Github messages for voidlinux
 help / color / mirror / Atom feed
* Re: [PR PATCH] [Updated] libnotify: update to 0.7.8
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-13708@inbox.vuxu.org>
@ 2019-09-03  9:36 ` voidlinux-github
  2019-09-03  9:36 ` voidlinux-github
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 4+ messages in thread
From: voidlinux-github @ 2019-09-03  9:36 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 518 bytes --]

There is an updated pull request by biopsin against master on the void-packages repository

https://github.com/biopsin/void-packages patch-1
https://github.com/void-linux/void-packages/pull/13708

libnotify: update to 0.7.8
switch to meson, added build options for docs..

noticed this warning while build:
/usr/include/features.h:382:4: warning: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Wcpp]


A patch file from https://github.com/void-linux/void-packages/pull/13708.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-patch-1-13708.patch --]
[-- Type: text/x-diff, Size: 4909 bytes --]

From 66cbe34a1cd4c226829d228283436b70b6f0a3ac Mon Sep 17 00:00:00 2001
From: biopsin <biopsin@yahoo.no>
Date: Fri, 16 Aug 2019 09:12:49 +0200
Subject: [PATCH 1/4] libnotify: update to 0.7.8

switch to meson, added build options for docs..

noticed this warning while build:
/usr/include/features.h:382:4: warning: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Wcpp]
---
 srcpkgs/libnotify/template | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/libnotify/template b/srcpkgs/libnotify/template
index ca699bda40a..bda47d17c18 100644
--- a/srcpkgs/libnotify/template
+++ b/srcpkgs/libnotify/template
@@ -1,21 +1,24 @@
 # Template file for 'libnotify'
 pkgname=libnotify
-version=0.7.7
-revision=3
-build_style=gnu-configure
+version=0.7.8
+revision=1
+build_style=meson
 build_helper="gir"
-configure_args="--disable-static $(vopt_enable gir introspection)"
+configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
+ -Dgtk_doc=$(vopt_if gtk_doc true false)
+ -Ddocbook_docs=$(vopt_if docbook enabled disabled)"
 hostmakedepends="pkg-config glib-devel"
-makedepends="libglib-devel libpng-devel gdk-pixbuf-devel gtk+3-devel"
+makedepends="libglib-devel libpng-devel gdk-pixbuf-devel gtk+3-devel
+ $(vopt_if gtk_doc gtk-doc) $(vopt_if docbook 'xmlto docbook-xsl')"
 short_desc="Desktop notification library"
 maintainer="Juan RP <xtraeme@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="http://library.gnome.org/devel/notification-spec/"
 distfiles="${GNOME_SITE}/${pkgname}/0.7/${pkgname}-${version}.tar.xz"
-checksum=9cb4ce315b2655860c524d46b56010874214ec27e854086c1a1d0260137efc04
+checksum=69209e0b663776a00c7b6c0e560302a8dbf66b2551d55616304f240bba66e18c
 
 # Package build options
-build_options="gir"
+build_options="gir gtk_doc docbook"
 build_options_default="gir"
 
 libnotify-devel_package() {

From bf76a08bd3c448da1e67e1a54640d31bcdc65fd8 Mon Sep 17 00:00:00 2001
From: biopsin <biopsin@yahoo.no>
Date: Mon, 19 Aug 2019 08:55:11 +0200
Subject: [PATCH 2/4] Update template

---
 srcpkgs/libnotify/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libnotify/template b/srcpkgs/libnotify/template
index bda47d17c18..2243a2eef72 100644
--- a/srcpkgs/libnotify/template
+++ b/srcpkgs/libnotify/template
@@ -11,7 +11,7 @@ hostmakedepends="pkg-config glib-devel"
 makedepends="libglib-devel libpng-devel gdk-pixbuf-devel gtk+3-devel
  $(vopt_if gtk_doc gtk-doc) $(vopt_if docbook 'xmlto docbook-xsl')"
 short_desc="Desktop notification library"
-maintainer="Juan RP <xtraeme@voidlinux.org>"
+maintainer="biopsin <biopsin@yahoo.no>"
 license="LGPL-2.1-or-later"
 homepage="http://library.gnome.org/devel/notification-spec/"
 distfiles="${GNOME_SITE}/${pkgname}/0.7/${pkgname}-${version}.tar.xz"

From 05ca14c65ca07f012b37597aa4ff7e5592b11e94 Mon Sep 17 00:00:00 2001
From: biopsin <biopsin@yahoo.no>
Date: Wed, 21 Aug 2019 09:28:17 +0200
Subject: [PATCH 3/4] Update template

---
 srcpkgs/libnotify/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libnotify/template b/srcpkgs/libnotify/template
index 2243a2eef72..5390f45af82 100644
--- a/srcpkgs/libnotify/template
+++ b/srcpkgs/libnotify/template
@@ -4,7 +4,7 @@ version=0.7.8
 revision=1
 build_style=meson
 build_helper="gir"
-configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
+configure_args="-Dc_args=-O2 -Dintrospection=$(vopt_if gir enabled disabled)
  -Dgtk_doc=$(vopt_if gtk_doc true false)
  -Ddocbook_docs=$(vopt_if docbook enabled disabled)"
 hostmakedepends="pkg-config glib-devel"

From 9d660c090b19caedf4c5bbf39dbbed940bd66619 Mon Sep 17 00:00:00 2001
From: biopsin <biopsin@yahoo.no>
Date: Tue, 3 Sep 2019 11:36:05 +0200
Subject: [PATCH 4/4] libnotify: update to 0.7.8

trying to resolve my stupidity
---
 srcpkgs/libnotify/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libnotify/template b/srcpkgs/libnotify/template
index 5390f45af82..99ba36df8a0 100644
--- a/srcpkgs/libnotify/template
+++ b/srcpkgs/libnotify/template
@@ -5,8 +5,7 @@ revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Dc_args=-O2 -Dintrospection=$(vopt_if gir enabled disabled)
- -Dgtk_doc=$(vopt_if gtk_doc true false)
- -Ddocbook_docs=$(vopt_if docbook enabled disabled)"
+ -Dgtk_doc=false -Ddocbook_docs=$(vopt_if docbook enabled disabled)"
 hostmakedepends="pkg-config glib-devel"
 makedepends="libglib-devel libpng-devel gdk-pixbuf-devel gtk+3-devel
  $(vopt_if gtk_doc gtk-doc) $(vopt_if docbook 'xmlto docbook-xsl')"
@@ -18,7 +17,7 @@ distfiles="${GNOME_SITE}/${pkgname}/0.7/${pkgname}-${version}.tar.xz"
 checksum=69209e0b663776a00c7b6c0e560302a8dbf66b2551d55616304f240bba66e18c
 
 # Package build options
-build_options="gir gtk_doc docbook"
+build_options="gir docbook"
 build_options_default="gir"
 
 libnotify-devel_package() {

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PR PATCH] [Updated] libnotify: update to 0.7.8
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-13708@inbox.vuxu.org>
  2019-09-03  9:36 ` [PR PATCH] [Updated] libnotify: update to 0.7.8 voidlinux-github
  2019-09-03  9:36 ` voidlinux-github
@ 2019-10-19 10:22 ` voidlinux-github
  2019-10-19 10:22 ` voidlinux-github
  3 siblings, 0 replies; 4+ messages in thread
From: voidlinux-github @ 2019-10-19 10:22 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 518 bytes --]

There is an updated pull request by biopsin against master on the void-packages repository

https://github.com/biopsin/void-packages patch-1
https://github.com/void-linux/void-packages/pull/13708

libnotify: update to 0.7.8
switch to meson, added build options for docs..

noticed this warning while build:
/usr/include/features.h:382:4: warning: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Wcpp]


A patch file from https://github.com/void-linux/void-packages/pull/13708.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-patch-1-13708.patch --]
[-- Type: text/x-diff, Size: 10553357 bytes --]

From 66cbe34a1cd4c226829d228283436b70b6f0a3ac Mon Sep 17 00:00:00 2001
From: biopsin <biopsin@yahoo.no>
Date: Fri, 16 Aug 2019 09:12:49 +0200
Subject: [PATCH 1/5] libnotify: update to 0.7.8

switch to meson, added build options for docs..

noticed this warning while build:
/usr/include/features.h:382:4: warning: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Wcpp]
---
 srcpkgs/libnotify/template | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/libnotify/template b/srcpkgs/libnotify/template
index ca699bda40a..bda47d17c18 100644
--- a/srcpkgs/libnotify/template
+++ b/srcpkgs/libnotify/template
@@ -1,21 +1,24 @@
 # Template file for 'libnotify'
 pkgname=libnotify
-version=0.7.7
-revision=3
-build_style=gnu-configure
+version=0.7.8
+revision=1
+build_style=meson
 build_helper="gir"
-configure_args="--disable-static $(vopt_enable gir introspection)"
+configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
+ -Dgtk_doc=$(vopt_if gtk_doc true false)
+ -Ddocbook_docs=$(vopt_if docbook enabled disabled)"
 hostmakedepends="pkg-config glib-devel"
-makedepends="libglib-devel libpng-devel gdk-pixbuf-devel gtk+3-devel"
+makedepends="libglib-devel libpng-devel gdk-pixbuf-devel gtk+3-devel
+ $(vopt_if gtk_doc gtk-doc) $(vopt_if docbook 'xmlto docbook-xsl')"
 short_desc="Desktop notification library"
 maintainer="Juan RP <xtraeme@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="http://library.gnome.org/devel/notification-spec/"
 distfiles="${GNOME_SITE}/${pkgname}/0.7/${pkgname}-${version}.tar.xz"
-checksum=9cb4ce315b2655860c524d46b56010874214ec27e854086c1a1d0260137efc04
+checksum=69209e0b663776a00c7b6c0e560302a8dbf66b2551d55616304f240bba66e18c
 
 # Package build options
-build_options="gir"
+build_options="gir gtk_doc docbook"
 build_options_default="gir"
 
 libnotify-devel_package() {

From bf76a08bd3c448da1e67e1a54640d31bcdc65fd8 Mon Sep 17 00:00:00 2001
From: biopsin <biopsin@yahoo.no>
Date: Mon, 19 Aug 2019 08:55:11 +0200
Subject: [PATCH 2/5] Update template

---
 srcpkgs/libnotify/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libnotify/template b/srcpkgs/libnotify/template
index bda47d17c18..2243a2eef72 100644
--- a/srcpkgs/libnotify/template
+++ b/srcpkgs/libnotify/template
@@ -11,7 +11,7 @@ hostmakedepends="pkg-config glib-devel"
 makedepends="libglib-devel libpng-devel gdk-pixbuf-devel gtk+3-devel
  $(vopt_if gtk_doc gtk-doc) $(vopt_if docbook 'xmlto docbook-xsl')"
 short_desc="Desktop notification library"
-maintainer="Juan RP <xtraeme@voidlinux.org>"
+maintainer="biopsin <biopsin@yahoo.no>"
 license="LGPL-2.1-or-later"
 homepage="http://library.gnome.org/devel/notification-spec/"
 distfiles="${GNOME_SITE}/${pkgname}/0.7/${pkgname}-${version}.tar.xz"

From 05ca14c65ca07f012b37597aa4ff7e5592b11e94 Mon Sep 17 00:00:00 2001
From: biopsin <biopsin@yahoo.no>
Date: Wed, 21 Aug 2019 09:28:17 +0200
Subject: [PATCH 3/5] Update template

---
 srcpkgs/libnotify/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libnotify/template b/srcpkgs/libnotify/template
index 2243a2eef72..5390f45af82 100644
--- a/srcpkgs/libnotify/template
+++ b/srcpkgs/libnotify/template
@@ -4,7 +4,7 @@ version=0.7.8
 revision=1
 build_style=meson
 build_helper="gir"
-configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
+configure_args="-Dc_args=-O2 -Dintrospection=$(vopt_if gir enabled disabled)
  -Dgtk_doc=$(vopt_if gtk_doc true false)
  -Ddocbook_docs=$(vopt_if docbook enabled disabled)"
 hostmakedepends="pkg-config glib-devel"

From 9d660c090b19caedf4c5bbf39dbbed940bd66619 Mon Sep 17 00:00:00 2001
From: biopsin <biopsin@yahoo.no>
Date: Tue, 3 Sep 2019 11:36:05 +0200
Subject: [PATCH 4/5] libnotify: update to 0.7.8

trying to resolve my stupidity
---
 srcpkgs/libnotify/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libnotify/template b/srcpkgs/libnotify/template
index 5390f45af82..99ba36df8a0 100644
--- a/srcpkgs/libnotify/template
+++ b/srcpkgs/libnotify/template
@@ -5,8 +5,7 @@ revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Dc_args=-O2 -Dintrospection=$(vopt_if gir enabled disabled)
- -Dgtk_doc=$(vopt_if gtk_doc true false)
- -Ddocbook_docs=$(vopt_if docbook enabled disabled)"
+ -Dgtk_doc=false -Ddocbook_docs=$(vopt_if docbook enabled disabled)"
 hostmakedepends="pkg-config glib-devel"
 makedepends="libglib-devel libpng-devel gdk-pixbuf-devel gtk+3-devel
  $(vopt_if gtk_doc gtk-doc) $(vopt_if docbook 'xmlto docbook-xsl')"
@@ -18,7 +17,7 @@ distfiles="${GNOME_SITE}/${pkgname}/0.7/${pkgname}-${version}.tar.xz"
 checksum=69209e0b663776a00c7b6c0e560302a8dbf66b2551d55616304f240bba66e18c
 
 # Package build options
-build_options="gir gtk_doc docbook"
+build_options="gir docbook"
 build_options_default="gir"
 
 libnotify-devel_package() {

From dff300c93a3c5469382cd1e3e70ad34d5f940ab5 Mon Sep 17 00:00:00 2001
From: biopsin <biopsin@yahoo.no>
Date: Sat, 19 Oct 2019 12:22:14 +0200
Subject: [PATCH 5/5] test (#11)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* python3-pulsectl: update to 19.9.5.

* python3-precis-i18n: update to 1.0.1.

* python3-rsistent: update to 0.15.4.

* python3-saml2: update to 4.8.0.

* python3-tabulate: update to 0.8.4.

* perl-Proc-Govern: update to 0.208.

* python3-PyFxA: update to 0.7.3.

* python3-SoCo: update to 0.18.

* python3-pem: update to 19.2.0.

* python3-mypy: update to 0.730.

* python3-mypy_extensions: update to 0.4.2.

* python3-josepy: update to 1.2.0.

* python3-dbusmock: update to 0.18.3.

* python3-chromecast: update to 4.0.1.

* python3-acme: update to 0.39.0.

* python3-fido2: update to 0.7.1.

* yubikey-manager: update to 3.1.0.

* libGL: update to 19.2.1

* jack: update to 1.9.13, adopt package

* wxPython4: actually build core library

* bluedevil: update to 5.17.0

[ci skip]

* breeze-gtk: update to 5.17.0

[ci skip]

* breeze: update to 5.17.0

[ci skip]

* kactivitymanagerd: update to 5.17.0

[ci skip]

* kde-cli-tools: update to 5.17.0

[ci skip]

* kde-gtk-config5: update to 5.17.0

[ci skip]

* kdecoration: update to 5.17.0

[ci skip]

* kdeplasma-addons5: update to 5.17.0

[ci skip]

* kgamma5: update to 5.17.0

[ci skip]

* khotkeys: update to 5.17.0

[ci skip]

* kinfocenter: update to 5.17.0

[ci skip]

* kmenuedit: update to 5.17.0

[ci skip]

* kscreen: update to 5.17.0

[ci skip]

* kscreenlocker: update to 5.17.0

[ci skip]

* ksshaskpass: update to 5.17.0

[ci skip]

* ksysguard: update to 5.17.0

[ci skip]

* kwallet-pam: update to 5.17.0

[ci skip]

* kwayland-integration: update to 5.17.0

[ci skip]

* kwin: update to 5.17.0

[ci skip]

* kwrited: update to 5.17.0

[ci skip]

* libkscreen: update to 5.17.0

[ci skip]

* libksysguard: update to 5.17.0

[ci skip]

* milou: update to 5.17.0

[ci skip]

* oxygen: update to 5.17.0

[ci skip]

* plasma-browser-integration: update to 5.17.0

[ci skip]

* plasma-desktop: update to 5.17.0

[ci skip]

* plasma-integration: update to 5.17.0

[ci skip]

* plasma-nm: update to 5.17.0

[ci skip]

* plasma-pa: update to 5.17.0

[ci skip]

* plasma-sdk: update to 5.17.0

[ci skip]

* plasma-vault: update to 5.17.0

[ci skip]

* plasma-workspace-wallpapers: update to 5.17.0

[ci skip]

* plasma-workspace: update to 5.17.0

[ci skip]

* polkit-kde-agent: update to 5.17.0

[ci skip]

* powerdevil: update to 5.17.0

[ci skip]

* sddm-kcm: update to 5.17.0

[ci skip]

* systemsettings: update to 5.17.0

[ci skip]

* user-manager: update to 5.17.0

[ci skip]

* xdg-desktop-portal-kde: update to 5.17.0

[ci skip]

* kde5: update to 5.17

* New package: plasma-thunderbolt-5.17.0

* Revert "libsass: update to 3.6.2."

This reverts commit e3b836224babe33f5c0748cabfc82cf82adba400.

this update broke sassc, at least for breeze-gtk

[ci skip]

* libdazzle: update to 3.34.1

Signed-off-by: Jürgen Buchmüller <pullmoll@t-online.de>

* libgweather: update to 3.34.0

Signed-off-by: Jürgen Buchmüller <pullmoll@t-online.de>

* evolution-data-server: revbump for libgweather-3.34.0

Signed-off-by: Jürgen Buchmüller <pullmoll@t-online.de>

* evolution: revbump for libgweather-3.34.0

Signed-off-by: Jürgen Buchmüller <pullmoll@t-online.de>

* gnome-calendar: update to 3.34.1

Signed-off-by: Jürgen Buchmüller <pullmoll@t-online.de>

* gnome-clocks: update to 3.34.0

Signed-off-by: Jürgen Buchmüller <pullmoll@t-online.de>

* gnome-initial-setup: update to 3.34.1

Signed-off-by: Jürgen Buchmüller <pullmoll@t-online.de>

* gnome-panel: update to 3.34.1

Signed-off-by: Jürgen Buchmüller <pullmoll@t-online.de>

* gnome-settings-daemon: update to 3.34.1

Signed-off-by: Jürgen Buchmüller <pullmoll@t-online.de>

* bijiben: update to 3.34.1

Signed-off-by: Jürgen Buchmüller <pullmoll@t-online.de>

* kubecfg: update to 0.13.1.

* gjs: update to 1.58.1

Signed-off-by: Jürgen Buchmüller <pullmoll@t-online.de>

* meson: backport a regression fix to unbreak various builds

Without this wlroots fails to build and possibly others too.

[ci skip]

* youtube-dl: update to 2019.10.16.

* mutter: update to 3.34.1. [skip ci]

requires void-linux/void-packages/pull/15506

closes #15530

* gnome-shell: update to 3.34.1. [skip ci]

gnome-shell requires void-linux/void-packages/pull/15446 before merge.

closes #15531

* sysprof: update to 3.34.1.

closes #15506

* gnome-builder: update to 3.34.1.

* gnome-todo: rebuild

* Revert "meson: update to 0.52.0."

This reverts commit 6b8bf86f64e2154765424f394283193093fe5a64.

0.52.0 did break gnome-builder https://gitlab.gnome.org/GNOME/gnome-builder/issues/1057

* gnome-todo: actually add patch

* flatbuffers: update to 1.11.0

* linux4.14: update to 4.14.149.

* s: install fish completion

* nvme-cli: fix build and handling of generated files

* pithos: update to 1.5.0.

* mpd: update to 0.21.16.

* totem: update to 3.34.1.

* gnome-session: update to 3.34.1.

* gnome-screensaver: rebuild against libgnome-desktop-3.so.18

* gnome-settings-daemon: rebuild against libgnome-desktop-3.so.18

* gnome-panel: rebuild against libgnome-desktop-3.so.18

* gnome-initial-setup: rebuild against libgnome-desktop-3.so.18

* gnome-font-viewer: update to 3.34.0.

* gnome-flashback: update to 3.34.1.

* gnome-control-center: update to 3.34.1.

* gnome-documents: rebuild against libgnome-desktop-3.so.18

* gnome-contacts: rebuild against libgnome-desktop-3.so.18

* gnome-clocks: rebuild against libgnome-desktop-3.so.18

* gnome-books: update to 3.34.0.

* evince: update to 3.34.1.

* eog: update to 3.34.1.

* cheese: update to 3.34.0.

* gnome-desktop: update to 3.34.1.

* adwaita-icon-theme: update to 3.34.0.

* file-roller: update to 3.32.2.

* gnome-backgrounds: update to 3.34.0.

* gnome-bluetooth: update to 3.34.0.

* gnome-user-docs: update to 3.34.0.

* gnome-shell-extensions: update to 3.34.1.

* gnome-online-miners: update to 3.34.0.

* yelp: update to 3.34.0.

* gnome-online-accounts: update to 3.34.1.

* mutter: rebuild against libgnome-desktop-3.so.18

* evolution: rebuild against libgnome-desktop-3.so.18

* nautilus: update to 3.34.1.

* sassc: increase rev to make sure that libcsass is build first

* gnome-tweaks: update to 3.34.0.

* yelp-xsl: update to 3.34.0.

* libreoffice: require libatomic on ppc32

It fails to link otherwise.

[ci skip]

* sparse: update to 0.6.1.

* exiftool: update to 11.70.

* aspell: update to 0.60.8.

* bogofilter: update to 1.2.5.

* mariadb: simplify handling of atomics/libatomic, fix ppc32 build

Platforms such as ppc32 and mips do not have the __sync builtins
in gcc, which breaks compilation. However, that code is not even
necessary, as proper implementations of the higher level atomic
primitives are available as builtins in any modern toolchain
(and definitely ours) and mariadb in fact already uses those
when available.

So basically ditch all this effectively dead code to fix build
on those platforms. While at it, remove the wrong checks in
cmake and fix properly linking against libatomic only when
needed (this also affects ARMv5/6) and simplify the template.

These changes have already been done upstream, but we're
sticking with an older version for now because of libmysqlclient
ABI compat, so fix this downstream until we can upgrade.

Also add another patch for ppc/ppc64+musl to use a gcc builtin
instead of a glibc extension.

[ci skip]

* firebird3: fix build on ppc*-musl

[ci skip]

* mariadb: mark as broken for armv6l-musl

* wf-shell: fix cross

* build_style/meson.sh: add support for using qemu as exe_wrapper

* gnome-todo: fix cross

* cheese: fix cross

* io.elementary.calendar: temporarily use git tag for compat with libecal-1.2

* mariadb: unbreak

* gnome-tweaks: add missing dependency

* kcontacts: update to 5.63.0.

* akonadi-calendar: rebuild for new kcontacts version number from KDE frameworks

* akonadi-contacts: rebuild for new kcontacts version number from KDE frameworks

* akonadi-import-wizard: rebuild for new kcontacts version number from KDE frameworks

* akonadi-search: rebuild for new kcontacts version number from KDE frameworks

* calligra-plan: rebuild for new kcontacts version number from KDE frameworks

* digikam: rebuild for new kcontacts version number from KDE frameworks

* eventviews: rebuild for new kcontacts version number from KDE frameworks

* incidenceeditor: rebuild for new kcontacts version number from KDE frameworks

* kaddressbook: rebuild for new kcontacts version number from KDE frameworks

* kalarm: rebuild for new kcontacts version number from KDE frameworks

* kdepim-apps-libs: rebuild for new kcontacts version number from KDE frameworks

* kdepim-runtime: rebuild for new kcontacts version number from KDE frameworks

* kgpg: rebuild for new kcontacts version number from KDE frameworks

* kmail: rebuild for new kcontacts version number from KDE frameworks

* kmymoney: rebuild for new kcontacts version number from KDE frameworks

* knotes: rebuild for new kcontacts version number from KDE frameworks

* korganizer: rebuild for new kcontacts version number from KDE frameworks

* ktnef: rebuild for new kcontacts version number from KDE frameworks

* libkdepim: rebuild for new kcontacts version number from KDE frameworks

* libkgapi: rebuild for new kcontacts version number from KDE frameworks

* mailcommon: rebuild for new kcontacts version number from KDE frameworks

* messagelib: rebuild for new kcontacts version number from KDE frameworks

* pim-data-exporter: rebuild for new kcontacts version number from KDE frameworks

* pimcommon: rebuild for new kcontacts version number from KDE frameworks

[skip ci]

* qpdf: update to 9.0.2.

* cups-filters: revbump for new qpdf release

* perl-Term-Table: update to 0.014.

* ruby-multi_json: update to 1.14.1.

* rpm: update to 4.15.0.

* occt: update to 7.4.0.

ship an env file in /etc/profile.d to make sure the Draw command works
(stolen from arch linux)

* freecad: rebuild for occt-7.4.0

along, fix build with gcc9

Closes #15102

* portage: update to 2.3.77

* jmol: update to 14.29.54.

* papirus-icon-theme: update to 20191009.

* kvantum: update to 0.12.1.

* google-cloud-sdk: update to 267.0.0.

* cmus: add elogind option to interface with MPRIS

Note: I couldn't adopt this package

* azote: update to 1.5.1

* libGL: add wayland build_option

* kgpg: update to 19.08.2.

* kdegraphics-mobipocket: update to 19.08.2.

* kdialog: update to 19.08.2.

* python3-pafy: drop broken py2 version

* go-jira: update to 1.0.21.

* onionshare: update to 2.2.

* New package: python3-Flask-HTTPAuth-3.3.0

* kio-extras: update to 19.08.2.

* print-manager: update to 19.08.2.

* dragon-player: update to 19.08.2.

* kcharselect: update to 19.08.2.

* ffmpegthumbs: update to 19.08.2.

* kcalc: update to 19.08.2.

* libksane: update to 19.08.2.

* kcolorchooser: update to 19.08.2.

* konquest: update to 19.08.2.

* kdenlive: update to 19.08.2.

* libkdegames: update to 19.08.2.

* juk: update to 19.08.2.

* ktouch: update to 19.08.2.

* k3b: update to 19.08.2.

* binwalk: update to 2.2.0.

* xl2tpd: update to 1.3.15.

* linux5.3: update to 5.3.7.

[skip ci]

* linux4.19: update to 4.19.80.

* open-vm-tools: update to 11.0.0.

adopt package

Closes #14922

* xfce4-panel: split lib

* xfce4-taskmanager: remove obsolete build dependency (xfce4-panel)

* Thunar: rebuild for libxfce4panel

* orage: rebuild for libxfce4panel

* xfce4-battery-plugin: rebuild for libxfce4panel

* xfce4-clipman-plugin: rebuild for libxfce4panel

* xfce4-cpufreq-plugin: rebuild for libxfce4panel

* xfce4-cpugraph-plugin: rebuild for libxfce4panel

* xfce4-dict: rebuild for libxfce4panel

* xfce4-diskperf-plugin: rebuild for libxfce4panel

* xfce4-fsguard-plugin: rebuild for libxfce4panel

* xfce4-genmon-plugin: rebuild for libxfce4panel

* xfce4-hardware-monitor-plugin: rebuild for libxfce4panel

* xfce4-kbdleds-plugin: rebuild for libxfce4panel

* xfce4-mailwatch-plugin: rebuild for libxfce4panel

* xfce4-mpc-plugin: rebuild for libxfce4panel

* xfce4-netload-plugin: rebuild for libxfce4panel

* xfce4-notes-plugin: rebuild for libxfce4panel

* xfce4-notifyd: rebuild for libxfce4panel

* xfce4-places-plugin: rebuild for libxfce4panel

* xfce4-power-manager: rebuild for libxfce4panel

* xfce4-pulseaudio-plugin: rebuild for libxfce4panel

* xfce4-screenshooter: rebuild for libxfce4panel

* xfce4-sensors-plugin: rebuild for libxfce4panel

* xfce4-systemload-plugin: rebuild for libxfce4panel

* xfce4-time-out-plugin: rebuild for libxfce4panel

* xfce4-timer-plugin: rebuild for libxfce4panel

* xfce4-verve-plugin: rebuild for libxfce4panel

* xfce4-wavelan-plugin: rebuild for libxfce4panel

* xfce4-weather-plugin: rebuild for libxfce4panel

* xfce4-whiskermenu-plugin: rebuild for libxfce4panel

* xfce4-windowck-plugin: rebuild for libxfce4panel

* xfce4-xkb-plugin: rebuild for libxfce4panel

Closes #13979

Fixes #15288

[ci skip]

* sudo: update to 1.8.28p1.

* gitlab-runner: update to 12.3.0

* tor: update sandbox patch for ppc32

[ci skip]

* delta: update to 0.0.13.

* exiftool: update to 11.71.

* python3-yara: update to 3.11.0.

* spotify-tui: update to 0.6.2.

* tau: update to 0.9.3

* New package: sqlmap-1.3.9

* python3-perf: update to 1.6.1.

* botan: update to 2.12.1

Signed-off-by: Jürgen Buchmüller <pullmoll@t-online.de>

* sqlite: update to 3.30.1.

* yaru: update to 19.10.4.

* Revert "libnotify"
---
 .travis.yml                                   |     1 +
 common/build-style/cargo.sh                   |     2 +-
 common/build-style/meson.sh                   |     7 +
 common/shlibs                                 |   225 +-
 common/xbps-src/shutils/build_dependencies.sh |     2 +-
 common/xbps-src/shutils/common.sh             |     2 +-
 common/xbps-src/shutils/cross.sh              |     2 +-
 srcpkgs/2bwm/template                         |     4 +-
 srcpkgs/3proxy/template                       |     8 +-
 srcpkgs/66-tools/template                     |    33 +
 srcpkgs/66/template                           |     6 +-
 srcpkgs/Amass/template                        |    12 +
 srcpkgs/AppStream/template                    |     2 +-
 srcpkgs/Bear/template                         |     8 +-
 srcpkgs/CImg/template                         |     5 +-
 srcpkgs/CLion/template                        |    12 +-
 srcpkgs/Clight/template                       |     2 +-
 srcpkgs/Clightd/template                      |     2 +-
 srcpkgs/ClusterSSH/template                   |     9 +-
 srcpkgs/ClusterSSH/update                     |     1 -
 srcpkgs/CopyQ/template                        |     4 +-
 srcpkgs/Electron-Cash/template                |    25 +
 srcpkgs/EternalTerminal/template              |     6 +-
 srcpkgs/FeatherPad/template                   |     6 +-
 srcpkgs/FeedReader/template                   |     4 +-
 srcpkgs/GoLand/template                       |    12 +-
 srcpkgs/GraphicsMagick/template               |     4 +-
 srcpkgs/ImageMagick/template                  |     6 +-
 srcpkgs/ImageMagick6/template                 |     4 +-
 .../patches/ppc/musl-ppc-secureplt.patch      |    93 +
 .../patches/ppc64}/add-ppc64-support.patch    |     0
 .../patches/ppc64}/fix-vm-jit-ppc64.patch     |     0
 srcpkgs/LuaJIT/template                       |    17 +
 srcpkgs/MEGAcmd/patches/include.am.patch      |    16 +-
 srcpkgs/MEGAcmd/patches/megacmd-sdk36.diff    |   381 +
 srcpkgs/MEGAcmd/patches/musl.patch            |    13 -
 srcpkgs/MEGAcmd/template                      |     9 +-
 srcpkgs/MEGAsdk/template                      |     6 +-
 srcpkgs/MEGAsync/patches/breakpad.patch       |    16 +
 srcpkgs/MEGAsync/template                     |    12 +-
 srcpkgs/Minder/template                       |     4 +-
 srcpkgs/ModemManager/template                 |     4 +-
 srcpkgs/MultiMC/template                      |    16 +-
 srcpkgs/NetAuth/template                      |     4 +-
 srcpkgs/NetKeys/template                      |     4 +-
 srcpkgs/NetworkManager/template               |     7 +-
 srcpkgs/OTPClient/template                    |     6 +-
 srcpkgs/PackageKit/template                   |     2 +-
 srcpkgs/PopCorn/template                      |    14 +-
 srcpkgs/QMPlay2/template                      |     8 +-
 srcpkgs/R/template                            |     6 +-
 srcpkgs/RubyMine/template                     |    12 +-
 srcpkgs/SDL2_mixer/template                   |     6 +-
 srcpkgs/SLADE/template                        |     5 +-
 srcpkgs/SPIRV-Headers/template                |     2 +-
 srcpkgs/SPIRV-Tools/template                  |     2 +-
 .../patches/build-from-tarball.patch          |     7 +-
 srcpkgs/Signal-Desktop/template               |    12 +-
 srcpkgs/Solaar/template                       |    15 +
 srcpkgs/SweetHome3D/template                  |     4 +-
 srcpkgs/The-Powder-Toy/template               |    28 +
 srcpkgs/Thunar/template                       |     2 +-
 srcpkgs/UEFITool/template                     |    27 +
 .../Uranium/patches/fix-crash-in-cura.patch   |   132 -
 srcpkgs/Uranium/template                      |     6 +-
 srcpkgs/VirtualGL/template                    |     8 +-
 srcpkgs/Vulkan-Headers/template               |     4 +-
 srcpkgs/Vulkan-Tools/template                 |     4 +-
 srcpkgs/Waybar/template                       |     4 +-
 srcpkgs/WebStorm/template                     |    16 +-
 srcpkgs/YACReader/template                    |     6 +-
 srcpkgs/abi-compliance-checker/template       |     2 +-
 srcpkgs/abireport/template                    |     8 +-
 srcpkgs/ack/template                          |     4 +-
 srcpkgs/acpica-utils/template                 |     6 +-
 srcpkgs/acpid/template                        |     6 +-
 srcpkgs/adobe-flash-plugin/template           |    12 +-
 srcpkgs/adriconf/template                     |     9 +-
 srcpkgs/adwaita-icon-theme/template           |     4 +-
 srcpkgs/afl/template                          |    15 +-
 srcpkgs/aisleriot/template                    |     4 +-
 srcpkgs/akonadi-calendar/template             |     6 +-
 srcpkgs/akonadi-contacts/template             |     6 +-
 srcpkgs/akonadi-import-wizard/template        |     8 +-
 srcpkgs/akonadi-mime/template                 |     4 +-
 srcpkgs/akonadi-notes/template                |     4 +-
 srcpkgs/akonadi-search/template               |     6 +-
 srcpkgs/akonadi5/template                     |     4 +-
 srcpkgs/akregator/template                    |     4 +-
 srcpkgs/alert-after/template                  |     6 +-
 srcpkgs/alertmanager/template                 |     4 +-
 srcpkgs/alkimia/template                      |     4 +-
 srcpkgs/alpine/patches/418e8bc5.patch         |    22 +
 srcpkgs/alpine/template                       |     2 +-
 srcpkgs/amdvlk/patches/musl.patch             |    33 -
 srcpkgs/amdvlk/template                       |    36 +-
 srcpkgs/amiri-font/template                   |     6 +-
 srcpkgs/amp/template                          |    10 +-
 srcpkgs/amtk/template                         |     8 +-
 srcpkgs/android-studio/template               |    43 +-
 srcpkgs/android-tools/files/generate_build.rb |   405 -
 srcpkgs/android-tools/patches/gcc-fixes.patch |    30 -
 .../patches/include-sys-sysmacros.patch       |    10 -
 .../android-tools/patches/musl-fixes.patch    |   199 -
 .../patches/undef__USE_GNU.patch              |    24 -
 srcpkgs/android-tools/template                |    89 +-
 srcpkgs/android-tools/update                  |     2 +-
 srcpkgs/angband/template                      |     8 +-
 srcpkgs/anki/template                         |     4 +-
 srcpkgs/ansi/template                         |     2 +-
 srcpkgs/anydesk/template                      |     9 +-
 srcpkgs/apache-directory-studio               |     1 +
 .../files/ApacheDirectoryStudio.desktop       |     0
 .../template                                  |    21 +-
 .../update                                    |     0
 srcpkgs/apache-jmeter/update                  |     1 +
 srcpkgs/apache-maven/template                 |     6 +-
 srcpkgs/apache-tomcat/template                |     4 +-
 srcpkgs/apache/template                       |     7 +-
 srcpkgs/api-sanity-checker/template           |     2 +-
 srcpkgs/apparmor/template                     |     7 +-
 srcpkgs/apt/template                          |     4 +-
 srcpkgs/aptly/template                        |     4 +-
 srcpkgs/aqbanking/template                    |     7 +-
 srcpkgs/aquatone/template                     |     4 +-
 srcpkgs/arc-theme/template                    |    10 +-
 srcpkgs/archiver/template                     |     6 +-
 srcpkgs/arduino/patches/astyle_fix.patch      |    34 +
 .../patches/disable-dependency-build.patch    |     4 +-
 srcpkgs/arduino/template                      |     6 +-
 .../patches/patch-src_libssl_compat_h.patch   |    16 -
 srcpkgs/aria2/template                        |     6 +-
 srcpkgs/aribas/update                         |     1 +
 srcpkgs/ark/template                          |     4 +-
 srcpkgs/armadillo/template                    |     8 +-
 srcpkgs/asio/template                         |    10 +-
 srcpkgs/aspell-en/template                    |     6 +-
 srcpkgs/aspell/template                       |     6 +-
 .../patches/0001-glext_h_conflict.patch       |    14 -
 srcpkgs/assimp/patches/musl.patch             |    11 +
 srcpkgs/assimp/template                       |    15 +-
 srcpkgs/assimp_qt_viewer/template             |    24 +
 srcpkgs/asunder/template                      |     6 +-
 srcpkgs/at-spi2-atk/template                  |     4 +-
 srcpkgs/at-spi2-core/template                 |     6 +-
 srcpkgs/atk/patches/fix-cross-gir.patch       |    14 -
 srcpkgs/atk/template                          |     6 +-
 srcpkgs/atlantis/template                     |     4 +-
 srcpkgs/atomix/template                       |     4 +-
 srcpkgs/atril/template                        |     6 +-
 srcpkgs/attica/template                       |     4 +-
 srcpkgs/audacious-plugins/template            |    13 +-
 srcpkgs/audacious/template                    |    16 +-
 srcpkgs/autofs/template                       |     8 +-
 srcpkgs/avidemux/template                     |     6 +-
 srcpkgs/avr-gcc/template                      |    12 +-
 srcpkgs/aws-cli/template                      |     5 +-
 srcpkgs/axel/template                         |     4 +-
 srcpkgs/azote/template                        |     6 +-
 srcpkgs/azpainter/template                    |     6 +-
 srcpkgs/babeld/patches/45.patch               |    71 +
 srcpkgs/babeld/template                       |    11 +-
 srcpkgs/backblaze-b2/template                 |     6 +-
 srcpkgs/backintime-qt/template                |    19 +
 srcpkgs/backintime/template                   |    15 +-
 srcpkgs/baloo-widgets5/template               |     4 +-
 srcpkgs/baloo5/template                       |     5 +-
 srcpkgs/baresip/template                      |     4 +-
 srcpkgs/barrier/template                      |     4 +-
 srcpkgs/base-files/files/66-kvm.rules         |     2 +-
 srcpkgs/base-files/files/vkpurge.8            |     6 +-
 srcpkgs/base-files/template                   |     4 +-
 srcpkgs/bash/files/bash50-008                 |    68 +
 srcpkgs/bash/files/bash50-009                 |    42 +
 srcpkgs/bash/files/bash50-010                 |   172 +
 srcpkgs/bash/files/bash50-011                 |    59 +
 srcpkgs/bash/template                         |     4 +-
 srcpkgs/bat/template                          |    11 +-
 srcpkgs/bc-gh/template                        |     4 +-
 srcpkgs/bcal/patches/non-null.patch           |    11 +
 srcpkgs/bcal/template                         |    11 +-
 srcpkgs/bcc/patches/musl.patch                |    12 -
 srcpkgs/bcc/template                          |    19 +-
 srcpkgs/bctoolbox/template                    |     2 +-
 srcpkgs/beancount/template                    |     6 +-
 srcpkgs/bearssl/template                      |    17 +-
 srcpkgs/beignet/patches/llvm8.patch           |    56 +
 srcpkgs/beignet/patches/llvm9.patch           |   111 +
 srcpkgs/beignet/template                      |     3 +-
 srcpkgs/berry/patches/fix-cross.patch         |    22 +-
 srcpkgs/berry/template                        |     6 +-
 srcpkgs/bettercap/template                    |     4 +-
 srcpkgs/bfs/template                          |     6 +-
 srcpkgs/bijiben/template                      |     4 +-
 srcpkgs/bind/template                         |     4 +-
 srcpkgs/binutils/template                     |     6 +-
 srcpkgs/binwalk/template                      |    19 +-
 srcpkgs/bird/template                         |     4 +-
 srcpkgs/bison/template                        |     4 +-
 srcpkgs/bitcoin/template                      |     6 +-
 srcpkgs/bitlbee-facebook/template             |     3 +-
 srcpkgs/blackbox_exporter/template            |     4 +-
 srcpkgs/blender/patches/altivec-all.patch     |    32 +
 srcpkgs/blender/patches/gcc9-elbeem.patch     |    31 +
 srcpkgs/bluedevil/template                    |     4 +-
 srcpkgs/blueman/template                      |     6 +-
 srcpkgs/bluez-qt5/template                    |     4 +-
 srcpkgs/bluez/files/bluetooth-meshd/run       |     3 +
 ...-without-systemd-in-the-user-session.patch |    59 -
 .../0001-enable-dbus-without-systemd.patch    |    34 +
 ...02-allow-obexd-on-non-systemd-system.patch |    54 +
 .../0002-bluetoothd-dbus-service.patch        |    20 -
 ...003-allow-mesh-on-non-systemd-system.patch |    29 +
 .../0003-bluetooth-group-can-use-bluez.patch  |    13 -
 ...04-include-sys-time.h-for-musl-build.patch |   129 +
 ...0005-include-limits.h-for-musl-build.patch |    66 +
 .../{musl.patch => 0006-musl-fix.patch}       |    21 +-
 .../bluez/patches/0007-include-string.h.patch |    25 +
 ...-grant-permission-to-bluetooth-group.patch |    27 +
 ...fresh-adv_manager-for-non-LE-devices.patch |    51 +
 srcpkgs/bluez/template                        |    28 +-
 srcpkgs/bogofilter/template                   |    14 +-
 srcpkgs/boinc/template                        |     6 +-
 srcpkgs/borgmatic/template                    |     4 +-
 srcpkgs/botan/template                        |    26 +-
 srcpkgs/bpftrace/template                     |     2 +-
 srcpkgs/breeze-gtk/template                   |     4 +-
 srcpkgs/breeze-icons/template                 |     4 +-
 srcpkgs/breeze/template                       |     4 +-
 srcpkgs/brig/template                         |     2 +-
 ...052df45c1fa439f6af0a2c8e9795087b9444.patch |   185 -
 srcpkgs/brisk-menu/template                   |     8 +-
 srcpkgs/bro/template                          |     4 +-
 srcpkgs/broot/template                        |     4 +-
 srcpkgs/brother-brlaser/template              |     4 +-
 srcpkgs/bs1770gain/template                   |     6 +-
 srcpkgs/bsdunzip/template                     |     2 +-
 srcpkgs/bspwm/template                        |     4 +-
 srcpkgs/btfs/template                         |    12 +-
 srcpkgs/btrfs-progs/template                  |     4 +-
 srcpkgs/buildah/template                      |     4 +-
 srcpkgs/buildbot/template                     |     3 +-
 srcpkgs/bum/template                          |     2 +-
 srcpkgs/bvi/template                          |     8 +-
 srcpkgs/cJSON/template                        |     2 +-
 srcpkgs/caddy/template                        |     4 +-
 srcpkgs/cage/template                         |    18 +
 srcpkgs/caja-extensions/template              |     4 +-
 srcpkgs/caja/template                         |     4 +-
 .../patches/DST-fix-date-change.patch         |    34 +
 srcpkgs/calcurse/template                     |     2 +-
 srcpkgs/calendarsupport/template              |     4 +-
 srcpkgs/calibre/template                      |    23 +-
 .../patches/missing-includes.patch            |    22 +
 srcpkgs/calligra-plan/template                |     2 +-
 srcpkgs/calligra/patches/qt5.13.patch         |    21 +
 srcpkgs/calligra/template                     |     2 +-
 srcpkgs/camlp4/patches/version-hack.patch     |    11 +
 srcpkgs/camlp4/template                       |     2 +-
 srcpkgs/camlp5/template                       |     6 +-
 .../patches/revert-libgit2-sys-api.patch      |    32 +
 srcpkgs/cargo/template                        |    45 +-
 srcpkgs/catch2/template                       |     4 +-
 srcpkgs/catfish/template                      |     4 +-
 srcpkgs/cbindgen/template                     |     4 +-
 srcpkgs/ccache/template                       |     4 +-
 srcpkgs/ccls/template                         |     8 +-
 srcpkgs/cdemu-client/template                 |     4 +-
 srcpkgs/cdemu-daemon/template                 |     4 +-
 srcpkgs/cdetect/template                      |     6 +-
 srcpkgs/celluloid/template                    |    19 +
 srcpkgs/cgrps/template                        |     8 +-
 srcpkgs/chafa/template                        |     4 +-
 srcpkgs/chatty/template                       |    10 +-
 srcpkgs/cheat/template                        |    26 +
 srcpkgs/cheese/template                       |    26 +-
 srcpkgs/cherry-font/template                  |     4 +-
 srcpkgs/cherrytree/template                   |     4 +-
 srcpkgs/chocolate-doom/template               |     2 +-
 srcpkgs/chroma/template                       |     6 +-
 srcpkgs/chromium-widevine/template            |     4 +-
 .../files/musl-patches/no-mallinfo.patch      |    12 +
 .../patches/chromium-enable-vaapi.patch       |   760 +-
 .../chromium/patches/harfbuzz-subset.patch    |    49 +
 .../chromium/patches/linked-hash-set.patch    |   130 +
 .../chromium/patches/one_euro_filter.patch    |    11 +
 .../patches/sandbox-sched_getparam.patch      |    20 +
 srcpkgs/chromium/template                     |     6 +-
 srcpkgs/chronograf/template                   |     4 +-
 srcpkgs/cinnamon-control-center/template      |     6 +-
 srcpkgs/cinnamon-desktop/template             |     6 +-
 srcpkgs/cinnamon-menus/template               |    10 +-
 srcpkgs/cinnamon-screensaver/template         |     6 +-
 srcpkgs/cinnamon-session/template             |     8 +-
 srcpkgs/cinnamon-settings-daemon/template     |     6 +-
 srcpkgs/cinnamon-translations/template        |     4 +-
 ...78cf57b80b977401460a147602832157b303.patch |    64 -
 srcpkgs/cinnamon/patches/default-theme.patch  |    25 -
 srcpkgs/cinnamon/patches/set_wheel.patch      |    17 -
 srcpkgs/cinnamon/template                     |     9 +-
 srcpkgs/cjs/template                          |    10 +-
 srcpkgs/ckb-next/template                     |     8 +-
 srcpkgs/ckbcomp/template                      |     6 +-
 srcpkgs/clamav/template                       |     9 +-
 srcpkgs/clang                                 |     2 +-
 srcpkgs/clang-analyzer                        |     2 +-
 srcpkgs/clang-tools-extra                     |     2 +-
 srcpkgs/claws-mail/template                   |     2 +-
 srcpkgs/clazy/template                        |     6 +-
 srcpkgs/clearine/template                     |    32 +-
 ...add-missing-functional-includes-5630.patch |    51 -
 .../patches/clementine-chromaprint-1.4.patch  |    41 -
 .../patches/clementine-moodbar_flags.patch    |    14 -
 .../patches/clementine-sqlite-3.12.patch      |    19 -
 srcpkgs/clementine/patches/protobuf-370.patch |    82 -
 srcpkgs/clementine/patches/sentinel.patch     |    42 -
 srcpkgs/clementine/template                   |    22 +-
 srcpkgs/clipgrab/template                     |     8 +-
 srcpkgs/clipman/template                      |    14 +
 srcpkgs/cloc/template                         |     4 +-
 srcpkgs/cloudfuse/template                    |     2 +-
 srcpkgs/clyrics/template                      |     4 +-
 srcpkgs/cmake-gui/template                    |     4 +-
 srcpkgs/cmake/template                        |     6 +-
 srcpkgs/cmixer/patches/linux.patch            |    34 +
 srcpkgs/cmixer/template                       |    20 +
 srcpkgs/cmocka/template                       |     2 +-
 srcpkgs/cmus/template                         |    19 +-
 srcpkgs/cni-plugins/template                  |     4 +-
 srcpkgs/cnping/INSTALL                        |     5 +
 srcpkgs/cnping/template                       |    19 +
 srcpkgs/codecrypt/template                    |     6 +-
 srcpkgs/codelite/template                     |     2 +-
 srcpkgs/collectd/template                     |     2 +-
 srcpkgs/composer/template                     |     9 +-
 srcpkgs/compton/template                      |     8 +-
 srcpkgs/conky-cli/template                    |     4 +-
 srcpkgs/conky/template                        |     5 +-
 srcpkgs/conmon/template                       |     4 +-
 srcpkgs/connman/files/connmand/run            |     3 +-
 srcpkgs/connman/files/musl/freeaddrinfo.patch |    17 +
 srcpkgs/connman/template                      |     2 +-
 srcpkgs/consul-template/template              |    13 +
 srcpkgs/consul/template                       |     6 +-
 srcpkgs/coq/template                          |     9 +-
 srcpkgs/coreboot-utils/template               |     6 +-
 srcpkgs/coyim/template                        |    19 +
 srcpkgs/cozy/template                         |     4 +-
 srcpkgs/cppcheck/template                     |    29 +-
 srcpkgs/cpufrequtils/template                 |     2 +-
 srcpkgs/crash/template                        |     4 +-
 srcpkgs/cri-tools/template                    |    10 +-
 srcpkgs/croc/template                         |     4 +-
 srcpkgs/cropgui/template                      |     2 +-
 .../files/non-nullness.patch                  |     1 -
 srcpkgs/cross-aarch64-linux-gnu/template      |    21 +-
 .../files/gccgo-musl.patch                    |     1 +
 .../files/non-nullness.patch                  |     1 -
 srcpkgs/cross-aarch64-linux-musl/template     |    43 +-
 .../files/non-nullness.patch                  |     1 -
 srcpkgs/cross-arm-linux-gnueabi/template      |    21 +-
 .../files/non-nullness.patch                  |     1 -
 srcpkgs/cross-arm-linux-gnueabihf/template    |    21 +-
 .../files/gccgo-musl.patch                    |     1 +
 .../files/non-nullness.patch                  |     1 -
 srcpkgs/cross-arm-linux-musleabi/template     |    43 +-
 .../files/gccgo-musl.patch                    |     1 +
 .../files/non-nullness.patch                  |     1 -
 srcpkgs/cross-arm-linux-musleabihf/template   |    43 +-
 .../files/non-nullness.patch                  |     1 -
 srcpkgs/cross-armv7l-linux-gnueabihf/template |    21 +-
 .../files/gccgo-musl.patch                    |     1 +
 .../files/non-nullness.patch                  |     1 -
 .../cross-armv7l-linux-musleabihf/template    |    43 +-
 .../files/bug90756.patch                      |     1 -
 .../files/gccgo-musl.patch                    |     1 +
 .../files/non-nullness.patch                  |     1 -
 srcpkgs/cross-i686-linux-musl/template        |    47 +-
 .../files/bug90756.patch                      |     1 -
 .../files/non-nullness.patch                  |     1 -
 srcpkgs/cross-i686-pc-linux-gnu/template      |    24 +-
 .../files/non-nullness.patch                  |     1 -
 srcpkgs/cross-mips-linux-musl/template        |    14 +-
 .../files/non-nullness.patch                  |     1 -
 srcpkgs/cross-mips-linux-muslhf/template      |    14 +-
 .../files/non-nullness.patch                  |     1 -
 srcpkgs/cross-mipsel-linux-musl/template      |    14 +-
 .../files/non-nullness.patch                  |     1 -
 srcpkgs/cross-mipsel-linux-muslhf/template    |    14 +-
 .../files/non-nullness.patch                  |     1 -
 srcpkgs/cross-powerpc-linux-gnu/template      |    40 +-
 .../files/gccgo-musl.patch                    |     1 +
 .../files/non-nullness.patch                  |     1 -
 srcpkgs/cross-powerpc-linux-musl/template     |    63 +-
 .../files/darn.patch                          |     1 +
 .../files/non-nullness.patch                  |     1 -
 srcpkgs/cross-powerpc64-linux-gnu/template    |    21 +-
 .../files/darn.patch                          |     1 +
 .../files/gccgo-musl.patch                    |     1 +
 .../files/non-nullness.patch                  |     1 -
 srcpkgs/cross-powerpc64-linux-musl/template   |    44 +-
 .../files/darn.patch                          |     1 +
 .../files/non-nullness.patch                  |     1 -
 srcpkgs/cross-powerpc64le-linux-gnu/template  |    21 +-
 .../files/darn.patch                          |     1 +
 .../files/gccgo-musl.patch                    |     1 +
 .../files/non-nullness.patch                  |     1 -
 srcpkgs/cross-powerpc64le-linux-musl/template |    44 +-
 srcpkgs/cross-vpkg-dummy/template             |    24 +-
 .../files/gccgo-musl.patch                    |     1 +
 .../files/non-nullness.patch                  |     1 -
 srcpkgs/cross-x86_64-linux-musl/template      |    43 +-
 srcpkgs/cross-x86_64-w64-mingw32/template     |     6 +-
 srcpkgs/crypto++/patches/arm-native.patch     |    26 -
 .../crypto++/patches/musl-soname-links.patch  |    10 -
 srcpkgs/crypto++/template                     |    16 +-
 srcpkgs/cryptsetup/template                   |    14 +-
 srcpkgs/crystal/template                      |    10 +-
 srcpkgs/cups-filters/template                 |     6 +-
 srcpkgs/cups/patches/cups-no-gzip-man.patch   |    17 -
 srcpkgs/cups/template                         |     4 +-
 ...ult-none-so-that-it-compiles-in-gcc9.patch |    57 -
 srcpkgs/cura-engine/template                  |     4 +-
 srcpkgs/cura-fdm-materials/template           |     5 +-
 srcpkgs/cura/template                         |     4 +-
 srcpkgs/curl/template                         |    10 +-
 srcpkgs/cutter/template                       |     6 +-
 srcpkgs/datamash/template                     |     4 +-
 srcpkgs/dav1d/template                        |     2 +-
 srcpkgs/dbeaver/template                      |     4 +-
 srcpkgs/dconf-editor/template                 |     4 +-
 srcpkgs/ddcutil/template                      |     4 +-
 srcpkgs/ddgr/template                         |     6 +-
 srcpkgs/debootstrap/template                  |    10 +-
 srcpkgs/dejagnu/template                      |     2 +-
 srcpkgs/delta/template                        |    15 +
 srcpkgs/deluge/files/deluge-web/run           |     2 +-
 srcpkgs/deluge/template                       |     2 +-
 srcpkgs/delve/template                        |    18 +-
 srcpkgs/deutex/template                       |     8 +-
 srcpkgs/devedeng/template                     |     6 +-
 srcpkgs/dhcpcd/template                       |     5 +-
 srcpkgs/dialog/template                       |     2 +-
 srcpkgs/diffr/template                        |    18 +
 srcpkgs/digikam/template                      |     6 +-
 srcpkgs/diskus/template                       |     6 +-
 srcpkgs/dispcalGUI/template                   |     4 +-
 srcpkgs/dive/template                         |     4 +-
 srcpkgs/dkms/files/kernel.d/dkms.postinst     |     2 +
 srcpkgs/dkms/template                         |     2 +-
 srcpkgs/dma/patches/musl_sys_param_h.patch    |    12 -
 srcpkgs/dma/template                          |     9 +-
 srcpkgs/dmd/template                          |    16 +-
 srcpkgs/dmenu-wayland/template                |     5 +-
 srcpkgs/dmenu/template                        |     2 +-
 srcpkgs/dnscrypt-proxy/template               |     6 +-
 srcpkgs/dnsmasq/patches/nettle35.patch        |    42 +
 .../patches/pyyaml_version.patch              |    13 +
 srcpkgs/docker-compose/template               |     8 +-
 srcpkgs/docker/template                       |     4 +-
 srcpkgs/dolphin/template                      |     4 +-
 srcpkgs/doomretro/template                    |     4 +-
 srcpkgs/dos2unix/template                     |     8 +-
 srcpkgs/dosbox/template                       |     4 -
 srcpkgs/dovecot-plugin-pigeonhole/template    |     6 +-
 srcpkgs/dovecot/template                      |     6 +-
 srcpkgs/dracut/patches/ppc-mac-thermal.patch  |   144 +
 srcpkgs/dracut/template                       |     4 +-
 srcpkgs/dragon-player/template                |     4 +-
 srcpkgs/drone-cli/template                    |     6 +-
 srcpkgs/drumstick-devel                       |     1 +
 srcpkgs/drumstick/template                    |    33 +
 srcpkgs/dssi/template                         |     8 +-
 srcpkgs/dtc/template                          |     4 +-
 srcpkgs/dte/template                          |     4 +-
 srcpkgs/duktape/template                      |     4 +-
 srcpkgs/duplicity/template                    |     2 +-
 srcpkgs/dutree/template                       |     4 +-
 srcpkgs/e2fsprogs/template                    |     4 +-
 srcpkgs/eclipse/template                      |     6 +-
 srcpkgs/edbrowse/patches/curl-7.62.patch      |    27 -
 srcpkgs/edbrowse/template                     |     6 +-
 srcpkgs/editline/template                     |     2 +-
 srcpkgs/eggdrop/template                      |    44 +
 srcpkgs/elfinfo/template                      |     6 +-
 srcpkgs/elfutils/template                     |     2 +-
 srcpkgs/elixir/template                       |     4 +-
 srcpkgs/ell/template                          |     6 +-
 srcpkgs/elogind/template                      |     6 +-
 srcpkgs/emacs/template                        |     4 +-
 srcpkgs/enchant2/template                     |     6 +-
 srcpkgs/encodings/template                    |    13 +-
 srcpkgs/endless-sky/template                  |     4 +-
 srcpkgs/engrampa/template                     |     4 +-
 srcpkgs/entr/template                         |     7 +-
 srcpkgs/eog/template                          |     4 +-
 srcpkgs/eom/template                          |     5 -
 srcpkgs/epiphany/template                     |     2 +-
 srcpkgs/eqonomize/template                    |     4 +-
 srcpkgs/erlang/template                       |     4 +-
 srcpkgs/eselect/template                      |     6 +-
 srcpkgs/etcd/template                         |     4 +-
 srcpkgs/etcetera/template                     |    10 +-
 srcpkgs/ethtool/template                      |     4 +-
 srcpkgs/eventviews/template                   |     6 +-
 srcpkgs/evince/template                       |     6 +-
 srcpkgs/evolution-data-server/template        |     8 +-
 srcpkgs/evolution-ews/template                |     4 +-
 srcpkgs/evolution/template                    |     8 +-
 .../0001-Add-missing-limits.h-include.patch   |    37 +
 srcpkgs/evtest/template                       |     6 +-
 srcpkgs/exa/template                          |     2 +-
 srcpkgs/exec-on-git-staged/template           |    16 +
 srcpkgs/execline/template                     |     4 +-
 srcpkgs/exiftool/template                     |     4 +-
 srcpkgs/exiv2/patches/musl.patch              |    23 -
 srcpkgs/exiv2/template                        |    13 +-
 srcpkgs/expat/template                        |     6 +-
 srcpkgs/expect/template                       |    10 +-
 srcpkgs/extra-cmake-modules/template          |     4 +-
 srcpkgs/extrace/template                      |     3 +-
 srcpkgs/extractpdfmark/template               |     2 +-
 srcpkgs/f2fs-tools/template                   |     6 +-
 srcpkgs/faketime/template                     |    10 +-
 srcpkgs/fastmod/template                      |     4 +-
 srcpkgs/fatrace/template                      |     9 +-
 srcpkgs/fava/template                         |    10 +-
 srcpkgs/fd/template                           |     4 +-
 srcpkgs/fdk-aac/template                      |     4 +-
 srcpkgs/fetchmail/patches/patch-socket_c.diff |    21 -
 srcpkgs/fetchmail/template                    |    10 +-
 srcpkgs/ffcall/template                       |     4 +-
 srcpkgs/ffmpeg/template                       |    14 +-
 srcpkgs/ffmpegthumbnailer/template            |    15 +-
 srcpkgs/ffmpegthumbs/template                 |     4 +-
 srcpkgs/ffsend/template                       |     4 +-
 srcpkgs/ffuf/template                         |    16 +
 srcpkgs/fierce/template                       |    15 +
 srcpkgs/figurine/template                     |     6 +-
 srcpkgs/file-roller/template                  |     4 +-
 srcpkgs/filelight/template                    |    11 +-
 srcpkgs/filezilla/template                    |     4 +-
 .../findutils/patches/gnulib-freadahead.patch |    11 -
 srcpkgs/findutils/patches/gnulib-fseeko.patch |    21 -
 .../findutils/patches/gnulib-mountlist.patch  |    15 -
 .../findutils/patches/gnulib-stdio-impl.patch |    14 -
 srcpkgs/findutils/template                    |    12 +-
 srcpkgs/fio/template                          |     4 +-
 srcpkgs/firebird3/template                    |     7 +
 ...irefox-esr-i18n-as => firefox-esr-i18n-bn} |     0
 ...-esr-i18n-bn-BD => firefox-esr-i18n-en-CA} |     0
 ...fox-esr-i18n-bn-IN => firefox-esr-i18n-ia} |     0
 ...-esr-i18n-en-ZA => firefox-esr-i18n-ne-NP} |     0
 ...refox-esr-i18n-mai => firefox-esr-i18n-oc} |     0
 srcpkgs/firefox-esr-i18n-or                   |     1 -
 ...irefox-esr-i18n-ml => firefox-esr-i18n-ur} |     0
 .../firefox-esr-i18n/files/update-lang-list   |     1 +
 srcpkgs/firefox-esr-i18n/template             |   202 +-
 srcpkgs/firefox-esr/files/mozconfig           |     6 -
 .../disable-image-format-warning.patch        |    15 +
 .../patches/fix-arm-opus-include.patch        |    11 +
 .../firefox-esr/patches/fix-i686-musl.patch   |     9 -
 srcpkgs/firefox-esr/patches/fix-toolkit.patch |    35 +-
 srcpkgs/firefox-esr/patches/fix-tools.patch   |    31 +-
 .../firefox-esr/patches/fix-wasm-arm.patch    |    15 +
 .../firefox-esr/patches/fix-webrtc-arm.patch  |    11 -
 .../patches/fix-webrtc-glibcisms.patch        |    17 +-
 srcpkgs/firefox-esr/patches/fix-xpcom.patch   |    11 -
 .../patches/gettid-musl.patch}                |     0
 srcpkgs/firefox-esr/patches/mallinfo.patch    |    40 +-
 .../patches/ppc-no-static-sizes.patch         |    19 -
 .../patches/remove-rustc-check.patch          |    18 +-
 .../firefox-esr/patches/rust-cssparser.patch  |    90 +
 .../patches/rust-unitialized-field.patch      |    19 -
 srcpkgs/firefox-esr/patches/rust133.patch     |    24 -
 ...nd-restore-non-volatile-x28-on-arm64.patch |    64 -
 ...-clobbering-it-in-the-regex-compiler.patch |    97 -
 srcpkgs/firefox-esr/patches/sndio.patch       |    12 +-
 srcpkgs/firefox-esr/patches/yuv-be.patch      |    48 +
 srcpkgs/firefox-esr/template                  |    33 +-
 srcpkgs/firefox-i18n-bn                       |     1 +
 srcpkgs/firefox-i18n-en-CA                    |     1 +
 srcpkgs/firefox-i18n-ia                       |     1 +
 srcpkgs/firefox-i18n-ne-NP                    |     1 +
 srcpkgs/firefox-i18n-oc                       |     1 +
 srcpkgs/firefox-i18n-ur                       |     1 +
 srcpkgs/firefox-i18n/files/update-lang-list   |    81 +
 srcpkgs/firefox-i18n/template                 |   188 +-
 srcpkgs/firefox/files/firefox-wayland         |     5 +-
 .../patches/initialize_sched_param.patch      |    22 +
 .../firefox/patches/ppc64le-bug-1512162.patch |    50 -
 srcpkgs/firefox/template                      |    36 +-
 srcpkgs/fish-shell/template                   |     2 +-
 srcpkgs/flac/template                         |     5 +-
 srcpkgs/flacon/template                       |     4 +-
 srcpkgs/flake8/template                       |     6 +-
 srcpkgs/flatbuffers/patches/install.patch     |    20 -
 srcpkgs/flatbuffers/template                  |    12 +-
 srcpkgs/flatpak-builder/template              |     4 +-
 srcpkgs/flatpak/template                      |     6 +-
 srcpkgs/fldigi/template                       |     4 +-
 .../patches/00-add-bin-directories.patch      |    10 +-
 srcpkgs/flowblade/template                    |     8 +-
 srcpkgs/fmt/template                          |     2 +-
 srcpkgs/fmtools/template                      |    11 +
 srcpkgs/focuswriter/template                  |     4 +-
 srcpkgs/foliate/template                      |     6 +-
 srcpkgs/folks/template                        |     8 +-
 srcpkgs/font-FixedMisc/template               |     4 +-
 srcpkgs/font-Hasklig/template                 |     2 +-
 srcpkgs/font-awesome5/template                |     6 +-
 srcpkgs/font-firacode/template                |     4 +-
 srcpkgs/font-ibm-plex-ttf/template            |     4 +-
 srcpkgs/font-ionicons-ttf/template            |     4 +-
 srcpkgs/font-iosevka/template                 |     4 +-
 .../font-material-design-icons-ttf/template   |     2 +-
 srcpkgs/font-mplus-ttf/template               |     6 +-
 srcpkgs/font-sarasa-gothic/template           |     4 +-
 srcpkgs/font-spleen/template                  |     8 +-
 srcpkgs/font-unifont-bdf/template             |     4 +-
 srcpkgs/font-util/template                    |     8 +-
 srcpkgs/font-vazir/template                   |     4 +-
 srcpkgs/forkstat/template                     |     4 +-
 srcpkgs/fossil/template                       |     7 +-
 srcpkgs/fotoxx/template                       |     5 +-
 srcpkgs/four-in-a-row/template                |     8 +-
 srcpkgs/fpc-src/template                      |     2 +-
 srcpkgs/frameworkintegration/template         |     4 +-
 .../patches/020-namespace-missing-std.patch   |   127 +
 srcpkgs/freecad/template                      |     2 +-
 srcpkgs/freecell-solver/template              |     8 +-
 srcpkgs/freeipmi/template                     |     4 +-
 srcpkgs/fribidi/template                      |     6 +-
 srcpkgs/frp/template                          |     4 +-
 srcpkgs/fselect/template                      |     4 +-
 srcpkgs/fuse-mp3fs/template                   |    14 +
 srcpkgs/fuse-overlayfs/template               |     6 +-
 srcpkgs/fuse-zip/template                     |     4 +-
 srcpkgs/fuse3/template                        |     4 +-
 srcpkgs/fvwm/template                         |     6 +-
 srcpkgs/fwup/template                         |     8 +-
 srcpkgs/fwupd/template                        |     6 +-
 srcpkgs/fwupdate/template                     |     2 +-
 srcpkgs/g810-led/template                     |     4 +-
 srcpkgs/gallery-dl/template                   |    14 +-
 srcpkgs/gc/template                           |     2 +-
 srcpkgs/gcc/files/gccgo-musl.patch            |   200 +
 srcpkgs/gcc/patches/bug90756.patch            |    23 -
 srcpkgs/gcc/patches/darn.patch                |   504 +
 srcpkgs/gcc/patches/libffi_gnulinux.patch     |    11 +
 srcpkgs/gcc/patches/non-nullness.patch        |    88 -
 srcpkgs/gcc/template                          |    56 +-
 srcpkgs/gcdemu/template                       |     4 +-
 srcpkgs/gcompris-qt/template                  |     4 +-
 srcpkgs/gdb/template                          |     8 +-
 srcpkgs/gdm/template                          |     6 +-
 srcpkgs/geany-plugins/template                |     7 +-
 srcpkgs/geany/template                        |     6 +-
 srcpkgs/geary/template                        |    10 +-
 srcpkgs/geckodriver/template                  |     4 +-
 srcpkgs/geda/patches/snarf_cpp_opts.patch     |    17 +
 srcpkgs/geda/template                         |    23 +-
 srcpkgs/gerbera/template                      |     4 +-
 srcpkgs/getmail/template                      |     6 +-
 srcpkgs/gfuzz/template                        |    14 +
 srcpkgs/giflib/template                       |     2 +-
 srcpkgs/gifski/template                       |     8 +-
 srcpkgs/gip/template                          |     9 +-
 srcpkgs/girara/template                       |     8 +-
 srcpkgs/git-cola/template                     |     4 +-
 srcpkgs/git-mediate/template                  |    14 +
 srcpkgs/git-revise/template                   |     7 +-
 srcpkgs/github-opml/template                  |     2 +-
 srcpkgs/gitlab-runner/template                |     4 +-
 srcpkgs/gjs/template                          |     4 +-
 srcpkgs/glances/template                      |     6 +-
 srcpkgs/glib-networking/template              |     4 +-
 srcpkgs/glib/template                         |     4 +-
 srcpkgs/glibmm/template                       |     4 +-
 srcpkgs/glslViewer/template                   |     2 +-
 srcpkgs/glslang/template                      |     2 +-
 srcpkgs/glusterfs/template                    |     4 +-
 srcpkgs/gmic/template                         |     4 +-
 srcpkgs/gmime3/template                       |     6 +-
 srcpkgs/gnome-backgrounds/template            |     4 +-
 srcpkgs/gnome-bluetooth/template              |     6 +-
 srcpkgs/gnome-books/template                  |     4 +-
 .../patches/dont-require-FNM_EXTMATCH.patch   |    25 -
 srcpkgs/gnome-builder/template                |     8 +-
 srcpkgs/gnome-calendar/template               |     4 +-
 srcpkgs/gnome-chess/template                  |     4 +-
 srcpkgs/gnome-clocks/template                 |     6 +-
 .../gnome-contacts/patches/ambiguous.patch    |    14 -
 srcpkgs/gnome-contacts/template               |     6 +-
 srcpkgs/gnome-control-center/template         |     4 +-
 srcpkgs/gnome-desktop/template                |     4 +-
 srcpkgs/gnome-documents/template              |     2 +-
 srcpkgs/gnome-flashback/template              |     6 +-
 srcpkgs/gnome-font-viewer/template            |     4 +-
 srcpkgs/gnome-games/template                  |     7 +-
 srcpkgs/gnome-getting-started-docs/template   |     4 +-
 srcpkgs/gnome-initial-setup/template          |     8 +-
 srcpkgs/gnome-klotski/template                |     6 +-
 srcpkgs/gnome-mahjongg/template               |     6 +-
 srcpkgs/gnome-mines/template                  |     4 +-
 srcpkgs/gnome-mpv                             |     1 +
 srcpkgs/gnome-mpv/template                    |    13 -
 srcpkgs/gnome-nibbles/template                |    12 +-
 srcpkgs/gnome-online-accounts/template        |     6 +-
 srcpkgs/gnome-online-miners/template          |     4 +-
 srcpkgs/gnome-panel/template                  |     6 +-
 srcpkgs/gnome-passwordsafe/template           |     5 +-
 srcpkgs/gnome-robots/template                 |     6 +-
 srcpkgs/gnome-screensaver/template            |     2 +-
 srcpkgs/gnome-session/template                |     6 +-
 srcpkgs/gnome-settings-daemon/template        |    11 +-
 srcpkgs/gnome-shell-extensions/template       |     4 +-
 srcpkgs/gnome-shell/template                  |     8 +-
 srcpkgs/gnome-ssh-askpass/template            |     4 +-
 srcpkgs/gnome-sudoku/template                 |     4 +-
 srcpkgs/gnome-tetravex/template               |     4 +-
 ...bc4dd0c6c804a093b94c269461ce376fed4f.patch |    30 -
 .../patches/gnome-todo-eds-libecal-2.0.patch  |   567 +
 srcpkgs/gnome-todo/template                   |     8 +-
 srcpkgs/gnome-tweaks/template                 |     8 +-
 srcpkgs/gnome-user-docs/template              |     4 +-
 srcpkgs/gnu-efi-libs/template                 |     8 +-
 srcpkgs/gnucash/template                      |     6 +-
 srcpkgs/gnumeric/template                     |     2 +-
 .../patches/use-versioned-pcsclite.patch      |    11 +
 srcpkgs/gnupg2/template                       |     9 +-
 srcpkgs/gnutls/template                       |     7 +-
 srcpkgs/go-for-it/template                    |     4 +-
 srcpkgs/go-jira/template                      |    24 +-
 srcpkgs/go-md2man/template                    |     2 +-
 srcpkgs/go-review/template                    |    18 +
 .../go/patches/gohostarch-bootstrap-fix.patch |    28 +
 srcpkgs/go/template                           |     4 +-
 srcpkgs/gocryptfs/template                    |     6 +-
 srcpkgs/godot/template                        |     6 +-
 srcpkgs/golangci-lint/template                |     4 +-
 srcpkgs/golly/template                        |     6 +-
 srcpkgs/gomatrix/template                     |    17 +
 srcpkgs/goodvibes/template                    |     4 +-
 srcpkgs/google-chrome/template                |     6 +-
 srcpkgs/google-cloud-sdk/template             |     5 +-
 srcpkgs/googler/template                      |     2 +-
 srcpkgs/gopls/template                        |    20 +
 srcpkgs/goversion/template                    |     2 +-
 .../patches/elf-mem-image-musl.patch          |    13 +
 srcpkgs/gperftools/patches/ppc-musl.patch     |    76 +
 srcpkgs/gperftools/template                   |    22 +-
 srcpkgs/gpgme/template                        |    14 +-
 srcpkgs/gpodder/template                      |     5 +-
 srcpkgs/gpsim/template                        |     8 +-
 srcpkgs/gradle/template                       |     8 +-
 srcpkgs/grafana/template                      |     4 +-
 srcpkgs/gramps/template                       |     6 +-
 srcpkgs/granite/template                      |    10 +-
 srcpkgs/grantleetheme/template                |     4 +-
 srcpkgs/graphene/template                     |     9 +-
 srcpkgs/grpc/template                         |    15 +-
 srcpkgs/grub/files/kernel.d/grub.post         |     2 +
 srcpkgs/grub/template                         |     2 +-
 srcpkgs/gscan2pdf/template                    |     4 +-
 srcpkgs/gsettings-desktop-schemas/template    |     6 +-
 srcpkgs/gsl/patches/ppc-musl.patch            |    36 +
 srcpkgs/gst-libav/template                    |     4 +-
 srcpkgs/gst-omx/template                      |     4 +-
 srcpkgs/gst-plugins-bad1/template             |     6 +-
 srcpkgs/gst-plugins-base1/template            |     4 +-
 srcpkgs/gst-plugins-good1/template            |     6 +-
 srcpkgs/gst-plugins-ugly1/template            |     4 +-
 srcpkgs/gst1-editing-services/template        |     4 +-
 srcpkgs/gst1-python/template                  |     4 +-
 srcpkgs/gst1-python3/template                 |     4 +-
 srcpkgs/gstreamer-vaapi/template              |     4 +-
 srcpkgs/gstreamer1/template                   |     4 +-
 srcpkgs/gtk+3/template                        |     4 +-
 srcpkgs/gtk3-nocsd/template                   |    12 +-
 srcpkgs/gtk4/template                         |    10 +-
 srcpkgs/gtkwave/template                      |     4 +-
 srcpkgs/gucci/template                        |    17 +
 srcpkgs/guitarix2/patches/musl.patch          |    15 -
 srcpkgs/guitarix2/template                    |    13 +-
 srcpkgs/gummiboot/template                    |     2 +-
 srcpkgs/gutenprint/patches/musl.patch         |    19 -
 srcpkgs/gutenprint/template                   |     4 +-
 srcpkgs/gvfs/template                         |     8 +-
 srcpkgs/gwenview/template                     |     4 +-
 srcpkgs/gxi                                   |     1 +
 srcpkgs/gxi/template                          |    23 -
 srcpkgs/h2o/template                          |     9 +-
 srcpkgs/harfbuzz/template                     |     6 +-
 srcpkgs/haveged/template                      |     8 +-
 srcpkgs/help2man/template                     |     6 +-
 srcpkgs/hexchat/template                      |     2 +-
 srcpkgs/hexyl/template                        |     6 +-
 srcpkgs/hiawatha/template                     |     4 +-
 srcpkgs/hitori/template                       |     6 +-
 srcpkgs/homebank/template                     |     6 +-
 srcpkgs/hopper/template                       |     4 +-
 srcpkgs/hplip/template                        |     4 +-
 srcpkgs/httpie/template                       |     6 +-
 srcpkgs/hub/template                          |     4 +-
 srcpkgs/hugo/template                         |     4 +-
 srcpkgs/hunspell-en_AU/template               |     4 +-
 srcpkgs/hunspell-en_GB-ize/template           |    12 +-
 srcpkgs/hunspell-en_US/template               |    10 +-
 srcpkgs/hunspell-es_ES/template               |     4 +-
 srcpkgs/hunspell-pl_PL/template               |     4 +-
 srcpkgs/hwids/template                        |     6 +-
 srcpkgs/hydroxide/template                    |     5 +-
 srcpkgs/hyperfine/template                    |     6 +-
 srcpkgs/i2pd/template                         |     4 +-
 srcpkgs/i3-gaps/template                      |     4 +-
 srcpkgs/i3/template                           |     4 +-
 srcpkgs/i3lock-color/template                 |     6 +-
 srcpkgs/i3lock-fancy/template                 |     2 +-
 srcpkgs/i3status-rust/patches/fix-32bit.patch |    16 +-
 srcpkgs/i3status-rust/template                |    10 +-
 .../patches/pulseaudio-optional.patch         |    95 +
 srcpkgs/i3status/template                     |    41 +-
 srcpkgs/iagno/template                        |     8 +-
 srcpkgs/ibus-bamboo/template                  |     4 +-
 srcpkgs/ibus-m17n/INSTALL.msg                 |     2 +
 srcpkgs/ibus-m17n/template                    |    19 +
 srcpkgs/icdiff/template                       |     6 +-
 srcpkgs/ice-ssb/template                      |     4 +-
 .../patches/fix-gettid.patch}                 |     5 +-
 srcpkgs/icecat/patches/fix-musl.patch         |    11 -
 srcpkgs/icecat/patches/rust-cssparser.patch   |    90 +
 srcpkgs/icecat/template                       |    12 +
 srcpkgs/icewm/patches/use-NULL.patch          |    45 -
 srcpkgs/icewm/template                        |    22 +-
 srcpkgs/iio-sensor-proxy/template             |     4 +-
 srcpkgs/imgp/template                         |     2 +-
 srcpkgs/immortal/template                     |     2 +-
 srcpkgs/imv/template                          |    11 +-
 srcpkgs/incidenceeditor/template              |     6 +-
 srcpkgs/include-what-you-use/template         |     2 +-
 srcpkgs/influxdb/template                     |     4 +-
 srcpkgs/inkscape/template                     |     2 +-
 srcpkgs/innoextract/template                  |    10 +-
 srcpkgs/intel-ucode/template                  |     4 +-
 .../intellij-idea-community-edition/template  |    15 +-
 srcpkgs/inxi/template                         |     6 +-
 srcpkgs/io.elementary.calendar/template       |     9 +-
 srcpkgs/io.elementary.code/template           |     2 +-
 srcpkgs/io.elementary.files/template          |     8 +-
 srcpkgs/ipe/template                          |    11 +-
 srcpkgs/iperf/template                        |     2 +-
 srcpkgs/iperf3/template                       |     2 +-
 srcpkgs/iproute2/template                     |     4 +-
 srcpkgs/ipv6calc/template                     |     4 +-
 srcpkgs/ipvsadm/template                      |     8 +-
 srcpkgs/irssi/template                        |     6 +-
 srcpkgs/iso-codes/template                    |     4 +-
 srcpkgs/ispc/template                         |     8 +-
 srcpkgs/iverilog/template                     |     6 +-
 srcpkgs/iwd/template                          |    10 +-
 srcpkgs/jack/template                         |    38 +-
 srcpkgs/jansson/template                      |     2 +-
 .../jbig2dec/patches/2002_abi_compat.patch    |    24 +
 srcpkgs/jbig2dec/template                     |     6 +-
 srcpkgs/jdupes/template                       |     4 +-
 srcpkgs/jemalloc/template                     |     4 +-
 srcpkgs/jenkins/files/jenkins/run             |     2 +-
 srcpkgs/jenkins/template                      |     6 +-
 srcpkgs/jgmenu/template                       |     4 +-
 srcpkgs/jmol/template                         |     4 +-
 srcpkgs/jreen-qt5                             |     1 +
 srcpkgs/jreen-qt5-devel                       |     2 +-
 srcpkgs/jreen-qt5/template                    |    28 -
 srcpkgs/jreen/template                        |    37 +-
 srcpkgs/json-glib/template                    |     2 +-
 srcpkgs/jsonnet/template                      |     5 +-
 srcpkgs/juCi++/patches/libgit2-0.28.patch     |    23 -
 srcpkgs/juCi++/template                       |    14 +-
 srcpkgs/juk/template                          |     4 +-
 srcpkgs/julia/template                        |    10 +-
 srcpkgs/jwm-settings-manager/template         |     2 +-
 srcpkgs/k3b/template                          |     4 +-
 srcpkgs/k3s/files/k3s-agent/log/run           |     2 +
 srcpkgs/k3s/files/k3s-agent/run               |    10 +
 srcpkgs/k3s/files/k3s-server/log/run          |     2 +
 srcpkgs/k3s/files/k3s-server/run              |     5 +
 srcpkgs/k3s/template                          |    65 +
 srcpkgs/kColorPicker-devel                    |     1 +
 srcpkgs/kColorPicker/template                 |    28 +
 srcpkgs/kImageAnnotator-devel                 |     1 +
 srcpkgs/kImageAnnotator/template              |    28 +
 srcpkgs/kaccounts-integration/template        |     4 +-
 srcpkgs/kaccounts-providers/template          |     4 +-
 srcpkgs/kactivities5-stats/template           |     5 +-
 srcpkgs/kactivities5/template                 |     5 +-
 srcpkgs/kactivitymanagerd/template            |     4 +-
 srcpkgs/kaddressbook/template                 |     6 +-
 srcpkgs/kak-lsp/template                      |     4 +-
 srcpkgs/kalarm/template                       |     6 +-
 srcpkgs/kalarmcal/template                    |     4 +-
 srcpkgs/kapidox/template                      |     4 +-
 srcpkgs/karchive/template                     |     4 +-
 srcpkgs/kate5/template                        |     4 +-
 srcpkgs/kauth/template                        |     4 +-
 srcpkgs/kbfs                                  |     1 +
 srcpkgs/kbfs/template                         |    23 -
 srcpkgs/kbookmarks/template                   |     4 +-
 srcpkgs/kcachegrind/template                  |     8 +-
 srcpkgs/kcalc/template                        |     6 +-
 srcpkgs/kcalcore/template                     |     4 +-
 srcpkgs/kcalutils/template                    |     4 +-
 srcpkgs/kcharselect/template                  |     4 +-
 srcpkgs/kcmutils/template                     |     4 +-
 srcpkgs/kcodecs/template                      |     4 +-
 srcpkgs/kcolorchooser/template                |     4 +-
 srcpkgs/kcompletion/template                  |     5 +-
 srcpkgs/kconfig/template                      |     4 +-
 srcpkgs/kconfigwidgets/template               |     5 +-
 srcpkgs/kcontacts/template                    |     9 +-
 srcpkgs/kcoreaddons/template                  |     4 +-
 srcpkgs/kcrash/template                       |     4 +-
 srcpkgs/kcron/template                        |     8 +-
 srcpkgs/kdav/template                         |     4 +-
 srcpkgs/kdbusaddons/template                  |     4 +-
 srcpkgs/kde-cli-tools/template                |     4 +-
 srcpkgs/kde-gtk-config5/template              |     6 +-
 srcpkgs/kde5-baseapps/template                |     2 +-
 srcpkgs/kde5/template                         |    53 +-
 srcpkgs/kdeclarative/template                 |     4 +-
 srcpkgs/kdecoration/template                  |     4 +-
 srcpkgs/kded/template                         |     4 +-
 srcpkgs/kdegraphics-mobipocket/template       |     4 +-
 srcpkgs/kdegraphics-thumbnailers/template     |     4 +-
 srcpkgs/kdelibs4support/template              |     5 +-
 srcpkgs/kdenlive/template                     |     4 +-
 srcpkgs/kdepim-apps-libs/template             |     6 +-
 srcpkgs/kdepim-runtime/template               |     6 +-
 srcpkgs/kdeplasma-addons5/template            |     4 +-
 srcpkgs/kdesignerplugin/template              |     6 +-
 srcpkgs/kdesu/template                        |     4 +-
 srcpkgs/kdevelop-php/template                 |     4 +-
 srcpkgs/kdevelop-python/template              |     8 +-
 srcpkgs/kdevelop/patches/use-std-c99.patch    |     9 +-
 srcpkgs/kdevelop/template                     |     6 +-
 srcpkgs/kdewebkit/template                    |     4 +-
 srcpkgs/kdialog/template                      |     4 +-
 srcpkgs/kdnssd/template                       |     4 +-
 srcpkgs/kdoctools/template                    |     4 +-
 srcpkgs/kea/patches/fix-musl-getopt.patch     |    10 -
 srcpkgs/kea/template                          |     9 +-
 srcpkgs/keditbookmarks/template               |     9 +-
 srcpkgs/keepalived/template                   |     6 +-
 srcpkgs/kemoticons/template                   |     4 +-
 srcpkgs/keybase-desktop/template              |     6 +-
 .../{kbfs/INSTALL => keybase/kbfs.INSTALL}    |     0
 srcpkgs/keybase/template                      |    25 +-
 srcpkgs/keyutils/template                     |     9 +-
 srcpkgs/kfilemetadata5/template               |     5 +-
 srcpkgs/kfind/template                        |     6 +-
 srcpkgs/kgamma5/template                      |     4 +-
 srcpkgs/kget/template                         |     4 +-
 srcpkgs/kglobalaccel/template                 |     4 +-
 srcpkgs/kgpg/template                         |    22 +
 srcpkgs/kguiaddons/template                   |     4 +-
 srcpkgs/khelpcenter/template                  |     4 +-
 srcpkgs/kholidays/template                    |     4 +-
 srcpkgs/khotkeys/template                     |     4 +-
 srcpkgs/khtml/template                        |     4 +-
 srcpkgs/ki18n/template                        |     4 +-
 srcpkgs/kiconthemes/template                  |     5 +-
 srcpkgs/kidentitymanagement/template          |     4 +-
 srcpkgs/kidletime/template                    |     4 +-
 srcpkgs/kig/template                          |    11 +-
 srcpkgs/kimageformats/template                |     4 +-
 srcpkgs/kimap/template                        |     4 +-
 srcpkgs/kinfocenter/template                  |     4 +-
 srcpkgs/kinit/template                        |     4 +-
 srcpkgs/kio-extras/template                   |     4 +-
 srcpkgs/kio-gdrive/template                   |     4 +-
 srcpkgs/kio/template                          |     5 +-
 srcpkgs/kirigami2/template                    |     5 +-
 srcpkgs/kismet/template                       |     4 +-
 srcpkgs/kitemmodels/template                  |     4 +-
 srcpkgs/kitemviews/template                   |     5 +-
 srcpkgs/kitty/patches/musl.patch              |    37 -
 srcpkgs/kitty/template                        |     4 +-
 srcpkgs/kiwix-lib/template                    |     4 +-
 srcpkgs/kiwix-tools/template                  |     6 +-
 srcpkgs/kjobwidgets/template                  |     4 +-
 srcpkgs/kjs/template                          |     4 +-
 srcpkgs/kjsembed/template                     |     8 +-
 srcpkgs/kldap/template                        |     4 +-
 srcpkgs/kmag/template                         |     6 +-
 srcpkgs/kmail-account-wizard/template         |     4 +-
 srcpkgs/kmail/template                        |     6 +-
 srcpkgs/kmailtransport/template               |     4 +-
 srcpkgs/kmbox/template                        |     4 +-
 srcpkgs/kmediaplayer/template                 |     4 +-
 srcpkgs/kmenuedit/template                    |     4 +-
 srcpkgs/kmime/template                        |     4 +-
 srcpkgs/kmix/template                         |     6 +-
 srcpkgs/kmymoney/template                     |     2 +-
 srcpkgs/knewstuff/template                    |     4 +-
 srcpkgs/knights/template                      |     4 +-
 srcpkgs/knot-resolver/files/kresd/run         |     2 +-
 srcpkgs/knot-resolver/template                |     6 +-
 srcpkgs/knot/template                         |     4 +-
 srcpkgs/knotes/template                       |     6 +-
 srcpkgs/knotifications/template               |     4 +-
 srcpkgs/knotifyconfig/template                |     4 +-
 .../kodi-addon-inputstream-adaptive/template  |     4 +-
 srcpkgs/kodi-addon-pvr-iptvsimple/template    |     4 +-
 srcpkgs/kodi-rpi/files/swig.nojava-18.3       |     1 -
 srcpkgs/kodi-rpi/files/swig.nojava-18.4       |     1 +
 srcpkgs/kodi-rpi/files/xbmc-standalone/run    |     1 +
 srcpkgs/kodi-rpi/template                     |     6 +-
 .../AddonModuleXbmc.i.cpp                     |     2 +-
 .../AddonModuleXbmc.i.xml                     | 12232 ++---
 .../AddonModuleXbmcaddon.i.cpp                |     2 +-
 .../AddonModuleXbmcaddon.i.xml                |  1518 +-
 .../AddonModuleXbmcdrm.i.cpp                  |     2 +-
 .../AddonModuleXbmcdrm.i.xml                  |  1492 +-
 .../AddonModuleXbmcgui.i.cpp                  |     2 +-
 .../AddonModuleXbmcgui.i.xml                  | 40730 ++++++++--------
 .../AddonModuleXbmcplugin.i.cpp               |     2 +-
 .../AddonModuleXbmcplugin.i.xml               |  2724 +-
 .../AddonModuleXbmcvfs.i.cpp                  |     2 +-
 .../AddonModuleXbmcvfs.i.xml                  |  2314 +-
 .../AddonModuleXbmcwsgi.i.cpp                 |     2 +-
 .../AddonModuleXbmcwsgi.i.xml                 |  2884 +-
 srcpkgs/kodi/template                         |     4 +-
 srcpkgs/kolourpaint/template                  |    10 +-
 srcpkgs/kompare/template                      |     6 +-
 srcpkgs/konqueror/template                    |     7 +-
 srcpkgs/konquest/template                     |     4 +-
 srcpkgs/konsole/template                      |     4 +-
 srcpkgs/kontact/template                      |     4 +-
 srcpkgs/kontactinterface/template             |     4 +-
 srcpkgs/korganizer/template                   |     6 +-
 srcpkgs/kpackage/template                     |     4 +-
 srcpkgs/kparts/template                       |     4 +-
 srcpkgs/kpartx/template                       |     6 +-
 srcpkgs/kpat/template                         |     8 +-
 srcpkgs/kpeople/template                      |     4 +-
 srcpkgs/kpimtextedit/template                 |     4 +-
 srcpkgs/kplotting/template                    |     7 +-
 srcpkgs/kpty/template                         |     4 +-
 srcpkgs/kqtquickcharts/template               |     4 +-
 srcpkgs/krdc/template                         |     7 +-
 srcpkgs/krfb/template                         |     6 +-
 srcpkgs/krita/patches/musl.patch              |    11 +
 srcpkgs/krita/template                        |     5 +-
 srcpkgs/kross/template                        |     8 +-
 srcpkgs/kruler/template                       |    11 +-
 srcpkgs/krunner/template                      |     4 +-
 srcpkgs/krusader/template                     |     6 +-
 srcpkgs/kscreen/template                      |    10 +-
 srcpkgs/kscreenlocker/template                |     4 +-
 srcpkgs/kservice/template                     |     4 +-
 srcpkgs/ksh/files/LICENSE                     |   229 -
 srcpkgs/ksh/template                          |    27 +-
 srcpkgs/ksmtp/template                        |     4 +-
 srcpkgs/ksnip/patches/useGNUInstallDirs.patch |    10 +
 srcpkgs/ksnip/template                        |    14 +
 srcpkgs/ksolid/template                       |     4 +-
 srcpkgs/ksshaskpass/template                  |     4 +-
 srcpkgs/ksysguard/template                    |     4 +-
 srcpkgs/ksystemlog/template                   |    15 +-
 srcpkgs/kteatime/template                     |    11 +-
 srcpkgs/ktexteditor/template                  |     4 +-
 srcpkgs/ktextwidgets/template                 |     4 +-
 srcpkgs/ktnef/template                        |     6 +-
 srcpkgs/ktouch/template                       |     4 +-
 srcpkgs/ktuberling/template                   |     4 +-
 srcpkgs/kturtle/template                      |     6 +-
 srcpkgs/kubecfg/template                      |     4 +-
 srcpkgs/kubernetes/template                   |     4 +-
 srcpkgs/kunitconversion/template              |     4 +-
 srcpkgs/kvantum/template                      |     4 +-
 srcpkgs/kvirc/template                        |     2 +-
 srcpkgs/kwallet-pam/template                  |     4 +-
 srcpkgs/kwallet/template                      |     4 +-
 srcpkgs/kwalletmanager/template               |    11 +-
 srcpkgs/kwayland-integration/template         |     6 +-
 srcpkgs/kwayland/template                     |     4 +-
 srcpkgs/kwidgetsaddons/template               |     4 +-
 srcpkgs/kwin/template                         |     8 +-
 srcpkgs/kwindowsystem/template                |     4 +-
 srcpkgs/kwrited/template                      |     4 +-
 srcpkgs/kxmlgui/template                      |     4 +-
 srcpkgs/kxmlrpcclient/template                |     4 +-
 srcpkgs/latte-dock/template                   |     4 +-
 srcpkgs/lazarus/template                      |     2 +-
 srcpkgs/lazydocker/template                   |     4 +-
 srcpkgs/lazygit/template                      |     6 +-
 srcpkgs/lbreakouthd/template                  |     4 +-
 srcpkgs/lego/template                         |     7 +-
 srcpkgs/lesspipe/template                     |     8 +-
 srcpkgs/libArcus/template                     |     4 +-
 srcpkgs/libGL/patches/add-glx-use-tls.patch   |    47 -
 srcpkgs/libGL/patches/add-use-elf-tls.patch   |    28 +
 srcpkgs/libGL/patches/musl.patch              |    40 +-
 srcpkgs/libGL/patches/ppc-auxval.patch        |    55 +
 srcpkgs/libGL/template                        |    38 +-
 srcpkgs/libICE/template                       |     7 +-
 srcpkgs/libSM/template                        |     2 +-
 srcpkgs/libSavitar/template                   |     6 +-
 srcpkgs/libX11/template                       |     4 +-
 srcpkgs/libXau/template                       |     2 +-
 srcpkgs/libXcomposite/template                |     2 +-
 srcpkgs/libXcursor/template                   |     2 +-
 srcpkgs/libXdamage/template                   |     2 +-
 srcpkgs/libXext/template                      |     2 +-
 srcpkgs/libXfont2/template                    |     6 +-
 srcpkgs/libXft/template                       |     2 +-
 srcpkgs/libXmu/template                       |     2 +-
 srcpkgs/libXpresent/template                  |     2 +-
 srcpkgs/libXrandr/template                    |     2 +-
 srcpkgs/libXvMC/template                      |     2 +-
 srcpkgs/libXxf86dga/template                  |     2 +-
 srcpkgs/libaacs/template                      |     2 +-
 srcpkgs/libabw/template                       |     6 +-
 srcpkgs/libaom/template                       |     2 +-
 srcpkgs/libappindicator/template              |     4 +-
 srcpkgs/libassuan/template                    |     2 +-
 srcpkgs/libbaseencode/template                |     2 +-
 srcpkgs/libblockdev/template                  |     2 +-
 srcpkgs/libbsd/template                       |    11 +-
 srcpkgs/libbytesize/template                  |     2 +-
 srcpkgs/libcacard/template                    |     2 +-
 srcpkgs/libcap-ng/template                    |     8 +-
 srcpkgs/libclc-git/template                   |     2 +-
 srcpkgs/libcloudproviders/template            |     2 +-
 ...no-include-cxx-headers-from-extern-c.patch |    19 +
 srcpkgs/libcmis/template                      |     2 +-
 srcpkgs/libcotp/template                      |     2 +-
 srcpkgs/libcxx/patches/ppc.patch              |    22 +
 srcpkgs/libcxx/template                       |    25 +-
 srcpkgs/libcxxabi/template                    |    22 +-
 srcpkgs/libdazzle/template                    |     4 +-
 srcpkgs/libdrm/template                       |     2 +-
 srcpkgs/libdwarf/template                     |     4 +-
 srcpkgs/libebml/template                      |     2 +-
 srcpkgs/libfakekey/template                   |     2 +-
 srcpkgs/libfilezilla/template                 |     4 +-
 srcpkgs/libfontenc/template                   |     2 +-
 srcpkgs/libgcrypt/template                    |     7 +-
 srcpkgs/libgdiplus/template                   |     9 +-
 srcpkgs/libgit2-0.27/template                 |    28 -
 srcpkgs/libgit2-0.27/update                   |     3 -
 srcpkgs/libgnome-games-support/template       |     4 +-
 srcpkgs/libgravatar/template                  |     4 +-
 srcpkgs/libgta/template                       |     5 +-
 srcpkgs/libgusb/template                      |     2 +-
 .../patches/conditionalize-gir.patch          |   130 -
 srcpkgs/libgweather/template                  |     4 +-
 srcpkgs/libheif/template                      |     4 +-
 srcpkgs/libhtp/template                       |     2 +-
 srcpkgs/libical/template                      |    22 +-
 srcpkgs/libinput/template                     |     6 +-
 srcpkgs/libite/template                       |     6 +-
 srcpkgs/libjpeg-turbo/template                |     4 +-
 srcpkgs/libkcddb/template                     |    11 +-
 srcpkgs/libkdcraw5/template                   |     4 +-
 srcpkgs/libkdegames/template                  |     4 +-
 srcpkgs/libkdepim/template                    |     6 +-
 srcpkgs/libkexiv25/template                   |     4 +-
 srcpkgs/libkgapi/template                     |     6 +-
 srcpkgs/libkipi5/template                     |     4 +-
 srcpkgs/libkleo/template                      |     4 +-
 srcpkgs/libknet1-devel                        |     1 +
 srcpkgs/libknet1/patches/01_musl_fix.diff     |   210 +
 srcpkgs/libknet1/template                     |    58 +
 srcpkgs/libkomparediff2/template              |    10 +-
 srcpkgs/libksane/template                     |     4 +-
 srcpkgs/libkscreen/template                   |     4 +-
 srcpkgs/libksieve/template                    |     4 +-
 srcpkgs/libksysguard/template                 |     4 +-
 srcpkgs/liblastfm-qt5/template                |     6 +-
 srcpkgs/libllvm9                              |     1 +
 srcpkgs/libluv-devel                          |     1 +
 srcpkgs/libluv/template                       |    37 +
 srcpkgs/libmatroska/template                  |     2 +-
 srcpkgs/libmediainfo/template                 |     4 +-
 srcpkgs/libmicrodns/template                  |     4 +-
 srcpkgs/libmirage/template                    |     6 +-
 srcpkgs/libmpack/template                     |     2 +-
 srcpkgs/libnftnl/template                     |     4 +-
 srcpkgs/libnl3/patches/musl.patch             |    12 -
 srcpkgs/libnl3/template                       |     9 +-
 srcpkgs/libnotify/template                    |    18 +-
 srcpkgs/libnozzle1                            |     1 +
 srcpkgs/libnozzle1-devel                      |     1 +
 srcpkgs/libogg/template                       |    16 +-
 srcpkgs/liboping/template                     |     4 +-
 srcpkgs/libopusenc/template                   |     2 +-
 srcpkgs/libosinfo/template                    |     8 +-
 srcpkgs/libpcap/patches/fix-musl.patch        |    10 -
 srcpkgs/libpcap/template                      |     6 +-
 srcpkgs/libpipeline/template                  |     4 +-
 srcpkgs/libplacebo/template                   |     2 +-
 srcpkgs/libpsl/template                       |     5 +-
 srcpkgs/libpwquality-python3                  |     1 +
 srcpkgs/libpwquality/template                 |    29 +-
 srcpkgs/libqmatrixclient/template             |    11 +-
 srcpkgs/libqtxdg/template                     |     2 +-
 srcpkgs/libratbag/template                    |     8 +-
 srcpkgs/libraw/template                       |     4 +-
 srcpkgs/librdkafka/template                   |     4 +-
 srcpkgs/libreoffice/template                  |     5 +
 srcpkgs/librime/template                      |     4 +-
 srcpkgs/libsass/template                      |     3 +-
 srcpkgs/libsidplayfp/template                 |     4 +-
 srcpkgs/libsigsegv/patches/ppc-musl.patch     |    16 +
 srcpkgs/libsmbios/template                    |     2 +-
 srcpkgs/libtickit/template                    |     2 +-
 srcpkgs/libu2f-host/template                  |    10 +-
 srcpkgs/liburcu/template                      |     4 +-
 srcpkgs/liburing-devel                        |     1 +
 srcpkgs/liburing/template                     |    25 +
 srcpkgs/libuv/template                        |     4 +-
 srcpkgs/libva/template                        |    13 +-
 srcpkgs/libvarnishapi                         |     1 +
 srcpkgs/libvarnishapi-devel                   |     1 +
 srcpkgs/libversion/template                   |     6 +-
 srcpkgs/libvirt-python/template               |     6 +-
 srcpkgs/libvirt/template                      |    19 +-
 srcpkgs/libvoikko/template                    |     2 +-
 srcpkgs/libvpx5/template                      |     6 +
 srcpkgs/libvterm/template                     |    10 +-
 srcpkgs/libwaylandpp/template                 |     2 +-
 srcpkgs/libwebp/template                      |     2 +-
 srcpkgs/libxcb/template                       |     2 +-
 srcpkgs/libxfce4panel                         |     1 +
 srcpkgs/libxkbcommon/template                 |     2 +-
 srcpkgs/libxmlb/template                      |     2 +-
 srcpkgs/libxo/template                        |     2 +-
 srcpkgs/libyaml/template                      |     2 +-
 srcpkgs/libzim/template                       |     4 +-
 srcpkgs/libzip/template                       |     2 +-
 srcpkgs/licensechecker/template               |     2 +-
 srcpkgs/licensor/template                     |    15 +
 srcpkgs/lightsoff/template                    |     6 +-
 srcpkgs/lightzone/template                    |     2 +-
 srcpkgs/links-x11/template                    |     6 +-
 srcpkgs/links/template                        |     6 +-
 srcpkgs/linux-driver-management/template      |     2 +-
 srcpkgs/linux-firmware/template               |     7 +-
 srcpkgs/linux-tools/patches/musl.patch        |     3 +-
 srcpkgs/linux-tools/patches/turbostat.patch   |    20 -
 srcpkgs/linux-tools/template                  |     6 +-
 srcpkgs/linux/template                        |     6 +-
 srcpkgs/linux3.16/template                    |     4 +-
 srcpkgs/linux4.14/template                    |     4 +-
 srcpkgs/linux4.19/template                    |     4 +-
 srcpkgs/linux4.4/files/i386-dotconfig         |     3 +-
 srcpkgs/linux4.4/files/x86_64-dotconfig       |     3 +-
 srcpkgs/linux4.4/patches/gcc9.patch           |    18 -
 srcpkgs/linux4.4/template                     |     4 +-
 srcpkgs/linux4.9/files/arm64-dotconfig        |     3 +-
 srcpkgs/linux4.9/template                     |     4 +-
 srcpkgs/linux5.1-dbg                          |     1 -
 srcpkgs/linux5.1-headers                      |     1 -
 srcpkgs/linux5.2/files/x86_64-dotconfig       |     2 +-
 srcpkgs/linux5.2/template                     |     4 +-
 srcpkgs/linux5.3-dbg                          |     1 +
 srcpkgs/linux5.3-headers                      |     1 +
 .../files/DocBook/Makefile                    |     0
 .../files/arm-dotconfig                       |   749 +-
 .../files/arm64-dotconfig                     |   899 +-
 .../files/i386-dotconfig                      |   811 +-
 srcpkgs/{linux5.1 => linux5.3}/files/mv-debug |     0
 .../files/ppc-dotconfig                       |   620 +-
 .../files/ppc64-dotconfig                     |   765 +-
 .../files/ppc64le-dotconfig                   |   753 +-
 .../files/x86_64-dotconfig                    |   845 +-
 .../patches/ppc64-be-elfv2.patch              |     0
 .../patches/smsc95xx-mac.patch                |     0
 srcpkgs/{linux5.1 => linux5.3}/template       |    19 +-
 srcpkgs/lld                                   |     2 +-
 srcpkgs/lld-devel                             |     2 +-
 srcpkgs/lldb                                  |     2 +-
 srcpkgs/lldb-devel                            |     2 +-
 srcpkgs/llvm-libunwind/patches/ppc32.patch    |    63 +
 srcpkgs/llvm-libunwind/template               |     8 +-
 srcpkgs/llvm/template                         |     7 +-
 .../patches/llvm/llvm-003-secureplt.patch     |   164 +-
 srcpkgs/llvm8/template                        |   174 +-
 srcpkgs/llvm9/files/llvm-Config-config.h      |     9 +
 srcpkgs/llvm9/files/llvm-Config-llvm-config.h |     9 +
 .../cfe-001-fix-unwind-chain-inclusion.patch  |    44 +
 .../cfe/cfe-002-add-musl-triples.patch        |    91 +
 .../cfe-003-ppc64-dynamic-linker-path.patch   |    18 +
 .../cfe/cfe-004-ppc64-musl-elfv2.patch        |    27 +
 .../files/patches/cfe/cfe-005-gcc9.patch      |    40 +
 srcpkgs/llvm9/files/patches/lldb/musl.patch   |    31 +
 .../files/patches/llvm/llvm-001-musl.patch    |    58 +
 .../llvm/llvm-002-musl-ppc64-elfv2.patch      |    31 +
 .../patches/llvm/llvm-003-secureplt.patch     |   130 +
 .../patches/llvm/llvm-004-override-opt.patch  |    18 +
 srcpkgs/llvm9/template                        |   283 +
 srcpkgs/llvm9/update                          |     2 +
 srcpkgs/logrotate/template                    |     5 +-
 srcpkgs/lok/template                          |     2 +-
 srcpkgs/lollypop/template                     |     6 +-
 srcpkgs/lowdown/patches/stdint_h.patch        |    30 -
 srcpkgs/lowdown/template                      |     4 +-
 srcpkgs/lprng/files/lprng/run                 |     4 +
 srcpkgs/lprng/template                        |    24 +
 srcpkgs/lsd/template                          |    12 +
 srcpkgs/lsyncd/files/lsyncd/log/run           |     2 +
 srcpkgs/lsyncd/files/lsyncd/run               |     3 +-
 srcpkgs/lsyncd/template                       |     4 +-
 srcpkgs/lttng-modules-dkms/template           |     6 +-
 srcpkgs/lttng-tools/template                  |     4 +-
 srcpkgs/lttng-ust/template                    |     4 +-
 srcpkgs/luaposix/template                     |    10 +-
 srcpkgs/luasec/template                       |     4 +-
 srcpkgs/lutris/template                       |     4 +-
 srcpkgs/lxqt-themes/template                  |     2 +-
 srcpkgs/lyx/template                          |     8 +-
 srcpkgs/lz4/template                          |     4 +-
 srcpkgs/magic-wormhole/template               |    21 +
 srcpkgs/mailcommon/template                   |     8 +-
 srcpkgs/mailimporter/template                 |     4 +-
 srcpkgs/maim/template                         |     2 +-
 srcpkgs/makedepend/template                   |     2 +-
 srcpkgs/mame/template                         |     4 +-
 srcpkgs/man-db/template                       |    20 +-
 srcpkgs/man-pages/template                    |     4 +-
 srcpkgs/manuskript/template                   |     4 +-
 srcpkgs/marble5/template                      |     9 +-
 srcpkgs/marco/template                        |     8 +-
 .../mariadb/patches/force-c11-atomics.patch   |   294 +
 srcpkgs/mariadb/patches/libatomic.patch       |   103 +
 srcpkgs/mariadb/patches/musl-ppc.patch        |    27 +
 srcpkgs/mariadb/template                      |    19 +-
 srcpkgs/mate-control-center/template          |     2 +-
 srcpkgs/mate-menus/template                   |    20 +-
 srcpkgs/mate-panel/template                   |     6 +-
 srcpkgs/mate-screensaver/template             |    10 +-
 srcpkgs/mate-tweak/template                   |     7 +-
 srcpkgs/mathcomp/template                     |     2 +-
 srcpkgs/mathjax/template                      |     8 +-
 srcpkgs/maxima/template                       |    13 +-
 srcpkgs/mc/template                           |     2 +-
 srcpkgs/mdevd/template                        |     6 +-
 srcpkgs/mediainfo/template                    |     4 +-
 srcpkgs/megazeux/template                     |     4 +-
 srcpkgs/menumaker/template                    |    10 +-
 srcpkgs/menutray/template                     |     6 +-
 srcpkgs/mercurial/template                    |     4 +-
 srcpkgs/meson/template                        |     9 +-
 srcpkgs/messagelib/template                   |     6 +-
 srcpkgs/mftrace/patches/gf2pbm.1.patch        |    11 +
 srcpkgs/mftrace/template                      |     8 +-
 srcpkgs/mgba/template                         |     4 +-
 srcpkgs/miller/template                       |     8 +-
 srcpkgs/milou/template                        |     6 +-
 srcpkgs/miniflux/template                     |     4 +-
 srcpkgs/minify/template                       |     4 +-
 srcpkgs/minijail/template                     |    23 +
 srcpkgs/minikube/template                     |     2 +-
 srcpkgs/minio/template                        |     7 +-
 srcpkgs/minitalk/template                     |    14 +-
 srcpkgs/mkchromecast/template                 |     2 +-
 srcpkgs/mkfontscale/template                  |     2 +-
 srcpkgs/mkinitcpio/template                   |     6 +-
 srcpkgs/mkpasswd                              |     1 +
 srcpkgs/mkvtoolnix/template                   |     4 +-
 srcpkgs/mmark/template                        |     4 +-
 srcpkgs/modemmanager-qt5/template             |     4 +-
 srcpkgs/modsecurity/template                  |     2 +-
 srcpkgs/mongoose/template                     |     6 +-
 srcpkgs/mono/patches/fix-heapviz-import.patch |    11 +
 srcpkgs/mono/patches/musl.patch               |    11 +
 srcpkgs/mono/template                         |     9 +-
 srcpkgs/monolith/template                     |    22 +
 srcpkgs/moserial/template                     |    14 +
 srcpkgs/mozo/template                         |     8 +-
 srcpkgs/mpDris2/files/mpDris2/run             |     2 +
 srcpkgs/mpDris2/template                      |    25 +
 srcpkgs/mpc/template                          |     2 +-
 srcpkgs/mpd/template                          |    11 +-
 srcpkgs/mpdcron/template                      |     2 +-
 srcpkgs/mpg123/template                       |     4 +-
 srcpkgs/mplayer/template                      |     2 +
 srcpkgs/mpop/template                         |     4 +-
 srcpkgs/msbuild-bin/template                  |     6 +-
 srcpkgs/msgpack/template                      |     6 +-
 srcpkgs/msmtp/template                        |     6 +-
 srcpkgs/mtm/template                          |    23 +
 srcpkgs/muffin/template                       |     4 +-
 .../patches/link-overlay-against-libGL.patch  |    22 +-
 srcpkgs/mumble/patches/musl-dlsym.patch       |    30 -
 srcpkgs/mumble/patches/protobuf-370.patch     |   758 -
 .../mumble/patches/speech-dispatcher.patch    |    11 -
 srcpkgs/mumble/patches/std-float.patch        |    11 -
 srcpkgs/mumble/template                       |    50 +-
 srcpkgs/musikcube/template                    |     4 +-
 srcpkgs/mutt/template                         |     8 +-
 .../mutter/patches/meta-renderer-x11.patch    |    17 -
 srcpkgs/mutter/template                       |    14 +-
 srcpkgs/mymcplus/template                     |    15 +
 srcpkgs/mysql++/template                      |    10 +-
 srcpkgs/namecoin/template                     |     6 +-
 srcpkgs/nano/template                         |     7 +-
 srcpkgs/nasa-wallpaper/template               |     4 +-
 srcpkgs/nautilus/template                     |     4 +-
 srcpkgs/nbd/template                          |     4 +-
 srcpkgs/ncdc/template                         |     6 +-
 srcpkgs/ncmpc/template                        |     4 +-
 srcpkgs/ndctl/template                        |     6 +-
 srcpkgs/neatvi/template                       |     6 +-
 srcpkgs/nemo-fileroller/template              |     6 +-
 srcpkgs/nemo/template                         |     8 +-
 srcpkgs/neofetch/template                     |     4 +-
 srcpkgs/neovim-remote/template                |     4 +-
 srcpkgs/neovim/template                       |     9 +-
 srcpkgs/nerd-fonts/template                   |     2 +-
 srcpkgs/netcdf/template                       |     4 +-
 .../netpbm/files/netpbm-security-code.patch   |    69 -
 srcpkgs/netpbm/template                       |    10 +-
 srcpkgs/nettle/template                       |     6 +-
 srcpkgs/networkmanager-qt5/template           |     4 +-
 srcpkgs/newsboat/template                     |     8 +-
 srcpkgs/next/template                         |    21 +
 srcpkgs/nftables/template                     |     9 +-
 srcpkgs/ngspice/template                      |     6 +-
 srcpkgs/nilfs-utils/patches/max-input.patch   |    12 -
 srcpkgs/nilfs-utils/patches/rpc-types.patch   |    11 -
 srcpkgs/nilfs-utils/template                  |     8 +-
 srcpkgs/nim/template                          |    28 +-
 srcpkgs/ninja/template                        |     2 +-
 srcpkgs/nix/template                          |     2 +-
 srcpkgs/nnn/template                          |     4 +-
 srcpkgs/nodejs-lts/patches/ppc32.patch        |    25 +
 srcpkgs/nodejs-lts/template                   |     6 +
 srcpkgs/nodejs/patches/ppc32.patch            |     8 +-
 srcpkgs/nodejs/template                       |     9 +-
 srcpkgs/nomad/template                        |     6 +-
 srcpkgs/nootka/template                       |     6 +-
 srcpkgs/notify-send.sh/template               |     2 +-
 srcpkgs/nsd/template                          |     4 +-
 srcpkgs/nsjail/template                       |    10 +-
 srcpkgs/nspr/template                         |     4 +-
 srcpkgs/nss/template                          |     6 +-
 srcpkgs/nsss/template                         |     6 +-
 srcpkgs/numactl/template                      |     6 +-
 srcpkgs/nvidia/template                       |     8 +-
 srcpkgs/nvidia340/files/kernel-5.0.patch      |    44 +
 srcpkgs/nvidia340/template                    |     4 +-
 .../nvidia390/files/kernel-5.1-x86_64.patch   |    29 -
 srcpkgs/nvidia390/files/kernel-5.1.patch      |   102 -
 .../nvidia390/files/kernel-5.2-x86_64.patch   |    18 -
 srcpkgs/nvidia390/template                    |    26 +-
 srcpkgs/nvme-cli/INSTALL                      |    12 +
 srcpkgs/nvme-cli/REMOVE                       |     8 +
 srcpkgs/nvme-cli/template                     |    18 +-
 srcpkgs/oblibs/template                       |     6 +-
 srcpkgs/obs/template                          |     4 +-
 srcpkgs/ocaml-findlib/template                |    10 +-
 srcpkgs/ocaml-lablgtk2/template               |     2 +-
 srcpkgs/ocaml-num/template                    |     2 +-
 srcpkgs/ocaml/template                        |     4 +-
 srcpkgs/ocamlbuild/template                   |     2 +-
 srcpkgs/occt/files/opencascade.sh             |    24 +
 srcpkgs/occt/patches/musl-fenv.patch          |    55 +-
 srcpkgs/occt/template                         |     9 +-
 srcpkgs/offlineimap/template                  |    10 +-
 srcpkgs/ofono/template                        |     8 +-
 srcpkgs/ok.sh/template                        |     2 +-
 srcpkgs/okular/template                       |     4 +-
 srcpkgs/olive/template                        |     4 +-
 srcpkgs/olm-python/template                   |     4 +-
 srcpkgs/olm/template                          |     4 +-
 srcpkgs/onionshare/template                   |     9 +-
 srcpkgs/opam/template                         |     2 +-
 srcpkgs/open-iscsi/patches/ether.patch        |    10 -
 srcpkgs/open-iscsi/patches/fix-musl-2.patch   |    10 -
 srcpkgs/open-iscsi/template                   |    20 +-
 srcpkgs/open-vm-tools/patches/gcc9.patch      |   103 -
 srcpkgs/open-vm-tools/template                |    20 +-
 srcpkgs/openbsd-netcat/template               |     8 +-
 srcpkgs/openconnect/template                  |     4 +-
 srcpkgs/opendkim/files/opendkim/run           |     3 +
 srcpkgs/opendkim/template                     |     7 +-
 srcpkgs/openldap/template                     |     3 +-
 srcpkgs/openmw/template                       |     5 +-
 srcpkgs/openresolv/template                   |     4 +-
 srcpkgs/openssh/patches/setproctitle.patch    |    10 -
 srcpkgs/openssh/template                      |     7 +-
 srcpkgs/opentmpfiles/template                 |     2 +-
 srcpkgs/openttd/template                      |     6 +-
 srcpkgs/opera/template                        |     4 +-
 srcpkgs/opus/template                         |     2 +-
 srcpkgs/orage/template                        |     2 +-
 srcpkgs/orca/template                         |     6 +-
 srcpkgs/ortp/template                         |     2 +-
 srcpkgs/osg/template                          |     2 +-
 srcpkgs/osinfo-db-tools/template              |     8 +-
 srcpkgs/osinfo-db/template                    |     6 +-
 srcpkgs/oxipng/template                       |     4 +-
 srcpkgs/oxygen-icons5/template                |     4 +-
 srcpkgs/oxygen/template                       |     4 +-
 srcpkgs/p11-kit/template                      |     4 +-
 srcpkgs/packer/template                       |     6 +-
 srcpkgs/palapeli/template                     |     4 +-
 srcpkgs/pam_rundir/patches/fix.patch          |    40 +
 srcpkgs/pam_rundir/template                   |     4 +-
 srcpkgs/pam_ssh/template                      |     6 +-
 srcpkgs/papi/patches/gnu_source.patch         |    12 +
 srcpkgs/papi/template                         |     7 +-
 srcpkgs/papirus-icon-theme/template           |     4 +-
 srcpkgs/parallel/template                     |     4 +-
 srcpkgs/paraview/template                     |    63 +
 srcpkgs/parted/patches/fix-glibc-2.27.patch   |    42 -
 srcpkgs/parted/patches/fix-includes.patch     |    10 -
 srcpkgs/parted/template                       |     6 +-
 srcpkgs/passphrase2pgp/template               |    13 +
 srcpkgs/pastel/template                       |    15 +
 srcpkgs/patchelf/template                     |     2 +-
 srcpkgs/pax/template                          |     4 +-
 srcpkgs/pcmanfm-qt/template                   |     3 +-
 srcpkgs/pd/patches/fix-musl.patch             |    15 +
 srcpkgs/pd/template                           |    10 +-
 srcpkgs/pdd/template                          |     2 +-
 srcpkgs/pdfcrack/template                     |     4 +-
 srcpkgs/pdsh/patches/fix_configure_ac.patch   |    18 +
 srcpkgs/pdsh/template                         |    40 +
 srcpkgs/peaclock/template                     |     8 +-
 srcpkgs/peek/template                         |    11 +-
 srcpkgs/pelican/template                      |     6 +-
 srcpkgs/perl-ACL-Lite/template                |     2 +-
 srcpkgs/perl-Alien-Build/template             |     6 +-
 srcpkgs/perl-Archive-Zip/template             |     8 +-
 srcpkgs/perl-Barcode-ZBar/template            |     4 +-
 srcpkgs/perl-Bit-Vector/template              |     2 +-
 srcpkgs/perl-CPAN-Meta-Check/template         |     2 +-
 srcpkgs/perl-Cairo-GObject/template           |     6 +-
 srcpkgs/perl-Cairo/template                   |    10 +-
 srcpkgs/perl-Carp-Clan/template               |     4 +-
 srcpkgs/perl-Class-Method-Modifiers/template  |     8 +-
 srcpkgs/perl-Class-XSAccessor/template        |     4 +-
 srcpkgs/perl-Clone-Choose/template            |     2 +-
 srcpkgs/perl-Clone-PP/template                |     2 +-
 srcpkgs/perl-Clone/template                   |     2 +-
 srcpkgs/perl-Config-Simple/template           |     2 +-
 srcpkgs/perl-Crypt-Blowfish/template          |     2 +-
 srcpkgs/perl-Crypt-CAST5/template             |     2 +-
 srcpkgs/perl-Crypt-DES/template               |     2 +-
 srcpkgs/perl-Crypt-IDEA/template              |     2 +-
 srcpkgs/perl-Crypt-OpenSSL-Bignum/template    |     2 +-
 srcpkgs/perl-Crypt-OpenSSL-Guess/template     |     2 +-
 srcpkgs/perl-Crypt-OpenSSL-RSA/template       |     2 +-
 srcpkgs/perl-Crypt-OpenSSL-Random/template    |     2 +-
 srcpkgs/perl-Crypt-Rijndael/template          |     8 +-
 srcpkgs/perl-CryptX/template                  |     2 +-
 srcpkgs/perl-Curses-UI/template               |    15 +
 srcpkgs/perl-Curses/template                  |     4 +-
 srcpkgs/perl-DBD-Pg/template                  |    12 +-
 srcpkgs/perl-DBD-SQLite/template              |     2 +-
 srcpkgs/perl-DBD-mysql/template               |     2 +-
 srcpkgs/perl-DBI/template                     |     2 +-
 srcpkgs/perl-Danga-Socket/template            |     2 +-
 srcpkgs/perl-Data-MessagePack/template        |     4 +-
 srcpkgs/perl-Data-Section-Simple/template     |     2 +-
 srcpkgs/perl-Data-UUID/template               |     2 +-
 srcpkgs/perl-Date-Manip/template              |     4 +-
 srcpkgs/perl-DateTime-TimeZone/template       |     4 +-
 srcpkgs/perl-DateTime/template                |     8 +-
 srcpkgs/perl-Devel-Caller/template            |     2 +-
 srcpkgs/perl-Devel-LexAlias/template          |     4 +-
 srcpkgs/perl-Digest-SHA1/template             |     2 +-
 srcpkgs/perl-Email-Address-XS/template        |     4 +-
 srcpkgs/perl-Email-Date-Format/template       |     2 +-
 srcpkgs/perl-Email-MIME-ContentType/template  |     2 +-
 srcpkgs/perl-Email-MIME-Encodings/template    |     2 +-
 srcpkgs/perl-Email-MIME/template              |     2 +-
 srcpkgs/perl-Email-MessageID/template         |     2 +-
 srcpkgs/perl-Email-Simple/template            |     2 +-
 srcpkgs/perl-FFI-CheckLib/template            |     6 +-
 srcpkgs/perl-File-BaseDir/template            |     2 +-
 srcpkgs/perl-File-Copy-Recursive/template     |     6 +-
 srcpkgs/perl-File-Find-Rule/template          |     2 +-
 srcpkgs/perl-File-Flock-Retry/template        |     2 +-
 srcpkgs/perl-File-Slurp/template              |     6 +-
 srcpkgs/perl-File-Slurper/template            |     2 +-
 srcpkgs/perl-File-Write-Rotate/template       |     8 +-
 srcpkgs/perl-File-chdir/template              |     2 +-
 srcpkgs/perl-File-pushd/template              |     2 +-
 srcpkgs/perl-Filesys-Df/template              |     2 +-
 srcpkgs/perl-Filesys-Notify-Simple/template   |     2 +-
 srcpkgs/perl-Fuse/template                    |     2 +-
 srcpkgs/perl-Getopt-Compact/template          |     2 +-
 .../perl-Glib-Object-Introspection/template   |     2 +-
 srcpkgs/perl-Glib/template                    |     4 +-
 srcpkgs/perl-Goo-Canvas/template              |     2 +-
 srcpkgs/perl-Gtk2-ImageView/template          |     2 +-
 srcpkgs/perl-Gtk2-Notify/template             |     2 +-
 srcpkgs/perl-Gtk2/template                    |     8 +-
 srcpkgs/perl-Gtk3/template                    |     4 +-
 srcpkgs/perl-HTML-Form/template               |     4 +-
 srcpkgs/perl-HTML-Parser/template             |     2 +-
 srcpkgs/perl-HTML-Tree/template               |     2 +-
 srcpkgs/perl-HTTP-Daemon/template             |     4 +-
 srcpkgs/perl-IO-HTML/template                 |     2 +-
 srcpkgs/perl-IO-SessionData/template          |     2 +-
 srcpkgs/perl-IO-Tty/template                  |     2 +-
 srcpkgs/perl-IPC-System-Simple/template       |     2 +-
 srcpkgs/perl-Image-Sane/template              |     6 +-
 srcpkgs/perl-Importer/template                |     2 +-
 srcpkgs/perl-Inline-C/template                |     6 +-
 srcpkgs/perl-Inline/template                  |     6 +-
 srcpkgs/perl-JSON-XS/template                 |     2 +-
 srcpkgs/perl-LWP-MediaTypes/template          |     2 +-
 srcpkgs/perl-Lchown/template                  |     4 +-
 srcpkgs/perl-Linux-Inotify2/template          |     2 +-
 srcpkgs/perl-List-MoreUtils-XS/template       |     2 +-
 srcpkgs/perl-Locale-gettext/template          |     2 +-
 srcpkgs/perl-MP3-Tag/template                 |    10 +-
 srcpkgs/perl-Mail-Box/template                |     4 +-
 srcpkgs/perl-Mail-DKIM/template               |     4 +-
 srcpkgs/perl-Mail-Message/template            |     2 +-
 srcpkgs/perl-Mail-POP3Client/template         |     2 +-
 srcpkgs/perl-Mail-Sendmail/template           |     2 +-
 srcpkgs/perl-Mail-Transport/template          |     6 +-
 srcpkgs/perl-Math-BigInt-GMP/template         |     6 +-
 srcpkgs/perl-Math-FFT/template                |    15 +
 srcpkgs/perl-Math-Prime-Util-GMP/template     |     2 +-
 srcpkgs/perl-Math-Prime-Util/template         |     2 +-
 srcpkgs/perl-Module-Pluggable/template        |     2 +-
 srcpkgs/perl-Mojolicious/template             |     5 +-
 srcpkgs/perl-Monkey-Patch-Action/template     |     2 +-
 srcpkgs/perl-Moo/template                     |     2 +-
 srcpkgs/perl-MusicBrainz-DiscID/template      |     2 +-
 srcpkgs/perl-Net-DBus/template                |     2 +-
 srcpkgs/perl-Net-DNS-Resolver-Mock/template   |     2 +-
 srcpkgs/perl-Net-IMAP-Client/template         |     2 +-
 srcpkgs/perl-Net-IMAP-Simple/template         |     2 +-
 srcpkgs/perl-Net-MPD/template                 |     2 +-
 srcpkgs/perl-Net-SSH2/template                |     2 +-
 srcpkgs/perl-Net-SSLeay/template              |     2 +-
 srcpkgs/perl-NetAddr-IP/template              |     2 +-
 srcpkgs/perl-Number-Compare/template          |     2 +-
 srcpkgs/perl-Object-MultiType/template        |     2 +-
 srcpkgs/perl-OpenGL/template                  |     2 +-
 srcpkgs/perl-PDF-API2/template                |     4 +-
 srcpkgs/perl-Package-Stash-XS/template        |     2 +-
 srcpkgs/perl-PadWalker/template               |     2 +-
 srcpkgs/perl-Pango/template                   |     2 +-
 srcpkgs/perl-Params-Util/template             |     2 +-
 srcpkgs/perl-Parse-RecDescent/template        |     2 +-
 srcpkgs/perl-PatchReader/template             |     2 +-
 srcpkgs/perl-Pegex/template                   |     2 +-
 srcpkgs/perl-Pod-Simple-Text-Termcap/template |     2 +-
 srcpkgs/perl-Proc-Daemontools/template        |     2 +-
 srcpkgs/perl-Proc-Govern/template             |     8 +-
 srcpkgs/perl-Proc-PID-File/template           |     2 +-
 srcpkgs/perl-Proc-ProcessTable/template       |     2 +-
 srcpkgs/perl-Ref-Util-XS/template             |     2 +-
 srcpkgs/perl-Regexp-Grammars/template         |     6 +-
 srcpkgs/perl-Role-Tiny/template               |     4 +-
 srcpkgs/perl-SUPER/template                   |     8 +-
 srcpkgs/perl-Scope-Guard/template             |     2 +-
 srcpkgs/perl-Search-Xapian/template           |     2 +-
 srcpkgs/perl-Socket-MsgHdr/template           |     4 +-
 srcpkgs/perl-Socket6/template                 |     2 +-
 srcpkgs/perl-Spiffy/template                  |     2 +-
 srcpkgs/perl-Sub-Delete/template              |     2 +-
 srcpkgs/perl-Sub-Identify/template            |     2 +-
 srcpkgs/perl-Sub-Info/template                |     2 +-
 srcpkgs/perl-Sub-Name/template                |    10 +-
 srcpkgs/perl-Sub-Quote/template               |     6 +-
 srcpkgs/perl-Svsh/template                    |     2 +-
 srcpkgs/perl-Sys-Syscall/template             |     2 +-
 srcpkgs/perl-Taint-Runtime/template           |     4 +-
 srcpkgs/perl-Template-Toolkit/template        |     2 +-
 srcpkgs/perl-Term-ExtendedColor/template      |     6 +-
 srcpkgs/perl-Term-ReadKey/template            |     2 +-
 srcpkgs/perl-Term-ReadLine-Gnu/template       |     2 +-
 srcpkgs/perl-Term-Table/template              |     6 +-
 srcpkgs/perl-Test-Base/template               |     2 +-
 srcpkgs/perl-Test-CPAN-Meta/template          |     2 +-
 srcpkgs/perl-Test-Class/template              |     2 +-
 srcpkgs/perl-Test-Cmd/template                |     2 +-
 srcpkgs/perl-Test-Command/template            |     2 +-
 srcpkgs/perl-Test-Deep/template               |     2 +-
 srcpkgs/perl-Test-FailWarnings/template       |     2 +-
 srcpkgs/perl-Test-File-ShareDir/template      |     2 +-
 srcpkgs/perl-Test-File/template               |     2 +-
 srcpkgs/perl-Test-HTTP-Server-Simple/template |     2 +-
 srcpkgs/perl-Test-Inter/template              |     2 +-
 srcpkgs/perl-Test-LeakTrace/template          |     4 +-
 srcpkgs/perl-Test-MockModule/template         |     2 +-
 srcpkgs/perl-Test-Most/template               |     2 +-
 srcpkgs/perl-Test-Needs/template              |     2 +-
 srcpkgs/perl-Test-Output/template             |     2 +-
 srcpkgs/perl-Test-Requires/template           |     2 +-
 srcpkgs/perl-Test-RequiresInternet/template   |     2 +-
 srcpkgs/perl-Test-SharedFork/template         |     2 +-
 srcpkgs/perl-Test-Simple/template             |     6 +-
 srcpkgs/perl-Test-Subroutines/template        |     2 +-
 srcpkgs/perl-Test-TCP/template                |     4 +-
 srcpkgs/perl-Test-Warn/template               |     2 +-
 srcpkgs/perl-Test-Warnings/template           |    10 +-
 srcpkgs/perl-Test-Weaken/template             |     2 +-
 srcpkgs/perl-Test-Without-Module/template     |     2 +-
 srcpkgs/perl-Test-YAML/template               |     2 +-
 srcpkgs/perl-Test-utf8/template               |     2 +-
 srcpkgs/perl-Test2-Plugin-NoWarnings/template |     8 +-
 srcpkgs/perl-Test2-Suite/template             |     6 +-
 srcpkgs/perl-Text-Aligner/template            |     2 +-
 srcpkgs/perl-Text-Bidi/template               |     2 +-
 srcpkgs/perl-Text-CharWidth/template          |     2 +-
 srcpkgs/perl-Text-Markdown/template           |     2 +-
 srcpkgs/perl-Text-Table/template              |     2 +-
 srcpkgs/perl-Text-XLogfile/template           |     2 +-
 srcpkgs/perl-Time-modules/template            |     2 +-
 srcpkgs/perl-Tk/template                      |     2 +-
 srcpkgs/perl-Unicode-LineBreak/template       |     2 +-
 srcpkgs/perl-Unicode-String/template          |     2 +-
 srcpkgs/perl-Unix-Mknod/template              |     4 +-
 srcpkgs/perl-Unix-Uptime/template             |     2 +-
 srcpkgs/perl-Variable-Magic/template          |     2 +-
 srcpkgs/perl-WL/template                      |     2 +-
 .../perl-WWW-Curl/patches/CURL_STRICTER.patch |    32 -
 .../perl-WWW-Curl/patches/curl-7.50.2.patch   |    24 +
 srcpkgs/perl-WWW-Curl/template                |     2 +-
 srcpkgs/perl-WWW-Mechanize/template           |     6 +-
 srcpkgs/perl-XML-LibXML/template              |     2 +-
 srcpkgs/perl-XML-Parser-Lite/template         |     2 +-
 srcpkgs/perl-XML-Parser/template              |    10 +-
 srcpkgs/perl-XML-Smart/template               |     2 +-
 srcpkgs/perl-YAML-LibYAML/template            |     8 +-
 srcpkgs/perl-namespace-autoclean/template     |    10 +-
 srcpkgs/perl-pcsc/template                    |     2 +-
 srcpkgs/perl-strictures/template              |     9 +-
 srcpkgs/perl-tainting/template                |     2 +-
 srcpkgs/perl/patches/cleanup-paths.diff       |    20 +-
 srcpkgs/perl/template                         |   100 +-
 srcpkgs/peru/template                         |    20 +
 srcpkgs/pfetch/template                       |    16 +
 srcpkgs/pgbackrest/template                   |     2 +-
 srcpkgs/pgbouncer/template                    |     4 +-
 srcpkgs/pgweb/template                        |     4 +-
 srcpkgs/phonon-qt5/template                   |     9 +-
 srcpkgs/php/template                          |     6 +-
 srcpkgs/picard/template                       |     4 +-
 srcpkgs/pidgin-sipe/template                  |     6 +-
 srcpkgs/pijul/patches/bindgen.patch           |    19 +-
 srcpkgs/pijul/template                        |    13 +-
 srcpkgs/pim-data-exporter/template            |     6 +-
 srcpkgs/pimcommon/template                    |     6 +-
 srcpkgs/pinentry-dmenu/template               |     2 +-
 srcpkgs/pioneer/template                      |     4 +-
 srcpkgs/pioneer/update                        |     1 +
 srcpkgs/piper/template                        |     2 +-
 srcpkgs/pipewire/template                     |     5 +-
 srcpkgs/pithos/template                       |     8 +-
 srcpkgs/pixman/template                       |     2 +-
 srcpkgs/pkgtop/template                       |    18 +
 srcpkgs/plantuml/template                     |     5 +-
 srcpkgs/plasma-browser-integration/template   |     7 +-
 srcpkgs/plasma-desktop/template               |     4 +-
 srcpkgs/plasma-framework/template             |     4 +-
 srcpkgs/plasma-integration/template           |     4 +-
 srcpkgs/plasma-nm/template                    |     4 +-
 srcpkgs/plasma-pa/template                    |     4 +-
 srcpkgs/plasma-sdk/template                   |     4 +-
 srcpkgs/plasma-thunderbolt/template           |    19 +
 srcpkgs/plasma-vault/template                 |     4 +-
 srcpkgs/plasma-workspace-wallpapers/template  |     4 +-
 srcpkgs/plasma-workspace/template             |     7 +-
 srcpkgs/plata-theme/INSTALL.msg               |     3 +
 srcpkgs/plata-theme/template                  |     9 +-
 srcpkgs/pluma/template                        |     4 +-
 srcpkgs/pmbootstrap/template                  |     8 +-
 srcpkgs/png++/patches/musl-error.patch        |    11 -
 srcpkgs/png++/template                        |     4 +-
 srcpkgs/poco/template                         |     6 +-
 srcpkgs/podman/template                       |     4 +-
 srcpkgs/poedit/patches/LearnMoreLink.patch    |    21 -
 srcpkgs/poedit/template                       |     6 +-
 srcpkgs/poezio/template                       |     6 +-
 srcpkgs/poezio/update                         |     1 +
 srcpkgs/polkit-kde-agent/template             |     4 +-
 srcpkgs/polygen/template                      |     2 +-
 srcpkgs/ponyc/template                        |     4 +-
 srcpkgs/poppler-qt5/template                  |     4 +-
 srcpkgs/poppler/template                      |     4 +-
 srcpkgs/portage/template                      |     4 +-
 srcpkgs/postfix/template                      |     6 +-
 .../postgis-2.5.3-PROTOCC_VERSION.patch       |    13 +
 srcpkgs/postgis/template                      |     6 +-
 srcpkgs/postgis/update                        |     1 +
 srcpkgs/postgresql/template                   |     2 +-
 srcpkgs/potrace/template                      |     4 +-
 srcpkgs/powerdevil/template                   |     4 +-
 srcpkgs/powertop/template                     |    11 +-
 srcpkgs/ppsspp/template                       |    18 +-
 srcpkgs/praat/template                        |     4 +-
 srcpkgs/prelink-cross/template                |     2 +-
 srcpkgs/print-manager/template                |     4 +-
 srcpkgs/prison/template                       |     8 +-
 srcpkgs/profanity/template                    |     6 +-
 srcpkgs/prometheus/template                   |     4 +-
 .../disable-seccomp-based-tracing.patch       |    28 +
 srcpkgs/proot/patches/makefile-fix-vars.patch |    35 +
 srcpkgs/proot/template                        |    28 +-
 srcpkgs/protontricks/template                 |    14 +
 srcpkgs/pscircle/template                     |     6 +-
 srcpkgs/pulseaudio-module-sndio/template      |     4 +-
 .../pulseaudio/patches/fix-alsa-module.patch  |    42 -
 srcpkgs/pulseaudio/template                   |    23 +-
 srcpkgs/puppet/template                       |     6 +-
 srcpkgs/purpose/template                      |     4 +-
 srcpkgs/putty/template                        |     4 +-
 srcpkgs/py3status/template                    |     4 +-
 srcpkgs/pycharm-community/template            |     4 +-
 srcpkgs/pylint/template                       |    34 +-
 srcpkgs/pyradio/INSTALL.msg                   |     5 +
 srcpkgs/pyradio/template                      |    21 +
 srcpkgs/python-Arrow/template                 |     4 +-
 srcpkgs/python-Babel/template                 |     6 +-
 srcpkgs/python-BeautifulSoup4/template        |     6 +-
 srcpkgs/python-Cheroot/template               |    14 +-
 srcpkgs/python-ConfigArgParse/template        |     4 +-
 srcpkgs/python-Cython/template                |     4 +-
 srcpkgs/python-Django/template                |     4 +-
 srcpkgs/python-Mako/template                  |     4 +-
 srcpkgs/python-Markdown/template              |     6 +-
 srcpkgs/python-MiniMock/template              |     2 +-
 srcpkgs/python-Pillow/template                |     6 +-
 srcpkgs/python-PyQt5-webengine/template       |     2 +
 srcpkgs/python-SQLAlchemy/template            |     4 +-
 srcpkgs/python-Unidecode/template             |     4 +-
 srcpkgs/python-aalib/template                 |     2 +-
 srcpkgs/python-alembic/template               |    11 +-
 srcpkgs/python-appdirs/template               |     2 +-
 srcpkgs/python-apsw/template                  |     5 +-
 srcpkgs/python-astroid/template               |    16 +-
 srcpkgs/python-attrs/template                 |    11 +-
 srcpkgs/python-audioread/template             |     6 +-
 srcpkgs/python-b2sdk/template                 |     4 +-
 srcpkgs/python-bitarray/template              |     6 +-
 srcpkgs/python-botocore/template              |     9 +-
 srcpkgs/python-coverage/template              |     6 +-
 srcpkgs/python-cram/template                  |     2 +-
 .../patches/libressl.patch                    |    18 -
 srcpkgs/python-cryptography/template          |    17 +-
 srcpkgs/python-cryptography_vectors/template  |    30 +
 srcpkgs/python-cssselect/template             |     8 +-
 srcpkgs/python-curl/template                  |    13 +-
 srcpkgs/python-dbus/template                  |     8 +-
 srcpkgs/python-docutils/template              |     8 +-
 srcpkgs/python-dogpile.cache/template         |     8 +-
 srcpkgs/python-dulwich/template               |     4 +-
 srcpkgs/python-ecdsa/template                 |    10 +-
 srcpkgs/python-envdir/template                |     2 +-
 srcpkgs/python-ewmh/template                  |     2 +-
 srcpkgs/python-flaky/template                 |     6 +-
 srcpkgs/python-fonttools/template             |    32 +-
 srcpkgs/python-fonttools/update               |     3 +
 srcpkgs/python-gitlab/template                |     4 +-
 .../python-google-api-python-client/template  |     4 +-
 srcpkgs/python-grako/template                 |     2 +-
 srcpkgs/python-graphviz/template              |     2 +-
 srcpkgs/python-guessit/template               |     9 +-
 srcpkgs/python-html2text/template             |    29 -
 srcpkgs/python-httmock/template               |     2 +-
 srcpkgs/python-httplib2/template              |     4 +-
 srcpkgs/python-hypothesis/template            |     4 +-
 srcpkgs/python-iso-8601/template              |    30 +
 srcpkgs/python-iwlib/template                 |     4 +-
 srcpkgs/python-jedi/template                  |     8 +-
 srcpkgs/python-jsonschema/template            |     5 +-
 srcpkgs/python-kaptan/template                |     4 +-
 srcpkgs/python-lxml/template                  |     6 +-
 srcpkgs/python-magic/template                 |     2 +-
 srcpkgs/python-mechanize/template             |    23 +-
 srcpkgs/python-mock/template                  |     8 +-
 srcpkgs/python-nose/template                  |     2 +-
 srcpkgs/python-npyscreen/template             |     2 +-
 srcpkgs/python-numexpr/template               |     8 +-
 srcpkgs/python-numpy/template                 |     6 +-
 srcpkgs/python-oauthlib/template              |    10 +-
 srcpkgs/python-packaging/template             |    10 +-
 srcpkgs/python-pafy                           |     1 +
 srcpkgs/python-pafy/template                  |    29 -
 srcpkgs/python-pandas/template                |    19 +-
 srcpkgs/python-parsing/template               |     9 +-
 srcpkgs/python-parso/template                 |     4 +-
 srcpkgs/python-pbr/template                   |     4 +-
 srcpkgs/python-pdfrw/template                 |     2 +-
 srcpkgs/python-peewee/template                |     4 +-
 srcpkgs/python-pex/template                   |     4 +-
 srcpkgs/python-pexpect/template               |    10 +-
 srcpkgs/python-pip/template                   |     8 +-
 srcpkgs/python-prctl/template                 |     2 +-
 srcpkgs/python-pretend/template               |    32 +
 srcpkgs/python-prometheus_client/template     |     4 +-
 srcpkgs/python-psycopg2/template              |     4 +-
 srcpkgs/python-pycryptodome/template          |     4 +-
 srcpkgs/python-pyglet/template                |     8 +-
 srcpkgs/python-pyotp/template                 |     4 +-
 srcpkgs/python-pytz/template                  |     4 +-
 srcpkgs/python-rarfile/template               |     4 +-
 srcpkgs/python-rebulk/template                |     4 +-
 srcpkgs/python-regex/template                 |    28 +-
 srcpkgs/python-requests-oauthlib/template     |     8 +-
 srcpkgs/python-requests/template              |     8 +-
 srcpkgs/python-rfc6555/template               |    25 +
 srcpkgs/python-s3transfer/template            |     9 +-
 srcpkgs/python-scikit-learn/template          |    30 -
 srcpkgs/python-scipy/template                 |    33 -
 srcpkgs/python-setuptools/template            |    12 +-
 srcpkgs/python-snappy/template                |     2 +-
 srcpkgs/python-soupsieve/template             |     4 +-
 srcpkgs/python-tmuxp/template                 |     4 +-
 srcpkgs/python-tornado/template               |     8 +-
 srcpkgs/python-tqdm/template                  |     4 +-
 srcpkgs/python-traitlets/template             |    10 +-
 srcpkgs/python-tweepy/template                |     2 +-
 srcpkgs/python-urllib3/template               |     4 +-
 srcpkgs/python-virtualenv/template            |     6 +-
 srcpkgs/python-vispy/template                 |    10 +-
 srcpkgs/python-xmltodict/template             |     2 +-
 srcpkgs/python-yaml/template                  |     8 +-
 srcpkgs/python-zeroconf/template              |    21 -
 srcpkgs/python-zeroconf/update                |     1 -
 srcpkgs/python3-CherryPy/template             |     7 +-
 srcpkgs/python3-Flask-HTTPAuth/template       |    19 +
 srcpkgs/python3-MechanicalSoup/template       |     4 +-
 srcpkgs/python3-PyBrowserID/template          |     2 +-
 srcpkgs/python3-PyFxA/template                |     6 +-
 srcpkgs/python3-PyJWT/template                |    14 +
 srcpkgs/python3-SoCo/template                 |     6 +-
 srcpkgs/python3-Telethon/template             |     6 +-
 srcpkgs/python3-TxSNI/template                |     2 +-
 srcpkgs/python3-WebOb/template                |     2 +-
 srcpkgs/python3-acme/template                 |     6 +-
 srcpkgs/python3-altgraph/template             |     2 +-
 srcpkgs/python3-aniso8601/template            |     6 +-
 srcpkgs/python3-astroid                       |     1 -
 srcpkgs/python3-astroid/template              |    22 +
 srcpkgs/python3-async_generator/template      |     2 +-
 srcpkgs/python3-autobahn/template             |    20 +
 srcpkgs/{python-bcc => python3-bcc}           |     0
 srcpkgs/python3-blessed/template              |     6 +-
 srcpkgs/python3-boltons/template              |     2 +-
 srcpkgs/python3-canonicaljson/template        |     2 +-
 srcpkgs/python3-casttube/template             |     2 +-
 srcpkgs/python3-changelogs/template           |     2 +-
 srcpkgs/python3-cheetah3/template             |     4 +-
 srcpkgs/python3-chromecast/template           |     6 +-
 srcpkgs/python3-cryptography_vectors          |     1 +
 srcpkgs/python3-dbusmock/template             |     6 +-
 srcpkgs/python3-distro/template               |    16 +
 srcpkgs/python3-eliot/template                |     2 +-
 srcpkgs/python3-fido2/template                |    21 +
 srcpkgs/python3-fishnet/template              |     8 +-
 srcpkgs/python3-flexmock/template             |     2 +-
 srcpkgs/python3-fonttools                     |     1 -
 srcpkgs/python3-fonttools/template            |    31 +
 srcpkgs/python3-frozendict/template           |     2 +-
 srcpkgs/python3-geojson/template              |     6 +-
 srcpkgs/python3-gitchangelog/template         |     2 +-
 srcpkgs/python3-hawkauthlib/template          |     2 +-
 srcpkgs/python3-hkdf/template                 |    19 +
 srcpkgs/python3-html2text                     |     1 -
 srcpkgs/python3-html2text/template            |    16 +
 srcpkgs/python3-importlib_metadata/template   |     4 +-
 srcpkgs/python3-ipython/template              |     4 +-
 srcpkgs/python3-iso-8601                      |     1 +
 srcpkgs/python3-jellyfish/template            |     4 +-
 srcpkgs/python3-josepy/template               |     6 +-
 srcpkgs/python3-libevdev/template             |    19 +
 srcpkgs/python3-macaroons/template            |     2 +-
 srcpkgs/python3-macholib/template             |     2 +-
 srcpkgs/python3-matplotlib/template           |     6 +-
 srcpkgs/python3-mechanize                     |     1 +
 srcpkgs/python3-more-itertools/template       |     8 +-
 srcpkgs/python3-mpi4py/template               |    20 +
 srcpkgs/python3-mpv/template                  |     2 +-
 srcpkgs/python3-mypy/template                 |     6 +-
 srcpkgs/python3-mypy_extensions/template      |     6 +-
 srcpkgs/python3-nacl/template                 |     2 +-
 srcpkgs/python3-numpy/template                |     9 +-
 srcpkgs/python3-pafy                          |     1 -
 srcpkgs/python3-pafy/template                 |    22 +
 srcpkgs/python3-pandas                        |     1 -
 .../INSTALL.msg}                              |     0
 srcpkgs/python3-pandas/template               |    20 +
 srcpkgs/python3-pandas/update                 |     1 +
 srcpkgs/python3-pefile/template               |     2 +-
 srcpkgs/python3-pem/template                  |     6 +-
 srcpkgs/python3-perf/template                 |    16 +-
 srcpkgs/python3-pgspecial/template            |     5 +-
 srcpkgs/python3-phonenumbers/template         |     6 +-
 srcpkgs/python3-pivy/template                 |     5 +
 srcpkgs/python3-pluggy/template               |     4 +-
 srcpkgs/python3-precis-i18n/template          |     6 +-
 srcpkgs/python3-pretend                       |     1 +
 srcpkgs/python3-pulsectl/template             |     6 +-
 srcpkgs/python3-pyfiglet/template             |    21 +
 srcpkgs/python3-pylint                        |     1 -
 srcpkgs/python3-pylint/template               |    47 +
 srcpkgs/python3-pysol_cards/template          |    13 +-
 srcpkgs/python3-pytest-asyncio/template       |     2 +-
 srcpkgs/python3-regex                         |     1 +
 srcpkgs/python3-rfc6555                       |     1 +
 srcpkgs/python3-rsistent/template             |     8 +-
 srcpkgs/python3-rss2email/template            |    16 +
 srcpkgs/python3-saml2/template                |     6 +-
 srcpkgs/python3-scard/template                |    19 +
 srcpkgs/python3-scikit-learn                  |     1 -
 srcpkgs/python3-scikit-learn/template         |    20 +
 srcpkgs/python3-scipy                         |     1 -
 srcpkgs/python3-scipy/template                |    23 +
 .../{python-scipy => python3-scipy}/update    |     0
 srcpkgs/python3-scruffy/template              |     4 +-
 srcpkgs/python3-shodan/template               |     4 +-
 srcpkgs/python3-signedjson/template           |     2 +-
 srcpkgs/python3-sortedcontainers/template     |     2 +-
 srcpkgs/python3-spake2/template               |    20 +
 srcpkgs/python3-tabulate/template             |     6 +-
 srcpkgs/python3-tinycss/template              |    21 +
 srcpkgs/python3-treq/template                 |     2 +-
 srcpkgs/python3-txacme/template               |     2 +-
 srcpkgs/python3-txaio/template                |    19 +
 srcpkgs/python3-txtorcon/template             |    20 +
 srcpkgs/python3-unpaddedbase64/template       |     2 +-
 srcpkgs/python3-usb/template                  |    21 +
 srcpkgs/python3-validators/template           |     6 +-
 srcpkgs/python3-vdf/template                  |    18 +
 srcpkgs/python3-virustotal-api/template       |     4 +-
 srcpkgs/python3-yara/template                 |     4 +-
 srcpkgs/python3-zipp/template                 |     4 +-
 srcpkgs/qalculate-gtk/template                |     4 +-
 srcpkgs/qalculate/template                    |     6 +-
 srcpkgs/qbittorrent/template                  |     4 +-
 srcpkgs/qemu-user-static/template             |     8 +-
 ...l.c-define-__SIGRTMIN-MAX-for-non-GN.patch |    12 +-
 srcpkgs/qemu/patches/musl-ppc.patch           |    13 +
 srcpkgs/qemu/template                         |    20 +-
 srcpkgs/qgit/template                         |     8 +-
 srcpkgs/qimgv/template                        |     7 +-
 srcpkgs/qmmp/template                         |     6 +-
 srcpkgs/qpdf/template                         |     4 +-
 srcpkgs/qqc2-desktop-style/template           |     4 +-
 srcpkgs/qt/patches/gcc9-qforeach.patch        |    67 +
 srcpkgs/qt5-styleplugins/template             |     8 +-
 srcpkgs/qt5-webkit/patches/musl-ppc.patch     |    14 +
 srcpkgs/qt5-webkit/patches/ppc-llint.patch    |    32 +
 .../qt5-webkit/patches/reduce-exports.patch   |    27 +
 srcpkgs/qt5-webkit/template                   |    61 +-
 .../qt5/patches/0027-remove-glibc-check.patch |    13 +
 srcpkgs/qt5/patches/0048-qtbug-76742.patch    |    25 -
 .../qt5/patches/0049-big-endian-scroll.patch  |    54 +
 srcpkgs/qt5/patches/0050-pulse-stubs.patch    |    49 +
 srcpkgs/qt5/patches/0100-qtbug-77364.patch    |    26 +
 srcpkgs/qt5/template                          |     9 +-
 srcpkgs/qt5dxcb-plugin/template               |     9 +-
 srcpkgs/qt5integration/template               |     4 +-
 srcpkgs/qt5pas/template                       |     2 +-
 srcpkgs/qtcreator/patches/clang9.patch        |    11 +
 srcpkgs/qtcreator/template                    |    19 +-
 .../qtcurve/patches/gtkprops_constexpr.patch  |    29 +
 srcpkgs/qtcurve/template                      |    18 +-
 srcpkgs/qtfm/template                         |     6 +-
 srcpkgs/qtpass/patches/qmake-qt5.13.patch     |     3 +-
 srcpkgs/qtpass/template                       |     5 +-
 srcpkgs/quadrapassel/template                 |     6 +-
 srcpkgs/qutebrowser/template                  |     4 +-
 srcpkgs/racket/template                       |     4 +-
 srcpkgs/radare2/template                      |     6 +-
 srcpkgs/radeon-profile/template               |     4 +-
 .../rakudo/patches/fix-perl6-home-dir.patch   |    26 +
 srcpkgs/rakudo/template                       |     4 +-
 srcpkgs/range-v3/patches/fix-is_trivial.patch |    96 -
 srcpkgs/range-v3/template                     |     6 +-
 srcpkgs/ranger/template                       |     2 +-
 srcpkgs/rawtherapee/template                  |     4 +-
 srcpkgs/rclone/template                       |    10 +-
 srcpkgs/rcm/template                          |     2 +-
 srcpkgs/rdfind/template                       |     2 +-
 srcpkgs/rdup/template                         |     3 +-
 srcpkgs/re/template                           |     6 +-
 srcpkgs/re2/template                          |     4 +-
 srcpkgs/reap/template                         |    11 +
 srcpkgs/rebar3/template                       |     4 +-
 srcpkgs/recutils/template                     |     2 +-
 srcpkgs/redis/template                        |     6 +-
 srcpkgs/remmina/template                      |     4 +-
 srcpkgs/resvg/template                        |     2 +-
 srcpkgs/retro-gtk/template                    |     6 +-
 srcpkgs/retroarch/template                    |     4 +-
 srcpkgs/rinse/template                        |     2 +-
 srcpkgs/riot-desktop/patches/electron5.patch  |    32 -
 srcpkgs/riot-desktop/template                 |     8 +-
 srcpkgs/rlottie/template                      |     6 +-
 srcpkgs/rmlint/template                       |     6 +-
 srcpkgs/roswell/template                      |     4 +-
 srcpkgs/roxterm/template                      |    13 +-
 srcpkgs/rpi-firmware/template                 |    23 +-
 srcpkgs/rpi-kernel/template                   |   150 +-
 srcpkgs/rpm/template                          |    14 +-
 srcpkgs/rrdtool/template                      |     4 +-
 srcpkgs/rsClock/template                      |    16 +
 srcpkgs/rsyslog/template                      |     6 +-
 srcpkgs/rtags/template                        |     2 +-
 srcpkgs/rtaudio/template                      |     2 +-
 srcpkgs/rtl8822bu-dkms/template               |     6 +-
 srcpkgs/rtl_433/template                      |     7 +-
 srcpkgs/ruby-addressable/template             |     6 +-
 srcpkgs/ruby-asciidoctor/template             |     6 +-
 srcpkgs/ruby-backports/template               |     6 +-
 srcpkgs/ruby-connection_pool/template         |     2 +-
 srcpkgs/ruby-erubis/template                  |     2 +-
 srcpkgs/ruby-ethon/template                   |     2 +-
 srcpkgs/ruby-faraday/template                 |     8 +-
 srcpkgs/ruby-faraday_middleware/template      |     2 +-
 srcpkgs/ruby-ffi/template                     |     6 +-
 srcpkgs/ruby-gh/template                      |     2 +-
 srcpkgs/ruby-highline/template                |     6 +-
 srcpkgs/ruby-hpricot/template                 |     2 +-
 srcpkgs/ruby-httparty/template                |     6 +-
 srcpkgs/ruby-launchy/template                 |     2 +-
 srcpkgs/ruby-mime-types-data/template         |     6 +-
 srcpkgs/ruby-mime-types/template              |     8 +-
 srcpkgs/ruby-mini_portile2/template           |     2 +-
 srcpkgs/ruby-multi_json/template              |     8 +-
 srcpkgs/ruby-multi_xml/template               |     2 +-
 srcpkgs/ruby-multipart-post/template          |     8 +-
 srcpkgs/ruby-mustache/template                |     2 +-
 srcpkgs/ruby-net-http-persistent/template     |     8 +-
 srcpkgs/ruby-net-http-pipeline/template       |     2 +-
 srcpkgs/ruby-pkg-config/template              |     6 +-
 srcpkgs/ruby-public_suffix/template           |     8 +-
 srcpkgs/ruby-pusher-client/template           |     2 +-
 srcpkgs/ruby-rb-readline/template             |     2 +-
 srcpkgs/ruby-rdiscount/template               |     2 +-
 srcpkgs/ruby-ronn/template                    |     2 +-
 srcpkgs/ruby-thor/template                    |     2 +-
 srcpkgs/ruby-travis/template                  |     2 +-
 srcpkgs/ruby-typhoeus/template                |     2 +-
 srcpkgs/ruby-websocket/template               |     2 +-
 srcpkgs/ruby-xdg/template                     |    10 +-
 srcpkgs/ruby/template                         |     6 +-
 srcpkgs/run-parts/template                    |     6 +-
 srcpkgs/runc/template                         |     6 +-
 srcpkgs/runit-void/template                   |     6 +-
 srcpkgs/rust-cargo-audit/template             |     4 +-
 srcpkgs/rust-cargo-bloat/template             |     4 +-
 srcpkgs/rust-sccache/template                 |    11 +-
 .../rust/patches/0002-Fix-LLVM-build.patch    |    10 +-
 ...to-work-when-cross-compiling-on-musl.patch |     8 +-
 ...ative-libraries-when-linking-static-.patch |    12 +-
 ...dlib-and-musl_root-from-musl-targets.patch |   127 +-
 ...er-libgcc_eh-over-libunwind-for-musl.patch |    10 +-
 ...x-C-aggregate-passing-ABI-on-powerpc.patch |    93 +
 ...t-Fix-proc-macro-tests-on-musl-hosts.patch |    39 -
 ...-zero-sized-aggregate-ABI-on-powerpc.patch |    62 +
 ...piletest-Match-suffixed-environments.patch |    48 +
 ...c-variadic-Fix-patterns-on-powerpc64.patch |    73 +
 ...n-for-plugins-Don-t-assume-multilib.patch} |    10 +-
 ...es-are-unstable-Fix-test-when-rpath.patch} |     8 +-
 ...ore-broken-and-non-applicable-tests.patch} |    55 +-
 ...stage-2-tools-dynamically-to-libstd.patch} |    10 +-
 ...-debugger-scripts-to-usr-share-rust.patch} |    14 +-
 srcpkgs/rust/patches/0030-libc-linkage.patch  |    14 +-
 srcpkgs/rust/patches/0091-bootstrap.patch     |    71 +
 .../patches/0091-lzma-sys-cross-ldflags.patch |    11 -
 srcpkgs/rust/template                         |   101 +-
 srcpkgs/rxvt-unicode/template                 |     2 +-
 srcpkgs/s/template                            |     5 +-
 srcpkgs/s6-dns/template                       |     6 +-
 srcpkgs/s6-linux-utils/template               |     4 +-
 srcpkgs/s6-networking/template                |     6 +-
 srcpkgs/s6-portable-utils/template            |     6 +-
 srcpkgs/s6-rc/template                        |    11 +-
 srcpkgs/s6/template                           |     6 +-
 srcpkgs/sabnzbd/template                      |     5 +-
 ...ixed-crash-with-vte-0.54-Bug-1790317.patch |    69 -
 srcpkgs/sakura/template                       |    12 +-
 srcpkgs/saml2aws/template                     |    25 +
 srcpkgs/sampler/template                      |     4 +-
 srcpkgs/sane/patches/sane-desc-cross.patch    |     2 +-
 srcpkgs/sane/template                         |    41 +-
 srcpkgs/sanoid/template                       |     7 +-
 srcpkgs/sassc/template                        |     2 +-
 srcpkgs/sbcl/template                         |     6 +-
 srcpkgs/sblg/template                         |     4 +-
 srcpkgs/scapy/template                        |     4 +-
 srcpkgs/scc/template                          |    17 +
 srcpkgs/scdoc/template                        |     4 +-
 srcpkgs/scons/template                        |     6 +-
 srcpkgs/screen/template                       |     6 +-
 srcpkgs/scrot/template                        |     6 +-
 srcpkgs/scrypt/template                       |     8 +-
 srcpkgs/scummvm/template                      |    43 +-
 srcpkgs/sddm-kcm/template                     |     4 +-
 srcpkgs/seafile-client-qt/template            |    15 +-
 srcpkgs/seafile-libclient/template            |     6 +-
 srcpkgs/seahorse/template                     |     2 +-
 srcpkgs/sequeler/template                     |     4 +-
 srcpkgs/sfeed/template                        |     4 +-
 srcpkgs/shaderc/template                      |     2 +-
 srcpkgs/shared-mime-info/template             |    14 +-
 srcpkgs/shfmt/template                        |     2 +-
 srcpkgs/shiboken2/patches/qstringlist.patch   |    12 +
 srcpkgs/shiboken2/template                    |     2 +-
 srcpkgs/shotcut/template                      |     4 +-
 srcpkgs/shotwell/template                     |     4 +-
 srcpkgs/shunit2/template                      |     2 +-
 srcpkgs/signon-kwallet-extension/template     |     4 +-
 srcpkgs/sk1/template                          |    10 +-
 srcpkgs/sk1/update                            |     1 +
 srcpkgs/skaffold/template                     |     5 +-
 srcpkgs/skalibs/template                      |    27 +-
 srcpkgs/skim/template                         |     2 +-
 srcpkgs/skype/template                        |     8 +-
 srcpkgs/slack-desktop/template                |     6 +-
 srcpkgs/sleuthkit/template                    |     4 +-
 srcpkgs/slirp4netns/template                  |     8 +-
 srcpkgs/smenu/template                        |     2 +-
 srcpkgs/socat/template                        |    25 +-
 srcpkgs/solarus-quest-editor/template         |     4 +-
 srcpkgs/solarus/template                      |     6 +-
 srcpkgs/sonnet/template                       |     4 +-
 srcpkgs/sops/template                         |    13 +
 srcpkgs/source-sans-pro/template              |     6 +-
 srcpkgs/sparse/template                       |     4 +-
 srcpkgs/spdx-licenses-list/template           |     2 +-
 srcpkgs/spectacle/template                    |     6 +-
 srcpkgs/speedtest-cli/template                |     4 +-
 srcpkgs/spice-gtk/template                    |     5 +-
 srcpkgs/spice/template                        |     4 +
 srcpkgs/spigot/template                       |     4 +-
 .../files/spotify-adblock.desktop             |    11 +
 srcpkgs/spotify-adblock-linux/template        |    20 +
 srcpkgs/spotify-tui/template                  |    17 +
 srcpkgs/sqlite-replication/template           |    11 +-
 srcpkgs/sqlite/template                       |     6 +-
 srcpkgs/sqlmap/template                       |    27 +
 .../patches/CVE-2015-4645.patch               |    27 -
 .../squashfs-tools/patches/fix-compat.patch   |    46 -
 .../squashfs-tools/patches/vla-overlow.patch  |    21 -
 srcpkgs/squashfs-tools/template               |    19 +-
 srcpkgs/stagit/patches/libgit2-0.28.patch     |    27 -
 srcpkgs/stagit/template                       |    10 +-
 srcpkgs/starship/template                     |    18 +
 srcpkgs/stow/template                         |     8 +-
 srcpkgs/strace/template                       |     9 +-
 srcpkgs/streamlink/template                   |     4 +-
 srcpkgs/stremio-shell/template                |     8 +-
 srcpkgs/stress-ng/template                    |     4 +-
 srcpkgs/strongswan/template                   |     4 +-
 srcpkgs/sublime-merge/template                |     4 +-
 srcpkgs/sublime-text3/template                |     6 +-
 srcpkgs/sudo/template                         |     4 +-
 ...068659ced596402dedc78f49fabfab6470bd.patch |    23 -
 srcpkgs/supercollider/template                |     5 +-
 srcpkgs/supermin/template                     |     2 +-
 srcpkgs/svctl/template                        |     2 +-
 srcpkgs/svgpart/template                      |     4 +-
 srcpkgs/swaks/template                        |     4 +-
 srcpkgs/sway/template                         |     8 +-
 srcpkgs/swell-foop/patches/pivot_point.patch  |    32 +
 srcpkgs/swell-foop/template                   |     6 +-
 srcpkgs/sx/template                           |     2 +-
 .../patches/bump-python-dependencies.patch    |    30 -
 srcpkgs/synapse/template                      |     6 +-
 srcpkgs/syncthing-gtk/template                |     6 +-
 srcpkgs/syncthing-inotify/template            |     2 +-
 srcpkgs/syncthing/template                    |     5 +-
 srcpkgs/syndication/template                  |     4 +-
 srcpkgs/syntax-highlighting/template          |     4 +-
 srcpkgs/sysdig/template                       |    12 +-
 srcpkgs/sysexxer-ng/template                  |    17 +
 srcpkgs/sysprof/template                      |     8 +-
 srcpkgs/sysstat/template                      |     5 +-
 srcpkgs/systemsettings/template               |     4 +-
 srcpkgs/systemtap/template                    |     4 +-
 srcpkgs/tab/template                          |     6 +-
 srcpkgs/taisei/template                       |    12 +-
 srcpkgs/tarpaulin/template                    |    19 +
 srcpkgs/tau/template                          |    29 +
 srcpkgs/tbb/template                          |     6 +-
 srcpkgs/tcpdump/template                      |     6 +-
 srcpkgs/teamspeak3/template                   |     6 +-
 srcpkgs/telegram-desktop/files/Telegram.cmake |    16 +-
 .../files/TelegramCodegenTools.cmake          |     2 +
 .../telegram-desktop/patches/stdafx.h.patch   |    19 +
 srcpkgs/telegram-desktop/template             |    11 +-
 srcpkgs/telepresence/template                 |     5 +-
 srcpkgs/termdown/template                     |    15 +
 srcpkgs/terraform/template                    |     4 +-
 srcpkgs/terragrunt/template                   |     4 +-
 srcpkgs/texlive-bin/template                  |    19 +-
 srcpkgs/thermald/template                     |     4 +-
 srcpkgs/thingylaunch/template                 |     2 +-
 srcpkgs/threadweaver/template                 |     4 +-
 srcpkgs/thunderbird-i18n/template             |   116 +-
 srcpkgs/thunderbird/files/mozconfig           |     3 +-
 .../patches/disable-hunspell_hooks.patch      |    11 -
 .../disable-image-format-warning.patch        |    15 +
 .../patches/fix-arm-opus-include.patch        |    11 +
 .../patches/fix-i686-ppc-musl.patch           |    11 +
 srcpkgs/thunderbird/patches/fix-musl.patch    |    18 +-
 .../thunderbird/patches/fix-rust-1.29.patch   |    14 -
 .../patches/fix-sandbox-membarrier.patch      |    52 +
 srcpkgs/thunderbird/patches/fix-toolkit.patch |    36 +-
 srcpkgs/thunderbird/patches/fix-tools.patch   |    35 +-
 .../thunderbird/patches/fix-wasm-arm.patch    |    15 +
 .../patches/fix-webrtc-glibcisms.patch        |    25 +-
 srcpkgs/thunderbird/patches/fix-xpcom.patch   |    11 -
 srcpkgs/thunderbird/patches/mallinfo.patch    |    40 +-
 .../patches/ppc32-skia-portable.patch         |    14 +
 .../thunderbird/patches/rust-configure.patch  |    42 +
 .../thunderbird/patches/rust-cssparser.patch  |    90 +
 .../patches/rust-unitialized-field.patch      |    19 -
 srcpkgs/thunderbird/patches/rust133.patch     |    24 -
 srcpkgs/thunderbird/patches/sndio.patch       |    12 +-
 srcpkgs/thunderbird/patches/yuv-be.patch      |    48 +
 srcpkgs/thunderbird/template                  |    90 +-
 srcpkgs/tig/template                          |     4 +-
 srcpkgs/tigervnc/template                     |     2 +-
 srcpkgs/timeshift/template                    |     4 +-
 srcpkgs/tinc/template                         |     6 +-
 srcpkgs/tintin/template                       |     4 +-
 srcpkgs/tinyxml2/template                     |     6 +-
 srcpkgs/tlp/template                          |     2 +-
 srcpkgs/tmux/template                         |     4 +-
 srcpkgs/tomahawk/template                     |     8 +-
 srcpkgs/tomb/template                         |     7 +-
 srcpkgs/toot/template                         |     7 +-
 srcpkgs/topgrade/template                     |     4 +-
 srcpkgs/tor/patches/ppc.patch                 |    35 +
 srcpkgs/tor/patches/ppc64.patch               |    14 -
 srcpkgs/tor/template                          |    14 +-
 srcpkgs/torbrowser-launcher/template          |    21 +
 srcpkgs/totem/template                        |     4 +-
 srcpkgs/tox/template                          |     4 +-
 srcpkgs/translate-shell/template              |     4 +-
 srcpkgs/tty-clock/template                    |    19 +-
 srcpkgs/ttyd/template                         |     4 +-
 srcpkgs/tudu/template                         |     8 +-
 srcpkgs/tuir/template                         |     4 +-
 srcpkgs/turses/template                       |     2 +-
 srcpkgs/txr/template                          |     4 +-
 srcpkgs/txtw/template                         |     2 +-
 srcpkgs/tzdata/template                       |     4 +-
 srcpkgs/tzutils/template                      |    12 +-
 srcpkgs/ucspi-ssl/template                    |     2 +-
 srcpkgs/ufetch/template                       |     2 +-
 srcpkgs/uget/template                         |     6 +-
 srcpkgs/umbrello/template                     |     6 +-
 srcpkgs/unbound/template                      |     5 +-
 srcpkgs/unison/template                       |     2 +-
 srcpkgs/unrar/template                        |     6 +-
 srcpkgs/urh/template                          |     4 +-
 srcpkgs/urlscan/template                      |     4 +-
 srcpkgs/usbguard/files/usbguard/run           |     2 +
 srcpkgs/usbguard/patches/musl.patch           |    84 +
 srcpkgs/usbguard/template                     |    20 +
 srcpkgs/user-manager/template                 |     4 +-
 srcpkgs/usql/template                         |     6 +-
 srcpkgs/util-linux/patches/chsh.patch         |    89 +
 srcpkgs/util-linux/template                   |     2 +-
 srcpkgs/utox/template                         |     8 +-
 srcpkgs/vagrant/template                      |     6 +-
 srcpkgs/vala-panel-appmenu/template           |     4 +-
 srcpkgs/vala/template                         |     8 +-
 srcpkgs/valabind/template                     |     2 +-
 srcpkgs/valadoc/template                      |     8 +-
 srcpkgs/vamp-plugin-sdk/template              |    16 +-
 srcpkgs/vapoursynth/template                  |     4 +-
 srcpkgs/varnish/INSTALL.msg                   |     1 -
 srcpkgs/varnish/files/varnishd/log/run        |     2 +
 srcpkgs/varnish/files/varnishd/run            |    20 +
 srcpkgs/varnish/patches/musl.patch            |    22 +
 srcpkgs/varnish/template                      |    69 +-
 srcpkgs/varnish/update                        |     1 +
 srcpkgs/vault/template                        |    14 +-
 srcpkgs/vba-m/template                        |     7 +-
 srcpkgs/vhba-module-dkms/template             |     4 +-
 srcpkgs/viewres/template                      |     4 +-
 srcpkgs/vifm/template                         |     5 +-
 srcpkgs/viking/template                       |     2 +-
 srcpkgs/vim/template                          |     6 +-
 srcpkgs/vinagre/template                      |     6 +-
 srcpkgs/virt-viewer/template                  |     5 +-
 srcpkgs/virt-what/template                    |     4 +-
 srcpkgs/virtualbox-ose/template               |     4 +-
 srcpkgs/vivaldi/template                      |     8 +-
 srcpkgs/vlc/template                          |    19 +-
 srcpkgs/vmpk/template                         |    23 +
 srcpkgs/vnstat/template                       |     4 +-
 srcpkgs/vpnc-scripts/patches/fix-ipv6.patch   |    16 -
 srcpkgs/vpnc-scripts/template                 |     4 +-
 srcpkgs/vscode/patches/fix_dir.patch          |    10 +-
 srcpkgs/vscode/patches/gulp.patch             |     2 +-
 srcpkgs/vscode/template                       |     9 +-
 srcpkgs/vte3/template                         |    13 +-
 srcpkgs/vulkan-loader/template                |     4 +-
 srcpkgs/w3m/template                          |     2 +-
 srcpkgs/warzone2100/template                  |    25 +-
 srcpkgs/way-cooler/template                   |     2 +-
 srcpkgs/wayfire/template                      |     8 +-
 srcpkgs/wayland-protocols/template            |     6 +-
 srcpkgs/wayland/template                      |     2 +-
 .../patches/fix-fast-memory-disabled.patch    |    14 -
 .../patches/fix-musl-javascriptcore.patch     |   492 +-
 srcpkgs/webkit2gtk/patches/ppc-llint.patch    |    41 +
 srcpkgs/webkit2gtk/template                   |   100 +-
 srcpkgs/weechat/template                      |    16 +-
 srcpkgs/wesnoth/template                      |     6 +-
 srcpkgs/wf-config-devel                       |     1 +
 srcpkgs/wf-config/patches/fix-musl.patch      |    13 -
 srcpkgs/wf-config/template                    |    20 +-
 srcpkgs/wf-shell/template                     |    28 +-
 srcpkgs/whois/template                        |    17 +-
 srcpkgs/wine-mono/template                    |     4 +-
 srcpkgs/wine/template                         |     4 +-
 srcpkgs/winetricks/template                   |     4 +-
 srcpkgs/wireguard/template                    |     5 +-
 srcpkgs/wireshark/template                    |     4 +-
 srcpkgs/wl-clipboard/template                 |     6 +-
 srcpkgs/wlroots/template                      |    12 +-
 srcpkgs/woff2/template                        |     2 +-
 srcpkgs/workrave/template                     |     9 +-
 srcpkgs/wpa-cute/template                     |    23 +
 srcpkgs/wxMaxima/template                     |     4 +-
 ...fig-gtk3.0-to-avoid-conflict-with-wx.patch |    12 +-
 srcpkgs/wxPython4/template                    |    17 +-
 srcpkgs/x264/template                         |    10 +-
 srcpkgs/x42-plugins/template                  |     4 +-
 srcpkgs/xapian-core/template                  |     6 +-
 srcpkgs/xapps/template                        |     6 +-
 srcpkgs/xbps-triggers/files/dkms              |     2 +-
 srcpkgs/xbps-triggers/template                |     2 +-
 srcpkgs/xcb-util-xrm/template                 |     2 +-
 srcpkgs/xdg-dbus-proxy/patches/musl.patch     |    19 +
 srcpkgs/xdg-dbus-proxy/template               |     6 +-
 srcpkgs/xdg-desktop-portal-kde/template       |     4 +-
 srcpkgs/xdgmenumaker/files/1.5/xdgmenumaker.1 |   464 +
 srcpkgs/xdgmenumaker/template                 |    19 +-
 srcpkgs/xen/template                          |     2 +-
 srcpkgs/xev/template                          |     2 +-
 srcpkgs/xf86-input-libinput/template          |     2 +-
 srcpkgs/xf86-video-amdgpu/template            |     4 +-
 srcpkgs/xfce4-battery-plugin/template         |     2 +-
 srcpkgs/xfce4-clipman-plugin/template         |     2 +-
 srcpkgs/xfce4-cpufreq-plugin/template         |     2 +-
 srcpkgs/xfce4-cpugraph-plugin/template        |     2 +-
 srcpkgs/xfce4-dict/template                   |     8 +-
 srcpkgs/xfce4-diskperf-plugin/template        |     2 +-
 srcpkgs/xfce4-fsguard-plugin/template         |     2 +-
 srcpkgs/xfce4-genmon-plugin/template          |     2 +-
 .../xfce4-hardware-monitor-plugin/template    |     2 +-
 srcpkgs/xfce4-kbdleds-plugin/template         |     2 +-
 srcpkgs/xfce4-mailwatch-plugin/template       |     2 +-
 srcpkgs/xfce4-mpc-plugin/template             |     2 +-
 srcpkgs/xfce4-netload-plugin/template         |     2 +-
 srcpkgs/xfce4-notes-plugin/template           |     2 +-
 srcpkgs/xfce4-notifyd/template                |     2 +-
 srcpkgs/xfce4-panel/template                  |    19 +-
 srcpkgs/xfce4-places-plugin/template          |     2 +-
 srcpkgs/xfce4-power-manager/template          |     2 +-
 srcpkgs/xfce4-pulseaudio-plugin/template      |     2 +-
 srcpkgs/xfce4-screensaver/template            |     2 +-
 srcpkgs/xfce4-screenshooter/template          |     6 +-
 srcpkgs/xfce4-sensors-plugin/template         |     2 +-
 srcpkgs/xfce4-settings/template               |     6 +-
 srcpkgs/xfce4-systemload-plugin/template      |     2 +-
 srcpkgs/xfce4-taskmanager/template            |     3 +-
 srcpkgs/xfce4-time-out-plugin/template        |     2 +-
 srcpkgs/xfce4-timer-plugin/template           |     2 +-
 srcpkgs/xfce4-verve-plugin/template           |     2 +-
 srcpkgs/xfce4-wavelan-plugin/template         |     2 +-
 srcpkgs/xfce4-weather-plugin/template         |     2 +-
 srcpkgs/xfce4-whiskermenu-plugin/template     |     2 +-
 srcpkgs/xfce4-windowck-plugin/template        |     2 +-
 srcpkgs/xfce4-xkb-plugin/template             |     2 +-
 srcpkgs/xfsdump/template                      |     9 +-
 srcpkgs/xfsprogs/template                     |     4 +-
 srcpkgs/xhost/template                        |     2 +-
 srcpkgs/xi-editor/template                    |     2 +-
 srcpkgs/xkb-switch/template                   |     6 +-
 srcpkgs/xkcdpass/template                     |     2 +-
 srcpkgs/xl2tpd/template                       |     6 +-
 srcpkgs/xlockmore/template                    |     8 +-
 srcpkgs/xlsatoms/template                     |     2 +-
 srcpkgs/xmltoman/template                     |     2 +-
 srcpkgs/xmodmap/template                      |     2 +-
 srcpkgs/xob/template                          |     2 +-
 srcpkgs/xonsh/template                        |     4 +-
 srcpkgs/xorg-server/template                  |     2 +-
 srcpkgs/xorgproto/template                    |     7 +-
 srcpkgs/xpdf/template                         |     6 +-
 srcpkgs/xpdf/update                           |     1 +
 srcpkgs/xpra/template                         |     2 +-
 srcpkgs/xprintidle/template                   |     2 +-
 srcpkgs/xrdb/template                         |     2 +-
 srcpkgs/xsecurelock/template                  |     4 +-
 srcpkgs/xst/template                          |     3 +-
 srcpkgs/xterm/template                        |     8 +-
 srcpkgs/xtitle/template                       |     2 +-
 srcpkgs/xurls/template                        |     4 +-
 srcpkgs/xvinfo/template                       |     2 +-
 srcpkgs/xvkbd/template                        |     9 +-
 srcpkgs/xxHash/template                       |     4 +-
 srcpkgs/yabasic/template                      |    10 +-
 srcpkgs/yad/template                          |     6 +-
 srcpkgs/yakuake/template                      |    16 +-
 srcpkgs/yandex-disk/template                  |     7 +-
 srcpkgs/yank/template                         |     6 +-
 srcpkgs/yarn-bin/template                     |     6 +-
 srcpkgs/yaru/template                         |     4 +-
 srcpkgs/yash/template                         |    11 +-
 srcpkgs/yelp-xsl/template                     |     4 +-
 srcpkgs/yelp/template                         |     4 +-
 srcpkgs/yggdrasil/template                    |     6 +-
 srcpkgs/ykpivmgr/patches/libressl.patch       |   158 -
 srcpkgs/ykpivmgr/patches/ssl_obsolete.patch   |    22 +
 srcpkgs/ykpivmgr/template                     |     9 +-
 srcpkgs/yoshimi/template                      |     4 +-
 srcpkgs/yosys/template                        |     6 +-
 srcpkgs/youtube-dl/template                   |    18 +-
 srcpkgs/youtube-viewer/template               |     4 +-
 srcpkgs/yq-go/template                        |     2 +-
 srcpkgs/yq/template                           |     2 +-
 srcpkgs/yubikey-manager/template              |    19 +
 srcpkgs/z3/template                           |    10 +-
 srcpkgs/zabbix/template                       |     2 +-
 srcpkgs/zaproxy/template                      |    34 -
 srcpkgs/zaproxy/update                        |     2 -
 srcpkgs/zathura/template                      |    13 +-
 srcpkgs/zchunk/template                       |     8 +-
 srcpkgs/zfs/template                          |     4 +-
 srcpkgs/zim-tools/template                    |     6 +-
 srcpkgs/zimwriterfs/template                  |     4 +-
 srcpkgs/znc/template                          |     8 +-
 srcpkgs/zola/template                         |    13 +-
 srcpkgs/zoom/template                         |     7 +-
 srcpkgs/zou/template                          |     2 +-
 srcpkgs/zsh-completions/template              |     4 +-
 srcpkgs/zstd/template                         |     7 +-
 srcpkgs/zulucrypt/template                    |     7 +-
 2552 files changed, 55414 insertions(+), 45921 deletions(-)
 create mode 100644 srcpkgs/66-tools/template
 create mode 100644 srcpkgs/Amass/template
 delete mode 100644 srcpkgs/ClusterSSH/update
 create mode 100644 srcpkgs/Electron-Cash/template
 create mode 100644 srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
 rename srcpkgs/LuaJIT/{patches => files/patches/ppc64}/add-ppc64-support.patch (100%)
 rename srcpkgs/LuaJIT/{patches => files/patches/ppc64}/fix-vm-jit-ppc64.patch (100%)
 create mode 100644 srcpkgs/MEGAcmd/patches/megacmd-sdk36.diff
 delete mode 100644 srcpkgs/MEGAcmd/patches/musl.patch
 create mode 100644 srcpkgs/MEGAsync/patches/breakpad.patch
 create mode 100644 srcpkgs/Solaar/template
 create mode 100644 srcpkgs/The-Powder-Toy/template
 create mode 100644 srcpkgs/UEFITool/template
 delete mode 100644 srcpkgs/Uranium/patches/fix-crash-in-cura.patch
 create mode 100644 srcpkgs/alpine/patches/418e8bc5.patch
 delete mode 100755 srcpkgs/android-tools/files/generate_build.rb
 delete mode 100644 srcpkgs/android-tools/patches/gcc-fixes.patch
 delete mode 100644 srcpkgs/android-tools/patches/include-sys-sysmacros.patch
 delete mode 100644 srcpkgs/android-tools/patches/musl-fixes.patch
 delete mode 100644 srcpkgs/android-tools/patches/undef__USE_GNU.patch
 create mode 120000 srcpkgs/apache-directory-studio
 rename srcpkgs/{apache-directory-studio => apache-directory-studio-bin}/files/ApacheDirectoryStudio.desktop (100%)
 rename srcpkgs/{apache-directory-studio => apache-directory-studio-bin}/template (56%)
 rename srcpkgs/{apache-directory-studio => apache-directory-studio-bin}/update (100%)
 create mode 100644 srcpkgs/apache-jmeter/update
 create mode 100644 srcpkgs/arduino/patches/astyle_fix.patch
 delete mode 100644 srcpkgs/aria2/patches/patch-src_libssl_compat_h.patch
 create mode 100644 srcpkgs/aribas/update
 delete mode 100644 srcpkgs/assimp/patches/0001-glext_h_conflict.patch
 create mode 100644 srcpkgs/assimp/patches/musl.patch
 create mode 100644 srcpkgs/assimp_qt_viewer/template
 delete mode 100644 srcpkgs/atk/patches/fix-cross-gir.patch
 create mode 100644 srcpkgs/babeld/patches/45.patch
 create mode 100644 srcpkgs/backintime-qt/template
 create mode 100644 srcpkgs/bash/files/bash50-008
 create mode 100644 srcpkgs/bash/files/bash50-009
 create mode 100644 srcpkgs/bash/files/bash50-010
 create mode 100644 srcpkgs/bash/files/bash50-011
 create mode 100644 srcpkgs/bcal/patches/non-null.patch
 create mode 100644 srcpkgs/beignet/patches/llvm8.patch
 create mode 100644 srcpkgs/beignet/patches/llvm9.patch
 create mode 100644 srcpkgs/blender/patches/altivec-all.patch
 create mode 100644 srcpkgs/blender/patches/gcc9-elbeem.patch
 create mode 100755 srcpkgs/bluez/files/bluetooth-meshd/run
 delete mode 100644 srcpkgs/bluez/patches/0001-Allow-using-obexd-without-systemd-in-the-user-session.patch
 create mode 100644 srcpkgs/bluez/patches/0001-enable-dbus-without-systemd.patch
 create mode 100644 srcpkgs/bluez/patches/0002-allow-obexd-on-non-systemd-system.patch
 delete mode 100644 srcpkgs/bluez/patches/0002-bluetoothd-dbus-service.patch
 create mode 100644 srcpkgs/bluez/patches/0003-allow-mesh-on-non-systemd-system.patch
 delete mode 100644 srcpkgs/bluez/patches/0003-bluetooth-group-can-use-bluez.patch
 create mode 100644 srcpkgs/bluez/patches/0004-include-sys-time.h-for-musl-build.patch
 create mode 100644 srcpkgs/bluez/patches/0005-include-limits.h-for-musl-build.patch
 rename srcpkgs/bluez/patches/{musl.patch => 0006-musl-fix.patch} (52%)
 create mode 100644 srcpkgs/bluez/patches/0007-include-string.h.patch
 create mode 100644 srcpkgs/bluez/patches/0008-grant-permission-to-bluetooth-group.patch
 create mode 100644 srcpkgs/bluez/patches/0009-adapter-Don-t-refresh-adv_manager-for-non-LE-devices.patch
 delete mode 100644 srcpkgs/brisk-menu/patches/69fa052df45c1fa439f6af0a2c8e9795087b9444.patch
 create mode 100644 srcpkgs/cage/template
 create mode 100644 srcpkgs/calcurse/patches/DST-fix-date-change.patch
 create mode 100644 srcpkgs/calligra/patches/qt5.13.patch
 create mode 100644 srcpkgs/camlp4/patches/version-hack.patch
 create mode 100644 srcpkgs/cargo/patches/revert-libgit2-sys-api.patch
 create mode 100644 srcpkgs/celluloid/template
 create mode 100644 srcpkgs/cheat/template
 create mode 100644 srcpkgs/chromium/patches/harfbuzz-subset.patch
 create mode 100644 srcpkgs/chromium/patches/linked-hash-set.patch
 create mode 100644 srcpkgs/chromium/patches/one_euro_filter.patch
 create mode 100644 srcpkgs/chromium/patches/sandbox-sched_getparam.patch
 delete mode 100644 srcpkgs/cinnamon/patches/595178cf57b80b977401460a147602832157b303.patch
 delete mode 100644 srcpkgs/cinnamon/patches/default-theme.patch
 delete mode 100644 srcpkgs/cinnamon/patches/set_wheel.patch
 delete mode 100644 srcpkgs/clementine/patches/add-missing-functional-includes-5630.patch
 delete mode 100644 srcpkgs/clementine/patches/clementine-chromaprint-1.4.patch
 delete mode 100644 srcpkgs/clementine/patches/clementine-moodbar_flags.patch
 delete mode 100644 srcpkgs/clementine/patches/clementine-sqlite-3.12.patch
 delete mode 100644 srcpkgs/clementine/patches/protobuf-370.patch
 delete mode 100644 srcpkgs/clementine/patches/sentinel.patch
 create mode 100644 srcpkgs/clipman/template
 create mode 100644 srcpkgs/cmixer/patches/linux.patch
 create mode 100644 srcpkgs/cmixer/template
 create mode 100644 srcpkgs/cnping/INSTALL
 create mode 100644 srcpkgs/cnping/template
 create mode 100644 srcpkgs/connman/files/musl/freeaddrinfo.patch
 create mode 100644 srcpkgs/consul-template/template
 create mode 100644 srcpkgs/coyim/template
 delete mode 120000 srcpkgs/cross-aarch64-linux-gnu/files/non-nullness.patch
 create mode 120000 srcpkgs/cross-aarch64-linux-musl/files/gccgo-musl.patch
 delete mode 120000 srcpkgs/cross-aarch64-linux-musl/files/non-nullness.patch
 delete mode 120000 srcpkgs/cross-arm-linux-gnueabi/files/non-nullness.patch
 delete mode 120000 srcpkgs/cross-arm-linux-gnueabihf/files/non-nullness.patch
 create mode 120000 srcpkgs/cross-arm-linux-musleabi/files/gccgo-musl.patch
 delete mode 120000 srcpkgs/cross-arm-linux-musleabi/files/non-nullness.patch
 create mode 120000 srcpkgs/cross-arm-linux-musleabihf/files/gccgo-musl.patch
 delete mode 120000 srcpkgs/cross-arm-linux-musleabihf/files/non-nullness.patch
 delete mode 120000 srcpkgs/cross-armv7l-linux-gnueabihf/files/non-nullness.patch
 create mode 120000 srcpkgs/cross-armv7l-linux-musleabihf/files/gccgo-musl.patch
 delete mode 120000 srcpkgs/cross-armv7l-linux-musleabihf/files/non-nullness.patch
 delete mode 120000 srcpkgs/cross-i686-linux-musl/files/bug90756.patch
 create mode 120000 srcpkgs/cross-i686-linux-musl/files/gccgo-musl.patch
 delete mode 120000 srcpkgs/cross-i686-linux-musl/files/non-nullness.patch
 delete mode 120000 srcpkgs/cross-i686-pc-linux-gnu/files/bug90756.patch
 delete mode 120000 srcpkgs/cross-i686-pc-linux-gnu/files/non-nullness.patch
 delete mode 120000 srcpkgs/cross-mips-linux-musl/files/non-nullness.patch
 delete mode 120000 srcpkgs/cross-mips-linux-muslhf/files/non-nullness.patch
 delete mode 120000 srcpkgs/cross-mipsel-linux-musl/files/non-nullness.patch
 delete mode 120000 srcpkgs/cross-mipsel-linux-muslhf/files/non-nullness.patch
 delete mode 120000 srcpkgs/cross-powerpc-linux-gnu/files/non-nullness.patch
 create mode 120000 srcpkgs/cross-powerpc-linux-musl/files/gccgo-musl.patch
 delete mode 120000 srcpkgs/cross-powerpc-linux-musl/files/non-nullness.patch
 create mode 120000 srcpkgs/cross-powerpc64-linux-gnu/files/darn.patch
 delete mode 120000 srcpkgs/cross-powerpc64-linux-gnu/files/non-nullness.patch
 create mode 120000 srcpkgs/cross-powerpc64-linux-musl/files/darn.patch
 create mode 120000 srcpkgs/cross-powerpc64-linux-musl/files/gccgo-musl.patch
 delete mode 120000 srcpkgs/cross-powerpc64-linux-musl/files/non-nullness.patch
 create mode 120000 srcpkgs/cross-powerpc64le-linux-gnu/files/darn.patch
 delete mode 120000 srcpkgs/cross-powerpc64le-linux-gnu/files/non-nullness.patch
 create mode 120000 srcpkgs/cross-powerpc64le-linux-musl/files/darn.patch
 create mode 120000 srcpkgs/cross-powerpc64le-linux-musl/files/gccgo-musl.patch
 delete mode 120000 srcpkgs/cross-powerpc64le-linux-musl/files/non-nullness.patch
 create mode 120000 srcpkgs/cross-x86_64-linux-musl/files/gccgo-musl.patch
 delete mode 120000 srcpkgs/cross-x86_64-linux-musl/files/non-nullness.patch
 delete mode 100644 srcpkgs/crypto++/patches/arm-native.patch
 delete mode 100644 srcpkgs/crypto++/patches/musl-soname-links.patch
 delete mode 100644 srcpkgs/cups/patches/cups-no-gzip-man.patch
 delete mode 100644 srcpkgs/cura-engine/patches/0001-Remove-default-none-so-that-it-compiles-in-gcc9.patch
 create mode 100644 srcpkgs/delta/template
 create mode 100644 srcpkgs/diffr/template
 delete mode 100644 srcpkgs/dma/patches/musl_sys_param_h.patch
 create mode 100644 srcpkgs/dnsmasq/patches/nettle35.patch
 create mode 100644 srcpkgs/docker-compose/patches/pyyaml_version.patch
 create mode 100644 srcpkgs/dracut/patches/ppc-mac-thermal.patch
 create mode 120000 srcpkgs/drumstick-devel
 create mode 100644 srcpkgs/drumstick/template
 delete mode 100644 srcpkgs/edbrowse/patches/curl-7.62.patch
 create mode 100644 srcpkgs/eggdrop/template
 create mode 100644 srcpkgs/evtest/patches/0001-Add-missing-limits.h-include.patch
 create mode 100644 srcpkgs/exec-on-git-staged/template
 delete mode 100644 srcpkgs/exiv2/patches/musl.patch
 delete mode 100644 srcpkgs/fetchmail/patches/patch-socket_c.diff
 create mode 100644 srcpkgs/ffuf/template
 create mode 100644 srcpkgs/fierce/template
 delete mode 100644 srcpkgs/findutils/patches/gnulib-freadahead.patch
 delete mode 100644 srcpkgs/findutils/patches/gnulib-fseeko.patch
 delete mode 100644 srcpkgs/findutils/patches/gnulib-mountlist.patch
 delete mode 100644 srcpkgs/findutils/patches/gnulib-stdio-impl.patch
 rename srcpkgs/{firefox-esr-i18n-as => firefox-esr-i18n-bn} (100%)
 rename srcpkgs/{firefox-esr-i18n-bn-BD => firefox-esr-i18n-en-CA} (100%)
 rename srcpkgs/{firefox-esr-i18n-bn-IN => firefox-esr-i18n-ia} (100%)
 rename srcpkgs/{firefox-esr-i18n-en-ZA => firefox-esr-i18n-ne-NP} (100%)
 rename srcpkgs/{firefox-esr-i18n-mai => firefox-esr-i18n-oc} (100%)
 delete mode 120000 srcpkgs/firefox-esr-i18n-or
 rename srcpkgs/{firefox-esr-i18n-ml => firefox-esr-i18n-ur} (100%)
 create mode 120000 srcpkgs/firefox-esr-i18n/files/update-lang-list
 create mode 100644 srcpkgs/firefox-esr/patches/disable-image-format-warning.patch
 create mode 100644 srcpkgs/firefox-esr/patches/fix-arm-opus-include.patch
 create mode 100644 srcpkgs/firefox-esr/patches/fix-wasm-arm.patch
 delete mode 100644 srcpkgs/firefox-esr/patches/fix-webrtc-arm.patch
 delete mode 100644 srcpkgs/firefox-esr/patches/fix-xpcom.patch
 rename srcpkgs/{firefox/patches/fix-musl.patch => firefox-esr/patches/gettid-musl.patch} (100%)
 delete mode 100644 srcpkgs/firefox-esr/patches/ppc-no-static-sizes.patch
 create mode 100644 srcpkgs/firefox-esr/patches/rust-cssparser.patch
 delete mode 100644 srcpkgs/firefox-esr/patches/rust-unitialized-field.patch
 delete mode 100644 srcpkgs/firefox-esr/patches/rust133.patch
 delete mode 100644 srcpkgs/firefox-esr/patches/save-and-restore-non-volatile-x28-on-arm64.patch
 delete mode 100644 srcpkgs/firefox-esr/patches/save-x28-before-clobbering-it-in-the-regex-compiler.patch
 create mode 100644 srcpkgs/firefox-esr/patches/yuv-be.patch
 create mode 120000 srcpkgs/firefox-i18n-bn
 create mode 120000 srcpkgs/firefox-i18n-en-CA
 create mode 120000 srcpkgs/firefox-i18n-ia
 create mode 120000 srcpkgs/firefox-i18n-ne-NP
 create mode 120000 srcpkgs/firefox-i18n-oc
 create mode 120000 srcpkgs/firefox-i18n-ur
 create mode 100755 srcpkgs/firefox-i18n/files/update-lang-list
 create mode 100644 srcpkgs/firefox/patches/initialize_sched_param.patch
 delete mode 100644 srcpkgs/firefox/patches/ppc64le-bug-1512162.patch
 delete mode 100644 srcpkgs/flatbuffers/patches/install.patch
 create mode 100644 srcpkgs/fmtools/template
 create mode 100644 srcpkgs/freecad/patches/020-namespace-missing-std.patch
 create mode 100644 srcpkgs/fuse-mp3fs/template
 create mode 100644 srcpkgs/gcc/files/gccgo-musl.patch
 delete mode 100644 srcpkgs/gcc/patches/bug90756.patch
 create mode 100644 srcpkgs/gcc/patches/darn.patch
 create mode 100644 srcpkgs/gcc/patches/libffi_gnulinux.patch
 delete mode 100644 srcpkgs/gcc/patches/non-nullness.patch
 create mode 100644 srcpkgs/geda/patches/snarf_cpp_opts.patch
 create mode 100644 srcpkgs/gfuzz/template
 create mode 100644 srcpkgs/git-mediate/template
 delete mode 100644 srcpkgs/gnome-builder/patches/dont-require-FNM_EXTMATCH.patch
 delete mode 100644 srcpkgs/gnome-contacts/patches/ambiguous.patch
 create mode 120000 srcpkgs/gnome-mpv
 delete mode 100644 srcpkgs/gnome-mpv/template
 delete mode 100644 srcpkgs/gnome-todo/patches/6cdabc4dd0c6c804a093b94c269461ce376fed4f.patch
 create mode 100644 srcpkgs/gnome-todo/patches/gnome-todo-eds-libecal-2.0.patch
 create mode 100644 srcpkgs/gnupg2/patches/use-versioned-pcsclite.patch
 create mode 100644 srcpkgs/go-review/template
 create mode 100644 srcpkgs/go/patches/gohostarch-bootstrap-fix.patch
 create mode 100644 srcpkgs/gomatrix/template
 create mode 100644 srcpkgs/gopls/template
 create mode 100644 srcpkgs/gperftools/patches/elf-mem-image-musl.patch
 create mode 100644 srcpkgs/gperftools/patches/ppc-musl.patch
 create mode 100644 srcpkgs/gsl/patches/ppc-musl.patch
 create mode 100644 srcpkgs/gucci/template
 delete mode 100644 srcpkgs/guitarix2/patches/musl.patch
 delete mode 100644 srcpkgs/gutenprint/patches/musl.patch
 create mode 120000 srcpkgs/gxi
 delete mode 100644 srcpkgs/gxi/template
 create mode 100644 srcpkgs/i3status/patches/pulseaudio-optional.patch
 create mode 100644 srcpkgs/ibus-m17n/INSTALL.msg
 create mode 100644 srcpkgs/ibus-m17n/template
 rename srcpkgs/{firefox-esr/patches/fix-musl.patch => icecat/patches/fix-gettid.patch} (61%)
 delete mode 100644 srcpkgs/icecat/patches/fix-musl.patch
 create mode 100644 srcpkgs/icecat/patches/rust-cssparser.patch
 delete mode 100644 srcpkgs/icewm/patches/use-NULL.patch
 create mode 100644 srcpkgs/jbig2dec/patches/2002_abi_compat.patch
 create mode 120000 srcpkgs/jreen-qt5
 delete mode 100644 srcpkgs/jreen-qt5/template
 delete mode 100644 srcpkgs/juCi++/patches/libgit2-0.28.patch
 create mode 100755 srcpkgs/k3s/files/k3s-agent/log/run
 create mode 100755 srcpkgs/k3s/files/k3s-agent/run
 create mode 100755 srcpkgs/k3s/files/k3s-server/log/run
 create mode 100755 srcpkgs/k3s/files/k3s-server/run
 create mode 100644 srcpkgs/k3s/template
 create mode 120000 srcpkgs/kColorPicker-devel
 create mode 100644 srcpkgs/kColorPicker/template
 create mode 120000 srcpkgs/kImageAnnotator-devel
 create mode 100644 srcpkgs/kImageAnnotator/template
 create mode 120000 srcpkgs/kbfs
 delete mode 100644 srcpkgs/kbfs/template
 delete mode 100644 srcpkgs/kea/patches/fix-musl-getopt.patch
 rename srcpkgs/{kbfs/INSTALL => keybase/kbfs.INSTALL} (100%)
 create mode 100644 srcpkgs/kgpg/template
 delete mode 100644 srcpkgs/kitty/patches/musl.patch
 delete mode 120000 srcpkgs/kodi-rpi/files/swig.nojava-18.3
 create mode 120000 srcpkgs/kodi-rpi/files/swig.nojava-18.4
 rename srcpkgs/kodi/files/{swig.nojava-18.3 => swig.nojava-18.4}/AddonModuleXbmc.i.cpp (99%)
 rename srcpkgs/kodi/files/{swig.nojava-18.3 => swig.nojava-18.4}/AddonModuleXbmc.i.xml (61%)
 rename srcpkgs/kodi/files/{swig.nojava-18.3 => swig.nojava-18.4}/AddonModuleXbmcaddon.i.cpp (99%)
 rename srcpkgs/kodi/files/{swig.nojava-18.3 => swig.nojava-18.4}/AddonModuleXbmcaddon.i.xml (58%)
 rename srcpkgs/kodi/files/{swig.nojava-18.3 => swig.nojava-18.4}/AddonModuleXbmcdrm.i.cpp (99%)
 rename srcpkgs/kodi/files/{swig.nojava-18.3 => swig.nojava-18.4}/AddonModuleXbmcdrm.i.xml (59%)
 rename srcpkgs/kodi/files/{swig.nojava-18.3 => swig.nojava-18.4}/AddonModuleXbmcgui.i.cpp (99%)
 rename srcpkgs/kodi/files/{swig.nojava-18.3 => swig.nojava-18.4}/AddonModuleXbmcgui.i.xml (67%)
 rename srcpkgs/kodi/files/{swig.nojava-18.3 => swig.nojava-18.4}/AddonModuleXbmcplugin.i.cpp (99%)
 rename srcpkgs/kodi/files/{swig.nojava-18.3 => swig.nojava-18.4}/AddonModuleXbmcplugin.i.xml (59%)
 rename srcpkgs/kodi/files/{swig.nojava-18.3 => swig.nojava-18.4}/AddonModuleXbmcvfs.i.cpp (99%)
 rename srcpkgs/kodi/files/{swig.nojava-18.3 => swig.nojava-18.4}/AddonModuleXbmcvfs.i.xml (59%)
 rename srcpkgs/kodi/files/{swig.nojava-18.3 => swig.nojava-18.4}/AddonModuleXbmcwsgi.i.cpp (99%)
 rename srcpkgs/kodi/files/{swig.nojava-18.3 => swig.nojava-18.4}/AddonModuleXbmcwsgi.i.xml (61%)
 create mode 100644 srcpkgs/krita/patches/musl.patch
 delete mode 100644 srcpkgs/ksh/files/LICENSE
 create mode 100644 srcpkgs/ksnip/patches/useGNUInstallDirs.patch
 create mode 100644 srcpkgs/ksnip/template
 delete mode 100644 srcpkgs/libGL/patches/add-glx-use-tls.patch
 create mode 100644 srcpkgs/libGL/patches/add-use-elf-tls.patch
 create mode 100644 srcpkgs/libGL/patches/ppc-auxval.patch
 create mode 100644 srcpkgs/libcmis/patches/no-include-cxx-headers-from-extern-c.patch
 create mode 100644 srcpkgs/libcxx/patches/ppc.patch
 delete mode 100644 srcpkgs/libgit2-0.27/template
 delete mode 100644 srcpkgs/libgit2-0.27/update
 delete mode 100644 srcpkgs/libgweather/patches/conditionalize-gir.patch
 create mode 120000 srcpkgs/libknet1-devel
 create mode 100644 srcpkgs/libknet1/patches/01_musl_fix.diff
 create mode 100644 srcpkgs/libknet1/template
 create mode 120000 srcpkgs/libllvm9
 create mode 120000 srcpkgs/libluv-devel
 create mode 100644 srcpkgs/libluv/template
 delete mode 100644 srcpkgs/libnl3/patches/musl.patch
 create mode 120000 srcpkgs/libnozzle1
 create mode 120000 srcpkgs/libnozzle1-devel
 delete mode 100644 srcpkgs/libpcap/patches/fix-musl.patch
 create mode 120000 srcpkgs/libpwquality-python3
 create mode 100644 srcpkgs/libsigsegv/patches/ppc-musl.patch
 create mode 120000 srcpkgs/liburing-devel
 create mode 100644 srcpkgs/liburing/template
 create mode 120000 srcpkgs/libvarnishapi
 create mode 120000 srcpkgs/libvarnishapi-devel
 create mode 120000 srcpkgs/libxfce4panel
 create mode 100644 srcpkgs/licensor/template
 delete mode 100644 srcpkgs/linux-tools/patches/turbostat.patch
 delete mode 100644 srcpkgs/linux4.4/patches/gcc9.patch
 delete mode 120000 srcpkgs/linux5.1-dbg
 delete mode 120000 srcpkgs/linux5.1-headers
 create mode 120000 srcpkgs/linux5.3-dbg
 create mode 120000 srcpkgs/linux5.3-headers
 rename srcpkgs/{linux5.1 => linux5.3}/files/DocBook/Makefile (100%)
 rename srcpkgs/{linux5.1 => linux5.3}/files/arm-dotconfig (91%)
 rename srcpkgs/{linux5.1 => linux5.3}/files/arm64-dotconfig (91%)
 rename srcpkgs/{linux5.1 => linux5.3}/files/i386-dotconfig (92%)
 rename srcpkgs/{linux5.1 => linux5.3}/files/mv-debug (100%)
 rename srcpkgs/{linux5.1 => linux5.3}/files/ppc-dotconfig (93%)
 rename srcpkgs/{linux5.1 => linux5.3}/files/ppc64-dotconfig (92%)
 rename srcpkgs/{linux5.1 => linux5.3}/files/ppc64le-dotconfig (92%)
 rename srcpkgs/{linux5.1 => linux5.3}/files/x86_64-dotconfig (92%)
 rename srcpkgs/{linux5.1 => linux5.3}/patches/ppc64-be-elfv2.patch (100%)
 rename srcpkgs/{linux5.1 => linux5.3}/patches/smsc95xx-mac.patch (100%)
 rename srcpkgs/{linux5.1 => linux5.3}/template (96%)
 create mode 100644 srcpkgs/llvm-libunwind/patches/ppc32.patch
 create mode 100644 srcpkgs/llvm9/files/llvm-Config-config.h
 create mode 100644 srcpkgs/llvm9/files/llvm-Config-llvm-config.h
 create mode 100644 srcpkgs/llvm9/files/patches/cfe/cfe-001-fix-unwind-chain-inclusion.patch
 create mode 100644 srcpkgs/llvm9/files/patches/cfe/cfe-002-add-musl-triples.patch
 create mode 100644 srcpkgs/llvm9/files/patches/cfe/cfe-003-ppc64-dynamic-linker-path.patch
 create mode 100644 srcpkgs/llvm9/files/patches/cfe/cfe-004-ppc64-musl-elfv2.patch
 create mode 100644 srcpkgs/llvm9/files/patches/cfe/cfe-005-gcc9.patch
 create mode 100644 srcpkgs/llvm9/files/patches/lldb/musl.patch
 create mode 100644 srcpkgs/llvm9/files/patches/llvm/llvm-001-musl.patch
 create mode 100644 srcpkgs/llvm9/files/patches/llvm/llvm-002-musl-ppc64-elfv2.patch
 create mode 100644 srcpkgs/llvm9/files/patches/llvm/llvm-003-secureplt.patch
 create mode 100644 srcpkgs/llvm9/files/patches/llvm/llvm-004-override-opt.patch
 create mode 100644 srcpkgs/llvm9/template
 create mode 100644 srcpkgs/llvm9/update
 create mode 100755 srcpkgs/lprng/files/lprng/run
 create mode 100644 srcpkgs/lprng/template
 create mode 100644 srcpkgs/lsd/template
 create mode 100755 srcpkgs/lsyncd/files/lsyncd/log/run
 create mode 100644 srcpkgs/magic-wormhole/template
 create mode 100644 srcpkgs/mariadb/patches/force-c11-atomics.patch
 create mode 100644 srcpkgs/mariadb/patches/libatomic.patch
 create mode 100644 srcpkgs/mariadb/patches/musl-ppc.patch
 create mode 100644 srcpkgs/mftrace/patches/gf2pbm.1.patch
 create mode 100644 srcpkgs/minijail/template
 create mode 120000 srcpkgs/mkpasswd
 create mode 100644 srcpkgs/mono/patches/fix-heapviz-import.patch
 create mode 100644 srcpkgs/mono/patches/musl.patch
 create mode 100644 srcpkgs/monolith/template
 create mode 100644 srcpkgs/moserial/template
 create mode 100644 srcpkgs/mpDris2/files/mpDris2/run
 create mode 100644 srcpkgs/mpDris2/template
 create mode 100644 srcpkgs/mtm/template
 delete mode 100644 srcpkgs/mumble/patches/musl-dlsym.patch
 delete mode 100644 srcpkgs/mumble/patches/protobuf-370.patch
 delete mode 100644 srcpkgs/mumble/patches/speech-dispatcher.patch
 delete mode 100644 srcpkgs/mumble/patches/std-float.patch
 delete mode 100644 srcpkgs/mutter/patches/meta-renderer-x11.patch
 create mode 100644 srcpkgs/mymcplus/template
 create mode 100644 srcpkgs/next/template
 delete mode 100644 srcpkgs/nilfs-utils/patches/max-input.patch
 delete mode 100644 srcpkgs/nilfs-utils/patches/rpc-types.patch
 delete mode 100644 srcpkgs/nvidia390/files/kernel-5.1-x86_64.patch
 delete mode 100644 srcpkgs/nvidia390/files/kernel-5.1.patch
 delete mode 100644 srcpkgs/nvidia390/files/kernel-5.2-x86_64.patch
 create mode 100644 srcpkgs/nvme-cli/INSTALL
 create mode 100644 srcpkgs/nvme-cli/REMOVE
 create mode 100644 srcpkgs/occt/files/opencascade.sh
 delete mode 100644 srcpkgs/open-iscsi/patches/ether.patch
 delete mode 100644 srcpkgs/open-iscsi/patches/fix-musl-2.patch
 delete mode 100644 srcpkgs/open-vm-tools/patches/gcc9.patch
 create mode 100644 srcpkgs/opendkim/files/opendkim/run
 delete mode 100644 srcpkgs/openssh/patches/setproctitle.patch
 create mode 100644 srcpkgs/pam_rundir/patches/fix.patch
 create mode 100644 srcpkgs/papi/patches/gnu_source.patch
 create mode 100644 srcpkgs/paraview/template
 delete mode 100644 srcpkgs/parted/patches/fix-glibc-2.27.patch
 delete mode 100644 srcpkgs/parted/patches/fix-includes.patch
 create mode 100644 srcpkgs/passphrase2pgp/template
 create mode 100644 srcpkgs/pastel/template
 create mode 100644 srcpkgs/pd/patches/fix-musl.patch
 create mode 100644 srcpkgs/pdsh/patches/fix_configure_ac.patch
 create mode 100644 srcpkgs/pdsh/template
 create mode 100644 srcpkgs/perl-Curses-UI/template
 create mode 100644 srcpkgs/perl-Math-FFT/template
 delete mode 100644 srcpkgs/perl-WWW-Curl/patches/CURL_STRICTER.patch
 create mode 100644 srcpkgs/perl-WWW-Curl/patches/curl-7.50.2.patch
 create mode 100644 srcpkgs/peru/template
 create mode 100644 srcpkgs/pfetch/template
 create mode 100644 srcpkgs/pioneer/update
 create mode 100644 srcpkgs/pkgtop/template
 create mode 100644 srcpkgs/plasma-thunderbolt/template
 create mode 100644 srcpkgs/plata-theme/INSTALL.msg
 delete mode 100644 srcpkgs/png++/patches/musl-error.patch
 delete mode 100644 srcpkgs/poedit/patches/LearnMoreLink.patch
 create mode 100644 srcpkgs/poezio/update
 create mode 100644 srcpkgs/postgis/patches/postgis-2.5.3-PROTOCC_VERSION.patch
 create mode 100644 srcpkgs/postgis/update
 create mode 100644 srcpkgs/proot/patches/disable-seccomp-based-tracing.patch
 create mode 100644 srcpkgs/proot/patches/makefile-fix-vars.patch
 create mode 100644 srcpkgs/protontricks/template
 delete mode 100644 srcpkgs/pulseaudio/patches/fix-alsa-module.patch
 create mode 100644 srcpkgs/pyradio/INSTALL.msg
 create mode 100644 srcpkgs/pyradio/template
 delete mode 100644 srcpkgs/python-cryptography/patches/libressl.patch
 create mode 100644 srcpkgs/python-cryptography_vectors/template
 create mode 100644 srcpkgs/python-fonttools/update
 delete mode 100644 srcpkgs/python-html2text/template
 create mode 100644 srcpkgs/python-iso-8601/template
 create mode 120000 srcpkgs/python-pafy
 delete mode 100644 srcpkgs/python-pafy/template
 create mode 100644 srcpkgs/python-pretend/template
 create mode 100644 srcpkgs/python-rfc6555/template
 delete mode 100644 srcpkgs/python-scikit-learn/template
 delete mode 100644 srcpkgs/python-scipy/template
 delete mode 100644 srcpkgs/python-zeroconf/template
 delete mode 100644 srcpkgs/python-zeroconf/update
 create mode 100644 srcpkgs/python3-Flask-HTTPAuth/template
 create mode 100644 srcpkgs/python3-PyJWT/template
 delete mode 120000 srcpkgs/python3-astroid
 create mode 100644 srcpkgs/python3-astroid/template
 create mode 100644 srcpkgs/python3-autobahn/template
 rename srcpkgs/{python-bcc => python3-bcc} (100%)
 create mode 120000 srcpkgs/python3-cryptography_vectors
 create mode 100644 srcpkgs/python3-distro/template
 create mode 100644 srcpkgs/python3-fido2/template
 delete mode 120000 srcpkgs/python3-fonttools
 create mode 100644 srcpkgs/python3-fonttools/template
 create mode 100644 srcpkgs/python3-hkdf/template
 delete mode 120000 srcpkgs/python3-html2text
 create mode 100644 srcpkgs/python3-html2text/template
 create mode 120000 srcpkgs/python3-iso-8601
 create mode 100644 srcpkgs/python3-libevdev/template
 create mode 120000 srcpkgs/python3-mechanize
 create mode 100644 srcpkgs/python3-mpi4py/template
 delete mode 120000 srcpkgs/python3-pafy
 create mode 100644 srcpkgs/python3-pafy/template
 delete mode 120000 srcpkgs/python3-pandas
 rename srcpkgs/{python-pandas/python3-pandas.INSTALL.msg => python3-pandas/INSTALL.msg} (100%)
 create mode 100644 srcpkgs/python3-pandas/template
 create mode 100644 srcpkgs/python3-pandas/update
 create mode 120000 srcpkgs/python3-pretend
 create mode 100644 srcpkgs/python3-pyfiglet/template
 delete mode 120000 srcpkgs/python3-pylint
 create mode 100644 srcpkgs/python3-pylint/template
 create mode 120000 srcpkgs/python3-regex
 create mode 120000 srcpkgs/python3-rfc6555
 create mode 100644 srcpkgs/python3-rss2email/template
 create mode 100644 srcpkgs/python3-scard/template
 delete mode 120000 srcpkgs/python3-scikit-learn
 create mode 100644 srcpkgs/python3-scikit-learn/template
 delete mode 120000 srcpkgs/python3-scipy
 create mode 100644 srcpkgs/python3-scipy/template
 rename srcpkgs/{python-scipy => python3-scipy}/update (100%)
 create mode 100644 srcpkgs/python3-spake2/template
 create mode 100644 srcpkgs/python3-tinycss/template
 create mode 100644 srcpkgs/python3-txaio/template
 create mode 100644 srcpkgs/python3-txtorcon/template
 create mode 100644 srcpkgs/python3-usb/template
 create mode 100644 srcpkgs/python3-vdf/template
 create mode 100644 srcpkgs/qt/patches/gcc9-qforeach.patch
 create mode 100644 srcpkgs/qt5-webkit/patches/musl-ppc.patch
 create mode 100644 srcpkgs/qt5-webkit/patches/ppc-llint.patch
 create mode 100644 srcpkgs/qt5-webkit/patches/reduce-exports.patch
 create mode 100644 srcpkgs/qt5/patches/0027-remove-glibc-check.patch
 delete mode 100644 srcpkgs/qt5/patches/0048-qtbug-76742.patch
 create mode 100644 srcpkgs/qt5/patches/0049-big-endian-scroll.patch
 create mode 100644 srcpkgs/qt5/patches/0050-pulse-stubs.patch
 create mode 100644 srcpkgs/qt5/patches/0100-qtbug-77364.patch
 create mode 100644 srcpkgs/qtcreator/patches/clang9.patch
 create mode 100644 srcpkgs/qtcurve/patches/gtkprops_constexpr.patch
 create mode 100644 srcpkgs/rakudo/patches/fix-perl6-home-dir.patch
 delete mode 100644 srcpkgs/range-v3/patches/fix-is_trivial.patch
 create mode 100644 srcpkgs/reap/template
 delete mode 100644 srcpkgs/riot-desktop/patches/electron5.patch
 create mode 100644 srcpkgs/rsClock/template
 create mode 100644 srcpkgs/rust/patches/0007-Fix-C-aggregate-passing-ABI-on-powerpc.patch
 delete mode 100644 srcpkgs/rust/patches/0007-runtest-Fix-proc-macro-tests-on-musl-hosts.patch
 create mode 100644 srcpkgs/rust/patches/0008-Fix-zero-sized-aggregate-ABI-on-powerpc.patch
 create mode 100644 srcpkgs/rust/patches/0009-compiletest-Match-suffixed-environments.patch
 create mode 100644 srcpkgs/rust/patches/0010-test-c-variadic-Fix-patterns-on-powerpc64.patch
 rename srcpkgs/rust/patches/{0008-test-use-extern-for-plugins-Don-t-assume-multilib.patch => 0011-test-use-extern-for-plugins-Don-t-assume-multilib.patch} (79%)
 rename srcpkgs/rust/patches/{0009-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch => 0012-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch} (80%)
 rename srcpkgs/rust/patches/{0010-Ignore-broken-and-non-applicable-tests.patch => 0013-Ignore-broken-and-non-applicable-tests.patch} (71%)
 rename srcpkgs/rust/patches/{0011-Link-stage-2-tools-dynamically-to-libstd.patch => 0014-Link-stage-2-tools-dynamically-to-libstd.patch} (75%)
 rename srcpkgs/rust/patches/{0012-Move-debugger-scripts-to-usr-share-rust.patch => 0015-Move-debugger-scripts-to-usr-share-rust.patch} (85%)
 create mode 100644 srcpkgs/rust/patches/0091-bootstrap.patch
 delete mode 100644 srcpkgs/rust/patches/0091-lzma-sys-cross-ldflags.patch
 delete mode 100644 srcpkgs/sakura/patches/0002-Fixed-crash-with-vte-0.54-Bug-1790317.patch
 create mode 100644 srcpkgs/saml2aws/template
 create mode 100644 srcpkgs/scc/template
 create mode 100644 srcpkgs/shiboken2/patches/qstringlist.patch
 create mode 100644 srcpkgs/sops/template
 create mode 100644 srcpkgs/spotify-adblock-linux/files/spotify-adblock.desktop
 create mode 100644 srcpkgs/spotify-adblock-linux/template
 create mode 100644 srcpkgs/spotify-tui/template
 create mode 100644 srcpkgs/sqlmap/template
 delete mode 100644 srcpkgs/squashfs-tools/patches/CVE-2015-4645.patch
 delete mode 100644 srcpkgs/squashfs-tools/patches/fix-compat.patch
 delete mode 100644 srcpkgs/squashfs-tools/patches/vla-overlow.patch
 delete mode 100644 srcpkgs/stagit/patches/libgit2-0.28.patch
 create mode 100644 srcpkgs/starship/template
 delete mode 100644 srcpkgs/supercollider/patches/bbcd068659ced596402dedc78f49fabfab6470bd.patch
 create mode 100644 srcpkgs/swell-foop/patches/pivot_point.patch
 delete mode 100644 srcpkgs/synapse/patches/bump-python-dependencies.patch
 create mode 100644 srcpkgs/sysexxer-ng/template
 create mode 100644 srcpkgs/tarpaulin/template
 create mode 100644 srcpkgs/tau/template
 create mode 100644 srcpkgs/telegram-desktop/patches/stdafx.h.patch
 create mode 100644 srcpkgs/termdown/template
 delete mode 100644 srcpkgs/thunderbird/patches/disable-hunspell_hooks.patch
 create mode 100644 srcpkgs/thunderbird/patches/disable-image-format-warning.patch
 create mode 100644 srcpkgs/thunderbird/patches/fix-arm-opus-include.patch
 create mode 100644 srcpkgs/thunderbird/patches/fix-i686-ppc-musl.patch
 delete mode 100644 srcpkgs/thunderbird/patches/fix-rust-1.29.patch
 create mode 100644 srcpkgs/thunderbird/patches/fix-sandbox-membarrier.patch
 create mode 100644 srcpkgs/thunderbird/patches/fix-wasm-arm.patch
 delete mode 100644 srcpkgs/thunderbird/patches/fix-xpcom.patch
 create mode 100644 srcpkgs/thunderbird/patches/ppc32-skia-portable.patch
 create mode 100644 srcpkgs/thunderbird/patches/rust-configure.patch
 create mode 100644 srcpkgs/thunderbird/patches/rust-cssparser.patch
 delete mode 100644 srcpkgs/thunderbird/patches/rust-unitialized-field.patch
 delete mode 100644 srcpkgs/thunderbird/patches/rust133.patch
 create mode 100644 srcpkgs/thunderbird/patches/yuv-be.patch
 create mode 100644 srcpkgs/tor/patches/ppc.patch
 delete mode 100644 srcpkgs/tor/patches/ppc64.patch
 create mode 100644 srcpkgs/torbrowser-launcher/template
 create mode 100644 srcpkgs/usbguard/files/usbguard/run
 create mode 100644 srcpkgs/usbguard/patches/musl.patch
 create mode 100644 srcpkgs/usbguard/template
 create mode 100644 srcpkgs/util-linux/patches/chsh.patch
 delete mode 100644 srcpkgs/varnish/INSTALL.msg
 create mode 100755 srcpkgs/varnish/files/varnishd/log/run
 create mode 100755 srcpkgs/varnish/files/varnishd/run
 create mode 100644 srcpkgs/varnish/patches/musl.patch
 create mode 100644 srcpkgs/varnish/update
 create mode 100644 srcpkgs/vmpk/template
 delete mode 100644 srcpkgs/vpnc-scripts/patches/fix-ipv6.patch
 delete mode 100644 srcpkgs/webkit2gtk/patches/fix-fast-memory-disabled.patch
 create mode 100644 srcpkgs/webkit2gtk/patches/ppc-llint.patch
 create mode 120000 srcpkgs/wf-config-devel
 delete mode 100644 srcpkgs/wf-config/patches/fix-musl.patch
 create mode 100644 srcpkgs/wpa-cute/template
 create mode 100644 srcpkgs/xdg-dbus-proxy/patches/musl.patch
 create mode 100644 srcpkgs/xdgmenumaker/files/1.5/xdgmenumaker.1
 create mode 100644 srcpkgs/xpdf/update
 delete mode 100644 srcpkgs/ykpivmgr/patches/libressl.patch
 create mode 100644 srcpkgs/ykpivmgr/patches/ssl_obsolete.patch
 create mode 100644 srcpkgs/yubikey-manager/template
 delete mode 100644 srcpkgs/zaproxy/template
 delete mode 100644 srcpkgs/zaproxy/update

diff --git a/.travis.yml b/.travis.yml
index c6e23258590..d0ffe216573 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,5 @@
 language: bash
+dist: bionic
 
 git:
     depth: 200
diff --git a/common/build-style/cargo.sh b/common/build-style/cargo.sh
index a2a0dfe3744..cff16bee082 100644
--- a/common/build-style/cargo.sh
+++ b/common/build-style/cargo.sh
@@ -18,6 +18,6 @@ do_install() {
 	: ${make_cmd:=cargo}
 
 	${make_cmd} install --path . --target ${RUST_TARGET} --root="${DESTDIR}/usr" \
-		${make_install_args}
+		 --locked ${make_install_args}
 	rm "${DESTDIR}"/usr/.crates.toml
 }
diff --git a/common/build-style/meson.sh b/common/build-style/meson.sh
index 160dc16b417..d318978ea59 100644
--- a/common/build-style/meson.sh
+++ b/common/build-style/meson.sh
@@ -69,6 +69,10 @@ cpu_family = '${_MESON_CPU_FAMILY}'
 cpu = '${_MESON_TARGET_CPU}'
 endian = '${_MESON_TARGET_ENDIAN}'
 EOF
+		if [ "${hostmakedepends}" != "${hostmakedepends/qemu-user-static/}" ]; then
+			sed -e "/\[binaries\]/ a exe_wrapper = '/usr/bin/qemu-${XBPS_TARGET_QEMU_MACHINE}-static'" \
+				-i ${meson_crossfile}
+		fi
 
 		unset _MESON_CPU_FAMILY _MESON_TARGET_CPU _MESON_TARGET_ENDIAN
 	fi
@@ -78,6 +82,7 @@ do_configure() {
 	: ${meson_cmd:=meson}
 	: ${meson_builddir:=build}
 	: ${meson_crossfile:=xbps_meson.cross}
+	export QEMU_LD_PREFIX=${XBPS_CROSS_BASE}
 
 	if [ "$CROSS_BUILD" ]; then
 		configure_args+=" --cross-file=${meson_crossfile}"
@@ -130,6 +135,7 @@ do_build() {
 	: ${make_cmd:=ninja}
 	: ${make_build_target:=all}
 	: ${meson_builddir:=build}
+	export QEMU_LD_PREFIX=${XBPS_CROSS_BASE}
 
 	${make_cmd} -C ${meson_builddir} ${makejobs} ${make_build_args} ${make_build_target}
 }
@@ -146,6 +152,7 @@ do_install() {
 	: ${make_cmd:=ninja}
 	: ${make_install_target:=install}
 	: ${meson_builddir:=build}
+	export QEMU_LD_PREFIX=${XBPS_CROSS_BASE}
 
 	DESTDIR=${DESTDIR} ${make_cmd} -C ${meson_builddir} ${make_install_args} ${make_install_target}
 }
diff --git a/common/shlibs b/common/shlibs
index c95b078e0bf..cc3fd8383d8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -60,7 +60,7 @@ libgcc_s.so.1 libgcc-4.4.0_1
 libgo.so.14 libgo-9.1.0_1
 libmpx.so.2 libmpx-6.2.1_1
 libmpxwrappers.so.2 libmpx-6.2.1_1
-libperl.so.5.28 perl-5.28.0_1
+libperl.so.5.30 perl-5.30.0_1
 libgmp.so.10 gmp-5.0.1_1
 libgmpxx.so.4 gmpxx-6.0.0_2
 libmpfr.so.6 mpfr-4.0.0_1
@@ -146,8 +146,8 @@ libnvidia-gtk3.so.346.47 nvidia-gtklibs-346.47_1 ignore
 libnvidia-glcore.so.346.47 nvidia340-libs-340.46_1 ignore
 libnvidia-glcore.so.390.87 nvidia390-libs-390.87_1 ignore
 libnvidia-glsi.so.346.72 nvidia-libs-346.72_1 ignore
-libnvidia-fatbinaryloader.so.390.116 nvidia390-libs-390.116_1 ignore
-libnvidia-fatbinaryloader.so.430.14 nvidia-libs-430.14_1 ignore
+libnvidia-fatbinaryloader.so.390.129 nvidia390-libs-390.129_1 ignore
+libnvidia-fatbinaryloader.so.430.40 nvidia-libs-430.40_1 ignore
 libglapi.so.0 libglapi-7.11_1
 libgbm.so.1 libgbm-9.0_1
 librsvg-2.so.2 librsvg-2.26.0_1
@@ -182,8 +182,8 @@ libreadline.so.8 libreadline8-8.0_1
 libhistory.so.8 libhistory8-8.0_1
 libxfconf-0.so.3 xfconf-4.13.7_1
 libxfce4util.so.7 libxfce4util-4.12.1_1
-libxfce4panel-1.0.so.4 xfce4-panel-4.9.2_1
-libxfce4panel-2.0.so.4 xfce4-panel-4.12.0_1
+libxfce4panel-1.0.so.4 libxfce4panel-4.9.2_1
+libxfce4panel-2.0.so.4 libxfce4panel-4.12.0_1
 libgdbm.so.6 gdbm-1.16_1
 libgdbm_compat.so.4 gdbm-1.10_1_1
 libintl.so.8 gettext-libs-0.19.2_1
@@ -354,7 +354,7 @@ libMagickCore-6.Q16.so.6 libmagick6-6.9.10.11_1
 libMagickWand-6.Q16.so.6 libmagick6-6.9.10.11_1
 libMagick++-6.Q16.so.8 libmagick6-6.9.10.11_1
 libltdl.so.7 libltdl-2.2.6_1
-libpoppler.so.89 libpoppler89-0.78.0_1
+libpoppler.so.90 libpoppler89-0.80.0_1
 libpoppler-glib.so.8 poppler-glib-0.18.2_1
 libpoppler-cpp.so.0 poppler-cpp-0.18.2_1
 libpoppler-qt5.so.1 poppler-qt5-0.31.0_1
@@ -541,6 +541,8 @@ libkdexoauth2.so.3 kdepim-runtime-17.12.3_1
 libakonadi-filestore.so.5 kdepim-runtime-17.12.3_1
 libmaildir.so.5 kdepim-runtime-17.12.3_1
 libfolderarchivesettings.so.5 kdepim-runtime-17.12.3_1
+libkColorPicker.so.0.1.0 kColorPicker-0.1.0_1
+libkImageAnnotator.so.0.1.0 kImageAnnotator-0.1.0_1
 libbabl-0.1.so.0 babl-0.1.16_1
 libbamf3.so.2 bamf-0.5.1_1
 libicuio.so.64 icu-libs-64.1_1
@@ -624,16 +626,16 @@ libcamel-1.2.so.62 evolution-data-server-3.30.0_1
 libedataserver-1.2.so.24 evolution-data-server-3.32.0_1
 libebackend-1.2.so.10 evolution-data-server-3.17.90_1
 libedataserverui-1.2.so.2 evolution-data-server-3.28.0_1
-libebook-contacts-1.2.so.2 evolution-data-server-3.17.90_1
-libedata-book-1.2.so.25 evolution-data-server-3.8.0_1
-libebook-1.2.so.19 evolution-data-server-3.24.0_1
-libecal-1.2.so.19 evolution-data-server-3.18.0_1
+libebook-contacts-1.2.so.3 evolution-data-server-3.34.0_1
+libedata-book-1.2.so.26 evolution-data-server-3.34.0_1
+libebook-1.2.so.20 evolution-data-server-3.34.0_1
+libecal-2.0.so.1 evolution-data-server-3.34.0_1
 libevolution-calendar.so evolution-3.28.0_1
 libevolution-util.so evolution-3.28.0_1
 libemail-engine.so evolution-3.28.0_1
 libevolution-mail.so evolution-3.28.0_1
 libevolution-shell.so evolution-3.28.0_1
-libedata-cal-1.2.so.29 evolution-data-server-3.30.0_1
+libedata-cal-2.0.so.1 evolution-data-server-3.34.0_1
 libgdata.so.22 libgdata-0.17.9_1
 libpcap.so.1 libpcap-1.1.1_1
 libiptc.so.0 iptables-1.4.7_1
@@ -758,8 +760,8 @@ libasyncns.so.0 libasyncns-0.8_1
 libpulse.so.0 libpulseaudio-1.0_1
 libpulse-mainloop-glib.so.0 libpulseaudio-1.0_1
 libpulse-simple.so.0 libpulseaudio-1.0_1
-libpulsecommon-12.2.so libpulseaudio-12.2_1
-libpulsecore-12.2.so libpulseaudio-12.2_1
+libpulsecommon-13.0.so libpulseaudio-13.0_1
+libpulsecore-13.0.so libpulseaudio-13.0_1
 liborc-0.4.so.0 orc-0.4.11_1
 liborc-test-0.4.so.0 orc-0.4.11_1
 libgmime-2.6.so.0 gmime-2.6.4_1
@@ -1019,13 +1021,13 @@ libuchardet.so.0 uchardet-0.0.6_1
 libgtksourceviewmm-3.0.so.0 gtksourceviewmm-3.2.0_1
 libyajl.so.2 yajl-2.0.1_1
 libconfuse.so.2 confuse-3.2.1_1
-liblldb.so.8 lldb-8.0.0_1
-libclang.so.8 clang-8.0.0_1
+liblldb.so.9 lldb-9.0.0_1
+libclang.so.9 clang-9.0.0_1
+libclang-cpp.so.9 clang-9.0.0_1
 libLLVM-6.0.so libllvm6.0-6.0.0_1
 libLLVM-7.so libllvm7-7.0.0_1
 libLLVM-8.so libllvm8-8.0.0_1
-libOptRemarks.so.8 libllvm8-8.0.0_1
-libLTO.so.8 libllvm8-8.0.0_1
+libLLVM-9.so libllvm9-9.0.0_1
 libisofs.so.6 libisofs-0.6.24_1
 libmpack.so.0 libmpack-1.0.5_1
 libGeoIP.so.1 libgeoip-1.4.8_1
@@ -1046,7 +1048,7 @@ libtirpc.so.3 libtirpc-1.0.2_1
 librpcsecgss.so.3 librpcsecgss-0.19_1
 libnfsidmap.so.0 libnfsidmap-0.24_1
 libbind9.so.161 bind-libs-9.11.5_1
-libdns.so.1106 bind-libs-9.11.7_1
+libdns.so.1107 bind-libs-9.11.10_1
 libirs.so.161 bind-libs-9.11.5_1
 libisc.so.1100 bind-libs-9.11.5_1
 libisccc.so.161 bind-libs-9.11.5_1
@@ -1129,7 +1131,7 @@ libsbc.so.1 sbc-1.0_1
 libecryptfs.so.1 libecryptfs-104_1
 libnuma.so.1 libnuma-2.0.7_1
 libxar.so.1 xar-1.5.2_1
-libqpdf.so.21 libqpdf-8.0.0_1
+libqpdf.so.26 libqpdf-9.0.2_1
 libmikmod.so.3 libmikmod-3.1.12_1
 libSDL_sound-1.0.so.1 SDL_sound-1.0.3_1
 libgtksourceview-2.0.so.0 gtksourceview2-2.10.5_1
@@ -1149,6 +1151,7 @@ libguess.so.1 libguess-1.1_1
 libaudcore.so.5 audacious-3.9_1
 libaudgui.so.5 audacious-3.9_1
 libaudtag.so.3 audacious-3.8_1
+libaudqt.so.2 audacious-3.10.1_2
 libgstreamer-1.0.so.0 gstreamer1-1.0.0_1
 libgstbase-1.0.so.0 gstreamer1-1.0.0_1
 libgstcontroller-1.0.so.0 gstreamer1-1.0.0_1
@@ -1172,9 +1175,9 @@ libgstbasecamerabinsrc-1.0.so.0 gst-plugins-bad1-1.0.0_1
 libgstcodecparsers-1.0.so.0 gst-plugins-bad1-1.0.0_1
 libgstplayer-1.0.so.0 gst-plugins-bad1-1.0.0_1
 libgstgl-1.0.so.0 gst-plugins-base1-1.14.0_1
-libgnome-desktop-3.so.17 gnome-desktop-3.28.0_1
+libgnome-desktop-3.so.18 gnome-desktop-3.34.0_1
 libsecret-1.so.0 libsecret-0.10_1
-libgweather-3.so.15 libgweather-3.28.0_1
+libgweather-3.so.16 libgweather-3.34.0_1
 libgnomekbd.so.8 libgnomekbd-3.6.0_1
 libgnomekbdui.so.8 libgnomekbd-3.6.0_1
 libibus-1.0.so.5 ibus-1.4.99.20120917_1
@@ -1217,8 +1220,8 @@ libHX.so.28 libHX-3.14_1
 libxkbcommon.so.0 libxkbcommon-0.2.0_1
 libxkbcommon-x11.so.0 libxkbcommon-x11-0.4.2_1
 libgee-0.8.so.2 libgee08-0.8.2_1
-libnettle.so.6 nettle-3.2_1
-libhogweed.so.4 nettle-3.2_1
+libnettle.so.7 nettle-3.5.1_1
+libhogweed.so.5 nettle-3.5.1_1
 libgtkspell.so.0 gtkspell-2.0.16_1
 libgtkspell3-3.so.0 gtkspell3-3.0.9_1
 libpurple.so.0 libpurple-2.10.6_1
@@ -1298,6 +1301,7 @@ libunwind-aarch64.so.8 libunwind-1.2rc1_1
 libunwind-ppc32.so.8 libunwind-1.2.1_1
 libunwind-ppc64.so.8 libunwind-1.2.1_1
 libmicrohttpd.so.12 libmicrohttpd-0.9.48_1
+libmicrodns.so.0 libmicrodns-0.1.0_1
 libgit2.so.28 libgit2-0.28.0_1
 libgit2-glib-1.0.so.0 libgit2-glib-0.23.4_1
 libagg.so.2 agg-2.5_1
@@ -1309,7 +1313,7 @@ libkworkspace5.so.5 kworkspace-5.14.5_2
 libdb-5.3.so libdb-5.3.21_1
 libdb_cxx-5.3.so libdb-cxx-5.3.21_1
 libcares.so.2 c-ares-1.10.0_1
-libcryptopp.so.5.6 crypto++-565_1
+libcryptopp.so.8 crypto++-820_1
 libphonon.so.4 phonon-4.6.0_1
 libphononexperimental.so.4 phonon-4.6.0_1
 libdbusmenu-glib.so.4 libdbusmenu-glib-12.10.2_1
@@ -1326,8 +1330,8 @@ libodbcinst.so.2 libodbc-2.3.1_1
 libodbc.so.2 libodbc-2.3.1_1
 libiodbc.so.2 libiodbc-3.52.8_1
 libiodbcinst.so.2 libiodbc-3.52.8_1
-libsolarus.so.1 solarus-1.5.3_1
-libsolarus-gui.so solarus-1.5.3_1
+libsolarus.so.1 solarus-1.6.2_1
+libsolarus-gui.so.1 solarus-1.6.2_1
 libplank.so.1 plank-0.11.0_1
 libssh.so.4 libssh-0.5.4_1
 libqjson.so.0 qjson-0.8.1_1
@@ -1756,7 +1760,7 @@ libcblas.so.3 cblas-3.6.0_1
 liblapack.so.3 lapack-3.5.0_1
 libcinnamon-menu-3.so.0 cinnamon-menus-2.2.0_1
 libmate-desktop-2.so.17 mate-desktop-1.8.0_1
-libmarco-private.so.1 libmarco-1.14.0_1
+libmarco-private.so.2 libmarco-1.22.2_1
 libmate-menu.so.2 mate-menus-1.8.0_1
 libcaja-extension.so.1 libcaja-1.8.1_1
 libmatekbd.so.4 libmatekbd-1.8.0_1
@@ -1994,7 +1998,6 @@ libasignify.so.1 asignify-1.0_1
 libvte2_90.so.9 vte290-0.36.3_1
 libd0_blind_id.so.0 xonotic-0.8.0_1
 libechonest.so.2.3 libechonest-2.3.1_1
-libjreen.so.1 jreen-1.2.1_1
 libuecc.so.0 libuecc-5_1
 libKF5WindowSystem.so.5 kwindowsystem-5.6.0_1
 libKF5GuiAddons.so.5 kguiaddons-5.6.0_1
@@ -2063,6 +2066,7 @@ libsfml-graphics.so.2.5 SFML-2.5.0_1
 libclamav.so.9 clamav-0.101.0_1
 libclamunrar.so.9 clamav-0.101.0_1
 libclamunrar_iface.so.9 clamav-0.101.0_1
+libfreshclam.so.2 clamav-0.102.0_1
 libqca-qt5.so.2 qca-qt5-2.1.3_1
 libqt5keychain.so.1 qtkeychain-qt5-0.7.0_1
 libphonon4qt5.so.4 phonon-qt5-4.8.3_1
@@ -2075,7 +2079,7 @@ libechonest5.so.2.3 libechonest-qt5-2.3.0_1
 liblastfm_fingerprint5.so.1 liblastfm-qt5-1.0.9_1
 liblastfm5.so.1 liblastfm-qt5-1.0.9_1
 libquazip5.so.1 quazip-0.7.3_2
-libjreen-qt5.so.1 jreen-qt5-1.2.0_1
+libjreen-qt5.so.1 jreen-1.3.0_1
 libzen.so.0 libzen-0.4.31_1
 libmediainfo.so.0 libmediainfo-0.7.75_1
 libnghttp2.so.14 nghttp2-1.0.2_1
@@ -2104,7 +2108,7 @@ libtesseract.so.4 tesseract-ocr-4.0.0_1
 libffmpegthumbnailer.so.4 ffmpegthumbnailer-2.0.10_1
 libopenraw.so.7 libopenraw-0.1.0_1
 libopenrawgnome.so.7 libopenraw-0.1.0_1
-libgeda.so.42 geda-1.8.2_1
+libgeda.so.46 geda-1.10.0_1
 libclutter-gst-3.0.so.0 clutter-gst3-3.0.4_1
 libgsound.so.0 gsound-1.0.1_1
 libgegl-0.3.so.0 gegl3-0.3.0_1
@@ -2114,7 +2118,7 @@ libprocps.so.7 procps-ng-3.3.15_1
 libgegl-0.4.so.0 gegl-0.4.16_1
 libgegl-npd-0.4.so gegl-0.4.16_1
 libgegl-sc-0.4.so gegl-0.4.16_1
-libskarnet.so.2.8 skalibs-2.8.0.0_1
+libskarnet.so.2.9 skalibs-2.9.0.0_1
 libKF5BalooWidgets.so.5 baloo-widgets5-17.04.3_1
 libtidy.so.5 libtidy5-5.1.25_1
 libSDL2_gfx-1.0.so.0 SDL2_gfx-1.0.1_1
@@ -2254,7 +2258,7 @@ libhidapi-libusb.so.0 hidapi-0.8.0rc1_1
 libu2f-host.so.0 libu2f-host-1.0.0_1
 libu2f-server.so.0 libu2f-server-1.0.1_2
 libsqlcipher.so.0 sqlcipher-3.3.1_1
-libgta.so.0 libgta-1.0.7_1
+libgta.so.1 libgta-1.2.0_1
 libgdal.so.26 libgdal-3.0.0_1
 libosgViewer.so.131 osg-3.4.1_1
 libosgShadow.so.131 osg-3.4.1_1
@@ -2412,20 +2416,20 @@ libxdo.so.3 xdotool-3.20150503.1_1
 libabigail.so.0 libabigail-1.0.rc3_1
 libgnome-games-support-1.so.3 libgnome-games-support-1.4.0_1
 libwlc.so.0 wlc-0.0.2_1
-libKDevClangPrivate.so.31 kdevelop-5.3.0_1
-libKDevPlatformDebugger.so.53 kdevelop-5.3.0_1
-libKDevPlatformDocumentation.so.53 kdevelop-5.3.0_1
-libKDevPlatformInterfaces.so.53 kdevelop-5.3.0_1
-libKDevPlatformLanguage.so.53 kdevelop-5.3.0_1
-libKDevPlatformOutputView.so.53 kdevelop-5.3.0_1
-libKDevPlatformProject.so.53 kdevelop-5.3.0_1
-libKDevPlatformSerialization.so.53 kdevelop-5.3.0_1
-libKDevPlatformShell.so.53 kdevelop-5.3.0_1
-libKDevPlatformSublime.so.53 kdevelop-5.3.0_1
-libKDevPlatformTests.so.53 kdevelop-5.3.0_1
-libKDevPlatformUtil.so.53 kdevelop-5.3.0_1
-libKDevPlatformVcs.so.53 kdevelop-5.3.0_1
-libkdevcmakecommon.so kdevelop-5.3.0_1
+libKDevClangPrivate.so.32 kdevelop-5.4.1_1
+libKDevPlatformDebugger.so.54 kdevelop-5.4.1_1
+libKDevPlatformDocumentation.so.54 kdevelop-5.4.1_1
+libKDevPlatformInterfaces.so.54 kdevelop-5.4.1_1
+libKDevPlatformLanguage.so.54 kdevelop-5.4.1_1
+libKDevPlatformOutputView.so.54 kdevelop-5.4.1_1
+libKDevPlatformProject.so.54 kdevelop-5.4.1_1
+libKDevPlatformSerialization.so.54 kdevelop-5.4.1_1
+libKDevPlatformShell.so.54 kdevelop-5.4.1_1
+libKDevPlatformSublime.so.54 kdevelop-5.4.1_1
+libKDevPlatformTests.so.54 kdevelop-5.4.1_1
+libKDevPlatformUtil.so.54 kdevelop-5.4.1_1
+libKDevPlatformVcs.so.54 kdevelop-5.4.1_1
+libkdevcmakecommon.so kdevelop-5.4.1_1
 libts.so.0 tslib-1.6_1
 libobs.so.0 obs-0.14.1_2
 libobsglad.so.0 obs-0.14.1_2
@@ -2699,7 +2703,7 @@ libKDb3.so.4 kdb-3.1.0_1
 libKPropertyWidgets3.so.4 kproperty-3.1.0_1
 libKPropertyCore3.so.4 kproperty-3.1.0_1
 libKReport3.so.4 kreport-3.1.0_1
-libbotan-2.so.10 botan-2.10.0_1
+libbotan-2.so.12 botan-2.12.0_1
 libswipl.so.8 swi-prolog-8.0.0_1
 libpcre2-16.so.0 libpcre2-10.22_1
 libpcre2-32.so.0 libpcre2-10.22_1
@@ -2723,27 +2727,27 @@ libkj-http-0.7.0.so capnproto-0.7.0_1
 libkj-async-0.7.0.so capnproto-0.7.0_1
 libkj-test-0.7.0.so capnproto-0.7.0_1
 libkj-0.7.0.so capnproto-0.7.0_1
-libkea-asiodns.so.0 libkea-1.1.0_1
+libkea-asiodns.so.1 libkea-1.7.0_1
 libkea-asiolink.so.7 libkea-1.5.0_1
-libkea-cc.so.7 libkea-1.5.0_1
-libkea-cfgclient.so.6 libkea-1.5.0_1
-libkea-cryptolink.so.4 libkea-1.5.0_1
-libkea-database.so.1 libkea-1.5.0_1
-libkea-dhcp++.so.11 libkea-1.5.0_1
-libkea-dhcp_ddns.so.1 libkea-1.1.0_1
-libkea-dhcpsrv.so.14 libkea-1.5.0_1
+libkea-cc.so.8 libkea-1.6.0_1
+libkea-cfgclient.so.8 libkea-1.7.0_1
+libkea-cryptolink.so.5 libkea-1.7.0_1
+libkea-database.so.5 libkea-1.7.0_1
+libkea-dhcp++.so.14 libkea-1.7.0_1
+libkea-dhcp_ddns.so.2 libkea-1.7.0_1
+libkea-dhcpsrv.so.17 libkea-1.7.0_1
 libkea-dns++.so.3 libkea-1.5.0_1
-libkea-eval.so.10 libkea-1.5.0_1
+libkea-eval.so.12 libkea-1.7.0_1
 libkea-exceptions.so.0 libkea-1.1.0_1
-libkea-hooks.so.7 libkea-1.4.0_1
-libkea-http.so.4 libkea-1.5.0_1
-libkea-log.so.3 libkea-1.2.0_1
-libkea-pgsql.so.0 libkea-1.5.0_1
-libkea-process.so.3 libkea-1.5.0_1
-libkea-stats.so.2 libkea-1.3.0_1
-libkea-threads.so.2 libkea-1.5.0_1
+libkea-hooks.so.8 libkea-1.7.0_1
+libkea-http.so.7 libkea-1.7.0_1
+libkea-log.so.5 libkea-1.7.0_1
+libkea-pgsql.so.1 libkea-1.7.0_1
+libkea-process.so.4 libkea-1.6.0_1
+libkea-stats.so.3 libkea-1.6.0_1
+libkea-threads.so.3 libkea-1.7.0_1
 libkea-util-io.so.0 libkea-1.1.0_1
-libkea-util.so.5 libkea-1.5.0_1
+libkea-util.so.8 libkea-1.7.0_1
 libytnef.so.0 ytnef-1.8_1
 libpisock.so.9 pilot-link-0.12.5_1
 libpisync.so.1 pilot-link-0.12.5_1
@@ -2777,11 +2781,11 @@ libdecoration.so.0 compiz-core-0.8.14_1
 libcompizconfig.so.0 libcompizconfig-0.8.14_1
 libemeraldengine.so.0 emerald-0.8.14_1
 libhangul.so.1 libhangul-0.1.0_1
-libmutter-4.so.0 mutter-3.32.0_1
-libmutter-clutter-4.so.0 mutter-3.32.0_1
-libmutter-cogl-path-4.so mutter-3.32.0_1
-libmutter-cogl-4.so.0 mutter-3.32.0_1
-libmutter-cogl-pango-4.so.0 mutter-3.32.0_1
+libmutter-5.so.0 mutter-3.34.1_1
+libmutter-clutter-5.so.0 mutter-3.34.1_1
+libmutter-cogl-path-5.so mutter-3.34.1_1
+libmutter-cogl-5.so.0 mutter-3.34.1_1
+libmutter-cogl-pango-5.so.0 mutter-3.34.1_1
 libgeoclue-2.so.0 geoclue2-2.4.4_1
 libgepub.so.0 libgepub-0.4_1
 libslopy.so.7.4 slop-7.4_1
@@ -2798,7 +2802,7 @@ libomxvideosched.so.0 libomxil-bellagio-0.9.3_1
 libnss_libvirt_guest.so.2 libvirt-3.1.0_1
 libvirt-admin.so.0 libvirt-3.1.0_1
 libnss_libvirt.so.2 libvirt-3.1.0_1
-libassimp.so.4 libassimp-4.0.0_1
+libassimp.so.5 libassimp-5.0.0_1
 libdouble-conversion.so.1 double-conversion-2.0.1_1
 libspectrum.so.8 libspectrum-1.2.2_1
 libbearssl.so.0 bearssl-0.3_1
@@ -2812,16 +2816,19 @@ libsigrok.so.4 libsigrok-0.5.0_1
 libsigrokcxx.so.4 libsigrok-0.5.0_1
 libsigrokdecode.so.4 libsigrokdecode-0.5.0_2
 libglyr.so.1 glyr-1.0.8_1
-libPocoJSON.so.60 poco-1.9.0_1
-libPocoMongoDB.so.60 poco-1.9.0_1
-libPocoZip.so.60 poco-1.9.0_1
-libPocoData.so.60 poco-1.9.0_1
-libPocoNet.so.60 poco-1.9.0_1
-libPocoDataSQLite.so.60 poco-1.9.0_1
-libPocoFoundation.so.60 poco-1.9.0_1
-libPocoXML.so.60 poco-1.9.0_1
-libPocoUtil.so.60 poco-1.9.0_1
-libPocoRedis.so.60 poco-1.9.0_1
+libPocoJSON.so.64 poco-1.9.4_1
+libPocoMongoDB.so.64 poco-1.9.4_1
+libPocoZip.so.64 poco-1.9.4_1
+libPocoData.so.64 poco-1.9.4_1
+libPocoNet.so.64 poco-1.9.4_1
+libPocoDataSQLite.so.64 poco-1.9.4_1
+libPocoFoundation.so.64 poco-1.9.4_1
+libPocoXML.so.64 poco-1.9.4_1
+libPocoUtil.so.64 poco-1.9.4_1
+libPocoRedis.so.64 poco-1.9.4_1
+libPocoEncodings.so.64 poco-1.9.4_1
+libPocoNetSSL.so.64 poco-1.9.4_1
+libPocoCrypto.so.64 poco-1.9.4_1
 libopenblas.so.0 openblas-0.2.19_1
 librtmidi.so.4 rtmidi-3.0.0_1
 libbiblesync.so.2.0.1 biblesync-2.0.1_1
@@ -2880,7 +2887,7 @@ libbrotlienc.so.1 brotli-1.0.2_1
 libfilteraudio.so filter_audio-0.0.1_1
 libgstreamermm-1.0.so.1 gstreamermm-1.8.0_1
 libmovit.so.8 movit-1.6.0_1
-libduktape.so.203 duktape-2.3.0_1
+libduktape.so.204 duktape-2.4.0_1
 libccgnu2-1.8.so.0 commoncpp2-1.8.1_1
 libccext2-1.8.so.0 commoncpp2-1.8.1_1
 libucommon.so.8 ucommon-7.0.0_1
@@ -2916,7 +2923,7 @@ libtracker-sparql-2.0.so.0 libtracker-2.0.0_1
 libdockapp.so.3 libdockapp-0.7.2_1
 libkrdccore.so.5 krdc-17.04.3_1
 libArcus.so.3 libArcus-3.1.0_1
-libgutenprint.so.8 gutenprint-5.3.1_1
+libgutenprint.so.9 gutenprint-5.3.3_1
 libunbound.so.8 unbound-1.8.0_1
 libmirage.so.11 libmirage-3.1.0_1
 libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
@@ -2924,19 +2931,19 @@ libixml.so.10 libupnp1.8-1.8.2_1
 libupnp.so.13 libupnp1.8-1.8.4_1
 libevent_extra-2.1.so.6 libevent-2.1.8_3
 libevent_openssl-2.1.so.6 libevent-2.1.8_3
-libsysprof-2.so sysprof-3.24.1_1
-libsysprof-ui-2.so sysprof-3.24.1_1
+libsysprof-3.so sysprof-3.34.0_1
+libsysprof-ui-3.so sysprof-3.34.0_1
 libmozjs-52.so mozjs52-52.3.0_1
 libmozjs-52.so.0 mozjs52-52.3.0_1
-libvala-0.44.so.0 libvala-0.44.0_1
-libvaladoc-0.44.so.0 libvaladoc-0.44.2_1
+libvala-0.46.so.0 libvala-0.46.0_1
+libvaladoc-0.46.so.0 libvaladoc-0.46.0_1
 libvalaccodegen.so libvala-0.44.0_1
 libphodav-2.0.so.0 phodav-2.2_1
 libgfshare.so.2 libgfshare-2.0.0_1
 libtracker-miner-2.0.so.0 libtracker-2.0.1_1
 libtacacs.so.1 tacacs-4.0.4.28_1
 libffms2.so.4 libffms2-2.23.1_1
-libddcutil.so.0 ddcutil-0.8.5_1
+libddcutil.so.1 ddcutil-0.9.7_1
 liblsmash.so.2 liblsmash-2.9.1_1
 libgiac.so.0 libgiac-1.4.9r17_1
 libgnustep-base.so.1.26 gnustep-base-1.26.0_1
@@ -2950,7 +2957,7 @@ libvted-3.so.0 libvted-3.7.0_2
 libpeasd-3.so.0 libpeasd-3.7.0_2
 libgstreamerd-3.so.0 libgstreamerd-3.7.0_2
 libgtkdgl-3.so.0 libgtkdgl-3.7.0_2
-libmega.so.30504 MEGAsdk-3.5.4_1
+libmega.so.30602 MEGAsdk-3.6.2a_1
 libopenglrecorder.so.0 libopenglrecorder-0.1.0_1
 libgpod.so.4 libgpod-0.8.3_1
 libi2c.so.0 i2c-tools-4.0_1
@@ -2963,13 +2970,13 @@ libKF5Kipi.so.32.0.0 libkipi5-17.04.3_1
 libhackrf.so.0 libhackrf-2017.02.1_1
 libtecla.so.1 libtecla-1.6.3_1
 libtecla_r.so.1 libtecla-1.6.3_1
-libzim.so.5 libzim-5.0.0_1
-libkiwix.so.6 kiwix-lib-6.0.0_1
+libzim.so.6 libzim-6.0.1_1
+libkiwix.so.8 kiwix-lib-8.0.1_1
 libaria2.so.0 libaria2-1.33.1_3
-librpm.so.8 librpm-4.14.1_1
-librpmsign.so.8 librpmsign-4.14.1_1
-librpmbuild.so.8 librpmbuild-4.14.1_1
-librpmio.so.8 librpmio-4.14.1_1
+librpm.so.9 librpm-4.15.0_1
+librpmsign.so.9 librpmsign-4.15.0_1
+librpmbuild.so.9 librpmbuild-4.15.0_1
+librpmio.so.9 librpmio-4.15.0_1
 libsquirrel.so.0 squirrel-libs-3.1_1
 libsqstdlib.so.0 squirrel-libs-3.1_1
 libexecinfo.so.1 libexecinfo-1.1_1
@@ -3017,7 +3024,7 @@ libembb_mtapi_network_c.so embb-devel-1.0.0_1
 libembb_base_cpp.so embb-devel-1.0.0_1
 libembb_base_c.so embb-devel-1.0.0_1
 libhpdf.so Haru-devel-2.3.0_1
-libKF5Contacts.so.5 kcontacts-17.12.0_1
+libKF5Contacts.so.5 kcontacts-5.63.0_1
 libKF5AkonadiPrivate.so.5 akonadi5-17.12.0_1
 libKF5AkonadiCore.so.5 akonadi5-17.12.0_1
 libKF5AkonadiAgentBase.so.5 akonadi5-17.12.0_1
@@ -3232,6 +3239,7 @@ libTKOffset.so.7 occt-7.2.0p1_1
 libTKXDESTEP.so.7 occt-7.2.0p1_1
 libTKQADraw.so.7 occt-7.2.0p1_1
 libTKXmlL.so.7 occt-7.2.0p1_1
+libTKRWMesh.so.7 occt-7.4.0_1
 libargon2.so.1 libargon2-20171227_1
 libdazzle-1.0.so.0 libdazzle-3.28.0_1
 libjsonrpc-glib-1.0.so.1 jsonrpc-glib-3.28.0_1
@@ -3291,7 +3299,7 @@ libshaderc_shared.so.1 shaderc-2018.0_1
 libglslang.so glslang-6.2.2596_1
 libSPIRV.so glslang-6.2.2596_1
 libmaxminddb.so.0 libmaxminddb-1.3.2_1
-libmysqlpp.so mysql++-3.2.4_1
+libmysqlpp.so.3 mysql++-3.2.5_1
 libKF5Syndication.so.5 syndication-5.50.0_1
 liblqr-1.so.0 liblqr-0.4.2_1
 libmozjs-60.so.0 mozjs60-60.0.2_1
@@ -3404,7 +3412,7 @@ libsnore-qt5.so.0.7 snorenotify-0.7.0_1
 libsnoresettings-qt5.so.0.7 snorenotify-0.7.0_1
 libTECkit.so.0 libteckit-2.5.8_1
 libTECkit_Compiler.so.0 libteckit-2.5.8_1
-libwf-config.so wf-config-0.1_1
+libwf-config.so.0 wf-config-0.3_1
 libQt5Pas.so.1 qt5pas-2.6~beta_1
 libClp.so.1 libClp-1.16.11_1
 libCoinUtils.so.3 libClp-1.16.11_1
@@ -3457,16 +3465,16 @@ liboblibs.so.0.0 oblibs-0.0.1.1_1
 libaal-1.0.so.7 libaal-1.0.7_1
 libaal-minimal.so.0 libaal-1.0.7_1
 libcli.so.1.9 libcli-1.9.8.4_1
-libaddress_sorting.so.7 grpc-1.19.1_1
-libgpr.so.7 grpc-1.19.1_1
+libaddress_sorting.so.8 grpc-1.24.1_1
+libgpr.so.8 grpc-1.24.1_1
 libgrpc++.so.1 grpc-1.19.1_1
 libgrpc++_cronet.so.1 grpc-1.19.1_1
 libgrpc++_error_details.so.1 grpc-1.19.1_1
 libgrpc++_reflection.so.1 grpc-1.19.1_1
 libgrpc++_unsecure.so.1 grpc-1.19.1_1
-libgrpc.so.7 grpc-1.19.1_1
-libgrpc_cronet.so.7 grpc-1.19.1_1
-libgrpc_unsecure.so.7 grpc-1.19.1_1
+libgrpc.so.8 grpc-1.24.1_1
+libgrpc_cronet.so.8 grpc-1.24.1_1
+libgrpc_unsecure.so.8 grpc-1.24.1_1
 libgrpcpp_channelz.so.1 grpc-1.19.1_1
 libircclient.so.1 libircclient-1.10_1
 libFAudio.so.0 FAudio-19.05_1
@@ -3485,7 +3493,7 @@ libmhash.so.2 mhash-0.9.9.9_1
 librlottie.so.0 rlottie-0.0.20160709_1
 libfstrm.so.0 fstrm-0.5.0_1
 libfreecell-solver.so.0 libfreecell-solver-5.10.0_1
-libknot.so.9 libknot-2.8.2_1
+libknot.so.10 libknot-2.9.0_1
 libdnssec.so.7 libknot-2.8.2_1
 libzscanner.so.3 libknot-2.8.2_1
 libkres.so.9 knot-resolver-4.0.0_1
@@ -3499,3 +3507,14 @@ libgambit.so.4 gambit-4.9.3_1
 liblog4cpp.so.5 log4cpp-1.1.3_1
 libnuspell.so.2 libnuspell-2.3.0_1
 liblog4c.so.3 log4c-1.2.4_1
+libqb.so.0 libqb-1.0.5_1
+libusbguard.so.0 usbguard-0.7.5_1
+libknet.so.1 libknet1-1.11_1
+libdrumstick-file.so.1 drumstick-1.1.2_1
+libdrumstick-alsa.so.1 drumstick-1.1.2_1
+libdrumstick-rt.so.1 drumstick-1.1.2_1
+libnozzle.so.1 libnozzle1-1.11_2
+libmygpo-qt5.so.1 libmygpo-qt-1.1.0_1
+libluv.so.1 libluv-1.30.1.0_1
+libarmadillo.so.9 armadillo-9.700.2_1
+libvarnishapi.so.2 libvarnishapi-6.3.0_1
diff --git a/common/xbps-src/shutils/build_dependencies.sh b/common/xbps-src/shutils/build_dependencies.sh
index 6d9d727e0d3..26e24232ad8 100644
--- a/common/xbps-src/shutils/build_dependencies.sh
+++ b/common/xbps-src/shutils/build_dependencies.sh
@@ -169,7 +169,7 @@ install_pkg_deps() {
                         break
                     fi
                 done
-                if [[ $found -eq 1 ]]; then
+                if [[ $found -eq 1 ]] && [[ -z "$cross" ]]; then
                     echo "   [host] ${_vpkg}: not found (subpkg, ignored)"
                 else
                     echo "   [host] ${_vpkg}: not found"
diff --git a/common/xbps-src/shutils/common.sh b/common/xbps-src/shutils/common.sh
index d258509d878..d0e455471ea 100644
--- a/common/xbps-src/shutils/common.sh
+++ b/common/xbps-src/shutils/common.sh
@@ -237,7 +237,7 @@ run_pkg_hooks() {
 unset_package_funcs() {
     local f
 
-    for f in "$(typeset -F)"; do
+    for f in $(typeset -F); do
         case "$f" in
         *_package)
             unset -f "$f"
diff --git a/common/xbps-src/shutils/cross.sh b/common/xbps-src/shutils/cross.sh
index a699885e801..0a4fa3028db 100644
--- a/common/xbps-src/shutils/cross.sh
+++ b/common/xbps-src/shutils/cross.sh
@@ -29,7 +29,7 @@ prepare_cross_sysroot() {
     [ -z "$cross" -o "$cross" = "" -o -f $statefile ] && return 0
 
     # Check for cross-vpkg-dummy available for the target arch, otherwise build it.
-    pkg_available 'cross-vpkg-dummy>=0.31_1' $cross
+    pkg_available 'cross-vpkg-dummy>=0.33_1' $cross
     if [ $? -eq 0 ]; then
         $XBPS_LIBEXECDIR/build.sh cross-vpkg-dummy cross-vpkg-dummy pkg $cross init || return $?
     fi
diff --git a/srcpkgs/2bwm/template b/srcpkgs/2bwm/template
index a0ca799c977..be62e8594f7 100644
--- a/srcpkgs/2bwm/template
+++ b/srcpkgs/2bwm/template
@@ -1,6 +1,6 @@
 # Template file for '2bwm'
 pkgname=2bwm
-version=0.2
+version=0.3
 revision=1
 build_style=gnu-makefile
 makedepends="libxcb-devel xcb-util-keysyms-devel xcb-util-wm-devel xcb-util-xrm-devel"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="ISC"
 homepage="https://github.com/venam/2bwm"
 distfiles="https://github.com/venam/${pkgname}/archive/v${version}.tar.gz"
-checksum=5d071bdbe6d3b4b79b5462cc1b36afe357030fb70c7e64f88d9c7d541d648439
+checksum=a4889ea4b01b1a3d4a508daa034b9d86676913cbbca1f977858df692a6e2af95
 
 pre_build() {
 	sed -i 's|-Os ||g' Makefile
diff --git a/srcpkgs/3proxy/template b/srcpkgs/3proxy/template
index 6e0aad41627..6063c616007 100644
--- a/srcpkgs/3proxy/template
+++ b/srcpkgs/3proxy/template
@@ -1,13 +1,13 @@
 # Template file for '3proxy'
 pkgname=3proxy
-version=0.8.12
-revision=2
+version=0.8.13
+revision=1
 short_desc="3proxy tiny proxy server"
 maintainer="iaroki <iaroki@protonmail.com>"
 license="BSD-3-Clause"
 homepage="https://3proxy.ru"
-distfiles="https://github.com/z3APA3A/3proxy/archive/$version.tar.gz"
-checksum=c2ad3798b4f0df06cfcc7b49f658304e451d60e4834e2705ef83ddb85a03f849
+distfiles="https://github.com/z3APA3A/3proxy/archive/${version}.tar.gz"
+checksum=a6d3cf9dd264315fa6ec848f6fe6c9057db005ce4ca8ed1deb00f6e1c3900f88
 
 do_build() {
 	make -f Makefile.Linux CC=$CC LN=$CC
diff --git a/srcpkgs/66-tools/template b/srcpkgs/66-tools/template
new file mode 100644
index 00000000000..9c954860c2b
--- /dev/null
+++ b/srcpkgs/66-tools/template
@@ -0,0 +1,33 @@
+# Template file for '66-tools'
+pkgname=66-tools
+version=0.0.1.0
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=configure
+configure_args="--prefix=/usr
+ --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
+ --with-lib=${XBPS_CROSS_BASE}/usr/lib"
+hostmakedepends="pkg-config scdoc"
+makedepends="oblibs-devel execline-devel skalibs-devel"
+short_desc="Small tools and helpers for service scripts execution"
+maintainer="mobinmob <mobinmob@disroot.org>"
+license="ISC"
+homepage="http://web.obarun.org/software/index.html"
+distfiles="https://framagit.org/Obarun/66-tools/-/archive/v${version}/66-tools-v${version}.tar.gz"
+checksum=e3ce0a1de81196ca7e6ab0bee720022b98dabaa7dd01d9c4c1cc98a90cb3a2a7
+
+pre_build() {
+	make man
+}
+
+post_install() {
+	local i
+	vlicense COPYING
+	for i in doc/html/*.html ; do
+		vdoc $i
+	done
+	vdoc README
+	for i in doc/man/*.{1,5} ; do
+		vman $i
+	done
+}
diff --git a/srcpkgs/66/template b/srcpkgs/66/template
index ee21cc063cf..adb86308a14 100644
--- a/srcpkgs/66/template
+++ b/srcpkgs/66/template
@@ -1,6 +1,6 @@
 # Template file for '66'
 pkgname=66
-version=0.2.0.4
+version=0.2.1.2
 revision=1
 wrksrc="66-v${version}"
 build_style=configure
@@ -11,13 +11,13 @@ hostmakedepends="pkg-config scdoc"
 makedepends="oblibs-devel skalibs-devel execline-devel s6-devel
 s6-rc-devel procps-ng-devel"
 depends="s6-portable-utils"
-short_desc="Helpers tools around s6-rc"
+short_desc="Small tools built around s6 and s6-rc programs"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="ISC"
 homepage="http://web.obarun.org/software/"
 changelog="https://framagit.org/Obarun/66/raw/master/NEWS"
 distfiles="https://framagit.org/Obarun/66/-/archive/v${version}/66-v${version}.tar.bz2"
-checksum=fc6ca90cc12f16d35c8a7a1a181df8d690c72e04a9ecf586f588160528df7ce6
+checksum=9c3430ab291ec83e74faa05634614e1d851e2bc18fe173963d8fe5313c2dd337
 
 conf_files="/etc/66/init /etc/66/init.conf"
 make_dirs="
diff --git a/srcpkgs/Amass/template b/srcpkgs/Amass/template
new file mode 100644
index 00000000000..c959b006334
--- /dev/null
+++ b/srcpkgs/Amass/template
@@ -0,0 +1,12 @@
+# Template file for 'Amass'
+pkgname=Amass
+version=3.1.10
+revision=1
+build_style=go
+go_import_path="github.com/OWASP/Amass/..."
+short_desc="In-depth Attack Surface Mapping and Asset Discovery"
+maintainer="Andrew Benson <abenson+void@gmail.com>"
+license="Apache-2.0"
+homepage="https://www.owasp.org/index.php/OWASP_Amass_Project"
+distfiles="https://github.com/OWASP/Amass/archive/v${version}.tar.gz"
+checksum=018a910c18df4510a6b73137177c05e98e9e01a0828ccd07285b83884fc24456
diff --git a/srcpkgs/AppStream/template b/srcpkgs/AppStream/template
index f93ff78e3a0..3df0d5fa923 100644
--- a/srcpkgs/AppStream/template
+++ b/srcpkgs/AppStream/template
@@ -9,7 +9,7 @@ hostmakedepends="docbook-xsl glib-devel gperf libxslt pkg-config
  qt5-host-tools"
 makedepends="libglib-devel libxml2-devel libyaml-devel qt5-devel"
 short_desc="Tools and libraries to work with AppStream metadata"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/ximion/appstream"
 changelog="https://raw.githubusercontent.com/ximion/appstream/master/NEWS"
diff --git a/srcpkgs/Bear/template b/srcpkgs/Bear/template
index 9a36eb6b1fe..69a36bfeeb1 100644
--- a/srcpkgs/Bear/template
+++ b/srcpkgs/Bear/template
@@ -1,14 +1,14 @@
 # Template file for 'Bear'
 pkgname=Bear
-version=2.4.1
+version=2.4.2
 revision=1
 build_style=cmake
-makedepends="bash-completion"
-depends="python"
+hostmakedepends="python3"
+depends="python3"
 short_desc="Tool that generates a compilation database for clang tooling"
 maintainer="Alain Kalker <a.c.kalker@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/rizsotto/Bear"
 changelog="https://raw.githubusercontent.com/rizsotto/Bear/master/ChangeLog.md"
 distfiles="https://github.com/rizsotto/Bear/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=41e118471f11d91147490561b3bc52228a9ffc2a293e8e03717d674a0e312a9c
+checksum=e80c0d622a8192a1ec0c0efa139e5767c6c4b1defe1c75fc99cf680c6d1816c0
diff --git a/srcpkgs/CImg/template b/srcpkgs/CImg/template
index b8c994a9b52..12b0b65c0b7 100644
--- a/srcpkgs/CImg/template
+++ b/srcpkgs/CImg/template
@@ -1,6 +1,6 @@
 # Template file for 'CImg'
 pkgname=CImg
-version=2.6.6
+version=2.7.4
 revision=1
 archs=noarch
 wrksrc="CImg-v.${version}"
@@ -10,7 +10,7 @@ maintainer="Robert Lowry <bobertlo@gmail.com>"
 license="CECILL-2.0, CECILL-C"
 homepage="http://cimg.eu"
 distfiles="https://framagit.org/dtschump/CImg/-/archive/v.${version}/CImg-v.${version}.tar.bz2"
-checksum=45c22113418bf53a6c3b3b990a4283aff9eb96bd36895622ad27b367b632430d
+checksum=f2897f26b20095a1f826c7f4baa9224a9a13727d4de93acd8f3fbe559214307a
 
 do_install() {
 	vlicense Licence_CeCILL_V2-en.txt
@@ -19,4 +19,3 @@ do_install() {
 	vmkdir usr/include/CImg
 	vcopy "plugins/*.h" usr/include/CImg
 }
-
diff --git a/srcpkgs/CLion/template b/srcpkgs/CLion/template
index 686b7a88a70..aa34774c3bc 100644
--- a/srcpkgs/CLion/template
+++ b/srcpkgs/CLion/template
@@ -1,6 +1,6 @@
 # Template file for 'CLion'
 pkgname=CLion
-version=2019.2
+version=2019.2.4
 revision=1
 archs="i686 x86_64"
 wrksrc="clion-${version}"
@@ -10,7 +10,7 @@ maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/clion"
 distfiles="https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"
-checksum=e2d453264c2fb6dcc58e976fd5660157afd62ba5c0ee64f829407c772f7e1dcf
+checksum=2d3b1820eef6d60aab4b9a12c7357280de6606f72cdc1c72d6449e3676f23030
 repository=nonfree
 restricted=yes
 nopie=yes
@@ -44,14 +44,14 @@ post_extract() {
 
 do_install() {
 	TARGET_PATH="usr/lib/${pkgname}"
-	LICENSE_PATH="usr/share/licenses/${pkgname}"
 
 	vmkdir usr/bin
 	vmkdir ${TARGET_PATH}
-	vmkdir ${LICENSE_PATH}
 
-	# Ideally vlicense should be called here, but vcopy is more terse.
-	vcopy license/* ${LICENSE_PATH}
+	local i
+	for i in license/* ; do
+		vlicense $i
+	done
 
 	vcopy bin ${TARGET_PATH}
 	vcopy help ${TARGET_PATH}
diff --git a/srcpkgs/Clight/template b/srcpkgs/Clight/template
index 84d98307755..9919d510abb 100644
--- a/srcpkgs/Clight/template
+++ b/srcpkgs/Clight/template
@@ -1,7 +1,7 @@
 # Template file for 'Clight'
 pkgname=Clight
 version=3.1
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="popt-devel gsl-devel libconfig-devel elogind-devel bash-completion dbus-devel"
diff --git a/srcpkgs/Clightd/template b/srcpkgs/Clightd/template
index 241cf60cd05..6779220bfcb 100644
--- a/srcpkgs/Clightd/template
+++ b/srcpkgs/Clightd/template
@@ -1,7 +1,7 @@
 # Template file for 'Clightd'
 pkgname=Clightd
 version=3.4
-revision=1
+revision=2
 build_style=cmake
 cmake_builddir=build
 configure_args="-DENABLE_DDC=1 -DENABLE_GAMMA=1 -DENABLE_DPMS=1"
diff --git a/srcpkgs/ClusterSSH/template b/srcpkgs/ClusterSSH/template
index a56c72440a5..ade9b7fefa0 100644
--- a/srcpkgs/ClusterSSH/template
+++ b/srcpkgs/ClusterSSH/template
@@ -1,10 +1,9 @@
 # Template file for 'ClusterSSH'
 pkgname=ClusterSSH
-version=4.13.2.02
+version=4.14
 revision=1
-_distver="${version%.*}_${version##*.}"
 archs=noarch
-wrksrc="clusterssh-${_distver}"
+wrksrc="clusterssh-${version}"
 build_style=perl-ModuleBuild
 hostmakedepends="xterm openssh
  perl-CPAN-Changes perl-Module-Build perl-Try-Tiny perl-Tk
@@ -18,8 +17,8 @@ maintainer="Enguerrand de Rochefort <voidlinux@rochefort.de>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://github.com/duncs/clusterssh"
 changelog="https://raw.githubusercontent.com/duncs/clusterssh/master/Changes"
-distfiles="https://github.com/duncs/clusterssh/archive/v${_distver}.tar.gz"
-checksum=5c03b706267ddf0b84cf1f1cd6756344859a90a20e3dcc3018820fe142146780
+distfiles="https://github.com/duncs/clusterssh/archive/v${version}.tar.gz"
+checksum=179ac8a7c27ec9674d2aa3f65ebb097b4945646c71f83f52fe2b8b24c21cd629
 
 pre_check() {
 	touch README
diff --git a/srcpkgs/ClusterSSH/update b/srcpkgs/ClusterSSH/update
deleted file mode 100644
index 45c768a1027..00000000000
--- a/srcpkgs/ClusterSSH/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="clusterssh/archive/[-_a-z]+\K[-_.\d]+(?=\.tar\.gz)"
diff --git a/srcpkgs/CopyQ/template b/srcpkgs/CopyQ/template
index 58743ca47b1..7eef67931e3 100644
--- a/srcpkgs/CopyQ/template
+++ b/srcpkgs/CopyQ/template
@@ -1,6 +1,6 @@
 # Template file for 'CopyQ'
 pkgname=CopyQ
-version=3.9.0
+version=3.9.2
 revision=1
 build_style=cmake
 hostmakedepends="qt5-tools-devel"
@@ -12,4 +12,4 @@ license="GPL-3.0-or-later"
 homepage="https://hluk.github.io/CopyQ/"
 changelog="https://raw.githubusercontent.com/hluk/CopyQ/master/CHANGES"
 distfiles="https://github.com/hluk/CopyQ/archive/v${version}.tar.gz"
-checksum=de2e64451464dd5af661fd56bb8d5c6a9cdbbd2f66249ae0404e61c1c7d9916e
+checksum=8d526c7b0ab7a2e5ae91ef68df104277217c6679b15a0f100ae2de50247c993b
diff --git a/srcpkgs/Electron-Cash/template b/srcpkgs/Electron-Cash/template
new file mode 100644
index 00000000000..2db05c94832
--- /dev/null
+++ b/srcpkgs/Electron-Cash/template
@@ -0,0 +1,25 @@
+# Template file for 'Electron-Cash'
+pkgname=Electron-Cash
+version=4.0.10
+revision=1
+archs=noarch
+build_style=python3-module
+pycompile_module="electroncash electroncash_gui electroncash_plugins"
+hostmakedepends="python3-setuptools python3-PyQt5-devel-tools"
+depends="python3-PyQt5 python3-PyQt5-svg
+ python3-jsonrpclib python3-protobuf
+ python3-pyaes python3-pycryptodome libbitcoin-secp256k1 libzbar
+ python3-dnspython python3-requests python3-qrcode python3-pysocks"
+short_desc="Lightweight Bitcoin Cash client"
+maintainer="Cameron Nemo <cnemo@tutanota.com>"
+license="MIT"
+homepage="https://electroncash.org"
+distfiles="https://electroncash.org/downloads/${version}/win-linux/Electron-Cash-${version}.tar.gz"
+checksum=48270e12956a2f4ef4d2b0cb60611e47f136b734a3741dab176542a32ae59ee5
+
+post_install() {
+	for lib in zbar secp256k1; do
+		rm -f -- "${DESTDIR}/usr/lib/python${py3_ver}/site-packages/electroncash/lib${lib}.so.0"
+	done
+	vlicense LICENCE
+}
diff --git a/srcpkgs/EternalTerminal/template b/srcpkgs/EternalTerminal/template
index 8957865792d..875537de451 100644
--- a/srcpkgs/EternalTerminal/template
+++ b/srcpkgs/EternalTerminal/template
@@ -1,7 +1,7 @@
 # Template file for 'EternalTerminal'
 pkgname=EternalTerminal
-version=5.1.9
-revision=2
+version=5.1.10
+revision=1
 wrksrc="${pkgname}-et-v${version}"
 build_style=cmake
 hostmakedepends="protobuf"
@@ -12,7 +12,7 @@ maintainer="Nathan Owens <ndowens04@gmail.com>"
 license="Apache-2.0"
 homepage="https://mistertea.github.io/EternalTerminal"
 distfiles="https://github.com/MisterTea/EternalTerminal/archive/et-v${version}.tar.gz"
-checksum=37b9bd33ed3edc88cedf2c4168246e23818ccd4e08731d0698d8d133dd3b1147
+checksum=cfe368b3b79d5d07d59ee0437d6a7b838e6162ae85ffc71ca7988b37b46a477b
 
 system_accounts="_eternal"
 
diff --git a/srcpkgs/FeatherPad/template b/srcpkgs/FeatherPad/template
index 9ac45729814..ddfc89c6300 100644
--- a/srcpkgs/FeatherPad/template
+++ b/srcpkgs/FeatherPad/template
@@ -1,16 +1,16 @@
 # Template file for 'FeatherPad'
 pkgname=FeatherPad
-version=0.9.4
+version=0.11.1
 revision=1
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-tools-devel"
-makedepends="libX11-devel libXext-devel qt5-x11extras-devel qt5-svg-devel"
+makedepends="libX11-devel libXext-devel qt5-x11extras-devel qt5-svg-devel hunspell-devel"
 short_desc="Lightweight Qt5 plain-text editor for Linux"
 maintainer="Young Jin Park <youngjinpark20@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/tsujan/FeatherPad"
 distfiles="https://github.com/tsujan/FeatherPad/archive/V${version}.tar.gz"
-checksum=6833ebc541550c0cac4c5e47f0870eb0209f0d779dfeef7273b6287896d46ef6
+checksum=a9cb943587bb0065c7cd7e42b5b396d633d4bab6c531621b4f85b050e0ccd9db
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-x11extras-devel qt5-svg-devel"
diff --git a/srcpkgs/FeedReader/template b/srcpkgs/FeedReader/template
index 134f2a39144..55d74e6a51d 100644
--- a/srcpkgs/FeedReader/template
+++ b/srcpkgs/FeedReader/template
@@ -1,6 +1,6 @@
 # Template file for 'FeedReader'
 pkgname=FeedReader
-version=2.8.2
+version=2.10.0
 revision=1
 build_style=meson
 hostmakedepends="glib-devel intltool itstool pkg-config vala"
@@ -12,7 +12,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-only"
 homepage="https://jangernert.github.io/FeedReader/"
 distfiles="https://github.com/jangernert/${pkgname}/archive/v${version}.tar.gz"
-checksum=40ec53a5bdb745909b486092fb0c91686b2f1a76fce5416514f62c3f3617f612
+checksum=fd10d2d2dc9c20c259d672634e5e100d10f0fb730e0687e1b3c2423224901a2c
 nocross="SQLite.vala:131.12-131.36: error: The name copy does not exist in the context of Sqlite.Value"
 
 case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/GoLand/template b/srcpkgs/GoLand/template
index cebfb255168..70a9d20c60e 100644
--- a/srcpkgs/GoLand/template
+++ b/srcpkgs/GoLand/template
@@ -1,6 +1,6 @@
 # Template file for 'GoLand'
 pkgname=GoLand
-version=2019.1.3
+version=2019.2.3
 revision=1
 archs="i686 x86_64"
 depends="virtual?java-environment"
@@ -9,7 +9,7 @@ maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/go"
 distfiles="https://download.jetbrains.com/go/goland-${version}.tar.gz"
-checksum=b0e22be860ead904c88595f005d5fe2b0fea310c15a1d8551372b5c336d1895b
+checksum=d65d5fc57798652be47d6a540c41da3cf344c0ebabc357c0807c6999acff2b7d
 repository=nonfree
 restricted=yes
 nopie=yes
@@ -37,14 +37,14 @@ post_extract() {
 
 do_install() {
 	TARGET_PATH="usr/lib/${pkgname}"
-	LICENSE_PATH="usr/share/licenses/${pkgname}"
 
 	vmkdir usr/bin
 	vmkdir ${TARGET_PATH}
-	vmkdir ${LICENSE_PATH}
 
-	# Ideally vlicense should be called here, but vcopy is more terse.
-	vcopy license/* ${LICENSE_PATH}
+	local i
+	for i in license/* ; do
+		vlicense $i
+	done
 
 	vcopy bin ${TARGET_PATH}
 	vcopy help ${TARGET_PATH}
diff --git a/srcpkgs/GraphicsMagick/template b/srcpkgs/GraphicsMagick/template
index 5bdcedd320d..20df5e5c42a 100644
--- a/srcpkgs/GraphicsMagick/template
+++ b/srcpkgs/GraphicsMagick/template
@@ -1,6 +1,6 @@
 # Template file for 'GraphicsMagick'
 pkgname=GraphicsMagick
-version=1.3.32
+version=1.3.33
 revision=1
 build_style=gnu-configure
 configure_args="--with-quantum-depth=16 --with-gs-font-dir=/usr/share/fonts/Type1
@@ -17,7 +17,7 @@ license="MIT"
 homepage="http://www.graphicsmagick.org/"
 changelog="http://www.graphicsmagick.org/NEWS.html"
 distfiles="${SOURCEFORGE_SITE}/graphicsmagick/graphicsmagick/${version}/${pkgname}-${version}.tar.gz"
-checksum=03919288e14927d8cace1e2e95578bef171a3c2cdd88ac563f25c3d57f14ff2e
+checksum=00ea0df7c78c903cce325f402429bcd3924168cf39277f743a0641d47c411ee8
 keep_libtool_archives=yes
 
 post_install() {
diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index bd15d7fd519..5951e1e5a69 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -1,7 +1,7 @@
 # Template file for 'ImageMagick'
 pkgname=ImageMagick
 _majorver=7.0.8
-_patchver=59
+_patchver=68
 version="${_majorver}.${_patchver}"
 revision=1
 wrksrc="${pkgname}-${_majorver}-${_patchver}"
@@ -16,12 +16,12 @@ makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel
  libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel libwmf-devel
  ocl-icd-devel pango-devel"
 short_desc="Package for display and interactive manipulation of images"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="ImageMagick"
 homepage="https://www.imagemagick.org/"
 changelog="https://imagemagick.org/script/changelog.php"
 distfiles="https://github.com/ImageMagick/ImageMagick/archive/${_majorver}-${_patchver}.tar.gz"
-checksum=238ee17196fcb80bb58485910aaefc12d48f99e4043c2a28f06ff9588161c4e3
+checksum=c3aa886789b36d3fe1f6f99fc1a32bbbf26d4ce51f485b32c3a4b85e176a53c9
 
 subpackages="libmagick libmagick-devel"
 
diff --git a/srcpkgs/ImageMagick6/template b/srcpkgs/ImageMagick6/template
index 67747ba52db..75d65b49fb1 100644
--- a/srcpkgs/ImageMagick6/template
+++ b/srcpkgs/ImageMagick6/template
@@ -1,7 +1,7 @@
 # Template file for 'ImageMagick6'
 pkgname=ImageMagick6
 _majorver=6.9.10
-_patchver=59
+_patchver=68
 version="${_majorver}.${_patchver}"
 revision=1
 wrksrc="${pkgname}-${_majorver}-${_patchver}"
@@ -20,7 +20,7 @@ maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="ImageMagick"
 homepage="https://www.imagemagick.org/"
 distfiles="https://github.com/ImageMagick/ImageMagick6/archive/${_majorver}-${_patchver}.tar.gz"
-checksum=eb4e312e2d576c61f0bf4b43eea9cc77820e0ecacb8a0264e5eb708dfa101493
+checksum=2caa3d8d1f65e733de30d1f537e57991ff3adb3edb5b60afa9cd0f6e0a20945f
 
 keep_libtool_archives=yes
 conf_files="/etc/ImageMagick-${_majorver%%.*}/*.xml"
diff --git a/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch b/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
new file mode 100644
index 00000000000..b7304474f77
--- /dev/null
+++ b/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
@@ -0,0 +1,93 @@
+Imported from https://github.com/LuaJIT/LuaJIT/pull/486.
+
+This fixes crashes on ppc-musl, as musl only supports secureplt.
+
+--- src/lj_dispatch.c
++++ src/lj_dispatch.c
+@@ -56,6 +56,18 @@ static const ASMFunction dispatch_got[] = {
+ #undef GOTFUNC
+ #endif
+ 
++#if LJ_TARGET_PPC && (LJ_ARCH_BITS == 32)
++#include <math.h>
++LJ_FUNCA_NORET void LJ_FASTCALL lj_ffh_coroutine_wrap_err(lua_State *L,
++							  lua_State *co);
++
++#define GOTFUNC(name)	(ASMFunction)name,
++static const ASMFunction dispatch_got[] = {
++  GOTDEF(GOTFUNC)
++};
++#undef GOTFUNC
++#endif
++
+ /* Initialize instruction dispatch table and hot counters. */
+ void lj_dispatch_init(GG_State *GG)
+ {
+@@ -77,6 +89,9 @@ void lj_dispatch_init(GG_State *GG)
+ #if LJ_TARGET_MIPS
+   memcpy(GG->got, dispatch_got, LJ_GOT__MAX*sizeof(ASMFunction *));
+ #endif
++#if LJ_TARGET_PPC && (LJ_ARCH_BITS == 32)
++  memcpy(GG->got, dispatch_got, LJ_GOT__MAX*4);
++#endif
+ }
+ 
+ #if LJ_HASJIT
+--- src/lj_dispatch.h
++++ src/lj_dispatch.h
+@@ -66,6 +66,21 @@ GOTDEF(GOTENUM)
+ };
+ #endif
+ 
++#if LJ_TARGET_PPC && (LJ_ARCH_BITS == 32)
++/* Need our own global offset table for the dreaded MIPS calling conventions. */
++#define GOTDEF(_) \
++  _(floor) _(ceil) _(trunc) _(log) _(log10) _(exp) _(sin) _(cos) _(tan) \
++  _(asin) _(acos) _(atan) _(sinh) _(cosh) _(tanh) _(frexp) _(modf) _(atan2) \
++  _(pow) _(fmod) _(ldexp) _(sqrt)
++
++enum {
++#define GOTENUM(name) LJ_GOT_##name,
++GOTDEF(GOTENUM)
++#undef GOTENUM
++  LJ_GOT__MAX
++};
++#endif
++
+ /* Type of hot counter. Must match the code in the assembler VM. */
+ /* 16 bits are sufficient. Only 0.0015% overhead with maximum slot penalty. */
+ typedef uint16_t HotCount;
+@@ -89,7 +104,7 @@ typedef uint16_t HotCount;
+ typedef struct GG_State {
+   lua_State L;				/* Main thread. */
+   global_State g;			/* Global state. */
+-#if LJ_TARGET_MIPS
++#if LJ_TARGET_MIPS || (LJ_TARGET_PPC && (LJ_ARCH_BITS == 32))
+   ASMFunction got[LJ_GOT__MAX];		/* Global offset table. */
+ #endif
+ #if LJ_HASJIT
+--- src/vm_ppc.dasc
++++ src/vm_ppc.dasc
+@@ -59,7 +59,12 @@
+ |.define ENV_OFS,	8
+ |.endif
+ |.else  // No TOC.
+-|.macro blex, target; bl extern target@plt; .endmacro
++|.macro blex, target
++|  lwz TMP0, DISPATCH_GOT(target)(DISPATCH)
++|  mtctr TMP0
++|  bctrl
++|  //bl extern target@plt
++|.endmacro
+ |.macro .toc, a, b; .endmacro
+ |.endif
+ |.macro .tocenv, a, b; .if TOCENV; a, b; .endif; .endmacro
+@@ -448,6 +453,8 @@
+ |// Assumes DISPATCH is relative to GL.
+ #define DISPATCH_GL(field)	(GG_DISP2G + (int)offsetof(global_State, field))
+ #define DISPATCH_J(field)	(GG_DISP2J + (int)offsetof(jit_State, field))
++#define GG_DISP2GOT		(GG_OFS(got) - GG_OFS(dispatch))
++#define DISPATCH_GOT(name)	(GG_DISP2GOT + 4*LJ_GOT_##name)
+ |
+ #define PC2PROTO(field)  ((int)offsetof(GCproto, field)-(int)sizeof(GCproto))
+ |
diff --git a/srcpkgs/LuaJIT/patches/add-ppc64-support.patch b/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
similarity index 100%
rename from srcpkgs/LuaJIT/patches/add-ppc64-support.patch
rename to srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
diff --git a/srcpkgs/LuaJIT/patches/fix-vm-jit-ppc64.patch b/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
similarity index 100%
rename from srcpkgs/LuaJIT/patches/fix-vm-jit-ppc64.patch
rename to srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
diff --git a/srcpkgs/LuaJIT/template b/srcpkgs/LuaJIT/template
index b204c21811f..313404defe1 100644
--- a/srcpkgs/LuaJIT/template
+++ b/srcpkgs/LuaJIT/template
@@ -47,6 +47,23 @@ if [ "$CROSS_BUILD" ]; then
 	esac
 fi
 
+# the ppc64 patchset subtly breaks ppc, needs investigation; for
+# now apply patches conditionally, separately for ppc64 and ppc
+post_patch() {
+	local patchdir
+
+	case "$XBPS_TARGET_MACHINE" in
+		ppc64*) patchdir="ppc64";;
+		ppc*) patchdir="ppc";;
+		*) return;;
+	esac
+
+	for i in ${FILESDIR}/patches/${patchdir}/*.patch; do
+		msg_normal "patching: $i\n"
+		patch -sNp0 -i ${i}
+	done
+}
+
 do_build() {
 	local _cflags=$CFLAGS
 	local _ldflags=$LDFLAGS
diff --git a/srcpkgs/MEGAcmd/patches/include.am.patch b/srcpkgs/MEGAcmd/patches/include.am.patch
index 45e1a9fcdd5..66a0d7287d4 100644
--- a/srcpkgs/MEGAcmd/patches/include.am.patch
+++ b/srcpkgs/MEGAcmd/patches/include.am.patch
@@ -1,20 +1,12 @@
---- src/include.am.orig	2017-12-01 23:56:36.199044786 +0100
-+++ src/include.am	2017-12-01 23:56:54.073045467 +0100
-@@ -7,7 +7,7 @@
+--- src/include.am	2019-09-15 11:19:21.139430520 +0300
++++ -	2019-09-15 11:20:24.234994345 +0300
+@@ -7,9 +7,9 @@
  
  MEGACMD = mega-cmd mega-exec mega-cmd-server
  bin_PROGRAMS += $(MEGACMD)
 -$(MEGACMD): $(MEGA_LIBS)
 +$(MEGACMD):
- noinst_HEADERS += src/comunicationsmanager.h src/configurationmanager.h src/megacmd.h src/megacmdlogger.h src/megacmdsandbox.h src/megacmdutils.h src/listeners.h src/megacmdexecuter.h src/megacmdversion.h src/megacmdplatform.h src/comunicationsmanagerportsockets.h
- megacmdcompletiondir = $(sysconfdir)/bash_completion.d/
- megacmdcompletion_DATA = src/client/megacmd_completion.sh
---- src/include.am	2018-12-06 14:42:18.308589868 +0100
-+++ -	2018-12-06 14:45:15.075785487 +0100
-@@ -9,7 +9,7 @@
- bin_PROGRAMS += $(MEGACMD)
- $(MEGACMD):
- noinst_HEADERS += src/comunicationsmanager.h src/configurationmanager.h src/megacmd.h src/megacmdlogger.h src/megacmdsandbox.h src/megacmdutils.h src/listeners.h src/megacmdexecuter.h src/megacmdversion.h src/megacmdplatform.h src/comunicationsmanagerportsockets.h
+ noinst_HEADERS += src/comunicationsmanager.h src/configurationmanager.h src/megacmd.h src/megacmdlogger.h src/megacmdsandbox.h src/megacmdutils.h src/megacmdcommonutils.h src/listeners.h src/megacmdexecuter.h src/megacmdversion.h src/megacmdplatform.h src/comunicationsmanagerportsockets.h
 -megacmdcompletiondir = $(sysconfdir)/bash_completion.d/
 +megacmdcompletiondir = $(datarootdir)/bash-completion/completions
  megacmdcompletion_DATA = src/client/megacmd_completion.sh
diff --git a/srcpkgs/MEGAcmd/patches/megacmd-sdk36.diff b/srcpkgs/MEGAcmd/patches/megacmd-sdk36.diff
new file mode 100644
index 00000000000..a30a142156e
--- /dev/null
+++ b/srcpkgs/MEGAcmd/patches/megacmd-sdk36.diff
@@ -0,0 +1,381 @@
+--- src/comunicationsmanagerfilesockets.cpp
++++ src/comunicationsmanagerfilesockets.cpp
+@@ -134,14 +134,13 @@ int ComunicationsManagerFileSockets::create_new_socket(int *sockId)
+ ComunicationsManagerFileSockets::ComunicationsManagerFileSockets()
+ {
+     count = 0;
+-    mtx = new MegaMutex();
+-    informerMutex = new MegaMutex(false);
++    mtx = new std::recursive_mutex();
++    informerMutex = new std::recursive_mutex();
+     initialize();
+ }
+ 
+ int ComunicationsManagerFileSockets::initialize()
+ {
+-    mtx->init(false);
+ 
+     MegaFileSystemAccess *fsAccess = new MegaFileSystemAccess();
+     char csocketsFolder[34]; // enough to hold all numbers up to 64-bits
+@@ -394,7 +393,7 @@ void ComunicationsManagerFileSockets::sendPartialOutput(CmdPetition *inf, OUTSTR
+ 
+ int ComunicationsManagerFileSockets::informStateListener(CmdPetition *inf, string &s)
+ {
+-    MutexGuard g(*informerMutex);
++    std::lock_guard<std::recursive_mutex> g(*informerMutex);
+     LOG_verbose << "Inform State Listener: Output to write in socket " << ((CmdPetitionPosixSockets *)inf)->outSocket << ": <<" << s << ">>";
+ 
+     sockaddr_in cliAddr;
+--- src/comunicationsmanagerfilesockets.h
++++ src/comunicationsmanagerfilesockets.h
+@@ -58,8 +58,8 @@ private:
+ 
+     // to get next socket id
+     int count;
+-    mega::MegaMutex *mtx;
+-    mega::MegaMutex *informerMutex;
++    std::recursive_mutex *mtx;
++    std::recursive_mutex *informerMutex;
+ 
+     /**
+      * @brief create_new_socket
+--- src/comunicationsmanagerportsockets.cpp
++++ src/comunicationsmanagerportsockets.cpp
+@@ -161,13 +161,12 @@ SOCKET ComunicationsManagerPortSockets::create_new_socket(int *sockId)
+ ComunicationsManagerPortSockets::ComunicationsManagerPortSockets()
+ {
+     count = 0;
+-    mtx = new MegaMutex();
++    mtx = new std::recursive_mutex();
+     initialize();
+ }
+ 
+ int ComunicationsManagerPortSockets::initialize()
+ {
+-    mtx->init(false);
+ #if _WIN32
+     WORD wVersionRequested;
+     WSADATA wsaData;
+--- src/comunicationsmanagerportsockets.h
++++ src/comunicationsmanagerportsockets.h
+@@ -69,7 +69,7 @@ private:
+ 
+     // to get next socket id
+     int count;
+-    mega::MegaMutex *mtx;
++    std::recursive_mutex *mtx;
+ 
+     /**
+      * @brief create_new_socket
+--- src/listeners.cpp
++++ src/listeners.cpp
+@@ -902,7 +902,6 @@ MegaCmdGlobalTransferListener::MegaCmdGlobalTransferListener(MegaApi *megaApi, M
+     this->megaApi = megaApi;
+     this->sandboxCMD = sandboxCMD;
+     this->listener = parent;
+-    completedTransfersMutex.init(false);
+ };
+ 
+ void MegaCmdGlobalTransferListener::onTransferFinish(MegaApi* api, MegaTransfer *transfer, MegaError* error)
+--- src/listeners.h
++++ src/listeners.h
+@@ -178,7 +178,7 @@ private:
+     static const int MAXCOMPLETEDTRANSFERSBUFFER;
+ 
+ public:
+-    mega::MegaMutex completedTransfersMutex;
++    std::recursive_mutex completedTransfersMutex;
+     std::deque<mega::MegaTransfer *> completedTransfers;
+     std::map<mega::MegaHandle,std::string> completedPathsByHandle;
+ public:
+--- src/megacmd.cpp
++++ src/megacmd.cpp
+@@ -103,11 +103,11 @@ MegaApi *api;
+ std::queue<MegaApi *> apiFolders;
+ std::vector<MegaApi *> occupiedapiFolders;
+ MegaSemaphore semaphoreapiFolders;
+-MegaMutex mutexapiFolders;
++std::recursive_mutex mutexapiFolders;
+ 
+ MegaCMDLogger *loggerCMD;
+ 
+-MegaMutex mutexEndedPetitionThreads;
++std::recursive_mutex mutexEndedPetitionThreads;
+ std::vector<MegaThread *> petitionThreads;
+ std::vector<MegaThread *> endedPetitionThreads;
+ MegaThread *threadRetryConnections;
+@@ -194,7 +194,7 @@ static prompttype prompt = COMMAND;
+ // local console
+ Console* console;
+ 
+-MegaMutex mutexHistory;
++std::recursive_mutex mutexHistory;
+ 
+ map<unsigned long long, string> threadline;
+ 
+@@ -4411,9 +4411,7 @@ int main(int argc, char* argv[])
+         loggerCMD->setCmdLoggerLevel(MegaApi::LOG_LEVEL_MAX);
+     }
+ 
+-    mutexHistory.init(false);
+ 
+-    mutexEndedPetitionThreads.init(false);
+ 
+     ConfigurationManager::loadConfiguration(( argc > 1 ) && debug);
+     if (!ConfigurationManager::lockExecution() && !skiplockcheck)
+@@ -4476,7 +4474,6 @@ int main(int argc, char* argv[])
+         semaphoreClients.release();
+     }
+ 
+-    mutexapiFolders.init(false);
+ 
+     LOG_debug << "Language set to: " << localecode;
+ 
+--- src/megacmdexecuter.cpp
++++ src/megacmdexecuter.cpp
+@@ -124,12 +124,6 @@ MegaCmdExecuter::MegaCmdExecuter(MegaApi *api, MegaCMDLogger *loggerCMD, MegaCmd
+     api->addTransferListener(globalTransferListener);
+     cwd = UNDEF;
+     fsAccessCMD = new MegaFileSystemAccess();
+-    mtxSyncMap.init(false);
+-    mtxWebDavLocations.init(false);
+-    mtxFtpLocations.init(false);
+-#ifdef ENABLE_BACKUPS
+-    mtxBackupsMap.init(true);
+-#endif
+     session = NULL;
+ }
+ 
+--- src/megacmdexecuter.h
++++ src/megacmdexecuter.h
+@@ -33,12 +33,12 @@ private:
+     MegaCMDLogger *loggerCMD;
+     MegaCmdSandbox *sandboxCMD;
+     MegaCmdGlobalTransferListener *globalTransferListener;
+-    mega::MegaMutex mtxSyncMap;
+-    mega::MegaMutex mtxWebDavLocations; //TODO: destroy these two
+-    mega::MegaMutex mtxFtpLocations;
++    std::recursive_mutex mtxSyncMap;
++    std::recursive_mutex mtxWebDavLocations; //TODO: destroy these two
++    std::recursive_mutex mtxFtpLocations;
+ 
+ #ifdef ENABLE_BACKUPS
+-    mega::MegaMutex mtxBackupsMap;
++    std::recursive_mutex mtxBackupsMap;
+ #endif
+ 
+     // login/signup e-mail address
+--- src/megacmdlogger.cpp
++++ src/megacmdlogger.cpp
+@@ -38,7 +38,7 @@ using namespace std;
+ using namespace mega;
+ 
+ // different outstreams for every thread. to gather all the output data
+-MUTEX_CLASS threadLookups(false);
++std::mutex threadLookups;
+ map<uint64_t, LoggedStream *> outstreams;
+ map<uint64_t, int> threadLogLevel;
+ map<uint64_t, int> threadoutCode;
+@@ -50,7 +50,7 @@ LoggedStream LCOUT(&COUT);
+ 
+ LoggedStream &getCurrentOut()
+ {
+-    MutexGuard g(threadLookups);
++    std::lock_guard<std::mutex> g(threadLookups);
+     uint64_t currentThread = MegaThread::currentThreadId();
+     if (outstreams.find(currentThread) == outstreams.end())
+     {
+@@ -71,7 +71,7 @@ bool interactiveThread()
+ 
+     unsigned long long currentThread = MegaThread::currentThreadId();
+ 
+-    MutexGuard g(threadLookups);
++    std::lock_guard<std::mutex> g(threadLookups);
+     if (outstreams.find(currentThread) == outstreams.end())
+     {
+         return true;
+@@ -86,7 +86,7 @@ int getCurrentOutCode()
+ {
+     unsigned long long currentThread = MegaThread::currentThreadId();
+ 
+-    MutexGuard g(threadLookups);
++    std::lock_guard<std::mutex> g(threadLookups);
+     if (threadoutCode.find(currentThread) == threadoutCode.end())
+     {
+         return 0; //default OK
+@@ -102,7 +102,7 @@ CmdPetition * getCurrentPetition()
+ {
+     unsigned long long currentThread = MegaThread::currentThreadId();
+ 
+-    MutexGuard g(threadLookups);
++    std::lock_guard<std::mutex> g(threadLookups);
+     if (threadpetition.find(currentThread) == threadpetition.end())
+     {
+         return NULL;
+@@ -117,7 +117,7 @@ int getCurrentThreadLogLevel()
+ {
+     unsigned long long currentThread = MegaThread::currentThreadId();
+ 
+-    MutexGuard g(threadLookups);
++    std::lock_guard<std::mutex> g(threadLookups);
+     if (threadLogLevel.find(currentThread) == threadLogLevel.end())
+     {
+         return -1;
+@@ -132,7 +132,7 @@ bool getCurrentThreadIsCmdShell()
+ {
+     unsigned long long currentThread = MegaThread::currentThreadId();
+ 
+-    MutexGuard g(threadLookups);
++    std::lock_guard<std::mutex> g(threadLookups);
+     if (threadIsCmdShell.find(currentThread) == threadIsCmdShell.end())
+     {
+         return false; //default not
+@@ -146,31 +146,31 @@ bool getCurrentThreadIsCmdShell()
+ 
+ void setCurrentThreadLogLevel(int level)
+ {
+-    MutexGuard g(threadLookups);
++    std::lock_guard<std::mutex> g(threadLookups);
+     threadLogLevel[MegaThread::currentThreadId()] = level;
+ }
+ 
+ void setCurrentThreadOutStream(LoggedStream *s)
+ {
+-    MutexGuard g(threadLookups);
++    std::lock_guard<std::mutex> g(threadLookups);
+     outstreams[MegaThread::currentThreadId()] = s;
+ }
+ 
+ void setCurrentThreadIsCmdShell(bool isit)
+ {
+-    MutexGuard g(threadLookups);
++    std::lock_guard<std::mutex> g(threadLookups);
+     threadIsCmdShell[MegaThread::currentThreadId()] = isit;
+ }
+ 
+ void setCurrentOutCode(int outCode)
+ {
+-    MutexGuard g(threadLookups);
++    std::lock_guard<std::mutex> g(threadLookups);
+     threadoutCode[MegaThread::currentThreadId()] = outCode;
+ }
+ 
+ void setCurrentPetition(CmdPetition *petition)
+ {
+-    MutexGuard g(threadLookups);
++    std::lock_guard<std::mutex> g(threadLookups);
+     threadpetition[MegaThread::currentThreadId()] = petition;
+ }
+ 
+@@ -179,7 +179,7 @@ MegaCMDLogger::MegaCMDLogger()
+ {
+     this->output = &LCOUT;
+     this->apiLoggerLevel = MegaApi::LOG_LEVEL_ERROR;
+-    this->outputmutex = new MegaMutex(false);
++    this->outputmutex = new std::recursive_mutex;
+ }
+ 
+ MegaCMDLogger::~MegaCMDLogger()
+@@ -199,7 +199,7 @@ void MegaCMDLogger::log(const char *time, int loglevel, const char *source, cons
+         if (loglevel <= cmdLoggerLevel)
+         {
+ #ifdef _WIN32
+-            MutexGuard g(*outputmutex);
++            std::lock_guard<std::mutex> g(*outputmutex);
+             int oldmode;
+             oldmode = _setmode(_fileno(stdout), _O_U8TEXT);
+             *output << "[" << SimpleLogger::toStr(LogLevel(loglevel)) << ": " << time << "] " << message << endl;
+@@ -233,7 +233,7 @@ void MegaCMDLogger::log(const char *time, int loglevel, const char *source, cons
+                 return;
+             }
+ #ifdef _WIN32
+-            MutexGuard g(*outputmutex);
++            std::lock_guard<std::mutex> g(*outputmutex);
+             int oldmode;
+             oldmode = _setmode(_fileno(stdout), _O_U8TEXT);
+             *output << "[API:" << SimpleLogger::toStr(LogLevel(loglevel)) << ": " << time << "] " << message << endl;
+--- src/megacmdlogger.h
++++ src/megacmdlogger.h
+@@ -112,7 +112,7 @@ private:
+     int apiLoggerLevel;
+     int cmdLoggerLevel;
+     LoggedStream * output;
+-    mega::MegaMutex *outputmutex;
++    std::recursive_mutex *outputmutex;
+ 
+ public:
+     MegaCMDLogger();
+--- src/megacmdshell/megacmdshell.cpp
++++ src/megacmdshell/megacmdshell.cpp
+@@ -199,7 +199,7 @@ bool confirmingcancellink = false;
+ // communications with megacmdserver:
+ MegaCmdShellCommunications *comms;
+ 
+-MUTEX_CLASS mutexPrompt(false);
++std::mutex mutexPrompt;
+ 
+ void printWelcomeMsg(unsigned int width = 0);
+ 
+@@ -627,7 +627,7 @@ void install_rl_handler(const char *theprompt)
+ 
+ void changeprompt(const char *newprompt, bool redisplay)
+ {
+-    MutexGuard g(mutexPrompt);
++    std::lock_guard<std::mutex> g(mutexPrompt);
+ 
+     if (*dynamicprompt)
+     {
+--- src/megacmdshell/megacmdshellcommunications.cpp
++++ src/megacmdshell/megacmdshellcommunications.cpp
+@@ -80,7 +80,7 @@ bool MegaCmdShellCommunications::stopListener;
+ bool MegaCmdShellCommunications::updating;
+ ::mega::Thread *MegaCmdShellCommunications::listenerThread;
+ SOCKET MegaCmdShellCommunications::newsockfd = INVALID_SOCKET;
+-MegaMutex MegaCmdShellCommunications::megaCmdStdoutputing;
++std::recursive_mutex MegaCmdShellCommunications::megaCmdStdoutputing;
+ 
+ bool MegaCmdShellCommunications::socketValid(SOCKET socket)
+ {
+@@ -483,7 +483,6 @@ MegaCmdShellCommunications::MegaCmdShellCommunications()
+     stopListener = false;
+     updating = false;
+     listenerThread = NULL;
+-    MegaCmdShellCommunications::megaCmdStdoutputing.init(false);
+ }
+ 
+ 
+--- src/megacmdshell/megacmdshellcommunications.h
++++ src/megacmdshell/megacmdshellcommunications.h
+@@ -26,6 +26,7 @@
+ 
+ #include <string>
+ #include <iostream>
++#include <mutex>
+ 
+ #ifdef _WIN32
+ #include <WinSock2.h>
+@@ -40,15 +41,12 @@
+ 
+ #if defined(_WIN32) && !defined(WINDOWS_PHONE) && !defined(USE_CPPTHREAD)
+ #include "mega/thread/win32thread.h"
+-class MegaMutex : public ::mega::Win32Mutex {};
+ class MegaThread : public ::mega::Win32Thread {};
+ #elif defined(USE_CPPTHREAD)
+ #include "mega/thread/cppthread.h"
+-class MegaMutex : public ::mega::CppMutex {};
+ class MegaThread : public ::mega::CppThread {};
+ #else
+ #include "mega/thread/posixthread.h"
+-class MegaMutex : public ::mega::PosixMutex {};
+ class MegaThread : public ::mega::PosixThread {};
+ #endif
+ 
+@@ -118,7 +116,7 @@ public:
+     MegaCmdShellCommunications();
+     virtual ~MegaCmdShellCommunications();
+ 
+-    static MegaMutex megaCmdStdoutputing;
++    static std::recursive_mutex megaCmdStdoutputing;
+     virtual int executeCommand(std::string command, std::string (*readresponse)(const char *) = NULL, OUTSTREAMTYPE &output = COUT, bool interactiveshell = true, std::wstring = L"");
+     virtual int executeCommandW(std::wstring command, std::string (*readresponse)(const char *) = NULL, OUTSTREAMTYPE &output = COUT, bool interactiveshell = true);
+ 
diff --git a/srcpkgs/MEGAcmd/patches/musl.patch b/srcpkgs/MEGAcmd/patches/musl.patch
deleted file mode 100644
index 3e0a395fb19..00000000000
--- a/srcpkgs/MEGAcmd/patches/musl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/configurationmanager.h	2018-10-03 16:27:51.311763612 +0200
-+++ -	2018-10-03 16:29:44.035272722 +0200
-@@ -23,6 +23,10 @@
- #include <map>
- #include <set>
- 
-+#ifndef _WIN32
-+#include <sys/file.h> // LOCK_EX and LOCK_NB
-+#endif
-+
- #define CONFIGURATIONSTOREDBYVERSION -2
- class ConfigurationManager
- {
diff --git a/srcpkgs/MEGAcmd/template b/srcpkgs/MEGAcmd/template
index 2345b3972b8..63e7c4f6986 100644
--- a/srcpkgs/MEGAcmd/template
+++ b/srcpkgs/MEGAcmd/template
@@ -1,7 +1,8 @@
 # Template file for 'MEGAcmd'
 pkgname=MEGAcmd
-version=1.0.0
-revision=11
+version=1.1.0
+revision=1
+wrksrc="${pkgname}-${version}_Linux"
 build_style=gnu-configure
 make_build_args='LIBTOOLFLAGS="--tag=CXX"'
 hostmakedepends="autoconf-archive autogen gettext automake libtool pkg-config"
@@ -10,8 +11,8 @@ short_desc="Command Line Interactive and Scriptable Application to access MEGA"
 maintainer="John <johnz@posteo.net>"
 license="BSD-2-Clause, GPL-3.0-or-later"
 homepage="https://github.com/meganz/MEGAcmd"
-distfiles="https://github.com/meganz/MEGAcmd/archive/${version}.tar.gz"
-checksum=1200363bee2f387a2287e286b38d15b1a01079967e20b8c489815cc7c8d9ff63
+distfiles="https://github.com/meganz/MEGAcmd/archive/${version}_Linux.tar.gz"
+checksum=8064a21b1d1436537ab9ccc98f1f411f9496aace000584bea87d95f8e7b3a550
 replaces="megacmd>=0"
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/MEGAsdk/template b/srcpkgs/MEGAsdk/template
index a7a9977393e..52aa7573279 100644
--- a/srcpkgs/MEGAsdk/template
+++ b/srcpkgs/MEGAsdk/template
@@ -1,7 +1,7 @@
 # Template file for 'MEGAsdk'
 pkgname=MEGAsdk
-version=3.5.4
-revision=1
+version=3.6.2a
+revision=2
 wrksrc="sdk-${version}"
 build_style=gnu-configure
 configure_args="--enable-chat --disable-examples $(vopt_with libuv)"
@@ -16,7 +16,7 @@ maintainer="John <johnz@posteo.net>"
 license="BSD-2-Clause"
 homepage="https://mega.nz"
 distfiles="https://github.com/meganz/sdk/archive/v${version}.tar.gz"
-checksum=7fc81a64a77829bbc8dd316aac2159890a556dfdeade527a1386482e6dee26ee
+checksum=22d910bcd799f30a499fe748cc2b3917e9e213558b1d5fba07b3f3908a833897
 replaces="libmega>=0"
 
 build_options="libuv mediainfo"
diff --git a/srcpkgs/MEGAsync/patches/breakpad.patch b/srcpkgs/MEGAsync/patches/breakpad.patch
new file mode 100644
index 00000000000..79f258f71a5
--- /dev/null
+++ b/srcpkgs/MEGAsync/patches/breakpad.patch
@@ -0,0 +1,16 @@
+--- src/MEGASync/google_breakpad/client/linux/handler/exception_handler.cc	2019-09-13 22:27:23.351723073 +0300
++++ -	2019-09-13 22:33:08.244312688 +0300
+@@ -104,11 +104,13 @@
+ #define PR_SET_PTRACER 0x59616d61
+ #endif
+ 
++#if defined(__GLIBC__) && !__GLIBC_PREREQ(2, 30)
+ // A wrapper for the tgkill syscall: send a signal to a specific thread.
+ static int tgkill(pid_t tgid, pid_t tid, int sig) {
+   return syscall(__NR_tgkill, tgid, tid, sig);
+   return 0;
+ }
++#endif
+ 
+ namespace google_breakpad {
+ 
diff --git a/srcpkgs/MEGAsync/template b/srcpkgs/MEGAsync/template
index 913e8fe7dee..4b66868b06e 100644
--- a/srcpkgs/MEGAsync/template
+++ b/srcpkgs/MEGAsync/template
@@ -1,20 +1,20 @@
 # Template file for 'MEGAsync'
 pkgname=MEGAsync
-version=4.1.1.0
+version=4.2.4.0
 revision=1
-wrksrc="${pkgname}-${version}_Linux"
+wrksrc="${pkgname}-${version}_Win"
 build_wrksrc=src
 build_style=qmake
-configure_args='"CONFIG-=with_tools"'
+configure_args='"CONFIG+=FULLREQUIREMENTS"'
 hostmakedepends="libtool qt5-qmake qt5-host-tools"
 makedepends="qt5-tools-devel qt5-devel qt5-svg-devel MEGAsdk-devel MEGAsdk-qt
  libraw-devel libgomp-devel"
 short_desc="Automated syncing with MEGA Cloud Drive"
 maintainer="John <johnz@posteo.net>"
-license="custom"
+license="custom: Proprietary"
 homepage="https://mega.co.nz"
-distfiles="https://github.com/meganz/MEGAsync/archive/v${version}_Linux.tar.gz"
-checksum=5f43a3f402c10519e2f59c8c2a70c55affd3eb1a323767127929fb5f4baa429c
+distfiles="https://github.com/meganz/MEGAsync/archive/v${version}_Win.tar.gz"
+checksum=5fd90c93677085a2f73faa6a5a3548fcd29fc9f3203f6ddbcac7f170b580f239
 restricted=yes
 nocross=yes
 
diff --git a/srcpkgs/Minder/template b/srcpkgs/Minder/template
index ffe8b188f28..47d62e32ed2 100644
--- a/srcpkgs/Minder/template
+++ b/srcpkgs/Minder/template
@@ -1,6 +1,6 @@
 # Template file for 'Minder'
 pkgname=Minder
-version=1.4.1
+version=1.5.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config glib-devel vala"
@@ -11,4 +11,4 @@ maintainer="Cameron Nemo <camerontnorman@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/phase1geo/Minder"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=e1e5343fb83612bfc4f1943cbc53411649da4ce9bd078061b0623e7c9db95621
+checksum=e313b5305242959434d551d3ec78bbed6faceb5494c1832b98b0b63a95b2e3f0
diff --git a/srcpkgs/ModemManager/template b/srcpkgs/ModemManager/template
index 085a1c6de39..276f13dba4b 100644
--- a/srcpkgs/ModemManager/template
+++ b/srcpkgs/ModemManager/template
@@ -1,6 +1,6 @@
 # Template file for 'ModemManager'
 pkgname=ModemManager
-version=1.10.4
+version=1.10.6
 revision=1
 build_style=gnu-configure
 build_helper="gir"
@@ -18,7 +18,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.freedesktop.org/wiki/Software/ModemManager/"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=fa556bb4ba1f1478e709b71151b4de8f7d136d80e51c64e887fc1fd8926cdc70
+checksum=3c2ca73782215664141042422759899ca9846440fc26d6223c7cf7ea4dd3c996
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/MultiMC/template b/srcpkgs/MultiMC/template
index 297ffe08850..b38ba6ca597 100644
--- a/srcpkgs/MultiMC/template
+++ b/srcpkgs/MultiMC/template
@@ -1,14 +1,14 @@
 # Template file for 'MultiMC'
 pkgname=MultiMC
-version=0.6.5
-revision=4
+version=0.6.7
+revision=2
 wrksrc="${pkgname}5-${version}"
 _commithashnbt="4b305bbd2ac0e7a26987baf7949a484a87b474d4"
-_nbtversion="multimc-0.5.0"
-_quazipversion="multimc-2"
+_nbtversion="multimc-0.6.1"
+_quazipversion="multimc-3"
 build_style=cmake
 configure_args='-DMultiMC_BUILD_PLATFORM=Void -DMultiMC_LAYOUT=lin-system'
-hostmakedepends="openjdk xxd git-all"
+hostmakedepends="openjdk xxd git"
 makedepends="qt5-devel qt5-x11extras-devel qt5-svg-devel gtk+-devel"
 depends="virtual?java-environment"
 short_desc="Instanced Minecraft client"
@@ -18,9 +18,9 @@ homepage="http://multimc.org"
 distfiles="https://github.com/${pkgname}/${pkgname}5/archive/${version}.tar.gz
 	https://github.com/${pkgname}/libnbtplusplus/archive/${_nbtversion}.tar.gz
 	https://github.com/${pkgname}/quazip/archive/${_quazipversion}.tar.gz"
-checksum="98e8db7c0fda5e5a1917dc3f7cdbfd4b337c45aa47d1e7dbd45c380576bd7716
-	bcefbdd905f10a04605cf9e8f768d0f60c972e9e219c800512a5fd9c5f7a8498
-	25e1b74f0edef5e09647f7b5344c08fad4eaebbc386b1f288b59286ecdfe07fa"
+checksum="3ec38a5f622048ba3926f0e20fb296d646c7848f8313143062b3e2bd273149ae
+ 36c816e6b1ef8ece52c57dfa9bfda3a23808d0c6c3288b25d8bcf49c7cdb5b07
+ ffa60368b1c196859691b637c740f4c60597b2ac47217995082ae8b2a3a9ac18"
 skip_extraction="${_nbtversion}.tar.gz ${_quazipversion}.tar.gz"
 
 pre_configure() {
diff --git a/srcpkgs/NetAuth/template b/srcpkgs/NetAuth/template
index caa6078d3d0..ef64bcac909 100644
--- a/srcpkgs/NetAuth/template
+++ b/srcpkgs/NetAuth/template
@@ -1,6 +1,6 @@
 # Template file for 'NetAuth'
 pkgname=NetAuth
-version=0.1.0
+version=0.2.1
 revision=1
 build_style="go"
 go_import_path="github.com/NetAuth/NetAuth"
@@ -12,7 +12,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MIT"
 homepage="https://netauth.org"
 distfiles="https://github.com/NetAuth/NetAuth/archive/v$version.tar.gz"
-checksum=3521516de7e342199ebc564614f0b5f93119b2fcbf603c186cd2c7f20cb18874
+checksum=f2065b58c6e6c1015ea5cfcf7a61a91e90b597e76ecabd0c6ec60016ebdb0766
 
 do_check() {
 	go test -v ./...
diff --git a/srcpkgs/NetKeys/template b/srcpkgs/NetKeys/template
index 1afaa01f939..ef5fedfe8e5 100644
--- a/srcpkgs/NetKeys/template
+++ b/srcpkgs/NetKeys/template
@@ -1,6 +1,6 @@
 # Template file for 'NetKeys'
 pkgname=NetKeys
-version=0.3
+version=0.4
 revision=1
 build_style=go
 go_import_path="github.com/NetAuth/NetKeys"
@@ -11,7 +11,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MIT"
 homepage="https://netauth.org"
 distfiles="https://github.com/NetAuth/NetKeys/archive/v$version.tar.gz"
-checksum=f6daf0390020c31ba33c4231df9190ce9d3b6a8373492debc98a797a31380679
+checksum=f70a457f7e840425618c32ef3f5a540b6b9a027e3199e5355ffb7995b5de0d3f
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index bc2c5a4db7d..e9a615193c9 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -1,7 +1,7 @@
 # Template file for 'NetworkManager'
 pkgname=NetworkManager
 version=1.18.2
-revision=2
+revision=4
 build_style=meson
 build_helper="gir"
 configure_args="-Dpolkit_agent=true -Dsystemd_journal=false
@@ -12,10 +12,11 @@ configure_args="-Dpolkit_agent=true -Dsystemd_journal=false
  -Dpppd_plugin_dir=/usr/lib/pppd/2.4.7 -Dresolvconf=/usr/bin/resolvconf
  -Ddhclient=/usr/bin/dhclient -Dkernel_firmware_dir=/usr/lib/firmware
  -Ddnsmasq=/usr/bin/dnsmasq -Ddbus_conf_dir=/etc/dbus-1/system.d
+ -Diwd=true
  -Dudev_dir=/usr/lib/udev -Dintrospection=$(vopt_if gir true false)
  -Dvapi=$(vopt_if vala true false)
  -Dsession_tracking=$(vopt_if elogind elogind no)
- -Dsuspend_resume=$(vopt_if elogind elogind no)
+ -Dsuspend_resume=$(vopt_if elogind elogind upower)
  -Dconfig_dhcp_default=internal"
 hostmakedepends="gettext-devel glib-devel libxslt-devel pkg-config
  intltool dbus-glib-devel jansson-devel $(vopt_if vala vala)
@@ -52,7 +53,7 @@ esac
 
 # Package build options
 build_options="gir vala elogind"
-build_options_default="gir vala"
+build_options_default="gir vala elogind"
 
 pre_configure() {
 	if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/OTPClient/template b/srcpkgs/OTPClient/template
index 3effc7e017c..668300b7192 100644
--- a/srcpkgs/OTPClient/template
+++ b/srcpkgs/OTPClient/template
@@ -1,14 +1,14 @@
 # Template file for 'OTPClient'
 pkgname=OTPClient
-version=1.4.1
+version=1.5.1
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="gtk+3-devel libglib-devel libgcrypt-devel libpng-devel
  libzip-devel libcotp-devel libzbar-devel jansson-devel"
 short_desc="Highly secure and easy to use GTK+ OTP client"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/paolostivanin/OTPClient"
 distfiles="https://github.com/paolostivanin/OTPClient/archive/v${version}.tar.gz"
-checksum=67ffd03e866a2184896b99d385a95c181e2e84d371276723297d136683a0fa93
+checksum=c8794a45b691613326f15a95b9fe7f16511b0c16b6b6e1cedc11dc5344c2cc27
diff --git a/srcpkgs/PackageKit/template b/srcpkgs/PackageKit/template
index b9590d1e5ba..046602547cd 100644
--- a/srcpkgs/PackageKit/template
+++ b/srcpkgs/PackageKit/template
@@ -15,7 +15,7 @@ hostmakedepends="automake glib-devel pkg-config libtool gtk-doc
 makedepends="libglib-devel sqlite-devel polkit-devel bash-completion
  $(vopt_if gir gobject-introspection) $(vopt_if vala 'vala-devel')"
 short_desc="D-BUS abstraction layer to package management API"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/hughsie/PackageKit"
 distfiles="https://github.com/hughsie/PackageKit/archive/PACKAGEKIT_${version//./_}.tar.gz"
diff --git a/srcpkgs/PopCorn/template b/srcpkgs/PopCorn/template
index 06da3633994..86b03287d71 100644
--- a/srcpkgs/PopCorn/template
+++ b/srcpkgs/PopCorn/template
@@ -1,21 +1,21 @@
 # Template file for 'PopCorn'
 pkgname=PopCorn
-version=0.3
-revision=4
+version=0.4
+revision=1
 build_style=go
 go_import_path=github.com/the-maldridge/popcorn
 go_package="${go_import_path}/cmd/popcorn
  ${go_import_path}/cmd/popcornctl
  ${go_import_path}/cmd/statrepo
  ${go_import_path}/cmd/pqueryd"
-hostmakedepends="dep"
+hostmakedepends="git"
 depends="snooze"
 short_desc="Package statistics system"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/the-maldridge/PopCorn"
 distfiles="https://github.com/the-maldridge/PopCorn/archive/v${version}.tar.gz"
-checksum=5e61970c3ba5fd83f6b5b86c30264213461f4a5af8aacd2ba1757333ece05260
+checksum=b25589802c5e1c277d2e9536add44704a012359b02d7fb4be1b4b0f11eb10d93
 
 system_accounts="_popcorn"
 _popcorn_homedir="/var/lib/popcorn"
@@ -23,12 +23,6 @@ make_dirs="
  /var/lib/popcorn 0755 _popcorn _popcorn
  /etc/popcorn 0755 _popcorn _popcorn"
 
-pre_build() {
-	cd $GOSRCPATH
-	dep ensure
-	cd $wrksrc
-}
-
 post_install() {
 	vlicense LICENSE
 	vsv popcorn
diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 23d299bce49..9070ba6cd11 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,21 +1,21 @@
 # Template file for 'QMPlay2'
 pkgname=QMPlay2
-version=18.12.26
-revision=3
+version=19.09.03
+revision=1
 wrksrc="${pkgname}-src-${version}"
 build_style=cmake
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
 makedepends="alsa-lib-devel ffmpeg-devel libass-devel libcdio-devel libgme-devel
  libsidplayfp-devel libva-glx-devel libXv-devel pulseaudio-devel
  qt5-svg-devel qt5-tools-devel qt5-x11extras-devel taglib-devel
- libcdio-paranoia-devel"
+ libcdio-paranoia-devel qt5-declarative-devel"
 short_desc="Video and audio player which can play most formats and codecs"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="LGPL-3.0-only"
 homepage="http://zaps166.sourceforge.net/?app=QMPlay2"
 changelog="https://raw.githubusercontent.com/zaps166/QMPlay2/master/ChangeLog"
 distfiles="https://github.com/zaps166/QMPlay2/releases/download/${version}/QMPlay2-src-${version}.tar.xz"
-checksum=11922ea44512736de223f502f32ed075f2010c37a752065945fcadaf6af5e53d
+checksum=8481124d0cdec6c2256a748dc529b4c6080b6f6700a26e11e3738d9d2a577882
 
 QMPlay2-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/R/template b/srcpkgs/R/template
index 427735181d9..1e62b4cd784 100644
--- a/srcpkgs/R/template
+++ b/srcpkgs/R/template
@@ -1,7 +1,7 @@
 # Template file for 'R'
 pkgname=R
-version=3.5.3
-revision=2
+version=3.6.1
+revision=1
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/R rdocdir=/usr/share/doc/R
  --with-lapack --with-blas --enable-R-shlib --with-tcltk
@@ -18,7 +18,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.r-project.org/"
 changelog="https://cran.r-project.org/doc/manuals/r-release/NEWS.html"
 distfiles="https://cran.r-project.org/src/base/R-3/${pkgname}-${version}.tar.gz"
-checksum=2bfa37b7bd709f003d6b8a172ddfb6d03ddd2d672d6096439523039f7a8e678c
+checksum=5baa9ebd3e71acecdcc3da31d9042fb174d55a42829f8315f2457080978b1389
 nocross=yes
 shlib_provides="libR.so"
 
diff --git a/srcpkgs/RubyMine/template b/srcpkgs/RubyMine/template
index 7b674991b74..db8144b63a0 100644
--- a/srcpkgs/RubyMine/template
+++ b/srcpkgs/RubyMine/template
@@ -1,6 +1,6 @@
 # Template file for 'RubyMine'
 pkgname=RubyMine
-version=2019.1.2
+version=2019.2.3
 revision=1
 archs="i686 x86_64"
 depends="virtual?java-environment"
@@ -9,7 +9,7 @@ maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/ruby"
 distfiles="https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"
-checksum=db60a07098d3fec4e72bcbd5e5c48638983e20817e41c3f83266733f2d8a0cfe
+checksum=6ac522b2a68d2e32855999d73a900e08144a812f1e54562d4714d99eb0ee1e3d
 repository=nonfree
 restricted=yes
 nopie=yes
@@ -37,14 +37,14 @@ post_extract() {
 
 do_install() {
 	TARGET_PATH="usr/lib/${pkgname}"
-	LICENSE_PATH="usr/share/licenses/${pkgname}"
 
 	vmkdir usr/bin
 	vmkdir ${TARGET_PATH}
-	vmkdir ${LICENSE_PATH}
 
-	# Ideally vlicense should be called here, but vcopy is more terse.
-	vcopy license/* ${LICENSE_PATH}
+	local i
+	for i in license/* ; do
+		vlicense $i
+	done
 
 	vcopy bin ${TARGET_PATH}
 	vcopy help ${TARGET_PATH}
diff --git a/srcpkgs/SDL2_mixer/template b/srcpkgs/SDL2_mixer/template
index 69197b64791..80d654951b9 100644
--- a/srcpkgs/SDL2_mixer/template
+++ b/srcpkgs/SDL2_mixer/template
@@ -1,13 +1,13 @@
 # Template file for 'SDL2_mixer'
 pkgname=SDL2_mixer
 version=2.0.4
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="SDL2-devel libvorbis-devel libmikmod-devel libflac-devel
- libmodplug-devel mpg123-devel smpeg2-devel fluidsynth-devel"
+ libmodplug-devel mpg123-devel smpeg2-devel fluidsynth-devel opusfile-devel"
 # The following deps are dlopen(3)ed at runtime.
-depends="libvorbis libmikmod libmpg123 libmodplug libflac smpeg2"
+depends="libvorbis libmikmod libmpg123 libmodplug libflac smpeg2 opusfile"
 short_desc="Multi-channel audio mixer library (SDL 2.x)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
diff --git a/srcpkgs/SLADE/template b/srcpkgs/SLADE/template
index 0015cd93633..9123399f560 100644
--- a/srcpkgs/SLADE/template
+++ b/srcpkgs/SLADE/template
@@ -1,8 +1,9 @@
 # Template file for 'SLADE'
 pkgname=SLADE
-version=3.1.5
+version=3.1.7
 revision=1
 build_style=cmake
+configure_args="-DCL_WX_CONFIG=wx-config-gtk3"
 hostmakedepends="pkg-config p7zip"
 makedepends="SFML-devel fluidsynth-devel freeimage-devel ftgl-devel glew-devel
  gtk+3-devel libcurl-devel wxWidgets-gtk3-devel"
@@ -12,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/sirjuddington/SLADE"
 changelog="https://github.com/sirjuddington/SLADE/releases/tag/${version}"
 distfiles="https://github.com/sirjuddington/SLADE/archive/${version}.tar.gz"
-checksum=ddab2c5bde9939dd74505fa4f021995e35f00ead0124ce19cbf72f908445aec4
+checksum=abea38ff173b5494ddb50fa7996b6f1818f08c6992b119cb137bdacc63af3789
 
 if [ -z "$CROSS_BUILD" ]; then
 	configure_args+=" -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-gtk3"
diff --git a/srcpkgs/SPIRV-Headers/template b/srcpkgs/SPIRV-Headers/template
index 3c0374f53bd..55f54b64dfa 100644
--- a/srcpkgs/SPIRV-Headers/template
+++ b/srcpkgs/SPIRV-Headers/template
@@ -5,7 +5,7 @@ revision=1
 archs=noarch
 build_style=cmake
 short_desc="Machine-readable files for the SPIR-V Registry"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/KhronosGroup/SPIRV-Headers"
 distfiles="https://github.com/KhronosGroup/SPIRV-Headers/archive/${version}.tar.gz"
diff --git a/srcpkgs/SPIRV-Tools/template b/srcpkgs/SPIRV-Tools/template
index 5d6b76342c2..2c077be3c55 100644
--- a/srcpkgs/SPIRV-Tools/template
+++ b/srcpkgs/SPIRV-Tools/template
@@ -9,7 +9,7 @@ configure_args="-DSPIRV_SKIP_TESTS=ON -DSPIRV_WERROR=OFF
 hostmakedepends="python3"
 makedepends="SPIRV-Headers"
 short_desc="API and commands for processing SPIR-V modules"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/KhronosGroup/SPIRV-Tools"
 distfiles="https://github.com/KhronosGroup/SPIRV-Tools/archive/v${version}.tar.gz"
diff --git a/srcpkgs/Signal-Desktop/patches/build-from-tarball.patch b/srcpkgs/Signal-Desktop/patches/build-from-tarball.patch
index 11f75722a5a..9bb227005f0 100644
--- a/srcpkgs/Signal-Desktop/patches/build-from-tarball.patch
+++ b/srcpkgs/Signal-Desktop/patches/build-from-tarball.patch
@@ -1,7 +1,6 @@
-Kludge to work around https://github.com/signalapp/Signal-Desktop/issues/2376.
---- Gruntfile.js.orig	2018-05-15 01:57:11.000000000 +0200
-+++ Gruntfile.js	2018-05-20 19:15:45.054357251 +0200
-@@ -511,6 +511,5 @@
+--- Gruntfile.js.orig	2019-09-05 13:47:47.906325029 +0200
++++ Gruntfile.js	2019-09-05 13:48:40.869808351 +0200
+@@ -436,6 +436,5 @@
      'concat',
      'copy:deps',
      'sass',
diff --git a/srcpkgs/Signal-Desktop/template b/srcpkgs/Signal-Desktop/template
index 73fe0184272..7013d4d8a2a 100644
--- a/srcpkgs/Signal-Desktop/template
+++ b/srcpkgs/Signal-Desktop/template
@@ -1,20 +1,24 @@
 # Template file for 'Signal-Desktop'
 pkgname=Signal-Desktop
-version=1.23.2
-revision=2
+version=1.27.1
+revision=1
 # Due to electron
 # 32-bit is not supported https://github.com/signalapp/Signal-Desktop/issues/1661
 archs="x86_64"
-hostmakedepends="git python nodejs-lts yarn"
+hostmakedepends="git python nodejs yarn"
 depends="libnotify libappindicator"
 short_desc="Signal Private Messenger for Linux"
 maintainer="Julio Galvan <juliogalvan@protonmail.com>"
 license="GPL-3.0-only"
 homepage="https://github.com/signalapp/Signal-Desktop"
 distfiles="https://github.com/signalapp/Signal-Desktop/archive/v${version}.tar.gz"
-checksum=344842c7a7eac1772a507c8170eef6cf000051eab688609e158669cda51f56a6
+checksum=18c5c9f1a3684b4d0d49a9bb490c7e56417e464b29a06bf4cef36e2e5c523652
 nostrip_files="signal-desktop"
 
+pre_build() {
+	vsed -e 's/"node": "/&>=/' -i package.json
+}
+
 do_build() {
 	yarn install --ignore-engines
 	yarn grunt
diff --git a/srcpkgs/Solaar/template b/srcpkgs/Solaar/template
new file mode 100644
index 00000000000..2e8f4112e0e
--- /dev/null
+++ b/srcpkgs/Solaar/template
@@ -0,0 +1,15 @@
+# Template file for 'Solaar'
+pkgname=Solaar
+version=1.0.1
+revision=1
+archs=noarch
+build_style=python3-module
+pycompile_module="hidapi logitech_receiver solaar"
+hostmakedepends="python3-setuptools"
+depends="python3-pyudev"
+short_desc="Linux device manager for a wide range of Logitech devices"
+maintainer="Young Jin Park <youngjinpark20@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://pwr-solaar.github.io/Solaar/"
+distfiles="https://github.com/pwr-Solaar/Solaar/archive/${version}.tar.gz"
+checksum=20f7c29610cc1d0a964052b6698c3e01f1703d08d621cbe7f9e45a9892632f13
diff --git a/srcpkgs/SweetHome3D/template b/srcpkgs/SweetHome3D/template
index 0cac3ce8c48..40617e123f3 100644
--- a/srcpkgs/SweetHome3D/template
+++ b/srcpkgs/SweetHome3D/template
@@ -1,6 +1,6 @@
 # Template file for 'SweetHome3D'
 pkgname=SweetHome3D
-version=6.1.2
+version=6.2
 revision=1
 archs="i686 x86_64"
 wrksrc="SweetHome3D-${version}-src"
@@ -12,7 +12,7 @@ maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="www.sweethome3d.com"
 distfiles="${SOURCEFORGE_SITE}/sweethome3d/SweetHome3D-${version}-src.zip"
-checksum=43645e34c94bf5b514974428c4a0eefae403fcaf52258cbb9c6fe07d4da8f7db
+checksum=285cb97aee9254de66a195469e494fb28bb77dc1f14b0a92802e7896bd7870ad
 
 do_build() {
 	ant application textures furniture examples help java3dLibraries
diff --git a/srcpkgs/The-Powder-Toy/template b/srcpkgs/The-Powder-Toy/template
new file mode 100644
index 00000000000..778c0f8f211
--- /dev/null
+++ b/srcpkgs/The-Powder-Toy/template
@@ -0,0 +1,28 @@
+# Template file for 'The-Powder-Toy'
+pkgname=The-Powder-Toy
+version=94.1
+revision=1
+build_style=scons
+make_build_args="--output=powder"
+makedepends="SDL2-devel lua51-devel fftw-devel bzip2-devel zlib-devel"
+short_desc="Falling sand physics sandbox, simulates air pressure, velocity & heat"
+maintainer="Illia Shestakov <ishestakov@airmail.cc>"
+license="GPL-3.0-or-later"
+homepage="https://powdertoy.co.uk/"
+distfiles="https://github.com/The-Powder-Toy/${pkgname}/archive/v${version}.tar.gz"
+checksum=9770c0732c97e4e89a1e53330c969e9675595f78e6673c519c3724d6df591e72
+CPPDEFINES=IGNORE_UPDATES
+
+case "$XBPS_TARGET_MACHINE"
+	in x86_64*|i686*)
+		;;
+	*)
+		make_build_args+=" --no-sse";;
+esac
+
+do_install() {
+	vbin build/powder
+	vdoc README.md
+	vinstall resources/powder.desktop 664 /usr/share/applications/
+	vinstall resources/icon/powder-256.png 644 /usr/share/pixmaps/ powder.png
+}
diff --git a/srcpkgs/Thunar/template b/srcpkgs/Thunar/template
index 26160c44da0..6cf46ccd0ff 100644
--- a/srcpkgs/Thunar/template
+++ b/srcpkgs/Thunar/template
@@ -1,7 +1,7 @@
 # Template file for 'Thunar'
 pkgname=Thunar
 version=1.8.9
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--enable-gio-unix --enable-gudev
diff --git a/srcpkgs/UEFITool/template b/srcpkgs/UEFITool/template
new file mode 100644
index 00000000000..6d9602fd636
--- /dev/null
+++ b/srcpkgs/UEFITool/template
@@ -0,0 +1,27 @@
+# Template file for 'UEFITool'
+pkgname=UEFITool
+version=A55
+revision=1
+build_wrksrc="UEFITool"
+build_style=qmake
+hostmakedepends="qt5-qmake qt5-devel"
+makedepends="qt5-declarative-devel"
+short_desc="UEFI firmware image viewer and editor"
+maintainer="Kacper Słomiński <kacper.slominski72@gmail.com>"
+license="BSD-2-Clause"
+homepage="https://github.com/LongSoft/UEFITool/"
+distfiles="${homepage}/archive/${version}.tar.gz"
+checksum=2b8f7643585aee80497789430b18196e8480c0d0af8632dec8bc06492fbc16d9
+
+do_install() {
+	vbin UEFITool uefitool
+	vmkdir usr/share/applications
+	vinstall uefitool.desktop 644 usr/share/applications
+	local size
+	for size in 16 32 48 64 128 256 512; do
+		vinstall icons/uefitool_${size}x${size}.png \
+			644 usr/share/icons/hicolor${size}x${size}/apps uefitool.png
+	done
+	vinstall icons/uefitool_128x128.png 644 usr/share/pixmaps uefitool.png
+	vlicense ../LICENSE.md
+}
diff --git a/srcpkgs/Uranium/patches/fix-crash-in-cura.patch b/srcpkgs/Uranium/patches/fix-crash-in-cura.patch
deleted file mode 100644
index 3d51f4e66d8..00000000000
--- a/srcpkgs/Uranium/patches/fix-crash-in-cura.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-From 9de2827a6ea5eb6ce7d8f845c4b4fc388b01da40 Mon Sep 17 00:00:00 2001
-From: Mark Burton <markb@smartavionics.com>
-Date: Mon, 22 Jul 2019 16:00:15 +0100
-Subject: [PATCH] Set border_node's geometry and material before appending it
- to paint_node.
-
----
- UM/Qt/Bindings/PointingRectangle.py | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/UM/Qt/Bindings/PointingRectangle.py b/UM/Qt/Bindings/PointingRectangle.py
-index ddb8520db..a0a79c6a1 100644
---- UM/Qt/Bindings/PointingRectangle.py
-+++ UM/Qt/Bindings/PointingRectangle.py
-@@ -162,8 +162,9 @@ def updatePaintNode(self, paint_node, update_data):
- 
-         if self._border_width > 0:
-             if paint_node.childCount() == 0:
--                paint_node.appendChildNode(QSGGeometryNode())
--            border_node = paint_node.firstChild()
-+                border_node = QSGGeometryNode()
-+            else:
-+                border_node = paint_node.firstChild()
- 
-             border_vertices = []
-             border_vertices.append((0, 0))
-@@ -204,6 +205,9 @@ def updatePaintNode(self, paint_node, update_data):
-             border_material.setColor(self._border_color)
- 
-             border_node.setMaterial(border_material)
-+
-+            if paint_node.childCount() == 0:
-+                paint_node.appendChildNode(border_node)
-         else:
-             border_node = None
-             border_geometry = None
-
-From c0fcf8e290b88fa276af7df8694e95d55aa912b9 Mon Sep 17 00:00:00 2001
-From: Mark Burton <markb@smartavionics.com>
-Date: Mon, 22 Jul 2019 19:47:15 +0100
-Subject: [PATCH] ShaderEffect crashes on Linux with Qt 5.13 so replace with
- ColorOverlay.
-
----
- UM/Qt/qml/UM/RecolorImage.qml | 60 ++++-------------------------------
- 1 file changed, 6 insertions(+), 54 deletions(-)
-
-diff --git a/UM/Qt/qml/UM/RecolorImage.qml b/UM/Qt/qml/UM/RecolorImage.qml
-index c4f209154..5bd73a6b5 100644
---- UM/Qt/qml/UM/RecolorImage.qml
-+++ UM/Qt/qml/UM/RecolorImage.qml
-@@ -2,6 +2,7 @@
- // Uranium is released under the terms of the LGPLv3 or higher.
- 
- import QtQuick 2.1
-+import QtGraphicalEffects 1.0
- import UM 1.3 as UM
- 
- Item
-@@ -9,7 +10,7 @@ Item
-     id: base;
- 
-     property alias source: img.source
--    property alias color: shader.color
-+    property alias color: overlay.color
-     property alias sourceSize: img.sourceSize
- 
-     Image
-@@ -21,59 +22,10 @@ Item
-         sourceSize.height: parent.height
-     }
- 
--    ShaderEffect
--    {
--        id: shader
-+    ColorOverlay {
-+        id: overlay
-         anchors.fill: parent
--
--        property variant src: img
--        property color color: "#fff"
--
--        vertexShader: UM.OpenGLContextProxy.isLegacyOpenGL ?
--            "
--            uniform highp mat4 qt_Matrix;
--            attribute highp vec4 qt_Vertex;
--            attribute highp vec2 qt_MultiTexCoord0;
--            varying highp vec2 coord;
--            void main() {
--                coord = qt_MultiTexCoord0;
--                gl_Position = qt_Matrix * qt_Vertex;
--            }
--            " : "
--            #version 410
--            uniform highp mat4 qt_Matrix;
--            in highp vec4 qt_Vertex;
--            in highp vec2 qt_MultiTexCoord0;
--            out highp vec2 coord;
--            void main() {
--                coord = qt_MultiTexCoord0;
--                gl_Position = qt_Matrix * qt_Vertex;
--            }
--            "
--
--        fragmentShader: UM.OpenGLContextProxy.isLegacyOpenGL ?
--            "
--            varying highp vec2 coord;
--            uniform sampler2D src;
--            uniform lowp vec4 color;
--            uniform lowp float qt_Opacity;
--            void main() {
--                lowp vec4 tex = texture2D(src, coord);
--                lowp float alpha = tex.a  * qt_Opacity;
--                gl_FragColor = vec4(color.r * alpha, color.g * alpha, color.b * alpha, alpha);
--            }
--            " : "
--            #version 410
--            in highp vec2 coord;
--            uniform sampler2D src;
--            uniform lowp vec4 color;
--            uniform lowp float qt_Opacity;
--            out vec4 frag_color;
--            void main() {
--                lowp vec4 tex = texture(src, coord);
--                lowp float alpha = tex.a  * qt_Opacity;
--                frag_color = vec4(color.r * alpha, color.g * alpha, color.b * alpha, alpha);
--            }
--            "
-+        source: img
-+        color: "#fff"
-     }
- }
diff --git a/srcpkgs/Uranium/template b/srcpkgs/Uranium/template
index cf3fb0bb38c..193d5e211df 100644
--- a/srcpkgs/Uranium/template
+++ b/srcpkgs/Uranium/template
@@ -1,7 +1,7 @@
 # Template file for 'Uranium'
 pkgname=Uranium
-version=4.2.0
-revision=2
+version=4.3.0
+revision=1
 archs=noarch
 build_style=cmake
 pycompile_module="UM"
@@ -15,4 +15,4 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/Ultimaker/Uranium"
 distfiles="https://github.com/Ultimaker/Uranium/archive/${version}.tar.gz"
-checksum=af394fb133e6a3ce92c245428bcf458956b2ca26c33122a35c464b9f5aaddd2e
+checksum=9f871877cf46e8b9e58346f33fdb6eed07c08f242fe292d0c993f224005dfc38
diff --git a/srcpkgs/VirtualGL/template b/srcpkgs/VirtualGL/template
index 98bc90b7a1c..c142305613b 100644
--- a/srcpkgs/VirtualGL/template
+++ b/srcpkgs/VirtualGL/template
@@ -1,7 +1,7 @@
 # Template file for 'VirtualGL'
 pkgname=VirtualGL
-version=2.6.1
-revision=2
+version=2.6.2
+revision=1
 build_style=cmake
 configure_args="-DTJPEG_INCLUDE_DIR=/usr/include -DVGL_SYSTEMGLX=ON
  -DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DCMAKE_INSTALL_LIBDIR=/usr/lib
@@ -10,10 +10,10 @@ makedepends="libXv-devel glu-devel libjpeg-turbo-devel MesaLib-devel
  libXtst-devel fltk-devel libressl-devel"
 short_desc="Run remote OpenGL applications with full acceleration"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
+license="LGPL-2.1-or-later"
 homepage="http://www.virtualgl.org/"
 distfiles="${SOURCEFORGE_SITE}/virtualgl/${version}/${pkgname}-${version}.tar.gz"
-checksum=8802989a565b077036007848a845943971f670d72dc89f502601dfd36d401f83
+checksum=79dff857862890215794509ac65826005625925d03bf0874a486d695aae6f859
 
 archs="i686* x86_64*"
 
diff --git a/srcpkgs/Vulkan-Headers/template b/srcpkgs/Vulkan-Headers/template
index 7993668de4b..addd0c9847a 100644
--- a/srcpkgs/Vulkan-Headers/template
+++ b/srcpkgs/Vulkan-Headers/template
@@ -1,6 +1,6 @@
 # Template file for 'Vulkan-Headers'
 pkgname=Vulkan-Headers
-version=1.1.115
+version=1.1.123
 revision=1
 archs=noarch
 wrksrc="${pkgname}-${version}"
@@ -10,4 +10,4 @@ maintainer="Arvin Ignaci <arvin.ignaci@gmail.com>"
 license="Apache-2.0"
 homepage="https://www.khronos.org/vulkan/"
 distfiles="https://github.com/KhronosGroup/Vulkan-Headers/archive/v${version}.tar.gz"
-checksum=9298c9a591ecbfbe399b659eac2ae0ee8845601235859a741f38ced1a8144fe3
+checksum=aa58ddcf972f05d26bdfa50ac689022b77baf101317258ac146393ef47741581
diff --git a/srcpkgs/Vulkan-Tools/template b/srcpkgs/Vulkan-Tools/template
index 6a78090e775..cb1dfc9b446 100644
--- a/srcpkgs/Vulkan-Tools/template
+++ b/srcpkgs/Vulkan-Tools/template
@@ -1,6 +1,6 @@
 # Template file for 'Vulkan-Tools'
 pkgname=Vulkan-Tools
-version=1.1.108
+version=1.1.123
 revision=1
 wrksrc="${pkgname}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="Arvin Ignaci <arvin.ignaci@gmail.com>"
 license="Apache-2.0"
 homepage="https://www.khronos.org/vulkan/"
 distfiles="https://github.com/KhronosGroup/${pkgname}/archive/v${version}.tar.gz"
-checksum=6db41f252e32a5255342cfeb0e3eceff2ea729025a655727ac681f3c5ab46512
+checksum=a458ee9b3c6dcbdef0dbb69b6a6afbd7ac72f9355977636d34a89c2fadecc7c8
 
 build_options="cube"
 desc_option_cube="Build cube vulkan demo"
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index 88141db5e04..bc62ee11bb9 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,6 +1,6 @@
 # Template file for 'Waybar'
 pkgname=Waybar
-version=0.7.0
+version=0.8.0
 revision=1
 build_style=meson
 configure_args="-Dlibnl=$(vopt_if libnl enabled disabled)
@@ -18,7 +18,7 @@ license="MIT"
 homepage="https://github.com/Alexays/Waybar"
 changelog="https://github.com/Alexays/Waybar/releases"
 distfiles="https://github.com/Alexays/Waybar/archive/${version}.tar.gz"
-checksum=413bff4691c8c8b9d9cb98219063cf0c7c9cb05c946313984c8969009f172659
+checksum=2de2f0cec243da0d9ff2255ceb9dac9d95e8be06d6ea13926fae460d72e4b8aa
 
 build_options="libnl pulseaudio dbusmenugtk mpd"
 build_options_default="pulseaudio mpd"
diff --git a/srcpkgs/WebStorm/template b/srcpkgs/WebStorm/template
index 6602c930613..5bf8427f95e 100644
--- a/srcpkgs/WebStorm/template
+++ b/srcpkgs/WebStorm/template
@@ -1,16 +1,16 @@
 # Template file for 'WebStorm'
 pkgname=WebStorm
-version=2019.1.3
+version=2019.2.3
 revision=1
 archs="i686 x86_64"
-wrksrc="WebStorm-191.7479.14"
+wrksrc="WebStorm-192.6817.13"
 depends="virtual?java-environment"
 short_desc="Smartest JavaScript IDE"
 maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/webstorm"
 distfiles="https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"
-checksum=c3ef27051f6de608ee679035957a8a4329897c910b046cb2dbbf840cc8151dae
+checksum=af94c66c80508fe221d9ba2b294d3852d68db8bc293dd240e2638dd2c21a6c50
 repository=nonfree
 restricted=yes
 nopie=yes
@@ -23,12 +23,14 @@ post_extract() {
 	case "$XBPS_TARGET_MACHINE" in
 		x86_64)
 			rm -rf bin/fsnotifier
+			rm -rf bin/fsnotifier-arm
 			rm -rf bin/webstorm.vmoptions
 			rm -rf bin/libyjpagent-linux.so
 			rm -rf lib/pty4j-native/linux/x86
 			;;
 		i686)
 			rm -rf bin/fsnotifier64
+			rm -rf bin/fsnotifier-arm
 			rm -rf bin/webstorm64.vmoptions
 			rm -rf bin/libyjpagent-linux64.so
 			rm -rf lib/pty4j-native/linux/x86_64
@@ -40,14 +42,14 @@ post_extract() {
 
 do_install() {
 	TARGET_PATH="usr/lib/${pkgname}"
-	LICENSE_PATH="usr/share/licenses/${pkgname}"
 
 	vmkdir usr/bin
 	vmkdir ${TARGET_PATH}
-	vmkdir ${LICENSE_PATH}
 
-	# Ideally vlicense should be called here, but vcopy is more terse.
-	vcopy license/* ${LICENSE_PATH}
+	local i
+	for i in license/* ; do
+		vlicense $i
+	done
 
 	vcopy bin ${TARGET_PATH}
 	vcopy help ${TARGET_PATH}
diff --git a/srcpkgs/YACReader/template b/srcpkgs/YACReader/template
index 3d60b425267..8223256ef3a 100644
--- a/srcpkgs/YACReader/template
+++ b/srcpkgs/YACReader/template
@@ -1,6 +1,6 @@
 # Template file for 'YACReader'
 pkgname=YACReader
-version=9.5.0
+version=9.6.2
 revision=1
 wrksrc=yacreader-${version}
 build_style=qmake
@@ -13,7 +13,7 @@ makedepends="qt5-script-devel qt5-declarative-devel qt5-quickcontrols
 short_desc="Cross-platform reader and manager for your digital comic library"
 maintainer="Crestwave <crest.wave@yahoo.com>"
 license="GPL-3.0-or-later"
-changelog="https://raw.githubusercontent.com/YACReader/yacreader/master/CHANGELOG.md"
 homepage="http://yacreader.com/"
+changelog="https://raw.githubusercontent.com/YACReader/yacreader/master/CHANGELOG.md"
 distfiles="https://github.com/YACReader/yacreader/archive/${version}.tar.gz"
-checksum=1104ffa78835b21a3cf611d42e52944ca413bf7feb38f7620fc07950e5f5ad40
+checksum=e58cd10071180c759f53d74ac7049105b8608e63661bd1b68bcbd8fc8a534a80
diff --git a/srcpkgs/abi-compliance-checker/template b/srcpkgs/abi-compliance-checker/template
index cc8c7d58cc9..644acae70e6 100644
--- a/srcpkgs/abi-compliance-checker/template
+++ b/srcpkgs/abi-compliance-checker/template
@@ -7,7 +7,7 @@ hostmakedepends="perl"
 depends="binutils ctags perl"
 checkdepends="binutils ctags"
 short_desc="A tool for checking backward API/ABI compat of a C/C++ library"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/lvc/abi-compliance-checker"
 distfiles="https://github.com/lvc/abi-compliance-checker/archive/${version}.tar.gz"
diff --git a/srcpkgs/abireport/template b/srcpkgs/abireport/template
index 4054e55d5c4..b23ea4d8565 100644
--- a/srcpkgs/abireport/template
+++ b/srcpkgs/abireport/template
@@ -1,16 +1,16 @@
 # Template file for 'abireport'
 pkgname=abireport
-version=1.0.6
-revision=2
+version=1.0.7
+revision=1
 build_style=go
 go_import_path=github.com/clearlinux/abireport
 go_package="${go_import_path}/src/abireport"
 short_desc="Tool to create ABI reports from ELF binaries"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/clearlinux/abireport"
 distfiles="https://github.com/clearlinux/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.gz"
-checksum=60beb805335302f999c32bda62f56afd6971f27499580fece84fe4d6bb9cb653
+checksum=c46c46bff3dc873cb84a66c639c38b2df14f095d95a4bb77e3b96904b8219399
 
 post_install() {
 	vman man/abireport.1
diff --git a/srcpkgs/ack/template b/srcpkgs/ack/template
index 9c406b8f107..7a32670d18f 100644
--- a/srcpkgs/ack/template
+++ b/srcpkgs/ack/template
@@ -1,6 +1,6 @@
 # Template file for 'ack'
 pkgname=ack
-version=3.0.2
+version=3.1.1
 revision=1
 archs=noarch
 wrksrc="$pkgname-v$version"
@@ -13,4 +13,4 @@ maintainer="Jan S. <jan.schreib@gmail.com>"
 license="Artistic-2.0"
 homepage="https://beyondgrep.com/"
 distfiles="${CPAN_SITE}/App/ack-v${version}.tar.gz"
-checksum=63b4b3bdbdb919f231780b2ce09e73c64b0c407633b36433aa9b574b59cc9528
+checksum=f4778d6d7ef829a7cfd1c7a25f5ae191c4233d002535f3718cc357301008fb92
diff --git a/srcpkgs/acpica-utils/template b/srcpkgs/acpica-utils/template
index 01de433f6c1..ea21904a2bb 100644
--- a/srcpkgs/acpica-utils/template
+++ b/srcpkgs/acpica-utils/template
@@ -1,16 +1,16 @@
 # Template file for 'acpica-utils'
 pkgname=acpica-utils
-version=20190509
+version=20190816
 revision=1
 archs="i686* x86_64*"
 wrksrc="acpica-unix-${version}"
 hostmakedepends="flex"
 short_desc="Intel ACPI CA Unix utilities"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="GPL-2.0-only, BSD-3-Clause"
 homepage="https://www.acpica.org/"
 distfiles="https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz"
-checksum=f124ab6e99110a192864b23dc6911d180968dd15b49f95f7adc37d69dd14621a
+checksum=7aec4dc88a3ba148eecd898e59fb5378573eb6a94585e5538e0b396840d0fc5c
 
 do_build() {
 	vsed -e 's/-Werror//g' \
diff --git a/srcpkgs/acpid/template b/srcpkgs/acpid/template
index 0bb77771db5..8312d0e4e15 100644
--- a/srcpkgs/acpid/template
+++ b/srcpkgs/acpid/template
@@ -1,14 +1,14 @@
 # Template file for 'acpid'
 pkgname=acpid
-version=2.0.31
-revision=2
+version=2.0.32
+revision=1
 build_style=gnu-configure
 short_desc="The ACPI Daemon (acpid) With Netlink Support"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://sourceforge.net/projects/acpid2/"
 distfiles="${SOURCEFORGE_SITE}/acpid2/acpid-${version}.tar.xz"
-checksum=fc9dc669ed85d9a1739aa76915e0667c6697c5431160f8dfb253046c6a072cc3
+checksum=f2d2d30b3edc3234bd82f6f7186699a6aa3c85c8d20bc4e30e9b3c68a1ed157e
 conf_files="/etc/acpi/events/anything /etc/acpi/handler.sh"
 
 post_install() {
diff --git a/srcpkgs/adobe-flash-plugin/template b/srcpkgs/adobe-flash-plugin/template
index cd6526df1b7..cab18ca659c 100644
--- a/srcpkgs/adobe-flash-plugin/template
+++ b/srcpkgs/adobe-flash-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'adobe-flash-plugin'
 pkgname=adobe-flash-plugin
-version=32.0.0.238
-revision=2
+version=32.0.0.270
+revision=1
 depends="curl hicolor-icon-theme desktop-file-utils"
 short_desc="Adobe Flash Player plugin for Netscape compatible browsers"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -23,15 +23,15 @@ if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
 	 ${_url}/flash_player_npapi_linux.x86_64.tar.gz
 	 ${_url}/flash_player_ppapi_linux.x86_64.tar.gz"
 	checksum="
-	 3a711c50396819ead949598b0c0bb960ac923172f9d9b6e3db7790dfa4d6fb15
-	 0268ebab5dbce2be8941c64f3402edd8c34a245206cf2e5e15ba13bf9e246277"
+	 bccd1207ad080caf942305a5739cf690ae19e0fc2490c3e04ee44191d77c9d9a
+	 7176857cf2b3198ea5c725a007f12db1e570091675ecbe8648576cd8dd9d56c5"
 else
 	distfiles="
 	 ${_url}/flash_player_npapi_linux.i386.tar.gz
 	 ${_url}/flash_player_ppapi_linux.i386.tar.gz"
 	checksum="
-	 e08807dcf17b68721658e5d91de781626acc5efb00946508efdde5021ffc871a
-	 cc33e22aab65ee73b1d375cc6456cbba023e6fcfbd5c1ce7c52a585d97f2e16d"
+	 72cf38a1e6b9c3d4063ef2765f606b1ed77a249c3b937ab818581d7e51fd2d4b
+	 81eeee21e1e0337747a7668e01a5a89f9379b3ec3ba7d017ba1e38c13720f997"
 fi
 distfiles+=" ${_eula}"
 checksum+=" ${_eulacksum}"
diff --git a/srcpkgs/adriconf/template b/srcpkgs/adriconf/template
index 5f03859b73d..4055418c83c 100644
--- a/srcpkgs/adriconf/template
+++ b/srcpkgs/adriconf/template
@@ -1,8 +1,9 @@
 # Template file for 'adriconf'
 pkgname=adriconf
-version=1.4
+version=1.5.1
 revision=1
 build_style=cmake
+configure_args="-DENABLE_UNIT_TESTS=false"
 hostmakedepends="pkg-config glib-devel"
 makedepends="MesaLib-devel gtkmm-devel boost-devel libxml++3.0-devel pciutils-devel gtest-devel"
 short_desc="Advanced DRI Configurator"
@@ -10,8 +11,4 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/jlHertel/adriconf"
 distfiles="https://github.com/jlHertel/adriconf/archive/v${version}.tar.gz"
-checksum=058e7ed2ab2450167de1399898db4a53829b433157f43a1e14e50e7fae01f18c
-
-post_install() {
-	vbin build/adriconf
-}
+checksum=70c676e79302e00838ef0d297230fe03548f50fb2892cbe9318423d7aa1ef3ab
diff --git a/srcpkgs/adwaita-icon-theme/template b/srcpkgs/adwaita-icon-theme/template
index b1260b3ec2e..85a5d237ba5 100644
--- a/srcpkgs/adwaita-icon-theme/template
+++ b/srcpkgs/adwaita-icon-theme/template
@@ -1,6 +1,6 @@
 # Template file for 'adwaita-icon-theme'
 pkgname=adwaita-icon-theme
-version=3.32.0
+version=3.34.0
 revision=1
 archs=noarch
 build_style=gnu-configure
@@ -12,4 +12,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-3.0-or-later, CC-BY-SA-3.0"
 homepage="https://gitlab.gnome.org/GNOME/adwaita-icon-theme"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=698db6e407bb987baec736c6a30216dfc0317e3ca2403c7adf3a5aa46c193286
+checksum=40b7e91f8263552b64d0f9beff33150291b086618ce498c71bf10035e48c7c7f
diff --git a/srcpkgs/afl/template b/srcpkgs/afl/template
index 9842510d59f..3cd3b8fcc17 100644
--- a/srcpkgs/afl/template
+++ b/srcpkgs/afl/template
@@ -1,25 +1,26 @@
 # Template file for 'afl'
 pkgname=afl
-version=2.52b
+version=2.56b
 revision=1
-build_style=gnu-makefile
 # x86 only currently
 archs="i686* x86_64*"
+wrksrc="AFL-${version}"
+build_style=gnu-makefile
 hostmakedepends="llvm clang"
 short_desc="American fuzzy lop - a brute-force fuzzer"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
-homepage="http://lcamtuf.coredump.cx/afl/"
-distfiles="http://lcamtuf.coredump.cx/afl/releases/afl-${version}.tgz"
-checksum=43614b4b91c014d39ef086c5cc84ff5f068010c264c2c05bf199df60898ce045
+homepage="https://github.com/google/AFL/"
+distfiles="https://github.com/google/AFL/archive/v${version}.tar.gz"
+checksum=1d4a372e49af02fbcef0dc3ac436d03adff577afc2b6245c783744609d9cdd22
 
 nostrip_files="small_archive.a small_exec.elf"
 
 do_build() {
 	make PREFIX=/usr
 
-	CFLAGS="${CFLAGS} -fPIC" \
-	CXXFLAGS="${CXXFLAGS} -fPIC" \
+	CFLAGS="${CFLAGS//-fstack-clash-protection} -fPIC" \
+	CXXFLAGS="${CXXFLAGS//-fstack-clash-protection} -fPIC" \
 	LDFLAGS="${LDFLAGS} -pie" \
 	make PREFIX=/usr CC=clang CXX=clang++ -C llvm_mode
 }
diff --git a/srcpkgs/aisleriot/template b/srcpkgs/aisleriot/template
index cf364d25f06..40d46895aa4 100644
--- a/srcpkgs/aisleriot/template
+++ b/srcpkgs/aisleriot/template
@@ -1,6 +1,6 @@
 # Template file for 'aisleriot'
 pkgname=aisleriot
-version=3.22.8
+version=3.22.9
 revision=1
 _pysol_cardsets=PySolFC-Cardsets
 _pysol_ver=2.0
@@ -17,7 +17,7 @@ license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Aisleriot"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz
  http://distfiles.voidlinux.de/${_pysol_cardsets}-${_pysol_ver}/${_pysol_cardsets}-${_pysol_ver}.tar.bz2"
-checksum="252094ec220691cacbf54cabbdf81fe593cf3cdcb62c7d409cbdfa744c1af596
+checksum="51f2ffe4dd4f23349b033fd87aab7bf433641285719503dd7e52b2c25982ed7b
  c388d6360191b3b7e463d84e5a64260c4e3ed36e791a85227d7e8923f3f47ca7"
 
 aisleriot-data_package() {
diff --git a/srcpkgs/akonadi-calendar/template b/srcpkgs/akonadi-calendar/template
index 582ba28e1ac..cbda74ac5cf 100644
--- a/srcpkgs/akonadi-calendar/template
+++ b/srcpkgs/akonadi-calendar/template
@@ -1,7 +1,7 @@
 # Template file for 'akonadi-calendar'
 pkgname=akonadi-calendar
-version=19.08.0
-revision=1
+version=19.08.2
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
  kcoreaddons kconfig"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/applications/${version}/src/akonadi-calendar-${version}.tar.xz"
-checksum=74743ff7822ce75f0e0170f154e4596644855a5fe9322a09b76e01bd1d078e3b
+checksum=5beba24af485c8dae96944e4b5bd570460eb2868ba069580c2e5d784be38a3c8
 
 akonadi-calendar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/akonadi-contacts/template b/srcpkgs/akonadi-contacts/template
index c5ef95cc0d0..90191703a9d 100644
--- a/srcpkgs/akonadi-contacts/template
+++ b/srcpkgs/akonadi-contacts/template
@@ -1,7 +1,7 @@
 # Template file for 'akonadi-contacts'
 pkgname=akonadi-contacts
-version=19.08.0
-revision=1
+version=19.08.2
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons"
 makedepends="kio-devel kcontacts-devel kmime-devel akonadi-mime-devel prison-devel"
@@ -10,7 +10,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/applications/${version}/src/akonadi-contacts-${version}.tar.xz"
-checksum=912a657a11d1bd1e680a71b43d69a5a871136ed83f171b11c52f1974d7381ce4
+checksum=eafeb550faea91a56109821864eedfbd619dc7850887746d31c1724ea7561920
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools python3 kconfig"
diff --git a/srcpkgs/akonadi-import-wizard/template b/srcpkgs/akonadi-import-wizard/template
index ee192f5226a..f7280d0b44a 100644
--- a/srcpkgs/akonadi-import-wizard/template
+++ b/srcpkgs/akonadi-import-wizard/template
@@ -1,16 +1,16 @@
 # Template file for 'akonadi-import-wizard'
 pkgname=akonadi-import-wizard
-version=19.08.0
-revision=1
+version=19.08.2
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools qt5-host-tools qt5-qmake"
-makedepends="mailcommon-devel mailimporter-devel messagelib-devel"
+makedepends="kcontacts-devel mailcommon-devel mailimporter-devel messagelib-devel"
 short_desc="Import data from other mail clients to KMail"
 maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=e21454b8ac346c4b8d35e5979dc11346b96e3520df22f44270dc668d5abcd915
+checksum=038713e7d30686eb1b8e49c595ec853ffa52d335e435a5b0bdf2f2a2448cae45
 
 akonadi-import-wizard-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/akonadi-mime/template b/srcpkgs/akonadi-mime/template
index e4af94adf44..9d2af13bc19 100644
--- a/srcpkgs/akonadi-mime/template
+++ b/srcpkgs/akonadi-mime/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-mime'
 pkgname=akonadi-mime
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3"
@@ -10,7 +10,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/applications/${version}/src/akonadi-mime-${version}.tar.xz"
-checksum=32dcee53d8bd79a4ad85dfa453aa762d69194493ad6622aea4fd7cd05bde3ec4
+checksum=16f8034d7990828c50a85474fe16641dfa46e22d00f49d8045d3483c61815264
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools kconfig"
diff --git a/srcpkgs/akonadi-notes/template b/srcpkgs/akonadi-notes/template
index e97662c08ee..f54c93cf64b 100644
--- a/srcpkgs/akonadi-notes/template
+++ b/srcpkgs/akonadi-notes/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-notes'
 pkgname=akonadi-notes
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later, BSD-2-Clause"
 homepage="https://kontact.kde.org"
 distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=26000875958b3a0ff68c5ad871fd697623c8408b88fc46679c8a13ad308c33d3
+checksum=64684c50d06664d8ccda098f8bfa536e861e4938c8f27688ef97653f7788fdde
 
 post_install() {
 	vlicense COPYING.BSD COPYING.BSD
diff --git a/srcpkgs/akonadi-search/template b/srcpkgs/akonadi-search/template
index 2fafd789f0e..be659b8d39f 100644
--- a/srcpkgs/akonadi-search/template
+++ b/srcpkgs/akonadi-search/template
@@ -1,7 +1,7 @@
 # Template file for 'akonadi-search'
 pkgname=akonadi-search
-version=19.08.0
-revision=1
+version=19.08.2
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python AppStream
  kcoreaddons"
@@ -12,7 +12,7 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/applications/${version}/src/akonadi-search-${version}.tar.xz"
-checksum=fadc158343eb7c124454ca3e22ade14230772f1d1a89e04a0059c924ed3959d0
+checksum=75c9713b84a03c60a68ff36652decbf57f4f56a0fb39579f53e7ed80a5ee8525
 
 akonadi-search-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/akonadi5/template b/srcpkgs/akonadi5/template
index a560368b260..68a23cde127 100644
--- a/srcpkgs/akonadi5/template
+++ b/srcpkgs/akonadi5/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi5'
 pkgname=akonadi5
-version=19.08.0
+version=19.08.2
 revision=1
 wrksrc="akonadi-${version}"
 build_style=cmake
@@ -16,7 +16,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/applications/${version}/src/akonadi-${version}.tar.xz"
-checksum=ff53f078b024f2674a8b2990515f5cbafe2bc965390d74a464b2a044aee32831
+checksum=f67f0fac07d480739b2d6715862ee47a93fd38f057ac7ef888ed8ddfdc99934f
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-tools-devel qt5-devel kconfig kcoreaddons"
diff --git a/srcpkgs/akregator/template b/srcpkgs/akregator/template
index 0f0b31406bb..ceaa405b82b 100644
--- a/srcpkgs/akregator/template
+++ b/srcpkgs/akregator/template
@@ -1,6 +1,6 @@
 # Template file for 'akregator'
 pkgname=akregator
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 configure_args=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,4 +13,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/internet/akregator"
 distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=d3cb8b97a3d2c9eeb805e1b7fc26cb637ad21589675d837b545580e6be764820
+checksum=cefc0785f40508a80fbf4534eef4d1164e349cfd50455483cef044945d1888c4
diff --git a/srcpkgs/alert-after/template b/srcpkgs/alert-after/template
index 191286c6aa5..27dcd62231e 100644
--- a/srcpkgs/alert-after/template
+++ b/srcpkgs/alert-after/template
@@ -1,7 +1,7 @@
 # Template file for 'alert-after'
 pkgname=alert-after
-version=1.4.3
-revision=2
+version=1.5.1
+revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
 makedepends="dbus-devel"
@@ -10,4 +10,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://crates.io/crates/alert-after"
 distfiles="https://github.com/frewsxcv/alert-after/archive/${version}.tar.gz"
-checksum=e0d80e1b4c9cb78f4759a78495f197fa3865eacf9658653ec14ddb010e117b3d
+checksum=f40dd43f667735741be95f753e52d3ec36731fcb3c3217084ad07e70dbac7a2a
diff --git a/srcpkgs/alertmanager/template b/srcpkgs/alertmanager/template
index 530e93fe081..f7f5533a569 100644
--- a/srcpkgs/alertmanager/template
+++ b/srcpkgs/alertmanager/template
@@ -1,6 +1,6 @@
 # Template file for 'alertmanager'
 pkgname=alertmanager
-version=0.17.0
+version=0.19.0
 revision=1
 build_style=go
 go_import_path="github.com/prometheus/alertmanager"
@@ -15,7 +15,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/prometheus/alertmanager"
 distfiles="https://github.com/prometheus/alertmanager/archive/v${version}.tar.gz"
-checksum=8254591e058338b31a023f0eb3ab69de9d1547e0a446d28cab4664609793e4a2
+checksum=4730664f746173f89804df43b3f608cac030e79baae165d6d99df472eb52d36a
 
 system_accounts="_alertmanager"
 make_dirs="/var/lib/alertmanager 700 _alertmanager _alertmanager"
diff --git a/srcpkgs/alkimia/template b/srcpkgs/alkimia/template
index 679c0c1c499..342011f742a 100644
--- a/srcpkgs/alkimia/template
+++ b/srcpkgs/alkimia/template
@@ -1,6 +1,6 @@
 # Template file for 'alkimia'
 pkgname=alkimia
-version=8.0.1
+version=8.0.2
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson -DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://www.linux-apps.com/content/show.php/libalkimia?content=137323"
 distfiles="${KDE_SITE}/alkimia/${version}/alkimia-${version}.tar.xz"
-checksum=f5601780f6ed95b5e14dd3a243ecd1afbdbdb522f0e32dec2fb86933ec363115
+checksum=616f7736fde8ce8acec4575f14e856fabfefb0961d932198d42fbd9a639a852a
 
 libalkimia-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/alpine/patches/418e8bc5.patch b/srcpkgs/alpine/patches/418e8bc5.patch
new file mode 100644
index 00000000000..7cc8dc7a8c8
--- /dev/null
+++ b/srcpkgs/alpine/patches/418e8bc5.patch
@@ -0,0 +1,22 @@
+From 418e8bc5789d9ef223f043848619b6a648748dcc Mon Sep 17 00:00:00 2001
+From: Eduardo Chappa <chappa@washington.edu>
+Date: Thu, 22 Aug 2019 19:11:53 -0600
+Subject: [PATCH 1/1]   * Ignore extra text in challenge from smtp server
+ during authentication.
+
+---
+ imap/src/c-client/smtp.c | 1 +
+ pith/pine.hlp            | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+--- imap/src/c-client/smtp.c
++++ imap/src/c-client/smtp.c
+@@ -363,6 +363,7 @@ void *smtp_challenge (void *s,unsigned long *len)
+     sprintf (tmp,"SMTP SERVER BUG (invalid challenge, continuing): %.80s",stream->reply+4);
+     mm_log (tmp,ERROR);
+     ret = cpystr("");	/* This is silly: fake a reply, it will be ignored */
++    *len = 0L;
+   }
+   return ret;
+ }
+
diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 9c8a0f8bb4e..6557a6debc6 100644
--- a/srcpkgs/alpine/template
+++ b/srcpkgs/alpine/template
@@ -1,7 +1,7 @@
 # Template file for 'alpine'
 pkgname=alpine
 version=2.21.99999
-revision=1
+revision=2
 _githash=abeb2c25935ef8c75f1e5deef0f81276754dc975
 _gitshort="${_githash:0:7}"
 wrksrc="${pkgname}-${_gitshort}"
diff --git a/srcpkgs/amdvlk/patches/musl.patch b/srcpkgs/amdvlk/patches/musl.patch
index 9cf3d74915f..5e4e1e9f18d 100644
--- a/srcpkgs/amdvlk/patches/musl.patch
+++ b/srcpkgs/amdvlk/patches/musl.patch
@@ -1,23 +1,3 @@
-From a9dc984a35f0f522e3a1ec0d310facb3246a5d0f Mon Sep 17 00:00:00 2001
-From: John Zimmermann <johnz@posteo.net>
-Date: Fri, 25 Jan 2019 13:47:21 +0000
-Subject: [PATCH] Fix Compilation against Musl libc
-
-diff --git pal/shared/gpuopen/inc/posix/ddPosixPlatform.h pal/shared/gpuopen/inc/posix/ddPosixPlatform.h
-index df54bfe..55d707c 100644
---- pal/shared/gpuopen/inc/posix/ddPosixPlatform.h
-+++ pal/shared/gpuopen/inc/posix/ddPosixPlatform.h
-@@ -72,6 +72,9 @@ static_assert(false, "Unknown platform detected")
- #else
- #define DD_AXIOMATICALLY_CANNOT_HAPPEN(expr) ((expr) ? DD_UNUSED(0) : __builtin_unreachable())
- #endif
-+#if defined(__linux__) && !defined(__GLIBC__)
-+#include "rand48_r.h"
-+#endif
- 
- namespace DevDriver
- {
-
 --- pal/shared/gpuopen/src/posix/ddPosixSocket.cpp	2019-03-01 15:31:04.000000000 +0100
 +++ -	2019-03-04 15:42:00.789284605 +0100
 @@ -34,12 +34,12 @@
@@ -35,16 +15,3 @@ index df54bfe..55d707c 100644
  #include <stdio.h>
  #include <stdlib.h>
  
---- pal/shared/gpuopen/CMakeLists.txt	2019-06-06 14:52:37.000000000 +0200
-+++ -	2019-06-10 19:23:05.932195923 +0200
-@@ -72,6 +72,10 @@
-     set(THREADS_PREFER_PTHREAD_FLAG ON)
-     find_package(Threads REQUIRED)
-     target_link_libraries(${GPUOPEN_LIB_NAME} Threads::Threads)
-+    check_symbol_exists(seed48_r stdlib.h HAVE_RAND48)
-+    if(NOT HAVE_RAND48)
-+        target_link_libraries(${GPUOPEN_LIB_NAME} rand48_r)
-+    endif()
- endif()
- 
- ### Build Defines ######################################################################################################
diff --git a/srcpkgs/amdvlk/template b/srcpkgs/amdvlk/template
index 58b7b030dc0..ef74969d1a3 100644
--- a/srcpkgs/amdvlk/template
+++ b/srcpkgs/amdvlk/template
@@ -1,17 +1,21 @@
 # Template file for 'amdvlk'
 pkgname=amdvlk
-version=2019.Q3.4
+version=2019.Q3.6
 revision=1
-_llpc_commit=0da6ca8e09f41639636a106f9b9ca74df50321ce
-_xgl_commit=9b632ef4f132bddc94769702ed8b49efbc39d89c
-_pal_commit=66e78b997748d03d77e1d706c10f1f17e18e5654
+_llpc_commit=4fa48ef1cf0f81eafdb56df91c2f2180d4865101
+_xgl_commit=331558e93794068a786bf699d3fe23bb11bac021
+_pal_commit=68b57dba33a4d922e8f1ef1b3781c2f659ffbd1c
 _llvm_commit=9bc5dd4450a6361faf5c5661056a7ee494fad830
 _spvgen_commit=2f31d1170e8a12a66168b23235638c4bbc43ecdc
+_MetroHash_commit=2b6fee002db6cc92345b02aeee963ebaaf4c0e2f
+_CWPack_commit=b601c88aeca7a7b08becb3d32709de383c8ee428
 archs="i686* x86_64*"
 create_wrksrc=yes
 build_wrksrc="xgl"
 build_style=cmake
-configure_args="-DBUILD_WAYLAND_SUPPORT=ON"
+configure_args="-DBUILD_WAYLAND_SUPPORT=ON
+ -DXGL_METROHASH_PATH=../../metrohash
+ -DXGL_CWPACK_PATH=../../cwpack"
 hostmakedepends="pkg-config python3 perl"
 makedepends="libxml2-devel xorg-server-devel libXrandr-devel"
 depends="vulkan-loader"
@@ -24,20 +28,20 @@ distfiles="https://github.com/GPUOpen-Drivers/AMDVLK/archive/v-${version}.tar.gz
  https://github.com/GPUOpen-Drivers/xgl/archive/${_xgl_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/pal/archive/${_pal_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/llvm/archive/${_llvm_commit}.tar.gz
- https://github.com/GPUOpen-Drivers/spvgen/archive/${_spvgen_commit}.tar.gz"
-checksum="01777c1cfe4df7dce4feb91e75658fbc865dd5c755ff79451191a0cf8de1c7a4
- 00bf10ff483ba5f6420fb3bfe34f7ce77c6d33515840df64ed1e2858e0eeb831
- 6baede0581d63bdf88cc72c8c496b0cef534ee244dd4f74bcb39a9e0e0beeacd
- e8a29b20a166cb7139157a40e88b8087ed33097871dcaee1bfda61b6a417886f
+ https://github.com/GPUOpen-Drivers/spvgen/archive/${_spvgen_commit}.tar.gz
+ https://github.com/GPUOpen-Drivers/MetroHash/archive/${_MetroHash_commit}.tar.gz
+ https://github.com/GPUOpen-Drivers/CWPack/archive/${_CWPack_commit}.tar.gz"
+checksum="9afb90b56c3c1213c97ef3364b1d31d0e85a81469c861b43dc389af5672c6331
+ abe541ef6cd4fa3ca1eaab52412caa29e2adedec0fab40894aef88d33deee584
+ 939a2cf69d840e01da8b3e69f5ffe1f852f9d2919cdbc8aa4ade7cff7ac56906
+ 7648ca7761b588b6025f8fe16fcf4216bf7e1fe53c6568377f5cca98feca9627
  efbde2752044ec74d522c160899491105dbc77bb8a08ff64c274d2b94a6916d1
- cc946ad2835e502aca904c5f87802a2004eaed4729cb5c1dc29a5258d1c1e401"
+ cc946ad2835e502aca904c5f87802a2004eaed4729cb5c1dc29a5258d1c1e401
+ e8ecf026584dd953e39c3abba2eb04d28b28ed4577482ee70265f0d421fef398
+ 58ca397f33d62bcfecaecd89eb4ad466a6c33e1c619e5cf742822074f1f7d664"
 nocross=yes
 lib32files="/usr/share/vulkan/icd.d/amd_icd32.json"
 
-case $XBPS_TARGET_MACHINE in
-	*-musl) makedepends+=" rand48_r-devel"
-esac
-
 post_extract() {
 	mv ${wrksrc}/AMDVLK-v-${version} ${wrksrc}/AMDVLK
 	mv ${wrksrc}/xgl-${_xgl_commit} ${wrksrc}/xgl
@@ -45,6 +49,8 @@ post_extract() {
 	mv ${wrksrc}/llpc-${_llpc_commit} ${wrksrc}/llpc
 	mv ${wrksrc}/llvm-${_llvm_commit} ${wrksrc}/llvm
 	mv ${wrksrc}/spvgen-${_spvgen_commit} ${wrksrc}/spvgen
+	mv ${wrksrc}/MetroHash-${_MetroHash_commit} ${wrksrc}/metrohash
+	mv ${wrksrc}/CWPack-${_CWPack_commit} ${wrksrc}/cwpack
 }
 
 pre_configure() {
diff --git a/srcpkgs/amiri-font/template b/srcpkgs/amiri-font/template
index c20ce968b52..a9b07e456c4 100644
--- a/srcpkgs/amiri-font/template
+++ b/srcpkgs/amiri-font/template
@@ -1,7 +1,7 @@
 # Template file for 'amiri-font'
 pkgname=amiri-font
-version=0.111
-revision=2
+version=0.112
+revision=1
 archs=noarch
 wrksrc="Amiri-${version}"
 hostmakedepends="unzip"
@@ -12,7 +12,7 @@ license="OFL-1.1"
 homepage="https://github.com/alif-type/amiri/"
 changelog="https://github.com/alif-type/amiri/blob/master/NEWS.md"
 distfiles="https://github.com/alif-type/amiri/releases/download/${version}/Amiri-${version}.zip"
-checksum=1fbfccced6348b5db2c1c21d5b319cd488e14d055702fa817a0f6cb83d882166
+checksum=b9da1916f5e1028ea5d8404f7ac7b3722576d794b1053b6be11f1a02651ddf3c
 font_dirs="/usr/share/fonts/TTF"
 
 do_install() {
diff --git a/srcpkgs/amp/template b/srcpkgs/amp/template
index ad20f0cb8eb..dcb603b52f6 100644
--- a/srcpkgs/amp/template
+++ b/srcpkgs/amp/template
@@ -1,20 +1,20 @@
 # Template file for 'amp'
 pkgname=amp
-version=0.5.2
-revision=3
+version=0.6.0
+revision=1
 build_style=cargo
 hostmakedepends="cmake git perl pkg-config python3"
 makedepends="libcurl-devel libgit2-devel libxcb-devel"
-short_desc="A complete text editor for your terminal"
+short_desc="Complete text editor for your terminal"
 maintainer="Wilson Birney <wpb@360scada.com>"
 license="GPL-3.0-or-later"
 homepage="https://amp.rs"
 changelog="https://raw.githubusercontent.com/jmacdonald/amp/master/CHANGELOG.md"
 distfiles="https://github.com/jmacdonald/amp/archive/${version}.tar.gz"
-checksum=e1f22a829205cf44f8c3fcf5660dbdb9a3c5a1f64b92c67dcdb75a30ad7e5a60
+checksum=3529e9aa51df80ff3bd9db340423bf0975b58473fc0a307ea6eee799089ee2e2
 
 export LIBGIT2_SYS_USE_PKG_CONFIG=1
 
 pre_build() {
-	cargo update --package openssl-sys --precise 0.9.46
+	cargo update --package openssl-sys --precise 0.9.49
 }
diff --git a/srcpkgs/amtk/template b/srcpkgs/amtk/template
index 9381324e983..e642fe7b5d3 100644
--- a/srcpkgs/amtk/template
+++ b/srcpkgs/amtk/template
@@ -1,18 +1,18 @@
 # Template file for 'amtk'
 pkgname=amtk
-version=5.0.0
-revision=3
+version=5.0.1
+revision=1
 build_style=gnu-configure
 build_helper="gir"
 configure_args="$(vopt_enable gir introspection)"
 hostmakedepends="pkg-config glib-devel"
 makedepends="gtk+3-devel libglib-devel"
 short_desc="Actions, Menus and Toolbars Kit for GTK+ applications"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Amtk"
 distfiles="${GNOME_SITE}/amtk/${version%.*}/amtk-${version}.tar.xz"
-checksum=12a996978a30b7b69a810ac0c5656d5cf2f58d9787b98a0c028ff1b64e8f31ff
+checksum=2d1cf4a4468655f93c90a2dde2e08b1ea0b3960c0aee04eb206c201d7849de27
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/android-studio/template b/srcpkgs/android-studio/template
index 4ccbb3e2221..5838e3f29ed 100644
--- a/srcpkgs/android-studio/template
+++ b/srcpkgs/android-studio/template
@@ -1,23 +1,21 @@
 # Template file for 'android-studio'
 pkgname=android-studio
-version=3.3.2
+version=3.4.2
 revision=1
 # _studio_build and _studio_rev are for downloading the zip from dl.google.com
 # https://developer.android.com/studio/#resources as of 2018-07-12
-_studio_build=182.5314842
+_studio_build=183.5692245
 _studio_rev=0
 archs="x86_64 i686"
 create_wrksrc=yes
-build_style=fetch
-hostmakedepends="unzip"
 depends="gtk+ libGL"
 short_desc="Official Android IDE"
 maintainer="Jordyn Carattini <onlinecloud1@gmail.com>"
 license="Apache-2.0"
 homepage="http://tools.android.com/"
 # changelog="https://developer.android.com/studio/releases/index.html"
-distfiles="https://dl.google.com/dl/android/studio/ide-zips/${version}.${_studio_rev}/android-studio-ide-${_studio_build}-linux.zip"
-checksum=8257d3eab61c3da088e26689888a13e53e210c109a4e775ed71158b4471bb06a
+distfiles="https://dl.google.com/dl/android/studio/ide-zips/${version}.${_studio_rev}/android-studio-ide-${_studio_build}-linux.tar.gz"
+checksum=35eb8c74837d1aab59229101fc91568a607ac04854a40209f7a0ba7ac0601924
 repository=nonfree
 nopie=yes
 nostrip=yes
@@ -32,18 +30,37 @@ skiprdeps="/opt/android-studio/plugins/android/resources/installer/arm64-v8a/ins
  /opt/android-studio/plugins/android/resources/perfa/x86_64/libperfa.so
  /opt/android-studio/plugins/android/resources/perfd/arm64-v8a/perfd
  /opt/android-studio/plugins/android/resources/perfd/armeabi-v7a/perfd
- /opt/android-studio/plugins/android/resources/perfd/x86/perfd"
+ /opt/android-studio/plugins/android/resources/perfd/x86/perfd
+ /opt/android-studio/plugins/android/resources/simpleperf/arm64-v8a/simpleperf
+ /opt/android-studio/plugins/android/resources/simpleperf/armeabi-v7a/simpleperf
+ /opt/android-studio/plugins/android/resources/simpleperf/x86/simpleperf
+ /opt/android-studio/plugins/android/resources/simpleperf/x86_64/simpleperf"
+
+do_extract() {
+	tar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}-ide-${_studio_build}-linux.tar.gz --strip-components=1 -C ${wrksrc}
+}
 
 do_install() {
-	unzip android-studio-ide-${_studio_build}-linux.zip
 	vmkdir opt/${pkgname}
-	vcopy android-studio/bin opt/${pkgname}/
-	vcopy android-studio/gradle opt/${pkgname}/
-	vcopy android-studio/lib opt/${pkgname}/
-	vcopy android-studio/jre opt/${pkgname}/
-	vcopy android-studio/plugins opt/${pkgname}/
+	vcopy bin opt/${pkgname}/
+	vcopy gradle opt/${pkgname}/
+	vcopy lib opt/${pkgname}/
+	vcopy jre opt/${pkgname}/
+	vcopy plugins opt/${pkgname}/
+	vcopy build.txt opt/${pkgname}/ # read as IDE version information
+	vcopy product-info.json opt/${pkgname}/
 	vmkdir usr/bin
 	ln -s /opt/android-studio/bin/studio.sh ${DESTDIR}/usr/bin/android-studio
+
+	# The version of host-side simpleperf bundled with Android Studio (as of 3.4.2) requires
+	# libncurses.so.5, which is not provided by Void Linux. However, as host-side simpleperf
+	# parsing is a fairly recent addition, we can just disable it...
+
+	rm -r ${DESTDIR}/opt/android-studio/plugins/android/resources/simpleperf/linux-x86
+	rm -r ${DESTDIR}/opt/android-studio/plugins/android/resources/simpleperf/linux-x86_64
+	echo "-Dprofiler.cpu.simpleperf.host=false" >> ${DESTDIR}/opt/android-studio/bin/studio.vmoptions
+	echo "-Dprofiler.cpu.simpleperf.host=false" >> ${DESTDIR}/opt/android-studio/bin/studio64.vmoptions
+
 	vinstall "${FILESDIR}/android-studio.desktop" 644 usr/share/applications/
 	chmod -R ugo+rX ${DESTDIR}/opt
 }
diff --git a/srcpkgs/android-tools/files/generate_build.rb b/srcpkgs/android-tools/files/generate_build.rb
deleted file mode 100755
index c7674446998..00000000000
--- a/srcpkgs/android-tools/files/generate_build.rb
+++ /dev/null
@@ -1,405 +0,0 @@
-#!/usr/bin/ruby
-# This ruby script has been copied from Arch Linux.
-
-# Android build system is complicated and does not allow to build
-# separate parts easily.
-# This script tries to mimic Android build rules.
-
-def expand(dir, files)
-  files.map{|f| File.join(dir,f)}
-end
-
-# Compiles sources to *.o files.
-# Returns array of output *.o filenames
-def compile(sources, cflags)
-  outputs = []
-  for s in sources
-    ext = File.extname(s)
-
-    case ext
-    when '.c'
-      cc = 'cc'
-      lang_flags = '-std=gnu11 $CFLAGS $CPPFLAGS'
-    when '.cpp', '.cc'
-      cc = 'cxx'
-      lang_flags = '-std=gnu++17 $CXXFLAGS $CPPFLAGS'
-    else
-        raise "Unknown extension #{ext}"
-    end
-
-    output = s + '.o'
-    outputs << output
-    puts "build #{output}: #{cc} #{s}\n    cflags = #{lang_flags} #{cflags}"
-  end
-
-  return outputs
-end
-
-# dir - directory where ninja file is located
-# lib - static library path relative to dir
-def subninja(dir, lib)
-  puts "subninja #{dir}build.ninja"
-  return lib.each{|l| dir + l}
-end
-
-# Links object files
-def link(output, objects, ldflags)
-  puts "build #{output}: link #{objects.join(' ')}\n    ldflags = #{ldflags} $LDFLAGS"
-end
-
-puts "# This set of commands generated by generate_build.rb script\n\n"
-puts "CC = #{ENV['CC'] || 'clang'}"
-puts "CXX = #{ENV['CXX'] || 'clang++'}\n\n"
-puts "CFLAGS = #{ENV['CFLAGS']}"
-puts "CXXFLAGS = #{ENV['CXXFLAGS']}"
-puts "LDFLAGS = #{ENV['LDFLAGS']}"
-puts "PKGVER = #{ENV['PKGVER']}\n\n"
-
-
-puts """
-rule cc
-  command = $CC $cflags -c $in -o $out
-
-rule cxx
-  command = $CXX $cflags -c $in -o $out
-
-rule link
-  command = $CXX $ldflags $LDFLAGS $in -o $out
-
-
-"""
-
-adbdfiles = %w(
-  adb.cpp
-  adb_io.cpp
-  adb_listeners.cpp
-  adb_trace.cpp
-  adb_utils.cpp
-  bugreport.cpp
-  line_printer.cpp
-  sockets.cpp
-  transport.cpp
-  transport_local.cpp
-  transport_usb.cpp
-  transport_mdns_unsupported.cpp
-  fdevent.cpp
-  adb_auth_host.cpp
-  shell_service_protocol.cpp
-)
-libadbd = compile(expand('core/adb', adbdfiles), '-DADB_VERSION="\"$PKGVER\"" -DADB_HOST=1 -Icore/include -Icore/base/include -Icore/adb -Icore/libcrypto_utils/include -Iboringssl/include')
-
-adbfiles = %w(
-  console.cpp
-  socket_spec.cpp
-  commandline.cpp
-  adb_client.cpp
-  services.cpp
-  file_sync_client.cpp
-  sysdeps_unix.cpp
-  sysdeps/errno.cpp
-  client/main.cpp
-  client/usb_dispatch.cpp
-  client/usb_linux.cpp
-  client/usb_libusb.cpp
-  sysdeps/posix/network.cpp
-)
-libadb = compile(expand('core/adb', adbfiles), '-D_GNU_SOURCE -DADB_HOST=1 -Icore/include -Icore/base/include -Icore/adb')
-
-basefiles = %w(
-  file.cpp
-  logging.cpp
-  parsenetaddress.cpp
-  stringprintf.cpp
-  strings.cpp
-  errors_unix.cpp
-  test_utils.cpp
-)
-libbase = compile(expand('core/base', basefiles), '-DADB_HOST=1 -Icore/base/include -Icore/include')
-
-logfiles = %w(
-  log_event_write.c
-  fake_log_device.c
-  log_event_list.c
-  logger_write.c
-  config_write.c
-  config_read.c
-  logger_lock.c
-  local_logger.c
-  fake_writer.c
-  logger_name.c
-  stderr_write.c
-  logprint.c
-)
-liblog = compile(expand('core/liblog', logfiles), '-DLIBLOG_LOG_TAG=1006 -D_XOPEN_SOURCE=700 -DFAKE_LOG_DEVICE=1 -Icore/log/include -Icore/include')
-
-cutilsfiles = %w(
-  load_file.cpp
-  socket_local_client_unix.cpp
-  socket_network_client_unix.cpp
-  socket_local_server_unix.cpp
-  sockets_unix.cpp
-  socket_inaddr_any_server_unix.cpp
-  sockets.cpp
-  android_get_control_file.cpp
-  threads.cpp
-  fs_config.cpp
-  canned_fs_config.cpp
-)
-libcutils = compile(expand('core/libcutils', cutilsfiles), '-D_GNU_SOURCE -Icore/libcutils/include -Icore/include')
-
-diagnoseusbfiles = %w(
-  diagnose_usb.cpp
-)
-libdiagnoseusb = compile(expand('core/adb', diagnoseusbfiles), '-Icore/include -Icore/base/include')
-
-libcryptofiles = %w(
-  android_pubkey.c
-)
-libcrypto = compile(expand('core/libcrypto_utils', libcryptofiles), '-Icore/libcrypto_utils/include -Iboringssl/include')
-
-# TODO: make subninja working
-#boringssl = subninja('boringssl/build/', ['crypto/libcrypto.a'])
-boringssl = ['boringssl/build/crypto/libcrypto.a']
-
-link('adb', libbase + liblog + libcutils + libadbd + libadb + libdiagnoseusb + libcrypto + boringssl, '-lpthread -lusb-1.0')
-
-
-fastbootfiles = %w(
-  protocol.cpp
-  engine.cpp
-  bootimg_utils.cpp
-  fastboot.cpp
-  util.cpp
-  fs.cpp
-  usb_linux.cpp
-  socket.cpp
-  tcp.cpp
-  udp.cpp
-)
-libfastboot = compile(expand("core/fastboot", fastbootfiles), '-DFASTBOOT_VERSION="\"$PKGVER\"" -D_GNU_SOURCE -D_XOPEN_SOURCE=700 -DUSE_F2FS -Icore/base/include -Icore/include -Icore/adb -Icore/libsparse/include -Icore/mkbootimg -Iextras/ext4_utils/include -Iextras/f2fs_utils -Icore/libziparchive/include -Icore/mkbootimg/include/bootimg')
-	
-sparsefiles = %w(
-  backed_block.c
-  output_file.c
-  sparse.c
-  sparse_crc32.c
-  sparse_err.c
-  sparse_read.cpp
-)
-libsparse = compile(expand('core/libsparse', sparsefiles), '-Icore/libsparse/include -Icore/base/include')
-
-f2fsfiles = %w(
-)
-f2fs = compile(expand("extras/f2fs_utils", f2fsfiles), "-DHAVE_LINUX_TYPES_H -If2fs-tools/include -Icore/liblog/include")
-
-zipfiles = %w(
-  zip_archive.cc
-)
-libzip = compile(expand('core/libziparchive', zipfiles), '-Icore/base/include -Icore/include -Icore/libziparchive/include')
-
-utilfiles = %w(
-  FileMap.cpp
-)
-libutil = compile(expand('core/libutils', utilfiles), '-Icore/include')
-
-ext4files = %w(
-  ext4_utils.c
-  wipe.c
-  ext4_sb.c
-)
-libext4 = compile(expand('extras/ext4_utils', ext4files), '-D_GNU_SOURCE -Icore/libsparse/include -Icore/include -Iselinux/libselinux/include -Iextras/ext4_utils/include')
-
-selinuxfiles = %w(
-  callbacks.c
-  check_context.c
-  freecon.c
-  init.c
-  label.c
-  label_file.c
-  label_support.c
-  setrans_client.c
-  regex.c
-  matchpathcon.c
-  selinux_config.c
-  label_backends_android.c
-  canonicalize_context.c
-  lsetfilecon.c
-  policyvers.c
-  lgetfilecon.c
-  load_policy.c
-  seusers.c
-  sha1.c
-  booleans.c
-  disable.c
-  enabled.c
-  getenforce.c
-  setenforce.c
-)
-libselinux = compile(expand('selinux/libselinux/src', selinuxfiles), '-DAUDITD_LOG_TAG=1003 -D_GNU_SOURCE -DHOST -DUSE_PCRE2 -DNO_PERSISTENTLY_STORED_PATTERNS -DDISABLE_SETRANS -DDISABLE_BOOL -DNO_MEDIA_BACKEND -DNO_X_BACKEND -DNO_DB_BACKEND -DPCRE2_CODE_UNIT_WIDTH=8 -Iselinux/libselinux/include -Iselinux/libsepol/include')
-
-libsepolfiles = %w(
-  policydb_public.c
-  genbools.c
-  debug.c
-  policydb.c
-  conditional.c
-  services.c
-  ebitmap.c
-  util.c
-  assertion.c
-  avtab.c
-  hashtab.c
-  sidtab.c
-  context.c
-  genusers.c
-  context_record.c
-  mls.c
-  avrule_block.c
-  symtab.c
-  policydb_convert.c
-  write.c
-  constraint.c
-  expand.c
-  hierarchy.c
-)
-libsepol = compile(expand('selinux/libsepol/src', libsepolfiles), '-Iselinux/libsepol/include')
-
-link('fastboot', libsparse + libzip + libcutils + liblog + libutil + libbase + libext4 + f2fs + libselinux + libsepol + libfastboot + libdiagnoseusb, '-lz -lpcre2-8 -lpthread -ldl')
-
-
-# mke2fs.android - a ustom version of mke2fs that supports --android_sparse (FS#56955)
-libext2fsfiles = %w(
-  lib/blkid/cache.c
-  lib/blkid/dev.c
-  lib/blkid/devname.c
-  lib/blkid/devno.c
-  lib/blkid/getsize.c
-  lib/blkid/llseek.c
-  lib/blkid/probe.c
-  lib/blkid/read.c
-  lib/blkid/resolve.c
-  lib/blkid/save.c
-  lib/blkid/tag.c
-  lib/e2p/feature.c
-  lib/e2p/hashstr.c
-  lib/e2p/mntopts.c
-  lib/e2p/ostype.c
-  lib/e2p/parse_num.c
-  lib/e2p/uuid.c
-  lib/et/com_err.c
-  lib/et/error_message.c
-  lib/et/et_name.c
-  lib/ext2fs/alloc.c
-  lib/ext2fs/alloc_sb.c
-  lib/ext2fs/alloc_stats.c
-  lib/ext2fs/alloc_tables.c
-  lib/ext2fs/atexit.c
-  lib/ext2fs/badblocks.c
-  lib/ext2fs/bb_inode.c
-  lib/ext2fs/bitmaps.c
-  lib/ext2fs/bitops.c
-  lib/ext2fs/blkmap64_ba.c
-  lib/ext2fs/blkmap64_rb.c
-  lib/ext2fs/blknum.c
-  lib/ext2fs/block.c
-  lib/ext2fs/bmap.c
-  lib/ext2fs/closefs.c
-  lib/ext2fs/crc16.c
-  lib/ext2fs/crc32c.c
-  lib/ext2fs/csum.c
-  lib/ext2fs/dirblock.c
-  lib/ext2fs/dir_iterate.c
-  lib/ext2fs/expanddir.c
-  lib/ext2fs/ext2_err.c
-  lib/ext2fs/ext_attr.c
-  lib/ext2fs/extent.c
-  lib/ext2fs/fallocate.c
-  lib/ext2fs/fileio.c
-  lib/ext2fs/freefs.c
-  lib/ext2fs/gen_bitmap64.c
-  lib/ext2fs/gen_bitmap.c
-  lib/ext2fs/get_num_dirs.c
-  lib/ext2fs/getsectsize.c
-  lib/ext2fs/getsize.c
-  lib/ext2fs/hashmap.c
-  lib/ext2fs/i_block.c
-  lib/ext2fs/ind_block.c
-  lib/ext2fs/initialize.c
-  lib/ext2fs/inline.c
-  lib/ext2fs/inline_data.c
-  lib/ext2fs/inode.c
-  lib/ext2fs/io_manager.c
-  lib/ext2fs/ismounted.c
-  lib/ext2fs/link.c
-  lib/ext2fs/llseek.c
-  lib/ext2fs/lookup.c
-  lib/ext2fs/mkdir.c
-  lib/ext2fs/mkjournal.c
-  lib/ext2fs/mmp.c
-  lib/ext2fs/namei.c
-  lib/ext2fs/newdir.c
-  lib/ext2fs/openfs.c
-  lib/ext2fs/progress.c
-  lib/ext2fs/punch.c
-  lib/ext2fs/rbtree.c
-  lib/ext2fs/read_bb.c
-  lib/ext2fs/read_bb_file.c
-  lib/ext2fs/res_gdt.c
-  lib/ext2fs/rw_bitmaps.c
-  lib/ext2fs/sha512.c
-  lib/ext2fs/sparse_io.c
-  lib/ext2fs/symlink.c
-  lib/ext2fs/undo_io.c
-  lib/ext2fs/unix_io.c
-  lib/ext2fs/valid_blk.c
-  lib/support/dict.c
-  lib/support/mkquota.c
-  lib/support/parse_qtype.c
-  lib/support/plausible.c
-  lib/support/prof_err.c
-  lib/support/profile.c
-  lib/support/quotaio.c
-  lib/support/quotaio_tree.c
-  lib/support/quotaio_v2.c
-  lib/uuid/gen_uuid.c
-  lib/uuid/isnull.c
-  lib/uuid/pack.c
-  lib/uuid/parse.c
-  lib/uuid/unpack.c
-  lib/uuid/unparse.c
-  misc/create_inode.c
-)
-libext2fs = compile(expand("e2fsprogs", libext2fsfiles), "-Ie2fsprogs/lib -Ie2fsprogs/lib/ext2fs -Icore/libsparse/include")
-
-
-mke2fsfiles = %w(
-  misc/default_profile.c
-  misc/mke2fs.c
-  misc/mk_hugefiles.c
-  misc/util.c
-)
-mke2fs = compile(expand('e2fsprogs', mke2fsfiles), '-Ie2fsprogs/lib')
-
-link('mke2fs.android', mke2fs + libext2fs + libsparse + libbase + libzip + liblog + libutil, '-lpthread -lz')
-
-
-e2fsdroidfiles = %w(
-  contrib/android/e2fsdroid.c
-  contrib/android/basefs_allocator.c
-  contrib/android/block_range.c
-  contrib/android/base_fs.c
-  contrib/android/fsmap.c
-  contrib/android/block_list.c
-  contrib/android/perms.c
-)
-e2fsdroid = compile(expand("e2fsprogs", e2fsdroidfiles), "-Ie2fsprogs/lib -Ie2fsprogs/lib/ext2fs -Iselinux/libselinux/include -Icore/libcutils/include -Ie2fsprogs/misc")
-
-link('e2fsdroid', e2fsdroid + libext2fs + libsparse + libbase + libzip + liblog + libutil + libselinux + libsepol + libcutils, '-lz -lpthread -lpcre2-8')
-
-
-ext2simgfiles = %w(
-  contrib/android/ext2simg.c
-)
-ext2simg = compile(expand('e2fsprogs', ext2simgfiles), '-Ie2fsprogs/lib -Icore/libsparse/include')
-
-link('ext2simg', ext2simg + libext2fs + libsparse + libbase + libzip + liblog + libutil, '-lz -lpthread')
diff --git a/srcpkgs/android-tools/patches/gcc-fixes.patch b/srcpkgs/android-tools/patches/gcc-fixes.patch
deleted file mode 100644
index fc0e60fa06e..00000000000
--- a/srcpkgs/android-tools/patches/gcc-fixes.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- core/adb/sysdeps.h
-+++ core/adb/sysdeps.h
-@@ -66,6 +66,11 @@
- #endif
- #endif
- 
-+#ifndef __clang__
-+#define _Nonnull
-+#define _Nullable
-+#endif
-+
- #ifdef _WIN32
- 
- // Clang-only nullability specifiers
---- core/libcutils/include/cutils/trace.h
-+++ core/libcutils/include/cutils/trace.h
-@@ -18,7 +18,13 @@
- #define _LIBS_CUTILS_TRACE_H
- 
- #include <inttypes.h>
-+// https://gcc.gnu.org/PR60932
-+#ifdef __cplusplus
-+#include <atomic>
-+using namespace std;
-+#else
- #include <stdatomic.h>
-+#endif
- #include <stdbool.h>
- #include <stdint.h>
- #include <stdio.h>
diff --git a/srcpkgs/android-tools/patches/include-sys-sysmacros.patch b/srcpkgs/android-tools/patches/include-sys-sysmacros.patch
deleted file mode 100644
index 592473ac93f..00000000000
--- a/srcpkgs/android-tools/patches/include-sys-sysmacros.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- core/adb/client/usb_linux.cpp	2019-01-02 20:03:26.218600891 +0100
-+++ -	2019-01-02 20:03:57.806149467 +0100
-@@ -28,6 +28,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <sys/sysmacros.h>
- #include <sys/ioctl.h>
- #include <sys/time.h>
- #include <sys/types.h>
diff --git a/srcpkgs/android-tools/patches/musl-fixes.patch b/srcpkgs/android-tools/patches/musl-fixes.patch
deleted file mode 100644
index 235ef68854e..00000000000
--- a/srcpkgs/android-tools/patches/musl-fixes.patch
+++ /dev/null
@@ -1,199 +0,0 @@
-Patch has been taken from Arch Linux with some minor modifications for
-needed to build android-tools with musl libc.
-
-diff -upr core.orig/adb/client/usb_libusb.cpp core/adb/client/usb_libusb.cpp
---- core.orig/adb/client/usb_libusb.cpp	2017-11-29 19:11:44.000000000 +0100
-+++ core/adb/client/usb_libusb.cpp	2018-02-25 10:35:06.661418453 +0100
-@@ -21,6 +21,7 @@
- #include <stdint.h>
- 
- #include <atomic>
-+#include <condition_variable>
- #include <chrono>
- #include <memory>
- #include <mutex>
-@@ -28,7 +29,7 @@
- #include <thread>
- #include <unordered_map>
- 
--#include <libusb/libusb.h>
-+#include <libusb-1.0/libusb.h>
- 
- #include <android-base/file.h>
- #include <android-base/logging.h>
-diff -upr core.orig/adb/diagnose_usb.cpp core/adb/diagnose_usb.cpp
---- core.orig/adb/diagnose_usb.cpp	2017-11-29 19:11:44.000000000 +0100
-+++ core/adb/diagnose_usb.cpp	2018-02-25 10:35:06.658085109 +0100
-@@ -45,9 +45,7 @@ static std::string GetUdevProblem() {
-         return "";
-     }
- 
--    // getgroups(2) indicates that the GNU group_member(3) may not check the egid so we check it
--    // additionally just to be sure.
--    if (group_member(plugdev_group->gr_gid) || getegid() == plugdev_group->gr_gid) {
-+    if (getegid() == plugdev_group->gr_gid) {
-         // The user is in plugdev so the problem is likely with the udev rules.
-         return "user in plugdev group; are your udev rules wrong?";
-     }
-diff -upr core.orig/adb/sysdeps/posix/network.cpp core/adb/sysdeps/posix/network.cpp
---- core.orig/adb/sysdeps/posix/network.cpp	2017-11-29 19:11:44.000000000 +0100
-+++ core/adb/sysdeps/posix/network.cpp	2018-02-25 10:35:06.661418453 +0100
-@@ -21,6 +21,7 @@
- #include <sys/socket.h>
- 
- #include <string>
-+#include <string.h>
- 
- #include "adb_unique_fd.h"
- 
-diff -upr core.orig/base/errors_unix.cpp core/base/errors_unix.cpp
---- core.orig/base/errors_unix.cpp	2017-11-29 19:11:44.000000000 +0100
-+++ core/base/errors_unix.cpp	2018-02-25 10:35:06.654751766 +0100
-@@ -17,6 +17,7 @@
- #include "android-base/errors.h"
- 
- #include <errno.h>
-+#include <string.h>
- 
- namespace android {
- namespace base {
-diff -upr core.orig/base/file.cpp core/base/file.cpp
---- core.orig/base/file.cpp	2017-11-29 19:11:44.000000000 +0100
-+++ core/base/file.cpp	2018-02-25 10:35:06.654751766 +0100
-@@ -22,6 +22,7 @@
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <unistd.h>
-+#include <string.h>
- 
- #include <memory>
- #include <mutex>
-diff -upr core.orig/base/logging.cpp core/base/logging.cpp
---- core.orig/base/logging.cpp	2017-11-29 19:11:44.000000000 +0100
-+++ core/base/logging.cpp	2018-02-25 10:35:06.654751766 +0100
-@@ -23,6 +23,7 @@
- #include <fcntl.h>
- #include <libgen.h>
- #include <time.h>
-+#include <string.h>
- 
- // For getprogname(3) or program_invocation_short_name.
- #if defined(__ANDROID__) || defined(__APPLE__)
-@@ -89,7 +90,7 @@ static thread_id GetThreadId() {
- }
- 
- namespace {
--#if defined(__GLIBC__)
-+#if defined(__linux__)
- const char* getprogname() {
-   return program_invocation_short_name;
- }
-diff -upr core.orig/fastboot/fs.cpp core/fastboot/fs.cpp
---- core.orig/fastboot/fs.cpp	2017-11-29 19:11:44.000000000 +0100
-+++ core/fastboot/fs.cpp	2018-02-25 10:35:06.651418422 +0100
-@@ -108,7 +108,7 @@ static int generate_ext4_image(const cha
-     static constexpr int block_size = 4096;
-     const std::string exec_dir = android::base::GetExecutableDirectory();
- 
--    const std::string mke2fs_path = exec_dir + "/mke2fs";
-+    const std::string mke2fs_path = exec_dir + "/mke2fs.android";
-     std::vector<const char*> mke2fs_args = {mke2fs_path.c_str(), "-t", "ext4", "-b"};
- 
-     std::string block_size_str = std::to_string(block_size);
-diff -upr core.orig/fastboot/socket.cpp core/fastboot/socket.cpp
---- core.orig/fastboot/socket.cpp	2017-11-29 19:11:44.000000000 +0100
-+++ core/fastboot/socket.cpp	2018-02-25 10:35:06.651418422 +0100
-@@ -28,6 +28,8 @@
- 
- #include "socket.h"
- 
-+#include <sys/select.h>
-+
- #include <android-base/errors.h>
- #include <android-base/stringprintf.h>
- 
-diff -upr core.orig/libsparse/sparse_read.cpp core/libsparse/sparse_read.cpp
---- core.orig/libsparse/sparse_read.cpp	2017-11-29 19:11:44.000000000 +0100
-+++ core/libsparse/sparse_read.cpp	2018-02-25 10:35:06.621418331 +0100
-@@ -26,6 +26,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string>
-+#include <string.h>
- #include <unistd.h>
- 
- #include <sparse/sparse.h>
-diff -upr selinux.orig/libsepol/src/private.h selinux/libsepol/src/private.h
---- selinux.orig/libsepol/src/private.h	2017-08-13 09:34:17.000000000 +0200
-+++ selinux/libsepol/src/private.h	2018-02-25 10:36:31.765008355 +0100
-@@ -14,7 +14,7 @@
- #endif
- 
- #include <errno.h>
--#include <dso.h>
-+#include "dso.h"
- 
- #ifdef __APPLE__
- #define __BYTE_ORDER  BYTE_ORDER
-diff -upr selinux.orig/libsepol/src/util.c selinux/libsepol/src/util.c
---- selinux.orig/libsepol/src/util.c	2017-08-13 09:34:17.000000000 +0200
-+++ selinux/libsepol/src/util.c	2018-02-25 10:36:31.765008355 +0100
-@@ -27,7 +27,7 @@
- #include <sepol/policydb/flask_types.h>
- #include <sepol/policydb/policydb.h>
- #include <sepol/policydb/util.h>
--#include <dso.h>
-+#include "dso.h"
- 
- struct val_to_name {
- 	unsigned int val;
-diff -upr e2fsprogs.orig/contrib/android/perms.c e2fsprogs/contrib/android/perms.c
---- e2fsprogs.orig/contrib/android/perms.c	2017-11-29 00:28:33.000000000 +0100
-+++ e2fsprogs/contrib/android/perms.c	2018-02-25 10:37:13.048466147 +0100
-@@ -5,6 +5,7 @@
- #include "support/nls-enable.h"
- #include <time.h>
- #include <sys/stat.h>
-+#include "private/android_filesystem_capability.h"
- 
- #ifndef XATTR_SELINUX_SUFFIX
- # define XATTR_SELINUX_SUFFIX  "selinux"
-diff -upr e2fsprogs.orig/lib/ext2fs/bitops.h e2fsprogs/lib/ext2fs/bitops.h
---- e2fsprogs.orig/lib/ext2fs/bitops.h	2017-11-29 00:28:33.000000000 +0100
-+++ e2fsprogs/lib/ext2fs/bitops.h	2018-02-25 10:37:13.028466087 +0100
-@@ -233,11 +233,11 @@ extern errcode_t ext2fs_find_first_set_g
- #if (__STDC_VERSION__ >= 199901L)
- #define _INLINE_ extern inline
- #else
--#define _INLINE_ inline
-+#define _INLINE_ static inline
- #endif
- #else /* !INCLUDE_INLINE FUNCS */
- #if (__STDC_VERSION__ >= 199901L)
--#define _INLINE_ inline
-+#define _INLINE_ static inline
- #else /* not C99 */
- #ifdef __GNUC__
- #define _INLINE_ extern __inline__
-diff -upr e2fsprogs.orig/lib/ext2fs/ext2fs.h e2fsprogs/lib/ext2fs/ext2fs.h
---- e2fsprogs.orig/lib/ext2fs/ext2fs.h	2017-11-29 00:28:33.000000000 +0100
-+++ e2fsprogs/lib/ext2fs/ext2fs.h	2018-02-25 10:37:13.028466087 +0100
-@@ -53,9 +53,7 @@ extern "C" {
-  */
- #define EXT2_LIB_CURRENT_REV	EXT2_DYNAMIC_REV
- 
--#ifdef HAVE_SYS_TYPES_H
- #include <sys/types.h>
--#endif
- 
- #include <stdio.h>
- #include <stdlib.h>
-@@ -1736,7 +1734,7 @@ extern const struct ext2_inode *ext2fs_c
- #define _INLINE_ extern
- #else
- #if (__STDC_VERSION__ >= 199901L)
--#define _INLINE_ inline
-+#define _INLINE_ static inline
- #else
- #ifdef __GNUC__
- #define _INLINE_ extern __inline__
diff --git a/srcpkgs/android-tools/patches/undef__USE_GNU.patch b/srcpkgs/android-tools/patches/undef__USE_GNU.patch
deleted file mode 100644
index 03fb129c1c1..00000000000
--- a/srcpkgs/android-tools/patches/undef__USE_GNU.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Source: John
-Upstream: No
-Reason: Conflicting declaration of copy_file_range on GLIBC
-
-FAILED: e2fsprogs/misc/create_inode.c.o 
-cc -std=gnu11 -D_FORTIFY_SOURCE=2 -mtune=generic -O2 -pipe     -Ie2fsprogs/lib -Ie2fsprogs/lib/ext2fs -Icore/libsparse/include -c e2fsprogs/misc/create_inode.c -o e2fsprogs/misc/create_inode.c.o
-e2fsprogs/misc/create_inode.c:406:18: error: conflicting types for 'copy_file_range'
- static errcode_t copy_file_range(ext2_filsys fs, int fd, ext2_file_t e2_file,
-                  ^~~~~~~~~~~~~~~
-In file included from e2fsprogs/misc/create_inode.c:20:
-/usr/include/unistd.h:1107:9: note: previous declaration of 'copy_file_range' was here
- ssize_t copy_file_range (int __infd, __off64_t *__pinoff,
-         ^~~~~~~~~~~~~~~
-
---- e2fsprogs/misc/create_inode.c	2019-01-02 20:07:51.685424116 +0100
-+++ -	2019-01-02 20:08:17.379127932 +0100
-@@ -17,6 +17,7 @@
- #include <time.h>
- #include <sys/stat.h>
- #include <sys/types.h>
-+#undef __USE_GNU
- #include <unistd.h>
- #include <limits.h> /* for PATH_MAX */
- #ifdef HAVE_ATTR_XATTR_H
diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index 12806884ec0..cbf06abc647 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -1,56 +1,24 @@
 # Template file for 'android-tools'
 pkgname=android-tools
-# NOTE: not all upstream updates has code changes for the parts
-#       of android used by android-tools. Check for diff with:
-#         curl -L http://git.io/vvC0Z | sh -s 5.0.2_r1 5.1.0_r1
-version=9.0.0r45
-revision=2
-archs="x86_64* i686*"
-_distver=${version/r/_r}
-#See https://android.googlesource.com/platform/development/+/refs/tags/android-${_distver}/sdk/plat_tools_source.prop_template
-_apiver="28.0.0 rc1"
-create_wrksrc=yes
-hostmakedepends="ruby cmake ninja perl go"
+version=29.0.4
+revision=1
+archs="armv* aarch64* x86_64* i686*"
+build_style=cmake
+hostmakedepends="perl go"
 makedepends="gtest-devel zlib-devel libressl-devel libusb-devel pcre2-devel"
 short_desc="Android platform tools (adb and fastboot)"
 maintainer="John <johnz@posteo.net>"
 license="Apache-2.0, ISC, GPL-2.0-only, MIT"
 homepage="http://developer.android.com/tools/help/adb.html"
-_baseurl=https://android.googlesource.com/platform
-distfiles="
- ${_baseurl}/system/core/+archive/android-${_distver}.tar.gz>core.tar.gz
- ${_baseurl}/system/extras/+archive/android-${_distver}.tar.gz>extras.tar.gz
- ${_baseurl}/external/selinux/+archive/android-${_distver}.tar.gz>selinux.tar.gz
- ${_baseurl}/external/f2fs-tools/+archive/android-${_distver}.tar.gz>f2fs-tools.tar.gz
- ${_baseurl}/external/e2fsprogs/+archive/android-${_distver}.tar.gz>e2fsprogs.tar.gz
- ${_baseurl}/external/avb/+archive/android-${_distver}.tar.gz>avb.tar.gz
- https://boringssl.googlesource.com/boringssl/+archive/3538.tar.gz>boringssl.tar.gz"
-# Contents checksums because the tarballs change with every download
-checksum="@dfaea8c40be4a8bbd1df513ab3516ff88e92430ee0fde399dd7e7e09ec21cd29
- @0a43d228088faabe8b7150fa752c8b0c002503c0d830d8470ecea351f195bbb3
- @9f2b5e379eca4c56e2d422598831bfd7bdf2b7b3c3d011ce513c7603aa46b574
- @f1efc86a1e78521f4754d184d682c1f6660c04f74496913f37cae9e2670db0e8
- @e98509632e865e792dc4b344b0a1ada0662dda7571534fa7c5d1a8902dcfb0f4
- @5c2fcb88154f9b6ffed8d24a069e4bad0a7aea1936be2ce18af972ad8762e09a
- @452e29d95f8da494896e3335931e928d9b7c94500a5793101bb19629cd7dea8c"
+distfiles="https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz"
+checksum=5428e16a2baba79665cac0b11be81aa0cfa6920dc20da039711cc3d3b96a333b
 
-do_extract() {
-	local tarball p
-	for p in ${distfiles}; do
-		tarball=${p##*>}
-		mkdir -p ${wrksrc}/${tarball/.*}
-		tar -x --no-same-permissions --no-same-owner -f \
-			${XBPS_SRCDISTDIR}/${pkgname}-${version}/${tarball} \
-			-C ${wrksrc}/${tarball/.*}
-	done
-}
+case "$XBPS_TARGET_MACHINE" in
+	armv[56]*) makedepends+=" libatomic-devel"
+		;;
+esac
 
 pre_configure() {
-	PKGVER="${_apiver}-void-${version}_${revision}" ${FILESDIR}/generate_build.rb > build.ninja
-
-	mkdir -p boringssl/build
-	cd boringssl/build
-
 	# Don't check for CROSS_COMPILING, since i686 container/chroot inside
 	# x86_64 host will failed to build this.
 	if [ "${XBPS_TARGET_MACHINE}" = i686 ] && [ "$(uname -m)" = "x86_64" ]; then
@@ -62,34 +30,19 @@ pre_configure() {
 		SET(CMAKE_CXX_COMPILER ${CXX})
 		SET(CMAKE_SYSTEM_PROCESSOR x86)
 		_EOF
+		configure_args+=" ${boring_ssl_cmake_args}"
 	fi
 
-	cmake -GNinja \
-		-DBUILD_SHARED_LIBS=FALSE \
-		-DCMAKE_BUILD_TYPE=RELEASE \
-		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-		-DCMAKE_C_FLAGS="$CFLAGS" \
-		$boring_ssl_cmake_args \
-		..
-	ninja
+	case "${XBPS_TARGET_MACHINE}" in
+		armv[56]*) sed -i vendor/CMakeLists.adb.txt \
+			-e "/target_link_libraries/s;$; atomic;"
+			;;
+	esac
 }
 
-do_build() {
-	ninja
-}
-
-do_install() {
-	for i in adb fastboot mke2fs.android e2fsdroid ext2simg \
-		core/mkbootimg/mkbootimg avb/avbtool ;do
-		vbin $i
-	done
-	vlicense boringssl/LICENSE boringssl.LICENSE
-	vlicense boringssl/third_party/fiat/LICENSE fiat.LICENSE
-	vlicense boringssl/third_party/googletest/LICENSE gtest.LICENSE
-	vlicense boringssl/third_party/android-cmake/LICENSE android-cmake.LICENSE
+post_install() {
+	vlicense vendor/boringssl/LICENSE boringssl.LICENSE
+	vlicense vendor/boringssl/third_party/fiat/LICENSE fiat.LICENSE
+	vlicense vendor/boringssl/third_party/googletest/LICENSE gtest.LICENSE
 	vsv adb
 }
-
-# REMARKS:
-# If there is any reason at all that fastboot may not be a position independent
-# executable, please document it here.
diff --git a/srcpkgs/android-tools/update b/srcpkgs/android-tools/update
index e5c3658d328..49895605477 100644
--- a/srcpkgs/android-tools/update
+++ b/srcpkgs/android-tools/update
@@ -1,2 +1,2 @@
 site="https://android.googlesource.com/platform/system/core"
-pattern='android-\K[\d._r]+'
+pattern='platform-tools-\K[\d._r]+'
diff --git a/srcpkgs/angband/template b/srcpkgs/angband/template
index 9b118cc9489..c9a1c5e0db2 100644
--- a/srcpkgs/angband/template
+++ b/srcpkgs/angband/template
@@ -1,18 +1,18 @@
 # Template file for 'angband'
 pkgname=angband
-version=4.1.3
+version=4.2.0
 revision=1
 build_style=gnu-configure
 configure_args="--enable-sdl --enable-sdl-mixer"
 hostmakedepends="automake"
 makedepends="SDL_image-devel SDL_mixer-devel SDL_ttf-devel"
-short_desc="A free, single-player dungeon exploration game"
+short_desc="Free, single-player dungeon exploration game"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-2.0-or-later"
 homepage="http://rephial.org/"
 changelog="http://rephial.org/release/"
-distfiles="http://rephial.org/downloads/4.1/angband-${version}.tar.gz"
-checksum=9402c4f8da691edbd4567a948c5663e1066bee3fcb4a62fbcf86b5454918406f
+distfiles="http://rephial.org/downloads/4.2/angband-${version}.tar.gz"
+checksum=d3e1495c7cc2a4ee66de7b4e612d3b133048072e37504bd2e58a2351ab0fb56d
 
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh
diff --git a/srcpkgs/anki/template b/srcpkgs/anki/template
index 78d8089b5a7..c7248395618 100644
--- a/srcpkgs/anki/template
+++ b/srcpkgs/anki/template
@@ -1,6 +1,6 @@
 # Template file for 'anki'
 pkgname=anki
-version=2.1.13
+version=2.1.15
 revision=2
 archs=noarch
 build_style=gnu-makefile
@@ -14,7 +14,7 @@ license="AGPL-3.0-or-later"
 homepage="https://apps.ankiweb.net"
 changelog="https://apps.ankiweb.net/docs/changes.html"
 distfiles="https://apps.ankiweb.net/downloads/current/anki-${version}-source.tgz"
-checksum=8166eebc54575aa55eeff0886ffec3228b3c377885abf9cc18561b7a01cb8edb
+checksum=5a53760164c77d619f55107a13099cffe620566a7f610b61b6c4b52487f3bb89
 
 pycompile_version="$py3_ver"
 
diff --git a/srcpkgs/ansi/template b/srcpkgs/ansi/template
index c40ac829b2f..7c877d9c823 100644
--- a/srcpkgs/ansi/template
+++ b/srcpkgs/ansi/template
@@ -5,7 +5,7 @@ revision=1
 archs=noarch
 depends="bash"
 short_desc="ANSI escape codes in pure Bash"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/fidian/ansi"
 changelog="https://raw.githubusercontent.com/fidian/ansi/master/CHANGELOG.md"
diff --git a/srcpkgs/anydesk/template b/srcpkgs/anydesk/template
index 4f760bc124d..6de2c0969bc 100644
--- a/srcpkgs/anydesk/template
+++ b/srcpkgs/anydesk/template
@@ -1,6 +1,6 @@
 # Template file for 'anydesk'
 pkgname=anydesk
-version=5.1.1
+version=5.1.2
 revision=1
 archs="i686 x86_64"
 wrksrc=${pkgname}-${version}
@@ -14,10 +14,10 @@ restricted=yes
 
 if [ "${XBPS_TARGET_MACHINE}" = "x86_64" ] ; then
 	distfiles="https://download.anydesk.com/linux/anydesk-${version}-amd64.tar.gz"
-	checksum=cb72b79ac1476bfb295f3e27d2127d4868107e324f6473b089b448c7f3df55a4
+	checksum=02d98ca58dfa053d5dc59fb198992a3066ebd66b9faff8948421d233b5e03d56
 elif [ "${XBPS_TARGET_MACHINE}" = "i686" ]; then
-	distfiles="https://download.anydesk.com/linux/anydesk-${version}-i686.tar.gz"
-	checksum=87d9a4ccfa6e46c7174e943453fc97418c73b6b8255631f36e9def3bc3fe6b82
+	distfiles="https://download.anydesk.com/linux/anydesk-${version}-i386.tar.gz"
+	checksum=6ca826ead232e9bd54fb445524ab5efee5df7edd84fc90cd30567b54376950bf
 fi
 
 do_install() {
@@ -29,4 +29,3 @@ do_install() {
 	vbin anydesk
 	vlicense copyright
 }
-
diff --git a/srcpkgs/apache-directory-studio b/srcpkgs/apache-directory-studio
new file mode 120000
index 00000000000..da11f0190a6
--- /dev/null
+++ b/srcpkgs/apache-directory-studio
@@ -0,0 +1 @@
+apache-directory-studio-bin
\ No newline at end of file
diff --git a/srcpkgs/apache-directory-studio/files/ApacheDirectoryStudio.desktop b/srcpkgs/apache-directory-studio-bin/files/ApacheDirectoryStudio.desktop
similarity index 100%
rename from srcpkgs/apache-directory-studio/files/ApacheDirectoryStudio.desktop
rename to srcpkgs/apache-directory-studio-bin/files/ApacheDirectoryStudio.desktop
diff --git a/srcpkgs/apache-directory-studio/template b/srcpkgs/apache-directory-studio-bin/template
similarity index 56%
rename from srcpkgs/apache-directory-studio/template
rename to srcpkgs/apache-directory-studio-bin/template
index 61392aa39d0..0353d15dcdd 100644
--- a/srcpkgs/apache-directory-studio/template
+++ b/srcpkgs/apache-directory-studio-bin/template
@@ -1,25 +1,26 @@
 # Template file for 'apache-directory-studio'
-pkgname=apache-directory-studio
+pkgname=apache-directory-studio-bin
 _pkgname=ApacheDirectoryStudio
-version=2.0.0.v20170904
+version=2.0.0.v20180908
 revision=1
+_versionprefix=M14
 depends="virtual?java-runtime gtk+ desktop-file-utils"
 short_desc="LDAP browser and directory client"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Frank Steinborn <steinex@nognu.de>"
 license="Apache-2.0"
-homepage="http://directory.apache.org/studio/"
 archs="i686 x86_64"
+homepage="http://directory.apache.org/studio/"
 nopie=yes
 
 if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
 	_arch="x86_64"
-	checksum=581d55f3496827710301dec613466d829cf9a3ed3d4308460e63ca08aaa9d6c9
+	checksum=faae04c6d37bfd1e1ac6cd997399d5d314de7ba9b7279fd7b9c9e052cea0044f
 elif [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
 	_arch="x86"
-	checksum=96281c2af3b1ea04e423b41b465a93b21607ce41b3dc3771861e0b52557eb5af
+	checksum=38c0ca414961852e6b1d3960124fb12f45ccfcd03779537291afe02725f20d0d
 fi
 
-distfiles="http://apache.mindstudios.com/directory/studio/${version}-M13/${_pkgname}-${version}-M13-linux.gtk.${_arch}.tar.gz"
+distfiles="https://www-eu.apache.org/dist/directory/studio/${version}-${_versionprefix}/${_pkgname}-${version}-${_versionprefix}-linux.gtk.${_arch}.tar.gz"
 wrksrc="${_pkgname}"
 
 do_install() {
@@ -31,3 +32,9 @@ do_install() {
 	ln -sf /opt/${_pkgname}/${_pkgname} ${DESTDIR}/usr/bin/${_pkgname}
 	ln -sf /opt/${_pkgname}/${_pkgname} ${DESTDIR}/usr/bin/${pkgname//-/}
 }
+
+apache-directory-studio_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	build_style=meta
+	short_desc+=" (transitional dummy package)"
+}
diff --git a/srcpkgs/apache-directory-studio/update b/srcpkgs/apache-directory-studio-bin/update
similarity index 100%
rename from srcpkgs/apache-directory-studio/update
rename to srcpkgs/apache-directory-studio-bin/update
diff --git a/srcpkgs/apache-jmeter/update b/srcpkgs/apache-jmeter/update
new file mode 100644
index 00000000000..cb43837f485
--- /dev/null
+++ b/srcpkgs/apache-jmeter/update
@@ -0,0 +1 @@
+site=https://jmeter.apache.org/download_jmeter.cgi
diff --git a/srcpkgs/apache-maven/template b/srcpkgs/apache-maven/template
index e5cb31b40c5..573423ccb43 100644
--- a/srcpkgs/apache-maven/template
+++ b/srcpkgs/apache-maven/template
@@ -1,6 +1,6 @@
 # Template file for 'apache-maven'
 pkgname=apache-maven
-version=3.6.1
+version=3.6.2
 revision=1
 archs=noarch
 hostmakedepends="openjdk"
@@ -11,8 +11,8 @@ license="Apache-2.0"
 homepage="https://maven.apache.org/"
 distfiles="https://www-us.apache.org/dist/maven/maven-3/${version}/source/${pkgname}-${version}-src.tar.gz
  https://www-us.apache.org/dist/maven/maven-3/${version}/binaries/apache-maven-${version}-bin.tar.gz"
-checksum="025921fff6ba827a25413ffc08fb1933565eb1f07ee2d3f228911913ee4f3c3f
- 2528c35a99c30f8940cc599ba15d34359d58bec57af58c1075519b8cd33b69e7"
+checksum="7ed94655b4098729de292a13c96765bb90a407bb6feb64f201a9444aebde69d1
+ 3fbc92d1961482d6fbd57fbf3dd6d27a4de70778528ee3fb44aa7d27eb32dfdc"
 
 do_build() {
 	./bin/mvn package -DskipTests -Drat.skip=true -Dmaven.repo.local=repo -DdistributionTargetDir=${DESTDIR}/usr/share/${pkgname}/
diff --git a/srcpkgs/apache-tomcat/template b/srcpkgs/apache-tomcat/template
index 49a82f9b526..64a981fd38b 100644
--- a/srcpkgs/apache-tomcat/template
+++ b/srcpkgs/apache-tomcat/template
@@ -1,6 +1,6 @@
 # Template file for 'apache-tomcat'
 pkgname=apache-tomcat
-version=9.0.22
+version=9.0.26
 revision=1
 wrksrc="${pkgname}-${version}-src"
 hostmakedepends="openjdk apache-ant"
@@ -10,7 +10,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://tomcat.apache.org"
 distfiles="http://mirrors.gigenet.com/apache/tomcat/tomcat-9/v${version}/src/${pkgname}-${version}-src.tar.gz"
-checksum=3058585ddea3f5133b2883b750536b4693950152c399b99a99e0ecc0b4e0caa4
+checksum=d061aa50bcc51e28c40f5a2d5a06999d9a49ddcae5410f3bac99c8d5ded61935
 
 system_accounts="tomcat"
 make_dirs="/usr/share/${pkgname}/webapps 0755 tomcat tomcat
diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index c83d4ba5f51..b62093f0358 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
 # Template file for 'apache'
 pkgname=apache
-version=2.4.39
-revision=2
+version=2.4.41
+revision=1
 wrksrc="httpd-${version}"
 build_style=gnu-configure
 configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
@@ -37,7 +37,8 @@ license="Apache-2.0"
 homepage="http://httpd.apache.org/"
 changelog="http://www.apache.org/dist/httpd/CHANGES_2.4"
 distfiles="https://archive.apache.org/dist/httpd/httpd-${version}.tar.bz2"
-checksum=b4ca9d05773aa59b54d66cd8f4744b945289f084d3be17d7981d1783a5decfa2
+checksum=133d48298fe5315ae9366a0ec66282fa4040efa5d566174481077ade7d18ea40
+nocross="https://build.voidlinux.org/builders/armv7l_builder/builds/20326/steps/shell_3/logs/stdio"
 
 system_accounts="_${pkgname}"
 _apache_homedir="/srv/www/$pkgname"
diff --git a/srcpkgs/api-sanity-checker/template b/srcpkgs/api-sanity-checker/template
index 96ad3b7879a..765c5c3fc63 100644
--- a/srcpkgs/api-sanity-checker/template
+++ b/srcpkgs/api-sanity-checker/template
@@ -6,7 +6,7 @@ build_style=gnu-makefile
 hostmakedepends="perl abi-compliance-checker"
 depends="abi-compliance-checker perl binutils ctags"
 short_desc="An automatic generator of basic C/C++ library unit tests"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://lvc.github.io/api-sanity-checker/"
 distfiles="https://github.com/lvc/api-sanity-checker/archive/${version}.tar.gz"
diff --git a/srcpkgs/apparmor/template b/srcpkgs/apparmor/template
index a51f79c409d..c0ef28bae03 100644
--- a/srcpkgs/apparmor/template
+++ b/srcpkgs/apparmor/template
@@ -1,7 +1,7 @@
 # Template file for 'apparmor'
 pkgname=apparmor
-version=2.13.2
-revision=7
+version=2.13.3
+revision=1
 wrksrc="${pkgname}-v${version}"
 build_wrksrc=libraries/libapparmor
 build_style=gnu-configure
@@ -16,7 +16,7 @@ maintainer="Olivier Mauras <olivier@mauras.ch>"
 license="GPL-2.0-only, LGPL-2.1-only"
 homepage="https://gitlab.com/apparmor/apparmor"
 distfiles="https://gitlab.com/apparmor/apparmor/-/archive/v${version}/apparmor-v${version}.tar.gz"
-checksum=83edb98c729dc5388407aea23ea7aedb62c00db70131853f1eae15a27d71ca1d
+checksum=2e32413a83108c3213d60f439ec2865432eb839a577425ee92489c45ac8ce7e4
 patch_args="-Np1"
 
 if [ -z "$CROSS_BUILD" ]; then
@@ -95,4 +95,3 @@ libapparmor-devel_package() {
 		vmove usr/lib/pkgconfig
 	}
 }
-
diff --git a/srcpkgs/apt/template b/srcpkgs/apt/template
index cbb652c1e91..49a8e087855 100644
--- a/srcpkgs/apt/template
+++ b/srcpkgs/apt/template
@@ -1,6 +1,6 @@
 # Template file for 'apt'
 pkgname=apt
-version=1.8.2
+version=1.8.4
 revision=1
 build_style=cmake
 configure_args="-DDPKG_DATADIR=/usr/share/dpkg -DCURRENT_VENDOR=debian
@@ -13,7 +13,7 @@ maintainer="Elie ROUDNINSKI <xademax@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://salsa.debian.org/apt-team/apt"
 distfiles="https://github.com/Debian/apt/archive/${version}.tar.gz"
-checksum=6ff2ede3ffc707ae51c80e5026199816ce7baab038e55aa96aa7eabe0e910bb6
+checksum=41fcd2f1825405c6f0333b5e47eadf13bd9b3ca20d3b7abc26680683198d8ec8
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) broken="error: void value not ignored as it ought to be" ;;
diff --git a/srcpkgs/aptly/template b/srcpkgs/aptly/template
index 7113619a063..4098ebc02d8 100644
--- a/srcpkgs/aptly/template
+++ b/srcpkgs/aptly/template
@@ -1,6 +1,6 @@
 # Template file for 'aptly'
 pkgname=aptly
-version=1.3.0
+version=1.4.0
 revision=1
 build_style=go
 go_import_path=github.com/aptly-dev/aptly
@@ -9,7 +9,7 @@ maintainer="Tassilo Schweyer <dev@welterde.de>"
 license="MIT"
 homepage="https://www.aptly.info/"
 distfiles="https://github.com/aptly-dev/aptly/archive/v$version.tar.gz"
-checksum=4d993dd790345e54dd963467a475ae160a7133bae7ee42844f15d5e82c1fb36e
+checksum=4172d54613139f6c34d5a17396adc9675d7ed002e517db8381731d105351fbe5
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/aqbanking/template b/srcpkgs/aqbanking/template
index 7f547ad9444..ed906ea0645 100644
--- a/srcpkgs/aqbanking/template
+++ b/srcpkgs/aqbanking/template
@@ -1,7 +1,6 @@
 # Template file for 'aqbanking'
 pkgname=aqbanking
-_dnrel=217
-version=5.7.8
+version=5.8.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config gwenhywfar"
@@ -10,8 +9,8 @@ short_desc="Library for online banking and financial applications"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only, GPL-3.0-only"
 homepage="http://www.aquamaniac.de/aqbanking"
-distfiles="http://www.aquamaniac.de/sites/download/download.php?package=03&release=${_dnrel}&file=02&dummy=aqbanking-$version.tar.gz"
-checksum=16f86e4cc49a9eaaa8dfe3206607e627873208bce45a70030c3caea9b5afc768
+distfiles="https://www.aquamaniac.de/rdm/attachments/download/107/aqbanking-${version}.tar.gz"
+checksum=93ca523fe175e72042db75f8c3fc6255ab058cf82caf52796e15f030809fb15e
 disable_parallel_build=yes
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/aquatone/template b/srcpkgs/aquatone/template
index 02e2b239665..f6215fe4ee6 100644
--- a/srcpkgs/aquatone/template
+++ b/srcpkgs/aquatone/template
@@ -1,6 +1,6 @@
 # Template file for 'aquatone'
 pkgname=aquatone
-version=1.4.3
+version=1.7.0
 revision=1
 build_style=go
 go_import_path=github.com/michenriksen/aquatone
@@ -10,7 +10,7 @@ maintainer="Alex Childs <misuchiru03+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/michenriksen/aquatone"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=8a54c597814a246b5b61cb1b5c1bc267fdbf47a83dbc55d5e7800c90b25a2cbb
+checksum=7849dce3241df663ea6edd9a9433d5ecc20fb768d0192ccbfb28d61d67ebcc97
 
 post_install() {
 	vlicense LICENSE.txt
diff --git a/srcpkgs/arc-theme/template b/srcpkgs/arc-theme/template
index a40cf0e0ede..627fa1bad00 100644
--- a/srcpkgs/arc-theme/template
+++ b/srcpkgs/arc-theme/template
@@ -1,16 +1,16 @@
 # Template file for 'arc-theme'
 pkgname=arc-theme
-version=20190330
+version=20190917
 revision=1
 archs=noarch
 build_style=gnu-configure
 configure_script="./autogen.sh"
 hostmakedepends="automake glib-devel gnome-shell pkg-config sassc optipng inkscape"
 makedepends="gtk+3-devel"
-depends="gnome-themes-standard gtk-engine-murrine"
+depends="gnome-themes-extra gtk-engine-murrine"
 short_desc="Flat theme with transparent elements for GTK 3, GTK 2 and GNOME Shell"
 maintainer="jtalowell <jtalowell@protonmail.com>"
 license="GPL-3.0-or-later"
-homepage="https://github.com/NicoHood/arc-theme"
-distfiles="https://github.com/NicoHood/arc-theme/archive/${version}.tar.gz"
-checksum=9e420be8ae3d71ca67882db7f44c5d8c199170751f7470865bf77e8762aa1d5f
+homepage="https://github.com/arc-design/arc-theme"
+distfiles="https://github.com/arc-design/arc-theme/archive/${version}.tar.gz"
+checksum=7ec7ee60fe7c4de0dfbb407b02fde92f1acc87a07e5ed59d6af3d3c822b0ca59
diff --git a/srcpkgs/archiver/template b/srcpkgs/archiver/template
index 942228d1767..e1c510df2b0 100644
--- a/srcpkgs/archiver/template
+++ b/srcpkgs/archiver/template
@@ -1,7 +1,7 @@
 # Template file for 'archiver'
 pkgname=archiver
-version=3.1.1
-revision=2
+version=3.2.0
+revision=1
 build_style=go
 go_import_path=github.com/mholt/archiver
 go_package="${go_import_path}/cmd/arc"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/mholt/archiver"
 distfiles="https://github.com/mholt/archiver/archive/v${version}.tar.gz"
-checksum=41ec54a7e0165c9bf1a567589a453c243394efff41dc446532f2028d98b476ac
+checksum=919182c8a2ae8095b12f059a1b2826107629bd13bdba6a429cb3d97eac6ae065
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/arduino/patches/astyle_fix.patch b/srcpkgs/arduino/patches/astyle_fix.patch
new file mode 100644
index 00000000000..7b07f574420
--- /dev/null
+++ b/srcpkgs/arduino/patches/astyle_fix.patch
@@ -0,0 +1,34 @@
+--- astyle/src/astyle_main.cpp	2017-05-30 20:26:37.000000000 -0400
++++ astyle/src/astyle_main.cpp	2019-09-11 20:38:02.155936887 -0400
+@@ -3749,7 +3749,7 @@
+ // called by a java program to get the version number
+ // the function name is constructed from method names in the calling java program
+ extern "C"  EXPORT
+-jstring STDCALL Java_AStyleInterface_AStyleGetVersion(JNIEnv* env, jclass)
++jstring STDCALL Java_cc_arduino_packages_formatter_AStyleInterface_AStyleGetVersion(JNIEnv* env, jclass)
+ {
+ 	return env->NewStringUTF(g_version);
+ }
+@@ -3757,7 +3757,7 @@
+ // called by a java program to format the source code
+ // the function name is constructed from method names in the calling java program
+ extern "C"  EXPORT
+-jstring STDCALL Java_AStyleInterface_AStyleMain(JNIEnv* env,
++jstring STDCALL Java_cc_arduino_packages_formatter_AStyleInterface_AStyleMain(JNIEnv* env,
+                                                 jobject obj,
+                                                 jstring textInJava,
+                                                 jstring optionsJava)
+--- astyle/src/astyle_main.h	2017-05-30 20:26:37.000000000 -0400
++++ astyle/src/astyle_main.h	2019-09-11 20:39:15.953536523 -0400
+@@ -406,9 +406,9 @@
+ char* STDCALL javaMemoryAlloc(unsigned long memoryNeeded);
+ // the following function names are constructed from method names in the calling java program
+ extern "C" EXPORT
+-jstring STDCALL Java_AStyleInterface_AStyleGetVersion(JNIEnv* env, jclass);
++jstring STDCALL Java_cc_arduino_packages_formatter_AStyleInterface_AStyleGetVersion(JNIEnv* env, jclass);
+ extern "C" EXPORT
+-jstring STDCALL Java_AStyleInterface_AStyleMain(JNIEnv* env,
++jstring STDCALL Java_cc_arduino_packages_formatter_AStyleInterface_AStyleMain(JNIEnv* env,
+                                                 jobject obj,
+                                                 jstring textInJava,
+                                                 jstring optionsJava);
diff --git a/srcpkgs/arduino/patches/disable-dependency-build.patch b/srcpkgs/arduino/patches/disable-dependency-build.patch
index ac27de7601e..970decc78e1 100644
--- a/srcpkgs/arduino/patches/disable-dependency-build.patch
+++ b/srcpkgs/arduino/patches/disable-dependency-build.patch
@@ -1,5 +1,5 @@
---- build/build.xml.orig	2019-02-26 02:16:33.845398910 +0100
-+++ build/build.xml	2019-02-26 02:22:56.667235290 +0100
+--- Arduino-1.8.9/build/build.xml.orig	2019-02-26 02:16:33.845398910 +0100
++++ Arduino-1.8.9/build/build.xml	2019-02-26 02:22:56.667235290 +0100
 @@ -649,15 +649,6 @@
    </target>
  
diff --git a/srcpkgs/arduino/template b/srcpkgs/arduino/template
index ed5954c9195..d877176f70c 100644
--- a/srcpkgs/arduino/template
+++ b/srcpkgs/arduino/template
@@ -1,9 +1,11 @@
 # Template file for 'arduino'
 pkgname=arduino
 version=1.8.9
-revision=1
+revision=2
 archs="x86_64* i686* aarch64* arm*"
-wrksrc=Arduino-$version
+wrksrc=$pkgname-$version
+create_wrksrc=yes
+build_wrksrc=Arduino-$version
 hostmakedepends="apache-ant unzip ImageMagick openjdk"
 depends="virtual?java-runtime avr-binutils avr-gcc avr-libc avrdude"
 short_desc="IDE for the arduino open-source electronics prototyping platform"
diff --git a/srcpkgs/aria2/patches/patch-src_libssl_compat_h.patch b/srcpkgs/aria2/patches/patch-src_libssl_compat_h.patch
deleted file mode 100644
index aedaa65199a..00000000000
--- a/srcpkgs/aria2/patches/patch-src_libssl_compat_h.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-$OpenBSD: patch-src_libssl_compat_h,v 1.1 2018/02/18 11:12:22 sthen Exp $
-
-Index: src/libssl_compat.h
---- src/libssl_compat.h.orig
-+++ src/libssl_compat.h
-@@ -43,7 +43,9 @@
- #define LIBRESSL_IN_USE 0
- #endif // !defined(LIBRESSL_VERSION_NUMBER)
- 
-+/* XXX really OPENSSL_110_API... */
- #define OPENSSL_101_API                                                        \
--  (!LIBRESSL_IN_USE && OPENSSL_VERSION_NUMBER >= 0x1010000fL)
-+  OPENSSL_VERSION_NUMBER >= 0x1010000fL ||                                     \
-+  (LIBRESSL_IN_USE && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
- 
- #endif // LIBSSL_COMPAT_H
diff --git a/srcpkgs/aria2/template b/srcpkgs/aria2/template
index 22dc750b8d5..4e0fdf6fa1c 100644
--- a/srcpkgs/aria2/template
+++ b/srcpkgs/aria2/template
@@ -1,7 +1,7 @@
 # Template file for 'aria2'
 pkgname=aria2
-version=1.34.0
-revision=5
+version=1.35.0
+revision=1
 build_style=gnu-configure
 configure_args="--with-openssl --with-libexpat --without-gnutls
  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
@@ -18,7 +18,7 @@ license="GPL-2.0-or-later"
 homepage="https://aria2.github.io/"
 changelog="https://raw.githubusercontent.com/aria2/aria2/master/NEWS"
 distfiles="https://github.com/aria2/aria2/releases/download/release-${version}/aria2-${version}.tar.xz"
-checksum=3a44a802631606e138a9e172a3e9f5bcbaac43ce2895c1d8e2b46f30487e77a3
+checksum=1e2b7fd08d6af228856e51c07173cfcf987528f1ac97e04c5af4a47642617dfd
 
 libaria2_package() {
 	short_desc="Multi-Protocol/multi-source download library"
diff --git a/srcpkgs/aribas/update b/srcpkgs/aribas/update
new file mode 100644
index 00000000000..fdee11819e4
--- /dev/null
+++ b/srcpkgs/aribas/update
@@ -0,0 +1 @@
+ignore="164"
diff --git a/srcpkgs/ark/template b/srcpkgs/ark/template
index c676d14d6c8..12103a51375 100644
--- a/srcpkgs/ark/template
+++ b/srcpkgs/ark/template
@@ -1,6 +1,6 @@
 # Template file for 'ark'
 pkgname=ark
-version=19.04.3
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-devel qt5-qmake kdoctools kconfig"
@@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/utilities/ark"
 distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=a06cc2937aa4ed41bab0a38344164f367b993a80bcd74011e4ab72643bfee8ee
+checksum=63fcec0a32d806cfc82fb1c136b5e037bfe75459b148ac08c00be7e45ac70c50
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" python kcoreaddons kparts"
diff --git a/srcpkgs/armadillo/template b/srcpkgs/armadillo/template
index e72d11d50ec..66cb6816785 100644
--- a/srcpkgs/armadillo/template
+++ b/srcpkgs/armadillo/template
@@ -1,6 +1,6 @@
 # Template file for 'armadillo'
 pkgname=armadillo
-version=9.500.2
+version=9.700.2
 revision=1
 build_style=cmake
 configure_args="-DDETECT_HDF5=$(vopt_if hdf5 ON OFF)"
@@ -11,7 +11,7 @@ maintainer="Julien Dehos <dehos@lisic.univ-littoral.fr>"
 license="Apache-2.0"
 homepage="http://arma.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/arma/${pkgname}-${version}.tar.xz"
-checksum=0b1a3e07a6ae4d98c69dd3a6a84262574c88e491c9215147236ee5bf957fd79e
+checksum=923f2b48974f707c9da3176aab8d370e8003de23277c17ca0e49fdf97fac08bd
 
 build_options="hdf5"
 desc_option_hdf5="HDF5 support"
@@ -19,10 +19,6 @@ if [ -z "$CROSS_BUILD" ]; then
 	build_options_default="hdf5"
 fi
 
-post_install() {
-	vlicense LICENSE.txt
-}
-
 armadillo-devel_package() {
 	depends="${makedepends}"
 	short_desc+=" - development files"
diff --git a/srcpkgs/asio/template b/srcpkgs/asio/template
index e5d25452725..98c37cd7cb1 100644
--- a/srcpkgs/asio/template
+++ b/srcpkgs/asio/template
@@ -1,7 +1,7 @@
 # Template file for 'asio'
 pkgname=asio
-version=1.13.0
-revision=2
+version=1.14.0
+revision=1
 build_style=gnu-configure
 makedepends="boost-devel"
 depends="boost-devel"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSL-1.0"
 homepage="http://think-async.com/Asio/"
 distfiles="${SOURCEFORGE_SITE}/asio/asio-${version}.tar.bz2"
-checksum=1efa97afbf4191eb3d0bb96026ac35ff2eb4a842866dfe8648fbd4829a9f7e39
+checksum=2e1be1a518a568525f79b5734d13731b6b4e4399ec576a0961db6e2d86112973
 
 pre_configure() {
 	case "$XBPS_TARGET_MACHINE" in
@@ -19,3 +19,7 @@ pre_configure() {
 				-i ${wrksrc}/include/asio/impl/error_code.ipp
 	esac
 }
+
+post_install() {
+	vlicense LICENSE_1_0.txt
+}
diff --git a/srcpkgs/aspell-en/template b/srcpkgs/aspell-en/template
index 100c26721a6..09a1c2279d3 100644
--- a/srcpkgs/aspell-en/template
+++ b/srcpkgs/aspell-en/template
@@ -1,7 +1,8 @@
 # Template file for 'aspell-en'
 pkgname=aspell-en
-version=2018.04.16
+version=2019.10.06
 revision=1
+archs=noarch
 wrksrc="aspell6-en-${version}-0"
 build_style=configure
 hostmakedepends="aspell-devel"
@@ -10,8 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="http://aspell.net/"
 distfiles="${GNU_SITE}/aspell/dict/en/aspell6-en-${version}-0.tar.bz2"
-checksum=f11071e74b0c0753f4afabf024941a5c3a96bafe3879211ebd47bc34e76fbd2f
-archs=noarch
+checksum=24334b4daac6890a679084f4089e1ce7edbe33c442ace776fa693d8e334f51fd
 
 words-en_package() {
 	short_desc="English dictionary word list"
diff --git a/srcpkgs/aspell/template b/srcpkgs/aspell/template
index d1b6ca497bc..b3ccbeeaef8 100644
--- a/srcpkgs/aspell/template
+++ b/srcpkgs/aspell/template
@@ -1,6 +1,6 @@
 # Template file for 'aspell'
 pkgname=aspell
-version=0.60.7
+version=0.60.8
 revision=1
 build_style=gnu-configure
 configure_args="--enable-compile-in-filters"
@@ -9,11 +9,11 @@ makedepends="ncurses-devel"
 depends="perl"
 short_desc="Spell checker with good multi-language support"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
+license="LGPL-2.1-only"
 homepage="http://aspell.net/"
 changelog="http://aspell.net/man-html/ChangeLog.html"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=5ca8fc8cb0370cc6c9eb5b64c6d1bc5d57b3750dbf17887726c3407d833b70e4
+checksum=f9b77e515334a751b2e60daab5db23499e26c9209f5e7b7443b05235ad0226f2
 
 pre_configure() {
 	# XXX workaround ctor/dtor ordering with musl
diff --git a/srcpkgs/assimp/patches/0001-glext_h_conflict.patch b/srcpkgs/assimp/patches/0001-glext_h_conflict.patch
deleted file mode 100644
index 06c69d59d20..00000000000
--- a/srcpkgs/assimp/patches/0001-glext_h_conflict.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- tools/assimp_qt_viewer/glview.cpp	2017-07-28 22:33:41.000000000 +0200
-+++ tools/assimp_qt_viewer/glview.cpp	2017-08-05 09:47:00.697027943 +0200
-@@ -3,6 +3,11 @@
- /// \author smal.root@gmail.com
- /// \date   2016
-
-+#if defined(__arm__)
-+// Avoid conflict for types GLsizeiptr and GLintptr
-+#define GL_VERSION_1_5
-+
-+#endif
- #include "glview.hpp"
- 
- // Header files, OpenGL.
diff --git a/srcpkgs/assimp/patches/musl.patch b/srcpkgs/assimp/patches/musl.patch
new file mode 100644
index 00000000000..f2cf5b1a5e9
--- /dev/null
+++ b/srcpkgs/assimp/patches/musl.patch
@@ -0,0 +1,11 @@
+--- contrib/zip/src/zip.h	2019-09-24 19:28:59.000000000 +0200
++++ -	2019-09-29 00:15:02.408202128 +0200
+@@ -20,7 +20,7 @@
+ #endif
+ 
+ #if !defined(_SSIZE_T_DEFINED) && !defined(_SSIZE_T_DEFINED_) &&               \
+-    !defined(_SSIZE_T) && !defined(_SSIZE_T_) && !defined(__ssize_t_defined)
++    !defined(_SSIZE_T) && !defined(_SSIZE_T_) && !defined(__ssize_t_defined) && !defined(__DEFINED_ssize_t)
+ #define _SSIZE_T
+ // 64-bit Windows is the only mainstream platform
+ // where sizeof(long) != sizeof(void*)
diff --git a/srcpkgs/assimp/template b/srcpkgs/assimp/template
index 1b41014d735..ec6a61c9bcd 100644
--- a/srcpkgs/assimp/template
+++ b/srcpkgs/assimp/template
@@ -1,23 +1,24 @@
 # Template file for 'assimp'
 pkgname=assimp
-version=4.1.0
-revision=1
+version=5.0.0
+revision=2
 build_style=cmake
 configure_args="-DASSIMP_BUILD_SAMPLES=OFF"
-hostmakedepends="cmake pkg-config qt5-qmake qt5-host-tools qt5-devel"
-makedepends="boost-devel libgomp-devel devil-devel qt5-devel minizip-devel zziplib-devel"
+hostmakedepends="pkg-config"
+makedepends="boost-devel libgomp-devel devil-devel minizip-devel zziplib-devel"
 short_desc="Import library for various well-known 3D model formats"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="3-clause-BSD"
 homepage="http://assimp.sourceforge.net/"
 distfiles="https://github.com/assimp/assimp/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=3520b1e9793b93a2ca3b797199e16f40d61762617e072f2d525fad70f9678a71
+checksum=b0110a91650d6bb4000e3d5c2185bf77b0ff0a2e7a284bc2c4af81b33988b63c
 depends="libassimp>=${version}_${revision}"
 
 post_install() {
-	# Install assimp_qt_viewer
-	vbin build/tools/assimp_qt_viewer/assimp_qt_viewer
 	vlicense LICENSE
+	# Copy contrib/stb_image header file (required for assimp_qt_viewer)
+	vmkdir usr/include/assimp/contrib/stb_image
+	vcopy contrib/stb_image/stb_image.h usr/include/assimp/contrib/stb_image
 
 	# Create command documentation
 	cd doc
diff --git a/srcpkgs/assimp_qt_viewer/template b/srcpkgs/assimp_qt_viewer/template
new file mode 100644
index 00000000000..11838e028ae
--- /dev/null
+++ b/srcpkgs/assimp_qt_viewer/template
@@ -0,0 +1,24 @@
+# Template file for 'assimp_qt_viewer'
+pkgname=assimp_qt_viewer
+version=5.0.0
+revision=1
+_gitrev=b2b86036a860297b86b096dba009aebeaf5a2503
+wrksrc="${pkgname}-${_gitrev}"
+build_style=cmake
+build_wrksrc="${pkgname}"
+hostmakedepends="qt5-host-tools qt5-devel"
+makedepends="qt5-devel libassimp-devel"
+short_desc="Qt-Widget-based viewer for assimp"
+maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+license="MIT"
+homepage="https://github.com/assimp/assimp_qt_viewer"
+distfiles="https://github.com/assimp/${pkgname}/archive/${_gitrev}.tar.gz>${pkgname}-${version}.tar.gz"
+checksum=6c65e214f0a49c446a479b98b1a4795c1b79103410403ad38e28c4846eb76996
+
+pre_build() {
+	ln -fsv ${XBPS_CROSS_BASE}/usr/include/assimp/contrib contrib
+}
+
+post_install() {
+	vlicense ${wrksrc}/LICENSE
+}
diff --git a/srcpkgs/asunder/template b/srcpkgs/asunder/template
index 79b9ae35b57..cfed1debf04 100644
--- a/srcpkgs/asunder/template
+++ b/srcpkgs/asunder/template
@@ -1,6 +1,6 @@
 # Template file for 'asunder'
 pkgname=asunder
-version=2.9.3
+version=2.9.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config"
@@ -9,11 +9,11 @@ makedepends="gtk+-devel libcddb-devel"
 # bin/mpcenc (Musepack)
 depends="cdparanoia flac lame opus vorbis-tools wavpack"
 short_desc="Graphical Audio CD ripper and encoder"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://littlesvr.ca/asunder/"
 distfiles="http://littlesvr.ca/asunder/releases/asunder-${version}.tar.bz2"
-checksum=8533c634802a6e830c887015eb169f4807de6539ae3d373620c81be05a886098
+checksum=6070646e53d0cd59d1d20fc0e551306c45b3b57846477e9ac473b840d34e8caf
 
 pre_build() {
 	sed -i 's:cd syslogng && $(MAKE) install:true:' Makefile.in
diff --git a/srcpkgs/at-spi2-atk/template b/srcpkgs/at-spi2-atk/template
index 37bc305f58f..9d675e3752b 100644
--- a/srcpkgs/at-spi2-atk/template
+++ b/srcpkgs/at-spi2-atk/template
@@ -1,6 +1,6 @@
 # Template file for 'at-spi2-atk'
 pkgname=at-spi2-atk
-version=2.32.0
+version=2.34.0
 revision=1
 build_style=meson
 hostmakedepends="libtool pkg-config intltool glib-devel"
@@ -10,7 +10,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0b51e6d339fa2bcca3a3e3159ccea574c67b107f1ac8b00047fa60e34ce7a45c
+checksum=3a9a7e96a1eb549529e60a42201dd78ccce413d9c1706e16351cc5288e064500
 
 at-spi2-atk-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/at-spi2-core/template b/srcpkgs/at-spi2-core/template
index 9de5050734d..b383fe99bed 100644
--- a/srcpkgs/at-spi2-core/template
+++ b/srcpkgs/at-spi2-core/template
@@ -1,7 +1,7 @@
 # Template file for 'at-spi2-core'
 pkgname=at-spi2-core
-version=2.32.1
-revision=2
+version=2.34.0
+revision=1
 build_style=meson
 build_helper="gir"
 hostmakedepends="pkg-config dbus glib-devel"
@@ -12,7 +12,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/at-spi2-core"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3c2aa937ebfaca2c86569bce9b16a34fbe20d69ef0c58846313b1c42f53b0d53
+checksum=d629cdbd674e539f8912028512af583990938c7b49e25184c126b00121ef11c6
 
 # Package build options
 build_options="gir"
diff --git a/srcpkgs/atk/patches/fix-cross-gir.patch b/srcpkgs/atk/patches/fix-cross-gir.patch
deleted file mode 100644
index c249c72c542..00000000000
--- a/srcpkgs/atk/patches/fix-cross-gir.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/atk/meson.build b/atk/meson.build
-index 616a3e6..941ded8 100644
---- atk/meson.build
-+++ atk/meson.build
-@@ -137,7 +137,7 @@ libatk_dep = declare_dependency(link_with: libatk,
-                                 dependencies: gobject_dep,
-                                 sources: atk_enum_h)
- 
--if not meson.is_cross_build() and get_option('introspection')
-+if get_option('introspection')
-   gnome.generate_gir(libatk,
-                      sources: atk_sources + atk_headers + [ atk_enum_h ] + [ atk_version_h ],
-                      namespace: 'Atk',
-
diff --git a/srcpkgs/atk/template b/srcpkgs/atk/template
index 6d5d2399df7..7c14b116598 100644
--- a/srcpkgs/atk/template
+++ b/srcpkgs/atk/template
@@ -1,7 +1,7 @@
 # Template file for 'atk'
 pkgname=atk
-version=2.32.0
-revision=2
+version=2.34.1
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir true false)"
@@ -12,7 +12,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://developer.gnome.org/atk/"
 distfiles="${GNOME_SITE}/atk/${version%.*}/atk-${version}.tar.xz"
-checksum=cb41feda7fe4ef0daa024471438ea0219592baf7c291347e5a858bb64e4091cc
+checksum=d4f0e3b3d21265fcf2bc371e117da51c42ede1a71f6db1c834e6976bb20997cb
 
 # Package build options
 build_options="gir"
diff --git a/srcpkgs/atlantis/template b/srcpkgs/atlantis/template
index 5801c6a8711..3c56b32df97 100644
--- a/srcpkgs/atlantis/template
+++ b/srcpkgs/atlantis/template
@@ -1,6 +1,6 @@
 # Template file for 'atlantis'
 pkgname=atlantis
-version=0.8.3
+version=0.9.0
 revision=1
 build_style=go
 go_import_path=github.com/runatlantis/atlantis
@@ -11,7 +11,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://runatlantis.io"
 distfiles="https://github.com/runatlantis/atlantis/archive/v${version}.tar.gz"
-checksum=26304b0510544ec883f0bb08f7c60794062b4930e6cbaa3396f6d0e66aa813e0
+checksum=ff3b8b38c59c54ff9ff2dfd0c53c69af5308a6c6f64f92d1c4ece87a7d35f1c6
 
 pre_build() {
 	cd $GOSRCPATH
diff --git a/srcpkgs/atomix/template b/srcpkgs/atomix/template
index 18b09fa3650..78c47f01303 100644
--- a/srcpkgs/atomix/template
+++ b/srcpkgs/atomix/template
@@ -1,6 +1,6 @@
 # Template file for 'atomix'
 pkgname=atomix
-version=3.32.1
+version=3.34.0
 revision=1
 build_style=meson
 hostmakedepends="glib-devel itstool pkg-config"
@@ -10,4 +10,4 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Atomix"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=74caa733e86c3410398ae79df536f33119d5c7c373821cbe34fd6463eba997a7
+checksum=0054c3b3830f1fe4383e17d716e6034b608859f4352a102130c13156894a2041
diff --git a/srcpkgs/atril/template b/srcpkgs/atril/template
index a99680cd2c9..84be1535d7d 100644
--- a/srcpkgs/atril/template
+++ b/srcpkgs/atril/template
@@ -1,7 +1,7 @@
 # Template file for 'atril'
 pkgname=atril
-version=1.22.1
-revision=2
+version=1.22.2
+revision=1
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-schemas-compile --enable-djvu
@@ -18,7 +18,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://mate-desktop.org"
 distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=208544f6cce4bb5c0bf423a0d618929e35527d1c5ed120a5aa19f2a7a77e5c44
+checksum=dc692b9c2a2b8bdd7c36631a9f50fb19335f9ce36156464e967a7fdde7478786
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/attica/template b/srcpkgs/attica/template
index 522b54b72fc..4b045707063 100644
--- a/srcpkgs/attica/template
+++ b/srcpkgs/attica/template
@@ -1,6 +1,6 @@
 # Template file for 'attica'
 pkgname=attica
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/kdesupport/attica"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9d3ad34c17223333b5a77144cc5a9d941cbb7baa01ab4a2ffe34ae9398c90dde
+checksum=c064af18478386da6a8eee16a9af626e300a4f0d1755b1598c910e2628977a37
 
 attica-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/audacious-plugins/template b/srcpkgs/audacious-plugins/template
index d97bf72f30e..a50d65e7819 100644
--- a/srcpkgs/audacious-plugins/template
+++ b/srcpkgs/audacious-plugins/template
@@ -1,14 +1,16 @@
 # Template file for 'audacious-plugins'
 pkgname=audacious-plugins
 version=3.10.1
-revision=3
+revision=4
 build_style=gnu-configure
+configure_args="$(vopt_enable gtk) $(vopt_enable qt)"
 hostmakedepends="pkg-config"
 makedepends="audacious-devel alsa-lib-devel pulseaudio-devel jack-devel
  lame-devel libvorbis-devel libflac-devel mpg123-devel faad2-devel ffmpeg-devel
  libmodplug-devel fluidsynth-devel libcdio-paranoia-devel wavpack-devel libnotify-devel
- libcurl-devel libmtp-devel neon-devel libmms-devel gtk+-devel libxml2-devel
- libbs2b-devel libsoxr-devel libsidplayfp-devel"
+ libcurl-devel libmtp-devel neon-devel libmms-devel libxml2-devel
+ libbs2b-devel libsoxr-devel libsidplayfp-devel libcue-devel
+ $(vopt_if gtk gtk+-devel) $(vopt_if qt 'qt5-devel qt5-multimedia-devel')"
 short_desc="Plugins for the Audacious media player"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
@@ -16,6 +18,11 @@ homepage="https://audacious-media-player.org/"
 distfiles="https://distfiles.audacious-media-player.org/${pkgname}-${version}.tar.bz2"
 checksum=eec3177631f99729bf0e94223b627406cc648c70e6646e35613c7b55040a2642
 
+build_options="gtk qt"
+build_options_default="gtk"
+desc_option_gtk="Enable support for the GTK+2 GUI toolkit"
+vopt_conflict gtk qt
+
 post_install() {
 	vlicense COPYING
 }
diff --git a/srcpkgs/audacious/template b/srcpkgs/audacious/template
index 69528553607..e925bb3683f 100644
--- a/srcpkgs/audacious/template
+++ b/srcpkgs/audacious/template
@@ -1,11 +1,12 @@
 # Template file for 'audacious'
 pkgname=audacious
 version=3.10.1
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--enable-thunar"
-hostmakedepends="pkg-config glib-devel"
-makedepends="libSM-devel gtk+-devel dbus-glib-devel libguess-devel"
+configure_args="$(vopt_enable gtk) $(vopt_enable qt)"
+hostmakedepends="pkg-config glib-devel $(vopt_if qt qt5-host-tools)"
+makedepends="libSM-devel dbus-glib-devel libguess-devel $(vopt_if gtk gtk+-devel)
+ $(vopt_if qt qt5-devel)"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Lightweight, advanced audio player focused on audio quality"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -14,6 +15,11 @@ homepage="https://audacious-media-player.org/"
 distfiles="https://distfiles.${pkgname}-media-player.org/${pkgname}-${version}.tar.bz2"
 checksum=8366e840bb3c9448c2cf0cf9a0800155b0bd7cc212a28ba44990c3d2289c6b93
 
+build_options="gtk qt"
+build_options_default="gtk"
+desc_option_gtk="Enable support for the GTK+2 GUI toolkit"
+vopt_conflict gtk qt
+
 post_install() {
 	vlicense COPYING
 }
@@ -24,6 +30,6 @@ audacious-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		vmove usr/lib/*.so
+		vmove "usr/lib/*.so"
 	}
 }
diff --git a/srcpkgs/autofs/template b/srcpkgs/autofs/template
index 6b9a6477107..67f298b2dc4 100644
--- a/srcpkgs/autofs/template
+++ b/srcpkgs/autofs/template
@@ -1,7 +1,7 @@
 # Template file for 'autofs'
 pkgname=autofs
-version=5.1.5
-revision=4
+version=5.1.6
+revision=1
 build_style=gnu-configure
 make_build_args="DONTSTRIP=1"
 configure_args="--with-libtirpc --with-mapdir=/etc/autofs --sbindir=/usr/bin"
@@ -11,9 +11,9 @@ makedepends="libtirpc-devel libxml2-devel"
 short_desc="Kernel-based automounter for Linux"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
-homepage="${KERNEL_SITE}/daemons/autofs"
+homepage="https://www.kernel.org/pub/linux/daemons/autofs"
 distfiles="${KERNEL_SITE}/daemons/autofs/v5/autofs-${version}.tar.xz"
-checksum=23afdad9e2fd6d41b1900be8cfecfd5aae0ad174c7708ff685ec27e280f9c0da
+checksum=dddee3d9b7388ce6cb7432832dfade25b07ef68ad48dcce01cf247b26a10caef
 
 CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/gssglue -I${XBPS_CROSS_BASE}/usr/include/tirpc"
 
diff --git a/srcpkgs/avidemux/template b/srcpkgs/avidemux/template
index 7cf9d1d49d2..84fc747185c 100644
--- a/srcpkgs/avidemux/template
+++ b/srcpkgs/avidemux/template
@@ -1,7 +1,7 @@
 # Template file for 'avidemux'
 pkgname=avidemux
-version=2.7.3
-revision=3
+version=2.7.4
+revision=1
 wrksrc="${pkgname}_${version}"
 # Can't be compiled for aarch64, arm* or mips*
 archs="x86_64* i686*"
@@ -18,7 +18,7 @@ license="GPL-2.0-or-later"
 homepage="http://avidemux.sourceforge.net/"
 changelog="http://avidemux.sourceforge.net/news.html"
 distfiles="${SOURCEFORGE_SITE}/avidemux/avidemux/${version}/${pkgname}_${version}.tar.gz"
-checksum=8d768e09cb646e4aa954d3332417fc565261590fb4944bccb917c192adada29f
+checksum=7db0ac01c8255279a2c360ecb2725c27ea8a2c5bd1f38aeafabfed33ea588da9
 
 do_build() {
 	MAKEFLAGS=${makejobs} \
diff --git a/srcpkgs/avr-gcc/template b/srcpkgs/avr-gcc/template
index 1f415c4a4af..c23673f9689 100644
--- a/srcpkgs/avr-gcc/template
+++ b/srcpkgs/avr-gcc/template
@@ -1,14 +1,14 @@
-# Template build file for 'avr-gcc'
+# Template file for 'avr-gcc'
 pkgname=avr-gcc
-version=8.2.0
+version=9.2.0
 revision=1
-short_desc="The GNU C Compiler for AVR"
+wrksrc="gcc-$version"
+short_desc="GNU C Compiler for AVR"
 maintainer="allan <mail@may.mooo.com>"
-homepage="http://gcc.gnu.org"
 license="GFDL-1.2, GPL-3, LGPL-2.1"
+homepage="http://gcc.gnu.org"
 distfiles="${GNU_SITE}/gcc/gcc-${version}/gcc-${version}.tar.xz"
-checksum=196c3c04ba2613f893283977e6011b2345d1cd1af9abeac58e916b1aab3e0080
-wrksrc="gcc-$version"
+checksum=ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
 
 hostmakedepends="flex avr-binutils"
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/aws-cli/template b/srcpkgs/aws-cli/template
index 125e1c9c79a..4e5e200e3f9 100644
--- a/srcpkgs/aws-cli/template
+++ b/srcpkgs/aws-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'aws-cli'
 pkgname=aws-cli
-version=1.16.169
+version=1.16.253
 revision=1
 archs=noarch
 wrksrc="aws-cli-${version}"
@@ -14,10 +14,9 @@ maintainer="Robert Lowry <bobertlo@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/aws/aws-cli"
 distfiles="https://github.com/aws/aws-cli/archive/${version}.tar.gz"
-checksum=eaec519dbb638d9aeaf9a9d451d011e64e0657cd71bf961a2c2544f175d00d2e
+checksum=aacd3c0faa3b8ce6fda3c58fac6e5d29c7136fe67d56408ee39a64b63ed9485b
 
 post_install() {
-	vlicense LICENSE.txt
 	vinstall bin/aws_bash_completer 644 usr/share/bash-completion/completions aws
 	vinstall bin/aws_zsh_completer.sh 644 usr/share/zsh/site-functions _aws
 	rm "${DESTDIR}/usr/bin/aws_bash_completer"
diff --git a/srcpkgs/axel/template b/srcpkgs/axel/template
index 44f1c979acd..4e5f8ccd348 100644
--- a/srcpkgs/axel/template
+++ b/srcpkgs/axel/template
@@ -1,6 +1,6 @@
 # Template file for 'axel'
 pkgname=axel
-version=2.17.5
+version=2.17.6
 revision=1
 build_style=gnu-configure
 conf_files="/etc/axelrc"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/axel-download-accelerator/axel"
 changelog="https://raw.githubusercontent.com/axel-download-accelerator/axel/master/ChangeLog"
 distfiles="https://github.com/axel-download-accelerator/axel/releases/download/v${version}/axel-${version}.tar.xz"
-checksum=5c5c682617d498071ff9083029fcecc2c2fdeeedc366c35d2bdf8663355616cc
+checksum=24ab549021bdfca01ad5e8e95b706869dd30fe9ab1043da4cbb9dff89edc267d
 
 post_install() {
 	vconf doc/axelrc.example axelrc
diff --git a/srcpkgs/azote/template b/srcpkgs/azote/template
index 0d5daa6bdd4..0a23c209551 100644
--- a/srcpkgs/azote/template
+++ b/srcpkgs/azote/template
@@ -1,18 +1,18 @@
 # Template file for 'azote'
 pkgname=azote
-version=1.3.0
+version=1.5.1
 revision=1
 archs=noarch
 build_style=python3-module
 pycompile_module="azote"
 hostmakedepends="python3-setuptools"
-depends="python3>=3.5 python3-setuptools python3-gobject python3-Pillow gtk+3 feh xrandr wmctrl"
+depends="python3>=3.5 python3-setuptools python3-gobject python3-Pillow python3-send2trash gtk+3 feh xrandr wmctrl"
 short_desc="Wallpaper manager for Sway, i3 and some other WMs"
 maintainer="Piotr Miller <nwg.piotr@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/nwg-piotr/azote"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=fb66f06b8a53fbb9bb64b0a0260a187dc4f5b2a313f90e3f349bd5440e021334
+checksum=1da35263cef47e7dd656de4b3f422a277db8c6b0d4d9b1256767a2446722cdb2
 
 post_install() {
 	vmkdir usr/bin
diff --git a/srcpkgs/azpainter/template b/srcpkgs/azpainter/template
index 4e3bd5dc449..27651577200 100644
--- a/srcpkgs/azpainter/template
+++ b/srcpkgs/azpainter/template
@@ -1,6 +1,6 @@
 # Template file for 'azpainter'
 pkgname=azpainter
-version=2.1.3
+version=2.1.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake"
@@ -10,8 +10,8 @@ short_desc="Full-color painting software for illustration drawing"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-3.0-or-later"
 homepage="https://osdn.net/projects/azpainter/"
-distfiles="https://acc.dl.osdn.jp/azpainter/70132/${pkgname}-${version}.tar.xz"
-checksum=8716a47f3695ba3c6e230415c0d19f082bc2d900213ff1271bfd81496e02e300
+distfiles="https://osdn.net/frs/redir.php?m=rwthaachen&f=azpainter%2F71051%2Fazpainter-${version}.tar.xz"
+checksum=200dba9b443888054172fd13c8d9045d1556210834a46edaa0267bc80a2bad30
 
 CPPFLAGS="-I${XBPS_CROSS_BASE}/usr/include/freetype2"
 
diff --git a/srcpkgs/babeld/patches/45.patch b/srcpkgs/babeld/patches/45.patch
new file mode 100644
index 00000000000..089e35f8d54
--- /dev/null
+++ b/srcpkgs/babeld/patches/45.patch
@@ -0,0 +1,71 @@
+From 36121c1e67fb5a60a35fed0faa37297cd97c9ffc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fabian=20Bl=C3=A4se?= <fabian@blaese.de>
+Date: Thu, 19 Sep 2019 01:16:46 +0200
+Subject: [PATCH] Remove src_plen assignments which break v4mapped encoding
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+These assignments were introduced in f8bce04, probably
+to ensure that src_plen doesn't contain any leftovers from
+earlier revisions when source specific wasn't done via sub-TLVs.
+
+This however breaks v4mapped encoding as a prefix length of 0
+for IPv4 routes is represented as src_plen = 96. This offset is
+already added outside of the affected functions and therefore
+gets overwritten by this assignment.
+
+Both functions contain an additional check if the message contains
+ipv4 addresses, but as this check is only executed if the message has
+a source-specific sub-TLV, the offset isn't added for non source-specific
+routes.
+
+Because the offset is already added outside of the subtlv parsing
+functions, this additional check is also removed, as it would otherwise
+break IPv4 source specifics by adding the IPv4 offset two times.
+
+Signed-off-by: Fabian Bläse <fabian@blaese.de>
+---
+ message.c | 8 --------
+ 1 file changed, 8 deletions(-)
+
+diff --git a/message.c b/message.c
+index 0f6ca19d..78f9aa93 100644
+--- a/message.c
++++ b/message.c
+@@ -137,8 +137,6 @@ parse_update_subtlv(struct interface *ifp, int metric, int ae,
+         }
+     }
+ 
+-    *src_plen = 0;
+-
+     while(i < alen) {
+         type = a[i];
+         if(type == SUBTLV_PAD1) {
+@@ -170,8 +168,6 @@ parse_update_subtlv(struct interface *ifp, int metric, int ae,
+                                 len - 1, src_prefix);
+             if(rc < 0)
+                 goto fail;
+-            if(ae == 1)
+-                (*src_plen) += 96;
+         } else {
+             debugf("Received unknown%s Update sub-TLV %d.\n",
+                    (type & 0x80) != 0 ? " mandatory" : "", type);
+@@ -305,8 +301,6 @@ parse_request_subtlv(int ae, const unsigned char *a, int alen,
+ {
+     int type, len, i = 0;
+ 
+-    *src_plen = 0;
+-
+     while(i < alen) {
+         type = a[0];
+         if(type == SUBTLV_PAD1) {
+@@ -336,8 +330,6 @@ parse_request_subtlv(int ae, const unsigned char *a, int alen,
+                                 len - 1, src_prefix);
+             if(rc < 0)
+                 goto fail;
+-            if(ae == 1)
+-                (*src_plen) += 96;
+         } else {
+             debugf("Received unknown%s Route Request sub-TLV %d.\n",
+                    ((type & 0x80) != 0) ? " mandatory" : "", type);
diff --git a/srcpkgs/babeld/template b/srcpkgs/babeld/template
index a810d6a6522..7707dda1712 100644
--- a/srcpkgs/babeld/template
+++ b/srcpkgs/babeld/template
@@ -1,7 +1,7 @@
 # Template file for 'babeld'
 pkgname=babeld
-version=1.8.5
-revision=1
+version=1.9.1
+revision=3
 wrksrc=babeld-babeld-${version}
 build_style=gnu-makefile
 short_desc="Babel loop-avoiding distance-vector routing daemon"
@@ -9,7 +9,12 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="MIT"
 homepage="https://www.irif.fr/~jch/software/babel/"
 distfiles="https://github.com/jech/babeld/archive/babeld-${version}.tar.gz"
-checksum=91192a7d6f7e99ad6a68d696c2e7b174f8e1413c693d4dc31c77d04e24b64f3c
+checksum=16e18dbd9f8442feaa68487f5919a8ff8f7d95c62a9c7a3c42b7adf31bd4a9b3
+patch_args="-Np1"
+
+pre_build() {
+	echo ${version}-${revision} > version
+}
 
 do_install() {
 	vbin babeld
diff --git a/srcpkgs/backblaze-b2/template b/srcpkgs/backblaze-b2/template
index d1136a5f750..48d5a95a5f7 100644
--- a/srcpkgs/backblaze-b2/template
+++ b/srcpkgs/backblaze-b2/template
@@ -1,7 +1,7 @@
 # Template file for 'backblaze-b2'
 pkgname=backblaze-b2
-version=1.4.0
-revision=3
+version=1.4.2
+revision=1
 archs=noarch
 wrksrc="B2_Command_Line_Tool-${version}"
 build_style=python2-module
@@ -14,7 +14,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 homepage="https://github.com/Backblaze/B2_Command_Line_Tool"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=813bf3334b8986fc5592cff8e4e79faca46c957204d31ef4ba520080c5d315eb
+checksum=2d6382b94af59dcaa44dd546252807e0364d1b61f169584829ebbf82458e7078
 
 post_install() {
 	# Remove test directory polluting site-packages
diff --git a/srcpkgs/backintime-qt/template b/srcpkgs/backintime-qt/template
new file mode 100644
index 00000000000..82f39c652f8
--- /dev/null
+++ b/srcpkgs/backintime-qt/template
@@ -0,0 +1,19 @@
+# Template file for 'backintime-qt'
+pkgname=backintime-qt
+version=1.2.1
+revision=1
+archs=noarch
+wrksrc=backintime-${version}
+build_wrksrc="qt"
+build_style=configure
+configure_args="--python3"
+pycompile_dirs="/usr/share/backintime"
+hostmakedepends="python3"
+depends="backintime python3-PyQt5 python3-PyQt5-dbus libnotify xdpyinfo"
+short_desc="Qt Gui for backintime"
+maintainer="Alpicoid <alpicoid@tuta.io>"
+license="GPL-2.0-only"
+homepage="https://github.com/bit-team/backintime"
+distfiles="https://github.com/bit-team/backintime/releases/download/v${version}/backintime-${version}.tar.gz"
+checksum=eef2aa4f43ac23fb0d45239a4bb2f7e5025afdca2ae4e6d6d9d6e722e8b17644
+pycompile_version="$py3_ver"
diff --git a/srcpkgs/backintime/template b/srcpkgs/backintime/template
index c66dd8521a5..1be1c42e32a 100644
--- a/srcpkgs/backintime/template
+++ b/srcpkgs/backintime/template
@@ -1,17 +1,18 @@
 # Template file for 'backintime'
 pkgname=backintime
-version=1.1.24
+version=1.2.1
 revision=1
 archs=noarch
 build_wrksrc="common"
 build_style=configure
 configure_args="--python3"
-hostmakedepends="python3"
-depends="python3 rsync python3-dbus"
 pycompile_dirs="/usr/share/backintime"
-short_desc="A simple backup tool for Linux"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+hostmakedepends="python3"
+depends="python3 rsync python3-dbus python3-keyring"
+short_desc="Simple backup tool for Linux"
+maintainer="Alpicoid <alpicoid@tuta.io>"
+license="GPL-2.0-only"
 homepage="https://github.com/bit-team/backintime"
 distfiles="https://github.com/bit-team/backintime/releases/download/v${version}/backintime-${version}.tar.gz"
-checksum=72b9324314c70cc55bac04e5db8ca300ae98bf24f63334d3d9cd297a6b988308
+checksum=eef2aa4f43ac23fb0d45239a4bb2f7e5025afdca2ae4e6d6d9d6e722e8b17644
+pycompile_version="$py3_ver"
diff --git a/srcpkgs/baloo-widgets5/template b/srcpkgs/baloo-widgets5/template
index 03aa917a695..41196ccc6d1 100644
--- a/srcpkgs/baloo-widgets5/template
+++ b/srcpkgs/baloo-widgets5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo-widgets5'
 pkgname=baloo-widgets5
-version=19.08.0
+version=19.08.2
 revision=1
 wrksrc="baloo-widgets-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://cgit.kde.org/baloo-widgets.git/"
 distfiles="${KDE_SITE}/applications/${version}/src/baloo-widgets-${version}.tar.xz"
-checksum=3ef81f74ce6fccd6eaf60e0dfd18fe660ac357e75c4715801da9bb3a203a6008
+checksum=529f3b587098eb9b7d1aaa8b311f98c58d16ed88384fa0900f9fb9f8e242c070
 
 baloo-widgets5-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/baloo5/template b/srcpkgs/baloo5/template
index 38a78d381d2..da35cc5ece3 100644
--- a/srcpkgs/baloo5/template
+++ b/srcpkgs/baloo5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo5'
 pkgname=baloo5
-version=5.61.0
+version=5.63.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/Baloo"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=dd559e06237843f51d68eb5001b835037d4b2f6d62b7dc4d040961f9863632f1
+checksum=90ad2f2e13a33b74030fb4b26e46aa699525009efe30cf0c09283dfa52d818e2
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kcoreaddons"
@@ -26,6 +26,7 @@ baloo5-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/qt5/mkspecs
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
 	}
diff --git a/srcpkgs/baresip/template b/srcpkgs/baresip/template
index a2e45356dad..606eb5a9119 100644
--- a/srcpkgs/baresip/template
+++ b/srcpkgs/baresip/template
@@ -1,6 +1,6 @@
 # Template file for 'baresip'
 pkgname=baresip
-version=0.6.3
+version=0.6.4
 revision=1
 build_style=gnu-makefile
 make_build_args="LIBRE_MK=${XBPS_CROSS_BASE}/usr/share/re/re.mk
@@ -25,7 +25,7 @@ maintainer="JohnZ <johnz@posteo.net>"
 license="BSD-3-Clause"
 homepage="http://www.creytiv.com/baresip.html"
 distfiles="http://www.creytiv.com/pub/baresip-${version}.tar.gz"
-checksum=c8005466b4947e28bc48ceb3d99608c782109970c2653b9d0eb0900d4695300c
+checksum=61710bd1bec406ae1faf167c5743bad8eef9ced5152a3943b94d7e1cf9597581
 
 # Package build options
 build_options="gtk video"
diff --git a/srcpkgs/barrier/template b/srcpkgs/barrier/template
index f636aa30b07..6d2072c98a7 100644
--- a/srcpkgs/barrier/template
+++ b/srcpkgs/barrier/template
@@ -1,6 +1,6 @@
 # Template file for 'barrier'
 pkgname=barrier
-version=2.3.1
+version=2.3.2
 revision=1
 build_style=cmake
 configure_args="-DBARRIER_REVISION=00000000 -DBARRIER_VERSION_STAGE=RELEASE"
@@ -12,7 +12,7 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-only"
 homepage="https://github.com/debauchee/barrier"
 distfiles="https://github.com/debauchee/barrier/archive/v${version}.tar.gz"
-checksum=adf6df33a4a07e05784e825a2549ff22fe288aa184f1caee2c2ffddb2cbcf249
+checksum=6b92a70c5f4d625065842d133386982ec2ad1db2a809af47e46ab8ce2acd39b5
 
 do_install() {
 	vbin build/bin/barrier
diff --git a/srcpkgs/base-files/files/66-kvm.rules b/srcpkgs/base-files/files/66-kvm.rules
index c2f7317aacc..582fc57ede4 100644
--- a/srcpkgs/base-files/files/66-kvm.rules
+++ b/srcpkgs/base-files/files/66-kvm.rules
@@ -1 +1 @@
-KERNEL=="kvm", GROUP="kvm", MODE="0660"
+KERNEL=="kvm", GROUP="kvm", MODE="0660", OPTIONS+="static_node=kvm"
diff --git a/srcpkgs/base-files/files/vkpurge.8 b/srcpkgs/base-files/files/vkpurge.8
index a4a1814a427..7974f4d0eb2 100644
--- a/srcpkgs/base-files/files/vkpurge.8
+++ b/srcpkgs/base-files/files/vkpurge.8
@@ -16,7 +16,7 @@
 .Sh DESCRIPTION
 The
 .Nm
-utility lists and removes removable kernel versions leaved
+utility lists and removes removable kernel versions left
 behind by
 .Xr xbps-install 1
 and
@@ -68,5 +68,5 @@ The following command will delete the kernel versions matching the pattern and a
 .Xr xbps-install 1 ,
 .Xr xbps-remove 1
 .Sh BUGS
-There is no support as of yet for all kernels, specific series like rpi-kernel
-are not supported
+There is no support for all kernels. Specific series, like rpi-kernel, are not
+supported yet.
diff --git a/srcpkgs/base-files/template b/srcpkgs/base-files/template
index 672855e8671..a049c59681d 100644
--- a/srcpkgs/base-files/template
+++ b/srcpkgs/base-files/template
@@ -1,12 +1,12 @@
 # Template file for 'base-files'
 pkgname=base-files
 version=0.140
-revision=6
+revision=8
 bootstrap=yes
 depends="xbps-triggers"
 short_desc="Void Linux base system files"
 maintainer="Enno Boland <orphan@voidlinux.org>"
-license="Public domain"
+license="custom:Public domain"
 homepage="https://www.voidlinux.org"
 conf_files="
 	/etc/inputrc
diff --git a/srcpkgs/bash/files/bash50-008 b/srcpkgs/bash/files/bash50-008
new file mode 100644
index 00000000000..b09d6b33ac7
--- /dev/null
+++ b/srcpkgs/bash/files/bash50-008
@@ -0,0 +1,68 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	5.0
+Patch-ID:	bash50-008
+
+Bug-Reported-by:	Michael Albinus <michael.albinus@gmx.de>
+Bug-Reference-ID:	<87bm36k3kz.fsf@gmx.de>
+Bug-Reference-URL:	https://lists.gnu.org/archive/html/bug-bash/2019-02/msg00111.html
+
+Bug-Description:
+
+When HISTSIZE is set to 0, history expansion can leave the history length
+set to an incorrect value, leading to subsequent attempts to access invalid
+memory.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-5.0-patched/bashhist.c	2018-07-05 22:41:14.000000000 -0400
+--- bashhist.c	2019-02-20 16:20:04.000000000 -0500
+***************
+*** 561,573 ****
+    if (!history_expansion_inhibited && history_expansion && history_expansion_p (line))
+      {
+        /* If we are expanding the second or later line of a multi-line
+  	 command, decrease history_length so references to history expansions
+  	 in these lines refer to the previous history entry and not the
+  	 current command. */
+        if (history_length > 0 && command_oriented_history && current_command_first_line_saved && current_command_line_count > 1)
+          history_length--;
+        expanded = history_expand (line, &history_value);
+        if (history_length >= 0 && command_oriented_history && current_command_first_line_saved && current_command_line_count > 1)
+!         history_length++;
+  
+        if (expanded)
+--- 561,576 ----
+    if (!history_expansion_inhibited && history_expansion && history_expansion_p (line))
+      {
++       int old_len;
++ 
+        /* If we are expanding the second or later line of a multi-line
+  	 command, decrease history_length so references to history expansions
+  	 in these lines refer to the previous history entry and not the
+  	 current command. */
++       old_len = history_length;
+        if (history_length > 0 && command_oriented_history && current_command_first_line_saved && current_command_line_count > 1)
+          history_length--;
+        expanded = history_expand (line, &history_value);
+        if (history_length >= 0 && command_oriented_history && current_command_first_line_saved && current_command_line_count > 1)
+!         history_length = old_len;
+  
+        if (expanded)
+
+*** ../bash-5.0/patchlevel.h	2016-06-22 14:51:03.000000000 -0400
+--- patchlevel.h	2016-10-01 11:01:28.000000000 -0400
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 7
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 8
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/srcpkgs/bash/files/bash50-009 b/srcpkgs/bash/files/bash50-009
new file mode 100644
index 00000000000..aef4ce7b5ad
--- /dev/null
+++ b/srcpkgs/bash/files/bash50-009
@@ -0,0 +1,42 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	5.0
+Patch-ID:	bash50-009
+
+Bug-Reported-by:	chet.ramey@case.edu
+Bug-Reference-ID:
+Bug-Reference-URL:
+
+Bug-Description:
+
+The history file reading code doesn't close the file descriptor open to
+the history file when it encounters a zero-length file.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-5.0-patched/lib/readline/histfile.c	2018-06-11 09:14:52.000000000 -0400
+--- lib/readline/histfile.c	2019-05-16 15:55:57.000000000 -0400
+***************
+*** 306,309 ****
+--- 312,316 ----
+      {
+        free (input);
++       close (file);
+        return 0;	/* don't waste time if we don't have to */
+      }
+*** ../bash-5.0/patchlevel.h	2016-06-22 14:51:03.000000000 -0400
+--- patchlevel.h	2016-10-01 11:01:28.000000000 -0400
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 8
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 9
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/srcpkgs/bash/files/bash50-010 b/srcpkgs/bash/files/bash50-010
new file mode 100644
index 00000000000..bac7aa92515
--- /dev/null
+++ b/srcpkgs/bash/files/bash50-010
@@ -0,0 +1,172 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	5.0
+Patch-ID:	bash50-010
+
+Bug-Reported-by:	Thorsten Glaser <tg@mirbsd.de>
+Bug-Reference-ID:	<156622962831.19438.16374961114836556294.reportbug@tglase.lan.tarent.de>
+Bug-Reference-URL:	https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=935115
+
+Bug-Description:
+
+Bash-5.0 changed the way assignment statements preceding special builtins
+and shell functions were handled in posix mode. They automatically created
+or modified global variables instead of modifying existing local variables
+as in bash-4.4.
+
+The bash-4.4 posix-mode semantics were buggy, and resulted in creating
+local variables where they were not intended and modifying global variables
+and local variables simultaneously.
+
+The bash-5.0 changes were intended to fix this issue, but did not preserve
+enough backwards compatibility. The posix standard also changed what it
+required in these cases, so bash-5.0 is not bound by the strict conformance
+requirements that existed in previous issues of the standard.
+
+This patch modifies the bash-5.0 posix mode behavior in an effort to restore
+some backwards compatibility and rationalize the behavior in the presence of
+local variables. It
+
+1. Changes the assignment semantics to be more similar to standalone assignment
+   statements: assignments preceding a function call or special builtin while
+   executing in a shell function will modify the value of a local variable
+   with the same name for the duration of the function's execution;
+
+2. Changes assignments preceding shell function calls or special builtins
+   from within a shell function to no longer create or modify global variables
+   in the presence of a local variable with the same name;
+
+3. Assignment statements preceding a shell function call or special builtin
+   at the global scope continue to modify the (global) calling environment,
+   but are unaffected by assignments preceding function calls or special
+   builtins within a function, as described in item 2. This is also similar
+   to the behavior of a standalone assignment statement.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-5.0-patched/variables.c	2018-12-18 11:07:21.000000000 -0500
+--- variables.c	2019-08-22 10:53:44.000000000 -0400
+***************
+*** 4461,4467 ****
+  
+  /* Take a variable from an assignment statement preceding a posix special
+!    builtin (including `return') and create a global variable from it. This
+!    is called from merge_temporary_env, which is only called when in posix
+!    mode. */
+  static void
+  push_posix_temp_var (data)
+--- 4461,4467 ----
+  
+  /* Take a variable from an assignment statement preceding a posix special
+!    builtin (including `return') and create a variable from it as if a
+!    standalone assignment statement had been performed. This is called from
+!    merge_temporary_env, which is only called when in posix mode. */
+  static void
+  push_posix_temp_var (data)
+***************
+*** 4473,4486 ****
+    var = (SHELL_VAR *)data;
+  
+!   binding_table = global_variables->table;
+!   if (binding_table == 0)
+!     binding_table = global_variables->table = hash_create (VARIABLES_HASH_BUCKETS);
+! 
+!   v = bind_variable_internal (var->name, value_cell (var), binding_table, 0, ASS_FORCE|ASS_NOLONGJMP);
+  
+    /* global variables are no longer temporary and don't need propagating. */
+!   var->attributes &= ~(att_tempvar|att_propagate);
+    if (v)
+!     v->attributes |= var->attributes;
+  
+    if (find_special_var (var->name) >= 0)
+--- 4473,4497 ----
+    var = (SHELL_VAR *)data;
+  
+!   /* Just like do_assignment_internal(). This makes assignments preceding
+!      special builtins act like standalone assignment statements when in
+!      posix mode, satisfying the posix requirement that this affect the
+!      "current execution environment." */
+!   v = bind_variable (var->name, value_cell (var), ASS_FORCE|ASS_NOLONGJMP);
+! 
+!   /* If this modifies an existing local variable, v->context will be non-zero.
+!      If it comes back with v->context == 0, we bound at the global context.
+!      Set binding_table appropriately. It doesn't matter whether it's correct
+!      if the variable is local, only that it's not global_variables->table */
+!   binding_table = v->context ? shell_variables->table : global_variables->table;
+  
+    /* global variables are no longer temporary and don't need propagating. */
+!   if (binding_table == global_variables->table)
+!     var->attributes &= ~(att_tempvar|att_propagate);
+! 
+    if (v)
+!     {
+!       v->attributes |= var->attributes;
+!       v->attributes &= ~att_tempvar;	/* not a temp var now */
+!     }
+  
+    if (find_special_var (var->name) >= 0)
+***************
+*** 4576,4587 ****
+  {
+    int i;
+  
+    tempvar_list = strvec_create (HASH_ENTRIES (temporary_env) + 1);
+    tempvar_list[tvlist_ind = 0] = 0;
+!     
+!   hash_flush (temporary_env, pushf);
+!   hash_dispose (temporary_env);
+    temporary_env = (HASH_TABLE *)NULL;
+  
+    tempvar_list[tvlist_ind] = 0;
+  
+--- 4587,4601 ----
+  {
+    int i;
++   HASH_TABLE *disposer;
+  
+    tempvar_list = strvec_create (HASH_ENTRIES (temporary_env) + 1);
+    tempvar_list[tvlist_ind = 0] = 0;
+! 
+!   disposer = temporary_env;
+    temporary_env = (HASH_TABLE *)NULL;
+  
++   hash_flush (disposer, pushf);
++   hash_dispose (disposer);
++ 
+    tempvar_list[tvlist_ind] = 0;
+  
+*** ../bash-5.0-patched/tests/varenv.right	2018-12-17 15:39:48.000000000 -0500
+--- tests/varenv.right	2019-08-22 16:05:25.000000000 -0400
+***************
+*** 147,153 ****
+  outside: declare -- var="one"
+  inside: declare -x var="value"
+! outside: declare -x var="value"
+! inside: declare -- var="local"
+! outside: declare -x var="global"
+  foo=<unset> environment foo=
+  foo=foo environment foo=foo
+--- 147,153 ----
+  outside: declare -- var="one"
+  inside: declare -x var="value"
+! outside: declare -- var="outside"
+! inside: declare -x var="global"
+! outside: declare -- var="outside"
+  foo=<unset> environment foo=
+  foo=foo environment foo=foo
+*** ../bash-5.0/patchlevel.h	2016-06-22 14:51:03.000000000 -0400
+--- patchlevel.h	2016-10-01 11:01:28.000000000 -0400
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 9
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 10
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/srcpkgs/bash/files/bash50-011 b/srcpkgs/bash/files/bash50-011
new file mode 100644
index 00000000000..a9ae690e004
--- /dev/null
+++ b/srcpkgs/bash/files/bash50-011
@@ -0,0 +1,59 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	5.0
+Patch-ID:	bash50-011
+
+Bug-Reported-by:	Matt Whitlock
+Bug-Reference-ID:	
+Bug-Reference-URL:	https://savannah.gnu.org/support/?109671
+
+Bug-Description:
+
+The conditional command did not perform appropriate quoted null character
+removal on its arguments, causing syntax errors and attempts to stat
+invalid pathnames.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-5.0-patched/subst.c	2018-12-22 17:43:37.000000000 -0500
+--- subst.c	2019-04-14 13:25:41.000000000 -0400
+***************
+*** 3626,3630 ****
+     SPECIAL is 2, this is an rhs argument for the =~ operator, and should
+     be quoted appropriately for regcomp/regexec.  The caller is responsible
+!    for removing the backslashes if the unquoted word is needed later. */   
+  char *
+  cond_expand_word (w, special)
+--- 3642,3648 ----
+     SPECIAL is 2, this is an rhs argument for the =~ operator, and should
+     be quoted appropriately for regcomp/regexec.  The caller is responsible
+!    for removing the backslashes if the unquoted word is needed later. In
+!    any case, since we don't perform word splitting, we need to do quoted
+!    null character removal. */
+  char *
+  cond_expand_word (w, special)
+***************
+*** 3647,3650 ****
+--- 3665,3670 ----
+        if (special == 0)			/* LHS */
+  	{
++ 	  if (l->word)
++ 	    word_list_remove_quoted_nulls (l);
+  	  dequote_list (l);
+  	  r = string_list (l);
+*** ../bash-5.0/patchlevel.h	2016-06-22 14:51:03.000000000 -0400
+--- patchlevel.h	2016-10-01 11:01:28.000000000 -0400
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 10
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 11
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/srcpkgs/bash/template b/srcpkgs/bash/template
index 84176143b72..1fd2f591cdb 100644
--- a/srcpkgs/bash/template
+++ b/srcpkgs/bash/template
@@ -1,9 +1,9 @@
 # Template file for 'bash'
 pkgname=bash
 _bash_distver=5.0
-_bash_patchlevel=007
+_bash_patchlevel=011
 version="${_bash_distver}.${_bash_patchlevel}"
-revision=2
+revision=1
 wrksrc="${pkgname}-${_bash_distver}"
 build_style=gnu-configure
 configure_args="--without-bash-malloc --with-curses --without-installed-readline"
diff --git a/srcpkgs/bat/template b/srcpkgs/bat/template
index db577d886ae..1a06119cd32 100644
--- a/srcpkgs/bat/template
+++ b/srcpkgs/bat/template
@@ -1,16 +1,21 @@
 # Template file for 'bat'
 pkgname=bat
-version=0.11.0
+version=0.12.1
 revision=1
 build_style=cargo
-hostmakedepends="cmake"
+hostmakedepends="cmake llvm"
 makedepends="libcurl-devel libssh2-devel oniguruma-devel"
 short_desc="Cat(1) clone with syntax highlighting and Git integration"
 maintainer="John <johnz@posteo.net>"
 license="Apache-2.0, MIT"
 homepage="https://github.com/sharkdp/bat"
 distfiles="https://github.com/sharkdp/bat/archive/v${version}.tar.gz"
-checksum=bb4e39efadfab71c0c929a92b82dac58deacfe2a4eb527d4256ac0634e042ed2
+checksum=1dd184ddc9e5228ba94d19afc0b8b440bfc1819fef8133fe331e2c0ec9e3f8e2
+
+pre_build() {
+	export CFLAGS_${RUST_BUILD//-/_}="${CFLAGS_host}"
+	export CC_${RUST_BUILD//-/_}="${BUILD_CC}"
+}
 
 post_install() {
 	vlicense LICENSE-MIT
diff --git a/srcpkgs/bc-gh/template b/srcpkgs/bc-gh/template
index 0a8a7ee8293..ac863f30d77 100644
--- a/srcpkgs/bc-gh/template
+++ b/srcpkgs/bc-gh/template
@@ -1,6 +1,6 @@
 # Template file for 'bc-gh'
 pkgname=bc-gh
-version=2.1.0
+version=2.1.3
 revision=1
 wrksrc="bc-${version}"
 short_desc="Implementation of POSIX bc with GNU extensions"
@@ -8,7 +8,7 @@ maintainer="Gavin D. Howard <yzena.tech@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://github.com/gavinhoward/bc"
 distfiles="${homepage}/releases/download/${version}/bc-${version}.tar.xz"
-checksum=b6b25a44323e42959b2ba4885f54fcc6d889070dbb53c7d0f8db9f56a4faafc8
+checksum=cf24e19a5573e7cc8e4cbefea382de57e982212c33e8e15d7064ccc989cae17b
 alternatives="
  bc:bc:/usr/bin/bc-gh
  dc:dc:/usr/bin/dc-gh"
diff --git a/srcpkgs/bcal/patches/non-null.patch b/srcpkgs/bcal/patches/non-null.patch
new file mode 100644
index 00000000000..132fc086784
--- /dev/null
+++ b/srcpkgs/bcal/patches/non-null.patch
@@ -0,0 +1,11 @@
+--- src/bcal.c	2018-12-11 16:12:41.000000000 +0100
++++ src/bcal.c	2019-09-24 22:34:39.475836973 +0200
+@@ -1923,7 +1923,7 @@
+ 	char *expr = fixexpr(exp, &ret);  /* Make parsing compatible */
+ 	char *ptr;
+ 
+-	log(DEBUG, "expr: %s\n", expr);
++	log(DEBUG, "expr: %s\n", expr ? expr : "<null>");
+ 
+ 	if (expr == NULL) {
+ 		if (ret)
diff --git a/srcpkgs/bcal/template b/srcpkgs/bcal/template
index 8aedd08e322..905e22fccd5 100644
--- a/srcpkgs/bcal/template
+++ b/srcpkgs/bcal/template
@@ -1,18 +1,17 @@
 # Template file for 'bcal'
 pkgname=bcal
 version=2.1
-revision=2
+revision=3
 build_style=gnu-makefile
 makedepends="readline-devel"
 depends="bc"
 short_desc="Byte CALculator for storage conversions and calculations"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/jarun/bcal"
 distfiles="https://github.com/jarun/bcal/archive/v${version}.tar.gz"
 checksum=c0b6cb911a773abdd555e6a9e0eb8a25934ceca038156e6250e117fa451beaa6
-nocross=yes
 
-case "$XBPS_TARGET_MACHINE" in
-	i686*) broken="https://build.voidlinux.org/builders/i686_builder/builds/6760/steps/shell_3/logs/stdio";;
-esac
+if [ "$XBPS_TARGET_WORDSIZE" -ne 64 ]; then
+	broken="Can only be built for 64 bit targets which define __uint128_t."
+fi
diff --git a/srcpkgs/bcc/patches/musl.patch b/srcpkgs/bcc/patches/musl.patch
index 20def02c588..bc7ac1e7726 100644
--- a/srcpkgs/bcc/patches/musl.patch
+++ b/srcpkgs/bcc/patches/musl.patch
@@ -48,15 +48,3 @@
  #include <arpa/inet.h>
  #include <errno.h>
  #include <fcntl.h>
---- src/cc/libbpf/src/hashmap.h.orig	2019-05-29 19:27:27.000000000 +0200
-+++ src/cc/libbpf/src/hashmap.h	2019-06-01 23:57:31.458324372 +0200
-@@ -10,6 +10,9 @@
- 
- #include <stdbool.h>
- #include <stddef.h>
-+#if !defined(__GLIBC__)
-+#include <bits/reg.h>	/* for __WORDSIZE */
-+#endif
- #include "libbpf_internal.h"
- 
- static inline size_t hash_bits(size_t h, int bits)
diff --git a/srcpkgs/bcc/template b/srcpkgs/bcc/template
index 807f1425c1d..a4d32bce7a4 100644
--- a/srcpkgs/bcc/template
+++ b/srcpkgs/bcc/template
@@ -1,20 +1,21 @@
 # Template file for 'bcc'
 pkgname=bcc
-version=0.10.0
+version=0.11.0
 revision=1
 build_style=cmake
 configure_args="-DREVISION=${version}"
 hostmakedepends="flex"
 makedepends="clang elfutils-devel lld-devel llvm ncurses-devel
- python-devel zlib-devel"
+ python3-devel zlib-devel"
+python_version="3"
 short_desc="BPF-based Linux IO analysis, networking, monitoring, and more"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://github.com/iovisor/bcc"
 distfiles="https://github.com/iovisor/${pkgname}/archive/v${version}.tar.gz
- https://github.com/libbpf/libbpf/archive/75db50f4a09d9dbac49b1ace9e4b6a722bdf0519.tar.gz"
-checksum="b02a75bc469a33e6781c915361a49a97d4ec7b45d74cfeffb22693247438d4b0
- 22a7ba2343df699a0332015aa54d4a8aeba1756f58308fed120b60a8900e9d55"
+ https://github.com/libbpf/libbpf/archive/1a26b51b1ca0c33ded075e7563ab40fba686ea0f.tar.gz"
+checksum="18ba73ab285d96b806e59764abba5e6a5fa0c39f5571150b31cf651df3a71b48
+ 3c2e5dc538b338353b05f1ed5d5f2aceee394bbd9b69fec2a7b586a4f9c0274d"
 nocross=yes # https://github.com/voidlinux/void-packages/issues/4738
 
 post_extract() {
@@ -25,7 +26,7 @@ post_extract() {
 }
 bcc-tools_package() {
 	short_desc+=" - tools"
-	depends="python-bcc>=${version}_${revision} linux-headers"
+	depends="python3-bcc>=${version}_${revision} linux-headers"
 	pkg_install() {
 		vmove usr/share/bcc/man/man8
 		mv ${PKGDESTDIR}/usr/share/bcc/man ${PKGDESTDIR}/usr/share/man
@@ -55,10 +56,10 @@ bcc-devel_package() {
 		vmove usr/share/bcc/examples
 	}
 }
-python-bcc_package() {
+python3-bcc_package() {
 	lib32disabled=yes
-	depends="python"
-	short_desc+=" - Python 2.7 module"
+	depends="python3"
+	short_desc+=" - Python 3 module"
 	depends="${sourcepkg}>=${version}_${revision}"
 	pycompile_module="bcc"
 	pkg_install() {
diff --git a/srcpkgs/bctoolbox/template b/srcpkgs/bctoolbox/template
index 1fdcea06dc7..b339759beac 100644
--- a/srcpkgs/bctoolbox/template
+++ b/srcpkgs/bctoolbox/template
@@ -6,7 +6,7 @@ build_style=cmake
 configure_args="-DENABLE_TESTS_COMPONENT=OFF"
 makedepends="mbedtls-devel"
 short_desc="Library to create and run audio and video streams"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/BelledonneCommunications/bctoolbox"
 distfiles="https://github.com/BelledonneCommunications/bctoolbox/archive/${version}.tar.gz"
diff --git a/srcpkgs/beancount/template b/srcpkgs/beancount/template
index c29e4b8836c..b1e2a121668 100644
--- a/srcpkgs/beancount/template
+++ b/srcpkgs/beancount/template
@@ -1,6 +1,6 @@
 # Template file for 'beancount'
 pkgname=beancount
-version=2.2.1
+version=2.2.3
 revision=1
 build_style=python3-module
 pycompile_module="beancount"
@@ -8,10 +8,10 @@ hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
 depends="python3-pytest python3-dateutil python3-ply python3-bottle python3-lxml
  python3-magic python3-BeautifulSoup4 python3-requests python3-chardet
- python3-google-api-python-client"
+ python3-google-api-python-client python3-oauth2client"
 short_desc="Double-entry accounting system based on plain text files"
 maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"
 license="GPL-2.0-only"
 homepage="http://furius.ca/beancount/"
 distfiles="${PYPI_SITE}/b/beancount/beancount-${version}.tar.gz"
-checksum=ebcb59bd7c0e18a858c55d6c30eacee3fa949ee5d2c452a7aa80690e36ae2f77
+checksum=1554adfd773d12cb88fd7f4da67fcb608665a9bdedc7e44834e059d1b3a08e5d
diff --git a/srcpkgs/bearssl/template b/srcpkgs/bearssl/template
index 777cec324d3..ec393735acf 100644
--- a/srcpkgs/bearssl/template
+++ b/srcpkgs/bearssl/template
@@ -1,23 +1,24 @@
 # Template file for 'bearssl'
 pkgname=bearssl
 version=0.6
-revision=1
+revision=2
 build_style=gnu-makefile
+make_build_args="D=.so.${version} LD=\$(CC) LDDLL=\$(CC) LDDLLFLAGS=-shared LDDLLFLAGS+=-Wl,-soname,lib${pkgname}.so.${version%%.*}"
 short_desc="Implementation of the SSL/TLS protocol in C"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
-homepage="https://www.bearssl.org/"
-_changelog="https://www.bearssl.org/changelog.html"
-distfiles="https://www.bearssl.org/${pkgname}-${version}.tar.gz"
+homepage="https://bearssl.org"
+changelog="${homepage}/changelog.html"
+distfiles="${homepage}/${pkgname}-${version}.tar.gz"
 checksum=6705bba1714961b41a728dfc5debbe348d2966c117649392f8c8139efc83ff14
 CFLAGS="-fPIC"
-make_build_args="D=.so.${version} LDDLL=\$(CC) LD=\$(CC) LDDLLFLAGS=-shared LDDLLFLAGS+=-Wl,-soname,libbearssl.so.0"
 
 do_install() {
 	vbin build/brssl
-	vinstall build/libbearssl.a 0644 usr/lib
-	vinstall build/libbearssl.so.${version} 0644 usr/lib
-	ln -s libbearssl.so.${version} ${DESTDIR}/usr/lib/libbearssl.so
+	vinstall "build/lib${pkgname}.a"             0644 usr/lib
+	vinstall "build/lib${pkgname}.so.${version}" 0644 usr/lib
+	ln -s "lib${pkgname}.so.${version}"     "${DESTDIR}/usr/lib/lib${pkgname}.so.${version%%.*}"
+	ln -s "lib${pkgname}.so.${version%%.*}" "${DESTDIR}/usr/lib/lib${pkgname}.so"
 	vcopy inc usr/include
 	vlicense LICENSE.txt LICENSE
 }
diff --git a/srcpkgs/beignet/patches/llvm8.patch b/srcpkgs/beignet/patches/llvm8.patch
new file mode 100644
index 00000000000..15128d1a115
--- /dev/null
+++ b/srcpkgs/beignet/patches/llvm8.patch
@@ -0,0 +1,56 @@
+From 75c152599a7c1739e6dadcdb9b377acf7e44d9cf Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Wed, 30 Jan 2019 12:42:34 +0000
+Subject: [PATCH] lang/beignet: unbreak with llvm80
+
+Regressed by https://github.com/llvm/llvm-project/commit/721d95713a9e
+
+unable to load /usr/local/lib/beignet//libgbeinterp.so which is part of the driver, please check!
+ld-elf.so.1: /usr/local/lib/beignet//libgbeinterp.so: Undefined symbol "_ZN4llvm24DisableABIBreakingChecksE"
+
+Regressed by https://github.com/llvm/llvm-project/commit/4a2d58e16acc
+
+backend/src/llvm/llvm_gen_backend.cpp:3076:5: error:
+      unknown type name 'TerminatorInst'
+    TerminatorInst *term = bb->getTerminator();
+    ^
+backend/src/llvm/llvm_gen_backend.cpp:3083:5: error:
+      unknown type name 'TerminatorInst'
+    TerminatorInst *term = bb->getTerminator();
+    ^
+
+--- backend/src/CMakeLists.txt.orig	2017-09-22 08:05:22 UTC
++++ backend/src/CMakeLists.txt
+@@ -168,6 +168,7 @@ add_dependencies(gbe beignet_bitcode)
+ endif (NOT (USE_STANDALONE_GBE_COMPILER STREQUAL "true"))
+ 
+ add_library(gbeinterp SHARED gbe_bin_interpreter.cpp)
++target_link_libraries(gbeinterp ${LLVM_MODULE_LIBS})
+ 
+ if (LLVM_VERSION_NODOT VERSION_EQUAL 34)
+   find_library(TERMINFO NAMES tinfo ncurses)
+--- backend/src/llvm/llvm_gen_backend.cpp.orig	2017-10-24 06:04:48 UTC
++++ backend/src/llvm/llvm_gen_backend.cpp
+@@ -3073,14 +3073,22 @@ namespace gbe
+ 
+ 
+   static unsigned getChildNo(BasicBlock *bb) {
++#if LLVM_VERSION_MAJOR < 8
+     TerminatorInst *term = bb->getTerminator();
++#else
++    Instruction *term = bb->getTerminator();
++#endif
+     return term->getNumSuccessors();
+   }
+ 
+   // return NULL if index out-range of children number
+   static BasicBlock *getChildPossible(BasicBlock *bb, unsigned index) {
+ 
++#if LLVM_VERSION_MAJOR < 8
+     TerminatorInst *term = bb->getTerminator();
++#else
++    Instruction *term = bb->getTerminator();
++#endif
+     unsigned childNo = term->getNumSuccessors();
+     BasicBlock *child = NULL;
+     if(index < childNo) {
diff --git a/srcpkgs/beignet/patches/llvm9.patch b/srcpkgs/beignet/patches/llvm9.patch
new file mode 100644
index 00000000000..bff503800b0
--- /dev/null
+++ b/srcpkgs/beignet/patches/llvm9.patch
@@ -0,0 +1,111 @@
+Source: FreeBSD + q66
+
+Mostly FreeBSD other than FindLLVM.cmake changes.
+Linking against clang-cpp does not work for us.
+
+--- CMake/FindLLVM.cmake
++++ CMake/FindLLVM.cmake
+@@ -140,6 +140,7 @@ add_one_lib("clangStaticAnalyzerCore")
+ add_one_lib("clangAnalysis")
+ add_one_lib("clangEdit")
+ add_one_lib("clangAST")
++add_one_lib("clangASTMatchers")
+ add_one_lib("clangParse")
+ add_one_lib("clangSema")
+ add_one_lib("clangLex")
+--- backend/src/llvm/llvm_intrinsic_lowering.cpp.orig	2017-10-24 06:04:48 UTC
++++ backend/src/llvm/llvm_intrinsic_lowering.cpp
+@@ -77,7 +77,11 @@ namespace gbe {
+         std::vector<Type *> ParamTys;
+         for (Value** I = ArgBegin; I != ArgEnd; ++I)
+           ParamTys.push_back((*I)->getType());
++#if LLVM_VERSION_MAJOR * 10 + LLVM_VERSION_MINOR >= 90
++        FunctionCallee FCache = M->getOrInsertFunction(NewFn,
++#else
+         Constant* FCache = M->getOrInsertFunction(NewFn,
++#endif
+                                         FunctionType::get(RetTy, ParamTys, false));
+ 
+         IRBuilder<> Builder(CI->getParent(), BasicBlock::iterator(CI));
+--- backend/src/llvm/llvm_sampler_fix.cpp.orig	2017-10-24 06:04:48 UTC
++++ backend/src/llvm/llvm_sampler_fix.cpp
+@@ -82,7 +82,11 @@ namespace gbe {
+ #if LLVM_VERSION_MAJOR * 10 + LLVM_VERSION_MINOR >= 40
+           Module *M = I->getParent()->getParent()->getParent();
+ #if LLVM_VERSION_MAJOR * 10 + LLVM_VERSION_MINOR >= 50
++#if LLVM_VERSION_MAJOR * 10 + LLVM_VERSION_MINOR >= 90
++          FunctionCallee samplerCvt = M->getOrInsertFunction("__gen_ocl_sampler_to_int", i32Ty, I->getOperand(0)->getType());
++#else
+           Value* samplerCvt = M->getOrInsertFunction("__gen_ocl_sampler_to_int", i32Ty, I->getOperand(0)->getType());
++#endif
+ #else
+           Value* samplerCvt = M->getOrInsertFunction("__gen_ocl_sampler_to_int", i32Ty, I->getOperand(0)->getType(), nullptr);
+ #endif
+@@ -124,7 +128,11 @@ namespace gbe {
+ #if LLVM_VERSION_MAJOR * 10 + LLVM_VERSION_MINOR >= 40
+           Module *M = I->getParent()->getParent()->getParent();
+ #if LLVM_VERSION_MAJOR * 10 + LLVM_VERSION_MINOR >= 50
++#if LLVM_VERSION_MAJOR * 10 + LLVM_VERSION_MINOR >= 90
++          FunctionCallee samplerCvt = M->getOrInsertFunction("__gen_ocl_sampler_to_int", i32Ty, I->getOperand(0)->getType());
++#else
+           Value* samplerCvt = M->getOrInsertFunction("__gen_ocl_sampler_to_int", i32Ty, I->getOperand(0)->getType());
++#endif
+ #else
+           Value* samplerCvt = M->getOrInsertFunction("__gen_ocl_sampler_to_int", i32Ty, I->getOperand(0)->getType(), nullptr);
+ #endif
+--- backend/src/llvm/llvm_profiling.cpp.orig	2017-10-24 06:04:48 UTC
++++ backend/src/llvm/llvm_profiling.cpp
+@@ -163,10 +163,18 @@ namespace gbe
+       // __gen_ocl_store_timestamp(int nth, int type);
+       Value *Args[2] = {ConstantInt::get(intTy, pointNum++), ConstantInt::get(intTy, profilingType)};
+ #if LLVM_VERSION_MAJOR * 10 + LLVM_VERSION_MINOR >= 50
++#if LLVM_VERSION_MAJOR * 10 + LLVM_VERSION_MINOR >= 90
++      builder->CreateCall(module->getOrInsertFunction(
++#else
+       builder->CreateCall(cast<llvm::Function>(module->getOrInsertFunction(
++#endif
+               "__gen_ocl_calc_timestamp", Type::getVoidTy(module->getContext()),
+               IntegerType::getInt32Ty(module->getContext()),
++#if LLVM_VERSION_MAJOR * 10 + LLVM_VERSION_MINOR >= 90
++              IntegerType::getInt32Ty(module->getContext())),
++#else
+               IntegerType::getInt32Ty(module->getContext()))),
++#endif
+               ArrayRef<Value*>(Args));
+ #else
+       builder->CreateCall(cast<llvm::Function>(module->getOrInsertFunction(
+@@ -185,10 +193,18 @@ namespace gbe
+     Value *Args2[2] = {profilingBuf, ConstantInt::get(intTy, profilingType)};
+ 
+ #if LLVM_VERSION_MAJOR * 10 + LLVM_VERSION_MINOR >= 50
++#if LLVM_VERSION_MAJOR * 10 + LLVM_VERSION_MINOR >= 90
++    builder->CreateCall(module->getOrInsertFunction(
++#else
+     builder->CreateCall(cast<llvm::Function>(module->getOrInsertFunction(
++#endif
+             "__gen_ocl_store_profiling", Type::getVoidTy(module->getContext()),
+             ptrTy,
++#if LLVM_VERSION_MAJOR * 10 + LLVM_VERSION_MINOR >= 90
++            IntegerType::getInt32Ty(module->getContext())),
++#else
+             IntegerType::getInt32Ty(module->getContext()))),
++#endif
+             ArrayRef<Value*>(Args2));
+ #else
+     builder->CreateCall(cast<llvm::Function>(module->getOrInsertFunction(
+--- backend/src/llvm/llvm_device_enqueue.cpp.orig	2017-10-24 06:04:48 UTC
++++ backend/src/llvm/llvm_device_enqueue.cpp
+@@ -398,8 +398,13 @@ namespace gbe {
+               std::vector<Type *> ParamTys;
+               for (Value** iter = args.begin(); iter != args.end(); ++iter)
+                 ParamTys.push_back((*iter)->getType());
++#if LLVM_VERSION_MAJOR * 10 + LLVM_VERSION_MINOR >= 90
++              CallInst* newCI = builder.CreateCall(mod->getOrInsertFunction(
++                              "__gen_enqueue_kernel_slm", FunctionType::get(intTy, ParamTys, false)), args);
++#else
+               CallInst* newCI = builder.CreateCall(cast<llvm::Function>(mod->getOrInsertFunction(
+                               "__gen_enqueue_kernel_slm", FunctionType::get(intTy, ParamTys, false))), args);
++#endif
+               CI->replaceAllUsesWith(newCI);
+               deadInsnSet.insert(CI);
+             }
diff --git a/srcpkgs/beignet/template b/srcpkgs/beignet/template
index f56b3d1a0ae..eedb7aef1a7 100644
--- a/srcpkgs/beignet/template
+++ b/srcpkgs/beignet/template
@@ -1,7 +1,7 @@
 # Template file for 'beignet'
 pkgname=beignet
 version=1.3.2
-revision=4
+revision=5
 archs="i686* x86_64*"
 wrksrc="Beignet-${version}-Source"
 build_style=cmake
@@ -14,7 +14,6 @@ license="LGPL-2.1-or-later"
 homepage="http://www.freedesktop.org/wiki/Software/Beignet/"
 distfiles="https://01.org/sites/default/files/${pkgname}-${version}-source.tar.gz"
 checksum=c555edba149de23243965a703f39f79fa06f15bcff5a3762b5544b0925010b43
-broken="Doesn't build against libLLVM8; can't be built against libclang 8 and libLLVM7"
 
 post_install() {
 	# remove CL headers, we do use opencl-headers instead.
diff --git a/srcpkgs/berry/patches/fix-cross.patch b/srcpkgs/berry/patches/fix-cross.patch
index a19b36dbc0a..0841ad893af 100644
--- a/srcpkgs/berry/patches/fix-cross.patch
+++ b/srcpkgs/berry/patches/fix-cross.patch
@@ -1,12 +1,3 @@
---- config.mk.orig
-+++ config.mk
-@@ -39,5 +39,5 @@
- 
- CPPFLAGS += $(NAME_DEFINES) -DSRVR_$$HOSTNAME $(DEBUG_CPPFLAGS)
- CFLAGS += -Wall -O3 $(DEBUG_CFLAGS)
--CFLAGS += -Icore -Iinclude -I/usr/include/freetype2
-+CFLAGS += -Icore -Iinclude -I$(XBPS_CROSS_BASE)/usr/include/freetype2
- LDFLAGS += -lX11 -lXrandr -lXft
 --- Makefile.orig
 +++ Makefile
 @@ -5,12 +5,12 @@
@@ -18,10 +9,19 @@
  CFLAGS?=-Os -pedantic -Wall $(NAME_DEFINES)
  
  all:
--	$(CC) $(CFLAGS) -I$(PREFIX)/include src/utils.c src/wm.c -L$(PREFIX)/lib -lX11 -lm -lXinerama -lXft -o berry
+-	$(CC) $(CFLAGS) -I$(PREFIX)/include src/utils.c src/wm.c -L$(PREFIX)/lib -lX11 -lm -lXinerama -lXft -lXext -o berry
 -	$(CC) $(CFLAGS) -I$(PREFIX)/include src/client.c -L$(PREFIX)/lib -lX11 -o berryc
-+	$(CC) $(CFLAGS) -I$(XBPS_CROSS_BASE)/$(PREFIX)/include src/utils.c src/wm.c -L$(XBPS_CROSS_BASE)/$(PREFIX)/lib -lX11 -lm -lXinerama -lXft -o berry
++	$(CC) $(CFLAGS) -I$(XBPS_CROSS_BASE)/$(PREFIX)/include src/utils.c src/wm.c -L$(XBPS_CROSS_BASE)/$(PREFIX)/lib -lX11 -lm -lXinerama -lXft -lXext -o berry
 +	$(CC) $(CFLAGS) -I$(XBPS_CROSS_BASE)/$(PREFIX)/include src/client.c -L$(XBPS_CROSS_BASE)/$(PREFIX)/lib -lX11 -o berryc
  
  install:
  	mkdir -p "$(DESTDIR)$(PREFIX)/bin"
+--- config.mk.orig
++++ config.mk
+@@ -39,5 +39,5 @@
+
+ CPPFLAGS += $(NAME_DEFINES) -DSRVR_$$HOSTNAME $(DEBUG_CPPFLAGS)
+ CFLAGS += -Wall -O3 $(DEBUG_CFLAGS)
+-CFLAGS += -Icore -Iinclude -I/usr/include/freetype2
++CFLAGS += -Icore -Iinclude -I$(XBPS_CROSS_BASE)/usr/include/freetype2
+ LDFLAGS += -lX11 -lXrandr -lXft
diff --git a/srcpkgs/berry/template b/srcpkgs/berry/template
index 49cdc814ef8..72de22c1c5d 100644
--- a/srcpkgs/berry/template
+++ b/srcpkgs/berry/template
@@ -1,16 +1,16 @@
 # Template file for 'berry'
 pkgname=berry
-version=0.1.0
+version=0.1.3
 revision=1
 build_style=gnu-makefile
 make_use_env=yes
 makedepends="libX11-devel libXinerama-devel libXft-devel freetype-devel"
 short_desc="Healthy, bite-sized window manager"
-maintainer="Andrew Benson <abenson@gmail.com>"
+maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/JLErvin/berry"
 distfiles="https://github.com/JLErvin/berry/archive/${version}.tar.gz"
-checksum=62a9e279c2029f52fb80acee3169c02de3cda8e53cf1243e6deeeca7437d1efb
+checksum=05a3b9b001ca515ded4310e358cfcd1d4b544954509f61fe40062951b57c0b87
 
 do_install() {
 	vbin berry
diff --git a/srcpkgs/bettercap/template b/srcpkgs/bettercap/template
index 55f649a982f..ce85b29756f 100644
--- a/srcpkgs/bettercap/template
+++ b/srcpkgs/bettercap/template
@@ -1,6 +1,6 @@
 # Template file for 'bettercap'
 pkgname=bettercap
-version=2.24.1
+version=2.25
 revision=1
 build_style=go
 go_import_path=github.com/bettercap/bettercap
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-3.0-only"
 homepage="https://github.com/bettercap/bettercap"
 distfiles="https://github.com/bettercap/bettercap/archive/v${version}.tar.gz"
-checksum=590cef2b2b24fd9f67c57c8cb19ab8ff08b11d43bfc23b468013ddad907bb8b8
+checksum=955b29946774bb12a757006d5518bc20e7174092c5a37f771ab1cb8d21223b6a
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64-musl) broken="fails to build" ;;
diff --git a/srcpkgs/bfs/template b/srcpkgs/bfs/template
index b900832fe8a..b1d0c7ce076 100644
--- a/srcpkgs/bfs/template
+++ b/srcpkgs/bfs/template
@@ -1,16 +1,16 @@
 # Template file for 'bfs'
 pkgname=bfs
-version=1.5
+version=1.5.1
 revision=1
 build_style=gnu-makefile
 makedepends="acl-devel libcap-devel"
 checkdepends="acl-progs"
 short_desc="Breadth-first version of the UNIX find command"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="0BSD"
 homepage="https://github.com/tavianator/bfs"
 distfiles="https://github.com/tavianator/bfs/archive/${version}.tar.gz"
-checksum=c3e595e05e014acda10487efaf74d37ef0d6459d74b3c5b976cd425b277c79c9
+checksum=28defd5f66043c5bfda8b715e9e3eac92a0a1f59b3ec39c78d527a2fb5e0735b
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/bijiben/template b/srcpkgs/bijiben/template
index b60a004ec63..43e698466ef 100644
--- a/srcpkgs/bijiben/template
+++ b/srcpkgs/bijiben/template
@@ -1,6 +1,6 @@
 # Template file for 'bijiben'
 pkgname=bijiben
-version=3.32.2
+version=3.34.1
 revision=1
 build_helper="gir"
 build_style=meson
@@ -14,5 +14,5 @@ license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Notes"
 changelog="https://raw.githubusercontent.com/GNOME/bijiben/gnome-${version%.*}/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c23bc5af5e83a85cb4fdc6873ad800c2afb48dbcadfdce7c1dfdb2a3a7131532
+checksum=fbc3c8f050aed8174358e56dcbf06857db45180ee1e1481e20110b6b25d3c279
 nocross="evolution-data-server cross"
diff --git a/srcpkgs/bind/template b/srcpkgs/bind/template
index 2a59fe39135..d9dbd327368 100644
--- a/srcpkgs/bind/template
+++ b/srcpkgs/bind/template
@@ -1,7 +1,7 @@
 # Template file for 'bind'
 pkgname=bind
 reverts="9.13.6_1"
-version=9.11.9
+version=9.11.11
 revision=1
 _fullver="${version}${_patchver:+-${_patchver}}"
 wrksrc="${pkgname}-${_fullver}"
@@ -21,7 +21,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="ISC"
 homepage="https://www.isc.org/downloads/bind/"
 distfiles="https://ftp.isc.org/isc/bind9/${_fullver}/bind-${_fullver}.tar.gz"
-checksum=963bf048354795b85b8f3dbe3ff5ba524d3f5b14b86a4cc733fcf971b43ac50e
+checksum=615230336645e494d0125a3e92cf1c0f956b7408378aca66667b44eaa9de8a6b
 
 conf_files="/etc/named/named.conf"
 system_accounts="named"
diff --git a/srcpkgs/binutils/template b/srcpkgs/binutils/template
index b6780fcd5d7..03ea951f7d1 100644
--- a/srcpkgs/binutils/template
+++ b/srcpkgs/binutils/template
@@ -1,14 +1,14 @@
 # Template file for 'binutils'
 pkgname=binutils
-version=2.32
-revision=3
+version=2.33.1
+revision=1
 bootstrap=yes
 short_desc="GNU binary utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.gnu.org/software/binutils/"
 distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.xz"
-checksum=0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
+checksum=ab66fc2d1c3ec0359b8e08843c9f33b63e8707efdff5e4cc5c200eae24722cbf
 
 if [ "$CHROOT_READY" ]; then
 	hostmakedepends="flex perl"
diff --git a/srcpkgs/binwalk/template b/srcpkgs/binwalk/template
index d7a2fbc72f7..461ea4b547a 100644
--- a/srcpkgs/binwalk/template
+++ b/srcpkgs/binwalk/template
@@ -1,18 +1,27 @@
-# Template build file for 'binwalk'.
+# Template file for 'binwalk'
 pkgname=binwalk
-version=2.1.1
-revision=4
+version=2.2.0
+revision=1
 archs=noarch
 build_style=python3-module
 pycompile_module="binwalk"
 hostmakedepends="python3"
 depends="python3"
+checkdepends="python3-nose"
 short_desc="Easy tool for analyzing/reversing/extracting firmware images"
 maintainer="Duncaen <duncaen@voidlinux.org>"
-homepage="http://www.binwalk.org"
 license="MIT"
+homepage="https://github.com/ReFirmLabs/binwalk"
 distfiles="https://github.com/ReFirmLabs/binwalk/archive/v${version}.tar.gz"
-checksum=1b70a5b03489d29f60fef18008a2164974234874faab48a4f47ec53d461d284a
+checksum=f5495f0e4c5575023d593f7c087c367675df6aeb7f4d9a2966e49763924daa27
+
+post_extract() {
+	vsed -i -e 's;/etc/bash_completion.d/%s;%s.bash;' setup.py
+}
+
+do_check() {
+	PYTHONPATH="${wrksrc}/src" python3 setup.py test
+}
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/bird/template b/srcpkgs/bird/template
index 718a927acf6..ac4a7c0bf27 100644
--- a/srcpkgs/bird/template
+++ b/srcpkgs/bird/template
@@ -1,6 +1,6 @@
 # Template file for 'bird'
 pkgname=bird
-version=2.0.5
+version=2.0.6
 revision=1
 build_style=gnu-configure
 hostmakedepends="flex autoconf"
@@ -10,7 +10,7 @@ maintainer="Philipp Hirsch <itself@hanspolo.net>"
 license="GPL-2.0-or-later"
 homepage="https://bird.network.cz"
 distfiles="ftp://bird.network.cz/pub/bird/bird-${version}.tar.gz"
-checksum=4e4b736fd26579823a728be6a7746b3f525206e3c9a4a21fccb302cffd3029d3
+checksum=90934cce6ae90039ab1e58ade223935f9221a7e5eac05df6fb53045b77bfd3aa
 
 conf_files="/etc/bird.conf"
 system_accounts="_bird"
diff --git a/srcpkgs/bison/template b/srcpkgs/bison/template
index 005c9f270c8..2f8067783c4 100644
--- a/srcpkgs/bison/template
+++ b/srcpkgs/bison/template
@@ -1,6 +1,6 @@
 # Template file for 'bison'
 pkgname=bison
-version=3.4.1
+version=3.4.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="help2man perl m4"
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.gnu.org/software/bison/bison.html"
 distfiles="${GNU_SITE}/bison/bison-${version}.tar.xz"
-checksum=27159ac5ebf736dffd5636fd2cd625767c9e437de65baa63cb0de83570bd820d
+checksum=27d05534699735dc69e86add5b808d6cb35900ad3fd63fa82e3eb644336abfa0
 alternatives="
  yacc:yacc:/usr/bin/bison-yacc
  yacc:yacc.1:/usr/share/man/man1/bison-yacc.1"
diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index 9312239a209..b91af62be02 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,7 +1,7 @@
 # Template file for 'bitcoin'
 pkgname=bitcoin
-version=0.18.0
-revision=2
+version=0.18.1
+revision=1
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --disable-ccache --disable-static
  --enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr"
@@ -15,7 +15,7 @@ homepage="https://bitcoin.org/"
 distfiles="https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz
  https://raw.github.com/bitcoin-core/packaging/master/debian/bitcoin-qt.desktop
  https://raw.github.com/bitcoin/bitcoin/v${version}/share/pixmaps/bitcoin128.png"
-checksum="5e4e6890e07b620a93fdb24605dae2bb53e8435b2a93d37558e1db1913df405f
+checksum="5c7d93f15579e37aa2d1dc79e8f5ac675f59045fceddf604ae0f1550eb03bf96
  0a46bbadda140599e807be38999e6848c89f9c3523d26fede02d34d62d50f632
  ad880c8459ecfdb96abe6a4689af06bdd27906e0edcd39d0915482f2da91e722"
 conflicts="litecoin>=0" # Both provide libbitcoinconsensus.so.0
diff --git a/srcpkgs/bitlbee-facebook/template b/srcpkgs/bitlbee-facebook/template
index 4eae30b1c51..052a896f72c 100644
--- a/srcpkgs/bitlbee-facebook/template
+++ b/srcpkgs/bitlbee-facebook/template
@@ -1,10 +1,11 @@
 # Template file for 'bitlbee-facebook'
 pkgname=bitlbee-facebook
 version=1.2.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="libtool automake pkg-config glib-devel"
 makedepends="bitlbee-devel json-glib-devel"
+depends="bitlbee"
 short_desc="Facebook protocol plugin for BitlBee"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
diff --git a/srcpkgs/blackbox_exporter/template b/srcpkgs/blackbox_exporter/template
index a827ce5c2f2..2915315437b 100644
--- a/srcpkgs/blackbox_exporter/template
+++ b/srcpkgs/blackbox_exporter/template
@@ -1,6 +1,6 @@
 # Template file for 'blackbox_exporter'
 pkgname=blackbox_exporter
-version=0.14.0
+version=0.15.1
 revision=1
 build_style=go
 go_import_path="github.com/prometheus/blackbox_exporter"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="https://prometheus.io"
 changelog="https://github.com/prometheus/blackbox_exporter/releases"
 distfiles="https://github.com/prometheus/blackbox_exporter/archive/v${version}.tar.gz"
-checksum=25528cfd51ed95ff70e41f44670193f045b6107e803c1c2d30fc71aae5a8c711
+checksum=5873b6fef45f3fca67036f837a8b6191eace3cb722ad301919bfa8a4d120e24f
 
 system_accounts="_bbox_exporter"
 
diff --git a/srcpkgs/blender/patches/altivec-all.patch b/srcpkgs/blender/patches/altivec-all.patch
new file mode 100644
index 00000000000..115e1ea6fd0
--- /dev/null
+++ b/srcpkgs/blender/patches/altivec-all.patch
@@ -0,0 +1,32 @@
+This applies a better workaround for C++ type conflicts
+in AltiVec/C++, allowing it to build on BE ppc(64).
+
+--- a/extern/clew/include/clew.h
++++ b/extern/clew/include/clew.h
+@@ -370,15 +370,18 @@ typedef unsigned int cl_GLenum;
+ 
+ /* Define basic vector types */
+ /* Workaround for ppc64el platform: conflicts with bool from C++. */
+-#if defined( __VEC__ ) && !(defined(__PPC64__) && defined(__LITTLE_ENDIAN__))
++#if defined(__VEC__)
+    #include <altivec.h>   /* may be omitted depending on compiler. AltiVec spec provides no way to detect whether the header is required. */
+-   typedef vector unsigned char     __cl_uchar16;
+-   typedef vector signed char       __cl_char16;
+-   typedef vector unsigned short    __cl_ushort8;
+-   typedef vector signed short      __cl_short8;
+-   typedef vector unsigned int      __cl_uint4;
+-   typedef vector signed int        __cl_int4;
+-   typedef vector float             __cl_float4;
++   #undef vector
++   #undef bool
++   #undef pixel
++   typedef __vector unsigned char     __cl_uchar16;
++   typedef __vector signed char       __cl_char16;
++   typedef __vector unsigned short    __cl_ushort8;
++   typedef __vector signed short      __cl_short8;
++   typedef __vector unsigned int      __cl_uint4;
++   typedef __vector signed int        __cl_int4;
++   typedef __vector float             __cl_float4;
+    #define  __CL_UCHAR16__  1
+    #define  __CL_CHAR16__   1
+    #define  __CL_USHORT8__  1
diff --git a/srcpkgs/blender/patches/gcc9-elbeem.patch b/srcpkgs/blender/patches/gcc9-elbeem.patch
new file mode 100644
index 00000000000..26c58e7d988
--- /dev/null
+++ b/srcpkgs/blender/patches/gcc9-elbeem.patch
@@ -0,0 +1,31 @@
+https://bugs.gentoo.org/685922
+
+--- a/intern/elbeem/intern/solver_main.cpp
++++ b/intern/elbeem/intern/solver_main.cpp
+@@ -381,7 +381,7 @@ LbmFsgrSolver::mainLoop(const int lev)
+ 	GRID_REGION_INIT();
+ #if PARALLEL==1
+ 	const int gDebugLevel = ::gDebugLevel;
+-#pragma omp parallel default(none) num_threads(mNumOMPThreads) \
++#pragma omp parallel default(none) firstprivate(gDebugLevel,iend,lev,cutConst) num_threads(mNumOMPThreads) \
+   reduction(+: \
+ 	  calcCurrentMass,calcCurrentVolume, \
+ 		calcCellsFilled,calcCellsEmptied, \
+@@ -1126,7 +1126,7 @@ LbmFsgrSolver::preinitGrids()
+ 		GRID_REGION_INIT();
+ #if PARALLEL==1
+ 	const int gDebugLevel = ::gDebugLevel;
+-#pragma omp parallel default(none) num_threads(mNumOMPThreads) \
++#pragma omp parallel default(none) firstprivate(gDebugLevel,iend,lev) num_threads(mNumOMPThreads) \
+   reduction(+: \
+ 	  calcCurrentMass,calcCurrentVolume, \
+ 		calcCellsFilled,calcCellsEmptied, \
+@@ -1164,7 +1164,7 @@ LbmFsgrSolver::standingFluidPreinit()
+ 	GRID_REGION_INIT();
+ #if PARALLEL==1
+ 	const int gDebugLevel = ::gDebugLevel;
+-#pragma omp parallel default(none) num_threads(mNumOMPThreads) \
++#pragma omp parallel default(none) firstprivate(gDebugLevel,iend,lev) num_threads(mNumOMPThreads) \
+   reduction(+: \
+ 	  calcCurrentMass,calcCurrentVolume, \
+ 		calcCellsFilled,calcCellsEmptied, \
diff --git a/srcpkgs/bluedevil/template b/srcpkgs/bluedevil/template
index abb64eb503f..612d4da35bf 100644
--- a/srcpkgs/bluedevil/template
+++ b/srcpkgs/bluedevil/template
@@ -1,6 +1,6 @@
 # Template file for 'bluedevil'
 pkgname=bluedevil
-version=5.16.4
+version=5.17.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/plasma/bluedevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=36eaff3da49104fb4ca8de32c2cd42657af7cde94f54c95bacf5abd6c1d39521
+checksum=c4576b72dead133483e8faab787ea5daf96217216b324df529ca5381a5aac929
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"
diff --git a/srcpkgs/blueman/template b/srcpkgs/blueman/template
index f59d3ccb980..83f9b899583 100644
--- a/srcpkgs/blueman/template
+++ b/srcpkgs/blueman/template
@@ -1,7 +1,7 @@
 # Template file for 'blueman'
 pkgname=blueman
 version=2.1.1
-revision=1
+revision=2
 build_style=gnu-configure
 pycompile_module="blueman"
 configure_args="--disable-static"
@@ -20,3 +20,7 @@ conf_files="/etc/dbus-1/system.d/org.blueman.Mechanism.conf"
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" glib-devel python3-devel"
 fi
+
+post_install() {
+	rm -rf ${DESTDIR}/usr/lib/systemd
+}
diff --git a/srcpkgs/bluez-qt5/template b/srcpkgs/bluez-qt5/template
index d739ac2f454..53d3b214cb6 100644
--- a/srcpkgs/bluez-qt5/template
+++ b/srcpkgs/bluez-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'bluez-qt5'
 pkgname=bluez-qt5
-version=5.61.0
+version=5.63.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://cgit.kde.org/bluez-qt.git"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=0ea647de61fcc18a85c660fa8e05fe93072a713a8d00a018ba8e99ea790e5d27
+checksum=b0114b2f0605973b67cdc89ab2037a78d088abecab28597364352df859aa2a9d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/bluez/files/bluetooth-meshd/run b/srcpkgs/bluez/files/bluetooth-meshd/run
new file mode 100755
index 00000000000..752dbcc37bf
--- /dev/null
+++ b/srcpkgs/bluez/files/bluetooth-meshd/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+sv check dbus >/dev/null || exit 1
+exec /usr/libexec/bluetooth/bluetooth-meshd --nodetach >/dev/null
diff --git a/srcpkgs/bluez/patches/0001-Allow-using-obexd-without-systemd-in-the-user-session.patch b/srcpkgs/bluez/patches/0001-Allow-using-obexd-without-systemd-in-the-user-session.patch
deleted file mode 100644
index 15da2636673..00000000000
--- a/srcpkgs/bluez/patches/0001-Allow-using-obexd-without-systemd-in-the-user-session.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 3027cb7141fb65cf3eeda69c688db8c4045e2d3f Mon Sep 17 00:00:00 2001
-From: Giovanni Campagna <gcampagna-cNUdlRotFMnNLxjTenLetw@public.gmane.org>
-Date: Sat, 12 Oct 2013 17:45:25 +0200
-Subject: [PATCH] Allow using obexd without systemd in the user session
-
-Not all sessions run systemd --user (actually, the majority
-doesn't), so the dbus daemon must be able to spawn obexd
-directly, and to do so it needs the full path of the daemon.
----
- Makefile.obexd                      | 4 ++--
- obexd/src/org.bluez.obex.service    | 4 ----
- obexd/src/org.bluez.obex.service.in | 4 ++++
- 3 files changed, 6 insertions(+), 6 deletions(-)
- delete mode 100644 obexd/src/org.bluez.obex.service
- create mode 100644 obexd/src/org.bluez.obex.service.in
-
-diff --git a/Makefile.obexd b/Makefile.obexd
-index 3760867..142e7c3 100644
---- Makefile.obexd
-+++ Makefile.obexd
-@@ -2,12 +2,12 @@
- if SYSTEMD
- systemduserunitdir = @SYSTEMD_USERUNITDIR@
- systemduserunit_DATA = obexd/src/obex.service
-+endif
- 
- dbussessionbusdir = @DBUS_SESSIONBUSDIR@
- dbussessionbus_DATA = obexd/src/org.bluez.obex.service
--endif
- 
--EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service
-+EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service.in
- 
- obex_plugindir = $(libdir)/obex/plugins
- 
-diff --git a/obexd/src/org.bluez.obex.service b/obexd/src/org.bluez.obex.service
-deleted file mode 100644
-index a538088..0000000
---- obexd/src/org.bluez.obex.service
-+++ /dev/null
-@@ -1,4 +0,0 @@
--[D-BUS Service]
--Name=org.bluez.obex
--Exec=/bin/false
--SystemdService=dbus-org.bluez.obex.service
-diff --git a/obexd/src/org.bluez.obex.service.in b/obexd/src/org.bluez.obex.service.in
-new file mode 100644
-index 0000000..9c815f2
---- /dev/null
-+++ obexd/src/org.bluez.obex.service.in
-@@ -0,0 +1,4 @@
-+[D-BUS Service]
-+Name=org.bluez.obex
-+Exec=@libexecdir@/obexd
-+SystemdService=dbus-org.bluez.obex.service
--- 
-1.8.3.1
-
-
diff --git a/srcpkgs/bluez/patches/0001-enable-dbus-without-systemd.patch b/srcpkgs/bluez/patches/0001-enable-dbus-without-systemd.patch
new file mode 100644
index 00000000000..5b9c7dc708c
--- /dev/null
+++ b/srcpkgs/bluez/patches/0001-enable-dbus-without-systemd.patch
@@ -0,0 +1,34 @@
+From 2625ab38ae27754205d060f09e3a18f7648d5167 Mon Sep 17 00:00:00 2001
+From: Doan Tran Cong Danh <congdanhqx@gmail.com>
+Date: Thu, 3 Oct 2019 12:57:09 +0700
+Subject: [PATCH 1/9] enable dbus without systemd
+
+---
+ Makefile.am | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 404e6a460..0884156fa 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -40,14 +40,14 @@ conf_DATA =
+ 
+ statedir = $(localstatedir)/lib/bluetooth
+ state_DATA =
++
++dbussystembusdir = $(DBUS_SYSTEMBUSDIR)
++dbussystembus_DATA = src/org.bluez.service
+ endif
+ 
+ if SYSTEMD
+ systemdsystemunitdir = $(SYSTEMD_SYSTEMUNITDIR)
+ systemdsystemunit_DATA = src/bluetooth.service
+-
+-dbussystembusdir = $(DBUS_SYSTEMBUSDIR)
+-dbussystembus_DATA = src/org.bluez.service
+ endif
+ 
+ EXTRA_DIST += src/bluetooth.service.in src/org.bluez.service
+-- 
+2.23.0
+
diff --git a/srcpkgs/bluez/patches/0002-allow-obexd-on-non-systemd-system.patch b/srcpkgs/bluez/patches/0002-allow-obexd-on-non-systemd-system.patch
new file mode 100644
index 00000000000..4ea752cd685
--- /dev/null
+++ b/srcpkgs/bluez/patches/0002-allow-obexd-on-non-systemd-system.patch
@@ -0,0 +1,54 @@
+From 82099f711ecd8281cebad23b53aadb8c875bc235 Mon Sep 17 00:00:00 2001
+From: Doan Tran Cong Danh <congdanhqx@gmail.com>
+Date: Thu, 3 Oct 2019 12:57:55 +0700
+Subject: [PATCH 2/9] allow obexd on non-systemd system
+
+---
+ Makefile.obexd                                              | 6 +++---
+ .../{org.bluez.obex.service => org.bluez.obex.service.in}   | 2 +-
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+ rename obexd/src/{org.bluez.obex.service => org.bluez.obex.service.in} (74%)
+
+diff --git a/Makefile.obexd b/Makefile.obexd
+index d36874770..c9996288c 100644
+--- a/Makefile.obexd
++++ b/Makefile.obexd
+@@ -1,12 +1,12 @@
+ if SYSTEMD
+ systemduserunitdir = $(SYSTEMD_USERUNITDIR)
+ systemduserunit_DATA = obexd/src/obex.service
++endif
+ 
+ dbussessionbusdir = $(DBUS_SESSIONBUSDIR)
+ dbussessionbus_DATA = obexd/src/org.bluez.obex.service
+-endif
+ 
+-EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service
++EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service.in
+ 
+ if OBEX
+ 
+@@ -106,6 +106,6 @@ obexd/src/plugin.$(OBJEXT): obexd/src/builtin.h
+ obexd/src/builtin.h: obexd/src/genbuiltin $(obexd_builtin_sources)
+ 	$(AM_V_GEN)$(srcdir)/obexd/src/genbuiltin $(obexd_builtin_modules) > $@
+ 
+-CLEANFILES += obexd/src/builtin.h $(builtin_files) obexd/src/obex.service
++CLEANFILES += obexd/src/builtin.h $(builtin_files) obexd/src/obex.service obexd/src/org.bluez.obex.service
+ 
+ EXTRA_DIST += obexd/src/genbuiltin
+diff --git a/obexd/src/org.bluez.obex.service b/obexd/src/org.bluez.obex.service.in
+similarity index 74%
+rename from obexd/src/org.bluez.obex.service
+rename to obexd/src/org.bluez.obex.service.in
+index a53808884..543d7bc07 100644
+--- a/obexd/src/org.bluez.obex.service
++++ b/obexd/src/org.bluez.obex.service.in
+@@ -1,4 +1,4 @@
+ [D-BUS Service]
+ Name=org.bluez.obex
+-Exec=/bin/false
++Exec=@pkglibexecdir@/obexd
+ SystemdService=dbus-org.bluez.obex.service
+-- 
+2.23.0
+
diff --git a/srcpkgs/bluez/patches/0002-bluetoothd-dbus-service.patch b/srcpkgs/bluez/patches/0002-bluetoothd-dbus-service.patch
deleted file mode 100644
index b7856185dff..00000000000
--- a/srcpkgs/bluez/patches/0002-bluetoothd-dbus-service.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- Makefile.am.orig	2014-07-30 12:30:56.483179384 +0200
-+++ Makefile.am	2014-07-30 12:31:30.858387791 +0200
-@@ -39,14 +39,14 @@ conf_DATA =
- 
- statedir = $(localstatedir)/lib/bluetooth
- state_DATA =
-+
-+dbussystembusdir = @DBUS_SYSTEMBUSDIR@
-+dbussystembus_DATA = src/org.bluez.service
- endif
- 
- if SYSTEMD
- systemdsystemunitdir = @SYSTEMD_SYSTEMUNITDIR@
- systemdsystemunit_DATA = src/bluetooth.service
--
--dbussystembusdir = @DBUS_SYSTEMBUSDIR@
--dbussystembus_DATA = src/org.bluez.service
- endif
- 
- EXTRA_DIST += src/bluetooth.service.in src/org.bluez.service
diff --git a/srcpkgs/bluez/patches/0003-allow-mesh-on-non-systemd-system.patch b/srcpkgs/bluez/patches/0003-allow-mesh-on-non-systemd-system.patch
new file mode 100644
index 00000000000..2cf6f73442d
--- /dev/null
+++ b/srcpkgs/bluez/patches/0003-allow-mesh-on-non-systemd-system.patch
@@ -0,0 +1,29 @@
+From 32a425c3f9b42a55824c044a6b486c9c12e65a65 Mon Sep 17 00:00:00 2001
+From: Doan Tran Cong Danh <congdanhqx@gmail.com>
+Date: Thu, 3 Oct 2019 12:58:18 +0700
+Subject: [PATCH 3/9] allow mesh on non-systemd system
+
+---
+ Makefile.mesh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.mesh b/Makefile.mesh
+index 90979cbc0..9e6e2c2ca 100644
+--- a/Makefile.mesh
++++ b/Makefile.mesh
+@@ -2,11 +2,11 @@ if MESH
+ 
+ if DATAFILES
+ dbus_DATA += mesh/bluetooth-mesh.conf
++dbussystembus_DATA += mesh/org.bluez.mesh.service
+ endif
+ 
+ if SYSTEMD
+ systemdsystemunit_DATA += mesh/bluetooth-mesh.service
+-dbussystembus_DATA += mesh/org.bluez.mesh.service
+ endif
+ 
+ mesh_sources = mesh/mesh.h mesh/mesh.c \
+-- 
+2.23.0
+
diff --git a/srcpkgs/bluez/patches/0003-bluetooth-group-can-use-bluez.patch b/srcpkgs/bluez/patches/0003-bluetooth-group-can-use-bluez.patch
deleted file mode 100644
index 7a72e60944e..00000000000
--- a/srcpkgs/bluez/patches/0003-bluetooth-group-can-use-bluez.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/bluetooth.conf
-+++ src/bluetooth.conf
-@@ -28,6 +28,10 @@
-     <allow send_destination="org.bluez"/>
-   </policy>
- 
-+  <policy group="bluetooth">
-+    <allow send_destination="org.bluez"/>
-+  </policy>
-+
-   <!-- allow users of lp group (printing subsystem) to 
-        communicate with bluetoothd -->
-   <policy group="lp">
diff --git a/srcpkgs/bluez/patches/0004-include-sys-time.h-for-musl-build.patch b/srcpkgs/bluez/patches/0004-include-sys-time.h-for-musl-build.patch
new file mode 100644
index 00000000000..1cd573cc039
--- /dev/null
+++ b/srcpkgs/bluez/patches/0004-include-sys-time.h-for-musl-build.patch
@@ -0,0 +1,129 @@
+From 2a2eb634d481ab4eed0a444321dc12338de96d6a Mon Sep 17 00:00:00 2001
+From: Doan Tran Cong Danh <congdanhqx@gmail.com>
+Date: Thu, 3 Oct 2019 12:59:56 +0700
+Subject: [PATCH 4/9] include sys/time.h for musl build
+
+---
+ mesh/appkey.c         | 1 +
+ mesh/crypto.c         | 1 +
+ mesh/friend.c         | 1 +
+ mesh/manager.c        | 1 +
+ mesh/mesh.c           | 1 +
+ mesh/net.c            | 2 +-
+ mesh/pb-adv.c         | 1 +
+ mesh/prov-acceptor.c  | 1 +
+ mesh/prov-initiator.c | 1 +
+ 9 files changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/mesh/appkey.c b/mesh/appkey.c
+index 6c65454c1..a455c83b6 100644
+--- a/mesh/appkey.c
++++ b/mesh/appkey.c
+@@ -22,6 +22,7 @@
+ #endif
+ 
+ #define _GNU_SOURCE
++#include <sys/time.h>
+ #include <ell/ell.h>
+ 
+ #include "mesh/mesh-defs.h"
+diff --git a/mesh/crypto.c b/mesh/crypto.c
+index cebdffe45..e1689c6d7 100644
+--- a/mesh/crypto.c
++++ b/mesh/crypto.c
+@@ -24,6 +24,7 @@
+ #define _GNU_SOURCE
+ #include <unistd.h>
+ #include <sys/socket.h>
++#include <sys/time.h>
+ #include <ell/ell.h>
+ 
+ #include <linux/if_alg.h>
+diff --git a/mesh/friend.c b/mesh/friend.c
+index da2772870..ee48a3cc7 100644
+--- a/mesh/friend.c
++++ b/mesh/friend.c
+@@ -21,6 +21,7 @@
+ #include <config.h>
+ #endif
+ 
++#include <sys/time.h>
+ #include <ell/ell.h>
+ 
+ #include "mesh/mesh-defs.h"
+diff --git a/mesh/manager.c b/mesh/manager.c
+index 501ec10fe..6b6219c56 100644
+--- a/mesh/manager.c
++++ b/mesh/manager.c
+@@ -22,6 +22,7 @@
+ #endif
+ 
+ #define _GNU_SOURCE
++#include <sys/time.h>
+ #include <ell/ell.h>
+ 
+ #include "mesh/mesh-defs.h"
+diff --git a/mesh/mesh.c b/mesh/mesh.c
+index b660a7ef2..3ea8b2cb4 100644
+--- a/mesh/mesh.c
++++ b/mesh/mesh.c
+@@ -22,6 +22,7 @@
+ #endif
+ 
+ #define _GNU_SOURCE
++#include <sys/time.h>
+ #include <ell/ell.h>
+ 
+ #include "mesh/mesh-io.h"
+diff --git a/mesh/net.c b/mesh/net.c
+index 2785039db..740e3c3af 100644
+--- a/mesh/net.c
++++ b/mesh/net.c
+@@ -22,7 +22,7 @@
+ #endif
+ 
+ #define _GNU_SOURCE
+-
++#include <sys/time.h>
+ #include <ell/ell.h>
+ 
+ #include "mesh/mesh-defs.h"
+diff --git a/mesh/pb-adv.c b/mesh/pb-adv.c
+index 6b4a70052..481f4ac8d 100644
+--- a/mesh/pb-adv.c
++++ b/mesh/pb-adv.c
+@@ -21,6 +21,7 @@
+ #include <config.h>
+ #endif
+ 
++#include <sys/time.h>
+ #include <ell/ell.h>
+ 
+ #include "mesh/mesh-defs.h"
+diff --git a/mesh/prov-acceptor.c b/mesh/prov-acceptor.c
+index 57eb1e750..50989b217 100644
+--- a/mesh/prov-acceptor.c
++++ b/mesh/prov-acceptor.c
+@@ -21,6 +21,7 @@
+ #include <config.h>
+ #endif
+ 
++#include <sys/time.h>
+ #include <ell/ell.h>
+ 
+ #include "src/shared/ecc.h"
+diff --git a/mesh/prov-initiator.c b/mesh/prov-initiator.c
+index eb59f53f1..65cf194e6 100644
+--- a/mesh/prov-initiator.c
++++ b/mesh/prov-initiator.c
+@@ -21,6 +21,7 @@
+ #include <config.h>
+ #endif
+ 
++#include <sys/time.h>
+ #include <ell/ell.h>
+ 
+ #include "src/shared/ecc.h"
+-- 
+2.23.0
+
diff --git a/srcpkgs/bluez/patches/0005-include-limits.h-for-musl-build.patch b/srcpkgs/bluez/patches/0005-include-limits.h-for-musl-build.patch
new file mode 100644
index 00000000000..0de1d253c1f
--- /dev/null
+++ b/srcpkgs/bluez/patches/0005-include-limits.h-for-musl-build.patch
@@ -0,0 +1,66 @@
+From 9ac712db3c9913d6e00635e120d77541dcc51b6b Mon Sep 17 00:00:00 2001
+From: Doan Tran Cong Danh <congdanhqx@gmail.com>
+Date: Thu, 3 Oct 2019 13:00:13 +0700
+Subject: [PATCH 5/9] include limits.h for musl build
+
+---
+ mesh/keyring.c          | 2 +-
+ mesh/mesh-config-json.c | 1 +
+ mesh/node.c             | 1 +
+ mesh/util.c             | 1 +
+ 4 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/mesh/keyring.c b/mesh/keyring.c
+index 3a7f92f9f..d5765983c 100644
+--- a/mesh/keyring.c
++++ b/mesh/keyring.c
+@@ -24,9 +24,9 @@
+ #define _GNU_SOURCE
+ #include <fcntl.h>
+ #include <dirent.h>
++#include <limits.h>
+ #include <stdio.h>
+ #include <unistd.h>
+-#include <dirent.h>
+ 
+ #include <sys/stat.h>
+ 
+diff --git a/mesh/mesh-config-json.c b/mesh/mesh-config-json.c
+index cafa2fdd7..74ca49590 100644
+--- a/mesh/mesh-config-json.c
++++ b/mesh/mesh-config-json.c
+@@ -27,6 +27,7 @@
+ #include <fcntl.h>
+ #include <ftw.h>
+ #include <libgen.h>
++#include <limits.h>
+ #include <stdio.h>
+ #include <string.h>
+ #include <unistd.h>
+diff --git a/mesh/node.c b/mesh/node.c
+index b6824f505..15dcb977f 100644
+--- a/mesh/node.c
++++ b/mesh/node.c
+@@ -23,6 +23,7 @@
+ 
+ #define _GNU_SOURCE
+ #include <dirent.h>
++#include <limits.h>
+ #include <stdio.h>
+ #include <sys/time.h>
+ 
+diff --git a/mesh/util.c b/mesh/util.c
+index 1455bdec3..e441a2ed8 100644
+--- a/mesh/util.c
++++ b/mesh/util.c
+@@ -24,6 +24,7 @@
+ #define _GNU_SOURCE
+ #include <dirent.h>
+ #include <ftw.h>
++#include <limits.h>
+ #include <stdio.h>
+ #include <time.h>
+ #include <sys/time.h>
+-- 
+2.23.0
+
diff --git a/srcpkgs/bluez/patches/musl.patch b/srcpkgs/bluez/patches/0006-musl-fix.patch
similarity index 52%
rename from srcpkgs/bluez/patches/musl.patch
rename to srcpkgs/bluez/patches/0006-musl-fix.patch
index 033a1165fd5..ab0a588137e 100644
--- a/srcpkgs/bluez/patches/musl.patch
+++ b/srcpkgs/bluez/patches/0006-musl-fix.patch
@@ -1,10 +1,20 @@
+From d1d8408c9a7c7b5ffa30371f246cc18085e11313 Mon Sep 17 00:00:00 2001
+From: Doan Tran Cong Danh <congdanhqx@gmail.com>
+Date: Thu, 3 Oct 2019 13:00:27 +0700
+Subject: [PATCH 6/9] musl fix
+
 Including <linux/if_bridge.h> causes the inclusion of <linux/in6.h>,
 which defines 'struct in6_addr', already defined in <netinet/in.h>.
 Remove <linux/if_bridge.h> to fix musl build.
+---
+ tools/bneptest.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
 
---- tools/bneptest.c.orig	2015-07-30 21:17:18.000000000 +0200
-+++ tools/bneptest.c	2017-03-01 19:27:43.579458817 +0100
-@@ -36,7 +36,6 @@
+diff --git a/tools/bneptest.c b/tools/bneptest.c
+index 8bc7596b6..6b3956cfa 100644
+--- a/tools/bneptest.c
++++ b/tools/bneptest.c
+@@ -37,7 +37,6 @@
  #include <net/if.h>
  #include <linux/sockios.h>
  #include <netinet/in.h>
@@ -12,7 +22,7 @@ Remove <linux/if_bridge.h> to fix musl build.
  
  #include <glib.h>
  
-@@ -50,6 +49,9 @@
+@@ -51,6 +50,9 @@
  #include "lib/bnep.h"
  #include "profiles/network/bnep.h"
  
@@ -22,3 +32,6 @@ Remove <linux/if_bridge.h> to fix musl build.
  enum {
  	MODE_LISTEN,
  	MODE_CONNECT,
+-- 
+2.23.0
+
diff --git a/srcpkgs/bluez/patches/0007-include-string.h.patch b/srcpkgs/bluez/patches/0007-include-string.h.patch
new file mode 100644
index 00000000000..e1cff41df49
--- /dev/null
+++ b/srcpkgs/bluez/patches/0007-include-string.h.patch
@@ -0,0 +1,25 @@
+From fe1a76a03b9cbc28621d53680eb9ff4a2bd31778 Mon Sep 17 00:00:00 2001
+From: Doan Tran Cong Danh <congdanhqx@gmail.com>
+Date: Thu, 3 Oct 2019 16:31:01 +0700
+Subject: [PATCH 7/9] include string.h
+
+---
+ android/client/if-hf-client.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/android/client/if-hf-client.c b/android/client/if-hf-client.c
+index f701a814c..b44eb4291 100644
+--- a/android/client/if-hf-client.c
++++ b/android/client/if-hf-client.c
+@@ -16,6 +16,8 @@
+  */
+ 
+ #define _GNU_SOURCE
++#include <string.h>
++
+ #include "if-main.h"
+ #include "../hal-utils.h"
+ 
+-- 
+2.23.0
+
diff --git a/srcpkgs/bluez/patches/0008-grant-permission-to-bluetooth-group.patch b/srcpkgs/bluez/patches/0008-grant-permission-to-bluetooth-group.patch
new file mode 100644
index 00000000000..ec8a1f554af
--- /dev/null
+++ b/srcpkgs/bluez/patches/0008-grant-permission-to-bluetooth-group.patch
@@ -0,0 +1,27 @@
+From 05853e46e66868228468fc73d86f221b12edaef1 Mon Sep 17 00:00:00 2001
+From: Doan Tran Cong Danh <congdanhqx@gmail.com>
+Date: Fri, 4 Oct 2019 11:36:47 +0700
+Subject: [PATCH 8/9] grant permission to bluetooth group
+
+---
+ src/bluetooth.conf | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/bluetooth.conf b/src/bluetooth.conf
+index 8a1e25801..75dd7d670 100644
+--- a/src/bluetooth.conf
++++ b/src/bluetooth.conf
+@@ -22,6 +22,10 @@
+     <allow send_interface="org.mpris.MediaPlayer2.Player"/>
+   </policy>
+ 
++  <policy group="bluetooth">
++    <allow send_destination="org.bluez"/>
++  </policy>
++
+   <policy context="default">
+     <allow send_destination="org.bluez"/>
+   </policy>
+-- 
+2.23.0
+
diff --git a/srcpkgs/bluez/patches/0009-adapter-Don-t-refresh-adv_manager-for-non-LE-devices.patch b/srcpkgs/bluez/patches/0009-adapter-Don-t-refresh-adv_manager-for-non-LE-devices.patch
new file mode 100644
index 00000000000..b78dd879800
--- /dev/null
+++ b/srcpkgs/bluez/patches/0009-adapter-Don-t-refresh-adv_manager-for-non-LE-devices.patch
@@ -0,0 +1,51 @@
+From 3b357802d24ae4f918a1b001b6930280909ef87e Mon Sep 17 00:00:00 2001
+From: "antoine.belvire@laposte.net" <antoine.belvire@laposte.net>
+Date: Tue, 27 Mar 2018 20:30:26 +0200
+Subject: [PATCH 9/9] adapter: Don't refresh adv_manager for non-LE devices
+
+btd_adv_manager_refresh is called upon MGMT_SETTING_DISCOVERABLE setting change
+but as only LE adapters have an adv_manager, this leads to segmentation fault
+for non-LE devices:
+
+0  btd_adv_manager_refresh (manager=0x0) at src/advertising.c:1176
+1  0x0000556fe45fcb02 in settings_changed (settings=<optimized out>,
+    adapter=0x556fe53f7c70) at src/adapter.c:543
+2  new_settings_callback (index=<optimized out>, length=<optimized out>,
+    param=<optimized out>, user_data=0x556fe53f7c70) at src/adapter.c:573
+3  0x0000556fe462c278 in request_complete (mgmt=mgmt@entry=0x556fe53f20c0,
+    status=<optimized out>, opcode=opcode@entry=7, index=index@entry=0,
+    length=length@entry=4, param=0x556fe53eb5f9) at src/shared/mgmt.c:261
+4  0x0000556fe462cd9d in can_read_data (io=<optimized out>,
+    user_data=0x556fe53f20c0) at src/shared/mgmt.c:353
+5  0x0000556fe46396e3 in watch_callback (channel=<optimized out>,
+    cond=<optimized out>, user_data=<optimized out>)
+    at src/shared/io-glib.c:170
+6  0x00007fe351c980e5 in g_main_context_dispatch ()
+   from /usr/lib64/libglib-2.0.so.0
+7  0x00007fe351c984b0 in ?? () from /usr/lib64/libglib-2.0.so.0
+8  0x00007fe351c987c2 in g_main_loop_run () from /usr/lib64/libglib-2.0.so.0
+9  0x0000556fe45abc75 in main (argc=<optimized out>, argv=<optimized out>)
+    at src/main.c:770
+
+This commit prevents the call to btd_adv_manager_refresh for non-LE devices.
+---
+ src/adapter.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/adapter.c b/src/adapter.c
+index cef25616f..17018ecac 100644
+--- a/src/adapter.c
++++ b/src/adapter.c
+@@ -546,7 +546,8 @@ static void settings_changed(struct btd_adapter *adapter, uint32_t settings)
+ 		g_dbus_emit_property_changed(dbus_conn, adapter->path,
+ 					ADAPTER_INTERFACE, "Discoverable");
+ 		store_adapter_info(adapter);
+-		btd_adv_manager_refresh(adapter->adv_manager);
++		if (adapter->supported_settings & MGMT_SETTING_LE)
++			btd_adv_manager_refresh(adapter->adv_manager);
+ 	}
+ 
+ 	if (changed_mask & MGMT_SETTING_BONDABLE) {
+-- 
+2.23.0
+
diff --git a/srcpkgs/bluez/template b/srcpkgs/bluez/template
index c096e8386f7..9286b93a542 100644
--- a/srcpkgs/bluez/template
+++ b/srcpkgs/bluez/template
@@ -1,21 +1,33 @@
 # Template file for 'bluez'
 pkgname=bluez
-version=5.50
-revision=5
+version=5.51
+revision=1
 build_style=gnu-configure
 configure_args="--with-udevdir=/usr/lib/udev --disable-systemd
- --enable-sixaxis --enable-threads --enable-library --enable-deprecated"
+ --enable-sixaxis --enable-threads --enable-library --enable-deprecated
+ $(vopt_enable mesh) $(vopt_enable nfc)"
 hostmakedepends="automake flex libtool pkg-config"
 makedepends="cups-devel eudev-libudev-devel libglib-devel libical-devel
- readline-devel"
+ readline-devel $(vopt_if mesh json-c-devel)"
 short_desc="Bluetooth tools and daemons"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Doan Tran Cong Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://www.bluez.org/"
 distfiles="${KERNEL_SITE}/bluetooth/$pkgname-$version.tar.xz"
-checksum=5ffcaae18bbb6155f1591be8c24898dc12f062075a40b538b745bfd477481911
+checksum=ebedfb359f62957940822f1d0b39fcee30422380e435608dad06bb3913d5ebba
 conf_files="/etc/bluetooth/main.conf"
 system_groups="bluetooth"
+build_options="mesh nfc"
+patch_args="-Np1"
+
+post_patch() {
+	find android -name '*.h' -exec \
+		sed -i\
+			-e 's/__BEGIN_DECLS/#ifdef __cplusplus\nextern "C" {\n#endif/' \
+			-e 's/__END_DECLS/#ifdef __cplusplus\n}\n#endif/' \
+			-e '/#include .sys\/cdefs.h/d' \
+			{} +
+}
 
 pre_configure() {
 	autoreconf -fi
@@ -24,6 +36,9 @@ pre_configure() {
 post_install() {
 	vinstall ${wrksrc}/src/main.conf 644 etc/bluetooth
 	vsv bluetoothd
+	if [ $build_option_mesh ]; then
+		vsv bluetooth-meshd
+	fi
 }
 
 libbluetooth_package() {
@@ -68,4 +83,3 @@ bluez-deprecated_package() {
 		vmove usr/share/man/man1/sdptool.1
 	}
 }
-
diff --git a/srcpkgs/bogofilter/template b/srcpkgs/bogofilter/template
index ffa878f9cc8..6a804e5c649 100644
--- a/srcpkgs/bogofilter/template
+++ b/srcpkgs/bogofilter/template
@@ -1,18 +1,18 @@
 # Template file for 'bogofilter'
 pkgname=bogofilter
-version=1.2.4
-revision=4
+version=1.2.5
+revision=1
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/${pkgname} --with-database=sqlite"
 hostmakedepends="perl"
-depends="perl"
 makedepends="gsl-devel sqlite-devel"
-short_desc="A fast Bayesian spam filtering tool"
+depends="perl"
+short_desc="Fast Bayesian spam filtering tool"
 maintainer="Gour <gour@atmarama.net>"
-license="GPL-3"
+license="GPL-3.0-only"
 homepage="http://bogofilter.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=d2f2598d1300307209b7b1905cc0637d2d053c0a4701a8d44383867299578471
+distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
+checksum=3248a1373bff552c500834adbea4b6caee04224516ae581fb25a4c6a6dee89ea
 
 conf_files="/etc/bogofilter/bogofilter.cf"
 
diff --git a/srcpkgs/boinc/template b/srcpkgs/boinc/template
index 85315678f0e..ad3ac3a55f5 100644
--- a/srcpkgs/boinc/template
+++ b/srcpkgs/boinc/template
@@ -1,7 +1,7 @@
 # Template file for 'boinc'
 pkgname=boinc
-version=7.14.2
-revision=3
+version=7.16.3
+revision=1
 _majorver=${version%.*}
 wrksrc=boinc-client_release-${_majorver}-${version}
 build_style=gnu-configure
@@ -19,7 +19,7 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="LGPL-3.0-or-later"
 homepage="https://boinc.berkeley.edu/"
 distfiles="https://github.com/BOINC/boinc/archive/client_release/${_majorver}/${version}.tar.gz>boinc-${version}.tar.gz"
-checksum=970aedb9e25afa20be67f125ab05435df8eb2e66a3ac30ad316c54085e397c88
+checksum=622ce3335a01ef30add4813c0cc7b65cffcaa5500a7f58f77748d0dbc80e6b06
 conflicts="boinc-nox>=0"
 
 CXXFLAGS="-Wno-redundant-decls"
diff --git a/srcpkgs/borgmatic/template b/srcpkgs/borgmatic/template
index 6ddb713e591..8ef7c0568a6 100644
--- a/srcpkgs/borgmatic/template
+++ b/srcpkgs/borgmatic/template
@@ -1,6 +1,6 @@
 # Template file for 'borgmatic'
 pkgname=borgmatic
-version=1.3.14
+version=1.3.24
 revision=1
 archs=noarch
 build_style=python3-module
@@ -15,7 +15,7 @@ maintainer="Renato Aguiar <renato@renag.me>"
 license="GPL-3.0-only"
 homepage="https://torsion.org/borgmatic/"
 distfiles="${PYPI_SITE}/b/borgmatic/borgmatic-${version}.tar.gz"
-checksum=4fbb7a0f3a32ee0ebdd6f6a982f7ced00ec92205176cbe1cfeaa780466716bdc
+checksum=ca49f15e0eab8650550ce031a9c71a547acaaff15abd3448a6a2e55ca09e83ca
 
 do_check() {
 	# The tests use the NEWS file to get version and checks against
diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template
index 0d2f0021391..2e8da6f872a 100644
--- a/srcpkgs/botan/template
+++ b/srcpkgs/botan/template
@@ -1,7 +1,7 @@
 # Template file for 'botan'
 pkgname=botan
-version=2.10.0
-revision=2
+version=2.12.1
+revision=1
 wrksrc="${pkgname^}-${version}"
 build_style=gnu-makefile
 pycompile_module="botan.py"
@@ -11,8 +11,8 @@ short_desc="Crypto library written in C++"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="BSD-2-Clause"
 homepage="https://botan.randombit.net/"
-distfiles="https://botan.randombit.net/releases/Botan-${version}.tgz"
-checksum=88481997578c27924724fea76610d43d9f59c99edfe561d41803bbc98871ad31
+distfiles="https://botan.randombit.net/releases/Botan-${version}.tar.xz"
+checksum=7e035f142a51fca1359705792627a282456d49749bf62a37a8e48375d41baaa9
 
 python_version=2
 
@@ -20,7 +20,7 @@ LDFLAGS="-pthread"
 CXXFLAGS="-O3"
 
 do_configure() {
-	local _args _arch _cpu
+	local _args _cpu
 
 	_args="--prefix=/usr"
 	_args+=" --os=linux"
@@ -36,48 +36,44 @@ do_configure() {
 	case "$XBPS_TARGET_MACHINE" in
 	i686*)
 		_cpu="i686"
-		_arch="x86"
 		;;
 	x86_64*)
 		_cpu="x86_64"
-		_arch="x86"
 		;;
 	armv5*)
 		_cpu="arm"
-		_arch="armv5te"
 		_args+=" --disable-modules=simd"
 		;;
 	armv6*)
 		_cpu="arm"
-		_arch="armv6"
 		_args+=" --disable-modules=simd"
 		;;
 	armv7*)
 		_cpu="armv7-a"
-		_arch="armv7"
 		_args+=" --disable-modules=simd"
 		;;
 	aarch64*)
 		_cpu="armv8-a"
-		_arch="arm64"
 		;;
 	mips*)
 		_cpu="mips32"
-		_arch="mips"
 		;;
 	ppc64le*)
 		_cpu="ppc64le"
-		_arch="ppc64le"
 		;;
 	ppc64*)
 		_cpu="ppc64"
-		_arch="ppc64"
+		;;
+	ppc*)
+		_cpu="ppc"
+		;;
+	*)
+		_cpu="${XBPS_TARGET_MACHINE%-musl}"
 		;;
 	esac
 
 	python2 configure.py \
 		--distribution-info="Void Linux botan-${version}_${revision}" \
-		--cc-abi-flags="-std=c++14" \
 		--cpu=${_cpu} \
 		${_args}
 }
diff --git a/srcpkgs/bpftrace/template b/srcpkgs/bpftrace/template
index cac5b779664..56d673d38e5 100644
--- a/srcpkgs/bpftrace/template
+++ b/srcpkgs/bpftrace/template
@@ -1,7 +1,7 @@
 # Template file for 'bpftrace'
 pkgname=bpftrace
 version=0.9.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"  # needs root to run
 hostmakedepends="pkg-config flex"
diff --git a/srcpkgs/breeze-gtk/template b/srcpkgs/breeze-gtk/template
index 9911b616943..e114ade1943 100644
--- a/srcpkgs/breeze-gtk/template
+++ b/srcpkgs/breeze-gtk/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-gtk'
 pkgname=breeze-gtk
-version=5.16.4
+version=5.17.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules sassc python3 python3-cairo"
@@ -10,7 +10,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/plasma/breeze-gtk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=8c954a8754bc75b2d8edff70a7b322c559da6e23dc75e1ed616ac926fbe186eb
+checksum=bba00e94bad2b6f9baae19b1edba076785f45a94b591dd4b34f7b9104348cc3a
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel"
diff --git a/srcpkgs/breeze-icons/template b/srcpkgs/breeze-icons/template
index 512daf7ad2c..884d465a884 100644
--- a/srcpkgs/breeze-icons/template
+++ b/srcpkgs/breeze-icons/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-icons'
 pkgname=breeze-icons
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel libxml2"
@@ -10,7 +10,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-3.0-or-later"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1d260a01a2617f5f755d2eb38423af19bf4a1a2ccfa9339b441b4f6be6381c30
+checksum=25a5b55e5be0fc3df837e0dd8f6721bfcbb30ed94be6ac92c88523485ba2719e
 
 if [ -z "$CROSS_BUILD" ]; then
 	configure_args="-DBINARY_ICONS_RESOURCE=ON"
diff --git a/srcpkgs/breeze/template b/srcpkgs/breeze/template
index 41d10059cd7..7bdb56fa3ef 100644
--- a/srcpkgs/breeze/template
+++ b/srcpkgs/breeze/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze'
 pkgname=breeze
-version=5.16.4
+version=5.17.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/plasma/breeze"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=84fea0c31a41521983698ad2aed603b5e2c6e4f6e8723e2c64c66c37eb2a5395
+checksum=9d32ceffe33b776fcb7ec92d99088503a97c49e4b6216153438d5f7b93af8345
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/brig/template b/srcpkgs/brig/template
index 72f627b5127..59dcd0ceba6 100644
--- a/srcpkgs/brig/template
+++ b/srcpkgs/brig/template
@@ -5,7 +5,7 @@ revision=1
 build_style=go
 go_import_path=github.com/sahib/brig
 short_desc="File synchronization on top of IPFS with git-like interface and WebUI"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-or-later"
 homepage="https://brig.readthedocs.io/en/master/"
 distfiles="https://github.com/sahib/brig/archive/v${version}.tar.gz"
diff --git a/srcpkgs/brisk-menu/patches/69fa052df45c1fa439f6af0a2c8e9795087b9444.patch b/srcpkgs/brisk-menu/patches/69fa052df45c1fa439f6af0a2c8e9795087b9444.patch
deleted file mode 100644
index 4b2bd478c8a..00000000000
--- a/srcpkgs/brisk-menu/patches/69fa052df45c1fa439f6af0a2c8e9795087b9444.patch
+++ /dev/null
@@ -1,185 +0,0 @@
-From 3cab9d1fc7b2ca500c7d3276e17b256f395e0126 Mon Sep 17 00:00:00 2001
-From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-Date: Fri, 19 Jan 2018 22:57:26 +0100
-Subject: [PATCH 1/2] Reliably fix parallel builds of brisk-menu.
-
-  - Move brisk-glue .xml files to data/ and ...
-  - process them in an earlier stage of the build
-
- Fixes solus-project/brisk-menu#73.
----
- data/meson.build                              | 16 ++++++++
- .../org.gnome.SessionManager.xml              |  0
- .../session => data}/org.mate.ScreenSaver.xml |  0
- src/frontend/meson.build                      |  1 +
- src/meson.build                               | 28 +++++++++++--
- src/session/meson.build                       | 40 -------------------
- 6 files changed, 42 insertions(+), 43 deletions(-)
- rename {src/session => data}/org.gnome.SessionManager.xml (100%)
- rename {src/session => data}/org.mate.ScreenSaver.xml (100%)
- delete mode 100644 src/session/meson.build
-
-diff --git data/meson.build data/meson.build
-index 609ff27..aa450e8 100644
---- data/meson.build
-+++ data/meson.build
-@@ -12,6 +12,22 @@ brisk_resources = gnome.compile_resources(
-     ],
- )
- 
-+# libsaver_glue provides dbus code for the MATE screensaver
-+libsaver_glue = gnome.gdbus_codegen(
-+    'libsaver-glue',
-+    'org.mate.ScreenSaver.xml',
-+    interface_prefix : 'org.mate.',
-+    namespace : 'Mate',
-+)
-+
-+# libsession_glue provides dbus code for the MATE/GNOME session
-+libsession_glue = gnome.gdbus_codegen(
-+    'libsession-glue',
-+    'org.gnome.SessionManager.xml',
-+    interface_prefix : 'org.gnome.',
-+    namespace : 'Gnome',
-+)
-+
- icons = [
-     'brisk_system-log-out-symbolic.svg',
- ]
-diff --git src/session/org.gnome.SessionManager.xml data/org.gnome.SessionManager.xml
-similarity index 100%
-rename from src/session/org.gnome.SessionManager.xml
-rename to data/org.gnome.SessionManager.xml
-diff --git src/session/org.mate.ScreenSaver.xml data/org.mate.ScreenSaver.xml
-similarity index 100%
-rename from src/session/org.mate.ScreenSaver.xml
-rename to data/org.mate.ScreenSaver.xml
-diff --git src/frontend/meson.build src/frontend/meson.build
-index 624b590..31e2f17 100644
---- src/frontend/meson.build
-+++ src/frontend/meson.build
-@@ -30,6 +30,7 @@ libfrontend_dependencies = [
- 
- libfrontend_includes = [
-     include_directories('.'),
-+    include_directories('../../data'),
- ]
- 
- # Contains the main Brisk UI (Windowed)
-diff --git src/meson.build src/meson.build
-index 7c26b57..0f29a58 100644
---- src/meson.build
-+++ src/meson.build
-@@ -18,15 +18,37 @@ link_libresources = declare_dependency(
-     ],
- )
- 
-+# Build the Cs into a simple static library and control compiler noise
-+libsession_stub = static_library(
-+    'brisk-glue',
-+    sources: [
-+        libsaver_glue,
-+        libsession_glue,
-+    ],
-+    c_args: [
-+        '-Wno-unused-parameter',
-+    ],
-+    dependencies: dep_gio_unix,
-+    install: false,
-+)
-+
-+# Allow linking to the stub
-+link_libsession_stub = declare_dependency(
-+    link_with: libsession_stub,
-+    dependencies: [
-+        dep_gio_unix,
-+    ],
-+    include_directories: [
-+        include_directories('.'),
-+    ],
-+)
-+
- # Build common library (currently just keybinder really.)
- subdir('lib')
- 
- # Build the backend component
- subdir('backend')
- 
--# Build session glue to help the frontend out
--subdir('session')
--
- # Now build our main UI
- subdir('frontend')
- 
-diff --git src/session/meson.build src/session/meson.build
-deleted file mode 100644
-index 5b38bdc..0000000
---- src/session/meson.build
-+++ /dev/null
-@@ -1,40 +0,0 @@
--# libsaver_glue provides dbus code for the MATE screensaver
--libsaver_glue = gnome.gdbus_codegen(
--    'libsaver-glue',
--    'org.mate.ScreenSaver.xml',
--    interface_prefix : 'org.mate.',
--    namespace : 'Mate',
--)
--
--# libsession_glue provides dbus code for the MATE/GNOME session
--libsession_glue = gnome.gdbus_codegen(
--    'libsession-glue',
--    'org.gnome.SessionManager.xml',
--    interface_prefix : 'org.gnome.',
--    namespace : 'Gnome',
--)
--
--# Build the Cs into a simple static library and control compiler noise
--libsession_stub = static_library(
--    'brisk-glue',
--    sources: [
--        libsaver_glue,
--        libsession_glue,
--    ],
--    c_args: [
--        '-Wno-unused-parameter',
--    ],
--    dependencies: dep_gio_unix,
--    install: false,
--)
--
--# Allow linking to the stub
--link_libsession_stub = declare_dependency(
--    link_with: libsession_stub,
--    dependencies: [
--        dep_gio_unix,
--    ],
--    include_directories: [
--        include_directories('.'),
--    ],
--)
-
-From 2309dab7ee5cce419c02038092a075096a89ff88 Mon Sep 17 00:00:00 2001
-From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-Date: Fri, 19 Jan 2018 23:01:46 +0100
-Subject: [PATCH 2/2] src/mesa.build: Fix build against GLib << 2.51.3.
-
-  - This patch is not hurting builds against newer GLib versions.
-  - For details, see https://github.com/mesonbuild/meson/issues/1387
----
- src/meson.build | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git src/meson.build src/meson.build
-index 0f29a58..7d8ca3f 100644
---- src/meson.build
-+++ src/meson.build
-@@ -30,6 +30,9 @@ libsession_stub = static_library(
-     ],
-     dependencies: dep_gio_unix,
-     install: false,
-+    include_directories: [
-+        include_directories('..'),
-+    ],
- )
- 
- # Allow linking to the stub
diff --git a/srcpkgs/brisk-menu/template b/srcpkgs/brisk-menu/template
index 67c0d1fa881..f440391e26e 100644
--- a/srcpkgs/brisk-menu/template
+++ b/srcpkgs/brisk-menu/template
@@ -1,6 +1,6 @@
 # Template file for 'brisk-menu'
 pkgname=brisk-menu
-version=0.5.0
+version=0.6.1
 revision=1
 wrksrc="${pkgname}-v${version}"
 build_style=meson
@@ -9,10 +9,10 @@ makedepends="gtk+3-devel mate-menus-devel libmate-panel-devel libnotify-devel"
 depends="mate-panel"
 short_desc="Modern, efficient menu for the MATE DE"
 maintainer="Jasu Koponen <jasu.koponen@hotmail.com>"
-license="GPL-2, CC-BY-SA-4.0"
-homepage="https://github.com/solus-project/brisk-menu"
+license="GPL-2.0-only, CC-BY-SA-4.0"
+homepage="https://github.com/getsolus/brisk-menu"
 distfiles="${homepage}/releases/download/v${version}/${pkgname}-v${version}.tar.xz"
-checksum=1377ffbb784e576c290bb4d11a2dd376bc0ad017bb9f56a080bccdbc4fbe88ce
+checksum=9cf9ae307a780afe5b808b8233ac85ecf948f846efbcfb60a6adcc8fd77017aa
 
 post_install() {
 	vlicense LICENSE.CC-BY-SA-4.0
diff --git a/srcpkgs/bro/template b/srcpkgs/bro/template
index 95552592e28..0d65960711e 100644
--- a/srcpkgs/bro/template
+++ b/srcpkgs/bro/template
@@ -1,6 +1,6 @@
 # Template file for 'bro'
 pkgname=bro
-version=2.6.3
+version=2.6.4
 revision=1
 build_style=cmake
 hostmakedepends="flex pkg-config python3"
@@ -10,7 +10,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.bro.org"
 distfiles="https://www.bro.org/downloads/bro-${version}.tar.gz"
-checksum=469dd7456af388ba65d8722fbfdd5b9182f14def16149aa5ebceb1cfd881697f
+checksum=a47a9cdcef0ea14d5f70c390ab266f0333063ff96f3869a5f1609581a1d1ceb7
 nocross="Needs to build part of itself to run, can't be built separately yet."
 
 case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/broot/template b/srcpkgs/broot/template
index b4da3bf687a..b18675c1743 100644
--- a/srcpkgs/broot/template
+++ b/srcpkgs/broot/template
@@ -1,6 +1,6 @@
 # Template file for 'broot'
 pkgname=broot
-version=0.9.3
+version=0.9.6
 revision=1
 build_style=cargo
 short_desc="Interactive directory tree view, fuzzy search, balanced BFS descent"
@@ -8,7 +8,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://dystroy.org/broot/"
 distfiles="https://github.com/Canop/broot/archive/v${version}.tar.gz"
-checksum=@6d681c9336277dd8d13ba2238809b5ed2c0004a45c9574b50cbc4c7f2ce59c21
+checksum=af8b36d5d4242ec1bd86925f0f664a610e7e94309686ef0874df6bc0867a0c3e
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/brother-brlaser/template b/srcpkgs/brother-brlaser/template
index e2b22b19b23..9e67aa9d44c 100644
--- a/srcpkgs/brother-brlaser/template
+++ b/srcpkgs/brother-brlaser/template
@@ -1,6 +1,6 @@
 # Template file for 'brother-brlaser'
 pkgname=brother-brlaser
-version=5
+version=6
 revision=1
 wrksrc="brlaser-${version}"
 build_style=cmake
@@ -11,4 +11,4 @@ maintainer="Jaredy <jaredycalves@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/pdewacht/brlaser"
 distfiles="https://github.com/pdewacht/brlaser/archive/v${version}.tar.gz"
-checksum=0848513c03a789a450b9115419a24a43c92bcc2eb41203a7c5ea3c0a76ac52d2
+checksum=fe7c117eb7e837b6a1751f61a813c218f68a5d8fc40f3403f6a4b1cf5a4758dd
diff --git a/srcpkgs/bs1770gain/template b/srcpkgs/bs1770gain/template
index 772f2c33212..60efd328e4a 100644
--- a/srcpkgs/bs1770gain/template
+++ b/srcpkgs/bs1770gain/template
@@ -1,7 +1,9 @@
 # Template file for 'bs1770gain'
 pkgname=bs1770gain
-version=0.5.2
+version=0.6.4
 revision=1
+# bgx.c:29:10: fatal error: gnu/libc-version.h: No such file or directory
+archs="~*-musl"
 build_style=gnu-configure
 makedepends="ffmpeg-devel sox-devel"
 short_desc="Loudness scanner compliant with ITU-R BS.1770"
@@ -9,4 +11,4 @@ maintainer="Michal Koutenský <koutak.m@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://bs1770gain.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=73e5738786b57afb89582333ed18206fd2c6d5245717d3b24ace7f7670f9dedc
+checksum=24cf866748c78bc103a5f53c1af958531357b55bd945ee9e26f8c86445163515
diff --git a/srcpkgs/bsdunzip/template b/srcpkgs/bsdunzip/template
index 450efc1e69e..dd02386b3e0 100644
--- a/srcpkgs/bsdunzip/template
+++ b/srcpkgs/bsdunzip/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-makefile
 makedepends="libarchive-devel"
 short_desc="Libarchive(3)-utilizing unzip implementation from FreeBSD"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD, ISC"
 homepage="https://github.com/somasis/bsdunzip"
 distfiles="https://github.com/somasis/bsdunzip/archive/${version}.tar.gz"
diff --git a/srcpkgs/bspwm/template b/srcpkgs/bspwm/template
index c8b7e959ab3..df8fdee1f5f 100644
--- a/srcpkgs/bspwm/template
+++ b/srcpkgs/bspwm/template
@@ -1,6 +1,6 @@
 # Template file for 'bspwm'
 pkgname=bspwm
-version=0.9.8
+version=0.9.9
 revision=1
 makedepends="xcb-util-wm-devel xcb-util-keysyms-devel"
 short_desc="Tiling window manager based on binary space partitioning"
@@ -8,7 +8,7 @@ maintainer="Nathan Owens <ndowens04@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://github.com/baskerville/bspwm"
 distfiles="https://github.com/baskerville/bspwm/archive/${version}.tar.gz"
-checksum=8bf670227b3e3c91b94df0834daf2b3da36bbac196c5bcc65353b3eb5983afa6
+checksum=b1438c3cad13b6101edb31ce8d00ba4ed2f972754e85b90f763e04fa5143c6fc
 
 do_build() {
 	make CC=$CC
diff --git a/srcpkgs/btfs/template b/srcpkgs/btfs/template
index 7419009970f..cac840fda33 100644
--- a/srcpkgs/btfs/template
+++ b/srcpkgs/btfs/template
@@ -1,19 +1,17 @@
 # Template file for 'btfs'
 pkgname=btfs
-version=2.19
+version=2.20
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake pkg-config"
-makedepends="boost-devel libcurl-devel libtorrent-rasterbar-devel fuse-devel"
-depends="python"
+makedepends="boost-devel fuse-devel libcurl-devel libtorrent-rasterbar-devel"
+depends="python3"
 short_desc="Bittorrent filesystem based on FUSE"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Daniel Eyßer <daniel.eysser@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/johang/btfs"
 distfiles="https://github.com/johang/btfs/archive/v${version}.tar.gz"
-checksum=678831788e3b5e24f674adf87618353bea935fb418d512f17aabe3244f06b7e1
-
-CXXFLAGS="-std=c++11"
+checksum=ab85d10407d210c367dc5a0db6aa9e8620ebbb819c58da783ca343dfa8577441
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/btrfs-progs/template b/srcpkgs/btrfs-progs/template
index 729425bafcd..8a525ea0af0 100644
--- a/srcpkgs/btrfs-progs/template
+++ b/srcpkgs/btrfs-progs/template
@@ -1,6 +1,6 @@
 # Template file for 'btrfs-progs'
 pkgname=btrfs-progs
-version=5.2.1
+version=5.2.2
 revision=1
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
@@ -15,7 +15,7 @@ license="GPL-2.0-only, LGPL-3.0-or-later"
 homepage="https://btrfs.wiki.kernel.org/index.php/Main_Page"
 changelog="https://raw.githubusercontent.com/kdave/btrfs-progs/master/CHANGES"
 distfiles="${KERNEL_SITE}/kernel/people/kdave/${pkgname}/${pkgname}-v${version}.tar.xz"
-checksum=36ac4a0198ffff79d5800c537ea4b19769a8fd3ad870f75413d25b20e2d83233
+checksum=821321dbf17087e1172023fa35656ce52d342fbfe210fb8ea01fc57b65dfb1c6
 
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh
diff --git a/srcpkgs/buildah/template b/srcpkgs/buildah/template
index d852dccf93f..2145d41023d 100644
--- a/srcpkgs/buildah/template
+++ b/srcpkgs/buildah/template
@@ -1,6 +1,6 @@
 # Template file for 'buildah'
 pkgname=buildah
-version=1.10.1
+version=1.11.3
 revision=1
 build_style=go
 go_import_path=github.com/containers/buildah
@@ -15,7 +15,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://github.com/containers/buildah"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=02dc74649a2341d355281911ee5a8e4801165192e4419627513698ab129c9e78
+checksum=a3df3f87aa06e322f8fb5f61337cffa2c57ad4fca6b49ed9431b3275b52131a5
 
 post_build() {
 	make -C docs GOMD2MAN=go-md2man
diff --git a/srcpkgs/buildbot/template b/srcpkgs/buildbot/template
index c753cd7c502..9bee50ec737 100644
--- a/srcpkgs/buildbot/template
+++ b/srcpkgs/buildbot/template
@@ -1,7 +1,8 @@
 # Template file for 'buildbot'
 pkgname=buildbot
+reverts="2.4.1_1"
 version=0.8.14
-revision=3
+revision=4
 archs=noarch
 build_style=python2-module
 pycompile_module="buildbot"
diff --git a/srcpkgs/bum/template b/srcpkgs/bum/template
index 7bf9c33f47e..58d0bb2b7f7 100644
--- a/srcpkgs/bum/template
+++ b/srcpkgs/bum/template
@@ -8,7 +8,7 @@ pycompile_module="bum"
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-mpd2 python3-musicbrainzngs python3-mpv"
 short_desc="Daemon that downloads and displays album arts via MPD events"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/dylanaraps/bum"
 distfiles="https://github.com/dylanaraps/bum/archive/${version}.tar.gz"
diff --git a/srcpkgs/bvi/template b/srcpkgs/bvi/template
index 476935bd33e..b31f4fc737e 100644
--- a/srcpkgs/bvi/template
+++ b/srcpkgs/bvi/template
@@ -1,12 +1,12 @@
 # Template file for 'bvi'
 pkgname=bvi
-version=1.4.0
+version=1.4.1
 revision=1
 build_style=gnu-configure
 makedepends="ncurses-devel"
-short_desc="A display-oriented editor for binary files"
+short_desc="Display-oriented editor for binary files"
 maintainer="oliver <ohemming@gmail.com>"
-license="GPL-2"
+license="GPL-3.0-or-later"
 homepage="http://bvi.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.src.tar.gz"
-checksum=015a3c2832c7c097d98a5527deef882119546287ba8f2a70c736227d764ef802
+checksum=3035255ca79e0464567d255baa5544f7794e2b7eb791dcc60cc339cf1aa01e28
diff --git a/srcpkgs/cJSON/template b/srcpkgs/cJSON/template
index e15f0252e7f..98595580c23 100644
--- a/srcpkgs/cJSON/template
+++ b/srcpkgs/cJSON/template
@@ -4,7 +4,7 @@ version=1.7.12
 revision=1
 build_style=cmake
 short_desc="Ultralightweight JSON parser in ANSI C"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/DaveGamble/cJSON"
 distfiles="https://github.com/DaveGamble/cJSON/archive/v${version}.tar.gz"
diff --git a/srcpkgs/caddy/template b/srcpkgs/caddy/template
index 5a647aca447..e863de20f2f 100644
--- a/srcpkgs/caddy/template
+++ b/srcpkgs/caddy/template
@@ -1,6 +1,6 @@
 # Template file for 'caddy'
 pkgname=caddy
-version=1.0.1
+version=1.0.3
 revision=1
 build_style=go
 go_import_path=github.com/caddyserver/caddy
@@ -11,7 +11,7 @@ maintainer="Dominic Monroe <monroef4@googlemail.com>"
 license="Apache-2.0"
 homepage="https://caddyserver.com"
 distfiles="https://github.com/caddyserver/caddy/archive/v${version}.tar.gz"
-checksum=7cbd80c798a0db4195381f730f5409680c6e1239fbc06295b90b34f666a05692
+checksum=c1c7b337a5008d28c1956fd4f057104a78d0e24b74c30867cea988369b61fed3
 
 system_accounts="caddy"
 make_dirs="
diff --git a/srcpkgs/cage/template b/srcpkgs/cage/template
new file mode 100644
index 00000000000..eca84c1dacc
--- /dev/null
+++ b/srcpkgs/cage/template
@@ -0,0 +1,18 @@
+# Template file for 'cage'
+pkgname=cage
+version=0.1.1
+revision=1
+build_style=meson
+hostmakedepends="pkg-config wayland-devel"
+makedepends="libxkbcommon-devel pixman-devel wayland-devel wlroots-devel"
+short_desc="Kiosk compositor for Wayland"
+maintainer="Illia Shestakov <ishestakov@airmail.cc>"
+license="MIT"
+homepage="https://www.hjdskes.nl/projects/cage/"
+distfiles="https://github.com/Hjdskes/cage/archive/v${version}.tar.gz"
+checksum=63efbe96cf307381f2bedf9b80153343e255970a70d612515da7dc325dd49478
+
+post_install() {
+	vlicense LICENSE
+	vdoc README.md
+}
diff --git a/srcpkgs/caja-extensions/template b/srcpkgs/caja-extensions/template
index dd5d680d6f3..cb7f942eb7b 100644
--- a/srcpkgs/caja-extensions/template
+++ b/srcpkgs/caja-extensions/template
@@ -1,6 +1,6 @@
 # Template file for 'caja-extensions'
 pkgname=caja-extensions
-version=1.22.0
+version=1.22.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-gksu"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://mate-desktop.org"
 distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=779c237f7e922c877f7884a0201cb54da9c8f30c414a7ee297178fd6aa3406c1
+checksum=d0845b6f2921ee7b7c951d4490a4fd7166f90b85f60a22aef77c75b53fbcf077
 
 caja-image-converter_package() {
 	short_desc="Caja extension for simple image conversions"
diff --git a/srcpkgs/caja/template b/srcpkgs/caja/template
index b190ff7fad1..71f867920a0 100644
--- a/srcpkgs/caja/template
+++ b/srcpkgs/caja/template
@@ -1,6 +1,6 @@
 # Template file for 'caja'
 pkgname=caja
-version=1.22.1
+version=1.22.2
 revision=1
 build_style=gnu-configure
 build_helper="gir"
@@ -17,7 +17,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://mate-desktop.org"
 distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3b26efd276c68a579db443ea1f85a270cd33c59284667d5db8d5d355a3f46781
+checksum=b09cfd068da3789fddd564afb7117ed874472e97c9d2f3ceb7a7fd8b16c9beb0
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/calcurse/patches/DST-fix-date-change.patch b/srcpkgs/calcurse/patches/DST-fix-date-change.patch
new file mode 100644
index 00000000000..6ecadfd49bc
--- /dev/null
+++ b/srcpkgs/calcurse/patches/DST-fix-date-change.patch
@@ -0,0 +1,34 @@
+From d6fd07785fe8072e6bbadc173e9d6a2e73efdcdd Mon Sep 17 00:00:00 2001
+From: Lars Henriksen <LarsHenriksen@get2net.dk>
+Date: Thu, 1 Aug 2019 07:19:14 +0200
+Subject: DST: fix date_change() thoroughly
+
+Explicit setting of Daylight Saving Time should be avoided before as well as
+after the mktime() call.
+
+Signed-off-by: Lars Henriksen <LarsHenriksen@get2net.dk>
+Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
+---
+ src/utils.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/utils.c b/src/utils.c
+index 8a8de75..a9a9e68 100644
+--- src/utils.c
++++ src/utils.c
+@@ -525,10 +525,11 @@ int date_change(struct tm *date, int delta_month, int delta_day)
+ 	t = *date;
+ 	t.tm_mon += delta_month;
+ 	t.tm_mday += delta_day;
+-
++	t.tm_isdst = -1;
+ 	if (mktime(&t) == -1) {
+ 		return 1;
+ 	} else {
++		t.tm_isdst = -1;
+ 		*date = t;
+ 		return 0;
+ 	}
+-- 
+cgit v1.2.1
+
diff --git a/srcpkgs/calcurse/template b/srcpkgs/calcurse/template
index b1c5e29ba2c..4508aba0a1f 100644
--- a/srcpkgs/calcurse/template
+++ b/srcpkgs/calcurse/template
@@ -1,7 +1,7 @@
 # Template file for 'calcurse'
 pkgname=calcurse
 version=4.5.0
-revision=1
+revision=2
 build_style=gnu-configure
 makedepends="ncurses-devel"
 depends="python3-httplib2"
diff --git a/srcpkgs/calendarsupport/template b/srcpkgs/calendarsupport/template
index 50c165c8161..ab5e828cacb 100644
--- a/srcpkgs/calendarsupport/template
+++ b/srcpkgs/calendarsupport/template
@@ -1,6 +1,6 @@
 # Template file for 'calendarsupport'
 pkgname=calendarsupport
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig python3 qt5-host-tools qt5-qmake
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/applications/${version}/src/calendarsupport-${version}.tar.xz"
-checksum=af590cf5443c1205a8bd59d00c430bbdf65a185a36ed36e92e6ef78bba8551e4
+checksum=9ae448463ca60e075f1ea9a22489f0acf6ea672c00f9bd7b49027e548e82c2af
 
 calendarsupport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index 43ff96d668b..dce942cf36f 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,29 +1,30 @@
 # Template file for 'calibre'
 pkgname=calibre
-version=3.46.0
+version=4.1.0
 revision=1
 build_style=python2-module
 pycompile_dirs="/usr/lib/calibre/"
 make_build_args="gui"
 hostmakedepends="pkg-config python-BeautifulSoup4 python-Pillow python-PyQt5-svg
- python-PyQt5-webkit python-apsw python-css-parser python-dateutil
+ python-PyQt5-webengine python-apsw python-css-parser python-dateutil
  python-devel python-html5-parser python-msgpack python-regex qt5-qmake
  xdg-utils"
 makedepends="glib-devel libchmlib-devel libinput-devel libmagick-devel libmtp-devel
  libpodofo-devel libwmf-devel libxkbcommon-devel python-PyQt5-devel
- qt5-devel sqlite-devel tslib-devel qt5-webkit-devel"
+ qt5-devel sqlite-devel tslib-devel hunspell-devel"
 depends="desktop-file-utils optipng poppler-utils python-BeautifulSoup4
  python-CherryPy python-Markdown python-Pillow python-PyQt5-svg
- python-PyQt5-webkit python-Pygments python-apsw python-css-parser
- python-cssselect python-dateutil python-dbus python-dnspython
- python-feedparser python-html5-parser python-mechanize python-msgpack
- python-netifaces python-psutil python-regex"
+ python-PyQt5-webengine python-PyQt5-webchannel python-Pygments python-apsw
+ python-css-parser python-cssselect python-dateutil python-dbus
+ python-dnspython python-feedparser python-html5-parser python-mechanize
+ python-msgpack python-netifaces python-psutil python-regex qt5-webengine"
 short_desc="Ebook management application"
 maintainer="bra1nwave <brainwave@openmailbox.org>"
 license="GPL-3.0-only"
 homepage="https://calibre-ebook.com"
+changelog="https://raw.githubusercontent.com/kovidgoyal/calibre/master/Changelog.yaml"
 distfiles="https://download.calibre-ebook.com/${version}/calibre-${version}.tar.xz"
-checksum=e947b9854f9db344ee07e5495feaad759c96936d89a128d3a3587c3503d09ab6
+checksum=363f89b4c26ba8f8bba1eb40da09df85b8b3fedf9a0256285a0abae1ff65987c
 nocross=yes
 
 do_configure() {
@@ -38,6 +39,12 @@ do_configure() {
 }
 
 do_install() {
+	vmkdir usr/share/zsh/site-functions
+
 	python2 setup.py \
 		install --prefix=/usr --staging-root=${DESTDIR}/usr
+
+	for m in man-pages/man1/*.1; do
+		vman "${m}"
+	done
 }
diff --git a/srcpkgs/calligra-plan/patches/missing-includes.patch b/srcpkgs/calligra-plan/patches/missing-includes.patch
index c02c5a82326..efb4183edfe 100644
--- a/srcpkgs/calligra-plan/patches/missing-includes.patch
+++ b/srcpkgs/calligra-plan/patches/missing-includes.patch
@@ -79,3 +79,25 @@
  
  class KoUnit;
  
+From fe36bf6f0dc1f0c1e927850dd78093cfe3b7aae2 Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Sun, 28 Jul 2019 00:07:33 +0200
+Subject: [PATCH] Fix compile on CI
+
+src/workpackage/view.h:148:31: error: field m_scheduleActions has incomplete type QMap<QAction*, KPlato::Schedule*>
+---
+ src/workpackage/view.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/workpackage/view.h b/src/workpackage/view.h
+index 6cae32b7..cd2fc4ea 100644
+--- src/workpackage/view.h
++++ src/workpackage/view.h
+@@ -24,6 +24,7 @@
+ 
+ #include <KoView.h>
+ 
++#include <QMap>
+ #include <QStackedWidget>
+ 
+ class QPrinter;
diff --git a/srcpkgs/calligra-plan/template b/srcpkgs/calligra-plan/template
index 321312114b5..a39e482f1b6 100644
--- a/srcpkgs/calligra-plan/template
+++ b/srcpkgs/calligra-plan/template
@@ -1,7 +1,7 @@
 # Template file for 'calligra-plan'
 pkgname=calligra-plan
 version=3.1.0
-revision=3
+revision=4
 wrksrc="${pkgname/-/}-${version}"
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools"
diff --git a/srcpkgs/calligra/patches/qt5.13.patch b/srcpkgs/calligra/patches/qt5.13.patch
new file mode 100644
index 00000000000..ec19e0a0929
--- /dev/null
+++ b/srcpkgs/calligra/patches/qt5.13.patch
@@ -0,0 +1,21 @@
+From 0c5430697bdcf41a45046107b28014e40c49a11a Mon Sep 17 00:00:00 2001
+From: David Faure <faure@kde.org>
+Date: Tue, 23 Jul 2019 13:02:34 +0200
+Subject: [PATCH] Fix compilation with Qt 5.13 (missing include)
+
+---
+ sheets/plugins/calendar/CalendarToolWidget.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/sheets/plugins/calendar/CalendarToolWidget.cpp b/sheets/plugins/calendar/CalendarToolWidget.cpp
+index b10b23022a2..0c5eeb68cf3 100644
+--- sheets/plugins/calendar/CalendarToolWidget.cpp
++++ sheets/plugins/calendar/CalendarToolWidget.cpp
+@@ -30,6 +30,7 @@
+ #include <kdatepicker.h>
+ 
+ #include <QPushButton>
++#include <QDate>
+ 
+ namespace Calligra
+ {
diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index 8e8142184c7..a9ca78804fa 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
 # Template file for 'calligra'
 pkgname=calligra
 version=3.1.0
-revision=21
+revision=22
 build_style=cmake
 configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
  -DBUILD_TESTING=OFF"
diff --git a/srcpkgs/camlp4/patches/version-hack.patch b/srcpkgs/camlp4/patches/version-hack.patch
new file mode 100644
index 00000000000..34f7f48ff8c
--- /dev/null
+++ b/srcpkgs/camlp4/patches/version-hack.patch
@@ -0,0 +1,11 @@
+--- configure.orig
++++ configure
+@@ -39,7 +39,7 @@
+     echo "The standalone Camlp4 requires OCaml >= 4.02."
+     echo "For previous versions of OCaml use the Camlp4 distributed with OCaml."
+     exit 2
+-elif [ $major -ne 4 -o $minor -ne 8 ]; then
++elif [ $major -ne 4 -o $minor -ne 9 ]; then
+     echo "This version of Camlp4 is for OCaml 4.07 but you are using OCaml $ocaml_version."
+     if [ -d .git ] ; then
+       if [ $PINNED -eq 1 ] ; then
diff --git a/srcpkgs/camlp4/template b/srcpkgs/camlp4/template
index 6d84e7e5093..64c324cb1a5 100644
--- a/srcpkgs/camlp4/template
+++ b/srcpkgs/camlp4/template
@@ -1,7 +1,7 @@
 # Template file for 'camlp4'
 pkgname=camlp4
 version=4.08+1
-revision=1
+revision=2
 wrksrc="camlp4-${version/+/-}"
 build_style=configure
 hostmakedepends="ocaml ocamlbuild"
diff --git a/srcpkgs/camlp5/template b/srcpkgs/camlp5/template
index 28fff2aea9a..09e214a685c 100644
--- a/srcpkgs/camlp5/template
+++ b/srcpkgs/camlp5/template
@@ -1,7 +1,7 @@
 # Template file for 'camlp5'
 pkgname=camlp5
-version=7.08
-revision=1
+version=7.10
+revision=2
 build_style=configure
 configure_args="-mandir /usr/share/man"
 hostmakedepends="ocaml"
@@ -13,7 +13,7 @@ distfiles="https://github.com/${pkgname}/${pkgname}/archive/rel${version//./}.ta
 wrksrc="camlp5-rel${version//./}"
 nocross=yes
 nopie=yes
-checksum=46e67d8e36e5e4558c414f0b569532a33d3a12d7120ffdc474a6b3da1bfff163
+checksum=83dff83d33ee9b70cd1b9d8d365db63a118201e5feb6aab49d9d3b1d62621784
 
 post_install() {
 	vinstall etc/META 0644 usr/lib/ocaml/camlp5
diff --git a/srcpkgs/cargo/patches/revert-libgit2-sys-api.patch b/srcpkgs/cargo/patches/revert-libgit2-sys-api.patch
new file mode 100644
index 00000000000..b2f819286ba
--- /dev/null
+++ b/srcpkgs/cargo/patches/revert-libgit2-sys-api.patch
@@ -0,0 +1,32 @@
+Source: FreeBSD
+
+Revert to libgit2 0.28 API per https://github.com/rust-lang/git2-rs/issues/458
+
+--- libgit2-sys/lib.rs
++++ libgit2-sys/lib.rs
+@@ -331,7 +331,6 @@ pub struct git_remote_callbacks {
+     pub push_negotiation: Option<git_push_negotiation>,
+     pub transport: Option<git_transport_cb>,
+     pub payload: *mut c_void,
+-    pub resolve_url: Option<git_url_resolve_cb>,
+ }
+ 
+ #[repr(C)]
+@@ -385,8 +384,6 @@ pub type git_push_negotiation =
+ 
+ pub type git_push_update_reference_cb =
+     extern "C" fn(*const c_char, *const c_char, *mut c_void) -> c_int;
+-pub type git_url_resolve_cb =
+-    extern "C" fn(*mut git_buf, *const c_char, c_int, *mut c_void) -> c_int;
+ 
+ #[repr(C)]
+ pub struct git_push_update {
+@@ -2233,7 +2230,7 @@ extern "C" {
+         source: *const git_tree,
+     ) -> c_int;
+     pub fn git_treebuilder_clear(bld: *mut git_treebuilder);
+-    pub fn git_treebuilder_entrycount(bld: *mut git_treebuilder) -> size_t;
++    pub fn git_treebuilder_entrycount(bld: *mut git_treebuilder) -> c_uint;
+     pub fn git_treebuilder_free(bld: *mut git_treebuilder);
+     pub fn git_treebuilder_get(
+         bld: *mut git_treebuilder,
diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index a0bca421f61..584ca07efe2 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,8 @@
 # Template file for 'cargo'
 pkgname=cargo
-version=0.37.0
+version=0.39.0
 revision=1
+wrksrc="cargo-${version}"
 build_helper=rust
 hostmakedepends="rust python curl cmake pkg-config"
 makedepends="libcurl-devel libgit2-devel"
@@ -10,9 +11,11 @@ short_desc="Rust package manager"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT, Apache-2.0"
 homepage="https://crates.io/"
-distfiles="https://github.com/rust-lang/cargo/archive/${version}.tar.gz"
-checksum=377e1090e9ce21206270576193746499a26e8ffbd8b89ccd5f8eb1085ca00e3b
-_cargo_dist_version=0.37.0
+distfiles="https://github.com/rust-lang/cargo/archive/${version}.tar.gz
+ https://github.com/rust-lang/git2-rs/archive/libgit2-sys-0.8.2.tar.gz"
+checksum="1fade63d5c09eab6fa234a1fdf64693ccf1b63398a316ad27edeb1f76ee4a57e
+ c6597bcdc2be7a2fd70c1bb8fdc75883ca5df6aea33f0354c5a8124eacc0938b"
+_cargo_dist_version=0.39.0
 build_options="static"
 
 if [ "$CROSS_BUILD" ]; then
@@ -33,39 +36,39 @@ else
 	case "$XBPS_MACHINE" in
 		i686)
 			checksum+="
-			 6835a73e2ce17e11eda5393133dd7c78bc41bae5a09784e5327648f14340fd48"
+			 2996b0fb41506e87d9b07851f40b41fed94725cf53c3d251e4e1c78eea08df4c"
 			;;
 		x86_64)
 			checksum+="
-			 d20fa121951339d5492cf8862f8a7af59efc99d18f3c27b95ab6d4658b6a7d67"
+			 80bcb1368ce98d13cb371df89cbbed9007fb98843f34d07f2abd2c03b8f2747a"
 			;;
 		x86_64-musl)
 			checksum+="
-			 53975d91e11569f2255d8e30176f05f6976cd810725197a527b0e7ad547ca70c"
+			 1d7d881a5af73fb7c3f632278d47a7d174f8347673e2263c4cd6a2f7d0278733"
 			;;
 		ppc64le)
 			checksum+="
-			 4cda7686160f6981e936229703e8e2e756c74f390245f2ad9e356bbbed28a2c9"
+			 456d019511cfe015152a7a4c1c2f518fdeb10e0c610c9bc3ef44d73861ca967e"
 			;;
 		ppc64le-musl)
 			checksum+="
-			 d2690135522db9fdc6efa2f432e5719b8b70abc94e91db278b84be834a75bf72"
+			 5725c42c8356443db15f378d88f2ccb67e363ebf4beacc96ae1eac9ba36f8fe7"
 			;;
 		ppc64)
 			checksum+="
-			 8b2f7d5da611a21dd7e0b4238b9aca6ee32f1e49d8fe831435301f11a29b12de"
+			 73a4f13b8edda6b4c9c1818341c5d936f7b11a04f892358039d072b80ccd41dc"
 			;;
 		ppc64-musl)
 			checksum+="
-			 131db0127366665b2ae55327155c171e99c2eddfb4bcdd7e5cd2663ada109bd5"
+			 ac18707b8df5d1f64b7e15dabd73eb7a3b0f9ef5976ef7c6ceb462b5d3feb9cd"
 			;;
 		ppc)
 			checksum+="
-			 856fcb63f6ebeab67038fe3fc96ee0911353b1ee19cabcb0496c7d419de0d531"
+			 02c07b741062e75556f5993a05eefe6dace70fee4a45542f1c6997fa69624d7e"
 			;;
 		ppc-musl)
 			checksum+="
-			 119dba3538f6c1d1164b720b238acac598e1924d943ebbdf3c7113ec3cbd8a2a"
+			 b06306fc164bffa73afd2d21d96381a28d38446e58cf01a0d1585e92b4656a23"
 			;;
 	esac
 fi
@@ -75,6 +78,20 @@ post_extract() {
 		mkdir -p target/snapshot
 		cp ../cargo-${_cargo_dist_version}-${RUST_TARGET}/cargo/bin/cargo cargo
 	fi
+
+	# need this for the patch to work
+	cp -R ${XBPS_BUILDDIR}/git2-rs-libgit2-sys-0.8.2/libgit2-sys .
+}
+
+post_patch() {
+	# but only use the patched libgit2 when not static; when static, bundled
+	# libgit2 is used and this would not work (libgit2 sources are not there)
+	if [ ! "$build_option_static" ]; then
+		cat >> Cargo.toml <<- EOF
+			[patch.crates-io]
+			libgit2-sys = { path = './libgit2-sys' }
+		EOF
+	fi
 }
 
 do_build() {
@@ -93,8 +110,6 @@ do_build() {
 		cargo="./cargo"
 	fi
 
-	$cargo update
-	$cargo update --package libc --precise 0.2.55
 	$cargo build --release $(vopt_if static --features="all-static")
 }
 
diff --git a/srcpkgs/catch2/template b/srcpkgs/catch2/template
index 8d46f584f6f..2f9db0dd4c1 100644
--- a/srcpkgs/catch2/template
+++ b/srcpkgs/catch2/template
@@ -1,6 +1,6 @@
 # Template file for 'catch2'
 pkgname=catch2
-version=2.7.1
+version=2.9.2
 revision=1
 archs=noarch
 wrksrc="Catch2-${version}"
@@ -15,7 +15,7 @@ maintainer="Louis Dupré Bertoni <contact@louisdb.xyz>"
 license="BSL-1.0"
 homepage="https://github.com/catchorg/Catch2"
 distfiles="https://github.com/catchorg/Catch2/archive/v${version}/${pkgname}-v${version}.tar.gz"
-checksum=04b303517284572c277597004a33c3f8c02a4d12ba73d5a4cb73b4a369dfef0b
+checksum=54bea6d80a388a80f895cd0e2343fca72b0d9093a776af40904aefce49c13bda
 
 post_install() {
 	vlicense LICENSE.txt
diff --git a/srcpkgs/catfish/template b/srcpkgs/catfish/template
index 39c73a8a7ba..1b28ffcafff 100644
--- a/srcpkgs/catfish/template
+++ b/srcpkgs/catfish/template
@@ -1,6 +1,6 @@
 # Template file for 'catfish'
 pkgname=catfish
-version=1.4.9
+version=1.4.10
 revision=1
 archs=noarch
 build_style=python3-module
@@ -12,5 +12,5 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.twotoasts.de/index.php/catfish/"
 distfiles="http://archive.xfce.org/src/apps/catfish/${version%.*}/catfish-${version}.tar.bz2"
-checksum=29a39b85804336e4819dceff203693a5904b7e11d7e024b49b5aab2649ed944e
+checksum=2573a004105031f871c92fed22a0c4b15bb96f2dff6e36c4f2959f56b62e343d
 nocross="gobject-introspection"
diff --git a/srcpkgs/cbindgen/template b/srcpkgs/cbindgen/template
index 778bc45666c..0fb0c8a7c0d 100644
--- a/srcpkgs/cbindgen/template
+++ b/srcpkgs/cbindgen/template
@@ -1,6 +1,6 @@
 # Template file for 'cbindgen'
 pkgname=cbindgen
-version=0.9.0
+version=0.9.1
 revision=1
 build_style=cargo
 short_desc="Tool to generate C bindings for Rust code"
@@ -8,4 +8,4 @@ maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MPL-2.0"
 homepage="https://github.com/eqrion/cbindgen"
 distfiles="https://github.com/eqrion/cbindgen/archive/v${version}.tar.gz"
-checksum=28ea5a0f99d0c4a8a6bd8a75a017031b0271bec2716ac0e9029d2a65451aacd0
+checksum=bb1b9b55bfed3ccd774d3c0e83bc549f2ac5418c7d80b63052b0dd1034478ec7
diff --git a/srcpkgs/ccache/template b/srcpkgs/ccache/template
index 774f62915cb..efd4464d4df 100644
--- a/srcpkgs/ccache/template
+++ b/srcpkgs/ccache/template
@@ -1,6 +1,6 @@
 # Template file for 'ccache'
 pkgname=ccache
-version=3.7.3
+version=3.7.4
 revision=1
 bootstrap=yes
 build_style=gnu-configure
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://ccache.samba.org/"
 changelog="https://ccache.samba.org/news.html"
 distfiles="https://github.com/ccache/ccache/releases/download/v${version}/${pkgname}-${version}.tar.xz"
-checksum=73d2ec69fcf4fd3b956304036974a779b443d88882b69c5d81b62b5dc8630e04
+checksum=04c0af414b8cf89e541daed59735547fbfd323b1aaa983da0216f6b6731e6836
 
 post_install() {
 	vmkdir usr/lib/ccache/bin
diff --git a/srcpkgs/ccls/template b/srcpkgs/ccls/template
index 6c6ab601a78..e04cf8107ed 100644
--- a/srcpkgs/ccls/template
+++ b/srcpkgs/ccls/template
@@ -1,7 +1,7 @@
 # Template file for 'ccls'
 pkgname=ccls
-version=0.20190314
-revision=1
+version=0.20190823
+revision=2
 build_style=cmake
 hostmakedepends="clang-tools-extra"
 makedepends="clang llvm ncurses-devel rapidjson zlib-devel"
@@ -9,6 +9,6 @@ short_desc="C/C++/ObjC language server"
 maintainer="Nathan Owens <ndowens04@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/MaskRay/ccls"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=aaefa603a76325bb94e5222d144e19c432771346990c8b84165832bf37d15bb3
+distfiles="https://github.com/MaskRay/ccls/archive/${version}.tar.gz"
+checksum=0176a10b2fa567862e5a93ac16a5bb92940f7bab7c3759b35be1a256cd2f1a66
 nocross="Clang cannot be installed as makedep"
diff --git a/srcpkgs/cdemu-client/template b/srcpkgs/cdemu-client/template
index 5522981eaeb..d0b4b4bf7ba 100644
--- a/srcpkgs/cdemu-client/template
+++ b/srcpkgs/cdemu-client/template
@@ -1,6 +1,6 @@
 # Template file for 'cdemu-client'
 pkgname=cdemu-client
-version=3.2.1
+version=3.2.3
 revision=1
 archs=noarch
 build_style=cmake
@@ -12,4 +12,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://cdemu.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/cdemu/cdemu-client-${version}.tar.bz2"
-checksum=e54d2f5686d27bd49e65b84542fb2446ef349c27fa17ee14675d98bd311115b5
+checksum=f883800db99d39a91f41b94ede7c799c12318f15f4c138eeca0374374c156caf
diff --git a/srcpkgs/cdemu-daemon/template b/srcpkgs/cdemu-daemon/template
index 25f88bd4ec0..61631d510e8 100644
--- a/srcpkgs/cdemu-daemon/template
+++ b/srcpkgs/cdemu-daemon/template
@@ -1,6 +1,6 @@
 # Template file for 'cdemu-daemon'
 pkgname=cdemu-daemon
-version=3.2.2
+version=3.2.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config intltool"
@@ -11,4 +11,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://cdemu.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/cdemu/cdemu-daemon-${version}.tar.bz2"
-checksum=2b8934ad09d5a1c844202d5e2020193dd5bb00112732559c23594b0761f63542
+checksum=b94bd9f343b82a292ea542c6454762ae4d5987a78387d36a5a5c335bf9fb5d08
diff --git a/srcpkgs/cdetect/template b/srcpkgs/cdetect/template
index 0081cf0513e..b02df3a496e 100644
--- a/srcpkgs/cdetect/template
+++ b/srcpkgs/cdetect/template
@@ -1,7 +1,7 @@
 # Template file for 'cdetect'
 pkgname=cdetect
-version=0.5.3
-revision=2
+version=0.5.4
+revision=1
 build_style=go
 go_import_path=github.com/xyproto/cdetect
 hostmakedepends="git"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/xyproto/cdetect"
 distfiles="https://github.com/xyproto/cdetect/archive/${version}.tar.gz"
-checksum=8f9e68366c619706ae48dc3c2188ee15dca97e01a922d1b7eda87ad746e14c32
+checksum=5df583e1b016d61cbc723fc0d222308c4327e108f91316707235148c06095b49
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/celluloid/template b/srcpkgs/celluloid/template
new file mode 100644
index 00000000000..e022f1175f4
--- /dev/null
+++ b/srcpkgs/celluloid/template
@@ -0,0 +1,19 @@
+# Template file for 'celluloid'
+pkgname=celluloid
+version=0.17
+revision=1
+build_style=meson
+hostmakedepends="glib-devel pkg-config"
+makedepends="gtk+3-devel libepoxy-devel libglib-devel mpv-devel"
+short_desc="Simple GTK+ frontend for mpv"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-3.0-or-later"
+homepage="https://celluloid-player.github.io/"
+distfiles="https://github.com/${pkgname}-player/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.xz"
+checksum=0016078c02c1c8629a0658bd6eeb02be50d94a670983f53cbdb23f34f4866b28
+
+gnome-mpv_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	build_style=meta
+	short_desc+=" (transitional dummy package)"
+}
diff --git a/srcpkgs/cgrps/template b/srcpkgs/cgrps/template
index 9239c458de3..94d1c447138 100644
--- a/srcpkgs/cgrps/template
+++ b/srcpkgs/cgrps/template
@@ -1,15 +1,15 @@
 # Template file for 'cgrps'
 pkgname=cgrps
-version=0.7.0
-revision=3
+version=0.8.0
+revision=1
 build_style=go
 go_import_path=github.com/k1LoW/cgrps
 short_desc="Set of commands for checking cgroups"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/k1LoW/cgrps"
 distfiles="https://github.com/k1LoW/cgrps/archive/v${version}.tar.gz"
-checksum=728d95bdcf6a4d2805b7b4262af26440d66408dceea92873d443fc059bb22613
+checksum=1be01ebc65c7b86ccc88597934781a61321566e1be32a4ea4d3df34a4a2a1e43
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/chafa/template b/srcpkgs/chafa/template
index f7ef49009b6..c748a65494e 100644
--- a/srcpkgs/chafa/template
+++ b/srcpkgs/chafa/template
@@ -1,6 +1,6 @@
 # Template file for 'chafa'
 pkgname=chafa
-version=1.0.1
+version=1.2.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Christian Buschau <christian.buschau@mailbox.org>"
 license="LGPL-3.0-or-later"
 homepage="https://hpjansson.org/chafa/"
 distfiles="https://hpjansson.org/chafa/releases/chafa-${version}.tar.xz"
-checksum=49d491a566a22daf56c51c043259f1373a1b1125d5c1c1fe321f7c25ca178e01
+checksum=3f37a28bfb9ab716efb32d2652bc2c17856711ed7808e74481c8afcf7cdb44c2
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*) ;;
diff --git a/srcpkgs/chatty/template b/srcpkgs/chatty/template
index 57249d473b2..7612f7bd929 100644
--- a/srcpkgs/chatty/template
+++ b/srcpkgs/chatty/template
@@ -1,16 +1,16 @@
 # Template file for 'chatty'
 pkgname=chatty
-version=0.9.7
-revision=2
+version=0.10
+revision=1
 archs=noarch
 hostmakedepends="openjdk gradle"
 depends="virtual?java-runtime"
 short_desc="Twitch Chat Client for Desktop"
 maintainer="Frank Steinborn <steinex@nognu.de>"
-license="GPL-3"
+license="GPL-3.0-only"
 homepage="http://chatty.github.io/"
 distfiles="https://github.com/chatty/chatty/archive/v${version}.tar.gz"
-checksum="e5c2eb006db593ce0fc6fb71e602ad641dc3ff970b770dce73155c67d87afbea"
+checksum=9b50246620f179be675e883c9a5766218fc50a8f0b4ee139dc40a9dfed5d54d2
 
 do_build() {
 	gradle shadowJar
@@ -33,6 +33,4 @@ do_install() {
 
 	vinstall src/${pkgname}/gui/app_main_64.png 644 usr/share/pixmaps chatty.png
 	vinstall ${FILESDIR}/chatty.desktop 644 usr/share/applications
-
-	vlicense assets/LICENSE
 }
diff --git a/srcpkgs/cheat/template b/srcpkgs/cheat/template
new file mode 100644
index 00000000000..b60b4ba53b2
--- /dev/null
+++ b/srcpkgs/cheat/template
@@ -0,0 +1,26 @@
+# Template file for 'cheat'
+pkgname=cheat
+version=2.5.1
+revision=1
+build_style=python3-module
+pycompile_module="cheat"
+conf_files="/etc/cheat"
+hostmakedepends="python3"
+depends="python3-docopt python3-termcolor python3-Pygments"
+short_desc="Create and view interactive cheatsheets on the command-line"
+maintainer="bra1nwave <brainwave@openmailbox.org>"
+license="GPL-3.0-or-later, MIT"
+homepage="https://github.com/cheat/cheat"
+distfiles="${homepage}/archive/${version}.tar.gz"
+checksum=9ae44cfc79478a7ba604871f3253e176f2bf3e1a4e698c9466e58a39d279effd
+
+post_install() {
+	vinstall cheat/autocompletion/cheat.bash 644 \
+		usr/share/bash-completion/completions cheat
+	vinstall cheat/autocompletion/cheat.zsh 644 \
+		usr/share/zsh/site-functions _cheat
+	vinstall cheat/autocompletion/cheat.fish 644 \
+		usr/share/fish/completions
+	vman man1/cheat.1.gz
+	vlicense licenses/mit.txt LICENSE
+}
diff --git a/srcpkgs/cheese/template b/srcpkgs/cheese/template
index 1e870bd7613..e6d1e05dbc1 100644
--- a/srcpkgs/cheese/template
+++ b/srcpkgs/cheese/template
@@ -1,12 +1,13 @@
 # Template file for 'cheese'
 pkgname=cheese
-version=3.32.1
-revision=2
-build_style=gnu-configure
+version=3.34.0
+revision=1
+build_style=meson
+configure_args="-Dgtk_doc=$(vopt_if gtk_doc 'true' 'false')
+ -Dman=$(vopt_if gtk_doc 'true' 'false')"
 build_helper="gir"
-configure_args="--disable-static --disable-schemas-compile"
-hostmakedepends="gdk-pixbuf glib-devel gtk-doc intltool itstool pkg-config
- $(vopt_if gir 'gobject-introspection') vala"
+hostmakedepends="gdk-pixbuf glib-devel itstool pkg-config vala librsvg
+ $(vopt_if gtk_doc 'gtk-doc') $(vopt_if gir 'gobject-introspection')"
 makedepends="clutter-gst3-devel clutter-gtk-devel gnome-desktop-devel
  gst-plugins-good1 libXtst-devel libcanberra-devel libgee08-devel librsvg-devel"
 depends="clutter-gst clutter-gtk desktop-file-utils gnome-video-effects
@@ -16,12 +17,15 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Cheese"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7b9ad1da8bb475a9e71ae69a5832786a75e860f0af927637540574fd49d595f6
-nocross="https://build.voidlinux.org/builders/armv7l_builder/builds/18665/steps/shell_3/logs/stdio"
+checksum=d1865600ac88012e136b1ec3db72a4634f57bc2035895277be792bb078627e73
 
-build_options="gir"
+build_options="gir gtk_doc"
 build_options_default="gir"
 
+if [ -z "$CROSS_BUILD" ]; then
+	build_options_default+=" gtk_doc"
+fi
+
 libcheese_package() {
 	short_desc+=" - shared libraries"
 	pkg_install() {
@@ -46,6 +50,8 @@ cheese-devel_package() {
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
 		fi
-		vmove usr/share/gtk-doc
+		if [ "$build_option_gtk_doc" ]; then
+			vmove usr/share/gtk-doc
+		fi
 	}
 }
diff --git a/srcpkgs/cherry-font/template b/srcpkgs/cherry-font/template
index 544778ab2b6..496d45988d1 100644
--- a/srcpkgs/cherry-font/template
+++ b/srcpkgs/cherry-font/template
@@ -1,6 +1,6 @@
 # Template file for 'cherry-font'
 pkgname=cherry-font
-version=1.3
+version=1.4
 revision=1
 archs=noarch
 wrksrc="cherry-${version}"
@@ -11,7 +11,7 @@ maintainer="Chinmay Pai <chinmaydpai@gmail.com>"
 license="MIT"
 homepage="https://github.com/turquoise-hexagon/cherry"
 distfiles="https://github.com/turquoise-hexagon/cherry/archive/${version}.tar.gz"
-checksum=3fd95e66f9baa8c71f3a513fb807ff72a44605e30938b2be6157a68a1d5ed57e
+checksum=984191a0b305832b95bd3036cd8b7ab07cac8a0dd05ba440d6be9ffbdd8434df
 
 font_dirs="/usr/share/fonts/X11/misc"
 
diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index a6b59335c2a..2f8878707ec 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,6 +1,6 @@
 # Template file for 'cherrytree'
 pkgname=cherrytree
-version=0.38.8
+version=0.38.9
 revision=1
 archs=noarch
 build_style=python2-module
@@ -12,7 +12,7 @@ maintainer="Logen K <logen@sudotask.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.giuspen.com/cherrytree/"
 distfiles="https://www.giuspen.com/software/${pkgname}-${version}.tar.xz"
-checksum=af21e540fddb3c5a92cdad9b4bbfc6ccd3ce3ab87076a2a01d2e3f2d683f48db
+checksum=fc16669e81e7f981f1b51671171a55035febf2ea80e801c0dd7ff52763025475
 
 post_install() {
 	# don’t install useless egg
diff --git a/srcpkgs/chocolate-doom/template b/srcpkgs/chocolate-doom/template
index c20db393a43..963ba91c585 100644
--- a/srcpkgs/chocolate-doom/template
+++ b/srcpkgs/chocolate-doom/template
@@ -1,4 +1,4 @@
-# Template file for 'chocolate-doom'
+# Template file for 'chocolate-doom'.
 pkgname=chocolate-doom
 version=3.0.0
 revision=1
diff --git a/srcpkgs/chroma/template b/srcpkgs/chroma/template
index 7a7867cc8c9..e8b786f9671 100644
--- a/srcpkgs/chroma/template
+++ b/srcpkgs/chroma/template
@@ -1,6 +1,6 @@
 # Template file for 'chroma'
 pkgname=chroma
-version=0.6.6
+version=0.6.7
 revision=1
 build_style=go
 go_import_path="github.com/alecthomas/${pkgname}"
@@ -10,8 +10,8 @@ short_desc="General purpose syntax highlighter"
 maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="MIT"
 homepage="https://github.com/alecthomas/chroma"
-distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
-checksum=87c64941500c9433ef481f2c54155f892ac8bd3c18b3247fc9d9785a8d4f5c10
+distfiles="https://github.com/alecthomas/chroma/archive/v${version}.tar.gz"
+checksum=ac23e6b649929d093f2ad163629bc5f30b293ddf4d48d20824f97a512186dcb1
 
 do_check() {
 	go test -v
diff --git a/srcpkgs/chromium-widevine/template b/srcpkgs/chromium-widevine/template
index a8e074fd168..d777e5ffa2e 100644
--- a/srcpkgs/chromium-widevine/template
+++ b/srcpkgs/chromium-widevine/template
@@ -6,7 +6,7 @@ _chromeVersion="current"
 _channel="stable"
 
 pkgname=chromium-widevine
-version=75.0.3770.142
+version=77.0.3865.120
 revision=1
 archs="x86_64"
 create_wrksrc=yes
@@ -17,7 +17,7 @@ depends="chromium binutils xz"
 homepage="https://www.google.com/chrome"
 repository=nonfree
 distfiles="https://dl.google.com/linux/direct/google-chrome-${_channel}_${_chromeVersion}_amd64.deb"
-checksum=8a39e922d9d0f12b79949efc46c22021f89a8207670fa9493a366ad8231b343f
+checksum=07abdccd7c15f5abe68765c1162f2ab666b6478a4d578aa6351d5667cd983a48
 
 do_extract() {
 	:
diff --git a/srcpkgs/chromium/files/musl-patches/no-mallinfo.patch b/srcpkgs/chromium/files/musl-patches/no-mallinfo.patch
index 461c90cb0af..288f8670c06 100644
--- a/srcpkgs/chromium/files/musl-patches/no-mallinfo.patch
+++ b/srcpkgs/chromium/files/musl-patches/no-mallinfo.patch
@@ -42,3 +42,15 @@ index 0eb5c1f..8af7799 100644
    mi = ::mallinfo();
    return mi.uordblks;
 
+--- third_party/swiftshader/third_party/llvm-7.0/configs/linux/include/llvm/Config/config.h.orig	2019-09-30 13:03:42.556880537 -0400
++++ third_party/swiftshader/third_party/llvm-7.0/configs/linux/include/llvm/Config/config.h	2019-09-30 13:07:27.989821227 -0400
+@@ -122,7 +122,9 @@
+ /* #undef HAVE_MALLCTL */
+ 
+ /* Define to 1 if you have the `mallinfo' function. */
++#if defined(__GLIBC__)
+ #define HAVE_MALLINFO 1
++#endif
+ 
+ /* Define to 1 if you have the <malloc.h> header file. */
+ #define HAVE_MALLOC_H 1
diff --git a/srcpkgs/chromium/patches/chromium-enable-vaapi.patch b/srcpkgs/chromium/patches/chromium-enable-vaapi.patch
index d1cb7b4be59..01c253de5ff 100644
--- a/srcpkgs/chromium/patches/chromium-enable-vaapi.patch
+++ b/srcpkgs/chromium/patches/chromium-enable-vaapi.patch
@@ -1,165 +1,107 @@
---- chrome/browser/about_flags.cc.orig	2019-07-29 16:35:46.000000000 -0400
-+++ chrome/browser/about_flags.cc	2019-07-31 13:54:18.350186083 -0400
-@@ -1119,12 +1119,14 @@
-     {"ui-disable-partial-swap", flag_descriptions::kUiPartialSwapName,
-      flag_descriptions::kUiPartialSwapDescription, kOsAll,
-      SINGLE_DISABLE_VALUE_TYPE(switches::kUIDisablePartialSwap)},
-+#if defined(OS_CHROMEOS) || defined(OS_ANDROID)
-     {"disable-webrtc-hw-decoding", flag_descriptions::kWebrtcHwDecodingName,
-      flag_descriptions::kWebrtcHwDecodingDescription, kOsAndroid | kOsCrOS,
-      SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebRtcHWDecoding)},
-     {"disable-webrtc-hw-encoding", flag_descriptions::kWebrtcHwEncodingName,
-      flag_descriptions::kWebrtcHwEncodingDescription, kOsAndroid | kOsCrOS,
-      SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebRtcHWEncoding)},
-+#endif
- #if !defined(OS_ANDROID)
-     {"enable-reader-mode", flag_descriptions::kEnableReaderModeName,
-      flag_descriptions::kEnableReaderModeDescription, kOsDesktop,
-@@ -1446,6 +1448,13 @@
-      flag_descriptions::kEnableVirtualDesksDescription, kOsCrOS,
-      FEATURE_VALUE_TYPE(ash::features::kVirtualDesks)},
- #endif  // OS_CHROMEOS
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+    {
-+        "enable-accelerated-video", flag_descriptions::kAcceleratedVideoName,
-+        flag_descriptions::kAcceleratedVideoDescription, kOsLinux,
-+        SINGLE_VALUE_TYPE(switches::kEnableAcceleratedVideo),
-+    },
-+#else
-     {
+From 53b93dfe87fd10cced5d2a2a63072dfc7a2af6e4 Mon Sep 17 00:00:00 2001
+From: Daniel Charles <daniel.charles@intel.com>
+Date: Fri, 28 Jul 2017 16:31:47 -0700
+Subject: [PATCH] Enable VAVDA, VAVEA and VAJDA on linux with VAAPI only
+
+This patch contains all the changes necessary to use VA-API along with
+vaapi-driver to run all media use cases supported with hardware acceleration.
+
+It is intended to remain as experimental accessible from chrome://flags on linux.
+It requires libva/intel-vaapi-driver to be installed on the system path where
+chrome is executed.  Other drivers could be tested if available. Flags are
+kept independent for linux, where this feature has to be enabled before
+actually using it.  This should not change how other OSes use the flags
+already, the new flags will show at the buttom on the section of unavailable
+experiments
+
+The changes cover a range of compiler pre-processor flags to enable the stack.
+It moves the presandbox operations to the vaapi_wrapper class as the hook function
+is available there. vaInit will open driver on the correct installed folder.
+
+chrome flags consolidtation into only two flags for linux.  Mjpeg and accelerated
+video are used.  The other flags are kept for ChromeOS and other OSes.
+
+Developer testing was made on skylake hardware, ChromeOS and Ubuntu.
+
+BUG=NONE
+TEST="subjective testing with VAVDA,VAVEA and VAJDA, autotest for encoder"
+TEST="and decoder hardware accelerated"
+TEST="have libva/intel-vaapi-driver installed and not installed in the system"
+TEST="repeat on different hardware families"
+R=posciak@chromium.org
+R=kcwu@chromium.org
+
+Cq-Include-Trybots: master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel
+Change-Id: Ifbbf5c9e5221a8b5733fc6d4d0cf984a1f103171
+Signed-off-by: Daniel Charles <daniel.charles@intel.com>
+---
+
+Index: dev/chrome/browser/about_flags.cc
+===================================================================
+--- chrome/browser/about_flags.cc
++++ chrome/browser/about_flags.cc
+@@ -1527,7 +1527,7 @@ const FeatureEntry kFeatureEntries[] = {
          "disable-accelerated-video-decode",
          flag_descriptions::kAcceleratedVideoDecodeName,
-@@ -1453,6 +1462,7 @@
-         kOsMac | kOsWin | kOsCrOS | kOsAndroid,
+         flag_descriptions::kAcceleratedVideoDecodeDescription,
+-        kOsMac | kOsWin | kOsCrOS | kOsAndroid,
++        kOsAll,
          SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode),
      },
-+#endif
-     {"enable-history-favicons-google-server-query",
-      flag_descriptions::kEnableHistoryFaviconsGoogleServerQueryName,
-      flag_descriptions::kEnableHistoryFaviconsGoogleServerQueryDescription,
-@@ -1883,7 +1892,12 @@
+     {
+@@ -1993,10 +1993,10 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(service_manager::features::kXRSandbox)},
- #endif  // ENABLE_ISOLATED_XR_SERVICE
+ #endif  // !defined(OS_ANDROID)
  #endif  // ENABLE_VR
 -#if defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+    {"enable-accelerated-mjpeg-decode",
-+     flag_descriptions::kAcceleratedMjpegDecodeName,
-+     flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsLinux,
-+     SINGLE_VALUE_TYPE(switches::kEnableAcceleratedMjpegDecode)},
-+#elif defined(OS_CHROMEOS)
++#if defined(OS_LINUX) && !defined(OS_ANDROID)
      {"disable-accelerated-mjpeg-decode",
       flag_descriptions::kAcceleratedMjpegDecodeName,
-      flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsCrOS,
---- chrome/browser/chromeos/login/chrome_restart_request.cc.orig	2019-07-29 16:35:47.000000000 -0400
-+++ chrome/browser/chromeos/login/chrome_restart_request.cc	2019-07-31 13:58:47.201085960 -0400
-@@ -20,6 +20,7 @@
- #include "base/system/sys_info.h"
- #include "base/timer/timer.h"
- #include "base/values.h"
-+#include "build/build_config.h"
- #include "cc/base/switches.h"
- #include "chrome/browser/browser_process.h"
- #include "chrome/browser/chromeos/boot_times_recorder.h"
-@@ -84,9 +85,14 @@
-     ::switches::kBlinkSettings,
-     ::switches::kDisable2dCanvasImageChromium,
-     ::switches::kDisableAccelerated2dCanvas,
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+    ::switches::kEnableAcceleratedMjpegDecode,
-+    ::switches::kEnableAcceleratedVideo,
-+#else
-     ::switches::kDisableAcceleratedMjpegDecode,
-     ::switches::kDisableAcceleratedVideoDecode,
-     ::switches::kDisableAcceleratedVideoEncode,
-+#endif
-     ::switches::kDisableBlinkFeatures,
-     ::switches::kDisableGpu,
-     ::switches::kDisableGpuMemoryBufferVideoFrames,
-@@ -158,8 +164,10 @@
-     ::switches::kEnableWebGLImageChromium,
-     ::switches::kEnableWebVR,
-     ::switches::kEnableUnsafeWebGPU,
-+#if (defined(OS_CHROMEOS) || defined(OS_ANDROID))
-     ::switches::kDisableWebRtcHWDecoding,
-     ::switches::kDisableWebRtcHWEncoding,
-+#endif
-     ::switches::kOzonePlatform,
-     ash::switches::kAshEnableTabletMode,
-     ash::switches::kAshEnableWaylandServer,
-diff -ur chrome/browser/flag_descriptions.cc chromium-69.0.3497.92/chrome/browser/flag_descriptions.cc
---- chrome/browser/flag_descriptions.cc.orig	2019-06-18 11:47:50.000000000 -0400
-+++ chrome/browser/flag_descriptions.cc	2019-07-02 12:27:47.137866754 -0400
-@@ -14,6 +14,13 @@
-     "Enables the use of the GPU to perform 2d canvas rendering instead of "
-     "using software rendering.";
- 
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+const char kAcceleratedVideoName[] = "Hardware-accelerated video";
-+const char kAcceleratedVideoDescription[] =
-+    "Hardware-accelerated video where VA-API driver is installed on the"
-+    "system.";
-+#endif
-+
- const char kAcceleratedVideoDecodeName[] = "Hardware-accelerated video decode";
- const char kAcceleratedVideoDecodeDescription[] =
-     "Hardware-accelerated video decode where available.";
-@@ -2081,6 +2088,7 @@
- const char kWebrtcHybridAgcDescription[] =
-     "WebRTC Agc2 digital adaptation with Agc1 analog adaptation.";
- 
-+#if defined(OS_CHROMEOS) || defined(OS_ANDROID)
- const char kWebrtcHwDecodingName[] = "WebRTC hardware video decoding";
- const char kWebrtcHwDecodingDescription[] =
-     "Support in WebRTC for decoding video streams using platform hardware.";
-@@ -2088,6 +2096,7 @@
- const char kWebrtcHwEncodingName[] = "WebRTC hardware video encoding";
- const char kWebrtcHwEncodingDescription[] =
-     "Support in WebRTC for encoding video streams using platform hardware.";
-+#endif
- 
- const char kWebrtcHwH264EncodingName[] = "WebRTC hardware h264 video encoding";
- const char kWebrtcHwH264EncodingDescription[] =
-@@ -2943,14 +2952,16 @@
+-     flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsCrOS,
++     flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsCrOS | kOsLinux,
+      SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedMjpegDecode)},
+ #endif  // OS_CHROMEOS
+     {"system-keyboard-lock", flag_descriptions::kSystemKeyboardLockName,
+Index: dev/chrome/browser/flag_descriptions.cc
+===================================================================
+--- chrome/browser/flag_descriptions.cc
++++ chrome/browser/flag_descriptions.cc
+@@ -2880,9 +2880,7 @@ const char kMacSystemMediaPermissionsInf
  
- // Chrome OS -------------------------------------------------------------------
+ #endif
  
+-// Chrome OS -------------------------------------------------------------------
+-
 -#if defined(OS_CHROMEOS)
-+#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID))
++#if defined(OS_LINUX) && !defined(OS_ANDROID)
  
  const char kAcceleratedMjpegDecodeName[] =
      "Hardware-accelerated mjpeg decode for captured frame";
- const char kAcceleratedMjpegDecodeDescription[] =
+@@ -2890,6 +2888,12 @@ const char kAcceleratedMjpegDecodeDescri
      "Enable hardware-accelerated mjpeg decode for captured frame where "
      "available.";
-+#endif
  
++#endif
++
++// Chrome OS -------------------------------------------------------------------
++
 +#if defined(OS_CHROMEOS)
++
  const char kAppServiceAshName[] = "App Service Ash";
  const char kAppServiceAshDescription[] =
      "Use the App Service to provide data to the Ash UI, such as the shelf and "
-diff -ur chrome/browser/flag_descriptions.h chromium-69.0.3497.92/chrome/browser/flag_descriptions.h
---- chrome/browser/flag_descriptions.h.orig	2019-06-18 11:47:50.000000000 -0400
-+++ chrome/browser/flag_descriptions.h	2019-07-02 12:29:46.200214795 -0400
-@@ -43,6 +43,10 @@
- extern const char kAccelerated2dCanvasName[];
- extern const char kAccelerated2dCanvasDescription[];
- 
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+extern const char kAcceleratedVideoName[];
-+extern const char kAcceleratedVideoDescription[];
-+#endif
- extern const char kAcceleratedVideoDecodeName[];
- extern const char kAcceleratedVideoDecodeDescription[];
- 
-@@ -1765,13 +1769,17 @@
+Index: dev/chrome/browser/flag_descriptions.h
+===================================================================
+--- chrome/browser/flag_descriptions.h
++++ chrome/browser/flag_descriptions.h
+@@ -1715,13 +1715,17 @@ extern const char kPermissionPromptPersi
  
  #endif  // defined(OS_MACOSX)
  
 -// Chrome OS ------------------------------------------------------------------
 -
 -#if defined(OS_CHROMEOS)
-+#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID))
++#if defined(OS_LINUX) && !defined(OS_ANDROID)
  
  extern const char kAcceleratedMjpegDecodeName[];
  extern const char kAcceleratedMjpegDecodeDescription[];
@@ -173,234 +115,32 @@ diff -ur chrome/browser/flag_descriptions.h chromium-69.0.3497.92/chrome/browser
  extern const char kAppServiceAshName[];
  extern const char kAppServiceAshDescription[];
  
-diff -ur content/browser/gpu/compositor_util.cc chromium-69.0.3497.92/content/browser/gpu/compositor_util.cc
---- content/browser/gpu/compositor_util.cc	2018-09-12 00:39:41.000000000 +0530
-+++ content/browser/gpu/compositor_util.cc	2018-09-13 22:10:34.072012092 +0530
-@@ -149,7 +149,11 @@
-       {"video_decode",
-        SafeGetFeatureStatus(gpu_feature_info,
-                             gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE),
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+       !command_line.HasSwitch(switches::kEnableAcceleratedVideo),
-+#else
-        command_line.HasSwitch(switches::kDisableAcceleratedVideoDecode),
-+#endif
-        "Accelerated video decode has been disabled, either via blacklist, "
-        "about:flags or the command line.",
-        true, true},
---- content/browser/gpu/gpu_process_host.cc.orig	2019-07-31 14:16:52.304849119 -0400
-+++ content/browser/gpu/gpu_process_host.cc	2019-07-31 14:19:22.567480008 -0400
-@@ -208,7 +208,9 @@
-     switches::kDisableLogging,
-     switches::kDisableShaderNameHashing,
-     switches::kDisableSkiaRuntimeOpts,
-+#if !defined(OS_LINUX)
-     switches::kDisableWebRtcHWEncoding,
-+#endif
-     switches::kEnableGpuRasterization,
-     switches::kEnableLogging,
-     switches::kEnableVizDevTools,
-diff -ur content/browser/renderer_host/media/video_capture_browsertest.cc chromium-69.0.3497.92/content/browser/renderer_host/media/video_capture_browsertest.cc
---- content/browser/renderer_host/media/video_capture_browsertest.cc	2018-09-12 00:39:41.000000000 +0530
-+++ content/browser/renderer_host/media/video_capture_browsertest.cc	2018-09-13 22:10:34.124010499 +0530
-@@ -165,8 +165,13 @@
-       base::CommandLine::ForCurrentProcess()->AppendSwitch(
-           switches::kUseFakeJpegDecodeAccelerator);
-     } else {
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+      base::CommandLine::ForCurrentProcess()->AppendSwitch(
-+          switches::kEnableAcceleratedMjpegDecode);
-+#else
-       base::CommandLine::ForCurrentProcess()->AppendSwitch(
-           switches::kDisableAcceleratedMjpegDecode);
-+#endif
-     }
-   }
- 
---- content/browser/renderer_host/render_process_host_impl.cc.orig	2019-07-29 16:36:09.000000000 -0400
-+++ content/browser/renderer_host/render_process_host_impl.cc	2019-07-31 14:04:18.859680348 -0400
-@@ -2937,7 +2937,11 @@
-     switches::kDefaultTileHeight,
-     switches::kDisable2dCanvasImageChromium,
-     switches::kDisableYUVImageDecoding,
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+    switches::kEnableAcceleratedVideo,
-+#else
-     switches::kDisableAcceleratedVideoDecode,
-+#endif
-     switches::kDisableBackgroundTimerThrottling,
-     switches::kDisableBestEffortTasks,
-     switches::kDisableBreakpad,
-@@ -3077,8 +3081,10 @@
- #if BUILDFLAG(ENABLE_PLUGINS)
-     switches::kEnablePepperTesting,
- #endif
-+#if !defined(OS_LINUX) || defined(OS_CHROMEOS)
-     switches::kDisableWebRtcHWDecoding,
-     switches::kDisableWebRtcHWEncoding,
-+#endif
-     switches::kEnableWebRtcSrtpAesGcm,
-     switches::kEnableWebRtcSrtpEncryptedHeaders,
-     switches::kEnableWebRtcStunOrigin,
-diff -ur content/browser/utility_process_host.cc chromium-69.0.3497.92/content/browser/utility_process_host.cc
---- content/browser/utility_process_host.cc	2018-09-12 00:39:41.000000000 +0530
-+++ content/browser/utility_process_host.cc	2018-09-13 22:10:34.296005227 +0530
-@@ -296,7 +296,11 @@
-       switches::kOverrideUseSoftwareGLForTests,
-       switches::kOverrideEnabledCdmInterfaceVersion,
-       switches::kProxyServer,
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+      switches::kEnableAcceleratedMjpegDecode,
-+#else
-       switches::kDisableAcceleratedMjpegDecode,
-+#endif
-       switches::kUseFakeDeviceForMediaStream,
-       switches::kUseFakeJpegDecodeAccelerator,
-       switches::kUseFileForFakeVideoCapture,
-diff -ur content/browser/webrtc/webrtc_media_recorder_browsertest.cc chromium-69.0.3497.92/content/browser/webrtc/webrtc_media_recorder_browsertest.cc
---- content/browser/webrtc/webrtc_media_recorder_browsertest.cc	2018-09-12 00:39:41.000000000 +0530
-+++ content/browser/webrtc/webrtc_media_recorder_browsertest.cc	2018-09-13 22:10:34.143009916 +0530
-@@ -66,7 +66,12 @@
-       return;
-     // This flag is also used for encoding, https://crbug.com/616640.
-     base::CommandLine::ForCurrentProcess()->AppendSwitch(
--        switches::kDisableAcceleratedVideoDecode);
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+        switches::kEnableAcceleratedVideo
-+#else
-+        switches::kDisableAcceleratedVideoDecode
-+#endif
-+        );
-   }
- 
-  private:
-diff -ur content/gpu/BUILD.gn chromium-69.0.3497.92/content/gpu/BUILD.gn
---- content/gpu/BUILD.gn	2018-09-12 00:39:41.000000000 +0530
-+++ content/gpu/BUILD.gn	2018-09-13 22:10:34.148009763 +0530
-@@ -133,4 +133,8 @@
+Index: dev/content/gpu/BUILD.gn
+===================================================================
+--- content/gpu/BUILD.gn
++++ content/gpu/BUILD.gn
+@@ -6,6 +6,7 @@ import("//build/config/jumbo.gni")
+ import("//build/config/ui.gni")
+ import("//gpu/vulkan/features.gni")
+ import("//media/media_options.gni")
++import("//media/gpu/args.gni")
+ import("//ui/ozone/ozone.gni")
+ 
+ # See //content/BUILD.gn for how this works.
+@@ -128,4 +129,8 @@ target(link_target_type, "gpu_sources")
        (!is_chromecast || is_cast_desktop_build)) {
      configs += [ "//build/config/linux/dri" ]
    }
 +
-+  if (is_desktop_linux) {
-+    public_configs = [ "//media/gpu:libva_config" ]
++  if (is_desktop_linux && use_vaapi) {
++    public_configs = [ "//build/config/linux/libva" ]
 +  }
  }
-diff -ur content/gpu/gpu_main.cc chromium-69.0.3497.92/content/gpu/gpu_main.cc
---- content/gpu/gpu_main.cc	2019-07-02 09:50:13.403486804 -0400
-+++ content/gpu/gpu_main.cc	2019-07-02 09:55:07.256818723 -0400
-@@ -288,7 +288,7 @@
- 
-   base::PlatformThread::SetName("CrGpuMain");
- 
--#if defined(OS_ANDROID) || defined(OS_CHROMEOS) || defined(USE_OZONE)
-+#if defined(OS_LINUX)
-   // Set thread priority before sandbox initialization.
-   base::PlatformThread::SetCurrentThreadPriority(base::ThreadPriority::DISPLAY);
- #endif
-@@ -321,7 +321,7 @@
-   GetContentClient()->SetGpuInfo(gpu_init->gpu_info());
- 
-   base::ThreadPriority io_thread_priority = base::ThreadPriority::NORMAL;
--#if defined(OS_ANDROID) || defined(OS_CHROMEOS) || defined(USE_OZONE)
-+#if defined(OS_LINUX)
-   io_thread_priority = base::ThreadPriority::DISPLAY;
- #endif
- 
-diff -ur content/public/browser/gpu_utils.cc chromium-69.0.3497.92/content/public/browser/gpu_utils.cc
---- content/public/browser/gpu_utils.cc	2018-09-12 00:39:42.000000000 +0530
-+++ content/public/browser/gpu_utils.cc	2018-09-13 22:10:34.164009273 +0530
-@@ -57,9 +57,17 @@
-   gpu_preferences.in_process_gpu =
-       command_line->HasSwitch(switches::kInProcessGPU);
-   gpu_preferences.disable_accelerated_video_decode =
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+      !command_line->HasSwitch(switches::kEnableAcceleratedVideo);
-+#else
-       command_line->HasSwitch(switches::kDisableAcceleratedVideoDecode);
-+#endif
-   gpu_preferences.disable_accelerated_video_encode =
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+      !command_line->HasSwitch(switches::kEnableAcceleratedVideo);
-+#else
-       command_line->HasSwitch(switches::kDisableAcceleratedVideoEncode);
-+#endif
- #if defined(OS_WIN)
-   uint32_t enable_accelerated_vpx_decode_val =
-       gpu::GpuPreferences::VPX_VENDOR_MICROSOFT;
-diff -ur content/public/common/content_switches.cc chromium-69.0.3497.92/content/public/common/content_switches.cc
---- content/public/common/content_switches.cc	2018-09-12 00:39:42.000000000 +0530
-+++ content/public/common/content_switches.cc	2018-09-13 22:10:34.172009028 +0530
-@@ -79,6 +79,11 @@
- // Disable gpu-accelerated 2d canvas.
- const char kDisableAccelerated2dCanvas[]    = "disable-accelerated-2d-canvas";
- 
-+#if defined(OS_LINUX)
-+// Enables hardware acceleration of video for Linux only. VA-API driver
-+// is required to be present on the system installation.
-+const char kEnableAcceleratedVideo[] = "enable-accelerated-video";
-+#endif
- // Disables hardware acceleration of video decode, where available.
- const char kDisableAcceleratedVideoDecode[] =
-     "disable-accelerated-video-decode";
-@@ -868,11 +873,13 @@
- // ignores this switch on its stable and beta channels.
- const char kDisableWebRtcEncryption[]      = "disable-webrtc-encryption";
- 
-+#if defined(OS_CHROMEOS)
- // Disables HW decode acceleration for WebRTC.
- const char kDisableWebRtcHWDecoding[]       = "disable-webrtc-hw-decoding";
- 
- // Disables HW encode acceleration for WebRTC.
- const char kDisableWebRtcHWEncoding[] = "disable-webrtc-hw-encoding";
-+#endif
- 
- // Enables negotiation of GCM cipher suites from RFC 7714 for SRTP in WebRTC.
- // See https://tools.ietf.org/html/rfc7714 for further information.
-diff -ur content/public/common/content_switches.h chromium-69.0.3497.92/content/public/common/content_switches.h
---- content/public/common/content_switches.h	2018-09-12 00:39:42.000000000 +0530
-+++ content/public/common/content_switches.h	2018-09-13 22:10:34.172009028 +0530
-@@ -104,6 +104,9 @@
- CONTENT_EXPORT extern const char kDomAutomationController[];
- extern const char kDisable2dCanvasClipAntialiasing[];
- CONTENT_EXPORT extern const char kDumpBlinkRuntimeCallStats[];
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+CONTENT_EXPORT extern const char kEnableAcceleratedVideo[];
-+#endif
- CONTENT_EXPORT extern const char kEnableAccessibilityObjectModel[];
- CONTENT_EXPORT extern const char kEnableAggressiveDOMStorageFlushing[];
- CONTENT_EXPORT extern const char kEnableAutomation[];
-@@ -241,8 +244,10 @@
- CONTENT_EXPORT extern const char kWaitForDebuggerChildren[];
- 
- CONTENT_EXPORT extern const char kDisableWebRtcEncryption[];
-+#if defined(OS_CHROMEOS)
- CONTENT_EXPORT extern const char kDisableWebRtcHWDecoding[];
- CONTENT_EXPORT extern const char kDisableWebRtcHWEncoding[];
-+#endif
- CONTENT_EXPORT extern const char kEnableWebRtcSrtpAesGcm[];
- CONTENT_EXPORT extern const char kEnableWebRtcSrtpEncryptedHeaders[];
- CONTENT_EXPORT extern const char kEnableWebRtcStunOrigin[];
-diff -ur content/renderer/render_thread_impl.cc chromium-69.0.3497.92/content/renderer/render_thread_impl.cc
---- content/renderer/render_thread_impl.cc	2018-09-12 00:39:42.000000000 +0530
-+++ content/renderer/render_thread_impl.cc	2018-09-13 22:10:34.192008415 +0530
-@@ -1441,7 +1441,11 @@
-           kGpuStreamPriorityMedia);
- 
-   const bool enable_video_accelerator =
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+      cmd_line->HasSwitch(switches::kEnableAcceleratedVideo) &&
-+#else
-       !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode) &&
-+#endif
-       (gpu_channel_host->gpu_feature_info()
-            .status_values[gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE] ==
-        gpu::kGpuFeatureStatusEnabled);
-Only in content/renderer: render_thread_impl.cc.orig
-diff -ur gpu/config/software_rendering_list.json chromium-69.0.3497.92/gpu/config/software_rendering_list.json
---- gpu/config/software_rendering_list.json	2018-09-12 00:39:44.000000000 +0530
-+++ gpu/config/software_rendering_list.json	2018-09-13 22:10:34.193008384 +0530
-@@ -377,17 +377,6 @@
+Index: dev/gpu/config/software_rendering_list.json
+===================================================================
+--- gpu/config/software_rendering_list.json
++++ gpu/config/software_rendering_list.json
+@@ -369,17 +369,6 @@
        ]
      },
      {
@@ -418,119 +158,241 @@ diff -ur gpu/config/software_rendering_list.json chromium-69.0.3497.92/gpu/confi
        "id": 50,
        "description": "Disable VMware software renderer on older Mesa",
        "cr_bugs": [145531, 332596, 571899, 629434],
-diff -ur media/base/media_switches.cc chromium-69.0.3497.92/media/base/media_switches.cc
---- media/base/media_switches.cc.orig	2019-06-18 11:48:14.000000000 -0400
-+++ media/base/media_switches.cc	2019-07-02 12:32:22.370983036 -0400
-@@ -103,10 +103,15 @@
- const char kUseFakeMjpegDecodeAccelerator[] =
-     "use-fake-mjpeg-decode-accelerator";
- 
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+// Enable hardware accelerated mjpeg decode on linux
-+const char kEnableAcceleratedMjpegDecode[] = "enable-accelerated-mjpeg-decode";
-+#else
- // Disable hardware acceleration of mjpeg decode for captured frame, where
- // available.
- const char kDisableAcceleratedMjpegDecode[] =
-     "disable-accelerated-mjpeg-decode";
-+#endif
- 
- // When running tests on a system without the required hardware or libraries,
- // this flag will cause the tests to fail. Otherwise, they silently succeed.
-@@ -503,15 +508,21 @@
- };
- 
- bool IsVideoCaptureAcceleratedJpegDecodingEnabled() {
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+  if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
-+  	  switches::kEnableAcceleratedMjpegDecode)
-+#else
-   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
--          switches::kDisableAcceleratedMjpegDecode)) {
-+          switches::kDisableAcceleratedMjpegDecode)
-+#endif
-+          ) {
-     return false;
-   }
-   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+Index: dev/media/base/media_switches.cc
+===================================================================
+--- media/base/media_switches.cc
++++ media/base/media_switches.cc
+@@ -544,7 +544,7 @@ bool IsVideoCaptureAcceleratedJpegDecodi
            switches::kUseFakeMjpegDecodeAccelerator)) {
      return true;
    }
 -#if defined(OS_CHROMEOS)
-+#if !defined(OS_ANDROID) && defined(OS_LINUX)
++#if defined(OS_LINUX) && !defined(OS_ANDROID)
    return true;
  #endif
    return false;
-diff -ur media/base/media_switches.h chromium-69.0.3497.92/media/base/media_switches.h
---- media/base/media_switches.h.orig	2019-07-02 12:20:39.902984488 -0400
-+++ media/base/media_switches.h	2019-07-02 12:33:45.441923602 -0400
-@@ -60,7 +60,11 @@
- MEDIA_EXPORT extern const char kUseFileForFakeVideoCapture[];
- MEDIA_EXPORT extern const char kUseFileForFakeAudioCapture[];
- MEDIA_EXPORT extern const char kUseFakeMjpegDecodeAccelerator[];
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+MEDIA_EXPORT extern const char kEnableAcceleratedMjpegDecode[];
-+#else
- MEDIA_EXPORT extern const char kDisableAcceleratedMjpegDecode[];
-+#endif
- 
- MEDIA_EXPORT extern const char kRequireAudioHardwareForTesting[];
- MEDIA_EXPORT extern const char kMuteAudio[];
---- media/gpu/BUILD.gn.orig	2019-07-29 16:36:19.000000000 -0400
-+++ media/gpu/BUILD.gn	2019-07-31 14:09:28.093032826 -0400
-@@ -495,6 +495,14 @@
+Index: dev/media/filters/BUILD.gn
+===================================================================
+--- media/filters/BUILD.gn
++++ media/filters/BUILD.gn
+@@ -5,6 +5,7 @@
+ import("//build/config/jumbo.gni")
+ import("//media/media_options.gni")
+ import("//third_party/libaom/options.gni")
++import("//media/gpu/args.gni")
+ 
+ jumbo_source_set("filters") {
+   # Do not expand the visibility here without double-checking with OWNERS, this
+@@ -196,7 +197,7 @@ jumbo_source_set("filters") {
+     deps += [ "//media/base/android" ]
    }
- }
  
-+if (is_desktop_linux && use_vaapi) {
-+  import("//build/config/linux/pkg_config.gni")
-+
-+  pkg_config("libva_config") {
-+    packages = [ "libva" ]
-+  }
-+}
-+
- if (use_v4l2_codec || use_vaapi || is_mac || is_win) {
-   test("video_encode_accelerator_unittest") {
-     deps = [
-@@ -525,6 +533,10 @@
+-  if (current_cpu != "arm" && is_linux) {
++  if (use_vaapi) {
+     sources += [
+       "h264_bitstream_buffer.cc",
+       "h264_bitstream_buffer.h",
+Index: dev/media/gpu/BUILD.gn
+===================================================================
+--- media/gpu/BUILD.gn
++++ media/gpu/BUILD.gn
+@@ -531,6 +531,7 @@ if (use_v4l2_codec || use_vaapi || is_ma
      if (use_ozone) {
        deps += [ "//ui/ozone" ]
      }
-+
-+    if (is_desktop_linux) {
-+      public_configs = [ ":libva_config" ]
-+    }
++    public_configs = [ "//build/config/linux/libva" ]
    }
  }
  
---- content/renderer/media/webrtc/video_codec_factory.cc.orig	2019-07-02 16:39:57.973241977 -0400
-+++ content/renderer/media/webrtc/video_codec_factory.cc	2019-07-02 17:00:00.656342711 -0400
-@@ -187,8 +187,11 @@
-   std::unique_ptr<webrtc::VideoEncoderFactory> encoder_factory;
+Index: dev/media/gpu/gpu_video_decode_accelerator_factory.cc
+===================================================================
+--- media/gpu/gpu_video_decode_accelerator_factory.cc
++++ media/gpu/gpu_video_decode_accelerator_factory.cc
+@@ -171,6 +171,8 @@ GpuVideoDecodeAcceleratorFactory::Create
+     vda = (this->*create_vda_function)(workarounds, gpu_preferences, media_log);
+     if (vda && vda->Initialize(config, client))
+       return vda;
++    else
++      LOG(ERROR) << "Initialization of one or more VDAs failed.";
+   }
  
-   const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
--  if (gpu_factories && gpu_factories->IsGpuVideoAcceleratorEnabled() &&
--      !cmd_line->HasSwitch(switches::kDisableWebRtcHWEncoding)) {
-+  if (gpu_factories && gpu_factories->IsGpuVideoAcceleratorEnabled()
-+#if defined(OS_CHROMEOS)
-+      && !cmd_line->HasSwitch(switches::kDisableWebRtcHWEncoding)
+   return nullptr;
+@@ -229,6 +231,7 @@ GpuVideoDecodeAcceleratorFactory::Create
+     const gpu::GpuDriverBugWorkarounds& workarounds,
+     const gpu::GpuPreferences& gpu_preferences,
+     MediaLog* media_log) const {
++  LOG(WARNING) << "Initializing VAAPI VDA.";
+   std::unique_ptr<VideoDecodeAccelerator> decoder;
+   decoder.reset(new VaapiVideoDecodeAccelerator(make_context_current_cb_,
+                                                 bind_image_cb_));
+Index: dev/media/gpu/ipc/service/gpu_video_decode_accelerator.cc
+===================================================================
+--- media/gpu/ipc/service/gpu_video_decode_accelerator.cc
++++ media/gpu/ipc/service/gpu_video_decode_accelerator.cc
+@@ -380,6 +380,7 @@ bool GpuVideoDecodeAccelerator::Initiali
+     LOG(ERROR) << "Failed creating the VDA factory";
+     return false;
+   }
++  LOG(WARNING) << "Created the VDA factory";
+ 
+   const gpu::GpuDriverBugWorkarounds& gpu_workarounds =
+       stub_->channel()->gpu_channel_manager()->gpu_driver_bug_workarounds();
+@@ -393,6 +394,7 @@ bool GpuVideoDecodeAccelerator::Initiali
+                << (config.is_encrypted() ? " with encryption" : "");
+     return false;
+   }
++  LOG(WARNING) << "Created VDA";
+ 
+   // Attempt to set up performing decoding tasks on IO thread, if supported by
+   // the VDA.
+Index: dev/media/gpu/vaapi/vaapi_video_decode_accelerator.cc
+===================================================================
+--- media/gpu/vaapi/vaapi_video_decode_accelerator.cc
++++ media/gpu/vaapi/vaapi_video_decode_accelerator.cc
+@@ -64,6 +64,7 @@ void ReportToUMA(VAVDADecoderFailure fai
+                             VAVDA_DECODER_FAILURES_MAX + 1);
+ }
+ 
++#if defined(OS_ANDROID) || defined(OS_CHROMEOS)
+ // Returns true if the CPU is an Intel Gemini Lake or later (including Kaby
+ // Lake) Cpu platform id's are referenced from the following file in kernel
+ // source arch/x86/include/asm/intel-family.h
+@@ -76,6 +77,7 @@ bool IsGeminiLakeOrLater() {
+       cpuid.model() >= kGeminiLakeModelId;
+   return is_geminilake_or_later;
+ }
 +#endif
-+      ) {
-     encoder_factory.reset(new RTCVideoEncoderFactory(gpu_factories));
+ 
+ }  // namespace
+ 
+@@ -632,6 +634,10 @@ void VaapiVideoDecodeAccelerator::Assign
+   va_surface_format_ = GetVaFormatForVideoCodecProfile(profile_);
+   std::vector<VASurfaceID> va_surface_ids;
+ 
++  // Nvidia doesn't support VAProfileNone, so don't try to create a temporary
++  // copy buffer there. It's not needed anyways for hardware video decoding
++  // to work.
++#if defined(OS_ANDROID) || defined(OS_CHROMEOS)
+   // If we aren't in BufferAllocationMode::kNone, we have to allocate a
+   // |vpp_vaapi_wrapper_| for VaapiPicture to DownloadFromSurface() the VA's
+   // internal decoded frame.
+@@ -645,15 +651,20 @@ void VaapiVideoDecodeAccelerator::Assign
+       NotifyError(PLATFORM_FAILURE);
+     }
    }
++#endif
  
-@@ -205,8 +208,11 @@
-   std::unique_ptr<webrtc::VideoDecoderFactory> decoder_factory;
+   for (size_t i = 0; i < buffers.size(); ++i) {
+     // If we aren't in BufferAllocationMode::kNone, this |picture| is
+     // only used as a copy destination. Therefore, the VaapiWrapper used and
+     // owned by |picture| is |vpp_vaapi_wrapper_|.
+     std::unique_ptr<VaapiPicture> picture = vaapi_picture_factory_->Create(
++#if defined(OS_LINUX) && !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
++            vaapi_wrapper_,
++#else
+         (buffer_allocation_mode_ == BufferAllocationMode::kNone)
+             ? vaapi_wrapper_
+             : vpp_vaapi_wrapper_,
++#endif
+         make_context_current_cb_, bind_image_cb_, buffers[i]);
+     RETURN_AND_NOTIFY_ON_FAILURE(picture, "Failed creating a VaapiPicture",
+                                  PLATFORM_FAILURE, );
+@@ -1078,6 +1089,9 @@ VaapiVideoDecodeAccelerator::GetSupporte
+ 
+ VaapiVideoDecodeAccelerator::BufferAllocationMode
+ VaapiVideoDecodeAccelerator::DecideBufferAllocationMode() {
++#if defined(OS_LINUX) && !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
++  return BufferAllocationMode::kNormal;
++#else
+   // TODO(crbug.com/912295): Enable a better BufferAllocationMode for IMPORT
+   // |output_mode_| as well.
+   if (output_mode_ == VideoDecodeAccelerator::Config::OutputMode::IMPORT)
+@@ -1113,6 +1127,7 @@ VaapiVideoDecodeAccelerator::DecideBuffe
+     return BufferAllocationMode::kReduced;
  
-   const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
--  if (gpu_factories && gpu_factories->IsGpuVideoAcceleratorEnabled() &&
--      !cmd_line->HasSwitch(switches::kDisableWebRtcHWDecoding)) {
-+  if (gpu_factories && gpu_factories->IsGpuVideoAcceleratorEnabled() 
-+#if defined(OS_CHROMEOS)
-+      && !cmd_line->HasSwitch(switches::kDisableWebRtcHWDecoding)
+   return BufferAllocationMode::kSuperReduced;
 +#endif
-+      ) {
-     decoder_factory.reset(new RTCVideoDecoderFactory(gpu_factories));
+ }
+ 
+ bool VaapiVideoDecodeAccelerator::IsBufferAllocationModeReducedOrSuperReduced()
+Index: dev/media/gpu/vaapi/vaapi_wrapper.cc
+===================================================================
+--- media/gpu/vaapi/vaapi_wrapper.cc
++++ media/gpu/vaapi/vaapi_wrapper.cc
+@@ -324,6 +324,11 @@ void VADisplayState::PreSandboxInitializ
+       base::File::FLAG_OPEN | base::File::FLAG_READ | base::File::FLAG_WRITE);
+   if (drm_file.IsValid())
+     VADisplayState::Get()->SetDrmFd(drm_file.GetPlatformFile());
++
++  const char kNvidiaPath[] = "/dev/dri/nvidiactl";
++  base::File nvidia_file = base::File(
++      base::FilePath::FromUTF8Unsafe(kNvidiaPath),
++      base::File::FLAG_OPEN | base::File::FLAG_READ | base::File::FLAG_WRITE);
+ }
+ 
+ VADisplayState::VADisplayState()
+@@ -351,10 +356,6 @@ bool VADisplayState::Initialize() {
+ }
+ 
+ bool VADisplayState::InitializeOnce() {
+-  static_assert(
+-      VA_MAJOR_VERSION >= 2 || (VA_MAJOR_VERSION == 1 && VA_MINOR_VERSION >= 1),
+-      "Requires VA-API >= 1.1.0");
+-
+   switch (gl::GetGLImplementation()) {
+     case gl::kGLImplementationEGLGLES2:
+       va_display_ = vaGetDisplayDRM(drm_fd_.get());
+@@ -362,10 +363,10 @@ bool VADisplayState::InitializeOnce() {
+     case gl::kGLImplementationDesktopGL:
+ #if defined(USE_X11)
+       va_display_ = vaGetDisplay(gfx::GetXDisplay());
+-#else
+-      LOG(WARNING) << "VAAPI video acceleration not available without "
+-                      "DesktopGL (GLX).";
++      if (vaDisplayIsValid(va_display_))
++        break;
+ #endif  // USE_X11
++      va_display_ = vaGetDisplayDRM(drm_fd_.get());
+       break;
+     // Cannot infer platform from GL, try all available displays
+     case gl::kGLImplementationNone:
+@@ -398,8 +399,19 @@ bool VADisplayState::InitializeOnce() {
+   int major_version, minor_version;
+   VAStatus va_res = vaInitialize(va_display_, &major_version, &minor_version);
+   if (va_res != VA_STATUS_SUCCESS) {
+-    LOG(ERROR) << "vaInitialize failed: " << vaErrorStr(va_res);
+-    return false;
++    LOG(ERROR) << "vaInitialize failed (ignore if using Wayland desktop environment): " << vaErrorStr(va_res);
++    va_display_ = vaGetDisplayDRM(drm_fd_.get());
++    if (!vaDisplayIsValid(va_display_)) {
++      LOG(ERROR) << "Could not get a valid DRM VA display";
++      return false;
++    }
++    va_res = vaInitialize(va_display_, &major_version, &minor_version);
++    if (va_res != VA_STATUS_SUCCESS) {
++      LOG(ERROR) << "vaInitialize failed using DRM: " << vaErrorStr(va_res);
++      return false;
++    } else {
++      LOG(WARNING) << "vaInitialize succeeded for DRM";
++    }
    }
  
+   va_initialized_ = true;
+@@ -407,7 +419,7 @@ bool VADisplayState::InitializeOnce() {
+   va_vendor_string_ = vaQueryVendorString(va_display_);
+   DLOG_IF(WARNING, va_vendor_string_.empty())
+       << "Vendor string empty or error reading.";
+-  DVLOG(1) << "VAAPI version: " << major_version << "." << minor_version << " "
++  VLOG(1) << "VAAPI version: " << major_version << "." << minor_version << " "
+            << va_vendor_string_;
+ 
+   // The VAAPI version is determined from what is loaded on the system by
+@@ -742,7 +754,7 @@ bool VASupportedProfiles::AreAttribsSupp
+     if (attribs[i].type != required_attribs[i].type ||
+         (attribs[i].value & required_attribs[i].value) !=
+             required_attribs[i].value) {
+-      DVLOG(1) << "Unsupported value " << required_attribs[i].value
++      VLOG(1) << "Unsupported value " << required_attribs[i].value
+                << " for attribute type " << required_attribs[i].type;
+       return false;
+     }
diff --git a/srcpkgs/chromium/patches/harfbuzz-subset.patch b/srcpkgs/chromium/patches/harfbuzz-subset.patch
new file mode 100644
index 00000000000..6f228b774d4
--- /dev/null
+++ b/srcpkgs/chromium/patches/harfbuzz-subset.patch
@@ -0,0 +1,49 @@
+From 27e25336b8316ff3ec4e464058682ed85801fd06 Mon Sep 17 00:00:00 2001
+From: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
+Date: Mon, 29 Jul 2019 10:54:28 +0000
+Subject: [PATCH] Also link against libharfbuzz-subset when use_system_harfbuzz is true
+
+When building HarfBuzz as part of Chromium, there is a single source set
+with all the files we need in the build.
+
+Upstream HarfBuzz, on the other hand, produces a few different libraries:
+harfbuzz, harfbuzz-icu and harfbuzz-subset.  When |use_system_harfbuzz| is
+true, we were only looking for (and using) harfbuzz.pc with pkg-config even
+though we also use symbols from libharfbuzz-subset.so. This resulted in
+errors when linking:
+
+    ld: obj/skia/skia/SkPDFSubsetFont.o: in function `SkPDFSubsetFont(sk_sp<SkData>, SkPDFGlyphUse const&, SkPDF::Metadata::Subsetter, char const*, int)':
+    SkPDFSubsetFont.cpp:(.text._Z15SkPDFSubsetFont5sk_spI6SkDataERK13SkPDFGlyphUseN5SkPDF8Metadata9SubsetterEPKci+0x48a): undefined reference to `hb_subset_input_create_or_fail'
+    ld: SkPDFSubsetFont.cpp:(.text._Z15SkPDFSubsetFont5sk_spI6SkDataERK13SkPDFGlyphUseN5SkPDF8Metadata9SubsetterEPKci+0x4af): undefined reference to `hb_subset_input_glyph_set'
+    ld: SkPDFSubsetFont.cpp:(.text._Z15SkPDFSubsetFont5sk_spI6SkDataERK13SkPDFGlyphUseN5SkPDF8Metadata9SubsetterEPKci+0x5d7): undefined reference to `hb_subset_input_set_retain_gids'
+    ld: SkPDFSubsetFont.cpp:(.text._Z15SkPDFSubsetFont5sk_spI6SkDataERK13SkPDFGlyphUseN5SkPDF8Metadata9SubsetterEPKci+0x5e4): undefined reference to `hb_subset_input_set_drop_hints'
+    ld: SkPDFSubsetFont.cpp:(.text._Z15SkPDFSubsetFont5sk_spI6SkDataERK13SkPDFGlyphUseN5SkPDF8Metadata9SubsetterEPKci+0x5f3): undefined reference to `hb_subset'
+    ld: SkPDFSubsetFont.cpp:(.text._Z15SkPDFSubsetFont5sk_spI6SkDataERK13SkPDFGlyphUseN5SkPDF8Metadata9SubsetterEPKci+0x66f): undefined reference to `hb_subset_input_destroy'
+
+as reported in
+https://groups.google.com/a/chromium.org/d/msg/chromium-packagers/UyJsVJ5QqWo/jSv5z7-rEQAJ
+
+Change-Id: I997af075c7b7263cd7cc71a63db5b0f93bd1ab59
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1715288
+Auto-Submit: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
+Commit-Queue: Dominik Röttsches <drott@chromium.org>
+Reviewed-by: Dominik Röttsches <drott@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#681760}
+---
+
+diff --git a/third_party/harfbuzz-ng/BUILD.gn b/third_party/harfbuzz-ng/BUILD.gn
+index 37d8e33..72013eb1d 100644
+--- third_party/harfbuzz-ng/BUILD.gn
++++ third_party/harfbuzz-ng/BUILD.gn
+@@ -16,7 +16,10 @@
+       "//third_party:freetype_harfbuzz",
+       "//third_party/freetype:freetype_source",
+     ]
+-    packages = [ "harfbuzz" ]
++    packages = [
++      "harfbuzz",
++      "harfbuzz-subset",
++    ]
+   }
+ } else {
+   config("harfbuzz_config") {
diff --git a/srcpkgs/chromium/patches/linked-hash-set.patch b/srcpkgs/chromium/patches/linked-hash-set.patch
new file mode 100644
index 00000000000..24b13d8a5c0
--- /dev/null
+++ b/srcpkgs/chromium/patches/linked-hash-set.patch
@@ -0,0 +1,130 @@
+From 74138b9febd37eac0fc26b8efb110014a83a52c6 Mon Sep 17 00:00:00 2001
+From: Jeremy Roman <jbroman@chromium.org>
+Date: Wed, 07 Aug 2019 13:26:48 +0000
+Subject: [PATCH] WTF: Make LinkedHashSet understand values for which memset initialization would be bad.
+
+Includes a unit test which fails before, and uses this to fix FontCacheKeyTraits.
+
+Bug: 980025
+Change-Id: If41f97444c7fd37b9b95d6dadaf3da5689079e9e
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1739948
+Reviewed-by: Kentaro Hara <haraken@chromium.org>
+Reviewed-by: Yutaka Hirano <yhirano@chromium.org>
+Commit-Queue: Jeremy Roman <jbroman@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#684731}
+---
+
+diff --git a/third_party/blink/renderer/platform/fonts/font_cache_key.h b/third_party/blink/renderer/platform/fonts/font_cache_key.h
+index 0efc8fb..90063cb 100644
+--- third_party/blink/renderer/platform/fonts/font_cache_key.h
++++ third_party/blink/renderer/platform/fonts/font_cache_key.h
+@@ -133,6 +133,10 @@
+ 
+ struct FontCacheKeyTraits : WTF::SimpleClassHashTraits<FontCacheKey> {
+   STATIC_ONLY(FontCacheKeyTraits);
++
++  // std::string's empty state need not be zero in all implementations,
++  // and it is held within FontFaceCreationParams.
++  static const bool kEmptyValueIsZero = false;
+ };
+ 
+ }  // namespace blink
+diff --git a/third_party/blink/renderer/platform/wtf/linked_hash_set.h b/third_party/blink/renderer/platform/wtf/linked_hash_set.h
+index b35b6e9..77e524c 100644
+--- third_party/blink/renderer/platform/wtf/linked_hash_set.h
++++ third_party/blink/renderer/platform/wtf/linked_hash_set.h
+@@ -146,6 +146,11 @@
+                     LinkedHashSetNodeBase* next)
+       : LinkedHashSetNodeBase(prev, next), value_(value) {}
+ 
++  LinkedHashSetNode(ValueArg&& value,
++                    LinkedHashSetNodeBase* prev,
++                    LinkedHashSetNodeBase* next)
++      : LinkedHashSetNodeBase(prev, next), value_(std::move(value)) {}
++
+   LinkedHashSetNode(LinkedHashSetNode&& other)
+       : LinkedHashSetNodeBase(std::move(other)),
+         value_(std::move(other.value_)) {}
+@@ -445,10 +450,13 @@
+ 
+   // The slot is empty when the next_ field is zero so it's safe to zero
+   // the backing.
+-  static const bool kEmptyValueIsZero = true;
++  static const bool kEmptyValueIsZero = ValueTraits::kEmptyValueIsZero;
+ 
+   static const bool kHasIsEmptyValueFunction = true;
+   static bool IsEmptyValue(const Node& node) { return !node.next_; }
++  static Node EmptyValue() {
++    return Node(ValueTraits::EmptyValue(), nullptr, nullptr);
++  }
+ 
+   static const int kDeletedValue = -1;
+ 
+diff --git a/third_party/blink/renderer/platform/wtf/list_hash_set_test.cc b/third_party/blink/renderer/platform/wtf/list_hash_set_test.cc
+index 4c3f899..cd1be00 100644
+--- third_party/blink/renderer/platform/wtf/list_hash_set_test.cc
++++ third_party/blink/renderer/platform/wtf/list_hash_set_test.cc
+@@ -487,6 +487,7 @@
+ };
+ 
+ struct Complicated {
++  Complicated() : Complicated(0) {}
+   Complicated(int value) : simple_(value) { objects_constructed_++; }
+ 
+   Complicated(const Complicated& other) : simple_(other.simple_) {
+@@ -495,9 +496,6 @@
+ 
+   Simple simple_;
+   static int objects_constructed_;
+-
+- private:
+-  Complicated() = delete;
+ };
+ 
+ int Complicated::objects_constructed_ = 0;
+@@ -731,4 +729,45 @@
+ 
+ }  // anonymous namespace
+ 
++// A unit type which objects to its state being initialized wrong.
++struct InvalidZeroValue {
++  InvalidZeroValue() = default;
++  InvalidZeroValue(WTF::HashTableDeletedValueType) : deleted_(true) {}
++  ~InvalidZeroValue() { CHECK(ok_); }
++  bool IsHashTableDeletedValue() const { return deleted_; }
++
++  bool ok_ = true;
++  bool deleted_ = false;
++};
++
++template <>
++struct HashTraits<InvalidZeroValue> : SimpleClassHashTraits<InvalidZeroValue> {
++  static const bool kEmptyValueIsZero = false;
++};
++
++template <>
++struct DefaultHash<InvalidZeroValue> {
++  struct Hash {
++    static unsigned GetHash(const InvalidZeroValue&) { return 0; }
++    static bool Equal(const InvalidZeroValue&, const InvalidZeroValue&) {
++      return true;
++    }
++  };
++};
++
++template <typename Set>
++class ListOrLinkedHashSetInvalidZeroTest : public testing::Test {};
++
++using InvalidZeroValueSetTypes =
++    testing::Types<ListHashSet<InvalidZeroValue>,
++                   ListHashSet<InvalidZeroValue, 1>,
++                   LinkedHashSet<InvalidZeroValue>>;
++TYPED_TEST_SUITE(ListOrLinkedHashSetInvalidZeroTest, InvalidZeroValueSetTypes);
++
++TYPED_TEST(ListOrLinkedHashSetInvalidZeroTest, InvalidZeroValue) {
++  using Set = TypeParam;
++  Set set;
++  set.insert(InvalidZeroValue());
++}
++
+ }  // namespace WTF
diff --git a/srcpkgs/chromium/patches/one_euro_filter.patch b/srcpkgs/chromium/patches/one_euro_filter.patch
new file mode 100644
index 00000000000..357babf1668
--- /dev/null
+++ b/srcpkgs/chromium/patches/one_euro_filter.patch
@@ -0,0 +1,11 @@
+--- third_party/one_euro_filter/src/one_euro_filter.h.orig	2019-09-29 21:21:03.958633609 -0400
++++ third_party/one_euro_filter/src/one_euro_filter.h	2019-09-29 21:21:54.128270940 -0400
+@@ -3,6 +3,8 @@
+ 
+ #include "low_pass_filter.h"
+ 
++#include <memory>
++
+ namespace one_euro_filter {
+ namespace test {
+ class OneEuroFilterTest;
diff --git a/srcpkgs/chromium/patches/sandbox-sched_getparam.patch b/srcpkgs/chromium/patches/sandbox-sched_getparam.patch
new file mode 100644
index 00000000000..aa2d9aa1846
--- /dev/null
+++ b/srcpkgs/chromium/patches/sandbox-sched_getparam.patch
@@ -0,0 +1,20 @@
+Allow SYS_sched_getparam and SYS_sched_getscheduler
+musl uses them for pthread_getschedparam()
+
+source: https://git.alpinelinux.org/aports/commit/community/chromium?id=54af9f8ac24f52d382c5758e2445bf0206eff40e
+
+--- services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc.orig	2019-10-08 21:03:18.253080425 +0200
++++ services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc	2019-10-08 21:04:19.648549718 +0200
+@@ -88,10 +88,10 @@
+     case __NR_sysinfo:
+     case __NR_times:
+     case __NR_uname:
+-      return Allow();
+-    case __NR_sched_getaffinity:
+     case __NR_sched_getparam:
+     case __NR_sched_getscheduler:
++      return Allow();
++    case __NR_sched_getaffinity:
+     case __NR_sched_setscheduler:
+       return sandbox::RestrictSchedTarget(GetPolicyPid(), sysno);
+     case __NR_prlimit64:
diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index c407841598b..45893b5f8e1 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -1,7 +1,7 @@
 # Template file for 'chromium'
 pkgname=chromium
 # See http://www.chromium.org/developers/calendar for the latest version
-version=76.0.3809.87
+version=77.0.3865.120
 revision=1
 archs="i686 x86_64*"
 short_desc="Google's attempt at creating a safer, faster, and more stable browser"
@@ -9,7 +9,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://www.chromium.org/"
 distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz"
-checksum=215ca6acee7b4fd3c95fe796260af4dc5454dbba3b701aa43afeb98a06dc4194
+checksum=d792f9b09b1dcfd64e68f47a611c540dd1383dd9abd78ca1e06b2a7e2ff06af8
 
 lib32disabled=yes
 nodebug=yes
@@ -246,7 +246,7 @@ do_install() {
 
 	vinstall out/Release/icudtl.dat 0644 usr/lib/chromium
 
-	for size in 22 24 48 64 128 256; do
+	for size in 24 48 64 128 256; do
 		install -Dm644 "chrome/app/theme/chromium/product_logo_${size}.png" \
 		${DESTDIR}/usr/share/icons/hicolor/${size}x${size}/apps/chromium.png
 	done
diff --git a/srcpkgs/chronograf/template b/srcpkgs/chronograf/template
index c21c7a90a00..b23d2ef09a3 100644
--- a/srcpkgs/chronograf/template
+++ b/srcpkgs/chronograf/template
@@ -1,6 +1,6 @@
 # Template file for 'chronograf'
 pkgname=chronograf
-version=1.7.12
+version=1.7.14
 revision=1
 build_style=go
 go_import_path="github.com/influxdata/${pkgname}"
@@ -12,7 +12,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="AGPL-3.0"
 homepage="https://www.influxdata.com/time-series-platform/chronograf/"
 distfiles="https://github.com/influxdata/${pkgname}/archive/${version}.tar.gz"
-checksum=b98b63577a039d3d505bcf953b3067fe180d09a91688ec162f9c8f00ee816dd3
+checksum=245479b691e2ad484717778562ce9e0c21b1d769e7d748335d1c5f41cd677d4c
 
 system_accounts="_chronograf"
 _chronograf_homedir="/var/lib/${pkgname}"
diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template
index 63027ef5197..5e6a1ab71d5 100644
--- a/srcpkgs/cinnamon-control-center/template
+++ b/srcpkgs/cinnamon-control-center/template
@@ -1,6 +1,6 @@
 # Template file for 'cinnamon-control-center'
 pkgname=cinnamon-control-center
-version=4.0.1
+version=4.2.2
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-update-mimedb --disable-systemd"
@@ -13,12 +13,12 @@ makedepends="ModemManager-devel cinnamon-desktop-devel cinnamon-menus-devel
  pulseaudio-devel tzdata upower-devel"
 depends="libcinnamon-control-center>=${version}_${revision} cinnamon-settings-daemon>=2.4
  cinnamon-translations>=2.4 desktop-file-utils hicolor-icon-theme"
-short_desc="The Cinnamon Control Center"
+short_desc="Cinnamon Control Center"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html"
 distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=130663817d55a6f37f6f5a51b2aa71b7b2ec7c684ef358f16b5a47e1b133ff76
+checksum=0cd334e9fc36165664362d2bef7953879ec1f1d1becdbce21ef0557ea34618d7
 nocross="gobject-introspection"
 
 do_check() {
diff --git a/srcpkgs/cinnamon-desktop/template b/srcpkgs/cinnamon-desktop/template
index 10cf9698c70..926e292256d 100644
--- a/srcpkgs/cinnamon-desktop/template
+++ b/srcpkgs/cinnamon-desktop/template
@@ -1,7 +1,7 @@
 # Template file for 'cinnamon-desktop'
 pkgname=cinnamon-desktop
-version=4.0.1
-revision=4
+version=4.2.0
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Dalsa=true"
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://developer.linuxmint.com/projects/cinnamon-projects.html"
 distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=72d4a8c78e42cf9d000f553551f3f3645df77c3c23973c989d7d269acd659100
+checksum=e7e6e9aa6e5c5c04a8320cb97ef545700826d04fc34e0f50d140d2efa41941a1
 
 case "$XBPS_TARGET_MACHINE" in
 	aarch64-musl) broken="Expat.c: loadable library and perl binaries are mismatched (got handshake key 0xce00080, needed 0xc800080)" ;;
diff --git a/srcpkgs/cinnamon-menus/template b/srcpkgs/cinnamon-menus/template
index affa413fa12..eedb8cbf29f 100644
--- a/srcpkgs/cinnamon-menus/template
+++ b/srcpkgs/cinnamon-menus/template
@@ -1,9 +1,8 @@
 # Template file for 'cinnamon-menus'
 pkgname=cinnamon-menus
-version=4.0.0
+version=4.2.0
 revision=1
-build_style=gnu-configure
-configure_args=" --disable-static"
+build_style=meson
 hostmakedepends="glib-devel gnome-common gobject-introspection intltool libtool
  pkg-config"
 makedepends="libglib-devel gobject-introspection"
@@ -12,12 +11,9 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
 distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=e42c642a6fcb3b8e53d6b8f389cca617c8988baaa6e85ac236b61edc38efc3a5
+checksum=331bd599d7a863fa92329483637de159c25c57467305691f9768e675cd63f7c2
 nocross="gobject-introspection"
 
-pre_configure() {
-	NOCONFIGURE=1 ./autogen.sh
-}
 
 cinnamon-menus-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/cinnamon-screensaver/template b/srcpkgs/cinnamon-screensaver/template
index 71f8a8ee026..9d39f32709a 100644
--- a/srcpkgs/cinnamon-screensaver/template
+++ b/srcpkgs/cinnamon-screensaver/template
@@ -1,6 +1,6 @@
 # Template file for 'cinnamon-screensaver'
 pkgname=cinnamon-screensaver
-version=4.0.3
+version=4.2.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
@@ -11,12 +11,12 @@ makedepends="cinnamon-desktop-devel dbus-glib-devel libXxf86misc-devel
 depends="cinnamon-translations hicolor-icon-theme python3-gobject
  python3-setproctitle python3-xapp xapps"
 conf_files="/etc/pam.d/${pkgname}"
-short_desc="The Cinnamon screensaver"
+short_desc="Cinnamon screensaver"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://developer.linuxmint.com/projects/cinnamon-projects.html/"
 distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=0835111cf01b25447076177944a977cebfe995b5ce3dcfe0fba841141ebbdaca
+checksum=8dee253e12cbd2f30f2c5112a8e5fba62b651733cb56aa327ede939506adf6a0
 
 nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/28904/steps/shell_3/logs/stdio
 pycompile_version="$py3_ver"
diff --git a/srcpkgs/cinnamon-session/template b/srcpkgs/cinnamon-session/template
index 04b89cbbab2..58b88acc618 100644
--- a/srcpkgs/cinnamon-session/template
+++ b/srcpkgs/cinnamon-session/template
@@ -1,6 +1,6 @@
 # Template file for 'cinnamon-session'
 pkgname=cinnamon-session
-version=4.0.0
+version=4.2.1
 revision=1
 build_style=meson
 configure_args="-Dwith-gconf=false"
@@ -8,12 +8,12 @@ hostmakedepends="pkg-config gobject-introspection
  gettext-devel dbus-glib-devel glib-devel intltool xmlto"
 makedepends="gtk+3-devel dbus-devel json-glib-devel libSM-devel
  pangox-compat-devel cinnamon-desktop-devel libcanberra-devel upower-devel
- elogind-devel libXtst-devel xapps-devel"
+ elogind-devel libXtst-devel xapps-devel GConf-devel"
 depends="cinnamon-desktop desktop-file-utils hicolor-icon-theme elogind"
-short_desc="The Cinnamon session handler"
+short_desc="Cinnamon session handler"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html"
 distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=cfd6d71ff4000f463b36ffa97ab415557d627776eefbe2720d8d954319a5bdc5
+checksum=bff38239942dc990ccb57c35bde43c19ebc8708284410de53c100e12c7005663
 nocross="gobject-introspection from cinnamon-desktop-devel"
diff --git a/srcpkgs/cinnamon-settings-daemon/template b/srcpkgs/cinnamon-settings-daemon/template
index 854aa640076..3641a1df2f0 100644
--- a/srcpkgs/cinnamon-settings-daemon/template
+++ b/srcpkgs/cinnamon-settings-daemon/template
@@ -1,6 +1,6 @@
 # Template file for 'cinnamon-settings-daemon'
 pkgname=cinnamon-settings-daemon
-version=4.0.3
+version=4.2.2
 revision=1
 build_style=gnu-configure
 configure_args=" --disable-static --disable-schemas-compile"
@@ -10,13 +10,13 @@ makedepends="cinnamon-desktop-devel elogind-devel ibus-devel json-glib-devel
  libSM-devel libcanberra-devel libgnomekbd-devel libgudev-devel libnotify-devel
  nss-devel polkit-devel pulseaudio-devel upower-devel"
 depends="desktop-file-utils hicolor-icon-theme"
-short_desc="The Cinnamon Settings Daemon"
+short_desc="Cinnamon Settings Daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
 changelog="https://raw.githubusercontent.com/linuxmint/cinnamon-settings-daemon/${version}/debian/changelog"
 distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=2b2530c089cf4d1f52510d00b38abc8f037776f61cb02942f3a3bbf242239c4f
+checksum=d5b1ff8b5777174a45ebf2906eb1690e79a241c1adeb56cd70f9f273674901f9
 nocross="gobject-introspection"
 
 pre_configure() {
diff --git a/srcpkgs/cinnamon-translations/template b/srcpkgs/cinnamon-translations/template
index 2eb1ad70d50..69e35cdf682 100644
--- a/srcpkgs/cinnamon-translations/template
+++ b/srcpkgs/cinnamon-translations/template
@@ -1,6 +1,6 @@
 # Template file for 'cinnamon-translations'
 pkgname=cinnamon-translations
-version=4.0.2
+version=4.2.2
 revision=1
 archs=noarch
 build_style=gnu-makefile
@@ -10,7 +10,7 @@ license="GPL-2.0-or-later"
 homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
 changelog="https://raw.githubusercontent.com/linuxmint/cinnamon-translations/${version}/debian/changelog"
 distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=07efa3d387aa91813dcc480e81237ae1daf1c8f817178ef7cbb2377ce8fba37d
+checksum=0bfcca02894dcff4644a77560515ea33d4beed1365210cf17ea66b04bf52ee1d
 
 do_install() {
 	vmkdir /usr/share/locale
diff --git a/srcpkgs/cinnamon/patches/595178cf57b80b977401460a147602832157b303.patch b/srcpkgs/cinnamon/patches/595178cf57b80b977401460a147602832157b303.patch
deleted file mode 100644
index 0e2bf8c54ba..00000000000
--- a/srcpkgs/cinnamon/patches/595178cf57b80b977401460a147602832157b303.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 595178cf57b80b977401460a147602832157b303 Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz93@gmail.com>
-Date: Fri, 5 Apr 2019 11:28:45 -0400
-Subject: [PATCH] PIL: remove unnnecessary version check and code fork (#8496)
-
-The Image.VERSION variable was deprecated some time ago and is now gone
-entirely. But its only use was to determine whether we were using at
-least the latest version of PIL, or any version of its fork, Pillow. And
-PIL was last developed in 2009 and does not support python3 at all, so
-we are guaranteed to be using Pillow.
-
-Moreover, the check does not really matter, as Pillow is guaranteed to
-load any image it opens, without the user doing so manually.
-
-Fixes #8495
----
- .../cinnamon/cinnamon-settings/bin/imtools.py | 27 +------------------
- 1 file changed, 1 insertion(+), 26 deletions(-)
-
-diff --git a/files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py b/files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py
-index 05605001f7..c386fe3847 100644
---- files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py
-+++ files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py
-@@ -620,31 +620,6 @@ def has_transparency(image):
-         has_alpha(image)
- 
- 
--if Image.VERSION == '1.1.7':
--
--    def split(image):
--        """Work around for bug in Pil 1.1.7
--
--        :param image: input image
--        :type image: PIL image object
--        :returns: the different color bands of the image (eg R, G, B)
--        :rtype: tuple
--        """
--        image.load()
--        return image.split()
--else:
--
--    def split(image):
--        """Work around for bug in Pil 1.1.7
--
--        :param image: input image
--        :type image: PIL image object
--        :returns: the different color bands of the image (eg R, G, B)
--        :rtype: tuple
--        """
--        return image.split()
--
--
- def get_alpha(image):
-     """Gets the image alpha band. Can handles P mode images with transpareny.
-     Returns a band with all values set to 255 if no alpha band exists.
-@@ -655,7 +630,7 @@ def get_alpha(image):
-     :rtype: single band image object
-     """
-     if has_alpha(image):
--        return split(image)[-1]
-+        return image.split()[-1]
-     if image.mode == 'P' and 'transparency' in image.info:
-         return image.convert('RGBA').split()[-1]
-     # No alpha layer, create one.
diff --git a/srcpkgs/cinnamon/patches/default-theme.patch b/srcpkgs/cinnamon/patches/default-theme.patch
deleted file mode 100644
index f18623acb57..00000000000
--- a/srcpkgs/cinnamon/patches/default-theme.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 36af45f699daa886a3c3fc3187e0b24b193294ad Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
-Date: Sat, 22 Nov 2014 22:39:39 +0100
-Subject: [PATCH] Set default theme to 'cinnamon'
-
----
- data/org.cinnamon.gschema.xml.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/data/org.cinnamon.gschema.xml.in b/data/org.cinnamon.gschema.xml.in
-index 91fa171..9f56e4c 100644
---- data/org.cinnamon.gschema.xml.in
-+++ data/org.cinnamon.gschema.xml.in
-@@ -581,7 +581,7 @@
-   <schema id="org.cinnamon.theme" path="/org/cinnamon/theme/"
-         gettext-domain="@GETTEXT_PACKAGE@">
-     <key name="name" type="s">
--      <default>""</default>
-+      <default>"cinnamon"</default>
-       <_summary>Theme name</_summary>
-       <_description>
-        The name of the theme
--- 
-2.1.3
-
diff --git a/srcpkgs/cinnamon/patches/set_wheel.patch b/srcpkgs/cinnamon/patches/set_wheel.patch
deleted file mode 100644
index 86228d1895d..00000000000
--- a/srcpkgs/cinnamon/patches/set_wheel.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py.orig	2017-12-18 13:53:18.000000000 +0100
-+++ files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py	2017-12-21 22:15:03.058109278 +0100
-@@ -839,11 +833,11 @@
-             pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size("/usr/share/cinnamon/faces/user-generic.png", 48, 48)
-             description = "<b>%s</b>\n%s" % (fullname, username)
-             piter = self.users.append(None, [new_user, pixbuf, description])
--            # Add the user to his/her own group and sudo if Administrator was selected
-+            # Add the user to his/her own group and wheel if Administrator was selected
-             if dialog.account_type_combo.get_active() == 1:
--                subprocess.call(["usermod", username, "-G", "%s,sudo,nopasswdlogin" % username])
-+                subprocess.call(["usermod", username, "-G", "%s,wheel,nopasswdlogin" % username]) 
-             else:
--                subprocess.call(["usermod", username, "-G", "%s,nopasswdlogin" % username])
-+                subprocess.call(["usermod", username, "-G", "%s" % username])
-             self.load_groups()
-         dialog.destroy()
- 
diff --git a/srcpkgs/cinnamon/template b/srcpkgs/cinnamon/template
index bdf374cea82..60b9e8be68b 100644
--- a/srcpkgs/cinnamon/template
+++ b/srcpkgs/cinnamon/template
@@ -1,7 +1,7 @@
 # Template file for 'cinnamon'
 pkgname=cinnamon
-version=4.0.10
-revision=2
+version=4.2.4
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-schemas-compile
  --enable-compile-warnings=no --disable-gtk-doc"
@@ -18,14 +18,15 @@ depends=" accountsservice caribou cinnamon-settings-daemon>=${version%.*}
  cinnamon-translations>=${version%.*} nemo>=${version%.*}
  gnome-themes-standard gnome-themes-standard-metacity gnome-backgrounds
  network-manager-applet polkit-gnome upower>=0.99.7 libkeybinder3 python3-dbus
- python3-gobject python3-pam python3-pexpect python3-Pillow python3-inotify"
+ python3-gobject python3-pam python3-pexpect python3-Pillow python3-inotify
+ python3-tinycss"
 short_desc="GNOME3 fork of Linux Mint with GNOME2 aspect"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
 changelog="https://raw.githubusercontent.com/linuxmint/Cinnamon/${version}/debian/changelog"
 distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=50e07fa014eeecb380e840a3be0f09c8af0ad368c64c6b8ce6c30b1f78a2bf66
+checksum=4329b03e08a82316b6890b761174132c18a349508387f005748c32436f6364fd
 nocross="gobject-introspection"
 
 pycompile_version="$py3_ver"
diff --git a/srcpkgs/cjs/template b/srcpkgs/cjs/template
index a6584d1923b..5db9aa80efc 100644
--- a/srcpkgs/cjs/template
+++ b/srcpkgs/cjs/template
@@ -1,11 +1,11 @@
 # Template file for 'cjs'
 pkgname=cjs
-version=4.0.0
-revision=2
+version=4.2.0
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-profiler"
 hostmakedepends="automake autoconf-archive libtool gnome-common pkg-config
- gobject-introspection glib-devel"
+ gobject-introspection glib-devel dbus"
 makedepends="mozjs52-devel dbus-glib-devel readline-devel gobject-introspection
  gtk+3-devel"
 short_desc="Javascript for Cinnamon"
@@ -13,7 +13,9 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
 distfiles="https://github.com/linuxmint/cjs/archive/${version}.tar.gz"
-checksum=acd520a503399753ecb0bfa71aa3d932d22ac6a72162043085ea48519a59d3f5
+checksum=77d1b9f0290135939ad03b60ac64ac637f05e886ba5b777b97f6742ee75af260
+nocross="yes" # https://api.travis-ci.org/v3/job/590340360/log.txt
+
 
 pre_configure() {
 	cp ${FILESDIR}/ax_code_coverage.m4 m4/
diff --git a/srcpkgs/ckb-next/template b/srcpkgs/ckb-next/template
index f3beb2d0a08..c6925c6691d 100644
--- a/srcpkgs/ckb-next/template
+++ b/srcpkgs/ckb-next/template
@@ -1,9 +1,9 @@
 # Template file for 'ckb-next'
 pkgname=ckb-next
-version=0.4.0
-revision=2
+version=0.4.2
+revision=1
 build_style=cmake
-configure_args="-DDISABLE_UPDATER=1"
+configure_args="-DDISABLE_UPDATER=1 -DUDEV_RULE_DIRECTORY=/usr/lib/udev/rules.d"
 hostmakedepends="qt5-devel"
 makedepends="qt5-devel quazip-qt5-devel eudev-libudev-devel $(vopt_if pulseaudio pulseaudio-devel)"
 short_desc="Corsair RGB Driver for Linux"
@@ -11,7 +11,7 @@ maintainer="Frank Steinborn <steinex@nognu.de>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/ckb-next/ckb-next"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=5521c5a94e87ba035c6d9340e37785fa6f29710215f3e3201bb6949c88de8bd1
+checksum=75b6908d5590c293dee8258a83d4ebe206306d3df9f867596e953ef7c6a86440
 build_options="pulseaudio"
 desc_option_pulseaudio="Enable support for music visualizer animation"
 
diff --git a/srcpkgs/ckbcomp/template b/srcpkgs/ckbcomp/template
index 00885ff6c2f..b6a0e1bc5d0 100644
--- a/srcpkgs/ckbcomp/template
+++ b/srcpkgs/ckbcomp/template
@@ -1,16 +1,16 @@
 # Template file for 'ckbcomp'
 pkgname=ckbcomp
-version=1.192
+version=1.193
 revision=1
 archs=noarch
-wrksrc="console-setup"
+wrksrc="console-setup-${version}"
 depends="perl"
 short_desc="Compile a XKB keyboard description to a keymap suitable for loadkeys"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://anonscm.debian.org/cgit/d-i/console-setup.git"
 distfiles="${DEBIAN_SITE}/main/c/console-setup/console-setup_${version}.tar.xz"
-checksum=4dbe2c9559ff68a61315efe4de2cb932396ede8c4a1df4b46b6fb0846cc59d5b
+checksum=d29c5d49cf4e0d8c1149bacbac38d9400d16f25a9fe3b8ad121737b0cc828977
 
 do_install() {
 	vbin Keyboard/ckbcomp
diff --git a/srcpkgs/clamav/template b/srcpkgs/clamav/template
index b74d1f6836b..e25a56e0a18 100644
--- a/srcpkgs/clamav/template
+++ b/srcpkgs/clamav/template
@@ -1,14 +1,15 @@
 # Template file for 'clamav'
 pkgname=clamav
-version=0.101.3
-revision=1
+version=0.102.0
+revision=2
 build_style=gnu-configure
 # XXX: system llvm is too new (< 3.7 required)
 # Shipped llvm does not build with gcc6
 configure_args="--sbindir=/usr/bin --libdir=/usr/lib
  --with-openssl=${XBPS_CROSS_BASE}/usr --with-pcre=${XBPS_CROSS_BASE}/usr
  --with-zlib=${XBPS_CROSS_BASE}/usr --with-libbz2-prefix=${XBPS_CROSS_BASE}/usr
- --with-system-libmspack=${XBPS_CROSS_BASE}/usr --with-user=_clamav --with-group=_clamav"
+ --with-system-libmspack=${XBPS_CROSS_BASE}/usr --with-libcurl=${XBPS_CROSS_BASE}/usr
+ --enable-ipv6 --with-user=_clamav --with-group=_clamav"
 conf_files="/etc/clamd.conf /etc/freshclam.conf"
 hostmakedepends="flex pkg-config zip"
 makedepends="json-c-devel libcurl-devel libmspack-devel libxml2-devel
@@ -18,7 +19,7 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-only"
 homepage="http://www.clamav.net/"
 distfiles="http://www.clamav.net/downloads/production/${pkgname}-${version}.tar.gz"
-checksum=68d42aac4a9cbde293288533a9a3c3d55863de38f2b8707c1ef2d987b1260338
+checksum=48fe188c46c793c2d0cb5c81c106e4690251aff6dc8aa6575dc688343291bee1
 _clamav_homedir="/var/lib/_${pkgname}"
 _clamav_descr="ClamAV user"
 system_accounts="_clamav"
diff --git a/srcpkgs/clang b/srcpkgs/clang
index 8ec3476f9c1..14540d7bad2 120000
--- a/srcpkgs/clang
+++ b/srcpkgs/clang
@@ -1 +1 @@
-llvm8
\ No newline at end of file
+llvm9
\ No newline at end of file
diff --git a/srcpkgs/clang-analyzer b/srcpkgs/clang-analyzer
index 8ec3476f9c1..14540d7bad2 120000
--- a/srcpkgs/clang-analyzer
+++ b/srcpkgs/clang-analyzer
@@ -1 +1 @@
-llvm8
\ No newline at end of file
+llvm9
\ No newline at end of file
diff --git a/srcpkgs/clang-tools-extra b/srcpkgs/clang-tools-extra
index 8ec3476f9c1..14540d7bad2 120000
--- a/srcpkgs/clang-tools-extra
+++ b/srcpkgs/clang-tools-extra
@@ -1 +1 @@
-llvm8
\ No newline at end of file
+llvm9
\ No newline at end of file
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index b7445b94b68..37ed2552729 100644
--- a/srcpkgs/claws-mail/template
+++ b/srcpkgs/claws-mail/template
@@ -1,7 +1,7 @@
 # Template file for 'claws-mail'
 pkgname=claws-mail
 version=3.17.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static --disable-python-plugin --disable-perl-plugin
  --enable-enchant --enable-gnutls"
diff --git a/srcpkgs/clazy/template b/srcpkgs/clazy/template
index 81f3176a363..f7f790395e6 100644
--- a/srcpkgs/clazy/template
+++ b/srcpkgs/clazy/template
@@ -1,7 +1,7 @@
 # Template file for 'clazy'
 pkgname=clazy
-version=1.5
-revision=2
+version=1.6
+revision=1
 build_style=cmake
 hostmakedepends="python"
 makedepends="clang llvm"
@@ -10,5 +10,5 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-or-later"
 homepage="https://cgit.kde.org/clazy.git/about/"
 distfiles="${KDE_SITE}/clazy/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=87e37aace395e31359d4258452bbf7d1bdb5eae39e21e0dc0d80a75db8b8b779
+checksum=806d1befaddba82316f4ea34f1cba38bcc7545d0981007e3527c1ff1576dd0de
 nocross="Clang cannot be installed as makedep"
diff --git a/srcpkgs/clearine/template b/srcpkgs/clearine/template
index 64919e918aa..419bb3c4550 100644
--- a/srcpkgs/clearine/template
+++ b/srcpkgs/clearine/template
@@ -1,32 +1,26 @@
 # Template file for 'clearine'
 pkgname=clearine
-version=0.5
+version=0.7
 revision=1
-archs=noarch
-build_style=gnu-makefile
-depends="gtk+3 python3-gobject"
+build_style=python3-module
+pycompile_module="Clearine"
+hostmakedepends="python3-setuptools"
+depends="python3-gobject python3-cairo"
 short_desc="GTK3-based logout-window overlay for independent windowmanager"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Frank Steinborn <steinex@nognu.de>"
 license="MIT"
 homepage="https://github.com/yuune/clearine"
 distfiles="https://github.com/yuune/clearine/archive/${version}.tar.gz"
-checksum=029d5ece64a0471d1978daa620f5f06c5757245f3fec240aade38c514b3a5145
+checksum=18a1a6b8b726c430e848a6688c97cd095fc01d7b15907fac28a267155b69588d
 conf_files="/etc/clearine.conf"
 
-do_build() {
-	sed -i data/clearine.conf \
-		-e "s;^\(restart =\) .*;\1 reboot;" \
-		-e "s;^\(shutdown =\) .*;\1 poweroff;"
+pre_build() {
+	sed -i src/data/clearine.conf \
+		-e "s;\(restart =\) .*;\1 reboot;" \
+		-e "s;\(shutdown =\) .*;\1 poweroff;"
 }
 
-do_install() {
-	local f
-
-	vmkdir usr/share/themes/Clearine-Fallback/clearine
-	vconf data/clearine.conf
-	for f in data/*.svg; do
-		vinstall $f 644 usr/share/themes/Clearine-Fallback/clearine
-	done
-	vbin clearine
+post_install() {
+	vconf src/data/clearine.conf
 	vlicense LICENSE
 }
diff --git a/srcpkgs/clementine/patches/add-missing-functional-includes-5630.patch b/srcpkgs/clementine/patches/add-missing-functional-includes-5630.patch
deleted file mode 100644
index 0355eefca7c..00000000000
--- a/srcpkgs/clementine/patches/add-missing-functional-includes-5630.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 8a6cc8b5069265e1e92e22def985e22c5955e503 Mon Sep 17 00:00:00 2001
-From: Morris Hafner <mmha@users.noreply.github.com>
-Date: Mon, 13 Feb 2017 17:46:46 +0100
-Subject: [PATCH] Add missing <functional> includes (#5630)
-
----
- src/core/mergedproxymodel.cpp | 1 +
- src/devices/giolister.cpp     | 1 +
- src/library/groupbydialog.cpp | 2 ++
- 3 files changed, 4 insertions(+)
-
-diff --git a/src/core/mergedproxymodel.cpp b/src/core/mergedproxymodel.cpp
-index 56217f6fd..8c210d391 100644
---- a/src/core/mergedproxymodel.cpp
-+++ b/src/core/mergedproxymodel.cpp
-@@ -23,6 +23,7 @@
- 
- #include <QStringList>
- 
-+#include <functional>
- #include <limits>
- 
- // boost::multi_index still relies on these being in the global namespace.
-diff --git a/src/devices/giolister.cpp b/src/devices/giolister.cpp
-index aa3bddb34..5f63ef248 100644
---- a/src/devices/giolister.cpp
-+++ b/src/devices/giolister.cpp
-@@ -17,6 +17,7 @@
- 
- #include "config.h"
- 
-+#include <functional>
- #include <memory>
- 
- #include <QFile>
-diff --git a/src/library/groupbydialog.cpp b/src/library/groupbydialog.cpp
-index 5efdc9f36..e5f711b34 100644
---- a/src/library/groupbydialog.cpp
-+++ b/src/library/groupbydialog.cpp
-@@ -20,6 +20,8 @@
- 
- #include <QPushButton>
- 
-+#include <functional>
-+
- // boost::multi_index still relies on these being in the global namespace.
- using std::placeholders::_1;
- using std::placeholders::_2;
--- 
-2.13.4
-
diff --git a/srcpkgs/clementine/patches/clementine-chromaprint-1.4.patch b/srcpkgs/clementine/patches/clementine-chromaprint-1.4.patch
deleted file mode 100644
index bfdc49265aa..00000000000
--- a/srcpkgs/clementine/patches/clementine-chromaprint-1.4.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From ded312685735fc266d4154d355286eeb86db3bcd Mon Sep 17 00:00:00 2001
-From: Chocobozzz <florian.bigard@gmail.com>
-Date: Thu, 8 Dec 2016 23:12:17 +0100
-Subject: [PATCH] Add compatibility with chromaprint >= 1.4
-
----
- src/musicbrainz/chromaprinter.cpp | 14 +++++++++++---
- 1 file changed, 11 insertions(+), 3 deletions(-)
-
-diff --git a/src/musicbrainz/chromaprinter.cpp b/src/musicbrainz/chromaprinter.cpp
-index 9579b62..c7ad99e 100644
---- a/src/musicbrainz/chromaprinter.cpp
-+++ b/src/musicbrainz/chromaprinter.cpp
-@@ -143,16 +143,24 @@ QString Chromaprinter::CreateFingerprint() {
-   ChromaprintContext* chromaprint =
-       chromaprint_new(CHROMAPRINT_ALGORITHM_DEFAULT);
-   chromaprint_start(chromaprint, kDecodeRate, kDecodeChannels);
--  chromaprint_feed(chromaprint, reinterpret_cast<void*>(data.data()),
-+  chromaprint_feed(chromaprint, reinterpret_cast<int16_t *>(data.data()),
-                    data.size() / 2);
-   chromaprint_finish(chromaprint);
- 
--  void* fprint = nullptr;
-   int size = 0;
-+
-+#if CHROMAPRINT_VERSION_MAJOR >= 1 && CHROMAPRINT_VERSION_MINOR >= 4
-+  u_int32_t *fprint = nullptr;
-+  char *encoded = nullptr;
-+#else
-+  void *fprint = nullptr;
-+  void *encoded = nullptr;
-+#endif
-+
-   int ret = chromaprint_get_raw_fingerprint(chromaprint, &fprint, &size);
-+
-   QByteArray fingerprint;
-   if (ret == 1) {
--    void* encoded = nullptr;
-     int encoded_size = 0;
-     chromaprint_encode_fingerprint(fprint, size, CHROMAPRINT_ALGORITHM_DEFAULT,
-                                    &encoded, &encoded_size, 1);
diff --git a/srcpkgs/clementine/patches/clementine-moodbar_flags.patch b/srcpkgs/clementine/patches/clementine-moodbar_flags.patch
deleted file mode 100644
index 5eadfec4c46..00000000000
--- a/srcpkgs/clementine/patches/clementine-moodbar_flags.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/gst/moodbar/CMakeLists.txt b/gst/moodbar/CMakeLists.txt
-index 44c1362..7ed5047 100644
---- a/gst/moodbar/CMakeLists.txt
-+++ b/gst/moodbar/CMakeLists.txt
-@@ -1,7 +1,7 @@
- cmake_minimum_required(VERSION 2.6)
- 
--set(CMAKE_C_FLAGS "-Wall")
--set(CMAKE_CXX_FLAGS "-Woverloaded-virtual -Wall --std=c++0x")
-+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
-+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual -Wall --std=c++0x")
- 
- include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
- 
diff --git a/srcpkgs/clementine/patches/clementine-sqlite-3.12.patch b/srcpkgs/clementine/patches/clementine-sqlite-3.12.patch
deleted file mode 100644
index 5c6a15227c7..00000000000
--- a/srcpkgs/clementine/patches/clementine-sqlite-3.12.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/src/core/database.cpp
-+++ b/src/core/database.cpp
-@@ -265,6 +265,16 @@
-   StaticInit();
-
-   {
-+#ifdef SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER
-+    QVariant v = db.driver()->handle();
-+    if (v.isValid() && qstrcmp(v.typeName(), "sqlite3*") == 0) {
-+      sqlite3* handle = *static_cast<sqlite3**>(v.data());
-+      if (handle) {
-+        sqlite3_db_config(handle, SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER, 1, NULL);
-+      }
-+    }
-+#endif
-+
-     QSqlQuery set_fts_tokenizer("SELECT fts3_tokenizer(:name, :pointer)", db);
-     set_fts_tokenizer.bindValue(":name", "unicode");
-     set_fts_tokenizer.bindValue(
diff --git a/srcpkgs/clementine/patches/protobuf-370.patch b/srcpkgs/clementine/patches/protobuf-370.patch
deleted file mode 100644
index 00617da94cd..00000000000
--- a/srcpkgs/clementine/patches/protobuf-370.patch
+++ /dev/null
@@ -1,82 +0,0 @@
---- a/src/internet/lastfm/lastfmcompat.cpp
-+++ b/src/internet/lastfm/lastfmcompat.cpp
-@@ -68,13 +68,13 @@ bool ParseQuery(const QByteArray& data, XmlQuery* query,
-       return false;
-     }
- #endif  // Q_OS_WIN32
--  } catch (lastfm::ws::ParseError e) {
-+  } catch (lastfm::ws::ParseError &e) {
-     qLog(Error) << "Last.fm parse error: " << e.enumValue();
-     if (connection_problems) {
-       *connection_problems = e.enumValue() == lastfm::ws::MalformedResponse;
-     }
-     return false;
--  } catch (std::runtime_error& e) {
-+  }  (std::runtime_error& e) {
-     qLog(Error) << e.what();
-     return false;
-   }
---- a/src/internet/spotify/spotifyblobdownloader.cpp
-+++ b/src/internet/spotify/spotifyblobdownloader.cpp
-@@ -216,7 +216,7 @@ bool SpotifyBlobDownloader::CheckSignature(
-         return false;
-       }
-     }
--  } catch (std::exception e) {
-+  } catch (std::exception &e) {
-     // This should only happen if we fail to parse our own key.
-     qLog(Debug) << "Verifying spotify blob signature failed:" << e.what();
-     return false;
---- a/src/songinfo/echonestbiographies.cpp
-+++ b/src/songinfo/echonestbiographies.cpp
-@@ -66,7 +66,7 @@ void EchoNestBiographies::RequestFinished() {
-   try {
-     request->artist_->parseProfile(reply);
-   }
--  catch (Echonest::ParseError e) {
-+  catch (Echonest::ParseError &e) {
-     qLog(Warning) << "Error parsing echonest reply:" << e.errorType()
-                   << e.what();
-   }
---- a/src/songinfo/echonestimages.cpp
-+++ b/src/songinfo/echonestimages.cpp
-@@ -68,7 +68,7 @@ void EchoNestImages::RequestFinished(QNetworkReply* reply, int id,
-   reply->deleteLater();
-   try {
-     artist.parseProfile(reply);
--  } catch (Echonest::ParseError e) {
-+  } catch (Echonest::ParseError &e) {
-     qLog(Warning) << "Error parsing echonest reply:" << e.errorType()
-                   << e.what();
-   }
-@@ -94,7 +94,7 @@ void EchoNestImages::IdsFound(QNetworkReply* reply, int request_id) {
-         DoSpotifyImageRequest(id.foreign_id, request_id);
-       }
-     }
--  } catch (Echonest::ParseError e) {
-+  } catch (Echonest::ParseError &e) {
-     qLog(Warning) << "Error parsing echonest reply:" << e.errorType()
-                   << e.what();
-   }
---- a/src/songinfo/echonestsimilarartists.cpp
-+++ b/src/songinfo/echonestsimilarartists.cpp
-@@ -47,7 +47,7 @@ void EchoNestSimilarArtists::RequestFinished() {
-   try {
-     artists = Echonest::Artist::parseSimilar(reply);
-   }
--  catch (Echonest::ParseError e) {
-+  catch (Echonest::ParseError &e) {
-     qLog(Warning) << "Error parsing echonest reply:" << e.errorType()
-                   << e.what();
-   }
---- a/src/songinfo/echonesttags.cpp
-+++ b/src/songinfo/echonesttags.cpp
-@@ -51,7 +51,7 @@ void EchoNestTags::RequestFinished() {
-   try {
-     request->artist_->parseProfile(reply);
-   }
--  catch (Echonest::ParseError e) {
-+  catch (Echonest::ParseError &e) {
-     qLog(Warning) << "Error parsing echonest reply:" << e.errorType()
-                   << e.what();
-   }
diff --git a/srcpkgs/clementine/patches/sentinel.patch b/srcpkgs/clementine/patches/sentinel.patch
deleted file mode 100644
index d2aeb7d27ac..00000000000
--- a/srcpkgs/clementine/patches/sentinel.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/gstenginepipeline.cpp	2017-09-22 23:13:31.520359890 +0200
-+++ b/src/engines/gstenginepipeline.cpp	2017-09-22 23:14:31.837362189 +0200
-@@ -375,7 +375,7 @@
-   // Link the elements with special caps
-   // The scope path through the tee gets 16-bit ints.
-   GstCaps* caps16 = gst_caps_new_simple("audio/x-raw", "format", G_TYPE_STRING,
--                                        "S16LE", NULL);
-+                                        "S16LE", (char*)0);
-   gst_element_link_filtered(probe_converter, probe_sink, caps16);
-   gst_caps_unref(caps16);
- 
---- a/chromaprinter.cpp	2017-09-22 23:18:59.324372383 +0200
-+++ b/src/musicbrainz/chromaprinter.cpp	2017-09-22 23:19:35.520373762 +0200
-@@ -78,7 +78,7 @@
-   // Chromaprint expects mono 16-bit ints at a sample rate of 11025Hz.
-   GstCaps* caps = gst_caps_new_simple(
-       "audio/x-raw", "format", G_TYPE_STRING, "S16LE", "channels", G_TYPE_INT,
--      kDecodeChannels, "rate", G_TYPE_INT, kDecodeRate, NULL);
-+      kDecodeChannels, "rate", G_TYPE_INT, kDecodeRate, (char*)0);
-   gst_element_link_filtered(resample, sink, caps);
-   gst_caps_unref(caps);
- 
---- a/cddasongloader.cpp	2017-09-22 23:25:22.975387004 +0200
-+++ b/src/devices/cddasongloader.cpp	2017-09-22 23:25:59.774388406 +0200
-@@ -62,7 +62,7 @@
-                  nullptr);
-   }
-   if (g_object_class_find_property (G_OBJECT_GET_CLASS (cdda_), "paranoia-mode")) {
--    g_object_set (cdda_, "paranoia-mode", 0, NULL);
-+    g_object_set (cdda_, "paranoia-mode", 0, (char*)0);
-   }
- 
-   // Change the element's state to ready and paused, to be able to query it
-@@ -106,7 +106,7 @@
- 
-   GstElement* pipeline = gst_pipeline_new("pipeline");
-   GstElement* sink = gst_element_factory_make ("fakesink", NULL);
--  gst_bin_add_many (GST_BIN (pipeline), cdda_, sink, NULL);
-+  gst_bin_add_many (GST_BIN (pipeline), cdda_, sink, (char*)0);
-   gst_element_link (cdda_, sink);
-   gst_element_set_state(pipeline, GST_STATE_READY);
-   gst_element_set_state(pipeline, GST_STATE_PAUSED);
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index 6e99f249328..cda941a6369 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,22 +1,26 @@
 # Template file for 'clementine'
 pkgname=clementine
 version=1.3.1
-revision=18
-wrksrc="Clementine-${version}"
+revision=21
+_commit=75f18dab23f0842713a4200a7e362efd51b12e31
+wrksrc="Clementine-${_commit}"
 build_style=cmake
-hostmakedepends="sparsehash pkg-config qt-host-tools qt-devel protobuf"
+configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF"
+hostmakedepends="sparsehash pkg-config qt5-qmake qt5-host-tools protobuf"
 makedepends="chromaprint-devel boost-devel gst-plugins-base1-devel liblastfm-devel
- qt-webkit-devel glew-devel qjson-devel sqlite-devel protobuf-devel libplist-devel
- libusbmuxd-devel libmtp-devel libcdio-devel qca-devel pulseaudio-devel glu-devel
+ qt5-devel glew-devel sqlite-devel protobuf-devel libplist-devel
+ libusbmuxd-devel libmtp-devel libcdio-devel pulseaudio-devel glu-devel
  taglib-devel crypto++-devel $(vopt_if spotify libspotify-devel) libechonest-devel
- libgpod-devel"
+ libgpod-devel libmygpo-qt-devel qt5-x11extras-devel qt5-plugin-mysql
+ qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds qt5-plugin-odbc
+ qt5-tools-devel"
 depends="desktop-file-utils"
 short_desc="Modern music player and library organizer"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="https://www.clementine-player.org/"
-distfiles="https://github.com/clementine-player/Clementine/archive/${version}.tar.gz"
-checksum=f885931a9ab7c88607d07b50c64fcce46fc05f13dd2c0a04188c94eff938f37c
+distfiles="https://github.com/clementine-player/Clementine/archive/${_commit}.tar.gz"
+checksum=0c29e596cb5acc6970754e3c20616c5474859b7d2e6f05f5cda5c539581e2c8a
 
 patch_args="-Np1"
 build_options="spotify"
diff --git a/srcpkgs/clipgrab/template b/srcpkgs/clipgrab/template
index 943cfaabde3..d437d592958 100644
--- a/srcpkgs/clipgrab/template
+++ b/srcpkgs/clipgrab/template
@@ -1,6 +1,6 @@
 # Template file for 'clipgrab'
 pkgname=clipgrab
-version=3.8.3
+version=3.8.5
 revision=1
 build_style=qmake
 configure_args=clipgrab.pro
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://clipgrab.org"
 distfiles="https://download.clipgrab.org/clipgrab-${version}.tar.gz"
-checksum=ee03fe7fbac15c8ed7f8e6fd577c8d9372472ac0317dc5bf7fc363f930dd1bed
+checksum=69c3264bedc72a6c98006b43f05413bce8724a3beec0081aa5d693bff9b7d249
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-location-devel qt5-quickcontrols2-devel
@@ -22,6 +22,10 @@ if [ "$CROSS_BUILD" ]; then
 	 qt5-host-tools"
 fi
 
+case "$XBPS_TARGET_MACHINE" in
+	arm*) broken="qt-webkit not available on arm"
+esac
+
 do_install() {
 	vbin clipgrab
 	vinstall icon.png 644 usr/share/pixmaps clipgrab.png
diff --git a/srcpkgs/clipman/template b/srcpkgs/clipman/template
new file mode 100644
index 00000000000..87303fff362
--- /dev/null
+++ b/srcpkgs/clipman/template
@@ -0,0 +1,14 @@
+# Template file for 'clipman'
+pkgname=clipman
+version=1.0.2
+revision=1
+build_style=go
+go_import_path=github.com/yory8/clipman
+hostmakedepends="git"
+depends="wl-clipboard"
+short_desc="Simple clipboard manager for Wayland"
+maintainer="travankor <travankor@tuta.io>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/yory8/clipman"
+distfiles="https://github.com/yory8/clipman/archive/v${version}.tar.gz"
+checksum=9ee2a03891d06594323777fad2e34b3787f41c5168f2354c52776bc8ad2868d3
diff --git a/srcpkgs/cloc/template b/srcpkgs/cloc/template
index b9fb0a9ae45..9fa379def29 100644
--- a/srcpkgs/cloc/template
+++ b/srcpkgs/cloc/template
@@ -1,6 +1,6 @@
 # Template file for 'cloc'
 pkgname=cloc
-version=1.82
+version=1.84
 revision=1
 archs=noarch
 hostmakedepends="perl"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/AlDanial/cloc"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=7ab390f3a4888d9b78df420bff586326b53e3f7fc0e0c9ff9b160d076ca85a17
+checksum=b88a3adc669c15a9a32975095090708ba4eee5a73b8498369fae14be5b8a37d4
 
 do_build() {
 	make -C Unix man
diff --git a/srcpkgs/cloudfuse/template b/srcpkgs/cloudfuse/template
index c5d930f1c02..5240fd0c6b7 100644
--- a/srcpkgs/cloudfuse/template
+++ b/srcpkgs/cloudfuse/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libxml2-devel libcurl-devel fuse-devel"
 short_desc="FUSE for Mosso's Cloud Files"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://redbo.github.io/cloudfuse"
 distfiles="https://github.com/redbo/cloudfuse/archive/${version}.tar.gz"
diff --git a/srcpkgs/clyrics/template b/srcpkgs/clyrics/template
index 3e4c42d3988..5a0144c5b30 100644
--- a/srcpkgs/clyrics/template
+++ b/srcpkgs/clyrics/template
@@ -1,6 +1,6 @@
 # Template file for 'clyrics'
 pkgname=clyrics
-version=0.11
+version=0.12
 revision=1
 archs=noarch
 depends="perl-LWP-Protocol-https perl-WWW-Mechanize"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
 homepage="https://trizenx.blogspot.fr/2013/02/mocp-lyrics.html"
 distfiles="https://github.com/trizen/clyrics/archive/${version}.tar.gz"
-checksum=221d746c9c60249c56d2637f10890609bb14a97316016d98ebdf0db57acf22e8
+checksum=3110a177618fee02b5b17539b1a7c2fe877238ee922ac2967e828c3db5efc799
 
 do_install() {
 	local f
diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template
index f7fbf78964c..4614373f36c 100644
--- a/srcpkgs/cmake-gui/template
+++ b/srcpkgs/cmake-gui/template
@@ -1,6 +1,6 @@
 # Template file for 'cmake-gui'
 pkgname=cmake-gui
-version=3.15.2
+version=3.15.4
 revision=1
 wrksrc="cmake-${version}"
 build_style=configure
@@ -15,7 +15,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later, BSD-3-Clause"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz"
-checksum=539088cb29a68e6d6a8fba5c00951e5e5b1a92c68fa38a83e1ed2f355933f768
+checksum=8a211589ea21374e49b25fc1fc170e2d5c7462b795f1b29c84dd0e984301ed7a
 nocross=yes
 
 do_install() {
diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template
index 0790260af45..c0b11d76885 100644
--- a/srcpkgs/cmake/template
+++ b/srcpkgs/cmake/template
@@ -1,7 +1,7 @@
 # Template file for 'cmake'
 pkgname=cmake
-version=3.15.2
-revision=2
+version=3.15.4
+revision=1
 build_style=configure
 make_check_target=test
 makedepends="expat-devel libarchive-devel libcurl-devel libuv-devel
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later, BSD-3-Clause"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz"
-checksum=539088cb29a68e6d6a8fba5c00951e5e5b1a92c68fa38a83e1ed2f355933f768
+checksum=8a211589ea21374e49b25fc1fc170e2d5c7462b795f1b29c84dd0e984301ed7a
 
 if [ "$CROSS_BUILD" ]; then
 	# XXX ugly :-)
diff --git a/srcpkgs/cmixer/patches/linux.patch b/srcpkgs/cmixer/patches/linux.patch
new file mode 100644
index 00000000000..653488322b4
--- /dev/null
+++ b/srcpkgs/cmixer/patches/linux.patch
@@ -0,0 +1,34 @@
+--- cmixer.pl.orig
++++ cmixer.pl
+@@ -34,23 +34,6 @@
+ 
+ sub read_mixerctl {
+ 	my $self = shift;
+-	foreach (`mixerctl 2>&1`) {
+-		#mixerctl: /dev/mixer: Device not configured
+-		die "No mixer device found" if (/^mixerctl: \/dev\/mixer.: Device not configured$/);
+-		#outputs.master=255,255 volume
+-		if (/^(outputs|inputs|record)\.([^\.]*)=(\d+),(\d+)\s+/) {
+-			$self->{mixer}{$1}{$2}{volume}{left} = $3;
+-			$self->{mixer}{$1}{$2}{volume}{right} = $4;
+-		# outputs.mono=255 volume
+-		} elsif (/^(outputs|inputs|record)\.([^\.]*)=(\d+)\s+/) {
+-			$self->{mixer}{$1}{$2}{volume}{center} = $3;
+-		# outputs.master.mute=off  [ off on ]
+-		} elsif (/^(outputs|inputs|record)\.(.*)\.mute=(on|off)\s+/) {
+-			$self->{mixer}{$1}{$2}{mute} = $3;
+-		}
+-		#todo: record.source=mic  [ mic cd video aux line mixerout mixeroutmono phone ]
+-		#inputs.mix_source=mic,beep,hp  { mic mic2 beep hp }
+-	}
+ 	foreach (`aucatctl 2>&1`) {
+ 		die "Failed to connect to sndiod" if (/couldn't open MIDI device$/);
+ 		#mplayer0=127
+@@ -59,7 +42,6 @@
+ 			$self->{mixer}{sndio}{$1}{volume}{center} = 2 * $2;
+ 		}
+ 	}
+-	die "No outputs found" unless (exists $self->{mixer}{outputs});
+ }
+ 
+ sub update_view {
diff --git a/srcpkgs/cmixer/template b/srcpkgs/cmixer/template
new file mode 100644
index 00000000000..1fefb2b529b
--- /dev/null
+++ b/srcpkgs/cmixer/template
@@ -0,0 +1,20 @@
+# Template file for 'cmixer'
+pkgname=cmixer
+version=0.2
+revision=1
+depends="aucatctl perl-Curses-UI"
+short_desc="Curses sndio mixer"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="ISC"
+homepage="https://rhaalovely.net/"
+distfiles="https://rhaalovely.net/stuff/cmixer-${version}.tar.gz"
+checksum=1ee4489a73f15b0a4a1c5698ac4476295b53c054c08a98ae94087f0f14104007
+
+post_extract() {
+	sed -n '3,15p' cmixer.pl >LICENSE
+}
+
+do_install() {
+	vbin cmixer.pl cmixer
+	vlicense LICENSE
+}
diff --git a/srcpkgs/cmocka/template b/srcpkgs/cmocka/template
index f9c71a870e6..ea0384420a3 100644
--- a/srcpkgs/cmocka/template
+++ b/srcpkgs/cmocka/template
@@ -8,7 +8,7 @@ configure_args="-DUNIT_TESTING=ON"
 # It contains a filename "\makeindex"
 # hostmakedepends="doxygen graphviz"
 short_desc="Unit testing framework in C"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://cmocka.org/"
 distfiles="https://cmocka.org/files/${version%.*}/cmocka-${version}.tar.xz"
diff --git a/srcpkgs/cmus/template b/srcpkgs/cmus/template
index 811a16d7a82..cbc752370cf 100644
--- a/srcpkgs/cmus/template
+++ b/srcpkgs/cmus/template
@@ -1,18 +1,23 @@
 # Template file for 'cmus'
 pkgname=cmus
 version=2.8.0
-revision=1
+revision=2
+build_style=configure
+configure_args="prefix=/usr LD=$CC"
 hostmakedepends="pkg-config"
 makedepends="ncurses-devel faad2-devel libflac-devel libao-devel libmad-devel
  libmodplug-devel libmp4v2-devel libmpcdec-devel pulseaudio-devel
  opusfile-devel wavpack-devel alsa-lib-devel libvorbis-devel ffmpeg-devel
- sndio-devel"
+ sndio-devel $(vopt_if elogind elogind-devel)"
 short_desc="Small, fast and powerful console music player"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://cmus.github.io"
 distfiles="https://github.com/cmus/cmus/archive/v${version}.tar.gz"
 checksum=756ce2c6241b2104dc19097488225de559ac1802a175be0233cfb6fbc02f3bd2
+build_options="elogind"
+build_options_default="elogind"
+desc_option_elogind="Support MPRIS interface via elogind"
 
 case $XBPS_TARGET_MACHINE in
 	armv6*)
@@ -22,16 +27,6 @@ case $XBPS_TARGET_MACHINE in
 		;;
 esac
 
-do_configure() {
-	./configure prefix=/usr
-}
-do_build() {
-	make GCC=$CC CC=$CC LD=$CC LDFLAGS="$LDFLAGS" ${makejobs}
-}
-do_install() {
-	make DESTDIR=${DESTDIR} install
-}
-
 cmus-libao_package() {
 	short_desc+=" - libao output plugin"
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/cni-plugins/template b/srcpkgs/cni-plugins/template
index ee57fb191ab..3c649fd8f74 100644
--- a/srcpkgs/cni-plugins/template
+++ b/srcpkgs/cni-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'cni-plugins'
 pkgname=cni-plugins
-version=0.8.1
+version=0.8.2
 revision=1
 wrksrc="plugins-${version}"
 build_style=go
@@ -10,7 +10,7 @@ maintainer="Cameron Nemo <camerontnorman@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/containernetworking/plugins"
 distfiles="https://github.com/containernetworking/plugins/archive/v${version}.tar.gz"
-checksum=1b6f66835b52eb382f625cb98b70ddfaa02bbaf016ef4d9eb5faa21d0648e519
+checksum=91994d305a86a2c5a70e9dd7add9e277074065678b605bf12983e6e43fdcd4d8
 
 do_build() {
 	./build_linux.sh
diff --git a/srcpkgs/cnping/INSTALL b/srcpkgs/cnping/INSTALL
new file mode 100644
index 00000000000..6c7a28b1aa5
--- /dev/null
+++ b/srcpkgs/cnping/INSTALL
@@ -0,0 +1,5 @@
+case "${ACTION}" in
+post)
+	setcap cap_net_raw+ep usr/bin/cnping
+	;;
+esac
diff --git a/srcpkgs/cnping/template b/srcpkgs/cnping/template
new file mode 100644
index 00000000000..cfbbe6b4029
--- /dev/null
+++ b/srcpkgs/cnping/template
@@ -0,0 +1,19 @@
+# Template file for 'cnping'
+pkgname=cnping
+version=1.0.0
+revision=1
+build_style=gnu-makefile
+makedepends="libXinerama-devel libX11-devel"
+depends="libcap-progs"
+short_desc="Minimal Graphical IPV4 Ping Tool"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="MIT, BSD-3-Clause"
+homepage="https://github.com/cnlohr/cnping"
+distfiles="https://github.com/cnlohr/cnping/archive/${version}.tar.gz"
+checksum=43e4737e27a2ab5bd8f90c73efa0ce998c2cc1d767e4948f50ded0d29e683e2d
+
+do_install() {
+	vbin cnping
+	vlicense LICENSE.MIT
+	vlicense LICENSE.BSD-3-Clause
+}
diff --git a/srcpkgs/codecrypt/template b/srcpkgs/codecrypt/template
index 697c9672d6a..13c8b79abd7 100644
--- a/srcpkgs/codecrypt/template
+++ b/srcpkgs/codecrypt/template
@@ -1,14 +1,14 @@
 # Template file for 'codecrypt'
 pkgname=codecrypt
 version=1.8
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="crypto++-devel fftw-devel gmp-devel"
-maintainer="Orphaned <orphan@voidlinux.org>"
 short_desc="Post-quantum cryptography tool"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="LGPL-3.0-or-later"
 homepage="https://e-x-a.org/codecrypt"
-license="LGPL-3"
 distfiles="https://github.com/exaexa/codecrypt/archive/v${version}.tar.gz"
 checksum=25f11bc361b4f8aca7245698334b5715b7d594d708a75e8cdb2aa732dc46eb96
 
diff --git a/srcpkgs/codelite/template b/srcpkgs/codelite/template
index cb2ef04fca4..9ca8123dafe 100644
--- a/srcpkgs/codelite/template
+++ b/srcpkgs/codelite/template
@@ -1,7 +1,7 @@
 # Template file for 'codelite'
 pkgname=codelite
 version=13.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DWITH_PCH=0
  $(vopt_if sftp -DENABLE_SFTP=1)
diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index a6957f46b40..328e5aaa360 100644
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -1,7 +1,7 @@
 # Template file for 'collectd'
 pkgname=collectd
 version=5.9.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable notify notify_desktop) --with-libiptc --enable-virt
diff --git a/srcpkgs/composer/template b/srcpkgs/composer/template
index 5ef0064c24a..0171dc5e520 100644
--- a/srcpkgs/composer/template
+++ b/srcpkgs/composer/template
@@ -1,6 +1,6 @@
 # Template file for 'composer'
 pkgname=composer
-version=1.8.5
+version=1.9.0
 revision=1
 archs=noarch
 build_style=fetch
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://getcomposer.org/"
 distfiles="https://github.com/composer/composer/releases/download/${version}/composer.phar
  https://raw.githubusercontent.com/composer/composer/master/LICENSE"
-checksum="6faf282db067f0f7625a5a1d80f4ecd3228ccc9a0388aec1599824c610d5d4e3
+checksum="1126fd7501ae6ff1dc9f91f0a3eca7430b1ea060d018d21521dc5e2d1ba01606
  7855ac293067aebe7e51afdd23b9dea54b8be24187dbecc9b9142581c37f596c"
 
 do_install() {
@@ -19,7 +19,6 @@ do_install() {
 	vlicense LICENSE
 
 	vmkdir /etc/php/conf.d
-	echo "extension=phar" > ${DESTDIR}/etc/php/conf.d/composer.ini
-	echo "extension=zip" >> ${DESTDIR}/etc/php/conf.d/composer.ini
-	echo "extension=openssl" >> ${DESTDIR}/etc/php/conf.d/composer.ini
+	printf 'extension=%s\n' phar iconv openssl zip \
+		>${DESTDIR}/etc/php/conf.d/composer.ini
 }
diff --git a/srcpkgs/compton/template b/srcpkgs/compton/template
index 61c3dcfa02f..a7f8f6d170f 100644
--- a/srcpkgs/compton/template
+++ b/srcpkgs/compton/template
@@ -1,20 +1,20 @@
 # Template file for 'compton'
 pkgname=compton
-version=6.2
+version=7.4
 revision=1
 build_style=meson
 configure_args="-Dbuild_docs=true"
 hostmakedepends="pkg-config asciidoc"
 makedepends="MesaLib-devel dbus-devel libconfig-devel libev-devel pcre-devel
  pixman-devel xcb-util-image-devel xcb-util-renderutil-devel
- libxdg-basedir-devel"
+ libxdg-basedir-devel uthash"
 depends="desktop-file-utils"
 short_desc="Compositor for X11 (fork of xcompmgr-dana)"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Frank Steinborn <steinex@nognu.de>"
 license="MIT, MPL-2.0"
 homepage="https://github.com/yshui/compton/"
 distfiles="https://github.com/yshui/compton/archive/v${version}.tar.gz"
-checksum=1333133ca9dfea768256c3fff8362d12a98b4d129e6ab1e56b1e630353f269bb
+checksum=1911aebb49f765586f655933ee016828e126bc7b2bb016b13c9a34a4865a8fd3
 
 pre_build() {
 	export COMPTON_VERSION="v${version}"
diff --git a/srcpkgs/conky-cli/template b/srcpkgs/conky-cli/template
index 74a564b96b9..cbb7cb7c4e7 100644
--- a/srcpkgs/conky-cli/template
+++ b/srcpkgs/conky-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'conky-cli'
 pkgname=conky-cli
-version=1.11.3
+version=1.11.5
 revision=1
 wrksrc="${pkgname/-cli/}-${version}"
 build_style=cmake
@@ -16,7 +16,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause, GPL-3.0-or-later"
 homepage="https://github.com/brndnmtthws/conky"
 distfiles="https://github.com/brndnmtthws/conky/archive/v${version}.tar.gz"
-checksum=0140e749537d4d05bf33fbac436e54756faa26021e16f2bca418e9eeea724eb4
+checksum=4cefdd92219a90934c28297e4ac7448a3f69d6aeec5d48c5763b23f6b214ef13
 
 provides="conky-${version}_${revision}"
 conflicts="conky>=0"
diff --git a/srcpkgs/conky/template b/srcpkgs/conky/template
index f1853949ba7..67d2397c19e 100644
--- a/srcpkgs/conky/template
+++ b/srcpkgs/conky/template
@@ -1,6 +1,6 @@
 # Template file for 'conky'
 pkgname=conky
-version=1.11.4
+version=1.11.5
 revision=1
 build_style=cmake
 conf_files="/etc/conky/conky.conf /etc/conky/conky_no_x11.conf"
@@ -18,7 +18,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause, GPL-3.0-or-later"
 homepage="https://github.com/brndnmtthws/conky"
 distfiles="https://github.com/brndnmtthws/conky/archive/v${version}.tar.gz"
-checksum=344637646c15c4cb7cf0afdde4651ee3100f7812e7bb8434ca757eba5c621a48
+checksum=4cefdd92219a90934c28297e4ac7448a3f69d6aeec5d48c5763b23f6b214ef13
 
 do_install() {
 	make -C build DESTDIR=${DESTDIR} install
@@ -29,4 +29,3 @@ do_install() {
 
 	vlicense COPYING
 }
-
diff --git a/srcpkgs/conmon/template b/srcpkgs/conmon/template
index c92bf445e2e..1b88fb61e50 100644
--- a/srcpkgs/conmon/template
+++ b/srcpkgs/conmon/template
@@ -1,6 +1,6 @@
 # Template file for 'conmon'
 pkgname=conmon
-version=2.0.0
+version=2.0.1
 revision=1
 build_style=gnu-makefile
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://github.com/containers/conmon"
 distfiles="https://github.com/containers/conmon/archive/v${version}.tar.gz"
-checksum=841ee6c8085f4d1092a330481b2d56ddaceedee9e78aa6698765bf2a693e06e7
+checksum=809508bd6f76599516f5a5a8f509e1257c2bdbcdc623c11b49e99287bba3d293
 
 do_install() {
 	vbin bin/conmon
diff --git a/srcpkgs/connman/files/connmand/run b/srcpkgs/connman/files/connmand/run
index accfc763830..e90eed5ba4a 100755
--- a/srcpkgs/connman/files/connmand/run
+++ b/srcpkgs/connman/files/connmand/run
@@ -1,2 +1,3 @@
 #!/bin/sh
-exec connmand -n
+[ -r conf ] && . ./conf
+exec connmand -n ${OPTS}
diff --git a/srcpkgs/connman/files/musl/freeaddrinfo.patch b/srcpkgs/connman/files/musl/freeaddrinfo.patch
new file mode 100644
index 00000000000..b5c1aca390d
--- /dev/null
+++ b/srcpkgs/connman/files/musl/freeaddrinfo.patch
@@ -0,0 +1,17 @@
+musl > 1.1.21 segfaults on null pointers to freeaddrinfo
+
+diff --git a/gweb/gweb.c b/gweb/gweb.c
+index 393afe0a..12fcb1d8 100644
+--- a/gweb/gweb.c
++++ b/gweb/gweb.c
+@@ -1274,7 +1274,8 @@ static bool is_ip_address(const char *host)
+ 	addr = NULL;
+ 
+ 	result = getaddrinfo(host, NULL, &hints, &addr);
+-	freeaddrinfo(addr);
++	if(!result)
++		freeaddrinfo(addr);
+ 
+ 	return result == 0;
+ }
+
diff --git a/srcpkgs/connman/template b/srcpkgs/connman/template
index f9cb3085a4d..fdc7f434a1e 100644
--- a/srcpkgs/connman/template
+++ b/srcpkgs/connman/template
@@ -1,7 +1,7 @@
 # Template file for 'connman'
 pkgname=connman
 version=1.37
-revision=1
+revision=3
 build_style=gnu-configure
 configure_args="--enable-polkit --enable-client --enable-pie --enable-ethernet
  --enable-wifi --enable-bluetooth --enable-loopback --enable-nmcompat
diff --git a/srcpkgs/consul-template/template b/srcpkgs/consul-template/template
new file mode 100644
index 00000000000..a121a52f453
--- /dev/null
+++ b/srcpkgs/consul-template/template
@@ -0,0 +1,13 @@
+# Template file for 'consul-template'
+pkgname=consul-template
+version=0.22.0
+revision=1
+build_style=go
+go_import_path="github.com/hashicorp/$pkgname"
+hostmakedepends="git"
+short_desc="Template rendering, notifier, and supervisor for Consul and Vault data"
+maintainer="Noel Cower <ncower@gmail.com>"
+license="MPL-2.0"
+homepage="https://$go_import_path"
+distfiles="$homepage/archive/v$version.tar.gz"
+checksum=81f81ab5bcd91184eba1955f2729382fe800ef8e23b059f4f65a6a64dd4d6039
diff --git a/srcpkgs/consul/template b/srcpkgs/consul/template
index 9bd68c23f73..9680d40e176 100644
--- a/srcpkgs/consul/template
+++ b/srcpkgs/consul/template
@@ -1,10 +1,10 @@
 # Template file for 'consul'
 pkgname=consul
-version=1.5.3
+version=1.6.1
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/${pkgname}"
-_git_commit=34eff659dcc5503b6eb117733c9f7def63f01bad
+_git_commit=a42ded477cf4e5ac1a850b42ec5d25672cd2545d
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit} -X ${go_import_path}/version.GitDescribe=v${version}"
 # consul has a vendor directory, but relies on replace statements in go.mod, so
 # force default non-vendor behavior.
@@ -15,7 +15,7 @@ maintainer="iaroki <iaroki@protonmail.com>"
 license="MPL-2.0"
 homepage="https://www.consul.io/"
 distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
-checksum=9a29ee11e12d75980016db0685ce7eb81a36a97c90d6bd23529a310f4e2dc02a
+checksum=e31ee84ee95efe3c27ebac46ba9f7973f1f7017589b7aece22715e304fccd464
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/coq/template b/srcpkgs/coq/template
index d69848b9254..9b7ba6bd9b9 100644
--- a/srcpkgs/coq/template
+++ b/srcpkgs/coq/template
@@ -1,13 +1,14 @@
+# Template file for 'coq'
 pkgname=coq
-version=8.9.1
-revision=2
+version=8.10.0
+revision=1
 hostmakedepends="ocaml ocaml-findlib ocaml-num camlp5"
 short_desc="Proof assistant written in OCaml"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="LGPL-2.1"
+license="LGPL-2.1-only"
 homepage="https://coq.inria.fr"
 distfiles="https://github.com/coq/coq/archive/V${version}.tar.gz"
-checksum=87251327e8a1e25c6b08b5c0ae8e7cdf3a91a5f30832bbe74ccc4f0bde9618ea
+checksum=292c64162620c4c4825c323c1c71762d764ebc9ce39bd8eee900851eaca655f5
 nopie=yes
 nocross=yes
 
diff --git a/srcpkgs/coreboot-utils/template b/srcpkgs/coreboot-utils/template
index 8083de45bf2..f16f14113b9 100644
--- a/srcpkgs/coreboot-utils/template
+++ b/srcpkgs/coreboot-utils/template
@@ -1,10 +1,10 @@
 # Template file for 'coreboot-utils'
 pkgname=coreboot-utils
-version=4.9
+version=4.10
 revision=1
+archs="i686* x86_64*"
 wrksrc="coreboot-${version}"
 build_wrksrc="util"
-archs="i686* x86_64*"
 build_style=gnu-makefile
 makedepends="pciutils-devel zlib-devel"
 short_desc="Coreboot firmware utilities"
@@ -12,7 +12,7 @@ maintainer="m3tav3rse <n6maa10816@tuta.io>"
 license="GPL-2.0-only"
 homepage="https://coreboot.org"
 distfiles="https://coreboot.org/releases/coreboot-${version}.tar.xz"
-checksum=32368d8b3d87a79376e30efd4ed279e90ace9a3d752ea6f98e2efdd18a896a76
+checksum=ca7136cd67309971b1f006bdc7e3c9fbf00234a29a9a2dc3c35444a74ef851cb
 
 do_build() {
 	for util in cbfstool cbmem ectool ifdtool inteltool intelmetool \
diff --git a/srcpkgs/coyim/template b/srcpkgs/coyim/template
new file mode 100644
index 00000000000..7597c891823
--- /dev/null
+++ b/srcpkgs/coyim/template
@@ -0,0 +1,19 @@
+# Template file for 'coyim'
+pkgname=coyim
+version=0.3.11
+revision=1
+build_style=go
+go_import_path=github.com/coyim/$pkgname
+hostmakedepends="pkg-config"
+makedepends="gtk+3-devel"
+short_desc="Safe and secure XMPP chat client"
+maintainer="Illia Shestakov <ishestakov@airmail.cc>"
+license="GPL-3.0-only"
+homepage="https://coy.im"
+distfiles="https://github.com/coyim/coyim/archive/v${version}.tar.gz"
+checksum=4717901462f027578369358c8772eb5b14e22f053fc30e4c9dbcc2b053374a41
+
+post_install() {
+	vlicense LICENSE
+	vdoc README.md
+}
diff --git a/srcpkgs/cozy/template b/srcpkgs/cozy/template
index da15249275f..a35aff61f37 100644
--- a/srcpkgs/cozy/template
+++ b/srcpkgs/cozy/template
@@ -1,6 +1,6 @@
 # Template file for 'cozy'
 pkgname=cozy
-version=0.6.7
+version=0.6.8
 revision=1
 archs=noarch
 build_style=meson
@@ -13,5 +13,5 @@ maintainer="johannes <johannes.brechtmann@gmail.com>"
 license="GPL-3.0-only, LGPL-3.0-only"
 homepage="https://github.com/geigi/cozy"
 distfiles="https://github.com/geigi/cozy/archive/${version}.tar.gz"
-checksum=d007bc1aa5aa08e1aca06af1b5504323b53be4597ab3998c7abf24efc6673722
+checksum=fce7e9a46dc6b7a56c243727310fdef2eb948ce4c44974104e03918e936bedda
 nocross="requires python3-gobject"
diff --git a/srcpkgs/cppcheck/template b/srcpkgs/cppcheck/template
index a6d26d33f10..fc12ca4663a 100644
--- a/srcpkgs/cppcheck/template
+++ b/srcpkgs/cppcheck/template
@@ -1,24 +1,25 @@
 # Template file for 'cppcheck'
 pkgname=cppcheck
-version=1.87
+version=1.89
 revision=1
-hostmakedepends="libxslt docbook-xsl"
-depends="python"
+build_style=gnu-makefile
+make_build_args="
+ FILESDIR=/usr/share/cppcheck
+ MATCHCOMPILER=yes
+ DB2MAN=/usr/share/xsl/docbook/manpages/docbook.xsl"
+make_install_args="
+ FILESDIR=/usr/share/cppcheck"
+make_build_target="cppcheck man"
+python_version="3"
+hostmakedepends="libxslt docbook-xsl python3"
+depends="python3"
 short_desc="Static analysis of C/C++ code"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://cppcheck.sourceforge.net"
 distfiles="https://github.com/danmar/cppcheck/archive/${version}.tar.gz"
-checksum=ea7ac1cd2f5c00ecffd596fd0f7281cba44308e565a634fae02b77ecd927c153
+checksum=37452d378825c7bd78116b4d7073df795fa732207d371ad5348287f811755783
 
-do_build() {
-	make ${makejobs} CFGDIR=/usr/share/cppcheck/cfg
-	make ${makejobs} DB2MAN=/usr/share/xsl/docbook/manpages/docbook.xsl all man
-}
-
-do_install() {
-	make DESTDIR=${DESTDIR} CFGDIR=/usr/share/cppcheck/cfg install
+post_install() {
 	vman cppcheck.1
-	vmkdir usr/share/${pkgname}
-	vcopy cfg/ usr/share/${pkgname}/cfg
 }
diff --git a/srcpkgs/cpufrequtils/template b/srcpkgs/cpufrequtils/template
index 62f700490ee..bbb798db7d6 100644
--- a/srcpkgs/cpufrequtils/template
+++ b/srcpkgs/cpufrequtils/template
@@ -14,7 +14,7 @@ homepage="https://git.kernel.org/pub/scm/linux/kernel/git/brodo/cpufrequtils.git
 distfiles="${homepage}/snapshot/${pkgname}-${_commit}.tar.gz"
 checksum=53b0fd1092e2053d31f4707ae0485f0d09b7faafcfac0e53da06c28ecfe23c95
 
-archs="i686* x86_64* ppc64-musl ppc64le*"
+archs="i686* x86_64* ppc*"
 
 post_extract() {
 	sed -i "s|/usr/bin/install|install|g" Makefile
diff --git a/srcpkgs/crash/template b/srcpkgs/crash/template
index 077e3619c38..e1b71f0c4d8 100644
--- a/srcpkgs/crash/template
+++ b/srcpkgs/crash/template
@@ -1,6 +1,6 @@
 # Template file for 'crash'
 pkgname=crash
-version=7.2.6
+version=7.2.7
 revision=1
 archs="i686 x86_64"  # broken on musl
 build_style=gnu-makefile
@@ -12,7 +12,7 @@ license="GPL-3.0-or-later"
 homepage="http://people.redhat.com/anderson/"
 changelog="https://people.redhat.com/anderson/crash.changelog.html"
 distfiles="http://people.redhat.com/anderson/${pkgname}-${version}.tar.gz"
-checksum=c8bc0892061e7cec838e641a8e61319d656f33de5f211502296d1c9a23058ec2
+checksum=16b96b350f56ea0f73f04003b8ca7604e8bdb3809c2e9e8cf89799da5b9b2dad
 nocross=yes
 LDFLAGS=-llzo2
 
diff --git a/srcpkgs/cri-tools/template b/srcpkgs/cri-tools/template
index 9dca672cfae..66a936fcd1b 100644
--- a/srcpkgs/cri-tools/template
+++ b/srcpkgs/cri-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'cri-tools'
 pkgname=cri-tools
-version=1.15.0
+version=1.16.0
 revision=1
 build_style=go
 go_import_path=github.com/kubernetes-sigs/cri-tools
@@ -9,8 +9,14 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="Apache-2.0"
 homepage="https://github.com/kubernetes-sigs/cri-tools"
 distfiles="https://github.com/kubernetes-sigs/cri-tools/archive/v${version}.tar.gz"
-checksum=7827777ffb085918ef454210ce158a464f1b7326eb339deb348cc8cd3aee2931
+checksum=4c382c3929f1536c36f3a6c8593ce49dd5b7831d3c0f9e41cd4f48163ec05b90
 
 do_build() {
 	make ${makejobs}
 }
+
+do_install() {
+	for bin in _output/*; do
+		vbin $bin
+	done
+}
diff --git a/srcpkgs/croc/template b/srcpkgs/croc/template
index 7aab8b8d324..3be23a0a2d4 100644
--- a/srcpkgs/croc/template
+++ b/srcpkgs/croc/template
@@ -1,6 +1,6 @@
 # Template file for 'croc'
 pkgname=croc
-version=6.1.1
+version=6.1.4
 revision=1
 build_style=go
 go_import_path=github.com/schollz/croc/v6
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/schollz/croc"
 distfiles="https://github.com/schollz/croc/archive/v${version}.tar.gz"
-checksum=4636edd8c76e8a2a52b7b156332f8a5414e8124305cd94633bcff92998dcf166
+checksum=3eb8f7a1c3ca45270841b374ea0ccaf1423de38492dbb4c8696678bae271c701
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/cropgui/template b/srcpkgs/cropgui/template
index 96f2a549694..82042037f30 100644
--- a/srcpkgs/cropgui/template
+++ b/srcpkgs/cropgui/template
@@ -7,7 +7,7 @@ makedepends="python"
 depends="python python-Pillow python-gobject2 pygtk libjpeg-turbo-tools
 ImageMagick exiftool"
 short_desc="Gtk frontend for lossless cropping of jpeg images"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2"
 homepage="https://github.com/jepler/cropgui"
 distfiles="https://github.com/jepler/cropgui/archive/v${version}.tar.gz"
diff --git a/srcpkgs/cross-aarch64-linux-gnu/files/non-nullness.patch b/srcpkgs/cross-aarch64-linux-gnu/files/non-nullness.patch
deleted file mode 120000
index c8b653748fe..00000000000
--- a/srcpkgs/cross-aarch64-linux-gnu/files/non-nullness.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/non-nullness.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-aarch64-linux-gnu/template b/srcpkgs/cross-aarch64-linux-gnu/template
index e4f1544040e..cecc02ec7b8 100644
--- a/srcpkgs/cross-aarch64-linux-gnu/template
+++ b/srcpkgs/cross-aarch64-linux-gnu/template
@@ -1,8 +1,8 @@
 # Template build file for 'cross-aarch64-linux-gnu'
 #
 _binutils_version=2.32
-_gcc_version=9.1.0
-_glibc_version=2.29
+_gcc_version=9.2.0
+_glibc_version=2.30
 _linux_version=4.19
 
 _triplet=aarch64-linux-gnu
@@ -10,7 +10,7 @@ _archflags="-march=armv8-a"
 _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
-version=0.31
+version=0.32
 revision=1
 short_desc="GNU Cross toolchain for the ${_triplet} LE target (binutils/gcc/glibc)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -22,15 +22,15 @@ distfiles="
  ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz
  ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
 checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0
- f3eeb8d57e25ca9fc13c2af3dae97754f9f643bc69229546828e3a240e2af04b
+ ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
+ e2c4114e569afbe7edbc29131a43be833850ab9a459d81beb2588016d2bbb8af
  0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
 
 lib32disabled=yes
 nocross=yes
 nopie=yes
 create_wrksrc=yes
-hostmakedepends="flex perl python3"
+hostmakedepends="gcc-objc gcc-go flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a
@@ -94,7 +94,6 @@ _gcc_bootstrap() {
 
 	cd ${wrksrc}/gcc-${_gcc_version}
 	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
-	_apply_patch -p0 ${FILESDIR}/non-nullness.patch
 
 	msg_normal "Building cross gcc bootstrap\n"
 
@@ -234,7 +233,7 @@ _gcc_build() {
 	_args+=" --libdir=/usr/lib"
 	_args+=" --target=${_triplet}"
 	_args+=" --with-sysroot=${_sysroot}"
-	_args+=" --enable-languages=c,ada,c++,fortran,lto"
+	_args+=" --enable-languages=c,ada,c++,objc,obj-c++,go,fortran,lto"
 	_args+=" --with-gnu-as"
 	_args+=" --with-gnu-ld"
 	_args+=" --disable-multilib"
@@ -250,7 +249,6 @@ _gcc_build() {
 	_args+=" --enable-default-pie"
 	_args+=" --enable-default-ssp"
 	_args+=" --disable-libquadmath"
-	_args+=" --disable-libatomic"
 	_args+=" --disable-libssp"
 	_args+=" --disable-libmudflap"
 	_args+=" --disable-libsanitizer"
@@ -334,6 +332,11 @@ do_install() {
 	ln -svf libgnat-${_majorver}.so libgnat.so
 	rm -vf ${DESTDIR}/${_adalib}/libgna{rl,t}.so
 
+	# We need to build libatomic in target gcc as gccgo needs it to
+	# build... but it's not needed at runtime, so remove it from the
+	# destdir so it doesn't conflict with the libatomic package
+	rm -f ${DESTDIR}/${_sysroot}/usr/lib/libatomic.*
+
 	# Remove unnecessary stuff
 	rm -f ${DESTDIR}/usr/lib*/libiberty.a
 	rm -rf ${DESTDIR}/usr/share
diff --git a/srcpkgs/cross-aarch64-linux-musl/files/gccgo-musl.patch b/srcpkgs/cross-aarch64-linux-musl/files/gccgo-musl.patch
new file mode 120000
index 00000000000..a093af85773
--- /dev/null
+++ b/srcpkgs/cross-aarch64-linux-musl/files/gccgo-musl.patch
@@ -0,0 +1 @@
+../../gcc/files/gccgo-musl.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-aarch64-linux-musl/files/non-nullness.patch b/srcpkgs/cross-aarch64-linux-musl/files/non-nullness.patch
deleted file mode 120000
index c8b653748fe..00000000000
--- a/srcpkgs/cross-aarch64-linux-musl/files/non-nullness.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/non-nullness.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-aarch64-linux-musl/template b/srcpkgs/cross-aarch64-linux-musl/template
index a40e53f532e..7fc76c3d726 100644
--- a/srcpkgs/cross-aarch64-linux-musl/template
+++ b/srcpkgs/cross-aarch64-linux-musl/template
@@ -1,17 +1,18 @@
 # Template build file for 'cross-aarch64-linux-musl'
 #
 _binutils_version=2.32
-_gcc_version=9.1.0
+_gcc_version=9.2.0
 _musl_version=1.1.23
 _linux_version=4.19
+_libucontext_version=0.9.0
 
 _triplet=aarch64-linux-musl
 _archflags="-march=armv8-a"
 _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
-version=0.31
-revision=3
+version=0.32
+revision=1
 short_desc="Cross toolchain for ARM64 LE target (musl)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 homepage="https://www.voidlinux.org/"
@@ -20,11 +21,13 @@ distfiles="
  ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
  ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz
  http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz
- ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
+ ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz
+ https://distfiles.adelielinux.org/source/libucontext/libucontext-${_libucontext_version}.tar.xz"
 checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0
+ ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
  8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa
- 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
+ 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1
+ 0d53a415a307ef175153bbe60a572c940a922cb736ce13530b666e7ec2795d68"
 
 lib32disabled=yes
 nocross=yes
@@ -33,7 +36,7 @@ nodebug=yes
 create_wrksrc=yes
 
 archs="x86_64* ppc64le"
-hostmakedepends="flex perl python3"
+hostmakedepends="gcc-objc gcc-go flex perl python3"
 makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel isl15-devel"
 nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a
  libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a"
@@ -81,10 +84,10 @@ _gcc_bootstrap() {
 
 	cd ${wrksrc}/gcc-${_gcc_version}
 	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
-	_apply_patch -p0 ${FILESDIR}/non-nullness.patch
 	_apply_patch -p0 ${FILESDIR}/musl-ada.patch
 	_apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch
 	_apply_patch -p0 ${FILESDIR}/invalid_tls_model.patch
+	_apply_patch -p0 ${FILESDIR}/gccgo-musl.patch
 
 	msg_normal "Building cross gcc bootstrap\n"
 
@@ -153,6 +156,22 @@ _musl_build() {
 	touch ${wrksrc}/.musl_build_done
 }
 
+_libucontext_build() {
+	[ -f ${wrksrc}/.libucontext_build_done ] && return 0
+
+	cd ${wrksrc}/libucontext-${_libucontext_version}
+	msg_normal "Building cross libucontext\n"
+
+	# it's ok if we're static only here
+	CC="${_triplet}-gcc" AR="${_triplet}-ar" AS="${_triplet}-as" \
+		CFLAGS="-Os -pipe ${_archflags}" \
+		make ARCH=aarch64 libucontext.a
+
+	cp libucontext.a ${_sysroot}/usr/lib
+
+	touch ${wrksrc}/.libucontext_build_done
+}
+
 _gcc_build() {
 	local _args
 
@@ -168,7 +187,7 @@ _gcc_build() {
 	_args+=" --libexecdir=/usr/lib"
 	_args+=" --target=${_triplet}"
 	_args+=" --with-sysroot=${_sysroot}"
-	_args+=" --enable-languages=c,ada,c++,fortran,lto"
+	_args+=" --enable-languages=c,ada,c++,objc,obj-c++,go,fortran,lto"
 	_args+=" --enable-libada"
 	_args+=" --enable-lto"
 	_args+=" --enable-default-pie"
@@ -208,6 +227,7 @@ do_build() {
 	_gcc_bootstrap
 	_linux_headers
 	_musl_build
+	_libucontext_build
 	_gcc_build
 }
 
@@ -263,6 +283,11 @@ do_install() {
 	ln -svf libgnat-${_majorver}.so libgnat.so
 	rm -vf ${DESTDIR}/${_adalib}/libgna{rl,t}.so
 
+	# We need to build libatomic in target gcc as gccgo needs it to
+	# build... but it's not needed at runtime, so remove it from the
+	# destdir so it doesn't conflict with the libatomic package
+	rm -f ${DESTDIR}/${_sysroot}/usr/lib/libatomic.*
+
 	# Remove unnecessary stuff
 	rm -f ${DESTDIR}/usr/lib*/libiberty.a
 	rm -rf ${DESTDIR}/usr/share
diff --git a/srcpkgs/cross-arm-linux-gnueabi/files/non-nullness.patch b/srcpkgs/cross-arm-linux-gnueabi/files/non-nullness.patch
deleted file mode 120000
index c8b653748fe..00000000000
--- a/srcpkgs/cross-arm-linux-gnueabi/files/non-nullness.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/non-nullness.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-arm-linux-gnueabi/template b/srcpkgs/cross-arm-linux-gnueabi/template
index 53b16264218..99b23a88538 100644
--- a/srcpkgs/cross-arm-linux-gnueabi/template
+++ b/srcpkgs/cross-arm-linux-gnueabi/template
@@ -1,8 +1,8 @@
 # Template build file for 'cross-arm-linux-gnueabi'
 #
 _binutils_version=2.32
-_gcc_version=9.1.0
-_glibc_version=2.29
+_gcc_version=9.2.0
+_glibc_version=2.30
 _linux_version=4.19
 
 _triplet=arm-linux-gnueabi
@@ -11,7 +11,7 @@ _archflags="-march=armv5te -msoft-float -mfloat-abi=soft"
 _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
-version=0.31
+version=0.32
 revision=1
 short_desc="GNU Cross toolchain for the ${_triplet} LE target (binutils/gcc/glibc)"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -23,8 +23,8 @@ distfiles="
  ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz
  ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
 checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0
- f3eeb8d57e25ca9fc13c2af3dae97754f9f643bc69229546828e3a240e2af04b
+ ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
+ e2c4114e569afbe7edbc29131a43be833850ab9a459d81beb2588016d2bbb8af
  0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
 
 lib32disabled=yes
@@ -33,7 +33,7 @@ nopie=yes
 nodebug=yes
 create_wrksrc=yes
 
-hostmakedepends="flex perl python3"
+hostmakedepends="gcc-objc gcc-go flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a
@@ -97,7 +97,6 @@ _gcc_bootstrap() {
 
 	cd ${wrksrc}/gcc-${_gcc_version}
 	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
-	_apply_patch -p0 ${FILESDIR}/non-nullness.patch
 
 	msg_normal "Building cross gcc bootstrap\n"
 
@@ -238,7 +237,7 @@ _gcc_build() {
 	_args+=" --libexecdir=/usr/lib"
 	_args+=" --target=${_triplet}"
 	_args+=" --with-sysroot=${_sysroot}"
-	_args+=" --enable-languages=c,ada,c++,fortran,lto"
+	_args+=" --enable-languages=c,ada,c++,objc,obj-c++,go,fortran,lto"
 	_args+=" --with-gnu-as"
 	_args+=" --with-gnu-ld"
 	_args+=" --disable-multilib"
@@ -255,7 +254,6 @@ _gcc_build() {
 	_args+=" --enable-default-pie"
 	_args+=" --enable-default-ssp"
 	_args+=" --disable-libquadmath"
-	_args+=" --disable-libatomic"
 	_args+=" --disable-libssp"
 	_args+=" --disable-libmpx"
 	_args+=" --disable-libmudflap"
@@ -337,6 +335,11 @@ do_install() {
 	ln -svf libgnat-${_majorver}.so libgnat.so
 	rm -vf ${DESTDIR}/${_adalib}/libgna{rl,t}.so
 
+	# We need to build libatomic in target gcc as gccgo needs it to
+	# build... but it's not needed at runtime, so remove it from the
+	# destdir so it doesn't conflict with the libatomic package
+	rm -f ${DESTDIR}/${_sysroot}/usr/lib/libatomic.*
+
 	# Remove unnecessary stuff
 	rm -f ${DESTDIR}/usr/lib*/libiberty.a
 	rm -rf ${DESTDIR}/usr/share
diff --git a/srcpkgs/cross-arm-linux-gnueabihf/files/non-nullness.patch b/srcpkgs/cross-arm-linux-gnueabihf/files/non-nullness.patch
deleted file mode 120000
index c8b653748fe..00000000000
--- a/srcpkgs/cross-arm-linux-gnueabihf/files/non-nullness.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/non-nullness.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-arm-linux-gnueabihf/template b/srcpkgs/cross-arm-linux-gnueabihf/template
index 32006480282..85a724d3c87 100644
--- a/srcpkgs/cross-arm-linux-gnueabihf/template
+++ b/srcpkgs/cross-arm-linux-gnueabihf/template
@@ -1,8 +1,8 @@
 # Template build file for 'cross-arm-linux-gnueabihf'
 #
 _binutils_version=2.32
-_gcc_version=9.1.0
-_glibc_version=2.29
+_gcc_version=9.2.0
+_glibc_version=2.30
 _linux_version=4.19
 
 _triplet=arm-linux-gnueabihf
@@ -11,7 +11,7 @@ _archflags="-march=armv6 -mfpu=vfp -mfloat-abi=hard"
 _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
-version=0.31
+version=0.32
 revision=1
 short_desc="GNU Cross toolchain for the ${_triplet} LE target (binutils/gcc/glibc)"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -23,8 +23,8 @@ distfiles="
  ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz
  ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
 checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0
- f3eeb8d57e25ca9fc13c2af3dae97754f9f643bc69229546828e3a240e2af04b
+ ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
+ e2c4114e569afbe7edbc29131a43be833850ab9a459d81beb2588016d2bbb8af
  0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
 
 lib32disabled=yes
@@ -33,7 +33,7 @@ nopie=yes
 nodebug=yes
 create_wrksrc=yes
 
-hostmakedepends="flex perl python3"
+hostmakedepends="gcc-objc gcc-go flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a
@@ -98,7 +98,6 @@ _gcc_bootstrap() {
 
 	cd ${wrksrc}/gcc-${_gcc_version}
 	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
-	_apply_patch -p0 ${FILESDIR}/non-nullness.patch
 
 	msg_normal "Building cross gcc bootstrap\n"
 
@@ -238,7 +237,7 @@ _gcc_build() {
 	_args+=" --libexecdir=/usr/lib"
 	_args+=" --target=${_triplet}"
 	_args+=" --with-sysroot=${_sysroot}"
-	_args+=" --enable-languages=c,ada,c++,fortran,lto"
+	_args+=" --enable-languages=c,ada,c++,objc,obj-c++,go,fortran,lto"
 	_args+=" --with-gnu-as"
 	_args+=" --with-gnu-ld"
 	_args+=" --disable-multilib"
@@ -255,7 +254,6 @@ _gcc_build() {
 	_args+=" --enable-default-pie"
 	_args+=" --enable-default-ssp"
 	_args+=" --disable-libquadmath"
-	_args+=" --disable-libatomic"
 	_args+=" --disable-libssp"
 	_args+=" --disable-libmpx"
 	_args+=" --disable-libmudflap"
@@ -337,6 +335,11 @@ do_install() {
 	ln -svf libgnat-${_majorver}.so libgnat.so
 	rm -vf ${DESTDIR}/${_adalib}/libgna{rl,t}.so
 
+	# We need to build libatomic in target gcc as gccgo needs it to
+	# build... but it's not needed at runtime, so remove it from the
+	# destdir so it doesn't conflict with the libatomic package
+	rm -f ${DESTDIR}/${_sysroot}/usr/lib/libatomic.*
+
 	# Remove unnecessary stuff
 	rm -f ${DESTDIR}/usr/lib*/libiberty.a
 	rm -rf ${DESTDIR}/usr/share
diff --git a/srcpkgs/cross-arm-linux-musleabi/files/gccgo-musl.patch b/srcpkgs/cross-arm-linux-musleabi/files/gccgo-musl.patch
new file mode 120000
index 00000000000..a093af85773
--- /dev/null
+++ b/srcpkgs/cross-arm-linux-musleabi/files/gccgo-musl.patch
@@ -0,0 +1 @@
+../../gcc/files/gccgo-musl.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-arm-linux-musleabi/files/non-nullness.patch b/srcpkgs/cross-arm-linux-musleabi/files/non-nullness.patch
deleted file mode 120000
index c8b653748fe..00000000000
--- a/srcpkgs/cross-arm-linux-musleabi/files/non-nullness.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/non-nullness.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-arm-linux-musleabi/template b/srcpkgs/cross-arm-linux-musleabi/template
index f1434fe9b26..985af935aac 100644
--- a/srcpkgs/cross-arm-linux-musleabi/template
+++ b/srcpkgs/cross-arm-linux-musleabi/template
@@ -1,9 +1,10 @@
 # Template build file for 'cross-arm-linux-musleabi'
 #
 _binutils_version=2.32
-_gcc_version=9.1.0
+_gcc_version=9.2.0
 _musl_version=1.1.23
 _linux_version=4.19
+_libucontext_version=0.9.0
 
 _triplet=arm-linux-musleabi
 _fpuflags="--with-arch=armv5te --without-fp --with-float=soft"
@@ -11,8 +12,8 @@ _archflags="-march=armv5te -msoft-float -mfloat-abi=soft"
 _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
-version=0.31
-revision=3
+version=0.32
+revision=1
 short_desc="Cross toolchain for ARMv5 TE target (musl)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 homepage="https://www.voidlinux.org/"
@@ -21,11 +22,13 @@ distfiles="
  ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
  ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz
  http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz
- ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
+ ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz
+ https://distfiles.adelielinux.org/source/libucontext/libucontext-${_libucontext_version}.tar.xz"
 checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0
+ ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
  8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa
- 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
+ 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1
+ 0d53a415a307ef175153bbe60a572c940a922cb736ce13530b666e7ec2795d68"
 
 lib32disabled=yes
 nocross=yes
@@ -33,7 +36,7 @@ nopie=yes
 nodebug=yes
 create_wrksrc=yes
 
-hostmakedepends="flex perl python3"
+hostmakedepends="gcc-objc gcc-go flex perl python3"
 makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel isl15-devel"
 nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a
  libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a"
@@ -84,10 +87,10 @@ _gcc_bootstrap() {
 
 	cd ${wrksrc}/gcc-${_gcc_version}
 	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
-	_apply_patch -p0 ${FILESDIR}/non-nullness.patch
 	_apply_patch -p0 ${FILESDIR}/musl-ada.patch
 	_apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch
 	_apply_patch -p0 ${FILESDIR}/invalid_tls_model.patch
+	_apply_patch -p0 ${FILESDIR}/gccgo-musl.patch
 
 	msg_normal "Building cross gcc bootstrap\n"
 
@@ -155,6 +158,22 @@ _musl_build() {
 	touch ${wrksrc}/.musl_build_done
 }
 
+_libucontext_build() {
+	[ -f ${wrksrc}/.libucontext_build_done ] && return 0
+
+	cd ${wrksrc}/libucontext-${_libucontext_version}
+	msg_normal "Building cross libucontext\n"
+
+	# it's ok if we're static only here
+	CC="${_triplet}-gcc" AR="${_triplet}-ar" AS="${_triplet}-as" \
+		CFLAGS="-Os -pipe ${_archflags}" \
+		make ARCH=arm libucontext.a
+
+	cp libucontext.a ${_sysroot}/usr/lib
+
+	touch ${wrksrc}/.libucontext_build_done
+}
+
 _gcc_build() {
 	local _args
 
@@ -169,7 +188,7 @@ _gcc_build() {
 	_args="--prefix=/usr"
 	_args+=" --target=${_triplet}"
 	_args+=" --with-sysroot=${_sysroot}"
-	_args+=" --enable-languages=c,ada,c++,fortran,lto"
+	_args+=" --enable-languages=c,ada,c++,objc,obj-c++,go,fortran,lto"
 	_args+=" --enable-libada"
 	_args+=" --enable-lto"
 	_args+=" --enable-default-pie"
@@ -211,6 +230,7 @@ do_build() {
 	_gcc_bootstrap
 	_linux_headers
 	_musl_build
+	_libucontext_build
 	_gcc_build
 }
 
@@ -261,6 +281,11 @@ do_install() {
 	ln -svf libgnat-${_majorver}.so libgnat.so
 	rm -vf ${DESTDIR}/${_adalib}/libgna{rl,t}.so
 
+	# We need to build libatomic in target gcc as gccgo needs it to
+	# build... but it's not needed at runtime, so remove it from the
+	# destdir so it doesn't conflict with the libatomic package
+	rm -f ${DESTDIR}/${_sysroot}/usr/lib/libatomic.*
+
 	# Remove unnecessary stuff
 	rm -f ${DESTDIR}/usr/lib*/libiberty.a
 	rm -rf ${DESTDIR}/usr/share
diff --git a/srcpkgs/cross-arm-linux-musleabihf/files/gccgo-musl.patch b/srcpkgs/cross-arm-linux-musleabihf/files/gccgo-musl.patch
new file mode 120000
index 00000000000..a093af85773
--- /dev/null
+++ b/srcpkgs/cross-arm-linux-musleabihf/files/gccgo-musl.patch
@@ -0,0 +1 @@
+../../gcc/files/gccgo-musl.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-arm-linux-musleabihf/files/non-nullness.patch b/srcpkgs/cross-arm-linux-musleabihf/files/non-nullness.patch
deleted file mode 120000
index c8b653748fe..00000000000
--- a/srcpkgs/cross-arm-linux-musleabihf/files/non-nullness.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/non-nullness.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-arm-linux-musleabihf/template b/srcpkgs/cross-arm-linux-musleabihf/template
index 6b9194ebc65..a5b5fc028c7 100644
--- a/srcpkgs/cross-arm-linux-musleabihf/template
+++ b/srcpkgs/cross-arm-linux-musleabihf/template
@@ -1,9 +1,10 @@
 # Template build file for 'cross-arm-linux-musleabihf'
 #
 _binutils_version=2.32
-_gcc_version=9.1.0
+_gcc_version=9.2.0
 _musl_version=1.1.23
 _linux_version=4.19
+_libucontext_version=0.9.0
 
 _triplet=arm-linux-musleabihf
 _fpuflags="--with-arch=armv6 --with-fpu=vfp --with-float=hard"
@@ -11,8 +12,8 @@ _archflags="-march=armv6 -mfpu=vfp -mfloat-abi=hard"
 _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
-version=0.31
-revision=3
+version=0.32
+revision=1
 short_desc="Cross toolchain for ARMv6 LE Hard Float target (musl)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 homepage="https://www.voidlinux.org/"
@@ -21,11 +22,13 @@ distfiles="
  ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
  ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz
  http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz
- ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
+ ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz
+ https://distfiles.adelielinux.org/source/libucontext/libucontext-${_libucontext_version}.tar.xz"
 checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0
+ ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
  8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa
- 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
+ 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1
+ 0d53a415a307ef175153bbe60a572c940a922cb736ce13530b666e7ec2795d68"
 
 lib32disabled=yes
 nocross=yes
@@ -33,7 +36,7 @@ nopie=yes
 nodebug=yes
 create_wrksrc=yes
 
-hostmakedepends="flex perl python3"
+hostmakedepends="gcc-objc gcc-go flex perl python3"
 makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel isl15-devel"
 nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a
  libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a"
@@ -84,10 +87,10 @@ _gcc_bootstrap() {
 
 	cd ${wrksrc}/gcc-${_gcc_version}
 	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
-	_apply_patch -p0 ${FILESDIR}/non-nullness.patch
 	_apply_patch -p0 ${FILESDIR}/musl-ada.patch
 	_apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch
 	_apply_patch -p0 ${FILESDIR}/invalid_tls_model.patch
+	_apply_patch -p0 ${FILESDIR}/gccgo-musl.patch
 
 	msg_normal "Building cross gcc bootstrap\n"
 
@@ -155,6 +158,22 @@ _musl_build() {
 	touch ${wrksrc}/.musl_build_done
 }
 
+_libucontext_build() {
+	[ -f ${wrksrc}/.libucontext_build_done ] && return 0
+
+	cd ${wrksrc}/libucontext-${_libucontext_version}
+	msg_normal "Building cross libucontext\n"
+
+	# it's ok if we're static only here
+	CC="${_triplet}-gcc" AR="${_triplet}-ar" AS="${_triplet}-as" \
+		CFLAGS="-Os -pipe ${_archflags}" \
+		make ARCH=arm libucontext.a
+
+	cp libucontext.a ${_sysroot}/usr/lib
+
+	touch ${wrksrc}/.libucontext_build_done
+}
+
 _gcc_build() {
 	local _args
 	[ -f ${wrksrc}/.gcc_build_done ] && return 0
@@ -168,7 +187,7 @@ _gcc_build() {
 	_args="--prefix=/usr"
 	_args+=" --target=${_triplet}"
 	_args+=" --with-sysroot=${_sysroot}"
-	_args+=" --enable-languages=c,ada,c++,fortran,lto"
+	_args+=" --enable-languages=c,ada,c++,objc,obj-c++,go,fortran,lto"
 	_args+=" --enable-libada"
 	_args+=" --enable-lto"
 	_args+=" --enable-default-pie"
@@ -210,6 +229,7 @@ do_build() {
 	_gcc_bootstrap
 	_linux_headers
 	_musl_build
+	_libucontext_build
 	_gcc_build
 }
 
@@ -260,6 +280,11 @@ do_install() {
 	ln -svf libgnat-${_majorver}.so libgnat.so
 	rm -vf ${DESTDIR}/${_adalib}/libgna{rl,t}.so
 
+	# We need to build libatomic in target gcc as gccgo needs it to
+	# build... but it's not needed at runtime, so remove it from the
+	# destdir so it doesn't conflict with the libatomic package
+	rm -f ${DESTDIR}/${_sysroot}/usr/lib/libatomic.*
+
 	# Remove unnecessary stuff
 	rm -f ${DESTDIR}/usr/lib*/libiberty.a
 	rm -rf ${DESTDIR}/usr/share
diff --git a/srcpkgs/cross-armv7l-linux-gnueabihf/files/non-nullness.patch b/srcpkgs/cross-armv7l-linux-gnueabihf/files/non-nullness.patch
deleted file mode 120000
index c8b653748fe..00000000000
--- a/srcpkgs/cross-armv7l-linux-gnueabihf/files/non-nullness.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/non-nullness.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-armv7l-linux-gnueabihf/template b/srcpkgs/cross-armv7l-linux-gnueabihf/template
index 23864834772..bb60304d610 100644
--- a/srcpkgs/cross-armv7l-linux-gnueabihf/template
+++ b/srcpkgs/cross-armv7l-linux-gnueabihf/template
@@ -1,8 +1,8 @@
 # Template build file for 'cross-armv7l-linux-gnueabihf'
 #
 _binutils_version=2.32
-_gcc_version=9.1.0
-_glibc_version=2.29
+_gcc_version=9.2.0
+_glibc_version=2.30
 _linux_version=4.19
 
 _triplet=armv7l-linux-gnueabihf
@@ -11,7 +11,7 @@ _archflags="-march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard"
 _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
-version=0.31
+version=0.32
 revision=1
 short_desc="GNU Cross toolchain for the ${_triplet} LE target (binutils/gcc/glibc)"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -23,8 +23,8 @@ distfiles="
  http://ftp.gnu.org/gnu/glibc/glibc-${_glibc_version}.tar.xz
  ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
 checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0
- f3eeb8d57e25ca9fc13c2af3dae97754f9f643bc69229546828e3a240e2af04b
+ ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
+ e2c4114e569afbe7edbc29131a43be833850ab9a459d81beb2588016d2bbb8af
  0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
 
 lib32disabled=yes
@@ -33,7 +33,7 @@ nopie=yes
 nodebug=yes
 create_wrksrc=yes
 
-hostmakedepends="flex perl python3"
+hostmakedepends="gcc-objc gcc-go flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a
@@ -98,7 +98,6 @@ _gcc_bootstrap() {
 
 	cd ${wrksrc}/gcc-${_gcc_version}
 	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
-	_apply_patch -p0 ${FILESDIR}/non-nullness.patch
 
 	msg_normal "Building cross gcc bootstrap\n"
 
@@ -239,7 +238,7 @@ _gcc_build() {
 	_args+=" --libexecdir=/usr/lib"
 	_args+=" --target=${_triplet}"
 	_args+=" --with-sysroot=${_sysroot}"
-	_args+=" --enable-languages=c,ada,c++,fortran,lto"
+	_args+=" --enable-languages=c,ada,c++,objc,obj-c++,go,fortran,lto"
 	_args+=" --with-gnu-as"
 	_args+=" --with-gnu-ld"
 	_args+=" --disable-multilib"
@@ -256,7 +255,6 @@ _gcc_build() {
 	_args+=" --enable-default-pie"
 	_args+=" --enable-default-ssp"
 	_args+=" --disable-libquadmath"
-	_args+=" --disable-libatomic"
 	_args+=" --disable-libssp"
 	_args+=" --disable-libmpx"
 	_args+=" --disable-libmudflap"
@@ -338,6 +336,11 @@ do_install() {
 	ln -svf libgnat-${_majorver}.so libgnat.so
 	rm -vf ${DESTDIR}/${_adalib}/libgna{rl,t}.so
 
+	# We need to build libatomic in target gcc as gccgo needs it to
+	# build... but it's not needed at runtime, so remove it from the
+	# destdir so it doesn't conflict with the libatomic package
+	rm -f ${DESTDIR}/${_sysroot}/usr/lib/libatomic.*
+
 	# Remove unnecessary stuff
 	rm -f ${DESTDIR}/usr/lib*/libiberty.a
 	rm -rf ${DESTDIR}/usr/share
diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/files/gccgo-musl.patch b/srcpkgs/cross-armv7l-linux-musleabihf/files/gccgo-musl.patch
new file mode 120000
index 00000000000..a093af85773
--- /dev/null
+++ b/srcpkgs/cross-armv7l-linux-musleabihf/files/gccgo-musl.patch
@@ -0,0 +1 @@
+../../gcc/files/gccgo-musl.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/files/non-nullness.patch b/srcpkgs/cross-armv7l-linux-musleabihf/files/non-nullness.patch
deleted file mode 120000
index c8b653748fe..00000000000
--- a/srcpkgs/cross-armv7l-linux-musleabihf/files/non-nullness.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/non-nullness.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/template b/srcpkgs/cross-armv7l-linux-musleabihf/template
index 37daba36ac9..5704eb067a9 100644
--- a/srcpkgs/cross-armv7l-linux-musleabihf/template
+++ b/srcpkgs/cross-armv7l-linux-musleabihf/template
@@ -1,9 +1,10 @@
 # Template build file for 'cross-armv7l-linux-musleabihf'
 #
 _binutils_version=2.32
-_gcc_version=9.1.0
+_gcc_version=9.2.0
 _musl_version=1.1.23
 _linux_version=4.19
+_libucontext_version=0.9.0
 
 _triplet=armv7l-linux-musleabihf
 _fpuflags="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard"
@@ -11,8 +12,8 @@ _archflags="-march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard"
 _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
-version=0.31
-revision=3
+version=0.32
+revision=1
 short_desc="Cross toolchain for ARMv7 LE Hard Float target (musl)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 homepage="https://www.voidlinux.org/"
@@ -21,11 +22,13 @@ distfiles="
  ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
  ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz
  http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz
- ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
+ ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz
+ https://distfiles.adelielinux.org/source/libucontext/libucontext-${_libucontext_version}.tar.xz"
 checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0
+ ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
  8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa
- 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
+ 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1
+ 0d53a415a307ef175153bbe60a572c940a922cb736ce13530b666e7ec2795d68"
 
 lib32disabled=yes
 nocross=yes
@@ -33,7 +36,7 @@ nopie=yes
 nodebug=yes
 create_wrksrc=yes
 
-hostmakedepends="flex perl python3"
+hostmakedepends="gcc-objc gcc-go flex perl python3"
 makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel isl15-devel"
 nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a
  libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a"
@@ -84,10 +87,10 @@ _gcc_bootstrap() {
 
 	cd ${wrksrc}/gcc-${_gcc_version}
 	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
-	_apply_patch -p0 ${FILESDIR}/non-nullness.patch
 	_apply_patch -p0 ${FILESDIR}/musl-ada.patch
 	_apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch
 	_apply_patch -p0 ${FILESDIR}/invalid_tls_model.patch
+	_apply_patch -p0 ${FILESDIR}/gccgo-musl.patch
 
 	msg_normal "Building cross gcc bootstrap\n"
 
@@ -156,6 +159,22 @@ _musl_build() {
 	touch ${wrksrc}/.musl_build_done
 }
 
+_libucontext_build() {
+	[ -f ${wrksrc}/.libucontext_build_done ] && return 0
+
+	cd ${wrksrc}/libucontext-${_libucontext_version}
+	msg_normal "Building cross libucontext\n"
+
+	# it's ok if we're static only here
+	CC="${_triplet}-gcc" AR="${_triplet}-ar" AS="${_triplet}-as" \
+		CFLAGS="-Os -pipe ${_archflags}" \
+		make ARCH=arm libucontext.a
+
+	cp libucontext.a ${_sysroot}/usr/lib
+
+	touch ${wrksrc}/.libucontext_build_done
+}
+
 _gcc_build() {
 	local _args
 
@@ -170,7 +189,7 @@ _gcc_build() {
 	_args="--prefix=/usr"
 	_args+=" --target=${_triplet}"
 	_args+=" --with-sysroot=${_sysroot}"
-	_args+=" --enable-languages=c,ada,c++,fortran,lto"
+	_args+=" --enable-languages=c,ada,c++,objc,obj-c++,go,fortran,lto"
 	_args+=" --enable-libada"
 	_args+=" --enable-lto"
 	_args+=" --enable-default-pie"
@@ -212,6 +231,7 @@ do_build() {
 	_gcc_bootstrap
 	_linux_headers
 	_musl_build
+	_libucontext_build
 	_gcc_build
 }
 
@@ -262,6 +282,11 @@ do_install() {
 	ln -svf libgnat-${_majorver}.so libgnat.so
 	rm -vf ${DESTDIR}/${_adalib}/libgna{rl,t}.so
 
+	# We need to build libatomic in target gcc as gccgo needs it to
+	# build... but it's not needed at runtime, so remove it from the
+	# destdir so it doesn't conflict with the libatomic package
+	rm -f ${DESTDIR}/${_sysroot}/usr/lib/libatomic.*
+
 	# Remove unnecessary stuff
 	rm -f ${DESTDIR}/usr/lib*/libiberty.a
 	rm -rf ${DESTDIR}/usr/share
diff --git a/srcpkgs/cross-i686-linux-musl/files/bug90756.patch b/srcpkgs/cross-i686-linux-musl/files/bug90756.patch
deleted file mode 120000
index 02ae43b18b4..00000000000
--- a/srcpkgs/cross-i686-linux-musl/files/bug90756.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/bug90756.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-i686-linux-musl/files/gccgo-musl.patch b/srcpkgs/cross-i686-linux-musl/files/gccgo-musl.patch
new file mode 120000
index 00000000000..a093af85773
--- /dev/null
+++ b/srcpkgs/cross-i686-linux-musl/files/gccgo-musl.patch
@@ -0,0 +1 @@
+../../gcc/files/gccgo-musl.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-i686-linux-musl/files/non-nullness.patch b/srcpkgs/cross-i686-linux-musl/files/non-nullness.patch
deleted file mode 120000
index c8b653748fe..00000000000
--- a/srcpkgs/cross-i686-linux-musl/files/non-nullness.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/non-nullness.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-i686-linux-musl/template b/srcpkgs/cross-i686-linux-musl/template
index 905bacb0e27..25d8042180a 100644
--- a/srcpkgs/cross-i686-linux-musl/template
+++ b/srcpkgs/cross-i686-linux-musl/template
@@ -1,17 +1,18 @@
 # Template build file for 'cross-i686-linux-musl'
 #
 _binutils_version=2.32
-_gcc_version=9.1.0
+_gcc_version=9.2.0
 _musl_version=1.1.23
 _linux_version=4.19
+_libucontext_version=0.9.0
 
 _triplet=i686-linux-musl
 _sysroot="/usr/${_triplet}"
 _archflags="-march=i686"
 
 pkgname=cross-${_triplet}
-version=0.31
-revision=4
+version=0.32
+revision=1
 short_desc="Cross toolchain for i686 target (musl)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 homepage="https://www.voidlinux.org/"
@@ -20,18 +21,20 @@ distfiles="
  ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
  ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz
  http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz
- ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
+ ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz
+ https://distfiles.adelielinux.org/source/libucontext/libucontext-${_libucontext_version}.tar.xz"
 checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0
+ ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
  8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa
- 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
+ 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1
+ 0d53a415a307ef175153bbe60a572c940a922cb736ce13530b666e7ec2795d68"
 
 lib32disabled=yes
 nocross=yes
 nopie=yes
 nodebug=yes
 create_wrksrc=yes
-hostmakedepends="flex perl python3"
+hostmakedepends="gcc-objc gcc-go flex perl python3"
 makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel isl15-devel"
 nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a
  libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a"
@@ -83,12 +86,11 @@ _gcc_bootstrap() {
 
 	cd ${wrksrc}/gcc-${_gcc_version}
 	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
-	_apply_patch -p0 ${FILESDIR}/non-nullness.patch
 	_apply_patch -p0 ${FILESDIR}/no-stack_chk_fail_local.patch
 	_apply_patch -p0 ${FILESDIR}/musl-ada.patch
 	_apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch
 	_apply_patch -p0 ${FILESDIR}/invalid_tls_model.patch
-	_apply_patch -p0 ${FILESDIR}/bug90756.patch
+	_apply_patch -p0 ${FILESDIR}/gccgo-musl.patch
 
 	msg_normal "Building cross gcc bootstrap\n"
 
@@ -155,6 +157,25 @@ _musl_build() {
 	touch ${wrksrc}/.musl_build_done
 }
 
+_libucontext_build() {
+	[ -f ${wrksrc}/.libucontext_build_done ] && return 0
+
+	cd ${wrksrc}/libucontext-${_libucontext_version}
+	msg_normal "Building cross libucontext\n"
+
+	sed -i arch/x86/startcontext.S -e \
+	 "s;__i686.get_pc_thunk.bx;i686_get_pc_thunk_bx;g"
+
+	# it's ok if we're static only here
+	CC="${_triplet}-gcc" AR="${_triplet}-ar" AS="${_triplet}-as" \
+		CFLAGS="-Os -pipe ${_archflags}" \
+		make ARCH=x86 libucontext.a
+
+	cp libucontext.a ${_sysroot}/usr/lib
+
+	touch ${wrksrc}/.libucontext_build_done
+}
+
 _gcc_build() {
 	local _args
 	[ -f ${wrksrc}/.gcc_build_done ] && return 0
@@ -168,7 +189,7 @@ _gcc_build() {
 	_args="--target=${_triplet}"
 	_args+=" --with-sysroot=${_sysroot}"
 	_args+=" --prefix=/usr"
-	_args+=" --enable-languages=c,ada,c++,fortran,lto"
+	_args+=" --enable-languages=c,ada,c++,objc,obj-c++,go,fortran,lto"
 	_args+=" --enable-lto"
 	_args+=" --enable-default-pie"
 	_args+=" --enable-default-ssp"
@@ -209,6 +230,7 @@ do_build() {
 	_gcc_bootstrap
 	_linux_headers
 	_musl_build
+	_libucontext_build
 	_gcc_build
 }
 
@@ -266,6 +288,11 @@ do_install() {
 	ln -svf libgnat-${_majorver}.so libgnat.so
 	rm -vf ${DESTDIR}/${_adalib}/libgna{rl,t}.so
 
+	# We need to build libatomic in target gcc as gccgo needs it to
+	# build... but it's not needed at runtime, so remove it from the
+	# destdir so it doesn't conflict with the libatomic package
+	rm -f ${DESTDIR}/${_sysroot}/usr/lib/libatomic.*
+
 	# Remove unnecessary stuff
 	rm -f ${DESTDIR}/usr/lib*/libiberty.a
 	rm -rf ${DESTDIR}/usr/share
diff --git a/srcpkgs/cross-i686-pc-linux-gnu/files/bug90756.patch b/srcpkgs/cross-i686-pc-linux-gnu/files/bug90756.patch
deleted file mode 120000
index 02ae43b18b4..00000000000
--- a/srcpkgs/cross-i686-pc-linux-gnu/files/bug90756.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/bug90756.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-i686-pc-linux-gnu/files/non-nullness.patch b/srcpkgs/cross-i686-pc-linux-gnu/files/non-nullness.patch
deleted file mode 120000
index c8b653748fe..00000000000
--- a/srcpkgs/cross-i686-pc-linux-gnu/files/non-nullness.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/non-nullness.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-i686-pc-linux-gnu/template b/srcpkgs/cross-i686-pc-linux-gnu/template
index 34dc2a3827e..c5b0e414cae 100644
--- a/srcpkgs/cross-i686-pc-linux-gnu/template
+++ b/srcpkgs/cross-i686-pc-linux-gnu/template
@@ -1,8 +1,8 @@
 # Template build file for 'cross-i686-pc-linux-gnu'
 #
 _binutils_version=2.32
-_gcc_version=9.1.0
-_glibc_version=2.29
+_gcc_version=9.2.0
+_glibc_version=2.30
 _linux_version=4.19
 
 _triplet=i686-pc-linux-gnu
@@ -10,8 +10,8 @@ _archflags="-march=i686 -mtune=generic"
 _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
-version=0.31
-revision=2
+version=0.32
+revision=1
 short_desc="GNU Cross toolchain for the ${_triplet} target (binutils/gcc/glibc)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 homepage="https://www.voidlinux.org/"
@@ -22,8 +22,8 @@ distfiles="
  ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz
  ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
 checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0
- f3eeb8d57e25ca9fc13c2af3dae97754f9f643bc69229546828e3a240e2af04b
+ ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
+ e2c4114e569afbe7edbc29131a43be833850ab9a459d81beb2588016d2bbb8af
  0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
 
 archs="armv6l armv7l x86_64"
@@ -32,7 +32,7 @@ nopie=yes
 nodebug=yes
 lib32disabled=yes
 create_wrksrc=yes
-hostmakedepends="flex perl python3"
+hostmakedepends="gcc-objc gcc-go flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a
@@ -81,9 +81,7 @@ _gcc_bootstrap() {
 
 	cd ${wrksrc}/gcc-${_gcc_version}
 	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
-	_apply_patch -p0 ${FILESDIR}/non-nullness.patch
 	_apply_patch -p0 ${FILESDIR}/no-stack_chk_fail_local.patch
-	_apply_patch -p0 ${FILESDIR}/bug90756.patch
 
 	msg_normal "Building cross gcc bootstrap\n"
 
@@ -235,7 +233,7 @@ _gcc_build() {
 	_args+=" --prefix=/usr"
 	_args+=" --libdir=/usr/lib"
 	_args+=" --with-sysroot=${_sysroot}"
-	_args+=" --enable-languages=c,ada,c++,fortran,lto"
+	_args+=" --enable-languages=c,ada,c++,objc,obj-c++,go,fortran,lto"
 	_args+=" --with-gnu-as"
 	_args+=" --with-gnu-ld"
 	_args+=" --disable-multilib"
@@ -252,7 +250,6 @@ _gcc_build() {
 	_args+=" --enable-default-ssp"
 	_args+=" --enable-gnu-indirect-function"
 	_args+=" --enable-libquadmath"
-	_args+=" --disable-libatomic"
 	_args+=" --disable-libssp"
 	_args+=" --disable-libmpx"
 	_args+=" --disable-libmudflap"
@@ -338,6 +335,11 @@ do_install() {
 	ln -svf libgnat-${_majorver}.so libgnat.so
 	rm -vf ${DESTDIR}/${_adalib}/libgna{rl,t}.so
 
+	# We need to build libatomic in target gcc as gccgo needs it to
+	# build... but it's not needed at runtime, so remove it from the
+	# destdir so it doesn't conflict with the libatomic package
+	rm -f ${DESTDIR}/${_sysroot}/usr/lib/libatomic.*
+
 	# Remove unnecessary stuff
 	rm -f ${DESTDIR}/usr/lib*/libiberty.a
 	rm -rf ${DESTDIR}/usr/share
diff --git a/srcpkgs/cross-mips-linux-musl/files/non-nullness.patch b/srcpkgs/cross-mips-linux-musl/files/non-nullness.patch
deleted file mode 120000
index c8b653748fe..00000000000
--- a/srcpkgs/cross-mips-linux-musl/files/non-nullness.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/non-nullness.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-mips-linux-musl/template b/srcpkgs/cross-mips-linux-musl/template
index a129e937dbf..213d288cafc 100644
--- a/srcpkgs/cross-mips-linux-musl/template
+++ b/srcpkgs/cross-mips-linux-musl/template
@@ -1,7 +1,7 @@
 # Template build file for 'cross-mips-linux-musl'
 #
 _binutils_version=2.32
-_gcc_version=9.1.0
+_gcc_version=9.2.0
 _musl_version=1.1.23
 _linux_version=4.19
 
@@ -11,8 +11,8 @@ _archflags="-march=mips32r2 -msoft-float"
 _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
-version=0.31
-revision=3
+version=0.32
+revision=1
 short_desc="Cross toolchain for MIPS32r2 BE softfloat target (musl)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 homepage="https://www.voidlinux.org/"
@@ -23,7 +23,7 @@ distfiles="
  http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz
  ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
 checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0
+ ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
  8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa
  0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
 
@@ -33,7 +33,7 @@ nopie=yes
 nodebug=yes
 create_wrksrc=yes
 
-hostmakedepends="flex perl python3"
+hostmakedepends="gcc-objc flex perl python3"
 makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel isl15-devel"
 nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a
  libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a"
@@ -84,7 +84,6 @@ _gcc_bootstrap() {
 
 	cd ${wrksrc}/gcc-${_gcc_version}
 	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
-	_apply_patch -p0 ${FILESDIR}/non-nullness.patch
 	_apply_patch -p0 ${FILESDIR}/musl-ada.patch
 	_apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch
 	_apply_patch -p0 ${FILESDIR}/invalid_tls_model.patch
@@ -169,7 +168,7 @@ _gcc_build() {
 	_args+=" --target=${_triplet}"
 	_args+=" --with-sysroot=${_sysroot}"
 	_args+=" --libexecdir=/usr/lib"
-	_args+=" --enable-languages=c,ada,c++,fortran,lto"
+	_args+=" --enable-languages=c,ada,c++,objc,obj-c++,fortran,lto"
 	_args+=" --enable-libada"
 	_args+=" --enable-lto"
 	_args+=" --enable-default-pie"
@@ -180,6 +179,7 @@ _gcc_build() {
 	_args+=" --disable-libquadmath"
 	_args+=" --disable-libmpx"
 	_args+=" --disable-libmudflap"
+	_args+=" --disable-libatomic"
 	_args+=" --enable-shared"
 	_args+=" ${_fpuflags}"
 
diff --git a/srcpkgs/cross-mips-linux-muslhf/files/non-nullness.patch b/srcpkgs/cross-mips-linux-muslhf/files/non-nullness.patch
deleted file mode 120000
index c8b653748fe..00000000000
--- a/srcpkgs/cross-mips-linux-muslhf/files/non-nullness.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/non-nullness.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-mips-linux-muslhf/template b/srcpkgs/cross-mips-linux-muslhf/template
index 5ad364ecf40..84892aa48ba 100644
--- a/srcpkgs/cross-mips-linux-muslhf/template
+++ b/srcpkgs/cross-mips-linux-muslhf/template
@@ -1,7 +1,7 @@
 # Template build file for 'cross-mips-linux-muslhf'
 #
 _binutils_version=2.32
-_gcc_version=9.1.0
+_gcc_version=9.2.0
 _musl_version=1.1.23
 _linux_version=4.19
 
@@ -11,8 +11,8 @@ _archflags="-march=mips32r2 -mhard-float"
 _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
-version=0.31
-revision=3
+version=0.32
+revision=1
 short_desc="Cross toolchain for MIPS32r2 BE hardfloat target (musl)"
 maintainer="hipperson0 <hipperson0@gmail.com>"
 homepage="https://www.voidlinux.org/"
@@ -23,7 +23,7 @@ distfiles="
  https://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz
  ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
 checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0
+ ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
  8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa
  0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
 
@@ -33,7 +33,7 @@ nopie=yes
 nodebug=yes
 create_wrksrc=yes
 
-hostmakedepends="flex perl python3"
+hostmakedepends="gcc-objc flex perl python3"
 makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel isl15-devel"
 nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a
  libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a"
@@ -84,7 +84,6 @@ _gcc_bootstrap() {
 
 	cd ${wrksrc}/gcc-${_gcc_version}
 	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
-	_apply_patch -p0 ${FILESDIR}/non-nullness.patch
 	_apply_patch -p0 ${FILESDIR}/musl-ada.patch
 	_apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch
 	_apply_patch -p0 ${FILESDIR}/invalid_tls_model.patch
@@ -169,7 +168,7 @@ _gcc_build() {
 	_args+=" --target=${_triplet}"
 	_args+=" --with-sysroot=${_sysroot}"
 	_args+=" --libexecdir=/usr/lib"
-	_args+=" --enable-languages=c,ada,c++,fortran,lto"
+	_args+=" --enable-languages=c,ada,c++,objc,obj-c++,fortran,lto"
 	_args+=" --enable-libada"
 	_args+=" --enable-lto"
 	_args+=" --enable-default-pie"
@@ -180,6 +179,7 @@ _gcc_build() {
 	_args+=" --disable-libquadmath"
 	_args+=" --disable-libmpx"
 	_args+=" --disable-libmudflap"
+	_args+=" --disable-libatomic"
 	_args+=" --enable-shared"
 	_args+=" ${_fpuflags}"
 
diff --git a/srcpkgs/cross-mipsel-linux-musl/files/non-nullness.patch b/srcpkgs/cross-mipsel-linux-musl/files/non-nullness.patch
deleted file mode 120000
index c8b653748fe..00000000000
--- a/srcpkgs/cross-mipsel-linux-musl/files/non-nullness.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/non-nullness.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-mipsel-linux-musl/template b/srcpkgs/cross-mipsel-linux-musl/template
index 1621d1005d5..20cbe0fed03 100644
--- a/srcpkgs/cross-mipsel-linux-musl/template
+++ b/srcpkgs/cross-mipsel-linux-musl/template
@@ -1,7 +1,7 @@
 # Template build file for 'cross-mipsel-linux-musl'
 #
 _binutils_version=2.32
-_gcc_version=9.1.0
+_gcc_version=9.2.0
 _musl_version=1.1.23
 _linux_version=4.19
 
@@ -11,8 +11,8 @@ _archflags="-march=mips32r2 -msoft-float"
 _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
-version=0.31
-revision=3
+version=0.32
+revision=1
 short_desc="Cross toolchain for MIPS32r2 LE softfloat target (musl)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 homepage="https://www.voidlinux.org/"
@@ -23,7 +23,7 @@ distfiles="
  http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz
  ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
 checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0
+ ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
  8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa
  0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
 
@@ -33,7 +33,7 @@ nopie=yes
 nodebug=yes
 create_wrksrc=yes
 
-hostmakedepends="flex perl python3"
+hostmakedepends="gcc-objc flex perl python3"
 makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel isl15-devel"
 nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a
  libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a"
@@ -84,7 +84,6 @@ _gcc_bootstrap() {
 
 	cd ${wrksrc}/gcc-${_gcc_version}
 	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
-	_apply_patch -p0 ${FILESDIR}/non-nullness.patch
 	_apply_patch -p0 ${FILESDIR}/musl-ada.patch
 	_apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch
 	_apply_patch -p0 ${FILESDIR}/invalid_tls_model.patch
@@ -169,7 +168,7 @@ _gcc_build() {
 	_args+=" --libexecdir=/usr/lib"
 	_args+=" --target=${_triplet}"
 	_args+=" --with-sysroot=${_sysroot}"
-	_args+=" --enable-languages=c,ada,c++,fortran,lto"
+	_args+=" --enable-languages=c,ada,c++,objc,obj-c++,fortran,lto"
 	_args+=" --enable-libada"
 	_args+=" --enable-lto"
 	_args+=" --enable-default-pie"
@@ -180,6 +179,7 @@ _gcc_build() {
 	_args+=" --disable-libquadmath"
 	_args+=" --disable-libmpx"
 	_args+=" --disable-libmudflap"
+	_args+=" --disable-libatomic"
 	_args+=" --enable-shared"
 	_args+=" ${_fpuflags}"
 
diff --git a/srcpkgs/cross-mipsel-linux-muslhf/files/non-nullness.patch b/srcpkgs/cross-mipsel-linux-muslhf/files/non-nullness.patch
deleted file mode 120000
index c8b653748fe..00000000000
--- a/srcpkgs/cross-mipsel-linux-muslhf/files/non-nullness.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/non-nullness.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-mipsel-linux-muslhf/template b/srcpkgs/cross-mipsel-linux-muslhf/template
index 3f02ba22d27..d2a692b48fe 100644
--- a/srcpkgs/cross-mipsel-linux-muslhf/template
+++ b/srcpkgs/cross-mipsel-linux-muslhf/template
@@ -1,7 +1,7 @@
 # Template build file for 'cross-mipsel-linux-muslhf'
 #
 _binutils_version=2.32
-_gcc_version=9.1.0
+_gcc_version=9.2.0
 _musl_version=1.1.23
 _linux_version=4.19
 
@@ -11,8 +11,8 @@ _archflags="-march=mips32r2 -mhard-float"
 _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
-version=0.31
-revision=3
+version=0.32
+revision=1
 short_desc="Cross toolchain for MIPS32r2 LE hardfloat target (musl)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 homepage="https://www.voidlinux.org/"
@@ -23,7 +23,7 @@ distfiles="
  http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz
  ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
 checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0
+ ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
  8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa
  0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
 
@@ -33,7 +33,7 @@ nopie=yes
 nodebug=yes
 create_wrksrc=yes
 
-hostmakedepends="flex perl python3"
+hostmakedepends="gcc-objc flex perl python3"
 makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel isl15-devel"
 nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a
  libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a"
@@ -84,7 +84,6 @@ _gcc_bootstrap() {
 
 	cd ${wrksrc}/gcc-${_gcc_version}
 	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
-	_apply_patch -p0 ${FILESDIR}/non-nullness.patch
 	_apply_patch -p0 ${FILESDIR}/musl-ada.patch
 	_apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch
 	_apply_patch -p0 ${FILESDIR}/invalid_tls_model.patch
@@ -169,7 +168,7 @@ _gcc_build() {
 	_args+=" --libexecdir=/usr/lib"
 	_args+=" --target=${_triplet}"
 	_args+=" --with-sysroot=${_sysroot}"
-	_args+=" --enable-languages=c,ada,c++,fortran,lto"
+	_args+=" --enable-languages=c,ada,c++,objc,obj-c++,fortran,lto"
 	_args+=" --enable-libada"
 	_args+=" --enable-lto"
 	_args+=" --enable-default-pie"
@@ -180,6 +179,7 @@ _gcc_build() {
 	_args+=" --disable-libquadmath"
 	_args+=" --disable-libmpx"
 	_args+=" --disable-libmudflap"
+	_args+=" --disable-libatomic"
 	_args+=" --enable-shared"
 	_args+=" ${_fpuflags}"
 
diff --git a/srcpkgs/cross-powerpc-linux-gnu/files/non-nullness.patch b/srcpkgs/cross-powerpc-linux-gnu/files/non-nullness.patch
deleted file mode 120000
index c8b653748fe..00000000000
--- a/srcpkgs/cross-powerpc-linux-gnu/files/non-nullness.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/non-nullness.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc-linux-gnu/template b/srcpkgs/cross-powerpc-linux-gnu/template
index d599721bad6..c36b8c1c307 100644
--- a/srcpkgs/cross-powerpc-linux-gnu/template
+++ b/srcpkgs/cross-powerpc-linux-gnu/template
@@ -1,8 +1,7 @@
-# Template build file for 'cross-powerpc-linux-gnu'
-#
+# Template file for 'cross-powerpc-linux-gnu'
 _binutils_version=2.32
-_gcc_version=9.1.0
-_glibc_version=2.29
+_gcc_version=9.2.0
+_glibc_version=2.30
 _linux_version=4.19
 
 _triplet=powerpc-linux-gnu
@@ -10,7 +9,7 @@ _archflags="-mcpu=powerpc -msecure-plt"
 _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
-version=0.31
+version=0.32
 revision=1
 short_desc="GNU Cross toolchain for the ${_triplet} target (binutils/gcc/glibc)"
 maintainer="Thomas Batten <stenstorpmc@gmail.com>"
@@ -22,15 +21,15 @@ distfiles="
  ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz
  ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
 checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0
- f3eeb8d57e25ca9fc13c2af3dae97754f9f643bc69229546828e3a240e2af04b
+ ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
+ e2c4114e569afbe7edbc29131a43be833850ab9a459d81beb2588016d2bbb8af
  0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
 
 lib32disabled=yes
 nocross=yes
 nopie=yes
 create_wrksrc=yes
-hostmakedepends="flex perl python3"
+hostmakedepends="gcc-objc gcc-go flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a
@@ -95,7 +94,6 @@ _gcc_bootstrap() {
 
 	cd ${wrksrc}/gcc-${_gcc_version}
 	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
-	_apply_patch -p0 ${FILESDIR}/non-nullness.patch
 
 	msg_normal "Building cross gcc bootstrap\n"
 
@@ -236,7 +234,7 @@ _gcc_build() {
 	_args+=" --libdir=/usr/lib"
 	_args+=" --target=${_triplet}"
 	_args+=" --with-sysroot=${_sysroot}"
-	_args+=" --enable-languages=c,ada,c++,fortran,lto"
+	_args+=" --enable-languages=c,ada,c++,objc,obj-c++,go,fortran,lto"
 	_args+=" --with-gnu-as"
 	_args+=" --with-gnu-ld"
 	_args+=" --disable-multilib"
@@ -252,7 +250,6 @@ _gcc_build() {
 	_args+=" --enable-default-pie"
 	_args+=" --enable-default-ssp"
 	_args+=" --disable-libquadmath"
-	_args+=" --disable-libatomic"
 	_args+=" --disable-libssp"
 	_args+=" --disable-libmudflap"
 	_args+=" --disable-libsanitizer"
@@ -328,14 +325,19 @@ do_install() {
 	cd ${wrksrc}/glibc-build
 	make install_root=${DESTDIR}/${_sysroot} install install-headers
 
-        # symlinks for gnarl and gnat shared libraries
-        _majorver=${_gcc_version%.*.*}
-        _adalib=usr/lib/gcc/${_triplet}/${_gcc_version}/adalib
-        mv -v ${DESTDIR}/${_adalib}/libgnarl-${_majorver}.so ${DESTDIR}/${_sysroot}/usr/lib
-        mv -v ${DESTDIR}/${_adalib}/libgnat-${_majorver}.so ${DESTDIR}/${_sysroot}/usr/lib
-        ln -svf libgnarl-${_majorver}.so libgnarl.so
-        ln -svf libgnat-${_majorver}.so libgnat.so
-        rm -vf ${DESTDIR}/${_adalib}/libgna{rl,t}.so
+	# symlinks for gnarl and gnat shared libraries
+	_majorver=${_gcc_version%.*.*}
+	_adalib=usr/lib/gcc/${_triplet}/${_gcc_version}/adalib
+	mv -v ${DESTDIR}/${_adalib}/libgnarl-${_majorver}.so ${DESTDIR}/${_sysroot}/usr/lib
+	mv -v ${DESTDIR}/${_adalib}/libgnat-${_majorver}.so ${DESTDIR}/${_sysroot}/usr/lib
+	ln -svf libgnarl-${_majorver}.so libgnarl.so
+	ln -svf libgnat-${_majorver}.so libgnat.so
+	rm -vf ${DESTDIR}/${_adalib}/libgna{rl,t}.so
+
+	# We need to build libatomic in target gcc as gccgo needs it to
+	# build... but it's not needed at runtime, so remove it from the
+	# destdir so it doesn't conflict with the libatomic package
+	rm -f ${DESTDIR}/${_sysroot}/usr/lib/libatomic.*
 
 	# Remove unnecessary stuff
 	rm -f ${DESTDIR}/usr/lib*/libiberty.a
diff --git a/srcpkgs/cross-powerpc-linux-musl/files/gccgo-musl.patch b/srcpkgs/cross-powerpc-linux-musl/files/gccgo-musl.patch
new file mode 120000
index 00000000000..a093af85773
--- /dev/null
+++ b/srcpkgs/cross-powerpc-linux-musl/files/gccgo-musl.patch
@@ -0,0 +1 @@
+../../gcc/files/gccgo-musl.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc-linux-musl/files/non-nullness.patch b/srcpkgs/cross-powerpc-linux-musl/files/non-nullness.patch
deleted file mode 120000
index c8b653748fe..00000000000
--- a/srcpkgs/cross-powerpc-linux-musl/files/non-nullness.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/non-nullness.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc-linux-musl/template b/srcpkgs/cross-powerpc-linux-musl/template
index 856e8fb0885..9d61d406ace 100644
--- a/srcpkgs/cross-powerpc-linux-musl/template
+++ b/srcpkgs/cross-powerpc-linux-musl/template
@@ -1,9 +1,9 @@
-# Template build file for 'cross-powerpc-linux-musl'
-#
+# Template file for 'cross-powerpc-linux-musl'
 _binutils_version=2.32
-_gcc_version=9.1.0
+_gcc_version=9.2.0
 _musl_version=1.1.23
 _linux_version=4.19
+_libucontext_version=0.9.0
 
 _triplet=powerpc-linux-musl
 _fpuflags=
@@ -11,8 +11,8 @@ _archflags="-mcpu=powerpc -msecure-plt"
 _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
-version=0.31
-revision=3
+version=0.32
+revision=1
 
 short_desc="Cross toolchain for PowerPC (musl)"
 maintainer="Thomas Batten <stenstorpmc@gmail.com>"
@@ -21,13 +21,14 @@ license="GPL-3.0-or-later, GPL-2.0-only, MIT"
 distfiles="
  ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
  ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz
+ http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz
  ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz
- http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz"
-checksum="
- 0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0
+ https://distfiles.adelielinux.org/source/libucontext/libucontext-${_libucontext_version}.tar.xz"
+checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
+ ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
+ 8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa
  0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1
- 8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa"
+ 0d53a415a307ef175153bbe60a572c940a922cb736ce13530b666e7ec2795d68"
 
 lib32disabled=yes
 nocross=yes
@@ -36,7 +37,7 @@ nodebug=yes
 create_wrksrc=yes
 
 archs="i686* x86_64* ppc64*"
-hostmakedepends="flex perl python3"
+hostmakedepends="gcc-objc gcc-go flex perl python3"
 makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel isl15-devel"
 nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a
  libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a"
@@ -86,13 +87,13 @@ _gcc_bootstrap() {
 
 	cd ${wrksrc}/gcc-${_gcc_version}
 	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
-	_apply_patch -p0 ${FILESDIR}/non-nullness.patch
 	_apply_patch -p0 ${FILESDIR}/musl-ada.patch
 	_apply_patch -p0 ${FILESDIR}/no-stack_chk_fail_local.patch
 	_apply_patch -p0 ${FILESDIR}/0010-ldbl128-config.patch
 	_apply_patch -p0 ${FILESDIR}/libgcc-musl-ldbl128-config.patch
 	_apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch
 	_apply_patch -p0 ${FILESDIR}/invalid_tls_model.patch
+	_apply_patch -p0 ${FILESDIR}/gccgo-musl.patch
 
 	msg_normal "Building cross gcc bootstrap\n"
 
@@ -166,6 +167,22 @@ _musl_build() {
 	touch ${wrksrc}/.musl_build_done
 }
 
+_libucontext_build() {
+	[ -f ${wrksrc}/.libucontext_build_done ] && return 0
+
+	cd ${wrksrc}/libucontext-${_libucontext_version}
+	msg_normal "Building cross libucontext\n"
+
+	# it's ok if we're static only here
+	CC="${_triplet}-gcc" AR="${_triplet}-ar" AS="${_triplet}-as" \
+		CFLAGS="-Os -pipe ${_archflags}" \
+		make ARCH=ppc libucontext.a
+
+	cp libucontext.a ${_sysroot}/usr/lib
+
+	touch ${wrksrc}/.libucontext_build_done
+}
+
 _gcc_build() {
 	local _args
 
@@ -181,7 +198,7 @@ _gcc_build() {
 	_args+=" --target=${_triplet}"
 	_args+=" --with-sysroot=${_sysroot}"
 	_args+=" --libexecdir=/usr/lib"
-	_args+=" --enable-languages=c,ada,c++,fortran,lto"
+	_args+=" --enable-languages=c,ada,c++,objc,obj-c++,go,fortran,lto"
 	_args+=" --enable-lto"
 	_args+=" --enable-libada"
 	_args+=" --enable-default-pie"
@@ -226,6 +243,7 @@ do_build() {
 	_gcc_bootstrap
 	_linux_headers
 	_musl_build
+	_libucontext_build
 	_gcc_build
 }
 
@@ -268,15 +286,20 @@ do_install() {
 	ln -sf libc.so ${DESTDIR}/${_sysroot}/usr/lib/ld-musl-powerpc.so.1
 	ln -sf libc.so ${DESTDIR}/${_sysroot}/usr/lib/ld-musl-powerpc-sf.so.1
 
-        # symlinks for gnarl and gnat shared libraries
-        _majorver=${_gcc_version%.*.*}
-        _adalib=usr/lib/gcc/${_triplet}/${_gcc_version}/adalib
-        mv -v ${DESTDIR}/${_adalib}/libgnarl-${_majorver}.so ${DESTDIR}/${_sysroot}/usr/lib
-        mv -v ${DESTDIR}/${_adalib}/libgnat-${_majorver}.so ${DESTDIR}/${_sysroot}/usr/lib
-        ln -svf libgnarl-${_majorver}.so libgnarl.so
-        ln -svf libgnat-${_majorver}.so libgnat.so
+	# symlinks for gnarl and gnat shared libraries
+	_majorver=${_gcc_version%.*.*}
+	_adalib=usr/lib/gcc/${_triplet}/${_gcc_version}/adalib
+	mv -v ${DESTDIR}/${_adalib}/libgnarl-${_majorver}.so ${DESTDIR}/${_sysroot}/usr/lib
+	mv -v ${DESTDIR}/${_adalib}/libgnat-${_majorver}.so ${DESTDIR}/${_sysroot}/usr/lib
+	ln -svf libgnarl-${_majorver}.so libgnarl.so
+	ln -svf libgnat-${_majorver}.so libgnat.so
 	rm -vf ${DESTDIR}/${_adalib}/libgna{rl,t}.so
 
+	# We need to build libatomic in target gcc as gccgo needs it to
+	# build... but it's not needed at runtime, so remove it from the
+	# destdir so it doesn't conflict with the libatomic package
+	rm -f ${DESTDIR}/${_sysroot}/usr/lib/libatomic.*
+
 	# Remove unnecessary stuff
 	rm -f ${DESTDIR}/usr/lib*/libiberty.a
 	rm -rf ${DESTDIR}/usr/share
diff --git a/srcpkgs/cross-powerpc64-linux-gnu/files/darn.patch b/srcpkgs/cross-powerpc64-linux-gnu/files/darn.patch
new file mode 120000
index 00000000000..dc81f1f9657
--- /dev/null
+++ b/srcpkgs/cross-powerpc64-linux-gnu/files/darn.patch
@@ -0,0 +1 @@
+../../gcc/patches/darn.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc64-linux-gnu/files/non-nullness.patch b/srcpkgs/cross-powerpc64-linux-gnu/files/non-nullness.patch
deleted file mode 120000
index c8b653748fe..00000000000
--- a/srcpkgs/cross-powerpc64-linux-gnu/files/non-nullness.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/non-nullness.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc64-linux-gnu/template b/srcpkgs/cross-powerpc64-linux-gnu/template
index 51973934ea6..9788de4ffc1 100644
--- a/srcpkgs/cross-powerpc64-linux-gnu/template
+++ b/srcpkgs/cross-powerpc64-linux-gnu/template
@@ -1,14 +1,14 @@
 # Template file for 'cross-powerpc64le-linux-gnu'
 _binutils_version=2.32
-_gcc_version=9.1.0
-_glibc_version=2.29
+_gcc_version=9.2.0
+_glibc_version=2.30
 _linux_version=4.19
 
 _triplet="powerpc64-linux-gnu"
 _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
-version=0.31
+version=0.32
 revision=1
 short_desc="GNU cross toolchain for the ${_triplet} targets (binutils/gcc/glibc)"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
@@ -20,8 +20,8 @@ distfiles="
  ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz
  ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
 checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0
- f3eeb8d57e25ca9fc13c2af3dae97754f9f643bc69229546828e3a240e2af04b
+ ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
+ e2c4114e569afbe7edbc29131a43be833850ab9a459d81beb2588016d2bbb8af
  0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
 
 lib32disabled=yes
@@ -29,7 +29,7 @@ nocross=yes
 nopie=yes
 nodebug=yes
 create_wrksrc=yes
-hostmakedepends="flex perl python3"
+hostmakedepends="gcc-objc gcc-go flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel"
 nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a
  libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a"
@@ -81,7 +81,7 @@ _gcc_bootstrap() {
 
 	cd ${wrksrc}/gcc-${_gcc_version}
 	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
-	_apply_patch -p0 ${FILESDIR}/non-nullness.patch
+	_apply_patch -p0 ${FILESDIR}/darn.patch
 	_apply_patch -p0 ${FILESDIR}/ppc64-pure64.patch
 
 	sed -i 's/lib64/lib/' gcc/config/rs6000/linux64.h
@@ -241,7 +241,7 @@ _gcc_build() {
 	_args+=" --target=${_triplet}"
 	_args+=" --with-sysroot=${_sysroot}"
 	_args+=" --with-abi=elfv2"
-	_args+=" --enable-languages=c,ada,c++,fortran,lto"
+	_args+=" --enable-languages=c,ada,c++,objc,obj-c++,go,fortran,lto"
 	_args+=" --enable-secureplt"
 	_args+=" --enable-targets=powerpcle-linux"
 	_args+=" --with-gnu-as"
@@ -338,6 +338,11 @@ do_install() {
 	ln -svf libgnat-${_majorver}.so libgnat.so
 	rm -vf ${DESTDIR}/${_adalib}/libgna{rl,t}.so
 
+	# We need to build libatomic in target gcc as gccgo needs it to
+	# build... but it's not needed at runtime, so remove it from the
+	# destdir so it doesn't conflict with the libatomic package
+	rm -f ${DESTDIR}/${_sysroot}/usr/lib/libatomic.*
+
 	# Remove unnecessary stuff
 	rm -f ${DESTDIR}/usr/lib*/libiberty.a
 	rm -rf ${DESTDIR}/usr/share
diff --git a/srcpkgs/cross-powerpc64-linux-musl/files/darn.patch b/srcpkgs/cross-powerpc64-linux-musl/files/darn.patch
new file mode 120000
index 00000000000..dc81f1f9657
--- /dev/null
+++ b/srcpkgs/cross-powerpc64-linux-musl/files/darn.patch
@@ -0,0 +1 @@
+../../gcc/patches/darn.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc64-linux-musl/files/gccgo-musl.patch b/srcpkgs/cross-powerpc64-linux-musl/files/gccgo-musl.patch
new file mode 120000
index 00000000000..a093af85773
--- /dev/null
+++ b/srcpkgs/cross-powerpc64-linux-musl/files/gccgo-musl.patch
@@ -0,0 +1 @@
+../../gcc/files/gccgo-musl.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc64-linux-musl/files/non-nullness.patch b/srcpkgs/cross-powerpc64-linux-musl/files/non-nullness.patch
deleted file mode 120000
index c8b653748fe..00000000000
--- a/srcpkgs/cross-powerpc64-linux-musl/files/non-nullness.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/non-nullness.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc64-linux-musl/template b/srcpkgs/cross-powerpc64-linux-musl/template
index d3a9a758fe9..ea2800df634 100644
--- a/srcpkgs/cross-powerpc64-linux-musl/template
+++ b/srcpkgs/cross-powerpc64-linux-musl/template
@@ -1,15 +1,16 @@
 # Template file for 'cross-powerpc64-linux-musl'
 _binutils_version=2.32
-_gcc_version=9.1.0
+_gcc_version=9.2.0
 _musl_version=1.1.23
 _linux_version=4.19
+_libucontext_version=0.9.0
 
 _triplet="powerpc64-linux-musl"
 _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
-version=0.31
-revision=3
+version=0.32
+revision=1
 short_desc="Cross toolchain for powerpc64 with musl"
 maintainer="q66 <daniel@octaforge.org>"
 homepage="https://www.voidlinux.org/"
@@ -18,18 +19,20 @@ distfiles="
  ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
  ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz
  http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz
- ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
+ ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz
+ https://distfiles.adelielinux.org/source/libucontext/libucontext-${_libucontext_version}.tar.xz"
 checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0
+ ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
  8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa
- 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
+ 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1
+ 0d53a415a307ef175153bbe60a572c940a922cb736ce13530b666e7ec2795d68"
 
 lib32disabled=yes
 nocross=yes
 nopie=yes
 nodebug=yes
 create_wrksrc=yes
-hostmakedepends="flex perl python3"
+hostmakedepends="gcc-objc gcc-go flex perl python3"
 makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel isl15-devel"
 nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a
  libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a"
@@ -81,13 +84,14 @@ _gcc_bootstrap() {
 
 	cd ${wrksrc}/gcc-${_gcc_version}
 	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
-	_apply_patch -p0 ${FILESDIR}/non-nullness.patch
 	_apply_patch -p0 ${FILESDIR}/0010-ldbl128-config.patch
 	_apply_patch -p0 ${FILESDIR}/ppc64-pure64.patch
 	_apply_patch -p0 ${FILESDIR}/libgcc-musl-ldbl128-config.patch
 	_apply_patch -p0 ${FILESDIR}/musl-ada.patch
+	_apply_patch -p0 ${FILESDIR}/darn.patch
 	_apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch
 	_apply_patch -p0 ${FILESDIR}/invalid_tls_model.patch
+	_apply_patch -p0 ${FILESDIR}/gccgo-musl.patch
 
 	sed -i 's/lib64/lib/' gcc/config/rs6000/linux64.h
 
@@ -161,6 +165,22 @@ _musl_build() {
 	touch ${wrksrc}/.musl_build_done
 }
 
+_libucontext_build() {
+	[ -f ${wrksrc}/.libucontext_build_done ] && return 0
+
+	cd ${wrksrc}/libucontext-${_libucontext_version}
+	msg_normal "Building cross libucontext\n"
+
+	# it's ok if we're static only here
+	CC="${_triplet}-gcc" AR="${_triplet}-ar" AS="${_triplet}-as" \
+		CFLAGS="-Os -pipe ${_archflags}" \
+		make ARCH=ppc64 libucontext.a
+
+	cp libucontext.a ${_sysroot}/usr/lib
+
+	touch ${wrksrc}/.libucontext_build_done
+}
+
 _gcc_build() {
 	local _args
 	[ -f ${wrksrc}/.gcc_build_done ] && return 0
@@ -176,7 +196,7 @@ _gcc_build() {
 	_args+=" --target=${_triplet}"
 	_args+=" --with-sysroot=${_sysroot}"
 	_args+=" --with-abi=elfv2"
-	_args+=" --enable-languages=c,ada,c++,fortran,lto"
+	_args+=" --enable-languages=c,ada,c++,objc,obj-c++,go,fortran,lto"
 	_args+=" --enable-decimal-float=no"
 	_args+=" --enable-secureplt"
 	_args+=" --enable-targets=powerpc-linux"
@@ -219,6 +239,7 @@ do_build() {
 	_gcc_bootstrap
 	_linux_headers
 	_musl_build
+	_libucontext_build
 	_gcc_build
 }
 
@@ -270,6 +291,11 @@ do_install() {
 	ln -svf libgnat-${_majorver}.so libgnat.so
 	rm -vf ${DESTDIR}/${_adalib}/libgna{rl,t}.so
 
+	# We need to build libatomic in target gcc as gccgo needs it to
+	# build... but it's not needed at runtime, so remove it from the
+	# destdir so it doesn't conflict with the libatomic package
+	rm -f ${DESTDIR}/${_sysroot}/usr/lib/libatomic.*
+
 	# Remove unnecessary stuff
 	rm -f ${DESTDIR}/usr/lib*/libiberty.a
 	rm -rf ${DESTDIR}/usr/share
diff --git a/srcpkgs/cross-powerpc64le-linux-gnu/files/darn.patch b/srcpkgs/cross-powerpc64le-linux-gnu/files/darn.patch
new file mode 120000
index 00000000000..dc81f1f9657
--- /dev/null
+++ b/srcpkgs/cross-powerpc64le-linux-gnu/files/darn.patch
@@ -0,0 +1 @@
+../../gcc/patches/darn.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc64le-linux-gnu/files/non-nullness.patch b/srcpkgs/cross-powerpc64le-linux-gnu/files/non-nullness.patch
deleted file mode 120000
index c8b653748fe..00000000000
--- a/srcpkgs/cross-powerpc64le-linux-gnu/files/non-nullness.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/non-nullness.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc64le-linux-gnu/template b/srcpkgs/cross-powerpc64le-linux-gnu/template
index 485f6bfe397..30bde74b769 100644
--- a/srcpkgs/cross-powerpc64le-linux-gnu/template
+++ b/srcpkgs/cross-powerpc64le-linux-gnu/template
@@ -1,14 +1,14 @@
 # Template file for 'cross-powerpc64le-linux-gnu'
 _binutils_version=2.32
-_gcc_version=9.1.0
-_glibc_version=2.29
+_gcc_version=9.2.0
+_glibc_version=2.30
 _linux_version=4.19
 
 _triplet="powerpc64le-linux-gnu"
 _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
-version=0.31
+version=0.32
 revision=1
 short_desc="GNU cross toolchain for the ${_triplet} targets (binutils/gcc/glibc)"
 maintainer="q66 <daniel@octaforge.org>"
@@ -20,8 +20,8 @@ distfiles="
  ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz
  ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
 checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0
- f3eeb8d57e25ca9fc13c2af3dae97754f9f643bc69229546828e3a240e2af04b
+ ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
+ e2c4114e569afbe7edbc29131a43be833850ab9a459d81beb2588016d2bbb8af
  0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
 
 lib32disabled=yes
@@ -29,7 +29,7 @@ nocross=yes
 nopie=yes
 nodebug=yes
 create_wrksrc=yes
-hostmakedepends="flex perl python3"
+hostmakedepends="gcc-objc gcc-go flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel"
 nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a
  libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a"
@@ -81,7 +81,7 @@ _gcc_bootstrap() {
 
 	cd ${wrksrc}/gcc-${_gcc_version}
 	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
-	_apply_patch -p0 ${FILESDIR}/non-nullness.patch
+	_apply_patch -p0 ${FILESDIR}/darn.patch
 	_apply_patch -p0 ${FILESDIR}/ppc64-pure64.patch
 
 	sed -i 's/lib64/lib/' gcc/config/rs6000/linux64.h
@@ -241,7 +241,7 @@ _gcc_build() {
 	_args+=" --target=${_triplet}"
 	_args+=" --with-sysroot=${_sysroot}"
 	_args+=" --with-abi=elfv2"
-	_args+=" --enable-languages=c,ada,c++,fortran,lto"
+	_args+=" --enable-languages=c,ada,c++,objc,obj-c++,go,fortran,lto"
 	_args+=" --enable-secureplt"
 	_args+=" --enable-targets=powerpcle-linux"
 	_args+=" --with-gnu-as"
@@ -338,6 +338,11 @@ do_install() {
 	ln -svf libgnat-${_majorver}.so libgnat.so
 	rm -vf ${DESTDIR}/${_adalib}/libgna{rl,t}.so
 
+	# We need to build libatomic in target gcc as gccgo needs it to
+	# build... but it's not needed at runtime, so remove it from the
+	# destdir so it doesn't conflict with the libatomic package
+	rm -f ${DESTDIR}/${_sysroot}/usr/lib/libatomic.*
+
 	# Remove unnecessary stuff
 	rm -f ${DESTDIR}/usr/lib*/libiberty.a
 	rm -rf ${DESTDIR}/usr/share
diff --git a/srcpkgs/cross-powerpc64le-linux-musl/files/darn.patch b/srcpkgs/cross-powerpc64le-linux-musl/files/darn.patch
new file mode 120000
index 00000000000..dc81f1f9657
--- /dev/null
+++ b/srcpkgs/cross-powerpc64le-linux-musl/files/darn.patch
@@ -0,0 +1 @@
+../../gcc/patches/darn.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc64le-linux-musl/files/gccgo-musl.patch b/srcpkgs/cross-powerpc64le-linux-musl/files/gccgo-musl.patch
new file mode 120000
index 00000000000..a093af85773
--- /dev/null
+++ b/srcpkgs/cross-powerpc64le-linux-musl/files/gccgo-musl.patch
@@ -0,0 +1 @@
+../../gcc/files/gccgo-musl.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc64le-linux-musl/files/non-nullness.patch b/srcpkgs/cross-powerpc64le-linux-musl/files/non-nullness.patch
deleted file mode 120000
index c8b653748fe..00000000000
--- a/srcpkgs/cross-powerpc64le-linux-musl/files/non-nullness.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/non-nullness.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc64le-linux-musl/template b/srcpkgs/cross-powerpc64le-linux-musl/template
index 7e75d7b1c5c..475f2f725ca 100644
--- a/srcpkgs/cross-powerpc64le-linux-musl/template
+++ b/srcpkgs/cross-powerpc64le-linux-musl/template
@@ -1,15 +1,16 @@
 # Template file for 'cross-powerpc64le-linux-musl'
 _binutils_version=2.32
-_gcc_version=9.1.0
+_gcc_version=9.2.0
 _musl_version=1.1.23
 _linux_version=4.19
+_libucontext_version=0.9.0
 
 _triplet="powerpc64le-linux-musl"
 _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
-version=0.31
-revision=3
+version=0.32
+revision=1
 short_desc="Cross toolchain for powerpc64le with musl"
 maintainer="q66 <daniel@octaforge.org>"
 homepage="https://www.voidlinux.org/"
@@ -18,18 +19,20 @@ distfiles="
  ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
  ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz
  http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz
- ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
+ ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz
+ https://distfiles.adelielinux.org/source/libucontext/libucontext-${_libucontext_version}.tar.xz"
 checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0
+ ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
  8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa
- 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
+ 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1
+ 0d53a415a307ef175153bbe60a572c940a922cb736ce13530b666e7ec2795d68"
 
 lib32disabled=yes
 nocross=yes
 nopie=yes
 nodebug=yes
 create_wrksrc=yes
-hostmakedepends="flex perl python3"
+hostmakedepends="gcc-objc gcc-go flex perl python3"
 makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel isl15-devel"
 nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a
  libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a"
@@ -81,13 +84,14 @@ _gcc_bootstrap() {
 
 	cd ${wrksrc}/gcc-${_gcc_version}
 	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
-	_apply_patch -p0 ${FILESDIR}/non-nullness.patch
 	_apply_patch -p0 ${FILESDIR}/0010-ldbl128-config.patch
 	_apply_patch -p0 ${FILESDIR}/ppc64-pure64.patch
 	_apply_patch -p0 ${FILESDIR}/libgcc-musl-ldbl128-config.patch
 	_apply_patch -p0 ${FILESDIR}/musl-ada.patch
+	_apply_patch -p0 ${FILESDIR}/darn.patch
 	_apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch
 	_apply_patch -p0 ${FILESDIR}/invalid_tls_model.patch
+	_apply_patch -p0 ${FILESDIR}/gccgo-musl.patch
 
 	sed -i 's/lib64/lib/' gcc/config/rs6000/linux64.h
 
@@ -161,6 +165,22 @@ _musl_build() {
 	touch ${wrksrc}/.musl_build_done
 }
 
+_libucontext_build() {
+	[ -f ${wrksrc}/.libucontext_build_done ] && return 0
+
+	cd ${wrksrc}/libucontext-${_libucontext_version}
+	msg_normal "Building cross libucontext\n"
+
+	# it's ok if we're static only here
+	CC="${_triplet}-gcc" AR="${_triplet}-ar" AS="${_triplet}-as" \
+		CFLAGS="-Os -pipe ${_archflags}" \
+		make ARCH=ppc64 libucontext.a
+
+	cp libucontext.a ${_sysroot}/usr/lib
+
+	touch ${wrksrc}/.libucontext_build_done
+}
+
 _gcc_build() {
 	local _args
 	[ -f ${wrksrc}/.gcc_build_done ] && return 0
@@ -176,7 +196,7 @@ _gcc_build() {
 	_args+=" --target=${_triplet}"
 	_args+=" --with-sysroot=${_sysroot}"
 	_args+=" --with-abi=elfv2"
-	_args+=" --enable-languages=c,ada,c++,fortran,lto"
+	_args+=" --enable-languages=c,ada,c++,objc,obj-c++,go,fortran,lto"
 	_args+=" --enable-decimal-float=no"
 	_args+=" --enable-secureplt"
 	_args+=" --enable-targets=powerpcle-linux"
@@ -219,6 +239,7 @@ do_build() {
 	_gcc_bootstrap
 	_linux_headers
 	_musl_build
+	_libucontext_build
 	_gcc_build
 }
 
@@ -270,6 +291,11 @@ do_install() {
 	ln -svf libgnat-${_majorver}.so libgnat.so
 	rm -vf ${DESTDIR}/${_adalib}/libgna{rl,t}.so
 
+	# We need to build libatomic in target gcc as gccgo needs it to
+	# build... but it's not needed at runtime, so remove it from the
+	# destdir so it doesn't conflict with the libatomic package
+	rm -f ${DESTDIR}/${_sysroot}/usr/lib/libatomic.*
+
 	# Remove unnecessary stuff
 	rm -f ${DESTDIR}/usr/lib*/libiberty.a
 	rm -rf ${DESTDIR}/usr/share
diff --git a/srcpkgs/cross-vpkg-dummy/template b/srcpkgs/cross-vpkg-dummy/template
index d763d7f14c4..60a5c4f63f1 100644
--- a/srcpkgs/cross-vpkg-dummy/template
+++ b/srcpkgs/cross-vpkg-dummy/template
@@ -1,7 +1,7 @@
 # Template file for 'cross-vpkg-dummy'
 pkgname=cross-vpkg-dummy
-version=0.31
-revision=2
+version=0.33
+revision=1
 build_style=meta
 short_desc="Dummy meta-pkg for cross building packages with xbps-src"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -16,26 +16,42 @@ provides="
 	libada-9999_1
 	libada-devel-9999_1
 	libgcc-9999_1
+	libgcc-devel-9999_1
 	libstdc++-9999_1
 	libstdc++-devel-9999_1
 	libgfortran-9999_1
 	libgfortran-devel-9999_1
+	libgo-9999_1
+	libgo-devel-9999_1
+	libobjc-9999_1
+	libobjc-devel-9999_1
 	gcc-9999_1
 	gcc-fortran-9999_1
-	gcc-ada-9999_1"
+	gcc-ada-9999_1
+	gcc-go-9999_1
+	gcc-objc-9999_1
+	gcc-objc++-9999_1"
 conflicts="
 	kernel-libc-headers>=0
 	binutils>=0
 	libada>=0
 	libada-devel>=0
 	libgcc>=0
+	libgcc-devel>=0
 	libstdc++>=0
 	libstdc++-devel>=0
 	libgfortran>=0
 	libgfortran-devel>=0
+	libgo>=0
+	libgo-devel>=0
+	libobjc>=0
+	libobjc-devel>=0
 	gcc>=0
 	gcc-fortran>=0
-	gcc-ada>=0"
+	gcc-ada>=0
+	gcc-go>=0
+	gcc-objc>=0
+	gcc-objc++>=0"
 shlib_provides="
 	libgcc_s.so.1
 	libgnat-9.so
diff --git a/srcpkgs/cross-x86_64-linux-musl/files/gccgo-musl.patch b/srcpkgs/cross-x86_64-linux-musl/files/gccgo-musl.patch
new file mode 120000
index 00000000000..a093af85773
--- /dev/null
+++ b/srcpkgs/cross-x86_64-linux-musl/files/gccgo-musl.patch
@@ -0,0 +1 @@
+../../gcc/files/gccgo-musl.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-x86_64-linux-musl/files/non-nullness.patch b/srcpkgs/cross-x86_64-linux-musl/files/non-nullness.patch
deleted file mode 120000
index c8b653748fe..00000000000
--- a/srcpkgs/cross-x86_64-linux-musl/files/non-nullness.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/non-nullness.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-x86_64-linux-musl/template b/srcpkgs/cross-x86_64-linux-musl/template
index 2f6a2a4241d..349eacf973c 100644
--- a/srcpkgs/cross-x86_64-linux-musl/template
+++ b/srcpkgs/cross-x86_64-linux-musl/template
@@ -1,16 +1,17 @@
 # Template file for 'cross-x86_64-linux-musl'
 #
 _binutils_version=2.32
-_gcc_version=9.1.0
+_gcc_version=9.2.0
 _musl_version=1.1.23
 _linux_version=4.19
+_libucontext_version=0.9.0
 
 _triplet=x86_64-linux-musl
 _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
-version=0.31
-revision=3
+version=0.32
+revision=1
 archs="i686* x86_64 ppc64le"
 short_desc="Cross toolchain for x86_64 with musl"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -20,18 +21,20 @@ distfiles="
  ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
  ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz
  http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz
- ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
+ ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz
+ https://distfiles.adelielinux.org/source/libucontext/libucontext-${_libucontext_version}.tar.xz"
 checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0
+ ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
  8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa
- 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
+ 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1
+ 0d53a415a307ef175153bbe60a572c940a922cb736ce13530b666e7ec2795d68"
 
 lib32disabled=yes
 nocross=yes
 nopie=yes
 nodebug=yes
 create_wrksrc=yes
-hostmakedepends="flex perl python3"
+hostmakedepends="gcc-objc gcc-go flex perl python3"
 makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel isl15-devel"
 nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a
  libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a"
@@ -83,10 +86,10 @@ _gcc_bootstrap() {
 
 	cd ${wrksrc}/gcc-${_gcc_version}
 	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
-	_apply_patch -p0 ${FILESDIR}/non-nullness.patch
 	_apply_patch -p0 ${FILESDIR}/musl-ada.patch
 	_apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch
 	_apply_patch -p0 ${FILESDIR}/invalid_tls_model.patch
+	_apply_patch -p0 ${FILESDIR}/gccgo-musl.patch
 
 	sed -i '/m64=/s/lib64/lib/' gcc/config/i386/t-linux64
 	sed -i 's/lib64/lib/' gcc/config/i386/linux64.h
@@ -158,6 +161,22 @@ _musl_build() {
 	touch ${wrksrc}/.musl_build_done
 }
 
+_libucontext_build() {
+	[ -f ${wrksrc}/.libucontext_build_done ] && return 0
+
+	cd ${wrksrc}/libucontext-${_libucontext_version}
+	msg_normal "Building cross libucontext\n"
+
+	# it's ok if we're static only here
+	CC="${_triplet}-gcc" AR="${_triplet}-ar" AS="${_triplet}-as" \
+		CFLAGS="-Os -pipe ${_archflags}" \
+		make ARCH=x86_64 libucontext.a
+
+	cp libucontext.a ${_sysroot}/usr/lib
+
+	touch ${wrksrc}/.libucontext_build_done
+}
+
 _gcc_build() {
 	local _args
 	[ -f ${wrksrc}/.gcc_build_done ] && return 0
@@ -171,7 +190,7 @@ _gcc_build() {
 	_args="--prefix=/usr"
 	_args+=" --target=${_triplet}"
 	_args+=" --with-sysroot=${_sysroot}"
-	_args+=" --enable-languages=c,ada,c++,fortran,lto"
+	_args+=" --enable-languages=c,ada,c++,objc,obj-c++,go,fortran,lto"
 	_args+=" --enable-libada"
 	_args+=" --enable-lto"
 	_args+=" --enable-default-pie"
@@ -213,6 +232,7 @@ do_build() {
 	_gcc_bootstrap
 	_linux_headers
 	_musl_build
+	_libucontext_build
 	_gcc_build
 }
 
@@ -264,6 +284,11 @@ do_install() {
 	ln -svf libgnat-${_majorver}.so libgnat.so
 	rm -vf ${DESTDIR}/${_adalib}/libgna{rl,t}.so
 
+	# We need to build libatomic in target gcc as gccgo needs it to
+	# build... but it's not needed at runtime, so remove it from the
+	# destdir so it doesn't conflict with the libatomic package
+	rm -f ${DESTDIR}/${_sysroot}/usr/lib/libatomic.*
+
 	# Remove unnecessary stuff
 	rm -f ${DESTDIR}/usr/lib*/libiberty.a
 	rm -rf ${DESTDIR}/usr/share
diff --git a/srcpkgs/cross-x86_64-w64-mingw32/template b/srcpkgs/cross-x86_64-w64-mingw32/template
index 2e5bc454ba8..ccc30402e15 100644
--- a/srcpkgs/cross-x86_64-w64-mingw32/template
+++ b/srcpkgs/cross-x86_64-w64-mingw32/template
@@ -1,5 +1,5 @@
 # Template file for 'cross-x86_64-w64-mingw32'
-_gcc_version=9.1.0
+_gcc_version=9.2.0
 _binutils_version=2.32
 _gmp_version=6.1.2
 _mpfr_version=4.0.1
@@ -9,7 +9,7 @@ _mingw_version=6.0.0
 
 pkgname=cross-x86_64-w64-mingw32
 version=$_mingw_version
-revision=2
+revision=3
 archs="x86_64* i686*"
 create_wrksrc=yes
 hostmakedepends="flex perl python3"
@@ -31,7 +31,7 @@ distfiles="
  http://isl.gforge.inria.fr/isl-${_isl_version}.tar.bz2
  ${SOURCEFORGE_SITE}/project/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${_mingw_version}.tar.bz2"
 checksum="de38b15c902eb2725eac6af21183a5f34ea4634cb0bcef19612b50e5ed31072d
- 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0
+ ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
  6985c538143c1208dcb1ac42cedad6ff52e267b47e5f970183a3e75125b43c2e
  87b565e89a9a684fe4ebeeddb8399dce2599f9c9049854ca8c0dfbdea0e21912
  67874a60826303ee2fb6affc6dc0ddd3e749e9bfcb4c8655e3953d0458a6e16e
diff --git a/srcpkgs/crypto++/patches/arm-native.patch b/srcpkgs/crypto++/patches/arm-native.patch
deleted file mode 100644
index ff7678735d3..00000000000
--- a/srcpkgs/crypto++/patches/arm-native.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- GNUmakefile.orig
-+++ GNUmakefile
-@@ -125,23 +125,6 @@
-  endif
- endif
- 
--# Guard use of -march=native
--ifeq ($(GCC42_OR_LATER)$(IS_NETBSD),10)
--   CXXFLAGS += -march=native
--else ifneq ($(CLANG_COMPILER)$(INTEL_COMPILER),00)
--   CXXFLAGS += -march=native
--else
--  # GCC 3.3 and "unknown option -march="
--  # Ubuntu GCC 4.1 compiler crash with -march=native
--  # NetBSD GCC 4.8 compiler and "bad value (native) for -march= switch"
--  # Sun compiler is handled below
--  ifeq ($(SUN_COMPILER)$(IS_X64),01)
--    CXXFLAGS += -m64
--  else ifeq ($(SUN_COMPILER)$(IS_X86),01)
--    CXXFLAGS += -m32
--  endif # X86/X32/X64
--endif
--
- # Aligned access required for -O3 and above due to vectorization
- UNALIGNED_ACCESS := $(shell $(EGREP) -c "^[[:space:]]*//[[:space:]]*\#[[:space:]]*define[[:space:]]*CRYPTOPP_NO_UNALIGNED_DATA_ACCESS" config.h)
- ifneq ($(UNALIGNED_ACCESS),0)
diff --git a/srcpkgs/crypto++/patches/musl-soname-links.patch b/srcpkgs/crypto++/patches/musl-soname-links.patch
deleted file mode 100644
index 34f3b4fbfe6..00000000000
--- a/srcpkgs/crypto++/patches/musl-soname-links.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- GNUmakefile.orig	2017-09-22 10:27:03.000000000 +0000
-+++ GNUmakefile	2017-09-22 10:34:42.897537258 +0000
-@@ -581,6 +581,7 @@
- 	-$(CHMOD) 0755 $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_VERSION_SUFFIX)
- ifeq ($(HAS_SOLIB_VERSION),1)
- 	-$(LN) -sf libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so
-+	-$(LN) -sf libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_COMPAT_SUFFIX)
- 	$(LDCONF) $(DESTDIR)$(LIBDIR)
- endif
- endif
diff --git a/srcpkgs/crypto++/template b/srcpkgs/crypto++/template
index bce3e38a963..9fc17a0d4fd 100644
--- a/srcpkgs/crypto++/template
+++ b/srcpkgs/crypto++/template
@@ -1,20 +1,24 @@
-# Template build file for 'crypto++'.
+# Template file for 'crypto++'
 pkgname=crypto++
-version=565
-revision=3
+version=820
+revision=1
 create_wrksrc=yes
 build_style=gnu-makefile
 make_build_target="libcryptopp.so libcryptopp.a"
 hostmakedepends="unzip"
-short_desc="A free C++ class library of cryptographic schemes"
+short_desc="Free C++ class library of cryptographic schemes"
 maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSL-1.0"
 homepage="http://www.cryptopp.com/"
-license="Boost Software License 1.0, Public domain"
 distfiles="http://www.cryptopp.com/cryptopp${version}.zip"
-checksum=a75ef486fe3128008bbb201efee3dcdcffbe791120952910883b26337ec32c34
+checksum=03f0e2242e11b9d19b28d0ec5a3fa8ed5cc7b27640e6bed365744f593e858058
 
 CXXFLAGS="-DNDEBUG -fPIC"
 
+if [ "$XBPS_CROSS" ]; then
+	make_build_args="-f GNUmakefile-cross"
+fi
+
 post_extract() {
 	sed -i -e 's/^CXXFLAGS/#CXXFLAGS/' GNUmakefile
 }
diff --git a/srcpkgs/cryptsetup/template b/srcpkgs/cryptsetup/template
index 725b5838e13..c2629720de0 100644
--- a/srcpkgs/cryptsetup/template
+++ b/srcpkgs/cryptsetup/template
@@ -1,7 +1,7 @@
 # Template file for 'cryptsetup'
 pkgname=cryptsetup
-version=2.1.0
-revision=2
+version=2.2.1
+revision=1
 build_style=gnu-configure
 configure_args="--with-crypto_backend=openssl $(vopt_enable pwquality)
  --enable-cryptsetup-reencrypt --enable-libargon2"
@@ -9,12 +9,12 @@ hostmakedepends="pkg-config"
 makedepends="device-mapper-devel json-c-devel libressl-devel popt-devel
  libargon2-devel $(vopt_if pwquality 'libpwquality-devel')"
 short_desc="Setup virtual encryption devices under Linux dm-crypt"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Daniel Eyßer <daniel.eysser@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://gitlab.com/cryptsetup/cryptsetup"
 changelog="https://gitlab.com/cryptsetup/cryptsetup/raw/master/docs/v${version}-ReleaseNotes"
 distfiles="${KERNEL_SITE}/utils/cryptsetup/v${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a3eeb2741f8f3376d16585191f3c60e067dd987e096c3c4b073fab7748b1c897
+checksum=94e79a31ed38bdb0acd9af7ccca1605a2ac62ca850ed640202876b1ee11c1c61
 subpackages="libcryptsetup cryptsetup-devel"
 
 build_options="pwquality"
@@ -22,9 +22,9 @@ desc_option_pwquality="Enable support for checking password quality via libpwqua
 
 case $XBPS_TARGET_MACHINE in
 	*-musl)
-	configure_args+=" --enable-static-cryptsetup"
-	subpackages+=" cryptsetup-static"
-	;;
+		configure_args+=" --enable-static-cryptsetup"
+		subpackages+=" cryptsetup-static"
+		;;
 esac
 
 cryptsetup-static_package() {
diff --git a/srcpkgs/crystal/template b/srcpkgs/crystal/template
index c0a23e87e63..2bb0db5dc81 100644
--- a/srcpkgs/crystal/template
+++ b/srcpkgs/crystal/template
@@ -1,10 +1,10 @@
 # Template file for 'crystal'
 pkgname=crystal
-version=0.30.0
+version=0.31.1
 revision=1
 archs="x86_64* i686* aarch64* arm*"
 _shardsversion=0.9.0
-_bootstrapversion=0.30.0
+_bootstrapversion=0.31.1
 _bootstraprevision=1
 hostmakedepends="git llvm8"
 makedepends="gc-devel libatomic_ops pcre-devel libevent-devel libyaml-devel
@@ -19,7 +19,7 @@ homepage="https://crystal-lang.org/"
 distfiles="
  https://github.com/crystal-lang/crystal/archive/${version}.tar.gz
  https://github.com/crystal-lang/shards/archive/v${_shardsversion}.tar.gz"
-checksum="fc884970089e382344540676a9c5aa4f369c9a0f45d1858e079b4ce26878164a
+checksum="b4a51164763b891572492e2445d3a69b462675184ea0ccf06fcc57a070f07b80
  90f230c87cc7b94ca845e6fe34f2523edcadb562d715daaf98603edfa2a94d65"
 nocross="FIXME: someone needs to sort out the llvm --cxxflags for cross building"
 _crystalflags="--release --no-debug --progress"
@@ -32,11 +32,11 @@ if [ "$build_option_binary_bootstrap" ]; then
 	case "$XBPS_MACHINE" in
 	x86_64)
 		distfiles+=" https://github.com/crystal-lang/crystal/releases/download/${_bootstrapversion}/crystal-${_bootstrapversion}-${_bootstraprevision}-linux-x86_64.tar.gz"
-		checksum+=" 1995420a5d9146fd21322c96fe8bf87ddf73d5e0273b3c24c3c71d0e6f54cba2"
+		checksum+=" 308a5891322287852ba492e6e0dcc1484af361c189525349b6b98b531c551a65"
 		;;
 	i686)
 		distfiles+=" https://github.com/crystal-lang/crystal/releases/download/${_bootstrapversion}/crystal-${_bootstrapversion}-${_bootstraprevision}-linux-i686.tar.gz"
-		checksum+=" 81282e2fdaba77a31aeb682deac7cde545a72dfd0ad5b6554002b8fd861e9d3e"
+		checksum+=" 394bfe422bd2e74b6c5a99d31dcd873ec3f25c3f06834e1dd779efa2a36d3143"
 		;;
 	*)
 		broken="cannot be built on $XBPS_MACHINE"
diff --git a/srcpkgs/cups-filters/template b/srcpkgs/cups-filters/template
index 8c232894061..df7daba3a5e 100644
--- a/srcpkgs/cups-filters/template
+++ b/srcpkgs/cups-filters/template
@@ -1,7 +1,7 @@
 # Template file for 'cups-filters'
 pkgname=cups-filters
-version=1.25.2
-revision=1
+version=1.25.10
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static --with-rcdir=no --enable-avahi
  --with-browseremoteprotocols=DNSSD,CUPS
@@ -18,7 +18,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, MIT"
 homepage="https://wiki.linuxfoundation.org/openprinting/cups-filters"
 distfiles="http://openprinting.org/download/cups-filters/${pkgname}-${version}.tar.xz"
-checksum=c1f172afdc060d105a80ef8e8123fd2c0d9f2fabf8c7c38f5abdace576d82e0e
+checksum=4338dc314558f796ab5169a99440cc4fc4d65df33878dddc1525f7fe5683a45b
 
 lib32disabled=yes
 
diff --git a/srcpkgs/cups/patches/cups-no-gzip-man.patch b/srcpkgs/cups/patches/cups-no-gzip-man.patch
deleted file mode 100644
index b96df8963a0..00000000000
--- a/srcpkgs/cups/patches/cups-no-gzip-man.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- config-scripts/cups-manpages.m4.orig	2016-09-17 23:43:25.901857459 +0200
-+++ config-scripts/cups-manpages.m4	2016-09-17 23:43:53.797006791 +0200
-@@ -53,10 +53,10 @@ case "$uname" in
- 		;;
- 	Linux* | GNU* | Darwin*)
- 		# Linux, GNU Hurd, and macOS
--		MAN1EXT=1.gz
--		MAN5EXT=5.gz
--		MAN7EXT=7.gz
--		MAN8EXT=8.gz
-+		MAN1EXT=1
-+		MAN5EXT=5
-+		MAN7EXT=7
-+		MAN8EXT=8
- 		MAN8DIR=8
- 		;;
- 	*)
diff --git a/srcpkgs/cups/template b/srcpkgs/cups/template
index 0f3bbb1e894..d8f045937a2 100644
--- a/srcpkgs/cups/template
+++ b/srcpkgs/cups/template
@@ -1,6 +1,6 @@
 # Template file for 'cups'
 pkgname=cups
-version=2.2.12
+version=2.3.0
 revision=1
 hostmakedepends="automake avahi-libs-devel gnutls-devel pkg-config
  poppler-utils"
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://www.cups.org/"
 distfiles="https://github.com/apple/cups/releases/download/v${version}/cups-${version}-source.tar.gz"
-checksum=0f61ab449e4748a24c6ab355b481ff7691247a140d327b2b7526fce34b7f9aa8
+checksum=acaf0229cf008ea8f06353ffd1bbd62d71dbe88990dd3330650ef87edb95a1a5
 
 conf_files="/etc/pam.d/cups /etc/cups/*.conf /etc/xinetd.d/cups-lpd"
 make_dirs="
diff --git a/srcpkgs/cura-engine/patches/0001-Remove-default-none-so-that-it-compiles-in-gcc9.patch b/srcpkgs/cura-engine/patches/0001-Remove-default-none-so-that-it-compiles-in-gcc9.patch
deleted file mode 100644
index ce7d6a2a41b..00000000000
--- a/srcpkgs/cura-engine/patches/0001-Remove-default-none-so-that-it-compiles-in-gcc9.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 45cab061494467165ba515055a828cdd39567c0e Mon Sep 17 00:00:00 2001
-From: Jasper Chan <jasperchan515@gmail.com>
-Date: Mon, 5 Aug 2019 23:37:35 -0700
-Subject: [PATCH] Remove default(none) so that it compiles in gcc9
-
----
- src/layerPart.cpp | 2 +-
- src/support.cpp   | 6 +++---
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git src/layerPart.cpp src/layerPart.cpp
-index ba3e7157..d36a31f6 100644
---- src/layerPart.cpp
-+++ src/layerPart.cpp
-@@ -52,7 +52,7 @@ void createLayerParts(SliceMeshStorage& mesh, Slicer* slicer)
- {
-     const auto total_layers = slicer->layers.size();
-     assert(mesh.layers.size() == total_layers);
--#pragma omp parallel for default(none) shared(mesh, slicer) schedule(dynamic)
-+#pragma omp parallel for shared(mesh, slicer) schedule(dynamic)
-     // Use a signed type for the loop counter so MSVC compiles (because it uses OpenMP 2.0, an old version).
-     for (int layer_nr = 0; layer_nr < static_cast<int>(total_layers); layer_nr++)
-     {
-diff --git src/support.cpp src/support.cpp
-index 9bd531a6..0a43de2f 100644
---- src/support.cpp
-+++ src/support.cpp
-@@ -816,7 +816,7 @@ void AreaSupport::generateOverhangAreasForMesh(SliceDataStorage& storage, SliceM
-     }
- 
-     //Generate the actual areas and store them in the mesh.
--    #pragma omp parallel for default(none) shared(storage, mesh) schedule(dynamic)
-+    #pragma omp parallel for shared(storage, mesh) schedule(dynamic)
-     // Use a signed type for the loop counter so MSVC compiles (because it uses OpenMP 2.0, an old version).
-     for (int layer_idx = 1; layer_idx < static_cast<int>(storage.print_layer_count); layer_idx++)
-     {
-@@ -875,7 +875,7 @@ void AreaSupport::generateSupportAreasForMesh(SliceDataStorage& storage, const S
-     constexpr bool no_prime_tower = false;
-     xy_disallowed_per_layer[0] = storage.getLayerOutlines(0, no_support, no_prime_tower).offset(xy_distance);
-     // for all other layers (of non support meshes) compute the overhang area and possibly use that when calculating the support disallowed area
--    #pragma omp parallel for default(none) shared(xy_disallowed_per_layer, storage, mesh) schedule(dynamic)
-+    #pragma omp parallel for shared(xy_disallowed_per_layer, storage, mesh) schedule(dynamic)
-     // Use a signed type for the loop counter so MSVC compiles (because it uses OpenMP 2.0, an old version).
-     for (int layer_idx = 1; layer_idx < static_cast<int>(layer_count); layer_idx++)
-     {
-@@ -1070,7 +1070,7 @@ void AreaSupport::generateSupportAreasForMesh(SliceDataStorage& storage, const S
-         const int max_checking_layer_idx = std::max(0,
-                                                     std::min(static_cast<int>(storage.support.supportLayers.size()),
-                                                              static_cast<int>(layer_count - (layer_z_distance_top - 1))));
--#pragma omp parallel for default(none) shared(support_areas, storage) schedule(dynamic)
-+#pragma omp parallel for shared(support_areas, storage) schedule(dynamic)
-         // Use a signed type for the loop counter so MSVC compiles (because it uses OpenMP 2.0, an old version).
-         for (int layer_idx = 0; layer_idx < max_checking_layer_idx; layer_idx++)
-         {
--- 
-2.22.0
-
diff --git a/srcpkgs/cura-engine/template b/srcpkgs/cura-engine/template
index 63b00cda8e7..04184076df0 100644
--- a/srcpkgs/cura-engine/template
+++ b/srcpkgs/cura-engine/template
@@ -1,6 +1,6 @@
 # Template file for 'cura-engine'
 pkgname=cura-engine
-version=4.2.0
+version=4.3.0
 revision=1
 wrksrc="CuraEngine-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="AGPL-3.0-or-later"
 homepage="https://github.com/Ultimaker/CuraEngine"
 distfiles="https://github.com/Ultimaker/CuraEngine/archive/${version}.tar.gz"
-checksum=9e66c2840c46ad5ba91da872d73cc8d8d03bf163fe8ce9a81ec5188a6d7b4593
+checksum=4922a21ae90f95daae918baf21b51d94e36b8aac8e160b73c8088b993dd78ccb
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/cura-fdm-materials/template b/srcpkgs/cura-fdm-materials/template
index 79542c83947..153ec525b1f 100644
--- a/srcpkgs/cura-fdm-materials/template
+++ b/srcpkgs/cura-fdm-materials/template
@@ -1,6 +1,7 @@
 # Template file for 'cura-fdm-materials'
 pkgname=cura-fdm-materials
-version=4.2.0
+reverts="2019.08.21_1"
+version=4.3.0
 revision=1
 archs=noarch
 wrksrc="fdm_materials-${version}"
@@ -10,7 +11,7 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="CC0-1.0"
 homepage="https://github.com/Ultimaker/fdm_materials"
 distfiles="https://github.com/Ultimaker/fdm_materials/archive/${version}.tar.gz"
-checksum=96b2946ced9dec98fa73d82644dcaf6ce5801d9d9edc23d3f42b73a76fda0ef3
+checksum=b31b997cae18a85f8c913b4d1f0fe0a5a009f94689d4cc26682f6614d0dc3f09
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/cura/template b/srcpkgs/cura/template
index f4ff4f24b0f..31318e5aecf 100644
--- a/srcpkgs/cura/template
+++ b/srcpkgs/cura/template
@@ -1,6 +1,6 @@
 # Template file for 'cura'
 pkgname=cura
-version=4.2.1
+version=4.3.0
 revision=1
 archs=noarch
 wrksrc="Cura-${version}"
@@ -17,4 +17,4 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/Ultimaker/Cura"
 distfiles="https://github.com/Ultimaker/Cura/archive/${version}.tar.gz"
-checksum=e3b54947a8722dbbdef4510beb724d43952f6dbd1e7c32b52e1a3c9358be3fa1
+checksum=a27f5671250452d685069d8fe8018438ec32c096cd5b2c0d54ada7022ded1ccf
diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index a3bc8dcf862..7dc0542bc5d 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -1,10 +1,10 @@
 # Template file for 'curl'
 pkgname=curl
-version=7.65.3
+version=7.66.0
 revision=1
 build_style=gnu-configure
 configure_args="ac_cv_sizeof_off_t=8 --enable-threaded-resolver --enable-ipv6
- $(vopt_with rtmp) $(vopt_with gssapi) $(vopt_enable ldap) $(vopt_with gnuts)
+ $(vopt_with rtmp) $(vopt_with gssapi) $(vopt_enable ldap) $(vopt_with gnutls)
  $(vopt_enable ldap ldaps) $(vopt_with ssh libssh2) $(vopt_with ssl)
  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt --without-libidn2"
 hostmakedepends="groff perl pkg-config"
@@ -13,14 +13,14 @@ makedepends="nghttp2-devel zlib-devel $(vopt_if gnutls 'gnutls-devel')
  $(vopt_if rtmp 'librtmp-devel') $(vopt_if ssh 'libssh2-devel')
  $(vopt_if ssl 'libressl-devel')"
 depends="ca-certificates"
-checkdepends="python"
+checkdepends="python3"
 short_desc="Client that groks URLs"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://curl.haxx.se"
 changelog="https://curl.haxx.se/changes.html#${version//./_}"
 distfiles="${homepage}/download/${pkgname}-${version}.tar.bz2"
-checksum=0a855e83be482d7bc9ea00e05bdb1551a44966076762f9650959179c89fce509
+checksum=6618234e0235c420a21f4cb4c2dd0badde76e6139668739085a70c4e2fe7a141
 build_options="gnutls gssapi ldap rtmp ssh ssl"
 build_options_default="ssh ssl"
 vopt_conflict ssl gnutls
@@ -40,7 +40,7 @@ libcurl_package() {
 	shlib_provides="libcurl-gnutls.so.4"
 	pkg_install() {
 		vmove "usr/lib/*.so.*"
-		ln -sf libcurl.so.4.5.0 ${PKGDESTDIR}/usr/lib/libcurl-gnutls.so.4
+		ln -sf libcurl.so.4.6.0 ${PKGDESTDIR}/usr/lib/libcurl-gnutls.so.4
 	}
 }
 
diff --git a/srcpkgs/cutter/template b/srcpkgs/cutter/template
index 917510733ed..aa4c57ef4ad 100644
--- a/srcpkgs/cutter/template
+++ b/srcpkgs/cutter/template
@@ -1,7 +1,7 @@
 # Template file for 'cutter'
 pkgname=cutter
-version=1.8.3
-revision=2
+version=1.9.0
+revision=3
 build_wrksrc=src
 build_style=qmake
 hostmakedepends="pkg-config qt5-declarative-devel qt5-location-devel
@@ -13,4 +13,4 @@ maintainer="johannes <johannes.brechtmann@gmail.com>"
 license="GPL-3.0-only"
 homepage="https://github.com/radareorg/cutter"
 distfiles="https://github.com/radareorg/${pkgname}/archive/v${version}.tar.gz"
-checksum=71014ec5a00f1255978c8298a3e1a84fa968ac327188333b5ea684b515e61fda
+checksum=798aa696970030dfef2a1ecf2a058982089ac58db9b2ce008de5757b7fc20d84
diff --git a/srcpkgs/datamash/template b/srcpkgs/datamash/template
index 90a4512b2e5..cecbef14f95 100644
--- a/srcpkgs/datamash/template
+++ b/srcpkgs/datamash/template
@@ -1,6 +1,6 @@
 # Template file for 'datamash'
 pkgname=datamash
-version=1.4
+version=1.5
 revision=1
 build_style=gnu-configure
 short_desc="Command-line program that performs simple calculations on input files"
@@ -8,4 +8,4 @@ maintainer="oliver JH <ohemming@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/datamash/"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=fa44dd2d5456bcb94ef49dfc6cfe62c83fd53ac435119a85d34e6812f6e6472a
+checksum=226249d5fe54024f96404798778f45963a3041714229d4225cd5d9acdaba21ad
diff --git a/srcpkgs/dav1d/template b/srcpkgs/dav1d/template
index 5288ecb9415..ba6673de755 100644
--- a/srcpkgs/dav1d/template
+++ b/srcpkgs/dav1d/template
@@ -7,7 +7,7 @@ configure_args="-Dbuild_tests=false -Dbuild_asm=true -Dbuild_tools=true
  -Dfuzzing_engine=none -Dtestdata_tests=false"
 hostmakedepends="nasm"
 short_desc="Small and fast AV1 Decoder"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://code.videolan.org/videolan/dav1d"
 distfiles="https://code.videolan.org/videolan/dav1d/-/archive//${version}/dav1d-${version}.tar.bz2"
diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index bbf30e1ccdf..3280e83a5f2 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,6 +1,6 @@
 # Template file for 'dbeaver'
 pkgname=dbeaver
-version=6.1.3
+version=6.2.1
 revision=1
 archs="x86_64"
 hostmakedepends="apache-maven-bin"
@@ -9,7 +9,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="Apache-2.0"
 homepage="https://dbeaver.io"
 distfiles="https://github.com/dbeaver/dbeaver/archive/${version}.tar.gz"
-checksum=b7e0c74a912b60b26f7ab74a0917435c61198393207abc3a4ca08f7b7428a16d
+checksum=1a049c3a5aea98d371a1833bca19b08dd34a8a857513787a3843885e7c9fc2c2
 nopie=true
 
 do_build() {
diff --git a/srcpkgs/dconf-editor/template b/srcpkgs/dconf-editor/template
index cbd5ccc5d67..3617e12dacf 100644
--- a/srcpkgs/dconf-editor/template
+++ b/srcpkgs/dconf-editor/template
@@ -1,6 +1,6 @@
 # Template file for 'dconf-editor'
 pkgname=dconf-editor
-version=3.32.0
+version=3.34.1
 revision=1
 build_style=meson
 hostmakedepends="docbook-xsl glib-devel libxslt pkg-config vala"
@@ -10,4 +10,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Projects/dconf"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f19d1332ac27e23ef3dc2ed07ba4e4646d9d7f05e2e78748aa525a1320adbaba
+checksum=32ad3e899840e0b17d36a1c4dab60bfb1eedfcf4e46f3ae428076132f37ff335
diff --git a/srcpkgs/ddcutil/template b/srcpkgs/ddcutil/template
index 060d65b9b24..9c0103ed481 100644
--- a/srcpkgs/ddcutil/template
+++ b/srcpkgs/ddcutil/template
@@ -1,6 +1,6 @@
 # Template file for 'ddcutil'
 pkgname=ddcutil
-version=0.9.5
+version=0.9.7
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
@@ -11,7 +11,7 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.ddcutil.com"
 distfiles="https://github.com/rockowitz/ddcutil/archive/v${version}.tar.gz"
-checksum=aab0284d27c9537f995e8b79904b42099050ec05557b81ee29ff2045909e0933
+checksum=56a520a68e00e519a3ea5562238b2a67c0b9c4133a9b61983fe82b24e7066222
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) makedepends+=" libexecinfo-devel"
diff --git a/srcpkgs/ddgr/template b/srcpkgs/ddgr/template
index ec714a808b2..79c49b1e2f2 100644
--- a/srcpkgs/ddgr/template
+++ b/srcpkgs/ddgr/template
@@ -1,13 +1,13 @@
 # Template file for 'ddgr'
 pkgname=ddgr
-version=1.6
+version=1.7
 revision=1
 archs=noarch
 build_style=gnu-makefile
 depends="python3-requests"
-maintainer="Orphaned <orphan@voidlinux.org>"
 short_desc="DuckDuckGo from the terminal"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/jarun/ddgr"
 distfiles="https://github.com/jarun/ddgr/archive/v${version}.tar.gz"
-checksum=eae7ff1ab44dfda168a8bbe46593e80ca4a26ab45a9efbab13e6f466349e0e5c
+checksum=1e3d01dc71337b2a59b96ab89ee422a7ef9e6ddcd42813ac08d57db194bc4fea
diff --git a/srcpkgs/debootstrap/template b/srcpkgs/debootstrap/template
index e4316aaa7ff..f3deb671ad9 100644
--- a/srcpkgs/debootstrap/template
+++ b/srcpkgs/debootstrap/template
@@ -1,6 +1,6 @@
 # Template file for 'debootstrap'
 pkgname=debootstrap
-version=1.0.115
+version=1.0.116
 revision=1
 build_style=fetch
 depends="binutils gnupg gzip tar wget xz"
@@ -9,13 +9,13 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="http://packages.qa.debian.org/d/debootstrap.html"
 distfiles="${DEBIAN_SITE}/main/d/${pkgname}/${pkgname}_${version}_all.deb
- ${DEBIAN_SITE}/main/d/debian-archive-keyring/debian-archive-keyring_2017.5_all.deb"
-checksum="d7955a6e88bec5f86a531429b1819d49c35b0d8cf49b9cf7bd901d86c6e41f89
- 6a38407c47fefad2d8459dc271d109f1841ee857f993ed3ce2884e33f7f0f734"
+ ${DEBIAN_SITE}/main/d/debian-archive-keyring/debian-archive-keyring_2019.1_all.deb"
+checksum="e5b060eb86c8955d91e7193d796b9928dd7d803bdd61f8df008f42a8fe2f8b69
+ 9cefd8917f3d97a999c136aa87f04a3024408b5bc1de470de7d6dfa5e4bd4361"
 
 do_install() {
 	ar p ${pkgname}_${version}_all.deb data.tar.gz | tar xvzf - -C ${DESTDIR}
-	ar p debian-archive-keyring_2017.5_all.deb data.tar.xz | tar xvJf - -C ${DESTDIR} ./usr/share/keyrings/debian-archive-keyring.gpg
+	ar p debian-archive-keyring_2019.1_all.deb data.tar.xz | tar xvJf - -C ${DESTDIR} ./usr/share/keyrings/debian-archive-keyring.gpg
 	mv ${DESTDIR}/usr/sbin ${DESTDIR}/usr/bin
 	sed -i 's|export PATH|export PATH="/usr/sbin:/sbin:/usr/bin:/bin"|' ${DESTDIR}/usr/bin/debootstrap
 	vlicense ${DESTDIR}/usr/share/doc/debootstrap/copyright LICENSE
diff --git a/srcpkgs/dejagnu/template b/srcpkgs/dejagnu/template
index e8025073628..5a2572644c1 100644
--- a/srcpkgs/dejagnu/template
+++ b/srcpkgs/dejagnu/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 makedepends="expect-devel"
 depends="expect"
 short_desc="Framework for running test suites on GNU tools"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/dejagnu/"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/delta/template b/srcpkgs/delta/template
new file mode 100644
index 00000000000..ca651c2dfc8
--- /dev/null
+++ b/srcpkgs/delta/template
@@ -0,0 +1,15 @@
+# Template file for 'delta'
+pkgname=delta
+version=0.0.13
+revision=1
+build_style=cargo
+short_desc="Syntax-highlighting pager for git"
+maintainer="Andrew Benson <abenson+void@gmail.com>"
+license="MIT"
+homepage="https://github.com/dandavison/delta"
+distfiles="${homepage}/archive/${version}.tar.gz"
+checksum=60e8d1dc7710d892c5e612c608baa29e357df4bd895efc4e01e453e2336a47d6
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/deluge/files/deluge-web/run b/srcpkgs/deluge/files/deluge-web/run
index 44c75c99053..b90477d7a45 100644
--- a/srcpkgs/deluge/files/deluge-web/run
+++ b/srcpkgs/deluge/files/deluge-web/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 sv check deluged >/dev/null || exit 1
-exec chpst -u deluge:deluge deluge-web 2>&1
+exec chpst -u deluge:deluge deluge-web -d 2>&1
diff --git a/srcpkgs/deluge/template b/srcpkgs/deluge/template
index dee8b8d96dd..6dc7f26184d 100644
--- a/srcpkgs/deluge/template
+++ b/srcpkgs/deluge/template
@@ -1,7 +1,7 @@
 # Template file for 'deluge'
 pkgname=deluge
 version=2.0.3
-revision=2
+revision=3
 archs=noarch
 build_style=python3-module
 pycompile_module="deluge"
diff --git a/srcpkgs/delve/template b/srcpkgs/delve/template
index fc5e2b03d12..089343cab3d 100644
--- a/srcpkgs/delve/template
+++ b/srcpkgs/delve/template
@@ -1,20 +1,30 @@
 # Template file for 'delve'
 pkgname=delve
-version=1.2.0
+version=1.3.0
 revision=1
+# Version bump to 1.3.0 has been done after the release tag, so using
+# specific commit for this version.
+_commit=dd3c2d63cc5b2aa84d7970eca0c91b45c71e9dd9
 build_style=go
-go_import_path=github.com/go-delve/delve/cmd/dlv
+go_import_path="github.com/go-delve/delve"
+go_package="${go_import_path}/cmd/dlv"
 short_desc="Debugger for the Go programming language"
 maintainer="Renato Aguiar <renato@renag.me>"
 license="MIT"
 homepage="https://github.com/go-delve/delve"
-distfiles="https://github.com/go-delve/delve/archive/v${version}.tar.gz"
-checksum=eebf6cd9647a2c3987fd38e8dd6e0e968ff41300cab20dc178a789a77b92627d
+distfiles="https://github.com/go-delve/delve/archive/${_commit}.tar.gz"
+checksum=1a3ac2e709dd5a373c0c4379f614b2e68c2e8fd848a725b9a97b8aaa25910319
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*|arm*|aarch64*|ppc*) broken=yes ;;
 esac
 
+post_extract() {
+	mv "${XBPS_BUILDDIR}/delve-${_commit}" "$wrksrc"
+}
+
 post_install() {
 	vlicense LICENSE
+	vmkdir "usr/share/doc/${pkgname}"
+	vcopy Documentation/* "usr/share/doc/${pkgname}"
 }
diff --git a/srcpkgs/deutex/template b/srcpkgs/deutex/template
index 7c232bbe83d..88846dd7f70 100644
--- a/srcpkgs/deutex/template
+++ b/srcpkgs/deutex/template
@@ -1,16 +1,16 @@
 # Template file for 'deutex'
 pkgname=deutex
-version=5.1.2
-revision=3
+version=5.2.1
+revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config asciidoc"
 makedepends="libpng-devel"
 short_desc="WAD composer for DOOM and others"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://github.com/Doom-Utils/deutex"
 distfiles="https://github.com/Doom-Utils/deutex/archive/v${version}.tar.gz"
-checksum=b91b1cd40098cc8f5e1e9a18ea4b5b785a4f54ff2ce5c6d9524f22ca84a83bd0
+checksum=5b4b2d5a0c85fcccb206a94685ecf5558a891ee6ce9e0cdbf96d4c4a129d5bcc
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/devedeng/template b/srcpkgs/devedeng/template
index 3a28ed5e49b..d971b2e207b 100644
--- a/srcpkgs/devedeng/template
+++ b/srcpkgs/devedeng/template
@@ -1,6 +1,6 @@
 # Template file for 'devedeng'
 pkgname=devedeng
-version=4.14.0
+version=4.16.0
 revision=1
 archs=noarch
 build_style=python3-module
@@ -9,8 +9,8 @@ hostmakedepends="python3"
 depends="cdrtools desktop-file-utils dvdauthor ffmpeg gtk+3
  hicolor-icon-theme python3-gobject python3-setuptools vcdimager"
 short_desc="Create video DVDs and CDs"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="http://www.rastersoft.com/programas/devede.html"
 distfiles="https://gitlab.com/rastersoft/devedeng/-/archive/${version}/${pkgname}-${version}.tar.bz2"
-checksum=9e443e66bcb515008584061ee52a8a8a7404343befeb747647725544adb8d973
+checksum=fe2715aa8f73133fc2d809d840fd662dcf9776fcedfb68169984af2e762b5164
diff --git a/srcpkgs/dhcpcd/template b/srcpkgs/dhcpcd/template
index b6214863908..35b108a355f 100644
--- a/srcpkgs/dhcpcd/template
+++ b/srcpkgs/dhcpcd/template
@@ -1,8 +1,9 @@
 # Template file for 'dhcpcd'
 pkgname=dhcpcd
-version=8.0.2
+version=8.0.6
 revision=1
 build_style=configure
+make_check_target=test
 configure_args="--prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc --rundir=/run"
 hostmakedepends="ntp pkg-config"
 makedepends="eudev-libudev-devel"
@@ -11,7 +12,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://roy.marples.name/projects/dhcpcd"
 distfiles="https://roy.marples.name/downloads/dhcpcd/dhcpcd-${version}.tar.xz"
-checksum=33a26ad561546cd2cfe1e6de6352a85df72b41c37def8c7eb00e90e57c627a5c
+checksum=66b50199ed83bf502af3fab9ac001b417f0fac7e69c92d97a9c41499cebabd4f
 lib32disabled=yes
 conf_files=/etc/dhcpcd.conf
 
diff --git a/srcpkgs/dialog/template b/srcpkgs/dialog/template
index 287735b3bf9..a257a5b4485 100644
--- a/srcpkgs/dialog/template
+++ b/srcpkgs/dialog/template
@@ -9,7 +9,7 @@ build_style=gnu-configure
 configure_args="--with-ncursesw --disable-nls"
 makedepends="ncurses-devel"
 short_desc="Tool to display dialog boxes from shell scripts"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only"
 homepage="https://invisible-island.net/dialog/"
 distfiles="https://invisible-mirror.net/archives/${pkgname}/${pkgname}-${_distver}-${_date}.tgz"
diff --git a/srcpkgs/diffr/template b/srcpkgs/diffr/template
new file mode 100644
index 00000000000..96d43f10ed0
--- /dev/null
+++ b/srcpkgs/diffr/template
@@ -0,0 +1,18 @@
+# Template file for 'diffr'
+pkgname=diffr
+version=0.1.2
+revision=1
+build_style=cargo
+short_desc="LCS based diff highlighting tool to ease code review from your terminal"
+maintainer="Andy Weidenbaum <archbaum@gmail.com>"
+license="MIT"
+homepage="https://github.com/mookid/diffr"
+changelog="https://github.com/mookid/diffr/raw/master/CHANGELOG.md"
+distfiles="https://github.com/mookid/diffr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
+checksum=76767fec7bcec1f86ed0c21c05ce4fee3ac41e00f2b88e91249102b02c0f7307
+
+do_install() {
+	vbin "target/${RUST_TARGET}/release/diffr"
+	vlicense LICENSE.txt
+	vdoc README.md
+}
diff --git a/srcpkgs/digikam/template b/srcpkgs/digikam/template
index 782d55424a2..b35d66bed0b 100644
--- a/srcpkgs/digikam/template
+++ b/srcpkgs/digikam/template
@@ -1,6 +1,6 @@
 # Template file for 'digikam'
 pkgname=digikam
-version=6.2.0
+version=6.3.0
 revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config bison flex"
@@ -18,4 +18,6 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.digikam.org"
 distfiles="${KDE_SITE}/digikam/${version}/digikam-${version}.tar.xz"
-checksum=28762ea0f03a82e3b2473c0682a358c9b83f5013aec827dd5ab6556a1f29baeb
+checksum=94dc05e3f9c08b83419010d1689c7b0398d4eced4fef42375249c974622874ba
+
+CXXFLAGS="-Wl,-lpthread"
diff --git a/srcpkgs/diskus/template b/srcpkgs/diskus/template
index b125ef984ec..c171cbacb56 100644
--- a/srcpkgs/diskus/template
+++ b/srcpkgs/diskus/template
@@ -1,14 +1,14 @@
 # Template file for 'diskus'
 pkgname=diskus
-version=0.5.0
+version=0.6.0
 revision=1
 build_style=cargo
-short_desc="A minimal, fast alternative to du -sh"
+short_desc="Minimal, fast alternative to du -sh"
 maintainer="travankor <travankor@tuta.io>"
 license="Apache-2.0, MIT"
 homepage="https://github.com/sharkdp/diskus"
 distfiles="https://github.com/sharkdp/diskus/archive/v${version}.tar.gz"
-checksum=90d785f3f24899a6adcc497846f29112812a887c8042d0657d6b258d5a5352bc
+checksum=661687edefa3218833677660a38ccd4e2a3c45c4a66055c5bfa4667358b97500
 
 post_install() {
 	vlicense LICENSE-MIT
diff --git a/srcpkgs/dispcalGUI/template b/srcpkgs/dispcalGUI/template
index d871b860cbe..42960daa3d8 100644
--- a/srcpkgs/dispcalGUI/template
+++ b/srcpkgs/dispcalGUI/template
@@ -1,6 +1,6 @@
 # Template file for 'dispcalGUI'
 pkgname=dispcalGUI
-version=3.8.5.0
+version=3.8.6.0
 revision=1
 _name="DisplayCAL"
 wrksrc="${_name}-${version}"
@@ -14,7 +14,7 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="GPL-3.0-or-later"
 homepage="https://displaycal.net/"
 distfiles="${SOURCEFORGE_SITE}/dispcalgui/${_name}-${version}.tar.gz"
-checksum=20b0db965f0e25f237000ba299b5ddf8035b05327dd1b2505792465d182bd440
+checksum=7be913f4a13f4461f5cdcea57395ba99ad4efaa6206e891ed1c69c78626305fb
 
 pre_configure() {
 	sed -i 's|MimeType=model/vrml;x-world/x-vrml;|MimeType=model/vrml;|' misc/displaycal-vrml-to-x3d-converter.desktop
diff --git a/srcpkgs/dive/template b/srcpkgs/dive/template
index b21319204e1..0307068e30c 100644
--- a/srcpkgs/dive/template
+++ b/srcpkgs/dive/template
@@ -1,6 +1,6 @@
 # Template file for 'dive'
 pkgname=dive
-version=0.7.2
+version=0.8.1
 revision=1
 build_style=go
 go_import_path="github.com/wagoodman/dive"
@@ -10,7 +10,7 @@ maintainer="Cameron Nemo <camerontnorman@gmail.com>"
 license="MIT"
 homepage="https://github.com/wagoodman/dive"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=2ec6d77b662e0d709f6fc4282dbd8f0d3f6509f78133451b6b17d9b8fb594cf1
+checksum=6663960b974a6aad1d1271fb04cdaa9c527adbffdb37b9ab62fa9ad323f0bcda
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/dkms/files/kernel.d/dkms.postinst b/srcpkgs/dkms/files/kernel.d/dkms.postinst
index 8c83c4723a0..314f2454bda 100644
--- a/srcpkgs/dkms/files/kernel.d/dkms.postinst
+++ b/srcpkgs/dkms/files/kernel.d/dkms.postinst
@@ -17,6 +17,8 @@ if [ ! -e /lib/modules/${VERSION}/build/include ] ; then
 	exit 0
 fi
 
+export IGNORE_CC_MISMATCH=1
+
 if [ ! -f /lib/modules/${VERSION}/build/scripts/basic/fixdep ] ; then
 	make -C /lib/modules/${VERSION}/build scripts
 fi
diff --git a/srcpkgs/dkms/template b/srcpkgs/dkms/template
index d7aa2ef86db..73749260055 100644
--- a/srcpkgs/dkms/template
+++ b/srcpkgs/dkms/template
@@ -1,7 +1,7 @@
 # Template file for 'dkms'
 pkgname=dkms
 version=2.7.1
-revision=1
+revision=2
 conf_files="/etc/dkms/framework.conf"
 depends="bash kmod gcc make coreutils linux-headers"
 short_desc="Dynamic Kernel Modules System"
diff --git a/srcpkgs/dma/patches/musl_sys_param_h.patch b/srcpkgs/dma/patches/musl_sys_param_h.patch
deleted file mode 100644
index 170b6895bdc..00000000000
--- a/srcpkgs/dma/patches/musl_sys_param_h.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Include <sys/param.h> for roundup() declaration with musl libc
-
---- dns.c	2013-06-03 16:03:15.000000000 +0200
-+++ dns.c	2015-08-07 14:53:01.499713464 +0200
-@@ -33,6 +33,7 @@
-  */
- 
- #include <sys/types.h>
-+#include <sys/param.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
- #include <arpa/nameser.h>
diff --git a/srcpkgs/dma/template b/srcpkgs/dma/template
index eeae971c688..d521dcfc0b7 100644
--- a/srcpkgs/dma/template
+++ b/srcpkgs/dma/template
@@ -1,17 +1,17 @@
 # Template file for 'dma'
 pkgname=dma
-version=0.11
-revision=10
+version=0.12
+revision=1
 conf_files="/etc/dma/*.conf"
 make_dirs="/var/spool/dma 2775 root mail"
 hostmakedepends="flex"
 makedepends="libressl-devel"
 short_desc="Small Mail Transport Agent (MTA), designed for home and office use"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="BSD"
+license="BSD-3-Clause"
 homepage="https://github.com/corecode/dma"
 distfiles="https://github.com/corecode/dma/archive/v${version}.tar.gz"
-checksum=288bd57f17aba696b6423b1fa0cd0f7d9b7228d32811f1cd7b821d5f020051b8
+checksum=054a40203d43bc1182dcadf2375ccf01944329dce472444acb42d56cf01de367
 system_accounts="mail"
 
 provides="smtp-server-0_1 smtp-forwarder-0_1"
@@ -20,6 +20,7 @@ replaces="smtp-server>=0 smtp-forwarder>=0"
 do_build() {
 	make PREFIX=/usr SBIN=/usr/bin CC=$CC LEX=flex ${makejobs}
 }
+
 do_install() {
 	vmkdir usr/bin
 	make PREFIX=/usr SBIN=/usr/bin DESTDIR=${DESTDIR} sendmail-link mailq-link install-etc install
diff --git a/srcpkgs/dmd/template b/srcpkgs/dmd/template
index 2cf833eb56e..e96f79cdf8a 100644
--- a/srcpkgs/dmd/template
+++ b/srcpkgs/dmd/template
@@ -1,12 +1,12 @@
 # Template file for 'dmd'
 pkgname=dmd
-version=2.085.0
+version=2.087.1
 revision=1
 create_wrksrc=yes
 makedepends="dmd2.081 git"
 depends="libphobos>=${version} gcc"
 short_desc="Digital Mars D compiler"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="streaks <assemblyislaw@gmail.com>"
 license="BSL-1.0"
 homepage="http://www.digitalmars.com/d/2.0/"
 distfiles="
@@ -14,10 +14,10 @@ distfiles="
  https://github.com/dlang/druntime/archive/v${version}.tar.gz>druntime-${version}.tar.gz
  https://github.com/dlang/phobos/archive/v${version}.tar.gz>phobos-${version}.tar.gz
  http://downloads.dlang.org/releases/2.x/${version}/dmd.${version}.linux.tar.xz"
-checksum="5e45e9ccf07fb0b500f63500b143f8b66dbaf3f4348d2a5250799fc2d22f8225
- b490b04afbd771a51188fd864497b5bf01b28d5a49fb06da420036fc8ea2f7d2
- c2018c8275cf83b542a9cc2c8dc99a770e9b8b89e638f8971dc9945bd0e5385e
- 25d53bb87ff337f99984fcf77d4216d0b9af53ce9dfaf1c3fadf9c3959338487"
+checksum="4239b8b6dc09acf3cdaa1c924f3a2b3cddd0fb532f817c4027b8966f1e96b3a8
+ 19b7f18e11934a582d67dcb39c3ea91d5c24444c3be311f93160e0016ccc58fa
+ 84c7120e972255b4c66c532ff771ecbbb615b87140d0ffcb214d04b0d418f28f
+ c3c6cc865f5aa66dce4244467797b596ed0ada2bde93031350dc36713733cfc1"
 conf_files="/etc/dmd.conf"
 provides="d-compiler-${version}_${revision}"
 conflicts="dmd-bootstrap dmd2.081"
@@ -74,7 +74,7 @@ do_install() {
 dmd-doc_package() {
 	short_desc="Documentation and sample code for D programming language"
 	replaces="dmd-docs>=0"
-	license="Boost License"
+	license="BSL-1.0"
 
 	pkg_install() {
 		cd dmd2
@@ -91,7 +91,7 @@ dmd-doc_package() {
 
 libphobos_package() {
 	short_desc+=" - standard library"
-	license="Boost License"
+	license="BSL-1.0"
 	conflicts="dmd-bootstrap"
 	pkg_install() {
 		vinstall ${wrksrc}/druntime/generated/linux/release/$_archbits/libdruntime.a 644 usr/lib libdruntime.a
diff --git a/srcpkgs/dmenu-wayland/template b/srcpkgs/dmenu-wayland/template
index baa380dca42..d36244bbbe7 100644
--- a/srcpkgs/dmenu-wayland/template
+++ b/srcpkgs/dmenu-wayland/template
@@ -1,9 +1,9 @@
 # Template file for 'dmenu-wayland'
 pkgname=dmenu-wayland
 version=0.1
-revision=1
+revision=2
 build_style=meson
-hostmakedepends="cmake pkg-config"
+hostmakedepends="cmake pkg-config wayland-devel"
 makedepends="cairo-devel glib-devel gobject-introspection libxkbcommon-devel
  pango-devel wayland-devel wayland-protocols"
 short_desc="Dmenu for wayland-compositors"
@@ -12,7 +12,6 @@ license="MIT"
 homepage="https://github.com/nyyManni/dmenu-wayland"
 distfiles="https://github.com/nyyManni/dmenu-wayland/archive/v${version}.tar.gz"
 checksum=dcbc70156e138b2bb8788aeebf75af14f75e188ed78865840e341b5375ed6614
-nocross=yes #wait for wayland to use meson https://gitlab.freedesktop.org/wayland/weston/merge_requests/157
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/dmenu/template b/srcpkgs/dmenu/template
index 8eaa67ef39c..045b64e1635 100644
--- a/srcpkgs/dmenu/template
+++ b/srcpkgs/dmenu/template
@@ -4,7 +4,7 @@ version=4.9
 revision=1
 makedepends="libXinerama-devel libXft-devel freetype-devel"
 short_desc="Generic menu for X"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Lugubris <lugubris@disroot.org>"
 license="MIT"
 homepage="https://tools.suckless.org/dmenu/"
 distfiles="https://dl.suckless.org/tools/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/dnscrypt-proxy/template b/srcpkgs/dnscrypt-proxy/template
index b89455ac3e1..1ff59848058 100644
--- a/srcpkgs/dnscrypt-proxy/template
+++ b/srcpkgs/dnscrypt-proxy/template
@@ -1,17 +1,17 @@
 # Template file for 'dnscrypt-proxy'
 pkgname=dnscrypt-proxy
-version=2.0.25
+version=2.0.27
 revision=1
 build_style=go
 go_import_path=github.com/jedisct1/dnscrypt-proxy
 go_package="${go_import_path}/dnscrypt-proxy"
 short_desc="DNS proxy that encrypts queries"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Lugubris <lugubris@disroot.org>"
 license="ISC"
 homepage="https://github.com/jedisct1/dnscrypt-proxy"
 changelog="https://raw.githubusercontent.com/jedisct1/dnscrypt-proxy/master/ChangeLog"
 distfiles="https://github.com/jedisct1/dnscrypt-proxy/archive/${version}.tar.gz"
-checksum=774696004c9e306e1723b4cbbe66a961128a335543d318d0786492ce69b906fa
+checksum=a501f44af39cb43e00489ef9e6678aa8adba2bc98f9042dd61ce60e9ad074d5a
 conf_files="/etc/dnscrypt-proxy.toml"
 system_accounts="dnscrypt_proxy"
 make_dirs="/var/log/dnscrypt-proxy 0750 dnscrypt_proxy dnscrypt_proxy"
diff --git a/srcpkgs/dnsmasq/patches/nettle35.patch b/srcpkgs/dnsmasq/patches/nettle35.patch
new file mode 100644
index 00000000000..90e83d2e00d
--- /dev/null
+++ b/srcpkgs/dnsmasq/patches/nettle35.patch
@@ -0,0 +1,42 @@
+From: Vladislav Grishenko <themiron@mail.ru>
+Date: Wed, 26 Jun 2019 15:27:11 +0000 (+0500)
+Subject: Fix build with libnettle 3.5
+X-Git-Url: http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commitdiff_plain;h=ab73a746a0d6fcac2e682c5548eeb87fb9c9c82e;hp=69bc94779c2f035a9fffdb5327a54c3aeca73ed5
+
+Fix build with libnettle 3.5
+---
+
+diff --git a/src/crypto.c b/src/crypto.c
+index ebb871e..fecc64a 100644
+--- src/crypto.c
++++ src/crypto.c
+@@ -275,6 +275,10 @@ static int dnsmasq_ecdsa_verify(struct blockdata *key_data, unsigned int key_len
+   static struct ecc_point *key_256 = NULL, *key_384 = NULL;
+   static mpz_t x, y;
+   static struct dsa_signature *sig_struct;
++#if NETTLE_VERSION_MAJOR == 3 && NETTLE_VERSION_MINOR < 4
++#define nettle_get_secp_256r1() (&nettle_secp_256r1)
++#define nettle_get_secp_384r1() (&nettle_secp_384r1)
++#endif
+
+   if (!sig_struct)
+     {
+@@ -294,7 +298,7 @@ static int dnsmasq_ecdsa_verify(struct blockdata *key_data, unsigned int key_len
+          if (!(key_256 = whine_malloc(sizeof(struct ecc_point))))
+            return 0;
+
+-         nettle_ecc_point_init(key_256, &nettle_secp_256r1);
++         nettle_ecc_point_init(key_256, nettle_get_secp_256r1());
+        }
+
+       key = key_256;
+@@ -307,7 +311,7 @@ static int dnsmasq_ecdsa_verify(struct blockdata *key_data, unsigned int key_len
+          if (!(key_384 = whine_malloc(sizeof(struct ecc_point))))
+            return 0;
+
+-         nettle_ecc_point_init(key_384, &nettle_secp_384r1);
++         nettle_ecc_point_init(key_384, nettle_get_secp_384r1());
+        }
+
+       key = key_384;
+
diff --git a/srcpkgs/docker-compose/patches/pyyaml_version.patch b/srcpkgs/docker-compose/patches/pyyaml_version.patch
new file mode 100644
index 00000000000..77c69fd89a5
--- /dev/null
+++ b/srcpkgs/docker-compose/patches/pyyaml_version.patch
@@ -0,0 +1,13 @@
+diff --git a/setup.py b/setup.py
+index 8371cc756ee0..5e27ab7c5d0e 100644
+--- a/setup.py
++++ b/setup.py
+@@ -32,7 +32,7 @@ def find_version(*file_paths):
+ install_requires = [
+     'cached-property >= 1.2.0, < 2',
+     'docopt >= 0.6.1, < 0.7',
+-    'PyYAML >= 3.10, < 4.3',
++    'PyYAML >= 3.10',
+     'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0, < 2.21',
+     'texttable >= 0.9.0, < 0.10',
+     'websocket-client >= 0.32.0, < 1.0',
diff --git a/srcpkgs/docker-compose/template b/srcpkgs/docker-compose/template
index eaa967790b6..c3383fdf1ad 100644
--- a/srcpkgs/docker-compose/template
+++ b/srcpkgs/docker-compose/template
@@ -1,7 +1,7 @@
 # Template file for 'docker-compose'
 pkgname=docker-compose
-version=1.24.0
-revision=1
+version=1.24.1
+revision=2
 archs=noarch
 wrksrc="compose-${version}"
 build_style=python3-module
@@ -16,7 +16,9 @@ maintainer="pancake <pancake@nopcode.org>"
 license="Apache-2.0"
 homepage="https://docs.docker.com/compose/"
 distfiles="https://github.com/docker/compose/archive/${version}.tar.gz"
-checksum=31933e401d295812617f23377f63fc2b8da13d8456b61a60cec0e02afcad5672
+checksum=63a0e0d3819ff77aebd3d5ea30f77b36475ed522c4dabed2eb10636e35aa9370
+patch_args="-Np1"
+
 
 pre_build() {
 	# relax texttable and requests upper bound
diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template
index f23caafc3f8..d9e389417c6 100644
--- a/srcpkgs/docker/template
+++ b/srcpkgs/docker/template
@@ -1,6 +1,6 @@
 # Template file for 'docker'
 pkgname=docker
-version=19.03.1
+version=19.03.3
 revision=1
 wrksrc="${pkgname}-ce-${version}"
 hostmakedepends="git go pkg-config curl cmake"
@@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="http://www.docker.io"
 distfiles="https://github.com/docker/docker-ce/archive/v${version}.tar.gz"
-checksum=dad9123e203751ce9981bc34773721593655231c32412e310e748b18f10f0053
+checksum=63b0d28608f32573b9c03fa46247c6f959e9c08133ddf30a71276919de0194c0
 
 # These are required at run-time.
 depends+=" iptables xz git"
diff --git a/srcpkgs/dolphin/template b/srcpkgs/dolphin/template
index 0d5f02f3788..ab48334e3de 100644
--- a/srcpkgs/dolphin/template
+++ b/srcpkgs/dolphin/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin'
 pkgname=dolphin
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://userbase.kde.org/Dolphin"
 distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=fd44714541ae7082d4615e441242afdba2d7810a373bfc8c3e64ff5c7db0a0f0
+checksum=0c56515737fc0f96020b3c157a93023095d1a1e23637e7670e068c6c286bbc3b
 
 if [ "$CROSS_BUILD" ]; then
 	LDFLAGS=" -Wl,-rpath-link,../bin"
diff --git a/srcpkgs/doomretro/template b/srcpkgs/doomretro/template
index a247a172b0c..400fe78615d 100644
--- a/srcpkgs/doomretro/template
+++ b/srcpkgs/doomretro/template
@@ -1,6 +1,6 @@
 # Template file for 'doomretro'
 pkgname=doomretro
-version=2.9.3
+version=3.0.4
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -10,4 +10,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.doomretro.com"
 distfiles="https://github.com/bradharding/doomretro/archive/v${version}.tar.gz"
-checksum=4e72f7b15a85be187c33e2e304c0d3306abfc4459e41d1e0e1f5413c336173e2
+checksum=60887a4edc3013cad5965ed2f39c5a3e114ef182c3dc83055caf3b682e2a638b
diff --git a/srcpkgs/dos2unix/template b/srcpkgs/dos2unix/template
index a354c26d2d2..862b49c8314 100644
--- a/srcpkgs/dos2unix/template
+++ b/srcpkgs/dos2unix/template
@@ -1,14 +1,14 @@
 # Template file for 'dos2unix'
 pkgname=dos2unix
-version=7.4.0
+version=7.4.1
 revision=1
 build_style=gnu-makefile
+short_desc="Text file format converter"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="2-clause-BSD"
+license="BSD-2-Clause"
 homepage="http://waterlan.home.xs4all.nl/dos2unix.html"
-short_desc="Text file format converter"
 distfiles="http://waterlan.home.xs4all.nl/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=bac765abdbd95cdd87a71989d4382c32cf3cbfeee2153f0086cb9cf18261048a
+checksum=1cd58a60b03ed28fa39046102a185c5e88c4f7665e1e0417c25de7f8b9f78623
 
 post_install() {
 	rm -rf ${DESTDIR}/usr/share/doc/${pkgname}-${version}
diff --git a/srcpkgs/dosbox/template b/srcpkgs/dosbox/template
index f9ecd89eefc..4518697790a 100644
--- a/srcpkgs/dosbox/template
+++ b/srcpkgs/dosbox/template
@@ -13,9 +13,6 @@ homepage="http://www.dosbox.com"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${wrksrc}.tar.gz"
 checksum=c0d13dd7ed2ed363b68de615475781e891cd582e8162b5c3669137502222260a
 
-pre_configure() {
-	sed -i 's/png_check_sig/png_sig_cmp/' configure
-}
 post_install() {
 	vdoc README
 	vdoc docs/README.video
@@ -23,4 +20,3 @@ post_install() {
 	vinstall ${FILESDIR}/${pkgname}.png 644 usr/share/pixmaps
 	vinstall ${FILESDIR}/${pkgname}.desktop 644 usr/share/applications
 }
-
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index a931292cbbd..908febe902c 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,6 +1,6 @@
 # Template file for 'dovecot-plugin-pigeonhole'
 pkgname=dovecot-plugin-pigeonhole
-version=0.5.7.1
+version=0.5.8
 revision=1
 wrksrc="dovecot-2.3-pigeonhole-${version}"
 build_style=gnu-configure
@@ -15,11 +15,11 @@ make_build_args="LIBDOVECOT_INCLUDE=-I${XBPS_CROSS_BASE}/usr/include/dovecot
 hostmakedepends="libldap-devel"
 makedepends="dovecot-devel libressl-devel libldap-devel"
 short_desc="Sieve implementation for Dovecot"
-maintainer="John Regan <john@jrjrtech.com>"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://pigeonhole.dovecot.org"
 distfiles="${homepage}/releases/2.3/${wrksrc}.tar.gz"
-checksum=3270b24c1f75a7c144f54d6d08ce994176e39c2cdb3ac4dd80ad5e64aaaa2028
+checksum=8fb860d50c1b1a09aea9e25f8ee89c22e34ecedfb0e11a1c48a7f67310759022
 
 dovecot-plugin-pigeonhole-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 78b1b26a7c9..4b195f2bf44 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -1,7 +1,7 @@
 # Template file for 'dovecot'
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
-version=2.3.7.1
+version=2.3.8
 revision=1
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
@@ -15,11 +15,11 @@ makedepends=" liblz4-devel zlib-devel bzip2-devel liblzma-devel libressl-devel
  clucene-devel libldap-devel libcap-devel pam-devel libcurl-devel expat-devel
  libsodium-devel"
 short_desc="IMAP and POP3 server written with security primarily in mind"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://dovecot.org"
 distfiles="${homepage}/releases/2.3/${pkgname}-${version}.tar.gz"
-checksum=c5a51d6f76e6e9c843df69e52a364a4c65c4c60e0c51d992eaa45f22f71803c3
+checksum=c5778d03bf26ab34a605854098035badec455d07adfab38d974f610c8f78b649
 keep_libtool_archives=yes
 
 
diff --git a/srcpkgs/dracut/patches/ppc-mac-thermal.patch b/srcpkgs/dracut/patches/ppc-mac-thermal.patch
new file mode 100644
index 00000000000..16ce4dbff1d
--- /dev/null
+++ b/srcpkgs/dracut/patches/ppc-mac-thermal.patch
@@ -0,0 +1,144 @@
+From 3b146ac6c0397f4a73c7b4ee498bff4e98479066 Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+Date: Mon, 22 Jul 2019 18:52:08 +0200
+Subject: [PATCH] modules.d: add a module for early fan control on PowerPC Macs
+
+The goal of this module is to enable automatic loading of the
+thermal/fan control modules on PowerPC based Macs, as on some
+modular kernel configurations this will not happen automatically
+which will result in the fans spinning up to 100% until they are
+manually loaded.
+
+This is especially a problem in live systems where it takes some
+time to boot up and the spin-up happens before the system even
+leaves initramfs.
+---
+ modules.d/90ppcmac/load-thermal.sh | 29 +++++++++++
+ modules.d/90ppcmac/module-setup.sh | 82 ++++++++++++++++++++++++++++++
+ 2 files changed, 111 insertions(+)
+ create mode 100644 modules.d/90ppcmac/load-thermal.sh
+ create mode 100644 modules.d/90ppcmac/module-setup.sh
+
+diff --git a/modules.d/90ppcmac/load-thermal.sh b/modules.d/90ppcmac/load-thermal.sh
+new file mode 100644
+index 000000000..1e548f052
+--- /dev/null
++++ modules.d/90ppcmac/load-thermal.sh
+@@ -0,0 +1,29 @@
++#!/bin/sh
++#
++# This hook attempts to load the appropriate thermal modules
++# for PowerPC Macs depending on the specific machine you have.
++
++[ -r /proc/cpuinfo ] || exit 0
++
++load_windfarm() {
++    local pm_model="$(sed -n '/model/p' /proc/cpuinfo)"
++    pm_model="${pm_model##*: }"
++
++    # load quietly and respect the blacklist
++    # this way if the modules are for some reason missing, it will
++    # still exit successfully and not affect the boot process
++    case "$pm_model" in
++        PowerMac3,6)             modprobe -b -q therm_windtunnel ;;
++        PowerMac7,2|PowerMac7,3) modprobe -b -q windfarm_pm72    ;;
++        PowerMac8,1|PowerMac8,2) modprobe -b -q windfarm_pm81    ;;
++        PowerMac9,1)             modprobe -b -q windfarm_pm91    ;;
++        PowerMac11,2)            modprobe -b -q windfarm_pm112   ;;
++        PowerMac12,1)            modprobe -b -q windfarm_pm121   ;;
++        RackMac3,1)              modprobe -b -q windfarm_rm31    ;;
++        *) ;;
++    esac
++
++    return 0
++}
++
++load_windfarm
+diff --git a/modules.d/90ppcmac/module-setup.sh b/modules.d/90ppcmac/module-setup.sh
+new file mode 100644
+index 000000000..59221ec4d
+--- /dev/null
++++ modules.d/90ppcmac/module-setup.sh
+@@ -0,0 +1,82 @@
++#!/bin/bash
++#
++# This module attempts to properly deal with thermal behavior on PowerPC
++# based Mac systems, by installing the model-appropriate (when hostonly)
++# or all (when not) fan control/thermal kernel modules and loading them
++# in a hook.
++#
++# While this is not strictly necessary for all kernels, particularly
++# modular kernels will not autoload those drivers, even once the full
++# system is up, which results in the fans spinning up to 100%; this is
++# particularly annoying on live systems, where the system takes a while
++# to load, so it's best to load the drivers early in initramfs stage.
++#
++# The behavior of this is inspired by the thermal hook in Debian's
++# initramfs-tools, but written for dracut specifically and updated
++# for modern kernels (2012+).
++
++# called by dracut
++check() {
++    local _arch="$(uname -m)"
++    # only for PowerPC Macs
++    [[ "$_arch" == ppc* && "$_arch" != ppc*le ]] || return 1
++    return 0
++}
++
++# called by dracut
++depends() {
++    return 0
++}
++
++# called by dracut
++installkernel() {
++    pmac_model() {
++        local pm_model="$(grep model /proc/cpuinfo)"
++        echo "${pm_model##*: }"
++    }
++
++    # only PowerMac3,6 has a module, special case
++    if [[ "$(uname -m)" == ppc ]]; then
++        if ! [[ $hostonly ]] || [[ "$(pmac_model)" == "PowerMac3,6" ]]; then
++            instmods therm_windtunnel
++        fi
++        return 0
++    fi
++
++    windfarm_modules() {
++        if ! [[ $hostonly ]]; then
++            # include all drivers when not hostonly
++            instmods \
++                windfarm_pm72 windfarm_pm81 windfarm_pm91 windfarm_pm112 \
++                windfarm_pm121 windfarm_rm31
++        else
++            # guess model specific module, then install the rest
++            case "$(pmac_model)" in
++                PowerMac7,2|PowerMac7,3) instmods windfarm_pm72  ;;
++                PowerMac8,1|PowerMac8,2) instmods windfarm_pm81  ;;
++                PowerMac9,1)             instmods windfarm_pm91  ;;
++                PowerMac11,2)            instmods windfarm_pm112 ;;
++                PowerMac12,1)            instmods windfarm_pm121 ;;
++                RackMac3,1)              instmods windfarm_rm31  ;;
++                # no match, so skip installation of the rest
++                *) return 1 ;;
++            esac
++        fi
++        return 0
++    }
++
++    # hostonly and didn't match a model; skip installing other modules
++    windfarm_modules || return 0
++    # these are all required by the assorted windfarm_pm*
++    instmods \
++        windfarm_core windfarm_cpufreq_clamp windfarm_pid \
++        windfarm_smu_controls windfarm_smu_sat windfarm_smu_sensors \
++        windfarm_fcu_controls windfarm_ad7417_sensor windfarm_max6690_sensor \
++        windfarm_lm75_sensor windfarm_lm87_sensor
++}
++
++# called by dracut
++install() {
++    # this will attempt to load the appropriate modules
++    inst_hook pre-udev 99 "$moddir/load-thermal.sh"
++}
diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template
index 6eb4125fb56..25614b2d3e2 100644
--- a/srcpkgs/dracut/template
+++ b/srcpkgs/dracut/template
@@ -1,7 +1,7 @@
 # Template file for 'dracut'
 pkgname=dracut
 version=049
-revision=1
+revision=2
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc"
 conf_files="/etc/dracut.conf"
@@ -9,7 +9,7 @@ hostmakedepends="asciidoc pkg-config"
 makedepends="libkmod-devel"
 depends="bash coreutils cpio psmisc"
 short_desc="Low-level tool for generating an initramfs/initrd image"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="q66 <daniel@octaforge.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="http://www.kernel.org/pub/linux/utils/boot/dracut/dracut.html"
 distfiles="https://github.com/dracutdevs/dracut/archive/${version}.tar.gz"
diff --git a/srcpkgs/dragon-player/template b/srcpkgs/dragon-player/template
index a2cea075394..826bc54fc8c 100644
--- a/srcpkgs/dragon-player/template
+++ b/srcpkgs/dragon-player/template
@@ -1,6 +1,6 @@
 # Template file for 'dragon-player'
 pkgname=dragon-player
-version=19.04.3
+version=19.08.2
 revision=1
 wrksrc="dragon-${version}"
 build_style=cmake
@@ -13,4 +13,4 @@ maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/multimedia/dragonplayer"
 distfiles="${KDE_SITE}/applications/${version}/src/dragon-${version}.tar.xz"
-checksum=498bbcf3441a32a588568981ee3ad563b6c4fd88b226d1673d83da09901f117a
+checksum=3924dba504f370415c0d68cb5079acfc941aa761e9d9d2df2ea48b302ef9ce61
diff --git a/srcpkgs/drone-cli/template b/srcpkgs/drone-cli/template
index 086015f3347..603c76fd72d 100644
--- a/srcpkgs/drone-cli/template
+++ b/srcpkgs/drone-cli/template
@@ -1,14 +1,14 @@
 # Template file for 'drone-cli'
 pkgname=drone-cli
-version=1.1.2
+version=1.2.0
 revision=1
 build_style=go
 go_import_path=github.com/drone/drone-cli
 go_package="${go_import_path}/drone"
 go_ldflags="-X main.version=${version}"
 short_desc="CLI for Drone continuous delivery platform"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/drone/drone-cli"
 distfiles="https://github.com/drone/drone-cli/archive/v${version}.tar.gz"
-checksum=ba315c38dd36af898900fd0149d5228775f9f96d491d40dcaa3daddafd03aac4
+checksum=2f7cfb0ab99c94a2406f057ab509ed4974bf715a743979e62f542d889bb7bcc7
diff --git a/srcpkgs/drumstick-devel b/srcpkgs/drumstick-devel
new file mode 120000
index 00000000000..e953fd56e31
--- /dev/null
+++ b/srcpkgs/drumstick-devel
@@ -0,0 +1 @@
+drumstick
\ No newline at end of file
diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
new file mode 100644
index 00000000000..bbc8f563897
--- /dev/null
+++ b/srcpkgs/drumstick/template
@@ -0,0 +1,33 @@
+# Template file for 'drumstick'
+pkgname=drumstick
+version=1.1.3
+revision=1
+build_style=cmake
+configure_args="-DLIB_SUFFIX="
+hostmakedepends="pkg-config doxygen libxslt docbook-xsl"
+makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel"
+short_desc="Set of MIDI libraries using C++/Qt5 idioms and style"
+maintainer="Mohammad Amin Sameti <mamins1376@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="http://drumstick.sourceforge.net"
+distfiles="${SOURCEFORGE_SITE}/drumstick/drumstick-${version}.tar.bz2"
+checksum=75aca4281da25fe0186b44c07772c5f0b4d1f2bba875c4667e7e6e9fcedb3cd9
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt5-qmake qt5-host-tools"
+fi
+
+post_install() {
+	for doc in TODO NEWS ChangeLog AUTHORS; do
+		vdoc $doc
+	done
+}
+
+drumstick-devel_package() {
+	short_desc+=" - development libraries"
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+	}
+}
diff --git a/srcpkgs/dssi/template b/srcpkgs/dssi/template
index 4478cb3ef37..fac019b9f57 100644
--- a/srcpkgs/dssi/template
+++ b/srcpkgs/dssi/template
@@ -1,12 +1,12 @@
 # Template file for 'dssi'
 pkgname=dssi
 version=1.1.1
-revision=7
+revision=8
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="
  liblo-devel libsndfile-devel libsamplerate-devel alsa-lib-devel jack-devel
- ladspa-sdk libSM-devel libX11-devel qt-devel"
+ ladspa-sdk libSM-devel libX11-devel"
 short_desc="API for audio processing plugins"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1"
@@ -14,10 +14,6 @@ homepage="http://dssi.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=f2c82b073a947c8255284249097667f9b14e660bf86186f3fcd3b3b3e087814e
 
-if [ -n "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt-host-tools qt-devel"
-fi
-
 dssi-devel_package() {
 	depends="dssi>=${version}"
 	short_desc+=" - development files"
diff --git a/srcpkgs/dtc/template b/srcpkgs/dtc/template
index 72bcd3d08ea..3c1e4c05628 100644
--- a/srcpkgs/dtc/template
+++ b/srcpkgs/dtc/template
@@ -1,6 +1,6 @@
 # Template file for 'dtc'
 pkgname=dtc
-version=1.5.0
+version=1.5.1
 revision=1
 build_style=gnu-makefile
 make_build_args="NO_PYTHON=1"
@@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-only"
 homepage="https://git.kernel.org/pub/scm/utils/dtc/dtc.git"
 distfiles="https://www.kernel.org/pub/software/utils/dtc/dtc-${version}.tar.xz"
-checksum=c672e443c9f7e39f5a7c8e602da6777f9ad55ad70de87de300a43828c8050172
+checksum=660b74039690fc37013660544d09191834efb58503c73c555c5513ba75ab031f
 
 CFLAGS="-fPIC"
 
diff --git a/srcpkgs/dte/template b/srcpkgs/dte/template
index 4836cb3d1f9..ea15247d6a2 100644
--- a/srcpkgs/dte/template
+++ b/srcpkgs/dte/template
@@ -1,6 +1,6 @@
 # Template file for 'dte'
 pkgname=dte
-version=1.8.2
+version=1.9.1
 revision=1
 build_style=gnu-makefile
 make_install_args="prefix=/usr"
@@ -10,4 +10,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/craigbarnes/dte"
 distfiles="https://github.com/craigbarnes/dte/archive/v${version}.tar.gz"
-checksum=778786c0b2588f0d9a651ebfde939885a5579745dae8f5d9adc480f4895d6c04
+checksum=80d2732269a308b5e1126ecc16c28cda032864f625a95184821a73c054f81a2d
diff --git a/srcpkgs/duktape/template b/srcpkgs/duktape/template
index a77c759199e..c7d5a957a18 100644
--- a/srcpkgs/duktape/template
+++ b/srcpkgs/duktape/template
@@ -1,6 +1,6 @@
 # Template file for 'duktape'
 pkgname=duktape
-version=2.3.0
+version=2.4.0
 revision=1
 build_style=gnu-makefile
 make_build_args="-f Makefile.sharedlibrary"
@@ -10,7 +10,7 @@ maintainer="Christopher Brannon <chris@the-brannons.com>"
 license="MIT"
 homepage="http://duktape.org"
 distfiles="https://github.com/svaarala/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.xz"
-checksum=ed6e2f3ab2061628a7aeee27ccff16538ba6a151480cccf2e846bd061e45afe8
+checksum=86a89307d1633b5cedb2c6e56dc86e92679fc34b05be551722d8cc69ab0771fc
 
 pre_build() {
 	sed -i 's|^CC.*||g' Makefile.sharedlibrary
diff --git a/srcpkgs/duplicity/template b/srcpkgs/duplicity/template
index cae0d5556d0..c5b03faa53c 100644
--- a/srcpkgs/duplicity/template
+++ b/srcpkgs/duplicity/template
@@ -9,7 +9,7 @@ makedepends="python-devel librsync-devel"
 depends="python-fasteners gnupg"
 checkdepends="python-pexpect python-mock python-fasteners gnupg par2cmdline"
 short_desc="Encrypted bandwidth-efficient backup using the rsync algorithm"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://duplicity.nongnu.org/"
 changelog="http://duplicity.nongnu.org/CHANGELOG"
diff --git a/srcpkgs/dutree/template b/srcpkgs/dutree/template
index c6873cf8a00..d2faee7ab31 100644
--- a/srcpkgs/dutree/template
+++ b/srcpkgs/dutree/template
@@ -1,6 +1,6 @@
 # Template file for 'dutree'
 pkgname=dutree
-version=0.2.9
+version=0.2.12
 revision=2
 build_style=cargo
 short_desc="Tool to analyze file system usage written in Rust"
@@ -8,4 +8,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/nachoparker/dutree"
 distfiles="https://github.com/nachoparker/dutree/archive/v${version}.tar.gz"
-checksum=38e621e813b6d3ee37bf765ac68b98e77bdf7fc58b8b788d54153bd929c1fda1
+checksum=6304eaf2ee0913bd0521a351fe5138b3ae44103927655ec43672cadeac559c08
diff --git a/srcpkgs/e2fsprogs/template b/srcpkgs/e2fsprogs/template
index 0fd0da5bce1..b9a2cbc85e1 100644
--- a/srcpkgs/e2fsprogs/template
+++ b/srcpkgs/e2fsprogs/template
@@ -1,6 +1,6 @@
 # Template file for 'e2fsprogs'
 pkgname=e2fsprogs
-version=1.45.3
+version=1.45.4
 revision=1
 build_style=gnu-configure
 configure_args="--enable-elf-shlibs --disable-fsck
@@ -17,7 +17,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://e2fsprogs.sourceforge.net/"
 distfiles="${KERNEL_SITE}/kernel/people/tytso/e2fsprogs/v${version}/e2fsprogs-${version}.tar.xz"
-checksum=90d10066b815e27b0b4875f0d5e396c663e0bf55aa3ca10868978d10c6ffe595
+checksum=65faf6b590ca1da97440d6446bd11de9e0914b42553740ba5d9d2a796fa0dc02
 conf_files="/etc/mke2fs.conf /etc/e2scrub.conf"
 
 do_check() {
diff --git a/srcpkgs/eclipse/template b/srcpkgs/eclipse/template
index c097b29e622..e81765c0264 100644
--- a/srcpkgs/eclipse/template
+++ b/srcpkgs/eclipse/template
@@ -1,9 +1,9 @@
 # Template file for 'eclipse'
 pkgname=eclipse
-version=4.12
+version=4.13
 revision=1
 #code name of version
-_release=2019-06
+_release=2019-09
 archs="x86_64"
 wrksrc="eclipse"
 depends="virtual?java-environment unzip gtk+3 webkit2gtk libXtst hicolor-icon-theme desktop-file-utils"
@@ -17,7 +17,7 @@ _patch=R
 _edition=java
 _mirror="http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse"
 distfiles="${_mirror}/technology/epp/downloads/release/${_release}/${_patch}/eclipse-${_edition}-${_release}-${_patch}-linux-gtk-x86_64.tar.gz"
-checksum=bafa1143704f0bba32ed933fdf0f620bb956221b2ebba8e2a822c43671d8acf4
+checksum=18f55219c86fa4fe52f8a1a51b17c4eb99af6c215d6af8702555ea82af83acaa
 
 do_install() {
 	vmkdir usr/lib/eclipse
diff --git a/srcpkgs/edbrowse/patches/curl-7.62.patch b/srcpkgs/edbrowse/patches/curl-7.62.patch
deleted file mode 100644
index ec9e85124e2..00000000000
--- a/srcpkgs/edbrowse/patches/curl-7.62.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 5d2b9e21fdf019f461ebe62738d615428d5db963 Mon Sep 17 00:00:00 2001
-From: Po-Chuan Hsieh <sunpoet@sunpoet.net>
-Date: Sat, 3 Nov 2018 18:11:14 +0800
-Subject: [PATCH] Fix build with curl 7.62.0
-
-from CHANGES:
-ssl: deprecate CURLE_SSL_CACERT in favour of a unified error code
-Long live CURLE_PEER_FAILED_VERIFICATION
----
- src/http.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/http.c b/src/http.c
-index 56eebab..ccafc8f 100644
---- src/http.c
-+++ src/http.c
-@@ -1557,7 +1557,9 @@ void ebcurl_setError(CURLcode curlret, const char *url, int action,
- 		break;
- 
- 	case CURLE_PEER_FAILED_VERIFICATION:
-+#if LIBCURL_VERSION_NUM < 0x073e00
- 	case CURLE_SSL_CACERT:
-+#endif
- 		(*fn) (MSG_NoCertify, host);
- 		break;
- 
-
diff --git a/srcpkgs/edbrowse/template b/srcpkgs/edbrowse/template
index 72671ae7797..b3e93dc9613 100644
--- a/srcpkgs/edbrowse/template
+++ b/srcpkgs/edbrowse/template
@@ -1,7 +1,7 @@
 # Template file for 'edbrowse'
 pkgname=edbrowse
-version=3.7.4
-revision=3
+version=3.7.5.1
+revision=1
 hostmakedepends="perl pkg-config"
 build_style=cmake
 makedepends="duktape-devel libcurl-devel libtidy5-devel pcre-devel
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="http://edbrowse.org/"
 distfiles="https://github.com/CMB/${pkgname}/archive/v${version}.tar.gz"
-checksum=b79e6417c1170c96ef68968c33d585725f0f2d27859e3fe807c980a9c33ea719
+checksum=096eb9051f9cde4cf71c833fa43f602fb3db40af056d1fab98a1711abf42caba
 
 do_install() {
 	vbin build/edbrowse
diff --git a/srcpkgs/editline/template b/srcpkgs/editline/template
index c97f4c2a196..50f10aab097 100644
--- a/srcpkgs/editline/template
+++ b/srcpkgs/editline/template
@@ -4,7 +4,7 @@ version=1.16.1
 revision=1
 build_style=gnu-configure
 short_desc="Minimal readline() replacement"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Spencer-94"
 homepage="http://troglobit.com/projects/editline/"
 distfiles="https://github.com/troglobit/editline/releases/download/${version}/editline-${version}.tar.xz"
diff --git a/srcpkgs/eggdrop/template b/srcpkgs/eggdrop/template
new file mode 100644
index 00000000000..dd274acdb61
--- /dev/null
+++ b/srcpkgs/eggdrop/template
@@ -0,0 +1,44 @@
+# Template file for 'eggdrop'
+pkgname=eggdrop
+version=1.8.4
+revision=1
+build_style=gnu-configure
+hostmakedepends="tcl-devel"
+makedepends="tcl-devel libressl-devel zlib-devel"
+short_desc="Internet relay chat (IRC) bot"
+maintainer="Andrew Benson <abenson+void@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://www.eggheads.org/"
+distfiles="https://ftp.eggheads.org/pub/eggdrop/source/${version%.*}/eggdrop-${version}.tar.gz"
+checksum=79644eb27a5568934422fa194ce3ec21cfb9a71f02069d39813e85d99cdebf9e
+
+pre_build() {
+	make config
+}
+
+do_install() {
+	_lib="usr/lib/eggdrop"
+	_share="usr/share/eggdrop"
+	_conf="etc/eggdrop"
+
+	make install DEST=ed_staging
+
+	vbin eggdrop
+
+	vmkdir "${_lib}"
+	vcopy "ed_staging/modules/*.so" "${_lib}"
+	vsed -e "s|modules/|/${_lib}/|" -i eggdrop.conf
+
+	for _asset in language scripts help; do
+		vmkdir "${_share}/${_asset}/"
+		vcopy "ed_staging/${_asset}/*" "${_share}/${_asset}"
+		vsed -e "s|${_asset}/|/${_share}/&|" -i eggdrop.conf
+	done
+
+	vmkdir "${_conf}/text"
+	vcopy "ed_staging/text/*" "${_conf}/text"
+	vsed -e "s|text/|/${_conf}/&|" -i eggdrop.conf
+
+	vsconf eggdrop.conf
+	vsconf eggdrop-basic.conf
+}
diff --git a/srcpkgs/elfinfo/template b/srcpkgs/elfinfo/template
index 17f8e262008..ecec045e604 100644
--- a/srcpkgs/elfinfo/template
+++ b/srcpkgs/elfinfo/template
@@ -1,7 +1,7 @@
 # Template file for 'elfinfo'
 pkgname=elfinfo
-version=0.7.5
-revision=2
+version=0.7.6
+revision=1
 build_style=go
 go_import_path=github.com/xyproto/elfinfo
 hostmakedepends="git"
@@ -10,7 +10,7 @@ maintainer="Alexander F. Rødseth <xyproto@archlinux.org>"
 license="MIT"
 homepage="https://elfinfo.roboticoverlords.org/"
 distfiles="https://github.com/xyproto/elfinfo/releases/download/${version}/elfinfo-${version}.tar.xz"
-checksum=430feccaeb102cb9bcef95a25d1fbf12cef2a693b7834446139eba1bc91c8af0
+checksum=194e782bf811ddb3f503af3621158bf9ff50aa6161ff51cbf899b6ebef5f2e7c
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/elfutils/template b/srcpkgs/elfutils/template
index 40cd4b44ef9..3a7671de6b1 100644
--- a/srcpkgs/elfutils/template
+++ b/srcpkgs/elfutils/template
@@ -13,7 +13,7 @@ homepage="https://sourceware.org/elfutils/"
 distfiles="https://sourceware.org/${pkgname}/ftp/${version}/${pkgname}-${version}.tar.bz2"
 checksum=eb5747c371b0af0f71e86215a5ebb88728533c3a104a43d4231963f308cd1023
 
-CFLAGS="-Wno-error"
+CFLAGS="-Wno-error -Wno-error=null-dereference"
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) makedepends+=" argp-standalone musl-fts-devel musl-obstack" ;;
diff --git a/srcpkgs/elixir/template b/srcpkgs/elixir/template
index 4b0ac69330d..2eece311b26 100644
--- a/srcpkgs/elixir/template
+++ b/srcpkgs/elixir/template
@@ -1,6 +1,6 @@
 # Template file for 'elixir'
 pkgname=elixir
-version=1.9.1
+version=1.9.2
 revision=1
 build_style=gnu-makefile
 make_check_target="test"
@@ -12,4 +12,4 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="Apache-2.0"
 homepage="http://elixir-lang.org/"
 distfiles="https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz"
-checksum=94daa716abbd4493405fb2032514195077ac7bc73dc2999922f13c7d8ea58777
+checksum=02aaa3ffd21f9cf51aceb3aa5a5bc2c1e2636b1611867e44f19693dcf856e25c
diff --git a/srcpkgs/ell/template b/srcpkgs/ell/template
index 83e3812da5f..8a2c91f4371 100644
--- a/srcpkgs/ell/template
+++ b/srcpkgs/ell/template
@@ -1,17 +1,17 @@
 # Template file for 'ell'
 pkgname=ell
-version=0.21
+version=0.24
 revision=1
 build_style=gnu-configure
 configure_args="--enable-glib"
 hostmakedepends="pkg-config"
 makedepends="libglib-devel"
 short_desc="Linux library for embedded development"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Peter Bui <pbui@github.bx612.space>"
 license="GPL-2.0-only"
 homepage="https://01.org/ell"
 distfiles="https://mirrors.edge.kernel.org/pub/linux/libs/ell/ell-${version}.tar.xz"
-checksum=a0db4e3057ba41035637354b6af2aa4c74f83509e0c3e563d682df9d72eaff17
+checksum=2f96de39c48cc7facf91015a4dbb123541a8f7818cffa7885db6f8837837cc15
 
 ell-devel_package() {
 	depends="ell-${version}_${revision}"
diff --git a/srcpkgs/elogind/template b/srcpkgs/elogind/template
index 7d03f4e5fc0..3573956c521 100644
--- a/srcpkgs/elogind/template
+++ b/srcpkgs/elogind/template
@@ -1,7 +1,7 @@
 # Template file for 'elogind'
 pkgname=elogind
 version=241.3
-revision=2
+revision=3
 build_style=meson
 configure_args="-Dcgroup-controller=elogind -Dhalt-path=/usr/bin/halt
  -Drootlibexecdir=/usr/libexec/elogind -Dreboot-path=/usr/bin/reboot
@@ -20,6 +20,10 @@ distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz"
 checksum=d6a465479c8a629d49ea9374f6199b0c60e7e42eade0fcd8265fc37085386365
 conf_files="/etc/elogind/logind.conf"
 
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	configure_args+=" -Dutmp=false"
+fi
+
 pre_check() {
 	# test-fs-util checks for /etc/machine-id/foo and expects ENOTDIR
 	# since /etc/machine-id is expected to be a file.
diff --git a/srcpkgs/emacs/template b/srcpkgs/emacs/template
index 8e4ddd6736c..be1dd6da5b0 100644
--- a/srcpkgs/emacs/template
+++ b/srcpkgs/emacs/template
@@ -1,6 +1,6 @@
 # Template file for 'emacs'
 pkgname=emacs
-version=26.2
+version=26.3
 revision=1
 build_style=gnu-configure
 configure_args="--with-file-notification=inotify --with-modules
@@ -21,7 +21,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.gnu.org/software/emacs/"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=151ce69dbe5b809d4492ffae4a4b153b2778459de6deb26f35691e1281a9c58e
+checksum=4d90e6751ad8967822c6e092db07466b9d383ef1653feb2f95c93e7de66d3485
 replaces="emacs>=0"
 nocross=yes
 nopie=yes
diff --git a/srcpkgs/enchant2/template b/srcpkgs/enchant2/template
index be08603478a..f0094c23526 100644
--- a/srcpkgs/enchant2/template
+++ b/srcpkgs/enchant2/template
@@ -1,6 +1,6 @@
 # Template file for 'enchant2'
 pkgname=enchant2
-version=2.2.5
+version=2.2.7
 revision=1
 wrksrc="enchant-${version}"
 build_style=gnu-configure
@@ -9,11 +9,11 @@ make_install_args="$make_build_args"
 hostmakedepends="pkg-config"
 makedepends="libglib-devel hunspell-devel aspell-devel libvoikko-devel"
 short_desc="Generic spell checking library"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://abiword.github.io/enchant/"
 distfiles="https://github.com/AbiWord/enchant/releases/download/v${version}/enchant-${version}.tar.gz"
-checksum=ffce4ea00dbda1478d91c3e1538cadfe5761d9d6c0ceb27bc3dba51882fe1c47
+checksum=1b22976135812b35cb5b8d21a53ad11d5e7c1426c93f51e7a314a2a42cab3a09
 
 enchant2-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/encodings/template b/srcpkgs/encodings/template
index fab5215d3df..eb2ef08e8e6 100644
--- a/srcpkgs/encodings/template
+++ b/srcpkgs/encodings/template
@@ -1,17 +1,17 @@
-# Template build file for 'encodings'.
+# Template file for 'encodings'
 pkgname=encodings
-version=1.0.4
-revision=6
+version=1.0.5
+revision=1
 archs=noarch
 build_style=gnu-configure
 hostmakedepends="pkg-config font-util"
 depends="font-util"
 short_desc="X11 Font Index Generator"
-homepage="http://xorg.freedesktop.org"
-license="Public domain"
 maintainer="Orphaned <orphan@voidlinux.org>"
+license="custom:Public domain"
+homepage="http://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
-checksum=ced6312988a45d23812c2ac708b4595f63fd7a49c4dcd9f66bdcd50d1057d539
+checksum=bd96e16143a044b19e87f217cf6a3763a70c561d1076aad6f6d862ec41774a31
 
 pre_build() {
 	sed -e 's|^\(encodings_DATA = $(DATA_FILES)\).*|\1|' -i Makefile
@@ -19,4 +19,5 @@ pre_build() {
 post_install() {
 	# encodings.dir are generated at pkg post-install time.
 	find ${DESTDIR} -name encodings.dir -delete
+	vlicense COPYING
 }
diff --git a/srcpkgs/endless-sky/template b/srcpkgs/endless-sky/template
index f3e4da66ece..57355b3ea1e 100644
--- a/srcpkgs/endless-sky/template
+++ b/srcpkgs/endless-sky/template
@@ -1,6 +1,6 @@
 # Template file for 'endless-sky'
 pkgname=endless-sky
-version=0.9.9
+version=0.9.10
 revision=1
 build_style=scons
 makedepends="SDL2-devel glew-devel libjpeg-turbo-devel libmad-devel
@@ -11,7 +11,7 @@ maintainer="CoolOhm <micvlas@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="http://endless-sky.github.io/"
 distfiles="https://github.com/endless-sky/endless-sky/archive/v${version}.tar.gz"
-checksum=8bb9a17fd28177b2c17cadb282edcf4ef9a8b3de146f177cc4ca37c6f0aed8a5
+checksum=58f2e405e171be8426004216df4df7bb3a2792a507a5d01f77a0f02346332f6f
 
 endless-sky-data_package() {
 	short_desc+=" - data files"
diff --git a/srcpkgs/engrampa/template b/srcpkgs/engrampa/template
index 573bcf722bb..9e7c329d19c 100644
--- a/srcpkgs/engrampa/template
+++ b/srcpkgs/engrampa/template
@@ -1,6 +1,6 @@
 # Template file for 'engrampa'
 pkgname=engrampa
-version=1.22.1
+version=1.22.2
 revision=1
 build_style=gnu-configure
 configure_args="--enable-magic --disable-schemas-compile --disable-packagekit"
@@ -13,4 +13,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://mate-desktop.org"
 distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=336b05cf891b82c55373454e5c03bed09d5296c39aed977366c595a0dd46e31b
+checksum=ed21d1ceafbbe31e35c9225f0dc6a451ae2f8aff454bacef60df5a31e6b3075e
diff --git a/srcpkgs/entr/template b/srcpkgs/entr/template
index f6f734af09e..cff7bf64a2d 100644
--- a/srcpkgs/entr/template
+++ b/srcpkgs/entr/template
@@ -1,17 +1,16 @@
 # Template file for 'entr'
 pkgname=entr
-version=4.2
+version=4.3
 revision=1
 build_style=gnu-makefile
-short_desc="A utility for running arbitrary commands when files change"
+short_desc="Utility for running arbitrary commands when files change"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="ISC"
 homepage="http://entrproject.org"
 distfiles="$homepage/code/$pkgname-$version.tar.gz"
-checksum=27300215df0aab8b773002da25c7bf60681d8c392f5d5702946c46798e9b5d70
+checksum=b081c1dbdac7723e91f6d528a0d736f90cb2fb1458888aa3b446699d9d26235a
 
 post_extract() {
-	mv ${XBPS_BUILDDIR}/eradman-entr-* $wrksrc
 	case "$XBPS_TARGET_MACHINE" in
 		*-musl) # No need for _LINUX_PORT compat.h and strlcpy.c
 			sed -i $wrksrc/Makefile.linux -e "s;-D_LINUX_PORT;;"
diff --git a/srcpkgs/eog/template b/srcpkgs/eog/template
index 672830a87d6..e0c978ad2fe 100644
--- a/srcpkgs/eog/template
+++ b/srcpkgs/eog/template
@@ -1,6 +1,6 @@
 # Template file for 'eog'
 pkgname=eog
-version=3.32.2
+version=3.34.1
 revision=1
 build_helper="gir"
 build_style=meson
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/EyeOfGnome"
 distfiles="${GNOME_SITE}/eog/${version%.*}/eog-${version}.tar.xz"
-checksum=be971985c9b997cd302e2be7303374425e588d81658de538f14c4cfa1fbe9dad
+checksum=fdb0739f8420af2ffb8e91c766a154afefdf20f721ad34b56cab27fd1569f42c
 shlib_provides="libeog.so"
 lib32disabled=yes
 nocross="Can not use target eog as a generator because it is cross-built"
diff --git a/srcpkgs/eom/template b/srcpkgs/eom/template
index 492bf5c32e7..a048c63c3f5 100644
--- a/srcpkgs/eom/template
+++ b/srcpkgs/eom/template
@@ -16,11 +16,6 @@ homepage="https://mate-desktop.org"
 distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=64d73069ba4db8515a6c2c90fadba87e1c5cac67dd1e102b271f62e537ee970e
 
-case "$XBPS_TARGET_MACHINE" in
-	i686-musl|x86_64-musl) ;;
-	*-musl) broken="gobject-introspection" ;;
-esac
-
 eom-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}-${version}_${revision}"
diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template
index bc0dedc6a1c..b5a3b890c75 100644
--- a/srcpkgs/epiphany/template
+++ b/srcpkgs/epiphany/template
@@ -1,7 +1,7 @@
 # Template file for 'epiphany'
 pkgname=epiphany
 version=3.32.4
-revision=1
+revision=2
 build_helper="gir"
 build_style=meson
 configure_args="-Ddistributor_name=VoidLinux -Dunit_tests=disabled"
diff --git a/srcpkgs/eqonomize/template b/srcpkgs/eqonomize/template
index 060d4878602..702247a68e4 100644
--- a/srcpkgs/eqonomize/template
+++ b/srcpkgs/eqonomize/template
@@ -1,6 +1,6 @@
 # Template file for 'eqonomize'
 pkgname=eqonomize
-version=1.4.1
+version=1.4.2
 revision=1
 build_style=qmake
 makedepends="qt5-charts-devel"
@@ -11,7 +11,7 @@ license="GPL-3.0-or-later"
 homepage="http://eqonomize.github.io"
 changelog="https://raw.githubusercontent.com/Eqonomize/Eqonomize/master/ChangeLog"
 distfiles="https://github.com/Eqonomize/Eqonomize/releases/download/v${version}/${pkgname}-${version}.tar.gz"
-checksum=b3856aa4ecd25618a26a101ed5cf80bdf0973e64fe681b7e2353dfc959256688
+checksum=1972efad7afad7c516cae8ef65894a4f205f722ab039748b132212cf7e1a6d8d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends="qt5-charts-devel"
diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index f031b19ebee..3afb2833920 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,6 +1,6 @@
 # Template file for 'erlang'
 pkgname=erlang
-version=22.0.7
+version=22.1.3
 revision=1
 create_wrksrc=yes
 build_wrksrc="otp-OTP-${version}"
@@ -15,7 +15,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="http://www.erlang.org/"
 distfiles="https://github.com/erlang/otp/archive/OTP-${version}.tar.gz"
-checksum=04c090b55ec4a01778e7e1a5b7fdf54012548ca72737965b7aa8c4d7878c92bc
+checksum=53a828c1199a41cb54bd3bc6c2c49af977a8834e702c030a5ea34013a3fcacdd
 
 build_options="x11"
 
diff --git a/srcpkgs/eselect/template b/srcpkgs/eselect/template
index 0c84234daf7..e65a82933b1 100644
--- a/srcpkgs/eselect/template
+++ b/srcpkgs/eselect/template
@@ -1,17 +1,17 @@
 # Template file for 'eselect'
 pkgname=eselect
-version=1.4.14
+version=1.4.15
 revision=1
 archs=noarch
 build_style=gnu-configure
 hostmakedepends="automake libtool"
 depends="bash"
 short_desc="Modular configuration framework for Gentoo systems"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://wiki.gentoo.org/wiki/Project:Eselect"
 distfiles="https://gitweb.gentoo.org/proj/eselect.git/snapshot/eselect-${version}.tar.gz"
-checksum=0e1799f9fd4c9dbc421930b33a7705bfd0171d39092fa4cb323bd5c5798af663
+checksum=77fc8449f6ebc0026512a06d6429a8848058516efbbb4fa1193508a9b43398a3
 
 pre_configure() {
 	./autogen.bash
diff --git a/srcpkgs/etcd/template b/srcpkgs/etcd/template
index f2cbe6e5978..a115313af74 100644
--- a/srcpkgs/etcd/template
+++ b/srcpkgs/etcd/template
@@ -1,6 +1,6 @@
 # Template file for 'etcd'
 pkgname=etcd
-version=3.3.13
+version=3.3.15
 revision=1
 build_style=go
 short_desc="Distributed reliable key-value store"
@@ -11,7 +11,7 @@ go_import_path="github.com/coreos/etcd"
 go_package="${go_import_path} ${go_import_path}/etcdctl"
 homepage="https://coreos.com/etcd/docs/latest/"
 distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
-checksum=02df2eb25d67dafc355d19a91791f686fcf59b04cea46110c3a11fcd5e365100
+checksum=3da9bba24d1d4c434d39b8f603c0f481d5888c2a9b7600d3d2cd0cc5d58804e2
 conf_files="/etc/sv/etcd/conf"
 system_accounts="etcd"
 make_dirs="/var/lib/etcd 0755 etcd etcd"
diff --git a/srcpkgs/etcetera/template b/srcpkgs/etcetera/template
index a45f194810b..cfcb25f5b92 100644
--- a/srcpkgs/etcetera/template
+++ b/srcpkgs/etcetera/template
@@ -1,17 +1,17 @@
 # Template file for 'etcetera'
 pkgname=etcetera
-version=0.92
-revision=2
+version=1.0
+revision=1
 archs=noarch
-pycompile_version="$py3_ver"
-pycompile_dirs="usr/lib/etcetera"
 depends="python3"
 short_desc="Config file management with a touch of wisdom"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.com/jeancf/etcetera"
+pycompile_dirs="usr/lib/etcetera"
 distfiles="https://gitlab.com/jeancf/etcetera/-/archive/${version}/etcetera-${version}.tar.gz"
-checksum=83e553454aaf56edb71e300c415523724c5e9df4e29adba3523502ed3d7bf6fe
+checksum=3e4b7ff9095f6d311b12e30d745cc5d6b5c777f5daca7d01f7f1c46d273760c1
+pycompile_version="$py3_ver"
 conf_files="/etc/etcetera.conf"
 
 do_install() {
diff --git a/srcpkgs/ethtool/template b/srcpkgs/ethtool/template
index e1bee9ee0e9..23702d81012 100644
--- a/srcpkgs/ethtool/template
+++ b/srcpkgs/ethtool/template
@@ -1,6 +1,6 @@
 # Template file for 'ethtool'
 pkgname=ethtool
-version=5.2
+version=5.3
 revision=1
 build_style=gnu-configure
 short_desc="Utility for controlling network drivers and hardware"
@@ -8,4 +8,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="http://www.kernel.org/pub/software/network/ethtool/"
 distfiles="http://www.kernel.org/pub/software/network/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=665fd70841860d6cb974387e3ab97e0dde7745f95cb3ef35b98ef9aace137805
+checksum=f3dac0dbce7066af05fbe92812cc33a042d03fb00a45bcf9959f20455efe24c4
diff --git a/srcpkgs/eventviews/template b/srcpkgs/eventviews/template
index cc34479c69c..9b6cbc02cb2 100644
--- a/srcpkgs/eventviews/template
+++ b/srcpkgs/eventviews/template
@@ -1,7 +1,7 @@
 # Template file for 'eventviews'
 pkgname=eventviews
-version=19.08.0
-revision=1
+version=19.08.2
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kcoreaddons kconfig"
 makedepends="calendarsupport-devel kdiagram-devel"
@@ -10,7 +10,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=2f7713173b3820800d7927aff64eb7bcc84c643d9da43adbe6560cb842081295
+checksum=48da7f85c86bcc7a64d475c5bbcbb531471e70cfc9f4bda76030280f0671132d
 
 eventviews-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/evince/template b/srcpkgs/evince/template
index 0196ddc36a8..6e4ec3ecb97 100644
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@@ -1,7 +1,7 @@
 # Template file for 'evince'
 pkgname=evince
-version=3.32.0
-revision=2
+version=3.34.1
+revision=1
 build_helper="gir"
 build_style=gnu-configure
 configure_args="$(vopt_enable gir introspection) --disable-schemas-compile
@@ -19,7 +19,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Evince"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f0d977216466ed2f5a6de64476ef7113dc7c7c9832336f1ff07f3c03c5324c40
+checksum=85e407cde396147b249120d816c7715fb6df191ca561cf65ff3554a5d67626df
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index d781766e49a..5f7abc2ba3b 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,13 +1,13 @@
 # Template file for 'evolution-data-server'
 pkgname=evolution-data-server
-version=3.32.4
-revision=1
+version=3.34.1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_UOA=OFF
  $(vopt_if gir '-DENABLE_INTROSPECTION=ON -DENABLE_VALA_BINDINGS=ON' '-DENABLE_WEATHER=OFF')"
 hostmakedepends="flex glib-devel gperf intltool pkg-config libglib-devel
  $(vopt_if gir 'gobject-introspection')"
-makedepends="libcanberra-devel libgdata-devel $(vopt_if gir libgweather-devel)
+makedepends="boost-devel libcanberra-devel libgdata-devel $(vopt_if gir libgweather-devel)
  libical-devel libsecret-devel mit-krb5-devel $(vopt_if gir 'vala-devel') webkit2gtk-devel"
 depends="$(vopt_if gir libgweather) libsoup-gnome"
 short_desc="Centralized access to appointments and contacts"
@@ -16,7 +16,7 @@ license="LGPL-2.1-only"
 homepage="https://wiki.gnome.org/Apps/Evolution"
 changelog="https://raw.githubusercontent.com/GNOME/evolution-data-server/gnome-3-30/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=83f67cb4b680e892b22b51bcde64c788b7ac63e92a99de401fb347e3794f4c7f
+checksum=6ff56ba04cb639e627fe9d6e0ada106a10cadd68a0d53b8ec72b4e285df53abe
 
 build_options="gir"
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template
index 8d187a40d75..d96c66b7c19 100644
--- a/srcpkgs/evolution-ews/template
+++ b/srcpkgs/evolution-ews/template
@@ -1,6 +1,6 @@
 # Template file for 'evolution-ews'
 pkgname=evolution-ews
-version=3.32.1
+version=3.34.1
 revision=1
 build_style=cmake
 configure_args="-DLIBEXEC_INSTALL_DIR=/usr/lib/evolution"
@@ -12,4 +12,4 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Apps/Evolution"
 changelog="https://raw.githubusercontent.com/GNOME/evolution-ews/gnome-3-30/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0a6cf6d682060ed4bc7065d8320bc63022caa1885c5503d06b8087ae9eb284b0
+checksum=b7479de9eca74dfb99ba0303da830c4b9e21cba89e904ea6f5d158eaea3d5316
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index c29be1fa0b8..fc93468dded 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,7 +1,7 @@
 # Template file for 'evolution'
 pkgname=evolution
-version=3.32.4
-revision=1
+version=3.34.1
+revision=4
 build_style=cmake
 configure_args="-DENABLE_AUTOAR=OFF -DENABLE_LIBCRYPTUI=OFF -DENABLE_GTKSPELL=OFF
  -DENABLE_TEXT_HIGHLIGHT=OFF -DENABLE_PST_IMPORT=OFF
@@ -9,7 +9,7 @@ configure_args="-DENABLE_AUTOAR=OFF -DENABLE_LIBCRYPTUI=OFF -DENABLE_GTKSPELL=OF
 hostmakedepends="gnome-doc-utils gobject-introspection intltool itstool
  pkg-config"
 makedepends="NetworkManager-devel clutter-gtk-devel enchant2-devel
- evolution-data-server-devel gtkhtml-devel libcanberra-devel
+ evolution-data-server-devel gspell-devel gtkhtml-devel libcanberra-devel
  $(vopt_if gir libgweather-devel) libnotify-devel webkit2gtk-devel ytnef-devel
  gnome-desktop-devel"
 depends="gnome-keyring"
@@ -19,7 +19,7 @@ license="LGPL-2.1-or-later, LGPL-3.0-or-later, GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Evolution"
 changelog="https://raw.githubusercontent.com/GNOME/evolution/gnome-3-28/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=10af2af919bc0b5e7f6acbd1231ad573f6101ff095469613ce485b07c9ab1502
+checksum=656a92dd7f3e1afb6eef4f824fd17ae307c0904a67587ca5bb14ab9bd6f8bd42
 shlib_provides="libevolution-calendar.so libevolution-util.so libemail-engine.so
  libevolution-mail.so libevolution-shell.so"
 
diff --git a/srcpkgs/evtest/patches/0001-Add-missing-limits.h-include.patch b/srcpkgs/evtest/patches/0001-Add-missing-limits.h-include.patch
new file mode 100644
index 00000000000..88ccfc13fdd
--- /dev/null
+++ b/srcpkgs/evtest/patches/0001-Add-missing-limits.h-include.patch
@@ -0,0 +1,37 @@
+From 5eb4ab1c139ea38ebe6bb4acba08b09ee7d77d3c Mon Sep 17 00:00:00 2001
+From: Baruch Siach <baruch@tkos.co.il>
+Date: Sun, 18 Aug 2019 10:01:06 +0300
+Subject: [PATCH] Add missing limits.h include
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fixes build with musl libc that does not include limits.h indirectly via
+other headers.
+
+evtest.c: In function ‘scan_devices’:
+evtest.c:886:14: error: ‘PATH_MAX’ undeclared (first use in this function); did you mean  INT8_MAX’?
+   char fname[PATH_MAX];
+              ^~~~~~~~
+
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+---
+ evtest.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git evtest.c evtest.c
+index 37d4f85..548c203 100644
+--- evtest.c
++++ evtest.c
+@@ -56,6 +56,7 @@
+ #include <getopt.h>
+ #include <ctype.h>
+ #include <signal.h>
++#include <limits.h>
+ #include <sys/time.h>
+ #include <sys/types.h>
+ #include <unistd.h>
+-- 
+2.23.0
+
diff --git a/srcpkgs/evtest/template b/srcpkgs/evtest/template
index b5e0c956c7f..1feed55a9d6 100644
--- a/srcpkgs/evtest/template
+++ b/srcpkgs/evtest/template
@@ -1,7 +1,7 @@
 # Template file for 'evtest'
 pkgname=evtest
-version=1.33
-revision=2
+version=1.34
+revision=1
 build_style=gnu-configure
 hostmakedepends="automake"
 short_desc="Command line tool for displaying device input information"
@@ -9,7 +9,7 @@ maintainer="sen <ethan.k.shackelford@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.freedesktop.org/evtest/"
 distfiles="https://cgit.freedesktop.org/evtest/snapshot/evtest-${version}.tar.xz"
-checksum=928f6e81c73bd71ce88be03f7fdad204087a04dccd0250462106af0c2d813532
+checksum=e49f1f160b30c8f7c2a4caef5ab655f1caf816483d19fdedd6db2d251d7ab80e
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/exa/template b/srcpkgs/exa/template
index 998e0ef1b77..2a2af04ee57 100644
--- a/srcpkgs/exa/template
+++ b/srcpkgs/exa/template
@@ -6,7 +6,7 @@ build_style=cargo
 hostmakedepends="cmake"
 makedepends="libgit2-devel"
 short_desc="Modern replacement for ls"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://the.exa.website/"
 distfiles="https://github.com/ogham/exa/archive/v${version}.tar.gz"
diff --git a/srcpkgs/exec-on-git-staged/template b/srcpkgs/exec-on-git-staged/template
new file mode 100644
index 00000000000..4f41115f8d9
--- /dev/null
+++ b/srcpkgs/exec-on-git-staged/template
@@ -0,0 +1,16 @@
+# Template file for 'exec-on-git-staged'
+pkgname=exec-on-git-staged
+version=1.1.0
+revision=1
+archs=noarch
+depends="git"
+short_desc="Execute commands on staged tree"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/jcgruenhage/exec-on-git-staged"
+distfiles="https://github.com/jcgruenhage/exec-on-git-staged/archive/v${version}.tar.gz"
+checksum=c163104e8d9539bec253275fd32a4241717db0f502bb43654a52d70ba71b745d
+
+do_install() {
+	vbin exec-on-git-staged
+}
diff --git a/srcpkgs/execline/template b/srcpkgs/execline/template
index 154cf56a200..887045b728d 100644
--- a/srcpkgs/execline/template
+++ b/srcpkgs/execline/template
@@ -1,6 +1,6 @@
 # Template file for 'execline'
 pkgname=execline
-version=2.5.1.0
+version=2.5.2.0
 revision=1
 build_style=configure
 makedepends="skalibs-devel"
@@ -13,7 +13,7 @@ license="ISC"
 homepage="https://skarnet.org/software/execline/"
 changelog="https://skarnet.org/software/execline/upgrade.html"
 distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=b1a756842947488404db8173bbae179d6e78b6ef551ec683acca540ecaf22677
+checksum=280bb633cbe96088193225729ad32d80493d68380a127e6bc1789aac64375e29
 
 CFLAGS="-fPIC"
 
diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template
index d22bf6a2f65..e76784b1b23 100644
--- a/srcpkgs/exiftool/template
+++ b/srcpkgs/exiftool/template
@@ -1,6 +1,6 @@
 # Template file for 'exiftool'
 pkgname=exiftool
-version=11.62
+version=11.71
 revision=1
 archs=noarch
 wrksrc="Image-ExifTool-${version}"
@@ -14,4 +14,4 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://www.sno.phy.queensu.ca/~phil/exiftool/"
 changelog="https://sno.phy.queensu.ca/~phil/exiftool/history.html"
 distfiles="https://www.sno.phy.queensu.ca/~phil/exiftool/Image-ExifTool-${version}.tar.gz"
-checksum=60c11ca7ab19d069582dd950da97e4e574fea83b4c14175a5a2418d8942c4731
+checksum=5258817bea57e0eb76d6783acb387f01bb5212ecb27e9db722f3e7f16cf0b5b5
diff --git a/srcpkgs/exiv2/patches/musl.patch b/srcpkgs/exiv2/patches/musl.patch
deleted file mode 100644
index 7baa5ba2b64..00000000000
--- a/srcpkgs/exiv2/patches/musl.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/src/futils.cpp b/src/futils.cpp
-index a30acd9..24250fa 100644
---- src/futils.cpp
-+++ src/futils.cpp
-@@ -54,7 +54,7 @@
- #include <stdexcept>
- 
- #ifdef EXV_HAVE_STRERROR_R
--#ifdef _GNU_SOURCE
-+#if defined(_GNU_SOURCE) && defined(__GLIBC__)
- extern char *strerror_r(int errnum, char *buf, size_t n);
- #else
- extern int strerror_r(int errnum, char *buf, size_t n);
-@@ -348,7 +348,7 @@ namespace Exiv2 {
-         std::ostringstream os;
- #ifdef EXV_HAVE_STRERROR_R
-         const size_t n = 1024;
--#ifdef _GNU_SOURCE
-+#if defined(_GNU_SOURCE) && defined(__GLIBC__)
-         char *buf = 0;
-         char buf2[n];
-         std::memset(buf2, 0x0, n);
-
diff --git a/srcpkgs/exiv2/template b/srcpkgs/exiv2/template
index 7bd2e2be5db..90696f471ca 100644
--- a/srcpkgs/exiv2/template
+++ b/srcpkgs/exiv2/template
@@ -1,6 +1,6 @@
 # Template file for 'exiv2'
 pkgname=exiv2
-version=0.27.0
+version=0.27.2
 revision=1
 wrksrc="exiv2-${version}-Source"
 build_style=cmake
@@ -9,17 +9,18 @@ makedepends="zlib-devel expat-devel"
 short_desc="Image metadata manipulation"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="http://www.exiv2.org"
-distfiles="http://www.exiv2.org/releases/exiv2-${version}-Source.tar.gz"
-checksum=ee88bc81539b73c65010651785d094fad0b39760a424b3c16c17e1856cfef2d7
+homepage="https://www.exiv2.org"
+distfiles="https://www.exiv2.org/builds/exiv2-${version}-Source.tar.gz"
+checksum=2652f56b912711327baff6dc0c90960818211cf7ab79bb5e1eb59320b78d153f
 
 exiv2-devel_package() {
 	depends="${makedepends} ${sourcepkg}-${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
+		vmove usr/lib/cmake
 		vmove usr/lib/pkgconfig
-		vmove usr/lib/*.a
-		vmove usr/lib/*.so
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
 	}
 }
diff --git a/srcpkgs/expat/template b/srcpkgs/expat/template
index fe72ec47a9b..b26e9ee9a93 100644
--- a/srcpkgs/expat/template
+++ b/srcpkgs/expat/template
@@ -1,14 +1,14 @@
 # Template file for 'expat'
 pkgname=expat
-version=2.2.7
+version=2.2.9
 revision=1
 build_style=gnu-configure
 short_desc="XML parser library written in C"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="http://expat.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/expat/${pkgname}-${version}.tar.bz2"
-checksum=cbc9102f4a31a8dafd42d642e9a3aa31e79a0aedaa1f6efd2795ebc83174ec18
+checksum=f1063084dc4302a427dabcca499c8312b3a32a29b7d2506653ecc8f950a9a237
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/expect/template b/srcpkgs/expect/template
index cc157437666..66936f261e7 100644
--- a/srcpkgs/expect/template
+++ b/srcpkgs/expect/template
@@ -1,9 +1,10 @@
 # Template file for 'expect'
 pkgname=expect
 version=5.45.4
-revision=1
+revision=2
 wrksrc=${pkgname}${version}
 build_style=gnu-configure
+make_check_target="test"
 makedepends="tcl-devel"
 short_desc="Programmed dialogue with interactive programs"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -11,13 +12,18 @@ license="Public Domain"
 homepage="http://www.nist.gov/el/msid/expect.cfm"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/Expect/${version}/${pkgname}${version}.tar.gz"
 checksum=49a7da83b0bdd9f46d04a04deec19c7767bb9a323e40c4781f89caf760b92c34
-make_check_target="test"
 nocross=yes
 
+alternatives="
+ mkpasswd:mkpasswd:/usr/bin/expect-mkpasswd
+ mkpasswd:mkpasswd.1:/usr/share/man/man1/expect-mkpasswd.1"
+
 LDFLAGS+=" -Wl,-rpath=/usr/lib:/usr/lib/${pkgname}${version}"
 
 post_install() {
 	rm ${DESTDIR}/usr/bin/weather
+	mv ${DESTDIR}/usr/bin/{,expect-}mkpasswd
+	mv ${DESTDIR}/usr/share/man/man1/{,expect-}mkpasswd.1
 }
 expect-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/extra-cmake-modules/template b/srcpkgs/extra-cmake-modules/template
index acbc140778a..dace69919fe 100644
--- a/srcpkgs/extra-cmake-modules/template
+++ b/srcpkgs/extra-cmake-modules/template
@@ -1,6 +1,6 @@
 # Template file for 'extra-cmake-modules'
 pkgname=extra-cmake-modules
-version=5.61.0
+version=5.63.0
 revision=1
 archs=noarch
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <johnz@posteo.net>"
 license="BSD-3-Clause"
 homepage="https://projects.kde.org/projects/kdesupport/extra-cmake-modules"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a86a3b12c8a540af822131a8d65586d985267b1d642c29b4815b6c7870bc126c
+checksum=79926a0a2c6f5aa760a5a63209a7cad641476591b9bf4e51819f4fb752280792
 
 post_install() {
 	vlicense COPYING-CMAKE-SCRIPTS
diff --git a/srcpkgs/extrace/template b/srcpkgs/extrace/template
index 9d1d5a286e2..da7cf1f1bfb 100644
--- a/srcpkgs/extrace/template
+++ b/srcpkgs/extrace/template
@@ -1,8 +1,9 @@
 # Template file for 'extrace'
 pkgname=extrace
 version=0.7
-revision=2
+revision=3
 build_style=gnu-makefile
+depends="libcap-progs"
 short_desc="Trace exec(2) calls system-wide"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later, BSD-2-Clause"
diff --git a/srcpkgs/extractpdfmark/template b/srcpkgs/extractpdfmark/template
index e52abb050ae..c42abd61a87 100644
--- a/srcpkgs/extractpdfmark/template
+++ b/srcpkgs/extractpdfmark/template
@@ -1,7 +1,7 @@
 # Template file for 'extractpdfmark'
 pkgname=extractpdfmark
 version=1.1.0
-revision=4
+revision=5
 build_wrksrc=build
 build_style=gnu-configure
 configure_script="../configure"
diff --git a/srcpkgs/f2fs-tools/template b/srcpkgs/f2fs-tools/template
index 77b37d14ee2..84c7744a71d 100644
--- a/srcpkgs/f2fs-tools/template
+++ b/srcpkgs/f2fs-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'f2fs-tools'
 pkgname=f2fs-tools
-version=1.12.0
-revision=2
+version=1.13.0
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static ac_cv_file__git=yes"
 hostmakedepends="automake libtool pkg-config git"
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git"
 distfiles="https://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/${pkgname}-${version}.tar.gz"
-checksum=e2124e4dffaba865d41495d817bcb924d096adaec67ff777b8c7da99aa13f696
+checksum=b39d3ae9224267aab0070b5f17d91d0c5143f6d960166a27f6b11c8c87072c7d
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) makedepends+=" musl-legacy-compat"
diff --git a/srcpkgs/faketime/template b/srcpkgs/faketime/template
index 614743b1a8a..ba9acf87766 100644
--- a/srcpkgs/faketime/template
+++ b/srcpkgs/faketime/template
@@ -1,14 +1,14 @@
 # Template file for 'faketime'
 pkgname=faketime
-version=0.9.7
+version=0.9.8
 revision=1
+wrksrc=lib$pkgname-$version
 build_style=gnu-makefile
-short_desc="modifies the system time for a single application"
+short_desc="Modifies the system time for a single application"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-3"
+license="GPL-2.0-only"
 homepage="https://github.com/wolfcw/libfaketime"
 distfiles="https://github.com/wolfcw/libfaketime/archive/v$version.tar.gz"
-checksum=4d65f368b2d53ee2f93a25d5e9541ce27357f2b95e5e5afff210e0805042811e
+checksum=06288237cd5890eca148489e5b904ed852ed0ffa8424bfb479342f4daa8442a3
 CFLAGS='-fPIC -DPREFIX=\"/usr\" -DLIBDIRNAME=\"/lib/faketime\"'
 LDFLAGS='-lpthread'
-wrksrc=lib$pkgname-$version
diff --git a/srcpkgs/fastmod/template b/srcpkgs/fastmod/template
index 8bc8629d07f..2297553303f 100644
--- a/srcpkgs/fastmod/template
+++ b/srcpkgs/fastmod/template
@@ -1,6 +1,6 @@
 # Template file for 'fastmod'
 pkgname=fastmod
-version=0.2.5
+version=0.2.6
 revision=1
 build_style=cargo
 short_desc="Tool for partially automating codebase refactors"
@@ -8,4 +8,4 @@ maintainer="Adam Beckmeyer <adam_gpg@thebeckmeyers.xyz>"
 license="Apache-2.0"
 homepage="https://github.com/facebookincubator/fastmod"
 distfiles="https://github.com/facebookincubator/fastmod/archive/v${version}.tar.gz"
-checksum=fe90fb206a0e1081328423a68b931f2c381205366fcce7daee3e84c59023d629
+checksum=b70f615e883cc6cc235b62ee15ec2ec7ef4b04618b42fb79d8ee807440f6cf3c
diff --git a/srcpkgs/fatrace/template b/srcpkgs/fatrace/template
index ab39e67c22f..dae605bdd22 100644
--- a/srcpkgs/fatrace/template
+++ b/srcpkgs/fatrace/template
@@ -1,16 +1,15 @@
 # Template file for 'fatrace'
 pkgname=fatrace
-version=0.13
+version=0.14
 revision=1
 build_style=gnu-makefile
 short_desc="Report system wide file access events"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="http://launchpad.net/fatrace"
-distfiles="http://launchpad.net/fatrace/trunk/${version}/+download/${pkgname}-${version}.tar.bz2"
-checksum=7d8b0670896b10600c89caedeec52c26237260d5a20fdea7049cd97f57213043
+distfiles="http://launchpad.net/fatrace/trunk/${version}/+download/${pkgname}-${version}.tar.xz"
+checksum=d876999a801398e981e1a4d09b2259b92249fc55f05b31e60010deb27557bb8c
 
 post_extract() {
 	sed -i 's/sbin/bin/g' Makefile
-	sed -i 's/KERNEL_O_LARGEFILE 00100000/KERNEL_O_LARGEFILE 0/g' fatrace.c
 }
diff --git a/srcpkgs/fava/template b/srcpkgs/fava/template
index 83d3632fc58..24e66cac45b 100644
--- a/srcpkgs/fava/template
+++ b/srcpkgs/fava/template
@@ -1,6 +1,6 @@
 # Template file for 'fava'
 pkgname=fava
-version=1.10
+version=1.11
 revision=1
 archs=noarch
 build_style=python3-module
@@ -9,12 +9,18 @@ hostmakedepends="python3-setuptools"
 depends="python3-Babel python3-Cheroot python3-Flask-Babel python3-Flask
  python3-Jinja2 beancount python3-click python3-markdown2 python3-ply
  python3-simplejson"
+checkdepends="$depends"
 short_desc="Web interface for Beancount"
 maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"
 license="MIT"
 homepage="https://beancount.github.io/fava/"
 distfiles="${PYPI_SITE}/f/fava/fava-${version}.tar.gz"
-checksum=5207d0ee49f86b5f7520ea7d556e769321853bb8eaa760acc606e4f76d49a990
+checksum=0cfeb20e2082a64aae1cda76538a9cca9f5027a19ad174ad742fa2ec2aeed93f
+
+do_check() {
+	# CLI test expects fava on $PATH.  Not sure why static_url fails.
+	python3 -m pytest tests -k 'not cli and not static_url'
+}
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/fd/template b/srcpkgs/fd/template
index bf7396a727d..2094d0dd5f0 100644
--- a/srcpkgs/fd/template
+++ b/srcpkgs/fd/template
@@ -1,6 +1,6 @@
 # Template file for 'fd'
 pkgname=fd
-version=7.3.0
+version=7.4.0
 revision=1
 build_style=cargo
 short_desc="Simple, fast and user-friendly alternative to find"
@@ -8,7 +8,7 @@ maintainer="Jerry Tegno <jerrytegno@gmail.com>"
 license="Apache-2.0, MIT"
 homepage="https://github.com/sharkdp/fd"
 distfiles="https://github.com/sharkdp/fd/archive/v${version}.tar.gz"
-checksum=fbd48cc83c90a0ab09fc3bbe865708a3a528876a99f8304a17d07af7fb378170
+checksum=33570ba65e7f8b438746cb92bb9bc4a6030b482a0d50db37c830c4e315877537
 
 case "$XBPS_TARGET_MACHINE" in
 	aarch64-musl) broken="MAP_32BIT; not found in libc" ;;
diff --git a/srcpkgs/fdk-aac/template b/srcpkgs/fdk-aac/template
index 43076213592..05db31c4647 100644
--- a/srcpkgs/fdk-aac/template
+++ b/srcpkgs/fdk-aac/template
@@ -1,6 +1,6 @@
 # Template file for 'fdk-aac'
 pkgname=fdk-aac
-version=2.0.0
+version=2.0.1
 revision=1
 build_style=gnu-configure
 short_desc="Fraunhofer FDK AAC codec library"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Fraunhofer FDK AAC Codec license"
 homepage="http://www.iis.fraunhofer.de/en/ff/amm/impl/fdkaaccodec.html"
 distfiles="${SOURCEFORGE_SITE}/opencore-amr/${pkgname}-${version}.tar.gz"
-checksum=f7d6e60f978ff1db952f7d5c3e96751816f5aef238ecf1d876972697b85fd96c
+checksum=840133aa9412153894af03b27b03dde1188772442c316a4ce2a24ed70093f271
 
 post_install() {
 	vlicense NOTICE LICENSE
diff --git a/srcpkgs/fetchmail/patches/patch-socket_c.diff b/srcpkgs/fetchmail/patches/patch-socket_c.diff
deleted file mode 100644
index 6f92aef0258..00000000000
--- a/srcpkgs/fetchmail/patches/patch-socket_c.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-$OpenBSD: patch-socket_c,v 1.9 2015/08/25 17:44:09 jca Exp $
-
-Fixed upstream
-
-  https://gitlab.com/fetchmail/fetchmail/commit/a2ae6f8d15d7caf815d7bdd13df833fd1b2af5cc
-
---- socket.c.orig	Fri Jul 17 22:01:09 2015
-+++ socket.c	Fri Jul 17 22:19:47 2015
-@@ -914,7 +914,12 @@ int SSLOpen(int sock, char *mycert, char *mykey, const
- 			return -1;
- #endif
- 		} else if(!strcasecmp("ssl3",myproto)) {
-+#if HAVE_DECL_SSLV3_CLIENT_METHOD + 0 > 0
- 			_ctx[sock] = SSL_CTX_new(SSLv3_client_method());
-+#else
-+			report(stderr, GT_("Your operating system does not support SSLv3.\n"));
-+			return -1;
-+#endif
- 		} else if(!strcasecmp("tls1",myproto)) {
- 			_ctx[sock] = SSL_CTX_new(TLSv1_client_method());
- 		} else if (!strcasecmp("ssl23",myproto)) {
diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template
index 45e8c1efa2a..706d3b4fa0e 100644
--- a/srcpkgs/fetchmail/template
+++ b/srcpkgs/fetchmail/template
@@ -1,15 +1,15 @@
 # Template file for 'fetchmail'
 pkgname=fetchmail
-version=6.3.26
-revision=15
+version=6.4.1
+revision=1
 build_style=gnu-configure
 configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="python-devel"
 makedepends="libressl-devel"
 depends="python"
-short_desc="A remote-mail retrieval utility"
+short_desc="Remote-mail retrieval utility"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="http://fetchmail.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=79b4c54cdbaf02c1a9a691d9948fcb1a77a1591a813e904283a8b614b757e850
+checksum=3f33f11dd08c3e8cc3e9d18eec686b1626d4818f4d5a72791507bbc4dce6a9a0
diff --git a/srcpkgs/ffcall/template b/srcpkgs/ffcall/template
index 62b9560e70d..874a2344a71 100644
--- a/srcpkgs/ffcall/template
+++ b/srcpkgs/ffcall/template
@@ -1,6 +1,6 @@
 # Template file for 'ffcall'
 pkgname=ffcall
-version=2.1
+version=2.2
 revision=1
 wrksrc="libffcall-${version}"
 build_style=gnu-configure
@@ -9,7 +9,7 @@ maintainer="Martin Riese <grauehaare@gmx.de>"
 license="GPL-2.0-or-later"
 homepage="https://www.gnu.org/software/libffcall"
 distfiles="${GNU_SITE}/libffcall/libffcall-${version}.tar.gz"
-checksum=a091fb8bbabf17c94a2dae2d41161b96a08ab92b5f75d3364157a2c34d538c47
+checksum=ebfa37f97b6c94fac24ecf3193f9fc829517cf81aee9ac2d191af993d73cb747
 
 # won't work with parallel_build so just turn it off (thanks to JuanRP for the Hint)
 disable_parallel_build=yes
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index f38a74a5e71..01287fc19a3 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -1,7 +1,7 @@
 # Template file for 'ffmpeg'
 # audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
 pkgname=ffmpeg
-version=4.2
+version=4.2.1
 revision=1
 short_desc="Decoding, encoding and streaming software"
 maintainer="Johannes <johannes.brechtmann@gmail.com>"
@@ -9,7 +9,7 @@ license="GPL-3.0-or-later"
 homepage="https://www.ffmpeg.org"
 changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog"
 distfiles="${homepage}/releases/ffmpeg-${version}.tar.xz"
-checksum=023f10831a97ad93d798f53a3640e55cd564abfeba807ecbe8524dac4fedecd5
+checksum=cec7c87e9b60d174509e263ac4011b522385fd0775292e1670ecc1180c9bb6d4
 
 hostmakedepends="pkg-config perl yasm"
 makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel
@@ -21,10 +21,11 @@ makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-deve
  $(vopt_if vdpau libvdpau-devel) $(vopt_if v4l2 v4l-utils-devel) libbs2b-devel
  libvidstab-devel $(vopt_if faac faac-devel) $(vopt_if fdk_aac fdk-aac-devel)
  $(vopt_if vpx libvpx-devel) $(vopt_if aom libaom-devel)
- $(vopt_if nvenc nv-codec-headers) $(vopt_if sndio sndio-devel)"
+ $(vopt_if nvenc nv-codec-headers) $(vopt_if sndio sndio-devel)
+ $(vopt_if dav1d libdav1d-devel)"
 
-build_options="x265 v4l2 vaapi vdpau vpx faac fdk_aac aom nvenc sndio pulseaudio"
-build_options_default="x265 v4l2 vpx sndio pulseaudio"
+build_options="x265 v4l2 vaapi vdpau vpx faac fdk_aac aom nvenc sndio pulseaudio dav1d"
+build_options_default="x265 v4l2 vpx sndio pulseaudio dav1d"
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*) build_options_default+=" vaapi vdpau nvenc";;
@@ -74,7 +75,8 @@ do_configure() {
 		$(vopt_if x265 '--enable-libx265' '--disable-libx265') \
 		$(vopt_if v4l2 '--enable-libv4l2' '--disable-libv4l2') \
 		$(vopt_enable aom libaom) $(vopt_enable vaapi) $(vopt_enable vdpau) \
-		--enable-libbs2b --enable-avresample --enable-libvidstab
+		--enable-libbs2b --enable-avresample --enable-libvidstab \
+		$(vopt_if dav1d '--enable-libdav1d')
 }
 do_build() {
 	rm ${XBPS_WRAPPERDIR}/strip
diff --git a/srcpkgs/ffmpegthumbnailer/template b/srcpkgs/ffmpegthumbnailer/template
index 9fd2f4ec011..ab627032c2e 100644
--- a/srcpkgs/ffmpegthumbnailer/template
+++ b/srcpkgs/ffmpegthumbnailer/template
@@ -1,7 +1,7 @@
 # Template file for 'ffmpegthumbnailer'
 pkgname=ffmpegthumbnailer
-version=2.2.0
-revision=4
+version=2.2.2
+revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="libpng-devel libjpeg-turbo-devel ffmpeg-devel"
@@ -11,15 +11,12 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/dirkvdb/${pkgname}"
 distfiles="${homepage}/releases/download/${version}/${pkgname}-${version}.tar.bz2"
-checksum=e5c31299d064968198cd378f7488e52cd5e738fac998eea780bc77d7f32238c2
+checksum=1cb24059c38223f657b300c84dd80491b7040d4b69471c4fea69be862bc99b5b
 
-CXXFLAGS="-D_GLIBCXX_USE_C99_STDIO=1 -D_GLIBCXX_USE_C99_STDLIB=1"
-
-post_configure() {
-	# Patch wrong man1 path
-	sed -e 's;DESTINATION "/usr/man/man1";DESTINATION "/usr/share/man/man1";' \
-		-i ${wrksrc}/build/cmake_install.cmake
+post_install() {
+	vinstall dist/ffmpegthumbnailer.thumbnailer 644 usr/share/thumbnailers
 }
+
 ffmpegthumbnailer-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
diff --git a/srcpkgs/ffmpegthumbs/template b/srcpkgs/ffmpegthumbs/template
index 870aca2b770..ed00015b1bc 100644
--- a/srcpkgs/ffmpegthumbs/template
+++ b/srcpkgs/ffmpegthumbs/template
@@ -1,6 +1,6 @@
 # Template file for 'ffmpegthumbs'
 pkgname=ffmpegthumbs
-version=19.04.3
+version=19.08.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,4 +12,4 @@ maintainer="Michael Straube <straubem@gmx.de>"
 license="GPL-2.0-or-later"
 homepage="${KDE_SITE}/applications"
 distfiles="${KDE_SITE}/applications/${version}/src/ffmpegthumbs-${version}.tar.xz"
-checksum=ddd6cb3388c1af96a14d611de9575f6f6c22c6acfe52e63e44b746709ac8024b
+checksum=deba57ff10525efdf404401f6b605c1be0f02ec0bfe00465e080b42dc379d570
diff --git a/srcpkgs/ffsend/template b/srcpkgs/ffsend/template
index c897b5f2e8d..3b9af5402a2 100644
--- a/srcpkgs/ffsend/template
+++ b/srcpkgs/ffsend/template
@@ -1,6 +1,6 @@
 # Template file for 'ffsend'
 pkgname=ffsend
-version=0.2.49
+version=0.2.52
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
@@ -10,4 +10,4 @@ maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/timvisee/ffsend"
 distfiles="https://github.com/timvisee/ffsend/archive/v${version}.tar.gz"
-checksum=3f39dd5f8be525904f4486228fcd51c7f3c0263e23eba096d6f6ceb71e6d73f5
+checksum=b5fd937604eeccd85d7b30d8510784d95497c2412da29c586430275db55043ef
diff --git a/srcpkgs/ffuf/template b/srcpkgs/ffuf/template
new file mode 100644
index 00000000000..9ba257e4a61
--- /dev/null
+++ b/srcpkgs/ffuf/template
@@ -0,0 +1,16 @@
+# Template file for 'ffuf'
+pkgname=ffuf
+version=0.10
+revision=1
+build_style=go
+go_import_path="github.com/ffuf/ffuf"
+short_desc="Fast web fuzzer"
+maintainer="Andrew Benson <abenson+void@gmail.com>"
+license="MIT"
+homepage="https://github.com/ffuf/ffuf"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=7efbedace2798dd970a801ed2ede6ef41ef48414140efda71f8018e7df23edf3
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/fierce/template b/srcpkgs/fierce/template
new file mode 100644
index 00000000000..86dedb39ad2
--- /dev/null
+++ b/srcpkgs/fierce/template
@@ -0,0 +1,15 @@
+# Template file for 'fierce'
+pkgname=fierce
+version=1.3.0
+revision=1
+archs=noarch
+build_style=python3-module
+pycompile_module="fierce"
+hostmakedepends="python3-setuptools"
+depends="python3-dnspython"
+short_desc="DNS reconnaissance tool"
+maintainer="Andrew Benson <abenson+void@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/mschwager/fierce"
+distfiles="${homepage}/archive/${version}.tar.gz"
+checksum=ca6938c6ecb2cb3ff0484ee3d90566e044bf35c30237e921d439310fa6cb788b
diff --git a/srcpkgs/figurine/template b/srcpkgs/figurine/template
index 522e604fe6f..bef430fa4ba 100644
--- a/srcpkgs/figurine/template
+++ b/srcpkgs/figurine/template
@@ -1,7 +1,7 @@
 # Template file for 'figurine'
 pkgname=figurine
-version=0.3.0
-revision=2
+version=1.0.1
+revision=1
 build_style=go
 go_import_path=github.com/arsham/figurine
 hostmakedepends="git"
@@ -10,4 +10,4 @@ maintainer="travankor <travankor@tuta.io>"
 license="Apache-2.0"
 homepage="https://github.com/arsham/figurine"
 distfiles="https://github.com/arsham/figurine/archive/v${version}.tar.gz"
-checksum=beea08f1bfcf2d5875dfaa948b43772304f552945a5a299910117b4208280488
+checksum=5af66e90009dae130b8e75678d038ba770b46b8488bff975f5f0f52c0e928bd6
diff --git a/srcpkgs/file-roller/template b/srcpkgs/file-roller/template
index 278635cab95..837fdb7a7af 100644
--- a/srcpkgs/file-roller/template
+++ b/srcpkgs/file-roller/template
@@ -1,6 +1,6 @@
 # Template file for 'file-roller'
 pkgname=file-roller
-version=3.32.1
+version=3.32.2
 revision=1
 build_style=meson
 hostmakedepends="glib-devel itstool pkg-config"
@@ -12,4 +12,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/FileRoller"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1cab0847845b3236725a99f81a638c504d06ac0576c7a947824208e498383547
+checksum=c60a79e0baf74cb1c09a1c8f5ffe0d6e311227ca14ecc5b1156beb3715341a71
diff --git a/srcpkgs/filelight/template b/srcpkgs/filelight/template
index 42571cfc632..23a704a1ed8 100644
--- a/srcpkgs/filelight/template
+++ b/srcpkgs/filelight/template
@@ -1,17 +1,14 @@
 # Template file for 'filelight'
 pkgname=filelight
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules kcoreaddons"
+hostmakedepends="extra-cmake-modules kcoreaddons kdoctools
+ qt5-host-tools qt5-qmake"
 makedepends="kparts-devel qt5-devel"
 short_desc="Interactive map that helps visualize disk usage on your computer"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://utils.kde.org/projects/filelight/"
 distfiles="${KDE_SITE}/applications/${version}/src/filelight-${version}.tar.xz"
-checksum=bdd3d32f6666b3d2fa4c614f5f058571c8849484e1ba17a97996680503f8e8e6
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" kconfig kdoctools python qt5-host-tools qt5-qmake"
-fi
+checksum=313ff23fceb427509b37efa012535e651618d42bde35c62cdc7732e463c346a6
diff --git a/srcpkgs/filezilla/template b/srcpkgs/filezilla/template
index aca479c816f..c6de4dde1c3 100644
--- a/srcpkgs/filezilla/template
+++ b/srcpkgs/filezilla/template
@@ -1,6 +1,6 @@
 # Template file for 'filezilla'
 pkgname=filezilla
-version=3.44.2
+version=3.45.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-manualupdatecheck --disable-autoupdatecheck
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later"
 homepage="https://filezilla-project.org"
 changelog="https://svn.filezilla-project.org/filezilla/FileZilla3/trunk/NEWS?view=co"
 distfiles="https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2"
-checksum=5d4d20105859cee72be3ac171e844080f58031f5f96ee483bf86d6bfbc09deb6
+checksum=889c08a7247f05507ca4bd76f4e2cd0e0504deb1815c7a2a28d8cfbdaa9d1ec2
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wxWidgets-gtk3-devel xdg-utils"
diff --git a/srcpkgs/findutils/patches/gnulib-freadahead.patch b/srcpkgs/findutils/patches/gnulib-freadahead.patch
deleted file mode 100644
index 5d8e5af28bf..00000000000
--- a/srcpkgs/findutils/patches/gnulib-freadahead.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gl/lib/freadahead.c
-+++ gl/lib/freadahead.c
-@@ -30,7 +30,7 @@ extern size_t __sreadahead (FILE *);
- size_t
- freadahead (FILE *fp)
- {
--#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-   if (fp->_IO_write_ptr > fp->_IO_write_base)
-     return 0;
-   return (fp->_IO_read_end - fp->_IO_read_ptr)
diff --git a/srcpkgs/findutils/patches/gnulib-fseeko.patch b/srcpkgs/findutils/patches/gnulib-fseeko.patch
deleted file mode 100644
index 6d4c75ac737..00000000000
--- a/srcpkgs/findutils/patches/gnulib-fseeko.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- gl/lib/fseeko.c
-+++ gl/lib/fseeko.c
-@@ -47,7 +47,7 @@ fseeko (FILE *fp, off_t offset, int whence)
- #endif
- 
-   /* These tests are based on fpurge.c.  */
--#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-   if (fp->_IO_read_end == fp->_IO_read_ptr
-       && fp->_IO_write_ptr == fp->_IO_write_base
-       && fp->_IO_save_base == NULL)
-@@ -123,7 +123,7 @@ fseeko (FILE *fp, off_t offset, int whence)
-           return -1;
-         }
- 
--#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-       fp->_flags &= ~_IO_EOF_SEEN;
-       fp->_offset = pos;
- #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
-
diff --git a/srcpkgs/findutils/patches/gnulib-mountlist.patch b/srcpkgs/findutils/patches/gnulib-mountlist.patch
deleted file mode 100644
index bb58385a69a..00000000000
--- a/srcpkgs/findutils/patches/gnulib-mountlist.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- gl/lib/mountlist.c
-+++ gl/lib/mountlist.c
-@@ -37,6 +37,12 @@
- # include <sys/param.h>
- #endif
- 
-+#if MAJOR_IN_MKDEV
-+# include <sys/mkdev.h>
-+#elif MAJOR_IN_SYSMACROS
-+# include <sys/sysmacros.h>
-+#endif
-+
- #if defined MOUNTED_GETFSSTAT   /* OSF_1 and Darwin1.3.x */
- # if HAVE_SYS_UCRED_H
- #  include <grp.h> /* needed on OSF V4.0 for definition of NGROUPS,
diff --git a/srcpkgs/findutils/patches/gnulib-stdio-impl.patch b/srcpkgs/findutils/patches/gnulib-stdio-impl.patch
deleted file mode 100644
index e054879d577..00000000000
--- a/srcpkgs/findutils/patches/gnulib-stdio-impl.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- gl/lib/stdio-impl.h
-+++ gl/lib/stdio-impl.h
-@@ -18,6 +18,12 @@
-    the same implementation of stdio extension API, except that some fields
-    have different naming conventions, or their access requires some casts.  */
- 
-+/* Glibc 2.28 made _IO_IN_BACKUP private.  For now, work around this
-+   problem by defining it ourselves.  FIXME: Do not rely on glibc
-+   internals.  */
-+#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN
-+# define _IO_IN_BACKUP 0x100
-+#endif
- 
- /* BSD stdio derived implementations.  */
diff --git a/srcpkgs/findutils/template b/srcpkgs/findutils/template
index d2e6737291f..2155bdd80bd 100644
--- a/srcpkgs/findutils/template
+++ b/srcpkgs/findutils/template
@@ -1,16 +1,16 @@
 # Template file for 'findutils'
 pkgname=findutils
-version=4.6.0
-revision=4
+version=4.7.0
+revision=1
 bootstrap=yes
 build_style=gnu-configure
 configure_args="--program-prefix=g"
-short_desc="The GNU Find Utilities"
+short_desc="GNU Find Utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="http://www.gnu.org/software/findutils"
-distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=ded4c9f73731cd48fec3b6bdaccce896473b6d8e337e9612e16cf1431bb1169d
+distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
+checksum=c5fefbdf9858f7e4feb86f036e1247a54c79fc2d8e4b7064d5aaa1f47dfa789a
 
 alternatives="
  xargs:xargs:/usr/bin/gxargs
diff --git a/srcpkgs/fio/template b/srcpkgs/fio/template
index 540c8d4584a..74f9a2b02c6 100644
--- a/srcpkgs/fio/template
+++ b/srcpkgs/fio/template
@@ -1,6 +1,6 @@
 # Template file for 'fio'
 pkgname=fio
-version=3.15
+version=3.16
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=configure
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/axboe/fio"
 distfiles="https://github.com/axboe/${pkgname}/archive/${pkgname}-${version}.tar.gz"
-checksum=c0c0e40e770abcd5ab013af4bd8b16dfa83645145871063939db2a14270e2545
+checksum=c7731a9e831581bab7104da9ea60c9f44e594438dbe95dff26726ca0285e7b93
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*|ppc64*) makedepends+=" libnuma-devel"
diff --git a/srcpkgs/firebird3/template b/srcpkgs/firebird3/template
index f163475c253..1adc010439f 100644
--- a/srcpkgs/firebird3/template
+++ b/srcpkgs/firebird3/template
@@ -42,6 +42,13 @@ CFLAGS="-fno-strict-aliasing"
 CXXFLAGS="-fno-delete-null-pointer-checks"
 
 pre_configure() {
+	# musl does not have gcrt1.o needed for -p
+	case "$XBPS_TARGET_MACHINE" in
+		ppc*-musl)
+			sed -i '/FLAGS=/s/ \-p / /g' builds/posix/prefix.linux_powerpc*
+			;;
+	esac
+
 	# Avoid errors telling we are not 'root' and
 	# do not change ownership to root:root and
 	# do not change permissions to read-only
diff --git a/srcpkgs/firefox-esr-i18n-as b/srcpkgs/firefox-esr-i18n-bn
similarity index 100%
rename from srcpkgs/firefox-esr-i18n-as
rename to srcpkgs/firefox-esr-i18n-bn
diff --git a/srcpkgs/firefox-esr-i18n-bn-BD b/srcpkgs/firefox-esr-i18n-en-CA
similarity index 100%
rename from srcpkgs/firefox-esr-i18n-bn-BD
rename to srcpkgs/firefox-esr-i18n-en-CA
diff --git a/srcpkgs/firefox-esr-i18n-bn-IN b/srcpkgs/firefox-esr-i18n-ia
similarity index 100%
rename from srcpkgs/firefox-esr-i18n-bn-IN
rename to srcpkgs/firefox-esr-i18n-ia
diff --git a/srcpkgs/firefox-esr-i18n-en-ZA b/srcpkgs/firefox-esr-i18n-ne-NP
similarity index 100%
rename from srcpkgs/firefox-esr-i18n-en-ZA
rename to srcpkgs/firefox-esr-i18n-ne-NP
diff --git a/srcpkgs/firefox-esr-i18n-mai b/srcpkgs/firefox-esr-i18n-oc
similarity index 100%
rename from srcpkgs/firefox-esr-i18n-mai
rename to srcpkgs/firefox-esr-i18n-oc
diff --git a/srcpkgs/firefox-esr-i18n-or b/srcpkgs/firefox-esr-i18n-or
deleted file mode 120000
index 0707c37f205..00000000000
--- a/srcpkgs/firefox-esr-i18n-or
+++ /dev/null
@@ -1 +0,0 @@
-firefox-esr-i18n
\ No newline at end of file
diff --git a/srcpkgs/firefox-esr-i18n-ml b/srcpkgs/firefox-esr-i18n-ur
similarity index 100%
rename from srcpkgs/firefox-esr-i18n-ml
rename to srcpkgs/firefox-esr-i18n-ur
diff --git a/srcpkgs/firefox-esr-i18n/files/update-lang-list b/srcpkgs/firefox-esr-i18n/files/update-lang-list
new file mode 120000
index 00000000000..d6e91286846
--- /dev/null
+++ b/srcpkgs/firefox-esr-i18n/files/update-lang-list
@@ -0,0 +1 @@
+../../firefox-i18n/files/update-lang-list
\ No newline at end of file
diff --git a/srcpkgs/firefox-esr-i18n/template b/srcpkgs/firefox-esr-i18n/template
index 8c43a8ace7c..b4e17fb16f0 100644
--- a/srcpkgs/firefox-esr-i18n/template
+++ b/srcpkgs/firefox-esr-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-esr-i18n'
 pkgname=firefox-esr-i18n
-version=60.8.0
+version=68.1.0
 revision=1
 build_style=meta
 homepage="https://www.mozilla.org/firefox/"
@@ -19,13 +19,11 @@ _languages=(
 	'af     "Afrikaans"'
 	'an     "Aragonese"'
 	'ar     "Arabic"'
-	'as     "Assamese"'
 	'ast    "Asturian"'
 	'az     "Azerbaijani"'
 	'be     "Belarusian"'
 	'bg     "Bulgarian"'
-	'bn-BD  "Bengali (Bangladesh)"'
-	'bn-IN  "Bengali (India)"'
+	'bn     "Bengali"'
 	'br     "Breton"'
 	'bs     "Bosnian"'
 	'ca     "Catalan"'
@@ -36,9 +34,9 @@ _languages=(
 	'de     "German"'
 	'dsb    "Lower Sorbian"'
 	'el     "Greek"'
+	'en-CA  "English (Canada)"'
 	'en-GB  "English (British)"'
 	'en-US  "English (US)"'
-	'en-ZA  "English (South African)"'
 	'eo     "Esperanto"'
 	'es-AR  "Spanish (Argentina)"'
 	'es-CL  "Spanish (Chile)"'
@@ -62,6 +60,7 @@ _languages=(
 	'hsb    "Upper Sorbian"'
 	'hu     "Hungarian"'
 	'hy-AM  "Armenian"'
+	'ia     "Interlingua"'
 	'id     "Indonesian"'
 	'is     "Icelandic"'
 	'it     "Italian"'
@@ -75,16 +74,15 @@ _languages=(
 	'lij    "Ligurian"'
 	'lt     "Lithuanian"'
 	'lv     "Latvian"'
-	'mai    "Maithili"'
 	'mk     "Macedonian"'
-	'ml     "Malayalam"'
 	'mr     "Marathi"'
 	'ms     "Malay"'
 	'my     "Burmese"'
 	'nb-NO  "Norwegian (Bokmål)"'
+	'ne-NP  "Nepali"'
 	'nl     "Dutch"'
 	'nn-NO  "Norwegian (Nynorsk)"'
-	'or     "Oriya"'
+	'oc     "Occitan"'
 	'pa-IN  "Punjabi"'
 	'pl     "Polish"'
 	'pt-BR  "Portuguese (Brazilian)"'
@@ -104,6 +102,7 @@ _languages=(
 	'th     "Thai"'
 	'tr     "Turkish"'
 	'uk     "Ukrainian"'
+	'ur     "Urdu"'
 	'uz     "Uzbek"'
 	'vi     "Vietnamese"'
 	'xh     "Xhosa"'
@@ -136,97 +135,96 @@ _pkgtmpl() {
 	}
 }
 
-checksum="ff8a0e5081e1bf6f1794ea47dab8f32f5b28580c423bccc149e16f4749e36c50
- eb86ab716a1d6a32bd102952f3ac13b7708ac9fdb947e72e0f66891f872c1cb0
- beb35664f371716cebd1a4a4c84b44129c381a1dc9a38dea19684fd5f15e407c
- 25e8cdd8d22a1073143e2c88e5d3c4d96b505edbe9c18bf29fb5fbf4c68db620
- 7a05659ee866abc198bd55169b189f8e1f4daa1259b28bef78918ee0e84ed669
- 610f0c658af4d93eb7d70a459317323845a641b229f1dd42c4ee66ee660067d9
- 021d5f86239831892335f8d4b434bff3e129b774588e8b49758b3ff97534b055
- b3d75d79148ef5000aaca5d6948e09dcc43673f9d51a91bd21c51eaee34a4bf0
- 6481896744f2a0e596f425de2590ab78e153463a8bd16fc9398bb0e6a2278f3c
- a03b62fe0dba6a9aaf080505299d632dec7eb98d2973c42b53330ec25695d9c7
- db332375bf0224ac90a0aec2475c70d0262f52a0f856ef5d244ba7ab8d89bb90
- ff234f75fe294bf4278d7976a7c44815f5aa9e981e9742fb322f19726a38dcbc
- 5f0d36853f12f5fc3d8a85874718bcef77103903cb732c370b4e301dffb38a51
- 6b336951b07e1dd63472027d7603439ee5384b3f6a814c7be34d0cdeac1bd4d0
- 21e196147819aab031a733a4ad78b4c67d77120cd8976e7aa0b364823a3beb01
- 4edbad866270ef310932149188d4e4b0d786abc22db3196430d9db9b9113e992
- 0acf0db94b5e56fd81c14a763e2b4dd32c10f21824464195e30adc7ed9e4c021
- 440ac13c8d241d537c7de382a10ca1da1716cc302dc200ac5039ac43efcfd8a6
- bb7fc4aeffeca0c89a2ba33a7c762f4764cd70334f74cfa5d4b51fc4449aabed
- feebf56ff307f191ebd2af9990840db9e3e447c0cfbdea3219320b108838202a
- 9ced74783c6e21ae934243b3558ba1ecbe2858b6cfe57a031389d4c91b4887dc
- 958ff950724abf9c593685991246325ff6d04f73ea9c518dcefe24e289770c9e
- d8f5ef61b8a2bbe021fef63d09cb8e83a848a8100331acecdd70c47cf0cf9d43
- db9f3432a6a364791e0c4c8e47516c60182a0640a8ef795e24b7fc2465c7a7b3
- 7558f05cc6319ef57cf54a176b41bb9ac6d4650de9099998d3d4ad83163d07cf
- 8f8ef308c6c5d06f20feae2e4f6b29aa0db271f1a91f1d3ad097aa7a51948384
- 987c9758f4a71bd3e7602cfd977a611fe28d58ae28f324ba1325382958735aa7
- 1ac4c54b7ed0bc407711c589328d192b1b49a4b23417d294bd3608bbc5f40581
- 71d5f764c000ad31f252fa36a94d6a178b552c1a9e4815ae883e7c490ed4d401
- 74441cfbfdbd111ab87318598dd4a3c8aaa4c4db2b86a12bc6cf41fa05881ea8
- 43bffe371b4cb25f21bf767f618631a96b24e72a658a72759f4bb6a06bc5bf32
- 50fa12cc74afb9faca4ebb8ae47d2e22756f4cae70e3c8169fbf0f568dc64fc8
- 85e3332ce6656d8df3a492ed837192df3991aab1314c1c5ef25a67bf61360cbf
- a3dadeaca0193cb249b087b165e1d6fbbd322cf06485a7cf1a35c090b4adeb31
- 55cbc207ea34d61519f48946c077cc9dfa17d24eed5310f58838af289ea0b60f
- 31c6f72f72743a4b085eb699627a3917e92531066388343a40ffc6412277027a
- 38f1b0d8091f864256464cec0e7f78f474020feb7c4748b84160c6e074088b60
- cf2c4efce1203eb8c8f8a984b90c61672cfe9a6d05da3cfecee52e12189301a0
- ca8e8da872f5053cfa15d8395d8f10a66794589833714538b0c67fd83c340466
- c15707031179223c545a4299306b3df107ded62b685363a5e3274e318b88f219
- c1699a128003f23ef5662919ed1b33c5d61caf914985e39853df29a1ba35828c
- 3fb4a2283723b2ef3709c88baeb99e77bbba33c9e835c2dfedf28c6b2ecad2fa
- 344b3b3149aa3b77f10f49b86a76c6ff0179043048093c541944058f620e8845
- b43880065a4a92aeff823e4913eabe953e88cafb9cd414b2f616475cd7af69af
- 94b414e2f89f030c131742de0d9ba48f13b16b40e06dd568c10cea417b57b5ba
- 177ca8c3883d9c5d7e4a84b79dbc7b64e430fabaa247b0cee78f9ef65e2b5aa0
- a2a071c6e3604287a99e78042b34d02d4d91b27d3b23b9ea90945da7d9456012
- ae57f94246c078f8e2d4b8c297b281115bb008a811bf2a783278deb916007da4
- a222763e7d2d5eda8a15869f85c19765111841a2ccf4d18993eb83f20bdf4933
- 7771989dad60a20756517a6f696d939039cf5f10aa47d271e2ff5c465bd7b4c0
- 389b3c1b09e744c8fe843e3784088ea72214571b975ea9d69aaeb7c4264a990b
- d5fea97921089f0b4a6a8667ddf19a430eca78223118818480a202e563088943
- 617b9daf4d828bc66fc8061601adc9c40b25f1338c5f527d9fbf83dfa3e8770b
- 87d2ec6cadb2a61909888af5cc80a4dacd64493d82d0282679ba3c597918fb07
- 1afe05f69af9bc0b0e37d1c6d0942073349b173433a41a83b3a732e6fa026511
- 68b80d99dc3ff2c2828622cdf7d21c32e6f00904a239eef3f5eedb8fb8476386
- 853ec1ad7ef319a60586902c5b3dec73e0800c7af2d94e44b549d4f03f114fd7
- d0c9e3dfd07994ebf26d4ad98ef997cb62c90c07f9d0e70c8b2f7771f39b1b95
- f5b14095e891af078ef256460a41b19e00fbcd81eba66e0331af8bc096288963
- bec28861d16cf418fa06d650765c3be8fbc02b69b41b079d3907bb01c3d8096a
- b042d80a54dbc7cd0fdf24ba3599404632d84635ae73204235dbf66ef7a35a26
- 7b791bfc3bd843a291d74d86f88c0a5a31af13d9da9f135841fd7859c442f733
- f12eb8be3a7ef93146c161f6ba02b9d9b892b792d0c190adb92398802f5365fe
- 49addce322b6020d69b65f72ee4e82a140cd0e712c647127f6fac5b66e6f51b5
- acdc9ae4ae7397ade4c4053dc3b1f22ef42cc844bf853e5e846d1f6b0c5d5cab
- 02ac07e226734f1f693283784816b3c96a48b4e592c676673901104c5dcc72b2
- b102cf97790415b804182743426e8eb1304675fb4bf360e64ae9055cce87b2f1
- f8988dfc783c4b39d8a3a44e1000c6376bc211ab6297a49eddf5194b71fdfbde
- 58cad897f3bd51b9a1fcb7d4e4d3fc6bac47e5b2d4c6c19096732556eaec1314
- 23af8e26632da7c5d791a8891295eb2a83cde54390d9cd17692525f6e32ff6ed
- 0d38ca007291146731793d1a2c7e07bad2d2ed82668dfbd5be14daacf7abdce7
- a5957711b3fd9665dd2fed5fdbbb0a2fcbce54ad43ccd6800ddf7ccf5be731e5
- fcc2580a8ab3e95d23af7ee373a9bfcdce52e2a5ce59bb59d1ba1dca75772239
- bc3a8480ff73c752cc1cbfa80c327b155b194553c3568534b9d20f7e2176df1e
- 196abc6109092f326b387f5cffad880e5b6a857203127cf1f76622ca5a823ad2
- 002109cec6f2e40fb4ffc07b04c72a8debd128357925e8d51e5a84614004a086
- 83be2c2c9f9c93c0c31c5d30c0e6fdef3df2381f7c62c64a8313066f64c98b0f
- c7c83b2c405c432c3de1c187cfc800025502b1931e07ff1108648e77279441ab
- 8156b74896fd7b69fc306f90f1fd5291316d3c9b4c5ab4df620cab8d782b466e
- 27ff153a51f800ea9620042acc47aad6b2392c3551a4be30e982652ef89fcdf2
- abbbd74fb4e2ce5cfb254837c8383c9cca637bbdfd05d403526a50b08806c050
- 0c6ada2d7bf26be43d4f3fa8f37581a1f1a3113c3399ebd328736802dbe7623f
- b8c50654545a923e7ad7ef43bb1f2ea56b845b3443ffa0410b9bb7a6be9b8b91
- 4e49460bd3cd763e9527c771c4030237700e2eb73a359fefce3bd2146db7d56e
- 82bab7b006ab019d2bf2d6b3ed9aa85796f8dc1f827ed7350b0286dbd19bbc78
- 9b6adcd828ed3c2bb4950df6a2634bc943768b3d852e2e258e52c7e2da7a5ca7
- ccd0aa23ba2662e766e2adcab201076dfdcfc5cf288e4c4bbeff6d0d3c451abb
- f3709e35f5d4d317733f943aec9e977fd83acc1eaa9a35cf149dbf05e345146c
- 282d60e14be013a29ba09611f7ebe37d1fa5fe6dd8e441a1f10270d4e10323d6
- 742960a8b13cab9901267237accfcbcded21018aff9b6fc1bfd0ab37b7c8b607
- 0ae68434908b9512c46f22a6f3149b0f611f77306887a7641527d5df55725517
- 432353f98d29dbec0bc0eb50f0316220f155dee755ea0b4cb45b0636a0fcffde
- 8c1bbca429dd81d9180639ed1e526892908d26c1784f5f9c37093577b82d25fe
- c9651a78d2d2395711d320f6fac1ffd37048d4bffc544a2f2e182cedd237d090"
+checksum="c3fafda87192d9b98dc9b2b99d62b7109dbd72f73e8d5de1ea2a418ed086317b
+ 93af0702aae30332eecdc0f407dc29080923660508018fca14fe1307fdf375a1
+ a40baf64e7376e4916fa96d7199bad099edc7e897d65b5ecc4a2dc9fdbba2e75
+ 1e915f6a0860f2f7f583a70a5668ec5033969fbba177c3d3da4e244d01ba5cb4
+ d6c45490cec27609f43fb9af406ba15e25fff544f10d038e650a5b25d2ba5a69
+ 2b5d84d3f7800d162b095d0ee77da8264af9eac3a98dfff7e14b26510c92be1e
+ f317a73af579bbb42bc6635900e5b529f5198daaf54c5a7f51756b7707747444
+ 6e65702a500ef4d2841eacbd9e16ca692d25a9aa3fcf38be2603657bfb03a80d
+ 7b056d739b64407e92a6738c8e3a5f6fe070380196c057d3f832be4015e7957c
+ 6bdd5ab6efd06bd384e227d78de6cffeac4c828ce6254d152e0137c70eb7b2e9
+ b60364c109f3fe94387bfb27258c65c09b7761248e309adb8f92eda0c6c1dddb
+ 3b91a27432306a6152f6cee7b19d684476c4282743259eb0e5f90db6483216e6
+ a17149908edf9a173b9d7ca3eac644cf45cd0e35ba40c565903ea9af9580e41e
+ b404f670ce1f3cc7fbdb170e9f0286e0a7608d779c5dae83ce5adee911876e6d
+ b41236a8ce2e96edf02165bd1ad91de967d8605ed7a9c77f079027ea0b13a7cf
+ 1f444a10561108bdfb98d43531c33d377a2565763d1299c96ef3c1f746b10555
+ f15e57588ccdf2a6be3b51fba066dc030e2808071b29957c3da844b272d1dd25
+ d51b8bdbc415fcdf5df587e364b8a3edb6296a988c38dbfb0fbec40b5dec856e
+ bcfbd612f55efff2dc98cdf9ff6ddf3d8e91274ead7d8d8bf1023cb28b815623
+ f711d9206635ac98b3eec788791089d1a64316dc55ad4be2f6043acca79317b8
+ a48efe9f0a885060fe2844ae056fb9de8932e45cfda399959ff8a4f54c99dc3f
+ c919c3557a66188ea7ab58210f6fe629f5e111bd73c0f94f298e4635c21b5f05
+ edf74a83a03f85dfb2172053cf1816736fdfb4c42fbacdf4626b128186fb15db
+ 76bc68c806add52aa205f9f6a55dd6c141ecfaa29ce5b63fe06cb8bf1ce0c567
+ af3763e63550893a001a651c5d89e4bb529004de98d58f2dc2a49336239171bf
+ 979725bd9b1b8aade54e0e24efdc2c716381130559615f45c007f0d68a0b0b69
+ db96fd8658bc75f4813ddaf457c888e3f0656dc407b12d7799dbdebb7cc1a9ae
+ ba5e81b435217c15e2d55a42d34e3313e9ad1302b34599a25b48a23846dfc920
+ fd3988b0ddcfa721fd702c126dd531f5b77f1f5af8ac61e8b23307c5b84e8e72
+ a58a245d30efb8ad6553166dd2469da504d6cf3c773e52da15c3677899f37c4e
+ 3fd377be34a8786a726a13c88d28b2b73155b1f527b2909e6841474631ce8226
+ 790af48c82bf520bcd8f915af77d1e0c8f156ae6c028b1fa0f39c3c991865d1c
+ 46b8071a1e23d8c5af1ced98cfbdb1a2258f679425434e092fbe1c42dfa26066
+ a4eefa1ff84e33059d055c984dbb47283d117cb63ad9e39d7cc4c4e61ea9c11a
+ 5a91be294ac35aac472c4ba8324221551abb2e8cb66f995806606c191dca0428
+ 9a4a582673dc466a684fd2beacbe77a152047e6023b1e247f5eda7b513e5e30d
+ 039af250c8b2dc6254b2f24975704095406c70090de9d21ecc73975d8d874675
+ 3c77fd2a4cfc49ff94994b46a9b80ea24e534299838dd64a11a5dc2ef110f901
+ feaeb14a016d732b3ec0be6266bd078fdf220c48c38683a4dd7315e076839b82
+ a4756471f45168ff28fdc0e87c65b33288ca1f7fd2eedb7e31a726ee4766fb3c
+ 4eb62cbed52d1cdad08551a38d1f7656c71ef986df49eee0381e9aec7b11c0ba
+ 8e967ef8ff1f1a2fc21ea537d629d40a38d6b8789ce344e79d7a3b3b78138968
+ e008e241c41900d6df1128d5dd55d41e1ed43d7c60d48329a321716968397b09
+ 7011776c661b07bc3fd7d24b62765aeee10ba2a72ea4112862989f759aceb466
+ 760c44d1512be5f10264d195785e45d47c46595ef57c24de81c070a81ba65456
+ 531ec7550a9ab4e2410e9c69495852eaa0e7df43e022ed7ec0f0c50e148a4506
+ c46413f7aa225147712fb634483f64c9368f43d03ba6f66405e4c9dc281421b4
+ 42debde9c9341fc910ff382e94fade233b3ad23e4f474d89426648c659a99a12
+ 50f1088649f77e0f83dffe3e81dd8ac993d1d8f06d8f231acdf98a69cda9147a
+ 2a4f6162bfbf5ea44c832c0d5896079b0ce69e590dc377e3bbd37a92f9780e6c
+ 60aa95eb50d59ddb2bf57d5cfacf860d4cc2c8b86a219f35ceaa30d82fd6e593
+ 73a416254d022b051bb38ebf085772c031ecba18ab4896634ba8599fcb396f7b
+ ae3aa802087754458465af30a4ddafc8baa08e101a4e177b144b4f606a78b941
+ 30c7498935e0d4529ccbe3a5c7671aec9505d0132cd6123f97c0680c80cbb917
+ 99b76ac0f7cf4c5d5ae8b66ae3e54e3932c6a6f101aba8b156cf8d78a67e3f0b
+ 1bcb69081c99b27781c81becce86baaf2f1da54ceba009904ad2a5a8614eaa68
+ bb3152472d5582b365722a83972b416d78b8bddfc6dbea40d1c778c37eb86623
+ 426115a07ce25b7d2ae89024bf81e8b5957df9d8709bd6e5c1da704633af3c85
+ 24918b9cd56f5fe12c7e02b0cedcdaf2abeeb7ec3cdb75a4aee3ca2d4aaaa961
+ 8497c47c4f151966538836b0dfa312a044d8496ffc4647fcf62c8ed19b2337d9
+ e160dd5b88f37562d7cbace3f46b8fd8edc5b9211f4240d8e38aec3dd81d915d
+ 298ab33911b8c425e6032eba867bc31925ea24b2457298bbf965bd6b194edc3f
+ 4c53367e4ddcff92733a95139baf9610390bf3eaf78ef5a5d10b4530c359e8eb
+ f340c62b77eaaa6bde0e61944c508b32785619ad4ca54b7dfbf281fcb986eac0
+ 99201be46e35f22312a27da2a2afc54f46043342a1c577fa64696ef365198329
+ 41e4d2d255435d2b50a8e0c4c59b13a0a0aafae925cd32e20bf9005cd066d11e
+ 266141c6c9a6729da904dfa040ae20d80a6b5c39efc31fcf2d039ed65e9c2b28
+ 33daee0ac659ec7d1fb1cb101798dae2ed0077653fc9170bcbb5bc554ee3e433
+ 23b74270aef1c6a4bff5194103a430e6854fe4c460e5c684769bd7c59d1afa0d
+ 9405687dbb0a81e8be8f842824f2fe65830b70a0dd0dcde84cc8a21d6637f841
+ 40a608e720136044f4b95728474fcb82764e61d649551be438e330b63753635f
+ 0ef710447a36e81a6c86b17ee28d2cf463242834936af2578074df6e11c2baea
+ 3f0d0d33abda068465d7747149cdf11a4b1dc819f7da7f1f7a3d9c2a45307231
+ 9d2c3438776531077e379e97a449e714882896c53dbb87052de7e7ac77ea3d67
+ de9b4ec945265f5539025fb73b713322924da2d1a51b5bd6ad1baba4584c76e1
+ 7b66c7d5e1b9eb6959295a76416271220e84ecc43a97a5f5f07ec99986579cb1
+ 4404f5fe56868f5c551208d72630b91a88c68f78d7463e8e1d221fd7406c0783
+ 3f55ec2730a870951759961c83d6654c7122a3114e136a6e2bce7c05d6062d89
+ 873819bc254911aa3a443d0a9db306b472f7f31af8d986d54c535bce67a4b1c0
+ 07326e95015601946706f50333c32b0919025376abcdf88dc225dae2c167b19a
+ bfdd58d9f0f0e809e6b801f65c722c61b4dbb5e6635cecd7390d1403f1dd6f42
+ 8c2d716291a28cc64f93078d2bdf8d756a6521e3b0107815788c48452eac95f0
+ 9b07735b4d8e8359e38d671ed054b373c4ed50a232013807d09ca4fae31e8223
+ 5592ee66611515f8583a48211d70764fdb28c54b1ad4de5b4b87a9d3b101a182
+ d36e2c9a894beb94b62855bd07d4b54e41fc96c0736b5e2e702422e75b3cf21e
+ caf7dd282fb6dc065eb6a0c124cd458716d877a500c094ff650c4d40302dd49e
+ 80bd3c70433f6b3aacdbd370b70d4fe0eab13547d1f6368b80eb5c28a759141a
+ 67b359947cbe15b2be1ad2567d74a36cfe5f27665a058b0fab19ed37ddd63a30
+ b3347d5cec7f9f6e3aa4b5ccdd49350fd0879c20938bfc22664782c377dd73a6
+ 79b512427977c359ec8f93e4880cd5397ccddb013676d2d39837f06433fe4041
+ 883d5daa5b041778b0984a7e86ecfc4892af1aed1ec09285ac031e335075524c
+ bc1981c7cb2e6d5aecec7fb0f370c1da52895f00d238c1afa2b4e31b93580eb6
+ 6278e5c054f50d3de62de9d070d21d2842d4d0ff9212d852af8eb672fad7ecea"
diff --git a/srcpkgs/firefox-esr/files/mozconfig b/srcpkgs/firefox-esr/files/mozconfig
index 5b3c6e46d6f..0798fdd40ef 100644
--- a/srcpkgs/firefox-esr/files/mozconfig
+++ b/srcpkgs/firefox-esr/files/mozconfig
@@ -1,11 +1,6 @@
 ac_add_options --prefix=/usr
 ac_add_options --libdir=/usr/lib
 
-ac_add_options --with-pthreads
-# XXX build without system cairo see:
-# - https://github.com/voidlinux/void-packages/issues/2308#issuecomment-135426813
-# - https://bugs.gentoo.org/show_bug.cgi?id=558150
-# ac_add_options --with-system-cairo
 ac_add_options --with-system-nspr
 ac_add_options --with-system-nss
 ac_add_options --with-system-bz2
@@ -39,7 +34,6 @@ ac_add_options --disable-install-strip
 ac_add_options --disable-strip
 ac_add_options --disable-profiling
 ac_add_options --enable-optimize="$CFLAGS"
-ac_add_options --enable-pie
 
 ac_add_options --enable-official-branding
 ac_add_options --enable-application=browser
diff --git a/srcpkgs/firefox-esr/patches/disable-image-format-warning.patch b/srcpkgs/firefox-esr/patches/disable-image-format-warning.patch
new file mode 100644
index 00000000000..bd56e6bc37c
--- /dev/null
+++ b/srcpkgs/firefox-esr/patches/disable-image-format-warning.patch
@@ -0,0 +1,15 @@
+Imported from Adélie. Firefox is prone to this warning on BE and
+it leads to huge .xsession-errors, and the warning is not very
+important or meaningful, so just disable it.
+
+--- gfx/2d/HelpersCairo.h
++++ gfx/2d/HelpersCairo.h
+@@ -147,7 +147,7 @@
+     case SurfaceFormat::R5G6B5_UINT16:
+       return CAIRO_FORMAT_RGB16_565;
+     default:
+-      gfxCriticalError() << "Unknown image format " << (int)format;
++      //gfxCriticalError() << "Unknown image format " << (int)format;
+       return CAIRO_FORMAT_ARGB32;
+   }
+ }
diff --git a/srcpkgs/firefox-esr/patches/fix-arm-opus-include.patch b/srcpkgs/firefox-esr/patches/fix-arm-opus-include.patch
new file mode 100644
index 00000000000..6e0c5875da3
--- /dev/null
+++ b/srcpkgs/firefox-esr/patches/fix-arm-opus-include.patch
@@ -0,0 +1,11 @@
+--- media/libopus/silk/arm/arm_silk_map.c.orig	2019-03-19 20:55:01.249609964 +0100
++++ media/libopus/silk/arm/arm_silk_map.c	2019-03-19 20:55:25.769400255 +0100
+@@ -28,7 +28,7 @@
+ # include "config.h"
+ #endif
+
+-#include "main_FIX.h"
++#include "../fixed/main_FIX.h"
+ #include "NSQ.h"
+ #include "SigProc_FIX.h"
+
diff --git a/srcpkgs/firefox-esr/patches/fix-i686-musl.patch b/srcpkgs/firefox-esr/patches/fix-i686-musl.patch
index 5345a3cd3df..6df609bbf16 100644
--- a/srcpkgs/firefox-esr/patches/fix-i686-musl.patch
+++ b/srcpkgs/firefox-esr/patches/fix-i686-musl.patch
@@ -9,12 +9,3 @@
       ((defined(__GNUC__) && (defined(__i386) || defined(PPC))) || \
        defined(HAVE__UNWIND_BACKTRACE)))
  #define MOZ_STACKWALK_SUPPORTS_LINUX 1
-@@ -911,7 +911,7 @@
- }
- 
- // {x86, ppc} x {Linux, Mac} stackwalking code.
--#if ((defined(__i386) || defined(PPC) || defined(__ppc__)) && \
-+#if defined(__GLIBC__) && ((defined(__i386) || defined(PPC) || defined(__ppc__)) && \
-      (MOZ_STACKWALK_SUPPORTS_MACOSX || MOZ_STACKWALK_SUPPORTS_LINUX))
- 
- MFBT_API bool
diff --git a/srcpkgs/firefox-esr/patches/fix-toolkit.patch b/srcpkgs/firefox-esr/patches/fix-toolkit.patch
index ce4d7d01f82..86e8ef47855 100644
--- a/srcpkgs/firefox-esr/patches/fix-toolkit.patch
+++ b/srcpkgs/firefox-esr/patches/fix-toolkit.patch
@@ -47,18 +47,28 @@
  #include <a.out.h>
  #endif
 
+--- toolkit.orig/mozapps/update/common/updatedefines.h	2019-01-29 11:34:36.416804577 +0100
++++ toolkit/mozapps/update/common/updatedefines.h	2019-01-29 11:34:59.193583777 +0100
+@@ -102,7 +102,7 @@
 
+ #  ifdef SOLARIS
+ #    include <sys/stat.h>
+-#  else
++#  elif !(defined(__linux__)) || defined(__GLIBC__)
+ #    include <fts.h>
+ #  endif
+ #  include <dirent.h>
 --- toolkit.orig/mozapps/update/updater/updater.cpp	2014-03-15 05:19:37.000000000 +0000
 +++ toolkit/mozapps/update/updater/updater.cpp	2014-04-17 10:24:33.796765327 +0000
-@@ -3432,6 +3432,7 @@
- int add_dir_entries(const NS_tchar *dirpath, ActionList *list)
- {
+@@ -3978,6 +3978,7 @@
+ 
+ int add_dir_entries(const NS_tchar* dirpath, ActionList* list) {
    int rv = OK;
 +#if !defined(__linux__) || defined(__GLIBC__)
-   FTS *ftsdir;
-   FTSENT *ftsdirEntry;
-   NS_tchar searchpath[MAXPATHLEN];
-@@ -3534,6 +3535,7 @@
+   FTS* ftsdir;
+   FTSENT* ftsdirEntry;
+   mozilla::UniquePtr<NS_tchar[]> searchpath(get_full_path(dirpath));
+@@ -4085,6 +4086,7 @@
    }
  
    fts_close(ftsdir);
@@ -66,14 +76,3 @@
  
    return rv;
  }
---- toolkit/mozapps/update/common/updatedefines.h	2019-01-24 18:31:42.000000000 +0100
-+++ -	2019-01-31 11:15:53.946747750 +0100
-@@ -100,7 +100,7 @@
- 
- #ifdef SOLARIS
- #include <sys/stat.h>
--#else
-+#elif !defined(__linux__) || defined(__GLIBC__)
- #include <fts.h>
- #endif
- #include <dirent.h>
diff --git a/srcpkgs/firefox-esr/patches/fix-tools.patch b/srcpkgs/firefox-esr/patches/fix-tools.patch
index 1e2fc4f7d39..0ed043fb5b5 100644
--- a/srcpkgs/firefox-esr/patches/fix-tools.patch
+++ b/srcpkgs/firefox-esr/patches/fix-tools.patch
@@ -1,33 +1,24 @@
---- tools/profiler/core/platform.h
-+++ tools/profiler/core/platform.h
-@@ -29,6 +29,8 @@
- #ifndef TOOLS_PLATFORM_H_
- #define TOOLS_PLATFORM_H_
-
-+#include <sys/types.h>
-+
- #include <stdint.h>
- #include <math.h>
- #include "MainThreadUtils.h"
---- tools/profiler/lul/LulElf.cpp	2019-01-24 18:31:42.000000000 +0100
-+++ -	2019-01-31 11:19:53.198257189 +0100
-@@ -460,9 +460,9 @@
+--- tools/profiler/lul/LulElf.cpp.orig	2019-01-29 12:05:34.223834130 +0100
++++ tools/profiler/lul/LulElf.cpp	2019-01-29 12:08:02.480400845 +0100
+@@ -469,10 +469,10 @@
+ // Return the non-directory portion of FILENAME: the portion after the
  // last slash, or the whole filename if there are no slashes.
  string BaseFileName(const string& filename) {
-   // Lots of copies!  basename's behavior is less than ideal.
+-  // Lots of copies!  basename's behavior is less than ideal.
 -  char* c_filename = strdup(filename.c_str());
 -  string base = basename(c_filename);
 -  free(c_filename);
-+  const char* c_filename = filename.c_str();
++  // basename's behavior is less than ideal so avoid it
++  const char *c_filename = filename.c_str();
 +  const char *p = strrchr(c_filename, '/');
 +  string base = p ? p+1 : c_filename;
    return base;
  }
  
---- tools/profiler/core/platform-linux-android.cpp	2019-01-24 18:31:43.000000000 +0100
-+++ -	2019-01-31 11:23:07.911772317 +0100
+--- tools/profiler/core/platform-linux-android.cpp.orig	2019-01-29 12:09:40.980448579 +0100
++++ tools/profiler/core/platform-linux-android.cpp	2019-01-29 12:11:09.689590967 +0100
 @@ -253,7 +253,11 @@
-
+ 
    // Request profiling signals.
    struct sigaction sa;
 +#if defined(GP_ARCH_arm)
@@ -38,7 +29,7 @@
    sigemptyset(&sa.sa_mask);
    sa.sa_flags = SA_RESTART | SA_SIGINFO;
    if (sigaction(SIGPROF, &sa, &mOldSigprofHandler) != 0) {
-@@ -497,8 +497,10 @@
+@@ -497,8 +501,10 @@
  ucontext_t sSyncUContext;
  
  void Registers::SyncPopulate() {
diff --git a/srcpkgs/firefox-esr/patches/fix-wasm-arm.patch b/srcpkgs/firefox-esr/patches/fix-wasm-arm.patch
new file mode 100644
index 00000000000..e6ad61c9f44
--- /dev/null
+++ b/srcpkgs/firefox-esr/patches/fix-wasm-arm.patch
@@ -0,0 +1,15 @@
+--- js/src/wasm/WasmSignalHandlers.cpp
++++ js/src/wasm/WasmSignalHandlers.cpp
+@@ -243,9 +243,9 @@
+ // If you run into compile problems on a tier-3 platform, you can disable the
+ // emulation here.
+ 
+-#if defined(__linux__) && defined(__arm__)
+-#  define WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS
+-#endif
++// #if defined(__linux__) && defined(__arm__)
++// #  define WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS
++// #endif
+ 
+ #ifdef WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS
+ #  include <sys/user.h>
diff --git a/srcpkgs/firefox-esr/patches/fix-webrtc-arm.patch b/srcpkgs/firefox-esr/patches/fix-webrtc-arm.patch
deleted file mode 100644
index 222be5f9e21..00000000000
--- a/srcpkgs/firefox-esr/patches/fix-webrtc-arm.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- media/webrtc/trunk/webrtc/system_wrappers/source/cpu_features.cc	2019-01-24 18:31:10.000000000 +0100
-+++ -	2019-02-01 00:13:35.690776711 +0100
-@@ -67,7 +67,7 @@
-   return 0;
- }
- 
--#if !defined(ANDROID)
-+#if !defined(ANDROID) && !defined(__linux__)
- #ifdef WEBRTC_ARCH_ARM_V7
- uint64_t WebRtc_GetCPUFeaturesARM(void) {
-   return kCPUFeatureARMv7
diff --git a/srcpkgs/firefox-esr/patches/fix-webrtc-glibcisms.patch b/srcpkgs/firefox-esr/patches/fix-webrtc-glibcisms.patch
index 3ff2570b12b..cf895dd8448 100644
--- a/srcpkgs/firefox-esr/patches/fix-webrtc-glibcisms.patch
+++ b/srcpkgs/firefox-esr/patches/fix-webrtc-glibcisms.patch
@@ -1,18 +1,15 @@
---- media/webrtc/trunk/webrtc/system_wrappers/source/cpu_features_linux.c	2019-02-01 00:49:18.472382771 +0100
-+++ -	2019-02-01 00:50:25.928007236 +0100
-@@ -11,7 +11,10 @@
- #include <stdlib.h>
- #include <string.h>
- #include <features.h>
+--- media/webrtc/trunk/webrtc/system_wrappers/source/cpu_features_linux.c.orig	2019-01-29 11:20:52.298793223 +0100
++++ media/webrtc/trunk/webrtc/system_wrappers/source/cpu_features_linux.c	2019-01-29 11:21:48.250250850 +0100
+@@ -14,7 +14,7 @@
+ #ifndef __GLIBC_PREREQ
+ #define __GLIBC_PREREQ(a, b) 0
+ #endif
 -#if __GLIBC_PREREQ(2, 16)
-+#ifndef __GLIBC_PREREQ
-+#define __GLIBC_PREREQ(a, b) 0
-+#endif
 +#if !__GLIBC__ || __GLIBC_PREREQ(2, 16)
  #include <sys/auxv.h>
  #else
  #include <fcntl.h>
-@@ -29,7 +32,7 @@
+@@ -32,7 +32,7 @@
    int architecture = 0;
    unsigned long hwcap = 0;
    const char* platform = NULL;
diff --git a/srcpkgs/firefox-esr/patches/fix-xpcom.patch b/srcpkgs/firefox-esr/patches/fix-xpcom.patch
deleted file mode 100644
index 38dd582d96b..00000000000
--- a/srcpkgs/firefox-esr/patches/fix-xpcom.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xpcom/base/nsMemoryReporterManager.cpp.orig	2015-12-16 11:53:14.211144456 +0100
-+++ xpcom/base/nsMemoryReporterManager.cpp	2015-12-16 11:55:26.859476381 +0100
-@@ -46,7 +46,7 @@ using namespace mozilla;
- #  include "mozmemory.h"
- #endif  // MOZ_MEMORY
- 
--#if defined(XP_LINUX)
-+#if defined(XP_LINUX) && defined(__GLIBC__)
- 
- #include <malloc.h>
- #include <string.h>
diff --git a/srcpkgs/firefox/patches/fix-musl.patch b/srcpkgs/firefox-esr/patches/gettid-musl.patch
similarity index 100%
rename from srcpkgs/firefox/patches/fix-musl.patch
rename to srcpkgs/firefox-esr/patches/gettid-musl.patch
diff --git a/srcpkgs/firefox-esr/patches/mallinfo.patch b/srcpkgs/firefox-esr/patches/mallinfo.patch
index c9a38d45bdf..afea86c0a2c 100644
--- a/srcpkgs/firefox-esr/patches/mallinfo.patch
+++ b/srcpkgs/firefox-esr/patches/mallinfo.patch
@@ -1,18 +1,34 @@
---- xpcom/base/nsMemoryReporterManager.cpp
-+++ xpcom/base/nsMemoryReporterManager.cpp
-@@ -153,6 +153,7 @@ ResidentUniqueDistinguishedAmount(int64_t* aN)
+--- xpcom/base/nsMemoryReporterManager.cpp.orig	2019-03-19 17:12:20.844810044 +0100
++++ xpcom/base/nsMemoryReporterManager.cpp	2019-03-19 17:13:32.505133615 +0100
+@@ -123,6 +123,7 @@
    return GetProcSelfSmapsPrivate(aN);
  }
  
 +#ifdef __GLIBC__
- #define HAVE_SYSTEM_HEAP_REPORTER 1
- nsresult
- SystemHeapSize(int64_t* aSizeOut)
-@@ -172,6 +173,7 @@ SystemHeapSize(int64_t* aSizeOut)
-     *aSizeOut = size_t(info.hblkhd) + size_t(info.uordblks);
-     return NS_OK;
+ #  ifdef HAVE_MALLINFO
+ #    define HAVE_SYSTEM_HEAP_REPORTER 1
+ static MOZ_MUST_USE nsresult SystemHeapSize(int64_t* aSizeOut) {
+@@ -142,6 +143,7 @@
+   return NS_OK;
  }
-+#endif
+ #  endif
++#endif // __GLIBC__
  
- #elif defined(__DragonFly__) || defined(__FreeBSD__) \
-     || defined(__NetBSD__) || defined(__OpenBSD__) \
+ #elif defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || \
+     defined(__OpenBSD__) || defined(__FreeBSD_kernel__)
+@@ -642,6 +644,7 @@
+   return NS_OK;
+ }
+ 
++#ifdef __GLIBC__
+ #  define HAVE_SYSTEM_HEAP_REPORTER 1
+ // Windows can have multiple separate heaps. During testing there were multiple
+ // heaps present but the non-default ones had sizes no more than a few 10s of
+@@ -698,6 +701,7 @@
+   *aSizeOut = heapsSize;
+   return NS_OK;
+ }
++#endif // __GLIBC__
+ 
+ struct SegmentKind {
+   DWORD mState;
diff --git a/srcpkgs/firefox-esr/patches/ppc-no-static-sizes.patch b/srcpkgs/firefox-esr/patches/ppc-no-static-sizes.patch
deleted file mode 100644
index 3f77023bb5f..00000000000
--- a/srcpkgs/firefox-esr/patches/ppc-no-static-sizes.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-# HG changeset patch
-# Parent b735e618c2a860972197942f6680c941e3c9a67f
-# User Gustavo Luiz Duarte <gustavold@linux.vnet.ibm.com>
-Bug 997353 - Do not use compile-time page size for PowerPC.
-
-The PowerPC architecture allows various memory page sizes, making it impossible
-to predict the runtime page size.
-
---- memory/build/mozjemalloc.cpp
-+++ memory/build/mozjemalloc.cpp
-@@ -369,7 +369,7 @@
- // Debug builds are opted out too, for test coverage.
- #ifndef MOZ_DEBUG
- #if !defined(__ia64__) && !defined(__sparc__) && !defined(__mips__) &&         \
--  !defined(__aarch64__)
-+  !defined(__aarch64__) && !defined(__powerpc__) && !defined(__powerpc64__)
- #define MALLOC_STATIC_PAGESIZE 1
- #endif
- #endif
diff --git a/srcpkgs/firefox-esr/patches/remove-rustc-check.patch b/srcpkgs/firefox-esr/patches/remove-rustc-check.patch
index f6bebc8aab1..84077f4fc88 100644
--- a/srcpkgs/firefox-esr/patches/remove-rustc-check.patch
+++ b/srcpkgs/firefox-esr/patches/remove-rustc-check.patch
@@ -1,8 +1,19 @@
 Mozilla rustc check does not support crossbuild: let's remove it
+Remove calls to unwrap_rustup, they fail if rustup isn't present
 
---- build/moz.configure/rust.configure	2018-10-01 16:28:31.000000000 +0200
-+++ build/moz.configure/rust.configure	2018-10-20 14:21:35.510000000 +0200
-@@ -204,26 +204,6 @@
+--- build/moz.configure/rust.configure	2019-07-06 03:48:30.000000000 +0200
++++ build/moz.configure/rust.configure	2019-07-09 22:35:23.326851798 +0200
+@@ -79,9 +79,6 @@
+ 
+     return unwrap
+ 
+-rustc = unwrap_rustup(rustc, 'rustc')
+-cargo = unwrap_rustup(cargo, 'cargo')
+-
+ 
+ set_config('CARGO', cargo)
+ set_config('RUSTC', rustc)
+@@ -294,26 +291,6 @@
  
              os.write(in_fd, source)
              os.close(in_fd)
@@ -29,4 +40,3 @@ Mozilla rustc check does not support crossbuild: let's remove it
          finally:
              os.remove(in_path)
              os.remove(out_path)
-
diff --git a/srcpkgs/firefox-esr/patches/rust-cssparser.patch b/srcpkgs/firefox-esr/patches/rust-cssparser.patch
new file mode 100644
index 00000000000..1ebef87c014
--- /dev/null
+++ b/srcpkgs/firefox-esr/patches/rust-cssparser.patch
@@ -0,0 +1,90 @@
+backport of:
+
+From 3c98d22c5de3b696bf1fde2b6c90069812312aa6 Mon Sep 17 00:00:00 2001
+From: Simon Sapin <simon.sapin@exyr.org>
+Date: Tue, 23 Apr 2019 13:47:25 +0200
+Subject: [PATCH] Fix a future-compat warning
+
+```
+warning[E0506]: cannot assign to `self.input.cached_token` because it is borrowed
+   --> src/parser.rs:591:17
+    |
+566 |     pub fn next_including_whitespace_and_comments(&mut self) -> Result<&Token<'i>, BasicParseError<'i>> {
+    |                                                   - let's call the lifetime of this reference `'1`
+...
+579 |             Some(ref cached_token)
+    |                  ---------------- borrow of `self.input.cached_token` occurs here
+...
+591 |                 self.input.cached_token = Some(CachedToken {
+    |                 ^^^^^^^^^^^^^^^^^^^^^^^ assignment to borrowed `self.input.cached_token` occurs here
+...
+603 |         Ok(token)
+    |         --------- returning this value requires that `self.input.cached_token.0` is borrowed for `'1`
+    |
+    = warning: this error has been downgraded to a warning for backwards compatibility with previous releases
+    = warning: this represents potential undefined behavior in your code and this warning will become a hard error in the future
+```
+---
+ src/parser.rs | 50 +++++++++++++++++++++++++++-----------------------
+ 1 file changed, 27 insertions(+), 23 deletions(-)
+
+diff --git a/src/parser.rs b/src/parser.rs
+index 51f441e4..7cef117c 100644
+--- third_party/rust/cssparser/src/parser.rs
++++ third_party/rust/cssparser/src/parser.rs
+@@ -555,28 +555,34 @@
+         }
+ 
+         let token_start_position = self.input.tokenizer.position();
+-        let token;
+-        match self.input.cached_token {
+-            Some(ref cached_token)
+-            if cached_token.start_position == token_start_position => {
+-                self.input.tokenizer.reset(&cached_token.end_state);
+-                match cached_token.token {
+-                    Token::Function(ref name) => self.input.tokenizer.see_function(name),
+-                    _ => {}
+-                }
+-                token = &cached_token.token
++        let using_cached_token = self
++            .input
++            .cached_token
++            .as_ref()
++            .map_or(false, |cached_token| {
++                cached_token.start_position == token_start_position
++            });
++        let token = if using_cached_token {
++            let cached_token = self.input.cached_token.as_ref().unwrap();
++            self.input.tokenizer.reset(&cached_token.end_state);
++            match cached_token.token {
++                Token::Function(ref name) => self.input.tokenizer.see_function(name),
++                _ => {}
+             }
+-            _ => {
+-                let new_token = self.input.tokenizer.next()
+-                    .map_err(|()| self.new_basic_error(BasicParseErrorKind::EndOfInput))?;
+-                self.input.cached_token = Some(CachedToken {
+-                    token: new_token,
+-                    start_position: token_start_position,
+-                    end_state: self.input.tokenizer.state(),
+-                });
+-                token = self.input.cached_token_ref()
+-            }
+-        }
++            &cached_token.token
++        } else {
++            let new_token = self
++                .input
++                .tokenizer
++                .next()
++                .map_err(|()| self.new_basic_error(BasicParseErrorKind::EndOfInput))?;
++            self.input.cached_token = Some(CachedToken {
++                token: new_token,
++                start_position: token_start_position,
++                end_state: self.input.tokenizer.state(),
++            });
++            self.input.cached_token_ref()
++        };
+ 
+         if let Some(block_type) = BlockType::opening(token) {
+             self.at_start_of = Some(block_type);
diff --git a/srcpkgs/firefox-esr/patches/rust-unitialized-field.patch b/srcpkgs/firefox-esr/patches/rust-unitialized-field.patch
deleted file mode 100644
index 67ef3a02ab8..00000000000
--- a/srcpkgs/firefox-esr/patches/rust-unitialized-field.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- ./media/audioipc/audioipc/src/cmsg.rs.orig	2018-05-09 22:19:14.748631939 +0200
-+++ ./media/audioipc/audioipc/src/cmsg.rs	2018-05-09 22:19:22.961620862 +0200
-@@ -106,11 +106,11 @@ impl ControlMsgBuilder {
-                 return Err(Error::NoSpace);
-             }
- 
--            let cmsghdr = cmsghdr {
--                cmsg_len: cmsg_len as _,
--                cmsg_level: level,
--                cmsg_type: kind,
--            };
-+            use std::mem;
-+            let mut cmsghdr: cmsghdr =  unsafe { mem::zeroed() };
-+            cmsghdr.cmsg_len = cmsg_len as _;
-+            cmsghdr.cmsg_level = level;
-+            cmsghdr.cmsg_type = kind;
- 
-             let cmsghdr = unsafe {
-                 slice::from_raw_parts(&cmsghdr as *const _ as *const _, mem::size_of::<cmsghdr>())
diff --git a/srcpkgs/firefox-esr/patches/rust133.patch b/srcpkgs/firefox-esr/patches/rust133.patch
deleted file mode 100644
index ebdcac7e3a3..00000000000
--- a/srcpkgs/firefox-esr/patches/rust133.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-This fixes build errors under recent Rust.
-
---- servo/components/style_traits/lib.rs
-+++ servo/components/style_traits/lib.rs
-@@ -9,7 +9,7 @@
- #![crate_name = "style_traits"]
- #![crate_type = "rlib"]
- 
--#![deny(unsafe_code, missing_docs)]
-+#![deny(unsafe_code)]
- 
- extern crate app_units;
- #[macro_use] extern crate bitflags;
---- servo/components/style/lib.rs
-+++ servo/components/style/lib.rs
-@@ -23,8 +23,6 @@
- //! [cssparser]: ../cssparser/index.html
- //! [selectors]: ../selectors/index.html
- 
--#![deny(missing_docs)]
--
- extern crate app_units;
- extern crate arrayvec;
- extern crate atomic_refcell;
diff --git a/srcpkgs/firefox-esr/patches/save-and-restore-non-volatile-x28-on-arm64.patch b/srcpkgs/firefox-esr/patches/save-and-restore-non-volatile-x28-on-arm64.patch
deleted file mode 100644
index fa303f6d1e9..00000000000
--- a/srcpkgs/firefox-esr/patches/save-and-restore-non-volatile-x28-on-arm64.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-# HG changeset patch
-# User Lars T Hansen <lhansen@mozilla.com>
-# Date 1519822672 -3600
-# Node ID 800abe66894d6b07b24bccecbf6a65e2261076f6
-# Parent  223c97459e96183eb616aed39147207bdb953ba8
-Bug 1375074 - Save and restore non-volatile x28 on ARM64 for generated unboxed object constructor.  r=sstangl
-
-Origin: upstream
-Applied-upstream: 61, commit: https://hg.mozilla.org/mozilla-central/rev/800abe66894d
----
- js/src/vm/UnboxedObject.cpp | 30 ++++++++++++++++++++++++++----
- 1 file changed, 26 insertions(+), 4 deletions(-)
-
-diff --git a/js/src/vm/UnboxedObject.cpp b/js/src/vm/UnboxedObject.cpp
-index 35ca20d7405f..1c20a1093d13 100644
---- js/src/vm/UnboxedObject.cpp
-+++ js/src/vm/UnboxedObject.cpp
-@@ -86,9 +86,16 @@ static const uintptr_t CLEAR_CONSTRUCTOR_CODE_TOKEN = 0x1;
- #endif
-
- #ifdef JS_CODEGEN_ARM64
--  // ARM64 communicates stack address via sp, but uses a pseudo-sp for
--  // addressing.
--  masm.initStackPtr();
-+    // ARM64 communicates stack address via sp, but uses a pseudo-sp (PSP) for
-+    // addressing.  The register we use for PSP may however also be used by
-+    // calling code, and it is nonvolatile, so save it.  Do this as a special
-+    // case first because the generic save/restore code needs the PSP to be
-+    // initialized already.
-+    MOZ_ASSERT(PseudoStackPointer64.Is(masm.GetStackPointer64()));
-+    masm.Str(PseudoStackPointer64, vixl::MemOperand(sp, -16, vixl::PreIndex));
-+
-+    // Initialize the PSP from the SP.
-+    masm.initStackPtr();
- #endif
-
-   MOZ_ASSERT(propertiesReg.volatile_());
-@@ -239,7 +246,22 @@ static const uintptr_t CLEAR_CONSTRUCTOR_CODE_TOKEN = 0x1;
-   if (ScratchDoubleReg.volatile_()) masm.pop(ScratchDoubleReg);
-   masm.PopRegsInMask(savedNonVolatileRegisters);
-
--  masm.abiret();
-+#ifdef JS_CODEGEN_ARM64
-+    // Now restore the value that was in the PSP register on entry, and return.
-+
-+    // Obtain the correct SP from the PSP.
-+    masm.Mov(sp, PseudoStackPointer64);
-+
-+    // Restore the saved value of the PSP register, this value is whatever the
-+    // caller had saved in it, not any actual SP value, and it must not be
-+    // overwritten subsequently.
-+    masm.Ldr(PseudoStackPointer64, vixl::MemOperand(sp, 16, vixl::PostIndex));
-+
-+    // Perform a plain Ret(), as abiret() will move SP <- PSP and that is wrong.
-+    masm.Ret(vixl::lr);
-+#else
-+    masm.abiret();
-+#endif
-
-   masm.bind(&failureStoreOther);
-
---
-2.21.0
-
diff --git a/srcpkgs/firefox-esr/patches/save-x28-before-clobbering-it-in-the-regex-compiler.patch b/srcpkgs/firefox-esr/patches/save-x28-before-clobbering-it-in-the-regex-compiler.patch
deleted file mode 100644
index aa2dcc6ba8d..00000000000
--- a/srcpkgs/firefox-esr/patches/save-x28-before-clobbering-it-in-the-regex-compiler.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-# HG changeset patch
-# User Lars T Hansen <lhansen@mozilla.com>
-# Date 1521449886 -3600
-# Node ID 903a79a1efff18fc7cc50db09a3fe5d768adc9a8
-# Parent  4d2955a9ca7e30ca4c3af9c214ccc77fb2fe7fb8
-Bug 1445907 - Save x28 before clobbering it in the regex compiler. r=sstangl
-
-Origin: upstream
-Applied-upstream: 61, commit: https://hg.mozilla.org/mozilla-central/rev/903a79a1efff
----
-diff --git a/js/src/irregexp/NativeRegExpMacroAssembler.cpp b/js/src/irregexp/NativeRegExpMacroAssembler.cpp
---- js/src/irregexp/NativeRegExpMacroAssembler.cpp
-+++ js/src/irregexp/NativeRegExpMacroAssembler.cpp
-@@ -118,17 +118,25 @@ NativeRegExpMacroAssembler::GenerateCode
-
-     Label return_temp0;
-
-     // Finalize code - write the entry point code now we know how many
-     // registers we need.
-     masm.bind(&entry_label_);
-
- #ifdef JS_CODEGEN_ARM64
--    // ARM64 communicates stack address via sp, but uses a pseudo-sp for addressing.
-+    // ARM64 communicates stack address via SP, but uses a pseudo-sp (PSP) for
-+    // addressing.  The register we use for PSP may however also be used by
-+    // calling code, and it is nonvolatile, so save it.  Do this as a special
-+    // case first because the generic save/restore code needs the PSP to be
-+    // initialized already.
-+    MOZ_ASSERT(PseudoStackPointer64.Is(masm.GetStackPointer64()));
-+    masm.Str(PseudoStackPointer64, vixl::MemOperand(sp, -16, vixl::PreIndex));
-+
-+    // Initialize the PSP from the SP.
-     masm.initStackPtr();
- #endif
-
-     // Push non-volatile registers which might be modified by jitcode.
-     size_t pushedNonVolatileRegisters = 0;
-     for (GeneralRegisterForwardIterator iter(savedNonVolatileRegisters); iter.more(); ++iter) {
-         masm.Push(*iter);
-         pushedNonVolatileRegisters++;
-@@ -416,17 +424,32 @@ NativeRegExpMacroAssembler::GenerateCode
-     masm.pop(temp0);
-     masm.movePtr(temp0, StackPointer);
- #endif
-
-     // Restore non-volatile registers which were saved on entry.
-     for (GeneralRegisterBackwardIterator iter(savedNonVolatileRegisters); iter.more(); ++iter)
-         masm.Pop(*iter);
-
-+#ifdef JS_CODEGEN_ARM64
-+    // Now restore the value that was in the PSP register on entry, and return.
-+
-+    // Obtain the correct SP from the PSP.
-+    masm.Mov(sp, PseudoStackPointer64);
-+
-+    // Restore the saved value of the PSP register, this value is whatever the
-+    // caller had saved in it, not any actual SP value, and it must not be
-+    // overwritten subsequently.
-+    masm.Ldr(PseudoStackPointer64, vixl::MemOperand(sp, 16, vixl::PostIndex));
-+
-+    // Perform a plain Ret(), as abiret() will move SP <- PSP and that is wrong.
-+    masm.Ret(vixl::lr);
-+#else
-     masm.abiret();
-+#endif
-
-     // Backtrack code (branch target for conditional backtracks).
-     if (backtrack_label_.used()) {
-         masm.bind(&backtrack_label_);
-         Backtrack();
-     }
-
-     // Backtrack stack overflow code.
-diff --git a/js/src/jit-test/tests/regexp/bug1445907.js b/js/src/jit-test/tests/regexp/bug1445907.js
-new file mode 100644
---- /dev/null
-+++ js/src/jit-test/tests/regexp/bug1445907.js
-@@ -0,0 +1,15 @@
-+// On ARM64, we failed to save x28 properly when generating code for the regexp
-+// matcher.
-+//
-+// There's wasm and Debugger code here because the combination forces the use of
-+// x28 and exposes the bug when running on the simulator.
-+
-+if (!wasmIsSupported())
-+    quit();
-+
-+var g = newGlobal('');
-+var dbg = new Debugger(g);
-+g.eval(`var m = new WebAssembly.Instance(new WebAssembly.Module(wasmTextToBinary('(module (func (export "test")))')))`);
-+var re = /./;
-+dbg.onEnterFrame = function(frame) { re.exec("x") };
-+result = g.eval("m.exports.test()");
-
---
-2.21.0
-
diff --git a/srcpkgs/firefox-esr/patches/sndio.patch b/srcpkgs/firefox-esr/patches/sndio.patch
index 097b313e90b..6c72284c19b 100644
--- a/srcpkgs/firefox-esr/patches/sndio.patch
+++ b/srcpkgs/firefox-esr/patches/sndio.patch
@@ -51,14 +51,14 @@
      ]
 --- build/moz.configure/old.configure.orig
 +++ build/moz.configure/old.configure
-@@ -159,6 +159,7 @@
-     '--enable-accessibility',
-     '--enable-address-sanitizer',
-     '--enable-alsa',
+@@ -169,6 +169,7 @@
+ @old_configure_options(
+     '--cache-file',
+     '--datadir',
 +    '--enable-sndio',
-     '--enable-bundled-fonts',
-     '--enable-clang-plugin',
      '--enable-content-sandbox',
+     '--enable-cookies',
+     '--enable-cpp-rtti',
 --- security/sandbox/linux/broker/SandboxBrokerPolicyFactory.cpp.orig
 +++ security/sandbox/linux/broker/SandboxBrokerPolicyFactory.cpp
 @@ -349,6 +349,21 @@
diff --git a/srcpkgs/firefox-esr/patches/yuv-be.patch b/srcpkgs/firefox-esr/patches/yuv-be.patch
new file mode 100644
index 00000000000..1c26f2ecced
--- /dev/null
+++ b/srcpkgs/firefox-esr/patches/yuv-be.patch
@@ -0,0 +1,48 @@
+# HG changeset patch
+# User A. Wilcox <AWilcox@Wilcox-Tech.com>
+# Date 1543674229 0
+#      Sat Dec 01 14:23:49 2018 +0000
+# Node ID 0309ff19e46b126c527e633518d7de8570442114
+# Parent  53107afbc21ec78e7ac46d37af212505f2032d5d
+Bug 1511604 - Swizzle YCbCr->RGB data on big-endian machines
+
+diff -r 53107afbc21e -r 0309ff19e46b gfx/ycbcr/YCbCrUtils.cpp
+--- gfx/ycbcr/YCbCrUtils.cpp	Wed Nov 07 04:50:21 2018 +0000
++++ gfx/ycbcr/YCbCrUtils.cpp	Sat Dec 01 14:23:49 2018 +0000
+@@ -3,7 +3,9 @@
+  * License, v. 2.0. If a copy of the MPL was not distributed with this
+  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+ 
++#include "mozilla/EndianUtils.h"
+ #include "gfx2DGlue.h"
++#include "mozilla/gfx/Swizzle.h"
+ 
+ #include "YCbCrUtils.h"
+ #include "yuv_convert.h"
+@@ -236,6 +238,13 @@
+                           yuvtype,
+                           srcData.mYUVColorSpace);
+   }
++#if MOZ_BIG_ENDIAN
++  // libyuv makes endian-correct result, which needs to be swapped to BGRX
++  if (aDestFormat != SurfaceFormat::R5G6B5_UINT16)
++    gfx::SwizzleData(aDestBuffer, aStride, gfx::SurfaceFormat::X8R8G8B8,
++                     aDestBuffer, aStride, gfx::SurfaceFormat::B8G8R8X8,
++                     srcData.mPicSize);
++#endif
+ }
+ 
+ void
+@@ -257,6 +266,12 @@
+                         aSrcStrideYA,
+                         aSrcStrideUV,
+                         aDstStrideARGB);
++#if MOZ_BIG_ENDIAN
++  // libyuv makes endian-correct result, which needs to be swapped to BGRA
++  gfx::SwizzleData(aDstARGB, aDstStrideARGB, gfx::SurfaceFormat::A8R8G8B8,
++                   aDstARGB, aDstStrideARGB, gfx::SurfaceFormat::B8G8R8A8,
++                   IntSize(aWidth, aHeight));
++#endif
+ }
+ 
+ } // namespace gfx
diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template
index 05a0a521341..8f1c983c8b4 100644
--- a/srcpkgs/firefox-esr/template
+++ b/srcpkgs/firefox-esr/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-esr-i18n".
 #
 pkgname=firefox-esr
-version=60.8.0
+version=68.1.0
 revision=2
 build_helper="rust"
 wrksrc="firefox-${version}"
@@ -12,11 +12,11 @@ maintainer="Eivind Uggedal <eivind@uggedal.com>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/organizations/"
 distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"
-checksum=c13387d944e635aebd5f1d2ce9ab77cb706a74043a240cbb7b70654519487fbe
+checksum=f56f5fa5a4744be0b9acf259cb991254d708a50b9a0a12d1d846ffa5a6c409ac
 
 lib32disabled=yes
 hostmakedepends="autoconf213 unzip zip pkg-config perl python yasm
- cargo llvm clang rust cbindgen"
+ python3 cargo llvm clang rust cbindgen nasm nodejs"
 makedepends="nss-devel libjpeg-turbo-devel gtk+-devel gtk+3-devel icu-devel
  pixman-devel sqlite-devel libevent-devel libnotify-devel libvpx5-devel
  libXrender-devel libXcomposite-devel libSM-devel libXt-devel rust-std
@@ -30,10 +30,6 @@ conflicts="firefox>=0"
 build_options="alsa dbus gtk3 pulseaudio startup_notification xscreensaver sndio"
 build_options_default="alsa dbus gtk3 pulseaudio startup_notification xscreensaver sndio"
 
-if [ "$XBPS_WORDSIZE" -eq 32 ]; then
-	nodebug=yes
-fi
-
 case $XBPS_TARGET_MACHINE in
 	armv6*)
 		broken="required NEON extensions are not supported on armv6"
@@ -42,6 +38,13 @@ case $XBPS_TARGET_MACHINE in
 	ppc*) broken="ftbfs in several places" ;;
 esac
 
+# we need this because cargo verifies checksums of all files in vendor
+# crates when it builds and gives us no way to override or update the
+# file sanely... so just clear out the file list
+_clear_vendor_checksums() {
+	sed -i 's/\("files":{\)[^}]*/\1/' third_party/rust/$1/.cargo-checksum.json
+}
+
 post_extract() {
 	case "$XBPS_TARGET_MACHINE" in
 	*-musl)
@@ -57,6 +60,11 @@ post_extract() {
 	# Note: This is for Void Linux use ONLY.
 	echo -n "cd894504-7a2a-4263-abff-ff73ee89ffca" > mozilla-api-key
 }
+
+post_patch() {
+	_clear_vendor_checksums cssparser
+}
+
 do_build() {
 	cp "${FILESDIR}/mozconfig" "${wrksrc}/.mozconfig"
 
@@ -112,9 +120,14 @@ do_build() {
 		;;
 	esac
 
-	if [ "$XBPS_WORDSIZE" -eq 32 ]; then
-		# ENOMEM
-		echo "ac_add_options --disable-debug-symbols" >>.mozconfig
+	# work around large debug symbols on 32-bit hosts
+	if [ "$XBPS_WORDSIZE" = "32" ]; then
+		export CFLAGS="${CFLAGS/-g/-g1}"
+		export CXXFLAGS="${CXXFLAGS/-g/-g1}"
+		export LDFLAGS+=" -Wl,--no-keep-memory"
+		# patch the rust debug level, this is hardcoded
+		sed -i "s/debug_info = '2'/debug_info = '1'/" \
+		build/moz.configure/toolchain.configure
 	fi
 
 	export LDFLAGS+=" -Wl,-rpath=/usr/lib/firefox"
diff --git a/srcpkgs/firefox-i18n-bn b/srcpkgs/firefox-i18n-bn
new file mode 120000
index 00000000000..6b9610b993c
--- /dev/null
+++ b/srcpkgs/firefox-i18n-bn
@@ -0,0 +1 @@
+firefox-i18n
\ No newline at end of file
diff --git a/srcpkgs/firefox-i18n-en-CA b/srcpkgs/firefox-i18n-en-CA
new file mode 120000
index 00000000000..6b9610b993c
--- /dev/null
+++ b/srcpkgs/firefox-i18n-en-CA
@@ -0,0 +1 @@
+firefox-i18n
\ No newline at end of file
diff --git a/srcpkgs/firefox-i18n-ia b/srcpkgs/firefox-i18n-ia
new file mode 120000
index 00000000000..6b9610b993c
--- /dev/null
+++ b/srcpkgs/firefox-i18n-ia
@@ -0,0 +1 @@
+firefox-i18n
\ No newline at end of file
diff --git a/srcpkgs/firefox-i18n-ne-NP b/srcpkgs/firefox-i18n-ne-NP
new file mode 120000
index 00000000000..6b9610b993c
--- /dev/null
+++ b/srcpkgs/firefox-i18n-ne-NP
@@ -0,0 +1 @@
+firefox-i18n
\ No newline at end of file
diff --git a/srcpkgs/firefox-i18n-oc b/srcpkgs/firefox-i18n-oc
new file mode 120000
index 00000000000..6b9610b993c
--- /dev/null
+++ b/srcpkgs/firefox-i18n-oc
@@ -0,0 +1 @@
+firefox-i18n
\ No newline at end of file
diff --git a/srcpkgs/firefox-i18n-ur b/srcpkgs/firefox-i18n-ur
new file mode 120000
index 00000000000..6b9610b993c
--- /dev/null
+++ b/srcpkgs/firefox-i18n-ur
@@ -0,0 +1 @@
+firefox-i18n
\ No newline at end of file
diff --git a/srcpkgs/firefox-i18n/files/update-lang-list b/srcpkgs/firefox-i18n/files/update-lang-list
new file mode 100755
index 00000000000..ff8042113bf
--- /dev/null
+++ b/srcpkgs/firefox-i18n/files/update-lang-list
@@ -0,0 +1,81 @@
+#!/bin/bash
+# Copyright (c) 2019 Danh Doan
+# All rights reserved.
+#
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+# OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
+
+version=$1
+
+esr=""
+[[ $version =~ esr$ ]] && esr="-esr"
+
+tmpldir="firefox${esr}-i18n"
+
+tmpoldfile="$(mktemp)"
+tmpnewfile="$(mktemp)"
+
+xoldlangexpr="^_languages="
+
+xlistold() {
+	source "${tmpldir}/template"
+	for _lang in "${_languages[@]}"; do
+		_locale="${_lang%%\"*}"
+		[ $_locale ] && echo "$_locale"
+	done
+}
+
+xlink () {
+	ln -sf "$tmpldir" "$tmpldir-$1"
+}
+
+xnewlang () {
+	lang=$1
+	padded=$(printf '%-7s' $lang)
+	xoldexpr=$xoldlangexpr
+	xoldlangexpr="'$lang \+\""
+	grep -q "'$lang \+\"" "$tmpldir/template" && return 0
+	sed -i "/$xoldexpr/a\\
+	'$padded\"Unknown\"'
+	/checksum=/a\\
+ badbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadb" \
+	"$tmpldir/template"
+}
+
+xprocessnew() {
+	while read lang; do
+		printf '%-7s\n' $lang >&3
+		xlink $lang
+		xnewlang $lang
+	done
+}
+
+xcleanlang() {
+	while read lang; do
+		padded=$(printf '%-7s' $lang)
+		sed -i "/'$padded\"/d" $tmpldir/template
+		unlink "$tmpldir-$lang" || true
+	done
+}
+
+cd $(xdistdir)/srcpkgs
+
+xlistold >| "$tmpoldfile"
+
+curl "https://ftp.mozilla.org/pub/firefox/releases/$1/linux-i686/xpi/" \
+	| grep -o 'xpi/[a-z]\+\(-[A-Z]\+\)\?' \
+	| cut -d/ -f2 \
+	| xprocessnew 3>$tmpnewfile
+
+grep -vF -f $tmpnewfile $tmpoldfile \
+	| xcleanlang
+
+rm -rf $tmpoldfile $tmpnewfile
diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template
index a18f552af2c..c901f5c9123 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-i18n'
 pkgname=firefox-i18n
-version=68.0.2
+version=69.0.2
 revision=1
 build_style=meta
 homepage="https://www.mozilla.org/firefox/"
@@ -23,6 +23,7 @@ _languages=(
 	'az     "Azerbaijani"'
 	'be     "Belarusian"'
 	'bg     "Bulgarian"'
+	'bn     "Bengali"'
 	'br     "Breton"'
 	'bs     "Bosnian"'
 	'ca     "Catalan"'
@@ -33,6 +34,7 @@ _languages=(
 	'de     "German"'
 	'dsb    "Lower Sorbian"'
 	'el     "Greek"'
+	'en-CA  "English (Canada)"'
 	'en-GB  "English (British)"'
 	'en-US  "English (US)"'
 	'eo     "Esperanto"'
@@ -58,6 +60,7 @@ _languages=(
 	'hsb    "Upper Sorbian"'
 	'hu     "Hungarian"'
 	'hy-AM  "Armenian"'
+	'ia     "Interlingua"'
 	'id     "Indonesian"'
 	'is     "Icelandic"'
 	'it     "Italian"'
@@ -76,8 +79,10 @@ _languages=(
 	'ms     "Malay"'
 	'my     "Burmese"'
 	'nb-NO  "Norwegian (Bokmål)"'
+	'ne-NP  "Nepali"'
 	'nl     "Dutch"'
 	'nn-NO  "Norwegian (Nynorsk)"'
+	'oc     "Occitan"'
 	'pa-IN  "Punjabi"'
 	'pl     "Polish"'
 	'pt-BR  "Portuguese (Brazilian)"'
@@ -97,6 +102,7 @@ _languages=(
 	'th     "Thai"'
 	'tr     "Turkish"'
 	'uk     "Ukrainian"'
+	'ur     "Urdu"'
 	'uz     "Uzbek"'
 	'vi     "Vietnamese"'
 	'xh     "Xhosa"'
@@ -129,90 +135,96 @@ _pkgtmpl() {
 	}
 }
 
-checksum="2ea325dae9dfd9725a533d7a4630b9326d408ab9a4b925b70468d28a2d45d2ba
- 7ac5d43f433ccd68bb96ac92cc7485755348a03c0bcb74d66e12925afd9463ae
- 88914e2a4d070d307ab4483538f3b863179dc4f1ba148bd3ae28cff4d87a390f
- 54627c8ba83781677dde0fc917eea5926a53906cad6283143cb917868e764b98
- 2f03fd4a024dc82920cbbec72140899d7fb1ab84c8913e01bdf2444de1faff95
- 129bfb200b92ff372be47d7b6482f509643448dfe620b725a3dc4932c1fecb83
- 841ad3f8ddae023fc2d426b83512f62d8ca0e6c96933166b3e53a144d08abf53
- 65326e4b1bf378e6971fb29f5532b5de81f355346e5310a63db093c6156255c3
- edd830c87ca09dc9764600b484f763322f9771c6557b960baa690872fcdfd3bb
- c686c3fd8a62b4fad79748f56c0306844545828aa8bf5a2f06a3710e21f64fa4
- 70ad36174d88e06f4ab068e55d3b737ffad7847014765b94bfc0de6bcdc52c5e
- 42381fad38549111e5ff2d57887318727159815b7b6ce19a8665fc049615f0e5
- ebef3a70259d887cb83ed61826dc4f4efb7e934a17a1315921232a0be0c78faa
- c3502cb60c44d1dbdec77046ca1d00b4d5b600f546a7964f4e27bfd52b42d193
- dfb94b9b6665284b1bedd6c9e13aa78f8ac43d64d5337825645c064e89bb5077
- 0c52ae1e1d8492193221f4ca71c77e3447521169202b615644b618ca09a02b92
- 1e01f718a7b5e4f7b1e7ba383c4a83c336658398bd8ed579511e099399eb7659
- 4a81323c5c564a903da4e58ed9e6ce968c96530bec924a143a83a153d2a3f712
- 870d58d9ea7615b9c4d7425970c1fad96ea7ec8864b55509fff5c501138eb724
- 595109a433b969231f5efb0b1de5585d2b3a82be0338166418ad84b7472fd6db
- b6ab79f793a7558e074d53f210721c9fb61b10ebd6ca219c47890c2066262ab8
- d059897607824b2cd3fe68b7a3bce3214ebd490d486517838a41ac21a9d66cd8
- 1db3f913dcadbdc63e38c8c41fe7f9d58b94bd372f2ed815ef98d7210376281d
- 9a0aa04d643dff8eed58b9167a8f8d373962c5df2b5c240dd280fc46add25cb2
- 5c2d1c6de35b41c534f98bbf53bf68dfcba7f81ee44fa41670852f0b7cb6034d
- 253d0275b7c3be1ad387f27901ed8f6a8e1c8f06c6052bd1ba4432cdf8987e40
- 282b17de74487d4af0b6471ebb86702635b51b658d4dc1040b2a1bc0173d75cd
- f0cdbc7b603345ce782efdda2cdd97cb3086a35ba8a8dc93316a408aa008ce4c
- 539a457d13deb4ac0e4149af5894f6a34348d00311212117d1ba5472b3eb7630
- d975fa37a38d88ecd2e539082200d7243ba00c1d0388ba3a79b32cbb237cb5be
- 1bb93ab89e1b29b13e88280817f22478f734f8b401e8a46e45842f80dd12dc91
- 7f92bb80877a94b06a9d21fd4c8773828b2ffb00d76fcada5fe6d63046f50e56
- 5cc79d40e9d9ac053f42a62ca6bf3fceeb734a7c4ae3c4dae730ce5326dcee53
- b991ad7abc56fe09f8784d82b5ce31490c54ccc0336f8df3735f39442eb408a8
- 914e3dd3902056311f0b31891dd5829e44c9b1d21e5527b5d5fc02a0a9163231
- d4a34da51853ce5ceeb44c717bff8e0e43e8a7a3573a5b8d37bfbc7535a7ab8c
- 2af29f4878ab8d2a68374ed5e548389defc08dd7ed4afc922a0ecdd469d323aa
- 3fbb71fcd7fbfdc7df8e992fad3cf4101b1d8864fe2a3adc4cce6c9260789892
- c2e8f0ceb5b585038189e7e29ab44ef847b302ff12769a576d9ed84f4c6b1733
- 808ecfcb890009a5a8aec761019f7365dee0472f56a66cab3dff5aab96f5092e
- e3b41849929b2b339aeb31187e5a8212645d4352b84c6da2d00427f4704701fa
- 61526c0ed945e0c4fa7e3c74a50b1c850640ad1127583b261d98d96e051ab8a7
- 27b8f857c0cd3a0cfc4b672dafd97b5058141c9c2611f3bc3dcdf0cbc7bbb0f6
- 87825f138676242e47e5feea13416b7f0b80d2abcd6d1e9e9c176cbf2b16fc4a
- 25adc223948abbf53e2485ef7e2ba7c6cd57035539a328bc1bed0ef5a2e98151
- 29117feb77725cb04612ecf4d5fc2cdd99cf83ec5a5443bc7ad70d5087f067e7
- a9313a9102e7076cdb2fb6d93c521c7125fc7bb238a1c10b7fe7aad83ed1a832
- 8ac5b14e77083a78ea452370c388216827a74a535238f46b68e54f583fb9d28e
- 8fbeaacb8eb49fcbdedfbad2ea8ddc6ef6c439ffeaf760ce8951399f130f2e70
- 7e90cebdc49ba304cbcacf1e2402e1d04a74915655e51736f77cbf06ef96b15b
- 6a05ca1dea4d1d1df7403909765469fd64f930687f10c4f12d6df47b316b01a0
- 7385224b6cb45a987ccf7a78e14e4d2962f7d8053226907db7d221871a1d9654
- 6cf181372cdbd6e71d391e3d301862df861d09294b21e60aca2439adaed90f1c
- e52b3fffda04b1a1b53f3de317e5e1c0632284ee49f99a1639a5e153f18eb7e1
- 79a2c8da2175659ec63d62414b6f6d39342f705f3e973f886a0e05979dbbb5e2
- 56d52734e4be44d91bfb993ad8ff71a8adb467781a562219d62f58f13a588ed7
- 96f4ec00964d3c9f0f5db9243ed2486ef4f705d822427de1303d25decb1d8091
- 97b6e1980fa99a5edac112f25a4873b88ebb1c28f010c7e7dc2197216740f916
- 1b14434f61257ce16bdeef681383b6371b0ad2004c0ca165d819b559f1db57e6
- 4908fe09e5da90f608d1abbcad948f4b4b6622ebb6bbbd22c61233736c402281
- 92967023816682d0991bdf50e08eb9a199a45c95b848b5aeceefc0906d267a1e
- 65e4a1bac6db7d51f67d3d522ffa5104031619fc5a427e446de90a959cf1b5ae
- 774d4102558b9744c141dbb6b89915beee1401c7997caafc5e84c3d3431505aa
- 2c8af1b518a1ab9470a2a8a6b2728a107ae92043dfe63a0bfbfb1423e11561b4
- 772c0e432e5e2a07ce0f7f150a0e999e291490e1c8b1d7a47085c231e1bfb551
- cb144fe7128393e757eb0e89fbfa1a64a98d75645563ef23538c81ea2395c54b
- b1fc0e8abe44a489728a5d35a7e30b2c189b3afee57ccf1ca3d457863bcaf613
- 3672383cd1054cbc082c7b2ea423461af6088f80784b72ab0c961f648dcb6046
- d13c1b0ffb1325352b0abd42dba05d3932814dcbbf01049d8e3e96c35ca4cecc
- 5197f27b5f1a6fda42dfdd23ab26e7852e6055d949b3421a604107f07d9ffab3
- a931a967980d2c85436a24035eb2da0de6996fcfcf2013b1b2c7481a5e3de81b
- bf136d69e10bb4300753e1bde4a4287837ab1576669c51f679bf37d8de4961e6
- c265e73b9bc51156e04f69073d10dd4ea82f70bdfbd4d1246648a4158f9887f9
- 840fc9402492c653f07709d04ffe8e33b96e6c7a8873fe14ec6d382f9650769c
- c0e795d692d62262a8e300e2ae573873b21538d79a9ad0bb3fd5c12486e12cef
- fa1ce8c4e3c8d0c25817766e9eb1897a055d032d4a6b69b9bf83a07d1d9234ac
- c3bbcd6f00dfe6e8c086489a03797366dcddca55326269d32239f5a1a5466836
- 638fa687bd1f367b88a983c66a3644cbef2d86608bb17cf8a71f1fa149156138
- 1098aeed113c1050e1ba6b42ae22fb547912a8fd864b56ba44e561a60ea19203
- 7dcb700b1bf6ae29a2c76362337bd5b34f8951b5fbcd5316e892c81e5434092d
- d4deb3fc82619bf21f5e30fa488724da3ac17d0b3002661f95345a4fdfa5342c
- 7121d04c37484902cd0c68a7fd2c68af25b43d5a71872cff65e408845029885c
- d02e0982655a560b547629a9635abb0e491163ea7eb443d454f9e09ff0a05904
- 0bfe3a70d2b393973eb5c097191a38ecfe57cdd61000dc5b1d01acc8ac700604
- b4824070be3c764c0e1be0baea8baf5cc4700732bdf4f7a5f946f81227caceea
- 3f8ec0fb6428fcf7eeba212165e4c5d4d61b865e3e26780e2a893704e1a169d8
- 093fe238df44efe1491c952454142222662c4c58ea953d558d7a3b344ead0799"
+checksum="2dedbef23c189a3ae79601848bda9494ac94a54b62912f27c475a76f0fd689fe
+ b7b58f8567304c7acdf15e68b22f26f44fa4aa26fb9ce51adc9ab8091e62df70
+ d65eacf7031f09d3f17da10c9043cf0db3b2a27acfc94ce1642d62986aabc9d4
+ 4da10714359d8433741ccba376c782e1b8774b85ce186f99927dc09add8bea0f
+ 0635d930e2ba2da6362f7838d98bf50f21d7d69bac8b67a69e34981d22bb450b
+ e8bb7f3b9443e6bd2efe7bfaaf4f7be169ceba14ee3c4acde169d454df613b4d
+ 0bbd6e920bb09d055f23813af147d8f532a7288e992f4dc72b301c40ba165153
+ 5023d7f804189f5a25a65a649fe3e2dafd723a4ecfa236db00eb51c2ae8b2c9f
+ ccdb7e5537debe2a97cb05ef20a63683e984770fbd4bf1315a9ca7d1b675e6e2
+ e6a449b1280d337b549bc5ae8fa6a81a5f20632dce4807e54cff313fa848b273
+ 885df228e7a5821d4a036a206bf1d8b39415a740a470eca581d1488ca68642b4
+ 72585b3125e0253fa9fb7cec59ad332e35bdc40865e6d30e85dd77426fb1b88c
+ e74e73bf2746608c9f6bea7b44cbf99699170d19f48c588b48bcb20673dde6ab
+ 81a1172ce4e0075cbbed9090b4e193ebef9fae0f01d1ea0b599e6ba2e5b9d676
+ 9e048a7648e4d9b32df68117a206e4d48d4a648c4e7fb0555c152b80a3fdb01a
+ afca69f4448ee277d6f0ec6fb564dbdcf52daeaa678ec792968a25a1b4089395
+ 1f1da038f72fc2d120e791711813883e782b6e5896248bad8a9bc637656c7c64
+ 2c0ef8f7f85e5ee2992c7ca972b0f379c69bce20e8891ceedc1249c7de6977e7
+ b61a3b03d7663aa7a9d4b41442bbc1c36a53917baa9ac6ea40586ddfc8b46fd6
+ be3993297bc3a2e5a5143948bf77bf68341602cad991e2ffb3440ea91684eee7
+ abbc3505714d14afab1ee31dddf1c740400849e91ae0940894608c439d14ca1b
+ cb9caf3791adeaaf028dc3ea49190a7261dbac1d819e773745da43bd5e20baf3
+ 310044e3dc20c8e5a6f93b8a1431e4e483a64ef7e85a363205c0f099d022c101
+ ada24eec9c0ee87bf91a1c7615d5626683cc5f71299682abd1d9623ed1c3ac4d
+ 45c56e1f272f7888c955be0012e10fdae24eaa966a092b390ba3fb3290331da7
+ 6ebc3c7478047bf4cab9c3a8c21750c11b735860118838dc88eafcb682520f83
+ 5e9443506779ba3ec0e6142b6933e21653a5e73df183c4f139ad5a03fdce808f
+ 802a8e645735dc796889854356943c68f93111f091189c8604c2bef31e3a887e
+ d71d2df409aab2dcfa1b01d0223b6ff2a89490e95b3be5606ad03de215c03dc5
+ e5f7c195566375f6bc042b2eef47ff32ca92ec5e199d3c8ce074abac4f17b141
+ f9afb0d6f77df96a9b7aef610b7da9162a87610d9f7567604f785dbe08ac78b7
+ b56b78228ddb7a323e2c45c155098663df00068011904febe69d29e9c7b3ede9
+ 791c498fb02559f77a8d6e7b3f206bc27de60e6447ca472d034678cf59636321
+ c2fcc7d13fe09910b4a615720c983d7ad23e69ecfa4615ff22ea9701e022f978
+ 2ac17793f016a00dec9c08795252f0b32b2820ece859b231334fa2b6ff34264f
+ 13801b073d6deece09b33ae445b1b10f01bb71d45a5378699c72d7bd8a914a78
+ 6d5add1a5b7d1a33aeb604b7ba9194932f86811b83efcc5752fcfe1775e08f23
+ 30117c68fcd691f3159a328c5a3c7948ca3e77ca4688a73a9d0c644b8a4246f9
+ f90f0f0fd894566dc0eaaf60919a09d1ccee9321524871e1331cff757fb7bfea
+ 7d96458df5f800936e4561fb185ecc9b581eca9578137296c9bdeceb44daf193
+ a7bb9478be3d6e013ad5f9e35d32eb71a62797a705404bff6cc2cae8487743b1
+ f08c737abd560cea089152758d792e5beaedc9ccede7983388dd807fe7d2a11f
+ 95e7475adabd240f0972757a7da25261bc47e83ac2c67944a8a6ac7992d9ec29
+ 099b50cd890420b3a2d62070e45ce7c0705ef39e7dd9c2300bd4aae69fda726c
+ bad88b58dfca9079037ce94f42f77374ef9f9a3bd638e87bf7287b47a5dc9ffb
+ 6efda86537326063b96b5e77131dc6412e75589d84131dac96a482c788c50a7b
+ 2a62edb917fc00d292ee020e9f8d134ebfe9c5673ce200da45cd19d5c2a8802f
+ 26aa9c6b1de4d536ec1c0aae8c226b151207f172aa4afb52152955f3d9419b36
+ d163cde2b231fbbf0e59e43ae7e9df9d90af63063f17e0422e693eec40a51521
+ 02f4e66ff8693498527505c3a32fd6ddf7a5039b7a7ccd6c2c747523a910754b
+ 892960fd4783c002e2474d16e9d7b70845e8bb93964ff681812a0cad6b763304
+ fa2f66fbd0dedf186650768547553aba45a15fa5ea2a1dcdfcd9ff157838ec54
+ ad143cf3848376f5391842ff8e5f8adbd1dde0f02cceef48e48d0903cd174578
+ 0707af0cf8a4074839844a6c21632746d2a5fd6f114805d3876d018de20aca88
+ fca407ec651962e21618c06cff83e68a8ed03e579cff9323336e8d78d13cee9e
+ b335c60db936421f1a2a77944aa9156821c3d350f8dba689d5a6fec6bbc88092
+ ef3a4d8335a856f3ce0aa7ba4c48265ca043edf90f4050922a134584fc9a0b9f
+ 2434ae11c76063aa7685d0445993cb09b2566ae5a5d50cf2080c977cb5af98fc
+ ad02956d6bc1b49925170ad1a172b5e830dae346986913ce6002f46c3d998dd0
+ e6b2562e083f74d82ff9665c182ffa61c4cf1a2e28777b6be8169f2b81d3e6a5
+ 4907238801a5db0c6736995c4cd907b4247274abcea7828684e61c0d07e6cfff
+ 6ba4938cd5bee47c97eb469a0d7d4a74dae140f6ec2c571e4bad7e7e0516503a
+ 5eb3c903dc6f77080bb7863bddac704ff9f54b01af8c85a18b6d09e2c421b30f
+ 0ad0c770e64b3269f99f0c675bfa3462e04375134db585b75e5948ad5aaaf8d8
+ 5414854b7f2125093a369e5b239f62822aca0b9109a0338a5f92bc3e66b61c92
+ 7e7e198016ca1a8d26f3818cee938f72b11e8c73a9321cf9daa1fb9b12781c6e
+ f0a7269039e2bc34e12d0fea551f658c05bf7f8867f723f557ac6da6ef9ef139
+ 2d24d04287306fe490f6d512d2589ba04dc146212b41e87997fe15fb825ea52d
+ 24b5910b9ff7bef6d3f6f3da15451374f1322c26a08cc8120f9c3f56657df3bb
+ 14bb80304f93b629e78d174cc11bf0e9291662d223a9e7d2cf28218026835426
+ 77383381d09a8bc6f3d119a831b7f143b28f1ca5ca0af328cc4085d83e9b2cd7
+ ab1f80d1df6096f608a7b3868b555f372f1d4453718dc7a193ffca551e1d8dc7
+ 89c5b8410c2b29dafd062f6fc2caad4ed70d582400882509919b56628aa917a5
+ f81e32bddb4d1c0bf8d6b969ce14f365cc604c51bfae3c757188ecac0d182415
+ f0b6652eb519c081a704cbed0aacca367eb13449b0643c2690aaef6cf4387539
+ e6fc7b8ea756fcb0ddc9830f804cd818c7e18db3fce9f070c9fa0a4aa837cb87
+ 1594712d37d0deea3d7b8483be8a17f6151cc05dab24f63fa0bedbea0744e798
+ 478930a36ca9bb22b56554099a569f351799b50f39b291ab18cde013fcf866b1
+ d28be7e2d566576c62183d745c2d19605312c5264988ede6b0feb6fd9e5a2567
+ 74de8c32bffa4c7442a187548c3cc0b878e2c2b2f34a4009fdb09fe1a5287f74
+ 00c1d6ba56aef0121bc48db84500d5b0fdb67b93ec0719da024f96b425817115
+ 783e5458dad544dcef3ba2bada77d9d74d1856729f81a9a703cd6bdcaab77eeb
+ c63b8ea8ad7449c99c87cba1c7db2351aef0d4ad5e44aa7e74420f2b29579b9c
+ 28b08801c0e429d3de1a72e3c54653220305dd64ddb791a6c75d8f22c18cf9f9
+ e4b70ed881bb5cfe718e16d16570bd85887e87c859de72e2699bd6935b41c5c6
+ 86f15fa6884f8513921c57c7884d57fb00ecfd08284a54522b1e7ea463029e8e
+ 72eba55bf5f37386ed1fd81bf246ed99ba37a77d099cb78d60f8c145eab55545
+ 96ee4b5ebd85508e5dfa4cb1e12c36e47006b3aaed3779950dcf681678c23380
+ b060a98122104f8b0f9b352b5406ba92182a91078588caadbdf30f56f2682415
+ 5d511cf3086366c319e5ac900f20afd12fca2e245cd54656282ea39c86eb8764
+ 569949c84e9db4a9057f60f3b30739c17e06ac7fb9efac760e5af66dc283f8d9
+ 3aade6bf9b7fa18750dc31faaf330d67f053f7fc48fab9bd2569ad9c1409e518
+ 80868aa4719be5bae403a5d962ddb0097a1566f900ef20ae947c15ed2f647f89"
diff --git a/srcpkgs/firefox/files/firefox-wayland b/srcpkgs/firefox/files/firefox-wayland
index bd7b93c7a92..495f901320c 100644
--- a/srcpkgs/firefox/files/firefox-wayland
+++ b/srcpkgs/firefox/files/firefox-wayland
@@ -1,5 +1,2 @@
 #!/bin/sh
-
-export GDK_BACKEND=wayland
-
-exec /usr/lib/firefox/firefox "$@"
+exec env MOZ_ENABLE_WAYLAND= /usr/lib/firefox/firefox "$@"
diff --git a/srcpkgs/firefox/patches/initialize_sched_param.patch b/srcpkgs/firefox/patches/initialize_sched_param.patch
new file mode 100644
index 00000000000..ee593c3c217
--- /dev/null
+++ b/srcpkgs/firefox/patches/initialize_sched_param.patch
@@ -0,0 +1,22 @@
+source: https://github.com/padenot/audio_thread_priority/commit/a1443a02667c649cb72873a45b98fffbd2eac5a8
+
+commit a1443a02667c649cb72873a45b98fffbd2eac5a8
+Author: Paul Adenot <paul@paul.cx>
+Date:   Mon Aug 19 15:00:39 2019 +0200
+
+    initialize sched_param using std::mem::zeroed to fix compilation against other libc than glibc
+
+diff --git a/src/rt_linux.rs b/src/rt_linux.rs
+index d8c0114..fbb4fde 100644
+--- third_party/rust/audio_thread_priority/src/rt_linux.rs.orig	2019-09-03 22:57:00.197152845 +0200
++++ third_party/rust/audio_thread_priority/src/rt_linux.rs	2019-09-03 23:05:42.219159018 +0200
+@@ -93,8 +93,8 @@ pub fn promote_current_thread_to_real_time_internal(audio_buffer_frames: u32,
+ {
+     let thread_id = unsafe { libc::syscall(libc::SYS_gettid) };
+     let pthread_id = unsafe { libc::pthread_self() };
++    let mut param = unsafe { std::mem::zeroed::<libc::sched_param>() };
+     let mut policy = 0;
+-    let mut param = libc::sched_param { sched_priority: 0 };
+ 
+     if unsafe { libc::pthread_getschedparam(pthread_id, &mut policy, &mut param) } < 0 {
+         error!("pthread_getschedparam error {}", pthread_id);
diff --git a/srcpkgs/firefox/patches/ppc64le-bug-1512162.patch b/srcpkgs/firefox/patches/ppc64le-bug-1512162.patch
deleted file mode 100644
index ec38f2262be..00000000000
--- a/srcpkgs/firefox/patches/ppc64le-bug-1512162.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-
-diff --git a/js/xpconnect/src/XPCWrappedNative.cpp b/js/xpconnect/src/XPCWrappedNative.cpp
---- js/xpconnect/src/XPCWrappedNative.cpp
-+++ js/xpconnect/src/XPCWrappedNative.cpp
-@@ -1152,16 +1152,20 @@ bool XPCWrappedNative::CallMethod(XPCCal
-   if (NS_FAILED(rv)) {
-     return Throw(rv, ccx);
-   }
- 
-   JS::Rooted<CallMethodHelper> helper(ccx, /* init = */ ccx);
-   return helper.get().Call();
- }
- 
-+#if (__GNUC__ && __linux__ && __PPC64__ && _LITTLE_ENDIAN)
-+// Work around a compiler bug on ppc64le (bug 1512162).
-+__attribute__ ((noinline,noclone))
-+#endif
- bool CallMethodHelper::Call() {
-   mCallContext.SetRetVal(JS::UndefinedValue());
- 
-   mCallContext.GetContext()->SetPendingException(nullptr);
- 
-   if (mVTableIndex == 0) {
-     return QueryInterfaceFastPath();
-   }
-@@ -1310,16 +1314,20 @@ bool CallMethodHelper::GetOutParamSource
-         return false;
-       }
-     }
-   }
- 
-   return true;
- }
- 
-+#if (__GNUC__ && __linux__ && __PPC64__ && _LITTLE_ENDIAN)
-+// Work around a compiler bug on ppc64le (bug 1512162).
-+__attribute__ ((noinline,noclone))
-+#endif
- bool CallMethodHelper::GatherAndConvertResults() {
-   // now we iterate through the native params to gather and convert results
-   uint8_t paramCount = mMethodInfo->GetParamCount();
-   for (uint8_t i = 0; i < paramCount; i++) {
-     const nsXPTParamInfo& paramInfo = mMethodInfo->GetParam(i);
-     if (!paramInfo.IsOut()) {
-       continue;
-     }
-
-
-
-
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 82d454d0f68..ec5516269f3 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n".
 #
 pkgname=firefox
-version=68.0.2
+version=69.0.2
 revision=1
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
@@ -11,7 +11,7 @@ maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=9b3e6d8f99819f9eda9ebba403b644a2b96d19450b42cae422bbf4386902a840
+checksum=2904ef954626d2a7f320670ccb7cb5d9060610f091c94190a6cbee14aa2cd82e
 
 lib32disabled=yes
 
@@ -31,11 +31,6 @@ conflicts="firefox-esr>=0"
 build_options="alsa dbus pulseaudio startup_notification xscreensaver sndio wayland"
 build_options_default="alsa dbus pulseaudio startup_notification xscreensaver sndio wayland"
 
-# 19:55.85 /usr/bin/ld: failed to set dynamic section sizes: memory exhausted
-if [ "$XBPS_WORDSIZE" -eq 32 ]; then
-	nodebug=yes
-fi
-
 case $XBPS_TARGET_MACHINE in
 	armv6*)
 		broken="required NEON extensions are not supported on armv6"
@@ -44,6 +39,13 @@ case $XBPS_TARGET_MACHINE in
 	ppc*) broken="ftbfs in several places" ;;
 esac
 
+# we need this because cargo verifies checksums of all files in vendor
+# crates when it builds and gives us no way to override or update the
+# file sanely... so just clear out the file list
+_clear_vendor_checksums() {
+	sed -i 's/\("files":{\)[^}]*/\1/' third_party/rust/$1/.cargo-checksum.json
+}
+
 post_extract() {
 	case "$XBPS_TARGET_MACHINE" in
 	*-musl)
@@ -59,6 +61,11 @@ post_extract() {
 	# Note: This is for Void Linux use ONLY.
 	echo -n "cd894504-7a2a-4263-abff-ff73ee89ffca" > mozilla-api-key
 }
+
+post_patch() {
+	_clear_vendor_checksums audio_thread_priority
+}
+
 do_build() {
 	cp "${FILESDIR}/mozconfig" "${wrksrc}/.mozconfig"
 
@@ -104,19 +111,20 @@ do_build() {
 	mkdir -p third_party/rust/libloading/.deps
 
 	case "$XBPS_TARGET_MACHINE" in
-	i686*)
-		export CFLAGS+=" -D_FILE_OFFSET_BITS=64"
-		export CXXFLAGS+=" -D_FILE_OFFSET_BITS=64"
-		;;
 	armv7*)
 		export CFLAGS+=" -mfpu=neon -Wno-psabi"
 		export CXXFLAGS+=" -mfpu=neon -Wno-psabi"
 		;;
 	esac
 
-	if [ "$XBPS_WORDSIZE" -eq 32 ]; then
-		# ENOMEM
-		echo "ac_add_options --disable-debug-symbols" >>.mozconfig
+	# work around large debug symbols on 32-bit hosts
+	if [ "$XBPS_WORDSIZE" = "32" ]; then
+		export CFLAGS="${CFLAGS/-g/-g1}"
+		export CXXFLAGS="${CXXFLAGS/-g/-g1}"
+		export LDFLAGS+=" -Wl,--no-keep-memory"
+		# patch the rust debug level, this is hardcoded
+		sed -i "s/debug_info = '2'/debug_info = '1'/" \
+		build/moz.configure/toolchain.configure
 	fi
 
 	export LDFLAGS+=" -Wl,-rpath=/usr/lib/firefox"
diff --git a/srcpkgs/fish-shell/template b/srcpkgs/fish-shell/template
index b48ac921bda..9a3930ad586 100644
--- a/srcpkgs/fish-shell/template
+++ b/srcpkgs/fish-shell/template
@@ -7,7 +7,7 @@ build_style=cmake
 makedepends="ncurses-devel pcre2-devel gettext-devel"
 depends="bc groff"
 short_desc="User friendly shell intended mostly for interactive use"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://fishshell.com/"
 distfiles="https://github.com/fish-shell/fish-shell/releases/download/${version}/fish-${version}.tar.gz"
diff --git a/srcpkgs/flac/template b/srcpkgs/flac/template
index aa1a8b3fa52..03c29f4f72a 100644
--- a/srcpkgs/flac/template
+++ b/srcpkgs/flac/template
@@ -15,8 +15,11 @@ license="BSD-3-Clause, GPL-2"
 distfiles="https://downloads.xiph.org/releases/flac/flac-${version}.tar.xz"
 checksum=213e82bd716c9de6db2f98bcadbc4c24c7e2efe8c75939a1a84e28539c4e1748
 
+# TODO: make into options
 case "$XBPS_TARGET_MACHINE" in
-	ppc64|ppc64-musl) configure_args+=" --disable-vsx";;
+	ppc64le*) configure_args+=" --enable-altivec --enable-vsx" ;;
+	ppc64*) configure_args+=" --enable-altivec --disable-vsx" ;;
+	ppc*) configure_args+=" --disable-altivec --disable-vsx" ;;
 esac
 
 post_install() {
diff --git a/srcpkgs/flacon/template b/srcpkgs/flacon/template
index 016e1732d7d..907355a6413 100644
--- a/srcpkgs/flacon/template
+++ b/srcpkgs/flacon/template
@@ -1,6 +1,6 @@
 # Template file for 'flacon'
 pkgname=flacon
-version=5.2.0
+version=5.5.1
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="LGPL-2.1-or-later"
 homepage="https://flacon.github.io/"
 changelog="https://flacon.github.io/changelog/"
 distfiles="https://github.com/Flacon/flacon/archive/v${version}.tar.gz"
-checksum=701fb0ebee98a697baa3060645ca4203771714994bb1fa8eeebfd2274e4704ac
+checksum=bdeac2268536c790ede8928156c7a35019dd05ed1b16f04238394a238950d287
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/flake8/template b/srcpkgs/flake8/template
index 6a885e01ccb..d8f2b095644 100644
--- a/srcpkgs/flake8/template
+++ b/srcpkgs/flake8/template
@@ -1,6 +1,6 @@
 # Template file for 'flake8'
 pkgname=flake8
-version=3.7.7
+version=3.7.8
 revision=1
 archs=noarch
 build_style=python3-module
@@ -14,10 +14,10 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="MIT"
 homepage="https://gitlab.com/pycqa/flake8"
 distfiles="${PYPI_SITE}/f/flake8/flake8-${version}.tar.gz"
-checksum=859996073f341f2670741b51ec1e67a01da142831aa1fdc6242dbf88dffbe661
+checksum=19241c1cbc971b9962473e4438a2ca19749a7dd002dd1a946eaba171b4114548
 
 pre_build() {
-	sed -i '/setup_requires/d' setup.py
+	vsed -i '/setup_requires/d' setup.py
 }
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/flatbuffers/patches/install.patch b/srcpkgs/flatbuffers/patches/install.patch
deleted file mode 100644
index 6669eaffaa8..00000000000
--- a/srcpkgs/flatbuffers/patches/install.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -320,7 +320,7 @@ if(FLATBUFFERS_INSTALL)
-     install(
-       TARGETS flatc EXPORT FlatcTargets
-       RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
--      CONFIGURATIONS Release
-+      CONFIGURATIONS Release RelWithDebInfo
-     )
- 
-     install(
-@@ -328,7 +328,7 @@ if(FLATBUFFERS_INSTALL)
-       FILE FlatcTargets.cmake
-       NAMESPACE flatbuffers::
-       DESTINATION ${FB_CMAKE_DIR}
--      CONFIGURATIONS Release
-+      CONFIGURATIONS Release RelWithDebInfo
-     )
-   endif()
- 
diff --git a/srcpkgs/flatbuffers/template b/srcpkgs/flatbuffers/template
index 2888235df1a..d437677c768 100644
--- a/srcpkgs/flatbuffers/template
+++ b/srcpkgs/flatbuffers/template
@@ -1,20 +1,24 @@
 # Template file for 'flatbuffers'
 pkgname=flatbuffers
-version=1.10.0
+version=1.11.0
 revision=1
 build_style=cmake
 short_desc="Memory Efficient Serialization Library"
 maintainer="Elie ROUDNINSKI <xademax@gmail.com>"
-license="GPL-3.0-or-later"
+license="Apache-2.0"
 homepage="https://google.github.io/flatbuffers/"
 distfiles="https://github.com/google/${pkgname}/archive/v${version}.tar.gz"
-checksum=3714e3db8c51e43028e10ad7adffb9a36fc4aa5b1a363c2d0c4303dd1be59a7c
+checksum=3f4a286642094f45b1b77228656fbd7ea123964f19502f9ecfd29933fd23a50b
 
 if [ "$CROSS_BUILD" ]; then
 	# Disable tests to prevent executing target binaries on host
-	configure_args="-DFLATBUFFERS_BUILD_TESTS=OFF"
+	configure_args+=" -DFLATBUFFERS_BUILD_TESTS=OFF"
 fi
 
+case "$XBPS_TARGET_MACHINE" in
+	*-musl) configure_args+=" -DFLATBUFFERS_LOCALE_INDEPENDENT=0";;
+esac
+
 flatbuffers-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/flatpak-builder/template b/srcpkgs/flatpak-builder/template
index 1cc55f9ba13..056d33ce5ca 100644
--- a/srcpkgs/flatpak-builder/template
+++ b/srcpkgs/flatpak-builder/template
@@ -1,6 +1,6 @@
 # Template file for 'flatpak-builder'
 pkgname=flatpak-builder
-version=1.0.6
+version=1.0.9
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config xmlto"
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/flatpak/flatpak-builder"
 distfiles="${homepage}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=3b572ad7b7cce9ca6a8632ca69a49a47b20e99066fe064b7b56e7896dca789bb
+checksum=d6ef390a1cd927db1cfb12b6d2e340227a69de3fd64308316a3e6a89c1390d03
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" flatpak-devel"
diff --git a/srcpkgs/flatpak/template b/srcpkgs/flatpak/template
index d4bab0c9a13..0a572fd11a1 100644
--- a/srcpkgs/flatpak/template
+++ b/srcpkgs/flatpak/template
@@ -1,7 +1,7 @@
 # Template file for 'flatpak'
 pkgname=flatpak
-version=1.4.2
-revision=3
+version=1.5.0
+revision=1
 build_style=gnu-configure
 build_helper="gir"
 configure_args="
@@ -20,7 +20,7 @@ license="LGPL-2.1-or-later"
 homepage="https://flatpak.org/"
 changelog="https://github.com/flatpak/flatpak/blob/master/NEWS"
 distfiles="https://github.com/flatpak/flatpak/releases/download/${version}/flatpak-${version}.tar.xz"
-checksum=f2799a6d973a052529b52943021108f148706d3e69725ac7dd60bf6ac4bdd522
+checksum=1a13f4c54c136e728e96406846f26b84d9d5986caf17868aa73917d7588c471e
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/fldigi/template b/srcpkgs/fldigi/template
index 8e86893ebb4..8b34b4c8027 100644
--- a/srcpkgs/fldigi/template
+++ b/srcpkgs/fldigi/template
@@ -1,6 +1,6 @@
 # Template file for 'fldigi'
 pkgname=fldigi
-version=4.1.07
+version=4.1.08
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -11,4 +11,4 @@ maintainer="Andy Cobaugh <andrew.cobaugh@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="http://www.w1hkj.com"
 distfiles="http://www.w1hkj.com/files/fldigi/fldigi-${version}.tar.gz"
-checksum=dc4864b6e63c688b9dd932587bdaf7becfa17558380f7deff1236eb6b66921f0
+checksum=004b54fa4ff03c85e088bf1706270db5f3976afcaaf1003b4d6d3b0ef8007349
diff --git a/srcpkgs/flowblade/patches/00-add-bin-directories.patch b/srcpkgs/flowblade/patches/00-add-bin-directories.patch
index b73fe73df61..91622e5cc53 100644
--- a/srcpkgs/flowblade/patches/00-add-bin-directories.patch
+++ b/srcpkgs/flowblade/patches/00-add-bin-directories.patch
@@ -1,11 +1,11 @@
---- flowblade-trunk/flowblade	2019-02-04 02:29:07.000000000 -0700
-+++ flowblade-trunk/flowblade	2019-07-06 17:48:47.295155396 -0600
-@@ -34,7 +34,7 @@ print "Launch script dir:", launch_dir
+--- flowblade-trunk/flowblade	2019-08-31 20:09:32.877338976 +0200
++++ flowblade-trunk/flowblade	2019-08-31 20:09:50.706337258 +0200
+@@ -34,7 +34,7 @@
  
  # Update sys.path to include modules
  # When running on distro
--if launch_dir == "/usr/bin":
-+if launch_dir in {"/usr/bin", "/bin", "/usr/local/bin"}:
+-if launch_dir in {"bin", "/usr/bin", "/usr/local/bin"}:
++if launch_dir in {"/bin", "/usr/bin", "/usr/local/bin"}:
      print "Running from installation..."
      modules_path = "/usr/share/flowblade/Flowblade"
      if not os.path.isdir(modules_path):
diff --git a/srcpkgs/flowblade/template b/srcpkgs/flowblade/template
index 4e8e509f9f9..765ac779be1 100644
--- a/srcpkgs/flowblade/template
+++ b/srcpkgs/flowblade/template
@@ -1,7 +1,7 @@
 # Template file for 'flowblade'
 pkgname=flowblade
-version=2.0
-revision=2
+version=2.2
+revision=1
 archs=noarch
 build_wrksrc=flowblade-trunk
 build_style=python2-module
@@ -11,8 +11,8 @@ hostmakedepends="python-setuptools"
 depends="frei0r-plugins gmic mlt-python python-Pillow python-dbus gtk+3
  python-gobject python-numpy swh-plugins"
 short_desc="Non-linear video editor for Linux"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://jliljebl.github.io/flowblade/"
 distfiles="https://github.com/jliljebl/flowblade/archive/v${version}.tar.gz"
-checksum=c8f21d76803d9ed44585e6d960b12ba1930661e58ee36456fc424d41e2945b33
+checksum=4c7bc61d2d38dbf91bbae9f835fbf82504a47d973983427264706a0596573e70
diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template
index 793aa081ea1..3a3ab9cfc57 100644
--- a/srcpkgs/fmt/template
+++ b/srcpkgs/fmt/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF"
 short_desc="Modern formatting library"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/fmtlib/fmt"
 distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz"
diff --git a/srcpkgs/fmtools/template b/srcpkgs/fmtools/template
new file mode 100644
index 00000000000..9ae54b6cf28
--- /dev/null
+++ b/srcpkgs/fmtools/template
@@ -0,0 +1,11 @@
+# Template file for 'fmtools'
+pkgname=fmtools
+version=2.0.7
+revision=1
+build_style=gnu-configure
+short_desc="Utility for adjusting the frequency and volume of FM radio cards"
+maintainer="Foxlet <foxlet@furcode.co>"
+license="GPL-2.0-only"
+homepage="https://benpfaff.org/fmtools/"
+distfiles="https://benpfaff.org/fmtools/fmtools-${version}.tar.gz"
+checksum=75174e07d8cde6d4a8a5d7bbaa3a3b0760a850e7f6840cb7c6246227b18f5a39
diff --git a/srcpkgs/focuswriter/template b/srcpkgs/focuswriter/template
index 0999b4b8cdd..ca42da753d1 100644
--- a/srcpkgs/focuswriter/template
+++ b/srcpkgs/focuswriter/template
@@ -1,6 +1,6 @@
 # Template file for 'focuswriter'
 pkgname=focuswriter
-version=1.7.2
+version=1.7.3
 revision=1
 build_style=qmake
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://gottcode.org/focuswriter/"
 distfiles="https://github.com/gottcode/focuswriter/archive/v${version}.tar.gz"
-checksum=0d6c2795445f2d124ba2e7e1a12db20a4a25731215935f228794ae79f0cc553c
+checksum=3fed103a3088e2f71ead38f19b46726aabd5d2b2f27ef6716ce1b05cb609fb3d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-multimedia-devel"
diff --git a/srcpkgs/foliate/template b/srcpkgs/foliate/template
index 25b0f0badce..95d3ba64672 100644
--- a/srcpkgs/foliate/template
+++ b/srcpkgs/foliate/template
@@ -1,14 +1,14 @@
 # Template file for 'foliate'
 pkgname=foliate
-version=1.4.0
+version=1.5.3
 revision=1
 archs=noarch
 build_style=meson
-hostmakedepends="pkg-config gjs glib-devel ninja"
+hostmakedepends="pkg-config gjs glib-devel ninja desktop-file-utils"
 depends="webkit2gtk gjs"
 short_desc="Simple and modern GTK eBook reader"
 maintainer="lorem <notloremipsum@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://johnfactotum.github.io/foliate/"
 distfiles="https://github.com/johnfactotum/foliate/archive/${version}.tar.gz"
-checksum=481d051299dcc26918f453e635730313ad00fac33cc8d61594e4289fff1159fd
+checksum=95f45c0511493a3c732f9a199ddc2b5851a220d74d93e6d14976f29f243ee2d7
diff --git a/srcpkgs/folks/template b/srcpkgs/folks/template
index 376f1522505..9a75a1f3c7b 100644
--- a/srcpkgs/folks/template
+++ b/srcpkgs/folks/template
@@ -1,7 +1,7 @@
 # Template file for 'folks'
 pkgname=folks
-version=0.12.1
-revision=2
+version=0.13.1
+revision=1
 build_style=meson
 configure_args="-Db_lto=false -Dlibsocialweb-backend=false $(vopt_bool vala vala)"
 hostmakedepends="pkg-config intltool glib-devel $(vopt_if vala vala)
@@ -11,10 +11,10 @@ makedepends="readline-devel telepathy-glib-devel zeitgeist-devel
 depends="zeitgeist"
 short_desc="GObject Library to aggregate people into metacontacts"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="LGPL-2.1.0-or-later"
+license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Folks"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3ca9f2d50fdf5a7a3d3f59c49bd54ceaf8d8181938762370e07535f86d36d475
+checksum=3df1c663b82fe211aead2b31cae1fc41d124e85436375762f6745c45ba46aa5d
 nocross="Needs Vala, which needs evolution-dataserver GIR"
 
 # NOTE: Vala build opt is broken because upstream doesn't package all necessary
diff --git a/srcpkgs/font-FixedMisc/template b/srcpkgs/font-FixedMisc/template
index d4ad7c471a5..dc11ffcd791 100644
--- a/srcpkgs/font-FixedMisc/template
+++ b/srcpkgs/font-FixedMisc/template
@@ -1,6 +1,6 @@
 # Template file for 'font-FixedMisc'
 pkgname=font-FixedMisc
-version=20190604
+version=20190911
 revision=1
 archs=noarch
 wrksrc=FixedMisc
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="https://www.mirbsd.org/cvs.cgi/contrib/fonts/fixed/"
 distfiles="https://www.mirbsd.org/MirOS/dist/mir/Foundry/FixedMisc-${version}.tgz"
-checksum=6b883d84036f79d6d148313ff0a3c5389e516bd00497e6b610eab97965340a48
+checksum=1aa35a3128b3e5ca452467fca8150ad394054f60f847eca7296480bd23039dd7
 
 font_dirs="/usr/share/fonts/X11/misc"
 
diff --git a/srcpkgs/font-Hasklig/template b/srcpkgs/font-Hasklig/template
index eea3082cf8d..656492ec093 100644
--- a/srcpkgs/font-Hasklig/template
+++ b/srcpkgs/font-Hasklig/template
@@ -7,7 +7,7 @@ create_wrksrc=yes
 hostmakedepends="unzip"
 depends="font-util xbps-triggers"
 short_desc="Monospaced font with ligatures"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="OFL-1.1"
 homepage="https://github.com/i-tu/Hasklig/"
 distfiles="https://github.com/i-tu/Hasklig/releases/download/${version}/Hasklig-${version}.zip"
diff --git a/srcpkgs/font-awesome5/template b/srcpkgs/font-awesome5/template
index 0a027800f19..bb4cfcb0b58 100644
--- a/srcpkgs/font-awesome5/template
+++ b/srcpkgs/font-awesome5/template
@@ -1,16 +1,16 @@
 # Template file for 'font-awesome5'
 pkgname=font-awesome5
-version=5.10.1
+version=5.11.2
 revision=1
 archs=noarch
 wrksrc="Font-Awesome-${version}"
 depends="font-util"
 short_desc="Iconic font (version 5)"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="mobinmob <mobinmob@disroot.org>"
 license="OFL-1.1"
 homepage="https://fontawesome.com"
 distfiles="https://github.com/FortAwesome/Font-Awesome/archive/${version}.tar.gz"
-checksum=8c58f94b774ad7e1b86b2a0ec4de8795acdf7ad2fc5339276fd245023e74913a
+checksum=f4e4622b944267cbd063cb75c6b606924eea1f801bd3585075695f681cebd723
 conflicts="font-awesome>=0"
 font_dirs="/usr/share/fonts/OTF"
 
diff --git a/srcpkgs/font-firacode/template b/srcpkgs/font-firacode/template
index 534b1e217f7..ef7704f3a3a 100644
--- a/srcpkgs/font-firacode/template
+++ b/srcpkgs/font-firacode/template
@@ -1,6 +1,6 @@
 # Template file for 'font-firacode'
 pkgname=font-firacode
-version=1.207
+version=2
 revision=1
 archs=noarch
 create_wrksrc=yes
@@ -11,7 +11,7 @@ license="OFL-1.1"
 homepage="https://github.com/tonsky/${pkgname#*-}"
 changelog="https://github.com/tonsky/FiraCode/raw/master/CHANGELOG.md"
 distfiles="${homepage}/releases/download/${version}/${pkgname#*-}_${version}.zip"
-checksum=ba8d1a9ff3ad1bce7decc48db7a1e95c6116959cc5b9b80dc307b615eec3dfee
+checksum=60d5b1106b708cc134c521aae4e503bb1d2ec3c9bf8ad978f2c659820505d492
 font_dirs="/usr/share/fonts/OTF"
 
 do_install() {
diff --git a/srcpkgs/font-ibm-plex-ttf/template b/srcpkgs/font-ibm-plex-ttf/template
index 2de952c018a..fed6cc4c85b 100644
--- a/srcpkgs/font-ibm-plex-ttf/template
+++ b/srcpkgs/font-ibm-plex-ttf/template
@@ -1,6 +1,6 @@
 # Template file for 'font-ibm-plex-ttf'
 pkgname=font-ibm-plex-ttf
-version=2.0.0
+version=3.0.0
 revision=1
 archs=noarch
 wrksrc="plex-${version}"
@@ -10,7 +10,7 @@ maintainer="Vintodrimmer <vintodrimmer@protonmail.ch>"
 license="OFL-1.1"
 homepage="https://github.com/IBM/plex"
 distfiles="https://github.com/IBM/plex/archive/v${version}.tar.gz"
-checksum=5f19741813ffdb4218253dbb0be26b56bf021b8919c42f8c6762d64e71109063
+checksum=3f17785a532507b855e9efe0166d3dedb24451a832a8739ff4c5c191fd64058b
 
 font_dirs="/usr/share/fonts/TTF"
 
diff --git a/srcpkgs/font-ionicons-ttf/template b/srcpkgs/font-ionicons-ttf/template
index bb1afd2ea89..5a1b9153095 100644
--- a/srcpkgs/font-ionicons-ttf/template
+++ b/srcpkgs/font-ionicons-ttf/template
@@ -1,6 +1,6 @@
 # Template file for 'font-ionicons-ttf'
 pkgname=font-ionicons-ttf
-version=4.6.2
+version=4.6.3
 revision=1
 archs=noarch
 wrksrc="ionicons-$version"
@@ -10,7 +10,7 @@ maintainer="Daniel Eyßer <daniel.eysser@gmail.com>"
 license="MIT"
 homepage="https://ionicons.com/"
 distfiles="https://github.com/ionic-team/ionicons/archive/v${version}.tar.gz"
-checksum=fae86345ddeda1449ecb016010e473f5e036c2f8c0ac6514d141998f8934ea05
+checksum=de8d4208a95f82ba5336e4ce3729bed5bc530332083c44de49790d1f0081d321
 
 font_dirs="/usr/share/fonts/TTF"
 
diff --git a/srcpkgs/font-iosevka/template b/srcpkgs/font-iosevka/template
index 5db390c3a30..2e1ad9abaa3 100644
--- a/srcpkgs/font-iosevka/template
+++ b/srcpkgs/font-iosevka/template
@@ -1,6 +1,6 @@
 # Template file for 'font-iosevka'
 pkgname=font-iosevka
-version=2.2.1
+version=2.3.2
 revision=1
 archs=noarch
 create_wrksrc=yes
@@ -13,7 +13,7 @@ homepage="https://be5invis.github.io/Iosevka/"
 distfiles="https://raw.githubusercontent.com/be5invis/Iosevka/v${version}/LICENSE.md>LICENSE.txt
  https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-iosevka-${version}.zip"
 checksum="ecfd74a1d6749bf509cee122870da0186bccfae446e3f6bc5faff253577ab000
- 65cec2bc3672f8aa3cc427effa62a8aa9e26386db983ce0ff4a876e85bf77e5f"
+ dbb8737eb147dcfcb3e3130fb07193fc1308c9af3dd70cc850d6d73184ffea1a"
 
 font_dirs="/usr/share/fonts/TTF"
 
diff --git a/srcpkgs/font-material-design-icons-ttf/template b/srcpkgs/font-material-design-icons-ttf/template
index 111cd2c44b7..70565c4255b 100644
--- a/srcpkgs/font-material-design-icons-ttf/template
+++ b/srcpkgs/font-material-design-icons-ttf/template
@@ -7,7 +7,7 @@ wrksrc="material-design-icons-${version}"
 hostmakedepends="unzip"
 depends="font-util xbps-triggers"
 short_desc="Material Design icons by Google"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/google/material-design-icons"
 distfiles="https://github.com/google/material-design-icons/releases/download/${version}/material-design-icons-${version}.zip"
diff --git a/srcpkgs/font-mplus-ttf/template b/srcpkgs/font-mplus-ttf/template
index 865d8fad9a9..102d839baac 100644
--- a/srcpkgs/font-mplus-ttf/template
+++ b/srcpkgs/font-mplus-ttf/template
@@ -1,16 +1,16 @@
 # Template file for 'font-mplus-ttf'
 pkgname=font-mplus-ttf
-version=063
+version=063a
 revision=1
 archs=noarch
 wrksrc="mplus-TESTFLIGHT-${version}"
 depends="fontconfig font-util"
 short_desc="M+ Japanese outline fonts"
 maintainer="Satoshi Amemiya <amemiya@protonmail.com>"
-license="custom"
+license="CC0-1.0"
 homepage="https://mplus-fonts.osdn.jp/"
 distfiles="http://jaist.dl.osdn.jp/mplus-fonts/62344/mplus-TESTFLIGHT-${version}.tar.xz"
-checksum=149a5c97c35624d79ffb3cbbdd56559319085229acaf72b49b56adc5ede0979c
+checksum=44eb973b4b6aff574de454db105ddc23e6749c2294734bd9cb1e0d734e4cdd79
 font_dirs="/usr/share/fonts/TTF"
 
 do_install() {
diff --git a/srcpkgs/font-sarasa-gothic/template b/srcpkgs/font-sarasa-gothic/template
index eb31ac8b75c..15ef1025e18 100644
--- a/srcpkgs/font-sarasa-gothic/template
+++ b/srcpkgs/font-sarasa-gothic/template
@@ -1,6 +1,6 @@
 # Template file for 'font-sarasa-gothic'
 pkgname=font-sarasa-gothic
-version=0.8.0
+version=0.9.1
 revision=1
 archs=noarch
 create_wrksrc=yes
@@ -11,7 +11,7 @@ maintainer="B. Wilson <x@wilsonb.com>"
 license="OFL-1.1"
 homepage="https://github.com/be5invis/Sarasa-Gothic"
 distfiles="https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z"
-checksum=6a78ce58fc5c572e2f6e17d6af84589b26dc97cccaf253851496c6773ae40f65
+checksum=d8d0b566b2ca7ff0964e00a2fca7737cc73f041c3e3d3badbc62a10e07e2a83b
 
 font_dirs="/usr/share/fonts/TTF"
 
diff --git a/srcpkgs/font-spleen/template b/srcpkgs/font-spleen/template
index 82a443e418d..0bf164819ee 100644
--- a/srcpkgs/font-spleen/template
+++ b/srcpkgs/font-spleen/template
@@ -1,10 +1,9 @@
 # Template file for 'font-spleen'
 pkgname=font-spleen
-version=1.0.5
+version=1.5.0
 revision=1
 archs=noarch
 wrksrc="spleen-${version}"
-font_dirs="/usr/share/fonts/X11/spleen"
 hostmakedepends="bdftopcf"
 depends="font-util"
 short_desc="Monospaced bitmap fonts"
@@ -12,7 +11,8 @@ maintainer="Renato Aguiar <renato@renag.me>"
 license="BSD-2-Clause"
 homepage="https://github.com/fcambus/spleen"
 distfiles="https://github.com/fcambus/spleen/releases/download/${version}/spleen-${version}.tar.gz"
-checksum=cf26c313da53857353e48a93540845cf6f773908fe19d2a509249f061776dfe0
+checksum=a346844625416ede531bcb720bc786924792a0538fe90c8f1215d619dcd0f6c2
+font_dirs="/usr/share/fonts/X11/spleen"
 
 do_install() {
 	vmkdir usr/share/fonts/X11/spleen
@@ -21,6 +21,6 @@ do_install() {
 		bdftopcf -t $f | gzip -n9 > $out
 		vinstall $out 644 usr/share/fonts/X11/spleen
 	done
-	vinstall fonts.alias-spleen 644 usr/share/fonts/X11/spleen fonts.alias
+	vinstall fonts.alias 644 usr/share/fonts/X11/spleen
 	vlicense LICENSE
 }
diff --git a/srcpkgs/font-unifont-bdf/template b/srcpkgs/font-unifont-bdf/template
index a607a113744..63908286b21 100644
--- a/srcpkgs/font-unifont-bdf/template
+++ b/srcpkgs/font-unifont-bdf/template
@@ -1,6 +1,6 @@
 # Template file for 'font-unifont-bdf'
 pkgname=font-unifont-bdf
-version=12.1.02
+version=12.1.03
 revision=1
 archs=noarch
 create_wrksrc=yes
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://unifoundry.com/unifont/index.html"
 distfiles="http://unifoundry.com/pub/unifont/unifont-${version}/font-builds/unifont-${version}.bdf.gz"
-checksum=04d652be1e28a6d464965c75c71ac84633085cd0960c2687466651c34c94bd89
+checksum=6067bda8daa1f3c49d8876107992e19fc9ab905ad54c01c3131b9649977c3746
 font_dirs=/usr/share/fonts/misc
 
 do_install() {
diff --git a/srcpkgs/font-util/template b/srcpkgs/font-util/template
index f71db68e265..5b9946003b5 100644
--- a/srcpkgs/font-util/template
+++ b/srcpkgs/font-util/template
@@ -1,7 +1,7 @@
 # Template file for 'font-util'
 pkgname=font-util
-version=1.3.1
-revision=4
+version=1.3.2
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config bdftopcf"
 #
@@ -10,11 +10,11 @@ hostmakedepends="pkg-config bdftopcf"
 #
 depends="font-alias expat freetype fontconfig mkfontscale"
 short_desc="Tools for truncating and subseting of ISO10646-1 BDF fonts"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
-checksum=aa7ebdb0715106dd255082f2310dbaa2cd7e225957c2a77d719720c7cc92b921
+checksum=3ad880444123ac06a7238546fa38a2a6ad7f7e0cc3614de7e103863616522282
 lib32disabled=yes
 
 post_install() {
diff --git a/srcpkgs/font-vazir/template b/srcpkgs/font-vazir/template
index faea8ba6438..61d1651ea35 100755
--- a/srcpkgs/font-vazir/template
+++ b/srcpkgs/font-vazir/template
@@ -1,6 +1,6 @@
 # Template file for 'font-vazir'
 pkgname=font-vazir
-version=20.1.0
+version=21.1.0
 revision=1
 archs=noarch
 create_wrksrc=yes
@@ -11,7 +11,7 @@ maintainer="linarcx <linarcx@gmail.com>"
 license="OFL-1.1"
 homepage="https://github.com/rastikerdar/vazir-font"
 distfiles="https://github.com/rastikerdar/vazir-font/releases/download/v${version}/vazir-font-v${version}.zip"
-checksum=843f6bfbc7c214ab339f3e7a555bfeb20c6ddebbe3885a33a2c3b4098cf64576
+checksum=5a4abd2e5a21c1659d1a89232559a0936717a9bfaa586da1a3390ee2a3dc63a2
 
 font_dirs="/usr/share/fonts/TTF"
 
diff --git a/srcpkgs/forkstat/template b/srcpkgs/forkstat/template
index f9928be8323..f301b41bdba 100644
--- a/srcpkgs/forkstat/template
+++ b/srcpkgs/forkstat/template
@@ -1,6 +1,6 @@
 # Template file for 'forkstat'
 pkgname=forkstat
-version=0.02.10
+version=0.02.11
 revision=1
 build_style=gnu-makefile
 short_desc="Program that logs process fork(), exec() and exit() activity"
@@ -8,5 +8,5 @@ maintainer="Wilson Birney <wpb@360scada.com>"
 license="GPL-3.0-or-later"
 homepage="https://kernel.ubuntu.com/~cking/forkstat/"
 distfiles="https://kernel.ubuntu.com/~cking/tarballs/forkstat/forkstat-${version}.tar.xz"
-checksum=af039bcd9f11ee76721d96c2c65d7e9c8d5df0a3f688bcbe0a5add2dd5dbb6da
+checksum=717ad3c2a22f5dc68d51ac25cc86deb69820dffbc8ea1101b9792040a843921a
 CFLAGS="-DVERSION=\'\"${version}\"\'"
diff --git a/srcpkgs/fossil/template b/srcpkgs/fossil/template
index cb6a810b6db..19c29ffe70a 100644
--- a/srcpkgs/fossil/template
+++ b/srcpkgs/fossil/template
@@ -1,6 +1,6 @@
 # Template file for 'fossil'
 pkgname=fossil
-version=2.9
+version=2.10
 revision=1
 build_style=configure
 configure_args="--disable-internal-sqlite --prefix=/usr"
@@ -11,8 +11,11 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://www.fossil-scm.org"
 distfiles="https://www.fossil-scm.org/index.html/uv/fossil-src-${version}.tar.gz"
-checksum=1cb2ada92d43e3e7e008fe77f5e743d301c7ea34d4c36c42f255f873e73d8b4f
+checksum=d8a3776d2ce77385ed5ff20a2776d13bb534fb2508e87351e14e94f91cd12b10
 
+post_extract() {
+	vsed -i 's/test_system_sqlite$/# &/' auto.def  # failing on cross
+}
 post_install() {
 	vman fossil.1
 	vlicense COPYRIGHT-BSD2.txt LICENSE
diff --git a/srcpkgs/fotoxx/template b/srcpkgs/fotoxx/template
index 877f4804cdd..db8f3461a70 100644
--- a/srcpkgs/fotoxx/template
+++ b/srcpkgs/fotoxx/template
@@ -1,6 +1,6 @@
 # Template file for 'fotoxx'
 pkgname=fotoxx
-version=19.12
+version=19.17
 revision=1
 wrksrc=fotoxx
 build_style=gnu-makefile
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.kornelix.net/fotoxx/fotoxx.html"
 distfiles="https://www.kornelix.net/downloads/downloads/fotoxx-${version}.tar.gz"
-checksum=a5fa5ab5d2a4289c49fb87b0ffa843953daec3439686643db1edbc69ee65407c
+checksum=0da39c534205b6a8124a8191b2004d6deb56f1862077449e84733fa3a307408c
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) broken="execinfo.h is a GNU specific header, and doesn’t exist under musl.";;
@@ -27,4 +27,3 @@ post_install() {
 	rm -v ${DESTDIR}/usr/share/doc/fotoxx/{changelog.gz,copyright,fotoxx.man}
 	rm -rv ${DESTDIR}/usr/share/appdata
 }
-
diff --git a/srcpkgs/four-in-a-row/template b/srcpkgs/four-in-a-row/template
index e11d20dff2a..db1aae3d87d 100644
--- a/srcpkgs/four-in-a-row/template
+++ b/srcpkgs/four-in-a-row/template
@@ -1,13 +1,13 @@
 # Template file for 'four-in-a-row'
 pkgname=four-in-a-row
-version=3.32.0
-revision=2
+version=3.34.1
+revision=1
 build_style=meson
 hostmakedepends="glib-devel itstool pkg-config vala"
-makedepends="gtk+3-devel libcanberra-devel librsvg-devel"
+makedepends="gsound-devel gtk+3-devel libcanberra-devel librsvg-devel"
 short_desc="GNOME four in a row game"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Four-in-a-row"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f4a74ee13b1fc846f5045817477c3416551386a2bbf6a5d37da39fdbe6aa9c40
+checksum=239ced156386c51528d5ccf4f7c9c3788bcbafccac2ca0c42a9e6f2f60f65784
diff --git a/srcpkgs/fpc-src/template b/srcpkgs/fpc-src/template
index fe2f75fdee9..477b62368b6 100644
--- a/srcpkgs/fpc-src/template
+++ b/srcpkgs/fpc-src/template
@@ -4,7 +4,7 @@ version=3.0.4
 revision=1
 wrksrc="fpcbuild-${version}"
 short_desc="Source code for FreePascal compiler"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://www.freepascal.org"
 distfiles="ftp://ftp.freepascal.org/pub/fpc/dist/${version}/source/fpcbuild-${version}.tar.gz"
diff --git a/srcpkgs/frameworkintegration/template b/srcpkgs/frameworkintegration/template
index 048644f2624..24431fccd29 100644
--- a/srcpkgs/frameworkintegration/template
+++ b/srcpkgs/frameworkintegration/template
@@ -1,6 +1,6 @@
 # Template file for 'frameworkintegration'
 pkgname=frameworkintegration
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/frameworks/frameworkintegration"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a1a2bbb15d287b67643750cb5414ceb10c6583861dd5c00118010d409f106efb
+checksum=a080657c5fae216b596dd04cca7d0b1eb4b959264b788c08c22272fd2d351659
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python"
diff --git a/srcpkgs/freecad/patches/020-namespace-missing-std.patch b/srcpkgs/freecad/patches/020-namespace-missing-std.patch
new file mode 100644
index 00000000000..82033cd5afb
--- /dev/null
+++ b/srcpkgs/freecad/patches/020-namespace-missing-std.patch
@@ -0,0 +1,127 @@
+# reason: fix build with gcc9
+# upstream: yes
+
+diff --git src/3rdParty/salomesmesh/inc/Rn.h src/3rdParty/salomesmesh/inc/Rn.h
+index 6ec871d93..e92d2275a 100644
+--- src/3rdParty/salomesmesh/inc/Rn.h
++++ src/3rdParty/salomesmesh/inc/Rn.h
+@@ -180,12 +180,12 @@ class R4: public R3
+ {
+   friend std::ostream& operator <<(std::ostream& f, const R4 & P )
+   { f << P.x << ' ' << P.y << ' ' << P.z << ' ' << P.omega; return f; }
+-  friend istream& operator >>(istream& f,  R4 & P)
++  friend std::istream& operator >>(std::istream& f,  R4 & P)
+   { f >> P.x >>  P.y >>  P.z >> P.omega ; return f; }
+ 
+   friend std::ostream& operator <<(std::ostream& f, const R4 * P )
+   { f << P->x << ' ' << P->y << ' ' << P->z << ' ' << P->omega; return f; }
+-  friend istream& operator >>(istream& f,  R4 * P)
++  friend std::istream& operator >>(std::istream& f,  R4 * P)
+   { f >> P->x >>  P->y >>  P->z >> P->omega ; return f; }
+ 
+ public:  
+
+
+diff --git src/Mod/Drawing/App/DrawingExport.cpp src/Mod/Drawing/App/DrawingExport.cpp
+index 0c3c23231..550b12c25 100644
+--- src/Mod/Drawing/App/DrawingExport.cpp
++++ src/Mod/Drawing/App/DrawingExport.cpp
+@@ -81,6 +81,7 @@
+ #include <Base/Vector3D.h>
+ 
+ using namespace Drawing;
++using namespace std;
+ 
+ TopoDS_Edge DrawingOutput::asCircle(const BRepAdaptor_Curve& c) const
+ {
+diff --git src/Mod/Part/App/Geometry2d.cpp src/Mod/Part/App/Geometry2d.cpp
+index fb1de909c..979465533 100644
+--- src/Mod/Part/App/Geometry2d.cpp
++++ src/Mod/Part/App/Geometry2d.cpp
+@@ -83,6 +83,7 @@
+ #include <Mod/Part/App/Geom2d/OffsetCurve2dPy.h>
+ 
+ using namespace Part;
++using namespace std;
+ 
+ extern const char* gce_ErrorStatusText(gce_ErrorType et);
+ 
+diff --git src/Mod/Raytracing/App/AppRaytracingPy.cpp src/Mod/Raytracing/App/AppRaytracingPy.cpp
+index d48c51c97..1bb2b1b01 100644
+--- src/Mod/Raytracing/App/AppRaytracingPy.cpp
++++ src/Mod/Raytracing/App/AppRaytracingPy.cpp
+@@ -40,6 +40,8 @@
+ #include <Mod/Part/App/TopoShapePy.h>
+ #include <App/Application.h>
+ 
++using namespace std;
++
+ 
+ namespace Raytracing {
+ class Module : public Py::ExtensionModule<Module>
+diff --git src/Mod/Raytracing/App/LuxFeature.cpp src/Mod/Raytracing/App/LuxFeature.cpp
+index 930fe12b7..d1e0a0089 100644
+--- src/Mod/Raytracing/App/LuxFeature.cpp
++++ src/Mod/Raytracing/App/LuxFeature.cpp
+@@ -38,6 +38,7 @@
+ 
+ 
+ using namespace Raytracing;
++using namespace std;
+ 
+ PROPERTY_SOURCE(Raytracing::LuxFeature, Raytracing::RaySegment)
+ 
+diff --git src/Mod/Raytracing/App/RayFeature.cpp src/Mod/Raytracing/App/RayFeature.cpp
+index cdd2cb6dc..235a98685 100644
+--- src/Mod/Raytracing/App/RayFeature.cpp
++++ src/Mod/Raytracing/App/RayFeature.cpp
+@@ -36,6 +36,7 @@
+ 
+ 
+ using namespace Raytracing;
++using namespace std;
+ 
+ PROPERTY_SOURCE(Raytracing::RayFeature, Raytracing::RaySegment)
+ 
+diff --git src/Mod/TechDraw/App/Geometry.cpp src/Mod/TechDraw/App/Geometry.cpp
+index c10b63177..d34eeb9bb 100644
+--- src/Mod/TechDraw/App/Geometry.cpp
++++ src/Mod/TechDraw/App/Geometry.cpp
+@@ -80,6 +80,7 @@
+ #include "Geometry.h"
+ 
+ using namespace TechDraw;
++using namespace std;
+ 
+ // Collection of Geometric Features
+ Wire::Wire()
+
+
+--- src/Mod/Part/App/PropertyTopoShape.cpp
++++ src/Mod/Part/App/PropertyTopoShape.cpp
+@@ -281,11 +281,11 @@
+ static Standard_Boolean  BRepTools_Write(const TopoDS_Shape& Sh, 
+                                    const Standard_CString File)
+ {
+-  ofstream os;
++  std::ofstream os;
+ #if OCC_VERSION_HEX >= 0x060800
+-  OSD_OpenStream(os, File, ios::out);
++  OSD_OpenStream(os, File, std::ios::out);
+ #else
+-  os.open(File, ios::out);
++  os.open(File, std::ios::out);
+ #endif
+   if (!os.rdbuf()->is_open()) return Standard_False;
+ 
+
+--- src/Mod/Part/App/Geometry.cpp
++++ src/Mod/Part/App/Geometry.cpp
+@@ -141,6 +141,7 @@
+ #include "Geometry.h"
+ 
+ using namespace Part;
++using namespace std;
+ 
+ 
+ const char* gce_ErrorStatusText(gce_ErrorType et)
diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index e641ed2a603..9e9375c4444 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
 # Template file for 'freecad'
 pkgname=freecad
 version=0.18.3
-revision=1
+revision=2
 wrksrc="FreeCAD-${version}"
 build_style=cmake
 
diff --git a/srcpkgs/freecell-solver/template b/srcpkgs/freecell-solver/template
index 57a6df76b18..0de23aae8df 100644
--- a/srcpkgs/freecell-solver/template
+++ b/srcpkgs/freecell-solver/template
@@ -1,17 +1,17 @@
 # Template file for 'freecell-solver'
 pkgname=freecell-solver
-version=5.10.0
+version=5.12.0
 revision=1
 build_style=cmake
+configure_args="-DFCS_WITH_TEST_SUITE=OFF"
 hostmakedepends="perl-Template-Toolkit gperf perl-Path-Tiny
  pysolfc python3-pysol_cards python3-random2 python3-six"
-configure_args="-DFCS_WITH_TEST_SUITE=OFF"
-short_desc="Automatically solves layouts of Freecell and similar variants of solitaire"
+short_desc="Automatically solves Freecell and similar variants of solitaire"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="MIT"
 homepage="https://fc-solve.shlomifish.org/"
 distfiles="https://fc-solve.shlomifish.org/downloads/fc-solve/freecell-solver-${version}.tar.xz"
-checksum=cc8671d315e69f6b16fc52ee9fe7515671dcc286ce871b2c13347e1afcfbdd39
+checksum=2579b89a1d4b42308f64e3d97511dede84ccc7137af8c674b094cbf4eaf1d6db
 
 post_install() {
 	vlicense COPYING.txt
diff --git a/srcpkgs/freeipmi/template b/srcpkgs/freeipmi/template
index adcd64037ce..c79faf11ffa 100644
--- a/srcpkgs/freeipmi/template
+++ b/srcpkgs/freeipmi/template
@@ -1,6 +1,6 @@
 # Template file for 'freeipmi'
 pkgname=freeipmi
-version=1.6.3
+version=1.6.4
 revision=1
 build_style=gnu-configure
 configure_args="--without-systemdsystemunitdir ac_cv_header_sys_stropts_h=no"
@@ -12,7 +12,7 @@ license="GPL-3.0-or-later"
 # Changelog: http://www.gnu.org/software/freeipmi/NEWS
 homepage="http://www.gnu.org/software/freeipmi/"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=aad4e735a7ac4a1f8ade20caadb35dfefc2a352fa2ef41d3f6e589179917e1e9
+checksum=65dfbb95a30438ba247f01a58498862a37d2e71c8c950bcfcee459d079241a3c
 
 conf_files="/etc/freeipmi/*.conf"
 make_dirs="/var/cache/ipmiseld 0755 root root"
diff --git a/srcpkgs/fribidi/template b/srcpkgs/fribidi/template
index e90ef057beb..1a05f24153c 100644
--- a/srcpkgs/fribidi/template
+++ b/srcpkgs/fribidi/template
@@ -1,16 +1,16 @@
 # Template file for 'fribidi'
 pkgname=fribidi
-version=1.0.5
+version=1.0.7
 revision=1
 build_style=gnu-configure
 configure_args="--disable-docs"
 hostmakedepends="automake libtool pkg-config"
 short_desc="Free Implementation of the Unicode Bidirectional Algorithm"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/fribidi/fribidi/"
 distfiles="https://github.com/fribidi/fribidi/archive/v${version}.tar.gz"
-checksum=aee3a93d081c293eaca9157700f17dc780a0b6674bc911decc5aaa43aec9abd7
+checksum=4352e95aa26bc0c4a45a224d606df0aba5f17f8cadcbcde36dd976e585a320e8
 disable_parallel_build=yes
 
 pre_configure() {
diff --git a/srcpkgs/frp/template b/srcpkgs/frp/template
index ea9573a42a1..02289ab2483 100644
--- a/srcpkgs/frp/template
+++ b/srcpkgs/frp/template
@@ -1,6 +1,6 @@
 # Template file for 'frp'
 pkgname=frp
-version=0.28.0
+version=0.29.0
 revision=1
 build_style=go
 go_import_path=github.com/fatedier/frp
@@ -10,7 +10,7 @@ maintainer="Anachron <gith@cron.world>"
 license="Apache-2.0"
 homepage="https://github.com/fatedier/frp"
 distfiles="https://github.com/fatedier/frp/archive/v${version}.tar.gz"
-checksum=61afbd0e84fc1ab92eacce5a642e2590d1b8c1a972a78f6499165c1778aa62cf
+checksum=5d7980b81cfd055e3e5bb7a120098f94342656f647cb906ea075912f63568816
 
 conf_files="/etc/frp/*.ini"
 
diff --git a/srcpkgs/fselect/template b/srcpkgs/fselect/template
index 6197dab708e..93775c99ce2 100644
--- a/srcpkgs/fselect/template
+++ b/srcpkgs/fselect/template
@@ -1,6 +1,6 @@
 # Template file for 'fselect'
 pkgname=fselect
-version=0.6.3
+version=0.6.5
 revision=1
 build_style=cargo
 short_desc="Find files with SQL-like queries"
@@ -8,7 +8,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="Apache-2.0, MIT"
 homepage="https://github.com/jhspetersson/fselect"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=cc0655057cc4a6ce771670ff72b52468adac27efc6bda1db08039a37866f2858
+checksum=6c50f0c7874045bee7721c8dcb687fa1ba2278f4eb86c4e638d4b1c8592129a3
 
 post_install() {
 	vlicense LICENSE-MIT
diff --git a/srcpkgs/fuse-mp3fs/template b/srcpkgs/fuse-mp3fs/template
new file mode 100644
index 00000000000..75b031ad9cf
--- /dev/null
+++ b/srcpkgs/fuse-mp3fs/template
@@ -0,0 +1,14 @@
+# Template file for 'fuse-mp3fs'
+pkgname=fuse-mp3fs
+version=0.91
+revision=1
+wrksrc="mp3fs-${version}"
+build_style=gnu-configure
+hostmakedepends="pkg-config"
+makedepends="fuse-devel libflac-devel libvorbis-devel libid3tag-devel lame-devel"
+short_desc="FUSE client to transcode FLAC to MP3"
+maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://khenriks.github.io/mp3fs/"
+distfiles="https://github.com/khenriks/mp3fs/releases/download/v${version}/mp3fs-${version}.tar.gz"
+checksum=a47b5e351b7660e6f535a3c5b489c5a8191209957f8c0b8d066a5c221e8ecf92
diff --git a/srcpkgs/fuse-overlayfs/template b/srcpkgs/fuse-overlayfs/template
index 9de2b442941..d90f41438a5 100644
--- a/srcpkgs/fuse-overlayfs/template
+++ b/srcpkgs/fuse-overlayfs/template
@@ -1,16 +1,16 @@
 # Template file for 'fuse-overlayfs'
 pkgname=fuse-overlayfs
-version=0.5.1
+version=0.6.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="autoconf automake pkg-config"
 makedepends="fuse3-devel"
 short_desc="FUSE implementation for overlayfs"
-maintainer="Cameron Nemo <camerontnorman@gmail.com>"
+maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/containers/fuse-overlayfs"
 distfiles="https://github.com/containers/fuse-overlayfs/archive/v${version}.tar.gz"
-checksum=2f65877839a8b4a857197035f26c33f391d2af44fdfcc6c39e34050873071355
+checksum=e95590ce77cfff07779b977f4e8445cf82c9927391d21c41d1cc28326ad0133a
 
 pre_configure() {
 	./autogen.sh
diff --git a/srcpkgs/fuse-zip/template b/srcpkgs/fuse-zip/template
index 948133ad053..02f71f082f7 100644
--- a/srcpkgs/fuse-zip/template
+++ b/srcpkgs/fuse-zip/template
@@ -1,6 +1,6 @@
 # Template file for 'fuse-zip'
 pkgname=fuse-zip
-version=0.6.0
+version=0.7.0
 revision=1
 build_style=gnu-makefile
 make_build_args="all doc"
@@ -12,7 +12,7 @@ maintainer="Matthias von Faber <mvf@gmx.eu>"
 license="GPL-3.0-or-later"
 homepage="https://bitbucket.org/agalanin/fuse-zip"
 distfiles="${homepage}/downloads/${pkgname}-${version}.tar.gz"
-checksum=21985c78ab9787033cff7afe4d9a29252383fd28ce83eb0d9cc2b963a1c5d656
+checksum=47306bab2b8b0db8ca6fac01833ccfb4394ddae1943ab2e7020b1bdbb210410b
 
 pre_build() {
 	vsed -i '/^CXXFLAGS=/d' Makefile lib/Makefile
diff --git a/srcpkgs/fuse3/template b/srcpkgs/fuse3/template
index d3bd632c203..87ca26bb94e 100644
--- a/srcpkgs/fuse3/template
+++ b/srcpkgs/fuse3/template
@@ -1,6 +1,6 @@
 # Template file for 'fuse3'
 pkgname=fuse3
-version=3.6.2
+version=3.7.0
 revision=1
 wrksrc="fuse-${version}"
 build_style=meson
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/libfuse/libfuse"
 distfiles="https://github.com/libfuse/libfuse/releases/download/fuse-${version}/fuse-${version}.tar.xz"
-checksum=f45869427575e1e59ab743a67deb57addbf2cb8f9ce431199dbd40ddab71f281
+checksum=3aea4766da5e2751aba82e8f77047d5d3c412bc3c298e4ec9532e59d7bd73a7a
 conf_files="/etc/fuse.conf"
 
 post_install() {
diff --git a/srcpkgs/fvwm/template b/srcpkgs/fvwm/template
index 5d84887898a..f5c988338a9 100644
--- a/srcpkgs/fvwm/template
+++ b/srcpkgs/fvwm/template
@@ -1,7 +1,7 @@
 # Template file for 'fvwm'
 pkgname=fvwm
-version=2.6.8
-revision=2
+version=2.6.9
+revision=1
 build_style=gnu-configure
 hostmakedepends="libxslt pkg-config python"
 makedepends="fribidi-devel libXcursor-devel libXft-devel libXinerama-devel
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later, MIT"
 homepage="http://fvwm.org/"
 distfiles="https://github.com/fvwmorg/fvwm/releases/download/${version}/fvwm-${version}.tar.gz"
-checksum=fb36c9235d157411efb7383d09d7d4d25a90fe02d0b2b4f752ca4acc7e9bf341
+checksum=1bc64cf3ccd0073008758168327a8265b8059def9b239b451d6b9fab2cc391ae
 nocross=yes
 
 post_install() {
diff --git a/srcpkgs/fwup/template b/srcpkgs/fwup/template
index 72210e7bd4b..713aac43d0e 100644
--- a/srcpkgs/fwup/template
+++ b/srcpkgs/fwup/template
@@ -1,6 +1,6 @@
 # Template file for 'fwup'
 pkgname=fwup
-version=1.3.1
+version=1.3.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
@@ -9,10 +9,10 @@ checkdepends="mtools unzip zip dosfstools"
 short_desc="Configurable embedded Linux firmware update creator and runner"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="Apache-2.0"
-#changelog="https://github.com/fhunleth/fwup/raw/master/CHANGELOG.md"
+changelog="https://github.com/fhunleth/fwup/raw/master/CHANGELOG.md"
 homepage="https://github.com/fhunleth/fwup"
 distfiles="https://github.com/fhunleth/fwup/archive/v${version}.tar.gz"
-checksum=8bf62b9fa1f791394ca94bb973f0f52b2054c67d93a6c8f65e19e8545be5002f
+checksum=897580814709aabe1575d47c8d7a264f01dd6e65a62fa13f42b24416d0944c2b
 
 if [ -z "$CROSS_BUILD" ]; then
 	hostmakedepends+=" help2man"
@@ -25,5 +25,5 @@ pre_configure() {
 pre_check() {
 	# mtools.conf requires manual configuration for usage, but not for out tests
 	# so we just remove the unrecognized keyword
-	sed -i '/SAMPLE FILE/d' /etc/mtools.conf
+	vsed -i '/SAMPLE FILE/d' /etc/mtools.conf
 }
diff --git a/srcpkgs/fwupd/template b/srcpkgs/fwupd/template
index bb1e714de03..06a68a00754 100644
--- a/srcpkgs/fwupd/template
+++ b/srcpkgs/fwupd/template
@@ -1,6 +1,6 @@
 # Template file for 'fwupd'
 pkgname=fwupd
-version=1.2.10
+version=1.2.11
 revision=1
 build_style=meson
 build_helper="gir"
@@ -18,11 +18,11 @@ makedepends="libxmlb-devel cairo-devel colord-devel libarchive-devel
  sqlite-devel libsoup-devel gcab-devel pango-devel python3-gobject
  python3-Pillow elogind-devel"
 short_desc="Daemon to allow session software to update firmware"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/hughsie/fwupd"
 distfiles="https://github.com/hughsie/fwupd/archive/${version}.tar.gz"
-checksum=d9cd36f633e98a1b40f6020fd5e066ed05bfb445be69b8357806b0dd6ae189db
+checksum=8f9238053689aaa29e80328122012ddb3fb8a6432d19af24904b3db62ec167ca
 
 conf_files="
  /etc/dbus-1/system.d/org.freedesktop.fwupd.conf
diff --git a/srcpkgs/fwupdate/template b/srcpkgs/fwupdate/template
index 231f714913f..e00c79225b9 100644
--- a/srcpkgs/fwupdate/template
+++ b/srcpkgs/fwupdate/template
@@ -10,7 +10,7 @@ hostmakedepends="pkg-config"
 makedepends="elfutils-devel gnu-efi-libs libefivar-devel popt-devel"
 checkdepends="libabigail-tools"
 short_desc="Tool for using the ESRT and UpdateCapsule() to apply firmware updates"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/rhboot/fwupdate"
 distfiles="https://github.com/rhboot/fwupdate/releases/download/${version}/fwupdate-${version}.tar.bz2"
diff --git a/srcpkgs/g810-led/template b/srcpkgs/g810-led/template
index d978c0c7665..9bb9b6a548e 100644
--- a/srcpkgs/g810-led/template
+++ b/srcpkgs/g810-led/template
@@ -1,6 +1,6 @@
 # Template file for 'g810-led'
 pkgname=g810-led
-version=0.3.5
+version=0.3.9
 revision=1
 build_style=gnu-makefile
 makedepends="hidapi-devel"
@@ -9,7 +9,7 @@ maintainer="Alex Childs <misuchiru03+void@gmail.com>"
 license="GPL-3.0-only"
 homepage="https://github.com/MatMoul/g810-led/"
 distfiles="https://github.com/MatMoul/g810-led/archive/v${version}.tar.gz"
-checksum=8a971be4b77111aa54b250a39b6fcead78188f46999b2aa9b8280c2506753e69
+checksum=e08c3f411711dbaa0659d7b9d1ec9ab7c93d2e5a23352161092a83c7c8628b89
 
 do_install() {
 	vbin bin/g810-led
diff --git a/srcpkgs/gallery-dl/template b/srcpkgs/gallery-dl/template
index 22d69108df2..a1e8c633fe3 100644
--- a/srcpkgs/gallery-dl/template
+++ b/srcpkgs/gallery-dl/template
@@ -1,6 +1,6 @@
 # Template file for 'gallery-dl'
 pkgname=gallery-dl
-version=1.10.1
+version=1.10.5
 revision=1
 archs=noarch
 build_style=python3-module
@@ -13,4 +13,14 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/mikf/gallery-dl"
 changelog="https://raw.githubusercontent.com/mikf/gallery-dl/master/CHANGELOG.md"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=8b6da4cde53c15dbd2204b822c50f9828f6141cee167051075d719d7f4a8fad6
+checksum=0ed5935a5b40aad339f680c194bfe66be073a4c852b994606fb84bede86d5942
+
+post_build() {
+	make man completion
+}
+
+post_install() {
+	vmkdir usr/share/bash-completion/completions
+	mv ${DESTDIR}/usr/etc/bash_completion.d/gallery-dl.bash_completion \
+		${DESTDIR}/usr/share/bash-completion/completions/gallery-dl
+}
diff --git a/srcpkgs/gc/template b/srcpkgs/gc/template
index 3ef3f1b7c74..f7ed0c10010 100644
--- a/srcpkgs/gc/template
+++ b/srcpkgs/gc/template
@@ -7,7 +7,7 @@ configure_args="--enable-static --enable-mmap"
 hostmakedepends="pkg-config"
 makedepends="libatomic_ops-devel"
 short_desc="Garbage collector for C and C++"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.hboehm.info/gc/"
 distfiles="https://github.com/ivmai/bdwgc/releases/download/v${version}/gc-${version}.tar.gz"
diff --git a/srcpkgs/gcc/files/gccgo-musl.patch b/srcpkgs/gcc/files/gccgo-musl.patch
new file mode 100644
index 00000000000..cc3ed7d17ae
--- /dev/null
+++ b/srcpkgs/gcc/files/gccgo-musl.patch
@@ -0,0 +1,200 @@
+This is not among the normal patches as these changes are musl specific and
+there is no way to easily conditionalize it in source for some of the changes.
+
+Souurce: Adélie Linux, q66
+URL: https://code.foxkit.us/adelie/packages/tree/master/system/gcc
+
+--- Makefile.in
++++ Makefile.in
+@@ -46325,7 +46325,7 @@ configure-target-libgo:
+ 	esac; \
+ 	module_srcdir=libgo; \
+ 	rm -f no-such-file || : ; \
+-	CONFIG_SITE=no-such-file $(SHELL) \
++	CONFIG_SITE=no-such-file LIBS="-lucontext $$LIBS" $(SHELL) \
+ 	  $$s/$$module_srcdir/configure \
+ 	  --srcdir=$${topdir}/$$module_srcdir \
+ 	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+--- libgo/mksysinfo.sh
++++ libgo/mksysinfo.sh
+@@ -379,11 +379,7 @@ fi
+ # Some basic types.
+ echo 'type Size_t _size_t' >> ${OUT}
+ echo "type Ssize_t _ssize_t" >> ${OUT}
+-if grep '^const _HAVE_OFF64_T = ' gen-sysinfo.go > /dev/null 2>&1; then
+-  echo "type Offset_t _off64_t" >> ${OUT}
+-else
+-  echo "type Offset_t _off_t" >> ${OUT}
+-fi
++echo "type Offset_t _off_t" >> ${OUT}
+ echo "type Mode_t _mode_t" >> ${OUT}
+ echo "type Pid_t _pid_t" >> ${OUT}
+ echo "type Uid_t _uid_t" >> ${OUT}
+--- libgo/go/runtime/mem_gccgo.go
++++ libgo/go/runtime/mem_gccgo.go
+@@ -16,7 +16,7 @@ import (
+ //go:linkname sysFree runtime.sysFree
+ 
+ //extern mmap
+-func sysMmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off uintptr) unsafe.Pointer
++func sysMmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off int64) unsafe.Pointer
+ 
+ //extern munmap
+ func munmap(addr unsafe.Pointer, length uintptr) int32
+@@ -38,7 +38,7 @@ func init() {
+ 	}
+ }
+ 
+-func mmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off uintptr) (unsafe.Pointer, int) {
++func mmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off int64) (unsafe.Pointer, int) {
+ 	p := sysMmap(addr, n, prot, flags, fd, off)
+ 	if uintptr(p) == _MAP_FAILED {
+ 		return nil, errno()
+--- libgo/go/runtime/signal_gccgo.go
++++ libgo/go/runtime/signal_gccgo.go
+@@ -111,7 +111,7 @@ func getsig(i uint32) uintptr {
+ 	if sigaction(i, nil, &sa) < 0 {
+ 		// On GNU/Linux glibc rejects attempts to call
+ 		// sigaction with signal 32 (SIGCANCEL) or 33 (SIGSETXID).
+-		if GOOS == "linux" && (i == 32 || i == 33) {
++		if GOOS == "linux" && (i == 32 || i == 33 || i == 34) {
+ 			return _SIG_DFL
+ 		}
+ 		throw("sigaction read failure")
+--- libgo/go/syscall/errstr.go
++++ libgo/go/syscall/errstr.go
+@@ -5,7 +5,6 @@
+ // license that can be found in the LICENSE file.
+ 
+ // +build !hurd
+-// +build !linux
+ 
+ package syscall
+ 
+--- libgo/go/syscall/errstr_glibc.go
++++ /dev/null
+@@ -1,33 +0,0 @@
+-// errstr_glibc.go -- GNU/Linux and GNU/Hurd specific error strings.
+-
+-// Copyright 2010 The Go Authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
+-
+-// We use this rather than errstr.go because on GNU/Linux sterror_r
+-// returns a pointer to the error message, and may not use buf at all.
+-
+-// +build hurd linux
+-
+-package syscall
+-
+-import "unsafe"
+-
+-//sysnb	strerror_r(errnum int, b []byte) (errstr *byte)
+-//strerror_r(errnum _C_int, b *byte, len Size_t) *byte
+-
+-func Errstr(errnum int) string {
+-	a := make([]byte, 128)
+-	p := strerror_r(errnum, a)
+-	b := (*[1000]byte)(unsafe.Pointer(p))
+-	i := 0
+-	for b[i] != 0 {
+-		i++
+-	}
+-	// Lowercase first letter: Bad -> bad, but STREAM -> STREAM.
+-	if i > 1 && 'A' <= b[0] && b[0] <= 'Z' && 'a' <= b[1] && b[1] <= 'z' {
+-		c := b[0] + 'a' - 'A'
+-		return string(c) + string(b[1:i])
+-	}
+-	return string(b[:i])
+-}
+--- libgo/go/syscall/libcall_linux.go
++++ libgo/go/syscall/libcall_linux.go
+@@ -206,19 +206,19 @@ func Gettid() (tid int) {
+ //sys	Setxattr(path string, attr string, data []byte, flags int) (err error)
+ //setxattr(path *byte, name *byte, value *byte, size Size_t, flags _C_int) _C_int
+ 
+-//sys	splice(rfd int, roff *_loff_t, wfd int, woff *_loff_t, len int, flags int) (n int64, err error)
+-//splice(rfd _C_int, roff *_loff_t, wfd _C_int, woff *_loff_t, len Size_t, flags _C_uint) Ssize_t
++//sys	splice(rfd int, roff *_off_t, wfd int, woff *_off_t, len int, flags int) (n int64, err error)
++//splice(rfd _C_int, roff *_off_t, wfd _C_int, woff *_off_t, len Size_t, flags _C_uint) Ssize_t
+ func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error) {
+-	var lroff _loff_t
+-	var plroff *_loff_t
++	var lroff _off_t
++	var plroff *_off_t
+ 	if roff != nil {
+-		lroff = _loff_t(*roff)
++		lroff = _off_t(*roff)
+ 		plroff = &lroff
+ 	}
+-	var lwoff _loff_t
+-	var plwoff *_loff_t
++	var lwoff _off_t
++	var plwoff *_off_t
+ 	if woff != nil {
+-		lwoff = _loff_t(*woff)
++		lwoff = _off_t(*woff)
+ 		plwoff = &lwoff
+ 	}
+ 	n, err = splice(rfd, plroff, wfd, plwoff, len, flags)
+--- libgo/mksigtab.sh
++++ libgo/mksigtab.sh
+@@ -82,7 +82,7 @@ checksig _SIGPWR     '{_SigNotify, "SIGPWR: power failure restart"}'
+ checksig _SIGEMT     '{_SigThrow, "SIGEMT: emulate instruction executed"}'
+ checksig _SIGINFO    '{_SigNotify, "SIGINFO: status request from keyboard"}'
+ checksig _SIGTHR     '{_SigNotify, "SIGTHR: reserved"}'
+-checksig _SIGPOLL    '{_SigNotify, "SIGPOLL: pollable event occurred"}'
++#checksig _SIGPOLL    '{_SigNotify, "SIGPOLL: pollable event occurred"}'
+ checksig _SIGWAITING '{_SigNotify, "SIGWAITING: reserved signal no longer used by"}'
+ checksig _SIGLWP     '{_SigNotify, "SIGLWP: reserved signal no longer used by"}'
+ checksig _SIGFREEZE  '{_SigNotify, "SIGFREEZE: special signal used by CPR"}'
+@@ -95,10 +95,12 @@ checksig _SIGLOST '   {_SigNotify, "SIGLOST: resource lost (Sun); server died (G
+ 
+ # Special handling of signals 32 and 33 on GNU/Linux systems,
+ # because they are special to glibc.
++# Signal 34 is additionally special to Linux systems with musl.
+ if test "${GOOS}" = "linux"; then
+-    SIGLIST=$SIGLIST"_32__33_"
++    SIGLIST=$SIGLIST"_32__33__34_"
+     echo '	32: {_SigSetStack + _SigUnblock, "signal 32"}, /* SIGCANCEL; see issue 6997 */'
+     echo '	33: {_SigSetStack + _SigUnblock, "signal 33"}, /* SIGSETXID; see issues 3871, 9400, 12498 */'
++    echo '	34: {_SigSetStack + _SigUnblock, "signal 34"}, /* see issue 30062 */'
+ fi
+ 
+ if test "${GOOS}" = "aix"; then
+--- libgo/runtime/go-signal.c
++++ libgo/runtime/go-signal.c
+@@ -222,7 +222,11 @@ getSiginfo(siginfo_t *info, void *context __attribute__((unused)))
+ #endif
+ #ifdef __PPC__
+   #ifdef __linux__
+-	ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.regs->nip;
++    #ifdef __PPC64__
++	ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.gp_regs[32];
++    #else
++	ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.gregs[32];
++    #endif
+   #endif
+   #ifdef _AIX
+ 	ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.jmp_context.iar;
+@@ -343,7 +343,7 @@ dumpregs(siginfo_t *info __attribute__((unused)), void *context __attribute__((u
+   #endif
+ #endif
+ 
+-#if defined(__PPC__) && defined(__LITTLE_ENDIAN__)
++#if defined(__PPC__) && defined(__LITTLE_ENDIAN__) && defined(__GLIBC__)
+   #ifdef __linux__
+ 	  {
+ 		mcontext_t *m = &((ucontext_t*)(context))->uc_mcontext;
+--- libgo/sysinfo.c
++++ libgo/sysinfo.c
+@@ -73,9 +73,6 @@
+ #include <sys/times.h>
+ #include <sys/wait.h>
+ #include <sys/un.h>
+-#if defined(HAVE_SYS_USER_H)
+-#include <sys/user.h>
+-#endif
+ #if defined(HAVE_SYS_UTSNAME_H)
+ #include <sys/utsname.h>
+ #endif
diff --git a/srcpkgs/gcc/patches/bug90756.patch b/srcpkgs/gcc/patches/bug90756.patch
deleted file mode 100644
index cf78dad9cce..00000000000
--- a/srcpkgs/gcc/patches/bug90756.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Bug 90756 - [7/8/9 Regression] g++ ICE in convert_move, at expr.c:218 on i686 and s390x 
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90756
-
---- gcc/explow.c	2019/07/04 02:39:58	273035
-+++ gcc/explow.c	2019/07/04 04:49:22	273036
-@@ -892,16 +892,7 @@
- 
-   tree type = TREE_TYPE (name);
-   int unsignedp = TYPE_UNSIGNED (type);
--  machine_mode mode = TYPE_MODE (type);
--
--  /* Bypass TYPE_MODE when it maps vector modes to BLKmode.  */
--  if (mode == BLKmode)
--    {
--      gcc_assert (VECTOR_TYPE_P (type));
--      mode = type->type_common.mode;
--    }
--
--  machine_mode pmode = promote_mode (type, mode, &unsignedp);
-+  machine_mode pmode = promote_mode (type, TYPE_MODE (type), &unsignedp);
-   if (punsignedp)
-     *punsignedp = unsignedp;
- 
diff --git a/srcpkgs/gcc/patches/darn.patch b/srcpkgs/gcc/patches/darn.patch
new file mode 100644
index 00000000000..97f7de3f438
--- /dev/null
+++ b/srcpkgs/gcc/patches/darn.patch
@@ -0,0 +1,504 @@
+Upstream: yes
+Reference: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=91481
+
+https://gcc.gnu.org/viewcvs/gcc?view=revision&revision=275170
+https://gcc.gnu.org/viewcvs/gcc?view=revision&revision=275181
+
+Fixes a security issue with the hardware random number generator
+when compiling for POWER9. Since Void compiles for POWER8 by
+default, it's not affected, but people building custom binaries
+might be.
+
+--- gcc/config/rs6000/altivec.md
++++ gcc/config/rs6000/altivec.md
+@@ -80,9 +80,6 @@
+    UNSPEC_VUPKHPX
+    UNSPEC_VUPKLPX
+    UNSPEC_CONVERT_4F32_8I16
+-   UNSPEC_DARN
+-   UNSPEC_DARN_32
+-   UNSPEC_DARN_RAW
+    UNSPEC_DST
+    UNSPEC_DSTT
+    UNSPEC_DSTST
+@@ -161,9 +158,6 @@
+    UNSPEC_BCDADD
+    UNSPEC_BCDSUB
+    UNSPEC_BCD_OVERFLOW
+-   UNSPEC_CMPRB
+-   UNSPEC_CMPRB2
+-   UNSPEC_CMPEQB
+    UNSPEC_VRLMI
+    UNSPEC_VRLNM
+ ])
+@@ -4101,223 +4095,6 @@
+   "bcd<bcd_add_sub>. %0,%1,%2,%3"
+   [(set_attr "type" "vecsimple")])
+ 
+-(define_insn "darn_32"
+-  [(set (match_operand:SI 0 "register_operand" "=r")
+-        (unspec:SI [(const_int 0)] UNSPEC_DARN_32))]
+-  "TARGET_P9_MISC"
+-  "darn %0,0"
+-  [(set_attr "type" "integer")])
+-
+-(define_insn "darn_raw"
+-  [(set (match_operand:DI 0 "register_operand" "=r")
+-        (unspec:DI [(const_int 0)] UNSPEC_DARN_RAW))]
+-  "TARGET_P9_MISC && TARGET_64BIT"
+-  "darn %0,2"
+-  [(set_attr "type" "integer")])
+-
+-(define_insn "darn"
+-  [(set (match_operand:DI 0 "register_operand" "=r")
+-        (unspec:DI [(const_int 0)] UNSPEC_DARN))]
+-  "TARGET_P9_MISC && TARGET_64BIT"
+-  "darn %0,1"
+-  [(set_attr "type" "integer")])
+-
+-;; Test byte within range.
+-;;
+-;; The bytes of operand 1 are organized as xx:xx:xx:vv, where xx
+-;; represents a byte whose value is ignored in this context and
+-;; vv, the least significant byte, holds the byte value that is to
+-;; be tested for membership within the range specified by operand 2.
+-;; The bytes of operand 2 are organized as xx:xx:hi:lo.
+-;;
+-;; Return in target register operand 0 a value of 1 if lo <= vv and
+-;; vv <= hi.  Otherwise, set register operand 0 to 0.
+-;;
+-;; Though the instructions to which this expansion maps operate on
+-;; 64-bit registers, the current implementation only operates on
+-;; SI-mode operands as the high-order bits provide no information
+-;; that is not already available in the low-order bits.  To avoid the
+-;; costs of data widening operations, future enhancements might allow
+-;; DI mode for operand 0 and/or might allow operand 1 to be QI mode.
+-(define_expand "cmprb"
+-  [(set (match_dup 3)
+-	(unspec:CC [(match_operand:SI 1 "gpc_reg_operand" "r")
+-		    (match_operand:SI 2 "gpc_reg_operand" "r")]
+-	 UNSPEC_CMPRB))
+-   (set (match_operand:SI 0 "gpc_reg_operand" "=r")
+-	(if_then_else:SI (lt (match_dup 3)
+-			     (const_int 0))
+-			 (const_int -1)
+-			 (if_then_else (gt (match_dup 3)
+-					   (const_int 0))
+-				       (const_int 1)
+-				       (const_int 0))))]
+-  "TARGET_P9_MISC"
+-{
+-  operands[3] = gen_reg_rtx (CCmode);
+-})
+-
+-;; The bytes of operand 1 are organized as xx:xx:xx:vv, where xx
+-;; represents a byte whose value is ignored in this context and
+-;; vv, the least significant byte, holds the byte value that is to
+-;; be tested for membership within the range specified by operand 2.
+-;; The bytes of operand 2 are organized as xx:xx:hi:lo.
+-;;
+-;; Set bit 1 (the GT bit, 0x4) of CR register operand 0 to 1 if
+-;; lo <= vv and vv <= hi.  Otherwise, set the GT bit to 0.  The other
+-;; 3 bits of the target CR register are all set to 0.
+-(define_insn "*cmprb_internal"
+-  [(set (match_operand:CC 0 "cc_reg_operand" "=y")
+-	(unspec:CC [(match_operand:SI 1 "gpc_reg_operand" "r")
+-		    (match_operand:SI 2 "gpc_reg_operand" "r")]
+-	 UNSPEC_CMPRB))]
+-  "TARGET_P9_MISC"
+-  "cmprb %0,0,%1,%2"
+-  [(set_attr "type" "logical")])
+-
+-;; Set operand 0 register to -1 if the LT bit (0x8) of condition
+-;; register operand 1 is on.  Otherwise, set operand 0 register to 1
+-;; if the GT bit (0x4) of condition register operand 1 is on.
+-;; Otherwise, set operand 0 to 0.  Note that the result stored into
+-;; register operand 0 is non-zero iff either the LT or GT bits are on
+-;; within condition register operand 1.
+-(define_insn "setb_signed"
+-   [(set (match_operand:SI 0 "gpc_reg_operand" "=r")
+-	 (if_then_else:SI (lt (match_operand:CC 1 "cc_reg_operand" "y")
+-			      (const_int 0))
+-			  (const_int -1)
+-			  (if_then_else (gt (match_dup 1)
+-					    (const_int 0))
+-					(const_int 1)
+-					(const_int 0))))]
+-  "TARGET_P9_MISC"
+-  "setb %0,%1"
+-  [(set_attr "type" "logical")])
+-
+-(define_insn "setb_unsigned"
+-   [(set (match_operand:SI 0 "gpc_reg_operand" "=r")
+-	 (if_then_else:SI (ltu (match_operand:CCUNS 1 "cc_reg_operand" "y")
+-			      (const_int 0))
+-			  (const_int -1)
+-			  (if_then_else (gtu (match_dup 1)
+-					    (const_int 0))
+-					(const_int 1)
+-					(const_int 0))))]
+-  "TARGET_P9_MISC"
+-  "setb %0,%1"
+-  [(set_attr "type" "logical")])
+-
+-;; Test byte within two ranges.
+-;;
+-;; The bytes of operand 1 are organized as xx:xx:xx:vv, where xx
+-;; represents a byte whose value is ignored in this context and
+-;; vv, the least significant byte, holds the byte value that is to
+-;; be tested for membership within the range specified by operand 2.
+-;; The bytes of operand 2 are organized as hi_1:lo_1:hi_2:lo_2.
+-;;
+-;; Return in target register operand 0 a value of 1 if (lo_1 <= vv and
+-;; vv <= hi_1) or if (lo_2 <= vv and vv <= hi_2).  Otherwise, set register
+-;; operand 0 to 0.
+-;;
+-;; Though the instructions to which this expansion maps operate on
+-;; 64-bit registers, the current implementation only operates on
+-;; SI-mode operands as the high-order bits provide no information
+-;; that is not already available in the low-order bits.  To avoid the
+-;; costs of data widening operations, future enhancements might allow
+-;; DI mode for operand 0 and/or might allow operand 1 to be QI mode.
+-(define_expand "cmprb2"
+-  [(set (match_dup 3)
+-	(unspec:CC [(match_operand:SI 1 "gpc_reg_operand" "r")
+-		    (match_operand:SI 2 "gpc_reg_operand" "r")]
+-	 UNSPEC_CMPRB2))
+-   (set (match_operand:SI 0 "gpc_reg_operand" "=r")
+-	(if_then_else:SI (lt (match_dup 3)
+-			     (const_int 0))
+-			 (const_int -1)
+-			 (if_then_else (gt (match_dup 3)
+-					   (const_int 0))
+-				       (const_int 1)
+-				       (const_int 0))))]
+-  "TARGET_P9_MISC"
+-{
+-  operands[3] = gen_reg_rtx (CCmode);
+-})
+-
+-;; The bytes of operand 1 are organized as xx:xx:xx:vv, where xx
+-;; represents a byte whose value is ignored in this context and
+-;; vv, the least significant byte, holds the byte value that is to
+-;; be tested for membership within the ranges specified by operand 2.
+-;; The bytes of operand 2 are organized as hi_1:lo_1:hi_2:lo_2.
+-;;
+-;; Set bit 1 (the GT bit, 0x4) of CR register operand 0 to 1 if
+-;; (lo_1 <= vv and vv <= hi_1) or if (lo_2 <= vv and vv <= hi_2).
+-;; Otherwise, set the GT bit to 0.  The other 3 bits of the target
+-;; CR register are all set to 0.
+-(define_insn "*cmprb2_internal"
+-  [(set (match_operand:CC 0 "cc_reg_operand" "=y")
+-	(unspec:CC [(match_operand:SI 1 "gpc_reg_operand" "r")
+-		    (match_operand:SI 2 "gpc_reg_operand" "r")]
+-	 UNSPEC_CMPRB2))]
+-  "TARGET_P9_MISC"
+-  "cmprb %0,1,%1,%2"
+-  [(set_attr "type" "logical")])
+-
+-;; Test byte membership within set of 8 bytes.
+-;;
+-;; The bytes of operand 1 are organized as xx:xx:xx:vv, where xx
+-;; represents a byte whose value is ignored in this context and
+-;; vv, the least significant byte, holds the byte value that is to
+-;; be tested for membership within the set specified by operand 2.
+-;; The bytes of operand 2 are organized as e0:e1:e2:e3:e4:e5:e6:e7.
+-;;
+-;; Return in target register operand 0 a value of 1 if vv equals one
+-;; of the values e0, e1, e2, e3, e4, e5, e6, or e7.  Otherwise, set
+-;; register operand 0 to 0.  Note that the 8 byte values held within
+-;; operand 2 need not be unique.
+-;;
+-;; Though the instructions to which this expansion maps operate on
+-;; 64-bit registers, the current implementation requires that operands
+-;; 0 and 1 have mode SI as the high-order bits provide no information
+-;; that is not already available in the low-order bits.  To avoid the
+-;; costs of data widening operations, future enhancements might allow
+-;; DI mode for operand 0 and/or might allow operand 1 to be QI mode.
+-(define_expand "cmpeqb"
+-  [(set (match_dup 3)
+-	(unspec:CC [(match_operand:SI 1 "gpc_reg_operand" "r")
+-		    (match_operand:DI 2 "gpc_reg_operand" "r")]
+-	 UNSPEC_CMPEQB))
+-   (set (match_operand:SI 0 "gpc_reg_operand" "=r")
+-	(if_then_else:SI (lt (match_dup 3)
+-			     (const_int 0))
+-			 (const_int -1)
+-			 (if_then_else (gt (match_dup 3)
+-					   (const_int 0))
+-				       (const_int 1)
+-				       (const_int 0))))]
+-  "TARGET_P9_MISC && TARGET_64BIT"
+-{
+-  operands[3] = gen_reg_rtx (CCmode);
+-})
+-
+-;; The bytes of operand 1 are organized as xx:xx:xx:vv, where xx
+-;; represents a byte whose value is ignored in this context and
+-;; vv, the least significant byte, holds the byte value that is to
+-;; be tested for membership within the set specified by operand 2.
+-;; The bytes of operand 2 are organized as e0:e1:e2:e3:e4:e5:e6:e7.
+-;;
+-;; Set bit 1 (the GT bit, 0x4) of CR register operand 0 to 1 if vv
+-;; equals one of the values e0, e1, e2, e3, e4, e5, e6, or e7.  Otherwise,
+-;; set the GT bit to zero.  The other 3 bits of the target CR register
+-;; are all set to 0.
+-(define_insn "*cmpeqb_internal"
+-  [(set (match_operand:CC 0 "cc_reg_operand" "=y")
+-	 (unspec:CC [(match_operand:SI 1 "gpc_reg_operand" "r")
+-		     (match_operand:DI 2 "gpc_reg_operand" "r")]
+-	  UNSPEC_CMPEQB))]
+-  "TARGET_P9_MISC && TARGET_64BIT"
+-  "cmpeqb %0,%1,%2"
+-  [(set_attr "type" "logical")])
+-
+ (define_expand "bcd<bcd_add_sub>_<code>"
+   [(parallel [(set (reg:CCFP CR6_REGNO)
+ 		   (compare:CCFP
+--- gcc/config/rs6000/rs6000.md
++++ gcc/config/rs6000/rs6000.md
+@@ -137,6 +137,9 @@
+    UNSPEC_LSQ
+    UNSPEC_FUSION_GPR
+    UNSPEC_STACK_CHECK
++   UNSPEC_CMPRB
++   UNSPEC_CMPRB2
++   UNSPEC_CMPEQB
+    UNSPEC_ADD_ROUND_TO_ODD
+    UNSPEC_SUB_ROUND_TO_ODD
+    UNSPEC_MUL_ROUND_TO_ODD
+@@ -164,6 +167,9 @@
+    UNSPECV_EH_RR		; eh_reg_restore
+    UNSPECV_ISYNC		; isync instruction
+    UNSPECV_MFTB			; move from time base
++   UNSPECV_DARN			; darn 1 (deliver a random number)
++   UNSPECV_DARN_32		; darn 2
++   UNSPECV_DARN_RAW		; darn 0
+    UNSPECV_NLGR			; non-local goto receiver
+    UNSPECV_MFFS			; Move from FPSCR
+    UNSPECV_MFFSL		; Move from FPSCR light instruction version
+@@ -13853,6 +13859,224 @@
+   [(set_attr "type" "vecmove")
+    (set_attr "size" "128")])
+ 
++;; Miscellaneous ISA 3.0 (power9) instructions
++
++(define_insn "darn_32"
++  [(set (match_operand:SI 0 "register_operand" "=r")
++        (unspec_volatile:SI [(const_int 0)] UNSPECV_DARN_32))]
++  "TARGET_P9_MISC"
++  "darn %0,0"
++  [(set_attr "type" "integer")])
++
++(define_insn "darn_raw"
++  [(set (match_operand:DI 0 "register_operand" "=r")
++        (unspec_volatile:DI [(const_int 0)] UNSPECV_DARN_RAW))]
++  "TARGET_P9_MISC && TARGET_64BIT"
++  "darn %0,2"
++  [(set_attr "type" "integer")])
++
++(define_insn "darn"
++  [(set (match_operand:DI 0 "register_operand" "=r")
++        (unspec_volatile:DI [(const_int 0)] UNSPECV_DARN))]
++  "TARGET_P9_MISC && TARGET_64BIT"
++  "darn %0,1"
++  [(set_attr "type" "integer")])
++
++;; Test byte within range.
++;;
++;; The bytes of operand 1 are organized as xx:xx:xx:vv, where xx
++;; represents a byte whose value is ignored in this context and
++;; vv, the least significant byte, holds the byte value that is to
++;; be tested for membership within the range specified by operand 2.
++;; The bytes of operand 2 are organized as xx:xx:hi:lo.
++;;
++;; Return in target register operand 0 a value of 1 if lo <= vv and
++;; vv <= hi.  Otherwise, set register operand 0 to 0.
++;;
++;; Though the instructions to which this expansion maps operate on
++;; 64-bit registers, the current implementation only operates on
++;; SI-mode operands as the high-order bits provide no information
++;; that is not already available in the low-order bits.  To avoid the
++;; costs of data widening operations, future enhancements might allow
++;; DI mode for operand 0 and/or might allow operand 1 to be QI mode.
++(define_expand "cmprb"
++  [(set (match_dup 3)
++	(unspec:CC [(match_operand:SI 1 "gpc_reg_operand" "r")
++		    (match_operand:SI 2 "gpc_reg_operand" "r")]
++	 UNSPEC_CMPRB))
++   (set (match_operand:SI 0 "gpc_reg_operand" "=r")
++	(if_then_else:SI (lt (match_dup 3)
++			     (const_int 0))
++			 (const_int -1)
++			 (if_then_else (gt (match_dup 3)
++					   (const_int 0))
++				       (const_int 1)
++				       (const_int 0))))]
++  "TARGET_P9_MISC"
++{
++  operands[3] = gen_reg_rtx (CCmode);
++})
++
++;; The bytes of operand 1 are organized as xx:xx:xx:vv, where xx
++;; represents a byte whose value is ignored in this context and
++;; vv, the least significant byte, holds the byte value that is to
++;; be tested for membership within the range specified by operand 2.
++;; The bytes of operand 2 are organized as xx:xx:hi:lo.
++;;
++;; Set bit 1 (the GT bit, 0x4) of CR register operand 0 to 1 if
++;; lo <= vv and vv <= hi.  Otherwise, set the GT bit to 0.  The other
++;; 3 bits of the target CR register are all set to 0.
++(define_insn "*cmprb_internal"
++  [(set (match_operand:CC 0 "cc_reg_operand" "=y")
++	(unspec:CC [(match_operand:SI 1 "gpc_reg_operand" "r")
++		    (match_operand:SI 2 "gpc_reg_operand" "r")]
++	 UNSPEC_CMPRB))]
++  "TARGET_P9_MISC"
++  "cmprb %0,0,%1,%2"
++  [(set_attr "type" "logical")])
++
++;; Set operand 0 register to -1 if the LT bit (0x8) of condition
++;; register operand 1 is on.  Otherwise, set operand 0 register to 1
++;; if the GT bit (0x4) of condition register operand 1 is on.
++;; Otherwise, set operand 0 to 0.  Note that the result stored into
++;; register operand 0 is non-zero iff either the LT or GT bits are on
++;; within condition register operand 1.
++(define_insn "setb_signed"
++   [(set (match_operand:SI 0 "gpc_reg_operand" "=r")
++	 (if_then_else:SI (lt (match_operand:CC 1 "cc_reg_operand" "y")
++			      (const_int 0))
++			  (const_int -1)
++			  (if_then_else (gt (match_dup 1)
++					    (const_int 0))
++					(const_int 1)
++					(const_int 0))))]
++  "TARGET_P9_MISC"
++  "setb %0,%1"
++  [(set_attr "type" "logical")])
++
++(define_insn "setb_unsigned"
++   [(set (match_operand:SI 0 "gpc_reg_operand" "=r")
++	 (if_then_else:SI (ltu (match_operand:CCUNS 1 "cc_reg_operand" "y")
++			      (const_int 0))
++			  (const_int -1)
++			  (if_then_else (gtu (match_dup 1)
++					    (const_int 0))
++					(const_int 1)
++					(const_int 0))))]
++  "TARGET_P9_MISC"
++  "setb %0,%1"
++  [(set_attr "type" "logical")])
++
++;; Test byte within two ranges.
++;;
++;; The bytes of operand 1 are organized as xx:xx:xx:vv, where xx
++;; represents a byte whose value is ignored in this context and
++;; vv, the least significant byte, holds the byte value that is to
++;; be tested for membership within the range specified by operand 2.
++;; The bytes of operand 2 are organized as hi_1:lo_1:hi_2:lo_2.
++;;
++;; Return in target register operand 0 a value of 1 if (lo_1 <= vv and
++;; vv <= hi_1) or if (lo_2 <= vv and vv <= hi_2).  Otherwise, set register
++;; operand 0 to 0.
++;;
++;; Though the instructions to which this expansion maps operate on
++;; 64-bit registers, the current implementation only operates on
++;; SI-mode operands as the high-order bits provide no information
++;; that is not already available in the low-order bits.  To avoid the
++;; costs of data widening operations, future enhancements might allow
++;; DI mode for operand 0 and/or might allow operand 1 to be QI mode.
++(define_expand "cmprb2"
++  [(set (match_dup 3)
++	(unspec:CC [(match_operand:SI 1 "gpc_reg_operand" "r")
++		    (match_operand:SI 2 "gpc_reg_operand" "r")]
++	 UNSPEC_CMPRB2))
++   (set (match_operand:SI 0 "gpc_reg_operand" "=r")
++	(if_then_else:SI (lt (match_dup 3)
++			     (const_int 0))
++			 (const_int -1)
++			 (if_then_else (gt (match_dup 3)
++					   (const_int 0))
++				       (const_int 1)
++				       (const_int 0))))]
++  "TARGET_P9_MISC"
++{
++  operands[3] = gen_reg_rtx (CCmode);
++})
++
++;; The bytes of operand 1 are organized as xx:xx:xx:vv, where xx
++;; represents a byte whose value is ignored in this context and
++;; vv, the least significant byte, holds the byte value that is to
++;; be tested for membership within the ranges specified by operand 2.
++;; The bytes of operand 2 are organized as hi_1:lo_1:hi_2:lo_2.
++;;
++;; Set bit 1 (the GT bit, 0x4) of CR register operand 0 to 1 if
++;; (lo_1 <= vv and vv <= hi_1) or if (lo_2 <= vv and vv <= hi_2).
++;; Otherwise, set the GT bit to 0.  The other 3 bits of the target
++;; CR register are all set to 0.
++(define_insn "*cmprb2_internal"
++  [(set (match_operand:CC 0 "cc_reg_operand" "=y")
++	(unspec:CC [(match_operand:SI 1 "gpc_reg_operand" "r")
++		    (match_operand:SI 2 "gpc_reg_operand" "r")]
++	 UNSPEC_CMPRB2))]
++  "TARGET_P9_MISC"
++  "cmprb %0,1,%1,%2"
++  [(set_attr "type" "logical")])
++
++;; Test byte membership within set of 8 bytes.
++;;
++;; The bytes of operand 1 are organized as xx:xx:xx:vv, where xx
++;; represents a byte whose value is ignored in this context and
++;; vv, the least significant byte, holds the byte value that is to
++;; be tested for membership within the set specified by operand 2.
++;; The bytes of operand 2 are organized as e0:e1:e2:e3:e4:e5:e6:e7.
++;;
++;; Return in target register operand 0 a value of 1 if vv equals one
++;; of the values e0, e1, e2, e3, e4, e5, e6, or e7.  Otherwise, set
++;; register operand 0 to 0.  Note that the 8 byte values held within
++;; operand 2 need not be unique.
++;;
++;; Though the instructions to which this expansion maps operate on
++;; 64-bit registers, the current implementation requires that operands
++;; 0 and 1 have mode SI as the high-order bits provide no information
++;; that is not already available in the low-order bits.  To avoid the
++;; costs of data widening operations, future enhancements might allow
++;; DI mode for operand 0 and/or might allow operand 1 to be QI mode.
++(define_expand "cmpeqb"
++  [(set (match_dup 3)
++	(unspec:CC [(match_operand:SI 1 "gpc_reg_operand" "r")
++		    (match_operand:DI 2 "gpc_reg_operand" "r")]
++	 UNSPEC_CMPEQB))
++   (set (match_operand:SI 0 "gpc_reg_operand" "=r")
++	(if_then_else:SI (lt (match_dup 3)
++			     (const_int 0))
++			 (const_int -1)
++			 (if_then_else (gt (match_dup 3)
++					   (const_int 0))
++				       (const_int 1)
++				       (const_int 0))))]
++  "TARGET_P9_MISC && TARGET_64BIT"
++{
++  operands[3] = gen_reg_rtx (CCmode);
++})
++
++;; The bytes of operand 1 are organized as xx:xx:xx:vv, where xx
++;; represents a byte whose value is ignored in this context and
++;; vv, the least significant byte, holds the byte value that is to
++;; be tested for membership within the set specified by operand 2.
++;; The bytes of operand 2 are organized as e0:e1:e2:e3:e4:e5:e6:e7.
++;;
++;; Set bit 1 (the GT bit, 0x4) of CR register operand 0 to 1 if vv
++;; equals one of the values e0, e1, e2, e3, e4, e5, e6, or e7.  Otherwise,
++;; set the GT bit to zero.  The other 3 bits of the target CR register
++;; are all set to 0.
++(define_insn "*cmpeqb_internal"
++  [(set (match_operand:CC 0 "cc_reg_operand" "=y")
++	 (unspec:CC [(match_operand:SI 1 "gpc_reg_operand" "r")
++		     (match_operand:DI 2 "gpc_reg_operand" "r")]
++	  UNSPEC_CMPEQB))]
++  "TARGET_P9_MISC && TARGET_64BIT"
++  "cmpeqb %0,%1,%2"
++  [(set_attr "type" "logical")])
+ 
+ (define_insn "*nabs<mode>2_hw"
+   [(set (match_operand:IEEE128 0 "altivec_register_operand" "=v")
diff --git a/srcpkgs/gcc/patches/libffi_gnulinux.patch b/srcpkgs/gcc/patches/libffi_gnulinux.patch
new file mode 100644
index 00000000000..413b4aef5af
--- /dev/null
+++ b/srcpkgs/gcc/patches/libffi_gnulinux.patch
@@ -0,0 +1,11 @@
+--- libffi/src/closures.c.orig
++++ libffi/src/closures.c
+@@ -34,7 +34,7 @@
+ #include <ffi_common.h>
+
+ #if !FFI_MMAP_EXEC_WRIT && !FFI_EXEC_TRAMPOLINE_TABLE
+-# if __gnu_linux__ && !defined(__ANDROID__)
++# if __linux__ && !defined(__ANDROID__)
+ /* This macro indicates it may be forbidden to map anonymous memory
+    with both write and execute permission.  Code compiled when this
+    option is defined will attempt to map such pages once, but if it
diff --git a/srcpkgs/gcc/patches/non-nullness.patch b/srcpkgs/gcc/patches/non-nullness.patch
deleted file mode 100644
index 7e0e4425ce4..00000000000
--- a/srcpkgs/gcc/patches/non-nullness.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-Source: 2019-06-21  Jeff Law  <law@redhat.com>
-Upstream: yes
-Reason: PR tree-optimization/90949
-* tree-ssa-copy.c (fini_copy_prop): Use reset_flow_sensitive_info.
-* tree-ssanames.c (reset_flow_sensitive_info): Reset non-null state.
-
---- gcc/tree-ssa-copy.c	2019-01-01 13:31:55.000000000 +0100
-+++ gcc/tree-ssa-copy.c	2019-06-26 18:50:01.030395471 +0200
-@@ -545,13 +545,12 @@
- 	      duplicate_ssa_name_ptr_info (copy_of[i].value,
- 					   SSA_NAME_PTR_INFO (var));
- 	      /* Points-to information is cfg insensitive,
--		 but alignment info might be cfg sensitive, if it
--		 e.g. is derived from VRP derived non-zero bits.
--		 So, do not copy alignment info if the two SSA_NAMEs
--		 aren't defined in the same basic block.  */
-+		 but [E]VRP might record context sensitive alignment
-+		 info, non-nullness, etc.  So reset context sensitive
-+		 info if the two SSA_NAMEs aren't defined in the same
-+		 basic block.  */
- 	      if (var_bb != copy_of_bb)
--		mark_ptr_info_alignment_unknown
--				(SSA_NAME_PTR_INFO (copy_of[i].value));
-+		reset_flow_sensitive_info (copy_of[i].value);
- 	    }
- 	  else if (!POINTER_TYPE_P (TREE_TYPE (var))
- 		   && SSA_NAME_RANGE_INFO (var)
---- gcc/tree-ssanames.c	2019-03-18 14:59:11.000000000 +0100
-+++ gcc/tree-ssanames.c	2019-06-26 18:50:11.282394906 +0200
-@@ -820,7 +820,12 @@
-     {
-       /* points-to info is not flow-sensitive.  */
-       if (SSA_NAME_PTR_INFO (name))
--	mark_ptr_info_alignment_unknown (SSA_NAME_PTR_INFO (name));
-+	{
-+	  /* [E]VRP can derive context sensitive alignment info and
-+	     non-nullness properties.  We must reset both.  */
-+	  mark_ptr_info_alignment_unknown (SSA_NAME_PTR_INFO (name));
-+	  SSA_NAME_PTR_INFO (name)->pt.null = 1;
-+	}
-     }
-   else
-     SSA_NAME_RANGE_INFO (name) = NULL;
---- /dev/null
-+++ gcc/testsuite/gcc.c-torture/pr90949.c	2019-06-26 18:53:16.870384679 +0200
-@@ -0,0 +1,42 @@
-+void __attribute__ ((noipa, noinline)) my_puts (const char *str) { }
-+
-+void __attribute__ ((noipa, noinline)) my_free (void *p) { }
-+
-+
-+struct Node
-+{
-+  struct Node *child;
-+};
-+
-+struct Node space[2] = { };
-+
-+struct Node * __attribute__ ((noipa, noinline)) my_malloc (int bytes)
-+{
-+  return &space[0];
-+}
-+
-+void
-+walk (struct Node *module, int cleanup)
-+{
-+  if (module == 0)
-+    {
-+      return;
-+    }
-+  if (!cleanup)
-+    {
-+      my_puts ("No cleanup");
-+    }
-+  walk (module->child, cleanup);
-+  if (cleanup)
-+    {
-+      my_free (module);
-+    }
-+}
-+
-+int
-+main ()
-+{
-+  struct Node *node = my_malloc (sizeof (struct Node));
-+  node->child = 0;
-+  walk (node, 1);
-+}
diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index bab33d798ae..6774b8a5826 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -1,14 +1,14 @@
 # Template file for 'gcc'
 _majorver=9
-_minorver=${_majorver}.1
+_minorver=${_majorver}.2
 _gmp_version=6.1.2
-_mpfr_version=4.0.1
+_mpfr_version=4.0.2
 _mpc_version=1.1.0
-_isl_version=0.19
+_isl_version=0.21
 
 pkgname=gcc
 version=${_minorver}.0
-revision=3
+revision=1
 short_desc="GNU Compiler Collection"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 homepage="http://gcc.gnu.org"
@@ -20,11 +20,11 @@ distfiles="
  https://www.mpfr.org/mpfr-${_mpfr_version}/mpfr-${_mpfr_version}.tar.xz
  ${GNU_SITE}/mpc/mpc-${_mpc_version}.tar.gz
  http://isl.gforge.inria.fr/isl-${_isl_version}.tar.bz2"
-checksum="79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0
+checksum="ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
  87b565e89a9a684fe4ebeeddb8399dce2599f9c9049854ca8c0dfbdea0e21912
- 67874a60826303ee2fb6affc6dc0ddd3e749e9bfcb4c8655e3953d0458a6e16e
+ 1d3be708604eae0e42d578ba93b390c2a145f17743a744d8f3f8c2ad5855a38a
  6985c538143c1208dcb1ac42cedad6ff52e267b47e5f970183a3e75125b43c2e
- d59726f34f7852a081fbd3defd1ab2136f174110fc2e0c8d10bb122173fa9ed8"
+ d18ca11f8ad1a39ab6d03d3dcb3365ab416720fcb65b42d69f34f51bf0a0e859"
 
 nopie=yes
 lib32disabled=yes
@@ -32,6 +32,13 @@ bootstrap=yes
 replaces="gcc-gcj<7.2.0 gcc-gcj-jdk-compat<7.2.0 libmpx>=0 libmpx-devel>=0"
 alternatives="cc:cc:/usr/bin/gcc"
 
+_have_gccgo=yes
+
+# MIPS does not have libucontext yet
+case "$XBPS_TARGET_MACHINE" in
+	mips*-musl) _have_gccgo=no ;;
+esac
+
 if [ "$CHROOT_READY" ]; then
 	hostmakedepends="perl flex"
 fi
@@ -67,14 +74,13 @@ fi
 
 if [ "$CHROOT_READY" ]; then
 	subpackages+=" gcc-fortran libgfortran-devel libgfortran"
-	if [ -z "$CROSS_BUILD" ]; then
-		subpackages+=" gcc-objc gcc-objc++ libobjc-devel libobjc"
-		case "$XBPS_TARGET_MACHINE" in
-		*-musl)	# Go won't link for musl libc
-			;;
-		*)	subpackages+=" gcc-go gcc-go-tools libgo-devel libgo"
-			;;
-		esac
+	subpackages+=" gcc-objc gcc-objc++ libobjc-devel libobjc"
+	if [ "$_have_gccgo" = "yes" ]; then
+		subpackages+=" gcc-go gcc-go-tools libgo-devel libgo"
+		# we need this for gcc-go on musl
+		if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+			makedepends+=" libucontext-devel"
+		fi
 	fi
 fi
 
@@ -129,7 +135,6 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" cross-${_triplet}"
-	export GFORTRAN_FOR_TARGET=" ${_triplet}-gfortran"
 	if [ "$build_option_ada" ]; then
 		hostmakedepends+=" gcc-ada libada-devel"
 	fi
@@ -162,7 +167,10 @@ pre_configure() {
 	# _FORTIFY_SOURCE needs an optimization level.
 	sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" {gcc,libiberty}/configure
 	case "$XBPS_TARGET_MACHINE" in
-		*-musl) patch -p1 -i ${FILESDIR}/libgnarl-musl.patch ;;
+		*-musl)
+			patch -p1 -i ${FILESDIR}/libgnarl-musl.patch
+			patch -p0 -i ${FILESDIR}/gccgo-musl.patch
+			;;
 	esac
 }
 do_configure() {
@@ -216,26 +224,26 @@ do_configure() {
 		export CC_FOR_TARGET="$CC"
 		export GCC_FOR_TARGET="$CC"
 		export CXX_FOR_TARGET="$CXX"
+		export GOC_FOR_TARGET="${_triplet}-gccgo"
+		export GFORTRAN_FOR_TARGET="${_triplet}-gfortran"
 
 		_args+=" --host=$XBPS_CROSS_TRIPLET"
 		_args+=" --with-build-sysroot=${XBPS_CROSS_BASE}"
 		_args+=" --enable-sjlj-exceptions=no"
-		_langs+=",fortran"
+		_langs+=",objc,obj-c++,fortran"
 	elif [ -z "$CHROOT_READY" ]; then
 		export LD_LIBRARY_PATH="${XBPS_MASTERDIR}/usr/lib"
 		_args+=" --build=${_triplet}"
 	else
 		_langs="c,c++,objc,obj-c++,fortran,lto"
-		case "$XBPS_TARGET_MACHINE" in
-			*-musl)	# Linking libgo.so is broken for musl libc
-				;;
-			*)	_langs+=",go"
-				;;
-		esac
 		_args+=" --build=${_triplet}"
 		_args+=" --enable-fast-character"
 	fi
 
+	if [ "$_have_gccgo" = "yes" ]; then
+		_langs+=",go"
+	fi
+
 	case "$XBPS_TARGET_MACHINE" in
 		*-musl) _args+=" --disable-libsanitizer";;
 	esac
diff --git a/srcpkgs/gcdemu/template b/srcpkgs/gcdemu/template
index 70841043db3..6dba7c01bb6 100644
--- a/srcpkgs/gcdemu/template
+++ b/srcpkgs/gcdemu/template
@@ -1,6 +1,6 @@
 # Template file for 'gcdemu'
 pkgname=gcdemu
-version=3.2.1
+version=3.2.3
 revision=1
 archs=noarch
 wrksrc="gcdemu-${version}"
@@ -12,4 +12,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://cdemu.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/cdemu/gcdemu-${version}.tar.bz2"
-checksum=aff033fb19b1e7f6c001780ccf7c54743de26113720c2526aa8c9fe216dcbe52
+checksum=e4794a36f932e1044cdb04eac506bdc3bb3c9cbad6a8a1a463472305b90a7ea7
diff --git a/srcpkgs/gcompris-qt/template b/srcpkgs/gcompris-qt/template
index 725c71638bf..2c7d2fed9f0 100644
--- a/srcpkgs/gcompris-qt/template
+++ b/srcpkgs/gcompris-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'gcompris-qt'
 pkgname=gcompris-qt
-version=0.96
+version=0.97
 revision=1
 build_style=cmake
 configure_args="-DQML_BOX2D_LIBRARY=/usr/lib/qt5/qml/Box2D.2.0"
@@ -15,7 +15,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://gcompris.net/index-en.html"
 distfiles="https://gcompris.net/download/qt/src/gcompris-qt-${version}.tar.xz"
-checksum=a2bc2ce6e2687120d7ff2dee036fd85cfed70a793a9cc385b786d054681c8818
+checksum=2b8911a9121fe1c754afae4084092552b0dd21aba1a36b2653f485b0f659c2ef
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/gdb/template b/srcpkgs/gdb/template
index 8d3c51745d4..9f84e4869e9 100644
--- a/srcpkgs/gdb/template
+++ b/srcpkgs/gdb/template
@@ -1,6 +1,6 @@
 # Template file for 'gdb'
 pkgname=gdb
-version=8.3
+version=8.3.1
 revision=1
 build_style=gnu-configure
 pycompile_dirs="/usr/share/gdb"
@@ -10,12 +10,12 @@ configure_args="--disable-werror --disable-nls --with-system-readline
  $(vopt_if python --with-python=/usr/bin/python3)"
 hostmakedepends="perl $(vopt_if python python3-devel)"
 makedepends="ncurses-devel zlib-devel readline-devel expat-devel $(vopt_if python 'python3-devel gettext-libs')"
-short_desc="The GNU Debugger"
-maintainer="Orphaned <orphan@voidlinux.org>"
+short_desc="GNU Debugger"
+maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/gdb/"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=802f7ee309dcc547d65a68d61ebd6526762d26c3051f52caebe2189ac1ffd72e
+checksum=1e55b4d7cdca7b34be12f4ceae651623aa73b2fd640152313f9f66a7149757c4
 patch_args="-Np1"
 
 if [ "${CROSS_BUILD}" ]; then
diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index ee3a71f2900..d9947d330ef 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,7 +1,7 @@
 # Template file for 'gdm'
 pkgname=gdm
-version=3.32.0
-revision=2
+version=3.34.1
+revision=1
 build_helper="gir"
 build_style=gnu-configure
 configure_args="$(vopt_enable gir introspection)
@@ -21,7 +21,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GDM"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=643db0c8c5089a96282b4c259b8823ca6dfad1ead6f2d0025d1c1211d36fd78b
+checksum=e85df657aa8d9361af4fb122014d8f123a93bfe45a7662fba2b373d839dbd8d3
 nocross="gnome-shell can't be crosscompiled yet"
 
 conf_files="
diff --git a/srcpkgs/geany-plugins/template b/srcpkgs/geany-plugins/template
index db0775ae22f..7047183241d 100644
--- a/srcpkgs/geany-plugins/template
+++ b/srcpkgs/geany-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'geany-plugins'
 pkgname=geany-plugins
-version=1.35.0
-revision=2
+version=1.36.0
+revision=1
 build_style=gnu-configure
 configure_args="PYTHON=/usr/bin/python2 --enable-all-plugins --disable-devhelp
  --disable-webhelper --disable-debugger --disable-geanypy --disable-multiterm"
@@ -15,7 +15,7 @@ maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://plugins.geany.org"
 distfiles="https://github.com/geany/${pkgname}/archive/${version}.tar.gz"
-checksum=8a46ed8ed79443ec891e0ac2da039ece666de1601178afe030dd50bcd6515fce
+checksum=39409e948502a7d6d88a290f201b7c6c678ce8ecaff7c73589ee0f6dcc059568
 
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh
@@ -52,4 +52,3 @@ geany-plugins-extra_package() {
 		vmove usr/lib/geany-plugins/geanylua
 	}
 }
-
diff --git a/srcpkgs/geany/template b/srcpkgs/geany/template
index 0cbd92aeafd..e99051eedb8 100644
--- a/srcpkgs/geany/template
+++ b/srcpkgs/geany/template
@@ -1,6 +1,6 @@
 # Template file for 'geany'
 pkgname=geany
-version=1.35
+version=1.36
 revision=1
 build_style=gnu-configure
 configure_args="--enable-vte --enable-gtk3"
@@ -9,11 +9,11 @@ hostmakedepends="automake gettext-devel glib-devel libtool pkg-config intltool
 makedepends="gtk+3-devel"
 depends="hicolor-icon-theme desktop-file-utils"
 short_desc="Fast and lightweight IDE"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://www.geany.org"
 distfiles="https://download.${pkgname}.org/${pkgname}-${version}.tar.bz2"
-checksum=35ee1d3ddfadca8bf1764e174ba3a5f348b1f1f430d32a36295b7706b7753d9d
+checksum=9184dd3dd40b7b84fca70083284bb9dbf2ee8022bf2be066bdc36592d909d53e
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/geary/template b/srcpkgs/geary/template
index 91d1f6cc8d5..94798e329a2 100644
--- a/srcpkgs/geary/template
+++ b/srcpkgs/geary/template
@@ -1,6 +1,6 @@
 # Template file for 'geary'
 pkgname=geary
-version=3.32.2
+version=3.34.1
 revision=1
 build_helper="gir"
 build_style=meson
@@ -8,14 +8,14 @@ configure_args="-Dcontractor=true"
 hostmakedepends="desktop-file-utils iso-codes pkg-config itstool
  gobject-introspection vala glib-devel"
 makedepends="enchant2-devel gcr-devel gmime-devel libsoup-devel libglib-devel
- libgee08-devel libnotify-devel libsecret-devel webkit2gtk-devel libxml2-devel
+ libgee08-devel libsecret-devel webkit2gtk-devel libxml2-devel
  gnome-online-accounts-devel json-glib-devel libunwind-devel libcanberra-devel
- folks-devel"
+ folks-devel appstream-glib-devel gspell-devel ytnef-devel libhandy-devel"
 depends="gir-freedesktop gnome-keyring"
 short_desc="Lightweight email program for the GNOME desktop"
-maintainer="Cameron Nemo <camerontnorman@gmail.com>"
+maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Apps/Geary"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/geary-${version}.tar.xz"
-checksum=f821632356f1c0f694e6fe7c301952fa393e3522a0151f718348ec80f01fe569
+checksum=7ba4948312f556d972a8e899ec62f677862714b3b4817403c4eca614d03ba5af
 nocross="folks GIR can't be crossbuilt"
diff --git a/srcpkgs/geckodriver/template b/srcpkgs/geckodriver/template
index 9c019745d1a..34e4b9d996f 100644
--- a/srcpkgs/geckodriver/template
+++ b/srcpkgs/geckodriver/template
@@ -1,6 +1,6 @@
 # Template file for 'geckodriver'
 pkgname=geckodriver
-version=0.24.0
+version=0.25.0
 revision=1
 build_style=cargo
 short_desc="WebDriver for Firefox"
@@ -8,7 +8,7 @@ maintainer="m3tav3rse <n6maa10816@tuta.io>"
 license="MPL-2.0"
 homepage="https://github.com/mozilla/geckodriver"
 distfiles="https://github.com/mozilla/geckodriver/archive/v${version}.tar.gz"
-checksum=e6f86b3b6411f078c0a762f978c00ee99926463036a68be01d111bd91f25340e
+checksum=9ba9b1be1a2e47ddd11216ce863903853975a4805e72b9ed5da8bcbcaebbcea9
 
 case $XBPS_TARGET_MACHINE in
 	armv6*)
diff --git a/srcpkgs/geda/patches/snarf_cpp_opts.patch b/srcpkgs/geda/patches/snarf_cpp_opts.patch
new file mode 100644
index 00000000000..1eec9b6f6db
--- /dev/null
+++ b/srcpkgs/geda/patches/snarf_cpp_opts.patch
@@ -0,0 +1,17 @@
+--- gschem/src/Makefile.orig	2019-10-08 20:33:14.000000000 +0200
++++ gschem/src/Makefile.in	2019-10-12 15:49:39.966600662 +0200
+@@ -2693,12 +2693,12 @@
+ 	$(AM_V_SNARF)CPP="$(CPP)" $(GUILE_SNARF) -o $@ $< $(snarf_cpp_opts)
+ 
+ actions.decl.x: actions.decl.h actions.c Makefile
+-	$(AM_V_GEN)$(CPP) -I$(srcdir) -c $< | \
++	$(AM_V_GEN)$(CPP) -I$(srcdir) $< | \
+ 	  sed -e '/^.*KEEP_LINE /!d' -e 's/^.*KEEP_LINE //' > $@.tmp && \
+ 	mv $@.tmp $@
+ 
+ actions.init.x: actions.init.c actions.c Makefile
+-	$(AM_V_GEN)$(CPP) -I$(srcdir) -c $< | \
++	$(AM_V_GEN)$(CPP) -I$(srcdir) $< | \
+ 	  sed -e '/^.*KEEP_LINE /!d' -e 's/^.*KEEP_LINE //' > $@.tmp && \
+ 	mv $@.tmp $@
+ 
diff --git a/srcpkgs/geda/template b/srcpkgs/geda/template
index 23d895d1381..db74437e903 100644
--- a/srcpkgs/geda/template
+++ b/srcpkgs/geda/template
@@ -1,12 +1,12 @@
 # Template file for 'geda'
 pkgname=geda
-version=1.8.2
-revision=7
+version=1.10.0
+revision=1
 wrksrc="${pkgname}-gaf-${version}"
 build_style=gnu-configure
-configure_args="--with-sysroot=/${XBPS_CROSS_BASE}"
-hostmakedepends="pkg-config guile desktop-file-utils shared-mime-info"
-makedepends="gc-devel gtk+-devel guile-devel"
+make_build_args="V=1"
+hostmakedepends="pkg-config guile python desktop-file-utils shared-mime-info"
+makedepends="gamin-devel gc-devel gtk+-devel guile-devel python-devel libatomic_ops-devel"
 depends="guile geda-data"
 checkdepends="perl"
 short_desc="Electronic Design Automation tool"
@@ -14,12 +14,19 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"
 homepage="http://www.geda-project.org/"
 distfiles="http://ftp.geda-project.org/geda-gaf/stable/v${version%.*}/${version}/geda-gaf-${version}.tar.gz"
-checksum=bbf4773aef1b5a51a8d6f4c3fa288c047340cc62dd6e14d7928fcc6e4051b721
+checksum=5eb7a619f9d9cbcfa895468d6eae888d7e1d519dfff717b9f8f22fbeb37a3b1a
 
-if [ "${XBPS_ARCH}" = "x86_64" ]; then
-	hostmakedepends+=" glibc-devel-32bit"
+if [ "$CROSS_BUILD" ]; then
+	if [ "$XBPS_WORDSIZE" != "$XBPS_TARGET_WORDSIZE" ]; then
+		broken="The host ($XBPS_WORDSIZE) and target ($XBPS_TARGET_WORDSIZE) word sizes need to be the same for cross building."
+	fi
 fi
 
+pre_configure() {
+	mkdir -p gnu
+	touch gnu/stubs-32.h
+}
+
 geda-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index e652eb37668..cdec13159fd 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
 # Template file for 'gerbera'
 pkgname=gerbera
 version=1.3.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
 makedepends="duktape-devel expat-devel ffmpeg-devel file-devel libcurl-devel
@@ -11,7 +11,7 @@ maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="GPL-2.0-only"
 homepage="http://gerbera.io/"
 distfiles="https://github.com/gerbera/gerbera/archive/v${version}.tar.gz"
-checksum=89bbcebcf6beebb50b9453329b13e6a20e3e505dee5655486e90e1f085591f4a
+checksum=9c4509189eab6bff0fe183e1dd54ea8cb17d7fb0bc6e21bb5b1a8ccaaf6c60d9
 
 # libupnp uses large file support, so users must do that, too
 CXXFLAGS="-D_FILE_OFFSET_BITS=64"
diff --git a/srcpkgs/getmail/template b/srcpkgs/getmail/template
index ede082939ab..51a5c4a109f 100644
--- a/srcpkgs/getmail/template
+++ b/srcpkgs/getmail/template
@@ -1,6 +1,6 @@
 # Template file for 'getmail'
 pkgname=getmail
-version=5.13
+version=5.14
 revision=1
 archs=noarch
 build_style=python2-module
@@ -8,8 +8,8 @@ pycompile_module="getmailcore"
 hostmakedepends="python-devel"
 depends="python"
 short_desc="POP3/IMAP mail retriever with reliable Maildir and command delivery"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Lugubris <lugubris@disroot.org>"
 license="GPL-2.0-only"
 homepage="http://pyropus.ca/software/getmail"
 distfiles="http://pyropus.ca/software/getmail/old-versions/${pkgname}-${version}.tar.gz"
-checksum=04d52f6475f09e9f99b4e3d2f1d2eb967a68b67f09af2a6a5151857f060b0a9d
+checksum=f3a99fe74564237d12ca8d4582e113c067c9205b5ab640f72b4e8447606a99c1
diff --git a/srcpkgs/gfuzz/template b/srcpkgs/gfuzz/template
new file mode 100644
index 00000000000..6df0db9c47e
--- /dev/null
+++ b/srcpkgs/gfuzz/template
@@ -0,0 +1,14 @@
+# Template file for 'gfuzz'
+pkgname=gfuzz
+version=0.1
+revision=1
+wrksrc="gfuzz-${version}"
+build_style=go
+go_import_path=github.com/braaaax/gfuzz
+hostmakedepends="git"
+short_desc="Web fuzzer like wfuzz written in Golang"
+maintainer="Alex Childs <misuchiru03+void@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/braaaax/gfuzz"
+distfiles="https://github.com/braaaax/gfuzz/archive/v${version}.tar.gz"
+checksum=9e5b371d4b571fa9970e7678090f010d9adf23eb4f0f3c90da9b64b452f99e63
diff --git a/srcpkgs/giflib/template b/srcpkgs/giflib/template
index 956bc731e84..4f01f28e079 100644
--- a/srcpkgs/giflib/template
+++ b/srcpkgs/giflib/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-makefile
 hostmakedepends="xmlto"
 short_desc="Library to handle, display and manipulate GIF images"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://sourceforge.net/projects/giflib/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/gifski/template b/srcpkgs/gifski/template
index 6d2040e9f19..8ecb5d725f7 100644
--- a/srcpkgs/gifski/template
+++ b/srcpkgs/gifski/template
@@ -1,16 +1,16 @@
 # Template file for 'gifski'
 pkgname=gifski
-version=0.8.7
+version=0.9.2
 revision=1
 build_style=cargo
 configure_args="--features=openmp"
-makedepends="libgomp-devel"
+makedepends="libgomp-devel libomp-devel"
 short_desc="Highest-quality GIF encoder based on pngquant"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="AGPL-3.0-only"
 homepage="https://gif.ski"
 distfiles="https://github.com/ImageOptim/gifski/archive/${version}.tar.gz"
-checksum=e8d8d2fdb816953315989b3ecf39ac88f33b8c49aa7c79a0df8f53b4032755ab
+checksum=e2f6a44e5422527f1a6c582f371b637fefa9f0420c25cbce5831b1c95a2c91c9
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/gip/template b/srcpkgs/gip/template
index 590b7a0d5d0..17b19df9814 100644
--- a/srcpkgs/gip/template
+++ b/srcpkgs/gip/template
@@ -1,7 +1,7 @@
 # Template file for 'gip'
 pkgname=gip
 version=0.6.0
-revision=1
+revision=2
 build_style=cargo
 short_desc="CLI tool to get global IP address"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
@@ -10,6 +10,13 @@ homepage="https://github.com/dalance/gip"
 distfiles="https://github.com/dalance/gip/archive/v${version}.tar.gz"
 checksum=b8f5ba15a554ba4cb85a32449a8f665db24ab9dde7c47e7e6e10724fc9a76422
 
+pre_build() {
+	# the defined version (0.2.39 at the time of writing) is buggy on
+	# ppc64*-musl, pin the oldest newer working version; on next update
+	# please check Cargo.lock to verify if this is still necessary
+	cargo update --package libc --precise 0.2.43
+}
+
 post_install() {
 	vlicense LICENSE-MIT
 }
diff --git a/srcpkgs/girara/template b/srcpkgs/girara/template
index 23657857b6b..8dcb84f51d5 100644
--- a/srcpkgs/girara/template
+++ b/srcpkgs/girara/template
@@ -1,17 +1,17 @@
 # Template file for 'girara'
 pkgname=girara
-version=0.3.2
+version=0.3.3
 revision=1
 build_style=meson
 configure_args="-Dnotify=auto -Dtests=disabled"
 hostmakedepends="pkg-config intltool doxygen glib-devel"
 makedepends="gtk+3-devel libnotify-devel libglib-devel json-c-devel"
-short_desc="A library implementing a user interface that focuses on minimalism"
+short_desc="Library implementing a user interface that focuses on minimalism"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
 homepage="https://pwmt.org/projects/girara/"
-distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz"
-checksum=1700353a101f3c520f9b22e79d71ea5b268a9ec324796cf9e64775d96bb086cd
+distfiles="https://git.pwmt.org/pwmt/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
+checksum=4456ddd6f0420fa6f1677a4a8f438f0401c38c2521585db3ee42e339a730798f
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/git-cola/template b/srcpkgs/git-cola/template
index 98978120b91..7eaba90f3be 100644
--- a/srcpkgs/git-cola/template
+++ b/srcpkgs/git-cola/template
@@ -1,6 +1,6 @@
 # Template file for 'git-cola'
 pkgname=git-cola
-version=3.4
+version=3.5
 revision=1
 archs=noarch
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2"
 homepage="https://git-cola.github.io/"
 distfiles="https://github.com/git-cola/git-cola/archive/v${version}.tar.gz"
-checksum=763e382d8b32427539585d17ec6fe92026c073f6d31a864a5816ebe22cf245bc
+checksum=7fdcfc4326b35e384b97bd4bb2189b4cb5cf258948352759c302e632b41bb2e2
diff --git a/srcpkgs/git-mediate/template b/srcpkgs/git-mediate/template
new file mode 100644
index 00000000000..07f93c2e42f
--- /dev/null
+++ b/srcpkgs/git-mediate/template
@@ -0,0 +1,14 @@
+# Template file for 'git-mediate'
+pkgname=git-mediate
+version=1.0.5
+revision=1
+build_style=haskell-stack
+depends="git"
+short_desc="Tool to help resolving git conflicts"
+maintainer="Peter Wang <novalazy@gmail.com>"
+license="GPL-2.0-only"
+homepage="https://github.com/Peaker/git-mediate"
+distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz"
+checksum=a3f01abc25e7f5a89833131b07ba1a69ab497b099972acf6f333ef43be31b8bc
+nocross=yes
+nopie_files="/usr/bin/git-mediate"
diff --git a/srcpkgs/git-revise/template b/srcpkgs/git-revise/template
index 0f3d478bc60..4179a52bddc 100644
--- a/srcpkgs/git-revise/template
+++ b/srcpkgs/git-revise/template
@@ -1,7 +1,8 @@
 # Template file for 'git-revise'
 pkgname=git-revise
-version=0.4.2
-revision=3
+version=0.5.0
+revision=1
+archs=noarch
 build_style=python3-module
 pycompile_module="gitrevise"
 hostmakedepends="python3 python3-setuptools"
@@ -11,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/mystor/git-revise"
 distfiles="https://github.com/mystor/git-revise/archive/${version}.tar.gz"
-checksum=217b1bb9a3b34d0c7e7544b516a9eed5bc061b9bafd3a97bc7edfd83ea54c0d6
+checksum=f2bd6ad51b2acdd6fb6acf51807ce4b951d92cd039fc9e5a7dbb1e182fdf38b4
 
 post_extract() {
 	vsed -e 's|"man/man1"|"share/man/man1"|g' -i setup.py
diff --git a/srcpkgs/github-opml/template b/srcpkgs/github-opml/template
index a7ab953b773..3d2f6f49a48 100644
--- a/srcpkgs/github-opml/template
+++ b/srcpkgs/github-opml/template
@@ -6,7 +6,7 @@ build_style=go
 go_import_path=github.com/jojomi/github-opml
 hostmakedepends="git"
 short_desc="Create opml file with references to all starred repos by a github user"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/jojomi/github-opml"
 distfiles="https://github.com/jojomi/github-opml/archive/v${version}.tar.gz"
diff --git a/srcpkgs/gitlab-runner/template b/srcpkgs/gitlab-runner/template
index 5f2bc003abd..a2aed99abb9 100644
--- a/srcpkgs/gitlab-runner/template
+++ b/srcpkgs/gitlab-runner/template
@@ -1,6 +1,6 @@
 # Template file for 'gitlab-runner'
 pkgname=gitlab-runner
-version=12.1.0
+version=12.3.0
 revision=1
 wrksrc="${pkgname}-v${version}"
 build_style=go
@@ -10,7 +10,7 @@ maintainer="Christian Poulwey <christian.poulwey@t-online.de>"
 license="MIT"
 homepage="https://docs.gitlab.com/runner/"
 distfiles="https://gitlab.com/gitlab-org/gitlab-runner/-/archive/v${version}/gitlab-runner-v${version}.tar.gz"
-checksum=e6e89a3dd7039ecd34403830eee70aa1de4e3831c61a8da5c6925942ae071c32
+checksum=@eae777591b276f44edb1ebc0b12608180347d779657397065d121a869b90f178
 
 post_install() {
 	vsv gitlab-runner
diff --git a/srcpkgs/gjs/template b/srcpkgs/gjs/template
index 99454afca87..f17eac8a1f2 100644
--- a/srcpkgs/gjs/template
+++ b/srcpkgs/gjs/template
@@ -1,6 +1,6 @@
 # Template file for 'gjs'
 pkgname=gjs
-version=1.56.2
+version=1.58.1
 revision=1
 build_style=gnu-configure
 build_helper="gir"
@@ -13,7 +13,7 @@ license="MIT, LGPL-2.0-or-later"
 homepage="https://wiki.gnome.org/action/show/Projects/Gjs"
 changelog="https://gitlab.gnome.org/GNOME/gjs/blob/gnome-3-30/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4c89818c3d0e2186fcc4cb5228e9bf2a1866dd7d6646a18f1b37219b6710a3ac
+checksum=b4df16ea87dc78c0df5412f9134efb14f7c510773aee117d5ad4cda75646c6f5
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) configure_args+=" --disable-profiler" # https://gitlab.gnome.org/GNOME/gjs/issues/132
diff --git a/srcpkgs/glances/template b/srcpkgs/glances/template
index 3f185b9e294..6d4766493c3 100644
--- a/srcpkgs/glances/template
+++ b/srcpkgs/glances/template
@@ -1,19 +1,19 @@
 # Template file for 'glances'
 pkgname=glances
-version=3.1.0
+version=3.1.2
 revision=1
 archs=noarch
 wrksrc="Glances-${version}"
 build_style=python3-module
 pycompile_module="glances"
 hostmakedepends="python3-setuptools"
-depends="${hostmakedepends} python3-psutil"
+depends="${hostmakedepends} python3-future python3-psutil"
 short_desc="Cross-platform curses-based monitoring tool"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/nicolargo/glances"
 distfiles="${PYPI_SITE}/G/Glances/Glances-${version}.tar.gz"
-checksum=904e3dbbebe261dd98d02f4f0a340e4934b12192e8b303b78473f617c0fcd6ca
+checksum=733a30ee580d062759640a3ce9d7f5798b80c24e6dbf8f96269227bed7256894
 
 post_install() {
 	vsconf conf/glances.conf
diff --git a/srcpkgs/glib-networking/template b/srcpkgs/glib-networking/template
index 601e05089f0..98520abb635 100644
--- a/srcpkgs/glib-networking/template
+++ b/srcpkgs/glib-networking/template
@@ -1,6 +1,6 @@
 # Template file for 'glib-networking'
 pkgname=glib-networking
-version=2.60.3
+version=2.62.1
 revision=1
 build_style=meson
 configure_args="-Dinstalled_tests=false -Dgnutls=enabled -Dlibproxy=enabled
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/glib-networking/"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d50183046a4ff955d8cc7e953067cdfc94f14dbfda3024bf377ff37a3121dcd5
+checksum=3c55ae6771ad7a79fa606a834f4686ed555c2774ed6e9ece6f3c0f6a3dab7110
 lib32disabled=yes
 
 post_install() {
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 48c20a0be6f..5fdfff1410d 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,6 +1,6 @@
 # Template file for 'glib'
 pkgname=glib
-version=2.60.6
+version=2.62.1
 revision=1
 build_style=meson
 configure_args="-Dfam=false -Dman=true -Dselinux=disabled
@@ -14,7 +14,7 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GLib"
 changelog="https://gitlab.gnome.org/GNOME/glib/raw/master/NEWS"
 distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=ff8fab8d8deaa4fd0536c90f90d9769a09071779c7e6183907f6855645bffb6c
+checksum=3dd9024e1d0872a6da7ac509937ccf997161b11d7d35be337c7e829cbae0f9df
 
 build_options="gtk_doc"
 
diff --git a/srcpkgs/glibmm/template b/srcpkgs/glibmm/template
index 141c8058787..23ef47c5994 100644
--- a/srcpkgs/glibmm/template
+++ b/srcpkgs/glibmm/template
@@ -1,6 +1,6 @@
 # Template file for 'glibmm'
 pkgname=glibmm
-version=2.60.0
+version=2.62.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="glib-devel perl pkg-config"
@@ -10,7 +10,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.gtkmm.org"
 distfiles="${GNOME_SITE}/glibmm/${version%.*}/glibmm-${version}.tar.xz"
-checksum=a3a1b1c9805479a16c0018acd84b3bfff23a122aee9e3c5013bb81231aeef2bc
+checksum=36659f13cc73282392d1305858f3bbca46fbd1ce2f078cc9db8b9f79b2e93cfe
 
 glibmm-doc_package() {
 	archs=noarch
diff --git a/srcpkgs/glslViewer/template b/srcpkgs/glslViewer/template
index 5f458d21f46..a94a2e84992 100644
--- a/srcpkgs/glslViewer/template
+++ b/srcpkgs/glslViewer/template
@@ -9,7 +9,7 @@ makedepends="glfw-devel glu-devel MesaLib-devel libX11-devel libXrandr-devel
  libXi-devel libXxf86vm-devel libXcursor-devel libXinerama-devel libXext-devel
  libXrender-devel libXdamage-devel"
 short_desc="Live GLSL coding render"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://patriciogonzalezvivo.com/2015/glslViewer/"
 distfiles="https://github.com/patriciogonzalezvivo/glslViewer/archive/${version}.tar.gz"
diff --git a/srcpkgs/glslang/template b/srcpkgs/glslang/template
index 59526f9966c..cde1162b93f 100644
--- a/srcpkgs/glslang/template
+++ b/srcpkgs/glslang/template
@@ -6,7 +6,7 @@ build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
 hostmakedepends="python bison"
 short_desc="Khronos reference front-end for GLSL, ESSL, and sample SPIR-V generator"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/KhronosGroup/glslang"
 distfiles="https://github.com/KhronosGroup/glslang/archive/${version}.tar.gz"
diff --git a/srcpkgs/glusterfs/template b/srcpkgs/glusterfs/template
index 81cd6b5a496..a1304e266fe 100644
--- a/srcpkgs/glusterfs/template
+++ b/srcpkgs/glusterfs/template
@@ -1,6 +1,6 @@
 # Template file for 'glusterfs'
 pkgname=glusterfs
-version=6.4
+version=6.5
 revision=1
 build_style=gnu-configure
 configure_args="--with-mountutildir=/usr/bin ac_cv_file__etc_debian_version=no
@@ -17,7 +17,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-3.0-only"
 homepage="https://www.gluster.org/"
 distfiles="https://download.gluster.org/pub/gluster/glusterfs/${version%.*}/${version}/${pkgname}-${version}.tar.gz"
-checksum=82ff052e58b7eccf3cc04ce21ec99479722a5b9bfb6f29a48de2622a571ed1bd
+checksum=83548320df35d9552c9053a7a6ceea6dd17971d9962275ed6dfedb06a308847b
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) broken="not yet supported";;
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index 1e8de636605..6c9af4917f1 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,6 +1,6 @@
 # Template file for 'gmic'
 pkgname=gmic
-version=2.6.7
+version=2.7.1
 revision=1
 build_wrksrc="src"
 build_style=gnu-makefile
@@ -13,7 +13,7 @@ maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
 license="CECILL-2.1"
 homepage="http://gmic.eu/"
 distfiles="http://gmic.eu/files/source/gmic_${version}.tar.gz"
-checksum="2e5535d1bae66254136e928428750aac8efcef6f4413fc352b6de9ce8ac8b0ff"
+checksum="c71e784abd2141252efad505b6a48b6974c388788db5530b3ca0dfb07baeafeb"
 disable_parallel_build="yes"
 nocross="https://build.voidlinux.org/builders/armv7l_builder/builds/8869/steps/shell_3/logs/stdio"
 
diff --git a/srcpkgs/gmime3/template b/srcpkgs/gmime3/template
index 63d319ef519..a6a34d2306b 100644
--- a/srcpkgs/gmime3/template
+++ b/srcpkgs/gmime3/template
@@ -1,7 +1,7 @@
 # Template file for 'gmime3'
 pkgname=gmime3
-version=3.2.3
-revision=6
+version=3.2.4
+revision=1
 wrksrc="gmime-${version}"
 build_style=gnu-configure
 build_helper="gir"
@@ -16,7 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/jstedfast/gmime"
 distfiles="${GNOME_SITE}/gmime/${version%.*}/gmime-${version}.tar.xz"
-checksum=6a0875eeb552ab447dd54853a68ced62217d863631048737dd97eaa2713e7311
+checksum=249ea7c0e080b067aa9669162c36b181b402f6cf6cebc4999d838c6f1e81d024
 
 # Package build options
 build_options="gir vala"
diff --git a/srcpkgs/gnome-backgrounds/template b/srcpkgs/gnome-backgrounds/template
index a5585c4b932..bf2d7679ac5 100644
--- a/srcpkgs/gnome-backgrounds/template
+++ b/srcpkgs/gnome-backgrounds/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-backgrounds'
 pkgname=gnome-backgrounds
-version=3.32.0
+version=3.34.0
 revision=1
 archs=noarch
 build_style=meson
@@ -9,4 +9,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, CC-BY-2.0, CC-BY-SA-2.0, CC-BY-SA-3.0"
 homepage="https://gitlab.gnome.org/GNOME/gnome-backgrounds"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3f53c31bc9ff31b27408159afe77d06875174bc554e4e7c225a4d5d16acbb3e8
+checksum=c2b7fb6db98c05e205053daaa7f58c7f06ff91b45c4006052af17c578ae7b47f
diff --git a/srcpkgs/gnome-bluetooth/template b/srcpkgs/gnome-bluetooth/template
index 26d33435dbe..988a7f19b6d 100644
--- a/srcpkgs/gnome-bluetooth/template
+++ b/srcpkgs/gnome-bluetooth/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-bluetooth'
 pkgname=gnome-bluetooth
-version=3.32.1
-revision=2
+version=3.34.0
+revision=1
 build_helper="gir"
 build_style=meson
 configure_args="-Dicon-update=false -Dgtk_doc=false
@@ -15,7 +15,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeBluetooth"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6441cafd313af94fba28b701698074f97d693b9023788a74e8e6f16f817ba1aa
+checksum=e867e67423e1dc78c56c2ea11dec066ce0254238d559e4777c80fa2935eb6baf
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/gnome-books/template b/srcpkgs/gnome-books/template
index 43bb31e4939..638d9140e43 100644
--- a/srcpkgs/gnome-books/template
+++ b/srcpkgs/gnome-books/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-books'
 pkgname=gnome-books
-version=3.32.0
+version=3.34.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -12,5 +12,5 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Books"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a49e2ff49f1ee96ca66836e48c80f6f0fc863f7b9682dc684df26bce19f76cf2
+checksum=ca5716a09e526ee43aa69dafffe5057b30edc648f56f554070c54a1db19d7b94
 nocross="Mozjs60 .pc file's Cflags don't honor the sysroot which leads to missing includes"
diff --git a/srcpkgs/gnome-builder/patches/dont-require-FNM_EXTMATCH.patch b/srcpkgs/gnome-builder/patches/dont-require-FNM_EXTMATCH.patch
deleted file mode 100644
index 46d327bd94b..00000000000
--- a/srcpkgs/gnome-builder/patches/dont-require-FNM_EXTMATCH.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-commit ec3f94cf7430b8c4120a9a2b352a238163696bec
-Author: Ting-Wei Lan <lantw@src.gnome.org>
-Date:   Mon Jul 29 23:24:27 2019 +0800
-
-    foundry: don't require FNM_EXTMATCH
-    
-    If the system doesn't support FNM_EXTMATCH, we just fallback to 0. It
-    seems to be safe because nothing depends on its extra features currently.
-
-diff --git src/libide/foundry/ide-simple-build-system-discovery.c src/libide/foundry/ide-simple-build-system-discovery.c
-index c62eeb155..57883996f 100644
---- src/libide/foundry/ide-simple-build-system-discovery.c
-+++ src/libide/foundry/ide-simple-build-system-discovery.c
-@@ -289,7 +289,11 @@ ide_simple_build_system_discovery_match (IdeSimpleBuildSystemDiscovery *self,
-   g_assert (IDE_IS_SIMPLE_BUILD_SYSTEM_DISCOVERY (self));
-   g_assert (name != NULL);
- 
-+#ifdef FNM_EXTMATCH
-   return fnmatch (priv->glob, name, FNM_EXTMATCH) == 0;
-+#else
-+  return fnmatch (priv->glob, name, 0) == 0;
-+#endif
- }
- 
- static gboolean
diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index ebed528508f..9ae9ff9d94c 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-builder'
 pkgname=gnome-builder
-version=3.32.4
-revision=2
+version=3.34.1
+revision=1
 build_style=meson
 configure_args="-Dwith_webkit=true -Dwith_sysprof=true -Dhelp=true"
 hostmakedepends="appdata-tools desktop-file-utils flex gobject-introspection
@@ -16,9 +16,9 @@ short_desc="IDE for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Builder"
-changelog="https://gitlab.gnome.org/GNOME/gnome-builder/raw/gnome-builder-3-32/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-builder/raw/gnome-builder-3-34/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=19a388402e429277751b54e6587f2ff9533f3df143818b84e2e81a202a2a3776
+checksum=0b6e461057ea8151e80524c0ea7ef1cb948e92afda9dc6bd33ae3392f04501a4
 nocross="Cannot build gresources on cross musl, unresolvable shlibs on glibc cross"
 
 case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/gnome-calendar/template b/srcpkgs/gnome-calendar/template
index ef2c96c3323..2b0a27b9f25 100644
--- a/srcpkgs/gnome-calendar/template
+++ b/srcpkgs/gnome-calendar/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-calendar'
 pkgname=gnome-calendar
-version=3.32.2
+version=3.34.1
 revision=1
 build_style=meson
 hostmakedepends="glib-devel pkg-config $(vopt_if gir 'gobject-introspection')"
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Calendar"
 changelog="https://gitlab.gnome.org/GNOME/gnome-calendar/raw/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f3500bedc257e3c7b82c5f4187b189dec99b76f445c96b01ca2d22f9371be71e
+checksum=fed47b23e3fe2c356092e25bc8d455e87ef0eeb39fa90bf3d0be925dfa3e90e2
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/gnome-chess/template b/srcpkgs/gnome-chess/template
index 6cc8597d570..9733e3937a6 100644
--- a/srcpkgs/gnome-chess/template
+++ b/srcpkgs/gnome-chess/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-chess'
 pkgname=gnome-chess
-version=3.32.0
+version=3.34.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config vala glib-devel itstool librsvg-devel"
@@ -11,4 +11,4 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Chess"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6998a9bc6cee1d7b6b203f9ec744f33c6f1983adb0b0a7b477c1bbca8936eb43
+checksum=6504054499e08801cb5e321b70a186f74d399699b3e29a5babf772d8cd933bd8
diff --git a/srcpkgs/gnome-clocks/template b/srcpkgs/gnome-clocks/template
index a62c3591576..3b6e5895080 100644
--- a/srcpkgs/gnome-clocks/template
+++ b/srcpkgs/gnome-clocks/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-clocks'
 pkgname=gnome-clocks
-version=3.32.0
-revision=1
+version=3.34.0
+revision=2
 build_helper="gir"
 build_style=meson
 hostmakedepends="pkg-config intltool itstool glib-devel vala"
@@ -15,4 +15,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Clocks"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6c8d90b0044f535f239bd94a7d0e46d0c9da32a6a141ff1233a78fa99a7cd4f0
+checksum=61195f357c63b65b75e209494e12a122a802c75333290e136813565dca94f03c
diff --git a/srcpkgs/gnome-contacts/patches/ambiguous.patch b/srcpkgs/gnome-contacts/patches/ambiguous.patch
deleted file mode 100644
index 3569e0e303f..00000000000
--- a/srcpkgs/gnome-contacts/patches/ambiguous.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/contacts-window.vala
-+++ src/contacts-window.vala
-@@ -35,9 +35,9 @@ public class Contacts.Window : Gtk.ApplicationWindow {
-   [GtkChild]
-   private TitleBar titlebar;
-   [GtkChild]
--  private HeaderBar left_header;
-+  private Gtk.HeaderBar left_header;
-   [GtkChild]
--  private HeaderBar right_header;
-+  private Gtk.HeaderBar right_header;
-   [GtkChild]
-   private Overlay notification_overlay;
-   [GtkChild]
diff --git a/srcpkgs/gnome-contacts/template b/srcpkgs/gnome-contacts/template
index 9b861442c14..5595ef8ce06 100644
--- a/srcpkgs/gnome-contacts/template
+++ b/srcpkgs/gnome-contacts/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-contacts'
 pkgname=gnome-contacts
-version=3.32.2
-revision=1
+version=3.34.0
+revision=2
 wrksrc="gnome-contacts-${version%.*}"
 build_style=meson
 hostmakedepends="docbook-xsl glib-devel libxslt pkg-config vala"
@@ -13,4 +13,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Contacts"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version%.*}.tar.xz"
-checksum=fc49f9821fe7a2491287bc25979bb428d39c6510d23c59bf031a4e555a39798b
+checksum=99602ec8d660c1f3c92cae6356f64f72fb6db58e55bce27a599330bf7b622f12
diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index b71bd9cbe42..0e2787898ae 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-control-center'
 pkgname=gnome-control-center
-version=3.32.2
+version=3.34.1
 revision=1
 build_style=meson
 build_helper="gir"
@@ -24,7 +24,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-control-center"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=faa5092d1eb12dfe85c54fe025e0fb29520654bb219cc5086f7326ea6005d70e
+checksum=5f82ecd5554136c462248ec5363b82d95358b39dfd6787006d8307b4504e515e
 
 build_options="cheese"
 desc_option_cheese="Add support for adding user account images with your webcam"
diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index e8cd6c94cbc..38baffaa5c8 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-desktop'
 pkgname=gnome-desktop
-version=3.32.2
+version=3.34.1
 revision=1
 build_style=meson
 build_helper="gir"
@@ -16,7 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-desktop"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=099f71b29310c999c28f2bf272c846bbd7efc8c6c438b37d15f374230ce92d2e
+checksum=c1dbeb5666dad27166c769e48e2ab41dd5ed74718ea35eb57c8488790662dc5a
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/gnome-documents/template b/srcpkgs/gnome-documents/template
index b33f4b1bd65..62d9bddbc1e 100644
--- a/srcpkgs/gnome-documents/template
+++ b/srcpkgs/gnome-documents/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-documents'
 pkgname=gnome-documents
 version=3.32.0
-revision=2
+revision=3
 build_helper="gir"
 build_style=meson
 hostmakedepends="docbook-xsl itstool pkg-config glib-devel libxslt gdk-pixbuf
diff --git a/srcpkgs/gnome-flashback/template b/srcpkgs/gnome-flashback/template
index 1201adbb01d..bc5ae868cb8 100644
--- a/srcpkgs/gnome-flashback/template
+++ b/srcpkgs/gnome-flashback/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-flashback'
 pkgname=gnome-flashback
-version=3.30.0
-revision=2
+version=3.34.1
+revision=1
 build_style=gnu-configure
 configure_args="--enable-compile-warnings=minimum"
 hostmakedepends="pkg-config automake glib-devel"
@@ -16,5 +16,5 @@ maintainer="shizonic <realtiaz@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeFlashback"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a7786f43760b63d3036aa92240c5efe897e83a2831dc9f6829019d7805c53ca3
+checksum=ddba0c9661ad93b58ccbde267f6ecbc02da2c15f9d38d87d5504f4670c2fbc77
 nocross="gobject-introspection"
diff --git a/srcpkgs/gnome-font-viewer/template b/srcpkgs/gnome-font-viewer/template
index 085b7d013bc..6d035366d44 100644
--- a/srcpkgs/gnome-font-viewer/template
+++ b/srcpkgs/gnome-font-viewer/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-font-viewer'
 pkgname=gnome-font-viewer
-version=3.32.0
+version=3.34.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config glib-devel"
@@ -12,4 +12,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-font-viewer"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=43e1b0e759882d3597e650eb043e3d89c64cff9c124ceb6889e1a4a134286181
+checksum=aa6f0583e5f93aec095e537f0638b29de3d02491f0131ef584a7c55d39d6b98b
diff --git a/srcpkgs/gnome-games/template b/srcpkgs/gnome-games/template
index d83f3dd9853..dd83b22de09 100644
--- a/srcpkgs/gnome-games/template
+++ b/srcpkgs/gnome-games/template
@@ -1,16 +1,15 @@
 # Template file for 'gnome-games'
 pkgname=gnome-games
-version=3.30.2
+version=3.34.0
 revision=1
 build_style=meson
 hostmakedepends="glib-devel pkg-config vala-devel"
 makedepends="libarchive-devel grilo-devel gtk+3-devel libglib-devel
  libmanette-devel librsvg-devel libsoup-devel libxml2-devel retro-gtk-devel
- sqlite-devel tracker-devel"
+ sqlite-devel tracker-devel libhandy-devel"
 short_desc="Browse and play your games"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Games"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5607c4071d3b07809ec1a88deb52bb289c29b2f5fb91374e244ebe7f8dee31a1
-nocross="depends on libmanette, which hard depends on gobject-introspection"
+checksum=0fd7246d61ce21c0fc121c5488051a5866c19de2c2835ad7fe4b18c06627dcba
diff --git a/srcpkgs/gnome-getting-started-docs/template b/srcpkgs/gnome-getting-started-docs/template
index 9801d25e75c..5bec93490ba 100644
--- a/srcpkgs/gnome-getting-started-docs/template
+++ b/srcpkgs/gnome-getting-started-docs/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-getting-started-docs'
 pkgname=gnome-getting-started-docs
-version=3.32.2
+version=3.34.0
 revision=1
 archs=noarch
 build_style=gnu-configure
@@ -11,4 +11,4 @@ license="CC-BY-SA-3.0"
 homepage="https://gitlab.gnome.org/GNOME/gnome-getting-started-docs"
 #changelog="https://gitlab.gnome.org/GNOME/gnome-getting-started-docs/raw/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=98af5c388808a81334806f3c69bacb3e520f6a5d46ffd61a7b307f5a8b2193ec
+checksum=f70ce2ca23ad786215f3c92ec85783e3aabed07e4f78700fa27f9b2cf76e03db
diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index cda29a3406a..aba5a094c28 100644
--- a/srcpkgs/gnome-initial-setup/template
+++ b/srcpkgs/gnome-initial-setup/template
@@ -1,9 +1,9 @@
 # Template file for 'gnome-initial-setup'
 pkgname=gnome-initial-setup
-version=3.32.1
-revision=1
+version=3.34.1
+revision=2
 build_style=meson
-configure_args="-Dsoftware-sources=disabled"
+configure_args="-Dsoftware-sources=disabled -Dsystemd=false"
 hostmakedepends="pkg-config glib-devel"
 makedepends="NetworkManager-devel accountsservice-devel libglib-devel
  gnome-desktop-devel cheese-devel libgweather-devel webkit2gtk-devel
@@ -17,4 +17,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Design/OS/InitialSetup"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3ea709826ee87e837518e316bc72334dc8dc6e65c6a82b96fe8879aadab990bf
+checksum=e71f10ef6b631cd92ffde774e4130b32b2494b4df5ef288375d8b1957eeabfa1
diff --git a/srcpkgs/gnome-klotski/template b/srcpkgs/gnome-klotski/template
index a1ba3965238..73929851e1d 100644
--- a/srcpkgs/gnome-klotski/template
+++ b/srcpkgs/gnome-klotski/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-klotski'
 pkgname=gnome-klotski
-version=3.32.0
-revision=2
+version=3.34.0
+revision=1
 build_style=meson
 hostmakedepends="glib itstool pkg-config vala glib-devel"
 makedepends="librsvg-devel libgnome-games-support-devel"
@@ -10,4 +10,4 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Klotski"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e2c4259f6b3199423336dbe4ceb63329f4ec45a73b7d217ad4ea19d95f099adc
+checksum=8e3442f5d7e08ce3de512557a468f0c97284ce7f67a32b1313908ae1ff027d69
diff --git a/srcpkgs/gnome-mahjongg/template b/srcpkgs/gnome-mahjongg/template
index 69fc096f1f3..20f4a0011fd 100644
--- a/srcpkgs/gnome-mahjongg/template
+++ b/srcpkgs/gnome-mahjongg/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-mahjongg'
 pkgname=gnome-mahjongg
-version=3.32.0
-revision=2
+version=3.34.0
+revision=1
 build_style=meson
 hostmakedepends="glib-devel itstool pkg-config vala"
 makedepends="librsvg-devel gtk+3-devel libglib-devel"
@@ -10,4 +10,4 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Mahjongg"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=52843745a17ef1e9e80820432b3317aa885ec7417ac1e9239946c0d56daf6a8a
+checksum=e5cfcf839cc86003708dfaa35c13a05aa4751618e316afb3f65284f0a61cd163
diff --git a/srcpkgs/gnome-mines/template b/srcpkgs/gnome-mines/template
index e534547cfd4..af283c58320 100644
--- a/srcpkgs/gnome-mines/template
+++ b/srcpkgs/gnome-mines/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-mines'
 pkgname=gnome-mines
-version=3.32.2
+version=3.34.0
 revision=1
 build_style=meson
 hostmakedepends="glib-devel itstool pkg-config vala"
@@ -10,4 +10,4 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Mines"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0f757f4cc8526ecbffedd3e68f156b0acbfb17e5cb9cd5d8ef388b3bb93169db
+checksum=a4f0189ef0fc45d5d5554197649f15014db82ff791ddad732e1af990b151fdea
diff --git a/srcpkgs/gnome-mpv b/srcpkgs/gnome-mpv
new file mode 120000
index 00000000000..ce77c85be34
--- /dev/null
+++ b/srcpkgs/gnome-mpv
@@ -0,0 +1 @@
+celluloid
\ No newline at end of file
diff --git a/srcpkgs/gnome-mpv/template b/srcpkgs/gnome-mpv/template
deleted file mode 100644
index 96e5a00911c..00000000000
--- a/srcpkgs/gnome-mpv/template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'gnome-mpv'
-pkgname=gnome-mpv
-version=0.16
-revision=1
-build_style=meson
-hostmakedepends="glib-devel pkg-config"
-makedepends="gtk+3-devel libepoxy-devel libglib-devel mpv-devel"
-short_desc="Simple GTK+ frontend for mpv"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-3.0-or-later"
-homepage="https://gnome-mpv.github.io/"
-distfiles="https://github.com/${pkgname}/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.xz"
-checksum=22cd8a9257ea57449f3120993e668d11e5e3be31444c6e63b8b25ccce0feed4b
diff --git a/srcpkgs/gnome-nibbles/template b/srcpkgs/gnome-nibbles/template
index 056876156ff..ec89cbca3f8 100644
--- a/srcpkgs/gnome-nibbles/template
+++ b/srcpkgs/gnome-nibbles/template
@@ -1,15 +1,15 @@
 # Template file for 'gnome-nibbles'
 pkgname=gnome-nibbles
-version=3.32.0
+version=3.34.1
 revision=1
-build_style=gnu-configure
-hostmakedepends="glib-devel intltool itstool pkg-config"
-makedepends="clutter-gtk-devel libcanberra-devel libgnome-games-support-devel
- librsvg-devel"
+build_style=meson
+hostmakedepends="glib-devel intltool itstool pkg-config vala"
+makedepends="clutter-gtk-devel gsound-devel libcanberra-devel
+ libgnome-games-support-devel librsvg-devel"
 short_desc="GNOME snake eats diamonds game"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-3.0-or-later"
 changelog="https://github.com/GNOME/gnome-nibbles/raw/gnome-3-24/NEWS"
 homepage="https://wiki.gnome.org/Apps/Nibbles"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=375143d127ecf9921f23dce78b6a9144274bd76b5111a8b3f0917bb7fe3dc23c
+checksum=77f0070af8294ac8795c07982fed4144d581f7336817eb6c6c377bdd370fde59
diff --git a/srcpkgs/gnome-online-accounts/template b/srcpkgs/gnome-online-accounts/template
index 1a74bb3a834..469ba370503 100644
--- a/srcpkgs/gnome-online-accounts/template
+++ b/srcpkgs/gnome-online-accounts/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-online-accounts'
 pkgname=gnome-online-accounts
-version=3.32.0
-revision=2
+version=3.34.1
+revision=1
 build_style=gnu-configure
 build_helper="gir"
 configure_args="$(vopt_enable gir introspection)
@@ -20,7 +20,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeOnlineAccounts"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1c19e65771c8d16fa0016ab70d9a1ee2b75a84aeeedd24527a4e41b132e8d4aa
+checksum=4832ca8e48d3a497fc676e7b6f146009ab4206995362977b9805aa39f164783a
 
 build_options="gir vala"
 build_options_default="gir vala"
diff --git a/srcpkgs/gnome-online-miners/template b/srcpkgs/gnome-online-miners/template
index b1a93746c94..43b21bf5b9c 100644
--- a/srcpkgs/gnome-online-miners/template
+++ b/srcpkgs/gnome-online-miners/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-online-miners'
 pkgname=gnome-online-miners
-version=3.30.0
+version=3.34.0
 revision=1
 lib32disabled=yes
 build_style=gnu-configure
@@ -15,7 +15,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeOnlineMiners"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2c29a9922b1d32aeb0e615db6717c8e060417d3b6568ed617c9817fb39af4a5e
+checksum=845c2260fb12f14315c800d04d60f37e076c7c7b4222587ae75f108562fa52d8
 
 build_options="gir"
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/gnome-panel/template b/srcpkgs/gnome-panel/template
index 60b50fc2192..18a2ea4ca94 100644
--- a/srcpkgs/gnome-panel/template
+++ b/srcpkgs/gnome-panel/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-panel'
 pkgname=gnome-panel
-version=3.32.0
-revision=1
+version=3.34.1
+revision=2
 build_style=gnu-configure
 hostmakedepends="gettext-devel glib-devel itstool pkg-config"
 makedepends="cairo-devel dconf-devel elogind-devel evolution-data-server-devel
@@ -13,5 +13,5 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.1-or-later, LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomePanel"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6a6079d3d22d480d53cf552bbe18e061276d2d0b458cce4dfb822cb064883f29
+checksum=a6bc0255252eeb4b964bcbe55fd7908b69f914c062c5ec8dff5ac0262d29b90d
 patch_args="-Np1"
diff --git a/srcpkgs/gnome-passwordsafe/template b/srcpkgs/gnome-passwordsafe/template
index cec9f84e238..f310ce03a08 100644
--- a/srcpkgs/gnome-passwordsafe/template
+++ b/srcpkgs/gnome-passwordsafe/template
@@ -1,14 +1,15 @@
 # Template file for 'gnome-passwordsafe'
 pkgname=gnome-passwordsafe
 version=3.32.0
-revision=1
+revision=2
 archs=noarch
 wrksrc="PasswordSafe-${version}"
 build_style=meson
 pycompile_module="passwordsafe"
 hostmakedepends="glib-devel pkg-config gobject-introspection python3-pykeepass"
 makedepends="gtk+3-devel libhandy-devel python3-pykeepass libpwquality-devel"
-depends="gtk+3 libnotify libhandy python3-gobject python3-pykeepass python3-construct"
+depends="gtk+3 libnotify libhandy python3-gobject python3-pykeepass python3-construct
+ libpwquality-python3"
 short_desc="Keepass compatible password manager for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
diff --git a/srcpkgs/gnome-robots/template b/srcpkgs/gnome-robots/template
index 572c6632bb7..3184fafe0fa 100644
--- a/srcpkgs/gnome-robots/template
+++ b/srcpkgs/gnome-robots/template
@@ -1,14 +1,14 @@
 # Template file for 'gnome-robots'
 pkgname=gnome-robots
-version=3.32.0
+version=3.34.0
 revision=1
 build_style=meson
 hostmakedepends="glib-devel itstool pkg-config"
-makedepends="gtk+3-devel libcanberra-devel librsvg-devel
+makedepends="gsound-devel gtk+3-devel libcanberra-devel librsvg-devel
  libglib-devel libgnome-games-support-devel"
 short_desc="GNOME classic robots game"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Robots"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d0db7879288e1a9e0d2bad5ae6ce24e7be2e1581af41b096adfccc4265d4e1f6
+checksum=ab82885194a536b8ad74512541a1dad6614d1d4caa127ea26075349340e976a3
diff --git a/srcpkgs/gnome-screensaver/template b/srcpkgs/gnome-screensaver/template
index 1381c5d9219..363fcf12e10 100644
--- a/srcpkgs/gnome-screensaver/template
+++ b/srcpkgs/gnome-screensaver/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-screensaver'
 pkgname=gnome-screensaver
 version=3.6.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-compile-warnings=minimum"
 hostmakedepends="pkg-config automake intltool glib-devel"
diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template
index 359c08d41f5..4444f162bf1 100644
--- a/srcpkgs/gnome-session/template
+++ b/srcpkgs/gnome-session/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-session'
 pkgname=gnome-session
-version=3.32.0
-revision=2
+version=3.34.1
+revision=1
 build_style=meson
 configure_args="-Dsystemd_journal=false"
 hostmakedepends="glib-devel intltool pkg-config xmlto"
@@ -15,4 +15,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-session"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bbd4c4ead32f0b805d0e372a63207e4e0c756dd16e1d456b2a211a40da9d3f7f
+checksum=d7801fe2d5a751b19cb58081771316a76aabd5c550cd58d4e4c6a5a4ed356660
diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template
index 7f179f2be4a..a70e28be5fa 100644
--- a/srcpkgs/gnome-settings-daemon/template
+++ b/srcpkgs/gnome-settings-daemon/template
@@ -1,10 +1,11 @@
 # Template file for 'gnome-settings-daemon'
 pkgname=gnome-settings-daemon
-version=3.32.1
-revision=1
+version=3.34.1
+revision=2
 build_style=meson
-hostmakedepends="docbook-xsl glib-devel libglib-devel libxslt perl pkg-config"
-makedepends="NetworkManager-devel alsa-lib-devel colord-devel cups-devel
+configure_args+="-Dsystemd=false"
+hostmakedepends="cmake docbook-xsl glib-devel libglib-devel libxslt perl pkg-config"
+makedepends="NetworkManager-devel alsa-lib-devel colord-devel cups-devel gcr-devel
  geoclue2-devel gnome-desktop-devel ibus-devel libcanberra-devel libgnomekbd-devel
  libgweather-devel libnotify-devel librsvg-devel libwacom-devel nss-devel
  polkit-devel pulseaudio-devel startup-notification-devel upower-devel
@@ -17,7 +18,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-settings-daemon"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7a36d14f5ca1aaa5b5d4cd0a8a743017819c12014e8f4cc88a0ed72a1ed0a009
+checksum=9981a20babf8da7744b7fbe175b9e36078bf08f3bf65fe5aedeb82cfe27ac11f
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" polkit"
diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index a66ab15c374..97168b40f66 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell-extensions'
 pkgname=gnome-shell-extensions
-version=3.32.1
+version=3.34.1
 revision=1
 archs=noarch
 build_style=meson
@@ -12,4 +12,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=02b2b2fb477fcd8277ee3ce34ec156d97724011f2660dd2e14c412f18d5b911e
+checksum=b0ad51143b1bf40def4a10f8fd0ab0ffb47218304800794e62cadd29d0acc75b
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 577c58e5c19..3968ffa805f 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,18 +1,18 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
-version=3.32.2
+version=3.34.1
 revision=1
 build_style=meson
 configure_args="-Dsystemd=false"
 hostmakedepends="gobject-introspection gtk-doc libxslt pkg-config python3 sassc
- perl"
+ asciidoc perl"
 makedepends="at-spi2-atk caribou-devel evolution-data-server-devel folks-devel
  gcr-devel gjs-devel gnome-bluetooth-devel gnome-control-center-devel gnome-desktop-devel
  gnome-menus-devel gsettings-desktop-schemas-devel gstreamer1-devel gtk+3-devel
  ibus-devel json-glib-devel libcanberra-devel libcroco-devel libglib-devel
  libsecret-devel libsoup-devel libX11-devel libxml2-devel mutter-devel
  network-manager-applet-devel polkit-devel pulseaudio-devel
- startup-notification-devel telepathy-logger-devel"
+ startup-notification-devel telepathy-logger-devel gnome-autoar-devel"
 depends="caribou elogind glxinfo gnome-control-center gsettings-desktop-schemas upower"
 short_desc="GNOME core user interface"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -20,5 +20,5 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell"
 changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/gnome-3-30/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e5561b0d5c1fb3b0b66e99f1ad7f2f9db918ee953897f4eac6ae5c8d6d9bd42a
+checksum=ccd86559b9c897c219d2d2ebfdb8413efa4c1bee846427c750cb8a301b3f6d1e
 nocross="Evolution-dataserver cross gir doesn't work yet."
diff --git a/srcpkgs/gnome-ssh-askpass/template b/srcpkgs/gnome-ssh-askpass/template
index 2192837714d..0843e73d44b 100644
--- a/srcpkgs/gnome-ssh-askpass/template
+++ b/srcpkgs/gnome-ssh-askpass/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-ssh-askpass'
 pkgname=gnome-ssh-askpass
-version=8.0p1
+version=8.1p1
 revision=1
 wrksrc="openssh-${version}"
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause, BSD-2-Clause"
 homepage="http://www.openssh.org"
 distfiles="https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${version}.tar.gz"
-checksum=bd943879e69498e8031eb6b7f44d08cdc37d59a7ab689aa0b437320c3481fd68
+checksum=02f5dbef3835d0753556f973cd57b4c19b6b1f6cd24c03445e23ac77ca1b93ff
 
 alternatives="
  ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/gnome-ssh-askpass
diff --git a/srcpkgs/gnome-sudoku/template b/srcpkgs/gnome-sudoku/template
index e7451d42579..ee321a337a6 100644
--- a/srcpkgs/gnome-sudoku/template
+++ b/srcpkgs/gnome-sudoku/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-sudoku'
 pkgname=gnome-sudoku
-version=3.32.0
+version=3.34.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -11,7 +11,7 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Sudoku"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=14388541ca7bbc01a45cb29a46cfc0794a2bcb7d0cef67361b7dd1c0a9938df3
+checksum=7e30b859a31e832738719808cede0c41e14daa059ed3f3a3619ab629094f9eaf
 
 case "$XBPS_TARGET_MACHINE" in
 	i686-musl|x86_64-musl) ;;
diff --git a/srcpkgs/gnome-tetravex/template b/srcpkgs/gnome-tetravex/template
index ff11bb618f4..d2e2be6ccf3 100644
--- a/srcpkgs/gnome-tetravex/template
+++ b/srcpkgs/gnome-tetravex/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-tetravex'
 pkgname=gnome-tetravex
-version=3.32.0
+version=3.34.1
 revision=1
 build_style=meson
 hostmakedepends="itstool pkg-config vala glib-devel"
@@ -10,4 +10,4 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Tetravex"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=544e702558d9d2a17e4f34b0db40ee728c1d83ad4761433bf7560a39c8edb9a1
+checksum=e06ddb08f810314553c7745c8476221a8b1425599f64388157ee4495baf12916
diff --git a/srcpkgs/gnome-todo/patches/6cdabc4dd0c6c804a093b94c269461ce376fed4f.patch b/srcpkgs/gnome-todo/patches/6cdabc4dd0c6c804a093b94c269461ce376fed4f.patch
deleted file mode 100644
index d7a5f123bb3..00000000000
--- a/srcpkgs/gnome-todo/patches/6cdabc4dd0c6c804a093b94c269461ce376fed4f.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Upstream: yes
-From 6cdabc4dd0c6c804a093b94c269461ce376fed4f Mon Sep 17 00:00:00 2001
-From: Emmanuele Bassi <ebassi@gnome.org>
-Date: Mon, 21 Jan 2019 10:47:09 +0000
-Subject: [PATCH] Drop the autoptr definition for ESource
-
-Evolution-data-server includes the autoptr definition for ESource.
-
-See: GNOME/evolution-data-server#73
-
-Without this change, GNOME Todo does not build on the Continuous CI
-infrastructure.
-
-Signed-off-by: Emmanuele Bassi <ebassi@gnome.org>
----
- plugins/eds/gtd-eds-autoptr.h | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/plugins/eds/gtd-eds-autoptr.h b/plugins/eds/gtd-eds-autoptr.h
-index eb9b011..42709ee 100644
---- plugins/eds/gtd-eds-autoptr.h
-+++ plugins/eds/gtd-eds-autoptr.h
-@@ -25,4 +25,3 @@
- G_DEFINE_AUTOPTR_CLEANUP_FUNC (ECalComponent, g_object_unref);
- G_DEFINE_AUTOPTR_CLEANUP_FUNC (ECalComponentId, e_cal_component_free_id);
- G_DEFINE_AUTOPTR_CLEANUP_FUNC (ECalClient, g_object_unref);
--G_DEFINE_AUTOPTR_CLEANUP_FUNC (ESource, g_object_unref);
--- 
-2.18.1
-
diff --git a/srcpkgs/gnome-todo/patches/gnome-todo-eds-libecal-2.0.patch b/srcpkgs/gnome-todo/patches/gnome-todo-eds-libecal-2.0.patch
new file mode 100644
index 00000000000..549c3ce9c4a
--- /dev/null
+++ b/srcpkgs/gnome-todo/patches/gnome-todo-eds-libecal-2.0.patch
@@ -0,0 +1,567 @@
+diff --git a/plugins/eds/gtd-eds-autoptr.h b/plugins/eds/gtd-eds-autoptr.h
+index eb9b011..78bd944 100644
+--- a/plugins/eds/gtd-eds-autoptr.h
++++ b/plugins/eds/gtd-eds-autoptr.h
+@@ -23,6 +23,5 @@
+ #include <libecal/libecal.h>
+ 
+ G_DEFINE_AUTOPTR_CLEANUP_FUNC (ECalComponent, g_object_unref);
+-G_DEFINE_AUTOPTR_CLEANUP_FUNC (ECalComponentId, e_cal_component_free_id);
++G_DEFINE_AUTOPTR_CLEANUP_FUNC (ECalComponentId, e_cal_component_id_free);
+ G_DEFINE_AUTOPTR_CLEANUP_FUNC (ECalClient, g_object_unref);
+-G_DEFINE_AUTOPTR_CLEANUP_FUNC (ESource, g_object_unref);
+diff --git a/plugins/eds/gtd-provider-eds.c b/plugins/eds/gtd-provider-eds.c
+index a403226..def4235 100644
+--- a/plugins/eds/gtd-provider-eds.c
++++ b/plugins/eds/gtd-provider-eds.c
+@@ -554,6 +554,7 @@ gtd_provider_eds_create_task (GtdProvider *provider,
+ 
+   e_cal_client_create_object (client,
+                               e_cal_component_get_icalcomponent (component),
++                              E_CAL_OPERATION_FLAG_NONE,
+                               NULL,
+                               (GAsyncReadyCallback) on_task_created_cb,
+                               new_task);
+@@ -587,6 +588,7 @@ gtd_provider_eds_update_task (GtdProvider *provider,
+   e_cal_client_modify_object (client,
+                               e_cal_component_get_icalcomponent (component),
+                               E_CAL_OBJ_MOD_THIS,
++                              E_CAL_OPERATION_FLAG_NONE,
+                               NULL,
+                               (GAsyncReadyCallback) on_task_modified_cb,
+                               task);
+@@ -616,9 +618,10 @@ gtd_provider_eds_remove_task (GtdProvider *provider,
+   gtd_object_push_loading (GTD_OBJECT (provider));
+ 
+   e_cal_client_remove_object (client,
+-                              id->uid,
+-                              id->rid,
++                              e_cal_component_id_get_uid (id),
++                              e_cal_component_id_get_rid (id),
+                               E_CAL_OBJ_MOD_THIS,
++                              E_CAL_OPERATION_FLAG_NONE,
+                               NULL,
+                               (GAsyncReadyCallback) on_task_removed_cb,
+                               provider);
+diff --git a/plugins/eds/gtd-task-eds.c b/plugins/eds/gtd-task-eds.c
+index 2c8cd8e..bd8f7ac 100644
+--- a/plugins/eds/gtd-task-eds.c
++++ b/plugins/eds/gtd-task-eds.c
+@@ -46,19 +46,19 @@ static GParamSpec *properties [N_PROPS];
+  */
+ 
+ static GDateTime*
+-convert_icaltime (const icaltimetype *date)
++convert_icaltime (const ICalTime *date)
+ {
+   GDateTime *dt;
+ 
+   if (!date)
+     return NULL;
+ 
+-  dt = g_date_time_new_utc (date->year,
+-                            date->month,
+-                            date->day,
+-                            date->is_date ? 0 : date->hour,
+-                            date->is_date ? 0 : date->minute,
+-                            date->is_date ? 0 : date->second);
++  dt = g_date_time_new_utc (i_cal_time_get_year (date),
++                            i_cal_time_get_month (date),
++                            i_cal_time_get_day (date),
++                            i_cal_time_is_date (date) ? 0 : i_cal_time_get_hour (date),
++                            i_cal_time_is_date (date) ? 0 : i_cal_time_get_minute (date),
++                            i_cal_time_is_date (date) ? 0 : i_cal_time_get_second (date));
+ 
+   return dt;
+ }
+@@ -67,19 +67,20 @@ static void
+ set_description (GtdTaskEds  *self,
+                  const gchar *description)
+ {
+-  ECalComponentText text;
++  ECalComponentText *text;
+   GSList note;
+ 
+-  text.value = description && *description ? description : "";
+-  text.altrep = NULL;
++  text = e_cal_component_text_new (description ? description : "", NULL);
+ 
+-  note.data = &text;
++  note.data = text;
+   note.next = NULL;
+ 
+   g_clear_pointer (&self->description, g_free);
+   self->description = g_strdup (description);
+ 
+-  e_cal_component_set_description_list (self->component, &note);
++  e_cal_component_set_descriptions (self->component, (description && *description) ? &note : NULL);
++
++  e_cal_component_text_free (text);
+ }
+ 
+ static void
+@@ -90,7 +91,7 @@ setup_description (GtdTaskEds *self)
+   GSList *l;
+ 
+   /* concatenates the multiple descriptions a task may have */
+-  e_cal_component_get_description_list (self->component, &text_list);
++  text_list = e_cal_component_get_descriptions (self->component);
+ 
+   for (l = text_list; l != NULL; l = l->next)
+     {
+@@ -105,21 +106,21 @@ setup_description (GtdTaskEds *self)
+             {
+               carrier = g_strconcat (desc,
+                                      "\n",
+-                                     text->value,
++                                     e_cal_component_text_get_value (text),
+                                      NULL);
+               g_free (desc);
+               desc = carrier;
+             }
+           else
+             {
+-              desc = g_strdup (text->value);
++              desc = g_strdup (e_cal_component_text_get_value (text));
+             }
+         }
+     }
+ 
+   set_description (self, desc);
+ 
+-  e_cal_component_free_text_list (text_list);
++  g_slist_free_full (text_list, e_cal_component_text_free);
+ }
+ 
+ 
+@@ -138,7 +139,7 @@ gtd_task_eds_get_uid (GtdObject *object)
+   self = GTD_TASK_EDS (object);
+ 
+   if (self->component)
+-    e_cal_component_get_uid (self->component, &uid);
++    uid = e_cal_component_get_uid (self->component);
+   else
+     uid = NULL;
+ 
+@@ -159,7 +160,7 @@ gtd_task_eds_set_uid (GtdObject   *object,
+   if (!self->component)
+     return;
+ 
+-  e_cal_component_get_uid (self->component, &current_uid);
++  current_uid = e_cal_component_get_uid (self->component);
+ 
+   if (g_strcmp0 (current_uid, uid) != 0)
+     {
+@@ -177,7 +178,7 @@ gtd_task_eds_set_uid (GtdObject   *object,
+ static gboolean
+ gtd_task_eds_get_complete (GtdTask *task)
+ {
+-  icalproperty_status status;
++  ICalPropertyStatus status;
+   GtdTaskEds *self;
+   gboolean completed;
+ 
+@@ -185,8 +186,8 @@ gtd_task_eds_get_complete (GtdTask *task)
+ 
+   self = GTD_TASK_EDS (task);
+ 
+-  e_cal_component_get_status (self->component, &status);
+-  completed = status == ICAL_STATUS_COMPLETED;
++  status = e_cal_component_get_status (self->component);
++  completed = status == I_CAL_STATUS_COMPLETED;
+ 
+   return completed;
+ }
+@@ -195,8 +196,8 @@ static void
+ gtd_task_eds_set_complete (GtdTask  *task,
+                            gboolean  complete)
+ {
+-  icalproperty_status status;
+-  icaltimetype *dt;
++  ICalPropertyStatus status;
++  ICalTime *dt;
+   GtdTaskEds *self;
+   gint percent;
+ 
+@@ -209,54 +210,54 @@ gtd_task_eds_set_complete (GtdTask  *task,
+       percent = 100;
+       status = ICAL_STATUS_COMPLETED;
+ 
+-      dt = g_new0 (icaltimetype, 1);
+-      dt->year = g_date_time_get_year (now);
+-      dt->month = g_date_time_get_month (now);
+-      dt->day = g_date_time_get_day_of_month (now);
+-      dt->hour = g_date_time_get_hour (now);
+-      dt->minute = g_date_time_get_minute (now);
+-      dt->second = g_date_time_get_seconds (now);
+-      dt->zone = icaltimezone_get_utc_timezone ();
++      dt = i_cal_time_new_null_time ();
++      i_cal_time_set_date (dt,
++                           g_date_time_get_year (now),
++                           g_date_time_get_month (now),
++                           g_date_time_get_day_of_month (now));
++      i_cal_time_set_time (dt,
++                           g_date_time_get_hour (now),
++                           g_date_time_get_minute (now),
++                           g_date_time_get_seconds (now));
++      i_cal_time_set_timezone (dt, i_cal_timezone_get_utc_timezone ());
+ 
+       /* convert timezone
+        *
+        * FIXME: This does not do anything until we have an ical
+        * timezone associated with the task
+        */
+-      icaltimezone_convert_time (dt, NULL, icaltimezone_get_utc_timezone ());
++      i_cal_time_convert_timezone (dt, NULL, i_cal_timezone_get_utc_timezone ());
+     }
+   else
+     {
+       dt = NULL;
+       percent = 0;
+-      status = ICAL_STATUS_NEEDSACTION;
++      status = I_CAL_STATUS_NEEDSACTION;
+     }
+ 
+-  e_cal_component_set_percent_as_int (self->component, percent);
++  e_cal_component_set_percent_complete (self->component, percent);
+   e_cal_component_set_status (self->component, status);
+   e_cal_component_set_completed (self->component, dt);
+ 
+-  if (dt)
+-    e_cal_component_free_icaltimetype (dt);
++  g_clear_object (&dt);
+ }
+ 
+ static GDateTime*
+ gtd_task_eds_get_creation_date (GtdTask *task)
+ {
+-  icaltimetype *idt;
++  ICalTime *idt;
+   GtdTaskEds *self;
+   GDateTime *dt;
+ 
+   self = GTD_TASK_EDS (task);
+-  idt = NULL;
+   dt = NULL;
+ 
+-  e_cal_component_get_created (self->component, &idt);
++  idt = e_cal_component_get_created (self->component);
+ 
+   if (idt)
+     dt = convert_icaltime (idt);
+ 
+-  g_clear_pointer (&idt, e_cal_component_free_icaltimetype);
++  g_clear_object (&idt);
+ 
+   return dt;
+ }
+@@ -286,7 +287,7 @@ gtd_task_eds_set_description (GtdTask     *task,
+ static GDateTime*
+ gtd_task_eds_get_due_date (GtdTask *task)
+ {
+-  ECalComponentDateTime comp_dt;
++  ECalComponentDateTime *comp_dt;
+   GtdTaskEds *self;
+   GDateTime *date;
+ 
+@@ -294,10 +295,12 @@ gtd_task_eds_get_due_date (GtdTask *task)
+ 
+   self = GTD_TASK_EDS (task);
+ 
+-  e_cal_component_get_due (self->component, &comp_dt);
++  comp_dt = e_cal_component_get_due (self->component);
++  if (!comp_dt)
++    return NULL;
+ 
+-  date = convert_icaltime (comp_dt.value);
+-  e_cal_component_free_datetime (&comp_dt);
++  date = convert_icaltime (e_cal_component_datetime_get_value (comp_dt));
++  e_cal_component_datetime_free (comp_dt);
+ 
+   return date;
+ }
+@@ -317,11 +320,10 @@ gtd_task_eds_set_due_date (GtdTask   *task,
+ 
+   if (dt != current_dt)
+     {
+-      ECalComponentDateTime comp_dt;
+-      icaltimetype *idt;
++      ECalComponentDateTime *comp_dt;
++      ICalTime *idt;
+ 
+-      comp_dt.value = NULL;
+-      comp_dt.tzid = NULL;
++      comp_dt = NULL;
+       idt = NULL;
+ 
+       if (!current_dt ||
+@@ -329,36 +331,34 @@ gtd_task_eds_set_due_date (GtdTask   *task,
+            dt &&
+            g_date_time_compare (current_dt, dt) != 0))
+         {
+-          idt = g_new0 (icaltimetype, 1);
++          idt = i_cal_time_new_null_time ();
+ 
+           g_date_time_ref (dt);
+ 
+           /* Copy the given dt */
+-          idt->year = g_date_time_get_year (dt);
+-          idt->month = g_date_time_get_month (dt);
+-          idt->day = g_date_time_get_day_of_month (dt);
+-          idt->hour = g_date_time_get_hour (dt);
+-          idt->minute = g_date_time_get_minute (dt);
+-          idt->second = g_date_time_get_seconds (dt);
+-          idt->is_date = (idt->hour == 0 &&
+-                          idt->minute == 0 &&
+-                          idt->second == 0);
+-
+-          comp_dt.tzid = g_strdup ("UTC");
++          i_cal_time_set_date (idt,
++                               g_date_time_get_year (dt),
++                               g_date_time_get_month (dt),
++                               g_date_time_get_day_of_month (dt));
++          i_cal_time_set_time (idt,
++                               g_date_time_get_hour (dt),
++                               g_date_time_get_minute (dt),
++                               g_date_time_get_seconds (dt));
++          i_cal_time_set_is_date (idt,
++                          i_cal_time_get_hour (idt) == 0 &&
++                          i_cal_time_get_minute (idt) == 0 &&
++                          i_cal_time_get_second (idt) == 0);
+ 
+-          comp_dt.value = idt;
++          comp_dt = e_cal_component_datetime_new_take (idt, g_strdup ("UTC"));
+ 
+-          e_cal_component_set_due (self->component, &comp_dt);
++          e_cal_component_set_due (self->component, comp_dt);
+ 
+-          e_cal_component_free_datetime (&comp_dt);
++          e_cal_component_datetime_free (comp_dt);
+ 
+           g_date_time_unref (dt);
+         }
+       else if (!dt)
+         {
+-          idt = NULL;
+-          comp_dt.tzid = NULL;
+-
+           e_cal_component_set_due (self->component, NULL);
+         }
+     }
+@@ -369,19 +369,13 @@ gtd_task_eds_set_due_date (GtdTask   *task,
+ static gint32
+ gtd_task_eds_get_priority (GtdTask *task)
+ {
+-  g_autofree gint *priority = NULL;
+   GtdTaskEds *self;
+ 
+   g_assert (GTD_IS_TASK_EDS (task));
+ 
+   self = GTD_TASK_EDS (task);
+ 
+-  e_cal_component_get_priority (self->component, &priority);
+-
+-  if (!priority)
+-    return -1;
+-
+-  return *priority;
++  return e_cal_component_get_priority (self->component);
+ }
+ 
+ static void
+@@ -394,29 +388,26 @@ gtd_task_eds_set_priority (GtdTask *task,
+ 
+   self = GTD_TASK_EDS (task);
+ 
+-  e_cal_component_set_priority (self->component, &priority);
++  e_cal_component_set_priority (self->component, priority);
+ }
+ 
+ static const gchar*
+ gtd_task_eds_get_title (GtdTask *task)
+ {
+-  ECalComponentText summary;
+   GtdTaskEds *self;
+ 
+   g_return_val_if_fail (GTD_IS_TASK_EDS (task), NULL);
+ 
+   self = GTD_TASK_EDS (task);
+ 
+-  e_cal_component_get_summary (self->component, &summary);
+-
+-  return summary.value;
++  return i_cal_component_get_summary (e_cal_component_get_icalcomponent (self->component));
+ }
+ 
+ static void
+ gtd_task_eds_set_title (GtdTask     *task,
+                         const gchar *title)
+ {
+-  ECalComponentText new_summary;
++  ECalComponentText *new_summary;
+   GtdTaskEds *self;
+ 
+   g_return_if_fail (GTD_IS_TASK_EDS (task));
+@@ -424,10 +415,11 @@ gtd_task_eds_set_title (GtdTask     *task,
+ 
+   self = GTD_TASK_EDS (task);
+ 
+-  new_summary.value = title;
+-  new_summary.altrep = NULL;
++  new_summary = e_cal_component_text_new (title, NULL);
+ 
+-  e_cal_component_set_summary (self->component, &new_summary);
++  e_cal_component_set_summary (self->component, new_summary);
++
++  e_cal_component_text_free (new_summary);
+ }
+ 
+ 
+@@ -436,10 +428,10 @@ gtd_task_eds_subtask_added (GtdTask *task,
+                             GtdTask *subtask)
+ {
+   g_autoptr (GList) subtasks = NULL;
+-  ECalComponentId *id;
++  const gchar *uid;
+   ECalComponent *comp;
+-  icalcomponent *ical_comp;
+-  icalproperty *property;
++  ICalComponent *ical_comp;
++  ICalProperty *property;
+   GtdTaskEds *subtask_self;
+   GtdTaskEds *self;
+ 
+@@ -450,17 +442,17 @@ gtd_task_eds_subtask_added (GtdTask *task,
+   /* Hook with parent's :subtask_added */
+   GTD_TASK_CLASS (gtd_task_eds_parent_class)->subtask_added (task, subtask);
+ 
+-  id = e_cal_component_get_id (self->component);
++  uid = e_cal_component_get_uid (self->component);
+   comp = subtask_self->component;
+   ical_comp = e_cal_component_get_icalcomponent (comp);
+-  property = icalcomponent_get_first_property (ical_comp, ICAL_RELATEDTO_PROPERTY);
++  property = i_cal_component_get_first_property (ical_comp, I_CAL_RELATEDTO_PROPERTY);
+ 
+   if (property)
+-    icalproperty_set_relatedto (property, id->uid);
++    i_cal_property_set_relatedto (property, uid);
+   else
+-    icalcomponent_add_property (ical_comp, icalproperty_new_relatedto (id->uid));
++    i_cal_component_take_property (ical_comp, i_cal_property_new_relatedto (uid));
+ 
+-  e_cal_component_free_id (id);
++  g_clear_object (&property);
+ }
+ 
+ static void
+@@ -468,8 +460,8 @@ gtd_task_eds_subtask_removed (GtdTask *task,
+                               GtdTask *subtask)
+ {
+   g_autoptr (GList) subtasks = NULL;
+-  icalcomponent *ical_comp;
+-  icalproperty *property;
++  ICalComponent *ical_comp;
++  ICalProperty *property;
+   GtdTaskEds *subtask_self;
+ 
+   subtask_self = GTD_TASK_EDS (subtask);
+@@ -480,12 +472,13 @@ gtd_task_eds_subtask_removed (GtdTask *task,
+ 
+   /* Remove the parent link from the subtask's component */
+   ical_comp = e_cal_component_get_icalcomponent (subtask_self->component);
+-  property = icalcomponent_get_first_property (ical_comp, ICAL_RELATEDTO_PROPERTY);
++  property = i_cal_component_get_first_property (ical_comp, I_CAL_RELATEDTO_PROPERTY);
+ 
+   if (!property)
+     return;
+ 
+-  icalcomponent_remove_property (ical_comp, property);
++  i_cal_component_remove_property (ical_comp, property);
++  g_object_unref (property);
+ }
+ 
+ 
+diff --git a/plugins/eds/gtd-task-list-eds.c b/plugins/eds/gtd-task-list-eds.c
+index eb48a73..5b71718 100644
+--- a/plugins/eds/gtd-task-list-eds.c
++++ b/plugins/eds/gtd-task-list-eds.c
+@@ -85,19 +85,19 @@ setup_parent_task (GtdTaskListEds *self,
+                    GtdTask        *task)
+ {
+   ECalComponent *component;
+-  icalcomponent *ical_comp;
+-  icalproperty *property;
++  ICalComponent *ical_comp;
++  ICalProperty *property;
+   GtdTask *parent_task;
+   const gchar *parent_uid;
+ 
+   component = gtd_task_eds_get_component (GTD_TASK_EDS (task));
+   ical_comp = e_cal_component_get_icalcomponent (component);
+-  property = icalcomponent_get_first_property (ical_comp, ICAL_RELATEDTO_PROPERTY);
++  property = i_cal_component_get_first_property (ical_comp, I_CAL_RELATEDTO_PROPERTY);
+ 
+   if (!property)
+     return;
+ 
+-  parent_uid = icalproperty_get_relatedto (property);
++  parent_uid = i_cal_property_get_relatedto (property);
+   parent_task = gtd_task_list_get_task_by_id (GTD_TASK_LIST (self), parent_uid);
+ 
+   if (parent_task)
+@@ -112,6 +112,8 @@ setup_parent_task (GtdTaskListEds *self,
+ 
+       g_ptr_array_add (self->pending_subtasks, data);
+     }
++
++  g_object_unref (property);
+ }
+ 
+ static void
+@@ -161,8 +163,8 @@ on_view_objects_added_cb (ECalClientView *view,
+       GtdTask *task;
+       const gchar *uid;
+ 
+-      component = e_cal_component_new_from_string (icalcomponent_as_ical_string (l->data));
+-      e_cal_component_get_uid (component, &uid);
++      component = e_cal_component_new_from_icalcomponent (i_cal_component_clone (l->data));
++      uid = e_cal_component_get_uid (component);
+ 
+       task = gtd_task_list_get_task_by_id (self, uid);
+ 
+@@ -211,8 +213,8 @@ on_view_objects_modified_cb (ECalClientView *view,
+       GtdTask *task;
+       const gchar *uid;
+ 
+-      component = e_cal_component_new_from_string (icalcomponent_as_ical_string (l->data));
+-      e_cal_component_get_uid (component, &uid);
++      component = e_cal_component_new_from_icalcomponent (i_cal_component_clone (l->data));
++      uid = e_cal_component_get_uid (component);
+ 
+       task = gtd_task_list_get_task_by_id (self, uid);
+ 
+@@ -244,7 +246,7 @@ on_view_objects_removed_cb (ECalClientView *view,
+       GtdTask *task;
+ 
+       id = l->data;
+-      task = gtd_task_list_get_task_by_id (self, id->uid);
++      task = gtd_task_list_get_task_by_id (self, e_cal_component_id_get_uid (id));
+ 
+       if (!task)
+         continue;
+diff --git a/plugins/eds/meson.build b/plugins/eds/meson.build
+index ea84426..b37f0c6 100644
+--- a/plugins/eds/meson.build
++++ b/plugins/eds/meson.build
+@@ -8,10 +8,9 @@ plugins_ldflags += ['-Wl,--undefined=gtd_plugin_eds_register_types']
+ ################
+ 
+ eds_plugin_deps = [
+-  dependency('libecal-1.2', version: '>= 3.13.90'),
++  dependency('libecal-2.0', version: '>= 3.33.1'),
+   dependency('libedataserver-1.2', version: '>= 3.17.1'),
+   dependency('libedataserverui-1.2', version: '>= 3.17.1'),
+-  dependency('libical', version: '>= 0.43'),
+ ]
+ 
+ eds_plugin_deps += gnome_todo_deps
diff --git a/srcpkgs/gnome-todo/template b/srcpkgs/gnome-todo/template
index 16cb152ff9c..1ab0a81432d 100644
--- a/srcpkgs/gnome-todo/template
+++ b/srcpkgs/gnome-todo/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-todo'
 pkgname=gnome-todo
 version=3.28.1
-revision=4
+revision=5
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir true false)"
@@ -14,7 +14,11 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Todo"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=c7571fc040d8901dd0e528282ef0655687f23f29d304057c72548ab3e2c2cf23
-nocross="https://build.voidlinux.org/builders/aarch64_builder/builds/19471/steps/shell_3/logs/stdio"
+patch_args="-Np1"
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qemu-user-static"
+fi
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/gnome-tweaks/template b/srcpkgs/gnome-tweaks/template
index ff9d1828c60..ac1f8bdb873 100644
--- a/srcpkgs/gnome-tweaks/template
+++ b/srcpkgs/gnome-tweaks/template
@@ -1,17 +1,17 @@
 # Template file for 'gnome-tweaks'
 pkgname=gnome-tweaks
-version=3.32.0
-revision=1
+version=3.34.0
+revision=2
 archs=noarch
 build_style=meson
 pycompile_module="gtweak"
-depends="gtk+3 dconf gnome-settings-daemon mutter libnotify python3-gobject"
+depends="gtk+3 dconf gnome-settings-daemon mutter libnotify python3-gobject libhandy"
 short_desc="GNOME3 tool to customize advanced options"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later, CC0-1.0"
 homepage="https://wiki.gnome.org/Apps/Tweaks"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a54061b2c9150567ff22874c0c3a9e36c04ab6b0093b738c662e92c15919f90c
+checksum=003326fab46e6faad9485924bca503f0c583e3b4553d6f673406eda396205250
 nocross=yes
 replaces="gnome-tweak-tool>=0"
 
diff --git a/srcpkgs/gnome-user-docs/template b/srcpkgs/gnome-user-docs/template
index 9d96116ae29..431c54f3934 100644
--- a/srcpkgs/gnome-user-docs/template
+++ b/srcpkgs/gnome-user-docs/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-user-docs'
 pkgname=gnome-user-docs
-version=3.32.3
+version=3.34.0
 revision=1
 archs=noarch
 build_style=gnu-configure
@@ -13,4 +13,4 @@ license="CC-BY-3.0"
 homepage="https://github.com/GNOME/gnome-user-docs"
 #changelog="https://raw.githubusercontent.com/GNOME/gnome-user-docs/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2fc2b50dcdb0ae49dd9a4f9d8bd993efe840ec0dbb910cb03f2ea3d728a07a37
+checksum=8f9907ff15fff97da75ece645cc86766703ac54d716d25563ba67ffed1af24ed
diff --git a/srcpkgs/gnu-efi-libs/template b/srcpkgs/gnu-efi-libs/template
index 80bed8b52f6..1d6e1e057e9 100644
--- a/srcpkgs/gnu-efi-libs/template
+++ b/srcpkgs/gnu-efi-libs/template
@@ -1,16 +1,16 @@
 # Template file for 'gnu-efi-libs'
 pkgname=gnu-efi-libs
 reverts="3.0w_1" # Not an actual revert, xbps considers 3.0w higher than 3.0.8
-version=3.0.9
-revision=2
+version=3.0.10
+revision=1
 wrksrc="gnu-efi-${version}"
 makedepends="pciutils-devel"
 short_desc="Library for building UEFI Applications using GNU toolchain"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://sourceforge.net/projects/gnu-efi/"
 distfiles="${SOURCEFORGE_SITE}/gnu-efi/gnu-efi-${version}.tar.bz2"
-checksum=6715ea7eae1c7e4fc5041034bd3f107ec2911962ed284a081e491646b12277f0
+checksum=f12082a3a5f0c3e38c67262a9f34245d139ac2cdfc0a0bdcf03c9b1f56fa4fed
 nostrip=yes
 
 # If we are cross-building we need to pass the cross-compilation triplet
diff --git a/srcpkgs/gnucash/template b/srcpkgs/gnucash/template
index cd02e38eb44..68bb811fc42 100644
--- a/srcpkgs/gnucash/template
+++ b/srcpkgs/gnucash/template
@@ -1,7 +1,7 @@
 # Template file for 'gnucash'
 pkgname=gnucash
-version=3.6
-revision=2
+version=3.7
+revision=1
 build_style=cmake
 configure_args="-DWITH_SQL=0 -DWITH_PYTHON=1"
 hostmakedepends="pkg-config guile python3 libxslt perl"
@@ -14,7 +14,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://www.gnucash.org"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=f1cb86de60bb0eb2cf5c2c3868e7dab7d889017e233230f944f158f84eb85f25
+checksum=6b8eb09f3980531509bcb3a589ab0334d827c32f860ce8a209aa2fe0ed8858b4
 
 pycompile_module="gnucash"
 pycompile_dirs="usr/share/gnucash/python"
diff --git a/srcpkgs/gnumeric/template b/srcpkgs/gnumeric/template
index ae54b7b997a..bd198be684a 100644
--- a/srcpkgs/gnumeric/template
+++ b/srcpkgs/gnumeric/template
@@ -1,7 +1,7 @@
 # Template file for 'gnumeric'
 pkgname=gnumeric
 version=1.12.45
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="bison gdk-pixbuf-devel glib-devel intltool itstool pkg-config "
 makedepends="goffice-devel librsvg-devel libxslt-devel"
diff --git a/srcpkgs/gnupg2/patches/use-versioned-pcsclite.patch b/srcpkgs/gnupg2/patches/use-versioned-pcsclite.patch
new file mode 100644
index 00000000000..0f12e5f446f
--- /dev/null
+++ b/srcpkgs/gnupg2/patches/use-versioned-pcsclite.patch
@@ -0,0 +1,11 @@
+--- scd/scdaemon.c.orig	2019-09-29 12:18:47.810111976 +0700
++++ scd/scdaemon.c	2019-09-29 12:20:38.079117234 +0700
+@@ -189,7 +189,7 @@
+ #define DEFAULT_PCSC_DRIVER "winscard.dll"
+ #elif defined(__APPLE__)
+ #define DEFAULT_PCSC_DRIVER "/System/Library/Frameworks/PCSC.framework/PCSC"
+-#elif defined(__GLIBC__)
++#elif defined(__linux__)
+ #define DEFAULT_PCSC_DRIVER "libpcsclite.so.1"
+ #else
+ #define DEFAULT_PCSC_DRIVER "libpcsclite.so"
diff --git a/srcpkgs/gnupg2/template b/srcpkgs/gnupg2/template
index 2d8b288a3e8..7b8037886bc 100644
--- a/srcpkgs/gnupg2/template
+++ b/srcpkgs/gnupg2/template
@@ -1,22 +1,25 @@
 # Template file for 'gnupg2'
 pkgname=gnupg2
 version=2.2.17
-revision=1
+revision=3
 wrksrc="gnupg-${version}"
 build_style=gnu-configure
 configure_args="--with-libgcrypt-prefix=${XBPS_CROSS_BASE}
  --with-ksba-prefix=${XBPS_CROSS_BASE} --with-npth-prefix=${XBPS_CROSS_BASE}
- --with-libassuan-prefix=${XBPS_CROSS_BASE} --enable-gpg-is-gpg2"
+ --with-libassuan-prefix=${XBPS_CROSS_BASE} --enable-gpg-is-gpg2
+ $(vopt_enable ldap)"
 hostmakedepends="pkg-config"
 makedepends="bzip2-devel gnutls-devel libassuan-devel libcurl-devel
  libksba-devel libldap-devel libusb-compat-devel npth-devel sqlite-devel"
 depends="pinentry"
 short_desc="GNU Privacy Guard (2.x)"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnupg.org/"
 distfiles="https://gnupg.org/ftp/gcrypt/gnupg/gnupg-${version}.tar.bz2"
 checksum=afa262868e39b651a2db4c071fba90415154243e83a830ca00516f9a807fd514
+build_options="ldap"
+build_options_default="ldap"
 
 pre_configure() {
 	vsed -i '/examples\/systemd-user/d' doc/Makefile.in
diff --git a/srcpkgs/gnutls/template b/srcpkgs/gnutls/template
index 88f0bb3e6df..d4b9123540b 100644
--- a/srcpkgs/gnutls/template
+++ b/srcpkgs/gnutls/template
@@ -1,10 +1,11 @@
 # Template file for 'gnutls'
 pkgname=gnutls
-version=3.6.9
+version=3.6.10
 revision=1
 build_style=gnu-configure
 configure_args="--with-zlib --disable-guile --disable-static
- --disable-valgrind-tests --disable-rpath"
+ --disable-valgrind-tests --disable-rpath
+ --with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt"
 hostmakedepends="gettext-devel pkg-config libtool"
 # add autogen when #6550 is solved
 makedepends="zlib-devel lzo-devel readline-devel libgpg-error-devel
@@ -15,7 +16,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only, LGPL-2.1-or-later"
 homepage="https://gnutls.org"
 distfiles="https://www.gnupg.org/ftp/gcrypt/gnutls/v${version%.*}/gnutls-${version}.tar.xz"
-checksum=4331fca55817ecdd74450b908a6c29b4f05bb24dd13144c6284aa34d872e1fcb
+checksum=b1f3ca67673b05b746a961acf2243eaae0ffe658b6a6494265c648e7c7812293
 
 gnutls-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/go-for-it/template b/srcpkgs/go-for-it/template
index 87e86aa98cc..daa46e150b2 100644
--- a/srcpkgs/go-for-it/template
+++ b/srcpkgs/go-for-it/template
@@ -1,6 +1,6 @@
 # Template file for 'go-for-it'
 pkgname=go-for-it
-version=1.7.2
+version=1.7.3
 revision=1
 wrksrc="Go-For-It-${version}"
 build_style=cmake
@@ -11,4 +11,4 @@ maintainer="Piraty <piraty1@inbox.ru>"
 license="GPL-3.0-only"
 homepage="https://github.com/JMoerman/Go-For-It"
 distfiles="https://github.com/JMoerman/Go-For-It/archive/${version}.tar.gz"
-checksum=446a461b148e7df2ed81f1340adba0181ba1f0f698c0b7b539223a2ee5aa54f6
+checksum=582ec27876dbfdab71c5fc681a74c3e4f5a4d0d73cd634a0c5db64e5c4c51ea7
diff --git a/srcpkgs/go-jira/template b/srcpkgs/go-jira/template
index 537d365eca8..fc3668fa323 100644
--- a/srcpkgs/go-jira/template
+++ b/srcpkgs/go-jira/template
@@ -1,25 +1,15 @@
 # Template file for 'go-jira'
 pkgname=go-jira
-version=1.0.20
-revision=2
+version=1.0.21
+revision=1
+wrksrc="jira-${version}"
 build_style=go
+go_import_path="github.com/go-jira/jira"
+go_package="$go_import_path/cmd/jira"
 hostmakedepends="dep"
 short_desc="Simple jira command line client in Go"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="Apache"
-go_import_path="github.com/Netflix-Skunkworks/go-jira"
-go_package="$go_import_path/cmd/jira"
+license="Apache-2.0"
 homepage="https://$go_import_path"
 distfiles="$homepage/archive/v$version.tar.gz"
-checksum=0adf6d68e4a0700578706d9707dab633db8ee336151ce4232de93c7332459c45
-
-pre_build() {
-	git config --global http.https://gopkg.in.followRedirects true
-
-	cd $GOSRCPATH
-	dep ensure
-}
-
-post_install() {
-	vlicense LICENSE
-}
+checksum=c76089423fc0d4b9dcdd39822d6d94452136f8f24b8c17ec75b0e702e40fbcc2
diff --git a/srcpkgs/go-md2man/template b/srcpkgs/go-md2man/template
index e2cbc9a0073..c19f0817804 100644
--- a/srcpkgs/go-md2man/template
+++ b/srcpkgs/go-md2man/template
@@ -6,7 +6,7 @@ build_style=go
 go_import_path=github.com/cpuguy83/go-md2man
 hostmakedepends="git"
 short_desc="Convert md to manpages"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://${go_import_path}"
 distfiles="https://github.com/cpuguy83/go-md2man/archive/v${version}.tar.gz"
diff --git a/srcpkgs/go-review/template b/srcpkgs/go-review/template
new file mode 100644
index 00000000000..01cd9d00848
--- /dev/null
+++ b/srcpkgs/go-review/template
@@ -0,0 +1,18 @@
+# Template file for 'go-review'
+pkgname=go-review
+version=0.3.1
+revision=1
+build_style=go
+go_import_path="github.com/heppu/go-review"
+go_package="${go_import_path}/cmd/${pkgname}"
+hostmakedepends="git"
+short_desc="Publish reports from different Go linters as gerrit reviews"
+maintainer="Renato Aguiar <renato@renag.me>"
+license="MIT"
+homepage="https://github.com/heppu/go-review"
+distfiles="https://github.com/heppu/go-review/archive/v${version}.tar.gz"
+checksum=284eea5ec9184f169454de1f15a64beafd774653852d3e952171d9850651a553
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/go/patches/gohostarch-bootstrap-fix.patch b/srcpkgs/go/patches/gohostarch-bootstrap-fix.patch
new file mode 100644
index 00000000000..7791b92abe7
--- /dev/null
+++ b/srcpkgs/go/patches/gohostarch-bootstrap-fix.patch
@@ -0,0 +1,28 @@
+From e1b1b7856f416ca6ff086adc00adc89fd900992c Mon Sep 17 00:00:00 2001
+From: Brad Fitzpatrick <bradfitz@golang.org>
+Date: Thu, 26 Sep 2019 19:04:00 +0000
+Subject: [PATCH] cmd/dist: fix bootstrap failure when GOHOSTARCH is set
+
+Fixes #33977
+
+Change-Id: I4b136788f08b08c53087af8d3cd56125e620b51b
+Reviewed-on: https://go-review.googlesource.com/c/go/+/197602
+Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
+TryBot-Result: Gobot Gobot <gobot@golang.org>
+Reviewed-by: Cherry Zhang <cherryyz@google.com>
+---
+
+diff --git a/src/cmd/dist/buildtool.go b/src/cmd/dist/buildtool.go
+index f293891..f27ea17 100644
+--- go/src/cmd/dist/buildtool.go
++++ go/src/cmd/dist/buildtool.go
+@@ -250,6 +250,9 @@
+ 	archCaps = fileArch
+ 	fileArch = strings.ToLower(fileArch)
+ 	fileArch = strings.TrimSuffix(fileArch, "splitload")
++	if fileArch == os.Getenv("GOHOSTARCH") {
++		return "", false
++	}
+ 	if fileArch == strings.TrimSuffix(runtime.GOARCH, "le") {
+ 		return "", false
+ 	}
diff --git a/srcpkgs/go/template b/srcpkgs/go/template
index 683e651aa7a..f74f4c9a0ce 100644
--- a/srcpkgs/go/template
+++ b/srcpkgs/go/template
@@ -1,6 +1,6 @@
 # Template file for 'go'
 pkgname=go
-version=1.12.8
+version=1.13.1
 revision=1
 create_wrksrc=yes
 build_wrksrc=go
@@ -10,7 +10,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://golang.org/"
 distfiles="https://golang.org/dl/go${version}.src.tar.gz"
-checksum=11ad2e2e31ff63fcf8a2bdffbe9bfa2e1845653358daed593c8c2d03453c9898
+checksum=81f154e69544b9fa92b1475ff5f11e64270260d46e7e36c34aafc8bc96209358
 
 nostrip=yes
 noverifyrdeps=yes
diff --git a/srcpkgs/gocryptfs/template b/srcpkgs/gocryptfs/template
index 98b28535695..65172c644aa 100644
--- a/srcpkgs/gocryptfs/template
+++ b/srcpkgs/gocryptfs/template
@@ -1,7 +1,7 @@
 # Template file for 'gocryptfs'
 pkgname=gocryptfs
-version=1.7
-revision=2
+version=1.7.1
+revision=1
 wrksrc="${pkgname}_v${version}_src-deps"
 build_style=go
 go_import_path="github.com/rfjakob/gocryptfs"
@@ -14,7 +14,7 @@ license="MIT"
 homepage="https://nuetzlich.net/gocryptfs"
 changelog="https://github.com/rfjakob/gocryptfs#changelog"
 distfiles="https://github.com/rfjakob/${pkgname}/releases/download/v${version}/${pkgname}_v${version}_src-deps.tar.gz"
-checksum=2d1a2cfd072d554a28ee6e6807474b00ac710fb1aaf7aa81f3d8e94e80f6a703
+checksum=d3fc2c87b869025cd51e4abea030e58e7383197a7458f26bf99a71b224402bda
 
 post_install() {
 	vlicense $GOSRCPATH/LICENSE
diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index 8eb582bfb7c..25c7e41ffc8 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -1,7 +1,7 @@
 # Template file for 'godot'
 pkgname=godot
-version=3.1
-revision=2
+version=3.1.1
+revision=1
 wrksrc="${pkgname}-${version}-stable"
 build_style=scons
 # Godot contains private copies of libraries
@@ -16,7 +16,7 @@ maintainer="Nick Hahn <nick.hahn@hotmail.de>"
 license="MIT"
 homepage="https://www.godotengine.org/"
 distfiles="https://github.com/godotengine/${pkgname}/archive/${version}-stable.tar.gz"
-checksum=cd66354b2397f28193ba3add8d8cc5c3562775f662887b56f16de82974f041e3
+checksum=3d952cda12a43d71c53c508bc64ca82cc165a3345976b6d128f869d5bd7a61d2
 nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/6342/steps/shell_3/logs/stdio
 
 CFLAGS+=" -fPIE -fPIC"
diff --git a/srcpkgs/golangci-lint/template b/srcpkgs/golangci-lint/template
index fd6dc0df15c..c493e5b6534 100644
--- a/srcpkgs/golangci-lint/template
+++ b/srcpkgs/golangci-lint/template
@@ -1,6 +1,6 @@
 # Template file for 'golangci-lint'
 pkgname=golangci-lint
-version=1.17.1
+version=1.20.0
 revision=1
 build_style=go
 go_import_path=github.com/golangci/golangci-lint/cmd/golangci-lint
@@ -9,7 +9,7 @@ maintainer="Renato Aguiar <renato@renag.me>"
 license="GPL-3.0-only"
 homepage="https://github.com/golangci/golangci-lint"
 distfiles="https://github.com/golangci/golangci-lint/archive/v${version}.tar.gz"
-checksum=7e76e57cdd24b48e4bacc55575dd61e955789c705173f31994bccae894da1625
+checksum=9ea46fc1db83e7242c0188afd5e201b6a83afef9650de4e96ea8a60fddd93973
 
 post_install() {
 	vdoc README.md
diff --git a/srcpkgs/golly/template b/srcpkgs/golly/template
index ce2e403c661..3512fd71b72 100644
--- a/srcpkgs/golly/template
+++ b/srcpkgs/golly/template
@@ -1,7 +1,7 @@
 # Template file for 'golly'
 pkgname=golly
-version=3.2
-revision=4
+version=3.3
+revision=1
 wrksrc="${pkgname}-${version}-src"
 build_style=gnu-configure
 configure_script="gui-wx/configure/configure"
@@ -14,7 +14,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://golly.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-src.tar.gz"
-checksum=4d02f78592b5ea211f1ceda2d5ba55eb10e013ecf95b8a61c7061357f9aae931
+checksum=88fd776b1afd763ef32ac6e6d95ddfcbc51b74f6ef6a1f3ba9aa659295d573c8
 
 post_extract() {
 	# POSIX name clash
diff --git a/srcpkgs/gomatrix/template b/srcpkgs/gomatrix/template
new file mode 100644
index 00000000000..fae7a4343ed
--- /dev/null
+++ b/srcpkgs/gomatrix/template
@@ -0,0 +1,17 @@
+# Template file for 'gomatrix'
+pkgname=gomatrix
+version=101.0.0
+revision=1
+build_style=go
+go_import_path=github.com/GeertJohan/gomatrix
+hostmakedepends="git"
+short_desc="Terminal Matrix display in golang"
+maintainer="Alex Childs <misuchiru03+void@gmail.com>"
+license="BSD-2-Clause"
+homepage="https://github.com/GeertJohan/gomatrix"
+distfiles="https://github.com/GeertJohan/gomatrix/archive/v${version}.tar.gz"
+checksum=4d71d2509ac84f2340537d5e6f0eb9810b4173706f13cd6fe5e5e8ee5a69a50c
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/goodvibes/template b/srcpkgs/goodvibes/template
index 2f38a88a1ca..730fc7a27be 100644
--- a/srcpkgs/goodvibes/template
+++ b/srcpkgs/goodvibes/template
@@ -1,6 +1,6 @@
 # Template file for 'goodvibes'
 pkgname=goodvibes
-version=0.4.2
+version=0.4.3
 revision=1
 wrksrc="goodvibes-v${version}"
 build_style=meson
@@ -14,4 +14,4 @@ license="GPL-3.0-or-later"
 homepage="https://gitlab.com/goodvibes/goodvibes"
 changelog="https://gitlab.com/goodvibes/goodvibes/raw/v${version}/NEWS"
 distfiles="https://gitlab.com/goodvibes/goodvibes/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
-checksum=aaa2650ee330e7b4cb97d9783ac8d2e5fbadd0af339a562638acebe674045fa1
+checksum=521a8b35380ddcb28795de9a749daea163fcd99486c866a276f776fa1fc683ae
diff --git a/srcpkgs/google-chrome/template b/srcpkgs/google-chrome/template
index ee5cdf60538..5f93d6c5e28 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,5 +1,5 @@
 # Template file for 'google-chrome'
-_chromeVersion=76.0.3809.100
+_chromeVersion=77.0.3865.90
 _chromeRevision=1
 _channel=stable
 
@@ -20,7 +20,7 @@ _filename="google-chrome-${_channel}_${_chromeVersion}-${_chromeRevision}_amd64.
 _chromeUrl="${_baseUrl}/${_filename}"
 
 distfiles="$_chromeUrl"
-checksum=1dbf606dfa051a927fbd9a241a9032148d25be0851b2f27849a26ca81fa6b9b0
+checksum=f443503c88164f018ddb88247d2824431efcb863935ae476f4ada6218f41fdda
 
 do_extract() {
 	mkdir -p ${DESTDIR}
@@ -31,7 +31,7 @@ do_install() {
 	tar xf data.tar.xz -C ${DESTDIR}
 
 	# Install the icons
-	for size in 16 22 24 32 48 64 128 256; do
+	for size in 16 24 32 48 64 128 256; do
 		# Create the google chrome xdg directory
 		mkdir -p ${DESTDIR}/usr/share/icons/hicolor/${size}x${size}/apps
 
diff --git a/srcpkgs/google-cloud-sdk/template b/srcpkgs/google-cloud-sdk/template
index abf4ab1ba45..646b701d0ed 100644
--- a/srcpkgs/google-cloud-sdk/template
+++ b/srcpkgs/google-cloud-sdk/template
@@ -1,6 +1,6 @@
 # Template file for 'google-cloud-sdk'
 pkgname=google-cloud-sdk
-version=256.0.0
+version=267.0.0
 revision=1
 archs=noarch
 wrksrc=$pkgname
@@ -10,7 +10,7 @@ maintainer="Daniel Santana <daniel@santana.tech>"
 license="Apache-2.0"
 homepage="https://cloud.google.com/sdk"
 distfiles="https://dl.google.com/dl/cloudsdk/release/downloads/for_packagers/linux/${pkgname}_${version}.orig.tar.gz"
-checksum=b53debf3c1a9a0d3f6e3df6f8dce6aa0d9d9010221b604ef5140c9453b28d140
+checksum=2a3ebea6294d9bb1e62fcfd3a84e0d2e9e760cce6dcf5542013590640ccc0204
 
 do_install() {
 	vmkdir usr/lib/$pkgname
@@ -40,5 +40,4 @@ do_install() {
 	vdoc README
 	vdoc VERSION
 	vdoc RELEASE_NOTES
-	vlicense LICENSE
 }
diff --git a/srcpkgs/googler/template b/srcpkgs/googler/template
index fff59844076..a22598c4058 100644
--- a/srcpkgs/googler/template
+++ b/srcpkgs/googler/template
@@ -6,7 +6,7 @@ build_style=gnu-makefile
 make_build_target=disable-self-upgrade
 depends="python3 xsel xclip"
 short_desc="Google Search, Site Search and News from the terminal"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/jarun/googler"
 distfiles="https://github.com/jarun/googler/archive/v${version}.tar.gz"
diff --git a/srcpkgs/gopls/template b/srcpkgs/gopls/template
new file mode 100644
index 00000000000..64243fe9908
--- /dev/null
+++ b/srcpkgs/gopls/template
@@ -0,0 +1,20 @@
+# Template file for 'gopls'
+pkgname=gopls
+version=0.1.7
+revision=1
+wrksrc=tools-gopls-v${version}
+build_style=go
+go_import_path=golang.org/x/tools/gopls
+hostmakedepends="git"
+short_desc="Official language server for the Go language"
+maintainer="Renato Aguiar <renato@renag.me>"
+license="MIT"
+homepage="https://github.com/golang/tools"
+distfiles="https://github.com/golang/tools/archive/gopls/v${version}.tar.gz"
+checksum=3081a1ec963228baf18063c914ec04916030d87f443126ec8ae56cbc114ef747
+
+post_install() {
+	vlicense LICENSE
+	vdoc gopls/README.md
+	vcopy gopls/doc usr/share/doc/${pkgname}
+}
diff --git a/srcpkgs/goversion/template b/srcpkgs/goversion/template
index 304044bc0c5..390551d2b42 100644
--- a/srcpkgs/goversion/template
+++ b/srcpkgs/goversion/template
@@ -6,7 +6,7 @@ build_style=go
 go_import_path=rsc.io/goversion
 hostmakedepends="git"
 short_desc="Print version used to build Go executables"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/rsc/goversion"
 distfiles="https://github.com/rsc/goversion/archive/v${version}.tar.gz"
diff --git a/srcpkgs/gperftools/patches/elf-mem-image-musl.patch b/srcpkgs/gperftools/patches/elf-mem-image-musl.patch
new file mode 100644
index 00000000000..541cde28b2b
--- /dev/null
+++ b/srcpkgs/gperftools/patches/elf-mem-image-musl.patch
@@ -0,0 +1,13 @@
+This relies on link.h, which is present in musl as well as glibc.
+
+--- src/base/elf_mem_image.h
++++ src/base/elf_mem_image.h
+@@ -43,7 +43,7 @@
+ 
+ // Maybe one day we can rewrite this file not to require the elf
+ // symbol extensions in glibc, but for right now we need them.
+-#if defined(__ELF__) && defined(__GLIBC__) && !defined(__native_client__)
++#if defined(__ELF__) && !defined(__native_client__)
+ 
+ #define HAVE_ELF_MEM_IMAGE 1
+ 
diff --git a/srcpkgs/gperftools/patches/ppc-musl.patch b/srcpkgs/gperftools/patches/ppc-musl.patch
new file mode 100644
index 00000000000..d7a3645d6d7
--- /dev/null
+++ b/srcpkgs/gperftools/patches/ppc-musl.patch
@@ -0,0 +1,76 @@
+Compatibility fixes for musl.
+
+--- m4/pc_from_ucontext.m4
++++ m4/pc_from_ucontext.m4
+@@ -31,6 +31,7 @@ AC_DEFUN([AC_PC_FROM_UCONTEXT],
+    pc_fields="$pc_fields uc_mcontext.gregs[[R15]]"     # Linux (arm old [untested])
+    pc_fields="$pc_fields uc_mcontext.arm_pc"           # Linux (arm arch 5)
+    pc_fields="$pc_fields uc_mcontext.gp_regs[[PT_NIP]]"  # Suse SLES 11 (ppc64)
++   pc_fields="$pc_fields uc_mcontext.gregs[[PT_NIP]]"
+    pc_fields="$pc_fields uc_mcontext.mc_eip"           # FreeBSD (i386)
+    pc_fields="$pc_fields uc_mcontext.mc_rip"           # FreeBSD (x86_64 [untested])
+    pc_fields="$pc_fields uc_mcontext.__gregs[[_REG_EIP]]"  # NetBSD (i386)
+@@ -55,7 +56,8 @@ AC_DEFUN([AC_PC_FROM_UCONTEXT],
+                         pc_field_found=true)
+        elif test "x$ac_cv_header_sys_ucontext_h" = xyes; then
+          AC_TRY_COMPILE([#define _GNU_SOURCE 1
+-                         #include <sys/ucontext.h>],
++                         #include <sys/ucontext.h>
++                         #include <asm/ptrace.h>],
+                         [ucontext_t u; return u.$pc_field == 0;],
+                         AC_DEFINE_UNQUOTED(PC_FROM_UCONTEXT, $pc_field,
+                                            How to access the PC from a struct ucontext)
+@@ -63,7 +65,8 @@ AC_DEFUN([AC_PC_FROM_UCONTEXT],
+                         pc_field_found=true)
+        elif test "x$ac_cv_header_ucontext_h" = xyes; then
+          AC_TRY_COMPILE([#define _GNU_SOURCE 1
+-                         #include <ucontext.h>],
++                         #include <ucontext.h>
++                         #include <asm/ptrace.h>],
+                         [ucontext_t u; return u.$pc_field == 0;],
+                         AC_DEFINE_UNQUOTED(PC_FROM_UCONTEXT, $pc_field,
+                                            How to access the PC from a struct ucontext)
+--- src/getpc.h
++++ src/getpc.h
+@@ -65,6 +65,9 @@
+ typedef ucontext ucontext_t;
+ #endif
+ 
++#if defined(__powerpc__) && !defined(PT_NIP)
++#define PT_NIP 32
++#endif
+ 
+ // Take the example where function Foo() calls function Bar().  For
+ // many architectures, Bar() is responsible for setting up and tearing
+--- src/stacktrace_powerpc-linux-inl.h
++++ src/stacktrace_powerpc-linux-inl.h
+@@ -186,7 +186,7 @@ static int GET_STACK_TRACE_OR_FRAMES {
+           ucontext_t uc;
+         // We don't care about the rest, since the IP value is at 'uc' field.
+         } *sigframe = reinterpret_cast<signal_frame_64*>(current);
+-        result[n] = (void*) sigframe->uc.uc_mcontext.gp_regs[PT_NIP];
++        result[n] = (void*) sigframe->uc.uc_mcontext.gp_regs[32];
+       }
+ #else
+       if (sigtramp32_vdso && (sigtramp32_vdso == current->return_addr)) {
+@@ -196,7 +196,7 @@ static int GET_STACK_TRACE_OR_FRAMES {
+           mcontext_t mctx;
+           // We don't care about the rest, since IP value is at 'mctx' field.
+         } *sigframe = reinterpret_cast<signal_frame_32*>(current);
+-        result[n] = (void*) sigframe->mctx.gregs[PT_NIP];
++        result[n] = (void*) sigframe->mctx.gregs[32];
+       } else if (sigtramp32_rt_vdso && (sigtramp32_rt_vdso == current->return_addr)) {
+         struct rt_signal_frame_32 {
+           char dummy[64 + 16];
+@@ -204,7 +204,11 @@ static int GET_STACK_TRACE_OR_FRAMES {
+           ucontext_t uc;
+           // We don't care about the rest, since IP value is at 'uc' field.A
+         } *sigframe = reinterpret_cast<rt_signal_frame_32*>(current);
++#if defined(__GLIBC__)
+         result[n] = (void*) sigframe->uc.uc_mcontext.uc_regs->gregs[PT_NIP];
++#else
++        result[n] = (void*) sigframe->uc.uc_mcontext.gregs[32];
++#endif
+       }
+ #endif
+ 
diff --git a/srcpkgs/gperftools/template b/srcpkgs/gperftools/template
index 0cb00c5fb97..bded7024477 100644
--- a/srcpkgs/gperftools/template
+++ b/srcpkgs/gperftools/template
@@ -1,8 +1,9 @@
 # Template file for 'gperftools'
 pkgname=gperftools
 version=2.7
-revision=2
+revision=3
 build_style=gnu-configure
+hostmakedepends="automake libtool"
 makedepends="libunwind-devel"
 checkdepends="perl"
 short_desc="Multi-threaded malloc() and performance analysis tools"
@@ -12,11 +13,22 @@ homepage="https://github.com/gperftools/gperftools"
 distfiles="https://github.com/${pkgname}/${pkgname}/releases/download/${pkgname}-${version}/${pkgname}-${version}.tar.gz"
 checksum=1ee8c8699a0eff6b6a203e59b43330536b22bbcbe6448f54c7091e5efb0763c9
 
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	# needed by some newly enabled code
+	CXXFLAGS+=" -D__WORDSIZE=$XBPS_TARGET_WORDSIZE"
+	# needed on musl other than x86_64
+	if [ "$XBPS_TARGET_MACHINE" != "x86_64-musl" ]; then
+		makedepends+=" libucontext-devel"
+		LDFLAGS+=" -lucontext"
+	fi
+fi
+
 case "$XBPS_TARGET_MACHINE" in
 	arm*-musl|aarch64-musl)
+		# having libunwind in makedepends still causes failures...
 		makedepends="libucontext-devel"
-		LDFLAGS=" -lucontext"
-		configure_args="--disable-libunwind"
+		configure_args+=" --disable-libunwind"
+		;;
 esac
 
 post_extract() {
@@ -24,6 +36,10 @@ post_extract() {
 		src/base/linux_syscall_support.h src/malloc_hook_mmap_linux.h
 }
 
+pre_configure() {
+	autoreconf -fi
+}
+
 post_install() {
 	vlicense COPYING
 	rm -rf ${DESTDIR}/usr/share/doc
diff --git a/srcpkgs/gpgme/template b/srcpkgs/gpgme/template
index 3492b8c29f6..cbc08afe773 100644
--- a/srcpkgs/gpgme/template
+++ b/srcpkgs/gpgme/template
@@ -16,13 +16,13 @@ homepage="https://www.gnupg.org/software/gpgme/index.html"
 distfiles="https://www.gnupg.org/ftp/gcrypt/gpgme/gpgme-${version}.tar.bz2"
 checksum=c4e30b227682374c23cddc7fdb9324a99694d907e79242a25a4deeedb393be46
 
-case "$XBPS_TARGET_MACHINE" in
-	*-musl) configure_args+=" ac_cv_sys_file_offset_bits=no";;
-	i686*|arm*)
-		CFLAGS="-D_FILE_OFFSET_BITS=64 -DLARGEFILE_SOURCE=1"
-		CXXFLAGS="${CFLAGS}"
-		;;
-esac
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	configure_args+=" ac_cv_sys_file_offset_bits=no"
+elif [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
+	CFLAGS="-D_FILE_OFFSET_BITS=64 -DLARGEFILE_SOURCE=1"
+	CXXFLAGS="${CFLAGS}"
+fi
+
 CXXFLAGS+=" -D_GLIBCXX_USE_C99_STDIO=1"
 
 post_extract() {
diff --git a/srcpkgs/gpodder/template b/srcpkgs/gpodder/template
index ae495f11f13..7c7414e19cd 100644
--- a/srcpkgs/gpodder/template
+++ b/srcpkgs/gpodder/template
@@ -1,6 +1,6 @@
 # Template file for 'gpodder'
 pkgname=gpodder
-version=3.10.9
+version=3.10.11
 revision=1
 archs=noarch
 wrksrc="gpodder-${version}"
@@ -16,8 +16,7 @@ maintainer="bra1nwave <brainwave@openmailbox.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/gpodder/gpodder"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=ab7eab4e9e63556c463a9efdcf0b26069f56c047d7cef7fd22931b71ba025dbf
-nocross="gobject-introspection"
+checksum=eaa5b0b74ba00699342dbf317d52f1c4e52d77b7313fc9144cd01eea68b314cc
 
 do_install() {
 	make install DESTDIR=${DESTDIR}
diff --git a/srcpkgs/gpsim/template b/srcpkgs/gpsim/template
index 18a284ae05d..1778e73658e 100644
--- a/srcpkgs/gpsim/template
+++ b/srcpkgs/gpsim/template
@@ -1,6 +1,6 @@
 # Template file for 'gpsim'
 pkgname=gpsim
-version=0.30.0
+version=0.31.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,7 +10,11 @@ maintainer="Robert Lowry <bobertlo@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://gpsim.sourceforge.net/"
 distfiles="https://sourceforge.net/projects/gpsim/files/gpsim/${version}/gpsim-${version}.tar.gz"
-checksum=e1927312c37119bc26d6abf2c250072a279a9c764c49ae9d71b4ccebb8154f86
+checksum=110ee6be3a5d02b32803a91e480cbfc9d423ef72e0830703fc0bc97b9569923f
+
+pre_configure() {
+	vsed -i -e 's/#include "error.h"//' src/modules.cc
+}
 
 gpsim-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/gradle/template b/srcpkgs/gradle/template
index e1dd49e3fe5..6cc8ee612f3 100644
--- a/srcpkgs/gradle/template
+++ b/srcpkgs/gradle/template
@@ -1,6 +1,6 @@
 # Template file for 'gradle'
 pkgname=gradle
-version=4.10.3
+version=5.6.2
 revision=1
 archs=noarch
 hostmakedepends="unzip"
@@ -11,15 +11,13 @@ license="Apache-2.0"
 homepage="https://gradle.org/"
 changelog="https://docs.gradle.org/${version}/release-notes.html"
 distfiles="https://services.gradle.org/distributions/gradle-${version}-bin.zip"
-checksum=8626cbf206b4e201ade7b87779090690447054bc93f052954c78480fa6ed186e
+checksum=32fce6628848f799b0ad3205ae8db67d0d828c10ffe62b748a7c0d9f4a5d9ee0
 nocross=yes
 
 do_install() {
 	vmkdir "usr/lib/gradle"
-	vmkdir "usr/share/doc/gradle"
 	sed ${FILESDIR}/gradle -e "s;@VERSION@;${version};" > gradle
 	vbin gradle
-
-	cp -v getting-started.html ${DESTDIR}/usr/share/doc/gradle
+	vdoc getting-started.html
 	mv lib ${DESTDIR}/usr/lib/gradle/
 }
diff --git a/srcpkgs/grafana/template b/srcpkgs/grafana/template
index 079b943a502..5a03e8944ba 100644
--- a/srcpkgs/grafana/template
+++ b/srcpkgs/grafana/template
@@ -1,6 +1,6 @@
 # Template file for 'grafana'
 pkgname=grafana
-version=6.3.2
+version=6.3.5
 revision=1
 build_style=go
 go_import_path=github.com/grafana/grafana
@@ -11,7 +11,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://grafana.com"
 distfiles="https://github.com/grafana/grafana/archive/v${version}.tar.gz"
-checksum=b6b6fa21969c3dc2e1241f2f00ca1dc5aa291a691cccefff21b0bf9606b8fdb4
+checksum=193974115bf868272dbff08e53fdc0c97af3a07a24758390178ce53e5c9e179b
 
 system_accounts="_grafana"
 _grafana_homedir="/var/lib/grafana"
diff --git a/srcpkgs/gramps/template b/srcpkgs/gramps/template
index 0b71cbced3a..9d1d1a4616a 100644
--- a/srcpkgs/gramps/template
+++ b/srcpkgs/gramps/template
@@ -1,6 +1,6 @@
 # Template file for 'gramps'
 pkgname=gramps
-version=5.0.1
+version=5.1.1
 revision=1
 archs=noarch
 build_style=python3-module
@@ -11,9 +11,9 @@ short_desc="Genealogy program"
 maintainer="7185 <7185@free.fr>"
 license="GPL-2.0-or-later"
 homepage="https://gramps-project.org"
-changelog="${homepage}/introduction-WP/2018/12/gramps-5-0-1-released"
+changelog="https://gramps-project.org/introduction-WP/2019/09/gramps-5-1-1-released/"
 distfiles="https://github.com/gramps-project/${pkgname}/archive/v${version}.tar.gz"
-checksum=3a81265764a314cca0540593ccd639c5b76199615b3b0aace0b2540fc186eba5
+checksum=7623c1e976a19e121f6fa799ca619def18672000ba7fd505abdaa9e782920eda
 
 post_install() {
 	echo -n '/usr/share' > ${DESTDIR}${py3_sitelib}/gramps/gen/utils/resource-path
diff --git a/srcpkgs/granite/template b/srcpkgs/granite/template
index f5af855b5ee..6aed37e4689 100644
--- a/srcpkgs/granite/template
+++ b/srcpkgs/granite/template
@@ -1,6 +1,6 @@
 # Template file for 'granite'
 pkgname=granite
-version=5.2.4
+version=5.2.5
 revision=1
 build_style=meson
 build_helper="gir"
@@ -12,13 +12,7 @@ maintainer="Cameron Nemo <camerontnorman@gmail.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/elementary/granite"
 distfiles="https://github.com/elementary/granite/archive/${version}.tar.gz"
-checksum=45349b24f3f5e9216354894f5598104e08d72992d81a41dadc373602853419fb
-
-case "$XBPS_TARGET_MACHINE" in
-	i686-musl|x86_64-musl) ;;
-	*-musl) broken="gobject introspection" ;;
-	*) ;;
-esac
+checksum=1c1cbe94b18a3ba2e3a099206906827d1ecf0c9572c349059fee23b6b0738966
 
 granite-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/grantleetheme/template b/srcpkgs/grantleetheme/template
index a6d80f86b0f..c457c93435c 100644
--- a/srcpkgs/grantleetheme/template
+++ b/srcpkgs/grantleetheme/template
@@ -1,6 +1,6 @@
 # Template file for 'grantleetheme'
 pkgname=grantleetheme
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 configure_args="KDE_INSTALL_USE_QT_SYS_PATHS=TRUE"
@@ -12,7 +12,7 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/applications/${version}/src/grantleetheme-${version}.tar.xz"
-checksum=c966ad7ef55a784c8cf97a69d4885b9b9d7956c84a4e323404e5cf88154cc543
+checksum=a9d4e70089debdfaffb4af881cf2064ba68a0ad3fe007985c8e5997f0cf0e836
 
 grantleetheme-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"
diff --git a/srcpkgs/graphene/template b/srcpkgs/graphene/template
index 1dab79df685..f2fe81a3f47 100644
--- a/srcpkgs/graphene/template
+++ b/srcpkgs/graphene/template
@@ -1,7 +1,7 @@
 # Template file for 'graphene'
 pkgname=graphene
 version=1.8.2
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Dtests=false -Dbenchmarks=false
@@ -16,12 +16,7 @@ distfiles="${GNOME_SITE}/graphene/${version%.*}/graphene-${version}.tar.xz"
 checksum=b3fcf20996e57b1f4df3941caac10f143bb29890a42f7a65407cd19271fc89f7
 
 build_options="gir"
-
-case "$XBPS_TARGET_MACHINE" in
-	i686-musl|x86_64-musl) build_options_default+=" gir" ;;
-	*-musl) ;;
-	*) build_options_default+=" gir" ;;
-esac
+build_options_default="gir"
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index 87571420750..be38ef148ac 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,23 +1,28 @@
 # Template file for 'grpc'
 pkgname=grpc
-version=1.22.0
+version=1.24.2
 revision=1
+_upbver=931bbecbd3230ae7f22efa5d203639facc47f719
 build_style=gnu-makefile
 make_build_args="prefix=\$(DESTDIR)/usr AROPTS=rc LD=\$(CC)"
 make_install_args="prefix=\$(DESTDIR)/usr"
 hostmakedepends="protobuf"
-makedepends="zlib-devel c-ares-devel libressl-devel libprotoc-devel protobuf-devel gperftools-devel"
-depends=""
+makedepends="zlib-devel c-ares-devel libressl-devel libprotoc-devel
+ protobuf-devel gperftools-devel"
 short_desc="High performance, open source, general RPC framework"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://github.com/grpc/grpc"
-distfiles="https://github.com/$pkgname/$pkgname/archive/v${version}/$pkgname-${version}.tar.gz"
-checksum=11ac793c562143d52fd440f6549588712badc79211cdc8c509b183cb69bddad8
+distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}/${pkgname}-${version}.tar.gz
+ https://github.com/protocolbuffers/upb/archive/${_upbver}/upb-${_upbver}.tar.gz"
+checksum="fd040f5238ff1e32b468d9d38e50f0d7f8da0828019948c9001e9a03093e1d8f
+ 95150db57b51b65f3422c38953956e0f786945d842d76f8ab685fbcd93ab5caa"
 nocross=yes
 
 post_extract() {
 	sed -r 's/-Werror//g;/ldconfig/d;s/ strip-(static|shared)_c(xx)? / /' -i Makefile
+	rm -rf third_party/upb
+	mv ../upb-${_upbver} third_party/upb
 }
 post_install() {
 	vlicense NOTICE.txt
diff --git a/srcpkgs/grub/files/kernel.d/grub.post b/srcpkgs/grub/files/kernel.d/grub.post
index f28257d999d..561d8b2f179 100644
--- a/srcpkgs/grub/files/kernel.d/grub.post
+++ b/srcpkgs/grub/files/kernel.d/grub.post
@@ -7,6 +7,8 @@
 PKGNAME="$1"
 VERSION="$2"
 
+export ZPOOL_VDEV_NAME_PATH=YES
+
 if command -v grub-mkconfig >/dev/null 2>&1; then
 	if [ -d $ROOTDIR/boot/grub ]; then
 		grub-mkconfig -o $ROOTDIR/boot/grub/grub.cfg
diff --git a/srcpkgs/grub/template b/srcpkgs/grub/template
index cd6b168036d..16f3f5eb01c 100644
--- a/srcpkgs/grub/template
+++ b/srcpkgs/grub/template
@@ -1,7 +1,7 @@
 # Template file for 'grub'
 pkgname=grub
 version=2.04
-revision=1
+revision=2
 hostmakedepends="python3 pkg-config flex freetype-devel font-unifont-bdf"
 makedepends="libusb-compat-devel ncurses-devel freetype-devel
  liblzma-devel device-mapper-devel fuse-devel"
diff --git a/srcpkgs/gscan2pdf/template b/srcpkgs/gscan2pdf/template
index c760df42221..31c1b7be9a0 100644
--- a/srcpkgs/gscan2pdf/template
+++ b/srcpkgs/gscan2pdf/template
@@ -1,6 +1,6 @@
 # Template file for 'gscan2pdf'
 pkgname=gscan2pdf
-version=2.5.5
+version=2.5.7
 revision=1
 archs=noarch
 build_style=perl-module
@@ -17,7 +17,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-3.0-or-later"
 homepage="http://gscan2pdf.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=68570af787b04f8425091a1cfe5a53f34dab0384b28a2907151d22737695d03d
+checksum=11a26c7070437359d1d7c3b6e3e9009317cd82a8ae96df737a555c8687630974
 nocross=yes
 
 do_check() {
diff --git a/srcpkgs/gsettings-desktop-schemas/template b/srcpkgs/gsettings-desktop-schemas/template
index f421fa43e3b..7c3e76e6b3d 100644
--- a/srcpkgs/gsettings-desktop-schemas/template
+++ b/srcpkgs/gsettings-desktop-schemas/template
@@ -1,7 +1,7 @@
 # Template file for 'gsettings-desktop-schemas'
 pkgname=gsettings-desktop-schemas
-version=3.32.0
-revision=2
+version=3.34.0
+revision=1
 build_helper="gir"
 build_style=meson
 configure_args="-Dintrospection=$(vopt_if gir true false)"
@@ -12,7 +12,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2d59b4b3a548859dfae46314ee4666787a00d5c82db382e97df7aa9d0e310a35
+checksum=288b04260f7040b0e004a8d59c773cfb4e32df4f1b4a0f9d705c51afccc95ead
 
 # Package build options
 build_options="gir"
diff --git a/srcpkgs/gsl/patches/ppc-musl.patch b/srcpkgs/gsl/patches/ppc-musl.patch
new file mode 100644
index 00000000000..807ae163675
--- /dev/null
+++ b/srcpkgs/gsl/patches/ppc-musl.patch
@@ -0,0 +1,36 @@
+fpu_control.h is glibc specific, but we only need some bits from it.
+
+--- ieee-utils/fp-gnuppc.c
++++ ieee-utils/fp-gnuppc.c
+@@ -18,7 +18,31 @@
+  */
+ 
+ #include <stdio.h>
++
++#if defined(__GLIBC__)
+ #include <fpu_control.h>
++#else
++/* copied from fpu_control.h, only stuff that is needed here */
++# define _FPU_RC_NEAREST 0x00
++# define _FPU_RC_DOWN    0x03
++# define _FPU_RC_UP      0x02
++# define _FPU_RC_ZERO    0x01
++
++# define _FPU_MASK_ZM  0x10
++# define _FPU_MASK_OM  0x40
++# define _FPU_MASK_UM  0x20
++# define _FPU_MASK_IM  0x80 
++
++# define _FPU_SETCW(cw)						\
++  { union { double __d; unsigned long long __ll; } __u;		\
++    register double __fr;					\
++    __u.__ll = 0xfff80000LL << 32; /* This is a QNaN.  */	\
++    __u.__ll |= (cw) & 0xffffffffLL;				\
++    __fr = __u.__d;						\
++    __asm__ __volatile__("mtfsf 255,%0" : : "f" (__fr));	\
++  }
++#endif
++
+ #include <gsl/gsl_errno.h>
+ #include <gsl/gsl_ieee_utils.h>
+ 
diff --git a/srcpkgs/gst-libav/template b/srcpkgs/gst-libav/template
index f8b2729621e..d0187de47eb 100644
--- a/srcpkgs/gst-libav/template
+++ b/srcpkgs/gst-libav/template
@@ -1,6 +1,6 @@
 # Template file for 'gst-libav'
 pkgname=gst-libav
-version=1.16.0
+version=1.16.1
 revision=1
 wrksrc="${pkgname}-${version}"
 build_style=meson
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://gstreamer.freedesktop.org"
 distfiles="${homepage}/src/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=dfac119043a9cfdcacd7acde77f674ab172cf2537b5812be52f49e9cddc53d9a
+checksum=e8a5748ae9a4a7be9696512182ea9ffa6efe0be9b7976916548e9d4381ca61c4
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) # Required by musl for M_SQRT1_2
diff --git a/srcpkgs/gst-omx/template b/srcpkgs/gst-omx/template
index 1f9c2550df0..9c5aae67430 100644
--- a/srcpkgs/gst-omx/template
+++ b/srcpkgs/gst-omx/template
@@ -1,6 +1,6 @@
 # Template file for 'gst-omx'
 pkgname=gst-omx
-version=1.16.0
+version=1.16.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-examples"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only"
 homepage="https://gstreamer.freedesktop.org"
 distfiles="${homepage}/src/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=fef77cddc02784608451c46b9def880b63230a246decf8900f2da2ed54a8af4a
+checksum=cbf54121a2cba575d460833e8132265781252ce32cf5b8f9fa8753e42ab24bb2
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*|aarch64*|ppc64*)
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 476d0c11bbc..4a293277495 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-bad1'
 pkgname=gst-plugins-bad1
-version=1.16.0
-revision=4
+version=1.16.1
+revision=1
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
 build_style=meson
@@ -35,7 +35,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://gstreamer.freedesktop.org"
 distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz"
-checksum=22139de35626ada6090bdfa3423b27b7fc15a0198331d25c95e6b12cb1072b05
+checksum=56481c95339b8985af13bac19b18bc8da7118c2a7d9440ed70e7dcd799c2adb5
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/gst-plugins-base1/template b/srcpkgs/gst-plugins-base1/template
index 06e984fbe45..3f33619ee90 100644
--- a/srcpkgs/gst-plugins-base1/template
+++ b/srcpkgs/gst-plugins-base1/template
@@ -1,6 +1,6 @@
 # Template file for 'gst-plugins-base1'
 pkgname=gst-plugins-base1
-version=1.16.0
+version=1.16.1
 revision=1
 wrksrc="${pkgname/1/}-${version}"
 build_style=meson
@@ -21,7 +21,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://gstreamer.freedesktop.org"
 distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz"
-checksum=4093aa7b51e28fb24dfd603893fead8d1b7782f088b05ed0f22a21ef176fb5ae
+checksum=5c3cc489933d0597087c9bc6ba251c93693d64554bcc563539a084fa2d5fcb2b
 
 # Package build options
 build_options="cdparanoia gir sndio"
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index c5902e3df78..d83d85fff42 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-good1'
 pkgname=gst-plugins-good1
-version=1.16.0
-revision=2
+version=1.16.1
+revision=1
 wrksrc="${pkgname/1/}-${version}"
 build_style=meson
 configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled
@@ -23,7 +23,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://gstreamer.freedesktop.org"
 distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz"
-checksum=654adef33380d604112f702c2927574cfc285e31307b79e584113858838bb0fd
+checksum=9fbabe69018fcec707df0b71150168776040cde6c1a26bb5a82a136755fa8f1f
 lib32disabled=yes
 
 build_options="gtk3 qt"
diff --git a/srcpkgs/gst-plugins-ugly1/template b/srcpkgs/gst-plugins-ugly1/template
index 81e821f677b..e7bd16be207 100644
--- a/srcpkgs/gst-plugins-ugly1/template
+++ b/srcpkgs/gst-plugins-ugly1/template
@@ -1,6 +1,6 @@
 # Template file for 'gst-plugins-ugly1'.
 pkgname=gst-plugins-ugly1
-version=1.16.0
+version=1.16.1
 revision=1
 lib32disabled=yes
 wrksrc="${pkgname/1/}-${version}"
@@ -17,4 +17,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://gstreamer.freedesktop.org"
 distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz"
-checksum=e30964c5f031c32289e0b25e176c3c95a5737f2052dfc81d0f7427ef0233a4c2
+checksum=4bf913b2ca5195ac3b53b5e3ade2dc7c45d2258507552ddc850c5fa425968a1d
diff --git a/srcpkgs/gst1-editing-services/template b/srcpkgs/gst1-editing-services/template
index 02666970553..ea4e9fb9262 100644
--- a/srcpkgs/gst1-editing-services/template
+++ b/srcpkgs/gst1-editing-services/template
@@ -1,6 +1,6 @@
 # Template file for 'gst1-editing-services'
 pkgname=gst1-editing-services
-version=1.16.0
+version=1.16.1
 revision=1
 wrksrc="${pkgname/gst1/gstreamer}-${version}"
 build_style=meson
@@ -13,7 +13,7 @@ maintainer="Toyam Cox <Vaelatern@gmail.com>"
 license="LGPL-2.0-or-later"
 homepage="https://gstreamer.freedesktop.org"
 distfiles="${homepage}/src/${pkgname/gst1/gst}/${pkgname/gst1/gstreamer}-${version}.tar.xz"
-checksum=82a3faefb2b0d91e134fd02cddeee718b7846a07cbf0127fed7aa03e25495ad1
+checksum=c884878f9e6ddac96e4f174654d12fe52e3d48eaaec27a80767c0d56cb2f6780
 
 gst1-editing-services-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/gst1-python/template b/srcpkgs/gst1-python/template
index ad5617b814e..40fba1f6536 100644
--- a/srcpkgs/gst1-python/template
+++ b/srcpkgs/gst1-python/template
@@ -1,6 +1,6 @@
 # Template file for 'gst1-python'.
 pkgname=gst1-python
-version=1.16.0
+version=1.16.1
 revision=1
 wrksrc="gst-python-${version}"
 build_style=gnu-configure
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://gstreamer.freedesktop.org"
 distfiles="${homepage}/src/gst-python/gst-python-${version}.tar.xz"
-checksum=55dc7aaed1855565f9b9ef842d93e93bfc5cb2b376faef6af5b463e1774e2d38
+checksum=b469c8955126f41b8ce0bf689b7029f182cd305f422b3a8df35b780bd8347489
 
 pre_configure() {
 	if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/gst1-python3/template b/srcpkgs/gst1-python3/template
index 7704de67c2a..6f02f19aca3 100644
--- a/srcpkgs/gst1-python3/template
+++ b/srcpkgs/gst1-python3/template
@@ -1,6 +1,6 @@
 # Template file for 'gst1-python3'
 pkgname=gst1-python3
-version=1.16.0
+version=1.16.1
 revision=1
 wrksrc="gst-python-${version}"
 build_style=meson
@@ -13,4 +13,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://gstreamer.freedesktop.org"
 distfiles="${homepage}/src/gst-python/gst-python-${version}.tar.xz"
-checksum=55dc7aaed1855565f9b9ef842d93e93bfc5cb2b376faef6af5b463e1774e2d38
+checksum=b469c8955126f41b8ce0bf689b7029f182cd305f422b3a8df35b780bd8347489
diff --git a/srcpkgs/gstreamer-vaapi/template b/srcpkgs/gstreamer-vaapi/template
index 4cdd701c673..e3d2c49f139 100644
--- a/srcpkgs/gstreamer-vaapi/template
+++ b/srcpkgs/gstreamer-vaapi/template
@@ -1,6 +1,6 @@
 # Template file for 'gstreamer-vaapi'
 pkgname=gstreamer-vaapi
-version=1.16.0
+version=1.16.1
 revision=1
 build_style=meson
 hostmakedepends="pkg-config"
@@ -11,4 +11,4 @@ license="LGPL-2.1-or-later"
 homepage="https://gstreamer.freedesktop.org"
 changelog="https://raw.githubusercontent.com/GStreamer/gstreamer-vaapi/master/ChangeLog"
 distfiles="${homepage}/src/gstreamer-vaapi/gstreamer-vaapi-${version}.tar.xz"
-checksum=4e7fce626ee0590dca74b5a8341d25bac76307945131a970b414fc5895f5171f
+checksum=cb570f6f1e78cb364fbe3c4fb8751824ee9db0c942ba61b62380b9b5abb7603a
diff --git a/srcpkgs/gstreamer1/template b/srcpkgs/gstreamer1/template
index 6db91b8cde5..29629189d62 100644
--- a/srcpkgs/gstreamer1/template
+++ b/srcpkgs/gstreamer1/template
@@ -1,6 +1,6 @@
 # Template file for 'gstreamer1'
 pkgname=gstreamer1
-version=1.16.0
+version=1.16.1
 revision=1
 wrksrc="gstreamer-${version}"
 build_style=meson
@@ -18,7 +18,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://gstreamer.freedesktop.org"
 distfiles="${homepage}/src/gstreamer/gstreamer-${version}.tar.xz"
-checksum=0e8e2f7118be437cba879353970cf83c2acced825ecb9275ba05d9186ef07c00
+checksum=02211c3447c4daa55919c5c0f43a82a6fbb51740d57fc3af0639d46f1cf4377d
 
 # Package build options
 build_options="gir gtk_doc"
diff --git a/srcpkgs/gtk+3/template b/srcpkgs/gtk+3/template
index 45115dd7cee..975925d33f3 100644
--- a/srcpkgs/gtk+3/template
+++ b/srcpkgs/gtk+3/template
@@ -1,6 +1,6 @@
 # Template file for 'gtk+3'
 pkgname=gtk+3
-version=3.24.10
+version=3.24.11
 revision=1
 wrksrc="gtk+-${version}"
 build_style=gnu-configure
@@ -26,7 +26,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.gtk.org/"
 distfiles="${GNOME_SITE}/gtk+/${version%.*}/gtk+-${version}.tar.xz"
-checksum=35a8f107e2b90fda217f014c0c15cb20a6a66678f6fd7e36556d469372c01b03
+checksum=dba7658d0a2e1bfad8260f5210ca02988f233d1d86edacb95eceed7eca982895
 
 # Package build options
 build_options="broadway colord cups gir cloudproviders wayland x11"
diff --git a/srcpkgs/gtk3-nocsd/template b/srcpkgs/gtk3-nocsd/template
index 36e60a61ebe..8c9af5a68f0 100644
--- a/srcpkgs/gtk3-nocsd/template
+++ b/srcpkgs/gtk3-nocsd/template
@@ -1,16 +1,16 @@
 # Template file for 'gtk3-nocsd'
 pkgname=gtk3-nocsd
-version=3
+version=3.0.1
 revision=1
 build_style=gnu-makefile
 hostmakedepends="pkg-config"
 makedepends="gtk+3-devel libgirepository-devel"
-short_desc="A hack to disable gtk+ 3 client side decoration"
+short_desc="Hack to disable gtk+ 3 client side decoration"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
-license="LGPL-2.1"
-homepage="https://github.com/PCMan/gtk3-nocsd"
-distfiles="https://github.com/PCMan/gtk3-nocsd/archive/v${version}.tar.gz"
-checksum=779c47d894ee3b6751ddb02b62a76757b77eb81232c4f9335564654817889570
+license="LGPL-2.1-or-later"
+homepage="https://github.com/ZaWertun/gtk3-nocsd"
+distfiles="https://github.com/ZaWertun/gtk3-nocsd/archive/v${version}.tar.gz"
+checksum=c4cc5e8fa49a145013430cdce7f0fddad648c0cf6d53a8085b4500612c37cbf7
 
 do_install() {
 	vbin gtk3-nocsd
diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index 783705b0729..58388b515c0 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,7 +1,7 @@
 # Template file for 'gtk4'
 pkgname=gtk4
 version=3.94.0
-revision=1
+revision=2
 wrksrc="gtk+-${version}"
 build_style=meson
 build_helper="gir"
@@ -35,13 +35,7 @@ build_options="broadway colord cups gir cloudproviders wayland x11"
 desc_option_broadway="Enable support for the HTML5 Broadway backend"
 desc_option_cloudproviders="Enable integration with cloudproviders, such as Nextcloud"
 
-build_options_default="colord cups broadway wayland x11 cloudproviders vulkan"
-
-case "$XBPS_TARGET_MACHINE" in
-	x86_64-musl) build_options_default+=" gir" ;;
-	*-musl) ;;
-	*) build_options_default+=" gir" ;;
-esac
+build_options_default="colord cups broadway wayland x11 cloudproviders vulkan gir"
 
 gtk4-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/gtkwave/template b/srcpkgs/gtkwave/template
index 16cf79a3d40..f60eba6fc8f 100644
--- a/srcpkgs/gtkwave/template
+++ b/srcpkgs/gtkwave/template
@@ -1,6 +1,6 @@
 # Template file for 'gtkwave'
 pkgname=gtkwave
-version=3.3.98
+version=3.3.102
 revision=1
 build_style=gnu-configure
 configure_args="--with-tcl=${XBPS_CROSS_BASE}/usr/lib --with-tk=${XBPS_CROSS_BASE}/usr/lib"
@@ -11,7 +11,7 @@ maintainer="allan <mail@may.mooo.com>"
 license="GPL-2.0-or-later, MIT"
 homepage="http://gtkwave.sourceforge.net/"
 distfiles="http://gtkwave.sourceforge.net/gtkwave-${version}.tar.gz"
-checksum=efa6bbbeb3bd54104425a69a2aa0d079bb5c3ecc1c420ba57dcaa1c97c5a22f6
+checksum=80bb7cb92db45872209f4ca48fc95a0460e0d89b0fe0c310c836d9b04c77fec7
 
 post_install() {
 	vlicense LICENSE.TXT
diff --git a/srcpkgs/gucci/template b/srcpkgs/gucci/template
new file mode 100644
index 00000000000..2383ae4c09f
--- /dev/null
+++ b/srcpkgs/gucci/template
@@ -0,0 +1,17 @@
+# Template file for 'gucci'
+pkgname=gucci
+version=1.2.2
+revision=1
+build_style=go
+go_import_path="github.com/noqcks/gucci"
+hostmakedepends="git"
+short_desc="Simple CLI templating tool written in Go"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="MIT"
+homepage="https://github.com/noqcks/gucci"
+distfiles="https://github.com/noqcks/gucci/archive/${version}.tar.gz"
+checksum=b31ebdb94d227331ac954262e43e39e3b9a1fb25bab96fd0cccb7ddfb997e383
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/guitarix2/patches/musl.patch b/srcpkgs/guitarix2/patches/musl.patch
deleted file mode 100644
index ee07fe904c4..00000000000
--- a/srcpkgs/guitarix2/patches/musl.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-There is no mallopt in musl.
-
---- src/gx_head/gui/machine.cpp.orig	2018-07-22 06:24:50.000000000 +0200
-+++ src/gx_head/gui/machine.cpp	2018-08-26 09:31:01.815078037 +0200
-@@ -44,8 +44,10 @@
-     long int total_size = 0;
-     if (mlockall(MCL_CURRENT | MCL_FUTURE))
-         gx_print_error("system init", "mlockall failed:");
-+#ifdef __GLIBC__
-     mallopt(M_TRIM_THRESHOLD, -1);
-     mallopt(M_MMAP_MAX, 0);
-+#endif
-     for (unsigned int i = 0; i < sizeof(regions)/sizeof(regions[0]); i++) {
-         total_size +=regions[i].len;
-         if (mlock(regions[i].start, regions[i].len) != 0) {
diff --git a/srcpkgs/guitarix2/template b/srcpkgs/guitarix2/template
index bd26f268bca..8b2e5ec85f4 100644
--- a/srcpkgs/guitarix2/template
+++ b/srcpkgs/guitarix2/template
@@ -1,15 +1,15 @@
 # Template file for 'guitarix2'
 pkgname=guitarix2
-version=0.37.3
-revision=4
+version=0.38.1
+revision=1
 wrksrc="guitarix-${version}"
 build_style=waf
-configure_args="--cxxflags-release=-DNDEBUG --ladspa --new-ladspa --no-faust --no-lv2
+configure_args="--cxxflags-release=-DNDEBUG --ladspa --new-ladspa --no-faust
  $(vopt_if avahi '' '--no-avahi') $(vopt_if bluez '' '--no-bluez')"
 make_build_args="--progress"
 hostmakedepends="gperf intltool pkg-config"
 makedepends="boost-devel eigen fftw-devel gtkmm2-devel jack-devel
- ladspa-sdk liblrdf-devel libsndfile-devel lilv-devel sratom-devel
+ ladspa-sdk liblrdf-devel libsndfile-devel lilv-devel lv2 sratom-devel
  zita-convolver-devel zita-resampler-devel
  $(vopt_if avahi avahi-glib-libs-devel) $(vopt_if bluez libbluetooth-devel)"
 depends="desktop-file-utils"
@@ -18,7 +18,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://guitarix.org"
 distfiles="${SOURCEFORGE_SITE}/guitarix/guitarix/guitarix2-${version}.tar.xz"
-checksum=4ca93bd4226cd175456f37612acd28b46e13133db61c0f235917dbcc3347d5f1
+checksum=00fda3e1ce1d5f1691665f9ff32bb3c9800381313d49b7c2e25618d0b3ed872f
 
 build_options="avahi bluez"
 desc_option_avahi="Build with avahi support"
@@ -34,7 +34,6 @@ esac
 if [ -n "$CROSS_BUILD" ]; then
 	post_extract() {
 		# don’t test load the ladspa plugin when cross compiling
-		sed -i "s/\(features='cxx cshlib\) test_loadable/\1/" src/ladspa/wscript
+		vsed -i "s/\(features='cxx cshlib\) test_loadable/\1/" src/ladspa/wscript
 	}
 fi
-
diff --git a/srcpkgs/gummiboot/template b/srcpkgs/gummiboot/template
index 77ab2f99fa5..d23620e6170 100644
--- a/srcpkgs/gummiboot/template
+++ b/srcpkgs/gummiboot/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 hostmakedepends="automake pkg-config libxslt docbook-xsl"
 makedepends="gnu-efi-libs liblzma-devel libblkid-devel"
 short_desc="Simple UEFI Boot Manager"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 # Homepage is long dead and the project has an unofficial release under Alpine
 # homepage="http://freedesktop.org/wiki/Software/gummiboot"
diff --git a/srcpkgs/gutenprint/patches/musl.patch b/srcpkgs/gutenprint/patches/musl.patch
deleted file mode 100644
index 52edda6269c..00000000000
--- a/srcpkgs/gutenprint/patches/musl.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 6b8ae64056133e2b4775a201eb527fdc143d669c
-Author: Cameron Nemo <camerontnorman@gmail.com>
-Date:   Sun Nov 25 10:09:21 2018 -0800
-
-    src/xml/printers: remove assignment to read-only variable
-
-diff --git src/xml/printers/check_duplicate_printers.test.c src/xml/printers/check_duplicate_printers.test.c
-index 52c46e65..d5d2771c 100644
---- src/xml/printers/check_duplicate_printers.c
-+++ src/xml/printers/check_duplicate_printers.c
-@@ -34,7 +34,7 @@ main(int argc, char **argv)
-       if (getenv("BUILD_VERBOSE"))
- 	dup2(2, 3);
-       (void) snprintf(path, PATH_MAX, "%scheck_duplicate_printers_%d.log", getenv("STP_TEST_LOG_PREFIX"), getpid());
--      stdout = freopen(path, "w", stdout);
-+      freopen(path, "w", stdout);
-       dup2(1, 2);
-     }
-   setenv("STP_CHECK_DUPLICATE_PRINTERS", "TRUE", 1);
diff --git a/srcpkgs/gutenprint/template b/srcpkgs/gutenprint/template
index 1ae82e5b37a..e94fa323629 100644
--- a/srcpkgs/gutenprint/template
+++ b/srcpkgs/gutenprint/template
@@ -1,6 +1,6 @@
 # Template file for 'gutenprint'
 pkgname=gutenprint
-version=5.3.1
+version=5.3.3
 revision=1
 build_style=gnu-configure
 configure_args="--disable-rpath --enable-samples --disable-static
@@ -13,7 +13,7 @@ maintainer="Anachron <Anachron14@gmx.de>"
 license="GPL-2.0-or-later"
 homepage="http://gimp-print.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/gimp-print/$pkgname-$version.tar.xz"
-checksum=d80d8f5272d15bca5710f6ef4a2bb95e76d34e1155c5bcd5e83cb9f0a111d0d4
+checksum=7279ecbc8e67d1858c53cb24e423ea1be98e214872006b79e6e03650dd54a072
 nocross="https://sourceforge.net/p/gimp-print/mailman/message/34782748/"
 
 post_install() {
diff --git a/srcpkgs/gvfs/template b/srcpkgs/gvfs/template
index 552062513bd..4eee8094057 100644
--- a/srcpkgs/gvfs/template
+++ b/srcpkgs/gvfs/template
@@ -1,25 +1,25 @@
 # Template file for 'gvfs'
 pkgname=gvfs
-version=1.40.2
+version=1.42.0
 revision=1
 build_style=meson
 configure_args="-Dsystemduserunitdir=no -Dtmpfilesdir=no -Dlogind=false
  -Dman=true"
 hostmakedepends="docbook-xsl glib-devel intltool libxslt openssh pkg-config
  polkit-devel"
-makedepends="avahi-glib-libs-devel dbus-glib-devel fuse-devel gcr-devel
+makedepends="avahi-glib-libs-devel dbus-glib-devel fuse3-devel gcr-devel
  libarchive-devel libbluetooth-devel libbluray-devel libcap-devel
  libcdio-paranoia-devel libgcrypt-devel libgdata-devel libglib-devel
  libgphoto2-devel libgudev-devel libimobiledevice-devel libmtp-devel
  libnfs-devel libsecret-devel libsoup-gnome-devel libxml2-devel polkit-devel
- samba-devel udisks2-devel"
+ samba-devel udisks2-devel gsettings-desktop-schemas-devel"
 short_desc="Userspace virtual filesystem"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/gvfs"
 changelog="https://gitlab.gnome.org/GNOME/gvfs/raw/gnome-3-32/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bdefe8fec6a1097f0c126fa2a4533667c98a86e237ac640518000e16b363971e
+checksum=d0958d9ceefb54bb8ddda74ef51e10fe03dff93f74634784bd309ea434066cf1
 
 # Manually declare shlibs used by the subpkgs.
 shlib_provides="libgvfscommon.so libgvfsdaemon.so"
diff --git a/srcpkgs/gwenview/template b/srcpkgs/gwenview/template
index 2a2399ddf16..a279261dc4b 100644
--- a/srcpkgs/gwenview/template
+++ b/srcpkgs/gwenview/template
@@ -1,6 +1,6 @@
 # Template file for 'gwenview'
 pkgname=gwenview
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
@@ -14,7 +14,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/gwenview"
 distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=1d1d4713bcebdd8c7c458c075b7101055c81cf94a802ac8b9b3528a3c3c961a3
+checksum=fa49352a208c9472c911d3579f7601fb915831ad42caf74a053ed749bf5bb1fb
 patch_args="-Np1"
 
 pre_configure() {
diff --git a/srcpkgs/gxi b/srcpkgs/gxi
new file mode 120000
index 00000000000..3008d527e75
--- /dev/null
+++ b/srcpkgs/gxi
@@ -0,0 +1 @@
+tau
\ No newline at end of file
diff --git a/srcpkgs/gxi/template b/srcpkgs/gxi/template
deleted file mode 100644
index 8fa53d00432..00000000000
--- a/srcpkgs/gxi/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'gxi'
-pkgname=gxi
-version=0.8.1
-revision=1
-build_style=meson
-build_helper=rust
-hostmakedepends="cargo pkg-config rust gettext glib-devel"
-makedepends="gtk+3-devel rust-std gettext-devel"
-checkdepends="appstream-glib desktop-file-utils"
-short_desc="GTK frontend for the xi text editor, written in Rust"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/Cogitri/gxi"
-distfiles="https://github.com/Cogitri/gxi/releases/download/v${version}/gxi-${version}.tar.xz"
-checksum=7f970239815cd688218c360fba7f00b8e1eb9ee9bafc9ce578e61018cca087a1
-
-case $XBPS_MACHINE in
-	*-musl) broken="crashes rustc" ;;
-esac
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/h2o/template b/srcpkgs/h2o/template
index 4446b84b03c..93b3281be50 100644
--- a/srcpkgs/h2o/template
+++ b/srcpkgs/h2o/template
@@ -1,7 +1,7 @@
 # Template file for 'h2o'
 pkgname=h2o
-version=2.2.5
-revision=4
+version=2.2.6
+revision=1
 build_style=cmake
 conf_files="/etc/h2o.conf"
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ maintainer="Eivind Uggedal <eivind@uggedal.com>"
 license="MIT"
 homepage="https://h2o.examp1e.net/"
 distfiles="https://github.com/h2o/h2o/archive/v${version}.tar.gz"
-checksum=eafb40aa2d93b3de1af472bb046c17b2335c3e5a894462310e1822e126c97d24
+checksum=f8cbc1b530d85ff098f6efc2c3fdbc5e29baffb30614caac59d5c710f7bda201
 
 system_accounts="h2o"
 
@@ -31,6 +31,7 @@ h2o-devel_package() {
 	depends="${makedepends}"
 	pkg_install() {
 		vmove usr/include
-		vmove usr/lib/*.a
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
 	}
 }
diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template
index 5d8f9346919..87c29a2baf9 100644
--- a/srcpkgs/harfbuzz/template
+++ b/srcpkgs/harfbuzz/template
@@ -1,18 +1,18 @@
 # Template file for 'harfbuzz'
 pkgname=harfbuzz
-version=2.6.0
+version=2.6.2
 revision=1
 build_style=gnu-configure
 configure_args="--with-glib --with-freetype --with-cairo --with-icu --with-graphite2"
 hostmakedepends="automake glib-devel libtool pkg-config"
 makedepends="cairo-devel graphite-devel icu-devel"
 short_desc="OpenType text shaping engine"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MIT"
 homepage="http://www.freedesktop.org/wiki/Software/HarfBuzz/"
 changelog="https://raw.githubusercontent.com/harfbuzz/harfbuzz/master/NEWS"
 distfiles="${FREEDESKTOP_SITE}/harfbuzz/release/${pkgname}-${version}.tar.xz"
-checksum=9cf7d117548265f95ca884e2f4c9fafaf4e17d45a67b11107147b79eed76c966
+checksum=3b4c6a72f7f2b05d54f6c3112b3ebee5131c199fe4de4cf9bbbf71a56666f624
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/haveged/template b/srcpkgs/haveged/template
index bfc2fc6229e..5707e4adb46 100644
--- a/srcpkgs/haveged/template
+++ b/srcpkgs/haveged/template
@@ -1,14 +1,14 @@
 # Template file for 'haveged'
 pkgname=haveged
-version=1.9.4
+version=1.9.8
 revision=1
 build_style=gnu-configure
 short_desc="Entropy harvesting daemon using CPU timings"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="GPL-3.0-or-later"
 homepage="http://www.issihosts.com/haveged"
-distfiles="https://github.com/jirka-h/haveged/archive/${version}.tar.gz"
-checksum=c4959d3cb1fa6391d16a3aa1ba4d82cd3a0d497206ae4b87d638088c0664e5aa
+distfiles="https://github.com/jirka-h/haveged/archive/v${version}.tar.gz"
+checksum=99aa1996c6e39ea2459cfc37addfb8b1eecc63f3a2b6da9db17b22e76b6851ae
 
 post_install() {
 	vsv $pkgname
diff --git a/srcpkgs/help2man/template b/srcpkgs/help2man/template
index 8a284973530..36d4b1b6684 100644
--- a/srcpkgs/help2man/template
+++ b/srcpkgs/help2man/template
@@ -1,14 +1,14 @@
 # Template file for 'help2man'
 pkgname=help2man
-version=1.47.10
+version=1.47.11
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl-Locale-gettext"
 depends="$hostmakedepends"
 short_desc="GNU conversion tool to create man files"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/help2man"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=f371cbfd63f879065422b58fa6b81e21870cd791ef6e11d4528608204aa4dcfb
+checksum=5985b257f86304c8791842c0c807a37541d0d6807ee973000cf8a3fe6ad47b88
 lib32disabled=yes
diff --git a/srcpkgs/hexchat/template b/srcpkgs/hexchat/template
index 1a46e08ae99..fbeaf28ae8a 100644
--- a/srcpkgs/hexchat/template
+++ b/srcpkgs/hexchat/template
@@ -1,7 +1,7 @@
 # Template file for 'hexchat'
 pkgname=hexchat
 version=2.14.2
-revision=5
+revision=6
 build_style=meson
 configure_args="-Dwith-dbus=true -Dwith-ssl=true -Dwith-text=false
  -Dwith-perl=/usr/bin/perl -Dwith-python=python3
diff --git a/srcpkgs/hexyl/template b/srcpkgs/hexyl/template
index 094dadfe87e..2054496993f 100644
--- a/srcpkgs/hexyl/template
+++ b/srcpkgs/hexyl/template
@@ -1,14 +1,14 @@
 # Template file for 'hexyl'
 pkgname=hexyl
-version=0.5.1
-revision=2
+version=0.6.0
+revision=1
 build_style=cargo
 short_desc="Command-line hex viewer"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="Apache-2.0, MIT"
 homepage="https://github.com/sharkdp/hexyl"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=9c12bc6377d1efedc4a1731547448f7eb6ed17ee1c267aad9a35995b42091163
+checksum=5031b20c13b3ccb27abbf119b54609cef16c4152aca2823ee5c53cd5f434b97e
 
 case "$XBPS_TARGET_MACHINE" in
 	aarch64-musl) broken="https://github.com/nix-rust/nix/issues/951"
diff --git a/srcpkgs/hiawatha/template b/srcpkgs/hiawatha/template
index 3ec6202b494..ce962ab6d35 100644
--- a/srcpkgs/hiawatha/template
+++ b/srcpkgs/hiawatha/template
@@ -1,6 +1,6 @@
 # Template file for 'hiawatha'
 pkgname=hiawatha
-version=10.9
+version=10.10
 revision=1
 build_style=cmake
 configure_args="-DLOG_DIR=/var/log/hiawatha -DPID_DIR=/run
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://hiawatha-webserver.org"
 distfiles="${homepage}/files/${pkgname}-${version}.tar.gz"
-checksum=74dd43812272c3ddbf067b6d4da1773cdeef2ffe71e8f164449fabf8431752b8
+checksum=b5e46f5757fa647e77d21d24f7eea912d59f26a75558cba780b45c1c3a33a4d9
 conf_files="/etc/${pkgname}/*.conf /etc/${pkgname}/*.xslt"
 make_dirs="/var/log/hiawatha 0755 root root"
 
diff --git a/srcpkgs/hitori/template b/srcpkgs/hitori/template
index dc367cdadd5..2144995be0d 100644
--- a/srcpkgs/hitori/template
+++ b/srcpkgs/hitori/template
@@ -1,8 +1,8 @@
 # Template file for 'hitori'
 pkgname=hitori
-version=3.22.4
+version=3.34.0
 revision=1
-build_style=gnu-configure
+build_style=meson
 hostmakedepends="glib-devel intltool itstool pkg-config"
 makedepends="gtk+3-devel"
 short_desc="GNOME eponymous puzzle game"
@@ -10,4 +10,4 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2"
 homepage="https://wiki.gnome.org/Apps/Hitori"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=dcac6909b6007857ee425ac8c65fed179f2c71da138d5e5300cd62c8b9ea15d3
+checksum=65d14068f83f4a59f1f9c83c9a813508a54fd19a2d91e4ef7dcf56d10c862298
diff --git a/srcpkgs/homebank/template b/srcpkgs/homebank/template
index 0d9a04b2434..8e5e87f341c 100644
--- a/srcpkgs/homebank/template
+++ b/srcpkgs/homebank/template
@@ -1,6 +1,6 @@
 # Template file for 'homebank'
 pkgname=homebank
-version=5.2.6
+version=5.2.8
 revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config"
@@ -10,5 +10,5 @@ short_desc="Free personal finance software"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://homebank.free.fr/"
-distfiles="http://homebank.free.fr/public/${pkgname}-${version}.tar.gz"
-checksum=9a14cbf7029080f208d76b27a2d8066964426685ddc86fd1abed30bd428c9881
+distfiles="http://homebank.free.fr/public/homebank-${version}.tar.gz"
+checksum=fe98a3585a23ed66695a96b9162dbf1872f4fd78c01471019b60786476bc558d
diff --git a/srcpkgs/hopper/template b/srcpkgs/hopper/template
index 1160a36b1a0..e68d8e1a804 100644
--- a/srcpkgs/hopper/template
+++ b/srcpkgs/hopper/template
@@ -1,6 +1,6 @@
 # Template file for 'hopper'
 pkgname=hopper
-version=4.5.13
+version=4.5.16
 revision=1
 _build=1
 create_wrksrc=yes
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="EULA"
 homepage="https://www.hopperapp.com"
 distfiles="https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-v4-${version}-Linux.pkg.tar.xz"
-checksum=aea44d9ee0eb61b65a39627a7c43b910ec0f4eedfd46eddb2e5b81b47568d88c
+checksum=04951a9a2fdde8f95f5e268c836fae4013308fca48ae45a621ddad68dcb1563e
 
 archs="x86_64"
 restricted=yes
diff --git a/srcpkgs/hplip/template b/srcpkgs/hplip/template
index 337189e7393..07a707569f6 100644
--- a/srcpkgs/hplip/template
+++ b/srcpkgs/hplip/template
@@ -1,6 +1,6 @@
 # Template file for 'hplip'
 pkgname=hplip
-version=3.19.6
+version=3.19.8
 revision=1
 build_style=gnu-configure
 pycompile_dirs="usr/share/hplip"
@@ -31,7 +31,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only, BSD-3-Clause, MIT"
 homepage="https://developers.hp.com/hp-linux-imaging-and-printing"
 distfiles="${SOURCEFORGE_SITE}/hplip/hplip/${version}/hplip-${version}.tar.gz"
-checksum=fcdaedee9ed17d2e70f3aff9558a452d99443d1b93d6623132faf3f3ae61d66d
+checksum=a385fea00241592d148ef1a20082799fa45b36031742157db181d5d94a84ba32
 conflicts="hplip-gui"
 
 CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/libusb-1.0 -I${XBPS_CROSS_BASE}/${py3_inc}"
diff --git a/srcpkgs/httpie/template b/srcpkgs/httpie/template
index 7e435e11fe2..387af8ebf05 100644
--- a/srcpkgs/httpie/template
+++ b/srcpkgs/httpie/template
@@ -1,6 +1,6 @@
 # Template file for 'httpie'
 pkgname=httpie
-version=1.0.2
+version=1.0.3
 revision=1
 archs=noarch
 build_style=python3-module
@@ -9,10 +9,10 @@ hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-requests python3-Pygments"
 short_desc="Human-friendly command line HTTP client"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://httpie.org/"
 license="BSD-3-Clause"
+homepage="https://httpie.org/"
 distfiles="https://github.com/jakubroztocil/httpie/archive/${version}.tar.gz"
-checksum=f11f5ecdbcc0571aa865fb29cd5db68ba6bce4f15a5aae3f27a32d19b0854dc9
+checksum=ecfb1ecdfd1468100bd9ffecebe1bea6d7d72c72149ea91f3d0112dc8ef03c7a
 
 post_install() {
 	vinstall extras/httpie-completion.bash 644 usr/share/bash-completion/completions http
diff --git a/srcpkgs/hub/template b/srcpkgs/hub/template
index dfad19b6565..47b26514f6b 100644
--- a/srcpkgs/hub/template
+++ b/srcpkgs/hub/template
@@ -1,6 +1,6 @@
 # Template file for 'hub'
 pkgname=hub
-version=2.12.3
+version=2.12.8
 revision=1
 build_style=go
 go_import_path=github.com/github/hub
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://hub.github.com/"
 changelog="https://github.com/github/hub/releases"
 distfiles="https://github.com/github/hub/archive/v${version}.tar.gz"
-checksum=197242fea670353688c541d2e4584b449f18c354a01d89bf1667ea33c0071ddc
+checksum=72d09397967c85b118fc1be25dc0fc54353f4dea09f804687a287949c7de7ebe
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" hub"
diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template
index c785474fcbc..c8b96e9f0eb 100644
--- a/srcpkgs/hugo/template
+++ b/srcpkgs/hugo/template
@@ -1,6 +1,6 @@
 # Template file for 'hugo'
 pkgname=hugo
-version=0.56.2
+version=0.58.3
 revision=1
 build_style=go
 go_import_path="github.com/gohugoio/${pkgname}"
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://gohugo.io"
 distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
-checksum=5fecdda6630ed585daa931d6087d95d8e05a24c30cfe7bdd2b29fba340d2650d
+checksum=4733f22fc447d745c88f7c688407d67e9ab67e7e276557f3a48edd8b37900718
 
 build_options="pygments"
 desc_option_pygments="Alternative syntax highlighter"
diff --git a/srcpkgs/hunspell-en_AU/template b/srcpkgs/hunspell-en_AU/template
index 6a748d6ccd5..f8f3b94e6ab 100644
--- a/srcpkgs/hunspell-en_AU/template
+++ b/srcpkgs/hunspell-en_AU/template
@@ -1,6 +1,6 @@
 # Template file for 'hunspell-en_AU'
 pkgname=hunspell-en_AU
-version=2018.04.16
+version=2019.10.06
 revision=1
 archs=noarch
 create_wrksrc=yes
@@ -10,7 +10,7 @@ maintainer="Alexis <flexibeast@gmail.com>"
 license="SCOWL" # not in SPDX
 homepage="http://wordlist.aspell.net/dicts"
 distfiles="${SOURCEFORGE_SITE}/wordlist/speller/${version}/${pkgname}-${version}.zip"
-checksum=c599f7d420ddac12785bf13eccbf007d04c6a3784c949c6a2da0cd40af35e0ce
+checksum=32dbd174c143acdd670f08c1757c7402a197e1e7d5fa634b61e68bb1a26cdcbc
 
 do_install() {
 	vinstall en_AU.aff 644 /usr/share/hunspell
diff --git a/srcpkgs/hunspell-en_GB-ize/template b/srcpkgs/hunspell-en_GB-ize/template
index 69588d7ace7..41001a413a8 100644
--- a/srcpkgs/hunspell-en_GB-ize/template
+++ b/srcpkgs/hunspell-en_GB-ize/template
@@ -2,20 +2,20 @@
 _vpkgname=hunspell-en_GB
 _variant="ize"
 pkgname=${_vpkgname}-${_variant}
-version=2018.04.16
+version=2019.10.06
 revision=1
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-homepage="http://wordlist.aspell.net/dicts"
-license="SCOWL"
 archs=noarch
+create_wrksrc=yes
 hostmakedepends="unzip"
 short_desc="English dictionary for hunspell ${_variant} variant"
-create_wrksrc=yes
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="SCOWL"
+homepage="http://wordlist.aspell.net/dicts"
 provides="${_vpkgname}-${version}_${revision}"
 replaces="${_vpkgname}>=0"
 
 distfiles="${SOURCEFORGE_SITE}/wordlist/speller/${version}/${pkgname}-${version}.zip"
-checksum=fa0a52131ec3a3b73cc2b41687c245026b129ef90a1527390380b4dab5f1bce6
+checksum=20990e242c78ae46e3179dcaf1885d0af2fa3fae67b19facda8dd0246f6fc2b5
 
 do_install() {
 	vinstall en_GB-${_variant}.aff 644 /usr/share/hunspell en_GB.aff
diff --git a/srcpkgs/hunspell-en_US/template b/srcpkgs/hunspell-en_US/template
index bac820aaa00..0d100851774 100644
--- a/srcpkgs/hunspell-en_US/template
+++ b/srcpkgs/hunspell-en_US/template
@@ -1,16 +1,16 @@
 # Template file for 'hunspell-en_US'
 pkgname=hunspell-en_US
-version=2018.04.16
+version=2019.10.06
 revision=1
+archs=noarch
+create_wrksrc=yes
 hostmakedepends="unzip"
+short_desc="American English en_US dictionary for hunspell"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="SCOWL" # not in SPDX
-short_desc="American English en_US dictionary for hunspell"
 homepage="http://wordlist.aspell.net/dicts"
 distfiles="${SOURCEFORGE_SITE}/wordlist/speller/${version}/${pkgname}-${version}.zip"
-checksum=4efdba6438b916a61c4a12933952f458564f2f2af3db9ab3c27f328b37b30ba2
-create_wrksrc=yes
-archs=noarch
+checksum=e0f9c8bbc20da9998ea9daaa8b221f4b1bbaba4211e116318a838354cc856ba5
 
 do_install() {
 	sed -i 's/SET UTF8/SET UTF-8/g' en_US.aff
diff --git a/srcpkgs/hunspell-es_ES/template b/srcpkgs/hunspell-es_ES/template
index a4b6f84c06c..f24f904620f 100644
--- a/srcpkgs/hunspell-es_ES/template
+++ b/srcpkgs/hunspell-es_ES/template
@@ -1,6 +1,6 @@
 # Template file for 'hunspell-es_ES'
 pkgname=hunspell-es_ES
-version=2.4
+version=2.5
 revision=1
 archs=noarch
 create_wrksrc=yes
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later, LGPL-3.0-or-later, MPL-1.1"
 homepage="https://github.com/sbosio/rla-es"
 distfiles="https://github.com/sbosio/rla-es/releases/download/v${version}/es_ES.oxt>dict-es.zip"
-checksum=c1b47643e694b1bb1002d964684b8669a9a4976ca3db48d4a20f5bc3f9d8d40e
+checksum=22a3b973f1667ddfd2d5c130623a16e22f9722a27437ba66d1de4fe569d32d0f
 
 do_install() {
 	vinstall es_ES.aff 644 /usr/share/hunspell
diff --git a/srcpkgs/hunspell-pl_PL/template b/srcpkgs/hunspell-pl_PL/template
index 11974615d5e..31158cc9bec 100644
--- a/srcpkgs/hunspell-pl_PL/template
+++ b/srcpkgs/hunspell-pl_PL/template
@@ -1,6 +1,6 @@
 # Template file for 'hunspell-pl_PL'
 pkgname=hunspell-pl_PL
-version=20190812
+version=20191005
 revision=1
 archs=noarch
 create_wrksrc=yes
@@ -10,7 +10,7 @@ maintainer="m-cz <emcze@ya.ru>"
 license="GPL-2.0-only, LGPL-2.1-only, CC-BY-4.0, MPL-1.1, Apache-2.0"
 homepage="https://sjp.pl/slownik/ort/"
 distfiles="https://sjp.pl/slownik/ort/sjp-myspell-pl-${version}.zip"
-checksum=60bf16820551816acec9d708dbc7982ecfe3d6caeb377021324124583030a1b7
+checksum=45035bb507849a203a835c211720e3e65ef401a3605c5f7f1951c7450242156f
 
 post_extract() {
 	unzip pl_PL.zip
diff --git a/srcpkgs/hwids/template b/srcpkgs/hwids/template
index e44c19a39ca..a7ee61a427d 100644
--- a/srcpkgs/hwids/template
+++ b/srcpkgs/hwids/template
@@ -1,15 +1,15 @@
 # Template file for 'hwids'
 pkgname=hwids
-version=20190316
+version=20190818
 revision=1
 archs=noarch
 wrksrc="hwids-hwids-${version}"
 short_desc="Hardware Identification Databases"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/gentoo/hwids"
 distfiles="https://github.com/gentoo/hwids/archive/hwids-${version}.tar.gz"
-checksum=e4498020b2c1a1ea5faf1e9d30bda0ae161aaf8e8fb17f40e1c6b8dc896c5d9e
+checksum=cee0947dd345fbd3aa2dc008c53d81d05358f7fbebc4eadd626b688a586e83fd
 
 do_install() {
 	vmkdir usr/share/hwdata
diff --git a/srcpkgs/hydroxide/template b/srcpkgs/hydroxide/template
index 6ea22f860f8..2181a2120ae 100644
--- a/srcpkgs/hydroxide/template
+++ b/srcpkgs/hydroxide/template
@@ -1,6 +1,6 @@
 # Template file for 'hydroxide'
 pkgname=hydroxide
-version=0.2.6
+version=0.2.9
 revision=1
 build_style=go
 go_import_path=github.com/emersion/hydroxide/cmd/hydroxide
@@ -10,9 +10,8 @@ maintainer="DirectorX <void.directorx@protonmail.com>"
 license="MIT"
 homepage="https://github.com/emersion/hydroxide"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=49b1cea513fd3c012dc1b09a60d19656fe7f12be647b4cbb25b36be580772b40
+checksum=dacf8720620855171bbb201bdcd757364701c53071e3b82a00646ae95e019829
 
 post_install() {
 	vlicense LICENSE
 }
-
diff --git a/srcpkgs/hyperfine/template b/srcpkgs/hyperfine/template
index 7743009e710..66d27d51a8f 100644
--- a/srcpkgs/hyperfine/template
+++ b/srcpkgs/hyperfine/template
@@ -1,15 +1,15 @@
 # Template file for 'hyperfine'
 pkgname=hyperfine
-version=1.5.0
+version=1.8.0
 revision=1
 build_style=cargo
 short_desc="Command-line benchmarking tool"
 maintainer="Wilson Birney <wpb@360scada.com>"
-license="MIT"
+license="MIT, Apache-2.0"
 homepage="https://github.com/sharkdp/hyperfine"
 changelog="https://github.com/sharkdp/hyperfine/releases"
 distfiles="https://github.com/sharkdp/hyperfine/archive/v${version}.tar.gz"
-checksum=d5183611348e696e579dda846cee92b7b78c8ef18c00bfb9b0a62d0a63034823
+checksum=14de63b44eb4c2c5d6a6f9354acbcff350c9a2ba50b2397de5798c152cc2a029
 
 post_install() {
 	vlicense LICENSE-MIT
diff --git a/srcpkgs/i2pd/template b/srcpkgs/i2pd/template
index f96adface6b..1ba8e910453 100644
--- a/srcpkgs/i2pd/template
+++ b/srcpkgs/i2pd/template
@@ -1,6 +1,6 @@
 # Template file for 'i2pd'
 pkgname=i2pd
-version=2.27.0
+version=2.28.0
 revision=1
 build_style=gnu-makefile
 make_build_args="USE_UPNP=yes"
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://i2pd.website/"
 changelog="https://raw.githubusercontent.com/PurpleI2P/i2pd/openssl/ChangeLog"
 distfiles="https://github.com/PurpleI2P/i2pd/archive/${version}.tar.gz"
-checksum=46aa20760c85e3c5bf79229cd86b75a4c7e163271d400d0f104913d64cb8e093
+checksum=181327edc7cf5b3c25ee51ecc518a4da90fa9e421eca2107996791038a514a21
 disable_parallel_build=yes
 
 conf_files="
diff --git a/srcpkgs/i3-gaps/template b/srcpkgs/i3-gaps/template
index 7e3e60ea9ea..1092e5fad4d 100644
--- a/srcpkgs/i3-gaps/template
+++ b/srcpkgs/i3-gaps/template
@@ -1,6 +1,6 @@
 # Template file for 'i3-gaps'
 pkgname=i3-gaps
-version=4.17
+version=4.17.1
 revision=1
 wrksrc="i3-${version}"
 build_style=gnu-configure
@@ -17,7 +17,7 @@ maintainer="ian c. <ian@airmail.cc>"
 license="BSD-3-Clause"
 homepage="https://github.com/Airblader/i3"
 distfiles="${homepage}/archive/${version}.tar.gz>${version}.tar.gz"
-checksum=4fbe0d80f8ef8814f266705318885e15e316774e98fb26f40199e51ed2eea2ed
+checksum=10d75b32786f54cc8854287478f83ff428e6996b73b3cd9b6ba86cee2adf570a
 
 provides="i3-${version}_${revision}"
 replaces="i3>=0"
diff --git a/srcpkgs/i3/template b/srcpkgs/i3/template
index f4f13d4c9cd..542b1fe701f 100644
--- a/srcpkgs/i3/template
+++ b/srcpkgs/i3/template
@@ -1,6 +1,6 @@
 # Template file for 'i3'
 pkgname=i3
-version=4.17
+version=4.17.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-builddir"
@@ -16,7 +16,7 @@ maintainer="Frank Steinborn <steinex@nognu.de>"
 license="BSD-3-Clause"
 homepage="https://i3wm.org/"
 distfiles="${homepage}/downloads/${pkgname}-${version}.tar.bz2"
-checksum=4ebe13e47d6b88fb31d0cb1492e9d968d96aafcd834b8d3cae18b684e7ac18fd
+checksum=1e8fe133a195c29a8e2aa3b1c56e5bc77e7f5534f2dd92e09faabe2ca2d85f45
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) makedepends+=" libglob-devel";;
diff --git a/srcpkgs/i3lock-color/template b/srcpkgs/i3lock-color/template
index 1ec44f0c738..07bd585c69d 100644
--- a/srcpkgs/i3lock-color/template
+++ b/srcpkgs/i3lock-color/template
@@ -1,7 +1,7 @@
 # Template file for 'i3lock-color'
 pkgname=i3lock-color
 version=2.12
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}.c"
 build_style=gnu-configure
 hostmakedepends="pkg-config automake"
@@ -20,6 +20,10 @@ pre_configure() {
 	autoreconf -i
 }
 
+pre_build() {
+	vsed -i 's:login:system-auth:' pam/i3lock
+}
+
 post_install() {
 	vlicense LICENSE
 }
diff --git a/srcpkgs/i3lock-fancy/template b/srcpkgs/i3lock-fancy/template
index fbbf22d0143..5bb3502b4ed 100644
--- a/srcpkgs/i3lock-fancy/template
+++ b/srcpkgs/i3lock-fancy/template
@@ -5,7 +5,7 @@ revision=1
 archs=noarch
 depends="util-linux bash ImageMagick i3lock wmctrl gawk"
 short_desc="Fancy lockscreen using i3lock"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/meskarune/i3lock-fancy"
 distfiles="https://github.com/meskarune/i3lock-fancy/archive/${version}.tar.gz"
diff --git a/srcpkgs/i3status-rust/patches/fix-32bit.patch b/srcpkgs/i3status-rust/patches/fix-32bit.patch
index d77308460ea..dc05dfa9eca 100644
--- a/srcpkgs/i3status-rust/patches/fix-32bit.patch
+++ b/srcpkgs/i3status-rust/patches/fix-32bit.patch
@@ -5,20 +5,20 @@ diff --git a/src/blocks/disk_space.rs b/src/blocks/disk_space.rs
          let mut result;
          let mut converted = 0.0f64;
          let mut converted_str = String::new();
--        let total = statvfs.blocks() * statvfs.fragment_size();
--        let used = (statvfs.blocks() - statvfs.blocks_free()) * statvfs.fragment_size();
-+        let total = (statvfs.blocks() as u64 * statvfs.fragment_size() as u64) as u64;
-+        let used = ((statvfs.blocks() as u64 - statvfs.blocks_free() as u64) * statvfs.fragment_size() as u64) as u64;
+-        let total = (statvfs.blocks() * statvfs.fragment_size()) as u64;
+-        let used = ((statvfs.blocks() - statvfs.blocks_free()) * statvfs.fragment_size()) as u64;
++        let total = (statvfs.blocks() as u64) * (statvfs.fragment_size() as u64);
++        let used = ((statvfs.blocks() as u64) - (statvfs.blocks_free() as u64)) * (statvfs.fragment_size() as u64);
  
          match self.info_type {
              InfoType::Available => {
--                result = statvfs.blocks_available() * statvfs.block_size();
-+                result = (statvfs.blocks_available() as u64 * statvfs.block_size() as u64) as u64;
+-                result = (statvfs.blocks_available() * statvfs.block_size()) as u64;
++                result = (statvfs.blocks_available() as u64) * (statvfs.block_size() as u64);
                  converted = Unit::bytes_in_unit(self.unit, result);
              }
              InfoType::Free => {
--                result = statvfs.blocks_free() * statvfs.block_size();
-+                result = (statvfs.blocks_free() as u64 * statvfs.block_size() as u64) as u64;
+-                result = (statvfs.blocks_free() * statvfs.block_size()) as u64;
++                result = (statvfs.blocks_free() as u64) * (statvfs.block_size() as u64);
                  converted = Unit::bytes_in_unit(self.unit, result);
              }
              InfoType::Total => {
diff --git a/srcpkgs/i3status-rust/template b/srcpkgs/i3status-rust/template
index 8e01ed53609..8d7775ee134 100644
--- a/srcpkgs/i3status-rust/template
+++ b/srcpkgs/i3status-rust/template
@@ -1,7 +1,7 @@
 # Template file for 'i3status-rust'
 pkgname=i3status-rust
-version=0.10.0
-revision=3
+version=0.11.0
+revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
 makedepends="dbus-devel pulseaudio-devel"
@@ -10,8 +10,4 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="GPL-3.0-only"
 homepage="https://github.com/greshake/i3status-rust"
 distfiles="https://github.com/greshake/i3status-rust/archive/v${version}.tar.gz"
-checksum=84a12a91419fda35109a0be3980671c1d58e13c5987e6dc999cbe786d05053d9
-
-case "$XBPS_TARGET_MACHINE" in
-	ppc*) broken="old broken version of nix (0.8.1) in dep tree" ;;
-esac
+checksum=2f749ba4646e2fc0af62d31c990ae8d59d454eb0e5fe947b39d64cfeabbb0a1c
diff --git a/srcpkgs/i3status/patches/pulseaudio-optional.patch b/srcpkgs/i3status/patches/pulseaudio-optional.patch
new file mode 100644
index 00000000000..895097d221c
--- /dev/null
+++ b/srcpkgs/i3status/patches/pulseaudio-optional.patch
@@ -0,0 +1,95 @@
+# reason: make pulseaudio optional
+# upstream: yes (>2.13)
+# ```
+# cd i3status
+# git diff --no-prefix 2.13..23da59920c -- configure.ac Makefile.am i3status.c src/print_volume.c
+# ```
+
+diff --git Makefile.am Makefile.am
+index bb251f0..c2c1c0a 100644
+--- Makefile.am
++++ Makefile.am
+@@ -68,8 +68,11 @@ i3status_SOURCES = \
+ 	src/print_volume.c \
+ 	src/print_wireless_info.c \
+ 	src/print_file_contents.c \
+-	src/process_runs.c \
+-	src/pulse.c
++	src/process_runs.c
++
++if PULSE
++i3status_SOURCES += src/pulse.c
++endif
+ 
+ dist_sysconf_DATA = \
+ 	i3status.conf
+diff --git configure.ac configure.ac
+index cf9e430..11caa33 100644
+--- configure.ac
++++ configure.ac
+@@ -80,11 +80,24 @@ AC_CANONICAL_HOST
+ PKG_CHECK_MODULES([CONFUSE], [libconfuse])
+ PKG_CHECK_MODULES([YAJL], [yajl])
+ 
++AC_ARG_ENABLE(pulseaudio,
++  AS_HELP_STRING(
++    [--disable-pulseaudio],
++    [build without pulseaudio support]),
++  [ax_pulse=$enableval],
++  [ax_pulse=yes])
++AM_CONDITIONAL([PULSE], [test x$ax_pulse = xyes])
++AS_IF([test x"$ax_pulse" = x"yes"],
++      [PKG_CHECK_MODULES([PULSE], [libpulse])])
++pulse_def=0
++AS_IF([test x"$ax_pulse" = x"yes"],
++      [pulse_def=1])
++AC_DEFINE_UNQUOTED([HAS_PULSEAUDIO], [$pulse_def], [Build with pulseaudio])
++
+ case $host_os in
+ 	linux*)
+ 	PKG_CHECK_MODULES([NLGENL], [libnl-genl-3.0])
+ 	PKG_CHECK_MODULES([ALSA], [alsa])
+-	PKG_CHECK_MODULES([PULSE], [libpulse])
+ 	;;
+ 	netbsd*)
+ 	AC_SEARCH_LIBS([prop_string_create], [prop])
+@@ -151,6 +164,7 @@ AS_HELP_STRING([is release version:], [${is_release}])
+ AS_HELP_STRING([enable debug flags:], [${ax_enable_debug}])
+ AS_HELP_STRING([code coverage:], [${CODE_COVERAGE_ENABLED}])
+ AS_HELP_STRING([enabled sanitizers:], [${ax_enabled_sanitizers}])
++AS_HELP_STRING([pulseaudio support:], [${ax_pulse}])
+ 
+ To compile, run:
+ 
+diff --git i3status.c i3status.c
+index 0898da3..1ab8400 100644
+--- i3status.c
++++ i3status.c
+@@ -565,7 +565,13 @@ int main(int argc, char *argv[]) {
+                 return 0;
+                 break;
+             case 'v':
+-                printf("i3status " VERSION " © 2008 Michael Stapelberg and contributors\n");
++                printf("i3status " VERSION " © 2008 Michael Stapelberg and contributors\n"
++#if HAS_PULSEAUDIO
++                       "Built with pulseaudio support\n"
++#else
++                       "Built without pulseaudio support\n"
++#endif
++                       );
+                 return 0;
+                 break;
+             case 0:
+diff --git src/print_volume.c src/print_volume.c
+index 91e8ce2..7364d47 100644
+--- src/print_volume.c
++++ src/print_volume.c
+@@ -86,7 +86,7 @@ void print_volume(yajl_gen json_gen, char *buffer, const char *fmt, const char *
+         free(instance);
+     }
+ 
+-#if !defined(__DragonFly__) && !defined(__OpenBSD__)
++#if HAS_PULSEAUDIO
+     /* Try PulseAudio first */
+ 
+     /* If the device name has the format "pulse[:N]" where N is the
diff --git a/srcpkgs/i3status/template b/srcpkgs/i3status/template
index 3bfa6a3481e..9474d13234b 100644
--- a/srcpkgs/i3status/template
+++ b/srcpkgs/i3status/template
@@ -1,39 +1,48 @@
 # Template file for 'i3status'
 pkgname=i3status
-version=2.12
+version=2.13
 revision=1
-hostmakedepends="asciidoc pkg-config"
+build_style=gnu-configure
+configure_args="--disable-builddir $(vopt_if pulseaudio '' --disable-pulseaudio)"
+hostmakedepends="automake asciidoc pkg-config xmlto"
 makedepends="alsa-lib-devel confuse-devel libcap-devel libnl3-devel
- pulseaudio-devel yajl-devel"
+ yajl-devel $(vopt_if pulseaudio pulseaudio-devel)"
 depends="libcap-progs"
 short_desc="Status bar generator for i3bar, dzen2, xmobar or similar programs"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Lugubris <lugubris@disroot.org>"
 license="BSD-3-Clause"
 homepage="https://www.i3wm.org/i3status/"
 #changelog="https://raw.githubusercontent.com/i3/i3status/master/CHANGELOG"
 distfiles="${homepage}/${pkgname}-${version}.tar.bz2"
-checksum=6fc6881536043391ab4bed369d956f99d1088965d8bcebed18d1932de3ba791a
+checksum=ce89c9ff8565f62e88299f1a611229afdfc356b4e97368a5f8c4f06ad2fa1466
 conf_files="/etc/i3status.conf"
 
+build_options="pulseaudio"
+build_options_default="pulseaudio"
+
 case "$XBPS_TARGET_MACHINE" in
-	*-musl) makedepends+=" libglob-devel";;
+	*-musl)
+		makedepends+=" libglob-devel"
+		export LIBS="${XBPS_CROSS_BASE}/usr/lib/libglob.a"
+		;;
 esac
 
-do_build() {
+post_patch() {
 	case "$XBPS_TARGET_MACHINE" in
 	*-musl)
-		sed -i '/include/s,glob.h,libglob/glob.h,g' src/process_runs.c src/print_cpu_temperature.c i3status.c
-		sed -i '/GLOB_TILDE/s/glob(/g_glob(/g' src/process_runs.c src/print_cpu_temperature.c i3status.c
-		sed -i 's/globfree(/g_globfree(/g' src/process_runs.c src/print_cpu_temperature.c i3status.c
-		export LIBS="$XBPS_CROSS_BASE/usr/lib/libglob.a"
+		vsed \
+		  -e '/include/s,glob.h,libglob/glob.h,g' \
+		  -e '/GLOB_TILDE/s/glob(/g_glob(/g' \
+		  -e 's/globfree(/g_globfree(/g' \
+		  -i src/process_runs.c src/print_cpu_temperature.c i3status.c
 		;;
 	esac
-	make CC=$CC ${makejobs}
 }
 
-do_install() {
-	make PREFIX=/usr DESTDIR=${DESTDIR} install
-	# detect dhcpcd.
-	sed -i -e "s#dhclient#dhcpcd#g" ${DESTDIR}/etc/i3status.conf
+pre_configure() {
+	autoreconf -vfi
+}
+
+post_install() {
 	vlicense LICENSE
 }
diff --git a/srcpkgs/iagno/template b/srcpkgs/iagno/template
index 42215135b1d..76fed345932 100644
--- a/srcpkgs/iagno/template
+++ b/srcpkgs/iagno/template
@@ -1,13 +1,13 @@
 # Template file for 'iagno'
 pkgname=iagno
-version=3.32.0
-revision=2
+version=3.34.2
+revision=1
 build_style=meson
 hostmakedepends="glib-devel itstool pkg-config vala"
-makedepends="libcanberra-devel librsvg-devel"
+makedepends="gsound-devel libcanberra-devel librsvg-devel"
 short_desc="GNOME Reversi (Othello) game"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Iagno"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ed040e8fc6a7e965f20dc267136cd693a497e75402137b10ef2654751f5998e5
+checksum=c9beb1788339965bafc1bb14ce0f9ede9c93db7d2445580a2bf6e18a96996164
diff --git a/srcpkgs/ibus-bamboo/template b/srcpkgs/ibus-bamboo/template
index 6db7c943552..0e14d425b64 100644
--- a/srcpkgs/ibus-bamboo/template
+++ b/srcpkgs/ibus-bamboo/template
@@ -1,6 +1,6 @@
 # Template file for 'ibus-bamboo'
 pkgname=ibus-bamboo
-version=0.5.3
+version=0.5.8
 revision=1
 hostmakedepends="go"
 makedepends="libXtst-devel libX11-devel"
@@ -10,7 +10,7 @@ maintainer="ndgnuh <ndgnuh99@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/BambooEngine/ibus-bamboo"
 distfiles="${homepage}/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum="8718418f5cb616808ca6827b0851ead83ee4660a981bcb9143edf0a5cf12e43a"
+checksum="e4fbf2df5d6bab75323bc8ad1dd6f2d1e847db41a49b63e69169acb1ba9e94e5"
 nocross="armv7l-linux-gnueabihf-gcc: error: unrecognized command line option '-m64'"
 _engine_dir="usr/share/ibus-bamboo/"
 _ibus_dir="usr/share/ibus"
diff --git a/srcpkgs/ibus-m17n/INSTALL.msg b/srcpkgs/ibus-m17n/INSTALL.msg
new file mode 100644
index 00000000000..fbc9da6e6d1
--- /dev/null
+++ b/srcpkgs/ibus-m17n/INSTALL.msg
@@ -0,0 +1,2 @@
+If the M17N languages don't appear in ibus-setup or GNOME Control Center
+run `ibus-daemon -xdr` or simply reboot.
diff --git a/srcpkgs/ibus-m17n/template b/srcpkgs/ibus-m17n/template
new file mode 100644
index 00000000000..db0ab6ea93a
--- /dev/null
+++ b/srcpkgs/ibus-m17n/template
@@ -0,0 +1,19 @@
+# Template file for 'ibus-m17n'
+pkgname=ibus-m17n
+version=1.4.1
+revision=1
+build_style=gnu-configure
+configure_args="--prefix=/usr --libexecdir=/usr/lib/ibus"
+hostmakedepends="ibus m17n-db m17n-lib gnome-common xz pkg-config automake libtool gettext-devel"
+makedepends="ibus-devel m17n-lib-devel"
+depends="ibus m17n-db"
+short_desc="M17N engine for IBus"
+maintainer="reback00 <reback00@protonmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/ibus/ibus-m17n"
+distfiles="https://github.com/ibus/ibus-m17n/releases/download/${version}/ibus-m17n-${version}.tar.gz"
+checksum=5207f0b99bd17cae05251f96649dd26ec09f2feedb47dbe92a5128c7eeea4762
+
+pre_configure() {
+	autoreconf -fi
+}
diff --git a/srcpkgs/icdiff/template b/srcpkgs/icdiff/template
index 8aba093e5d7..31cfc3e2354 100644
--- a/srcpkgs/icdiff/template
+++ b/srcpkgs/icdiff/template
@@ -1,7 +1,7 @@
 # Template file for 'icdiff'
 pkgname=icdiff
-version=1.9.4
-revision=2
+version=1.9.5
+revision=1
 wrksrc="${pkgname}-release-${version}"
 archs=noarch
 build_style=python-module
@@ -14,7 +14,7 @@ license="Python-2.0"
 homepage="http://www.jefftk.com/icdiff"
 changelog="https://github.com/jeffkaufman/icdiff/raw/master/ChangeLog"
 distfiles="https://github.com/jeffkaufman/icdiff/archive/release-${version}.tar.gz"
-checksum=dabceff1986d45f1e0e6a396ed71836586acfb99092a91303f14052b879ca59a
+checksum=f2e3df30e93df92224538ef3c62a73891af92de4caf94e8117582835e1040fc7
 
 alternatives="
  icdiff:icdiff:/usr/bin/icdiff2
diff --git a/srcpkgs/ice-ssb/template b/srcpkgs/ice-ssb/template
index 62315cc7211..e604b9bfbc3 100644
--- a/srcpkgs/ice-ssb/template
+++ b/srcpkgs/ice-ssb/template
@@ -1,6 +1,6 @@
 # Template file for 'ice-ssb'
 pkgname=ice-ssb
-version=6.0.5
+version=6.0.6
 revision=1
 archs=noarch
 wrksrc="ice-$version"
@@ -11,7 +11,7 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/peppermintos/ice/"
 changelog="https://github.com/peppermintos/ice/blob/${version}/debian/changelog"
 distfiles="https://github.com/peppermintos/ice/archive/v${version}.tar.gz"
-checksum=390bd16de7a6eff6a382a5efc2779bd60b74b65943234b628bf9a839fc1a1f80
+checksum=5422094e74cb9b77059631b5bc4ed6c74e7d3d48390aef142f638c8735a942cf
 
 post_extract() {
 	sed -i -e 's/chromium-browser/chromium/g' usr/bin/ice
diff --git a/srcpkgs/firefox-esr/patches/fix-musl.patch b/srcpkgs/icecat/patches/fix-gettid.patch
similarity index 61%
rename from srcpkgs/firefox-esr/patches/fix-musl.patch
rename to srcpkgs/icecat/patches/fix-gettid.patch
index c32921d39e1..6abd59b30c3 100644
--- a/srcpkgs/firefox-esr/patches/fix-musl.patch
+++ b/srcpkgs/icecat/patches/fix-gettid.patch
@@ -1,3 +1,6 @@
+originally, the gettid wrapper was needed on glibc and musl,
+glibc-2.30 added a gettid function, so now it is only needed on musl
+
 --- tools/profiler/core/platform.h.orig
 +++ tools/profiler/core/platform.h
 @@ -56,7 +56,7 @@
@@ -5,7 +8,7 @@
  // We need a definition of gettid(), but glibc doesn't provide a
  // wrapper for it.
 -#if defined(__GLIBC__)
-+#if defined(__linux__)
++#if defined(__linux__) && !defined(__GLIBC__)
  #include <unistd.h>
  #include <sys/syscall.h>
  static inline pid_t gettid()
diff --git a/srcpkgs/icecat/patches/fix-musl.patch b/srcpkgs/icecat/patches/fix-musl.patch
deleted file mode 100644
index c32921d39e1..00000000000
--- a/srcpkgs/icecat/patches/fix-musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- tools/profiler/core/platform.h.orig
-+++ tools/profiler/core/platform.h
-@@ -56,7 +56,7 @@
-
- // We need a definition of gettid(), but glibc doesn't provide a
- // wrapper for it.
--#if defined(__GLIBC__)
-+#if defined(__linux__)
- #include <unistd.h>
- #include <sys/syscall.h>
- static inline pid_t gettid()
diff --git a/srcpkgs/icecat/patches/rust-cssparser.patch b/srcpkgs/icecat/patches/rust-cssparser.patch
new file mode 100644
index 00000000000..1ebef87c014
--- /dev/null
+++ b/srcpkgs/icecat/patches/rust-cssparser.patch
@@ -0,0 +1,90 @@
+backport of:
+
+From 3c98d22c5de3b696bf1fde2b6c90069812312aa6 Mon Sep 17 00:00:00 2001
+From: Simon Sapin <simon.sapin@exyr.org>
+Date: Tue, 23 Apr 2019 13:47:25 +0200
+Subject: [PATCH] Fix a future-compat warning
+
+```
+warning[E0506]: cannot assign to `self.input.cached_token` because it is borrowed
+   --> src/parser.rs:591:17
+    |
+566 |     pub fn next_including_whitespace_and_comments(&mut self) -> Result<&Token<'i>, BasicParseError<'i>> {
+    |                                                   - let's call the lifetime of this reference `'1`
+...
+579 |             Some(ref cached_token)
+    |                  ---------------- borrow of `self.input.cached_token` occurs here
+...
+591 |                 self.input.cached_token = Some(CachedToken {
+    |                 ^^^^^^^^^^^^^^^^^^^^^^^ assignment to borrowed `self.input.cached_token` occurs here
+...
+603 |         Ok(token)
+    |         --------- returning this value requires that `self.input.cached_token.0` is borrowed for `'1`
+    |
+    = warning: this error has been downgraded to a warning for backwards compatibility with previous releases
+    = warning: this represents potential undefined behavior in your code and this warning will become a hard error in the future
+```
+---
+ src/parser.rs | 50 +++++++++++++++++++++++++++-----------------------
+ 1 file changed, 27 insertions(+), 23 deletions(-)
+
+diff --git a/src/parser.rs b/src/parser.rs
+index 51f441e4..7cef117c 100644
+--- third_party/rust/cssparser/src/parser.rs
++++ third_party/rust/cssparser/src/parser.rs
+@@ -555,28 +555,34 @@
+         }
+ 
+         let token_start_position = self.input.tokenizer.position();
+-        let token;
+-        match self.input.cached_token {
+-            Some(ref cached_token)
+-            if cached_token.start_position == token_start_position => {
+-                self.input.tokenizer.reset(&cached_token.end_state);
+-                match cached_token.token {
+-                    Token::Function(ref name) => self.input.tokenizer.see_function(name),
+-                    _ => {}
+-                }
+-                token = &cached_token.token
++        let using_cached_token = self
++            .input
++            .cached_token
++            .as_ref()
++            .map_or(false, |cached_token| {
++                cached_token.start_position == token_start_position
++            });
++        let token = if using_cached_token {
++            let cached_token = self.input.cached_token.as_ref().unwrap();
++            self.input.tokenizer.reset(&cached_token.end_state);
++            match cached_token.token {
++                Token::Function(ref name) => self.input.tokenizer.see_function(name),
++                _ => {}
+             }
+-            _ => {
+-                let new_token = self.input.tokenizer.next()
+-                    .map_err(|()| self.new_basic_error(BasicParseErrorKind::EndOfInput))?;
+-                self.input.cached_token = Some(CachedToken {
+-                    token: new_token,
+-                    start_position: token_start_position,
+-                    end_state: self.input.tokenizer.state(),
+-                });
+-                token = self.input.cached_token_ref()
+-            }
+-        }
++            &cached_token.token
++        } else {
++            let new_token = self
++                .input
++                .tokenizer
++                .next()
++                .map_err(|()| self.new_basic_error(BasicParseErrorKind::EndOfInput))?;
++            self.input.cached_token = Some(CachedToken {
++                token: new_token,
++                start_position: token_start_position,
++                end_state: self.input.tokenizer.state(),
++            });
++            self.input.cached_token_ref()
++        };
+ 
+         if let Some(block_type) = BlockType::opening(token) {
+             self.at_start_of = Some(block_type);
diff --git a/srcpkgs/icecat/template b/srcpkgs/icecat/template
index 64a466766d9..655d7cab66e 100644
--- a/srcpkgs/icecat/template
+++ b/srcpkgs/icecat/template
@@ -37,6 +37,13 @@ if [ "$XBPS_WORDSIZE" -eq 32 ]; then
 	nodebug=yes
 fi
 
+# we need this because cargo verifies checksums of all files in vendor
+# crates when it builds and gives us no way to override or update the
+# file sanely... so just clear out the file list
+_clear_vendor_checksums() {
+	sed -i 's/\("files":{\)[^}]*/\1/' third_party/rust/$1/.cargo-checksum.json
+}
+
 post_extract() {
 	case "$XBPS_TARGET_MACHINE" in
 	*-musl)
@@ -51,6 +58,11 @@ post_extract() {
 	# Note: This is for Void Linux use ONLY.
 	echo -n "cd894504-7a2a-4263-abff-ff73ee89ffca" > mozilla-api-key
 }
+
+post_patch() {
+	_clear_vendor_checksums cssparser
+}
+
 do_build() {
 	local triplet
 	cp ${FILESDIR}/mozconfig .mozconfig
diff --git a/srcpkgs/icewm/patches/use-NULL.patch b/srcpkgs/icewm/patches/use-NULL.patch
deleted file mode 100644
index 855c1a446c6..00000000000
--- a/srcpkgs/icewm/patches/use-NULL.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-For unknown reasons g++ complains about these usages
-of 'nullptr' being unknown and suggests to use 'fileptr'
-instead, which of course is wrong.
-Use the C way of describing a null pointer as NULL for now.
-
---- src/wmconfig.cc	2019-05-07 12:15:34.814033408 +0200
-+++ src/wmconfig.cc	2019-05-07 12:17:38.655028470 +0200
-@@ -50,7 +50,7 @@
-     if (!append) {
-         for (long i = 0; i < workspaceCount; i++) {
-             delete[] workspaceNames[i];
--            workspaceNames[i] = nullptr;
-+            workspaceNames[i] = NULL;
-         }
-         workspaceCount = 0;
-     }
---- src/icewmhint.cc	2019-04-23 22:12:00.000000000 +0200
-+++ src/icewmhint.cc	2019-05-07 12:19:35.440023813 +0200
-@@ -32,7 +32,7 @@
-     Hinter() :
-         display(XOpenDisplay(NULL))
-     {
--        if (display == nullptr)
-+        if (display == NULL)
-             die(1,  _("Can't open display: %s. "
-                       "X must be running and $DISPLAY set."),
-                     XDisplayName(NULL));
-@@ -52,7 +52,7 @@
-             size += 1 + strlen(args[i]);
- 
-         unsigned char *hint = new unsigned char [size];
--        if (hint == nullptr)
-+        if (hint == NULL)
-             die(1, _("Out of memory (len=%d)."), int(size));
- 
-         size_t copy = 0;
-@@ -79,7 +79,7 @@
- 
-     char** arg = &argv[1];
-     for (; arg < &argv[argc] && **arg == '-'; ++arg) {
--        char* value = nullptr;
-+        char* value = NULL;
-         if (GetArgument(value, "d", "display", arg, argv + argc)) {
-             setenv("DISPLAY", value, True);
-         }
diff --git a/srcpkgs/icewm/template b/srcpkgs/icewm/template
index 70a445f4874..a011b4a8d7d 100644
--- a/srcpkgs/icewm/template
+++ b/srcpkgs/icewm/template
@@ -1,19 +1,29 @@
 # Template file for 'icewm'
 pkgname=icewm
-version=1.5.4
-revision=3
+version=1.6.2
+revision=1
 build_style=cmake
 configure_args="-DENABLE_LTO=ON -DCONFIG_LIBRSVG=ON -DENABLE_ALSA=ON -DCFGDIR=/etc/icewm"
 hostmakedepends="asciidoc gettext-devel libtool mkfontdir perl pkg-config"
 makedepends="libSM-devel libXft-devel libXinerama-devel libXpm-devel
- libXrandr-devel libao-devel librsvg-devel libsndfile-devel"
+ libXrandr-devel libao-devel librsvg-devel libsndfile-devel libXcomposite-devel fribidi-devel"
 depends="shared-mime-info"
 short_desc="Window Manager designed for speed, usability, and consistency"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="https://github.com/bbidulock/icewm"
-distfiles="https://github.com/ice-wm/icewm/releases/download/${version}/icewm-${version}.tar.xz"
-checksum=895c81d6672a3eaa91c76a0807ea8fea6789b8a3c8626635f1c11d7c5ca059ea
+homepage="https://ice-wm.org/"
+distfiles="https://github.com/ice-wm/icewm/archive/${version}.tar.gz"
+checksum=1008c17caa7d69a0bd29e5122efee278c99f0082b4c02b1e2a45c188ea9396dc
 
 # No c++ warnings for 'One Defintion Rules' and make sure LTO goes ok
 CXXFLAGS="-Wno-odr -fno-strict-aliasing"
+
+
+if [ "$CROSS_BUILD" ]; then
+	makedepends+=" libXdamage-devel"
+fi
+
+
+pre_install() {
+	cp lib/IceWM.jpg build/lib/IceWM.jpg
+}
diff --git a/srcpkgs/iio-sensor-proxy/template b/srcpkgs/iio-sensor-proxy/template
index d87d043350b..b8bd7003535 100644
--- a/srcpkgs/iio-sensor-proxy/template
+++ b/srcpkgs/iio-sensor-proxy/template
@@ -1,6 +1,6 @@
 # Template file for 'iio-sensor-proxy'
 pkgname=iio-sensor-proxy
-version=2.7
+version=2.8
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake gtk-doc pkg-config git gnome-common autoconf-archive glib-devel libtool"
@@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-3"
 homepage="https://github.com/hadess/iio-sensor-proxy"
 distfiles="$homepage/archive/$version.tar.gz"
-checksum=14e8919e1ec913660230a88bb7dcd667d32b9199e7abf3c84b34e06a1c39e87c
+checksum=3129e89777ad308400685d3da16931b404ecc4d6b0a48fe217b405e3310a8373
 patch_args="-Np1"
 
 pre_configure() {
diff --git a/srcpkgs/imgp/template b/srcpkgs/imgp/template
index 764fe7b9426..2ddccac758c 100644
--- a/srcpkgs/imgp/template
+++ b/srcpkgs/imgp/template
@@ -6,7 +6,7 @@ archs=noarch
 build_style=gnu-makefile
 depends="python3-Pillow"
 short_desc="Multi-core batch image resizer and rotator"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/jarun/imgp"
 distfiles="https://github.com/jarun/imgp/archive/v${version}.tar.gz"
diff --git a/srcpkgs/immortal/template b/srcpkgs/immortal/template
index 518af7fde1d..6f7ad74ac7b 100644
--- a/srcpkgs/immortal/template
+++ b/srcpkgs/immortal/template
@@ -9,7 +9,7 @@ go_package="${go_import_path}/cmd/immortal ${go_import_path}/cmd/immortalctl
 go_ldflags="-X main.Version=v${version}"
 hostmakedepends="git"
 short_desc="*nix cross-platform (OS agnostic) supervisor"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/immortal/immortal"
 #changelog="https://raw.githubusercontent.com/immortal/immortal/master/CHANGELOG.md"
diff --git a/srcpkgs/imv/template b/srcpkgs/imv/template
index 540b1b6b017..42c3664cf63 100644
--- a/srcpkgs/imv/template
+++ b/srcpkgs/imv/template
@@ -1,19 +1,20 @@
 # Template file for 'imv'
 pkgname=imv
-version=3.1.2
+version=4.0.1
 revision=1
 build_style=gnu-makefile
 hostmakedepends="asciidoc pkg-config"
-makedepends="SDL2_ttf-devel cmocka-devel fontconfig-devel freeimage-devel
- librsvg-devel"
+makedepends="cmocka-devel freeimage-devel glu-devel librsvg-devel libxkbcommon-devel
+ pango-devel wayland-devel"
 depends="desktop-file-utils"
 conf_files="/etc/imv_config"
 short_desc="Image viewer for X11/Wayland"
-maintainer="Arvin Ignaci <arvin.ignaci@gmail.com>"
+maintainer="bra1nwave <brainwave@openmailbox.org>"
 license="GPL-2.0-or-later, MIT"
 homepage="https://github.com/eXeC64/imv"
+changelog="https://raw.githubusercontent.com/eXeC64/imv/master/CHANGELOG"
 distfiles="https://github.com/eXeC64/imv/archive/v${version}.tar.gz"
-checksum=4d98696ea5c16b4cb6f7b3c3e7da8ee9e1814e9fc78e66ee1a2015f5dfd0d450
+checksum=b2370c7ab88056b4c832fa24ac837ac645378d9fa028f4bb8828da6a832b2e27
 conflicts="renameutils>=0"
 
 post_install() {
diff --git a/srcpkgs/incidenceeditor/template b/srcpkgs/incidenceeditor/template
index 941ed1b4f43..5b4cfd69808 100644
--- a/srcpkgs/incidenceeditor/template
+++ b/srcpkgs/incidenceeditor/template
@@ -1,7 +1,7 @@
 # Template file for 'incidenceeditor'
 pkgname=incidenceeditor
-version=19.08.0
-revision=1
+version=19.08.2
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kcoreaddons kconfig"
 makedepends="calendarsupport-devel eventviews-devel kdiagram-devel"
@@ -10,7 +10,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=43915613a5db71847be425bc4434c0e04f5410b3575cea3141ffcd99b2cdb9ea
+checksum=f2f7bf3a12af21e6f9e4a5f2ba93346e06a6988366af7b452d6268ac9fb4fc3d
 
 incidenceeditor-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/include-what-you-use/template b/srcpkgs/include-what-you-use/template
index 5ebf9a70d2a..331c4441fa2 100644
--- a/srcpkgs/include-what-you-use/template
+++ b/srcpkgs/include-what-you-use/template
@@ -1,7 +1,7 @@
 # Template file for 'include-what-you-use'
 pkgname=include-what-you-use
 version=0.12
-revision=1
+revision=2
 wrksrc="${pkgname}"
 build_style=cmake
 configure_args="-DIWYU_LLVM_ROOT_PATH=${XBPS_CROSS_BASE}/usr "
diff --git a/srcpkgs/influxdb/template b/srcpkgs/influxdb/template
index 77d8b68e1d7..4814650dc0c 100644
--- a/srcpkgs/influxdb/template
+++ b/srcpkgs/influxdb/template
@@ -1,6 +1,6 @@
 # Template file for 'influxdb'
 pkgname=influxdb
-version=1.7.7
+version=1.7.8
 revision=1
 build_style=go
 go_import_path=github.com/influxdata/influxdb
@@ -17,7 +17,7 @@ license="MIT"
 homepage="https://influxdata.com/time-series-platform/influxdb/"
 changelog="https://raw.githubusercontent.com/influxdata/influxdb/master/CHANGELOG.md"
 distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
-checksum=2ac8d6edb7eb736ba1a7c2c3fc3d529c6685a27d0a0c11ef51b02f4561e44166
+checksum=ed52925bb71ca8912e4daecce66a4c32935f396cf3f021464aab99934b41db51
 
 system_accounts="_influxdb"
 _influxdb_homedir="/var/lib/influxdb"
diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index f25db667498..092c279b09e 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,7 +1,7 @@
 # Template file for 'inkscape'
 pkgname=inkscape
 version=0.92.4
-revision=6
+revision=7
 wrksrc="${pkgname}-INKSCAPE_${version//./_}"
 build_style=gnu-configure
 configure_args="--enable-lcms --enable-poppler-cairo
diff --git a/srcpkgs/innoextract/template b/srcpkgs/innoextract/template
index 5a6766d23dd..c578d7cd0d3 100644
--- a/srcpkgs/innoextract/template
+++ b/srcpkgs/innoextract/template
@@ -1,14 +1,14 @@
 # Template file for 'innoextract'
 pkgname=innoextract
-version=1.7
-revision=4
+version=1.8
+revision=1
 build_style=cmake
 configure_args="-DCMAKE_INSTALL_PREFIX=/usr"
-hostmakedepends="boost"
+hostmakedepends="boost extra-cmake-modules"
 makedepends="boost-devel liblzma-devel"
-short_desc="A tool to unpack installers created by Inno Setup"
+short_desc="Tool to unpack installers created by Inno Setup"
 maintainer="Antonio Malcolm <antonio@antoniomalcolm.com>"
 license="Zlib"
 homepage="http://constexpr.org/innoextract/"
 distfiles="${homepage}files/${pkgname}-${version}/${pkgname}-${version}.tar.gz"
-checksum=c1efb732f2bc3a80065c5f51a0d4ea6027aebf528c609d3f336aea2055d2f0a4
+checksum=5e78f6295119eeda08a54dcac75306a1a4a40d0cb812ff3cd405e9862c285269
diff --git a/srcpkgs/intel-ucode/template b/srcpkgs/intel-ucode/template
index 109edac179b..dfcd239f283 100644
--- a/srcpkgs/intel-ucode/template
+++ b/srcpkgs/intel-ucode/template
@@ -1,6 +1,6 @@
 # Template file for 'intel-ucode'
 pkgname=intel-ucode
-version=20190618
+version=20190918
 revision=1
 archs="i686* x86_64*"
 wrksrc="Intel-Linux-Processor-Microcode-Data-Files-microcode-${version}"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="custom: Proprietary"
 homepage="https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files"
 distfiles="https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/microcode-${version}.tar.gz"
-checksum=74ec7415988d40fa53686d994cf8cb27accdbd35c5373c4c3afc2e93372ebba5
+checksum=2b6b728d351764dfbf6a9763ac96ae7e04085f382a309fed3abc0118f094c943
 repository=nonfree
 
 do_install() {
diff --git a/srcpkgs/intellij-idea-community-edition/template b/srcpkgs/intellij-idea-community-edition/template
index 961c22781af..b079e18e35c 100644
--- a/srcpkgs/intellij-idea-community-edition/template
+++ b/srcpkgs/intellij-idea-community-edition/template
@@ -1,6 +1,6 @@
 # Template file for 'intellij-idea-community-edition'
 pkgname=intellij-idea-community-edition
-version=2019.1.3
+version=2019.2.3
 revision=1
 archs="i686 x86_64"
 depends="virtual?java-environment giflib libXtst"
@@ -9,7 +9,7 @@ maintainer="John <johnz@posteo.net>"
 license="Apache-2.0"
 homepage="https://www.jetbrains.org/"
 distfiles="https://download.jetbrains.com/idea/ideaIC-${version}-no-jbr.tar.gz"
-checksum=6fbb1f99b467a7c7a39d74b835414288b113a9a136f9ba22b25ea44f87952fff
+checksum=9742d4c65b8ce20c31e993f0e04d526b0f368d7703e34ad4d6a01713b886353a
 repository=nonfree
 nopie=yes
 
@@ -27,21 +27,28 @@ do_install() {
 	rm ${DESTDIR}/usr/lib/intellij-idea/bin/fsnotifier-arm
 	rm ${DESTDIR}/usr/lib/intellij-idea/plugins/android/lib/libwebp/win -rf
 	rm ${DESTDIR}/usr/lib/intellij-idea/plugins/android/lib/libwebp/mac -rf
+	rm ${DESTDIR}/usr/lib/intellij-idea/plugins/maven/lib/maven3/lib/jansi-native/windows32 -rf
+	rm ${DESTDIR}/usr/lib/intellij-idea/plugins/maven/lib/maven3/lib/jansi-native/windows64 -rf
+	rm ${DESTDIR}/usr/lib/intellij-idea/plugins/maven/lib/maven3/lib/jansi-native/osx -rf
+	rm ${DESTDIR}/usr/lib/intellij-idea/plugins/maven/lib/maven3/lib/jansi-native/freebsd32 -rf
+	rm ${DESTDIR}/usr/lib/intellij-idea/plugins/maven/lib/maven3/lib/jansi-native/freebsd64 -rf
 	case $XBPS_TARGET_MACHINE in
 		x86_64)
 		rm ${DESTDIR}/usr/lib/intellij-idea/bin/fsnotifier
 		rm ${DESTDIR}/usr/lib/intellij-idea/bin/idea.vmoptions
-		rm ${DESTDIR}/usr/lib/intellij-idea/plugins/android/lib/libwebp/linux/libwebp_jni.so
 		rm ${DESTDIR}/usr/lib/intellij-idea/lib/pty4j-native/linux/x86 -rf
 		rm ${DESTDIR}/usr/lib/intellij-idea/lib/pty4j-native/linux/ppc64le -rf
+		rm ${DESTDIR}/usr/lib/intellij-idea/plugins/android/lib/libwebp/linux/libwebp_jni.so
+		rm ${DESTDIR}/usr/lib/intellij-idea/plugins/maven/lib/maven3/lib/jansi-native/linux32 -rf
 		;;
 		i686)
 		rm ${DESTDIR}/usr/lib/intellij-idea/bin/fsnotifier64
 		rm ${DESTDIR}/usr/lib/intellij-idea/bin/idea64.vmoptions
-		rm ${DESTDIR}/usr/lib/intellij-idea/plugins/android/lib/libwebp/linux/libwebp_jni64.so
 		rm ${DESTDIR}/usr/lib/intellij-idea/bin/libdbm64.so
 		rm ${DESTDIR}/usr/lib/intellij-idea/lib/pty4j-native/linux/x86_64 -rf
 		rm ${DESTDIR}/usr/lib/intellij-idea/lib/pty4j-native/linux/ppc64le -rf
+		rm ${DESTDIR}/usr/lib/intellij-idea/plugins/android/lib/libwebp/linux/libwebp_jni64.so
+		rm ${DESTDIR}/usr/lib/intellij-idea/plugins/maven/lib/maven3/lib/jansi-native/linux64 -rf
 		;;
 	esac
 
diff --git a/srcpkgs/inxi/template b/srcpkgs/inxi/template
index bd2c820eb76..76afaf8b7f4 100644
--- a/srcpkgs/inxi/template
+++ b/srcpkgs/inxi/template
@@ -1,17 +1,17 @@
 # Template file for 'inxi'
 pkgname=inxi
-version=3.0.34
+version=3.0.36
 revision=1
 archs=noarch
 wrksrc="inxi-${version}-1"
 depends="dmidecode file glxinfo pciutils perl usbutils xdpyinfo xprop xrandr"
 short_desc="Full featured system information script"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="bra1nwave <brainwave@openmailbox.org>"
 license="GPL-3.0-or-later"
 homepage="https://smxi.org/docs/inxi.htm"
 changelog="https://raw.githubusercontent.com/smxi/inxi/master/inxi.changelog"
 distfiles="https://github.com/smxi/inxi/archive/${version}-1.tar.gz"
-checksum=db3c331706772f68de68191abcde8f9eedabef001fc39c1683dd71f54610c77e
+checksum=2826ee041f4ce2be91063be1ba92c47f6a2b7f1ee97ed236af4c71494d6a1bd0
 
 do_install() {
 	vbin inxi
diff --git a/srcpkgs/io.elementary.calendar/template b/srcpkgs/io.elementary.calendar/template
index 6e8ac639231..5e9ae316d95 100644
--- a/srcpkgs/io.elementary.calendar/template
+++ b/srcpkgs/io.elementary.calendar/template
@@ -1,8 +1,9 @@
 # Template file for 'io.elementary.calendar'
 pkgname=io.elementary.calendar
 version=5.0
-revision=2
-wrksrc="calendar-${version}"
+revision=3
+_git_commit=46346e48b53e9d3d59d9f567b622532338f50f32
+wrksrc="calendar-${_git_commit}"
 build_style=meson
 build_helper="gir"
 hostmakedepends="intltool pkg-config vala desktop-file-utils AppStream"
@@ -13,8 +14,8 @@ short_desc="Desktop calendar app designed for elementary OS"
 maintainer="Cameron Nemo <camerontnorman@gmail.com>"
 license="GPL-3.0-only"
 homepage="https://github.com/elementary/calendar"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=f47bae213163ec87c2e4f2c0563a40be8cf080cab70094a6a4f41936803fb3fa
+distfiles="${homepage}/archive/${_git_commit}.tar.gz"
+checksum=3be3851baeed67144e5cbed209b2c1b982fe9830db13372e3051423295dee345
 
 libio.elementary.calendar_package() {
 	short_desc+=" - library"
diff --git a/srcpkgs/io.elementary.code/template b/srcpkgs/io.elementary.code/template
index e597d61eff5..68018aabb00 100644
--- a/srcpkgs/io.elementary.code/template
+++ b/srcpkgs/io.elementary.code/template
@@ -1,7 +1,7 @@
 # Template file for 'io.elementary.code'
 pkgname=io.elementary.code
 version=3.1.1
-revision=2
+revision=3
 wrksrc="code-${version}"
 build_style=meson
 hostmakedepends="pkg-config vala intltool glib-devel"
diff --git a/srcpkgs/io.elementary.files/template b/srcpkgs/io.elementary.files/template
index 4c7c798bcc3..3eb6525b0b0 100644
--- a/srcpkgs/io.elementary.files/template
+++ b/srcpkgs/io.elementary.files/template
@@ -1,6 +1,6 @@
 # Template file for 'io.elementary.files'
 pkgname=io.elementary.files
-version=4.1.9
+version=4.2.0
 revision=1
 wrksrc="files-${version}"
 build_style=meson
@@ -8,13 +8,13 @@ configure_args="-Dwith-unity=false"
 hostmakedepends="vala glib-devel pkg-config"
 makedepends="gtk+3-devel libglib-devel libgee08-devel sqlite-devel plank-devel
  libcanberra-devel granite-devel pango-devel zeitgeist-devel dbus-glib-devel
- libnotify-devel"
+ libnotify-devel libcloudproviders-devel"
 short_desc="File browser designed for elementary OS"
-maintainer="Cameron Nemo <camerontnorman@gmail.com>"
+maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/elementary/files"
 distfiles="https://github.com/elementary/files/archive/${version}.tar.gz"
-checksum=9948e6476095095f922d723279e974be249dc7ea1d5b4b5f8ea19ac6314a4546
+checksum=6151db8279f38abd7a938ea63ea43371148b0e9d9a989351f77ac51c85a10325
 
 libio.elementary.files_package() {
 	short_desc+=" - library"
diff --git a/srcpkgs/ipe/template b/srcpkgs/ipe/template
index e79cc29ab00..ee84562db3d 100644
--- a/srcpkgs/ipe/template
+++ b/srcpkgs/ipe/template
@@ -1,7 +1,7 @@
 # Template file for 'ipe'
 pkgname=ipe
-version=7.2.12
-revision=2
+version=7.2.13
+revision=1
 _tools_commit=6a2b0fd899dad765c67d3ec5cf95790d5ba090a7
 hostmakedepends="pkg-config qt5-qmake qt5-tools qt5-host-tools"
 makedepends="qt5-devel lua52-devel libjpeg-turbo-devel cairo-devel poppler-devel"
@@ -11,18 +11,15 @@ license="GPL-3.0-or-later"
 homepage="http://ipe.otfried.org/"
 distfiles="https://dl.bintray.com/otfried/generic/ipe/${version%.*}/ipe-${version}-src.tar.gz
  https://github.com/otfried/ipe-tools/archive/${_tools_commit}.tar.gz"
-checksum="7c9a78b20e7d08be5850299240b9cd2b45982ff1299a903a999d8ff8796581e3
+checksum="af3ca3d713ae99d65cfeb9cddea56c9d1a3b1e52e2fc30cd0fe017793242caa8
  143c6c99de2e5548c1666717c5b9cbba1a360d322c8f934695c2bfe0ac5c3d2c"
 
-case "$XBPS_TARGET_MACHINE" in
-	*-musl) broken=yes ;;
-esac
-
 post_extract() {
 	mv $XBPS_BUILDDIR/ipe-tools* ipe-tools
 
 	sed -i 's/xlocale.h/locale.h/g' src/ipelib/ipeplatform.cpp
 	sed -i '/cstdio/i#include <sys/types.h>' src/include/ipebase.h
+	sed -i '/cstdio/i#include <limits.h>' src/include/ipebase.h
 }
 
 do_build() {
diff --git a/srcpkgs/iperf/template b/srcpkgs/iperf/template
index 126de357156..d992f0d3d67 100644
--- a/srcpkgs/iperf/template
+++ b/srcpkgs/iperf/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-multicast --enable-threads
  ac_cv_sizeof_bool=0"
 short_desc="Perform network throughput tests"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="NCSA"
 homepage="https://iperf.fr/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}2/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/iperf3/template b/srcpkgs/iperf3/template
index 06602de120e..75a980b17df 100644
--- a/srcpkgs/iperf3/template
+++ b/srcpkgs/iperf3/template
@@ -6,7 +6,7 @@ wrksrc="iperf-${version}"
 build_style=gnu-configure
 make_build_args="iperf3_profile_LDFLAGS= iperf3_profile_CFLAGS="
 short_desc="Active measurements of the maximum achievable bandwidth on IP networks"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://software.es.net/iperf/"
 changelog="https://raw.githubusercontent.com/esnet/iperf/master/RELEASE_NOTES"
diff --git a/srcpkgs/iproute2/template b/srcpkgs/iproute2/template
index 8ea63613526..1e918d98abf 100644
--- a/srcpkgs/iproute2/template
+++ b/srcpkgs/iproute2/template
@@ -1,6 +1,6 @@
 # Template file for 'iproute2'
 pkgname=iproute2
-version=5.2.0
+version=5.3.0
 revision=1
 build_style=configure
 make_install_args="SBINDIR=/usr/bin"
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://wiki.linuxfoundation.org/networking/iproute2"
 distfiles="${KERNEL_SITE}/utils/net/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=a5b95dec26353fc71dba9bb403e9343fad2a06bd69fb154a22a2aa2914f74da8
+checksum=cb1c1e45993a3bd2438543fd4332d70f1726a6e6ff97dc613a8258c993117b3f
 
 conf_files="
  /etc/iproute2/ematch_map
diff --git a/srcpkgs/ipv6calc/template b/srcpkgs/ipv6calc/template
index e4a811678a4..40701608f4b 100644
--- a/srcpkgs/ipv6calc/template
+++ b/srcpkgs/ipv6calc/template
@@ -1,6 +1,6 @@
 # Template file for 'ipv6calc'
 pkgname=ipv6calc
-version=2.1.0
+version=2.1.1
 revision=1
 build_style=gnu-configure
 configure_args="--enable-geoip"
@@ -11,4 +11,4 @@ maintainer="Lon Willett <xgit@lonw.net>"
 license="GPL-2.0-only"
 homepage="https://www.deepspace6.net/projects/ipv6calc.html"
 distfiles="https://github.com/pbiering/ipv6calc/archive/${version}.tar.gz"
-checksum=a0ec4a1ff197210162f8a644381dd08b2c552cf50c68041748ea7e067df70080
+checksum=964957e79505cbc71ebc706a0fc0b67c6e08c55ed53335470ed7f8309eb84405
diff --git a/srcpkgs/ipvsadm/template b/srcpkgs/ipvsadm/template
index 7df99d4c5f1..9f1db9abdf9 100644
--- a/srcpkgs/ipvsadm/template
+++ b/srcpkgs/ipvsadm/template
@@ -1,15 +1,15 @@
 # Template file for 'ipvsadm'
 pkgname=ipvsadm
-version=1.29
+version=1.30
 revision=1
 hostmakedepends="pkg-config"
 makedepends="libnl3-devel popt-devel"
-short_desc="The IP Virtual Server administration utility"
+short_desc="IP Virtual Server administration utility"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://www.linuxvirtualserver.org/software/ipvs.html"
 distfiles="${KERNEL_SITE}/utils/kernel/ipvsadm/$pkgname-$version.tar.xz"
-checksum=c3de4a21d90a02c621f0c72ee36a7aa27374b6f29fd4178f33fbf71b4c66c149
+checksum=95573d70df473c9f63fc4ac496c044c69e3a6de7ccac119922210c0b44cd7a0c
 
 CFLAGS="-Du_int16_t=uint16_t -Du_int32_t=uint32_t"
 
diff --git a/srcpkgs/irssi/template b/srcpkgs/irssi/template
index bbd6a19d527..bf029cbcb4c 100644
--- a/srcpkgs/irssi/template
+++ b/srcpkgs/irssi/template
@@ -1,7 +1,7 @@
 # Template file for 'irssi'
 pkgname=irssi
-version=1.2.1
-revision=1
+version=1.2.2
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static --with-proxy --enable-true-color --with-otr"
 hostmakedepends="pkg-config"
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.irssi.org"
 distfiles="https://github.com/irssi/irssi/releases/download/${version}/irssi-${version}.tar.gz"
-checksum=fd8b0ef2544fdb691211293dded3dcf6ed87f21781db19e7df62ead797f18a06
+checksum=53182861d4d2be6db35fa7e3f0524a64d2a54a374307574dab5f5362bfea563c
 
 LDFLAGS="-lncursesw"
 subpackages="irssi-devel irssi-otr"
diff --git a/srcpkgs/iso-codes/template b/srcpkgs/iso-codes/template
index c3434030ca7..548fc15aea7 100644
--- a/srcpkgs/iso-codes/template
+++ b/srcpkgs/iso-codes/template
@@ -1,6 +1,6 @@
 # Template file for 'iso-codes'
 pkgname=iso-codes
-version=4.3
+version=4.4
 revision=1
 archs=noarch
 build_style=gnu-configure
@@ -10,4 +10,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://salsa.debian.org/iso-codes-team/iso-codes"
 distfiles="${DEBIAN_SITE}/main/i/iso-codes/${pkgname}_${version}.orig.tar.xz"
-checksum=643eb83b2d714e8650ed7112706968d057bf5b101ba71c8ef219e20f1737b141
+checksum=5124ba64e5ce6e1a73c24d1a1cdc42f6a2d0db038791b28ac77aafeb07654e86
diff --git a/srcpkgs/ispc/template b/srcpkgs/ispc/template
index a27cc129f01..2386fc710d3 100644
--- a/srcpkgs/ispc/template
+++ b/srcpkgs/ispc/template
@@ -1,10 +1,10 @@
 # Template file for 'ispc'
 pkgname=ispc
-version=1.11.0
+version=1.12.0
 revision=1
 archs="i686 x86_64"
 build_style=cmake
-hostmakedepends="clang python m4 bison flex llvm"
+hostmakedepends="clang python3 m4 bison flex llvm"
 configure_args="-DISPC_NO_DUMPS=yes"
 makedepends="ncurses-devel zlib-devel"
 short_desc="A compiler for high-performance SIMD programming on the CPU"
@@ -13,9 +13,9 @@ license="BSD"
 homepage="https://ispc.github.io"
 distfiles="https://github.com/ispc/ispc/archive/v${version}.tar.gz"
 patch_args="-p1"
-checksum=f48ef6e8a1fe5ad4fca691583bf7419f4dce1596e7ed850ff99cc017f8711b2f
+checksum=9ebc29adcdf477659b45155d0f91e61120a12084e42113d0e9f4ce5cfdfbdcab
 nopie=yes
 
 pre_build() {
 	sed -i '/tinfo/d' CMakeLists.txt
-}
\ No newline at end of file
+}
diff --git a/srcpkgs/iverilog/template b/srcpkgs/iverilog/template
index 1eb6539c2b1..971cf2a8e12 100644
--- a/srcpkgs/iverilog/template
+++ b/srcpkgs/iverilog/template
@@ -1,7 +1,7 @@
 # Template file for 'iverilog'
 pkgname=iverilog
-version=10.2
-revision=3
+version=10.3
+revision=1
 wrksrc="${pkgname}-${version/./_}"
 build_style=gnu-configure
 hostmakedepends="automake flex gperf"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://iverilog.icarus.com/"
 distfiles="https://github.com/steveicarus/iverilog/archive/v${version/./_}.tar.gz"
-checksum=f54d91821223c71c70f4735a1fb2af39c62efbccdeb9b0060ea1cf9c67647ee3
+checksum=4b884261645a73b37467242d6ae69264fdde2e7c4c15b245d902531efaaeb234
 
 nocross="draw_tt.exe: cannot execute binary file: Exec format error"
 
diff --git a/srcpkgs/iwd/template b/srcpkgs/iwd/template
index eb57cb326d5..4ec4727d82b 100644
--- a/srcpkgs/iwd/template
+++ b/srcpkgs/iwd/template
@@ -1,20 +1,20 @@
 # Template file for 'iwd'
 pkgname=iwd
-version=0.19
+version=0.22
 revision=1
 build_style=gnu-configure
-configure_args="--disable-systemd-service --enable-docs --enable-pie
+configure_args="--disable-systemd-service --enable-pie
  --enable-external-ell --enable-dbus-policy --enable-wired"
-hostmakedepends="asciidoc pkg-config automake libtool"
+hostmakedepends="python3-docutils pkg-config automake libtool"
 makedepends="readline-devel dbus-devel ell-devel"
 depends="dbus"
 checkdepends="python3"
 short_desc="Internet Wireless Daemon by Intel that aims to replace wpa_supplicant"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Peter Bui <pbui@github.bx612.space>"
 license="LGPL-2.1-or-later"
 homepage="https://iwd.wiki.kernel.org/"
 distfiles="${KERNEL_SITE}/network/wireless/iwd-${version}.tar.xz"
-checksum=f041e21531b5d4a9b705e366dc95d99434c2c337b7508d72e295620b6182ccf4
+checksum=b50c778716a2a1f9da961de0cac4711ad43ab104a67405935248f33ea8a6559a
 make_dirs="/var/lib/iwd 0600 root root
  /etc/iwd 755 root root"
 
diff --git a/srcpkgs/jack/template b/srcpkgs/jack/template
index 3303ec5a9b7..4c60f0ede3b 100644
--- a/srcpkgs/jack/template
+++ b/srcpkgs/jack/template
@@ -1,33 +1,31 @@
 # Template file for 'jack'
 pkgname=jack
-version=1.9.12
-revision=12
+version=1.9.13
+revision=1
 wrksrc="jack2-${version}"
-# XXX libffado (firewire)
-hostmakedepends="pkg-config python"
-makedepends="opus-devel libsamplerate-devel readline-devel dbus-devel celt-devel"
-depends="python-dbus"
+build_style=waf3
+configure_args="--alsa --classic --dbus"
+hostmakedepends="pkg-config"
+makedepends="opus-devel libsamplerate-devel readline-devel dbus-devel celt-devel
+ $(vopt_if ffado libffado-devel)"
+depends="python3-dbus"
 short_desc="JACK Audio Connection Kit low-latency sound server (pro audio)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2, LGPL-2.1"
-homepage="http://jackaudio.org/"
+maintainer="Daniel Eyßer <daniel.eysser@gmail.com>"
+license="GPL-2.0-or-later, LGPL-2.1-or-later"
+homepage="https://jackaudio.org/"
 distfiles="https://github.com/jackaudio/jack2/archive/v${version}.tar.gz"
-checksum=deefe2f936dc32f59ad3cef7e37276c2035ef8a024ca92118f35c9a292272e33
+checksum=2a683eef63b608b292411d66482fd45aa7fa8dc004bed4184e06f9f9ca83c075
+python_version=3
+
+# Package build options
+build_options="ffado"
+desc_option_ffado="Enable support for FireWire audio devices"
 
 if [ -z "CROSS_BUILD" ]; then
 	makedepends+=" eigen"
 fi
 
-do_configure() {
-	python2 waf configure --prefix=/usr --alsa --classic --dbus
-}
-do_build() {
-	python2 waf build ${makejobs}
-}
-
-do_install() {
-	python2 waf install --destdir=${DESTDIR}
-
+post_install() {
 	# pam_limits(8) support
 	vinstall ${FILESDIR}/jack-limitsd.conf 644 etc/security/limits.d jack.conf
 	# audio group permissions for realtime
diff --git a/srcpkgs/jansson/template b/srcpkgs/jansson/template
index 318fb67c5b5..a3c2a171822 100644
--- a/srcpkgs/jansson/template
+++ b/srcpkgs/jansson/template
@@ -4,7 +4,7 @@ version=2.12
 revision=1
 build_style=gnu-configure
 short_desc="Library for encoding, decoding and manipulating JSON data"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://www.digip.org/jansson/"
 distfiles="http://www.digip.org/jansson/releases/jansson-${version}.tar.bz2"
diff --git a/srcpkgs/jbig2dec/patches/2002_abi_compat.patch b/srcpkgs/jbig2dec/patches/2002_abi_compat.patch
new file mode 100644
index 00000000000..bd4f4c4b72f
--- /dev/null
+++ b/srcpkgs/jbig2dec/patches/2002_abi_compat.patch
@@ -0,0 +1,24 @@
+Description: Restore ABI compatibility
+Author: Julien Cristau <jcristau@debian.org>
+Source: https://bugs.debian.org/cgi-bin/bugreport.cgi?att=1;bug=940605;filename=0001-Restore-ABI-compatibility-closes-940605.patch;msg=21
+Bug-Debian: https://bugs.debian.org/940605
+Forwarded: no
+Last-Update: 2019-09-19
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- jbig2.c
++++ jbig2.c
+@@ -99,6 +99,13 @@
+     return -1;
+ }
+
++#undef jbig2_ctx_new
++Jbig2Ctx *
++jbig2_ctx_new(Jbig2Allocator *allocator, Jbig2Options options, Jbig2GlobalCtx *global_ctx, Jbig2ErrorCallback error_callback, void *error_callback_data)
++{
++    return jbig2_ctx_new_imp((allocator), (options), (global_ctx), (error_callback), (error_callback_data), JBIG2_VERSION_MAJOR, JBIG2_VERSION_MINOR);
++}
++
+ Jbig2Ctx *
+ jbig2_ctx_new_imp(Jbig2Allocator *allocator, Jbig2Options options, Jbig2GlobalCtx *global_ctx, Jbig2ErrorCallback error_callback, void *error_callback_data, int jbig2_version_major, int jbig2_version_minor)
+ {
diff --git a/srcpkgs/jbig2dec/template b/srcpkgs/jbig2dec/template
index f08ea768410..41bc57bcb54 100644
--- a/srcpkgs/jbig2dec/template
+++ b/srcpkgs/jbig2dec/template
@@ -1,7 +1,7 @@
 # Template file for 'jbig2dec'
 pkgname=jbig2dec
-version=0.16
-revision=1
+version=0.17
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool"
 makedepends="libpng-devel"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-or-later"
 homepage="https://www.jbig2dec.com"
 distfiles="https://github.com/ArtifexSoftware/jbig2dec/archive/${version}.tar.gz"
-checksum=30f706a67604237ffffaece96ae20ee86b2cfebd6277a95f8b0f2ab0f8859850
+checksum=e14c0a978332e0cad011b1aeb9aab7555c73b55e9907f08cb1c74bb6d78a7c59
 
 pre_configure() {
 	sed -i '$ d' autogen.sh
diff --git a/srcpkgs/jdupes/template b/srcpkgs/jdupes/template
index c300803d985..c42464c566a 100644
--- a/srcpkgs/jdupes/template
+++ b/srcpkgs/jdupes/template
@@ -1,6 +1,6 @@
 # Template file for 'jdupes'
 pkgname=jdupes
-version=1.13.1
+version=1.13.2
 revision=1
 build_style=gnu-makefile
 make_build_args="ENABLE_BTRFS=1"
@@ -10,7 +10,7 @@ license="MIT"
 homepage="https://github.com/jbruchon/jdupes"
 changelog="https://raw.githubusercontent.com/jbruchon/jdupes/master/CHANGES"
 distfiles="https://github.com/jbruchon/jdupes/archive/v${version}.tar.gz"
-checksum=6b68ea30b0d8fceb31ccbc07187133dbff0cc84678752e89ad3270c89322710f
+checksum=41376ace274320a77e35ffed170ff0cbca2cd0cfd0ff1cea53d7464e97d4341f
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/jemalloc/template b/srcpkgs/jemalloc/template
index 1800fc5e15d..aba5e005696 100644
--- a/srcpkgs/jemalloc/template
+++ b/srcpkgs/jemalloc/template
@@ -1,6 +1,6 @@
 # Template file for 'jemalloc'
 pkgname=jemalloc
-version=5.2.0
+version=5.2.1
 revision=1
 build_style=gnu-configure
 configure_args="je_cv_static_page_shift=12"
@@ -10,7 +10,7 @@ license="BSD-2-Clause"
 homepage="http://jemalloc.net/"
 #changelog="https://raw.githubusercontent.com/jemalloc/jemalloc/master/ChangeLog"
 distfiles="https://github.com/jemalloc/jemalloc/releases/download/${version}/jemalloc-${version}.tar.bz2"
-checksum=74be9f44a60d2a99398e706baa921e4efde82bf8fd16e5c0643c375c5851e3b4
+checksum=34330e5ce276099e2e8950d9335db5a875689a4c6a56751ef3b1d8c537f887f6
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/jenkins/files/jenkins/run b/srcpkgs/jenkins/files/jenkins/run
index 5ccc479d35f..05d8a79c68d 100755
--- a/srcpkgs/jenkins/files/jenkins/run
+++ b/srcpkgs/jenkins/files/jenkins/run
@@ -8,4 +8,4 @@ export JENKINS_HOME=/var/lib/jenkins
 cd /
 unset OLDPWD
 
-exec chpst -u jenkins:jenkins java -Xmx512m -jar /opt/jenkins/jenkins.war $OPTS
+exec chpst -u jenkins:${JENKINS_GROUPS:=jenkins} java ${JAVAOPTS:=-Xmx512m} -jar /opt/jenkins/jenkins.war $OPTS
diff --git a/srcpkgs/jenkins/template b/srcpkgs/jenkins/template
index 37902fdcdcc..bc818a21b91 100644
--- a/srcpkgs/jenkins/template
+++ b/srcpkgs/jenkins/template
@@ -1,7 +1,7 @@
 # Template file for 'jenkins'
 pkgname=jenkins
-version=2.176.2
-revision=1
+version=2.190.1
+revision=2
 build_style=fetch
 make_dirs="/var/lib/jenkins 0755 jenkins jenkins"
 depends="virtual?java-runtime"
@@ -10,7 +10,7 @@ maintainer="Renato Aguiar <renato@renag.me>"
 license="MIT"
 homepage="https://jenkins.io/"
 distfiles="http://mirrors.jenkins.io/war-stable/${version}/jenkins.war"
-checksum=33a6c3161cf8de9c8729fd83914d781319fd1569acf487c7b1121681dba190a5
+checksum=46fb1d25d9423fc66aadd648dc74b9772863a7fbbd89bfc14c873cd0c3436f05
 # Create 'jenkins' user
 system_accounts="jenkins"
 jenkins_homedir="/var/lib/jenkins"
diff --git a/srcpkgs/jgmenu/template b/srcpkgs/jgmenu/template
index 1a0c5c0163b..9cc43358ca6 100644
--- a/srcpkgs/jgmenu/template
+++ b/srcpkgs/jgmenu/template
@@ -1,6 +1,6 @@
 # Template file for 'jgmenu'
 pkgname=jgmenu
-version=3.3
+version=3.4
 revision=1
 build_style=gnu-makefile
 make_use_env=yes
@@ -15,4 +15,4 @@ license="GPL-2.0-only"
 homepage="https://www.github.com/johanmalm/jgmenu"
 changelog="https://raw.githubusercontent.com/johanmalm/jgmenu/master/docs/relnotes/${version}.txt"
 distfiles="https://www.github.com/johanmalm/jgmenu/archive/v${version}.tar.gz"
-checksum=65ae338ab604e6deadfcfcfef02f6eb54d9c25eac6c477ecb11084af25b0a453
+checksum=973491a756296e66520874f35c590d8c2de5417afcfc4f5117c47e35841cb171
diff --git a/srcpkgs/jmol/template b/srcpkgs/jmol/template
index b0a7403c1a0..d0f06d14215 100644
--- a/srcpkgs/jmol/template
+++ b/srcpkgs/jmol/template
@@ -1,6 +1,6 @@
 # Template file for 'jmol'
 pkgname=jmol
-version=14.29.42
+version=14.29.54
 revision=1
 hostmakedepends="unzip"
 depends="virtual?java-environment"
@@ -10,7 +10,7 @@ license="LGPL-2.1-or-later"
 homepage="http://jmol.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/jmol/Jmol/Version%20${version%.*}/Jmol%20${version}/Jmol-${version}-binary.tar.gz
  http://jmol.sourceforge.net/images/Jmol_icon_128.png"
-checksum="d762553e4bb3bd80c5bf900898e8afbd36c69db46f055cc8af5f29c33a8bfa3a
+checksum="ebb630d11f9d2b46e5c2f6585fc9350f044615f095d44d5a0a0fa93533288a38
  d84e5e4b5c9b440b3b90432db87e0d4bd5c8237d7d2891c174fac71f0a5a2127"
 skip_extraction="Jmol_icon_128.png"
 nocross="openjdk is nocross"
diff --git a/srcpkgs/jreen-qt5 b/srcpkgs/jreen-qt5
new file mode 120000
index 00000000000..adda684e0c9
--- /dev/null
+++ b/srcpkgs/jreen-qt5
@@ -0,0 +1 @@
+jreen
\ No newline at end of file
diff --git a/srcpkgs/jreen-qt5-devel b/srcpkgs/jreen-qt5-devel
index 9aff5c71925..adda684e0c9 120000
--- a/srcpkgs/jreen-qt5-devel
+++ b/srcpkgs/jreen-qt5-devel
@@ -1 +1 @@
-jreen-qt5
\ No newline at end of file
+jreen
\ No newline at end of file
diff --git a/srcpkgs/jreen-qt5/template b/srcpkgs/jreen-qt5/template
deleted file mode 100644
index 92f3aa73b09..00000000000
--- a/srcpkgs/jreen-qt5/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'jreen'
-pkgname=jreen-qt5
-version=1.3.0
-revision=1
-wrksrc="${pkgname%-*}-${version}"
-build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="gsasl-devel speex-devel qt5-devel zlib-devel"
-short_desc="Qt5 Jabber/XMPP extensible library"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="LGPL-3"
-homepage="https://github.com/euroelessar/jreen"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=f93c3d338c011c0945dacb14eb9da3be9541028c9eaa6f2024e688eb8a49b07e
-
-if [ -n "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-host-tools qt5-devel"
-fi
-
-jreen-qt5-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/*.so
-		vmove usr/lib/pkgconfig
-	}
-}
diff --git a/srcpkgs/jreen/template b/srcpkgs/jreen/template
index 61fbb204312..f23ba291354 100644
--- a/srcpkgs/jreen/template
+++ b/srcpkgs/jreen/template
@@ -1,20 +1,23 @@
 # Template file for 'jreen'
 pkgname=jreen
-version=1.2.1
-revision=1
+version=1.3.0
+revision=2
 build_style=cmake
-configure_args="-DJREEN_FORCE_QT4=yes"
 hostmakedepends="pkg-config"
-makedepends="gsasl-devel speex-devel qt-devel zlib-devel"
-short_desc="Extensible XMPP library written in C++ using Qt"
-maintainer="Duncan Overbruck <mail@duncano.de>"
-license="GPL-2"
-homepage="http://qutim.org/jreen"
-distfiles="http://github.com/euroelessar/${pkgname}/archive/v${version}.tar.gz"
-checksum=be5de04b6f54e47bdec92707600441a39e46add958181ad2b5b2d1bf92693fbd
+makedepends="gsasl-devel speex-devel qt5-devel zlib-devel"
+short_desc="Qt5 Jabber/XMPP extensible library"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/euroelessar/jreen"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=f93c3d338c011c0945dacb14eb9da3be9541028c9eaa6f2024e688eb8a49b07e
+
+if [ -n "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt5-host-tools qt5-devel"
+fi
 
 jreen-devel_package() {
-	depends="jreen>=${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
@@ -22,3 +25,15 @@ jreen-devel_package() {
 		vmove usr/lib/pkgconfig
 	}
 }
+
+jreen-qt5_package() {
+	build_style=meta
+	short_desc+=" (transitional dummy package)"
+	depends="${sourcepkg}>=${version}_${revision}"
+}
+
+jreen-qt5-devel_package() {
+	build_style=meta
+	short_desc+=" (transitional dummy package)"
+	depends="jreen-devel>=${version}_${revision}"
+}
diff --git a/srcpkgs/json-glib/template b/srcpkgs/json-glib/template
index ac71f34e3b4..0fbdb69905c 100644
--- a/srcpkgs/json-glib/template
+++ b/srcpkgs/json-glib/template
@@ -8,7 +8,7 @@ configure_args="-Dintrospection=$(vopt_if gir true false)"
 hostmakedepends="pkg-config glib-devel"
 makedepends="libglib-devel"
 short_desc="JSON parser for GLib-based libraries and applications"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="http://live.gnome.org/JsonGlib"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/jsonnet/template b/srcpkgs/jsonnet/template
index e1e0ef2d07c..f6074776e92 100644
--- a/srcpkgs/jsonnet/template
+++ b/srcpkgs/jsonnet/template
@@ -1,14 +1,15 @@
 # Template file for 'jsonnet'
 pkgname=jsonnet
-version=0.13.0
+version=0.14.0
 revision=1
 build_style=gnu-makefile
+make_build_args="bins"
 short_desc="Data templating language"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://github.com/google/jsonnet"
 distfiles="https://github.com/google/jsonnet/archive/v${version}.tar.gz"
-checksum=f6f0c4ea333f3423f1a7237a8a107c589354c38be8a2a438198f9f7c69b77596
+checksum=7f41cdc4cb366cfc1de3aada926a2f7e640ef025887eb05cdaf8342d6e4e088b
 
 CXXFLAGS="-Iinclude -Ithird_party/md5 -Ithird_party/json"
 CFLAGS="-Iinclude"
diff --git a/srcpkgs/juCi++/patches/libgit2-0.28.patch b/srcpkgs/juCi++/patches/libgit2-0.28.patch
deleted file mode 100644
index 9eb910f4db3..00000000000
--- a/srcpkgs/juCi++/patches/libgit2-0.28.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/src/git.cc b/src/git.cc
-index 9da2d7b..45e9007 100644
---- src/git.cc
-+++ src/git.cc
-@@ -6,7 +6,7 @@ bool Git::initialized = false;
- std::mutex Git::mutex;
- 
- std::string Git::Error::message() noexcept {
--  const git_error *last_error = giterr_last();
-+  const git_error *last_error = git_error_last();
-   if(last_error == nullptr)
-     return std::string();
-   else
-@@ -244,7 +244,7 @@ boost::filesystem::path Git::Repository::get_root_path(const boost::filesystem::
-       throw std::runtime_error(error.message());
-   }
-   auto root_path = Git::path(root.ptr, root.size);
--  git_buf_free(&root);
-+  git_buf_dispose(&root);
-   return root_path;
- }
- 
-
diff --git a/srcpkgs/juCi++/template b/srcpkgs/juCi++/template
index c7c0e3f275a..dffd1d7119d 100644
--- a/srcpkgs/juCi++/template
+++ b/srcpkgs/juCi++/template
@@ -1,9 +1,9 @@
 # Template file for 'juCi++'
 pkgname=juCi++
-version=1.4.6
-revision=5
-_libclangmm_commit="2b2f2ead1f685a9efb28ee2c0ff3cbe452a724dd"
-_tiny_commit="54b95a21cf35f8467e21038f523fd3342a77de4c"
+version=1.5.0
+revision=2
+_libclangmm_commit="687b9c231d850504ec515acb9ccab73f26c34063"
+_tiny_commit="a6773276efdbc322f1abb0159301f5502647eb52"
 wrksrc="jucipp-v${version}"
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -16,9 +16,9 @@ homepage="https://gitlab.com/cppit/jucipp"
 distfiles="https://gitlab.com/cppit/jucipp/-/archive/v${version}/jucipp-v${version}.tar.gz
 https://gitlab.com/cppit/libclangmm/-/archive/${_libclangmm_commit}/libclangmm-${_libclangmm_commit}.tar.gz
 https://gitlab.com/eidheim/tiny-process-library/-/archive/${_tiny_commit}/tiny-process-library-${_tiny_commit}.tar.gz"
-checksum="e46863c272b1ff153f8e834ec8f3902b8c7de01b4f1ef4d980e27e1d6e7bd1e4
- 8d7f83a6f4544033cd6a790cc497475521bf15ed620fbcd0014597a2d5ae6481
- 9f5713440aa0c1d4dcd665a1e264a1d0c6bed75edf1a80996b1f6e2231184d1e"
+checksum="178f25db2105ee35db0a1b9a4a19205c737b416adda7d05d3b34a2b7cecd3c87
+ bdc4ecf59f5de2a3ade04fac1c298b87c1af59653eaa2993d45adc0fa7d8389d
+ 99e0c1a2ddc59bbb30f0e6cccd9669ddc79952d4aa54ae1d6c72f9d1cf297231"
 nocross=yes #clang cannot be installed as makedepends when cross compiling
 
 post_extract() {
diff --git a/srcpkgs/juk/template b/srcpkgs/juk/template
index 5116d95e6d1..3273989dd88 100644
--- a/srcpkgs/juk/template
+++ b/srcpkgs/juk/template
@@ -1,6 +1,6 @@
 # Template file for 'juk'
 pkgname=juk
-version=19.04.3
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
@@ -12,4 +12,4 @@ maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://juk.kde.org/"
 distfiles="${KDE_SITE}/applications/${version}/src/juk-${version}.tar.xz"
-checksum=f4a272aa677ac7b5eb8c3f30234dea129e41863c5c78d812b27d30dde0f5d750
+checksum=b3f0e006d6defa58e0724088a1c99c1c412bc5764f8d1bebadf31b5f331d51d3
diff --git a/srcpkgs/julia/template b/srcpkgs/julia/template
index 3f35d555d4b..a8f107f0eee 100644
--- a/srcpkgs/julia/template
+++ b/srcpkgs/julia/template
@@ -1,12 +1,12 @@
 # Template file for 'julia'
 pkgname=julia
-version=1.1.1
-revision=2
+version=1.2.0
+revision=1
 archs="i686* x86_64*"
 build_style=gnu-makefile
 make_build_args="prefix=/usr sysconfdir=/etc USE_SYSTEM_LLVM=0 USE_LLVM_SHLIB=1
  USE_SYSTEM_PCRE=1 USE_SYSTEM_BLAS=1 USE_SYSTEM_LAPACK=1 USE_SYSTEM_GMP=1
- USE_SYSTEM_MPFR=1 USE_SYSTEM_LIBUV=0 USE_SYSTEM_LIBGIT2=1
+ USE_SYSTEM_MPFR=1 USE_SYSTEM_LIBUV=0 USE_SYSTEM_LIBGIT2=1 USE_BINARYBUILDER=0
  LIBLAPACK=-lopenblas LIBLAPACKNAME=libopenblas
  LIBBLAS=-lopenblas LIBBLASNAME=libopenblas"
 make_install_args="$make_build_args"
@@ -22,10 +22,10 @@ maintainer="Adam Beckmeyer <adam_git@thebeckmeyers.xyz>"
 license="MIT"
 homepage="https://julialang.org"
 distfiles="https://github.com/JuliaLang/julia/releases/download/v${version}/julia-${version}-full.tar.gz"
-checksum=3c5395dd3419ebb82d57bcc49dc729df3b225b9094e74376f8c649ee35ed79c2
+checksum=2419b268fc5c3666dd9aeb554815fe7cf9e0e7265bc9b94a43957c31a68d9184
 nocross=yes
 # Falsely detects dependency on libllvm
-skiprdeps="/usr/lib/libjulia.so.1.1 /usr/lib/julia/libllvmcalltest.so"
+skiprdeps="/usr/lib/libjulia.so.1.2 /usr/lib/julia/libllvmcalltest.so"
 
 case "$XBPS_TARGET_MACHINE" in
 *-musl)
diff --git a/srcpkgs/jwm-settings-manager/template b/srcpkgs/jwm-settings-manager/template
index 5dbaf7e2488..fc09f90e26c 100644
--- a/srcpkgs/jwm-settings-manager/template
+++ b/srcpkgs/jwm-settings-manager/template
@@ -6,7 +6,7 @@ build_style=cmake
 hostmakedepends="pkg-config fltk"
 makedepends="fltk-devel libXpm-devel"
 short_desc="Full configuration manager for JWM"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Israel-D/jwm-settings-manager"
 distfiles="https://github.com/Israel-D/jwm-settings-manager/archive/${version}.tar.gz"
diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 83ec9c394a8..f6592f9b5e7 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,6 +1,6 @@
 # Template file for 'k3b'
 pkgname=k3b
-version=19.04.3
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake"
@@ -14,5 +14,5 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/multimedia/k3b/"
 distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=c92b7b811f47d31b107aa14fb1e21d01a8635c208c1503f4ddf183522501df61
+checksum=a16796a873018bc5fd9f562297fea56d3f6d32a1e903a3e145814ea7d9be5209
 
diff --git a/srcpkgs/k3s/files/k3s-agent/log/run b/srcpkgs/k3s/files/k3s-agent/log/run
new file mode 100755
index 00000000000..6a3f7aaa612
--- /dev/null
+++ b/srcpkgs/k3s/files/k3s-agent/log/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec logger -t k3s-agent
diff --git a/srcpkgs/k3s/files/k3s-agent/run b/srcpkgs/k3s/files/k3s-agent/run
new file mode 100755
index 00000000000..48244292cf9
--- /dev/null
+++ b/srcpkgs/k3s/files/k3s-agent/run
@@ -0,0 +1,10 @@
+#!/bin/sh
+set --
+[ -r /etc/k3s/config ] && . /etc/k3s/config
+[ -r conf ] && . ./conf
+if [ 0 = $# ]; then
+  set -- \
+    ${K3S_SERVER:+--server="${K3S_SERVER}"} \
+    ${K3S_TOKEN:+--token="${K3S_TOKEN}"}
+fi
+exec k3s agent ${K3S_OPTIONS} ${K3S_AGENT_OPTIONS} "$@"
diff --git a/srcpkgs/k3s/files/k3s-server/log/run b/srcpkgs/k3s/files/k3s-server/log/run
new file mode 100755
index 00000000000..e78f852bb29
--- /dev/null
+++ b/srcpkgs/k3s/files/k3s-server/log/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec logger -t k3s-server
diff --git a/srcpkgs/k3s/files/k3s-server/run b/srcpkgs/k3s/files/k3s-server/run
new file mode 100755
index 00000000000..03ada62d4a4
--- /dev/null
+++ b/srcpkgs/k3s/files/k3s-server/run
@@ -0,0 +1,5 @@
+#!/bin/sh
+set --
+[ -r /etc/k3s/config ] && . /etc/k3s/config
+[ -r ./conf ] && . ./conf
+exec k3s server ${K3S_OPTIONS} ${K3S_SERVER_OPTIONS} "$@"
diff --git a/srcpkgs/k3s/template b/srcpkgs/k3s/template
new file mode 100644
index 00000000000..1657a9b7823
--- /dev/null
+++ b/srcpkgs/k3s/template
@@ -0,0 +1,65 @@
+# Template file for 'k3s'
+pkgname=k3s
+version=0.9.1
+revision=2
+create_wrksrc=yes
+build_wrksrc="${pkgname}-${version}"
+build_style=go
+go_import_path="github.com/rancher/k3s"
+hostmakedepends="git pkg-config"
+makedepends="libseccomp-devel"
+short_desc="Lightweight Kubernetes"
+maintainer="Cameron Nemo <cnemo@tutanota.com>"
+license="Apache-2.0"
+homepage="https://k3s.io"
+# _traefik_* variables' values from scripts/download in source distfile
+_traefik_version="1.77.1"
+_traefik_file="traefik-${_traefik_version}.tgz"
+distfiles="https://${go_import_path}/archive/v${version}.tar.gz
+ https://kubernetes-charts.storage.googleapis.com/${_traefik_file}"
+checksum="dee3ddfcdb61f292bcfe778d7677e436309511e15c6bbdd326ebec42ea41bbac
+ 15dd78d136d7c9bae7144072052ef6cd12821ae081a7c085f145d834d96c5d5c"
+skip_extraction="${_traefik_file}"
+conflicts="kubernetes"
+
+_git_commit=755bd1c63bafe80f9b5fe8d4bba527f988625364
+
+pre_build() {
+	# Modify version.sh to use template variables' values.
+	vsed -i scripts/version.sh -e '
+		s@^COMMIT=.*@COMMIT='"${_git_commit}"'@;
+		s@^GIT_TAG=.*@GIT_TAG=v'"${version}"'@
+		'
+	# Remove -s (strip) and -w (no dwarf) linker arguments.
+	vsed -i scripts/build -e 's@-w -s@@'
+	# Remove BIN_SUFFIX, nullify GOARCH for go generate. The latter
+	# is needed because 'go run' will try to run binaries for the
+	# target given by GOOS/GOARCH. The -x prints what 'go generate'
+	# is executing. CGO_ENABLED is set to 0 because cross builds
+	# won't necessarily be able to handle 64-bit builds performed by
+	# 'go run'.
+	vsed -i scripts/package-cli -e '
+		s@BIN_SUFFIX="[^"]\+"@BIN_SUFFIX=""@;
+		s@^go generate$@CGO_ENABLED=0 GOARCH= & -x@;
+		s@-w -s@@g
+		'
+
+	# Recreate behavior of scripts/download minus downloading
+	# anything or having anything to do with busybox.
+	mkdir -p bin
+
+	mkdir -p build/static/charts
+	cp ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_traefik_file} build/static/charts/${_traefik_file}
+}
+
+do_build() {
+	scripts/build
+	scripts/package-cli
+}
+
+do_install() {
+	vbin dist/artifacts/k3s
+	vbin dist/artifacts/hyperkube
+	vsv k3s-server
+	vsv k3s-agent
+}
diff --git a/srcpkgs/kColorPicker-devel b/srcpkgs/kColorPicker-devel
new file mode 120000
index 00000000000..bc2cf83a861
--- /dev/null
+++ b/srcpkgs/kColorPicker-devel
@@ -0,0 +1 @@
+kColorPicker
\ No newline at end of file
diff --git a/srcpkgs/kColorPicker/template b/srcpkgs/kColorPicker/template
new file mode 100644
index 00000000000..954ae0e8a76
--- /dev/null
+++ b/srcpkgs/kColorPicker/template
@@ -0,0 +1,28 @@
+# Template file for 'kColorPicker'
+pkgname=kColorPicker
+version=0.1.0
+revision=1
+build_style=cmake
+configure_args="-DBUILD_TESTS=ON -DBUILD_EXAMPLE=OFF -DBUILD_SHARED_LIBS=ON"
+hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools"
+makedepends="qt5-devel"
+short_desc="Qt based Color Picker with popup menu"
+maintainer="John <johnz@posteo.net>"
+license="LGPL-2.0-or-later"
+homepage="https://github.com/DamirPorobic/kColorPicker"
+distfiles="https://github.com/DamirPorobic/kColorPicker/archive/v${version}.tar.gz"
+checksum=104a5c8c507786219c99ab62511189f4f7fb9435f88c11774e78ed628509ddb5
+
+pre_check() {
+	export QT_QPA_PLATFORM=offscreen
+}
+
+kColorPicker-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/kImageAnnotator-devel b/srcpkgs/kImageAnnotator-devel
new file mode 120000
index 00000000000..d26188257d4
--- /dev/null
+++ b/srcpkgs/kImageAnnotator-devel
@@ -0,0 +1 @@
+kImageAnnotator
\ No newline at end of file
diff --git a/srcpkgs/kImageAnnotator/template b/srcpkgs/kImageAnnotator/template
new file mode 100644
index 00000000000..90defcba517
--- /dev/null
+++ b/srcpkgs/kImageAnnotator/template
@@ -0,0 +1,28 @@
+# Template file for 'kImageAnnotator'
+pkgname=kImageAnnotator
+version=0.1.0
+revision=2
+build_style=cmake
+configure_args="-DBUILD_TESTS=ON -DBUILD_EXAMPLE=OFF -DBUILD_SHARED_LIBS=ON"
+hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools"
+makedepends="qt5-devel kColorPicker-devel"
+short_desc="Tool for annotating images"
+maintainer="John <johnz@posteo.net>"
+license="LGPL-2.0-or-later"
+homepage="https://github.com/DamirPorobic/kImageAnnotator"
+distfiles="https://github.com/DamirPorobic/kImageAnnotator/archive/v${version}.tar.gz"
+checksum=5172586c337d018fe988659ea728e023ca660becd5c2e10304438972aff1eced
+
+pre_check() {
+	export QT_QPA_PLATFORM=offscreen
+}
+
+kImageAnnotator-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/kaccounts-integration/template b/srcpkgs/kaccounts-integration/template
index 0bc23e4af89..9e31e95ecd5 100644
--- a/srcpkgs/kaccounts-integration/template
+++ b/srcpkgs/kaccounts-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-integration'
 pkgname=kaccounts-integration
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake"
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-integration.git/"
 distfiles="${KDE_SITE}/applications/${version}/src/kaccounts-integration-${version}.tar.xz"
-checksum=b6602a1270037c8c9dc366e3bf6ddf6d7dcd14ca66623e3ecc6641fd474c0d2a
+checksum=b422c23eb3eefc3a79c4ccb9360ae6269a86982575e981bb949c0782f1f813ce
 nocross="libaccounts-qt5 is nocross"
 
 kaccounts-integration-devel_package() {
diff --git a/srcpkgs/kaccounts-providers/template b/srcpkgs/kaccounts-providers/template
index f6724171147..178c10c4abe 100644
--- a/srcpkgs/kaccounts-providers/template
+++ b/srcpkgs/kaccounts-providers/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-providers'
 pkgname=kaccounts-providers
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool qt5-qmake qt5-host-tools pkg-config"
@@ -10,5 +10,5 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-providers.git/"
 distfiles="${KDE_SITE}/applications/${version}/src/kaccounts-providers-${version}.tar.xz"
-checksum=9fc235e2140e76e4b95589a8a5b1e98f7aac00f4c9ad8ba774be0d0d360df8c3
+checksum=d5ad6882ff151d2f0cff2b76a83e38cf37c72a0dbdf4a0aff64420903266a309
 nocross="kaccounts-integration is nocross"
diff --git a/srcpkgs/kactivities5-stats/template b/srcpkgs/kactivities5-stats/template
index a7812efec66..b73aa726d3e 100644
--- a/srcpkgs/kactivities5-stats/template
+++ b/srcpkgs/kactivities5-stats/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5-stats'
 pkgname=kactivities5-stats
-version=5.61.0
+version=5.63.0
 revision=1
 wrksrc="${pkgname/5/}-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://api.kde.org/frameworks/kactivities/html/index.html"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname/5/}-${version}.tar.xz"
-checksum=9062eb0f189f1b50674e65a7db9a4b821c628acd1ac650000cebbf1f7bdf0068
+checksum=85f817fd3380be1e4641cb280c1b56e697bd8eabf386784f1876da2b12f5eea0
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
@@ -23,6 +23,7 @@ kactivities5-stats-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt5/mkspecs
 		vmove usr/lib/cmake
 		vmove "usr/lib/*.so"
diff --git a/srcpkgs/kactivities5/template b/srcpkgs/kactivities5/template
index cf154f2302f..85578669aa0 100644
--- a/srcpkgs/kactivities5/template
+++ b/srcpkgs/kactivities5/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5'
 pkgname=kactivities5
-version=5.61.0
+version=5.63.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kactivities"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=0d7d7e5bd68541ad1dcf1f96c7205330cb7b075c6ff0d8b46774e781eff84af5
+checksum=fa08c5de949efc6ec972c0e0e2234d445ed88e0df30fa9b683891025fec9050e
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools"
@@ -26,6 +26,7 @@ kactivities5-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt5/mkspecs
 		vmove usr/lib/cmake
 		vmove "usr/lib/*.so"
diff --git a/srcpkgs/kactivitymanagerd/template b/srcpkgs/kactivitymanagerd/template
index db1c3bb19be..4120ce48dfd 100644
--- a/srcpkgs/kactivitymanagerd/template
+++ b/srcpkgs/kactivitymanagerd/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivitymanagerd'
 pkgname=kactivitymanagerd
-version=5.16.4
+version=5.17.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/plasma/kactivitymanagerd"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=a287fc9624390c8493a35a5440e2161d1bb67252b6986231acb6268440bb4770
+checksum=23ef9043a968d0f6920b1ca677673c09282c94482be1bfdf5fb38e7b2d09fe3f
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DRUN_RESULT_VAR=0"
diff --git a/srcpkgs/kaddressbook/template b/srcpkgs/kaddressbook/template
index cd2c5972eb8..54ee81f552f 100644
--- a/srcpkgs/kaddressbook/template
+++ b/srcpkgs/kaddressbook/template
@@ -1,7 +1,7 @@
 # Template file for 'kaddressbook'
 pkgname=kaddressbook
-version=19.08.0
-revision=1
+version=19.08.2
+revision=2
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kconfig
@@ -12,4 +12,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/office/kaddressbook"
 distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=9639047be5c5ea245844831e315fa0f0baca40d243f611a98bbab3503af127cf
+checksum=4d67480ebf8ee96fcde85e66f8ad32119b006e36c87f4e4ac20ecfa967599260
diff --git a/srcpkgs/kak-lsp/template b/srcpkgs/kak-lsp/template
index 99154ab54b0..e80a7ce5044 100644
--- a/srcpkgs/kak-lsp/template
+++ b/srcpkgs/kak-lsp/template
@@ -1,6 +1,6 @@
 # Template file for 'kak-lsp'
 pkgname=kak-lsp
-version=6.2.1
+version=7.0.0
 revision=1
 build_style=cargo
 short_desc="Language Server Protocol client for Kakoune"
@@ -8,7 +8,7 @@ maintainer="Emerson Ferreira <me@skrps.me>"
 license="Unlicense"
 homepage="https://github.com/ul/kak-lsp"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=00ca9f8b9a875790a24030fd1a7304c84cd94aa918be6846af5ef84898ef569b
+checksum=94af509062471a4e2dac760ac10704c05fb803983509cd85e20c6036240ef4c4
 
 post_install() {
 	vlicense UNLICENSE
diff --git a/srcpkgs/kalarm/template b/srcpkgs/kalarm/template
index 645193252f6..50501dd8e74 100644
--- a/srcpkgs/kalarm/template
+++ b/srcpkgs/kalarm/template
@@ -1,7 +1,7 @@
 # Template file for 'kalarm'
 pkgname=kalarm
-version=19.08.0
-revision=1
+version=19.08.2
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools libxslt kdoctools
  kauth kconfig"
@@ -11,4 +11,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kalarm"
 distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=e0ddabb2abfc2d593ec88864179c30eda219f7db4c25b7fc9951ac3b388eee84
+checksum=54d61b469042d27b8df903c5fc95dd68c1d108218f1402a733d974ab02576d24
diff --git a/srcpkgs/kalarmcal/template b/srcpkgs/kalarmcal/template
index aa9bd7830ad..25da48afe2b 100644
--- a/srcpkgs/kalarmcal/template
+++ b/srcpkgs/kalarmcal/template
@@ -1,6 +1,6 @@
 # Template file for 'kalarmcal'
 pkgname=kalarmcal
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=5f764d58716e7d271fac4cb3a4df6ab157014533782c47c38bacab59ca669419
+checksum=4dc6e1cd8a9cbf6e3f8e593e68ef6fa912819ece56efa64852ab33e3f582e6b7
 
 kalarmcal-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kapidox/template b/srcpkgs/kapidox/template
index 84f1082d08a..4e3cbb00ff0 100644
--- a/srcpkgs/kapidox/template
+++ b/srcpkgs/kapidox/template
@@ -1,6 +1,6 @@
 # Template file for 'kapidox'
 pkgname=kapidox
-version=5.61.0
+version=5.63.0
 revision=1
 archs=noarch
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <johnz@posteo.net>"
 license="BSD-2-Clause"
 homepage="https://projects.kde.org/projects/frameworks/kapidox"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3c948c87c7f7b16a3835f7df8387c110efe5fefecf8a7d6ffa1cae647be0669f
+checksum=29ccea641395a73a83c040a63aea25b14c7318352a6f9321c62b8cf32fcc9733
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/karchive/template b/srcpkgs/karchive/template
index cd42e95c827..29953fff154 100644
--- a/srcpkgs/karchive/template
+++ b/srcpkgs/karchive/template
@@ -1,6 +1,6 @@
 # Template file for 'karchive'
 pkgname=karchive
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/frameworks/karchive"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=457ed420449630625cb161fcc9bedc7c6a16527f48d6db4008aea76cdb948387
+checksum=fa733531ddc6059eb92d4eaceb5b84177ee832e9303afdf229bf25da979ffe7a
 
 karchive-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kate5/template b/srcpkgs/kate5/template
index a133a7af785..2fc5bdf1377 100644
--- a/srcpkgs/kate5/template
+++ b/srcpkgs/kate5/template
@@ -1,6 +1,6 @@
 # Template file for 'kate5'
 pkgname=kate5
-version=19.08.0
+version=19.08.2
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-3.0-or-later, LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/applications/kate"
 distfiles="${KDE_SITE}/applications/${version}/src/${pkgname%5}-${version}.tar.xz"
-checksum=6acc3172429191ab47722d788f324292ea5ee2f1e419d48c72200579b9b30878
+checksum=9897f652996e3ebca8a749562cc2d609d704c80b08ec4716622def38f5980b47
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DKF5_HOST_TOOLING=/usr/lib/cmake"
diff --git a/srcpkgs/kauth/template b/srcpkgs/kauth/template
index 8285e54ee4e..7c78e0fde61 100644
--- a/srcpkgs/kauth/template
+++ b/srcpkgs/kauth/template
@@ -1,6 +1,6 @@
 # Template file for 'kauth'
 pkgname=kauth
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kauth"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b04458f32046b2dd61b48118646180df63d2c843cb2d53560aaa15168df087f1
+checksum=2c4917f0bb49f09b232aeda9d3282eef0e235124fab1dab0deeae2ae7a7df321
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kcoreaddons qt5-host-tools qt5-qmake qt5-tools-devel polkit-qt5-devel"
diff --git a/srcpkgs/kbfs b/srcpkgs/kbfs
new file mode 120000
index 00000000000..c02e554306a
--- /dev/null
+++ b/srcpkgs/kbfs
@@ -0,0 +1 @@
+keybase
\ No newline at end of file
diff --git a/srcpkgs/kbfs/template b/srcpkgs/kbfs/template
deleted file mode 100644
index 5bd004bae82..00000000000
--- a/srcpkgs/kbfs/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'kbfs'
-pkgname=kbfs
-version=2.11.0
-revision=1
-build_style=go
-go_import_path="github.com/keybase/kbfs"
-go_package="${go_import_path}/kbfsfuse ${go_import_path}/kbfsgit/git-remote-keybase ${go_import_path}/kbfstool ${go_import_path}/redirector"
-go_build_tags="production"
-depends="keybase util-linux"
-short_desc="Keybase Filesystem"
-maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://keybase.io/docs/kbfs"
-distfiles="https://github.com/keybase/kbfs/archive/v${version}.tar.gz"
-checksum=0e97cab1c90592035ec6763e22c78c08a95dd3467419d15b9e45b3d0887b594d
-
-post_install() {
-	mv ${DESTDIR}/usr/bin/redirector ${DESTDIR}/usr/bin/keybase-redirector
-	# setuid
-	chmod 4755 ${DESTDIR}/usr/bin/keybase-redirector
-
-	vlicense LICENSE
-}
diff --git a/srcpkgs/kbookmarks/template b/srcpkgs/kbookmarks/template
index 9e7dff7a8c4..4ac73909960 100644
--- a/srcpkgs/kbookmarks/template
+++ b/srcpkgs/kbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'kbookmarks'
 pkgname=kbookmarks
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-only"
 homepage="https://projects.kde.org/projects/frameworks/kbookmarks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=24f87ff1acc5f0c257518f67af277b454566e607f82eb09e75b4a6ed02403377
+checksum=5be8d8640f7a4519c25c55e59ea7a640ea48a2646560a0ea2c9ff95374153904
 
 kbookmarks-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcachegrind/template b/srcpkgs/kcachegrind/template
index 1be4cb29aca..04600c9f09f 100644
--- a/srcpkgs/kcachegrind/template
+++ b/srcpkgs/kcachegrind/template
@@ -1,10 +1,10 @@
 # Template file for 'kcachegrind'
 pkgname=kcachegrind
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules kconfig kcoreaddons kdoctools
- pkg-config python qt5-host-tools qt5-qmake"
+hostmakedepends="extra-cmake-modules kcoreaddons kdoctools
+ pkg-config qt5-host-tools qt5-qmake"
 makedepends="kparts-devel qt5-devel"
 depends="python hicolor-icon-theme"
 short_desc="Visualization of Performance Profiling Data"
@@ -12,4 +12,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/development/kcachegrind/"
 distfiles="${KDE_SITE}/applications/${version}/src/kcachegrind-${version}.tar.xz"
-checksum=676dd522eb9976789da17eea1dc103c9c67b6df7bfa70d998e29c0e7dde0608b
+checksum=baf17a5c11f21deb7b019a7e3a9819348ec8d20af5c8c4a6108b96266e425b46
diff --git a/srcpkgs/kcalc/template b/srcpkgs/kcalc/template
index cbcacfc0bac..183963ce4f1 100644
--- a/srcpkgs/kcalc/template
+++ b/srcpkgs/kcalc/template
@@ -1,14 +1,14 @@
 # Template file for 'kcalc'
 pkgname=kcalc
-version=19.04.3
+version=19.08.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules kcoreaddons kconfig kdoctools python qt5-host-tools qt5-qmake"
-makedepends="gmp-devel kinit-devel kparts-devel qt5-devel"
+makedepends="gmp-devel kinit-devel kparts-devel qt5-devel mpfr-devel"
 short_desc="Simple and scientific calculator"
 maintainer="Norbert Vegh <vegh@norvegh.com>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kcalc/"
 distfiles="${KDE_SITE}/applications/${version}/src/kcalc-${version}.tar.xz"
-checksum=42da5439af4f59402d27f2c48d4ee9c68d4a84bfda8d16a5ab9d7ab6bdcc02d5
+checksum=94a6d004266813449b6b9efbe0e3b0da3e5368059134668277a344a720f65fd9
diff --git a/srcpkgs/kcalcore/template b/srcpkgs/kcalcore/template
index 35408d42a75..f8d6810fdd0 100644
--- a/srcpkgs/kcalcore/template
+++ b/srcpkgs/kcalcore/template
@@ -1,6 +1,6 @@
 # Template file for 'kcalcore'
 pkgname=kcalcore
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python bison"
@@ -10,7 +10,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/applications/${version}/src/kcalcore-${version}.tar.xz"
-checksum=7c7bbca70ada8c8317d6d3d91e0357b2b5886328189423e0b7fac1d326f8ed85
+checksum=f7d33ec65cf954a0460258694ecb2e14bf6c00cee5ea9fdc3e015e78947d896a
 
 case $XBPS_TARGET_MACHINE in
 	*-musl) CFLAGS="-D_GNU_SOURCE";;
diff --git a/srcpkgs/kcalutils/template b/srcpkgs/kcalutils/template
index bd17013d547..5c97991a0c2 100644
--- a/srcpkgs/kcalutils/template
+++ b/srcpkgs/kcalutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcalutils'
 pkgname=kcalutils
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/applications/${version}/src/kcalutils-${version}.tar.xz"
-checksum=ce0cb6633d7f85fdfa54085710c421f0465b286e9236f55c0297737abdfbaf7e
+checksum=3f789a18348152f9fc70965dbc2e9a8bd0ba872968c3d0631afacd0e78d3ce13
 
 kcalutils-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kcharselect/template b/srcpkgs/kcharselect/template
index 5a5afc15f60..368e9579a11 100644
--- a/srcpkgs/kcharselect/template
+++ b/srcpkgs/kcharselect/template
@@ -1,6 +1,6 @@
 # Template file for 'kcharselect'
 pkgname=kcharselect
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="travankor <travankor@tuta.io>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kcharselect/"
 distfiles="${KDE_SITE}/applications/${version}/src/kcharselect-${version}.tar.xz"
-checksum=31caf29e82327d7e31badff141dd7d5f179b87e9547c322b074f58bc07063020
+checksum=ff2a8c78fc4a12dd727e8ad8677216d5a480a8c82aff97269397ee8ae01e36df
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kdoctools python qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kcmutils/template b/srcpkgs/kcmutils/template
index ab43f153b67..9381f9f0727 100644
--- a/srcpkgs/kcmutils/template
+++ b/srcpkgs/kcmutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcmutils'
 pkgname=kcmutils
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-or-later, LGPL-2.0-only"
 homepage="https://projects.kde.org/projects/frameworks/kcmutils"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b8b79ef2f4513fbe5e4c61cf4726ed33b95efffabdd512fcc2dcff23c23cdfa7
+checksum=c8bc32268307656b73aaa9c5c28ba05c92bd5e8a85eaab1772a2e6e774b222e0
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python"
diff --git a/srcpkgs/kcodecs/template b/srcpkgs/kcodecs/template
index 86da1801e9f..96b04beb038 100644
--- a/srcpkgs/kcodecs/template
+++ b/srcpkgs/kcodecs/template
@@ -1,6 +1,6 @@
 # Template file for 'kcodecs'
 pkgname=kcodecs
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kcodecs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4604323e44c1be7547f25b43b71bd541048c3d036a7fc5ca74e5ece9792ff5ee
+checksum=30214dcc48ac4214c4f0b7bb0e36174fd8de13d4e9cd210e41d4ff86e919b870
 
 kcodecs-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kcolorchooser/template b/srcpkgs/kcolorchooser/template
index 9a113dc2d95..3fbf0f825e4 100644
--- a/srcpkgs/kcolorchooser/template
+++ b/srcpkgs/kcolorchooser/template
@@ -1,6 +1,6 @@
 # Template file for 'kcolorchooser'
 pkgname=kcolorchooser
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="travankor <travankor@tuta.io>"
 license="MIT"
 homepage="https://www.kde.org/applications/graphics/kcolorchooser"
 distfiles="${KDE_SITE}/applications/${version}/src/kcolorchooser-${version}.tar.xz"
-checksum=bd9fa8940218f686b0a2d8c6fbe38b996646508a1908dd53925c2513f6fd39eb
+checksum=4eb50f314b190f1980e73212a45fe86db39f278f789288cd76cb0763f3176edc
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel"
diff --git a/srcpkgs/kcompletion/template b/srcpkgs/kcompletion/template
index 650cbb6b61d..09435678b91 100644
--- a/srcpkgs/kcompletion/template
+++ b/srcpkgs/kcompletion/template
@@ -1,6 +1,6 @@
 # Template file for 'kcompletion'
 pkgname=kcompletion
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kcompletion"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=68697be65d6c9e0053fc3e504170d23c3162c05a0a9027249c575bc6dc8bd3ec
+checksum=4bc7458e44fe5fba0e18aa296236de4523acb47b51f73d5f0a8ca904def5ef81
 
 if [ "CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools-devel"
@@ -22,6 +22,7 @@ kcompletion-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/qt5/mkspecs
+		vmove usr/lib/qt5/plugins/designer
 		vmove usr/lib/cmake
 		vmove "usr/lib/*.so"
 	}
diff --git a/srcpkgs/kconfig/template b/srcpkgs/kconfig/template
index 7586fda6649..ab78d8832cb 100644
--- a/srcpkgs/kconfig/template
+++ b/srcpkgs/kconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfig'
 pkgname=kconfig
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=94c0e292a5d57e014aa745be6b59a989118ead1252d56c768f2719b5c6471372
+checksum=6165d493323562026a0341c0e2fbad6a603fa7bd92353f7951844797f37640f9
 
 kconfig-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kconfigwidgets/template b/srcpkgs/kconfigwidgets/template
index 7b5fcb2b959..9ff9e58631c 100644
--- a/srcpkgs/kconfigwidgets/template
+++ b/srcpkgs/kconfigwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfigwidgets'
 pkgname=kconfigwidgets
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kconfigwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4cc1e55c5f994abbec03b32bef73bdf54c2613199a446ad63f4ced6e3a0e2165
+checksum=e577c68523721cbdbe2f019098f382cdcd4db4c805fb68d86c2b7d6fb76b1d25
 
 kconfigwidgets-devel_package() {
 	short_desc+=" - development"
@@ -20,6 +20,7 @@ kconfigwidgets-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/qt5/mkspecs
+		vmove usr/lib/qt5/plugins/designer
 		vmove usr/lib/cmake
 		vmove "usr/lib/*.so"
 	}
diff --git a/srcpkgs/kcontacts/template b/srcpkgs/kcontacts/template
index db382cc59c2..cba2a980065 100644
--- a/srcpkgs/kcontacts/template
+++ b/srcpkgs/kcontacts/template
@@ -1,17 +1,18 @@
 # Template file for 'kcontacts'
 pkgname=kcontacts
-version=19.08.0
+reverts="19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1"
+version=5.63.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python
  kcoreaddons"
 makedepends="qt5-devel kcoreaddons-devel ki18n-devel kconfig-devel kcodecs-devel"
 short_desc="Address book API for KDE"
-maintainer="Helmut Pozimski <helmut@pozimski.eu>"
+maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/applications/kcontacts"
-distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=b245832fe6150a915d3bcbf1ec4c2c37b6aab541b2568f4955dcd76afa1c486e
+distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
+checksum=10f0bb2cbcab33332830763a0f9313c0c5919c0d5dc974908965b24d68614577
 
 kcontacts-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcoreaddons/template b/srcpkgs/kcoreaddons/template
index f156f339f63..84f70cd6acd 100644
--- a/srcpkgs/kcoreaddons/template
+++ b/srcpkgs/kcoreaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kcoreaddons'
 pkgname=kcoreaddons
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kcoreaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6a4ea2eca77944c24fe63d2f7111913db721533d5971497cb5bdd2cac896e813
+checksum=4d6e76e2a191b7a4c5f46b4cf8ed14edee25eb4357a82b1dc8f4753d1d47c5f0
 
 post_install() {
 	vsed -e 's;${_IMPORT_PREFIX};/usr;g' \
diff --git a/srcpkgs/kcrash/template b/srcpkgs/kcrash/template
index cec785ec607..22877acfd88 100644
--- a/srcpkgs/kcrash/template
+++ b/srcpkgs/kcrash/template
@@ -1,6 +1,6 @@
 # Template file for 'kcrash'
 pkgname=kcrash
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kcrash"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=83e6333ea0cd7d1ded3fa84f126e3c86a010d7bdb7fd183e7c5d42a8b8e74db8
+checksum=8c3baa5143eb6927c9ed0b90183ab76ea880df016fd0482f73ca41e6fa5f83f6
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools kwindowsystem-devel kcoreaddons"
diff --git a/srcpkgs/kcron/template b/srcpkgs/kcron/template
index b000a5759c4..3742daff90c 100644
--- a/srcpkgs/kcron/template
+++ b/srcpkgs/kcron/template
@@ -1,14 +1,14 @@
 # Template file for 'kcron'
 pkgname=kcron
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules kconfig kcoreaddons kdoctools
- pkg-config python qt5-host-tools qt5-qmake"
+hostmakedepends="extra-cmake-modules kcoreaddons kdoctools
+ pkg-config qt5-host-tools qt5-qmake"
 makedepends="kparts-devel qt5-devel"
 short_desc="KDE Configure and schedule tasks"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://userbase.kde.org/System_Settings/Task_Scheduler"
 distfiles="${KDE_SITE}/applications/${version}/src/kcron-${version}.tar.xz"
-checksum=1594aafc964d8e6c9ff31056d8f6f9ca6ee51ef9067b3ee1c991744baf54a88c
+checksum=270ee81cba5ef9d92158a3fc71cf8c50c658468018eb0415c9d3d0bc7abea5e5
diff --git a/srcpkgs/kdav/template b/srcpkgs/kdav/template
index 75e136b6286..fd84cb81c4a 100644
--- a/srcpkgs/kdav/template
+++ b/srcpkgs/kdav/template
@@ -1,6 +1,6 @@
 # Template file for 'kdav'
 pkgname=kdav
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=8bfd0657c0eaa74068c7601208baacb9d11bc6574cd353d4d346473c6c43b6f6
+checksum=8572a77ee3d0f8a7e09e4975fcf0420394c16e908c4a19aecc409415770595f9
 
 kdav-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kdbusaddons/template b/srcpkgs/kdbusaddons/template
index e6038bca1f2..c049cdb4788 100644
--- a/srcpkgs/kdbusaddons/template
+++ b/srcpkgs/kdbusaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kdbusaddons'
 pkgname=kdbusaddons
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kdbusaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f24fadc71670591bb679cde68147e53819f6c3d56126ecbafe59688fc47b347d
+checksum=1b0ba356dd285b6785d14b91f17eb1bcb9c5c84f23ff5c8608954cb013cafc87
 
 kdbusaddons-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kde-cli-tools/template b/srcpkgs/kde-cli-tools/template
index 63c730d8e47..8d69866f1ef 100644
--- a/srcpkgs/kde-cli-tools/template
+++ b/srcpkgs/kde-cli-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-cli-tools'
 pkgname=kde-cli-tools
-version=5.16.4
+version=5.17.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kde-cli-tools.git"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=56c7c2566217704a9d613757767c3b8ee8d1bc4601b9414a44acb50aaaaedc0d
+checksum=1d554bc8c68b9a7ec7e467bcd38b64ed706c5c6a6de566c4b205b536f5490744
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kdoctools kcoreaddons python qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kde-gtk-config5/template b/srcpkgs/kde-gtk-config5/template
index dfc301bb91a..3793a80c221 100644
--- a/srcpkgs/kde-gtk-config5/template
+++ b/srcpkgs/kde-gtk-config5/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-gtk-config5'
 pkgname=kde-gtk-config5
-version=5.16.4
+version=5.17.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -8,13 +8,13 @@ configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools"
 makedepends="kcmutils-devel knewstuff-devel gtk+-devel gtk+3-devel
  gsettings-desktop-schemas-devel"
-depends="kde-cli-tools"
+depends="kde-cli-tools gsettings-desktop-schemas"
 short_desc="GTK2 and GTK3 Configurator for KDE"
 maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/plasma/kde-gtk-config"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=c271b1caebac0837483af7ae11d2e4786a7770ff85753f1a3da4c8d28681111c
+checksum=a6eb212078877ef37cd103d92d2d342d6306c5c1f16778586dd271ecb75a3bd6
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kcoreaddons"
diff --git a/srcpkgs/kde5-baseapps/template b/srcpkgs/kde5-baseapps/template
index 70be2d94cb9..c7b66b346e5 100644
--- a/srcpkgs/kde5-baseapps/template
+++ b/srcpkgs/kde5-baseapps/template
@@ -1,6 +1,6 @@
 # Template file for 'kde5-baseapps'
 pkgname=kde5-baseapps
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=meta
 depends="
diff --git a/srcpkgs/kde5/template b/srcpkgs/kde5/template
index dcadced3bf3..3666ff0c305 100644
--- a/srcpkgs/kde5/template
+++ b/srcpkgs/kde5/template
@@ -1,32 +1,33 @@
 # Template file for 'kde5'
 pkgname=kde5
-version=5.15.0
+version=5.16.90
 revision=1
 build_style=meta
-depends="
-	bluedevil>=${version}
-	breeze-gtk>=${version}
-	kde-gtk-config5>=${version}
-	kdeplasma-addons5>=${version}
-	kgamma5>=${version}
-	kinfocenter>=${version}
-	kscreen>=${version}
-	ksshaskpass>=${version}
-	ksysguard>=${version}
-	kwallet-pam>=${version}
-	kwayland-integration>=${version}
-	kwrited>=${version}
-	oxygen>=${version}
-	plasma-desktop>=${version}
-	plasma-nm>=${version}
-	plasma-pa>=${version}
-	plasma-sdk>=${version}
-	plasma-workspace-wallpapers>=${version}
-	powerdevil>=${version}
-	sddm-kcm>=${version}
-	user-manager>=${version}
-	xdg-desktop-portal-kde>=${version}"
-short_desc="The kde 5 meta-package for Void Linux"
+depends="bluedevil>=${version}
+ breeze-gtk>=${version}
+ kde-gtk-config5>=${version}
+ kdeplasma-addons5>=${version}
+ kgamma5>=${version}
+ kinfocenter>=${version}
+ kscreen>=${version}
+ ksshaskpass>=${version}
+ ksysguard>=${version}
+ kwallet-pam>=${version}
+ kwayland-integration>=${version}
+ kwrited>=${version}
+ oxygen>=${version}
+ plasma-desktop>=${version}
+ plasma-nm>=${version}
+ plasma-pa>=${version}
+ plasma-sdk>=${version}
+ plasma-workspace-wallpapers>=${version}
+ powerdevil>=${version}
+ sddm-kcm>=${version}
+ user-manager>=${version}
+ xdg-desktop-portal-kde>=${version}
+ plasma-thunderbolt>=${version}
+ elogind"
+short_desc="The KDE Plasma Desktop meta-package for Void Linux"
 maintainer="John <johnz@posteo.net>"
 license="GPL-2, LGPL-2.1, FDL"
-homepage="http://www.kde.org"
+homepage="https://kde.org/plasma-desktop"
diff --git a/srcpkgs/kdeclarative/template b/srcpkgs/kdeclarative/template
index 9e27ec3c858..6d0d296d5c4 100644
--- a/srcpkgs/kdeclarative/template
+++ b/srcpkgs/kdeclarative/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeclarative'
 pkgname=kdeclarative
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kdeclarative"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=464a77f88cce72c1616654c371068c11d51e484e0de5c0c5e032126d71afedaa
+checksum=c873ab1076fce137090c341c9f2c1751b5aacf85eeb62b899bdda5936bb6fc08
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kconfig"
diff --git a/srcpkgs/kdecoration/template b/srcpkgs/kdecoration/template
index e5ed2420728..d8bf65a6428 100644
--- a/srcpkgs/kdecoration/template
+++ b/srcpkgs/kdecoration/template
@@ -1,6 +1,6 @@
 # Template file for 'kdecoration'
 pkgname=kdecoration
-version=5.16.4
+version=5.17.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/plasma/kdecoration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=aa77507dcf357243cca9002764f8c8d1c8404d7e5b7249ad0d0f900f0a47ace4
+checksum=d6d25e6894d941001af035497388aa998599d89df0ca2847c8aa6275b9bf9266
 
 kdecoration-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kded/template b/srcpkgs/kded/template
index c4b1b95eb9f..23ebe5b0bd2 100644
--- a/srcpkgs/kded/template
+++ b/srcpkgs/kded/template
@@ -1,6 +1,6 @@
 # Template file for 'kded'
 pkgname=kded
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kded"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ca970111cb2d0073305a226cc005e2085952c2a02703168a775f954d27d723bc
+checksum=055087306a3c7c970a13f8ba3fddaba433cc68fc67a5a88b56be9b179c33594e
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools"
diff --git a/srcpkgs/kdegraphics-mobipocket/template b/srcpkgs/kdegraphics-mobipocket/template
index d0cca875cc8..896f5d1667b 100644
--- a/srcpkgs/kdegraphics-mobipocket/template
+++ b/srcpkgs/kdegraphics-mobipocket/template
@@ -1,6 +1,6 @@
 # Template file for 'kdegraphics-mobipocket'
 pkgname=kdegraphics-mobipocket
-version=19.04.3
+version=19.08.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="Denis Revin <denis.revin@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/kde/kdegraphics-mobipocket"
 distfiles="${KDE_SITE}/applications/${version}/src/kdegraphics-mobipocket-${version}.tar.xz"
-checksum=c073730b7f3d468f4e710a67bdb90d794b69bf0f2c149f7fac705b44b912fa94
+checksum=9621b0b3564ce7fcd6890c15c48e11d00c1cf2d3b408b255ec590bd6d113439f
 
 libqmobipocket_package() {
 	short_desc+=" - runtime library"
diff --git a/srcpkgs/kdegraphics-thumbnailers/template b/srcpkgs/kdegraphics-thumbnailers/template
index 980248c0a89..79e79fd946f 100644
--- a/srcpkgs/kdegraphics-thumbnailers/template
+++ b/srcpkgs/kdegraphics-thumbnailers/template
@@ -1,6 +1,6 @@
 # Template file for 'kdegraphics-thumbnailers'
 pkgname=kdegraphics-thumbnailers
-version=19.04.3
+version=19.08.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kconfig-devel pkg-config"
@@ -11,4 +11,4 @@ maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/kde/kdegraphics-thumbnailers"
 distfiles="${KDE_SITE}/applications/${version}/src/kdegraphics-thumbnailers-${version}.tar.xz"
-checksum=1cca91081a97e851156d187794037bdcbffe996f607a1eed59a2ea00049a9f78
+checksum=86a81ff786168778cbe0ad7c185320dbf052b1df2e6269f14323df04b48ed2ff
diff --git a/srcpkgs/kdelibs4support/template b/srcpkgs/kdelibs4support/template
index c47237be96d..74c82becf02 100644
--- a/srcpkgs/kdelibs4support/template
+++ b/srcpkgs/kdelibs4support/template
@@ -1,6 +1,6 @@
 # Template file for 'kdelibs4support'
 pkgname=kdelibs4support
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kdelibs4support"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=ae6f7c10e1fe67ded687f38a8ab3c8d483ae06ae69344bd1e683af752cf40b5c
+checksum=8cd614941fc201bac296a0e8ab010f73791ffb5cd72bce6f6cdf87fb2ae3be9e
 
 if [ "$CROSS_BUILD" ]; then
 	makedepends+=" qt5-tools-devel"
@@ -31,6 +31,7 @@ kdelibs4support-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/qt5/plugins/designer
 		vmove usr/lib/*.so
 	}
 }
diff --git a/srcpkgs/kdenlive/template b/srcpkgs/kdenlive/template
index cf8eda2d1aa..69f53c77cf9 100644
--- a/srcpkgs/kdenlive/template
+++ b/srcpkgs/kdenlive/template
@@ -1,6 +1,6 @@
 # Template file for 'kdenlive'
 pkgname=kdenlive
-version=19.04.3
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="
@@ -17,7 +17,7 @@ maintainer="johannes <johannes.brechtmann@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://kdenlive.org"
 distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=c981954ce9759da2878b4c76d97b9bb7aa92fc1f073a9f759142870e287d2a1e
+checksum=5ca3b7a2457d2aa355309bc7471791f691edd8774af9a19cbfc8fac39ad53c78
 
 # needed for mlt to work on musl
 CXXFLAGS="-DHAVE_LOCALE_H=1"
diff --git a/srcpkgs/kdepim-apps-libs/template b/srcpkgs/kdepim-apps-libs/template
index 70db766ac79..f4e78b047d6 100644
--- a/srcpkgs/kdepim-apps-libs/template
+++ b/srcpkgs/kdepim-apps-libs/template
@@ -1,7 +1,7 @@
 # Template file for 'kdepim-apps-libs'
 pkgname=kdepim-apps-libs
-version=19.08.0
-revision=1
+version=19.08.2
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python
  kcoreaddons kconfig"
@@ -12,7 +12,7 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/applications/${version}/src/kdepim-apps-libs-${version}.tar.xz"
-checksum=2a19e9b0c3b6b2fecaeb4054bf101170056b8c9e831e45fb796b59666f103f2e
+checksum=d542b1d532d3ce3d9f1c63f4455175c7e855cd1e095a1addf1322074afc11923
 
 kdepim-apps-libs-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kdepim-runtime/template b/srcpkgs/kdepim-runtime/template
index 49f313d77b0..8928c20ccec 100644
--- a/srcpkgs/kdepim-runtime/template
+++ b/srcpkgs/kdepim-runtime/template
@@ -1,7 +1,7 @@
 # Template file for 'kdepim-runtime'
 pkgname=kdepim-runtime
-version=19.08.0
-revision=1
+version=19.08.2
+revision=2
 build_style=cmake
 # XXX KolabLibraries, Kolabxml
 hostmakedepends="extra-cmake-modules python3 kdoctools kdesignerplugin
@@ -14,7 +14,7 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later, AGPL-3.0-or-later"
 homepage="https://projects.kde.org/projects/kde/kdepimlibs"
 distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=634419978329902a1877810d87d4ddae8cb07adbabbfa4540b521689d8bc85ef
+checksum=9b98980003d2d107596e9acc9482dfc3ea26a2485c75a700bd82b53b9be72ebf
 
 post_install() {
 	vlicense COPYING.agpl3 COPYING.agpl3
diff --git a/srcpkgs/kdeplasma-addons5/template b/srcpkgs/kdeplasma-addons5/template
index a54452c8537..5048fdc9628 100644
--- a/srcpkgs/kdeplasma-addons5/template
+++ b/srcpkgs/kdeplasma-addons5/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeplasma-addons5'
 pkgname=kdeplasma-addons5
-version=5.16.4
+version=5.17.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/plasma/kdeplasma-addons"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=4c0884dcb8413fa836d7e390b1c12fc71127c0e5e6fa278a338c253d1539f4a1
+checksum=d4c6ab840f61dcdc52b925045614f9de4089dc2fdf89726fd7c8638c521eb42e
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/kdesignerplugin/template b/srcpkgs/kdesignerplugin/template
index aa47dd98f42..acad7c1faf2 100644
--- a/srcpkgs/kdesignerplugin/template
+++ b/srcpkgs/kdesignerplugin/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesignerplugin'
 pkgname=kdesignerplugin
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,8 +12,8 @@ short_desc="Integrating KDE frameworks widgets with Qt Designer"
 maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-only"
 homepage="https://projects.kde.org/projects/frameworks/kdesignerplugin"
-distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6b204dffbb4897f51143650d75383b5a3ddf4254455e5827d316c7b4ee7b3f33
+distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
+checksum=c9f63d672cbc04465e77eff07d62530e8f9a9129e0d6dfa7e13e0ad4bea6eff0
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools python kgendesignerplugin kdoctools"
diff --git a/srcpkgs/kdesu/template b/srcpkgs/kdesu/template
index e2c4f650afc..94a6cc8f9e0 100644
--- a/srcpkgs/kdesu/template
+++ b/srcpkgs/kdesu/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesu'
 pkgname=kdesu
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-only"
 homepage="https://projects.kde.org/projects/frameworks/kdesu"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=398e74bdfe695ec2d7b57ce78f9fce3e19bb447a8eb5924441718a8f7384f888
+checksum=bd5f8f7a8d9e097e95d5189d32601e231931f9794ea3f34605c56b7b9b06150d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python"
diff --git a/srcpkgs/kdevelop-php/template b/srcpkgs/kdevelop-php/template
index 959d1979099..ab2b462aa62 100644
--- a/srcpkgs/kdevelop-php/template
+++ b/srcpkgs/kdevelop-php/template
@@ -1,6 +1,6 @@
 # Template file for 'kdevelop-php'
 pkgname=kdevelop-php
-version=5.3.3
+version=5.4.2
 revision=1
 wrksrc="kdev-php-${version}"
 build_style=cmake
@@ -13,5 +13,5 @@ maintainer="yopito <pierre.bourgin@free.fr>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://www.kdevelop.org/"
 distfiles="${KDE_SITE}/kdevelop/${version}/src/kdev-php-${version}.tar.xz"
-checksum=8499c46f676a9cd37e56b5635f63dfcab1f2875875b2c65a9f66d84ed4f72972
+checksum=360444b7ac7c2f35144b4e13054a169b705b44e66219bd988ec1137e07994967
 nocross="kdevelop-devel is not available"
diff --git a/srcpkgs/kdevelop-python/template b/srcpkgs/kdevelop-python/template
index ba6a5e203b7..0265916a3d0 100644
--- a/srcpkgs/kdevelop-python/template
+++ b/srcpkgs/kdevelop-python/template
@@ -1,21 +1,21 @@
 # Template file for 'kdevelop-python'
 pkgname=kdevelop-python
-version=5.3.3
+version=5.4.2
 revision=1
 wrksrc="kdev-python-${version}"
 build_style=cmake
+pycompile_dirs="usr/share/kdevpythonsupport"
 hostmakedepends="extra-cmake-modules python3 qt5-qmake python3-devel"
 makedepends="python3-devel qt5-devel knewstuff-devel kitemmodels-devel
  threadweaver-devel ktexteditor-devel kcmutils-devel knotifyconfig-devel
  grantlee5-devel kdevelop-devel"
-pycompile_dirs="usr/share/kdevpythonsupport"
-pycompile_version="$py3_ver"
 short_desc="Python 3 language and Django project support for KDevelop"
 maintainer="yopito <pierre.bourgin@free.fr>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://www.kdevelop.org/"
 distfiles="${KDE_SITE}/kdevelop/${version}/src/kdev-python-${version}.tar.xz"
-checksum=80c4bab96aede589ebdb6d4b33d0339766ac645cc0e4fe10674df12008f37f04
+checksum=bb32205081d55723bc5948f93fe0cdb9baeadacf0d0eba74f131d58477679867
+pycompile_version="$py3_ver"
 nocross="kdevelop-devel is not available"
 
 post_install() {
diff --git a/srcpkgs/kdevelop/patches/use-std-c99.patch b/srcpkgs/kdevelop/patches/use-std-c99.patch
index da373e3ab2c..d766e446f69 100644
--- a/srcpkgs/kdevelop/patches/use-std-c99.patch
+++ b/srcpkgs/kdevelop/patches/use-std-c99.patch
@@ -4,13 +4,12 @@ Let's use C99 instead.
 
 --- CMakeLists.txt.ORIG
 +++ CMakeLists.txt
-@@ -21,6 +21,9 @@
- endif()
- 
+@@ -15,6 +15,8 @@
+ include(KDEInstallDirs)
+ include(KDECMakeSettings)
  include(KDECompilerSettings NO_POLICY_SCOPE) # needs to be first, as set policies influence following macros
 +string(REPLACE " -std=iso9899:1990" "" CMAKE_C_FLAGS " ${CMAKE_C_FLAGS} ")
 +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
-+
+ 
  include(ECMOptionalAddSubdirectory)
  include(ECMInstallIcons)
- include(ECMAddAppIcon)
diff --git a/srcpkgs/kdevelop/template b/srcpkgs/kdevelop/template
index 434820fe9d8..94900870527 100644
--- a/srcpkgs/kdevelop/template
+++ b/srcpkgs/kdevelop/template
@@ -1,6 +1,6 @@
 # Template file for 'kdevelop'
 pkgname=kdevelop
-version=5.3.3
+version=5.4.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -15,8 +15,8 @@ maintainer="yopito <pierre.bourgin@free.fr>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.kdevelop.org/"
 distfiles="${KDE_SITE}/${pkgname}/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=cedd1c7ba8e352a76ec021218cf2e35a6c060875ef3d27964246c48d0f2ae81c
-nocross="plasma-framework-devel is not available"
+checksum=52e253da4892428ef3059568a93263bf7f9dec5ddeb17b0e5d258726492dc6c4
+nocross="subversion-devel is not available"
 
 kdevelop-devel_package() {
 	depends="kdevelop>=${version}_${revision}"
diff --git a/srcpkgs/kdewebkit/template b/srcpkgs/kdewebkit/template
index 33c1bd2efba..14cc070c6bd 100644
--- a/srcpkgs/kdewebkit/template
+++ b/srcpkgs/kdewebkit/template
@@ -1,6 +1,6 @@
 # Template file for 'kdewebkit'
 pkgname=kdewebkit
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kdewebkit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=1ee2a00ee3d95df9270e8c3d434568cda8f42151e361bc07fe374bf0f7afe211
+checksum=db78cf8b167562a211c20a081e23540d0613d2e6feec67d461bb9fc982ad6be8
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python"
diff --git a/srcpkgs/kdialog/template b/srcpkgs/kdialog/template
index 732acbd084f..c4b0190f178 100644
--- a/srcpkgs/kdialog/template
+++ b/srcpkgs/kdialog/template
@@ -1,6 +1,6 @@
 # Template file for 'kdialog'
 pkgname=kdialog
-version=19.04.3
+version=19.08.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="Denis Revin <denis.revin@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/applications/kdialog"
 distfiles="${KDE_SITE}/applications/${version}/src/kdialog-${version}.tar.xz"
-checksum=647c5eac9d34f2cc8011f6214bc5a8ddc1eca8f0b381c66eaf20848eccdf9823
+checksum=7aef7b5a5f340cc0066e02572ec8cef8b227bc6c7f5b066677ef6422632db95a
diff --git a/srcpkgs/kdnssd/template b/srcpkgs/kdnssd/template
index 866387ff5a5..1182a2cd898 100644
--- a/srcpkgs/kdnssd/template
+++ b/srcpkgs/kdnssd/template
@@ -1,6 +1,6 @@
 # Template file for 'kdnssd'
 pkgname=kdnssd
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kdnssd"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=02d70e5ee18697867c1a12373c1dbe31e1efba1fcb1e26bba3c75472cd3b271d
+checksum=f58d8260b5cdbef3eb777990d53666ab1df5be3f978e880ed1d6d810a361c9ae
 
 kdnssd-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kdoctools/template b/srcpkgs/kdoctools/template
index bf5590ac34f..6e11282d67d 100644
--- a/srcpkgs/kdoctools/template
+++ b/srcpkgs/kdoctools/template
@@ -1,6 +1,6 @@
 # Template file for 'kdoctools'
 pkgname=kdoctools
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kdoctools"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e48d8f8f075171c6b83189999a10552c772c6a7e9a115a2643414f9ecec77c6f
+checksum=a46a10424d6cd4dcb3d8a59b9fbd1bf9fe4f409af42decf853298b18bf4ecafe
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools-devel"
diff --git a/srcpkgs/kea/patches/fix-musl-getopt.patch b/srcpkgs/kea/patches/fix-musl-getopt.patch
deleted file mode 100644
index 273e126c684..00000000000
--- a/srcpkgs/kea/patches/fix-musl-getopt.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/bin/perfdhcp/command_options.cc	2016-09-27 12:32:02.000000000 +0200
-+++ src/bin/perfdhcp/command_options.cc	2016-12-07 12:19:55.784883734 +0100
-@@ -7,6 +7,7 @@
- #include <config.h>
- 
- #include "command_options.h"
-+#include <getopt.h>
- #include <exceptions/exceptions.h>
- #include <dhcp/iface_mgr.h>
- #include <dhcp/duid.h>
diff --git a/srcpkgs/kea/template b/srcpkgs/kea/template
index c6a0a34f317..45709e4a108 100644
--- a/srcpkgs/kea/template
+++ b/srcpkgs/kea/template
@@ -1,13 +1,13 @@
 # Template file for 'kea'
 pkgname=kea
-version=1.5.0
-revision=6
+version=1.7.0
+revision=1
 build_style=gnu-configure
 configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr
  $(vopt_if mysql --with-dhcp-mysql)
  $(vopt_if pgsql --with-dhcp-pgsql=${XBPS_CROSS_BASE}/usr/bin/pg_config)"
 hostmakedepends="flex bison perl pkg-config
- doxygen elinks libxslt docbook-xsl"
+ doxygen elinks libxslt docbook-xsl python3-Sphinx python3-sphinx_rtd_theme"
 makedepends="boost-devel log4cplus-devel python3-devel
  $(vopt_if botan botan-devel libressl-devel)
  $(vopt_if mysql libmysqlclient-devel)
@@ -20,7 +20,7 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="MPL-2.0, Apache-2.0"
 homepage="https://kea.isc.org"
 distfiles="http://ftp.isc.org/isc/kea/${version/.P/-P}/kea-${version/.P/-P}.tar.gz"
-checksum=edce4fab68ca7af607cf7f5bc86596e04fe0ef4b8e88906e339cdefcf21daaec
+checksum=173c8e893690a611bc1d1c6fbe54a5c20fcd54429399a8dc3a0d7d2eb01bf8cc
 nocross="Tools required for messages are not built for the host arch"
 
 build_options="botan mysql pgsql"
@@ -67,6 +67,5 @@ libkea-devel_package() {
 		vmove usr/include
 		vmove usr/lib/*.a
 		vmove usr/lib/*.so
-		vmove usr/lib/pkgconfig
 	}
 }
diff --git a/srcpkgs/keditbookmarks/template b/srcpkgs/keditbookmarks/template
index 2638b8f2242..1de44014edc 100644
--- a/srcpkgs/keditbookmarks/template
+++ b/srcpkgs/keditbookmarks/template
@@ -1,9 +1,8 @@
 # Template file for 'keditbookmarks'
 pkgname=keditbookmarks
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
-configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules kcoreaddons kconfig kdoctools
  pkg-config qt5-host-tools qt5-qmake"
 makedepends="kparts-devel qt5-devel"
@@ -12,4 +11,8 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/"
 distfiles="${KDE_SITE}/applications/${version}/src/keditbookmarks-${version}.tar.xz"
-checksum=98c539e63a0e2bb62680003022d9ea5aececc4aa1c2d19a7b4c4aa3d8999e7ac
+checksum=6a22c3ccdd89d07ad13b34b89704afcc9bf3b5a177d4dc137dcb5eaf1580f6dd
+
+pre_check() {
+	export QT_QPA_PLATFORM=offscreen
+}
diff --git a/srcpkgs/keepalived/template b/srcpkgs/keepalived/template
index 1414e1a54d3..afaa82c31dd 100644
--- a/srcpkgs/keepalived/template
+++ b/srcpkgs/keepalived/template
@@ -1,7 +1,7 @@
 # Template file for 'keepalived'
 pkgname=keepalived
-version=2.0.16
-revision=2
+version=2.0.18
+revision=1
 build_style=gnu-configure
 configure_args="--enable-sha1"
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2-or-later"
 homepage="http://www.keepalived.org/"
 distfiles="http://www.keepalived.org/software/${pkgname}-${version}.tar.gz"
-checksum=f0c7dc86147a286913c1c2c918f557735016285d25779d4d2fce5732fcb888df
+checksum=1423a2b1b8e541211029b9e1e1452e683bbe5f4b0b287eddd609aaf5ff024fd0
 
 conf_files="/etc/keepalived/keepalived.conf"
 
diff --git a/srcpkgs/kemoticons/template b/srcpkgs/kemoticons/template
index d4a66b32f7e..a8d9d4e82f8 100644
--- a/srcpkgs/kemoticons/template
+++ b/srcpkgs/kemoticons/template
@@ -1,6 +1,6 @@
 # Template file for 'kemoticons'
 pkgname=kemoticons
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later, CC-BY-4.0"
 homepage="https://projects.kde.org/projects/frameworks/kemoticons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=cfc17de43320fbb353be30ae8d5b448b88da6f83bd23e29d678cd95a4bd7a380
+checksum=4d9b0608e9badcce1376032d75c650265108f2b4a38b65f0db9f513ccba72152
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/keybase-desktop/template b/srcpkgs/keybase-desktop/template
index 4296259c3d2..4892e48f464 100644
--- a/srcpkgs/keybase-desktop/template
+++ b/srcpkgs/keybase-desktop/template
@@ -1,16 +1,16 @@
 # Template file for 'keybase-desktop'
 pkgname=keybase-desktop
-version=4.3.2
+version=4.6.0
 revision=1
 wrksrc="client-${version}"
-hostmakedepends="git nodejs-lts yarn"
+hostmakedepends="git nodejs-lts yarn unzip"
 depends="keybase kbfs"
 short_desc="Keybase desktop client"
 maintainer="Dominic Monroe <monroef4@googlemail.com>"
 license="BSD-3-Clause"
 homepage="https://keybase.io"
 distfiles="https://github.com/keybase/client/archive/v${version}.tar.gz"
-checksum=95300e1729b74a8fddd13b5f2ab35a3bd6f2e53402568d723e671b5cfc5d3778
+checksum=ee97b78e27dc77f55e0533dfbf4ecde2563c14e0f8c708cdb6066361c56ff8f8
 nostrip_files="Keybase"
 
 case "${XBPS_TARGET_MACHINE}" in
diff --git a/srcpkgs/kbfs/INSTALL b/srcpkgs/keybase/kbfs.INSTALL
similarity index 100%
rename from srcpkgs/kbfs/INSTALL
rename to srcpkgs/keybase/kbfs.INSTALL
diff --git a/srcpkgs/keybase/template b/srcpkgs/keybase/template
index a505df25165..050920ee3eb 100644
--- a/srcpkgs/keybase/template
+++ b/srcpkgs/keybase/template
@@ -1,20 +1,39 @@
 # Template file for 'keybase'
 pkgname=keybase
-version=4.3.2
+version=4.6.0
 revision=1
 wrksrc="client-${version}"
 build_style=go
 go_import_path="github.com/keybase/client"
-go_package="${go_import_path}/go/keybase"
+go_package="${go_import_path}/go/keybase
+${go_import_path}/go/kbfs/kbfsfuse
+${go_import_path}/go/kbfs/kbfsgit/git-remote-keybase
+${go_import_path}/go/kbfs/kbfstool ${go_import_path}/go/kbfs/redirector"
 go_build_tags="production"
+hostmakedepends="git"
 depends="gnupg2"
 short_desc="Client for keybase.io"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://keybase.io/"
 distfiles="https://github.com/keybase/client/archive/v${version}.tar.gz"
-checksum=95300e1729b74a8fddd13b5f2ab35a3bd6f2e53402568d723e671b5cfc5d3778
+checksum=ee97b78e27dc77f55e0533dfbf4ecde2563c14e0f8c708cdb6066361c56ff8f8
 
 post_install() {
 	vlicense LICENSE
 }
+
+kbfs_package() {
+	depends="keybase fuse"
+	short_desc="Keybase Filesystem"
+
+	pkg_install() {
+		vmove usr/bin/redirector
+		mv ${PKGDESTDIR}/usr/bin/redirector ${PKGDESTDIR}/usr/bin/keybase-redirector
+		# setuid
+		chmod 4755 ${PKGDESTDIR}/usr/bin/keybase-redirector
+		vmove usr/bin/kbfsfuse
+		vmove usr/bin/kbfstool
+		vmove usr/bin/git-remote-keybase
+	}
+}
diff --git a/srcpkgs/keyutils/template b/srcpkgs/keyutils/template
index cade0250d73..9cb16a10485 100644
--- a/srcpkgs/keyutils/template
+++ b/srcpkgs/keyutils/template
@@ -1,14 +1,13 @@
 # Template file for 'keyutils'
 pkgname=keyutils
-version=1.6
+version=1.6.1
 revision=1
-makedepends="mit-krb5-devel"
 short_desc="Linux Key Management Utilities"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://www.kernel.org"
-distfiles="http://people.redhat.com/~dhowells/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=d3aef20cec0005c0fa6b4be40079885567473185b1a57b629b030e67942c7115
+distfiles="https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/snapshot/${pkgname}-${version}.tar.gz"
+checksum=3c71dcfc6900d07b02f4e061d8fb218a4ae6519c1d283d6a57b8e27718e2f557
 conf_files="/etc/request-key.conf"
 
 pre_build() {
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 479154afef1..8b3c4143a40 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,6 +1,6 @@
 # Template file for 'kfilemetadata5'
 pkgname=kfilemetadata5
-version=5.61.0
+version=5.63.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kfilemetadata"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=15f20af053c71c1e5ba6c6ade90b7cce27645b27ee30f1e6e73038e81a2c958e
+checksum=a000dbfa729306c07e631c1ec2bd306c572ac605aa0f1b7389be617b566b9b87
 
 kfilemetadata5-devel_package() {
 	short_desc+=" - development"
@@ -22,6 +22,7 @@ kfilemetadata5-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/qt5/mkspecs
 		vmove "usr/lib/*.so"
 	}
 }
diff --git a/srcpkgs/kfind/template b/srcpkgs/kfind/template
index 8e45a324975..f1e127072f4 100644
--- a/srcpkgs/kfind/template
+++ b/srcpkgs/kfind/template
@@ -1,9 +1,9 @@
 # Template file for 'kfind'
 pkgname=kfind
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules kcoreaddons qt5-host-tools qt5-qmake python
+hostmakedepends="extra-cmake-modules kcoreaddons qt5-host-tools qt5-qmake
  kdoctools"
 makedepends="kfilemetadata5-devel kparts-devel"
 short_desc="Find files and folders"
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kfind/"
 distfiles="${KDE_SITE}/applications/${version}/src/kfind-${version}.tar.xz"
-checksum=25b7b442600c4e109b0a6f7f09962a4d95d419673f6b64eebf226dcdae8cc6ff
+checksum=7ce5255fa4ef3e98db937eb23e8cdc89bd6b5e5429ccb5fea769e99da2bc424a
diff --git a/srcpkgs/kgamma5/template b/srcpkgs/kgamma5/template
index d065c905aa2..f7f19b38819 100644
--- a/srcpkgs/kgamma5/template
+++ b/srcpkgs/kgamma5/template
@@ -1,6 +1,6 @@
 # Template file for 'kgamma5'
 pkgname=kgamma5
-version=5.16.4
+version=5.17.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/plasma/kgamma5"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=18c01c6a9d73f2450da24ac7a52c00b9d355a1ba41bd346eb71fbe271de85f46
+checksum=5d4c7cfc63896746a994128db03037bff666132e8e35378de60ac91a3959493d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel kdoctools"
diff --git a/srcpkgs/kget/template b/srcpkgs/kget/template
index e2119f4e30b..9a4680bf335 100644
--- a/srcpkgs/kget/template
+++ b/srcpkgs/kget/template
@@ -1,6 +1,6 @@
 # Template file for 'kget'
 pkgname=kget
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -14,4 +14,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/applications/kpimtextedit"
 distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=4db589499c8e5fc3cbb5e398054b1292f68fa23ad1798f2bb2065ba56723d06b
+checksum=e93795eec8f51cac2719ab31cfa6f5f4f642b166ffbb3f876ab3c866a4cd7df1
diff --git a/srcpkgs/kglobalaccel/template b/srcpkgs/kglobalaccel/template
index 6f97844ccb8..470a124b80d 100644
--- a/srcpkgs/kglobalaccel/template
+++ b/srcpkgs/kglobalaccel/template
@@ -1,6 +1,6 @@
 # Template file for 'kglobalaccel'
 pkgname=kglobalaccel
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kglobalaccel"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ad6bd2648e39854369555dd8a0823b08d9631f3638472627eb80e01d9902150e
+checksum=e670675025657acecd6795c584a6adbfbf64c83ac30a10db983520992ddfeef6
 
 kglobalaccel-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kgpg/template b/srcpkgs/kgpg/template
new file mode 100644
index 00000000000..8fa3dd4e0ff
--- /dev/null
+++ b/srcpkgs/kgpg/template
@@ -0,0 +1,22 @@
+# Template file for 'kgpg'
+pkgname=kgpg
+version=19.08.2
+revision=1
+build_style=cmake
+configure_args="-DBUILD_TESTING=OFF"
+hostmakedepends="extra-cmake-modules"
+makedepends="kwindowsystem-devel kcrash-devel kdbusaddons-devel
+ kiconthemes-devel kjobwidgets-devel kio-devel
+ kservice-devel ktextwidgets-devel kxmlgui-devel
+ kwidgetsaddons-devel knotifications-devel kdoctools-devel
+ akonadi-contacts-devel kcontacts-devel boost-devel"
+short_desc="Simple interface for GnuPG, a powerful encryption utility"
+maintainer="k4leg <d0xi@inbox.ru>"
+license="GPL-2.0-only"
+homepage="https://kde.org/applications/utilities/kgpg/"
+distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz"
+checksum=90795c649cd32b65b6030ed965e0db5b0570719afa36abb5d4893268461aa841
+
+if [ "$CROSS_BUILD" ]; then
+ hostmakedepends+=" qt5-qmake kcoreaddons-devel kdoctools kconfig"
+fi
diff --git a/srcpkgs/kguiaddons/template b/srcpkgs/kguiaddons/template
index 42065ade21f..fce92161d27 100644
--- a/srcpkgs/kguiaddons/template
+++ b/srcpkgs/kguiaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kguiaddons'
 pkgname=kguiaddons
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kguiaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=40cefa421b5ad5cf211875a35408ba526a5fb34e5ba19ebbda718dbf6b742520
+checksum=b91ad511bbdacc60c1a41104011492d71a5116483dcccf1390c075fcb29a424c
 
 kguiaddons-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/khelpcenter/template b/srcpkgs/khelpcenter/template
index cd7839c9993..bcec6e8d411 100644
--- a/srcpkgs/khelpcenter/template
+++ b/srcpkgs/khelpcenter/template
@@ -1,6 +1,6 @@
 # Template file for 'khelpcenter'
 pkgname=khelpcenter
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/applications/khelpcenter"
 distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=36810c12ae5d163738101b0f5f13c03cda03ee4c157f641df0f73105a894644f
+checksum=22b9f5225dfb9e8ad85becb7c2986cbee2a1366f84257fcbf76d5d7292dccdd9
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kconfig kdoctools python qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kholidays/template b/srcpkgs/kholidays/template
index e31fdacf854..dd921f0e97b 100644
--- a/srcpkgs/kholidays/template
+++ b/srcpkgs/kholidays/template
@@ -1,7 +1,7 @@
 # Template file for 'kholidays'
 pkgname=kholidays
 reverts="17.12.3_1 17.12.1_1 17.12.0_1 17.04.3_1"
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/applications/kholidays"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ce3d879824a3e429b468008c1ccec5de44c07299d412ea32f9a2a814c27c08c1
+checksum=c728d03732c8570ec50359daf6166924847c9a0d17456d2fb91c1265019c6580
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/khotkeys/template b/srcpkgs/khotkeys/template
index cf72107331a..93dfac3c5c0 100644
--- a/srcpkgs/khotkeys/template
+++ b/srcpkgs/khotkeys/template
@@ -1,6 +1,6 @@
 # Template file for 'khotkeys'
 pkgname=khotkeys
-version=5.16.4
+version=5.17.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/plasma/khotkeys"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=a8646ab20cd067a515d4a9318c814760be0030f27856f155edf11920caeddd0d
+checksum=da7d2a1db9f49b34ea5b24ec9bd6450142cb4e708c9a8f478adc94eb7f190d69
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/khtml/template b/srcpkgs/khtml/template
index dfc5ac899e7..6a01b99c7f3 100644
--- a/srcpkgs/khtml/template
+++ b/srcpkgs/khtml/template
@@ -1,6 +1,6 @@
 # Template file for 'khtml'
 pkgname=khtml
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/frameworks/khtml"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=5d8612b584eecf96959d56bb75b1470b3b34ff7176cef7a0a15bc2531b21720b
+checksum=8d7ba064ffd5391e9b7a2b9d9784f815f2f1f1519cf6ddb7887bcede4c3ec795
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python perl kcoreaddons"
diff --git a/srcpkgs/ki18n/template b/srcpkgs/ki18n/template
index daaa5b95297..c3aeb88ae7f 100644
--- a/srcpkgs/ki18n/template
+++ b/srcpkgs/ki18n/template
@@ -1,6 +1,6 @@
 # Template file for 'ki18n'
 pkgname=ki18n
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/frameworks/ki18n"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d8c0594268b386ee42823360aa937c664cf04eedac8232bc18a653a9c52491d9
+checksum=491395d2d725e1f25acefeea542d1e12e51673636bbc657d5f1f2fbcdb02b7b9
 
 ki18n-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kiconthemes/template b/srcpkgs/kiconthemes/template
index 2d9ebd433f9..1d387aeba07 100644
--- a/srcpkgs/kiconthemes/template
+++ b/srcpkgs/kiconthemes/template
@@ -1,6 +1,6 @@
 # Template file for 'kiconthemes'
 pkgname=kiconthemes
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-only, GPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kiconthemes"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=341741abd0b8aeeec8a2a87fe781b4ec1ab593563b1c063cdfdccead3706cdd7
+checksum=dce004b5a210b7a96e78533909cb91ed2168534ae6303499f0777ac8c8b5e4a2
 
 kiconthemes-devel_package() {
 	short_desc+=" - development"
@@ -19,6 +19,7 @@ kiconthemes-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/qt5/mkspecs
+		vmove usr/lib/qt5/plugins/designer
 		vmove usr/lib/cmake
 		vmove "usr/lib/*.so"
 	}
diff --git a/srcpkgs/kidentitymanagement/template b/srcpkgs/kidentitymanagement/template
index 90dcdb1fa35..233f13e350a 100644
--- a/srcpkgs/kidentitymanagement/template
+++ b/srcpkgs/kidentitymanagement/template
@@ -1,6 +1,6 @@
 # Template file for 'kidentitymanagement'
 pkgname=kidentitymanagement
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python
@@ -12,7 +12,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/applications/kidentitymanagement"
 distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=9fe5c473af0d042b482f1d1dac499c1d8227b60a79f1b5678043f0f49f19013d
+checksum=8f93f9546d570c8f7b2602a3a171641d488595ec8da3c47b0a08ef4f5083e884
 
 kidentitymanagement-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kidletime/template b/srcpkgs/kidletime/template
index afad9254cf5..34275f7f297 100644
--- a/srcpkgs/kidletime/template
+++ b/srcpkgs/kidletime/template
@@ -1,6 +1,6 @@
 # Template file for 'kidletime'
 pkgname=kidletime
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kidletime"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8fb302dcc5b891ac2f06b5278bd6e08043772f3325bc209175c945280621fca2
+checksum=196cb99c7f30ea571f9a7e8c0b507ef95aa54731457f4bc9e4380ff1350da57d
 
 kidletime-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kig/template b/srcpkgs/kig/template
index 883bd006181..6150dcf8457 100644
--- a/srcpkgs/kig/template
+++ b/srcpkgs/kig/template
@@ -1,17 +1,14 @@
 # Template file for 'kig'
 pkgname=kig
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules kcoreaddons pkg-config python"
+hostmakedepends="extra-cmake-modules kcoreaddons kdoctools
+ pkg-config qt5-host-tools qt5-qmake"
 makedepends="boost-devel kparts-devel ktexteditor-devel python-devel"
 short_desc="KDE education tool for interactive geometry"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://www.kde.org/applications/education/kig/"
 distfiles="${KDE_SITE}/applications/${version}/src/kig-${version}.tar.xz"
-checksum=ec35f8e9c10e0a984ab7ff06fc810a26e0abc825ee5674af238bb04e83ce38ee
-
-if [ -n "$CROSS_BUILD" ]; then
-	hostmakedepends+=" kdoctools qt5-host-tools qt5-qmake"
-fi
+checksum=60bab2ccdf69df8ebaed672dc9201e468563d78761f191c43ee5673f9a54246a
diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index 0f7b304aaf5..f2509d882dd 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,6 +1,6 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kimageformats"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5a81359a043e201b29e205dd93559de077e0317d26712cb1c07e624d76aeb207
+checksum=4be4247672c21538afecc2f784cee8d0e963a31a7a8c855d5d7acbe3571ac397
diff --git a/srcpkgs/kimap/template b/srcpkgs/kimap/template
index ec5bc9de3cb..b1b020cba2b 100644
--- a/srcpkgs/kimap/template
+++ b/srcpkgs/kimap/template
@@ -1,6 +1,6 @@
 # Template file for 'kimap'
 pkgname=kimap
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/applications/${version}/src/kimap-${version}.tar.xz"
-checksum=d9e3af3e1bb03d929a08287b1a29540915d25dbb6a38d152560302c93e4c5060
+checksum=250479c78517610aab810f54184d8826fb981438ec9f0d5c423ad781a796ee00
 
 kimap-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kinfocenter/template b/srcpkgs/kinfocenter/template
index 1c841ebcfd6..198d1e4d416 100644
--- a/srcpkgs/kinfocenter/template
+++ b/srcpkgs/kinfocenter/template
@@ -1,6 +1,6 @@
 # Template file for 'kinfocenter'
 pkgname=kinfocenter
-version=5.16.4
+version=5.17.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2"
 homepage="https://projects.kde.org/projects/plasma/kinfocenter"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=30e4df2d641c4faa385a718c772d893900eca99591ffee5787d6563fe5130426
+checksum=f9866450a795b6c458011de457f27e51258803459d5d384b7366f13f9a1c8d7e
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel kdoctools-devel"
diff --git a/srcpkgs/kinit/template b/srcpkgs/kinit/template
index eb199f3bca9..94262d45761 100644
--- a/srcpkgs/kinit/template
+++ b/srcpkgs/kinit/template
@@ -1,6 +1,6 @@
 # Template file for 'kinit'
 pkgname=kinit
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-only"
 homepage="https://projects.kde.org/projects/frameworks/kinit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1806bba9cc3f4d9c5ed23f49eca30707e8f74a99d35f5022130a46a395f2858f
+checksum=9dcb8d59419066a11b11b64dc028f8cccf7713cd5230451ca8ea5b724c8ae01a
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index 079309d6aee..c121e472129 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
-version=19.04.3
+version=19.08.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -15,7 +15,7 @@ maintainer="Denis Revin <denis.revin@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://cgit.kde.org/kio-extras.git"
 distfiles="${KDE_SITE}/applications/${version}/src/kio-extras-${version}.tar.xz"
-checksum=b65cb37a5965782a9eaae80840fdd7e06505aece33cc6774510c65e1fea3f55b
+checksum=a0b8f08ab8f9d36cfdc950470f75726e90e9fba159bc2035931cfa6efbfe4394
 
 if [ -z "$CROSS_BUILD" ]; then
 	makedepends+=" libssh-devel"
diff --git a/srcpkgs/kio-gdrive/template b/srcpkgs/kio-gdrive/template
index baae49e3505..dc1da9d3f25 100644
--- a/srcpkgs/kio-gdrive/template
+++ b/srcpkgs/kio-gdrive/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-gdrive'
 pkgname=kio-gdrive
-version=1.2.6
+version=1.2.7
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool pkg-config qt5-qmake qt5-host-tools"
@@ -11,5 +11,5 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KIO_GDrive"
 distfiles="${KDE_SITE}/kio-gdrive/${version}/src/kio-gdrive-${version}.tar.xz"
-checksum=7a9169e1d464641eb0ae4013ca1732b46bdfd50a13b3e87810c19ba794527f7b
+checksum=1b59e4d9940deb290cc4d7441d4ae8762ccb1de8d14dbd0bdbd3bc9a5fc266a4
 nocross="kaccounts-integration is nocross"
diff --git a/srcpkgs/kio/template b/srcpkgs/kio/template
index 901df89ad41..a7fb31f8d2d 100644
--- a/srcpkgs/kio/template
+++ b/srcpkgs/kio/template
@@ -1,6 +1,6 @@
 # Template file for 'kio'
 pkgname=kio
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kio"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1fa35126f8167bdbe029e515d01c8d4b91a07556ce6d5c9418e0ea10d7c2e44e
+checksum=9478aa457b6059cba00a2263fefe01a678c3272012e5cb94fed6c486a4c10f11
 
 CXXFLAGS+=" -fpermissive"
 
@@ -28,6 +28,7 @@ kio-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/qt5/mkspecs
+		vmove usr/lib/qt5/plugins/designer
 		vmove usr/lib/cmake
 		vmove "usr/lib/*.so"
 	}
diff --git a/srcpkgs/kirigami2/template b/srcpkgs/kirigami2/template
index 027017ce238..d4879e795df 100644
--- a/srcpkgs/kirigami2/template
+++ b/srcpkgs/kirigami2/template
@@ -1,6 +1,6 @@
 # Template file for 'kirigami2'
 pkgname=kirigami2
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="Sir_Boops <admin@boops.me>"
 license="LGPL-2.0-or-later"
 homepage="https://techbase.kde.org/Kirigami"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kirigami2-${version}.tar.xz"
-checksum=afdbe922f0627330319f22834d6631af13edb0081c687422d36acb8697a88c30
+checksum=db03144ea410bf9c400589f05b52e51c06ddd5cfc613cc639f33c5fa7a68e6ec
 
 kirigami2-devel_package() {
 	short_desc+=" - development"
@@ -20,6 +20,7 @@ kirigami2-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/qt5/mkspecs
 		vmove "usr/lib/*.so"
 	}
 }
diff --git a/srcpkgs/kismet/template b/srcpkgs/kismet/template
index 942e19c11c0..46de3290e0e 100644
--- a/srcpkgs/kismet/template
+++ b/srcpkgs/kismet/template
@@ -1,6 +1,6 @@
 # Template file for 'kismet'
 pkgname=kismet
-version=2019.08.R1
+version=2019.09.R1
 revision=1
 _realver="${version//./-}"
 wrksrc="${pkgname}-${_realver}"
@@ -17,5 +17,5 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.kismetwireless.net/"
 distfiles="http://www.kismetwireless.net/code/${pkgname}-${_realver}.tar.xz"
-checksum=3a0bde964f34c5eceaa085b9f1dc4eb008a4ce3a38b68bec6d962d3404a0d96b
+checksum=c3f33ae4044ba9951f9f5f4f17c7980919b73afb3055a68a69f39cd3fd66ce6d
 system_groups="kismet"
diff --git a/srcpkgs/kitemmodels/template b/srcpkgs/kitemmodels/template
index d801687da30..4e6d12b40c0 100644
--- a/srcpkgs/kitemmodels/template
+++ b/srcpkgs/kitemmodels/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemmodels'
 pkgname=kitemmodels
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kitemmodels"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=47db271ba24904933629ed00f7a4f916a19969967dcfbfd59ae5e98f08f89d68
+checksum=2d978b4403c2b88f3b1c2795260c4a491d2c6278cf0ac02814afbdb41a787081
 
 kitemmodels-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kitemviews/template b/srcpkgs/kitemviews/template
index 7a5724876f4..af7adcceb4e 100644
--- a/srcpkgs/kitemviews/template
+++ b/srcpkgs/kitemviews/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemviews'
 pkgname=kitemviews
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kitemviews"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0447b361444a853409f65e2fb5650cc95eb799ca54a5d7e15cd6d8ca527002da
+checksum=dfe37a7baf4069d18834485e2b5ce0a5fb3b22194bbe4d7e9f24c9c74de00096
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-qmake qt5-host-tools qt5-tools-devel"
@@ -23,6 +23,7 @@ kitemviews-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/qt5/mkspecs
+		vmove usr/lib/qt5/plugins/designer
 		vmove usr/lib/cmake
 		vmove "usr/lib/*.so"
 	}
diff --git a/srcpkgs/kitty/patches/musl.patch b/srcpkgs/kitty/patches/musl.patch
deleted file mode 100644
index 99b86547a7b..00000000000
--- a/srcpkgs/kitty/patches/musl.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 9cbb726566f14454b24d05e6e94c640997fc77ff Mon Sep 17 00:00:00 2001
-From: Kovid Goyal <kovid@kovidgoyal.net>
-Date: Tue, 30 Jul 2019 06:20:54 +0530
-Subject: [PATCH] Fix #1865
-
----
- glfw/linux_joystick.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/glfw/linux_joystick.c b/glfw/linux_joystick.c
-index d40bf0233..70a86f6f3 100644
---- a/glfw/linux_joystick.c
-+++ b/glfw/linux_joystick.c
-@@ -144,10 +144,10 @@ static bool openJoystickDevice(const char* path)
-     char absBits[(ABS_CNT + 7) / 8] = {0};
-     struct input_id id;
- 
--    if (ioctl(linjs.fd, EVIOCGBIT(0, sizeof(evBits)), evBits) < 0 ||
--        ioctl(linjs.fd, EVIOCGBIT(EV_KEY, sizeof(keyBits)), keyBits) < 0 ||
--        ioctl(linjs.fd, EVIOCGBIT(EV_ABS, sizeof(absBits)), absBits) < 0 ||
--        ioctl(linjs.fd, EVIOCGID, &id) < 0)
-+    if (ioctl(linjs.fd, (int32_t)EVIOCGBIT(0, sizeof(evBits)), evBits) < 0 ||
-+        ioctl(linjs.fd, (int32_t)EVIOCGBIT(EV_KEY, sizeof(keyBits)), keyBits) < 0 ||
-+        ioctl(linjs.fd, (int32_t)EVIOCGBIT(EV_ABS, sizeof(absBits)), absBits) < 0 ||
-+        ioctl(linjs.fd, (int32_t)EVIOCGID, &id) < 0)
-     {
-         _glfwInputError(GLFW_PLATFORM_ERROR,
-                         "Linux: Failed to query input device: %s",
-@@ -165,7 +165,7 @@ static bool openJoystickDevice(const char* path)
- 
-     char name[256] = "";
- 
--    if (ioctl(linjs.fd, EVIOCGNAME(sizeof(name)), name) < 0)
-+    if (ioctl(linjs.fd, (int32_t)EVIOCGNAME(sizeof(name)), name) < 0)
-         strncpy(name, "Unknown", sizeof(name));
- 
-     char guid[33] = "";
diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template
index 7d06fcfaa3f..d79bcc4acce 100644
--- a/srcpkgs/kitty/template
+++ b/srcpkgs/kitty/template
@@ -1,6 +1,6 @@
 # Template file for 'kitty'
 pkgname=kitty
-version=0.14.3
+version=0.14.6
 revision=1
 pycompile_dirs="usr/lib/kitty"
 hostmakedepends="ncurses pkg-config python3 wayland-devel wayland-protocols"
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://sw.kovidgoyal.net/kitty/"
 changelog="https://sw.kovidgoyal.net/kitty/changelog.html"
 distfiles="https://github.com/kovidgoyal/kitty/releases/download/v${version}/kitty-${version}.tar.xz"
-checksum=f5e522a6e477acd8b4a9637261f20dc66d6f7b9e9229a4a957f10811708b8d8b
+checksum=f07e0b2398b21e546ead8bb7755b140ee2d9cd1be10b720263b2578a0396a9b8
 patch_args="-Np1"
 pycompile_version="$py3_ver"
 LDFLAGS+=" -Wl,-z,stack-size=2097152"
diff --git a/srcpkgs/kiwix-lib/template b/srcpkgs/kiwix-lib/template
index cb2f5253bfb..4db31bb4ca6 100644
--- a/srcpkgs/kiwix-lib/template
+++ b/srcpkgs/kiwix-lib/template
@@ -1,6 +1,6 @@
 # Template file for 'kiwix-lib'
 pkgname=kiwix-lib
-version=6.0.0
+version=8.1.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="GPL-3.0-or-later"
 homepage="https://www.kiwix.org/"
 changelog="https://github.com/kiwix/kiwix-lib/blob/${version}/ChangeLog"
 distfiles="https://github.com/kiwix/kiwix-lib/archive/${version}.tar.gz"
-checksum=00fcc067ae7abeb8043b0270f234d40f2ad1b1085da5df143e2ba23443a8a16c
+checksum=d5e498db7d24b2df3c77ff3521810949204de69793eecf8245b2366b93da27e0
 
 case "$XBPS_TARGET_MACHINE" in
 	armv6l*)
diff --git a/srcpkgs/kiwix-tools/template b/srcpkgs/kiwix-tools/template
index d10729c482d..0959d5bac62 100644
--- a/srcpkgs/kiwix-tools/template
+++ b/srcpkgs/kiwix-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'kiwix-tools'
 pkgname=kiwix-tools
-version=3.0.0
-revision=1
+version=3.0.1
+revision=3
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="kiwix-lib-devel zlib-devel libmicrohttpd-devel libuuid-devel"
@@ -11,7 +11,7 @@ license="GPL-3.0-or-later"
 homepage="https://kiwix.org"
 changelog="https://github.com/kiwix/kiwix-tools/blob/${version}/Changelog"
 distfiles="https://github.com/kiwix/kiwix-tools/archive/${version}.tar.gz"
-checksum=ee22a7f939bcf51999327736461c988bfa8c9e0c83562d335eb2a400c4df3758
+checksum=b4d2ff9dfb7d71bb06ee837392a714cf8934d21dba65d5d051c0caa0112e4974
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kiwix-lib-devel"
diff --git a/srcpkgs/kjobwidgets/template b/srcpkgs/kjobwidgets/template
index 757be66de11..626693590ff 100644
--- a/srcpkgs/kjobwidgets/template
+++ b/srcpkgs/kjobwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kjobwidgets'
 pkgname=kjobwidgets
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kjobwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5246c2a230e3b4e9d7ba87c5a6b13b5f96fef6af0d1262f27f91fa0c619cf378
+checksum=f68e9cfd949a2c981e048fdde2905419853bb40f7a00bb43f6c9d45b5529e05d
 
 kjobwidgets-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kjs/template b/srcpkgs/kjs/template
index 2454eb23906..921ee2f13dd 100644
--- a/srcpkgs/kjs/template
+++ b/srcpkgs/kjs/template
@@ -1,6 +1,6 @@
 # Template file for 'kjs'
 pkgname=kjs
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kjs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=968e1592c98ee260d80644bf4631bf09479512e48fa878887ee3b9d6d57d3d17
+checksum=37ab39659cec1ea141d244b3c59678f19d1609299e0c084e2d6a4dc49255fa9b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools kjs"
diff --git a/srcpkgs/kjsembed/template b/srcpkgs/kjsembed/template
index 643664aea7c..d3837119784 100644
--- a/srcpkgs/kjsembed/template
+++ b/srcpkgs/kjsembed/template
@@ -1,6 +1,6 @@
 # Template file for 'kjsembed'
 pkgname=kjsembed
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,12 +11,16 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kjsembed"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=d8e0afad638574c31c89d716d78456ce51ffe6dd03eae6787bc9b4f8b52d5b44
+checksum=eb444305618f04c0e804ea661956e217f57549b71c6fae94f1222a1b36355903
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"
 fi
 
+case "$XBPS_TARGET_MACHINE" in
+	armv6l-musl) makedepends+=" libatomic-devel";;
+esac
+
 kjsembed-devel_package() {
 	short_desc+=" - development"
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index d82891012ce..729074583df 100644
--- a/srcpkgs/kldap/template
+++ b/srcpkgs/kldap/template
@@ -1,6 +1,6 @@
 # Template file for 'kldap'
 pkgname=kldap
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/applications/${version}/src/kldap-${version}.tar.xz"
-checksum=4bee7b041aff8e1a76330bde12ab9368176181136be1136c4b0c0b733eb9bc16
+checksum=79c540693b85c138ae7bf4f72213dfad6dfa48dfc0ab414004d93f15d2ffac6e
 
 kldap-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kmag/template b/srcpkgs/kmag/template
index 17d86ceb798..bda8c831330 100644
--- a/srcpkgs/kmag/template
+++ b/srcpkgs/kmag/template
@@ -1,13 +1,13 @@
 # Template file for 'kmag'
 pkgname=kmag
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python qt5-host-tools qt5-qmake"
+hostmakedepends="extra-cmake-modules kcoreaddons kdoctools qt5-host-tools qt5-qmake"
 makedepends="kparts-devel libqaccessibilityclient-devel qt5-devel"
 short_desc="Screen Magnifier"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kmag/"
 distfiles="${KDE_SITE}/applications/${version}/src/kmag-${version}.tar.xz"
-checksum=7d42c254e62750899e429482c2b6ed3b4b1e8c5a66fbc371eec656421817d0a4
+checksum=6e8ecfab87dca12804a5a8d0a8adf1545e9e17039e0f9667b10a8f2832512e71
diff --git a/srcpkgs/kmail-account-wizard/template b/srcpkgs/kmail-account-wizard/template
index 3b261bed1b7..4a5639ce8a4 100644
--- a/srcpkgs/kmail-account-wizard/template
+++ b/srcpkgs/kmail-account-wizard/template
@@ -1,6 +1,6 @@
 # Template file for 'kmail-account-wizard'
 pkgname=kmail-account-wizard
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python"
@@ -11,4 +11,4 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/applications/${version}/src/kmail-account-wizard-${version}.tar.xz"
-checksum=5eddd4029047b3c37146c49e043d17c1f9086bc738726d5da2756cbe9ad28622
+checksum=769b151d0de47d49e41eaeca501526de41c174f9df99b46418e955163c38e9a8
diff --git a/srcpkgs/kmail/template b/srcpkgs/kmail/template
index d0b81f4ce3b..bb44f5f051d 100644
--- a/srcpkgs/kmail/template
+++ b/srcpkgs/kmail/template
@@ -1,7 +1,7 @@
 # Template file for 'kmail'
 pkgname=kmail
-version=19.08.0
-revision=1
+version=19.08.2
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules python qt5-host-tools qt5-qmake
  kdoctools kconfig kcoreaddons"
@@ -15,7 +15,7 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://userbase.kde.org/KMail"
 distfiles="${KDE_SITE}/applications/${version}/src/kmail-${version}.tar.xz"
-checksum=052d5b0da402024646673f5e57785b509c328bd5f5ac064f742f9c63e75f3b28
+checksum=0ad2a5439da7f255923eeb4c4cf267ece721619aa046a04439f56763aeabac85
 
 case $XBPS_TARGET_MACHINE in
 	*-musl) broken="segfaults on start";;
diff --git a/srcpkgs/kmailtransport/template b/srcpkgs/kmailtransport/template
index 4648ea3ab40..cdf51104c1b 100644
--- a/srcpkgs/kmailtransport/template
+++ b/srcpkgs/kmailtransport/template
@@ -1,6 +1,6 @@
 # Template file for 'kmailtransport'
 pkgname=kmailtransport
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/applications/${version}/src/kmailtransport-${version}.tar.xz"
-checksum=cc5f865f2059e8fd8d45d1597d8483bbfe0b743e472d91dd4e7cc3837c3fa2dd
+checksum=c545fb5546e82f7dfcea4c6e1a8b565ad04e34851c33876c9bf74c9fbc3165c7
 
 kmailtransport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kmbox/template b/srcpkgs/kmbox/template
index 40ca1239993..98f5daea1eb 100644
--- a/srcpkgs/kmbox/template
+++ b/srcpkgs/kmbox/template
@@ -1,6 +1,6 @@
 # Template file for 'kmbox'
 pkgname=kmbox
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python"
@@ -10,7 +10,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/applications/${version}/src/kmbox-${version}.tar.xz"
-checksum=6600033298b0d5ff84705dc66fa529156cb08aeda7503ba7890581b618f83228
+checksum=82e2f64b90a1386100e13f9b2afea5d71952a1cb9547f965ddcdb3b8c59c35b1
 
 kmbox-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kmediaplayer/template b/srcpkgs/kmediaplayer/template
index 7b872a211f0..85d38112930 100644
--- a/srcpkgs/kmediaplayer/template
+++ b/srcpkgs/kmediaplayer/template
@@ -1,6 +1,6 @@
 # Template file for 'kmediaplayer'
 pkgname=kmediaplayer
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="X11"
 homepage="https://projects.kde.org/projects/frameworks/kmediaplayer"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=ae15a4a39e6530b505d699fb1b1ab3fd5f0e64d87dd758db17702463e44ce181
+checksum=b54d4184ff04e5c02dec06259dd6002fa4a9d2b32d3325b3cf43fb49071c65a7
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python"
diff --git a/srcpkgs/kmenuedit/template b/srcpkgs/kmenuedit/template
index 1229a63c622..99d0438e348 100644
--- a/srcpkgs/kmenuedit/template
+++ b/srcpkgs/kmenuedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kmenuedit'
 pkgname=kmenuedit
-version=5.16.4
+version=5.17.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2"
 homepage="https://projects.kde.org/projects/plasma/kmenuedit"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=f749ca062d9c7bfd2033c4016e8a3dcc9f849f83f941dd9a60fd5b0232d023a2
+checksum=c8c433e8d4e3e13a5ace0ebc265756441aa01a07b1e68e45ce71387f128cc706
diff --git a/srcpkgs/kmime/template b/srcpkgs/kmime/template
index da7fc849579..1c3e5c12b1e 100644
--- a/srcpkgs/kmime/template
+++ b/srcpkgs/kmime/template
@@ -1,6 +1,6 @@
 # Template file for 'kmime'
 pkgname=kmime
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3"
@@ -10,7 +10,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/applications/${version}/src/kmime-${version}.tar.xz"
-checksum=1422e6235659b66b3ee5e91cdd732d8c3738d42f81435e69f3cbb18f04a0be75
+checksum=f153332bb71de9d4451b8d28135a914059f5156fc8dda33f6375671603477771
 
 if [ "CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"
diff --git a/srcpkgs/kmix/template b/srcpkgs/kmix/template
index ff00210781a..75fba0ba9e0 100644
--- a/srcpkgs/kmix/template
+++ b/srcpkgs/kmix/template
@@ -1,6 +1,6 @@
 # Template file for 'kmix'
 pkgname=kmix
-version=19.04.3
+version=19.08.2
 revision=1
 build_style=cmake
 configure_args="-DSYSCONF_INSTALL_DIR=/etc -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -9,8 +9,8 @@ hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
 makedepends="plasma-framework-devel kinit-devel alsa-lib-devel pulseaudio-devel
  libcanberra-devel ksolid-devel"
 short_desc="KDE's mixer application"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/multimedia/kmix/"
 distfiles="${KDE_SITE}/applications/${version}/src/kmix-${version}.tar.xz"
-checksum=d08a0d40fb9a7a3f032f8995dbd9260777119b249669323447fa2575e44e3bf9
+checksum=5d852df8b54d3abca98db4aa2b259973231fed0a597d511d54fb41c6389ce61a
diff --git a/srcpkgs/kmymoney/template b/srcpkgs/kmymoney/template
index c6a7242810f..5e99dc91cff 100644
--- a/srcpkgs/kmymoney/template
+++ b/srcpkgs/kmymoney/template
@@ -1,7 +1,7 @@
 # Template file for 'kmymoney'
 pkgname=kmymoney
 version=5.0.6
-revision=1
+revision=3
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson
  -DBUILD_TESTING=OFF"
diff --git a/srcpkgs/knewstuff/template b/srcpkgs/knewstuff/template
index d6da21e4d16..16aad91f138 100644
--- a/srcpkgs/knewstuff/template
+++ b/srcpkgs/knewstuff/template
@@ -1,6 +1,6 @@
 # Template file for 'knewstuff'
 pkgname=knewstuff
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/frameworks/knewstuff"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=87f8ec030223f5f0e4e39de8407fc0d28542e48e057c1752adb2466c55fe365b
+checksum=5b63a5f5ca144536ffd8748855947fce120af0a3dc490debf53db579153e755e
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python"
diff --git a/srcpkgs/knights/template b/srcpkgs/knights/template
index 68fba321c7b..cc8da33217c 100644
--- a/srcpkgs/knights/template
+++ b/srcpkgs/knights/template
@@ -1,6 +1,6 @@
 # Template file for 'knights'
 pkgname=knights
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,4 +11,4 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://www.kde.org/applications/games/knights/"
 distfiles="${KDE_SITE}/applications/${version}/src/knights-${version}.tar.xz"
-checksum=1e22413a23b8afeab8b5d46a4d6d81a5e00a891636676b99c5bd08806f97795c
+checksum=2b70338d1cb2b770157a5b061a797620d8dd7dd8c6da0bcb7e2a9db375e71a07
diff --git a/srcpkgs/knot-resolver/files/kresd/run b/srcpkgs/knot-resolver/files/kresd/run
index 7134f8c2c1b..2342892a135 100644
--- a/srcpkgs/knot-resolver/files/kresd/run
+++ b/srcpkgs/knot-resolver/files/kresd/run
@@ -1,4 +1,4 @@
 #!/bin/sh
 [ -r ./conf ] && . ./conf
-install -d -m0755 -o _knot-resolver -g _knot-resolver /run/knot-resolver
+install -d -m0755 -o _knot_resolver -g _knot_resolver /run/knot-resolver
 exec kresd ${OPTS:--f 1}
diff --git a/srcpkgs/knot-resolver/template b/srcpkgs/knot-resolver/template
index 58d884c04de..4179479a87a 100644
--- a/srcpkgs/knot-resolver/template
+++ b/srcpkgs/knot-resolver/template
@@ -1,7 +1,7 @@
 # Template file for 'knot-resolver'
 pkgname=knot-resolver
-version=4.2.0
-revision=1
+version=4.2.2
+revision=2
 build_style=meson
 configure_args="
  -Dclient=enabled
@@ -17,7 +17,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.knot-resolver.cz/"
 distfiles="https://secure.nic.cz/files/knot-resolver/knot-resolver-${version}.tar.xz"
-checksum=b37ff9ceefbaa4e4527d183fb1bbb63e641d34d9889ce92715128bc1423c7ef4
+checksum=03b68dff16429aed7a5b0cea7189276c8056e8ecd567b678c2595d48d9a51458
 
 system_accounts="_knot_resolver"
 _knot_resolver_homedir="/var/cache/knot-resolver"
diff --git a/srcpkgs/knot/template b/srcpkgs/knot/template
index e1d92e5f540..1f1f5c3c846 100644
--- a/srcpkgs/knot/template
+++ b/srcpkgs/knot/template
@@ -1,6 +1,6 @@
 # Template file for 'knot'
 pkgname=knot
-version=2.8.3
+version=2.9.0
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -18,7 +18,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.knot-dns.cz/"
 distfiles="https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"
-checksum=8a62d81e5cf3df938f469b60ed4e46d9161007c2b89fbf7ae07525fa68368bad
+checksum=df7434eaefbabbf7cca2d6cba5038be48a4668e508215ca197532bac7c9b21a2
 
 system_accounts="_knot"
 _knot_homedir="/var/lib/knot"
diff --git a/srcpkgs/knotes/template b/srcpkgs/knotes/template
index 513c5fa8702..7d88b28a288 100644
--- a/srcpkgs/knotes/template
+++ b/srcpkgs/knotes/template
@@ -1,7 +1,7 @@
 # Template file for 'knotes'
 pkgname=knotes
-version=19.08.0
-revision=1
+version=19.08.2
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools libxslt
  kcoreaddons kdoctools kconfig"
@@ -12,4 +12,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/utilities/knotes"
 distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=578afb9d879023db9fef4e58e326927d0e2e24edd1e1ac0d46eee968a0ab7030
+checksum=aa0aa4d215507750b055e9af91f552e723aee8163b36f65a3dd19786cf327cf3
diff --git a/srcpkgs/knotifications/template b/srcpkgs/knotifications/template
index 50d9d624179..eaf91a0c0cf 100644
--- a/srcpkgs/knotifications/template
+++ b/srcpkgs/knotifications/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifications'
 pkgname=knotifications
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/frameworks/knotifications"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f72ce6394465316a5324e38afb07f4f71d5f8e281d09b5cf340246c9905568ac
+checksum=886aa99e21deaf35ba626f38d60fcb4f6ce831b1e03dcade79d6e0098a7576e6
 
 knotifications-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/knotifyconfig/template b/srcpkgs/knotifyconfig/template
index c1e40bdc819..bb7d93156f2 100644
--- a/srcpkgs/knotifyconfig/template
+++ b/srcpkgs/knotifyconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifyconfig'
 pkgname=knotifyconfig
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/frameworks/knotifyconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bbd2260a98f70779415369ca1d99807bc3e57f618024b9663d2a462a74169bee
+checksum=24ffc43ec414f6dee675f630c275317c74ce5ba60ece159c69780edfad7e20b5
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python"
diff --git a/srcpkgs/kodi-addon-inputstream-adaptive/template b/srcpkgs/kodi-addon-inputstream-adaptive/template
index d16b4008479..7d923115e36 100644
--- a/srcpkgs/kodi-addon-inputstream-adaptive/template
+++ b/srcpkgs/kodi-addon-inputstream-adaptive/template
@@ -1,6 +1,6 @@
 # Template file for 'kodi-addon-inputstream-adaptive'
 pkgname=kodi-addon-inputstream-adaptive
-version=2.3.22
+version=2.4.2
 revision=1
 _kodi_release=Leia
 wrksrc="inputstream.adaptive-${version}-${_kodi_release}"
@@ -12,5 +12,5 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/peak3d/inputstream.adaptive"
 distfiles="https://github.com/peak3d/inputstream.adaptive/archive/${version}-${_kodi_release}.tar.gz"
-checksum=2c21abeead9dc172de297c47930f62050f382c449682cbdb6c70c7e19a2d561b
+checksum=e47263240ac9276546ead439ba14ee26c3f3b45f2882351a9081e5502e296329
 nocross="depends on kodi-platform"
diff --git a/srcpkgs/kodi-addon-pvr-iptvsimple/template b/srcpkgs/kodi-addon-pvr-iptvsimple/template
index d83b02a1f97..c288602b850 100644
--- a/srcpkgs/kodi-addon-pvr-iptvsimple/template
+++ b/srcpkgs/kodi-addon-pvr-iptvsimple/template
@@ -1,6 +1,6 @@
 # Template file for 'kodi-addon-pvr-iptvsimple'
 pkgname=kodi-addon-pvr-iptvsimple
-version=3.5.8
+version=3.8.3
 revision=1
 _kodi_release=Leia
 wrksrc="pvr.iptvsimple-${version}-${_kodi_release}"
@@ -13,5 +13,5 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/kodi-pvr/pvr.iptvsimple"
 distfiles="https://github.com/kodi-pvr/pvr.iptvsimple/archive/${version}-${_kodi_release}.tar.gz"
-checksum=84e985b5b31044352eaf54914c266a1775f6b7c32a6ce6a46001ddb7d1f9d7fa
+checksum=feac27e3bd97d115ad9f3920be6f43447972194246d0f33fa295d9a4f33e4c48
 nocross="depends on kodi-platform"
diff --git a/srcpkgs/kodi-rpi/files/swig.nojava-18.3 b/srcpkgs/kodi-rpi/files/swig.nojava-18.3
deleted file mode 120000
index 2dba4f75239..00000000000
--- a/srcpkgs/kodi-rpi/files/swig.nojava-18.3
+++ /dev/null
@@ -1 +0,0 @@
-../../kodi/files/swig.nojava-18.3
\ No newline at end of file
diff --git a/srcpkgs/kodi-rpi/files/swig.nojava-18.4 b/srcpkgs/kodi-rpi/files/swig.nojava-18.4
new file mode 120000
index 00000000000..849e63c3370
--- /dev/null
+++ b/srcpkgs/kodi-rpi/files/swig.nojava-18.4
@@ -0,0 +1 @@
+../../kodi/files/swig.nojava-18.4
\ No newline at end of file
diff --git a/srcpkgs/kodi-rpi/files/xbmc-standalone/run b/srcpkgs/kodi-rpi/files/xbmc-standalone/run
index 94ad9da1cd4..e4fc93b47ed 100755
--- a/srcpkgs/kodi-rpi/files/xbmc-standalone/run
+++ b/srcpkgs/kodi-rpi/files/xbmc-standalone/run
@@ -1,2 +1,3 @@
 #!/bin/sh
+PATH=$PATH:/opt/vc/bin
 exec chpst -P sudo LD_LIBRARY_PATH=/opt/vc/lib -u xbmc -- /usr/lib/kodi/kodi-rbpi --standalone
diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template
index d26e9462abb..05e92d9fab4 100644
--- a/srcpkgs/kodi-rpi/template
+++ b/srcpkgs/kodi-rpi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi-rpi'
 pkgname=kodi-rpi
-version=18.3
-revision=1
+version=18.4
+revision=2
 build_style=cmake
 _codename="Leia"
 wrksrc="xbmc-${version}-${_codename}"
@@ -10,7 +10,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 homepage="http://www.kodi.tv/"
 license="GPL-2.0-or-later"
 distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz"
-checksum=4f265901c00f582beb8d6ad96c9c303e5ab82611e828c7121ae822b07c0915cc
+checksum=bf2be186d8ae5b5377e43c06a538012bb9f51a0e98f8244b70a401006861d110
 LDFLAGS+=" -Wl,-z,stack-size=1048576"
 patch_args="-Np1"
 
diff --git a/srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmc.i.cpp b/srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmc.i.cpp
similarity index 99%
rename from srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmc.i.cpp
rename to srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmc.i.cpp
index ff397fb3686..42f767ab0f8 100644
--- a/srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmc.i.cpp
+++ b/srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmc.i.cpp
@@ -9714,7 +9714,7 @@ namespace PythonBindings
 
    // constants
    PyModule_AddStringConstant(module, "__author__", "Team Kodi <http://kodi.tv>");
-   PyModule_AddStringConstant(module, "__date__", "Wed Jun 19 18:36:55 GMT 2019");
+   PyModule_AddStringConstant(module, "__date__", "Sun Sep 01 10:47:01 GMT 2019");
    PyModule_AddStringConstant(module, "__version__", "2.26.0");
    PyModule_AddStringConstant(module, "__credits__", "Team Kodi");
    PyModule_AddStringConstant(module, "__platform__", "ALL");
diff --git a/srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmc.i.xml b/srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmc.i.xml
similarity index 61%
rename from srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmc.i.xml
rename to srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmc.i.xml
index 44a83fa491f..cd136323a35 100644
--- a/srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmc.i.xml
+++ b/srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmc.i.xml
@@ -1,146 +1,146 @@
 <?xml version="1.0" ?> 
-<top id="1" addr="0x7ff9f1f73b30" >
-    <attributelist id="2" addr="0x7ff9f1f73b30" >
-        <attribute name="outfile" value="AddonModuleXbmc.i.xml" id="3" addr="0x7ff9f1fba9d0" />
-        <attribute name="name" value="xbmc" id="4" addr="0x7ff9f1fba9d0" />
-        <attribute name="module" value="xbmc" id="5" addr="0x7ff9f1f89430" />
-        <attribute name="inputfile" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmc.i" id="6" addr="0x7ff9f1fba9d0" />
-        <attribute name="classes" value="0x7ff9f1f86950" id="7" addr="0x7ff9f1f86950" />
-        <attribute name="infile" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmc.i" id="8" addr="0x7ff9f1fba9d0" />
-        <attribute name="outfile_h" value="AddonModuleXbmc.i.h" id="9" addr="0x7ff9f1fba9d0" />
+<top id="1" addr="0x7fdf084cab30" >
+    <attributelist id="2" addr="0x7fdf084cab30" >
+        <attribute name="outfile" value="AddonModuleXbmc.i.xml" id="3" addr="0x7fdf085119d0" />
+        <attribute name="name" value="xbmc" id="4" addr="0x7fdf085119d0" />
+        <attribute name="module" value="xbmc" id="5" addr="0x7fdf084e0430" />
+        <attribute name="inputfile" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmc.i" id="6" addr="0x7fdf085119d0" />
+        <attribute name="classes" value="0x7fdf084dd950" id="7" addr="0x7fdf084dd950" />
+        <attribute name="infile" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmc.i" id="8" addr="0x7fdf085119d0" />
+        <attribute name="outfile_h" value="AddonModuleXbmc.i.h" id="9" addr="0x7fdf085119d0" />
     </attributelist >
 
-    <include id="10" addr="0x7ff9f1f83ed0" >
-        <attributelist id="11" addr="0x7ff9f1f83ed0" >
-            <attribute name="name" value="/usr/share/swig/3.0.12/swig.swg" id="12" addr="0x7ff9f1fba9d0" />
+    <include id="10" addr="0x7fdf084daed0" >
+        <attributelist id="11" addr="0x7fdf084daed0" >
+            <attribute name="name" value="/usr/share/swig/3.0.12/swig.swg" id="12" addr="0x7fdf085119d0" />
         </attributelist >
 
-        <include id="13" addr="0x7ff9f1f83f30" >
-            <attributelist id="14" addr="0x7ff9f1f83f30" >
-                <attribute name="name" value="/usr/share/swig/3.0.12/swigwarnings.swg" id="15" addr="0x7ff9f1fba9d0" />
+        <include id="13" addr="0x7fdf084daf30" >
+            <attributelist id="14" addr="0x7fdf084daf30" >
+                <attribute name="name" value="/usr/share/swig/3.0.12/swigwarnings.swg" id="15" addr="0x7fdf085119d0" />
             </attributelist >
 
-            <include id="16" addr="0x7ff9f1f847f0" >
-                <attributelist id="17" addr="0x7ff9f1f847f0" >
-                    <attribute name="name" value="/usr/share/swig/3.0.12/swigwarn.swg" id="18" addr="0x7ff9f1fba9d0" />
+            <include id="16" addr="0x7fdf084db7f0" >
+                <attributelist id="17" addr="0x7fdf084db7f0" >
+                    <attribute name="name" value="/usr/share/swig/3.0.12/swigwarn.swg" id="18" addr="0x7fdf085119d0" />
                 </attributelist >
              
             </include >
         </include >
-        <namespace id="19" addr="0x7ff9f1f86470" >
-            <attributelist id="20" addr="0x7ff9f1f86470" >
-                <attribute name="sym_name" value="std" id="21" addr="0x7ff9f1fba9d0" />
-                <attribute name="name" value="std" id="22" addr="0x7ff9f1fba9d0" />
-                <typescope id="23" addr="0x7ff9f1fb4910" >
-                    <attributelist id="24" addr="0x7ff9f1fb4910" >
-                        <attribute name="name" value="std" id="25" addr="0x7ff9f1fba9d0" />
-                        <typetab id="26" addr="0x7ff9f1fb4930" >
-                            <attributelist id="27" addr="0x7ff9f1fb4930" >
-                                <attribute name="initializer_list" value="initializer_list" id="28" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                            <typetabsitem id="29" addr="0x7ff9f1fb4a50" >
-                                <attributelist id="30" addr="0x7ff9f1fb4a50" >
+        <namespace id="19" addr="0x7fdf084dd470" >
+            <attributelist id="20" addr="0x7fdf084dd470" >
+                <attribute name="sym_name" value="std" id="21" addr="0x7fdf085119d0" />
+                <attribute name="name" value="std" id="22" addr="0x7fdf085119d0" />
+                <typescope id="23" addr="0x7fdf0850b910" >
+                    <attributelist id="24" addr="0x7fdf0850b910" >
+                        <attribute name="name" value="std" id="25" addr="0x7fdf085119d0" />
+                        <typetab id="26" addr="0x7fdf0850b930" >
+                            <attributelist id="27" addr="0x7fdf0850b930" >
+                                <attribute name="initializer_list" value="initializer_list" id="28" addr="0x7fdf085119d0" />
+                            </attributelist >
+                            <typetabsitem id="29" addr="0x7fdf0850ba50" >
+                                <attributelist id="30" addr="0x7fdf0850ba50" >
                                 </attributelist >
                             </typetabsitem >
                         </typetab >
-                        <attribute name="parent" value="0x7ff9f1f72a30" id="31" addr="0x7ff9f1f72a30" />
-                        <attribute name="qname" value="std" id="32" addr="0x7ff9f1fba9d0" />
-                        <attribute name="symtab" value="0x7ff9f1f863d0" id="33" addr="0x7ff9f1f863d0" />
+                        <attribute name="parent" value="0x7fdf084c9a30" id="31" addr="0x7fdf084c9a30" />
+                        <attribute name="qname" value="std" id="32" addr="0x7fdf085119d0" />
+                        <attribute name="symtab" value="0x7fdf084dd3d0" id="33" addr="0x7fdf084dd3d0" />
                     </attributelist >
-                    <typescopesitem id="34" addr="0x7ff9f1f86330" >
-                        <attributelist id="35" addr="0x7ff9f1f86330" >
+                    <typescopesitem id="34" addr="0x7fdf084dd330" >
+                        <attributelist id="35" addr="0x7fdf084dd330" >
                         </attributelist >
                     </typescopesitem >
-                    <typescopesitem id="36" addr="0x7ff9f1fb4930" >
-                        <attributelist id="37" addr="0x7ff9f1fb4930" >
-                            <attribute name="initializer_list" value="initializer_list" id="38" addr="0x7ff9f1fba9d0" />
+                    <typescopesitem id="36" addr="0x7fdf0850b930" >
+                        <attributelist id="37" addr="0x7fdf0850b930" >
+                            <attribute name="initializer_list" value="initializer_list" id="38" addr="0x7fdf085119d0" />
                         </attributelist >
                     </typescopesitem >
-                    <typescopesitem id="39" addr="0x7ff9f1f72a30" >
-                        <attributelist id="40" addr="0x7ff9f1f72a30" >
-                            <attribute name="name" value="" id="41" addr="0x7ff9f1fba9d0" />
-                            <typetab id="42" addr="0x7ff9f1f72a90" >
-                                <attributelist id="43" addr="0x7ff9f1f72a90" >
-                                    <attribute name="CGUIDialogKeyboardGeneric" value="CGUIDialogKeyboardGeneric" id="44" addr="0x7ff9f1fba9d0" />
+                    <typescopesitem id="39" addr="0x7fdf084c9a30" >
+                        <attributelist id="40" addr="0x7fdf084c9a30" >
+                            <attribute name="name" value="" id="41" addr="0x7fdf085119d0" />
+                            <typetab id="42" addr="0x7fdf084c9a90" >
+                                <attributelist id="43" addr="0x7fdf084c9a90" >
+                                    <attribute name="CGUIDialogKeyboardGeneric" value="CGUIDialogKeyboardGeneric" id="44" addr="0x7fdf085119d0" />
                                 </attributelist >
-                                <typetabsitem id="45" addr="0x7ff9f1fb7950" >
-                                    <attributelist id="46" addr="0x7ff9f1fb7950" >
+                                <typetabsitem id="45" addr="0x7fdf0850e950" >
+                                    <attributelist id="46" addr="0x7fdf0850e950" >
                                     </attributelist >
                                 </typetabsitem >
                             </typetab >
                         </attributelist >
                     </typescopesitem >
-                    <typescopesitem id="47" addr="0x7ff9f1fb4950" >
-                        <attributelist id="48" addr="0x7ff9f1fb4950" >
+                    <typescopesitem id="47" addr="0x7fdf0850b950" >
+                        <attributelist id="48" addr="0x7fdf0850b950" >
                         </attributelist >
                     </typescopesitem >
-                    <typescopesitem id="49" addr="0x7ff9f1f863d0" >
-                        <attributelist id="50" addr="0x7ff9f1f863d0" >
-                            <attribute name="name" value="std" id="51" addr="0x7ff9f1fba9d0" />
-                            <attribute name="csymtab" value="0x7ff9f1f86410" id="52" addr="0x7ff9f1f86410" />
-                            <attribute name="symtab" value="0x7ff9f1f863b0" id="53" addr="0x7ff9f1f863b0" />
+                    <typescopesitem id="49" addr="0x7fdf084dd3d0" >
+                        <attributelist id="50" addr="0x7fdf084dd3d0" >
+                            <attribute name="name" value="std" id="51" addr="0x7fdf085119d0" />
+                            <attribute name="csymtab" value="0x7fdf084dd410" id="52" addr="0x7fdf084dd410" />
+                            <attribute name="symtab" value="0x7fdf084dd3b0" id="53" addr="0x7fdf084dd3b0" />
                         </attributelist >
                     </typescopesitem >
                 </typescope >
-                <attribute name="symtab" value="0x7ff9f1f863d0" id="54" addr="0x7ff9f1f863d0" />
-                <attribute name="sym_symtab" value="0x7ff9f1f72950" id="55" addr="0x7ff9f1f72950" />
-                <attribute name="sym_overname" value="__SWIG_0" id="56" addr="0x7ff9f1fba9d0" />
+                <attribute name="symtab" value="0x7fdf084dd3d0" id="54" addr="0x7fdf084dd3d0" />
+                <attribute name="sym_symtab" value="0x7fdf084c9950" id="55" addr="0x7fdf084c9950" />
+                <attribute name="sym_overname" value="__SWIG_0" id="56" addr="0x7fdf085119d0" />
             </attributelist >
 
-            <template id="57" addr="0x7ff9f1f865f0" >
-                <attributelist id="58" addr="0x7ff9f1f865f0" >
-                    <attribute name="templatetype" value="class" id="59" addr="0x7ff9f1fba9d0" />
-                    <attribute name="sym_typename" value="1" id="60" addr="0x7ff9f1fba9d0" />
-                    <attribute name="name" value="initializer_list" id="61" addr="0x7ff9f1fba9d0" />
-                    <attribute name="sym_symtab" value="0x7ff9f1f863d0" id="62" addr="0x7ff9f1f863d0" />
-                    <attribute name="symtab" value="0x7ff9f1f86810" id="63" addr="0x7ff9f1f86810" />
-                    <attribute name="allows_typedef" value="1" id="64" addr="0x7ff9f1fba9d0" />
-                    <attribute name="kind" value="class" id="65" addr="0x7ff9f1fba9d0" />
-                    <attribute name="sym_name" value="initializer_list" id="66" addr="0x7ff9f1fba9d0" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="67" addr="0x7ff9f1fba9d0" />
-                    <templateparms id="68" addr="0x7ff9f1f86510" >
+            <template id="57" addr="0x7fdf084dd5f0" >
+                <attributelist id="58" addr="0x7fdf084dd5f0" >
+                    <attribute name="templatetype" value="class" id="59" addr="0x7fdf085119d0" />
+                    <attribute name="sym_typename" value="1" id="60" addr="0x7fdf085119d0" />
+                    <attribute name="name" value="initializer_list" id="61" addr="0x7fdf085119d0" />
+                    <attribute name="sym_symtab" value="0x7fdf084dd3d0" id="62" addr="0x7fdf084dd3d0" />
+                    <attribute name="symtab" value="0x7fdf084dd810" id="63" addr="0x7fdf084dd810" />
+                    <attribute name="allows_typedef" value="1" id="64" addr="0x7fdf085119d0" />
+                    <attribute name="kind" value="class" id="65" addr="0x7fdf085119d0" />
+                    <attribute name="sym_name" value="initializer_list" id="66" addr="0x7fdf085119d0" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="67" addr="0x7fdf085119d0" />
+                    <templateparms id="68" addr="0x7fdf084dd510" >
                         <parm id="69">
-                            <attributelist id="70" addr="0x7ff9f1f86510" >
-                                <attribute name="name" value="T" id="71" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="typename T" id="72" addr="0x7ff9f1fba9d0" />
+                            <attributelist id="70" addr="0x7fdf084dd510" >
+                                <attribute name="name" value="T" id="71" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="typename T" id="72" addr="0x7fdf085119d0" />
                             </attributelist >
                         </parm >
                     </templateparms >
                 </attributelist >
 
-                <access id="73" addr="0x7ff9f1f869d0" >
-                    <attributelist id="74" addr="0x7ff9f1f869d0" >
-                        <attribute name="kind" value="public" id="75" addr="0x7ff9f1fba9d0" />
+                <access id="73" addr="0x7fdf084dd9d0" >
+                    <attributelist id="74" addr="0x7fdf084dd9d0" >
+                        <attribute name="kind" value="public" id="75" addr="0x7fdf085119d0" />
                     </attributelist >
                  
                 </access >
             </template >
-            <typemap id="76" addr="0x7ff9f1f87030" >
-                <attributelist id="77" addr="0x7ff9f1f87030" >
-                    <kwargs id="78" addr="0x7ff9f1f86d30" >
-                        <attributelist id="79" addr="0x7ff9f1f86d30" >
-                            <attribute name="name" value="warning" id="80" addr="0x7ff9f1fba9d0" />
-                            <attribute name="value" value="476:Initialization using std::initializer_list." id="81" addr="0x7ff9f1fba9d0" />
+            <typemap id="76" addr="0x7fdf084de030" >
+                <attributelist id="77" addr="0x7fdf084de030" >
+                    <kwargs id="78" addr="0x7fdf084ddd30" >
+                        <attributelist id="79" addr="0x7fdf084ddd30" >
+                            <attribute name="name" value="warning" id="80" addr="0x7fdf085119d0" />
+                            <attribute name="value" value="476:Initialization using std::initializer_list." id="81" addr="0x7fdf085119d0" />
                         </attributelist >
-                        <kwargssitem id="82" addr="0x7ff9f1f86eb0" >
-                            <attributelist id="83" addr="0x7ff9f1f86eb0" >
+                        <kwargssitem id="82" addr="0x7fdf084ddeb0" >
+                            <attributelist id="83" addr="0x7fdf084ddeb0" >
                             </attributelist >
                         </kwargssitem >
-                        <kwargssitem id="84" addr="0x7ff9f1f86d10" >
-                            <attributelist id="85" addr="0x7ff9f1f86d10" >
+                        <kwargssitem id="84" addr="0x7fdf084ddd10" >
+                            <attributelist id="85" addr="0x7fdf084ddd10" >
                             </attributelist >
                         </kwargssitem >
                     </kwargs >
-                    <attribute name="code" value="" id="86" addr="0x7ff9f1fba9d0" />
-                    <attribute name="method" value="in" id="87" addr="0x7ff9f1fba9d0" />
+                    <attribute name="code" value="" id="86" addr="0x7fdf085119d0" />
+                    <attribute name="method" value="in" id="87" addr="0x7fdf085119d0" />
                 </attributelist >
 
-                <typemapitem id="88" addr="0x7ff9f1f86f50" >
-                    <attributelist id="89" addr="0x7ff9f1f86f50" >
-                        <parmlist id="90" addr="0x7ff9f1f86f90" >
+                <typemapitem id="88" addr="0x7fdf084ddf50" >
+                    <attributelist id="89" addr="0x7fdf084ddf50" >
+                        <parmlist id="90" addr="0x7fdf084ddf90" >
                             <parm id="91">
-                                <attributelist id="92" addr="0x7ff9f1f86f90" >
-                                    <attribute name="type" value="std::initializer_list&lt;(T)>" id="93" addr="0x7ff9f1fba9d0" />
+                                <attributelist id="92" addr="0x7fdf084ddf90" >
+                                    <attribute name="type" value="std::initializer_list&lt;(T)>" id="93" addr="0x7fdf085119d0" />
                                 </attributelist >
                             </parm >
                         </parmlist >
@@ -148,32 +148,32 @@
                  
                 </typemapitem >
             </typemap >
-            <typemap id="94" addr="0x7ff9f1f873b0" >
-                <attributelist id="95" addr="0x7ff9f1f873b0" >
-                    <kwargs id="96" addr="0x7ff9f1f87150" >
-                        <attributelist id="97" addr="0x7ff9f1f87150" >
-                            <attribute name="name" value="precedence" id="98" addr="0x7ff9f1fba9d0" />
-                            <attribute name="value" value="0" id="99" addr="0x7ff9f1fba9d0" />
+            <typemap id="94" addr="0x7fdf084de3b0" >
+                <attributelist id="95" addr="0x7fdf084de3b0" >
+                    <kwargs id="96" addr="0x7fdf084de150" >
+                        <attributelist id="97" addr="0x7fdf084de150" >
+                            <attribute name="name" value="precedence" id="98" addr="0x7fdf085119d0" />
+                            <attribute name="value" value="0" id="99" addr="0x7fdf085119d0" />
                         </attributelist >
-                        <kwargssitem id="100" addr="0x7ff9f1f87170" >
-                            <attributelist id="101" addr="0x7ff9f1f87170" >
+                        <kwargssitem id="100" addr="0x7fdf084de170" >
+                            <attributelist id="101" addr="0x7fdf084de170" >
                             </attributelist >
                         </kwargssitem >
-                        <kwargssitem id="102" addr="0x7ff9f1f87190" >
-                            <attributelist id="103" addr="0x7ff9f1f87190" >
+                        <kwargssitem id="102" addr="0x7fdf084de190" >
+                            <attributelist id="103" addr="0x7fdf084de190" >
                             </attributelist >
                         </kwargssitem >
                     </kwargs >
-                    <attribute name="code" value="" id="104" addr="0x7ff9f1fba9d0" />
-                    <attribute name="method" value="typecheck" id="105" addr="0x7ff9f1fba9d0" />
+                    <attribute name="code" value="" id="104" addr="0x7fdf085119d0" />
+                    <attribute name="method" value="typecheck" id="105" addr="0x7fdf085119d0" />
                 </attributelist >
 
-                <typemapitem id="106" addr="0x7ff9f1f872f0" >
-                    <attributelist id="107" addr="0x7ff9f1f872f0" >
-                        <parmlist id="108" addr="0x7ff9f1f87330" >
+                <typemapitem id="106" addr="0x7fdf084de2f0" >
+                    <attributelist id="107" addr="0x7fdf084de2f0" >
+                        <parmlist id="108" addr="0x7fdf084de330" >
                             <parm id="109">
-                                <attributelist id="110" addr="0x7ff9f1f87330" >
-                                    <attribute name="type" value="std::initializer_list&lt;(T)>" id="111" addr="0x7ff9f1fba9d0" />
+                                <attributelist id="110" addr="0x7fdf084de330" >
+                                    <attribute name="type" value="std::initializer_list&lt;(T)>" id="111" addr="0x7fdf085119d0" />
                                 </attributelist >
                             </parm >
                         </parmlist >
@@ -182,18 +182,18 @@
                 </typemapitem >
             </typemap >
         </namespace >
-        <typemap id="112" addr="0x7ff9f1f875d0" >
-            <attributelist id="113" addr="0x7ff9f1f875d0" >
-                <attribute name="code" value="delete [] $1;" id="114" addr="0x7ff9f1fba9d0" />
-                <attribute name="method" value="newfree" id="115" addr="0x7ff9f1fba9d0" />
+        <typemap id="112" addr="0x7fdf084de5d0" >
+            <attributelist id="113" addr="0x7fdf084de5d0" >
+                <attribute name="code" value="delete [] $1;" id="114" addr="0x7fdf085119d0" />
+                <attribute name="method" value="newfree" id="115" addr="0x7fdf085119d0" />
             </attributelist >
 
-            <typemapitem id="116" addr="0x7ff9f1f874f0" >
-                <attributelist id="117" addr="0x7ff9f1f874f0" >
-                    <parmlist id="118" addr="0x7ff9f1f87530" >
+            <typemapitem id="116" addr="0x7fdf084de4f0" >
+                <attributelist id="117" addr="0x7fdf084de4f0" >
+                    <parmlist id="118" addr="0x7fdf084de530" >
                         <parm id="119">
-                            <attributelist id="120" addr="0x7ff9f1f87530" >
-                                <attribute name="type" value="p.char" id="121" addr="0x7ff9f1fba9d0" />
+                            <attributelist id="120" addr="0x7fdf084de530" >
+                                <attribute name="type" value="p.char" id="121" addr="0x7fdf085119d0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -201,18 +201,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="122" addr="0x7ff9f1f877b0" >
-            <attributelist id="123" addr="0x7ff9f1f877b0" >
-                <attribute name="code" value="{&#10;  delete [] $1;&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="124" addr="0x7ff9f1fba9d0" />
-                <attribute name="method" value="memberin" id="125" addr="0x7ff9f1fba9d0" />
+        <typemap id="122" addr="0x7fdf084de7b0" >
+            <attributelist id="123" addr="0x7fdf084de7b0" >
+                <attribute name="code" value="{&#10;  delete [] $1;&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="124" addr="0x7fdf085119d0" />
+                <attribute name="method" value="memberin" id="125" addr="0x7fdf085119d0" />
             </attributelist >
 
-            <typemapitem id="126" addr="0x7ff9f1f876f0" >
-                <attributelist id="127" addr="0x7ff9f1f876f0" >
-                    <parmlist id="128" addr="0x7ff9f1f87730" >
+            <typemapitem id="126" addr="0x7fdf084de6f0" >
+                <attributelist id="127" addr="0x7fdf084de6f0" >
+                    <parmlist id="128" addr="0x7fdf084de730" >
                         <parm id="129">
-                            <attributelist id="130" addr="0x7ff9f1f87730" >
-                                <attribute name="type" value="p.char" id="131" addr="0x7ff9f1fba9d0" />
+                            <attributelist id="130" addr="0x7fdf084de730" >
+                                <attribute name="type" value="p.char" id="131" addr="0x7fdf085119d0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -220,32 +220,32 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="132" addr="0x7ff9f1f87a10" >
-            <attributelist id="133" addr="0x7ff9f1f87a10" >
-                <kwargs id="134" addr="0x7ff9f1f87850" >
-                    <attributelist id="135" addr="0x7ff9f1f87850" >
-                        <attribute name="name" value="warning" id="136" addr="0x7ff9f1fba9d0" />
-                        <attribute name="value" value="451:Setting a const char * variable may leak memory." id="137" addr="0x7ff9f1fba9d0" />
+        <typemap id="132" addr="0x7fdf084dea10" >
+            <attributelist id="133" addr="0x7fdf084dea10" >
+                <kwargs id="134" addr="0x7fdf084de850" >
+                    <attributelist id="135" addr="0x7fdf084de850" >
+                        <attribute name="name" value="warning" id="136" addr="0x7fdf085119d0" />
+                        <attribute name="value" value="451:Setting a const char * variable may leak memory." id="137" addr="0x7fdf085119d0" />
                     </attributelist >
-                    <kwargssitem id="138" addr="0x7ff9f1f87870" >
-                        <attributelist id="139" addr="0x7ff9f1f87870" >
+                    <kwargssitem id="138" addr="0x7fdf084de870" >
+                        <attributelist id="139" addr="0x7fdf084de870" >
                         </attributelist >
                     </kwargssitem >
-                    <kwargssitem id="140" addr="0x7ff9f1f87830" >
-                        <attributelist id="141" addr="0x7ff9f1f87830" >
+                    <kwargssitem id="140" addr="0x7fdf084de830" >
+                        <attributelist id="141" addr="0x7fdf084de830" >
                         </attributelist >
                     </kwargssitem >
                 </kwargs >
-                <attribute name="code" value="{&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="142" addr="0x7ff9f1fba9d0" />
-                <attribute name="method" value="memberin" id="143" addr="0x7ff9f1fba9d0" />
+                <attribute name="code" value="{&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="142" addr="0x7fdf085119d0" />
+                <attribute name="method" value="memberin" id="143" addr="0x7fdf085119d0" />
             </attributelist >
 
-            <typemapitem id="144" addr="0x7ff9f1f87950" >
-                <attributelist id="145" addr="0x7ff9f1f87950" >
-                    <parmlist id="146" addr="0x7ff9f1f87990" >
+            <typemapitem id="144" addr="0x7fdf084de950" >
+                <attributelist id="145" addr="0x7fdf084de950" >
+                    <parmlist id="146" addr="0x7fdf084de990" >
                         <parm id="147">
-                            <attributelist id="148" addr="0x7ff9f1f87990" >
-                                <attribute name="type" value="p.q(const).char" id="149" addr="0x7ff9f1fba9d0" />
+                            <attributelist id="148" addr="0x7fdf084de990" >
+                                <attribute name="type" value="p.q(const).char" id="149" addr="0x7fdf085119d0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -253,18 +253,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="150" addr="0x7ff9f1f87bf0" >
-            <attributelist id="151" addr="0x7ff9f1f87bf0" >
-                <attribute name="code" value="{&#10;  delete [] $1;&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="152" addr="0x7ff9f1fba9d0" />
-                <attribute name="method" value="globalin" id="153" addr="0x7ff9f1fba9d0" />
+        <typemap id="150" addr="0x7fdf084debf0" >
+            <attributelist id="151" addr="0x7fdf084debf0" >
+                <attribute name="code" value="{&#10;  delete [] $1;&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="152" addr="0x7fdf085119d0" />
+                <attribute name="method" value="globalin" id="153" addr="0x7fdf085119d0" />
             </attributelist >
 
-            <typemapitem id="154" addr="0x7ff9f1f87b30" >
-                <attributelist id="155" addr="0x7ff9f1f87b30" >
-                    <parmlist id="156" addr="0x7ff9f1f87b70" >
+            <typemapitem id="154" addr="0x7fdf084deb30" >
+                <attributelist id="155" addr="0x7fdf084deb30" >
+                    <parmlist id="156" addr="0x7fdf084deb70" >
                         <parm id="157">
-                            <attributelist id="158" addr="0x7ff9f1f87b70" >
-                                <attribute name="type" value="p.char" id="159" addr="0x7ff9f1fba9d0" />
+                            <attributelist id="158" addr="0x7fdf084deb70" >
+                                <attribute name="type" value="p.char" id="159" addr="0x7fdf085119d0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -272,32 +272,32 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="160" addr="0x7ff9f1f87e50" >
-            <attributelist id="161" addr="0x7ff9f1f87e50" >
-                <kwargs id="162" addr="0x7ff9f1f87c90" >
-                    <attributelist id="163" addr="0x7ff9f1f87c90" >
-                        <attribute name="name" value="warning" id="164" addr="0x7ff9f1fba9d0" />
-                        <attribute name="value" value="451:Setting a const char * variable may leak memory." id="165" addr="0x7ff9f1fba9d0" />
+        <typemap id="160" addr="0x7fdf084dee50" >
+            <attributelist id="161" addr="0x7fdf084dee50" >
+                <kwargs id="162" addr="0x7fdf084dec90" >
+                    <attributelist id="163" addr="0x7fdf084dec90" >
+                        <attribute name="name" value="warning" id="164" addr="0x7fdf085119d0" />
+                        <attribute name="value" value="451:Setting a const char * variable may leak memory." id="165" addr="0x7fdf085119d0" />
                     </attributelist >
-                    <kwargssitem id="166" addr="0x7ff9f1f87cb0" >
-                        <attributelist id="167" addr="0x7ff9f1f87cb0" >
+                    <kwargssitem id="166" addr="0x7fdf084decb0" >
+                        <attributelist id="167" addr="0x7fdf084decb0" >
                         </attributelist >
                     </kwargssitem >
-                    <kwargssitem id="168" addr="0x7ff9f1f87c70" >
-                        <attributelist id="169" addr="0x7ff9f1f87c70" >
+                    <kwargssitem id="168" addr="0x7fdf084dec70" >
+                        <attributelist id="169" addr="0x7fdf084dec70" >
                         </attributelist >
                     </kwargssitem >
                 </kwargs >
-                <attribute name="code" value="{&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="170" addr="0x7ff9f1fba9d0" />
-                <attribute name="method" value="globalin" id="171" addr="0x7ff9f1fba9d0" />
+                <attribute name="code" value="{&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="170" addr="0x7fdf085119d0" />
+                <attribute name="method" value="globalin" id="171" addr="0x7fdf085119d0" />
             </attributelist >
 
-            <typemapitem id="172" addr="0x7ff9f1f87d90" >
-                <attributelist id="173" addr="0x7ff9f1f87d90" >
-                    <parmlist id="174" addr="0x7ff9f1f87dd0" >
+            <typemapitem id="172" addr="0x7fdf084ded90" >
+                <attributelist id="173" addr="0x7fdf084ded90" >
+                    <parmlist id="174" addr="0x7fdf084dedd0" >
                         <parm id="175">
-                            <attributelist id="176" addr="0x7ff9f1f87dd0" >
-                                <attribute name="type" value="p.q(const).char" id="177" addr="0x7ff9f1fba9d0" />
+                            <attributelist id="176" addr="0x7fdf084dedd0" >
+                                <attribute name="type" value="p.q(const).char" id="177" addr="0x7fdf085119d0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -305,18 +305,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="178" addr="0x7ff9f1f88070" >
-            <attributelist id="179" addr="0x7ff9f1f88070" >
-                <attribute name="code" value="{&#10;  if($input) {&#10;    strncpy((char*)$1, (const char *)$input, $1_dim0-1);&#10;    $1[$1_dim0-1] = 0;&#10;  } else {&#10;    $1[0] = 0;&#10;  }&#10;}" id="180" addr="0x7ff9f1fba9d0" />
-                <attribute name="method" value="memberin" id="181" addr="0x7ff9f1fba9d0" />
+        <typemap id="178" addr="0x7fdf084df070" >
+            <attributelist id="179" addr="0x7fdf084df070" >
+                <attribute name="code" value="{&#10;  if($input) {&#10;    strncpy((char*)$1, (const char *)$input, $1_dim0-1);&#10;    $1[$1_dim0-1] = 0;&#10;  } else {&#10;    $1[0] = 0;&#10;  }&#10;}" id="180" addr="0x7fdf085119d0" />
+                <attribute name="method" value="memberin" id="181" addr="0x7fdf085119d0" />
             </attributelist >
 
-            <typemapitem id="182" addr="0x7ff9f1f87fb0" >
-                <attributelist id="183" addr="0x7ff9f1f87fb0" >
-                    <parmlist id="184" addr="0x7ff9f1f87ff0" >
+            <typemapitem id="182" addr="0x7fdf084defb0" >
+                <attributelist id="183" addr="0x7fdf084defb0" >
+                    <parmlist id="184" addr="0x7fdf084deff0" >
                         <parm id="185">
-                            <attributelist id="186" addr="0x7ff9f1f87ff0" >
-                                <attribute name="type" value="a(ANY).char" id="187" addr="0x7ff9f1fba9d0" />
+                            <attributelist id="186" addr="0x7fdf084deff0" >
+                                <attribute name="type" value="a(ANY).char" id="187" addr="0x7fdf085119d0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -324,18 +324,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="188" addr="0x7ff9f1f88290" >
-            <attributelist id="189" addr="0x7ff9f1f88290" >
-                <attribute name="code" value="{&#10;  if($input) {&#10;    strncpy((char*)$1, (const char *)$input, $1_dim0-1);&#10;    $1[$1_dim0-1] = 0;&#10;  } else {&#10;    $1[0] = 0;&#10;  }&#10;}" id="190" addr="0x7ff9f1fba9d0" />
-                <attribute name="method" value="globalin" id="191" addr="0x7ff9f1fba9d0" />
+        <typemap id="188" addr="0x7fdf084df290" >
+            <attributelist id="189" addr="0x7fdf084df290" >
+                <attribute name="code" value="{&#10;  if($input) {&#10;    strncpy((char*)$1, (const char *)$input, $1_dim0-1);&#10;    $1[$1_dim0-1] = 0;&#10;  } else {&#10;    $1[0] = 0;&#10;  }&#10;}" id="190" addr="0x7fdf085119d0" />
+                <attribute name="method" value="globalin" id="191" addr="0x7fdf085119d0" />
             </attributelist >
 
-            <typemapitem id="192" addr="0x7ff9f1f881d0" >
-                <attributelist id="193" addr="0x7ff9f1f881d0" >
-                    <parmlist id="194" addr="0x7ff9f1f88210" >
+            <typemapitem id="192" addr="0x7fdf084df1d0" >
+                <attributelist id="193" addr="0x7fdf084df1d0" >
+                    <parmlist id="194" addr="0x7fdf084df210" >
                         <parm id="195">
-                            <attributelist id="196" addr="0x7ff9f1f88210" >
-                                <attribute name="type" value="a(ANY).char" id="197" addr="0x7ff9f1fba9d0" />
+                            <attributelist id="196" addr="0x7fdf084df210" >
+                                <attribute name="type" value="a(ANY).char" id="197" addr="0x7fdf085119d0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -343,18 +343,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="198" addr="0x7ff9f1f88470" >
-            <attributelist id="199" addr="0x7ff9f1f88470" >
-                <attribute name="code" value="{&#10;  if ($input) strcpy((char *)$1, (const char *)$input);&#10;  else $1[0] = 0;&#10;}" id="200" addr="0x7ff9f1fba9d0" />
-                <attribute name="method" value="memberin" id="201" addr="0x7ff9f1fba9d0" />
+        <typemap id="198" addr="0x7fdf084df470" >
+            <attributelist id="199" addr="0x7fdf084df470" >
+                <attribute name="code" value="{&#10;  if ($input) strcpy((char *)$1, (const char *)$input);&#10;  else $1[0] = 0;&#10;}" id="200" addr="0x7fdf085119d0" />
+                <attribute name="method" value="memberin" id="201" addr="0x7fdf085119d0" />
             </attributelist >
 
-            <typemapitem id="202" addr="0x7ff9f1f883b0" >
-                <attributelist id="203" addr="0x7ff9f1f883b0" >
-                    <parmlist id="204" addr="0x7ff9f1f883f0" >
+            <typemapitem id="202" addr="0x7fdf084df3b0" >
+                <attributelist id="203" addr="0x7fdf084df3b0" >
+                    <parmlist id="204" addr="0x7fdf084df3f0" >
                         <parm id="205">
-                            <attributelist id="206" addr="0x7ff9f1f883f0" >
-                                <attribute name="type" value="a().char" id="207" addr="0x7ff9f1fba9d0" />
+                            <attributelist id="206" addr="0x7fdf084df3f0" >
+                                <attribute name="type" value="a().char" id="207" addr="0x7fdf085119d0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -362,18 +362,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="208" addr="0x7ff9f1f88650" >
-            <attributelist id="209" addr="0x7ff9f1f88650" >
-                <attribute name="code" value="{&#10;  if ($input) strcpy((char *)$1, (const char *)$input);&#10;  else $1[0] = 0;&#10;}" id="210" addr="0x7ff9f1fba9d0" />
-                <attribute name="method" value="globalin" id="211" addr="0x7ff9f1fba9d0" />
+        <typemap id="208" addr="0x7fdf084df650" >
+            <attributelist id="209" addr="0x7fdf084df650" >
+                <attribute name="code" value="{&#10;  if ($input) strcpy((char *)$1, (const char *)$input);&#10;  else $1[0] = 0;&#10;}" id="210" addr="0x7fdf085119d0" />
+                <attribute name="method" value="globalin" id="211" addr="0x7fdf085119d0" />
             </attributelist >
 
-            <typemapitem id="212" addr="0x7ff9f1f88590" >
-                <attributelist id="213" addr="0x7ff9f1f88590" >
-                    <parmlist id="214" addr="0x7ff9f1f885d0" >
+            <typemapitem id="212" addr="0x7fdf084df590" >
+                <attributelist id="213" addr="0x7fdf084df590" >
+                    <parmlist id="214" addr="0x7fdf084df5d0" >
                         <parm id="215">
-                            <attributelist id="216" addr="0x7ff9f1f885d0" >
-                                <attribute name="type" value="a().char" id="217" addr="0x7ff9f1fba9d0" />
+                            <attributelist id="216" addr="0x7fdf084df5d0" >
+                                <attribute name="type" value="a().char" id="217" addr="0x7fdf085119d0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -381,18 +381,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="218" addr="0x7ff9f1f88870" >
-            <attributelist id="219" addr="0x7ff9f1f88870" >
-                <attribute name="code" value="{&#10;  size_t ii;&#10;  $1_basetype *b = ($1_basetype *) $1;&#10;  for (ii = 0; ii &lt; (size_t)$1_size; ii++) b[ii] = *(($1_basetype *) $input + ii);&#10;}" id="220" addr="0x7ff9f1fba9d0" />
-                <attribute name="method" value="memberin" id="221" addr="0x7ff9f1fba9d0" />
+        <typemap id="218" addr="0x7fdf084df870" >
+            <attributelist id="219" addr="0x7fdf084df870" >
+                <attribute name="code" value="{&#10;  size_t ii;&#10;  $1_basetype *b = ($1_basetype *) $1;&#10;  for (ii = 0; ii &lt; (size_t)$1_size; ii++) b[ii] = *(($1_basetype *) $input + ii);&#10;}" id="220" addr="0x7fdf085119d0" />
+                <attribute name="method" value="memberin" id="221" addr="0x7fdf085119d0" />
             </attributelist >
 
-            <typemapitem id="222" addr="0x7ff9f1f887b0" >
-                <attributelist id="223" addr="0x7ff9f1f887b0" >
-                    <parmlist id="224" addr="0x7ff9f1f887f0" >
+            <typemapitem id="222" addr="0x7fdf084df7b0" >
+                <attributelist id="223" addr="0x7fdf084df7b0" >
+                    <parmlist id="224" addr="0x7fdf084df7f0" >
                         <parm id="225">
-                            <attributelist id="226" addr="0x7ff9f1f887f0" >
-                                <attribute name="type" value="a(ANY).SWIGTYPE" id="227" addr="0x7ff9f1fba9d0" />
+                            <attributelist id="226" addr="0x7fdf084df7f0" >
+                                <attribute name="type" value="a(ANY).SWIGTYPE" id="227" addr="0x7fdf085119d0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -400,18 +400,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="228" addr="0x7ff9f1f88a90" >
-            <attributelist id="229" addr="0x7ff9f1f88a90" >
-                <attribute name="code" value="{&#10;  size_t ii;&#10;  $1_basetype *b = ($1_basetype *) $1;&#10;  for (ii = 0; ii &lt; (size_t)$1_size; ii++) b[ii] = *(($1_basetype *) $input + ii);&#10;}" id="230" addr="0x7ff9f1fba9d0" />
-                <attribute name="method" value="globalin" id="231" addr="0x7ff9f1fba9d0" />
+        <typemap id="228" addr="0x7fdf084dfa90" >
+            <attributelist id="229" addr="0x7fdf084dfa90" >
+                <attribute name="code" value="{&#10;  size_t ii;&#10;  $1_basetype *b = ($1_basetype *) $1;&#10;  for (ii = 0; ii &lt; (size_t)$1_size; ii++) b[ii] = *(($1_basetype *) $input + ii);&#10;}" id="230" addr="0x7fdf085119d0" />
+                <attribute name="method" value="globalin" id="231" addr="0x7fdf085119d0" />
             </attributelist >
 
-            <typemapitem id="232" addr="0x7ff9f1f889d0" >
-                <attributelist id="233" addr="0x7ff9f1f889d0" >
-                    <parmlist id="234" addr="0x7ff9f1f88a10" >
+            <typemapitem id="232" addr="0x7fdf084df9d0" >
+                <attributelist id="233" addr="0x7fdf084df9d0" >
+                    <parmlist id="234" addr="0x7fdf084dfa10" >
                         <parm id="235">
-                            <attributelist id="236" addr="0x7ff9f1f88a10" >
-                                <attribute name="type" value="a(ANY).SWIGTYPE" id="237" addr="0x7ff9f1fba9d0" />
+                            <attributelist id="236" addr="0x7fdf084dfa10" >
+                                <attribute name="type" value="a(ANY).SWIGTYPE" id="237" addr="0x7fdf085119d0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -419,18 +419,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="238" addr="0x7ff9f1f88cf0" >
-            <attributelist id="239" addr="0x7ff9f1f88cf0" >
-                <attribute name="code" value="{&#10;  $basetype (*inp)[$1_dim1] = ($basetype (*)[$1_dim1])($input);&#10;  $basetype (*dest)[$1_dim1] = ($basetype (*)[$1_dim1])($1);&#10;  size_t ii = 0;&#10;  for (; ii &lt; $1_dim0; ++ii) {&#10;    $basetype *ip = inp[ii];&#10;    $basetype *dp = dest[ii];&#10;    size_t jj = 0;&#10;    for (; jj &lt; $1_dim1; ++jj) dp[jj] = ip[jj];&#10;  }&#10;}" id="240" addr="0x7ff9f1fba9d0" />
-                <attribute name="method" value="memberin" id="241" addr="0x7ff9f1fba9d0" />
+        <typemap id="238" addr="0x7fdf084dfcf0" >
+            <attributelist id="239" addr="0x7fdf084dfcf0" >
+                <attribute name="code" value="{&#10;  $basetype (*inp)[$1_dim1] = ($basetype (*)[$1_dim1])($input);&#10;  $basetype (*dest)[$1_dim1] = ($basetype (*)[$1_dim1])($1);&#10;  size_t ii = 0;&#10;  for (; ii &lt; $1_dim0; ++ii) {&#10;    $basetype *ip = inp[ii];&#10;    $basetype *dp = dest[ii];&#10;    size_t jj = 0;&#10;    for (; jj &lt; $1_dim1; ++jj) dp[jj] = ip[jj];&#10;  }&#10;}" id="240" addr="0x7fdf085119d0" />
+                <attribute name="method" value="memberin" id="241" addr="0x7fdf085119d0" />
             </attributelist >
 
-            <typemapitem id="242" addr="0x7ff9f1f88bd0" >
-                <attributelist id="243" addr="0x7ff9f1f88bd0" >
-                    <parmlist id="244" addr="0x7ff9f1f88c70" >
+            <typemapitem id="242" addr="0x7fdf084dfbd0" >
+                <attributelist id="243" addr="0x7fdf084dfbd0" >
+                    <parmlist id="244" addr="0x7fdf084dfc70" >
                         <parm id="245">
-                            <attributelist id="246" addr="0x7ff9f1f88c70" >
-                                <attribute name="type" value="a(ANY).a(ANY).SWIGTYPE" id="247" addr="0x7ff9f1fba9d0" />
+                            <attributelist id="246" addr="0x7fdf084dfc70" >
+                                <attribute name="type" value="a(ANY).a(ANY).SWIGTYPE" id="247" addr="0x7fdf085119d0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -438,18 +438,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="248" addr="0x7ff9f1f88f50" >
-            <attributelist id="249" addr="0x7ff9f1f88f50" >
-                <attribute name="code" value="{&#10;  $basetype (*inp)[$1_dim1] = ($basetype (*)[$1_dim1])($input);&#10;  $basetype (*dest)[$1_dim1] = ($basetype (*)[$1_dim1])($1);&#10;  size_t ii = 0;&#10;  for (; ii &lt; $1_dim0; ++ii) {&#10;    $basetype *ip = inp[ii];&#10;    $basetype *dp = dest[ii];&#10;    size_t jj = 0;&#10;    for (; jj &lt; $1_dim1; ++jj) dp[jj] = ip[jj];&#10;  }&#10;}" id="250" addr="0x7ff9f1fba9d0" />
-                <attribute name="method" value="globalin" id="251" addr="0x7ff9f1fba9d0" />
+        <typemap id="248" addr="0x7fdf084dff50" >
+            <attributelist id="249" addr="0x7fdf084dff50" >
+                <attribute name="code" value="{&#10;  $basetype (*inp)[$1_dim1] = ($basetype (*)[$1_dim1])($input);&#10;  $basetype (*dest)[$1_dim1] = ($basetype (*)[$1_dim1])($1);&#10;  size_t ii = 0;&#10;  for (; ii &lt; $1_dim0; ++ii) {&#10;    $basetype *ip = inp[ii];&#10;    $basetype *dp = dest[ii];&#10;    size_t jj = 0;&#10;    for (; jj &lt; $1_dim1; ++jj) dp[jj] = ip[jj];&#10;  }&#10;}" id="250" addr="0x7fdf085119d0" />
+                <attribute name="method" value="globalin" id="251" addr="0x7fdf085119d0" />
             </attributelist >
 
-            <typemapitem id="252" addr="0x7ff9f1f88e30" >
-                <attributelist id="253" addr="0x7ff9f1f88e30" >
-                    <parmlist id="254" addr="0x7ff9f1f88ed0" >
+            <typemapitem id="252" addr="0x7fdf084dfe30" >
+                <attributelist id="253" addr="0x7fdf084dfe30" >
+                    <parmlist id="254" addr="0x7fdf084dfed0" >
                         <parm id="255">
-                            <attributelist id="256" addr="0x7ff9f1f88ed0" >
-                                <attribute name="type" value="a(ANY).a(ANY).SWIGTYPE" id="257" addr="0x7ff9f1fba9d0" />
+                            <attributelist id="256" addr="0x7fdf084dfed0" >
+                                <attribute name="type" value="a(ANY).a(ANY).SWIGTYPE" id="257" addr="0x7fdf085119d0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -457,2984 +457,2984 @@
              
             </typemapitem >
         </typemap >
-        <insert id="258" addr="0x7ff9f1f89010" >
-            <attributelist id="259" addr="0x7ff9f1f89010" >
-                <attribute name="code" value="&#10;#ifdef __cplusplus&#10;/* SwigValueWrapper is described in swig.swg */&#10;template&lt;typename T> class SwigValueWrapper {&#10;  struct SwigMovePointer {&#10;    T *ptr;&#10;    SwigMovePointer(T *p) : ptr(p) { }&#10;    ~SwigMovePointer() { delete ptr; }&#10;    SwigMovePointer&amp; operator=(SwigMovePointer&amp; rhs) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = rhs.ptr; rhs.ptr = 0; return *this; }&#10;  } pointer;&#10;  SwigValueWrapper&amp; operator=(const SwigValueWrapper&lt;T>&amp; rhs);&#10;  SwigValueWrapper(const SwigValueWrapper&lt;T>&amp; rhs);&#10;public:&#10;  SwigValueWrapper() : pointer(0) { }&#10;  SwigValueWrapper&amp; operator=(const T&amp; t) { SwigMovePointer tmp(new T(t)); pointer = tmp; return *this; }&#10;  operator T&amp;() const { return *pointer.ptr; }&#10;  T *operator&amp;() { return pointer.ptr; }&#10;};" id="260" addr="0x7ff9f1fba9d0" />
-                <attribute name="section" value="runtime" id="261" addr="0x7ff9f1fba9d0" />
+        <insert id="258" addr="0x7fdf084e0010" >
+            <attributelist id="259" addr="0x7fdf084e0010" >
+                <attribute name="code" value="&#10;#ifdef __cplusplus&#10;/* SwigValueWrapper is described in swig.swg */&#10;template&lt;typename T> class SwigValueWrapper {&#10;  struct SwigMovePointer {&#10;    T *ptr;&#10;    SwigMovePointer(T *p) : ptr(p) { }&#10;    ~SwigMovePointer() { delete ptr; }&#10;    SwigMovePointer&amp; operator=(SwigMovePointer&amp; rhs) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = rhs.ptr; rhs.ptr = 0; return *this; }&#10;  } pointer;&#10;  SwigValueWrapper&amp; operator=(const SwigValueWrapper&lt;T>&amp; rhs);&#10;  SwigValueWrapper(const SwigValueWrapper&lt;T>&amp; rhs);&#10;public:&#10;  SwigValueWrapper() : pointer(0) { }&#10;  SwigValueWrapper&amp; operator=(const T&amp; t) { SwigMovePointer tmp(new T(t)); pointer = tmp; return *this; }&#10;  operator T&amp;() const { return *pointer.ptr; }&#10;  T *operator&amp;() { return pointer.ptr; }&#10;};" id="260" addr="0x7fdf085119d0" />
+                <attribute name="section" value="runtime" id="261" addr="0x7fdf085119d0" />
             </attributelist >
          
         </insert >
-        <insert id="262" addr="0x7ff9f1f890f0" >
-            <attributelist id="263" addr="0x7ff9f1f890f0" >
-                <attribute name="code" value="&#10;template &lt;typename T> T SwigValueInit() {&#10;  return T();&#10;}&#10;#endif&#10;" id="264" addr="0x7ff9f1fba9d0" />
-                <attribute name="section" value="runtime" id="265" addr="0x7ff9f1fba9d0" />
+        <insert id="262" addr="0x7fdf084e00f0" >
+            <attributelist id="263" addr="0x7fdf084e00f0" >
+                <attribute name="code" value="&#10;template &lt;typename T> T SwigValueInit() {&#10;  return T();&#10;}&#10;#endif&#10;" id="264" addr="0x7fdf085119d0" />
+                <attribute name="section" value="runtime" id="265" addr="0x7fdf085119d0" />
             </attributelist >
          
         </insert >
-        <insert id="266" addr="0x7ff9f1f891d0" >
-            <attributelist id="267" addr="0x7ff9f1f891d0" >
-                <attribute name="code" value="/* -----------------------------------------------------------------------------&#10; *  This section contains generic SWIG labels for method/variable&#10; *  declarations/attributes, and other compiler dependent labels.&#10; * ----------------------------------------------------------------------------- */&#10;&#10;/* template workaround for compilers that cannot correctly implement the C++ standard */&#10;#ifndef SWIGTEMPLATEDISAMBIGUATOR&#10;# if defined(__SUNPRO_CC) &amp;&amp; (__SUNPRO_CC &lt;= 0x560)&#10;#  define SWIGTEMPLATEDISAMBIGUATOR template&#10;# elif defined(__HP_aCC)&#10;/* Needed even with `aCC -AA' when `aCC -V' reports HP ANSI C++ B3910B A.03.55 */&#10;/* If we find a maximum version that requires this, the test would be __HP_aCC &lt;= 35500 for A.03.55 */&#10;#  define SWIGTEMPLATEDISAMBIGUATOR template&#10;# else&#10;#  define SWIGTEMPLATEDISAMBIGUATOR&#10;# endif&#10;#endif&#10;&#10;/* inline attribute */&#10;#ifndef SWIGINLINE&#10;# if defined(__cplusplus) || (defined(__GNUC__) &amp;&amp; !defined(__STRICT_ANSI__))&#10;#   define SWIGINLINE inline&#10;# else&#10;#   define SWIGINLINE&#10;# endif&#10;#endif&#10;&#10;/* attribute recognised by some compilers to avoid 'unused' warnings */&#10;#ifndef SWIGUNUSED&#10;# if defined(__GNUC__)&#10;#   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 &amp;&amp; __GNUC_MINOR__ >= 4))&#10;#     define SWIGUNUSED __attribute__ ((__unused__))&#10;#   else&#10;#     define SWIGUNUSED&#10;#   endif&#10;# elif defined(__ICC)&#10;#   define SWIGUNUSED __attribute__ ((__unused__))&#10;# else&#10;#   define SWIGUNUSED&#10;# endif&#10;#endif&#10;&#10;#ifndef SWIG_MSC_UNSUPPRESS_4505&#10;# if defined(_MSC_VER)&#10;#   pragma warning(disable : 4505) /* unreferenced local function has been removed */&#10;# endif&#10;#endif&#10;&#10;#ifndef SWIGUNUSEDPARM&#10;# ifdef __cplusplus&#10;#   define SWIGUNUSEDPARM(p)&#10;# else&#10;#   define SWIGUNUSEDPARM(p) p SWIGUNUSED&#10;# endif&#10;#endif&#10;&#10;/* internal SWIG method */&#10;#ifndef SWIGINTERN&#10;# define SWIGINTERN static SWIGUNUSED&#10;#endif&#10;&#10;/* internal inline SWIG method */&#10;#ifndef SWIGINTERNINLINE&#10;# define SWIGINTERNINLINE SWIGINTERN SWIGINLINE&#10;#endif&#10;&#10;/* exporting methods */&#10;#if defined(__GNUC__)&#10;#  if (__GNUC__ >= 4) || (__GNUC__ == 3 &amp;&amp; __GNUC_MINOR__ >= 4)&#10;#    ifndef GCC_HASCLASSVISIBILITY&#10;#      define GCC_HASCLASSVISIBILITY&#10;#    endif&#10;#  endif&#10;#endif&#10;&#10;#ifndef SWIGEXPORT&#10;# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)&#10;#   if defined(STATIC_LINKED)&#10;#     define SWIGEXPORT&#10;#   else&#10;#     define SWIGEXPORT __declspec(dllexport)&#10;#   endif&#10;# else&#10;#   if defined(__GNUC__) &amp;&amp; defined(GCC_HASCLASSVISIBILITY)&#10;#     define SWIGEXPORT __attribute__ ((visibility(&quot;default&quot;)))&#10;#   else&#10;#     define SWIGEXPORT&#10;#   endif&#10;# endif&#10;#endif&#10;&#10;/* calling conventions for Windows */&#10;#ifndef SWIGSTDCALL&#10;# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)&#10;#   define SWIGSTDCALL __stdcall&#10;# else&#10;#   define SWIGSTDCALL&#10;# endif&#10;#endif&#10;&#10;/* Deal with Microsoft's attempt at deprecating C standard runtime functions */&#10;#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) &amp;&amp; defined(_MSC_VER) &amp;&amp; !defined(_CRT_SECURE_NO_DEPRECATE)&#10;# define _CRT_SECURE_NO_DEPRECATE&#10;#endif&#10;&#10;/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */&#10;#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) &amp;&amp; defined(_MSC_VER) &amp;&amp; !defined(_SCL_SECURE_NO_DEPRECATE)&#10;# define _SCL_SECURE_NO_DEPRECATE&#10;#endif&#10;&#10;/* Deal with Apple's deprecated 'AssertMacros.h' from Carbon-framework */&#10;#if defined(__APPLE__) &amp;&amp; !defined(__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES)&#10;# define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0&#10;#endif&#10;&#10;/* Intel's compiler complains if a variable which was never initialised is&#10; * cast to void, which is a common idiom which we use to indicate that we&#10; * are aware a variable isn't used.  So we just silence that warning.&#10; * See: https://github.com/swig/swig/issues/192 for more discussion.&#10; */&#10;#ifdef __INTEL_COMPILER&#10;# pragma warning disable 592&#10;#endif&#10;" id="268" addr="0x7ff9f1fba9d0" />
-                <attribute name="section" value="runtime" id="269" addr="0x7ff9f1fba9d0" />
+        <insert id="266" addr="0x7fdf084e01d0" >
+            <attributelist id="267" addr="0x7fdf084e01d0" >
+                <attribute name="code" value="/* -----------------------------------------------------------------------------&#10; *  This section contains generic SWIG labels for method/variable&#10; *  declarations/attributes, and other compiler dependent labels.&#10; * ----------------------------------------------------------------------------- */&#10;&#10;/* template workaround for compilers that cannot correctly implement the C++ standard */&#10;#ifndef SWIGTEMPLATEDISAMBIGUATOR&#10;# if defined(__SUNPRO_CC) &amp;&amp; (__SUNPRO_CC &lt;= 0x560)&#10;#  define SWIGTEMPLATEDISAMBIGUATOR template&#10;# elif defined(__HP_aCC)&#10;/* Needed even with `aCC -AA' when `aCC -V' reports HP ANSI C++ B3910B A.03.55 */&#10;/* If we find a maximum version that requires this, the test would be __HP_aCC &lt;= 35500 for A.03.55 */&#10;#  define SWIGTEMPLATEDISAMBIGUATOR template&#10;# else&#10;#  define SWIGTEMPLATEDISAMBIGUATOR&#10;# endif&#10;#endif&#10;&#10;/* inline attribute */&#10;#ifndef SWIGINLINE&#10;# if defined(__cplusplus) || (defined(__GNUC__) &amp;&amp; !defined(__STRICT_ANSI__))&#10;#   define SWIGINLINE inline&#10;# else&#10;#   define SWIGINLINE&#10;# endif&#10;#endif&#10;&#10;/* attribute recognised by some compilers to avoid 'unused' warnings */&#10;#ifndef SWIGUNUSED&#10;# if defined(__GNUC__)&#10;#   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 &amp;&amp; __GNUC_MINOR__ >= 4))&#10;#     define SWIGUNUSED __attribute__ ((__unused__))&#10;#   else&#10;#     define SWIGUNUSED&#10;#   endif&#10;# elif defined(__ICC)&#10;#   define SWIGUNUSED __attribute__ ((__unused__))&#10;# else&#10;#   define SWIGUNUSED&#10;# endif&#10;#endif&#10;&#10;#ifndef SWIG_MSC_UNSUPPRESS_4505&#10;# if defined(_MSC_VER)&#10;#   pragma warning(disable : 4505) /* unreferenced local function has been removed */&#10;# endif&#10;#endif&#10;&#10;#ifndef SWIGUNUSEDPARM&#10;# ifdef __cplusplus&#10;#   define SWIGUNUSEDPARM(p)&#10;# else&#10;#   define SWIGUNUSEDPARM(p) p SWIGUNUSED&#10;# endif&#10;#endif&#10;&#10;/* internal SWIG method */&#10;#ifndef SWIGINTERN&#10;# define SWIGINTERN static SWIGUNUSED&#10;#endif&#10;&#10;/* internal inline SWIG method */&#10;#ifndef SWIGINTERNINLINE&#10;# define SWIGINTERNINLINE SWIGINTERN SWIGINLINE&#10;#endif&#10;&#10;/* exporting methods */&#10;#if defined(__GNUC__)&#10;#  if (__GNUC__ >= 4) || (__GNUC__ == 3 &amp;&amp; __GNUC_MINOR__ >= 4)&#10;#    ifndef GCC_HASCLASSVISIBILITY&#10;#      define GCC_HASCLASSVISIBILITY&#10;#    endif&#10;#  endif&#10;#endif&#10;&#10;#ifndef SWIGEXPORT&#10;# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)&#10;#   if defined(STATIC_LINKED)&#10;#     define SWIGEXPORT&#10;#   else&#10;#     define SWIGEXPORT __declspec(dllexport)&#10;#   endif&#10;# else&#10;#   if defined(__GNUC__) &amp;&amp; defined(GCC_HASCLASSVISIBILITY)&#10;#     define SWIGEXPORT __attribute__ ((visibility(&quot;default&quot;)))&#10;#   else&#10;#     define SWIGEXPORT&#10;#   endif&#10;# endif&#10;#endif&#10;&#10;/* calling conventions for Windows */&#10;#ifndef SWIGSTDCALL&#10;# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)&#10;#   define SWIGSTDCALL __stdcall&#10;# else&#10;#   define SWIGSTDCALL&#10;# endif&#10;#endif&#10;&#10;/* Deal with Microsoft's attempt at deprecating C standard runtime functions */&#10;#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) &amp;&amp; defined(_MSC_VER) &amp;&amp; !defined(_CRT_SECURE_NO_DEPRECATE)&#10;# define _CRT_SECURE_NO_DEPRECATE&#10;#endif&#10;&#10;/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */&#10;#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) &amp;&amp; defined(_MSC_VER) &amp;&amp; !defined(_SCL_SECURE_NO_DEPRECATE)&#10;# define _SCL_SECURE_NO_DEPRECATE&#10;#endif&#10;&#10;/* Deal with Apple's deprecated 'AssertMacros.h' from Carbon-framework */&#10;#if defined(__APPLE__) &amp;&amp; !defined(__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES)&#10;# define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0&#10;#endif&#10;&#10;/* Intel's compiler complains if a variable which was never initialised is&#10; * cast to void, which is a common idiom which we use to indicate that we&#10; * are aware a variable isn't used.  So we just silence that warning.&#10; * See: https://github.com/swig/swig/issues/192 for more discussion.&#10; */&#10;#ifdef __INTEL_COMPILER&#10;# pragma warning disable 592&#10;#endif&#10;" id="268" addr="0x7fdf085119d0" />
+                <attribute name="section" value="runtime" id="269" addr="0x7fdf085119d0" />
             </attributelist >
          
         </insert >
     </include >
-    <include id="270" addr="0x7ff9f1f89350" >
-        <attributelist id="271" addr="0x7ff9f1f89350" >
-            <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmc.i" id="272" addr="0x7ff9f1fba9d0" />
-            <attribute name="module" value="" id="273" addr="0x7ff9f1f89530" />
-            <attribute name="options" value="0x7ff9f1f892d0" id="274" addr="0x7ff9f1f892d0" />
+    <include id="270" addr="0x7fdf084e0350" >
+        <attributelist id="271" addr="0x7fdf084e0350" >
+            <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmc.i" id="272" addr="0x7fdf085119d0" />
+            <attribute name="module" value="" id="273" addr="0x7fdf084e0530" />
+            <attribute name="options" value="0x7fdf084e02d0" id="274" addr="0x7fdf084e02d0" />
         </attributelist >
 
-        <module id="275" addr="0x7ff9f1f89430" >
-            <attributelist id="276" addr="0x7ff9f1f89430" >
-                <attribute name="name" value="xbmc" id="277" addr="0x7ff9f1fba9d0" />
-                <attribute name="options" value="0x7ff9f1f89410" id="278" addr="0x7ff9f1f89410" />
+        <module id="275" addr="0x7fdf084e0430" >
+            <attributelist id="276" addr="0x7fdf084e0430" >
+                <attribute name="name" value="xbmc" id="277" addr="0x7fdf085119d0" />
+                <attribute name="options" value="0x7fdf084e0410" id="278" addr="0x7fdf084e0410" />
             </attributelist >
          
         </module >
-        <insert id="279" addr="0x7ff9f1f89570" >
-            <attributelist id="280" addr="0x7ff9f1f89570" >
-                <attribute name="code" value="&#10;#if defined(TARGET_WINDOWS)&#10;#  include &lt;windows.h>&#10;#endif&#10;&#10;#include &quot;interfaces/legacy/Player.h&quot;&#10;#include &quot;interfaces/legacy/RenderCapture.h&quot;&#10;#include &quot;interfaces/legacy/Keyboard.h&quot;&#10;#include &quot;interfaces/legacy/ModuleXbmc.h&quot;&#10;#include &quot;interfaces/legacy/Monitor.h&quot;&#10;&#10;using namespace XBMCAddon;&#10;using namespace xbmc;&#10;&#10;#if defined(__GNUG__)&#10;#pragma GCC diagnostic ignored &quot;-Wstrict-aliasing&quot;&#10;#endif&#10;" id="281" addr="0x7ff9f1fba9d0" />
+        <insert id="279" addr="0x7fdf084e0570" >
+            <attributelist id="280" addr="0x7fdf084e0570" >
+                <attribute name="code" value="&#10;#if defined(TARGET_WINDOWS)&#10;#  include &lt;windows.h>&#10;#endif&#10;&#10;#include &quot;interfaces/legacy/Player.h&quot;&#10;#include &quot;interfaces/legacy/RenderCapture.h&quot;&#10;#include &quot;interfaces/legacy/Keyboard.h&quot;&#10;#include &quot;interfaces/legacy/ModuleXbmc.h&quot;&#10;#include &quot;interfaces/legacy/Monitor.h&quot;&#10;&#10;using namespace XBMCAddon;&#10;using namespace xbmc;&#10;&#10;#if defined(__GNUG__)&#10;#pragma GCC diagnostic ignored &quot;-Wstrict-aliasing&quot;&#10;#endif&#10;" id="281" addr="0x7fdf085119d0" />
             </attributelist >
          
         </insert >
-        <include id="282" addr="0x7ff9f1f898d0" >
-            <attributelist id="283" addr="0x7ff9f1f898d0" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/swighelper.h" id="284" addr="0x7ff9f1fba9d0" />
+        <include id="282" addr="0x7fdf084e08d0" >
+            <attributelist id="283" addr="0x7fdf084e08d0" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/swighelper.h" id="284" addr="0x7fdf085119d0" />
             </attributelist >
          
         </include >
-        <include id="285" addr="0x7ff9f1f89b10" >
-            <attributelist id="286" addr="0x7ff9f1f89b10" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/AddonString.h" id="287" addr="0x7ff9f1fba9d0" />
+        <include id="285" addr="0x7fdf084e0b10" >
+            <attributelist id="286" addr="0x7fdf084e0b10" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/AddonString.h" id="287" addr="0x7fdf085119d0" />
             </attributelist >
 
-            <namespace id="288" addr="0x7ff9f1f89c50" >
-                <attributelist id="289" addr="0x7ff9f1f89c50" >
-                    <attribute name="sym_name" value="XBMCAddon" id="290" addr="0x7ff9f1fba9d0" />
-                    <attribute name="name" value="XBMCAddon" id="291" addr="0x7ff9f1fba9d0" />
-                    <attribute name="csym_nextSibling" value="0x7ff9f1f8a210" id="292" addr="0x7ff9f1f8a210" />
-                    <attribute name="sym_nextSibling" value="0x7ff9f1f8a210" id="293" addr="0x7ff9f1f8a210" />
-                    <typescope id="294" addr="0x7ff9f1fb4990" >
-                        <attributelist id="295" addr="0x7ff9f1fb4990" >
-                            <attribute name="name" value="XBMCAddon" id="296" addr="0x7ff9f1fba9d0" />
-                            <typetab id="297" addr="0x7ff9f1fb49d0" >
-                                <attributelist id="298" addr="0x7ff9f1fb49d0" >
-                                    <attribute name="String" value="std::string" id="299" addr="0x7ff9f1fba9d0" />
+            <namespace id="288" addr="0x7fdf084e0c50" >
+                <attributelist id="289" addr="0x7fdf084e0c50" >
+                    <attribute name="sym_name" value="XBMCAddon" id="290" addr="0x7fdf085119d0" />
+                    <attribute name="name" value="XBMCAddon" id="291" addr="0x7fdf085119d0" />
+                    <attribute name="csym_nextSibling" value="0x7fdf084e1210" id="292" addr="0x7fdf084e1210" />
+                    <attribute name="sym_nextSibling" value="0x7fdf084e1210" id="293" addr="0x7fdf084e1210" />
+                    <typescope id="294" addr="0x7fdf0850b990" >
+                        <attributelist id="295" addr="0x7fdf0850b990" >
+                            <attribute name="name" value="XBMCAddon" id="296" addr="0x7fdf085119d0" />
+                            <typetab id="297" addr="0x7fdf0850b9d0" >
+                                <attributelist id="298" addr="0x7fdf0850b9d0" >
+                                    <attribute name="String" value="std::string" id="299" addr="0x7fdf085119d0" />
                                 </attributelist >
-                                <typetabsitem id="300" addr="0x7ff9f1fb4bb0" >
-                                    <attributelist id="301" addr="0x7ff9f1fb4bb0" >
+                                <typetabsitem id="300" addr="0x7fdf0850bbb0" >
+                                    <attributelist id="301" addr="0x7fdf0850bbb0" >
                                     </attributelist >
                                 </typetabsitem >
                             </typetab >
-                            <attribute name="parent" value="0x7ff9f1f72a30" id="302" addr="0x7ff9f1f72a30" />
-                            <attribute name="qname" value="XBMCAddon" id="303" addr="0x7ff9f1fba9d0" />
-                            <attribute name="symtab" value="0x7ff9f1f89bb0" id="304" addr="0x7ff9f1f89bb0" />
+                            <attribute name="parent" value="0x7fdf084c9a30" id="302" addr="0x7fdf084c9a30" />
+                            <attribute name="qname" value="XBMCAddon" id="303" addr="0x7fdf085119d0" />
+                            <attribute name="symtab" value="0x7fdf084e0bb0" id="304" addr="0x7fdf084e0bb0" />
                         </attributelist >
-                        <typescopesitem id="305" addr="0x7ff9f1f89b70" >
-                            <attributelist id="306" addr="0x7ff9f1f89b70" >
+                        <typescopesitem id="305" addr="0x7fdf084e0b70" >
+                            <attributelist id="306" addr="0x7fdf084e0b70" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="307" addr="0x7ff9f1fb49d0" >
-                            <attributelist id="308" addr="0x7ff9f1fb49d0" >
-                                <attribute name="String" value="std::string" id="309" addr="0x7ff9f1fba9d0" />
+                        <typescopesitem id="307" addr="0x7fdf0850b9d0" >
+                            <attributelist id="308" addr="0x7fdf0850b9d0" >
+                                <attribute name="String" value="std::string" id="309" addr="0x7fdf085119d0" />
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="310" addr="0x7ff9f1f72a30" >
-                            <attributelist id="311" addr="0x7ff9f1f72a30" >
-                                <attribute name="name" value="" id="312" addr="0x7ff9f1fba9d0" />
-                                <typetab id="313" addr="0x7ff9f1f72a90" >
-                                    <attributelist id="314" addr="0x7ff9f1f72a90" >
-                                        <attribute name="CGUIDialogKeyboardGeneric" value="CGUIDialogKeyboardGeneric" id="315" addr="0x7ff9f1fba9d0" />
+                        <typescopesitem id="310" addr="0x7fdf084c9a30" >
+                            <attributelist id="311" addr="0x7fdf084c9a30" >
+                                <attribute name="name" value="" id="312" addr="0x7fdf085119d0" />
+                                <typetab id="313" addr="0x7fdf084c9a90" >
+                                    <attributelist id="314" addr="0x7fdf084c9a90" >
+                                        <attribute name="CGUIDialogKeyboardGeneric" value="CGUIDialogKeyboardGeneric" id="315" addr="0x7fdf085119d0" />
                                     </attributelist >
-                                    <typetabsitem id="316" addr="0x7ff9f1fb7950" >
-                                        <attributelist id="317" addr="0x7ff9f1fb7950" >
+                                    <typetabsitem id="316" addr="0x7fdf0850e950" >
+                                        <attributelist id="317" addr="0x7fdf0850e950" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="318" addr="0x7ff9f1fb4ad0" >
-                            <attributelist id="319" addr="0x7ff9f1fb4ad0" >
+                        <typescopesitem id="318" addr="0x7fdf0850bad0" >
+                            <attributelist id="319" addr="0x7fdf0850bad0" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="320" addr="0x7ff9f1f89bb0" >
-                            <attributelist id="321" addr="0x7ff9f1f89bb0" >
-                                <attribute name="name" value="XBMCAddon" id="322" addr="0x7ff9f1fba9d0" />
-                                <attribute name="csymtab" value="0x7ff9f1f89bf0" id="323" addr="0x7ff9f1f89bf0" />
-                                <attribute name="symtab" value="0x7ff9f1f89b90" id="324" addr="0x7ff9f1f89b90" />
+                        <typescopesitem id="320" addr="0x7fdf084e0bb0" >
+                            <attributelist id="321" addr="0x7fdf084e0bb0" >
+                                <attribute name="name" value="XBMCAddon" id="322" addr="0x7fdf085119d0" />
+                                <attribute name="csymtab" value="0x7fdf084e0bf0" id="323" addr="0x7fdf084e0bf0" />
+                                <attribute name="symtab" value="0x7fdf084e0b90" id="324" addr="0x7fdf084e0b90" />
                             </attributelist >
                         </typescopesitem >
                     </typescope >
-                    <attribute name="symtab" value="0x7ff9f1f89bb0" id="325" addr="0x7ff9f1f89bb0" />
-                    <attribute name="sym_symtab" value="0x7ff9f1f72950" id="326" addr="0x7ff9f1f72950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="327" addr="0x7ff9f1fba9d0" />
+                    <attribute name="symtab" value="0x7fdf084e0bb0" id="325" addr="0x7fdf084e0bb0" />
+                    <attribute name="sym_symtab" value="0x7fdf084c9950" id="326" addr="0x7fdf084c9950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="327" addr="0x7fdf085119d0" />
                 </attributelist >
 
-                <cdecl id="328" addr="0x7ff9f1f89d70" >
-                    <attributelist id="329" addr="0x7ff9f1f89d70" >
-                        <attribute name="sym_name" value="String" id="330" addr="0x7ff9f1fba9d0" />
-                        <attribute name="name" value="XBMCAddon::String" id="331" addr="0x7ff9f1fba9d0" />
-                        <attribute name="decl" value="" id="332" addr="0x7ff9f1fba9d0" />
-                        <attribute name="storage" value="typedef" id="333" addr="0x7ff9f1fba9d0" />
-                        <attribute name="kind" value="typedef" id="334" addr="0x7ff9f1fba9d0" />
-                        <attribute name="type" value="std::string" id="335" addr="0x7ff9f1fba9d0" />
-                        <attribute name="sym_symtab" value="0x7ff9f1f89bb0" id="336" addr="0x7ff9f1f89bb0" />
-                        <attribute name="sym_overname" value="__SWIG_0" id="337" addr="0x7ff9f1fba9d0" />
+                <cdecl id="328" addr="0x7fdf084e0d70" >
+                    <attributelist id="329" addr="0x7fdf084e0d70" >
+                        <attribute name="sym_name" value="String" id="330" addr="0x7fdf085119d0" />
+                        <attribute name="name" value="XBMCAddon::String" id="331" addr="0x7fdf085119d0" />
+                        <attribute name="decl" value="" id="332" addr="0x7fdf085119d0" />
+                        <attribute name="storage" value="typedef" id="333" addr="0x7fdf085119d0" />
+                        <attribute name="kind" value="typedef" id="334" addr="0x7fdf085119d0" />
+                        <attribute name="type" value="std::string" id="335" addr="0x7fdf085119d0" />
+                        <attribute name="sym_symtab" value="0x7fdf084e0bb0" id="336" addr="0x7fdf084e0bb0" />
+                        <attribute name="sym_overname" value="__SWIG_0" id="337" addr="0x7fdf085119d0" />
                     </attributelist >
                  
                 </cdecl >
-                <cdecl id="338" addr="0x7ff9f1f89f70" >
-                    <attributelist id="339" addr="0x7ff9f1f89f70" >
-                        <attribute name="sym_name" value="emptyString" id="340" addr="0x7ff9f1fba9d0" />
-                        <attribute name="name" value="XBMCAddon::emptyString" id="341" addr="0x7ff9f1fba9d0" />
-                        <attribute name="decl" value="" id="342" addr="0x7ff9f1fba9d0" />
-                        <attribute name="storage" value="extern" id="343" addr="0x7ff9f1fba9d0" />
-                        <attribute name="kind" value="variable" id="344" addr="0x7ff9f1fba9d0" />
-                        <attribute name="type" value="XBMCAddon::String" id="345" addr="0x7ff9f1fba9d0" />
-                        <attribute name="sym_symtab" value="0x7ff9f1f89bb0" id="346" addr="0x7ff9f1f89bb0" />
-                        <attribute name="sym_overname" value="__SWIG_0" id="347" addr="0x7ff9f1fba9d0" />
+                <cdecl id="338" addr="0x7fdf084e0f70" >
+                    <attributelist id="339" addr="0x7fdf084e0f70" >
+                        <attribute name="sym_name" value="emptyString" id="340" addr="0x7fdf085119d0" />
+                        <attribute name="name" value="XBMCAddon::emptyString" id="341" addr="0x7fdf085119d0" />
+                        <attribute name="decl" value="" id="342" addr="0x7fdf085119d0" />
+                        <attribute name="storage" value="extern" id="343" addr="0x7fdf085119d0" />
+                        <attribute name="kind" value="variable" id="344" addr="0x7fdf085119d0" />
+                        <attribute name="type" value="XBMCAddon::String" id="345" addr="0x7fdf085119d0" />
+                        <attribute name="sym_symtab" value="0x7fdf084e0bb0" id="346" addr="0x7fdf084e0bb0" />
+                        <attribute name="sym_overname" value="__SWIG_0" id="347" addr="0x7fdf085119d0" />
                     </attributelist >
                  
                 </cdecl >
             </namespace >
         </include >
-        <include id="348" addr="0x7ff9f1f8a150" >
-            <attributelist id="349" addr="0x7ff9f1f8a150" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/ModuleXbmc.h" id="350" addr="0x7ff9f1fba9d0" />
+        <include id="348" addr="0x7fdf084e1150" >
+            <attributelist id="349" addr="0x7fdf084e1150" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/ModuleXbmc.h" id="350" addr="0x7fdf085119d0" />
             </attributelist >
 
-            <namespace id="351" addr="0x7ff9f1f8a210" >
-                <attributelist id="352" addr="0x7ff9f1f8a210" >
-                    <attribute name="sym_name" value="XBMCAddon" id="353" addr="0x7ff9f1fba9d0" />
-                    <attribute name="name" value="XBMCAddon" id="354" addr="0x7ff9f1fba9d0" />
-                    <attribute name="sym_previousSibling" value="0x7ff9f1f89c50" id="355" addr="0x7ff9f1f89c50" />
-                    <attribute name="csym_nextSibling" value="0x7ff9f1f949b0" id="356" addr="0x7ff9f1f949b0" />
-                    <attribute name="sym_nextSibling" value="0x7ff9f1f949b0" id="357" addr="0x7ff9f1f949b0" />
-                    <typescope id="358" addr="0x7ff9f1fb4990" >
-                        <attributelist id="359" addr="0x7ff9f1fb4990" >
-                            <attribute name="name" value="XBMCAddon" id="360" addr="0x7ff9f1fba9d0" />
-                            <typetab id="361" addr="0x7ff9f1fb49d0" >
-                                <attributelist id="362" addr="0x7ff9f1fb49d0" >
-                                    <attribute name="String" value="std::string" id="363" addr="0x7ff9f1fba9d0" />
+            <namespace id="351" addr="0x7fdf084e1210" >
+                <attributelist id="352" addr="0x7fdf084e1210" >
+                    <attribute name="sym_name" value="XBMCAddon" id="353" addr="0x7fdf085119d0" />
+                    <attribute name="name" value="XBMCAddon" id="354" addr="0x7fdf085119d0" />
+                    <attribute name="sym_previousSibling" value="0x7fdf084e0c50" id="355" addr="0x7fdf084e0c50" />
+                    <attribute name="csym_nextSibling" value="0x7fdf084eb9b0" id="356" addr="0x7fdf084eb9b0" />
+                    <attribute name="sym_nextSibling" value="0x7fdf084eb9b0" id="357" addr="0x7fdf084eb9b0" />
+                    <typescope id="358" addr="0x7fdf0850b990" >
+                        <attributelist id="359" addr="0x7fdf0850b990" >
+                            <attribute name="name" value="XBMCAddon" id="360" addr="0x7fdf085119d0" />
+                            <typetab id="361" addr="0x7fdf0850b9d0" >
+                                <attributelist id="362" addr="0x7fdf0850b9d0" >
+                                    <attribute name="String" value="std::string" id="363" addr="0x7fdf085119d0" />
                                 </attributelist >
-                                <typetabsitem id="364" addr="0x7ff9f1fb4bb0" >
-                                    <attributelist id="365" addr="0x7ff9f1fb4bb0" >
+                                <typetabsitem id="364" addr="0x7fdf0850bbb0" >
+                                    <attributelist id="365" addr="0x7fdf0850bbb0" >
                                     </attributelist >
                                 </typetabsitem >
                             </typetab >
-                            <attribute name="parent" value="0x7ff9f1f72a30" id="366" addr="0x7ff9f1f72a30" />
-                            <attribute name="qname" value="XBMCAddon" id="367" addr="0x7ff9f1fba9d0" />
-                            <attribute name="symtab" value="0x7ff9f1f89bb0" id="368" addr="0x7ff9f1f89bb0" />
+                            <attribute name="parent" value="0x7fdf084c9a30" id="366" addr="0x7fdf084c9a30" />
+                            <attribute name="qname" value="XBMCAddon" id="367" addr="0x7fdf085119d0" />
+                            <attribute name="symtab" value="0x7fdf084e0bb0" id="368" addr="0x7fdf084e0bb0" />
                         </attributelist >
-                        <typescopesitem id="369" addr="0x7ff9f1f89b70" >
-                            <attributelist id="370" addr="0x7ff9f1f89b70" >
+                        <typescopesitem id="369" addr="0x7fdf084e0b70" >
+                            <attributelist id="370" addr="0x7fdf084e0b70" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="371" addr="0x7ff9f1fb49d0" >
-                            <attributelist id="372" addr="0x7ff9f1fb49d0" >
-                                <attribute name="String" value="std::string" id="373" addr="0x7ff9f1fba9d0" />
+                        <typescopesitem id="371" addr="0x7fdf0850b9d0" >
+                            <attributelist id="372" addr="0x7fdf0850b9d0" >
+                                <attribute name="String" value="std::string" id="373" addr="0x7fdf085119d0" />
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="374" addr="0x7ff9f1f72a30" >
-                            <attributelist id="375" addr="0x7ff9f1f72a30" >
-                                <attribute name="name" value="" id="376" addr="0x7ff9f1fba9d0" />
-                                <typetab id="377" addr="0x7ff9f1f72a90" >
-                                    <attributelist id="378" addr="0x7ff9f1f72a90" >
-                                        <attribute name="CGUIDialogKeyboardGeneric" value="CGUIDialogKeyboardGeneric" id="379" addr="0x7ff9f1fba9d0" />
+                        <typescopesitem id="374" addr="0x7fdf084c9a30" >
+                            <attributelist id="375" addr="0x7fdf084c9a30" >
+                                <attribute name="name" value="" id="376" addr="0x7fdf085119d0" />
+                                <typetab id="377" addr="0x7fdf084c9a90" >
+                                    <attributelist id="378" addr="0x7fdf084c9a90" >
+                                        <attribute name="CGUIDialogKeyboardGeneric" value="CGUIDialogKeyboardGeneric" id="379" addr="0x7fdf085119d0" />
                                     </attributelist >
-                                    <typetabsitem id="380" addr="0x7ff9f1fb7950" >
-                                        <attributelist id="381" addr="0x7ff9f1fb7950" >
+                                    <typetabsitem id="380" addr="0x7fdf0850e950" >
+                                        <attributelist id="381" addr="0x7fdf0850e950" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="382" addr="0x7ff9f1fb4ad0" >
-                            <attributelist id="383" addr="0x7ff9f1fb4ad0" >
+                        <typescopesitem id="382" addr="0x7fdf0850bad0" >
+                            <attributelist id="383" addr="0x7fdf0850bad0" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="384" addr="0x7ff9f1f89bb0" >
-                            <attributelist id="385" addr="0x7ff9f1f89bb0" >
-                                <attribute name="name" value="XBMCAddon" id="386" addr="0x7ff9f1fba9d0" />
-                                <attribute name="csymtab" value="0x7ff9f1f89bf0" id="387" addr="0x7ff9f1f89bf0" />
-                                <attribute name="symtab" value="0x7ff9f1f89b90" id="388" addr="0x7ff9f1f89b90" />
+                        <typescopesitem id="384" addr="0x7fdf084e0bb0" >
+                            <attributelist id="385" addr="0x7fdf084e0bb0" >
+                                <attribute name="name" value="XBMCAddon" id="386" addr="0x7fdf085119d0" />
+                                <attribute name="csymtab" value="0x7fdf084e0bf0" id="387" addr="0x7fdf084e0bf0" />
+                                <attribute name="symtab" value="0x7fdf084e0b90" id="388" addr="0x7fdf084e0b90" />
                             </attributelist >
                         </typescopesitem >
                     </typescope >
-                    <attribute name="symtab" value="0x7ff9f1f89bb0" id="389" addr="0x7ff9f1f89bb0" />
-                    <attribute name="sym_symtab" value="0x7ff9f1f72950" id="390" addr="0x7ff9f1f72950" />
+                    <attribute name="symtab" value="0x7fdf084e0bb0" id="389" addr="0x7fdf084e0bb0" />
+                    <attribute name="sym_symtab" value="0x7fdf084c9950" id="390" addr="0x7fdf084c9950" />
                 </attributelist >
 
-                <namespace id="391" addr="0x7ff9f1f8a330" >
-                    <attributelist id="392" addr="0x7ff9f1f8a330" >
-                        <attribute name="feature_knownbasetypes" value="AddonClass,IPlayerCallback,AddonCallback" id="393" addr="0x7ff9f1fba9d0" />
-                        <attribute name="name" value="xbmc" id="394" addr="0x7ff9f1fba9d0" />
-                        <attribute name="sym_symtab" value="0x7ff9f1f89bb0" id="395" addr="0x7ff9f1f89bb0" />
-                        <attribute name="symtab" value="0x7ff9f1f8a2b0" id="396" addr="0x7ff9f1f8a2b0" />
-                        <attribute name="sym_nextSibling" value="0x7ff9f1f94a30" id="397" addr="0x7ff9f1f94a30" />
-                        <attribute name="csym_nextSibling" value="0x7ff9f1f94a30" id="398" addr="0x7ff9f1f94a30" />
-                        <attribute name="feature_knownapitypes" value="XBMCAddon::xbmcgui::ListItem,XBMCAddon::xbmc::PlayListItem" id="399" addr="0x7ff9f1fba9d0" />
-                        <attribute name="sym_name" value="xbmc" id="400" addr="0x7ff9f1fba9d0" />
-                        <attribute name="sym_overname" value="__SWIG_0" id="401" addr="0x7ff9f1fba9d0" />
-                        <typescope id="402" addr="0x7ff9f1fb4d70" >
-                            <attributelist id="403" addr="0x7ff9f1fb4d70" >
-                                <attribute name="name" value="xbmc" id="404" addr="0x7ff9f1fba9d0" />
-                                <typetab id="405" addr="0x7ff9f1fb4d90" >
-                                    <attributelist id="406" addr="0x7ff9f1fb4d90" >
-                                        <attribute name="Monitor" value="Monitor" id="407" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="408" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="Keyboard" value="Keyboard" id="409" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="410" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="InfoTagVideo" value="InfoTagVideo" id="411" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="Player" value="Player" id="412" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="InfoTagMusic" value="InfoTagMusic" id="413" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="PlayList" value="PlayList" id="414" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="RenderCapture" value="RenderCapture" id="415" addr="0x7ff9f1fba9d0" />
+                <namespace id="391" addr="0x7fdf084e1330" >
+                    <attributelist id="392" addr="0x7fdf084e1330" >
+                        <attribute name="feature_knownbasetypes" value="AddonClass,IPlayerCallback,AddonCallback" id="393" addr="0x7fdf085119d0" />
+                        <attribute name="name" value="xbmc" id="394" addr="0x7fdf085119d0" />
+                        <attribute name="sym_symtab" value="0x7fdf084e0bb0" id="395" addr="0x7fdf084e0bb0" />
+                        <attribute name="symtab" value="0x7fdf084e12b0" id="396" addr="0x7fdf084e12b0" />
+                        <attribute name="sym_nextSibling" value="0x7fdf084eba30" id="397" addr="0x7fdf084eba30" />
+                        <attribute name="csym_nextSibling" value="0x7fdf084eba30" id="398" addr="0x7fdf084eba30" />
+                        <attribute name="feature_knownapitypes" value="XBMCAddon::xbmcgui::ListItem,XBMCAddon::xbmc::PlayListItem" id="399" addr="0x7fdf085119d0" />
+                        <attribute name="sym_name" value="xbmc" id="400" addr="0x7fdf085119d0" />
+                        <attribute name="sym_overname" value="__SWIG_0" id="401" addr="0x7fdf085119d0" />
+                        <typescope id="402" addr="0x7fdf0850bd70" >
+                            <attributelist id="403" addr="0x7fdf0850bd70" >
+                                <attribute name="name" value="xbmc" id="404" addr="0x7fdf085119d0" />
+                                <typetab id="405" addr="0x7fdf0850bd90" >
+                                    <attributelist id="406" addr="0x7fdf0850bd90" >
+                                        <attribute name="Monitor" value="Monitor" id="407" addr="0x7fdf085119d0" />
+                                        <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="408" addr="0x7fdf085119d0" />
+                                        <attribute name="Keyboard" value="Keyboard" id="409" addr="0x7fdf085119d0" />
+                                        <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="410" addr="0x7fdf085119d0" />
+                                        <attribute name="InfoTagVideo" value="InfoTagVideo" id="411" addr="0x7fdf085119d0" />
+                                        <attribute name="Player" value="Player" id="412" addr="0x7fdf085119d0" />
+                                        <attribute name="InfoTagMusic" value="InfoTagMusic" id="413" addr="0x7fdf085119d0" />
+                                        <attribute name="PlayList" value="PlayList" id="414" addr="0x7fdf085119d0" />
+                                        <attribute name="RenderCapture" value="RenderCapture" id="415" addr="0x7fdf085119d0" />
                                     </attributelist >
-                                    <typetabsitem id="416" addr="0x7ff9f1fb9b10" >
-                                        <attributelist id="417" addr="0x7ff9f1fb9b10" >
+                                    <typetabsitem id="416" addr="0x7fdf08510b10" >
+                                        <attributelist id="417" addr="0x7fdf08510b10" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="418" addr="0x7ff9f1fb7f30" >
-                                        <attributelist id="419" addr="0x7ff9f1fb7f30" >
+                                    <typetabsitem id="418" addr="0x7fdf0850ef30" >
+                                        <attributelist id="419" addr="0x7fdf0850ef30" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="420" addr="0x7ff9f1fb8990" >
-                                        <attributelist id="421" addr="0x7ff9f1fb8990" >
+                                    <typetabsitem id="420" addr="0x7fdf0850f990" >
+                                        <attributelist id="421" addr="0x7fdf0850f990" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="422" addr="0x7ff9f1fb5e90" >
-                                        <attributelist id="423" addr="0x7ff9f1fb5e90" >
+                                    <typetabsitem id="422" addr="0x7fdf0850ce90" >
+                                        <attributelist id="423" addr="0x7fdf0850ce90" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="424" addr="0x7ff9f1fb8310" >
-                                        <attributelist id="425" addr="0x7ff9f1fb8310" >
+                                    <typetabsitem id="424" addr="0x7fdf0850f310" >
+                                        <attributelist id="425" addr="0x7fdf0850f310" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="426" addr="0x7ff9f1fb6050" >
-                                        <attributelist id="427" addr="0x7ff9f1fb6050" >
+                                    <typetabsitem id="426" addr="0x7fdf0850d050" >
+                                        <attributelist id="427" addr="0x7fdf0850d050" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="428" addr="0x7ff9f1fb7b50" >
-                                        <attributelist id="429" addr="0x7ff9f1fb7b50" >
+                                    <typetabsitem id="428" addr="0x7fdf0850eb50" >
+                                        <attributelist id="429" addr="0x7fdf0850eb50" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="430" addr="0x7ff9f1fb91b0" >
-                                        <attributelist id="431" addr="0x7ff9f1fb91b0" >
+                                    <typetabsitem id="430" addr="0x7fdf085101b0" >
+                                        <attributelist id="431" addr="0x7fdf085101b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="432" addr="0x7ff9f1fb7490" >
-                                        <attributelist id="433" addr="0x7ff9f1fb7490" >
+                                    <typetabsitem id="432" addr="0x7fdf0850e490" >
+                                        <attributelist id="433" addr="0x7fdf0850e490" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
-                                <attribute name="parent" value="0x7ff9f1fb4990" id="434" addr="0x7ff9f1fb4990" />
-                                <attribute name="qname" value="XBMCAddon::xbmc" id="435" addr="0x7ff9f1fba9d0" />
-                                <attribute name="symtab" value="0x7ff9f1f8a2b0" id="436" addr="0x7ff9f1f8a2b0" />
+                                <attribute name="parent" value="0x7fdf0850b990" id="434" addr="0x7fdf0850b990" />
+                                <attribute name="qname" value="XBMCAddon::xbmc" id="435" addr="0x7fdf085119d0" />
+                                <attribute name="symtab" value="0x7fdf084e12b0" id="436" addr="0x7fdf084e12b0" />
                             </attributelist >
-                            <typescopesitem id="437" addr="0x7ff9f1f8a270" >
-                                <attributelist id="438" addr="0x7ff9f1f8a270" >
+                            <typescopesitem id="437" addr="0x7fdf084e1270" >
+                                <attributelist id="438" addr="0x7fdf084e1270" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="439" addr="0x7ff9f1fb4d90" >
-                                <attributelist id="440" addr="0x7ff9f1fb4d90" >
-                                    <attribute name="Monitor" value="Monitor" id="441" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="442" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="Keyboard" value="Keyboard" id="443" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="444" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="InfoTagVideo" value="InfoTagVideo" id="445" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="Player" value="Player" id="446" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="InfoTagMusic" value="InfoTagMusic" id="447" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="PlayList" value="PlayList" id="448" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="RenderCapture" value="RenderCapture" id="449" addr="0x7ff9f1fba9d0" />
+                            <typescopesitem id="439" addr="0x7fdf0850bd90" >
+                                <attributelist id="440" addr="0x7fdf0850bd90" >
+                                    <attribute name="Monitor" value="Monitor" id="441" addr="0x7fdf085119d0" />
+                                    <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="442" addr="0x7fdf085119d0" />
+                                    <attribute name="Keyboard" value="Keyboard" id="443" addr="0x7fdf085119d0" />
+                                    <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="444" addr="0x7fdf085119d0" />
+                                    <attribute name="InfoTagVideo" value="InfoTagVideo" id="445" addr="0x7fdf085119d0" />
+                                    <attribute name="Player" value="Player" id="446" addr="0x7fdf085119d0" />
+                                    <attribute name="InfoTagMusic" value="InfoTagMusic" id="447" addr="0x7fdf085119d0" />
+                                    <attribute name="PlayList" value="PlayList" id="448" addr="0x7fdf085119d0" />
+                                    <attribute name="RenderCapture" value="RenderCapture" id="449" addr="0x7fdf085119d0" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="450" addr="0x7ff9f1fb4990" >
-                                <attributelist id="451" addr="0x7ff9f1fb4990" >
-                                    <attribute name="name" value="XBMCAddon" id="452" addr="0x7ff9f1fba9d0" />
-                                    <typetab id="453" addr="0x7ff9f1fb49d0" >
-                                        <attributelist id="454" addr="0x7ff9f1fb49d0" >
-                                            <attribute name="String" value="std::string" id="455" addr="0x7ff9f1fba9d0" />
-                                        </attributelist >
-                                        <typetabsitem id="456" addr="0x7ff9f1fb4bb0" >
-                                            <attributelist id="457" addr="0x7ff9f1fb4bb0" >
+                            <typescopesitem id="450" addr="0x7fdf0850b990" >
+                                <attributelist id="451" addr="0x7fdf0850b990" >
+                                    <attribute name="name" value="XBMCAddon" id="452" addr="0x7fdf085119d0" />
+                                    <typetab id="453" addr="0x7fdf0850b9d0" >
+                                        <attributelist id="454" addr="0x7fdf0850b9d0" >
+                                            <attribute name="String" value="std::string" id="455" addr="0x7fdf085119d0" />
+                                        </attributelist >
+                                        <typetabsitem id="456" addr="0x7fdf0850bbb0" >
+                                            <attributelist id="457" addr="0x7fdf0850bbb0" >
                                             </attributelist >
                                         </typetabsitem >
                                     </typetab >
-                                    <attribute name="parent" value="0x7ff9f1f72a30" id="458" addr="0x7ff9f1f72a30" />
-                                    <attribute name="qname" value="XBMCAddon" id="459" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="symtab" value="0x7ff9f1f89bb0" id="460" addr="0x7ff9f1f89bb0" />
+                                    <attribute name="parent" value="0x7fdf084c9a30" id="458" addr="0x7fdf084c9a30" />
+                                    <attribute name="qname" value="XBMCAddon" id="459" addr="0x7fdf085119d0" />
+                                    <attribute name="symtab" value="0x7fdf084e0bb0" id="460" addr="0x7fdf084e0bb0" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="461" addr="0x7ff9f1fb4db0" >
-                                <attributelist id="462" addr="0x7ff9f1fb4db0" >
+                            <typescopesitem id="461" addr="0x7fdf0850bdb0" >
+                                <attributelist id="462" addr="0x7fdf0850bdb0" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="463" addr="0x7ff9f1f8a2b0" >
-                                <attributelist id="464" addr="0x7ff9f1f8a2b0" >
-                                    <attribute name="name" value="xbmc" id="465" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="csymtab" value="0x7ff9f1f8a2f0" id="466" addr="0x7ff9f1f8a2f0" />
-                                    <attribute name="symtab" value="0x7ff9f1f8a290" id="467" addr="0x7ff9f1f8a290" />
+                            <typescopesitem id="463" addr="0x7fdf084e12b0" >
+                                <attributelist id="464" addr="0x7fdf084e12b0" >
+                                    <attribute name="name" value="xbmc" id="465" addr="0x7fdf085119d0" />
+                                    <attribute name="csymtab" value="0x7fdf084e12f0" id="466" addr="0x7fdf084e12f0" />
+                                    <attribute name="symtab" value="0x7fdf084e1290" id="467" addr="0x7fdf084e1290" />
                                 </attributelist >
                             </typescopesitem >
                         </typescope >
                     </attributelist >
 
-                    <cdecl id="468" addr="0x7ff9f1f8a6f0" >
-                        <attributelist id="469" addr="0x7ff9f1f8a6f0" >
-                            <attribute name="name" value="XBMCAddon::xbmc::log" id="470" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="471" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_nextSibling" value="0x7ff9f1f8a850" id="472" addr="0x7ff9f1f8a850" />
-                            <attribute name="csym_nextSibling" value="0x7ff9f1f8a850" id="473" addr="0x7ff9f1f8a850" />
-                            <attribute name="kind" value="function" id="474" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_name" value="log" id="475" addr="0x7ff9f1fba9d0" />
-                            <attribute name="decl" value="f(p.q(const).char,int)." id="476" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_overloaded" value="0x7ff9f1f8a6f0" id="477" addr="0x7ff9f1f8a6f0" />
-                            <parmlist id="478" addr="0x7ff9f1f8a4b0" >
+                    <cdecl id="468" addr="0x7fdf084e16f0" >
+                        <attributelist id="469" addr="0x7fdf084e16f0" >
+                            <attribute name="name" value="XBMCAddon::xbmc::log" id="470" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="471" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_nextSibling" value="0x7fdf084e1850" id="472" addr="0x7fdf084e1850" />
+                            <attribute name="csym_nextSibling" value="0x7fdf084e1850" id="473" addr="0x7fdf084e1850" />
+                            <attribute name="kind" value="function" id="474" addr="0x7fdf085119d0" />
+                            <attribute name="sym_name" value="log" id="475" addr="0x7fdf085119d0" />
+                            <attribute name="decl" value="f(p.q(const).char,int)." id="476" addr="0x7fdf085119d0" />
+                            <attribute name="sym_overloaded" value="0x7fdf084e16f0" id="477" addr="0x7fdf084e16f0" />
+                            <parmlist id="478" addr="0x7fdf084e14b0" >
                                 <parm id="479">
-                                    <attributelist id="480" addr="0x7ff9f1f8a4b0" >
-                                        <attribute name="name" value="msg" id="481" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="p.q(const).char" id="482" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="480" addr="0x7fdf084e14b0" >
+                                        <attribute name="name" value="msg" id="481" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="p.q(const).char" id="482" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                                 <parm id="483">
-                                    <attributelist id="484" addr="0x7ff9f1f8a630" >
-                                        <attribute name="name" value="level" id="485" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="value" value="lLOGDEBUG" id="486" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="int" id="487" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="484" addr="0x7fdf084e1630" >
+                                        <attribute name="name" value="level" id="485" addr="0x7fdf085119d0" />
+                                        <attribute name="value" value="lLOGDEBUG" id="486" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="int" id="487" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="type" value="void" id="488" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="489" addr="0x7ff9f1fba9d0" />
+                            <attribute name="type" value="void" id="488" addr="0x7fdf085119d0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="489" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="490" addr="0x7ff9f1f8a850" >
-                        <attributelist id="491" addr="0x7ff9f1f8a850" >
-                            <attribute name="name" value="XBMCAddon::xbmc::log" id="492" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="493" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_previousSibling" value="0x7ff9f1f8a6f0" id="494" addr="0x7ff9f1f8a6f0" />
-                            <attribute name="kind" value="function" id="495" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_name" value="log" id="496" addr="0x7ff9f1fba9d0" />
-                            <attribute name="defaultargs" value="0x7ff9f1f8a6f0" id="497" addr="0x7ff9f1f8a6f0" />
-                            <attribute name="decl" value="f(p.q(const).char)." id="498" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_overloaded" value="0x7ff9f1f8a6f0" id="499" addr="0x7ff9f1f8a6f0" />
-                            <parmlist id="500" addr="0x7ff9f1f8a750" >
+                    <cdecl id="490" addr="0x7fdf084e1850" >
+                        <attributelist id="491" addr="0x7fdf084e1850" >
+                            <attribute name="name" value="XBMCAddon::xbmc::log" id="492" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="493" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_previousSibling" value="0x7fdf084e16f0" id="494" addr="0x7fdf084e16f0" />
+                            <attribute name="kind" value="function" id="495" addr="0x7fdf085119d0" />
+                            <attribute name="sym_name" value="log" id="496" addr="0x7fdf085119d0" />
+                            <attribute name="defaultargs" value="0x7fdf084e16f0" id="497" addr="0x7fdf084e16f0" />
+                            <attribute name="decl" value="f(p.q(const).char)." id="498" addr="0x7fdf085119d0" />
+                            <attribute name="sym_overloaded" value="0x7fdf084e16f0" id="499" addr="0x7fdf084e16f0" />
+                            <parmlist id="500" addr="0x7fdf084e1750" >
                                 <parm id="501">
-                                    <attributelist id="502" addr="0x7ff9f1f8a750" >
-                                        <attribute name="name" value="msg" id="503" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="p.q(const).char" id="504" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="502" addr="0x7fdf084e1750" >
+                                        <attribute name="name" value="msg" id="503" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="p.q(const).char" id="504" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="type" value="void" id="505" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_overname" value="__SWIG_1" id="506" addr="0x7ff9f1fba9d0" />
+                            <attribute name="type" value="void" id="505" addr="0x7fdf085119d0" />
+                            <attribute name="sym_overname" value="__SWIG_1" id="506" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="507" addr="0x7ff9f1f8aa70" >
-                        <attributelist id="508" addr="0x7ff9f1f8aa70" >
-                            <attribute name="sym_name" value="shutdown" id="509" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="XBMCAddon::xbmc::shutdown" id="510" addr="0x7ff9f1fba9d0" />
-                            <attribute name="decl" value="f()." id="511" addr="0x7ff9f1fba9d0" />
-                            <attribute name="kind" value="function" id="512" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="void" id="513" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="514" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="515" addr="0x7ff9f1fba9d0" />
+                    <cdecl id="507" addr="0x7fdf084e1a70" >
+                        <attributelist id="508" addr="0x7fdf084e1a70" >
+                            <attribute name="sym_name" value="shutdown" id="509" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="XBMCAddon::xbmc::shutdown" id="510" addr="0x7fdf085119d0" />
+                            <attribute name="decl" value="f()." id="511" addr="0x7fdf085119d0" />
+                            <attribute name="kind" value="function" id="512" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="void" id="513" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="514" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="515" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="516" addr="0x7ff9f1f8abf0" >
-                        <attributelist id="517" addr="0x7ff9f1f8abf0" >
-                            <attribute name="sym_name" value="restart" id="518" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="XBMCAddon::xbmc::restart" id="519" addr="0x7ff9f1fba9d0" />
-                            <attribute name="decl" value="f()." id="520" addr="0x7ff9f1fba9d0" />
-                            <attribute name="kind" value="function" id="521" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="void" id="522" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="523" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="524" addr="0x7ff9f1fba9d0" />
+                    <cdecl id="516" addr="0x7fdf084e1bf0" >
+                        <attributelist id="517" addr="0x7fdf084e1bf0" >
+                            <attribute name="sym_name" value="restart" id="518" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="XBMCAddon::xbmc::restart" id="519" addr="0x7fdf085119d0" />
+                            <attribute name="decl" value="f()." id="520" addr="0x7fdf085119d0" />
+                            <attribute name="kind" value="function" id="521" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="void" id="522" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="523" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="524" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="525" addr="0x7ff9f1f8aeb0" >
-                        <attributelist id="526" addr="0x7ff9f1f8aeb0" >
-                            <attribute name="sym_name" value="executescript" id="527" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="XBMCAddon::xbmc::executescript" id="528" addr="0x7ff9f1fba9d0" />
-                            <attribute name="decl" value="f(p.q(const).char)." id="529" addr="0x7ff9f1fba9d0" />
-                            <parmlist id="530" addr="0x7ff9f1f8adf0" >
+                    <cdecl id="525" addr="0x7fdf084e1eb0" >
+                        <attributelist id="526" addr="0x7fdf084e1eb0" >
+                            <attribute name="sym_name" value="executescript" id="527" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="XBMCAddon::xbmc::executescript" id="528" addr="0x7fdf085119d0" />
+                            <attribute name="decl" value="f(p.q(const).char)." id="529" addr="0x7fdf085119d0" />
+                            <parmlist id="530" addr="0x7fdf084e1df0" >
                                 <parm id="531">
-                                    <attributelist id="532" addr="0x7ff9f1f8adf0" >
-                                        <attribute name="name" value="script" id="533" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="p.q(const).char" id="534" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="532" addr="0x7fdf084e1df0" >
+                                        <attribute name="name" value="script" id="533" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="p.q(const).char" id="534" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="kind" value="function" id="535" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="void" id="536" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="537" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="538" addr="0x7ff9f1fba9d0" />
+                            <attribute name="kind" value="function" id="535" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="void" id="536" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="537" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="538" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="539" addr="0x7ff9f1f8b2b0" >
-                        <attributelist id="540" addr="0x7ff9f1f8b2b0" >
-                            <attribute name="name" value="XBMCAddon::xbmc::executebuiltin" id="541" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="542" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_nextSibling" value="0x7ff9f1f8b410" id="543" addr="0x7ff9f1f8b410" />
-                            <attribute name="csym_nextSibling" value="0x7ff9f1f8b410" id="544" addr="0x7ff9f1f8b410" />
-                            <attribute name="kind" value="function" id="545" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_name" value="executebuiltin" id="546" addr="0x7ff9f1fba9d0" />
-                            <attribute name="decl" value="f(p.q(const).char,bool)." id="547" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_overloaded" value="0x7ff9f1f8b2b0" id="548" addr="0x7ff9f1f8b2b0" />
-                            <parmlist id="549" addr="0x7ff9f1f8b0b0" >
+                    <cdecl id="539" addr="0x7fdf084e22b0" >
+                        <attributelist id="540" addr="0x7fdf084e22b0" >
+                            <attribute name="name" value="XBMCAddon::xbmc::executebuiltin" id="541" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="542" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_nextSibling" value="0x7fdf084e2410" id="543" addr="0x7fdf084e2410" />
+                            <attribute name="csym_nextSibling" value="0x7fdf084e2410" id="544" addr="0x7fdf084e2410" />
+                            <attribute name="kind" value="function" id="545" addr="0x7fdf085119d0" />
+                            <attribute name="sym_name" value="executebuiltin" id="546" addr="0x7fdf085119d0" />
+                            <attribute name="decl" value="f(p.q(const).char,bool)." id="547" addr="0x7fdf085119d0" />
+                            <attribute name="sym_overloaded" value="0x7fdf084e22b0" id="548" addr="0x7fdf084e22b0" />
+                            <parmlist id="549" addr="0x7fdf084e20b0" >
                                 <parm id="550">
-                                    <attributelist id="551" addr="0x7ff9f1f8b0b0" >
-                                        <attribute name="name" value="function" id="552" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="p.q(const).char" id="553" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="551" addr="0x7fdf084e20b0" >
+                                        <attribute name="name" value="function" id="552" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="p.q(const).char" id="553" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                                 <parm id="554">
-                                    <attributelist id="555" addr="0x7ff9f1f8b1f0" >
-                                        <attribute name="name" value="wait" id="556" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="value" value="false" id="557" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="bool" id="558" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="555" addr="0x7fdf084e21f0" >
+                                        <attribute name="name" value="wait" id="556" addr="0x7fdf085119d0" />
+                                        <attribute name="value" value="false" id="557" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="bool" id="558" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="type" value="void" id="559" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="560" addr="0x7ff9f1fba9d0" />
+                            <attribute name="type" value="void" id="559" addr="0x7fdf085119d0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="560" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="561" addr="0x7ff9f1f8b410" >
-                        <attributelist id="562" addr="0x7ff9f1f8b410" >
-                            <attribute name="name" value="XBMCAddon::xbmc::executebuiltin" id="563" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="564" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_previousSibling" value="0x7ff9f1f8b2b0" id="565" addr="0x7ff9f1f8b2b0" />
-                            <attribute name="kind" value="function" id="566" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_name" value="executebuiltin" id="567" addr="0x7ff9f1fba9d0" />
-                            <attribute name="defaultargs" value="0x7ff9f1f8b2b0" id="568" addr="0x7ff9f1f8b2b0" />
-                            <attribute name="decl" value="f(p.q(const).char)." id="569" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_overloaded" value="0x7ff9f1f8b2b0" id="570" addr="0x7ff9f1f8b2b0" />
-                            <parmlist id="571" addr="0x7ff9f1f8b310" >
+                    <cdecl id="561" addr="0x7fdf084e2410" >
+                        <attributelist id="562" addr="0x7fdf084e2410" >
+                            <attribute name="name" value="XBMCAddon::xbmc::executebuiltin" id="563" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="564" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_previousSibling" value="0x7fdf084e22b0" id="565" addr="0x7fdf084e22b0" />
+                            <attribute name="kind" value="function" id="566" addr="0x7fdf085119d0" />
+                            <attribute name="sym_name" value="executebuiltin" id="567" addr="0x7fdf085119d0" />
+                            <attribute name="defaultargs" value="0x7fdf084e22b0" id="568" addr="0x7fdf084e22b0" />
+                            <attribute name="decl" value="f(p.q(const).char)." id="569" addr="0x7fdf085119d0" />
+                            <attribute name="sym_overloaded" value="0x7fdf084e22b0" id="570" addr="0x7fdf084e22b0" />
+                            <parmlist id="571" addr="0x7fdf084e2310" >
                                 <parm id="572">
-                                    <attributelist id="573" addr="0x7ff9f1f8b310" >
-                                        <attribute name="name" value="function" id="574" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="p.q(const).char" id="575" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="573" addr="0x7fdf084e2310" >
+                                        <attribute name="name" value="function" id="574" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="p.q(const).char" id="575" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="type" value="void" id="576" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_overname" value="__SWIG_1" id="577" addr="0x7ff9f1fba9d0" />
+                            <attribute name="type" value="void" id="576" addr="0x7fdf085119d0" />
+                            <attribute name="sym_overname" value="__SWIG_1" id="577" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="578" addr="0x7ff9f1f8b6f0" >
-                        <attributelist id="579" addr="0x7ff9f1f8b6f0" >
-                            <attribute name="sym_name" value="executeJSONRPC" id="580" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="XBMCAddon::xbmc::executeJSONRPC" id="581" addr="0x7ff9f1fba9d0" />
-                            <attribute name="decl" value="f(p.q(const).char)." id="582" addr="0x7ff9f1fba9d0" />
-                            <parmlist id="583" addr="0x7ff9f1f8b630" >
+                    <cdecl id="578" addr="0x7fdf084e26f0" >
+                        <attributelist id="579" addr="0x7fdf084e26f0" >
+                            <attribute name="sym_name" value="executeJSONRPC" id="580" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="XBMCAddon::xbmc::executeJSONRPC" id="581" addr="0x7fdf085119d0" />
+                            <attribute name="decl" value="f(p.q(const).char)." id="582" addr="0x7fdf085119d0" />
+                            <parmlist id="583" addr="0x7fdf084e2630" >
                                 <parm id="584">
-                                    <attributelist id="585" addr="0x7ff9f1f8b630" >
-                                        <attribute name="name" value="jsonrpccommand" id="586" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="p.q(const).char" id="587" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="585" addr="0x7fdf084e2630" >
+                                        <attribute name="name" value="jsonrpccommand" id="586" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="p.q(const).char" id="587" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="kind" value="function" id="588" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="XBMCAddon::String" id="589" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="590" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="591" addr="0x7ff9f1fba9d0" />
+                            <attribute name="kind" value="function" id="588" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="XBMCAddon::String" id="589" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="590" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="591" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="592" addr="0x7ff9f1f8b990" >
-                        <attributelist id="593" addr="0x7ff9f1f8b990" >
-                            <attribute name="sym_name" value="sleep" id="594" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="XBMCAddon::xbmc::sleep" id="595" addr="0x7ff9f1fba9d0" />
-                            <attribute name="decl" value="f(long)." id="596" addr="0x7ff9f1fba9d0" />
-                            <parmlist id="597" addr="0x7ff9f1f8b8d0" >
+                    <cdecl id="592" addr="0x7fdf084e2990" >
+                        <attributelist id="593" addr="0x7fdf084e2990" >
+                            <attribute name="sym_name" value="sleep" id="594" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="XBMCAddon::xbmc::sleep" id="595" addr="0x7fdf085119d0" />
+                            <attribute name="decl" value="f(long)." id="596" addr="0x7fdf085119d0" />
+                            <parmlist id="597" addr="0x7fdf084e28d0" >
                                 <parm id="598">
-                                    <attributelist id="599" addr="0x7ff9f1f8b8d0" >
-                                        <attribute name="name" value="timemillis" id="600" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="long" id="601" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="599" addr="0x7fdf084e28d0" >
+                                        <attribute name="name" value="timemillis" id="600" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="long" id="601" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="kind" value="function" id="602" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="void" id="603" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="604" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="605" addr="0x7ff9f1fba9d0" />
+                            <attribute name="kind" value="function" id="602" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="void" id="603" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="604" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="605" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="606" addr="0x7ff9f1f8bc50" >
-                        <attributelist id="607" addr="0x7ff9f1f8bc50" >
-                            <attribute name="sym_name" value="getLocalizedString" id="608" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="XBMCAddon::xbmc::getLocalizedString" id="609" addr="0x7ff9f1fba9d0" />
-                            <attribute name="decl" value="f(int)." id="610" addr="0x7ff9f1fba9d0" />
-                            <parmlist id="611" addr="0x7ff9f1f8bb90" >
+                    <cdecl id="606" addr="0x7fdf084e2c50" >
+                        <attributelist id="607" addr="0x7fdf084e2c50" >
+                            <attribute name="sym_name" value="getLocalizedString" id="608" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="XBMCAddon::xbmc::getLocalizedString" id="609" addr="0x7fdf085119d0" />
+                            <attribute name="decl" value="f(int)." id="610" addr="0x7fdf085119d0" />
+                            <parmlist id="611" addr="0x7fdf084e2b90" >
                                 <parm id="612">
-                                    <attributelist id="613" addr="0x7ff9f1f8bb90" >
-                                        <attribute name="name" value="id" id="614" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="int" id="615" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="613" addr="0x7fdf084e2b90" >
+                                        <attribute name="name" value="id" id="614" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="int" id="615" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="kind" value="function" id="616" addr="0x7ff9f1fba9d0" />
-                            <attribute name="feature_python_coerceToUnicode" value="true" id="617" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="XBMCAddon::String" id="618" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="619" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="620" addr="0x7ff9f1fba9d0" />
+                            <attribute name="kind" value="function" id="616" addr="0x7fdf085119d0" />
+                            <attribute name="feature_python_coerceToUnicode" value="true" id="617" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="XBMCAddon::String" id="618" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="619" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="620" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="621" addr="0x7ff9f1f8be10" >
-                        <attributelist id="622" addr="0x7ff9f1f8be10" >
-                            <attribute name="sym_name" value="getSkinDir" id="623" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="XBMCAddon::xbmc::getSkinDir" id="624" addr="0x7ff9f1fba9d0" />
-                            <attribute name="decl" value="f()." id="625" addr="0x7ff9f1fba9d0" />
-                            <attribute name="kind" value="function" id="626" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="XBMCAddon::String" id="627" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="628" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="629" addr="0x7ff9f1fba9d0" />
+                    <cdecl id="621" addr="0x7fdf084e2e10" >
+                        <attributelist id="622" addr="0x7fdf084e2e10" >
+                            <attribute name="sym_name" value="getSkinDir" id="623" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="XBMCAddon::xbmc::getSkinDir" id="624" addr="0x7fdf085119d0" />
+                            <attribute name="decl" value="f()." id="625" addr="0x7fdf085119d0" />
+                            <attribute name="kind" value="function" id="626" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="XBMCAddon::String" id="627" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="628" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="629" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="630" addr="0x7ff9f1f8c290" >
-                        <attributelist id="631" addr="0x7ff9f1f8c290" >
-                            <attribute name="name" value="XBMCAddon::xbmc::getLanguage" id="632" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="633" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_nextSibling" value="0x7ff9f1f8c410" id="634" addr="0x7ff9f1f8c410" />
-                            <attribute name="csym_nextSibling" value="0x7ff9f1f8c410" id="635" addr="0x7ff9f1f8c410" />
-                            <attribute name="kind" value="function" id="636" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_name" value="getLanguage" id="637" addr="0x7ff9f1fba9d0" />
-                            <attribute name="decl" value="f(int,bool)." id="638" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_overloaded" value="0x7ff9f1f8c290" id="639" addr="0x7ff9f1f8c290" />
-                            <parmlist id="640" addr="0x7ff9f1f8c090" >
+                    <cdecl id="630" addr="0x7fdf084e3290" >
+                        <attributelist id="631" addr="0x7fdf084e3290" >
+                            <attribute name="name" value="XBMCAddon::xbmc::getLanguage" id="632" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="633" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_nextSibling" value="0x7fdf084e3410" id="634" addr="0x7fdf084e3410" />
+                            <attribute name="csym_nextSibling" value="0x7fdf084e3410" id="635" addr="0x7fdf084e3410" />
+                            <attribute name="kind" value="function" id="636" addr="0x7fdf085119d0" />
+                            <attribute name="sym_name" value="getLanguage" id="637" addr="0x7fdf085119d0" />
+                            <attribute name="decl" value="f(int,bool)." id="638" addr="0x7fdf085119d0" />
+                            <attribute name="sym_overloaded" value="0x7fdf084e3290" id="639" addr="0x7fdf084e3290" />
+                            <parmlist id="640" addr="0x7fdf084e3090" >
                                 <parm id="641">
-                                    <attributelist id="642" addr="0x7ff9f1f8c090" >
-                                        <attribute name="name" value="format" id="643" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="value" value="CLangCodeExpander::ENGLISH_NAME" id="644" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="int" id="645" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="642" addr="0x7fdf084e3090" >
+                                        <attribute name="name" value="format" id="643" addr="0x7fdf085119d0" />
+                                        <attribute name="value" value="CLangCodeExpander::ENGLISH_NAME" id="644" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="int" id="645" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                                 <parm id="646">
-                                    <attributelist id="647" addr="0x7ff9f1f8c1d0" >
-                                        <attribute name="name" value="region" id="648" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="value" value="false" id="649" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="bool" id="650" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="647" addr="0x7fdf084e31d0" >
+                                        <attribute name="name" value="region" id="648" addr="0x7fdf085119d0" />
+                                        <attribute name="value" value="false" id="649" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="bool" id="650" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="type" value="XBMCAddon::String" id="651" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="652" addr="0x7ff9f1fba9d0" />
+                            <attribute name="type" value="XBMCAddon::String" id="651" addr="0x7fdf085119d0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="652" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="653" addr="0x7ff9f1f8c410" >
-                        <attributelist id="654" addr="0x7ff9f1f8c410" >
-                            <attribute name="name" value="XBMCAddon::xbmc::getLanguage" id="655" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="656" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_nextSibling" value="0x7ff9f1f8c4d0" id="657" addr="0x7ff9f1f8c4d0" />
-                            <attribute name="csym_nextSibling" value="0x7ff9f1f8c4d0" id="658" addr="0x7ff9f1f8c4d0" />
-                            <attribute name="sym_previousSibling" value="0x7ff9f1f8c290" id="659" addr="0x7ff9f1f8c290" />
-                            <attribute name="kind" value="function" id="660" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_name" value="getLanguage" id="661" addr="0x7ff9f1fba9d0" />
-                            <attribute name="defaultargs" value="0x7ff9f1f8c290" id="662" addr="0x7ff9f1f8c290" />
-                            <attribute name="decl" value="f(int)." id="663" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_overloaded" value="0x7ff9f1f8c290" id="664" addr="0x7ff9f1f8c290" />
-                            <parmlist id="665" addr="0x7ff9f1f8c2f0" >
+                    <cdecl id="653" addr="0x7fdf084e3410" >
+                        <attributelist id="654" addr="0x7fdf084e3410" >
+                            <attribute name="name" value="XBMCAddon::xbmc::getLanguage" id="655" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="656" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_nextSibling" value="0x7fdf084e34d0" id="657" addr="0x7fdf084e34d0" />
+                            <attribute name="csym_nextSibling" value="0x7fdf084e34d0" id="658" addr="0x7fdf084e34d0" />
+                            <attribute name="sym_previousSibling" value="0x7fdf084e3290" id="659" addr="0x7fdf084e3290" />
+                            <attribute name="kind" value="function" id="660" addr="0x7fdf085119d0" />
+                            <attribute name="sym_name" value="getLanguage" id="661" addr="0x7fdf085119d0" />
+                            <attribute name="defaultargs" value="0x7fdf084e3290" id="662" addr="0x7fdf084e3290" />
+                            <attribute name="decl" value="f(int)." id="663" addr="0x7fdf085119d0" />
+                            <attribute name="sym_overloaded" value="0x7fdf084e3290" id="664" addr="0x7fdf084e3290" />
+                            <parmlist id="665" addr="0x7fdf084e32f0" >
                                 <parm id="666">
-                                    <attributelist id="667" addr="0x7ff9f1f8c2f0" >
-                                        <attribute name="name" value="format" id="668" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="value" value="CLangCodeExpander::ENGLISH_NAME" id="669" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="int" id="670" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="667" addr="0x7fdf084e32f0" >
+                                        <attribute name="name" value="format" id="668" addr="0x7fdf085119d0" />
+                                        <attribute name="value" value="CLangCodeExpander::ENGLISH_NAME" id="669" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="int" id="670" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="type" value="XBMCAddon::String" id="671" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_overname" value="__SWIG_1" id="672" addr="0x7ff9f1fba9d0" />
+                            <attribute name="type" value="XBMCAddon::String" id="671" addr="0x7fdf085119d0" />
+                            <attribute name="sym_overname" value="__SWIG_1" id="672" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="673" addr="0x7ff9f1f8c4d0" >
-                        <attributelist id="674" addr="0x7ff9f1f8c4d0" >
-                            <attribute name="sym_name" value="getLanguage" id="675" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="XBMCAddon::xbmc::getLanguage" id="676" addr="0x7ff9f1fba9d0" />
-                            <attribute name="decl" value="f()." id="677" addr="0x7ff9f1fba9d0" />
-                            <attribute name="kind" value="function" id="678" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_overloaded" value="0x7ff9f1f8c290" id="679" addr="0x7ff9f1f8c290" />
-                            <attribute name="defaultargs" value="0x7ff9f1f8c290" id="680" addr="0x7ff9f1f8c290" />
-                            <attribute name="type" value="XBMCAddon::String" id="681" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_previousSibling" value="0x7ff9f1f8c410" id="682" addr="0x7ff9f1f8c410" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="683" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_2" id="684" addr="0x7ff9f1fba9d0" />
+                    <cdecl id="673" addr="0x7fdf084e34d0" >
+                        <attributelist id="674" addr="0x7fdf084e34d0" >
+                            <attribute name="sym_name" value="getLanguage" id="675" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="XBMCAddon::xbmc::getLanguage" id="676" addr="0x7fdf085119d0" />
+                            <attribute name="decl" value="f()." id="677" addr="0x7fdf085119d0" />
+                            <attribute name="kind" value="function" id="678" addr="0x7fdf085119d0" />
+                            <attribute name="sym_overloaded" value="0x7fdf084e3290" id="679" addr="0x7fdf084e3290" />
+                            <attribute name="defaultargs" value="0x7fdf084e3290" id="680" addr="0x7fdf084e3290" />
+                            <attribute name="type" value="XBMCAddon::String" id="681" addr="0x7fdf085119d0" />
+                            <attribute name="sym_previousSibling" value="0x7fdf084e3410" id="682" addr="0x7fdf084e3410" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="683" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_2" id="684" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="685" addr="0x7ff9f1f8c690" >
-                        <attributelist id="686" addr="0x7ff9f1f8c690" >
-                            <attribute name="sym_name" value="getIPAddress" id="687" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="XBMCAddon::xbmc::getIPAddress" id="688" addr="0x7ff9f1fba9d0" />
-                            <attribute name="decl" value="f()." id="689" addr="0x7ff9f1fba9d0" />
-                            <attribute name="kind" value="function" id="690" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="XBMCAddon::String" id="691" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="692" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="693" addr="0x7ff9f1fba9d0" />
+                    <cdecl id="685" addr="0x7fdf084e3690" >
+                        <attributelist id="686" addr="0x7fdf084e3690" >
+                            <attribute name="sym_name" value="getIPAddress" id="687" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="XBMCAddon::xbmc::getIPAddress" id="688" addr="0x7fdf085119d0" />
+                            <attribute name="decl" value="f()." id="689" addr="0x7fdf085119d0" />
+                            <attribute name="kind" value="function" id="690" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="XBMCAddon::String" id="691" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="692" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="693" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="694" addr="0x7ff9f1f8c830" >
-                        <attributelist id="695" addr="0x7ff9f1f8c830" >
-                            <attribute name="sym_name" value="getDVDState" id="696" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="XBMCAddon::xbmc::getDVDState" id="697" addr="0x7ff9f1fba9d0" />
-                            <attribute name="decl" value="f()." id="698" addr="0x7ff9f1fba9d0" />
-                            <attribute name="kind" value="function" id="699" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="long" id="700" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="701" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="702" addr="0x7ff9f1fba9d0" />
+                    <cdecl id="694" addr="0x7fdf084e3830" >
+                        <attributelist id="695" addr="0x7fdf084e3830" >
+                            <attribute name="sym_name" value="getDVDState" id="696" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="XBMCAddon::xbmc::getDVDState" id="697" addr="0x7fdf085119d0" />
+                            <attribute name="decl" value="f()." id="698" addr="0x7fdf085119d0" />
+                            <attribute name="kind" value="function" id="699" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="long" id="700" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="701" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="702" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="703" addr="0x7ff9f1f8c9d0" >
-                        <attributelist id="704" addr="0x7ff9f1f8c9d0" >
-                            <attribute name="sym_name" value="getFreeMem" id="705" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="XBMCAddon::xbmc::getFreeMem" id="706" addr="0x7ff9f1fba9d0" />
-                            <attribute name="decl" value="f()." id="707" addr="0x7ff9f1fba9d0" />
-                            <attribute name="kind" value="function" id="708" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="long" id="709" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="710" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="711" addr="0x7ff9f1fba9d0" />
+                    <cdecl id="703" addr="0x7fdf084e39d0" >
+                        <attributelist id="704" addr="0x7fdf084e39d0" >
+                            <attribute name="sym_name" value="getFreeMem" id="705" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="XBMCAddon::xbmc::getFreeMem" id="706" addr="0x7fdf085119d0" />
+                            <attribute name="decl" value="f()." id="707" addr="0x7fdf085119d0" />
+                            <attribute name="kind" value="function" id="708" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="long" id="709" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="710" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="711" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="712" addr="0x7ff9f1f8ccb0" >
-                        <attributelist id="713" addr="0x7ff9f1f8ccb0" >
-                            <attribute name="sym_name" value="getInfoLabel" id="714" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="XBMCAddon::xbmc::getInfoLabel" id="715" addr="0x7ff9f1fba9d0" />
-                            <attribute name="decl" value="f(p.q(const).char)." id="716" addr="0x7ff9f1fba9d0" />
-                            <parmlist id="717" addr="0x7ff9f1f8cbf0" >
+                    <cdecl id="712" addr="0x7fdf084e3cb0" >
+                        <attributelist id="713" addr="0x7fdf084e3cb0" >
+                            <attribute name="sym_name" value="getInfoLabel" id="714" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="XBMCAddon::xbmc::getInfoLabel" id="715" addr="0x7fdf085119d0" />
+                            <attribute name="decl" value="f(p.q(const).char)." id="716" addr="0x7fdf085119d0" />
+                            <parmlist id="717" addr="0x7fdf084e3bf0" >
                                 <parm id="718">
-                                    <attributelist id="719" addr="0x7ff9f1f8cbf0" >
-                                        <attribute name="name" value="cLine" id="720" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="p.q(const).char" id="721" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="719" addr="0x7fdf084e3bf0" >
+                                        <attribute name="name" value="cLine" id="720" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="p.q(const).char" id="721" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="kind" value="function" id="722" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="XBMCAddon::String" id="723" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="724" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="725" addr="0x7ff9f1fba9d0" />
+                            <attribute name="kind" value="function" id="722" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="XBMCAddon::String" id="723" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="724" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="725" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="726" addr="0x7ff9f1f8cf90" >
-                        <attributelist id="727" addr="0x7ff9f1f8cf90" >
-                            <attribute name="sym_name" value="getInfoImage" id="728" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="XBMCAddon::xbmc::getInfoImage" id="729" addr="0x7ff9f1fba9d0" />
-                            <attribute name="decl" value="f(p.q(const).char)." id="730" addr="0x7ff9f1fba9d0" />
-                            <parmlist id="731" addr="0x7ff9f1f8ced0" >
+                    <cdecl id="726" addr="0x7fdf084e3f90" >
+                        <attributelist id="727" addr="0x7fdf084e3f90" >
+                            <attribute name="sym_name" value="getInfoImage" id="728" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="XBMCAddon::xbmc::getInfoImage" id="729" addr="0x7fdf085119d0" />
+                            <attribute name="decl" value="f(p.q(const).char)." id="730" addr="0x7fdf085119d0" />
+                            <parmlist id="731" addr="0x7fdf084e3ed0" >
                                 <parm id="732">
-                                    <attributelist id="733" addr="0x7ff9f1f8ced0" >
-                                        <attribute name="name" value="infotag" id="734" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="p.q(const).char" id="735" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="733" addr="0x7fdf084e3ed0" >
+                                        <attribute name="name" value="infotag" id="734" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="p.q(const).char" id="735" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="kind" value="function" id="736" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="XBMCAddon::String" id="737" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="738" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="739" addr="0x7ff9f1fba9d0" />
+                            <attribute name="kind" value="function" id="736" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="XBMCAddon::String" id="737" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="738" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="739" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="740" addr="0x7ff9f1f8d390" >
-                        <attributelist id="741" addr="0x7ff9f1f8d390" >
-                            <attribute name="name" value="XBMCAddon::xbmc::playSFX" id="742" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="743" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_nextSibling" value="0x7ff9f1f8d4f0" id="744" addr="0x7ff9f1f8d4f0" />
-                            <attribute name="csym_nextSibling" value="0x7ff9f1f8d4f0" id="745" addr="0x7ff9f1f8d4f0" />
-                            <attribute name="kind" value="function" id="746" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_name" value="playSFX" id="747" addr="0x7ff9f1fba9d0" />
-                            <attribute name="decl" value="f(p.q(const).char,bool)." id="748" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_overloaded" value="0x7ff9f1f8d390" id="749" addr="0x7ff9f1f8d390" />
-                            <parmlist id="750" addr="0x7ff9f1f8d190" >
+                    <cdecl id="740" addr="0x7fdf084e4390" >
+                        <attributelist id="741" addr="0x7fdf084e4390" >
+                            <attribute name="name" value="XBMCAddon::xbmc::playSFX" id="742" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="743" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_nextSibling" value="0x7fdf084e44f0" id="744" addr="0x7fdf084e44f0" />
+                            <attribute name="csym_nextSibling" value="0x7fdf084e44f0" id="745" addr="0x7fdf084e44f0" />
+                            <attribute name="kind" value="function" id="746" addr="0x7fdf085119d0" />
+                            <attribute name="sym_name" value="playSFX" id="747" addr="0x7fdf085119d0" />
+                            <attribute name="decl" value="f(p.q(const).char,bool)." id="748" addr="0x7fdf085119d0" />
+                            <attribute name="sym_overloaded" value="0x7fdf084e4390" id="749" addr="0x7fdf084e4390" />
+                            <parmlist id="750" addr="0x7fdf084e4190" >
                                 <parm id="751">
-                                    <attributelist id="752" addr="0x7ff9f1f8d190" >
-                                        <attribute name="name" value="filename" id="753" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="p.q(const).char" id="754" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="752" addr="0x7fdf084e4190" >
+                                        <attribute name="name" value="filename" id="753" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="p.q(const).char" id="754" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                                 <parm id="755">
-                                    <attributelist id="756" addr="0x7ff9f1f8d2d0" >
-                                        <attribute name="name" value="useCached" id="757" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="value" value="true" id="758" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="bool" id="759" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="756" addr="0x7fdf084e42d0" >
+                                        <attribute name="name" value="useCached" id="757" addr="0x7fdf085119d0" />
+                                        <attribute name="value" value="true" id="758" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="bool" id="759" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="type" value="void" id="760" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="761" addr="0x7ff9f1fba9d0" />
+                            <attribute name="type" value="void" id="760" addr="0x7fdf085119d0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="761" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="762" addr="0x7ff9f1f8d4f0" >
-                        <attributelist id="763" addr="0x7ff9f1f8d4f0" >
-                            <attribute name="name" value="XBMCAddon::xbmc::playSFX" id="764" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="765" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_previousSibling" value="0x7ff9f1f8d390" id="766" addr="0x7ff9f1f8d390" />
-                            <attribute name="kind" value="function" id="767" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_name" value="playSFX" id="768" addr="0x7ff9f1fba9d0" />
-                            <attribute name="defaultargs" value="0x7ff9f1f8d390" id="769" addr="0x7ff9f1f8d390" />
-                            <attribute name="decl" value="f(p.q(const).char)." id="770" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_overloaded" value="0x7ff9f1f8d390" id="771" addr="0x7ff9f1f8d390" />
-                            <parmlist id="772" addr="0x7ff9f1f8d3f0" >
+                    <cdecl id="762" addr="0x7fdf084e44f0" >
+                        <attributelist id="763" addr="0x7fdf084e44f0" >
+                            <attribute name="name" value="XBMCAddon::xbmc::playSFX" id="764" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="765" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_previousSibling" value="0x7fdf084e4390" id="766" addr="0x7fdf084e4390" />
+                            <attribute name="kind" value="function" id="767" addr="0x7fdf085119d0" />
+                            <attribute name="sym_name" value="playSFX" id="768" addr="0x7fdf085119d0" />
+                            <attribute name="defaultargs" value="0x7fdf084e4390" id="769" addr="0x7fdf084e4390" />
+                            <attribute name="decl" value="f(p.q(const).char)." id="770" addr="0x7fdf085119d0" />
+                            <attribute name="sym_overloaded" value="0x7fdf084e4390" id="771" addr="0x7fdf084e4390" />
+                            <parmlist id="772" addr="0x7fdf084e43f0" >
                                 <parm id="773">
-                                    <attributelist id="774" addr="0x7ff9f1f8d3f0" >
-                                        <attribute name="name" value="filename" id="775" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="p.q(const).char" id="776" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="774" addr="0x7fdf084e43f0" >
+                                        <attribute name="name" value="filename" id="775" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="p.q(const).char" id="776" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="type" value="void" id="777" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_overname" value="__SWIG_1" id="778" addr="0x7ff9f1fba9d0" />
+                            <attribute name="type" value="void" id="777" addr="0x7fdf085119d0" />
+                            <attribute name="sym_overname" value="__SWIG_1" id="778" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="779" addr="0x7ff9f1f8d670" >
-                        <attributelist id="780" addr="0x7ff9f1f8d670" >
-                            <attribute name="sym_name" value="stopSFX" id="781" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="XBMCAddon::xbmc::stopSFX" id="782" addr="0x7ff9f1fba9d0" />
-                            <attribute name="decl" value="f()." id="783" addr="0x7ff9f1fba9d0" />
-                            <attribute name="kind" value="function" id="784" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="void" id="785" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="786" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="787" addr="0x7ff9f1fba9d0" />
+                    <cdecl id="779" addr="0x7fdf084e4670" >
+                        <attributelist id="780" addr="0x7fdf084e4670" >
+                            <attribute name="sym_name" value="stopSFX" id="781" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="XBMCAddon::xbmc::stopSFX" id="782" addr="0x7fdf085119d0" />
+                            <attribute name="decl" value="f()." id="783" addr="0x7fdf085119d0" />
+                            <attribute name="kind" value="function" id="784" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="void" id="785" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="786" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="787" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="788" addr="0x7ff9f1f8d8f0" >
-                        <attributelist id="789" addr="0x7ff9f1f8d8f0" >
-                            <attribute name="sym_name" value="enableNavSounds" id="790" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="XBMCAddon::xbmc::enableNavSounds" id="791" addr="0x7ff9f1fba9d0" />
-                            <attribute name="decl" value="f(bool)." id="792" addr="0x7ff9f1fba9d0" />
-                            <parmlist id="793" addr="0x7ff9f1f8d830" >
+                    <cdecl id="788" addr="0x7fdf084e48f0" >
+                        <attributelist id="789" addr="0x7fdf084e48f0" >
+                            <attribute name="sym_name" value="enableNavSounds" id="790" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="XBMCAddon::xbmc::enableNavSounds" id="791" addr="0x7fdf085119d0" />
+                            <attribute name="decl" value="f(bool)." id="792" addr="0x7fdf085119d0" />
+                            <parmlist id="793" addr="0x7fdf084e4830" >
                                 <parm id="794">
-                                    <attributelist id="795" addr="0x7ff9f1f8d830" >
-                                        <attribute name="name" value="yesNo" id="796" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="bool" id="797" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="795" addr="0x7fdf084e4830" >
+                                        <attribute name="name" value="yesNo" id="796" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="bool" id="797" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="kind" value="function" id="798" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="void" id="799" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="800" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="801" addr="0x7ff9f1fba9d0" />
+                            <attribute name="kind" value="function" id="798" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="void" id="799" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="800" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="801" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="802" addr="0x7ff9f1f8dbb0" >
-                        <attributelist id="803" addr="0x7ff9f1f8dbb0" >
-                            <attribute name="sym_name" value="getCondVisibility" id="804" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="XBMCAddon::xbmc::getCondVisibility" id="805" addr="0x7ff9f1fba9d0" />
-                            <attribute name="decl" value="f(p.q(const).char)." id="806" addr="0x7ff9f1fba9d0" />
-                            <parmlist id="807" addr="0x7ff9f1f8daf0" >
+                    <cdecl id="802" addr="0x7fdf084e4bb0" >
+                        <attributelist id="803" addr="0x7fdf084e4bb0" >
+                            <attribute name="sym_name" value="getCondVisibility" id="804" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="XBMCAddon::xbmc::getCondVisibility" id="805" addr="0x7fdf085119d0" />
+                            <attribute name="decl" value="f(p.q(const).char)." id="806" addr="0x7fdf085119d0" />
+                            <parmlist id="807" addr="0x7fdf084e4af0" >
                                 <parm id="808">
-                                    <attributelist id="809" addr="0x7ff9f1f8daf0" >
-                                        <attribute name="name" value="condition" id="810" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="p.q(const).char" id="811" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="809" addr="0x7fdf084e4af0" >
+                                        <attribute name="name" value="condition" id="810" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="p.q(const).char" id="811" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="kind" value="function" id="812" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="bool" id="813" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="814" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="815" addr="0x7ff9f1fba9d0" />
+                            <attribute name="kind" value="function" id="812" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="bool" id="813" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="814" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="815" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="816" addr="0x7ff9f1f8dd50" >
-                        <attributelist id="817" addr="0x7ff9f1f8dd50" >
-                            <attribute name="sym_name" value="getGlobalIdleTime" id="818" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="XBMCAddon::xbmc::getGlobalIdleTime" id="819" addr="0x7ff9f1fba9d0" />
-                            <attribute name="decl" value="f()." id="820" addr="0x7ff9f1fba9d0" />
-                            <attribute name="kind" value="function" id="821" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="int" id="822" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="823" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="824" addr="0x7ff9f1fba9d0" />
+                    <cdecl id="816" addr="0x7fdf084e4d50" >
+                        <attributelist id="817" addr="0x7fdf084e4d50" >
+                            <attribute name="sym_name" value="getGlobalIdleTime" id="818" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="XBMCAddon::xbmc::getGlobalIdleTime" id="819" addr="0x7fdf085119d0" />
+                            <attribute name="decl" value="f()." id="820" addr="0x7fdf085119d0" />
+                            <attribute name="kind" value="function" id="821" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="int" id="822" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="823" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="824" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="825" addr="0x7ff9f1f8e030" >
-                        <attributelist id="826" addr="0x7ff9f1f8e030" >
-                            <attribute name="sym_name" value="getCacheThumbName" id="827" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="XBMCAddon::xbmc::getCacheThumbName" id="828" addr="0x7ff9f1fba9d0" />
-                            <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="829" addr="0x7ff9f1fba9d0" />
-                            <parmlist id="830" addr="0x7ff9f1f8df70" >
+                    <cdecl id="825" addr="0x7fdf084e5030" >
+                        <attributelist id="826" addr="0x7fdf084e5030" >
+                            <attribute name="sym_name" value="getCacheThumbName" id="827" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="XBMCAddon::xbmc::getCacheThumbName" id="828" addr="0x7fdf085119d0" />
+                            <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="829" addr="0x7fdf085119d0" />
+                            <parmlist id="830" addr="0x7fdf084e4f70" >
                                 <parm id="831">
-                                    <attributelist id="832" addr="0x7ff9f1f8df70" >
-                                        <attribute name="name" value="path" id="833" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="834" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="832" addr="0x7fdf084e4f70" >
+                                        <attribute name="name" value="path" id="833" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="834" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="kind" value="function" id="835" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="XBMCAddon::String" id="836" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="837" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="838" addr="0x7ff9f1fba9d0" />
+                            <attribute name="kind" value="function" id="835" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="XBMCAddon::String" id="836" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="837" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="838" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="839" addr="0x7ff9f1f8e450" >
-                        <attributelist id="840" addr="0x7ff9f1f8e450" >
-                            <attribute name="name" value="XBMCAddon::xbmc::makeLegalFilename" id="841" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="842" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_nextSibling" value="0x7ff9f1f8e5b0" id="843" addr="0x7ff9f1f8e5b0" />
-                            <attribute name="csym_nextSibling" value="0x7ff9f1f8e5b0" id="844" addr="0x7ff9f1f8e5b0" />
-                            <attribute name="kind" value="function" id="845" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_name" value="makeLegalFilename" id="846" addr="0x7ff9f1fba9d0" />
-                            <attribute name="decl" value="f(r.q(const).XBMCAddon::String,bool)." id="847" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_overloaded" value="0x7ff9f1f8e450" id="848" addr="0x7ff9f1f8e450" />
-                            <parmlist id="849" addr="0x7ff9f1f8e250" >
+                    <cdecl id="839" addr="0x7fdf084e5450" >
+                        <attributelist id="840" addr="0x7fdf084e5450" >
+                            <attribute name="name" value="XBMCAddon::xbmc::makeLegalFilename" id="841" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="842" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_nextSibling" value="0x7fdf084e55b0" id="843" addr="0x7fdf084e55b0" />
+                            <attribute name="csym_nextSibling" value="0x7fdf084e55b0" id="844" addr="0x7fdf084e55b0" />
+                            <attribute name="kind" value="function" id="845" addr="0x7fdf085119d0" />
+                            <attribute name="sym_name" value="makeLegalFilename" id="846" addr="0x7fdf085119d0" />
+                            <attribute name="decl" value="f(r.q(const).XBMCAddon::String,bool)." id="847" addr="0x7fdf085119d0" />
+                            <attribute name="sym_overloaded" value="0x7fdf084e5450" id="848" addr="0x7fdf084e5450" />
+                            <parmlist id="849" addr="0x7fdf084e5250" >
                                 <parm id="850">
-                                    <attributelist id="851" addr="0x7ff9f1f8e250" >
-                                        <attribute name="name" value="filename" id="852" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="853" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="851" addr="0x7fdf084e5250" >
+                                        <attribute name="name" value="filename" id="852" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="853" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                                 <parm id="854">
-                                    <attributelist id="855" addr="0x7ff9f1f8e390" >
-                                        <attribute name="name" value="fatX" id="856" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="value" value="true" id="857" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="bool" id="858" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="855" addr="0x7fdf084e5390" >
+                                        <attribute name="name" value="fatX" id="856" addr="0x7fdf085119d0" />
+                                        <attribute name="value" value="true" id="857" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="bool" id="858" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="type" value="XBMCAddon::String" id="859" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="860" addr="0x7ff9f1fba9d0" />
+                            <attribute name="type" value="XBMCAddon::String" id="859" addr="0x7fdf085119d0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="860" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="861" addr="0x7ff9f1f8e5b0" >
-                        <attributelist id="862" addr="0x7ff9f1f8e5b0" >
-                            <attribute name="name" value="XBMCAddon::xbmc::makeLegalFilename" id="863" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="864" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_previousSibling" value="0x7ff9f1f8e450" id="865" addr="0x7ff9f1f8e450" />
-                            <attribute name="kind" value="function" id="866" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_name" value="makeLegalFilename" id="867" addr="0x7ff9f1fba9d0" />
-                            <attribute name="defaultargs" value="0x7ff9f1f8e450" id="868" addr="0x7ff9f1f8e450" />
-                            <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="869" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_overloaded" value="0x7ff9f1f8e450" id="870" addr="0x7ff9f1f8e450" />
-                            <parmlist id="871" addr="0x7ff9f1f8e4b0" >
+                    <cdecl id="861" addr="0x7fdf084e55b0" >
+                        <attributelist id="862" addr="0x7fdf084e55b0" >
+                            <attribute name="name" value="XBMCAddon::xbmc::makeLegalFilename" id="863" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="864" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_previousSibling" value="0x7fdf084e5450" id="865" addr="0x7fdf084e5450" />
+                            <attribute name="kind" value="function" id="866" addr="0x7fdf085119d0" />
+                            <attribute name="sym_name" value="makeLegalFilename" id="867" addr="0x7fdf085119d0" />
+                            <attribute name="defaultargs" value="0x7fdf084e5450" id="868" addr="0x7fdf084e5450" />
+                            <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="869" addr="0x7fdf085119d0" />
+                            <attribute name="sym_overloaded" value="0x7fdf084e5450" id="870" addr="0x7fdf084e5450" />
+                            <parmlist id="871" addr="0x7fdf084e54b0" >
                                 <parm id="872">
-                                    <attributelist id="873" addr="0x7ff9f1f8e4b0" >
-                                        <attribute name="name" value="filename" id="874" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="875" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="873" addr="0x7fdf084e54b0" >
+                                        <attribute name="name" value="filename" id="874" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="875" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="type" value="XBMCAddon::String" id="876" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_overname" value="__SWIG_1" id="877" addr="0x7ff9f1fba9d0" />
+                            <attribute name="type" value="XBMCAddon::String" id="876" addr="0x7fdf085119d0" />
+                            <attribute name="sym_overname" value="__SWIG_1" id="877" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="878" addr="0x7ff9f1f8e890" >
-                        <attributelist id="879" addr="0x7ff9f1f8e890" >
-                            <attribute name="sym_name" value="translatePath" id="880" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="XBMCAddon::xbmc::translatePath" id="881" addr="0x7ff9f1fba9d0" />
-                            <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="882" addr="0x7ff9f1fba9d0" />
-                            <parmlist id="883" addr="0x7ff9f1f8e7d0" >
+                    <cdecl id="878" addr="0x7fdf084e5890" >
+                        <attributelist id="879" addr="0x7fdf084e5890" >
+                            <attribute name="sym_name" value="translatePath" id="880" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="XBMCAddon::xbmc::translatePath" id="881" addr="0x7fdf085119d0" />
+                            <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="882" addr="0x7fdf085119d0" />
+                            <parmlist id="883" addr="0x7fdf084e57d0" >
                                 <parm id="884">
-                                    <attributelist id="885" addr="0x7ff9f1f8e7d0" >
-                                        <attribute name="name" value="path" id="886" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="887" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="885" addr="0x7fdf084e57d0" >
+                                        <attribute name="name" value="path" id="886" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="887" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="kind" value="function" id="888" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="XBMCAddon::String" id="889" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="890" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="891" addr="0x7ff9f1fba9d0" />
+                            <attribute name="kind" value="function" id="888" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="XBMCAddon::String" id="889" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="890" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="891" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="892" addr="0x7ff9f1f8ee10" >
-                        <attributelist id="893" addr="0x7ff9f1f8ee10" >
-                            <attribute name="name" value="XBMCAddon::xbmc::getCleanMovieTitle" id="894" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="895" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_nextSibling" value="0x7ff9f1f8ef70" id="896" addr="0x7ff9f1f8ef70" />
-                            <attribute name="csym_nextSibling" value="0x7ff9f1f8ef70" id="897" addr="0x7ff9f1f8ef70" />
-                            <attribute name="kind" value="function" id="898" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_name" value="getCleanMovieTitle" id="899" addr="0x7ff9f1fba9d0" />
-                            <attribute name="decl" value="f(r.q(const).XBMCAddon::String,bool)." id="900" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_overloaded" value="0x7ff9f1f8ee10" id="901" addr="0x7ff9f1f8ee10" />
-                            <parmlist id="902" addr="0x7ff9f1f8ec10" >
+                    <cdecl id="892" addr="0x7fdf084e5e10" >
+                        <attributelist id="893" addr="0x7fdf084e5e10" >
+                            <attribute name="name" value="XBMCAddon::xbmc::getCleanMovieTitle" id="894" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="895" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_nextSibling" value="0x7fdf084e5f70" id="896" addr="0x7fdf084e5f70" />
+                            <attribute name="csym_nextSibling" value="0x7fdf084e5f70" id="897" addr="0x7fdf084e5f70" />
+                            <attribute name="kind" value="function" id="898" addr="0x7fdf085119d0" />
+                            <attribute name="sym_name" value="getCleanMovieTitle" id="899" addr="0x7fdf085119d0" />
+                            <attribute name="decl" value="f(r.q(const).XBMCAddon::String,bool)." id="900" addr="0x7fdf085119d0" />
+                            <attribute name="sym_overloaded" value="0x7fdf084e5e10" id="901" addr="0x7fdf084e5e10" />
+                            <parmlist id="902" addr="0x7fdf084e5c10" >
                                 <parm id="903">
-                                    <attributelist id="904" addr="0x7ff9f1f8ec10" >
-                                        <attribute name="name" value="path" id="905" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="906" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="904" addr="0x7fdf084e5c10" >
+                                        <attribute name="name" value="path" id="905" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="906" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                                 <parm id="907">
-                                    <attributelist id="908" addr="0x7ff9f1f8ed50" >
-                                        <attribute name="name" value="usefoldername" id="909" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="value" value="false" id="910" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="bool" id="911" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="908" addr="0x7fdf084e5d50" >
+                                        <attribute name="name" value="usefoldername" id="909" addr="0x7fdf085119d0" />
+                                        <attribute name="value" value="false" id="910" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="bool" id="911" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="type" value="Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>" id="912" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="913" addr="0x7ff9f1fba9d0" />
+                            <attribute name="type" value="Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>" id="912" addr="0x7fdf085119d0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="913" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="914" addr="0x7ff9f1f8ef70" >
-                        <attributelist id="915" addr="0x7ff9f1f8ef70" >
-                            <attribute name="name" value="XBMCAddon::xbmc::getCleanMovieTitle" id="916" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="917" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_previousSibling" value="0x7ff9f1f8ee10" id="918" addr="0x7ff9f1f8ee10" />
-                            <attribute name="kind" value="function" id="919" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_name" value="getCleanMovieTitle" id="920" addr="0x7ff9f1fba9d0" />
-                            <attribute name="defaultargs" value="0x7ff9f1f8ee10" id="921" addr="0x7ff9f1f8ee10" />
-                            <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="922" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_overloaded" value="0x7ff9f1f8ee10" id="923" addr="0x7ff9f1f8ee10" />
-                            <parmlist id="924" addr="0x7ff9f1f8ee70" >
+                    <cdecl id="914" addr="0x7fdf084e5f70" >
+                        <attributelist id="915" addr="0x7fdf084e5f70" >
+                            <attribute name="name" value="XBMCAddon::xbmc::getCleanMovieTitle" id="916" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="917" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_previousSibling" value="0x7fdf084e5e10" id="918" addr="0x7fdf084e5e10" />
+                            <attribute name="kind" value="function" id="919" addr="0x7fdf085119d0" />
+                            <attribute name="sym_name" value="getCleanMovieTitle" id="920" addr="0x7fdf085119d0" />
+                            <attribute name="defaultargs" value="0x7fdf084e5e10" id="921" addr="0x7fdf084e5e10" />
+                            <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="922" addr="0x7fdf085119d0" />
+                            <attribute name="sym_overloaded" value="0x7fdf084e5e10" id="923" addr="0x7fdf084e5e10" />
+                            <parmlist id="924" addr="0x7fdf084e5e70" >
                                 <parm id="925">
-                                    <attributelist id="926" addr="0x7ff9f1f8ee70" >
-                                        <attribute name="name" value="path" id="927" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="928" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="926" addr="0x7fdf084e5e70" >
+                                        <attribute name="name" value="path" id="927" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="928" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="type" value="Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>" id="929" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_overname" value="__SWIG_1" id="930" addr="0x7ff9f1fba9d0" />
+                            <attribute name="type" value="Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>" id="929" addr="0x7fdf085119d0" />
+                            <attribute name="sym_overname" value="__SWIG_1" id="930" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="931" addr="0x7ff9f1f8f250" >
-                        <attributelist id="932" addr="0x7ff9f1f8f250" >
-                            <attribute name="sym_name" value="validatePath" id="933" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="XBMCAddon::xbmc::validatePath" id="934" addr="0x7ff9f1fba9d0" />
-                            <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="935" addr="0x7ff9f1fba9d0" />
-                            <parmlist id="936" addr="0x7ff9f1f8f190" >
+                    <cdecl id="931" addr="0x7fdf084e6250" >
+                        <attributelist id="932" addr="0x7fdf084e6250" >
+                            <attribute name="sym_name" value="validatePath" id="933" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="XBMCAddon::xbmc::validatePath" id="934" addr="0x7fdf085119d0" />
+                            <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="935" addr="0x7fdf085119d0" />
+                            <parmlist id="936" addr="0x7fdf084e6190" >
                                 <parm id="937">
-                                    <attributelist id="938" addr="0x7ff9f1f8f190" >
-                                        <attribute name="name" value="path" id="939" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="940" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="938" addr="0x7fdf084e6190" >
+                                        <attribute name="name" value="path" id="939" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="940" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="kind" value="function" id="941" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="XBMCAddon::String" id="942" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="943" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="944" addr="0x7ff9f1fba9d0" />
+                            <attribute name="kind" value="function" id="941" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="XBMCAddon::String" id="942" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="943" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="944" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="945" addr="0x7ff9f1f8f530" >
-                        <attributelist id="946" addr="0x7ff9f1f8f530" >
-                            <attribute name="sym_name" value="getRegion" id="947" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="XBMCAddon::xbmc::getRegion" id="948" addr="0x7ff9f1fba9d0" />
-                            <attribute name="decl" value="f(p.q(const).char)." id="949" addr="0x7ff9f1fba9d0" />
-                            <parmlist id="950" addr="0x7ff9f1f8f470" >
+                    <cdecl id="945" addr="0x7fdf084e6530" >
+                        <attributelist id="946" addr="0x7fdf084e6530" >
+                            <attribute name="sym_name" value="getRegion" id="947" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="XBMCAddon::xbmc::getRegion" id="948" addr="0x7fdf085119d0" />
+                            <attribute name="decl" value="f(p.q(const).char)." id="949" addr="0x7fdf085119d0" />
+                            <parmlist id="950" addr="0x7fdf084e6470" >
                                 <parm id="951">
-                                    <attributelist id="952" addr="0x7ff9f1f8f470" >
-                                        <attribute name="name" value="id" id="953" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="p.q(const).char" id="954" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="952" addr="0x7fdf084e6470" >
+                                        <attribute name="name" value="id" id="953" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="p.q(const).char" id="954" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="kind" value="function" id="955" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="XBMCAddon::String" id="956" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="957" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="958" addr="0x7ff9f1fba9d0" />
+                            <attribute name="kind" value="function" id="955" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="XBMCAddon::String" id="956" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="957" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="958" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="959" addr="0x7ff9f1f8f810" >
-                        <attributelist id="960" addr="0x7ff9f1f8f810" >
-                            <attribute name="sym_name" value="getSupportedMedia" id="961" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="XBMCAddon::xbmc::getSupportedMedia" id="962" addr="0x7ff9f1fba9d0" />
-                            <attribute name="decl" value="f(p.q(const).char)." id="963" addr="0x7ff9f1fba9d0" />
-                            <parmlist id="964" addr="0x7ff9f1f8f750" >
+                    <cdecl id="959" addr="0x7fdf084e6810" >
+                        <attributelist id="960" addr="0x7fdf084e6810" >
+                            <attribute name="sym_name" value="getSupportedMedia" id="961" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="XBMCAddon::xbmc::getSupportedMedia" id="962" addr="0x7fdf085119d0" />
+                            <attribute name="decl" value="f(p.q(const).char)." id="963" addr="0x7fdf085119d0" />
+                            <parmlist id="964" addr="0x7fdf084e6750" >
                                 <parm id="965">
-                                    <attributelist id="966" addr="0x7ff9f1f8f750" >
-                                        <attribute name="name" value="mediaType" id="967" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="p.q(const).char" id="968" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="966" addr="0x7fdf084e6750" >
+                                        <attribute name="name" value="mediaType" id="967" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="p.q(const).char" id="968" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="kind" value="function" id="969" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="XBMCAddon::String" id="970" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="971" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="972" addr="0x7ff9f1fba9d0" />
+                            <attribute name="kind" value="function" id="969" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="XBMCAddon::String" id="970" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="971" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="972" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="973" addr="0x7ff9f1f8fad0" >
-                        <attributelist id="974" addr="0x7ff9f1f8fad0" >
-                            <attribute name="sym_name" value="skinHasImage" id="975" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="XBMCAddon::xbmc::skinHasImage" id="976" addr="0x7ff9f1fba9d0" />
-                            <attribute name="decl" value="f(p.q(const).char)." id="977" addr="0x7ff9f1fba9d0" />
-                            <parmlist id="978" addr="0x7ff9f1f8fa10" >
+                    <cdecl id="973" addr="0x7fdf084e6ad0" >
+                        <attributelist id="974" addr="0x7fdf084e6ad0" >
+                            <attribute name="sym_name" value="skinHasImage" id="975" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="XBMCAddon::xbmc::skinHasImage" id="976" addr="0x7fdf085119d0" />
+                            <attribute name="decl" value="f(p.q(const).char)." id="977" addr="0x7fdf085119d0" />
+                            <parmlist id="978" addr="0x7fdf084e6a10" >
                                 <parm id="979">
-                                    <attributelist id="980" addr="0x7ff9f1f8fa10" >
-                                        <attribute name="name" value="image" id="981" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="p.q(const).char" id="982" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="980" addr="0x7fdf084e6a10" >
+                                        <attribute name="name" value="image" id="981" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="p.q(const).char" id="982" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="kind" value="function" id="983" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="bool" id="984" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="985" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="986" addr="0x7ff9f1fba9d0" />
+                            <attribute name="kind" value="function" id="983" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="bool" id="984" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="985" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="986" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="987" addr="0x7ff9f1f8ffb0" >
-                        <attributelist id="988" addr="0x7ff9f1f8ffb0" >
-                            <attribute name="name" value="XBMCAddon::xbmc::startServer" id="989" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="990" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_nextSibling" value="0x7ff9f1f90190" id="991" addr="0x7ff9f1f90190" />
-                            <attribute name="csym_nextSibling" value="0x7ff9f1f90190" id="992" addr="0x7ff9f1f90190" />
-                            <attribute name="kind" value="function" id="993" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_name" value="startServer" id="994" addr="0x7ff9f1fba9d0" />
-                            <attribute name="decl" value="f(int,bool,bool)." id="995" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_overloaded" value="0x7ff9f1f8ffb0" id="996" addr="0x7ff9f1f8ffb0" />
-                            <parmlist id="997" addr="0x7ff9f1f8fcb0" >
+                    <cdecl id="987" addr="0x7fdf084e6fb0" >
+                        <attributelist id="988" addr="0x7fdf084e6fb0" >
+                            <attribute name="name" value="XBMCAddon::xbmc::startServer" id="989" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="990" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_nextSibling" value="0x7fdf084e7190" id="991" addr="0x7fdf084e7190" />
+                            <attribute name="csym_nextSibling" value="0x7fdf084e7190" id="992" addr="0x7fdf084e7190" />
+                            <attribute name="kind" value="function" id="993" addr="0x7fdf085119d0" />
+                            <attribute name="sym_name" value="startServer" id="994" addr="0x7fdf085119d0" />
+                            <attribute name="decl" value="f(int,bool,bool)." id="995" addr="0x7fdf085119d0" />
+                            <attribute name="sym_overloaded" value="0x7fdf084e6fb0" id="996" addr="0x7fdf084e6fb0" />
+                            <parmlist id="997" addr="0x7fdf084e6cb0" >
                                 <parm id="998">
-                                    <attributelist id="999" addr="0x7ff9f1f8fcb0" >
-                                        <attribute name="name" value="iTyp" id="1000" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="int" id="1001" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="999" addr="0x7fdf084e6cb0" >
+                                        <attribute name="name" value="iTyp" id="1000" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="int" id="1001" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                                 <parm id="1002">
-                                    <attributelist id="1003" addr="0x7ff9f1f8fdb0" >
-                                        <attribute name="name" value="bStart" id="1004" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="bool" id="1005" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="1003" addr="0x7fdf084e6db0" >
+                                        <attribute name="name" value="bStart" id="1004" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="bool" id="1005" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                                 <parm id="1006">
-                                    <attributelist id="1007" addr="0x7ff9f1f8fef0" >
-                                        <attribute name="name" value="bWait" id="1008" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="value" value="false" id="1009" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="bool" id="1010" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="1007" addr="0x7fdf084e6ef0" >
+                                        <attribute name="name" value="bWait" id="1008" addr="0x7fdf085119d0" />
+                                        <attribute name="value" value="false" id="1009" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="bool" id="1010" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="type" value="bool" id="1011" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1012" addr="0x7ff9f1fba9d0" />
+                            <attribute name="type" value="bool" id="1011" addr="0x7fdf085119d0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1012" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="1013" addr="0x7ff9f1f90190" >
-                        <attributelist id="1014" addr="0x7ff9f1f90190" >
-                            <attribute name="name" value="XBMCAddon::xbmc::startServer" id="1015" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="1016" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_previousSibling" value="0x7ff9f1f8ffb0" id="1017" addr="0x7ff9f1f8ffb0" />
-                            <attribute name="kind" value="function" id="1018" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_name" value="startServer" id="1019" addr="0x7ff9f1fba9d0" />
-                            <attribute name="defaultargs" value="0x7ff9f1f8ffb0" id="1020" addr="0x7ff9f1f8ffb0" />
-                            <attribute name="decl" value="f(int,bool)." id="1021" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_overloaded" value="0x7ff9f1f8ffb0" id="1022" addr="0x7ff9f1f8ffb0" />
-                            <parmlist id="1023" addr="0x7ff9f1f90010" >
+                    <cdecl id="1013" addr="0x7fdf084e7190" >
+                        <attributelist id="1014" addr="0x7fdf084e7190" >
+                            <attribute name="name" value="XBMCAddon::xbmc::startServer" id="1015" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="1016" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_previousSibling" value="0x7fdf084e6fb0" id="1017" addr="0x7fdf084e6fb0" />
+                            <attribute name="kind" value="function" id="1018" addr="0x7fdf085119d0" />
+                            <attribute name="sym_name" value="startServer" id="1019" addr="0x7fdf085119d0" />
+                            <attribute name="defaultargs" value="0x7fdf084e6fb0" id="1020" addr="0x7fdf084e6fb0" />
+                            <attribute name="decl" value="f(int,bool)." id="1021" addr="0x7fdf085119d0" />
+                            <attribute name="sym_overloaded" value="0x7fdf084e6fb0" id="1022" addr="0x7fdf084e6fb0" />
+                            <parmlist id="1023" addr="0x7fdf084e7010" >
                                 <parm id="1024">
-                                    <attributelist id="1025" addr="0x7ff9f1f90010" >
-                                        <attribute name="name" value="iTyp" id="1026" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="int" id="1027" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="1025" addr="0x7fdf084e7010" >
+                                        <attribute name="name" value="iTyp" id="1026" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="int" id="1027" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                                 <parm id="1028">
-                                    <attributelist id="1029" addr="0x7ff9f1f900f0" >
-                                        <attribute name="name" value="bStart" id="1030" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="bool" id="1031" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="1029" addr="0x7fdf084e70f0" >
+                                        <attribute name="name" value="bStart" id="1030" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="bool" id="1031" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="type" value="bool" id="1032" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_overname" value="__SWIG_1" id="1033" addr="0x7ff9f1fba9d0" />
+                            <attribute name="type" value="bool" id="1032" addr="0x7fdf085119d0" />
+                            <attribute name="sym_overname" value="__SWIG_1" id="1033" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="1034" addr="0x7ff9f1f90310" >
-                        <attributelist id="1035" addr="0x7ff9f1f90310" >
-                            <attribute name="sym_name" value="audioSuspend" id="1036" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="XBMCAddon::xbmc::audioSuspend" id="1037" addr="0x7ff9f1fba9d0" />
-                            <attribute name="decl" value="f()." id="1038" addr="0x7ff9f1fba9d0" />
-                            <attribute name="kind" value="function" id="1039" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="void" id="1040" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="1041" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1042" addr="0x7ff9f1fba9d0" />
+                    <cdecl id="1034" addr="0x7fdf084e7310" >
+                        <attributelist id="1035" addr="0x7fdf084e7310" >
+                            <attribute name="sym_name" value="audioSuspend" id="1036" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="XBMCAddon::xbmc::audioSuspend" id="1037" addr="0x7fdf085119d0" />
+                            <attribute name="decl" value="f()." id="1038" addr="0x7fdf085119d0" />
+                            <attribute name="kind" value="function" id="1039" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="void" id="1040" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="1041" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1042" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="1043" addr="0x7ff9f1f90490" >
-                        <attributelist id="1044" addr="0x7ff9f1f90490" >
-                            <attribute name="sym_name" value="audioResume" id="1045" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="XBMCAddon::xbmc::audioResume" id="1046" addr="0x7ff9f1fba9d0" />
-                            <attribute name="decl" value="f()." id="1047" addr="0x7ff9f1fba9d0" />
-                            <attribute name="kind" value="function" id="1048" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="void" id="1049" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="1050" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1051" addr="0x7ff9f1fba9d0" />
+                    <cdecl id="1043" addr="0x7fdf084e7490" >
+                        <attributelist id="1044" addr="0x7fdf084e7490" >
+                            <attribute name="sym_name" value="audioResume" id="1045" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="XBMCAddon::xbmc::audioResume" id="1046" addr="0x7fdf085119d0" />
+                            <attribute name="decl" value="f()." id="1047" addr="0x7fdf085119d0" />
+                            <attribute name="kind" value="function" id="1048" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="void" id="1049" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="1050" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1051" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="1052" addr="0x7ff9f1f90630" >
-                        <attributelist id="1053" addr="0x7ff9f1f90630" >
-                            <attribute name="sym_name" value="getUserAgent" id="1054" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="XBMCAddon::xbmc::getUserAgent" id="1055" addr="0x7ff9f1fba9d0" />
-                            <attribute name="decl" value="f()." id="1056" addr="0x7ff9f1fba9d0" />
-                            <attribute name="kind" value="function" id="1057" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="XBMCAddon::String" id="1058" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="1059" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1060" addr="0x7ff9f1fba9d0" />
+                    <cdecl id="1052" addr="0x7fdf084e7630" >
+                        <attributelist id="1053" addr="0x7fdf084e7630" >
+                            <attribute name="sym_name" value="getUserAgent" id="1054" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="XBMCAddon::xbmc::getUserAgent" id="1055" addr="0x7fdf085119d0" />
+                            <attribute name="decl" value="f()." id="1056" addr="0x7fdf085119d0" />
+                            <attribute name="kind" value="function" id="1057" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="XBMCAddon::String" id="1058" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="1059" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1060" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="1061" addr="0x7ff9f1f90a30" >
-                        <attributelist id="1062" addr="0x7ff9f1f90a30" >
-                            <attribute name="sym_name" value="convertLanguage" id="1063" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="XBMCAddon::xbmc::convertLanguage" id="1064" addr="0x7ff9f1fba9d0" />
-                            <attribute name="decl" value="f(p.q(const).char,int)." id="1065" addr="0x7ff9f1fba9d0" />
-                            <parmlist id="1066" addr="0x7ff9f1f90850" >
+                    <cdecl id="1061" addr="0x7fdf084e7a30" >
+                        <attributelist id="1062" addr="0x7fdf084e7a30" >
+                            <attribute name="sym_name" value="convertLanguage" id="1063" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="XBMCAddon::xbmc::convertLanguage" id="1064" addr="0x7fdf085119d0" />
+                            <attribute name="decl" value="f(p.q(const).char,int)." id="1065" addr="0x7fdf085119d0" />
+                            <parmlist id="1066" addr="0x7fdf084e7850" >
                                 <parm id="1067">
-                                    <attributelist id="1068" addr="0x7ff9f1f90850" >
-                                        <attribute name="name" value="language" id="1069" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="p.q(const).char" id="1070" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="1068" addr="0x7fdf084e7850" >
+                                        <attribute name="name" value="language" id="1069" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="p.q(const).char" id="1070" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                                 <parm id="1071">
-                                    <attributelist id="1072" addr="0x7ff9f1f90970" >
-                                        <attribute name="name" value="format" id="1073" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="int" id="1074" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="1072" addr="0x7fdf084e7970" >
+                                        <attribute name="name" value="format" id="1073" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="int" id="1074" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="kind" value="function" id="1075" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="XBMCAddon::String" id="1076" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="1077" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1078" addr="0x7ff9f1fba9d0" />
+                            <attribute name="kind" value="function" id="1075" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="XBMCAddon::String" id="1076" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="1077" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1078" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <constant id="1079" addr="0x7ff9f1f90c50" >
-                        <attributelist id="1080" addr="0x7ff9f1f90c50" >
-                            <attribute name="sym_name" value="SERVER_WEBSERVER" id="1081" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="SERVER_WEBSERVER" id="1082" addr="0x7ff9f1fba9d0" />
-                            <attribute name="rawval" value="getSERVER_WEBSERVER()" id="1083" addr="0x7ff9f1fba9d0" />
-                            <attribute name="feature_immutable" value="1" id="1084" addr="0x7ff9f1fba9d0" />
-                            <attribute name="value" value="getSERVER_WEBSERVER()" id="1085" addr="0x7ff9f1fba9d0" />
-                            <attribute name="storage" value="%constant" id="1086" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="int" id="1087" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="1088" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1089" addr="0x7ff9f1fba9d0" />
+                    <constant id="1079" addr="0x7fdf084e7c50" >
+                        <attributelist id="1080" addr="0x7fdf084e7c50" >
+                            <attribute name="sym_name" value="SERVER_WEBSERVER" id="1081" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="SERVER_WEBSERVER" id="1082" addr="0x7fdf085119d0" />
+                            <attribute name="rawval" value="getSERVER_WEBSERVER()" id="1083" addr="0x7fdf085119d0" />
+                            <attribute name="feature_immutable" value="1" id="1084" addr="0x7fdf085119d0" />
+                            <attribute name="value" value="getSERVER_WEBSERVER()" id="1085" addr="0x7fdf085119d0" />
+                            <attribute name="storage" value="%constant" id="1086" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="int" id="1087" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="1088" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1089" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1090" addr="0x7ff9f1f90ed0" >
-                        <attributelist id="1091" addr="0x7ff9f1f90ed0" >
-                            <attribute name="sym_name" value="SERVER_AIRPLAYSERVER" id="1092" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="SERVER_AIRPLAYSERVER" id="1093" addr="0x7ff9f1fba9d0" />
-                            <attribute name="rawval" value="getSERVER_AIRPLAYSERVER()" id="1094" addr="0x7ff9f1fba9d0" />
-                            <attribute name="feature_immutable" value="1" id="1095" addr="0x7ff9f1fba9d0" />
-                            <attribute name="value" value="getSERVER_AIRPLAYSERVER()" id="1096" addr="0x7ff9f1fba9d0" />
-                            <attribute name="storage" value="%constant" id="1097" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="int" id="1098" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="1099" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1100" addr="0x7ff9f1fba9d0" />
+                    <constant id="1090" addr="0x7fdf084e7ed0" >
+                        <attributelist id="1091" addr="0x7fdf084e7ed0" >
+                            <attribute name="sym_name" value="SERVER_AIRPLAYSERVER" id="1092" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="SERVER_AIRPLAYSERVER" id="1093" addr="0x7fdf085119d0" />
+                            <attribute name="rawval" value="getSERVER_AIRPLAYSERVER()" id="1094" addr="0x7fdf085119d0" />
+                            <attribute name="feature_immutable" value="1" id="1095" addr="0x7fdf085119d0" />
+                            <attribute name="value" value="getSERVER_AIRPLAYSERVER()" id="1096" addr="0x7fdf085119d0" />
+                            <attribute name="storage" value="%constant" id="1097" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="int" id="1098" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="1099" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1100" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1101" addr="0x7ff9f1f91110" >
-                        <attributelist id="1102" addr="0x7ff9f1f91110" >
-                            <attribute name="sym_name" value="SERVER_UPNPSERVER" id="1103" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="SERVER_UPNPSERVER" id="1104" addr="0x7ff9f1fba9d0" />
-                            <attribute name="rawval" value="getSERVER_UPNPSERVER()" id="1105" addr="0x7ff9f1fba9d0" />
-                            <attribute name="feature_immutable" value="1" id="1106" addr="0x7ff9f1fba9d0" />
-                            <attribute name="value" value="getSERVER_UPNPSERVER()" id="1107" addr="0x7ff9f1fba9d0" />
-                            <attribute name="storage" value="%constant" id="1108" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="int" id="1109" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="1110" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1111" addr="0x7ff9f1fba9d0" />
+                    <constant id="1101" addr="0x7fdf084e8110" >
+                        <attributelist id="1102" addr="0x7fdf084e8110" >
+                            <attribute name="sym_name" value="SERVER_UPNPSERVER" id="1103" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="SERVER_UPNPSERVER" id="1104" addr="0x7fdf085119d0" />
+                            <attribute name="rawval" value="getSERVER_UPNPSERVER()" id="1105" addr="0x7fdf085119d0" />
+                            <attribute name="feature_immutable" value="1" id="1106" addr="0x7fdf085119d0" />
+                            <attribute name="value" value="getSERVER_UPNPSERVER()" id="1107" addr="0x7fdf085119d0" />
+                            <attribute name="storage" value="%constant" id="1108" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="int" id="1109" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="1110" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1111" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1112" addr="0x7ff9f1f91350" >
-                        <attributelist id="1113" addr="0x7ff9f1f91350" >
-                            <attribute name="sym_name" value="SERVER_UPNPRENDERER" id="1114" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="SERVER_UPNPRENDERER" id="1115" addr="0x7ff9f1fba9d0" />
-                            <attribute name="rawval" value="getSERVER_UPNPRENDERER()" id="1116" addr="0x7ff9f1fba9d0" />
-                            <attribute name="feature_immutable" value="1" id="1117" addr="0x7ff9f1fba9d0" />
-                            <attribute name="value" value="getSERVER_UPNPRENDERER()" id="1118" addr="0x7ff9f1fba9d0" />
-                            <attribute name="storage" value="%constant" id="1119" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="int" id="1120" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="1121" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1122" addr="0x7ff9f1fba9d0" />
+                    <constant id="1112" addr="0x7fdf084e8350" >
+                        <attributelist id="1113" addr="0x7fdf084e8350" >
+                            <attribute name="sym_name" value="SERVER_UPNPRENDERER" id="1114" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="SERVER_UPNPRENDERER" id="1115" addr="0x7fdf085119d0" />
+                            <attribute name="rawval" value="getSERVER_UPNPRENDERER()" id="1116" addr="0x7fdf085119d0" />
+                            <attribute name="feature_immutable" value="1" id="1117" addr="0x7fdf085119d0" />
+                            <attribute name="value" value="getSERVER_UPNPRENDERER()" id="1118" addr="0x7fdf085119d0" />
+                            <attribute name="storage" value="%constant" id="1119" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="int" id="1120" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="1121" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1122" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1123" addr="0x7ff9f1f91590" >
-                        <attributelist id="1124" addr="0x7ff9f1f91590" >
-                            <attribute name="sym_name" value="SERVER_EVENTSERVER" id="1125" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="SERVER_EVENTSERVER" id="1126" addr="0x7ff9f1fba9d0" />
-                            <attribute name="rawval" value="getSERVER_EVENTSERVER()" id="1127" addr="0x7ff9f1fba9d0" />
-                            <attribute name="feature_immutable" value="1" id="1128" addr="0x7ff9f1fba9d0" />
-                            <attribute name="value" value="getSERVER_EVENTSERVER()" id="1129" addr="0x7ff9f1fba9d0" />
-                            <attribute name="storage" value="%constant" id="1130" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="int" id="1131" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="1132" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1133" addr="0x7ff9f1fba9d0" />
+                    <constant id="1123" addr="0x7fdf084e8590" >
+                        <attributelist id="1124" addr="0x7fdf084e8590" >
+                            <attribute name="sym_name" value="SERVER_EVENTSERVER" id="1125" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="SERVER_EVENTSERVER" id="1126" addr="0x7fdf085119d0" />
+                            <attribute name="rawval" value="getSERVER_EVENTSERVER()" id="1127" addr="0x7fdf085119d0" />
+                            <attribute name="feature_immutable" value="1" id="1128" addr="0x7fdf085119d0" />
+                            <attribute name="value" value="getSERVER_EVENTSERVER()" id="1129" addr="0x7fdf085119d0" />
+                            <attribute name="storage" value="%constant" id="1130" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="int" id="1131" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="1132" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1133" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1134" addr="0x7ff9f1f917d0" >
-                        <attributelist id="1135" addr="0x7ff9f1f917d0" >
-                            <attribute name="sym_name" value="SERVER_JSONRPCSERVER" id="1136" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="SERVER_JSONRPCSERVER" id="1137" addr="0x7ff9f1fba9d0" />
-                            <attribute name="rawval" value="getSERVER_JSONRPCSERVER()" id="1138" addr="0x7ff9f1fba9d0" />
-                            <attribute name="feature_immutable" value="1" id="1139" addr="0x7ff9f1fba9d0" />
-                            <attribute name="value" value="getSERVER_JSONRPCSERVER()" id="1140" addr="0x7ff9f1fba9d0" />
-                            <attribute name="storage" value="%constant" id="1141" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="int" id="1142" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="1143" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1144" addr="0x7ff9f1fba9d0" />
+                    <constant id="1134" addr="0x7fdf084e87d0" >
+                        <attributelist id="1135" addr="0x7fdf084e87d0" >
+                            <attribute name="sym_name" value="SERVER_JSONRPCSERVER" id="1136" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="SERVER_JSONRPCSERVER" id="1137" addr="0x7fdf085119d0" />
+                            <attribute name="rawval" value="getSERVER_JSONRPCSERVER()" id="1138" addr="0x7fdf085119d0" />
+                            <attribute name="feature_immutable" value="1" id="1139" addr="0x7fdf085119d0" />
+                            <attribute name="value" value="getSERVER_JSONRPCSERVER()" id="1140" addr="0x7fdf085119d0" />
+                            <attribute name="storage" value="%constant" id="1141" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="int" id="1142" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="1143" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1144" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1145" addr="0x7ff9f1f91a10" >
-                        <attributelist id="1146" addr="0x7ff9f1f91a10" >
-                            <attribute name="sym_name" value="SERVER_ZEROCONF" id="1147" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="SERVER_ZEROCONF" id="1148" addr="0x7ff9f1fba9d0" />
-                            <attribute name="rawval" value="getSERVER_ZEROCONF()" id="1149" addr="0x7ff9f1fba9d0" />
-                            <attribute name="feature_immutable" value="1" id="1150" addr="0x7ff9f1fba9d0" />
-                            <attribute name="value" value="getSERVER_ZEROCONF()" id="1151" addr="0x7ff9f1fba9d0" />
-                            <attribute name="storage" value="%constant" id="1152" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="int" id="1153" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="1154" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1155" addr="0x7ff9f1fba9d0" />
+                    <constant id="1145" addr="0x7fdf084e8a10" >
+                        <attributelist id="1146" addr="0x7fdf084e8a10" >
+                            <attribute name="sym_name" value="SERVER_ZEROCONF" id="1147" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="SERVER_ZEROCONF" id="1148" addr="0x7fdf085119d0" />
+                            <attribute name="rawval" value="getSERVER_ZEROCONF()" id="1149" addr="0x7fdf085119d0" />
+                            <attribute name="feature_immutable" value="1" id="1150" addr="0x7fdf085119d0" />
+                            <attribute name="value" value="getSERVER_ZEROCONF()" id="1151" addr="0x7fdf085119d0" />
+                            <attribute name="storage" value="%constant" id="1152" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="int" id="1153" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="1154" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1155" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1156" addr="0x7ff9f1f91c50" >
-                        <attributelist id="1157" addr="0x7ff9f1f91c50" >
-                            <attribute name="sym_name" value="PLAYLIST_MUSIC" id="1158" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="PLAYLIST_MUSIC" id="1159" addr="0x7ff9f1fba9d0" />
-                            <attribute name="rawval" value="getPLAYLIST_MUSIC()" id="1160" addr="0x7ff9f1fba9d0" />
-                            <attribute name="feature_immutable" value="1" id="1161" addr="0x7ff9f1fba9d0" />
-                            <attribute name="value" value="getPLAYLIST_MUSIC()" id="1162" addr="0x7ff9f1fba9d0" />
-                            <attribute name="storage" value="%constant" id="1163" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="int" id="1164" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="1165" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1166" addr="0x7ff9f1fba9d0" />
+                    <constant id="1156" addr="0x7fdf084e8c50" >
+                        <attributelist id="1157" addr="0x7fdf084e8c50" >
+                            <attribute name="sym_name" value="PLAYLIST_MUSIC" id="1158" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="PLAYLIST_MUSIC" id="1159" addr="0x7fdf085119d0" />
+                            <attribute name="rawval" value="getPLAYLIST_MUSIC()" id="1160" addr="0x7fdf085119d0" />
+                            <attribute name="feature_immutable" value="1" id="1161" addr="0x7fdf085119d0" />
+                            <attribute name="value" value="getPLAYLIST_MUSIC()" id="1162" addr="0x7fdf085119d0" />
+                            <attribute name="storage" value="%constant" id="1163" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="int" id="1164" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="1165" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1166" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1167" addr="0x7ff9f1f91e90" >
-                        <attributelist id="1168" addr="0x7ff9f1f91e90" >
-                            <attribute name="sym_name" value="PLAYLIST_VIDEO" id="1169" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="PLAYLIST_VIDEO" id="1170" addr="0x7ff9f1fba9d0" />
-                            <attribute name="rawval" value="getPLAYLIST_VIDEO()" id="1171" addr="0x7ff9f1fba9d0" />
-                            <attribute name="feature_immutable" value="1" id="1172" addr="0x7ff9f1fba9d0" />
-                            <attribute name="value" value="getPLAYLIST_VIDEO()" id="1173" addr="0x7ff9f1fba9d0" />
-                            <attribute name="storage" value="%constant" id="1174" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="int" id="1175" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="1176" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1177" addr="0x7ff9f1fba9d0" />
+                    <constant id="1167" addr="0x7fdf084e8e90" >
+                        <attributelist id="1168" addr="0x7fdf084e8e90" >
+                            <attribute name="sym_name" value="PLAYLIST_VIDEO" id="1169" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="PLAYLIST_VIDEO" id="1170" addr="0x7fdf085119d0" />
+                            <attribute name="rawval" value="getPLAYLIST_VIDEO()" id="1171" addr="0x7fdf085119d0" />
+                            <attribute name="feature_immutable" value="1" id="1172" addr="0x7fdf085119d0" />
+                            <attribute name="value" value="getPLAYLIST_VIDEO()" id="1173" addr="0x7fdf085119d0" />
+                            <attribute name="storage" value="%constant" id="1174" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="int" id="1175" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="1176" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1177" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1178" addr="0x7ff9f1f920d0" >
-                        <attributelist id="1179" addr="0x7ff9f1f920d0" >
-                            <attribute name="sym_name" value="TRAY_OPEN" id="1180" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="TRAY_OPEN" id="1181" addr="0x7ff9f1fba9d0" />
-                            <attribute name="rawval" value="getTRAY_OPEN()" id="1182" addr="0x7ff9f1fba9d0" />
-                            <attribute name="feature_immutable" value="1" id="1183" addr="0x7ff9f1fba9d0" />
-                            <attribute name="value" value="getTRAY_OPEN()" id="1184" addr="0x7ff9f1fba9d0" />
-                            <attribute name="storage" value="%constant" id="1185" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="int" id="1186" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="1187" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1188" addr="0x7ff9f1fba9d0" />
+                    <constant id="1178" addr="0x7fdf084e90d0" >
+                        <attributelist id="1179" addr="0x7fdf084e90d0" >
+                            <attribute name="sym_name" value="TRAY_OPEN" id="1180" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="TRAY_OPEN" id="1181" addr="0x7fdf085119d0" />
+                            <attribute name="rawval" value="getTRAY_OPEN()" id="1182" addr="0x7fdf085119d0" />
+                            <attribute name="feature_immutable" value="1" id="1183" addr="0x7fdf085119d0" />
+                            <attribute name="value" value="getTRAY_OPEN()" id="1184" addr="0x7fdf085119d0" />
+                            <attribute name="storage" value="%constant" id="1185" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="int" id="1186" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="1187" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1188" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1189" addr="0x7ff9f1f92310" >
-                        <attributelist id="1190" addr="0x7ff9f1f92310" >
-                            <attribute name="sym_name" value="DRIVE_NOT_READY" id="1191" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="DRIVE_NOT_READY" id="1192" addr="0x7ff9f1fba9d0" />
-                            <attribute name="rawval" value="getDRIVE_NOT_READY()" id="1193" addr="0x7ff9f1fba9d0" />
-                            <attribute name="feature_immutable" value="1" id="1194" addr="0x7ff9f1fba9d0" />
-                            <attribute name="value" value="getDRIVE_NOT_READY()" id="1195" addr="0x7ff9f1fba9d0" />
-                            <attribute name="storage" value="%constant" id="1196" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="int" id="1197" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="1198" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1199" addr="0x7ff9f1fba9d0" />
+                    <constant id="1189" addr="0x7fdf084e9310" >
+                        <attributelist id="1190" addr="0x7fdf084e9310" >
+                            <attribute name="sym_name" value="DRIVE_NOT_READY" id="1191" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="DRIVE_NOT_READY" id="1192" addr="0x7fdf085119d0" />
+                            <attribute name="rawval" value="getDRIVE_NOT_READY()" id="1193" addr="0x7fdf085119d0" />
+                            <attribute name="feature_immutable" value="1" id="1194" addr="0x7fdf085119d0" />
+                            <attribute name="value" value="getDRIVE_NOT_READY()" id="1195" addr="0x7fdf085119d0" />
+                            <attribute name="storage" value="%constant" id="1196" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="int" id="1197" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="1198" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1199" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1200" addr="0x7ff9f1f92550" >
-                        <attributelist id="1201" addr="0x7ff9f1f92550" >
-                            <attribute name="sym_name" value="TRAY_CLOSED_NO_MEDIA" id="1202" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="TRAY_CLOSED_NO_MEDIA" id="1203" addr="0x7ff9f1fba9d0" />
-                            <attribute name="rawval" value="getTRAY_CLOSED_NO_MEDIA()" id="1204" addr="0x7ff9f1fba9d0" />
-                            <attribute name="feature_immutable" value="1" id="1205" addr="0x7ff9f1fba9d0" />
-                            <attribute name="value" value="getTRAY_CLOSED_NO_MEDIA()" id="1206" addr="0x7ff9f1fba9d0" />
-                            <attribute name="storage" value="%constant" id="1207" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="int" id="1208" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="1209" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1210" addr="0x7ff9f1fba9d0" />
+                    <constant id="1200" addr="0x7fdf084e9550" >
+                        <attributelist id="1201" addr="0x7fdf084e9550" >
+                            <attribute name="sym_name" value="TRAY_CLOSED_NO_MEDIA" id="1202" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="TRAY_CLOSED_NO_MEDIA" id="1203" addr="0x7fdf085119d0" />
+                            <attribute name="rawval" value="getTRAY_CLOSED_NO_MEDIA()" id="1204" addr="0x7fdf085119d0" />
+                            <attribute name="feature_immutable" value="1" id="1205" addr="0x7fdf085119d0" />
+                            <attribute name="value" value="getTRAY_CLOSED_NO_MEDIA()" id="1206" addr="0x7fdf085119d0" />
+                            <attribute name="storage" value="%constant" id="1207" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="int" id="1208" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="1209" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1210" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1211" addr="0x7ff9f1f92790" >
-                        <attributelist id="1212" addr="0x7ff9f1f92790" >
-                            <attribute name="sym_name" value="TRAY_CLOSED_MEDIA_PRESENT" id="1213" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="TRAY_CLOSED_MEDIA_PRESENT" id="1214" addr="0x7ff9f1fba9d0" />
-                            <attribute name="rawval" value="getTRAY_CLOSED_MEDIA_PRESENT()" id="1215" addr="0x7ff9f1fba9d0" />
-                            <attribute name="feature_immutable" value="1" id="1216" addr="0x7ff9f1fba9d0" />
-                            <attribute name="value" value="getTRAY_CLOSED_MEDIA_PRESENT()" id="1217" addr="0x7ff9f1fba9d0" />
-                            <attribute name="storage" value="%constant" id="1218" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="int" id="1219" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="1220" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1221" addr="0x7ff9f1fba9d0" />
+                    <constant id="1211" addr="0x7fdf084e9790" >
+                        <attributelist id="1212" addr="0x7fdf084e9790" >
+                            <attribute name="sym_name" value="TRAY_CLOSED_MEDIA_PRESENT" id="1213" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="TRAY_CLOSED_MEDIA_PRESENT" id="1214" addr="0x7fdf085119d0" />
+                            <attribute name="rawval" value="getTRAY_CLOSED_MEDIA_PRESENT()" id="1215" addr="0x7fdf085119d0" />
+                            <attribute name="feature_immutable" value="1" id="1216" addr="0x7fdf085119d0" />
+                            <attribute name="value" value="getTRAY_CLOSED_MEDIA_PRESENT()" id="1217" addr="0x7fdf085119d0" />
+                            <attribute name="storage" value="%constant" id="1218" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="int" id="1219" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="1220" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1221" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1222" addr="0x7ff9f1f929d0" >
-                        <attributelist id="1223" addr="0x7ff9f1f929d0" >
-                            <attribute name="sym_name" value="LOGDEBUG" id="1224" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="LOGDEBUG" id="1225" addr="0x7ff9f1fba9d0" />
-                            <attribute name="rawval" value="getLOGDEBUG()" id="1226" addr="0x7ff9f1fba9d0" />
-                            <attribute name="feature_immutable" value="1" id="1227" addr="0x7ff9f1fba9d0" />
-                            <attribute name="value" value="getLOGDEBUG()" id="1228" addr="0x7ff9f1fba9d0" />
-                            <attribute name="storage" value="%constant" id="1229" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="int" id="1230" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="1231" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1232" addr="0x7ff9f1fba9d0" />
+                    <constant id="1222" addr="0x7fdf084e99d0" >
+                        <attributelist id="1223" addr="0x7fdf084e99d0" >
+                            <attribute name="sym_name" value="LOGDEBUG" id="1224" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="LOGDEBUG" id="1225" addr="0x7fdf085119d0" />
+                            <attribute name="rawval" value="getLOGDEBUG()" id="1226" addr="0x7fdf085119d0" />
+                            <attribute name="feature_immutable" value="1" id="1227" addr="0x7fdf085119d0" />
+                            <attribute name="value" value="getLOGDEBUG()" id="1228" addr="0x7fdf085119d0" />
+                            <attribute name="storage" value="%constant" id="1229" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="int" id="1230" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="1231" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1232" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1233" addr="0x7ff9f1f92c10" >
-                        <attributelist id="1234" addr="0x7ff9f1f92c10" >
-                            <attribute name="sym_name" value="LOGINFO" id="1235" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="LOGINFO" id="1236" addr="0x7ff9f1fba9d0" />
-                            <attribute name="rawval" value="getLOGINFO()" id="1237" addr="0x7ff9f1fba9d0" />
-                            <attribute name="feature_immutable" value="1" id="1238" addr="0x7ff9f1fba9d0" />
-                            <attribute name="value" value="getLOGINFO()" id="1239" addr="0x7ff9f1fba9d0" />
-                            <attribute name="storage" value="%constant" id="1240" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="int" id="1241" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="1242" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1243" addr="0x7ff9f1fba9d0" />
+                    <constant id="1233" addr="0x7fdf084e9c10" >
+                        <attributelist id="1234" addr="0x7fdf084e9c10" >
+                            <attribute name="sym_name" value="LOGINFO" id="1235" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="LOGINFO" id="1236" addr="0x7fdf085119d0" />
+                            <attribute name="rawval" value="getLOGINFO()" id="1237" addr="0x7fdf085119d0" />
+                            <attribute name="feature_immutable" value="1" id="1238" addr="0x7fdf085119d0" />
+                            <attribute name="value" value="getLOGINFO()" id="1239" addr="0x7fdf085119d0" />
+                            <attribute name="storage" value="%constant" id="1240" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="int" id="1241" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="1242" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1243" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1244" addr="0x7ff9f1f92e50" >
-                        <attributelist id="1245" addr="0x7ff9f1f92e50" >
-                            <attribute name="sym_name" value="LOGNOTICE" id="1246" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="LOGNOTICE" id="1247" addr="0x7ff9f1fba9d0" />
-                            <attribute name="rawval" value="getLOGNOTICE()" id="1248" addr="0x7ff9f1fba9d0" />
-                            <attribute name="feature_immutable" value="1" id="1249" addr="0x7ff9f1fba9d0" />
-                            <attribute name="value" value="getLOGNOTICE()" id="1250" addr="0x7ff9f1fba9d0" />
-                            <attribute name="storage" value="%constant" id="1251" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="int" id="1252" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="1253" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1254" addr="0x7ff9f1fba9d0" />
+                    <constant id="1244" addr="0x7fdf084e9e50" >
+                        <attributelist id="1245" addr="0x7fdf084e9e50" >
+                            <attribute name="sym_name" value="LOGNOTICE" id="1246" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="LOGNOTICE" id="1247" addr="0x7fdf085119d0" />
+                            <attribute name="rawval" value="getLOGNOTICE()" id="1248" addr="0x7fdf085119d0" />
+                            <attribute name="feature_immutable" value="1" id="1249" addr="0x7fdf085119d0" />
+                            <attribute name="value" value="getLOGNOTICE()" id="1250" addr="0x7fdf085119d0" />
+                            <attribute name="storage" value="%constant" id="1251" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="int" id="1252" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="1253" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1254" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1255" addr="0x7ff9f1f93090" >
-                        <attributelist id="1256" addr="0x7ff9f1f93090" >
-                            <attribute name="sym_name" value="LOGWARNING" id="1257" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="LOGWARNING" id="1258" addr="0x7ff9f1fba9d0" />
-                            <attribute name="rawval" value="getLOGWARNING()" id="1259" addr="0x7ff9f1fba9d0" />
-                            <attribute name="feature_immutable" value="1" id="1260" addr="0x7ff9f1fba9d0" />
-                            <attribute name="value" value="getLOGWARNING()" id="1261" addr="0x7ff9f1fba9d0" />
-                            <attribute name="storage" value="%constant" id="1262" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="int" id="1263" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="1264" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1265" addr="0x7ff9f1fba9d0" />
+                    <constant id="1255" addr="0x7fdf084ea090" >
+                        <attributelist id="1256" addr="0x7fdf084ea090" >
+                            <attribute name="sym_name" value="LOGWARNING" id="1257" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="LOGWARNING" id="1258" addr="0x7fdf085119d0" />
+                            <attribute name="rawval" value="getLOGWARNING()" id="1259" addr="0x7fdf085119d0" />
+                            <attribute name="feature_immutable" value="1" id="1260" addr="0x7fdf085119d0" />
+                            <attribute name="value" value="getLOGWARNING()" id="1261" addr="0x7fdf085119d0" />
+                            <attribute name="storage" value="%constant" id="1262" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="int" id="1263" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="1264" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1265" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1266" addr="0x7ff9f1f932d0" >
-                        <attributelist id="1267" addr="0x7ff9f1f932d0" >
-                            <attribute name="sym_name" value="LOGERROR" id="1268" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="LOGERROR" id="1269" addr="0x7ff9f1fba9d0" />
-                            <attribute name="rawval" value="getLOGERROR()" id="1270" addr="0x7ff9f1fba9d0" />
-                            <attribute name="feature_immutable" value="1" id="1271" addr="0x7ff9f1fba9d0" />
-                            <attribute name="value" value="getLOGERROR()" id="1272" addr="0x7ff9f1fba9d0" />
-                            <attribute name="storage" value="%constant" id="1273" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="int" id="1274" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="1275" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1276" addr="0x7ff9f1fba9d0" />
+                    <constant id="1266" addr="0x7fdf084ea2d0" >
+                        <attributelist id="1267" addr="0x7fdf084ea2d0" >
+                            <attribute name="sym_name" value="LOGERROR" id="1268" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="LOGERROR" id="1269" addr="0x7fdf085119d0" />
+                            <attribute name="rawval" value="getLOGERROR()" id="1270" addr="0x7fdf085119d0" />
+                            <attribute name="feature_immutable" value="1" id="1271" addr="0x7fdf085119d0" />
+                            <attribute name="value" value="getLOGERROR()" id="1272" addr="0x7fdf085119d0" />
+                            <attribute name="storage" value="%constant" id="1273" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="int" id="1274" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="1275" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1276" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1277" addr="0x7ff9f1f93510" >
-                        <attributelist id="1278" addr="0x7ff9f1f93510" >
-                            <attribute name="sym_name" value="LOGSEVERE" id="1279" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="LOGSEVERE" id="1280" addr="0x7ff9f1fba9d0" />
-                            <attribute name="rawval" value="getLOGSEVERE()" id="1281" addr="0x7ff9f1fba9d0" />
-                            <attribute name="feature_immutable" value="1" id="1282" addr="0x7ff9f1fba9d0" />
-                            <attribute name="value" value="getLOGSEVERE()" id="1283" addr="0x7ff9f1fba9d0" />
-                            <attribute name="storage" value="%constant" id="1284" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="int" id="1285" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="1286" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1287" addr="0x7ff9f1fba9d0" />
+                    <constant id="1277" addr="0x7fdf084ea510" >
+                        <attributelist id="1278" addr="0x7fdf084ea510" >
+                            <attribute name="sym_name" value="LOGSEVERE" id="1279" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="LOGSEVERE" id="1280" addr="0x7fdf085119d0" />
+                            <attribute name="rawval" value="getLOGSEVERE()" id="1281" addr="0x7fdf085119d0" />
+                            <attribute name="feature_immutable" value="1" id="1282" addr="0x7fdf085119d0" />
+                            <attribute name="value" value="getLOGSEVERE()" id="1283" addr="0x7fdf085119d0" />
+                            <attribute name="storage" value="%constant" id="1284" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="int" id="1285" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="1286" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1287" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1288" addr="0x7ff9f1f93750" >
-                        <attributelist id="1289" addr="0x7ff9f1f93750" >
-                            <attribute name="sym_name" value="LOGFATAL" id="1290" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="LOGFATAL" id="1291" addr="0x7ff9f1fba9d0" />
-                            <attribute name="rawval" value="getLOGFATAL()" id="1292" addr="0x7ff9f1fba9d0" />
-                            <attribute name="feature_immutable" value="1" id="1293" addr="0x7ff9f1fba9d0" />
-                            <attribute name="value" value="getLOGFATAL()" id="1294" addr="0x7ff9f1fba9d0" />
-                            <attribute name="storage" value="%constant" id="1295" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="int" id="1296" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="1297" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1298" addr="0x7ff9f1fba9d0" />
+                    <constant id="1288" addr="0x7fdf084ea750" >
+                        <attributelist id="1289" addr="0x7fdf084ea750" >
+                            <attribute name="sym_name" value="LOGFATAL" id="1290" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="LOGFATAL" id="1291" addr="0x7fdf085119d0" />
+                            <attribute name="rawval" value="getLOGFATAL()" id="1292" addr="0x7fdf085119d0" />
+                            <attribute name="feature_immutable" value="1" id="1293" addr="0x7fdf085119d0" />
+                            <attribute name="value" value="getLOGFATAL()" id="1294" addr="0x7fdf085119d0" />
+                            <attribute name="storage" value="%constant" id="1295" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="int" id="1296" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="1297" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1298" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1299" addr="0x7ff9f1f93990" >
-                        <attributelist id="1300" addr="0x7ff9f1f93990" >
-                            <attribute name="sym_name" value="LOGNONE" id="1301" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="LOGNONE" id="1302" addr="0x7ff9f1fba9d0" />
-                            <attribute name="rawval" value="getLOGNONE()" id="1303" addr="0x7ff9f1fba9d0" />
-                            <attribute name="feature_immutable" value="1" id="1304" addr="0x7ff9f1fba9d0" />
-                            <attribute name="value" value="getLOGNONE()" id="1305" addr="0x7ff9f1fba9d0" />
-                            <attribute name="storage" value="%constant" id="1306" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="int" id="1307" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="1308" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1309" addr="0x7ff9f1fba9d0" />
+                    <constant id="1299" addr="0x7fdf084ea990" >
+                        <attributelist id="1300" addr="0x7fdf084ea990" >
+                            <attribute name="sym_name" value="LOGNONE" id="1301" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="LOGNONE" id="1302" addr="0x7fdf085119d0" />
+                            <attribute name="rawval" value="getLOGNONE()" id="1303" addr="0x7fdf085119d0" />
+                            <attribute name="feature_immutable" value="1" id="1304" addr="0x7fdf085119d0" />
+                            <attribute name="value" value="getLOGNONE()" id="1305" addr="0x7fdf085119d0" />
+                            <attribute name="storage" value="%constant" id="1306" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="int" id="1307" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="1308" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1309" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1310" addr="0x7ff9f1f93bd0" >
-                        <attributelist id="1311" addr="0x7ff9f1f93bd0" >
-                            <attribute name="sym_name" value="ISO_639_1" id="1312" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="ISO_639_1" id="1313" addr="0x7ff9f1fba9d0" />
-                            <attribute name="rawval" value="getISO_639_1()" id="1314" addr="0x7ff9f1fba9d0" />
-                            <attribute name="feature_immutable" value="1" id="1315" addr="0x7ff9f1fba9d0" />
-                            <attribute name="value" value="getISO_639_1()" id="1316" addr="0x7ff9f1fba9d0" />
-                            <attribute name="storage" value="%constant" id="1317" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="int" id="1318" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="1319" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1320" addr="0x7ff9f1fba9d0" />
+                    <constant id="1310" addr="0x7fdf084eabd0" >
+                        <attributelist id="1311" addr="0x7fdf084eabd0" >
+                            <attribute name="sym_name" value="ISO_639_1" id="1312" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="ISO_639_1" id="1313" addr="0x7fdf085119d0" />
+                            <attribute name="rawval" value="getISO_639_1()" id="1314" addr="0x7fdf085119d0" />
+                            <attribute name="feature_immutable" value="1" id="1315" addr="0x7fdf085119d0" />
+                            <attribute name="value" value="getISO_639_1()" id="1316" addr="0x7fdf085119d0" />
+                            <attribute name="storage" value="%constant" id="1317" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="int" id="1318" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="1319" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1320" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1321" addr="0x7ff9f1f93e10" >
-                        <attributelist id="1322" addr="0x7ff9f1f93e10" >
-                            <attribute name="sym_name" value="ISO_639_2" id="1323" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="ISO_639_2" id="1324" addr="0x7ff9f1fba9d0" />
-                            <attribute name="rawval" value="getISO_639_2()" id="1325" addr="0x7ff9f1fba9d0" />
-                            <attribute name="feature_immutable" value="1" id="1326" addr="0x7ff9f1fba9d0" />
-                            <attribute name="value" value="getISO_639_2()" id="1327" addr="0x7ff9f1fba9d0" />
-                            <attribute name="storage" value="%constant" id="1328" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="int" id="1329" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="1330" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1331" addr="0x7ff9f1fba9d0" />
+                    <constant id="1321" addr="0x7fdf084eae10" >
+                        <attributelist id="1322" addr="0x7fdf084eae10" >
+                            <attribute name="sym_name" value="ISO_639_2" id="1323" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="ISO_639_2" id="1324" addr="0x7fdf085119d0" />
+                            <attribute name="rawval" value="getISO_639_2()" id="1325" addr="0x7fdf085119d0" />
+                            <attribute name="feature_immutable" value="1" id="1326" addr="0x7fdf085119d0" />
+                            <attribute name="value" value="getISO_639_2()" id="1327" addr="0x7fdf085119d0" />
+                            <attribute name="storage" value="%constant" id="1328" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="int" id="1329" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="1330" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1331" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1332" addr="0x7ff9f1f94050" >
-                        <attributelist id="1333" addr="0x7ff9f1f94050" >
-                            <attribute name="sym_name" value="ENGLISH_NAME" id="1334" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="ENGLISH_NAME" id="1335" addr="0x7ff9f1fba9d0" />
-                            <attribute name="rawval" value="getENGLISH_NAME()" id="1336" addr="0x7ff9f1fba9d0" />
-                            <attribute name="feature_immutable" value="1" id="1337" addr="0x7ff9f1fba9d0" />
-                            <attribute name="value" value="getENGLISH_NAME()" id="1338" addr="0x7ff9f1fba9d0" />
-                            <attribute name="storage" value="%constant" id="1339" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="int" id="1340" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="1341" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1342" addr="0x7ff9f1fba9d0" />
+                    <constant id="1332" addr="0x7fdf084eb050" >
+                        <attributelist id="1333" addr="0x7fdf084eb050" >
+                            <attribute name="sym_name" value="ENGLISH_NAME" id="1334" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="ENGLISH_NAME" id="1335" addr="0x7fdf085119d0" />
+                            <attribute name="rawval" value="getENGLISH_NAME()" id="1336" addr="0x7fdf085119d0" />
+                            <attribute name="feature_immutable" value="1" id="1337" addr="0x7fdf085119d0" />
+                            <attribute name="value" value="getENGLISH_NAME()" id="1338" addr="0x7fdf085119d0" />
+                            <attribute name="storage" value="%constant" id="1339" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="int" id="1340" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="1341" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1342" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </constant >
                 </namespace >
             </namespace >
         </include >
-        <include id="1343" addr="0x7ff9f1f94910" >
-            <attributelist id="1344" addr="0x7ff9f1f94910" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/Player.h" id="1345" addr="0x7ff9f1fba9d0" />
+        <include id="1343" addr="0x7fdf084eb910" >
+            <attributelist id="1344" addr="0x7fdf084eb910" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/Player.h" id="1345" addr="0x7fdf085119d0" />
             </attributelist >
 
-            <namespace id="1346" addr="0x7ff9f1f949b0" >
-                <attributelist id="1347" addr="0x7ff9f1f949b0" >
-                    <attribute name="sym_name" value="XBMCAddon" id="1348" addr="0x7ff9f1fba9d0" />
-                    <attribute name="name" value="XBMCAddon" id="1349" addr="0x7ff9f1fba9d0" />
-                    <attribute name="sym_previousSibling" value="0x7ff9f1f8a210" id="1350" addr="0x7ff9f1f8a210" />
-                    <attribute name="csym_nextSibling" value="0x7ff9f1f9e2d0" id="1351" addr="0x7ff9f1f9e2d0" />
-                    <attribute name="sym_nextSibling" value="0x7ff9f1f9e2d0" id="1352" addr="0x7ff9f1f9e2d0" />
-                    <typescope id="1353" addr="0x7ff9f1fb4990" >
-                        <attributelist id="1354" addr="0x7ff9f1fb4990" >
-                            <attribute name="name" value="XBMCAddon" id="1355" addr="0x7ff9f1fba9d0" />
-                            <typetab id="1356" addr="0x7ff9f1fb49d0" >
-                                <attributelist id="1357" addr="0x7ff9f1fb49d0" >
-                                    <attribute name="String" value="std::string" id="1358" addr="0x7ff9f1fba9d0" />
+            <namespace id="1346" addr="0x7fdf084eb9b0" >
+                <attributelist id="1347" addr="0x7fdf084eb9b0" >
+                    <attribute name="sym_name" value="XBMCAddon" id="1348" addr="0x7fdf085119d0" />
+                    <attribute name="name" value="XBMCAddon" id="1349" addr="0x7fdf085119d0" />
+                    <attribute name="sym_previousSibling" value="0x7fdf084e1210" id="1350" addr="0x7fdf084e1210" />
+                    <attribute name="csym_nextSibling" value="0x7fdf084f52d0" id="1351" addr="0x7fdf084f52d0" />
+                    <attribute name="sym_nextSibling" value="0x7fdf084f52d0" id="1352" addr="0x7fdf084f52d0" />
+                    <typescope id="1353" addr="0x7fdf0850b990" >
+                        <attributelist id="1354" addr="0x7fdf0850b990" >
+                            <attribute name="name" value="XBMCAddon" id="1355" addr="0x7fdf085119d0" />
+                            <typetab id="1356" addr="0x7fdf0850b9d0" >
+                                <attributelist id="1357" addr="0x7fdf0850b9d0" >
+                                    <attribute name="String" value="std::string" id="1358" addr="0x7fdf085119d0" />
                                 </attributelist >
-                                <typetabsitem id="1359" addr="0x7ff9f1fb4bb0" >
-                                    <attributelist id="1360" addr="0x7ff9f1fb4bb0" >
+                                <typetabsitem id="1359" addr="0x7fdf0850bbb0" >
+                                    <attributelist id="1360" addr="0x7fdf0850bbb0" >
                                     </attributelist >
                                 </typetabsitem >
                             </typetab >
-                            <attribute name="parent" value="0x7ff9f1f72a30" id="1361" addr="0x7ff9f1f72a30" />
-                            <attribute name="qname" value="XBMCAddon" id="1362" addr="0x7ff9f1fba9d0" />
-                            <attribute name="symtab" value="0x7ff9f1f89bb0" id="1363" addr="0x7ff9f1f89bb0" />
+                            <attribute name="parent" value="0x7fdf084c9a30" id="1361" addr="0x7fdf084c9a30" />
+                            <attribute name="qname" value="XBMCAddon" id="1362" addr="0x7fdf085119d0" />
+                            <attribute name="symtab" value="0x7fdf084e0bb0" id="1363" addr="0x7fdf084e0bb0" />
                         </attributelist >
-                        <typescopesitem id="1364" addr="0x7ff9f1f89b70" >
-                            <attributelist id="1365" addr="0x7ff9f1f89b70" >
+                        <typescopesitem id="1364" addr="0x7fdf084e0b70" >
+                            <attributelist id="1365" addr="0x7fdf084e0b70" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="1366" addr="0x7ff9f1fb49d0" >
-                            <attributelist id="1367" addr="0x7ff9f1fb49d0" >
-                                <attribute name="String" value="std::string" id="1368" addr="0x7ff9f1fba9d0" />
+                        <typescopesitem id="1366" addr="0x7fdf0850b9d0" >
+                            <attributelist id="1367" addr="0x7fdf0850b9d0" >
+                                <attribute name="String" value="std::string" id="1368" addr="0x7fdf085119d0" />
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="1369" addr="0x7ff9f1f72a30" >
-                            <attributelist id="1370" addr="0x7ff9f1f72a30" >
-                                <attribute name="name" value="" id="1371" addr="0x7ff9f1fba9d0" />
-                                <typetab id="1372" addr="0x7ff9f1f72a90" >
-                                    <attributelist id="1373" addr="0x7ff9f1f72a90" >
-                                        <attribute name="CGUIDialogKeyboardGeneric" value="CGUIDialogKeyboardGeneric" id="1374" addr="0x7ff9f1fba9d0" />
+                        <typescopesitem id="1369" addr="0x7fdf084c9a30" >
+                            <attributelist id="1370" addr="0x7fdf084c9a30" >
+                                <attribute name="name" value="" id="1371" addr="0x7fdf085119d0" />
+                                <typetab id="1372" addr="0x7fdf084c9a90" >
+                                    <attributelist id="1373" addr="0x7fdf084c9a90" >
+                                        <attribute name="CGUIDialogKeyboardGeneric" value="CGUIDialogKeyboardGeneric" id="1374" addr="0x7fdf085119d0" />
                                     </attributelist >
-                                    <typetabsitem id="1375" addr="0x7ff9f1fb7950" >
-                                        <attributelist id="1376" addr="0x7ff9f1fb7950" >
+                                    <typetabsitem id="1375" addr="0x7fdf0850e950" >
+                                        <attributelist id="1376" addr="0x7fdf0850e950" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="1377" addr="0x7ff9f1fb4ad0" >
-                            <attributelist id="1378" addr="0x7ff9f1fb4ad0" >
+                        <typescopesitem id="1377" addr="0x7fdf0850bad0" >
+                            <attributelist id="1378" addr="0x7fdf0850bad0" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="1379" addr="0x7ff9f1f89bb0" >
-                            <attributelist id="1380" addr="0x7ff9f1f89bb0" >
-                                <attribute name="name" value="XBMCAddon" id="1381" addr="0x7ff9f1fba9d0" />
-                                <attribute name="csymtab" value="0x7ff9f1f89bf0" id="1382" addr="0x7ff9f1f89bf0" />
-                                <attribute name="symtab" value="0x7ff9f1f89b90" id="1383" addr="0x7ff9f1f89b90" />
+                        <typescopesitem id="1379" addr="0x7fdf084e0bb0" >
+                            <attributelist id="1380" addr="0x7fdf084e0bb0" >
+                                <attribute name="name" value="XBMCAddon" id="1381" addr="0x7fdf085119d0" />
+                                <attribute name="csymtab" value="0x7fdf084e0bf0" id="1382" addr="0x7fdf084e0bf0" />
+                                <attribute name="symtab" value="0x7fdf084e0b90" id="1383" addr="0x7fdf084e0b90" />
                             </attributelist >
                         </typescopesitem >
                     </typescope >
-                    <attribute name="symtab" value="0x7ff9f1f89bb0" id="1384" addr="0x7ff9f1f89bb0" />
-                    <attribute name="sym_symtab" value="0x7ff9f1f72950" id="1385" addr="0x7ff9f1f72950" />
+                    <attribute name="symtab" value="0x7fdf084e0bb0" id="1384" addr="0x7fdf084e0bb0" />
+                    <attribute name="sym_symtab" value="0x7fdf084c9950" id="1385" addr="0x7fdf084c9950" />
                 </attributelist >
 
-                <namespace id="1386" addr="0x7ff9f1f94a30" >
-                    <attributelist id="1387" addr="0x7ff9f1f94a30" >
-                        <attribute name="feature_knownbasetypes" value="AddonClass,IPlayerCallback,AddonCallback" id="1388" addr="0x7ff9f1fba9d0" />
-                        <attribute name="name" value="xbmc" id="1389" addr="0x7ff9f1fba9d0" />
-                        <attribute name="sym_symtab" value="0x7ff9f1f89bb0" id="1390" addr="0x7ff9f1f89bb0" />
-                        <attribute name="symtab" value="0x7ff9f1f8a2b0" id="1391" addr="0x7ff9f1f8a2b0" />
-                        <attribute name="sym_nextSibling" value="0x7ff9f1f9e350" id="1392" addr="0x7ff9f1f9e350" />
-                        <attribute name="csym_nextSibling" value="0x7ff9f1f9e350" id="1393" addr="0x7ff9f1f9e350" />
-                        <attribute name="sym_previousSibling" value="0x7ff9f1f8a330" id="1394" addr="0x7ff9f1f8a330" />
-                        <attribute name="feature_knownapitypes" value="XBMCAddon::xbmcgui::ListItem,XBMCAddon::xbmc::PlayListItem" id="1395" addr="0x7ff9f1fba9d0" />
-                        <attribute name="sym_name" value="xbmc" id="1396" addr="0x7ff9f1fba9d0" />
-                        <typescope id="1397" addr="0x7ff9f1fb4d70" >
-                            <attributelist id="1398" addr="0x7ff9f1fb4d70" >
-                                <attribute name="name" value="xbmc" id="1399" addr="0x7ff9f1fba9d0" />
-                                <typetab id="1400" addr="0x7ff9f1fb4d90" >
-                                    <attributelist id="1401" addr="0x7ff9f1fb4d90" >
-                                        <attribute name="Monitor" value="Monitor" id="1402" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="1403" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="Keyboard" value="Keyboard" id="1404" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="1405" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="InfoTagVideo" value="InfoTagVideo" id="1406" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="Player" value="Player" id="1407" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="InfoTagMusic" value="InfoTagMusic" id="1408" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="PlayList" value="PlayList" id="1409" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="RenderCapture" value="RenderCapture" id="1410" addr="0x7ff9f1fba9d0" />
+                <namespace id="1386" addr="0x7fdf084eba30" >
+                    <attributelist id="1387" addr="0x7fdf084eba30" >
+                        <attribute name="feature_knownbasetypes" value="AddonClass,IPlayerCallback,AddonCallback" id="1388" addr="0x7fdf085119d0" />
+                        <attribute name="name" value="xbmc" id="1389" addr="0x7fdf085119d0" />
+                        <attribute name="sym_symtab" value="0x7fdf084e0bb0" id="1390" addr="0x7fdf084e0bb0" />
+                        <attribute name="symtab" value="0x7fdf084e12b0" id="1391" addr="0x7fdf084e12b0" />
+                        <attribute name="sym_nextSibling" value="0x7fdf084f5350" id="1392" addr="0x7fdf084f5350" />
+                        <attribute name="csym_nextSibling" value="0x7fdf084f5350" id="1393" addr="0x7fdf084f5350" />
+                        <attribute name="sym_previousSibling" value="0x7fdf084e1330" id="1394" addr="0x7fdf084e1330" />
+                        <attribute name="feature_knownapitypes" value="XBMCAddon::xbmcgui::ListItem,XBMCAddon::xbmc::PlayListItem" id="1395" addr="0x7fdf085119d0" />
+                        <attribute name="sym_name" value="xbmc" id="1396" addr="0x7fdf085119d0" />
+                        <typescope id="1397" addr="0x7fdf0850bd70" >
+                            <attributelist id="1398" addr="0x7fdf0850bd70" >
+                                <attribute name="name" value="xbmc" id="1399" addr="0x7fdf085119d0" />
+                                <typetab id="1400" addr="0x7fdf0850bd90" >
+                                    <attributelist id="1401" addr="0x7fdf0850bd90" >
+                                        <attribute name="Monitor" value="Monitor" id="1402" addr="0x7fdf085119d0" />
+                                        <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="1403" addr="0x7fdf085119d0" />
+                                        <attribute name="Keyboard" value="Keyboard" id="1404" addr="0x7fdf085119d0" />
+                                        <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="1405" addr="0x7fdf085119d0" />
+                                        <attribute name="InfoTagVideo" value="InfoTagVideo" id="1406" addr="0x7fdf085119d0" />
+                                        <attribute name="Player" value="Player" id="1407" addr="0x7fdf085119d0" />
+                                        <attribute name="InfoTagMusic" value="InfoTagMusic" id="1408" addr="0x7fdf085119d0" />
+                                        <attribute name="PlayList" value="PlayList" id="1409" addr="0x7fdf085119d0" />
+                                        <attribute name="RenderCapture" value="RenderCapture" id="1410" addr="0x7fdf085119d0" />
                                     </attributelist >
-                                    <typetabsitem id="1411" addr="0x7ff9f1fb9b10" >
-                                        <attributelist id="1412" addr="0x7ff9f1fb9b10" >
+                                    <typetabsitem id="1411" addr="0x7fdf08510b10" >
+                                        <attributelist id="1412" addr="0x7fdf08510b10" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1413" addr="0x7ff9f1fb7f30" >
-                                        <attributelist id="1414" addr="0x7ff9f1fb7f30" >
+                                    <typetabsitem id="1413" addr="0x7fdf0850ef30" >
+                                        <attributelist id="1414" addr="0x7fdf0850ef30" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1415" addr="0x7ff9f1fb8990" >
-                                        <attributelist id="1416" addr="0x7ff9f1fb8990" >
+                                    <typetabsitem id="1415" addr="0x7fdf0850f990" >
+                                        <attributelist id="1416" addr="0x7fdf0850f990" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1417" addr="0x7ff9f1fb5e90" >
-                                        <attributelist id="1418" addr="0x7ff9f1fb5e90" >
+                                    <typetabsitem id="1417" addr="0x7fdf0850ce90" >
+                                        <attributelist id="1418" addr="0x7fdf0850ce90" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1419" addr="0x7ff9f1fb8310" >
-                                        <attributelist id="1420" addr="0x7ff9f1fb8310" >
+                                    <typetabsitem id="1419" addr="0x7fdf0850f310" >
+                                        <attributelist id="1420" addr="0x7fdf0850f310" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1421" addr="0x7ff9f1fb6050" >
-                                        <attributelist id="1422" addr="0x7ff9f1fb6050" >
+                                    <typetabsitem id="1421" addr="0x7fdf0850d050" >
+                                        <attributelist id="1422" addr="0x7fdf0850d050" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1423" addr="0x7ff9f1fb7b50" >
-                                        <attributelist id="1424" addr="0x7ff9f1fb7b50" >
+                                    <typetabsitem id="1423" addr="0x7fdf0850eb50" >
+                                        <attributelist id="1424" addr="0x7fdf0850eb50" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1425" addr="0x7ff9f1fb91b0" >
-                                        <attributelist id="1426" addr="0x7ff9f1fb91b0" >
+                                    <typetabsitem id="1425" addr="0x7fdf085101b0" >
+                                        <attributelist id="1426" addr="0x7fdf085101b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1427" addr="0x7ff9f1fb7490" >
-                                        <attributelist id="1428" addr="0x7ff9f1fb7490" >
+                                    <typetabsitem id="1427" addr="0x7fdf0850e490" >
+                                        <attributelist id="1428" addr="0x7fdf0850e490" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
-                                <attribute name="parent" value="0x7ff9f1fb4990" id="1429" addr="0x7ff9f1fb4990" />
-                                <attribute name="qname" value="XBMCAddon::xbmc" id="1430" addr="0x7ff9f1fba9d0" />
-                                <attribute name="symtab" value="0x7ff9f1f8a2b0" id="1431" addr="0x7ff9f1f8a2b0" />
+                                <attribute name="parent" value="0x7fdf0850b990" id="1429" addr="0x7fdf0850b990" />
+                                <attribute name="qname" value="XBMCAddon::xbmc" id="1430" addr="0x7fdf085119d0" />
+                                <attribute name="symtab" value="0x7fdf084e12b0" id="1431" addr="0x7fdf084e12b0" />
                             </attributelist >
-                            <typescopesitem id="1432" addr="0x7ff9f1f8a270" >
-                                <attributelist id="1433" addr="0x7ff9f1f8a270" >
+                            <typescopesitem id="1432" addr="0x7fdf084e1270" >
+                                <attributelist id="1433" addr="0x7fdf084e1270" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="1434" addr="0x7ff9f1fb4d90" >
-                                <attributelist id="1435" addr="0x7ff9f1fb4d90" >
-                                    <attribute name="Monitor" value="Monitor" id="1436" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="1437" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="Keyboard" value="Keyboard" id="1438" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="1439" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="InfoTagVideo" value="InfoTagVideo" id="1440" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="Player" value="Player" id="1441" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="InfoTagMusic" value="InfoTagMusic" id="1442" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="PlayList" value="PlayList" id="1443" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="RenderCapture" value="RenderCapture" id="1444" addr="0x7ff9f1fba9d0" />
+                            <typescopesitem id="1434" addr="0x7fdf0850bd90" >
+                                <attributelist id="1435" addr="0x7fdf0850bd90" >
+                                    <attribute name="Monitor" value="Monitor" id="1436" addr="0x7fdf085119d0" />
+                                    <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="1437" addr="0x7fdf085119d0" />
+                                    <attribute name="Keyboard" value="Keyboard" id="1438" addr="0x7fdf085119d0" />
+                                    <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="1439" addr="0x7fdf085119d0" />
+                                    <attribute name="InfoTagVideo" value="InfoTagVideo" id="1440" addr="0x7fdf085119d0" />
+                                    <attribute name="Player" value="Player" id="1441" addr="0x7fdf085119d0" />
+                                    <attribute name="InfoTagMusic" value="InfoTagMusic" id="1442" addr="0x7fdf085119d0" />
+                                    <attribute name="PlayList" value="PlayList" id="1443" addr="0x7fdf085119d0" />
+                                    <attribute name="RenderCapture" value="RenderCapture" id="1444" addr="0x7fdf085119d0" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="1445" addr="0x7ff9f1fb4990" >
-                                <attributelist id="1446" addr="0x7ff9f1fb4990" >
-                                    <attribute name="name" value="XBMCAddon" id="1447" addr="0x7ff9f1fba9d0" />
-                                    <typetab id="1448" addr="0x7ff9f1fb49d0" >
-                                        <attributelist id="1449" addr="0x7ff9f1fb49d0" >
-                                            <attribute name="String" value="std::string" id="1450" addr="0x7ff9f1fba9d0" />
-                                        </attributelist >
-                                        <typetabsitem id="1451" addr="0x7ff9f1fb4bb0" >
-                                            <attributelist id="1452" addr="0x7ff9f1fb4bb0" >
+                            <typescopesitem id="1445" addr="0x7fdf0850b990" >
+                                <attributelist id="1446" addr="0x7fdf0850b990" >
+                                    <attribute name="name" value="XBMCAddon" id="1447" addr="0x7fdf085119d0" />
+                                    <typetab id="1448" addr="0x7fdf0850b9d0" >
+                                        <attributelist id="1449" addr="0x7fdf0850b9d0" >
+                                            <attribute name="String" value="std::string" id="1450" addr="0x7fdf085119d0" />
+                                        </attributelist >
+                                        <typetabsitem id="1451" addr="0x7fdf0850bbb0" >
+                                            <attributelist id="1452" addr="0x7fdf0850bbb0" >
                                             </attributelist >
                                         </typetabsitem >
                                     </typetab >
-                                    <attribute name="parent" value="0x7ff9f1f72a30" id="1453" addr="0x7ff9f1f72a30" />
-                                    <attribute name="qname" value="XBMCAddon" id="1454" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="symtab" value="0x7ff9f1f89bb0" id="1455" addr="0x7ff9f1f89bb0" />
+                                    <attribute name="parent" value="0x7fdf084c9a30" id="1453" addr="0x7fdf084c9a30" />
+                                    <attribute name="qname" value="XBMCAddon" id="1454" addr="0x7fdf085119d0" />
+                                    <attribute name="symtab" value="0x7fdf084e0bb0" id="1455" addr="0x7fdf084e0bb0" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="1456" addr="0x7ff9f1fb4db0" >
-                                <attributelist id="1457" addr="0x7ff9f1fb4db0" >
+                            <typescopesitem id="1456" addr="0x7fdf0850bdb0" >
+                                <attributelist id="1457" addr="0x7fdf0850bdb0" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="1458" addr="0x7ff9f1f8a2b0" >
-                                <attributelist id="1459" addr="0x7ff9f1f8a2b0" >
-                                    <attribute name="name" value="xbmc" id="1460" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="csymtab" value="0x7ff9f1f8a2f0" id="1461" addr="0x7ff9f1f8a2f0" />
-                                    <attribute name="symtab" value="0x7ff9f1f8a290" id="1462" addr="0x7ff9f1f8a290" />
+                            <typescopesitem id="1458" addr="0x7fdf084e12b0" >
+                                <attributelist id="1459" addr="0x7fdf084e12b0" >
+                                    <attribute name="name" value="xbmc" id="1460" addr="0x7fdf085119d0" />
+                                    <attribute name="csymtab" value="0x7fdf084e12f0" id="1461" addr="0x7fdf084e12f0" />
+                                    <attribute name="symtab" value="0x7fdf084e1290" id="1462" addr="0x7fdf084e1290" />
                                 </attributelist >
                             </typescopesitem >
                         </typescope >
                     </attributelist >
 
-                    <cdecl id="1463" addr="0x7ff9f1f94b90" >
-                        <attributelist id="1464" addr="0x7ff9f1f94b90" >
-                            <attribute name="sym_name" value="PlayerException" id="1465" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="XBMCAddon::xbmc::PlayerException" id="1466" addr="0x7ff9f1fba9d0" />
-                            <attribute name="kind" value="variable" id="1467" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="XBMCCOMMONS_STANDARD_EXCEPTION" id="1468" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="1469" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1470" addr="0x7ff9f1fba9d0" />
+                    <cdecl id="1463" addr="0x7fdf084ebb90" >
+                        <attributelist id="1464" addr="0x7fdf084ebb90" >
+                            <attribute name="sym_name" value="PlayerException" id="1465" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="XBMCAddon::xbmc::PlayerException" id="1466" addr="0x7fdf085119d0" />
+                            <attribute name="kind" value="variable" id="1467" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="XBMCCOMMONS_STANDARD_EXCEPTION" id="1468" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="1469" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1470" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="1471" addr="0x7ff9f1f94ed0" >
-                        <attributelist id="1472" addr="0x7ff9f1f94ed0" >
-                            <attribute name="sym_name" value="PlayParameter" id="1473" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="XBMCAddon::xbmc::PlayParameter" id="1474" addr="0x7ff9f1fba9d0" />
-                            <attribute name="decl" value="" id="1475" addr="0x7ff9f1fba9d0" />
-                            <attribute name="storage" value="typedef" id="1476" addr="0x7ff9f1fba9d0" />
-                            <attribute name="kind" value="typedef" id="1477" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="1478" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="1479" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1480" addr="0x7ff9f1fba9d0" />
+                    <cdecl id="1471" addr="0x7fdf084ebed0" >
+                        <attributelist id="1472" addr="0x7fdf084ebed0" >
+                            <attribute name="sym_name" value="PlayParameter" id="1473" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="XBMCAddon::xbmc::PlayParameter" id="1474" addr="0x7fdf085119d0" />
+                            <attribute name="decl" value="" id="1475" addr="0x7fdf085119d0" />
+                            <attribute name="storage" value="typedef" id="1476" addr="0x7fdf085119d0" />
+                            <attribute name="kind" value="typedef" id="1477" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="1478" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="1479" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1480" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <class id="1481" addr="0x7ff9f1f95370" >
-                        <attributelist id="1482" addr="0x7ff9f1f95370" >
-                            <attribute name="name" value="XBMCAddon::xbmc::Player" id="1483" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="1484" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="symtab" value="0x7ff9f1f95550" id="1485" addr="0x7ff9f1f95550" />
-                            <attribute name="allows_typedef" value="1" id="1486" addr="0x7ff9f1fba9d0" />
-                            <attribute name="typepass_visit" value="1" id="1487" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_visit" value="1" id="1488" addr="0x7ff9f1fba9d0" />
-                            <attribute name="kind" value="class" id="1489" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_name" value="Player" id="1490" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_default_constructor" value="1" id="1491" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_has_constructor" value="1" id="1492" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_public_constructor" value="1" id="1493" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_has_destructor" value="1" id="1494" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_default_destructor" value="1" id="1495" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_copy_constructor" value="1" id="1496" addr="0x7ff9f1fba9d0" />
-                            <attribute name="privatebaselist" value="0x7ff9f1f950f0" id="1497" addr="0x7ff9f1f950f0" />
-                            <attribute name="protectedbaselist" value="0x7ff9f1f950d0" id="1498" addr="0x7ff9f1f950d0" />
-                            <baselist id="1499" addr="0x7ff9f1f950b0" >
-                                <base name="AddonCallback" id="1500" addr="0x7ff9f1f95070" />
-                                <base name="IPlayerCallback" id="1501" addr="0x7ff9f1f95210" />
+                    <class id="1481" addr="0x7fdf084ec370" >
+                        <attributelist id="1482" addr="0x7fdf084ec370" >
+                            <attribute name="name" value="XBMCAddon::xbmc::Player" id="1483" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="1484" addr="0x7fdf084e12b0" />
+                            <attribute name="symtab" value="0x7fdf084ec550" id="1485" addr="0x7fdf084ec550" />
+                            <attribute name="allows_typedef" value="1" id="1486" addr="0x7fdf085119d0" />
+                            <attribute name="typepass_visit" value="1" id="1487" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_visit" value="1" id="1488" addr="0x7fdf085119d0" />
+                            <attribute name="kind" value="class" id="1489" addr="0x7fdf085119d0" />
+                            <attribute name="sym_name" value="Player" id="1490" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_default_constructor" value="1" id="1491" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_has_constructor" value="1" id="1492" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_public_constructor" value="1" id="1493" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_has_destructor" value="1" id="1494" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_default_destructor" value="1" id="1495" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_copy_constructor" value="1" id="1496" addr="0x7fdf085119d0" />
+                            <attribute name="privatebaselist" value="0x7fdf084ec0f0" id="1497" addr="0x7fdf084ec0f0" />
+                            <attribute name="protectedbaselist" value="0x7fdf084ec0d0" id="1498" addr="0x7fdf084ec0d0" />
+                            <baselist id="1499" addr="0x7fdf084ec0b0" >
+                                <base name="AddonCallback" id="1500" addr="0x7fdf084ec070" />
+                                <base name="IPlayerCallback" id="1501" addr="0x7fdf084ec210" />
                             </baselist >
-                            <attribute name="module" value="xbmc" id="1502" addr="0x7ff9f1f89430" />
-                            <attribute name="feature_director" value="1" id="1503" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1504" addr="0x7ff9f1fba9d0" />
-                            <typescope id="1505" addr="0x7ff9f1fb6230" >
-                                <attributelist id="1506" addr="0x7ff9f1fb6230" >
-                                    <attribute name="name" value="Player" id="1507" addr="0x7ff9f1fba9d0" />
-                                    <typetab id="1508" addr="0x7ff9f1fb6250" >
-                                        <attributelist id="1509" addr="0x7ff9f1fb6250" >
+                            <attribute name="module" value="xbmc" id="1502" addr="0x7fdf084e0430" />
+                            <attribute name="feature_director" value="1" id="1503" addr="0x7fdf085119d0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1504" addr="0x7fdf085119d0" />
+                            <typescope id="1505" addr="0x7fdf0850d230" >
+                                <attributelist id="1506" addr="0x7fdf0850d230" >
+                                    <attribute name="name" value="Player" id="1507" addr="0x7fdf085119d0" />
+                                    <typetab id="1508" addr="0x7fdf0850d250" >
+                                        <attributelist id="1509" addr="0x7fdf0850d250" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7ff9f1fb4d70" id="1510" addr="0x7ff9f1fb4d70" />
-                                    <attribute name="qname" value="XBMCAddon::xbmc::Player" id="1511" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="symtab" value="0x7ff9f1f95550" id="1512" addr="0x7ff9f1f95550" />
+                                    <attribute name="parent" value="0x7fdf0850bd70" id="1510" addr="0x7fdf0850bd70" />
+                                    <attribute name="qname" value="XBMCAddon::xbmc::Player" id="1511" addr="0x7fdf085119d0" />
+                                    <attribute name="symtab" value="0x7fdf084ec550" id="1512" addr="0x7fdf084ec550" />
                                 </attributelist >
-                                <typescopesitem id="1513" addr="0x7ff9f1fb6150" >
-                                    <attributelist id="1514" addr="0x7ff9f1fb6150" >
+                                <typescopesitem id="1513" addr="0x7fdf0850d150" >
+                                    <attributelist id="1514" addr="0x7fdf0850d150" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="1515" addr="0x7ff9f1fb6250" >
-                                    <attributelist id="1516" addr="0x7ff9f1fb6250" >
+                                <typescopesitem id="1515" addr="0x7fdf0850d250" >
+                                    <attributelist id="1516" addr="0x7fdf0850d250" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="1517" addr="0x7ff9f1fb4d70" >
-                                    <attributelist id="1518" addr="0x7ff9f1fb4d70" >
-                                        <attribute name="name" value="xbmc" id="1519" addr="0x7ff9f1fba9d0" />
-                                        <typetab id="1520" addr="0x7ff9f1fb4d90" >
-                                            <attributelist id="1521" addr="0x7ff9f1fb4d90" >
-                                                <attribute name="Monitor" value="Monitor" id="1522" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="1523" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="Keyboard" value="Keyboard" id="1524" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="1525" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="InfoTagVideo" value="InfoTagVideo" id="1526" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="Player" value="Player" id="1527" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="InfoTagMusic" value="InfoTagMusic" id="1528" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="PlayList" value="PlayList" id="1529" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="RenderCapture" value="RenderCapture" id="1530" addr="0x7ff9f1fba9d0" />
+                                <typescopesitem id="1517" addr="0x7fdf0850bd70" >
+                                    <attributelist id="1518" addr="0x7fdf0850bd70" >
+                                        <attribute name="name" value="xbmc" id="1519" addr="0x7fdf085119d0" />
+                                        <typetab id="1520" addr="0x7fdf0850bd90" >
+                                            <attributelist id="1521" addr="0x7fdf0850bd90" >
+                                                <attribute name="Monitor" value="Monitor" id="1522" addr="0x7fdf085119d0" />
+                                                <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="1523" addr="0x7fdf085119d0" />
+                                                <attribute name="Keyboard" value="Keyboard" id="1524" addr="0x7fdf085119d0" />
+                                                <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="1525" addr="0x7fdf085119d0" />
+                                                <attribute name="InfoTagVideo" value="InfoTagVideo" id="1526" addr="0x7fdf085119d0" />
+                                                <attribute name="Player" value="Player" id="1527" addr="0x7fdf085119d0" />
+                                                <attribute name="InfoTagMusic" value="InfoTagMusic" id="1528" addr="0x7fdf085119d0" />
+                                                <attribute name="PlayList" value="PlayList" id="1529" addr="0x7fdf085119d0" />
+                                                <attribute name="RenderCapture" value="RenderCapture" id="1530" addr="0x7fdf085119d0" />
                                             </attributelist >
-                                            <typetabsitem id="1531" addr="0x7ff9f1fb9b10" >
-                                                <attributelist id="1532" addr="0x7ff9f1fb9b10" >
+                                            <typetabsitem id="1531" addr="0x7fdf08510b10" >
+                                                <attributelist id="1532" addr="0x7fdf08510b10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1533" addr="0x7ff9f1fb7f30" >
-                                                <attributelist id="1534" addr="0x7ff9f1fb7f30" >
+                                            <typetabsitem id="1533" addr="0x7fdf0850ef30" >
+                                                <attributelist id="1534" addr="0x7fdf0850ef30" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1535" addr="0x7ff9f1fb8990" >
-                                                <attributelist id="1536" addr="0x7ff9f1fb8990" >
+                                            <typetabsitem id="1535" addr="0x7fdf0850f990" >
+                                                <attributelist id="1536" addr="0x7fdf0850f990" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1537" addr="0x7ff9f1fb5e90" >
-                                                <attributelist id="1538" addr="0x7ff9f1fb5e90" >
+                                            <typetabsitem id="1537" addr="0x7fdf0850ce90" >
+                                                <attributelist id="1538" addr="0x7fdf0850ce90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1539" addr="0x7ff9f1fb8310" >
-                                                <attributelist id="1540" addr="0x7ff9f1fb8310" >
+                                            <typetabsitem id="1539" addr="0x7fdf0850f310" >
+                                                <attributelist id="1540" addr="0x7fdf0850f310" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1541" addr="0x7ff9f1fb6050" >
-                                                <attributelist id="1542" addr="0x7ff9f1fb6050" >
+                                            <typetabsitem id="1541" addr="0x7fdf0850d050" >
+                                                <attributelist id="1542" addr="0x7fdf0850d050" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1543" addr="0x7ff9f1fb7b50" >
-                                                <attributelist id="1544" addr="0x7ff9f1fb7b50" >
+                                            <typetabsitem id="1543" addr="0x7fdf0850eb50" >
+                                                <attributelist id="1544" addr="0x7fdf0850eb50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1545" addr="0x7ff9f1fb91b0" >
-                                                <attributelist id="1546" addr="0x7ff9f1fb91b0" >
+                                            <typetabsitem id="1545" addr="0x7fdf085101b0" >
+                                                <attributelist id="1546" addr="0x7fdf085101b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1547" addr="0x7ff9f1fb7490" >
-                                                <attributelist id="1548" addr="0x7ff9f1fb7490" >
+                                            <typetabsitem id="1547" addr="0x7fdf0850e490" >
+                                                <attributelist id="1548" addr="0x7fdf0850e490" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7ff9f1fb4990" id="1549" addr="0x7ff9f1fb4990" />
-                                        <attribute name="qname" value="XBMCAddon::xbmc" id="1550" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="symtab" value="0x7ff9f1f8a2b0" id="1551" addr="0x7ff9f1f8a2b0" />
+                                        <attribute name="parent" value="0x7fdf0850b990" id="1549" addr="0x7fdf0850b990" />
+                                        <attribute name="qname" value="XBMCAddon::xbmc" id="1550" addr="0x7fdf085119d0" />
+                                        <attribute name="symtab" value="0x7fdf084e12b0" id="1551" addr="0x7fdf084e12b0" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="1552" addr="0x7ff9f1fb6270" >
-                                    <attributelist id="1553" addr="0x7ff9f1fb6270" >
+                                <typescopesitem id="1552" addr="0x7fdf0850d270" >
+                                    <attributelist id="1553" addr="0x7fdf0850d270" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="1554" addr="0x7ff9f1f95550" >
-                                    <attributelist id="1555" addr="0x7ff9f1f95550" >
-                                        <attribute name="name" value="Player" id="1556" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="csymtab" value="0x7ff9f1f95570" id="1557" addr="0x7ff9f1f95570" />
-                                        <attribute name="symtab" value="0x7ff9f1f954f0" id="1558" addr="0x7ff9f1f954f0" />
+                                <typescopesitem id="1554" addr="0x7fdf084ec550" >
+                                    <attributelist id="1555" addr="0x7fdf084ec550" >
+                                        <attribute name="name" value="Player" id="1556" addr="0x7fdf085119d0" />
+                                        <attribute name="csymtab" value="0x7fdf084ec570" id="1557" addr="0x7fdf084ec570" />
+                                        <attribute name="symtab" value="0x7fdf084ec4f0" id="1558" addr="0x7fdf084ec4f0" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <access id="1559" addr="0x7ff9f1f954b0" >
-                            <attributelist id="1560" addr="0x7ff9f1f954b0" >
-                                <attribute name="kind" value="private" id="1561" addr="0x7ff9f1fba9d0" />
+                        <access id="1559" addr="0x7fdf084ec4b0" >
+                            <attributelist id="1560" addr="0x7fdf084ec4b0" >
+                                <attribute name="kind" value="private" id="1561" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </access >
-                        <cdecl id="1562" addr="0x7ff9f1f956b0" >
-                            <attributelist id="1563" addr="0x7ff9f1f956b0" >
-                                <attribute name="ismember" value="1" id="1564" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="iPlayList" id="1565" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="" id="1566" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="private" id="1567" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="variable" id="1568" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="int" id="1569" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="1570" addr="0x7ff9f1f95550" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="1571" addr="0x7ff9f1f95d90" >
-                            <attributelist id="1572" addr="0x7ff9f1f95d90" >
-                                <attribute name="ismember" value="1" id="1573" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="playStream" id="1574" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem,bool)." id="1575" addr="0x7ff9f1fba9d0" />
-                                <parmlist id="1576" addr="0x7ff9f1f959b0" >
+                        <cdecl id="1562" addr="0x7fdf084ec6b0" >
+                            <attributelist id="1563" addr="0x7fdf084ec6b0" >
+                                <attribute name="ismember" value="1" id="1564" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="iPlayList" id="1565" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="" id="1566" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="private" id="1567" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="variable" id="1568" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="int" id="1569" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="1570" addr="0x7fdf084ec550" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="1571" addr="0x7fdf084ecd90" >
+                            <attributelist id="1572" addr="0x7fdf084ecd90" >
+                                <attribute name="ismember" value="1" id="1573" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="playStream" id="1574" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem,bool)." id="1575" addr="0x7fdf085119d0" />
+                                <parmlist id="1576" addr="0x7fdf084ec9b0" >
                                     <parm id="1577">
-                                        <attributelist id="1578" addr="0x7ff9f1f959b0" >
-                                            <attribute name="name" value="item" id="1579" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="1580" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1581" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="1578" addr="0x7fdf084ec9b0" >
+                                            <attribute name="name" value="item" id="1579" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="1580" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1581" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1582">
-                                        <attributelist id="1583" addr="0x7ff9f1f95b90" >
-                                            <attribute name="name" value="listitem" id="1584" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="NULL" id="1585" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::ListItem" id="1586" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="1583" addr="0x7fdf084ecb90" >
+                                            <attribute name="name" value="listitem" id="1584" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="NULL" id="1585" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::ListItem" id="1586" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1587">
-                                        <attributelist id="1588" addr="0x7ff9f1f95cd0" >
-                                            <attribute name="name" value="windowed" id="1589" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="false" id="1590" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="bool" id="1591" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="1588" addr="0x7fdf084eccd0" >
+                                            <attribute name="name" value="windowed" id="1589" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="false" id="1590" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="bool" id="1591" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="access" value="private" id="1592" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="1593" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="void" id="1594" addr="0x7ff9f1fba9d0" />
-                                <attribute name="csym_nextSibling" value="0x7ff9f1f95fb0" id="1595" addr="0x7ff9f1f95fb0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="1596" addr="0x7ff9f1f95550" />
+                                <attribute name="access" value="private" id="1592" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="1593" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="void" id="1594" addr="0x7fdf085119d0" />
+                                <attribute name="csym_nextSibling" value="0x7fdf084ecfb0" id="1595" addr="0x7fdf084ecfb0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="1596" addr="0x7fdf084ec550" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="1597" addr="0x7ff9f1f95fb0" >
-                            <attributelist id="1598" addr="0x7ff9f1f95fb0" >
-                                <attribute name="ismember" value="1" id="1599" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="playStream" id="1600" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)." id="1601" addr="0x7ff9f1fba9d0" />
-                                <parmlist id="1602" addr="0x7ff9f1f95eb0" >
+                        <cdecl id="1597" addr="0x7fdf084ecfb0" >
+                            <attributelist id="1598" addr="0x7fdf084ecfb0" >
+                                <attribute name="ismember" value="1" id="1599" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="playStream" id="1600" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)." id="1601" addr="0x7fdf085119d0" />
+                                <parmlist id="1602" addr="0x7fdf084eceb0" >
                                     <parm id="1603">
-                                        <attributelist id="1604" addr="0x7ff9f1f95eb0" >
-                                            <attribute name="name" value="item" id="1605" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="1606" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1607" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="1604" addr="0x7fdf084eceb0" >
+                                            <attribute name="name" value="item" id="1605" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="1606" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1607" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1608">
-                                        <attributelist id="1609" addr="0x7ff9f1f95ef0" >
-                                            <attribute name="name" value="listitem" id="1610" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="NULL" id="1611" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::ListItem" id="1612" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="1609" addr="0x7fdf084ecef0" >
+                                            <attribute name="name" value="listitem" id="1610" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="NULL" id="1611" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::ListItem" id="1612" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="access" value="private" id="1613" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="1614" addr="0x7ff9f1fba9d0" />
-                                <attribute name="defaultargs" value="0x7ff9f1f95d90" id="1615" addr="0x7ff9f1f95d90" />
-                                <attribute name="type" value="void" id="1616" addr="0x7ff9f1fba9d0" />
-                                <attribute name="csym_nextSibling" value="0x7ff9f1f96130" id="1617" addr="0x7ff9f1f96130" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="1618" addr="0x7ff9f1f95550" />
+                                <attribute name="access" value="private" id="1613" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="1614" addr="0x7fdf085119d0" />
+                                <attribute name="defaultargs" value="0x7fdf084ecd90" id="1615" addr="0x7fdf084ecd90" />
+                                <attribute name="type" value="void" id="1616" addr="0x7fdf085119d0" />
+                                <attribute name="csym_nextSibling" value="0x7fdf084ed130" id="1617" addr="0x7fdf084ed130" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="1618" addr="0x7fdf084ec550" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="1619" addr="0x7ff9f1f96130" >
-                            <attributelist id="1620" addr="0x7ff9f1f96130" >
-                                <attribute name="ismember" value="1" id="1621" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="playStream" id="1622" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="1623" addr="0x7ff9f1fba9d0" />
-                                <parmlist id="1624" addr="0x7ff9f1f960d0" >
+                        <cdecl id="1619" addr="0x7fdf084ed130" >
+                            <attributelist id="1620" addr="0x7fdf084ed130" >
+                                <attribute name="ismember" value="1" id="1621" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="playStream" id="1622" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="1623" addr="0x7fdf085119d0" />
+                                <parmlist id="1624" addr="0x7fdf084ed0d0" >
                                     <parm id="1625">
-                                        <attributelist id="1626" addr="0x7ff9f1f960d0" >
-                                            <attribute name="name" value="item" id="1627" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="1628" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1629" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="1626" addr="0x7fdf084ed0d0" >
+                                            <attribute name="name" value="item" id="1627" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="1628" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1629" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="access" value="private" id="1630" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="1631" addr="0x7ff9f1fba9d0" />
-                                <attribute name="defaultargs" value="0x7ff9f1f95d90" id="1632" addr="0x7ff9f1f95d90" />
-                                <attribute name="type" value="void" id="1633" addr="0x7ff9f1fba9d0" />
-                                <attribute name="csym_nextSibling" value="0x7ff9f1f961f0" id="1634" addr="0x7ff9f1f961f0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="1635" addr="0x7ff9f1f95550" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="1636" addr="0x7ff9f1f961f0" >
-                            <attributelist id="1637" addr="0x7ff9f1f961f0" >
-                                <attribute name="ismember" value="1" id="1638" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="playStream" id="1639" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="1640" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="private" id="1641" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="1642" addr="0x7ff9f1fba9d0" />
-                                <attribute name="defaultargs" value="0x7ff9f1f95d90" id="1643" addr="0x7ff9f1f95d90" />
-                                <attribute name="type" value="void" id="1644" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="1645" addr="0x7ff9f1f95550" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="1646" addr="0x7ff9f1f967f0" >
-                            <attributelist id="1647" addr="0x7ff9f1f967f0" >
-                                <attribute name="ismember" value="1" id="1648" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="playPlaylist" id="1649" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(p.q(const).PlayList,bool,int)." id="1650" addr="0x7ff9f1fba9d0" />
-                                <parmlist id="1651" addr="0x7ff9f1f96470" >
+                                <attribute name="access" value="private" id="1630" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="1631" addr="0x7fdf085119d0" />
+                                <attribute name="defaultargs" value="0x7fdf084ecd90" id="1632" addr="0x7fdf084ecd90" />
+                                <attribute name="type" value="void" id="1633" addr="0x7fdf085119d0" />
+                                <attribute name="csym_nextSibling" value="0x7fdf084ed1f0" id="1634" addr="0x7fdf084ed1f0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="1635" addr="0x7fdf084ec550" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="1636" addr="0x7fdf084ed1f0" >
+                            <attributelist id="1637" addr="0x7fdf084ed1f0" >
+                                <attribute name="ismember" value="1" id="1638" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="playStream" id="1639" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="1640" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="private" id="1641" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="1642" addr="0x7fdf085119d0" />
+                                <attribute name="defaultargs" value="0x7fdf084ecd90" id="1643" addr="0x7fdf084ecd90" />
+                                <attribute name="type" value="void" id="1644" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="1645" addr="0x7fdf084ec550" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="1646" addr="0x7fdf084ed7f0" >
+                            <attributelist id="1647" addr="0x7fdf084ed7f0" >
+                                <attribute name="ismember" value="1" id="1648" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="playPlaylist" id="1649" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(p.q(const).PlayList,bool,int)." id="1650" addr="0x7fdf085119d0" />
+                                <parmlist id="1651" addr="0x7fdf084ed470" >
                                     <parm id="1652">
-                                        <attributelist id="1653" addr="0x7ff9f1f96470" >
-                                            <attribute name="name" value="playlist" id="1654" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="NULL" id="1655" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="p.q(const).PlayList" id="1656" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="1653" addr="0x7fdf084ed470" >
+                                            <attribute name="name" value="playlist" id="1654" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="NULL" id="1655" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="p.q(const).PlayList" id="1656" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1657">
-                                        <attributelist id="1658" addr="0x7ff9f1f965b0" >
-                                            <attribute name="name" value="windowed" id="1659" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="false" id="1660" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="bool" id="1661" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="1658" addr="0x7fdf084ed5b0" >
+                                            <attribute name="name" value="windowed" id="1659" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="false" id="1660" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="bool" id="1661" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1662">
-                                        <attributelist id="1663" addr="0x7ff9f1f96730" >
-                                            <attribute name="name" value="startpos" id="1664" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="-1" id="1665" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="int" id="1666" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="1663" addr="0x7fdf084ed730" >
+                                            <attribute name="name" value="startpos" id="1664" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="-1" id="1665" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="int" id="1666" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="access" value="private" id="1667" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="1668" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="void" id="1669" addr="0x7ff9f1fba9d0" />
-                                <attribute name="csym_nextSibling" value="0x7ff9f1f96a10" id="1670" addr="0x7ff9f1f96a10" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="1671" addr="0x7ff9f1f95550" />
+                                <attribute name="access" value="private" id="1667" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="1668" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="void" id="1669" addr="0x7fdf085119d0" />
+                                <attribute name="csym_nextSibling" value="0x7fdf084eda10" id="1670" addr="0x7fdf084eda10" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="1671" addr="0x7fdf084ec550" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="1672" addr="0x7ff9f1f96a10" >
-                            <attributelist id="1673" addr="0x7ff9f1f96a10" >
-                                <attribute name="ismember" value="1" id="1674" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="playPlaylist" id="1675" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(p.q(const).PlayList,bool)." id="1676" addr="0x7ff9f1fba9d0" />
-                                <parmlist id="1677" addr="0x7ff9f1f96910" >
+                        <cdecl id="1672" addr="0x7fdf084eda10" >
+                            <attributelist id="1673" addr="0x7fdf084eda10" >
+                                <attribute name="ismember" value="1" id="1674" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="playPlaylist" id="1675" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(p.q(const).PlayList,bool)." id="1676" addr="0x7fdf085119d0" />
+                                <parmlist id="1677" addr="0x7fdf084ed910" >
                                     <parm id="1678">
-                                        <attributelist id="1679" addr="0x7ff9f1f96910" >
-                                            <attribute name="name" value="playlist" id="1680" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="NULL" id="1681" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="p.q(const).PlayList" id="1682" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="1679" addr="0x7fdf084ed910" >
+                                            <attribute name="name" value="playlist" id="1680" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="NULL" id="1681" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="p.q(const).PlayList" id="1682" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1683">
-                                        <attributelist id="1684" addr="0x7ff9f1f96950" >
-                                            <attribute name="name" value="windowed" id="1685" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="false" id="1686" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="bool" id="1687" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="1684" addr="0x7fdf084ed950" >
+                                            <attribute name="name" value="windowed" id="1685" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="false" id="1686" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="bool" id="1687" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="access" value="private" id="1688" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="1689" addr="0x7ff9f1fba9d0" />
-                                <attribute name="defaultargs" value="0x7ff9f1f967f0" id="1690" addr="0x7ff9f1f967f0" />
-                                <attribute name="type" value="void" id="1691" addr="0x7ff9f1fba9d0" />
-                                <attribute name="csym_nextSibling" value="0x7ff9f1f96b90" id="1692" addr="0x7ff9f1f96b90" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="1693" addr="0x7ff9f1f95550" />
+                                <attribute name="access" value="private" id="1688" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="1689" addr="0x7fdf085119d0" />
+                                <attribute name="defaultargs" value="0x7fdf084ed7f0" id="1690" addr="0x7fdf084ed7f0" />
+                                <attribute name="type" value="void" id="1691" addr="0x7fdf085119d0" />
+                                <attribute name="csym_nextSibling" value="0x7fdf084edb90" id="1692" addr="0x7fdf084edb90" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="1693" addr="0x7fdf084ec550" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="1694" addr="0x7ff9f1f96b90" >
-                            <attributelist id="1695" addr="0x7ff9f1f96b90" >
-                                <attribute name="ismember" value="1" id="1696" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="playPlaylist" id="1697" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(p.q(const).PlayList)." id="1698" addr="0x7ff9f1fba9d0" />
-                                <parmlist id="1699" addr="0x7ff9f1f96b30" >
+                        <cdecl id="1694" addr="0x7fdf084edb90" >
+                            <attributelist id="1695" addr="0x7fdf084edb90" >
+                                <attribute name="ismember" value="1" id="1696" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="playPlaylist" id="1697" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(p.q(const).PlayList)." id="1698" addr="0x7fdf085119d0" />
+                                <parmlist id="1699" addr="0x7fdf084edb30" >
                                     <parm id="1700">
-                                        <attributelist id="1701" addr="0x7ff9f1f96b30" >
-                                            <attribute name="name" value="playlist" id="1702" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="NULL" id="1703" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="p.q(const).PlayList" id="1704" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="1701" addr="0x7fdf084edb30" >
+                                            <attribute name="name" value="playlist" id="1702" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="NULL" id="1703" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="p.q(const).PlayList" id="1704" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="access" value="private" id="1705" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="1706" addr="0x7ff9f1fba9d0" />
-                                <attribute name="defaultargs" value="0x7ff9f1f967f0" id="1707" addr="0x7ff9f1f967f0" />
-                                <attribute name="type" value="void" id="1708" addr="0x7ff9f1fba9d0" />
-                                <attribute name="csym_nextSibling" value="0x7ff9f1f96c70" id="1709" addr="0x7ff9f1f96c70" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="1710" addr="0x7ff9f1f95550" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="1711" addr="0x7ff9f1f96c70" >
-                            <attributelist id="1712" addr="0x7ff9f1f96c70" >
-                                <attribute name="ismember" value="1" id="1713" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="playPlaylist" id="1714" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="1715" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="private" id="1716" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="1717" addr="0x7ff9f1fba9d0" />
-                                <attribute name="defaultargs" value="0x7ff9f1f967f0" id="1718" addr="0x7ff9f1f967f0" />
-                                <attribute name="type" value="void" id="1719" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="1720" addr="0x7ff9f1f95550" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="1721" addr="0x7ff9f1f96f50" >
-                            <attributelist id="1722" addr="0x7ff9f1f96f50" >
-                                <attribute name="ismember" value="1" id="1723" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="playCurrent" id="1724" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(bool)." id="1725" addr="0x7ff9f1fba9d0" />
-                                <parmlist id="1726" addr="0x7ff9f1f96e90" >
+                                <attribute name="access" value="private" id="1705" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="1706" addr="0x7fdf085119d0" />
+                                <attribute name="defaultargs" value="0x7fdf084ed7f0" id="1707" addr="0x7fdf084ed7f0" />
+                                <attribute name="type" value="void" id="1708" addr="0x7fdf085119d0" />
+                                <attribute name="csym_nextSibling" value="0x7fdf084edc70" id="1709" addr="0x7fdf084edc70" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="1710" addr="0x7fdf084ec550" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="1711" addr="0x7fdf084edc70" >
+                            <attributelist id="1712" addr="0x7fdf084edc70" >
+                                <attribute name="ismember" value="1" id="1713" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="playPlaylist" id="1714" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="1715" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="private" id="1716" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="1717" addr="0x7fdf085119d0" />
+                                <attribute name="defaultargs" value="0x7fdf084ed7f0" id="1718" addr="0x7fdf084ed7f0" />
+                                <attribute name="type" value="void" id="1719" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="1720" addr="0x7fdf084ec550" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="1721" addr="0x7fdf084edf50" >
+                            <attributelist id="1722" addr="0x7fdf084edf50" >
+                                <attribute name="ismember" value="1" id="1723" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="playCurrent" id="1724" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(bool)." id="1725" addr="0x7fdf085119d0" />
+                                <parmlist id="1726" addr="0x7fdf084ede90" >
                                     <parm id="1727">
-                                        <attributelist id="1728" addr="0x7ff9f1f96e90" >
-                                            <attribute name="name" value="windowed" id="1729" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="false" id="1730" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="bool" id="1731" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="1728" addr="0x7fdf084ede90" >
+                                            <attribute name="name" value="windowed" id="1729" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="false" id="1730" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="bool" id="1731" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="access" value="private" id="1732" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="1733" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="void" id="1734" addr="0x7ff9f1fba9d0" />
-                                <attribute name="csym_nextSibling" value="0x7ff9f1f97010" id="1735" addr="0x7ff9f1f97010" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="1736" addr="0x7ff9f1f95550" />
+                                <attribute name="access" value="private" id="1732" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="1733" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="void" id="1734" addr="0x7fdf085119d0" />
+                                <attribute name="csym_nextSibling" value="0x7fdf084ee010" id="1735" addr="0x7fdf084ee010" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="1736" addr="0x7fdf084ec550" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="1737" addr="0x7ff9f1f97010" >
-                            <attributelist id="1738" addr="0x7ff9f1f97010" >
-                                <attribute name="ismember" value="1" id="1739" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="playCurrent" id="1740" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="1741" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="private" id="1742" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="1743" addr="0x7ff9f1fba9d0" />
-                                <attribute name="defaultargs" value="0x7ff9f1f96f50" id="1744" addr="0x7ff9f1f96f50" />
-                                <attribute name="type" value="void" id="1745" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="1746" addr="0x7ff9f1f95550" />
+                        <cdecl id="1737" addr="0x7fdf084ee010" >
+                            <attributelist id="1738" addr="0x7fdf084ee010" >
+                                <attribute name="ismember" value="1" id="1739" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="playCurrent" id="1740" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="1741" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="private" id="1742" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="1743" addr="0x7fdf085119d0" />
+                                <attribute name="defaultargs" value="0x7fdf084edf50" id="1744" addr="0x7fdf084edf50" />
+                                <attribute name="type" value="void" id="1745" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="1746" addr="0x7fdf084ec550" />
                             </attributelist >
                          
                         </cdecl >
-                        <access id="1747" addr="0x7ff9f1f97150" >
-                            <attributelist id="1748" addr="0x7ff9f1f97150" >
-                                <attribute name="kind" value="public" id="1749" addr="0x7ff9f1fba9d0" />
+                        <access id="1747" addr="0x7fdf084ee150" >
+                            <attributelist id="1748" addr="0x7fdf084ee150" >
+                                <attribute name="kind" value="public" id="1749" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="1750" addr="0x7ff9f1f97350" >
-                            <attributelist id="1751" addr="0x7ff9f1f97350" >
-                                <attribute name="name" value="Player" id="1752" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="1753" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="1754" addr="0x7ff9f1f95550" />
-                                <attribute name="csym_nextSibling" value="0x7ff9f1f97470" id="1755" addr="0x7ff9f1f97470" />
-                                <attribute name="sym_name" value="Player" id="1756" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_nextSibling" value="0x7ff9f1f97470" id="1757" addr="0x7ff9f1f97470" />
-                                <attribute name="decl" value="f(int)." id="1758" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="1759" addr="0x7ff9f1fba9d0" />
-                                <attribute name="feature_director" value="1" id="1760" addr="0x7ff9f1fba9d0" />
-                                <attribute name="feature_python_nokwds" value="true" id="1761" addr="0x7ff9f1fba9d0" />
-                                <parmlist id="1762" addr="0x7ff9f1f97290" >
+                        <constructor id="1750" addr="0x7fdf084ee350" >
+                            <attributelist id="1751" addr="0x7fdf084ee350" >
+                                <attribute name="name" value="Player" id="1752" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="1753" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="1754" addr="0x7fdf084ec550" />
+                                <attribute name="csym_nextSibling" value="0x7fdf084ee470" id="1755" addr="0x7fdf084ee470" />
+                                <attribute name="sym_name" value="Player" id="1756" addr="0x7fdf085119d0" />
+                                <attribute name="sym_nextSibling" value="0x7fdf084ee470" id="1757" addr="0x7fdf084ee470" />
+                                <attribute name="decl" value="f(int)." id="1758" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="1759" addr="0x7fdf085119d0" />
+                                <attribute name="feature_director" value="1" id="1760" addr="0x7fdf085119d0" />
+                                <attribute name="feature_python_nokwds" value="true" id="1761" addr="0x7fdf085119d0" />
+                                <parmlist id="1762" addr="0x7fdf084ee290" >
                                     <parm id="1763">
-                                        <attributelist id="1764" addr="0x7ff9f1f97290" >
-                                            <attribute name="name" value="playerCore" id="1765" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="0" id="1766" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="int" id="1767" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="1764" addr="0x7fdf084ee290" >
+                                            <attribute name="name" value="playerCore" id="1765" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="0" id="1766" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="int" id="1767" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overloaded" value="0x7ff9f1f97350" id="1768" addr="0x7ff9f1f97350" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="1769" addr="0x7ff9f1fba9d0" />
-                                <attribute name="storage" value="explicit" id="1770" addr="0x7ff9f1fba9d0" />
-                                <attribute name="feature_new" value="1" id="1771" addr="0x7ff9f1fba9d0" />
+                                <attribute name="sym_overloaded" value="0x7fdf084ee350" id="1768" addr="0x7fdf084ee350" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="1769" addr="0x7fdf085119d0" />
+                                <attribute name="storage" value="explicit" id="1770" addr="0x7fdf085119d0" />
+                                <attribute name="feature_new" value="1" id="1771" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="1772" addr="0x7ff9f1f97470" >
-                            <attributelist id="1773" addr="0x7ff9f1f97470" >
-                                <attribute name="name" value="Player" id="1774" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="1775" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="1776" addr="0x7ff9f1f95550" />
-                                <attribute name="sym_previousSibling" value="0x7ff9f1f97350" id="1777" addr="0x7ff9f1f97350" />
-                                <attribute name="sym_name" value="Player" id="1778" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="1779" addr="0x7ff9f1fba9d0" />
-                                <attribute name="defaultargs" value="0x7ff9f1f97350" id="1780" addr="0x7ff9f1f97350" />
-                                <attribute name="access" value="public" id="1781" addr="0x7ff9f1fba9d0" />
-                                <attribute name="feature_director" value="1" id="1782" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overloaded" value="0x7ff9f1f97350" id="1783" addr="0x7ff9f1f97350" />
-                                <attribute name="feature_python_nokwds" value="true" id="1784" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="1785" addr="0x7ff9f1fba9d0" />
-                                <attribute name="storage" value="explicit" id="1786" addr="0x7ff9f1fba9d0" />
-                                <attribute name="feature_new" value="1" id="1787" addr="0x7ff9f1fba9d0" />
+                        <constructor id="1772" addr="0x7fdf084ee470" >
+                            <attributelist id="1773" addr="0x7fdf084ee470" >
+                                <attribute name="name" value="Player" id="1774" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="1775" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="1776" addr="0x7fdf084ec550" />
+                                <attribute name="sym_previousSibling" value="0x7fdf084ee350" id="1777" addr="0x7fdf084ee350" />
+                                <attribute name="sym_name" value="Player" id="1778" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="1779" addr="0x7fdf085119d0" />
+                                <attribute name="defaultargs" value="0x7fdf084ee350" id="1780" addr="0x7fdf084ee350" />
+                                <attribute name="access" value="public" id="1781" addr="0x7fdf085119d0" />
+                                <attribute name="feature_director" value="1" id="1782" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overloaded" value="0x7fdf084ee350" id="1783" addr="0x7fdf084ee350" />
+                                <attribute name="feature_python_nokwds" value="true" id="1784" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="1785" addr="0x7fdf085119d0" />
+                                <attribute name="storage" value="explicit" id="1786" addr="0x7fdf085119d0" />
+                                <attribute name="feature_new" value="1" id="1787" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </constructor >
-                        <destructor id="1788" addr="0x7ff9f1f97730" >
-                            <attributelist id="1789" addr="0x7ff9f1f97730" >
-                                <attribute name="ismember" value="1" id="1790" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="~Player" id="1791" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="~Player" id="1792" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(void)." id="1793" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="1794" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="1795" addr="0x7ff9f1f95550" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="1796" addr="0x7ff9f1fba9d0" />
+                        <destructor id="1788" addr="0x7fdf084ee730" >
+                            <attributelist id="1789" addr="0x7fdf084ee730" >
+                                <attribute name="ismember" value="1" id="1790" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="~Player" id="1791" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="~Player" id="1792" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(void)." id="1793" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="1794" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="1795" addr="0x7fdf084ec550" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="1796" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </destructor >
-                        <cdecl id="1797" addr="0x7ff9f1f97f30" >
-                            <attributelist id="1798" addr="0x7ff9f1f97f30" >
-                                <attribute name="name" value="play" id="1799" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="1800" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="1801" addr="0x7ff9f1f95550" />
-                                <attribute name="sym_nextSibling" value="0x7ff9f1f98230" id="1802" addr="0x7ff9f1f98230" />
-                                <attribute name="csym_nextSibling" value="0x7ff9f1f98230" id="1803" addr="0x7ff9f1f98230" />
-                                <attribute name="kind" value="function" id="1804" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="play" id="1805" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::xbmc::PlayParameter,p.q(const).XBMCAddon::xbmcgui::ListItem,bool,int)." id="1806" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="1807" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overloaded" value="0x7ff9f1f97f30" id="1808" addr="0x7ff9f1f97f30" />
-                                <parmlist id="1809" addr="0x7ff9f1f979d0" >
+                        <cdecl id="1797" addr="0x7fdf084eef30" >
+                            <attributelist id="1798" addr="0x7fdf084eef30" >
+                                <attribute name="name" value="play" id="1799" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="1800" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="1801" addr="0x7fdf084ec550" />
+                                <attribute name="sym_nextSibling" value="0x7fdf084ef230" id="1802" addr="0x7fdf084ef230" />
+                                <attribute name="csym_nextSibling" value="0x7fdf084ef230" id="1803" addr="0x7fdf084ef230" />
+                                <attribute name="kind" value="function" id="1804" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="play" id="1805" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::xbmc::PlayParameter,p.q(const).XBMCAddon::xbmcgui::ListItem,bool,int)." id="1806" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="1807" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overloaded" value="0x7fdf084eef30" id="1808" addr="0x7fdf084eef30" />
+                                <parmlist id="1809" addr="0x7fdf084ee9d0" >
                                     <parm id="1810">
-                                        <attributelist id="1811" addr="0x7ff9f1f979d0" >
-                                            <attribute name="name" value="item" id="1812" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="Player::defaultPlayParameter" id="1813" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::xbmc::PlayParameter" id="1814" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="1811" addr="0x7fdf084ee9d0" >
+                                            <attribute name="name" value="item" id="1812" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="Player::defaultPlayParameter" id="1813" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::xbmc::PlayParameter" id="1814" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1815">
-                                        <attributelist id="1816" addr="0x7ff9f1f97bb0" >
-                                            <attribute name="name" value="listitem" id="1817" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="NULL" id="1818" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::ListItem" id="1819" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="1816" addr="0x7fdf084eebb0" >
+                                            <attribute name="name" value="listitem" id="1817" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="NULL" id="1818" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::ListItem" id="1819" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1820">
-                                        <attributelist id="1821" addr="0x7ff9f1f97cf0" >
-                                            <attribute name="name" value="windowed" id="1822" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="false" id="1823" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="bool" id="1824" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="1821" addr="0x7fdf084eecf0" >
+                                            <attribute name="name" value="windowed" id="1822" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="false" id="1823" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="bool" id="1824" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1825">
-                                        <attributelist id="1826" addr="0x7ff9f1f97e70" >
-                                            <attribute name="name" value="startpos" id="1827" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="-1" id="1828" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="int" id="1829" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="1826" addr="0x7fdf084eee70" >
+                                            <attribute name="name" value="startpos" id="1827" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="-1" id="1828" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="int" id="1829" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="1830" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="1831" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="1832" addr="0x7ff9f1f98230" >
-                            <attributelist id="1833" addr="0x7ff9f1f98230" >
-                                <attribute name="name" value="play" id="1834" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="1835" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="1836" addr="0x7ff9f1f95550" />
-                                <attribute name="sym_previousSibling" value="0x7ff9f1f97f30" id="1837" addr="0x7ff9f1f97f30" />
-                                <attribute name="kind" value="function" id="1838" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="play" id="1839" addr="0x7ff9f1fba9d0" />
-                                <attribute name="csym_nextSibling" value="0x7ff9f1f98490" id="1840" addr="0x7ff9f1f98490" />
-                                <attribute name="sym_nextSibling" value="0x7ff9f1f98490" id="1841" addr="0x7ff9f1f98490" />
-                                <attribute name="defaultargs" value="0x7ff9f1f97f30" id="1842" addr="0x7ff9f1f97f30" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::xbmc::PlayParameter,p.q(const).XBMCAddon::xbmcgui::ListItem,bool)." id="1843" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="1844" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overloaded" value="0x7ff9f1f97f30" id="1845" addr="0x7ff9f1f97f30" />
-                                <parmlist id="1846" addr="0x7ff9f1f97fd0" >
+                                <attribute name="type" value="void" id="1830" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="1831" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="1832" addr="0x7fdf084ef230" >
+                            <attributelist id="1833" addr="0x7fdf084ef230" >
+                                <attribute name="name" value="play" id="1834" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="1835" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="1836" addr="0x7fdf084ec550" />
+                                <attribute name="sym_previousSibling" value="0x7fdf084eef30" id="1837" addr="0x7fdf084eef30" />
+                                <attribute name="kind" value="function" id="1838" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="play" id="1839" addr="0x7fdf085119d0" />
+                                <attribute name="csym_nextSibling" value="0x7fdf084ef490" id="1840" addr="0x7fdf084ef490" />
+                                <attribute name="sym_nextSibling" value="0x7fdf084ef490" id="1841" addr="0x7fdf084ef490" />
+                                <attribute name="defaultargs" value="0x7fdf084eef30" id="1842" addr="0x7fdf084eef30" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::xbmc::PlayParameter,p.q(const).XBMCAddon::xbmcgui::ListItem,bool)." id="1843" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="1844" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overloaded" value="0x7fdf084eef30" id="1845" addr="0x7fdf084eef30" />
+                                <parmlist id="1846" addr="0x7fdf084eefd0" >
                                     <parm id="1847">
-                                        <attributelist id="1848" addr="0x7ff9f1f97fd0" >
-                                            <attribute name="name" value="item" id="1849" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="Player::defaultPlayParameter" id="1850" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::xbmc::PlayParameter" id="1851" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="1848" addr="0x7fdf084eefd0" >
+                                            <attribute name="name" value="item" id="1849" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="Player::defaultPlayParameter" id="1850" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::xbmc::PlayParameter" id="1851" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1852">
-                                        <attributelist id="1853" addr="0x7ff9f1f980d0" >
-                                            <attribute name="name" value="listitem" id="1854" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="NULL" id="1855" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::ListItem" id="1856" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="1853" addr="0x7fdf084ef0d0" >
+                                            <attribute name="name" value="listitem" id="1854" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="NULL" id="1855" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::ListItem" id="1856" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1857">
-                                        <attributelist id="1858" addr="0x7ff9f1f98170" >
-                                            <attribute name="name" value="windowed" id="1859" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="false" id="1860" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="bool" id="1861" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="1858" addr="0x7fdf084ef170" >
+                                            <attribute name="name" value="windowed" id="1859" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="false" id="1860" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="bool" id="1861" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="1862" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="1863" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="1864" addr="0x7ff9f1f98490" >
-                            <attributelist id="1865" addr="0x7ff9f1f98490" >
-                                <attribute name="name" value="play" id="1866" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="1867" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="1868" addr="0x7ff9f1f95550" />
-                                <attribute name="sym_previousSibling" value="0x7ff9f1f98230" id="1869" addr="0x7ff9f1f98230" />
-                                <attribute name="kind" value="function" id="1870" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="play" id="1871" addr="0x7ff9f1fba9d0" />
-                                <attribute name="csym_nextSibling" value="0x7ff9f1f98650" id="1872" addr="0x7ff9f1f98650" />
-                                <attribute name="sym_nextSibling" value="0x7ff9f1f98650" id="1873" addr="0x7ff9f1f98650" />
-                                <attribute name="defaultargs" value="0x7ff9f1f97f30" id="1874" addr="0x7ff9f1f97f30" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::xbmc::PlayParameter,p.q(const).XBMCAddon::xbmcgui::ListItem)." id="1875" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="1876" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overloaded" value="0x7ff9f1f97f30" id="1877" addr="0x7ff9f1f97f30" />
-                                <parmlist id="1878" addr="0x7ff9f1f982d0" >
+                                <attribute name="type" value="void" id="1862" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="1863" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="1864" addr="0x7fdf084ef490" >
+                            <attributelist id="1865" addr="0x7fdf084ef490" >
+                                <attribute name="name" value="play" id="1866" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="1867" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="1868" addr="0x7fdf084ec550" />
+                                <attribute name="sym_previousSibling" value="0x7fdf084ef230" id="1869" addr="0x7fdf084ef230" />
+                                <attribute name="kind" value="function" id="1870" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="play" id="1871" addr="0x7fdf085119d0" />
+                                <attribute name="csym_nextSibling" value="0x7fdf084ef650" id="1872" addr="0x7fdf084ef650" />
+                                <attribute name="sym_nextSibling" value="0x7fdf084ef650" id="1873" addr="0x7fdf084ef650" />
+                                <attribute name="defaultargs" value="0x7fdf084eef30" id="1874" addr="0x7fdf084eef30" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::xbmc::PlayParameter,p.q(const).XBMCAddon::xbmcgui::ListItem)." id="1875" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="1876" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overloaded" value="0x7fdf084eef30" id="1877" addr="0x7fdf084eef30" />
+                                <parmlist id="1878" addr="0x7fdf084ef2d0" >
                                     <parm id="1879">
-                                        <attributelist id="1880" addr="0x7ff9f1f982d0" >
-                                            <attribute name="name" value="item" id="1881" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="Player::defaultPlayParameter" id="1882" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::xbmc::PlayParameter" id="1883" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="1880" addr="0x7fdf084ef2d0" >
+                                            <attribute name="name" value="item" id="1881" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="Player::defaultPlayParameter" id="1882" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::xbmc::PlayParameter" id="1883" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1884">
-                                        <attributelist id="1885" addr="0x7ff9f1f983d0" >
-                                            <attribute name="name" value="listitem" id="1886" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="NULL" id="1887" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::ListItem" id="1888" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="1885" addr="0x7fdf084ef3d0" >
+                                            <attribute name="name" value="listitem" id="1886" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="NULL" id="1887" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::ListItem" id="1888" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="1889" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_2" id="1890" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="1891" addr="0x7ff9f1f98650" >
-                            <attributelist id="1892" addr="0x7ff9f1f98650" >
-                                <attribute name="name" value="play" id="1893" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="1894" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="1895" addr="0x7ff9f1f95550" />
-                                <attribute name="sym_previousSibling" value="0x7ff9f1f98490" id="1896" addr="0x7ff9f1f98490" />
-                                <attribute name="kind" value="function" id="1897" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="play" id="1898" addr="0x7ff9f1fba9d0" />
-                                <attribute name="csym_nextSibling" value="0x7ff9f1f98750" id="1899" addr="0x7ff9f1f98750" />
-                                <attribute name="sym_nextSibling" value="0x7ff9f1f98750" id="1900" addr="0x7ff9f1f98750" />
-                                <attribute name="defaultargs" value="0x7ff9f1f97f30" id="1901" addr="0x7ff9f1f97f30" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::xbmc::PlayParameter)." id="1902" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="1903" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overloaded" value="0x7ff9f1f97f30" id="1904" addr="0x7ff9f1f97f30" />
-                                <parmlist id="1905" addr="0x7ff9f1f98530" >
+                                <attribute name="type" value="void" id="1889" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_2" id="1890" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="1891" addr="0x7fdf084ef650" >
+                            <attributelist id="1892" addr="0x7fdf084ef650" >
+                                <attribute name="name" value="play" id="1893" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="1894" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="1895" addr="0x7fdf084ec550" />
+                                <attribute name="sym_previousSibling" value="0x7fdf084ef490" id="1896" addr="0x7fdf084ef490" />
+                                <attribute name="kind" value="function" id="1897" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="play" id="1898" addr="0x7fdf085119d0" />
+                                <attribute name="csym_nextSibling" value="0x7fdf084ef750" id="1899" addr="0x7fdf084ef750" />
+                                <attribute name="sym_nextSibling" value="0x7fdf084ef750" id="1900" addr="0x7fdf084ef750" />
+                                <attribute name="defaultargs" value="0x7fdf084eef30" id="1901" addr="0x7fdf084eef30" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::xbmc::PlayParameter)." id="1902" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="1903" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overloaded" value="0x7fdf084eef30" id="1904" addr="0x7fdf084eef30" />
+                                <parmlist id="1905" addr="0x7fdf084ef530" >
                                     <parm id="1906">
-                                        <attributelist id="1907" addr="0x7ff9f1f98530" >
-                                            <attribute name="name" value="item" id="1908" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="Player::defaultPlayParameter" id="1909" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::xbmc::PlayParameter" id="1910" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="1907" addr="0x7fdf084ef530" >
+                                            <attribute name="name" value="item" id="1908" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="Player::defaultPlayParameter" id="1909" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::xbmc::PlayParameter" id="1910" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="1911" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_3" id="1912" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="1913" addr="0x7ff9f1f98750" >
-                            <attributelist id="1914" addr="0x7ff9f1f98750" >
-                                <attribute name="name" value="play" id="1915" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="1916" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="1917" addr="0x7ff9f1f95550" />
-                                <attribute name="sym_previousSibling" value="0x7ff9f1f98650" id="1918" addr="0x7ff9f1f98650" />
-                                <attribute name="kind" value="function" id="1919" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="play" id="1920" addr="0x7ff9f1fba9d0" />
-                                <attribute name="defaultargs" value="0x7ff9f1f97f30" id="1921" addr="0x7ff9f1f97f30" />
-                                <attribute name="decl" value="f()." id="1922" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="1923" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overloaded" value="0x7ff9f1f97f30" id="1924" addr="0x7ff9f1f97f30" />
-                                <attribute name="type" value="void" id="1925" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_4" id="1926" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="1927" addr="0x7ff9f1f98930" >
-                            <attributelist id="1928" addr="0x7ff9f1f98930" >
-                                <attribute name="ismember" value="1" id="1929" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="stop" id="1930" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="stop" id="1931" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="1932" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="1933" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="1934" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="void" id="1935" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="1936" addr="0x7ff9f1f95550" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="1937" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="1938" addr="0x7ff9f1f98af0" >
-                            <attributelist id="1939" addr="0x7ff9f1f98af0" >
-                                <attribute name="ismember" value="1" id="1940" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="pause" id="1941" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="pause" id="1942" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="1943" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="1944" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="1945" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="void" id="1946" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="1947" addr="0x7ff9f1f95550" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="1948" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="1949" addr="0x7ff9f1f98cb0" >
-                            <attributelist id="1950" addr="0x7ff9f1f98cb0" >
-                                <attribute name="ismember" value="1" id="1951" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="playnext" id="1952" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="playnext" id="1953" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="1954" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="1955" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="1956" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="void" id="1957" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="1958" addr="0x7ff9f1f95550" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="1959" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="1960" addr="0x7ff9f1f98e70" >
-                            <attributelist id="1961" addr="0x7ff9f1f98e70" >
-                                <attribute name="ismember" value="1" id="1962" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="playprevious" id="1963" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="playprevious" id="1964" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="1965" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="1966" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="1967" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="void" id="1968" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="1969" addr="0x7ff9f1f95550" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="1970" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="1971" addr="0x7ff9f1f99150" >
-                            <attributelist id="1972" addr="0x7ff9f1f99150" >
-                                <attribute name="name" value="playselected" id="1973" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="1974" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="1975" addr="0x7ff9f1f95550" />
-                                <attribute name="kind" value="function" id="1976" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="playselected" id="1977" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(int)." id="1978" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="1979" addr="0x7ff9f1fba9d0" />
-                                <parmlist id="1980" addr="0x7ff9f1f99090" >
+                                <attribute name="type" value="void" id="1911" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_3" id="1912" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="1913" addr="0x7fdf084ef750" >
+                            <attributelist id="1914" addr="0x7fdf084ef750" >
+                                <attribute name="name" value="play" id="1915" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="1916" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="1917" addr="0x7fdf084ec550" />
+                                <attribute name="sym_previousSibling" value="0x7fdf084ef650" id="1918" addr="0x7fdf084ef650" />
+                                <attribute name="kind" value="function" id="1919" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="play" id="1920" addr="0x7fdf085119d0" />
+                                <attribute name="defaultargs" value="0x7fdf084eef30" id="1921" addr="0x7fdf084eef30" />
+                                <attribute name="decl" value="f()." id="1922" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="1923" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overloaded" value="0x7fdf084eef30" id="1924" addr="0x7fdf084eef30" />
+                                <attribute name="type" value="void" id="1925" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_4" id="1926" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="1927" addr="0x7fdf084ef930" >
+                            <attributelist id="1928" addr="0x7fdf084ef930" >
+                                <attribute name="ismember" value="1" id="1929" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="stop" id="1930" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="stop" id="1931" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="1932" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="1933" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="1934" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="void" id="1935" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="1936" addr="0x7fdf084ec550" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="1937" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="1938" addr="0x7fdf084efaf0" >
+                            <attributelist id="1939" addr="0x7fdf084efaf0" >
+                                <attribute name="ismember" value="1" id="1940" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="pause" id="1941" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="pause" id="1942" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="1943" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="1944" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="1945" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="void" id="1946" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="1947" addr="0x7fdf084ec550" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="1948" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="1949" addr="0x7fdf084efcb0" >
+                            <attributelist id="1950" addr="0x7fdf084efcb0" >
+                                <attribute name="ismember" value="1" id="1951" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="playnext" id="1952" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="playnext" id="1953" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="1954" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="1955" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="1956" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="void" id="1957" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="1958" addr="0x7fdf084ec550" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="1959" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="1960" addr="0x7fdf084efe70" >
+                            <attributelist id="1961" addr="0x7fdf084efe70" >
+                                <attribute name="ismember" value="1" id="1962" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="playprevious" id="1963" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="playprevious" id="1964" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="1965" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="1966" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="1967" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="void" id="1968" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="1969" addr="0x7fdf084ec550" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="1970" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="1971" addr="0x7fdf084f0150" >
+                            <attributelist id="1972" addr="0x7fdf084f0150" >
+                                <attribute name="name" value="playselected" id="1973" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="1974" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="1975" addr="0x7fdf084ec550" />
+                                <attribute name="kind" value="function" id="1976" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="playselected" id="1977" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(int)." id="1978" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="1979" addr="0x7fdf085119d0" />
+                                <parmlist id="1980" addr="0x7fdf084f0090" >
                                     <parm id="1981">
-                                        <attributelist id="1982" addr="0x7ff9f1f99090" >
-                                            <attribute name="name" value="selected" id="1983" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="int" id="1984" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="1982" addr="0x7fdf084f0090" >
+                                            <attribute name="name" value="selected" id="1983" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="int" id="1984" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="1985" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="1986" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="1987" addr="0x7ff9f1f99310" >
-                            <attributelist id="1988" addr="0x7ff9f1f99310" >
-                                <attribute name="name" value="onPlayBackStarted" id="1989" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="1990" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="1991" addr="0x7ff9f1f95550" />
-                                <attribute name="kind" value="function" id="1992" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="onPlayBackStarted" id="1993" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="1994" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="1995" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="void" id="1996" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="1997" addr="0x7ff9f1fba9d0" />
-                                <attribute name="storage" value="virtual" id="1998" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="1999" addr="0x7ff9f1f994f0" >
-                            <attributelist id="2000" addr="0x7ff9f1f994f0" >
-                                <attribute name="name" value="onAVStarted" id="2001" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="2002" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="2003" addr="0x7ff9f1f95550" />
-                                <attribute name="kind" value="function" id="2004" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="onAVStarted" id="2005" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="2006" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2007" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="void" id="2008" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2009" addr="0x7ff9f1fba9d0" />
-                                <attribute name="storage" value="virtual" id="2010" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="2011" addr="0x7ff9f1f996d0" >
-                            <attributelist id="2012" addr="0x7ff9f1f996d0" >
-                                <attribute name="name" value="onAVChange" id="2013" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="2014" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="2015" addr="0x7ff9f1f95550" />
-                                <attribute name="kind" value="function" id="2016" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="onAVChange" id="2017" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="2018" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2019" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="void" id="2020" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2021" addr="0x7ff9f1fba9d0" />
-                                <attribute name="storage" value="virtual" id="2022" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="2023" addr="0x7ff9f1f998b0" >
-                            <attributelist id="2024" addr="0x7ff9f1f998b0" >
-                                <attribute name="name" value="onPlayBackEnded" id="2025" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="2026" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="2027" addr="0x7ff9f1f95550" />
-                                <attribute name="kind" value="function" id="2028" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="onPlayBackEnded" id="2029" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="2030" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2031" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="void" id="2032" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2033" addr="0x7ff9f1fba9d0" />
-                                <attribute name="storage" value="virtual" id="2034" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="2035" addr="0x7ff9f1f99a90" >
-                            <attributelist id="2036" addr="0x7ff9f1f99a90" >
-                                <attribute name="name" value="onPlayBackStopped" id="2037" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="2038" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="2039" addr="0x7ff9f1f95550" />
-                                <attribute name="kind" value="function" id="2040" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="onPlayBackStopped" id="2041" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="2042" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2043" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="void" id="2044" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2045" addr="0x7ff9f1fba9d0" />
-                                <attribute name="storage" value="virtual" id="2046" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="2047" addr="0x7ff9f1f99c70" >
-                            <attributelist id="2048" addr="0x7ff9f1f99c70" >
-                                <attribute name="name" value="onPlayBackError" id="2049" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="2050" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="2051" addr="0x7ff9f1f95550" />
-                                <attribute name="kind" value="function" id="2052" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="onPlayBackError" id="2053" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="2054" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2055" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="void" id="2056" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2057" addr="0x7ff9f1fba9d0" />
-                                <attribute name="storage" value="virtual" id="2058" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="2059" addr="0x7ff9f1f99e50" >
-                            <attributelist id="2060" addr="0x7ff9f1f99e50" >
-                                <attribute name="name" value="onPlayBackPaused" id="2061" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="2062" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="2063" addr="0x7ff9f1f95550" />
-                                <attribute name="kind" value="function" id="2064" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="onPlayBackPaused" id="2065" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="2066" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2067" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="void" id="2068" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2069" addr="0x7ff9f1fba9d0" />
-                                <attribute name="storage" value="virtual" id="2070" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="2071" addr="0x7ff9f1f9a030" >
-                            <attributelist id="2072" addr="0x7ff9f1f9a030" >
-                                <attribute name="name" value="onPlayBackResumed" id="2073" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="2074" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="2075" addr="0x7ff9f1f95550" />
-                                <attribute name="kind" value="function" id="2076" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="onPlayBackResumed" id="2077" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="2078" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2079" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="void" id="2080" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2081" addr="0x7ff9f1fba9d0" />
-                                <attribute name="storage" value="virtual" id="2082" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="2083" addr="0x7ff9f1f9a210" >
-                            <attributelist id="2084" addr="0x7ff9f1f9a210" >
-                                <attribute name="name" value="onQueueNextItem" id="2085" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="2086" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="2087" addr="0x7ff9f1f95550" />
-                                <attribute name="kind" value="function" id="2088" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="onQueueNextItem" id="2089" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="2090" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2091" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="void" id="2092" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2093" addr="0x7ff9f1fba9d0" />
-                                <attribute name="storage" value="virtual" id="2094" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="2095" addr="0x7ff9f1f9a510" >
-                            <attributelist id="2096" addr="0x7ff9f1f9a510" >
-                                <attribute name="name" value="onPlayBackSpeedChanged" id="2097" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="2098" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="2099" addr="0x7ff9f1f95550" />
-                                <attribute name="kind" value="function" id="2100" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="onPlayBackSpeedChanged" id="2101" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(int)." id="2102" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2103" addr="0x7ff9f1fba9d0" />
-                                <parmlist id="2104" addr="0x7ff9f1f9a450" >
+                                <attribute name="type" value="void" id="1985" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="1986" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="1987" addr="0x7fdf084f0310" >
+                            <attributelist id="1988" addr="0x7fdf084f0310" >
+                                <attribute name="name" value="onPlayBackStarted" id="1989" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="1990" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="1991" addr="0x7fdf084ec550" />
+                                <attribute name="kind" value="function" id="1992" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="onPlayBackStarted" id="1993" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="1994" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="1995" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="void" id="1996" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="1997" addr="0x7fdf085119d0" />
+                                <attribute name="storage" value="virtual" id="1998" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="1999" addr="0x7fdf084f04f0" >
+                            <attributelist id="2000" addr="0x7fdf084f04f0" >
+                                <attribute name="name" value="onAVStarted" id="2001" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="2002" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="2003" addr="0x7fdf084ec550" />
+                                <attribute name="kind" value="function" id="2004" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="onAVStarted" id="2005" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="2006" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2007" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="void" id="2008" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2009" addr="0x7fdf085119d0" />
+                                <attribute name="storage" value="virtual" id="2010" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="2011" addr="0x7fdf084f06d0" >
+                            <attributelist id="2012" addr="0x7fdf084f06d0" >
+                                <attribute name="name" value="onAVChange" id="2013" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="2014" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="2015" addr="0x7fdf084ec550" />
+                                <attribute name="kind" value="function" id="2016" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="onAVChange" id="2017" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="2018" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2019" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="void" id="2020" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2021" addr="0x7fdf085119d0" />
+                                <attribute name="storage" value="virtual" id="2022" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="2023" addr="0x7fdf084f08b0" >
+                            <attributelist id="2024" addr="0x7fdf084f08b0" >
+                                <attribute name="name" value="onPlayBackEnded" id="2025" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="2026" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="2027" addr="0x7fdf084ec550" />
+                                <attribute name="kind" value="function" id="2028" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="onPlayBackEnded" id="2029" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="2030" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2031" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="void" id="2032" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2033" addr="0x7fdf085119d0" />
+                                <attribute name="storage" value="virtual" id="2034" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="2035" addr="0x7fdf084f0a90" >
+                            <attributelist id="2036" addr="0x7fdf084f0a90" >
+                                <attribute name="name" value="onPlayBackStopped" id="2037" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="2038" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="2039" addr="0x7fdf084ec550" />
+                                <attribute name="kind" value="function" id="2040" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="onPlayBackStopped" id="2041" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="2042" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2043" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="void" id="2044" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2045" addr="0x7fdf085119d0" />
+                                <attribute name="storage" value="virtual" id="2046" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="2047" addr="0x7fdf084f0c70" >
+                            <attributelist id="2048" addr="0x7fdf084f0c70" >
+                                <attribute name="name" value="onPlayBackError" id="2049" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="2050" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="2051" addr="0x7fdf084ec550" />
+                                <attribute name="kind" value="function" id="2052" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="onPlayBackError" id="2053" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="2054" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2055" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="void" id="2056" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2057" addr="0x7fdf085119d0" />
+                                <attribute name="storage" value="virtual" id="2058" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="2059" addr="0x7fdf084f0e50" >
+                            <attributelist id="2060" addr="0x7fdf084f0e50" >
+                                <attribute name="name" value="onPlayBackPaused" id="2061" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="2062" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="2063" addr="0x7fdf084ec550" />
+                                <attribute name="kind" value="function" id="2064" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="onPlayBackPaused" id="2065" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="2066" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2067" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="void" id="2068" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2069" addr="0x7fdf085119d0" />
+                                <attribute name="storage" value="virtual" id="2070" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="2071" addr="0x7fdf084f1030" >
+                            <attributelist id="2072" addr="0x7fdf084f1030" >
+                                <attribute name="name" value="onPlayBackResumed" id="2073" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="2074" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="2075" addr="0x7fdf084ec550" />
+                                <attribute name="kind" value="function" id="2076" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="onPlayBackResumed" id="2077" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="2078" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2079" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="void" id="2080" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2081" addr="0x7fdf085119d0" />
+                                <attribute name="storage" value="virtual" id="2082" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="2083" addr="0x7fdf084f1210" >
+                            <attributelist id="2084" addr="0x7fdf084f1210" >
+                                <attribute name="name" value="onQueueNextItem" id="2085" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="2086" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="2087" addr="0x7fdf084ec550" />
+                                <attribute name="kind" value="function" id="2088" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="onQueueNextItem" id="2089" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="2090" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2091" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="void" id="2092" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2093" addr="0x7fdf085119d0" />
+                                <attribute name="storage" value="virtual" id="2094" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="2095" addr="0x7fdf084f1510" >
+                            <attributelist id="2096" addr="0x7fdf084f1510" >
+                                <attribute name="name" value="onPlayBackSpeedChanged" id="2097" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="2098" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="2099" addr="0x7fdf084ec550" />
+                                <attribute name="kind" value="function" id="2100" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="onPlayBackSpeedChanged" id="2101" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(int)." id="2102" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2103" addr="0x7fdf085119d0" />
+                                <parmlist id="2104" addr="0x7fdf084f1450" >
                                     <parm id="2105">
-                                        <attributelist id="2106" addr="0x7ff9f1f9a450" >
-                                            <attribute name="name" value="speed" id="2107" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="int" id="2108" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="2106" addr="0x7fdf084f1450" >
+                                            <attribute name="name" value="speed" id="2107" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="int" id="2108" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="2109" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2110" addr="0x7ff9f1fba9d0" />
-                                <attribute name="storage" value="virtual" id="2111" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="2112" addr="0x7ff9f1f9a930" >
-                            <attributelist id="2113" addr="0x7ff9f1f9a930" >
-                                <attribute name="name" value="onPlayBackSeek" id="2114" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="2115" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="2116" addr="0x7ff9f1f95550" />
-                                <attribute name="kind" value="function" id="2117" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="onPlayBackSeek" id="2118" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(int,int)." id="2119" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2120" addr="0x7ff9f1fba9d0" />
-                                <parmlist id="2121" addr="0x7ff9f1f9a750" >
+                                <attribute name="type" value="void" id="2109" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2110" addr="0x7fdf085119d0" />
+                                <attribute name="storage" value="virtual" id="2111" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="2112" addr="0x7fdf084f1930" >
+                            <attributelist id="2113" addr="0x7fdf084f1930" >
+                                <attribute name="name" value="onPlayBackSeek" id="2114" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="2115" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="2116" addr="0x7fdf084ec550" />
+                                <attribute name="kind" value="function" id="2117" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="onPlayBackSeek" id="2118" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(int,int)." id="2119" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2120" addr="0x7fdf085119d0" />
+                                <parmlist id="2121" addr="0x7fdf084f1750" >
                                     <parm id="2122">
-                                        <attributelist id="2123" addr="0x7ff9f1f9a750" >
-                                            <attribute name="name" value="time" id="2124" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="int" id="2125" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="2123" addr="0x7fdf084f1750" >
+                                            <attribute name="name" value="time" id="2124" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="int" id="2125" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                     <parm id="2126">
-                                        <attributelist id="2127" addr="0x7ff9f1f9a870" >
-                                            <attribute name="name" value="seekOffset" id="2128" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="int" id="2129" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="2127" addr="0x7fdf084f1870" >
+                                            <attribute name="name" value="seekOffset" id="2128" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="int" id="2129" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="2130" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2131" addr="0x7ff9f1fba9d0" />
-                                <attribute name="storage" value="virtual" id="2132" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="2133" addr="0x7ff9f1f9ac30" >
-                            <attributelist id="2134" addr="0x7ff9f1f9ac30" >
-                                <attribute name="name" value="onPlayBackSeekChapter" id="2135" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="2136" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="2137" addr="0x7ff9f1f95550" />
-                                <attribute name="kind" value="function" id="2138" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="onPlayBackSeekChapter" id="2139" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(int)." id="2140" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2141" addr="0x7ff9f1fba9d0" />
-                                <parmlist id="2142" addr="0x7ff9f1f9ab70" >
+                                <attribute name="type" value="void" id="2130" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2131" addr="0x7fdf085119d0" />
+                                <attribute name="storage" value="virtual" id="2132" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="2133" addr="0x7fdf084f1c30" >
+                            <attributelist id="2134" addr="0x7fdf084f1c30" >
+                                <attribute name="name" value="onPlayBackSeekChapter" id="2135" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="2136" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="2137" addr="0x7fdf084ec550" />
+                                <attribute name="kind" value="function" id="2138" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="onPlayBackSeekChapter" id="2139" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(int)." id="2140" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2141" addr="0x7fdf085119d0" />
+                                <parmlist id="2142" addr="0x7fdf084f1b70" >
                                     <parm id="2143">
-                                        <attributelist id="2144" addr="0x7ff9f1f9ab70" >
-                                            <attribute name="name" value="chapter" id="2145" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="int" id="2146" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="2144" addr="0x7fdf084f1b70" >
+                                            <attribute name="name" value="chapter" id="2145" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="int" id="2146" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="2147" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2148" addr="0x7ff9f1fba9d0" />
-                                <attribute name="storage" value="virtual" id="2149" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="2150" addr="0x7ff9f1f9ae10" >
-                            <attributelist id="2151" addr="0x7ff9f1f9ae10" >
-                                <attribute name="ismember" value="1" id="2152" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="isPlaying" id="2153" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="isPlaying" id="2154" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="2155" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2156" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="2157" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="bool" id="2158" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="2159" addr="0x7ff9f1f95550" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2160" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="2161" addr="0x7ff9f1f9afd0" >
-                            <attributelist id="2162" addr="0x7ff9f1f9afd0" >
-                                <attribute name="ismember" value="1" id="2163" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="isPlayingAudio" id="2164" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="isPlayingAudio" id="2165" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="2166" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2167" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="2168" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="bool" id="2169" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="2170" addr="0x7ff9f1f95550" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2171" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="2172" addr="0x7ff9f1f9b190" >
-                            <attributelist id="2173" addr="0x7ff9f1f9b190" >
-                                <attribute name="ismember" value="1" id="2174" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="isPlayingVideo" id="2175" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="isPlayingVideo" id="2176" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="2177" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2178" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="2179" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="bool" id="2180" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="2181" addr="0x7ff9f1f95550" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2182" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="2183" addr="0x7ff9f1f9b350" >
-                            <attributelist id="2184" addr="0x7ff9f1f9b350" >
-                                <attribute name="ismember" value="1" id="2185" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="isPlayingRDS" id="2186" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="isPlayingRDS" id="2187" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="2188" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2189" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="2190" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="bool" id="2191" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="2192" addr="0x7ff9f1f95550" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2193" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="2194" addr="0x7ff9f1f9b510" >
-                            <attributelist id="2195" addr="0x7ff9f1f9b510" >
-                                <attribute name="ismember" value="1" id="2196" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="isExternalPlayer" id="2197" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="isExternalPlayer" id="2198" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="2199" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2200" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="2201" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="bool" id="2202" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="2203" addr="0x7ff9f1f95550" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2204" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="2205" addr="0x7ff9f1f9b6f0" >
-                            <attributelist id="2206" addr="0x7ff9f1f9b6f0" >
-                                <attribute name="ismember" value="1" id="2207" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getPlayingFile" id="2208" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getPlayingFile" id="2209" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="2210" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2211" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="2212" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="2213" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="2214" addr="0x7ff9f1f95550" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2215" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="2216" addr="0x7ff9f1f9b8d0" >
-                            <attributelist id="2217" addr="0x7ff9f1f9b8d0" >
-                                <attribute name="ismember" value="1" id="2218" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getTime" id="2219" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getTime" id="2220" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="2221" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2222" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="2223" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="double" id="2224" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="2225" addr="0x7ff9f1f95550" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2226" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="2227" addr="0x7ff9f1f9bbb0" >
-                            <attributelist id="2228" addr="0x7ff9f1f9bbb0" >
-                                <attribute name="name" value="seekTime" id="2229" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="2230" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="2231" addr="0x7ff9f1f95550" />
-                                <attribute name="kind" value="function" id="2232" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="seekTime" id="2233" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(double)." id="2234" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2235" addr="0x7ff9f1fba9d0" />
-                                <parmlist id="2236" addr="0x7ff9f1f9baf0" >
+                                <attribute name="type" value="void" id="2147" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2148" addr="0x7fdf085119d0" />
+                                <attribute name="storage" value="virtual" id="2149" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="2150" addr="0x7fdf084f1e10" >
+                            <attributelist id="2151" addr="0x7fdf084f1e10" >
+                                <attribute name="ismember" value="1" id="2152" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="isPlaying" id="2153" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="isPlaying" id="2154" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="2155" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2156" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="2157" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="bool" id="2158" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="2159" addr="0x7fdf084ec550" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2160" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="2161" addr="0x7fdf084f1fd0" >
+                            <attributelist id="2162" addr="0x7fdf084f1fd0" >
+                                <attribute name="ismember" value="1" id="2163" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="isPlayingAudio" id="2164" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="isPlayingAudio" id="2165" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="2166" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2167" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="2168" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="bool" id="2169" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="2170" addr="0x7fdf084ec550" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2171" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="2172" addr="0x7fdf084f2190" >
+                            <attributelist id="2173" addr="0x7fdf084f2190" >
+                                <attribute name="ismember" value="1" id="2174" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="isPlayingVideo" id="2175" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="isPlayingVideo" id="2176" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="2177" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2178" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="2179" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="bool" id="2180" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="2181" addr="0x7fdf084ec550" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2182" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="2183" addr="0x7fdf084f2350" >
+                            <attributelist id="2184" addr="0x7fdf084f2350" >
+                                <attribute name="ismember" value="1" id="2185" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="isPlayingRDS" id="2186" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="isPlayingRDS" id="2187" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="2188" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2189" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="2190" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="bool" id="2191" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="2192" addr="0x7fdf084ec550" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2193" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="2194" addr="0x7fdf084f2510" >
+                            <attributelist id="2195" addr="0x7fdf084f2510" >
+                                <attribute name="ismember" value="1" id="2196" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="isExternalPlayer" id="2197" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="isExternalPlayer" id="2198" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="2199" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2200" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="2201" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="bool" id="2202" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="2203" addr="0x7fdf084ec550" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2204" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="2205" addr="0x7fdf084f26f0" >
+                            <attributelist id="2206" addr="0x7fdf084f26f0" >
+                                <attribute name="ismember" value="1" id="2207" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getPlayingFile" id="2208" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getPlayingFile" id="2209" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="2210" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2211" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="2212" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="2213" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="2214" addr="0x7fdf084ec550" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2215" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="2216" addr="0x7fdf084f28d0" >
+                            <attributelist id="2217" addr="0x7fdf084f28d0" >
+                                <attribute name="ismember" value="1" id="2218" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getTime" id="2219" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getTime" id="2220" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="2221" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2222" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="2223" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="double" id="2224" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="2225" addr="0x7fdf084ec550" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2226" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="2227" addr="0x7fdf084f2bb0" >
+                            <attributelist id="2228" addr="0x7fdf084f2bb0" >
+                                <attribute name="name" value="seekTime" id="2229" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="2230" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="2231" addr="0x7fdf084ec550" />
+                                <attribute name="kind" value="function" id="2232" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="seekTime" id="2233" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(double)." id="2234" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2235" addr="0x7fdf085119d0" />
+                                <parmlist id="2236" addr="0x7fdf084f2af0" >
                                     <parm id="2237">
-                                        <attributelist id="2238" addr="0x7ff9f1f9baf0" >
-                                            <attribute name="name" value="seekTime" id="2239" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="double" id="2240" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="2238" addr="0x7fdf084f2af0" >
+                                            <attribute name="name" value="seekTime" id="2239" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="double" id="2240" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="2241" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2242" addr="0x7ff9f1fba9d0" />
+                                <attribute name="type" value="void" id="2241" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2242" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="2243" addr="0x7ff9f1f9beb0" >
-                            <attributelist id="2244" addr="0x7ff9f1f9beb0" >
-                                <attribute name="name" value="setSubtitles" id="2245" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="2246" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="2247" addr="0x7ff9f1f95550" />
-                                <attribute name="kind" value="function" id="2248" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="setSubtitles" id="2249" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(p.q(const).char)." id="2250" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2251" addr="0x7ff9f1fba9d0" />
-                                <parmlist id="2252" addr="0x7ff9f1f9bdf0" >
+                        <cdecl id="2243" addr="0x7fdf084f2eb0" >
+                            <attributelist id="2244" addr="0x7fdf084f2eb0" >
+                                <attribute name="name" value="setSubtitles" id="2245" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="2246" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="2247" addr="0x7fdf084ec550" />
+                                <attribute name="kind" value="function" id="2248" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="setSubtitles" id="2249" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(p.q(const).char)." id="2250" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2251" addr="0x7fdf085119d0" />
+                                <parmlist id="2252" addr="0x7fdf084f2df0" >
                                     <parm id="2253">
-                                        <attributelist id="2254" addr="0x7ff9f1f9bdf0" >
-                                            <attribute name="name" value="subtitleFile" id="2255" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="p.q(const).char" id="2256" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="2254" addr="0x7fdf084f2df0" >
+                                            <attribute name="name" value="subtitleFile" id="2255" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="p.q(const).char" id="2256" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="2257" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2258" addr="0x7ff9f1fba9d0" />
+                                <attribute name="type" value="void" id="2257" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2258" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="2259" addr="0x7ff9f1f9c170" >
-                            <attributelist id="2260" addr="0x7ff9f1f9c170" >
-                                <attribute name="name" value="showSubtitles" id="2261" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="2262" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="2263" addr="0x7ff9f1f95550" />
-                                <attribute name="kind" value="function" id="2264" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="showSubtitles" id="2265" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(bool)." id="2266" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2267" addr="0x7ff9f1fba9d0" />
-                                <parmlist id="2268" addr="0x7ff9f1f9c0b0" >
+                        <cdecl id="2259" addr="0x7fdf084f3170" >
+                            <attributelist id="2260" addr="0x7fdf084f3170" >
+                                <attribute name="name" value="showSubtitles" id="2261" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="2262" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="2263" addr="0x7fdf084ec550" />
+                                <attribute name="kind" value="function" id="2264" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="showSubtitles" id="2265" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(bool)." id="2266" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2267" addr="0x7fdf085119d0" />
+                                <parmlist id="2268" addr="0x7fdf084f30b0" >
                                     <parm id="2269">
-                                        <attributelist id="2270" addr="0x7ff9f1f9c0b0" >
-                                            <attribute name="name" value="bVisible" id="2271" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="bool" id="2272" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="2270" addr="0x7fdf084f30b0" >
+                                            <attribute name="name" value="bVisible" id="2271" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="bool" id="2272" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="2273" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2274" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="2275" addr="0x7ff9f1f9c350" >
-                            <attributelist id="2276" addr="0x7ff9f1f9c350" >
-                                <attribute name="ismember" value="1" id="2277" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getSubtitles" id="2278" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getSubtitles" id="2279" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="2280" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2281" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="2282" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="2283" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="2284" addr="0x7ff9f1f95550" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2285" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="2286" addr="0x7ff9f1f9c610" >
-                            <attributelist id="2287" addr="0x7ff9f1f9c610" >
-                                <attribute name="ismember" value="1" id="2288" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getAvailableSubtitleStreams" id="2289" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getAvailableSubtitleStreams" id="2290" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="2291" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2292" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="2293" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="std::vector&lt;(XBMCAddon::String)>" id="2294" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="2295" addr="0x7ff9f1f95550" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2296" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="2297" addr="0x7ff9f1f9c8f0" >
-                            <attributelist id="2298" addr="0x7ff9f1f9c8f0" >
-                                <attribute name="name" value="setSubtitleStream" id="2299" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="2300" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="2301" addr="0x7ff9f1f95550" />
-                                <attribute name="kind" value="function" id="2302" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="setSubtitleStream" id="2303" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(int)." id="2304" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2305" addr="0x7ff9f1fba9d0" />
-                                <parmlist id="2306" addr="0x7ff9f1f9c830" >
+                                <attribute name="type" value="void" id="2273" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2274" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="2275" addr="0x7fdf084f3350" >
+                            <attributelist id="2276" addr="0x7fdf084f3350" >
+                                <attribute name="ismember" value="1" id="2277" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getSubtitles" id="2278" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getSubtitles" id="2279" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="2280" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2281" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="2282" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="2283" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="2284" addr="0x7fdf084ec550" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2285" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="2286" addr="0x7fdf084f3610" >
+                            <attributelist id="2287" addr="0x7fdf084f3610" >
+                                <attribute name="ismember" value="1" id="2288" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getAvailableSubtitleStreams" id="2289" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getAvailableSubtitleStreams" id="2290" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="2291" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2292" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="2293" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="std::vector&lt;(XBMCAddon::String)>" id="2294" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="2295" addr="0x7fdf084ec550" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2296" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="2297" addr="0x7fdf084f38f0" >
+                            <attributelist id="2298" addr="0x7fdf084f38f0" >
+                                <attribute name="name" value="setSubtitleStream" id="2299" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="2300" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="2301" addr="0x7fdf084ec550" />
+                                <attribute name="kind" value="function" id="2302" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="setSubtitleStream" id="2303" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(int)." id="2304" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2305" addr="0x7fdf085119d0" />
+                                <parmlist id="2306" addr="0x7fdf084f3830" >
                                     <parm id="2307">
-                                        <attributelist id="2308" addr="0x7ff9f1f9c830" >
-                                            <attribute name="name" value="iStream" id="2309" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="int" id="2310" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="2308" addr="0x7fdf084f3830" >
+                                            <attribute name="name" value="iStream" id="2309" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="int" id="2310" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="2311" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2312" addr="0x7ff9f1fba9d0" />
+                                <attribute name="type" value="void" id="2311" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2312" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="2313" addr="0x7ff9f1f9cc30" >
-                            <attributelist id="2314" addr="0x7ff9f1f9cc30" >
-                                <attribute name="name" value="updateInfoTag" id="2315" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="2316" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="2317" addr="0x7ff9f1f95550" />
-                                <attribute name="kind" value="function" id="2318" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="updateInfoTag" id="2319" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(p.q(const).XBMCAddon::xbmcgui::ListItem)." id="2320" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2321" addr="0x7ff9f1fba9d0" />
-                                <parmlist id="2322" addr="0x7ff9f1f9cb70" >
+                        <cdecl id="2313" addr="0x7fdf084f3c30" >
+                            <attributelist id="2314" addr="0x7fdf084f3c30" >
+                                <attribute name="name" value="updateInfoTag" id="2315" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="2316" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="2317" addr="0x7fdf084ec550" />
+                                <attribute name="kind" value="function" id="2318" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="updateInfoTag" id="2319" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(p.q(const).XBMCAddon::xbmcgui::ListItem)." id="2320" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2321" addr="0x7fdf085119d0" />
+                                <parmlist id="2322" addr="0x7fdf084f3b70" >
                                     <parm id="2323">
-                                        <attributelist id="2324" addr="0x7ff9f1f9cb70" >
-                                            <attribute name="name" value="item" id="2325" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::ListItem" id="2326" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="2324" addr="0x7fdf084f3b70" >
+                                            <attribute name="name" value="item" id="2325" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::ListItem" id="2326" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="2327" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2328" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="2329" addr="0x7ff9f1f9ce50" >
-                            <attributelist id="2330" addr="0x7ff9f1f9ce50" >
-                                <attribute name="ismember" value="1" id="2331" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getVideoInfoTag" id="2332" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getVideoInfoTag" id="2333" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f().p." id="2334" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2335" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="2336" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="InfoTagVideo" id="2337" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="2338" addr="0x7ff9f1f95550" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2339" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="2340" addr="0x7ff9f1f9d030" >
-                            <attributelist id="2341" addr="0x7ff9f1f9d030" >
-                                <attribute name="ismember" value="1" id="2342" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getMusicInfoTag" id="2343" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getMusicInfoTag" id="2344" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f().p." id="2345" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2346" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="2347" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="InfoTagMusic" id="2348" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="2349" addr="0x7ff9f1f95550" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2350" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="2351" addr="0x7ff9f1f9d210" >
-                            <attributelist id="2352" addr="0x7ff9f1f9d210" >
-                                <attribute name="ismember" value="1" id="2353" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getRadioRDSInfoTag" id="2354" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getRadioRDSInfoTag" id="2355" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f().p." id="2356" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2357" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="2358" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="InfoTagRadioRDS" id="2359" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="2360" addr="0x7ff9f1f95550" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2361" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="2362" addr="0x7ff9f1f9d410" >
-                            <attributelist id="2363" addr="0x7ff9f1f9d410" >
-                                <attribute name="ismember" value="1" id="2364" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getTotalTime" id="2365" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getTotalTime" id="2366" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="2367" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2368" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="2369" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="double" id="2370" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="2371" addr="0x7ff9f1f95550" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2372" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="2373" addr="0x7ff9f1f9d6d0" >
-                            <attributelist id="2374" addr="0x7ff9f1f9d6d0" >
-                                <attribute name="ismember" value="1" id="2375" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getAvailableAudioStreams" id="2376" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getAvailableAudioStreams" id="2377" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="2378" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2379" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="2380" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="std::vector&lt;(XBMCAddon::String)>" id="2381" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="2382" addr="0x7ff9f1f95550" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2383" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="2384" addr="0x7ff9f1f9d9b0" >
-                            <attributelist id="2385" addr="0x7ff9f1f9d9b0" >
-                                <attribute name="name" value="setAudioStream" id="2386" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="2387" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="2388" addr="0x7ff9f1f95550" />
-                                <attribute name="kind" value="function" id="2389" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="setAudioStream" id="2390" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(int)." id="2391" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2392" addr="0x7ff9f1fba9d0" />
-                                <parmlist id="2393" addr="0x7ff9f1f9d8f0" >
+                                <attribute name="type" value="void" id="2327" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2328" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="2329" addr="0x7fdf084f3e50" >
+                            <attributelist id="2330" addr="0x7fdf084f3e50" >
+                                <attribute name="ismember" value="1" id="2331" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getVideoInfoTag" id="2332" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getVideoInfoTag" id="2333" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f().p." id="2334" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2335" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="2336" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="InfoTagVideo" id="2337" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="2338" addr="0x7fdf084ec550" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2339" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="2340" addr="0x7fdf084f4030" >
+                            <attributelist id="2341" addr="0x7fdf084f4030" >
+                                <attribute name="ismember" value="1" id="2342" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getMusicInfoTag" id="2343" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getMusicInfoTag" id="2344" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f().p." id="2345" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2346" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="2347" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="InfoTagMusic" id="2348" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="2349" addr="0x7fdf084ec550" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2350" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="2351" addr="0x7fdf084f4210" >
+                            <attributelist id="2352" addr="0x7fdf084f4210" >
+                                <attribute name="ismember" value="1" id="2353" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getRadioRDSInfoTag" id="2354" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getRadioRDSInfoTag" id="2355" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f().p." id="2356" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2357" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="2358" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="InfoTagRadioRDS" id="2359" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="2360" addr="0x7fdf084ec550" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2361" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="2362" addr="0x7fdf084f4410" >
+                            <attributelist id="2363" addr="0x7fdf084f4410" >
+                                <attribute name="ismember" value="1" id="2364" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getTotalTime" id="2365" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getTotalTime" id="2366" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="2367" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2368" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="2369" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="double" id="2370" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="2371" addr="0x7fdf084ec550" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2372" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="2373" addr="0x7fdf084f46d0" >
+                            <attributelist id="2374" addr="0x7fdf084f46d0" >
+                                <attribute name="ismember" value="1" id="2375" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getAvailableAudioStreams" id="2376" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getAvailableAudioStreams" id="2377" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="2378" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2379" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="2380" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="std::vector&lt;(XBMCAddon::String)>" id="2381" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="2382" addr="0x7fdf084ec550" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2383" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="2384" addr="0x7fdf084f49b0" >
+                            <attributelist id="2385" addr="0x7fdf084f49b0" >
+                                <attribute name="name" value="setAudioStream" id="2386" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="2387" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="2388" addr="0x7fdf084ec550" />
+                                <attribute name="kind" value="function" id="2389" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="setAudioStream" id="2390" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(int)." id="2391" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2392" addr="0x7fdf085119d0" />
+                                <parmlist id="2393" addr="0x7fdf084f48f0" >
                                     <parm id="2394">
-                                        <attributelist id="2395" addr="0x7ff9f1f9d8f0" >
-                                            <attribute name="name" value="iStream" id="2396" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="int" id="2397" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="2395" addr="0x7fdf084f48f0" >
+                                            <attribute name="name" value="iStream" id="2396" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="int" id="2397" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="2398" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2399" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="2400" addr="0x7ff9f1f9dc70" >
-                            <attributelist id="2401" addr="0x7ff9f1f9dc70" >
-                                <attribute name="ismember" value="1" id="2402" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getAvailableVideoStreams" id="2403" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getAvailableVideoStreams" id="2404" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="2405" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2406" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="2407" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="std::vector&lt;(XBMCAddon::String)>" id="2408" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="2409" addr="0x7ff9f1f95550" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2410" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="2411" addr="0x7ff9f1f9df50" >
-                            <attributelist id="2412" addr="0x7ff9f1f9df50" >
-                                <attribute name="name" value="setVideoStream" id="2413" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="2414" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="2415" addr="0x7ff9f1f95550" />
-                                <attribute name="kind" value="function" id="2416" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="setVideoStream" id="2417" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(int)." id="2418" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2419" addr="0x7ff9f1fba9d0" />
-                                <parmlist id="2420" addr="0x7ff9f1f9de90" >
+                                <attribute name="type" value="void" id="2398" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2399" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="2400" addr="0x7fdf084f4c70" >
+                            <attributelist id="2401" addr="0x7fdf084f4c70" >
+                                <attribute name="ismember" value="1" id="2402" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getAvailableVideoStreams" id="2403" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getAvailableVideoStreams" id="2404" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="2405" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2406" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="2407" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="std::vector&lt;(XBMCAddon::String)>" id="2408" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="2409" addr="0x7fdf084ec550" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2410" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="2411" addr="0x7fdf084f4f50" >
+                            <attributelist id="2412" addr="0x7fdf084f4f50" >
+                                <attribute name="name" value="setVideoStream" id="2413" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="2414" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="2415" addr="0x7fdf084ec550" />
+                                <attribute name="kind" value="function" id="2416" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="setVideoStream" id="2417" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(int)." id="2418" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2419" addr="0x7fdf085119d0" />
+                                <parmlist id="2420" addr="0x7fdf084f4e90" >
                                     <parm id="2421">
-                                        <attributelist id="2422" addr="0x7ff9f1f9de90" >
-                                            <attribute name="name" value="iStream" id="2423" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="int" id="2424" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="2422" addr="0x7fdf084f4e90" >
+                                            <attribute name="name" value="iStream" id="2423" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="int" id="2424" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="2425" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2426" addr="0x7ff9f1fba9d0" />
+                                <attribute name="type" value="void" id="2425" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2426" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </cdecl >
-                        <access id="2427" addr="0x7ff9f1f9dff0" >
-                            <attributelist id="2428" addr="0x7ff9f1f9dff0" >
-                                <attribute name="kind" value="protected" id="2429" addr="0x7ff9f1fba9d0" />
+                        <access id="2427" addr="0x7fdf084f4ff0" >
+                            <attributelist id="2428" addr="0x7fdf084f4ff0" >
+                                <attribute name="kind" value="protected" id="2429" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </access >
-                        <access id="2430" addr="0x7ff9f1f9e110" >
-                            <attributelist id="2431" addr="0x7ff9f1f9e110" >
-                                <attribute name="kind" value="public" id="2432" addr="0x7ff9f1fba9d0" />
+                        <access id="2430" addr="0x7fdf084f5110" >
+                            <attributelist id="2431" addr="0x7fdf084f5110" >
+                                <attribute name="kind" value="public" id="2432" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </access >
@@ -3442,524 +3442,524 @@
                 </namespace >
             </namespace >
         </include >
-        <include id="2433" addr="0x7ff9f1f9e230" >
-            <attributelist id="2434" addr="0x7ff9f1f9e230" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/RenderCapture.h" id="2435" addr="0x7ff9f1fba9d0" />
+        <include id="2433" addr="0x7fdf084f5230" >
+            <attributelist id="2434" addr="0x7fdf084f5230" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/RenderCapture.h" id="2435" addr="0x7fdf085119d0" />
             </attributelist >
 
-            <namespace id="2436" addr="0x7ff9f1f9e2d0" >
-                <attributelist id="2437" addr="0x7ff9f1f9e2d0" >
-                    <attribute name="sym_name" value="XBMCAddon" id="2438" addr="0x7ff9f1fba9d0" />
-                    <attribute name="name" value="XBMCAddon" id="2439" addr="0x7ff9f1fba9d0" />
-                    <attribute name="sym_previousSibling" value="0x7ff9f1f949b0" id="2440" addr="0x7ff9f1f949b0" />
-                    <attribute name="csym_nextSibling" value="0x7ff9f1fa0450" id="2441" addr="0x7ff9f1fa0450" />
-                    <attribute name="sym_nextSibling" value="0x7ff9f1fa0450" id="2442" addr="0x7ff9f1fa0450" />
-                    <typescope id="2443" addr="0x7ff9f1fb4990" >
-                        <attributelist id="2444" addr="0x7ff9f1fb4990" >
-                            <attribute name="name" value="XBMCAddon" id="2445" addr="0x7ff9f1fba9d0" />
-                            <typetab id="2446" addr="0x7ff9f1fb49d0" >
-                                <attributelist id="2447" addr="0x7ff9f1fb49d0" >
-                                    <attribute name="String" value="std::string" id="2448" addr="0x7ff9f1fba9d0" />
+            <namespace id="2436" addr="0x7fdf084f52d0" >
+                <attributelist id="2437" addr="0x7fdf084f52d0" >
+                    <attribute name="sym_name" value="XBMCAddon" id="2438" addr="0x7fdf085119d0" />
+                    <attribute name="name" value="XBMCAddon" id="2439" addr="0x7fdf085119d0" />
+                    <attribute name="sym_previousSibling" value="0x7fdf084eb9b0" id="2440" addr="0x7fdf084eb9b0" />
+                    <attribute name="csym_nextSibling" value="0x7fdf084f7450" id="2441" addr="0x7fdf084f7450" />
+                    <attribute name="sym_nextSibling" value="0x7fdf084f7450" id="2442" addr="0x7fdf084f7450" />
+                    <typescope id="2443" addr="0x7fdf0850b990" >
+                        <attributelist id="2444" addr="0x7fdf0850b990" >
+                            <attribute name="name" value="XBMCAddon" id="2445" addr="0x7fdf085119d0" />
+                            <typetab id="2446" addr="0x7fdf0850b9d0" >
+                                <attributelist id="2447" addr="0x7fdf0850b9d0" >
+                                    <attribute name="String" value="std::string" id="2448" addr="0x7fdf085119d0" />
                                 </attributelist >
-                                <typetabsitem id="2449" addr="0x7ff9f1fb4bb0" >
-                                    <attributelist id="2450" addr="0x7ff9f1fb4bb0" >
+                                <typetabsitem id="2449" addr="0x7fdf0850bbb0" >
+                                    <attributelist id="2450" addr="0x7fdf0850bbb0" >
                                     </attributelist >
                                 </typetabsitem >
                             </typetab >
-                            <attribute name="parent" value="0x7ff9f1f72a30" id="2451" addr="0x7ff9f1f72a30" />
-                            <attribute name="qname" value="XBMCAddon" id="2452" addr="0x7ff9f1fba9d0" />
-                            <attribute name="symtab" value="0x7ff9f1f89bb0" id="2453" addr="0x7ff9f1f89bb0" />
+                            <attribute name="parent" value="0x7fdf084c9a30" id="2451" addr="0x7fdf084c9a30" />
+                            <attribute name="qname" value="XBMCAddon" id="2452" addr="0x7fdf085119d0" />
+                            <attribute name="symtab" value="0x7fdf084e0bb0" id="2453" addr="0x7fdf084e0bb0" />
                         </attributelist >
-                        <typescopesitem id="2454" addr="0x7ff9f1f89b70" >
-                            <attributelist id="2455" addr="0x7ff9f1f89b70" >
+                        <typescopesitem id="2454" addr="0x7fdf084e0b70" >
+                            <attributelist id="2455" addr="0x7fdf084e0b70" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="2456" addr="0x7ff9f1fb49d0" >
-                            <attributelist id="2457" addr="0x7ff9f1fb49d0" >
-                                <attribute name="String" value="std::string" id="2458" addr="0x7ff9f1fba9d0" />
+                        <typescopesitem id="2456" addr="0x7fdf0850b9d0" >
+                            <attributelist id="2457" addr="0x7fdf0850b9d0" >
+                                <attribute name="String" value="std::string" id="2458" addr="0x7fdf085119d0" />
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="2459" addr="0x7ff9f1f72a30" >
-                            <attributelist id="2460" addr="0x7ff9f1f72a30" >
-                                <attribute name="name" value="" id="2461" addr="0x7ff9f1fba9d0" />
-                                <typetab id="2462" addr="0x7ff9f1f72a90" >
-                                    <attributelist id="2463" addr="0x7ff9f1f72a90" >
-                                        <attribute name="CGUIDialogKeyboardGeneric" value="CGUIDialogKeyboardGeneric" id="2464" addr="0x7ff9f1fba9d0" />
+                        <typescopesitem id="2459" addr="0x7fdf084c9a30" >
+                            <attributelist id="2460" addr="0x7fdf084c9a30" >
+                                <attribute name="name" value="" id="2461" addr="0x7fdf085119d0" />
+                                <typetab id="2462" addr="0x7fdf084c9a90" >
+                                    <attributelist id="2463" addr="0x7fdf084c9a90" >
+                                        <attribute name="CGUIDialogKeyboardGeneric" value="CGUIDialogKeyboardGeneric" id="2464" addr="0x7fdf085119d0" />
                                     </attributelist >
-                                    <typetabsitem id="2465" addr="0x7ff9f1fb7950" >
-                                        <attributelist id="2466" addr="0x7ff9f1fb7950" >
+                                    <typetabsitem id="2465" addr="0x7fdf0850e950" >
+                                        <attributelist id="2466" addr="0x7fdf0850e950" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="2467" addr="0x7ff9f1fb4ad0" >
-                            <attributelist id="2468" addr="0x7ff9f1fb4ad0" >
+                        <typescopesitem id="2467" addr="0x7fdf0850bad0" >
+                            <attributelist id="2468" addr="0x7fdf0850bad0" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="2469" addr="0x7ff9f1f89bb0" >
-                            <attributelist id="2470" addr="0x7ff9f1f89bb0" >
-                                <attribute name="name" value="XBMCAddon" id="2471" addr="0x7ff9f1fba9d0" />
-                                <attribute name="csymtab" value="0x7ff9f1f89bf0" id="2472" addr="0x7ff9f1f89bf0" />
-                                <attribute name="symtab" value="0x7ff9f1f89b90" id="2473" addr="0x7ff9f1f89b90" />
+                        <typescopesitem id="2469" addr="0x7fdf084e0bb0" >
+                            <attributelist id="2470" addr="0x7fdf084e0bb0" >
+                                <attribute name="name" value="XBMCAddon" id="2471" addr="0x7fdf085119d0" />
+                                <attribute name="csymtab" value="0x7fdf084e0bf0" id="2472" addr="0x7fdf084e0bf0" />
+                                <attribute name="symtab" value="0x7fdf084e0b90" id="2473" addr="0x7fdf084e0b90" />
                             </attributelist >
                         </typescopesitem >
                     </typescope >
-                    <attribute name="symtab" value="0x7ff9f1f89bb0" id="2474" addr="0x7ff9f1f89bb0" />
-                    <attribute name="sym_symtab" value="0x7ff9f1f72950" id="2475" addr="0x7ff9f1f72950" />
+                    <attribute name="symtab" value="0x7fdf084e0bb0" id="2474" addr="0x7fdf084e0bb0" />
+                    <attribute name="sym_symtab" value="0x7fdf084c9950" id="2475" addr="0x7fdf084c9950" />
                 </attributelist >
 
-                <namespace id="2476" addr="0x7ff9f1f9e350" >
-                    <attributelist id="2477" addr="0x7ff9f1f9e350" >
-                        <attribute name="feature_knownbasetypes" value="AddonClass,IPlayerCallback,AddonCallback" id="2478" addr="0x7ff9f1fba9d0" />
-                        <attribute name="name" value="xbmc" id="2479" addr="0x7ff9f1fba9d0" />
-                        <attribute name="sym_symtab" value="0x7ff9f1f89bb0" id="2480" addr="0x7ff9f1f89bb0" />
-                        <attribute name="symtab" value="0x7ff9f1f8a2b0" id="2481" addr="0x7ff9f1f8a2b0" />
-                        <attribute name="sym_nextSibling" value="0x7ff9f1fa04d0" id="2482" addr="0x7ff9f1fa04d0" />
-                        <attribute name="csym_nextSibling" value="0x7ff9f1fa04d0" id="2483" addr="0x7ff9f1fa04d0" />
-                        <attribute name="sym_previousSibling" value="0x7ff9f1f94a30" id="2484" addr="0x7ff9f1f94a30" />
-                        <attribute name="feature_knownapitypes" value="XBMCAddon::xbmcgui::ListItem,XBMCAddon::xbmc::PlayListItem" id="2485" addr="0x7ff9f1fba9d0" />
-                        <attribute name="sym_name" value="xbmc" id="2486" addr="0x7ff9f1fba9d0" />
-                        <typescope id="2487" addr="0x7ff9f1fb4d70" >
-                            <attributelist id="2488" addr="0x7ff9f1fb4d70" >
-                                <attribute name="name" value="xbmc" id="2489" addr="0x7ff9f1fba9d0" />
-                                <typetab id="2490" addr="0x7ff9f1fb4d90" >
-                                    <attributelist id="2491" addr="0x7ff9f1fb4d90" >
-                                        <attribute name="Monitor" value="Monitor" id="2492" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="2493" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="Keyboard" value="Keyboard" id="2494" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="2495" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="InfoTagVideo" value="InfoTagVideo" id="2496" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="Player" value="Player" id="2497" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="InfoTagMusic" value="InfoTagMusic" id="2498" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="PlayList" value="PlayList" id="2499" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="RenderCapture" value="RenderCapture" id="2500" addr="0x7ff9f1fba9d0" />
+                <namespace id="2476" addr="0x7fdf084f5350" >
+                    <attributelist id="2477" addr="0x7fdf084f5350" >
+                        <attribute name="feature_knownbasetypes" value="AddonClass,IPlayerCallback,AddonCallback" id="2478" addr="0x7fdf085119d0" />
+                        <attribute name="name" value="xbmc" id="2479" addr="0x7fdf085119d0" />
+                        <attribute name="sym_symtab" value="0x7fdf084e0bb0" id="2480" addr="0x7fdf084e0bb0" />
+                        <attribute name="symtab" value="0x7fdf084e12b0" id="2481" addr="0x7fdf084e12b0" />
+                        <attribute name="sym_nextSibling" value="0x7fdf084f74d0" id="2482" addr="0x7fdf084f74d0" />
+                        <attribute name="csym_nextSibling" value="0x7fdf084f74d0" id="2483" addr="0x7fdf084f74d0" />
+                        <attribute name="sym_previousSibling" value="0x7fdf084eba30" id="2484" addr="0x7fdf084eba30" />
+                        <attribute name="feature_knownapitypes" value="XBMCAddon::xbmcgui::ListItem,XBMCAddon::xbmc::PlayListItem" id="2485" addr="0x7fdf085119d0" />
+                        <attribute name="sym_name" value="xbmc" id="2486" addr="0x7fdf085119d0" />
+                        <typescope id="2487" addr="0x7fdf0850bd70" >
+                            <attributelist id="2488" addr="0x7fdf0850bd70" >
+                                <attribute name="name" value="xbmc" id="2489" addr="0x7fdf085119d0" />
+                                <typetab id="2490" addr="0x7fdf0850bd90" >
+                                    <attributelist id="2491" addr="0x7fdf0850bd90" >
+                                        <attribute name="Monitor" value="Monitor" id="2492" addr="0x7fdf085119d0" />
+                                        <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="2493" addr="0x7fdf085119d0" />
+                                        <attribute name="Keyboard" value="Keyboard" id="2494" addr="0x7fdf085119d0" />
+                                        <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="2495" addr="0x7fdf085119d0" />
+                                        <attribute name="InfoTagVideo" value="InfoTagVideo" id="2496" addr="0x7fdf085119d0" />
+                                        <attribute name="Player" value="Player" id="2497" addr="0x7fdf085119d0" />
+                                        <attribute name="InfoTagMusic" value="InfoTagMusic" id="2498" addr="0x7fdf085119d0" />
+                                        <attribute name="PlayList" value="PlayList" id="2499" addr="0x7fdf085119d0" />
+                                        <attribute name="RenderCapture" value="RenderCapture" id="2500" addr="0x7fdf085119d0" />
                                     </attributelist >
-                                    <typetabsitem id="2501" addr="0x7ff9f1fb9b10" >
-                                        <attributelist id="2502" addr="0x7ff9f1fb9b10" >
+                                    <typetabsitem id="2501" addr="0x7fdf08510b10" >
+                                        <attributelist id="2502" addr="0x7fdf08510b10" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2503" addr="0x7ff9f1fb7f30" >
-                                        <attributelist id="2504" addr="0x7ff9f1fb7f30" >
+                                    <typetabsitem id="2503" addr="0x7fdf0850ef30" >
+                                        <attributelist id="2504" addr="0x7fdf0850ef30" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2505" addr="0x7ff9f1fb8990" >
-                                        <attributelist id="2506" addr="0x7ff9f1fb8990" >
+                                    <typetabsitem id="2505" addr="0x7fdf0850f990" >
+                                        <attributelist id="2506" addr="0x7fdf0850f990" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2507" addr="0x7ff9f1fb5e90" >
-                                        <attributelist id="2508" addr="0x7ff9f1fb5e90" >
+                                    <typetabsitem id="2507" addr="0x7fdf0850ce90" >
+                                        <attributelist id="2508" addr="0x7fdf0850ce90" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2509" addr="0x7ff9f1fb8310" >
-                                        <attributelist id="2510" addr="0x7ff9f1fb8310" >
+                                    <typetabsitem id="2509" addr="0x7fdf0850f310" >
+                                        <attributelist id="2510" addr="0x7fdf0850f310" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2511" addr="0x7ff9f1fb6050" >
-                                        <attributelist id="2512" addr="0x7ff9f1fb6050" >
+                                    <typetabsitem id="2511" addr="0x7fdf0850d050" >
+                                        <attributelist id="2512" addr="0x7fdf0850d050" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2513" addr="0x7ff9f1fb7b50" >
-                                        <attributelist id="2514" addr="0x7ff9f1fb7b50" >
+                                    <typetabsitem id="2513" addr="0x7fdf0850eb50" >
+                                        <attributelist id="2514" addr="0x7fdf0850eb50" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2515" addr="0x7ff9f1fb91b0" >
-                                        <attributelist id="2516" addr="0x7ff9f1fb91b0" >
+                                    <typetabsitem id="2515" addr="0x7fdf085101b0" >
+                                        <attributelist id="2516" addr="0x7fdf085101b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2517" addr="0x7ff9f1fb7490" >
-                                        <attributelist id="2518" addr="0x7ff9f1fb7490" >
+                                    <typetabsitem id="2517" addr="0x7fdf0850e490" >
+                                        <attributelist id="2518" addr="0x7fdf0850e490" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
-                                <attribute name="parent" value="0x7ff9f1fb4990" id="2519" addr="0x7ff9f1fb4990" />
-                                <attribute name="qname" value="XBMCAddon::xbmc" id="2520" addr="0x7ff9f1fba9d0" />
-                                <attribute name="symtab" value="0x7ff9f1f8a2b0" id="2521" addr="0x7ff9f1f8a2b0" />
+                                <attribute name="parent" value="0x7fdf0850b990" id="2519" addr="0x7fdf0850b990" />
+                                <attribute name="qname" value="XBMCAddon::xbmc" id="2520" addr="0x7fdf085119d0" />
+                                <attribute name="symtab" value="0x7fdf084e12b0" id="2521" addr="0x7fdf084e12b0" />
                             </attributelist >
-                            <typescopesitem id="2522" addr="0x7ff9f1f8a270" >
-                                <attributelist id="2523" addr="0x7ff9f1f8a270" >
+                            <typescopesitem id="2522" addr="0x7fdf084e1270" >
+                                <attributelist id="2523" addr="0x7fdf084e1270" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="2524" addr="0x7ff9f1fb4d90" >
-                                <attributelist id="2525" addr="0x7ff9f1fb4d90" >
-                                    <attribute name="Monitor" value="Monitor" id="2526" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="2527" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="Keyboard" value="Keyboard" id="2528" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="2529" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="InfoTagVideo" value="InfoTagVideo" id="2530" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="Player" value="Player" id="2531" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="InfoTagMusic" value="InfoTagMusic" id="2532" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="PlayList" value="PlayList" id="2533" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="RenderCapture" value="RenderCapture" id="2534" addr="0x7ff9f1fba9d0" />
+                            <typescopesitem id="2524" addr="0x7fdf0850bd90" >
+                                <attributelist id="2525" addr="0x7fdf0850bd90" >
+                                    <attribute name="Monitor" value="Monitor" id="2526" addr="0x7fdf085119d0" />
+                                    <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="2527" addr="0x7fdf085119d0" />
+                                    <attribute name="Keyboard" value="Keyboard" id="2528" addr="0x7fdf085119d0" />
+                                    <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="2529" addr="0x7fdf085119d0" />
+                                    <attribute name="InfoTagVideo" value="InfoTagVideo" id="2530" addr="0x7fdf085119d0" />
+                                    <attribute name="Player" value="Player" id="2531" addr="0x7fdf085119d0" />
+                                    <attribute name="InfoTagMusic" value="InfoTagMusic" id="2532" addr="0x7fdf085119d0" />
+                                    <attribute name="PlayList" value="PlayList" id="2533" addr="0x7fdf085119d0" />
+                                    <attribute name="RenderCapture" value="RenderCapture" id="2534" addr="0x7fdf085119d0" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="2535" addr="0x7ff9f1fb4990" >
-                                <attributelist id="2536" addr="0x7ff9f1fb4990" >
-                                    <attribute name="name" value="XBMCAddon" id="2537" addr="0x7ff9f1fba9d0" />
-                                    <typetab id="2538" addr="0x7ff9f1fb49d0" >
-                                        <attributelist id="2539" addr="0x7ff9f1fb49d0" >
-                                            <attribute name="String" value="std::string" id="2540" addr="0x7ff9f1fba9d0" />
-                                        </attributelist >
-                                        <typetabsitem id="2541" addr="0x7ff9f1fb4bb0" >
-                                            <attributelist id="2542" addr="0x7ff9f1fb4bb0" >
+                            <typescopesitem id="2535" addr="0x7fdf0850b990" >
+                                <attributelist id="2536" addr="0x7fdf0850b990" >
+                                    <attribute name="name" value="XBMCAddon" id="2537" addr="0x7fdf085119d0" />
+                                    <typetab id="2538" addr="0x7fdf0850b9d0" >
+                                        <attributelist id="2539" addr="0x7fdf0850b9d0" >
+                                            <attribute name="String" value="std::string" id="2540" addr="0x7fdf085119d0" />
+                                        </attributelist >
+                                        <typetabsitem id="2541" addr="0x7fdf0850bbb0" >
+                                            <attributelist id="2542" addr="0x7fdf0850bbb0" >
                                             </attributelist >
                                         </typetabsitem >
                                     </typetab >
-                                    <attribute name="parent" value="0x7ff9f1f72a30" id="2543" addr="0x7ff9f1f72a30" />
-                                    <attribute name="qname" value="XBMCAddon" id="2544" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="symtab" value="0x7ff9f1f89bb0" id="2545" addr="0x7ff9f1f89bb0" />
+                                    <attribute name="parent" value="0x7fdf084c9a30" id="2543" addr="0x7fdf084c9a30" />
+                                    <attribute name="qname" value="XBMCAddon" id="2544" addr="0x7fdf085119d0" />
+                                    <attribute name="symtab" value="0x7fdf084e0bb0" id="2545" addr="0x7fdf084e0bb0" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="2546" addr="0x7ff9f1fb4db0" >
-                                <attributelist id="2547" addr="0x7ff9f1fb4db0" >
+                            <typescopesitem id="2546" addr="0x7fdf0850bdb0" >
+                                <attributelist id="2547" addr="0x7fdf0850bdb0" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="2548" addr="0x7ff9f1f8a2b0" >
-                                <attributelist id="2549" addr="0x7ff9f1f8a2b0" >
-                                    <attribute name="name" value="xbmc" id="2550" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="csymtab" value="0x7ff9f1f8a2f0" id="2551" addr="0x7ff9f1f8a2f0" />
-                                    <attribute name="symtab" value="0x7ff9f1f8a290" id="2552" addr="0x7ff9f1f8a290" />
+                            <typescopesitem id="2548" addr="0x7fdf084e12b0" >
+                                <attributelist id="2549" addr="0x7fdf084e12b0" >
+                                    <attribute name="name" value="xbmc" id="2550" addr="0x7fdf085119d0" />
+                                    <attribute name="csymtab" value="0x7fdf084e12f0" id="2551" addr="0x7fdf084e12f0" />
+                                    <attribute name="symtab" value="0x7fdf084e1290" id="2552" addr="0x7fdf084e1290" />
                                 </attributelist >
                             </typescopesitem >
                         </typescope >
                     </attributelist >
 
-                    <cdecl id="2553" addr="0x7ff9f1f9e4b0" >
-                        <attributelist id="2554" addr="0x7ff9f1f9e4b0" >
-                            <attribute name="sym_name" value="RenderCaptureException" id="2555" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="XBMCAddon::xbmc::RenderCaptureException" id="2556" addr="0x7ff9f1fba9d0" />
-                            <attribute name="kind" value="variable" id="2557" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="XBMCCOMMONS_STANDARD_EXCEPTION" id="2558" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="2559" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="2560" addr="0x7ff9f1fba9d0" />
+                    <cdecl id="2553" addr="0x7fdf084f54b0" >
+                        <attributelist id="2554" addr="0x7fdf084f54b0" >
+                            <attribute name="sym_name" value="RenderCaptureException" id="2555" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="XBMCAddon::xbmc::RenderCaptureException" id="2556" addr="0x7fdf085119d0" />
+                            <attribute name="kind" value="variable" id="2557" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="XBMCCOMMONS_STANDARD_EXCEPTION" id="2558" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="2559" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="2560" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <class id="2561" addr="0x7ff9f1f9e690" >
-                        <attributelist id="2562" addr="0x7ff9f1f9e690" >
-                            <attribute name="name" value="XBMCAddon::xbmc::RenderCapture" id="2563" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="2564" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="symtab" value="0x7ff9f1f9e7d0" id="2565" addr="0x7ff9f1f9e7d0" />
-                            <attribute name="allows_typedef" value="1" id="2566" addr="0x7ff9f1fba9d0" />
-                            <attribute name="typepass_visit" value="1" id="2567" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_visit" value="1" id="2568" addr="0x7ff9f1fba9d0" />
-                            <attribute name="kind" value="class" id="2569" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_name" value="RenderCapture" id="2570" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_default_constructor" value="1" id="2571" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_has_constructor" value="1" id="2572" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_public_constructor" value="1" id="2573" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_has_destructor" value="1" id="2574" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_default_destructor" value="1" id="2575" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_copy_constructor" value="1" id="2576" addr="0x7ff9f1fba9d0" />
-                            <attribute name="privatebaselist" value="0x7ff9f1f9e670" id="2577" addr="0x7ff9f1f9e670" />
-                            <attribute name="protectedbaselist" value="0x7ff9f1f9e650" id="2578" addr="0x7ff9f1f9e650" />
-                            <baselist id="2579" addr="0x7ff9f1f9e630" >
-                                <base name="AddonClass" id="2580" addr="0x7ff9f1f9e5b0" />
+                    <class id="2561" addr="0x7fdf084f5690" >
+                        <attributelist id="2562" addr="0x7fdf084f5690" >
+                            <attribute name="name" value="XBMCAddon::xbmc::RenderCapture" id="2563" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="2564" addr="0x7fdf084e12b0" />
+                            <attribute name="symtab" value="0x7fdf084f57d0" id="2565" addr="0x7fdf084f57d0" />
+                            <attribute name="allows_typedef" value="1" id="2566" addr="0x7fdf085119d0" />
+                            <attribute name="typepass_visit" value="1" id="2567" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_visit" value="1" id="2568" addr="0x7fdf085119d0" />
+                            <attribute name="kind" value="class" id="2569" addr="0x7fdf085119d0" />
+                            <attribute name="sym_name" value="RenderCapture" id="2570" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_default_constructor" value="1" id="2571" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_has_constructor" value="1" id="2572" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_public_constructor" value="1" id="2573" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_has_destructor" value="1" id="2574" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_default_destructor" value="1" id="2575" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_copy_constructor" value="1" id="2576" addr="0x7fdf085119d0" />
+                            <attribute name="privatebaselist" value="0x7fdf084f5670" id="2577" addr="0x7fdf084f5670" />
+                            <attribute name="protectedbaselist" value="0x7fdf084f5650" id="2578" addr="0x7fdf084f5650" />
+                            <baselist id="2579" addr="0x7fdf084f5630" >
+                                <base name="AddonClass" id="2580" addr="0x7fdf084f55b0" />
                             </baselist >
-                            <attribute name="module" value="xbmc" id="2581" addr="0x7ff9f1f89430" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="2582" addr="0x7ff9f1fba9d0" />
-                            <typescope id="2583" addr="0x7ff9f1fb7550" >
-                                <attributelist id="2584" addr="0x7ff9f1fb7550" >
-                                    <attribute name="name" value="RenderCapture" id="2585" addr="0x7ff9f1fba9d0" />
-                                    <typetab id="2586" addr="0x7ff9f1fb7570" >
-                                        <attributelist id="2587" addr="0x7ff9f1fb7570" >
+                            <attribute name="module" value="xbmc" id="2581" addr="0x7fdf084e0430" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="2582" addr="0x7fdf085119d0" />
+                            <typescope id="2583" addr="0x7fdf0850e550" >
+                                <attributelist id="2584" addr="0x7fdf0850e550" >
+                                    <attribute name="name" value="RenderCapture" id="2585" addr="0x7fdf085119d0" />
+                                    <typetab id="2586" addr="0x7fdf0850e570" >
+                                        <attributelist id="2587" addr="0x7fdf0850e570" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7ff9f1fb4d70" id="2588" addr="0x7ff9f1fb4d70" />
-                                    <attribute name="qname" value="XBMCAddon::xbmc::RenderCapture" id="2589" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="symtab" value="0x7ff9f1f9e7d0" id="2590" addr="0x7ff9f1f9e7d0" />
+                                    <attribute name="parent" value="0x7fdf0850bd70" id="2588" addr="0x7fdf0850bd70" />
+                                    <attribute name="qname" value="XBMCAddon::xbmc::RenderCapture" id="2589" addr="0x7fdf085119d0" />
+                                    <attribute name="symtab" value="0x7fdf084f57d0" id="2590" addr="0x7fdf084f57d0" />
                                 </attributelist >
-                                <typescopesitem id="2591" addr="0x7ff9f1fb74f0" >
-                                    <attributelist id="2592" addr="0x7ff9f1fb74f0" >
+                                <typescopesitem id="2591" addr="0x7fdf0850e4f0" >
+                                    <attributelist id="2592" addr="0x7fdf0850e4f0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="2593" addr="0x7ff9f1fb7570" >
-                                    <attributelist id="2594" addr="0x7ff9f1fb7570" >
+                                <typescopesitem id="2593" addr="0x7fdf0850e570" >
+                                    <attributelist id="2594" addr="0x7fdf0850e570" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="2595" addr="0x7ff9f1fb4d70" >
-                                    <attributelist id="2596" addr="0x7ff9f1fb4d70" >
-                                        <attribute name="name" value="xbmc" id="2597" addr="0x7ff9f1fba9d0" />
-                                        <typetab id="2598" addr="0x7ff9f1fb4d90" >
-                                            <attributelist id="2599" addr="0x7ff9f1fb4d90" >
-                                                <attribute name="Monitor" value="Monitor" id="2600" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="2601" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="Keyboard" value="Keyboard" id="2602" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="2603" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="InfoTagVideo" value="InfoTagVideo" id="2604" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="Player" value="Player" id="2605" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="InfoTagMusic" value="InfoTagMusic" id="2606" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="PlayList" value="PlayList" id="2607" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="RenderCapture" value="RenderCapture" id="2608" addr="0x7ff9f1fba9d0" />
+                                <typescopesitem id="2595" addr="0x7fdf0850bd70" >
+                                    <attributelist id="2596" addr="0x7fdf0850bd70" >
+                                        <attribute name="name" value="xbmc" id="2597" addr="0x7fdf085119d0" />
+                                        <typetab id="2598" addr="0x7fdf0850bd90" >
+                                            <attributelist id="2599" addr="0x7fdf0850bd90" >
+                                                <attribute name="Monitor" value="Monitor" id="2600" addr="0x7fdf085119d0" />
+                                                <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="2601" addr="0x7fdf085119d0" />
+                                                <attribute name="Keyboard" value="Keyboard" id="2602" addr="0x7fdf085119d0" />
+                                                <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="2603" addr="0x7fdf085119d0" />
+                                                <attribute name="InfoTagVideo" value="InfoTagVideo" id="2604" addr="0x7fdf085119d0" />
+                                                <attribute name="Player" value="Player" id="2605" addr="0x7fdf085119d0" />
+                                                <attribute name="InfoTagMusic" value="InfoTagMusic" id="2606" addr="0x7fdf085119d0" />
+                                                <attribute name="PlayList" value="PlayList" id="2607" addr="0x7fdf085119d0" />
+                                                <attribute name="RenderCapture" value="RenderCapture" id="2608" addr="0x7fdf085119d0" />
                                             </attributelist >
-                                            <typetabsitem id="2609" addr="0x7ff9f1fb9b10" >
-                                                <attributelist id="2610" addr="0x7ff9f1fb9b10" >
+                                            <typetabsitem id="2609" addr="0x7fdf08510b10" >
+                                                <attributelist id="2610" addr="0x7fdf08510b10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2611" addr="0x7ff9f1fb7f30" >
-                                                <attributelist id="2612" addr="0x7ff9f1fb7f30" >
+                                            <typetabsitem id="2611" addr="0x7fdf0850ef30" >
+                                                <attributelist id="2612" addr="0x7fdf0850ef30" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2613" addr="0x7ff9f1fb8990" >
-                                                <attributelist id="2614" addr="0x7ff9f1fb8990" >
+                                            <typetabsitem id="2613" addr="0x7fdf0850f990" >
+                                                <attributelist id="2614" addr="0x7fdf0850f990" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2615" addr="0x7ff9f1fb5e90" >
-                                                <attributelist id="2616" addr="0x7ff9f1fb5e90" >
+                                            <typetabsitem id="2615" addr="0x7fdf0850ce90" >
+                                                <attributelist id="2616" addr="0x7fdf0850ce90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2617" addr="0x7ff9f1fb8310" >
-                                                <attributelist id="2618" addr="0x7ff9f1fb8310" >
+                                            <typetabsitem id="2617" addr="0x7fdf0850f310" >
+                                                <attributelist id="2618" addr="0x7fdf0850f310" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2619" addr="0x7ff9f1fb6050" >
-                                                <attributelist id="2620" addr="0x7ff9f1fb6050" >
+                                            <typetabsitem id="2619" addr="0x7fdf0850d050" >
+                                                <attributelist id="2620" addr="0x7fdf0850d050" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2621" addr="0x7ff9f1fb7b50" >
-                                                <attributelist id="2622" addr="0x7ff9f1fb7b50" >
+                                            <typetabsitem id="2621" addr="0x7fdf0850eb50" >
+                                                <attributelist id="2622" addr="0x7fdf0850eb50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2623" addr="0x7ff9f1fb91b0" >
-                                                <attributelist id="2624" addr="0x7ff9f1fb91b0" >
+                                            <typetabsitem id="2623" addr="0x7fdf085101b0" >
+                                                <attributelist id="2624" addr="0x7fdf085101b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2625" addr="0x7ff9f1fb7490" >
-                                                <attributelist id="2626" addr="0x7ff9f1fb7490" >
+                                            <typetabsitem id="2625" addr="0x7fdf0850e490" >
+                                                <attributelist id="2626" addr="0x7fdf0850e490" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7ff9f1fb4990" id="2627" addr="0x7ff9f1fb4990" />
-                                        <attribute name="qname" value="XBMCAddon::xbmc" id="2628" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="symtab" value="0x7ff9f1f8a2b0" id="2629" addr="0x7ff9f1f8a2b0" />
+                                        <attribute name="parent" value="0x7fdf0850b990" id="2627" addr="0x7fdf0850b990" />
+                                        <attribute name="qname" value="XBMCAddon::xbmc" id="2628" addr="0x7fdf085119d0" />
+                                        <attribute name="symtab" value="0x7fdf084e12b0" id="2629" addr="0x7fdf084e12b0" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="2630" addr="0x7ff9f1fb7590" >
-                                    <attributelist id="2631" addr="0x7ff9f1fb7590" >
+                                <typescopesitem id="2630" addr="0x7fdf0850e590" >
+                                    <attributelist id="2631" addr="0x7fdf0850e590" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="2632" addr="0x7ff9f1f9e7d0" >
-                                    <attributelist id="2633" addr="0x7ff9f1f9e7d0" >
-                                        <attribute name="name" value="RenderCapture" id="2634" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="csymtab" value="0x7ff9f1f9e7f0" id="2635" addr="0x7ff9f1f9e7f0" />
-                                        <attribute name="symtab" value="0x7ff9f1f9e790" id="2636" addr="0x7ff9f1f9e790" />
+                                <typescopesitem id="2632" addr="0x7fdf084f57d0" >
+                                    <attributelist id="2633" addr="0x7fdf084f57d0" >
+                                        <attribute name="name" value="RenderCapture" id="2634" addr="0x7fdf085119d0" />
+                                        <attribute name="csymtab" value="0x7fdf084f57f0" id="2635" addr="0x7fdf084f57f0" />
+                                        <attribute name="symtab" value="0x7fdf084f5790" id="2636" addr="0x7fdf084f5790" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <cdecl id="2637" addr="0x7ff9f1f9e8f0" >
-                            <attributelist id="2638" addr="0x7ff9f1f9e8f0" >
-                                <attribute name="ismember" value="1" id="2639" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="m_captureId" id="2640" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="" id="2641" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="private" id="2642" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="variable" id="2643" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="unsigned int" id="2644" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f9e7d0" id="2645" addr="0x7ff9f1f9e7d0" />
+                        <cdecl id="2637" addr="0x7fdf084f58f0" >
+                            <attributelist id="2638" addr="0x7fdf084f58f0" >
+                                <attribute name="ismember" value="1" id="2639" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="m_captureId" id="2640" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="" id="2641" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="private" id="2642" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="variable" id="2643" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="unsigned int" id="2644" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084f57d0" id="2645" addr="0x7fdf084f57d0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="2646" addr="0x7ff9f1f9ead0" >
-                            <attributelist id="2647" addr="0x7ff9f1f9ead0" >
-                                <attribute name="ismember" value="1" id="2648" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="m_width" id="2649" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="" id="2650" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="private" id="2651" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="variable" id="2652" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="unsigned int" id="2653" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f9e7d0" id="2654" addr="0x7ff9f1f9e7d0" />
+                        <cdecl id="2646" addr="0x7fdf084f5ad0" >
+                            <attributelist id="2647" addr="0x7fdf084f5ad0" >
+                                <attribute name="ismember" value="1" id="2648" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="m_width" id="2649" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="" id="2650" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="private" id="2651" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="variable" id="2652" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="unsigned int" id="2653" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084f57d0" id="2654" addr="0x7fdf084f57d0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="2655" addr="0x7ff9f1f9ec70" >
-                            <attributelist id="2656" addr="0x7ff9f1f9ec70" >
-                                <attribute name="ismember" value="1" id="2657" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="m_height" id="2658" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="" id="2659" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="private" id="2660" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="variable" id="2661" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="unsigned int" id="2662" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f9e7d0" id="2663" addr="0x7ff9f1f9e7d0" />
+                        <cdecl id="2655" addr="0x7fdf084f5c70" >
+                            <attributelist id="2656" addr="0x7fdf084f5c70" >
+                                <attribute name="ismember" value="1" id="2657" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="m_height" id="2658" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="" id="2659" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="private" id="2660" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="variable" id="2661" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="unsigned int" id="2662" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084f57d0" id="2663" addr="0x7fdf084f57d0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="2664" addr="0x7ff9f1f9edf0" >
-                            <attributelist id="2665" addr="0x7ff9f1f9edf0" >
-                                <attribute name="ismember" value="1" id="2666" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="m_buffer" id="2667" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="p." id="2668" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="private" id="2669" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="variable" id="2670" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="uint8_t" id="2671" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f9e7d0" id="2672" addr="0x7ff9f1f9e7d0" />
+                        <cdecl id="2664" addr="0x7fdf084f5df0" >
+                            <attributelist id="2665" addr="0x7fdf084f5df0" >
+                                <attribute name="ismember" value="1" id="2666" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="m_buffer" id="2667" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="p." id="2668" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="private" id="2669" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="variable" id="2670" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="uint8_t" id="2671" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084f57d0" id="2672" addr="0x7fdf084f57d0" />
                             </attributelist >
                          
                         </cdecl >
-                        <access id="2673" addr="0x7ff9f1f9eed0" >
-                            <attributelist id="2674" addr="0x7ff9f1f9eed0" >
-                                <attribute name="kind" value="public" id="2675" addr="0x7ff9f1fba9d0" />
+                        <access id="2673" addr="0x7fdf084f5ed0" >
+                            <attributelist id="2674" addr="0x7fdf084f5ed0" >
+                                <attribute name="kind" value="public" id="2675" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="2676" addr="0x7ff9f1f9efd0" >
-                            <attributelist id="2677" addr="0x7ff9f1f9efd0" >
-                                <attribute name="ismember" value="1" id="2678" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="RenderCapture" id="2679" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="RenderCapture" id="2680" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="2681" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2682" addr="0x7ff9f1fba9d0" />
-                                <attribute name="feature_new" value="1" id="2683" addr="0x7ff9f1fba9d0" />
-                                <attribute name="code" value="{&#10;        m_captureId = UINT_MAX;&#10;        m_buffer = nullptr;&#10;        m_width = 0;&#10;        m_height = 0;&#10;      }" id="2684" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f9e7d0" id="2685" addr="0x7ff9f1f9e7d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2686" addr="0x7ff9f1fba9d0" />
+                        <constructor id="2676" addr="0x7fdf084f5fd0" >
+                            <attributelist id="2677" addr="0x7fdf084f5fd0" >
+                                <attribute name="ismember" value="1" id="2678" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="RenderCapture" id="2679" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="RenderCapture" id="2680" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="2681" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2682" addr="0x7fdf085119d0" />
+                                <attribute name="feature_new" value="1" id="2683" addr="0x7fdf085119d0" />
+                                <attribute name="code" value="{&#10;        m_captureId = UINT_MAX;&#10;        m_buffer = nullptr;&#10;        m_width = 0;&#10;        m_height = 0;&#10;      }" id="2684" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084f57d0" id="2685" addr="0x7fdf084f57d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2686" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </constructor >
-                        <destructor id="2687" addr="0x7ff9f1f9f130" >
-                            <attributelist id="2688" addr="0x7ff9f1f9f130" >
-                                <attribute name="ismember" value="1" id="2689" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="~RenderCapture" id="2690" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="~RenderCapture" id="2691" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="2692" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2693" addr="0x7ff9f1fba9d0" />
-                                <attribute name="code" value="{&#10;        g_application.GetAppPlayer().RenderCaptureRelease(m_captureId);&#10;        delete [] m_buffer;&#10;      }" id="2694" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f9e7d0" id="2695" addr="0x7ff9f1f9e7d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2696" addr="0x7ff9f1fba9d0" />
+                        <destructor id="2687" addr="0x7fdf084f6130" >
+                            <attributelist id="2688" addr="0x7fdf084f6130" >
+                                <attribute name="ismember" value="1" id="2689" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="~RenderCapture" id="2690" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="~RenderCapture" id="2691" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="2692" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2693" addr="0x7fdf085119d0" />
+                                <attribute name="code" value="{&#10;        g_application.GetAppPlayer().RenderCaptureRelease(m_captureId);&#10;        delete [] m_buffer;&#10;      }" id="2694" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084f57d0" id="2695" addr="0x7fdf084f57d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2696" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </destructor >
-                        <cdecl id="2697" addr="0x7ff9f1f9f2f0" >
-                            <attributelist id="2698" addr="0x7ff9f1f9f2f0" >
-                                <attribute name="name" value="getWidth" id="2699" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="2700" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f9e7d0" id="2701" addr="0x7ff9f1f9e7d0" />
-                                <attribute name="kind" value="function" id="2702" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getWidth" id="2703" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="2704" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2705" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="int" id="2706" addr="0x7ff9f1fba9d0" />
-                                <attribute name="code" value="{ return m_width; }" id="2707" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2708" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="2709" addr="0x7ff9f1f9f4d0" >
-                            <attributelist id="2710" addr="0x7ff9f1f9f4d0" >
-                                <attribute name="name" value="getHeight" id="2711" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="2712" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f9e7d0" id="2713" addr="0x7ff9f1f9e7d0" />
-                                <attribute name="kind" value="function" id="2714" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getHeight" id="2715" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="2716" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2717" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="int" id="2718" addr="0x7ff9f1fba9d0" />
-                                <attribute name="code" value="{ return m_height; }" id="2719" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2720" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="2721" addr="0x7ff9f1f9f6b0" >
-                            <attributelist id="2722" addr="0x7ff9f1f9f6b0" >
-                                <attribute name="name" value="getAspectRatio" id="2723" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="2724" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f9e7d0" id="2725" addr="0x7ff9f1f9e7d0" />
-                                <attribute name="kind" value="function" id="2726" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getAspectRatio" id="2727" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="2728" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2729" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="float" id="2730" addr="0x7ff9f1fba9d0" />
-                                <attribute name="code" value="{ return g_application.GetAppPlayer().GetRenderAspectRatio(); }" id="2731" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2732" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="2733" addr="0x7ff9f1f9f8b0" >
-                            <attributelist id="2734" addr="0x7ff9f1f9f8b0" >
-                                <attribute name="name" value="getImageFormat" id="2735" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="2736" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f9e7d0" id="2737" addr="0x7ff9f1f9e7d0" />
-                                <attribute name="kind" value="function" id="2738" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getImageFormat" id="2739" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f().p." id="2740" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2741" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="q(const).char" id="2742" addr="0x7ff9f1fba9d0" />
-                                <attribute name="code" value="{&#10;        return &quot;BGRA&quot;;&#10;      }" id="2743" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2744" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="2745" addr="0x7ff9f1f9fc30" >
-                            <attributelist id="2746" addr="0x7ff9f1f9fc30" >
-                                <attribute name="name" value="getImage" id="2747" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="2748" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f9e7d0" id="2749" addr="0x7ff9f1f9e7d0" />
-                                <attribute name="sym_nextSibling" value="0x7ff9f1f9fd50" id="2750" addr="0x7ff9f1f9fd50" />
-                                <attribute name="csym_nextSibling" value="0x7ff9f1f9fd50" id="2751" addr="0x7ff9f1f9fd50" />
-                                <attribute name="kind" value="function" id="2752" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getImage" id="2753" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(unsigned int)." id="2754" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2755" addr="0x7ff9f1fba9d0" />
-                                <parmlist id="2756" addr="0x7ff9f1f9fb90" >
+                        <cdecl id="2697" addr="0x7fdf084f62f0" >
+                            <attributelist id="2698" addr="0x7fdf084f62f0" >
+                                <attribute name="name" value="getWidth" id="2699" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="2700" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084f57d0" id="2701" addr="0x7fdf084f57d0" />
+                                <attribute name="kind" value="function" id="2702" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getWidth" id="2703" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="2704" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2705" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="int" id="2706" addr="0x7fdf085119d0" />
+                                <attribute name="code" value="{ return m_width; }" id="2707" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2708" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="2709" addr="0x7fdf084f64d0" >
+                            <attributelist id="2710" addr="0x7fdf084f64d0" >
+                                <attribute name="name" value="getHeight" id="2711" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="2712" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084f57d0" id="2713" addr="0x7fdf084f57d0" />
+                                <attribute name="kind" value="function" id="2714" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getHeight" id="2715" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="2716" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2717" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="int" id="2718" addr="0x7fdf085119d0" />
+                                <attribute name="code" value="{ return m_height; }" id="2719" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2720" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="2721" addr="0x7fdf084f66b0" >
+                            <attributelist id="2722" addr="0x7fdf084f66b0" >
+                                <attribute name="name" value="getAspectRatio" id="2723" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="2724" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084f57d0" id="2725" addr="0x7fdf084f57d0" />
+                                <attribute name="kind" value="function" id="2726" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getAspectRatio" id="2727" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="2728" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2729" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="float" id="2730" addr="0x7fdf085119d0" />
+                                <attribute name="code" value="{ return g_application.GetAppPlayer().GetRenderAspectRatio(); }" id="2731" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2732" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="2733" addr="0x7fdf084f68b0" >
+                            <attributelist id="2734" addr="0x7fdf084f68b0" >
+                                <attribute name="name" value="getImageFormat" id="2735" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="2736" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084f57d0" id="2737" addr="0x7fdf084f57d0" />
+                                <attribute name="kind" value="function" id="2738" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getImageFormat" id="2739" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f().p." id="2740" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2741" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="q(const).char" id="2742" addr="0x7fdf085119d0" />
+                                <attribute name="code" value="{&#10;        return &quot;BGRA&quot;;&#10;      }" id="2743" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2744" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="2745" addr="0x7fdf084f6c30" >
+                            <attributelist id="2746" addr="0x7fdf084f6c30" >
+                                <attribute name="name" value="getImage" id="2747" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="2748" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084f57d0" id="2749" addr="0x7fdf084f57d0" />
+                                <attribute name="sym_nextSibling" value="0x7fdf084f6d50" id="2750" addr="0x7fdf084f6d50" />
+                                <attribute name="csym_nextSibling" value="0x7fdf084f6d50" id="2751" addr="0x7fdf084f6d50" />
+                                <attribute name="kind" value="function" id="2752" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getImage" id="2753" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(unsigned int)." id="2754" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2755" addr="0x7fdf085119d0" />
+                                <parmlist id="2756" addr="0x7fdf084f6b90" >
                                     <parm id="2757">
-                                        <attributelist id="2758" addr="0x7ff9f1f9fb90" >
-                                            <attribute name="name" value="msecs" id="2759" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="0" id="2760" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="unsigned int" id="2761" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="2758" addr="0x7fdf084f6b90" >
+                                            <attribute name="name" value="msecs" id="2759" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="0" id="2760" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="unsigned int" id="2761" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overloaded" value="0x7ff9f1f9fc30" id="2762" addr="0x7ff9f1f9fc30" />
-                                <attribute name="type" value="XbmcCommons::Buffer" id="2763" addr="0x7ff9f1fba9d0" />
-                                <attribute name="code" value="{&#10;        if (!GetPixels(msecs))&#10;          return XbmcCommons::Buffer(0);&#10;&#10;        size_t size = m_width * m_height * 4;&#10;        return XbmcCommons::Buffer(m_buffer, size);&#10;      }" id="2764" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2765" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="2766" addr="0x7ff9f1f9fd50" >
-                            <attributelist id="2767" addr="0x7ff9f1f9fd50" >
-                                <attribute name="name" value="getImage" id="2768" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="2769" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f9e7d0" id="2770" addr="0x7ff9f1f9e7d0" />
-                                <attribute name="sym_previousSibling" value="0x7ff9f1f9fc30" id="2771" addr="0x7ff9f1f9fc30" />
-                                <attribute name="kind" value="function" id="2772" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getImage" id="2773" addr="0x7ff9f1fba9d0" />
-                                <attribute name="defaultargs" value="0x7ff9f1f9fc30" id="2774" addr="0x7ff9f1f9fc30" />
-                                <attribute name="decl" value="f()." id="2775" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2776" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overloaded" value="0x7ff9f1f9fc30" id="2777" addr="0x7ff9f1f9fc30" />
-                                <attribute name="type" value="XbmcCommons::Buffer" id="2778" addr="0x7ff9f1fba9d0" />
-                                <attribute name="code" value="{&#10;        if (!GetPixels(msecs))&#10;          return XbmcCommons::Buffer(0);&#10;&#10;        size_t size = m_width * m_height * 4;&#10;        return XbmcCommons::Buffer(m_buffer, size);&#10;      }" id="2779" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="2780" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="2781" addr="0x7ff9f1fa0170" >
-                            <attributelist id="2782" addr="0x7ff9f1fa0170" >
-                                <attribute name="name" value="capture" id="2783" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="2784" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f9e7d0" id="2785" addr="0x7ff9f1f9e7d0" />
-                                <attribute name="kind" value="function" id="2786" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="capture" id="2787" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(int,int)." id="2788" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2789" addr="0x7ff9f1fba9d0" />
-                                <parmlist id="2790" addr="0x7ff9f1f9ffb0" >
+                                <attribute name="sym_overloaded" value="0x7fdf084f6c30" id="2762" addr="0x7fdf084f6c30" />
+                                <attribute name="type" value="XbmcCommons::Buffer" id="2763" addr="0x7fdf085119d0" />
+                                <attribute name="code" value="{&#10;        if (!GetPixels(msecs))&#10;          return XbmcCommons::Buffer(0);&#10;&#10;        size_t size = m_width * m_height * 4;&#10;        return XbmcCommons::Buffer(m_buffer, size);&#10;      }" id="2764" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2765" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="2766" addr="0x7fdf084f6d50" >
+                            <attributelist id="2767" addr="0x7fdf084f6d50" >
+                                <attribute name="name" value="getImage" id="2768" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="2769" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084f57d0" id="2770" addr="0x7fdf084f57d0" />
+                                <attribute name="sym_previousSibling" value="0x7fdf084f6c30" id="2771" addr="0x7fdf084f6c30" />
+                                <attribute name="kind" value="function" id="2772" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getImage" id="2773" addr="0x7fdf085119d0" />
+                                <attribute name="defaultargs" value="0x7fdf084f6c30" id="2774" addr="0x7fdf084f6c30" />
+                                <attribute name="decl" value="f()." id="2775" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2776" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overloaded" value="0x7fdf084f6c30" id="2777" addr="0x7fdf084f6c30" />
+                                <attribute name="type" value="XbmcCommons::Buffer" id="2778" addr="0x7fdf085119d0" />
+                                <attribute name="code" value="{&#10;        if (!GetPixels(msecs))&#10;          return XbmcCommons::Buffer(0);&#10;&#10;        size_t size = m_width * m_height * 4;&#10;        return XbmcCommons::Buffer(m_buffer, size);&#10;      }" id="2779" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="2780" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="2781" addr="0x7fdf084f7170" >
+                            <attributelist id="2782" addr="0x7fdf084f7170" >
+                                <attribute name="name" value="capture" id="2783" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="2784" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084f57d0" id="2785" addr="0x7fdf084f57d0" />
+                                <attribute name="kind" value="function" id="2786" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="capture" id="2787" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(int,int)." id="2788" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2789" addr="0x7fdf085119d0" />
+                                <parmlist id="2790" addr="0x7fdf084f6fb0" >
                                     <parm id="2791">
-                                        <attributelist id="2792" addr="0x7ff9f1f9ffb0" >
-                                            <attribute name="name" value="width" id="2793" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="int" id="2794" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="2792" addr="0x7fdf084f6fb0" >
+                                            <attribute name="name" value="width" id="2793" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="int" id="2794" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                     <parm id="2795">
-                                        <attributelist id="2796" addr="0x7ff9f1fa00d0" >
-                                            <attribute name="name" value="height" id="2797" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="int" id="2798" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="2796" addr="0x7fdf084f70d0" >
+                                            <attribute name="name" value="height" id="2797" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="int" id="2798" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="2799" addr="0x7ff9f1fba9d0" />
-                                <attribute name="code" value="{&#10;        if (m_buffer)&#10;        {&#10;          g_application.GetAppPlayer().RenderCaptureRelease(m_captureId);&#10;          delete [] m_buffer;&#10;        }&#10;        m_captureId = g_application.GetAppPlayer().RenderCaptureAlloc();&#10;        m_width = width;&#10;        m_height = height;&#10;        m_buffer = new uint8_t[m_width*m_height*4];&#10;        g_application.GetAppPlayer().RenderCapture(m_captureId, m_width, m_height, CAPTUREFLAG_CONTINUOUS);&#10;      }" id="2800" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2801" addr="0x7ff9f1fba9d0" />
+                                <attribute name="type" value="void" id="2799" addr="0x7fdf085119d0" />
+                                <attribute name="code" value="{&#10;        if (m_buffer)&#10;        {&#10;          g_application.GetAppPlayer().RenderCaptureRelease(m_captureId);&#10;          delete [] m_buffer;&#10;        }&#10;        m_captureId = g_application.GetAppPlayer().RenderCaptureAlloc();&#10;        m_width = width;&#10;        m_height = height;&#10;        m_buffer = new uint8_t[m_width*m_height*4];&#10;        g_application.GetAppPlayer().RenderCapture(m_captureId, m_width, m_height, CAPTUREFLAG_CONTINUOUS);&#10;      }" id="2800" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2801" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </cdecl >
@@ -3967,613 +3967,613 @@
                 </namespace >
             </namespace >
         </include >
-        <include id="2802" addr="0x7ff9f1fa03b0" >
-            <attributelist id="2803" addr="0x7ff9f1fa03b0" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/InfoTagMusic.h" id="2804" addr="0x7ff9f1fba9d0" />
+        <include id="2802" addr="0x7fdf084f73b0" >
+            <attributelist id="2803" addr="0x7fdf084f73b0" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/InfoTagMusic.h" id="2804" addr="0x7fdf085119d0" />
             </attributelist >
 
-            <namespace id="2805" addr="0x7ff9f1fa0450" >
-                <attributelist id="2806" addr="0x7ff9f1fa0450" >
-                    <attribute name="sym_name" value="XBMCAddon" id="2807" addr="0x7ff9f1fba9d0" />
-                    <attribute name="name" value="XBMCAddon" id="2808" addr="0x7ff9f1fba9d0" />
-                    <attribute name="sym_previousSibling" value="0x7ff9f1f9e2d0" id="2809" addr="0x7ff9f1f9e2d0" />
-                    <attribute name="csym_nextSibling" value="0x7ff9f1fa32b0" id="2810" addr="0x7ff9f1fa32b0" />
-                    <attribute name="sym_nextSibling" value="0x7ff9f1fa32b0" id="2811" addr="0x7ff9f1fa32b0" />
-                    <typescope id="2812" addr="0x7ff9f1fb4990" >
-                        <attributelist id="2813" addr="0x7ff9f1fb4990" >
-                            <attribute name="name" value="XBMCAddon" id="2814" addr="0x7ff9f1fba9d0" />
-                            <typetab id="2815" addr="0x7ff9f1fb49d0" >
-                                <attributelist id="2816" addr="0x7ff9f1fb49d0" >
-                                    <attribute name="String" value="std::string" id="2817" addr="0x7ff9f1fba9d0" />
+            <namespace id="2805" addr="0x7fdf084f7450" >
+                <attributelist id="2806" addr="0x7fdf084f7450" >
+                    <attribute name="sym_name" value="XBMCAddon" id="2807" addr="0x7fdf085119d0" />
+                    <attribute name="name" value="XBMCAddon" id="2808" addr="0x7fdf085119d0" />
+                    <attribute name="sym_previousSibling" value="0x7fdf084f52d0" id="2809" addr="0x7fdf084f52d0" />
+                    <attribute name="csym_nextSibling" value="0x7fdf084fa2b0" id="2810" addr="0x7fdf084fa2b0" />
+                    <attribute name="sym_nextSibling" value="0x7fdf084fa2b0" id="2811" addr="0x7fdf084fa2b0" />
+                    <typescope id="2812" addr="0x7fdf0850b990" >
+                        <attributelist id="2813" addr="0x7fdf0850b990" >
+                            <attribute name="name" value="XBMCAddon" id="2814" addr="0x7fdf085119d0" />
+                            <typetab id="2815" addr="0x7fdf0850b9d0" >
+                                <attributelist id="2816" addr="0x7fdf0850b9d0" >
+                                    <attribute name="String" value="std::string" id="2817" addr="0x7fdf085119d0" />
                                 </attributelist >
-                                <typetabsitem id="2818" addr="0x7ff9f1fb4bb0" >
-                                    <attributelist id="2819" addr="0x7ff9f1fb4bb0" >
+                                <typetabsitem id="2818" addr="0x7fdf0850bbb0" >
+                                    <attributelist id="2819" addr="0x7fdf0850bbb0" >
                                     </attributelist >
                                 </typetabsitem >
                             </typetab >
-                            <attribute name="parent" value="0x7ff9f1f72a30" id="2820" addr="0x7ff9f1f72a30" />
-                            <attribute name="qname" value="XBMCAddon" id="2821" addr="0x7ff9f1fba9d0" />
-                            <attribute name="symtab" value="0x7ff9f1f89bb0" id="2822" addr="0x7ff9f1f89bb0" />
+                            <attribute name="parent" value="0x7fdf084c9a30" id="2820" addr="0x7fdf084c9a30" />
+                            <attribute name="qname" value="XBMCAddon" id="2821" addr="0x7fdf085119d0" />
+                            <attribute name="symtab" value="0x7fdf084e0bb0" id="2822" addr="0x7fdf084e0bb0" />
                         </attributelist >
-                        <typescopesitem id="2823" addr="0x7ff9f1f89b70" >
-                            <attributelist id="2824" addr="0x7ff9f1f89b70" >
+                        <typescopesitem id="2823" addr="0x7fdf084e0b70" >
+                            <attributelist id="2824" addr="0x7fdf084e0b70" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="2825" addr="0x7ff9f1fb49d0" >
-                            <attributelist id="2826" addr="0x7ff9f1fb49d0" >
-                                <attribute name="String" value="std::string" id="2827" addr="0x7ff9f1fba9d0" />
+                        <typescopesitem id="2825" addr="0x7fdf0850b9d0" >
+                            <attributelist id="2826" addr="0x7fdf0850b9d0" >
+                                <attribute name="String" value="std::string" id="2827" addr="0x7fdf085119d0" />
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="2828" addr="0x7ff9f1f72a30" >
-                            <attributelist id="2829" addr="0x7ff9f1f72a30" >
-                                <attribute name="name" value="" id="2830" addr="0x7ff9f1fba9d0" />
-                                <typetab id="2831" addr="0x7ff9f1f72a90" >
-                                    <attributelist id="2832" addr="0x7ff9f1f72a90" >
-                                        <attribute name="CGUIDialogKeyboardGeneric" value="CGUIDialogKeyboardGeneric" id="2833" addr="0x7ff9f1fba9d0" />
+                        <typescopesitem id="2828" addr="0x7fdf084c9a30" >
+                            <attributelist id="2829" addr="0x7fdf084c9a30" >
+                                <attribute name="name" value="" id="2830" addr="0x7fdf085119d0" />
+                                <typetab id="2831" addr="0x7fdf084c9a90" >
+                                    <attributelist id="2832" addr="0x7fdf084c9a90" >
+                                        <attribute name="CGUIDialogKeyboardGeneric" value="CGUIDialogKeyboardGeneric" id="2833" addr="0x7fdf085119d0" />
                                     </attributelist >
-                                    <typetabsitem id="2834" addr="0x7ff9f1fb7950" >
-                                        <attributelist id="2835" addr="0x7ff9f1fb7950" >
+                                    <typetabsitem id="2834" addr="0x7fdf0850e950" >
+                                        <attributelist id="2835" addr="0x7fdf0850e950" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="2836" addr="0x7ff9f1fb4ad0" >
-                            <attributelist id="2837" addr="0x7ff9f1fb4ad0" >
+                        <typescopesitem id="2836" addr="0x7fdf0850bad0" >
+                            <attributelist id="2837" addr="0x7fdf0850bad0" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="2838" addr="0x7ff9f1f89bb0" >
-                            <attributelist id="2839" addr="0x7ff9f1f89bb0" >
-                                <attribute name="name" value="XBMCAddon" id="2840" addr="0x7ff9f1fba9d0" />
-                                <attribute name="csymtab" value="0x7ff9f1f89bf0" id="2841" addr="0x7ff9f1f89bf0" />
-                                <attribute name="symtab" value="0x7ff9f1f89b90" id="2842" addr="0x7ff9f1f89b90" />
+                        <typescopesitem id="2838" addr="0x7fdf084e0bb0" >
+                            <attributelist id="2839" addr="0x7fdf084e0bb0" >
+                                <attribute name="name" value="XBMCAddon" id="2840" addr="0x7fdf085119d0" />
+                                <attribute name="csymtab" value="0x7fdf084e0bf0" id="2841" addr="0x7fdf084e0bf0" />
+                                <attribute name="symtab" value="0x7fdf084e0b90" id="2842" addr="0x7fdf084e0b90" />
                             </attributelist >
                         </typescopesitem >
                     </typescope >
-                    <attribute name="symtab" value="0x7ff9f1f89bb0" id="2843" addr="0x7ff9f1f89bb0" />
-                    <attribute name="sym_symtab" value="0x7ff9f1f72950" id="2844" addr="0x7ff9f1f72950" />
+                    <attribute name="symtab" value="0x7fdf084e0bb0" id="2843" addr="0x7fdf084e0bb0" />
+                    <attribute name="sym_symtab" value="0x7fdf084c9950" id="2844" addr="0x7fdf084c9950" />
                 </attributelist >
 
-                <namespace id="2845" addr="0x7ff9f1fa04d0" >
-                    <attributelist id="2846" addr="0x7ff9f1fa04d0" >
-                        <attribute name="feature_knownbasetypes" value="AddonClass,IPlayerCallback,AddonCallback" id="2847" addr="0x7ff9f1fba9d0" />
-                        <attribute name="name" value="xbmc" id="2848" addr="0x7ff9f1fba9d0" />
-                        <attribute name="sym_symtab" value="0x7ff9f1f89bb0" id="2849" addr="0x7ff9f1f89bb0" />
-                        <attribute name="symtab" value="0x7ff9f1f8a2b0" id="2850" addr="0x7ff9f1f8a2b0" />
-                        <attribute name="sym_nextSibling" value="0x7ff9f1fa3330" id="2851" addr="0x7ff9f1fa3330" />
-                        <attribute name="csym_nextSibling" value="0x7ff9f1fa3330" id="2852" addr="0x7ff9f1fa3330" />
-                        <attribute name="sym_previousSibling" value="0x7ff9f1f9e350" id="2853" addr="0x7ff9f1f9e350" />
-                        <attribute name="feature_knownapitypes" value="XBMCAddon::xbmcgui::ListItem,XBMCAddon::xbmc::PlayListItem" id="2854" addr="0x7ff9f1fba9d0" />
-                        <attribute name="sym_name" value="xbmc" id="2855" addr="0x7ff9f1fba9d0" />
-                        <typescope id="2856" addr="0x7ff9f1fb4d70" >
-                            <attributelist id="2857" addr="0x7ff9f1fb4d70" >
-                                <attribute name="name" value="xbmc" id="2858" addr="0x7ff9f1fba9d0" />
-                                <typetab id="2859" addr="0x7ff9f1fb4d90" >
-                                    <attributelist id="2860" addr="0x7ff9f1fb4d90" >
-                                        <attribute name="Monitor" value="Monitor" id="2861" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="2862" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="Keyboard" value="Keyboard" id="2863" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="2864" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="InfoTagVideo" value="InfoTagVideo" id="2865" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="Player" value="Player" id="2866" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="InfoTagMusic" value="InfoTagMusic" id="2867" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="PlayList" value="PlayList" id="2868" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="RenderCapture" value="RenderCapture" id="2869" addr="0x7ff9f1fba9d0" />
+                <namespace id="2845" addr="0x7fdf084f74d0" >
+                    <attributelist id="2846" addr="0x7fdf084f74d0" >
+                        <attribute name="feature_knownbasetypes" value="AddonClass,IPlayerCallback,AddonCallback" id="2847" addr="0x7fdf085119d0" />
+                        <attribute name="name" value="xbmc" id="2848" addr="0x7fdf085119d0" />
+                        <attribute name="sym_symtab" value="0x7fdf084e0bb0" id="2849" addr="0x7fdf084e0bb0" />
+                        <attribute name="symtab" value="0x7fdf084e12b0" id="2850" addr="0x7fdf084e12b0" />
+                        <attribute name="sym_nextSibling" value="0x7fdf084fa330" id="2851" addr="0x7fdf084fa330" />
+                        <attribute name="csym_nextSibling" value="0x7fdf084fa330" id="2852" addr="0x7fdf084fa330" />
+                        <attribute name="sym_previousSibling" value="0x7fdf084f5350" id="2853" addr="0x7fdf084f5350" />
+                        <attribute name="feature_knownapitypes" value="XBMCAddon::xbmcgui::ListItem,XBMCAddon::xbmc::PlayListItem" id="2854" addr="0x7fdf085119d0" />
+                        <attribute name="sym_name" value="xbmc" id="2855" addr="0x7fdf085119d0" />
+                        <typescope id="2856" addr="0x7fdf0850bd70" >
+                            <attributelist id="2857" addr="0x7fdf0850bd70" >
+                                <attribute name="name" value="xbmc" id="2858" addr="0x7fdf085119d0" />
+                                <typetab id="2859" addr="0x7fdf0850bd90" >
+                                    <attributelist id="2860" addr="0x7fdf0850bd90" >
+                                        <attribute name="Monitor" value="Monitor" id="2861" addr="0x7fdf085119d0" />
+                                        <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="2862" addr="0x7fdf085119d0" />
+                                        <attribute name="Keyboard" value="Keyboard" id="2863" addr="0x7fdf085119d0" />
+                                        <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="2864" addr="0x7fdf085119d0" />
+                                        <attribute name="InfoTagVideo" value="InfoTagVideo" id="2865" addr="0x7fdf085119d0" />
+                                        <attribute name="Player" value="Player" id="2866" addr="0x7fdf085119d0" />
+                                        <attribute name="InfoTagMusic" value="InfoTagMusic" id="2867" addr="0x7fdf085119d0" />
+                                        <attribute name="PlayList" value="PlayList" id="2868" addr="0x7fdf085119d0" />
+                                        <attribute name="RenderCapture" value="RenderCapture" id="2869" addr="0x7fdf085119d0" />
                                     </attributelist >
-                                    <typetabsitem id="2870" addr="0x7ff9f1fb9b10" >
-                                        <attributelist id="2871" addr="0x7ff9f1fb9b10" >
+                                    <typetabsitem id="2870" addr="0x7fdf08510b10" >
+                                        <attributelist id="2871" addr="0x7fdf08510b10" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2872" addr="0x7ff9f1fb7f30" >
-                                        <attributelist id="2873" addr="0x7ff9f1fb7f30" >
+                                    <typetabsitem id="2872" addr="0x7fdf0850ef30" >
+                                        <attributelist id="2873" addr="0x7fdf0850ef30" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2874" addr="0x7ff9f1fb8990" >
-                                        <attributelist id="2875" addr="0x7ff9f1fb8990" >
+                                    <typetabsitem id="2874" addr="0x7fdf0850f990" >
+                                        <attributelist id="2875" addr="0x7fdf0850f990" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2876" addr="0x7ff9f1fb5e90" >
-                                        <attributelist id="2877" addr="0x7ff9f1fb5e90" >
+                                    <typetabsitem id="2876" addr="0x7fdf0850ce90" >
+                                        <attributelist id="2877" addr="0x7fdf0850ce90" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2878" addr="0x7ff9f1fb8310" >
-                                        <attributelist id="2879" addr="0x7ff9f1fb8310" >
+                                    <typetabsitem id="2878" addr="0x7fdf0850f310" >
+                                        <attributelist id="2879" addr="0x7fdf0850f310" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2880" addr="0x7ff9f1fb6050" >
-                                        <attributelist id="2881" addr="0x7ff9f1fb6050" >
+                                    <typetabsitem id="2880" addr="0x7fdf0850d050" >
+                                        <attributelist id="2881" addr="0x7fdf0850d050" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2882" addr="0x7ff9f1fb7b50" >
-                                        <attributelist id="2883" addr="0x7ff9f1fb7b50" >
+                                    <typetabsitem id="2882" addr="0x7fdf0850eb50" >
+                                        <attributelist id="2883" addr="0x7fdf0850eb50" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2884" addr="0x7ff9f1fb91b0" >
-                                        <attributelist id="2885" addr="0x7ff9f1fb91b0" >
+                                    <typetabsitem id="2884" addr="0x7fdf085101b0" >
+                                        <attributelist id="2885" addr="0x7fdf085101b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2886" addr="0x7ff9f1fb7490" >
-                                        <attributelist id="2887" addr="0x7ff9f1fb7490" >
+                                    <typetabsitem id="2886" addr="0x7fdf0850e490" >
+                                        <attributelist id="2887" addr="0x7fdf0850e490" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
-                                <attribute name="parent" value="0x7ff9f1fb4990" id="2888" addr="0x7ff9f1fb4990" />
-                                <attribute name="qname" value="XBMCAddon::xbmc" id="2889" addr="0x7ff9f1fba9d0" />
-                                <attribute name="symtab" value="0x7ff9f1f8a2b0" id="2890" addr="0x7ff9f1f8a2b0" />
+                                <attribute name="parent" value="0x7fdf0850b990" id="2888" addr="0x7fdf0850b990" />
+                                <attribute name="qname" value="XBMCAddon::xbmc" id="2889" addr="0x7fdf085119d0" />
+                                <attribute name="symtab" value="0x7fdf084e12b0" id="2890" addr="0x7fdf084e12b0" />
                             </attributelist >
-                            <typescopesitem id="2891" addr="0x7ff9f1f8a270" >
-                                <attributelist id="2892" addr="0x7ff9f1f8a270" >
+                            <typescopesitem id="2891" addr="0x7fdf084e1270" >
+                                <attributelist id="2892" addr="0x7fdf084e1270" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="2893" addr="0x7ff9f1fb4d90" >
-                                <attributelist id="2894" addr="0x7ff9f1fb4d90" >
-                                    <attribute name="Monitor" value="Monitor" id="2895" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="2896" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="Keyboard" value="Keyboard" id="2897" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="2898" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="InfoTagVideo" value="InfoTagVideo" id="2899" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="Player" value="Player" id="2900" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="InfoTagMusic" value="InfoTagMusic" id="2901" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="PlayList" value="PlayList" id="2902" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="RenderCapture" value="RenderCapture" id="2903" addr="0x7ff9f1fba9d0" />
+                            <typescopesitem id="2893" addr="0x7fdf0850bd90" >
+                                <attributelist id="2894" addr="0x7fdf0850bd90" >
+                                    <attribute name="Monitor" value="Monitor" id="2895" addr="0x7fdf085119d0" />
+                                    <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="2896" addr="0x7fdf085119d0" />
+                                    <attribute name="Keyboard" value="Keyboard" id="2897" addr="0x7fdf085119d0" />
+                                    <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="2898" addr="0x7fdf085119d0" />
+                                    <attribute name="InfoTagVideo" value="InfoTagVideo" id="2899" addr="0x7fdf085119d0" />
+                                    <attribute name="Player" value="Player" id="2900" addr="0x7fdf085119d0" />
+                                    <attribute name="InfoTagMusic" value="InfoTagMusic" id="2901" addr="0x7fdf085119d0" />
+                                    <attribute name="PlayList" value="PlayList" id="2902" addr="0x7fdf085119d0" />
+                                    <attribute name="RenderCapture" value="RenderCapture" id="2903" addr="0x7fdf085119d0" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="2904" addr="0x7ff9f1fb4990" >
-                                <attributelist id="2905" addr="0x7ff9f1fb4990" >
-                                    <attribute name="name" value="XBMCAddon" id="2906" addr="0x7ff9f1fba9d0" />
-                                    <typetab id="2907" addr="0x7ff9f1fb49d0" >
-                                        <attributelist id="2908" addr="0x7ff9f1fb49d0" >
-                                            <attribute name="String" value="std::string" id="2909" addr="0x7ff9f1fba9d0" />
-                                        </attributelist >
-                                        <typetabsitem id="2910" addr="0x7ff9f1fb4bb0" >
-                                            <attributelist id="2911" addr="0x7ff9f1fb4bb0" >
+                            <typescopesitem id="2904" addr="0x7fdf0850b990" >
+                                <attributelist id="2905" addr="0x7fdf0850b990" >
+                                    <attribute name="name" value="XBMCAddon" id="2906" addr="0x7fdf085119d0" />
+                                    <typetab id="2907" addr="0x7fdf0850b9d0" >
+                                        <attributelist id="2908" addr="0x7fdf0850b9d0" >
+                                            <attribute name="String" value="std::string" id="2909" addr="0x7fdf085119d0" />
+                                        </attributelist >
+                                        <typetabsitem id="2910" addr="0x7fdf0850bbb0" >
+                                            <attributelist id="2911" addr="0x7fdf0850bbb0" >
                                             </attributelist >
                                         </typetabsitem >
                                     </typetab >
-                                    <attribute name="parent" value="0x7ff9f1f72a30" id="2912" addr="0x7ff9f1f72a30" />
-                                    <attribute name="qname" value="XBMCAddon" id="2913" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="symtab" value="0x7ff9f1f89bb0" id="2914" addr="0x7ff9f1f89bb0" />
+                                    <attribute name="parent" value="0x7fdf084c9a30" id="2912" addr="0x7fdf084c9a30" />
+                                    <attribute name="qname" value="XBMCAddon" id="2913" addr="0x7fdf085119d0" />
+                                    <attribute name="symtab" value="0x7fdf084e0bb0" id="2914" addr="0x7fdf084e0bb0" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="2915" addr="0x7ff9f1fb4db0" >
-                                <attributelist id="2916" addr="0x7ff9f1fb4db0" >
+                            <typescopesitem id="2915" addr="0x7fdf0850bdb0" >
+                                <attributelist id="2916" addr="0x7fdf0850bdb0" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="2917" addr="0x7ff9f1f8a2b0" >
-                                <attributelist id="2918" addr="0x7ff9f1f8a2b0" >
-                                    <attribute name="name" value="xbmc" id="2919" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="csymtab" value="0x7ff9f1f8a2f0" id="2920" addr="0x7ff9f1f8a2f0" />
-                                    <attribute name="symtab" value="0x7ff9f1f8a290" id="2921" addr="0x7ff9f1f8a290" />
+                            <typescopesitem id="2917" addr="0x7fdf084e12b0" >
+                                <attributelist id="2918" addr="0x7fdf084e12b0" >
+                                    <attribute name="name" value="xbmc" id="2919" addr="0x7fdf085119d0" />
+                                    <attribute name="csymtab" value="0x7fdf084e12f0" id="2920" addr="0x7fdf084e12f0" />
+                                    <attribute name="symtab" value="0x7fdf084e1290" id="2921" addr="0x7fdf084e1290" />
                                 </attributelist >
                             </typescopesitem >
                         </typescope >
                     </attributelist >
 
-                    <class id="2922" addr="0x7ff9f1fa0650" >
-                        <attributelist id="2923" addr="0x7ff9f1fa0650" >
-                            <attribute name="name" value="XBMCAddon::xbmc::InfoTagMusic" id="2924" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="2925" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="symtab" value="0x7ff9f1fa0790" id="2926" addr="0x7ff9f1fa0790" />
-                            <attribute name="allows_typedef" value="1" id="2927" addr="0x7ff9f1fba9d0" />
-                            <attribute name="typepass_visit" value="1" id="2928" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_visit" value="1" id="2929" addr="0x7ff9f1fba9d0" />
-                            <attribute name="kind" value="class" id="2930" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_name" value="InfoTagMusic" id="2931" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_default_constructor" value="1" id="2932" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_has_constructor" value="1" id="2933" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_public_constructor" value="1" id="2934" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_has_destructor" value="1" id="2935" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_default_destructor" value="1" id="2936" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_copy_constructor" value="1" id="2937" addr="0x7ff9f1fba9d0" />
-                            <attribute name="privatebaselist" value="0x7ff9f1fa0630" id="2938" addr="0x7ff9f1fa0630" />
-                            <attribute name="protectedbaselist" value="0x7ff9f1fa0610" id="2939" addr="0x7ff9f1fa0610" />
-                            <baselist id="2940" addr="0x7ff9f1fa05f0" >
-                                <base name="AddonClass" id="2941" addr="0x7ff9f1fa0570" />
+                    <class id="2922" addr="0x7fdf084f7650" >
+                        <attributelist id="2923" addr="0x7fdf084f7650" >
+                            <attribute name="name" value="XBMCAddon::xbmc::InfoTagMusic" id="2924" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="2925" addr="0x7fdf084e12b0" />
+                            <attribute name="symtab" value="0x7fdf084f7790" id="2926" addr="0x7fdf084f7790" />
+                            <attribute name="allows_typedef" value="1" id="2927" addr="0x7fdf085119d0" />
+                            <attribute name="typepass_visit" value="1" id="2928" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_visit" value="1" id="2929" addr="0x7fdf085119d0" />
+                            <attribute name="kind" value="class" id="2930" addr="0x7fdf085119d0" />
+                            <attribute name="sym_name" value="InfoTagMusic" id="2931" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_default_constructor" value="1" id="2932" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_has_constructor" value="1" id="2933" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_public_constructor" value="1" id="2934" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_has_destructor" value="1" id="2935" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_default_destructor" value="1" id="2936" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_copy_constructor" value="1" id="2937" addr="0x7fdf085119d0" />
+                            <attribute name="privatebaselist" value="0x7fdf084f7630" id="2938" addr="0x7fdf084f7630" />
+                            <attribute name="protectedbaselist" value="0x7fdf084f7610" id="2939" addr="0x7fdf084f7610" />
+                            <baselist id="2940" addr="0x7fdf084f75f0" >
+                                <base name="AddonClass" id="2941" addr="0x7fdf084f7570" />
                             </baselist >
-                            <attribute name="module" value="xbmc" id="2942" addr="0x7ff9f1f89430" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="2943" addr="0x7ff9f1fba9d0" />
-                            <typescope id="2944" addr="0x7ff9f1fb7c10" >
-                                <attributelist id="2945" addr="0x7ff9f1fb7c10" >
-                                    <attribute name="name" value="InfoTagMusic" id="2946" addr="0x7ff9f1fba9d0" />
-                                    <typetab id="2947" addr="0x7ff9f1fb7c30" >
-                                        <attributelist id="2948" addr="0x7ff9f1fb7c30" >
+                            <attribute name="module" value="xbmc" id="2942" addr="0x7fdf084e0430" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="2943" addr="0x7fdf085119d0" />
+                            <typescope id="2944" addr="0x7fdf0850ec10" >
+                                <attributelist id="2945" addr="0x7fdf0850ec10" >
+                                    <attribute name="name" value="InfoTagMusic" id="2946" addr="0x7fdf085119d0" />
+                                    <typetab id="2947" addr="0x7fdf0850ec30" >
+                                        <attributelist id="2948" addr="0x7fdf0850ec30" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7ff9f1fb4d70" id="2949" addr="0x7ff9f1fb4d70" />
-                                    <attribute name="qname" value="XBMCAddon::xbmc::InfoTagMusic" id="2950" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="symtab" value="0x7ff9f1fa0790" id="2951" addr="0x7ff9f1fa0790" />
+                                    <attribute name="parent" value="0x7fdf0850bd70" id="2949" addr="0x7fdf0850bd70" />
+                                    <attribute name="qname" value="XBMCAddon::xbmc::InfoTagMusic" id="2950" addr="0x7fdf085119d0" />
+                                    <attribute name="symtab" value="0x7fdf084f7790" id="2951" addr="0x7fdf084f7790" />
                                 </attributelist >
-                                <typescopesitem id="2952" addr="0x7ff9f1fb7bb0" >
-                                    <attributelist id="2953" addr="0x7ff9f1fb7bb0" >
+                                <typescopesitem id="2952" addr="0x7fdf0850ebb0" >
+                                    <attributelist id="2953" addr="0x7fdf0850ebb0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="2954" addr="0x7ff9f1fb7c30" >
-                                    <attributelist id="2955" addr="0x7ff9f1fb7c30" >
+                                <typescopesitem id="2954" addr="0x7fdf0850ec30" >
+                                    <attributelist id="2955" addr="0x7fdf0850ec30" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="2956" addr="0x7ff9f1fb4d70" >
-                                    <attributelist id="2957" addr="0x7ff9f1fb4d70" >
-                                        <attribute name="name" value="xbmc" id="2958" addr="0x7ff9f1fba9d0" />
-                                        <typetab id="2959" addr="0x7ff9f1fb4d90" >
-                                            <attributelist id="2960" addr="0x7ff9f1fb4d90" >
-                                                <attribute name="Monitor" value="Monitor" id="2961" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="2962" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="Keyboard" value="Keyboard" id="2963" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="2964" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="InfoTagVideo" value="InfoTagVideo" id="2965" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="Player" value="Player" id="2966" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="InfoTagMusic" value="InfoTagMusic" id="2967" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="PlayList" value="PlayList" id="2968" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="RenderCapture" value="RenderCapture" id="2969" addr="0x7ff9f1fba9d0" />
+                                <typescopesitem id="2956" addr="0x7fdf0850bd70" >
+                                    <attributelist id="2957" addr="0x7fdf0850bd70" >
+                                        <attribute name="name" value="xbmc" id="2958" addr="0x7fdf085119d0" />
+                                        <typetab id="2959" addr="0x7fdf0850bd90" >
+                                            <attributelist id="2960" addr="0x7fdf0850bd90" >
+                                                <attribute name="Monitor" value="Monitor" id="2961" addr="0x7fdf085119d0" />
+                                                <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="2962" addr="0x7fdf085119d0" />
+                                                <attribute name="Keyboard" value="Keyboard" id="2963" addr="0x7fdf085119d0" />
+                                                <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="2964" addr="0x7fdf085119d0" />
+                                                <attribute name="InfoTagVideo" value="InfoTagVideo" id="2965" addr="0x7fdf085119d0" />
+                                                <attribute name="Player" value="Player" id="2966" addr="0x7fdf085119d0" />
+                                                <attribute name="InfoTagMusic" value="InfoTagMusic" id="2967" addr="0x7fdf085119d0" />
+                                                <attribute name="PlayList" value="PlayList" id="2968" addr="0x7fdf085119d0" />
+                                                <attribute name="RenderCapture" value="RenderCapture" id="2969" addr="0x7fdf085119d0" />
                                             </attributelist >
-                                            <typetabsitem id="2970" addr="0x7ff9f1fb9b10" >
-                                                <attributelist id="2971" addr="0x7ff9f1fb9b10" >
+                                            <typetabsitem id="2970" addr="0x7fdf08510b10" >
+                                                <attributelist id="2971" addr="0x7fdf08510b10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2972" addr="0x7ff9f1fb7f30" >
-                                                <attributelist id="2973" addr="0x7ff9f1fb7f30" >
+                                            <typetabsitem id="2972" addr="0x7fdf0850ef30" >
+                                                <attributelist id="2973" addr="0x7fdf0850ef30" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2974" addr="0x7ff9f1fb8990" >
-                                                <attributelist id="2975" addr="0x7ff9f1fb8990" >
+                                            <typetabsitem id="2974" addr="0x7fdf0850f990" >
+                                                <attributelist id="2975" addr="0x7fdf0850f990" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2976" addr="0x7ff9f1fb5e90" >
-                                                <attributelist id="2977" addr="0x7ff9f1fb5e90" >
+                                            <typetabsitem id="2976" addr="0x7fdf0850ce90" >
+                                                <attributelist id="2977" addr="0x7fdf0850ce90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2978" addr="0x7ff9f1fb8310" >
-                                                <attributelist id="2979" addr="0x7ff9f1fb8310" >
+                                            <typetabsitem id="2978" addr="0x7fdf0850f310" >
+                                                <attributelist id="2979" addr="0x7fdf0850f310" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2980" addr="0x7ff9f1fb6050" >
-                                                <attributelist id="2981" addr="0x7ff9f1fb6050" >
+                                            <typetabsitem id="2980" addr="0x7fdf0850d050" >
+                                                <attributelist id="2981" addr="0x7fdf0850d050" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2982" addr="0x7ff9f1fb7b50" >
-                                                <attributelist id="2983" addr="0x7ff9f1fb7b50" >
+                                            <typetabsitem id="2982" addr="0x7fdf0850eb50" >
+                                                <attributelist id="2983" addr="0x7fdf0850eb50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2984" addr="0x7ff9f1fb91b0" >
-                                                <attributelist id="2985" addr="0x7ff9f1fb91b0" >
+                                            <typetabsitem id="2984" addr="0x7fdf085101b0" >
+                                                <attributelist id="2985" addr="0x7fdf085101b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2986" addr="0x7ff9f1fb7490" >
-                                                <attributelist id="2987" addr="0x7ff9f1fb7490" >
+                                            <typetabsitem id="2986" addr="0x7fdf0850e490" >
+                                                <attributelist id="2987" addr="0x7fdf0850e490" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7ff9f1fb4990" id="2988" addr="0x7ff9f1fb4990" />
-                                        <attribute name="qname" value="XBMCAddon::xbmc" id="2989" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="symtab" value="0x7ff9f1f8a2b0" id="2990" addr="0x7ff9f1f8a2b0" />
+                                        <attribute name="parent" value="0x7fdf0850b990" id="2988" addr="0x7fdf0850b990" />
+                                        <attribute name="qname" value="XBMCAddon::xbmc" id="2989" addr="0x7fdf085119d0" />
+                                        <attribute name="symtab" value="0x7fdf084e12b0" id="2990" addr="0x7fdf084e12b0" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="2991" addr="0x7ff9f1fb7c50" >
-                                    <attributelist id="2992" addr="0x7ff9f1fb7c50" >
+                                <typescopesitem id="2991" addr="0x7fdf0850ec50" >
+                                    <attributelist id="2992" addr="0x7fdf0850ec50" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="2993" addr="0x7ff9f1fa0790" >
-                                    <attributelist id="2994" addr="0x7ff9f1fa0790" >
-                                        <attribute name="name" value="InfoTagMusic" id="2995" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="csymtab" value="0x7ff9f1fa07b0" id="2996" addr="0x7ff9f1fa07b0" />
-                                        <attribute name="symtab" value="0x7ff9f1fa0750" id="2997" addr="0x7ff9f1fa0750" />
+                                <typescopesitem id="2993" addr="0x7fdf084f7790" >
+                                    <attributelist id="2994" addr="0x7fdf084f7790" >
+                                        <attribute name="name" value="InfoTagMusic" id="2995" addr="0x7fdf085119d0" />
+                                        <attribute name="csymtab" value="0x7fdf084f77b0" id="2996" addr="0x7fdf084f77b0" />
+                                        <attribute name="symtab" value="0x7fdf084f7750" id="2997" addr="0x7fdf084f7750" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <access id="2998" addr="0x7ff9f1fa0710" >
-                            <attributelist id="2999" addr="0x7ff9f1fa0710" >
-                                <attribute name="kind" value="private" id="3000" addr="0x7ff9f1fba9d0" />
+                        <access id="2998" addr="0x7fdf084f7710" >
+                            <attributelist id="2999" addr="0x7fdf084f7710" >
+                                <attribute name="kind" value="private" id="3000" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </access >
-                        <cdecl id="3001" addr="0x7ff9f1fa0910" >
-                            <attributelist id="3002" addr="0x7ff9f1fa0910" >
-                                <attribute name="ismember" value="1" id="3003" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="infoTag" id="3004" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="p." id="3005" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="private" id="3006" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="variable" id="3007" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="MUSIC_INFO::CMusicInfoTag" id="3008" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa0790" id="3009" addr="0x7ff9f1fa0790" />
+                        <cdecl id="3001" addr="0x7fdf084f7910" >
+                            <attributelist id="3002" addr="0x7fdf084f7910" >
+                                <attribute name="ismember" value="1" id="3003" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="infoTag" id="3004" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="p." id="3005" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="private" id="3006" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="variable" id="3007" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="MUSIC_INFO::CMusicInfoTag" id="3008" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084f7790" id="3009" addr="0x7fdf084f7790" />
                             </attributelist >
                          
                         </cdecl >
-                        <access id="3010" addr="0x7ff9f1fa09f0" >
-                            <attributelist id="3011" addr="0x7ff9f1fa09f0" >
-                                <attribute name="kind" value="public" id="3012" addr="0x7ff9f1fba9d0" />
+                        <access id="3010" addr="0x7fdf084f79f0" >
+                            <attributelist id="3011" addr="0x7fdf084f79f0" >
+                                <attribute name="kind" value="public" id="3012" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="3013" addr="0x7ff9f1fa0b10" >
-                            <attributelist id="3014" addr="0x7ff9f1fa0b10" >
-                                <attribute name="ismember" value="1" id="3015" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="InfoTagMusic" id="3016" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="InfoTagMusic" id="3017" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3018" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3019" addr="0x7ff9f1fba9d0" />
-                                <attribute name="feature_new" value="1" id="3020" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa0790" id="3021" addr="0x7ff9f1fa0790" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3022" addr="0x7ff9f1fba9d0" />
+                        <constructor id="3013" addr="0x7fdf084f7b10" >
+                            <attributelist id="3014" addr="0x7fdf084f7b10" >
+                                <attribute name="ismember" value="1" id="3015" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="InfoTagMusic" id="3016" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="InfoTagMusic" id="3017" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3018" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3019" addr="0x7fdf085119d0" />
+                                <attribute name="feature_new" value="1" id="3020" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084f7790" id="3021" addr="0x7fdf084f7790" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3022" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </constructor >
-                        <destructor id="3023" addr="0x7ff9f1fa0c70" >
-                            <attributelist id="3024" addr="0x7ff9f1fa0c70" >
-                                <attribute name="ismember" value="1" id="3025" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="~InfoTagMusic" id="3026" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="~InfoTagMusic" id="3027" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3028" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3029" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa0790" id="3030" addr="0x7ff9f1fa0790" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3031" addr="0x7ff9f1fba9d0" />
+                        <destructor id="3023" addr="0x7fdf084f7c70" >
+                            <attributelist id="3024" addr="0x7fdf084f7c70" >
+                                <attribute name="ismember" value="1" id="3025" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="~InfoTagMusic" id="3026" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="~InfoTagMusic" id="3027" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3028" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3029" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084f7790" id="3030" addr="0x7fdf084f7790" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3031" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </destructor >
-                        <cdecl id="3032" addr="0x7ff9f1fa0e30" >
-                            <attributelist id="3033" addr="0x7ff9f1fa0e30" >
-                                <attribute name="ismember" value="1" id="3034" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getDbId" id="3035" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getDbId" id="3036" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3037" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3038" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3039" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="int" id="3040" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa0790" id="3041" addr="0x7ff9f1fa0790" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3042" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3043" addr="0x7ff9f1fa1010" >
-                            <attributelist id="3044" addr="0x7ff9f1fa1010" >
-                                <attribute name="ismember" value="1" id="3045" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getURL" id="3046" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getURL" id="3047" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3048" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3049" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3050" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3051" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa0790" id="3052" addr="0x7ff9f1fa0790" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3053" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3054" addr="0x7ff9f1fa11f0" >
-                            <attributelist id="3055" addr="0x7ff9f1fa11f0" >
-                                <attribute name="ismember" value="1" id="3056" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getTitle" id="3057" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getTitle" id="3058" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3059" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3060" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3061" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3062" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa0790" id="3063" addr="0x7ff9f1fa0790" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3064" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3065" addr="0x7ff9f1fa13d0" >
-                            <attributelist id="3066" addr="0x7ff9f1fa13d0" >
-                                <attribute name="ismember" value="1" id="3067" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getMediaType" id="3068" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getMediaType" id="3069" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3070" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3071" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3072" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3073" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa0790" id="3074" addr="0x7ff9f1fa0790" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3075" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3076" addr="0x7ff9f1fa15b0" >
-                            <attributelist id="3077" addr="0x7ff9f1fa15b0" >
-                                <attribute name="ismember" value="1" id="3078" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getArtist" id="3079" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getArtist" id="3080" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3081" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3082" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3083" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3084" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa0790" id="3085" addr="0x7ff9f1fa0790" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3086" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3087" addr="0x7ff9f1fa1790" >
-                            <attributelist id="3088" addr="0x7ff9f1fa1790" >
-                                <attribute name="ismember" value="1" id="3089" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getAlbum" id="3090" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getAlbum" id="3091" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3092" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3093" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3094" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3095" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa0790" id="3096" addr="0x7ff9f1fa0790" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3097" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3098" addr="0x7ff9f1fa1970" >
-                            <attributelist id="3099" addr="0x7ff9f1fa1970" >
-                                <attribute name="ismember" value="1" id="3100" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getAlbumArtist" id="3101" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getAlbumArtist" id="3102" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3103" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3104" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3105" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3106" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa0790" id="3107" addr="0x7ff9f1fa0790" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3108" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3109" addr="0x7ff9f1fa1b50" >
-                            <attributelist id="3110" addr="0x7ff9f1fa1b50" >
-                                <attribute name="ismember" value="1" id="3111" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getGenre" id="3112" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getGenre" id="3113" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3114" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3115" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3116" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3117" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa0790" id="3118" addr="0x7ff9f1fa0790" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3119" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3120" addr="0x7ff9f1fa1d30" >
-                            <attributelist id="3121" addr="0x7ff9f1fa1d30" >
-                                <attribute name="ismember" value="1" id="3122" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getDuration" id="3123" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getDuration" id="3124" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3125" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3126" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3127" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="int" id="3128" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa0790" id="3129" addr="0x7ff9f1fa0790" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3130" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3131" addr="0x7ff9f1fa1f10" >
-                            <attributelist id="3132" addr="0x7ff9f1fa1f10" >
-                                <attribute name="ismember" value="1" id="3133" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getRating" id="3134" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getRating" id="3135" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3136" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3137" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3138" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="int" id="3139" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa0790" id="3140" addr="0x7ff9f1fa0790" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3141" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3142" addr="0x7ff9f1fa20f0" >
-                            <attributelist id="3143" addr="0x7ff9f1fa20f0" >
-                                <attribute name="ismember" value="1" id="3144" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getUserRating" id="3145" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getUserRating" id="3146" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3147" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3148" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3149" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="int" id="3150" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa0790" id="3151" addr="0x7ff9f1fa0790" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3152" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3153" addr="0x7ff9f1fa22d0" >
-                            <attributelist id="3154" addr="0x7ff9f1fa22d0" >
-                                <attribute name="ismember" value="1" id="3155" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getTrack" id="3156" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getTrack" id="3157" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3158" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3159" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3160" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="int" id="3161" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa0790" id="3162" addr="0x7ff9f1fa0790" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3163" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3164" addr="0x7ff9f1fa24b0" >
-                            <attributelist id="3165" addr="0x7ff9f1fa24b0" >
-                                <attribute name="ismember" value="1" id="3166" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getDisc" id="3167" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getDisc" id="3168" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3169" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3170" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3171" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="int" id="3172" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa0790" id="3173" addr="0x7ff9f1fa0790" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3174" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3175" addr="0x7ff9f1fa2690" >
-                            <attributelist id="3176" addr="0x7ff9f1fa2690" >
-                                <attribute name="ismember" value="1" id="3177" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getReleaseDate" id="3178" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getReleaseDate" id="3179" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3180" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3181" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3182" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3183" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa0790" id="3184" addr="0x7ff9f1fa0790" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3185" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3186" addr="0x7ff9f1fa2870" >
-                            <attributelist id="3187" addr="0x7ff9f1fa2870" >
-                                <attribute name="ismember" value="1" id="3188" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getListeners" id="3189" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getListeners" id="3190" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3191" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3192" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3193" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="int" id="3194" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa0790" id="3195" addr="0x7ff9f1fa0790" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3196" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3197" addr="0x7ff9f1fa2a50" >
-                            <attributelist id="3198" addr="0x7ff9f1fa2a50" >
-                                <attribute name="ismember" value="1" id="3199" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getPlayCount" id="3200" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getPlayCount" id="3201" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3202" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3203" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3204" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="int" id="3205" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa0790" id="3206" addr="0x7ff9f1fa0790" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3207" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3208" addr="0x7ff9f1fa2c30" >
-                            <attributelist id="3209" addr="0x7ff9f1fa2c30" >
-                                <attribute name="ismember" value="1" id="3210" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getLastPlayed" id="3211" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getLastPlayed" id="3212" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3213" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3214" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3215" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3216" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa0790" id="3217" addr="0x7ff9f1fa0790" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3218" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3219" addr="0x7ff9f1fa2e10" >
-                            <attributelist id="3220" addr="0x7ff9f1fa2e10" >
-                                <attribute name="ismember" value="1" id="3221" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getComment" id="3222" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getComment" id="3223" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3224" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3225" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3226" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3227" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa0790" id="3228" addr="0x7ff9f1fa0790" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3229" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3230" addr="0x7ff9f1fa2ff0" >
-                            <attributelist id="3231" addr="0x7ff9f1fa2ff0" >
-                                <attribute name="ismember" value="1" id="3232" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getLyrics" id="3233" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getLyrics" id="3234" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3235" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3236" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3237" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3238" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa0790" id="3239" addr="0x7ff9f1fa0790" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3240" addr="0x7ff9f1fba9d0" />
+                        <cdecl id="3032" addr="0x7fdf084f7e30" >
+                            <attributelist id="3033" addr="0x7fdf084f7e30" >
+                                <attribute name="ismember" value="1" id="3034" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getDbId" id="3035" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getDbId" id="3036" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3037" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3038" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3039" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="int" id="3040" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084f7790" id="3041" addr="0x7fdf084f7790" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3042" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3043" addr="0x7fdf084f8010" >
+                            <attributelist id="3044" addr="0x7fdf084f8010" >
+                                <attribute name="ismember" value="1" id="3045" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getURL" id="3046" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getURL" id="3047" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3048" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3049" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3050" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3051" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084f7790" id="3052" addr="0x7fdf084f7790" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3053" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3054" addr="0x7fdf084f81f0" >
+                            <attributelist id="3055" addr="0x7fdf084f81f0" >
+                                <attribute name="ismember" value="1" id="3056" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getTitle" id="3057" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getTitle" id="3058" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3059" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3060" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3061" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3062" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084f7790" id="3063" addr="0x7fdf084f7790" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3064" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3065" addr="0x7fdf084f83d0" >
+                            <attributelist id="3066" addr="0x7fdf084f83d0" >
+                                <attribute name="ismember" value="1" id="3067" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getMediaType" id="3068" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getMediaType" id="3069" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3070" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3071" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3072" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3073" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084f7790" id="3074" addr="0x7fdf084f7790" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3075" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3076" addr="0x7fdf084f85b0" >
+                            <attributelist id="3077" addr="0x7fdf084f85b0" >
+                                <attribute name="ismember" value="1" id="3078" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getArtist" id="3079" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getArtist" id="3080" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3081" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3082" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3083" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3084" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084f7790" id="3085" addr="0x7fdf084f7790" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3086" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3087" addr="0x7fdf084f8790" >
+                            <attributelist id="3088" addr="0x7fdf084f8790" >
+                                <attribute name="ismember" value="1" id="3089" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getAlbum" id="3090" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getAlbum" id="3091" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3092" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3093" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3094" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3095" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084f7790" id="3096" addr="0x7fdf084f7790" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3097" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3098" addr="0x7fdf084f8970" >
+                            <attributelist id="3099" addr="0x7fdf084f8970" >
+                                <attribute name="ismember" value="1" id="3100" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getAlbumArtist" id="3101" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getAlbumArtist" id="3102" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3103" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3104" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3105" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3106" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084f7790" id="3107" addr="0x7fdf084f7790" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3108" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3109" addr="0x7fdf084f8b50" >
+                            <attributelist id="3110" addr="0x7fdf084f8b50" >
+                                <attribute name="ismember" value="1" id="3111" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getGenre" id="3112" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getGenre" id="3113" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3114" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3115" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3116" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3117" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084f7790" id="3118" addr="0x7fdf084f7790" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3119" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3120" addr="0x7fdf084f8d30" >
+                            <attributelist id="3121" addr="0x7fdf084f8d30" >
+                                <attribute name="ismember" value="1" id="3122" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getDuration" id="3123" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getDuration" id="3124" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3125" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3126" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3127" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="int" id="3128" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084f7790" id="3129" addr="0x7fdf084f7790" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3130" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3131" addr="0x7fdf084f8f10" >
+                            <attributelist id="3132" addr="0x7fdf084f8f10" >
+                                <attribute name="ismember" value="1" id="3133" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getRating" id="3134" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getRating" id="3135" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3136" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3137" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3138" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="int" id="3139" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084f7790" id="3140" addr="0x7fdf084f7790" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3141" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3142" addr="0x7fdf084f90f0" >
+                            <attributelist id="3143" addr="0x7fdf084f90f0" >
+                                <attribute name="ismember" value="1" id="3144" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getUserRating" id="3145" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getUserRating" id="3146" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3147" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3148" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3149" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="int" id="3150" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084f7790" id="3151" addr="0x7fdf084f7790" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3152" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3153" addr="0x7fdf084f92d0" >
+                            <attributelist id="3154" addr="0x7fdf084f92d0" >
+                                <attribute name="ismember" value="1" id="3155" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getTrack" id="3156" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getTrack" id="3157" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3158" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3159" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3160" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="int" id="3161" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084f7790" id="3162" addr="0x7fdf084f7790" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3163" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3164" addr="0x7fdf084f94b0" >
+                            <attributelist id="3165" addr="0x7fdf084f94b0" >
+                                <attribute name="ismember" value="1" id="3166" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getDisc" id="3167" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getDisc" id="3168" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3169" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3170" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3171" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="int" id="3172" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084f7790" id="3173" addr="0x7fdf084f7790" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3174" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3175" addr="0x7fdf084f9690" >
+                            <attributelist id="3176" addr="0x7fdf084f9690" >
+                                <attribute name="ismember" value="1" id="3177" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getReleaseDate" id="3178" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getReleaseDate" id="3179" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3180" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3181" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3182" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3183" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084f7790" id="3184" addr="0x7fdf084f7790" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3185" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3186" addr="0x7fdf084f9870" >
+                            <attributelist id="3187" addr="0x7fdf084f9870" >
+                                <attribute name="ismember" value="1" id="3188" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getListeners" id="3189" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getListeners" id="3190" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3191" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3192" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3193" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="int" id="3194" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084f7790" id="3195" addr="0x7fdf084f7790" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3196" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3197" addr="0x7fdf084f9a50" >
+                            <attributelist id="3198" addr="0x7fdf084f9a50" >
+                                <attribute name="ismember" value="1" id="3199" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getPlayCount" id="3200" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getPlayCount" id="3201" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3202" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3203" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3204" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="int" id="3205" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084f7790" id="3206" addr="0x7fdf084f7790" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3207" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3208" addr="0x7fdf084f9c30" >
+                            <attributelist id="3209" addr="0x7fdf084f9c30" >
+                                <attribute name="ismember" value="1" id="3210" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getLastPlayed" id="3211" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getLastPlayed" id="3212" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3213" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3214" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3215" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3216" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084f7790" id="3217" addr="0x7fdf084f7790" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3218" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3219" addr="0x7fdf084f9e10" >
+                            <attributelist id="3220" addr="0x7fdf084f9e10" >
+                                <attribute name="ismember" value="1" id="3221" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getComment" id="3222" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getComment" id="3223" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3224" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3225" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3226" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3227" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084f7790" id="3228" addr="0x7fdf084f7790" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3229" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3230" addr="0x7fdf084f9ff0" >
+                            <attributelist id="3231" addr="0x7fdf084f9ff0" >
+                                <attribute name="ismember" value="1" id="3232" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getLyrics" id="3233" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getLyrics" id="3234" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3235" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3236" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3237" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3238" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084f7790" id="3239" addr="0x7fdf084f7790" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3240" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </cdecl >
@@ -4581,753 +4581,753 @@
                 </namespace >
             </namespace >
         </include >
-        <include id="3241" addr="0x7ff9f1fa3210" >
-            <attributelist id="3242" addr="0x7ff9f1fa3210" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/InfoTagRadioRDS.h" id="3243" addr="0x7ff9f1fba9d0" />
+        <include id="3241" addr="0x7fdf084fa210" >
+            <attributelist id="3242" addr="0x7fdf084fa210" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/InfoTagRadioRDS.h" id="3243" addr="0x7fdf085119d0" />
             </attributelist >
 
-            <namespace id="3244" addr="0x7ff9f1fa32b0" >
-                <attributelist id="3245" addr="0x7ff9f1fa32b0" >
-                    <attribute name="sym_name" value="XBMCAddon" id="3246" addr="0x7ff9f1fba9d0" />
-                    <attribute name="name" value="XBMCAddon" id="3247" addr="0x7ff9f1fba9d0" />
-                    <attribute name="sym_previousSibling" value="0x7ff9f1fa0450" id="3248" addr="0x7ff9f1fa0450" />
-                    <attribute name="csym_nextSibling" value="0x7ff9f1fa73d0" id="3249" addr="0x7ff9f1fa73d0" />
-                    <attribute name="sym_nextSibling" value="0x7ff9f1fa73d0" id="3250" addr="0x7ff9f1fa73d0" />
-                    <typescope id="3251" addr="0x7ff9f1fb4990" >
-                        <attributelist id="3252" addr="0x7ff9f1fb4990" >
-                            <attribute name="name" value="XBMCAddon" id="3253" addr="0x7ff9f1fba9d0" />
-                            <typetab id="3254" addr="0x7ff9f1fb49d0" >
-                                <attributelist id="3255" addr="0x7ff9f1fb49d0" >
-                                    <attribute name="String" value="std::string" id="3256" addr="0x7ff9f1fba9d0" />
+            <namespace id="3244" addr="0x7fdf084fa2b0" >
+                <attributelist id="3245" addr="0x7fdf084fa2b0" >
+                    <attribute name="sym_name" value="XBMCAddon" id="3246" addr="0x7fdf085119d0" />
+                    <attribute name="name" value="XBMCAddon" id="3247" addr="0x7fdf085119d0" />
+                    <attribute name="sym_previousSibling" value="0x7fdf084f7450" id="3248" addr="0x7fdf084f7450" />
+                    <attribute name="csym_nextSibling" value="0x7fdf084fe3d0" id="3249" addr="0x7fdf084fe3d0" />
+                    <attribute name="sym_nextSibling" value="0x7fdf084fe3d0" id="3250" addr="0x7fdf084fe3d0" />
+                    <typescope id="3251" addr="0x7fdf0850b990" >
+                        <attributelist id="3252" addr="0x7fdf0850b990" >
+                            <attribute name="name" value="XBMCAddon" id="3253" addr="0x7fdf085119d0" />
+                            <typetab id="3254" addr="0x7fdf0850b9d0" >
+                                <attributelist id="3255" addr="0x7fdf0850b9d0" >
+                                    <attribute name="String" value="std::string" id="3256" addr="0x7fdf085119d0" />
                                 </attributelist >
-                                <typetabsitem id="3257" addr="0x7ff9f1fb4bb0" >
-                                    <attributelist id="3258" addr="0x7ff9f1fb4bb0" >
+                                <typetabsitem id="3257" addr="0x7fdf0850bbb0" >
+                                    <attributelist id="3258" addr="0x7fdf0850bbb0" >
                                     </attributelist >
                                 </typetabsitem >
                             </typetab >
-                            <attribute name="parent" value="0x7ff9f1f72a30" id="3259" addr="0x7ff9f1f72a30" />
-                            <attribute name="qname" value="XBMCAddon" id="3260" addr="0x7ff9f1fba9d0" />
-                            <attribute name="symtab" value="0x7ff9f1f89bb0" id="3261" addr="0x7ff9f1f89bb0" />
+                            <attribute name="parent" value="0x7fdf084c9a30" id="3259" addr="0x7fdf084c9a30" />
+                            <attribute name="qname" value="XBMCAddon" id="3260" addr="0x7fdf085119d0" />
+                            <attribute name="symtab" value="0x7fdf084e0bb0" id="3261" addr="0x7fdf084e0bb0" />
                         </attributelist >
-                        <typescopesitem id="3262" addr="0x7ff9f1f89b70" >
-                            <attributelist id="3263" addr="0x7ff9f1f89b70" >
+                        <typescopesitem id="3262" addr="0x7fdf084e0b70" >
+                            <attributelist id="3263" addr="0x7fdf084e0b70" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="3264" addr="0x7ff9f1fb49d0" >
-                            <attributelist id="3265" addr="0x7ff9f1fb49d0" >
-                                <attribute name="String" value="std::string" id="3266" addr="0x7ff9f1fba9d0" />
+                        <typescopesitem id="3264" addr="0x7fdf0850b9d0" >
+                            <attributelist id="3265" addr="0x7fdf0850b9d0" >
+                                <attribute name="String" value="std::string" id="3266" addr="0x7fdf085119d0" />
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="3267" addr="0x7ff9f1f72a30" >
-                            <attributelist id="3268" addr="0x7ff9f1f72a30" >
-                                <attribute name="name" value="" id="3269" addr="0x7ff9f1fba9d0" />
-                                <typetab id="3270" addr="0x7ff9f1f72a90" >
-                                    <attributelist id="3271" addr="0x7ff9f1f72a90" >
-                                        <attribute name="CGUIDialogKeyboardGeneric" value="CGUIDialogKeyboardGeneric" id="3272" addr="0x7ff9f1fba9d0" />
+                        <typescopesitem id="3267" addr="0x7fdf084c9a30" >
+                            <attributelist id="3268" addr="0x7fdf084c9a30" >
+                                <attribute name="name" value="" id="3269" addr="0x7fdf085119d0" />
+                                <typetab id="3270" addr="0x7fdf084c9a90" >
+                                    <attributelist id="3271" addr="0x7fdf084c9a90" >
+                                        <attribute name="CGUIDialogKeyboardGeneric" value="CGUIDialogKeyboardGeneric" id="3272" addr="0x7fdf085119d0" />
                                     </attributelist >
-                                    <typetabsitem id="3273" addr="0x7ff9f1fb7950" >
-                                        <attributelist id="3274" addr="0x7ff9f1fb7950" >
+                                    <typetabsitem id="3273" addr="0x7fdf0850e950" >
+                                        <attributelist id="3274" addr="0x7fdf0850e950" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="3275" addr="0x7ff9f1fb4ad0" >
-                            <attributelist id="3276" addr="0x7ff9f1fb4ad0" >
+                        <typescopesitem id="3275" addr="0x7fdf0850bad0" >
+                            <attributelist id="3276" addr="0x7fdf0850bad0" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="3277" addr="0x7ff9f1f89bb0" >
-                            <attributelist id="3278" addr="0x7ff9f1f89bb0" >
-                                <attribute name="name" value="XBMCAddon" id="3279" addr="0x7ff9f1fba9d0" />
-                                <attribute name="csymtab" value="0x7ff9f1f89bf0" id="3280" addr="0x7ff9f1f89bf0" />
-                                <attribute name="symtab" value="0x7ff9f1f89b90" id="3281" addr="0x7ff9f1f89b90" />
+                        <typescopesitem id="3277" addr="0x7fdf084e0bb0" >
+                            <attributelist id="3278" addr="0x7fdf084e0bb0" >
+                                <attribute name="name" value="XBMCAddon" id="3279" addr="0x7fdf085119d0" />
+                                <attribute name="csymtab" value="0x7fdf084e0bf0" id="3280" addr="0x7fdf084e0bf0" />
+                                <attribute name="symtab" value="0x7fdf084e0b90" id="3281" addr="0x7fdf084e0b90" />
                             </attributelist >
                         </typescopesitem >
                     </typescope >
-                    <attribute name="symtab" value="0x7ff9f1f89bb0" id="3282" addr="0x7ff9f1f89bb0" />
-                    <attribute name="sym_symtab" value="0x7ff9f1f72950" id="3283" addr="0x7ff9f1f72950" />
+                    <attribute name="symtab" value="0x7fdf084e0bb0" id="3282" addr="0x7fdf084e0bb0" />
+                    <attribute name="sym_symtab" value="0x7fdf084c9950" id="3283" addr="0x7fdf084c9950" />
                 </attributelist >
 
-                <namespace id="3284" addr="0x7ff9f1fa3330" >
-                    <attributelist id="3285" addr="0x7ff9f1fa3330" >
-                        <attribute name="feature_knownbasetypes" value="AddonClass,IPlayerCallback,AddonCallback" id="3286" addr="0x7ff9f1fba9d0" />
-                        <attribute name="name" value="xbmc" id="3287" addr="0x7ff9f1fba9d0" />
-                        <attribute name="sym_symtab" value="0x7ff9f1f89bb0" id="3288" addr="0x7ff9f1f89bb0" />
-                        <attribute name="symtab" value="0x7ff9f1f8a2b0" id="3289" addr="0x7ff9f1f8a2b0" />
-                        <attribute name="sym_nextSibling" value="0x7ff9f1fa7450" id="3290" addr="0x7ff9f1fa7450" />
-                        <attribute name="csym_nextSibling" value="0x7ff9f1fa7450" id="3291" addr="0x7ff9f1fa7450" />
-                        <attribute name="sym_previousSibling" value="0x7ff9f1fa04d0" id="3292" addr="0x7ff9f1fa04d0" />
-                        <attribute name="feature_knownapitypes" value="XBMCAddon::xbmcgui::ListItem,XBMCAddon::xbmc::PlayListItem" id="3293" addr="0x7ff9f1fba9d0" />
-                        <attribute name="sym_name" value="xbmc" id="3294" addr="0x7ff9f1fba9d0" />
-                        <typescope id="3295" addr="0x7ff9f1fb4d70" >
-                            <attributelist id="3296" addr="0x7ff9f1fb4d70" >
-                                <attribute name="name" value="xbmc" id="3297" addr="0x7ff9f1fba9d0" />
-                                <typetab id="3298" addr="0x7ff9f1fb4d90" >
-                                    <attributelist id="3299" addr="0x7ff9f1fb4d90" >
-                                        <attribute name="Monitor" value="Monitor" id="3300" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="3301" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="Keyboard" value="Keyboard" id="3302" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="3303" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="InfoTagVideo" value="InfoTagVideo" id="3304" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="Player" value="Player" id="3305" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="InfoTagMusic" value="InfoTagMusic" id="3306" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="PlayList" value="PlayList" id="3307" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="RenderCapture" value="RenderCapture" id="3308" addr="0x7ff9f1fba9d0" />
+                <namespace id="3284" addr="0x7fdf084fa330" >
+                    <attributelist id="3285" addr="0x7fdf084fa330" >
+                        <attribute name="feature_knownbasetypes" value="AddonClass,IPlayerCallback,AddonCallback" id="3286" addr="0x7fdf085119d0" />
+                        <attribute name="name" value="xbmc" id="3287" addr="0x7fdf085119d0" />
+                        <attribute name="sym_symtab" value="0x7fdf084e0bb0" id="3288" addr="0x7fdf084e0bb0" />
+                        <attribute name="symtab" value="0x7fdf084e12b0" id="3289" addr="0x7fdf084e12b0" />
+                        <attribute name="sym_nextSibling" value="0x7fdf084fe450" id="3290" addr="0x7fdf084fe450" />
+                        <attribute name="csym_nextSibling" value="0x7fdf084fe450" id="3291" addr="0x7fdf084fe450" />
+                        <attribute name="sym_previousSibling" value="0x7fdf084f74d0" id="3292" addr="0x7fdf084f74d0" />
+                        <attribute name="feature_knownapitypes" value="XBMCAddon::xbmcgui::ListItem,XBMCAddon::xbmc::PlayListItem" id="3293" addr="0x7fdf085119d0" />
+                        <attribute name="sym_name" value="xbmc" id="3294" addr="0x7fdf085119d0" />
+                        <typescope id="3295" addr="0x7fdf0850bd70" >
+                            <attributelist id="3296" addr="0x7fdf0850bd70" >
+                                <attribute name="name" value="xbmc" id="3297" addr="0x7fdf085119d0" />
+                                <typetab id="3298" addr="0x7fdf0850bd90" >
+                                    <attributelist id="3299" addr="0x7fdf0850bd90" >
+                                        <attribute name="Monitor" value="Monitor" id="3300" addr="0x7fdf085119d0" />
+                                        <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="3301" addr="0x7fdf085119d0" />
+                                        <attribute name="Keyboard" value="Keyboard" id="3302" addr="0x7fdf085119d0" />
+                                        <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="3303" addr="0x7fdf085119d0" />
+                                        <attribute name="InfoTagVideo" value="InfoTagVideo" id="3304" addr="0x7fdf085119d0" />
+                                        <attribute name="Player" value="Player" id="3305" addr="0x7fdf085119d0" />
+                                        <attribute name="InfoTagMusic" value="InfoTagMusic" id="3306" addr="0x7fdf085119d0" />
+                                        <attribute name="PlayList" value="PlayList" id="3307" addr="0x7fdf085119d0" />
+                                        <attribute name="RenderCapture" value="RenderCapture" id="3308" addr="0x7fdf085119d0" />
                                     </attributelist >
-                                    <typetabsitem id="3309" addr="0x7ff9f1fb9b10" >
-                                        <attributelist id="3310" addr="0x7ff9f1fb9b10" >
+                                    <typetabsitem id="3309" addr="0x7fdf08510b10" >
+                                        <attributelist id="3310" addr="0x7fdf08510b10" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="3311" addr="0x7ff9f1fb7f30" >
-                                        <attributelist id="3312" addr="0x7ff9f1fb7f30" >
+                                    <typetabsitem id="3311" addr="0x7fdf0850ef30" >
+                                        <attributelist id="3312" addr="0x7fdf0850ef30" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="3313" addr="0x7ff9f1fb8990" >
-                                        <attributelist id="3314" addr="0x7ff9f1fb8990" >
+                                    <typetabsitem id="3313" addr="0x7fdf0850f990" >
+                                        <attributelist id="3314" addr="0x7fdf0850f990" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="3315" addr="0x7ff9f1fb5e90" >
-                                        <attributelist id="3316" addr="0x7ff9f1fb5e90" >
+                                    <typetabsitem id="3315" addr="0x7fdf0850ce90" >
+                                        <attributelist id="3316" addr="0x7fdf0850ce90" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="3317" addr="0x7ff9f1fb8310" >
-                                        <attributelist id="3318" addr="0x7ff9f1fb8310" >
+                                    <typetabsitem id="3317" addr="0x7fdf0850f310" >
+                                        <attributelist id="3318" addr="0x7fdf0850f310" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="3319" addr="0x7ff9f1fb6050" >
-                                        <attributelist id="3320" addr="0x7ff9f1fb6050" >
+                                    <typetabsitem id="3319" addr="0x7fdf0850d050" >
+                                        <attributelist id="3320" addr="0x7fdf0850d050" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="3321" addr="0x7ff9f1fb7b50" >
-                                        <attributelist id="3322" addr="0x7ff9f1fb7b50" >
+                                    <typetabsitem id="3321" addr="0x7fdf0850eb50" >
+                                        <attributelist id="3322" addr="0x7fdf0850eb50" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="3323" addr="0x7ff9f1fb91b0" >
-                                        <attributelist id="3324" addr="0x7ff9f1fb91b0" >
+                                    <typetabsitem id="3323" addr="0x7fdf085101b0" >
+                                        <attributelist id="3324" addr="0x7fdf085101b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="3325" addr="0x7ff9f1fb7490" >
-                                        <attributelist id="3326" addr="0x7ff9f1fb7490" >
+                                    <typetabsitem id="3325" addr="0x7fdf0850e490" >
+                                        <attributelist id="3326" addr="0x7fdf0850e490" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
-                                <attribute name="parent" value="0x7ff9f1fb4990" id="3327" addr="0x7ff9f1fb4990" />
-                                <attribute name="qname" value="XBMCAddon::xbmc" id="3328" addr="0x7ff9f1fba9d0" />
-                                <attribute name="symtab" value="0x7ff9f1f8a2b0" id="3329" addr="0x7ff9f1f8a2b0" />
+                                <attribute name="parent" value="0x7fdf0850b990" id="3327" addr="0x7fdf0850b990" />
+                                <attribute name="qname" value="XBMCAddon::xbmc" id="3328" addr="0x7fdf085119d0" />
+                                <attribute name="symtab" value="0x7fdf084e12b0" id="3329" addr="0x7fdf084e12b0" />
                             </attributelist >
-                            <typescopesitem id="3330" addr="0x7ff9f1f8a270" >
-                                <attributelist id="3331" addr="0x7ff9f1f8a270" >
+                            <typescopesitem id="3330" addr="0x7fdf084e1270" >
+                                <attributelist id="3331" addr="0x7fdf084e1270" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="3332" addr="0x7ff9f1fb4d90" >
-                                <attributelist id="3333" addr="0x7ff9f1fb4d90" >
-                                    <attribute name="Monitor" value="Monitor" id="3334" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="3335" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="Keyboard" value="Keyboard" id="3336" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="3337" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="InfoTagVideo" value="InfoTagVideo" id="3338" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="Player" value="Player" id="3339" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="InfoTagMusic" value="InfoTagMusic" id="3340" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="PlayList" value="PlayList" id="3341" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="RenderCapture" value="RenderCapture" id="3342" addr="0x7ff9f1fba9d0" />
+                            <typescopesitem id="3332" addr="0x7fdf0850bd90" >
+                                <attributelist id="3333" addr="0x7fdf0850bd90" >
+                                    <attribute name="Monitor" value="Monitor" id="3334" addr="0x7fdf085119d0" />
+                                    <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="3335" addr="0x7fdf085119d0" />
+                                    <attribute name="Keyboard" value="Keyboard" id="3336" addr="0x7fdf085119d0" />
+                                    <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="3337" addr="0x7fdf085119d0" />
+                                    <attribute name="InfoTagVideo" value="InfoTagVideo" id="3338" addr="0x7fdf085119d0" />
+                                    <attribute name="Player" value="Player" id="3339" addr="0x7fdf085119d0" />
+                                    <attribute name="InfoTagMusic" value="InfoTagMusic" id="3340" addr="0x7fdf085119d0" />
+                                    <attribute name="PlayList" value="PlayList" id="3341" addr="0x7fdf085119d0" />
+                                    <attribute name="RenderCapture" value="RenderCapture" id="3342" addr="0x7fdf085119d0" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="3343" addr="0x7ff9f1fb4990" >
-                                <attributelist id="3344" addr="0x7ff9f1fb4990" >
-                                    <attribute name="name" value="XBMCAddon" id="3345" addr="0x7ff9f1fba9d0" />
-                                    <typetab id="3346" addr="0x7ff9f1fb49d0" >
-                                        <attributelist id="3347" addr="0x7ff9f1fb49d0" >
-                                            <attribute name="String" value="std::string" id="3348" addr="0x7ff9f1fba9d0" />
-                                        </attributelist >
-                                        <typetabsitem id="3349" addr="0x7ff9f1fb4bb0" >
-                                            <attributelist id="3350" addr="0x7ff9f1fb4bb0" >
+                            <typescopesitem id="3343" addr="0x7fdf0850b990" >
+                                <attributelist id="3344" addr="0x7fdf0850b990" >
+                                    <attribute name="name" value="XBMCAddon" id="3345" addr="0x7fdf085119d0" />
+                                    <typetab id="3346" addr="0x7fdf0850b9d0" >
+                                        <attributelist id="3347" addr="0x7fdf0850b9d0" >
+                                            <attribute name="String" value="std::string" id="3348" addr="0x7fdf085119d0" />
+                                        </attributelist >
+                                        <typetabsitem id="3349" addr="0x7fdf0850bbb0" >
+                                            <attributelist id="3350" addr="0x7fdf0850bbb0" >
                                             </attributelist >
                                         </typetabsitem >
                                     </typetab >
-                                    <attribute name="parent" value="0x7ff9f1f72a30" id="3351" addr="0x7ff9f1f72a30" />
-                                    <attribute name="qname" value="XBMCAddon" id="3352" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="symtab" value="0x7ff9f1f89bb0" id="3353" addr="0x7ff9f1f89bb0" />
+                                    <attribute name="parent" value="0x7fdf084c9a30" id="3351" addr="0x7fdf084c9a30" />
+                                    <attribute name="qname" value="XBMCAddon" id="3352" addr="0x7fdf085119d0" />
+                                    <attribute name="symtab" value="0x7fdf084e0bb0" id="3353" addr="0x7fdf084e0bb0" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="3354" addr="0x7ff9f1fb4db0" >
-                                <attributelist id="3355" addr="0x7ff9f1fb4db0" >
+                            <typescopesitem id="3354" addr="0x7fdf0850bdb0" >
+                                <attributelist id="3355" addr="0x7fdf0850bdb0" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="3356" addr="0x7ff9f1f8a2b0" >
-                                <attributelist id="3357" addr="0x7ff9f1f8a2b0" >
-                                    <attribute name="name" value="xbmc" id="3358" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="csymtab" value="0x7ff9f1f8a2f0" id="3359" addr="0x7ff9f1f8a2f0" />
-                                    <attribute name="symtab" value="0x7ff9f1f8a290" id="3360" addr="0x7ff9f1f8a290" />
+                            <typescopesitem id="3356" addr="0x7fdf084e12b0" >
+                                <attributelist id="3357" addr="0x7fdf084e12b0" >
+                                    <attribute name="name" value="xbmc" id="3358" addr="0x7fdf085119d0" />
+                                    <attribute name="csymtab" value="0x7fdf084e12f0" id="3359" addr="0x7fdf084e12f0" />
+                                    <attribute name="symtab" value="0x7fdf084e1290" id="3360" addr="0x7fdf084e1290" />
                                 </attributelist >
                             </typescopesitem >
                         </typescope >
                     </attributelist >
 
-                    <class id="3361" addr="0x7ff9f1fa34b0" >
-                        <attributelist id="3362" addr="0x7ff9f1fa34b0" >
-                            <attribute name="name" value="XBMCAddon::xbmc::InfoTagRadioRDS" id="3363" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="3364" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="symtab" value="0x7ff9f1fa35f0" id="3365" addr="0x7ff9f1fa35f0" />
-                            <attribute name="allows_typedef" value="1" id="3366" addr="0x7ff9f1fba9d0" />
-                            <attribute name="typepass_visit" value="1" id="3367" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_visit" value="1" id="3368" addr="0x7ff9f1fba9d0" />
-                            <attribute name="kind" value="class" id="3369" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_name" value="InfoTagRadioRDS" id="3370" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_default_constructor" value="1" id="3371" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_has_constructor" value="1" id="3372" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_public_constructor" value="1" id="3373" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_has_destructor" value="1" id="3374" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_default_destructor" value="1" id="3375" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_copy_constructor" value="1" id="3376" addr="0x7ff9f1fba9d0" />
-                            <attribute name="privatebaselist" value="0x7ff9f1fa3490" id="3377" addr="0x7ff9f1fa3490" />
-                            <attribute name="protectedbaselist" value="0x7ff9f1fa3470" id="3378" addr="0x7ff9f1fa3470" />
-                            <baselist id="3379" addr="0x7ff9f1fa3450" >
-                                <base name="AddonClass" id="3380" addr="0x7ff9f1fa33d0" />
+                    <class id="3361" addr="0x7fdf084fa4b0" >
+                        <attributelist id="3362" addr="0x7fdf084fa4b0" >
+                            <attribute name="name" value="XBMCAddon::xbmc::InfoTagRadioRDS" id="3363" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="3364" addr="0x7fdf084e12b0" />
+                            <attribute name="symtab" value="0x7fdf084fa5f0" id="3365" addr="0x7fdf084fa5f0" />
+                            <attribute name="allows_typedef" value="1" id="3366" addr="0x7fdf085119d0" />
+                            <attribute name="typepass_visit" value="1" id="3367" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_visit" value="1" id="3368" addr="0x7fdf085119d0" />
+                            <attribute name="kind" value="class" id="3369" addr="0x7fdf085119d0" />
+                            <attribute name="sym_name" value="InfoTagRadioRDS" id="3370" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_default_constructor" value="1" id="3371" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_has_constructor" value="1" id="3372" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_public_constructor" value="1" id="3373" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_has_destructor" value="1" id="3374" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_default_destructor" value="1" id="3375" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_copy_constructor" value="1" id="3376" addr="0x7fdf085119d0" />
+                            <attribute name="privatebaselist" value="0x7fdf084fa490" id="3377" addr="0x7fdf084fa490" />
+                            <attribute name="protectedbaselist" value="0x7fdf084fa470" id="3378" addr="0x7fdf084fa470" />
+                            <baselist id="3379" addr="0x7fdf084fa450" >
+                                <base name="AddonClass" id="3380" addr="0x7fdf084fa3d0" />
                             </baselist >
-                            <attribute name="module" value="xbmc" id="3381" addr="0x7ff9f1f89430" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="3382" addr="0x7ff9f1fba9d0" />
-                            <typescope id="3383" addr="0x7ff9f1fb7ff0" >
-                                <attributelist id="3384" addr="0x7ff9f1fb7ff0" >
-                                    <attribute name="name" value="InfoTagRadioRDS" id="3385" addr="0x7ff9f1fba9d0" />
-                                    <typetab id="3386" addr="0x7ff9f1fb8010" >
-                                        <attributelist id="3387" addr="0x7ff9f1fb8010" >
+                            <attribute name="module" value="xbmc" id="3381" addr="0x7fdf084e0430" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="3382" addr="0x7fdf085119d0" />
+                            <typescope id="3383" addr="0x7fdf0850eff0" >
+                                <attributelist id="3384" addr="0x7fdf0850eff0" >
+                                    <attribute name="name" value="InfoTagRadioRDS" id="3385" addr="0x7fdf085119d0" />
+                                    <typetab id="3386" addr="0x7fdf0850f010" >
+                                        <attributelist id="3387" addr="0x7fdf0850f010" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7ff9f1fb4d70" id="3388" addr="0x7ff9f1fb4d70" />
-                                    <attribute name="qname" value="XBMCAddon::xbmc::InfoTagRadioRDS" id="3389" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="symtab" value="0x7ff9f1fa35f0" id="3390" addr="0x7ff9f1fa35f0" />
+                                    <attribute name="parent" value="0x7fdf0850bd70" id="3388" addr="0x7fdf0850bd70" />
+                                    <attribute name="qname" value="XBMCAddon::xbmc::InfoTagRadioRDS" id="3389" addr="0x7fdf085119d0" />
+                                    <attribute name="symtab" value="0x7fdf084fa5f0" id="3390" addr="0x7fdf084fa5f0" />
                                 </attributelist >
-                                <typescopesitem id="3391" addr="0x7ff9f1fb7f90" >
-                                    <attributelist id="3392" addr="0x7ff9f1fb7f90" >
+                                <typescopesitem id="3391" addr="0x7fdf0850ef90" >
+                                    <attributelist id="3392" addr="0x7fdf0850ef90" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="3393" addr="0x7ff9f1fb8010" >
-                                    <attributelist id="3394" addr="0x7ff9f1fb8010" >
+                                <typescopesitem id="3393" addr="0x7fdf0850f010" >
+                                    <attributelist id="3394" addr="0x7fdf0850f010" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="3395" addr="0x7ff9f1fb4d70" >
-                                    <attributelist id="3396" addr="0x7ff9f1fb4d70" >
-                                        <attribute name="name" value="xbmc" id="3397" addr="0x7ff9f1fba9d0" />
-                                        <typetab id="3398" addr="0x7ff9f1fb4d90" >
-                                            <attributelist id="3399" addr="0x7ff9f1fb4d90" >
-                                                <attribute name="Monitor" value="Monitor" id="3400" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="3401" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="Keyboard" value="Keyboard" id="3402" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="3403" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="InfoTagVideo" value="InfoTagVideo" id="3404" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="Player" value="Player" id="3405" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="InfoTagMusic" value="InfoTagMusic" id="3406" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="PlayList" value="PlayList" id="3407" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="RenderCapture" value="RenderCapture" id="3408" addr="0x7ff9f1fba9d0" />
+                                <typescopesitem id="3395" addr="0x7fdf0850bd70" >
+                                    <attributelist id="3396" addr="0x7fdf0850bd70" >
+                                        <attribute name="name" value="xbmc" id="3397" addr="0x7fdf085119d0" />
+                                        <typetab id="3398" addr="0x7fdf0850bd90" >
+                                            <attributelist id="3399" addr="0x7fdf0850bd90" >
+                                                <attribute name="Monitor" value="Monitor" id="3400" addr="0x7fdf085119d0" />
+                                                <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="3401" addr="0x7fdf085119d0" />
+                                                <attribute name="Keyboard" value="Keyboard" id="3402" addr="0x7fdf085119d0" />
+                                                <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="3403" addr="0x7fdf085119d0" />
+                                                <attribute name="InfoTagVideo" value="InfoTagVideo" id="3404" addr="0x7fdf085119d0" />
+                                                <attribute name="Player" value="Player" id="3405" addr="0x7fdf085119d0" />
+                                                <attribute name="InfoTagMusic" value="InfoTagMusic" id="3406" addr="0x7fdf085119d0" />
+                                                <attribute name="PlayList" value="PlayList" id="3407" addr="0x7fdf085119d0" />
+                                                <attribute name="RenderCapture" value="RenderCapture" id="3408" addr="0x7fdf085119d0" />
                                             </attributelist >
-                                            <typetabsitem id="3409" addr="0x7ff9f1fb9b10" >
-                                                <attributelist id="3410" addr="0x7ff9f1fb9b10" >
+                                            <typetabsitem id="3409" addr="0x7fdf08510b10" >
+                                                <attributelist id="3410" addr="0x7fdf08510b10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3411" addr="0x7ff9f1fb7f30" >
-                                                <attributelist id="3412" addr="0x7ff9f1fb7f30" >
+                                            <typetabsitem id="3411" addr="0x7fdf0850ef30" >
+                                                <attributelist id="3412" addr="0x7fdf0850ef30" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3413" addr="0x7ff9f1fb8990" >
-                                                <attributelist id="3414" addr="0x7ff9f1fb8990" >
+                                            <typetabsitem id="3413" addr="0x7fdf0850f990" >
+                                                <attributelist id="3414" addr="0x7fdf0850f990" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3415" addr="0x7ff9f1fb5e90" >
-                                                <attributelist id="3416" addr="0x7ff9f1fb5e90" >
+                                            <typetabsitem id="3415" addr="0x7fdf0850ce90" >
+                                                <attributelist id="3416" addr="0x7fdf0850ce90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3417" addr="0x7ff9f1fb8310" >
-                                                <attributelist id="3418" addr="0x7ff9f1fb8310" >
+                                            <typetabsitem id="3417" addr="0x7fdf0850f310" >
+                                                <attributelist id="3418" addr="0x7fdf0850f310" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3419" addr="0x7ff9f1fb6050" >
-                                                <attributelist id="3420" addr="0x7ff9f1fb6050" >
+                                            <typetabsitem id="3419" addr="0x7fdf0850d050" >
+                                                <attributelist id="3420" addr="0x7fdf0850d050" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3421" addr="0x7ff9f1fb7b50" >
-                                                <attributelist id="3422" addr="0x7ff9f1fb7b50" >
+                                            <typetabsitem id="3421" addr="0x7fdf0850eb50" >
+                                                <attributelist id="3422" addr="0x7fdf0850eb50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3423" addr="0x7ff9f1fb91b0" >
-                                                <attributelist id="3424" addr="0x7ff9f1fb91b0" >
+                                            <typetabsitem id="3423" addr="0x7fdf085101b0" >
+                                                <attributelist id="3424" addr="0x7fdf085101b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3425" addr="0x7ff9f1fb7490" >
-                                                <attributelist id="3426" addr="0x7ff9f1fb7490" >
+                                            <typetabsitem id="3425" addr="0x7fdf0850e490" >
+                                                <attributelist id="3426" addr="0x7fdf0850e490" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7ff9f1fb4990" id="3427" addr="0x7ff9f1fb4990" />
-                                        <attribute name="qname" value="XBMCAddon::xbmc" id="3428" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="symtab" value="0x7ff9f1f8a2b0" id="3429" addr="0x7ff9f1f8a2b0" />
+                                        <attribute name="parent" value="0x7fdf0850b990" id="3427" addr="0x7fdf0850b990" />
+                                        <attribute name="qname" value="XBMCAddon::xbmc" id="3428" addr="0x7fdf085119d0" />
+                                        <attribute name="symtab" value="0x7fdf084e12b0" id="3429" addr="0x7fdf084e12b0" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="3430" addr="0x7ff9f1fb8030" >
-                                    <attributelist id="3431" addr="0x7ff9f1fb8030" >
+                                <typescopesitem id="3430" addr="0x7fdf0850f030" >
+                                    <attributelist id="3431" addr="0x7fdf0850f030" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="3432" addr="0x7ff9f1fa35f0" >
-                                    <attributelist id="3433" addr="0x7ff9f1fa35f0" >
-                                        <attribute name="name" value="InfoTagRadioRDS" id="3434" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="csymtab" value="0x7ff9f1fa3610" id="3435" addr="0x7ff9f1fa3610" />
-                                        <attribute name="symtab" value="0x7ff9f1fa35b0" id="3436" addr="0x7ff9f1fa35b0" />
+                                <typescopesitem id="3432" addr="0x7fdf084fa5f0" >
+                                    <attributelist id="3433" addr="0x7fdf084fa5f0" >
+                                        <attribute name="name" value="InfoTagRadioRDS" id="3434" addr="0x7fdf085119d0" />
+                                        <attribute name="csymtab" value="0x7fdf084fa610" id="3435" addr="0x7fdf084fa610" />
+                                        <attribute name="symtab" value="0x7fdf084fa5b0" id="3436" addr="0x7fdf084fa5b0" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <access id="3437" addr="0x7ff9f1fa3570" >
-                            <attributelist id="3438" addr="0x7ff9f1fa3570" >
-                                <attribute name="kind" value="private" id="3439" addr="0x7ff9f1fba9d0" />
+                        <access id="3437" addr="0x7fdf084fa570" >
+                            <attributelist id="3438" addr="0x7fdf084fa570" >
+                                <attribute name="kind" value="private" id="3439" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </access >
-                        <cdecl id="3440" addr="0x7ff9f1fa3770" >
-                            <attributelist id="3441" addr="0x7ff9f1fa3770" >
-                                <attribute name="ismember" value="1" id="3442" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="infoTag" id="3443" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="" id="3444" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="private" id="3445" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="variable" id="3446" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="PVR::CPVRRadioRDSInfoTagPtr" id="3447" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa35f0" id="3448" addr="0x7ff9f1fa35f0" />
+                        <cdecl id="3440" addr="0x7fdf084fa770" >
+                            <attributelist id="3441" addr="0x7fdf084fa770" >
+                                <attribute name="ismember" value="1" id="3442" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="infoTag" id="3443" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="" id="3444" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="private" id="3445" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="variable" id="3446" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="PVR::CPVRRadioRDSInfoTagPtr" id="3447" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fa5f0" id="3448" addr="0x7fdf084fa5f0" />
                             </attributelist >
                          
                         </cdecl >
-                        <access id="3449" addr="0x7ff9f1fa3850" >
-                            <attributelist id="3450" addr="0x7ff9f1fa3850" >
-                                <attribute name="kind" value="public" id="3451" addr="0x7ff9f1fba9d0" />
+                        <access id="3449" addr="0x7fdf084fa850" >
+                            <attributelist id="3450" addr="0x7fdf084fa850" >
+                                <attribute name="kind" value="public" id="3451" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="3452" addr="0x7ff9f1fa3970" >
-                            <attributelist id="3453" addr="0x7ff9f1fa3970" >
-                                <attribute name="ismember" value="1" id="3454" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="InfoTagRadioRDS" id="3455" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="InfoTagRadioRDS" id="3456" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3457" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3458" addr="0x7ff9f1fba9d0" />
-                                <attribute name="feature_new" value="1" id="3459" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa35f0" id="3460" addr="0x7ff9f1fa35f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3461" addr="0x7ff9f1fba9d0" />
+                        <constructor id="3452" addr="0x7fdf084fa970" >
+                            <attributelist id="3453" addr="0x7fdf084fa970" >
+                                <attribute name="ismember" value="1" id="3454" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="InfoTagRadioRDS" id="3455" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="InfoTagRadioRDS" id="3456" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3457" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3458" addr="0x7fdf085119d0" />
+                                <attribute name="feature_new" value="1" id="3459" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fa5f0" id="3460" addr="0x7fdf084fa5f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3461" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </constructor >
-                        <destructor id="3462" addr="0x7ff9f1fa3ad0" >
-                            <attributelist id="3463" addr="0x7ff9f1fa3ad0" >
-                                <attribute name="ismember" value="1" id="3464" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="~InfoTagRadioRDS" id="3465" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="~InfoTagRadioRDS" id="3466" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3467" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3468" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa35f0" id="3469" addr="0x7ff9f1fa35f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3470" addr="0x7ff9f1fba9d0" />
+                        <destructor id="3462" addr="0x7fdf084faad0" >
+                            <attributelist id="3463" addr="0x7fdf084faad0" >
+                                <attribute name="ismember" value="1" id="3464" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="~InfoTagRadioRDS" id="3465" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="~InfoTagRadioRDS" id="3466" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3467" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3468" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fa5f0" id="3469" addr="0x7fdf084fa5f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3470" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </destructor >
-                        <cdecl id="3471" addr="0x7ff9f1fa3c90" >
-                            <attributelist id="3472" addr="0x7ff9f1fa3c90" >
-                                <attribute name="ismember" value="1" id="3473" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getTitle" id="3474" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getTitle" id="3475" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3476" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3477" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3478" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3479" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa35f0" id="3480" addr="0x7ff9f1fa35f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3481" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3482" addr="0x7ff9f1fa3e70" >
-                            <attributelist id="3483" addr="0x7ff9f1fa3e70" >
-                                <attribute name="ismember" value="1" id="3484" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getBand" id="3485" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getBand" id="3486" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3487" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3488" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3489" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3490" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa35f0" id="3491" addr="0x7ff9f1fa35f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3492" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3493" addr="0x7ff9f1fa4050" >
-                            <attributelist id="3494" addr="0x7ff9f1fa4050" >
-                                <attribute name="ismember" value="1" id="3495" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getArtist" id="3496" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getArtist" id="3497" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3498" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3499" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3500" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3501" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa35f0" id="3502" addr="0x7ff9f1fa35f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3503" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3504" addr="0x7ff9f1fa4230" >
-                            <attributelist id="3505" addr="0x7ff9f1fa4230" >
-                                <attribute name="ismember" value="1" id="3506" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getComposer" id="3507" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getComposer" id="3508" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3509" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3510" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3511" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3512" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa35f0" id="3513" addr="0x7ff9f1fa35f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3514" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3515" addr="0x7ff9f1fa4410" >
-                            <attributelist id="3516" addr="0x7ff9f1fa4410" >
-                                <attribute name="ismember" value="1" id="3517" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getConductor" id="3518" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getConductor" id="3519" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3520" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3521" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3522" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3523" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa35f0" id="3524" addr="0x7ff9f1fa35f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3525" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3526" addr="0x7ff9f1fa45f0" >
-                            <attributelist id="3527" addr="0x7ff9f1fa45f0" >
-                                <attribute name="ismember" value="1" id="3528" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getAlbum" id="3529" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getAlbum" id="3530" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3531" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3532" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3533" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3534" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa35f0" id="3535" addr="0x7ff9f1fa35f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3536" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3537" addr="0x7ff9f1fa47d0" >
-                            <attributelist id="3538" addr="0x7ff9f1fa47d0" >
-                                <attribute name="ismember" value="1" id="3539" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getComment" id="3540" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getComment" id="3541" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3542" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3543" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3544" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3545" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa35f0" id="3546" addr="0x7ff9f1fa35f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3547" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3548" addr="0x7ff9f1fa49b0" >
-                            <attributelist id="3549" addr="0x7ff9f1fa49b0" >
-                                <attribute name="ismember" value="1" id="3550" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getAlbumTrackNumber" id="3551" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getAlbumTrackNumber" id="3552" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3553" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3554" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3555" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="int" id="3556" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa35f0" id="3557" addr="0x7ff9f1fa35f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3558" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3559" addr="0x7ff9f1fa4b90" >
-                            <attributelist id="3560" addr="0x7ff9f1fa4b90" >
-                                <attribute name="ismember" value="1" id="3561" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getInfoNews" id="3562" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getInfoNews" id="3563" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3564" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3565" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3566" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3567" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa35f0" id="3568" addr="0x7ff9f1fa35f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3569" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3570" addr="0x7ff9f1fa4d70" >
-                            <attributelist id="3571" addr="0x7ff9f1fa4d70" >
-                                <attribute name="ismember" value="1" id="3572" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getInfoNewsLocal" id="3573" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getInfoNewsLocal" id="3574" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3575" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3576" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3577" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3578" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa35f0" id="3579" addr="0x7ff9f1fa35f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3580" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3581" addr="0x7ff9f1fa4f50" >
-                            <attributelist id="3582" addr="0x7ff9f1fa4f50" >
-                                <attribute name="ismember" value="1" id="3583" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getInfoSport" id="3584" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getInfoSport" id="3585" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3586" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3587" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3588" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3589" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa35f0" id="3590" addr="0x7ff9f1fa35f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3591" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3592" addr="0x7ff9f1fa5130" >
-                            <attributelist id="3593" addr="0x7ff9f1fa5130" >
-                                <attribute name="ismember" value="1" id="3594" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getInfoStock" id="3595" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getInfoStock" id="3596" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3597" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3598" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3599" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3600" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa35f0" id="3601" addr="0x7ff9f1fa35f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3602" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3603" addr="0x7ff9f1fa5310" >
-                            <attributelist id="3604" addr="0x7ff9f1fa5310" >
-                                <attribute name="ismember" value="1" id="3605" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getInfoWeather" id="3606" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getInfoWeather" id="3607" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3608" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3609" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3610" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3611" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa35f0" id="3612" addr="0x7ff9f1fa35f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3613" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3614" addr="0x7ff9f1fa54f0" >
-                            <attributelist id="3615" addr="0x7ff9f1fa54f0" >
-                                <attribute name="ismember" value="1" id="3616" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getInfoHoroscope" id="3617" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getInfoHoroscope" id="3618" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3619" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3620" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3621" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3622" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa35f0" id="3623" addr="0x7ff9f1fa35f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3624" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3625" addr="0x7ff9f1fa56d0" >
-                            <attributelist id="3626" addr="0x7ff9f1fa56d0" >
-                                <attribute name="ismember" value="1" id="3627" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getInfoCinema" id="3628" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getInfoCinema" id="3629" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3630" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3631" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3632" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3633" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa35f0" id="3634" addr="0x7ff9f1fa35f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3635" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3636" addr="0x7ff9f1fa58b0" >
-                            <attributelist id="3637" addr="0x7ff9f1fa58b0" >
-                                <attribute name="ismember" value="1" id="3638" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getInfoLottery" id="3639" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getInfoLottery" id="3640" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3641" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3642" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3643" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3644" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa35f0" id="3645" addr="0x7ff9f1fa35f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3646" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3647" addr="0x7ff9f1fa5a90" >
-                            <attributelist id="3648" addr="0x7ff9f1fa5a90" >
-                                <attribute name="ismember" value="1" id="3649" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getInfoOther" id="3650" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getInfoOther" id="3651" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3652" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3653" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3654" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3655" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa35f0" id="3656" addr="0x7ff9f1fa35f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3657" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3658" addr="0x7ff9f1fa5c70" >
-                            <attributelist id="3659" addr="0x7ff9f1fa5c70" >
-                                <attribute name="ismember" value="1" id="3660" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getEditorialStaff" id="3661" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getEditorialStaff" id="3662" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3663" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3664" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3665" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3666" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa35f0" id="3667" addr="0x7ff9f1fa35f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3668" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3669" addr="0x7ff9f1fa5e50" >
-                            <attributelist id="3670" addr="0x7ff9f1fa5e50" >
-                                <attribute name="ismember" value="1" id="3671" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getProgStation" id="3672" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getProgStation" id="3673" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3674" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3675" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3676" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3677" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa35f0" id="3678" addr="0x7ff9f1fa35f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3679" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3680" addr="0x7ff9f1fa6030" >
-                            <attributelist id="3681" addr="0x7ff9f1fa6030" >
-                                <attribute name="ismember" value="1" id="3682" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getProgStyle" id="3683" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getProgStyle" id="3684" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3685" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3686" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3687" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3688" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa35f0" id="3689" addr="0x7ff9f1fa35f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3690" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3691" addr="0x7ff9f1fa6210" >
-                            <attributelist id="3692" addr="0x7ff9f1fa6210" >
-                                <attribute name="ismember" value="1" id="3693" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getProgHost" id="3694" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getProgHost" id="3695" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3696" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3697" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3698" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3699" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa35f0" id="3700" addr="0x7ff9f1fa35f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3701" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3702" addr="0x7ff9f1fa63f0" >
-                            <attributelist id="3703" addr="0x7ff9f1fa63f0" >
-                                <attribute name="ismember" value="1" id="3704" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getProgWebsite" id="3705" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getProgWebsite" id="3706" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3707" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3708" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3709" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3710" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa35f0" id="3711" addr="0x7ff9f1fa35f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3712" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3713" addr="0x7ff9f1fa65d0" >
-                            <attributelist id="3714" addr="0x7ff9f1fa65d0" >
-                                <attribute name="ismember" value="1" id="3715" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getProgNow" id="3716" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getProgNow" id="3717" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3718" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3719" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3720" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3721" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa35f0" id="3722" addr="0x7ff9f1fa35f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3723" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3724" addr="0x7ff9f1fa67b0" >
-                            <attributelist id="3725" addr="0x7ff9f1fa67b0" >
-                                <attribute name="ismember" value="1" id="3726" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getProgNext" id="3727" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getProgNext" id="3728" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3729" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3730" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3731" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3732" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa35f0" id="3733" addr="0x7ff9f1fa35f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3734" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3735" addr="0x7ff9f1fa6990" >
-                            <attributelist id="3736" addr="0x7ff9f1fa6990" >
-                                <attribute name="ismember" value="1" id="3737" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getPhoneHotline" id="3738" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getPhoneHotline" id="3739" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3740" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3741" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3742" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3743" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa35f0" id="3744" addr="0x7ff9f1fa35f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3745" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3746" addr="0x7ff9f1fa6b70" >
-                            <attributelist id="3747" addr="0x7ff9f1fa6b70" >
-                                <attribute name="ismember" value="1" id="3748" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getEMailHotline" id="3749" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getEMailHotline" id="3750" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3751" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3752" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3753" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3754" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa35f0" id="3755" addr="0x7ff9f1fa35f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3756" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3757" addr="0x7ff9f1fa6d50" >
-                            <attributelist id="3758" addr="0x7ff9f1fa6d50" >
-                                <attribute name="ismember" value="1" id="3759" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getPhoneStudio" id="3760" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getPhoneStudio" id="3761" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3762" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3763" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3764" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3765" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa35f0" id="3766" addr="0x7ff9f1fa35f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3767" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3768" addr="0x7ff9f1fa6f30" >
-                            <attributelist id="3769" addr="0x7ff9f1fa6f30" >
-                                <attribute name="ismember" value="1" id="3770" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getEMailStudio" id="3771" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getEMailStudio" id="3772" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3773" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3774" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3775" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3776" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa35f0" id="3777" addr="0x7ff9f1fa35f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3778" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3779" addr="0x7ff9f1fa7110" >
-                            <attributelist id="3780" addr="0x7ff9f1fa7110" >
-                                <attribute name="ismember" value="1" id="3781" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getSMSStudio" id="3782" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getSMSStudio" id="3783" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3784" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3785" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3786" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3787" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa35f0" id="3788" addr="0x7ff9f1fa35f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3789" addr="0x7ff9f1fba9d0" />
+                        <cdecl id="3471" addr="0x7fdf084fac90" >
+                            <attributelist id="3472" addr="0x7fdf084fac90" >
+                                <attribute name="ismember" value="1" id="3473" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getTitle" id="3474" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getTitle" id="3475" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3476" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3477" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3478" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3479" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fa5f0" id="3480" addr="0x7fdf084fa5f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3481" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3482" addr="0x7fdf084fae70" >
+                            <attributelist id="3483" addr="0x7fdf084fae70" >
+                                <attribute name="ismember" value="1" id="3484" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getBand" id="3485" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getBand" id="3486" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3487" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3488" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3489" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3490" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fa5f0" id="3491" addr="0x7fdf084fa5f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3492" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3493" addr="0x7fdf084fb050" >
+                            <attributelist id="3494" addr="0x7fdf084fb050" >
+                                <attribute name="ismember" value="1" id="3495" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getArtist" id="3496" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getArtist" id="3497" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3498" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3499" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3500" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3501" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fa5f0" id="3502" addr="0x7fdf084fa5f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3503" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3504" addr="0x7fdf084fb230" >
+                            <attributelist id="3505" addr="0x7fdf084fb230" >
+                                <attribute name="ismember" value="1" id="3506" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getComposer" id="3507" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getComposer" id="3508" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3509" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3510" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3511" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3512" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fa5f0" id="3513" addr="0x7fdf084fa5f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3514" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3515" addr="0x7fdf084fb410" >
+                            <attributelist id="3516" addr="0x7fdf084fb410" >
+                                <attribute name="ismember" value="1" id="3517" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getConductor" id="3518" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getConductor" id="3519" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3520" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3521" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3522" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3523" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fa5f0" id="3524" addr="0x7fdf084fa5f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3525" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3526" addr="0x7fdf084fb5f0" >
+                            <attributelist id="3527" addr="0x7fdf084fb5f0" >
+                                <attribute name="ismember" value="1" id="3528" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getAlbum" id="3529" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getAlbum" id="3530" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3531" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3532" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3533" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3534" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fa5f0" id="3535" addr="0x7fdf084fa5f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3536" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3537" addr="0x7fdf084fb7d0" >
+                            <attributelist id="3538" addr="0x7fdf084fb7d0" >
+                                <attribute name="ismember" value="1" id="3539" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getComment" id="3540" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getComment" id="3541" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3542" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3543" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3544" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3545" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fa5f0" id="3546" addr="0x7fdf084fa5f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3547" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3548" addr="0x7fdf084fb9b0" >
+                            <attributelist id="3549" addr="0x7fdf084fb9b0" >
+                                <attribute name="ismember" value="1" id="3550" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getAlbumTrackNumber" id="3551" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getAlbumTrackNumber" id="3552" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3553" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3554" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3555" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="int" id="3556" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fa5f0" id="3557" addr="0x7fdf084fa5f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3558" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3559" addr="0x7fdf084fbb90" >
+                            <attributelist id="3560" addr="0x7fdf084fbb90" >
+                                <attribute name="ismember" value="1" id="3561" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getInfoNews" id="3562" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getInfoNews" id="3563" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3564" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3565" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3566" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3567" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fa5f0" id="3568" addr="0x7fdf084fa5f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3569" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3570" addr="0x7fdf084fbd70" >
+                            <attributelist id="3571" addr="0x7fdf084fbd70" >
+                                <attribute name="ismember" value="1" id="3572" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getInfoNewsLocal" id="3573" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getInfoNewsLocal" id="3574" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3575" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3576" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3577" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3578" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fa5f0" id="3579" addr="0x7fdf084fa5f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3580" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3581" addr="0x7fdf084fbf50" >
+                            <attributelist id="3582" addr="0x7fdf084fbf50" >
+                                <attribute name="ismember" value="1" id="3583" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getInfoSport" id="3584" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getInfoSport" id="3585" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3586" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3587" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3588" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3589" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fa5f0" id="3590" addr="0x7fdf084fa5f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3591" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3592" addr="0x7fdf084fc130" >
+                            <attributelist id="3593" addr="0x7fdf084fc130" >
+                                <attribute name="ismember" value="1" id="3594" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getInfoStock" id="3595" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getInfoStock" id="3596" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3597" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3598" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3599" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3600" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fa5f0" id="3601" addr="0x7fdf084fa5f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3602" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3603" addr="0x7fdf084fc310" >
+                            <attributelist id="3604" addr="0x7fdf084fc310" >
+                                <attribute name="ismember" value="1" id="3605" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getInfoWeather" id="3606" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getInfoWeather" id="3607" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3608" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3609" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3610" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3611" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fa5f0" id="3612" addr="0x7fdf084fa5f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3613" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3614" addr="0x7fdf084fc4f0" >
+                            <attributelist id="3615" addr="0x7fdf084fc4f0" >
+                                <attribute name="ismember" value="1" id="3616" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getInfoHoroscope" id="3617" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getInfoHoroscope" id="3618" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3619" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3620" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3621" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3622" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fa5f0" id="3623" addr="0x7fdf084fa5f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3624" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3625" addr="0x7fdf084fc6d0" >
+                            <attributelist id="3626" addr="0x7fdf084fc6d0" >
+                                <attribute name="ismember" value="1" id="3627" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getInfoCinema" id="3628" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getInfoCinema" id="3629" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3630" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3631" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3632" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3633" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fa5f0" id="3634" addr="0x7fdf084fa5f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3635" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3636" addr="0x7fdf084fc8b0" >
+                            <attributelist id="3637" addr="0x7fdf084fc8b0" >
+                                <attribute name="ismember" value="1" id="3638" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getInfoLottery" id="3639" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getInfoLottery" id="3640" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3641" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3642" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3643" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3644" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fa5f0" id="3645" addr="0x7fdf084fa5f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3646" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3647" addr="0x7fdf084fca90" >
+                            <attributelist id="3648" addr="0x7fdf084fca90" >
+                                <attribute name="ismember" value="1" id="3649" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getInfoOther" id="3650" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getInfoOther" id="3651" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3652" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3653" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3654" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3655" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fa5f0" id="3656" addr="0x7fdf084fa5f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3657" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3658" addr="0x7fdf084fcc70" >
+                            <attributelist id="3659" addr="0x7fdf084fcc70" >
+                                <attribute name="ismember" value="1" id="3660" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getEditorialStaff" id="3661" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getEditorialStaff" id="3662" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3663" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3664" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3665" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3666" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fa5f0" id="3667" addr="0x7fdf084fa5f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3668" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3669" addr="0x7fdf084fce50" >
+                            <attributelist id="3670" addr="0x7fdf084fce50" >
+                                <attribute name="ismember" value="1" id="3671" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getProgStation" id="3672" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getProgStation" id="3673" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3674" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3675" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3676" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3677" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fa5f0" id="3678" addr="0x7fdf084fa5f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3679" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3680" addr="0x7fdf084fd030" >
+                            <attributelist id="3681" addr="0x7fdf084fd030" >
+                                <attribute name="ismember" value="1" id="3682" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getProgStyle" id="3683" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getProgStyle" id="3684" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3685" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3686" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3687" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3688" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fa5f0" id="3689" addr="0x7fdf084fa5f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3690" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3691" addr="0x7fdf084fd210" >
+                            <attributelist id="3692" addr="0x7fdf084fd210" >
+                                <attribute name="ismember" value="1" id="3693" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getProgHost" id="3694" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getProgHost" id="3695" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3696" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3697" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3698" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3699" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fa5f0" id="3700" addr="0x7fdf084fa5f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3701" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3702" addr="0x7fdf084fd3f0" >
+                            <attributelist id="3703" addr="0x7fdf084fd3f0" >
+                                <attribute name="ismember" value="1" id="3704" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getProgWebsite" id="3705" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getProgWebsite" id="3706" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3707" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3708" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3709" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3710" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fa5f0" id="3711" addr="0x7fdf084fa5f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3712" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3713" addr="0x7fdf084fd5d0" >
+                            <attributelist id="3714" addr="0x7fdf084fd5d0" >
+                                <attribute name="ismember" value="1" id="3715" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getProgNow" id="3716" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getProgNow" id="3717" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3718" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3719" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3720" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3721" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fa5f0" id="3722" addr="0x7fdf084fa5f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3723" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3724" addr="0x7fdf084fd7b0" >
+                            <attributelist id="3725" addr="0x7fdf084fd7b0" >
+                                <attribute name="ismember" value="1" id="3726" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getProgNext" id="3727" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getProgNext" id="3728" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3729" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3730" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3731" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3732" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fa5f0" id="3733" addr="0x7fdf084fa5f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3734" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3735" addr="0x7fdf084fd990" >
+                            <attributelist id="3736" addr="0x7fdf084fd990" >
+                                <attribute name="ismember" value="1" id="3737" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getPhoneHotline" id="3738" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getPhoneHotline" id="3739" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3740" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3741" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3742" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3743" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fa5f0" id="3744" addr="0x7fdf084fa5f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3745" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3746" addr="0x7fdf084fdb70" >
+                            <attributelist id="3747" addr="0x7fdf084fdb70" >
+                                <attribute name="ismember" value="1" id="3748" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getEMailHotline" id="3749" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getEMailHotline" id="3750" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3751" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3752" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3753" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3754" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fa5f0" id="3755" addr="0x7fdf084fa5f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3756" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3757" addr="0x7fdf084fdd50" >
+                            <attributelist id="3758" addr="0x7fdf084fdd50" >
+                                <attribute name="ismember" value="1" id="3759" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getPhoneStudio" id="3760" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getPhoneStudio" id="3761" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3762" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3763" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3764" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3765" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fa5f0" id="3766" addr="0x7fdf084fa5f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3767" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3768" addr="0x7fdf084fdf30" >
+                            <attributelist id="3769" addr="0x7fdf084fdf30" >
+                                <attribute name="ismember" value="1" id="3770" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getEMailStudio" id="3771" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getEMailStudio" id="3772" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3773" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3774" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3775" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3776" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fa5f0" id="3777" addr="0x7fdf084fa5f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3778" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3779" addr="0x7fdf084fe110" >
+                            <attributelist id="3780" addr="0x7fdf084fe110" >
+                                <attribute name="ismember" value="1" id="3781" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getSMSStudio" id="3782" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getSMSStudio" id="3783" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3784" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3785" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3786" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3787" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fa5f0" id="3788" addr="0x7fdf084fa5f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3789" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </cdecl >
@@ -5335,781 +5335,781 @@
                 </namespace >
             </namespace >
         </include >
-        <include id="3790" addr="0x7ff9f1fa7330" >
-            <attributelist id="3791" addr="0x7ff9f1fa7330" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/InfoTagVideo.h" id="3792" addr="0x7ff9f1fba9d0" />
+        <include id="3790" addr="0x7fdf084fe330" >
+            <attributelist id="3791" addr="0x7fdf084fe330" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/InfoTagVideo.h" id="3792" addr="0x7fdf085119d0" />
             </attributelist >
 
-            <namespace id="3793" addr="0x7ff9f1fa73d0" >
-                <attributelist id="3794" addr="0x7ff9f1fa73d0" >
-                    <attribute name="sym_name" value="XBMCAddon" id="3795" addr="0x7ff9f1fba9d0" />
-                    <attribute name="name" value="XBMCAddon" id="3796" addr="0x7ff9f1fba9d0" />
-                    <attribute name="sym_previousSibling" value="0x7ff9f1fa32b0" id="3797" addr="0x7ff9f1fa32b0" />
-                    <attribute name="csym_nextSibling" value="0x7ff9f1fabad0" id="3798" addr="0x7ff9f1fabad0" />
-                    <attribute name="sym_nextSibling" value="0x7ff9f1fabad0" id="3799" addr="0x7ff9f1fabad0" />
-                    <typescope id="3800" addr="0x7ff9f1fb4990" >
-                        <attributelist id="3801" addr="0x7ff9f1fb4990" >
-                            <attribute name="name" value="XBMCAddon" id="3802" addr="0x7ff9f1fba9d0" />
-                            <typetab id="3803" addr="0x7ff9f1fb49d0" >
-                                <attributelist id="3804" addr="0x7ff9f1fb49d0" >
-                                    <attribute name="String" value="std::string" id="3805" addr="0x7ff9f1fba9d0" />
+            <namespace id="3793" addr="0x7fdf084fe3d0" >
+                <attributelist id="3794" addr="0x7fdf084fe3d0" >
+                    <attribute name="sym_name" value="XBMCAddon" id="3795" addr="0x7fdf085119d0" />
+                    <attribute name="name" value="XBMCAddon" id="3796" addr="0x7fdf085119d0" />
+                    <attribute name="sym_previousSibling" value="0x7fdf084fa2b0" id="3797" addr="0x7fdf084fa2b0" />
+                    <attribute name="csym_nextSibling" value="0x7fdf08502ad0" id="3798" addr="0x7fdf08502ad0" />
+                    <attribute name="sym_nextSibling" value="0x7fdf08502ad0" id="3799" addr="0x7fdf08502ad0" />
+                    <typescope id="3800" addr="0x7fdf0850b990" >
+                        <attributelist id="3801" addr="0x7fdf0850b990" >
+                            <attribute name="name" value="XBMCAddon" id="3802" addr="0x7fdf085119d0" />
+                            <typetab id="3803" addr="0x7fdf0850b9d0" >
+                                <attributelist id="3804" addr="0x7fdf0850b9d0" >
+                                    <attribute name="String" value="std::string" id="3805" addr="0x7fdf085119d0" />
                                 </attributelist >
-                                <typetabsitem id="3806" addr="0x7ff9f1fb4bb0" >
-                                    <attributelist id="3807" addr="0x7ff9f1fb4bb0" >
+                                <typetabsitem id="3806" addr="0x7fdf0850bbb0" >
+                                    <attributelist id="3807" addr="0x7fdf0850bbb0" >
                                     </attributelist >
                                 </typetabsitem >
                             </typetab >
-                            <attribute name="parent" value="0x7ff9f1f72a30" id="3808" addr="0x7ff9f1f72a30" />
-                            <attribute name="qname" value="XBMCAddon" id="3809" addr="0x7ff9f1fba9d0" />
-                            <attribute name="symtab" value="0x7ff9f1f89bb0" id="3810" addr="0x7ff9f1f89bb0" />
+                            <attribute name="parent" value="0x7fdf084c9a30" id="3808" addr="0x7fdf084c9a30" />
+                            <attribute name="qname" value="XBMCAddon" id="3809" addr="0x7fdf085119d0" />
+                            <attribute name="symtab" value="0x7fdf084e0bb0" id="3810" addr="0x7fdf084e0bb0" />
                         </attributelist >
-                        <typescopesitem id="3811" addr="0x7ff9f1f89b70" >
-                            <attributelist id="3812" addr="0x7ff9f1f89b70" >
+                        <typescopesitem id="3811" addr="0x7fdf084e0b70" >
+                            <attributelist id="3812" addr="0x7fdf084e0b70" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="3813" addr="0x7ff9f1fb49d0" >
-                            <attributelist id="3814" addr="0x7ff9f1fb49d0" >
-                                <attribute name="String" value="std::string" id="3815" addr="0x7ff9f1fba9d0" />
+                        <typescopesitem id="3813" addr="0x7fdf0850b9d0" >
+                            <attributelist id="3814" addr="0x7fdf0850b9d0" >
+                                <attribute name="String" value="std::string" id="3815" addr="0x7fdf085119d0" />
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="3816" addr="0x7ff9f1f72a30" >
-                            <attributelist id="3817" addr="0x7ff9f1f72a30" >
-                                <attribute name="name" value="" id="3818" addr="0x7ff9f1fba9d0" />
-                                <typetab id="3819" addr="0x7ff9f1f72a90" >
-                                    <attributelist id="3820" addr="0x7ff9f1f72a90" >
-                                        <attribute name="CGUIDialogKeyboardGeneric" value="CGUIDialogKeyboardGeneric" id="3821" addr="0x7ff9f1fba9d0" />
+                        <typescopesitem id="3816" addr="0x7fdf084c9a30" >
+                            <attributelist id="3817" addr="0x7fdf084c9a30" >
+                                <attribute name="name" value="" id="3818" addr="0x7fdf085119d0" />
+                                <typetab id="3819" addr="0x7fdf084c9a90" >
+                                    <attributelist id="3820" addr="0x7fdf084c9a90" >
+                                        <attribute name="CGUIDialogKeyboardGeneric" value="CGUIDialogKeyboardGeneric" id="3821" addr="0x7fdf085119d0" />
                                     </attributelist >
-                                    <typetabsitem id="3822" addr="0x7ff9f1fb7950" >
-                                        <attributelist id="3823" addr="0x7ff9f1fb7950" >
+                                    <typetabsitem id="3822" addr="0x7fdf0850e950" >
+                                        <attributelist id="3823" addr="0x7fdf0850e950" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="3824" addr="0x7ff9f1fb4ad0" >
-                            <attributelist id="3825" addr="0x7ff9f1fb4ad0" >
+                        <typescopesitem id="3824" addr="0x7fdf0850bad0" >
+                            <attributelist id="3825" addr="0x7fdf0850bad0" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="3826" addr="0x7ff9f1f89bb0" >
-                            <attributelist id="3827" addr="0x7ff9f1f89bb0" >
-                                <attribute name="name" value="XBMCAddon" id="3828" addr="0x7ff9f1fba9d0" />
-                                <attribute name="csymtab" value="0x7ff9f1f89bf0" id="3829" addr="0x7ff9f1f89bf0" />
-                                <attribute name="symtab" value="0x7ff9f1f89b90" id="3830" addr="0x7ff9f1f89b90" />
+                        <typescopesitem id="3826" addr="0x7fdf084e0bb0" >
+                            <attributelist id="3827" addr="0x7fdf084e0bb0" >
+                                <attribute name="name" value="XBMCAddon" id="3828" addr="0x7fdf085119d0" />
+                                <attribute name="csymtab" value="0x7fdf084e0bf0" id="3829" addr="0x7fdf084e0bf0" />
+                                <attribute name="symtab" value="0x7fdf084e0b90" id="3830" addr="0x7fdf084e0b90" />
                             </attributelist >
                         </typescopesitem >
                     </typescope >
-                    <attribute name="symtab" value="0x7ff9f1f89bb0" id="3831" addr="0x7ff9f1f89bb0" />
-                    <attribute name="sym_symtab" value="0x7ff9f1f72950" id="3832" addr="0x7ff9f1f72950" />
+                    <attribute name="symtab" value="0x7fdf084e0bb0" id="3831" addr="0x7fdf084e0bb0" />
+                    <attribute name="sym_symtab" value="0x7fdf084c9950" id="3832" addr="0x7fdf084c9950" />
                 </attributelist >
 
-                <namespace id="3833" addr="0x7ff9f1fa7450" >
-                    <attributelist id="3834" addr="0x7ff9f1fa7450" >
-                        <attribute name="feature_knownbasetypes" value="AddonClass,IPlayerCallback,AddonCallback" id="3835" addr="0x7ff9f1fba9d0" />
-                        <attribute name="name" value="xbmc" id="3836" addr="0x7ff9f1fba9d0" />
-                        <attribute name="sym_symtab" value="0x7ff9f1f89bb0" id="3837" addr="0x7ff9f1f89bb0" />
-                        <attribute name="symtab" value="0x7ff9f1f8a2b0" id="3838" addr="0x7ff9f1f8a2b0" />
-                        <attribute name="sym_nextSibling" value="0x7ff9f1fabb50" id="3839" addr="0x7ff9f1fabb50" />
-                        <attribute name="csym_nextSibling" value="0x7ff9f1fabb50" id="3840" addr="0x7ff9f1fabb50" />
-                        <attribute name="sym_previousSibling" value="0x7ff9f1fa3330" id="3841" addr="0x7ff9f1fa3330" />
-                        <attribute name="feature_knownapitypes" value="XBMCAddon::xbmcgui::ListItem,XBMCAddon::xbmc::PlayListItem" id="3842" addr="0x7ff9f1fba9d0" />
-                        <attribute name="sym_name" value="xbmc" id="3843" addr="0x7ff9f1fba9d0" />
-                        <typescope id="3844" addr="0x7ff9f1fb4d70" >
-                            <attributelist id="3845" addr="0x7ff9f1fb4d70" >
-                                <attribute name="name" value="xbmc" id="3846" addr="0x7ff9f1fba9d0" />
-                                <typetab id="3847" addr="0x7ff9f1fb4d90" >
-                                    <attributelist id="3848" addr="0x7ff9f1fb4d90" >
-                                        <attribute name="Monitor" value="Monitor" id="3849" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="3850" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="Keyboard" value="Keyboard" id="3851" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="3852" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="InfoTagVideo" value="InfoTagVideo" id="3853" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="Player" value="Player" id="3854" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="InfoTagMusic" value="InfoTagMusic" id="3855" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="PlayList" value="PlayList" id="3856" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="RenderCapture" value="RenderCapture" id="3857" addr="0x7ff9f1fba9d0" />
+                <namespace id="3833" addr="0x7fdf084fe450" >
+                    <attributelist id="3834" addr="0x7fdf084fe450" >
+                        <attribute name="feature_knownbasetypes" value="AddonClass,IPlayerCallback,AddonCallback" id="3835" addr="0x7fdf085119d0" />
+                        <attribute name="name" value="xbmc" id="3836" addr="0x7fdf085119d0" />
+                        <attribute name="sym_symtab" value="0x7fdf084e0bb0" id="3837" addr="0x7fdf084e0bb0" />
+                        <attribute name="symtab" value="0x7fdf084e12b0" id="3838" addr="0x7fdf084e12b0" />
+                        <attribute name="sym_nextSibling" value="0x7fdf08502b50" id="3839" addr="0x7fdf08502b50" />
+                        <attribute name="csym_nextSibling" value="0x7fdf08502b50" id="3840" addr="0x7fdf08502b50" />
+                        <attribute name="sym_previousSibling" value="0x7fdf084fa330" id="3841" addr="0x7fdf084fa330" />
+                        <attribute name="feature_knownapitypes" value="XBMCAddon::xbmcgui::ListItem,XBMCAddon::xbmc::PlayListItem" id="3842" addr="0x7fdf085119d0" />
+                        <attribute name="sym_name" value="xbmc" id="3843" addr="0x7fdf085119d0" />
+                        <typescope id="3844" addr="0x7fdf0850bd70" >
+                            <attributelist id="3845" addr="0x7fdf0850bd70" >
+                                <attribute name="name" value="xbmc" id="3846" addr="0x7fdf085119d0" />
+                                <typetab id="3847" addr="0x7fdf0850bd90" >
+                                    <attributelist id="3848" addr="0x7fdf0850bd90" >
+                                        <attribute name="Monitor" value="Monitor" id="3849" addr="0x7fdf085119d0" />
+                                        <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="3850" addr="0x7fdf085119d0" />
+                                        <attribute name="Keyboard" value="Keyboard" id="3851" addr="0x7fdf085119d0" />
+                                        <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="3852" addr="0x7fdf085119d0" />
+                                        <attribute name="InfoTagVideo" value="InfoTagVideo" id="3853" addr="0x7fdf085119d0" />
+                                        <attribute name="Player" value="Player" id="3854" addr="0x7fdf085119d0" />
+                                        <attribute name="InfoTagMusic" value="InfoTagMusic" id="3855" addr="0x7fdf085119d0" />
+                                        <attribute name="PlayList" value="PlayList" id="3856" addr="0x7fdf085119d0" />
+                                        <attribute name="RenderCapture" value="RenderCapture" id="3857" addr="0x7fdf085119d0" />
                                     </attributelist >
-                                    <typetabsitem id="3858" addr="0x7ff9f1fb9b10" >
-                                        <attributelist id="3859" addr="0x7ff9f1fb9b10" >
+                                    <typetabsitem id="3858" addr="0x7fdf08510b10" >
+                                        <attributelist id="3859" addr="0x7fdf08510b10" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="3860" addr="0x7ff9f1fb7f30" >
-                                        <attributelist id="3861" addr="0x7ff9f1fb7f30" >
+                                    <typetabsitem id="3860" addr="0x7fdf0850ef30" >
+                                        <attributelist id="3861" addr="0x7fdf0850ef30" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="3862" addr="0x7ff9f1fb8990" >
-                                        <attributelist id="3863" addr="0x7ff9f1fb8990" >
+                                    <typetabsitem id="3862" addr="0x7fdf0850f990" >
+                                        <attributelist id="3863" addr="0x7fdf0850f990" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="3864" addr="0x7ff9f1fb5e90" >
-                                        <attributelist id="3865" addr="0x7ff9f1fb5e90" >
+                                    <typetabsitem id="3864" addr="0x7fdf0850ce90" >
+                                        <attributelist id="3865" addr="0x7fdf0850ce90" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="3866" addr="0x7ff9f1fb8310" >
-                                        <attributelist id="3867" addr="0x7ff9f1fb8310" >
+                                    <typetabsitem id="3866" addr="0x7fdf0850f310" >
+                                        <attributelist id="3867" addr="0x7fdf0850f310" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="3868" addr="0x7ff9f1fb6050" >
-                                        <attributelist id="3869" addr="0x7ff9f1fb6050" >
+                                    <typetabsitem id="3868" addr="0x7fdf0850d050" >
+                                        <attributelist id="3869" addr="0x7fdf0850d050" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="3870" addr="0x7ff9f1fb7b50" >
-                                        <attributelist id="3871" addr="0x7ff9f1fb7b50" >
+                                    <typetabsitem id="3870" addr="0x7fdf0850eb50" >
+                                        <attributelist id="3871" addr="0x7fdf0850eb50" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="3872" addr="0x7ff9f1fb91b0" >
-                                        <attributelist id="3873" addr="0x7ff9f1fb91b0" >
+                                    <typetabsitem id="3872" addr="0x7fdf085101b0" >
+                                        <attributelist id="3873" addr="0x7fdf085101b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="3874" addr="0x7ff9f1fb7490" >
-                                        <attributelist id="3875" addr="0x7ff9f1fb7490" >
+                                    <typetabsitem id="3874" addr="0x7fdf0850e490" >
+                                        <attributelist id="3875" addr="0x7fdf0850e490" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
-                                <attribute name="parent" value="0x7ff9f1fb4990" id="3876" addr="0x7ff9f1fb4990" />
-                                <attribute name="qname" value="XBMCAddon::xbmc" id="3877" addr="0x7ff9f1fba9d0" />
-                                <attribute name="symtab" value="0x7ff9f1f8a2b0" id="3878" addr="0x7ff9f1f8a2b0" />
+                                <attribute name="parent" value="0x7fdf0850b990" id="3876" addr="0x7fdf0850b990" />
+                                <attribute name="qname" value="XBMCAddon::xbmc" id="3877" addr="0x7fdf085119d0" />
+                                <attribute name="symtab" value="0x7fdf084e12b0" id="3878" addr="0x7fdf084e12b0" />
                             </attributelist >
-                            <typescopesitem id="3879" addr="0x7ff9f1f8a270" >
-                                <attributelist id="3880" addr="0x7ff9f1f8a270" >
+                            <typescopesitem id="3879" addr="0x7fdf084e1270" >
+                                <attributelist id="3880" addr="0x7fdf084e1270" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="3881" addr="0x7ff9f1fb4d90" >
-                                <attributelist id="3882" addr="0x7ff9f1fb4d90" >
-                                    <attribute name="Monitor" value="Monitor" id="3883" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="3884" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="Keyboard" value="Keyboard" id="3885" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="3886" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="InfoTagVideo" value="InfoTagVideo" id="3887" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="Player" value="Player" id="3888" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="InfoTagMusic" value="InfoTagMusic" id="3889" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="PlayList" value="PlayList" id="3890" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="RenderCapture" value="RenderCapture" id="3891" addr="0x7ff9f1fba9d0" />
+                            <typescopesitem id="3881" addr="0x7fdf0850bd90" >
+                                <attributelist id="3882" addr="0x7fdf0850bd90" >
+                                    <attribute name="Monitor" value="Monitor" id="3883" addr="0x7fdf085119d0" />
+                                    <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="3884" addr="0x7fdf085119d0" />
+                                    <attribute name="Keyboard" value="Keyboard" id="3885" addr="0x7fdf085119d0" />
+                                    <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="3886" addr="0x7fdf085119d0" />
+                                    <attribute name="InfoTagVideo" value="InfoTagVideo" id="3887" addr="0x7fdf085119d0" />
+                                    <attribute name="Player" value="Player" id="3888" addr="0x7fdf085119d0" />
+                                    <attribute name="InfoTagMusic" value="InfoTagMusic" id="3889" addr="0x7fdf085119d0" />
+                                    <attribute name="PlayList" value="PlayList" id="3890" addr="0x7fdf085119d0" />
+                                    <attribute name="RenderCapture" value="RenderCapture" id="3891" addr="0x7fdf085119d0" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="3892" addr="0x7ff9f1fb4990" >
-                                <attributelist id="3893" addr="0x7ff9f1fb4990" >
-                                    <attribute name="name" value="XBMCAddon" id="3894" addr="0x7ff9f1fba9d0" />
-                                    <typetab id="3895" addr="0x7ff9f1fb49d0" >
-                                        <attributelist id="3896" addr="0x7ff9f1fb49d0" >
-                                            <attribute name="String" value="std::string" id="3897" addr="0x7ff9f1fba9d0" />
-                                        </attributelist >
-                                        <typetabsitem id="3898" addr="0x7ff9f1fb4bb0" >
-                                            <attributelist id="3899" addr="0x7ff9f1fb4bb0" >
+                            <typescopesitem id="3892" addr="0x7fdf0850b990" >
+                                <attributelist id="3893" addr="0x7fdf0850b990" >
+                                    <attribute name="name" value="XBMCAddon" id="3894" addr="0x7fdf085119d0" />
+                                    <typetab id="3895" addr="0x7fdf0850b9d0" >
+                                        <attributelist id="3896" addr="0x7fdf0850b9d0" >
+                                            <attribute name="String" value="std::string" id="3897" addr="0x7fdf085119d0" />
+                                        </attributelist >
+                                        <typetabsitem id="3898" addr="0x7fdf0850bbb0" >
+                                            <attributelist id="3899" addr="0x7fdf0850bbb0" >
                                             </attributelist >
                                         </typetabsitem >
                                     </typetab >
-                                    <attribute name="parent" value="0x7ff9f1f72a30" id="3900" addr="0x7ff9f1f72a30" />
-                                    <attribute name="qname" value="XBMCAddon" id="3901" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="symtab" value="0x7ff9f1f89bb0" id="3902" addr="0x7ff9f1f89bb0" />
+                                    <attribute name="parent" value="0x7fdf084c9a30" id="3900" addr="0x7fdf084c9a30" />
+                                    <attribute name="qname" value="XBMCAddon" id="3901" addr="0x7fdf085119d0" />
+                                    <attribute name="symtab" value="0x7fdf084e0bb0" id="3902" addr="0x7fdf084e0bb0" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="3903" addr="0x7ff9f1fb4db0" >
-                                <attributelist id="3904" addr="0x7ff9f1fb4db0" >
+                            <typescopesitem id="3903" addr="0x7fdf0850bdb0" >
+                                <attributelist id="3904" addr="0x7fdf0850bdb0" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="3905" addr="0x7ff9f1f8a2b0" >
-                                <attributelist id="3906" addr="0x7ff9f1f8a2b0" >
-                                    <attribute name="name" value="xbmc" id="3907" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="csymtab" value="0x7ff9f1f8a2f0" id="3908" addr="0x7ff9f1f8a2f0" />
-                                    <attribute name="symtab" value="0x7ff9f1f8a290" id="3909" addr="0x7ff9f1f8a290" />
+                            <typescopesitem id="3905" addr="0x7fdf084e12b0" >
+                                <attributelist id="3906" addr="0x7fdf084e12b0" >
+                                    <attribute name="name" value="xbmc" id="3907" addr="0x7fdf085119d0" />
+                                    <attribute name="csymtab" value="0x7fdf084e12f0" id="3908" addr="0x7fdf084e12f0" />
+                                    <attribute name="symtab" value="0x7fdf084e1290" id="3909" addr="0x7fdf084e1290" />
                                 </attributelist >
                             </typescopesitem >
                         </typescope >
                     </attributelist >
 
-                    <class id="3910" addr="0x7ff9f1fa75d0" >
-                        <attributelist id="3911" addr="0x7ff9f1fa75d0" >
-                            <attribute name="name" value="XBMCAddon::xbmc::InfoTagVideo" id="3912" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="3913" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="symtab" value="0x7ff9f1fa7710" id="3914" addr="0x7ff9f1fa7710" />
-                            <attribute name="allows_typedef" value="1" id="3915" addr="0x7ff9f1fba9d0" />
-                            <attribute name="typepass_visit" value="1" id="3916" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_visit" value="1" id="3917" addr="0x7ff9f1fba9d0" />
-                            <attribute name="kind" value="class" id="3918" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_name" value="InfoTagVideo" id="3919" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_default_constructor" value="1" id="3920" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_has_constructor" value="1" id="3921" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_public_constructor" value="1" id="3922" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_has_destructor" value="1" id="3923" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_default_destructor" value="1" id="3924" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_copy_constructor" value="1" id="3925" addr="0x7ff9f1fba9d0" />
-                            <attribute name="privatebaselist" value="0x7ff9f1fa75b0" id="3926" addr="0x7ff9f1fa75b0" />
-                            <attribute name="protectedbaselist" value="0x7ff9f1fa7590" id="3927" addr="0x7ff9f1fa7590" />
-                            <baselist id="3928" addr="0x7ff9f1fa7570" >
-                                <base name="AddonClass" id="3929" addr="0x7ff9f1fa74f0" />
+                    <class id="3910" addr="0x7fdf084fe5d0" >
+                        <attributelist id="3911" addr="0x7fdf084fe5d0" >
+                            <attribute name="name" value="XBMCAddon::xbmc::InfoTagVideo" id="3912" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="3913" addr="0x7fdf084e12b0" />
+                            <attribute name="symtab" value="0x7fdf084fe710" id="3914" addr="0x7fdf084fe710" />
+                            <attribute name="allows_typedef" value="1" id="3915" addr="0x7fdf085119d0" />
+                            <attribute name="typepass_visit" value="1" id="3916" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_visit" value="1" id="3917" addr="0x7fdf085119d0" />
+                            <attribute name="kind" value="class" id="3918" addr="0x7fdf085119d0" />
+                            <attribute name="sym_name" value="InfoTagVideo" id="3919" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_default_constructor" value="1" id="3920" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_has_constructor" value="1" id="3921" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_public_constructor" value="1" id="3922" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_has_destructor" value="1" id="3923" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_default_destructor" value="1" id="3924" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_copy_constructor" value="1" id="3925" addr="0x7fdf085119d0" />
+                            <attribute name="privatebaselist" value="0x7fdf084fe5b0" id="3926" addr="0x7fdf084fe5b0" />
+                            <attribute name="protectedbaselist" value="0x7fdf084fe590" id="3927" addr="0x7fdf084fe590" />
+                            <baselist id="3928" addr="0x7fdf084fe570" >
+                                <base name="AddonClass" id="3929" addr="0x7fdf084fe4f0" />
                             </baselist >
-                            <attribute name="module" value="xbmc" id="3930" addr="0x7ff9f1f89430" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="3931" addr="0x7ff9f1fba9d0" />
-                            <typescope id="3932" addr="0x7ff9f1fb83d0" >
-                                <attributelist id="3933" addr="0x7ff9f1fb83d0" >
-                                    <attribute name="name" value="InfoTagVideo" id="3934" addr="0x7ff9f1fba9d0" />
-                                    <typetab id="3935" addr="0x7ff9f1fb83f0" >
-                                        <attributelist id="3936" addr="0x7ff9f1fb83f0" >
+                            <attribute name="module" value="xbmc" id="3930" addr="0x7fdf084e0430" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="3931" addr="0x7fdf085119d0" />
+                            <typescope id="3932" addr="0x7fdf0850f3d0" >
+                                <attributelist id="3933" addr="0x7fdf0850f3d0" >
+                                    <attribute name="name" value="InfoTagVideo" id="3934" addr="0x7fdf085119d0" />
+                                    <typetab id="3935" addr="0x7fdf0850f3f0" >
+                                        <attributelist id="3936" addr="0x7fdf0850f3f0" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7ff9f1fb4d70" id="3937" addr="0x7ff9f1fb4d70" />
-                                    <attribute name="qname" value="XBMCAddon::xbmc::InfoTagVideo" id="3938" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="symtab" value="0x7ff9f1fa7710" id="3939" addr="0x7ff9f1fa7710" />
+                                    <attribute name="parent" value="0x7fdf0850bd70" id="3937" addr="0x7fdf0850bd70" />
+                                    <attribute name="qname" value="XBMCAddon::xbmc::InfoTagVideo" id="3938" addr="0x7fdf085119d0" />
+                                    <attribute name="symtab" value="0x7fdf084fe710" id="3939" addr="0x7fdf084fe710" />
                                 </attributelist >
-                                <typescopesitem id="3940" addr="0x7ff9f1fb8370" >
-                                    <attributelist id="3941" addr="0x7ff9f1fb8370" >
+                                <typescopesitem id="3940" addr="0x7fdf0850f370" >
+                                    <attributelist id="3941" addr="0x7fdf0850f370" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="3942" addr="0x7ff9f1fb83f0" >
-                                    <attributelist id="3943" addr="0x7ff9f1fb83f0" >
+                                <typescopesitem id="3942" addr="0x7fdf0850f3f0" >
+                                    <attributelist id="3943" addr="0x7fdf0850f3f0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="3944" addr="0x7ff9f1fb4d70" >
-                                    <attributelist id="3945" addr="0x7ff9f1fb4d70" >
-                                        <attribute name="name" value="xbmc" id="3946" addr="0x7ff9f1fba9d0" />
-                                        <typetab id="3947" addr="0x7ff9f1fb4d90" >
-                                            <attributelist id="3948" addr="0x7ff9f1fb4d90" >
-                                                <attribute name="Monitor" value="Monitor" id="3949" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="3950" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="Keyboard" value="Keyboard" id="3951" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="3952" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="InfoTagVideo" value="InfoTagVideo" id="3953" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="Player" value="Player" id="3954" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="InfoTagMusic" value="InfoTagMusic" id="3955" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="PlayList" value="PlayList" id="3956" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="RenderCapture" value="RenderCapture" id="3957" addr="0x7ff9f1fba9d0" />
+                                <typescopesitem id="3944" addr="0x7fdf0850bd70" >
+                                    <attributelist id="3945" addr="0x7fdf0850bd70" >
+                                        <attribute name="name" value="xbmc" id="3946" addr="0x7fdf085119d0" />
+                                        <typetab id="3947" addr="0x7fdf0850bd90" >
+                                            <attributelist id="3948" addr="0x7fdf0850bd90" >
+                                                <attribute name="Monitor" value="Monitor" id="3949" addr="0x7fdf085119d0" />
+                                                <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="3950" addr="0x7fdf085119d0" />
+                                                <attribute name="Keyboard" value="Keyboard" id="3951" addr="0x7fdf085119d0" />
+                                                <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="3952" addr="0x7fdf085119d0" />
+                                                <attribute name="InfoTagVideo" value="InfoTagVideo" id="3953" addr="0x7fdf085119d0" />
+                                                <attribute name="Player" value="Player" id="3954" addr="0x7fdf085119d0" />
+                                                <attribute name="InfoTagMusic" value="InfoTagMusic" id="3955" addr="0x7fdf085119d0" />
+                                                <attribute name="PlayList" value="PlayList" id="3956" addr="0x7fdf085119d0" />
+                                                <attribute name="RenderCapture" value="RenderCapture" id="3957" addr="0x7fdf085119d0" />
                                             </attributelist >
-                                            <typetabsitem id="3958" addr="0x7ff9f1fb9b10" >
-                                                <attributelist id="3959" addr="0x7ff9f1fb9b10" >
+                                            <typetabsitem id="3958" addr="0x7fdf08510b10" >
+                                                <attributelist id="3959" addr="0x7fdf08510b10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3960" addr="0x7ff9f1fb7f30" >
-                                                <attributelist id="3961" addr="0x7ff9f1fb7f30" >
+                                            <typetabsitem id="3960" addr="0x7fdf0850ef30" >
+                                                <attributelist id="3961" addr="0x7fdf0850ef30" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3962" addr="0x7ff9f1fb8990" >
-                                                <attributelist id="3963" addr="0x7ff9f1fb8990" >
+                                            <typetabsitem id="3962" addr="0x7fdf0850f990" >
+                                                <attributelist id="3963" addr="0x7fdf0850f990" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3964" addr="0x7ff9f1fb5e90" >
-                                                <attributelist id="3965" addr="0x7ff9f1fb5e90" >
+                                            <typetabsitem id="3964" addr="0x7fdf0850ce90" >
+                                                <attributelist id="3965" addr="0x7fdf0850ce90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3966" addr="0x7ff9f1fb8310" >
-                                                <attributelist id="3967" addr="0x7ff9f1fb8310" >
+                                            <typetabsitem id="3966" addr="0x7fdf0850f310" >
+                                                <attributelist id="3967" addr="0x7fdf0850f310" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3968" addr="0x7ff9f1fb6050" >
-                                                <attributelist id="3969" addr="0x7ff9f1fb6050" >
+                                            <typetabsitem id="3968" addr="0x7fdf0850d050" >
+                                                <attributelist id="3969" addr="0x7fdf0850d050" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3970" addr="0x7ff9f1fb7b50" >
-                                                <attributelist id="3971" addr="0x7ff9f1fb7b50" >
+                                            <typetabsitem id="3970" addr="0x7fdf0850eb50" >
+                                                <attributelist id="3971" addr="0x7fdf0850eb50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3972" addr="0x7ff9f1fb91b0" >
-                                                <attributelist id="3973" addr="0x7ff9f1fb91b0" >
+                                            <typetabsitem id="3972" addr="0x7fdf085101b0" >
+                                                <attributelist id="3973" addr="0x7fdf085101b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3974" addr="0x7ff9f1fb7490" >
-                                                <attributelist id="3975" addr="0x7ff9f1fb7490" >
+                                            <typetabsitem id="3974" addr="0x7fdf0850e490" >
+                                                <attributelist id="3975" addr="0x7fdf0850e490" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7ff9f1fb4990" id="3976" addr="0x7ff9f1fb4990" />
-                                        <attribute name="qname" value="XBMCAddon::xbmc" id="3977" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="symtab" value="0x7ff9f1f8a2b0" id="3978" addr="0x7ff9f1f8a2b0" />
+                                        <attribute name="parent" value="0x7fdf0850b990" id="3976" addr="0x7fdf0850b990" />
+                                        <attribute name="qname" value="XBMCAddon::xbmc" id="3977" addr="0x7fdf085119d0" />
+                                        <attribute name="symtab" value="0x7fdf084e12b0" id="3978" addr="0x7fdf084e12b0" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="3979" addr="0x7ff9f1fb8410" >
-                                    <attributelist id="3980" addr="0x7ff9f1fb8410" >
+                                <typescopesitem id="3979" addr="0x7fdf0850f410" >
+                                    <attributelist id="3980" addr="0x7fdf0850f410" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="3981" addr="0x7ff9f1fa7710" >
-                                    <attributelist id="3982" addr="0x7ff9f1fa7710" >
-                                        <attribute name="name" value="InfoTagVideo" id="3983" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="csymtab" value="0x7ff9f1fa7730" id="3984" addr="0x7ff9f1fa7730" />
-                                        <attribute name="symtab" value="0x7ff9f1fa76d0" id="3985" addr="0x7ff9f1fa76d0" />
+                                <typescopesitem id="3981" addr="0x7fdf084fe710" >
+                                    <attributelist id="3982" addr="0x7fdf084fe710" >
+                                        <attribute name="name" value="InfoTagVideo" id="3983" addr="0x7fdf085119d0" />
+                                        <attribute name="csymtab" value="0x7fdf084fe730" id="3984" addr="0x7fdf084fe730" />
+                                        <attribute name="symtab" value="0x7fdf084fe6d0" id="3985" addr="0x7fdf084fe6d0" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <access id="3986" addr="0x7ff9f1fa7690" >
-                            <attributelist id="3987" addr="0x7ff9f1fa7690" >
-                                <attribute name="kind" value="private" id="3988" addr="0x7ff9f1fba9d0" />
+                        <access id="3986" addr="0x7fdf084fe690" >
+                            <attributelist id="3987" addr="0x7fdf084fe690" >
+                                <attribute name="kind" value="private" id="3988" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </access >
-                        <cdecl id="3989" addr="0x7ff9f1fa7870" >
-                            <attributelist id="3990" addr="0x7ff9f1fa7870" >
-                                <attribute name="ismember" value="1" id="3991" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="infoTag" id="3992" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="p." id="3993" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="private" id="3994" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="variable" id="3995" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="CVideoInfoTag" id="3996" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa7710" id="3997" addr="0x7ff9f1fa7710" />
+                        <cdecl id="3989" addr="0x7fdf084fe870" >
+                            <attributelist id="3990" addr="0x7fdf084fe870" >
+                                <attribute name="ismember" value="1" id="3991" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="infoTag" id="3992" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="p." id="3993" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="private" id="3994" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="variable" id="3995" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="CVideoInfoTag" id="3996" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fe710" id="3997" addr="0x7fdf084fe710" />
                             </attributelist >
                          
                         </cdecl >
-                        <access id="3998" addr="0x7ff9f1fa7950" >
-                            <attributelist id="3999" addr="0x7ff9f1fa7950" >
-                                <attribute name="kind" value="public" id="4000" addr="0x7ff9f1fba9d0" />
+                        <access id="3998" addr="0x7fdf084fe950" >
+                            <attributelist id="3999" addr="0x7fdf084fe950" >
+                                <attribute name="kind" value="public" id="4000" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="4001" addr="0x7ff9f1fa7a70" >
-                            <attributelist id="4002" addr="0x7ff9f1fa7a70" >
-                                <attribute name="ismember" value="1" id="4003" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="InfoTagVideo" id="4004" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="InfoTagVideo" id="4005" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="4006" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4007" addr="0x7ff9f1fba9d0" />
-                                <attribute name="feature_new" value="1" id="4008" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa7710" id="4009" addr="0x7ff9f1fa7710" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4010" addr="0x7ff9f1fba9d0" />
+                        <constructor id="4001" addr="0x7fdf084fea70" >
+                            <attributelist id="4002" addr="0x7fdf084fea70" >
+                                <attribute name="ismember" value="1" id="4003" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="InfoTagVideo" id="4004" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="InfoTagVideo" id="4005" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="4006" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4007" addr="0x7fdf085119d0" />
+                                <attribute name="feature_new" value="1" id="4008" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fe710" id="4009" addr="0x7fdf084fe710" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4010" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </constructor >
-                        <destructor id="4011" addr="0x7ff9f1fa7bd0" >
-                            <attributelist id="4012" addr="0x7ff9f1fa7bd0" >
-                                <attribute name="ismember" value="1" id="4013" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="~InfoTagVideo" id="4014" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="~InfoTagVideo" id="4015" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="4016" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4017" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa7710" id="4018" addr="0x7ff9f1fa7710" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4019" addr="0x7ff9f1fba9d0" />
+                        <destructor id="4011" addr="0x7fdf084febd0" >
+                            <attributelist id="4012" addr="0x7fdf084febd0" >
+                                <attribute name="ismember" value="1" id="4013" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="~InfoTagVideo" id="4014" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="~InfoTagVideo" id="4015" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="4016" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4017" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fe710" id="4018" addr="0x7fdf084fe710" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4019" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </destructor >
-                        <cdecl id="4020" addr="0x7ff9f1fa7d90" >
-                            <attributelist id="4021" addr="0x7ff9f1fa7d90" >
-                                <attribute name="ismember" value="1" id="4022" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getDbId" id="4023" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getDbId" id="4024" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="4025" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4026" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="4027" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="int" id="4028" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa7710" id="4029" addr="0x7ff9f1fa7710" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4030" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4031" addr="0x7ff9f1fa7f70" >
-                            <attributelist id="4032" addr="0x7ff9f1fa7f70" >
-                                <attribute name="ismember" value="1" id="4033" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getDirector" id="4034" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getDirector" id="4035" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="4036" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4037" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="4038" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="4039" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa7710" id="4040" addr="0x7ff9f1fa7710" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4041" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4042" addr="0x7ff9f1fa8150" >
-                            <attributelist id="4043" addr="0x7ff9f1fa8150" >
-                                <attribute name="ismember" value="1" id="4044" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getWritingCredits" id="4045" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getWritingCredits" id="4046" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="4047" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4048" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="4049" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="4050" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa7710" id="4051" addr="0x7ff9f1fa7710" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4052" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4053" addr="0x7ff9f1fa8330" >
-                            <attributelist id="4054" addr="0x7ff9f1fa8330" >
-                                <attribute name="ismember" value="1" id="4055" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getGenre" id="4056" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getGenre" id="4057" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="4058" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4059" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="4060" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="4061" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa7710" id="4062" addr="0x7ff9f1fa7710" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4063" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4064" addr="0x7ff9f1fa8510" >
-                            <attributelist id="4065" addr="0x7ff9f1fa8510" >
-                                <attribute name="ismember" value="1" id="4066" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getTagLine" id="4067" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getTagLine" id="4068" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="4069" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4070" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="4071" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="4072" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa7710" id="4073" addr="0x7ff9f1fa7710" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4074" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4075" addr="0x7ff9f1fa86f0" >
-                            <attributelist id="4076" addr="0x7ff9f1fa86f0" >
-                                <attribute name="ismember" value="1" id="4077" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getPlotOutline" id="4078" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getPlotOutline" id="4079" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="4080" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4081" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="4082" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="4083" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa7710" id="4084" addr="0x7ff9f1fa7710" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4085" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4086" addr="0x7ff9f1fa88d0" >
-                            <attributelist id="4087" addr="0x7ff9f1fa88d0" >
-                                <attribute name="ismember" value="1" id="4088" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getPlot" id="4089" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getPlot" id="4090" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="4091" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4092" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="4093" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="4094" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa7710" id="4095" addr="0x7ff9f1fa7710" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4096" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4097" addr="0x7ff9f1fa8ab0" >
-                            <attributelist id="4098" addr="0x7ff9f1fa8ab0" >
-                                <attribute name="ismember" value="1" id="4099" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getPictureURL" id="4100" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getPictureURL" id="4101" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="4102" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4103" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="4104" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="4105" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa7710" id="4106" addr="0x7ff9f1fa7710" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4107" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4108" addr="0x7ff9f1fa8c90" >
-                            <attributelist id="4109" addr="0x7ff9f1fa8c90" >
-                                <attribute name="ismember" value="1" id="4110" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getTitle" id="4111" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getTitle" id="4112" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="4113" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4114" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="4115" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="4116" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa7710" id="4117" addr="0x7ff9f1fa7710" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4118" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4119" addr="0x7ff9f1fa8e70" >
-                            <attributelist id="4120" addr="0x7ff9f1fa8e70" >
-                                <attribute name="ismember" value="1" id="4121" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getTVShowTitle" id="4122" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getTVShowTitle" id="4123" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="4124" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4125" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="4126" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="4127" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa7710" id="4128" addr="0x7ff9f1fa7710" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4129" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4130" addr="0x7ff9f1fa9050" >
-                            <attributelist id="4131" addr="0x7ff9f1fa9050" >
-                                <attribute name="ismember" value="1" id="4132" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getMediaType" id="4133" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getMediaType" id="4134" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="4135" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4136" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="4137" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="4138" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa7710" id="4139" addr="0x7ff9f1fa7710" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4140" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4141" addr="0x7ff9f1fa9230" >
-                            <attributelist id="4142" addr="0x7ff9f1fa9230" >
-                                <attribute name="ismember" value="1" id="4143" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getVotes" id="4144" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getVotes" id="4145" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="4146" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4147" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="4148" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="4149" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa7710" id="4150" addr="0x7ff9f1fa7710" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4151" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4152" addr="0x7ff9f1fa9410" >
-                            <attributelist id="4153" addr="0x7ff9f1fa9410" >
-                                <attribute name="ismember" value="1" id="4154" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getCast" id="4155" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getCast" id="4156" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="4157" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4158" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="4159" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="4160" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa7710" id="4161" addr="0x7ff9f1fa7710" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4162" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4163" addr="0x7ff9f1fa95f0" >
-                            <attributelist id="4164" addr="0x7ff9f1fa95f0" >
-                                <attribute name="ismember" value="1" id="4165" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getFile" id="4166" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getFile" id="4167" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="4168" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4169" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="4170" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="4171" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa7710" id="4172" addr="0x7ff9f1fa7710" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4173" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4174" addr="0x7ff9f1fa97d0" >
-                            <attributelist id="4175" addr="0x7ff9f1fa97d0" >
-                                <attribute name="ismember" value="1" id="4176" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getPath" id="4177" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getPath" id="4178" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="4179" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4180" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="4181" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="4182" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa7710" id="4183" addr="0x7ff9f1fa7710" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4184" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4185" addr="0x7ff9f1fa99b0" >
-                            <attributelist id="4186" addr="0x7ff9f1fa99b0" >
-                                <attribute name="ismember" value="1" id="4187" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getIMDBNumber" id="4188" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getIMDBNumber" id="4189" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="4190" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4191" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="4192" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="4193" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa7710" id="4194" addr="0x7ff9f1fa7710" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4195" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4196" addr="0x7ff9f1fa9b90" >
-                            <attributelist id="4197" addr="0x7ff9f1fa9b90" >
-                                <attribute name="ismember" value="1" id="4198" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getSeason" id="4199" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getSeason" id="4200" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="4201" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4202" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="4203" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="int" id="4204" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa7710" id="4205" addr="0x7ff9f1fa7710" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4206" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4207" addr="0x7ff9f1fa9d70" >
-                            <attributelist id="4208" addr="0x7ff9f1fa9d70" >
-                                <attribute name="ismember" value="1" id="4209" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getEpisode" id="4210" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getEpisode" id="4211" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="4212" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4213" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="4214" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="int" id="4215" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa7710" id="4216" addr="0x7ff9f1fa7710" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4217" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4218" addr="0x7ff9f1fa9f50" >
-                            <attributelist id="4219" addr="0x7ff9f1fa9f50" >
-                                <attribute name="ismember" value="1" id="4220" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getYear" id="4221" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getYear" id="4222" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="4223" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4224" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="4225" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="int" id="4226" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa7710" id="4227" addr="0x7ff9f1fa7710" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4228" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4229" addr="0x7ff9f1faa130" >
-                            <attributelist id="4230" addr="0x7ff9f1faa130" >
-                                <attribute name="ismember" value="1" id="4231" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getRating" id="4232" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getRating" id="4233" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="4234" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4235" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="4236" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="double" id="4237" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa7710" id="4238" addr="0x7ff9f1fa7710" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4239" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4240" addr="0x7ff9f1faa310" >
-                            <attributelist id="4241" addr="0x7ff9f1faa310" >
-                                <attribute name="ismember" value="1" id="4242" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getUserRating" id="4243" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getUserRating" id="4244" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="4245" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4246" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="4247" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="int" id="4248" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa7710" id="4249" addr="0x7ff9f1fa7710" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4250" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4251" addr="0x7ff9f1faa4f0" >
-                            <attributelist id="4252" addr="0x7ff9f1faa4f0" >
-                                <attribute name="ismember" value="1" id="4253" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getPlayCount" id="4254" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getPlayCount" id="4255" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="4256" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4257" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="4258" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="int" id="4259" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa7710" id="4260" addr="0x7ff9f1fa7710" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4261" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4262" addr="0x7ff9f1faa6d0" >
-                            <attributelist id="4263" addr="0x7ff9f1faa6d0" >
-                                <attribute name="ismember" value="1" id="4264" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getLastPlayed" id="4265" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getLastPlayed" id="4266" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="4267" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4268" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="4269" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="4270" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa7710" id="4271" addr="0x7ff9f1fa7710" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4272" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4273" addr="0x7ff9f1faa8b0" >
-                            <attributelist id="4274" addr="0x7ff9f1faa8b0" >
-                                <attribute name="ismember" value="1" id="4275" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getOriginalTitle" id="4276" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getOriginalTitle" id="4277" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="4278" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4279" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="4280" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="4281" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa7710" id="4282" addr="0x7ff9f1fa7710" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4283" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4284" addr="0x7ff9f1faaa90" >
-                            <attributelist id="4285" addr="0x7ff9f1faaa90" >
-                                <attribute name="ismember" value="1" id="4286" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getPremiered" id="4287" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getPremiered" id="4288" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="4289" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4290" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="4291" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="4292" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa7710" id="4293" addr="0x7ff9f1fa7710" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4294" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4295" addr="0x7ff9f1faac70" >
-                            <attributelist id="4296" addr="0x7ff9f1faac70" >
-                                <attribute name="ismember" value="1" id="4297" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getFirstAired" id="4298" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getFirstAired" id="4299" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="4300" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4301" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="4302" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="4303" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa7710" id="4304" addr="0x7ff9f1fa7710" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4305" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4306" addr="0x7ff9f1faae50" >
-                            <attributelist id="4307" addr="0x7ff9f1faae50" >
-                                <attribute name="ismember" value="1" id="4308" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getTrailer" id="4309" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getTrailer" id="4310" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="4311" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4312" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="4313" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="4314" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa7710" id="4315" addr="0x7ff9f1fa7710" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4316" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4317" addr="0x7ff9f1fab130" >
-                            <attributelist id="4318" addr="0x7ff9f1fab130" >
-                                <attribute name="ismember" value="1" id="4319" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getArtist" id="4320" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getArtist" id="4321" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="4322" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4323" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="4324" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="std::vector&lt;(std::string)>" id="4325" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa7710" id="4326" addr="0x7ff9f1fa7710" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4327" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4328" addr="0x7ff9f1fab310" >
-                            <attributelist id="4329" addr="0x7ff9f1fab310" >
-                                <attribute name="ismember" value="1" id="4330" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getAlbum" id="4331" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getAlbum" id="4332" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="4333" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4334" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="4335" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="4336" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa7710" id="4337" addr="0x7ff9f1fa7710" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4338" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4339" addr="0x7ff9f1fab4f0" >
-                            <attributelist id="4340" addr="0x7ff9f1fab4f0" >
-                                <attribute name="ismember" value="1" id="4341" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getTrack" id="4342" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getTrack" id="4343" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="4344" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4345" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="4346" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="int" id="4347" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa7710" id="4348" addr="0x7ff9f1fa7710" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4349" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4350" addr="0x7ff9f1fab6f0" >
-                            <attributelist id="4351" addr="0x7ff9f1fab6f0" >
-                                <attribute name="ismember" value="1" id="4352" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getDuration" id="4353" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getDuration" id="4354" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="4355" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4356" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="4357" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="unsigned int" id="4358" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa7710" id="4359" addr="0x7ff9f1fa7710" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4360" addr="0x7ff9f1fba9d0" />
+                        <cdecl id="4020" addr="0x7fdf084fed90" >
+                            <attributelist id="4021" addr="0x7fdf084fed90" >
+                                <attribute name="ismember" value="1" id="4022" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getDbId" id="4023" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getDbId" id="4024" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="4025" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4026" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="4027" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="int" id="4028" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fe710" id="4029" addr="0x7fdf084fe710" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4030" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4031" addr="0x7fdf084fef70" >
+                            <attributelist id="4032" addr="0x7fdf084fef70" >
+                                <attribute name="ismember" value="1" id="4033" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getDirector" id="4034" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getDirector" id="4035" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="4036" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4037" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="4038" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="4039" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fe710" id="4040" addr="0x7fdf084fe710" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4041" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4042" addr="0x7fdf084ff150" >
+                            <attributelist id="4043" addr="0x7fdf084ff150" >
+                                <attribute name="ismember" value="1" id="4044" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getWritingCredits" id="4045" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getWritingCredits" id="4046" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="4047" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4048" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="4049" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="4050" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fe710" id="4051" addr="0x7fdf084fe710" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4052" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4053" addr="0x7fdf084ff330" >
+                            <attributelist id="4054" addr="0x7fdf084ff330" >
+                                <attribute name="ismember" value="1" id="4055" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getGenre" id="4056" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getGenre" id="4057" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="4058" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4059" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="4060" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="4061" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fe710" id="4062" addr="0x7fdf084fe710" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4063" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4064" addr="0x7fdf084ff510" >
+                            <attributelist id="4065" addr="0x7fdf084ff510" >
+                                <attribute name="ismember" value="1" id="4066" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getTagLine" id="4067" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getTagLine" id="4068" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="4069" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4070" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="4071" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="4072" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fe710" id="4073" addr="0x7fdf084fe710" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4074" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4075" addr="0x7fdf084ff6f0" >
+                            <attributelist id="4076" addr="0x7fdf084ff6f0" >
+                                <attribute name="ismember" value="1" id="4077" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getPlotOutline" id="4078" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getPlotOutline" id="4079" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="4080" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4081" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="4082" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="4083" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fe710" id="4084" addr="0x7fdf084fe710" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4085" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4086" addr="0x7fdf084ff8d0" >
+                            <attributelist id="4087" addr="0x7fdf084ff8d0" >
+                                <attribute name="ismember" value="1" id="4088" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getPlot" id="4089" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getPlot" id="4090" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="4091" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4092" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="4093" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="4094" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fe710" id="4095" addr="0x7fdf084fe710" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4096" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4097" addr="0x7fdf084ffab0" >
+                            <attributelist id="4098" addr="0x7fdf084ffab0" >
+                                <attribute name="ismember" value="1" id="4099" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getPictureURL" id="4100" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getPictureURL" id="4101" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="4102" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4103" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="4104" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="4105" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fe710" id="4106" addr="0x7fdf084fe710" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4107" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4108" addr="0x7fdf084ffc90" >
+                            <attributelist id="4109" addr="0x7fdf084ffc90" >
+                                <attribute name="ismember" value="1" id="4110" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getTitle" id="4111" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getTitle" id="4112" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="4113" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4114" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="4115" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="4116" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fe710" id="4117" addr="0x7fdf084fe710" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4118" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4119" addr="0x7fdf084ffe70" >
+                            <attributelist id="4120" addr="0x7fdf084ffe70" >
+                                <attribute name="ismember" value="1" id="4121" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getTVShowTitle" id="4122" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getTVShowTitle" id="4123" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="4124" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4125" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="4126" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="4127" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fe710" id="4128" addr="0x7fdf084fe710" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4129" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4130" addr="0x7fdf08500050" >
+                            <attributelist id="4131" addr="0x7fdf08500050" >
+                                <attribute name="ismember" value="1" id="4132" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getMediaType" id="4133" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getMediaType" id="4134" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="4135" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4136" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="4137" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="4138" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fe710" id="4139" addr="0x7fdf084fe710" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4140" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4141" addr="0x7fdf08500230" >
+                            <attributelist id="4142" addr="0x7fdf08500230" >
+                                <attribute name="ismember" value="1" id="4143" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getVotes" id="4144" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getVotes" id="4145" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="4146" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4147" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="4148" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="4149" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fe710" id="4150" addr="0x7fdf084fe710" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4151" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4152" addr="0x7fdf08500410" >
+                            <attributelist id="4153" addr="0x7fdf08500410" >
+                                <attribute name="ismember" value="1" id="4154" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getCast" id="4155" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getCast" id="4156" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="4157" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4158" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="4159" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="4160" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fe710" id="4161" addr="0x7fdf084fe710" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4162" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4163" addr="0x7fdf085005f0" >
+                            <attributelist id="4164" addr="0x7fdf085005f0" >
+                                <attribute name="ismember" value="1" id="4165" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getFile" id="4166" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getFile" id="4167" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="4168" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4169" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="4170" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="4171" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fe710" id="4172" addr="0x7fdf084fe710" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4173" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4174" addr="0x7fdf085007d0" >
+                            <attributelist id="4175" addr="0x7fdf085007d0" >
+                                <attribute name="ismember" value="1" id="4176" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getPath" id="4177" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getPath" id="4178" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="4179" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4180" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="4181" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="4182" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fe710" id="4183" addr="0x7fdf084fe710" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4184" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4185" addr="0x7fdf085009b0" >
+                            <attributelist id="4186" addr="0x7fdf085009b0" >
+                                <attribute name="ismember" value="1" id="4187" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getIMDBNumber" id="4188" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getIMDBNumber" id="4189" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="4190" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4191" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="4192" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="4193" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fe710" id="4194" addr="0x7fdf084fe710" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4195" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4196" addr="0x7fdf08500b90" >
+                            <attributelist id="4197" addr="0x7fdf08500b90" >
+                                <attribute name="ismember" value="1" id="4198" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getSeason" id="4199" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getSeason" id="4200" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="4201" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4202" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="4203" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="int" id="4204" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fe710" id="4205" addr="0x7fdf084fe710" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4206" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4207" addr="0x7fdf08500d70" >
+                            <attributelist id="4208" addr="0x7fdf08500d70" >
+                                <attribute name="ismember" value="1" id="4209" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getEpisode" id="4210" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getEpisode" id="4211" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="4212" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4213" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="4214" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="int" id="4215" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fe710" id="4216" addr="0x7fdf084fe710" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4217" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4218" addr="0x7fdf08500f50" >
+                            <attributelist id="4219" addr="0x7fdf08500f50" >
+                                <attribute name="ismember" value="1" id="4220" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getYear" id="4221" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getYear" id="4222" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="4223" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4224" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="4225" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="int" id="4226" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fe710" id="4227" addr="0x7fdf084fe710" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4228" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4229" addr="0x7fdf08501130" >
+                            <attributelist id="4230" addr="0x7fdf08501130" >
+                                <attribute name="ismember" value="1" id="4231" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getRating" id="4232" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getRating" id="4233" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="4234" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4235" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="4236" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="double" id="4237" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fe710" id="4238" addr="0x7fdf084fe710" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4239" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4240" addr="0x7fdf08501310" >
+                            <attributelist id="4241" addr="0x7fdf08501310" >
+                                <attribute name="ismember" value="1" id="4242" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getUserRating" id="4243" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getUserRating" id="4244" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="4245" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4246" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="4247" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="int" id="4248" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fe710" id="4249" addr="0x7fdf084fe710" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4250" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4251" addr="0x7fdf085014f0" >
+                            <attributelist id="4252" addr="0x7fdf085014f0" >
+                                <attribute name="ismember" value="1" id="4253" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getPlayCount" id="4254" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getPlayCount" id="4255" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="4256" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4257" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="4258" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="int" id="4259" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fe710" id="4260" addr="0x7fdf084fe710" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4261" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4262" addr="0x7fdf085016d0" >
+                            <attributelist id="4263" addr="0x7fdf085016d0" >
+                                <attribute name="ismember" value="1" id="4264" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getLastPlayed" id="4265" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getLastPlayed" id="4266" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="4267" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4268" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="4269" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="4270" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fe710" id="4271" addr="0x7fdf084fe710" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4272" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4273" addr="0x7fdf085018b0" >
+                            <attributelist id="4274" addr="0x7fdf085018b0" >
+                                <attribute name="ismember" value="1" id="4275" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getOriginalTitle" id="4276" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getOriginalTitle" id="4277" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="4278" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4279" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="4280" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="4281" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fe710" id="4282" addr="0x7fdf084fe710" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4283" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4284" addr="0x7fdf08501a90" >
+                            <attributelist id="4285" addr="0x7fdf08501a90" >
+                                <attribute name="ismember" value="1" id="4286" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getPremiered" id="4287" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getPremiered" id="4288" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="4289" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4290" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="4291" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="4292" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fe710" id="4293" addr="0x7fdf084fe710" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4294" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4295" addr="0x7fdf08501c70" >
+                            <attributelist id="4296" addr="0x7fdf08501c70" >
+                                <attribute name="ismember" value="1" id="4297" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getFirstAired" id="4298" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getFirstAired" id="4299" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="4300" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4301" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="4302" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="4303" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fe710" id="4304" addr="0x7fdf084fe710" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4305" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4306" addr="0x7fdf08501e50" >
+                            <attributelist id="4307" addr="0x7fdf08501e50" >
+                                <attribute name="ismember" value="1" id="4308" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getTrailer" id="4309" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getTrailer" id="4310" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="4311" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4312" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="4313" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="4314" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fe710" id="4315" addr="0x7fdf084fe710" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4316" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4317" addr="0x7fdf08502130" >
+                            <attributelist id="4318" addr="0x7fdf08502130" >
+                                <attribute name="ismember" value="1" id="4319" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getArtist" id="4320" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getArtist" id="4321" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="4322" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4323" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="4324" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="std::vector&lt;(std::string)>" id="4325" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fe710" id="4326" addr="0x7fdf084fe710" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4327" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4328" addr="0x7fdf08502310" >
+                            <attributelist id="4329" addr="0x7fdf08502310" >
+                                <attribute name="ismember" value="1" id="4330" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getAlbum" id="4331" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getAlbum" id="4332" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="4333" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4334" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="4335" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="4336" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fe710" id="4337" addr="0x7fdf084fe710" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4338" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4339" addr="0x7fdf085024f0" >
+                            <attributelist id="4340" addr="0x7fdf085024f0" >
+                                <attribute name="ismember" value="1" id="4341" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getTrack" id="4342" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getTrack" id="4343" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="4344" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4345" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="4346" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="int" id="4347" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fe710" id="4348" addr="0x7fdf084fe710" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4349" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4350" addr="0x7fdf085026f0" >
+                            <attributelist id="4351" addr="0x7fdf085026f0" >
+                                <attribute name="ismember" value="1" id="4352" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getDuration" id="4353" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getDuration" id="4354" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="4355" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4356" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="4357" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="unsigned int" id="4358" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fe710" id="4359" addr="0x7fdf084fe710" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4360" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </cdecl >
@@ -6117,637 +6117,637 @@
                 </namespace >
             </namespace >
         </include >
-        <include id="4361" addr="0x7ff9f1fab910" >
-            <attributelist id="4362" addr="0x7ff9f1fab910" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/Keyboard.h" id="4363" addr="0x7ff9f1fba9d0" />
+        <include id="4361" addr="0x7fdf08502910" >
+            <attributelist id="4362" addr="0x7fdf08502910" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/Keyboard.h" id="4363" addr="0x7fdf085119d0" />
             </attributelist >
 
-            <classforward id="4364" addr="0x7ff9f1fab9b0" >
-                <attributelist id="4365" addr="0x7ff9f1fab9b0" >
-                    <attribute name="sym_name" value="CGUIDialogKeyboardGeneric" id="4366" addr="0x7ff9f1fba9d0" />
-                    <attribute name="name" value="CGUIDialogKeyboardGeneric" id="4367" addr="0x7ff9f1fba9d0" />
-                    <attribute name="kind" value="class" id="4368" addr="0x7ff9f1fba9d0" />
-                    <attribute name="sym_weak" value="1" id="4369" addr="0x7ff9f1fba9d0" />
-                    <attribute name="sym_symtab" value="0x7ff9f1f72950" id="4370" addr="0x7ff9f1f72950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="4371" addr="0x7ff9f1fba9d0" />
+            <classforward id="4364" addr="0x7fdf085029b0" >
+                <attributelist id="4365" addr="0x7fdf085029b0" >
+                    <attribute name="sym_name" value="CGUIDialogKeyboardGeneric" id="4366" addr="0x7fdf085119d0" />
+                    <attribute name="name" value="CGUIDialogKeyboardGeneric" id="4367" addr="0x7fdf085119d0" />
+                    <attribute name="kind" value="class" id="4368" addr="0x7fdf085119d0" />
+                    <attribute name="sym_weak" value="1" id="4369" addr="0x7fdf085119d0" />
+                    <attribute name="sym_symtab" value="0x7fdf084c9950" id="4370" addr="0x7fdf084c9950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="4371" addr="0x7fdf085119d0" />
                 </attributelist >
              
             </classforward >
-            <namespace id="4372" addr="0x7ff9f1fabad0" >
-                <attributelist id="4373" addr="0x7ff9f1fabad0" >
-                    <attribute name="sym_name" value="XBMCAddon" id="4374" addr="0x7ff9f1fba9d0" />
-                    <attribute name="name" value="XBMCAddon" id="4375" addr="0x7ff9f1fba9d0" />
-                    <attribute name="sym_previousSibling" value="0x7ff9f1fa73d0" id="4376" addr="0x7ff9f1fa73d0" />
-                    <attribute name="csym_nextSibling" value="0x7ff9f1fae270" id="4377" addr="0x7ff9f1fae270" />
-                    <attribute name="sym_nextSibling" value="0x7ff9f1fae270" id="4378" addr="0x7ff9f1fae270" />
-                    <typescope id="4379" addr="0x7ff9f1fb4990" >
-                        <attributelist id="4380" addr="0x7ff9f1fb4990" >
-                            <attribute name="name" value="XBMCAddon" id="4381" addr="0x7ff9f1fba9d0" />
-                            <typetab id="4382" addr="0x7ff9f1fb49d0" >
-                                <attributelist id="4383" addr="0x7ff9f1fb49d0" >
-                                    <attribute name="String" value="std::string" id="4384" addr="0x7ff9f1fba9d0" />
+            <namespace id="4372" addr="0x7fdf08502ad0" >
+                <attributelist id="4373" addr="0x7fdf08502ad0" >
+                    <attribute name="sym_name" value="XBMCAddon" id="4374" addr="0x7fdf085119d0" />
+                    <attribute name="name" value="XBMCAddon" id="4375" addr="0x7fdf085119d0" />
+                    <attribute name="sym_previousSibling" value="0x7fdf084fe3d0" id="4376" addr="0x7fdf084fe3d0" />
+                    <attribute name="csym_nextSibling" value="0x7fdf08505270" id="4377" addr="0x7fdf08505270" />
+                    <attribute name="sym_nextSibling" value="0x7fdf08505270" id="4378" addr="0x7fdf08505270" />
+                    <typescope id="4379" addr="0x7fdf0850b990" >
+                        <attributelist id="4380" addr="0x7fdf0850b990" >
+                            <attribute name="name" value="XBMCAddon" id="4381" addr="0x7fdf085119d0" />
+                            <typetab id="4382" addr="0x7fdf0850b9d0" >
+                                <attributelist id="4383" addr="0x7fdf0850b9d0" >
+                                    <attribute name="String" value="std::string" id="4384" addr="0x7fdf085119d0" />
                                 </attributelist >
-                                <typetabsitem id="4385" addr="0x7ff9f1fb4bb0" >
-                                    <attributelist id="4386" addr="0x7ff9f1fb4bb0" >
+                                <typetabsitem id="4385" addr="0x7fdf0850bbb0" >
+                                    <attributelist id="4386" addr="0x7fdf0850bbb0" >
                                     </attributelist >
                                 </typetabsitem >
                             </typetab >
-                            <attribute name="parent" value="0x7ff9f1f72a30" id="4387" addr="0x7ff9f1f72a30" />
-                            <attribute name="qname" value="XBMCAddon" id="4388" addr="0x7ff9f1fba9d0" />
-                            <attribute name="symtab" value="0x7ff9f1f89bb0" id="4389" addr="0x7ff9f1f89bb0" />
+                            <attribute name="parent" value="0x7fdf084c9a30" id="4387" addr="0x7fdf084c9a30" />
+                            <attribute name="qname" value="XBMCAddon" id="4388" addr="0x7fdf085119d0" />
+                            <attribute name="symtab" value="0x7fdf084e0bb0" id="4389" addr="0x7fdf084e0bb0" />
                         </attributelist >
-                        <typescopesitem id="4390" addr="0x7ff9f1f89b70" >
-                            <attributelist id="4391" addr="0x7ff9f1f89b70" >
+                        <typescopesitem id="4390" addr="0x7fdf084e0b70" >
+                            <attributelist id="4391" addr="0x7fdf084e0b70" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="4392" addr="0x7ff9f1fb49d0" >
-                            <attributelist id="4393" addr="0x7ff9f1fb49d0" >
-                                <attribute name="String" value="std::string" id="4394" addr="0x7ff9f1fba9d0" />
+                        <typescopesitem id="4392" addr="0x7fdf0850b9d0" >
+                            <attributelist id="4393" addr="0x7fdf0850b9d0" >
+                                <attribute name="String" value="std::string" id="4394" addr="0x7fdf085119d0" />
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="4395" addr="0x7ff9f1f72a30" >
-                            <attributelist id="4396" addr="0x7ff9f1f72a30" >
-                                <attribute name="name" value="" id="4397" addr="0x7ff9f1fba9d0" />
-                                <typetab id="4398" addr="0x7ff9f1f72a90" >
-                                    <attributelist id="4399" addr="0x7ff9f1f72a90" >
-                                        <attribute name="CGUIDialogKeyboardGeneric" value="CGUIDialogKeyboardGeneric" id="4400" addr="0x7ff9f1fba9d0" />
+                        <typescopesitem id="4395" addr="0x7fdf084c9a30" >
+                            <attributelist id="4396" addr="0x7fdf084c9a30" >
+                                <attribute name="name" value="" id="4397" addr="0x7fdf085119d0" />
+                                <typetab id="4398" addr="0x7fdf084c9a90" >
+                                    <attributelist id="4399" addr="0x7fdf084c9a90" >
+                                        <attribute name="CGUIDialogKeyboardGeneric" value="CGUIDialogKeyboardGeneric" id="4400" addr="0x7fdf085119d0" />
                                     </attributelist >
-                                    <typetabsitem id="4401" addr="0x7ff9f1fb7950" >
-                                        <attributelist id="4402" addr="0x7ff9f1fb7950" >
+                                    <typetabsitem id="4401" addr="0x7fdf0850e950" >
+                                        <attributelist id="4402" addr="0x7fdf0850e950" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="4403" addr="0x7ff9f1fb4ad0" >
-                            <attributelist id="4404" addr="0x7ff9f1fb4ad0" >
+                        <typescopesitem id="4403" addr="0x7fdf0850bad0" >
+                            <attributelist id="4404" addr="0x7fdf0850bad0" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="4405" addr="0x7ff9f1f89bb0" >
-                            <attributelist id="4406" addr="0x7ff9f1f89bb0" >
-                                <attribute name="name" value="XBMCAddon" id="4407" addr="0x7ff9f1fba9d0" />
-                                <attribute name="csymtab" value="0x7ff9f1f89bf0" id="4408" addr="0x7ff9f1f89bf0" />
-                                <attribute name="symtab" value="0x7ff9f1f89b90" id="4409" addr="0x7ff9f1f89b90" />
+                        <typescopesitem id="4405" addr="0x7fdf084e0bb0" >
+                            <attributelist id="4406" addr="0x7fdf084e0bb0" >
+                                <attribute name="name" value="XBMCAddon" id="4407" addr="0x7fdf085119d0" />
+                                <attribute name="csymtab" value="0x7fdf084e0bf0" id="4408" addr="0x7fdf084e0bf0" />
+                                <attribute name="symtab" value="0x7fdf084e0b90" id="4409" addr="0x7fdf084e0b90" />
                             </attributelist >
                         </typescopesitem >
                     </typescope >
-                    <attribute name="symtab" value="0x7ff9f1f89bb0" id="4410" addr="0x7ff9f1f89bb0" />
-                    <attribute name="sym_symtab" value="0x7ff9f1f72950" id="4411" addr="0x7ff9f1f72950" />
+                    <attribute name="symtab" value="0x7fdf084e0bb0" id="4410" addr="0x7fdf084e0bb0" />
+                    <attribute name="sym_symtab" value="0x7fdf084c9950" id="4411" addr="0x7fdf084c9950" />
                 </attributelist >
 
-                <namespace id="4412" addr="0x7ff9f1fabb50" >
-                    <attributelist id="4413" addr="0x7ff9f1fabb50" >
-                        <attribute name="feature_knownbasetypes" value="AddonClass,IPlayerCallback,AddonCallback" id="4414" addr="0x7ff9f1fba9d0" />
-                        <attribute name="name" value="xbmc" id="4415" addr="0x7ff9f1fba9d0" />
-                        <attribute name="sym_symtab" value="0x7ff9f1f89bb0" id="4416" addr="0x7ff9f1f89bb0" />
-                        <attribute name="symtab" value="0x7ff9f1f8a2b0" id="4417" addr="0x7ff9f1f8a2b0" />
-                        <attribute name="sym_nextSibling" value="0x7ff9f1fae2f0" id="4418" addr="0x7ff9f1fae2f0" />
-                        <attribute name="csym_nextSibling" value="0x7ff9f1fae2f0" id="4419" addr="0x7ff9f1fae2f0" />
-                        <attribute name="sym_previousSibling" value="0x7ff9f1fa7450" id="4420" addr="0x7ff9f1fa7450" />
-                        <attribute name="feature_knownapitypes" value="XBMCAddon::xbmcgui::ListItem,XBMCAddon::xbmc::PlayListItem" id="4421" addr="0x7ff9f1fba9d0" />
-                        <attribute name="sym_name" value="xbmc" id="4422" addr="0x7ff9f1fba9d0" />
-                        <typescope id="4423" addr="0x7ff9f1fb4d70" >
-                            <attributelist id="4424" addr="0x7ff9f1fb4d70" >
-                                <attribute name="name" value="xbmc" id="4425" addr="0x7ff9f1fba9d0" />
-                                <typetab id="4426" addr="0x7ff9f1fb4d90" >
-                                    <attributelist id="4427" addr="0x7ff9f1fb4d90" >
-                                        <attribute name="Monitor" value="Monitor" id="4428" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="4429" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="Keyboard" value="Keyboard" id="4430" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="4431" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="InfoTagVideo" value="InfoTagVideo" id="4432" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="Player" value="Player" id="4433" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="InfoTagMusic" value="InfoTagMusic" id="4434" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="PlayList" value="PlayList" id="4435" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="RenderCapture" value="RenderCapture" id="4436" addr="0x7ff9f1fba9d0" />
+                <namespace id="4412" addr="0x7fdf08502b50" >
+                    <attributelist id="4413" addr="0x7fdf08502b50" >
+                        <attribute name="feature_knownbasetypes" value="AddonClass,IPlayerCallback,AddonCallback" id="4414" addr="0x7fdf085119d0" />
+                        <attribute name="name" value="xbmc" id="4415" addr="0x7fdf085119d0" />
+                        <attribute name="sym_symtab" value="0x7fdf084e0bb0" id="4416" addr="0x7fdf084e0bb0" />
+                        <attribute name="symtab" value="0x7fdf084e12b0" id="4417" addr="0x7fdf084e12b0" />
+                        <attribute name="sym_nextSibling" value="0x7fdf085052f0" id="4418" addr="0x7fdf085052f0" />
+                        <attribute name="csym_nextSibling" value="0x7fdf085052f0" id="4419" addr="0x7fdf085052f0" />
+                        <attribute name="sym_previousSibling" value="0x7fdf084fe450" id="4420" addr="0x7fdf084fe450" />
+                        <attribute name="feature_knownapitypes" value="XBMCAddon::xbmcgui::ListItem,XBMCAddon::xbmc::PlayListItem" id="4421" addr="0x7fdf085119d0" />
+                        <attribute name="sym_name" value="xbmc" id="4422" addr="0x7fdf085119d0" />
+                        <typescope id="4423" addr="0x7fdf0850bd70" >
+                            <attributelist id="4424" addr="0x7fdf0850bd70" >
+                                <attribute name="name" value="xbmc" id="4425" addr="0x7fdf085119d0" />
+                                <typetab id="4426" addr="0x7fdf0850bd90" >
+                                    <attributelist id="4427" addr="0x7fdf0850bd90" >
+                                        <attribute name="Monitor" value="Monitor" id="4428" addr="0x7fdf085119d0" />
+                                        <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="4429" addr="0x7fdf085119d0" />
+                                        <attribute name="Keyboard" value="Keyboard" id="4430" addr="0x7fdf085119d0" />
+                                        <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="4431" addr="0x7fdf085119d0" />
+                                        <attribute name="InfoTagVideo" value="InfoTagVideo" id="4432" addr="0x7fdf085119d0" />
+                                        <attribute name="Player" value="Player" id="4433" addr="0x7fdf085119d0" />
+                                        <attribute name="InfoTagMusic" value="InfoTagMusic" id="4434" addr="0x7fdf085119d0" />
+                                        <attribute name="PlayList" value="PlayList" id="4435" addr="0x7fdf085119d0" />
+                                        <attribute name="RenderCapture" value="RenderCapture" id="4436" addr="0x7fdf085119d0" />
                                     </attributelist >
-                                    <typetabsitem id="4437" addr="0x7ff9f1fb9b10" >
-                                        <attributelist id="4438" addr="0x7ff9f1fb9b10" >
+                                    <typetabsitem id="4437" addr="0x7fdf08510b10" >
+                                        <attributelist id="4438" addr="0x7fdf08510b10" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="4439" addr="0x7ff9f1fb7f30" >
-                                        <attributelist id="4440" addr="0x7ff9f1fb7f30" >
+                                    <typetabsitem id="4439" addr="0x7fdf0850ef30" >
+                                        <attributelist id="4440" addr="0x7fdf0850ef30" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="4441" addr="0x7ff9f1fb8990" >
-                                        <attributelist id="4442" addr="0x7ff9f1fb8990" >
+                                    <typetabsitem id="4441" addr="0x7fdf0850f990" >
+                                        <attributelist id="4442" addr="0x7fdf0850f990" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="4443" addr="0x7ff9f1fb5e90" >
-                                        <attributelist id="4444" addr="0x7ff9f1fb5e90" >
+                                    <typetabsitem id="4443" addr="0x7fdf0850ce90" >
+                                        <attributelist id="4444" addr="0x7fdf0850ce90" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="4445" addr="0x7ff9f1fb8310" >
-                                        <attributelist id="4446" addr="0x7ff9f1fb8310" >
+                                    <typetabsitem id="4445" addr="0x7fdf0850f310" >
+                                        <attributelist id="4446" addr="0x7fdf0850f310" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="4447" addr="0x7ff9f1fb6050" >
-                                        <attributelist id="4448" addr="0x7ff9f1fb6050" >
+                                    <typetabsitem id="4447" addr="0x7fdf0850d050" >
+                                        <attributelist id="4448" addr="0x7fdf0850d050" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="4449" addr="0x7ff9f1fb7b50" >
-                                        <attributelist id="4450" addr="0x7ff9f1fb7b50" >
+                                    <typetabsitem id="4449" addr="0x7fdf0850eb50" >
+                                        <attributelist id="4450" addr="0x7fdf0850eb50" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="4451" addr="0x7ff9f1fb91b0" >
-                                        <attributelist id="4452" addr="0x7ff9f1fb91b0" >
+                                    <typetabsitem id="4451" addr="0x7fdf085101b0" >
+                                        <attributelist id="4452" addr="0x7fdf085101b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="4453" addr="0x7ff9f1fb7490" >
-                                        <attributelist id="4454" addr="0x7ff9f1fb7490" >
+                                    <typetabsitem id="4453" addr="0x7fdf0850e490" >
+                                        <attributelist id="4454" addr="0x7fdf0850e490" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
-                                <attribute name="parent" value="0x7ff9f1fb4990" id="4455" addr="0x7ff9f1fb4990" />
-                                <attribute name="qname" value="XBMCAddon::xbmc" id="4456" addr="0x7ff9f1fba9d0" />
-                                <attribute name="symtab" value="0x7ff9f1f8a2b0" id="4457" addr="0x7ff9f1f8a2b0" />
+                                <attribute name="parent" value="0x7fdf0850b990" id="4455" addr="0x7fdf0850b990" />
+                                <attribute name="qname" value="XBMCAddon::xbmc" id="4456" addr="0x7fdf085119d0" />
+                                <attribute name="symtab" value="0x7fdf084e12b0" id="4457" addr="0x7fdf084e12b0" />
                             </attributelist >
-                            <typescopesitem id="4458" addr="0x7ff9f1f8a270" >
-                                <attributelist id="4459" addr="0x7ff9f1f8a270" >
+                            <typescopesitem id="4458" addr="0x7fdf084e1270" >
+                                <attributelist id="4459" addr="0x7fdf084e1270" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="4460" addr="0x7ff9f1fb4d90" >
-                                <attributelist id="4461" addr="0x7ff9f1fb4d90" >
-                                    <attribute name="Monitor" value="Monitor" id="4462" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="4463" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="Keyboard" value="Keyboard" id="4464" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="4465" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="InfoTagVideo" value="InfoTagVideo" id="4466" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="Player" value="Player" id="4467" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="InfoTagMusic" value="InfoTagMusic" id="4468" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="PlayList" value="PlayList" id="4469" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="RenderCapture" value="RenderCapture" id="4470" addr="0x7ff9f1fba9d0" />
+                            <typescopesitem id="4460" addr="0x7fdf0850bd90" >
+                                <attributelist id="4461" addr="0x7fdf0850bd90" >
+                                    <attribute name="Monitor" value="Monitor" id="4462" addr="0x7fdf085119d0" />
+                                    <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="4463" addr="0x7fdf085119d0" />
+                                    <attribute name="Keyboard" value="Keyboard" id="4464" addr="0x7fdf085119d0" />
+                                    <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="4465" addr="0x7fdf085119d0" />
+                                    <attribute name="InfoTagVideo" value="InfoTagVideo" id="4466" addr="0x7fdf085119d0" />
+                                    <attribute name="Player" value="Player" id="4467" addr="0x7fdf085119d0" />
+                                    <attribute name="InfoTagMusic" value="InfoTagMusic" id="4468" addr="0x7fdf085119d0" />
+                                    <attribute name="PlayList" value="PlayList" id="4469" addr="0x7fdf085119d0" />
+                                    <attribute name="RenderCapture" value="RenderCapture" id="4470" addr="0x7fdf085119d0" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="4471" addr="0x7ff9f1fb4990" >
-                                <attributelist id="4472" addr="0x7ff9f1fb4990" >
-                                    <attribute name="name" value="XBMCAddon" id="4473" addr="0x7ff9f1fba9d0" />
-                                    <typetab id="4474" addr="0x7ff9f1fb49d0" >
-                                        <attributelist id="4475" addr="0x7ff9f1fb49d0" >
-                                            <attribute name="String" value="std::string" id="4476" addr="0x7ff9f1fba9d0" />
-                                        </attributelist >
-                                        <typetabsitem id="4477" addr="0x7ff9f1fb4bb0" >
-                                            <attributelist id="4478" addr="0x7ff9f1fb4bb0" >
+                            <typescopesitem id="4471" addr="0x7fdf0850b990" >
+                                <attributelist id="4472" addr="0x7fdf0850b990" >
+                                    <attribute name="name" value="XBMCAddon" id="4473" addr="0x7fdf085119d0" />
+                                    <typetab id="4474" addr="0x7fdf0850b9d0" >
+                                        <attributelist id="4475" addr="0x7fdf0850b9d0" >
+                                            <attribute name="String" value="std::string" id="4476" addr="0x7fdf085119d0" />
+                                        </attributelist >
+                                        <typetabsitem id="4477" addr="0x7fdf0850bbb0" >
+                                            <attributelist id="4478" addr="0x7fdf0850bbb0" >
                                             </attributelist >
                                         </typetabsitem >
                                     </typetab >
-                                    <attribute name="parent" value="0x7ff9f1f72a30" id="4479" addr="0x7ff9f1f72a30" />
-                                    <attribute name="qname" value="XBMCAddon" id="4480" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="symtab" value="0x7ff9f1f89bb0" id="4481" addr="0x7ff9f1f89bb0" />
+                                    <attribute name="parent" value="0x7fdf084c9a30" id="4479" addr="0x7fdf084c9a30" />
+                                    <attribute name="qname" value="XBMCAddon" id="4480" addr="0x7fdf085119d0" />
+                                    <attribute name="symtab" value="0x7fdf084e0bb0" id="4481" addr="0x7fdf084e0bb0" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="4482" addr="0x7ff9f1fb4db0" >
-                                <attributelist id="4483" addr="0x7ff9f1fb4db0" >
+                            <typescopesitem id="4482" addr="0x7fdf0850bdb0" >
+                                <attributelist id="4483" addr="0x7fdf0850bdb0" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="4484" addr="0x7ff9f1f8a2b0" >
-                                <attributelist id="4485" addr="0x7ff9f1f8a2b0" >
-                                    <attribute name="name" value="xbmc" id="4486" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="csymtab" value="0x7ff9f1f8a2f0" id="4487" addr="0x7ff9f1f8a2f0" />
-                                    <attribute name="symtab" value="0x7ff9f1f8a290" id="4488" addr="0x7ff9f1f8a290" />
+                            <typescopesitem id="4484" addr="0x7fdf084e12b0" >
+                                <attributelist id="4485" addr="0x7fdf084e12b0" >
+                                    <attribute name="name" value="xbmc" id="4486" addr="0x7fdf085119d0" />
+                                    <attribute name="csymtab" value="0x7fdf084e12f0" id="4487" addr="0x7fdf084e12f0" />
+                                    <attribute name="symtab" value="0x7fdf084e1290" id="4488" addr="0x7fdf084e1290" />
                                 </attributelist >
                             </typescopesitem >
                         </typescope >
                     </attributelist >
 
-                    <cdecl id="4489" addr="0x7ff9f1fabcb0" >
-                        <attributelist id="4490" addr="0x7ff9f1fabcb0" >
-                            <attribute name="sym_name" value="KeyboardException" id="4491" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="XBMCAddon::xbmc::KeyboardException" id="4492" addr="0x7ff9f1fba9d0" />
-                            <attribute name="kind" value="variable" id="4493" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="XBMCCOMMONS_STANDARD_EXCEPTION" id="4494" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="4495" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="4496" addr="0x7ff9f1fba9d0" />
+                    <cdecl id="4489" addr="0x7fdf08502cb0" >
+                        <attributelist id="4490" addr="0x7fdf08502cb0" >
+                            <attribute name="sym_name" value="KeyboardException" id="4491" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="XBMCAddon::xbmc::KeyboardException" id="4492" addr="0x7fdf085119d0" />
+                            <attribute name="kind" value="variable" id="4493" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="XBMCCOMMONS_STANDARD_EXCEPTION" id="4494" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="4495" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="4496" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <class id="4497" addr="0x7ff9f1fabe90" >
-                        <attributelist id="4498" addr="0x7ff9f1fabe90" >
-                            <attribute name="name" value="XBMCAddon::xbmc::Keyboard" id="4499" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="4500" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="symtab" value="0x7ff9f1fabfd0" id="4501" addr="0x7ff9f1fabfd0" />
-                            <attribute name="allows_typedef" value="1" id="4502" addr="0x7ff9f1fba9d0" />
-                            <attribute name="typepass_visit" value="1" id="4503" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_visit" value="1" id="4504" addr="0x7ff9f1fba9d0" />
-                            <attribute name="kind" value="class" id="4505" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_name" value="Keyboard" id="4506" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_default_constructor" value="1" id="4507" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_has_constructor" value="1" id="4508" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_public_constructor" value="1" id="4509" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_has_destructor" value="1" id="4510" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_default_destructor" value="1" id="4511" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_copy_constructor" value="1" id="4512" addr="0x7ff9f1fba9d0" />
-                            <attribute name="privatebaselist" value="0x7ff9f1fabe70" id="4513" addr="0x7ff9f1fabe70" />
-                            <attribute name="protectedbaselist" value="0x7ff9f1fabe50" id="4514" addr="0x7ff9f1fabe50" />
-                            <baselist id="4515" addr="0x7ff9f1fabe30" >
-                                <base name="AddonClass" id="4516" addr="0x7ff9f1fabdb0" />
+                    <class id="4497" addr="0x7fdf08502e90" >
+                        <attributelist id="4498" addr="0x7fdf08502e90" >
+                            <attribute name="name" value="XBMCAddon::xbmc::Keyboard" id="4499" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="4500" addr="0x7fdf084e12b0" />
+                            <attribute name="symtab" value="0x7fdf08502fd0" id="4501" addr="0x7fdf08502fd0" />
+                            <attribute name="allows_typedef" value="1" id="4502" addr="0x7fdf085119d0" />
+                            <attribute name="typepass_visit" value="1" id="4503" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_visit" value="1" id="4504" addr="0x7fdf085119d0" />
+                            <attribute name="kind" value="class" id="4505" addr="0x7fdf085119d0" />
+                            <attribute name="sym_name" value="Keyboard" id="4506" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_default_constructor" value="1" id="4507" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_has_constructor" value="1" id="4508" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_public_constructor" value="1" id="4509" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_has_destructor" value="1" id="4510" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_default_destructor" value="1" id="4511" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_copy_constructor" value="1" id="4512" addr="0x7fdf085119d0" />
+                            <attribute name="privatebaselist" value="0x7fdf08502e70" id="4513" addr="0x7fdf08502e70" />
+                            <attribute name="protectedbaselist" value="0x7fdf08502e50" id="4514" addr="0x7fdf08502e50" />
+                            <baselist id="4515" addr="0x7fdf08502e30" >
+                                <base name="AddonClass" id="4516" addr="0x7fdf08502db0" />
                             </baselist >
-                            <attribute name="module" value="xbmc" id="4517" addr="0x7ff9f1f89430" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="4518" addr="0x7ff9f1fba9d0" />
-                            <typescope id="4519" addr="0x7ff9f1fb8a50" >
-                                <attributelist id="4520" addr="0x7ff9f1fb8a50" >
-                                    <attribute name="name" value="Keyboard" id="4521" addr="0x7ff9f1fba9d0" />
-                                    <typetab id="4522" addr="0x7ff9f1fb8a70" >
-                                        <attributelist id="4523" addr="0x7ff9f1fb8a70" >
+                            <attribute name="module" value="xbmc" id="4517" addr="0x7fdf084e0430" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="4518" addr="0x7fdf085119d0" />
+                            <typescope id="4519" addr="0x7fdf0850fa50" >
+                                <attributelist id="4520" addr="0x7fdf0850fa50" >
+                                    <attribute name="name" value="Keyboard" id="4521" addr="0x7fdf085119d0" />
+                                    <typetab id="4522" addr="0x7fdf0850fa70" >
+                                        <attributelist id="4523" addr="0x7fdf0850fa70" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7ff9f1fb4d70" id="4524" addr="0x7ff9f1fb4d70" />
-                                    <attribute name="qname" value="XBMCAddon::xbmc::Keyboard" id="4525" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="symtab" value="0x7ff9f1fabfd0" id="4526" addr="0x7ff9f1fabfd0" />
+                                    <attribute name="parent" value="0x7fdf0850bd70" id="4524" addr="0x7fdf0850bd70" />
+                                    <attribute name="qname" value="XBMCAddon::xbmc::Keyboard" id="4525" addr="0x7fdf085119d0" />
+                                    <attribute name="symtab" value="0x7fdf08502fd0" id="4526" addr="0x7fdf08502fd0" />
                                 </attributelist >
-                                <typescopesitem id="4527" addr="0x7ff9f1fb89f0" >
-                                    <attributelist id="4528" addr="0x7ff9f1fb89f0" >
+                                <typescopesitem id="4527" addr="0x7fdf0850f9f0" >
+                                    <attributelist id="4528" addr="0x7fdf0850f9f0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="4529" addr="0x7ff9f1fb8a70" >
-                                    <attributelist id="4530" addr="0x7ff9f1fb8a70" >
+                                <typescopesitem id="4529" addr="0x7fdf0850fa70" >
+                                    <attributelist id="4530" addr="0x7fdf0850fa70" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="4531" addr="0x7ff9f1fb4d70" >
-                                    <attributelist id="4532" addr="0x7ff9f1fb4d70" >
-                                        <attribute name="name" value="xbmc" id="4533" addr="0x7ff9f1fba9d0" />
-                                        <typetab id="4534" addr="0x7ff9f1fb4d90" >
-                                            <attributelist id="4535" addr="0x7ff9f1fb4d90" >
-                                                <attribute name="Monitor" value="Monitor" id="4536" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="4537" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="Keyboard" value="Keyboard" id="4538" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="4539" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="InfoTagVideo" value="InfoTagVideo" id="4540" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="Player" value="Player" id="4541" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="InfoTagMusic" value="InfoTagMusic" id="4542" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="PlayList" value="PlayList" id="4543" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="RenderCapture" value="RenderCapture" id="4544" addr="0x7ff9f1fba9d0" />
+                                <typescopesitem id="4531" addr="0x7fdf0850bd70" >
+                                    <attributelist id="4532" addr="0x7fdf0850bd70" >
+                                        <attribute name="name" value="xbmc" id="4533" addr="0x7fdf085119d0" />
+                                        <typetab id="4534" addr="0x7fdf0850bd90" >
+                                            <attributelist id="4535" addr="0x7fdf0850bd90" >
+                                                <attribute name="Monitor" value="Monitor" id="4536" addr="0x7fdf085119d0" />
+                                                <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="4537" addr="0x7fdf085119d0" />
+                                                <attribute name="Keyboard" value="Keyboard" id="4538" addr="0x7fdf085119d0" />
+                                                <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="4539" addr="0x7fdf085119d0" />
+                                                <attribute name="InfoTagVideo" value="InfoTagVideo" id="4540" addr="0x7fdf085119d0" />
+                                                <attribute name="Player" value="Player" id="4541" addr="0x7fdf085119d0" />
+                                                <attribute name="InfoTagMusic" value="InfoTagMusic" id="4542" addr="0x7fdf085119d0" />
+                                                <attribute name="PlayList" value="PlayList" id="4543" addr="0x7fdf085119d0" />
+                                                <attribute name="RenderCapture" value="RenderCapture" id="4544" addr="0x7fdf085119d0" />
                                             </attributelist >
-                                            <typetabsitem id="4545" addr="0x7ff9f1fb9b10" >
-                                                <attributelist id="4546" addr="0x7ff9f1fb9b10" >
+                                            <typetabsitem id="4545" addr="0x7fdf08510b10" >
+                                                <attributelist id="4546" addr="0x7fdf08510b10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4547" addr="0x7ff9f1fb7f30" >
-                                                <attributelist id="4548" addr="0x7ff9f1fb7f30" >
+                                            <typetabsitem id="4547" addr="0x7fdf0850ef30" >
+                                                <attributelist id="4548" addr="0x7fdf0850ef30" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4549" addr="0x7ff9f1fb8990" >
-                                                <attributelist id="4550" addr="0x7ff9f1fb8990" >
+                                            <typetabsitem id="4549" addr="0x7fdf0850f990" >
+                                                <attributelist id="4550" addr="0x7fdf0850f990" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4551" addr="0x7ff9f1fb5e90" >
-                                                <attributelist id="4552" addr="0x7ff9f1fb5e90" >
+                                            <typetabsitem id="4551" addr="0x7fdf0850ce90" >
+                                                <attributelist id="4552" addr="0x7fdf0850ce90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4553" addr="0x7ff9f1fb8310" >
-                                                <attributelist id="4554" addr="0x7ff9f1fb8310" >
+                                            <typetabsitem id="4553" addr="0x7fdf0850f310" >
+                                                <attributelist id="4554" addr="0x7fdf0850f310" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4555" addr="0x7ff9f1fb6050" >
-                                                <attributelist id="4556" addr="0x7ff9f1fb6050" >
+                                            <typetabsitem id="4555" addr="0x7fdf0850d050" >
+                                                <attributelist id="4556" addr="0x7fdf0850d050" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4557" addr="0x7ff9f1fb7b50" >
-                                                <attributelist id="4558" addr="0x7ff9f1fb7b50" >
+                                            <typetabsitem id="4557" addr="0x7fdf0850eb50" >
+                                                <attributelist id="4558" addr="0x7fdf0850eb50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4559" addr="0x7ff9f1fb91b0" >
-                                                <attributelist id="4560" addr="0x7ff9f1fb91b0" >
+                                            <typetabsitem id="4559" addr="0x7fdf085101b0" >
+                                                <attributelist id="4560" addr="0x7fdf085101b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4561" addr="0x7ff9f1fb7490" >
-                                                <attributelist id="4562" addr="0x7ff9f1fb7490" >
+                                            <typetabsitem id="4561" addr="0x7fdf0850e490" >
+                                                <attributelist id="4562" addr="0x7fdf0850e490" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7ff9f1fb4990" id="4563" addr="0x7ff9f1fb4990" />
-                                        <attribute name="qname" value="XBMCAddon::xbmc" id="4564" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="symtab" value="0x7ff9f1f8a2b0" id="4565" addr="0x7ff9f1f8a2b0" />
+                                        <attribute name="parent" value="0x7fdf0850b990" id="4563" addr="0x7fdf0850b990" />
+                                        <attribute name="qname" value="XBMCAddon::xbmc" id="4564" addr="0x7fdf085119d0" />
+                                        <attribute name="symtab" value="0x7fdf084e12b0" id="4565" addr="0x7fdf084e12b0" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="4566" addr="0x7ff9f1fb8a90" >
-                                    <attributelist id="4567" addr="0x7ff9f1fb8a90" >
+                                <typescopesitem id="4566" addr="0x7fdf0850fa90" >
+                                    <attributelist id="4567" addr="0x7fdf0850fa90" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="4568" addr="0x7ff9f1fabfd0" >
-                                    <attributelist id="4569" addr="0x7ff9f1fabfd0" >
-                                        <attribute name="name" value="Keyboard" id="4570" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="csymtab" value="0x7ff9f1fabff0" id="4571" addr="0x7ff9f1fabff0" />
-                                        <attribute name="symtab" value="0x7ff9f1fabf90" id="4572" addr="0x7ff9f1fabf90" />
+                                <typescopesitem id="4568" addr="0x7fdf08502fd0" >
+                                    <attributelist id="4569" addr="0x7fdf08502fd0" >
+                                        <attribute name="name" value="Keyboard" id="4570" addr="0x7fdf085119d0" />
+                                        <attribute name="csymtab" value="0x7fdf08502ff0" id="4571" addr="0x7fdf08502ff0" />
+                                        <attribute name="symtab" value="0x7fdf08502f90" id="4572" addr="0x7fdf08502f90" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <access id="4573" addr="0x7ff9f1fabf50" >
-                            <attributelist id="4574" addr="0x7ff9f1fabf50" >
-                                <attribute name="kind" value="public" id="4575" addr="0x7ff9f1fba9d0" />
+                        <access id="4573" addr="0x7fdf08502f50" >
+                            <attributelist id="4574" addr="0x7fdf08502f50" >
+                                <attribute name="kind" value="public" id="4575" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="4576" addr="0x7ff9f1fac590" >
-                            <attributelist id="4577" addr="0x7ff9f1fac590" >
-                                <attribute name="name" value="Keyboard" id="4578" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="4579" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fabfd0" id="4580" addr="0x7ff9f1fabfd0" />
-                                <attribute name="sym_nextSibling" value="0x7ff9f1fac7f0" id="4581" addr="0x7ff9f1fac7f0" />
-                                <attribute name="csym_nextSibling" value="0x7ff9f1fac7f0" id="4582" addr="0x7ff9f1fac7f0" />
-                                <attribute name="sym_name" value="Keyboard" id="4583" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(r.q(const).String,r.q(const).String,bool)." id="4584" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4585" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overloaded" value="0x7ff9f1fac590" id="4586" addr="0x7ff9f1fac590" />
-                                <attribute name="feature_python_nokwds" value="true" id="4587" addr="0x7ff9f1fba9d0" />
-                                <parmlist id="4588" addr="0x7ff9f1fac1f0" >
+                        <constructor id="4576" addr="0x7fdf08503590" >
+                            <attributelist id="4577" addr="0x7fdf08503590" >
+                                <attribute name="name" value="Keyboard" id="4578" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="4579" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf08502fd0" id="4580" addr="0x7fdf08502fd0" />
+                                <attribute name="sym_nextSibling" value="0x7fdf085037f0" id="4581" addr="0x7fdf085037f0" />
+                                <attribute name="csym_nextSibling" value="0x7fdf085037f0" id="4582" addr="0x7fdf085037f0" />
+                                <attribute name="sym_name" value="Keyboard" id="4583" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(r.q(const).String,r.q(const).String,bool)." id="4584" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4585" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overloaded" value="0x7fdf08503590" id="4586" addr="0x7fdf08503590" />
+                                <attribute name="feature_python_nokwds" value="true" id="4587" addr="0x7fdf085119d0" />
+                                <parmlist id="4588" addr="0x7fdf085031f0" >
                                     <parm id="4589">
-                                        <attributelist id="4590" addr="0x7ff9f1fac1f0" >
-                                            <attribute name="name" value="line" id="4591" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="4592" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4593" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="4590" addr="0x7fdf085031f0" >
+                                            <attribute name="name" value="line" id="4591" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="4592" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4593" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4594">
-                                        <attributelist id="4595" addr="0x7ff9f1fac390" >
-                                            <attribute name="name" value="heading" id="4596" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="4597" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4598" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="4595" addr="0x7fdf08503390" >
+                                            <attribute name="name" value="heading" id="4596" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="4597" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4598" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4599">
-                                        <attributelist id="4600" addr="0x7ff9f1fac4d0" >
-                                            <attribute name="name" value="hidden" id="4601" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="false" id="4602" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="bool" id="4603" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="4600" addr="0x7fdf085034d0" >
+                                            <attribute name="name" value="hidden" id="4601" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="false" id="4602" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="bool" id="4603" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_0" id="4604" addr="0x7ff9f1fba9d0" />
-                                <attribute name="feature_new" value="1" id="4605" addr="0x7ff9f1fba9d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4604" addr="0x7fdf085119d0" />
+                                <attribute name="feature_new" value="1" id="4605" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="4606" addr="0x7ff9f1fac7f0" >
-                            <attributelist id="4607" addr="0x7ff9f1fac7f0" >
-                                <attribute name="name" value="Keyboard" id="4608" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="4609" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fabfd0" id="4610" addr="0x7ff9f1fabfd0" />
-                                <attribute name="sym_previousSibling" value="0x7ff9f1fac590" id="4611" addr="0x7ff9f1fac590" />
-                                <attribute name="sym_name" value="Keyboard" id="4612" addr="0x7ff9f1fba9d0" />
-                                <attribute name="csym_nextSibling" value="0x7ff9f1fac9b0" id="4613" addr="0x7ff9f1fac9b0" />
-                                <attribute name="sym_nextSibling" value="0x7ff9f1fac9b0" id="4614" addr="0x7ff9f1fac9b0" />
-                                <attribute name="defaultargs" value="0x7ff9f1fac590" id="4615" addr="0x7ff9f1fac590" />
-                                <attribute name="decl" value="f(r.q(const).String,r.q(const).String)." id="4616" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4617" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overloaded" value="0x7ff9f1fac590" id="4618" addr="0x7ff9f1fac590" />
-                                <attribute name="feature_python_nokwds" value="true" id="4619" addr="0x7ff9f1fba9d0" />
-                                <parmlist id="4620" addr="0x7ff9f1fac630" >
+                        <constructor id="4606" addr="0x7fdf085037f0" >
+                            <attributelist id="4607" addr="0x7fdf085037f0" >
+                                <attribute name="name" value="Keyboard" id="4608" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="4609" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf08502fd0" id="4610" addr="0x7fdf08502fd0" />
+                                <attribute name="sym_previousSibling" value="0x7fdf08503590" id="4611" addr="0x7fdf08503590" />
+                                <attribute name="sym_name" value="Keyboard" id="4612" addr="0x7fdf085119d0" />
+                                <attribute name="csym_nextSibling" value="0x7fdf085039b0" id="4613" addr="0x7fdf085039b0" />
+                                <attribute name="sym_nextSibling" value="0x7fdf085039b0" id="4614" addr="0x7fdf085039b0" />
+                                <attribute name="defaultargs" value="0x7fdf08503590" id="4615" addr="0x7fdf08503590" />
+                                <attribute name="decl" value="f(r.q(const).String,r.q(const).String)." id="4616" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4617" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overloaded" value="0x7fdf08503590" id="4618" addr="0x7fdf08503590" />
+                                <attribute name="feature_python_nokwds" value="true" id="4619" addr="0x7fdf085119d0" />
+                                <parmlist id="4620" addr="0x7fdf08503630" >
                                     <parm id="4621">
-                                        <attributelist id="4622" addr="0x7ff9f1fac630" >
-                                            <attribute name="name" value="line" id="4623" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="4624" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4625" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="4622" addr="0x7fdf08503630" >
+                                            <attribute name="name" value="line" id="4623" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="4624" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4625" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4626">
-                                        <attributelist id="4627" addr="0x7ff9f1fac730" >
-                                            <attribute name="name" value="heading" id="4628" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="4629" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4630" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="4627" addr="0x7fdf08503730" >
+                                            <attribute name="name" value="heading" id="4628" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="4629" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4630" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_1" id="4631" addr="0x7ff9f1fba9d0" />
-                                <attribute name="feature_new" value="1" id="4632" addr="0x7ff9f1fba9d0" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="4631" addr="0x7fdf085119d0" />
+                                <attribute name="feature_new" value="1" id="4632" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="4633" addr="0x7ff9f1fac9b0" >
-                            <attributelist id="4634" addr="0x7ff9f1fac9b0" >
-                                <attribute name="name" value="Keyboard" id="4635" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="4636" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fabfd0" id="4637" addr="0x7ff9f1fabfd0" />
-                                <attribute name="sym_previousSibling" value="0x7ff9f1fac7f0" id="4638" addr="0x7ff9f1fac7f0" />
-                                <attribute name="sym_name" value="Keyboard" id="4639" addr="0x7ff9f1fba9d0" />
-                                <attribute name="csym_nextSibling" value="0x7ff9f1faca90" id="4640" addr="0x7ff9f1faca90" />
-                                <attribute name="sym_nextSibling" value="0x7ff9f1faca90" id="4641" addr="0x7ff9f1faca90" />
-                                <attribute name="defaultargs" value="0x7ff9f1fac590" id="4642" addr="0x7ff9f1fac590" />
-                                <attribute name="decl" value="f(r.q(const).String)." id="4643" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4644" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overloaded" value="0x7ff9f1fac590" id="4645" addr="0x7ff9f1fac590" />
-                                <attribute name="feature_python_nokwds" value="true" id="4646" addr="0x7ff9f1fba9d0" />
-                                <parmlist id="4647" addr="0x7ff9f1fac890" >
+                        <constructor id="4633" addr="0x7fdf085039b0" >
+                            <attributelist id="4634" addr="0x7fdf085039b0" >
+                                <attribute name="name" value="Keyboard" id="4635" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="4636" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf08502fd0" id="4637" addr="0x7fdf08502fd0" />
+                                <attribute name="sym_previousSibling" value="0x7fdf085037f0" id="4638" addr="0x7fdf085037f0" />
+                                <attribute name="sym_name" value="Keyboard" id="4639" addr="0x7fdf085119d0" />
+                                <attribute name="csym_nextSibling" value="0x7fdf08503a90" id="4640" addr="0x7fdf08503a90" />
+                                <attribute name="sym_nextSibling" value="0x7fdf08503a90" id="4641" addr="0x7fdf08503a90" />
+                                <attribute name="defaultargs" value="0x7fdf08503590" id="4642" addr="0x7fdf08503590" />
+                                <attribute name="decl" value="f(r.q(const).String)." id="4643" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4644" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overloaded" value="0x7fdf08503590" id="4645" addr="0x7fdf08503590" />
+                                <attribute name="feature_python_nokwds" value="true" id="4646" addr="0x7fdf085119d0" />
+                                <parmlist id="4647" addr="0x7fdf08503890" >
                                     <parm id="4648">
-                                        <attributelist id="4649" addr="0x7ff9f1fac890" >
-                                            <attribute name="name" value="line" id="4650" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="4651" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4652" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="4649" addr="0x7fdf08503890" >
+                                            <attribute name="name" value="line" id="4650" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="4651" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4652" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_2" id="4653" addr="0x7ff9f1fba9d0" />
-                                <attribute name="feature_new" value="1" id="4654" addr="0x7ff9f1fba9d0" />
+                                <attribute name="sym_overname" value="__SWIG_2" id="4653" addr="0x7fdf085119d0" />
+                                <attribute name="feature_new" value="1" id="4654" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="4655" addr="0x7ff9f1faca90" >
-                            <attributelist id="4656" addr="0x7ff9f1faca90" >
-                                <attribute name="name" value="Keyboard" id="4657" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="4658" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fabfd0" id="4659" addr="0x7ff9f1fabfd0" />
-                                <attribute name="sym_previousSibling" value="0x7ff9f1fac9b0" id="4660" addr="0x7ff9f1fac9b0" />
-                                <attribute name="sym_name" value="Keyboard" id="4661" addr="0x7ff9f1fba9d0" />
-                                <attribute name="defaultargs" value="0x7ff9f1fac590" id="4662" addr="0x7ff9f1fac590" />
-                                <attribute name="decl" value="f()." id="4663" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4664" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overloaded" value="0x7ff9f1fac590" id="4665" addr="0x7ff9f1fac590" />
-                                <attribute name="feature_python_nokwds" value="true" id="4666" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_3" id="4667" addr="0x7ff9f1fba9d0" />
-                                <attribute name="feature_new" value="1" id="4668" addr="0x7ff9f1fba9d0" />
+                        <constructor id="4655" addr="0x7fdf08503a90" >
+                            <attributelist id="4656" addr="0x7fdf08503a90" >
+                                <attribute name="name" value="Keyboard" id="4657" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="4658" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf08502fd0" id="4659" addr="0x7fdf08502fd0" />
+                                <attribute name="sym_previousSibling" value="0x7fdf085039b0" id="4660" addr="0x7fdf085039b0" />
+                                <attribute name="sym_name" value="Keyboard" id="4661" addr="0x7fdf085119d0" />
+                                <attribute name="defaultargs" value="0x7fdf08503590" id="4662" addr="0x7fdf08503590" />
+                                <attribute name="decl" value="f()." id="4663" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4664" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overloaded" value="0x7fdf08503590" id="4665" addr="0x7fdf08503590" />
+                                <attribute name="feature_python_nokwds" value="true" id="4666" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_3" id="4667" addr="0x7fdf085119d0" />
+                                <attribute name="feature_new" value="1" id="4668" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </constructor >
-                        <destructor id="4669" addr="0x7ff9f1facc50" >
-                            <attributelist id="4670" addr="0x7ff9f1facc50" >
-                                <attribute name="ismember" value="1" id="4671" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="~Keyboard" id="4672" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="~Keyboard" id="4673" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="4674" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4675" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fabfd0" id="4676" addr="0x7ff9f1fabfd0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4677" addr="0x7ff9f1fba9d0" />
+                        <destructor id="4669" addr="0x7fdf08503c50" >
+                            <attributelist id="4670" addr="0x7fdf08503c50" >
+                                <attribute name="ismember" value="1" id="4671" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="~Keyboard" id="4672" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="~Keyboard" id="4673" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="4674" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4675" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf08502fd0" id="4676" addr="0x7fdf08502fd0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4677" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </destructor >
-                        <cdecl id="4678" addr="0x7ff9f1facf50" >
-                            <attributelist id="4679" addr="0x7ff9f1facf50" >
-                                <attribute name="name" value="doModal" id="4680" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="4681" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fabfd0" id="4682" addr="0x7ff9f1fabfd0" />
-                                <attribute name="sym_nextSibling" value="0x7ff9f1fad050" id="4683" addr="0x7ff9f1fad050" />
-                                <attribute name="csym_nextSibling" value="0x7ff9f1fad050" id="4684" addr="0x7ff9f1fad050" />
-                                <attribute name="kind" value="function" id="4685" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="doModal" id="4686" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(int)." id="4687" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4688" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overloaded" value="0x7ff9f1facf50" id="4689" addr="0x7ff9f1facf50" />
-                                <parmlist id="4690" addr="0x7ff9f1face90" >
+                        <cdecl id="4678" addr="0x7fdf08503f50" >
+                            <attributelist id="4679" addr="0x7fdf08503f50" >
+                                <attribute name="name" value="doModal" id="4680" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="4681" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf08502fd0" id="4682" addr="0x7fdf08502fd0" />
+                                <attribute name="sym_nextSibling" value="0x7fdf08504050" id="4683" addr="0x7fdf08504050" />
+                                <attribute name="csym_nextSibling" value="0x7fdf08504050" id="4684" addr="0x7fdf08504050" />
+                                <attribute name="kind" value="function" id="4685" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="doModal" id="4686" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(int)." id="4687" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4688" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overloaded" value="0x7fdf08503f50" id="4689" addr="0x7fdf08503f50" />
+                                <parmlist id="4690" addr="0x7fdf08503e90" >
                                     <parm id="4691">
-                                        <attributelist id="4692" addr="0x7ff9f1face90" >
-                                            <attribute name="name" value="autoclose" id="4693" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="0" id="4694" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="int" id="4695" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="4692" addr="0x7fdf08503e90" >
+                                            <attribute name="name" value="autoclose" id="4693" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="0" id="4694" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="int" id="4695" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="4696" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4697" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4698" addr="0x7ff9f1fad050" >
-                            <attributelist id="4699" addr="0x7ff9f1fad050" >
-                                <attribute name="name" value="doModal" id="4700" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="4701" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fabfd0" id="4702" addr="0x7ff9f1fabfd0" />
-                                <attribute name="sym_previousSibling" value="0x7ff9f1facf50" id="4703" addr="0x7ff9f1facf50" />
-                                <attribute name="kind" value="function" id="4704" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="doModal" id="4705" addr="0x7ff9f1fba9d0" />
-                                <attribute name="defaultargs" value="0x7ff9f1facf50" id="4706" addr="0x7ff9f1facf50" />
-                                <attribute name="decl" value="f()." id="4707" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4708" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overloaded" value="0x7ff9f1facf50" id="4709" addr="0x7ff9f1facf50" />
-                                <attribute name="type" value="void" id="4710" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="4711" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4712" addr="0x7ff9f1fad3d0" >
-                            <attributelist id="4713" addr="0x7ff9f1fad3d0" >
-                                <attribute name="name" value="setDefault" id="4714" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="4715" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fabfd0" id="4716" addr="0x7ff9f1fabfd0" />
-                                <attribute name="sym_nextSibling" value="0x7ff9f1fad4d0" id="4717" addr="0x7ff9f1fad4d0" />
-                                <attribute name="csym_nextSibling" value="0x7ff9f1fad4d0" id="4718" addr="0x7ff9f1fad4d0" />
-                                <attribute name="kind" value="function" id="4719" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="setDefault" id="4720" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="4721" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4722" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overloaded" value="0x7ff9f1fad3d0" id="4723" addr="0x7ff9f1fad3d0" />
-                                <parmlist id="4724" addr="0x7ff9f1fad310" >
+                                <attribute name="type" value="void" id="4696" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4697" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4698" addr="0x7fdf08504050" >
+                            <attributelist id="4699" addr="0x7fdf08504050" >
+                                <attribute name="name" value="doModal" id="4700" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="4701" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf08502fd0" id="4702" addr="0x7fdf08502fd0" />
+                                <attribute name="sym_previousSibling" value="0x7fdf08503f50" id="4703" addr="0x7fdf08503f50" />
+                                <attribute name="kind" value="function" id="4704" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="doModal" id="4705" addr="0x7fdf085119d0" />
+                                <attribute name="defaultargs" value="0x7fdf08503f50" id="4706" addr="0x7fdf08503f50" />
+                                <attribute name="decl" value="f()." id="4707" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4708" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overloaded" value="0x7fdf08503f50" id="4709" addr="0x7fdf08503f50" />
+                                <attribute name="type" value="void" id="4710" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="4711" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4712" addr="0x7fdf085043d0" >
+                            <attributelist id="4713" addr="0x7fdf085043d0" >
+                                <attribute name="name" value="setDefault" id="4714" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="4715" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf08502fd0" id="4716" addr="0x7fdf08502fd0" />
+                                <attribute name="sym_nextSibling" value="0x7fdf085044d0" id="4717" addr="0x7fdf085044d0" />
+                                <attribute name="csym_nextSibling" value="0x7fdf085044d0" id="4718" addr="0x7fdf085044d0" />
+                                <attribute name="kind" value="function" id="4719" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="setDefault" id="4720" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="4721" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4722" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overloaded" value="0x7fdf085043d0" id="4723" addr="0x7fdf085043d0" />
+                                <parmlist id="4724" addr="0x7fdf08504310" >
                                     <parm id="4725">
-                                        <attributelist id="4726" addr="0x7ff9f1fad310" >
-                                            <attribute name="name" value="line" id="4727" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="4728" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4729" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="4726" addr="0x7fdf08504310" >
+                                            <attribute name="name" value="line" id="4727" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="4728" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4729" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="4730" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4731" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4732" addr="0x7ff9f1fad4d0" >
-                            <attributelist id="4733" addr="0x7ff9f1fad4d0" >
-                                <attribute name="name" value="setDefault" id="4734" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="4735" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fabfd0" id="4736" addr="0x7ff9f1fabfd0" />
-                                <attribute name="sym_previousSibling" value="0x7ff9f1fad3d0" id="4737" addr="0x7ff9f1fad3d0" />
-                                <attribute name="kind" value="function" id="4738" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="setDefault" id="4739" addr="0x7ff9f1fba9d0" />
-                                <attribute name="defaultargs" value="0x7ff9f1fad3d0" id="4740" addr="0x7ff9f1fad3d0" />
-                                <attribute name="decl" value="f()." id="4741" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4742" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overloaded" value="0x7ff9f1fad3d0" id="4743" addr="0x7ff9f1fad3d0" />
-                                <attribute name="type" value="void" id="4744" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="4745" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4746" addr="0x7ff9f1fad7f0" >
-                            <attributelist id="4747" addr="0x7ff9f1fad7f0" >
-                                <attribute name="name" value="setHiddenInput" id="4748" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="4749" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fabfd0" id="4750" addr="0x7ff9f1fabfd0" />
-                                <attribute name="sym_nextSibling" value="0x7ff9f1fad8f0" id="4751" addr="0x7ff9f1fad8f0" />
-                                <attribute name="csym_nextSibling" value="0x7ff9f1fad8f0" id="4752" addr="0x7ff9f1fad8f0" />
-                                <attribute name="kind" value="function" id="4753" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="setHiddenInput" id="4754" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(bool)." id="4755" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4756" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overloaded" value="0x7ff9f1fad7f0" id="4757" addr="0x7ff9f1fad7f0" />
-                                <parmlist id="4758" addr="0x7ff9f1fad730" >
+                                <attribute name="type" value="void" id="4730" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4731" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4732" addr="0x7fdf085044d0" >
+                            <attributelist id="4733" addr="0x7fdf085044d0" >
+                                <attribute name="name" value="setDefault" id="4734" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="4735" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf08502fd0" id="4736" addr="0x7fdf08502fd0" />
+                                <attribute name="sym_previousSibling" value="0x7fdf085043d0" id="4737" addr="0x7fdf085043d0" />
+                                <attribute name="kind" value="function" id="4738" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="setDefault" id="4739" addr="0x7fdf085119d0" />
+                                <attribute name="defaultargs" value="0x7fdf085043d0" id="4740" addr="0x7fdf085043d0" />
+                                <attribute name="decl" value="f()." id="4741" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4742" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overloaded" value="0x7fdf085043d0" id="4743" addr="0x7fdf085043d0" />
+                                <attribute name="type" value="void" id="4744" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="4745" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4746" addr="0x7fdf085047f0" >
+                            <attributelist id="4747" addr="0x7fdf085047f0" >
+                                <attribute name="name" value="setHiddenInput" id="4748" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="4749" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf08502fd0" id="4750" addr="0x7fdf08502fd0" />
+                                <attribute name="sym_nextSibling" value="0x7fdf085048f0" id="4751" addr="0x7fdf085048f0" />
+                                <attribute name="csym_nextSibling" value="0x7fdf085048f0" id="4752" addr="0x7fdf085048f0" />
+                                <attribute name="kind" value="function" id="4753" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="setHiddenInput" id="4754" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(bool)." id="4755" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4756" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overloaded" value="0x7fdf085047f0" id="4757" addr="0x7fdf085047f0" />
+                                <parmlist id="4758" addr="0x7fdf08504730" >
                                     <parm id="4759">
-                                        <attributelist id="4760" addr="0x7ff9f1fad730" >
-                                            <attribute name="name" value="hidden" id="4761" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="false" id="4762" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="bool" id="4763" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="4760" addr="0x7fdf08504730" >
+                                            <attribute name="name" value="hidden" id="4761" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="false" id="4762" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="bool" id="4763" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="4764" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4765" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4766" addr="0x7ff9f1fad8f0" >
-                            <attributelist id="4767" addr="0x7ff9f1fad8f0" >
-                                <attribute name="name" value="setHiddenInput" id="4768" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="4769" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fabfd0" id="4770" addr="0x7ff9f1fabfd0" />
-                                <attribute name="sym_previousSibling" value="0x7ff9f1fad7f0" id="4771" addr="0x7ff9f1fad7f0" />
-                                <attribute name="kind" value="function" id="4772" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="setHiddenInput" id="4773" addr="0x7ff9f1fba9d0" />
-                                <attribute name="defaultargs" value="0x7ff9f1fad7f0" id="4774" addr="0x7ff9f1fad7f0" />
-                                <attribute name="decl" value="f()." id="4775" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4776" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overloaded" value="0x7ff9f1fad7f0" id="4777" addr="0x7ff9f1fad7f0" />
-                                <attribute name="type" value="void" id="4778" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="4779" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4780" addr="0x7ff9f1fadc10" >
-                            <attributelist id="4781" addr="0x7ff9f1fadc10" >
-                                <attribute name="name" value="setHeading" id="4782" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="4783" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fabfd0" id="4784" addr="0x7ff9f1fabfd0" />
-                                <attribute name="kind" value="function" id="4785" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="setHeading" id="4786" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="4787" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4788" addr="0x7ff9f1fba9d0" />
-                                <parmlist id="4789" addr="0x7ff9f1fadb50" >
+                                <attribute name="type" value="void" id="4764" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4765" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4766" addr="0x7fdf085048f0" >
+                            <attributelist id="4767" addr="0x7fdf085048f0" >
+                                <attribute name="name" value="setHiddenInput" id="4768" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="4769" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf08502fd0" id="4770" addr="0x7fdf08502fd0" />
+                                <attribute name="sym_previousSibling" value="0x7fdf085047f0" id="4771" addr="0x7fdf085047f0" />
+                                <attribute name="kind" value="function" id="4772" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="setHiddenInput" id="4773" addr="0x7fdf085119d0" />
+                                <attribute name="defaultargs" value="0x7fdf085047f0" id="4774" addr="0x7fdf085047f0" />
+                                <attribute name="decl" value="f()." id="4775" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4776" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overloaded" value="0x7fdf085047f0" id="4777" addr="0x7fdf085047f0" />
+                                <attribute name="type" value="void" id="4778" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="4779" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4780" addr="0x7fdf08504c10" >
+                            <attributelist id="4781" addr="0x7fdf08504c10" >
+                                <attribute name="name" value="setHeading" id="4782" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="4783" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf08502fd0" id="4784" addr="0x7fdf08502fd0" />
+                                <attribute name="kind" value="function" id="4785" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="setHeading" id="4786" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="4787" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4788" addr="0x7fdf085119d0" />
+                                <parmlist id="4789" addr="0x7fdf08504b50" >
                                     <parm id="4790">
-                                        <attributelist id="4791" addr="0x7ff9f1fadb50" >
-                                            <attribute name="name" value="heading" id="4792" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4793" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="4791" addr="0x7fdf08504b50" >
+                                            <attribute name="name" value="heading" id="4792" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4793" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="4794" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4795" addr="0x7ff9f1fba9d0" />
+                                <attribute name="type" value="void" id="4794" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4795" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="4796" addr="0x7ff9f1faddf0" >
-                            <attributelist id="4797" addr="0x7ff9f1faddf0" >
-                                <attribute name="ismember" value="1" id="4798" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getText" id="4799" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getText" id="4800" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="4801" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4802" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="4803" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="4804" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fabfd0" id="4805" addr="0x7ff9f1fabfd0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4806" addr="0x7ff9f1fba9d0" />
+                        <cdecl id="4796" addr="0x7fdf08504df0" >
+                            <attributelist id="4797" addr="0x7fdf08504df0" >
+                                <attribute name="ismember" value="1" id="4798" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getText" id="4799" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getText" id="4800" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="4801" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4802" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="4803" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="4804" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf08502fd0" id="4805" addr="0x7fdf08502fd0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4806" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="4807" addr="0x7ff9f1fadfb0" >
-                            <attributelist id="4808" addr="0x7ff9f1fadfb0" >
-                                <attribute name="ismember" value="1" id="4809" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="isConfirmed" id="4810" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="isConfirmed" id="4811" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="4812" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4813" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="4814" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="bool" id="4815" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fabfd0" id="4816" addr="0x7ff9f1fabfd0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4817" addr="0x7ff9f1fba9d0" />
+                        <cdecl id="4807" addr="0x7fdf08504fb0" >
+                            <attributelist id="4808" addr="0x7fdf08504fb0" >
+                                <attribute name="ismember" value="1" id="4809" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="isConfirmed" id="4810" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="isConfirmed" id="4811" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="4812" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4813" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="4814" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="bool" id="4815" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf08502fd0" id="4816" addr="0x7fdf08502fd0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4817" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </cdecl >
@@ -6755,622 +6755,622 @@
                 </namespace >
             </namespace >
         </include >
-        <include id="4818" addr="0x7ff9f1fae1d0" >
-            <attributelist id="4819" addr="0x7ff9f1fae1d0" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/PlayList.h" id="4820" addr="0x7ff9f1fba9d0" />
+        <include id="4818" addr="0x7fdf085051d0" >
+            <attributelist id="4819" addr="0x7fdf085051d0" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/PlayList.h" id="4820" addr="0x7fdf085119d0" />
             </attributelist >
 
-            <namespace id="4821" addr="0x7ff9f1fae270" >
-                <attributelist id="4822" addr="0x7ff9f1fae270" >
-                    <attribute name="sym_name" value="XBMCAddon" id="4823" addr="0x7ff9f1fba9d0" />
-                    <attribute name="name" value="XBMCAddon" id="4824" addr="0x7ff9f1fba9d0" />
-                    <attribute name="sym_previousSibling" value="0x7ff9f1fabad0" id="4825" addr="0x7ff9f1fabad0" />
-                    <attribute name="csym_nextSibling" value="0x7ff9f1fb1150" id="4826" addr="0x7ff9f1fb1150" />
-                    <attribute name="sym_nextSibling" value="0x7ff9f1fb1150" id="4827" addr="0x7ff9f1fb1150" />
-                    <typescope id="4828" addr="0x7ff9f1fb4990" >
-                        <attributelist id="4829" addr="0x7ff9f1fb4990" >
-                            <attribute name="name" value="XBMCAddon" id="4830" addr="0x7ff9f1fba9d0" />
-                            <typetab id="4831" addr="0x7ff9f1fb49d0" >
-                                <attributelist id="4832" addr="0x7ff9f1fb49d0" >
-                                    <attribute name="String" value="std::string" id="4833" addr="0x7ff9f1fba9d0" />
+            <namespace id="4821" addr="0x7fdf08505270" >
+                <attributelist id="4822" addr="0x7fdf08505270" >
+                    <attribute name="sym_name" value="XBMCAddon" id="4823" addr="0x7fdf085119d0" />
+                    <attribute name="name" value="XBMCAddon" id="4824" addr="0x7fdf085119d0" />
+                    <attribute name="sym_previousSibling" value="0x7fdf08502ad0" id="4825" addr="0x7fdf08502ad0" />
+                    <attribute name="csym_nextSibling" value="0x7fdf08508150" id="4826" addr="0x7fdf08508150" />
+                    <attribute name="sym_nextSibling" value="0x7fdf08508150" id="4827" addr="0x7fdf08508150" />
+                    <typescope id="4828" addr="0x7fdf0850b990" >
+                        <attributelist id="4829" addr="0x7fdf0850b990" >
+                            <attribute name="name" value="XBMCAddon" id="4830" addr="0x7fdf085119d0" />
+                            <typetab id="4831" addr="0x7fdf0850b9d0" >
+                                <attributelist id="4832" addr="0x7fdf0850b9d0" >
+                                    <attribute name="String" value="std::string" id="4833" addr="0x7fdf085119d0" />
                                 </attributelist >
-                                <typetabsitem id="4834" addr="0x7ff9f1fb4bb0" >
-                                    <attributelist id="4835" addr="0x7ff9f1fb4bb0" >
+                                <typetabsitem id="4834" addr="0x7fdf0850bbb0" >
+                                    <attributelist id="4835" addr="0x7fdf0850bbb0" >
                                     </attributelist >
                                 </typetabsitem >
                             </typetab >
-                            <attribute name="parent" value="0x7ff9f1f72a30" id="4836" addr="0x7ff9f1f72a30" />
-                            <attribute name="qname" value="XBMCAddon" id="4837" addr="0x7ff9f1fba9d0" />
-                            <attribute name="symtab" value="0x7ff9f1f89bb0" id="4838" addr="0x7ff9f1f89bb0" />
+                            <attribute name="parent" value="0x7fdf084c9a30" id="4836" addr="0x7fdf084c9a30" />
+                            <attribute name="qname" value="XBMCAddon" id="4837" addr="0x7fdf085119d0" />
+                            <attribute name="symtab" value="0x7fdf084e0bb0" id="4838" addr="0x7fdf084e0bb0" />
                         </attributelist >
-                        <typescopesitem id="4839" addr="0x7ff9f1f89b70" >
-                            <attributelist id="4840" addr="0x7ff9f1f89b70" >
+                        <typescopesitem id="4839" addr="0x7fdf084e0b70" >
+                            <attributelist id="4840" addr="0x7fdf084e0b70" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="4841" addr="0x7ff9f1fb49d0" >
-                            <attributelist id="4842" addr="0x7ff9f1fb49d0" >
-                                <attribute name="String" value="std::string" id="4843" addr="0x7ff9f1fba9d0" />
+                        <typescopesitem id="4841" addr="0x7fdf0850b9d0" >
+                            <attributelist id="4842" addr="0x7fdf0850b9d0" >
+                                <attribute name="String" value="std::string" id="4843" addr="0x7fdf085119d0" />
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="4844" addr="0x7ff9f1f72a30" >
-                            <attributelist id="4845" addr="0x7ff9f1f72a30" >
-                                <attribute name="name" value="" id="4846" addr="0x7ff9f1fba9d0" />
-                                <typetab id="4847" addr="0x7ff9f1f72a90" >
-                                    <attributelist id="4848" addr="0x7ff9f1f72a90" >
-                                        <attribute name="CGUIDialogKeyboardGeneric" value="CGUIDialogKeyboardGeneric" id="4849" addr="0x7ff9f1fba9d0" />
+                        <typescopesitem id="4844" addr="0x7fdf084c9a30" >
+                            <attributelist id="4845" addr="0x7fdf084c9a30" >
+                                <attribute name="name" value="" id="4846" addr="0x7fdf085119d0" />
+                                <typetab id="4847" addr="0x7fdf084c9a90" >
+                                    <attributelist id="4848" addr="0x7fdf084c9a90" >
+                                        <attribute name="CGUIDialogKeyboardGeneric" value="CGUIDialogKeyboardGeneric" id="4849" addr="0x7fdf085119d0" />
                                     </attributelist >
-                                    <typetabsitem id="4850" addr="0x7ff9f1fb7950" >
-                                        <attributelist id="4851" addr="0x7ff9f1fb7950" >
+                                    <typetabsitem id="4850" addr="0x7fdf0850e950" >
+                                        <attributelist id="4851" addr="0x7fdf0850e950" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="4852" addr="0x7ff9f1fb4ad0" >
-                            <attributelist id="4853" addr="0x7ff9f1fb4ad0" >
+                        <typescopesitem id="4852" addr="0x7fdf0850bad0" >
+                            <attributelist id="4853" addr="0x7fdf0850bad0" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="4854" addr="0x7ff9f1f89bb0" >
-                            <attributelist id="4855" addr="0x7ff9f1f89bb0" >
-                                <attribute name="name" value="XBMCAddon" id="4856" addr="0x7ff9f1fba9d0" />
-                                <attribute name="csymtab" value="0x7ff9f1f89bf0" id="4857" addr="0x7ff9f1f89bf0" />
-                                <attribute name="symtab" value="0x7ff9f1f89b90" id="4858" addr="0x7ff9f1f89b90" />
+                        <typescopesitem id="4854" addr="0x7fdf084e0bb0" >
+                            <attributelist id="4855" addr="0x7fdf084e0bb0" >
+                                <attribute name="name" value="XBMCAddon" id="4856" addr="0x7fdf085119d0" />
+                                <attribute name="csymtab" value="0x7fdf084e0bf0" id="4857" addr="0x7fdf084e0bf0" />
+                                <attribute name="symtab" value="0x7fdf084e0b90" id="4858" addr="0x7fdf084e0b90" />
                             </attributelist >
                         </typescopesitem >
                     </typescope >
-                    <attribute name="symtab" value="0x7ff9f1f89bb0" id="4859" addr="0x7ff9f1f89bb0" />
-                    <attribute name="sym_symtab" value="0x7ff9f1f72950" id="4860" addr="0x7ff9f1f72950" />
+                    <attribute name="symtab" value="0x7fdf084e0bb0" id="4859" addr="0x7fdf084e0bb0" />
+                    <attribute name="sym_symtab" value="0x7fdf084c9950" id="4860" addr="0x7fdf084c9950" />
                 </attributelist >
 
-                <namespace id="4861" addr="0x7ff9f1fae2f0" >
-                    <attributelist id="4862" addr="0x7ff9f1fae2f0" >
-                        <attribute name="feature_knownbasetypes" value="AddonClass,IPlayerCallback,AddonCallback" id="4863" addr="0x7ff9f1fba9d0" />
-                        <attribute name="name" value="xbmc" id="4864" addr="0x7ff9f1fba9d0" />
-                        <attribute name="sym_symtab" value="0x7ff9f1f89bb0" id="4865" addr="0x7ff9f1f89bb0" />
-                        <attribute name="symtab" value="0x7ff9f1f8a2b0" id="4866" addr="0x7ff9f1f8a2b0" />
-                        <attribute name="sym_nextSibling" value="0x7ff9f1fb11d0" id="4867" addr="0x7ff9f1fb11d0" />
-                        <attribute name="csym_nextSibling" value="0x7ff9f1fb11d0" id="4868" addr="0x7ff9f1fb11d0" />
-                        <attribute name="sym_previousSibling" value="0x7ff9f1fabb50" id="4869" addr="0x7ff9f1fabb50" />
-                        <attribute name="feature_knownapitypes" value="XBMCAddon::xbmcgui::ListItem,XBMCAddon::xbmc::PlayListItem" id="4870" addr="0x7ff9f1fba9d0" />
-                        <attribute name="sym_name" value="xbmc" id="4871" addr="0x7ff9f1fba9d0" />
-                        <typescope id="4872" addr="0x7ff9f1fb4d70" >
-                            <attributelist id="4873" addr="0x7ff9f1fb4d70" >
-                                <attribute name="name" value="xbmc" id="4874" addr="0x7ff9f1fba9d0" />
-                                <typetab id="4875" addr="0x7ff9f1fb4d90" >
-                                    <attributelist id="4876" addr="0x7ff9f1fb4d90" >
-                                        <attribute name="Monitor" value="Monitor" id="4877" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="4878" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="Keyboard" value="Keyboard" id="4879" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="4880" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="InfoTagVideo" value="InfoTagVideo" id="4881" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="Player" value="Player" id="4882" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="InfoTagMusic" value="InfoTagMusic" id="4883" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="PlayList" value="PlayList" id="4884" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="RenderCapture" value="RenderCapture" id="4885" addr="0x7ff9f1fba9d0" />
+                <namespace id="4861" addr="0x7fdf085052f0" >
+                    <attributelist id="4862" addr="0x7fdf085052f0" >
+                        <attribute name="feature_knownbasetypes" value="AddonClass,IPlayerCallback,AddonCallback" id="4863" addr="0x7fdf085119d0" />
+                        <attribute name="name" value="xbmc" id="4864" addr="0x7fdf085119d0" />
+                        <attribute name="sym_symtab" value="0x7fdf084e0bb0" id="4865" addr="0x7fdf084e0bb0" />
+                        <attribute name="symtab" value="0x7fdf084e12b0" id="4866" addr="0x7fdf084e12b0" />
+                        <attribute name="sym_nextSibling" value="0x7fdf085081d0" id="4867" addr="0x7fdf085081d0" />
+                        <attribute name="csym_nextSibling" value="0x7fdf085081d0" id="4868" addr="0x7fdf085081d0" />
+                        <attribute name="sym_previousSibling" value="0x7fdf08502b50" id="4869" addr="0x7fdf08502b50" />
+                        <attribute name="feature_knownapitypes" value="XBMCAddon::xbmcgui::ListItem,XBMCAddon::xbmc::PlayListItem" id="4870" addr="0x7fdf085119d0" />
+                        <attribute name="sym_name" value="xbmc" id="4871" addr="0x7fdf085119d0" />
+                        <typescope id="4872" addr="0x7fdf0850bd70" >
+                            <attributelist id="4873" addr="0x7fdf0850bd70" >
+                                <attribute name="name" value="xbmc" id="4874" addr="0x7fdf085119d0" />
+                                <typetab id="4875" addr="0x7fdf0850bd90" >
+                                    <attributelist id="4876" addr="0x7fdf0850bd90" >
+                                        <attribute name="Monitor" value="Monitor" id="4877" addr="0x7fdf085119d0" />
+                                        <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="4878" addr="0x7fdf085119d0" />
+                                        <attribute name="Keyboard" value="Keyboard" id="4879" addr="0x7fdf085119d0" />
+                                        <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="4880" addr="0x7fdf085119d0" />
+                                        <attribute name="InfoTagVideo" value="InfoTagVideo" id="4881" addr="0x7fdf085119d0" />
+                                        <attribute name="Player" value="Player" id="4882" addr="0x7fdf085119d0" />
+                                        <attribute name="InfoTagMusic" value="InfoTagMusic" id="4883" addr="0x7fdf085119d0" />
+                                        <attribute name="PlayList" value="PlayList" id="4884" addr="0x7fdf085119d0" />
+                                        <attribute name="RenderCapture" value="RenderCapture" id="4885" addr="0x7fdf085119d0" />
                                     </attributelist >
-                                    <typetabsitem id="4886" addr="0x7ff9f1fb9b10" >
-                                        <attributelist id="4887" addr="0x7ff9f1fb9b10" >
+                                    <typetabsitem id="4886" addr="0x7fdf08510b10" >
+                                        <attributelist id="4887" addr="0x7fdf08510b10" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="4888" addr="0x7ff9f1fb7f30" >
-                                        <attributelist id="4889" addr="0x7ff9f1fb7f30" >
+                                    <typetabsitem id="4888" addr="0x7fdf0850ef30" >
+                                        <attributelist id="4889" addr="0x7fdf0850ef30" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="4890" addr="0x7ff9f1fb8990" >
-                                        <attributelist id="4891" addr="0x7ff9f1fb8990" >
+                                    <typetabsitem id="4890" addr="0x7fdf0850f990" >
+                                        <attributelist id="4891" addr="0x7fdf0850f990" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="4892" addr="0x7ff9f1fb5e90" >
-                                        <attributelist id="4893" addr="0x7ff9f1fb5e90" >
+                                    <typetabsitem id="4892" addr="0x7fdf0850ce90" >
+                                        <attributelist id="4893" addr="0x7fdf0850ce90" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="4894" addr="0x7ff9f1fb8310" >
-                                        <attributelist id="4895" addr="0x7ff9f1fb8310" >
+                                    <typetabsitem id="4894" addr="0x7fdf0850f310" >
+                                        <attributelist id="4895" addr="0x7fdf0850f310" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="4896" addr="0x7ff9f1fb6050" >
-                                        <attributelist id="4897" addr="0x7ff9f1fb6050" >
+                                    <typetabsitem id="4896" addr="0x7fdf0850d050" >
+                                        <attributelist id="4897" addr="0x7fdf0850d050" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="4898" addr="0x7ff9f1fb7b50" >
-                                        <attributelist id="4899" addr="0x7ff9f1fb7b50" >
+                                    <typetabsitem id="4898" addr="0x7fdf0850eb50" >
+                                        <attributelist id="4899" addr="0x7fdf0850eb50" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="4900" addr="0x7ff9f1fb91b0" >
-                                        <attributelist id="4901" addr="0x7ff9f1fb91b0" >
+                                    <typetabsitem id="4900" addr="0x7fdf085101b0" >
+                                        <attributelist id="4901" addr="0x7fdf085101b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="4902" addr="0x7ff9f1fb7490" >
-                                        <attributelist id="4903" addr="0x7ff9f1fb7490" >
+                                    <typetabsitem id="4902" addr="0x7fdf0850e490" >
+                                        <attributelist id="4903" addr="0x7fdf0850e490" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
-                                <attribute name="parent" value="0x7ff9f1fb4990" id="4904" addr="0x7ff9f1fb4990" />
-                                <attribute name="qname" value="XBMCAddon::xbmc" id="4905" addr="0x7ff9f1fba9d0" />
-                                <attribute name="symtab" value="0x7ff9f1f8a2b0" id="4906" addr="0x7ff9f1f8a2b0" />
+                                <attribute name="parent" value="0x7fdf0850b990" id="4904" addr="0x7fdf0850b990" />
+                                <attribute name="qname" value="XBMCAddon::xbmc" id="4905" addr="0x7fdf085119d0" />
+                                <attribute name="symtab" value="0x7fdf084e12b0" id="4906" addr="0x7fdf084e12b0" />
                             </attributelist >
-                            <typescopesitem id="4907" addr="0x7ff9f1f8a270" >
-                                <attributelist id="4908" addr="0x7ff9f1f8a270" >
+                            <typescopesitem id="4907" addr="0x7fdf084e1270" >
+                                <attributelist id="4908" addr="0x7fdf084e1270" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="4909" addr="0x7ff9f1fb4d90" >
-                                <attributelist id="4910" addr="0x7ff9f1fb4d90" >
-                                    <attribute name="Monitor" value="Monitor" id="4911" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="4912" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="Keyboard" value="Keyboard" id="4913" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="4914" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="InfoTagVideo" value="InfoTagVideo" id="4915" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="Player" value="Player" id="4916" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="InfoTagMusic" value="InfoTagMusic" id="4917" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="PlayList" value="PlayList" id="4918" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="RenderCapture" value="RenderCapture" id="4919" addr="0x7ff9f1fba9d0" />
+                            <typescopesitem id="4909" addr="0x7fdf0850bd90" >
+                                <attributelist id="4910" addr="0x7fdf0850bd90" >
+                                    <attribute name="Monitor" value="Monitor" id="4911" addr="0x7fdf085119d0" />
+                                    <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="4912" addr="0x7fdf085119d0" />
+                                    <attribute name="Keyboard" value="Keyboard" id="4913" addr="0x7fdf085119d0" />
+                                    <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="4914" addr="0x7fdf085119d0" />
+                                    <attribute name="InfoTagVideo" value="InfoTagVideo" id="4915" addr="0x7fdf085119d0" />
+                                    <attribute name="Player" value="Player" id="4916" addr="0x7fdf085119d0" />
+                                    <attribute name="InfoTagMusic" value="InfoTagMusic" id="4917" addr="0x7fdf085119d0" />
+                                    <attribute name="PlayList" value="PlayList" id="4918" addr="0x7fdf085119d0" />
+                                    <attribute name="RenderCapture" value="RenderCapture" id="4919" addr="0x7fdf085119d0" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="4920" addr="0x7ff9f1fb4990" >
-                                <attributelist id="4921" addr="0x7ff9f1fb4990" >
-                                    <attribute name="name" value="XBMCAddon" id="4922" addr="0x7ff9f1fba9d0" />
-                                    <typetab id="4923" addr="0x7ff9f1fb49d0" >
-                                        <attributelist id="4924" addr="0x7ff9f1fb49d0" >
-                                            <attribute name="String" value="std::string" id="4925" addr="0x7ff9f1fba9d0" />
-                                        </attributelist >
-                                        <typetabsitem id="4926" addr="0x7ff9f1fb4bb0" >
-                                            <attributelist id="4927" addr="0x7ff9f1fb4bb0" >
+                            <typescopesitem id="4920" addr="0x7fdf0850b990" >
+                                <attributelist id="4921" addr="0x7fdf0850b990" >
+                                    <attribute name="name" value="XBMCAddon" id="4922" addr="0x7fdf085119d0" />
+                                    <typetab id="4923" addr="0x7fdf0850b9d0" >
+                                        <attributelist id="4924" addr="0x7fdf0850b9d0" >
+                                            <attribute name="String" value="std::string" id="4925" addr="0x7fdf085119d0" />
+                                        </attributelist >
+                                        <typetabsitem id="4926" addr="0x7fdf0850bbb0" >
+                                            <attributelist id="4927" addr="0x7fdf0850bbb0" >
                                             </attributelist >
                                         </typetabsitem >
                                     </typetab >
-                                    <attribute name="parent" value="0x7ff9f1f72a30" id="4928" addr="0x7ff9f1f72a30" />
-                                    <attribute name="qname" value="XBMCAddon" id="4929" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="symtab" value="0x7ff9f1f89bb0" id="4930" addr="0x7ff9f1f89bb0" />
+                                    <attribute name="parent" value="0x7fdf084c9a30" id="4928" addr="0x7fdf084c9a30" />
+                                    <attribute name="qname" value="XBMCAddon" id="4929" addr="0x7fdf085119d0" />
+                                    <attribute name="symtab" value="0x7fdf084e0bb0" id="4930" addr="0x7fdf084e0bb0" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="4931" addr="0x7ff9f1fb4db0" >
-                                <attributelist id="4932" addr="0x7ff9f1fb4db0" >
+                            <typescopesitem id="4931" addr="0x7fdf0850bdb0" >
+                                <attributelist id="4932" addr="0x7fdf0850bdb0" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="4933" addr="0x7ff9f1f8a2b0" >
-                                <attributelist id="4934" addr="0x7ff9f1f8a2b0" >
-                                    <attribute name="name" value="xbmc" id="4935" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="csymtab" value="0x7ff9f1f8a2f0" id="4936" addr="0x7ff9f1f8a2f0" />
-                                    <attribute name="symtab" value="0x7ff9f1f8a290" id="4937" addr="0x7ff9f1f8a290" />
+                            <typescopesitem id="4933" addr="0x7fdf084e12b0" >
+                                <attributelist id="4934" addr="0x7fdf084e12b0" >
+                                    <attribute name="name" value="xbmc" id="4935" addr="0x7fdf085119d0" />
+                                    <attribute name="csymtab" value="0x7fdf084e12f0" id="4936" addr="0x7fdf084e12f0" />
+                                    <attribute name="symtab" value="0x7fdf084e1290" id="4937" addr="0x7fdf084e1290" />
                                 </attributelist >
                             </typescopesitem >
                         </typescope >
                     </attributelist >
 
-                    <cdecl id="4938" addr="0x7ff9f1fae450" >
-                        <attributelist id="4939" addr="0x7ff9f1fae450" >
-                            <attribute name="sym_name" value="PlayListException" id="4940" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="XBMCAddon::xbmc::PlayListException" id="4941" addr="0x7ff9f1fba9d0" />
-                            <attribute name="kind" value="variable" id="4942" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="XBMCCOMMONS_STANDARD_EXCEPTION" id="4943" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="4944" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="4945" addr="0x7ff9f1fba9d0" />
+                    <cdecl id="4938" addr="0x7fdf08505450" >
+                        <attributelist id="4939" addr="0x7fdf08505450" >
+                            <attribute name="sym_name" value="PlayListException" id="4940" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="XBMCAddon::xbmc::PlayListException" id="4941" addr="0x7fdf085119d0" />
+                            <attribute name="kind" value="variable" id="4942" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="XBMCCOMMONS_STANDARD_EXCEPTION" id="4943" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="4944" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="4945" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <class id="4946" addr="0x7ff9f1fae630" >
-                        <attributelist id="4947" addr="0x7ff9f1fae630" >
-                            <attribute name="name" value="XBMCAddon::xbmc::PlayList" id="4948" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="4949" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="symtab" value="0x7ff9f1fae770" id="4950" addr="0x7ff9f1fae770" />
-                            <attribute name="allows_typedef" value="1" id="4951" addr="0x7ff9f1fba9d0" />
-                            <attribute name="typepass_visit" value="1" id="4952" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_visit" value="1" id="4953" addr="0x7ff9f1fba9d0" />
-                            <attribute name="kind" value="class" id="4954" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_name" value="PlayList" id="4955" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_has_constructor" value="1" id="4956" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_public_constructor" value="1" id="4957" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_has_destructor" value="1" id="4958" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_default_destructor" value="1" id="4959" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_copy_constructor" value="1" id="4960" addr="0x7ff9f1fba9d0" />
-                            <attribute name="privatebaselist" value="0x7ff9f1fae610" id="4961" addr="0x7ff9f1fae610" />
-                            <attribute name="protectedbaselist" value="0x7ff9f1fae5f0" id="4962" addr="0x7ff9f1fae5f0" />
-                            <baselist id="4963" addr="0x7ff9f1fae5d0" >
-                                <base name="AddonClass" id="4964" addr="0x7ff9f1fae550" />
+                    <class id="4946" addr="0x7fdf08505630" >
+                        <attributelist id="4947" addr="0x7fdf08505630" >
+                            <attribute name="name" value="XBMCAddon::xbmc::PlayList" id="4948" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="4949" addr="0x7fdf084e12b0" />
+                            <attribute name="symtab" value="0x7fdf08505770" id="4950" addr="0x7fdf08505770" />
+                            <attribute name="allows_typedef" value="1" id="4951" addr="0x7fdf085119d0" />
+                            <attribute name="typepass_visit" value="1" id="4952" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_visit" value="1" id="4953" addr="0x7fdf085119d0" />
+                            <attribute name="kind" value="class" id="4954" addr="0x7fdf085119d0" />
+                            <attribute name="sym_name" value="PlayList" id="4955" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_has_constructor" value="1" id="4956" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_public_constructor" value="1" id="4957" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_has_destructor" value="1" id="4958" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_default_destructor" value="1" id="4959" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_copy_constructor" value="1" id="4960" addr="0x7fdf085119d0" />
+                            <attribute name="privatebaselist" value="0x7fdf08505610" id="4961" addr="0x7fdf08505610" />
+                            <attribute name="protectedbaselist" value="0x7fdf085055f0" id="4962" addr="0x7fdf085055f0" />
+                            <baselist id="4963" addr="0x7fdf085055d0" >
+                                <base name="AddonClass" id="4964" addr="0x7fdf08505550" />
                             </baselist >
-                            <attribute name="module" value="xbmc" id="4965" addr="0x7ff9f1f89430" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="4966" addr="0x7ff9f1fba9d0" />
-                            <typescope id="4967" addr="0x7ff9f1fb9270" >
-                                <attributelist id="4968" addr="0x7ff9f1fb9270" >
-                                    <attribute name="name" value="PlayList" id="4969" addr="0x7ff9f1fba9d0" />
-                                    <typetab id="4970" addr="0x7ff9f1fb9290" >
-                                        <attributelist id="4971" addr="0x7ff9f1fb9290" >
+                            <attribute name="module" value="xbmc" id="4965" addr="0x7fdf084e0430" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="4966" addr="0x7fdf085119d0" />
+                            <typescope id="4967" addr="0x7fdf08510270" >
+                                <attributelist id="4968" addr="0x7fdf08510270" >
+                                    <attribute name="name" value="PlayList" id="4969" addr="0x7fdf085119d0" />
+                                    <typetab id="4970" addr="0x7fdf08510290" >
+                                        <attributelist id="4971" addr="0x7fdf08510290" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7ff9f1fb4d70" id="4972" addr="0x7ff9f1fb4d70" />
-                                    <attribute name="qname" value="XBMCAddon::xbmc::PlayList" id="4973" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="symtab" value="0x7ff9f1fae770" id="4974" addr="0x7ff9f1fae770" />
+                                    <attribute name="parent" value="0x7fdf0850bd70" id="4972" addr="0x7fdf0850bd70" />
+                                    <attribute name="qname" value="XBMCAddon::xbmc::PlayList" id="4973" addr="0x7fdf085119d0" />
+                                    <attribute name="symtab" value="0x7fdf08505770" id="4974" addr="0x7fdf08505770" />
                                 </attributelist >
-                                <typescopesitem id="4975" addr="0x7ff9f1fb9210" >
-                                    <attributelist id="4976" addr="0x7ff9f1fb9210" >
+                                <typescopesitem id="4975" addr="0x7fdf08510210" >
+                                    <attributelist id="4976" addr="0x7fdf08510210" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="4977" addr="0x7ff9f1fb9290" >
-                                    <attributelist id="4978" addr="0x7ff9f1fb9290" >
+                                <typescopesitem id="4977" addr="0x7fdf08510290" >
+                                    <attributelist id="4978" addr="0x7fdf08510290" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="4979" addr="0x7ff9f1fb4d70" >
-                                    <attributelist id="4980" addr="0x7ff9f1fb4d70" >
-                                        <attribute name="name" value="xbmc" id="4981" addr="0x7ff9f1fba9d0" />
-                                        <typetab id="4982" addr="0x7ff9f1fb4d90" >
-                                            <attributelist id="4983" addr="0x7ff9f1fb4d90" >
-                                                <attribute name="Monitor" value="Monitor" id="4984" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="4985" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="Keyboard" value="Keyboard" id="4986" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="4987" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="InfoTagVideo" value="InfoTagVideo" id="4988" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="Player" value="Player" id="4989" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="InfoTagMusic" value="InfoTagMusic" id="4990" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="PlayList" value="PlayList" id="4991" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="RenderCapture" value="RenderCapture" id="4992" addr="0x7ff9f1fba9d0" />
+                                <typescopesitem id="4979" addr="0x7fdf0850bd70" >
+                                    <attributelist id="4980" addr="0x7fdf0850bd70" >
+                                        <attribute name="name" value="xbmc" id="4981" addr="0x7fdf085119d0" />
+                                        <typetab id="4982" addr="0x7fdf0850bd90" >
+                                            <attributelist id="4983" addr="0x7fdf0850bd90" >
+                                                <attribute name="Monitor" value="Monitor" id="4984" addr="0x7fdf085119d0" />
+                                                <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="4985" addr="0x7fdf085119d0" />
+                                                <attribute name="Keyboard" value="Keyboard" id="4986" addr="0x7fdf085119d0" />
+                                                <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="4987" addr="0x7fdf085119d0" />
+                                                <attribute name="InfoTagVideo" value="InfoTagVideo" id="4988" addr="0x7fdf085119d0" />
+                                                <attribute name="Player" value="Player" id="4989" addr="0x7fdf085119d0" />
+                                                <attribute name="InfoTagMusic" value="InfoTagMusic" id="4990" addr="0x7fdf085119d0" />
+                                                <attribute name="PlayList" value="PlayList" id="4991" addr="0x7fdf085119d0" />
+                                                <attribute name="RenderCapture" value="RenderCapture" id="4992" addr="0x7fdf085119d0" />
                                             </attributelist >
-                                            <typetabsitem id="4993" addr="0x7ff9f1fb9b10" >
-                                                <attributelist id="4994" addr="0x7ff9f1fb9b10" >
+                                            <typetabsitem id="4993" addr="0x7fdf08510b10" >
+                                                <attributelist id="4994" addr="0x7fdf08510b10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4995" addr="0x7ff9f1fb7f30" >
-                                                <attributelist id="4996" addr="0x7ff9f1fb7f30" >
+                                            <typetabsitem id="4995" addr="0x7fdf0850ef30" >
+                                                <attributelist id="4996" addr="0x7fdf0850ef30" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4997" addr="0x7ff9f1fb8990" >
-                                                <attributelist id="4998" addr="0x7ff9f1fb8990" >
+                                            <typetabsitem id="4997" addr="0x7fdf0850f990" >
+                                                <attributelist id="4998" addr="0x7fdf0850f990" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4999" addr="0x7ff9f1fb5e90" >
-                                                <attributelist id="5000" addr="0x7ff9f1fb5e90" >
+                                            <typetabsitem id="4999" addr="0x7fdf0850ce90" >
+                                                <attributelist id="5000" addr="0x7fdf0850ce90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5001" addr="0x7ff9f1fb8310" >
-                                                <attributelist id="5002" addr="0x7ff9f1fb8310" >
+                                            <typetabsitem id="5001" addr="0x7fdf0850f310" >
+                                                <attributelist id="5002" addr="0x7fdf0850f310" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5003" addr="0x7ff9f1fb6050" >
-                                                <attributelist id="5004" addr="0x7ff9f1fb6050" >
+                                            <typetabsitem id="5003" addr="0x7fdf0850d050" >
+                                                <attributelist id="5004" addr="0x7fdf0850d050" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5005" addr="0x7ff9f1fb7b50" >
-                                                <attributelist id="5006" addr="0x7ff9f1fb7b50" >
+                                            <typetabsitem id="5005" addr="0x7fdf0850eb50" >
+                                                <attributelist id="5006" addr="0x7fdf0850eb50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5007" addr="0x7ff9f1fb91b0" >
-                                                <attributelist id="5008" addr="0x7ff9f1fb91b0" >
+                                            <typetabsitem id="5007" addr="0x7fdf085101b0" >
+                                                <attributelist id="5008" addr="0x7fdf085101b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5009" addr="0x7ff9f1fb7490" >
-                                                <attributelist id="5010" addr="0x7ff9f1fb7490" >
+                                            <typetabsitem id="5009" addr="0x7fdf0850e490" >
+                                                <attributelist id="5010" addr="0x7fdf0850e490" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7ff9f1fb4990" id="5011" addr="0x7ff9f1fb4990" />
-                                        <attribute name="qname" value="XBMCAddon::xbmc" id="5012" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="symtab" value="0x7ff9f1f8a2b0" id="5013" addr="0x7ff9f1f8a2b0" />
+                                        <attribute name="parent" value="0x7fdf0850b990" id="5011" addr="0x7fdf0850b990" />
+                                        <attribute name="qname" value="XBMCAddon::xbmc" id="5012" addr="0x7fdf085119d0" />
+                                        <attribute name="symtab" value="0x7fdf084e12b0" id="5013" addr="0x7fdf084e12b0" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="5014" addr="0x7ff9f1fb92b0" >
-                                    <attributelist id="5015" addr="0x7ff9f1fb92b0" >
+                                <typescopesitem id="5014" addr="0x7fdf085102b0" >
+                                    <attributelist id="5015" addr="0x7fdf085102b0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="5016" addr="0x7ff9f1fae770" >
-                                    <attributelist id="5017" addr="0x7ff9f1fae770" >
-                                        <attribute name="name" value="PlayList" id="5018" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="csymtab" value="0x7ff9f1fae790" id="5019" addr="0x7ff9f1fae790" />
-                                        <attribute name="symtab" value="0x7ff9f1fae730" id="5020" addr="0x7ff9f1fae730" />
+                                <typescopesitem id="5016" addr="0x7fdf08505770" >
+                                    <attributelist id="5017" addr="0x7fdf08505770" >
+                                        <attribute name="name" value="PlayList" id="5018" addr="0x7fdf085119d0" />
+                                        <attribute name="csymtab" value="0x7fdf08505790" id="5019" addr="0x7fdf08505790" />
+                                        <attribute name="symtab" value="0x7fdf08505730" id="5020" addr="0x7fdf08505730" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <cdecl id="5021" addr="0x7ff9f1fae870" >
-                            <attributelist id="5022" addr="0x7ff9f1fae870" >
-                                <attribute name="ismember" value="1" id="5023" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="iPlayList" id="5024" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="" id="5025" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="private" id="5026" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="variable" id="5027" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="int" id="5028" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fae770" id="5029" addr="0x7ff9f1fae770" />
+                        <cdecl id="5021" addr="0x7fdf08505870" >
+                            <attributelist id="5022" addr="0x7fdf08505870" >
+                                <attribute name="ismember" value="1" id="5023" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="iPlayList" id="5024" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="" id="5025" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="private" id="5026" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="variable" id="5027" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="int" id="5028" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf08505770" id="5029" addr="0x7fdf08505770" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="5030" addr="0x7ff9f1faea10" >
-                            <attributelist id="5031" addr="0x7ff9f1faea10" >
-                                <attribute name="ismember" value="1" id="5032" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="pPlayList" id="5033" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="p." id="5034" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="private" id="5035" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="variable" id="5036" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="PLAYLIST::CPlayList" id="5037" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fae770" id="5038" addr="0x7ff9f1fae770" />
+                        <cdecl id="5030" addr="0x7fdf08505a10" >
+                            <attributelist id="5031" addr="0x7fdf08505a10" >
+                                <attribute name="ismember" value="1" id="5032" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="pPlayList" id="5033" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="p." id="5034" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="private" id="5035" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="variable" id="5036" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="PLAYLIST::CPlayList" id="5037" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf08505770" id="5038" addr="0x7fdf08505770" />
                             </attributelist >
                          
                         </cdecl >
-                        <access id="5039" addr="0x7ff9f1faeaf0" >
-                            <attributelist id="5040" addr="0x7ff9f1faeaf0" >
-                                <attribute name="kind" value="public" id="5041" addr="0x7ff9f1fba9d0" />
+                        <access id="5039" addr="0x7fdf08505af0" >
+                            <attributelist id="5040" addr="0x7fdf08505af0" >
+                                <attribute name="kind" value="public" id="5041" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="5042" addr="0x7ff9f1faed30" >
-                            <attributelist id="5043" addr="0x7ff9f1faed30" >
-                                <attribute name="name" value="PlayList" id="5044" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="5045" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fae770" id="5046" addr="0x7ff9f1fae770" />
-                                <attribute name="sym_name" value="PlayList" id="5047" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(int)." id="5048" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="5049" addr="0x7ff9f1fba9d0" />
-                                <attribute name="feature_python_nokwds" value="true" id="5050" addr="0x7ff9f1fba9d0" />
-                                <parmlist id="5051" addr="0x7ff9f1faec70" >
+                        <constructor id="5042" addr="0x7fdf08505d30" >
+                            <attributelist id="5043" addr="0x7fdf08505d30" >
+                                <attribute name="name" value="PlayList" id="5044" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="5045" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf08505770" id="5046" addr="0x7fdf08505770" />
+                                <attribute name="sym_name" value="PlayList" id="5047" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(int)." id="5048" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="5049" addr="0x7fdf085119d0" />
+                                <attribute name="feature_python_nokwds" value="true" id="5050" addr="0x7fdf085119d0" />
+                                <parmlist id="5051" addr="0x7fdf08505c70" >
                                     <parm id="5052">
-                                        <attributelist id="5053" addr="0x7ff9f1faec70" >
-                                            <attribute name="name" value="playList" id="5054" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="int" id="5055" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="5053" addr="0x7fdf08505c70" >
+                                            <attribute name="name" value="playList" id="5054" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="int" id="5055" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_0" id="5056" addr="0x7ff9f1fba9d0" />
-                                <attribute name="storage" value="explicit" id="5057" addr="0x7ff9f1fba9d0" />
-                                <attribute name="feature_new" value="1" id="5058" addr="0x7ff9f1fba9d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="5056" addr="0x7fdf085119d0" />
+                                <attribute name="storage" value="explicit" id="5057" addr="0x7fdf085119d0" />
+                                <attribute name="feature_new" value="1" id="5058" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </constructor >
-                        <destructor id="5059" addr="0x7ff9f1faeed0" >
-                            <attributelist id="5060" addr="0x7ff9f1faeed0" >
-                                <attribute name="ismember" value="1" id="5061" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="~PlayList" id="5062" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="~PlayList" id="5063" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="5064" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="5065" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fae770" id="5066" addr="0x7ff9f1fae770" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="5067" addr="0x7ff9f1fba9d0" />
+                        <destructor id="5059" addr="0x7fdf08505ed0" >
+                            <attributelist id="5060" addr="0x7fdf08505ed0" >
+                                <attribute name="ismember" value="1" id="5061" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="~PlayList" id="5062" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="~PlayList" id="5063" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="5064" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="5065" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf08505770" id="5066" addr="0x7fdf08505770" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="5067" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </destructor >
-                        <cdecl id="5068" addr="0x7ff9f1faf090" >
-                            <attributelist id="5069" addr="0x7ff9f1faf090" >
-                                <attribute name="name" value="getPlayListId" id="5070" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="5071" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fae770" id="5072" addr="0x7ff9f1fae770" />
-                                <attribute name="kind" value="function" id="5073" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getPlayListId" id="5074" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="q(const).f()." id="5075" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="5076" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="int" id="5077" addr="0x7ff9f1fba9d0" />
-                                <attribute name="code" value="{ return iPlayList; }" id="5078" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="5079" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="5080" addr="0x7ff9f1faf6f0" >
-                            <attributelist id="5081" addr="0x7ff9f1faf6f0" >
-                                <attribute name="name" value="add" id="5082" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="5083" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fae770" id="5084" addr="0x7ff9f1fae770" />
-                                <attribute name="sym_nextSibling" value="0x7ff9f1faf930" id="5085" addr="0x7ff9f1faf930" />
-                                <attribute name="csym_nextSibling" value="0x7ff9f1faf930" id="5086" addr="0x7ff9f1faf930" />
-                                <attribute name="kind" value="function" id="5087" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="add" id="5088" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.XBMCAddon::xbmcgui::ListItem,int)." id="5089" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="5090" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overloaded" value="0x7ff9f1faf6f0" id="5091" addr="0x7ff9f1faf6f0" />
-                                <parmlist id="5092" addr="0x7ff9f1faf2f0" >
+                        <cdecl id="5068" addr="0x7fdf08506090" >
+                            <attributelist id="5069" addr="0x7fdf08506090" >
+                                <attribute name="name" value="getPlayListId" id="5070" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="5071" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf08505770" id="5072" addr="0x7fdf08505770" />
+                                <attribute name="kind" value="function" id="5073" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getPlayListId" id="5074" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="q(const).f()." id="5075" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="5076" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="int" id="5077" addr="0x7fdf085119d0" />
+                                <attribute name="code" value="{ return iPlayList; }" id="5078" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="5079" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="5080" addr="0x7fdf085066f0" >
+                            <attributelist id="5081" addr="0x7fdf085066f0" >
+                                <attribute name="name" value="add" id="5082" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="5083" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf08505770" id="5084" addr="0x7fdf08505770" />
+                                <attribute name="sym_nextSibling" value="0x7fdf08506930" id="5085" addr="0x7fdf08506930" />
+                                <attribute name="csym_nextSibling" value="0x7fdf08506930" id="5086" addr="0x7fdf08506930" />
+                                <attribute name="kind" value="function" id="5087" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="add" id="5088" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.XBMCAddon::xbmcgui::ListItem,int)." id="5089" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="5090" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overloaded" value="0x7fdf085066f0" id="5091" addr="0x7fdf085066f0" />
+                                <parmlist id="5092" addr="0x7fdf085062f0" >
                                     <parm id="5093">
-                                        <attributelist id="5094" addr="0x7ff9f1faf2f0" >
-                                            <attribute name="name" value="url" id="5095" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="5096" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="5094" addr="0x7fdf085062f0" >
+                                            <attribute name="name" value="url" id="5095" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="5096" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5097">
-                                        <attributelist id="5098" addr="0x7ff9f1faf4b0" >
-                                            <attribute name="name" value="listitem" id="5099" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="NULL" id="5100" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="p.XBMCAddon::xbmcgui::ListItem" id="5101" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="5098" addr="0x7fdf085064b0" >
+                                            <attribute name="name" value="listitem" id="5099" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="NULL" id="5100" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="p.XBMCAddon::xbmcgui::ListItem" id="5101" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5102">
-                                        <attributelist id="5103" addr="0x7ff9f1faf630" >
-                                            <attribute name="name" value="index" id="5104" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="-1" id="5105" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="int" id="5106" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="5103" addr="0x7fdf08506630" >
+                                            <attribute name="name" value="index" id="5104" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="-1" id="5105" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="int" id="5106" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="5107" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="5108" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="5109" addr="0x7ff9f1faf930" >
-                            <attributelist id="5110" addr="0x7ff9f1faf930" >
-                                <attribute name="name" value="add" id="5111" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="5112" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fae770" id="5113" addr="0x7ff9f1fae770" />
-                                <attribute name="sym_previousSibling" value="0x7ff9f1faf6f0" id="5114" addr="0x7ff9f1faf6f0" />
-                                <attribute name="kind" value="function" id="5115" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="add" id="5116" addr="0x7ff9f1fba9d0" />
-                                <attribute name="csym_nextSibling" value="0x7ff9f1fafad0" id="5117" addr="0x7ff9f1fafad0" />
-                                <attribute name="sym_nextSibling" value="0x7ff9f1fafad0" id="5118" addr="0x7ff9f1fafad0" />
-                                <attribute name="defaultargs" value="0x7ff9f1faf6f0" id="5119" addr="0x7ff9f1faf6f0" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.XBMCAddon::xbmcgui::ListItem)." id="5120" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="5121" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overloaded" value="0x7ff9f1faf6f0" id="5122" addr="0x7ff9f1faf6f0" />
-                                <parmlist id="5123" addr="0x7ff9f1faf790" >
+                                <attribute name="type" value="void" id="5107" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="5108" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="5109" addr="0x7fdf08506930" >
+                            <attributelist id="5110" addr="0x7fdf08506930" >
+                                <attribute name="name" value="add" id="5111" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="5112" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf08505770" id="5113" addr="0x7fdf08505770" />
+                                <attribute name="sym_previousSibling" value="0x7fdf085066f0" id="5114" addr="0x7fdf085066f0" />
+                                <attribute name="kind" value="function" id="5115" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="add" id="5116" addr="0x7fdf085119d0" />
+                                <attribute name="csym_nextSibling" value="0x7fdf08506ad0" id="5117" addr="0x7fdf08506ad0" />
+                                <attribute name="sym_nextSibling" value="0x7fdf08506ad0" id="5118" addr="0x7fdf08506ad0" />
+                                <attribute name="defaultargs" value="0x7fdf085066f0" id="5119" addr="0x7fdf085066f0" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.XBMCAddon::xbmcgui::ListItem)." id="5120" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="5121" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overloaded" value="0x7fdf085066f0" id="5122" addr="0x7fdf085066f0" />
+                                <parmlist id="5123" addr="0x7fdf08506790" >
                                     <parm id="5124">
-                                        <attributelist id="5125" addr="0x7ff9f1faf790" >
-                                            <attribute name="name" value="url" id="5126" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="5127" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="5125" addr="0x7fdf08506790" >
+                                            <attribute name="name" value="url" id="5126" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="5127" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5128">
-                                        <attributelist id="5129" addr="0x7ff9f1faf870" >
-                                            <attribute name="name" value="listitem" id="5130" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="NULL" id="5131" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="p.XBMCAddon::xbmcgui::ListItem" id="5132" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="5129" addr="0x7fdf08506870" >
+                                            <attribute name="name" value="listitem" id="5130" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="NULL" id="5131" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="p.XBMCAddon::xbmcgui::ListItem" id="5132" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="5133" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="5134" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="5135" addr="0x7ff9f1fafad0" >
-                            <attributelist id="5136" addr="0x7ff9f1fafad0" >
-                                <attribute name="name" value="add" id="5137" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="5138" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fae770" id="5139" addr="0x7ff9f1fae770" />
-                                <attribute name="sym_previousSibling" value="0x7ff9f1faf930" id="5140" addr="0x7ff9f1faf930" />
-                                <attribute name="kind" value="function" id="5141" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="add" id="5142" addr="0x7ff9f1fba9d0" />
-                                <attribute name="defaultargs" value="0x7ff9f1faf6f0" id="5143" addr="0x7ff9f1faf6f0" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="5144" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="5145" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overloaded" value="0x7ff9f1faf6f0" id="5146" addr="0x7ff9f1faf6f0" />
-                                <parmlist id="5147" addr="0x7ff9f1faf9d0" >
+                                <attribute name="type" value="void" id="5133" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="5134" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="5135" addr="0x7fdf08506ad0" >
+                            <attributelist id="5136" addr="0x7fdf08506ad0" >
+                                <attribute name="name" value="add" id="5137" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="5138" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf08505770" id="5139" addr="0x7fdf08505770" />
+                                <attribute name="sym_previousSibling" value="0x7fdf08506930" id="5140" addr="0x7fdf08506930" />
+                                <attribute name="kind" value="function" id="5141" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="add" id="5142" addr="0x7fdf085119d0" />
+                                <attribute name="defaultargs" value="0x7fdf085066f0" id="5143" addr="0x7fdf085066f0" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="5144" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="5145" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overloaded" value="0x7fdf085066f0" id="5146" addr="0x7fdf085066f0" />
+                                <parmlist id="5147" addr="0x7fdf085069d0" >
                                     <parm id="5148">
-                                        <attributelist id="5149" addr="0x7ff9f1faf9d0" >
-                                            <attribute name="name" value="url" id="5150" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="5151" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="5149" addr="0x7fdf085069d0" >
+                                            <attribute name="name" value="url" id="5150" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="5151" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="5152" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_2" id="5153" addr="0x7ff9f1fba9d0" />
+                                <attribute name="type" value="void" id="5152" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_2" id="5153" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="5154" addr="0x7ff9f1fafdd0" >
-                            <attributelist id="5155" addr="0x7ff9f1fafdd0" >
-                                <attribute name="name" value="load" id="5156" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="5157" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fae770" id="5158" addr="0x7ff9f1fae770" />
-                                <attribute name="kind" value="function" id="5159" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="load" id="5160" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(p.q(const).char)." id="5161" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="5162" addr="0x7ff9f1fba9d0" />
-                                <parmlist id="5163" addr="0x7ff9f1fafd10" >
+                        <cdecl id="5154" addr="0x7fdf08506dd0" >
+                            <attributelist id="5155" addr="0x7fdf08506dd0" >
+                                <attribute name="name" value="load" id="5156" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="5157" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf08505770" id="5158" addr="0x7fdf08505770" />
+                                <attribute name="kind" value="function" id="5159" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="load" id="5160" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(p.q(const).char)." id="5161" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="5162" addr="0x7fdf085119d0" />
+                                <parmlist id="5163" addr="0x7fdf08506d10" >
                                     <parm id="5164">
-                                        <attributelist id="5165" addr="0x7ff9f1fafd10" >
-                                            <attribute name="name" value="filename" id="5166" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="p.q(const).char" id="5167" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="5165" addr="0x7fdf08506d10" >
+                                            <attribute name="name" value="filename" id="5166" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="p.q(const).char" id="5167" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="bool" id="5168" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="5169" addr="0x7ff9f1fba9d0" />
+                                <attribute name="type" value="bool" id="5168" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="5169" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="5170" addr="0x7ff9f1fb00d0" >
-                            <attributelist id="5171" addr="0x7ff9f1fb00d0" >
-                                <attribute name="name" value="remove" id="5172" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="5173" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fae770" id="5174" addr="0x7ff9f1fae770" />
-                                <attribute name="kind" value="function" id="5175" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="remove" id="5176" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(p.q(const).char)." id="5177" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="5178" addr="0x7ff9f1fba9d0" />
-                                <parmlist id="5179" addr="0x7ff9f1fb0010" >
+                        <cdecl id="5170" addr="0x7fdf085070d0" >
+                            <attributelist id="5171" addr="0x7fdf085070d0" >
+                                <attribute name="name" value="remove" id="5172" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="5173" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf08505770" id="5174" addr="0x7fdf08505770" />
+                                <attribute name="kind" value="function" id="5175" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="remove" id="5176" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(p.q(const).char)." id="5177" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="5178" addr="0x7fdf085119d0" />
+                                <parmlist id="5179" addr="0x7fdf08507010" >
                                     <parm id="5180">
-                                        <attributelist id="5181" addr="0x7ff9f1fb0010" >
-                                            <attribute name="name" value="filename" id="5182" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="p.q(const).char" id="5183" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="5181" addr="0x7fdf08507010" >
+                                            <attribute name="name" value="filename" id="5182" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="p.q(const).char" id="5183" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="5184" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="5185" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="5186" addr="0x7ff9f1fb0290" >
-                            <attributelist id="5187" addr="0x7ff9f1fb0290" >
-                                <attribute name="ismember" value="1" id="5188" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="clear" id="5189" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="clear" id="5190" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="5191" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="5192" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="5193" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="void" id="5194" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fae770" id="5195" addr="0x7ff9f1fae770" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="5196" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="5197" addr="0x7ff9f1fb0470" >
-                            <attributelist id="5198" addr="0x7ff9f1fb0470" >
-                                <attribute name="ismember" value="1" id="5199" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="size" id="5200" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="size" id="5201" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="5202" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="5203" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="5204" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="int" id="5205" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fae770" id="5206" addr="0x7ff9f1fae770" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="5207" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="5208" addr="0x7ff9f1fb0630" >
-                            <attributelist id="5209" addr="0x7ff9f1fb0630" >
-                                <attribute name="ismember" value="1" id="5210" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="shuffle" id="5211" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="shuffle" id="5212" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="5213" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="5214" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="5215" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="void" id="5216" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fae770" id="5217" addr="0x7ff9f1fae770" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="5218" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="5219" addr="0x7ff9f1fb07f0" >
-                            <attributelist id="5220" addr="0x7ff9f1fb07f0" >
-                                <attribute name="ismember" value="1" id="5221" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="unshuffle" id="5222" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="unshuffle" id="5223" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="5224" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="5225" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="5226" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="void" id="5227" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fae770" id="5228" addr="0x7ff9f1fae770" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="5229" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="5230" addr="0x7ff9f1fb09d0" >
-                            <attributelist id="5231" addr="0x7ff9f1fb09d0" >
-                                <attribute name="ismember" value="1" id="5232" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getposition" id="5233" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getposition" id="5234" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="5235" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="5236" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="5237" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="int" id="5238" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fae770" id="5239" addr="0x7ff9f1fae770" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="5240" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="5241" addr="0x7ff9f1fb0cf0" >
-                            <attributelist id="5242" addr="0x7ff9f1fb0cf0" >
-                                <attribute name="ismember" value="1" id="5243" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="operator []" id="5244" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="operator []" id="5245" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(long).p." id="5246" addr="0x7ff9f1fba9d0" />
-                                <parmlist id="5247" addr="0x7ff9f1fb0c70" >
+                                <attribute name="type" value="void" id="5184" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="5185" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="5186" addr="0x7fdf08507290" >
+                            <attributelist id="5187" addr="0x7fdf08507290" >
+                                <attribute name="ismember" value="1" id="5188" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="clear" id="5189" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="clear" id="5190" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="5191" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="5192" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="5193" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="void" id="5194" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf08505770" id="5195" addr="0x7fdf08505770" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="5196" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="5197" addr="0x7fdf08507470" >
+                            <attributelist id="5198" addr="0x7fdf08507470" >
+                                <attribute name="ismember" value="1" id="5199" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="size" id="5200" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="size" id="5201" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="5202" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="5203" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="5204" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="int" id="5205" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf08505770" id="5206" addr="0x7fdf08505770" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="5207" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="5208" addr="0x7fdf08507630" >
+                            <attributelist id="5209" addr="0x7fdf08507630" >
+                                <attribute name="ismember" value="1" id="5210" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="shuffle" id="5211" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="shuffle" id="5212" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="5213" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="5214" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="5215" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="void" id="5216" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf08505770" id="5217" addr="0x7fdf08505770" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="5218" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="5219" addr="0x7fdf085077f0" >
+                            <attributelist id="5220" addr="0x7fdf085077f0" >
+                                <attribute name="ismember" value="1" id="5221" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="unshuffle" id="5222" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="unshuffle" id="5223" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="5224" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="5225" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="5226" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="void" id="5227" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf08505770" id="5228" addr="0x7fdf08505770" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="5229" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="5230" addr="0x7fdf085079d0" >
+                            <attributelist id="5231" addr="0x7fdf085079d0" >
+                                <attribute name="ismember" value="1" id="5232" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getposition" id="5233" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getposition" id="5234" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="5235" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="5236" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="5237" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="int" id="5238" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf08505770" id="5239" addr="0x7fdf08505770" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="5240" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="5241" addr="0x7fdf08507cf0" >
+                            <attributelist id="5242" addr="0x7fdf08507cf0" >
+                                <attribute name="ismember" value="1" id="5243" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="operator []" id="5244" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="operator []" id="5245" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(long).p." id="5246" addr="0x7fdf085119d0" />
+                                <parmlist id="5247" addr="0x7fdf08507c70" >
                                     <parm id="5248">
-                                        <attributelist id="5249" addr="0x7ff9f1fb0c70" >
-                                            <attribute name="name" value="i" id="5250" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="long" id="5251" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="5249" addr="0x7fdf08507c70" >
+                                            <attribute name="name" value="i" id="5250" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="long" id="5251" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="access" value="public" id="5252" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="5253" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::xbmcgui::ListItem" id="5254" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fae770" id="5255" addr="0x7ff9f1fae770" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="5256" addr="0x7ff9f1fba9d0" />
+                                <attribute name="access" value="public" id="5252" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="5253" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::xbmcgui::ListItem" id="5254" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf08505770" id="5255" addr="0x7fdf08505770" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="5256" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </cdecl >
@@ -7378,696 +7378,696 @@
                 </namespace >
             </namespace >
         </include >
-        <include id="5257" addr="0x7ff9f1fb10b0" >
-            <attributelist id="5258" addr="0x7ff9f1fb10b0" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/Monitor.h" id="5259" addr="0x7ff9f1fba9d0" />
+        <include id="5257" addr="0x7fdf085080b0" >
+            <attributelist id="5258" addr="0x7fdf085080b0" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/Monitor.h" id="5259" addr="0x7fdf085119d0" />
             </attributelist >
 
-            <namespace id="5260" addr="0x7ff9f1fb1150" >
-                <attributelist id="5261" addr="0x7ff9f1fb1150" >
-                    <attribute name="sym_name" value="XBMCAddon" id="5262" addr="0x7ff9f1fba9d0" />
-                    <attribute name="name" value="XBMCAddon" id="5263" addr="0x7ff9f1fba9d0" />
-                    <attribute name="sym_previousSibling" value="0x7ff9f1fae270" id="5264" addr="0x7ff9f1fae270" />
-                    <typescope id="5265" addr="0x7ff9f1fb4990" >
-                        <attributelist id="5266" addr="0x7ff9f1fb4990" >
-                            <attribute name="name" value="XBMCAddon" id="5267" addr="0x7ff9f1fba9d0" />
-                            <typetab id="5268" addr="0x7ff9f1fb49d0" >
-                                <attributelist id="5269" addr="0x7ff9f1fb49d0" >
-                                    <attribute name="String" value="std::string" id="5270" addr="0x7ff9f1fba9d0" />
+            <namespace id="5260" addr="0x7fdf08508150" >
+                <attributelist id="5261" addr="0x7fdf08508150" >
+                    <attribute name="sym_name" value="XBMCAddon" id="5262" addr="0x7fdf085119d0" />
+                    <attribute name="name" value="XBMCAddon" id="5263" addr="0x7fdf085119d0" />
+                    <attribute name="sym_previousSibling" value="0x7fdf08505270" id="5264" addr="0x7fdf08505270" />
+                    <typescope id="5265" addr="0x7fdf0850b990" >
+                        <attributelist id="5266" addr="0x7fdf0850b990" >
+                            <attribute name="name" value="XBMCAddon" id="5267" addr="0x7fdf085119d0" />
+                            <typetab id="5268" addr="0x7fdf0850b9d0" >
+                                <attributelist id="5269" addr="0x7fdf0850b9d0" >
+                                    <attribute name="String" value="std::string" id="5270" addr="0x7fdf085119d0" />
                                 </attributelist >
-                                <typetabsitem id="5271" addr="0x7ff9f1fb4bb0" >
-                                    <attributelist id="5272" addr="0x7ff9f1fb4bb0" >
+                                <typetabsitem id="5271" addr="0x7fdf0850bbb0" >
+                                    <attributelist id="5272" addr="0x7fdf0850bbb0" >
                                     </attributelist >
                                 </typetabsitem >
                             </typetab >
-                            <attribute name="parent" value="0x7ff9f1f72a30" id="5273" addr="0x7ff9f1f72a30" />
-                            <attribute name="qname" value="XBMCAddon" id="5274" addr="0x7ff9f1fba9d0" />
-                            <attribute name="symtab" value="0x7ff9f1f89bb0" id="5275" addr="0x7ff9f1f89bb0" />
+                            <attribute name="parent" value="0x7fdf084c9a30" id="5273" addr="0x7fdf084c9a30" />
+                            <attribute name="qname" value="XBMCAddon" id="5274" addr="0x7fdf085119d0" />
+                            <attribute name="symtab" value="0x7fdf084e0bb0" id="5275" addr="0x7fdf084e0bb0" />
                         </attributelist >
-                        <typescopesitem id="5276" addr="0x7ff9f1f89b70" >
-                            <attributelist id="5277" addr="0x7ff9f1f89b70" >
+                        <typescopesitem id="5276" addr="0x7fdf084e0b70" >
+                            <attributelist id="5277" addr="0x7fdf084e0b70" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="5278" addr="0x7ff9f1fb49d0" >
-                            <attributelist id="5279" addr="0x7ff9f1fb49d0" >
-                                <attribute name="String" value="std::string" id="5280" addr="0x7ff9f1fba9d0" />
+                        <typescopesitem id="5278" addr="0x7fdf0850b9d0" >
+                            <attributelist id="5279" addr="0x7fdf0850b9d0" >
+                                <attribute name="String" value="std::string" id="5280" addr="0x7fdf085119d0" />
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="5281" addr="0x7ff9f1f72a30" >
-                            <attributelist id="5282" addr="0x7ff9f1f72a30" >
-                                <attribute name="name" value="" id="5283" addr="0x7ff9f1fba9d0" />
-                                <typetab id="5284" addr="0x7ff9f1f72a90" >
-                                    <attributelist id="5285" addr="0x7ff9f1f72a90" >
-                                        <attribute name="CGUIDialogKeyboardGeneric" value="CGUIDialogKeyboardGeneric" id="5286" addr="0x7ff9f1fba9d0" />
+                        <typescopesitem id="5281" addr="0x7fdf084c9a30" >
+                            <attributelist id="5282" addr="0x7fdf084c9a30" >
+                                <attribute name="name" value="" id="5283" addr="0x7fdf085119d0" />
+                                <typetab id="5284" addr="0x7fdf084c9a90" >
+                                    <attributelist id="5285" addr="0x7fdf084c9a90" >
+                                        <attribute name="CGUIDialogKeyboardGeneric" value="CGUIDialogKeyboardGeneric" id="5286" addr="0x7fdf085119d0" />
                                     </attributelist >
-                                    <typetabsitem id="5287" addr="0x7ff9f1fb7950" >
-                                        <attributelist id="5288" addr="0x7ff9f1fb7950" >
+                                    <typetabsitem id="5287" addr="0x7fdf0850e950" >
+                                        <attributelist id="5288" addr="0x7fdf0850e950" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="5289" addr="0x7ff9f1fb4ad0" >
-                            <attributelist id="5290" addr="0x7ff9f1fb4ad0" >
+                        <typescopesitem id="5289" addr="0x7fdf0850bad0" >
+                            <attributelist id="5290" addr="0x7fdf0850bad0" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="5291" addr="0x7ff9f1f89bb0" >
-                            <attributelist id="5292" addr="0x7ff9f1f89bb0" >
-                                <attribute name="name" value="XBMCAddon" id="5293" addr="0x7ff9f1fba9d0" />
-                                <attribute name="csymtab" value="0x7ff9f1f89bf0" id="5294" addr="0x7ff9f1f89bf0" />
-                                <attribute name="symtab" value="0x7ff9f1f89b90" id="5295" addr="0x7ff9f1f89b90" />
+                        <typescopesitem id="5291" addr="0x7fdf084e0bb0" >
+                            <attributelist id="5292" addr="0x7fdf084e0bb0" >
+                                <attribute name="name" value="XBMCAddon" id="5293" addr="0x7fdf085119d0" />
+                                <attribute name="csymtab" value="0x7fdf084e0bf0" id="5294" addr="0x7fdf084e0bf0" />
+                                <attribute name="symtab" value="0x7fdf084e0b90" id="5295" addr="0x7fdf084e0b90" />
                             </attributelist >
                         </typescopesitem >
                     </typescope >
-                    <attribute name="symtab" value="0x7ff9f1f89bb0" id="5296" addr="0x7ff9f1f89bb0" />
-                    <attribute name="sym_symtab" value="0x7ff9f1f72950" id="5297" addr="0x7ff9f1f72950" />
+                    <attribute name="symtab" value="0x7fdf084e0bb0" id="5296" addr="0x7fdf084e0bb0" />
+                    <attribute name="sym_symtab" value="0x7fdf084c9950" id="5297" addr="0x7fdf084c9950" />
                 </attributelist >
 
-                <namespace id="5298" addr="0x7ff9f1fb11d0" >
-                    <attributelist id="5299" addr="0x7ff9f1fb11d0" >
-                        <attribute name="sym_name" value="xbmc" id="5300" addr="0x7ff9f1fba9d0" />
-                        <attribute name="name" value="xbmc" id="5301" addr="0x7ff9f1fba9d0" />
-                        <attribute name="feature_knownbasetypes" value="AddonClass,IPlayerCallback,AddonCallback" id="5302" addr="0x7ff9f1fba9d0" />
-                        <attribute name="feature_knownapitypes" value="XBMCAddon::xbmcgui::ListItem,XBMCAddon::xbmc::PlayListItem" id="5303" addr="0x7ff9f1fba9d0" />
-                        <attribute name="sym_previousSibling" value="0x7ff9f1fae2f0" id="5304" addr="0x7ff9f1fae2f0" />
-                        <typescope id="5305" addr="0x7ff9f1fb4d70" >
-                            <attributelist id="5306" addr="0x7ff9f1fb4d70" >
-                                <attribute name="name" value="xbmc" id="5307" addr="0x7ff9f1fba9d0" />
-                                <typetab id="5308" addr="0x7ff9f1fb4d90" >
-                                    <attributelist id="5309" addr="0x7ff9f1fb4d90" >
-                                        <attribute name="Monitor" value="Monitor" id="5310" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="5311" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="Keyboard" value="Keyboard" id="5312" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="5313" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="InfoTagVideo" value="InfoTagVideo" id="5314" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="Player" value="Player" id="5315" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="InfoTagMusic" value="InfoTagMusic" id="5316" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="PlayList" value="PlayList" id="5317" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="RenderCapture" value="RenderCapture" id="5318" addr="0x7ff9f1fba9d0" />
+                <namespace id="5298" addr="0x7fdf085081d0" >
+                    <attributelist id="5299" addr="0x7fdf085081d0" >
+                        <attribute name="sym_name" value="xbmc" id="5300" addr="0x7fdf085119d0" />
+                        <attribute name="name" value="xbmc" id="5301" addr="0x7fdf085119d0" />
+                        <attribute name="feature_knownbasetypes" value="AddonClass,IPlayerCallback,AddonCallback" id="5302" addr="0x7fdf085119d0" />
+                        <attribute name="feature_knownapitypes" value="XBMCAddon::xbmcgui::ListItem,XBMCAddon::xbmc::PlayListItem" id="5303" addr="0x7fdf085119d0" />
+                        <attribute name="sym_previousSibling" value="0x7fdf085052f0" id="5304" addr="0x7fdf085052f0" />
+                        <typescope id="5305" addr="0x7fdf0850bd70" >
+                            <attributelist id="5306" addr="0x7fdf0850bd70" >
+                                <attribute name="name" value="xbmc" id="5307" addr="0x7fdf085119d0" />
+                                <typetab id="5308" addr="0x7fdf0850bd90" >
+                                    <attributelist id="5309" addr="0x7fdf0850bd90" >
+                                        <attribute name="Monitor" value="Monitor" id="5310" addr="0x7fdf085119d0" />
+                                        <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="5311" addr="0x7fdf085119d0" />
+                                        <attribute name="Keyboard" value="Keyboard" id="5312" addr="0x7fdf085119d0" />
+                                        <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="5313" addr="0x7fdf085119d0" />
+                                        <attribute name="InfoTagVideo" value="InfoTagVideo" id="5314" addr="0x7fdf085119d0" />
+                                        <attribute name="Player" value="Player" id="5315" addr="0x7fdf085119d0" />
+                                        <attribute name="InfoTagMusic" value="InfoTagMusic" id="5316" addr="0x7fdf085119d0" />
+                                        <attribute name="PlayList" value="PlayList" id="5317" addr="0x7fdf085119d0" />
+                                        <attribute name="RenderCapture" value="RenderCapture" id="5318" addr="0x7fdf085119d0" />
                                     </attributelist >
-                                    <typetabsitem id="5319" addr="0x7ff9f1fb9b10" >
-                                        <attributelist id="5320" addr="0x7ff9f1fb9b10" >
+                                    <typetabsitem id="5319" addr="0x7fdf08510b10" >
+                                        <attributelist id="5320" addr="0x7fdf08510b10" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="5321" addr="0x7ff9f1fb7f30" >
-                                        <attributelist id="5322" addr="0x7ff9f1fb7f30" >
+                                    <typetabsitem id="5321" addr="0x7fdf0850ef30" >
+                                        <attributelist id="5322" addr="0x7fdf0850ef30" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="5323" addr="0x7ff9f1fb8990" >
-                                        <attributelist id="5324" addr="0x7ff9f1fb8990" >
+                                    <typetabsitem id="5323" addr="0x7fdf0850f990" >
+                                        <attributelist id="5324" addr="0x7fdf0850f990" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="5325" addr="0x7ff9f1fb5e90" >
-                                        <attributelist id="5326" addr="0x7ff9f1fb5e90" >
+                                    <typetabsitem id="5325" addr="0x7fdf0850ce90" >
+                                        <attributelist id="5326" addr="0x7fdf0850ce90" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="5327" addr="0x7ff9f1fb8310" >
-                                        <attributelist id="5328" addr="0x7ff9f1fb8310" >
+                                    <typetabsitem id="5327" addr="0x7fdf0850f310" >
+                                        <attributelist id="5328" addr="0x7fdf0850f310" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="5329" addr="0x7ff9f1fb6050" >
-                                        <attributelist id="5330" addr="0x7ff9f1fb6050" >
+                                    <typetabsitem id="5329" addr="0x7fdf0850d050" >
+                                        <attributelist id="5330" addr="0x7fdf0850d050" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="5331" addr="0x7ff9f1fb7b50" >
-                                        <attributelist id="5332" addr="0x7ff9f1fb7b50" >
+                                    <typetabsitem id="5331" addr="0x7fdf0850eb50" >
+                                        <attributelist id="5332" addr="0x7fdf0850eb50" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="5333" addr="0x7ff9f1fb91b0" >
-                                        <attributelist id="5334" addr="0x7ff9f1fb91b0" >
+                                    <typetabsitem id="5333" addr="0x7fdf085101b0" >
+                                        <attributelist id="5334" addr="0x7fdf085101b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="5335" addr="0x7ff9f1fb7490" >
-                                        <attributelist id="5336" addr="0x7ff9f1fb7490" >
+                                    <typetabsitem id="5335" addr="0x7fdf0850e490" >
+                                        <attributelist id="5336" addr="0x7fdf0850e490" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
-                                <attribute name="parent" value="0x7ff9f1fb4990" id="5337" addr="0x7ff9f1fb4990" />
-                                <attribute name="qname" value="XBMCAddon::xbmc" id="5338" addr="0x7ff9f1fba9d0" />
-                                <attribute name="symtab" value="0x7ff9f1f8a2b0" id="5339" addr="0x7ff9f1f8a2b0" />
+                                <attribute name="parent" value="0x7fdf0850b990" id="5337" addr="0x7fdf0850b990" />
+                                <attribute name="qname" value="XBMCAddon::xbmc" id="5338" addr="0x7fdf085119d0" />
+                                <attribute name="symtab" value="0x7fdf084e12b0" id="5339" addr="0x7fdf084e12b0" />
                             </attributelist >
-                            <typescopesitem id="5340" addr="0x7ff9f1f8a270" >
-                                <attributelist id="5341" addr="0x7ff9f1f8a270" >
+                            <typescopesitem id="5340" addr="0x7fdf084e1270" >
+                                <attributelist id="5341" addr="0x7fdf084e1270" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="5342" addr="0x7ff9f1fb4d90" >
-                                <attributelist id="5343" addr="0x7ff9f1fb4d90" >
-                                    <attribute name="Monitor" value="Monitor" id="5344" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="5345" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="Keyboard" value="Keyboard" id="5346" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="5347" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="InfoTagVideo" value="InfoTagVideo" id="5348" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="Player" value="Player" id="5349" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="InfoTagMusic" value="InfoTagMusic" id="5350" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="PlayList" value="PlayList" id="5351" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="RenderCapture" value="RenderCapture" id="5352" addr="0x7ff9f1fba9d0" />
+                            <typescopesitem id="5342" addr="0x7fdf0850bd90" >
+                                <attributelist id="5343" addr="0x7fdf0850bd90" >
+                                    <attribute name="Monitor" value="Monitor" id="5344" addr="0x7fdf085119d0" />
+                                    <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="5345" addr="0x7fdf085119d0" />
+                                    <attribute name="Keyboard" value="Keyboard" id="5346" addr="0x7fdf085119d0" />
+                                    <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="5347" addr="0x7fdf085119d0" />
+                                    <attribute name="InfoTagVideo" value="InfoTagVideo" id="5348" addr="0x7fdf085119d0" />
+                                    <attribute name="Player" value="Player" id="5349" addr="0x7fdf085119d0" />
+                                    <attribute name="InfoTagMusic" value="InfoTagMusic" id="5350" addr="0x7fdf085119d0" />
+                                    <attribute name="PlayList" value="PlayList" id="5351" addr="0x7fdf085119d0" />
+                                    <attribute name="RenderCapture" value="RenderCapture" id="5352" addr="0x7fdf085119d0" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="5353" addr="0x7ff9f1fb4990" >
-                                <attributelist id="5354" addr="0x7ff9f1fb4990" >
-                                    <attribute name="name" value="XBMCAddon" id="5355" addr="0x7ff9f1fba9d0" />
-                                    <typetab id="5356" addr="0x7ff9f1fb49d0" >
-                                        <attributelist id="5357" addr="0x7ff9f1fb49d0" >
-                                            <attribute name="String" value="std::string" id="5358" addr="0x7ff9f1fba9d0" />
-                                        </attributelist >
-                                        <typetabsitem id="5359" addr="0x7ff9f1fb4bb0" >
-                                            <attributelist id="5360" addr="0x7ff9f1fb4bb0" >
+                            <typescopesitem id="5353" addr="0x7fdf0850b990" >
+                                <attributelist id="5354" addr="0x7fdf0850b990" >
+                                    <attribute name="name" value="XBMCAddon" id="5355" addr="0x7fdf085119d0" />
+                                    <typetab id="5356" addr="0x7fdf0850b9d0" >
+                                        <attributelist id="5357" addr="0x7fdf0850b9d0" >
+                                            <attribute name="String" value="std::string" id="5358" addr="0x7fdf085119d0" />
+                                        </attributelist >
+                                        <typetabsitem id="5359" addr="0x7fdf0850bbb0" >
+                                            <attributelist id="5360" addr="0x7fdf0850bbb0" >
                                             </attributelist >
                                         </typetabsitem >
                                     </typetab >
-                                    <attribute name="parent" value="0x7ff9f1f72a30" id="5361" addr="0x7ff9f1f72a30" />
-                                    <attribute name="qname" value="XBMCAddon" id="5362" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="symtab" value="0x7ff9f1f89bb0" id="5363" addr="0x7ff9f1f89bb0" />
+                                    <attribute name="parent" value="0x7fdf084c9a30" id="5361" addr="0x7fdf084c9a30" />
+                                    <attribute name="qname" value="XBMCAddon" id="5362" addr="0x7fdf085119d0" />
+                                    <attribute name="symtab" value="0x7fdf084e0bb0" id="5363" addr="0x7fdf084e0bb0" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="5364" addr="0x7ff9f1fb4db0" >
-                                <attributelist id="5365" addr="0x7ff9f1fb4db0" >
+                            <typescopesitem id="5364" addr="0x7fdf0850bdb0" >
+                                <attributelist id="5365" addr="0x7fdf0850bdb0" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="5366" addr="0x7ff9f1f8a2b0" >
-                                <attributelist id="5367" addr="0x7ff9f1f8a2b0" >
-                                    <attribute name="name" value="xbmc" id="5368" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="csymtab" value="0x7ff9f1f8a2f0" id="5369" addr="0x7ff9f1f8a2f0" />
-                                    <attribute name="symtab" value="0x7ff9f1f8a290" id="5370" addr="0x7ff9f1f8a290" />
+                            <typescopesitem id="5366" addr="0x7fdf084e12b0" >
+                                <attributelist id="5367" addr="0x7fdf084e12b0" >
+                                    <attribute name="name" value="xbmc" id="5368" addr="0x7fdf085119d0" />
+                                    <attribute name="csymtab" value="0x7fdf084e12f0" id="5369" addr="0x7fdf084e12f0" />
+                                    <attribute name="symtab" value="0x7fdf084e1290" id="5370" addr="0x7fdf084e1290" />
                                 </attributelist >
                             </typescopesitem >
                         </typescope >
-                        <attribute name="symtab" value="0x7ff9f1f8a2b0" id="5371" addr="0x7ff9f1f8a2b0" />
-                        <attribute name="sym_symtab" value="0x7ff9f1f89bb0" id="5372" addr="0x7ff9f1f89bb0" />
+                        <attribute name="symtab" value="0x7fdf084e12b0" id="5371" addr="0x7fdf084e12b0" />
+                        <attribute name="sym_symtab" value="0x7fdf084e0bb0" id="5372" addr="0x7fdf084e0bb0" />
                     </attributelist >
 
-                    <class id="5373" addr="0x7ff9f1fb1350" >
-                        <attributelist id="5374" addr="0x7ff9f1fb1350" >
-                            <attribute name="name" value="XBMCAddon::xbmc::Monitor" id="5375" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="5376" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="symtab" value="0x7ff9f1fb14b0" id="5377" addr="0x7ff9f1fb14b0" />
-                            <attribute name="allows_typedef" value="1" id="5378" addr="0x7ff9f1fba9d0" />
-                            <attribute name="typepass_visit" value="1" id="5379" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_visit" value="1" id="5380" addr="0x7ff9f1fba9d0" />
-                            <attribute name="kind" value="class" id="5381" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_name" value="Monitor" id="5382" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_default_constructor" value="1" id="5383" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_has_constructor" value="1" id="5384" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_public_constructor" value="1" id="5385" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_has_destructor" value="1" id="5386" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_default_destructor" value="1" id="5387" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_copy_constructor" value="1" id="5388" addr="0x7ff9f1fba9d0" />
-                            <attribute name="privatebaselist" value="0x7ff9f1fb1330" id="5389" addr="0x7ff9f1fb1330" />
-                            <attribute name="protectedbaselist" value="0x7ff9f1fb1310" id="5390" addr="0x7ff9f1fb1310" />
-                            <baselist id="5391" addr="0x7ff9f1fb12f0" >
-                                <base name="AddonCallback" id="5392" addr="0x7ff9f1fb1270" />
+                    <class id="5373" addr="0x7fdf08508350" >
+                        <attributelist id="5374" addr="0x7fdf08508350" >
+                            <attribute name="name" value="XBMCAddon::xbmc::Monitor" id="5375" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="5376" addr="0x7fdf084e12b0" />
+                            <attribute name="symtab" value="0x7fdf085084b0" id="5377" addr="0x7fdf085084b0" />
+                            <attribute name="allows_typedef" value="1" id="5378" addr="0x7fdf085119d0" />
+                            <attribute name="typepass_visit" value="1" id="5379" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_visit" value="1" id="5380" addr="0x7fdf085119d0" />
+                            <attribute name="kind" value="class" id="5381" addr="0x7fdf085119d0" />
+                            <attribute name="sym_name" value="Monitor" id="5382" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_default_constructor" value="1" id="5383" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_has_constructor" value="1" id="5384" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_public_constructor" value="1" id="5385" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_has_destructor" value="1" id="5386" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_default_destructor" value="1" id="5387" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_copy_constructor" value="1" id="5388" addr="0x7fdf085119d0" />
+                            <attribute name="privatebaselist" value="0x7fdf08508330" id="5389" addr="0x7fdf08508330" />
+                            <attribute name="protectedbaselist" value="0x7fdf08508310" id="5390" addr="0x7fdf08508310" />
+                            <baselist id="5391" addr="0x7fdf085082f0" >
+                                <base name="AddonCallback" id="5392" addr="0x7fdf08508270" />
                             </baselist >
-                            <attribute name="module" value="xbmc" id="5393" addr="0x7ff9f1f89430" />
-                            <attribute name="feature_director" value="1" id="5394" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="5395" addr="0x7ff9f1fba9d0" />
-                            <typescope id="5396" addr="0x7ff9f1fb9c10" >
-                                <attributelist id="5397" addr="0x7ff9f1fb9c10" >
-                                    <attribute name="name" value="Monitor" id="5398" addr="0x7ff9f1fba9d0" />
-                                    <typetab id="5399" addr="0x7ff9f1fb9c30" >
-                                        <attributelist id="5400" addr="0x7ff9f1fb9c30" >
+                            <attribute name="module" value="xbmc" id="5393" addr="0x7fdf084e0430" />
+                            <attribute name="feature_director" value="1" id="5394" addr="0x7fdf085119d0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="5395" addr="0x7fdf085119d0" />
+                            <typescope id="5396" addr="0x7fdf08510c10" >
+                                <attributelist id="5397" addr="0x7fdf08510c10" >
+                                    <attribute name="name" value="Monitor" id="5398" addr="0x7fdf085119d0" />
+                                    <typetab id="5399" addr="0x7fdf08510c30" >
+                                        <attributelist id="5400" addr="0x7fdf08510c30" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7ff9f1fb4d70" id="5401" addr="0x7ff9f1fb4d70" />
-                                    <attribute name="qname" value="XBMCAddon::xbmc::Monitor" id="5402" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="symtab" value="0x7ff9f1fb14b0" id="5403" addr="0x7ff9f1fb14b0" />
+                                    <attribute name="parent" value="0x7fdf0850bd70" id="5401" addr="0x7fdf0850bd70" />
+                                    <attribute name="qname" value="XBMCAddon::xbmc::Monitor" id="5402" addr="0x7fdf085119d0" />
+                                    <attribute name="symtab" value="0x7fdf085084b0" id="5403" addr="0x7fdf085084b0" />
                                 </attributelist >
-                                <typescopesitem id="5404" addr="0x7ff9f1fb9bb0" >
-                                    <attributelist id="5405" addr="0x7ff9f1fb9bb0" >
+                                <typescopesitem id="5404" addr="0x7fdf08510bb0" >
+                                    <attributelist id="5405" addr="0x7fdf08510bb0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="5406" addr="0x7ff9f1fb9c30" >
-                                    <attributelist id="5407" addr="0x7ff9f1fb9c30" >
+                                <typescopesitem id="5406" addr="0x7fdf08510c30" >
+                                    <attributelist id="5407" addr="0x7fdf08510c30" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="5408" addr="0x7ff9f1fb4d70" >
-                                    <attributelist id="5409" addr="0x7ff9f1fb4d70" >
-                                        <attribute name="name" value="xbmc" id="5410" addr="0x7ff9f1fba9d0" />
-                                        <typetab id="5411" addr="0x7ff9f1fb4d90" >
-                                            <attributelist id="5412" addr="0x7ff9f1fb4d90" >
-                                                <attribute name="Monitor" value="Monitor" id="5413" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="5414" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="Keyboard" value="Keyboard" id="5415" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="5416" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="InfoTagVideo" value="InfoTagVideo" id="5417" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="Player" value="Player" id="5418" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="InfoTagMusic" value="InfoTagMusic" id="5419" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="PlayList" value="PlayList" id="5420" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="RenderCapture" value="RenderCapture" id="5421" addr="0x7ff9f1fba9d0" />
+                                <typescopesitem id="5408" addr="0x7fdf0850bd70" >
+                                    <attributelist id="5409" addr="0x7fdf0850bd70" >
+                                        <attribute name="name" value="xbmc" id="5410" addr="0x7fdf085119d0" />
+                                        <typetab id="5411" addr="0x7fdf0850bd90" >
+                                            <attributelist id="5412" addr="0x7fdf0850bd90" >
+                                                <attribute name="Monitor" value="Monitor" id="5413" addr="0x7fdf085119d0" />
+                                                <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="5414" addr="0x7fdf085119d0" />
+                                                <attribute name="Keyboard" value="Keyboard" id="5415" addr="0x7fdf085119d0" />
+                                                <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="5416" addr="0x7fdf085119d0" />
+                                                <attribute name="InfoTagVideo" value="InfoTagVideo" id="5417" addr="0x7fdf085119d0" />
+                                                <attribute name="Player" value="Player" id="5418" addr="0x7fdf085119d0" />
+                                                <attribute name="InfoTagMusic" value="InfoTagMusic" id="5419" addr="0x7fdf085119d0" />
+                                                <attribute name="PlayList" value="PlayList" id="5420" addr="0x7fdf085119d0" />
+                                                <attribute name="RenderCapture" value="RenderCapture" id="5421" addr="0x7fdf085119d0" />
                                             </attributelist >
-                                            <typetabsitem id="5422" addr="0x7ff9f1fb9b10" >
-                                                <attributelist id="5423" addr="0x7ff9f1fb9b10" >
+                                            <typetabsitem id="5422" addr="0x7fdf08510b10" >
+                                                <attributelist id="5423" addr="0x7fdf08510b10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5424" addr="0x7ff9f1fb7f30" >
-                                                <attributelist id="5425" addr="0x7ff9f1fb7f30" >
+                                            <typetabsitem id="5424" addr="0x7fdf0850ef30" >
+                                                <attributelist id="5425" addr="0x7fdf0850ef30" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5426" addr="0x7ff9f1fb8990" >
-                                                <attributelist id="5427" addr="0x7ff9f1fb8990" >
+                                            <typetabsitem id="5426" addr="0x7fdf0850f990" >
+                                                <attributelist id="5427" addr="0x7fdf0850f990" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5428" addr="0x7ff9f1fb5e90" >
-                                                <attributelist id="5429" addr="0x7ff9f1fb5e90" >
+                                            <typetabsitem id="5428" addr="0x7fdf0850ce90" >
+                                                <attributelist id="5429" addr="0x7fdf0850ce90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5430" addr="0x7ff9f1fb8310" >
-                                                <attributelist id="5431" addr="0x7ff9f1fb8310" >
+                                            <typetabsitem id="5430" addr="0x7fdf0850f310" >
+                                                <attributelist id="5431" addr="0x7fdf0850f310" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5432" addr="0x7ff9f1fb6050" >
-                                                <attributelist id="5433" addr="0x7ff9f1fb6050" >
+                                            <typetabsitem id="5432" addr="0x7fdf0850d050" >
+                                                <attributelist id="5433" addr="0x7fdf0850d050" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5434" addr="0x7ff9f1fb7b50" >
-                                                <attributelist id="5435" addr="0x7ff9f1fb7b50" >
+                                            <typetabsitem id="5434" addr="0x7fdf0850eb50" >
+                                                <attributelist id="5435" addr="0x7fdf0850eb50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5436" addr="0x7ff9f1fb91b0" >
-                                                <attributelist id="5437" addr="0x7ff9f1fb91b0" >
+                                            <typetabsitem id="5436" addr="0x7fdf085101b0" >
+                                                <attributelist id="5437" addr="0x7fdf085101b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5438" addr="0x7ff9f1fb7490" >
-                                                <attributelist id="5439" addr="0x7ff9f1fb7490" >
+                                            <typetabsitem id="5438" addr="0x7fdf0850e490" >
+                                                <attributelist id="5439" addr="0x7fdf0850e490" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7ff9f1fb4990" id="5440" addr="0x7ff9f1fb4990" />
-                                        <attribute name="qname" value="XBMCAddon::xbmc" id="5441" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="symtab" value="0x7ff9f1f8a2b0" id="5442" addr="0x7ff9f1f8a2b0" />
+                                        <attribute name="parent" value="0x7fdf0850b990" id="5440" addr="0x7fdf0850b990" />
+                                        <attribute name="qname" value="XBMCAddon::xbmc" id="5441" addr="0x7fdf085119d0" />
+                                        <attribute name="symtab" value="0x7fdf084e12b0" id="5442" addr="0x7fdf084e12b0" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="5443" addr="0x7ff9f1fb9c50" >
-                                    <attributelist id="5444" addr="0x7ff9f1fb9c50" >
+                                <typescopesitem id="5443" addr="0x7fdf08510c50" >
+                                    <attributelist id="5444" addr="0x7fdf08510c50" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="5445" addr="0x7ff9f1fb14b0" >
-                                    <attributelist id="5446" addr="0x7ff9f1fb14b0" >
-                                        <attribute name="name" value="Monitor" id="5447" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="csymtab" value="0x7ff9f1fb14d0" id="5448" addr="0x7ff9f1fb14d0" />
-                                        <attribute name="symtab" value="0x7ff9f1fb1470" id="5449" addr="0x7ff9f1fb1470" />
+                                <typescopesitem id="5445" addr="0x7fdf085084b0" >
+                                    <attributelist id="5446" addr="0x7fdf085084b0" >
+                                        <attribute name="name" value="Monitor" id="5447" addr="0x7fdf085119d0" />
+                                        <attribute name="csymtab" value="0x7fdf085084d0" id="5448" addr="0x7fdf085084d0" />
+                                        <attribute name="symtab" value="0x7fdf08508470" id="5449" addr="0x7fdf08508470" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <cdecl id="5450" addr="0x7ff9f1fb15b0" >
-                            <attributelist id="5451" addr="0x7ff9f1fb15b0" >
-                                <attribute name="ismember" value="1" id="5452" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="Id" id="5453" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="" id="5454" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="private" id="5455" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="variable" id="5456" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="5457" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fb14b0" id="5458" addr="0x7ff9f1fb14b0" />
+                        <cdecl id="5450" addr="0x7fdf085085b0" >
+                            <attributelist id="5451" addr="0x7fdf085085b0" >
+                                <attribute name="ismember" value="1" id="5452" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="Id" id="5453" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="" id="5454" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="private" id="5455" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="variable" id="5456" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="5457" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf085084b0" id="5458" addr="0x7fdf085084b0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="5459" addr="0x7ff9f1fb1730" >
-                            <attributelist id="5460" addr="0x7ff9f1fb1730" >
-                                <attribute name="ismember" value="1" id="5461" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="invokerId" id="5462" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="" id="5463" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="private" id="5464" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="variable" id="5465" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="long" id="5466" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fb14b0" id="5467" addr="0x7ff9f1fb14b0" />
+                        <cdecl id="5459" addr="0x7fdf08508730" >
+                            <attributelist id="5460" addr="0x7fdf08508730" >
+                                <attribute name="ismember" value="1" id="5461" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="invokerId" id="5462" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="" id="5463" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="private" id="5464" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="variable" id="5465" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="long" id="5466" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf085084b0" id="5467" addr="0x7fdf085084b0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="5468" addr="0x7ff9f1fb18f0" >
-                            <attributelist id="5469" addr="0x7ff9f1fb18f0" >
-                                <attribute name="ismember" value="1" id="5470" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="abortEvent" id="5471" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="" id="5472" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="private" id="5473" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="variable" id="5474" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="CEvent" id="5475" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fb14b0" id="5476" addr="0x7ff9f1fb14b0" />
+                        <cdecl id="5468" addr="0x7fdf085088f0" >
+                            <attributelist id="5469" addr="0x7fdf085088f0" >
+                                <attribute name="ismember" value="1" id="5470" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="abortEvent" id="5471" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="" id="5472" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="private" id="5473" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="variable" id="5474" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="CEvent" id="5475" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf085084b0" id="5476" addr="0x7fdf085084b0" />
                             </attributelist >
                          
                         </cdecl >
-                        <access id="5477" addr="0x7ff9f1fb19d0" >
-                            <attributelist id="5478" addr="0x7ff9f1fb19d0" >
-                                <attribute name="kind" value="public" id="5479" addr="0x7ff9f1fba9d0" />
+                        <access id="5477" addr="0x7fdf085089d0" >
+                            <attributelist id="5478" addr="0x7fdf085089d0" >
+                                <attribute name="kind" value="public" id="5479" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="5480" addr="0x7ff9f1fb1af0" >
-                            <attributelist id="5481" addr="0x7ff9f1fb1af0" >
-                                <attribute name="ismember" value="1" id="5482" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="Monitor" id="5483" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="Monitor" id="5484" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="5485" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="5486" addr="0x7ff9f1fba9d0" />
-                                <attribute name="feature_new" value="1" id="5487" addr="0x7ff9f1fba9d0" />
-                                <attribute name="feature_director" value="1" id="5488" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fb14b0" id="5489" addr="0x7ff9f1fb14b0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="5490" addr="0x7ff9f1fba9d0" />
+                        <constructor id="5480" addr="0x7fdf08508af0" >
+                            <attributelist id="5481" addr="0x7fdf08508af0" >
+                                <attribute name="ismember" value="1" id="5482" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="Monitor" id="5483" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="Monitor" id="5484" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="5485" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="5486" addr="0x7fdf085119d0" />
+                                <attribute name="feature_new" value="1" id="5487" addr="0x7fdf085119d0" />
+                                <attribute name="feature_director" value="1" id="5488" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf085084b0" id="5489" addr="0x7fdf085084b0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="5490" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </constructor >
-                        <cdecl id="5491" addr="0x7ff9f1fb1c90" >
-                            <attributelist id="5492" addr="0x7ff9f1fb1c90" >
-                                <attribute name="name" value="onSettingsChanged" id="5493" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="5494" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fb14b0" id="5495" addr="0x7ff9f1fb14b0" />
-                                <attribute name="kind" value="function" id="5496" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="onSettingsChanged" id="5497" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="5498" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="5499" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="void" id="5500" addr="0x7ff9f1fba9d0" />
-                                <attribute name="code" value="{ XBMC_TRACE; }" id="5501" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="5502" addr="0x7ff9f1fba9d0" />
-                                <attribute name="storage" value="virtual" id="5503" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="5504" addr="0x7ff9f1fb1e70" >
-                            <attributelist id="5505" addr="0x7ff9f1fb1e70" >
-                                <attribute name="name" value="onScreensaverActivated" id="5506" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="5507" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fb14b0" id="5508" addr="0x7ff9f1fb14b0" />
-                                <attribute name="kind" value="function" id="5509" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="onScreensaverActivated" id="5510" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="5511" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="5512" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="void" id="5513" addr="0x7ff9f1fba9d0" />
-                                <attribute name="code" value="{ XBMC_TRACE; }" id="5514" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="5515" addr="0x7ff9f1fba9d0" />
-                                <attribute name="storage" value="virtual" id="5516" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="5517" addr="0x7ff9f1fb2050" >
-                            <attributelist id="5518" addr="0x7ff9f1fb2050" >
-                                <attribute name="name" value="onScreensaverDeactivated" id="5519" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="5520" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fb14b0" id="5521" addr="0x7ff9f1fb14b0" />
-                                <attribute name="kind" value="function" id="5522" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="onScreensaverDeactivated" id="5523" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="5524" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="5525" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="void" id="5526" addr="0x7ff9f1fba9d0" />
-                                <attribute name="code" value="{ XBMC_TRACE; }" id="5527" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="5528" addr="0x7ff9f1fba9d0" />
-                                <attribute name="storage" value="virtual" id="5529" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="5530" addr="0x7ff9f1fb2230" >
-                            <attributelist id="5531" addr="0x7ff9f1fb2230" >
-                                <attribute name="name" value="onDPMSActivated" id="5532" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="5533" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fb14b0" id="5534" addr="0x7ff9f1fb14b0" />
-                                <attribute name="kind" value="function" id="5535" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="onDPMSActivated" id="5536" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="5537" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="5538" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="void" id="5539" addr="0x7ff9f1fba9d0" />
-                                <attribute name="code" value="{ XBMC_TRACE; }" id="5540" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="5541" addr="0x7ff9f1fba9d0" />
-                                <attribute name="storage" value="virtual" id="5542" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="5543" addr="0x7ff9f1fb2410" >
-                            <attributelist id="5544" addr="0x7ff9f1fb2410" >
-                                <attribute name="name" value="onDPMSDeactivated" id="5545" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="5546" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fb14b0" id="5547" addr="0x7ff9f1fb14b0" />
-                                <attribute name="kind" value="function" id="5548" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="onDPMSDeactivated" id="5549" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="5550" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="5551" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="void" id="5552" addr="0x7ff9f1fba9d0" />
-                                <attribute name="code" value="{ XBMC_TRACE; }" id="5553" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="5554" addr="0x7ff9f1fba9d0" />
-                                <attribute name="storage" value="virtual" id="5555" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="5556" addr="0x7ff9f1fb2730" >
-                            <attributelist id="5557" addr="0x7ff9f1fb2730" >
-                                <attribute name="name" value="onScanStarted" id="5558" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="5559" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fb14b0" id="5560" addr="0x7ff9f1fb14b0" />
-                                <attribute name="kind" value="function" id="5561" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="onScanStarted" id="5562" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(q(const).XBMCAddon::String)." id="5563" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="5564" addr="0x7ff9f1fba9d0" />
-                                <parmlist id="5565" addr="0x7ff9f1fb2690" >
+                        <cdecl id="5491" addr="0x7fdf08508c90" >
+                            <attributelist id="5492" addr="0x7fdf08508c90" >
+                                <attribute name="name" value="onSettingsChanged" id="5493" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="5494" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf085084b0" id="5495" addr="0x7fdf085084b0" />
+                                <attribute name="kind" value="function" id="5496" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="onSettingsChanged" id="5497" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="5498" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="5499" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="void" id="5500" addr="0x7fdf085119d0" />
+                                <attribute name="code" value="{ XBMC_TRACE; }" id="5501" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="5502" addr="0x7fdf085119d0" />
+                                <attribute name="storage" value="virtual" id="5503" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="5504" addr="0x7fdf08508e70" >
+                            <attributelist id="5505" addr="0x7fdf08508e70" >
+                                <attribute name="name" value="onScreensaverActivated" id="5506" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="5507" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf085084b0" id="5508" addr="0x7fdf085084b0" />
+                                <attribute name="kind" value="function" id="5509" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="onScreensaverActivated" id="5510" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="5511" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="5512" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="void" id="5513" addr="0x7fdf085119d0" />
+                                <attribute name="code" value="{ XBMC_TRACE; }" id="5514" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="5515" addr="0x7fdf085119d0" />
+                                <attribute name="storage" value="virtual" id="5516" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="5517" addr="0x7fdf08509050" >
+                            <attributelist id="5518" addr="0x7fdf08509050" >
+                                <attribute name="name" value="onScreensaverDeactivated" id="5519" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="5520" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf085084b0" id="5521" addr="0x7fdf085084b0" />
+                                <attribute name="kind" value="function" id="5522" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="onScreensaverDeactivated" id="5523" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="5524" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="5525" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="void" id="5526" addr="0x7fdf085119d0" />
+                                <attribute name="code" value="{ XBMC_TRACE; }" id="5527" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="5528" addr="0x7fdf085119d0" />
+                                <attribute name="storage" value="virtual" id="5529" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="5530" addr="0x7fdf08509230" >
+                            <attributelist id="5531" addr="0x7fdf08509230" >
+                                <attribute name="name" value="onDPMSActivated" id="5532" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="5533" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf085084b0" id="5534" addr="0x7fdf085084b0" />
+                                <attribute name="kind" value="function" id="5535" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="onDPMSActivated" id="5536" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="5537" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="5538" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="void" id="5539" addr="0x7fdf085119d0" />
+                                <attribute name="code" value="{ XBMC_TRACE; }" id="5540" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="5541" addr="0x7fdf085119d0" />
+                                <attribute name="storage" value="virtual" id="5542" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="5543" addr="0x7fdf08509410" >
+                            <attributelist id="5544" addr="0x7fdf08509410" >
+                                <attribute name="name" value="onDPMSDeactivated" id="5545" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="5546" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf085084b0" id="5547" addr="0x7fdf085084b0" />
+                                <attribute name="kind" value="function" id="5548" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="onDPMSDeactivated" id="5549" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="5550" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="5551" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="void" id="5552" addr="0x7fdf085119d0" />
+                                <attribute name="code" value="{ XBMC_TRACE; }" id="5553" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="5554" addr="0x7fdf085119d0" />
+                                <attribute name="storage" value="virtual" id="5555" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="5556" addr="0x7fdf08509730" >
+                            <attributelist id="5557" addr="0x7fdf08509730" >
+                                <attribute name="name" value="onScanStarted" id="5558" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="5559" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf085084b0" id="5560" addr="0x7fdf085084b0" />
+                                <attribute name="kind" value="function" id="5561" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="onScanStarted" id="5562" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(q(const).XBMCAddon::String)." id="5563" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="5564" addr="0x7fdf085119d0" />
+                                <parmlist id="5565" addr="0x7fdf08509690" >
                                     <parm id="5566">
-                                        <attributelist id="5567" addr="0x7ff9f1fb2690" >
-                                            <attribute name="name" value="library" id="5568" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="q(const).XBMCAddon::String" id="5569" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="5567" addr="0x7fdf08509690" >
+                                            <attribute name="name" value="library" id="5568" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="q(const).XBMCAddon::String" id="5569" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="5570" addr="0x7ff9f1fba9d0" />
-                                <attribute name="code" value="{ XBMC_TRACE; }" id="5571" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="5572" addr="0x7ff9f1fba9d0" />
-                                <attribute name="storage" value="virtual" id="5573" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="5574" addr="0x7ff9f1fb2a70" >
-                            <attributelist id="5575" addr="0x7ff9f1fb2a70" >
-                                <attribute name="name" value="onScanFinished" id="5576" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="5577" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fb14b0" id="5578" addr="0x7ff9f1fb14b0" />
-                                <attribute name="kind" value="function" id="5579" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="onScanFinished" id="5580" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(q(const).XBMCAddon::String)." id="5581" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="5582" addr="0x7ff9f1fba9d0" />
-                                <parmlist id="5583" addr="0x7ff9f1fb29d0" >
+                                <attribute name="type" value="void" id="5570" addr="0x7fdf085119d0" />
+                                <attribute name="code" value="{ XBMC_TRACE; }" id="5571" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="5572" addr="0x7fdf085119d0" />
+                                <attribute name="storage" value="virtual" id="5573" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="5574" addr="0x7fdf08509a70" >
+                            <attributelist id="5575" addr="0x7fdf08509a70" >
+                                <attribute name="name" value="onScanFinished" id="5576" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="5577" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf085084b0" id="5578" addr="0x7fdf085084b0" />
+                                <attribute name="kind" value="function" id="5579" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="onScanFinished" id="5580" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(q(const).XBMCAddon::String)." id="5581" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="5582" addr="0x7fdf085119d0" />
+                                <parmlist id="5583" addr="0x7fdf085099d0" >
                                     <parm id="5584">
-                                        <attributelist id="5585" addr="0x7ff9f1fb29d0" >
-                                            <attribute name="name" value="library" id="5586" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="q(const).XBMCAddon::String" id="5587" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="5585" addr="0x7fdf085099d0" >
+                                            <attribute name="name" value="library" id="5586" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="q(const).XBMCAddon::String" id="5587" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="5588" addr="0x7ff9f1fba9d0" />
-                                <attribute name="code" value="{ XBMC_TRACE; }" id="5589" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="5590" addr="0x7ff9f1fba9d0" />
-                                <attribute name="storage" value="virtual" id="5591" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="5592" addr="0x7ff9f1fb2d90" >
-                            <attributelist id="5593" addr="0x7ff9f1fb2d90" >
-                                <attribute name="name" value="onDatabaseScanStarted" id="5594" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="5595" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fb14b0" id="5596" addr="0x7ff9f1fb14b0" />
-                                <attribute name="kind" value="function" id="5597" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="onDatabaseScanStarted" id="5598" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(q(const).XBMCAddon::String)." id="5599" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="5600" addr="0x7ff9f1fba9d0" />
-                                <parmlist id="5601" addr="0x7ff9f1fb2cf0" >
+                                <attribute name="type" value="void" id="5588" addr="0x7fdf085119d0" />
+                                <attribute name="code" value="{ XBMC_TRACE; }" id="5589" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="5590" addr="0x7fdf085119d0" />
+                                <attribute name="storage" value="virtual" id="5591" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="5592" addr="0x7fdf08509d90" >
+                            <attributelist id="5593" addr="0x7fdf08509d90" >
+                                <attribute name="name" value="onDatabaseScanStarted" id="5594" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="5595" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf085084b0" id="5596" addr="0x7fdf085084b0" />
+                                <attribute name="kind" value="function" id="5597" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="onDatabaseScanStarted" id="5598" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(q(const).XBMCAddon::String)." id="5599" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="5600" addr="0x7fdf085119d0" />
+                                <parmlist id="5601" addr="0x7fdf08509cf0" >
                                     <parm id="5602">
-                                        <attributelist id="5603" addr="0x7ff9f1fb2cf0" >
-                                            <attribute name="name" value="database" id="5604" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="q(const).XBMCAddon::String" id="5605" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="5603" addr="0x7fdf08509cf0" >
+                                            <attribute name="name" value="database" id="5604" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="q(const).XBMCAddon::String" id="5605" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="5606" addr="0x7ff9f1fba9d0" />
-                                <attribute name="code" value="{ XBMC_TRACE; }" id="5607" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="5608" addr="0x7ff9f1fba9d0" />
-                                <attribute name="storage" value="virtual" id="5609" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="5610" addr="0x7ff9f1fb30b0" >
-                            <attributelist id="5611" addr="0x7ff9f1fb30b0" >
-                                <attribute name="name" value="onDatabaseUpdated" id="5612" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="5613" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fb14b0" id="5614" addr="0x7ff9f1fb14b0" />
-                                <attribute name="kind" value="function" id="5615" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="onDatabaseUpdated" id="5616" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(q(const).XBMCAddon::String)." id="5617" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="5618" addr="0x7ff9f1fba9d0" />
-                                <parmlist id="5619" addr="0x7ff9f1fb3010" >
+                                <attribute name="type" value="void" id="5606" addr="0x7fdf085119d0" />
+                                <attribute name="code" value="{ XBMC_TRACE; }" id="5607" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="5608" addr="0x7fdf085119d0" />
+                                <attribute name="storage" value="virtual" id="5609" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="5610" addr="0x7fdf0850a0b0" >
+                            <attributelist id="5611" addr="0x7fdf0850a0b0" >
+                                <attribute name="name" value="onDatabaseUpdated" id="5612" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="5613" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf085084b0" id="5614" addr="0x7fdf085084b0" />
+                                <attribute name="kind" value="function" id="5615" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="onDatabaseUpdated" id="5616" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(q(const).XBMCAddon::String)." id="5617" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="5618" addr="0x7fdf085119d0" />
+                                <parmlist id="5619" addr="0x7fdf0850a010" >
                                     <parm id="5620">
-                                        <attributelist id="5621" addr="0x7ff9f1fb3010" >
-                                            <attribute name="name" value="database" id="5622" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="q(const).XBMCAddon::String" id="5623" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="5621" addr="0x7fdf0850a010" >
+                                            <attribute name="name" value="database" id="5622" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="q(const).XBMCAddon::String" id="5623" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="5624" addr="0x7ff9f1fba9d0" />
-                                <attribute name="code" value="{ XBMC_TRACE; }" id="5625" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="5626" addr="0x7ff9f1fba9d0" />
-                                <attribute name="storage" value="virtual" id="5627" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="5628" addr="0x7ff9f1fb33d0" >
-                            <attributelist id="5629" addr="0x7ff9f1fb33d0" >
-                                <attribute name="name" value="onCleanStarted" id="5630" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="5631" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fb14b0" id="5632" addr="0x7ff9f1fb14b0" />
-                                <attribute name="kind" value="function" id="5633" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="onCleanStarted" id="5634" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(q(const).XBMCAddon::String)." id="5635" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="5636" addr="0x7ff9f1fba9d0" />
-                                <parmlist id="5637" addr="0x7ff9f1fb3330" >
+                                <attribute name="type" value="void" id="5624" addr="0x7fdf085119d0" />
+                                <attribute name="code" value="{ XBMC_TRACE; }" id="5625" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="5626" addr="0x7fdf085119d0" />
+                                <attribute name="storage" value="virtual" id="5627" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="5628" addr="0x7fdf0850a3d0" >
+                            <attributelist id="5629" addr="0x7fdf0850a3d0" >
+                                <attribute name="name" value="onCleanStarted" id="5630" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="5631" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf085084b0" id="5632" addr="0x7fdf085084b0" />
+                                <attribute name="kind" value="function" id="5633" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="onCleanStarted" id="5634" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(q(const).XBMCAddon::String)." id="5635" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="5636" addr="0x7fdf085119d0" />
+                                <parmlist id="5637" addr="0x7fdf0850a330" >
                                     <parm id="5638">
-                                        <attributelist id="5639" addr="0x7ff9f1fb3330" >
-                                            <attribute name="name" value="library" id="5640" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="q(const).XBMCAddon::String" id="5641" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="5639" addr="0x7fdf0850a330" >
+                                            <attribute name="name" value="library" id="5640" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="q(const).XBMCAddon::String" id="5641" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="5642" addr="0x7ff9f1fba9d0" />
-                                <attribute name="code" value="{ XBMC_TRACE; }" id="5643" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="5644" addr="0x7ff9f1fba9d0" />
-                                <attribute name="storage" value="virtual" id="5645" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="5646" addr="0x7ff9f1fb36f0" >
-                            <attributelist id="5647" addr="0x7ff9f1fb36f0" >
-                                <attribute name="name" value="onCleanFinished" id="5648" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="5649" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fb14b0" id="5650" addr="0x7ff9f1fb14b0" />
-                                <attribute name="kind" value="function" id="5651" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="onCleanFinished" id="5652" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(q(const).XBMCAddon::String)." id="5653" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="5654" addr="0x7ff9f1fba9d0" />
-                                <parmlist id="5655" addr="0x7ff9f1fb3650" >
+                                <attribute name="type" value="void" id="5642" addr="0x7fdf085119d0" />
+                                <attribute name="code" value="{ XBMC_TRACE; }" id="5643" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="5644" addr="0x7fdf085119d0" />
+                                <attribute name="storage" value="virtual" id="5645" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="5646" addr="0x7fdf0850a6f0" >
+                            <attributelist id="5647" addr="0x7fdf0850a6f0" >
+                                <attribute name="name" value="onCleanFinished" id="5648" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="5649" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf085084b0" id="5650" addr="0x7fdf085084b0" />
+                                <attribute name="kind" value="function" id="5651" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="onCleanFinished" id="5652" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(q(const).XBMCAddon::String)." id="5653" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="5654" addr="0x7fdf085119d0" />
+                                <parmlist id="5655" addr="0x7fdf0850a650" >
                                     <parm id="5656">
-                                        <attributelist id="5657" addr="0x7ff9f1fb3650" >
-                                            <attribute name="name" value="library" id="5658" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="q(const).XBMCAddon::String" id="5659" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="5657" addr="0x7fdf0850a650" >
+                                            <attribute name="name" value="library" id="5658" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="q(const).XBMCAddon::String" id="5659" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="5660" addr="0x7ff9f1fba9d0" />
-                                <attribute name="code" value="{ XBMC_TRACE; }" id="5661" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="5662" addr="0x7ff9f1fba9d0" />
-                                <attribute name="storage" value="virtual" id="5663" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="5664" addr="0x7ff9f1fb38d0" >
-                            <attributelist id="5665" addr="0x7ff9f1fb38d0" >
-                                <attribute name="name" value="onAbortRequested" id="5666" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="5667" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fb14b0" id="5668" addr="0x7ff9f1fb14b0" />
-                                <attribute name="kind" value="function" id="5669" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="onAbortRequested" id="5670" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="5671" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="5672" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="void" id="5673" addr="0x7ff9f1fba9d0" />
-                                <attribute name="code" value="{ XBMC_TRACE; }" id="5674" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="5675" addr="0x7ff9f1fba9d0" />
-                                <attribute name="storage" value="virtual" id="5676" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="5677" addr="0x7ff9f1fb3e70" >
-                            <attributelist id="5678" addr="0x7ff9f1fb3e70" >
-                                <attribute name="name" value="onNotification" id="5679" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="5680" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fb14b0" id="5681" addr="0x7ff9f1fb14b0" />
-                                <attribute name="kind" value="function" id="5682" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="onNotification" id="5683" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(q(const).XBMCAddon::String,q(const).XBMCAddon::String,q(const).XBMCAddon::String)." id="5684" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="5685" addr="0x7ff9f1fba9d0" />
-                                <parmlist id="5686" addr="0x7ff9f1fb3b50" >
+                                <attribute name="type" value="void" id="5660" addr="0x7fdf085119d0" />
+                                <attribute name="code" value="{ XBMC_TRACE; }" id="5661" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="5662" addr="0x7fdf085119d0" />
+                                <attribute name="storage" value="virtual" id="5663" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="5664" addr="0x7fdf0850a8d0" >
+                            <attributelist id="5665" addr="0x7fdf0850a8d0" >
+                                <attribute name="name" value="onAbortRequested" id="5666" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="5667" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf085084b0" id="5668" addr="0x7fdf085084b0" />
+                                <attribute name="kind" value="function" id="5669" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="onAbortRequested" id="5670" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="5671" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="5672" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="void" id="5673" addr="0x7fdf085119d0" />
+                                <attribute name="code" value="{ XBMC_TRACE; }" id="5674" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="5675" addr="0x7fdf085119d0" />
+                                <attribute name="storage" value="virtual" id="5676" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="5677" addr="0x7fdf0850ae70" >
+                            <attributelist id="5678" addr="0x7fdf0850ae70" >
+                                <attribute name="name" value="onNotification" id="5679" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="5680" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf085084b0" id="5681" addr="0x7fdf085084b0" />
+                                <attribute name="kind" value="function" id="5682" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="onNotification" id="5683" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(q(const).XBMCAddon::String,q(const).XBMCAddon::String,q(const).XBMCAddon::String)." id="5684" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="5685" addr="0x7fdf085119d0" />
+                                <parmlist id="5686" addr="0x7fdf0850ab50" >
                                     <parm id="5687">
-                                        <attributelist id="5688" addr="0x7ff9f1fb3b50" >
-                                            <attribute name="name" value="sender" id="5689" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="q(const).XBMCAddon::String" id="5690" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="5688" addr="0x7fdf0850ab50" >
+                                            <attribute name="name" value="sender" id="5689" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="q(const).XBMCAddon::String" id="5690" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5691">
-                                        <attributelist id="5692" addr="0x7ff9f1fb3c90" >
-                                            <attribute name="name" value="method" id="5693" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="q(const).XBMCAddon::String" id="5694" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="5692" addr="0x7fdf0850ac90" >
+                                            <attribute name="name" value="method" id="5693" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="q(const).XBMCAddon::String" id="5694" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5695">
-                                        <attributelist id="5696" addr="0x7ff9f1fb3dd0" >
-                                            <attribute name="name" value="data" id="5697" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="q(const).XBMCAddon::String" id="5698" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="5696" addr="0x7fdf0850add0" >
+                                            <attribute name="name" value="data" id="5697" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="q(const).XBMCAddon::String" id="5698" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="5699" addr="0x7ff9f1fba9d0" />
-                                <attribute name="code" value="{ XBMC_TRACE; }" id="5700" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="5701" addr="0x7ff9f1fba9d0" />
-                                <attribute name="storage" value="virtual" id="5702" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="5703" addr="0x7ff9f1fb41f0" >
-                            <attributelist id="5704" addr="0x7ff9f1fb41f0" >
-                                <attribute name="name" value="waitForAbort" id="5705" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="5706" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fb14b0" id="5707" addr="0x7ff9f1fb14b0" />
-                                <attribute name="sym_nextSibling" value="0x7ff9f1fb42f0" id="5708" addr="0x7ff9f1fb42f0" />
-                                <attribute name="csym_nextSibling" value="0x7ff9f1fb42f0" id="5709" addr="0x7ff9f1fb42f0" />
-                                <attribute name="kind" value="function" id="5710" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="waitForAbort" id="5711" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(double)." id="5712" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="5713" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overloaded" value="0x7ff9f1fb41f0" id="5714" addr="0x7ff9f1fb41f0" />
-                                <parmlist id="5715" addr="0x7ff9f1fb4130" >
+                                <attribute name="type" value="void" id="5699" addr="0x7fdf085119d0" />
+                                <attribute name="code" value="{ XBMC_TRACE; }" id="5700" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="5701" addr="0x7fdf085119d0" />
+                                <attribute name="storage" value="virtual" id="5702" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="5703" addr="0x7fdf0850b1f0" >
+                            <attributelist id="5704" addr="0x7fdf0850b1f0" >
+                                <attribute name="name" value="waitForAbort" id="5705" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="5706" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf085084b0" id="5707" addr="0x7fdf085084b0" />
+                                <attribute name="sym_nextSibling" value="0x7fdf0850b2f0" id="5708" addr="0x7fdf0850b2f0" />
+                                <attribute name="csym_nextSibling" value="0x7fdf0850b2f0" id="5709" addr="0x7fdf0850b2f0" />
+                                <attribute name="kind" value="function" id="5710" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="waitForAbort" id="5711" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(double)." id="5712" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="5713" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overloaded" value="0x7fdf0850b1f0" id="5714" addr="0x7fdf0850b1f0" />
+                                <parmlist id="5715" addr="0x7fdf0850b130" >
                                     <parm id="5716">
-                                        <attributelist id="5717" addr="0x7ff9f1fb4130" >
-                                            <attribute name="name" value="timeout" id="5718" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="-1" id="5719" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="double" id="5720" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="5717" addr="0x7fdf0850b130" >
+                                            <attribute name="name" value="timeout" id="5718" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="-1" id="5719" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="double" id="5720" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="bool" id="5721" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="5722" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="5723" addr="0x7ff9f1fb42f0" >
-                            <attributelist id="5724" addr="0x7ff9f1fb42f0" >
-                                <attribute name="name" value="waitForAbort" id="5725" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="5726" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fb14b0" id="5727" addr="0x7ff9f1fb14b0" />
-                                <attribute name="sym_previousSibling" value="0x7ff9f1fb41f0" id="5728" addr="0x7ff9f1fb41f0" />
-                                <attribute name="kind" value="function" id="5729" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="waitForAbort" id="5730" addr="0x7ff9f1fba9d0" />
-                                <attribute name="defaultargs" value="0x7ff9f1fb41f0" id="5731" addr="0x7ff9f1fb41f0" />
-                                <attribute name="decl" value="f()." id="5732" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="5733" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overloaded" value="0x7ff9f1fb41f0" id="5734" addr="0x7ff9f1fb41f0" />
-                                <attribute name="type" value="bool" id="5735" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="5736" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="5737" addr="0x7ff9f1fb44d0" >
-                            <attributelist id="5738" addr="0x7ff9f1fb44d0" >
-                                <attribute name="ismember" value="1" id="5739" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="abortRequested" id="5740" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="abortRequested" id="5741" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="5742" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="5743" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="5744" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="bool" id="5745" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fb14b0" id="5746" addr="0x7ff9f1fb14b0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="5747" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <destructor id="5748" addr="0x7ff9f1fb4650" >
-                            <attributelist id="5749" addr="0x7ff9f1fb4650" >
-                                <attribute name="ismember" value="1" id="5750" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="~Monitor" id="5751" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="~Monitor" id="5752" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="5753" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="5754" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fb14b0" id="5755" addr="0x7ff9f1fb14b0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="5756" addr="0x7ff9f1fba9d0" />
+                                <attribute name="type" value="bool" id="5721" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="5722" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="5723" addr="0x7fdf0850b2f0" >
+                            <attributelist id="5724" addr="0x7fdf0850b2f0" >
+                                <attribute name="name" value="waitForAbort" id="5725" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="5726" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf085084b0" id="5727" addr="0x7fdf085084b0" />
+                                <attribute name="sym_previousSibling" value="0x7fdf0850b1f0" id="5728" addr="0x7fdf0850b1f0" />
+                                <attribute name="kind" value="function" id="5729" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="waitForAbort" id="5730" addr="0x7fdf085119d0" />
+                                <attribute name="defaultargs" value="0x7fdf0850b1f0" id="5731" addr="0x7fdf0850b1f0" />
+                                <attribute name="decl" value="f()." id="5732" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="5733" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overloaded" value="0x7fdf0850b1f0" id="5734" addr="0x7fdf0850b1f0" />
+                                <attribute name="type" value="bool" id="5735" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="5736" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="5737" addr="0x7fdf0850b4d0" >
+                            <attributelist id="5738" addr="0x7fdf0850b4d0" >
+                                <attribute name="ismember" value="1" id="5739" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="abortRequested" id="5740" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="abortRequested" id="5741" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="5742" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="5743" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="5744" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="bool" id="5745" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf085084b0" id="5746" addr="0x7fdf085084b0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="5747" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <destructor id="5748" addr="0x7fdf0850b650" >
+                            <attributelist id="5749" addr="0x7fdf0850b650" >
+                                <attribute name="ismember" value="1" id="5750" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="~Monitor" id="5751" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="~Monitor" id="5752" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="5753" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="5754" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf085084b0" id="5755" addr="0x7fdf085084b0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="5756" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </destructor >
diff --git a/srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmcaddon.i.cpp b/srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmcaddon.i.cpp
similarity index 99%
rename from srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmcaddon.i.cpp
rename to srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmcaddon.i.cpp
index 62b0ba1e8cf..52eaa678f3a 100644
--- a/srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmcaddon.i.cpp
+++ b/srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmcaddon.i.cpp
@@ -927,7 +927,7 @@ namespace PythonBindings
 
    // constants
    PyModule_AddStringConstant(module, "__author__", "Team Kodi <http://kodi.tv>");
-   PyModule_AddStringConstant(module, "__date__", "Wed Jun 19 18:36:44 GMT 2019");
+   PyModule_AddStringConstant(module, "__date__", "Sun Sep 01 10:46:50 GMT 2019");
    PyModule_AddStringConstant(module, "__version__", "2.26.0");
    PyModule_AddStringConstant(module, "__credits__", "Team Kodi");
    PyModule_AddStringConstant(module, "__platform__", "ALL");
diff --git a/srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmcaddon.i.xml b/srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmcaddon.i.xml
similarity index 58%
rename from srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmcaddon.i.xml
rename to srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmcaddon.i.xml
index cd93caf78bc..a6cd368b8ac 100644
--- a/srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmcaddon.i.xml
+++ b/srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmcaddon.i.xml
@@ -1,141 +1,141 @@
 <?xml version="1.0" ?> 
-<top id="1" addr="0x7f0bacb21b30" >
-    <attributelist id="2" addr="0x7f0bacb21b30" >
-        <attribute name="outfile" value="AddonModuleXbmcaddon.i.xml" id="3" addr="0x7f0bacb3d530" />
-        <attribute name="name" value="xbmcaddon" id="4" addr="0x7f0bacb3d530" />
-        <attribute name="module" value="xbmcaddon" id="5" addr="0x7f0bacb36fd0" />
-        <attribute name="inputfile" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmcaddon.i" id="6" addr="0x7f0bacb3d530" />
-        <attribute name="classes" value="0x7f0bacb34590" id="7" addr="0x7f0bacb34590" />
-        <attribute name="infile" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmcaddon.i" id="8" addr="0x7f0bacb3d530" />
-        <attribute name="outfile_h" value="AddonModuleXbmcaddon.i.h" id="9" addr="0x7f0bacb3d530" />
+<top id="1" addr="0x7f136da18b30" >
+    <attributelist id="2" addr="0x7f136da18b30" >
+        <attribute name="outfile" value="AddonModuleXbmcaddon.i.xml" id="3" addr="0x7f136da34530" />
+        <attribute name="name" value="xbmcaddon" id="4" addr="0x7f136da34530" />
+        <attribute name="module" value="xbmcaddon" id="5" addr="0x7f136da2dfd0" />
+        <attribute name="inputfile" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmcaddon.i" id="6" addr="0x7f136da34530" />
+        <attribute name="classes" value="0x7f136da2b590" id="7" addr="0x7f136da2b590" />
+        <attribute name="infile" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmcaddon.i" id="8" addr="0x7f136da34530" />
+        <attribute name="outfile_h" value="AddonModuleXbmcaddon.i.h" id="9" addr="0x7f136da34530" />
     </attributelist >
 
-    <include id="10" addr="0x7f0bacb31ed0" >
-        <attributelist id="11" addr="0x7f0bacb31ed0" >
-            <attribute name="name" value="/usr/share/swig/3.0.12/swig.swg" id="12" addr="0x7f0bacb3d530" />
+    <include id="10" addr="0x7f136da28ed0" >
+        <attributelist id="11" addr="0x7f136da28ed0" >
+            <attribute name="name" value="/usr/share/swig/3.0.12/swig.swg" id="12" addr="0x7f136da34530" />
         </attributelist >
 
-        <include id="13" addr="0x7f0bacb31f30" >
-            <attributelist id="14" addr="0x7f0bacb31f30" >
-                <attribute name="name" value="/usr/share/swig/3.0.12/swigwarnings.swg" id="15" addr="0x7f0bacb3d530" />
+        <include id="13" addr="0x7f136da28f30" >
+            <attributelist id="14" addr="0x7f136da28f30" >
+                <attribute name="name" value="/usr/share/swig/3.0.12/swigwarnings.swg" id="15" addr="0x7f136da34530" />
             </attributelist >
 
-            <include id="16" addr="0x7f0bacb32050" >
-                <attributelist id="17" addr="0x7f0bacb32050" >
-                    <attribute name="name" value="/usr/share/swig/3.0.12/swigwarn.swg" id="18" addr="0x7f0bacb3d530" />
+            <include id="16" addr="0x7f136da29050" >
+                <attributelist id="17" addr="0x7f136da29050" >
+                    <attribute name="name" value="/usr/share/swig/3.0.12/swigwarn.swg" id="18" addr="0x7f136da34530" />
                 </attributelist >
              
             </include >
         </include >
-        <namespace id="19" addr="0x7f0bacb340b0" >
-            <attributelist id="20" addr="0x7f0bacb340b0" >
-                <attribute name="sym_name" value="std" id="21" addr="0x7f0bacb3d530" />
-                <attribute name="name" value="std" id="22" addr="0x7f0bacb3d530" />
-                <typescope id="23" addr="0x7f0bacb3c1d0" >
-                    <attributelist id="24" addr="0x7f0bacb3c1d0" >
-                        <attribute name="name" value="std" id="25" addr="0x7f0bacb3d530" />
-                        <typetab id="26" addr="0x7f0bacb3c1f0" >
-                            <attributelist id="27" addr="0x7f0bacb3c1f0" >
-                                <attribute name="initializer_list" value="initializer_list" id="28" addr="0x7f0bacb3d530" />
+        <namespace id="19" addr="0x7f136da2b0b0" >
+            <attributelist id="20" addr="0x7f136da2b0b0" >
+                <attribute name="sym_name" value="std" id="21" addr="0x7f136da34530" />
+                <attribute name="name" value="std" id="22" addr="0x7f136da34530" />
+                <typescope id="23" addr="0x7f136da331d0" >
+                    <attributelist id="24" addr="0x7f136da331d0" >
+                        <attribute name="name" value="std" id="25" addr="0x7f136da34530" />
+                        <typetab id="26" addr="0x7f136da331f0" >
+                            <attributelist id="27" addr="0x7f136da331f0" >
+                                <attribute name="initializer_list" value="initializer_list" id="28" addr="0x7f136da34530" />
                             </attributelist >
-                            <typetabsitem id="29" addr="0x7f0bacb3c310" >
-                                <attributelist id="30" addr="0x7f0bacb3c310" >
+                            <typetabsitem id="29" addr="0x7f136da33310" >
+                                <attributelist id="30" addr="0x7f136da33310" >
                                 </attributelist >
                             </typetabsitem >
                         </typetab >
-                        <attribute name="parent" value="0x7f0bacb20a30" id="31" addr="0x7f0bacb20a30" />
-                        <attribute name="qname" value="std" id="32" addr="0x7f0bacb3d530" />
-                        <attribute name="symtab" value="0x7f0bacb34010" id="33" addr="0x7f0bacb34010" />
+                        <attribute name="parent" value="0x7f136da17a30" id="31" addr="0x7f136da17a30" />
+                        <attribute name="qname" value="std" id="32" addr="0x7f136da34530" />
+                        <attribute name="symtab" value="0x7f136da2b010" id="33" addr="0x7f136da2b010" />
                     </attributelist >
-                    <typescopesitem id="34" addr="0x7f0bacb33f70" >
-                        <attributelist id="35" addr="0x7f0bacb33f70" >
+                    <typescopesitem id="34" addr="0x7f136da2af70" >
+                        <attributelist id="35" addr="0x7f136da2af70" >
                         </attributelist >
                     </typescopesitem >
-                    <typescopesitem id="36" addr="0x7f0bacb3c1f0" >
-                        <attributelist id="37" addr="0x7f0bacb3c1f0" >
-                            <attribute name="initializer_list" value="initializer_list" id="38" addr="0x7f0bacb3d530" />
+                    <typescopesitem id="36" addr="0x7f136da331f0" >
+                        <attributelist id="37" addr="0x7f136da331f0" >
+                            <attribute name="initializer_list" value="initializer_list" id="38" addr="0x7f136da34530" />
                         </attributelist >
                     </typescopesitem >
-                    <typescopesitem id="39" addr="0x7f0bacb20a30" >
-                        <attributelist id="40" addr="0x7f0bacb20a30" >
-                            <attribute name="name" value="" id="41" addr="0x7f0bacb3d530" />
-                            <typetab id="42" addr="0x7f0bacb20a90" >
-                                <attributelist id="43" addr="0x7f0bacb20a90" >
+                    <typescopesitem id="39" addr="0x7f136da17a30" >
+                        <attributelist id="40" addr="0x7f136da17a30" >
+                            <attribute name="name" value="" id="41" addr="0x7f136da34530" />
+                            <typetab id="42" addr="0x7f136da17a90" >
+                                <attributelist id="43" addr="0x7f136da17a90" >
                                 </attributelist >
                             </typetab >
                         </attributelist >
                     </typescopesitem >
-                    <typescopesitem id="44" addr="0x7f0bacb3c210" >
-                        <attributelist id="45" addr="0x7f0bacb3c210" >
+                    <typescopesitem id="44" addr="0x7f136da33210" >
+                        <attributelist id="45" addr="0x7f136da33210" >
                         </attributelist >
                     </typescopesitem >
-                    <typescopesitem id="46" addr="0x7f0bacb34010" >
-                        <attributelist id="47" addr="0x7f0bacb34010" >
-                            <attribute name="name" value="std" id="48" addr="0x7f0bacb3d530" />
-                            <attribute name="csymtab" value="0x7f0bacb34050" id="49" addr="0x7f0bacb34050" />
-                            <attribute name="symtab" value="0x7f0bacb33ff0" id="50" addr="0x7f0bacb33ff0" />
+                    <typescopesitem id="46" addr="0x7f136da2b010" >
+                        <attributelist id="47" addr="0x7f136da2b010" >
+                            <attribute name="name" value="std" id="48" addr="0x7f136da34530" />
+                            <attribute name="csymtab" value="0x7f136da2b050" id="49" addr="0x7f136da2b050" />
+                            <attribute name="symtab" value="0x7f136da2aff0" id="50" addr="0x7f136da2aff0" />
                         </attributelist >
                     </typescopesitem >
                 </typescope >
-                <attribute name="symtab" value="0x7f0bacb34010" id="51" addr="0x7f0bacb34010" />
-                <attribute name="sym_symtab" value="0x7f0bacb20950" id="52" addr="0x7f0bacb20950" />
-                <attribute name="sym_overname" value="__SWIG_0" id="53" addr="0x7f0bacb3d530" />
+                <attribute name="symtab" value="0x7f136da2b010" id="51" addr="0x7f136da2b010" />
+                <attribute name="sym_symtab" value="0x7f136da17950" id="52" addr="0x7f136da17950" />
+                <attribute name="sym_overname" value="__SWIG_0" id="53" addr="0x7f136da34530" />
             </attributelist >
 
-            <template id="54" addr="0x7f0bacb34230" >
-                <attributelist id="55" addr="0x7f0bacb34230" >
-                    <attribute name="templatetype" value="class" id="56" addr="0x7f0bacb3d530" />
-                    <attribute name="sym_typename" value="1" id="57" addr="0x7f0bacb3d530" />
-                    <attribute name="name" value="initializer_list" id="58" addr="0x7f0bacb3d530" />
-                    <attribute name="sym_symtab" value="0x7f0bacb34010" id="59" addr="0x7f0bacb34010" />
-                    <attribute name="symtab" value="0x7f0bacb34450" id="60" addr="0x7f0bacb34450" />
-                    <attribute name="allows_typedef" value="1" id="61" addr="0x7f0bacb3d530" />
-                    <attribute name="kind" value="class" id="62" addr="0x7f0bacb3d530" />
-                    <attribute name="sym_name" value="initializer_list" id="63" addr="0x7f0bacb3d530" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="64" addr="0x7f0bacb3d530" />
-                    <templateparms id="65" addr="0x7f0bacb34150" >
+            <template id="54" addr="0x7f136da2b230" >
+                <attributelist id="55" addr="0x7f136da2b230" >
+                    <attribute name="templatetype" value="class" id="56" addr="0x7f136da34530" />
+                    <attribute name="sym_typename" value="1" id="57" addr="0x7f136da34530" />
+                    <attribute name="name" value="initializer_list" id="58" addr="0x7f136da34530" />
+                    <attribute name="sym_symtab" value="0x7f136da2b010" id="59" addr="0x7f136da2b010" />
+                    <attribute name="symtab" value="0x7f136da2b450" id="60" addr="0x7f136da2b450" />
+                    <attribute name="allows_typedef" value="1" id="61" addr="0x7f136da34530" />
+                    <attribute name="kind" value="class" id="62" addr="0x7f136da34530" />
+                    <attribute name="sym_name" value="initializer_list" id="63" addr="0x7f136da34530" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="64" addr="0x7f136da34530" />
+                    <templateparms id="65" addr="0x7f136da2b150" >
                         <parm id="66">
-                            <attributelist id="67" addr="0x7f0bacb34150" >
-                                <attribute name="name" value="T" id="68" addr="0x7f0bacb3d530" />
-                                <attribute name="type" value="typename T" id="69" addr="0x7f0bacb3d530" />
+                            <attributelist id="67" addr="0x7f136da2b150" >
+                                <attribute name="name" value="T" id="68" addr="0x7f136da34530" />
+                                <attribute name="type" value="typename T" id="69" addr="0x7f136da34530" />
                             </attributelist >
                         </parm >
                     </templateparms >
                 </attributelist >
 
-                <access id="70" addr="0x7f0bacb34610" >
-                    <attributelist id="71" addr="0x7f0bacb34610" >
-                        <attribute name="kind" value="public" id="72" addr="0x7f0bacb3d530" />
+                <access id="70" addr="0x7f136da2b610" >
+                    <attributelist id="71" addr="0x7f136da2b610" >
+                        <attribute name="kind" value="public" id="72" addr="0x7f136da34530" />
                     </attributelist >
                  
                 </access >
             </template >
-            <typemap id="73" addr="0x7f0bacb34c70" >
-                <attributelist id="74" addr="0x7f0bacb34c70" >
-                    <kwargs id="75" addr="0x7f0bacb34970" >
-                        <attributelist id="76" addr="0x7f0bacb34970" >
-                            <attribute name="name" value="warning" id="77" addr="0x7f0bacb3d530" />
-                            <attribute name="value" value="476:Initialization using std::initializer_list." id="78" addr="0x7f0bacb3d530" />
+            <typemap id="73" addr="0x7f136da2bc70" >
+                <attributelist id="74" addr="0x7f136da2bc70" >
+                    <kwargs id="75" addr="0x7f136da2b970" >
+                        <attributelist id="76" addr="0x7f136da2b970" >
+                            <attribute name="name" value="warning" id="77" addr="0x7f136da34530" />
+                            <attribute name="value" value="476:Initialization using std::initializer_list." id="78" addr="0x7f136da34530" />
                         </attributelist >
-                        <kwargssitem id="79" addr="0x7f0bacb34af0" >
-                            <attributelist id="80" addr="0x7f0bacb34af0" >
+                        <kwargssitem id="79" addr="0x7f136da2baf0" >
+                            <attributelist id="80" addr="0x7f136da2baf0" >
                             </attributelist >
                         </kwargssitem >
-                        <kwargssitem id="81" addr="0x7f0bacb34950" >
-                            <attributelist id="82" addr="0x7f0bacb34950" >
+                        <kwargssitem id="81" addr="0x7f136da2b950" >
+                            <attributelist id="82" addr="0x7f136da2b950" >
                             </attributelist >
                         </kwargssitem >
                     </kwargs >
-                    <attribute name="code" value="" id="83" addr="0x7f0bacb3d530" />
-                    <attribute name="method" value="in" id="84" addr="0x7f0bacb3d530" />
+                    <attribute name="code" value="" id="83" addr="0x7f136da34530" />
+                    <attribute name="method" value="in" id="84" addr="0x7f136da34530" />
                 </attributelist >
 
-                <typemapitem id="85" addr="0x7f0bacb34b90" >
-                    <attributelist id="86" addr="0x7f0bacb34b90" >
-                        <parmlist id="87" addr="0x7f0bacb34bd0" >
+                <typemapitem id="85" addr="0x7f136da2bb90" >
+                    <attributelist id="86" addr="0x7f136da2bb90" >
+                        <parmlist id="87" addr="0x7f136da2bbd0" >
                             <parm id="88">
-                                <attributelist id="89" addr="0x7f0bacb34bd0" >
-                                    <attribute name="type" value="std::initializer_list&lt;(T)>" id="90" addr="0x7f0bacb3d530" />
+                                <attributelist id="89" addr="0x7f136da2bbd0" >
+                                    <attribute name="type" value="std::initializer_list&lt;(T)>" id="90" addr="0x7f136da34530" />
                                 </attributelist >
                             </parm >
                         </parmlist >
@@ -143,32 +143,32 @@
                  
                 </typemapitem >
             </typemap >
-            <typemap id="91" addr="0x7f0bacb34ff0" >
-                <attributelist id="92" addr="0x7f0bacb34ff0" >
-                    <kwargs id="93" addr="0x7f0bacb34d90" >
-                        <attributelist id="94" addr="0x7f0bacb34d90" >
-                            <attribute name="name" value="precedence" id="95" addr="0x7f0bacb3d530" />
-                            <attribute name="value" value="0" id="96" addr="0x7f0bacb3d530" />
+            <typemap id="91" addr="0x7f136da2bff0" >
+                <attributelist id="92" addr="0x7f136da2bff0" >
+                    <kwargs id="93" addr="0x7f136da2bd90" >
+                        <attributelist id="94" addr="0x7f136da2bd90" >
+                            <attribute name="name" value="precedence" id="95" addr="0x7f136da34530" />
+                            <attribute name="value" value="0" id="96" addr="0x7f136da34530" />
                         </attributelist >
-                        <kwargssitem id="97" addr="0x7f0bacb34db0" >
-                            <attributelist id="98" addr="0x7f0bacb34db0" >
+                        <kwargssitem id="97" addr="0x7f136da2bdb0" >
+                            <attributelist id="98" addr="0x7f136da2bdb0" >
                             </attributelist >
                         </kwargssitem >
-                        <kwargssitem id="99" addr="0x7f0bacb34dd0" >
-                            <attributelist id="100" addr="0x7f0bacb34dd0" >
+                        <kwargssitem id="99" addr="0x7f136da2bdd0" >
+                            <attributelist id="100" addr="0x7f136da2bdd0" >
                             </attributelist >
                         </kwargssitem >
                     </kwargs >
-                    <attribute name="code" value="" id="101" addr="0x7f0bacb3d530" />
-                    <attribute name="method" value="typecheck" id="102" addr="0x7f0bacb3d530" />
+                    <attribute name="code" value="" id="101" addr="0x7f136da34530" />
+                    <attribute name="method" value="typecheck" id="102" addr="0x7f136da34530" />
                 </attributelist >
 
-                <typemapitem id="103" addr="0x7f0bacb34f30" >
-                    <attributelist id="104" addr="0x7f0bacb34f30" >
-                        <parmlist id="105" addr="0x7f0bacb34f70" >
+                <typemapitem id="103" addr="0x7f136da2bf30" >
+                    <attributelist id="104" addr="0x7f136da2bf30" >
+                        <parmlist id="105" addr="0x7f136da2bf70" >
                             <parm id="106">
-                                <attributelist id="107" addr="0x7f0bacb34f70" >
-                                    <attribute name="type" value="std::initializer_list&lt;(T)>" id="108" addr="0x7f0bacb3d530" />
+                                <attributelist id="107" addr="0x7f136da2bf70" >
+                                    <attribute name="type" value="std::initializer_list&lt;(T)>" id="108" addr="0x7f136da34530" />
                                 </attributelist >
                             </parm >
                         </parmlist >
@@ -177,18 +177,18 @@
                 </typemapitem >
             </typemap >
         </namespace >
-        <typemap id="109" addr="0x7f0bacb35210" >
-            <attributelist id="110" addr="0x7f0bacb35210" >
-                <attribute name="code" value="delete [] $1;" id="111" addr="0x7f0bacb3d530" />
-                <attribute name="method" value="newfree" id="112" addr="0x7f0bacb3d530" />
+        <typemap id="109" addr="0x7f136da2c210" >
+            <attributelist id="110" addr="0x7f136da2c210" >
+                <attribute name="code" value="delete [] $1;" id="111" addr="0x7f136da34530" />
+                <attribute name="method" value="newfree" id="112" addr="0x7f136da34530" />
             </attributelist >
 
-            <typemapitem id="113" addr="0x7f0bacb35130" >
-                <attributelist id="114" addr="0x7f0bacb35130" >
-                    <parmlist id="115" addr="0x7f0bacb35170" >
+            <typemapitem id="113" addr="0x7f136da2c130" >
+                <attributelist id="114" addr="0x7f136da2c130" >
+                    <parmlist id="115" addr="0x7f136da2c170" >
                         <parm id="116">
-                            <attributelist id="117" addr="0x7f0bacb35170" >
-                                <attribute name="type" value="p.char" id="118" addr="0x7f0bacb3d530" />
+                            <attributelist id="117" addr="0x7f136da2c170" >
+                                <attribute name="type" value="p.char" id="118" addr="0x7f136da34530" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -196,18 +196,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="119" addr="0x7f0bacb353f0" >
-            <attributelist id="120" addr="0x7f0bacb353f0" >
-                <attribute name="code" value="{&#10;  delete [] $1;&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="121" addr="0x7f0bacb3d530" />
-                <attribute name="method" value="memberin" id="122" addr="0x7f0bacb3d530" />
+        <typemap id="119" addr="0x7f136da2c3f0" >
+            <attributelist id="120" addr="0x7f136da2c3f0" >
+                <attribute name="code" value="{&#10;  delete [] $1;&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="121" addr="0x7f136da34530" />
+                <attribute name="method" value="memberin" id="122" addr="0x7f136da34530" />
             </attributelist >
 
-            <typemapitem id="123" addr="0x7f0bacb35330" >
-                <attributelist id="124" addr="0x7f0bacb35330" >
-                    <parmlist id="125" addr="0x7f0bacb35370" >
+            <typemapitem id="123" addr="0x7f136da2c330" >
+                <attributelist id="124" addr="0x7f136da2c330" >
+                    <parmlist id="125" addr="0x7f136da2c370" >
                         <parm id="126">
-                            <attributelist id="127" addr="0x7f0bacb35370" >
-                                <attribute name="type" value="p.char" id="128" addr="0x7f0bacb3d530" />
+                            <attributelist id="127" addr="0x7f136da2c370" >
+                                <attribute name="type" value="p.char" id="128" addr="0x7f136da34530" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -215,32 +215,32 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="129" addr="0x7f0bacb35650" >
-            <attributelist id="130" addr="0x7f0bacb35650" >
-                <kwargs id="131" addr="0x7f0bacb35490" >
-                    <attributelist id="132" addr="0x7f0bacb35490" >
-                        <attribute name="name" value="warning" id="133" addr="0x7f0bacb3d530" />
-                        <attribute name="value" value="451:Setting a const char * variable may leak memory." id="134" addr="0x7f0bacb3d530" />
+        <typemap id="129" addr="0x7f136da2c650" >
+            <attributelist id="130" addr="0x7f136da2c650" >
+                <kwargs id="131" addr="0x7f136da2c490" >
+                    <attributelist id="132" addr="0x7f136da2c490" >
+                        <attribute name="name" value="warning" id="133" addr="0x7f136da34530" />
+                        <attribute name="value" value="451:Setting a const char * variable may leak memory." id="134" addr="0x7f136da34530" />
                     </attributelist >
-                    <kwargssitem id="135" addr="0x7f0bacb354b0" >
-                        <attributelist id="136" addr="0x7f0bacb354b0" >
+                    <kwargssitem id="135" addr="0x7f136da2c4b0" >
+                        <attributelist id="136" addr="0x7f136da2c4b0" >
                         </attributelist >
                     </kwargssitem >
-                    <kwargssitem id="137" addr="0x7f0bacb35470" >
-                        <attributelist id="138" addr="0x7f0bacb35470" >
+                    <kwargssitem id="137" addr="0x7f136da2c470" >
+                        <attributelist id="138" addr="0x7f136da2c470" >
                         </attributelist >
                     </kwargssitem >
                 </kwargs >
-                <attribute name="code" value="{&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="139" addr="0x7f0bacb3d530" />
-                <attribute name="method" value="memberin" id="140" addr="0x7f0bacb3d530" />
+                <attribute name="code" value="{&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="139" addr="0x7f136da34530" />
+                <attribute name="method" value="memberin" id="140" addr="0x7f136da34530" />
             </attributelist >
 
-            <typemapitem id="141" addr="0x7f0bacb35590" >
-                <attributelist id="142" addr="0x7f0bacb35590" >
-                    <parmlist id="143" addr="0x7f0bacb355d0" >
+            <typemapitem id="141" addr="0x7f136da2c590" >
+                <attributelist id="142" addr="0x7f136da2c590" >
+                    <parmlist id="143" addr="0x7f136da2c5d0" >
                         <parm id="144">
-                            <attributelist id="145" addr="0x7f0bacb355d0" >
-                                <attribute name="type" value="p.q(const).char" id="146" addr="0x7f0bacb3d530" />
+                            <attributelist id="145" addr="0x7f136da2c5d0" >
+                                <attribute name="type" value="p.q(const).char" id="146" addr="0x7f136da34530" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -248,18 +248,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="147" addr="0x7f0bacb35830" >
-            <attributelist id="148" addr="0x7f0bacb35830" >
-                <attribute name="code" value="{&#10;  delete [] $1;&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="149" addr="0x7f0bacb3d530" />
-                <attribute name="method" value="globalin" id="150" addr="0x7f0bacb3d530" />
+        <typemap id="147" addr="0x7f136da2c830" >
+            <attributelist id="148" addr="0x7f136da2c830" >
+                <attribute name="code" value="{&#10;  delete [] $1;&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="149" addr="0x7f136da34530" />
+                <attribute name="method" value="globalin" id="150" addr="0x7f136da34530" />
             </attributelist >
 
-            <typemapitem id="151" addr="0x7f0bacb35770" >
-                <attributelist id="152" addr="0x7f0bacb35770" >
-                    <parmlist id="153" addr="0x7f0bacb357b0" >
+            <typemapitem id="151" addr="0x7f136da2c770" >
+                <attributelist id="152" addr="0x7f136da2c770" >
+                    <parmlist id="153" addr="0x7f136da2c7b0" >
                         <parm id="154">
-                            <attributelist id="155" addr="0x7f0bacb357b0" >
-                                <attribute name="type" value="p.char" id="156" addr="0x7f0bacb3d530" />
+                            <attributelist id="155" addr="0x7f136da2c7b0" >
+                                <attribute name="type" value="p.char" id="156" addr="0x7f136da34530" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -267,32 +267,32 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="157" addr="0x7f0bacb35a90" >
-            <attributelist id="158" addr="0x7f0bacb35a90" >
-                <kwargs id="159" addr="0x7f0bacb358d0" >
-                    <attributelist id="160" addr="0x7f0bacb358d0" >
-                        <attribute name="name" value="warning" id="161" addr="0x7f0bacb3d530" />
-                        <attribute name="value" value="451:Setting a const char * variable may leak memory." id="162" addr="0x7f0bacb3d530" />
+        <typemap id="157" addr="0x7f136da2ca90" >
+            <attributelist id="158" addr="0x7f136da2ca90" >
+                <kwargs id="159" addr="0x7f136da2c8d0" >
+                    <attributelist id="160" addr="0x7f136da2c8d0" >
+                        <attribute name="name" value="warning" id="161" addr="0x7f136da34530" />
+                        <attribute name="value" value="451:Setting a const char * variable may leak memory." id="162" addr="0x7f136da34530" />
                     </attributelist >
-                    <kwargssitem id="163" addr="0x7f0bacb358f0" >
-                        <attributelist id="164" addr="0x7f0bacb358f0" >
+                    <kwargssitem id="163" addr="0x7f136da2c8f0" >
+                        <attributelist id="164" addr="0x7f136da2c8f0" >
                         </attributelist >
                     </kwargssitem >
-                    <kwargssitem id="165" addr="0x7f0bacb358b0" >
-                        <attributelist id="166" addr="0x7f0bacb358b0" >
+                    <kwargssitem id="165" addr="0x7f136da2c8b0" >
+                        <attributelist id="166" addr="0x7f136da2c8b0" >
                         </attributelist >
                     </kwargssitem >
                 </kwargs >
-                <attribute name="code" value="{&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="167" addr="0x7f0bacb3d530" />
-                <attribute name="method" value="globalin" id="168" addr="0x7f0bacb3d530" />
+                <attribute name="code" value="{&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="167" addr="0x7f136da34530" />
+                <attribute name="method" value="globalin" id="168" addr="0x7f136da34530" />
             </attributelist >
 
-            <typemapitem id="169" addr="0x7f0bacb359d0" >
-                <attributelist id="170" addr="0x7f0bacb359d0" >
-                    <parmlist id="171" addr="0x7f0bacb35a10" >
+            <typemapitem id="169" addr="0x7f136da2c9d0" >
+                <attributelist id="170" addr="0x7f136da2c9d0" >
+                    <parmlist id="171" addr="0x7f136da2ca10" >
                         <parm id="172">
-                            <attributelist id="173" addr="0x7f0bacb35a10" >
-                                <attribute name="type" value="p.q(const).char" id="174" addr="0x7f0bacb3d530" />
+                            <attributelist id="173" addr="0x7f136da2ca10" >
+                                <attribute name="type" value="p.q(const).char" id="174" addr="0x7f136da34530" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -300,18 +300,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="175" addr="0x7f0bacb35cb0" >
-            <attributelist id="176" addr="0x7f0bacb35cb0" >
-                <attribute name="code" value="{&#10;  if($input) {&#10;    strncpy((char*)$1, (const char *)$input, $1_dim0-1);&#10;    $1[$1_dim0-1] = 0;&#10;  } else {&#10;    $1[0] = 0;&#10;  }&#10;}" id="177" addr="0x7f0bacb3d530" />
-                <attribute name="method" value="memberin" id="178" addr="0x7f0bacb3d530" />
+        <typemap id="175" addr="0x7f136da2ccb0" >
+            <attributelist id="176" addr="0x7f136da2ccb0" >
+                <attribute name="code" value="{&#10;  if($input) {&#10;    strncpy((char*)$1, (const char *)$input, $1_dim0-1);&#10;    $1[$1_dim0-1] = 0;&#10;  } else {&#10;    $1[0] = 0;&#10;  }&#10;}" id="177" addr="0x7f136da34530" />
+                <attribute name="method" value="memberin" id="178" addr="0x7f136da34530" />
             </attributelist >
 
-            <typemapitem id="179" addr="0x7f0bacb35bf0" >
-                <attributelist id="180" addr="0x7f0bacb35bf0" >
-                    <parmlist id="181" addr="0x7f0bacb35c30" >
+            <typemapitem id="179" addr="0x7f136da2cbf0" >
+                <attributelist id="180" addr="0x7f136da2cbf0" >
+                    <parmlist id="181" addr="0x7f136da2cc30" >
                         <parm id="182">
-                            <attributelist id="183" addr="0x7f0bacb35c30" >
-                                <attribute name="type" value="a(ANY).char" id="184" addr="0x7f0bacb3d530" />
+                            <attributelist id="183" addr="0x7f136da2cc30" >
+                                <attribute name="type" value="a(ANY).char" id="184" addr="0x7f136da34530" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -319,18 +319,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="185" addr="0x7f0bacb35ed0" >
-            <attributelist id="186" addr="0x7f0bacb35ed0" >
-                <attribute name="code" value="{&#10;  if($input) {&#10;    strncpy((char*)$1, (const char *)$input, $1_dim0-1);&#10;    $1[$1_dim0-1] = 0;&#10;  } else {&#10;    $1[0] = 0;&#10;  }&#10;}" id="187" addr="0x7f0bacb3d530" />
-                <attribute name="method" value="globalin" id="188" addr="0x7f0bacb3d530" />
+        <typemap id="185" addr="0x7f136da2ced0" >
+            <attributelist id="186" addr="0x7f136da2ced0" >
+                <attribute name="code" value="{&#10;  if($input) {&#10;    strncpy((char*)$1, (const char *)$input, $1_dim0-1);&#10;    $1[$1_dim0-1] = 0;&#10;  } else {&#10;    $1[0] = 0;&#10;  }&#10;}" id="187" addr="0x7f136da34530" />
+                <attribute name="method" value="globalin" id="188" addr="0x7f136da34530" />
             </attributelist >
 
-            <typemapitem id="189" addr="0x7f0bacb35e10" >
-                <attributelist id="190" addr="0x7f0bacb35e10" >
-                    <parmlist id="191" addr="0x7f0bacb35e50" >
+            <typemapitem id="189" addr="0x7f136da2ce10" >
+                <attributelist id="190" addr="0x7f136da2ce10" >
+                    <parmlist id="191" addr="0x7f136da2ce50" >
                         <parm id="192">
-                            <attributelist id="193" addr="0x7f0bacb35e50" >
-                                <attribute name="type" value="a(ANY).char" id="194" addr="0x7f0bacb3d530" />
+                            <attributelist id="193" addr="0x7f136da2ce50" >
+                                <attribute name="type" value="a(ANY).char" id="194" addr="0x7f136da34530" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -338,18 +338,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="195" addr="0x7f0bacb360b0" >
-            <attributelist id="196" addr="0x7f0bacb360b0" >
-                <attribute name="code" value="{&#10;  if ($input) strcpy((char *)$1, (const char *)$input);&#10;  else $1[0] = 0;&#10;}" id="197" addr="0x7f0bacb3d530" />
-                <attribute name="method" value="memberin" id="198" addr="0x7f0bacb3d530" />
+        <typemap id="195" addr="0x7f136da2d0b0" >
+            <attributelist id="196" addr="0x7f136da2d0b0" >
+                <attribute name="code" value="{&#10;  if ($input) strcpy((char *)$1, (const char *)$input);&#10;  else $1[0] = 0;&#10;}" id="197" addr="0x7f136da34530" />
+                <attribute name="method" value="memberin" id="198" addr="0x7f136da34530" />
             </attributelist >
 
-            <typemapitem id="199" addr="0x7f0bacb35ff0" >
-                <attributelist id="200" addr="0x7f0bacb35ff0" >
-                    <parmlist id="201" addr="0x7f0bacb36030" >
+            <typemapitem id="199" addr="0x7f136da2cff0" >
+                <attributelist id="200" addr="0x7f136da2cff0" >
+                    <parmlist id="201" addr="0x7f136da2d030" >
                         <parm id="202">
-                            <attributelist id="203" addr="0x7f0bacb36030" >
-                                <attribute name="type" value="a().char" id="204" addr="0x7f0bacb3d530" />
+                            <attributelist id="203" addr="0x7f136da2d030" >
+                                <attribute name="type" value="a().char" id="204" addr="0x7f136da34530" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -357,18 +357,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="205" addr="0x7f0bacb36290" >
-            <attributelist id="206" addr="0x7f0bacb36290" >
-                <attribute name="code" value="{&#10;  if ($input) strcpy((char *)$1, (const char *)$input);&#10;  else $1[0] = 0;&#10;}" id="207" addr="0x7f0bacb3d530" />
-                <attribute name="method" value="globalin" id="208" addr="0x7f0bacb3d530" />
+        <typemap id="205" addr="0x7f136da2d290" >
+            <attributelist id="206" addr="0x7f136da2d290" >
+                <attribute name="code" value="{&#10;  if ($input) strcpy((char *)$1, (const char *)$input);&#10;  else $1[0] = 0;&#10;}" id="207" addr="0x7f136da34530" />
+                <attribute name="method" value="globalin" id="208" addr="0x7f136da34530" />
             </attributelist >
 
-            <typemapitem id="209" addr="0x7f0bacb361d0" >
-                <attributelist id="210" addr="0x7f0bacb361d0" >
-                    <parmlist id="211" addr="0x7f0bacb36210" >
+            <typemapitem id="209" addr="0x7f136da2d1d0" >
+                <attributelist id="210" addr="0x7f136da2d1d0" >
+                    <parmlist id="211" addr="0x7f136da2d210" >
                         <parm id="212">
-                            <attributelist id="213" addr="0x7f0bacb36210" >
-                                <attribute name="type" value="a().char" id="214" addr="0x7f0bacb3d530" />
+                            <attributelist id="213" addr="0x7f136da2d210" >
+                                <attribute name="type" value="a().char" id="214" addr="0x7f136da34530" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -376,18 +376,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="215" addr="0x7f0bacb364b0" >
-            <attributelist id="216" addr="0x7f0bacb364b0" >
-                <attribute name="code" value="{&#10;  size_t ii;&#10;  $1_basetype *b = ($1_basetype *) $1;&#10;  for (ii = 0; ii &lt; (size_t)$1_size; ii++) b[ii] = *(($1_basetype *) $input + ii);&#10;}" id="217" addr="0x7f0bacb3d530" />
-                <attribute name="method" value="memberin" id="218" addr="0x7f0bacb3d530" />
+        <typemap id="215" addr="0x7f136da2d4b0" >
+            <attributelist id="216" addr="0x7f136da2d4b0" >
+                <attribute name="code" value="{&#10;  size_t ii;&#10;  $1_basetype *b = ($1_basetype *) $1;&#10;  for (ii = 0; ii &lt; (size_t)$1_size; ii++) b[ii] = *(($1_basetype *) $input + ii);&#10;}" id="217" addr="0x7f136da34530" />
+                <attribute name="method" value="memberin" id="218" addr="0x7f136da34530" />
             </attributelist >
 
-            <typemapitem id="219" addr="0x7f0bacb363f0" >
-                <attributelist id="220" addr="0x7f0bacb363f0" >
-                    <parmlist id="221" addr="0x7f0bacb36430" >
+            <typemapitem id="219" addr="0x7f136da2d3f0" >
+                <attributelist id="220" addr="0x7f136da2d3f0" >
+                    <parmlist id="221" addr="0x7f136da2d430" >
                         <parm id="222">
-                            <attributelist id="223" addr="0x7f0bacb36430" >
-                                <attribute name="type" value="a(ANY).SWIGTYPE" id="224" addr="0x7f0bacb3d530" />
+                            <attributelist id="223" addr="0x7f136da2d430" >
+                                <attribute name="type" value="a(ANY).SWIGTYPE" id="224" addr="0x7f136da34530" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -395,18 +395,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="225" addr="0x7f0bacb366d0" >
-            <attributelist id="226" addr="0x7f0bacb366d0" >
-                <attribute name="code" value="{&#10;  size_t ii;&#10;  $1_basetype *b = ($1_basetype *) $1;&#10;  for (ii = 0; ii &lt; (size_t)$1_size; ii++) b[ii] = *(($1_basetype *) $input + ii);&#10;}" id="227" addr="0x7f0bacb3d530" />
-                <attribute name="method" value="globalin" id="228" addr="0x7f0bacb3d530" />
+        <typemap id="225" addr="0x7f136da2d6d0" >
+            <attributelist id="226" addr="0x7f136da2d6d0" >
+                <attribute name="code" value="{&#10;  size_t ii;&#10;  $1_basetype *b = ($1_basetype *) $1;&#10;  for (ii = 0; ii &lt; (size_t)$1_size; ii++) b[ii] = *(($1_basetype *) $input + ii);&#10;}" id="227" addr="0x7f136da34530" />
+                <attribute name="method" value="globalin" id="228" addr="0x7f136da34530" />
             </attributelist >
 
-            <typemapitem id="229" addr="0x7f0bacb36610" >
-                <attributelist id="230" addr="0x7f0bacb36610" >
-                    <parmlist id="231" addr="0x7f0bacb36650" >
+            <typemapitem id="229" addr="0x7f136da2d610" >
+                <attributelist id="230" addr="0x7f136da2d610" >
+                    <parmlist id="231" addr="0x7f136da2d650" >
                         <parm id="232">
-                            <attributelist id="233" addr="0x7f0bacb36650" >
-                                <attribute name="type" value="a(ANY).SWIGTYPE" id="234" addr="0x7f0bacb3d530" />
+                            <attributelist id="233" addr="0x7f136da2d650" >
+                                <attribute name="type" value="a(ANY).SWIGTYPE" id="234" addr="0x7f136da34530" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -414,18 +414,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="235" addr="0x7f0bacb36930" >
-            <attributelist id="236" addr="0x7f0bacb36930" >
-                <attribute name="code" value="{&#10;  $basetype (*inp)[$1_dim1] = ($basetype (*)[$1_dim1])($input);&#10;  $basetype (*dest)[$1_dim1] = ($basetype (*)[$1_dim1])($1);&#10;  size_t ii = 0;&#10;  for (; ii &lt; $1_dim0; ++ii) {&#10;    $basetype *ip = inp[ii];&#10;    $basetype *dp = dest[ii];&#10;    size_t jj = 0;&#10;    for (; jj &lt; $1_dim1; ++jj) dp[jj] = ip[jj];&#10;  }&#10;}" id="237" addr="0x7f0bacb3d530" />
-                <attribute name="method" value="memberin" id="238" addr="0x7f0bacb3d530" />
+        <typemap id="235" addr="0x7f136da2d930" >
+            <attributelist id="236" addr="0x7f136da2d930" >
+                <attribute name="code" value="{&#10;  $basetype (*inp)[$1_dim1] = ($basetype (*)[$1_dim1])($input);&#10;  $basetype (*dest)[$1_dim1] = ($basetype (*)[$1_dim1])($1);&#10;  size_t ii = 0;&#10;  for (; ii &lt; $1_dim0; ++ii) {&#10;    $basetype *ip = inp[ii];&#10;    $basetype *dp = dest[ii];&#10;    size_t jj = 0;&#10;    for (; jj &lt; $1_dim1; ++jj) dp[jj] = ip[jj];&#10;  }&#10;}" id="237" addr="0x7f136da34530" />
+                <attribute name="method" value="memberin" id="238" addr="0x7f136da34530" />
             </attributelist >
 
-            <typemapitem id="239" addr="0x7f0bacb36810" >
-                <attributelist id="240" addr="0x7f0bacb36810" >
-                    <parmlist id="241" addr="0x7f0bacb368b0" >
+            <typemapitem id="239" addr="0x7f136da2d810" >
+                <attributelist id="240" addr="0x7f136da2d810" >
+                    <parmlist id="241" addr="0x7f136da2d8b0" >
                         <parm id="242">
-                            <attributelist id="243" addr="0x7f0bacb368b0" >
-                                <attribute name="type" value="a(ANY).a(ANY).SWIGTYPE" id="244" addr="0x7f0bacb3d530" />
+                            <attributelist id="243" addr="0x7f136da2d8b0" >
+                                <attribute name="type" value="a(ANY).a(ANY).SWIGTYPE" id="244" addr="0x7f136da34530" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -433,18 +433,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="245" addr="0x7f0bacb36b90" >
-            <attributelist id="246" addr="0x7f0bacb36b90" >
-                <attribute name="code" value="{&#10;  $basetype (*inp)[$1_dim1] = ($basetype (*)[$1_dim1])($input);&#10;  $basetype (*dest)[$1_dim1] = ($basetype (*)[$1_dim1])($1);&#10;  size_t ii = 0;&#10;  for (; ii &lt; $1_dim0; ++ii) {&#10;    $basetype *ip = inp[ii];&#10;    $basetype *dp = dest[ii];&#10;    size_t jj = 0;&#10;    for (; jj &lt; $1_dim1; ++jj) dp[jj] = ip[jj];&#10;  }&#10;}" id="247" addr="0x7f0bacb3d530" />
-                <attribute name="method" value="globalin" id="248" addr="0x7f0bacb3d530" />
+        <typemap id="245" addr="0x7f136da2db90" >
+            <attributelist id="246" addr="0x7f136da2db90" >
+                <attribute name="code" value="{&#10;  $basetype (*inp)[$1_dim1] = ($basetype (*)[$1_dim1])($input);&#10;  $basetype (*dest)[$1_dim1] = ($basetype (*)[$1_dim1])($1);&#10;  size_t ii = 0;&#10;  for (; ii &lt; $1_dim0; ++ii) {&#10;    $basetype *ip = inp[ii];&#10;    $basetype *dp = dest[ii];&#10;    size_t jj = 0;&#10;    for (; jj &lt; $1_dim1; ++jj) dp[jj] = ip[jj];&#10;  }&#10;}" id="247" addr="0x7f136da34530" />
+                <attribute name="method" value="globalin" id="248" addr="0x7f136da34530" />
             </attributelist >
 
-            <typemapitem id="249" addr="0x7f0bacb36a70" >
-                <attributelist id="250" addr="0x7f0bacb36a70" >
-                    <parmlist id="251" addr="0x7f0bacb36b10" >
+            <typemapitem id="249" addr="0x7f136da2da70" >
+                <attributelist id="250" addr="0x7f136da2da70" >
+                    <parmlist id="251" addr="0x7f136da2db10" >
                         <parm id="252">
-                            <attributelist id="253" addr="0x7f0bacb36b10" >
-                                <attribute name="type" value="a(ANY).a(ANY).SWIGTYPE" id="254" addr="0x7f0bacb3d530" />
+                            <attributelist id="253" addr="0x7f136da2db10" >
+                                <attribute name="type" value="a(ANY).a(ANY).SWIGTYPE" id="254" addr="0x7f136da34530" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -452,780 +452,780 @@
              
             </typemapitem >
         </typemap >
-        <insert id="255" addr="0x7f0bacb36c50" >
-            <attributelist id="256" addr="0x7f0bacb36c50" >
-                <attribute name="code" value="&#10;#ifdef __cplusplus&#10;/* SwigValueWrapper is described in swig.swg */&#10;template&lt;typename T> class SwigValueWrapper {&#10;  struct SwigMovePointer {&#10;    T *ptr;&#10;    SwigMovePointer(T *p) : ptr(p) { }&#10;    ~SwigMovePointer() { delete ptr; }&#10;    SwigMovePointer&amp; operator=(SwigMovePointer&amp; rhs) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = rhs.ptr; rhs.ptr = 0; return *this; }&#10;  } pointer;&#10;  SwigValueWrapper&amp; operator=(const SwigValueWrapper&lt;T>&amp; rhs);&#10;  SwigValueWrapper(const SwigValueWrapper&lt;T>&amp; rhs);&#10;public:&#10;  SwigValueWrapper() : pointer(0) { }&#10;  SwigValueWrapper&amp; operator=(const T&amp; t) { SwigMovePointer tmp(new T(t)); pointer = tmp; return *this; }&#10;  operator T&amp;() const { return *pointer.ptr; }&#10;  T *operator&amp;() { return pointer.ptr; }&#10;};" id="257" addr="0x7f0bacb3d530" />
-                <attribute name="section" value="runtime" id="258" addr="0x7f0bacb3d530" />
+        <insert id="255" addr="0x7f136da2dc50" >
+            <attributelist id="256" addr="0x7f136da2dc50" >
+                <attribute name="code" value="&#10;#ifdef __cplusplus&#10;/* SwigValueWrapper is described in swig.swg */&#10;template&lt;typename T> class SwigValueWrapper {&#10;  struct SwigMovePointer {&#10;    T *ptr;&#10;    SwigMovePointer(T *p) : ptr(p) { }&#10;    ~SwigMovePointer() { delete ptr; }&#10;    SwigMovePointer&amp; operator=(SwigMovePointer&amp; rhs) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = rhs.ptr; rhs.ptr = 0; return *this; }&#10;  } pointer;&#10;  SwigValueWrapper&amp; operator=(const SwigValueWrapper&lt;T>&amp; rhs);&#10;  SwigValueWrapper(const SwigValueWrapper&lt;T>&amp; rhs);&#10;public:&#10;  SwigValueWrapper() : pointer(0) { }&#10;  SwigValueWrapper&amp; operator=(const T&amp; t) { SwigMovePointer tmp(new T(t)); pointer = tmp; return *this; }&#10;  operator T&amp;() const { return *pointer.ptr; }&#10;  T *operator&amp;() { return pointer.ptr; }&#10;};" id="257" addr="0x7f136da34530" />
+                <attribute name="section" value="runtime" id="258" addr="0x7f136da34530" />
             </attributelist >
          
         </insert >
-        <insert id="259" addr="0x7f0bacb36d30" >
-            <attributelist id="260" addr="0x7f0bacb36d30" >
-                <attribute name="code" value="&#10;template &lt;typename T> T SwigValueInit() {&#10;  return T();&#10;}&#10;#endif&#10;" id="261" addr="0x7f0bacb3d530" />
-                <attribute name="section" value="runtime" id="262" addr="0x7f0bacb3d530" />
+        <insert id="259" addr="0x7f136da2dd30" >
+            <attributelist id="260" addr="0x7f136da2dd30" >
+                <attribute name="code" value="&#10;template &lt;typename T> T SwigValueInit() {&#10;  return T();&#10;}&#10;#endif&#10;" id="261" addr="0x7f136da34530" />
+                <attribute name="section" value="runtime" id="262" addr="0x7f136da34530" />
             </attributelist >
          
         </insert >
-        <insert id="263" addr="0x7f0bacb36e10" >
-            <attributelist id="264" addr="0x7f0bacb36e10" >
-                <attribute name="code" value="/* -----------------------------------------------------------------------------&#10; *  This section contains generic SWIG labels for method/variable&#10; *  declarations/attributes, and other compiler dependent labels.&#10; * ----------------------------------------------------------------------------- */&#10;&#10;/* template workaround for compilers that cannot correctly implement the C++ standard */&#10;#ifndef SWIGTEMPLATEDISAMBIGUATOR&#10;# if defined(__SUNPRO_CC) &amp;&amp; (__SUNPRO_CC &lt;= 0x560)&#10;#  define SWIGTEMPLATEDISAMBIGUATOR template&#10;# elif defined(__HP_aCC)&#10;/* Needed even with `aCC -AA' when `aCC -V' reports HP ANSI C++ B3910B A.03.55 */&#10;/* If we find a maximum version that requires this, the test would be __HP_aCC &lt;= 35500 for A.03.55 */&#10;#  define SWIGTEMPLATEDISAMBIGUATOR template&#10;# else&#10;#  define SWIGTEMPLATEDISAMBIGUATOR&#10;# endif&#10;#endif&#10;&#10;/* inline attribute */&#10;#ifndef SWIGINLINE&#10;# if defined(__cplusplus) || (defined(__GNUC__) &amp;&amp; !defined(__STRICT_ANSI__))&#10;#   define SWIGINLINE inline&#10;# else&#10;#   define SWIGINLINE&#10;# endif&#10;#endif&#10;&#10;/* attribute recognised by some compilers to avoid 'unused' warnings */&#10;#ifndef SWIGUNUSED&#10;# if defined(__GNUC__)&#10;#   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 &amp;&amp; __GNUC_MINOR__ >= 4))&#10;#     define SWIGUNUSED __attribute__ ((__unused__))&#10;#   else&#10;#     define SWIGUNUSED&#10;#   endif&#10;# elif defined(__ICC)&#10;#   define SWIGUNUSED __attribute__ ((__unused__))&#10;# else&#10;#   define SWIGUNUSED&#10;# endif&#10;#endif&#10;&#10;#ifndef SWIG_MSC_UNSUPPRESS_4505&#10;# if defined(_MSC_VER)&#10;#   pragma warning(disable : 4505) /* unreferenced local function has been removed */&#10;# endif&#10;#endif&#10;&#10;#ifndef SWIGUNUSEDPARM&#10;# ifdef __cplusplus&#10;#   define SWIGUNUSEDPARM(p)&#10;# else&#10;#   define SWIGUNUSEDPARM(p) p SWIGUNUSED&#10;# endif&#10;#endif&#10;&#10;/* internal SWIG method */&#10;#ifndef SWIGINTERN&#10;# define SWIGINTERN static SWIGUNUSED&#10;#endif&#10;&#10;/* internal inline SWIG method */&#10;#ifndef SWIGINTERNINLINE&#10;# define SWIGINTERNINLINE SWIGINTERN SWIGINLINE&#10;#endif&#10;&#10;/* exporting methods */&#10;#if defined(__GNUC__)&#10;#  if (__GNUC__ >= 4) || (__GNUC__ == 3 &amp;&amp; __GNUC_MINOR__ >= 4)&#10;#    ifndef GCC_HASCLASSVISIBILITY&#10;#      define GCC_HASCLASSVISIBILITY&#10;#    endif&#10;#  endif&#10;#endif&#10;&#10;#ifndef SWIGEXPORT&#10;# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)&#10;#   if defined(STATIC_LINKED)&#10;#     define SWIGEXPORT&#10;#   else&#10;#     define SWIGEXPORT __declspec(dllexport)&#10;#   endif&#10;# else&#10;#   if defined(__GNUC__) &amp;&amp; defined(GCC_HASCLASSVISIBILITY)&#10;#     define SWIGEXPORT __attribute__ ((visibility(&quot;default&quot;)))&#10;#   else&#10;#     define SWIGEXPORT&#10;#   endif&#10;# endif&#10;#endif&#10;&#10;/* calling conventions for Windows */&#10;#ifndef SWIGSTDCALL&#10;# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)&#10;#   define SWIGSTDCALL __stdcall&#10;# else&#10;#   define SWIGSTDCALL&#10;# endif&#10;#endif&#10;&#10;/* Deal with Microsoft's attempt at deprecating C standard runtime functions */&#10;#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) &amp;&amp; defined(_MSC_VER) &amp;&amp; !defined(_CRT_SECURE_NO_DEPRECATE)&#10;# define _CRT_SECURE_NO_DEPRECATE&#10;#endif&#10;&#10;/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */&#10;#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) &amp;&amp; defined(_MSC_VER) &amp;&amp; !defined(_SCL_SECURE_NO_DEPRECATE)&#10;# define _SCL_SECURE_NO_DEPRECATE&#10;#endif&#10;&#10;/* Deal with Apple's deprecated 'AssertMacros.h' from Carbon-framework */&#10;#if defined(__APPLE__) &amp;&amp; !defined(__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES)&#10;# define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0&#10;#endif&#10;&#10;/* Intel's compiler complains if a variable which was never initialised is&#10; * cast to void, which is a common idiom which we use to indicate that we&#10; * are aware a variable isn't used.  So we just silence that warning.&#10; * See: https://github.com/swig/swig/issues/192 for more discussion.&#10; */&#10;#ifdef __INTEL_COMPILER&#10;# pragma warning disable 592&#10;#endif&#10;" id="265" addr="0x7f0bacb3d530" />
-                <attribute name="section" value="runtime" id="266" addr="0x7f0bacb3d530" />
+        <insert id="263" addr="0x7f136da2de10" >
+            <attributelist id="264" addr="0x7f136da2de10" >
+                <attribute name="code" value="/* -----------------------------------------------------------------------------&#10; *  This section contains generic SWIG labels for method/variable&#10; *  declarations/attributes, and other compiler dependent labels.&#10; * ----------------------------------------------------------------------------- */&#10;&#10;/* template workaround for compilers that cannot correctly implement the C++ standard */&#10;#ifndef SWIGTEMPLATEDISAMBIGUATOR&#10;# if defined(__SUNPRO_CC) &amp;&amp; (__SUNPRO_CC &lt;= 0x560)&#10;#  define SWIGTEMPLATEDISAMBIGUATOR template&#10;# elif defined(__HP_aCC)&#10;/* Needed even with `aCC -AA' when `aCC -V' reports HP ANSI C++ B3910B A.03.55 */&#10;/* If we find a maximum version that requires this, the test would be __HP_aCC &lt;= 35500 for A.03.55 */&#10;#  define SWIGTEMPLATEDISAMBIGUATOR template&#10;# else&#10;#  define SWIGTEMPLATEDISAMBIGUATOR&#10;# endif&#10;#endif&#10;&#10;/* inline attribute */&#10;#ifndef SWIGINLINE&#10;# if defined(__cplusplus) || (defined(__GNUC__) &amp;&amp; !defined(__STRICT_ANSI__))&#10;#   define SWIGINLINE inline&#10;# else&#10;#   define SWIGINLINE&#10;# endif&#10;#endif&#10;&#10;/* attribute recognised by some compilers to avoid 'unused' warnings */&#10;#ifndef SWIGUNUSED&#10;# if defined(__GNUC__)&#10;#   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 &amp;&amp; __GNUC_MINOR__ >= 4))&#10;#     define SWIGUNUSED __attribute__ ((__unused__))&#10;#   else&#10;#     define SWIGUNUSED&#10;#   endif&#10;# elif defined(__ICC)&#10;#   define SWIGUNUSED __attribute__ ((__unused__))&#10;# else&#10;#   define SWIGUNUSED&#10;# endif&#10;#endif&#10;&#10;#ifndef SWIG_MSC_UNSUPPRESS_4505&#10;# if defined(_MSC_VER)&#10;#   pragma warning(disable : 4505) /* unreferenced local function has been removed */&#10;# endif&#10;#endif&#10;&#10;#ifndef SWIGUNUSEDPARM&#10;# ifdef __cplusplus&#10;#   define SWIGUNUSEDPARM(p)&#10;# else&#10;#   define SWIGUNUSEDPARM(p) p SWIGUNUSED&#10;# endif&#10;#endif&#10;&#10;/* internal SWIG method */&#10;#ifndef SWIGINTERN&#10;# define SWIGINTERN static SWIGUNUSED&#10;#endif&#10;&#10;/* internal inline SWIG method */&#10;#ifndef SWIGINTERNINLINE&#10;# define SWIGINTERNINLINE SWIGINTERN SWIGINLINE&#10;#endif&#10;&#10;/* exporting methods */&#10;#if defined(__GNUC__)&#10;#  if (__GNUC__ >= 4) || (__GNUC__ == 3 &amp;&amp; __GNUC_MINOR__ >= 4)&#10;#    ifndef GCC_HASCLASSVISIBILITY&#10;#      define GCC_HASCLASSVISIBILITY&#10;#    endif&#10;#  endif&#10;#endif&#10;&#10;#ifndef SWIGEXPORT&#10;# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)&#10;#   if defined(STATIC_LINKED)&#10;#     define SWIGEXPORT&#10;#   else&#10;#     define SWIGEXPORT __declspec(dllexport)&#10;#   endif&#10;# else&#10;#   if defined(__GNUC__) &amp;&amp; defined(GCC_HASCLASSVISIBILITY)&#10;#     define SWIGEXPORT __attribute__ ((visibility(&quot;default&quot;)))&#10;#   else&#10;#     define SWIGEXPORT&#10;#   endif&#10;# endif&#10;#endif&#10;&#10;/* calling conventions for Windows */&#10;#ifndef SWIGSTDCALL&#10;# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)&#10;#   define SWIGSTDCALL __stdcall&#10;# else&#10;#   define SWIGSTDCALL&#10;# endif&#10;#endif&#10;&#10;/* Deal with Microsoft's attempt at deprecating C standard runtime functions */&#10;#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) &amp;&amp; defined(_MSC_VER) &amp;&amp; !defined(_CRT_SECURE_NO_DEPRECATE)&#10;# define _CRT_SECURE_NO_DEPRECATE&#10;#endif&#10;&#10;/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */&#10;#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) &amp;&amp; defined(_MSC_VER) &amp;&amp; !defined(_SCL_SECURE_NO_DEPRECATE)&#10;# define _SCL_SECURE_NO_DEPRECATE&#10;#endif&#10;&#10;/* Deal with Apple's deprecated 'AssertMacros.h' from Carbon-framework */&#10;#if defined(__APPLE__) &amp;&amp; !defined(__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES)&#10;# define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0&#10;#endif&#10;&#10;/* Intel's compiler complains if a variable which was never initialised is&#10; * cast to void, which is a common idiom which we use to indicate that we&#10; * are aware a variable isn't used.  So we just silence that warning.&#10; * See: https://github.com/swig/swig/issues/192 for more discussion.&#10; */&#10;#ifdef __INTEL_COMPILER&#10;# pragma warning disable 592&#10;#endif&#10;" id="265" addr="0x7f136da34530" />
+                <attribute name="section" value="runtime" id="266" addr="0x7f136da34530" />
             </attributelist >
          
         </insert >
     </include >
-    <include id="267" addr="0x7f0bacb36f90" >
-        <attributelist id="268" addr="0x7f0bacb36f90" >
-            <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmcaddon.i" id="269" addr="0x7f0bacb3d530" />
-            <attribute name="module" value="" id="270" addr="0x7f0bacb37030" />
-            <attribute name="options" value="0x7f0bacb36f10" id="271" addr="0x7f0bacb36f10" />
+    <include id="267" addr="0x7f136da2df90" >
+        <attributelist id="268" addr="0x7f136da2df90" >
+            <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmcaddon.i" id="269" addr="0x7f136da34530" />
+            <attribute name="module" value="" id="270" addr="0x7f136da2e030" />
+            <attribute name="options" value="0x7f136da2df10" id="271" addr="0x7f136da2df10" />
         </attributelist >
 
-        <module id="272" addr="0x7f0bacb36fd0" >
-            <attributelist id="273" addr="0x7f0bacb36fd0" >
-                <attribute name="name" value="xbmcaddon" id="274" addr="0x7f0bacb3d530" />
+        <module id="272" addr="0x7f136da2dfd0" >
+            <attributelist id="273" addr="0x7f136da2dfd0" >
+                <attribute name="name" value="xbmcaddon" id="274" addr="0x7f136da34530" />
             </attributelist >
          
         </module >
-        <insert id="275" addr="0x7f0bacb37070" >
-            <attributelist id="276" addr="0x7f0bacb37070" >
-                <attribute name="code" value="&#10;#if defined(TARGET_WINDOWS)&#10;#  include &lt;windows.h>&#10;#endif&#10;&#10;#include &quot;interfaces/legacy/Addon.h&quot;&#10;&#10;using namespace XBMCAddon;&#10;using namespace xbmcaddon;&#10;&#10;#if defined(__GNUG__)&#10;#pragma GCC diagnostic ignored &quot;-Wstrict-aliasing&quot;&#10;#endif&#10;&#10;" id="277" addr="0x7f0bacb3d530" />
+        <insert id="275" addr="0x7f136da2e070" >
+            <attributelist id="276" addr="0x7f136da2e070" >
+                <attribute name="code" value="&#10;#if defined(TARGET_WINDOWS)&#10;#  include &lt;windows.h>&#10;#endif&#10;&#10;#include &quot;interfaces/legacy/Addon.h&quot;&#10;&#10;using namespace XBMCAddon;&#10;using namespace xbmcaddon;&#10;&#10;#if defined(__GNUG__)&#10;#pragma GCC diagnostic ignored &quot;-Wstrict-aliasing&quot;&#10;#endif&#10;&#10;" id="277" addr="0x7f136da34530" />
             </attributelist >
          
         </insert >
-        <include id="278" addr="0x7f0bacb37290" >
-            <attributelist id="279" addr="0x7f0bacb37290" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/swighelper.h" id="280" addr="0x7f0bacb3d530" />
+        <include id="278" addr="0x7f136da2e290" >
+            <attributelist id="279" addr="0x7f136da2e290" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/swighelper.h" id="280" addr="0x7f136da34530" />
             </attributelist >
          
         </include >
-        <include id="281" addr="0x7f0bacb37310" >
-            <attributelist id="282" addr="0x7f0bacb37310" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/AddonString.h" id="283" addr="0x7f0bacb3d530" />
+        <include id="281" addr="0x7f136da2e310" >
+            <attributelist id="282" addr="0x7f136da2e310" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/AddonString.h" id="283" addr="0x7f136da34530" />
             </attributelist >
 
-            <namespace id="284" addr="0x7f0bacb37450" >
-                <attributelist id="285" addr="0x7f0bacb37450" >
-                    <attribute name="sym_name" value="XBMCAddon" id="286" addr="0x7f0bacb3d530" />
-                    <attribute name="name" value="XBMCAddon" id="287" addr="0x7f0bacb3d530" />
-                    <attribute name="csym_nextSibling" value="0x7f0bacb37bf0" id="288" addr="0x7f0bacb37bf0" />
-                    <attribute name="sym_nextSibling" value="0x7f0bacb37bf0" id="289" addr="0x7f0bacb37bf0" />
-                    <typescope id="290" addr="0x7f0bacb3c250" >
-                        <attributelist id="291" addr="0x7f0bacb3c250" >
-                            <attribute name="name" value="XBMCAddon" id="292" addr="0x7f0bacb3d530" />
-                            <typetab id="293" addr="0x7f0bacb3c290" >
-                                <attributelist id="294" addr="0x7f0bacb3c290" >
-                                    <attribute name="String" value="std::string" id="295" addr="0x7f0bacb3d530" />
+            <namespace id="284" addr="0x7f136da2e450" >
+                <attributelist id="285" addr="0x7f136da2e450" >
+                    <attribute name="sym_name" value="XBMCAddon" id="286" addr="0x7f136da34530" />
+                    <attribute name="name" value="XBMCAddon" id="287" addr="0x7f136da34530" />
+                    <attribute name="csym_nextSibling" value="0x7f136da2ebf0" id="288" addr="0x7f136da2ebf0" />
+                    <attribute name="sym_nextSibling" value="0x7f136da2ebf0" id="289" addr="0x7f136da2ebf0" />
+                    <typescope id="290" addr="0x7f136da33250" >
+                        <attributelist id="291" addr="0x7f136da33250" >
+                            <attribute name="name" value="XBMCAddon" id="292" addr="0x7f136da34530" />
+                            <typetab id="293" addr="0x7f136da33290" >
+                                <attributelist id="294" addr="0x7f136da33290" >
+                                    <attribute name="String" value="std::string" id="295" addr="0x7f136da34530" />
                                 </attributelist >
-                                <typetabsitem id="296" addr="0x7f0bacb3c470" >
-                                    <attributelist id="297" addr="0x7f0bacb3c470" >
+                                <typetabsitem id="296" addr="0x7f136da33470" >
+                                    <attributelist id="297" addr="0x7f136da33470" >
                                     </attributelist >
                                 </typetabsitem >
                             </typetab >
-                            <attribute name="parent" value="0x7f0bacb20a30" id="298" addr="0x7f0bacb20a30" />
-                            <attribute name="qname" value="XBMCAddon" id="299" addr="0x7f0bacb3d530" />
-                            <attribute name="symtab" value="0x7f0bacb373b0" id="300" addr="0x7f0bacb373b0" />
+                            <attribute name="parent" value="0x7f136da17a30" id="298" addr="0x7f136da17a30" />
+                            <attribute name="qname" value="XBMCAddon" id="299" addr="0x7f136da34530" />
+                            <attribute name="symtab" value="0x7f136da2e3b0" id="300" addr="0x7f136da2e3b0" />
                         </attributelist >
-                        <typescopesitem id="301" addr="0x7f0bacb37370" >
-                            <attributelist id="302" addr="0x7f0bacb37370" >
+                        <typescopesitem id="301" addr="0x7f136da2e370" >
+                            <attributelist id="302" addr="0x7f136da2e370" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="303" addr="0x7f0bacb3c290" >
-                            <attributelist id="304" addr="0x7f0bacb3c290" >
-                                <attribute name="String" value="std::string" id="305" addr="0x7f0bacb3d530" />
+                        <typescopesitem id="303" addr="0x7f136da33290" >
+                            <attributelist id="304" addr="0x7f136da33290" >
+                                <attribute name="String" value="std::string" id="305" addr="0x7f136da34530" />
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="306" addr="0x7f0bacb20a30" >
-                            <attributelist id="307" addr="0x7f0bacb20a30" >
-                                <attribute name="name" value="" id="308" addr="0x7f0bacb3d530" />
-                                <typetab id="309" addr="0x7f0bacb20a90" >
-                                    <attributelist id="310" addr="0x7f0bacb20a90" >
+                        <typescopesitem id="306" addr="0x7f136da17a30" >
+                            <attributelist id="307" addr="0x7f136da17a30" >
+                                <attribute name="name" value="" id="308" addr="0x7f136da34530" />
+                                <typetab id="309" addr="0x7f136da17a90" >
+                                    <attributelist id="310" addr="0x7f136da17a90" >
                                     </attributelist >
                                 </typetab >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="311" addr="0x7f0bacb3c390" >
-                            <attributelist id="312" addr="0x7f0bacb3c390" >
+                        <typescopesitem id="311" addr="0x7f136da33390" >
+                            <attributelist id="312" addr="0x7f136da33390" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="313" addr="0x7f0bacb373b0" >
-                            <attributelist id="314" addr="0x7f0bacb373b0" >
-                                <attribute name="name" value="XBMCAddon" id="315" addr="0x7f0bacb3d530" />
-                                <attribute name="csymtab" value="0x7f0bacb373f0" id="316" addr="0x7f0bacb373f0" />
-                                <attribute name="symtab" value="0x7f0bacb37390" id="317" addr="0x7f0bacb37390" />
+                        <typescopesitem id="313" addr="0x7f136da2e3b0" >
+                            <attributelist id="314" addr="0x7f136da2e3b0" >
+                                <attribute name="name" value="XBMCAddon" id="315" addr="0x7f136da34530" />
+                                <attribute name="csymtab" value="0x7f136da2e3f0" id="316" addr="0x7f136da2e3f0" />
+                                <attribute name="symtab" value="0x7f136da2e390" id="317" addr="0x7f136da2e390" />
                             </attributelist >
                         </typescopesitem >
                     </typescope >
-                    <attribute name="symtab" value="0x7f0bacb373b0" id="318" addr="0x7f0bacb373b0" />
-                    <attribute name="sym_symtab" value="0x7f0bacb20950" id="319" addr="0x7f0bacb20950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="320" addr="0x7f0bacb3d530" />
+                    <attribute name="symtab" value="0x7f136da2e3b0" id="318" addr="0x7f136da2e3b0" />
+                    <attribute name="sym_symtab" value="0x7f136da17950" id="319" addr="0x7f136da17950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="320" addr="0x7f136da34530" />
                 </attributelist >
 
-                <cdecl id="321" addr="0x7f0bacb37570" >
-                    <attributelist id="322" addr="0x7f0bacb37570" >
-                        <attribute name="sym_name" value="String" id="323" addr="0x7f0bacb3d530" />
-                        <attribute name="name" value="XBMCAddon::String" id="324" addr="0x7f0bacb3d530" />
-                        <attribute name="decl" value="" id="325" addr="0x7f0bacb3d530" />
-                        <attribute name="storage" value="typedef" id="326" addr="0x7f0bacb3d530" />
-                        <attribute name="kind" value="typedef" id="327" addr="0x7f0bacb3d530" />
-                        <attribute name="type" value="std::string" id="328" addr="0x7f0bacb3d530" />
-                        <attribute name="sym_symtab" value="0x7f0bacb373b0" id="329" addr="0x7f0bacb373b0" />
-                        <attribute name="sym_overname" value="__SWIG_0" id="330" addr="0x7f0bacb3d530" />
+                <cdecl id="321" addr="0x7f136da2e570" >
+                    <attributelist id="322" addr="0x7f136da2e570" >
+                        <attribute name="sym_name" value="String" id="323" addr="0x7f136da34530" />
+                        <attribute name="name" value="XBMCAddon::String" id="324" addr="0x7f136da34530" />
+                        <attribute name="decl" value="" id="325" addr="0x7f136da34530" />
+                        <attribute name="storage" value="typedef" id="326" addr="0x7f136da34530" />
+                        <attribute name="kind" value="typedef" id="327" addr="0x7f136da34530" />
+                        <attribute name="type" value="std::string" id="328" addr="0x7f136da34530" />
+                        <attribute name="sym_symtab" value="0x7f136da2e3b0" id="329" addr="0x7f136da2e3b0" />
+                        <attribute name="sym_overname" value="__SWIG_0" id="330" addr="0x7f136da34530" />
                     </attributelist >
                  
                 </cdecl >
-                <cdecl id="331" addr="0x7f0bacb37770" >
-                    <attributelist id="332" addr="0x7f0bacb37770" >
-                        <attribute name="sym_name" value="emptyString" id="333" addr="0x7f0bacb3d530" />
-                        <attribute name="name" value="XBMCAddon::emptyString" id="334" addr="0x7f0bacb3d530" />
-                        <attribute name="decl" value="" id="335" addr="0x7f0bacb3d530" />
-                        <attribute name="storage" value="extern" id="336" addr="0x7f0bacb3d530" />
-                        <attribute name="kind" value="variable" id="337" addr="0x7f0bacb3d530" />
-                        <attribute name="type" value="XBMCAddon::String" id="338" addr="0x7f0bacb3d530" />
-                        <attribute name="sym_symtab" value="0x7f0bacb373b0" id="339" addr="0x7f0bacb373b0" />
-                        <attribute name="sym_overname" value="__SWIG_0" id="340" addr="0x7f0bacb3d530" />
+                <cdecl id="331" addr="0x7f136da2e770" >
+                    <attributelist id="332" addr="0x7f136da2e770" >
+                        <attribute name="sym_name" value="emptyString" id="333" addr="0x7f136da34530" />
+                        <attribute name="name" value="XBMCAddon::emptyString" id="334" addr="0x7f136da34530" />
+                        <attribute name="decl" value="" id="335" addr="0x7f136da34530" />
+                        <attribute name="storage" value="extern" id="336" addr="0x7f136da34530" />
+                        <attribute name="kind" value="variable" id="337" addr="0x7f136da34530" />
+                        <attribute name="type" value="XBMCAddon::String" id="338" addr="0x7f136da34530" />
+                        <attribute name="sym_symtab" value="0x7f136da2e3b0" id="339" addr="0x7f136da2e3b0" />
+                        <attribute name="sym_overname" value="__SWIG_0" id="340" addr="0x7f136da34530" />
                     </attributelist >
                  
                 </cdecl >
             </namespace >
         </include >
-        <include id="341" addr="0x7f0bacb37b30" >
-            <attributelist id="342" addr="0x7f0bacb37b30" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/Addon.h" id="343" addr="0x7f0bacb3d530" />
+        <include id="341" addr="0x7f136da2eb30" >
+            <attributelist id="342" addr="0x7f136da2eb30" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/Addon.h" id="343" addr="0x7f136da34530" />
             </attributelist >
 
-            <namespace id="344" addr="0x7f0bacb37bf0" >
-                <attributelist id="345" addr="0x7f0bacb37bf0" >
-                    <attribute name="sym_name" value="XBMCAddon" id="346" addr="0x7f0bacb3d530" />
-                    <attribute name="name" value="XBMCAddon" id="347" addr="0x7f0bacb3d530" />
-                    <attribute name="sym_previousSibling" value="0x7f0bacb37450" id="348" addr="0x7f0bacb37450" />
-                    <typescope id="349" addr="0x7f0bacb3c250" >
-                        <attributelist id="350" addr="0x7f0bacb3c250" >
-                            <attribute name="name" value="XBMCAddon" id="351" addr="0x7f0bacb3d530" />
-                            <typetab id="352" addr="0x7f0bacb3c290" >
-                                <attributelist id="353" addr="0x7f0bacb3c290" >
-                                    <attribute name="String" value="std::string" id="354" addr="0x7f0bacb3d530" />
+            <namespace id="344" addr="0x7f136da2ebf0" >
+                <attributelist id="345" addr="0x7f136da2ebf0" >
+                    <attribute name="sym_name" value="XBMCAddon" id="346" addr="0x7f136da34530" />
+                    <attribute name="name" value="XBMCAddon" id="347" addr="0x7f136da34530" />
+                    <attribute name="sym_previousSibling" value="0x7f136da2e450" id="348" addr="0x7f136da2e450" />
+                    <typescope id="349" addr="0x7f136da33250" >
+                        <attributelist id="350" addr="0x7f136da33250" >
+                            <attribute name="name" value="XBMCAddon" id="351" addr="0x7f136da34530" />
+                            <typetab id="352" addr="0x7f136da33290" >
+                                <attributelist id="353" addr="0x7f136da33290" >
+                                    <attribute name="String" value="std::string" id="354" addr="0x7f136da34530" />
                                 </attributelist >
-                                <typetabsitem id="355" addr="0x7f0bacb3c470" >
-                                    <attributelist id="356" addr="0x7f0bacb3c470" >
+                                <typetabsitem id="355" addr="0x7f136da33470" >
+                                    <attributelist id="356" addr="0x7f136da33470" >
                                     </attributelist >
                                 </typetabsitem >
                             </typetab >
-                            <attribute name="parent" value="0x7f0bacb20a30" id="357" addr="0x7f0bacb20a30" />
-                            <attribute name="qname" value="XBMCAddon" id="358" addr="0x7f0bacb3d530" />
-                            <attribute name="symtab" value="0x7f0bacb373b0" id="359" addr="0x7f0bacb373b0" />
+                            <attribute name="parent" value="0x7f136da17a30" id="357" addr="0x7f136da17a30" />
+                            <attribute name="qname" value="XBMCAddon" id="358" addr="0x7f136da34530" />
+                            <attribute name="symtab" value="0x7f136da2e3b0" id="359" addr="0x7f136da2e3b0" />
                         </attributelist >
-                        <typescopesitem id="360" addr="0x7f0bacb37370" >
-                            <attributelist id="361" addr="0x7f0bacb37370" >
+                        <typescopesitem id="360" addr="0x7f136da2e370" >
+                            <attributelist id="361" addr="0x7f136da2e370" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="362" addr="0x7f0bacb3c290" >
-                            <attributelist id="363" addr="0x7f0bacb3c290" >
-                                <attribute name="String" value="std::string" id="364" addr="0x7f0bacb3d530" />
+                        <typescopesitem id="362" addr="0x7f136da33290" >
+                            <attributelist id="363" addr="0x7f136da33290" >
+                                <attribute name="String" value="std::string" id="364" addr="0x7f136da34530" />
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="365" addr="0x7f0bacb20a30" >
-                            <attributelist id="366" addr="0x7f0bacb20a30" >
-                                <attribute name="name" value="" id="367" addr="0x7f0bacb3d530" />
-                                <typetab id="368" addr="0x7f0bacb20a90" >
-                                    <attributelist id="369" addr="0x7f0bacb20a90" >
+                        <typescopesitem id="365" addr="0x7f136da17a30" >
+                            <attributelist id="366" addr="0x7f136da17a30" >
+                                <attribute name="name" value="" id="367" addr="0x7f136da34530" />
+                                <typetab id="368" addr="0x7f136da17a90" >
+                                    <attributelist id="369" addr="0x7f136da17a90" >
                                     </attributelist >
                                 </typetab >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="370" addr="0x7f0bacb3c390" >
-                            <attributelist id="371" addr="0x7f0bacb3c390" >
+                        <typescopesitem id="370" addr="0x7f136da33390" >
+                            <attributelist id="371" addr="0x7f136da33390" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="372" addr="0x7f0bacb373b0" >
-                            <attributelist id="373" addr="0x7f0bacb373b0" >
-                                <attribute name="name" value="XBMCAddon" id="374" addr="0x7f0bacb3d530" />
-                                <attribute name="csymtab" value="0x7f0bacb373f0" id="375" addr="0x7f0bacb373f0" />
-                                <attribute name="symtab" value="0x7f0bacb37390" id="376" addr="0x7f0bacb37390" />
+                        <typescopesitem id="372" addr="0x7f136da2e3b0" >
+                            <attributelist id="373" addr="0x7f136da2e3b0" >
+                                <attribute name="name" value="XBMCAddon" id="374" addr="0x7f136da34530" />
+                                <attribute name="csymtab" value="0x7f136da2e3f0" id="375" addr="0x7f136da2e3f0" />
+                                <attribute name="symtab" value="0x7f136da2e390" id="376" addr="0x7f136da2e390" />
                             </attributelist >
                         </typescopesitem >
                     </typescope >
-                    <attribute name="symtab" value="0x7f0bacb373b0" id="377" addr="0x7f0bacb373b0" />
-                    <attribute name="sym_symtab" value="0x7f0bacb20950" id="378" addr="0x7f0bacb20950" />
+                    <attribute name="symtab" value="0x7f136da2e3b0" id="377" addr="0x7f136da2e3b0" />
+                    <attribute name="sym_symtab" value="0x7f136da17950" id="378" addr="0x7f136da17950" />
                 </attributelist >
 
-                <namespace id="379" addr="0x7f0bacb37d10" >
-                    <attributelist id="380" addr="0x7f0bacb37d10" >
-                        <attribute name="sym_name" value="xbmcaddon" id="381" addr="0x7f0bacb3d530" />
-                        <attribute name="name" value="xbmcaddon" id="382" addr="0x7f0bacb3d530" />
-                        <attribute name="feature_knownbasetypes" value="AddonClass" id="383" addr="0x7f0bacb3d530" />
-                        <typescope id="384" addr="0x7f0bacb3c630" >
-                            <attributelist id="385" addr="0x7f0bacb3c630" >
-                                <attribute name="name" value="xbmcaddon" id="386" addr="0x7f0bacb3d530" />
-                                <typetab id="387" addr="0x7f0bacb3c650" >
-                                    <attributelist id="388" addr="0x7f0bacb3c650" >
-                                        <attribute name="Addon" value="Addon" id="389" addr="0x7f0bacb3d530" />
+                <namespace id="379" addr="0x7f136da2ed10" >
+                    <attributelist id="380" addr="0x7f136da2ed10" >
+                        <attribute name="sym_name" value="xbmcaddon" id="381" addr="0x7f136da34530" />
+                        <attribute name="name" value="xbmcaddon" id="382" addr="0x7f136da34530" />
+                        <attribute name="feature_knownbasetypes" value="AddonClass" id="383" addr="0x7f136da34530" />
+                        <typescope id="384" addr="0x7f136da33630" >
+                            <attributelist id="385" addr="0x7f136da33630" >
+                                <attribute name="name" value="xbmcaddon" id="386" addr="0x7f136da34530" />
+                                <typetab id="387" addr="0x7f136da33650" >
+                                    <attributelist id="388" addr="0x7f136da33650" >
+                                        <attribute name="Addon" value="Addon" id="389" addr="0x7f136da34530" />
                                     </attributelist >
-                                    <typetabsitem id="390" addr="0x7f0bacb3c7b0" >
-                                        <attributelist id="391" addr="0x7f0bacb3c7b0" >
+                                    <typetabsitem id="390" addr="0x7f136da337b0" >
+                                        <attributelist id="391" addr="0x7f136da337b0" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
-                                <attribute name="parent" value="0x7f0bacb3c250" id="392" addr="0x7f0bacb3c250" />
-                                <attribute name="qname" value="XBMCAddon::xbmcaddon" id="393" addr="0x7f0bacb3d530" />
-                                <attribute name="symtab" value="0x7f0bacb37c90" id="394" addr="0x7f0bacb37c90" />
+                                <attribute name="parent" value="0x7f136da33250" id="392" addr="0x7f136da33250" />
+                                <attribute name="qname" value="XBMCAddon::xbmcaddon" id="393" addr="0x7f136da34530" />
+                                <attribute name="symtab" value="0x7f136da2ec90" id="394" addr="0x7f136da2ec90" />
                             </attributelist >
-                            <typescopesitem id="395" addr="0x7f0bacb37c50" >
-                                <attributelist id="396" addr="0x7f0bacb37c50" >
+                            <typescopesitem id="395" addr="0x7f136da2ec50" >
+                                <attributelist id="396" addr="0x7f136da2ec50" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="397" addr="0x7f0bacb3c650" >
-                                <attributelist id="398" addr="0x7f0bacb3c650" >
-                                    <attribute name="Addon" value="Addon" id="399" addr="0x7f0bacb3d530" />
+                            <typescopesitem id="397" addr="0x7f136da33650" >
+                                <attributelist id="398" addr="0x7f136da33650" >
+                                    <attribute name="Addon" value="Addon" id="399" addr="0x7f136da34530" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="400" addr="0x7f0bacb3c250" >
-                                <attributelist id="401" addr="0x7f0bacb3c250" >
-                                    <attribute name="name" value="XBMCAddon" id="402" addr="0x7f0bacb3d530" />
-                                    <typetab id="403" addr="0x7f0bacb3c290" >
-                                        <attributelist id="404" addr="0x7f0bacb3c290" >
-                                            <attribute name="String" value="std::string" id="405" addr="0x7f0bacb3d530" />
+                            <typescopesitem id="400" addr="0x7f136da33250" >
+                                <attributelist id="401" addr="0x7f136da33250" >
+                                    <attribute name="name" value="XBMCAddon" id="402" addr="0x7f136da34530" />
+                                    <typetab id="403" addr="0x7f136da33290" >
+                                        <attributelist id="404" addr="0x7f136da33290" >
+                                            <attribute name="String" value="std::string" id="405" addr="0x7f136da34530" />
                                         </attributelist >
-                                        <typetabsitem id="406" addr="0x7f0bacb3c470" >
-                                            <attributelist id="407" addr="0x7f0bacb3c470" >
+                                        <typetabsitem id="406" addr="0x7f136da33470" >
+                                            <attributelist id="407" addr="0x7f136da33470" >
                                             </attributelist >
                                         </typetabsitem >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f0bacb20a30" id="408" addr="0x7f0bacb20a30" />
-                                    <attribute name="qname" value="XBMCAddon" id="409" addr="0x7f0bacb3d530" />
-                                    <attribute name="symtab" value="0x7f0bacb373b0" id="410" addr="0x7f0bacb373b0" />
+                                    <attribute name="parent" value="0x7f136da17a30" id="408" addr="0x7f136da17a30" />
+                                    <attribute name="qname" value="XBMCAddon" id="409" addr="0x7f136da34530" />
+                                    <attribute name="symtab" value="0x7f136da2e3b0" id="410" addr="0x7f136da2e3b0" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="411" addr="0x7f0bacb3c670" >
-                                <attributelist id="412" addr="0x7f0bacb3c670" >
+                            <typescopesitem id="411" addr="0x7f136da33670" >
+                                <attributelist id="412" addr="0x7f136da33670" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="413" addr="0x7f0bacb37c90" >
-                                <attributelist id="414" addr="0x7f0bacb37c90" >
-                                    <attribute name="name" value="xbmcaddon" id="415" addr="0x7f0bacb3d530" />
-                                    <attribute name="csymtab" value="0x7f0bacb37cd0" id="416" addr="0x7f0bacb37cd0" />
-                                    <attribute name="symtab" value="0x7f0bacb37c70" id="417" addr="0x7f0bacb37c70" />
+                            <typescopesitem id="413" addr="0x7f136da2ec90" >
+                                <attributelist id="414" addr="0x7f136da2ec90" >
+                                    <attribute name="name" value="xbmcaddon" id="415" addr="0x7f136da34530" />
+                                    <attribute name="csymtab" value="0x7f136da2ecd0" id="416" addr="0x7f136da2ecd0" />
+                                    <attribute name="symtab" value="0x7f136da2ec70" id="417" addr="0x7f136da2ec70" />
                                 </attributelist >
                             </typescopesitem >
                         </typescope >
-                        <attribute name="symtab" value="0x7f0bacb37c90" id="418" addr="0x7f0bacb37c90" />
-                        <attribute name="sym_symtab" value="0x7f0bacb373b0" id="419" addr="0x7f0bacb373b0" />
-                        <attribute name="sym_overname" value="__SWIG_0" id="420" addr="0x7f0bacb3d530" />
+                        <attribute name="symtab" value="0x7f136da2ec90" id="418" addr="0x7f136da2ec90" />
+                        <attribute name="sym_symtab" value="0x7f136da2e3b0" id="419" addr="0x7f136da2e3b0" />
+                        <attribute name="sym_overname" value="__SWIG_0" id="420" addr="0x7f136da34530" />
                     </attributelist >
 
-                    <cdecl id="421" addr="0x7f0bacb37e70" >
-                        <attributelist id="422" addr="0x7f0bacb37e70" >
-                            <attribute name="sym_name" value="AddonException" id="423" addr="0x7f0bacb3d530" />
-                            <attribute name="name" value="XBMCAddon::xbmcaddon::AddonException" id="424" addr="0x7f0bacb3d530" />
-                            <attribute name="kind" value="variable" id="425" addr="0x7f0bacb3d530" />
-                            <attribute name="type" value="XBMCCOMMONS_STANDARD_EXCEPTION" id="426" addr="0x7f0bacb3d530" />
-                            <attribute name="sym_symtab" value="0x7f0bacb37c90" id="427" addr="0x7f0bacb37c90" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="428" addr="0x7f0bacb3d530" />
+                    <cdecl id="421" addr="0x7f136da2ee70" >
+                        <attributelist id="422" addr="0x7f136da2ee70" >
+                            <attribute name="sym_name" value="AddonException" id="423" addr="0x7f136da34530" />
+                            <attribute name="name" value="XBMCAddon::xbmcaddon::AddonException" id="424" addr="0x7f136da34530" />
+                            <attribute name="kind" value="variable" id="425" addr="0x7f136da34530" />
+                            <attribute name="type" value="XBMCCOMMONS_STANDARD_EXCEPTION" id="426" addr="0x7f136da34530" />
+                            <attribute name="sym_symtab" value="0x7f136da2ec90" id="427" addr="0x7f136da2ec90" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="428" addr="0x7f136da34530" />
                         </attributelist >
                      
                     </cdecl >
-                    <class id="429" addr="0x7f0bacb38110" >
-                        <attributelist id="430" addr="0x7f0bacb38110" >
-                            <attribute name="name" value="XBMCAddon::xbmcaddon::Addon" id="431" addr="0x7f0bacb3d530" />
-                            <attribute name="sym_symtab" value="0x7f0bacb37c90" id="432" addr="0x7f0bacb37c90" />
-                            <attribute name="symtab" value="0x7f0bacb38290" id="433" addr="0x7f0bacb38290" />
-                            <attribute name="allows_typedef" value="1" id="434" addr="0x7f0bacb3d530" />
-                            <attribute name="typepass_visit" value="1" id="435" addr="0x7f0bacb3d530" />
-                            <attribute name="allocate_visit" value="1" id="436" addr="0x7f0bacb3d530" />
-                            <attribute name="kind" value="class" id="437" addr="0x7f0bacb3d530" />
-                            <attribute name="sym_name" value="Addon" id="438" addr="0x7f0bacb3d530" />
-                            <attribute name="allocate_default_constructor" value="1" id="439" addr="0x7f0bacb3d530" />
-                            <attribute name="allocate_has_constructor" value="1" id="440" addr="0x7f0bacb3d530" />
-                            <attribute name="allocate_public_constructor" value="1" id="441" addr="0x7f0bacb3d530" />
-                            <attribute name="allocate_has_destructor" value="1" id="442" addr="0x7f0bacb3d530" />
-                            <attribute name="allocate_default_destructor" value="1" id="443" addr="0x7f0bacb3d530" />
-                            <attribute name="allocate_copy_constructor" value="1" id="444" addr="0x7f0bacb3d530" />
-                            <attribute name="privatebaselist" value="0x7f0bacb38090" id="445" addr="0x7f0bacb38090" />
-                            <attribute name="protectedbaselist" value="0x7f0bacb38070" id="446" addr="0x7f0bacb38070" />
-                            <baselist id="447" addr="0x7f0bacb38050" >
-                                <base name="AddonClass" id="448" addr="0x7f0bacb37fb0" />
+                    <class id="429" addr="0x7f136da2f110" >
+                        <attributelist id="430" addr="0x7f136da2f110" >
+                            <attribute name="name" value="XBMCAddon::xbmcaddon::Addon" id="431" addr="0x7f136da34530" />
+                            <attribute name="sym_symtab" value="0x7f136da2ec90" id="432" addr="0x7f136da2ec90" />
+                            <attribute name="symtab" value="0x7f136da2f290" id="433" addr="0x7f136da2f290" />
+                            <attribute name="allows_typedef" value="1" id="434" addr="0x7f136da34530" />
+                            <attribute name="typepass_visit" value="1" id="435" addr="0x7f136da34530" />
+                            <attribute name="allocate_visit" value="1" id="436" addr="0x7f136da34530" />
+                            <attribute name="kind" value="class" id="437" addr="0x7f136da34530" />
+                            <attribute name="sym_name" value="Addon" id="438" addr="0x7f136da34530" />
+                            <attribute name="allocate_default_constructor" value="1" id="439" addr="0x7f136da34530" />
+                            <attribute name="allocate_has_constructor" value="1" id="440" addr="0x7f136da34530" />
+                            <attribute name="allocate_public_constructor" value="1" id="441" addr="0x7f136da34530" />
+                            <attribute name="allocate_has_destructor" value="1" id="442" addr="0x7f136da34530" />
+                            <attribute name="allocate_default_destructor" value="1" id="443" addr="0x7f136da34530" />
+                            <attribute name="allocate_copy_constructor" value="1" id="444" addr="0x7f136da34530" />
+                            <attribute name="privatebaselist" value="0x7f136da2f090" id="445" addr="0x7f136da2f090" />
+                            <attribute name="protectedbaselist" value="0x7f136da2f070" id="446" addr="0x7f136da2f070" />
+                            <baselist id="447" addr="0x7f136da2f050" >
+                                <base name="AddonClass" id="448" addr="0x7f136da2efb0" />
                             </baselist >
-                            <attribute name="module" value="xbmcaddon" id="449" addr="0x7f0bacb36fd0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="450" addr="0x7f0bacb3d530" />
-                            <typescope id="451" addr="0x7f0bacb3c8b0" >
-                                <attributelist id="452" addr="0x7f0bacb3c8b0" >
-                                    <attribute name="name" value="Addon" id="453" addr="0x7f0bacb3d530" />
-                                    <typetab id="454" addr="0x7f0bacb3c8d0" >
-                                        <attributelist id="455" addr="0x7f0bacb3c8d0" >
+                            <attribute name="module" value="xbmcaddon" id="449" addr="0x7f136da2dfd0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="450" addr="0x7f136da34530" />
+                            <typescope id="451" addr="0x7f136da338b0" >
+                                <attributelist id="452" addr="0x7f136da338b0" >
+                                    <attribute name="name" value="Addon" id="453" addr="0x7f136da34530" />
+                                    <typetab id="454" addr="0x7f136da338d0" >
+                                        <attributelist id="455" addr="0x7f136da338d0" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f0bacb3c630" id="456" addr="0x7f0bacb3c630" />
-                                    <attribute name="qname" value="XBMCAddon::xbmcaddon::Addon" id="457" addr="0x7f0bacb3d530" />
-                                    <attribute name="symtab" value="0x7f0bacb38290" id="458" addr="0x7f0bacb38290" />
+                                    <attribute name="parent" value="0x7f136da33630" id="456" addr="0x7f136da33630" />
+                                    <attribute name="qname" value="XBMCAddon::xbmcaddon::Addon" id="457" addr="0x7f136da34530" />
+                                    <attribute name="symtab" value="0x7f136da2f290" id="458" addr="0x7f136da2f290" />
                                 </attributelist >
-                                <typescopesitem id="459" addr="0x7f0bacb3c810" >
-                                    <attributelist id="460" addr="0x7f0bacb3c810" >
+                                <typescopesitem id="459" addr="0x7f136da33810" >
+                                    <attributelist id="460" addr="0x7f136da33810" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="461" addr="0x7f0bacb3c8d0" >
-                                    <attributelist id="462" addr="0x7f0bacb3c8d0" >
+                                <typescopesitem id="461" addr="0x7f136da338d0" >
+                                    <attributelist id="462" addr="0x7f136da338d0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="463" addr="0x7f0bacb3c630" >
-                                    <attributelist id="464" addr="0x7f0bacb3c630" >
-                                        <attribute name="name" value="xbmcaddon" id="465" addr="0x7f0bacb3d530" />
-                                        <typetab id="466" addr="0x7f0bacb3c650" >
-                                            <attributelist id="467" addr="0x7f0bacb3c650" >
-                                                <attribute name="Addon" value="Addon" id="468" addr="0x7f0bacb3d530" />
+                                <typescopesitem id="463" addr="0x7f136da33630" >
+                                    <attributelist id="464" addr="0x7f136da33630" >
+                                        <attribute name="name" value="xbmcaddon" id="465" addr="0x7f136da34530" />
+                                        <typetab id="466" addr="0x7f136da33650" >
+                                            <attributelist id="467" addr="0x7f136da33650" >
+                                                <attribute name="Addon" value="Addon" id="468" addr="0x7f136da34530" />
                                             </attributelist >
-                                            <typetabsitem id="469" addr="0x7f0bacb3c7b0" >
-                                                <attributelist id="470" addr="0x7f0bacb3c7b0" >
+                                            <typetabsitem id="469" addr="0x7f136da337b0" >
+                                                <attributelist id="470" addr="0x7f136da337b0" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7f0bacb3c250" id="471" addr="0x7f0bacb3c250" />
-                                        <attribute name="qname" value="XBMCAddon::xbmcaddon" id="472" addr="0x7f0bacb3d530" />
-                                        <attribute name="symtab" value="0x7f0bacb37c90" id="473" addr="0x7f0bacb37c90" />
+                                        <attribute name="parent" value="0x7f136da33250" id="471" addr="0x7f136da33250" />
+                                        <attribute name="qname" value="XBMCAddon::xbmcaddon" id="472" addr="0x7f136da34530" />
+                                        <attribute name="symtab" value="0x7f136da2ec90" id="473" addr="0x7f136da2ec90" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="474" addr="0x7f0bacb3c8f0" >
-                                    <attributelist id="475" addr="0x7f0bacb3c8f0" >
+                                <typescopesitem id="474" addr="0x7f136da338f0" >
+                                    <attributelist id="475" addr="0x7f136da338f0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="476" addr="0x7f0bacb38290" >
-                                    <attributelist id="477" addr="0x7f0bacb38290" >
-                                        <attribute name="name" value="Addon" id="478" addr="0x7f0bacb3d530" />
-                                        <attribute name="csymtab" value="0x7f0bacb382f0" id="479" addr="0x7f0bacb382f0" />
-                                        <attribute name="symtab" value="0x7f0bacb38270" id="480" addr="0x7f0bacb38270" />
+                                <typescopesitem id="476" addr="0x7f136da2f290" >
+                                    <attributelist id="477" addr="0x7f136da2f290" >
+                                        <attribute name="name" value="Addon" id="478" addr="0x7f136da34530" />
+                                        <attribute name="csymtab" value="0x7f136da2f2f0" id="479" addr="0x7f136da2f2f0" />
+                                        <attribute name="symtab" value="0x7f136da2f270" id="480" addr="0x7f136da2f270" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <cdecl id="481" addr="0x7f0bacb383f0" >
-                            <attributelist id="482" addr="0x7f0bacb383f0" >
-                                <attribute name="ismember" value="1" id="483" addr="0x7f0bacb3d530" />
-                                <attribute name="name" value="pAddon" id="484" addr="0x7f0bacb3d530" />
-                                <attribute name="decl" value="" id="485" addr="0x7f0bacb3d530" />
-                                <attribute name="access" value="private" id="486" addr="0x7f0bacb3d530" />
-                                <attribute name="kind" value="variable" id="487" addr="0x7f0bacb3d530" />
-                                <attribute name="type" value="ADDON::AddonPtr" id="488" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_symtab" value="0x7f0bacb38290" id="489" addr="0x7f0bacb38290" />
+                        <cdecl id="481" addr="0x7f136da2f3f0" >
+                            <attributelist id="482" addr="0x7f136da2f3f0" >
+                                <attribute name="ismember" value="1" id="483" addr="0x7f136da34530" />
+                                <attribute name="name" value="pAddon" id="484" addr="0x7f136da34530" />
+                                <attribute name="decl" value="" id="485" addr="0x7f136da34530" />
+                                <attribute name="access" value="private" id="486" addr="0x7f136da34530" />
+                                <attribute name="kind" value="variable" id="487" addr="0x7f136da34530" />
+                                <attribute name="type" value="ADDON::AddonPtr" id="488" addr="0x7f136da34530" />
+                                <attribute name="sym_symtab" value="0x7f136da2f290" id="489" addr="0x7f136da2f290" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="490" addr="0x7f0bacb38670" >
-                            <attributelist id="491" addr="0x7f0bacb38670" >
-                                <attribute name="ismember" value="1" id="492" addr="0x7f0bacb3d530" />
-                                <attribute name="name" value="getDefaultId" id="493" addr="0x7f0bacb3d530" />
-                                <attribute name="decl" value="f()." id="494" addr="0x7f0bacb3d530" />
-                                <attribute name="access" value="private" id="495" addr="0x7f0bacb3d530" />
-                                <attribute name="kind" value="function" id="496" addr="0x7f0bacb3d530" />
-                                <attribute name="type" value="XBMCAddon::String" id="497" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_symtab" value="0x7f0bacb38290" id="498" addr="0x7f0bacb38290" />
+                        <cdecl id="490" addr="0x7f136da2f670" >
+                            <attributelist id="491" addr="0x7f136da2f670" >
+                                <attribute name="ismember" value="1" id="492" addr="0x7f136da34530" />
+                                <attribute name="name" value="getDefaultId" id="493" addr="0x7f136da34530" />
+                                <attribute name="decl" value="f()." id="494" addr="0x7f136da34530" />
+                                <attribute name="access" value="private" id="495" addr="0x7f136da34530" />
+                                <attribute name="kind" value="function" id="496" addr="0x7f136da34530" />
+                                <attribute name="type" value="XBMCAddon::String" id="497" addr="0x7f136da34530" />
+                                <attribute name="sym_symtab" value="0x7f136da2f290" id="498" addr="0x7f136da2f290" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="499" addr="0x7f0bacb38810" >
-                            <attributelist id="500" addr="0x7f0bacb38810" >
-                                <attribute name="ismember" value="1" id="501" addr="0x7f0bacb3d530" />
-                                <attribute name="name" value="getAddonVersion" id="502" addr="0x7f0bacb3d530" />
-                                <attribute name="decl" value="f()." id="503" addr="0x7f0bacb3d530" />
-                                <attribute name="access" value="private" id="504" addr="0x7f0bacb3d530" />
-                                <attribute name="kind" value="function" id="505" addr="0x7f0bacb3d530" />
-                                <attribute name="type" value="XBMCAddon::String" id="506" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_symtab" value="0x7f0bacb38290" id="507" addr="0x7f0bacb38290" />
+                        <cdecl id="499" addr="0x7f136da2f810" >
+                            <attributelist id="500" addr="0x7f136da2f810" >
+                                <attribute name="ismember" value="1" id="501" addr="0x7f136da34530" />
+                                <attribute name="name" value="getAddonVersion" id="502" addr="0x7f136da34530" />
+                                <attribute name="decl" value="f()." id="503" addr="0x7f136da34530" />
+                                <attribute name="access" value="private" id="504" addr="0x7f136da34530" />
+                                <attribute name="kind" value="function" id="505" addr="0x7f136da34530" />
+                                <attribute name="type" value="XBMCAddon::String" id="506" addr="0x7f136da34530" />
+                                <attribute name="sym_symtab" value="0x7f136da2f290" id="507" addr="0x7f136da2f290" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="508" addr="0x7f0bacb38c10" >
-                            <attributelist id="509" addr="0x7f0bacb38c10" >
-                                <attribute name="ismember" value="1" id="510" addr="0x7f0bacb3d530" />
-                                <attribute name="name" value="UpdateSettingInActiveDialog" id="511" addr="0x7f0bacb3d530" />
-                                <attribute name="decl" value="f(p.q(const).char,r.q(const).XBMCAddon::String)." id="512" addr="0x7f0bacb3d530" />
-                                <parmlist id="513" addr="0x7f0bacb38a10" >
+                        <cdecl id="508" addr="0x7f136da2fc10" >
+                            <attributelist id="509" addr="0x7f136da2fc10" >
+                                <attribute name="ismember" value="1" id="510" addr="0x7f136da34530" />
+                                <attribute name="name" value="UpdateSettingInActiveDialog" id="511" addr="0x7f136da34530" />
+                                <attribute name="decl" value="f(p.q(const).char,r.q(const).XBMCAddon::String)." id="512" addr="0x7f136da34530" />
+                                <parmlist id="513" addr="0x7f136da2fa10" >
                                     <parm id="514">
-                                        <attributelist id="515" addr="0x7f0bacb38a10" >
-                                            <attribute name="name" value="id" id="516" addr="0x7f0bacb3d530" />
-                                            <attribute name="type" value="p.q(const).char" id="517" addr="0x7f0bacb3d530" />
+                                        <attributelist id="515" addr="0x7f136da2fa10" >
+                                            <attribute name="name" value="id" id="516" addr="0x7f136da34530" />
+                                            <attribute name="type" value="p.q(const).char" id="517" addr="0x7f136da34530" />
                                         </attributelist >
                                     </parm >
                                     <parm id="518">
-                                        <attributelist id="519" addr="0x7f0bacb38b50" >
-                                            <attribute name="name" value="value" id="520" addr="0x7f0bacb3d530" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="521" addr="0x7f0bacb3d530" />
+                                        <attributelist id="519" addr="0x7f136da2fb50" >
+                                            <attribute name="name" value="value" id="520" addr="0x7f136da34530" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="521" addr="0x7f136da34530" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="access" value="private" id="522" addr="0x7f0bacb3d530" />
-                                <attribute name="kind" value="function" id="523" addr="0x7f0bacb3d530" />
-                                <attribute name="type" value="bool" id="524" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_symtab" value="0x7f0bacb38290" id="525" addr="0x7f0bacb38290" />
+                                <attribute name="access" value="private" id="522" addr="0x7f136da34530" />
+                                <attribute name="kind" value="function" id="523" addr="0x7f136da34530" />
+                                <attribute name="type" value="bool" id="524" addr="0x7f136da34530" />
+                                <attribute name="sym_symtab" value="0x7f136da2f290" id="525" addr="0x7f136da2f290" />
                             </attributelist >
                          
                         </cdecl >
-                        <access id="526" addr="0x7f0bacb38d30" >
-                            <attributelist id="527" addr="0x7f0bacb38d30" >
-                                <attribute name="kind" value="public" id="528" addr="0x7f0bacb3d530" />
+                        <access id="526" addr="0x7f136da2fd30" >
+                            <attributelist id="527" addr="0x7f136da2fd30" >
+                                <attribute name="kind" value="public" id="528" addr="0x7f136da34530" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="529" addr="0x7f0bacb38f70" >
-                            <attributelist id="530" addr="0x7f0bacb38f70" >
-                                <attribute name="name" value="Addon" id="531" addr="0x7f0bacb3d530" />
-                                <attribute name="ismember" value="1" id="532" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_symtab" value="0x7f0bacb38290" id="533" addr="0x7f0bacb38290" />
-                                <attribute name="sym_nextSibling" value="0x7f0bacb39090" id="534" addr="0x7f0bacb39090" />
-                                <attribute name="csym_nextSibling" value="0x7f0bacb39090" id="535" addr="0x7f0bacb39090" />
-                                <attribute name="sym_name" value="Addon" id="536" addr="0x7f0bacb3d530" />
-                                <attribute name="decl" value="f(p.q(const).char)." id="537" addr="0x7f0bacb3d530" />
-                                <attribute name="access" value="public" id="538" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_overloaded" value="0x7f0bacb38f70" id="539" addr="0x7f0bacb38f70" />
-                                <parmlist id="540" addr="0x7f0bacb38eb0" >
+                        <constructor id="529" addr="0x7f136da2ff70" >
+                            <attributelist id="530" addr="0x7f136da2ff70" >
+                                <attribute name="name" value="Addon" id="531" addr="0x7f136da34530" />
+                                <attribute name="ismember" value="1" id="532" addr="0x7f136da34530" />
+                                <attribute name="sym_symtab" value="0x7f136da2f290" id="533" addr="0x7f136da2f290" />
+                                <attribute name="sym_nextSibling" value="0x7f136da30090" id="534" addr="0x7f136da30090" />
+                                <attribute name="csym_nextSibling" value="0x7f136da30090" id="535" addr="0x7f136da30090" />
+                                <attribute name="sym_name" value="Addon" id="536" addr="0x7f136da34530" />
+                                <attribute name="decl" value="f(p.q(const).char)." id="537" addr="0x7f136da34530" />
+                                <attribute name="access" value="public" id="538" addr="0x7f136da34530" />
+                                <attribute name="sym_overloaded" value="0x7f136da2ff70" id="539" addr="0x7f136da2ff70" />
+                                <parmlist id="540" addr="0x7f136da2feb0" >
                                     <parm id="541">
-                                        <attributelist id="542" addr="0x7f0bacb38eb0" >
-                                            <attribute name="name" value="id" id="543" addr="0x7f0bacb3d530" />
-                                            <attribute name="value" value="NULL" id="544" addr="0x7f0bacb3d530" />
-                                            <attribute name="type" value="p.q(const).char" id="545" addr="0x7f0bacb3d530" />
+                                        <attributelist id="542" addr="0x7f136da2feb0" >
+                                            <attribute name="name" value="id" id="543" addr="0x7f136da34530" />
+                                            <attribute name="value" value="NULL" id="544" addr="0x7f136da34530" />
+                                            <attribute name="type" value="p.q(const).char" id="545" addr="0x7f136da34530" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_0" id="546" addr="0x7f0bacb3d530" />
-                                <attribute name="storage" value="explicit" id="547" addr="0x7f0bacb3d530" />
-                                <attribute name="feature_new" value="1" id="548" addr="0x7f0bacb3d530" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="546" addr="0x7f136da34530" />
+                                <attribute name="storage" value="explicit" id="547" addr="0x7f136da34530" />
+                                <attribute name="feature_new" value="1" id="548" addr="0x7f136da34530" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="549" addr="0x7f0bacb39090" >
-                            <attributelist id="550" addr="0x7f0bacb39090" >
-                                <attribute name="name" value="Addon" id="551" addr="0x7f0bacb3d530" />
-                                <attribute name="ismember" value="1" id="552" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_symtab" value="0x7f0bacb38290" id="553" addr="0x7f0bacb38290" />
-                                <attribute name="sym_previousSibling" value="0x7f0bacb38f70" id="554" addr="0x7f0bacb38f70" />
-                                <attribute name="sym_name" value="Addon" id="555" addr="0x7f0bacb3d530" />
-                                <attribute name="defaultargs" value="0x7f0bacb38f70" id="556" addr="0x7f0bacb38f70" />
-                                <attribute name="decl" value="f()." id="557" addr="0x7f0bacb3d530" />
-                                <attribute name="access" value="public" id="558" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_overloaded" value="0x7f0bacb38f70" id="559" addr="0x7f0bacb38f70" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="560" addr="0x7f0bacb3d530" />
-                                <attribute name="storage" value="explicit" id="561" addr="0x7f0bacb3d530" />
-                                <attribute name="feature_new" value="1" id="562" addr="0x7f0bacb3d530" />
+                        <constructor id="549" addr="0x7f136da30090" >
+                            <attributelist id="550" addr="0x7f136da30090" >
+                                <attribute name="name" value="Addon" id="551" addr="0x7f136da34530" />
+                                <attribute name="ismember" value="1" id="552" addr="0x7f136da34530" />
+                                <attribute name="sym_symtab" value="0x7f136da2f290" id="553" addr="0x7f136da2f290" />
+                                <attribute name="sym_previousSibling" value="0x7f136da2ff70" id="554" addr="0x7f136da2ff70" />
+                                <attribute name="sym_name" value="Addon" id="555" addr="0x7f136da34530" />
+                                <attribute name="defaultargs" value="0x7f136da2ff70" id="556" addr="0x7f136da2ff70" />
+                                <attribute name="decl" value="f()." id="557" addr="0x7f136da34530" />
+                                <attribute name="access" value="public" id="558" addr="0x7f136da34530" />
+                                <attribute name="sym_overloaded" value="0x7f136da2ff70" id="559" addr="0x7f136da2ff70" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="560" addr="0x7f136da34530" />
+                                <attribute name="storage" value="explicit" id="561" addr="0x7f136da34530" />
+                                <attribute name="feature_new" value="1" id="562" addr="0x7f136da34530" />
                             </attributelist >
                          
                         </constructor >
-                        <destructor id="563" addr="0x7f0bacb392f0" >
-                            <attributelist id="564" addr="0x7f0bacb392f0" >
-                                <attribute name="ismember" value="1" id="565" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_name" value="~Addon" id="566" addr="0x7f0bacb3d530" />
-                                <attribute name="name" value="~Addon" id="567" addr="0x7f0bacb3d530" />
-                                <attribute name="decl" value="f()." id="568" addr="0x7f0bacb3d530" />
-                                <attribute name="access" value="public" id="569" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_symtab" value="0x7f0bacb38290" id="570" addr="0x7f0bacb38290" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="571" addr="0x7f0bacb3d530" />
+                        <destructor id="563" addr="0x7f136da302f0" >
+                            <attributelist id="564" addr="0x7f136da302f0" >
+                                <attribute name="ismember" value="1" id="565" addr="0x7f136da34530" />
+                                <attribute name="sym_name" value="~Addon" id="566" addr="0x7f136da34530" />
+                                <attribute name="name" value="~Addon" id="567" addr="0x7f136da34530" />
+                                <attribute name="decl" value="f()." id="568" addr="0x7f136da34530" />
+                                <attribute name="access" value="public" id="569" addr="0x7f136da34530" />
+                                <attribute name="sym_symtab" value="0x7f136da2f290" id="570" addr="0x7f136da2f290" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="571" addr="0x7f136da34530" />
                             </attributelist >
                          
                         </destructor >
-                        <cdecl id="572" addr="0x7f0bacb395d0" >
-                            <attributelist id="573" addr="0x7f0bacb395d0" >
-                                <attribute name="feature_python_coerceToUnicode" value="true" id="574" addr="0x7f0bacb3d530" />
-                                <attribute name="name" value="getLocalizedString" id="575" addr="0x7f0bacb3d530" />
-                                <attribute name="ismember" value="1" id="576" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_symtab" value="0x7f0bacb38290" id="577" addr="0x7f0bacb38290" />
-                                <attribute name="kind" value="function" id="578" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_name" value="getLocalizedString" id="579" addr="0x7f0bacb3d530" />
-                                <attribute name="decl" value="f(int)." id="580" addr="0x7f0bacb3d530" />
-                                <attribute name="access" value="public" id="581" addr="0x7f0bacb3d530" />
-                                <parmlist id="582" addr="0x7f0bacb39510" >
+                        <cdecl id="572" addr="0x7f136da305d0" >
+                            <attributelist id="573" addr="0x7f136da305d0" >
+                                <attribute name="feature_python_coerceToUnicode" value="true" id="574" addr="0x7f136da34530" />
+                                <attribute name="name" value="getLocalizedString" id="575" addr="0x7f136da34530" />
+                                <attribute name="ismember" value="1" id="576" addr="0x7f136da34530" />
+                                <attribute name="sym_symtab" value="0x7f136da2f290" id="577" addr="0x7f136da2f290" />
+                                <attribute name="kind" value="function" id="578" addr="0x7f136da34530" />
+                                <attribute name="sym_name" value="getLocalizedString" id="579" addr="0x7f136da34530" />
+                                <attribute name="decl" value="f(int)." id="580" addr="0x7f136da34530" />
+                                <attribute name="access" value="public" id="581" addr="0x7f136da34530" />
+                                <parmlist id="582" addr="0x7f136da30510" >
                                     <parm id="583">
-                                        <attributelist id="584" addr="0x7f0bacb39510" >
-                                            <attribute name="name" value="id" id="585" addr="0x7f0bacb3d530" />
-                                            <attribute name="type" value="int" id="586" addr="0x7f0bacb3d530" />
+                                        <attributelist id="584" addr="0x7f136da30510" >
+                                            <attribute name="name" value="id" id="585" addr="0x7f136da34530" />
+                                            <attribute name="type" value="int" id="586" addr="0x7f136da34530" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="XBMCAddon::String" id="587" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="588" addr="0x7f0bacb3d530" />
+                                <attribute name="type" value="XBMCAddon::String" id="587" addr="0x7f136da34530" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="588" addr="0x7f136da34530" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="589" addr="0x7f0bacb39910" >
-                            <attributelist id="590" addr="0x7f0bacb39910" >
-                                <attribute name="name" value="getSetting" id="591" addr="0x7f0bacb3d530" />
-                                <attribute name="ismember" value="1" id="592" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_symtab" value="0x7f0bacb38290" id="593" addr="0x7f0bacb38290" />
-                                <attribute name="kind" value="function" id="594" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_name" value="getSetting" id="595" addr="0x7f0bacb3d530" />
-                                <attribute name="decl" value="f(p.q(const).char)." id="596" addr="0x7f0bacb3d530" />
-                                <attribute name="access" value="public" id="597" addr="0x7f0bacb3d530" />
-                                <parmlist id="598" addr="0x7f0bacb39850" >
+                        <cdecl id="589" addr="0x7f136da30910" >
+                            <attributelist id="590" addr="0x7f136da30910" >
+                                <attribute name="name" value="getSetting" id="591" addr="0x7f136da34530" />
+                                <attribute name="ismember" value="1" id="592" addr="0x7f136da34530" />
+                                <attribute name="sym_symtab" value="0x7f136da2f290" id="593" addr="0x7f136da2f290" />
+                                <attribute name="kind" value="function" id="594" addr="0x7f136da34530" />
+                                <attribute name="sym_name" value="getSetting" id="595" addr="0x7f136da34530" />
+                                <attribute name="decl" value="f(p.q(const).char)." id="596" addr="0x7f136da34530" />
+                                <attribute name="access" value="public" id="597" addr="0x7f136da34530" />
+                                <parmlist id="598" addr="0x7f136da30850" >
                                     <parm id="599">
-                                        <attributelist id="600" addr="0x7f0bacb39850" >
-                                            <attribute name="name" value="id" id="601" addr="0x7f0bacb3d530" />
-                                            <attribute name="type" value="p.q(const).char" id="602" addr="0x7f0bacb3d530" />
+                                        <attributelist id="600" addr="0x7f136da30850" >
+                                            <attribute name="name" value="id" id="601" addr="0x7f136da34530" />
+                                            <attribute name="type" value="p.q(const).char" id="602" addr="0x7f136da34530" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="XBMCAddon::String" id="603" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="604" addr="0x7f0bacb3d530" />
+                                <attribute name="type" value="XBMCAddon::String" id="603" addr="0x7f136da34530" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="604" addr="0x7f136da34530" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="605" addr="0x7f0bacb39c10" >
-                            <attributelist id="606" addr="0x7f0bacb39c10" >
-                                <attribute name="name" value="getSettingBool" id="607" addr="0x7f0bacb3d530" />
-                                <attribute name="ismember" value="1" id="608" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_symtab" value="0x7f0bacb38290" id="609" addr="0x7f0bacb38290" />
-                                <attribute name="kind" value="function" id="610" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_name" value="getSettingBool" id="611" addr="0x7f0bacb3d530" />
-                                <attribute name="decl" value="f(p.q(const).char)." id="612" addr="0x7f0bacb3d530" />
-                                <attribute name="access" value="public" id="613" addr="0x7f0bacb3d530" />
-                                <parmlist id="614" addr="0x7f0bacb39b50" >
+                        <cdecl id="605" addr="0x7f136da30c10" >
+                            <attributelist id="606" addr="0x7f136da30c10" >
+                                <attribute name="name" value="getSettingBool" id="607" addr="0x7f136da34530" />
+                                <attribute name="ismember" value="1" id="608" addr="0x7f136da34530" />
+                                <attribute name="sym_symtab" value="0x7f136da2f290" id="609" addr="0x7f136da2f290" />
+                                <attribute name="kind" value="function" id="610" addr="0x7f136da34530" />
+                                <attribute name="sym_name" value="getSettingBool" id="611" addr="0x7f136da34530" />
+                                <attribute name="decl" value="f(p.q(const).char)." id="612" addr="0x7f136da34530" />
+                                <attribute name="access" value="public" id="613" addr="0x7f136da34530" />
+                                <parmlist id="614" addr="0x7f136da30b50" >
                                     <parm id="615">
-                                        <attributelist id="616" addr="0x7f0bacb39b50" >
-                                            <attribute name="name" value="id" id="617" addr="0x7f0bacb3d530" />
-                                            <attribute name="type" value="p.q(const).char" id="618" addr="0x7f0bacb3d530" />
+                                        <attributelist id="616" addr="0x7f136da30b50" >
+                                            <attribute name="name" value="id" id="617" addr="0x7f136da34530" />
+                                            <attribute name="type" value="p.q(const).char" id="618" addr="0x7f136da34530" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="bool" id="619" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="620" addr="0x7f0bacb3d530" />
+                                <attribute name="type" value="bool" id="619" addr="0x7f136da34530" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="620" addr="0x7f136da34530" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="621" addr="0x7f0bacb39f30" >
-                            <attributelist id="622" addr="0x7f0bacb39f30" >
-                                <attribute name="name" value="getSettingInt" id="623" addr="0x7f0bacb3d530" />
-                                <attribute name="ismember" value="1" id="624" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_symtab" value="0x7f0bacb38290" id="625" addr="0x7f0bacb38290" />
-                                <attribute name="kind" value="function" id="626" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_name" value="getSettingInt" id="627" addr="0x7f0bacb3d530" />
-                                <attribute name="decl" value="f(p.q(const).char)." id="628" addr="0x7f0bacb3d530" />
-                                <attribute name="access" value="public" id="629" addr="0x7f0bacb3d530" />
-                                <parmlist id="630" addr="0x7f0bacb39e70" >
+                        <cdecl id="621" addr="0x7f136da30f30" >
+                            <attributelist id="622" addr="0x7f136da30f30" >
+                                <attribute name="name" value="getSettingInt" id="623" addr="0x7f136da34530" />
+                                <attribute name="ismember" value="1" id="624" addr="0x7f136da34530" />
+                                <attribute name="sym_symtab" value="0x7f136da2f290" id="625" addr="0x7f136da2f290" />
+                                <attribute name="kind" value="function" id="626" addr="0x7f136da34530" />
+                                <attribute name="sym_name" value="getSettingInt" id="627" addr="0x7f136da34530" />
+                                <attribute name="decl" value="f(p.q(const).char)." id="628" addr="0x7f136da34530" />
+                                <attribute name="access" value="public" id="629" addr="0x7f136da34530" />
+                                <parmlist id="630" addr="0x7f136da30e70" >
                                     <parm id="631">
-                                        <attributelist id="632" addr="0x7f0bacb39e70" >
-                                            <attribute name="name" value="id" id="633" addr="0x7f0bacb3d530" />
-                                            <attribute name="type" value="p.q(const).char" id="634" addr="0x7f0bacb3d530" />
+                                        <attributelist id="632" addr="0x7f136da30e70" >
+                                            <attribute name="name" value="id" id="633" addr="0x7f136da34530" />
+                                            <attribute name="type" value="p.q(const).char" id="634" addr="0x7f136da34530" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="int" id="635" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="636" addr="0x7f0bacb3d530" />
+                                <attribute name="type" value="int" id="635" addr="0x7f136da34530" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="636" addr="0x7f136da34530" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="637" addr="0x7f0bacb3a250" >
-                            <attributelist id="638" addr="0x7f0bacb3a250" >
-                                <attribute name="name" value="getSettingNumber" id="639" addr="0x7f0bacb3d530" />
-                                <attribute name="ismember" value="1" id="640" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_symtab" value="0x7f0bacb38290" id="641" addr="0x7f0bacb38290" />
-                                <attribute name="kind" value="function" id="642" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_name" value="getSettingNumber" id="643" addr="0x7f0bacb3d530" />
-                                <attribute name="decl" value="f(p.q(const).char)." id="644" addr="0x7f0bacb3d530" />
-                                <attribute name="access" value="public" id="645" addr="0x7f0bacb3d530" />
-                                <parmlist id="646" addr="0x7f0bacb3a190" >
+                        <cdecl id="637" addr="0x7f136da31250" >
+                            <attributelist id="638" addr="0x7f136da31250" >
+                                <attribute name="name" value="getSettingNumber" id="639" addr="0x7f136da34530" />
+                                <attribute name="ismember" value="1" id="640" addr="0x7f136da34530" />
+                                <attribute name="sym_symtab" value="0x7f136da2f290" id="641" addr="0x7f136da2f290" />
+                                <attribute name="kind" value="function" id="642" addr="0x7f136da34530" />
+                                <attribute name="sym_name" value="getSettingNumber" id="643" addr="0x7f136da34530" />
+                                <attribute name="decl" value="f(p.q(const).char)." id="644" addr="0x7f136da34530" />
+                                <attribute name="access" value="public" id="645" addr="0x7f136da34530" />
+                                <parmlist id="646" addr="0x7f136da31190" >
                                     <parm id="647">
-                                        <attributelist id="648" addr="0x7f0bacb3a190" >
-                                            <attribute name="name" value="id" id="649" addr="0x7f0bacb3d530" />
-                                            <attribute name="type" value="p.q(const).char" id="650" addr="0x7f0bacb3d530" />
+                                        <attributelist id="648" addr="0x7f136da31190" >
+                                            <attribute name="name" value="id" id="649" addr="0x7f136da34530" />
+                                            <attribute name="type" value="p.q(const).char" id="650" addr="0x7f136da34530" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="double" id="651" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="652" addr="0x7f0bacb3d530" />
+                                <attribute name="type" value="double" id="651" addr="0x7f136da34530" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="652" addr="0x7f136da34530" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="653" addr="0x7f0bacb3a570" >
-                            <attributelist id="654" addr="0x7f0bacb3a570" >
-                                <attribute name="name" value="getSettingString" id="655" addr="0x7f0bacb3d530" />
-                                <attribute name="ismember" value="1" id="656" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_symtab" value="0x7f0bacb38290" id="657" addr="0x7f0bacb38290" />
-                                <attribute name="kind" value="function" id="658" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_name" value="getSettingString" id="659" addr="0x7f0bacb3d530" />
-                                <attribute name="decl" value="f(p.q(const).char)." id="660" addr="0x7f0bacb3d530" />
-                                <attribute name="access" value="public" id="661" addr="0x7f0bacb3d530" />
-                                <parmlist id="662" addr="0x7f0bacb3a4b0" >
+                        <cdecl id="653" addr="0x7f136da31570" >
+                            <attributelist id="654" addr="0x7f136da31570" >
+                                <attribute name="name" value="getSettingString" id="655" addr="0x7f136da34530" />
+                                <attribute name="ismember" value="1" id="656" addr="0x7f136da34530" />
+                                <attribute name="sym_symtab" value="0x7f136da2f290" id="657" addr="0x7f136da2f290" />
+                                <attribute name="kind" value="function" id="658" addr="0x7f136da34530" />
+                                <attribute name="sym_name" value="getSettingString" id="659" addr="0x7f136da34530" />
+                                <attribute name="decl" value="f(p.q(const).char)." id="660" addr="0x7f136da34530" />
+                                <attribute name="access" value="public" id="661" addr="0x7f136da34530" />
+                                <parmlist id="662" addr="0x7f136da314b0" >
                                     <parm id="663">
-                                        <attributelist id="664" addr="0x7f0bacb3a4b0" >
-                                            <attribute name="name" value="id" id="665" addr="0x7f0bacb3d530" />
-                                            <attribute name="type" value="p.q(const).char" id="666" addr="0x7f0bacb3d530" />
+                                        <attributelist id="664" addr="0x7f136da314b0" >
+                                            <attribute name="name" value="id" id="665" addr="0x7f136da34530" />
+                                            <attribute name="type" value="p.q(const).char" id="666" addr="0x7f136da34530" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="XBMCAddon::String" id="667" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="668" addr="0x7f0bacb3d530" />
+                                <attribute name="type" value="XBMCAddon::String" id="667" addr="0x7f136da34530" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="668" addr="0x7f136da34530" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="669" addr="0x7f0bacb3a9b0" >
-                            <attributelist id="670" addr="0x7f0bacb3a9b0" >
-                                <attribute name="name" value="setSetting" id="671" addr="0x7f0bacb3d530" />
-                                <attribute name="ismember" value="1" id="672" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_symtab" value="0x7f0bacb38290" id="673" addr="0x7f0bacb38290" />
-                                <attribute name="kind" value="function" id="674" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_name" value="setSetting" id="675" addr="0x7f0bacb3d530" />
-                                <attribute name="decl" value="f(p.q(const).char,r.q(const).XBMCAddon::String)." id="676" addr="0x7f0bacb3d530" />
-                                <attribute name="access" value="public" id="677" addr="0x7f0bacb3d530" />
-                                <parmlist id="678" addr="0x7f0bacb3a7b0" >
+                        <cdecl id="669" addr="0x7f136da319b0" >
+                            <attributelist id="670" addr="0x7f136da319b0" >
+                                <attribute name="name" value="setSetting" id="671" addr="0x7f136da34530" />
+                                <attribute name="ismember" value="1" id="672" addr="0x7f136da34530" />
+                                <attribute name="sym_symtab" value="0x7f136da2f290" id="673" addr="0x7f136da2f290" />
+                                <attribute name="kind" value="function" id="674" addr="0x7f136da34530" />
+                                <attribute name="sym_name" value="setSetting" id="675" addr="0x7f136da34530" />
+                                <attribute name="decl" value="f(p.q(const).char,r.q(const).XBMCAddon::String)." id="676" addr="0x7f136da34530" />
+                                <attribute name="access" value="public" id="677" addr="0x7f136da34530" />
+                                <parmlist id="678" addr="0x7f136da317b0" >
                                     <parm id="679">
-                                        <attributelist id="680" addr="0x7f0bacb3a7b0" >
-                                            <attribute name="name" value="id" id="681" addr="0x7f0bacb3d530" />
-                                            <attribute name="type" value="p.q(const).char" id="682" addr="0x7f0bacb3d530" />
+                                        <attributelist id="680" addr="0x7f136da317b0" >
+                                            <attribute name="name" value="id" id="681" addr="0x7f136da34530" />
+                                            <attribute name="type" value="p.q(const).char" id="682" addr="0x7f136da34530" />
                                         </attributelist >
                                     </parm >
                                     <parm id="683">
-                                        <attributelist id="684" addr="0x7f0bacb3a8f0" >
-                                            <attribute name="name" value="value" id="685" addr="0x7f0bacb3d530" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="686" addr="0x7f0bacb3d530" />
+                                        <attributelist id="684" addr="0x7f136da318f0" >
+                                            <attribute name="name" value="value" id="685" addr="0x7f136da34530" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="686" addr="0x7f136da34530" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="687" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="688" addr="0x7f0bacb3d530" />
+                                <attribute name="type" value="void" id="687" addr="0x7f136da34530" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="688" addr="0x7f136da34530" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="689" addr="0x7f0bacb3adb0" >
-                            <attributelist id="690" addr="0x7f0bacb3adb0" >
-                                <attribute name="name" value="setSettingBool" id="691" addr="0x7f0bacb3d530" />
-                                <attribute name="ismember" value="1" id="692" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_symtab" value="0x7f0bacb38290" id="693" addr="0x7f0bacb38290" />
-                                <attribute name="kind" value="function" id="694" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_name" value="setSettingBool" id="695" addr="0x7f0bacb3d530" />
-                                <attribute name="decl" value="f(p.q(const).char,bool)." id="696" addr="0x7f0bacb3d530" />
-                                <attribute name="access" value="public" id="697" addr="0x7f0bacb3d530" />
-                                <parmlist id="698" addr="0x7f0bacb3abf0" >
+                        <cdecl id="689" addr="0x7f136da31db0" >
+                            <attributelist id="690" addr="0x7f136da31db0" >
+                                <attribute name="name" value="setSettingBool" id="691" addr="0x7f136da34530" />
+                                <attribute name="ismember" value="1" id="692" addr="0x7f136da34530" />
+                                <attribute name="sym_symtab" value="0x7f136da2f290" id="693" addr="0x7f136da2f290" />
+                                <attribute name="kind" value="function" id="694" addr="0x7f136da34530" />
+                                <attribute name="sym_name" value="setSettingBool" id="695" addr="0x7f136da34530" />
+                                <attribute name="decl" value="f(p.q(const).char,bool)." id="696" addr="0x7f136da34530" />
+                                <attribute name="access" value="public" id="697" addr="0x7f136da34530" />
+                                <parmlist id="698" addr="0x7f136da31bf0" >
                                     <parm id="699">
-                                        <attributelist id="700" addr="0x7f0bacb3abf0" >
-                                            <attribute name="name" value="id" id="701" addr="0x7f0bacb3d530" />
-                                            <attribute name="type" value="p.q(const).char" id="702" addr="0x7f0bacb3d530" />
+                                        <attributelist id="700" addr="0x7f136da31bf0" >
+                                            <attribute name="name" value="id" id="701" addr="0x7f136da34530" />
+                                            <attribute name="type" value="p.q(const).char" id="702" addr="0x7f136da34530" />
                                         </attributelist >
                                     </parm >
                                     <parm id="703">
-                                        <attributelist id="704" addr="0x7f0bacb3acf0" >
-                                            <attribute name="name" value="value" id="705" addr="0x7f0bacb3d530" />
-                                            <attribute name="type" value="bool" id="706" addr="0x7f0bacb3d530" />
+                                        <attributelist id="704" addr="0x7f136da31cf0" >
+                                            <attribute name="name" value="value" id="705" addr="0x7f136da34530" />
+                                            <attribute name="type" value="bool" id="706" addr="0x7f136da34530" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="bool" id="707" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="708" addr="0x7f0bacb3d530" />
+                                <attribute name="type" value="bool" id="707" addr="0x7f136da34530" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="708" addr="0x7f136da34530" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="709" addr="0x7f0bacb3b1d0" >
-                            <attributelist id="710" addr="0x7f0bacb3b1d0" >
-                                <attribute name="name" value="setSettingInt" id="711" addr="0x7f0bacb3d530" />
-                                <attribute name="ismember" value="1" id="712" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_symtab" value="0x7f0bacb38290" id="713" addr="0x7f0bacb38290" />
-                                <attribute name="kind" value="function" id="714" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_name" value="setSettingInt" id="715" addr="0x7f0bacb3d530" />
-                                <attribute name="decl" value="f(p.q(const).char,int)." id="716" addr="0x7f0bacb3d530" />
-                                <attribute name="access" value="public" id="717" addr="0x7f0bacb3d530" />
-                                <parmlist id="718" addr="0x7f0bacb3aff0" >
+                        <cdecl id="709" addr="0x7f136da321d0" >
+                            <attributelist id="710" addr="0x7f136da321d0" >
+                                <attribute name="name" value="setSettingInt" id="711" addr="0x7f136da34530" />
+                                <attribute name="ismember" value="1" id="712" addr="0x7f136da34530" />
+                                <attribute name="sym_symtab" value="0x7f136da2f290" id="713" addr="0x7f136da2f290" />
+                                <attribute name="kind" value="function" id="714" addr="0x7f136da34530" />
+                                <attribute name="sym_name" value="setSettingInt" id="715" addr="0x7f136da34530" />
+                                <attribute name="decl" value="f(p.q(const).char,int)." id="716" addr="0x7f136da34530" />
+                                <attribute name="access" value="public" id="717" addr="0x7f136da34530" />
+                                <parmlist id="718" addr="0x7f136da31ff0" >
                                     <parm id="719">
-                                        <attributelist id="720" addr="0x7f0bacb3aff0" >
-                                            <attribute name="name" value="id" id="721" addr="0x7f0bacb3d530" />
-                                            <attribute name="type" value="p.q(const).char" id="722" addr="0x7f0bacb3d530" />
+                                        <attributelist id="720" addr="0x7f136da31ff0" >
+                                            <attribute name="name" value="id" id="721" addr="0x7f136da34530" />
+                                            <attribute name="type" value="p.q(const).char" id="722" addr="0x7f136da34530" />
                                         </attributelist >
                                     </parm >
                                     <parm id="723">
-                                        <attributelist id="724" addr="0x7f0bacb3b110" >
-                                            <attribute name="name" value="value" id="725" addr="0x7f0bacb3d530" />
-                                            <attribute name="type" value="int" id="726" addr="0x7f0bacb3d530" />
+                                        <attributelist id="724" addr="0x7f136da32110" >
+                                            <attribute name="name" value="value" id="725" addr="0x7f136da34530" />
+                                            <attribute name="type" value="int" id="726" addr="0x7f136da34530" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="bool" id="727" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="728" addr="0x7f0bacb3d530" />
+                                <attribute name="type" value="bool" id="727" addr="0x7f136da34530" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="728" addr="0x7f136da34530" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="729" addr="0x7f0bacb3b5f0" >
-                            <attributelist id="730" addr="0x7f0bacb3b5f0" >
-                                <attribute name="name" value="setSettingNumber" id="731" addr="0x7f0bacb3d530" />
-                                <attribute name="ismember" value="1" id="732" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_symtab" value="0x7f0bacb38290" id="733" addr="0x7f0bacb38290" />
-                                <attribute name="kind" value="function" id="734" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_name" value="setSettingNumber" id="735" addr="0x7f0bacb3d530" />
-                                <attribute name="decl" value="f(p.q(const).char,double)." id="736" addr="0x7f0bacb3d530" />
-                                <attribute name="access" value="public" id="737" addr="0x7f0bacb3d530" />
-                                <parmlist id="738" addr="0x7f0bacb3b410" >
+                        <cdecl id="729" addr="0x7f136da325f0" >
+                            <attributelist id="730" addr="0x7f136da325f0" >
+                                <attribute name="name" value="setSettingNumber" id="731" addr="0x7f136da34530" />
+                                <attribute name="ismember" value="1" id="732" addr="0x7f136da34530" />
+                                <attribute name="sym_symtab" value="0x7f136da2f290" id="733" addr="0x7f136da2f290" />
+                                <attribute name="kind" value="function" id="734" addr="0x7f136da34530" />
+                                <attribute name="sym_name" value="setSettingNumber" id="735" addr="0x7f136da34530" />
+                                <attribute name="decl" value="f(p.q(const).char,double)." id="736" addr="0x7f136da34530" />
+                                <attribute name="access" value="public" id="737" addr="0x7f136da34530" />
+                                <parmlist id="738" addr="0x7f136da32410" >
                                     <parm id="739">
-                                        <attributelist id="740" addr="0x7f0bacb3b410" >
-                                            <attribute name="name" value="id" id="741" addr="0x7f0bacb3d530" />
-                                            <attribute name="type" value="p.q(const).char" id="742" addr="0x7f0bacb3d530" />
+                                        <attributelist id="740" addr="0x7f136da32410" >
+                                            <attribute name="name" value="id" id="741" addr="0x7f136da34530" />
+                                            <attribute name="type" value="p.q(const).char" id="742" addr="0x7f136da34530" />
                                         </attributelist >
                                     </parm >
                                     <parm id="743">
-                                        <attributelist id="744" addr="0x7f0bacb3b530" >
-                                            <attribute name="name" value="value" id="745" addr="0x7f0bacb3d530" />
-                                            <attribute name="type" value="double" id="746" addr="0x7f0bacb3d530" />
+                                        <attributelist id="744" addr="0x7f136da32530" >
+                                            <attribute name="name" value="value" id="745" addr="0x7f136da34530" />
+                                            <attribute name="type" value="double" id="746" addr="0x7f136da34530" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="bool" id="747" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="748" addr="0x7f0bacb3d530" />
+                                <attribute name="type" value="bool" id="747" addr="0x7f136da34530" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="748" addr="0x7f136da34530" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="749" addr="0x7f0bacb3ba30" >
-                            <attributelist id="750" addr="0x7f0bacb3ba30" >
-                                <attribute name="name" value="setSettingString" id="751" addr="0x7f0bacb3d530" />
-                                <attribute name="ismember" value="1" id="752" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_symtab" value="0x7f0bacb38290" id="753" addr="0x7f0bacb38290" />
-                                <attribute name="kind" value="function" id="754" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_name" value="setSettingString" id="755" addr="0x7f0bacb3d530" />
-                                <attribute name="decl" value="f(p.q(const).char,r.q(const).XBMCAddon::String)." id="756" addr="0x7f0bacb3d530" />
-                                <attribute name="access" value="public" id="757" addr="0x7f0bacb3d530" />
-                                <parmlist id="758" addr="0x7f0bacb3b830" >
+                        <cdecl id="749" addr="0x7f136da32a30" >
+                            <attributelist id="750" addr="0x7f136da32a30" >
+                                <attribute name="name" value="setSettingString" id="751" addr="0x7f136da34530" />
+                                <attribute name="ismember" value="1" id="752" addr="0x7f136da34530" />
+                                <attribute name="sym_symtab" value="0x7f136da2f290" id="753" addr="0x7f136da2f290" />
+                                <attribute name="kind" value="function" id="754" addr="0x7f136da34530" />
+                                <attribute name="sym_name" value="setSettingString" id="755" addr="0x7f136da34530" />
+                                <attribute name="decl" value="f(p.q(const).char,r.q(const).XBMCAddon::String)." id="756" addr="0x7f136da34530" />
+                                <attribute name="access" value="public" id="757" addr="0x7f136da34530" />
+                                <parmlist id="758" addr="0x7f136da32830" >
                                     <parm id="759">
-                                        <attributelist id="760" addr="0x7f0bacb3b830" >
-                                            <attribute name="name" value="id" id="761" addr="0x7f0bacb3d530" />
-                                            <attribute name="type" value="p.q(const).char" id="762" addr="0x7f0bacb3d530" />
+                                        <attributelist id="760" addr="0x7f136da32830" >
+                                            <attribute name="name" value="id" id="761" addr="0x7f136da34530" />
+                                            <attribute name="type" value="p.q(const).char" id="762" addr="0x7f136da34530" />
                                         </attributelist >
                                     </parm >
                                     <parm id="763">
-                                        <attributelist id="764" addr="0x7f0bacb3b970" >
-                                            <attribute name="name" value="value" id="765" addr="0x7f0bacb3d530" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="766" addr="0x7f0bacb3d530" />
+                                        <attributelist id="764" addr="0x7f136da32970" >
+                                            <attribute name="name" value="value" id="765" addr="0x7f136da34530" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="766" addr="0x7f136da34530" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="bool" id="767" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="768" addr="0x7f0bacb3d530" />
+                                <attribute name="type" value="bool" id="767" addr="0x7f136da34530" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="768" addr="0x7f136da34530" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="769" addr="0x7f0bacb3bbf0" >
-                            <attributelist id="770" addr="0x7f0bacb3bbf0" >
-                                <attribute name="ismember" value="1" id="771" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_name" value="openSettings" id="772" addr="0x7f0bacb3d530" />
-                                <attribute name="name" value="openSettings" id="773" addr="0x7f0bacb3d530" />
-                                <attribute name="decl" value="f()." id="774" addr="0x7f0bacb3d530" />
-                                <attribute name="access" value="public" id="775" addr="0x7f0bacb3d530" />
-                                <attribute name="kind" value="function" id="776" addr="0x7f0bacb3d530" />
-                                <attribute name="type" value="void" id="777" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_symtab" value="0x7f0bacb38290" id="778" addr="0x7f0bacb38290" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="779" addr="0x7f0bacb3d530" />
+                        <cdecl id="769" addr="0x7f136da32bf0" >
+                            <attributelist id="770" addr="0x7f136da32bf0" >
+                                <attribute name="ismember" value="1" id="771" addr="0x7f136da34530" />
+                                <attribute name="sym_name" value="openSettings" id="772" addr="0x7f136da34530" />
+                                <attribute name="name" value="openSettings" id="773" addr="0x7f136da34530" />
+                                <attribute name="decl" value="f()." id="774" addr="0x7f136da34530" />
+                                <attribute name="access" value="public" id="775" addr="0x7f136da34530" />
+                                <attribute name="kind" value="function" id="776" addr="0x7f136da34530" />
+                                <attribute name="type" value="void" id="777" addr="0x7f136da34530" />
+                                <attribute name="sym_symtab" value="0x7f136da2f290" id="778" addr="0x7f136da2f290" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="779" addr="0x7f136da34530" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="780" addr="0x7f0bacb3bf10" >
-                            <attributelist id="781" addr="0x7f0bacb3bf10" >
-                                <attribute name="ismember" value="1" id="782" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_name" value="getAddonInfo" id="783" addr="0x7f0bacb3d530" />
-                                <attribute name="name" value="getAddonInfo" id="784" addr="0x7f0bacb3d530" />
-                                <attribute name="decl" value="f(p.q(const).char)." id="785" addr="0x7f0bacb3d530" />
-                                <parmlist id="786" addr="0x7f0bacb3be50" >
+                        <cdecl id="780" addr="0x7f136da32f10" >
+                            <attributelist id="781" addr="0x7f136da32f10" >
+                                <attribute name="ismember" value="1" id="782" addr="0x7f136da34530" />
+                                <attribute name="sym_name" value="getAddonInfo" id="783" addr="0x7f136da34530" />
+                                <attribute name="name" value="getAddonInfo" id="784" addr="0x7f136da34530" />
+                                <attribute name="decl" value="f(p.q(const).char)." id="785" addr="0x7f136da34530" />
+                                <parmlist id="786" addr="0x7f136da32e50" >
                                     <parm id="787">
-                                        <attributelist id="788" addr="0x7f0bacb3be50" >
-                                            <attribute name="name" value="id" id="789" addr="0x7f0bacb3d530" />
-                                            <attribute name="type" value="p.q(const).char" id="790" addr="0x7f0bacb3d530" />
+                                        <attributelist id="788" addr="0x7f136da32e50" >
+                                            <attribute name="name" value="id" id="789" addr="0x7f136da34530" />
+                                            <attribute name="type" value="p.q(const).char" id="790" addr="0x7f136da34530" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="access" value="public" id="791" addr="0x7f0bacb3d530" />
-                                <attribute name="kind" value="function" id="792" addr="0x7f0bacb3d530" />
-                                <attribute name="type" value="XBMCAddon::String" id="793" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_symtab" value="0x7f0bacb38290" id="794" addr="0x7f0bacb38290" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="795" addr="0x7f0bacb3d530" />
+                                <attribute name="access" value="public" id="791" addr="0x7f136da34530" />
+                                <attribute name="kind" value="function" id="792" addr="0x7f136da34530" />
+                                <attribute name="type" value="XBMCAddon::String" id="793" addr="0x7f136da34530" />
+                                <attribute name="sym_symtab" value="0x7f136da2f290" id="794" addr="0x7f136da2f290" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="795" addr="0x7f136da34530" />
                             </attributelist >
                          
                         </cdecl >
diff --git a/srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmcdrm.i.cpp b/srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmcdrm.i.cpp
similarity index 99%
rename from srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmcdrm.i.cpp
rename to srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmcdrm.i.cpp
index a541b837809..096ebdfda78 100644
--- a/srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmcdrm.i.cpp
+++ b/srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmcdrm.i.cpp
@@ -1061,7 +1061,7 @@ namespace PythonBindings
 
    // constants
    PyModule_AddStringConstant(module, "__author__", "Team Kodi <http://kodi.tv>");
-   PyModule_AddStringConstant(module, "__date__", "Wed Jun 19 18:36:49 GMT 2019");
+   PyModule_AddStringConstant(module, "__date__", "Sun Sep 01 10:46:53 GMT 2019");
    PyModule_AddStringConstant(module, "__version__", "2.26.0");
    PyModule_AddStringConstant(module, "__credits__", "Team Kodi");
    PyModule_AddStringConstant(module, "__platform__", "ALL");
diff --git a/srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmcdrm.i.xml b/srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmcdrm.i.xml
similarity index 59%
rename from srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmcdrm.i.xml
rename to srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmcdrm.i.xml
index 1ba16b19b41..2683d3c06bf 100644
--- a/srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmcdrm.i.xml
+++ b/srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmcdrm.i.xml
@@ -1,141 +1,141 @@
 <?xml version="1.0" ?> 
-<top id="1" addr="0x7f3904248b30" >
-    <attributelist id="2" addr="0x7f3904248b30" >
-        <attribute name="outfile" value="AddonModuleXbmcdrm.i.xml" id="3" addr="0x7f39042648d0" />
-        <attribute name="name" value="xbmcdrm" id="4" addr="0x7f39042648d0" />
-        <attribute name="module" value="xbmcdrm" id="5" addr="0x7f390425dfd0" />
-        <attribute name="inputfile" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmcdrm.i" id="6" addr="0x7f39042648d0" />
-        <attribute name="classes" value="0x7f390425b590" id="7" addr="0x7f390425b590" />
-        <attribute name="infile" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmcdrm.i" id="8" addr="0x7f39042648d0" />
-        <attribute name="outfile_h" value="AddonModuleXbmcdrm.i.h" id="9" addr="0x7f39042648d0" />
+<top id="1" addr="0x7f6d3685ab30" >
+    <attributelist id="2" addr="0x7f6d3685ab30" >
+        <attribute name="outfile" value="AddonModuleXbmcdrm.i.xml" id="3" addr="0x7f6d368768d0" />
+        <attribute name="name" value="xbmcdrm" id="4" addr="0x7f6d368768d0" />
+        <attribute name="module" value="xbmcdrm" id="5" addr="0x7f6d3686ffd0" />
+        <attribute name="inputfile" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmcdrm.i" id="6" addr="0x7f6d368768d0" />
+        <attribute name="classes" value="0x7f6d3686d590" id="7" addr="0x7f6d3686d590" />
+        <attribute name="infile" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmcdrm.i" id="8" addr="0x7f6d368768d0" />
+        <attribute name="outfile_h" value="AddonModuleXbmcdrm.i.h" id="9" addr="0x7f6d368768d0" />
     </attributelist >
 
-    <include id="10" addr="0x7f3904258ed0" >
-        <attributelist id="11" addr="0x7f3904258ed0" >
-            <attribute name="name" value="/usr/share/swig/3.0.12/swig.swg" id="12" addr="0x7f39042648d0" />
+    <include id="10" addr="0x7f6d3686aed0" >
+        <attributelist id="11" addr="0x7f6d3686aed0" >
+            <attribute name="name" value="/usr/share/swig/3.0.12/swig.swg" id="12" addr="0x7f6d368768d0" />
         </attributelist >
 
-        <include id="13" addr="0x7f3904258f30" >
-            <attributelist id="14" addr="0x7f3904258f30" >
-                <attribute name="name" value="/usr/share/swig/3.0.12/swigwarnings.swg" id="15" addr="0x7f39042648d0" />
+        <include id="13" addr="0x7f6d3686af30" >
+            <attributelist id="14" addr="0x7f6d3686af30" >
+                <attribute name="name" value="/usr/share/swig/3.0.12/swigwarnings.swg" id="15" addr="0x7f6d368768d0" />
             </attributelist >
 
-            <include id="16" addr="0x7f3904259050" >
-                <attributelist id="17" addr="0x7f3904259050" >
-                    <attribute name="name" value="/usr/share/swig/3.0.12/swigwarn.swg" id="18" addr="0x7f39042648d0" />
+            <include id="16" addr="0x7f6d3686b050" >
+                <attributelist id="17" addr="0x7f6d3686b050" >
+                    <attribute name="name" value="/usr/share/swig/3.0.12/swigwarn.swg" id="18" addr="0x7f6d368768d0" />
                 </attributelist >
              
             </include >
         </include >
-        <namespace id="19" addr="0x7f390425b0b0" >
-            <attributelist id="20" addr="0x7f390425b0b0" >
-                <attribute name="sym_name" value="std" id="21" addr="0x7f39042648d0" />
-                <attribute name="name" value="std" id="22" addr="0x7f39042648d0" />
-                <typescope id="23" addr="0x7f3904262ed0" >
-                    <attributelist id="24" addr="0x7f3904262ed0" >
-                        <attribute name="name" value="std" id="25" addr="0x7f39042648d0" />
-                        <typetab id="26" addr="0x7f3904262ef0" >
-                            <attributelist id="27" addr="0x7f3904262ef0" >
-                                <attribute name="initializer_list" value="initializer_list" id="28" addr="0x7f39042648d0" />
+        <namespace id="19" addr="0x7f6d3686d0b0" >
+            <attributelist id="20" addr="0x7f6d3686d0b0" >
+                <attribute name="sym_name" value="std" id="21" addr="0x7f6d368768d0" />
+                <attribute name="name" value="std" id="22" addr="0x7f6d368768d0" />
+                <typescope id="23" addr="0x7f6d36874ed0" >
+                    <attributelist id="24" addr="0x7f6d36874ed0" >
+                        <attribute name="name" value="std" id="25" addr="0x7f6d368768d0" />
+                        <typetab id="26" addr="0x7f6d36874ef0" >
+                            <attributelist id="27" addr="0x7f6d36874ef0" >
+                                <attribute name="initializer_list" value="initializer_list" id="28" addr="0x7f6d368768d0" />
                             </attributelist >
-                            <typetabsitem id="29" addr="0x7f3904263010" >
-                                <attributelist id="30" addr="0x7f3904263010" >
+                            <typetabsitem id="29" addr="0x7f6d36875010" >
+                                <attributelist id="30" addr="0x7f6d36875010" >
                                 </attributelist >
                             </typetabsitem >
                         </typetab >
-                        <attribute name="parent" value="0x7f3904247a30" id="31" addr="0x7f3904247a30" />
-                        <attribute name="qname" value="std" id="32" addr="0x7f39042648d0" />
-                        <attribute name="symtab" value="0x7f390425b010" id="33" addr="0x7f390425b010" />
+                        <attribute name="parent" value="0x7f6d36859a30" id="31" addr="0x7f6d36859a30" />
+                        <attribute name="qname" value="std" id="32" addr="0x7f6d368768d0" />
+                        <attribute name="symtab" value="0x7f6d3686d010" id="33" addr="0x7f6d3686d010" />
                     </attributelist >
-                    <typescopesitem id="34" addr="0x7f390425af70" >
-                        <attributelist id="35" addr="0x7f390425af70" >
+                    <typescopesitem id="34" addr="0x7f6d3686cf70" >
+                        <attributelist id="35" addr="0x7f6d3686cf70" >
                         </attributelist >
                     </typescopesitem >
-                    <typescopesitem id="36" addr="0x7f3904262ef0" >
-                        <attributelist id="37" addr="0x7f3904262ef0" >
-                            <attribute name="initializer_list" value="initializer_list" id="38" addr="0x7f39042648d0" />
+                    <typescopesitem id="36" addr="0x7f6d36874ef0" >
+                        <attributelist id="37" addr="0x7f6d36874ef0" >
+                            <attribute name="initializer_list" value="initializer_list" id="38" addr="0x7f6d368768d0" />
                         </attributelist >
                     </typescopesitem >
-                    <typescopesitem id="39" addr="0x7f3904247a30" >
-                        <attributelist id="40" addr="0x7f3904247a30" >
-                            <attribute name="name" value="" id="41" addr="0x7f39042648d0" />
-                            <typetab id="42" addr="0x7f3904247a90" >
-                                <attributelist id="43" addr="0x7f3904247a90" >
+                    <typescopesitem id="39" addr="0x7f6d36859a30" >
+                        <attributelist id="40" addr="0x7f6d36859a30" >
+                            <attribute name="name" value="" id="41" addr="0x7f6d368768d0" />
+                            <typetab id="42" addr="0x7f6d36859a90" >
+                                <attributelist id="43" addr="0x7f6d36859a90" >
                                 </attributelist >
                             </typetab >
                         </attributelist >
                     </typescopesitem >
-                    <typescopesitem id="44" addr="0x7f3904262f10" >
-                        <attributelist id="45" addr="0x7f3904262f10" >
+                    <typescopesitem id="44" addr="0x7f6d36874f10" >
+                        <attributelist id="45" addr="0x7f6d36874f10" >
                         </attributelist >
                     </typescopesitem >
-                    <typescopesitem id="46" addr="0x7f390425b010" >
-                        <attributelist id="47" addr="0x7f390425b010" >
-                            <attribute name="name" value="std" id="48" addr="0x7f39042648d0" />
-                            <attribute name="csymtab" value="0x7f390425b050" id="49" addr="0x7f390425b050" />
-                            <attribute name="symtab" value="0x7f390425aff0" id="50" addr="0x7f390425aff0" />
+                    <typescopesitem id="46" addr="0x7f6d3686d010" >
+                        <attributelist id="47" addr="0x7f6d3686d010" >
+                            <attribute name="name" value="std" id="48" addr="0x7f6d368768d0" />
+                            <attribute name="csymtab" value="0x7f6d3686d050" id="49" addr="0x7f6d3686d050" />
+                            <attribute name="symtab" value="0x7f6d3686cff0" id="50" addr="0x7f6d3686cff0" />
                         </attributelist >
                     </typescopesitem >
                 </typescope >
-                <attribute name="symtab" value="0x7f390425b010" id="51" addr="0x7f390425b010" />
-                <attribute name="sym_symtab" value="0x7f3904247950" id="52" addr="0x7f3904247950" />
-                <attribute name="sym_overname" value="__SWIG_0" id="53" addr="0x7f39042648d0" />
+                <attribute name="symtab" value="0x7f6d3686d010" id="51" addr="0x7f6d3686d010" />
+                <attribute name="sym_symtab" value="0x7f6d36859950" id="52" addr="0x7f6d36859950" />
+                <attribute name="sym_overname" value="__SWIG_0" id="53" addr="0x7f6d368768d0" />
             </attributelist >
 
-            <template id="54" addr="0x7f390425b230" >
-                <attributelist id="55" addr="0x7f390425b230" >
-                    <attribute name="templatetype" value="class" id="56" addr="0x7f39042648d0" />
-                    <attribute name="sym_typename" value="1" id="57" addr="0x7f39042648d0" />
-                    <attribute name="name" value="initializer_list" id="58" addr="0x7f39042648d0" />
-                    <attribute name="sym_symtab" value="0x7f390425b010" id="59" addr="0x7f390425b010" />
-                    <attribute name="symtab" value="0x7f390425b450" id="60" addr="0x7f390425b450" />
-                    <attribute name="allows_typedef" value="1" id="61" addr="0x7f39042648d0" />
-                    <attribute name="kind" value="class" id="62" addr="0x7f39042648d0" />
-                    <attribute name="sym_name" value="initializer_list" id="63" addr="0x7f39042648d0" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="64" addr="0x7f39042648d0" />
-                    <templateparms id="65" addr="0x7f390425b150" >
+            <template id="54" addr="0x7f6d3686d230" >
+                <attributelist id="55" addr="0x7f6d3686d230" >
+                    <attribute name="templatetype" value="class" id="56" addr="0x7f6d368768d0" />
+                    <attribute name="sym_typename" value="1" id="57" addr="0x7f6d368768d0" />
+                    <attribute name="name" value="initializer_list" id="58" addr="0x7f6d368768d0" />
+                    <attribute name="sym_symtab" value="0x7f6d3686d010" id="59" addr="0x7f6d3686d010" />
+                    <attribute name="symtab" value="0x7f6d3686d450" id="60" addr="0x7f6d3686d450" />
+                    <attribute name="allows_typedef" value="1" id="61" addr="0x7f6d368768d0" />
+                    <attribute name="kind" value="class" id="62" addr="0x7f6d368768d0" />
+                    <attribute name="sym_name" value="initializer_list" id="63" addr="0x7f6d368768d0" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="64" addr="0x7f6d368768d0" />
+                    <templateparms id="65" addr="0x7f6d3686d150" >
                         <parm id="66">
-                            <attributelist id="67" addr="0x7f390425b150" >
-                                <attribute name="name" value="T" id="68" addr="0x7f39042648d0" />
-                                <attribute name="type" value="typename T" id="69" addr="0x7f39042648d0" />
+                            <attributelist id="67" addr="0x7f6d3686d150" >
+                                <attribute name="name" value="T" id="68" addr="0x7f6d368768d0" />
+                                <attribute name="type" value="typename T" id="69" addr="0x7f6d368768d0" />
                             </attributelist >
                         </parm >
                     </templateparms >
                 </attributelist >
 
-                <access id="70" addr="0x7f390425b610" >
-                    <attributelist id="71" addr="0x7f390425b610" >
-                        <attribute name="kind" value="public" id="72" addr="0x7f39042648d0" />
+                <access id="70" addr="0x7f6d3686d610" >
+                    <attributelist id="71" addr="0x7f6d3686d610" >
+                        <attribute name="kind" value="public" id="72" addr="0x7f6d368768d0" />
                     </attributelist >
                  
                 </access >
             </template >
-            <typemap id="73" addr="0x7f390425bc70" >
-                <attributelist id="74" addr="0x7f390425bc70" >
-                    <kwargs id="75" addr="0x7f390425b970" >
-                        <attributelist id="76" addr="0x7f390425b970" >
-                            <attribute name="name" value="warning" id="77" addr="0x7f39042648d0" />
-                            <attribute name="value" value="476:Initialization using std::initializer_list." id="78" addr="0x7f39042648d0" />
+            <typemap id="73" addr="0x7f6d3686dc70" >
+                <attributelist id="74" addr="0x7f6d3686dc70" >
+                    <kwargs id="75" addr="0x7f6d3686d970" >
+                        <attributelist id="76" addr="0x7f6d3686d970" >
+                            <attribute name="name" value="warning" id="77" addr="0x7f6d368768d0" />
+                            <attribute name="value" value="476:Initialization using std::initializer_list." id="78" addr="0x7f6d368768d0" />
                         </attributelist >
-                        <kwargssitem id="79" addr="0x7f390425baf0" >
-                            <attributelist id="80" addr="0x7f390425baf0" >
+                        <kwargssitem id="79" addr="0x7f6d3686daf0" >
+                            <attributelist id="80" addr="0x7f6d3686daf0" >
                             </attributelist >
                         </kwargssitem >
-                        <kwargssitem id="81" addr="0x7f390425b950" >
-                            <attributelist id="82" addr="0x7f390425b950" >
+                        <kwargssitem id="81" addr="0x7f6d3686d950" >
+                            <attributelist id="82" addr="0x7f6d3686d950" >
                             </attributelist >
                         </kwargssitem >
                     </kwargs >
-                    <attribute name="code" value="" id="83" addr="0x7f39042648d0" />
-                    <attribute name="method" value="in" id="84" addr="0x7f39042648d0" />
+                    <attribute name="code" value="" id="83" addr="0x7f6d368768d0" />
+                    <attribute name="method" value="in" id="84" addr="0x7f6d368768d0" />
                 </attributelist >
 
-                <typemapitem id="85" addr="0x7f390425bb90" >
-                    <attributelist id="86" addr="0x7f390425bb90" >
-                        <parmlist id="87" addr="0x7f390425bbd0" >
+                <typemapitem id="85" addr="0x7f6d3686db90" >
+                    <attributelist id="86" addr="0x7f6d3686db90" >
+                        <parmlist id="87" addr="0x7f6d3686dbd0" >
                             <parm id="88">
-                                <attributelist id="89" addr="0x7f390425bbd0" >
-                                    <attribute name="type" value="std::initializer_list&lt;(T)>" id="90" addr="0x7f39042648d0" />
+                                <attributelist id="89" addr="0x7f6d3686dbd0" >
+                                    <attribute name="type" value="std::initializer_list&lt;(T)>" id="90" addr="0x7f6d368768d0" />
                                 </attributelist >
                             </parm >
                         </parmlist >
@@ -143,32 +143,32 @@
                  
                 </typemapitem >
             </typemap >
-            <typemap id="91" addr="0x7f390425bff0" >
-                <attributelist id="92" addr="0x7f390425bff0" >
-                    <kwargs id="93" addr="0x7f390425bd90" >
-                        <attributelist id="94" addr="0x7f390425bd90" >
-                            <attribute name="name" value="precedence" id="95" addr="0x7f39042648d0" />
-                            <attribute name="value" value="0" id="96" addr="0x7f39042648d0" />
+            <typemap id="91" addr="0x7f6d3686dff0" >
+                <attributelist id="92" addr="0x7f6d3686dff0" >
+                    <kwargs id="93" addr="0x7f6d3686dd90" >
+                        <attributelist id="94" addr="0x7f6d3686dd90" >
+                            <attribute name="name" value="precedence" id="95" addr="0x7f6d368768d0" />
+                            <attribute name="value" value="0" id="96" addr="0x7f6d368768d0" />
                         </attributelist >
-                        <kwargssitem id="97" addr="0x7f390425bdb0" >
-                            <attributelist id="98" addr="0x7f390425bdb0" >
+                        <kwargssitem id="97" addr="0x7f6d3686ddb0" >
+                            <attributelist id="98" addr="0x7f6d3686ddb0" >
                             </attributelist >
                         </kwargssitem >
-                        <kwargssitem id="99" addr="0x7f390425bdd0" >
-                            <attributelist id="100" addr="0x7f390425bdd0" >
+                        <kwargssitem id="99" addr="0x7f6d3686ddd0" >
+                            <attributelist id="100" addr="0x7f6d3686ddd0" >
                             </attributelist >
                         </kwargssitem >
                     </kwargs >
-                    <attribute name="code" value="" id="101" addr="0x7f39042648d0" />
-                    <attribute name="method" value="typecheck" id="102" addr="0x7f39042648d0" />
+                    <attribute name="code" value="" id="101" addr="0x7f6d368768d0" />
+                    <attribute name="method" value="typecheck" id="102" addr="0x7f6d368768d0" />
                 </attributelist >
 
-                <typemapitem id="103" addr="0x7f390425bf30" >
-                    <attributelist id="104" addr="0x7f390425bf30" >
-                        <parmlist id="105" addr="0x7f390425bf70" >
+                <typemapitem id="103" addr="0x7f6d3686df30" >
+                    <attributelist id="104" addr="0x7f6d3686df30" >
+                        <parmlist id="105" addr="0x7f6d3686df70" >
                             <parm id="106">
-                                <attributelist id="107" addr="0x7f390425bf70" >
-                                    <attribute name="type" value="std::initializer_list&lt;(T)>" id="108" addr="0x7f39042648d0" />
+                                <attributelist id="107" addr="0x7f6d3686df70" >
+                                    <attribute name="type" value="std::initializer_list&lt;(T)>" id="108" addr="0x7f6d368768d0" />
                                 </attributelist >
                             </parm >
                         </parmlist >
@@ -177,18 +177,18 @@
                 </typemapitem >
             </typemap >
         </namespace >
-        <typemap id="109" addr="0x7f390425c210" >
-            <attributelist id="110" addr="0x7f390425c210" >
-                <attribute name="code" value="delete [] $1;" id="111" addr="0x7f39042648d0" />
-                <attribute name="method" value="newfree" id="112" addr="0x7f39042648d0" />
+        <typemap id="109" addr="0x7f6d3686e210" >
+            <attributelist id="110" addr="0x7f6d3686e210" >
+                <attribute name="code" value="delete [] $1;" id="111" addr="0x7f6d368768d0" />
+                <attribute name="method" value="newfree" id="112" addr="0x7f6d368768d0" />
             </attributelist >
 
-            <typemapitem id="113" addr="0x7f390425c130" >
-                <attributelist id="114" addr="0x7f390425c130" >
-                    <parmlist id="115" addr="0x7f390425c170" >
+            <typemapitem id="113" addr="0x7f6d3686e130" >
+                <attributelist id="114" addr="0x7f6d3686e130" >
+                    <parmlist id="115" addr="0x7f6d3686e170" >
                         <parm id="116">
-                            <attributelist id="117" addr="0x7f390425c170" >
-                                <attribute name="type" value="p.char" id="118" addr="0x7f39042648d0" />
+                            <attributelist id="117" addr="0x7f6d3686e170" >
+                                <attribute name="type" value="p.char" id="118" addr="0x7f6d368768d0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -196,18 +196,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="119" addr="0x7f390425c3f0" >
-            <attributelist id="120" addr="0x7f390425c3f0" >
-                <attribute name="code" value="{&#10;  delete [] $1;&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="121" addr="0x7f39042648d0" />
-                <attribute name="method" value="memberin" id="122" addr="0x7f39042648d0" />
+        <typemap id="119" addr="0x7f6d3686e3f0" >
+            <attributelist id="120" addr="0x7f6d3686e3f0" >
+                <attribute name="code" value="{&#10;  delete [] $1;&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="121" addr="0x7f6d368768d0" />
+                <attribute name="method" value="memberin" id="122" addr="0x7f6d368768d0" />
             </attributelist >
 
-            <typemapitem id="123" addr="0x7f390425c330" >
-                <attributelist id="124" addr="0x7f390425c330" >
-                    <parmlist id="125" addr="0x7f390425c370" >
+            <typemapitem id="123" addr="0x7f6d3686e330" >
+                <attributelist id="124" addr="0x7f6d3686e330" >
+                    <parmlist id="125" addr="0x7f6d3686e370" >
                         <parm id="126">
-                            <attributelist id="127" addr="0x7f390425c370" >
-                                <attribute name="type" value="p.char" id="128" addr="0x7f39042648d0" />
+                            <attributelist id="127" addr="0x7f6d3686e370" >
+                                <attribute name="type" value="p.char" id="128" addr="0x7f6d368768d0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -215,32 +215,32 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="129" addr="0x7f390425c650" >
-            <attributelist id="130" addr="0x7f390425c650" >
-                <kwargs id="131" addr="0x7f390425c490" >
-                    <attributelist id="132" addr="0x7f390425c490" >
-                        <attribute name="name" value="warning" id="133" addr="0x7f39042648d0" />
-                        <attribute name="value" value="451:Setting a const char * variable may leak memory." id="134" addr="0x7f39042648d0" />
+        <typemap id="129" addr="0x7f6d3686e650" >
+            <attributelist id="130" addr="0x7f6d3686e650" >
+                <kwargs id="131" addr="0x7f6d3686e490" >
+                    <attributelist id="132" addr="0x7f6d3686e490" >
+                        <attribute name="name" value="warning" id="133" addr="0x7f6d368768d0" />
+                        <attribute name="value" value="451:Setting a const char * variable may leak memory." id="134" addr="0x7f6d368768d0" />
                     </attributelist >
-                    <kwargssitem id="135" addr="0x7f390425c4b0" >
-                        <attributelist id="136" addr="0x7f390425c4b0" >
+                    <kwargssitem id="135" addr="0x7f6d3686e4b0" >
+                        <attributelist id="136" addr="0x7f6d3686e4b0" >
                         </attributelist >
                     </kwargssitem >
-                    <kwargssitem id="137" addr="0x7f390425c470" >
-                        <attributelist id="138" addr="0x7f390425c470" >
+                    <kwargssitem id="137" addr="0x7f6d3686e470" >
+                        <attributelist id="138" addr="0x7f6d3686e470" >
                         </attributelist >
                     </kwargssitem >
                 </kwargs >
-                <attribute name="code" value="{&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="139" addr="0x7f39042648d0" />
-                <attribute name="method" value="memberin" id="140" addr="0x7f39042648d0" />
+                <attribute name="code" value="{&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="139" addr="0x7f6d368768d0" />
+                <attribute name="method" value="memberin" id="140" addr="0x7f6d368768d0" />
             </attributelist >
 
-            <typemapitem id="141" addr="0x7f390425c590" >
-                <attributelist id="142" addr="0x7f390425c590" >
-                    <parmlist id="143" addr="0x7f390425c5d0" >
+            <typemapitem id="141" addr="0x7f6d3686e590" >
+                <attributelist id="142" addr="0x7f6d3686e590" >
+                    <parmlist id="143" addr="0x7f6d3686e5d0" >
                         <parm id="144">
-                            <attributelist id="145" addr="0x7f390425c5d0" >
-                                <attribute name="type" value="p.q(const).char" id="146" addr="0x7f39042648d0" />
+                            <attributelist id="145" addr="0x7f6d3686e5d0" >
+                                <attribute name="type" value="p.q(const).char" id="146" addr="0x7f6d368768d0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -248,18 +248,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="147" addr="0x7f390425c830" >
-            <attributelist id="148" addr="0x7f390425c830" >
-                <attribute name="code" value="{&#10;  delete [] $1;&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="149" addr="0x7f39042648d0" />
-                <attribute name="method" value="globalin" id="150" addr="0x7f39042648d0" />
+        <typemap id="147" addr="0x7f6d3686e830" >
+            <attributelist id="148" addr="0x7f6d3686e830" >
+                <attribute name="code" value="{&#10;  delete [] $1;&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="149" addr="0x7f6d368768d0" />
+                <attribute name="method" value="globalin" id="150" addr="0x7f6d368768d0" />
             </attributelist >
 
-            <typemapitem id="151" addr="0x7f390425c770" >
-                <attributelist id="152" addr="0x7f390425c770" >
-                    <parmlist id="153" addr="0x7f390425c7b0" >
+            <typemapitem id="151" addr="0x7f6d3686e770" >
+                <attributelist id="152" addr="0x7f6d3686e770" >
+                    <parmlist id="153" addr="0x7f6d3686e7b0" >
                         <parm id="154">
-                            <attributelist id="155" addr="0x7f390425c7b0" >
-                                <attribute name="type" value="p.char" id="156" addr="0x7f39042648d0" />
+                            <attributelist id="155" addr="0x7f6d3686e7b0" >
+                                <attribute name="type" value="p.char" id="156" addr="0x7f6d368768d0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -267,32 +267,32 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="157" addr="0x7f390425ca90" >
-            <attributelist id="158" addr="0x7f390425ca90" >
-                <kwargs id="159" addr="0x7f390425c8d0" >
-                    <attributelist id="160" addr="0x7f390425c8d0" >
-                        <attribute name="name" value="warning" id="161" addr="0x7f39042648d0" />
-                        <attribute name="value" value="451:Setting a const char * variable may leak memory." id="162" addr="0x7f39042648d0" />
+        <typemap id="157" addr="0x7f6d3686ea90" >
+            <attributelist id="158" addr="0x7f6d3686ea90" >
+                <kwargs id="159" addr="0x7f6d3686e8d0" >
+                    <attributelist id="160" addr="0x7f6d3686e8d0" >
+                        <attribute name="name" value="warning" id="161" addr="0x7f6d368768d0" />
+                        <attribute name="value" value="451:Setting a const char * variable may leak memory." id="162" addr="0x7f6d368768d0" />
                     </attributelist >
-                    <kwargssitem id="163" addr="0x7f390425c8f0" >
-                        <attributelist id="164" addr="0x7f390425c8f0" >
+                    <kwargssitem id="163" addr="0x7f6d3686e8f0" >
+                        <attributelist id="164" addr="0x7f6d3686e8f0" >
                         </attributelist >
                     </kwargssitem >
-                    <kwargssitem id="165" addr="0x7f390425c8b0" >
-                        <attributelist id="166" addr="0x7f390425c8b0" >
+                    <kwargssitem id="165" addr="0x7f6d3686e8b0" >
+                        <attributelist id="166" addr="0x7f6d3686e8b0" >
                         </attributelist >
                     </kwargssitem >
                 </kwargs >
-                <attribute name="code" value="{&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="167" addr="0x7f39042648d0" />
-                <attribute name="method" value="globalin" id="168" addr="0x7f39042648d0" />
+                <attribute name="code" value="{&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="167" addr="0x7f6d368768d0" />
+                <attribute name="method" value="globalin" id="168" addr="0x7f6d368768d0" />
             </attributelist >
 
-            <typemapitem id="169" addr="0x7f390425c9d0" >
-                <attributelist id="170" addr="0x7f390425c9d0" >
-                    <parmlist id="171" addr="0x7f390425ca10" >
+            <typemapitem id="169" addr="0x7f6d3686e9d0" >
+                <attributelist id="170" addr="0x7f6d3686e9d0" >
+                    <parmlist id="171" addr="0x7f6d3686ea10" >
                         <parm id="172">
-                            <attributelist id="173" addr="0x7f390425ca10" >
-                                <attribute name="type" value="p.q(const).char" id="174" addr="0x7f39042648d0" />
+                            <attributelist id="173" addr="0x7f6d3686ea10" >
+                                <attribute name="type" value="p.q(const).char" id="174" addr="0x7f6d368768d0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -300,18 +300,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="175" addr="0x7f390425ccb0" >
-            <attributelist id="176" addr="0x7f390425ccb0" >
-                <attribute name="code" value="{&#10;  if($input) {&#10;    strncpy((char*)$1, (const char *)$input, $1_dim0-1);&#10;    $1[$1_dim0-1] = 0;&#10;  } else {&#10;    $1[0] = 0;&#10;  }&#10;}" id="177" addr="0x7f39042648d0" />
-                <attribute name="method" value="memberin" id="178" addr="0x7f39042648d0" />
+        <typemap id="175" addr="0x7f6d3686ecb0" >
+            <attributelist id="176" addr="0x7f6d3686ecb0" >
+                <attribute name="code" value="{&#10;  if($input) {&#10;    strncpy((char*)$1, (const char *)$input, $1_dim0-1);&#10;    $1[$1_dim0-1] = 0;&#10;  } else {&#10;    $1[0] = 0;&#10;  }&#10;}" id="177" addr="0x7f6d368768d0" />
+                <attribute name="method" value="memberin" id="178" addr="0x7f6d368768d0" />
             </attributelist >
 
-            <typemapitem id="179" addr="0x7f390425cbf0" >
-                <attributelist id="180" addr="0x7f390425cbf0" >
-                    <parmlist id="181" addr="0x7f390425cc30" >
+            <typemapitem id="179" addr="0x7f6d3686ebf0" >
+                <attributelist id="180" addr="0x7f6d3686ebf0" >
+                    <parmlist id="181" addr="0x7f6d3686ec30" >
                         <parm id="182">
-                            <attributelist id="183" addr="0x7f390425cc30" >
-                                <attribute name="type" value="a(ANY).char" id="184" addr="0x7f39042648d0" />
+                            <attributelist id="183" addr="0x7f6d3686ec30" >
+                                <attribute name="type" value="a(ANY).char" id="184" addr="0x7f6d368768d0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -319,18 +319,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="185" addr="0x7f390425ced0" >
-            <attributelist id="186" addr="0x7f390425ced0" >
-                <attribute name="code" value="{&#10;  if($input) {&#10;    strncpy((char*)$1, (const char *)$input, $1_dim0-1);&#10;    $1[$1_dim0-1] = 0;&#10;  } else {&#10;    $1[0] = 0;&#10;  }&#10;}" id="187" addr="0x7f39042648d0" />
-                <attribute name="method" value="globalin" id="188" addr="0x7f39042648d0" />
+        <typemap id="185" addr="0x7f6d3686eed0" >
+            <attributelist id="186" addr="0x7f6d3686eed0" >
+                <attribute name="code" value="{&#10;  if($input) {&#10;    strncpy((char*)$1, (const char *)$input, $1_dim0-1);&#10;    $1[$1_dim0-1] = 0;&#10;  } else {&#10;    $1[0] = 0;&#10;  }&#10;}" id="187" addr="0x7f6d368768d0" />
+                <attribute name="method" value="globalin" id="188" addr="0x7f6d368768d0" />
             </attributelist >
 
-            <typemapitem id="189" addr="0x7f390425ce10" >
-                <attributelist id="190" addr="0x7f390425ce10" >
-                    <parmlist id="191" addr="0x7f390425ce50" >
+            <typemapitem id="189" addr="0x7f6d3686ee10" >
+                <attributelist id="190" addr="0x7f6d3686ee10" >
+                    <parmlist id="191" addr="0x7f6d3686ee50" >
                         <parm id="192">
-                            <attributelist id="193" addr="0x7f390425ce50" >
-                                <attribute name="type" value="a(ANY).char" id="194" addr="0x7f39042648d0" />
+                            <attributelist id="193" addr="0x7f6d3686ee50" >
+                                <attribute name="type" value="a(ANY).char" id="194" addr="0x7f6d368768d0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -338,18 +338,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="195" addr="0x7f390425d0b0" >
-            <attributelist id="196" addr="0x7f390425d0b0" >
-                <attribute name="code" value="{&#10;  if ($input) strcpy((char *)$1, (const char *)$input);&#10;  else $1[0] = 0;&#10;}" id="197" addr="0x7f39042648d0" />
-                <attribute name="method" value="memberin" id="198" addr="0x7f39042648d0" />
+        <typemap id="195" addr="0x7f6d3686f0b0" >
+            <attributelist id="196" addr="0x7f6d3686f0b0" >
+                <attribute name="code" value="{&#10;  if ($input) strcpy((char *)$1, (const char *)$input);&#10;  else $1[0] = 0;&#10;}" id="197" addr="0x7f6d368768d0" />
+                <attribute name="method" value="memberin" id="198" addr="0x7f6d368768d0" />
             </attributelist >
 
-            <typemapitem id="199" addr="0x7f390425cff0" >
-                <attributelist id="200" addr="0x7f390425cff0" >
-                    <parmlist id="201" addr="0x7f390425d030" >
+            <typemapitem id="199" addr="0x7f6d3686eff0" >
+                <attributelist id="200" addr="0x7f6d3686eff0" >
+                    <parmlist id="201" addr="0x7f6d3686f030" >
                         <parm id="202">
-                            <attributelist id="203" addr="0x7f390425d030" >
-                                <attribute name="type" value="a().char" id="204" addr="0x7f39042648d0" />
+                            <attributelist id="203" addr="0x7f6d3686f030" >
+                                <attribute name="type" value="a().char" id="204" addr="0x7f6d368768d0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -357,18 +357,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="205" addr="0x7f390425d290" >
-            <attributelist id="206" addr="0x7f390425d290" >
-                <attribute name="code" value="{&#10;  if ($input) strcpy((char *)$1, (const char *)$input);&#10;  else $1[0] = 0;&#10;}" id="207" addr="0x7f39042648d0" />
-                <attribute name="method" value="globalin" id="208" addr="0x7f39042648d0" />
+        <typemap id="205" addr="0x7f6d3686f290" >
+            <attributelist id="206" addr="0x7f6d3686f290" >
+                <attribute name="code" value="{&#10;  if ($input) strcpy((char *)$1, (const char *)$input);&#10;  else $1[0] = 0;&#10;}" id="207" addr="0x7f6d368768d0" />
+                <attribute name="method" value="globalin" id="208" addr="0x7f6d368768d0" />
             </attributelist >
 
-            <typemapitem id="209" addr="0x7f390425d1d0" >
-                <attributelist id="210" addr="0x7f390425d1d0" >
-                    <parmlist id="211" addr="0x7f390425d210" >
+            <typemapitem id="209" addr="0x7f6d3686f1d0" >
+                <attributelist id="210" addr="0x7f6d3686f1d0" >
+                    <parmlist id="211" addr="0x7f6d3686f210" >
                         <parm id="212">
-                            <attributelist id="213" addr="0x7f390425d210" >
-                                <attribute name="type" value="a().char" id="214" addr="0x7f39042648d0" />
+                            <attributelist id="213" addr="0x7f6d3686f210" >
+                                <attribute name="type" value="a().char" id="214" addr="0x7f6d368768d0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -376,18 +376,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="215" addr="0x7f390425d4b0" >
-            <attributelist id="216" addr="0x7f390425d4b0" >
-                <attribute name="code" value="{&#10;  size_t ii;&#10;  $1_basetype *b = ($1_basetype *) $1;&#10;  for (ii = 0; ii &lt; (size_t)$1_size; ii++) b[ii] = *(($1_basetype *) $input + ii);&#10;}" id="217" addr="0x7f39042648d0" />
-                <attribute name="method" value="memberin" id="218" addr="0x7f39042648d0" />
+        <typemap id="215" addr="0x7f6d3686f4b0" >
+            <attributelist id="216" addr="0x7f6d3686f4b0" >
+                <attribute name="code" value="{&#10;  size_t ii;&#10;  $1_basetype *b = ($1_basetype *) $1;&#10;  for (ii = 0; ii &lt; (size_t)$1_size; ii++) b[ii] = *(($1_basetype *) $input + ii);&#10;}" id="217" addr="0x7f6d368768d0" />
+                <attribute name="method" value="memberin" id="218" addr="0x7f6d368768d0" />
             </attributelist >
 
-            <typemapitem id="219" addr="0x7f390425d3f0" >
-                <attributelist id="220" addr="0x7f390425d3f0" >
-                    <parmlist id="221" addr="0x7f390425d430" >
+            <typemapitem id="219" addr="0x7f6d3686f3f0" >
+                <attributelist id="220" addr="0x7f6d3686f3f0" >
+                    <parmlist id="221" addr="0x7f6d3686f430" >
                         <parm id="222">
-                            <attributelist id="223" addr="0x7f390425d430" >
-                                <attribute name="type" value="a(ANY).SWIGTYPE" id="224" addr="0x7f39042648d0" />
+                            <attributelist id="223" addr="0x7f6d3686f430" >
+                                <attribute name="type" value="a(ANY).SWIGTYPE" id="224" addr="0x7f6d368768d0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -395,18 +395,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="225" addr="0x7f390425d6d0" >
-            <attributelist id="226" addr="0x7f390425d6d0" >
-                <attribute name="code" value="{&#10;  size_t ii;&#10;  $1_basetype *b = ($1_basetype *) $1;&#10;  for (ii = 0; ii &lt; (size_t)$1_size; ii++) b[ii] = *(($1_basetype *) $input + ii);&#10;}" id="227" addr="0x7f39042648d0" />
-                <attribute name="method" value="globalin" id="228" addr="0x7f39042648d0" />
+        <typemap id="225" addr="0x7f6d3686f6d0" >
+            <attributelist id="226" addr="0x7f6d3686f6d0" >
+                <attribute name="code" value="{&#10;  size_t ii;&#10;  $1_basetype *b = ($1_basetype *) $1;&#10;  for (ii = 0; ii &lt; (size_t)$1_size; ii++) b[ii] = *(($1_basetype *) $input + ii);&#10;}" id="227" addr="0x7f6d368768d0" />
+                <attribute name="method" value="globalin" id="228" addr="0x7f6d368768d0" />
             </attributelist >
 
-            <typemapitem id="229" addr="0x7f390425d610" >
-                <attributelist id="230" addr="0x7f390425d610" >
-                    <parmlist id="231" addr="0x7f390425d650" >
+            <typemapitem id="229" addr="0x7f6d3686f610" >
+                <attributelist id="230" addr="0x7f6d3686f610" >
+                    <parmlist id="231" addr="0x7f6d3686f650" >
                         <parm id="232">
-                            <attributelist id="233" addr="0x7f390425d650" >
-                                <attribute name="type" value="a(ANY).SWIGTYPE" id="234" addr="0x7f39042648d0" />
+                            <attributelist id="233" addr="0x7f6d3686f650" >
+                                <attribute name="type" value="a(ANY).SWIGTYPE" id="234" addr="0x7f6d368768d0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -414,18 +414,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="235" addr="0x7f390425d930" >
-            <attributelist id="236" addr="0x7f390425d930" >
-                <attribute name="code" value="{&#10;  $basetype (*inp)[$1_dim1] = ($basetype (*)[$1_dim1])($input);&#10;  $basetype (*dest)[$1_dim1] = ($basetype (*)[$1_dim1])($1);&#10;  size_t ii = 0;&#10;  for (; ii &lt; $1_dim0; ++ii) {&#10;    $basetype *ip = inp[ii];&#10;    $basetype *dp = dest[ii];&#10;    size_t jj = 0;&#10;    for (; jj &lt; $1_dim1; ++jj) dp[jj] = ip[jj];&#10;  }&#10;}" id="237" addr="0x7f39042648d0" />
-                <attribute name="method" value="memberin" id="238" addr="0x7f39042648d0" />
+        <typemap id="235" addr="0x7f6d3686f930" >
+            <attributelist id="236" addr="0x7f6d3686f930" >
+                <attribute name="code" value="{&#10;  $basetype (*inp)[$1_dim1] = ($basetype (*)[$1_dim1])($input);&#10;  $basetype (*dest)[$1_dim1] = ($basetype (*)[$1_dim1])($1);&#10;  size_t ii = 0;&#10;  for (; ii &lt; $1_dim0; ++ii) {&#10;    $basetype *ip = inp[ii];&#10;    $basetype *dp = dest[ii];&#10;    size_t jj = 0;&#10;    for (; jj &lt; $1_dim1; ++jj) dp[jj] = ip[jj];&#10;  }&#10;}" id="237" addr="0x7f6d368768d0" />
+                <attribute name="method" value="memberin" id="238" addr="0x7f6d368768d0" />
             </attributelist >
 
-            <typemapitem id="239" addr="0x7f390425d810" >
-                <attributelist id="240" addr="0x7f390425d810" >
-                    <parmlist id="241" addr="0x7f390425d8b0" >
+            <typemapitem id="239" addr="0x7f6d3686f810" >
+                <attributelist id="240" addr="0x7f6d3686f810" >
+                    <parmlist id="241" addr="0x7f6d3686f8b0" >
                         <parm id="242">
-                            <attributelist id="243" addr="0x7f390425d8b0" >
-                                <attribute name="type" value="a(ANY).a(ANY).SWIGTYPE" id="244" addr="0x7f39042648d0" />
+                            <attributelist id="243" addr="0x7f6d3686f8b0" >
+                                <attribute name="type" value="a(ANY).a(ANY).SWIGTYPE" id="244" addr="0x7f6d368768d0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -433,18 +433,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="245" addr="0x7f390425db90" >
-            <attributelist id="246" addr="0x7f390425db90" >
-                <attribute name="code" value="{&#10;  $basetype (*inp)[$1_dim1] = ($basetype (*)[$1_dim1])($input);&#10;  $basetype (*dest)[$1_dim1] = ($basetype (*)[$1_dim1])($1);&#10;  size_t ii = 0;&#10;  for (; ii &lt; $1_dim0; ++ii) {&#10;    $basetype *ip = inp[ii];&#10;    $basetype *dp = dest[ii];&#10;    size_t jj = 0;&#10;    for (; jj &lt; $1_dim1; ++jj) dp[jj] = ip[jj];&#10;  }&#10;}" id="247" addr="0x7f39042648d0" />
-                <attribute name="method" value="globalin" id="248" addr="0x7f39042648d0" />
+        <typemap id="245" addr="0x7f6d3686fb90" >
+            <attributelist id="246" addr="0x7f6d3686fb90" >
+                <attribute name="code" value="{&#10;  $basetype (*inp)[$1_dim1] = ($basetype (*)[$1_dim1])($input);&#10;  $basetype (*dest)[$1_dim1] = ($basetype (*)[$1_dim1])($1);&#10;  size_t ii = 0;&#10;  for (; ii &lt; $1_dim0; ++ii) {&#10;    $basetype *ip = inp[ii];&#10;    $basetype *dp = dest[ii];&#10;    size_t jj = 0;&#10;    for (; jj &lt; $1_dim1; ++jj) dp[jj] = ip[jj];&#10;  }&#10;}" id="247" addr="0x7f6d368768d0" />
+                <attribute name="method" value="globalin" id="248" addr="0x7f6d368768d0" />
             </attributelist >
 
-            <typemapitem id="249" addr="0x7f390425da70" >
-                <attributelist id="250" addr="0x7f390425da70" >
-                    <parmlist id="251" addr="0x7f390425db10" >
+            <typemapitem id="249" addr="0x7f6d3686fa70" >
+                <attributelist id="250" addr="0x7f6d3686fa70" >
+                    <parmlist id="251" addr="0x7f6d3686fb10" >
                         <parm id="252">
-                            <attributelist id="253" addr="0x7f390425db10" >
-                                <attribute name="type" value="a(ANY).a(ANY).SWIGTYPE" id="254" addr="0x7f39042648d0" />
+                            <attributelist id="253" addr="0x7f6d3686fb10" >
+                                <attribute name="type" value="a(ANY).a(ANY).SWIGTYPE" id="254" addr="0x7f6d368768d0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -452,784 +452,784 @@
              
             </typemapitem >
         </typemap >
-        <insert id="255" addr="0x7f390425dc50" >
-            <attributelist id="256" addr="0x7f390425dc50" >
-                <attribute name="code" value="&#10;#ifdef __cplusplus&#10;/* SwigValueWrapper is described in swig.swg */&#10;template&lt;typename T> class SwigValueWrapper {&#10;  struct SwigMovePointer {&#10;    T *ptr;&#10;    SwigMovePointer(T *p) : ptr(p) { }&#10;    ~SwigMovePointer() { delete ptr; }&#10;    SwigMovePointer&amp; operator=(SwigMovePointer&amp; rhs) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = rhs.ptr; rhs.ptr = 0; return *this; }&#10;  } pointer;&#10;  SwigValueWrapper&amp; operator=(const SwigValueWrapper&lt;T>&amp; rhs);&#10;  SwigValueWrapper(const SwigValueWrapper&lt;T>&amp; rhs);&#10;public:&#10;  SwigValueWrapper() : pointer(0) { }&#10;  SwigValueWrapper&amp; operator=(const T&amp; t) { SwigMovePointer tmp(new T(t)); pointer = tmp; return *this; }&#10;  operator T&amp;() const { return *pointer.ptr; }&#10;  T *operator&amp;() { return pointer.ptr; }&#10;};" id="257" addr="0x7f39042648d0" />
-                <attribute name="section" value="runtime" id="258" addr="0x7f39042648d0" />
+        <insert id="255" addr="0x7f6d3686fc50" >
+            <attributelist id="256" addr="0x7f6d3686fc50" >
+                <attribute name="code" value="&#10;#ifdef __cplusplus&#10;/* SwigValueWrapper is described in swig.swg */&#10;template&lt;typename T> class SwigValueWrapper {&#10;  struct SwigMovePointer {&#10;    T *ptr;&#10;    SwigMovePointer(T *p) : ptr(p) { }&#10;    ~SwigMovePointer() { delete ptr; }&#10;    SwigMovePointer&amp; operator=(SwigMovePointer&amp; rhs) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = rhs.ptr; rhs.ptr = 0; return *this; }&#10;  } pointer;&#10;  SwigValueWrapper&amp; operator=(const SwigValueWrapper&lt;T>&amp; rhs);&#10;  SwigValueWrapper(const SwigValueWrapper&lt;T>&amp; rhs);&#10;public:&#10;  SwigValueWrapper() : pointer(0) { }&#10;  SwigValueWrapper&amp; operator=(const T&amp; t) { SwigMovePointer tmp(new T(t)); pointer = tmp; return *this; }&#10;  operator T&amp;() const { return *pointer.ptr; }&#10;  T *operator&amp;() { return pointer.ptr; }&#10;};" id="257" addr="0x7f6d368768d0" />
+                <attribute name="section" value="runtime" id="258" addr="0x7f6d368768d0" />
             </attributelist >
          
         </insert >
-        <insert id="259" addr="0x7f390425dd30" >
-            <attributelist id="260" addr="0x7f390425dd30" >
-                <attribute name="code" value="&#10;template &lt;typename T> T SwigValueInit() {&#10;  return T();&#10;}&#10;#endif&#10;" id="261" addr="0x7f39042648d0" />
-                <attribute name="section" value="runtime" id="262" addr="0x7f39042648d0" />
+        <insert id="259" addr="0x7f6d3686fd30" >
+            <attributelist id="260" addr="0x7f6d3686fd30" >
+                <attribute name="code" value="&#10;template &lt;typename T> T SwigValueInit() {&#10;  return T();&#10;}&#10;#endif&#10;" id="261" addr="0x7f6d368768d0" />
+                <attribute name="section" value="runtime" id="262" addr="0x7f6d368768d0" />
             </attributelist >
          
         </insert >
-        <insert id="263" addr="0x7f390425de10" >
-            <attributelist id="264" addr="0x7f390425de10" >
-                <attribute name="code" value="/* -----------------------------------------------------------------------------&#10; *  This section contains generic SWIG labels for method/variable&#10; *  declarations/attributes, and other compiler dependent labels.&#10; * ----------------------------------------------------------------------------- */&#10;&#10;/* template workaround for compilers that cannot correctly implement the C++ standard */&#10;#ifndef SWIGTEMPLATEDISAMBIGUATOR&#10;# if defined(__SUNPRO_CC) &amp;&amp; (__SUNPRO_CC &lt;= 0x560)&#10;#  define SWIGTEMPLATEDISAMBIGUATOR template&#10;# elif defined(__HP_aCC)&#10;/* Needed even with `aCC -AA' when `aCC -V' reports HP ANSI C++ B3910B A.03.55 */&#10;/* If we find a maximum version that requires this, the test would be __HP_aCC &lt;= 35500 for A.03.55 */&#10;#  define SWIGTEMPLATEDISAMBIGUATOR template&#10;# else&#10;#  define SWIGTEMPLATEDISAMBIGUATOR&#10;# endif&#10;#endif&#10;&#10;/* inline attribute */&#10;#ifndef SWIGINLINE&#10;# if defined(__cplusplus) || (defined(__GNUC__) &amp;&amp; !defined(__STRICT_ANSI__))&#10;#   define SWIGINLINE inline&#10;# else&#10;#   define SWIGINLINE&#10;# endif&#10;#endif&#10;&#10;/* attribute recognised by some compilers to avoid 'unused' warnings */&#10;#ifndef SWIGUNUSED&#10;# if defined(__GNUC__)&#10;#   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 &amp;&amp; __GNUC_MINOR__ >= 4))&#10;#     define SWIGUNUSED __attribute__ ((__unused__))&#10;#   else&#10;#     define SWIGUNUSED&#10;#   endif&#10;# elif defined(__ICC)&#10;#   define SWIGUNUSED __attribute__ ((__unused__))&#10;# else&#10;#   define SWIGUNUSED&#10;# endif&#10;#endif&#10;&#10;#ifndef SWIG_MSC_UNSUPPRESS_4505&#10;# if defined(_MSC_VER)&#10;#   pragma warning(disable : 4505) /* unreferenced local function has been removed */&#10;# endif&#10;#endif&#10;&#10;#ifndef SWIGUNUSEDPARM&#10;# ifdef __cplusplus&#10;#   define SWIGUNUSEDPARM(p)&#10;# else&#10;#   define SWIGUNUSEDPARM(p) p SWIGUNUSED&#10;# endif&#10;#endif&#10;&#10;/* internal SWIG method */&#10;#ifndef SWIGINTERN&#10;# define SWIGINTERN static SWIGUNUSED&#10;#endif&#10;&#10;/* internal inline SWIG method */&#10;#ifndef SWIGINTERNINLINE&#10;# define SWIGINTERNINLINE SWIGINTERN SWIGINLINE&#10;#endif&#10;&#10;/* exporting methods */&#10;#if defined(__GNUC__)&#10;#  if (__GNUC__ >= 4) || (__GNUC__ == 3 &amp;&amp; __GNUC_MINOR__ >= 4)&#10;#    ifndef GCC_HASCLASSVISIBILITY&#10;#      define GCC_HASCLASSVISIBILITY&#10;#    endif&#10;#  endif&#10;#endif&#10;&#10;#ifndef SWIGEXPORT&#10;# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)&#10;#   if defined(STATIC_LINKED)&#10;#     define SWIGEXPORT&#10;#   else&#10;#     define SWIGEXPORT __declspec(dllexport)&#10;#   endif&#10;# else&#10;#   if defined(__GNUC__) &amp;&amp; defined(GCC_HASCLASSVISIBILITY)&#10;#     define SWIGEXPORT __attribute__ ((visibility(&quot;default&quot;)))&#10;#   else&#10;#     define SWIGEXPORT&#10;#   endif&#10;# endif&#10;#endif&#10;&#10;/* calling conventions for Windows */&#10;#ifndef SWIGSTDCALL&#10;# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)&#10;#   define SWIGSTDCALL __stdcall&#10;# else&#10;#   define SWIGSTDCALL&#10;# endif&#10;#endif&#10;&#10;/* Deal with Microsoft's attempt at deprecating C standard runtime functions */&#10;#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) &amp;&amp; defined(_MSC_VER) &amp;&amp; !defined(_CRT_SECURE_NO_DEPRECATE)&#10;# define _CRT_SECURE_NO_DEPRECATE&#10;#endif&#10;&#10;/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */&#10;#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) &amp;&amp; defined(_MSC_VER) &amp;&amp; !defined(_SCL_SECURE_NO_DEPRECATE)&#10;# define _SCL_SECURE_NO_DEPRECATE&#10;#endif&#10;&#10;/* Deal with Apple's deprecated 'AssertMacros.h' from Carbon-framework */&#10;#if defined(__APPLE__) &amp;&amp; !defined(__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES)&#10;# define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0&#10;#endif&#10;&#10;/* Intel's compiler complains if a variable which was never initialised is&#10; * cast to void, which is a common idiom which we use to indicate that we&#10; * are aware a variable isn't used.  So we just silence that warning.&#10; * See: https://github.com/swig/swig/issues/192 for more discussion.&#10; */&#10;#ifdef __INTEL_COMPILER&#10;# pragma warning disable 592&#10;#endif&#10;" id="265" addr="0x7f39042648d0" />
-                <attribute name="section" value="runtime" id="266" addr="0x7f39042648d0" />
+        <insert id="263" addr="0x7f6d3686fe10" >
+            <attributelist id="264" addr="0x7f6d3686fe10" >
+                <attribute name="code" value="/* -----------------------------------------------------------------------------&#10; *  This section contains generic SWIG labels for method/variable&#10; *  declarations/attributes, and other compiler dependent labels.&#10; * ----------------------------------------------------------------------------- */&#10;&#10;/* template workaround for compilers that cannot correctly implement the C++ standard */&#10;#ifndef SWIGTEMPLATEDISAMBIGUATOR&#10;# if defined(__SUNPRO_CC) &amp;&amp; (__SUNPRO_CC &lt;= 0x560)&#10;#  define SWIGTEMPLATEDISAMBIGUATOR template&#10;# elif defined(__HP_aCC)&#10;/* Needed even with `aCC -AA' when `aCC -V' reports HP ANSI C++ B3910B A.03.55 */&#10;/* If we find a maximum version that requires this, the test would be __HP_aCC &lt;= 35500 for A.03.55 */&#10;#  define SWIGTEMPLATEDISAMBIGUATOR template&#10;# else&#10;#  define SWIGTEMPLATEDISAMBIGUATOR&#10;# endif&#10;#endif&#10;&#10;/* inline attribute */&#10;#ifndef SWIGINLINE&#10;# if defined(__cplusplus) || (defined(__GNUC__) &amp;&amp; !defined(__STRICT_ANSI__))&#10;#   define SWIGINLINE inline&#10;# else&#10;#   define SWIGINLINE&#10;# endif&#10;#endif&#10;&#10;/* attribute recognised by some compilers to avoid 'unused' warnings */&#10;#ifndef SWIGUNUSED&#10;# if defined(__GNUC__)&#10;#   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 &amp;&amp; __GNUC_MINOR__ >= 4))&#10;#     define SWIGUNUSED __attribute__ ((__unused__))&#10;#   else&#10;#     define SWIGUNUSED&#10;#   endif&#10;# elif defined(__ICC)&#10;#   define SWIGUNUSED __attribute__ ((__unused__))&#10;# else&#10;#   define SWIGUNUSED&#10;# endif&#10;#endif&#10;&#10;#ifndef SWIG_MSC_UNSUPPRESS_4505&#10;# if defined(_MSC_VER)&#10;#   pragma warning(disable : 4505) /* unreferenced local function has been removed */&#10;# endif&#10;#endif&#10;&#10;#ifndef SWIGUNUSEDPARM&#10;# ifdef __cplusplus&#10;#   define SWIGUNUSEDPARM(p)&#10;# else&#10;#   define SWIGUNUSEDPARM(p) p SWIGUNUSED&#10;# endif&#10;#endif&#10;&#10;/* internal SWIG method */&#10;#ifndef SWIGINTERN&#10;# define SWIGINTERN static SWIGUNUSED&#10;#endif&#10;&#10;/* internal inline SWIG method */&#10;#ifndef SWIGINTERNINLINE&#10;# define SWIGINTERNINLINE SWIGINTERN SWIGINLINE&#10;#endif&#10;&#10;/* exporting methods */&#10;#if defined(__GNUC__)&#10;#  if (__GNUC__ >= 4) || (__GNUC__ == 3 &amp;&amp; __GNUC_MINOR__ >= 4)&#10;#    ifndef GCC_HASCLASSVISIBILITY&#10;#      define GCC_HASCLASSVISIBILITY&#10;#    endif&#10;#  endif&#10;#endif&#10;&#10;#ifndef SWIGEXPORT&#10;# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)&#10;#   if defined(STATIC_LINKED)&#10;#     define SWIGEXPORT&#10;#   else&#10;#     define SWIGEXPORT __declspec(dllexport)&#10;#   endif&#10;# else&#10;#   if defined(__GNUC__) &amp;&amp; defined(GCC_HASCLASSVISIBILITY)&#10;#     define SWIGEXPORT __attribute__ ((visibility(&quot;default&quot;)))&#10;#   else&#10;#     define SWIGEXPORT&#10;#   endif&#10;# endif&#10;#endif&#10;&#10;/* calling conventions for Windows */&#10;#ifndef SWIGSTDCALL&#10;# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)&#10;#   define SWIGSTDCALL __stdcall&#10;# else&#10;#   define SWIGSTDCALL&#10;# endif&#10;#endif&#10;&#10;/* Deal with Microsoft's attempt at deprecating C standard runtime functions */&#10;#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) &amp;&amp; defined(_MSC_VER) &amp;&amp; !defined(_CRT_SECURE_NO_DEPRECATE)&#10;# define _CRT_SECURE_NO_DEPRECATE&#10;#endif&#10;&#10;/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */&#10;#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) &amp;&amp; defined(_MSC_VER) &amp;&amp; !defined(_SCL_SECURE_NO_DEPRECATE)&#10;# define _SCL_SECURE_NO_DEPRECATE&#10;#endif&#10;&#10;/* Deal with Apple's deprecated 'AssertMacros.h' from Carbon-framework */&#10;#if defined(__APPLE__) &amp;&amp; !defined(__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES)&#10;# define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0&#10;#endif&#10;&#10;/* Intel's compiler complains if a variable which was never initialised is&#10; * cast to void, which is a common idiom which we use to indicate that we&#10; * are aware a variable isn't used.  So we just silence that warning.&#10; * See: https://github.com/swig/swig/issues/192 for more discussion.&#10; */&#10;#ifdef __INTEL_COMPILER&#10;# pragma warning disable 592&#10;#endif&#10;" id="265" addr="0x7f6d368768d0" />
+                <attribute name="section" value="runtime" id="266" addr="0x7f6d368768d0" />
             </attributelist >
          
         </insert >
     </include >
-    <include id="267" addr="0x7f390425df90" >
-        <attributelist id="268" addr="0x7f390425df90" >
-            <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmcdrm.i" id="269" addr="0x7f39042648d0" />
-            <attribute name="module" value="" id="270" addr="0x7f390425e030" />
-            <attribute name="options" value="0x7f390425df10" id="271" addr="0x7f390425df10" />
+    <include id="267" addr="0x7f6d3686ff90" >
+        <attributelist id="268" addr="0x7f6d3686ff90" >
+            <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmcdrm.i" id="269" addr="0x7f6d368768d0" />
+            <attribute name="module" value="" id="270" addr="0x7f6d36870030" />
+            <attribute name="options" value="0x7f6d3686ff10" id="271" addr="0x7f6d3686ff10" />
         </attributelist >
 
-        <module id="272" addr="0x7f390425dfd0" >
-            <attributelist id="273" addr="0x7f390425dfd0" >
-                <attribute name="name" value="xbmcdrm" id="274" addr="0x7f39042648d0" />
+        <module id="272" addr="0x7f6d3686ffd0" >
+            <attributelist id="273" addr="0x7f6d3686ffd0" >
+                <attribute name="name" value="xbmcdrm" id="274" addr="0x7f6d368768d0" />
             </attributelist >
          
         </module >
-        <insert id="275" addr="0x7f390425e070" >
-            <attributelist id="276" addr="0x7f390425e070" >
-                <attribute name="code" value="&#10;#if defined(TARGET_WINDOWS)&#10;#  include &lt;windows.h>&#10;#endif&#10;&#10;#include &quot;interfaces/legacy/DrmCryptoSession.h&quot;&#10;#include &quot;utils/log.h&quot;&#10;&#10;using namespace XBMCAddon;&#10;using namespace xbmcdrm;&#10;&#10;#if defined(__GNUG__)&#10;#pragma GCC diagnostic ignored &quot;-Wstrict-aliasing&quot;&#10;#endif&#10;&#10;" id="277" addr="0x7f39042648d0" />
+        <insert id="275" addr="0x7f6d36870070" >
+            <attributelist id="276" addr="0x7f6d36870070" >
+                <attribute name="code" value="&#10;#if defined(TARGET_WINDOWS)&#10;#  include &lt;windows.h>&#10;#endif&#10;&#10;#include &quot;interfaces/legacy/DrmCryptoSession.h&quot;&#10;#include &quot;utils/log.h&quot;&#10;&#10;using namespace XBMCAddon;&#10;using namespace xbmcdrm;&#10;&#10;#if defined(__GNUG__)&#10;#pragma GCC diagnostic ignored &quot;-Wstrict-aliasing&quot;&#10;#endif&#10;&#10;" id="277" addr="0x7f6d368768d0" />
             </attributelist >
          
         </insert >
-        <include id="278" addr="0x7f390425e0f0" >
-            <attributelist id="279" addr="0x7f390425e0f0" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/swighelper.h" id="280" addr="0x7f39042648d0" />
+        <include id="278" addr="0x7f6d368700f0" >
+            <attributelist id="279" addr="0x7f6d368700f0" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/swighelper.h" id="280" addr="0x7f6d368768d0" />
             </attributelist >
          
         </include >
-        <include id="281" addr="0x7f390425e170" >
-            <attributelist id="282" addr="0x7f390425e170" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/AddonString.h" id="283" addr="0x7f39042648d0" />
+        <include id="281" addr="0x7f6d36870170" >
+            <attributelist id="282" addr="0x7f6d36870170" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/AddonString.h" id="283" addr="0x7f6d368768d0" />
             </attributelist >
 
-            <namespace id="284" addr="0x7f390425e2b0" >
-                <attributelist id="285" addr="0x7f390425e2b0" >
-                    <attribute name="sym_name" value="XBMCAddon" id="286" addr="0x7f39042648d0" />
-                    <attribute name="name" value="XBMCAddon" id="287" addr="0x7f39042648d0" />
-                    <attribute name="csym_nextSibling" value="0x7f390425eaf0" id="288" addr="0x7f390425eaf0" />
-                    <attribute name="sym_nextSibling" value="0x7f390425eaf0" id="289" addr="0x7f390425eaf0" />
-                    <typescope id="290" addr="0x7f3904262f50" >
-                        <attributelist id="291" addr="0x7f3904262f50" >
-                            <attribute name="name" value="XBMCAddon" id="292" addr="0x7f39042648d0" />
-                            <typetab id="293" addr="0x7f3904262f90" >
-                                <attributelist id="294" addr="0x7f3904262f90" >
-                                    <attribute name="charVec" value="std::vector&lt;(char)>" id="295" addr="0x7f39042648d0" />
-                                    <attribute name="String" value="std::string" id="296" addr="0x7f39042648d0" />
+            <namespace id="284" addr="0x7f6d368702b0" >
+                <attributelist id="285" addr="0x7f6d368702b0" >
+                    <attribute name="sym_name" value="XBMCAddon" id="286" addr="0x7f6d368768d0" />
+                    <attribute name="name" value="XBMCAddon" id="287" addr="0x7f6d368768d0" />
+                    <attribute name="csym_nextSibling" value="0x7f6d36870af0" id="288" addr="0x7f6d36870af0" />
+                    <attribute name="sym_nextSibling" value="0x7f6d36870af0" id="289" addr="0x7f6d36870af0" />
+                    <typescope id="290" addr="0x7f6d36874f50" >
+                        <attributelist id="291" addr="0x7f6d36874f50" >
+                            <attribute name="name" value="XBMCAddon" id="292" addr="0x7f6d368768d0" />
+                            <typetab id="293" addr="0x7f6d36874f90" >
+                                <attributelist id="294" addr="0x7f6d36874f90" >
+                                    <attribute name="charVec" value="std::vector&lt;(char)>" id="295" addr="0x7f6d368768d0" />
+                                    <attribute name="String" value="std::string" id="296" addr="0x7f6d368768d0" />
                                 </attributelist >
-                                <typetabsitem id="297" addr="0x7f3904263430" >
-                                    <attributelist id="298" addr="0x7f3904263430" >
+                                <typetabsitem id="297" addr="0x7f6d36875430" >
+                                    <attributelist id="298" addr="0x7f6d36875430" >
                                     </attributelist >
                                 </typetabsitem >
-                                <typetabsitem id="299" addr="0x7f3904263170" >
-                                    <attributelist id="300" addr="0x7f3904263170" >
+                                <typetabsitem id="299" addr="0x7f6d36875170" >
+                                    <attributelist id="300" addr="0x7f6d36875170" >
                                     </attributelist >
                                 </typetabsitem >
                             </typetab >
-                            <attribute name="parent" value="0x7f3904247a30" id="301" addr="0x7f3904247a30" />
-                            <attribute name="qname" value="XBMCAddon" id="302" addr="0x7f39042648d0" />
-                            <attribute name="symtab" value="0x7f390425e210" id="303" addr="0x7f390425e210" />
+                            <attribute name="parent" value="0x7f6d36859a30" id="301" addr="0x7f6d36859a30" />
+                            <attribute name="qname" value="XBMCAddon" id="302" addr="0x7f6d368768d0" />
+                            <attribute name="symtab" value="0x7f6d36870210" id="303" addr="0x7f6d36870210" />
                         </attributelist >
-                        <typescopesitem id="304" addr="0x7f390425e1d0" >
-                            <attributelist id="305" addr="0x7f390425e1d0" >
+                        <typescopesitem id="304" addr="0x7f6d368701d0" >
+                            <attributelist id="305" addr="0x7f6d368701d0" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="306" addr="0x7f3904262f90" >
-                            <attributelist id="307" addr="0x7f3904262f90" >
-                                <attribute name="charVec" value="std::vector&lt;(char)>" id="308" addr="0x7f39042648d0" />
-                                <attribute name="String" value="std::string" id="309" addr="0x7f39042648d0" />
+                        <typescopesitem id="306" addr="0x7f6d36874f90" >
+                            <attributelist id="307" addr="0x7f6d36874f90" >
+                                <attribute name="charVec" value="std::vector&lt;(char)>" id="308" addr="0x7f6d368768d0" />
+                                <attribute name="String" value="std::string" id="309" addr="0x7f6d368768d0" />
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="310" addr="0x7f3904247a30" >
-                            <attributelist id="311" addr="0x7f3904247a30" >
-                                <attribute name="name" value="" id="312" addr="0x7f39042648d0" />
-                                <typetab id="313" addr="0x7f3904247a90" >
-                                    <attributelist id="314" addr="0x7f3904247a90" >
+                        <typescopesitem id="310" addr="0x7f6d36859a30" >
+                            <attributelist id="311" addr="0x7f6d36859a30" >
+                                <attribute name="name" value="" id="312" addr="0x7f6d368768d0" />
+                                <typetab id="313" addr="0x7f6d36859a90" >
+                                    <attributelist id="314" addr="0x7f6d36859a90" >
                                     </attributelist >
                                 </typetab >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="315" addr="0x7f3904263090" >
-                            <attributelist id="316" addr="0x7f3904263090" >
+                        <typescopesitem id="315" addr="0x7f6d36875090" >
+                            <attributelist id="316" addr="0x7f6d36875090" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="317" addr="0x7f390425e210" >
-                            <attributelist id="318" addr="0x7f390425e210" >
-                                <attribute name="name" value="XBMCAddon" id="319" addr="0x7f39042648d0" />
-                                <attribute name="csymtab" value="0x7f390425e250" id="320" addr="0x7f390425e250" />
-                                <attribute name="symtab" value="0x7f390425e1f0" id="321" addr="0x7f390425e1f0" />
+                        <typescopesitem id="317" addr="0x7f6d36870210" >
+                            <attributelist id="318" addr="0x7f6d36870210" >
+                                <attribute name="name" value="XBMCAddon" id="319" addr="0x7f6d368768d0" />
+                                <attribute name="csymtab" value="0x7f6d36870250" id="320" addr="0x7f6d36870250" />
+                                <attribute name="symtab" value="0x7f6d368701f0" id="321" addr="0x7f6d368701f0" />
                             </attributelist >
                         </typescopesitem >
                     </typescope >
-                    <attribute name="symtab" value="0x7f390425e210" id="322" addr="0x7f390425e210" />
-                    <attribute name="sym_symtab" value="0x7f3904247950" id="323" addr="0x7f3904247950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="324" addr="0x7f39042648d0" />
+                    <attribute name="symtab" value="0x7f6d36870210" id="322" addr="0x7f6d36870210" />
+                    <attribute name="sym_symtab" value="0x7f6d36859950" id="323" addr="0x7f6d36859950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="324" addr="0x7f6d368768d0" />
                 </attributelist >
 
-                <cdecl id="325" addr="0x7f390425e3d0" >
-                    <attributelist id="326" addr="0x7f390425e3d0" >
-                        <attribute name="sym_name" value="String" id="327" addr="0x7f39042648d0" />
-                        <attribute name="name" value="XBMCAddon::String" id="328" addr="0x7f39042648d0" />
-                        <attribute name="decl" value="" id="329" addr="0x7f39042648d0" />
-                        <attribute name="storage" value="typedef" id="330" addr="0x7f39042648d0" />
-                        <attribute name="kind" value="typedef" id="331" addr="0x7f39042648d0" />
-                        <attribute name="type" value="std::string" id="332" addr="0x7f39042648d0" />
-                        <attribute name="sym_symtab" value="0x7f390425e210" id="333" addr="0x7f390425e210" />
-                        <attribute name="sym_overname" value="__SWIG_0" id="334" addr="0x7f39042648d0" />
+                <cdecl id="325" addr="0x7f6d368703d0" >
+                    <attributelist id="326" addr="0x7f6d368703d0" >
+                        <attribute name="sym_name" value="String" id="327" addr="0x7f6d368768d0" />
+                        <attribute name="name" value="XBMCAddon::String" id="328" addr="0x7f6d368768d0" />
+                        <attribute name="decl" value="" id="329" addr="0x7f6d368768d0" />
+                        <attribute name="storage" value="typedef" id="330" addr="0x7f6d368768d0" />
+                        <attribute name="kind" value="typedef" id="331" addr="0x7f6d368768d0" />
+                        <attribute name="type" value="std::string" id="332" addr="0x7f6d368768d0" />
+                        <attribute name="sym_symtab" value="0x7f6d36870210" id="333" addr="0x7f6d36870210" />
+                        <attribute name="sym_overname" value="__SWIG_0" id="334" addr="0x7f6d368768d0" />
                     </attributelist >
                  
                 </cdecl >
-                <cdecl id="335" addr="0x7f390425e5d0" >
-                    <attributelist id="336" addr="0x7f390425e5d0" >
-                        <attribute name="sym_name" value="emptyString" id="337" addr="0x7f39042648d0" />
-                        <attribute name="name" value="XBMCAddon::emptyString" id="338" addr="0x7f39042648d0" />
-                        <attribute name="decl" value="" id="339" addr="0x7f39042648d0" />
-                        <attribute name="storage" value="extern" id="340" addr="0x7f39042648d0" />
-                        <attribute name="kind" value="variable" id="341" addr="0x7f39042648d0" />
-                        <attribute name="type" value="XBMCAddon::String" id="342" addr="0x7f39042648d0" />
-                        <attribute name="sym_symtab" value="0x7f390425e210" id="343" addr="0x7f390425e210" />
-                        <attribute name="sym_overname" value="__SWIG_0" id="344" addr="0x7f39042648d0" />
+                <cdecl id="335" addr="0x7f6d368705d0" >
+                    <attributelist id="336" addr="0x7f6d368705d0" >
+                        <attribute name="sym_name" value="emptyString" id="337" addr="0x7f6d368768d0" />
+                        <attribute name="name" value="XBMCAddon::emptyString" id="338" addr="0x7f6d368768d0" />
+                        <attribute name="decl" value="" id="339" addr="0x7f6d368768d0" />
+                        <attribute name="storage" value="extern" id="340" addr="0x7f6d368768d0" />
+                        <attribute name="kind" value="variable" id="341" addr="0x7f6d368768d0" />
+                        <attribute name="type" value="XBMCAddon::String" id="342" addr="0x7f6d368768d0" />
+                        <attribute name="sym_symtab" value="0x7f6d36870210" id="343" addr="0x7f6d36870210" />
+                        <attribute name="sym_overname" value="__SWIG_0" id="344" addr="0x7f6d368768d0" />
                     </attributelist >
                  
                 </cdecl >
             </namespace >
         </include >
-        <include id="345" addr="0x7f390425e7b0" >
-            <attributelist id="346" addr="0x7f390425e7b0" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/DrmCryptoSession.h" id="347" addr="0x7f39042648d0" />
+        <include id="345" addr="0x7f6d368707b0" >
+            <attributelist id="346" addr="0x7f6d368707b0" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/DrmCryptoSession.h" id="347" addr="0x7f6d368768d0" />
             </attributelist >
 
-            <namespace id="348" addr="0x7f390425e8f0" >
-                <attributelist id="349" addr="0x7f390425e8f0" >
-                    <attribute name="sym_name" value="DRM" id="350" addr="0x7f39042648d0" />
-                    <attribute name="name" value="DRM" id="351" addr="0x7f39042648d0" />
-                    <typescope id="352" addr="0x7f39042630d0" >
-                        <attributelist id="353" addr="0x7f39042630d0" >
-                            <attribute name="name" value="DRM" id="354" addr="0x7f39042648d0" />
-                            <typetab id="355" addr="0x7f3904263310" >
-                                <attributelist id="356" addr="0x7f3904263310" >
-                                    <attribute name="CCryptoSession" value="CCryptoSession" id="357" addr="0x7f39042648d0" />
+            <namespace id="348" addr="0x7f6d368708f0" >
+                <attributelist id="349" addr="0x7f6d368708f0" >
+                    <attribute name="sym_name" value="DRM" id="350" addr="0x7f6d368768d0" />
+                    <attribute name="name" value="DRM" id="351" addr="0x7f6d368768d0" />
+                    <typescope id="352" addr="0x7f6d368750d0" >
+                        <attributelist id="353" addr="0x7f6d368750d0" >
+                            <attribute name="name" value="DRM" id="354" addr="0x7f6d368768d0" />
+                            <typetab id="355" addr="0x7f6d36875310" >
+                                <attributelist id="356" addr="0x7f6d36875310" >
+                                    <attribute name="CCryptoSession" value="CCryptoSession" id="357" addr="0x7f6d368768d0" />
                                 </attributelist >
-                                <typetabsitem id="358" addr="0x7f3904263390" >
-                                    <attributelist id="359" addr="0x7f3904263390" >
+                                <typetabsitem id="358" addr="0x7f6d36875390" >
+                                    <attributelist id="359" addr="0x7f6d36875390" >
                                     </attributelist >
                                 </typetabsitem >
                             </typetab >
-                            <attribute name="parent" value="0x7f3904247a30" id="360" addr="0x7f3904247a30" />
-                            <attribute name="qname" value="DRM" id="361" addr="0x7f39042648d0" />
-                            <attribute name="symtab" value="0x7f390425e850" id="362" addr="0x7f390425e850" />
+                            <attribute name="parent" value="0x7f6d36859a30" id="360" addr="0x7f6d36859a30" />
+                            <attribute name="qname" value="DRM" id="361" addr="0x7f6d368768d0" />
+                            <attribute name="symtab" value="0x7f6d36870850" id="362" addr="0x7f6d36870850" />
                         </attributelist >
-                        <typescopesitem id="363" addr="0x7f390425e810" >
-                            <attributelist id="364" addr="0x7f390425e810" >
+                        <typescopesitem id="363" addr="0x7f6d36870810" >
+                            <attributelist id="364" addr="0x7f6d36870810" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="365" addr="0x7f3904263310" >
-                            <attributelist id="366" addr="0x7f3904263310" >
-                                <attribute name="CCryptoSession" value="CCryptoSession" id="367" addr="0x7f39042648d0" />
+                        <typescopesitem id="365" addr="0x7f6d36875310" >
+                            <attributelist id="366" addr="0x7f6d36875310" >
+                                <attribute name="CCryptoSession" value="CCryptoSession" id="367" addr="0x7f6d368768d0" />
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="368" addr="0x7f3904247a30" >
-                            <attributelist id="369" addr="0x7f3904247a30" >
-                                <attribute name="name" value="" id="370" addr="0x7f39042648d0" />
-                                <typetab id="371" addr="0x7f3904247a90" >
-                                    <attributelist id="372" addr="0x7f3904247a90" >
+                        <typescopesitem id="368" addr="0x7f6d36859a30" >
+                            <attributelist id="369" addr="0x7f6d36859a30" >
+                                <attribute name="name" value="" id="370" addr="0x7f6d368768d0" />
+                                <typetab id="371" addr="0x7f6d36859a90" >
+                                    <attributelist id="372" addr="0x7f6d36859a90" >
                                     </attributelist >
                                 </typetab >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="373" addr="0x7f3904263330" >
-                            <attributelist id="374" addr="0x7f3904263330" >
+                        <typescopesitem id="373" addr="0x7f6d36875330" >
+                            <attributelist id="374" addr="0x7f6d36875330" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="375" addr="0x7f390425e850" >
-                            <attributelist id="376" addr="0x7f390425e850" >
-                                <attribute name="name" value="DRM" id="377" addr="0x7f39042648d0" />
-                                <attribute name="csymtab" value="0x7f390425e890" id="378" addr="0x7f390425e890" />
-                                <attribute name="symtab" value="0x7f390425e830" id="379" addr="0x7f390425e830" />
+                        <typescopesitem id="375" addr="0x7f6d36870850" >
+                            <attributelist id="376" addr="0x7f6d36870850" >
+                                <attribute name="name" value="DRM" id="377" addr="0x7f6d368768d0" />
+                                <attribute name="csymtab" value="0x7f6d36870890" id="378" addr="0x7f6d36870890" />
+                                <attribute name="symtab" value="0x7f6d36870830" id="379" addr="0x7f6d36870830" />
                             </attributelist >
                         </typescopesitem >
                     </typescope >
-                    <attribute name="symtab" value="0x7f390425e850" id="380" addr="0x7f390425e850" />
-                    <attribute name="sym_symtab" value="0x7f3904247950" id="381" addr="0x7f3904247950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="382" addr="0x7f39042648d0" />
+                    <attribute name="symtab" value="0x7f6d36870850" id="380" addr="0x7f6d36870850" />
+                    <attribute name="sym_symtab" value="0x7f6d36859950" id="381" addr="0x7f6d36859950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="382" addr="0x7f6d368768d0" />
                 </attributelist >
 
-                <classforward id="383" addr="0x7f390425e990" >
-                    <attributelist id="384" addr="0x7f390425e990" >
-                        <attribute name="sym_name" value="CCryptoSession" id="385" addr="0x7f39042648d0" />
-                        <attribute name="name" value="CCryptoSession" id="386" addr="0x7f39042648d0" />
-                        <attribute name="kind" value="class" id="387" addr="0x7f39042648d0" />
-                        <attribute name="sym_weak" value="1" id="388" addr="0x7f39042648d0" />
-                        <attribute name="sym_symtab" value="0x7f390425e850" id="389" addr="0x7f390425e850" />
-                        <attribute name="sym_overname" value="__SWIG_0" id="390" addr="0x7f39042648d0" />
+                <classforward id="383" addr="0x7f6d36870990" >
+                    <attributelist id="384" addr="0x7f6d36870990" >
+                        <attribute name="sym_name" value="CCryptoSession" id="385" addr="0x7f6d368768d0" />
+                        <attribute name="name" value="CCryptoSession" id="386" addr="0x7f6d368768d0" />
+                        <attribute name="kind" value="class" id="387" addr="0x7f6d368768d0" />
+                        <attribute name="sym_weak" value="1" id="388" addr="0x7f6d368768d0" />
+                        <attribute name="sym_symtab" value="0x7f6d36870850" id="389" addr="0x7f6d36870850" />
+                        <attribute name="sym_overname" value="__SWIG_0" id="390" addr="0x7f6d368768d0" />
                     </attributelist >
                  
                 </classforward >
             </namespace >
-            <namespace id="391" addr="0x7f390425eaf0" >
-                <attributelist id="392" addr="0x7f390425eaf0" >
-                    <attribute name="sym_name" value="XBMCAddon" id="393" addr="0x7f39042648d0" />
-                    <attribute name="name" value="XBMCAddon" id="394" addr="0x7f39042648d0" />
-                    <attribute name="sym_previousSibling" value="0x7f390425e2b0" id="395" addr="0x7f390425e2b0" />
-                    <typescope id="396" addr="0x7f3904262f50" >
-                        <attributelist id="397" addr="0x7f3904262f50" >
-                            <attribute name="name" value="XBMCAddon" id="398" addr="0x7f39042648d0" />
-                            <typetab id="399" addr="0x7f3904262f90" >
-                                <attributelist id="400" addr="0x7f3904262f90" >
-                                    <attribute name="charVec" value="std::vector&lt;(char)>" id="401" addr="0x7f39042648d0" />
-                                    <attribute name="String" value="std::string" id="402" addr="0x7f39042648d0" />
+            <namespace id="391" addr="0x7f6d36870af0" >
+                <attributelist id="392" addr="0x7f6d36870af0" >
+                    <attribute name="sym_name" value="XBMCAddon" id="393" addr="0x7f6d368768d0" />
+                    <attribute name="name" value="XBMCAddon" id="394" addr="0x7f6d368768d0" />
+                    <attribute name="sym_previousSibling" value="0x7f6d368702b0" id="395" addr="0x7f6d368702b0" />
+                    <typescope id="396" addr="0x7f6d36874f50" >
+                        <attributelist id="397" addr="0x7f6d36874f50" >
+                            <attribute name="name" value="XBMCAddon" id="398" addr="0x7f6d368768d0" />
+                            <typetab id="399" addr="0x7f6d36874f90" >
+                                <attributelist id="400" addr="0x7f6d36874f90" >
+                                    <attribute name="charVec" value="std::vector&lt;(char)>" id="401" addr="0x7f6d368768d0" />
+                                    <attribute name="String" value="std::string" id="402" addr="0x7f6d368768d0" />
                                 </attributelist >
-                                <typetabsitem id="403" addr="0x7f3904263430" >
-                                    <attributelist id="404" addr="0x7f3904263430" >
+                                <typetabsitem id="403" addr="0x7f6d36875430" >
+                                    <attributelist id="404" addr="0x7f6d36875430" >
                                     </attributelist >
                                 </typetabsitem >
-                                <typetabsitem id="405" addr="0x7f3904263170" >
-                                    <attributelist id="406" addr="0x7f3904263170" >
+                                <typetabsitem id="405" addr="0x7f6d36875170" >
+                                    <attributelist id="406" addr="0x7f6d36875170" >
                                     </attributelist >
                                 </typetabsitem >
                             </typetab >
-                            <attribute name="parent" value="0x7f3904247a30" id="407" addr="0x7f3904247a30" />
-                            <attribute name="qname" value="XBMCAddon" id="408" addr="0x7f39042648d0" />
-                            <attribute name="symtab" value="0x7f390425e210" id="409" addr="0x7f390425e210" />
+                            <attribute name="parent" value="0x7f6d36859a30" id="407" addr="0x7f6d36859a30" />
+                            <attribute name="qname" value="XBMCAddon" id="408" addr="0x7f6d368768d0" />
+                            <attribute name="symtab" value="0x7f6d36870210" id="409" addr="0x7f6d36870210" />
                         </attributelist >
-                        <typescopesitem id="410" addr="0x7f390425e1d0" >
-                            <attributelist id="411" addr="0x7f390425e1d0" >
+                        <typescopesitem id="410" addr="0x7f6d368701d0" >
+                            <attributelist id="411" addr="0x7f6d368701d0" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="412" addr="0x7f3904262f90" >
-                            <attributelist id="413" addr="0x7f3904262f90" >
-                                <attribute name="charVec" value="std::vector&lt;(char)>" id="414" addr="0x7f39042648d0" />
-                                <attribute name="String" value="std::string" id="415" addr="0x7f39042648d0" />
+                        <typescopesitem id="412" addr="0x7f6d36874f90" >
+                            <attributelist id="413" addr="0x7f6d36874f90" >
+                                <attribute name="charVec" value="std::vector&lt;(char)>" id="414" addr="0x7f6d368768d0" />
+                                <attribute name="String" value="std::string" id="415" addr="0x7f6d368768d0" />
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="416" addr="0x7f3904247a30" >
-                            <attributelist id="417" addr="0x7f3904247a30" >
-                                <attribute name="name" value="" id="418" addr="0x7f39042648d0" />
-                                <typetab id="419" addr="0x7f3904247a90" >
-                                    <attributelist id="420" addr="0x7f3904247a90" >
+                        <typescopesitem id="416" addr="0x7f6d36859a30" >
+                            <attributelist id="417" addr="0x7f6d36859a30" >
+                                <attribute name="name" value="" id="418" addr="0x7f6d368768d0" />
+                                <typetab id="419" addr="0x7f6d36859a90" >
+                                    <attributelist id="420" addr="0x7f6d36859a90" >
                                     </attributelist >
                                 </typetab >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="421" addr="0x7f3904263090" >
-                            <attributelist id="422" addr="0x7f3904263090" >
+                        <typescopesitem id="421" addr="0x7f6d36875090" >
+                            <attributelist id="422" addr="0x7f6d36875090" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="423" addr="0x7f390425e210" >
-                            <attributelist id="424" addr="0x7f390425e210" >
-                                <attribute name="name" value="XBMCAddon" id="425" addr="0x7f39042648d0" />
-                                <attribute name="csymtab" value="0x7f390425e250" id="426" addr="0x7f390425e250" />
-                                <attribute name="symtab" value="0x7f390425e1f0" id="427" addr="0x7f390425e1f0" />
+                        <typescopesitem id="423" addr="0x7f6d36870210" >
+                            <attributelist id="424" addr="0x7f6d36870210" >
+                                <attribute name="name" value="XBMCAddon" id="425" addr="0x7f6d368768d0" />
+                                <attribute name="csymtab" value="0x7f6d36870250" id="426" addr="0x7f6d36870250" />
+                                <attribute name="symtab" value="0x7f6d368701f0" id="427" addr="0x7f6d368701f0" />
                             </attributelist >
                         </typescopesitem >
                     </typescope >
-                    <attribute name="symtab" value="0x7f390425e210" id="428" addr="0x7f390425e210" />
-                    <attribute name="sym_symtab" value="0x7f3904247950" id="429" addr="0x7f3904247950" />
+                    <attribute name="symtab" value="0x7f6d36870210" id="428" addr="0x7f6d36870210" />
+                    <attribute name="sym_symtab" value="0x7f6d36859950" id="429" addr="0x7f6d36859950" />
                 </attributelist >
 
-                <cdecl id="430" addr="0x7f390425ecd0" >
-                    <attributelist id="431" addr="0x7f390425ecd0" >
-                        <attribute name="sym_name" value="charVec" id="432" addr="0x7f39042648d0" />
-                        <attribute name="name" value="XBMCAddon::charVec" id="433" addr="0x7f39042648d0" />
-                        <attribute name="decl" value="" id="434" addr="0x7f39042648d0" />
-                        <attribute name="storage" value="typedef" id="435" addr="0x7f39042648d0" />
-                        <attribute name="kind" value="typedef" id="436" addr="0x7f39042648d0" />
-                        <attribute name="type" value="std::vector&lt;(char)>" id="437" addr="0x7f39042648d0" />
-                        <attribute name="sym_symtab" value="0x7f390425e210" id="438" addr="0x7f390425e210" />
-                        <attribute name="sym_overname" value="__SWIG_0" id="439" addr="0x7f39042648d0" />
+                <cdecl id="430" addr="0x7f6d36870cd0" >
+                    <attributelist id="431" addr="0x7f6d36870cd0" >
+                        <attribute name="sym_name" value="charVec" id="432" addr="0x7f6d368768d0" />
+                        <attribute name="name" value="XBMCAddon::charVec" id="433" addr="0x7f6d368768d0" />
+                        <attribute name="decl" value="" id="434" addr="0x7f6d368768d0" />
+                        <attribute name="storage" value="typedef" id="435" addr="0x7f6d368768d0" />
+                        <attribute name="kind" value="typedef" id="436" addr="0x7f6d368768d0" />
+                        <attribute name="type" value="std::vector&lt;(char)>" id="437" addr="0x7f6d368768d0" />
+                        <attribute name="sym_symtab" value="0x7f6d36870210" id="438" addr="0x7f6d36870210" />
+                        <attribute name="sym_overname" value="__SWIG_0" id="439" addr="0x7f6d368768d0" />
                     </attributelist >
                  
                 </cdecl >
-                <namespace id="440" addr="0x7f390425efd0" >
-                    <attributelist id="441" addr="0x7f390425efd0" >
-                        <attribute name="sym_name" value="xbmcdrm" id="442" addr="0x7f39042648d0" />
-                        <attribute name="name" value="xbmcdrm" id="443" addr="0x7f39042648d0" />
-                        <typescope id="444" addr="0x7f39042636d0" >
-                            <attributelist id="445" addr="0x7f39042636d0" >
-                                <attribute name="name" value="xbmcdrm" id="446" addr="0x7f39042648d0" />
-                                <typetab id="447" addr="0x7f39042636f0" >
-                                    <attributelist id="448" addr="0x7f39042636f0" >
-                                        <attribute name="CryptoSession" value="CryptoSession" id="449" addr="0x7f39042648d0" />
+                <namespace id="440" addr="0x7f6d36870fd0" >
+                    <attributelist id="441" addr="0x7f6d36870fd0" >
+                        <attribute name="sym_name" value="xbmcdrm" id="442" addr="0x7f6d368768d0" />
+                        <attribute name="name" value="xbmcdrm" id="443" addr="0x7f6d368768d0" />
+                        <typescope id="444" addr="0x7f6d368756d0" >
+                            <attributelist id="445" addr="0x7f6d368756d0" >
+                                <attribute name="name" value="xbmcdrm" id="446" addr="0x7f6d368768d0" />
+                                <typetab id="447" addr="0x7f6d368756f0" >
+                                    <attributelist id="448" addr="0x7f6d368756f0" >
+                                        <attribute name="CryptoSession" value="CryptoSession" id="449" addr="0x7f6d368768d0" />
                                     </attributelist >
-                                    <typetabsitem id="450" addr="0x7f3904263850" >
-                                        <attributelist id="451" addr="0x7f3904263850" >
+                                    <typetabsitem id="450" addr="0x7f6d36875850" >
+                                        <attributelist id="451" addr="0x7f6d36875850" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
-                                <attribute name="parent" value="0x7f3904262f50" id="452" addr="0x7f3904262f50" />
-                                <attribute name="qname" value="XBMCAddon::xbmcdrm" id="453" addr="0x7f39042648d0" />
-                                <attribute name="symtab" value="0x7f390425ee30" id="454" addr="0x7f390425ee30" />
+                                <attribute name="parent" value="0x7f6d36874f50" id="452" addr="0x7f6d36874f50" />
+                                <attribute name="qname" value="XBMCAddon::xbmcdrm" id="453" addr="0x7f6d368768d0" />
+                                <attribute name="symtab" value="0x7f6d36870e30" id="454" addr="0x7f6d36870e30" />
                             </attributelist >
-                            <typescopesitem id="455" addr="0x7f390425edd0" >
-                                <attributelist id="456" addr="0x7f390425edd0" >
+                            <typescopesitem id="455" addr="0x7f6d36870dd0" >
+                                <attributelist id="456" addr="0x7f6d36870dd0" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="457" addr="0x7f39042636f0" >
-                                <attributelist id="458" addr="0x7f39042636f0" >
-                                    <attribute name="CryptoSession" value="CryptoSession" id="459" addr="0x7f39042648d0" />
+                            <typescopesitem id="457" addr="0x7f6d368756f0" >
+                                <attributelist id="458" addr="0x7f6d368756f0" >
+                                    <attribute name="CryptoSession" value="CryptoSession" id="459" addr="0x7f6d368768d0" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="460" addr="0x7f3904262f50" >
-                                <attributelist id="461" addr="0x7f3904262f50" >
-                                    <attribute name="name" value="XBMCAddon" id="462" addr="0x7f39042648d0" />
-                                    <typetab id="463" addr="0x7f3904262f90" >
-                                        <attributelist id="464" addr="0x7f3904262f90" >
-                                            <attribute name="charVec" value="std::vector&lt;(char)>" id="465" addr="0x7f39042648d0" />
-                                            <attribute name="String" value="std::string" id="466" addr="0x7f39042648d0" />
+                            <typescopesitem id="460" addr="0x7f6d36874f50" >
+                                <attributelist id="461" addr="0x7f6d36874f50" >
+                                    <attribute name="name" value="XBMCAddon" id="462" addr="0x7f6d368768d0" />
+                                    <typetab id="463" addr="0x7f6d36874f90" >
+                                        <attributelist id="464" addr="0x7f6d36874f90" >
+                                            <attribute name="charVec" value="std::vector&lt;(char)>" id="465" addr="0x7f6d368768d0" />
+                                            <attribute name="String" value="std::string" id="466" addr="0x7f6d368768d0" />
                                         </attributelist >
-                                        <typetabsitem id="467" addr="0x7f3904263430" >
-                                            <attributelist id="468" addr="0x7f3904263430" >
+                                        <typetabsitem id="467" addr="0x7f6d36875430" >
+                                            <attributelist id="468" addr="0x7f6d36875430" >
                                             </attributelist >
                                         </typetabsitem >
-                                        <typetabsitem id="469" addr="0x7f3904263170" >
-                                            <attributelist id="470" addr="0x7f3904263170" >
+                                        <typetabsitem id="469" addr="0x7f6d36875170" >
+                                            <attributelist id="470" addr="0x7f6d36875170" >
                                             </attributelist >
                                         </typetabsitem >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f3904247a30" id="471" addr="0x7f3904247a30" />
-                                    <attribute name="qname" value="XBMCAddon" id="472" addr="0x7f39042648d0" />
-                                    <attribute name="symtab" value="0x7f390425e210" id="473" addr="0x7f390425e210" />
+                                    <attribute name="parent" value="0x7f6d36859a30" id="471" addr="0x7f6d36859a30" />
+                                    <attribute name="qname" value="XBMCAddon" id="472" addr="0x7f6d368768d0" />
+                                    <attribute name="symtab" value="0x7f6d36870210" id="473" addr="0x7f6d36870210" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="474" addr="0x7f3904263710" >
-                                <attributelist id="475" addr="0x7f3904263710" >
+                            <typescopesitem id="474" addr="0x7f6d36875710" >
+                                <attributelist id="475" addr="0x7f6d36875710" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="476" addr="0x7f390425ee30" >
-                                <attributelist id="477" addr="0x7f390425ee30" >
-                                    <attribute name="name" value="xbmcdrm" id="478" addr="0x7f39042648d0" />
-                                    <attribute name="csymtab" value="0x7f390425ef90" id="479" addr="0x7f390425ef90" />
-                                    <attribute name="symtab" value="0x7f390425edf0" id="480" addr="0x7f390425edf0" />
+                            <typescopesitem id="476" addr="0x7f6d36870e30" >
+                                <attributelist id="477" addr="0x7f6d36870e30" >
+                                    <attribute name="name" value="xbmcdrm" id="478" addr="0x7f6d368768d0" />
+                                    <attribute name="csymtab" value="0x7f6d36870f90" id="479" addr="0x7f6d36870f90" />
+                                    <attribute name="symtab" value="0x7f6d36870df0" id="480" addr="0x7f6d36870df0" />
                                 </attributelist >
                             </typescopesitem >
                         </typescope >
-                        <attribute name="symtab" value="0x7f390425ee30" id="481" addr="0x7f390425ee30" />
-                        <attribute name="sym_symtab" value="0x7f390425e210" id="482" addr="0x7f390425e210" />
-                        <attribute name="sym_overname" value="__SWIG_0" id="483" addr="0x7f39042648d0" />
+                        <attribute name="symtab" value="0x7f6d36870e30" id="481" addr="0x7f6d36870e30" />
+                        <attribute name="sym_symtab" value="0x7f6d36870210" id="482" addr="0x7f6d36870210" />
+                        <attribute name="sym_overname" value="__SWIG_0" id="483" addr="0x7f6d368768d0" />
                     </attributelist >
 
-                    <cdecl id="484" addr="0x7f390425f050" >
-                        <attributelist id="485" addr="0x7f390425f050" >
-                            <attribute name="sym_name" value="DRMException" id="486" addr="0x7f39042648d0" />
-                            <attribute name="name" value="XBMCAddon::xbmcdrm::DRMException" id="487" addr="0x7f39042648d0" />
-                            <attribute name="kind" value="variable" id="488" addr="0x7f39042648d0" />
-                            <attribute name="type" value="XBMCCOMMONS_STANDARD_EXCEPTION" id="489" addr="0x7f39042648d0" />
-                            <attribute name="sym_symtab" value="0x7f390425ee30" id="490" addr="0x7f390425ee30" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="491" addr="0x7f39042648d0" />
+                    <cdecl id="484" addr="0x7f6d36871050" >
+                        <attributelist id="485" addr="0x7f6d36871050" >
+                            <attribute name="sym_name" value="DRMException" id="486" addr="0x7f6d368768d0" />
+                            <attribute name="name" value="XBMCAddon::xbmcdrm::DRMException" id="487" addr="0x7f6d368768d0" />
+                            <attribute name="kind" value="variable" id="488" addr="0x7f6d368768d0" />
+                            <attribute name="type" value="XBMCCOMMONS_STANDARD_EXCEPTION" id="489" addr="0x7f6d368768d0" />
+                            <attribute name="sym_symtab" value="0x7f6d36870e30" id="490" addr="0x7f6d36870e30" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="491" addr="0x7f6d368768d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <class id="492" addr="0x7f390425f2f0" >
-                        <attributelist id="493" addr="0x7f390425f2f0" >
-                            <attribute name="name" value="XBMCAddon::xbmcdrm::CryptoSession" id="494" addr="0x7f39042648d0" />
-                            <attribute name="sym_symtab" value="0x7f390425ee30" id="495" addr="0x7f390425ee30" />
-                            <attribute name="symtab" value="0x7f390425f470" id="496" addr="0x7f390425f470" />
-                            <attribute name="allows_typedef" value="1" id="497" addr="0x7f39042648d0" />
-                            <attribute name="typepass_visit" value="1" id="498" addr="0x7f39042648d0" />
-                            <attribute name="allocate_visit" value="1" id="499" addr="0x7f39042648d0" />
-                            <attribute name="kind" value="class" id="500" addr="0x7f39042648d0" />
-                            <attribute name="sym_name" value="CryptoSession" id="501" addr="0x7f39042648d0" />
-                            <attribute name="allocate_has_constructor" value="1" id="502" addr="0x7f39042648d0" />
-                            <attribute name="allocate_public_constructor" value="1" id="503" addr="0x7f39042648d0" />
-                            <attribute name="allocate_has_destructor" value="1" id="504" addr="0x7f39042648d0" />
-                            <attribute name="allocate_default_destructor" value="1" id="505" addr="0x7f39042648d0" />
-                            <attribute name="allocate_copy_constructor" value="1" id="506" addr="0x7f39042648d0" />
-                            <attribute name="privatebaselist" value="0x7f390425f270" id="507" addr="0x7f390425f270" />
-                            <attribute name="protectedbaselist" value="0x7f390425f250" id="508" addr="0x7f390425f250" />
-                            <baselist id="509" addr="0x7f390425f230" >
-                                <base name="AddonClass" id="510" addr="0x7f390425f190" />
+                    <class id="492" addr="0x7f6d368712f0" >
+                        <attributelist id="493" addr="0x7f6d368712f0" >
+                            <attribute name="name" value="XBMCAddon::xbmcdrm::CryptoSession" id="494" addr="0x7f6d368768d0" />
+                            <attribute name="sym_symtab" value="0x7f6d36870e30" id="495" addr="0x7f6d36870e30" />
+                            <attribute name="symtab" value="0x7f6d36871470" id="496" addr="0x7f6d36871470" />
+                            <attribute name="allows_typedef" value="1" id="497" addr="0x7f6d368768d0" />
+                            <attribute name="typepass_visit" value="1" id="498" addr="0x7f6d368768d0" />
+                            <attribute name="allocate_visit" value="1" id="499" addr="0x7f6d368768d0" />
+                            <attribute name="kind" value="class" id="500" addr="0x7f6d368768d0" />
+                            <attribute name="sym_name" value="CryptoSession" id="501" addr="0x7f6d368768d0" />
+                            <attribute name="allocate_has_constructor" value="1" id="502" addr="0x7f6d368768d0" />
+                            <attribute name="allocate_public_constructor" value="1" id="503" addr="0x7f6d368768d0" />
+                            <attribute name="allocate_has_destructor" value="1" id="504" addr="0x7f6d368768d0" />
+                            <attribute name="allocate_default_destructor" value="1" id="505" addr="0x7f6d368768d0" />
+                            <attribute name="allocate_copy_constructor" value="1" id="506" addr="0x7f6d368768d0" />
+                            <attribute name="privatebaselist" value="0x7f6d36871270" id="507" addr="0x7f6d36871270" />
+                            <attribute name="protectedbaselist" value="0x7f6d36871250" id="508" addr="0x7f6d36871250" />
+                            <baselist id="509" addr="0x7f6d36871230" >
+                                <base name="AddonClass" id="510" addr="0x7f6d36871190" />
                             </baselist >
-                            <attribute name="module" value="xbmcdrm" id="511" addr="0x7f390425dfd0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="512" addr="0x7f39042648d0" />
-                            <typescope id="513" addr="0x7f3904263950" >
-                                <attributelist id="514" addr="0x7f3904263950" >
-                                    <attribute name="name" value="CryptoSession" id="515" addr="0x7f39042648d0" />
-                                    <typetab id="516" addr="0x7f3904263970" >
-                                        <attributelist id="517" addr="0x7f3904263970" >
+                            <attribute name="module" value="xbmcdrm" id="511" addr="0x7f6d3686ffd0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="512" addr="0x7f6d368768d0" />
+                            <typescope id="513" addr="0x7f6d36875950" >
+                                <attributelist id="514" addr="0x7f6d36875950" >
+                                    <attribute name="name" value="CryptoSession" id="515" addr="0x7f6d368768d0" />
+                                    <typetab id="516" addr="0x7f6d36875970" >
+                                        <attributelist id="517" addr="0x7f6d36875970" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f39042636d0" id="518" addr="0x7f39042636d0" />
-                                    <attribute name="qname" value="XBMCAddon::xbmcdrm::CryptoSession" id="519" addr="0x7f39042648d0" />
-                                    <attribute name="symtab" value="0x7f390425f470" id="520" addr="0x7f390425f470" />
+                                    <attribute name="parent" value="0x7f6d368756d0" id="518" addr="0x7f6d368756d0" />
+                                    <attribute name="qname" value="XBMCAddon::xbmcdrm::CryptoSession" id="519" addr="0x7f6d368768d0" />
+                                    <attribute name="symtab" value="0x7f6d36871470" id="520" addr="0x7f6d36871470" />
                                 </attributelist >
-                                <typescopesitem id="521" addr="0x7f39042638b0" >
-                                    <attributelist id="522" addr="0x7f39042638b0" >
+                                <typescopesitem id="521" addr="0x7f6d368758b0" >
+                                    <attributelist id="522" addr="0x7f6d368758b0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="523" addr="0x7f3904263970" >
-                                    <attributelist id="524" addr="0x7f3904263970" >
+                                <typescopesitem id="523" addr="0x7f6d36875970" >
+                                    <attributelist id="524" addr="0x7f6d36875970" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="525" addr="0x7f39042636d0" >
-                                    <attributelist id="526" addr="0x7f39042636d0" >
-                                        <attribute name="name" value="xbmcdrm" id="527" addr="0x7f39042648d0" />
-                                        <typetab id="528" addr="0x7f39042636f0" >
-                                            <attributelist id="529" addr="0x7f39042636f0" >
-                                                <attribute name="CryptoSession" value="CryptoSession" id="530" addr="0x7f39042648d0" />
+                                <typescopesitem id="525" addr="0x7f6d368756d0" >
+                                    <attributelist id="526" addr="0x7f6d368756d0" >
+                                        <attribute name="name" value="xbmcdrm" id="527" addr="0x7f6d368768d0" />
+                                        <typetab id="528" addr="0x7f6d368756f0" >
+                                            <attributelist id="529" addr="0x7f6d368756f0" >
+                                                <attribute name="CryptoSession" value="CryptoSession" id="530" addr="0x7f6d368768d0" />
                                             </attributelist >
-                                            <typetabsitem id="531" addr="0x7f3904263850" >
-                                                <attributelist id="532" addr="0x7f3904263850" >
+                                            <typetabsitem id="531" addr="0x7f6d36875850" >
+                                                <attributelist id="532" addr="0x7f6d36875850" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7f3904262f50" id="533" addr="0x7f3904262f50" />
-                                        <attribute name="qname" value="XBMCAddon::xbmcdrm" id="534" addr="0x7f39042648d0" />
-                                        <attribute name="symtab" value="0x7f390425ee30" id="535" addr="0x7f390425ee30" />
+                                        <attribute name="parent" value="0x7f6d36874f50" id="533" addr="0x7f6d36874f50" />
+                                        <attribute name="qname" value="XBMCAddon::xbmcdrm" id="534" addr="0x7f6d368768d0" />
+                                        <attribute name="symtab" value="0x7f6d36870e30" id="535" addr="0x7f6d36870e30" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="536" addr="0x7f3904263990" >
-                                    <attributelist id="537" addr="0x7f3904263990" >
+                                <typescopesitem id="536" addr="0x7f6d36875990" >
+                                    <attributelist id="537" addr="0x7f6d36875990" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="538" addr="0x7f390425f470" >
-                                    <attributelist id="539" addr="0x7f390425f470" >
-                                        <attribute name="name" value="CryptoSession" id="540" addr="0x7f39042648d0" />
-                                        <attribute name="csymtab" value="0x7f390425f4d0" id="541" addr="0x7f390425f4d0" />
-                                        <attribute name="symtab" value="0x7f390425f450" id="542" addr="0x7f390425f450" />
+                                <typescopesitem id="538" addr="0x7f6d36871470" >
+                                    <attributelist id="539" addr="0x7f6d36871470" >
+                                        <attribute name="name" value="CryptoSession" id="540" addr="0x7f6d368768d0" />
+                                        <attribute name="csymtab" value="0x7f6d368714d0" id="541" addr="0x7f6d368714d0" />
+                                        <attribute name="symtab" value="0x7f6d36871450" id="542" addr="0x7f6d36871450" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <cdecl id="543" addr="0x7f390425f5d0" >
-                            <attributelist id="544" addr="0x7f390425f5d0" >
-                                <attribute name="ismember" value="1" id="545" addr="0x7f39042648d0" />
-                                <attribute name="name" value="m_cryptoSession" id="546" addr="0x7f39042648d0" />
-                                <attribute name="decl" value="p." id="547" addr="0x7f39042648d0" />
-                                <attribute name="access" value="private" id="548" addr="0x7f39042648d0" />
-                                <attribute name="kind" value="variable" id="549" addr="0x7f39042648d0" />
-                                <attribute name="type" value="DRM::CCryptoSession" id="550" addr="0x7f39042648d0" />
-                                <attribute name="sym_symtab" value="0x7f390425f470" id="551" addr="0x7f390425f470" />
+                        <cdecl id="543" addr="0x7f6d368715d0" >
+                            <attributelist id="544" addr="0x7f6d368715d0" >
+                                <attribute name="ismember" value="1" id="545" addr="0x7f6d368768d0" />
+                                <attribute name="name" value="m_cryptoSession" id="546" addr="0x7f6d368768d0" />
+                                <attribute name="decl" value="p." id="547" addr="0x7f6d368768d0" />
+                                <attribute name="access" value="private" id="548" addr="0x7f6d368768d0" />
+                                <attribute name="kind" value="variable" id="549" addr="0x7f6d368768d0" />
+                                <attribute name="type" value="DRM::CCryptoSession" id="550" addr="0x7f6d368768d0" />
+                                <attribute name="sym_symtab" value="0x7f6d36871470" id="551" addr="0x7f6d36871470" />
                             </attributelist >
                          
                         </cdecl >
-                        <access id="552" addr="0x7f390425f790" >
-                            <attributelist id="553" addr="0x7f390425f790" >
-                                <attribute name="kind" value="public" id="554" addr="0x7f39042648d0" />
+                        <access id="552" addr="0x7f6d36871790" >
+                            <attributelist id="553" addr="0x7f6d36871790" >
+                                <attribute name="kind" value="public" id="554" addr="0x7f6d368768d0" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="555" addr="0x7f390425fbd0" >
-                            <attributelist id="556" addr="0x7f390425fbd0" >
-                                <attribute name="ismember" value="1" id="557" addr="0x7f39042648d0" />
-                                <attribute name="sym_name" value="CryptoSession" id="558" addr="0x7f39042648d0" />
-                                <attribute name="name" value="CryptoSession" id="559" addr="0x7f39042648d0" />
-                                <parmlist id="560" addr="0x7f390425f8d0" >
+                        <constructor id="555" addr="0x7f6d36871bd0" >
+                            <attributelist id="556" addr="0x7f6d36871bd0" >
+                                <attribute name="ismember" value="1" id="557" addr="0x7f6d368768d0" />
+                                <attribute name="sym_name" value="CryptoSession" id="558" addr="0x7f6d368768d0" />
+                                <attribute name="name" value="CryptoSession" id="559" addr="0x7f6d368768d0" />
+                                <parmlist id="560" addr="0x7f6d368718d0" >
                                     <parm id="561">
-                                        <attributelist id="562" addr="0x7f390425f8d0" >
-                                            <attribute name="name" value="UUID" id="563" addr="0x7f39042648d0" />
-                                            <attribute name="type" value="XBMCAddon::String" id="564" addr="0x7f39042648d0" />
+                                        <attributelist id="562" addr="0x7f6d368718d0" >
+                                            <attribute name="name" value="UUID" id="563" addr="0x7f6d368768d0" />
+                                            <attribute name="type" value="XBMCAddon::String" id="564" addr="0x7f6d368768d0" />
                                         </attributelist >
                                     </parm >
                                     <parm id="565">
-                                        <attributelist id="566" addr="0x7f390425f9f0" >
-                                            <attribute name="name" value="cipherAlgorithm" id="567" addr="0x7f39042648d0" />
-                                            <attribute name="type" value="XBMCAddon::String" id="568" addr="0x7f39042648d0" />
+                                        <attributelist id="566" addr="0x7f6d368719f0" >
+                                            <attribute name="name" value="cipherAlgorithm" id="567" addr="0x7f6d368768d0" />
+                                            <attribute name="type" value="XBMCAddon::String" id="568" addr="0x7f6d368768d0" />
                                         </attributelist >
                                     </parm >
                                     <parm id="569">
-                                        <attributelist id="570" addr="0x7f390425fb10" >
-                                            <attribute name="name" value="macAlgorithm" id="571" addr="0x7f39042648d0" />
-                                            <attribute name="type" value="XBMCAddon::String" id="572" addr="0x7f39042648d0" />
+                                        <attributelist id="570" addr="0x7f6d36871b10" >
+                                            <attribute name="name" value="macAlgorithm" id="571" addr="0x7f6d368768d0" />
+                                            <attribute name="type" value="XBMCAddon::String" id="572" addr="0x7f6d368768d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="decl" value="f(String,String,String)." id="573" addr="0x7f39042648d0" />
-                                <attribute name="access" value="public" id="574" addr="0x7f39042648d0" />
-                                <attribute name="feature_new" value="1" id="575" addr="0x7f39042648d0" />
-                                <attribute name="sym_symtab" value="0x7f390425f470" id="576" addr="0x7f390425f470" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="577" addr="0x7f39042648d0" />
+                                <attribute name="decl" value="f(String,String,String)." id="573" addr="0x7f6d368768d0" />
+                                <attribute name="access" value="public" id="574" addr="0x7f6d368768d0" />
+                                <attribute name="feature_new" value="1" id="575" addr="0x7f6d368768d0" />
+                                <attribute name="sym_symtab" value="0x7f6d36871470" id="576" addr="0x7f6d36871470" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="577" addr="0x7f6d368768d0" />
                             </attributelist >
                          
                         </constructor >
-                        <destructor id="578" addr="0x7f390425fd70" >
-                            <attributelist id="579" addr="0x7f390425fd70" >
-                                <attribute name="ismember" value="1" id="580" addr="0x7f39042648d0" />
-                                <attribute name="sym_name" value="~CryptoSession" id="581" addr="0x7f39042648d0" />
-                                <attribute name="name" value="~CryptoSession" id="582" addr="0x7f39042648d0" />
-                                <attribute name="decl" value="f()." id="583" addr="0x7f39042648d0" />
-                                <attribute name="access" value="public" id="584" addr="0x7f39042648d0" />
-                                <attribute name="sym_symtab" value="0x7f390425f470" id="585" addr="0x7f390425f470" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="586" addr="0x7f39042648d0" />
+                        <destructor id="578" addr="0x7f6d36871d70" >
+                            <attributelist id="579" addr="0x7f6d36871d70" >
+                                <attribute name="ismember" value="1" id="580" addr="0x7f6d368768d0" />
+                                <attribute name="sym_name" value="~CryptoSession" id="581" addr="0x7f6d368768d0" />
+                                <attribute name="name" value="~CryptoSession" id="582" addr="0x7f6d368768d0" />
+                                <attribute name="decl" value="f()." id="583" addr="0x7f6d368768d0" />
+                                <attribute name="access" value="public" id="584" addr="0x7f6d368768d0" />
+                                <attribute name="sym_symtab" value="0x7f6d36871470" id="585" addr="0x7f6d36871470" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="586" addr="0x7f6d368768d0" />
                             </attributelist >
                          
                         </destructor >
-                        <cdecl id="587" addr="0x7f39042605b0" >
-                            <attributelist id="588" addr="0x7f39042605b0" >
-                                <attribute name="name" value="GetKeyRequest" id="589" addr="0x7f39042648d0" />
-                                <attribute name="ismember" value="1" id="590" addr="0x7f39042648d0" />
-                                <attribute name="sym_symtab" value="0x7f390425f470" id="591" addr="0x7f390425f470" />
-                                <attribute name="kind" value="function" id="592" addr="0x7f39042648d0" />
-                                <attribute name="sym_name" value="GetKeyRequest" id="593" addr="0x7f39042648d0" />
-                                <attribute name="decl" value="f(r.q(const).XbmcCommons::Buffer,r.q(const).XBMCAddon::String,bool,r.q(const).std::map&lt;(XBMCAddon::String,XBMCAddon::String)>)." id="594" addr="0x7f39042648d0" />
-                                <attribute name="access" value="public" id="595" addr="0x7f39042648d0" />
-                                <parmlist id="596" addr="0x7f390425fff0" >
+                        <cdecl id="587" addr="0x7f6d368725b0" >
+                            <attributelist id="588" addr="0x7f6d368725b0" >
+                                <attribute name="name" value="GetKeyRequest" id="589" addr="0x7f6d368768d0" />
+                                <attribute name="ismember" value="1" id="590" addr="0x7f6d368768d0" />
+                                <attribute name="sym_symtab" value="0x7f6d36871470" id="591" addr="0x7f6d36871470" />
+                                <attribute name="kind" value="function" id="592" addr="0x7f6d368768d0" />
+                                <attribute name="sym_name" value="GetKeyRequest" id="593" addr="0x7f6d368768d0" />
+                                <attribute name="decl" value="f(r.q(const).XbmcCommons::Buffer,r.q(const).XBMCAddon::String,bool,r.q(const).std::map&lt;(XBMCAddon::String,XBMCAddon::String)>)." id="594" addr="0x7f6d368768d0" />
+                                <attribute name="access" value="public" id="595" addr="0x7f6d368768d0" />
+                                <parmlist id="596" addr="0x7f6d36871ff0" >
                                     <parm id="597">
-                                        <attributelist id="598" addr="0x7f390425fff0" >
-                                            <attribute name="name" value="init" id="599" addr="0x7f39042648d0" />
-                                            <attribute name="type" value="r.q(const).XbmcCommons::Buffer" id="600" addr="0x7f39042648d0" />
+                                        <attributelist id="598" addr="0x7f6d36871ff0" >
+                                            <attribute name="name" value="init" id="599" addr="0x7f6d368768d0" />
+                                            <attribute name="type" value="r.q(const).XbmcCommons::Buffer" id="600" addr="0x7f6d368768d0" />
                                         </attributelist >
                                     </parm >
                                     <parm id="601">
-                                        <attributelist id="602" addr="0x7f3904260130" >
-                                            <attribute name="name" value="mimeType" id="603" addr="0x7f39042648d0" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="604" addr="0x7f39042648d0" />
+                                        <attributelist id="602" addr="0x7f6d36872130" >
+                                            <attribute name="name" value="mimeType" id="603" addr="0x7f6d368768d0" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="604" addr="0x7f6d368768d0" />
                                         </attributelist >
                                     </parm >
                                     <parm id="605">
-                                        <attributelist id="606" addr="0x7f3904260230" >
-                                            <attribute name="name" value="offlineKey" id="607" addr="0x7f39042648d0" />
-                                            <attribute name="type" value="bool" id="608" addr="0x7f39042648d0" />
+                                        <attributelist id="606" addr="0x7f6d36872230" >
+                                            <attribute name="name" value="offlineKey" id="607" addr="0x7f6d368768d0" />
+                                            <attribute name="type" value="bool" id="608" addr="0x7f6d368768d0" />
                                         </attributelist >
                                     </parm >
                                     <parm id="609">
-                                        <attributelist id="610" addr="0x7f39042604f0" >
-                                            <attribute name="name" value="optionalParameters" id="611" addr="0x7f39042648d0" />
-                                            <attribute name="type" value="r.q(const).std::map&lt;(XBMCAddon::String,XBMCAddon::String)>" id="612" addr="0x7f39042648d0" />
+                                        <attributelist id="610" addr="0x7f6d368724f0" >
+                                            <attribute name="name" value="optionalParameters" id="611" addr="0x7f6d368768d0" />
+                                            <attribute name="type" value="r.q(const).std::map&lt;(XBMCAddon::String,XBMCAddon::String)>" id="612" addr="0x7f6d368768d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="XbmcCommons::Buffer" id="613" addr="0x7f39042648d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="614" addr="0x7f39042648d0" />
+                                <attribute name="type" value="XbmcCommons::Buffer" id="613" addr="0x7f6d368768d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="614" addr="0x7f6d368768d0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="615" addr="0x7f39042608d0" >
-                            <attributelist id="616" addr="0x7f39042608d0" >
-                                <attribute name="name" value="GetPropertyString" id="617" addr="0x7f39042648d0" />
-                                <attribute name="ismember" value="1" id="618" addr="0x7f39042648d0" />
-                                <attribute name="sym_symtab" value="0x7f390425f470" id="619" addr="0x7f390425f470" />
-                                <attribute name="kind" value="function" id="620" addr="0x7f39042648d0" />
-                                <attribute name="sym_name" value="GetPropertyString" id="621" addr="0x7f39042648d0" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="622" addr="0x7f39042648d0" />
-                                <attribute name="access" value="public" id="623" addr="0x7f39042648d0" />
-                                <parmlist id="624" addr="0x7f3904260810" >
+                        <cdecl id="615" addr="0x7f6d368728d0" >
+                            <attributelist id="616" addr="0x7f6d368728d0" >
+                                <attribute name="name" value="GetPropertyString" id="617" addr="0x7f6d368768d0" />
+                                <attribute name="ismember" value="1" id="618" addr="0x7f6d368768d0" />
+                                <attribute name="sym_symtab" value="0x7f6d36871470" id="619" addr="0x7f6d36871470" />
+                                <attribute name="kind" value="function" id="620" addr="0x7f6d368768d0" />
+                                <attribute name="sym_name" value="GetPropertyString" id="621" addr="0x7f6d368768d0" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="622" addr="0x7f6d368768d0" />
+                                <attribute name="access" value="public" id="623" addr="0x7f6d368768d0" />
+                                <parmlist id="624" addr="0x7f6d36872810" >
                                     <parm id="625">
-                                        <attributelist id="626" addr="0x7f3904260810" >
-                                            <attribute name="name" value="name" id="627" addr="0x7f39042648d0" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="628" addr="0x7f39042648d0" />
+                                        <attributelist id="626" addr="0x7f6d36872810" >
+                                            <attribute name="name" value="name" id="627" addr="0x7f6d368768d0" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="628" addr="0x7f6d368768d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="XBMCAddon::String" id="629" addr="0x7f39042648d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="630" addr="0x7f39042648d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="629" addr="0x7f6d368768d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="630" addr="0x7f6d368768d0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="631" addr="0x7f3904260c10" >
-                            <attributelist id="632" addr="0x7f3904260c10" >
-                                <attribute name="name" value="ProvideKeyResponse" id="633" addr="0x7f39042648d0" />
-                                <attribute name="ismember" value="1" id="634" addr="0x7f39042648d0" />
-                                <attribute name="sym_symtab" value="0x7f390425f470" id="635" addr="0x7f390425f470" />
-                                <attribute name="kind" value="function" id="636" addr="0x7f39042648d0" />
-                                <attribute name="sym_name" value="ProvideKeyResponse" id="637" addr="0x7f39042648d0" />
-                                <attribute name="decl" value="f(r.q(const).XbmcCommons::Buffer)." id="638" addr="0x7f39042648d0" />
-                                <attribute name="access" value="public" id="639" addr="0x7f39042648d0" />
-                                <parmlist id="640" addr="0x7f3904260b50" >
+                        <cdecl id="631" addr="0x7f6d36872c10" >
+                            <attributelist id="632" addr="0x7f6d36872c10" >
+                                <attribute name="name" value="ProvideKeyResponse" id="633" addr="0x7f6d368768d0" />
+                                <attribute name="ismember" value="1" id="634" addr="0x7f6d368768d0" />
+                                <attribute name="sym_symtab" value="0x7f6d36871470" id="635" addr="0x7f6d36871470" />
+                                <attribute name="kind" value="function" id="636" addr="0x7f6d368768d0" />
+                                <attribute name="sym_name" value="ProvideKeyResponse" id="637" addr="0x7f6d368768d0" />
+                                <attribute name="decl" value="f(r.q(const).XbmcCommons::Buffer)." id="638" addr="0x7f6d368768d0" />
+                                <attribute name="access" value="public" id="639" addr="0x7f6d368768d0" />
+                                <parmlist id="640" addr="0x7f6d36872b50" >
                                     <parm id="641">
-                                        <attributelist id="642" addr="0x7f3904260b50" >
-                                            <attribute name="name" value="response" id="643" addr="0x7f39042648d0" />
-                                            <attribute name="type" value="r.q(const).XbmcCommons::Buffer" id="644" addr="0x7f39042648d0" />
+                                        <attributelist id="642" addr="0x7f6d36872b50" >
+                                            <attribute name="name" value="response" id="643" addr="0x7f6d368768d0" />
+                                            <attribute name="type" value="r.q(const).XbmcCommons::Buffer" id="644" addr="0x7f6d368768d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="XBMCAddon::String" id="645" addr="0x7f39042648d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="646" addr="0x7f39042648d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="645" addr="0x7f6d368768d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="646" addr="0x7f6d368768d0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="647" addr="0x7f3904260dd0" >
-                            <attributelist id="648" addr="0x7f3904260dd0" >
-                                <attribute name="ismember" value="1" id="649" addr="0x7f39042648d0" />
-                                <attribute name="sym_name" value="RemoveKeys" id="650" addr="0x7f39042648d0" />
-                                <attribute name="name" value="RemoveKeys" id="651" addr="0x7f39042648d0" />
-                                <attribute name="decl" value="f()." id="652" addr="0x7f39042648d0" />
-                                <attribute name="access" value="public" id="653" addr="0x7f39042648d0" />
-                                <attribute name="kind" value="function" id="654" addr="0x7f39042648d0" />
-                                <attribute name="type" value="void" id="655" addr="0x7f39042648d0" />
-                                <attribute name="sym_symtab" value="0x7f390425f470" id="656" addr="0x7f390425f470" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="657" addr="0x7f39042648d0" />
+                        <cdecl id="647" addr="0x7f6d36872dd0" >
+                            <attributelist id="648" addr="0x7f6d36872dd0" >
+                                <attribute name="ismember" value="1" id="649" addr="0x7f6d368768d0" />
+                                <attribute name="sym_name" value="RemoveKeys" id="650" addr="0x7f6d368768d0" />
+                                <attribute name="name" value="RemoveKeys" id="651" addr="0x7f6d368768d0" />
+                                <attribute name="decl" value="f()." id="652" addr="0x7f6d368768d0" />
+                                <attribute name="access" value="public" id="653" addr="0x7f6d368768d0" />
+                                <attribute name="kind" value="function" id="654" addr="0x7f6d368768d0" />
+                                <attribute name="type" value="void" id="655" addr="0x7f6d368768d0" />
+                                <attribute name="sym_symtab" value="0x7f6d36871470" id="656" addr="0x7f6d36871470" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="657" addr="0x7f6d368768d0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="658" addr="0x7f39042610b0" >
-                            <attributelist id="659" addr="0x7f39042610b0" >
-                                <attribute name="name" value="RestoreKeys" id="660" addr="0x7f39042648d0" />
-                                <attribute name="ismember" value="1" id="661" addr="0x7f39042648d0" />
-                                <attribute name="sym_symtab" value="0x7f390425f470" id="662" addr="0x7f390425f470" />
-                                <attribute name="kind" value="function" id="663" addr="0x7f39042648d0" />
-                                <attribute name="sym_name" value="RestoreKeys" id="664" addr="0x7f39042648d0" />
-                                <attribute name="decl" value="f(XBMCAddon::String)." id="665" addr="0x7f39042648d0" />
-                                <attribute name="access" value="public" id="666" addr="0x7f39042648d0" />
-                                <parmlist id="667" addr="0x7f3904260ff0" >
+                        <cdecl id="658" addr="0x7f6d368730b0" >
+                            <attributelist id="659" addr="0x7f6d368730b0" >
+                                <attribute name="name" value="RestoreKeys" id="660" addr="0x7f6d368768d0" />
+                                <attribute name="ismember" value="1" id="661" addr="0x7f6d368768d0" />
+                                <attribute name="sym_symtab" value="0x7f6d36871470" id="662" addr="0x7f6d36871470" />
+                                <attribute name="kind" value="function" id="663" addr="0x7f6d368768d0" />
+                                <attribute name="sym_name" value="RestoreKeys" id="664" addr="0x7f6d368768d0" />
+                                <attribute name="decl" value="f(XBMCAddon::String)." id="665" addr="0x7f6d368768d0" />
+                                <attribute name="access" value="public" id="666" addr="0x7f6d368768d0" />
+                                <parmlist id="667" addr="0x7f6d36872ff0" >
                                     <parm id="668">
-                                        <attributelist id="669" addr="0x7f3904260ff0" >
-                                            <attribute name="name" value="keySetId" id="670" addr="0x7f39042648d0" />
-                                            <attribute name="type" value="XBMCAddon::String" id="671" addr="0x7f39042648d0" />
+                                        <attributelist id="669" addr="0x7f6d36872ff0" >
+                                            <attribute name="name" value="keySetId" id="670" addr="0x7f6d368768d0" />
+                                            <attribute name="type" value="XBMCAddon::String" id="671" addr="0x7f6d368768d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="672" addr="0x7f39042648d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="673" addr="0x7f39042648d0" />
+                                <attribute name="type" value="void" id="672" addr="0x7f6d368768d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="673" addr="0x7f6d368768d0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="674" addr="0x7f39042614f0" >
-                            <attributelist id="675" addr="0x7f39042614f0" >
-                                <attribute name="name" value="SetPropertyString" id="676" addr="0x7f39042648d0" />
-                                <attribute name="ismember" value="1" id="677" addr="0x7f39042648d0" />
-                                <attribute name="sym_symtab" value="0x7f390425f470" id="678" addr="0x7f390425f470" />
-                                <attribute name="kind" value="function" id="679" addr="0x7f39042648d0" />
-                                <attribute name="sym_name" value="SetPropertyString" id="680" addr="0x7f39042648d0" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="681" addr="0x7f39042648d0" />
-                                <attribute name="access" value="public" id="682" addr="0x7f39042648d0" />
-                                <parmlist id="683" addr="0x7f39042612f0" >
+                        <cdecl id="674" addr="0x7f6d368734f0" >
+                            <attributelist id="675" addr="0x7f6d368734f0" >
+                                <attribute name="name" value="SetPropertyString" id="676" addr="0x7f6d368768d0" />
+                                <attribute name="ismember" value="1" id="677" addr="0x7f6d368768d0" />
+                                <attribute name="sym_symtab" value="0x7f6d36871470" id="678" addr="0x7f6d36871470" />
+                                <attribute name="kind" value="function" id="679" addr="0x7f6d368768d0" />
+                                <attribute name="sym_name" value="SetPropertyString" id="680" addr="0x7f6d368768d0" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="681" addr="0x7f6d368768d0" />
+                                <attribute name="access" value="public" id="682" addr="0x7f6d368768d0" />
+                                <parmlist id="683" addr="0x7f6d368732f0" >
                                     <parm id="684">
-                                        <attributelist id="685" addr="0x7f39042612f0" >
-                                            <attribute name="name" value="name" id="686" addr="0x7f39042648d0" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="687" addr="0x7f39042648d0" />
+                                        <attributelist id="685" addr="0x7f6d368732f0" >
+                                            <attribute name="name" value="name" id="686" addr="0x7f6d368768d0" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="687" addr="0x7f6d368768d0" />
                                         </attributelist >
                                     </parm >
                                     <parm id="688">
-                                        <attributelist id="689" addr="0x7f3904261430" >
-                                            <attribute name="name" value="value" id="690" addr="0x7f39042648d0" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="691" addr="0x7f39042648d0" />
+                                        <attributelist id="689" addr="0x7f6d36873430" >
+                                            <attribute name="name" value="value" id="690" addr="0x7f6d368768d0" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="691" addr="0x7f6d368768d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="692" addr="0x7f39042648d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="693" addr="0x7f39042648d0" />
+                                <attribute name="type" value="void" id="692" addr="0x7f6d368768d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="693" addr="0x7f6d368768d0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="694" addr="0x7f3904261b10" >
-                            <attributelist id="695" addr="0x7f3904261b10" >
-                                <attribute name="name" value="Decrypt" id="696" addr="0x7f39042648d0" />
-                                <attribute name="ismember" value="1" id="697" addr="0x7f39042648d0" />
-                                <attribute name="sym_symtab" value="0x7f390425f470" id="698" addr="0x7f390425f470" />
-                                <attribute name="kind" value="function" id="699" addr="0x7f39042648d0" />
-                                <attribute name="sym_name" value="Decrypt" id="700" addr="0x7f39042648d0" />
-                                <attribute name="decl" value="f(r.q(const).XbmcCommons::Buffer,r.q(const).XbmcCommons::Buffer,r.q(const).XbmcCommons::Buffer)." id="701" addr="0x7f39042648d0" />
-                                <attribute name="access" value="public" id="702" addr="0x7f39042648d0" />
-                                <parmlist id="703" addr="0x7f3904261790" >
+                        <cdecl id="694" addr="0x7f6d36873b10" >
+                            <attributelist id="695" addr="0x7f6d36873b10" >
+                                <attribute name="name" value="Decrypt" id="696" addr="0x7f6d368768d0" />
+                                <attribute name="ismember" value="1" id="697" addr="0x7f6d368768d0" />
+                                <attribute name="sym_symtab" value="0x7f6d36871470" id="698" addr="0x7f6d36871470" />
+                                <attribute name="kind" value="function" id="699" addr="0x7f6d368768d0" />
+                                <attribute name="sym_name" value="Decrypt" id="700" addr="0x7f6d368768d0" />
+                                <attribute name="decl" value="f(r.q(const).XbmcCommons::Buffer,r.q(const).XbmcCommons::Buffer,r.q(const).XbmcCommons::Buffer)." id="701" addr="0x7f6d368768d0" />
+                                <attribute name="access" value="public" id="702" addr="0x7f6d368768d0" />
+                                <parmlist id="703" addr="0x7f6d36873790" >
                                     <parm id="704">
-                                        <attributelist id="705" addr="0x7f3904261790" >
-                                            <attribute name="name" value="cipherKeyId" id="706" addr="0x7f39042648d0" />
-                                            <attribute name="type" value="r.q(const).XbmcCommons::Buffer" id="707" addr="0x7f39042648d0" />
+                                        <attributelist id="705" addr="0x7f6d36873790" >
+                                            <attribute name="name" value="cipherKeyId" id="706" addr="0x7f6d368768d0" />
+                                            <attribute name="type" value="r.q(const).XbmcCommons::Buffer" id="707" addr="0x7f6d368768d0" />
                                         </attributelist >
                                     </parm >
                                     <parm id="708">
-                                        <attributelist id="709" addr="0x7f39042618f0" >
-                                            <attribute name="name" value="input" id="710" addr="0x7f39042648d0" />
-                                            <attribute name="type" value="r.q(const).XbmcCommons::Buffer" id="711" addr="0x7f39042648d0" />
+                                        <attributelist id="709" addr="0x7f6d368738f0" >
+                                            <attribute name="name" value="input" id="710" addr="0x7f6d368768d0" />
+                                            <attribute name="type" value="r.q(const).XbmcCommons::Buffer" id="711" addr="0x7f6d368768d0" />
                                         </attributelist >
                                     </parm >
                                     <parm id="712">
-                                        <attributelist id="713" addr="0x7f3904261a50" >
-                                            <attribute name="name" value="iv" id="714" addr="0x7f39042648d0" />
-                                            <attribute name="type" value="r.q(const).XbmcCommons::Buffer" id="715" addr="0x7f39042648d0" />
+                                        <attributelist id="713" addr="0x7f6d36873a50" >
+                                            <attribute name="name" value="iv" id="714" addr="0x7f6d368768d0" />
+                                            <attribute name="type" value="r.q(const).XbmcCommons::Buffer" id="715" addr="0x7f6d368768d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="XbmcCommons::Buffer" id="716" addr="0x7f39042648d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="717" addr="0x7f39042648d0" />
+                                <attribute name="type" value="XbmcCommons::Buffer" id="716" addr="0x7f6d368768d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="717" addr="0x7f6d368768d0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="718" addr="0x7f3904262130" >
-                            <attributelist id="719" addr="0x7f3904262130" >
-                                <attribute name="name" value="Encrypt" id="720" addr="0x7f39042648d0" />
-                                <attribute name="ismember" value="1" id="721" addr="0x7f39042648d0" />
-                                <attribute name="sym_symtab" value="0x7f390425f470" id="722" addr="0x7f390425f470" />
-                                <attribute name="kind" value="function" id="723" addr="0x7f39042648d0" />
-                                <attribute name="sym_name" value="Encrypt" id="724" addr="0x7f39042648d0" />
-                                <attribute name="decl" value="f(r.q(const).XbmcCommons::Buffer,r.q(const).XbmcCommons::Buffer,r.q(const).XbmcCommons::Buffer)." id="725" addr="0x7f39042648d0" />
-                                <attribute name="access" value="public" id="726" addr="0x7f39042648d0" />
-                                <parmlist id="727" addr="0x7f3904261db0" >
+                        <cdecl id="718" addr="0x7f6d36874130" >
+                            <attributelist id="719" addr="0x7f6d36874130" >
+                                <attribute name="name" value="Encrypt" id="720" addr="0x7f6d368768d0" />
+                                <attribute name="ismember" value="1" id="721" addr="0x7f6d368768d0" />
+                                <attribute name="sym_symtab" value="0x7f6d36871470" id="722" addr="0x7f6d36871470" />
+                                <attribute name="kind" value="function" id="723" addr="0x7f6d368768d0" />
+                                <attribute name="sym_name" value="Encrypt" id="724" addr="0x7f6d368768d0" />
+                                <attribute name="decl" value="f(r.q(const).XbmcCommons::Buffer,r.q(const).XbmcCommons::Buffer,r.q(const).XbmcCommons::Buffer)." id="725" addr="0x7f6d368768d0" />
+                                <attribute name="access" value="public" id="726" addr="0x7f6d368768d0" />
+                                <parmlist id="727" addr="0x7f6d36873db0" >
                                     <parm id="728">
-                                        <attributelist id="729" addr="0x7f3904261db0" >
-                                            <attribute name="name" value="cipherKeyId" id="730" addr="0x7f39042648d0" />
-                                            <attribute name="type" value="r.q(const).XbmcCommons::Buffer" id="731" addr="0x7f39042648d0" />
+                                        <attributelist id="729" addr="0x7f6d36873db0" >
+                                            <attribute name="name" value="cipherKeyId" id="730" addr="0x7f6d368768d0" />
+                                            <attribute name="type" value="r.q(const).XbmcCommons::Buffer" id="731" addr="0x7f6d368768d0" />
                                         </attributelist >
                                     </parm >
                                     <parm id="732">
-                                        <attributelist id="733" addr="0x7f3904261f10" >
-                                            <attribute name="name" value="input" id="734" addr="0x7f39042648d0" />
-                                            <attribute name="type" value="r.q(const).XbmcCommons::Buffer" id="735" addr="0x7f39042648d0" />
+                                        <attributelist id="733" addr="0x7f6d36873f10" >
+                                            <attribute name="name" value="input" id="734" addr="0x7f6d368768d0" />
+                                            <attribute name="type" value="r.q(const).XbmcCommons::Buffer" id="735" addr="0x7f6d368768d0" />
                                         </attributelist >
                                     </parm >
                                     <parm id="736">
-                                        <attributelist id="737" addr="0x7f3904262070" >
-                                            <attribute name="name" value="iv" id="738" addr="0x7f39042648d0" />
-                                            <attribute name="type" value="r.q(const).XbmcCommons::Buffer" id="739" addr="0x7f39042648d0" />
+                                        <attributelist id="737" addr="0x7f6d36874070" >
+                                            <attribute name="name" value="iv" id="738" addr="0x7f6d368768d0" />
+                                            <attribute name="type" value="r.q(const).XbmcCommons::Buffer" id="739" addr="0x7f6d368768d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="XbmcCommons::Buffer" id="740" addr="0x7f39042648d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="741" addr="0x7f39042648d0" />
+                                <attribute name="type" value="XbmcCommons::Buffer" id="740" addr="0x7f6d368768d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="741" addr="0x7f6d368768d0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="742" addr="0x7f39042625f0" >
-                            <attributelist id="743" addr="0x7f39042625f0" >
-                                <attribute name="name" value="Sign" id="744" addr="0x7f39042648d0" />
-                                <attribute name="ismember" value="1" id="745" addr="0x7f39042648d0" />
-                                <attribute name="sym_symtab" value="0x7f390425f470" id="746" addr="0x7f390425f470" />
-                                <attribute name="kind" value="function" id="747" addr="0x7f39042648d0" />
-                                <attribute name="sym_name" value="Sign" id="748" addr="0x7f39042648d0" />
-                                <attribute name="decl" value="f(r.q(const).XbmcCommons::Buffer,r.q(const).XbmcCommons::Buffer)." id="749" addr="0x7f39042648d0" />
-                                <attribute name="access" value="public" id="750" addr="0x7f39042648d0" />
-                                <parmlist id="751" addr="0x7f39042623d0" >
+                        <cdecl id="742" addr="0x7f6d368745f0" >
+                            <attributelist id="743" addr="0x7f6d368745f0" >
+                                <attribute name="name" value="Sign" id="744" addr="0x7f6d368768d0" />
+                                <attribute name="ismember" value="1" id="745" addr="0x7f6d368768d0" />
+                                <attribute name="sym_symtab" value="0x7f6d36871470" id="746" addr="0x7f6d36871470" />
+                                <attribute name="kind" value="function" id="747" addr="0x7f6d368768d0" />
+                                <attribute name="sym_name" value="Sign" id="748" addr="0x7f6d368768d0" />
+                                <attribute name="decl" value="f(r.q(const).XbmcCommons::Buffer,r.q(const).XbmcCommons::Buffer)." id="749" addr="0x7f6d368768d0" />
+                                <attribute name="access" value="public" id="750" addr="0x7f6d368768d0" />
+                                <parmlist id="751" addr="0x7f6d368743d0" >
                                     <parm id="752">
-                                        <attributelist id="753" addr="0x7f39042623d0" >
-                                            <attribute name="name" value="macKeyId" id="754" addr="0x7f39042648d0" />
-                                            <attribute name="type" value="r.q(const).XbmcCommons::Buffer" id="755" addr="0x7f39042648d0" />
+                                        <attributelist id="753" addr="0x7f6d368743d0" >
+                                            <attribute name="name" value="macKeyId" id="754" addr="0x7f6d368768d0" />
+                                            <attribute name="type" value="r.q(const).XbmcCommons::Buffer" id="755" addr="0x7f6d368768d0" />
                                         </attributelist >
                                     </parm >
                                     <parm id="756">
-                                        <attributelist id="757" addr="0x7f3904262530" >
-                                            <attribute name="name" value="message" id="758" addr="0x7f39042648d0" />
-                                            <attribute name="type" value="r.q(const).XbmcCommons::Buffer" id="759" addr="0x7f39042648d0" />
+                                        <attributelist id="757" addr="0x7f6d36874530" >
+                                            <attribute name="name" value="message" id="758" addr="0x7f6d368768d0" />
+                                            <attribute name="type" value="r.q(const).XbmcCommons::Buffer" id="759" addr="0x7f6d368768d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="XbmcCommons::Buffer" id="760" addr="0x7f39042648d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="761" addr="0x7f39042648d0" />
+                                <attribute name="type" value="XbmcCommons::Buffer" id="760" addr="0x7f6d368768d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="761" addr="0x7f6d368768d0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="762" addr="0x7f3904262bd0" >
-                            <attributelist id="763" addr="0x7f3904262bd0" >
-                                <attribute name="ismember" value="1" id="764" addr="0x7f39042648d0" />
-                                <attribute name="sym_name" value="Verify" id="765" addr="0x7f39042648d0" />
-                                <attribute name="name" value="Verify" id="766" addr="0x7f39042648d0" />
-                                <attribute name="decl" value="f(r.q(const).XbmcCommons::Buffer,r.q(const).XbmcCommons::Buffer,r.q(const).XbmcCommons::Buffer)." id="767" addr="0x7f39042648d0" />
-                                <parmlist id="768" addr="0x7f3904262850" >
+                        <cdecl id="762" addr="0x7f6d36874bd0" >
+                            <attributelist id="763" addr="0x7f6d36874bd0" >
+                                <attribute name="ismember" value="1" id="764" addr="0x7f6d368768d0" />
+                                <attribute name="sym_name" value="Verify" id="765" addr="0x7f6d368768d0" />
+                                <attribute name="name" value="Verify" id="766" addr="0x7f6d368768d0" />
+                                <attribute name="decl" value="f(r.q(const).XbmcCommons::Buffer,r.q(const).XbmcCommons::Buffer,r.q(const).XbmcCommons::Buffer)." id="767" addr="0x7f6d368768d0" />
+                                <parmlist id="768" addr="0x7f6d36874850" >
                                     <parm id="769">
-                                        <attributelist id="770" addr="0x7f3904262850" >
-                                            <attribute name="name" value="macKeyId" id="771" addr="0x7f39042648d0" />
-                                            <attribute name="type" value="r.q(const).XbmcCommons::Buffer" id="772" addr="0x7f39042648d0" />
+                                        <attributelist id="770" addr="0x7f6d36874850" >
+                                            <attribute name="name" value="macKeyId" id="771" addr="0x7f6d368768d0" />
+                                            <attribute name="type" value="r.q(const).XbmcCommons::Buffer" id="772" addr="0x7f6d368768d0" />
                                         </attributelist >
                                     </parm >
                                     <parm id="773">
-                                        <attributelist id="774" addr="0x7f39042629b0" >
-                                            <attribute name="name" value="message" id="775" addr="0x7f39042648d0" />
-                                            <attribute name="type" value="r.q(const).XbmcCommons::Buffer" id="776" addr="0x7f39042648d0" />
+                                        <attributelist id="774" addr="0x7f6d368749b0" >
+                                            <attribute name="name" value="message" id="775" addr="0x7f6d368768d0" />
+                                            <attribute name="type" value="r.q(const).XbmcCommons::Buffer" id="776" addr="0x7f6d368768d0" />
                                         </attributelist >
                                     </parm >
                                     <parm id="777">
-                                        <attributelist id="778" addr="0x7f3904262b10" >
-                                            <attribute name="name" value="signature" id="779" addr="0x7f39042648d0" />
-                                            <attribute name="type" value="r.q(const).XbmcCommons::Buffer" id="780" addr="0x7f39042648d0" />
+                                        <attributelist id="778" addr="0x7f6d36874b10" >
+                                            <attribute name="name" value="signature" id="779" addr="0x7f6d368768d0" />
+                                            <attribute name="type" value="r.q(const).XbmcCommons::Buffer" id="780" addr="0x7f6d368768d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="access" value="public" id="781" addr="0x7f39042648d0" />
-                                <attribute name="kind" value="function" id="782" addr="0x7f39042648d0" />
-                                <attribute name="type" value="bool" id="783" addr="0x7f39042648d0" />
-                                <attribute name="sym_symtab" value="0x7f390425f470" id="784" addr="0x7f390425f470" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="785" addr="0x7f39042648d0" />
+                                <attribute name="access" value="public" id="781" addr="0x7f6d368768d0" />
+                                <attribute name="kind" value="function" id="782" addr="0x7f6d368768d0" />
+                                <attribute name="type" value="bool" id="783" addr="0x7f6d368768d0" />
+                                <attribute name="sym_symtab" value="0x7f6d36871470" id="784" addr="0x7f6d36871470" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="785" addr="0x7f6d368768d0" />
                             </attributelist >
                          
                         </cdecl >
diff --git a/srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmcgui.i.cpp b/srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmcgui.i.cpp
similarity index 99%
rename from srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmcgui.i.cpp
rename to srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmcgui.i.cpp
index e31ce7ce8c1..fbee7dfdb3b 100644
--- a/srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmcgui.i.cpp
+++ b/srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmcgui.i.cpp
@@ -13783,7 +13783,7 @@ namespace PythonBindings
 
    // constants
    PyModule_AddStringConstant(module, "__author__", "Team Kodi <http://kodi.tv>");
-   PyModule_AddStringConstant(module, "__date__", "Wed Jun 19 18:36:56 GMT 2019");
+   PyModule_AddStringConstant(module, "__date__", "Sun Sep 01 10:46:59 GMT 2019");
    PyModule_AddStringConstant(module, "__version__", "2.26.0");
    PyModule_AddStringConstant(module, "__credits__", "Team Kodi");
    PyModule_AddStringConstant(module, "__platform__", "ALL");
diff --git a/srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmcgui.i.xml b/srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmcgui.i.xml
similarity index 67%
rename from srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmcgui.i.xml
rename to srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmcgui.i.xml
index 7cb59a9924b..1bcca339147 100644
--- a/srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmcgui.i.xml
+++ b/srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmcgui.i.xml
@@ -1,141 +1,141 @@
 <?xml version="1.0" ?> 
-<top id="1" addr="0x7f99f1e1eb30" >
-    <attributelist id="2" addr="0x7f99f1e1eb30" >
-        <attribute name="outfile" value="AddonModuleXbmcgui.i.xml" id="3" addr="0x7f99f1de6c90" />
-        <attribute name="name" value="xbmcgui" id="4" addr="0x7f99f1de6c90" />
-        <attribute name="module" value="xbmcgui" id="5" addr="0x7f99f1e402f0" />
-        <attribute name="inputfile" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmcgui.i" id="6" addr="0x7f99f1de6c90" />
-        <attribute name="classes" value="0x7f99f1e3d810" id="7" addr="0x7f99f1e3d810" />
-        <attribute name="infile" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmcgui.i" id="8" addr="0x7f99f1de6c90" />
-        <attribute name="outfile_h" value="AddonModuleXbmcgui.i.h" id="9" addr="0x7f99f1de6c90" />
+<top id="1" addr="0x7fca4696cb30" >
+    <attributelist id="2" addr="0x7fca4696cb30" >
+        <attribute name="outfile" value="AddonModuleXbmcgui.i.xml" id="3" addr="0x7fca46934c90" />
+        <attribute name="name" value="xbmcgui" id="4" addr="0x7fca46934c90" />
+        <attribute name="module" value="xbmcgui" id="5" addr="0x7fca4698e2f0" />
+        <attribute name="inputfile" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmcgui.i" id="6" addr="0x7fca46934c90" />
+        <attribute name="classes" value="0x7fca4698b810" id="7" addr="0x7fca4698b810" />
+        <attribute name="infile" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmcgui.i" id="8" addr="0x7fca46934c90" />
+        <attribute name="outfile_h" value="AddonModuleXbmcgui.i.h" id="9" addr="0x7fca46934c90" />
     </attributelist >
 
-    <include id="10" addr="0x7f99f1e2eed0" >
-        <attributelist id="11" addr="0x7f99f1e2eed0" >
-            <attribute name="name" value="/usr/share/swig/3.0.12/swig.swg" id="12" addr="0x7f99f1de6c90" />
+    <include id="10" addr="0x7fca4697ced0" >
+        <attributelist id="11" addr="0x7fca4697ced0" >
+            <attribute name="name" value="/usr/share/swig/3.0.12/swig.swg" id="12" addr="0x7fca46934c90" />
         </attributelist >
 
-        <include id="13" addr="0x7f99f1e2ef30" >
-            <attributelist id="14" addr="0x7f99f1e2ef30" >
-                <attribute name="name" value="/usr/share/swig/3.0.12/swigwarnings.swg" id="15" addr="0x7f99f1de6c90" />
+        <include id="13" addr="0x7fca4697cf30" >
+            <attributelist id="14" addr="0x7fca4697cf30" >
+                <attribute name="name" value="/usr/share/swig/3.0.12/swigwarnings.swg" id="15" addr="0x7fca46934c90" />
             </attributelist >
 
-            <include id="16" addr="0x7f99f1e2ff50" >
-                <attributelist id="17" addr="0x7f99f1e2ff50" >
-                    <attribute name="name" value="/usr/share/swig/3.0.12/swigwarn.swg" id="18" addr="0x7f99f1de6c90" />
+            <include id="16" addr="0x7fca4697df50" >
+                <attributelist id="17" addr="0x7fca4697df50" >
+                    <attribute name="name" value="/usr/share/swig/3.0.12/swigwarn.swg" id="18" addr="0x7fca46934c90" />
                 </attributelist >
              
             </include >
         </include >
-        <namespace id="19" addr="0x7f99f1e3d330" >
-            <attributelist id="20" addr="0x7f99f1e3d330" >
-                <attribute name="sym_name" value="std" id="21" addr="0x7f99f1de6c90" />
-                <attribute name="name" value="std" id="22" addr="0x7f99f1de6c90" />
-                <typescope id="23" addr="0x7f99f1dd1cf0" >
-                    <attributelist id="24" addr="0x7f99f1dd1cf0" >
-                        <attribute name="name" value="std" id="25" addr="0x7f99f1de6c90" />
-                        <typetab id="26" addr="0x7f99f1dd1d10" >
-                            <attributelist id="27" addr="0x7f99f1dd1d10" >
-                                <attribute name="initializer_list" value="initializer_list" id="28" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                            <typetabsitem id="29" addr="0x7f99f1dd1e30" >
-                                <attributelist id="30" addr="0x7f99f1dd1e30" >
+        <namespace id="19" addr="0x7fca4698b330" >
+            <attributelist id="20" addr="0x7fca4698b330" >
+                <attribute name="sym_name" value="std" id="21" addr="0x7fca46934c90" />
+                <attribute name="name" value="std" id="22" addr="0x7fca46934c90" />
+                <typescope id="23" addr="0x7fca4691fcf0" >
+                    <attributelist id="24" addr="0x7fca4691fcf0" >
+                        <attribute name="name" value="std" id="25" addr="0x7fca46934c90" />
+                        <typetab id="26" addr="0x7fca4691fd10" >
+                            <attributelist id="27" addr="0x7fca4691fd10" >
+                                <attribute name="initializer_list" value="initializer_list" id="28" addr="0x7fca46934c90" />
+                            </attributelist >
+                            <typetabsitem id="29" addr="0x7fca4691fe30" >
+                                <attributelist id="30" addr="0x7fca4691fe30" >
                                 </attributelist >
                             </typetabsitem >
                         </typetab >
-                        <attribute name="parent" value="0x7f99f1e1da30" id="31" addr="0x7f99f1e1da30" />
-                        <attribute name="qname" value="std" id="32" addr="0x7f99f1de6c90" />
-                        <attribute name="symtab" value="0x7f99f1e3d290" id="33" addr="0x7f99f1e3d290" />
+                        <attribute name="parent" value="0x7fca4696ba30" id="31" addr="0x7fca4696ba30" />
+                        <attribute name="qname" value="std" id="32" addr="0x7fca46934c90" />
+                        <attribute name="symtab" value="0x7fca4698b290" id="33" addr="0x7fca4698b290" />
                     </attributelist >
-                    <typescopesitem id="34" addr="0x7f99f1e3d1f0" >
-                        <attributelist id="35" addr="0x7f99f1e3d1f0" >
+                    <typescopesitem id="34" addr="0x7fca4698b1f0" >
+                        <attributelist id="35" addr="0x7fca4698b1f0" >
                         </attributelist >
                     </typescopesitem >
-                    <typescopesitem id="36" addr="0x7f99f1dd1d10" >
-                        <attributelist id="37" addr="0x7f99f1dd1d10" >
-                            <attribute name="initializer_list" value="initializer_list" id="38" addr="0x7f99f1de6c90" />
+                    <typescopesitem id="36" addr="0x7fca4691fd10" >
+                        <attributelist id="37" addr="0x7fca4691fd10" >
+                            <attribute name="initializer_list" value="initializer_list" id="38" addr="0x7fca46934c90" />
                         </attributelist >
                     </typescopesitem >
-                    <typescopesitem id="39" addr="0x7f99f1e1da30" >
-                        <attributelist id="40" addr="0x7f99f1e1da30" >
-                            <attribute name="name" value="" id="41" addr="0x7f99f1de6c90" />
-                            <typetab id="42" addr="0x7f99f1e1da90" >
-                                <attributelist id="43" addr="0x7f99f1e1da90" >
+                    <typescopesitem id="39" addr="0x7fca4696ba30" >
+                        <attributelist id="40" addr="0x7fca4696ba30" >
+                            <attribute name="name" value="" id="41" addr="0x7fca46934c90" />
+                            <typetab id="42" addr="0x7fca4696ba90" >
+                                <attributelist id="43" addr="0x7fca4696ba90" >
                                 </attributelist >
                             </typetab >
                         </attributelist >
                     </typescopesitem >
-                    <typescopesitem id="44" addr="0x7f99f1dd1d30" >
-                        <attributelist id="45" addr="0x7f99f1dd1d30" >
+                    <typescopesitem id="44" addr="0x7fca4691fd30" >
+                        <attributelist id="45" addr="0x7fca4691fd30" >
                         </attributelist >
                     </typescopesitem >
-                    <typescopesitem id="46" addr="0x7f99f1e3d290" >
-                        <attributelist id="47" addr="0x7f99f1e3d290" >
-                            <attribute name="name" value="std" id="48" addr="0x7f99f1de6c90" />
-                            <attribute name="csymtab" value="0x7f99f1e3d2d0" id="49" addr="0x7f99f1e3d2d0" />
-                            <attribute name="symtab" value="0x7f99f1e3d270" id="50" addr="0x7f99f1e3d270" />
+                    <typescopesitem id="46" addr="0x7fca4698b290" >
+                        <attributelist id="47" addr="0x7fca4698b290" >
+                            <attribute name="name" value="std" id="48" addr="0x7fca46934c90" />
+                            <attribute name="csymtab" value="0x7fca4698b2d0" id="49" addr="0x7fca4698b2d0" />
+                            <attribute name="symtab" value="0x7fca4698b270" id="50" addr="0x7fca4698b270" />
                         </attributelist >
                     </typescopesitem >
                 </typescope >
-                <attribute name="symtab" value="0x7f99f1e3d290" id="51" addr="0x7f99f1e3d290" />
-                <attribute name="sym_symtab" value="0x7f99f1e1d950" id="52" addr="0x7f99f1e1d950" />
-                <attribute name="sym_overname" value="__SWIG_0" id="53" addr="0x7f99f1de6c90" />
+                <attribute name="symtab" value="0x7fca4698b290" id="51" addr="0x7fca4698b290" />
+                <attribute name="sym_symtab" value="0x7fca4696b950" id="52" addr="0x7fca4696b950" />
+                <attribute name="sym_overname" value="__SWIG_0" id="53" addr="0x7fca46934c90" />
             </attributelist >
 
-            <template id="54" addr="0x7f99f1e3d4b0" >
-                <attributelist id="55" addr="0x7f99f1e3d4b0" >
-                    <attribute name="templatetype" value="class" id="56" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_typename" value="1" id="57" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="initializer_list" id="58" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e3d290" id="59" addr="0x7f99f1e3d290" />
-                    <attribute name="symtab" value="0x7f99f1e3d6d0" id="60" addr="0x7f99f1e3d6d0" />
-                    <attribute name="allows_typedef" value="1" id="61" addr="0x7f99f1de6c90" />
-                    <attribute name="kind" value="class" id="62" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_name" value="initializer_list" id="63" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="64" addr="0x7f99f1de6c90" />
-                    <templateparms id="65" addr="0x7f99f1e3d3d0" >
+            <template id="54" addr="0x7fca4698b4b0" >
+                <attributelist id="55" addr="0x7fca4698b4b0" >
+                    <attribute name="templatetype" value="class" id="56" addr="0x7fca46934c90" />
+                    <attribute name="sym_typename" value="1" id="57" addr="0x7fca46934c90" />
+                    <attribute name="name" value="initializer_list" id="58" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4698b290" id="59" addr="0x7fca4698b290" />
+                    <attribute name="symtab" value="0x7fca4698b6d0" id="60" addr="0x7fca4698b6d0" />
+                    <attribute name="allows_typedef" value="1" id="61" addr="0x7fca46934c90" />
+                    <attribute name="kind" value="class" id="62" addr="0x7fca46934c90" />
+                    <attribute name="sym_name" value="initializer_list" id="63" addr="0x7fca46934c90" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="64" addr="0x7fca46934c90" />
+                    <templateparms id="65" addr="0x7fca4698b3d0" >
                         <parm id="66">
-                            <attributelist id="67" addr="0x7f99f1e3d3d0" >
-                                <attribute name="name" value="T" id="68" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="typename T" id="69" addr="0x7f99f1de6c90" />
+                            <attributelist id="67" addr="0x7fca4698b3d0" >
+                                <attribute name="name" value="T" id="68" addr="0x7fca46934c90" />
+                                <attribute name="type" value="typename T" id="69" addr="0x7fca46934c90" />
                             </attributelist >
                         </parm >
                     </templateparms >
                 </attributelist >
 
-                <access id="70" addr="0x7f99f1e3d890" >
-                    <attributelist id="71" addr="0x7f99f1e3d890" >
-                        <attribute name="kind" value="public" id="72" addr="0x7f99f1de6c90" />
+                <access id="70" addr="0x7fca4698b890" >
+                    <attributelist id="71" addr="0x7fca4698b890" >
+                        <attribute name="kind" value="public" id="72" addr="0x7fca46934c90" />
                     </attributelist >
                  
                 </access >
             </template >
-            <typemap id="73" addr="0x7f99f1e3def0" >
-                <attributelist id="74" addr="0x7f99f1e3def0" >
-                    <kwargs id="75" addr="0x7f99f1e3dbf0" >
-                        <attributelist id="76" addr="0x7f99f1e3dbf0" >
-                            <attribute name="name" value="warning" id="77" addr="0x7f99f1de6c90" />
-                            <attribute name="value" value="476:Initialization using std::initializer_list." id="78" addr="0x7f99f1de6c90" />
+            <typemap id="73" addr="0x7fca4698bef0" >
+                <attributelist id="74" addr="0x7fca4698bef0" >
+                    <kwargs id="75" addr="0x7fca4698bbf0" >
+                        <attributelist id="76" addr="0x7fca4698bbf0" >
+                            <attribute name="name" value="warning" id="77" addr="0x7fca46934c90" />
+                            <attribute name="value" value="476:Initialization using std::initializer_list." id="78" addr="0x7fca46934c90" />
                         </attributelist >
-                        <kwargssitem id="79" addr="0x7f99f1e3dd70" >
-                            <attributelist id="80" addr="0x7f99f1e3dd70" >
+                        <kwargssitem id="79" addr="0x7fca4698bd70" >
+                            <attributelist id="80" addr="0x7fca4698bd70" >
                             </attributelist >
                         </kwargssitem >
-                        <kwargssitem id="81" addr="0x7f99f1e3dbd0" >
-                            <attributelist id="82" addr="0x7f99f1e3dbd0" >
+                        <kwargssitem id="81" addr="0x7fca4698bbd0" >
+                            <attributelist id="82" addr="0x7fca4698bbd0" >
                             </attributelist >
                         </kwargssitem >
                     </kwargs >
-                    <attribute name="code" value="" id="83" addr="0x7f99f1de6c90" />
-                    <attribute name="method" value="in" id="84" addr="0x7f99f1de6c90" />
+                    <attribute name="code" value="" id="83" addr="0x7fca46934c90" />
+                    <attribute name="method" value="in" id="84" addr="0x7fca46934c90" />
                 </attributelist >
 
-                <typemapitem id="85" addr="0x7f99f1e3de10" >
-                    <attributelist id="86" addr="0x7f99f1e3de10" >
-                        <parmlist id="87" addr="0x7f99f1e3de50" >
+                <typemapitem id="85" addr="0x7fca4698be10" >
+                    <attributelist id="86" addr="0x7fca4698be10" >
+                        <parmlist id="87" addr="0x7fca4698be50" >
                             <parm id="88">
-                                <attributelist id="89" addr="0x7f99f1e3de50" >
-                                    <attribute name="type" value="std::initializer_list&lt;(T)>" id="90" addr="0x7f99f1de6c90" />
+                                <attributelist id="89" addr="0x7fca4698be50" >
+                                    <attribute name="type" value="std::initializer_list&lt;(T)>" id="90" addr="0x7fca46934c90" />
                                 </attributelist >
                             </parm >
                         </parmlist >
@@ -143,32 +143,32 @@
                  
                 </typemapitem >
             </typemap >
-            <typemap id="91" addr="0x7f99f1e3e270" >
-                <attributelist id="92" addr="0x7f99f1e3e270" >
-                    <kwargs id="93" addr="0x7f99f1e3e010" >
-                        <attributelist id="94" addr="0x7f99f1e3e010" >
-                            <attribute name="name" value="precedence" id="95" addr="0x7f99f1de6c90" />
-                            <attribute name="value" value="0" id="96" addr="0x7f99f1de6c90" />
+            <typemap id="91" addr="0x7fca4698c270" >
+                <attributelist id="92" addr="0x7fca4698c270" >
+                    <kwargs id="93" addr="0x7fca4698c010" >
+                        <attributelist id="94" addr="0x7fca4698c010" >
+                            <attribute name="name" value="precedence" id="95" addr="0x7fca46934c90" />
+                            <attribute name="value" value="0" id="96" addr="0x7fca46934c90" />
                         </attributelist >
-                        <kwargssitem id="97" addr="0x7f99f1e3e030" >
-                            <attributelist id="98" addr="0x7f99f1e3e030" >
+                        <kwargssitem id="97" addr="0x7fca4698c030" >
+                            <attributelist id="98" addr="0x7fca4698c030" >
                             </attributelist >
                         </kwargssitem >
-                        <kwargssitem id="99" addr="0x7f99f1e3e050" >
-                            <attributelist id="100" addr="0x7f99f1e3e050" >
+                        <kwargssitem id="99" addr="0x7fca4698c050" >
+                            <attributelist id="100" addr="0x7fca4698c050" >
                             </attributelist >
                         </kwargssitem >
                     </kwargs >
-                    <attribute name="code" value="" id="101" addr="0x7f99f1de6c90" />
-                    <attribute name="method" value="typecheck" id="102" addr="0x7f99f1de6c90" />
+                    <attribute name="code" value="" id="101" addr="0x7fca46934c90" />
+                    <attribute name="method" value="typecheck" id="102" addr="0x7fca46934c90" />
                 </attributelist >
 
-                <typemapitem id="103" addr="0x7f99f1e3e1b0" >
-                    <attributelist id="104" addr="0x7f99f1e3e1b0" >
-                        <parmlist id="105" addr="0x7f99f1e3e1f0" >
+                <typemapitem id="103" addr="0x7fca4698c1b0" >
+                    <attributelist id="104" addr="0x7fca4698c1b0" >
+                        <parmlist id="105" addr="0x7fca4698c1f0" >
                             <parm id="106">
-                                <attributelist id="107" addr="0x7f99f1e3e1f0" >
-                                    <attribute name="type" value="std::initializer_list&lt;(T)>" id="108" addr="0x7f99f1de6c90" />
+                                <attributelist id="107" addr="0x7fca4698c1f0" >
+                                    <attribute name="type" value="std::initializer_list&lt;(T)>" id="108" addr="0x7fca46934c90" />
                                 </attributelist >
                             </parm >
                         </parmlist >
@@ -177,18 +177,18 @@
                 </typemapitem >
             </typemap >
         </namespace >
-        <typemap id="109" addr="0x7f99f1e3e490" >
-            <attributelist id="110" addr="0x7f99f1e3e490" >
-                <attribute name="code" value="delete [] $1;" id="111" addr="0x7f99f1de6c90" />
-                <attribute name="method" value="newfree" id="112" addr="0x7f99f1de6c90" />
+        <typemap id="109" addr="0x7fca4698c490" >
+            <attributelist id="110" addr="0x7fca4698c490" >
+                <attribute name="code" value="delete [] $1;" id="111" addr="0x7fca46934c90" />
+                <attribute name="method" value="newfree" id="112" addr="0x7fca46934c90" />
             </attributelist >
 
-            <typemapitem id="113" addr="0x7f99f1e3e3b0" >
-                <attributelist id="114" addr="0x7f99f1e3e3b0" >
-                    <parmlist id="115" addr="0x7f99f1e3e3f0" >
+            <typemapitem id="113" addr="0x7fca4698c3b0" >
+                <attributelist id="114" addr="0x7fca4698c3b0" >
+                    <parmlist id="115" addr="0x7fca4698c3f0" >
                         <parm id="116">
-                            <attributelist id="117" addr="0x7f99f1e3e3f0" >
-                                <attribute name="type" value="p.char" id="118" addr="0x7f99f1de6c90" />
+                            <attributelist id="117" addr="0x7fca4698c3f0" >
+                                <attribute name="type" value="p.char" id="118" addr="0x7fca46934c90" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -196,18 +196,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="119" addr="0x7f99f1e3e670" >
-            <attributelist id="120" addr="0x7f99f1e3e670" >
-                <attribute name="code" value="{&#10;  delete [] $1;&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="121" addr="0x7f99f1de6c90" />
-                <attribute name="method" value="memberin" id="122" addr="0x7f99f1de6c90" />
+        <typemap id="119" addr="0x7fca4698c670" >
+            <attributelist id="120" addr="0x7fca4698c670" >
+                <attribute name="code" value="{&#10;  delete [] $1;&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="121" addr="0x7fca46934c90" />
+                <attribute name="method" value="memberin" id="122" addr="0x7fca46934c90" />
             </attributelist >
 
-            <typemapitem id="123" addr="0x7f99f1e3e5b0" >
-                <attributelist id="124" addr="0x7f99f1e3e5b0" >
-                    <parmlist id="125" addr="0x7f99f1e3e5f0" >
+            <typemapitem id="123" addr="0x7fca4698c5b0" >
+                <attributelist id="124" addr="0x7fca4698c5b0" >
+                    <parmlist id="125" addr="0x7fca4698c5f0" >
                         <parm id="126">
-                            <attributelist id="127" addr="0x7f99f1e3e5f0" >
-                                <attribute name="type" value="p.char" id="128" addr="0x7f99f1de6c90" />
+                            <attributelist id="127" addr="0x7fca4698c5f0" >
+                                <attribute name="type" value="p.char" id="128" addr="0x7fca46934c90" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -215,32 +215,32 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="129" addr="0x7f99f1e3e8d0" >
-            <attributelist id="130" addr="0x7f99f1e3e8d0" >
-                <kwargs id="131" addr="0x7f99f1e3e710" >
-                    <attributelist id="132" addr="0x7f99f1e3e710" >
-                        <attribute name="name" value="warning" id="133" addr="0x7f99f1de6c90" />
-                        <attribute name="value" value="451:Setting a const char * variable may leak memory." id="134" addr="0x7f99f1de6c90" />
+        <typemap id="129" addr="0x7fca4698c8d0" >
+            <attributelist id="130" addr="0x7fca4698c8d0" >
+                <kwargs id="131" addr="0x7fca4698c710" >
+                    <attributelist id="132" addr="0x7fca4698c710" >
+                        <attribute name="name" value="warning" id="133" addr="0x7fca46934c90" />
+                        <attribute name="value" value="451:Setting a const char * variable may leak memory." id="134" addr="0x7fca46934c90" />
                     </attributelist >
-                    <kwargssitem id="135" addr="0x7f99f1e3e730" >
-                        <attributelist id="136" addr="0x7f99f1e3e730" >
+                    <kwargssitem id="135" addr="0x7fca4698c730" >
+                        <attributelist id="136" addr="0x7fca4698c730" >
                         </attributelist >
                     </kwargssitem >
-                    <kwargssitem id="137" addr="0x7f99f1e3e6f0" >
-                        <attributelist id="138" addr="0x7f99f1e3e6f0" >
+                    <kwargssitem id="137" addr="0x7fca4698c6f0" >
+                        <attributelist id="138" addr="0x7fca4698c6f0" >
                         </attributelist >
                     </kwargssitem >
                 </kwargs >
-                <attribute name="code" value="{&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="139" addr="0x7f99f1de6c90" />
-                <attribute name="method" value="memberin" id="140" addr="0x7f99f1de6c90" />
+                <attribute name="code" value="{&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="139" addr="0x7fca46934c90" />
+                <attribute name="method" value="memberin" id="140" addr="0x7fca46934c90" />
             </attributelist >
 
-            <typemapitem id="141" addr="0x7f99f1e3e810" >
-                <attributelist id="142" addr="0x7f99f1e3e810" >
-                    <parmlist id="143" addr="0x7f99f1e3e850" >
+            <typemapitem id="141" addr="0x7fca4698c810" >
+                <attributelist id="142" addr="0x7fca4698c810" >
+                    <parmlist id="143" addr="0x7fca4698c850" >
                         <parm id="144">
-                            <attributelist id="145" addr="0x7f99f1e3e850" >
-                                <attribute name="type" value="p.q(const).char" id="146" addr="0x7f99f1de6c90" />
+                            <attributelist id="145" addr="0x7fca4698c850" >
+                                <attribute name="type" value="p.q(const).char" id="146" addr="0x7fca46934c90" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -248,18 +248,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="147" addr="0x7f99f1e3eab0" >
-            <attributelist id="148" addr="0x7f99f1e3eab0" >
-                <attribute name="code" value="{&#10;  delete [] $1;&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="149" addr="0x7f99f1de6c90" />
-                <attribute name="method" value="globalin" id="150" addr="0x7f99f1de6c90" />
+        <typemap id="147" addr="0x7fca4698cab0" >
+            <attributelist id="148" addr="0x7fca4698cab0" >
+                <attribute name="code" value="{&#10;  delete [] $1;&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="149" addr="0x7fca46934c90" />
+                <attribute name="method" value="globalin" id="150" addr="0x7fca46934c90" />
             </attributelist >
 
-            <typemapitem id="151" addr="0x7f99f1e3e9f0" >
-                <attributelist id="152" addr="0x7f99f1e3e9f0" >
-                    <parmlist id="153" addr="0x7f99f1e3ea30" >
+            <typemapitem id="151" addr="0x7fca4698c9f0" >
+                <attributelist id="152" addr="0x7fca4698c9f0" >
+                    <parmlist id="153" addr="0x7fca4698ca30" >
                         <parm id="154">
-                            <attributelist id="155" addr="0x7f99f1e3ea30" >
-                                <attribute name="type" value="p.char" id="156" addr="0x7f99f1de6c90" />
+                            <attributelist id="155" addr="0x7fca4698ca30" >
+                                <attribute name="type" value="p.char" id="156" addr="0x7fca46934c90" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -267,32 +267,32 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="157" addr="0x7f99f1e3ed10" >
-            <attributelist id="158" addr="0x7f99f1e3ed10" >
-                <kwargs id="159" addr="0x7f99f1e3eb50" >
-                    <attributelist id="160" addr="0x7f99f1e3eb50" >
-                        <attribute name="name" value="warning" id="161" addr="0x7f99f1de6c90" />
-                        <attribute name="value" value="451:Setting a const char * variable may leak memory." id="162" addr="0x7f99f1de6c90" />
+        <typemap id="157" addr="0x7fca4698cd10" >
+            <attributelist id="158" addr="0x7fca4698cd10" >
+                <kwargs id="159" addr="0x7fca4698cb50" >
+                    <attributelist id="160" addr="0x7fca4698cb50" >
+                        <attribute name="name" value="warning" id="161" addr="0x7fca46934c90" />
+                        <attribute name="value" value="451:Setting a const char * variable may leak memory." id="162" addr="0x7fca46934c90" />
                     </attributelist >
-                    <kwargssitem id="163" addr="0x7f99f1e3eb70" >
-                        <attributelist id="164" addr="0x7f99f1e3eb70" >
+                    <kwargssitem id="163" addr="0x7fca4698cb70" >
+                        <attributelist id="164" addr="0x7fca4698cb70" >
                         </attributelist >
                     </kwargssitem >
-                    <kwargssitem id="165" addr="0x7f99f1e3eb30" >
-                        <attributelist id="166" addr="0x7f99f1e3eb30" >
+                    <kwargssitem id="165" addr="0x7fca4698cb30" >
+                        <attributelist id="166" addr="0x7fca4698cb30" >
                         </attributelist >
                     </kwargssitem >
                 </kwargs >
-                <attribute name="code" value="{&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="167" addr="0x7f99f1de6c90" />
-                <attribute name="method" value="globalin" id="168" addr="0x7f99f1de6c90" />
+                <attribute name="code" value="{&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="167" addr="0x7fca46934c90" />
+                <attribute name="method" value="globalin" id="168" addr="0x7fca46934c90" />
             </attributelist >
 
-            <typemapitem id="169" addr="0x7f99f1e3ec50" >
-                <attributelist id="170" addr="0x7f99f1e3ec50" >
-                    <parmlist id="171" addr="0x7f99f1e3ec90" >
+            <typemapitem id="169" addr="0x7fca4698cc50" >
+                <attributelist id="170" addr="0x7fca4698cc50" >
+                    <parmlist id="171" addr="0x7fca4698cc90" >
                         <parm id="172">
-                            <attributelist id="173" addr="0x7f99f1e3ec90" >
-                                <attribute name="type" value="p.q(const).char" id="174" addr="0x7f99f1de6c90" />
+                            <attributelist id="173" addr="0x7fca4698cc90" >
+                                <attribute name="type" value="p.q(const).char" id="174" addr="0x7fca46934c90" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -300,18 +300,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="175" addr="0x7f99f1e3ef30" >
-            <attributelist id="176" addr="0x7f99f1e3ef30" >
-                <attribute name="code" value="{&#10;  if($input) {&#10;    strncpy((char*)$1, (const char *)$input, $1_dim0-1);&#10;    $1[$1_dim0-1] = 0;&#10;  } else {&#10;    $1[0] = 0;&#10;  }&#10;}" id="177" addr="0x7f99f1de6c90" />
-                <attribute name="method" value="memberin" id="178" addr="0x7f99f1de6c90" />
+        <typemap id="175" addr="0x7fca4698cf30" >
+            <attributelist id="176" addr="0x7fca4698cf30" >
+                <attribute name="code" value="{&#10;  if($input) {&#10;    strncpy((char*)$1, (const char *)$input, $1_dim0-1);&#10;    $1[$1_dim0-1] = 0;&#10;  } else {&#10;    $1[0] = 0;&#10;  }&#10;}" id="177" addr="0x7fca46934c90" />
+                <attribute name="method" value="memberin" id="178" addr="0x7fca46934c90" />
             </attributelist >
 
-            <typemapitem id="179" addr="0x7f99f1e3ee70" >
-                <attributelist id="180" addr="0x7f99f1e3ee70" >
-                    <parmlist id="181" addr="0x7f99f1e3eeb0" >
+            <typemapitem id="179" addr="0x7fca4698ce70" >
+                <attributelist id="180" addr="0x7fca4698ce70" >
+                    <parmlist id="181" addr="0x7fca4698ceb0" >
                         <parm id="182">
-                            <attributelist id="183" addr="0x7f99f1e3eeb0" >
-                                <attribute name="type" value="a(ANY).char" id="184" addr="0x7f99f1de6c90" />
+                            <attributelist id="183" addr="0x7fca4698ceb0" >
+                                <attribute name="type" value="a(ANY).char" id="184" addr="0x7fca46934c90" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -319,18 +319,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="185" addr="0x7f99f1e3f150" >
-            <attributelist id="186" addr="0x7f99f1e3f150" >
-                <attribute name="code" value="{&#10;  if($input) {&#10;    strncpy((char*)$1, (const char *)$input, $1_dim0-1);&#10;    $1[$1_dim0-1] = 0;&#10;  } else {&#10;    $1[0] = 0;&#10;  }&#10;}" id="187" addr="0x7f99f1de6c90" />
-                <attribute name="method" value="globalin" id="188" addr="0x7f99f1de6c90" />
+        <typemap id="185" addr="0x7fca4698d150" >
+            <attributelist id="186" addr="0x7fca4698d150" >
+                <attribute name="code" value="{&#10;  if($input) {&#10;    strncpy((char*)$1, (const char *)$input, $1_dim0-1);&#10;    $1[$1_dim0-1] = 0;&#10;  } else {&#10;    $1[0] = 0;&#10;  }&#10;}" id="187" addr="0x7fca46934c90" />
+                <attribute name="method" value="globalin" id="188" addr="0x7fca46934c90" />
             </attributelist >
 
-            <typemapitem id="189" addr="0x7f99f1e3f090" >
-                <attributelist id="190" addr="0x7f99f1e3f090" >
-                    <parmlist id="191" addr="0x7f99f1e3f0d0" >
+            <typemapitem id="189" addr="0x7fca4698d090" >
+                <attributelist id="190" addr="0x7fca4698d090" >
+                    <parmlist id="191" addr="0x7fca4698d0d0" >
                         <parm id="192">
-                            <attributelist id="193" addr="0x7f99f1e3f0d0" >
-                                <attribute name="type" value="a(ANY).char" id="194" addr="0x7f99f1de6c90" />
+                            <attributelist id="193" addr="0x7fca4698d0d0" >
+                                <attribute name="type" value="a(ANY).char" id="194" addr="0x7fca46934c90" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -338,18 +338,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="195" addr="0x7f99f1e3f330" >
-            <attributelist id="196" addr="0x7f99f1e3f330" >
-                <attribute name="code" value="{&#10;  if ($input) strcpy((char *)$1, (const char *)$input);&#10;  else $1[0] = 0;&#10;}" id="197" addr="0x7f99f1de6c90" />
-                <attribute name="method" value="memberin" id="198" addr="0x7f99f1de6c90" />
+        <typemap id="195" addr="0x7fca4698d330" >
+            <attributelist id="196" addr="0x7fca4698d330" >
+                <attribute name="code" value="{&#10;  if ($input) strcpy((char *)$1, (const char *)$input);&#10;  else $1[0] = 0;&#10;}" id="197" addr="0x7fca46934c90" />
+                <attribute name="method" value="memberin" id="198" addr="0x7fca46934c90" />
             </attributelist >
 
-            <typemapitem id="199" addr="0x7f99f1e3f270" >
-                <attributelist id="200" addr="0x7f99f1e3f270" >
-                    <parmlist id="201" addr="0x7f99f1e3f2b0" >
+            <typemapitem id="199" addr="0x7fca4698d270" >
+                <attributelist id="200" addr="0x7fca4698d270" >
+                    <parmlist id="201" addr="0x7fca4698d2b0" >
                         <parm id="202">
-                            <attributelist id="203" addr="0x7f99f1e3f2b0" >
-                                <attribute name="type" value="a().char" id="204" addr="0x7f99f1de6c90" />
+                            <attributelist id="203" addr="0x7fca4698d2b0" >
+                                <attribute name="type" value="a().char" id="204" addr="0x7fca46934c90" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -357,18 +357,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="205" addr="0x7f99f1e3f510" >
-            <attributelist id="206" addr="0x7f99f1e3f510" >
-                <attribute name="code" value="{&#10;  if ($input) strcpy((char *)$1, (const char *)$input);&#10;  else $1[0] = 0;&#10;}" id="207" addr="0x7f99f1de6c90" />
-                <attribute name="method" value="globalin" id="208" addr="0x7f99f1de6c90" />
+        <typemap id="205" addr="0x7fca4698d510" >
+            <attributelist id="206" addr="0x7fca4698d510" >
+                <attribute name="code" value="{&#10;  if ($input) strcpy((char *)$1, (const char *)$input);&#10;  else $1[0] = 0;&#10;}" id="207" addr="0x7fca46934c90" />
+                <attribute name="method" value="globalin" id="208" addr="0x7fca46934c90" />
             </attributelist >
 
-            <typemapitem id="209" addr="0x7f99f1e3f450" >
-                <attributelist id="210" addr="0x7f99f1e3f450" >
-                    <parmlist id="211" addr="0x7f99f1e3f490" >
+            <typemapitem id="209" addr="0x7fca4698d450" >
+                <attributelist id="210" addr="0x7fca4698d450" >
+                    <parmlist id="211" addr="0x7fca4698d490" >
                         <parm id="212">
-                            <attributelist id="213" addr="0x7f99f1e3f490" >
-                                <attribute name="type" value="a().char" id="214" addr="0x7f99f1de6c90" />
+                            <attributelist id="213" addr="0x7fca4698d490" >
+                                <attribute name="type" value="a().char" id="214" addr="0x7fca46934c90" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -376,18 +376,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="215" addr="0x7f99f1e3f730" >
-            <attributelist id="216" addr="0x7f99f1e3f730" >
-                <attribute name="code" value="{&#10;  size_t ii;&#10;  $1_basetype *b = ($1_basetype *) $1;&#10;  for (ii = 0; ii &lt; (size_t)$1_size; ii++) b[ii] = *(($1_basetype *) $input + ii);&#10;}" id="217" addr="0x7f99f1de6c90" />
-                <attribute name="method" value="memberin" id="218" addr="0x7f99f1de6c90" />
+        <typemap id="215" addr="0x7fca4698d730" >
+            <attributelist id="216" addr="0x7fca4698d730" >
+                <attribute name="code" value="{&#10;  size_t ii;&#10;  $1_basetype *b = ($1_basetype *) $1;&#10;  for (ii = 0; ii &lt; (size_t)$1_size; ii++) b[ii] = *(($1_basetype *) $input + ii);&#10;}" id="217" addr="0x7fca46934c90" />
+                <attribute name="method" value="memberin" id="218" addr="0x7fca46934c90" />
             </attributelist >
 
-            <typemapitem id="219" addr="0x7f99f1e3f670" >
-                <attributelist id="220" addr="0x7f99f1e3f670" >
-                    <parmlist id="221" addr="0x7f99f1e3f6b0" >
+            <typemapitem id="219" addr="0x7fca4698d670" >
+                <attributelist id="220" addr="0x7fca4698d670" >
+                    <parmlist id="221" addr="0x7fca4698d6b0" >
                         <parm id="222">
-                            <attributelist id="223" addr="0x7f99f1e3f6b0" >
-                                <attribute name="type" value="a(ANY).SWIGTYPE" id="224" addr="0x7f99f1de6c90" />
+                            <attributelist id="223" addr="0x7fca4698d6b0" >
+                                <attribute name="type" value="a(ANY).SWIGTYPE" id="224" addr="0x7fca46934c90" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -395,18 +395,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="225" addr="0x7f99f1e3f950" >
-            <attributelist id="226" addr="0x7f99f1e3f950" >
-                <attribute name="code" value="{&#10;  size_t ii;&#10;  $1_basetype *b = ($1_basetype *) $1;&#10;  for (ii = 0; ii &lt; (size_t)$1_size; ii++) b[ii] = *(($1_basetype *) $input + ii);&#10;}" id="227" addr="0x7f99f1de6c90" />
-                <attribute name="method" value="globalin" id="228" addr="0x7f99f1de6c90" />
+        <typemap id="225" addr="0x7fca4698d950" >
+            <attributelist id="226" addr="0x7fca4698d950" >
+                <attribute name="code" value="{&#10;  size_t ii;&#10;  $1_basetype *b = ($1_basetype *) $1;&#10;  for (ii = 0; ii &lt; (size_t)$1_size; ii++) b[ii] = *(($1_basetype *) $input + ii);&#10;}" id="227" addr="0x7fca46934c90" />
+                <attribute name="method" value="globalin" id="228" addr="0x7fca46934c90" />
             </attributelist >
 
-            <typemapitem id="229" addr="0x7f99f1e3f890" >
-                <attributelist id="230" addr="0x7f99f1e3f890" >
-                    <parmlist id="231" addr="0x7f99f1e3f8d0" >
+            <typemapitem id="229" addr="0x7fca4698d890" >
+                <attributelist id="230" addr="0x7fca4698d890" >
+                    <parmlist id="231" addr="0x7fca4698d8d0" >
                         <parm id="232">
-                            <attributelist id="233" addr="0x7f99f1e3f8d0" >
-                                <attribute name="type" value="a(ANY).SWIGTYPE" id="234" addr="0x7f99f1de6c90" />
+                            <attributelist id="233" addr="0x7fca4698d8d0" >
+                                <attribute name="type" value="a(ANY).SWIGTYPE" id="234" addr="0x7fca46934c90" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -414,18 +414,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="235" addr="0x7f99f1e3fbb0" >
-            <attributelist id="236" addr="0x7f99f1e3fbb0" >
-                <attribute name="code" value="{&#10;  $basetype (*inp)[$1_dim1] = ($basetype (*)[$1_dim1])($input);&#10;  $basetype (*dest)[$1_dim1] = ($basetype (*)[$1_dim1])($1);&#10;  size_t ii = 0;&#10;  for (; ii &lt; $1_dim0; ++ii) {&#10;    $basetype *ip = inp[ii];&#10;    $basetype *dp = dest[ii];&#10;    size_t jj = 0;&#10;    for (; jj &lt; $1_dim1; ++jj) dp[jj] = ip[jj];&#10;  }&#10;}" id="237" addr="0x7f99f1de6c90" />
-                <attribute name="method" value="memberin" id="238" addr="0x7f99f1de6c90" />
+        <typemap id="235" addr="0x7fca4698dbb0" >
+            <attributelist id="236" addr="0x7fca4698dbb0" >
+                <attribute name="code" value="{&#10;  $basetype (*inp)[$1_dim1] = ($basetype (*)[$1_dim1])($input);&#10;  $basetype (*dest)[$1_dim1] = ($basetype (*)[$1_dim1])($1);&#10;  size_t ii = 0;&#10;  for (; ii &lt; $1_dim0; ++ii) {&#10;    $basetype *ip = inp[ii];&#10;    $basetype *dp = dest[ii];&#10;    size_t jj = 0;&#10;    for (; jj &lt; $1_dim1; ++jj) dp[jj] = ip[jj];&#10;  }&#10;}" id="237" addr="0x7fca46934c90" />
+                <attribute name="method" value="memberin" id="238" addr="0x7fca46934c90" />
             </attributelist >
 
-            <typemapitem id="239" addr="0x7f99f1e3fa90" >
-                <attributelist id="240" addr="0x7f99f1e3fa90" >
-                    <parmlist id="241" addr="0x7f99f1e3fb30" >
+            <typemapitem id="239" addr="0x7fca4698da90" >
+                <attributelist id="240" addr="0x7fca4698da90" >
+                    <parmlist id="241" addr="0x7fca4698db30" >
                         <parm id="242">
-                            <attributelist id="243" addr="0x7f99f1e3fb30" >
-                                <attribute name="type" value="a(ANY).a(ANY).SWIGTYPE" id="244" addr="0x7f99f1de6c90" />
+                            <attributelist id="243" addr="0x7fca4698db30" >
+                                <attribute name="type" value="a(ANY).a(ANY).SWIGTYPE" id="244" addr="0x7fca46934c90" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -433,18 +433,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="245" addr="0x7f99f1e3fe10" >
-            <attributelist id="246" addr="0x7f99f1e3fe10" >
-                <attribute name="code" value="{&#10;  $basetype (*inp)[$1_dim1] = ($basetype (*)[$1_dim1])($input);&#10;  $basetype (*dest)[$1_dim1] = ($basetype (*)[$1_dim1])($1);&#10;  size_t ii = 0;&#10;  for (; ii &lt; $1_dim0; ++ii) {&#10;    $basetype *ip = inp[ii];&#10;    $basetype *dp = dest[ii];&#10;    size_t jj = 0;&#10;    for (; jj &lt; $1_dim1; ++jj) dp[jj] = ip[jj];&#10;  }&#10;}" id="247" addr="0x7f99f1de6c90" />
-                <attribute name="method" value="globalin" id="248" addr="0x7f99f1de6c90" />
+        <typemap id="245" addr="0x7fca4698de10" >
+            <attributelist id="246" addr="0x7fca4698de10" >
+                <attribute name="code" value="{&#10;  $basetype (*inp)[$1_dim1] = ($basetype (*)[$1_dim1])($input);&#10;  $basetype (*dest)[$1_dim1] = ($basetype (*)[$1_dim1])($1);&#10;  size_t ii = 0;&#10;  for (; ii &lt; $1_dim0; ++ii) {&#10;    $basetype *ip = inp[ii];&#10;    $basetype *dp = dest[ii];&#10;    size_t jj = 0;&#10;    for (; jj &lt; $1_dim1; ++jj) dp[jj] = ip[jj];&#10;  }&#10;}" id="247" addr="0x7fca46934c90" />
+                <attribute name="method" value="globalin" id="248" addr="0x7fca46934c90" />
             </attributelist >
 
-            <typemapitem id="249" addr="0x7f99f1e3fcf0" >
-                <attributelist id="250" addr="0x7f99f1e3fcf0" >
-                    <parmlist id="251" addr="0x7f99f1e3fd90" >
+            <typemapitem id="249" addr="0x7fca4698dcf0" >
+                <attributelist id="250" addr="0x7fca4698dcf0" >
+                    <parmlist id="251" addr="0x7fca4698dd90" >
                         <parm id="252">
-                            <attributelist id="253" addr="0x7f99f1e3fd90" >
-                                <attribute name="type" value="a(ANY).a(ANY).SWIGTYPE" id="254" addr="0x7f99f1de6c90" />
+                            <attributelist id="253" addr="0x7fca4698dd90" >
+                                <attribute name="type" value="a(ANY).a(ANY).SWIGTYPE" id="254" addr="0x7fca46934c90" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -452,16311 +452,16311 @@
              
             </typemapitem >
         </typemap >
-        <insert id="255" addr="0x7f99f1e3fed0" >
-            <attributelist id="256" addr="0x7f99f1e3fed0" >
-                <attribute name="code" value="&#10;#ifdef __cplusplus&#10;/* SwigValueWrapper is described in swig.swg */&#10;template&lt;typename T> class SwigValueWrapper {&#10;  struct SwigMovePointer {&#10;    T *ptr;&#10;    SwigMovePointer(T *p) : ptr(p) { }&#10;    ~SwigMovePointer() { delete ptr; }&#10;    SwigMovePointer&amp; operator=(SwigMovePointer&amp; rhs) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = rhs.ptr; rhs.ptr = 0; return *this; }&#10;  } pointer;&#10;  SwigValueWrapper&amp; operator=(const SwigValueWrapper&lt;T>&amp; rhs);&#10;  SwigValueWrapper(const SwigValueWrapper&lt;T>&amp; rhs);&#10;public:&#10;  SwigValueWrapper() : pointer(0) { }&#10;  SwigValueWrapper&amp; operator=(const T&amp; t) { SwigMovePointer tmp(new T(t)); pointer = tmp; return *this; }&#10;  operator T&amp;() const { return *pointer.ptr; }&#10;  T *operator&amp;() { return pointer.ptr; }&#10;};" id="257" addr="0x7f99f1de6c90" />
-                <attribute name="section" value="runtime" id="258" addr="0x7f99f1de6c90" />
+        <insert id="255" addr="0x7fca4698ded0" >
+            <attributelist id="256" addr="0x7fca4698ded0" >
+                <attribute name="code" value="&#10;#ifdef __cplusplus&#10;/* SwigValueWrapper is described in swig.swg */&#10;template&lt;typename T> class SwigValueWrapper {&#10;  struct SwigMovePointer {&#10;    T *ptr;&#10;    SwigMovePointer(T *p) : ptr(p) { }&#10;    ~SwigMovePointer() { delete ptr; }&#10;    SwigMovePointer&amp; operator=(SwigMovePointer&amp; rhs) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = rhs.ptr; rhs.ptr = 0; return *this; }&#10;  } pointer;&#10;  SwigValueWrapper&amp; operator=(const SwigValueWrapper&lt;T>&amp; rhs);&#10;  SwigValueWrapper(const SwigValueWrapper&lt;T>&amp; rhs);&#10;public:&#10;  SwigValueWrapper() : pointer(0) { }&#10;  SwigValueWrapper&amp; operator=(const T&amp; t) { SwigMovePointer tmp(new T(t)); pointer = tmp; return *this; }&#10;  operator T&amp;() const { return *pointer.ptr; }&#10;  T *operator&amp;() { return pointer.ptr; }&#10;};" id="257" addr="0x7fca46934c90" />
+                <attribute name="section" value="runtime" id="258" addr="0x7fca46934c90" />
             </attributelist >
          
         </insert >
-        <insert id="259" addr="0x7f99f1e3ffb0" >
-            <attributelist id="260" addr="0x7f99f1e3ffb0" >
-                <attribute name="code" value="&#10;template &lt;typename T> T SwigValueInit() {&#10;  return T();&#10;}&#10;#endif&#10;" id="261" addr="0x7f99f1de6c90" />
-                <attribute name="section" value="runtime" id="262" addr="0x7f99f1de6c90" />
+        <insert id="259" addr="0x7fca4698dfb0" >
+            <attributelist id="260" addr="0x7fca4698dfb0" >
+                <attribute name="code" value="&#10;template &lt;typename T> T SwigValueInit() {&#10;  return T();&#10;}&#10;#endif&#10;" id="261" addr="0x7fca46934c90" />
+                <attribute name="section" value="runtime" id="262" addr="0x7fca46934c90" />
             </attributelist >
          
         </insert >
-        <insert id="263" addr="0x7f99f1e40090" >
-            <attributelist id="264" addr="0x7f99f1e40090" >
-                <attribute name="code" value="/* -----------------------------------------------------------------------------&#10; *  This section contains generic SWIG labels for method/variable&#10; *  declarations/attributes, and other compiler dependent labels.&#10; * ----------------------------------------------------------------------------- */&#10;&#10;/* template workaround for compilers that cannot correctly implement the C++ standard */&#10;#ifndef SWIGTEMPLATEDISAMBIGUATOR&#10;# if defined(__SUNPRO_CC) &amp;&amp; (__SUNPRO_CC &lt;= 0x560)&#10;#  define SWIGTEMPLATEDISAMBIGUATOR template&#10;# elif defined(__HP_aCC)&#10;/* Needed even with `aCC -AA' when `aCC -V' reports HP ANSI C++ B3910B A.03.55 */&#10;/* If we find a maximum version that requires this, the test would be __HP_aCC &lt;= 35500 for A.03.55 */&#10;#  define SWIGTEMPLATEDISAMBIGUATOR template&#10;# else&#10;#  define SWIGTEMPLATEDISAMBIGUATOR&#10;# endif&#10;#endif&#10;&#10;/* inline attribute */&#10;#ifndef SWIGINLINE&#10;# if defined(__cplusplus) || (defined(__GNUC__) &amp;&amp; !defined(__STRICT_ANSI__))&#10;#   define SWIGINLINE inline&#10;# else&#10;#   define SWIGINLINE&#10;# endif&#10;#endif&#10;&#10;/* attribute recognised by some compilers to avoid 'unused' warnings */&#10;#ifndef SWIGUNUSED&#10;# if defined(__GNUC__)&#10;#   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 &amp;&amp; __GNUC_MINOR__ >= 4))&#10;#     define SWIGUNUSED __attribute__ ((__unused__))&#10;#   else&#10;#     define SWIGUNUSED&#10;#   endif&#10;# elif defined(__ICC)&#10;#   define SWIGUNUSED __attribute__ ((__unused__))&#10;# else&#10;#   define SWIGUNUSED&#10;# endif&#10;#endif&#10;&#10;#ifndef SWIG_MSC_UNSUPPRESS_4505&#10;# if defined(_MSC_VER)&#10;#   pragma warning(disable : 4505) /* unreferenced local function has been removed */&#10;# endif&#10;#endif&#10;&#10;#ifndef SWIGUNUSEDPARM&#10;# ifdef __cplusplus&#10;#   define SWIGUNUSEDPARM(p)&#10;# else&#10;#   define SWIGUNUSEDPARM(p) p SWIGUNUSED&#10;# endif&#10;#endif&#10;&#10;/* internal SWIG method */&#10;#ifndef SWIGINTERN&#10;# define SWIGINTERN static SWIGUNUSED&#10;#endif&#10;&#10;/* internal inline SWIG method */&#10;#ifndef SWIGINTERNINLINE&#10;# define SWIGINTERNINLINE SWIGINTERN SWIGINLINE&#10;#endif&#10;&#10;/* exporting methods */&#10;#if defined(__GNUC__)&#10;#  if (__GNUC__ >= 4) || (__GNUC__ == 3 &amp;&amp; __GNUC_MINOR__ >= 4)&#10;#    ifndef GCC_HASCLASSVISIBILITY&#10;#      define GCC_HASCLASSVISIBILITY&#10;#    endif&#10;#  endif&#10;#endif&#10;&#10;#ifndef SWIGEXPORT&#10;# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)&#10;#   if defined(STATIC_LINKED)&#10;#     define SWIGEXPORT&#10;#   else&#10;#     define SWIGEXPORT __declspec(dllexport)&#10;#   endif&#10;# else&#10;#   if defined(__GNUC__) &amp;&amp; defined(GCC_HASCLASSVISIBILITY)&#10;#     define SWIGEXPORT __attribute__ ((visibility(&quot;default&quot;)))&#10;#   else&#10;#     define SWIGEXPORT&#10;#   endif&#10;# endif&#10;#endif&#10;&#10;/* calling conventions for Windows */&#10;#ifndef SWIGSTDCALL&#10;# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)&#10;#   define SWIGSTDCALL __stdcall&#10;# else&#10;#   define SWIGSTDCALL&#10;# endif&#10;#endif&#10;&#10;/* Deal with Microsoft's attempt at deprecating C standard runtime functions */&#10;#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) &amp;&amp; defined(_MSC_VER) &amp;&amp; !defined(_CRT_SECURE_NO_DEPRECATE)&#10;# define _CRT_SECURE_NO_DEPRECATE&#10;#endif&#10;&#10;/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */&#10;#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) &amp;&amp; defined(_MSC_VER) &amp;&amp; !defined(_SCL_SECURE_NO_DEPRECATE)&#10;# define _SCL_SECURE_NO_DEPRECATE&#10;#endif&#10;&#10;/* Deal with Apple's deprecated 'AssertMacros.h' from Carbon-framework */&#10;#if defined(__APPLE__) &amp;&amp; !defined(__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES)&#10;# define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0&#10;#endif&#10;&#10;/* Intel's compiler complains if a variable which was never initialised is&#10; * cast to void, which is a common idiom which we use to indicate that we&#10; * are aware a variable isn't used.  So we just silence that warning.&#10; * See: https://github.com/swig/swig/issues/192 for more discussion.&#10; */&#10;#ifdef __INTEL_COMPILER&#10;# pragma warning disable 592&#10;#endif&#10;" id="265" addr="0x7f99f1de6c90" />
-                <attribute name="section" value="runtime" id="266" addr="0x7f99f1de6c90" />
+        <insert id="263" addr="0x7fca4698e090" >
+            <attributelist id="264" addr="0x7fca4698e090" >
+                <attribute name="code" value="/* -----------------------------------------------------------------------------&#10; *  This section contains generic SWIG labels for method/variable&#10; *  declarations/attributes, and other compiler dependent labels.&#10; * ----------------------------------------------------------------------------- */&#10;&#10;/* template workaround for compilers that cannot correctly implement the C++ standard */&#10;#ifndef SWIGTEMPLATEDISAMBIGUATOR&#10;# if defined(__SUNPRO_CC) &amp;&amp; (__SUNPRO_CC &lt;= 0x560)&#10;#  define SWIGTEMPLATEDISAMBIGUATOR template&#10;# elif defined(__HP_aCC)&#10;/* Needed even with `aCC -AA' when `aCC -V' reports HP ANSI C++ B3910B A.03.55 */&#10;/* If we find a maximum version that requires this, the test would be __HP_aCC &lt;= 35500 for A.03.55 */&#10;#  define SWIGTEMPLATEDISAMBIGUATOR template&#10;# else&#10;#  define SWIGTEMPLATEDISAMBIGUATOR&#10;# endif&#10;#endif&#10;&#10;/* inline attribute */&#10;#ifndef SWIGINLINE&#10;# if defined(__cplusplus) || (defined(__GNUC__) &amp;&amp; !defined(__STRICT_ANSI__))&#10;#   define SWIGINLINE inline&#10;# else&#10;#   define SWIGINLINE&#10;# endif&#10;#endif&#10;&#10;/* attribute recognised by some compilers to avoid 'unused' warnings */&#10;#ifndef SWIGUNUSED&#10;# if defined(__GNUC__)&#10;#   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 &amp;&amp; __GNUC_MINOR__ >= 4))&#10;#     define SWIGUNUSED __attribute__ ((__unused__))&#10;#   else&#10;#     define SWIGUNUSED&#10;#   endif&#10;# elif defined(__ICC)&#10;#   define SWIGUNUSED __attribute__ ((__unused__))&#10;# else&#10;#   define SWIGUNUSED&#10;# endif&#10;#endif&#10;&#10;#ifndef SWIG_MSC_UNSUPPRESS_4505&#10;# if defined(_MSC_VER)&#10;#   pragma warning(disable : 4505) /* unreferenced local function has been removed */&#10;# endif&#10;#endif&#10;&#10;#ifndef SWIGUNUSEDPARM&#10;# ifdef __cplusplus&#10;#   define SWIGUNUSEDPARM(p)&#10;# else&#10;#   define SWIGUNUSEDPARM(p) p SWIGUNUSED&#10;# endif&#10;#endif&#10;&#10;/* internal SWIG method */&#10;#ifndef SWIGINTERN&#10;# define SWIGINTERN static SWIGUNUSED&#10;#endif&#10;&#10;/* internal inline SWIG method */&#10;#ifndef SWIGINTERNINLINE&#10;# define SWIGINTERNINLINE SWIGINTERN SWIGINLINE&#10;#endif&#10;&#10;/* exporting methods */&#10;#if defined(__GNUC__)&#10;#  if (__GNUC__ >= 4) || (__GNUC__ == 3 &amp;&amp; __GNUC_MINOR__ >= 4)&#10;#    ifndef GCC_HASCLASSVISIBILITY&#10;#      define GCC_HASCLASSVISIBILITY&#10;#    endif&#10;#  endif&#10;#endif&#10;&#10;#ifndef SWIGEXPORT&#10;# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)&#10;#   if defined(STATIC_LINKED)&#10;#     define SWIGEXPORT&#10;#   else&#10;#     define SWIGEXPORT __declspec(dllexport)&#10;#   endif&#10;# else&#10;#   if defined(__GNUC__) &amp;&amp; defined(GCC_HASCLASSVISIBILITY)&#10;#     define SWIGEXPORT __attribute__ ((visibility(&quot;default&quot;)))&#10;#   else&#10;#     define SWIGEXPORT&#10;#   endif&#10;# endif&#10;#endif&#10;&#10;/* calling conventions for Windows */&#10;#ifndef SWIGSTDCALL&#10;# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)&#10;#   define SWIGSTDCALL __stdcall&#10;# else&#10;#   define SWIGSTDCALL&#10;# endif&#10;#endif&#10;&#10;/* Deal with Microsoft's attempt at deprecating C standard runtime functions */&#10;#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) &amp;&amp; defined(_MSC_VER) &amp;&amp; !defined(_CRT_SECURE_NO_DEPRECATE)&#10;# define _CRT_SECURE_NO_DEPRECATE&#10;#endif&#10;&#10;/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */&#10;#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) &amp;&amp; defined(_MSC_VER) &amp;&amp; !defined(_SCL_SECURE_NO_DEPRECATE)&#10;# define _SCL_SECURE_NO_DEPRECATE&#10;#endif&#10;&#10;/* Deal with Apple's deprecated 'AssertMacros.h' from Carbon-framework */&#10;#if defined(__APPLE__) &amp;&amp; !defined(__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES)&#10;# define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0&#10;#endif&#10;&#10;/* Intel's compiler complains if a variable which was never initialised is&#10; * cast to void, which is a common idiom which we use to indicate that we&#10; * are aware a variable isn't used.  So we just silence that warning.&#10; * See: https://github.com/swig/swig/issues/192 for more discussion.&#10; */&#10;#ifdef __INTEL_COMPILER&#10;# pragma warning disable 592&#10;#endif&#10;" id="265" addr="0x7fca46934c90" />
+                <attribute name="section" value="runtime" id="266" addr="0x7fca46934c90" />
             </attributelist >
          
         </insert >
     </include >
-    <include id="267" addr="0x7f99f1e40210" >
-        <attributelist id="268" addr="0x7f99f1e40210" >
-            <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmcgui.i" id="269" addr="0x7f99f1de6c90" />
-            <attribute name="module" value="" id="270" addr="0x7f99f1e403f0" />
-            <attribute name="options" value="0x7f99f1e40190" id="271" addr="0x7f99f1e40190" />
+    <include id="267" addr="0x7fca4698e210" >
+        <attributelist id="268" addr="0x7fca4698e210" >
+            <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmcgui.i" id="269" addr="0x7fca46934c90" />
+            <attribute name="module" value="" id="270" addr="0x7fca4698e3f0" />
+            <attribute name="options" value="0x7fca4698e190" id="271" addr="0x7fca4698e190" />
         </attributelist >
 
-        <module id="272" addr="0x7f99f1e402f0" >
-            <attributelist id="273" addr="0x7f99f1e402f0" >
-                <attribute name="name" value="xbmcgui" id="274" addr="0x7f99f1de6c90" />
-                <attribute name="options" value="0x7f99f1e402d0" id="275" addr="0x7f99f1e402d0" />
+        <module id="272" addr="0x7fca4698e2f0" >
+            <attributelist id="273" addr="0x7fca4698e2f0" >
+                <attribute name="name" value="xbmcgui" id="274" addr="0x7fca46934c90" />
+                <attribute name="options" value="0x7fca4698e2d0" id="275" addr="0x7fca4698e2d0" />
             </attributelist >
          
         </module >
-        <insert id="276" addr="0x7f99f1e40430" >
-            <attributelist id="277" addr="0x7f99f1e40430" >
-                <attribute name="code" value="&#10;#if defined(TARGET_WINDOWS)&#10;#  include &lt;windows.h>&#10;#endif&#10;&#10;#include &quot;interfaces/legacy/Dialog.h&quot;&#10;#include &quot;interfaces/legacy/ModuleXbmcgui.h&quot;&#10;#include &quot;interfaces/legacy/Control.h&quot;&#10;#include &quot;interfaces/legacy/Window.h&quot;&#10;#include &quot;interfaces/legacy/WindowDialog.h&quot;&#10;#include &quot;interfaces/legacy/Dialog.h&quot;&#10;#include &quot;interfaces/legacy/WindowXML.h&quot;&#10;#include &quot;input/actions/ActionIDs.h&quot;&#10;#include &quot;input/Key.h&quot;&#10;&#10;using namespace XBMCAddon;&#10;using namespace xbmcgui;&#10;&#10;#if defined(__GNUG__)&#10;#pragma GCC diagnostic ignored &quot;-Wstrict-aliasing&quot;&#10;#endif&#10;&#10;" id="278" addr="0x7f99f1de6c90" />
+        <insert id="276" addr="0x7fca4698e430" >
+            <attributelist id="277" addr="0x7fca4698e430" >
+                <attribute name="code" value="&#10;#if defined(TARGET_WINDOWS)&#10;#  include &lt;windows.h>&#10;#endif&#10;&#10;#include &quot;interfaces/legacy/Dialog.h&quot;&#10;#include &quot;interfaces/legacy/ModuleXbmcgui.h&quot;&#10;#include &quot;interfaces/legacy/Control.h&quot;&#10;#include &quot;interfaces/legacy/Window.h&quot;&#10;#include &quot;interfaces/legacy/WindowDialog.h&quot;&#10;#include &quot;interfaces/legacy/Dialog.h&quot;&#10;#include &quot;interfaces/legacy/WindowXML.h&quot;&#10;#include &quot;input/actions/ActionIDs.h&quot;&#10;#include &quot;input/Key.h&quot;&#10;&#10;using namespace XBMCAddon;&#10;using namespace xbmcgui;&#10;&#10;#if defined(__GNUG__)&#10;#pragma GCC diagnostic ignored &quot;-Wstrict-aliasing&quot;&#10;#endif&#10;&#10;" id="278" addr="0x7fca46934c90" />
             </attributelist >
          
         </insert >
-        <include id="279" addr="0x7f99f1e40790" >
-            <attributelist id="280" addr="0x7f99f1e40790" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/swighelper.h" id="281" addr="0x7f99f1de6c90" />
+        <include id="279" addr="0x7fca4698e790" >
+            <attributelist id="280" addr="0x7fca4698e790" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/swighelper.h" id="281" addr="0x7fca46934c90" />
             </attributelist >
          
         </include >
-        <include id="282" addr="0x7f99f1e40810" >
-            <attributelist id="283" addr="0x7f99f1e40810" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/AddonString.h" id="284" addr="0x7f99f1de6c90" />
+        <include id="282" addr="0x7fca4698e810" >
+            <attributelist id="283" addr="0x7fca4698e810" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/AddonString.h" id="284" addr="0x7fca46934c90" />
             </attributelist >
 
-            <namespace id="285" addr="0x7f99f1e40950" >
-                <attributelist id="286" addr="0x7f99f1e40950" >
-                    <attribute name="sym_name" value="XBMCAddon" id="287" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="XBMCAddon" id="288" addr="0x7f99f1de6c90" />
-                    <attribute name="csym_nextSibling" value="0x7f99f1e40f10" id="289" addr="0x7f99f1e40f10" />
-                    <attribute name="sym_nextSibling" value="0x7f99f1e40f10" id="290" addr="0x7f99f1e40f10" />
-                    <typescope id="291" addr="0x7f99f1dd1d70" >
-                        <attributelist id="292" addr="0x7f99f1dd1d70" >
-                            <attribute name="name" value="XBMCAddon" id="293" addr="0x7f99f1de6c90" />
-                            <typetab id="294" addr="0x7f99f1dd1db0" >
-                                <attributelist id="295" addr="0x7f99f1dd1db0" >
-                                    <attribute name="Dictionary" value="Dictionary" id="296" addr="0x7f99f1de6c90" />
-                                    <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="297" addr="0x7f99f1de6c90" />
-                                    <attribute name="String" value="std::string" id="298" addr="0x7f99f1de6c90" />
-                                    <attribute name="StringOrInt" value="XBMCAddon::String" id="299" addr="0x7f99f1de6c90" />
+            <namespace id="285" addr="0x7fca4698e950" >
+                <attributelist id="286" addr="0x7fca4698e950" >
+                    <attribute name="sym_name" value="XBMCAddon" id="287" addr="0x7fca46934c90" />
+                    <attribute name="name" value="XBMCAddon" id="288" addr="0x7fca46934c90" />
+                    <attribute name="csym_nextSibling" value="0x7fca4698ef10" id="289" addr="0x7fca4698ef10" />
+                    <attribute name="sym_nextSibling" value="0x7fca4698ef10" id="290" addr="0x7fca4698ef10" />
+                    <typescope id="291" addr="0x7fca4691fd70" >
+                        <attributelist id="292" addr="0x7fca4691fd70" >
+                            <attribute name="name" value="XBMCAddon" id="293" addr="0x7fca46934c90" />
+                            <typetab id="294" addr="0x7fca4691fdb0" >
+                                <attributelist id="295" addr="0x7fca4691fdb0" >
+                                    <attribute name="Dictionary" value="Dictionary" id="296" addr="0x7fca46934c90" />
+                                    <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="297" addr="0x7fca46934c90" />
+                                    <attribute name="String" value="std::string" id="298" addr="0x7fca46934c90" />
+                                    <attribute name="StringOrInt" value="XBMCAddon::String" id="299" addr="0x7fca46934c90" />
                                 </attributelist >
-                                <typetabsitem id="300" addr="0x7f99f1dd28b0" >
-                                    <attributelist id="301" addr="0x7f99f1dd28b0" >
+                                <typetabsitem id="300" addr="0x7fca469208b0" >
+                                    <attributelist id="301" addr="0x7fca469208b0" >
                                     </attributelist >
                                 </typetabsitem >
-                                <typetabsitem id="302" addr="0x7f99f1dd2910" >
-                                    <attributelist id="303" addr="0x7f99f1dd2910" >
+                                <typetabsitem id="302" addr="0x7fca46920910" >
+                                    <attributelist id="303" addr="0x7fca46920910" >
                                     </attributelist >
                                 </typetabsitem >
-                                <typetabsitem id="304" addr="0x7f99f1dd1f90" >
-                                    <attributelist id="305" addr="0x7f99f1dd1f90" >
+                                <typetabsitem id="304" addr="0x7fca4691ff90" >
+                                    <attributelist id="305" addr="0x7fca4691ff90" >
                                     </attributelist >
                                 </typetabsitem >
-                                <typetabsitem id="306" addr="0x7f99f1dd2710" >
-                                    <attributelist id="307" addr="0x7f99f1dd2710" >
+                                <typetabsitem id="306" addr="0x7fca46920710" >
+                                    <attributelist id="307" addr="0x7fca46920710" >
                                     </attributelist >
                                 </typetabsitem >
                             </typetab >
-                            <attribute name="parent" value="0x7f99f1e1da30" id="308" addr="0x7f99f1e1da30" />
-                            <attribute name="qname" value="XBMCAddon" id="309" addr="0x7f99f1de6c90" />
-                            <attribute name="symtab" value="0x7f99f1e408b0" id="310" addr="0x7f99f1e408b0" />
+                            <attribute name="parent" value="0x7fca4696ba30" id="308" addr="0x7fca4696ba30" />
+                            <attribute name="qname" value="XBMCAddon" id="309" addr="0x7fca46934c90" />
+                            <attribute name="symtab" value="0x7fca4698e8b0" id="310" addr="0x7fca4698e8b0" />
                         </attributelist >
-                        <typescopesitem id="311" addr="0x7f99f1e40870" >
-                            <attributelist id="312" addr="0x7f99f1e40870" >
+                        <typescopesitem id="311" addr="0x7fca4698e870" >
+                            <attributelist id="312" addr="0x7fca4698e870" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="313" addr="0x7f99f1dd1db0" >
-                            <attributelist id="314" addr="0x7f99f1dd1db0" >
-                                <attribute name="Dictionary" value="Dictionary" id="315" addr="0x7f99f1de6c90" />
-                                <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="316" addr="0x7f99f1de6c90" />
-                                <attribute name="String" value="std::string" id="317" addr="0x7f99f1de6c90" />
-                                <attribute name="StringOrInt" value="XBMCAddon::String" id="318" addr="0x7f99f1de6c90" />
+                        <typescopesitem id="313" addr="0x7fca4691fdb0" >
+                            <attributelist id="314" addr="0x7fca4691fdb0" >
+                                <attribute name="Dictionary" value="Dictionary" id="315" addr="0x7fca46934c90" />
+                                <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="316" addr="0x7fca46934c90" />
+                                <attribute name="String" value="std::string" id="317" addr="0x7fca46934c90" />
+                                <attribute name="StringOrInt" value="XBMCAddon::String" id="318" addr="0x7fca46934c90" />
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="319" addr="0x7f99f1e1da30" >
-                            <attributelist id="320" addr="0x7f99f1e1da30" >
-                                <attribute name="name" value="" id="321" addr="0x7f99f1de6c90" />
-                                <typetab id="322" addr="0x7f99f1e1da90" >
-                                    <attributelist id="323" addr="0x7f99f1e1da90" >
+                        <typescopesitem id="319" addr="0x7fca4696ba30" >
+                            <attributelist id="320" addr="0x7fca4696ba30" >
+                                <attribute name="name" value="" id="321" addr="0x7fca46934c90" />
+                                <typetab id="322" addr="0x7fca4696ba90" >
+                                    <attributelist id="323" addr="0x7fca4696ba90" >
                                     </attributelist >
                                 </typetab >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="324" addr="0x7f99f1dd1eb0" >
-                            <attributelist id="325" addr="0x7f99f1dd1eb0" >
+                        <typescopesitem id="324" addr="0x7fca4691feb0" >
+                            <attributelist id="325" addr="0x7fca4691feb0" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="326" addr="0x7f99f1e408b0" >
-                            <attributelist id="327" addr="0x7f99f1e408b0" >
-                                <attribute name="name" value="XBMCAddon" id="328" addr="0x7f99f1de6c90" />
-                                <attribute name="csymtab" value="0x7f99f1e408f0" id="329" addr="0x7f99f1e408f0" />
-                                <attribute name="symtab" value="0x7f99f1e40890" id="330" addr="0x7f99f1e40890" />
+                        <typescopesitem id="326" addr="0x7fca4698e8b0" >
+                            <attributelist id="327" addr="0x7fca4698e8b0" >
+                                <attribute name="name" value="XBMCAddon" id="328" addr="0x7fca46934c90" />
+                                <attribute name="csymtab" value="0x7fca4698e8f0" id="329" addr="0x7fca4698e8f0" />
+                                <attribute name="symtab" value="0x7fca4698e890" id="330" addr="0x7fca4698e890" />
                             </attributelist >
                         </typescopesitem >
                     </typescope >
-                    <attribute name="symtab" value="0x7f99f1e408b0" id="331" addr="0x7f99f1e408b0" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="332" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="333" addr="0x7f99f1de6c90" />
+                    <attribute name="symtab" value="0x7fca4698e8b0" id="331" addr="0x7fca4698e8b0" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="332" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="333" addr="0x7fca46934c90" />
                 </attributelist >
 
-                <cdecl id="334" addr="0x7f99f1e40a70" >
-                    <attributelist id="335" addr="0x7f99f1e40a70" >
-                        <attribute name="sym_name" value="String" id="336" addr="0x7f99f1de6c90" />
-                        <attribute name="name" value="XBMCAddon::String" id="337" addr="0x7f99f1de6c90" />
-                        <attribute name="decl" value="" id="338" addr="0x7f99f1de6c90" />
-                        <attribute name="storage" value="typedef" id="339" addr="0x7f99f1de6c90" />
-                        <attribute name="kind" value="typedef" id="340" addr="0x7f99f1de6c90" />
-                        <attribute name="type" value="std::string" id="341" addr="0x7f99f1de6c90" />
-                        <attribute name="sym_symtab" value="0x7f99f1e408b0" id="342" addr="0x7f99f1e408b0" />
-                        <attribute name="sym_overname" value="__SWIG_0" id="343" addr="0x7f99f1de6c90" />
+                <cdecl id="334" addr="0x7fca4698ea70" >
+                    <attributelist id="335" addr="0x7fca4698ea70" >
+                        <attribute name="sym_name" value="String" id="336" addr="0x7fca46934c90" />
+                        <attribute name="name" value="XBMCAddon::String" id="337" addr="0x7fca46934c90" />
+                        <attribute name="decl" value="" id="338" addr="0x7fca46934c90" />
+                        <attribute name="storage" value="typedef" id="339" addr="0x7fca46934c90" />
+                        <attribute name="kind" value="typedef" id="340" addr="0x7fca46934c90" />
+                        <attribute name="type" value="std::string" id="341" addr="0x7fca46934c90" />
+                        <attribute name="sym_symtab" value="0x7fca4698e8b0" id="342" addr="0x7fca4698e8b0" />
+                        <attribute name="sym_overname" value="__SWIG_0" id="343" addr="0x7fca46934c90" />
                     </attributelist >
                  
                 </cdecl >
-                <cdecl id="344" addr="0x7f99f1e40c70" >
-                    <attributelist id="345" addr="0x7f99f1e40c70" >
-                        <attribute name="sym_name" value="emptyString" id="346" addr="0x7f99f1de6c90" />
-                        <attribute name="name" value="XBMCAddon::emptyString" id="347" addr="0x7f99f1de6c90" />
-                        <attribute name="decl" value="" id="348" addr="0x7f99f1de6c90" />
-                        <attribute name="storage" value="extern" id="349" addr="0x7f99f1de6c90" />
-                        <attribute name="kind" value="variable" id="350" addr="0x7f99f1de6c90" />
-                        <attribute name="type" value="XBMCAddon::String" id="351" addr="0x7f99f1de6c90" />
-                        <attribute name="sym_symtab" value="0x7f99f1e408b0" id="352" addr="0x7f99f1e408b0" />
-                        <attribute name="sym_overname" value="__SWIG_0" id="353" addr="0x7f99f1de6c90" />
+                <cdecl id="344" addr="0x7fca4698ec70" >
+                    <attributelist id="345" addr="0x7fca4698ec70" >
+                        <attribute name="sym_name" value="emptyString" id="346" addr="0x7fca46934c90" />
+                        <attribute name="name" value="XBMCAddon::emptyString" id="347" addr="0x7fca46934c90" />
+                        <attribute name="decl" value="" id="348" addr="0x7fca46934c90" />
+                        <attribute name="storage" value="extern" id="349" addr="0x7fca46934c90" />
+                        <attribute name="kind" value="variable" id="350" addr="0x7fca46934c90" />
+                        <attribute name="type" value="XBMCAddon::String" id="351" addr="0x7fca46934c90" />
+                        <attribute name="sym_symtab" value="0x7fca4698e8b0" id="352" addr="0x7fca4698e8b0" />
+                        <attribute name="sym_overname" value="__SWIG_0" id="353" addr="0x7fca46934c90" />
                     </attributelist >
                  
                 </cdecl >
             </namespace >
         </include >
-        <include id="354" addr="0x7f99f1e40e50" >
-            <attributelist id="355" addr="0x7f99f1e40e50" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/ModuleXbmcgui.h" id="356" addr="0x7f99f1de6c90" />
+        <include id="354" addr="0x7fca4698ee50" >
+            <attributelist id="355" addr="0x7fca4698ee50" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/ModuleXbmcgui.h" id="356" addr="0x7fca46934c90" />
             </attributelist >
 
-            <namespace id="357" addr="0x7f99f1e40f10" >
-                <attributelist id="358" addr="0x7f99f1e40f10" >
-                    <attribute name="sym_name" value="XBMCAddon" id="359" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="XBMCAddon" id="360" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_previousSibling" value="0x7f99f1e40950" id="361" addr="0x7f99f1e40950" />
-                    <attribute name="csym_nextSibling" value="0x7f99f1e45470" id="362" addr="0x7f99f1e45470" />
-                    <attribute name="sym_nextSibling" value="0x7f99f1e45470" id="363" addr="0x7f99f1e45470" />
-                    <typescope id="364" addr="0x7f99f1dd1d70" >
-                        <attributelist id="365" addr="0x7f99f1dd1d70" >
-                            <attribute name="name" value="XBMCAddon" id="366" addr="0x7f99f1de6c90" />
-                            <typetab id="367" addr="0x7f99f1dd1db0" >
-                                <attributelist id="368" addr="0x7f99f1dd1db0" >
-                                    <attribute name="Dictionary" value="Dictionary" id="369" addr="0x7f99f1de6c90" />
-                                    <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="370" addr="0x7f99f1de6c90" />
-                                    <attribute name="String" value="std::string" id="371" addr="0x7f99f1de6c90" />
-                                    <attribute name="StringOrInt" value="XBMCAddon::String" id="372" addr="0x7f99f1de6c90" />
+            <namespace id="357" addr="0x7fca4698ef10" >
+                <attributelist id="358" addr="0x7fca4698ef10" >
+                    <attribute name="sym_name" value="XBMCAddon" id="359" addr="0x7fca46934c90" />
+                    <attribute name="name" value="XBMCAddon" id="360" addr="0x7fca46934c90" />
+                    <attribute name="sym_previousSibling" value="0x7fca4698e950" id="361" addr="0x7fca4698e950" />
+                    <attribute name="csym_nextSibling" value="0x7fca46993470" id="362" addr="0x7fca46993470" />
+                    <attribute name="sym_nextSibling" value="0x7fca46993470" id="363" addr="0x7fca46993470" />
+                    <typescope id="364" addr="0x7fca4691fd70" >
+                        <attributelist id="365" addr="0x7fca4691fd70" >
+                            <attribute name="name" value="XBMCAddon" id="366" addr="0x7fca46934c90" />
+                            <typetab id="367" addr="0x7fca4691fdb0" >
+                                <attributelist id="368" addr="0x7fca4691fdb0" >
+                                    <attribute name="Dictionary" value="Dictionary" id="369" addr="0x7fca46934c90" />
+                                    <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="370" addr="0x7fca46934c90" />
+                                    <attribute name="String" value="std::string" id="371" addr="0x7fca46934c90" />
+                                    <attribute name="StringOrInt" value="XBMCAddon::String" id="372" addr="0x7fca46934c90" />
                                 </attributelist >
-                                <typetabsitem id="373" addr="0x7f99f1dd28b0" >
-                                    <attributelist id="374" addr="0x7f99f1dd28b0" >
+                                <typetabsitem id="373" addr="0x7fca469208b0" >
+                                    <attributelist id="374" addr="0x7fca469208b0" >
                                     </attributelist >
                                 </typetabsitem >
-                                <typetabsitem id="375" addr="0x7f99f1dd2910" >
-                                    <attributelist id="376" addr="0x7f99f1dd2910" >
+                                <typetabsitem id="375" addr="0x7fca46920910" >
+                                    <attributelist id="376" addr="0x7fca46920910" >
                                     </attributelist >
                                 </typetabsitem >
-                                <typetabsitem id="377" addr="0x7f99f1dd1f90" >
-                                    <attributelist id="378" addr="0x7f99f1dd1f90" >
+                                <typetabsitem id="377" addr="0x7fca4691ff90" >
+                                    <attributelist id="378" addr="0x7fca4691ff90" >
                                     </attributelist >
                                 </typetabsitem >
-                                <typetabsitem id="379" addr="0x7f99f1dd2710" >
-                                    <attributelist id="380" addr="0x7f99f1dd2710" >
+                                <typetabsitem id="379" addr="0x7fca46920710" >
+                                    <attributelist id="380" addr="0x7fca46920710" >
                                     </attributelist >
                                 </typetabsitem >
                             </typetab >
-                            <attribute name="parent" value="0x7f99f1e1da30" id="381" addr="0x7f99f1e1da30" />
-                            <attribute name="qname" value="XBMCAddon" id="382" addr="0x7f99f1de6c90" />
-                            <attribute name="symtab" value="0x7f99f1e408b0" id="383" addr="0x7f99f1e408b0" />
+                            <attribute name="parent" value="0x7fca4696ba30" id="381" addr="0x7fca4696ba30" />
+                            <attribute name="qname" value="XBMCAddon" id="382" addr="0x7fca46934c90" />
+                            <attribute name="symtab" value="0x7fca4698e8b0" id="383" addr="0x7fca4698e8b0" />
                         </attributelist >
-                        <typescopesitem id="384" addr="0x7f99f1e40870" >
-                            <attributelist id="385" addr="0x7f99f1e40870" >
+                        <typescopesitem id="384" addr="0x7fca4698e870" >
+                            <attributelist id="385" addr="0x7fca4698e870" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="386" addr="0x7f99f1dd1db0" >
-                            <attributelist id="387" addr="0x7f99f1dd1db0" >
-                                <attribute name="Dictionary" value="Dictionary" id="388" addr="0x7f99f1de6c90" />
-                                <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="389" addr="0x7f99f1de6c90" />
-                                <attribute name="String" value="std::string" id="390" addr="0x7f99f1de6c90" />
-                                <attribute name="StringOrInt" value="XBMCAddon::String" id="391" addr="0x7f99f1de6c90" />
+                        <typescopesitem id="386" addr="0x7fca4691fdb0" >
+                            <attributelist id="387" addr="0x7fca4691fdb0" >
+                                <attribute name="Dictionary" value="Dictionary" id="388" addr="0x7fca46934c90" />
+                                <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="389" addr="0x7fca46934c90" />
+                                <attribute name="String" value="std::string" id="390" addr="0x7fca46934c90" />
+                                <attribute name="StringOrInt" value="XBMCAddon::String" id="391" addr="0x7fca46934c90" />
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="392" addr="0x7f99f1e1da30" >
-                            <attributelist id="393" addr="0x7f99f1e1da30" >
-                                <attribute name="name" value="" id="394" addr="0x7f99f1de6c90" />
-                                <typetab id="395" addr="0x7f99f1e1da90" >
-                                    <attributelist id="396" addr="0x7f99f1e1da90" >
+                        <typescopesitem id="392" addr="0x7fca4696ba30" >
+                            <attributelist id="393" addr="0x7fca4696ba30" >
+                                <attribute name="name" value="" id="394" addr="0x7fca46934c90" />
+                                <typetab id="395" addr="0x7fca4696ba90" >
+                                    <attributelist id="396" addr="0x7fca4696ba90" >
                                     </attributelist >
                                 </typetab >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="397" addr="0x7f99f1dd1eb0" >
-                            <attributelist id="398" addr="0x7f99f1dd1eb0" >
+                        <typescopesitem id="397" addr="0x7fca4691feb0" >
+                            <attributelist id="398" addr="0x7fca4691feb0" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="399" addr="0x7f99f1e408b0" >
-                            <attributelist id="400" addr="0x7f99f1e408b0" >
-                                <attribute name="name" value="XBMCAddon" id="401" addr="0x7f99f1de6c90" />
-                                <attribute name="csymtab" value="0x7f99f1e408f0" id="402" addr="0x7f99f1e408f0" />
-                                <attribute name="symtab" value="0x7f99f1e40890" id="403" addr="0x7f99f1e40890" />
+                        <typescopesitem id="399" addr="0x7fca4698e8b0" >
+                            <attributelist id="400" addr="0x7fca4698e8b0" >
+                                <attribute name="name" value="XBMCAddon" id="401" addr="0x7fca46934c90" />
+                                <attribute name="csymtab" value="0x7fca4698e8f0" id="402" addr="0x7fca4698e8f0" />
+                                <attribute name="symtab" value="0x7fca4698e890" id="403" addr="0x7fca4698e890" />
                             </attributelist >
                         </typescopesitem >
                     </typescope >
-                    <attribute name="symtab" value="0x7f99f1e408b0" id="404" addr="0x7f99f1e408b0" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="405" addr="0x7f99f1e1d950" />
+                    <attribute name="symtab" value="0x7fca4698e8b0" id="404" addr="0x7fca4698e8b0" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="405" addr="0x7fca4696b950" />
                 </attributelist >
 
-                <namespace id="406" addr="0x7f99f1e41030" >
-                    <attributelist id="407" addr="0x7f99f1e41030" >
-                        <attribute name="feature_knownbasetypes" value="AddonClass,AddonCallback" id="408" addr="0x7f99f1de6c90" />
-                        <attribute name="name" value="xbmcgui" id="409" addr="0x7f99f1de6c90" />
-                        <attribute name="sym_symtab" value="0x7f99f1e408b0" id="410" addr="0x7f99f1e408b0" />
-                        <attribute name="symtab" value="0x7f99f1e40fb0" id="411" addr="0x7f99f1e40fb0" />
-                        <attribute name="sym_nextSibling" value="0x7f99f1e46490" id="412" addr="0x7f99f1e46490" />
-                        <attribute name="csym_nextSibling" value="0x7f99f1e46490" id="413" addr="0x7f99f1e46490" />
-                        <attribute name="feature_knownapitypes" value="XBMCAddon::xbmc::InfoTagVideo,xbmc::InfoTagMusic" id="414" addr="0x7f99f1de6c90" />
-                        <attribute name="sym_name" value="xbmcgui" id="415" addr="0x7f99f1de6c90" />
-                        <attribute name="sym_overname" value="__SWIG_0" id="416" addr="0x7f99f1de6c90" />
-                        <typescope id="417" addr="0x7f99f1dd2150" >
-                            <attributelist id="418" addr="0x7f99f1dd2150" >
-                                <attribute name="name" value="xbmcgui" id="419" addr="0x7f99f1de6c90" />
-                                <typetab id="420" addr="0x7f99f1dd2170" >
-                                    <attributelist id="421" addr="0x7f99f1dd2170" >
-                                        <attribute name="InterceptorBase" value="InterceptorBase" id="422" addr="0x7f99f1de6c90" />
-                                        <attribute name="Dialog" value="Dialog" id="423" addr="0x7f99f1de6c90" />
-                                        <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="424" addr="0x7f99f1de6c90" />
-                                        <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="425" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlTextBox" value="ControlTextBox" id="426" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlRadioButton" value="ControlRadioButton" id="427" addr="0x7f99f1de6c90" />
-                                        <attribute name="Window" value="Window" id="428" addr="0x7f99f1de6c90" />
-                                        <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="429" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlList" value="ControlList" id="430" addr="0x7f99f1de6c90" />
-                                        <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="431" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlImage" value="ControlImage" id="432" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlButton" value="ControlButton" id="433" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlGroup" value="ControlGroup" id="434" addr="0x7f99f1de6c90" />
-                                        <attribute name="DialogBusy" value="DialogBusy" id="435" addr="0x7f99f1de6c90" />
-                                        <attribute name="DialogProgressBG" value="DialogProgressBG" id="436" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlSpin" value="ControlSpin" id="437" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlEdit" value="ControlEdit" id="438" addr="0x7f99f1de6c90" />
-                                        <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="439" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="440" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlLabel" value="ControlLabel" id="441" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlProgress" value="ControlProgress" id="442" addr="0x7f99f1de6c90" />
-                                        <attribute name="Control" value="Control" id="443" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlSlider" value="ControlSlider" id="444" addr="0x7f99f1de6c90" />
-                                        <attribute name="DialogProgress" value="DialogProgress" id="445" addr="0x7f99f1de6c90" />
-                                        <attribute name="Action" value="Action" id="446" addr="0x7f99f1de6c90" />
-                                        <attribute name="WindowDialog" value="WindowDialog" id="447" addr="0x7f99f1de6c90" />
-                                        <attribute name="WindowXML" value="WindowXML" id="448" addr="0x7f99f1de6c90" />
-                                        <attribute name="ListItem" value="ListItem" id="449" addr="0x7f99f1de6c90" />
-                                        <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="450" addr="0x7f99f1de6c90" />
+                <namespace id="406" addr="0x7fca4698f030" >
+                    <attributelist id="407" addr="0x7fca4698f030" >
+                        <attribute name="feature_knownbasetypes" value="AddonClass,AddonCallback" id="408" addr="0x7fca46934c90" />
+                        <attribute name="name" value="xbmcgui" id="409" addr="0x7fca46934c90" />
+                        <attribute name="sym_symtab" value="0x7fca4698e8b0" id="410" addr="0x7fca4698e8b0" />
+                        <attribute name="symtab" value="0x7fca4698efb0" id="411" addr="0x7fca4698efb0" />
+                        <attribute name="sym_nextSibling" value="0x7fca46994490" id="412" addr="0x7fca46994490" />
+                        <attribute name="csym_nextSibling" value="0x7fca46994490" id="413" addr="0x7fca46994490" />
+                        <attribute name="feature_knownapitypes" value="XBMCAddon::xbmc::InfoTagVideo,xbmc::InfoTagMusic" id="414" addr="0x7fca46934c90" />
+                        <attribute name="sym_name" value="xbmcgui" id="415" addr="0x7fca46934c90" />
+                        <attribute name="sym_overname" value="__SWIG_0" id="416" addr="0x7fca46934c90" />
+                        <typescope id="417" addr="0x7fca46920150" >
+                            <attributelist id="418" addr="0x7fca46920150" >
+                                <attribute name="name" value="xbmcgui" id="419" addr="0x7fca46934c90" />
+                                <typetab id="420" addr="0x7fca46920170" >
+                                    <attributelist id="421" addr="0x7fca46920170" >
+                                        <attribute name="InterceptorBase" value="InterceptorBase" id="422" addr="0x7fca46934c90" />
+                                        <attribute name="Dialog" value="Dialog" id="423" addr="0x7fca46934c90" />
+                                        <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="424" addr="0x7fca46934c90" />
+                                        <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="425" addr="0x7fca46934c90" />
+                                        <attribute name="ControlTextBox" value="ControlTextBox" id="426" addr="0x7fca46934c90" />
+                                        <attribute name="ControlRadioButton" value="ControlRadioButton" id="427" addr="0x7fca46934c90" />
+                                        <attribute name="Window" value="Window" id="428" addr="0x7fca46934c90" />
+                                        <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="429" addr="0x7fca46934c90" />
+                                        <attribute name="ControlList" value="ControlList" id="430" addr="0x7fca46934c90" />
+                                        <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="431" addr="0x7fca46934c90" />
+                                        <attribute name="ControlImage" value="ControlImage" id="432" addr="0x7fca46934c90" />
+                                        <attribute name="ControlButton" value="ControlButton" id="433" addr="0x7fca46934c90" />
+                                        <attribute name="ControlGroup" value="ControlGroup" id="434" addr="0x7fca46934c90" />
+                                        <attribute name="DialogBusy" value="DialogBusy" id="435" addr="0x7fca46934c90" />
+                                        <attribute name="DialogProgressBG" value="DialogProgressBG" id="436" addr="0x7fca46934c90" />
+                                        <attribute name="ControlSpin" value="ControlSpin" id="437" addr="0x7fca46934c90" />
+                                        <attribute name="ControlEdit" value="ControlEdit" id="438" addr="0x7fca46934c90" />
+                                        <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="439" addr="0x7fca46934c90" />
+                                        <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="440" addr="0x7fca46934c90" />
+                                        <attribute name="ControlLabel" value="ControlLabel" id="441" addr="0x7fca46934c90" />
+                                        <attribute name="ControlProgress" value="ControlProgress" id="442" addr="0x7fca46934c90" />
+                                        <attribute name="Control" value="Control" id="443" addr="0x7fca46934c90" />
+                                        <attribute name="ControlSlider" value="ControlSlider" id="444" addr="0x7fca46934c90" />
+                                        <attribute name="DialogProgress" value="DialogProgress" id="445" addr="0x7fca46934c90" />
+                                        <attribute name="Action" value="Action" id="446" addr="0x7fca46934c90" />
+                                        <attribute name="WindowDialog" value="WindowDialog" id="447" addr="0x7fca46934c90" />
+                                        <attribute name="WindowXML" value="WindowXML" id="448" addr="0x7fca46934c90" />
+                                        <attribute name="ListItem" value="ListItem" id="449" addr="0x7fca46934c90" />
+                                        <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="450" addr="0x7fca46934c90" />
                                     </attributelist >
-                                    <typetabsitem id="451" addr="0x7f99f1de1dd0" >
-                                        <attributelist id="452" addr="0x7f99f1de1dd0" >
+                                    <typetabsitem id="451" addr="0x7fca4692fdd0" >
+                                        <attributelist id="452" addr="0x7fca4692fdd0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="453" addr="0x7f99f1dde790" >
-                                        <attributelist id="454" addr="0x7f99f1dde790" >
+                                    <typetabsitem id="453" addr="0x7fca4692c790" >
+                                        <attributelist id="454" addr="0x7fca4692c790" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="455" addr="0x7f99f1de3f10" >
-                                        <attributelist id="456" addr="0x7f99f1de3f10" >
+                                    <typetabsitem id="455" addr="0x7fca46931f10" >
+                                        <attributelist id="456" addr="0x7fca46931f10" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="457" addr="0x7f99f1dd67b0" >
-                                        <attributelist id="458" addr="0x7f99f1dd67b0" >
+                                    <typetabsitem id="457" addr="0x7fca469247b0" >
+                                        <attributelist id="458" addr="0x7fca469247b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="459" addr="0x7f99f1ddafd0" >
-                                        <attributelist id="460" addr="0x7f99f1ddafd0" >
+                                    <typetabsitem id="459" addr="0x7fca46928fd0" >
+                                        <attributelist id="460" addr="0x7fca46928fd0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="461" addr="0x7f99f1ddd430" >
-                                        <attributelist id="462" addr="0x7f99f1ddd430" >
+                                    <typetabsitem id="461" addr="0x7fca4692b430" >
+                                        <attributelist id="462" addr="0x7fca4692b430" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="463" addr="0x7f99f1de2130" >
-                                        <attributelist id="464" addr="0x7f99f1de2130" >
+                                    <typetabsitem id="463" addr="0x7fca46930130" >
+                                        <attributelist id="464" addr="0x7fca46930130" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="465" addr="0x7f99f1dd2f50" >
-                                        <attributelist id="466" addr="0x7f99f1dd2f50" >
+                                    <typetabsitem id="465" addr="0x7fca46920f50" >
+                                        <attributelist id="466" addr="0x7fca46920f50" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="467" addr="0x7f99f1dd9650" >
-                                        <attributelist id="468" addr="0x7f99f1dd9650" >
+                                    <typetabsitem id="467" addr="0x7fca46927650" >
+                                        <attributelist id="468" addr="0x7fca46927650" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="469" addr="0x7f99f1de3390" >
-                                        <attributelist id="470" addr="0x7f99f1de3390" >
+                                    <typetabsitem id="469" addr="0x7fca46931390" >
+                                        <attributelist id="470" addr="0x7fca46931390" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="471" addr="0x7f99f1ddb7b0" >
-                                        <attributelist id="472" addr="0x7f99f1ddb7b0" >
+                                    <typetabsitem id="471" addr="0x7fca469297b0" >
+                                        <attributelist id="472" addr="0x7fca469297b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="473" addr="0x7f99f1ddc4b0" >
-                                        <attributelist id="474" addr="0x7f99f1ddc4b0" >
+                                    <typetabsitem id="473" addr="0x7fca4692a4b0" >
+                                        <attributelist id="474" addr="0x7fca4692a4b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="475" addr="0x7f99f1ddcf90" >
-                                        <attributelist id="476" addr="0x7f99f1ddcf90" >
+                                    <typetabsitem id="475" addr="0x7fca4692af90" >
+                                        <attributelist id="476" addr="0x7fca4692af90" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="477" addr="0x7f99f1de11b0" >
-                                        <attributelist id="478" addr="0x7f99f1de11b0" >
+                                    <typetabsitem id="477" addr="0x7fca4692f1b0" >
+                                        <attributelist id="478" addr="0x7fca4692f1b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="479" addr="0x7f99f1de15b0" >
-                                        <attributelist id="480" addr="0x7f99f1de15b0" >
+                                    <typetabsitem id="479" addr="0x7fca4692f5b0" >
+                                        <attributelist id="480" addr="0x7fca4692f5b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="481" addr="0x7f99f1dd77f0" >
-                                        <attributelist id="482" addr="0x7f99f1dd77f0" >
+                                    <typetabsitem id="481" addr="0x7fca469257f0" >
+                                        <attributelist id="482" addr="0x7fca469257f0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="483" addr="0x7f99f1dd8b30" >
-                                        <attributelist id="484" addr="0x7f99f1dd8b30" >
+                                    <typetabsitem id="483" addr="0x7fca46926b30" >
+                                        <attributelist id="484" addr="0x7fca46926b30" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="485" addr="0x7f99f1dd2c50" >
-                                        <attributelist id="486" addr="0x7f99f1dd2c50" >
+                                    <typetabsitem id="485" addr="0x7fca46920c50" >
+                                        <attributelist id="486" addr="0x7fca46920c50" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="487" addr="0x7f99f1dda790" >
-                                        <attributelist id="488" addr="0x7f99f1dda790" >
+                                    <typetabsitem id="487" addr="0x7fca46928790" >
+                                        <attributelist id="488" addr="0x7fca46928790" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="489" addr="0x7f99f1dd8030" >
-                                        <attributelist id="490" addr="0x7f99f1dd8030" >
+                                    <typetabsitem id="489" addr="0x7fca46926030" >
+                                        <attributelist id="490" addr="0x7fca46926030" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="491" addr="0x7f99f1ddbe10" >
-                                        <attributelist id="492" addr="0x7f99f1ddbe10" >
+                                    <typetabsitem id="491" addr="0x7fca46929e10" >
+                                        <attributelist id="492" addr="0x7fca46929e10" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="493" addr="0x7f99f1dd6b10" >
-                                        <attributelist id="494" addr="0x7f99f1dd6b10" >
+                                    <typetabsitem id="493" addr="0x7fca46924b10" >
+                                        <attributelist id="494" addr="0x7fca46924b10" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="495" addr="0x7f99f1dddf90" >
-                                        <attributelist id="496" addr="0x7f99f1dddf90" >
+                                    <typetabsitem id="495" addr="0x7fca4692bf90" >
+                                        <attributelist id="496" addr="0x7fca4692bf90" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="497" addr="0x7f99f1de0530" >
-                                        <attributelist id="498" addr="0x7f99f1de0530" >
+                                    <typetabsitem id="497" addr="0x7fca4692e530" >
+                                        <attributelist id="498" addr="0x7fca4692e530" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="499" addr="0x7f99f1de1e50" >
-                                        <attributelist id="500" addr="0x7f99f1de1e50" >
+                                    <typetabsitem id="499" addr="0x7fca4692fe50" >
+                                        <attributelist id="500" addr="0x7fca4692fe50" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="501" addr="0x7f99f1de2d90" >
-                                        <attributelist id="502" addr="0x7f99f1de2d90" >
+                                    <typetabsitem id="501" addr="0x7fca46930d90" >
+                                        <attributelist id="502" addr="0x7fca46930d90" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="503" addr="0x7f99f1de3410" >
-                                        <attributelist id="504" addr="0x7f99f1de3410" >
+                                    <typetabsitem id="503" addr="0x7fca46931410" >
+                                        <attributelist id="504" addr="0x7fca46931410" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="505" addr="0x7f99f1dd3590" >
-                                        <attributelist id="506" addr="0x7f99f1dd3590" >
+                                    <typetabsitem id="505" addr="0x7fca46921590" >
+                                        <attributelist id="506" addr="0x7fca46921590" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="507" addr="0x7f99f1dd3390" >
-                                        <attributelist id="508" addr="0x7f99f1dd3390" >
+                                    <typetabsitem id="507" addr="0x7fca46921390" >
+                                        <attributelist id="508" addr="0x7fca46921390" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
-                                <attribute name="parent" value="0x7f99f1dd1d70" id="509" addr="0x7f99f1dd1d70" />
-                                <attribute name="qname" value="XBMCAddon::xbmcgui" id="510" addr="0x7f99f1de6c90" />
-                                <attribute name="symtab" value="0x7f99f1e40fb0" id="511" addr="0x7f99f1e40fb0" />
+                                <attribute name="parent" value="0x7fca4691fd70" id="509" addr="0x7fca4691fd70" />
+                                <attribute name="qname" value="XBMCAddon::xbmcgui" id="510" addr="0x7fca46934c90" />
+                                <attribute name="symtab" value="0x7fca4698efb0" id="511" addr="0x7fca4698efb0" />
                             </attributelist >
-                            <typescopesitem id="512" addr="0x7f99f1e40f70" >
-                                <attributelist id="513" addr="0x7f99f1e40f70" >
+                            <typescopesitem id="512" addr="0x7fca4698ef70" >
+                                <attributelist id="513" addr="0x7fca4698ef70" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="514" addr="0x7f99f1dd2170" >
-                                <attributelist id="515" addr="0x7f99f1dd2170" >
-                                    <attribute name="InterceptorBase" value="InterceptorBase" id="516" addr="0x7f99f1de6c90" />
-                                    <attribute name="Dialog" value="Dialog" id="517" addr="0x7f99f1de6c90" />
-                                    <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="518" addr="0x7f99f1de6c90" />
-                                    <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="519" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlTextBox" value="ControlTextBox" id="520" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlRadioButton" value="ControlRadioButton" id="521" addr="0x7f99f1de6c90" />
-                                    <attribute name="Window" value="Window" id="522" addr="0x7f99f1de6c90" />
-                                    <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="523" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlList" value="ControlList" id="524" addr="0x7f99f1de6c90" />
-                                    <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="525" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlImage" value="ControlImage" id="526" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlButton" value="ControlButton" id="527" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlGroup" value="ControlGroup" id="528" addr="0x7f99f1de6c90" />
-                                    <attribute name="DialogBusy" value="DialogBusy" id="529" addr="0x7f99f1de6c90" />
-                                    <attribute name="DialogProgressBG" value="DialogProgressBG" id="530" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlSpin" value="ControlSpin" id="531" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlEdit" value="ControlEdit" id="532" addr="0x7f99f1de6c90" />
-                                    <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="533" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="534" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlLabel" value="ControlLabel" id="535" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlProgress" value="ControlProgress" id="536" addr="0x7f99f1de6c90" />
-                                    <attribute name="Control" value="Control" id="537" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlSlider" value="ControlSlider" id="538" addr="0x7f99f1de6c90" />
-                                    <attribute name="DialogProgress" value="DialogProgress" id="539" addr="0x7f99f1de6c90" />
-                                    <attribute name="Action" value="Action" id="540" addr="0x7f99f1de6c90" />
-                                    <attribute name="WindowDialog" value="WindowDialog" id="541" addr="0x7f99f1de6c90" />
-                                    <attribute name="WindowXML" value="WindowXML" id="542" addr="0x7f99f1de6c90" />
-                                    <attribute name="ListItem" value="ListItem" id="543" addr="0x7f99f1de6c90" />
-                                    <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="544" addr="0x7f99f1de6c90" />
+                            <typescopesitem id="514" addr="0x7fca46920170" >
+                                <attributelist id="515" addr="0x7fca46920170" >
+                                    <attribute name="InterceptorBase" value="InterceptorBase" id="516" addr="0x7fca46934c90" />
+                                    <attribute name="Dialog" value="Dialog" id="517" addr="0x7fca46934c90" />
+                                    <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="518" addr="0x7fca46934c90" />
+                                    <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="519" addr="0x7fca46934c90" />
+                                    <attribute name="ControlTextBox" value="ControlTextBox" id="520" addr="0x7fca46934c90" />
+                                    <attribute name="ControlRadioButton" value="ControlRadioButton" id="521" addr="0x7fca46934c90" />
+                                    <attribute name="Window" value="Window" id="522" addr="0x7fca46934c90" />
+                                    <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="523" addr="0x7fca46934c90" />
+                                    <attribute name="ControlList" value="ControlList" id="524" addr="0x7fca46934c90" />
+                                    <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="525" addr="0x7fca46934c90" />
+                                    <attribute name="ControlImage" value="ControlImage" id="526" addr="0x7fca46934c90" />
+                                    <attribute name="ControlButton" value="ControlButton" id="527" addr="0x7fca46934c90" />
+                                    <attribute name="ControlGroup" value="ControlGroup" id="528" addr="0x7fca46934c90" />
+                                    <attribute name="DialogBusy" value="DialogBusy" id="529" addr="0x7fca46934c90" />
+                                    <attribute name="DialogProgressBG" value="DialogProgressBG" id="530" addr="0x7fca46934c90" />
+                                    <attribute name="ControlSpin" value="ControlSpin" id="531" addr="0x7fca46934c90" />
+                                    <attribute name="ControlEdit" value="ControlEdit" id="532" addr="0x7fca46934c90" />
+                                    <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="533" addr="0x7fca46934c90" />
+                                    <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="534" addr="0x7fca46934c90" />
+                                    <attribute name="ControlLabel" value="ControlLabel" id="535" addr="0x7fca46934c90" />
+                                    <attribute name="ControlProgress" value="ControlProgress" id="536" addr="0x7fca46934c90" />
+                                    <attribute name="Control" value="Control" id="537" addr="0x7fca46934c90" />
+                                    <attribute name="ControlSlider" value="ControlSlider" id="538" addr="0x7fca46934c90" />
+                                    <attribute name="DialogProgress" value="DialogProgress" id="539" addr="0x7fca46934c90" />
+                                    <attribute name="Action" value="Action" id="540" addr="0x7fca46934c90" />
+                                    <attribute name="WindowDialog" value="WindowDialog" id="541" addr="0x7fca46934c90" />
+                                    <attribute name="WindowXML" value="WindowXML" id="542" addr="0x7fca46934c90" />
+                                    <attribute name="ListItem" value="ListItem" id="543" addr="0x7fca46934c90" />
+                                    <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="544" addr="0x7fca46934c90" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="545" addr="0x7f99f1dd1d70" >
-                                <attributelist id="546" addr="0x7f99f1dd1d70" >
-                                    <attribute name="name" value="XBMCAddon" id="547" addr="0x7f99f1de6c90" />
-                                    <typetab id="548" addr="0x7f99f1dd1db0" >
-                                        <attributelist id="549" addr="0x7f99f1dd1db0" >
-                                            <attribute name="Dictionary" value="Dictionary" id="550" addr="0x7f99f1de6c90" />
-                                            <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="551" addr="0x7f99f1de6c90" />
-                                            <attribute name="String" value="std::string" id="552" addr="0x7f99f1de6c90" />
-                                            <attribute name="StringOrInt" value="XBMCAddon::String" id="553" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                        <typetabsitem id="554" addr="0x7f99f1dd28b0" >
-                                            <attributelist id="555" addr="0x7f99f1dd28b0" >
+                            <typescopesitem id="545" addr="0x7fca4691fd70" >
+                                <attributelist id="546" addr="0x7fca4691fd70" >
+                                    <attribute name="name" value="XBMCAddon" id="547" addr="0x7fca46934c90" />
+                                    <typetab id="548" addr="0x7fca4691fdb0" >
+                                        <attributelist id="549" addr="0x7fca4691fdb0" >
+                                            <attribute name="Dictionary" value="Dictionary" id="550" addr="0x7fca46934c90" />
+                                            <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="551" addr="0x7fca46934c90" />
+                                            <attribute name="String" value="std::string" id="552" addr="0x7fca46934c90" />
+                                            <attribute name="StringOrInt" value="XBMCAddon::String" id="553" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                        <typetabsitem id="554" addr="0x7fca469208b0" >
+                                            <attributelist id="555" addr="0x7fca469208b0" >
                                             </attributelist >
                                         </typetabsitem >
-                                        <typetabsitem id="556" addr="0x7f99f1dd2910" >
-                                            <attributelist id="557" addr="0x7f99f1dd2910" >
+                                        <typetabsitem id="556" addr="0x7fca46920910" >
+                                            <attributelist id="557" addr="0x7fca46920910" >
                                             </attributelist >
                                         </typetabsitem >
-                                        <typetabsitem id="558" addr="0x7f99f1dd1f90" >
-                                            <attributelist id="559" addr="0x7f99f1dd1f90" >
+                                        <typetabsitem id="558" addr="0x7fca4691ff90" >
+                                            <attributelist id="559" addr="0x7fca4691ff90" >
                                             </attributelist >
                                         </typetabsitem >
-                                        <typetabsitem id="560" addr="0x7f99f1dd2710" >
-                                            <attributelist id="561" addr="0x7f99f1dd2710" >
+                                        <typetabsitem id="560" addr="0x7fca46920710" >
+                                            <attributelist id="561" addr="0x7fca46920710" >
                                             </attributelist >
                                         </typetabsitem >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f99f1e1da30" id="562" addr="0x7f99f1e1da30" />
-                                    <attribute name="qname" value="XBMCAddon" id="563" addr="0x7f99f1de6c90" />
-                                    <attribute name="symtab" value="0x7f99f1e408b0" id="564" addr="0x7f99f1e408b0" />
+                                    <attribute name="parent" value="0x7fca4696ba30" id="562" addr="0x7fca4696ba30" />
+                                    <attribute name="qname" value="XBMCAddon" id="563" addr="0x7fca46934c90" />
+                                    <attribute name="symtab" value="0x7fca4698e8b0" id="564" addr="0x7fca4698e8b0" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="565" addr="0x7f99f1dd2190" >
-                                <attributelist id="566" addr="0x7f99f1dd2190" >
+                            <typescopesitem id="565" addr="0x7fca46920190" >
+                                <attributelist id="566" addr="0x7fca46920190" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="567" addr="0x7f99f1e40fb0" >
-                                <attributelist id="568" addr="0x7f99f1e40fb0" >
-                                    <attribute name="name" value="xbmcgui" id="569" addr="0x7f99f1de6c90" />
-                                    <attribute name="csymtab" value="0x7f99f1e40ff0" id="570" addr="0x7f99f1e40ff0" />
-                                    <attribute name="symtab" value="0x7f99f1e40f90" id="571" addr="0x7f99f1e40f90" />
+                            <typescopesitem id="567" addr="0x7fca4698efb0" >
+                                <attributelist id="568" addr="0x7fca4698efb0" >
+                                    <attribute name="name" value="xbmcgui" id="569" addr="0x7fca46934c90" />
+                                    <attribute name="csymtab" value="0x7fca4698eff0" id="570" addr="0x7fca4698eff0" />
+                                    <attribute name="symtab" value="0x7fca4698ef90" id="571" addr="0x7fca4698ef90" />
                                 </attributelist >
                             </typescopesitem >
                         </typescope >
                     </attributelist >
 
-                    <cdecl id="572" addr="0x7f99f1e41150" >
-                        <attributelist id="573" addr="0x7f99f1e41150" >
-                            <attribute name="sym_name" value="getCurrentWindowId" id="574" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="XBMCAddon::xbmcgui::getCurrentWindowId" id="575" addr="0x7f99f1de6c90" />
-                            <attribute name="decl" value="f()." id="576" addr="0x7f99f1de6c90" />
-                            <attribute name="kind" value="function" id="577" addr="0x7f99f1de6c90" />
-                            <attribute name="type" value="long" id="578" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="579" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="580" addr="0x7f99f1de6c90" />
+                    <cdecl id="572" addr="0x7fca4698f150" >
+                        <attributelist id="573" addr="0x7fca4698f150" >
+                            <attribute name="sym_name" value="getCurrentWindowId" id="574" addr="0x7fca46934c90" />
+                            <attribute name="name" value="XBMCAddon::xbmcgui::getCurrentWindowId" id="575" addr="0x7fca46934c90" />
+                            <attribute name="decl" value="f()." id="576" addr="0x7fca46934c90" />
+                            <attribute name="kind" value="function" id="577" addr="0x7fca46934c90" />
+                            <attribute name="type" value="long" id="578" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="579" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="580" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="581" addr="0x7f99f1e412f0" >
-                        <attributelist id="582" addr="0x7f99f1e412f0" >
-                            <attribute name="sym_name" value="getCurrentWindowDialogId" id="583" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="XBMCAddon::xbmcgui::getCurrentWindowDialogId" id="584" addr="0x7f99f1de6c90" />
-                            <attribute name="decl" value="f()." id="585" addr="0x7f99f1de6c90" />
-                            <attribute name="kind" value="function" id="586" addr="0x7f99f1de6c90" />
-                            <attribute name="type" value="long" id="587" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="588" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="589" addr="0x7f99f1de6c90" />
+                    <cdecl id="581" addr="0x7fca4698f2f0" >
+                        <attributelist id="582" addr="0x7fca4698f2f0" >
+                            <attribute name="sym_name" value="getCurrentWindowDialogId" id="583" addr="0x7fca46934c90" />
+                            <attribute name="name" value="XBMCAddon::xbmcgui::getCurrentWindowDialogId" id="584" addr="0x7fca46934c90" />
+                            <attribute name="decl" value="f()." id="585" addr="0x7fca46934c90" />
+                            <attribute name="kind" value="function" id="586" addr="0x7fca46934c90" />
+                            <attribute name="type" value="long" id="587" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="588" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="589" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="590" addr="0x7f99f1e41490" >
-                        <attributelist id="591" addr="0x7f99f1e41490" >
-                            <attribute name="sym_name" value="getScreenHeight" id="592" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="XBMCAddon::xbmcgui::getScreenHeight" id="593" addr="0x7f99f1de6c90" />
-                            <attribute name="decl" value="f()." id="594" addr="0x7f99f1de6c90" />
-                            <attribute name="kind" value="function" id="595" addr="0x7f99f1de6c90" />
-                            <attribute name="type" value="long" id="596" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="597" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="598" addr="0x7f99f1de6c90" />
+                    <cdecl id="590" addr="0x7fca4698f490" >
+                        <attributelist id="591" addr="0x7fca4698f490" >
+                            <attribute name="sym_name" value="getScreenHeight" id="592" addr="0x7fca46934c90" />
+                            <attribute name="name" value="XBMCAddon::xbmcgui::getScreenHeight" id="593" addr="0x7fca46934c90" />
+                            <attribute name="decl" value="f()." id="594" addr="0x7fca46934c90" />
+                            <attribute name="kind" value="function" id="595" addr="0x7fca46934c90" />
+                            <attribute name="type" value="long" id="596" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="597" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="598" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="599" addr="0x7f99f1e41630" >
-                        <attributelist id="600" addr="0x7f99f1e41630" >
-                            <attribute name="sym_name" value="getScreenWidth" id="601" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="XBMCAddon::xbmcgui::getScreenWidth" id="602" addr="0x7f99f1de6c90" />
-                            <attribute name="decl" value="f()." id="603" addr="0x7f99f1de6c90" />
-                            <attribute name="kind" value="function" id="604" addr="0x7f99f1de6c90" />
-                            <attribute name="type" value="long" id="605" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="606" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="607" addr="0x7f99f1de6c90" />
+                    <cdecl id="599" addr="0x7fca4698f630" >
+                        <attributelist id="600" addr="0x7fca4698f630" >
+                            <attribute name="sym_name" value="getScreenWidth" id="601" addr="0x7fca46934c90" />
+                            <attribute name="name" value="XBMCAddon::xbmcgui::getScreenWidth" id="602" addr="0x7fca46934c90" />
+                            <attribute name="decl" value="f()." id="603" addr="0x7fca46934c90" />
+                            <attribute name="kind" value="function" id="604" addr="0x7fca46934c90" />
+                            <attribute name="type" value="long" id="605" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="606" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="607" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </cdecl >
-                    <constant id="608" addr="0x7f99f1e41830" >
-                        <attributelist id="609" addr="0x7f99f1e41830" >
-                            <attribute name="sym_name" value="ICON_OVERLAY_NONE" id="610" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="ICON_OVERLAY_NONE" id="611" addr="0x7f99f1de6c90" />
-                            <attribute name="rawval" value="CGUIListItem::ICON_OVERLAY_NONE" id="612" addr="0x7f99f1de6c90" />
-                            <attribute name="feature_immutable" value="1" id="613" addr="0x7f99f1de6c90" />
-                            <attribute name="value" value="CGUIListItem::ICON_OVERLAY_NONE" id="614" addr="0x7f99f1de6c90" />
-                            <attribute name="storage" value="%constant" id="615" addr="0x7f99f1de6c90" />
-                            <attribute name="type" value="int" id="616" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="617" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="618" addr="0x7f99f1de6c90" />
+                    <constant id="608" addr="0x7fca4698f830" >
+                        <attributelist id="609" addr="0x7fca4698f830" >
+                            <attribute name="sym_name" value="ICON_OVERLAY_NONE" id="610" addr="0x7fca46934c90" />
+                            <attribute name="name" value="ICON_OVERLAY_NONE" id="611" addr="0x7fca46934c90" />
+                            <attribute name="rawval" value="CGUIListItem::ICON_OVERLAY_NONE" id="612" addr="0x7fca46934c90" />
+                            <attribute name="feature_immutable" value="1" id="613" addr="0x7fca46934c90" />
+                            <attribute name="value" value="CGUIListItem::ICON_OVERLAY_NONE" id="614" addr="0x7fca46934c90" />
+                            <attribute name="storage" value="%constant" id="615" addr="0x7fca46934c90" />
+                            <attribute name="type" value="int" id="616" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="617" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="618" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="619" addr="0x7f99f1e41a90" >
-                        <attributelist id="620" addr="0x7f99f1e41a90" >
-                            <attribute name="sym_name" value="ICON_OVERLAY_RAR" id="621" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="ICON_OVERLAY_RAR" id="622" addr="0x7f99f1de6c90" />
-                            <attribute name="rawval" value="CGUIListItem::ICON_OVERLAY_RAR" id="623" addr="0x7f99f1de6c90" />
-                            <attribute name="feature_immutable" value="1" id="624" addr="0x7f99f1de6c90" />
-                            <attribute name="value" value="CGUIListItem::ICON_OVERLAY_RAR" id="625" addr="0x7f99f1de6c90" />
-                            <attribute name="storage" value="%constant" id="626" addr="0x7f99f1de6c90" />
-                            <attribute name="type" value="int" id="627" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="628" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="629" addr="0x7f99f1de6c90" />
+                    <constant id="619" addr="0x7fca4698fa90" >
+                        <attributelist id="620" addr="0x7fca4698fa90" >
+                            <attribute name="sym_name" value="ICON_OVERLAY_RAR" id="621" addr="0x7fca46934c90" />
+                            <attribute name="name" value="ICON_OVERLAY_RAR" id="622" addr="0x7fca46934c90" />
+                            <attribute name="rawval" value="CGUIListItem::ICON_OVERLAY_RAR" id="623" addr="0x7fca46934c90" />
+                            <attribute name="feature_immutable" value="1" id="624" addr="0x7fca46934c90" />
+                            <attribute name="value" value="CGUIListItem::ICON_OVERLAY_RAR" id="625" addr="0x7fca46934c90" />
+                            <attribute name="storage" value="%constant" id="626" addr="0x7fca46934c90" />
+                            <attribute name="type" value="int" id="627" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="628" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="629" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="630" addr="0x7f99f1e41cb0" >
-                        <attributelist id="631" addr="0x7f99f1e41cb0" >
-                            <attribute name="sym_name" value="ICON_OVERLAY_ZIP" id="632" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="ICON_OVERLAY_ZIP" id="633" addr="0x7f99f1de6c90" />
-                            <attribute name="rawval" value="CGUIListItem::ICON_OVERLAY_ZIP" id="634" addr="0x7f99f1de6c90" />
-                            <attribute name="feature_immutable" value="1" id="635" addr="0x7f99f1de6c90" />
-                            <attribute name="value" value="CGUIListItem::ICON_OVERLAY_ZIP" id="636" addr="0x7f99f1de6c90" />
-                            <attribute name="storage" value="%constant" id="637" addr="0x7f99f1de6c90" />
-                            <attribute name="type" value="int" id="638" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="639" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="640" addr="0x7f99f1de6c90" />
+                    <constant id="630" addr="0x7fca4698fcb0" >
+                        <attributelist id="631" addr="0x7fca4698fcb0" >
+                            <attribute name="sym_name" value="ICON_OVERLAY_ZIP" id="632" addr="0x7fca46934c90" />
+                            <attribute name="name" value="ICON_OVERLAY_ZIP" id="633" addr="0x7fca46934c90" />
+                            <attribute name="rawval" value="CGUIListItem::ICON_OVERLAY_ZIP" id="634" addr="0x7fca46934c90" />
+                            <attribute name="feature_immutable" value="1" id="635" addr="0x7fca46934c90" />
+                            <attribute name="value" value="CGUIListItem::ICON_OVERLAY_ZIP" id="636" addr="0x7fca46934c90" />
+                            <attribute name="storage" value="%constant" id="637" addr="0x7fca46934c90" />
+                            <attribute name="type" value="int" id="638" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="639" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="640" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="641" addr="0x7f99f1e41ed0" >
-                        <attributelist id="642" addr="0x7f99f1e41ed0" >
-                            <attribute name="sym_name" value="ICON_OVERLAY_LOCKED" id="643" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="ICON_OVERLAY_LOCKED" id="644" addr="0x7f99f1de6c90" />
-                            <attribute name="rawval" value="CGUIListItem::ICON_OVERLAY_LOCKED" id="645" addr="0x7f99f1de6c90" />
-                            <attribute name="feature_immutable" value="1" id="646" addr="0x7f99f1de6c90" />
-                            <attribute name="value" value="CGUIListItem::ICON_OVERLAY_LOCKED" id="647" addr="0x7f99f1de6c90" />
-                            <attribute name="storage" value="%constant" id="648" addr="0x7f99f1de6c90" />
-                            <attribute name="type" value="int" id="649" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="650" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="651" addr="0x7f99f1de6c90" />
+                    <constant id="641" addr="0x7fca4698fed0" >
+                        <attributelist id="642" addr="0x7fca4698fed0" >
+                            <attribute name="sym_name" value="ICON_OVERLAY_LOCKED" id="643" addr="0x7fca46934c90" />
+                            <attribute name="name" value="ICON_OVERLAY_LOCKED" id="644" addr="0x7fca46934c90" />
+                            <attribute name="rawval" value="CGUIListItem::ICON_OVERLAY_LOCKED" id="645" addr="0x7fca46934c90" />
+                            <attribute name="feature_immutable" value="1" id="646" addr="0x7fca46934c90" />
+                            <attribute name="value" value="CGUIListItem::ICON_OVERLAY_LOCKED" id="647" addr="0x7fca46934c90" />
+                            <attribute name="storage" value="%constant" id="648" addr="0x7fca46934c90" />
+                            <attribute name="type" value="int" id="649" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="650" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="651" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="652" addr="0x7f99f1e420f0" >
-                        <attributelist id="653" addr="0x7f99f1e420f0" >
-                            <attribute name="sym_name" value="ICON_OVERLAY_UNWATCHED" id="654" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="ICON_OVERLAY_UNWATCHED" id="655" addr="0x7f99f1de6c90" />
-                            <attribute name="rawval" value="CGUIListItem::ICON_OVERLAY_UNWATCHED" id="656" addr="0x7f99f1de6c90" />
-                            <attribute name="feature_immutable" value="1" id="657" addr="0x7f99f1de6c90" />
-                            <attribute name="value" value="CGUIListItem::ICON_OVERLAY_UNWATCHED" id="658" addr="0x7f99f1de6c90" />
-                            <attribute name="storage" value="%constant" id="659" addr="0x7f99f1de6c90" />
-                            <attribute name="type" value="int" id="660" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="661" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="662" addr="0x7f99f1de6c90" />
+                    <constant id="652" addr="0x7fca469900f0" >
+                        <attributelist id="653" addr="0x7fca469900f0" >
+                            <attribute name="sym_name" value="ICON_OVERLAY_UNWATCHED" id="654" addr="0x7fca46934c90" />
+                            <attribute name="name" value="ICON_OVERLAY_UNWATCHED" id="655" addr="0x7fca46934c90" />
+                            <attribute name="rawval" value="CGUIListItem::ICON_OVERLAY_UNWATCHED" id="656" addr="0x7fca46934c90" />
+                            <attribute name="feature_immutable" value="1" id="657" addr="0x7fca46934c90" />
+                            <attribute name="value" value="CGUIListItem::ICON_OVERLAY_UNWATCHED" id="658" addr="0x7fca46934c90" />
+                            <attribute name="storage" value="%constant" id="659" addr="0x7fca46934c90" />
+                            <attribute name="type" value="int" id="660" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="661" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="662" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="663" addr="0x7f99f1e42310" >
-                        <attributelist id="664" addr="0x7f99f1e42310" >
-                            <attribute name="sym_name" value="ICON_OVERLAY_WATCHED" id="665" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="ICON_OVERLAY_WATCHED" id="666" addr="0x7f99f1de6c90" />
-                            <attribute name="rawval" value="CGUIListItem::ICON_OVERLAY_WATCHED" id="667" addr="0x7f99f1de6c90" />
-                            <attribute name="feature_immutable" value="1" id="668" addr="0x7f99f1de6c90" />
-                            <attribute name="value" value="CGUIListItem::ICON_OVERLAY_WATCHED" id="669" addr="0x7f99f1de6c90" />
-                            <attribute name="storage" value="%constant" id="670" addr="0x7f99f1de6c90" />
-                            <attribute name="type" value="int" id="671" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="672" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="673" addr="0x7f99f1de6c90" />
+                    <constant id="663" addr="0x7fca46990310" >
+                        <attributelist id="664" addr="0x7fca46990310" >
+                            <attribute name="sym_name" value="ICON_OVERLAY_WATCHED" id="665" addr="0x7fca46934c90" />
+                            <attribute name="name" value="ICON_OVERLAY_WATCHED" id="666" addr="0x7fca46934c90" />
+                            <attribute name="rawval" value="CGUIListItem::ICON_OVERLAY_WATCHED" id="667" addr="0x7fca46934c90" />
+                            <attribute name="feature_immutable" value="1" id="668" addr="0x7fca46934c90" />
+                            <attribute name="value" value="CGUIListItem::ICON_OVERLAY_WATCHED" id="669" addr="0x7fca46934c90" />
+                            <attribute name="storage" value="%constant" id="670" addr="0x7fca46934c90" />
+                            <attribute name="type" value="int" id="671" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="672" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="673" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="674" addr="0x7f99f1e42530" >
-                        <attributelist id="675" addr="0x7f99f1e42530" >
-                            <attribute name="sym_name" value="ICON_OVERLAY_HD" id="676" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="ICON_OVERLAY_HD" id="677" addr="0x7f99f1de6c90" />
-                            <attribute name="rawval" value="CGUIListItem::ICON_OVERLAY_HD" id="678" addr="0x7f99f1de6c90" />
-                            <attribute name="feature_immutable" value="1" id="679" addr="0x7f99f1de6c90" />
-                            <attribute name="value" value="CGUIListItem::ICON_OVERLAY_HD" id="680" addr="0x7f99f1de6c90" />
-                            <attribute name="storage" value="%constant" id="681" addr="0x7f99f1de6c90" />
-                            <attribute name="type" value="int" id="682" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="683" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="684" addr="0x7f99f1de6c90" />
+                    <constant id="674" addr="0x7fca46990530" >
+                        <attributelist id="675" addr="0x7fca46990530" >
+                            <attribute name="sym_name" value="ICON_OVERLAY_HD" id="676" addr="0x7fca46934c90" />
+                            <attribute name="name" value="ICON_OVERLAY_HD" id="677" addr="0x7fca46934c90" />
+                            <attribute name="rawval" value="CGUIListItem::ICON_OVERLAY_HD" id="678" addr="0x7fca46934c90" />
+                            <attribute name="feature_immutable" value="1" id="679" addr="0x7fca46934c90" />
+                            <attribute name="value" value="CGUIListItem::ICON_OVERLAY_HD" id="680" addr="0x7fca46934c90" />
+                            <attribute name="storage" value="%constant" id="681" addr="0x7fca46934c90" />
+                            <attribute name="type" value="int" id="682" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="683" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="684" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="685" addr="0x7f99f1e42750" >
-                        <attributelist id="686" addr="0x7f99f1e42750" >
-                            <attribute name="sym_name" value="INPUT_TYPE_TEXT" id="687" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="INPUT_TYPE_TEXT" id="688" addr="0x7f99f1de6c90" />
-                            <attribute name="rawval" value="CGUIEditControl::INPUT_TYPE_TEXT" id="689" addr="0x7f99f1de6c90" />
-                            <attribute name="feature_immutable" value="1" id="690" addr="0x7f99f1de6c90" />
-                            <attribute name="value" value="CGUIEditControl::INPUT_TYPE_TEXT" id="691" addr="0x7f99f1de6c90" />
-                            <attribute name="storage" value="%constant" id="692" addr="0x7f99f1de6c90" />
-                            <attribute name="type" value="int" id="693" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="694" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="695" addr="0x7f99f1de6c90" />
+                    <constant id="685" addr="0x7fca46990750" >
+                        <attributelist id="686" addr="0x7fca46990750" >
+                            <attribute name="sym_name" value="INPUT_TYPE_TEXT" id="687" addr="0x7fca46934c90" />
+                            <attribute name="name" value="INPUT_TYPE_TEXT" id="688" addr="0x7fca46934c90" />
+                            <attribute name="rawval" value="CGUIEditControl::INPUT_TYPE_TEXT" id="689" addr="0x7fca46934c90" />
+                            <attribute name="feature_immutable" value="1" id="690" addr="0x7fca46934c90" />
+                            <attribute name="value" value="CGUIEditControl::INPUT_TYPE_TEXT" id="691" addr="0x7fca46934c90" />
+                            <attribute name="storage" value="%constant" id="692" addr="0x7fca46934c90" />
+                            <attribute name="type" value="int" id="693" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="694" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="695" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="696" addr="0x7f99f1e42970" >
-                        <attributelist id="697" addr="0x7f99f1e42970" >
-                            <attribute name="sym_name" value="INPUT_TYPE_NUMBER" id="698" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="INPUT_TYPE_NUMBER" id="699" addr="0x7f99f1de6c90" />
-                            <attribute name="rawval" value="CGUIEditControl::INPUT_TYPE_NUMBER" id="700" addr="0x7f99f1de6c90" />
-                            <attribute name="feature_immutable" value="1" id="701" addr="0x7f99f1de6c90" />
-                            <attribute name="value" value="CGUIEditControl::INPUT_TYPE_NUMBER" id="702" addr="0x7f99f1de6c90" />
-                            <attribute name="storage" value="%constant" id="703" addr="0x7f99f1de6c90" />
-                            <attribute name="type" value="int" id="704" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="705" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="706" addr="0x7f99f1de6c90" />
+                    <constant id="696" addr="0x7fca46990970" >
+                        <attributelist id="697" addr="0x7fca46990970" >
+                            <attribute name="sym_name" value="INPUT_TYPE_NUMBER" id="698" addr="0x7fca46934c90" />
+                            <attribute name="name" value="INPUT_TYPE_NUMBER" id="699" addr="0x7fca46934c90" />
+                            <attribute name="rawval" value="CGUIEditControl::INPUT_TYPE_NUMBER" id="700" addr="0x7fca46934c90" />
+                            <attribute name="feature_immutable" value="1" id="701" addr="0x7fca46934c90" />
+                            <attribute name="value" value="CGUIEditControl::INPUT_TYPE_NUMBER" id="702" addr="0x7fca46934c90" />
+                            <attribute name="storage" value="%constant" id="703" addr="0x7fca46934c90" />
+                            <attribute name="type" value="int" id="704" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="705" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="706" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="707" addr="0x7f99f1e42b90" >
-                        <attributelist id="708" addr="0x7f99f1e42b90" >
-                            <attribute name="sym_name" value="INPUT_TYPE_DATE" id="709" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="INPUT_TYPE_DATE" id="710" addr="0x7f99f1de6c90" />
-                            <attribute name="rawval" value="CGUIEditControl::INPUT_TYPE_DATE" id="711" addr="0x7f99f1de6c90" />
-                            <attribute name="feature_immutable" value="1" id="712" addr="0x7f99f1de6c90" />
-                            <attribute name="value" value="CGUIEditControl::INPUT_TYPE_DATE" id="713" addr="0x7f99f1de6c90" />
-                            <attribute name="storage" value="%constant" id="714" addr="0x7f99f1de6c90" />
-                            <attribute name="type" value="int" id="715" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="716" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="717" addr="0x7f99f1de6c90" />
+                    <constant id="707" addr="0x7fca46990b90" >
+                        <attributelist id="708" addr="0x7fca46990b90" >
+                            <attribute name="sym_name" value="INPUT_TYPE_DATE" id="709" addr="0x7fca46934c90" />
+                            <attribute name="name" value="INPUT_TYPE_DATE" id="710" addr="0x7fca46934c90" />
+                            <attribute name="rawval" value="CGUIEditControl::INPUT_TYPE_DATE" id="711" addr="0x7fca46934c90" />
+                            <attribute name="feature_immutable" value="1" id="712" addr="0x7fca46934c90" />
+                            <attribute name="value" value="CGUIEditControl::INPUT_TYPE_DATE" id="713" addr="0x7fca46934c90" />
+                            <attribute name="storage" value="%constant" id="714" addr="0x7fca46934c90" />
+                            <attribute name="type" value="int" id="715" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="716" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="717" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="718" addr="0x7f99f1e42db0" >
-                        <attributelist id="719" addr="0x7f99f1e42db0" >
-                            <attribute name="sym_name" value="INPUT_TYPE_TIME" id="720" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="INPUT_TYPE_TIME" id="721" addr="0x7f99f1de6c90" />
-                            <attribute name="rawval" value="CGUIEditControl::INPUT_TYPE_TIME" id="722" addr="0x7f99f1de6c90" />
-                            <attribute name="feature_immutable" value="1" id="723" addr="0x7f99f1de6c90" />
-                            <attribute name="value" value="CGUIEditControl::INPUT_TYPE_TIME" id="724" addr="0x7f99f1de6c90" />
-                            <attribute name="storage" value="%constant" id="725" addr="0x7f99f1de6c90" />
-                            <attribute name="type" value="int" id="726" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="727" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="728" addr="0x7f99f1de6c90" />
+                    <constant id="718" addr="0x7fca46990db0" >
+                        <attributelist id="719" addr="0x7fca46990db0" >
+                            <attribute name="sym_name" value="INPUT_TYPE_TIME" id="720" addr="0x7fca46934c90" />
+                            <attribute name="name" value="INPUT_TYPE_TIME" id="721" addr="0x7fca46934c90" />
+                            <attribute name="rawval" value="CGUIEditControl::INPUT_TYPE_TIME" id="722" addr="0x7fca46934c90" />
+                            <attribute name="feature_immutable" value="1" id="723" addr="0x7fca46934c90" />
+                            <attribute name="value" value="CGUIEditControl::INPUT_TYPE_TIME" id="724" addr="0x7fca46934c90" />
+                            <attribute name="storage" value="%constant" id="725" addr="0x7fca46934c90" />
+                            <attribute name="type" value="int" id="726" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="727" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="728" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="729" addr="0x7f99f1e42fd0" >
-                        <attributelist id="730" addr="0x7f99f1e42fd0" >
-                            <attribute name="sym_name" value="INPUT_TYPE_IPADDRESS" id="731" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="INPUT_TYPE_IPADDRESS" id="732" addr="0x7f99f1de6c90" />
-                            <attribute name="rawval" value="CGUIEditControl::INPUT_TYPE_IPADDRESS" id="733" addr="0x7f99f1de6c90" />
-                            <attribute name="feature_immutable" value="1" id="734" addr="0x7f99f1de6c90" />
-                            <attribute name="value" value="CGUIEditControl::INPUT_TYPE_IPADDRESS" id="735" addr="0x7f99f1de6c90" />
-                            <attribute name="storage" value="%constant" id="736" addr="0x7f99f1de6c90" />
-                            <attribute name="type" value="int" id="737" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="738" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="739" addr="0x7f99f1de6c90" />
+                    <constant id="729" addr="0x7fca46990fd0" >
+                        <attributelist id="730" addr="0x7fca46990fd0" >
+                            <attribute name="sym_name" value="INPUT_TYPE_IPADDRESS" id="731" addr="0x7fca46934c90" />
+                            <attribute name="name" value="INPUT_TYPE_IPADDRESS" id="732" addr="0x7fca46934c90" />
+                            <attribute name="rawval" value="CGUIEditControl::INPUT_TYPE_IPADDRESS" id="733" addr="0x7fca46934c90" />
+                            <attribute name="feature_immutable" value="1" id="734" addr="0x7fca46934c90" />
+                            <attribute name="value" value="CGUIEditControl::INPUT_TYPE_IPADDRESS" id="735" addr="0x7fca46934c90" />
+                            <attribute name="storage" value="%constant" id="736" addr="0x7fca46934c90" />
+                            <attribute name="type" value="int" id="737" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="738" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="739" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="740" addr="0x7f99f1e431f0" >
-                        <attributelist id="741" addr="0x7f99f1e431f0" >
-                            <attribute name="sym_name" value="INPUT_TYPE_PASSWORD" id="742" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="INPUT_TYPE_PASSWORD" id="743" addr="0x7f99f1de6c90" />
-                            <attribute name="rawval" value="CGUIEditControl::INPUT_TYPE_PASSWORD" id="744" addr="0x7f99f1de6c90" />
-                            <attribute name="feature_immutable" value="1" id="745" addr="0x7f99f1de6c90" />
-                            <attribute name="value" value="CGUIEditControl::INPUT_TYPE_PASSWORD" id="746" addr="0x7f99f1de6c90" />
-                            <attribute name="storage" value="%constant" id="747" addr="0x7f99f1de6c90" />
-                            <attribute name="type" value="int" id="748" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="749" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="750" addr="0x7f99f1de6c90" />
+                    <constant id="740" addr="0x7fca469911f0" >
+                        <attributelist id="741" addr="0x7fca469911f0" >
+                            <attribute name="sym_name" value="INPUT_TYPE_PASSWORD" id="742" addr="0x7fca46934c90" />
+                            <attribute name="name" value="INPUT_TYPE_PASSWORD" id="743" addr="0x7fca46934c90" />
+                            <attribute name="rawval" value="CGUIEditControl::INPUT_TYPE_PASSWORD" id="744" addr="0x7fca46934c90" />
+                            <attribute name="feature_immutable" value="1" id="745" addr="0x7fca46934c90" />
+                            <attribute name="value" value="CGUIEditControl::INPUT_TYPE_PASSWORD" id="746" addr="0x7fca46934c90" />
+                            <attribute name="storage" value="%constant" id="747" addr="0x7fca46934c90" />
+                            <attribute name="type" value="int" id="748" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="749" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="750" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="751" addr="0x7f99f1e43410" >
-                        <attributelist id="752" addr="0x7f99f1e43410" >
-                            <attribute name="sym_name" value="INPUT_TYPE_PASSWORD_MD5" id="753" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="INPUT_TYPE_PASSWORD_MD5" id="754" addr="0x7f99f1de6c90" />
-                            <attribute name="rawval" value="CGUIEditControl::INPUT_TYPE_PASSWORD_MD5" id="755" addr="0x7f99f1de6c90" />
-                            <attribute name="feature_immutable" value="1" id="756" addr="0x7f99f1de6c90" />
-                            <attribute name="value" value="CGUIEditControl::INPUT_TYPE_PASSWORD_MD5" id="757" addr="0x7f99f1de6c90" />
-                            <attribute name="storage" value="%constant" id="758" addr="0x7f99f1de6c90" />
-                            <attribute name="type" value="int" id="759" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="760" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="761" addr="0x7f99f1de6c90" />
+                    <constant id="751" addr="0x7fca46991410" >
+                        <attributelist id="752" addr="0x7fca46991410" >
+                            <attribute name="sym_name" value="INPUT_TYPE_PASSWORD_MD5" id="753" addr="0x7fca46934c90" />
+                            <attribute name="name" value="INPUT_TYPE_PASSWORD_MD5" id="754" addr="0x7fca46934c90" />
+                            <attribute name="rawval" value="CGUIEditControl::INPUT_TYPE_PASSWORD_MD5" id="755" addr="0x7fca46934c90" />
+                            <attribute name="feature_immutable" value="1" id="756" addr="0x7fca46934c90" />
+                            <attribute name="value" value="CGUIEditControl::INPUT_TYPE_PASSWORD_MD5" id="757" addr="0x7fca46934c90" />
+                            <attribute name="storage" value="%constant" id="758" addr="0x7fca46934c90" />
+                            <attribute name="type" value="int" id="759" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="760" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="761" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="762" addr="0x7f99f1e43630" >
-                        <attributelist id="763" addr="0x7f99f1e43630" >
-                            <attribute name="sym_name" value="INPUT_TYPE_SECONDS" id="764" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="INPUT_TYPE_SECONDS" id="765" addr="0x7f99f1de6c90" />
-                            <attribute name="rawval" value="CGUIEditControl::INPUT_TYPE_SECONDS" id="766" addr="0x7f99f1de6c90" />
-                            <attribute name="feature_immutable" value="1" id="767" addr="0x7f99f1de6c90" />
-                            <attribute name="value" value="CGUIEditControl::INPUT_TYPE_SECONDS" id="768" addr="0x7f99f1de6c90" />
-                            <attribute name="storage" value="%constant" id="769" addr="0x7f99f1de6c90" />
-                            <attribute name="type" value="int" id="770" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="771" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="772" addr="0x7f99f1de6c90" />
+                    <constant id="762" addr="0x7fca46991630" >
+                        <attributelist id="763" addr="0x7fca46991630" >
+                            <attribute name="sym_name" value="INPUT_TYPE_SECONDS" id="764" addr="0x7fca46934c90" />
+                            <attribute name="name" value="INPUT_TYPE_SECONDS" id="765" addr="0x7fca46934c90" />
+                            <attribute name="rawval" value="CGUIEditControl::INPUT_TYPE_SECONDS" id="766" addr="0x7fca46934c90" />
+                            <attribute name="feature_immutable" value="1" id="767" addr="0x7fca46934c90" />
+                            <attribute name="value" value="CGUIEditControl::INPUT_TYPE_SECONDS" id="768" addr="0x7fca46934c90" />
+                            <attribute name="storage" value="%constant" id="769" addr="0x7fca46934c90" />
+                            <attribute name="type" value="int" id="770" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="771" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="772" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="773" addr="0x7f99f1e43890" >
-                        <attributelist id="774" addr="0x7f99f1e43890" >
-                            <attribute name="sym_name" value="NOTIFICATION_INFO" id="775" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="NOTIFICATION_INFO" id="776" addr="0x7f99f1de6c90" />
-                            <attribute name="rawval" value="getNOTIFICATION_INFO()" id="777" addr="0x7f99f1de6c90" />
-                            <attribute name="feature_immutable" value="1" id="778" addr="0x7f99f1de6c90" />
-                            <attribute name="value" value="getNOTIFICATION_INFO()" id="779" addr="0x7f99f1de6c90" />
-                            <attribute name="storage" value="%constant" id="780" addr="0x7f99f1de6c90" />
-                            <attribute name="type" value="p.q(const).char" id="781" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="782" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="783" addr="0x7f99f1de6c90" />
+                    <constant id="773" addr="0x7fca46991890" >
+                        <attributelist id="774" addr="0x7fca46991890" >
+                            <attribute name="sym_name" value="NOTIFICATION_INFO" id="775" addr="0x7fca46934c90" />
+                            <attribute name="name" value="NOTIFICATION_INFO" id="776" addr="0x7fca46934c90" />
+                            <attribute name="rawval" value="getNOTIFICATION_INFO()" id="777" addr="0x7fca46934c90" />
+                            <attribute name="feature_immutable" value="1" id="778" addr="0x7fca46934c90" />
+                            <attribute name="value" value="getNOTIFICATION_INFO()" id="779" addr="0x7fca46934c90" />
+                            <attribute name="storage" value="%constant" id="780" addr="0x7fca46934c90" />
+                            <attribute name="type" value="p.q(const).char" id="781" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="782" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="783" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="784" addr="0x7f99f1e43af0" >
-                        <attributelist id="785" addr="0x7f99f1e43af0" >
-                            <attribute name="sym_name" value="NOTIFICATION_WARNING" id="786" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="NOTIFICATION_WARNING" id="787" addr="0x7f99f1de6c90" />
-                            <attribute name="rawval" value="getNOTIFICATION_WARNING()" id="788" addr="0x7f99f1de6c90" />
-                            <attribute name="feature_immutable" value="1" id="789" addr="0x7f99f1de6c90" />
-                            <attribute name="value" value="getNOTIFICATION_WARNING()" id="790" addr="0x7f99f1de6c90" />
-                            <attribute name="storage" value="%constant" id="791" addr="0x7f99f1de6c90" />
-                            <attribute name="type" value="p.q(const).char" id="792" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="793" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="794" addr="0x7f99f1de6c90" />
+                    <constant id="784" addr="0x7fca46991af0" >
+                        <attributelist id="785" addr="0x7fca46991af0" >
+                            <attribute name="sym_name" value="NOTIFICATION_WARNING" id="786" addr="0x7fca46934c90" />
+                            <attribute name="name" value="NOTIFICATION_WARNING" id="787" addr="0x7fca46934c90" />
+                            <attribute name="rawval" value="getNOTIFICATION_WARNING()" id="788" addr="0x7fca46934c90" />
+                            <attribute name="feature_immutable" value="1" id="789" addr="0x7fca46934c90" />
+                            <attribute name="value" value="getNOTIFICATION_WARNING()" id="790" addr="0x7fca46934c90" />
+                            <attribute name="storage" value="%constant" id="791" addr="0x7fca46934c90" />
+                            <attribute name="type" value="p.q(const).char" id="792" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="793" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="794" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="795" addr="0x7f99f1e43d50" >
-                        <attributelist id="796" addr="0x7f99f1e43d50" >
-                            <attribute name="sym_name" value="NOTIFICATION_ERROR" id="797" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="NOTIFICATION_ERROR" id="798" addr="0x7f99f1de6c90" />
-                            <attribute name="rawval" value="getNOTIFICATION_ERROR()" id="799" addr="0x7f99f1de6c90" />
-                            <attribute name="feature_immutable" value="1" id="800" addr="0x7f99f1de6c90" />
-                            <attribute name="value" value="getNOTIFICATION_ERROR()" id="801" addr="0x7f99f1de6c90" />
-                            <attribute name="storage" value="%constant" id="802" addr="0x7f99f1de6c90" />
-                            <attribute name="type" value="p.q(const).char" id="803" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="804" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="805" addr="0x7f99f1de6c90" />
+                    <constant id="795" addr="0x7fca46991d50" >
+                        <attributelist id="796" addr="0x7fca46991d50" >
+                            <attribute name="sym_name" value="NOTIFICATION_ERROR" id="797" addr="0x7fca46934c90" />
+                            <attribute name="name" value="NOTIFICATION_ERROR" id="798" addr="0x7fca46934c90" />
+                            <attribute name="rawval" value="getNOTIFICATION_ERROR()" id="799" addr="0x7fca46934c90" />
+                            <attribute name="feature_immutable" value="1" id="800" addr="0x7fca46934c90" />
+                            <attribute name="value" value="getNOTIFICATION_ERROR()" id="801" addr="0x7fca46934c90" />
+                            <attribute name="storage" value="%constant" id="802" addr="0x7fca46934c90" />
+                            <attribute name="type" value="p.q(const).char" id="803" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="804" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="805" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="806" addr="0x7f99f1e43f50" >
-                        <attributelist id="807" addr="0x7f99f1e43f50" >
-                            <attribute name="sym_name" value="INPUT_ALPHANUM" id="808" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="INPUT_ALPHANUM" id="809" addr="0x7f99f1de6c90" />
-                            <attribute name="rawval" value="INPUT_ALPHANUM" id="810" addr="0x7f99f1de6c90" />
-                            <attribute name="feature_immutable" value="1" id="811" addr="0x7f99f1de6c90" />
-                            <attribute name="value" value="INPUT_ALPHANUM" id="812" addr="0x7f99f1de6c90" />
-                            <attribute name="storage" value="%constant" id="813" addr="0x7f99f1de6c90" />
-                            <attribute name="type" value="int" id="814" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="815" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="816" addr="0x7f99f1de6c90" />
+                    <constant id="806" addr="0x7fca46991f50" >
+                        <attributelist id="807" addr="0x7fca46991f50" >
+                            <attribute name="sym_name" value="INPUT_ALPHANUM" id="808" addr="0x7fca46934c90" />
+                            <attribute name="name" value="INPUT_ALPHANUM" id="809" addr="0x7fca46934c90" />
+                            <attribute name="rawval" value="INPUT_ALPHANUM" id="810" addr="0x7fca46934c90" />
+                            <attribute name="feature_immutable" value="1" id="811" addr="0x7fca46934c90" />
+                            <attribute name="value" value="INPUT_ALPHANUM" id="812" addr="0x7fca46934c90" />
+                            <attribute name="storage" value="%constant" id="813" addr="0x7fca46934c90" />
+                            <attribute name="type" value="int" id="814" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="815" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="816" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="817" addr="0x7f99f1e44150" >
-                        <attributelist id="818" addr="0x7f99f1e44150" >
-                            <attribute name="sym_name" value="INPUT_NUMERIC" id="819" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="INPUT_NUMERIC" id="820" addr="0x7f99f1de6c90" />
-                            <attribute name="rawval" value="INPUT_NUMERIC" id="821" addr="0x7f99f1de6c90" />
-                            <attribute name="feature_immutable" value="1" id="822" addr="0x7f99f1de6c90" />
-                            <attribute name="value" value="INPUT_NUMERIC" id="823" addr="0x7f99f1de6c90" />
-                            <attribute name="storage" value="%constant" id="824" addr="0x7f99f1de6c90" />
-                            <attribute name="type" value="int" id="825" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="826" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="827" addr="0x7f99f1de6c90" />
+                    <constant id="817" addr="0x7fca46992150" >
+                        <attributelist id="818" addr="0x7fca46992150" >
+                            <attribute name="sym_name" value="INPUT_NUMERIC" id="819" addr="0x7fca46934c90" />
+                            <attribute name="name" value="INPUT_NUMERIC" id="820" addr="0x7fca46934c90" />
+                            <attribute name="rawval" value="INPUT_NUMERIC" id="821" addr="0x7fca46934c90" />
+                            <attribute name="feature_immutable" value="1" id="822" addr="0x7fca46934c90" />
+                            <attribute name="value" value="INPUT_NUMERIC" id="823" addr="0x7fca46934c90" />
+                            <attribute name="storage" value="%constant" id="824" addr="0x7fca46934c90" />
+                            <attribute name="type" value="int" id="825" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="826" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="827" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="828" addr="0x7f99f1e44350" >
-                        <attributelist id="829" addr="0x7f99f1e44350" >
-                            <attribute name="sym_name" value="INPUT_DATE" id="830" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="INPUT_DATE" id="831" addr="0x7f99f1de6c90" />
-                            <attribute name="rawval" value="INPUT_DATE" id="832" addr="0x7f99f1de6c90" />
-                            <attribute name="feature_immutable" value="1" id="833" addr="0x7f99f1de6c90" />
-                            <attribute name="value" value="INPUT_DATE" id="834" addr="0x7f99f1de6c90" />
-                            <attribute name="storage" value="%constant" id="835" addr="0x7f99f1de6c90" />
-                            <attribute name="type" value="int" id="836" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="837" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="838" addr="0x7f99f1de6c90" />
+                    <constant id="828" addr="0x7fca46992350" >
+                        <attributelist id="829" addr="0x7fca46992350" >
+                            <attribute name="sym_name" value="INPUT_DATE" id="830" addr="0x7fca46934c90" />
+                            <attribute name="name" value="INPUT_DATE" id="831" addr="0x7fca46934c90" />
+                            <attribute name="rawval" value="INPUT_DATE" id="832" addr="0x7fca46934c90" />
+                            <attribute name="feature_immutable" value="1" id="833" addr="0x7fca46934c90" />
+                            <attribute name="value" value="INPUT_DATE" id="834" addr="0x7fca46934c90" />
+                            <attribute name="storage" value="%constant" id="835" addr="0x7fca46934c90" />
+                            <attribute name="type" value="int" id="836" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="837" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="838" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="839" addr="0x7f99f1e44550" >
-                        <attributelist id="840" addr="0x7f99f1e44550" >
-                            <attribute name="sym_name" value="INPUT_TIME" id="841" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="INPUT_TIME" id="842" addr="0x7f99f1de6c90" />
-                            <attribute name="rawval" value="INPUT_TIME" id="843" addr="0x7f99f1de6c90" />
-                            <attribute name="feature_immutable" value="1" id="844" addr="0x7f99f1de6c90" />
-                            <attribute name="value" value="INPUT_TIME" id="845" addr="0x7f99f1de6c90" />
-                            <attribute name="storage" value="%constant" id="846" addr="0x7f99f1de6c90" />
-                            <attribute name="type" value="int" id="847" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="848" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="849" addr="0x7f99f1de6c90" />
+                    <constant id="839" addr="0x7fca46992550" >
+                        <attributelist id="840" addr="0x7fca46992550" >
+                            <attribute name="sym_name" value="INPUT_TIME" id="841" addr="0x7fca46934c90" />
+                            <attribute name="name" value="INPUT_TIME" id="842" addr="0x7fca46934c90" />
+                            <attribute name="rawval" value="INPUT_TIME" id="843" addr="0x7fca46934c90" />
+                            <attribute name="feature_immutable" value="1" id="844" addr="0x7fca46934c90" />
+                            <attribute name="value" value="INPUT_TIME" id="845" addr="0x7fca46934c90" />
+                            <attribute name="storage" value="%constant" id="846" addr="0x7fca46934c90" />
+                            <attribute name="type" value="int" id="847" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="848" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="849" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="850" addr="0x7f99f1e44750" >
-                        <attributelist id="851" addr="0x7f99f1e44750" >
-                            <attribute name="sym_name" value="INPUT_IPADDRESS" id="852" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="INPUT_IPADDRESS" id="853" addr="0x7f99f1de6c90" />
-                            <attribute name="rawval" value="INPUT_IPADDRESS" id="854" addr="0x7f99f1de6c90" />
-                            <attribute name="feature_immutable" value="1" id="855" addr="0x7f99f1de6c90" />
-                            <attribute name="value" value="INPUT_IPADDRESS" id="856" addr="0x7f99f1de6c90" />
-                            <attribute name="storage" value="%constant" id="857" addr="0x7f99f1de6c90" />
-                            <attribute name="type" value="int" id="858" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="859" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="860" addr="0x7f99f1de6c90" />
+                    <constant id="850" addr="0x7fca46992750" >
+                        <attributelist id="851" addr="0x7fca46992750" >
+                            <attribute name="sym_name" value="INPUT_IPADDRESS" id="852" addr="0x7fca46934c90" />
+                            <attribute name="name" value="INPUT_IPADDRESS" id="853" addr="0x7fca46934c90" />
+                            <attribute name="rawval" value="INPUT_IPADDRESS" id="854" addr="0x7fca46934c90" />
+                            <attribute name="feature_immutable" value="1" id="855" addr="0x7fca46934c90" />
+                            <attribute name="value" value="INPUT_IPADDRESS" id="856" addr="0x7fca46934c90" />
+                            <attribute name="storage" value="%constant" id="857" addr="0x7fca46934c90" />
+                            <attribute name="type" value="int" id="858" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="859" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="860" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="861" addr="0x7f99f1e44950" >
-                        <attributelist id="862" addr="0x7f99f1e44950" >
-                            <attribute name="sym_name" value="INPUT_PASSWORD" id="863" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="INPUT_PASSWORD" id="864" addr="0x7f99f1de6c90" />
-                            <attribute name="rawval" value="INPUT_PASSWORD" id="865" addr="0x7f99f1de6c90" />
-                            <attribute name="feature_immutable" value="1" id="866" addr="0x7f99f1de6c90" />
-                            <attribute name="value" value="INPUT_PASSWORD" id="867" addr="0x7f99f1de6c90" />
-                            <attribute name="storage" value="%constant" id="868" addr="0x7f99f1de6c90" />
-                            <attribute name="type" value="int" id="869" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="870" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="871" addr="0x7f99f1de6c90" />
+                    <constant id="861" addr="0x7fca46992950" >
+                        <attributelist id="862" addr="0x7fca46992950" >
+                            <attribute name="sym_name" value="INPUT_PASSWORD" id="863" addr="0x7fca46934c90" />
+                            <attribute name="name" value="INPUT_PASSWORD" id="864" addr="0x7fca46934c90" />
+                            <attribute name="rawval" value="INPUT_PASSWORD" id="865" addr="0x7fca46934c90" />
+                            <attribute name="feature_immutable" value="1" id="866" addr="0x7fca46934c90" />
+                            <attribute name="value" value="INPUT_PASSWORD" id="867" addr="0x7fca46934c90" />
+                            <attribute name="storage" value="%constant" id="868" addr="0x7fca46934c90" />
+                            <attribute name="type" value="int" id="869" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="870" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="871" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="872" addr="0x7f99f1e44b50" >
-                        <attributelist id="873" addr="0x7f99f1e44b50" >
-                            <attribute name="sym_name" value="HORIZONTAL" id="874" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="HORIZONTAL" id="875" addr="0x7f99f1de6c90" />
-                            <attribute name="rawval" value="HORIZONTAL" id="876" addr="0x7f99f1de6c90" />
-                            <attribute name="feature_immutable" value="1" id="877" addr="0x7f99f1de6c90" />
-                            <attribute name="value" value="HORIZONTAL" id="878" addr="0x7f99f1de6c90" />
-                            <attribute name="storage" value="%constant" id="879" addr="0x7f99f1de6c90" />
-                            <attribute name="type" value="int" id="880" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="881" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="882" addr="0x7f99f1de6c90" />
+                    <constant id="872" addr="0x7fca46992b50" >
+                        <attributelist id="873" addr="0x7fca46992b50" >
+                            <attribute name="sym_name" value="HORIZONTAL" id="874" addr="0x7fca46934c90" />
+                            <attribute name="name" value="HORIZONTAL" id="875" addr="0x7fca46934c90" />
+                            <attribute name="rawval" value="HORIZONTAL" id="876" addr="0x7fca46934c90" />
+                            <attribute name="feature_immutable" value="1" id="877" addr="0x7fca46934c90" />
+                            <attribute name="value" value="HORIZONTAL" id="878" addr="0x7fca46934c90" />
+                            <attribute name="storage" value="%constant" id="879" addr="0x7fca46934c90" />
+                            <attribute name="type" value="int" id="880" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="881" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="882" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="883" addr="0x7f99f1e44d50" >
-                        <attributelist id="884" addr="0x7f99f1e44d50" >
-                            <attribute name="sym_name" value="VERTICAL" id="885" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="VERTICAL" id="886" addr="0x7f99f1de6c90" />
-                            <attribute name="rawval" value="VERTICAL" id="887" addr="0x7f99f1de6c90" />
-                            <attribute name="feature_immutable" value="1" id="888" addr="0x7f99f1de6c90" />
-                            <attribute name="value" value="VERTICAL" id="889" addr="0x7f99f1de6c90" />
-                            <attribute name="storage" value="%constant" id="890" addr="0x7f99f1de6c90" />
-                            <attribute name="type" value="int" id="891" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="892" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="893" addr="0x7f99f1de6c90" />
+                    <constant id="883" addr="0x7fca46992d50" >
+                        <attributelist id="884" addr="0x7fca46992d50" >
+                            <attribute name="sym_name" value="VERTICAL" id="885" addr="0x7fca46934c90" />
+                            <attribute name="name" value="VERTICAL" id="886" addr="0x7fca46934c90" />
+                            <attribute name="rawval" value="VERTICAL" id="887" addr="0x7fca46934c90" />
+                            <attribute name="feature_immutable" value="1" id="888" addr="0x7fca46934c90" />
+                            <attribute name="value" value="VERTICAL" id="889" addr="0x7fca46934c90" />
+                            <attribute name="storage" value="%constant" id="890" addr="0x7fca46934c90" />
+                            <attribute name="type" value="int" id="891" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="892" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="893" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="894" addr="0x7f99f1e44f50" >
-                        <attributelist id="895" addr="0x7f99f1e44f50" >
-                            <attribute name="sym_name" value="PASSWORD_VERIFY" id="896" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="PASSWORD_VERIFY" id="897" addr="0x7f99f1de6c90" />
-                            <attribute name="rawval" value="PASSWORD_VERIFY" id="898" addr="0x7f99f1de6c90" />
-                            <attribute name="feature_immutable" value="1" id="899" addr="0x7f99f1de6c90" />
-                            <attribute name="value" value="PASSWORD_VERIFY" id="900" addr="0x7f99f1de6c90" />
-                            <attribute name="storage" value="%constant" id="901" addr="0x7f99f1de6c90" />
-                            <attribute name="type" value="int" id="902" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="903" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="904" addr="0x7f99f1de6c90" />
+                    <constant id="894" addr="0x7fca46992f50" >
+                        <attributelist id="895" addr="0x7fca46992f50" >
+                            <attribute name="sym_name" value="PASSWORD_VERIFY" id="896" addr="0x7fca46934c90" />
+                            <attribute name="name" value="PASSWORD_VERIFY" id="897" addr="0x7fca46934c90" />
+                            <attribute name="rawval" value="PASSWORD_VERIFY" id="898" addr="0x7fca46934c90" />
+                            <attribute name="feature_immutable" value="1" id="899" addr="0x7fca46934c90" />
+                            <attribute name="value" value="PASSWORD_VERIFY" id="900" addr="0x7fca46934c90" />
+                            <attribute name="storage" value="%constant" id="901" addr="0x7fca46934c90" />
+                            <attribute name="type" value="int" id="902" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="903" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="904" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="905" addr="0x7f99f1e45150" >
-                        <attributelist id="906" addr="0x7f99f1e45150" >
-                            <attribute name="sym_name" value="ALPHANUM_HIDE_INPUT" id="907" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="ALPHANUM_HIDE_INPUT" id="908" addr="0x7f99f1de6c90" />
-                            <attribute name="rawval" value="ALPHANUM_HIDE_INPUT" id="909" addr="0x7f99f1de6c90" />
-                            <attribute name="feature_immutable" value="1" id="910" addr="0x7f99f1de6c90" />
-                            <attribute name="value" value="ALPHANUM_HIDE_INPUT" id="911" addr="0x7f99f1de6c90" />
-                            <attribute name="storage" value="%constant" id="912" addr="0x7f99f1de6c90" />
-                            <attribute name="type" value="int" id="913" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="914" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="915" addr="0x7f99f1de6c90" />
+                    <constant id="905" addr="0x7fca46993150" >
+                        <attributelist id="906" addr="0x7fca46993150" >
+                            <attribute name="sym_name" value="ALPHANUM_HIDE_INPUT" id="907" addr="0x7fca46934c90" />
+                            <attribute name="name" value="ALPHANUM_HIDE_INPUT" id="908" addr="0x7fca46934c90" />
+                            <attribute name="rawval" value="ALPHANUM_HIDE_INPUT" id="909" addr="0x7fca46934c90" />
+                            <attribute name="feature_immutable" value="1" id="910" addr="0x7fca46934c90" />
+                            <attribute name="value" value="ALPHANUM_HIDE_INPUT" id="911" addr="0x7fca46934c90" />
+                            <attribute name="storage" value="%constant" id="912" addr="0x7fca46934c90" />
+                            <attribute name="type" value="int" id="913" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="914" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="915" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </constant >
                 </namespace >
             </namespace >
         </include >
-        <include id="916" addr="0x7f99f1e45350" >
-            <attributelist id="917" addr="0x7f99f1e45350" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/Exception.h" id="918" addr="0x7f99f1de6c90" />
+        <include id="916" addr="0x7fca46993350" >
+            <attributelist id="917" addr="0x7fca46993350" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/Exception.h" id="918" addr="0x7fca46934c90" />
             </attributelist >
          
         </include >
-        <include id="919" addr="0x7f99f1e453d0" >
-            <attributelist id="920" addr="0x7f99f1e453d0" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/Dictionary.h" id="921" addr="0x7f99f1de6c90" />
+        <include id="919" addr="0x7fca469933d0" >
+            <attributelist id="920" addr="0x7fca469933d0" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/Dictionary.h" id="921" addr="0x7fca46934c90" />
             </attributelist >
 
-            <namespace id="922" addr="0x7f99f1e45470" >
-                <attributelist id="923" addr="0x7f99f1e45470" >
-                    <attribute name="sym_name" value="XBMCAddon" id="924" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="XBMCAddon" id="925" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_previousSibling" value="0x7f99f1e40f10" id="926" addr="0x7f99f1e40f10" />
-                    <attribute name="csym_nextSibling" value="0x7f99f1e462b0" id="927" addr="0x7f99f1e462b0" />
-                    <attribute name="sym_nextSibling" value="0x7f99f1e462b0" id="928" addr="0x7f99f1e462b0" />
-                    <typescope id="929" addr="0x7f99f1dd1d70" >
-                        <attributelist id="930" addr="0x7f99f1dd1d70" >
-                            <attribute name="name" value="XBMCAddon" id="931" addr="0x7f99f1de6c90" />
-                            <typetab id="932" addr="0x7f99f1dd1db0" >
-                                <attributelist id="933" addr="0x7f99f1dd1db0" >
-                                    <attribute name="Dictionary" value="Dictionary" id="934" addr="0x7f99f1de6c90" />
-                                    <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="935" addr="0x7f99f1de6c90" />
-                                    <attribute name="String" value="std::string" id="936" addr="0x7f99f1de6c90" />
-                                    <attribute name="StringOrInt" value="XBMCAddon::String" id="937" addr="0x7f99f1de6c90" />
+            <namespace id="922" addr="0x7fca46993470" >
+                <attributelist id="923" addr="0x7fca46993470" >
+                    <attribute name="sym_name" value="XBMCAddon" id="924" addr="0x7fca46934c90" />
+                    <attribute name="name" value="XBMCAddon" id="925" addr="0x7fca46934c90" />
+                    <attribute name="sym_previousSibling" value="0x7fca4698ef10" id="926" addr="0x7fca4698ef10" />
+                    <attribute name="csym_nextSibling" value="0x7fca469942b0" id="927" addr="0x7fca469942b0" />
+                    <attribute name="sym_nextSibling" value="0x7fca469942b0" id="928" addr="0x7fca469942b0" />
+                    <typescope id="929" addr="0x7fca4691fd70" >
+                        <attributelist id="930" addr="0x7fca4691fd70" >
+                            <attribute name="name" value="XBMCAddon" id="931" addr="0x7fca46934c90" />
+                            <typetab id="932" addr="0x7fca4691fdb0" >
+                                <attributelist id="933" addr="0x7fca4691fdb0" >
+                                    <attribute name="Dictionary" value="Dictionary" id="934" addr="0x7fca46934c90" />
+                                    <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="935" addr="0x7fca46934c90" />
+                                    <attribute name="String" value="std::string" id="936" addr="0x7fca46934c90" />
+                                    <attribute name="StringOrInt" value="XBMCAddon::String" id="937" addr="0x7fca46934c90" />
                                 </attributelist >
-                                <typetabsitem id="938" addr="0x7f99f1dd28b0" >
-                                    <attributelist id="939" addr="0x7f99f1dd28b0" >
+                                <typetabsitem id="938" addr="0x7fca469208b0" >
+                                    <attributelist id="939" addr="0x7fca469208b0" >
                                     </attributelist >
                                 </typetabsitem >
-                                <typetabsitem id="940" addr="0x7f99f1dd2910" >
-                                    <attributelist id="941" addr="0x7f99f1dd2910" >
+                                <typetabsitem id="940" addr="0x7fca46920910" >
+                                    <attributelist id="941" addr="0x7fca46920910" >
                                     </attributelist >
                                 </typetabsitem >
-                                <typetabsitem id="942" addr="0x7f99f1dd1f90" >
-                                    <attributelist id="943" addr="0x7f99f1dd1f90" >
+                                <typetabsitem id="942" addr="0x7fca4691ff90" >
+                                    <attributelist id="943" addr="0x7fca4691ff90" >
                                     </attributelist >
                                 </typetabsitem >
-                                <typetabsitem id="944" addr="0x7f99f1dd2710" >
-                                    <attributelist id="945" addr="0x7f99f1dd2710" >
+                                <typetabsitem id="944" addr="0x7fca46920710" >
+                                    <attributelist id="945" addr="0x7fca46920710" >
                                     </attributelist >
                                 </typetabsitem >
                             </typetab >
-                            <attribute name="parent" value="0x7f99f1e1da30" id="946" addr="0x7f99f1e1da30" />
-                            <attribute name="qname" value="XBMCAddon" id="947" addr="0x7f99f1de6c90" />
-                            <attribute name="symtab" value="0x7f99f1e408b0" id="948" addr="0x7f99f1e408b0" />
+                            <attribute name="parent" value="0x7fca4696ba30" id="946" addr="0x7fca4696ba30" />
+                            <attribute name="qname" value="XBMCAddon" id="947" addr="0x7fca46934c90" />
+                            <attribute name="symtab" value="0x7fca4698e8b0" id="948" addr="0x7fca4698e8b0" />
                         </attributelist >
-                        <typescopesitem id="949" addr="0x7f99f1e40870" >
-                            <attributelist id="950" addr="0x7f99f1e40870" >
+                        <typescopesitem id="949" addr="0x7fca4698e870" >
+                            <attributelist id="950" addr="0x7fca4698e870" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="951" addr="0x7f99f1dd1db0" >
-                            <attributelist id="952" addr="0x7f99f1dd1db0" >
-                                <attribute name="Dictionary" value="Dictionary" id="953" addr="0x7f99f1de6c90" />
-                                <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="954" addr="0x7f99f1de6c90" />
-                                <attribute name="String" value="std::string" id="955" addr="0x7f99f1de6c90" />
-                                <attribute name="StringOrInt" value="XBMCAddon::String" id="956" addr="0x7f99f1de6c90" />
+                        <typescopesitem id="951" addr="0x7fca4691fdb0" >
+                            <attributelist id="952" addr="0x7fca4691fdb0" >
+                                <attribute name="Dictionary" value="Dictionary" id="953" addr="0x7fca46934c90" />
+                                <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="954" addr="0x7fca46934c90" />
+                                <attribute name="String" value="std::string" id="955" addr="0x7fca46934c90" />
+                                <attribute name="StringOrInt" value="XBMCAddon::String" id="956" addr="0x7fca46934c90" />
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="957" addr="0x7f99f1e1da30" >
-                            <attributelist id="958" addr="0x7f99f1e1da30" >
-                                <attribute name="name" value="" id="959" addr="0x7f99f1de6c90" />
-                                <typetab id="960" addr="0x7f99f1e1da90" >
-                                    <attributelist id="961" addr="0x7f99f1e1da90" >
+                        <typescopesitem id="957" addr="0x7fca4696ba30" >
+                            <attributelist id="958" addr="0x7fca4696ba30" >
+                                <attribute name="name" value="" id="959" addr="0x7fca46934c90" />
+                                <typetab id="960" addr="0x7fca4696ba90" >
+                                    <attributelist id="961" addr="0x7fca4696ba90" >
                                     </attributelist >
                                 </typetab >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="962" addr="0x7f99f1dd1eb0" >
-                            <attributelist id="963" addr="0x7f99f1dd1eb0" >
+                        <typescopesitem id="962" addr="0x7fca4691feb0" >
+                            <attributelist id="963" addr="0x7fca4691feb0" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="964" addr="0x7f99f1e408b0" >
-                            <attributelist id="965" addr="0x7f99f1e408b0" >
-                                <attribute name="name" value="XBMCAddon" id="966" addr="0x7f99f1de6c90" />
-                                <attribute name="csymtab" value="0x7f99f1e408f0" id="967" addr="0x7f99f1e408f0" />
-                                <attribute name="symtab" value="0x7f99f1e40890" id="968" addr="0x7f99f1e40890" />
+                        <typescopesitem id="964" addr="0x7fca4698e8b0" >
+                            <attributelist id="965" addr="0x7fca4698e8b0" >
+                                <attribute name="name" value="XBMCAddon" id="966" addr="0x7fca46934c90" />
+                                <attribute name="csymtab" value="0x7fca4698e8f0" id="967" addr="0x7fca4698e8f0" />
+                                <attribute name="symtab" value="0x7fca4698e890" id="968" addr="0x7fca4698e890" />
                             </attributelist >
                         </typescopesitem >
                     </typescope >
-                    <attribute name="symtab" value="0x7f99f1e408b0" id="969" addr="0x7f99f1e408b0" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="970" addr="0x7f99f1e1d950" />
+                    <attribute name="symtab" value="0x7fca4698e8b0" id="969" addr="0x7fca4698e8b0" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="970" addr="0x7fca4696b950" />
                 </attributelist >
 
-                <cdecl id="971" addr="0x7f99f1e45570" >
-                    <attributelist id="972" addr="0x7f99f1e45570" >
-                        <attribute name="sym_name" value="StringOrInt" id="973" addr="0x7f99f1de6c90" />
-                        <attribute name="name" value="XBMCAddon::StringOrInt" id="974" addr="0x7f99f1de6c90" />
-                        <attribute name="decl" value="" id="975" addr="0x7f99f1de6c90" />
-                        <attribute name="storage" value="typedef" id="976" addr="0x7f99f1de6c90" />
-                        <attribute name="kind" value="typedef" id="977" addr="0x7f99f1de6c90" />
-                        <attribute name="type" value="XBMCAddon::String" id="978" addr="0x7f99f1de6c90" />
-                        <attribute name="sym_symtab" value="0x7f99f1e408b0" id="979" addr="0x7f99f1e408b0" />
-                        <attribute name="sym_overname" value="__SWIG_0" id="980" addr="0x7f99f1de6c90" />
+                <cdecl id="971" addr="0x7fca46993570" >
+                    <attributelist id="972" addr="0x7fca46993570" >
+                        <attribute name="sym_name" value="StringOrInt" id="973" addr="0x7fca46934c90" />
+                        <attribute name="name" value="XBMCAddon::StringOrInt" id="974" addr="0x7fca46934c90" />
+                        <attribute name="decl" value="" id="975" addr="0x7fca46934c90" />
+                        <attribute name="storage" value="typedef" id="976" addr="0x7fca46934c90" />
+                        <attribute name="kind" value="typedef" id="977" addr="0x7fca46934c90" />
+                        <attribute name="type" value="XBMCAddon::String" id="978" addr="0x7fca46934c90" />
+                        <attribute name="sym_symtab" value="0x7fca4698e8b0" id="979" addr="0x7fca4698e8b0" />
+                        <attribute name="sym_overname" value="__SWIG_0" id="980" addr="0x7fca46934c90" />
                     </attributelist >
                  
                 </cdecl >
-                <template id="981" addr="0x7f99f1e45a70" >
-                    <attributelist id="982" addr="0x7f99f1e45a70" >
-                        <attribute name="templatetype" value="class" id="983" addr="0x7f99f1de6c90" />
-                        <attribute name="sym_typename" value="1" id="984" addr="0x7f99f1de6c90" />
-                        <attribute name="name" value="Dictionary" id="985" addr="0x7f99f1de6c90" />
-                        <attribute name="sym_symtab" value="0x7f99f1e408b0" id="986" addr="0x7f99f1e408b0" />
-                        <attribute name="symtab" value="0x7f99f1e45c10" id="987" addr="0x7f99f1e45c10" />
-                        <attribute name="allows_typedef" value="1" id="988" addr="0x7f99f1de6c90" />
-                        <attribute name="kind" value="class" id="989" addr="0x7f99f1de6c90" />
-                        <attribute name="sym_name" value="Dictionary" id="990" addr="0x7f99f1de6c90" />
-                        <attribute name="privatebaselist" value="0x7f99f1e459f0" id="991" addr="0x7f99f1e459f0" />
-                        <attribute name="protectedbaselist" value="0x7f99f1e459d0" id="992" addr="0x7f99f1e459d0" />
-                        <baselist id="993" addr="0x7f99f1e459b0" >
-                            <base name="std::map&lt;(String,T)>" id="994" addr="0x7f99f1e45930" />
+                <template id="981" addr="0x7fca46993a70" >
+                    <attributelist id="982" addr="0x7fca46993a70" >
+                        <attribute name="templatetype" value="class" id="983" addr="0x7fca46934c90" />
+                        <attribute name="sym_typename" value="1" id="984" addr="0x7fca46934c90" />
+                        <attribute name="name" value="Dictionary" id="985" addr="0x7fca46934c90" />
+                        <attribute name="sym_symtab" value="0x7fca4698e8b0" id="986" addr="0x7fca4698e8b0" />
+                        <attribute name="symtab" value="0x7fca46993c10" id="987" addr="0x7fca46993c10" />
+                        <attribute name="allows_typedef" value="1" id="988" addr="0x7fca46934c90" />
+                        <attribute name="kind" value="class" id="989" addr="0x7fca46934c90" />
+                        <attribute name="sym_name" value="Dictionary" id="990" addr="0x7fca46934c90" />
+                        <attribute name="privatebaselist" value="0x7fca469939f0" id="991" addr="0x7fca469939f0" />
+                        <attribute name="protectedbaselist" value="0x7fca469939d0" id="992" addr="0x7fca469939d0" />
+                        <baselist id="993" addr="0x7fca469939b0" >
+                            <base name="std::map&lt;(String,T)>" id="994" addr="0x7fca46993930" />
                         </baselist >
-                        <attribute name="sym_overname" value="__SWIG_0" id="995" addr="0x7f99f1de6c90" />
-                        <templateparms id="996" addr="0x7f99f1e456b0" >
+                        <attribute name="sym_overname" value="__SWIG_0" id="995" addr="0x7fca46934c90" />
+                        <templateparms id="996" addr="0x7fca469936b0" >
                             <parm id="997">
-                                <attributelist id="998" addr="0x7f99f1e456b0" >
-                                    <attribute name="name" value="T" id="999" addr="0x7f99f1de6c90" />
-                                    <attribute name="type" value="class T" id="1000" addr="0x7f99f1de6c90" />
+                                <attributelist id="998" addr="0x7fca469936b0" >
+                                    <attribute name="name" value="T" id="999" addr="0x7fca46934c90" />
+                                    <attribute name="type" value="class T" id="1000" addr="0x7fca46934c90" />
                                 </attributelist >
                             </parm >
                         </templateparms >
                     </attributelist >
 
-                    <access id="1001" addr="0x7f99f1e45d50" >
-                        <attributelist id="1002" addr="0x7f99f1e45d50" >
-                            <attribute name="kind" value="public" id="1003" addr="0x7f99f1de6c90" />
+                    <access id="1001" addr="0x7fca46993d50" >
+                        <attributelist id="1002" addr="0x7fca46993d50" >
+                            <attribute name="kind" value="public" id="1003" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </access >
                 </template >
-                <cdecl id="1004" addr="0x7f99f1e46070" >
-                    <attributelist id="1005" addr="0x7f99f1e46070" >
-                        <attribute name="sym_name" value="Properties" id="1006" addr="0x7f99f1de6c90" />
-                        <attribute name="name" value="XBMCAddon::Properties" id="1007" addr="0x7f99f1de6c90" />
-                        <attribute name="decl" value="" id="1008" addr="0x7f99f1de6c90" />
-                        <attribute name="storage" value="typedef" id="1009" addr="0x7f99f1de6c90" />
-                        <attribute name="kind" value="typedef" id="1010" addr="0x7f99f1de6c90" />
-                        <attribute name="type" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="1011" addr="0x7f99f1de6c90" />
-                        <attribute name="sym_symtab" value="0x7f99f1e408b0" id="1012" addr="0x7f99f1e408b0" />
-                        <attribute name="sym_overname" value="__SWIG_0" id="1013" addr="0x7f99f1de6c90" />
+                <cdecl id="1004" addr="0x7fca46994070" >
+                    <attributelist id="1005" addr="0x7fca46994070" >
+                        <attribute name="sym_name" value="Properties" id="1006" addr="0x7fca46934c90" />
+                        <attribute name="name" value="XBMCAddon::Properties" id="1007" addr="0x7fca46934c90" />
+                        <attribute name="decl" value="" id="1008" addr="0x7fca46934c90" />
+                        <attribute name="storage" value="typedef" id="1009" addr="0x7fca46934c90" />
+                        <attribute name="kind" value="typedef" id="1010" addr="0x7fca46934c90" />
+                        <attribute name="type" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="1011" addr="0x7fca46934c90" />
+                        <attribute name="sym_symtab" value="0x7fca4698e8b0" id="1012" addr="0x7fca4698e8b0" />
+                        <attribute name="sym_overname" value="__SWIG_0" id="1013" addr="0x7fca46934c90" />
                     </attributelist >
                  
                 </cdecl >
             </namespace >
         </include >
-        <include id="1014" addr="0x7f99f1e46450" >
-            <attributelist id="1015" addr="0x7f99f1e46450" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/ListItem.h" id="1016" addr="0x7f99f1de6c90" />
+        <include id="1014" addr="0x7fca46994450" >
+            <attributelist id="1015" addr="0x7fca46994450" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/ListItem.h" id="1016" addr="0x7fca46934c90" />
             </attributelist >
 
-            <namespace id="1017" addr="0x7f99f1e462b0" >
-                <attributelist id="1018" addr="0x7f99f1e462b0" >
-                    <attribute name="sym_name" value="XBMCAddon" id="1019" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="XBMCAddon" id="1020" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_previousSibling" value="0x7f99f1e45470" id="1021" addr="0x7f99f1e45470" />
-                    <attribute name="csym_nextSibling" value="0x7f99f1e54770" id="1022" addr="0x7f99f1e54770" />
-                    <attribute name="sym_nextSibling" value="0x7f99f1e54770" id="1023" addr="0x7f99f1e54770" />
-                    <typescope id="1024" addr="0x7f99f1dd1d70" >
-                        <attributelist id="1025" addr="0x7f99f1dd1d70" >
-                            <attribute name="name" value="XBMCAddon" id="1026" addr="0x7f99f1de6c90" />
-                            <typetab id="1027" addr="0x7f99f1dd1db0" >
-                                <attributelist id="1028" addr="0x7f99f1dd1db0" >
-                                    <attribute name="Dictionary" value="Dictionary" id="1029" addr="0x7f99f1de6c90" />
-                                    <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="1030" addr="0x7f99f1de6c90" />
-                                    <attribute name="String" value="std::string" id="1031" addr="0x7f99f1de6c90" />
-                                    <attribute name="StringOrInt" value="XBMCAddon::String" id="1032" addr="0x7f99f1de6c90" />
+            <namespace id="1017" addr="0x7fca469942b0" >
+                <attributelist id="1018" addr="0x7fca469942b0" >
+                    <attribute name="sym_name" value="XBMCAddon" id="1019" addr="0x7fca46934c90" />
+                    <attribute name="name" value="XBMCAddon" id="1020" addr="0x7fca46934c90" />
+                    <attribute name="sym_previousSibling" value="0x7fca46993470" id="1021" addr="0x7fca46993470" />
+                    <attribute name="csym_nextSibling" value="0x7fca469a2770" id="1022" addr="0x7fca469a2770" />
+                    <attribute name="sym_nextSibling" value="0x7fca469a2770" id="1023" addr="0x7fca469a2770" />
+                    <typescope id="1024" addr="0x7fca4691fd70" >
+                        <attributelist id="1025" addr="0x7fca4691fd70" >
+                            <attribute name="name" value="XBMCAddon" id="1026" addr="0x7fca46934c90" />
+                            <typetab id="1027" addr="0x7fca4691fdb0" >
+                                <attributelist id="1028" addr="0x7fca4691fdb0" >
+                                    <attribute name="Dictionary" value="Dictionary" id="1029" addr="0x7fca46934c90" />
+                                    <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="1030" addr="0x7fca46934c90" />
+                                    <attribute name="String" value="std::string" id="1031" addr="0x7fca46934c90" />
+                                    <attribute name="StringOrInt" value="XBMCAddon::String" id="1032" addr="0x7fca46934c90" />
                                 </attributelist >
-                                <typetabsitem id="1033" addr="0x7f99f1dd28b0" >
-                                    <attributelist id="1034" addr="0x7f99f1dd28b0" >
+                                <typetabsitem id="1033" addr="0x7fca469208b0" >
+                                    <attributelist id="1034" addr="0x7fca469208b0" >
                                     </attributelist >
                                 </typetabsitem >
-                                <typetabsitem id="1035" addr="0x7f99f1dd2910" >
-                                    <attributelist id="1036" addr="0x7f99f1dd2910" >
+                                <typetabsitem id="1035" addr="0x7fca46920910" >
+                                    <attributelist id="1036" addr="0x7fca46920910" >
                                     </attributelist >
                                 </typetabsitem >
-                                <typetabsitem id="1037" addr="0x7f99f1dd1f90" >
-                                    <attributelist id="1038" addr="0x7f99f1dd1f90" >
+                                <typetabsitem id="1037" addr="0x7fca4691ff90" >
+                                    <attributelist id="1038" addr="0x7fca4691ff90" >
                                     </attributelist >
                                 </typetabsitem >
-                                <typetabsitem id="1039" addr="0x7f99f1dd2710" >
-                                    <attributelist id="1040" addr="0x7f99f1dd2710" >
+                                <typetabsitem id="1039" addr="0x7fca46920710" >
+                                    <attributelist id="1040" addr="0x7fca46920710" >
                                     </attributelist >
                                 </typetabsitem >
                             </typetab >
-                            <attribute name="parent" value="0x7f99f1e1da30" id="1041" addr="0x7f99f1e1da30" />
-                            <attribute name="qname" value="XBMCAddon" id="1042" addr="0x7f99f1de6c90" />
-                            <attribute name="symtab" value="0x7f99f1e408b0" id="1043" addr="0x7f99f1e408b0" />
+                            <attribute name="parent" value="0x7fca4696ba30" id="1041" addr="0x7fca4696ba30" />
+                            <attribute name="qname" value="XBMCAddon" id="1042" addr="0x7fca46934c90" />
+                            <attribute name="symtab" value="0x7fca4698e8b0" id="1043" addr="0x7fca4698e8b0" />
                         </attributelist >
-                        <typescopesitem id="1044" addr="0x7f99f1e40870" >
-                            <attributelist id="1045" addr="0x7f99f1e40870" >
+                        <typescopesitem id="1044" addr="0x7fca4698e870" >
+                            <attributelist id="1045" addr="0x7fca4698e870" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="1046" addr="0x7f99f1dd1db0" >
-                            <attributelist id="1047" addr="0x7f99f1dd1db0" >
-                                <attribute name="Dictionary" value="Dictionary" id="1048" addr="0x7f99f1de6c90" />
-                                <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="1049" addr="0x7f99f1de6c90" />
-                                <attribute name="String" value="std::string" id="1050" addr="0x7f99f1de6c90" />
-                                <attribute name="StringOrInt" value="XBMCAddon::String" id="1051" addr="0x7f99f1de6c90" />
+                        <typescopesitem id="1046" addr="0x7fca4691fdb0" >
+                            <attributelist id="1047" addr="0x7fca4691fdb0" >
+                                <attribute name="Dictionary" value="Dictionary" id="1048" addr="0x7fca46934c90" />
+                                <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="1049" addr="0x7fca46934c90" />
+                                <attribute name="String" value="std::string" id="1050" addr="0x7fca46934c90" />
+                                <attribute name="StringOrInt" value="XBMCAddon::String" id="1051" addr="0x7fca46934c90" />
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="1052" addr="0x7f99f1e1da30" >
-                            <attributelist id="1053" addr="0x7f99f1e1da30" >
-                                <attribute name="name" value="" id="1054" addr="0x7f99f1de6c90" />
-                                <typetab id="1055" addr="0x7f99f1e1da90" >
-                                    <attributelist id="1056" addr="0x7f99f1e1da90" >
+                        <typescopesitem id="1052" addr="0x7fca4696ba30" >
+                            <attributelist id="1053" addr="0x7fca4696ba30" >
+                                <attribute name="name" value="" id="1054" addr="0x7fca46934c90" />
+                                <typetab id="1055" addr="0x7fca4696ba90" >
+                                    <attributelist id="1056" addr="0x7fca4696ba90" >
                                     </attributelist >
                                 </typetab >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="1057" addr="0x7f99f1dd1eb0" >
-                            <attributelist id="1058" addr="0x7f99f1dd1eb0" >
+                        <typescopesitem id="1057" addr="0x7fca4691feb0" >
+                            <attributelist id="1058" addr="0x7fca4691feb0" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="1059" addr="0x7f99f1e408b0" >
-                            <attributelist id="1060" addr="0x7f99f1e408b0" >
-                                <attribute name="name" value="XBMCAddon" id="1061" addr="0x7f99f1de6c90" />
-                                <attribute name="csymtab" value="0x7f99f1e408f0" id="1062" addr="0x7f99f1e408f0" />
-                                <attribute name="symtab" value="0x7f99f1e40890" id="1063" addr="0x7f99f1e40890" />
+                        <typescopesitem id="1059" addr="0x7fca4698e8b0" >
+                            <attributelist id="1060" addr="0x7fca4698e8b0" >
+                                <attribute name="name" value="XBMCAddon" id="1061" addr="0x7fca46934c90" />
+                                <attribute name="csymtab" value="0x7fca4698e8f0" id="1062" addr="0x7fca4698e8f0" />
+                                <attribute name="symtab" value="0x7fca4698e890" id="1063" addr="0x7fca4698e890" />
                             </attributelist >
                         </typescopesitem >
                     </typescope >
-                    <attribute name="symtab" value="0x7f99f1e408b0" id="1064" addr="0x7f99f1e408b0" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="1065" addr="0x7f99f1e1d950" />
+                    <attribute name="symtab" value="0x7fca4698e8b0" id="1064" addr="0x7fca4698e8b0" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="1065" addr="0x7fca4696b950" />
                 </attributelist >
 
-                <namespace id="1066" addr="0x7f99f1e46490" >
-                    <attributelist id="1067" addr="0x7f99f1e46490" >
-                        <attribute name="feature_knownbasetypes" value="AddonClass,AddonCallback" id="1068" addr="0x7f99f1de6c90" />
-                        <attribute name="name" value="xbmcgui" id="1069" addr="0x7f99f1de6c90" />
-                        <attribute name="sym_symtab" value="0x7f99f1e408b0" id="1070" addr="0x7f99f1e408b0" />
-                        <attribute name="symtab" value="0x7f99f1e40fb0" id="1071" addr="0x7f99f1e40fb0" />
-                        <attribute name="sym_nextSibling" value="0x7f99f1e547f0" id="1072" addr="0x7f99f1e547f0" />
-                        <attribute name="csym_nextSibling" value="0x7f99f1e547f0" id="1073" addr="0x7f99f1e547f0" />
-                        <attribute name="sym_previousSibling" value="0x7f99f1e41030" id="1074" addr="0x7f99f1e41030" />
-                        <attribute name="feature_knownapitypes" value="XBMCAddon::xbmc::InfoTagVideo,xbmc::InfoTagMusic" id="1075" addr="0x7f99f1de6c90" />
-                        <attribute name="sym_name" value="xbmcgui" id="1076" addr="0x7f99f1de6c90" />
-                        <typescope id="1077" addr="0x7f99f1dd2150" >
-                            <attributelist id="1078" addr="0x7f99f1dd2150" >
-                                <attribute name="name" value="xbmcgui" id="1079" addr="0x7f99f1de6c90" />
-                                <typetab id="1080" addr="0x7f99f1dd2170" >
-                                    <attributelist id="1081" addr="0x7f99f1dd2170" >
-                                        <attribute name="InterceptorBase" value="InterceptorBase" id="1082" addr="0x7f99f1de6c90" />
-                                        <attribute name="Dialog" value="Dialog" id="1083" addr="0x7f99f1de6c90" />
-                                        <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="1084" addr="0x7f99f1de6c90" />
-                                        <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="1085" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlTextBox" value="ControlTextBox" id="1086" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlRadioButton" value="ControlRadioButton" id="1087" addr="0x7f99f1de6c90" />
-                                        <attribute name="Window" value="Window" id="1088" addr="0x7f99f1de6c90" />
-                                        <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="1089" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlList" value="ControlList" id="1090" addr="0x7f99f1de6c90" />
-                                        <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="1091" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlImage" value="ControlImage" id="1092" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlButton" value="ControlButton" id="1093" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlGroup" value="ControlGroup" id="1094" addr="0x7f99f1de6c90" />
-                                        <attribute name="DialogBusy" value="DialogBusy" id="1095" addr="0x7f99f1de6c90" />
-                                        <attribute name="DialogProgressBG" value="DialogProgressBG" id="1096" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlSpin" value="ControlSpin" id="1097" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlEdit" value="ControlEdit" id="1098" addr="0x7f99f1de6c90" />
-                                        <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="1099" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="1100" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlLabel" value="ControlLabel" id="1101" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlProgress" value="ControlProgress" id="1102" addr="0x7f99f1de6c90" />
-                                        <attribute name="Control" value="Control" id="1103" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlSlider" value="ControlSlider" id="1104" addr="0x7f99f1de6c90" />
-                                        <attribute name="DialogProgress" value="DialogProgress" id="1105" addr="0x7f99f1de6c90" />
-                                        <attribute name="Action" value="Action" id="1106" addr="0x7f99f1de6c90" />
-                                        <attribute name="WindowDialog" value="WindowDialog" id="1107" addr="0x7f99f1de6c90" />
-                                        <attribute name="WindowXML" value="WindowXML" id="1108" addr="0x7f99f1de6c90" />
-                                        <attribute name="ListItem" value="ListItem" id="1109" addr="0x7f99f1de6c90" />
-                                        <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="1110" addr="0x7f99f1de6c90" />
+                <namespace id="1066" addr="0x7fca46994490" >
+                    <attributelist id="1067" addr="0x7fca46994490" >
+                        <attribute name="feature_knownbasetypes" value="AddonClass,AddonCallback" id="1068" addr="0x7fca46934c90" />
+                        <attribute name="name" value="xbmcgui" id="1069" addr="0x7fca46934c90" />
+                        <attribute name="sym_symtab" value="0x7fca4698e8b0" id="1070" addr="0x7fca4698e8b0" />
+                        <attribute name="symtab" value="0x7fca4698efb0" id="1071" addr="0x7fca4698efb0" />
+                        <attribute name="sym_nextSibling" value="0x7fca469a27f0" id="1072" addr="0x7fca469a27f0" />
+                        <attribute name="csym_nextSibling" value="0x7fca469a27f0" id="1073" addr="0x7fca469a27f0" />
+                        <attribute name="sym_previousSibling" value="0x7fca4698f030" id="1074" addr="0x7fca4698f030" />
+                        <attribute name="feature_knownapitypes" value="XBMCAddon::xbmc::InfoTagVideo,xbmc::InfoTagMusic" id="1075" addr="0x7fca46934c90" />
+                        <attribute name="sym_name" value="xbmcgui" id="1076" addr="0x7fca46934c90" />
+                        <typescope id="1077" addr="0x7fca46920150" >
+                            <attributelist id="1078" addr="0x7fca46920150" >
+                                <attribute name="name" value="xbmcgui" id="1079" addr="0x7fca46934c90" />
+                                <typetab id="1080" addr="0x7fca46920170" >
+                                    <attributelist id="1081" addr="0x7fca46920170" >
+                                        <attribute name="InterceptorBase" value="InterceptorBase" id="1082" addr="0x7fca46934c90" />
+                                        <attribute name="Dialog" value="Dialog" id="1083" addr="0x7fca46934c90" />
+                                        <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="1084" addr="0x7fca46934c90" />
+                                        <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="1085" addr="0x7fca46934c90" />
+                                        <attribute name="ControlTextBox" value="ControlTextBox" id="1086" addr="0x7fca46934c90" />
+                                        <attribute name="ControlRadioButton" value="ControlRadioButton" id="1087" addr="0x7fca46934c90" />
+                                        <attribute name="Window" value="Window" id="1088" addr="0x7fca46934c90" />
+                                        <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="1089" addr="0x7fca46934c90" />
+                                        <attribute name="ControlList" value="ControlList" id="1090" addr="0x7fca46934c90" />
+                                        <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="1091" addr="0x7fca46934c90" />
+                                        <attribute name="ControlImage" value="ControlImage" id="1092" addr="0x7fca46934c90" />
+                                        <attribute name="ControlButton" value="ControlButton" id="1093" addr="0x7fca46934c90" />
+                                        <attribute name="ControlGroup" value="ControlGroup" id="1094" addr="0x7fca46934c90" />
+                                        <attribute name="DialogBusy" value="DialogBusy" id="1095" addr="0x7fca46934c90" />
+                                        <attribute name="DialogProgressBG" value="DialogProgressBG" id="1096" addr="0x7fca46934c90" />
+                                        <attribute name="ControlSpin" value="ControlSpin" id="1097" addr="0x7fca46934c90" />
+                                        <attribute name="ControlEdit" value="ControlEdit" id="1098" addr="0x7fca46934c90" />
+                                        <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="1099" addr="0x7fca46934c90" />
+                                        <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="1100" addr="0x7fca46934c90" />
+                                        <attribute name="ControlLabel" value="ControlLabel" id="1101" addr="0x7fca46934c90" />
+                                        <attribute name="ControlProgress" value="ControlProgress" id="1102" addr="0x7fca46934c90" />
+                                        <attribute name="Control" value="Control" id="1103" addr="0x7fca46934c90" />
+                                        <attribute name="ControlSlider" value="ControlSlider" id="1104" addr="0x7fca46934c90" />
+                                        <attribute name="DialogProgress" value="DialogProgress" id="1105" addr="0x7fca46934c90" />
+                                        <attribute name="Action" value="Action" id="1106" addr="0x7fca46934c90" />
+                                        <attribute name="WindowDialog" value="WindowDialog" id="1107" addr="0x7fca46934c90" />
+                                        <attribute name="WindowXML" value="WindowXML" id="1108" addr="0x7fca46934c90" />
+                                        <attribute name="ListItem" value="ListItem" id="1109" addr="0x7fca46934c90" />
+                                        <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="1110" addr="0x7fca46934c90" />
                                     </attributelist >
-                                    <typetabsitem id="1111" addr="0x7f99f1de1dd0" >
-                                        <attributelist id="1112" addr="0x7f99f1de1dd0" >
+                                    <typetabsitem id="1111" addr="0x7fca4692fdd0" >
+                                        <attributelist id="1112" addr="0x7fca4692fdd0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1113" addr="0x7f99f1dde790" >
-                                        <attributelist id="1114" addr="0x7f99f1dde790" >
+                                    <typetabsitem id="1113" addr="0x7fca4692c790" >
+                                        <attributelist id="1114" addr="0x7fca4692c790" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1115" addr="0x7f99f1de3f10" >
-                                        <attributelist id="1116" addr="0x7f99f1de3f10" >
+                                    <typetabsitem id="1115" addr="0x7fca46931f10" >
+                                        <attributelist id="1116" addr="0x7fca46931f10" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1117" addr="0x7f99f1dd67b0" >
-                                        <attributelist id="1118" addr="0x7f99f1dd67b0" >
+                                    <typetabsitem id="1117" addr="0x7fca469247b0" >
+                                        <attributelist id="1118" addr="0x7fca469247b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1119" addr="0x7f99f1ddafd0" >
-                                        <attributelist id="1120" addr="0x7f99f1ddafd0" >
+                                    <typetabsitem id="1119" addr="0x7fca46928fd0" >
+                                        <attributelist id="1120" addr="0x7fca46928fd0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1121" addr="0x7f99f1ddd430" >
-                                        <attributelist id="1122" addr="0x7f99f1ddd430" >
+                                    <typetabsitem id="1121" addr="0x7fca4692b430" >
+                                        <attributelist id="1122" addr="0x7fca4692b430" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1123" addr="0x7f99f1de2130" >
-                                        <attributelist id="1124" addr="0x7f99f1de2130" >
+                                    <typetabsitem id="1123" addr="0x7fca46930130" >
+                                        <attributelist id="1124" addr="0x7fca46930130" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1125" addr="0x7f99f1dd2f50" >
-                                        <attributelist id="1126" addr="0x7f99f1dd2f50" >
+                                    <typetabsitem id="1125" addr="0x7fca46920f50" >
+                                        <attributelist id="1126" addr="0x7fca46920f50" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1127" addr="0x7f99f1dd9650" >
-                                        <attributelist id="1128" addr="0x7f99f1dd9650" >
+                                    <typetabsitem id="1127" addr="0x7fca46927650" >
+                                        <attributelist id="1128" addr="0x7fca46927650" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1129" addr="0x7f99f1de3390" >
-                                        <attributelist id="1130" addr="0x7f99f1de3390" >
+                                    <typetabsitem id="1129" addr="0x7fca46931390" >
+                                        <attributelist id="1130" addr="0x7fca46931390" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1131" addr="0x7f99f1ddb7b0" >
-                                        <attributelist id="1132" addr="0x7f99f1ddb7b0" >
+                                    <typetabsitem id="1131" addr="0x7fca469297b0" >
+                                        <attributelist id="1132" addr="0x7fca469297b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1133" addr="0x7f99f1ddc4b0" >
-                                        <attributelist id="1134" addr="0x7f99f1ddc4b0" >
+                                    <typetabsitem id="1133" addr="0x7fca4692a4b0" >
+                                        <attributelist id="1134" addr="0x7fca4692a4b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1135" addr="0x7f99f1ddcf90" >
-                                        <attributelist id="1136" addr="0x7f99f1ddcf90" >
+                                    <typetabsitem id="1135" addr="0x7fca4692af90" >
+                                        <attributelist id="1136" addr="0x7fca4692af90" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1137" addr="0x7f99f1de11b0" >
-                                        <attributelist id="1138" addr="0x7f99f1de11b0" >
+                                    <typetabsitem id="1137" addr="0x7fca4692f1b0" >
+                                        <attributelist id="1138" addr="0x7fca4692f1b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1139" addr="0x7f99f1de15b0" >
-                                        <attributelist id="1140" addr="0x7f99f1de15b0" >
+                                    <typetabsitem id="1139" addr="0x7fca4692f5b0" >
+                                        <attributelist id="1140" addr="0x7fca4692f5b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1141" addr="0x7f99f1dd77f0" >
-                                        <attributelist id="1142" addr="0x7f99f1dd77f0" >
+                                    <typetabsitem id="1141" addr="0x7fca469257f0" >
+                                        <attributelist id="1142" addr="0x7fca469257f0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1143" addr="0x7f99f1dd8b30" >
-                                        <attributelist id="1144" addr="0x7f99f1dd8b30" >
+                                    <typetabsitem id="1143" addr="0x7fca46926b30" >
+                                        <attributelist id="1144" addr="0x7fca46926b30" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1145" addr="0x7f99f1dd2c50" >
-                                        <attributelist id="1146" addr="0x7f99f1dd2c50" >
+                                    <typetabsitem id="1145" addr="0x7fca46920c50" >
+                                        <attributelist id="1146" addr="0x7fca46920c50" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1147" addr="0x7f99f1dda790" >
-                                        <attributelist id="1148" addr="0x7f99f1dda790" >
+                                    <typetabsitem id="1147" addr="0x7fca46928790" >
+                                        <attributelist id="1148" addr="0x7fca46928790" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1149" addr="0x7f99f1dd8030" >
-                                        <attributelist id="1150" addr="0x7f99f1dd8030" >
+                                    <typetabsitem id="1149" addr="0x7fca46926030" >
+                                        <attributelist id="1150" addr="0x7fca46926030" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1151" addr="0x7f99f1ddbe10" >
-                                        <attributelist id="1152" addr="0x7f99f1ddbe10" >
+                                    <typetabsitem id="1151" addr="0x7fca46929e10" >
+                                        <attributelist id="1152" addr="0x7fca46929e10" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1153" addr="0x7f99f1dd6b10" >
-                                        <attributelist id="1154" addr="0x7f99f1dd6b10" >
+                                    <typetabsitem id="1153" addr="0x7fca46924b10" >
+                                        <attributelist id="1154" addr="0x7fca46924b10" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1155" addr="0x7f99f1dddf90" >
-                                        <attributelist id="1156" addr="0x7f99f1dddf90" >
+                                    <typetabsitem id="1155" addr="0x7fca4692bf90" >
+                                        <attributelist id="1156" addr="0x7fca4692bf90" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1157" addr="0x7f99f1de0530" >
-                                        <attributelist id="1158" addr="0x7f99f1de0530" >
+                                    <typetabsitem id="1157" addr="0x7fca4692e530" >
+                                        <attributelist id="1158" addr="0x7fca4692e530" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1159" addr="0x7f99f1de1e50" >
-                                        <attributelist id="1160" addr="0x7f99f1de1e50" >
+                                    <typetabsitem id="1159" addr="0x7fca4692fe50" >
+                                        <attributelist id="1160" addr="0x7fca4692fe50" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1161" addr="0x7f99f1de2d90" >
-                                        <attributelist id="1162" addr="0x7f99f1de2d90" >
+                                    <typetabsitem id="1161" addr="0x7fca46930d90" >
+                                        <attributelist id="1162" addr="0x7fca46930d90" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1163" addr="0x7f99f1de3410" >
-                                        <attributelist id="1164" addr="0x7f99f1de3410" >
+                                    <typetabsitem id="1163" addr="0x7fca46931410" >
+                                        <attributelist id="1164" addr="0x7fca46931410" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1165" addr="0x7f99f1dd3590" >
-                                        <attributelist id="1166" addr="0x7f99f1dd3590" >
+                                    <typetabsitem id="1165" addr="0x7fca46921590" >
+                                        <attributelist id="1166" addr="0x7fca46921590" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1167" addr="0x7f99f1dd3390" >
-                                        <attributelist id="1168" addr="0x7f99f1dd3390" >
+                                    <typetabsitem id="1167" addr="0x7fca46921390" >
+                                        <attributelist id="1168" addr="0x7fca46921390" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
-                                <attribute name="parent" value="0x7f99f1dd1d70" id="1169" addr="0x7f99f1dd1d70" />
-                                <attribute name="qname" value="XBMCAddon::xbmcgui" id="1170" addr="0x7f99f1de6c90" />
-                                <attribute name="symtab" value="0x7f99f1e40fb0" id="1171" addr="0x7f99f1e40fb0" />
+                                <attribute name="parent" value="0x7fca4691fd70" id="1169" addr="0x7fca4691fd70" />
+                                <attribute name="qname" value="XBMCAddon::xbmcgui" id="1170" addr="0x7fca46934c90" />
+                                <attribute name="symtab" value="0x7fca4698efb0" id="1171" addr="0x7fca4698efb0" />
                             </attributelist >
-                            <typescopesitem id="1172" addr="0x7f99f1e40f70" >
-                                <attributelist id="1173" addr="0x7f99f1e40f70" >
+                            <typescopesitem id="1172" addr="0x7fca4698ef70" >
+                                <attributelist id="1173" addr="0x7fca4698ef70" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="1174" addr="0x7f99f1dd2170" >
-                                <attributelist id="1175" addr="0x7f99f1dd2170" >
-                                    <attribute name="InterceptorBase" value="InterceptorBase" id="1176" addr="0x7f99f1de6c90" />
-                                    <attribute name="Dialog" value="Dialog" id="1177" addr="0x7f99f1de6c90" />
-                                    <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="1178" addr="0x7f99f1de6c90" />
-                                    <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="1179" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlTextBox" value="ControlTextBox" id="1180" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlRadioButton" value="ControlRadioButton" id="1181" addr="0x7f99f1de6c90" />
-                                    <attribute name="Window" value="Window" id="1182" addr="0x7f99f1de6c90" />
-                                    <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="1183" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlList" value="ControlList" id="1184" addr="0x7f99f1de6c90" />
-                                    <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="1185" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlImage" value="ControlImage" id="1186" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlButton" value="ControlButton" id="1187" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlGroup" value="ControlGroup" id="1188" addr="0x7f99f1de6c90" />
-                                    <attribute name="DialogBusy" value="DialogBusy" id="1189" addr="0x7f99f1de6c90" />
-                                    <attribute name="DialogProgressBG" value="DialogProgressBG" id="1190" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlSpin" value="ControlSpin" id="1191" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlEdit" value="ControlEdit" id="1192" addr="0x7f99f1de6c90" />
-                                    <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="1193" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="1194" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlLabel" value="ControlLabel" id="1195" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlProgress" value="ControlProgress" id="1196" addr="0x7f99f1de6c90" />
-                                    <attribute name="Control" value="Control" id="1197" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlSlider" value="ControlSlider" id="1198" addr="0x7f99f1de6c90" />
-                                    <attribute name="DialogProgress" value="DialogProgress" id="1199" addr="0x7f99f1de6c90" />
-                                    <attribute name="Action" value="Action" id="1200" addr="0x7f99f1de6c90" />
-                                    <attribute name="WindowDialog" value="WindowDialog" id="1201" addr="0x7f99f1de6c90" />
-                                    <attribute name="WindowXML" value="WindowXML" id="1202" addr="0x7f99f1de6c90" />
-                                    <attribute name="ListItem" value="ListItem" id="1203" addr="0x7f99f1de6c90" />
-                                    <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="1204" addr="0x7f99f1de6c90" />
+                            <typescopesitem id="1174" addr="0x7fca46920170" >
+                                <attributelist id="1175" addr="0x7fca46920170" >
+                                    <attribute name="InterceptorBase" value="InterceptorBase" id="1176" addr="0x7fca46934c90" />
+                                    <attribute name="Dialog" value="Dialog" id="1177" addr="0x7fca46934c90" />
+                                    <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="1178" addr="0x7fca46934c90" />
+                                    <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="1179" addr="0x7fca46934c90" />
+                                    <attribute name="ControlTextBox" value="ControlTextBox" id="1180" addr="0x7fca46934c90" />
+                                    <attribute name="ControlRadioButton" value="ControlRadioButton" id="1181" addr="0x7fca46934c90" />
+                                    <attribute name="Window" value="Window" id="1182" addr="0x7fca46934c90" />
+                                    <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="1183" addr="0x7fca46934c90" />
+                                    <attribute name="ControlList" value="ControlList" id="1184" addr="0x7fca46934c90" />
+                                    <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="1185" addr="0x7fca46934c90" />
+                                    <attribute name="ControlImage" value="ControlImage" id="1186" addr="0x7fca46934c90" />
+                                    <attribute name="ControlButton" value="ControlButton" id="1187" addr="0x7fca46934c90" />
+                                    <attribute name="ControlGroup" value="ControlGroup" id="1188" addr="0x7fca46934c90" />
+                                    <attribute name="DialogBusy" value="DialogBusy" id="1189" addr="0x7fca46934c90" />
+                                    <attribute name="DialogProgressBG" value="DialogProgressBG" id="1190" addr="0x7fca46934c90" />
+                                    <attribute name="ControlSpin" value="ControlSpin" id="1191" addr="0x7fca46934c90" />
+                                    <attribute name="ControlEdit" value="ControlEdit" id="1192" addr="0x7fca46934c90" />
+                                    <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="1193" addr="0x7fca46934c90" />
+                                    <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="1194" addr="0x7fca46934c90" />
+                                    <attribute name="ControlLabel" value="ControlLabel" id="1195" addr="0x7fca46934c90" />
+                                    <attribute name="ControlProgress" value="ControlProgress" id="1196" addr="0x7fca46934c90" />
+                                    <attribute name="Control" value="Control" id="1197" addr="0x7fca46934c90" />
+                                    <attribute name="ControlSlider" value="ControlSlider" id="1198" addr="0x7fca46934c90" />
+                                    <attribute name="DialogProgress" value="DialogProgress" id="1199" addr="0x7fca46934c90" />
+                                    <attribute name="Action" value="Action" id="1200" addr="0x7fca46934c90" />
+                                    <attribute name="WindowDialog" value="WindowDialog" id="1201" addr="0x7fca46934c90" />
+                                    <attribute name="WindowXML" value="WindowXML" id="1202" addr="0x7fca46934c90" />
+                                    <attribute name="ListItem" value="ListItem" id="1203" addr="0x7fca46934c90" />
+                                    <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="1204" addr="0x7fca46934c90" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="1205" addr="0x7f99f1dd1d70" >
-                                <attributelist id="1206" addr="0x7f99f1dd1d70" >
-                                    <attribute name="name" value="XBMCAddon" id="1207" addr="0x7f99f1de6c90" />
-                                    <typetab id="1208" addr="0x7f99f1dd1db0" >
-                                        <attributelist id="1209" addr="0x7f99f1dd1db0" >
-                                            <attribute name="Dictionary" value="Dictionary" id="1210" addr="0x7f99f1de6c90" />
-                                            <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="1211" addr="0x7f99f1de6c90" />
-                                            <attribute name="String" value="std::string" id="1212" addr="0x7f99f1de6c90" />
-                                            <attribute name="StringOrInt" value="XBMCAddon::String" id="1213" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                        <typetabsitem id="1214" addr="0x7f99f1dd28b0" >
-                                            <attributelist id="1215" addr="0x7f99f1dd28b0" >
+                            <typescopesitem id="1205" addr="0x7fca4691fd70" >
+                                <attributelist id="1206" addr="0x7fca4691fd70" >
+                                    <attribute name="name" value="XBMCAddon" id="1207" addr="0x7fca46934c90" />
+                                    <typetab id="1208" addr="0x7fca4691fdb0" >
+                                        <attributelist id="1209" addr="0x7fca4691fdb0" >
+                                            <attribute name="Dictionary" value="Dictionary" id="1210" addr="0x7fca46934c90" />
+                                            <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="1211" addr="0x7fca46934c90" />
+                                            <attribute name="String" value="std::string" id="1212" addr="0x7fca46934c90" />
+                                            <attribute name="StringOrInt" value="XBMCAddon::String" id="1213" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                        <typetabsitem id="1214" addr="0x7fca469208b0" >
+                                            <attributelist id="1215" addr="0x7fca469208b0" >
                                             </attributelist >
                                         </typetabsitem >
-                                        <typetabsitem id="1216" addr="0x7f99f1dd2910" >
-                                            <attributelist id="1217" addr="0x7f99f1dd2910" >
+                                        <typetabsitem id="1216" addr="0x7fca46920910" >
+                                            <attributelist id="1217" addr="0x7fca46920910" >
                                             </attributelist >
                                         </typetabsitem >
-                                        <typetabsitem id="1218" addr="0x7f99f1dd1f90" >
-                                            <attributelist id="1219" addr="0x7f99f1dd1f90" >
+                                        <typetabsitem id="1218" addr="0x7fca4691ff90" >
+                                            <attributelist id="1219" addr="0x7fca4691ff90" >
                                             </attributelist >
                                         </typetabsitem >
-                                        <typetabsitem id="1220" addr="0x7f99f1dd2710" >
-                                            <attributelist id="1221" addr="0x7f99f1dd2710" >
+                                        <typetabsitem id="1220" addr="0x7fca46920710" >
+                                            <attributelist id="1221" addr="0x7fca46920710" >
                                             </attributelist >
                                         </typetabsitem >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f99f1e1da30" id="1222" addr="0x7f99f1e1da30" />
-                                    <attribute name="qname" value="XBMCAddon" id="1223" addr="0x7f99f1de6c90" />
-                                    <attribute name="symtab" value="0x7f99f1e408b0" id="1224" addr="0x7f99f1e408b0" />
+                                    <attribute name="parent" value="0x7fca4696ba30" id="1222" addr="0x7fca4696ba30" />
+                                    <attribute name="qname" value="XBMCAddon" id="1223" addr="0x7fca46934c90" />
+                                    <attribute name="symtab" value="0x7fca4698e8b0" id="1224" addr="0x7fca4698e8b0" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="1225" addr="0x7f99f1dd2190" >
-                                <attributelist id="1226" addr="0x7f99f1dd2190" >
+                            <typescopesitem id="1225" addr="0x7fca46920190" >
+                                <attributelist id="1226" addr="0x7fca46920190" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="1227" addr="0x7f99f1e40fb0" >
-                                <attributelist id="1228" addr="0x7f99f1e40fb0" >
-                                    <attribute name="name" value="xbmcgui" id="1229" addr="0x7f99f1de6c90" />
-                                    <attribute name="csymtab" value="0x7f99f1e40ff0" id="1230" addr="0x7f99f1e40ff0" />
-                                    <attribute name="symtab" value="0x7f99f1e40f90" id="1231" addr="0x7f99f1e40f90" />
+                            <typescopesitem id="1227" addr="0x7fca4698efb0" >
+                                <attributelist id="1228" addr="0x7fca4698efb0" >
+                                    <attribute name="name" value="xbmcgui" id="1229" addr="0x7fca46934c90" />
+                                    <attribute name="csymtab" value="0x7fca4698eff0" id="1230" addr="0x7fca4698eff0" />
+                                    <attribute name="symtab" value="0x7fca4698ef90" id="1231" addr="0x7fca4698ef90" />
                                 </attributelist >
                             </typescopesitem >
                         </typescope >
                     </attributelist >
 
-                    <cdecl id="1232" addr="0x7f99f1e465f0" >
-                        <attributelist id="1233" addr="0x7f99f1e465f0" >
-                            <attribute name="sym_name" value="ListItemException" id="1234" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="XBMCAddon::xbmcgui::ListItemException" id="1235" addr="0x7f99f1de6c90" />
-                            <attribute name="kind" value="variable" id="1236" addr="0x7f99f1de6c90" />
-                            <attribute name="type" value="XBMCCOMMONS_STANDARD_EXCEPTION" id="1237" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="1238" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1239" addr="0x7f99f1de6c90" />
+                    <cdecl id="1232" addr="0x7fca469945f0" >
+                        <attributelist id="1233" addr="0x7fca469945f0" >
+                            <attribute name="sym_name" value="ListItemException" id="1234" addr="0x7fca46934c90" />
+                            <attribute name="name" value="XBMCAddon::xbmcgui::ListItemException" id="1235" addr="0x7fca46934c90" />
+                            <attribute name="kind" value="variable" id="1236" addr="0x7fca46934c90" />
+                            <attribute name="type" value="XBMCCOMMONS_STANDARD_EXCEPTION" id="1237" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="1238" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1239" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="1240" addr="0x7f99f1e46a50" >
-                        <attributelist id="1241" addr="0x7f99f1e46a50" >
-                            <attribute name="sym_name" value="InfoLabelStringOrTuple" id="1242" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="XBMCAddon::xbmcgui::InfoLabelStringOrTuple" id="1243" addr="0x7f99f1de6c90" />
-                            <attribute name="decl" value="" id="1244" addr="0x7f99f1de6c90" />
-                            <attribute name="storage" value="typedef" id="1245" addr="0x7f99f1de6c90" />
-                            <attribute name="kind" value="typedef" id="1246" addr="0x7f99f1de6c90" />
-                            <attribute name="type" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="1247" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="1248" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1249" addr="0x7f99f1de6c90" />
+                    <cdecl id="1240" addr="0x7fca46994a50" >
+                        <attributelist id="1241" addr="0x7fca46994a50" >
+                            <attribute name="sym_name" value="InfoLabelStringOrTuple" id="1242" addr="0x7fca46934c90" />
+                            <attribute name="name" value="XBMCAddon::xbmcgui::InfoLabelStringOrTuple" id="1243" addr="0x7fca46934c90" />
+                            <attribute name="decl" value="" id="1244" addr="0x7fca46934c90" />
+                            <attribute name="storage" value="typedef" id="1245" addr="0x7fca46934c90" />
+                            <attribute name="kind" value="typedef" id="1246" addr="0x7fca46934c90" />
+                            <attribute name="type" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="1247" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="1248" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1249" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="1250" addr="0x7f99f1e471d0" >
-                        <attributelist id="1251" addr="0x7f99f1e471d0" >
-                            <attribute name="sym_name" value="InfoLabelValue" id="1252" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="XBMCAddon::xbmcgui::InfoLabelValue" id="1253" addr="0x7f99f1de6c90" />
-                            <attribute name="decl" value="" id="1254" addr="0x7f99f1de6c90" />
-                            <attribute name="storage" value="typedef" id="1255" addr="0x7f99f1de6c90" />
-                            <attribute name="kind" value="typedef" id="1256" addr="0x7f99f1de6c90" />
-                            <attribute name="type" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="1257" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="1258" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1259" addr="0x7f99f1de6c90" />
+                    <cdecl id="1250" addr="0x7fca469951d0" >
+                        <attributelist id="1251" addr="0x7fca469951d0" >
+                            <attribute name="sym_name" value="InfoLabelValue" id="1252" addr="0x7fca46934c90" />
+                            <attribute name="name" value="XBMCAddon::xbmcgui::InfoLabelValue" id="1253" addr="0x7fca46934c90" />
+                            <attribute name="decl" value="" id="1254" addr="0x7fca46934c90" />
+                            <attribute name="storage" value="typedef" id="1255" addr="0x7fca46934c90" />
+                            <attribute name="kind" value="typedef" id="1256" addr="0x7fca46934c90" />
+                            <attribute name="type" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="1257" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="1258" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1259" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="1260" addr="0x7f99f1e47450" >
-                        <attributelist id="1261" addr="0x7f99f1e47450" >
-                            <attribute name="sym_name" value="InfoLabelDict" id="1262" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="XBMCAddon::xbmcgui::InfoLabelDict" id="1263" addr="0x7f99f1de6c90" />
-                            <attribute name="decl" value="" id="1264" addr="0x7f99f1de6c90" />
-                            <attribute name="storage" value="typedef" id="1265" addr="0x7f99f1de6c90" />
-                            <attribute name="kind" value="typedef" id="1266" addr="0x7f99f1de6c90" />
-                            <attribute name="type" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="1267" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="1268" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1269" addr="0x7f99f1de6c90" />
+                    <cdecl id="1260" addr="0x7fca46995450" >
+                        <attributelist id="1261" addr="0x7fca46995450" >
+                            <attribute name="sym_name" value="InfoLabelDict" id="1262" addr="0x7fca46934c90" />
+                            <attribute name="name" value="XBMCAddon::xbmcgui::InfoLabelDict" id="1263" addr="0x7fca46934c90" />
+                            <attribute name="decl" value="" id="1264" addr="0x7fca46934c90" />
+                            <attribute name="storage" value="typedef" id="1265" addr="0x7fca46934c90" />
+                            <attribute name="kind" value="typedef" id="1266" addr="0x7fca46934c90" />
+                            <attribute name="type" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="1267" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="1268" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1269" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </cdecl >
-                    <class id="1270" addr="0x7f99f1e476b0" >
-                        <attributelist id="1271" addr="0x7f99f1e476b0" >
-                            <attribute name="name" value="XBMCAddon::xbmcgui::ListItem" id="1272" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="1273" addr="0x7f99f1e40fb0" />
-                            <attribute name="symtab" value="0x7f99f1e478f0" id="1274" addr="0x7f99f1e478f0" />
-                            <attribute name="allows_typedef" value="1" id="1275" addr="0x7f99f1de6c90" />
-                            <attribute name="typepass_visit" value="1" id="1276" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_visit" value="1" id="1277" addr="0x7f99f1de6c90" />
-                            <attribute name="kind" value="class" id="1278" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_name" value="ListItem" id="1279" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_default_constructor" value="1" id="1280" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_has_constructor" value="1" id="1281" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_public_constructor" value="1" id="1282" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_has_destructor" value="1" id="1283" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_default_destructor" value="1" id="1284" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_copy_constructor" value="1" id="1285" addr="0x7f99f1de6c90" />
-                            <attribute name="privatebaselist" value="0x7f99f1e47610" id="1286" addr="0x7f99f1e47610" />
-                            <attribute name="protectedbaselist" value="0x7f99f1e475f0" id="1287" addr="0x7f99f1e475f0" />
-                            <baselist id="1288" addr="0x7f99f1e47630" >
-                                <base name="AddonClass" id="1289" addr="0x7f99f1e477b0" />
+                    <class id="1270" addr="0x7fca469956b0" >
+                        <attributelist id="1271" addr="0x7fca469956b0" >
+                            <attribute name="name" value="XBMCAddon::xbmcgui::ListItem" id="1272" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="1273" addr="0x7fca4698efb0" />
+                            <attribute name="symtab" value="0x7fca469958f0" id="1274" addr="0x7fca469958f0" />
+                            <attribute name="allows_typedef" value="1" id="1275" addr="0x7fca46934c90" />
+                            <attribute name="typepass_visit" value="1" id="1276" addr="0x7fca46934c90" />
+                            <attribute name="allocate_visit" value="1" id="1277" addr="0x7fca46934c90" />
+                            <attribute name="kind" value="class" id="1278" addr="0x7fca46934c90" />
+                            <attribute name="sym_name" value="ListItem" id="1279" addr="0x7fca46934c90" />
+                            <attribute name="allocate_default_constructor" value="1" id="1280" addr="0x7fca46934c90" />
+                            <attribute name="allocate_has_constructor" value="1" id="1281" addr="0x7fca46934c90" />
+                            <attribute name="allocate_public_constructor" value="1" id="1282" addr="0x7fca46934c90" />
+                            <attribute name="allocate_has_destructor" value="1" id="1283" addr="0x7fca46934c90" />
+                            <attribute name="allocate_default_destructor" value="1" id="1284" addr="0x7fca46934c90" />
+                            <attribute name="allocate_copy_constructor" value="1" id="1285" addr="0x7fca46934c90" />
+                            <attribute name="privatebaselist" value="0x7fca46995610" id="1286" addr="0x7fca46995610" />
+                            <attribute name="protectedbaselist" value="0x7fca469955f0" id="1287" addr="0x7fca469955f0" />
+                            <baselist id="1288" addr="0x7fca46995630" >
+                                <base name="AddonClass" id="1289" addr="0x7fca469957b0" />
                             </baselist >
-                            <attribute name="module" value="xbmcgui" id="1290" addr="0x7f99f1e402f0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1291" addr="0x7f99f1de6c90" />
-                            <typescope id="1292" addr="0x7f99f1dd3690" >
-                                <attributelist id="1293" addr="0x7f99f1dd3690" >
-                                    <attribute name="name" value="ListItem" id="1294" addr="0x7f99f1de6c90" />
-                                    <typetab id="1295" addr="0x7f99f1dd36b0" >
-                                        <attributelist id="1296" addr="0x7f99f1dd36b0" >
+                            <attribute name="module" value="xbmcgui" id="1290" addr="0x7fca4698e2f0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1291" addr="0x7fca46934c90" />
+                            <typescope id="1292" addr="0x7fca46921690" >
+                                <attributelist id="1293" addr="0x7fca46921690" >
+                                    <attribute name="name" value="ListItem" id="1294" addr="0x7fca46934c90" />
+                                    <typetab id="1295" addr="0x7fca469216b0" >
+                                        <attributelist id="1296" addr="0x7fca469216b0" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f99f1dd2150" id="1297" addr="0x7f99f1dd2150" />
-                                    <attribute name="qname" value="XBMCAddon::xbmcgui::ListItem" id="1298" addr="0x7f99f1de6c90" />
-                                    <attribute name="symtab" value="0x7f99f1e478f0" id="1299" addr="0x7f99f1e478f0" />
+                                    <attribute name="parent" value="0x7fca46920150" id="1297" addr="0x7fca46920150" />
+                                    <attribute name="qname" value="XBMCAddon::xbmcgui::ListItem" id="1298" addr="0x7fca46934c90" />
+                                    <attribute name="symtab" value="0x7fca469958f0" id="1299" addr="0x7fca469958f0" />
                                 </attributelist >
-                                <typescopesitem id="1300" addr="0x7f99f1dd35f0" >
-                                    <attributelist id="1301" addr="0x7f99f1dd35f0" >
+                                <typescopesitem id="1300" addr="0x7fca469215f0" >
+                                    <attributelist id="1301" addr="0x7fca469215f0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="1302" addr="0x7f99f1dd36b0" >
-                                    <attributelist id="1303" addr="0x7f99f1dd36b0" >
+                                <typescopesitem id="1302" addr="0x7fca469216b0" >
+                                    <attributelist id="1303" addr="0x7fca469216b0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="1304" addr="0x7f99f1dd2150" >
-                                    <attributelist id="1305" addr="0x7f99f1dd2150" >
-                                        <attribute name="name" value="xbmcgui" id="1306" addr="0x7f99f1de6c90" />
-                                        <typetab id="1307" addr="0x7f99f1dd2170" >
-                                            <attributelist id="1308" addr="0x7f99f1dd2170" >
-                                                <attribute name="InterceptorBase" value="InterceptorBase" id="1309" addr="0x7f99f1de6c90" />
-                                                <attribute name="Dialog" value="Dialog" id="1310" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="1311" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="1312" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlTextBox" value="ControlTextBox" id="1313" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="1314" addr="0x7f99f1de6c90" />
-                                                <attribute name="Window" value="Window" id="1315" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="1316" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlList" value="ControlList" id="1317" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="1318" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlImage" value="ControlImage" id="1319" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlButton" value="ControlButton" id="1320" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlGroup" value="ControlGroup" id="1321" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogBusy" value="DialogBusy" id="1322" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="1323" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSpin" value="ControlSpin" id="1324" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlEdit" value="ControlEdit" id="1325" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="1326" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="1327" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlLabel" value="ControlLabel" id="1328" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlProgress" value="ControlProgress" id="1329" addr="0x7f99f1de6c90" />
-                                                <attribute name="Control" value="Control" id="1330" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSlider" value="ControlSlider" id="1331" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgress" value="DialogProgress" id="1332" addr="0x7f99f1de6c90" />
-                                                <attribute name="Action" value="Action" id="1333" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowDialog" value="WindowDialog" id="1334" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXML" value="WindowXML" id="1335" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItem" value="ListItem" id="1336" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="1337" addr="0x7f99f1de6c90" />
+                                <typescopesitem id="1304" addr="0x7fca46920150" >
+                                    <attributelist id="1305" addr="0x7fca46920150" >
+                                        <attribute name="name" value="xbmcgui" id="1306" addr="0x7fca46934c90" />
+                                        <typetab id="1307" addr="0x7fca46920170" >
+                                            <attributelist id="1308" addr="0x7fca46920170" >
+                                                <attribute name="InterceptorBase" value="InterceptorBase" id="1309" addr="0x7fca46934c90" />
+                                                <attribute name="Dialog" value="Dialog" id="1310" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="1311" addr="0x7fca46934c90" />
+                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="1312" addr="0x7fca46934c90" />
+                                                <attribute name="ControlTextBox" value="ControlTextBox" id="1313" addr="0x7fca46934c90" />
+                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="1314" addr="0x7fca46934c90" />
+                                                <attribute name="Window" value="Window" id="1315" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="1316" addr="0x7fca46934c90" />
+                                                <attribute name="ControlList" value="ControlList" id="1317" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="1318" addr="0x7fca46934c90" />
+                                                <attribute name="ControlImage" value="ControlImage" id="1319" addr="0x7fca46934c90" />
+                                                <attribute name="ControlButton" value="ControlButton" id="1320" addr="0x7fca46934c90" />
+                                                <attribute name="ControlGroup" value="ControlGroup" id="1321" addr="0x7fca46934c90" />
+                                                <attribute name="DialogBusy" value="DialogBusy" id="1322" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="1323" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSpin" value="ControlSpin" id="1324" addr="0x7fca46934c90" />
+                                                <attribute name="ControlEdit" value="ControlEdit" id="1325" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="1326" addr="0x7fca46934c90" />
+                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="1327" addr="0x7fca46934c90" />
+                                                <attribute name="ControlLabel" value="ControlLabel" id="1328" addr="0x7fca46934c90" />
+                                                <attribute name="ControlProgress" value="ControlProgress" id="1329" addr="0x7fca46934c90" />
+                                                <attribute name="Control" value="Control" id="1330" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSlider" value="ControlSlider" id="1331" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgress" value="DialogProgress" id="1332" addr="0x7fca46934c90" />
+                                                <attribute name="Action" value="Action" id="1333" addr="0x7fca46934c90" />
+                                                <attribute name="WindowDialog" value="WindowDialog" id="1334" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXML" value="WindowXML" id="1335" addr="0x7fca46934c90" />
+                                                <attribute name="ListItem" value="ListItem" id="1336" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="1337" addr="0x7fca46934c90" />
                                             </attributelist >
-                                            <typetabsitem id="1338" addr="0x7f99f1de1dd0" >
-                                                <attributelist id="1339" addr="0x7f99f1de1dd0" >
+                                            <typetabsitem id="1338" addr="0x7fca4692fdd0" >
+                                                <attributelist id="1339" addr="0x7fca4692fdd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1340" addr="0x7f99f1dde790" >
-                                                <attributelist id="1341" addr="0x7f99f1dde790" >
+                                            <typetabsitem id="1340" addr="0x7fca4692c790" >
+                                                <attributelist id="1341" addr="0x7fca4692c790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1342" addr="0x7f99f1de3f10" >
-                                                <attributelist id="1343" addr="0x7f99f1de3f10" >
+                                            <typetabsitem id="1342" addr="0x7fca46931f10" >
+                                                <attributelist id="1343" addr="0x7fca46931f10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1344" addr="0x7f99f1dd67b0" >
-                                                <attributelist id="1345" addr="0x7f99f1dd67b0" >
+                                            <typetabsitem id="1344" addr="0x7fca469247b0" >
+                                                <attributelist id="1345" addr="0x7fca469247b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1346" addr="0x7f99f1ddafd0" >
-                                                <attributelist id="1347" addr="0x7f99f1ddafd0" >
+                                            <typetabsitem id="1346" addr="0x7fca46928fd0" >
+                                                <attributelist id="1347" addr="0x7fca46928fd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1348" addr="0x7f99f1ddd430" >
-                                                <attributelist id="1349" addr="0x7f99f1ddd430" >
+                                            <typetabsitem id="1348" addr="0x7fca4692b430" >
+                                                <attributelist id="1349" addr="0x7fca4692b430" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1350" addr="0x7f99f1de2130" >
-                                                <attributelist id="1351" addr="0x7f99f1de2130" >
+                                            <typetabsitem id="1350" addr="0x7fca46930130" >
+                                                <attributelist id="1351" addr="0x7fca46930130" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1352" addr="0x7f99f1dd2f50" >
-                                                <attributelist id="1353" addr="0x7f99f1dd2f50" >
+                                            <typetabsitem id="1352" addr="0x7fca46920f50" >
+                                                <attributelist id="1353" addr="0x7fca46920f50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1354" addr="0x7f99f1dd9650" >
-                                                <attributelist id="1355" addr="0x7f99f1dd9650" >
+                                            <typetabsitem id="1354" addr="0x7fca46927650" >
+                                                <attributelist id="1355" addr="0x7fca46927650" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1356" addr="0x7f99f1de3390" >
-                                                <attributelist id="1357" addr="0x7f99f1de3390" >
+                                            <typetabsitem id="1356" addr="0x7fca46931390" >
+                                                <attributelist id="1357" addr="0x7fca46931390" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1358" addr="0x7f99f1ddb7b0" >
-                                                <attributelist id="1359" addr="0x7f99f1ddb7b0" >
+                                            <typetabsitem id="1358" addr="0x7fca469297b0" >
+                                                <attributelist id="1359" addr="0x7fca469297b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1360" addr="0x7f99f1ddc4b0" >
-                                                <attributelist id="1361" addr="0x7f99f1ddc4b0" >
+                                            <typetabsitem id="1360" addr="0x7fca4692a4b0" >
+                                                <attributelist id="1361" addr="0x7fca4692a4b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1362" addr="0x7f99f1ddcf90" >
-                                                <attributelist id="1363" addr="0x7f99f1ddcf90" >
+                                            <typetabsitem id="1362" addr="0x7fca4692af90" >
+                                                <attributelist id="1363" addr="0x7fca4692af90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1364" addr="0x7f99f1de11b0" >
-                                                <attributelist id="1365" addr="0x7f99f1de11b0" >
+                                            <typetabsitem id="1364" addr="0x7fca4692f1b0" >
+                                                <attributelist id="1365" addr="0x7fca4692f1b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1366" addr="0x7f99f1de15b0" >
-                                                <attributelist id="1367" addr="0x7f99f1de15b0" >
+                                            <typetabsitem id="1366" addr="0x7fca4692f5b0" >
+                                                <attributelist id="1367" addr="0x7fca4692f5b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1368" addr="0x7f99f1dd77f0" >
-                                                <attributelist id="1369" addr="0x7f99f1dd77f0" >
+                                            <typetabsitem id="1368" addr="0x7fca469257f0" >
+                                                <attributelist id="1369" addr="0x7fca469257f0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1370" addr="0x7f99f1dd8b30" >
-                                                <attributelist id="1371" addr="0x7f99f1dd8b30" >
+                                            <typetabsitem id="1370" addr="0x7fca46926b30" >
+                                                <attributelist id="1371" addr="0x7fca46926b30" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1372" addr="0x7f99f1dd2c50" >
-                                                <attributelist id="1373" addr="0x7f99f1dd2c50" >
+                                            <typetabsitem id="1372" addr="0x7fca46920c50" >
+                                                <attributelist id="1373" addr="0x7fca46920c50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1374" addr="0x7f99f1dda790" >
-                                                <attributelist id="1375" addr="0x7f99f1dda790" >
+                                            <typetabsitem id="1374" addr="0x7fca46928790" >
+                                                <attributelist id="1375" addr="0x7fca46928790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1376" addr="0x7f99f1dd8030" >
-                                                <attributelist id="1377" addr="0x7f99f1dd8030" >
+                                            <typetabsitem id="1376" addr="0x7fca46926030" >
+                                                <attributelist id="1377" addr="0x7fca46926030" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1378" addr="0x7f99f1ddbe10" >
-                                                <attributelist id="1379" addr="0x7f99f1ddbe10" >
+                                            <typetabsitem id="1378" addr="0x7fca46929e10" >
+                                                <attributelist id="1379" addr="0x7fca46929e10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1380" addr="0x7f99f1dd6b10" >
-                                                <attributelist id="1381" addr="0x7f99f1dd6b10" >
+                                            <typetabsitem id="1380" addr="0x7fca46924b10" >
+                                                <attributelist id="1381" addr="0x7fca46924b10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1382" addr="0x7f99f1dddf90" >
-                                                <attributelist id="1383" addr="0x7f99f1dddf90" >
+                                            <typetabsitem id="1382" addr="0x7fca4692bf90" >
+                                                <attributelist id="1383" addr="0x7fca4692bf90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1384" addr="0x7f99f1de0530" >
-                                                <attributelist id="1385" addr="0x7f99f1de0530" >
+                                            <typetabsitem id="1384" addr="0x7fca4692e530" >
+                                                <attributelist id="1385" addr="0x7fca4692e530" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1386" addr="0x7f99f1de1e50" >
-                                                <attributelist id="1387" addr="0x7f99f1de1e50" >
+                                            <typetabsitem id="1386" addr="0x7fca4692fe50" >
+                                                <attributelist id="1387" addr="0x7fca4692fe50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1388" addr="0x7f99f1de2d90" >
-                                                <attributelist id="1389" addr="0x7f99f1de2d90" >
+                                            <typetabsitem id="1388" addr="0x7fca46930d90" >
+                                                <attributelist id="1389" addr="0x7fca46930d90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1390" addr="0x7f99f1de3410" >
-                                                <attributelist id="1391" addr="0x7f99f1de3410" >
+                                            <typetabsitem id="1390" addr="0x7fca46931410" >
+                                                <attributelist id="1391" addr="0x7fca46931410" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1392" addr="0x7f99f1dd3590" >
-                                                <attributelist id="1393" addr="0x7f99f1dd3590" >
+                                            <typetabsitem id="1392" addr="0x7fca46921590" >
+                                                <attributelist id="1393" addr="0x7fca46921590" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1394" addr="0x7f99f1dd3390" >
-                                                <attributelist id="1395" addr="0x7f99f1dd3390" >
+                                            <typetabsitem id="1394" addr="0x7fca46921390" >
+                                                <attributelist id="1395" addr="0x7fca46921390" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7f99f1dd1d70" id="1396" addr="0x7f99f1dd1d70" />
-                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="1397" addr="0x7f99f1de6c90" />
-                                        <attribute name="symtab" value="0x7f99f1e40fb0" id="1398" addr="0x7f99f1e40fb0" />
+                                        <attribute name="parent" value="0x7fca4691fd70" id="1396" addr="0x7fca4691fd70" />
+                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="1397" addr="0x7fca46934c90" />
+                                        <attribute name="symtab" value="0x7fca4698efb0" id="1398" addr="0x7fca4698efb0" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="1399" addr="0x7f99f1dd36d0" >
-                                    <attributelist id="1400" addr="0x7f99f1dd36d0" >
+                                <typescopesitem id="1399" addr="0x7fca469216d0" >
+                                    <attributelist id="1400" addr="0x7fca469216d0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="1401" addr="0x7f99f1e478f0" >
-                                    <attributelist id="1402" addr="0x7f99f1e478f0" >
-                                        <attribute name="name" value="ListItem" id="1403" addr="0x7f99f1de6c90" />
-                                        <attribute name="csymtab" value="0x7f99f1e47910" id="1404" addr="0x7f99f1e47910" />
-                                        <attribute name="symtab" value="0x7f99f1e478b0" id="1405" addr="0x7f99f1e478b0" />
+                                <typescopesitem id="1401" addr="0x7fca469958f0" >
+                                    <attributelist id="1402" addr="0x7fca469958f0" >
+                                        <attribute name="name" value="ListItem" id="1403" addr="0x7fca46934c90" />
+                                        <attribute name="csymtab" value="0x7fca46995910" id="1404" addr="0x7fca46995910" />
+                                        <attribute name="symtab" value="0x7fca469958b0" id="1405" addr="0x7fca469958b0" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <access id="1406" addr="0x7f99f1e47870" >
-                            <attributelist id="1407" addr="0x7f99f1e47870" >
-                                <attribute name="kind" value="public" id="1408" addr="0x7f99f1de6c90" />
+                        <access id="1406" addr="0x7fca46995870" >
+                            <attributelist id="1407" addr="0x7fca46995870" >
+                                <attribute name="kind" value="public" id="1408" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="1409" addr="0x7f99f1e48390" >
-                            <attributelist id="1410" addr="0x7f99f1e48390" >
-                                <attribute name="name" value="ListItem" id="1411" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="1412" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="1413" addr="0x7f99f1e478f0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e487f0" id="1414" addr="0x7f99f1e487f0" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e487f0" id="1415" addr="0x7f99f1e487f0" />
-                                <attribute name="sym_name" value="ListItem" id="1416" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).String,r.q(const).String,r.q(const).String,r.q(const).String,r.q(const).String,bool)." id="1417" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="1418" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e48390" id="1419" addr="0x7f99f1e48390" />
-                                <parmlist id="1420" addr="0x7f99f1e47b10" >
+                        <constructor id="1409" addr="0x7fca46996390" >
+                            <attributelist id="1410" addr="0x7fca46996390" >
+                                <attribute name="name" value="ListItem" id="1411" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="1412" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="1413" addr="0x7fca469958f0" />
+                                <attribute name="sym_nextSibling" value="0x7fca469967f0" id="1414" addr="0x7fca469967f0" />
+                                <attribute name="csym_nextSibling" value="0x7fca469967f0" id="1415" addr="0x7fca469967f0" />
+                                <attribute name="sym_name" value="ListItem" id="1416" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).String,r.q(const).String,r.q(const).String,r.q(const).String,r.q(const).String,bool)." id="1417" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="1418" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca46996390" id="1419" addr="0x7fca46996390" />
+                                <parmlist id="1420" addr="0x7fca46995b10" >
                                     <parm id="1421">
-                                        <attributelist id="1422" addr="0x7f99f1e47b10" >
-                                            <attribute name="name" value="label" id="1423" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="1424" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1425" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1422" addr="0x7fca46995b10" >
+                                            <attribute name="name" value="label" id="1423" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="1424" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1425" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1426">
-                                        <attributelist id="1427" addr="0x7f99f1e47cb0" >
-                                            <attribute name="name" value="label2" id="1428" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="1429" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1430" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1427" addr="0x7fca46995cb0" >
+                                            <attribute name="name" value="label2" id="1428" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="1429" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1430" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1431">
-                                        <attributelist id="1432" addr="0x7f99f1e47e50" >
-                                            <attribute name="name" value="iconImage" id="1433" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="1434" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1435" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1432" addr="0x7fca46995e50" >
+                                            <attribute name="name" value="iconImage" id="1433" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="1434" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1435" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1436">
-                                        <attributelist id="1437" addr="0x7f99f1e47ff0" >
-                                            <attribute name="name" value="thumbnailImage" id="1438" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="1439" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1440" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1437" addr="0x7fca46995ff0" >
+                                            <attribute name="name" value="thumbnailImage" id="1438" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="1439" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1440" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1441">
-                                        <attributelist id="1442" addr="0x7f99f1e48190" >
-                                            <attribute name="name" value="path" id="1443" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="1444" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1445" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1442" addr="0x7fca46996190" >
+                                            <attribute name="name" value="path" id="1443" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="1444" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1445" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1446">
-                                        <attributelist id="1447" addr="0x7f99f1e482d0" >
-                                            <attribute name="name" value="offscreen" id="1448" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="false" id="1449" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="1450" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1447" addr="0x7fca469962d0" >
+                                            <attribute name="name" value="offscreen" id="1448" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="false" id="1449" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="1450" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_0" id="1451" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="1452" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="1451" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="1452" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="1453" addr="0x7f99f1e487f0" >
-                            <attributelist id="1454" addr="0x7f99f1e487f0" >
-                                <attribute name="name" value="ListItem" id="1455" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="1456" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="1457" addr="0x7f99f1e478f0" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e48bb0" id="1458" addr="0x7f99f1e48bb0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e48390" id="1459" addr="0x7f99f1e48390" />
-                                <attribute name="sym_name" value="ListItem" id="1460" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e48bb0" id="1461" addr="0x7f99f1e48bb0" />
-                                <attribute name="defaultargs" value="0x7f99f1e48390" id="1462" addr="0x7f99f1e48390" />
-                                <attribute name="decl" value="f(r.q(const).String,r.q(const).String,r.q(const).String,r.q(const).String,r.q(const).String)." id="1463" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="1464" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e48390" id="1465" addr="0x7f99f1e48390" />
-                                <parmlist id="1466" addr="0x7f99f1e48470" >
+                        <constructor id="1453" addr="0x7fca469967f0" >
+                            <attributelist id="1454" addr="0x7fca469967f0" >
+                                <attribute name="name" value="ListItem" id="1455" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="1456" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="1457" addr="0x7fca469958f0" />
+                                <attribute name="csym_nextSibling" value="0x7fca46996bb0" id="1458" addr="0x7fca46996bb0" />
+                                <attribute name="sym_previousSibling" value="0x7fca46996390" id="1459" addr="0x7fca46996390" />
+                                <attribute name="sym_name" value="ListItem" id="1460" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca46996bb0" id="1461" addr="0x7fca46996bb0" />
+                                <attribute name="defaultargs" value="0x7fca46996390" id="1462" addr="0x7fca46996390" />
+                                <attribute name="decl" value="f(r.q(const).String,r.q(const).String,r.q(const).String,r.q(const).String,r.q(const).String)." id="1463" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="1464" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca46996390" id="1465" addr="0x7fca46996390" />
+                                <parmlist id="1466" addr="0x7fca46996470" >
                                     <parm id="1467">
-                                        <attributelist id="1468" addr="0x7f99f1e48470" >
-                                            <attribute name="name" value="label" id="1469" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="1470" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1471" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1468" addr="0x7fca46996470" >
+                                            <attribute name="name" value="label" id="1469" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="1470" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1471" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1472">
-                                        <attributelist id="1473" addr="0x7f99f1e48550" >
-                                            <attribute name="name" value="label2" id="1474" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="1475" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1476" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1473" addr="0x7fca46996550" >
+                                            <attribute name="name" value="label2" id="1474" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="1475" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1476" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1477">
-                                        <attributelist id="1478" addr="0x7f99f1e485f0" >
-                                            <attribute name="name" value="iconImage" id="1479" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="1480" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1481" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1478" addr="0x7fca469965f0" >
+                                            <attribute name="name" value="iconImage" id="1479" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="1480" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1481" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1482">
-                                        <attributelist id="1483" addr="0x7f99f1e48690" >
-                                            <attribute name="name" value="thumbnailImage" id="1484" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="1485" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1486" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1483" addr="0x7fca46996690" >
+                                            <attribute name="name" value="thumbnailImage" id="1484" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="1485" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1486" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1487">
-                                        <attributelist id="1488" addr="0x7f99f1e48730" >
-                                            <attribute name="name" value="path" id="1489" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="1490" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1491" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1488" addr="0x7fca46996730" >
+                                            <attribute name="name" value="path" id="1489" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="1490" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1491" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_1" id="1492" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="1493" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="1492" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="1493" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="1494" addr="0x7f99f1e48bb0" >
-                            <attributelist id="1495" addr="0x7f99f1e48bb0" >
-                                <attribute name="name" value="ListItem" id="1496" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="1497" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="1498" addr="0x7f99f1e478f0" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e48e90" id="1499" addr="0x7f99f1e48e90" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e487f0" id="1500" addr="0x7f99f1e487f0" />
-                                <attribute name="sym_name" value="ListItem" id="1501" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e48e90" id="1502" addr="0x7f99f1e48e90" />
-                                <attribute name="defaultargs" value="0x7f99f1e48390" id="1503" addr="0x7f99f1e48390" />
-                                <attribute name="decl" value="f(r.q(const).String,r.q(const).String,r.q(const).String,r.q(const).String)." id="1504" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="1505" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e48390" id="1506" addr="0x7f99f1e48390" />
-                                <parmlist id="1507" addr="0x7f99f1e48910" >
+                        <constructor id="1494" addr="0x7fca46996bb0" >
+                            <attributelist id="1495" addr="0x7fca46996bb0" >
+                                <attribute name="name" value="ListItem" id="1496" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="1497" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="1498" addr="0x7fca469958f0" />
+                                <attribute name="csym_nextSibling" value="0x7fca46996e90" id="1499" addr="0x7fca46996e90" />
+                                <attribute name="sym_previousSibling" value="0x7fca469967f0" id="1500" addr="0x7fca469967f0" />
+                                <attribute name="sym_name" value="ListItem" id="1501" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca46996e90" id="1502" addr="0x7fca46996e90" />
+                                <attribute name="defaultargs" value="0x7fca46996390" id="1503" addr="0x7fca46996390" />
+                                <attribute name="decl" value="f(r.q(const).String,r.q(const).String,r.q(const).String,r.q(const).String)." id="1504" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="1505" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca46996390" id="1506" addr="0x7fca46996390" />
+                                <parmlist id="1507" addr="0x7fca46996910" >
                                     <parm id="1508">
-                                        <attributelist id="1509" addr="0x7f99f1e48910" >
-                                            <attribute name="name" value="label" id="1510" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="1511" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1512" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1509" addr="0x7fca46996910" >
+                                            <attribute name="name" value="label" id="1510" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="1511" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1512" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1513">
-                                        <attributelist id="1514" addr="0x7f99f1e489b0" >
-                                            <attribute name="name" value="label2" id="1515" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="1516" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1517" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1514" addr="0x7fca469969b0" >
+                                            <attribute name="name" value="label2" id="1515" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="1516" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1517" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1518">
-                                        <attributelist id="1519" addr="0x7f99f1e48a50" >
-                                            <attribute name="name" value="iconImage" id="1520" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="1521" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1522" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1519" addr="0x7fca46996a50" >
+                                            <attribute name="name" value="iconImage" id="1520" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="1521" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1522" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1523">
-                                        <attributelist id="1524" addr="0x7f99f1e48af0" >
-                                            <attribute name="name" value="thumbnailImage" id="1525" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="1526" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1527" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1524" addr="0x7fca46996af0" >
+                                            <attribute name="name" value="thumbnailImage" id="1525" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="1526" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1527" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_2" id="1528" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="1529" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_2" id="1528" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="1529" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="1530" addr="0x7f99f1e48e90" >
-                            <attributelist id="1531" addr="0x7f99f1e48e90" >
-                                <attribute name="name" value="ListItem" id="1532" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="1533" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="1534" addr="0x7f99f1e478f0" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e490d0" id="1535" addr="0x7f99f1e490d0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e48bb0" id="1536" addr="0x7f99f1e48bb0" />
-                                <attribute name="sym_name" value="ListItem" id="1537" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e490d0" id="1538" addr="0x7f99f1e490d0" />
-                                <attribute name="defaultargs" value="0x7f99f1e48390" id="1539" addr="0x7f99f1e48390" />
-                                <attribute name="decl" value="f(r.q(const).String,r.q(const).String,r.q(const).String)." id="1540" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="1541" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e48390" id="1542" addr="0x7f99f1e48390" />
-                                <parmlist id="1543" addr="0x7f99f1e48c50" >
+                        <constructor id="1530" addr="0x7fca46996e90" >
+                            <attributelist id="1531" addr="0x7fca46996e90" >
+                                <attribute name="name" value="ListItem" id="1532" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="1533" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="1534" addr="0x7fca469958f0" />
+                                <attribute name="csym_nextSibling" value="0x7fca469970d0" id="1535" addr="0x7fca469970d0" />
+                                <attribute name="sym_previousSibling" value="0x7fca46996bb0" id="1536" addr="0x7fca46996bb0" />
+                                <attribute name="sym_name" value="ListItem" id="1537" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469970d0" id="1538" addr="0x7fca469970d0" />
+                                <attribute name="defaultargs" value="0x7fca46996390" id="1539" addr="0x7fca46996390" />
+                                <attribute name="decl" value="f(r.q(const).String,r.q(const).String,r.q(const).String)." id="1540" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="1541" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca46996390" id="1542" addr="0x7fca46996390" />
+                                <parmlist id="1543" addr="0x7fca46996c50" >
                                     <parm id="1544">
-                                        <attributelist id="1545" addr="0x7f99f1e48c50" >
-                                            <attribute name="name" value="label" id="1546" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="1547" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1548" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1545" addr="0x7fca46996c50" >
+                                            <attribute name="name" value="label" id="1546" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="1547" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1548" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1549">
-                                        <attributelist id="1550" addr="0x7f99f1e48d30" >
-                                            <attribute name="name" value="label2" id="1551" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="1552" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1553" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1550" addr="0x7fca46996d30" >
+                                            <attribute name="name" value="label2" id="1551" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="1552" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1553" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1554">
-                                        <attributelist id="1555" addr="0x7f99f1e48dd0" >
-                                            <attribute name="name" value="iconImage" id="1556" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="1557" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1558" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1555" addr="0x7fca46996dd0" >
+                                            <attribute name="name" value="iconImage" id="1556" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="1557" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1558" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_3" id="1559" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="1560" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_3" id="1559" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="1560" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="1561" addr="0x7f99f1e490d0" >
-                            <attributelist id="1562" addr="0x7f99f1e490d0" >
-                                <attribute name="name" value="ListItem" id="1563" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="1564" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="1565" addr="0x7f99f1e478f0" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e49270" id="1566" addr="0x7f99f1e49270" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e48e90" id="1567" addr="0x7f99f1e48e90" />
-                                <attribute name="sym_name" value="ListItem" id="1568" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e49270" id="1569" addr="0x7f99f1e49270" />
-                                <attribute name="defaultargs" value="0x7f99f1e48390" id="1570" addr="0x7f99f1e48390" />
-                                <attribute name="decl" value="f(r.q(const).String,r.q(const).String)." id="1571" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="1572" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e48390" id="1573" addr="0x7f99f1e48390" />
-                                <parmlist id="1574" addr="0x7f99f1e48f30" >
+                        <constructor id="1561" addr="0x7fca469970d0" >
+                            <attributelist id="1562" addr="0x7fca469970d0" >
+                                <attribute name="name" value="ListItem" id="1563" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="1564" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="1565" addr="0x7fca469958f0" />
+                                <attribute name="csym_nextSibling" value="0x7fca46997270" id="1566" addr="0x7fca46997270" />
+                                <attribute name="sym_previousSibling" value="0x7fca46996e90" id="1567" addr="0x7fca46996e90" />
+                                <attribute name="sym_name" value="ListItem" id="1568" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca46997270" id="1569" addr="0x7fca46997270" />
+                                <attribute name="defaultargs" value="0x7fca46996390" id="1570" addr="0x7fca46996390" />
+                                <attribute name="decl" value="f(r.q(const).String,r.q(const).String)." id="1571" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="1572" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca46996390" id="1573" addr="0x7fca46996390" />
+                                <parmlist id="1574" addr="0x7fca46996f30" >
                                     <parm id="1575">
-                                        <attributelist id="1576" addr="0x7f99f1e48f30" >
-                                            <attribute name="name" value="label" id="1577" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="1578" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1579" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1576" addr="0x7fca46996f30" >
+                                            <attribute name="name" value="label" id="1577" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="1578" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1579" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1580">
-                                        <attributelist id="1581" addr="0x7f99f1e49010" >
-                                            <attribute name="name" value="label2" id="1582" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="1583" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1584" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1581" addr="0x7fca46997010" >
+                                            <attribute name="name" value="label2" id="1582" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="1583" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1584" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_4" id="1585" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="1586" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_4" id="1585" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="1586" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="1587" addr="0x7f99f1e49270" >
-                            <attributelist id="1588" addr="0x7f99f1e49270" >
-                                <attribute name="name" value="ListItem" id="1589" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="1590" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="1591" addr="0x7f99f1e478f0" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e49350" id="1592" addr="0x7f99f1e49350" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e490d0" id="1593" addr="0x7f99f1e490d0" />
-                                <attribute name="sym_name" value="ListItem" id="1594" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e49350" id="1595" addr="0x7f99f1e49350" />
-                                <attribute name="defaultargs" value="0x7f99f1e48390" id="1596" addr="0x7f99f1e48390" />
-                                <attribute name="decl" value="f(r.q(const).String)." id="1597" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="1598" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e48390" id="1599" addr="0x7f99f1e48390" />
-                                <parmlist id="1600" addr="0x7f99f1e49170" >
+                        <constructor id="1587" addr="0x7fca46997270" >
+                            <attributelist id="1588" addr="0x7fca46997270" >
+                                <attribute name="name" value="ListItem" id="1589" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="1590" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="1591" addr="0x7fca469958f0" />
+                                <attribute name="csym_nextSibling" value="0x7fca46997350" id="1592" addr="0x7fca46997350" />
+                                <attribute name="sym_previousSibling" value="0x7fca469970d0" id="1593" addr="0x7fca469970d0" />
+                                <attribute name="sym_name" value="ListItem" id="1594" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca46997350" id="1595" addr="0x7fca46997350" />
+                                <attribute name="defaultargs" value="0x7fca46996390" id="1596" addr="0x7fca46996390" />
+                                <attribute name="decl" value="f(r.q(const).String)." id="1597" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="1598" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca46996390" id="1599" addr="0x7fca46996390" />
+                                <parmlist id="1600" addr="0x7fca46997170" >
                                     <parm id="1601">
-                                        <attributelist id="1602" addr="0x7f99f1e49170" >
-                                            <attribute name="name" value="label" id="1603" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="1604" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1605" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1602" addr="0x7fca46997170" >
+                                            <attribute name="name" value="label" id="1603" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="1604" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1605" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_5" id="1606" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="1607" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_5" id="1606" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="1607" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="1608" addr="0x7f99f1e49350" >
-                            <attributelist id="1609" addr="0x7f99f1e49350" >
-                                <attribute name="name" value="ListItem" id="1610" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="1611" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="1612" addr="0x7f99f1e478f0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e49270" id="1613" addr="0x7f99f1e49270" />
-                                <attribute name="sym_name" value="ListItem" id="1614" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e48390" id="1615" addr="0x7f99f1e48390" />
-                                <attribute name="decl" value="f()." id="1616" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="1617" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e48390" id="1618" addr="0x7f99f1e48390" />
-                                <attribute name="sym_overname" value="__SWIG_6" id="1619" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="1620" addr="0x7f99f1de6c90" />
+                        <constructor id="1608" addr="0x7fca46997350" >
+                            <attributelist id="1609" addr="0x7fca46997350" >
+                                <attribute name="name" value="ListItem" id="1610" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="1611" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="1612" addr="0x7fca469958f0" />
+                                <attribute name="sym_previousSibling" value="0x7fca46997270" id="1613" addr="0x7fca46997270" />
+                                <attribute name="sym_name" value="ListItem" id="1614" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca46996390" id="1615" addr="0x7fca46996390" />
+                                <attribute name="decl" value="f()." id="1616" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="1617" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca46996390" id="1618" addr="0x7fca46996390" />
+                                <attribute name="sym_overname" value="__SWIG_6" id="1619" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="1620" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <destructor id="1621" addr="0x7f99f1e494d0" >
-                            <attributelist id="1622" addr="0x7f99f1e494d0" >
-                                <attribute name="ismember" value="1" id="1623" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="~ListItem" id="1624" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="~ListItem" id="1625" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="1626" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="1627" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="1628" addr="0x7f99f1e478f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="1629" addr="0x7f99f1de6c90" />
+                        <destructor id="1621" addr="0x7fca469974d0" >
+                            <attributelist id="1622" addr="0x7fca469974d0" >
+                                <attribute name="ismember" value="1" id="1623" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="~ListItem" id="1624" addr="0x7fca46934c90" />
+                                <attribute name="name" value="~ListItem" id="1625" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="1626" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="1627" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="1628" addr="0x7fca469958f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="1629" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </destructor >
-                        <cdecl id="1630" addr="0x7f99f1e49690" >
-                            <attributelist id="1631" addr="0x7f99f1e49690" >
-                                <attribute name="ismember" value="1" id="1632" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getLabel" id="1633" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="getLabel" id="1634" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="1635" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="1636" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="1637" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="XBMCAddon::String" id="1638" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="1639" addr="0x7f99f1e478f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="1640" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="1641" addr="0x7f99f1e49870" >
-                            <attributelist id="1642" addr="0x7f99f1e49870" >
-                                <attribute name="ismember" value="1" id="1643" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getLabel2" id="1644" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="getLabel2" id="1645" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="1646" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="1647" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="1648" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="XBMCAddon::String" id="1649" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="1650" addr="0x7f99f1e478f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="1651" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="1652" addr="0x7f99f1e49b70" >
-                            <attributelist id="1653" addr="0x7f99f1e49b70" >
-                                <attribute name="name" value="setLabel" id="1654" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="1655" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="1656" addr="0x7f99f1e478f0" />
-                                <attribute name="kind" value="function" id="1657" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setLabel" id="1658" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="1659" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="1660" addr="0x7f99f1de6c90" />
-                                <parmlist id="1661" addr="0x7f99f1e49ab0" >
+                        <cdecl id="1630" addr="0x7fca46997690" >
+                            <attributelist id="1631" addr="0x7fca46997690" >
+                                <attribute name="ismember" value="1" id="1632" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getLabel" id="1633" addr="0x7fca46934c90" />
+                                <attribute name="name" value="getLabel" id="1634" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="1635" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="1636" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="1637" addr="0x7fca46934c90" />
+                                <attribute name="type" value="XBMCAddon::String" id="1638" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="1639" addr="0x7fca469958f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="1640" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="1641" addr="0x7fca46997870" >
+                            <attributelist id="1642" addr="0x7fca46997870" >
+                                <attribute name="ismember" value="1" id="1643" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getLabel2" id="1644" addr="0x7fca46934c90" />
+                                <attribute name="name" value="getLabel2" id="1645" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="1646" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="1647" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="1648" addr="0x7fca46934c90" />
+                                <attribute name="type" value="XBMCAddon::String" id="1649" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="1650" addr="0x7fca469958f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="1651" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="1652" addr="0x7fca46997b70" >
+                            <attributelist id="1653" addr="0x7fca46997b70" >
+                                <attribute name="name" value="setLabel" id="1654" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="1655" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="1656" addr="0x7fca469958f0" />
+                                <attribute name="kind" value="function" id="1657" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setLabel" id="1658" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="1659" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="1660" addr="0x7fca46934c90" />
+                                <parmlist id="1661" addr="0x7fca46997ab0" >
                                     <parm id="1662">
-                                        <attributelist id="1663" addr="0x7f99f1e49ab0" >
-                                            <attribute name="name" value="label" id="1664" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1665" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1663" addr="0x7fca46997ab0" >
+                                            <attribute name="name" value="label" id="1664" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1665" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="1666" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="1667" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="1666" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="1667" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="1668" addr="0x7f99f1e49e70" >
-                            <attributelist id="1669" addr="0x7f99f1e49e70" >
-                                <attribute name="name" value="setLabel2" id="1670" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="1671" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="1672" addr="0x7f99f1e478f0" />
-                                <attribute name="kind" value="function" id="1673" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setLabel2" id="1674" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="1675" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="1676" addr="0x7f99f1de6c90" />
-                                <parmlist id="1677" addr="0x7f99f1e49db0" >
+                        <cdecl id="1668" addr="0x7fca46997e70" >
+                            <attributelist id="1669" addr="0x7fca46997e70" >
+                                <attribute name="name" value="setLabel2" id="1670" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="1671" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="1672" addr="0x7fca469958f0" />
+                                <attribute name="kind" value="function" id="1673" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setLabel2" id="1674" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="1675" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="1676" addr="0x7fca46934c90" />
+                                <parmlist id="1677" addr="0x7fca46997db0" >
                                     <parm id="1678">
-                                        <attributelist id="1679" addr="0x7f99f1e49db0" >
-                                            <attribute name="name" value="label" id="1680" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1681" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1679" addr="0x7fca46997db0" >
+                                            <attribute name="name" value="label" id="1680" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1681" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="1682" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="1683" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="1682" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="1683" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="1684" addr="0x7f99f1e4a170" >
-                            <attributelist id="1685" addr="0x7f99f1e4a170" >
-                                <attribute name="name" value="setIconImage" id="1686" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="1687" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="1688" addr="0x7f99f1e478f0" />
-                                <attribute name="kind" value="function" id="1689" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setIconImage" id="1690" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="1691" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="1692" addr="0x7f99f1de6c90" />
-                                <parmlist id="1693" addr="0x7f99f1e4a0b0" >
+                        <cdecl id="1684" addr="0x7fca46998170" >
+                            <attributelist id="1685" addr="0x7fca46998170" >
+                                <attribute name="name" value="setIconImage" id="1686" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="1687" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="1688" addr="0x7fca469958f0" />
+                                <attribute name="kind" value="function" id="1689" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setIconImage" id="1690" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="1691" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="1692" addr="0x7fca46934c90" />
+                                <parmlist id="1693" addr="0x7fca469980b0" >
                                     <parm id="1694">
-                                        <attributelist id="1695" addr="0x7f99f1e4a0b0" >
-                                            <attribute name="name" value="iconImage" id="1696" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1697" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1695" addr="0x7fca469980b0" >
+                                            <attribute name="name" value="iconImage" id="1696" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1697" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="1698" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="1699" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="1698" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="1699" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="1700" addr="0x7f99f1e4a470" >
-                            <attributelist id="1701" addr="0x7f99f1e4a470" >
-                                <attribute name="name" value="setThumbnailImage" id="1702" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="1703" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="1704" addr="0x7f99f1e478f0" />
-                                <attribute name="kind" value="function" id="1705" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setThumbnailImage" id="1706" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="1707" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="1708" addr="0x7f99f1de6c90" />
-                                <parmlist id="1709" addr="0x7f99f1e4a3b0" >
+                        <cdecl id="1700" addr="0x7fca46998470" >
+                            <attributelist id="1701" addr="0x7fca46998470" >
+                                <attribute name="name" value="setThumbnailImage" id="1702" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="1703" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="1704" addr="0x7fca469958f0" />
+                                <attribute name="kind" value="function" id="1705" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setThumbnailImage" id="1706" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="1707" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="1708" addr="0x7fca46934c90" />
+                                <parmlist id="1709" addr="0x7fca469983b0" >
                                     <parm id="1710">
-                                        <attributelist id="1711" addr="0x7f99f1e4a3b0" >
-                                            <attribute name="name" value="thumbFilename" id="1712" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1713" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1711" addr="0x7fca469983b0" >
+                                            <attribute name="name" value="thumbFilename" id="1712" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1713" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="1714" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="1715" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="1714" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="1715" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="1716" addr="0x7f99f1e4a770" >
-                            <attributelist id="1717" addr="0x7f99f1e4a770" >
-                                <attribute name="name" value="setArt" id="1718" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="1719" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="1720" addr="0x7f99f1e478f0" />
-                                <attribute name="kind" value="function" id="1721" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setArt" id="1722" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::Properties)." id="1723" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="1724" addr="0x7f99f1de6c90" />
-                                <parmlist id="1725" addr="0x7f99f1e4a6b0" >
+                        <cdecl id="1716" addr="0x7fca46998770" >
+                            <attributelist id="1717" addr="0x7fca46998770" >
+                                <attribute name="name" value="setArt" id="1718" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="1719" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="1720" addr="0x7fca469958f0" />
+                                <attribute name="kind" value="function" id="1721" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setArt" id="1722" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::Properties)." id="1723" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="1724" addr="0x7fca46934c90" />
+                                <parmlist id="1725" addr="0x7fca469986b0" >
                                     <parm id="1726">
-                                        <attributelist id="1727" addr="0x7f99f1e4a6b0" >
-                                            <attribute name="name" value="dictionary" id="1728" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::Properties" id="1729" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1727" addr="0x7fca469986b0" >
+                                            <attribute name="name" value="dictionary" id="1728" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::Properties" id="1729" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="1730" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="1731" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="1730" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="1731" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="1732" addr="0x7f99f1e4aa30" >
-                            <attributelist id="1733" addr="0x7f99f1e4aa30" >
-                                <attribute name="name" value="setIsFolder" id="1734" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="1735" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="1736" addr="0x7f99f1e478f0" />
-                                <attribute name="kind" value="function" id="1737" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setIsFolder" id="1738" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(bool)." id="1739" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="1740" addr="0x7f99f1de6c90" />
-                                <parmlist id="1741" addr="0x7f99f1e4a970" >
+                        <cdecl id="1732" addr="0x7fca46998a30" >
+                            <attributelist id="1733" addr="0x7fca46998a30" >
+                                <attribute name="name" value="setIsFolder" id="1734" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="1735" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="1736" addr="0x7fca469958f0" />
+                                <attribute name="kind" value="function" id="1737" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setIsFolder" id="1738" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(bool)." id="1739" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="1740" addr="0x7fca46934c90" />
+                                <parmlist id="1741" addr="0x7fca46998970" >
                                     <parm id="1742">
-                                        <attributelist id="1743" addr="0x7f99f1e4a970" >
-                                            <attribute name="name" value="isFolder" id="1744" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="1745" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1743" addr="0x7fca46998970" >
+                                            <attribute name="name" value="isFolder" id="1744" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="1745" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="1746" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="1747" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="1746" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="1747" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="1748" addr="0x7f99f1e4aeb0" >
-                            <attributelist id="1749" addr="0x7f99f1e4aeb0" >
-                                <attribute name="name" value="setUniqueIDs" id="1750" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="1751" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="1752" addr="0x7f99f1e478f0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e4b050" id="1753" addr="0x7f99f1e4b050" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e4b050" id="1754" addr="0x7f99f1e4b050" />
-                                <attribute name="kind" value="function" id="1755" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setUniqueIDs" id="1756" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::Properties,r.q(const).XBMCAddon::String)." id="1757" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="1758" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e4aeb0" id="1759" addr="0x7f99f1e4aeb0" />
-                                <parmlist id="1760" addr="0x7f99f1e4ac70" >
+                        <cdecl id="1748" addr="0x7fca46998eb0" >
+                            <attributelist id="1749" addr="0x7fca46998eb0" >
+                                <attribute name="name" value="setUniqueIDs" id="1750" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="1751" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="1752" addr="0x7fca469958f0" />
+                                <attribute name="sym_nextSibling" value="0x7fca46999050" id="1753" addr="0x7fca46999050" />
+                                <attribute name="csym_nextSibling" value="0x7fca46999050" id="1754" addr="0x7fca46999050" />
+                                <attribute name="kind" value="function" id="1755" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setUniqueIDs" id="1756" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::Properties,r.q(const).XBMCAddon::String)." id="1757" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="1758" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca46998eb0" id="1759" addr="0x7fca46998eb0" />
+                                <parmlist id="1760" addr="0x7fca46998c70" >
                                     <parm id="1761">
-                                        <attributelist id="1762" addr="0x7f99f1e4ac70" >
-                                            <attribute name="name" value="dictionary" id="1763" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::Properties" id="1764" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1762" addr="0x7fca46998c70" >
+                                            <attribute name="name" value="dictionary" id="1763" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::Properties" id="1764" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1765">
-                                        <attributelist id="1766" addr="0x7f99f1e4adf0" >
-                                            <attribute name="name" value="defaultrating" id="1767" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="&quot;&quot;" id="1768" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1769" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1766" addr="0x7fca46998df0" >
+                                            <attribute name="name" value="defaultrating" id="1767" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="&quot;&quot;" id="1768" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1769" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="1770" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="1771" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="1770" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="1771" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="1772" addr="0x7f99f1e4b050" >
-                            <attributelist id="1773" addr="0x7f99f1e4b050" >
-                                <attribute name="name" value="setUniqueIDs" id="1774" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="1775" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="1776" addr="0x7f99f1e478f0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e4aeb0" id="1777" addr="0x7f99f1e4aeb0" />
-                                <attribute name="kind" value="function" id="1778" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setUniqueIDs" id="1779" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e4aeb0" id="1780" addr="0x7f99f1e4aeb0" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::Properties)." id="1781" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="1782" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e4aeb0" id="1783" addr="0x7f99f1e4aeb0" />
-                                <parmlist id="1784" addr="0x7f99f1e4af50" >
+                        <cdecl id="1772" addr="0x7fca46999050" >
+                            <attributelist id="1773" addr="0x7fca46999050" >
+                                <attribute name="name" value="setUniqueIDs" id="1774" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="1775" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="1776" addr="0x7fca469958f0" />
+                                <attribute name="sym_previousSibling" value="0x7fca46998eb0" id="1777" addr="0x7fca46998eb0" />
+                                <attribute name="kind" value="function" id="1778" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setUniqueIDs" id="1779" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca46998eb0" id="1780" addr="0x7fca46998eb0" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::Properties)." id="1781" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="1782" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca46998eb0" id="1783" addr="0x7fca46998eb0" />
+                                <parmlist id="1784" addr="0x7fca46998f50" >
                                     <parm id="1785">
-                                        <attributelist id="1786" addr="0x7f99f1e4af50" >
-                                            <attribute name="name" value="dictionary" id="1787" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::Properties" id="1788" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1786" addr="0x7fca46998f50" >
+                                            <attribute name="name" value="dictionary" id="1787" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::Properties" id="1788" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="1789" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="1790" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="1789" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="1790" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="1791" addr="0x7f99f1e4b710" >
-                            <attributelist id="1792" addr="0x7f99f1e4b710" >
-                                <attribute name="name" value="setRating" id="1793" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="1794" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="1795" addr="0x7f99f1e478f0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e4b9d0" id="1796" addr="0x7f99f1e4b9d0" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e4b9d0" id="1797" addr="0x7f99f1e4b9d0" />
-                                <attribute name="kind" value="function" id="1798" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setRating" id="1799" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(std::string,float,int,bool)." id="1800" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="1801" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e4b710" id="1802" addr="0x7f99f1e4b710" />
-                                <parmlist id="1803" addr="0x7f99f1e4b290" >
+                        <cdecl id="1791" addr="0x7fca46999710" >
+                            <attributelist id="1792" addr="0x7fca46999710" >
+                                <attribute name="name" value="setRating" id="1793" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="1794" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="1795" addr="0x7fca469958f0" />
+                                <attribute name="sym_nextSibling" value="0x7fca469999d0" id="1796" addr="0x7fca469999d0" />
+                                <attribute name="csym_nextSibling" value="0x7fca469999d0" id="1797" addr="0x7fca469999d0" />
+                                <attribute name="kind" value="function" id="1798" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setRating" id="1799" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(std::string,float,int,bool)." id="1800" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="1801" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca46999710" id="1802" addr="0x7fca46999710" />
+                                <parmlist id="1803" addr="0x7fca46999290" >
                                     <parm id="1804">
-                                        <attributelist id="1805" addr="0x7f99f1e4b290" >
-                                            <attribute name="name" value="type" id="1806" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="std::string" id="1807" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1805" addr="0x7fca46999290" >
+                                            <attribute name="name" value="type" id="1806" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="std::string" id="1807" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1808">
-                                        <attributelist id="1809" addr="0x7f99f1e4b3b0" >
-                                            <attribute name="name" value="rating" id="1810" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="float" id="1811" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1809" addr="0x7fca469993b0" >
+                                            <attribute name="name" value="rating" id="1810" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="float" id="1811" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1812">
-                                        <attributelist id="1813" addr="0x7f99f1e4b510" >
-                                            <attribute name="name" value="votes" id="1814" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="0" id="1815" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="1816" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1813" addr="0x7fca46999510" >
+                                            <attribute name="name" value="votes" id="1814" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="0" id="1815" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="1816" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1817">
-                                        <attributelist id="1818" addr="0x7f99f1e4b650" >
-                                            <attribute name="name" value="defaultt" id="1819" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="false" id="1820" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="1821" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1818" addr="0x7fca46999650" >
+                                            <attribute name="name" value="defaultt" id="1819" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="false" id="1820" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="1821" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="1822" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="1823" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="1822" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="1823" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="1824" addr="0x7f99f1e4b9d0" >
-                            <attributelist id="1825" addr="0x7f99f1e4b9d0" >
-                                <attribute name="name" value="setRating" id="1826" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="1827" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="1828" addr="0x7f99f1e478f0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e4b710" id="1829" addr="0x7f99f1e4b710" />
-                                <attribute name="kind" value="function" id="1830" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setRating" id="1831" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e4bbf0" id="1832" addr="0x7f99f1e4bbf0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e4bbf0" id="1833" addr="0x7f99f1e4bbf0" />
-                                <attribute name="defaultargs" value="0x7f99f1e4b710" id="1834" addr="0x7f99f1e4b710" />
-                                <attribute name="decl" value="f(std::string,float,int)." id="1835" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="1836" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e4b710" id="1837" addr="0x7f99f1e4b710" />
-                                <parmlist id="1838" addr="0x7f99f1e4b7b0" >
+                        <cdecl id="1824" addr="0x7fca469999d0" >
+                            <attributelist id="1825" addr="0x7fca469999d0" >
+                                <attribute name="name" value="setRating" id="1826" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="1827" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="1828" addr="0x7fca469958f0" />
+                                <attribute name="sym_previousSibling" value="0x7fca46999710" id="1829" addr="0x7fca46999710" />
+                                <attribute name="kind" value="function" id="1830" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setRating" id="1831" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca46999bf0" id="1832" addr="0x7fca46999bf0" />
+                                <attribute name="sym_nextSibling" value="0x7fca46999bf0" id="1833" addr="0x7fca46999bf0" />
+                                <attribute name="defaultargs" value="0x7fca46999710" id="1834" addr="0x7fca46999710" />
+                                <attribute name="decl" value="f(std::string,float,int)." id="1835" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="1836" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca46999710" id="1837" addr="0x7fca46999710" />
+                                <parmlist id="1838" addr="0x7fca469997b0" >
                                     <parm id="1839">
-                                        <attributelist id="1840" addr="0x7f99f1e4b7b0" >
-                                            <attribute name="name" value="type" id="1841" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="std::string" id="1842" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1840" addr="0x7fca469997b0" >
+                                            <attribute name="name" value="type" id="1841" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="std::string" id="1842" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1843">
-                                        <attributelist id="1844" addr="0x7f99f1e4b890" >
-                                            <attribute name="name" value="rating" id="1845" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="float" id="1846" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1844" addr="0x7fca46999890" >
+                                            <attribute name="name" value="rating" id="1845" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="float" id="1846" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1847">
-                                        <attributelist id="1848" addr="0x7f99f1e4b910" >
-                                            <attribute name="name" value="votes" id="1849" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="0" id="1850" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="1851" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1848" addr="0x7fca46999910" >
+                                            <attribute name="name" value="votes" id="1849" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="0" id="1850" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="1851" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="1852" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="1853" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="1852" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="1853" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="1854" addr="0x7f99f1e4bbf0" >
-                            <attributelist id="1855" addr="0x7f99f1e4bbf0" >
-                                <attribute name="name" value="setRating" id="1856" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="1857" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="1858" addr="0x7f99f1e478f0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e4b9d0" id="1859" addr="0x7f99f1e4b9d0" />
-                                <attribute name="kind" value="function" id="1860" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setRating" id="1861" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e4b710" id="1862" addr="0x7f99f1e4b710" />
-                                <attribute name="decl" value="f(std::string,float)." id="1863" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="1864" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e4b710" id="1865" addr="0x7f99f1e4b710" />
-                                <parmlist id="1866" addr="0x7f99f1e4ba70" >
+                        <cdecl id="1854" addr="0x7fca46999bf0" >
+                            <attributelist id="1855" addr="0x7fca46999bf0" >
+                                <attribute name="name" value="setRating" id="1856" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="1857" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="1858" addr="0x7fca469958f0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469999d0" id="1859" addr="0x7fca469999d0" />
+                                <attribute name="kind" value="function" id="1860" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setRating" id="1861" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca46999710" id="1862" addr="0x7fca46999710" />
+                                <attribute name="decl" value="f(std::string,float)." id="1863" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="1864" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca46999710" id="1865" addr="0x7fca46999710" />
+                                <parmlist id="1866" addr="0x7fca46999a70" >
                                     <parm id="1867">
-                                        <attributelist id="1868" addr="0x7f99f1e4ba70" >
-                                            <attribute name="name" value="type" id="1869" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="std::string" id="1870" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1868" addr="0x7fca46999a70" >
+                                            <attribute name="name" value="type" id="1869" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="std::string" id="1870" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1871">
-                                        <attributelist id="1872" addr="0x7f99f1e4bb50" >
-                                            <attribute name="name" value="rating" id="1873" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="float" id="1874" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1872" addr="0x7fca46999b50" >
+                                            <attribute name="name" value="rating" id="1873" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="float" id="1874" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="1875" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_2" id="1876" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="1875" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_2" id="1876" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="1877" addr="0x7f99f1e4c050" >
-                            <attributelist id="1878" addr="0x7f99f1e4c050" >
-                                <attribute name="name" value="addSeason" id="1879" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="1880" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="1881" addr="0x7f99f1e478f0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e4c1f0" id="1882" addr="0x7f99f1e4c1f0" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e4c1f0" id="1883" addr="0x7f99f1e4c1f0" />
-                                <attribute name="kind" value="function" id="1884" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="addSeason" id="1885" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(int,std::string)." id="1886" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="1887" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e4c050" id="1888" addr="0x7f99f1e4c050" />
-                                <parmlist id="1889" addr="0x7f99f1e4be10" >
+                        <cdecl id="1877" addr="0x7fca4699a050" >
+                            <attributelist id="1878" addr="0x7fca4699a050" >
+                                <attribute name="name" value="addSeason" id="1879" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="1880" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="1881" addr="0x7fca469958f0" />
+                                <attribute name="sym_nextSibling" value="0x7fca4699a1f0" id="1882" addr="0x7fca4699a1f0" />
+                                <attribute name="csym_nextSibling" value="0x7fca4699a1f0" id="1883" addr="0x7fca4699a1f0" />
+                                <attribute name="kind" value="function" id="1884" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="addSeason" id="1885" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(int,std::string)." id="1886" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="1887" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca4699a050" id="1888" addr="0x7fca4699a050" />
+                                <parmlist id="1889" addr="0x7fca46999e10" >
                                     <parm id="1890">
-                                        <attributelist id="1891" addr="0x7f99f1e4be10" >
-                                            <attribute name="name" value="number" id="1892" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="1893" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1891" addr="0x7fca46999e10" >
+                                            <attribute name="name" value="number" id="1892" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="1893" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1894">
-                                        <attributelist id="1895" addr="0x7f99f1e4bf90" >
-                                            <attribute name="name" value="name" id="1896" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="&quot;&quot;" id="1897" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="std::string" id="1898" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1895" addr="0x7fca46999f90" >
+                                            <attribute name="name" value="name" id="1896" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="&quot;&quot;" id="1897" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="std::string" id="1898" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="1899" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="1900" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="1899" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="1900" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="1901" addr="0x7f99f1e4c1f0" >
-                            <attributelist id="1902" addr="0x7f99f1e4c1f0" >
-                                <attribute name="name" value="addSeason" id="1903" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="1904" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="1905" addr="0x7f99f1e478f0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e4c050" id="1906" addr="0x7f99f1e4c050" />
-                                <attribute name="kind" value="function" id="1907" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="addSeason" id="1908" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e4c050" id="1909" addr="0x7f99f1e4c050" />
-                                <attribute name="decl" value="f(int)." id="1910" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="1911" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e4c050" id="1912" addr="0x7f99f1e4c050" />
-                                <parmlist id="1913" addr="0x7f99f1e4c0f0" >
+                        <cdecl id="1901" addr="0x7fca4699a1f0" >
+                            <attributelist id="1902" addr="0x7fca4699a1f0" >
+                                <attribute name="name" value="addSeason" id="1903" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="1904" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="1905" addr="0x7fca469958f0" />
+                                <attribute name="sym_previousSibling" value="0x7fca4699a050" id="1906" addr="0x7fca4699a050" />
+                                <attribute name="kind" value="function" id="1907" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="addSeason" id="1908" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca4699a050" id="1909" addr="0x7fca4699a050" />
+                                <attribute name="decl" value="f(int)." id="1910" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="1911" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca4699a050" id="1912" addr="0x7fca4699a050" />
+                                <parmlist id="1913" addr="0x7fca4699a0f0" >
                                     <parm id="1914">
-                                        <attributelist id="1915" addr="0x7f99f1e4c0f0" >
-                                            <attribute name="name" value="number" id="1916" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="1917" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1915" addr="0x7fca4699a0f0" >
+                                            <attribute name="name" value="number" id="1916" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="1917" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="1918" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="1919" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="1918" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="1919" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="1920" addr="0x7f99f1e4c510" >
-                            <attributelist id="1921" addr="0x7f99f1e4c510" >
-                                <attribute name="name" value="getArt" id="1922" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="1923" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="1924" addr="0x7f99f1e478f0" />
-                                <attribute name="kind" value="function" id="1925" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getArt" id="1926" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(p.q(const).char)." id="1927" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="1928" addr="0x7f99f1de6c90" />
-                                <parmlist id="1929" addr="0x7f99f1e4c450" >
+                        <cdecl id="1920" addr="0x7fca4699a510" >
+                            <attributelist id="1921" addr="0x7fca4699a510" >
+                                <attribute name="name" value="getArt" id="1922" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="1923" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="1924" addr="0x7fca469958f0" />
+                                <attribute name="kind" value="function" id="1925" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getArt" id="1926" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(p.q(const).char)." id="1927" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="1928" addr="0x7fca46934c90" />
+                                <parmlist id="1929" addr="0x7fca4699a450" >
                                     <parm id="1930">
-                                        <attributelist id="1931" addr="0x7f99f1e4c450" >
-                                            <attribute name="name" value="key" id="1932" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="1933" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1931" addr="0x7fca4699a450" >
+                                            <attribute name="name" value="key" id="1932" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="1933" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="XBMCAddon::String" id="1934" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="1935" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="XBMCAddon::String" id="1934" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="1935" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="1936" addr="0x7f99f1e4c830" >
-                            <attributelist id="1937" addr="0x7f99f1e4c830" >
-                                <attribute name="name" value="getUniqueID" id="1938" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="1939" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="1940" addr="0x7f99f1e478f0" />
-                                <attribute name="kind" value="function" id="1941" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getUniqueID" id="1942" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(p.q(const).char)." id="1943" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="1944" addr="0x7f99f1de6c90" />
-                                <parmlist id="1945" addr="0x7f99f1e4c770" >
+                        <cdecl id="1936" addr="0x7fca4699a830" >
+                            <attributelist id="1937" addr="0x7fca4699a830" >
+                                <attribute name="name" value="getUniqueID" id="1938" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="1939" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="1940" addr="0x7fca469958f0" />
+                                <attribute name="kind" value="function" id="1941" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getUniqueID" id="1942" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(p.q(const).char)." id="1943" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="1944" addr="0x7fca46934c90" />
+                                <parmlist id="1945" addr="0x7fca4699a770" >
                                     <parm id="1946">
-                                        <attributelist id="1947" addr="0x7f99f1e4c770" >
-                                            <attribute name="name" value="key" id="1948" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="1949" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1947" addr="0x7fca4699a770" >
+                                            <attribute name="name" value="key" id="1948" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="1949" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="XBMCAddon::String" id="1950" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="1951" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="XBMCAddon::String" id="1950" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="1951" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="1952" addr="0x7f99f1e4cb50" >
-                            <attributelist id="1953" addr="0x7f99f1e4cb50" >
-                                <attribute name="name" value="getRating" id="1954" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="1955" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="1956" addr="0x7f99f1e478f0" />
-                                <attribute name="kind" value="function" id="1957" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getRating" id="1958" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(p.q(const).char)." id="1959" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="1960" addr="0x7f99f1de6c90" />
-                                <parmlist id="1961" addr="0x7f99f1e4ca90" >
+                        <cdecl id="1952" addr="0x7fca4699ab50" >
+                            <attributelist id="1953" addr="0x7fca4699ab50" >
+                                <attribute name="name" value="getRating" id="1954" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="1955" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="1956" addr="0x7fca469958f0" />
+                                <attribute name="kind" value="function" id="1957" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getRating" id="1958" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(p.q(const).char)." id="1959" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="1960" addr="0x7fca46934c90" />
+                                <parmlist id="1961" addr="0x7fca4699aa90" >
                                     <parm id="1962">
-                                        <attributelist id="1963" addr="0x7f99f1e4ca90" >
-                                            <attribute name="name" value="key" id="1964" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="1965" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1963" addr="0x7fca4699aa90" >
+                                            <attribute name="name" value="key" id="1964" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="1965" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="float" id="1966" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="1967" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="float" id="1966" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="1967" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="1968" addr="0x7f99f1e4ce70" >
-                            <attributelist id="1969" addr="0x7f99f1e4ce70" >
-                                <attribute name="name" value="getVotes" id="1970" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="1971" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="1972" addr="0x7f99f1e478f0" />
-                                <attribute name="kind" value="function" id="1973" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getVotes" id="1974" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(p.q(const).char)." id="1975" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="1976" addr="0x7f99f1de6c90" />
-                                <parmlist id="1977" addr="0x7f99f1e4cdb0" >
+                        <cdecl id="1968" addr="0x7fca4699ae70" >
+                            <attributelist id="1969" addr="0x7fca4699ae70" >
+                                <attribute name="name" value="getVotes" id="1970" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="1971" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="1972" addr="0x7fca469958f0" />
+                                <attribute name="kind" value="function" id="1973" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getVotes" id="1974" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(p.q(const).char)." id="1975" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="1976" addr="0x7fca46934c90" />
+                                <parmlist id="1977" addr="0x7fca4699adb0" >
                                     <parm id="1978">
-                                        <attributelist id="1979" addr="0x7f99f1e4cdb0" >
-                                            <attribute name="name" value="key" id="1980" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="1981" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1979" addr="0x7fca4699adb0" >
+                                            <attribute name="name" value="key" id="1980" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="1981" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="int" id="1982" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="1983" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="int" id="1982" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="1983" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="1984" addr="0x7f99f1e4d130" >
-                            <attributelist id="1985" addr="0x7f99f1e4d130" >
-                                <attribute name="name" value="select" id="1986" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="1987" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="1988" addr="0x7f99f1e478f0" />
-                                <attribute name="kind" value="function" id="1989" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="select" id="1990" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(bool)." id="1991" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="1992" addr="0x7f99f1de6c90" />
-                                <parmlist id="1993" addr="0x7f99f1e4d070" >
+                        <cdecl id="1984" addr="0x7fca4699b130" >
+                            <attributelist id="1985" addr="0x7fca4699b130" >
+                                <attribute name="name" value="select" id="1986" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="1987" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="1988" addr="0x7fca469958f0" />
+                                <attribute name="kind" value="function" id="1989" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="select" id="1990" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(bool)." id="1991" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="1992" addr="0x7fca46934c90" />
+                                <parmlist id="1993" addr="0x7fca4699b070" >
                                     <parm id="1994">
-                                        <attributelist id="1995" addr="0x7f99f1e4d070" >
-                                            <attribute name="name" value="selected" id="1996" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="1997" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1995" addr="0x7fca4699b070" >
+                                            <attribute name="name" value="selected" id="1996" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="1997" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="1998" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="1999" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="1998" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="1999" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="2000" addr="0x7f99f1e4d2f0" >
-                            <attributelist id="2001" addr="0x7f99f1e4d2f0" >
-                                <attribute name="ismember" value="1" id="2002" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="isSelected" id="2003" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="isSelected" id="2004" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="2005" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="2006" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="2007" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="bool" id="2008" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="2009" addr="0x7f99f1e478f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2010" addr="0x7f99f1de6c90" />
+                        <cdecl id="2000" addr="0x7fca4699b2f0" >
+                            <attributelist id="2001" addr="0x7fca4699b2f0" >
+                                <attribute name="ismember" value="1" id="2002" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="isSelected" id="2003" addr="0x7fca46934c90" />
+                                <attribute name="name" value="isSelected" id="2004" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="2005" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="2006" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="2007" addr="0x7fca46934c90" />
+                                <attribute name="type" value="bool" id="2008" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="2009" addr="0x7fca469958f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2010" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="2011" addr="0x7f99f1e4d730" >
-                            <attributelist id="2012" addr="0x7f99f1e4d730" >
-                                <attribute name="name" value="setInfo" id="2013" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="2014" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="2015" addr="0x7f99f1e478f0" />
-                                <attribute name="kind" value="function" id="2016" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setInfo" id="2017" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(p.q(const).char,r.q(const).XBMCAddon::xbmcgui::InfoLabelDict)." id="2018" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="2019" addr="0x7f99f1de6c90" />
-                                <parmlist id="2020" addr="0x7f99f1e4d530" >
+                        <cdecl id="2011" addr="0x7fca4699b730" >
+                            <attributelist id="2012" addr="0x7fca4699b730" >
+                                <attribute name="name" value="setInfo" id="2013" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="2014" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="2015" addr="0x7fca469958f0" />
+                                <attribute name="kind" value="function" id="2016" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setInfo" id="2017" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(p.q(const).char,r.q(const).XBMCAddon::xbmcgui::InfoLabelDict)." id="2018" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="2019" addr="0x7fca46934c90" />
+                                <parmlist id="2020" addr="0x7fca4699b530" >
                                     <parm id="2021">
-                                        <attributelist id="2022" addr="0x7f99f1e4d530" >
-                                            <attribute name="name" value="type" id="2023" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="2024" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2022" addr="0x7fca4699b530" >
+                                            <attribute name="name" value="type" id="2023" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="2024" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="2025">
-                                        <attributelist id="2026" addr="0x7f99f1e4d670" >
-                                            <attribute name="name" value="infoLabels" id="2027" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::xbmcgui::InfoLabelDict" id="2028" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2026" addr="0x7fca4699b670" >
+                                            <attribute name="name" value="infoLabels" id="2027" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::xbmcgui::InfoLabelDict" id="2028" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="2029" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2030" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="2029" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2030" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="2031" addr="0x7f99f1e4db10" >
-                            <attributelist id="2032" addr="0x7f99f1e4db10" >
-                                <attribute name="name" value="setCast" id="2033" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="2034" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="2035" addr="0x7f99f1e478f0" />
-                                <attribute name="kind" value="function" id="2036" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setCast" id="2037" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).std::vector&lt;(XBMCAddon::Properties)>)." id="2038" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="2039" addr="0x7f99f1de6c90" />
-                                <parmlist id="2040" addr="0x7f99f1e4da50" >
+                        <cdecl id="2031" addr="0x7fca4699bb10" >
+                            <attributelist id="2032" addr="0x7fca4699bb10" >
+                                <attribute name="name" value="setCast" id="2033" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="2034" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="2035" addr="0x7fca469958f0" />
+                                <attribute name="kind" value="function" id="2036" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setCast" id="2037" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).std::vector&lt;(XBMCAddon::Properties)>)." id="2038" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="2039" addr="0x7fca46934c90" />
+                                <parmlist id="2040" addr="0x7fca4699ba50" >
                                     <parm id="2041">
-                                        <attributelist id="2042" addr="0x7f99f1e4da50" >
-                                            <attribute name="name" value="actors" id="2043" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).std::vector&lt;(XBMCAddon::Properties)>" id="2044" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2042" addr="0x7fca4699ba50" >
+                                            <attribute name="name" value="actors" id="2043" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).std::vector&lt;(XBMCAddon::Properties)>" id="2044" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="2045" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2046" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="2045" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2046" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="2047" addr="0x7f99f1e4def0" >
-                            <attributelist id="2048" addr="0x7f99f1e4def0" >
-                                <attribute name="name" value="setAvailableFanart" id="2049" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="2050" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="2051" addr="0x7f99f1e478f0" />
-                                <attribute name="kind" value="function" id="2052" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setAvailableFanart" id="2053" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).std::vector&lt;(XBMCAddon::Properties)>)." id="2054" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="2055" addr="0x7f99f1de6c90" />
-                                <parmlist id="2056" addr="0x7f99f1e4de30" >
+                        <cdecl id="2047" addr="0x7fca4699bef0" >
+                            <attributelist id="2048" addr="0x7fca4699bef0" >
+                                <attribute name="name" value="setAvailableFanart" id="2049" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="2050" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="2051" addr="0x7fca469958f0" />
+                                <attribute name="kind" value="function" id="2052" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setAvailableFanart" id="2053" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).std::vector&lt;(XBMCAddon::Properties)>)." id="2054" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="2055" addr="0x7fca46934c90" />
+                                <parmlist id="2056" addr="0x7fca4699be30" >
                                     <parm id="2057">
-                                        <attributelist id="2058" addr="0x7f99f1e4de30" >
-                                            <attribute name="name" value="images" id="2059" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).std::vector&lt;(XBMCAddon::Properties)>" id="2060" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2058" addr="0x7fca4699be30" >
+                                            <attribute name="name" value="images" id="2059" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).std::vector&lt;(XBMCAddon::Properties)>" id="2060" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="2061" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2062" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="2061" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2062" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="2063" addr="0x7f99f1e4ea70" >
-                            <attributelist id="2064" addr="0x7f99f1e4ea70" >
-                                <attribute name="name" value="addAvailableArtwork" id="2065" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="2066" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="2067" addr="0x7f99f1e478f0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e4ef30" id="2068" addr="0x7f99f1e4ef30" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e4ef30" id="2069" addr="0x7f99f1e4ef30" />
-                                <attribute name="kind" value="function" id="2070" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="addAvailableArtwork" id="2071" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(std::string,std::string,std::string,std::string,bool,bool,int)." id="2072" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="2073" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e4ea70" id="2074" addr="0x7f99f1e4ea70" />
-                                <parmlist id="2075" addr="0x7f99f1e4e130" >
+                        <cdecl id="2063" addr="0x7fca4699ca70" >
+                            <attributelist id="2064" addr="0x7fca4699ca70" >
+                                <attribute name="name" value="addAvailableArtwork" id="2065" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="2066" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="2067" addr="0x7fca469958f0" />
+                                <attribute name="sym_nextSibling" value="0x7fca4699cf30" id="2068" addr="0x7fca4699cf30" />
+                                <attribute name="csym_nextSibling" value="0x7fca4699cf30" id="2069" addr="0x7fca4699cf30" />
+                                <attribute name="kind" value="function" id="2070" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="addAvailableArtwork" id="2071" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(std::string,std::string,std::string,std::string,bool,bool,int)." id="2072" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="2073" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca4699ca70" id="2074" addr="0x7fca4699ca70" />
+                                <parmlist id="2075" addr="0x7fca4699c130" >
                                     <parm id="2076">
-                                        <attributelist id="2077" addr="0x7f99f1e4e130" >
-                                            <attribute name="name" value="url" id="2078" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="std::string" id="2079" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2077" addr="0x7fca4699c130" >
+                                            <attribute name="name" value="url" id="2078" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="std::string" id="2079" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="2080">
-                                        <attributelist id="2081" addr="0x7f99f1e4e2b0" >
-                                            <attribute name="name" value="art_type" id="2082" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="&quot;&quot;" id="2083" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="std::string" id="2084" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2081" addr="0x7fca4699c2b0" >
+                                            <attribute name="name" value="art_type" id="2082" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="&quot;&quot;" id="2083" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="std::string" id="2084" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="2085">
-                                        <attributelist id="2086" addr="0x7f99f1e4e430" >
-                                            <attribute name="name" value="referrer" id="2087" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="&quot;&quot;" id="2088" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="std::string" id="2089" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2086" addr="0x7fca4699c430" >
+                                            <attribute name="name" value="referrer" id="2087" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="&quot;&quot;" id="2088" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="std::string" id="2089" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="2090">
-                                        <attributelist id="2091" addr="0x7f99f1e4e5b0" >
-                                            <attribute name="name" value="cache" id="2092" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="&quot;&quot;" id="2093" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="std::string" id="2094" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2091" addr="0x7fca4699c5b0" >
+                                            <attribute name="name" value="cache" id="2092" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="&quot;&quot;" id="2093" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="std::string" id="2094" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="2095">
-                                        <attributelist id="2096" addr="0x7f99f1e4e6f0" >
-                                            <attribute name="name" value="post" id="2097" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="false" id="2098" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="2099" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2096" addr="0x7fca4699c6f0" >
+                                            <attribute name="name" value="post" id="2097" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="false" id="2098" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="2099" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="2100">
-                                        <attributelist id="2101" addr="0x7f99f1e4e830" >
-                                            <attribute name="name" value="isgz" id="2102" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="false" id="2103" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="2104" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2101" addr="0x7fca4699c830" >
+                                            <attribute name="name" value="isgz" id="2102" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="false" id="2103" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="2104" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="2105">
-                                        <attributelist id="2106" addr="0x7f99f1e4e9b0" >
-                                            <attribute name="name" value="season" id="2107" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="-1" id="2108" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="2109" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2106" addr="0x7fca4699c9b0" >
+                                            <attribute name="name" value="season" id="2107" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="-1" id="2108" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="2109" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="2110" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2111" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="2110" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2111" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="2112" addr="0x7f99f1e4ef30" >
-                            <attributelist id="2113" addr="0x7f99f1e4ef30" >
-                                <attribute name="name" value="addAvailableArtwork" id="2114" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="2115" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="2116" addr="0x7f99f1e478f0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e4ea70" id="2117" addr="0x7f99f1e4ea70" />
-                                <attribute name="kind" value="function" id="2118" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="addAvailableArtwork" id="2119" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e4f350" id="2120" addr="0x7f99f1e4f350" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e4f350" id="2121" addr="0x7f99f1e4f350" />
-                                <attribute name="defaultargs" value="0x7f99f1e4ea70" id="2122" addr="0x7f99f1e4ea70" />
-                                <attribute name="decl" value="f(std::string,std::string,std::string,std::string,bool,bool)." id="2123" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="2124" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e4ea70" id="2125" addr="0x7f99f1e4ea70" />
-                                <parmlist id="2126" addr="0x7f99f1e4eb10" >
+                        <cdecl id="2112" addr="0x7fca4699cf30" >
+                            <attributelist id="2113" addr="0x7fca4699cf30" >
+                                <attribute name="name" value="addAvailableArtwork" id="2114" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="2115" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="2116" addr="0x7fca469958f0" />
+                                <attribute name="sym_previousSibling" value="0x7fca4699ca70" id="2117" addr="0x7fca4699ca70" />
+                                <attribute name="kind" value="function" id="2118" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="addAvailableArtwork" id="2119" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca4699d350" id="2120" addr="0x7fca4699d350" />
+                                <attribute name="sym_nextSibling" value="0x7fca4699d350" id="2121" addr="0x7fca4699d350" />
+                                <attribute name="defaultargs" value="0x7fca4699ca70" id="2122" addr="0x7fca4699ca70" />
+                                <attribute name="decl" value="f(std::string,std::string,std::string,std::string,bool,bool)." id="2123" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="2124" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca4699ca70" id="2125" addr="0x7fca4699ca70" />
+                                <parmlist id="2126" addr="0x7fca4699cb10" >
                                     <parm id="2127">
-                                        <attributelist id="2128" addr="0x7f99f1e4eb10" >
-                                            <attribute name="name" value="url" id="2129" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="std::string" id="2130" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2128" addr="0x7fca4699cb10" >
+                                            <attribute name="name" value="url" id="2129" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="std::string" id="2130" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="2131">
-                                        <attributelist id="2132" addr="0x7f99f1e4ebf0" >
-                                            <attribute name="name" value="art_type" id="2133" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="&quot;&quot;" id="2134" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="std::string" id="2135" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2132" addr="0x7fca4699cbf0" >
+                                            <attribute name="name" value="art_type" id="2133" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="&quot;&quot;" id="2134" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="std::string" id="2135" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="2136">
-                                        <attributelist id="2137" addr="0x7f99f1e4ec90" >
-                                            <attribute name="name" value="referrer" id="2138" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="&quot;&quot;" id="2139" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="std::string" id="2140" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2137" addr="0x7fca4699cc90" >
+                                            <attribute name="name" value="referrer" id="2138" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="&quot;&quot;" id="2139" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="std::string" id="2140" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="2141">
-                                        <attributelist id="2142" addr="0x7f99f1e4ed30" >
-                                            <attribute name="name" value="cache" id="2143" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="&quot;&quot;" id="2144" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="std::string" id="2145" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2142" addr="0x7fca4699cd30" >
+                                            <attribute name="name" value="cache" id="2143" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="&quot;&quot;" id="2144" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="std::string" id="2145" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="2146">
-                                        <attributelist id="2147" addr="0x7f99f1e4edd0" >
-                                            <attribute name="name" value="post" id="2148" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="false" id="2149" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="2150" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2147" addr="0x7fca4699cdd0" >
+                                            <attribute name="name" value="post" id="2148" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="false" id="2149" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="2150" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="2151">
-                                        <attributelist id="2152" addr="0x7f99f1e4ee70" >
-                                            <attribute name="name" value="isgz" id="2153" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="false" id="2154" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="2155" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2152" addr="0x7fca4699ce70" >
+                                            <attribute name="name" value="isgz" id="2153" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="false" id="2154" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="2155" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="2156" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="2157" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="2156" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="2157" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="2158" addr="0x7f99f1e4f350" >
-                            <attributelist id="2159" addr="0x7f99f1e4f350" >
-                                <attribute name="name" value="addAvailableArtwork" id="2160" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="2161" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="2162" addr="0x7f99f1e478f0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e4ef30" id="2163" addr="0x7f99f1e4ef30" />
-                                <attribute name="kind" value="function" id="2164" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="addAvailableArtwork" id="2165" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e4f6d0" id="2166" addr="0x7f99f1e4f6d0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e4f6d0" id="2167" addr="0x7f99f1e4f6d0" />
-                                <attribute name="defaultargs" value="0x7f99f1e4ea70" id="2168" addr="0x7f99f1e4ea70" />
-                                <attribute name="decl" value="f(std::string,std::string,std::string,std::string,bool)." id="2169" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="2170" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e4ea70" id="2171" addr="0x7f99f1e4ea70" />
-                                <parmlist id="2172" addr="0x7f99f1e4efd0" >
+                        <cdecl id="2158" addr="0x7fca4699d350" >
+                            <attributelist id="2159" addr="0x7fca4699d350" >
+                                <attribute name="name" value="addAvailableArtwork" id="2160" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="2161" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="2162" addr="0x7fca469958f0" />
+                                <attribute name="sym_previousSibling" value="0x7fca4699cf30" id="2163" addr="0x7fca4699cf30" />
+                                <attribute name="kind" value="function" id="2164" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="addAvailableArtwork" id="2165" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca4699d6d0" id="2166" addr="0x7fca4699d6d0" />
+                                <attribute name="sym_nextSibling" value="0x7fca4699d6d0" id="2167" addr="0x7fca4699d6d0" />
+                                <attribute name="defaultargs" value="0x7fca4699ca70" id="2168" addr="0x7fca4699ca70" />
+                                <attribute name="decl" value="f(std::string,std::string,std::string,std::string,bool)." id="2169" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="2170" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca4699ca70" id="2171" addr="0x7fca4699ca70" />
+                                <parmlist id="2172" addr="0x7fca4699cfd0" >
                                     <parm id="2173">
-                                        <attributelist id="2174" addr="0x7f99f1e4efd0" >
-                                            <attribute name="name" value="url" id="2175" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="std::string" id="2176" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2174" addr="0x7fca4699cfd0" >
+                                            <attribute name="name" value="url" id="2175" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="std::string" id="2176" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="2177">
-                                        <attributelist id="2178" addr="0x7f99f1e4f0b0" >
-                                            <attribute name="name" value="art_type" id="2179" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="&quot;&quot;" id="2180" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="std::string" id="2181" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2178" addr="0x7fca4699d0b0" >
+                                            <attribute name="name" value="art_type" id="2179" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="&quot;&quot;" id="2180" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="std::string" id="2181" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="2182">
-                                        <attributelist id="2183" addr="0x7f99f1e4f150" >
-                                            <attribute name="name" value="referrer" id="2184" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="&quot;&quot;" id="2185" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="std::string" id="2186" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2183" addr="0x7fca4699d150" >
+                                            <attribute name="name" value="referrer" id="2184" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="&quot;&quot;" id="2185" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="std::string" id="2186" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="2187">
-                                        <attributelist id="2188" addr="0x7f99f1e4f1f0" >
-                                            <attribute name="name" value="cache" id="2189" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="&quot;&quot;" id="2190" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="std::string" id="2191" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2188" addr="0x7fca4699d1f0" >
+                                            <attribute name="name" value="cache" id="2189" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="&quot;&quot;" id="2190" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="std::string" id="2191" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="2192">
-                                        <attributelist id="2193" addr="0x7f99f1e4f290" >
-                                            <attribute name="name" value="post" id="2194" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="false" id="2195" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="2196" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2193" addr="0x7fca4699d290" >
+                                            <attribute name="name" value="post" id="2194" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="false" id="2195" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="2196" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="2197" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_2" id="2198" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="2197" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_2" id="2198" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="2199" addr="0x7f99f1e4f6d0" >
-                            <attributelist id="2200" addr="0x7f99f1e4f6d0" >
-                                <attribute name="name" value="addAvailableArtwork" id="2201" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="2202" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="2203" addr="0x7f99f1e478f0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e4f350" id="2204" addr="0x7f99f1e4f350" />
-                                <attribute name="kind" value="function" id="2205" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="addAvailableArtwork" id="2206" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e4f9b0" id="2207" addr="0x7f99f1e4f9b0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e4f9b0" id="2208" addr="0x7f99f1e4f9b0" />
-                                <attribute name="defaultargs" value="0x7f99f1e4ea70" id="2209" addr="0x7f99f1e4ea70" />
-                                <attribute name="decl" value="f(std::string,std::string,std::string,std::string)." id="2210" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="2211" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e4ea70" id="2212" addr="0x7f99f1e4ea70" />
-                                <parmlist id="2213" addr="0x7f99f1e4f3f0" >
+                        <cdecl id="2199" addr="0x7fca4699d6d0" >
+                            <attributelist id="2200" addr="0x7fca4699d6d0" >
+                                <attribute name="name" value="addAvailableArtwork" id="2201" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="2202" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="2203" addr="0x7fca469958f0" />
+                                <attribute name="sym_previousSibling" value="0x7fca4699d350" id="2204" addr="0x7fca4699d350" />
+                                <attribute name="kind" value="function" id="2205" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="addAvailableArtwork" id="2206" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca4699d9b0" id="2207" addr="0x7fca4699d9b0" />
+                                <attribute name="sym_nextSibling" value="0x7fca4699d9b0" id="2208" addr="0x7fca4699d9b0" />
+                                <attribute name="defaultargs" value="0x7fca4699ca70" id="2209" addr="0x7fca4699ca70" />
+                                <attribute name="decl" value="f(std::string,std::string,std::string,std::string)." id="2210" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="2211" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca4699ca70" id="2212" addr="0x7fca4699ca70" />
+                                <parmlist id="2213" addr="0x7fca4699d3f0" >
                                     <parm id="2214">
-                                        <attributelist id="2215" addr="0x7f99f1e4f3f0" >
-                                            <attribute name="name" value="url" id="2216" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="std::string" id="2217" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2215" addr="0x7fca4699d3f0" >
+                                            <attribute name="name" value="url" id="2216" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="std::string" id="2217" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="2218">
-                                        <attributelist id="2219" addr="0x7f99f1e4f4d0" >
-                                            <attribute name="name" value="art_type" id="2220" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="&quot;&quot;" id="2221" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="std::string" id="2222" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2219" addr="0x7fca4699d4d0" >
+                                            <attribute name="name" value="art_type" id="2220" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="&quot;&quot;" id="2221" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="std::string" id="2222" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="2223">
-                                        <attributelist id="2224" addr="0x7f99f1e4f570" >
-                                            <attribute name="name" value="referrer" id="2225" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="&quot;&quot;" id="2226" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="std::string" id="2227" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2224" addr="0x7fca4699d570" >
+                                            <attribute name="name" value="referrer" id="2225" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="&quot;&quot;" id="2226" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="std::string" id="2227" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="2228">
-                                        <attributelist id="2229" addr="0x7f99f1e4f610" >
-                                            <attribute name="name" value="cache" id="2230" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="&quot;&quot;" id="2231" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="std::string" id="2232" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2229" addr="0x7fca4699d610" >
+                                            <attribute name="name" value="cache" id="2230" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="&quot;&quot;" id="2231" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="std::string" id="2232" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="2233" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_3" id="2234" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="2233" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_3" id="2234" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="2235" addr="0x7f99f1e4f9b0" >
-                            <attributelist id="2236" addr="0x7f99f1e4f9b0" >
-                                <attribute name="name" value="addAvailableArtwork" id="2237" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="2238" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="2239" addr="0x7f99f1e478f0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e4f6d0" id="2240" addr="0x7f99f1e4f6d0" />
-                                <attribute name="kind" value="function" id="2241" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="addAvailableArtwork" id="2242" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e4fbf0" id="2243" addr="0x7f99f1e4fbf0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e4fbf0" id="2244" addr="0x7f99f1e4fbf0" />
-                                <attribute name="defaultargs" value="0x7f99f1e4ea70" id="2245" addr="0x7f99f1e4ea70" />
-                                <attribute name="decl" value="f(std::string,std::string,std::string)." id="2246" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="2247" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e4ea70" id="2248" addr="0x7f99f1e4ea70" />
-                                <parmlist id="2249" addr="0x7f99f1e4f770" >
+                        <cdecl id="2235" addr="0x7fca4699d9b0" >
+                            <attributelist id="2236" addr="0x7fca4699d9b0" >
+                                <attribute name="name" value="addAvailableArtwork" id="2237" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="2238" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="2239" addr="0x7fca469958f0" />
+                                <attribute name="sym_previousSibling" value="0x7fca4699d6d0" id="2240" addr="0x7fca4699d6d0" />
+                                <attribute name="kind" value="function" id="2241" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="addAvailableArtwork" id="2242" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca4699dbf0" id="2243" addr="0x7fca4699dbf0" />
+                                <attribute name="sym_nextSibling" value="0x7fca4699dbf0" id="2244" addr="0x7fca4699dbf0" />
+                                <attribute name="defaultargs" value="0x7fca4699ca70" id="2245" addr="0x7fca4699ca70" />
+                                <attribute name="decl" value="f(std::string,std::string,std::string)." id="2246" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="2247" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca4699ca70" id="2248" addr="0x7fca4699ca70" />
+                                <parmlist id="2249" addr="0x7fca4699d770" >
                                     <parm id="2250">
-                                        <attributelist id="2251" addr="0x7f99f1e4f770" >
-                                            <attribute name="name" value="url" id="2252" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="std::string" id="2253" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2251" addr="0x7fca4699d770" >
+                                            <attribute name="name" value="url" id="2252" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="std::string" id="2253" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="2254">
-                                        <attributelist id="2255" addr="0x7f99f1e4f850" >
-                                            <attribute name="name" value="art_type" id="2256" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="&quot;&quot;" id="2257" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="std::string" id="2258" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2255" addr="0x7fca4699d850" >
+                                            <attribute name="name" value="art_type" id="2256" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="&quot;&quot;" id="2257" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="std::string" id="2258" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="2259">
-                                        <attributelist id="2260" addr="0x7f99f1e4f8f0" >
-                                            <attribute name="name" value="referrer" id="2261" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="&quot;&quot;" id="2262" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="std::string" id="2263" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2260" addr="0x7fca4699d8f0" >
+                                            <attribute name="name" value="referrer" id="2261" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="&quot;&quot;" id="2262" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="std::string" id="2263" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="2264" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_4" id="2265" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="2264" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_4" id="2265" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="2266" addr="0x7f99f1e4fbf0" >
-                            <attributelist id="2267" addr="0x7f99f1e4fbf0" >
-                                <attribute name="name" value="addAvailableArtwork" id="2268" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="2269" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="2270" addr="0x7f99f1e478f0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e4f9b0" id="2271" addr="0x7f99f1e4f9b0" />
-                                <attribute name="kind" value="function" id="2272" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="addAvailableArtwork" id="2273" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e4fd90" id="2274" addr="0x7f99f1e4fd90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e4fd90" id="2275" addr="0x7f99f1e4fd90" />
-                                <attribute name="defaultargs" value="0x7f99f1e4ea70" id="2276" addr="0x7f99f1e4ea70" />
-                                <attribute name="decl" value="f(std::string,std::string)." id="2277" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="2278" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e4ea70" id="2279" addr="0x7f99f1e4ea70" />
-                                <parmlist id="2280" addr="0x7f99f1e4fa50" >
+                        <cdecl id="2266" addr="0x7fca4699dbf0" >
+                            <attributelist id="2267" addr="0x7fca4699dbf0" >
+                                <attribute name="name" value="addAvailableArtwork" id="2268" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="2269" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="2270" addr="0x7fca469958f0" />
+                                <attribute name="sym_previousSibling" value="0x7fca4699d9b0" id="2271" addr="0x7fca4699d9b0" />
+                                <attribute name="kind" value="function" id="2272" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="addAvailableArtwork" id="2273" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca4699dd90" id="2274" addr="0x7fca4699dd90" />
+                                <attribute name="sym_nextSibling" value="0x7fca4699dd90" id="2275" addr="0x7fca4699dd90" />
+                                <attribute name="defaultargs" value="0x7fca4699ca70" id="2276" addr="0x7fca4699ca70" />
+                                <attribute name="decl" value="f(std::string,std::string)." id="2277" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="2278" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca4699ca70" id="2279" addr="0x7fca4699ca70" />
+                                <parmlist id="2280" addr="0x7fca4699da50" >
                                     <parm id="2281">
-                                        <attributelist id="2282" addr="0x7f99f1e4fa50" >
-                                            <attribute name="name" value="url" id="2283" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="std::string" id="2284" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2282" addr="0x7fca4699da50" >
+                                            <attribute name="name" value="url" id="2283" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="std::string" id="2284" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="2285">
-                                        <attributelist id="2286" addr="0x7f99f1e4fb30" >
-                                            <attribute name="name" value="art_type" id="2287" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="&quot;&quot;" id="2288" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="std::string" id="2289" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2286" addr="0x7fca4699db30" >
+                                            <attribute name="name" value="art_type" id="2287" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="&quot;&quot;" id="2288" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="std::string" id="2289" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="2290" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_5" id="2291" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="2290" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_5" id="2291" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="2292" addr="0x7f99f1e4fd90" >
-                            <attributelist id="2293" addr="0x7f99f1e4fd90" >
-                                <attribute name="name" value="addAvailableArtwork" id="2294" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="2295" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="2296" addr="0x7f99f1e478f0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e4fbf0" id="2297" addr="0x7f99f1e4fbf0" />
-                                <attribute name="kind" value="function" id="2298" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="addAvailableArtwork" id="2299" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e4ea70" id="2300" addr="0x7f99f1e4ea70" />
-                                <attribute name="decl" value="f(std::string)." id="2301" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="2302" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e4ea70" id="2303" addr="0x7f99f1e4ea70" />
-                                <parmlist id="2304" addr="0x7f99f1e4fc90" >
+                        <cdecl id="2292" addr="0x7fca4699dd90" >
+                            <attributelist id="2293" addr="0x7fca4699dd90" >
+                                <attribute name="name" value="addAvailableArtwork" id="2294" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="2295" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="2296" addr="0x7fca469958f0" />
+                                <attribute name="sym_previousSibling" value="0x7fca4699dbf0" id="2297" addr="0x7fca4699dbf0" />
+                                <attribute name="kind" value="function" id="2298" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="addAvailableArtwork" id="2299" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca4699ca70" id="2300" addr="0x7fca4699ca70" />
+                                <attribute name="decl" value="f(std::string)." id="2301" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="2302" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca4699ca70" id="2303" addr="0x7fca4699ca70" />
+                                <parmlist id="2304" addr="0x7fca4699dc90" >
                                     <parm id="2305">
-                                        <attributelist id="2306" addr="0x7f99f1e4fc90" >
-                                            <attribute name="name" value="url" id="2307" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="std::string" id="2308" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2306" addr="0x7fca4699dc90" >
+                                            <attribute name="name" value="url" id="2307" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="std::string" id="2308" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="2309" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_6" id="2310" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="2309" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_6" id="2310" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="2311" addr="0x7f99f1e50210" >
-                            <attributelist id="2312" addr="0x7f99f1e50210" >
-                                <attribute name="name" value="addStreamInfo" id="2313" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="2314" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="2315" addr="0x7f99f1e478f0" />
-                                <attribute name="kind" value="function" id="2316" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="addStreamInfo" id="2317" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(p.q(const).char,r.q(const).XBMCAddon::Properties)." id="2318" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="2319" addr="0x7f99f1de6c90" />
-                                <parmlist id="2320" addr="0x7f99f1e50010" >
+                        <cdecl id="2311" addr="0x7fca4699e210" >
+                            <attributelist id="2312" addr="0x7fca4699e210" >
+                                <attribute name="name" value="addStreamInfo" id="2313" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="2314" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="2315" addr="0x7fca469958f0" />
+                                <attribute name="kind" value="function" id="2316" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="addStreamInfo" id="2317" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(p.q(const).char,r.q(const).XBMCAddon::Properties)." id="2318" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="2319" addr="0x7fca46934c90" />
+                                <parmlist id="2320" addr="0x7fca4699e010" >
                                     <parm id="2321">
-                                        <attributelist id="2322" addr="0x7f99f1e50010" >
-                                            <attribute name="name" value="cType" id="2323" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="2324" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2322" addr="0x7fca4699e010" >
+                                            <attribute name="name" value="cType" id="2323" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="2324" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="2325">
-                                        <attributelist id="2326" addr="0x7f99f1e50150" >
-                                            <attribute name="name" value="dictionary" id="2327" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::Properties" id="2328" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2326" addr="0x7fca4699e150" >
+                                            <attribute name="name" value="dictionary" id="2327" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::Properties" id="2328" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="2329" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2330" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="2329" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2330" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="2331" addr="0x7f99f1e50a30" >
-                            <attributelist id="2332" addr="0x7f99f1e50a30" >
-                                <attribute name="name" value="addContextMenuItems" id="2333" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="2334" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="2335" addr="0x7f99f1e478f0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e50bd0" id="2336" addr="0x7f99f1e50bd0" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e50bd0" id="2337" addr="0x7f99f1e50bd0" />
-                                <attribute name="kind" value="function" id="2338" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="addContextMenuItems" id="2339" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).std::vector&lt;(Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>)>,bool)." id="2340" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="2341" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e50a30" id="2342" addr="0x7f99f1e50a30" />
-                                <parmlist id="2343" addr="0x7f99f1e50950" >
+                        <cdecl id="2331" addr="0x7fca4699ea30" >
+                            <attributelist id="2332" addr="0x7fca4699ea30" >
+                                <attribute name="name" value="addContextMenuItems" id="2333" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="2334" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="2335" addr="0x7fca469958f0" />
+                                <attribute name="sym_nextSibling" value="0x7fca4699ebd0" id="2336" addr="0x7fca4699ebd0" />
+                                <attribute name="csym_nextSibling" value="0x7fca4699ebd0" id="2337" addr="0x7fca4699ebd0" />
+                                <attribute name="kind" value="function" id="2338" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="addContextMenuItems" id="2339" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).std::vector&lt;(Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>)>,bool)." id="2340" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="2341" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca4699ea30" id="2342" addr="0x7fca4699ea30" />
+                                <parmlist id="2343" addr="0x7fca4699e950" >
                                     <parm id="2344">
-                                        <attributelist id="2345" addr="0x7f99f1e50950" >
-                                            <attribute name="name" value="items" id="2346" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).std::vector&lt;(Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>)>" id="2347" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2345" addr="0x7fca4699e950" >
+                                            <attribute name="name" value="items" id="2346" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).std::vector&lt;(Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>)>" id="2347" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="2348">
-                                        <attributelist id="2349" addr="0x7f99f1e50970" >
-                                            <attribute name="name" value="replaceItems" id="2350" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="false" id="2351" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="2352" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2349" addr="0x7fca4699e970" >
+                                            <attribute name="name" value="replaceItems" id="2350" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="false" id="2351" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="2352" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="2353" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2354" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="2353" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2354" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="2355" addr="0x7f99f1e50bd0" >
-                            <attributelist id="2356" addr="0x7f99f1e50bd0" >
-                                <attribute name="name" value="addContextMenuItems" id="2357" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="2358" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="2359" addr="0x7f99f1e478f0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e50a30" id="2360" addr="0x7f99f1e50a30" />
-                                <attribute name="kind" value="function" id="2361" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="addContextMenuItems" id="2362" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e50a30" id="2363" addr="0x7f99f1e50a30" />
-                                <attribute name="decl" value="f(r.q(const).std::vector&lt;(Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>)>)." id="2364" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="2365" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e50a30" id="2366" addr="0x7f99f1e50a30" />
-                                <parmlist id="2367" addr="0x7f99f1e50ad0" >
+                        <cdecl id="2355" addr="0x7fca4699ebd0" >
+                            <attributelist id="2356" addr="0x7fca4699ebd0" >
+                                <attribute name="name" value="addContextMenuItems" id="2357" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="2358" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="2359" addr="0x7fca469958f0" />
+                                <attribute name="sym_previousSibling" value="0x7fca4699ea30" id="2360" addr="0x7fca4699ea30" />
+                                <attribute name="kind" value="function" id="2361" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="addContextMenuItems" id="2362" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca4699ea30" id="2363" addr="0x7fca4699ea30" />
+                                <attribute name="decl" value="f(r.q(const).std::vector&lt;(Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>)>)." id="2364" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="2365" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca4699ea30" id="2366" addr="0x7fca4699ea30" />
+                                <parmlist id="2367" addr="0x7fca4699ead0" >
                                     <parm id="2368">
-                                        <attributelist id="2369" addr="0x7f99f1e50ad0" >
-                                            <attribute name="name" value="items" id="2370" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).std::vector&lt;(Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>)>" id="2371" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2369" addr="0x7fca4699ead0" >
+                                            <attribute name="name" value="items" id="2370" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).std::vector&lt;(Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>)>" id="2371" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="2372" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="2373" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="2372" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="2373" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="2374" addr="0x7f99f1e51010" >
-                            <attributelist id="2375" addr="0x7f99f1e51010" >
-                                <attribute name="name" value="setProperty" id="2376" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="2377" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="2378" addr="0x7f99f1e478f0" />
-                                <attribute name="kind" value="function" id="2379" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setProperty" id="2380" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(p.q(const).char,r.q(const).XBMCAddon::String)." id="2381" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="2382" addr="0x7f99f1de6c90" />
-                                <parmlist id="2383" addr="0x7f99f1e50e10" >
+                        <cdecl id="2374" addr="0x7fca4699f010" >
+                            <attributelist id="2375" addr="0x7fca4699f010" >
+                                <attribute name="name" value="setProperty" id="2376" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="2377" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="2378" addr="0x7fca469958f0" />
+                                <attribute name="kind" value="function" id="2379" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setProperty" id="2380" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(p.q(const).char,r.q(const).XBMCAddon::String)." id="2381" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="2382" addr="0x7fca46934c90" />
+                                <parmlist id="2383" addr="0x7fca4699ee10" >
                                     <parm id="2384">
-                                        <attributelist id="2385" addr="0x7f99f1e50e10" >
-                                            <attribute name="name" value="key" id="2386" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="2387" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2385" addr="0x7fca4699ee10" >
+                                            <attribute name="name" value="key" id="2386" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="2387" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="2388">
-                                        <attributelist id="2389" addr="0x7f99f1e50f50" >
-                                            <attribute name="name" value="value" id="2390" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="2391" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2389" addr="0x7fca4699ef50" >
+                                            <attribute name="name" value="value" id="2390" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="2391" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="2392" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2393" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="2392" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2393" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="2394" addr="0x7f99f1e51310" >
-                            <attributelist id="2395" addr="0x7f99f1e51310" >
-                                <attribute name="name" value="setProperties" id="2396" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="2397" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="2398" addr="0x7f99f1e478f0" />
-                                <attribute name="kind" value="function" id="2399" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setProperties" id="2400" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::Properties)." id="2401" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="2402" addr="0x7f99f1de6c90" />
-                                <parmlist id="2403" addr="0x7f99f1e51250" >
+                        <cdecl id="2394" addr="0x7fca4699f310" >
+                            <attributelist id="2395" addr="0x7fca4699f310" >
+                                <attribute name="name" value="setProperties" id="2396" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="2397" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="2398" addr="0x7fca469958f0" />
+                                <attribute name="kind" value="function" id="2399" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setProperties" id="2400" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::Properties)." id="2401" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="2402" addr="0x7fca46934c90" />
+                                <parmlist id="2403" addr="0x7fca4699f250" >
                                     <parm id="2404">
-                                        <attributelist id="2405" addr="0x7f99f1e51250" >
-                                            <attribute name="name" value="dictionary" id="2406" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::Properties" id="2407" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2405" addr="0x7fca4699f250" >
+                                            <attribute name="name" value="dictionary" id="2406" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::Properties" id="2407" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="2408" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2409" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="2408" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2409" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="2410" addr="0x7f99f1e51630" >
-                            <attributelist id="2411" addr="0x7f99f1e51630" >
-                                <attribute name="name" value="getProperty" id="2412" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="2413" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="2414" addr="0x7f99f1e478f0" />
-                                <attribute name="kind" value="function" id="2415" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getProperty" id="2416" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(p.q(const).char)." id="2417" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="2418" addr="0x7f99f1de6c90" />
-                                <parmlist id="2419" addr="0x7f99f1e51570" >
+                        <cdecl id="2410" addr="0x7fca4699f630" >
+                            <attributelist id="2411" addr="0x7fca4699f630" >
+                                <attribute name="name" value="getProperty" id="2412" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="2413" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="2414" addr="0x7fca469958f0" />
+                                <attribute name="kind" value="function" id="2415" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getProperty" id="2416" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(p.q(const).char)." id="2417" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="2418" addr="0x7fca46934c90" />
+                                <parmlist id="2419" addr="0x7fca4699f570" >
                                     <parm id="2420">
-                                        <attributelist id="2421" addr="0x7f99f1e51570" >
-                                            <attribute name="name" value="key" id="2422" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="2423" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2421" addr="0x7fca4699f570" >
+                                            <attribute name="name" value="key" id="2422" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="2423" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="XBMCAddon::String" id="2424" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2425" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="XBMCAddon::String" id="2424" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2425" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="2426" addr="0x7f99f1e51930" >
-                            <attributelist id="2427" addr="0x7f99f1e51930" >
-                                <attribute name="name" value="setPath" id="2428" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="2429" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="2430" addr="0x7f99f1e478f0" />
-                                <attribute name="kind" value="function" id="2431" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setPath" id="2432" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="2433" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="2434" addr="0x7f99f1de6c90" />
-                                <parmlist id="2435" addr="0x7f99f1e51870" >
+                        <cdecl id="2426" addr="0x7fca4699f930" >
+                            <attributelist id="2427" addr="0x7fca4699f930" >
+                                <attribute name="name" value="setPath" id="2428" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="2429" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="2430" addr="0x7fca469958f0" />
+                                <attribute name="kind" value="function" id="2431" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setPath" id="2432" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="2433" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="2434" addr="0x7fca46934c90" />
+                                <parmlist id="2435" addr="0x7fca4699f870" >
                                     <parm id="2436">
-                                        <attributelist id="2437" addr="0x7f99f1e51870" >
-                                            <attribute name="name" value="path" id="2438" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="2439" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2437" addr="0x7fca4699f870" >
+                                            <attribute name="name" value="path" id="2438" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="2439" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="2440" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2441" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="2440" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2441" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="2442" addr="0x7f99f1e51c30" >
-                            <attributelist id="2443" addr="0x7f99f1e51c30" >
-                                <attribute name="name" value="setMimeType" id="2444" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="2445" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="2446" addr="0x7f99f1e478f0" />
-                                <attribute name="kind" value="function" id="2447" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setMimeType" id="2448" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="2449" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="2450" addr="0x7f99f1de6c90" />
-                                <parmlist id="2451" addr="0x7f99f1e51b70" >
+                        <cdecl id="2442" addr="0x7fca4699fc30" >
+                            <attributelist id="2443" addr="0x7fca4699fc30" >
+                                <attribute name="name" value="setMimeType" id="2444" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="2445" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="2446" addr="0x7fca469958f0" />
+                                <attribute name="kind" value="function" id="2447" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setMimeType" id="2448" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="2449" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="2450" addr="0x7fca46934c90" />
+                                <parmlist id="2451" addr="0x7fca4699fb70" >
                                     <parm id="2452">
-                                        <attributelist id="2453" addr="0x7f99f1e51b70" >
-                                            <attribute name="name" value="mimetype" id="2454" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="2455" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2453" addr="0x7fca4699fb70" >
+                                            <attribute name="name" value="mimetype" id="2454" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="2455" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="2456" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2457" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="2456" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2457" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="2458" addr="0x7f99f1e51ef0" >
-                            <attributelist id="2459" addr="0x7f99f1e51ef0" >
-                                <attribute name="name" value="setContentLookup" id="2460" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="2461" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="2462" addr="0x7f99f1e478f0" />
-                                <attribute name="kind" value="function" id="2463" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setContentLookup" id="2464" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(bool)." id="2465" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="2466" addr="0x7f99f1de6c90" />
-                                <parmlist id="2467" addr="0x7f99f1e51e30" >
+                        <cdecl id="2458" addr="0x7fca4699fef0" >
+                            <attributelist id="2459" addr="0x7fca4699fef0" >
+                                <attribute name="name" value="setContentLookup" id="2460" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="2461" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="2462" addr="0x7fca469958f0" />
+                                <attribute name="kind" value="function" id="2463" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setContentLookup" id="2464" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(bool)." id="2465" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="2466" addr="0x7fca46934c90" />
+                                <parmlist id="2467" addr="0x7fca4699fe30" >
                                     <parm id="2468">
-                                        <attributelist id="2469" addr="0x7f99f1e51e30" >
-                                            <attribute name="name" value="enable" id="2470" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="2471" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2469" addr="0x7fca4699fe30" >
+                                            <attribute name="name" value="enable" id="2470" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="2471" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="2472" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2473" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="2472" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2473" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="2474" addr="0x7f99f1e522d0" >
-                            <attributelist id="2475" addr="0x7f99f1e522d0" >
-                                <attribute name="name" value="setSubtitles" id="2476" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="2477" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="2478" addr="0x7f99f1e478f0" />
-                                <attribute name="kind" value="function" id="2479" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setSubtitles" id="2480" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).std::vector&lt;(XBMCAddon::String)>)." id="2481" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="2482" addr="0x7f99f1de6c90" />
-                                <parmlist id="2483" addr="0x7f99f1e52210" >
+                        <cdecl id="2474" addr="0x7fca469a02d0" >
+                            <attributelist id="2475" addr="0x7fca469a02d0" >
+                                <attribute name="name" value="setSubtitles" id="2476" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="2477" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="2478" addr="0x7fca469958f0" />
+                                <attribute name="kind" value="function" id="2479" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setSubtitles" id="2480" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).std::vector&lt;(XBMCAddon::String)>)." id="2481" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="2482" addr="0x7fca46934c90" />
+                                <parmlist id="2483" addr="0x7fca469a0210" >
                                     <parm id="2484">
-                                        <attributelist id="2485" addr="0x7f99f1e52210" >
-                                            <attribute name="name" value="subtitleFiles" id="2486" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).std::vector&lt;(XBMCAddon::String)>" id="2487" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2485" addr="0x7fca469a0210" >
+                                            <attribute name="name" value="subtitleFiles" id="2486" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).std::vector&lt;(XBMCAddon::String)>" id="2487" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="2488" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2489" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="2488" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2489" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="2490" addr="0x7f99f1e524b0" >
-                            <attributelist id="2491" addr="0x7f99f1e524b0" >
-                                <attribute name="ismember" value="1" id="2492" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getdescription" id="2493" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="getdescription" id="2494" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="2495" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="2496" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="2497" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="XBMCAddon::String" id="2498" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="2499" addr="0x7f99f1e478f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2500" addr="0x7f99f1de6c90" />
+                        <cdecl id="2490" addr="0x7fca469a04b0" >
+                            <attributelist id="2491" addr="0x7fca469a04b0" >
+                                <attribute name="ismember" value="1" id="2492" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getdescription" id="2493" addr="0x7fca46934c90" />
+                                <attribute name="name" value="getdescription" id="2494" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="2495" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="2496" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="2497" addr="0x7fca46934c90" />
+                                <attribute name="type" value="XBMCAddon::String" id="2498" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="2499" addr="0x7fca469958f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2500" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="2501" addr="0x7f99f1e52690" >
-                            <attributelist id="2502" addr="0x7f99f1e52690" >
-                                <attribute name="ismember" value="1" id="2503" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getduration" id="2504" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="getduration" id="2505" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="2506" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="2507" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="2508" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="XBMCAddon::String" id="2509" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="2510" addr="0x7f99f1e478f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2511" addr="0x7f99f1de6c90" />
+                        <cdecl id="2501" addr="0x7fca469a0690" >
+                            <attributelist id="2502" addr="0x7fca469a0690" >
+                                <attribute name="ismember" value="1" id="2503" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getduration" id="2504" addr="0x7fca46934c90" />
+                                <attribute name="name" value="getduration" id="2505" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="2506" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="2507" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="2508" addr="0x7fca46934c90" />
+                                <attribute name="type" value="XBMCAddon::String" id="2509" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="2510" addr="0x7fca469958f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2511" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="2512" addr="0x7f99f1e52870" >
-                            <attributelist id="2513" addr="0x7f99f1e52870" >
-                                <attribute name="ismember" value="1" id="2514" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getfilename" id="2515" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="getfilename" id="2516" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="2517" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="2518" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="2519" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="XBMCAddon::String" id="2520" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="2521" addr="0x7f99f1e478f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2522" addr="0x7f99f1de6c90" />
+                        <cdecl id="2512" addr="0x7fca469a0870" >
+                            <attributelist id="2513" addr="0x7fca469a0870" >
+                                <attribute name="ismember" value="1" id="2514" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getfilename" id="2515" addr="0x7fca46934c90" />
+                                <attribute name="name" value="getfilename" id="2516" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="2517" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="2518" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="2519" addr="0x7fca46934c90" />
+                                <attribute name="type" value="XBMCAddon::String" id="2520" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="2521" addr="0x7fca469958f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2522" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="2523" addr="0x7f99f1e52a50" >
-                            <attributelist id="2524" addr="0x7f99f1e52a50" >
-                                <attribute name="ismember" value="1" id="2525" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getPath" id="2526" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="getPath" id="2527" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="2528" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="2529" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="2530" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="XBMCAddon::String" id="2531" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="2532" addr="0x7f99f1e478f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2533" addr="0x7f99f1de6c90" />
+                        <cdecl id="2523" addr="0x7fca469a0a50" >
+                            <attributelist id="2524" addr="0x7fca469a0a50" >
+                                <attribute name="ismember" value="1" id="2525" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getPath" id="2526" addr="0x7fca46934c90" />
+                                <attribute name="name" value="getPath" id="2527" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="2528" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="2529" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="2530" addr="0x7fca46934c90" />
+                                <attribute name="type" value="XBMCAddon::String" id="2531" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="2532" addr="0x7fca469958f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2533" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="2534" addr="0x7f99f1e52c30" >
-                            <attributelist id="2535" addr="0x7f99f1e52c30" >
-                                <attribute name="ismember" value="1" id="2536" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getVideoInfoTag" id="2537" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="getVideoInfoTag" id="2538" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f().p." id="2539" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="2540" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="2541" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="xbmc::InfoTagVideo" id="2542" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="2543" addr="0x7f99f1e478f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2544" addr="0x7f99f1de6c90" />
+                        <cdecl id="2534" addr="0x7fca469a0c30" >
+                            <attributelist id="2535" addr="0x7fca469a0c30" >
+                                <attribute name="ismember" value="1" id="2536" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getVideoInfoTag" id="2537" addr="0x7fca46934c90" />
+                                <attribute name="name" value="getVideoInfoTag" id="2538" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f().p." id="2539" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="2540" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="2541" addr="0x7fca46934c90" />
+                                <attribute name="type" value="xbmc::InfoTagVideo" id="2542" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="2543" addr="0x7fca469958f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2544" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="2545" addr="0x7f99f1e52e30" >
-                            <attributelist id="2546" addr="0x7f99f1e52e30" >
-                                <attribute name="ismember" value="1" id="2547" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getMusicInfoTag" id="2548" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="getMusicInfoTag" id="2549" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f().p." id="2550" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="2551" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="2552" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="xbmc::InfoTagMusic" id="2553" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="2554" addr="0x7f99f1e478f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2555" addr="0x7f99f1de6c90" />
+                        <cdecl id="2545" addr="0x7fca469a0e30" >
+                            <attributelist id="2546" addr="0x7fca469a0e30" >
+                                <attribute name="ismember" value="1" id="2547" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getMusicInfoTag" id="2548" addr="0x7fca46934c90" />
+                                <attribute name="name" value="getMusicInfoTag" id="2549" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f().p." id="2550" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="2551" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="2552" addr="0x7fca46934c90" />
+                                <attribute name="type" value="xbmc::InfoTagMusic" id="2553" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="2554" addr="0x7fca469958f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2555" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <access id="2556" addr="0x7f99f1e52ef0" >
-                            <attributelist id="2557" addr="0x7f99f1e52ef0" >
-                                <attribute name="kind" value="private" id="2558" addr="0x7f99f1de6c90" />
+                        <access id="2556" addr="0x7fca469a0ef0" >
+                            <attributelist id="2557" addr="0x7fca469a0ef0" >
+                                <attribute name="kind" value="private" id="2558" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </access >
-                        <cdecl id="2559" addr="0x7f99f1e535b0" >
-                            <attributelist id="2560" addr="0x7f99f1e535b0" >
-                                <attribute name="ismember" value="1" id="2561" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="getStringArray" id="2562" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::xbmcgui::InfoLabelValue,r.q(const).std::string,std::string)." id="2563" addr="0x7f99f1de6c90" />
-                                <parmlist id="2564" addr="0x7f99f1e53210" >
+                        <cdecl id="2559" addr="0x7fca469a15b0" >
+                            <attributelist id="2560" addr="0x7fca469a15b0" >
+                                <attribute name="ismember" value="1" id="2561" addr="0x7fca46934c90" />
+                                <attribute name="name" value="getStringArray" id="2562" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::xbmcgui::InfoLabelValue,r.q(const).std::string,std::string)." id="2563" addr="0x7fca46934c90" />
+                                <parmlist id="2564" addr="0x7fca469a1210" >
                                     <parm id="2565">
-                                        <attributelist id="2566" addr="0x7f99f1e53210" >
-                                            <attribute name="name" value="alt" id="2567" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::xbmcgui::InfoLabelValue" id="2568" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2566" addr="0x7fca469a1210" >
+                                            <attribute name="name" value="alt" id="2567" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::xbmcgui::InfoLabelValue" id="2568" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="2569">
-                                        <attributelist id="2570" addr="0x7f99f1e53370" >
-                                            <attribute name="name" value="tag" id="2571" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).std::string" id="2572" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2570" addr="0x7fca469a1370" >
+                                            <attribute name="name" value="tag" id="2571" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).std::string" id="2572" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="2573">
-                                        <attributelist id="2574" addr="0x7f99f1e534f0" >
-                                            <attribute name="name" value="value" id="2575" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="&quot;&quot;" id="2576" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="std::string" id="2577" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2574" addr="0x7fca469a14f0" >
+                                            <attribute name="name" value="value" id="2575" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="&quot;&quot;" id="2576" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="std::string" id="2577" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="access" value="private" id="2578" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="2579" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="std::vector&lt;(std::string)>" id="2580" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e53790" id="2581" addr="0x7f99f1e53790" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="2582" addr="0x7f99f1e478f0" />
+                                <attribute name="access" value="private" id="2578" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="2579" addr="0x7fca46934c90" />
+                                <attribute name="type" value="std::vector&lt;(std::string)>" id="2580" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469a1790" id="2581" addr="0x7fca469a1790" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="2582" addr="0x7fca469958f0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="2583" addr="0x7f99f1e53790" >
-                            <attributelist id="2584" addr="0x7f99f1e53790" >
-                                <attribute name="ismember" value="1" id="2585" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="getStringArray" id="2586" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::xbmcgui::InfoLabelValue,r.q(const).std::string)." id="2587" addr="0x7f99f1de6c90" />
-                                <parmlist id="2588" addr="0x7f99f1e536d0" >
+                        <cdecl id="2583" addr="0x7fca469a1790" >
+                            <attributelist id="2584" addr="0x7fca469a1790" >
+                                <attribute name="ismember" value="1" id="2585" addr="0x7fca46934c90" />
+                                <attribute name="name" value="getStringArray" id="2586" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::xbmcgui::InfoLabelValue,r.q(const).std::string)." id="2587" addr="0x7fca46934c90" />
+                                <parmlist id="2588" addr="0x7fca469a16d0" >
                                     <parm id="2589">
-                                        <attributelist id="2590" addr="0x7f99f1e536d0" >
-                                            <attribute name="name" value="alt" id="2591" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::xbmcgui::InfoLabelValue" id="2592" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2590" addr="0x7fca469a16d0" >
+                                            <attribute name="name" value="alt" id="2591" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::xbmcgui::InfoLabelValue" id="2592" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="2593">
-                                        <attributelist id="2594" addr="0x7f99f1e536f0" >
-                                            <attribute name="name" value="tag" id="2595" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).std::string" id="2596" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2594" addr="0x7fca469a16f0" >
+                                            <attribute name="name" value="tag" id="2595" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).std::string" id="2596" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="access" value="private" id="2597" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="2598" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e535b0" id="2599" addr="0x7f99f1e535b0" />
-                                <attribute name="type" value="std::vector&lt;(std::string)>" id="2600" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="2601" addr="0x7f99f1e478f0" />
+                                <attribute name="access" value="private" id="2597" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="2598" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469a15b0" id="2599" addr="0x7fca469a15b0" />
+                                <attribute name="type" value="std::vector&lt;(std::string)>" id="2600" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="2601" addr="0x7fca469958f0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="2602" addr="0x7f99f1e53910" >
-                            <attributelist id="2603" addr="0x7f99f1e53910" >
-                                <attribute name="ismember" value="1" id="2604" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="GetVideoInfoTag" id="2605" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f().p." id="2606" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="private" id="2607" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="2608" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="CVideoInfoTag" id="2609" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e53b10" id="2610" addr="0x7f99f1e53b10" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="2611" addr="0x7f99f1e478f0" />
+                        <cdecl id="2602" addr="0x7fca469a1910" >
+                            <attributelist id="2603" addr="0x7fca469a1910" >
+                                <attribute name="ismember" value="1" id="2604" addr="0x7fca46934c90" />
+                                <attribute name="name" value="GetVideoInfoTag" id="2605" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f().p." id="2606" addr="0x7fca46934c90" />
+                                <attribute name="access" value="private" id="2607" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="2608" addr="0x7fca46934c90" />
+                                <attribute name="type" value="CVideoInfoTag" id="2609" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469a1b10" id="2610" addr="0x7fca469a1b10" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="2611" addr="0x7fca469958f0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="2612" addr="0x7f99f1e53b10" >
-                            <attributelist id="2613" addr="0x7f99f1e53b10" >
-                                <attribute name="ismember" value="1" id="2614" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="GetVideoInfoTag" id="2615" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="q(const).f().p." id="2616" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="private" id="2617" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="2618" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="q(const).CVideoInfoTag" id="2619" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="2620" addr="0x7f99f1e478f0" />
+                        <cdecl id="2612" addr="0x7fca469a1b10" >
+                            <attributelist id="2613" addr="0x7fca469a1b10" >
+                                <attribute name="ismember" value="1" id="2614" addr="0x7fca46934c90" />
+                                <attribute name="name" value="GetVideoInfoTag" id="2615" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="q(const).f().p." id="2616" addr="0x7fca46934c90" />
+                                <attribute name="access" value="private" id="2617" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="2618" addr="0x7fca46934c90" />
+                                <attribute name="type" value="q(const).CVideoInfoTag" id="2619" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="2620" addr="0x7fca469958f0" />
                             </attributelist >
                          
                         </cdecl >
-                        <access id="2621" addr="0x7f99f1e53c10" >
-                            <attributelist id="2622" addr="0x7f99f1e53c10" >
-                                <attribute name="kind" value="public" id="2623" addr="0x7f99f1de6c90" />
+                        <access id="2621" addr="0x7fca469a1c10" >
+                            <attributelist id="2622" addr="0x7fca469a1c10" >
+                                <attribute name="kind" value="public" id="2623" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </access >
                     </class >
-                    <cdecl id="2624" addr="0x7f99f1e53e70" >
-                        <attributelist id="2625" addr="0x7f99f1e53e70" >
-                            <attribute name="sym_name" value="ListItemList" id="2626" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="XBMCAddon::xbmcgui::ListItemList" id="2627" addr="0x7f99f1de6c90" />
-                            <attribute name="decl" value="" id="2628" addr="0x7f99f1de6c90" />
-                            <attribute name="storage" value="typedef" id="2629" addr="0x7f99f1de6c90" />
-                            <attribute name="kind" value="typedef" id="2630" addr="0x7f99f1de6c90" />
-                            <attribute name="type" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="2631" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="2632" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="2633" addr="0x7f99f1de6c90" />
+                    <cdecl id="2624" addr="0x7fca469a1e70" >
+                        <attributelist id="2625" addr="0x7fca469a1e70" >
+                            <attribute name="sym_name" value="ListItemList" id="2626" addr="0x7fca46934c90" />
+                            <attribute name="name" value="XBMCAddon::xbmcgui::ListItemList" id="2627" addr="0x7fca46934c90" />
+                            <attribute name="decl" value="" id="2628" addr="0x7fca46934c90" />
+                            <attribute name="storage" value="typedef" id="2629" addr="0x7fca46934c90" />
+                            <attribute name="kind" value="typedef" id="2630" addr="0x7fca46934c90" />
+                            <attribute name="type" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="2631" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="2632" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="2633" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </cdecl >
                 </namespace >
             </namespace >
         </include >
-        <include id="2634" addr="0x7f99f1e54410" >
-            <attributelist id="2635" addr="0x7f99f1e54410" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/Control.h" id="2636" addr="0x7f99f1de6c90" />
+        <include id="2634" addr="0x7fca469a2410" >
+            <attributelist id="2635" addr="0x7fca469a2410" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/Control.h" id="2636" addr="0x7fca46934c90" />
             </attributelist >
 
-            <constant id="2637" addr="0x7f99f1e544d0" >
-                <attributelist id="2638" addr="0x7f99f1e544d0" >
-                    <attribute name="sym_name" value="CONTROL_TEXT_OFFSET_X" id="2639" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="CONTROL_TEXT_OFFSET_X" id="2640" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="10" id="2641" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="2642" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="10" id="2643" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="2644" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="2645" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="2646" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="2647" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="2648" addr="0x7f99f1e54630" >
-                <attributelist id="2649" addr="0x7f99f1e54630" >
-                    <attribute name="sym_name" value="CONTROL_TEXT_OFFSET_Y" id="2650" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="CONTROL_TEXT_OFFSET_Y" id="2651" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="2" id="2652" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="2653" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="2" id="2654" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="2655" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="2656" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="2657" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="2658" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <namespace id="2659" addr="0x7f99f1e54770" >
-                <attributelist id="2660" addr="0x7f99f1e54770" >
-                    <attribute name="sym_name" value="XBMCAddon" id="2661" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="XBMCAddon" id="2662" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_previousSibling" value="0x7f99f1e462b0" id="2663" addr="0x7f99f1e462b0" />
-                    <attribute name="csym_nextSibling" value="0x7f99f1e967b0" id="2664" addr="0x7f99f1e967b0" />
-                    <attribute name="sym_nextSibling" value="0x7f99f1e967b0" id="2665" addr="0x7f99f1e967b0" />
-                    <typescope id="2666" addr="0x7f99f1dd1d70" >
-                        <attributelist id="2667" addr="0x7f99f1dd1d70" >
-                            <attribute name="name" value="XBMCAddon" id="2668" addr="0x7f99f1de6c90" />
-                            <typetab id="2669" addr="0x7f99f1dd1db0" >
-                                <attributelist id="2670" addr="0x7f99f1dd1db0" >
-                                    <attribute name="Dictionary" value="Dictionary" id="2671" addr="0x7f99f1de6c90" />
-                                    <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="2672" addr="0x7f99f1de6c90" />
-                                    <attribute name="String" value="std::string" id="2673" addr="0x7f99f1de6c90" />
-                                    <attribute name="StringOrInt" value="XBMCAddon::String" id="2674" addr="0x7f99f1de6c90" />
+            <constant id="2637" addr="0x7fca469a24d0" >
+                <attributelist id="2638" addr="0x7fca469a24d0" >
+                    <attribute name="sym_name" value="CONTROL_TEXT_OFFSET_X" id="2639" addr="0x7fca46934c90" />
+                    <attribute name="name" value="CONTROL_TEXT_OFFSET_X" id="2640" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="10" id="2641" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="2642" addr="0x7fca46934c90" />
+                    <attribute name="value" value="10" id="2643" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="2644" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="2645" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="2646" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="2647" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="2648" addr="0x7fca469a2630" >
+                <attributelist id="2649" addr="0x7fca469a2630" >
+                    <attribute name="sym_name" value="CONTROL_TEXT_OFFSET_Y" id="2650" addr="0x7fca46934c90" />
+                    <attribute name="name" value="CONTROL_TEXT_OFFSET_Y" id="2651" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="2" id="2652" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="2653" addr="0x7fca46934c90" />
+                    <attribute name="value" value="2" id="2654" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="2655" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="2656" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="2657" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="2658" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <namespace id="2659" addr="0x7fca469a2770" >
+                <attributelist id="2660" addr="0x7fca469a2770" >
+                    <attribute name="sym_name" value="XBMCAddon" id="2661" addr="0x7fca46934c90" />
+                    <attribute name="name" value="XBMCAddon" id="2662" addr="0x7fca46934c90" />
+                    <attribute name="sym_previousSibling" value="0x7fca469942b0" id="2663" addr="0x7fca469942b0" />
+                    <attribute name="csym_nextSibling" value="0x7fca469e47b0" id="2664" addr="0x7fca469e47b0" />
+                    <attribute name="sym_nextSibling" value="0x7fca469e47b0" id="2665" addr="0x7fca469e47b0" />
+                    <typescope id="2666" addr="0x7fca4691fd70" >
+                        <attributelist id="2667" addr="0x7fca4691fd70" >
+                            <attribute name="name" value="XBMCAddon" id="2668" addr="0x7fca46934c90" />
+                            <typetab id="2669" addr="0x7fca4691fdb0" >
+                                <attributelist id="2670" addr="0x7fca4691fdb0" >
+                                    <attribute name="Dictionary" value="Dictionary" id="2671" addr="0x7fca46934c90" />
+                                    <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="2672" addr="0x7fca46934c90" />
+                                    <attribute name="String" value="std::string" id="2673" addr="0x7fca46934c90" />
+                                    <attribute name="StringOrInt" value="XBMCAddon::String" id="2674" addr="0x7fca46934c90" />
                                 </attributelist >
-                                <typetabsitem id="2675" addr="0x7f99f1dd28b0" >
-                                    <attributelist id="2676" addr="0x7f99f1dd28b0" >
+                                <typetabsitem id="2675" addr="0x7fca469208b0" >
+                                    <attributelist id="2676" addr="0x7fca469208b0" >
                                     </attributelist >
                                 </typetabsitem >
-                                <typetabsitem id="2677" addr="0x7f99f1dd2910" >
-                                    <attributelist id="2678" addr="0x7f99f1dd2910" >
+                                <typetabsitem id="2677" addr="0x7fca46920910" >
+                                    <attributelist id="2678" addr="0x7fca46920910" >
                                     </attributelist >
                                 </typetabsitem >
-                                <typetabsitem id="2679" addr="0x7f99f1dd1f90" >
-                                    <attributelist id="2680" addr="0x7f99f1dd1f90" >
+                                <typetabsitem id="2679" addr="0x7fca4691ff90" >
+                                    <attributelist id="2680" addr="0x7fca4691ff90" >
                                     </attributelist >
                                 </typetabsitem >
-                                <typetabsitem id="2681" addr="0x7f99f1dd2710" >
-                                    <attributelist id="2682" addr="0x7f99f1dd2710" >
+                                <typetabsitem id="2681" addr="0x7fca46920710" >
+                                    <attributelist id="2682" addr="0x7fca46920710" >
                                     </attributelist >
                                 </typetabsitem >
                             </typetab >
-                            <attribute name="parent" value="0x7f99f1e1da30" id="2683" addr="0x7f99f1e1da30" />
-                            <attribute name="qname" value="XBMCAddon" id="2684" addr="0x7f99f1de6c90" />
-                            <attribute name="symtab" value="0x7f99f1e408b0" id="2685" addr="0x7f99f1e408b0" />
+                            <attribute name="parent" value="0x7fca4696ba30" id="2683" addr="0x7fca4696ba30" />
+                            <attribute name="qname" value="XBMCAddon" id="2684" addr="0x7fca46934c90" />
+                            <attribute name="symtab" value="0x7fca4698e8b0" id="2685" addr="0x7fca4698e8b0" />
                         </attributelist >
-                        <typescopesitem id="2686" addr="0x7f99f1e40870" >
-                            <attributelist id="2687" addr="0x7f99f1e40870" >
+                        <typescopesitem id="2686" addr="0x7fca4698e870" >
+                            <attributelist id="2687" addr="0x7fca4698e870" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="2688" addr="0x7f99f1dd1db0" >
-                            <attributelist id="2689" addr="0x7f99f1dd1db0" >
-                                <attribute name="Dictionary" value="Dictionary" id="2690" addr="0x7f99f1de6c90" />
-                                <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="2691" addr="0x7f99f1de6c90" />
-                                <attribute name="String" value="std::string" id="2692" addr="0x7f99f1de6c90" />
-                                <attribute name="StringOrInt" value="XBMCAddon::String" id="2693" addr="0x7f99f1de6c90" />
+                        <typescopesitem id="2688" addr="0x7fca4691fdb0" >
+                            <attributelist id="2689" addr="0x7fca4691fdb0" >
+                                <attribute name="Dictionary" value="Dictionary" id="2690" addr="0x7fca46934c90" />
+                                <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="2691" addr="0x7fca46934c90" />
+                                <attribute name="String" value="std::string" id="2692" addr="0x7fca46934c90" />
+                                <attribute name="StringOrInt" value="XBMCAddon::String" id="2693" addr="0x7fca46934c90" />
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="2694" addr="0x7f99f1e1da30" >
-                            <attributelist id="2695" addr="0x7f99f1e1da30" >
-                                <attribute name="name" value="" id="2696" addr="0x7f99f1de6c90" />
-                                <typetab id="2697" addr="0x7f99f1e1da90" >
-                                    <attributelist id="2698" addr="0x7f99f1e1da90" >
+                        <typescopesitem id="2694" addr="0x7fca4696ba30" >
+                            <attributelist id="2695" addr="0x7fca4696ba30" >
+                                <attribute name="name" value="" id="2696" addr="0x7fca46934c90" />
+                                <typetab id="2697" addr="0x7fca4696ba90" >
+                                    <attributelist id="2698" addr="0x7fca4696ba90" >
                                     </attributelist >
                                 </typetab >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="2699" addr="0x7f99f1dd1eb0" >
-                            <attributelist id="2700" addr="0x7f99f1dd1eb0" >
+                        <typescopesitem id="2699" addr="0x7fca4691feb0" >
+                            <attributelist id="2700" addr="0x7fca4691feb0" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="2701" addr="0x7f99f1e408b0" >
-                            <attributelist id="2702" addr="0x7f99f1e408b0" >
-                                <attribute name="name" value="XBMCAddon" id="2703" addr="0x7f99f1de6c90" />
-                                <attribute name="csymtab" value="0x7f99f1e408f0" id="2704" addr="0x7f99f1e408f0" />
-                                <attribute name="symtab" value="0x7f99f1e40890" id="2705" addr="0x7f99f1e40890" />
+                        <typescopesitem id="2701" addr="0x7fca4698e8b0" >
+                            <attributelist id="2702" addr="0x7fca4698e8b0" >
+                                <attribute name="name" value="XBMCAddon" id="2703" addr="0x7fca46934c90" />
+                                <attribute name="csymtab" value="0x7fca4698e8f0" id="2704" addr="0x7fca4698e8f0" />
+                                <attribute name="symtab" value="0x7fca4698e890" id="2705" addr="0x7fca4698e890" />
                             </attributelist >
                         </typescopesitem >
                     </typescope >
-                    <attribute name="symtab" value="0x7f99f1e408b0" id="2706" addr="0x7f99f1e408b0" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="2707" addr="0x7f99f1e1d950" />
+                    <attribute name="symtab" value="0x7fca4698e8b0" id="2706" addr="0x7fca4698e8b0" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="2707" addr="0x7fca4696b950" />
                 </attributelist >
 
-                <namespace id="2708" addr="0x7f99f1e547f0" >
-                    <attributelist id="2709" addr="0x7f99f1e547f0" >
-                        <attribute name="feature_knownbasetypes" value="AddonClass,AddonCallback" id="2710" addr="0x7f99f1de6c90" />
-                        <attribute name="name" value="xbmcgui" id="2711" addr="0x7f99f1de6c90" />
-                        <attribute name="sym_symtab" value="0x7f99f1e408b0" id="2712" addr="0x7f99f1e408b0" />
-                        <attribute name="symtab" value="0x7f99f1e40fb0" id="2713" addr="0x7f99f1e40fb0" />
-                        <attribute name="sym_nextSibling" value="0x7f99f1e96830" id="2714" addr="0x7f99f1e96830" />
-                        <attribute name="csym_nextSibling" value="0x7f99f1e96830" id="2715" addr="0x7f99f1e96830" />
-                        <attribute name="sym_previousSibling" value="0x7f99f1e46490" id="2716" addr="0x7f99f1e46490" />
-                        <attribute name="feature_knownapitypes" value="XBMCAddon::xbmc::InfoTagVideo,xbmc::InfoTagMusic" id="2717" addr="0x7f99f1de6c90" />
-                        <attribute name="sym_name" value="xbmcgui" id="2718" addr="0x7f99f1de6c90" />
-                        <typescope id="2719" addr="0x7f99f1dd2150" >
-                            <attributelist id="2720" addr="0x7f99f1dd2150" >
-                                <attribute name="name" value="xbmcgui" id="2721" addr="0x7f99f1de6c90" />
-                                <typetab id="2722" addr="0x7f99f1dd2170" >
-                                    <attributelist id="2723" addr="0x7f99f1dd2170" >
-                                        <attribute name="InterceptorBase" value="InterceptorBase" id="2724" addr="0x7f99f1de6c90" />
-                                        <attribute name="Dialog" value="Dialog" id="2725" addr="0x7f99f1de6c90" />
-                                        <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="2726" addr="0x7f99f1de6c90" />
-                                        <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="2727" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlTextBox" value="ControlTextBox" id="2728" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlRadioButton" value="ControlRadioButton" id="2729" addr="0x7f99f1de6c90" />
-                                        <attribute name="Window" value="Window" id="2730" addr="0x7f99f1de6c90" />
-                                        <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="2731" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlList" value="ControlList" id="2732" addr="0x7f99f1de6c90" />
-                                        <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="2733" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlImage" value="ControlImage" id="2734" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlButton" value="ControlButton" id="2735" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlGroup" value="ControlGroup" id="2736" addr="0x7f99f1de6c90" />
-                                        <attribute name="DialogBusy" value="DialogBusy" id="2737" addr="0x7f99f1de6c90" />
-                                        <attribute name="DialogProgressBG" value="DialogProgressBG" id="2738" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlSpin" value="ControlSpin" id="2739" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlEdit" value="ControlEdit" id="2740" addr="0x7f99f1de6c90" />
-                                        <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="2741" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="2742" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlLabel" value="ControlLabel" id="2743" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlProgress" value="ControlProgress" id="2744" addr="0x7f99f1de6c90" />
-                                        <attribute name="Control" value="Control" id="2745" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlSlider" value="ControlSlider" id="2746" addr="0x7f99f1de6c90" />
-                                        <attribute name="DialogProgress" value="DialogProgress" id="2747" addr="0x7f99f1de6c90" />
-                                        <attribute name="Action" value="Action" id="2748" addr="0x7f99f1de6c90" />
-                                        <attribute name="WindowDialog" value="WindowDialog" id="2749" addr="0x7f99f1de6c90" />
-                                        <attribute name="WindowXML" value="WindowXML" id="2750" addr="0x7f99f1de6c90" />
-                                        <attribute name="ListItem" value="ListItem" id="2751" addr="0x7f99f1de6c90" />
-                                        <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="2752" addr="0x7f99f1de6c90" />
+                <namespace id="2708" addr="0x7fca469a27f0" >
+                    <attributelist id="2709" addr="0x7fca469a27f0" >
+                        <attribute name="feature_knownbasetypes" value="AddonClass,AddonCallback" id="2710" addr="0x7fca46934c90" />
+                        <attribute name="name" value="xbmcgui" id="2711" addr="0x7fca46934c90" />
+                        <attribute name="sym_symtab" value="0x7fca4698e8b0" id="2712" addr="0x7fca4698e8b0" />
+                        <attribute name="symtab" value="0x7fca4698efb0" id="2713" addr="0x7fca4698efb0" />
+                        <attribute name="sym_nextSibling" value="0x7fca469e4830" id="2714" addr="0x7fca469e4830" />
+                        <attribute name="csym_nextSibling" value="0x7fca469e4830" id="2715" addr="0x7fca469e4830" />
+                        <attribute name="sym_previousSibling" value="0x7fca46994490" id="2716" addr="0x7fca46994490" />
+                        <attribute name="feature_knownapitypes" value="XBMCAddon::xbmc::InfoTagVideo,xbmc::InfoTagMusic" id="2717" addr="0x7fca46934c90" />
+                        <attribute name="sym_name" value="xbmcgui" id="2718" addr="0x7fca46934c90" />
+                        <typescope id="2719" addr="0x7fca46920150" >
+                            <attributelist id="2720" addr="0x7fca46920150" >
+                                <attribute name="name" value="xbmcgui" id="2721" addr="0x7fca46934c90" />
+                                <typetab id="2722" addr="0x7fca46920170" >
+                                    <attributelist id="2723" addr="0x7fca46920170" >
+                                        <attribute name="InterceptorBase" value="InterceptorBase" id="2724" addr="0x7fca46934c90" />
+                                        <attribute name="Dialog" value="Dialog" id="2725" addr="0x7fca46934c90" />
+                                        <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="2726" addr="0x7fca46934c90" />
+                                        <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="2727" addr="0x7fca46934c90" />
+                                        <attribute name="ControlTextBox" value="ControlTextBox" id="2728" addr="0x7fca46934c90" />
+                                        <attribute name="ControlRadioButton" value="ControlRadioButton" id="2729" addr="0x7fca46934c90" />
+                                        <attribute name="Window" value="Window" id="2730" addr="0x7fca46934c90" />
+                                        <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="2731" addr="0x7fca46934c90" />
+                                        <attribute name="ControlList" value="ControlList" id="2732" addr="0x7fca46934c90" />
+                                        <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="2733" addr="0x7fca46934c90" />
+                                        <attribute name="ControlImage" value="ControlImage" id="2734" addr="0x7fca46934c90" />
+                                        <attribute name="ControlButton" value="ControlButton" id="2735" addr="0x7fca46934c90" />
+                                        <attribute name="ControlGroup" value="ControlGroup" id="2736" addr="0x7fca46934c90" />
+                                        <attribute name="DialogBusy" value="DialogBusy" id="2737" addr="0x7fca46934c90" />
+                                        <attribute name="DialogProgressBG" value="DialogProgressBG" id="2738" addr="0x7fca46934c90" />
+                                        <attribute name="ControlSpin" value="ControlSpin" id="2739" addr="0x7fca46934c90" />
+                                        <attribute name="ControlEdit" value="ControlEdit" id="2740" addr="0x7fca46934c90" />
+                                        <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="2741" addr="0x7fca46934c90" />
+                                        <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="2742" addr="0x7fca46934c90" />
+                                        <attribute name="ControlLabel" value="ControlLabel" id="2743" addr="0x7fca46934c90" />
+                                        <attribute name="ControlProgress" value="ControlProgress" id="2744" addr="0x7fca46934c90" />
+                                        <attribute name="Control" value="Control" id="2745" addr="0x7fca46934c90" />
+                                        <attribute name="ControlSlider" value="ControlSlider" id="2746" addr="0x7fca46934c90" />
+                                        <attribute name="DialogProgress" value="DialogProgress" id="2747" addr="0x7fca46934c90" />
+                                        <attribute name="Action" value="Action" id="2748" addr="0x7fca46934c90" />
+                                        <attribute name="WindowDialog" value="WindowDialog" id="2749" addr="0x7fca46934c90" />
+                                        <attribute name="WindowXML" value="WindowXML" id="2750" addr="0x7fca46934c90" />
+                                        <attribute name="ListItem" value="ListItem" id="2751" addr="0x7fca46934c90" />
+                                        <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="2752" addr="0x7fca46934c90" />
                                     </attributelist >
-                                    <typetabsitem id="2753" addr="0x7f99f1de1dd0" >
-                                        <attributelist id="2754" addr="0x7f99f1de1dd0" >
+                                    <typetabsitem id="2753" addr="0x7fca4692fdd0" >
+                                        <attributelist id="2754" addr="0x7fca4692fdd0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2755" addr="0x7f99f1dde790" >
-                                        <attributelist id="2756" addr="0x7f99f1dde790" >
+                                    <typetabsitem id="2755" addr="0x7fca4692c790" >
+                                        <attributelist id="2756" addr="0x7fca4692c790" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2757" addr="0x7f99f1de3f10" >
-                                        <attributelist id="2758" addr="0x7f99f1de3f10" >
+                                    <typetabsitem id="2757" addr="0x7fca46931f10" >
+                                        <attributelist id="2758" addr="0x7fca46931f10" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2759" addr="0x7f99f1dd67b0" >
-                                        <attributelist id="2760" addr="0x7f99f1dd67b0" >
+                                    <typetabsitem id="2759" addr="0x7fca469247b0" >
+                                        <attributelist id="2760" addr="0x7fca469247b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2761" addr="0x7f99f1ddafd0" >
-                                        <attributelist id="2762" addr="0x7f99f1ddafd0" >
+                                    <typetabsitem id="2761" addr="0x7fca46928fd0" >
+                                        <attributelist id="2762" addr="0x7fca46928fd0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2763" addr="0x7f99f1ddd430" >
-                                        <attributelist id="2764" addr="0x7f99f1ddd430" >
+                                    <typetabsitem id="2763" addr="0x7fca4692b430" >
+                                        <attributelist id="2764" addr="0x7fca4692b430" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2765" addr="0x7f99f1de2130" >
-                                        <attributelist id="2766" addr="0x7f99f1de2130" >
+                                    <typetabsitem id="2765" addr="0x7fca46930130" >
+                                        <attributelist id="2766" addr="0x7fca46930130" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2767" addr="0x7f99f1dd2f50" >
-                                        <attributelist id="2768" addr="0x7f99f1dd2f50" >
+                                    <typetabsitem id="2767" addr="0x7fca46920f50" >
+                                        <attributelist id="2768" addr="0x7fca46920f50" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2769" addr="0x7f99f1dd9650" >
-                                        <attributelist id="2770" addr="0x7f99f1dd9650" >
+                                    <typetabsitem id="2769" addr="0x7fca46927650" >
+                                        <attributelist id="2770" addr="0x7fca46927650" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2771" addr="0x7f99f1de3390" >
-                                        <attributelist id="2772" addr="0x7f99f1de3390" >
+                                    <typetabsitem id="2771" addr="0x7fca46931390" >
+                                        <attributelist id="2772" addr="0x7fca46931390" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2773" addr="0x7f99f1ddb7b0" >
-                                        <attributelist id="2774" addr="0x7f99f1ddb7b0" >
+                                    <typetabsitem id="2773" addr="0x7fca469297b0" >
+                                        <attributelist id="2774" addr="0x7fca469297b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2775" addr="0x7f99f1ddc4b0" >
-                                        <attributelist id="2776" addr="0x7f99f1ddc4b0" >
+                                    <typetabsitem id="2775" addr="0x7fca4692a4b0" >
+                                        <attributelist id="2776" addr="0x7fca4692a4b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2777" addr="0x7f99f1ddcf90" >
-                                        <attributelist id="2778" addr="0x7f99f1ddcf90" >
+                                    <typetabsitem id="2777" addr="0x7fca4692af90" >
+                                        <attributelist id="2778" addr="0x7fca4692af90" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2779" addr="0x7f99f1de11b0" >
-                                        <attributelist id="2780" addr="0x7f99f1de11b0" >
+                                    <typetabsitem id="2779" addr="0x7fca4692f1b0" >
+                                        <attributelist id="2780" addr="0x7fca4692f1b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2781" addr="0x7f99f1de15b0" >
-                                        <attributelist id="2782" addr="0x7f99f1de15b0" >
+                                    <typetabsitem id="2781" addr="0x7fca4692f5b0" >
+                                        <attributelist id="2782" addr="0x7fca4692f5b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2783" addr="0x7f99f1dd77f0" >
-                                        <attributelist id="2784" addr="0x7f99f1dd77f0" >
+                                    <typetabsitem id="2783" addr="0x7fca469257f0" >
+                                        <attributelist id="2784" addr="0x7fca469257f0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2785" addr="0x7f99f1dd8b30" >
-                                        <attributelist id="2786" addr="0x7f99f1dd8b30" >
+                                    <typetabsitem id="2785" addr="0x7fca46926b30" >
+                                        <attributelist id="2786" addr="0x7fca46926b30" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2787" addr="0x7f99f1dd2c50" >
-                                        <attributelist id="2788" addr="0x7f99f1dd2c50" >
+                                    <typetabsitem id="2787" addr="0x7fca46920c50" >
+                                        <attributelist id="2788" addr="0x7fca46920c50" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2789" addr="0x7f99f1dda790" >
-                                        <attributelist id="2790" addr="0x7f99f1dda790" >
+                                    <typetabsitem id="2789" addr="0x7fca46928790" >
+                                        <attributelist id="2790" addr="0x7fca46928790" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2791" addr="0x7f99f1dd8030" >
-                                        <attributelist id="2792" addr="0x7f99f1dd8030" >
+                                    <typetabsitem id="2791" addr="0x7fca46926030" >
+                                        <attributelist id="2792" addr="0x7fca46926030" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2793" addr="0x7f99f1ddbe10" >
-                                        <attributelist id="2794" addr="0x7f99f1ddbe10" >
+                                    <typetabsitem id="2793" addr="0x7fca46929e10" >
+                                        <attributelist id="2794" addr="0x7fca46929e10" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2795" addr="0x7f99f1dd6b10" >
-                                        <attributelist id="2796" addr="0x7f99f1dd6b10" >
+                                    <typetabsitem id="2795" addr="0x7fca46924b10" >
+                                        <attributelist id="2796" addr="0x7fca46924b10" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2797" addr="0x7f99f1dddf90" >
-                                        <attributelist id="2798" addr="0x7f99f1dddf90" >
+                                    <typetabsitem id="2797" addr="0x7fca4692bf90" >
+                                        <attributelist id="2798" addr="0x7fca4692bf90" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2799" addr="0x7f99f1de0530" >
-                                        <attributelist id="2800" addr="0x7f99f1de0530" >
+                                    <typetabsitem id="2799" addr="0x7fca4692e530" >
+                                        <attributelist id="2800" addr="0x7fca4692e530" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2801" addr="0x7f99f1de1e50" >
-                                        <attributelist id="2802" addr="0x7f99f1de1e50" >
+                                    <typetabsitem id="2801" addr="0x7fca4692fe50" >
+                                        <attributelist id="2802" addr="0x7fca4692fe50" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2803" addr="0x7f99f1de2d90" >
-                                        <attributelist id="2804" addr="0x7f99f1de2d90" >
+                                    <typetabsitem id="2803" addr="0x7fca46930d90" >
+                                        <attributelist id="2804" addr="0x7fca46930d90" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2805" addr="0x7f99f1de3410" >
-                                        <attributelist id="2806" addr="0x7f99f1de3410" >
+                                    <typetabsitem id="2805" addr="0x7fca46931410" >
+                                        <attributelist id="2806" addr="0x7fca46931410" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2807" addr="0x7f99f1dd3590" >
-                                        <attributelist id="2808" addr="0x7f99f1dd3590" >
+                                    <typetabsitem id="2807" addr="0x7fca46921590" >
+                                        <attributelist id="2808" addr="0x7fca46921590" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2809" addr="0x7f99f1dd3390" >
-                                        <attributelist id="2810" addr="0x7f99f1dd3390" >
+                                    <typetabsitem id="2809" addr="0x7fca46921390" >
+                                        <attributelist id="2810" addr="0x7fca46921390" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
-                                <attribute name="parent" value="0x7f99f1dd1d70" id="2811" addr="0x7f99f1dd1d70" />
-                                <attribute name="qname" value="XBMCAddon::xbmcgui" id="2812" addr="0x7f99f1de6c90" />
-                                <attribute name="symtab" value="0x7f99f1e40fb0" id="2813" addr="0x7f99f1e40fb0" />
+                                <attribute name="parent" value="0x7fca4691fd70" id="2811" addr="0x7fca4691fd70" />
+                                <attribute name="qname" value="XBMCAddon::xbmcgui" id="2812" addr="0x7fca46934c90" />
+                                <attribute name="symtab" value="0x7fca4698efb0" id="2813" addr="0x7fca4698efb0" />
                             </attributelist >
-                            <typescopesitem id="2814" addr="0x7f99f1e40f70" >
-                                <attributelist id="2815" addr="0x7f99f1e40f70" >
+                            <typescopesitem id="2814" addr="0x7fca4698ef70" >
+                                <attributelist id="2815" addr="0x7fca4698ef70" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="2816" addr="0x7f99f1dd2170" >
-                                <attributelist id="2817" addr="0x7f99f1dd2170" >
-                                    <attribute name="InterceptorBase" value="InterceptorBase" id="2818" addr="0x7f99f1de6c90" />
-                                    <attribute name="Dialog" value="Dialog" id="2819" addr="0x7f99f1de6c90" />
-                                    <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="2820" addr="0x7f99f1de6c90" />
-                                    <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="2821" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlTextBox" value="ControlTextBox" id="2822" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlRadioButton" value="ControlRadioButton" id="2823" addr="0x7f99f1de6c90" />
-                                    <attribute name="Window" value="Window" id="2824" addr="0x7f99f1de6c90" />
-                                    <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="2825" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlList" value="ControlList" id="2826" addr="0x7f99f1de6c90" />
-                                    <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="2827" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlImage" value="ControlImage" id="2828" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlButton" value="ControlButton" id="2829" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlGroup" value="ControlGroup" id="2830" addr="0x7f99f1de6c90" />
-                                    <attribute name="DialogBusy" value="DialogBusy" id="2831" addr="0x7f99f1de6c90" />
-                                    <attribute name="DialogProgressBG" value="DialogProgressBG" id="2832" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlSpin" value="ControlSpin" id="2833" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlEdit" value="ControlEdit" id="2834" addr="0x7f99f1de6c90" />
-                                    <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="2835" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="2836" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlLabel" value="ControlLabel" id="2837" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlProgress" value="ControlProgress" id="2838" addr="0x7f99f1de6c90" />
-                                    <attribute name="Control" value="Control" id="2839" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlSlider" value="ControlSlider" id="2840" addr="0x7f99f1de6c90" />
-                                    <attribute name="DialogProgress" value="DialogProgress" id="2841" addr="0x7f99f1de6c90" />
-                                    <attribute name="Action" value="Action" id="2842" addr="0x7f99f1de6c90" />
-                                    <attribute name="WindowDialog" value="WindowDialog" id="2843" addr="0x7f99f1de6c90" />
-                                    <attribute name="WindowXML" value="WindowXML" id="2844" addr="0x7f99f1de6c90" />
-                                    <attribute name="ListItem" value="ListItem" id="2845" addr="0x7f99f1de6c90" />
-                                    <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="2846" addr="0x7f99f1de6c90" />
+                            <typescopesitem id="2816" addr="0x7fca46920170" >
+                                <attributelist id="2817" addr="0x7fca46920170" >
+                                    <attribute name="InterceptorBase" value="InterceptorBase" id="2818" addr="0x7fca46934c90" />
+                                    <attribute name="Dialog" value="Dialog" id="2819" addr="0x7fca46934c90" />
+                                    <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="2820" addr="0x7fca46934c90" />
+                                    <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="2821" addr="0x7fca46934c90" />
+                                    <attribute name="ControlTextBox" value="ControlTextBox" id="2822" addr="0x7fca46934c90" />
+                                    <attribute name="ControlRadioButton" value="ControlRadioButton" id="2823" addr="0x7fca46934c90" />
+                                    <attribute name="Window" value="Window" id="2824" addr="0x7fca46934c90" />
+                                    <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="2825" addr="0x7fca46934c90" />
+                                    <attribute name="ControlList" value="ControlList" id="2826" addr="0x7fca46934c90" />
+                                    <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="2827" addr="0x7fca46934c90" />
+                                    <attribute name="ControlImage" value="ControlImage" id="2828" addr="0x7fca46934c90" />
+                                    <attribute name="ControlButton" value="ControlButton" id="2829" addr="0x7fca46934c90" />
+                                    <attribute name="ControlGroup" value="ControlGroup" id="2830" addr="0x7fca46934c90" />
+                                    <attribute name="DialogBusy" value="DialogBusy" id="2831" addr="0x7fca46934c90" />
+                                    <attribute name="DialogProgressBG" value="DialogProgressBG" id="2832" addr="0x7fca46934c90" />
+                                    <attribute name="ControlSpin" value="ControlSpin" id="2833" addr="0x7fca46934c90" />
+                                    <attribute name="ControlEdit" value="ControlEdit" id="2834" addr="0x7fca46934c90" />
+                                    <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="2835" addr="0x7fca46934c90" />
+                                    <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="2836" addr="0x7fca46934c90" />
+                                    <attribute name="ControlLabel" value="ControlLabel" id="2837" addr="0x7fca46934c90" />
+                                    <attribute name="ControlProgress" value="ControlProgress" id="2838" addr="0x7fca46934c90" />
+                                    <attribute name="Control" value="Control" id="2839" addr="0x7fca46934c90" />
+                                    <attribute name="ControlSlider" value="ControlSlider" id="2840" addr="0x7fca46934c90" />
+                                    <attribute name="DialogProgress" value="DialogProgress" id="2841" addr="0x7fca46934c90" />
+                                    <attribute name="Action" value="Action" id="2842" addr="0x7fca46934c90" />
+                                    <attribute name="WindowDialog" value="WindowDialog" id="2843" addr="0x7fca46934c90" />
+                                    <attribute name="WindowXML" value="WindowXML" id="2844" addr="0x7fca46934c90" />
+                                    <attribute name="ListItem" value="ListItem" id="2845" addr="0x7fca46934c90" />
+                                    <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="2846" addr="0x7fca46934c90" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="2847" addr="0x7f99f1dd1d70" >
-                                <attributelist id="2848" addr="0x7f99f1dd1d70" >
-                                    <attribute name="name" value="XBMCAddon" id="2849" addr="0x7f99f1de6c90" />
-                                    <typetab id="2850" addr="0x7f99f1dd1db0" >
-                                        <attributelist id="2851" addr="0x7f99f1dd1db0" >
-                                            <attribute name="Dictionary" value="Dictionary" id="2852" addr="0x7f99f1de6c90" />
-                                            <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="2853" addr="0x7f99f1de6c90" />
-                                            <attribute name="String" value="std::string" id="2854" addr="0x7f99f1de6c90" />
-                                            <attribute name="StringOrInt" value="XBMCAddon::String" id="2855" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                        <typetabsitem id="2856" addr="0x7f99f1dd28b0" >
-                                            <attributelist id="2857" addr="0x7f99f1dd28b0" >
+                            <typescopesitem id="2847" addr="0x7fca4691fd70" >
+                                <attributelist id="2848" addr="0x7fca4691fd70" >
+                                    <attribute name="name" value="XBMCAddon" id="2849" addr="0x7fca46934c90" />
+                                    <typetab id="2850" addr="0x7fca4691fdb0" >
+                                        <attributelist id="2851" addr="0x7fca4691fdb0" >
+                                            <attribute name="Dictionary" value="Dictionary" id="2852" addr="0x7fca46934c90" />
+                                            <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="2853" addr="0x7fca46934c90" />
+                                            <attribute name="String" value="std::string" id="2854" addr="0x7fca46934c90" />
+                                            <attribute name="StringOrInt" value="XBMCAddon::String" id="2855" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                        <typetabsitem id="2856" addr="0x7fca469208b0" >
+                                            <attributelist id="2857" addr="0x7fca469208b0" >
                                             </attributelist >
                                         </typetabsitem >
-                                        <typetabsitem id="2858" addr="0x7f99f1dd2910" >
-                                            <attributelist id="2859" addr="0x7f99f1dd2910" >
+                                        <typetabsitem id="2858" addr="0x7fca46920910" >
+                                            <attributelist id="2859" addr="0x7fca46920910" >
                                             </attributelist >
                                         </typetabsitem >
-                                        <typetabsitem id="2860" addr="0x7f99f1dd1f90" >
-                                            <attributelist id="2861" addr="0x7f99f1dd1f90" >
+                                        <typetabsitem id="2860" addr="0x7fca4691ff90" >
+                                            <attributelist id="2861" addr="0x7fca4691ff90" >
                                             </attributelist >
                                         </typetabsitem >
-                                        <typetabsitem id="2862" addr="0x7f99f1dd2710" >
-                                            <attributelist id="2863" addr="0x7f99f1dd2710" >
+                                        <typetabsitem id="2862" addr="0x7fca46920710" >
+                                            <attributelist id="2863" addr="0x7fca46920710" >
                                             </attributelist >
                                         </typetabsitem >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f99f1e1da30" id="2864" addr="0x7f99f1e1da30" />
-                                    <attribute name="qname" value="XBMCAddon" id="2865" addr="0x7f99f1de6c90" />
-                                    <attribute name="symtab" value="0x7f99f1e408b0" id="2866" addr="0x7f99f1e408b0" />
+                                    <attribute name="parent" value="0x7fca4696ba30" id="2864" addr="0x7fca4696ba30" />
+                                    <attribute name="qname" value="XBMCAddon" id="2865" addr="0x7fca46934c90" />
+                                    <attribute name="symtab" value="0x7fca4698e8b0" id="2866" addr="0x7fca4698e8b0" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="2867" addr="0x7f99f1dd2190" >
-                                <attributelist id="2868" addr="0x7f99f1dd2190" >
+                            <typescopesitem id="2867" addr="0x7fca46920190" >
+                                <attributelist id="2868" addr="0x7fca46920190" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="2869" addr="0x7f99f1e40fb0" >
-                                <attributelist id="2870" addr="0x7f99f1e40fb0" >
-                                    <attribute name="name" value="xbmcgui" id="2871" addr="0x7f99f1de6c90" />
-                                    <attribute name="csymtab" value="0x7f99f1e40ff0" id="2872" addr="0x7f99f1e40ff0" />
-                                    <attribute name="symtab" value="0x7f99f1e40f90" id="2873" addr="0x7f99f1e40f90" />
+                            <typescopesitem id="2869" addr="0x7fca4698efb0" >
+                                <attributelist id="2870" addr="0x7fca4698efb0" >
+                                    <attribute name="name" value="xbmcgui" id="2871" addr="0x7fca46934c90" />
+                                    <attribute name="csymtab" value="0x7fca4698eff0" id="2872" addr="0x7fca4698eff0" />
+                                    <attribute name="symtab" value="0x7fca4698ef90" id="2873" addr="0x7fca4698ef90" />
                                 </attributelist >
                             </typescopesitem >
                         </typescope >
                     </attributelist >
 
-                    <class id="2874" addr="0x7f99f1e54970" >
-                        <attributelist id="2875" addr="0x7f99f1e54970" >
-                            <attribute name="name" value="XBMCAddon::xbmcgui::Control" id="2876" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="2877" addr="0x7f99f1e40fb0" />
-                            <attribute name="symtab" value="0x7f99f1e54ab0" id="2878" addr="0x7f99f1e54ab0" />
-                            <attribute name="allows_typedef" value="1" id="2879" addr="0x7f99f1de6c90" />
-                            <attribute name="typepass_visit" value="1" id="2880" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_visit" value="1" id="2881" addr="0x7f99f1de6c90" />
-                            <attribute name="kind" value="class" id="2882" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_name" value="Control" id="2883" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_default_base_constructor" value="1" id="2884" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_has_constructor" value="1" id="2885" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_has_destructor" value="1" id="2886" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_default_destructor" value="1" id="2887" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_copy_constructor" value="1" id="2888" addr="0x7f99f1de6c90" />
-                            <attribute name="privatebaselist" value="0x7f99f1e54950" id="2889" addr="0x7f99f1e54950" />
-                            <attribute name="protectedbaselist" value="0x7f99f1e54930" id="2890" addr="0x7f99f1e54930" />
-                            <baselist id="2891" addr="0x7f99f1e54910" >
-                                <base name="AddonClass" id="2892" addr="0x7f99f1e54890" />
+                    <class id="2874" addr="0x7fca469a2970" >
+                        <attributelist id="2875" addr="0x7fca469a2970" >
+                            <attribute name="name" value="XBMCAddon::xbmcgui::Control" id="2876" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="2877" addr="0x7fca4698efb0" />
+                            <attribute name="symtab" value="0x7fca469a2ab0" id="2878" addr="0x7fca469a2ab0" />
+                            <attribute name="allows_typedef" value="1" id="2879" addr="0x7fca46934c90" />
+                            <attribute name="typepass_visit" value="1" id="2880" addr="0x7fca46934c90" />
+                            <attribute name="allocate_visit" value="1" id="2881" addr="0x7fca46934c90" />
+                            <attribute name="kind" value="class" id="2882" addr="0x7fca46934c90" />
+                            <attribute name="sym_name" value="Control" id="2883" addr="0x7fca46934c90" />
+                            <attribute name="allocate_default_base_constructor" value="1" id="2884" addr="0x7fca46934c90" />
+                            <attribute name="allocate_has_constructor" value="1" id="2885" addr="0x7fca46934c90" />
+                            <attribute name="allocate_has_destructor" value="1" id="2886" addr="0x7fca46934c90" />
+                            <attribute name="allocate_default_destructor" value="1" id="2887" addr="0x7fca46934c90" />
+                            <attribute name="allocate_copy_constructor" value="1" id="2888" addr="0x7fca46934c90" />
+                            <attribute name="privatebaselist" value="0x7fca469a2950" id="2889" addr="0x7fca469a2950" />
+                            <attribute name="protectedbaselist" value="0x7fca469a2930" id="2890" addr="0x7fca469a2930" />
+                            <baselist id="2891" addr="0x7fca469a2910" >
+                                <base name="AddonClass" id="2892" addr="0x7fca469a2890" />
                             </baselist >
-                            <attribute name="module" value="xbmcgui" id="2893" addr="0x7f99f1e402f0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="2894" addr="0x7f99f1de6c90" />
-                            <typescope id="2895" addr="0x7f99f1dd6bd0" >
-                                <attributelist id="2896" addr="0x7f99f1dd6bd0" >
-                                    <attribute name="name" value="Control" id="2897" addr="0x7f99f1de6c90" />
-                                    <typetab id="2898" addr="0x7f99f1dd6bf0" >
-                                        <attributelist id="2899" addr="0x7f99f1dd6bf0" >
+                            <attribute name="module" value="xbmcgui" id="2893" addr="0x7fca4698e2f0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="2894" addr="0x7fca46934c90" />
+                            <typescope id="2895" addr="0x7fca46924bd0" >
+                                <attributelist id="2896" addr="0x7fca46924bd0" >
+                                    <attribute name="name" value="Control" id="2897" addr="0x7fca46934c90" />
+                                    <typetab id="2898" addr="0x7fca46924bf0" >
+                                        <attributelist id="2899" addr="0x7fca46924bf0" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f99f1dd2150" id="2900" addr="0x7f99f1dd2150" />
-                                    <attribute name="qname" value="XBMCAddon::xbmcgui::Control" id="2901" addr="0x7f99f1de6c90" />
-                                    <attribute name="symtab" value="0x7f99f1e54ab0" id="2902" addr="0x7f99f1e54ab0" />
+                                    <attribute name="parent" value="0x7fca46920150" id="2900" addr="0x7fca46920150" />
+                                    <attribute name="qname" value="XBMCAddon::xbmcgui::Control" id="2901" addr="0x7fca46934c90" />
+                                    <attribute name="symtab" value="0x7fca469a2ab0" id="2902" addr="0x7fca469a2ab0" />
                                 </attributelist >
-                                <typescopesitem id="2903" addr="0x7f99f1dd6b70" >
-                                    <attributelist id="2904" addr="0x7f99f1dd6b70" >
+                                <typescopesitem id="2903" addr="0x7fca46924b70" >
+                                    <attributelist id="2904" addr="0x7fca46924b70" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="2905" addr="0x7f99f1dd6bf0" >
-                                    <attributelist id="2906" addr="0x7f99f1dd6bf0" >
+                                <typescopesitem id="2905" addr="0x7fca46924bf0" >
+                                    <attributelist id="2906" addr="0x7fca46924bf0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="2907" addr="0x7f99f1dd2150" >
-                                    <attributelist id="2908" addr="0x7f99f1dd2150" >
-                                        <attribute name="name" value="xbmcgui" id="2909" addr="0x7f99f1de6c90" />
-                                        <typetab id="2910" addr="0x7f99f1dd2170" >
-                                            <attributelist id="2911" addr="0x7f99f1dd2170" >
-                                                <attribute name="InterceptorBase" value="InterceptorBase" id="2912" addr="0x7f99f1de6c90" />
-                                                <attribute name="Dialog" value="Dialog" id="2913" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="2914" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="2915" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlTextBox" value="ControlTextBox" id="2916" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="2917" addr="0x7f99f1de6c90" />
-                                                <attribute name="Window" value="Window" id="2918" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="2919" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlList" value="ControlList" id="2920" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="2921" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlImage" value="ControlImage" id="2922" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlButton" value="ControlButton" id="2923" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlGroup" value="ControlGroup" id="2924" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogBusy" value="DialogBusy" id="2925" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="2926" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSpin" value="ControlSpin" id="2927" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlEdit" value="ControlEdit" id="2928" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="2929" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="2930" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlLabel" value="ControlLabel" id="2931" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlProgress" value="ControlProgress" id="2932" addr="0x7f99f1de6c90" />
-                                                <attribute name="Control" value="Control" id="2933" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSlider" value="ControlSlider" id="2934" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgress" value="DialogProgress" id="2935" addr="0x7f99f1de6c90" />
-                                                <attribute name="Action" value="Action" id="2936" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowDialog" value="WindowDialog" id="2937" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXML" value="WindowXML" id="2938" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItem" value="ListItem" id="2939" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="2940" addr="0x7f99f1de6c90" />
+                                <typescopesitem id="2907" addr="0x7fca46920150" >
+                                    <attributelist id="2908" addr="0x7fca46920150" >
+                                        <attribute name="name" value="xbmcgui" id="2909" addr="0x7fca46934c90" />
+                                        <typetab id="2910" addr="0x7fca46920170" >
+                                            <attributelist id="2911" addr="0x7fca46920170" >
+                                                <attribute name="InterceptorBase" value="InterceptorBase" id="2912" addr="0x7fca46934c90" />
+                                                <attribute name="Dialog" value="Dialog" id="2913" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="2914" addr="0x7fca46934c90" />
+                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="2915" addr="0x7fca46934c90" />
+                                                <attribute name="ControlTextBox" value="ControlTextBox" id="2916" addr="0x7fca46934c90" />
+                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="2917" addr="0x7fca46934c90" />
+                                                <attribute name="Window" value="Window" id="2918" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="2919" addr="0x7fca46934c90" />
+                                                <attribute name="ControlList" value="ControlList" id="2920" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="2921" addr="0x7fca46934c90" />
+                                                <attribute name="ControlImage" value="ControlImage" id="2922" addr="0x7fca46934c90" />
+                                                <attribute name="ControlButton" value="ControlButton" id="2923" addr="0x7fca46934c90" />
+                                                <attribute name="ControlGroup" value="ControlGroup" id="2924" addr="0x7fca46934c90" />
+                                                <attribute name="DialogBusy" value="DialogBusy" id="2925" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="2926" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSpin" value="ControlSpin" id="2927" addr="0x7fca46934c90" />
+                                                <attribute name="ControlEdit" value="ControlEdit" id="2928" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="2929" addr="0x7fca46934c90" />
+                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="2930" addr="0x7fca46934c90" />
+                                                <attribute name="ControlLabel" value="ControlLabel" id="2931" addr="0x7fca46934c90" />
+                                                <attribute name="ControlProgress" value="ControlProgress" id="2932" addr="0x7fca46934c90" />
+                                                <attribute name="Control" value="Control" id="2933" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSlider" value="ControlSlider" id="2934" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgress" value="DialogProgress" id="2935" addr="0x7fca46934c90" />
+                                                <attribute name="Action" value="Action" id="2936" addr="0x7fca46934c90" />
+                                                <attribute name="WindowDialog" value="WindowDialog" id="2937" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXML" value="WindowXML" id="2938" addr="0x7fca46934c90" />
+                                                <attribute name="ListItem" value="ListItem" id="2939" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="2940" addr="0x7fca46934c90" />
                                             </attributelist >
-                                            <typetabsitem id="2941" addr="0x7f99f1de1dd0" >
-                                                <attributelist id="2942" addr="0x7f99f1de1dd0" >
+                                            <typetabsitem id="2941" addr="0x7fca4692fdd0" >
+                                                <attributelist id="2942" addr="0x7fca4692fdd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2943" addr="0x7f99f1dde790" >
-                                                <attributelist id="2944" addr="0x7f99f1dde790" >
+                                            <typetabsitem id="2943" addr="0x7fca4692c790" >
+                                                <attributelist id="2944" addr="0x7fca4692c790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2945" addr="0x7f99f1de3f10" >
-                                                <attributelist id="2946" addr="0x7f99f1de3f10" >
+                                            <typetabsitem id="2945" addr="0x7fca46931f10" >
+                                                <attributelist id="2946" addr="0x7fca46931f10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2947" addr="0x7f99f1dd67b0" >
-                                                <attributelist id="2948" addr="0x7f99f1dd67b0" >
+                                            <typetabsitem id="2947" addr="0x7fca469247b0" >
+                                                <attributelist id="2948" addr="0x7fca469247b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2949" addr="0x7f99f1ddafd0" >
-                                                <attributelist id="2950" addr="0x7f99f1ddafd0" >
+                                            <typetabsitem id="2949" addr="0x7fca46928fd0" >
+                                                <attributelist id="2950" addr="0x7fca46928fd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2951" addr="0x7f99f1ddd430" >
-                                                <attributelist id="2952" addr="0x7f99f1ddd430" >
+                                            <typetabsitem id="2951" addr="0x7fca4692b430" >
+                                                <attributelist id="2952" addr="0x7fca4692b430" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2953" addr="0x7f99f1de2130" >
-                                                <attributelist id="2954" addr="0x7f99f1de2130" >
+                                            <typetabsitem id="2953" addr="0x7fca46930130" >
+                                                <attributelist id="2954" addr="0x7fca46930130" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2955" addr="0x7f99f1dd2f50" >
-                                                <attributelist id="2956" addr="0x7f99f1dd2f50" >
+                                            <typetabsitem id="2955" addr="0x7fca46920f50" >
+                                                <attributelist id="2956" addr="0x7fca46920f50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2957" addr="0x7f99f1dd9650" >
-                                                <attributelist id="2958" addr="0x7f99f1dd9650" >
+                                            <typetabsitem id="2957" addr="0x7fca46927650" >
+                                                <attributelist id="2958" addr="0x7fca46927650" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2959" addr="0x7f99f1de3390" >
-                                                <attributelist id="2960" addr="0x7f99f1de3390" >
+                                            <typetabsitem id="2959" addr="0x7fca46931390" >
+                                                <attributelist id="2960" addr="0x7fca46931390" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2961" addr="0x7f99f1ddb7b0" >
-                                                <attributelist id="2962" addr="0x7f99f1ddb7b0" >
+                                            <typetabsitem id="2961" addr="0x7fca469297b0" >
+                                                <attributelist id="2962" addr="0x7fca469297b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2963" addr="0x7f99f1ddc4b0" >
-                                                <attributelist id="2964" addr="0x7f99f1ddc4b0" >
+                                            <typetabsitem id="2963" addr="0x7fca4692a4b0" >
+                                                <attributelist id="2964" addr="0x7fca4692a4b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2965" addr="0x7f99f1ddcf90" >
-                                                <attributelist id="2966" addr="0x7f99f1ddcf90" >
+                                            <typetabsitem id="2965" addr="0x7fca4692af90" >
+                                                <attributelist id="2966" addr="0x7fca4692af90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2967" addr="0x7f99f1de11b0" >
-                                                <attributelist id="2968" addr="0x7f99f1de11b0" >
+                                            <typetabsitem id="2967" addr="0x7fca4692f1b0" >
+                                                <attributelist id="2968" addr="0x7fca4692f1b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2969" addr="0x7f99f1de15b0" >
-                                                <attributelist id="2970" addr="0x7f99f1de15b0" >
+                                            <typetabsitem id="2969" addr="0x7fca4692f5b0" >
+                                                <attributelist id="2970" addr="0x7fca4692f5b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2971" addr="0x7f99f1dd77f0" >
-                                                <attributelist id="2972" addr="0x7f99f1dd77f0" >
+                                            <typetabsitem id="2971" addr="0x7fca469257f0" >
+                                                <attributelist id="2972" addr="0x7fca469257f0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2973" addr="0x7f99f1dd8b30" >
-                                                <attributelist id="2974" addr="0x7f99f1dd8b30" >
+                                            <typetabsitem id="2973" addr="0x7fca46926b30" >
+                                                <attributelist id="2974" addr="0x7fca46926b30" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2975" addr="0x7f99f1dd2c50" >
-                                                <attributelist id="2976" addr="0x7f99f1dd2c50" >
+                                            <typetabsitem id="2975" addr="0x7fca46920c50" >
+                                                <attributelist id="2976" addr="0x7fca46920c50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2977" addr="0x7f99f1dda790" >
-                                                <attributelist id="2978" addr="0x7f99f1dda790" >
+                                            <typetabsitem id="2977" addr="0x7fca46928790" >
+                                                <attributelist id="2978" addr="0x7fca46928790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2979" addr="0x7f99f1dd8030" >
-                                                <attributelist id="2980" addr="0x7f99f1dd8030" >
+                                            <typetabsitem id="2979" addr="0x7fca46926030" >
+                                                <attributelist id="2980" addr="0x7fca46926030" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2981" addr="0x7f99f1ddbe10" >
-                                                <attributelist id="2982" addr="0x7f99f1ddbe10" >
+                                            <typetabsitem id="2981" addr="0x7fca46929e10" >
+                                                <attributelist id="2982" addr="0x7fca46929e10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2983" addr="0x7f99f1dd6b10" >
-                                                <attributelist id="2984" addr="0x7f99f1dd6b10" >
+                                            <typetabsitem id="2983" addr="0x7fca46924b10" >
+                                                <attributelist id="2984" addr="0x7fca46924b10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2985" addr="0x7f99f1dddf90" >
-                                                <attributelist id="2986" addr="0x7f99f1dddf90" >
+                                            <typetabsitem id="2985" addr="0x7fca4692bf90" >
+                                                <attributelist id="2986" addr="0x7fca4692bf90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2987" addr="0x7f99f1de0530" >
-                                                <attributelist id="2988" addr="0x7f99f1de0530" >
+                                            <typetabsitem id="2987" addr="0x7fca4692e530" >
+                                                <attributelist id="2988" addr="0x7fca4692e530" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2989" addr="0x7f99f1de1e50" >
-                                                <attributelist id="2990" addr="0x7f99f1de1e50" >
+                                            <typetabsitem id="2989" addr="0x7fca4692fe50" >
+                                                <attributelist id="2990" addr="0x7fca4692fe50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2991" addr="0x7f99f1de2d90" >
-                                                <attributelist id="2992" addr="0x7f99f1de2d90" >
+                                            <typetabsitem id="2991" addr="0x7fca46930d90" >
+                                                <attributelist id="2992" addr="0x7fca46930d90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2993" addr="0x7f99f1de3410" >
-                                                <attributelist id="2994" addr="0x7f99f1de3410" >
+                                            <typetabsitem id="2993" addr="0x7fca46931410" >
+                                                <attributelist id="2994" addr="0x7fca46931410" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2995" addr="0x7f99f1dd3590" >
-                                                <attributelist id="2996" addr="0x7f99f1dd3590" >
+                                            <typetabsitem id="2995" addr="0x7fca46921590" >
+                                                <attributelist id="2996" addr="0x7fca46921590" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2997" addr="0x7f99f1dd3390" >
-                                                <attributelist id="2998" addr="0x7f99f1dd3390" >
+                                            <typetabsitem id="2997" addr="0x7fca46921390" >
+                                                <attributelist id="2998" addr="0x7fca46921390" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7f99f1dd1d70" id="2999" addr="0x7f99f1dd1d70" />
-                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="3000" addr="0x7f99f1de6c90" />
-                                        <attribute name="symtab" value="0x7f99f1e40fb0" id="3001" addr="0x7f99f1e40fb0" />
+                                        <attribute name="parent" value="0x7fca4691fd70" id="2999" addr="0x7fca4691fd70" />
+                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="3000" addr="0x7fca46934c90" />
+                                        <attribute name="symtab" value="0x7fca4698efb0" id="3001" addr="0x7fca4698efb0" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="3002" addr="0x7f99f1dd6c10" >
-                                    <attributelist id="3003" addr="0x7f99f1dd6c10" >
+                                <typescopesitem id="3002" addr="0x7fca46924c10" >
+                                    <attributelist id="3003" addr="0x7fca46924c10" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="3004" addr="0x7f99f1e54ab0" >
-                                    <attributelist id="3005" addr="0x7f99f1e54ab0" >
-                                        <attribute name="name" value="Control" id="3006" addr="0x7f99f1de6c90" />
-                                        <attribute name="csymtab" value="0x7f99f1e54ad0" id="3007" addr="0x7f99f1e54ad0" />
-                                        <attribute name="symtab" value="0x7f99f1e54a70" id="3008" addr="0x7f99f1e54a70" />
+                                <typescopesitem id="3004" addr="0x7fca469a2ab0" >
+                                    <attributelist id="3005" addr="0x7fca469a2ab0" >
+                                        <attribute name="name" value="Control" id="3006" addr="0x7fca46934c90" />
+                                        <attribute name="csymtab" value="0x7fca469a2ad0" id="3007" addr="0x7fca469a2ad0" />
+                                        <attribute name="symtab" value="0x7fca469a2a70" id="3008" addr="0x7fca469a2a70" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <access id="3009" addr="0x7f99f1e54a30" >
-                            <attributelist id="3010" addr="0x7f99f1e54a30" >
-                                <attribute name="kind" value="protected" id="3011" addr="0x7f99f1de6c90" />
+                        <access id="3009" addr="0x7fca469a2a30" >
+                            <attributelist id="3010" addr="0x7fca469a2a30" >
+                                <attribute name="kind" value="protected" id="3011" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="3012" addr="0x7f99f1e54c10" >
-                            <attributelist id="3013" addr="0x7f99f1e54c10" >
-                                <attribute name="ismember" value="1" id="3014" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="Control" id="3015" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="Control" id="3016" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="3017" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="protected" id="3018" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="3019" addr="0x7f99f1de6c90" />
-                                <attribute name="value" value="default" id="3020" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e54ab0" id="3021" addr="0x7f99f1e54ab0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3022" addr="0x7f99f1de6c90" />
+                        <constructor id="3012" addr="0x7fca469a2c10" >
+                            <attributelist id="3013" addr="0x7fca469a2c10" >
+                                <attribute name="ismember" value="1" id="3014" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="Control" id="3015" addr="0x7fca46934c90" />
+                                <attribute name="name" value="Control" id="3016" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="3017" addr="0x7fca46934c90" />
+                                <attribute name="access" value="protected" id="3018" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="3019" addr="0x7fca46934c90" />
+                                <attribute name="value" value="default" id="3020" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a2ab0" id="3021" addr="0x7fca469a2ab0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3022" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <access id="3023" addr="0x7f99f1e54cb0" >
-                            <attributelist id="3024" addr="0x7f99f1e54cb0" >
-                                <attribute name="kind" value="public" id="3025" addr="0x7f99f1de6c90" />
+                        <access id="3023" addr="0x7fca469a2cb0" >
+                            <attributelist id="3024" addr="0x7fca469a2cb0" >
+                                <attribute name="kind" value="public" id="3025" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </access >
-                        <destructor id="3026" addr="0x7f99f1e54dd0" >
-                            <attributelist id="3027" addr="0x7f99f1e54dd0" >
-                                <attribute name="ismember" value="1" id="3028" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="~Control" id="3029" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="~Control" id="3030" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="3031" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="3032" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e54ab0" id="3033" addr="0x7f99f1e54ab0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3034" addr="0x7f99f1de6c90" />
+                        <destructor id="3026" addr="0x7fca469a2dd0" >
+                            <attributelist id="3027" addr="0x7fca469a2dd0" >
+                                <attribute name="ismember" value="1" id="3028" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="~Control" id="3029" addr="0x7fca46934c90" />
+                                <attribute name="name" value="~Control" id="3030" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="3031" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="3032" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a2ab0" id="3033" addr="0x7fca469a2ab0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3034" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </destructor >
-                        <cdecl id="3035" addr="0x7f99f1e55070" >
-                            <attributelist id="3036" addr="0x7f99f1e55070" >
-                                <attribute name="name" value="canAcceptMessages" id="3037" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="3038" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e54ab0" id="3039" addr="0x7f99f1e54ab0" />
-                                <attribute name="kind" value="function" id="3040" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="canAcceptMessages" id="3041" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(int)." id="3042" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="3043" addr="0x7f99f1de6c90" />
-                                <parmlist id="3044" addr="0x7f99f1e54fd0" >
+                        <cdecl id="3035" addr="0x7fca469a3070" >
+                            <attributelist id="3036" addr="0x7fca469a3070" >
+                                <attribute name="name" value="canAcceptMessages" id="3037" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="3038" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a2ab0" id="3039" addr="0x7fca469a2ab0" />
+                                <attribute name="kind" value="function" id="3040" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="canAcceptMessages" id="3041" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(int)." id="3042" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="3043" addr="0x7fca46934c90" />
+                                <parmlist id="3044" addr="0x7fca469a2fd0" >
                                     <parm id="3045">
-                                        <attributelist id="3046" addr="0x7f99f1e54fd0" >
-                                            <attribute name="name" value="actionId" id="3047" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="3048" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3046" addr="0x7fca469a2fd0" >
+                                            <attribute name="name" value="actionId" id="3047" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="3048" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="bool" id="3049" addr="0x7f99f1de6c90" />
-                                <attribute name="code" value="{ return false; }" id="3050" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3051" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="3052" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="bool" id="3049" addr="0x7fca46934c90" />
+                                <attribute name="code" value="{ return false; }" id="3050" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3051" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="3052" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="3053" addr="0x7f99f1e55270" >
-                            <attributelist id="3054" addr="0x7f99f1e55270" >
-                                <attribute name="name" value="getId" id="3055" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="3056" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e54ab0" id="3057" addr="0x7f99f1e54ab0" />
-                                <attribute name="kind" value="function" id="3058" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getId" id="3059" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="3060" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="3061" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="int" id="3062" addr="0x7f99f1de6c90" />
-                                <attribute name="code" value="{ return iControlId; }" id="3063" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3064" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="3065" addr="0x7f99f1de6c90" />
+                        <cdecl id="3053" addr="0x7fca469a3270" >
+                            <attributelist id="3054" addr="0x7fca469a3270" >
+                                <attribute name="name" value="getId" id="3055" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="3056" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a2ab0" id="3057" addr="0x7fca469a2ab0" />
+                                <attribute name="kind" value="function" id="3058" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getId" id="3059" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="3060" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="3061" addr="0x7fca46934c90" />
+                                <attribute name="type" value="int" id="3062" addr="0x7fca46934c90" />
+                                <attribute name="code" value="{ return iControlId; }" id="3063" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3064" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="3065" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="3066" addr="0x7f99f1e555b0" >
-                            <attributelist id="3067" addr="0x7f99f1e555b0" >
-                                <attribute name="name" value="operator ==" id="3068" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="3069" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e54ab0" id="3070" addr="0x7f99f1e54ab0" />
-                                <attribute name="kind" value="function" id="3071" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="operator ==" id="3072" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="q(const).f(r.q(const).XBMCAddon::xbmcgui::Control)." id="3073" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="3074" addr="0x7f99f1de6c90" />
-                                <parmlist id="3075" addr="0x7f99f1e554f0" >
+                        <cdecl id="3066" addr="0x7fca469a35b0" >
+                            <attributelist id="3067" addr="0x7fca469a35b0" >
+                                <attribute name="name" value="operator ==" id="3068" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="3069" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a2ab0" id="3070" addr="0x7fca469a2ab0" />
+                                <attribute name="kind" value="function" id="3071" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="operator ==" id="3072" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="q(const).f(r.q(const).XBMCAddon::xbmcgui::Control)." id="3073" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="3074" addr="0x7fca46934c90" />
+                                <parmlist id="3075" addr="0x7fca469a34f0" >
                                     <parm id="3076">
-                                        <attributelist id="3077" addr="0x7f99f1e554f0" >
-                                            <attribute name="name" value="other" id="3078" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::xbmcgui::Control" id="3079" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3077" addr="0x7fca469a34f0" >
+                                            <attribute name="name" value="other" id="3078" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::xbmcgui::Control" id="3079" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="bool" id="3080" addr="0x7f99f1de6c90" />
-                                <attribute name="code" value="{ return iControlId == other.iControlId; }" id="3081" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3082" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="bool" id="3080" addr="0x7fca46934c90" />
+                                <attribute name="code" value="{ return iControlId == other.iControlId; }" id="3081" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3082" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="3083" addr="0x7f99f1e558d0" >
-                            <attributelist id="3084" addr="0x7f99f1e558d0" >
-                                <attribute name="name" value="operator >" id="3085" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="3086" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e54ab0" id="3087" addr="0x7f99f1e54ab0" />
-                                <attribute name="kind" value="function" id="3088" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="operator >" id="3089" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="q(const).f(r.q(const).XBMCAddon::xbmcgui::Control)." id="3090" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="3091" addr="0x7f99f1de6c90" />
-                                <parmlist id="3092" addr="0x7f99f1e55810" >
+                        <cdecl id="3083" addr="0x7fca469a38d0" >
+                            <attributelist id="3084" addr="0x7fca469a38d0" >
+                                <attribute name="name" value="operator >" id="3085" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="3086" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a2ab0" id="3087" addr="0x7fca469a2ab0" />
+                                <attribute name="kind" value="function" id="3088" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="operator >" id="3089" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="q(const).f(r.q(const).XBMCAddon::xbmcgui::Control)." id="3090" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="3091" addr="0x7fca46934c90" />
+                                <parmlist id="3092" addr="0x7fca469a3810" >
                                     <parm id="3093">
-                                        <attributelist id="3094" addr="0x7f99f1e55810" >
-                                            <attribute name="name" value="other" id="3095" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::xbmcgui::Control" id="3096" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3094" addr="0x7fca469a3810" >
+                                            <attribute name="name" value="other" id="3095" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::xbmcgui::Control" id="3096" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="bool" id="3097" addr="0x7f99f1de6c90" />
-                                <attribute name="code" value="{ return iControlId > other.iControlId; }" id="3098" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3099" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="bool" id="3097" addr="0x7fca46934c90" />
+                                <attribute name="code" value="{ return iControlId > other.iControlId; }" id="3098" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3099" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="3100" addr="0x7f99f1e55bf0" >
-                            <attributelist id="3101" addr="0x7f99f1e55bf0" >
-                                <attribute name="name" value="operator &lt;" id="3102" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="3103" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e54ab0" id="3104" addr="0x7f99f1e54ab0" />
-                                <attribute name="kind" value="function" id="3105" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="operator &lt;" id="3106" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="q(const).f(r.q(const).XBMCAddon::xbmcgui::Control)." id="3107" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="3108" addr="0x7f99f1de6c90" />
-                                <parmlist id="3109" addr="0x7f99f1e55b30" >
+                        <cdecl id="3100" addr="0x7fca469a3bf0" >
+                            <attributelist id="3101" addr="0x7fca469a3bf0" >
+                                <attribute name="name" value="operator &lt;" id="3102" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="3103" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a2ab0" id="3104" addr="0x7fca469a2ab0" />
+                                <attribute name="kind" value="function" id="3105" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="operator &lt;" id="3106" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="q(const).f(r.q(const).XBMCAddon::xbmcgui::Control)." id="3107" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="3108" addr="0x7fca46934c90" />
+                                <parmlist id="3109" addr="0x7fca469a3b30" >
                                     <parm id="3110">
-                                        <attributelist id="3111" addr="0x7f99f1e55b30" >
-                                            <attribute name="name" value="other" id="3112" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::xbmcgui::Control" id="3113" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                    </parm >
-                                </parmlist >
-                                <attribute name="type" value="bool" id="3114" addr="0x7f99f1de6c90" />
-                                <attribute name="code" value="{ return iControlId &lt; other.iControlId; }" id="3115" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3116" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3117" addr="0x7f99f1e55ed0" >
-                            <attributelist id="3118" addr="0x7f99f1e55ed0" >
-                                <attribute name="name" value="getPosition" id="3119" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="3120" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e54ab0" id="3121" addr="0x7f99f1e54ab0" />
-                                <attribute name="kind" value="function" id="3122" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getPosition" id="3123" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="3124" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="3125" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="std::vector&lt;(int)>" id="3126" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3127" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="3128" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3129" addr="0x7f99f1e560b0" >
-                            <attributelist id="3130" addr="0x7f99f1e560b0" >
-                                <attribute name="name" value="getX" id="3131" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="3132" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e54ab0" id="3133" addr="0x7f99f1e54ab0" />
-                                <attribute name="kind" value="function" id="3134" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getX" id="3135" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="3136" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="3137" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="int" id="3138" addr="0x7f99f1de6c90" />
-                                <attribute name="code" value="{ return dwPosX; }" id="3139" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3140" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3141" addr="0x7f99f1e56290" >
-                            <attributelist id="3142" addr="0x7f99f1e56290" >
-                                <attribute name="name" value="getY" id="3143" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="3144" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e54ab0" id="3145" addr="0x7f99f1e54ab0" />
-                                <attribute name="kind" value="function" id="3146" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getY" id="3147" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="3148" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="3149" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="int" id="3150" addr="0x7f99f1de6c90" />
-                                <attribute name="code" value="{ return dwPosY; }" id="3151" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3152" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3153" addr="0x7f99f1e56470" >
-                            <attributelist id="3154" addr="0x7f99f1e56470" >
-                                <attribute name="name" value="getHeight" id="3155" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="3156" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e54ab0" id="3157" addr="0x7f99f1e54ab0" />
-                                <attribute name="kind" value="function" id="3158" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getHeight" id="3159" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="3160" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="3161" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="int" id="3162" addr="0x7f99f1de6c90" />
-                                <attribute name="code" value="{ return dwHeight; }" id="3163" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3164" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="3165" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3166" addr="0x7f99f1e56670" >
-                            <attributelist id="3167" addr="0x7f99f1e56670" >
-                                <attribute name="name" value="getWidth" id="3168" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="3169" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e54ab0" id="3170" addr="0x7f99f1e54ab0" />
-                                <attribute name="kind" value="function" id="3171" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getWidth" id="3172" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="3173" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="3174" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="int" id="3175" addr="0x7f99f1de6c90" />
-                                <attribute name="code" value="{ return dwWidth; }" id="3176" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3177" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="3178" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3179" addr="0x7f99f1e56970" >
-                            <attributelist id="3180" addr="0x7f99f1e56970" >
-                                <attribute name="name" value="setEnabled" id="3181" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="3182" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e54ab0" id="3183" addr="0x7f99f1e54ab0" />
-                                <attribute name="kind" value="function" id="3184" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setEnabled" id="3185" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(bool)." id="3186" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="3187" addr="0x7f99f1de6c90" />
-                                <parmlist id="3188" addr="0x7f99f1e568b0" >
+                                        <attributelist id="3111" addr="0x7fca469a3b30" >
+                                            <attribute name="name" value="other" id="3112" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::xbmcgui::Control" id="3113" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                    </parm >
+                                </parmlist >
+                                <attribute name="type" value="bool" id="3114" addr="0x7fca46934c90" />
+                                <attribute name="code" value="{ return iControlId &lt; other.iControlId; }" id="3115" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3116" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3117" addr="0x7fca469a3ed0" >
+                            <attributelist id="3118" addr="0x7fca469a3ed0" >
+                                <attribute name="name" value="getPosition" id="3119" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="3120" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a2ab0" id="3121" addr="0x7fca469a2ab0" />
+                                <attribute name="kind" value="function" id="3122" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getPosition" id="3123" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="3124" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="3125" addr="0x7fca46934c90" />
+                                <attribute name="type" value="std::vector&lt;(int)>" id="3126" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3127" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="3128" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3129" addr="0x7fca469a40b0" >
+                            <attributelist id="3130" addr="0x7fca469a40b0" >
+                                <attribute name="name" value="getX" id="3131" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="3132" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a2ab0" id="3133" addr="0x7fca469a2ab0" />
+                                <attribute name="kind" value="function" id="3134" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getX" id="3135" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="3136" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="3137" addr="0x7fca46934c90" />
+                                <attribute name="type" value="int" id="3138" addr="0x7fca46934c90" />
+                                <attribute name="code" value="{ return dwPosX; }" id="3139" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3140" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3141" addr="0x7fca469a4290" >
+                            <attributelist id="3142" addr="0x7fca469a4290" >
+                                <attribute name="name" value="getY" id="3143" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="3144" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a2ab0" id="3145" addr="0x7fca469a2ab0" />
+                                <attribute name="kind" value="function" id="3146" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getY" id="3147" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="3148" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="3149" addr="0x7fca46934c90" />
+                                <attribute name="type" value="int" id="3150" addr="0x7fca46934c90" />
+                                <attribute name="code" value="{ return dwPosY; }" id="3151" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3152" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3153" addr="0x7fca469a4470" >
+                            <attributelist id="3154" addr="0x7fca469a4470" >
+                                <attribute name="name" value="getHeight" id="3155" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="3156" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a2ab0" id="3157" addr="0x7fca469a2ab0" />
+                                <attribute name="kind" value="function" id="3158" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getHeight" id="3159" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="3160" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="3161" addr="0x7fca46934c90" />
+                                <attribute name="type" value="int" id="3162" addr="0x7fca46934c90" />
+                                <attribute name="code" value="{ return dwHeight; }" id="3163" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3164" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="3165" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3166" addr="0x7fca469a4670" >
+                            <attributelist id="3167" addr="0x7fca469a4670" >
+                                <attribute name="name" value="getWidth" id="3168" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="3169" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a2ab0" id="3170" addr="0x7fca469a2ab0" />
+                                <attribute name="kind" value="function" id="3171" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getWidth" id="3172" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="3173" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="3174" addr="0x7fca46934c90" />
+                                <attribute name="type" value="int" id="3175" addr="0x7fca46934c90" />
+                                <attribute name="code" value="{ return dwWidth; }" id="3176" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3177" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="3178" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3179" addr="0x7fca469a4970" >
+                            <attributelist id="3180" addr="0x7fca469a4970" >
+                                <attribute name="name" value="setEnabled" id="3181" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="3182" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a2ab0" id="3183" addr="0x7fca469a2ab0" />
+                                <attribute name="kind" value="function" id="3184" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setEnabled" id="3185" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(bool)." id="3186" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="3187" addr="0x7fca46934c90" />
+                                <parmlist id="3188" addr="0x7fca469a48b0" >
                                     <parm id="3189">
-                                        <attributelist id="3190" addr="0x7f99f1e568b0" >
-                                            <attribute name="name" value="enabled" id="3191" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="3192" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3190" addr="0x7fca469a48b0" >
+                                            <attribute name="name" value="enabled" id="3191" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="3192" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="3193" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3194" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="3195" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="3193" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3194" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="3195" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="3196" addr="0x7f99f1e56c50" >
-                            <attributelist id="3197" addr="0x7f99f1e56c50" >
-                                <attribute name="name" value="setVisible" id="3198" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="3199" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e54ab0" id="3200" addr="0x7f99f1e54ab0" />
-                                <attribute name="kind" value="function" id="3201" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setVisible" id="3202" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(bool)." id="3203" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="3204" addr="0x7f99f1de6c90" />
-                                <parmlist id="3205" addr="0x7f99f1e56b90" >
+                        <cdecl id="3196" addr="0x7fca469a4c50" >
+                            <attributelist id="3197" addr="0x7fca469a4c50" >
+                                <attribute name="name" value="setVisible" id="3198" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="3199" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a2ab0" id="3200" addr="0x7fca469a2ab0" />
+                                <attribute name="kind" value="function" id="3201" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setVisible" id="3202" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(bool)." id="3203" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="3204" addr="0x7fca46934c90" />
+                                <parmlist id="3205" addr="0x7fca469a4b90" >
                                     <parm id="3206">
-                                        <attributelist id="3207" addr="0x7f99f1e56b90" >
-                                            <attribute name="name" value="visible" id="3208" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="3209" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3207" addr="0x7fca469a4b90" >
+                                            <attribute name="name" value="visible" id="3208" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="3209" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="3210" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3211" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="3212" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="3210" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3211" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="3212" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="3213" addr="0x7f99f1e56e30" >
-                            <attributelist id="3214" addr="0x7f99f1e56e30" >
-                                <attribute name="name" value="isVisible" id="3215" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="3216" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e54ab0" id="3217" addr="0x7f99f1e54ab0" />
-                                <attribute name="kind" value="function" id="3218" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="isVisible" id="3219" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="3220" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="3221" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="bool" id="3222" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3223" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="3224" addr="0x7f99f1de6c90" />
+                        <cdecl id="3213" addr="0x7fca469a4e30" >
+                            <attributelist id="3214" addr="0x7fca469a4e30" >
+                                <attribute name="name" value="isVisible" id="3215" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="3216" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a2ab0" id="3217" addr="0x7fca469a2ab0" />
+                                <attribute name="kind" value="function" id="3218" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="isVisible" id="3219" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="3220" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="3221" addr="0x7fca46934c90" />
+                                <attribute name="type" value="bool" id="3222" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3223" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="3224" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="3225" addr="0x7f99f1e57290" >
-                            <attributelist id="3226" addr="0x7f99f1e57290" >
-                                <attribute name="name" value="setVisibleCondition" id="3227" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="3228" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e54ab0" id="3229" addr="0x7f99f1e54ab0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e57450" id="3230" addr="0x7f99f1e57450" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e57450" id="3231" addr="0x7f99f1e57450" />
-                                <attribute name="kind" value="function" id="3232" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setVisibleCondition" id="3233" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(p.q(const).char,bool)." id="3234" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="3235" addr="0x7f99f1de6c90" />
-                                <parmlist id="3236" addr="0x7f99f1e57090" >
+                        <cdecl id="3225" addr="0x7fca469a5290" >
+                            <attributelist id="3226" addr="0x7fca469a5290" >
+                                <attribute name="name" value="setVisibleCondition" id="3227" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="3228" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a2ab0" id="3229" addr="0x7fca469a2ab0" />
+                                <attribute name="sym_nextSibling" value="0x7fca469a5450" id="3230" addr="0x7fca469a5450" />
+                                <attribute name="csym_nextSibling" value="0x7fca469a5450" id="3231" addr="0x7fca469a5450" />
+                                <attribute name="kind" value="function" id="3232" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setVisibleCondition" id="3233" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(p.q(const).char,bool)." id="3234" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="3235" addr="0x7fca46934c90" />
+                                <parmlist id="3236" addr="0x7fca469a5090" >
                                     <parm id="3237">
-                                        <attributelist id="3238" addr="0x7f99f1e57090" >
-                                            <attribute name="name" value="visible" id="3239" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="3240" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3238" addr="0x7fca469a5090" >
+                                            <attribute name="name" value="visible" id="3239" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="3240" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="3241">
-                                        <attributelist id="3242" addr="0x7f99f1e571d0" >
-                                            <attribute name="name" value="allowHiddenFocus" id="3243" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="false" id="3244" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="3245" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3242" addr="0x7fca469a51d0" >
+                                            <attribute name="name" value="allowHiddenFocus" id="3243" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="false" id="3244" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="3245" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overloaded" value="0x7f99f1e57290" id="3246" addr="0x7f99f1e57290" />
-                                <attribute name="type" value="void" id="3247" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3248" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="3249" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469a5290" id="3246" addr="0x7fca469a5290" />
+                                <attribute name="type" value="void" id="3247" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3248" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="3249" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="3250" addr="0x7f99f1e57450" >
-                            <attributelist id="3251" addr="0x7f99f1e57450" >
-                                <attribute name="name" value="setVisibleCondition" id="3252" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="3253" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e54ab0" id="3254" addr="0x7f99f1e54ab0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e57290" id="3255" addr="0x7f99f1e57290" />
-                                <attribute name="kind" value="function" id="3256" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setVisibleCondition" id="3257" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(p.q(const).char)." id="3258" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e57290" id="3259" addr="0x7f99f1e57290" />
-                                <attribute name="access" value="public" id="3260" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e57290" id="3261" addr="0x7f99f1e57290" />
-                                <parmlist id="3262" addr="0x7f99f1e57350" >
+                        <cdecl id="3250" addr="0x7fca469a5450" >
+                            <attributelist id="3251" addr="0x7fca469a5450" >
+                                <attribute name="name" value="setVisibleCondition" id="3252" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="3253" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a2ab0" id="3254" addr="0x7fca469a2ab0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469a5290" id="3255" addr="0x7fca469a5290" />
+                                <attribute name="kind" value="function" id="3256" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setVisibleCondition" id="3257" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(p.q(const).char)." id="3258" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469a5290" id="3259" addr="0x7fca469a5290" />
+                                <attribute name="access" value="public" id="3260" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469a5290" id="3261" addr="0x7fca469a5290" />
+                                <parmlist id="3262" addr="0x7fca469a5350" >
                                     <parm id="3263">
-                                        <attributelist id="3264" addr="0x7f99f1e57350" >
-                                            <attribute name="name" value="visible" id="3265" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="3266" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3264" addr="0x7fca469a5350" >
+                                            <attribute name="name" value="visible" id="3265" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="3266" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="3267" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="3268" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="3269" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="3267" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="3268" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="3269" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="3270" addr="0x7f99f1e57770" >
-                            <attributelist id="3271" addr="0x7f99f1e57770" >
-                                <attribute name="name" value="setEnableCondition" id="3272" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="3273" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e54ab0" id="3274" addr="0x7f99f1e54ab0" />
-                                <attribute name="kind" value="function" id="3275" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setEnableCondition" id="3276" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(p.q(const).char)." id="3277" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="3278" addr="0x7f99f1de6c90" />
-                                <parmlist id="3279" addr="0x7f99f1e576b0" >
+                        <cdecl id="3270" addr="0x7fca469a5770" >
+                            <attributelist id="3271" addr="0x7fca469a5770" >
+                                <attribute name="name" value="setEnableCondition" id="3272" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="3273" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a2ab0" id="3274" addr="0x7fca469a2ab0" />
+                                <attribute name="kind" value="function" id="3275" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setEnableCondition" id="3276" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(p.q(const).char)." id="3277" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="3278" addr="0x7fca46934c90" />
+                                <parmlist id="3279" addr="0x7fca469a56b0" >
                                     <parm id="3280">
-                                        <attributelist id="3281" addr="0x7f99f1e576b0" >
-                                            <attribute name="name" value="enable" id="3282" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="3283" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3281" addr="0x7fca469a56b0" >
+                                            <attribute name="name" value="enable" id="3282" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="3283" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="3284" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3285" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="3286" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="3284" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3285" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="3286" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="3287" addr="0x7f99f1e57e10" >
-                            <attributelist id="3288" addr="0x7f99f1e57e10" >
-                                <attribute name="name" value="setAnimations" id="3289" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="3290" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e54ab0" id="3291" addr="0x7f99f1e54ab0" />
-                                <attribute name="kind" value="function" id="3292" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setAnimations" id="3293" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).std::vector&lt;(Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>)>)." id="3294" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="3295" addr="0x7f99f1de6c90" />
-                                <parmlist id="3296" addr="0x7f99f1e57c10" >
+                        <cdecl id="3287" addr="0x7fca469a5e10" >
+                            <attributelist id="3288" addr="0x7fca469a5e10" >
+                                <attribute name="name" value="setAnimations" id="3289" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="3290" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a2ab0" id="3291" addr="0x7fca469a2ab0" />
+                                <attribute name="kind" value="function" id="3292" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setAnimations" id="3293" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).std::vector&lt;(Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>)>)." id="3294" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="3295" addr="0x7fca46934c90" />
+                                <parmlist id="3296" addr="0x7fca469a5c10" >
                                     <parm id="3297">
-                                        <attributelist id="3298" addr="0x7f99f1e57c10" >
-                                            <attribute name="name" value="eventAttr" id="3299" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).std::vector&lt;(Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>)>" id="3300" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3298" addr="0x7fca469a5c10" >
+                                            <attribute name="name" value="eventAttr" id="3299" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).std::vector&lt;(Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>)>" id="3300" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="3301" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3302" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="3303" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="3301" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3302" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="3303" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="3304" addr="0x7f99f1e58230" >
-                            <attributelist id="3305" addr="0x7f99f1e58230" >
-                                <attribute name="name" value="setPosition" id="3306" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="3307" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e54ab0" id="3308" addr="0x7f99f1e54ab0" />
-                                <attribute name="kind" value="function" id="3309" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setPosition" id="3310" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(long,long)." id="3311" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="3312" addr="0x7f99f1de6c90" />
-                                <parmlist id="3313" addr="0x7f99f1e58050" >
+                        <cdecl id="3304" addr="0x7fca469a6230" >
+                            <attributelist id="3305" addr="0x7fca469a6230" >
+                                <attribute name="name" value="setPosition" id="3306" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="3307" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a2ab0" id="3308" addr="0x7fca469a2ab0" />
+                                <attribute name="kind" value="function" id="3309" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setPosition" id="3310" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(long,long)." id="3311" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="3312" addr="0x7fca46934c90" />
+                                <parmlist id="3313" addr="0x7fca469a6050" >
                                     <parm id="3314">
-                                        <attributelist id="3315" addr="0x7f99f1e58050" >
-                                            <attribute name="name" value="x" id="3316" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="3317" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3315" addr="0x7fca469a6050" >
+                                            <attribute name="name" value="x" id="3316" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="3317" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="3318">
-                                        <attributelist id="3319" addr="0x7f99f1e58170" >
-                                            <attribute name="name" value="y" id="3320" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="3321" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3319" addr="0x7fca469a6170" >
+                                            <attribute name="name" value="y" id="3320" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="3321" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="3322" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3323" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="3324" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="3322" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3323" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="3324" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="3325" addr="0x7f99f1e58530" >
-                            <attributelist id="3326" addr="0x7f99f1e58530" >
-                                <attribute name="name" value="setWidth" id="3327" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="3328" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e54ab0" id="3329" addr="0x7f99f1e54ab0" />
-                                <attribute name="kind" value="function" id="3330" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setWidth" id="3331" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(long)." id="3332" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="3333" addr="0x7f99f1de6c90" />
-                                <parmlist id="3334" addr="0x7f99f1e58470" >
+                        <cdecl id="3325" addr="0x7fca469a6530" >
+                            <attributelist id="3326" addr="0x7fca469a6530" >
+                                <attribute name="name" value="setWidth" id="3327" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="3328" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a2ab0" id="3329" addr="0x7fca469a2ab0" />
+                                <attribute name="kind" value="function" id="3330" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setWidth" id="3331" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(long)." id="3332" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="3333" addr="0x7fca46934c90" />
+                                <parmlist id="3334" addr="0x7fca469a6470" >
                                     <parm id="3335">
-                                        <attributelist id="3336" addr="0x7f99f1e58470" >
-                                            <attribute name="name" value="width" id="3337" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="3338" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3336" addr="0x7fca469a6470" >
+                                            <attribute name="name" value="width" id="3337" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="3338" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="3339" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3340" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="3341" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="3339" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3340" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="3341" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="3342" addr="0x7f99f1e58830" >
-                            <attributelist id="3343" addr="0x7f99f1e58830" >
-                                <attribute name="name" value="setHeight" id="3344" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="3345" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e54ab0" id="3346" addr="0x7f99f1e54ab0" />
-                                <attribute name="kind" value="function" id="3347" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setHeight" id="3348" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(long)." id="3349" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="3350" addr="0x7f99f1de6c90" />
-                                <parmlist id="3351" addr="0x7f99f1e58770" >
+                        <cdecl id="3342" addr="0x7fca469a6830" >
+                            <attributelist id="3343" addr="0x7fca469a6830" >
+                                <attribute name="name" value="setHeight" id="3344" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="3345" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a2ab0" id="3346" addr="0x7fca469a2ab0" />
+                                <attribute name="kind" value="function" id="3347" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setHeight" id="3348" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(long)." id="3349" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="3350" addr="0x7fca46934c90" />
+                                <parmlist id="3351" addr="0x7fca469a6770" >
                                     <parm id="3352">
-                                        <attributelist id="3353" addr="0x7f99f1e58770" >
-                                            <attribute name="name" value="height" id="3354" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="3355" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3353" addr="0x7fca469a6770" >
+                                            <attribute name="name" value="height" id="3354" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="3355" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="3356" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3357" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="3358" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="3356" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3357" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="3358" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="3359" addr="0x7f99f1e58f10" >
-                            <attributelist id="3360" addr="0x7f99f1e58f10" >
-                                <attribute name="name" value="setNavigation" id="3361" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="3362" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e54ab0" id="3363" addr="0x7f99f1e54ab0" />
-                                <attribute name="kind" value="function" id="3364" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setNavigation" id="3365" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(p.q(const).XBMCAddon::xbmcgui::Control,p.q(const).XBMCAddon::xbmcgui::Control,p.q(const).XBMCAddon::xbmcgui::Control,p.q(const).XBMCAddon::xbmcgui::Control)." id="3366" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="3367" addr="0x7f99f1de6c90" />
-                                <parmlist id="3368" addr="0x7f99f1e58a90" >
+                        <cdecl id="3359" addr="0x7fca469a6f10" >
+                            <attributelist id="3360" addr="0x7fca469a6f10" >
+                                <attribute name="name" value="setNavigation" id="3361" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="3362" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a2ab0" id="3363" addr="0x7fca469a2ab0" />
+                                <attribute name="kind" value="function" id="3364" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setNavigation" id="3365" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(p.q(const).XBMCAddon::xbmcgui::Control,p.q(const).XBMCAddon::xbmcgui::Control,p.q(const).XBMCAddon::xbmcgui::Control,p.q(const).XBMCAddon::xbmcgui::Control)." id="3366" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="3367" addr="0x7fca46934c90" />
+                                <parmlist id="3368" addr="0x7fca469a6a90" >
                                     <parm id="3369">
-                                        <attributelist id="3370" addr="0x7f99f1e58a90" >
-                                            <attribute name="name" value="up" id="3371" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::Control" id="3372" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3370" addr="0x7fca469a6a90" >
+                                            <attribute name="name" value="up" id="3371" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::Control" id="3372" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="3373">
-                                        <attributelist id="3374" addr="0x7f99f1e58bd0" >
-                                            <attribute name="name" value="down" id="3375" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::Control" id="3376" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3374" addr="0x7fca469a6bd0" >
+                                            <attribute name="name" value="down" id="3375" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::Control" id="3376" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="3377">
-                                        <attributelist id="3378" addr="0x7f99f1e58d10" >
-                                            <attribute name="name" value="left" id="3379" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::Control" id="3380" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3378" addr="0x7fca469a6d10" >
+                                            <attribute name="name" value="left" id="3379" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::Control" id="3380" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="3381">
-                                        <attributelist id="3382" addr="0x7f99f1e58e50" >
-                                            <attribute name="name" value="right" id="3383" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::Control" id="3384" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3382" addr="0x7fca469a6e50" >
+                                            <attribute name="name" value="right" id="3383" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::Control" id="3384" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="3385" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3386" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="3387" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="3385" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3386" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="3387" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="3388" addr="0x7f99f1e59230" >
-                            <attributelist id="3389" addr="0x7f99f1e59230" >
-                                <attribute name="name" value="controlUp" id="3390" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="3391" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e54ab0" id="3392" addr="0x7f99f1e54ab0" />
-                                <attribute name="kind" value="function" id="3393" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="controlUp" id="3394" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(p.q(const).XBMCAddon::xbmcgui::Control)." id="3395" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="3396" addr="0x7f99f1de6c90" />
-                                <parmlist id="3397" addr="0x7f99f1e59170" >
+                        <cdecl id="3388" addr="0x7fca469a7230" >
+                            <attributelist id="3389" addr="0x7fca469a7230" >
+                                <attribute name="name" value="controlUp" id="3390" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="3391" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a2ab0" id="3392" addr="0x7fca469a2ab0" />
+                                <attribute name="kind" value="function" id="3393" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="controlUp" id="3394" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(p.q(const).XBMCAddon::xbmcgui::Control)." id="3395" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="3396" addr="0x7fca46934c90" />
+                                <parmlist id="3397" addr="0x7fca469a7170" >
                                     <parm id="3398">
-                                        <attributelist id="3399" addr="0x7f99f1e59170" >
-                                            <attribute name="name" value="up" id="3400" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::Control" id="3401" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3399" addr="0x7fca469a7170" >
+                                            <attribute name="name" value="up" id="3400" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::Control" id="3401" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="3402" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3403" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="3404" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="3402" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3403" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="3404" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="3405" addr="0x7f99f1e59570" >
-                            <attributelist id="3406" addr="0x7f99f1e59570" >
-                                <attribute name="name" value="controlDown" id="3407" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="3408" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e54ab0" id="3409" addr="0x7f99f1e54ab0" />
-                                <attribute name="kind" value="function" id="3410" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="controlDown" id="3411" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(p.q(const).XBMCAddon::xbmcgui::Control)." id="3412" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="3413" addr="0x7f99f1de6c90" />
-                                <parmlist id="3414" addr="0x7f99f1e594b0" >
+                        <cdecl id="3405" addr="0x7fca469a7570" >
+                            <attributelist id="3406" addr="0x7fca469a7570" >
+                                <attribute name="name" value="controlDown" id="3407" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="3408" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a2ab0" id="3409" addr="0x7fca469a2ab0" />
+                                <attribute name="kind" value="function" id="3410" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="controlDown" id="3411" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(p.q(const).XBMCAddon::xbmcgui::Control)." id="3412" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="3413" addr="0x7fca46934c90" />
+                                <parmlist id="3414" addr="0x7fca469a74b0" >
                                     <parm id="3415">
-                                        <attributelist id="3416" addr="0x7f99f1e594b0" >
-                                            <attribute name="name" value="control" id="3417" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::Control" id="3418" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3416" addr="0x7fca469a74b0" >
+                                            <attribute name="name" value="control" id="3417" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::Control" id="3418" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="3419" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3420" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="3421" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="3419" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3420" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="3421" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="3422" addr="0x7f99f1e59890" >
-                            <attributelist id="3423" addr="0x7f99f1e59890" >
-                                <attribute name="name" value="controlLeft" id="3424" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="3425" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e54ab0" id="3426" addr="0x7f99f1e54ab0" />
-                                <attribute name="kind" value="function" id="3427" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="controlLeft" id="3428" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(p.q(const).XBMCAddon::xbmcgui::Control)." id="3429" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="3430" addr="0x7f99f1de6c90" />
-                                <parmlist id="3431" addr="0x7f99f1e597d0" >
+                        <cdecl id="3422" addr="0x7fca469a7890" >
+                            <attributelist id="3423" addr="0x7fca469a7890" >
+                                <attribute name="name" value="controlLeft" id="3424" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="3425" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a2ab0" id="3426" addr="0x7fca469a2ab0" />
+                                <attribute name="kind" value="function" id="3427" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="controlLeft" id="3428" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(p.q(const).XBMCAddon::xbmcgui::Control)." id="3429" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="3430" addr="0x7fca46934c90" />
+                                <parmlist id="3431" addr="0x7fca469a77d0" >
                                     <parm id="3432">
-                                        <attributelist id="3433" addr="0x7f99f1e597d0" >
-                                            <attribute name="name" value="control" id="3434" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::Control" id="3435" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3433" addr="0x7fca469a77d0" >
+                                            <attribute name="name" value="control" id="3434" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::Control" id="3435" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="3436" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3437" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="3438" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="3436" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3437" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="3438" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="3439" addr="0x7f99f1e59bb0" >
-                            <attributelist id="3440" addr="0x7f99f1e59bb0" >
-                                <attribute name="name" value="controlRight" id="3441" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="3442" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e54ab0" id="3443" addr="0x7f99f1e54ab0" />
-                                <attribute name="kind" value="function" id="3444" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="controlRight" id="3445" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(p.q(const).XBMCAddon::xbmcgui::Control)." id="3446" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="3447" addr="0x7f99f1de6c90" />
-                                <parmlist id="3448" addr="0x7f99f1e59af0" >
+                        <cdecl id="3439" addr="0x7fca469a7bb0" >
+                            <attributelist id="3440" addr="0x7fca469a7bb0" >
+                                <attribute name="name" value="controlRight" id="3441" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="3442" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a2ab0" id="3443" addr="0x7fca469a2ab0" />
+                                <attribute name="kind" value="function" id="3444" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="controlRight" id="3445" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(p.q(const).XBMCAddon::xbmcgui::Control)." id="3446" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="3447" addr="0x7fca46934c90" />
+                                <parmlist id="3448" addr="0x7fca469a7af0" >
                                     <parm id="3449">
-                                        <attributelist id="3450" addr="0x7f99f1e59af0" >
-                                            <attribute name="name" value="control" id="3451" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::Control" id="3452" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3450" addr="0x7fca469a7af0" >
+                                            <attribute name="name" value="control" id="3451" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::Control" id="3452" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="3453" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3454" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="3455" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="3453" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3454" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="3455" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
                     </class >
-                    <class id="3456" addr="0x7f99f1e59e90" >
-                        <attributelist id="3457" addr="0x7f99f1e59e90" >
-                            <attribute name="name" value="XBMCAddon::xbmcgui::ControlSpin" id="3458" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="3459" addr="0x7f99f1e40fb0" />
-                            <attribute name="symtab" value="0x7f99f1e59fd0" id="3460" addr="0x7f99f1e59fd0" />
-                            <attribute name="allows_typedef" value="1" id="3461" addr="0x7f99f1de6c90" />
-                            <attribute name="typepass_visit" value="1" id="3462" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_visit" value="1" id="3463" addr="0x7f99f1de6c90" />
-                            <attribute name="kind" value="class" id="3464" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_name" value="ControlSpin" id="3465" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_has_destructor" value="1" id="3466" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_default_destructor" value="1" id="3467" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_has_constructor" value="1" id="3468" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_copy_constructor" value="1" id="3469" addr="0x7f99f1de6c90" />
-                            <attribute name="privatebaselist" value="0x7f99f1e59e70" id="3470" addr="0x7f99f1e59e70" />
-                            <attribute name="protectedbaselist" value="0x7f99f1e59e50" id="3471" addr="0x7f99f1e59e50" />
-                            <baselist id="3472" addr="0x7f99f1e59e30" >
-                                <base name="Control" id="3473" addr="0x7f99f1e59db0" />
+                    <class id="3456" addr="0x7fca469a7e90" >
+                        <attributelist id="3457" addr="0x7fca469a7e90" >
+                            <attribute name="name" value="XBMCAddon::xbmcgui::ControlSpin" id="3458" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="3459" addr="0x7fca4698efb0" />
+                            <attribute name="symtab" value="0x7fca469a7fd0" id="3460" addr="0x7fca469a7fd0" />
+                            <attribute name="allows_typedef" value="1" id="3461" addr="0x7fca46934c90" />
+                            <attribute name="typepass_visit" value="1" id="3462" addr="0x7fca46934c90" />
+                            <attribute name="allocate_visit" value="1" id="3463" addr="0x7fca46934c90" />
+                            <attribute name="kind" value="class" id="3464" addr="0x7fca46934c90" />
+                            <attribute name="sym_name" value="ControlSpin" id="3465" addr="0x7fca46934c90" />
+                            <attribute name="allocate_has_destructor" value="1" id="3466" addr="0x7fca46934c90" />
+                            <attribute name="allocate_default_destructor" value="1" id="3467" addr="0x7fca46934c90" />
+                            <attribute name="allocate_has_constructor" value="1" id="3468" addr="0x7fca46934c90" />
+                            <attribute name="allocate_copy_constructor" value="1" id="3469" addr="0x7fca46934c90" />
+                            <attribute name="privatebaselist" value="0x7fca469a7e70" id="3470" addr="0x7fca469a7e70" />
+                            <attribute name="protectedbaselist" value="0x7fca469a7e50" id="3471" addr="0x7fca469a7e50" />
+                            <baselist id="3472" addr="0x7fca469a7e30" >
+                                <base name="Control" id="3473" addr="0x7fca469a7db0" />
                             </baselist >
-                            <attribute name="module" value="xbmcgui" id="3474" addr="0x7f99f1e402f0" />
-                            <attribute name="bases" value="0x7f99f1dd7a10" id="3475" addr="0x7f99f1dd7a10" />
-                            <attribute name="allbases" value="0x7f99f1dd7eb0" id="3476" addr="0x7f99f1dd7eb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="3477" addr="0x7f99f1de6c90" />
-                            <typescope id="3478" addr="0x7f99f1dd7930" >
-                                <attributelist id="3479" addr="0x7f99f1dd7930" >
-                                    <attribute name="inherit" value="0x7f99f1dd7a90" id="3480" addr="0x7f99f1dd7a90" />
-                                    <attribute name="name" value="ControlSpin" id="3481" addr="0x7f99f1de6c90" />
-                                    <typetab id="3482" addr="0x7f99f1dd7950" >
-                                        <attributelist id="3483" addr="0x7f99f1dd7950" >
+                            <attribute name="module" value="xbmcgui" id="3474" addr="0x7fca4698e2f0" />
+                            <attribute name="bases" value="0x7fca46925a10" id="3475" addr="0x7fca46925a10" />
+                            <attribute name="allbases" value="0x7fca46925eb0" id="3476" addr="0x7fca46925eb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="3477" addr="0x7fca46934c90" />
+                            <typescope id="3478" addr="0x7fca46925930" >
+                                <attributelist id="3479" addr="0x7fca46925930" >
+                                    <attribute name="inherit" value="0x7fca46925a90" id="3480" addr="0x7fca46925a90" />
+                                    <attribute name="name" value="ControlSpin" id="3481" addr="0x7fca46934c90" />
+                                    <typetab id="3482" addr="0x7fca46925950" >
+                                        <attributelist id="3483" addr="0x7fca46925950" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f99f1dd2150" id="3484" addr="0x7f99f1dd2150" />
-                                    <attribute name="qname" value="XBMCAddon::xbmcgui::ControlSpin" id="3485" addr="0x7f99f1de6c90" />
-                                    <attribute name="symtab" value="0x7f99f1e59fd0" id="3486" addr="0x7f99f1e59fd0" />
+                                    <attribute name="parent" value="0x7fca46920150" id="3484" addr="0x7fca46920150" />
+                                    <attribute name="qname" value="XBMCAddon::xbmcgui::ControlSpin" id="3485" addr="0x7fca46934c90" />
+                                    <attribute name="symtab" value="0x7fca469a7fd0" id="3486" addr="0x7fca469a7fd0" />
                                 </attributelist >
-                                <typescopesitem id="3487" addr="0x7f99f1dd7a90" >
-                                    <attributelist id="3488" addr="0x7f99f1dd7a90" >
+                                <typescopesitem id="3487" addr="0x7fca46925a90" >
+                                    <attributelist id="3488" addr="0x7fca46925a90" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="3489" addr="0x7f99f1dd78d0" >
-                                    <attributelist id="3490" addr="0x7f99f1dd78d0" >
+                                <typescopesitem id="3489" addr="0x7fca469258d0" >
+                                    <attributelist id="3490" addr="0x7fca469258d0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="3491" addr="0x7f99f1dd7950" >
-                                    <attributelist id="3492" addr="0x7f99f1dd7950" >
+                                <typescopesitem id="3491" addr="0x7fca46925950" >
+                                    <attributelist id="3492" addr="0x7fca46925950" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="3493" addr="0x7f99f1dd2150" >
-                                    <attributelist id="3494" addr="0x7f99f1dd2150" >
-                                        <attribute name="name" value="xbmcgui" id="3495" addr="0x7f99f1de6c90" />
-                                        <typetab id="3496" addr="0x7f99f1dd2170" >
-                                            <attributelist id="3497" addr="0x7f99f1dd2170" >
-                                                <attribute name="InterceptorBase" value="InterceptorBase" id="3498" addr="0x7f99f1de6c90" />
-                                                <attribute name="Dialog" value="Dialog" id="3499" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="3500" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="3501" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlTextBox" value="ControlTextBox" id="3502" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="3503" addr="0x7f99f1de6c90" />
-                                                <attribute name="Window" value="Window" id="3504" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="3505" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlList" value="ControlList" id="3506" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="3507" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlImage" value="ControlImage" id="3508" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlButton" value="ControlButton" id="3509" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlGroup" value="ControlGroup" id="3510" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogBusy" value="DialogBusy" id="3511" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="3512" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSpin" value="ControlSpin" id="3513" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlEdit" value="ControlEdit" id="3514" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="3515" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="3516" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlLabel" value="ControlLabel" id="3517" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlProgress" value="ControlProgress" id="3518" addr="0x7f99f1de6c90" />
-                                                <attribute name="Control" value="Control" id="3519" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSlider" value="ControlSlider" id="3520" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgress" value="DialogProgress" id="3521" addr="0x7f99f1de6c90" />
-                                                <attribute name="Action" value="Action" id="3522" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowDialog" value="WindowDialog" id="3523" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXML" value="WindowXML" id="3524" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItem" value="ListItem" id="3525" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="3526" addr="0x7f99f1de6c90" />
+                                <typescopesitem id="3493" addr="0x7fca46920150" >
+                                    <attributelist id="3494" addr="0x7fca46920150" >
+                                        <attribute name="name" value="xbmcgui" id="3495" addr="0x7fca46934c90" />
+                                        <typetab id="3496" addr="0x7fca46920170" >
+                                            <attributelist id="3497" addr="0x7fca46920170" >
+                                                <attribute name="InterceptorBase" value="InterceptorBase" id="3498" addr="0x7fca46934c90" />
+                                                <attribute name="Dialog" value="Dialog" id="3499" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="3500" addr="0x7fca46934c90" />
+                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="3501" addr="0x7fca46934c90" />
+                                                <attribute name="ControlTextBox" value="ControlTextBox" id="3502" addr="0x7fca46934c90" />
+                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="3503" addr="0x7fca46934c90" />
+                                                <attribute name="Window" value="Window" id="3504" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="3505" addr="0x7fca46934c90" />
+                                                <attribute name="ControlList" value="ControlList" id="3506" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="3507" addr="0x7fca46934c90" />
+                                                <attribute name="ControlImage" value="ControlImage" id="3508" addr="0x7fca46934c90" />
+                                                <attribute name="ControlButton" value="ControlButton" id="3509" addr="0x7fca46934c90" />
+                                                <attribute name="ControlGroup" value="ControlGroup" id="3510" addr="0x7fca46934c90" />
+                                                <attribute name="DialogBusy" value="DialogBusy" id="3511" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="3512" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSpin" value="ControlSpin" id="3513" addr="0x7fca46934c90" />
+                                                <attribute name="ControlEdit" value="ControlEdit" id="3514" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="3515" addr="0x7fca46934c90" />
+                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="3516" addr="0x7fca46934c90" />
+                                                <attribute name="ControlLabel" value="ControlLabel" id="3517" addr="0x7fca46934c90" />
+                                                <attribute name="ControlProgress" value="ControlProgress" id="3518" addr="0x7fca46934c90" />
+                                                <attribute name="Control" value="Control" id="3519" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSlider" value="ControlSlider" id="3520" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgress" value="DialogProgress" id="3521" addr="0x7fca46934c90" />
+                                                <attribute name="Action" value="Action" id="3522" addr="0x7fca46934c90" />
+                                                <attribute name="WindowDialog" value="WindowDialog" id="3523" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXML" value="WindowXML" id="3524" addr="0x7fca46934c90" />
+                                                <attribute name="ListItem" value="ListItem" id="3525" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="3526" addr="0x7fca46934c90" />
                                             </attributelist >
-                                            <typetabsitem id="3527" addr="0x7f99f1de1dd0" >
-                                                <attributelist id="3528" addr="0x7f99f1de1dd0" >
+                                            <typetabsitem id="3527" addr="0x7fca4692fdd0" >
+                                                <attributelist id="3528" addr="0x7fca4692fdd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3529" addr="0x7f99f1dde790" >
-                                                <attributelist id="3530" addr="0x7f99f1dde790" >
+                                            <typetabsitem id="3529" addr="0x7fca4692c790" >
+                                                <attributelist id="3530" addr="0x7fca4692c790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3531" addr="0x7f99f1de3f10" >
-                                                <attributelist id="3532" addr="0x7f99f1de3f10" >
+                                            <typetabsitem id="3531" addr="0x7fca46931f10" >
+                                                <attributelist id="3532" addr="0x7fca46931f10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3533" addr="0x7f99f1dd67b0" >
-                                                <attributelist id="3534" addr="0x7f99f1dd67b0" >
+                                            <typetabsitem id="3533" addr="0x7fca469247b0" >
+                                                <attributelist id="3534" addr="0x7fca469247b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3535" addr="0x7f99f1ddafd0" >
-                                                <attributelist id="3536" addr="0x7f99f1ddafd0" >
+                                            <typetabsitem id="3535" addr="0x7fca46928fd0" >
+                                                <attributelist id="3536" addr="0x7fca46928fd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3537" addr="0x7f99f1ddd430" >
-                                                <attributelist id="3538" addr="0x7f99f1ddd430" >
+                                            <typetabsitem id="3537" addr="0x7fca4692b430" >
+                                                <attributelist id="3538" addr="0x7fca4692b430" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3539" addr="0x7f99f1de2130" >
-                                                <attributelist id="3540" addr="0x7f99f1de2130" >
+                                            <typetabsitem id="3539" addr="0x7fca46930130" >
+                                                <attributelist id="3540" addr="0x7fca46930130" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3541" addr="0x7f99f1dd2f50" >
-                                                <attributelist id="3542" addr="0x7f99f1dd2f50" >
+                                            <typetabsitem id="3541" addr="0x7fca46920f50" >
+                                                <attributelist id="3542" addr="0x7fca46920f50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3543" addr="0x7f99f1dd9650" >
-                                                <attributelist id="3544" addr="0x7f99f1dd9650" >
+                                            <typetabsitem id="3543" addr="0x7fca46927650" >
+                                                <attributelist id="3544" addr="0x7fca46927650" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3545" addr="0x7f99f1de3390" >
-                                                <attributelist id="3546" addr="0x7f99f1de3390" >
+                                            <typetabsitem id="3545" addr="0x7fca46931390" >
+                                                <attributelist id="3546" addr="0x7fca46931390" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3547" addr="0x7f99f1ddb7b0" >
-                                                <attributelist id="3548" addr="0x7f99f1ddb7b0" >
+                                            <typetabsitem id="3547" addr="0x7fca469297b0" >
+                                                <attributelist id="3548" addr="0x7fca469297b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3549" addr="0x7f99f1ddc4b0" >
-                                                <attributelist id="3550" addr="0x7f99f1ddc4b0" >
+                                            <typetabsitem id="3549" addr="0x7fca4692a4b0" >
+                                                <attributelist id="3550" addr="0x7fca4692a4b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3551" addr="0x7f99f1ddcf90" >
-                                                <attributelist id="3552" addr="0x7f99f1ddcf90" >
+                                            <typetabsitem id="3551" addr="0x7fca4692af90" >
+                                                <attributelist id="3552" addr="0x7fca4692af90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3553" addr="0x7f99f1de11b0" >
-                                                <attributelist id="3554" addr="0x7f99f1de11b0" >
+                                            <typetabsitem id="3553" addr="0x7fca4692f1b0" >
+                                                <attributelist id="3554" addr="0x7fca4692f1b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3555" addr="0x7f99f1de15b0" >
-                                                <attributelist id="3556" addr="0x7f99f1de15b0" >
+                                            <typetabsitem id="3555" addr="0x7fca4692f5b0" >
+                                                <attributelist id="3556" addr="0x7fca4692f5b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3557" addr="0x7f99f1dd77f0" >
-                                                <attributelist id="3558" addr="0x7f99f1dd77f0" >
+                                            <typetabsitem id="3557" addr="0x7fca469257f0" >
+                                                <attributelist id="3558" addr="0x7fca469257f0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3559" addr="0x7f99f1dd8b30" >
-                                                <attributelist id="3560" addr="0x7f99f1dd8b30" >
+                                            <typetabsitem id="3559" addr="0x7fca46926b30" >
+                                                <attributelist id="3560" addr="0x7fca46926b30" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3561" addr="0x7f99f1dd2c50" >
-                                                <attributelist id="3562" addr="0x7f99f1dd2c50" >
+                                            <typetabsitem id="3561" addr="0x7fca46920c50" >
+                                                <attributelist id="3562" addr="0x7fca46920c50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3563" addr="0x7f99f1dda790" >
-                                                <attributelist id="3564" addr="0x7f99f1dda790" >
+                                            <typetabsitem id="3563" addr="0x7fca46928790" >
+                                                <attributelist id="3564" addr="0x7fca46928790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3565" addr="0x7f99f1dd8030" >
-                                                <attributelist id="3566" addr="0x7f99f1dd8030" >
+                                            <typetabsitem id="3565" addr="0x7fca46926030" >
+                                                <attributelist id="3566" addr="0x7fca46926030" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3567" addr="0x7f99f1ddbe10" >
-                                                <attributelist id="3568" addr="0x7f99f1ddbe10" >
+                                            <typetabsitem id="3567" addr="0x7fca46929e10" >
+                                                <attributelist id="3568" addr="0x7fca46929e10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3569" addr="0x7f99f1dd6b10" >
-                                                <attributelist id="3570" addr="0x7f99f1dd6b10" >
+                                            <typetabsitem id="3569" addr="0x7fca46924b10" >
+                                                <attributelist id="3570" addr="0x7fca46924b10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3571" addr="0x7f99f1dddf90" >
-                                                <attributelist id="3572" addr="0x7f99f1dddf90" >
+                                            <typetabsitem id="3571" addr="0x7fca4692bf90" >
+                                                <attributelist id="3572" addr="0x7fca4692bf90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3573" addr="0x7f99f1de0530" >
-                                                <attributelist id="3574" addr="0x7f99f1de0530" >
+                                            <typetabsitem id="3573" addr="0x7fca4692e530" >
+                                                <attributelist id="3574" addr="0x7fca4692e530" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3575" addr="0x7f99f1de1e50" >
-                                                <attributelist id="3576" addr="0x7f99f1de1e50" >
+                                            <typetabsitem id="3575" addr="0x7fca4692fe50" >
+                                                <attributelist id="3576" addr="0x7fca4692fe50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3577" addr="0x7f99f1de2d90" >
-                                                <attributelist id="3578" addr="0x7f99f1de2d90" >
+                                            <typetabsitem id="3577" addr="0x7fca46930d90" >
+                                                <attributelist id="3578" addr="0x7fca46930d90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3579" addr="0x7f99f1de3410" >
-                                                <attributelist id="3580" addr="0x7f99f1de3410" >
+                                            <typetabsitem id="3579" addr="0x7fca46931410" >
+                                                <attributelist id="3580" addr="0x7fca46931410" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3581" addr="0x7f99f1dd3590" >
-                                                <attributelist id="3582" addr="0x7f99f1dd3590" >
+                                            <typetabsitem id="3581" addr="0x7fca46921590" >
+                                                <attributelist id="3582" addr="0x7fca46921590" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3583" addr="0x7f99f1dd3390" >
-                                                <attributelist id="3584" addr="0x7f99f1dd3390" >
+                                            <typetabsitem id="3583" addr="0x7fca46921390" >
+                                                <attributelist id="3584" addr="0x7fca46921390" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7f99f1dd1d70" id="3585" addr="0x7f99f1dd1d70" />
-                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="3586" addr="0x7f99f1de6c90" />
-                                        <attribute name="symtab" value="0x7f99f1e40fb0" id="3587" addr="0x7f99f1e40fb0" />
+                                        <attribute name="parent" value="0x7fca4691fd70" id="3585" addr="0x7fca4691fd70" />
+                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="3586" addr="0x7fca46934c90" />
+                                        <attribute name="symtab" value="0x7fca4698efb0" id="3587" addr="0x7fca4698efb0" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="3588" addr="0x7f99f1dd7970" >
-                                    <attributelist id="3589" addr="0x7f99f1dd7970" >
+                                <typescopesitem id="3588" addr="0x7fca46925970" >
+                                    <attributelist id="3589" addr="0x7fca46925970" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="3590" addr="0x7f99f1e59fd0" >
-                                    <attributelist id="3591" addr="0x7f99f1e59fd0" >
-                                        <attribute name="inherit" value="0x7f99f1e5a030" id="3592" addr="0x7f99f1e5a030" />
-                                        <attribute name="name" value="ControlSpin" id="3593" addr="0x7f99f1de6c90" />
-                                        <attribute name="csymtab" value="0x7f99f1e59ff0" id="3594" addr="0x7f99f1e59ff0" />
-                                        <attribute name="symtab" value="0x7f99f1e59fb0" id="3595" addr="0x7f99f1e59fb0" />
+                                <typescopesitem id="3590" addr="0x7fca469a7fd0" >
+                                    <attributelist id="3591" addr="0x7fca469a7fd0" >
+                                        <attribute name="inherit" value="0x7fca469a8030" id="3592" addr="0x7fca469a8030" />
+                                        <attribute name="name" value="ControlSpin" id="3593" addr="0x7fca46934c90" />
+                                        <attribute name="csymtab" value="0x7fca469a7ff0" id="3594" addr="0x7fca469a7ff0" />
+                                        <attribute name="symtab" value="0x7fca469a7fb0" id="3595" addr="0x7fca469a7fb0" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <access id="3596" addr="0x7f99f1e59f50" >
-                            <attributelist id="3597" addr="0x7f99f1e59f50" >
-                                <attribute name="kind" value="public" id="3598" addr="0x7f99f1de6c90" />
+                        <access id="3596" addr="0x7fca469a7f50" >
+                            <attributelist id="3597" addr="0x7fca469a7f50" >
+                                <attribute name="kind" value="public" id="3598" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </access >
-                        <destructor id="3599" addr="0x7f99f1e5a110" >
-                            <attributelist id="3600" addr="0x7f99f1e5a110" >
-                                <attribute name="ismember" value="1" id="3601" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="~ControlSpin" id="3602" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="~ControlSpin" id="3603" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="3604" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="3605" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e59fd0" id="3606" addr="0x7f99f1e59fd0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3607" addr="0x7f99f1de6c90" />
+                        <destructor id="3599" addr="0x7fca469a8110" >
+                            <attributelist id="3600" addr="0x7fca469a8110" >
+                                <attribute name="ismember" value="1" id="3601" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="~ControlSpin" id="3602" addr="0x7fca46934c90" />
+                                <attribute name="name" value="~ControlSpin" id="3603" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="3604" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="3605" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a7fd0" id="3606" addr="0x7fca469a7fd0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3607" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </destructor >
-                        <cdecl id="3608" addr="0x7f99f1e5aa30" >
-                            <attributelist id="3609" addr="0x7f99f1e5aa30" >
-                                <attribute name="name" value="setTextures" id="3610" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="3611" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e59fd0" id="3612" addr="0x7f99f1e59fd0" />
-                                <attribute name="kind" value="function" id="3613" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setTextures" id="3614" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char)." id="3615" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="3616" addr="0x7f99f1de6c90" />
-                                <parmlist id="3617" addr="0x7f99f1e5a330" >
+                        <cdecl id="3608" addr="0x7fca469a8a30" >
+                            <attributelist id="3609" addr="0x7fca469a8a30" >
+                                <attribute name="name" value="setTextures" id="3610" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="3611" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a7fd0" id="3612" addr="0x7fca469a7fd0" />
+                                <attribute name="kind" value="function" id="3613" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setTextures" id="3614" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char)." id="3615" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="3616" addr="0x7fca46934c90" />
+                                <parmlist id="3617" addr="0x7fca469a8330" >
                                     <parm id="3618">
-                                        <attributelist id="3619" addr="0x7f99f1e5a330" >
-                                            <attribute name="name" value="up" id="3620" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="3621" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3619" addr="0x7fca469a8330" >
+                                            <attribute name="name" value="up" id="3620" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="3621" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="3622">
-                                        <attributelist id="3623" addr="0x7f99f1e5a470" >
-                                            <attribute name="name" value="down" id="3624" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="3625" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3623" addr="0x7fca469a8470" >
+                                            <attribute name="name" value="down" id="3624" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="3625" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="3626">
-                                        <attributelist id="3627" addr="0x7f99f1e5a5b0" >
-                                            <attribute name="name" value="upFocus" id="3628" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="3629" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3627" addr="0x7fca469a85b0" >
+                                            <attribute name="name" value="upFocus" id="3628" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="3629" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="3630">
-                                        <attributelist id="3631" addr="0x7f99f1e5a6f0" >
-                                            <attribute name="name" value="downFocus" id="3632" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="3633" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3631" addr="0x7fca469a86f0" >
+                                            <attribute name="name" value="downFocus" id="3632" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="3633" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="3634">
-                                        <attributelist id="3635" addr="0x7f99f1e5a830" >
-                                            <attribute name="name" value="upDisabled" id="3636" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="3637" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3635" addr="0x7fca469a8830" >
+                                            <attribute name="name" value="upDisabled" id="3636" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="3637" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="3638">
-                                        <attributelist id="3639" addr="0x7f99f1e5a970" >
-                                            <attribute name="name" value="downDisabled" id="3640" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="3641" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3639" addr="0x7fca469a8970" >
+                                            <attribute name="name" value="downDisabled" id="3640" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="3641" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="3642" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3643" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="3644" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="3642" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3643" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="3644" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <access id="3645" addr="0x7f99f1e5aaf0" >
-                            <attributelist id="3646" addr="0x7f99f1e5aaf0" >
-                                <attribute name="kind" value="private" id="3647" addr="0x7f99f1de6c90" />
+                        <access id="3645" addr="0x7fca469a8af0" >
+                            <attributelist id="3646" addr="0x7fca469a8af0" >
+                                <attribute name="kind" value="private" id="3647" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="3648" addr="0x7f99f1e5ac50" >
-                            <attributelist id="3649" addr="0x7f99f1e5ac50" >
-                                <attribute name="ismember" value="1" id="3650" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="ControlSpin" id="3651" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="3652" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="private" id="3653" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="3654" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e59fd0" id="3655" addr="0x7f99f1e59fd0" />
+                        <constructor id="3648" addr="0x7fca469a8c50" >
+                            <attributelist id="3649" addr="0x7fca469a8c50" >
+                                <attribute name="ismember" value="1" id="3650" addr="0x7fca46934c90" />
+                                <attribute name="name" value="ControlSpin" id="3651" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="3652" addr="0x7fca46934c90" />
+                                <attribute name="access" value="private" id="3653" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="3654" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a7fd0" id="3655" addr="0x7fca469a7fd0" />
                             </attributelist >
                          
                         </constructor >
-                        <access id="3656" addr="0x7f99f1e5ae10" >
-                            <attributelist id="3657" addr="0x7f99f1e5ae10" >
-                                <attribute name="kind" value="public" id="3658" addr="0x7f99f1de6c90" />
+                        <access id="3656" addr="0x7fca469a8e10" >
+                            <attributelist id="3657" addr="0x7fca469a8e10" >
+                                <attribute name="kind" value="public" id="3658" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </access >
                     </class >
-                    <class id="3659" addr="0x7f99f1e5afd0" >
-                        <attributelist id="3660" addr="0x7f99f1e5afd0" >
-                            <attribute name="name" value="XBMCAddon::xbmcgui::ControlLabel" id="3661" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="3662" addr="0x7f99f1e40fb0" />
-                            <attribute name="symtab" value="0x7f99f1e5b110" id="3663" addr="0x7f99f1e5b110" />
-                            <attribute name="allows_typedef" value="1" id="3664" addr="0x7f99f1de6c90" />
-                            <attribute name="typepass_visit" value="1" id="3665" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_visit" value="1" id="3666" addr="0x7f99f1de6c90" />
-                            <attribute name="kind" value="class" id="3667" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_name" value="ControlLabel" id="3668" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_has_constructor" value="1" id="3669" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_public_constructor" value="1" id="3670" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_has_destructor" value="1" id="3671" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_default_destructor" value="1" id="3672" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_copy_constructor" value="1" id="3673" addr="0x7f99f1de6c90" />
-                            <attribute name="privatebaselist" value="0x7f99f1e5afb0" id="3674" addr="0x7f99f1e5afb0" />
-                            <attribute name="protectedbaselist" value="0x7f99f1e5af90" id="3675" addr="0x7f99f1e5af90" />
-                            <baselist id="3676" addr="0x7f99f1e5af70" >
-                                <base name="Control" id="3677" addr="0x7f99f1e5aef0" />
+                    <class id="3659" addr="0x7fca469a8fd0" >
+                        <attributelist id="3660" addr="0x7fca469a8fd0" >
+                            <attribute name="name" value="XBMCAddon::xbmcgui::ControlLabel" id="3661" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="3662" addr="0x7fca4698efb0" />
+                            <attribute name="symtab" value="0x7fca469a9110" id="3663" addr="0x7fca469a9110" />
+                            <attribute name="allows_typedef" value="1" id="3664" addr="0x7fca46934c90" />
+                            <attribute name="typepass_visit" value="1" id="3665" addr="0x7fca46934c90" />
+                            <attribute name="allocate_visit" value="1" id="3666" addr="0x7fca46934c90" />
+                            <attribute name="kind" value="class" id="3667" addr="0x7fca46934c90" />
+                            <attribute name="sym_name" value="ControlLabel" id="3668" addr="0x7fca46934c90" />
+                            <attribute name="allocate_has_constructor" value="1" id="3669" addr="0x7fca46934c90" />
+                            <attribute name="allocate_public_constructor" value="1" id="3670" addr="0x7fca46934c90" />
+                            <attribute name="allocate_has_destructor" value="1" id="3671" addr="0x7fca46934c90" />
+                            <attribute name="allocate_default_destructor" value="1" id="3672" addr="0x7fca46934c90" />
+                            <attribute name="allocate_copy_constructor" value="1" id="3673" addr="0x7fca46934c90" />
+                            <attribute name="privatebaselist" value="0x7fca469a8fb0" id="3674" addr="0x7fca469a8fb0" />
+                            <attribute name="protectedbaselist" value="0x7fca469a8f90" id="3675" addr="0x7fca469a8f90" />
+                            <baselist id="3676" addr="0x7fca469a8f70" >
+                                <base name="Control" id="3677" addr="0x7fca469a8ef0" />
                             </baselist >
-                            <attribute name="module" value="xbmcgui" id="3678" addr="0x7f99f1e402f0" />
-                            <attribute name="bases" value="0x7f99f1dd8150" id="3679" addr="0x7f99f1dd8150" />
-                            <attribute name="allbases" value="0x7f99f1dd83f0" id="3680" addr="0x7f99f1dd83f0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="3681" addr="0x7f99f1de6c90" />
-                            <typescope id="3682" addr="0x7f99f1dd8090" >
-                                <attributelist id="3683" addr="0x7f99f1dd8090" >
-                                    <attribute name="inherit" value="0x7f99f1dd81d0" id="3684" addr="0x7f99f1dd81d0" />
-                                    <attribute name="name" value="ControlLabel" id="3685" addr="0x7f99f1de6c90" />
-                                    <typetab id="3686" addr="0x7f99f1dd80f0" >
-                                        <attributelist id="3687" addr="0x7f99f1dd80f0" >
+                            <attribute name="module" value="xbmcgui" id="3678" addr="0x7fca4698e2f0" />
+                            <attribute name="bases" value="0x7fca46926150" id="3679" addr="0x7fca46926150" />
+                            <attribute name="allbases" value="0x7fca469263f0" id="3680" addr="0x7fca469263f0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="3681" addr="0x7fca46934c90" />
+                            <typescope id="3682" addr="0x7fca46926090" >
+                                <attributelist id="3683" addr="0x7fca46926090" >
+                                    <attribute name="inherit" value="0x7fca469261d0" id="3684" addr="0x7fca469261d0" />
+                                    <attribute name="name" value="ControlLabel" id="3685" addr="0x7fca46934c90" />
+                                    <typetab id="3686" addr="0x7fca469260f0" >
+                                        <attributelist id="3687" addr="0x7fca469260f0" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f99f1dd2150" id="3688" addr="0x7f99f1dd2150" />
-                                    <attribute name="qname" value="XBMCAddon::xbmcgui::ControlLabel" id="3689" addr="0x7f99f1de6c90" />
-                                    <attribute name="symtab" value="0x7f99f1e5b110" id="3690" addr="0x7f99f1e5b110" />
+                                    <attribute name="parent" value="0x7fca46920150" id="3688" addr="0x7fca46920150" />
+                                    <attribute name="qname" value="XBMCAddon::xbmcgui::ControlLabel" id="3689" addr="0x7fca46934c90" />
+                                    <attribute name="symtab" value="0x7fca469a9110" id="3690" addr="0x7fca469a9110" />
                                 </attributelist >
-                                <typescopesitem id="3691" addr="0x7f99f1dd81d0" >
-                                    <attributelist id="3692" addr="0x7f99f1dd81d0" >
+                                <typescopesitem id="3691" addr="0x7fca469261d0" >
+                                    <attributelist id="3692" addr="0x7fca469261d0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="3693" addr="0x7f99f1dd7fd0" >
-                                    <attributelist id="3694" addr="0x7f99f1dd7fd0" >
+                                <typescopesitem id="3693" addr="0x7fca46925fd0" >
+                                    <attributelist id="3694" addr="0x7fca46925fd0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="3695" addr="0x7f99f1dd80f0" >
-                                    <attributelist id="3696" addr="0x7f99f1dd80f0" >
+                                <typescopesitem id="3695" addr="0x7fca469260f0" >
+                                    <attributelist id="3696" addr="0x7fca469260f0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="3697" addr="0x7f99f1dd2150" >
-                                    <attributelist id="3698" addr="0x7f99f1dd2150" >
-                                        <attribute name="name" value="xbmcgui" id="3699" addr="0x7f99f1de6c90" />
-                                        <typetab id="3700" addr="0x7f99f1dd2170" >
-                                            <attributelist id="3701" addr="0x7f99f1dd2170" >
-                                                <attribute name="InterceptorBase" value="InterceptorBase" id="3702" addr="0x7f99f1de6c90" />
-                                                <attribute name="Dialog" value="Dialog" id="3703" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="3704" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="3705" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlTextBox" value="ControlTextBox" id="3706" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="3707" addr="0x7f99f1de6c90" />
-                                                <attribute name="Window" value="Window" id="3708" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="3709" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlList" value="ControlList" id="3710" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="3711" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlImage" value="ControlImage" id="3712" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlButton" value="ControlButton" id="3713" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlGroup" value="ControlGroup" id="3714" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogBusy" value="DialogBusy" id="3715" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="3716" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSpin" value="ControlSpin" id="3717" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlEdit" value="ControlEdit" id="3718" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="3719" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="3720" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlLabel" value="ControlLabel" id="3721" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlProgress" value="ControlProgress" id="3722" addr="0x7f99f1de6c90" />
-                                                <attribute name="Control" value="Control" id="3723" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSlider" value="ControlSlider" id="3724" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgress" value="DialogProgress" id="3725" addr="0x7f99f1de6c90" />
-                                                <attribute name="Action" value="Action" id="3726" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowDialog" value="WindowDialog" id="3727" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXML" value="WindowXML" id="3728" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItem" value="ListItem" id="3729" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="3730" addr="0x7f99f1de6c90" />
+                                <typescopesitem id="3697" addr="0x7fca46920150" >
+                                    <attributelist id="3698" addr="0x7fca46920150" >
+                                        <attribute name="name" value="xbmcgui" id="3699" addr="0x7fca46934c90" />
+                                        <typetab id="3700" addr="0x7fca46920170" >
+                                            <attributelist id="3701" addr="0x7fca46920170" >
+                                                <attribute name="InterceptorBase" value="InterceptorBase" id="3702" addr="0x7fca46934c90" />
+                                                <attribute name="Dialog" value="Dialog" id="3703" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="3704" addr="0x7fca46934c90" />
+                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="3705" addr="0x7fca46934c90" />
+                                                <attribute name="ControlTextBox" value="ControlTextBox" id="3706" addr="0x7fca46934c90" />
+                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="3707" addr="0x7fca46934c90" />
+                                                <attribute name="Window" value="Window" id="3708" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="3709" addr="0x7fca46934c90" />
+                                                <attribute name="ControlList" value="ControlList" id="3710" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="3711" addr="0x7fca46934c90" />
+                                                <attribute name="ControlImage" value="ControlImage" id="3712" addr="0x7fca46934c90" />
+                                                <attribute name="ControlButton" value="ControlButton" id="3713" addr="0x7fca46934c90" />
+                                                <attribute name="ControlGroup" value="ControlGroup" id="3714" addr="0x7fca46934c90" />
+                                                <attribute name="DialogBusy" value="DialogBusy" id="3715" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="3716" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSpin" value="ControlSpin" id="3717" addr="0x7fca46934c90" />
+                                                <attribute name="ControlEdit" value="ControlEdit" id="3718" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="3719" addr="0x7fca46934c90" />
+                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="3720" addr="0x7fca46934c90" />
+                                                <attribute name="ControlLabel" value="ControlLabel" id="3721" addr="0x7fca46934c90" />
+                                                <attribute name="ControlProgress" value="ControlProgress" id="3722" addr="0x7fca46934c90" />
+                                                <attribute name="Control" value="Control" id="3723" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSlider" value="ControlSlider" id="3724" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgress" value="DialogProgress" id="3725" addr="0x7fca46934c90" />
+                                                <attribute name="Action" value="Action" id="3726" addr="0x7fca46934c90" />
+                                                <attribute name="WindowDialog" value="WindowDialog" id="3727" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXML" value="WindowXML" id="3728" addr="0x7fca46934c90" />
+                                                <attribute name="ListItem" value="ListItem" id="3729" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="3730" addr="0x7fca46934c90" />
                                             </attributelist >
-                                            <typetabsitem id="3731" addr="0x7f99f1de1dd0" >
-                                                <attributelist id="3732" addr="0x7f99f1de1dd0" >
+                                            <typetabsitem id="3731" addr="0x7fca4692fdd0" >
+                                                <attributelist id="3732" addr="0x7fca4692fdd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3733" addr="0x7f99f1dde790" >
-                                                <attributelist id="3734" addr="0x7f99f1dde790" >
+                                            <typetabsitem id="3733" addr="0x7fca4692c790" >
+                                                <attributelist id="3734" addr="0x7fca4692c790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3735" addr="0x7f99f1de3f10" >
-                                                <attributelist id="3736" addr="0x7f99f1de3f10" >
+                                            <typetabsitem id="3735" addr="0x7fca46931f10" >
+                                                <attributelist id="3736" addr="0x7fca46931f10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3737" addr="0x7f99f1dd67b0" >
-                                                <attributelist id="3738" addr="0x7f99f1dd67b0" >
+                                            <typetabsitem id="3737" addr="0x7fca469247b0" >
+                                                <attributelist id="3738" addr="0x7fca469247b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3739" addr="0x7f99f1ddafd0" >
-                                                <attributelist id="3740" addr="0x7f99f1ddafd0" >
+                                            <typetabsitem id="3739" addr="0x7fca46928fd0" >
+                                                <attributelist id="3740" addr="0x7fca46928fd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3741" addr="0x7f99f1ddd430" >
-                                                <attributelist id="3742" addr="0x7f99f1ddd430" >
+                                            <typetabsitem id="3741" addr="0x7fca4692b430" >
+                                                <attributelist id="3742" addr="0x7fca4692b430" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3743" addr="0x7f99f1de2130" >
-                                                <attributelist id="3744" addr="0x7f99f1de2130" >
+                                            <typetabsitem id="3743" addr="0x7fca46930130" >
+                                                <attributelist id="3744" addr="0x7fca46930130" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3745" addr="0x7f99f1dd2f50" >
-                                                <attributelist id="3746" addr="0x7f99f1dd2f50" >
+                                            <typetabsitem id="3745" addr="0x7fca46920f50" >
+                                                <attributelist id="3746" addr="0x7fca46920f50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3747" addr="0x7f99f1dd9650" >
-                                                <attributelist id="3748" addr="0x7f99f1dd9650" >
+                                            <typetabsitem id="3747" addr="0x7fca46927650" >
+                                                <attributelist id="3748" addr="0x7fca46927650" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3749" addr="0x7f99f1de3390" >
-                                                <attributelist id="3750" addr="0x7f99f1de3390" >
+                                            <typetabsitem id="3749" addr="0x7fca46931390" >
+                                                <attributelist id="3750" addr="0x7fca46931390" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3751" addr="0x7f99f1ddb7b0" >
-                                                <attributelist id="3752" addr="0x7f99f1ddb7b0" >
+                                            <typetabsitem id="3751" addr="0x7fca469297b0" >
+                                                <attributelist id="3752" addr="0x7fca469297b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3753" addr="0x7f99f1ddc4b0" >
-                                                <attributelist id="3754" addr="0x7f99f1ddc4b0" >
+                                            <typetabsitem id="3753" addr="0x7fca4692a4b0" >
+                                                <attributelist id="3754" addr="0x7fca4692a4b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3755" addr="0x7f99f1ddcf90" >
-                                                <attributelist id="3756" addr="0x7f99f1ddcf90" >
+                                            <typetabsitem id="3755" addr="0x7fca4692af90" >
+                                                <attributelist id="3756" addr="0x7fca4692af90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3757" addr="0x7f99f1de11b0" >
-                                                <attributelist id="3758" addr="0x7f99f1de11b0" >
+                                            <typetabsitem id="3757" addr="0x7fca4692f1b0" >
+                                                <attributelist id="3758" addr="0x7fca4692f1b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3759" addr="0x7f99f1de15b0" >
-                                                <attributelist id="3760" addr="0x7f99f1de15b0" >
+                                            <typetabsitem id="3759" addr="0x7fca4692f5b0" >
+                                                <attributelist id="3760" addr="0x7fca4692f5b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3761" addr="0x7f99f1dd77f0" >
-                                                <attributelist id="3762" addr="0x7f99f1dd77f0" >
+                                            <typetabsitem id="3761" addr="0x7fca469257f0" >
+                                                <attributelist id="3762" addr="0x7fca469257f0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3763" addr="0x7f99f1dd8b30" >
-                                                <attributelist id="3764" addr="0x7f99f1dd8b30" >
+                                            <typetabsitem id="3763" addr="0x7fca46926b30" >
+                                                <attributelist id="3764" addr="0x7fca46926b30" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3765" addr="0x7f99f1dd2c50" >
-                                                <attributelist id="3766" addr="0x7f99f1dd2c50" >
+                                            <typetabsitem id="3765" addr="0x7fca46920c50" >
+                                                <attributelist id="3766" addr="0x7fca46920c50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3767" addr="0x7f99f1dda790" >
-                                                <attributelist id="3768" addr="0x7f99f1dda790" >
+                                            <typetabsitem id="3767" addr="0x7fca46928790" >
+                                                <attributelist id="3768" addr="0x7fca46928790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3769" addr="0x7f99f1dd8030" >
-                                                <attributelist id="3770" addr="0x7f99f1dd8030" >
+                                            <typetabsitem id="3769" addr="0x7fca46926030" >
+                                                <attributelist id="3770" addr="0x7fca46926030" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3771" addr="0x7f99f1ddbe10" >
-                                                <attributelist id="3772" addr="0x7f99f1ddbe10" >
+                                            <typetabsitem id="3771" addr="0x7fca46929e10" >
+                                                <attributelist id="3772" addr="0x7fca46929e10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3773" addr="0x7f99f1dd6b10" >
-                                                <attributelist id="3774" addr="0x7f99f1dd6b10" >
+                                            <typetabsitem id="3773" addr="0x7fca46924b10" >
+                                                <attributelist id="3774" addr="0x7fca46924b10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3775" addr="0x7f99f1dddf90" >
-                                                <attributelist id="3776" addr="0x7f99f1dddf90" >
+                                            <typetabsitem id="3775" addr="0x7fca4692bf90" >
+                                                <attributelist id="3776" addr="0x7fca4692bf90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3777" addr="0x7f99f1de0530" >
-                                                <attributelist id="3778" addr="0x7f99f1de0530" >
+                                            <typetabsitem id="3777" addr="0x7fca4692e530" >
+                                                <attributelist id="3778" addr="0x7fca4692e530" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3779" addr="0x7f99f1de1e50" >
-                                                <attributelist id="3780" addr="0x7f99f1de1e50" >
+                                            <typetabsitem id="3779" addr="0x7fca4692fe50" >
+                                                <attributelist id="3780" addr="0x7fca4692fe50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3781" addr="0x7f99f1de2d90" >
-                                                <attributelist id="3782" addr="0x7f99f1de2d90" >
+                                            <typetabsitem id="3781" addr="0x7fca46930d90" >
+                                                <attributelist id="3782" addr="0x7fca46930d90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3783" addr="0x7f99f1de3410" >
-                                                <attributelist id="3784" addr="0x7f99f1de3410" >
+                                            <typetabsitem id="3783" addr="0x7fca46931410" >
+                                                <attributelist id="3784" addr="0x7fca46931410" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3785" addr="0x7f99f1dd3590" >
-                                                <attributelist id="3786" addr="0x7f99f1dd3590" >
+                                            <typetabsitem id="3785" addr="0x7fca46921590" >
+                                                <attributelist id="3786" addr="0x7fca46921590" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3787" addr="0x7f99f1dd3390" >
-                                                <attributelist id="3788" addr="0x7f99f1dd3390" >
+                                            <typetabsitem id="3787" addr="0x7fca46921390" >
+                                                <attributelist id="3788" addr="0x7fca46921390" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7f99f1dd1d70" id="3789" addr="0x7f99f1dd1d70" />
-                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="3790" addr="0x7f99f1de6c90" />
-                                        <attribute name="symtab" value="0x7f99f1e40fb0" id="3791" addr="0x7f99f1e40fb0" />
+                                        <attribute name="parent" value="0x7fca4691fd70" id="3789" addr="0x7fca4691fd70" />
+                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="3790" addr="0x7fca46934c90" />
+                                        <attribute name="symtab" value="0x7fca4698efb0" id="3791" addr="0x7fca4698efb0" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="3792" addr="0x7f99f1dd80d0" >
-                                    <attributelist id="3793" addr="0x7f99f1dd80d0" >
+                                <typescopesitem id="3792" addr="0x7fca469260d0" >
+                                    <attributelist id="3793" addr="0x7fca469260d0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="3794" addr="0x7f99f1e5b110" >
-                                    <attributelist id="3795" addr="0x7f99f1e5b110" >
-                                        <attribute name="inherit" value="0x7f99f1e5b170" id="3796" addr="0x7f99f1e5b170" />
-                                        <attribute name="name" value="ControlLabel" id="3797" addr="0x7f99f1de6c90" />
-                                        <attribute name="csymtab" value="0x7f99f1e5b130" id="3798" addr="0x7f99f1e5b130" />
-                                        <attribute name="symtab" value="0x7f99f1e5b0f0" id="3799" addr="0x7f99f1e5b0f0" />
+                                <typescopesitem id="3794" addr="0x7fca469a9110" >
+                                    <attributelist id="3795" addr="0x7fca469a9110" >
+                                        <attribute name="inherit" value="0x7fca469a9170" id="3796" addr="0x7fca469a9170" />
+                                        <attribute name="name" value="ControlLabel" id="3797" addr="0x7fca46934c90" />
+                                        <attribute name="csymtab" value="0x7fca469a9130" id="3798" addr="0x7fca469a9130" />
+                                        <attribute name="symtab" value="0x7fca469a90f0" id="3799" addr="0x7fca469a90f0" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <access id="3800" addr="0x7f99f1e5b090" >
-                            <attributelist id="3801" addr="0x7f99f1e5b090" >
-                                <attribute name="kind" value="public" id="3802" addr="0x7f99f1de6c90" />
+                        <access id="3800" addr="0x7fca469a9090" >
+                            <attributelist id="3801" addr="0x7fca469a9090" >
+                                <attribute name="kind" value="public" id="3802" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="3803" addr="0x7f99f1e5c130" >
-                            <attributelist id="3804" addr="0x7f99f1e5c130" >
-                                <attribute name="name" value="ControlLabel" id="3805" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="3806" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e5b110" id="3807" addr="0x7f99f1e5b110" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e5c7d0" id="3808" addr="0x7f99f1e5c7d0" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e5c7d0" id="3809" addr="0x7f99f1e5c7d0" />
-                                <attribute name="sym_name" value="ControlLabel" id="3810" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,long,bool,long)." id="3811" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="3812" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e5c130" id="3813" addr="0x7f99f1e5c130" />
-                                <parmlist id="3814" addr="0x7f99f1e5b2d0" >
+                        <constructor id="3803" addr="0x7fca469aa130" >
+                            <attributelist id="3804" addr="0x7fca469aa130" >
+                                <attribute name="name" value="ControlLabel" id="3805" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="3806" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a9110" id="3807" addr="0x7fca469a9110" />
+                                <attribute name="sym_nextSibling" value="0x7fca469aa7d0" id="3808" addr="0x7fca469aa7d0" />
+                                <attribute name="csym_nextSibling" value="0x7fca469aa7d0" id="3809" addr="0x7fca469aa7d0" />
+                                <attribute name="sym_name" value="ControlLabel" id="3810" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,long,bool,long)." id="3811" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="3812" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469aa130" id="3813" addr="0x7fca469aa130" />
+                                <parmlist id="3814" addr="0x7fca469a92d0" >
                                     <parm id="3815">
-                                        <attributelist id="3816" addr="0x7f99f1e5b2d0" >
-                                            <attribute name="name" value="x" id="3817" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="3818" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3816" addr="0x7fca469a92d0" >
+                                            <attribute name="name" value="x" id="3817" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="3818" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="3819">
-                                        <attributelist id="3820" addr="0x7f99f1e5b3f0" >
-                                            <attribute name="name" value="y" id="3821" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="3822" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3820" addr="0x7fca469a93f0" >
+                                            <attribute name="name" value="y" id="3821" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="3822" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="3823">
-                                        <attributelist id="3824" addr="0x7f99f1e5b510" >
-                                            <attribute name="name" value="width" id="3825" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="3826" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3824" addr="0x7fca469a9510" >
+                                            <attribute name="name" value="width" id="3825" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="3826" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="3827">
-                                        <attributelist id="3828" addr="0x7f99f1e5b630" >
-                                            <attribute name="name" value="height" id="3829" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="3830" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3828" addr="0x7fca469a9630" >
+                                            <attribute name="name" value="height" id="3829" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="3830" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="3831">
-                                        <attributelist id="3832" addr="0x7f99f1e5b770" >
-                                            <attribute name="name" value="label" id="3833" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="3834" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3832" addr="0x7fca469a9770" >
+                                            <attribute name="name" value="label" id="3833" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="3834" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="3835">
-                                        <attributelist id="3836" addr="0x7f99f1e5b910" >
-                                            <attribute name="name" value="font" id="3837" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="3838" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="3839" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3836" addr="0x7fca469a9910" >
+                                            <attribute name="name" value="font" id="3837" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="3838" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="3839" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="3840">
-                                        <attributelist id="3841" addr="0x7f99f1e5bab0" >
-                                            <attribute name="name" value="textColor" id="3842" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="3843" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="3844" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3841" addr="0x7fca469a9ab0" >
+                                            <attribute name="name" value="textColor" id="3842" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="3843" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="3844" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="3845">
-                                        <attributelist id="3846" addr="0x7f99f1e5bc50" >
-                                            <attribute name="name" value="disabledColor" id="3847" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="3848" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="3849" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3846" addr="0x7fca469a9c50" >
+                                            <attribute name="name" value="disabledColor" id="3847" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="3848" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="3849" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="3850">
-                                        <attributelist id="3851" addr="0x7f99f1e5bdd0" >
-                                            <attribute name="name" value="alignment" id="3852" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBFONT_LEFT" id="3853" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="3854" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3851" addr="0x7fca469a9dd0" >
+                                            <attribute name="name" value="alignment" id="3852" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBFONT_LEFT" id="3853" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="3854" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="3855">
-                                        <attributelist id="3856" addr="0x7f99f1e5bf10" >
-                                            <attribute name="name" value="hasPath" id="3857" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="false" id="3858" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="3859" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3856" addr="0x7fca469a9f10" >
+                                            <attribute name="name" value="hasPath" id="3857" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="false" id="3858" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="3859" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="3860">
-                                        <attributelist id="3861" addr="0x7f99f1e5c070" >
-                                            <attribute name="name" value="angle" id="3862" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="0" id="3863" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="3864" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3861" addr="0x7fca469aa070" >
+                                            <attribute name="name" value="angle" id="3862" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="0" id="3863" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="3864" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_0" id="3865" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="3866" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3865" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="3866" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="3867" addr="0x7f99f1e5c7d0" >
-                            <attributelist id="3868" addr="0x7f99f1e5c7d0" >
-                                <attribute name="name" value="ControlLabel" id="3869" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="3870" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e5b110" id="3871" addr="0x7f99f1e5b110" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e5cdd0" id="3872" addr="0x7f99f1e5cdd0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e5c130" id="3873" addr="0x7f99f1e5c130" />
-                                <attribute name="sym_name" value="ControlLabel" id="3874" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e5cdd0" id="3875" addr="0x7f99f1e5cdd0" />
-                                <attribute name="defaultargs" value="0x7f99f1e5c130" id="3876" addr="0x7f99f1e5c130" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,long,bool)." id="3877" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="3878" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e5c130" id="3879" addr="0x7f99f1e5c130" />
-                                <parmlist id="3880" addr="0x7f99f1e5c1d0" >
+                        <constructor id="3867" addr="0x7fca469aa7d0" >
+                            <attributelist id="3868" addr="0x7fca469aa7d0" >
+                                <attribute name="name" value="ControlLabel" id="3869" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="3870" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a9110" id="3871" addr="0x7fca469a9110" />
+                                <attribute name="csym_nextSibling" value="0x7fca469aadd0" id="3872" addr="0x7fca469aadd0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469aa130" id="3873" addr="0x7fca469aa130" />
+                                <attribute name="sym_name" value="ControlLabel" id="3874" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469aadd0" id="3875" addr="0x7fca469aadd0" />
+                                <attribute name="defaultargs" value="0x7fca469aa130" id="3876" addr="0x7fca469aa130" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,long,bool)." id="3877" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="3878" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469aa130" id="3879" addr="0x7fca469aa130" />
+                                <parmlist id="3880" addr="0x7fca469aa1d0" >
                                     <parm id="3881">
-                                        <attributelist id="3882" addr="0x7f99f1e5c1d0" >
-                                            <attribute name="name" value="x" id="3883" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="3884" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3882" addr="0x7fca469aa1d0" >
+                                            <attribute name="name" value="x" id="3883" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="3884" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="3885">
-                                        <attributelist id="3886" addr="0x7f99f1e5c290" >
-                                            <attribute name="name" value="y" id="3887" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="3888" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3886" addr="0x7fca469aa290" >
+                                            <attribute name="name" value="y" id="3887" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="3888" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="3889">
-                                        <attributelist id="3890" addr="0x7f99f1e5c310" >
-                                            <attribute name="name" value="width" id="3891" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="3892" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3890" addr="0x7fca469aa310" >
+                                            <attribute name="name" value="width" id="3891" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="3892" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="3893">
-                                        <attributelist id="3894" addr="0x7f99f1e5c390" >
-                                            <attribute name="name" value="height" id="3895" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="3896" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3894" addr="0x7fca469aa390" >
+                                            <attribute name="name" value="height" id="3895" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="3896" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="3897">
-                                        <attributelist id="3898" addr="0x7f99f1e5c410" >
-                                            <attribute name="name" value="label" id="3899" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="3900" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3898" addr="0x7fca469aa410" >
+                                            <attribute name="name" value="label" id="3899" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="3900" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="3901">
-                                        <attributelist id="3902" addr="0x7f99f1e5c490" >
-                                            <attribute name="name" value="font" id="3903" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="3904" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="3905" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3902" addr="0x7fca469aa490" >
+                                            <attribute name="name" value="font" id="3903" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="3904" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="3905" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="3906">
-                                        <attributelist id="3907" addr="0x7f99f1e5c530" >
-                                            <attribute name="name" value="textColor" id="3908" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="3909" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="3910" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3907" addr="0x7fca469aa530" >
+                                            <attribute name="name" value="textColor" id="3908" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="3909" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="3910" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="3911">
-                                        <attributelist id="3912" addr="0x7f99f1e5c5d0" >
-                                            <attribute name="name" value="disabledColor" id="3913" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="3914" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="3915" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3912" addr="0x7fca469aa5d0" >
+                                            <attribute name="name" value="disabledColor" id="3913" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="3914" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="3915" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="3916">
-                                        <attributelist id="3917" addr="0x7f99f1e5c670" >
-                                            <attribute name="name" value="alignment" id="3918" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBFONT_LEFT" id="3919" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="3920" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3917" addr="0x7fca469aa670" >
+                                            <attribute name="name" value="alignment" id="3918" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBFONT_LEFT" id="3919" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="3920" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="3921">
-                                        <attributelist id="3922" addr="0x7f99f1e5c710" >
-                                            <attribute name="name" value="hasPath" id="3923" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="false" id="3924" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="3925" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3922" addr="0x7fca469aa710" >
+                                            <attribute name="name" value="hasPath" id="3923" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="false" id="3924" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="3925" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_1" id="3926" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="3927" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="3926" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="3927" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="3928" addr="0x7f99f1e5cdd0" >
-                            <attributelist id="3929" addr="0x7f99f1e5cdd0" >
-                                <attribute name="name" value="ControlLabel" id="3930" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="3931" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e5b110" id="3932" addr="0x7f99f1e5b110" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e5d330" id="3933" addr="0x7f99f1e5d330" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e5c7d0" id="3934" addr="0x7f99f1e5c7d0" />
-                                <attribute name="sym_name" value="ControlLabel" id="3935" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e5d330" id="3936" addr="0x7f99f1e5d330" />
-                                <attribute name="defaultargs" value="0x7f99f1e5c130" id="3937" addr="0x7f99f1e5c130" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,long)." id="3938" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="3939" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e5c130" id="3940" addr="0x7f99f1e5c130" />
-                                <parmlist id="3941" addr="0x7f99f1e5c870" >
+                        <constructor id="3928" addr="0x7fca469aadd0" >
+                            <attributelist id="3929" addr="0x7fca469aadd0" >
+                                <attribute name="name" value="ControlLabel" id="3930" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="3931" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a9110" id="3932" addr="0x7fca469a9110" />
+                                <attribute name="csym_nextSibling" value="0x7fca469ab330" id="3933" addr="0x7fca469ab330" />
+                                <attribute name="sym_previousSibling" value="0x7fca469aa7d0" id="3934" addr="0x7fca469aa7d0" />
+                                <attribute name="sym_name" value="ControlLabel" id="3935" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469ab330" id="3936" addr="0x7fca469ab330" />
+                                <attribute name="defaultargs" value="0x7fca469aa130" id="3937" addr="0x7fca469aa130" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,long)." id="3938" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="3939" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469aa130" id="3940" addr="0x7fca469aa130" />
+                                <parmlist id="3941" addr="0x7fca469aa870" >
                                     <parm id="3942">
-                                        <attributelist id="3943" addr="0x7f99f1e5c870" >
-                                            <attribute name="name" value="x" id="3944" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="3945" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3943" addr="0x7fca469aa870" >
+                                            <attribute name="name" value="x" id="3944" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="3945" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="3946">
-                                        <attributelist id="3947" addr="0x7f99f1e5c930" >
-                                            <attribute name="name" value="y" id="3948" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="3949" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3947" addr="0x7fca469aa930" >
+                                            <attribute name="name" value="y" id="3948" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="3949" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="3950">
-                                        <attributelist id="3951" addr="0x7f99f1e5c9b0" >
-                                            <attribute name="name" value="width" id="3952" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="3953" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3951" addr="0x7fca469aa9b0" >
+                                            <attribute name="name" value="width" id="3952" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="3953" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="3954">
-                                        <attributelist id="3955" addr="0x7f99f1e5ca30" >
-                                            <attribute name="name" value="height" id="3956" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="3957" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3955" addr="0x7fca469aaa30" >
+                                            <attribute name="name" value="height" id="3956" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="3957" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="3958">
-                                        <attributelist id="3959" addr="0x7f99f1e5cab0" >
-                                            <attribute name="name" value="label" id="3960" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="3961" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3959" addr="0x7fca469aaab0" >
+                                            <attribute name="name" value="label" id="3960" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="3961" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="3962">
-                                        <attributelist id="3963" addr="0x7f99f1e5cb30" >
-                                            <attribute name="name" value="font" id="3964" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="3965" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="3966" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3963" addr="0x7fca469aab30" >
+                                            <attribute name="name" value="font" id="3964" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="3965" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="3966" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="3967">
-                                        <attributelist id="3968" addr="0x7f99f1e5cbd0" >
-                                            <attribute name="name" value="textColor" id="3969" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="3970" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="3971" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3968" addr="0x7fca469aabd0" >
+                                            <attribute name="name" value="textColor" id="3969" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="3970" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="3971" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="3972">
-                                        <attributelist id="3973" addr="0x7f99f1e5cc70" >
-                                            <attribute name="name" value="disabledColor" id="3974" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="3975" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="3976" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3973" addr="0x7fca469aac70" >
+                                            <attribute name="name" value="disabledColor" id="3974" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="3975" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="3976" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="3977">
-                                        <attributelist id="3978" addr="0x7f99f1e5cd10" >
-                                            <attribute name="name" value="alignment" id="3979" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBFONT_LEFT" id="3980" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="3981" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3978" addr="0x7fca469aad10" >
+                                            <attribute name="name" value="alignment" id="3979" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBFONT_LEFT" id="3980" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="3981" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_2" id="3982" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="3983" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_2" id="3982" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="3983" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="3984" addr="0x7f99f1e5d330" >
-                            <attributelist id="3985" addr="0x7f99f1e5d330" >
-                                <attribute name="name" value="ControlLabel" id="3986" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="3987" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e5b110" id="3988" addr="0x7f99f1e5b110" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e5d7f0" id="3989" addr="0x7f99f1e5d7f0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e5cdd0" id="3990" addr="0x7f99f1e5cdd0" />
-                                <attribute name="sym_name" value="ControlLabel" id="3991" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e5d7f0" id="3992" addr="0x7f99f1e5d7f0" />
-                                <attribute name="defaultargs" value="0x7f99f1e5c130" id="3993" addr="0x7f99f1e5c130" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char)." id="3994" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="3995" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e5c130" id="3996" addr="0x7f99f1e5c130" />
-                                <parmlist id="3997" addr="0x7f99f1e5ce70" >
+                        <constructor id="3984" addr="0x7fca469ab330" >
+                            <attributelist id="3985" addr="0x7fca469ab330" >
+                                <attribute name="name" value="ControlLabel" id="3986" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="3987" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a9110" id="3988" addr="0x7fca469a9110" />
+                                <attribute name="csym_nextSibling" value="0x7fca469ab7f0" id="3989" addr="0x7fca469ab7f0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469aadd0" id="3990" addr="0x7fca469aadd0" />
+                                <attribute name="sym_name" value="ControlLabel" id="3991" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469ab7f0" id="3992" addr="0x7fca469ab7f0" />
+                                <attribute name="defaultargs" value="0x7fca469aa130" id="3993" addr="0x7fca469aa130" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char)." id="3994" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="3995" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469aa130" id="3996" addr="0x7fca469aa130" />
+                                <parmlist id="3997" addr="0x7fca469aae70" >
                                     <parm id="3998">
-                                        <attributelist id="3999" addr="0x7f99f1e5ce70" >
-                                            <attribute name="name" value="x" id="4000" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4001" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3999" addr="0x7fca469aae70" >
+                                            <attribute name="name" value="x" id="4000" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4001" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4002">
-                                        <attributelist id="4003" addr="0x7f99f1e5cf30" >
-                                            <attribute name="name" value="y" id="4004" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4005" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4003" addr="0x7fca469aaf30" >
+                                            <attribute name="name" value="y" id="4004" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4005" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4006">
-                                        <attributelist id="4007" addr="0x7f99f1e5cfb0" >
-                                            <attribute name="name" value="width" id="4008" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4009" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4007" addr="0x7fca469aafb0" >
+                                            <attribute name="name" value="width" id="4008" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4009" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4010">
-                                        <attributelist id="4011" addr="0x7f99f1e5d030" >
-                                            <attribute name="name" value="height" id="4012" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4013" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4011" addr="0x7fca469ab030" >
+                                            <attribute name="name" value="height" id="4012" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4013" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4014">
-                                        <attributelist id="4015" addr="0x7f99f1e5d0b0" >
-                                            <attribute name="name" value="label" id="4016" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4017" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4015" addr="0x7fca469ab0b0" >
+                                            <attribute name="name" value="label" id="4016" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4017" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4018">
-                                        <attributelist id="4019" addr="0x7f99f1e5d130" >
-                                            <attribute name="name" value="font" id="4020" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4021" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4022" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4019" addr="0x7fca469ab130" >
+                                            <attribute name="name" value="font" id="4020" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4021" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4022" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4023">
-                                        <attributelist id="4024" addr="0x7f99f1e5d1d0" >
-                                            <attribute name="name" value="textColor" id="4025" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4026" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4027" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4024" addr="0x7fca469ab1d0" >
+                                            <attribute name="name" value="textColor" id="4025" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4026" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4027" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4028">
-                                        <attributelist id="4029" addr="0x7f99f1e5d270" >
-                                            <attribute name="name" value="disabledColor" id="4030" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4031" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4032" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4029" addr="0x7fca469ab270" >
+                                            <attribute name="name" value="disabledColor" id="4030" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4031" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4032" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_3" id="4033" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="4034" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_3" id="4033" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="4034" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="4035" addr="0x7f99f1e5d7f0" >
-                            <attributelist id="4036" addr="0x7f99f1e5d7f0" >
-                                <attribute name="name" value="ControlLabel" id="4037" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="4038" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e5b110" id="4039" addr="0x7f99f1e5b110" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e5dc10" id="4040" addr="0x7f99f1e5dc10" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e5d330" id="4041" addr="0x7f99f1e5d330" />
-                                <attribute name="sym_name" value="ControlLabel" id="4042" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e5dc10" id="4043" addr="0x7f99f1e5dc10" />
-                                <attribute name="defaultargs" value="0x7f99f1e5c130" id="4044" addr="0x7f99f1e5c130" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char)." id="4045" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="4046" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e5c130" id="4047" addr="0x7f99f1e5c130" />
-                                <parmlist id="4048" addr="0x7f99f1e5d3d0" >
+                        <constructor id="4035" addr="0x7fca469ab7f0" >
+                            <attributelist id="4036" addr="0x7fca469ab7f0" >
+                                <attribute name="name" value="ControlLabel" id="4037" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="4038" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a9110" id="4039" addr="0x7fca469a9110" />
+                                <attribute name="csym_nextSibling" value="0x7fca469abc10" id="4040" addr="0x7fca469abc10" />
+                                <attribute name="sym_previousSibling" value="0x7fca469ab330" id="4041" addr="0x7fca469ab330" />
+                                <attribute name="sym_name" value="ControlLabel" id="4042" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469abc10" id="4043" addr="0x7fca469abc10" />
+                                <attribute name="defaultargs" value="0x7fca469aa130" id="4044" addr="0x7fca469aa130" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char)." id="4045" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="4046" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469aa130" id="4047" addr="0x7fca469aa130" />
+                                <parmlist id="4048" addr="0x7fca469ab3d0" >
                                     <parm id="4049">
-                                        <attributelist id="4050" addr="0x7f99f1e5d3d0" >
-                                            <attribute name="name" value="x" id="4051" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4052" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4050" addr="0x7fca469ab3d0" >
+                                            <attribute name="name" value="x" id="4051" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4052" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4053">
-                                        <attributelist id="4054" addr="0x7f99f1e5d490" >
-                                            <attribute name="name" value="y" id="4055" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4056" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4054" addr="0x7fca469ab490" >
+                                            <attribute name="name" value="y" id="4055" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4056" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4057">
-                                        <attributelist id="4058" addr="0x7f99f1e5d510" >
-                                            <attribute name="name" value="width" id="4059" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4060" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4058" addr="0x7fca469ab510" >
+                                            <attribute name="name" value="width" id="4059" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4060" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4061">
-                                        <attributelist id="4062" addr="0x7f99f1e5d590" >
-                                            <attribute name="name" value="height" id="4063" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4064" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4062" addr="0x7fca469ab590" >
+                                            <attribute name="name" value="height" id="4063" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4064" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4065">
-                                        <attributelist id="4066" addr="0x7f99f1e5d610" >
-                                            <attribute name="name" value="label" id="4067" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4068" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4066" addr="0x7fca469ab610" >
+                                            <attribute name="name" value="label" id="4067" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4068" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4069">
-                                        <attributelist id="4070" addr="0x7f99f1e5d690" >
-                                            <attribute name="name" value="font" id="4071" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4072" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4073" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4070" addr="0x7fca469ab690" >
+                                            <attribute name="name" value="font" id="4071" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4072" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4073" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4074">
-                                        <attributelist id="4075" addr="0x7f99f1e5d730" >
-                                            <attribute name="name" value="textColor" id="4076" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4077" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4078" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4075" addr="0x7fca469ab730" >
+                                            <attribute name="name" value="textColor" id="4076" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4077" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4078" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_4" id="4079" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="4080" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_4" id="4079" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="4080" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="4081" addr="0x7f99f1e5dc10" >
-                            <attributelist id="4082" addr="0x7f99f1e5dc10" >
-                                <attribute name="name" value="ControlLabel" id="4083" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="4084" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e5b110" id="4085" addr="0x7f99f1e5b110" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e5df90" id="4086" addr="0x7f99f1e5df90" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e5d7f0" id="4087" addr="0x7f99f1e5d7f0" />
-                                <attribute name="sym_name" value="ControlLabel" id="4088" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e5df90" id="4089" addr="0x7f99f1e5df90" />
-                                <attribute name="defaultargs" value="0x7f99f1e5c130" id="4090" addr="0x7f99f1e5c130" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char)." id="4091" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="4092" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e5c130" id="4093" addr="0x7f99f1e5c130" />
-                                <parmlist id="4094" addr="0x7f99f1e5d890" >
+                        <constructor id="4081" addr="0x7fca469abc10" >
+                            <attributelist id="4082" addr="0x7fca469abc10" >
+                                <attribute name="name" value="ControlLabel" id="4083" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="4084" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a9110" id="4085" addr="0x7fca469a9110" />
+                                <attribute name="csym_nextSibling" value="0x7fca469abf90" id="4086" addr="0x7fca469abf90" />
+                                <attribute name="sym_previousSibling" value="0x7fca469ab7f0" id="4087" addr="0x7fca469ab7f0" />
+                                <attribute name="sym_name" value="ControlLabel" id="4088" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469abf90" id="4089" addr="0x7fca469abf90" />
+                                <attribute name="defaultargs" value="0x7fca469aa130" id="4090" addr="0x7fca469aa130" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char)." id="4091" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="4092" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469aa130" id="4093" addr="0x7fca469aa130" />
+                                <parmlist id="4094" addr="0x7fca469ab890" >
                                     <parm id="4095">
-                                        <attributelist id="4096" addr="0x7f99f1e5d890" >
-                                            <attribute name="name" value="x" id="4097" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4098" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4096" addr="0x7fca469ab890" >
+                                            <attribute name="name" value="x" id="4097" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4098" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4099">
-                                        <attributelist id="4100" addr="0x7f99f1e5d950" >
-                                            <attribute name="name" value="y" id="4101" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4102" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4100" addr="0x7fca469ab950" >
+                                            <attribute name="name" value="y" id="4101" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4102" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4103">
-                                        <attributelist id="4104" addr="0x7f99f1e5d9d0" >
-                                            <attribute name="name" value="width" id="4105" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4106" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4104" addr="0x7fca469ab9d0" >
+                                            <attribute name="name" value="width" id="4105" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4106" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4107">
-                                        <attributelist id="4108" addr="0x7f99f1e5da50" >
-                                            <attribute name="name" value="height" id="4109" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4110" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4108" addr="0x7fca469aba50" >
+                                            <attribute name="name" value="height" id="4109" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4110" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4111">
-                                        <attributelist id="4112" addr="0x7f99f1e5dad0" >
-                                            <attribute name="name" value="label" id="4113" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4114" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4112" addr="0x7fca469abad0" >
+                                            <attribute name="name" value="label" id="4113" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4114" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4115">
-                                        <attributelist id="4116" addr="0x7f99f1e5db50" >
-                                            <attribute name="name" value="font" id="4117" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4118" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4119" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4116" addr="0x7fca469abb50" >
+                                            <attribute name="name" value="font" id="4117" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4118" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4119" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_5" id="4120" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="4121" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_5" id="4120" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="4121" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="4122" addr="0x7f99f1e5df90" >
-                            <attributelist id="4123" addr="0x7f99f1e5df90" >
-                                <attribute name="name" value="ControlLabel" id="4124" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="4125" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e5b110" id="4126" addr="0x7f99f1e5b110" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e5dc10" id="4127" addr="0x7f99f1e5dc10" />
-                                <attribute name="sym_name" value="ControlLabel" id="4128" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e5c130" id="4129" addr="0x7f99f1e5c130" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String)." id="4130" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="4131" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e5c130" id="4132" addr="0x7f99f1e5c130" />
-                                <parmlist id="4133" addr="0x7f99f1e5dcb0" >
+                        <constructor id="4122" addr="0x7fca469abf90" >
+                            <attributelist id="4123" addr="0x7fca469abf90" >
+                                <attribute name="name" value="ControlLabel" id="4124" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="4125" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a9110" id="4126" addr="0x7fca469a9110" />
+                                <attribute name="sym_previousSibling" value="0x7fca469abc10" id="4127" addr="0x7fca469abc10" />
+                                <attribute name="sym_name" value="ControlLabel" id="4128" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469aa130" id="4129" addr="0x7fca469aa130" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String)." id="4130" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="4131" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469aa130" id="4132" addr="0x7fca469aa130" />
+                                <parmlist id="4133" addr="0x7fca469abcb0" >
                                     <parm id="4134">
-                                        <attributelist id="4135" addr="0x7f99f1e5dcb0" >
-                                            <attribute name="name" value="x" id="4136" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4137" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4135" addr="0x7fca469abcb0" >
+                                            <attribute name="name" value="x" id="4136" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4137" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4138">
-                                        <attributelist id="4139" addr="0x7f99f1e5dd70" >
-                                            <attribute name="name" value="y" id="4140" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4141" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4139" addr="0x7fca469abd70" >
+                                            <attribute name="name" value="y" id="4140" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4141" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4142">
-                                        <attributelist id="4143" addr="0x7f99f1e5ddf0" >
-                                            <attribute name="name" value="width" id="4144" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4145" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4143" addr="0x7fca469abdf0" >
+                                            <attribute name="name" value="width" id="4144" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4145" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4146">
-                                        <attributelist id="4147" addr="0x7f99f1e5de70" >
-                                            <attribute name="name" value="height" id="4148" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4149" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4147" addr="0x7fca469abe70" >
+                                            <attribute name="name" value="height" id="4148" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4149" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4150">
-                                        <attributelist id="4151" addr="0x7f99f1e5def0" >
-                                            <attribute name="name" value="label" id="4152" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4153" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4151" addr="0x7fca469abef0" >
+                                            <attribute name="name" value="label" id="4152" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4153" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_6" id="4154" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="4155" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_6" id="4154" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="4155" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <destructor id="4156" addr="0x7f99f1e5e0f0" >
-                            <attributelist id="4157" addr="0x7f99f1e5e0f0" >
-                                <attribute name="ismember" value="1" id="4158" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="~ControlLabel" id="4159" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="~ControlLabel" id="4160" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="4161" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="4162" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e5b110" id="4163" addr="0x7f99f1e5b110" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4164" addr="0x7f99f1de6c90" />
+                        <destructor id="4156" addr="0x7fca469ac0f0" >
+                            <attributelist id="4157" addr="0x7fca469ac0f0" >
+                                <attribute name="ismember" value="1" id="4158" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="~ControlLabel" id="4159" addr="0x7fca46934c90" />
+                                <attribute name="name" value="~ControlLabel" id="4160" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="4161" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="4162" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a9110" id="4163" addr="0x7fca469a9110" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4164" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </destructor >
-                        <cdecl id="4165" addr="0x7f99f1e5e2b0" >
-                            <attributelist id="4166" addr="0x7f99f1e5e2b0" >
-                                <attribute name="name" value="getLabel" id="4167" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="4168" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e5b110" id="4169" addr="0x7f99f1e5b110" />
-                                <attribute name="kind" value="function" id="4170" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getLabel" id="4171" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="4172" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="4173" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="XBMCAddon::String" id="4174" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4175" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="4176" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4177" addr="0x7f99f1e5eff0" >
-                            <attributelist id="4178" addr="0x7f99f1e5eff0" >
-                                <attribute name="name" value="setLabel" id="4179" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="4180" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e5b110" id="4181" addr="0x7f99f1e5b110" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e5f4f0" id="4182" addr="0x7f99f1e5f4f0" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e5f4f0" id="4183" addr="0x7f99f1e5f4f0" />
-                                <attribute name="kind" value="function" id="4184" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setLabel" id="4185" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,r.q(const).XBMCAddon::String)." id="4186" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="4187" addr="0x7f99f1de6c90" />
-                                <parmlist id="4188" addr="0x7f99f1e5e570" >
+                        <cdecl id="4165" addr="0x7fca469ac2b0" >
+                            <attributelist id="4166" addr="0x7fca469ac2b0" >
+                                <attribute name="name" value="getLabel" id="4167" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="4168" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a9110" id="4169" addr="0x7fca469a9110" />
+                                <attribute name="kind" value="function" id="4170" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getLabel" id="4171" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="4172" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="4173" addr="0x7fca46934c90" />
+                                <attribute name="type" value="XBMCAddon::String" id="4174" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4175" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="4176" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4177" addr="0x7fca469acff0" >
+                            <attributelist id="4178" addr="0x7fca469acff0" >
+                                <attribute name="name" value="setLabel" id="4179" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="4180" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a9110" id="4181" addr="0x7fca469a9110" />
+                                <attribute name="sym_nextSibling" value="0x7fca469ad4f0" id="4182" addr="0x7fca469ad4f0" />
+                                <attribute name="csym_nextSibling" value="0x7fca469ad4f0" id="4183" addr="0x7fca469ad4f0" />
+                                <attribute name="kind" value="function" id="4184" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setLabel" id="4185" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,r.q(const).XBMCAddon::String)." id="4186" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="4187" addr="0x7fca46934c90" />
+                                <parmlist id="4188" addr="0x7fca469ac570" >
                                     <parm id="4189">
-                                        <attributelist id="4190" addr="0x7f99f1e5e570" >
-                                            <attribute name="name" value="label" id="4191" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="4192" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4193" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4190" addr="0x7fca469ac570" >
+                                            <attribute name="name" value="label" id="4191" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="4192" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4193" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4194">
-                                        <attributelist id="4195" addr="0x7f99f1e5e710" >
-                                            <attribute name="name" value="font" id="4196" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4197" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4198" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4195" addr="0x7fca469ac710" >
+                                            <attribute name="name" value="font" id="4196" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4197" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4198" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4199">
-                                        <attributelist id="4200" addr="0x7f99f1e5e8b0" >
-                                            <attribute name="name" value="textColor" id="4201" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4202" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4203" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4200" addr="0x7fca469ac8b0" >
+                                            <attribute name="name" value="textColor" id="4201" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4202" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4203" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4204">
-                                        <attributelist id="4205" addr="0x7f99f1e5ea50" >
-                                            <attribute name="name" value="disabledColor" id="4206" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4207" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4208" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4205" addr="0x7fca469aca50" >
+                                            <attribute name="name" value="disabledColor" id="4206" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4207" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4208" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4209">
-                                        <attributelist id="4210" addr="0x7f99f1e5ebf0" >
-                                            <attribute name="name" value="shadowColor" id="4211" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4212" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4213" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4210" addr="0x7fca469acbf0" >
+                                            <attribute name="name" value="shadowColor" id="4211" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4212" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4213" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4214">
-                                        <attributelist id="4215" addr="0x7f99f1e5ed90" >
-                                            <attribute name="name" value="focusedColor" id="4216" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4217" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4218" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4215" addr="0x7fca469acd90" >
+                                            <attribute name="name" value="focusedColor" id="4216" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4217" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4218" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4219">
-                                        <attributelist id="4220" addr="0x7f99f1e5ef30" >
-                                            <attribute name="name" value="label2" id="4221" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="4222" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4223" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                    </parm >
-                                </parmlist >
-                                <attribute name="sym_overloaded" value="0x7f99f1e5eff0" id="4224" addr="0x7f99f1e5eff0" />
-                                <attribute name="type" value="void" id="4225" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4226" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="4227" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4228" addr="0x7f99f1e5f4f0" >
-                            <attributelist id="4229" addr="0x7f99f1e5f4f0" >
-                                <attribute name="name" value="setLabel" id="4230" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="4231" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e5b110" id="4232" addr="0x7f99f1e5b110" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e5eff0" id="4233" addr="0x7f99f1e5eff0" />
-                                <attribute name="kind" value="function" id="4234" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setLabel" id="4235" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e5f950" id="4236" addr="0x7f99f1e5f950" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e5f950" id="4237" addr="0x7f99f1e5f950" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char)." id="4238" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e5eff0" id="4239" addr="0x7f99f1e5eff0" />
-                                <attribute name="access" value="public" id="4240" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e5eff0" id="4241" addr="0x7f99f1e5eff0" />
-                                <parmlist id="4242" addr="0x7f99f1e5f0b0" >
+                                        <attributelist id="4220" addr="0x7fca469acf30" >
+                                            <attribute name="name" value="label2" id="4221" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="4222" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4223" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                    </parm >
+                                </parmlist >
+                                <attribute name="sym_overloaded" value="0x7fca469acff0" id="4224" addr="0x7fca469acff0" />
+                                <attribute name="type" value="void" id="4225" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4226" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="4227" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4228" addr="0x7fca469ad4f0" >
+                            <attributelist id="4229" addr="0x7fca469ad4f0" >
+                                <attribute name="name" value="setLabel" id="4230" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="4231" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a9110" id="4232" addr="0x7fca469a9110" />
+                                <attribute name="sym_previousSibling" value="0x7fca469acff0" id="4233" addr="0x7fca469acff0" />
+                                <attribute name="kind" value="function" id="4234" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setLabel" id="4235" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469ad950" id="4236" addr="0x7fca469ad950" />
+                                <attribute name="sym_nextSibling" value="0x7fca469ad950" id="4237" addr="0x7fca469ad950" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char)." id="4238" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469acff0" id="4239" addr="0x7fca469acff0" />
+                                <attribute name="access" value="public" id="4240" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469acff0" id="4241" addr="0x7fca469acff0" />
+                                <parmlist id="4242" addr="0x7fca469ad0b0" >
                                     <parm id="4243">
-                                        <attributelist id="4244" addr="0x7f99f1e5f0b0" >
-                                            <attribute name="name" value="label" id="4245" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="4246" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4247" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4244" addr="0x7fca469ad0b0" >
+                                            <attribute name="name" value="label" id="4245" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="4246" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4247" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4248">
-                                        <attributelist id="4249" addr="0x7f99f1e5f1b0" >
-                                            <attribute name="name" value="font" id="4250" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4251" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4252" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4249" addr="0x7fca469ad1b0" >
+                                            <attribute name="name" value="font" id="4250" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4251" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4252" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4253">
-                                        <attributelist id="4254" addr="0x7f99f1e5f250" >
-                                            <attribute name="name" value="textColor" id="4255" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4256" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4257" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4254" addr="0x7fca469ad250" >
+                                            <attribute name="name" value="textColor" id="4255" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4256" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4257" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4258">
-                                        <attributelist id="4259" addr="0x7f99f1e5f2f0" >
-                                            <attribute name="name" value="disabledColor" id="4260" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4261" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4262" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4259" addr="0x7fca469ad2f0" >
+                                            <attribute name="name" value="disabledColor" id="4260" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4261" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4262" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4263">
-                                        <attributelist id="4264" addr="0x7f99f1e5f390" >
-                                            <attribute name="name" value="shadowColor" id="4265" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4266" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4267" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4264" addr="0x7fca469ad390" >
+                                            <attribute name="name" value="shadowColor" id="4265" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4266" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4267" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4268">
-                                        <attributelist id="4269" addr="0x7f99f1e5f430" >
-                                            <attribute name="name" value="focusedColor" id="4270" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4271" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4272" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                    </parm >
-                                </parmlist >
-                                <attribute name="type" value="void" id="4273" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="4274" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="4275" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4276" addr="0x7f99f1e5f950" >
-                            <attributelist id="4277" addr="0x7f99f1e5f950" >
-                                <attribute name="name" value="setLabel" id="4278" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="4279" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e5b110" id="4280" addr="0x7f99f1e5b110" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e5f4f0" id="4281" addr="0x7f99f1e5f4f0" />
-                                <attribute name="kind" value="function" id="4282" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setLabel" id="4283" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e5fd10" id="4284" addr="0x7f99f1e5fd10" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e5fd10" id="4285" addr="0x7f99f1e5fd10" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char)." id="4286" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e5eff0" id="4287" addr="0x7f99f1e5eff0" />
-                                <attribute name="access" value="public" id="4288" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e5eff0" id="4289" addr="0x7f99f1e5eff0" />
-                                <parmlist id="4290" addr="0x7f99f1e5f5b0" >
+                                        <attributelist id="4269" addr="0x7fca469ad430" >
+                                            <attribute name="name" value="focusedColor" id="4270" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4271" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4272" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                    </parm >
+                                </parmlist >
+                                <attribute name="type" value="void" id="4273" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="4274" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="4275" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4276" addr="0x7fca469ad950" >
+                            <attributelist id="4277" addr="0x7fca469ad950" >
+                                <attribute name="name" value="setLabel" id="4278" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="4279" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a9110" id="4280" addr="0x7fca469a9110" />
+                                <attribute name="sym_previousSibling" value="0x7fca469ad4f0" id="4281" addr="0x7fca469ad4f0" />
+                                <attribute name="kind" value="function" id="4282" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setLabel" id="4283" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469add10" id="4284" addr="0x7fca469add10" />
+                                <attribute name="sym_nextSibling" value="0x7fca469add10" id="4285" addr="0x7fca469add10" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char)." id="4286" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469acff0" id="4287" addr="0x7fca469acff0" />
+                                <attribute name="access" value="public" id="4288" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469acff0" id="4289" addr="0x7fca469acff0" />
+                                <parmlist id="4290" addr="0x7fca469ad5b0" >
                                     <parm id="4291">
-                                        <attributelist id="4292" addr="0x7f99f1e5f5b0" >
-                                            <attribute name="name" value="label" id="4293" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="4294" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4295" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4292" addr="0x7fca469ad5b0" >
+                                            <attribute name="name" value="label" id="4293" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="4294" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4295" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4296">
-                                        <attributelist id="4297" addr="0x7f99f1e5f6b0" >
-                                            <attribute name="name" value="font" id="4298" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4299" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4300" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4297" addr="0x7fca469ad6b0" >
+                                            <attribute name="name" value="font" id="4298" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4299" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4300" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4301">
-                                        <attributelist id="4302" addr="0x7f99f1e5f750" >
-                                            <attribute name="name" value="textColor" id="4303" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4304" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4305" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4302" addr="0x7fca469ad750" >
+                                            <attribute name="name" value="textColor" id="4303" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4304" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4305" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4306">
-                                        <attributelist id="4307" addr="0x7f99f1e5f7f0" >
-                                            <attribute name="name" value="disabledColor" id="4308" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4309" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4310" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4307" addr="0x7fca469ad7f0" >
+                                            <attribute name="name" value="disabledColor" id="4308" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4309" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4310" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4311">
-                                        <attributelist id="4312" addr="0x7f99f1e5f890" >
-                                            <attribute name="name" value="shadowColor" id="4313" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4314" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4315" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                    </parm >
-                                </parmlist >
-                                <attribute name="type" value="void" id="4316" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_2" id="4317" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="4318" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4319" addr="0x7f99f1e5fd10" >
-                            <attributelist id="4320" addr="0x7f99f1e5fd10" >
-                                <attribute name="name" value="setLabel" id="4321" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="4322" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e5b110" id="4323" addr="0x7f99f1e5b110" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e5f950" id="4324" addr="0x7f99f1e5f950" />
-                                <attribute name="kind" value="function" id="4325" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setLabel" id="4326" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e60030" id="4327" addr="0x7f99f1e60030" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e60030" id="4328" addr="0x7f99f1e60030" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char,p.q(const).char)." id="4329" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e5eff0" id="4330" addr="0x7f99f1e5eff0" />
-                                <attribute name="access" value="public" id="4331" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e5eff0" id="4332" addr="0x7f99f1e5eff0" />
-                                <parmlist id="4333" addr="0x7f99f1e5fa10" >
+                                        <attributelist id="4312" addr="0x7fca469ad890" >
+                                            <attribute name="name" value="shadowColor" id="4313" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4314" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4315" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                    </parm >
+                                </parmlist >
+                                <attribute name="type" value="void" id="4316" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_2" id="4317" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="4318" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4319" addr="0x7fca469add10" >
+                            <attributelist id="4320" addr="0x7fca469add10" >
+                                <attribute name="name" value="setLabel" id="4321" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="4322" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a9110" id="4323" addr="0x7fca469a9110" />
+                                <attribute name="sym_previousSibling" value="0x7fca469ad950" id="4324" addr="0x7fca469ad950" />
+                                <attribute name="kind" value="function" id="4325" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setLabel" id="4326" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469ae030" id="4327" addr="0x7fca469ae030" />
+                                <attribute name="sym_nextSibling" value="0x7fca469ae030" id="4328" addr="0x7fca469ae030" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char,p.q(const).char)." id="4329" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469acff0" id="4330" addr="0x7fca469acff0" />
+                                <attribute name="access" value="public" id="4331" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469acff0" id="4332" addr="0x7fca469acff0" />
+                                <parmlist id="4333" addr="0x7fca469ada10" >
                                     <parm id="4334">
-                                        <attributelist id="4335" addr="0x7f99f1e5fa10" >
-                                            <attribute name="name" value="label" id="4336" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="4337" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4338" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4335" addr="0x7fca469ada10" >
+                                            <attribute name="name" value="label" id="4336" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="4337" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4338" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4339">
-                                        <attributelist id="4340" addr="0x7f99f1e5fb10" >
-                                            <attribute name="name" value="font" id="4341" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4342" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4343" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4340" addr="0x7fca469adb10" >
+                                            <attribute name="name" value="font" id="4341" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4342" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4343" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4344">
-                                        <attributelist id="4345" addr="0x7f99f1e5fbb0" >
-                                            <attribute name="name" value="textColor" id="4346" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4347" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4348" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4345" addr="0x7fca469adbb0" >
+                                            <attribute name="name" value="textColor" id="4346" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4347" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4348" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4349">
-                                        <attributelist id="4350" addr="0x7f99f1e5fc50" >
-                                            <attribute name="name" value="disabledColor" id="4351" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4352" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4353" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                    </parm >
-                                </parmlist >
-                                <attribute name="type" value="void" id="4354" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_3" id="4355" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="4356" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4357" addr="0x7f99f1e60030" >
-                            <attributelist id="4358" addr="0x7f99f1e60030" >
-                                <attribute name="name" value="setLabel" id="4359" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="4360" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e5b110" id="4361" addr="0x7f99f1e5b110" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e5fd10" id="4362" addr="0x7f99f1e5fd10" />
-                                <attribute name="kind" value="function" id="4363" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setLabel" id="4364" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e602b0" id="4365" addr="0x7f99f1e602b0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e602b0" id="4366" addr="0x7f99f1e602b0" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char)." id="4367" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e5eff0" id="4368" addr="0x7f99f1e5eff0" />
-                                <attribute name="access" value="public" id="4369" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e5eff0" id="4370" addr="0x7f99f1e5eff0" />
-                                <parmlist id="4371" addr="0x7f99f1e5fdd0" >
+                                        <attributelist id="4350" addr="0x7fca469adc50" >
+                                            <attribute name="name" value="disabledColor" id="4351" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4352" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4353" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                    </parm >
+                                </parmlist >
+                                <attribute name="type" value="void" id="4354" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_3" id="4355" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="4356" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4357" addr="0x7fca469ae030" >
+                            <attributelist id="4358" addr="0x7fca469ae030" >
+                                <attribute name="name" value="setLabel" id="4359" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="4360" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a9110" id="4361" addr="0x7fca469a9110" />
+                                <attribute name="sym_previousSibling" value="0x7fca469add10" id="4362" addr="0x7fca469add10" />
+                                <attribute name="kind" value="function" id="4363" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setLabel" id="4364" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469ae2b0" id="4365" addr="0x7fca469ae2b0" />
+                                <attribute name="sym_nextSibling" value="0x7fca469ae2b0" id="4366" addr="0x7fca469ae2b0" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char)." id="4367" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469acff0" id="4368" addr="0x7fca469acff0" />
+                                <attribute name="access" value="public" id="4369" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469acff0" id="4370" addr="0x7fca469acff0" />
+                                <parmlist id="4371" addr="0x7fca469addd0" >
                                     <parm id="4372">
-                                        <attributelist id="4373" addr="0x7f99f1e5fdd0" >
-                                            <attribute name="name" value="label" id="4374" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="4375" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4376" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4373" addr="0x7fca469addd0" >
+                                            <attribute name="name" value="label" id="4374" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="4375" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4376" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4377">
-                                        <attributelist id="4378" addr="0x7f99f1e5fed0" >
-                                            <attribute name="name" value="font" id="4379" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4380" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4381" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4378" addr="0x7fca469aded0" >
+                                            <attribute name="name" value="font" id="4379" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4380" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4381" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4382">
-                                        <attributelist id="4383" addr="0x7f99f1e5ff70" >
-                                            <attribute name="name" value="textColor" id="4384" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4385" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4386" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                    </parm >
-                                </parmlist >
-                                <attribute name="type" value="void" id="4387" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_4" id="4388" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="4389" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4390" addr="0x7f99f1e602b0" >
-                            <attributelist id="4391" addr="0x7f99f1e602b0" >
-                                <attribute name="name" value="setLabel" id="4392" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="4393" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e5b110" id="4394" addr="0x7f99f1e5b110" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e60030" id="4395" addr="0x7f99f1e60030" />
-                                <attribute name="kind" value="function" id="4396" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setLabel" id="4397" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e60490" id="4398" addr="0x7f99f1e60490" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e60490" id="4399" addr="0x7f99f1e60490" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char)." id="4400" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e5eff0" id="4401" addr="0x7f99f1e5eff0" />
-                                <attribute name="access" value="public" id="4402" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e5eff0" id="4403" addr="0x7f99f1e5eff0" />
-                                <parmlist id="4404" addr="0x7f99f1e600f0" >
+                                        <attributelist id="4383" addr="0x7fca469adf70" >
+                                            <attribute name="name" value="textColor" id="4384" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4385" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4386" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                    </parm >
+                                </parmlist >
+                                <attribute name="type" value="void" id="4387" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_4" id="4388" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="4389" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4390" addr="0x7fca469ae2b0" >
+                            <attributelist id="4391" addr="0x7fca469ae2b0" >
+                                <attribute name="name" value="setLabel" id="4392" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="4393" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a9110" id="4394" addr="0x7fca469a9110" />
+                                <attribute name="sym_previousSibling" value="0x7fca469ae030" id="4395" addr="0x7fca469ae030" />
+                                <attribute name="kind" value="function" id="4396" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setLabel" id="4397" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469ae490" id="4398" addr="0x7fca469ae490" />
+                                <attribute name="sym_nextSibling" value="0x7fca469ae490" id="4399" addr="0x7fca469ae490" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char)." id="4400" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469acff0" id="4401" addr="0x7fca469acff0" />
+                                <attribute name="access" value="public" id="4402" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469acff0" id="4403" addr="0x7fca469acff0" />
+                                <parmlist id="4404" addr="0x7fca469ae0f0" >
                                     <parm id="4405">
-                                        <attributelist id="4406" addr="0x7f99f1e600f0" >
-                                            <attribute name="name" value="label" id="4407" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="4408" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4409" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4406" addr="0x7fca469ae0f0" >
+                                            <attribute name="name" value="label" id="4407" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="4408" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4409" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4410">
-                                        <attributelist id="4411" addr="0x7f99f1e601f0" >
-                                            <attribute name="name" value="font" id="4412" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4413" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4414" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                    </parm >
-                                </parmlist >
-                                <attribute name="type" value="void" id="4415" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_5" id="4416" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="4417" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4418" addr="0x7f99f1e60490" >
-                            <attributelist id="4419" addr="0x7f99f1e60490" >
-                                <attribute name="name" value="setLabel" id="4420" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="4421" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e5b110" id="4422" addr="0x7f99f1e5b110" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e602b0" id="4423" addr="0x7f99f1e602b0" />
-                                <attribute name="kind" value="function" id="4424" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setLabel" id="4425" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e605b0" id="4426" addr="0x7f99f1e605b0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e605b0" id="4427" addr="0x7f99f1e605b0" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="4428" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e5eff0" id="4429" addr="0x7f99f1e5eff0" />
-                                <attribute name="access" value="public" id="4430" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e5eff0" id="4431" addr="0x7f99f1e5eff0" />
-                                <parmlist id="4432" addr="0x7f99f1e60370" >
+                                        <attributelist id="4411" addr="0x7fca469ae1f0" >
+                                            <attribute name="name" value="font" id="4412" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4413" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4414" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                    </parm >
+                                </parmlist >
+                                <attribute name="type" value="void" id="4415" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_5" id="4416" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="4417" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4418" addr="0x7fca469ae490" >
+                            <attributelist id="4419" addr="0x7fca469ae490" >
+                                <attribute name="name" value="setLabel" id="4420" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="4421" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a9110" id="4422" addr="0x7fca469a9110" />
+                                <attribute name="sym_previousSibling" value="0x7fca469ae2b0" id="4423" addr="0x7fca469ae2b0" />
+                                <attribute name="kind" value="function" id="4424" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setLabel" id="4425" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469ae5b0" id="4426" addr="0x7fca469ae5b0" />
+                                <attribute name="sym_nextSibling" value="0x7fca469ae5b0" id="4427" addr="0x7fca469ae5b0" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="4428" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469acff0" id="4429" addr="0x7fca469acff0" />
+                                <attribute name="access" value="public" id="4430" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469acff0" id="4431" addr="0x7fca469acff0" />
+                                <parmlist id="4432" addr="0x7fca469ae370" >
                                     <parm id="4433">
-                                        <attributelist id="4434" addr="0x7f99f1e60370" >
-                                            <attribute name="name" value="label" id="4435" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="4436" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4437" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4434" addr="0x7fca469ae370" >
+                                            <attribute name="name" value="label" id="4435" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="4436" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4437" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="4438" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_6" id="4439" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="4440" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="4438" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_6" id="4439" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="4440" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="4441" addr="0x7f99f1e605b0" >
-                            <attributelist id="4442" addr="0x7f99f1e605b0" >
-                                <attribute name="name" value="setLabel" id="4443" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="4444" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e5b110" id="4445" addr="0x7f99f1e5b110" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e60490" id="4446" addr="0x7f99f1e60490" />
-                                <attribute name="kind" value="function" id="4447" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setLabel" id="4448" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e5eff0" id="4449" addr="0x7f99f1e5eff0" />
-                                <attribute name="decl" value="f()." id="4450" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="4451" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e5eff0" id="4452" addr="0x7f99f1e5eff0" />
-                                <attribute name="type" value="void" id="4453" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_7" id="4454" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="4455" addr="0x7f99f1de6c90" />
+                        <cdecl id="4441" addr="0x7fca469ae5b0" >
+                            <attributelist id="4442" addr="0x7fca469ae5b0" >
+                                <attribute name="name" value="setLabel" id="4443" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="4444" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a9110" id="4445" addr="0x7fca469a9110" />
+                                <attribute name="sym_previousSibling" value="0x7fca469ae490" id="4446" addr="0x7fca469ae490" />
+                                <attribute name="kind" value="function" id="4447" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setLabel" id="4448" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469acff0" id="4449" addr="0x7fca469acff0" />
+                                <attribute name="decl" value="f()." id="4450" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="4451" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469acff0" id="4452" addr="0x7fca469acff0" />
+                                <attribute name="type" value="void" id="4453" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_7" id="4454" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="4455" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
                     </class >
-                    <class id="4456" addr="0x7f99f1e608b0" >
-                        <attributelist id="4457" addr="0x7f99f1e608b0" >
-                            <attribute name="name" value="XBMCAddon::xbmcgui::ControlEdit" id="4458" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="4459" addr="0x7f99f1e40fb0" />
-                            <attribute name="symtab" value="0x7f99f1e609f0" id="4460" addr="0x7f99f1e609f0" />
-                            <attribute name="allows_typedef" value="1" id="4461" addr="0x7f99f1de6c90" />
-                            <attribute name="typepass_visit" value="1" id="4462" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_visit" value="1" id="4463" addr="0x7f99f1de6c90" />
-                            <attribute name="kind" value="class" id="4464" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_name" value="ControlEdit" id="4465" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_has_constructor" value="1" id="4466" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_public_constructor" value="1" id="4467" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_copy_constructor" value="1" id="4468" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_default_destructor" value="1" id="4469" addr="0x7f99f1de6c90" />
-                            <attribute name="privatebaselist" value="0x7f99f1e60890" id="4470" addr="0x7f99f1e60890" />
-                            <attribute name="protectedbaselist" value="0x7f99f1e60870" id="4471" addr="0x7f99f1e60870" />
-                            <baselist id="4472" addr="0x7f99f1e60850" >
-                                <base name="Control" id="4473" addr="0x7f99f1e607d0" />
+                    <class id="4456" addr="0x7fca469ae8b0" >
+                        <attributelist id="4457" addr="0x7fca469ae8b0" >
+                            <attribute name="name" value="XBMCAddon::xbmcgui::ControlEdit" id="4458" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="4459" addr="0x7fca4698efb0" />
+                            <attribute name="symtab" value="0x7fca469ae9f0" id="4460" addr="0x7fca469ae9f0" />
+                            <attribute name="allows_typedef" value="1" id="4461" addr="0x7fca46934c90" />
+                            <attribute name="typepass_visit" value="1" id="4462" addr="0x7fca46934c90" />
+                            <attribute name="allocate_visit" value="1" id="4463" addr="0x7fca46934c90" />
+                            <attribute name="kind" value="class" id="4464" addr="0x7fca46934c90" />
+                            <attribute name="sym_name" value="ControlEdit" id="4465" addr="0x7fca46934c90" />
+                            <attribute name="allocate_has_constructor" value="1" id="4466" addr="0x7fca46934c90" />
+                            <attribute name="allocate_public_constructor" value="1" id="4467" addr="0x7fca46934c90" />
+                            <attribute name="allocate_copy_constructor" value="1" id="4468" addr="0x7fca46934c90" />
+                            <attribute name="allocate_default_destructor" value="1" id="4469" addr="0x7fca46934c90" />
+                            <attribute name="privatebaselist" value="0x7fca469ae890" id="4470" addr="0x7fca469ae890" />
+                            <attribute name="protectedbaselist" value="0x7fca469ae870" id="4471" addr="0x7fca469ae870" />
+                            <baselist id="4472" addr="0x7fca469ae850" >
+                                <base name="Control" id="4473" addr="0x7fca469ae7d0" />
                             </baselist >
-                            <attribute name="module" value="xbmcgui" id="4474" addr="0x7f99f1e402f0" />
-                            <attribute name="bases" value="0x7f99f1dd8c70" id="4475" addr="0x7f99f1dd8c70" />
-                            <attribute name="allbases" value="0x7f99f1dd8f10" id="4476" addr="0x7f99f1dd8f10" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="4477" addr="0x7f99f1de6c90" />
-                            <typescope id="4478" addr="0x7f99f1dd8bf0" >
-                                <attributelist id="4479" addr="0x7f99f1dd8bf0" >
-                                    <attribute name="inherit" value="0x7f99f1dd8cf0" id="4480" addr="0x7f99f1dd8cf0" />
-                                    <attribute name="name" value="ControlEdit" id="4481" addr="0x7f99f1de6c90" />
-                                    <typetab id="4482" addr="0x7f99f1dd8c10" >
-                                        <attributelist id="4483" addr="0x7f99f1dd8c10" >
+                            <attribute name="module" value="xbmcgui" id="4474" addr="0x7fca4698e2f0" />
+                            <attribute name="bases" value="0x7fca46926c70" id="4475" addr="0x7fca46926c70" />
+                            <attribute name="allbases" value="0x7fca46926f10" id="4476" addr="0x7fca46926f10" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="4477" addr="0x7fca46934c90" />
+                            <typescope id="4478" addr="0x7fca46926bf0" >
+                                <attributelist id="4479" addr="0x7fca46926bf0" >
+                                    <attribute name="inherit" value="0x7fca46926cf0" id="4480" addr="0x7fca46926cf0" />
+                                    <attribute name="name" value="ControlEdit" id="4481" addr="0x7fca46934c90" />
+                                    <typetab id="4482" addr="0x7fca46926c10" >
+                                        <attributelist id="4483" addr="0x7fca46926c10" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f99f1dd2150" id="4484" addr="0x7f99f1dd2150" />
-                                    <attribute name="qname" value="XBMCAddon::xbmcgui::ControlEdit" id="4485" addr="0x7f99f1de6c90" />
-                                    <attribute name="symtab" value="0x7f99f1e609f0" id="4486" addr="0x7f99f1e609f0" />
+                                    <attribute name="parent" value="0x7fca46920150" id="4484" addr="0x7fca46920150" />
+                                    <attribute name="qname" value="XBMCAddon::xbmcgui::ControlEdit" id="4485" addr="0x7fca46934c90" />
+                                    <attribute name="symtab" value="0x7fca469ae9f0" id="4486" addr="0x7fca469ae9f0" />
                                 </attributelist >
-                                <typescopesitem id="4487" addr="0x7f99f1dd8cf0" >
-                                    <attributelist id="4488" addr="0x7f99f1dd8cf0" >
+                                <typescopesitem id="4487" addr="0x7fca46926cf0" >
+                                    <attributelist id="4488" addr="0x7fca46926cf0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="4489" addr="0x7f99f1dd8b90" >
-                                    <attributelist id="4490" addr="0x7f99f1dd8b90" >
+                                <typescopesitem id="4489" addr="0x7fca46926b90" >
+                                    <attributelist id="4490" addr="0x7fca46926b90" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="4491" addr="0x7f99f1dd8c10" >
-                                    <attributelist id="4492" addr="0x7f99f1dd8c10" >
+                                <typescopesitem id="4491" addr="0x7fca46926c10" >
+                                    <attributelist id="4492" addr="0x7fca46926c10" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="4493" addr="0x7f99f1dd2150" >
-                                    <attributelist id="4494" addr="0x7f99f1dd2150" >
-                                        <attribute name="name" value="xbmcgui" id="4495" addr="0x7f99f1de6c90" />
-                                        <typetab id="4496" addr="0x7f99f1dd2170" >
-                                            <attributelist id="4497" addr="0x7f99f1dd2170" >
-                                                <attribute name="InterceptorBase" value="InterceptorBase" id="4498" addr="0x7f99f1de6c90" />
-                                                <attribute name="Dialog" value="Dialog" id="4499" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="4500" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="4501" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlTextBox" value="ControlTextBox" id="4502" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="4503" addr="0x7f99f1de6c90" />
-                                                <attribute name="Window" value="Window" id="4504" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="4505" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlList" value="ControlList" id="4506" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="4507" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlImage" value="ControlImage" id="4508" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlButton" value="ControlButton" id="4509" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlGroup" value="ControlGroup" id="4510" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogBusy" value="DialogBusy" id="4511" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="4512" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSpin" value="ControlSpin" id="4513" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlEdit" value="ControlEdit" id="4514" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="4515" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="4516" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlLabel" value="ControlLabel" id="4517" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlProgress" value="ControlProgress" id="4518" addr="0x7f99f1de6c90" />
-                                                <attribute name="Control" value="Control" id="4519" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSlider" value="ControlSlider" id="4520" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgress" value="DialogProgress" id="4521" addr="0x7f99f1de6c90" />
-                                                <attribute name="Action" value="Action" id="4522" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowDialog" value="WindowDialog" id="4523" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXML" value="WindowXML" id="4524" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItem" value="ListItem" id="4525" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="4526" addr="0x7f99f1de6c90" />
+                                <typescopesitem id="4493" addr="0x7fca46920150" >
+                                    <attributelist id="4494" addr="0x7fca46920150" >
+                                        <attribute name="name" value="xbmcgui" id="4495" addr="0x7fca46934c90" />
+                                        <typetab id="4496" addr="0x7fca46920170" >
+                                            <attributelist id="4497" addr="0x7fca46920170" >
+                                                <attribute name="InterceptorBase" value="InterceptorBase" id="4498" addr="0x7fca46934c90" />
+                                                <attribute name="Dialog" value="Dialog" id="4499" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="4500" addr="0x7fca46934c90" />
+                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="4501" addr="0x7fca46934c90" />
+                                                <attribute name="ControlTextBox" value="ControlTextBox" id="4502" addr="0x7fca46934c90" />
+                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="4503" addr="0x7fca46934c90" />
+                                                <attribute name="Window" value="Window" id="4504" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="4505" addr="0x7fca46934c90" />
+                                                <attribute name="ControlList" value="ControlList" id="4506" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="4507" addr="0x7fca46934c90" />
+                                                <attribute name="ControlImage" value="ControlImage" id="4508" addr="0x7fca46934c90" />
+                                                <attribute name="ControlButton" value="ControlButton" id="4509" addr="0x7fca46934c90" />
+                                                <attribute name="ControlGroup" value="ControlGroup" id="4510" addr="0x7fca46934c90" />
+                                                <attribute name="DialogBusy" value="DialogBusy" id="4511" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="4512" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSpin" value="ControlSpin" id="4513" addr="0x7fca46934c90" />
+                                                <attribute name="ControlEdit" value="ControlEdit" id="4514" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="4515" addr="0x7fca46934c90" />
+                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="4516" addr="0x7fca46934c90" />
+                                                <attribute name="ControlLabel" value="ControlLabel" id="4517" addr="0x7fca46934c90" />
+                                                <attribute name="ControlProgress" value="ControlProgress" id="4518" addr="0x7fca46934c90" />
+                                                <attribute name="Control" value="Control" id="4519" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSlider" value="ControlSlider" id="4520" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgress" value="DialogProgress" id="4521" addr="0x7fca46934c90" />
+                                                <attribute name="Action" value="Action" id="4522" addr="0x7fca46934c90" />
+                                                <attribute name="WindowDialog" value="WindowDialog" id="4523" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXML" value="WindowXML" id="4524" addr="0x7fca46934c90" />
+                                                <attribute name="ListItem" value="ListItem" id="4525" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="4526" addr="0x7fca46934c90" />
                                             </attributelist >
-                                            <typetabsitem id="4527" addr="0x7f99f1de1dd0" >
-                                                <attributelist id="4528" addr="0x7f99f1de1dd0" >
+                                            <typetabsitem id="4527" addr="0x7fca4692fdd0" >
+                                                <attributelist id="4528" addr="0x7fca4692fdd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4529" addr="0x7f99f1dde790" >
-                                                <attributelist id="4530" addr="0x7f99f1dde790" >
+                                            <typetabsitem id="4529" addr="0x7fca4692c790" >
+                                                <attributelist id="4530" addr="0x7fca4692c790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4531" addr="0x7f99f1de3f10" >
-                                                <attributelist id="4532" addr="0x7f99f1de3f10" >
+                                            <typetabsitem id="4531" addr="0x7fca46931f10" >
+                                                <attributelist id="4532" addr="0x7fca46931f10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4533" addr="0x7f99f1dd67b0" >
-                                                <attributelist id="4534" addr="0x7f99f1dd67b0" >
+                                            <typetabsitem id="4533" addr="0x7fca469247b0" >
+                                                <attributelist id="4534" addr="0x7fca469247b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4535" addr="0x7f99f1ddafd0" >
-                                                <attributelist id="4536" addr="0x7f99f1ddafd0" >
+                                            <typetabsitem id="4535" addr="0x7fca46928fd0" >
+                                                <attributelist id="4536" addr="0x7fca46928fd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4537" addr="0x7f99f1ddd430" >
-                                                <attributelist id="4538" addr="0x7f99f1ddd430" >
+                                            <typetabsitem id="4537" addr="0x7fca4692b430" >
+                                                <attributelist id="4538" addr="0x7fca4692b430" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4539" addr="0x7f99f1de2130" >
-                                                <attributelist id="4540" addr="0x7f99f1de2130" >
+                                            <typetabsitem id="4539" addr="0x7fca46930130" >
+                                                <attributelist id="4540" addr="0x7fca46930130" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4541" addr="0x7f99f1dd2f50" >
-                                                <attributelist id="4542" addr="0x7f99f1dd2f50" >
+                                            <typetabsitem id="4541" addr="0x7fca46920f50" >
+                                                <attributelist id="4542" addr="0x7fca46920f50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4543" addr="0x7f99f1dd9650" >
-                                                <attributelist id="4544" addr="0x7f99f1dd9650" >
+                                            <typetabsitem id="4543" addr="0x7fca46927650" >
+                                                <attributelist id="4544" addr="0x7fca46927650" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4545" addr="0x7f99f1de3390" >
-                                                <attributelist id="4546" addr="0x7f99f1de3390" >
+                                            <typetabsitem id="4545" addr="0x7fca46931390" >
+                                                <attributelist id="4546" addr="0x7fca46931390" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4547" addr="0x7f99f1ddb7b0" >
-                                                <attributelist id="4548" addr="0x7f99f1ddb7b0" >
+                                            <typetabsitem id="4547" addr="0x7fca469297b0" >
+                                                <attributelist id="4548" addr="0x7fca469297b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4549" addr="0x7f99f1ddc4b0" >
-                                                <attributelist id="4550" addr="0x7f99f1ddc4b0" >
+                                            <typetabsitem id="4549" addr="0x7fca4692a4b0" >
+                                                <attributelist id="4550" addr="0x7fca4692a4b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4551" addr="0x7f99f1ddcf90" >
-                                                <attributelist id="4552" addr="0x7f99f1ddcf90" >
+                                            <typetabsitem id="4551" addr="0x7fca4692af90" >
+                                                <attributelist id="4552" addr="0x7fca4692af90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4553" addr="0x7f99f1de11b0" >
-                                                <attributelist id="4554" addr="0x7f99f1de11b0" >
+                                            <typetabsitem id="4553" addr="0x7fca4692f1b0" >
+                                                <attributelist id="4554" addr="0x7fca4692f1b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4555" addr="0x7f99f1de15b0" >
-                                                <attributelist id="4556" addr="0x7f99f1de15b0" >
+                                            <typetabsitem id="4555" addr="0x7fca4692f5b0" >
+                                                <attributelist id="4556" addr="0x7fca4692f5b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4557" addr="0x7f99f1dd77f0" >
-                                                <attributelist id="4558" addr="0x7f99f1dd77f0" >
+                                            <typetabsitem id="4557" addr="0x7fca469257f0" >
+                                                <attributelist id="4558" addr="0x7fca469257f0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4559" addr="0x7f99f1dd8b30" >
-                                                <attributelist id="4560" addr="0x7f99f1dd8b30" >
+                                            <typetabsitem id="4559" addr="0x7fca46926b30" >
+                                                <attributelist id="4560" addr="0x7fca46926b30" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4561" addr="0x7f99f1dd2c50" >
-                                                <attributelist id="4562" addr="0x7f99f1dd2c50" >
+                                            <typetabsitem id="4561" addr="0x7fca46920c50" >
+                                                <attributelist id="4562" addr="0x7fca46920c50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4563" addr="0x7f99f1dda790" >
-                                                <attributelist id="4564" addr="0x7f99f1dda790" >
+                                            <typetabsitem id="4563" addr="0x7fca46928790" >
+                                                <attributelist id="4564" addr="0x7fca46928790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4565" addr="0x7f99f1dd8030" >
-                                                <attributelist id="4566" addr="0x7f99f1dd8030" >
+                                            <typetabsitem id="4565" addr="0x7fca46926030" >
+                                                <attributelist id="4566" addr="0x7fca46926030" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4567" addr="0x7f99f1ddbe10" >
-                                                <attributelist id="4568" addr="0x7f99f1ddbe10" >
+                                            <typetabsitem id="4567" addr="0x7fca46929e10" >
+                                                <attributelist id="4568" addr="0x7fca46929e10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4569" addr="0x7f99f1dd6b10" >
-                                                <attributelist id="4570" addr="0x7f99f1dd6b10" >
+                                            <typetabsitem id="4569" addr="0x7fca46924b10" >
+                                                <attributelist id="4570" addr="0x7fca46924b10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4571" addr="0x7f99f1dddf90" >
-                                                <attributelist id="4572" addr="0x7f99f1dddf90" >
+                                            <typetabsitem id="4571" addr="0x7fca4692bf90" >
+                                                <attributelist id="4572" addr="0x7fca4692bf90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4573" addr="0x7f99f1de0530" >
-                                                <attributelist id="4574" addr="0x7f99f1de0530" >
+                                            <typetabsitem id="4573" addr="0x7fca4692e530" >
+                                                <attributelist id="4574" addr="0x7fca4692e530" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4575" addr="0x7f99f1de1e50" >
-                                                <attributelist id="4576" addr="0x7f99f1de1e50" >
+                                            <typetabsitem id="4575" addr="0x7fca4692fe50" >
+                                                <attributelist id="4576" addr="0x7fca4692fe50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4577" addr="0x7f99f1de2d90" >
-                                                <attributelist id="4578" addr="0x7f99f1de2d90" >
+                                            <typetabsitem id="4577" addr="0x7fca46930d90" >
+                                                <attributelist id="4578" addr="0x7fca46930d90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4579" addr="0x7f99f1de3410" >
-                                                <attributelist id="4580" addr="0x7f99f1de3410" >
+                                            <typetabsitem id="4579" addr="0x7fca46931410" >
+                                                <attributelist id="4580" addr="0x7fca46931410" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4581" addr="0x7f99f1dd3590" >
-                                                <attributelist id="4582" addr="0x7f99f1dd3590" >
+                                            <typetabsitem id="4581" addr="0x7fca46921590" >
+                                                <attributelist id="4582" addr="0x7fca46921590" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4583" addr="0x7f99f1dd3390" >
-                                                <attributelist id="4584" addr="0x7f99f1dd3390" >
+                                            <typetabsitem id="4583" addr="0x7fca46921390" >
+                                                <attributelist id="4584" addr="0x7fca46921390" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7f99f1dd1d70" id="4585" addr="0x7f99f1dd1d70" />
-                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="4586" addr="0x7f99f1de6c90" />
-                                        <attribute name="symtab" value="0x7f99f1e40fb0" id="4587" addr="0x7f99f1e40fb0" />
+                                        <attribute name="parent" value="0x7fca4691fd70" id="4585" addr="0x7fca4691fd70" />
+                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="4586" addr="0x7fca46934c90" />
+                                        <attribute name="symtab" value="0x7fca4698efb0" id="4587" addr="0x7fca4698efb0" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="4588" addr="0x7f99f1dd8c30" >
-                                    <attributelist id="4589" addr="0x7f99f1dd8c30" >
+                                <typescopesitem id="4588" addr="0x7fca46926c30" >
+                                    <attributelist id="4589" addr="0x7fca46926c30" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="4590" addr="0x7f99f1e609f0" >
-                                    <attributelist id="4591" addr="0x7f99f1e609f0" >
-                                        <attribute name="inherit" value="0x7f99f1e60a50" id="4592" addr="0x7f99f1e60a50" />
-                                        <attribute name="name" value="ControlEdit" id="4593" addr="0x7f99f1de6c90" />
-                                        <attribute name="csymtab" value="0x7f99f1e60a10" id="4594" addr="0x7f99f1e60a10" />
-                                        <attribute name="symtab" value="0x7f99f1e609d0" id="4595" addr="0x7f99f1e609d0" />
+                                <typescopesitem id="4590" addr="0x7fca469ae9f0" >
+                                    <attributelist id="4591" addr="0x7fca469ae9f0" >
+                                        <attribute name="inherit" value="0x7fca469aea50" id="4592" addr="0x7fca469aea50" />
+                                        <attribute name="name" value="ControlEdit" id="4593" addr="0x7fca46934c90" />
+                                        <attribute name="csymtab" value="0x7fca469aea10" id="4594" addr="0x7fca469aea10" />
+                                        <attribute name="symtab" value="0x7fca469ae9d0" id="4595" addr="0x7fca469ae9d0" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <access id="4596" addr="0x7f99f1e60970" >
-                            <attributelist id="4597" addr="0x7f99f1e60970" >
-                                <attribute name="kind" value="public" id="4598" addr="0x7f99f1de6c90" />
+                        <access id="4596" addr="0x7fca469ae970" >
+                            <attributelist id="4597" addr="0x7fca469ae970" >
+                                <attribute name="kind" value="public" id="4598" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="4599" addr="0x7f99f1e61bf0" >
-                            <attributelist id="4600" addr="0x7f99f1e61bf0" >
-                                <attribute name="name" value="ControlEdit" id="4601" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="4602" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e609f0" id="4603" addr="0x7f99f1e609f0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e62330" id="4604" addr="0x7f99f1e62330" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e62330" id="4605" addr="0x7f99f1e62330" />
-                                <attribute name="sym_name" value="ControlEdit" id="4606" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,long,p.q(const).char,p.q(const).char,bool)." id="4607" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="4608" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e61bf0" id="4609" addr="0x7f99f1e61bf0" />
-                                <parmlist id="4610" addr="0x7f99f1e60bb0" >
+                        <constructor id="4599" addr="0x7fca469afbf0" >
+                            <attributelist id="4600" addr="0x7fca469afbf0" >
+                                <attribute name="name" value="ControlEdit" id="4601" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="4602" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469ae9f0" id="4603" addr="0x7fca469ae9f0" />
+                                <attribute name="sym_nextSibling" value="0x7fca469b0330" id="4604" addr="0x7fca469b0330" />
+                                <attribute name="csym_nextSibling" value="0x7fca469b0330" id="4605" addr="0x7fca469b0330" />
+                                <attribute name="sym_name" value="ControlEdit" id="4606" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,long,p.q(const).char,p.q(const).char,bool)." id="4607" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="4608" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469afbf0" id="4609" addr="0x7fca469afbf0" />
+                                <parmlist id="4610" addr="0x7fca469aebb0" >
                                     <parm id="4611">
-                                        <attributelist id="4612" addr="0x7f99f1e60bb0" >
-                                            <attribute name="name" value="x" id="4613" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4614" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4612" addr="0x7fca469aebb0" >
+                                            <attribute name="name" value="x" id="4613" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4614" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4615">
-                                        <attributelist id="4616" addr="0x7f99f1e60cd0" >
-                                            <attribute name="name" value="y" id="4617" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4618" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4616" addr="0x7fca469aecd0" >
+                                            <attribute name="name" value="y" id="4617" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4618" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4619">
-                                        <attributelist id="4620" addr="0x7f99f1e60df0" >
-                                            <attribute name="name" value="width" id="4621" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4622" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4620" addr="0x7fca469aedf0" >
+                                            <attribute name="name" value="width" id="4621" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4622" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4623">
-                                        <attributelist id="4624" addr="0x7f99f1e60f10" >
-                                            <attribute name="name" value="height" id="4625" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4626" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4624" addr="0x7fca469aef10" >
+                                            <attribute name="name" value="height" id="4625" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4626" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4627">
-                                        <attributelist id="4628" addr="0x7f99f1e61050" >
-                                            <attribute name="name" value="label" id="4629" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4630" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4628" addr="0x7fca469af050" >
+                                            <attribute name="name" value="label" id="4629" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4630" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4631">
-                                        <attributelist id="4632" addr="0x7f99f1e611f0" >
-                                            <attribute name="name" value="font" id="4633" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4634" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4635" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4632" addr="0x7fca469af1f0" >
+                                            <attribute name="name" value="font" id="4633" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4634" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4635" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4636">
-                                        <attributelist id="4637" addr="0x7f99f1e61390" >
-                                            <attribute name="name" value="textColor" id="4638" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4639" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4640" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4637" addr="0x7fca469af390" >
+                                            <attribute name="name" value="textColor" id="4638" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4639" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4640" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4641">
-                                        <attributelist id="4642" addr="0x7f99f1e61530" >
-                                            <attribute name="name" value="disabledColor" id="4643" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4644" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4645" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4642" addr="0x7fca469af530" >
+                                            <attribute name="name" value="disabledColor" id="4643" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4644" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4645" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4646">
-                                        <attributelist id="4647" addr="0x7f99f1e616b0" >
-                                            <attribute name="name" value="_alignment" id="4648" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBFONT_LEFT" id="4649" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4650" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4647" addr="0x7fca469af6b0" >
+                                            <attribute name="name" value="_alignment" id="4648" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBFONT_LEFT" id="4649" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4650" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4651">
-                                        <attributelist id="4652" addr="0x7f99f1e61850" >
-                                            <attribute name="name" value="focusTexture" id="4653" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4654" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4655" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4652" addr="0x7fca469af850" >
+                                            <attribute name="name" value="focusTexture" id="4653" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4654" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4655" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4656">
-                                        <attributelist id="4657" addr="0x7f99f1e619f0" >
-                                            <attribute name="name" value="noFocusTexture" id="4658" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4659" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4660" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4657" addr="0x7fca469af9f0" >
+                                            <attribute name="name" value="noFocusTexture" id="4658" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4659" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4660" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4661">
-                                        <attributelist id="4662" addr="0x7f99f1e61b30" >
-                                            <attribute name="name" value="isPassword" id="4663" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="false" id="4664" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="4665" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4662" addr="0x7fca469afb30" >
+                                            <attribute name="name" value="isPassword" id="4663" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="false" id="4664" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="4665" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_0" id="4666" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="4667" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4666" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="4667" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="4668" addr="0x7f99f1e62330" >
-                            <attributelist id="4669" addr="0x7f99f1e62330" >
-                                <attribute name="name" value="ControlEdit" id="4670" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="4671" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e609f0" id="4672" addr="0x7f99f1e609f0" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e629d0" id="4673" addr="0x7f99f1e629d0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e61bf0" id="4674" addr="0x7f99f1e61bf0" />
-                                <attribute name="sym_name" value="ControlEdit" id="4675" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e629d0" id="4676" addr="0x7f99f1e629d0" />
-                                <attribute name="defaultargs" value="0x7f99f1e61bf0" id="4677" addr="0x7f99f1e61bf0" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,long,p.q(const).char,p.q(const).char)." id="4678" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="4679" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e61bf0" id="4680" addr="0x7f99f1e61bf0" />
-                                <parmlist id="4681" addr="0x7f99f1e61c90" >
+                        <constructor id="4668" addr="0x7fca469b0330" >
+                            <attributelist id="4669" addr="0x7fca469b0330" >
+                                <attribute name="name" value="ControlEdit" id="4670" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="4671" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469ae9f0" id="4672" addr="0x7fca469ae9f0" />
+                                <attribute name="csym_nextSibling" value="0x7fca469b09d0" id="4673" addr="0x7fca469b09d0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469afbf0" id="4674" addr="0x7fca469afbf0" />
+                                <attribute name="sym_name" value="ControlEdit" id="4675" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469b09d0" id="4676" addr="0x7fca469b09d0" />
+                                <attribute name="defaultargs" value="0x7fca469afbf0" id="4677" addr="0x7fca469afbf0" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,long,p.q(const).char,p.q(const).char)." id="4678" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="4679" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469afbf0" id="4680" addr="0x7fca469afbf0" />
+                                <parmlist id="4681" addr="0x7fca469afc90" >
                                     <parm id="4682">
-                                        <attributelist id="4683" addr="0x7f99f1e61c90" >
-                                            <attribute name="name" value="x" id="4684" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4685" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4683" addr="0x7fca469afc90" >
+                                            <attribute name="name" value="x" id="4684" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4685" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4686">
-                                        <attributelist id="4687" addr="0x7f99f1e61d50" >
-                                            <attribute name="name" value="y" id="4688" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4689" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4687" addr="0x7fca469afd50" >
+                                            <attribute name="name" value="y" id="4688" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4689" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4690">
-                                        <attributelist id="4691" addr="0x7f99f1e61dd0" >
-                                            <attribute name="name" value="width" id="4692" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4693" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4691" addr="0x7fca469afdd0" >
+                                            <attribute name="name" value="width" id="4692" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4693" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4694">
-                                        <attributelist id="4695" addr="0x7f99f1e61e50" >
-                                            <attribute name="name" value="height" id="4696" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4697" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4695" addr="0x7fca469afe50" >
+                                            <attribute name="name" value="height" id="4696" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4697" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4698">
-                                        <attributelist id="4699" addr="0x7f99f1e61ed0" >
-                                            <attribute name="name" value="label" id="4700" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4701" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4699" addr="0x7fca469afed0" >
+                                            <attribute name="name" value="label" id="4700" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4701" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4702">
-                                        <attributelist id="4703" addr="0x7f99f1e61f50" >
-                                            <attribute name="name" value="font" id="4704" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4705" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4706" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4703" addr="0x7fca469aff50" >
+                                            <attribute name="name" value="font" id="4704" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4705" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4706" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4707">
-                                        <attributelist id="4708" addr="0x7f99f1e61ff0" >
-                                            <attribute name="name" value="textColor" id="4709" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4710" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4711" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4708" addr="0x7fca469afff0" >
+                                            <attribute name="name" value="textColor" id="4709" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4710" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4711" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4712">
-                                        <attributelist id="4713" addr="0x7f99f1e62090" >
-                                            <attribute name="name" value="disabledColor" id="4714" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4715" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4716" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4713" addr="0x7fca469b0090" >
+                                            <attribute name="name" value="disabledColor" id="4714" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4715" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4716" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4717">
-                                        <attributelist id="4718" addr="0x7f99f1e62130" >
-                                            <attribute name="name" value="_alignment" id="4719" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBFONT_LEFT" id="4720" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4721" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4718" addr="0x7fca469b0130" >
+                                            <attribute name="name" value="_alignment" id="4719" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBFONT_LEFT" id="4720" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4721" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4722">
-                                        <attributelist id="4723" addr="0x7f99f1e621d0" >
-                                            <attribute name="name" value="focusTexture" id="4724" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4725" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4726" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4723" addr="0x7fca469b01d0" >
+                                            <attribute name="name" value="focusTexture" id="4724" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4725" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4726" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4727">
-                                        <attributelist id="4728" addr="0x7f99f1e62270" >
-                                            <attribute name="name" value="noFocusTexture" id="4729" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4730" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4731" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4728" addr="0x7fca469b0270" >
+                                            <attribute name="name" value="noFocusTexture" id="4729" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4730" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4731" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_1" id="4732" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="4733" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="4732" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="4733" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="4734" addr="0x7f99f1e629d0" >
-                            <attributelist id="4735" addr="0x7f99f1e629d0" >
-                                <attribute name="name" value="ControlEdit" id="4736" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="4737" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e609f0" id="4738" addr="0x7f99f1e609f0" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e62fd0" id="4739" addr="0x7f99f1e62fd0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e62330" id="4740" addr="0x7f99f1e62330" />
-                                <attribute name="sym_name" value="ControlEdit" id="4741" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e62fd0" id="4742" addr="0x7f99f1e62fd0" />
-                                <attribute name="defaultargs" value="0x7f99f1e61bf0" id="4743" addr="0x7f99f1e61bf0" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,long,p.q(const).char)." id="4744" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="4745" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e61bf0" id="4746" addr="0x7f99f1e61bf0" />
-                                <parmlist id="4747" addr="0x7f99f1e623d0" >
+                        <constructor id="4734" addr="0x7fca469b09d0" >
+                            <attributelist id="4735" addr="0x7fca469b09d0" >
+                                <attribute name="name" value="ControlEdit" id="4736" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="4737" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469ae9f0" id="4738" addr="0x7fca469ae9f0" />
+                                <attribute name="csym_nextSibling" value="0x7fca469b0fd0" id="4739" addr="0x7fca469b0fd0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469b0330" id="4740" addr="0x7fca469b0330" />
+                                <attribute name="sym_name" value="ControlEdit" id="4741" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469b0fd0" id="4742" addr="0x7fca469b0fd0" />
+                                <attribute name="defaultargs" value="0x7fca469afbf0" id="4743" addr="0x7fca469afbf0" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,long,p.q(const).char)." id="4744" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="4745" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469afbf0" id="4746" addr="0x7fca469afbf0" />
+                                <parmlist id="4747" addr="0x7fca469b03d0" >
                                     <parm id="4748">
-                                        <attributelist id="4749" addr="0x7f99f1e623d0" >
-                                            <attribute name="name" value="x" id="4750" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4751" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4749" addr="0x7fca469b03d0" >
+                                            <attribute name="name" value="x" id="4750" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4751" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4752">
-                                        <attributelist id="4753" addr="0x7f99f1e62490" >
-                                            <attribute name="name" value="y" id="4754" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4755" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4753" addr="0x7fca469b0490" >
+                                            <attribute name="name" value="y" id="4754" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4755" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4756">
-                                        <attributelist id="4757" addr="0x7f99f1e62510" >
-                                            <attribute name="name" value="width" id="4758" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4759" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4757" addr="0x7fca469b0510" >
+                                            <attribute name="name" value="width" id="4758" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4759" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4760">
-                                        <attributelist id="4761" addr="0x7f99f1e62590" >
-                                            <attribute name="name" value="height" id="4762" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4763" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4761" addr="0x7fca469b0590" >
+                                            <attribute name="name" value="height" id="4762" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4763" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4764">
-                                        <attributelist id="4765" addr="0x7f99f1e62610" >
-                                            <attribute name="name" value="label" id="4766" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4767" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4765" addr="0x7fca469b0610" >
+                                            <attribute name="name" value="label" id="4766" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4767" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4768">
-                                        <attributelist id="4769" addr="0x7f99f1e62690" >
-                                            <attribute name="name" value="font" id="4770" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4771" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4772" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4769" addr="0x7fca469b0690" >
+                                            <attribute name="name" value="font" id="4770" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4771" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4772" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4773">
-                                        <attributelist id="4774" addr="0x7f99f1e62730" >
-                                            <attribute name="name" value="textColor" id="4775" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4776" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4777" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4774" addr="0x7fca469b0730" >
+                                            <attribute name="name" value="textColor" id="4775" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4776" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4777" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4778">
-                                        <attributelist id="4779" addr="0x7f99f1e627d0" >
-                                            <attribute name="name" value="disabledColor" id="4780" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4781" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4782" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4779" addr="0x7fca469b07d0" >
+                                            <attribute name="name" value="disabledColor" id="4780" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4781" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4782" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4783">
-                                        <attributelist id="4784" addr="0x7f99f1e62870" >
-                                            <attribute name="name" value="_alignment" id="4785" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBFONT_LEFT" id="4786" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4787" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4784" addr="0x7fca469b0870" >
+                                            <attribute name="name" value="_alignment" id="4785" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBFONT_LEFT" id="4786" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4787" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4788">
-                                        <attributelist id="4789" addr="0x7f99f1e62910" >
-                                            <attribute name="name" value="focusTexture" id="4790" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4791" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4792" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4789" addr="0x7fca469b0910" >
+                                            <attribute name="name" value="focusTexture" id="4790" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4791" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4792" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_2" id="4793" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="4794" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_2" id="4793" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="4794" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="4795" addr="0x7f99f1e62fd0" >
-                            <attributelist id="4796" addr="0x7f99f1e62fd0" >
-                                <attribute name="name" value="ControlEdit" id="4797" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="4798" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e609f0" id="4799" addr="0x7f99f1e609f0" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e63530" id="4800" addr="0x7f99f1e63530" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e629d0" id="4801" addr="0x7f99f1e629d0" />
-                                <attribute name="sym_name" value="ControlEdit" id="4802" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e63530" id="4803" addr="0x7f99f1e63530" />
-                                <attribute name="defaultargs" value="0x7f99f1e61bf0" id="4804" addr="0x7f99f1e61bf0" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,long)." id="4805" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="4806" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e61bf0" id="4807" addr="0x7f99f1e61bf0" />
-                                <parmlist id="4808" addr="0x7f99f1e62a70" >
+                        <constructor id="4795" addr="0x7fca469b0fd0" >
+                            <attributelist id="4796" addr="0x7fca469b0fd0" >
+                                <attribute name="name" value="ControlEdit" id="4797" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="4798" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469ae9f0" id="4799" addr="0x7fca469ae9f0" />
+                                <attribute name="csym_nextSibling" value="0x7fca469b1530" id="4800" addr="0x7fca469b1530" />
+                                <attribute name="sym_previousSibling" value="0x7fca469b09d0" id="4801" addr="0x7fca469b09d0" />
+                                <attribute name="sym_name" value="ControlEdit" id="4802" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469b1530" id="4803" addr="0x7fca469b1530" />
+                                <attribute name="defaultargs" value="0x7fca469afbf0" id="4804" addr="0x7fca469afbf0" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,long)." id="4805" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="4806" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469afbf0" id="4807" addr="0x7fca469afbf0" />
+                                <parmlist id="4808" addr="0x7fca469b0a70" >
                                     <parm id="4809">
-                                        <attributelist id="4810" addr="0x7f99f1e62a70" >
-                                            <attribute name="name" value="x" id="4811" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4812" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4810" addr="0x7fca469b0a70" >
+                                            <attribute name="name" value="x" id="4811" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4812" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4813">
-                                        <attributelist id="4814" addr="0x7f99f1e62b30" >
-                                            <attribute name="name" value="y" id="4815" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4816" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4814" addr="0x7fca469b0b30" >
+                                            <attribute name="name" value="y" id="4815" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4816" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4817">
-                                        <attributelist id="4818" addr="0x7f99f1e62bb0" >
-                                            <attribute name="name" value="width" id="4819" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4820" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4818" addr="0x7fca469b0bb0" >
+                                            <attribute name="name" value="width" id="4819" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4820" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4821">
-                                        <attributelist id="4822" addr="0x7f99f1e62c30" >
-                                            <attribute name="name" value="height" id="4823" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4824" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4822" addr="0x7fca469b0c30" >
+                                            <attribute name="name" value="height" id="4823" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4824" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4825">
-                                        <attributelist id="4826" addr="0x7f99f1e62cb0" >
-                                            <attribute name="name" value="label" id="4827" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4828" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4826" addr="0x7fca469b0cb0" >
+                                            <attribute name="name" value="label" id="4827" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4828" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4829">
-                                        <attributelist id="4830" addr="0x7f99f1e62d30" >
-                                            <attribute name="name" value="font" id="4831" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4832" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4833" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4830" addr="0x7fca469b0d30" >
+                                            <attribute name="name" value="font" id="4831" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4832" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4833" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4834">
-                                        <attributelist id="4835" addr="0x7f99f1e62dd0" >
-                                            <attribute name="name" value="textColor" id="4836" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4837" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4838" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4835" addr="0x7fca469b0dd0" >
+                                            <attribute name="name" value="textColor" id="4836" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4837" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4838" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4839">
-                                        <attributelist id="4840" addr="0x7f99f1e62e70" >
-                                            <attribute name="name" value="disabledColor" id="4841" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4842" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4843" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4840" addr="0x7fca469b0e70" >
+                                            <attribute name="name" value="disabledColor" id="4841" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4842" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4843" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4844">
-                                        <attributelist id="4845" addr="0x7f99f1e62f10" >
-                                            <attribute name="name" value="_alignment" id="4846" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBFONT_LEFT" id="4847" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4848" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4845" addr="0x7fca469b0f10" >
+                                            <attribute name="name" value="_alignment" id="4846" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBFONT_LEFT" id="4847" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4848" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_3" id="4849" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="4850" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_3" id="4849" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="4850" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="4851" addr="0x7f99f1e63530" >
-                            <attributelist id="4852" addr="0x7f99f1e63530" >
-                                <attribute name="name" value="ControlEdit" id="4853" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="4854" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e609f0" id="4855" addr="0x7f99f1e609f0" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e639f0" id="4856" addr="0x7f99f1e639f0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e62fd0" id="4857" addr="0x7f99f1e62fd0" />
-                                <attribute name="sym_name" value="ControlEdit" id="4858" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e639f0" id="4859" addr="0x7f99f1e639f0" />
-                                <attribute name="defaultargs" value="0x7f99f1e61bf0" id="4860" addr="0x7f99f1e61bf0" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char)." id="4861" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="4862" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e61bf0" id="4863" addr="0x7f99f1e61bf0" />
-                                <parmlist id="4864" addr="0x7f99f1e63070" >
+                        <constructor id="4851" addr="0x7fca469b1530" >
+                            <attributelist id="4852" addr="0x7fca469b1530" >
+                                <attribute name="name" value="ControlEdit" id="4853" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="4854" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469ae9f0" id="4855" addr="0x7fca469ae9f0" />
+                                <attribute name="csym_nextSibling" value="0x7fca469b19f0" id="4856" addr="0x7fca469b19f0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469b0fd0" id="4857" addr="0x7fca469b0fd0" />
+                                <attribute name="sym_name" value="ControlEdit" id="4858" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469b19f0" id="4859" addr="0x7fca469b19f0" />
+                                <attribute name="defaultargs" value="0x7fca469afbf0" id="4860" addr="0x7fca469afbf0" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char)." id="4861" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="4862" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469afbf0" id="4863" addr="0x7fca469afbf0" />
+                                <parmlist id="4864" addr="0x7fca469b1070" >
                                     <parm id="4865">
-                                        <attributelist id="4866" addr="0x7f99f1e63070" >
-                                            <attribute name="name" value="x" id="4867" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4868" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4866" addr="0x7fca469b1070" >
+                                            <attribute name="name" value="x" id="4867" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4868" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4869">
-                                        <attributelist id="4870" addr="0x7f99f1e63130" >
-                                            <attribute name="name" value="y" id="4871" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4872" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4870" addr="0x7fca469b1130" >
+                                            <attribute name="name" value="y" id="4871" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4872" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4873">
-                                        <attributelist id="4874" addr="0x7f99f1e631b0" >
-                                            <attribute name="name" value="width" id="4875" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4876" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4874" addr="0x7fca469b11b0" >
+                                            <attribute name="name" value="width" id="4875" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4876" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4877">
-                                        <attributelist id="4878" addr="0x7f99f1e63230" >
-                                            <attribute name="name" value="height" id="4879" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4880" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4878" addr="0x7fca469b1230" >
+                                            <attribute name="name" value="height" id="4879" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4880" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4881">
-                                        <attributelist id="4882" addr="0x7f99f1e632b0" >
-                                            <attribute name="name" value="label" id="4883" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4884" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4882" addr="0x7fca469b12b0" >
+                                            <attribute name="name" value="label" id="4883" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4884" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4885">
-                                        <attributelist id="4886" addr="0x7f99f1e63330" >
-                                            <attribute name="name" value="font" id="4887" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4888" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4889" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4886" addr="0x7fca469b1330" >
+                                            <attribute name="name" value="font" id="4887" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4888" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4889" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4890">
-                                        <attributelist id="4891" addr="0x7f99f1e633d0" >
-                                            <attribute name="name" value="textColor" id="4892" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4893" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4894" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4891" addr="0x7fca469b13d0" >
+                                            <attribute name="name" value="textColor" id="4892" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4893" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4894" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4895">
-                                        <attributelist id="4896" addr="0x7f99f1e63470" >
-                                            <attribute name="name" value="disabledColor" id="4897" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4898" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4899" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4896" addr="0x7fca469b1470" >
+                                            <attribute name="name" value="disabledColor" id="4897" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4898" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4899" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_4" id="4900" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="4901" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_4" id="4900" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="4901" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="4902" addr="0x7f99f1e639f0" >
-                            <attributelist id="4903" addr="0x7f99f1e639f0" >
-                                <attribute name="name" value="ControlEdit" id="4904" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="4905" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e609f0" id="4906" addr="0x7f99f1e609f0" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e63e10" id="4907" addr="0x7f99f1e63e10" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e63530" id="4908" addr="0x7f99f1e63530" />
-                                <attribute name="sym_name" value="ControlEdit" id="4909" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e63e10" id="4910" addr="0x7f99f1e63e10" />
-                                <attribute name="defaultargs" value="0x7f99f1e61bf0" id="4911" addr="0x7f99f1e61bf0" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char)." id="4912" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="4913" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e61bf0" id="4914" addr="0x7f99f1e61bf0" />
-                                <parmlist id="4915" addr="0x7f99f1e635d0" >
+                        <constructor id="4902" addr="0x7fca469b19f0" >
+                            <attributelist id="4903" addr="0x7fca469b19f0" >
+                                <attribute name="name" value="ControlEdit" id="4904" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="4905" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469ae9f0" id="4906" addr="0x7fca469ae9f0" />
+                                <attribute name="csym_nextSibling" value="0x7fca469b1e10" id="4907" addr="0x7fca469b1e10" />
+                                <attribute name="sym_previousSibling" value="0x7fca469b1530" id="4908" addr="0x7fca469b1530" />
+                                <attribute name="sym_name" value="ControlEdit" id="4909" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469b1e10" id="4910" addr="0x7fca469b1e10" />
+                                <attribute name="defaultargs" value="0x7fca469afbf0" id="4911" addr="0x7fca469afbf0" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char)." id="4912" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="4913" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469afbf0" id="4914" addr="0x7fca469afbf0" />
+                                <parmlist id="4915" addr="0x7fca469b15d0" >
                                     <parm id="4916">
-                                        <attributelist id="4917" addr="0x7f99f1e635d0" >
-                                            <attribute name="name" value="x" id="4918" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4919" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4917" addr="0x7fca469b15d0" >
+                                            <attribute name="name" value="x" id="4918" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4919" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4920">
-                                        <attributelist id="4921" addr="0x7f99f1e63690" >
-                                            <attribute name="name" value="y" id="4922" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4923" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4921" addr="0x7fca469b1690" >
+                                            <attribute name="name" value="y" id="4922" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4923" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4924">
-                                        <attributelist id="4925" addr="0x7f99f1e63710" >
-                                            <attribute name="name" value="width" id="4926" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4927" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4925" addr="0x7fca469b1710" >
+                                            <attribute name="name" value="width" id="4926" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4927" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4928">
-                                        <attributelist id="4929" addr="0x7f99f1e63790" >
-                                            <attribute name="name" value="height" id="4930" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4931" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4929" addr="0x7fca469b1790" >
+                                            <attribute name="name" value="height" id="4930" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4931" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4932">
-                                        <attributelist id="4933" addr="0x7f99f1e63810" >
-                                            <attribute name="name" value="label" id="4934" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4935" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4933" addr="0x7fca469b1810" >
+                                            <attribute name="name" value="label" id="4934" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4935" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4936">
-                                        <attributelist id="4937" addr="0x7f99f1e63890" >
-                                            <attribute name="name" value="font" id="4938" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4939" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4940" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4937" addr="0x7fca469b1890" >
+                                            <attribute name="name" value="font" id="4938" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4939" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4940" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4941">
-                                        <attributelist id="4942" addr="0x7f99f1e63930" >
-                                            <attribute name="name" value="textColor" id="4943" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4944" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4945" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4942" addr="0x7fca469b1930" >
+                                            <attribute name="name" value="textColor" id="4943" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4944" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4945" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_5" id="4946" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="4947" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_5" id="4946" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="4947" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="4948" addr="0x7f99f1e63e10" >
-                            <attributelist id="4949" addr="0x7f99f1e63e10" >
-                                <attribute name="name" value="ControlEdit" id="4950" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="4951" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e609f0" id="4952" addr="0x7f99f1e609f0" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e64190" id="4953" addr="0x7f99f1e64190" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e639f0" id="4954" addr="0x7f99f1e639f0" />
-                                <attribute name="sym_name" value="ControlEdit" id="4955" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e64190" id="4956" addr="0x7f99f1e64190" />
-                                <attribute name="defaultargs" value="0x7f99f1e61bf0" id="4957" addr="0x7f99f1e61bf0" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char)." id="4958" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="4959" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e61bf0" id="4960" addr="0x7f99f1e61bf0" />
-                                <parmlist id="4961" addr="0x7f99f1e63a90" >
+                        <constructor id="4948" addr="0x7fca469b1e10" >
+                            <attributelist id="4949" addr="0x7fca469b1e10" >
+                                <attribute name="name" value="ControlEdit" id="4950" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="4951" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469ae9f0" id="4952" addr="0x7fca469ae9f0" />
+                                <attribute name="csym_nextSibling" value="0x7fca469b2190" id="4953" addr="0x7fca469b2190" />
+                                <attribute name="sym_previousSibling" value="0x7fca469b19f0" id="4954" addr="0x7fca469b19f0" />
+                                <attribute name="sym_name" value="ControlEdit" id="4955" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469b2190" id="4956" addr="0x7fca469b2190" />
+                                <attribute name="defaultargs" value="0x7fca469afbf0" id="4957" addr="0x7fca469afbf0" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char)." id="4958" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="4959" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469afbf0" id="4960" addr="0x7fca469afbf0" />
+                                <parmlist id="4961" addr="0x7fca469b1a90" >
                                     <parm id="4962">
-                                        <attributelist id="4963" addr="0x7f99f1e63a90" >
-                                            <attribute name="name" value="x" id="4964" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4965" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4963" addr="0x7fca469b1a90" >
+                                            <attribute name="name" value="x" id="4964" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4965" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4966">
-                                        <attributelist id="4967" addr="0x7f99f1e63b50" >
-                                            <attribute name="name" value="y" id="4968" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4969" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4967" addr="0x7fca469b1b50" >
+                                            <attribute name="name" value="y" id="4968" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4969" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4970">
-                                        <attributelist id="4971" addr="0x7f99f1e63bd0" >
-                                            <attribute name="name" value="width" id="4972" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4973" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4971" addr="0x7fca469b1bd0" >
+                                            <attribute name="name" value="width" id="4972" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4973" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4974">
-                                        <attributelist id="4975" addr="0x7f99f1e63c50" >
-                                            <attribute name="name" value="height" id="4976" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4977" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4975" addr="0x7fca469b1c50" >
+                                            <attribute name="name" value="height" id="4976" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4977" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4978">
-                                        <attributelist id="4979" addr="0x7f99f1e63cd0" >
-                                            <attribute name="name" value="label" id="4980" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4981" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4979" addr="0x7fca469b1cd0" >
+                                            <attribute name="name" value="label" id="4980" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4981" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4982">
-                                        <attributelist id="4983" addr="0x7f99f1e63d50" >
-                                            <attribute name="name" value="font" id="4984" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4985" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4986" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4983" addr="0x7fca469b1d50" >
+                                            <attribute name="name" value="font" id="4984" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4985" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4986" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_6" id="4987" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="4988" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_6" id="4987" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="4988" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="4989" addr="0x7f99f1e64190" >
-                            <attributelist id="4990" addr="0x7f99f1e64190" >
-                                <attribute name="name" value="ControlEdit" id="4991" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="4992" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e609f0" id="4993" addr="0x7f99f1e609f0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e63e10" id="4994" addr="0x7f99f1e63e10" />
-                                <attribute name="sym_name" value="ControlEdit" id="4995" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e61bf0" id="4996" addr="0x7f99f1e61bf0" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String)." id="4997" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="4998" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e61bf0" id="4999" addr="0x7f99f1e61bf0" />
-                                <parmlist id="5000" addr="0x7f99f1e63eb0" >
+                        <constructor id="4989" addr="0x7fca469b2190" >
+                            <attributelist id="4990" addr="0x7fca469b2190" >
+                                <attribute name="name" value="ControlEdit" id="4991" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="4992" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469ae9f0" id="4993" addr="0x7fca469ae9f0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469b1e10" id="4994" addr="0x7fca469b1e10" />
+                                <attribute name="sym_name" value="ControlEdit" id="4995" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469afbf0" id="4996" addr="0x7fca469afbf0" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String)." id="4997" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="4998" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469afbf0" id="4999" addr="0x7fca469afbf0" />
+                                <parmlist id="5000" addr="0x7fca469b1eb0" >
                                     <parm id="5001">
-                                        <attributelist id="5002" addr="0x7f99f1e63eb0" >
-                                            <attribute name="name" value="x" id="5003" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5004" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5002" addr="0x7fca469b1eb0" >
+                                            <attribute name="name" value="x" id="5003" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5004" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5005">
-                                        <attributelist id="5006" addr="0x7f99f1e63f70" >
-                                            <attribute name="name" value="y" id="5007" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5008" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5006" addr="0x7fca469b1f70" >
+                                            <attribute name="name" value="y" id="5007" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5008" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5009">
-                                        <attributelist id="5010" addr="0x7f99f1e63ff0" >
-                                            <attribute name="name" value="width" id="5011" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5012" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5010" addr="0x7fca469b1ff0" >
+                                            <attribute name="name" value="width" id="5011" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5012" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5013">
-                                        <attributelist id="5014" addr="0x7f99f1e64070" >
-                                            <attribute name="name" value="height" id="5015" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5016" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5014" addr="0x7fca469b2070" >
+                                            <attribute name="name" value="height" id="5015" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5016" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5017">
-                                        <attributelist id="5018" addr="0x7f99f1e640f0" >
-                                            <attribute name="name" value="label" id="5019" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="5020" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5018" addr="0x7fca469b20f0" >
+                                            <attribute name="name" value="label" id="5019" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="5020" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_7" id="5021" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="5022" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_7" id="5021" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="5022" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <cdecl id="5023" addr="0x7f99f1e64e90" >
-                            <attributelist id="5024" addr="0x7f99f1e64e90" >
-                                <attribute name="name" value="setLabel" id="5025" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="5026" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e609f0" id="5027" addr="0x7f99f1e609f0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e65390" id="5028" addr="0x7f99f1e65390" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e65390" id="5029" addr="0x7f99f1e65390" />
-                                <attribute name="kind" value="function" id="5030" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setLabel" id="5031" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,r.q(const).XBMCAddon::String)." id="5032" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="5033" addr="0x7f99f1de6c90" />
-                                <parmlist id="5034" addr="0x7f99f1e64410" >
+                        <cdecl id="5023" addr="0x7fca469b2e90" >
+                            <attributelist id="5024" addr="0x7fca469b2e90" >
+                                <attribute name="name" value="setLabel" id="5025" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="5026" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469ae9f0" id="5027" addr="0x7fca469ae9f0" />
+                                <attribute name="sym_nextSibling" value="0x7fca469b3390" id="5028" addr="0x7fca469b3390" />
+                                <attribute name="csym_nextSibling" value="0x7fca469b3390" id="5029" addr="0x7fca469b3390" />
+                                <attribute name="kind" value="function" id="5030" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setLabel" id="5031" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,r.q(const).XBMCAddon::String)." id="5032" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="5033" addr="0x7fca46934c90" />
+                                <parmlist id="5034" addr="0x7fca469b2410" >
                                     <parm id="5035">
-                                        <attributelist id="5036" addr="0x7f99f1e64410" >
-                                            <attribute name="name" value="label" id="5037" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="5038" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="5039" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5036" addr="0x7fca469b2410" >
+                                            <attribute name="name" value="label" id="5037" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="5038" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="5039" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5040">
-                                        <attributelist id="5041" addr="0x7f99f1e645b0" >
-                                            <attribute name="name" value="font" id="5042" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5043" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5044" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5041" addr="0x7fca469b25b0" >
+                                            <attribute name="name" value="font" id="5042" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5043" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5044" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5045">
-                                        <attributelist id="5046" addr="0x7f99f1e64750" >
-                                            <attribute name="name" value="textColor" id="5047" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5048" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5049" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5046" addr="0x7fca469b2750" >
+                                            <attribute name="name" value="textColor" id="5047" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5048" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5049" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5050">
-                                        <attributelist id="5051" addr="0x7f99f1e648f0" >
-                                            <attribute name="name" value="disabledColor" id="5052" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5053" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5054" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5051" addr="0x7fca469b28f0" >
+                                            <attribute name="name" value="disabledColor" id="5052" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5053" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5054" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5055">
-                                        <attributelist id="5056" addr="0x7f99f1e64a90" >
-                                            <attribute name="name" value="shadowColor" id="5057" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5058" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5059" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5056" addr="0x7fca469b2a90" >
+                                            <attribute name="name" value="shadowColor" id="5057" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5058" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5059" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5060">
-                                        <attributelist id="5061" addr="0x7f99f1e64c30" >
-                                            <attribute name="name" value="focusedColor" id="5062" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5063" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5064" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5061" addr="0x7fca469b2c30" >
+                                            <attribute name="name" value="focusedColor" id="5062" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5063" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5064" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5065">
-                                        <attributelist id="5066" addr="0x7f99f1e64dd0" >
-                                            <attribute name="name" value="label2" id="5067" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="5068" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="5069" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                    </parm >
-                                </parmlist >
-                                <attribute name="sym_overloaded" value="0x7f99f1e64e90" id="5070" addr="0x7f99f1e64e90" />
-                                <attribute name="type" value="void" id="5071" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="5072" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="5073" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="5074" addr="0x7f99f1e65390" >
-                            <attributelist id="5075" addr="0x7f99f1e65390" >
-                                <attribute name="name" value="setLabel" id="5076" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="5077" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e609f0" id="5078" addr="0x7f99f1e609f0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e64e90" id="5079" addr="0x7f99f1e64e90" />
-                                <attribute name="kind" value="function" id="5080" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setLabel" id="5081" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e657f0" id="5082" addr="0x7f99f1e657f0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e657f0" id="5083" addr="0x7f99f1e657f0" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char)." id="5084" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e64e90" id="5085" addr="0x7f99f1e64e90" />
-                                <attribute name="access" value="public" id="5086" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e64e90" id="5087" addr="0x7f99f1e64e90" />
-                                <parmlist id="5088" addr="0x7f99f1e64f50" >
+                                        <attributelist id="5066" addr="0x7fca469b2dd0" >
+                                            <attribute name="name" value="label2" id="5067" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="5068" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="5069" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                    </parm >
+                                </parmlist >
+                                <attribute name="sym_overloaded" value="0x7fca469b2e90" id="5070" addr="0x7fca469b2e90" />
+                                <attribute name="type" value="void" id="5071" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="5072" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="5073" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="5074" addr="0x7fca469b3390" >
+                            <attributelist id="5075" addr="0x7fca469b3390" >
+                                <attribute name="name" value="setLabel" id="5076" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="5077" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469ae9f0" id="5078" addr="0x7fca469ae9f0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469b2e90" id="5079" addr="0x7fca469b2e90" />
+                                <attribute name="kind" value="function" id="5080" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setLabel" id="5081" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469b37f0" id="5082" addr="0x7fca469b37f0" />
+                                <attribute name="sym_nextSibling" value="0x7fca469b37f0" id="5083" addr="0x7fca469b37f0" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char)." id="5084" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469b2e90" id="5085" addr="0x7fca469b2e90" />
+                                <attribute name="access" value="public" id="5086" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469b2e90" id="5087" addr="0x7fca469b2e90" />
+                                <parmlist id="5088" addr="0x7fca469b2f50" >
                                     <parm id="5089">
-                                        <attributelist id="5090" addr="0x7f99f1e64f50" >
-                                            <attribute name="name" value="label" id="5091" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="5092" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="5093" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5090" addr="0x7fca469b2f50" >
+                                            <attribute name="name" value="label" id="5091" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="5092" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="5093" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5094">
-                                        <attributelist id="5095" addr="0x7f99f1e65050" >
-                                            <attribute name="name" value="font" id="5096" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5097" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5098" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5095" addr="0x7fca469b3050" >
+                                            <attribute name="name" value="font" id="5096" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5097" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5098" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5099">
-                                        <attributelist id="5100" addr="0x7f99f1e650f0" >
-                                            <attribute name="name" value="textColor" id="5101" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5102" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5103" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5100" addr="0x7fca469b30f0" >
+                                            <attribute name="name" value="textColor" id="5101" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5102" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5103" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5104">
-                                        <attributelist id="5105" addr="0x7f99f1e65190" >
-                                            <attribute name="name" value="disabledColor" id="5106" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5107" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5108" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5105" addr="0x7fca469b3190" >
+                                            <attribute name="name" value="disabledColor" id="5106" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5107" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5108" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5109">
-                                        <attributelist id="5110" addr="0x7f99f1e65230" >
-                                            <attribute name="name" value="shadowColor" id="5111" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5112" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5113" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5110" addr="0x7fca469b3230" >
+                                            <attribute name="name" value="shadowColor" id="5111" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5112" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5113" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5114">
-                                        <attributelist id="5115" addr="0x7f99f1e652d0" >
-                                            <attribute name="name" value="focusedColor" id="5116" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5117" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5118" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                    </parm >
-                                </parmlist >
-                                <attribute name="type" value="void" id="5119" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="5120" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="5121" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="5122" addr="0x7f99f1e657f0" >
-                            <attributelist id="5123" addr="0x7f99f1e657f0" >
-                                <attribute name="name" value="setLabel" id="5124" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="5125" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e609f0" id="5126" addr="0x7f99f1e609f0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e65390" id="5127" addr="0x7f99f1e65390" />
-                                <attribute name="kind" value="function" id="5128" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setLabel" id="5129" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e65bb0" id="5130" addr="0x7f99f1e65bb0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e65bb0" id="5131" addr="0x7f99f1e65bb0" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char)." id="5132" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e64e90" id="5133" addr="0x7f99f1e64e90" />
-                                <attribute name="access" value="public" id="5134" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e64e90" id="5135" addr="0x7f99f1e64e90" />
-                                <parmlist id="5136" addr="0x7f99f1e65450" >
+                                        <attributelist id="5115" addr="0x7fca469b32d0" >
+                                            <attribute name="name" value="focusedColor" id="5116" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5117" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5118" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                    </parm >
+                                </parmlist >
+                                <attribute name="type" value="void" id="5119" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="5120" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="5121" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="5122" addr="0x7fca469b37f0" >
+                            <attributelist id="5123" addr="0x7fca469b37f0" >
+                                <attribute name="name" value="setLabel" id="5124" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="5125" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469ae9f0" id="5126" addr="0x7fca469ae9f0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469b3390" id="5127" addr="0x7fca469b3390" />
+                                <attribute name="kind" value="function" id="5128" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setLabel" id="5129" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469b3bb0" id="5130" addr="0x7fca469b3bb0" />
+                                <attribute name="sym_nextSibling" value="0x7fca469b3bb0" id="5131" addr="0x7fca469b3bb0" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char)." id="5132" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469b2e90" id="5133" addr="0x7fca469b2e90" />
+                                <attribute name="access" value="public" id="5134" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469b2e90" id="5135" addr="0x7fca469b2e90" />
+                                <parmlist id="5136" addr="0x7fca469b3450" >
                                     <parm id="5137">
-                                        <attributelist id="5138" addr="0x7f99f1e65450" >
-                                            <attribute name="name" value="label" id="5139" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="5140" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="5141" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5138" addr="0x7fca469b3450" >
+                                            <attribute name="name" value="label" id="5139" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="5140" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="5141" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5142">
-                                        <attributelist id="5143" addr="0x7f99f1e65550" >
-                                            <attribute name="name" value="font" id="5144" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5145" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5146" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5143" addr="0x7fca469b3550" >
+                                            <attribute name="name" value="font" id="5144" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5145" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5146" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5147">
-                                        <attributelist id="5148" addr="0x7f99f1e655f0" >
-                                            <attribute name="name" value="textColor" id="5149" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5150" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5151" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5148" addr="0x7fca469b35f0" >
+                                            <attribute name="name" value="textColor" id="5149" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5150" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5151" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5152">
-                                        <attributelist id="5153" addr="0x7f99f1e65690" >
-                                            <attribute name="name" value="disabledColor" id="5154" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5155" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5156" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5153" addr="0x7fca469b3690" >
+                                            <attribute name="name" value="disabledColor" id="5154" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5155" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5156" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5157">
-                                        <attributelist id="5158" addr="0x7f99f1e65730" >
-                                            <attribute name="name" value="shadowColor" id="5159" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5160" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5161" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                    </parm >
-                                </parmlist >
-                                <attribute name="type" value="void" id="5162" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_2" id="5163" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="5164" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="5165" addr="0x7f99f1e65bb0" >
-                            <attributelist id="5166" addr="0x7f99f1e65bb0" >
-                                <attribute name="name" value="setLabel" id="5167" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="5168" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e609f0" id="5169" addr="0x7f99f1e609f0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e657f0" id="5170" addr="0x7f99f1e657f0" />
-                                <attribute name="kind" value="function" id="5171" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setLabel" id="5172" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e65ed0" id="5173" addr="0x7f99f1e65ed0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e65ed0" id="5174" addr="0x7f99f1e65ed0" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char,p.q(const).char)." id="5175" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e64e90" id="5176" addr="0x7f99f1e64e90" />
-                                <attribute name="access" value="public" id="5177" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e64e90" id="5178" addr="0x7f99f1e64e90" />
-                                <parmlist id="5179" addr="0x7f99f1e658b0" >
+                                        <attributelist id="5158" addr="0x7fca469b3730" >
+                                            <attribute name="name" value="shadowColor" id="5159" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5160" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5161" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                    </parm >
+                                </parmlist >
+                                <attribute name="type" value="void" id="5162" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_2" id="5163" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="5164" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="5165" addr="0x7fca469b3bb0" >
+                            <attributelist id="5166" addr="0x7fca469b3bb0" >
+                                <attribute name="name" value="setLabel" id="5167" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="5168" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469ae9f0" id="5169" addr="0x7fca469ae9f0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469b37f0" id="5170" addr="0x7fca469b37f0" />
+                                <attribute name="kind" value="function" id="5171" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setLabel" id="5172" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469b3ed0" id="5173" addr="0x7fca469b3ed0" />
+                                <attribute name="sym_nextSibling" value="0x7fca469b3ed0" id="5174" addr="0x7fca469b3ed0" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char,p.q(const).char)." id="5175" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469b2e90" id="5176" addr="0x7fca469b2e90" />
+                                <attribute name="access" value="public" id="5177" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469b2e90" id="5178" addr="0x7fca469b2e90" />
+                                <parmlist id="5179" addr="0x7fca469b38b0" >
                                     <parm id="5180">
-                                        <attributelist id="5181" addr="0x7f99f1e658b0" >
-                                            <attribute name="name" value="label" id="5182" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="5183" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="5184" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5181" addr="0x7fca469b38b0" >
+                                            <attribute name="name" value="label" id="5182" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="5183" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="5184" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5185">
-                                        <attributelist id="5186" addr="0x7f99f1e659b0" >
-                                            <attribute name="name" value="font" id="5187" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5188" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5189" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5186" addr="0x7fca469b39b0" >
+                                            <attribute name="name" value="font" id="5187" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5188" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5189" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5190">
-                                        <attributelist id="5191" addr="0x7f99f1e65a50" >
-                                            <attribute name="name" value="textColor" id="5192" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5193" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5194" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5191" addr="0x7fca469b3a50" >
+                                            <attribute name="name" value="textColor" id="5192" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5193" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5194" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5195">
-                                        <attributelist id="5196" addr="0x7f99f1e65af0" >
-                                            <attribute name="name" value="disabledColor" id="5197" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5198" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5199" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                    </parm >
-                                </parmlist >
-                                <attribute name="type" value="void" id="5200" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_3" id="5201" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="5202" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="5203" addr="0x7f99f1e65ed0" >
-                            <attributelist id="5204" addr="0x7f99f1e65ed0" >
-                                <attribute name="name" value="setLabel" id="5205" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="5206" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e609f0" id="5207" addr="0x7f99f1e609f0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e65bb0" id="5208" addr="0x7f99f1e65bb0" />
-                                <attribute name="kind" value="function" id="5209" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setLabel" id="5210" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e66150" id="5211" addr="0x7f99f1e66150" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e66150" id="5212" addr="0x7f99f1e66150" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char)." id="5213" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e64e90" id="5214" addr="0x7f99f1e64e90" />
-                                <attribute name="access" value="public" id="5215" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e64e90" id="5216" addr="0x7f99f1e64e90" />
-                                <parmlist id="5217" addr="0x7f99f1e65c70" >
+                                        <attributelist id="5196" addr="0x7fca469b3af0" >
+                                            <attribute name="name" value="disabledColor" id="5197" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5198" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5199" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                    </parm >
+                                </parmlist >
+                                <attribute name="type" value="void" id="5200" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_3" id="5201" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="5202" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="5203" addr="0x7fca469b3ed0" >
+                            <attributelist id="5204" addr="0x7fca469b3ed0" >
+                                <attribute name="name" value="setLabel" id="5205" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="5206" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469ae9f0" id="5207" addr="0x7fca469ae9f0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469b3bb0" id="5208" addr="0x7fca469b3bb0" />
+                                <attribute name="kind" value="function" id="5209" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setLabel" id="5210" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469b4150" id="5211" addr="0x7fca469b4150" />
+                                <attribute name="sym_nextSibling" value="0x7fca469b4150" id="5212" addr="0x7fca469b4150" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char)." id="5213" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469b2e90" id="5214" addr="0x7fca469b2e90" />
+                                <attribute name="access" value="public" id="5215" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469b2e90" id="5216" addr="0x7fca469b2e90" />
+                                <parmlist id="5217" addr="0x7fca469b3c70" >
                                     <parm id="5218">
-                                        <attributelist id="5219" addr="0x7f99f1e65c70" >
-                                            <attribute name="name" value="label" id="5220" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="5221" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="5222" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5219" addr="0x7fca469b3c70" >
+                                            <attribute name="name" value="label" id="5220" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="5221" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="5222" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5223">
-                                        <attributelist id="5224" addr="0x7f99f1e65d70" >
-                                            <attribute name="name" value="font" id="5225" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5226" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5227" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5224" addr="0x7fca469b3d70" >
+                                            <attribute name="name" value="font" id="5225" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5226" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5227" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5228">
-                                        <attributelist id="5229" addr="0x7f99f1e65e10" >
-                                            <attribute name="name" value="textColor" id="5230" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5231" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5232" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                    </parm >
-                                </parmlist >
-                                <attribute name="type" value="void" id="5233" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_4" id="5234" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="5235" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="5236" addr="0x7f99f1e66150" >
-                            <attributelist id="5237" addr="0x7f99f1e66150" >
-                                <attribute name="name" value="setLabel" id="5238" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="5239" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e609f0" id="5240" addr="0x7f99f1e609f0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e65ed0" id="5241" addr="0x7f99f1e65ed0" />
-                                <attribute name="kind" value="function" id="5242" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setLabel" id="5243" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e66330" id="5244" addr="0x7f99f1e66330" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e66330" id="5245" addr="0x7f99f1e66330" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char)." id="5246" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e64e90" id="5247" addr="0x7f99f1e64e90" />
-                                <attribute name="access" value="public" id="5248" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e64e90" id="5249" addr="0x7f99f1e64e90" />
-                                <parmlist id="5250" addr="0x7f99f1e65f90" >
+                                        <attributelist id="5229" addr="0x7fca469b3e10" >
+                                            <attribute name="name" value="textColor" id="5230" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5231" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5232" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                    </parm >
+                                </parmlist >
+                                <attribute name="type" value="void" id="5233" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_4" id="5234" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="5235" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="5236" addr="0x7fca469b4150" >
+                            <attributelist id="5237" addr="0x7fca469b4150" >
+                                <attribute name="name" value="setLabel" id="5238" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="5239" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469ae9f0" id="5240" addr="0x7fca469ae9f0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469b3ed0" id="5241" addr="0x7fca469b3ed0" />
+                                <attribute name="kind" value="function" id="5242" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setLabel" id="5243" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469b4330" id="5244" addr="0x7fca469b4330" />
+                                <attribute name="sym_nextSibling" value="0x7fca469b4330" id="5245" addr="0x7fca469b4330" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char)." id="5246" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469b2e90" id="5247" addr="0x7fca469b2e90" />
+                                <attribute name="access" value="public" id="5248" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469b2e90" id="5249" addr="0x7fca469b2e90" />
+                                <parmlist id="5250" addr="0x7fca469b3f90" >
                                     <parm id="5251">
-                                        <attributelist id="5252" addr="0x7f99f1e65f90" >
-                                            <attribute name="name" value="label" id="5253" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="5254" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="5255" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5252" addr="0x7fca469b3f90" >
+                                            <attribute name="name" value="label" id="5253" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="5254" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="5255" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5256">
-                                        <attributelist id="5257" addr="0x7f99f1e66090" >
-                                            <attribute name="name" value="font" id="5258" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5259" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5260" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                    </parm >
-                                </parmlist >
-                                <attribute name="type" value="void" id="5261" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_5" id="5262" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="5263" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="5264" addr="0x7f99f1e66330" >
-                            <attributelist id="5265" addr="0x7f99f1e66330" >
-                                <attribute name="name" value="setLabel" id="5266" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="5267" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e609f0" id="5268" addr="0x7f99f1e609f0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e66150" id="5269" addr="0x7f99f1e66150" />
-                                <attribute name="kind" value="function" id="5270" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setLabel" id="5271" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e66450" id="5272" addr="0x7f99f1e66450" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e66450" id="5273" addr="0x7f99f1e66450" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="5274" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e64e90" id="5275" addr="0x7f99f1e64e90" />
-                                <attribute name="access" value="public" id="5276" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e64e90" id="5277" addr="0x7f99f1e64e90" />
-                                <parmlist id="5278" addr="0x7f99f1e66210" >
+                                        <attributelist id="5257" addr="0x7fca469b4090" >
+                                            <attribute name="name" value="font" id="5258" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5259" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5260" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                    </parm >
+                                </parmlist >
+                                <attribute name="type" value="void" id="5261" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_5" id="5262" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="5263" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="5264" addr="0x7fca469b4330" >
+                            <attributelist id="5265" addr="0x7fca469b4330" >
+                                <attribute name="name" value="setLabel" id="5266" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="5267" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469ae9f0" id="5268" addr="0x7fca469ae9f0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469b4150" id="5269" addr="0x7fca469b4150" />
+                                <attribute name="kind" value="function" id="5270" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setLabel" id="5271" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469b4450" id="5272" addr="0x7fca469b4450" />
+                                <attribute name="sym_nextSibling" value="0x7fca469b4450" id="5273" addr="0x7fca469b4450" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="5274" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469b2e90" id="5275" addr="0x7fca469b2e90" />
+                                <attribute name="access" value="public" id="5276" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469b2e90" id="5277" addr="0x7fca469b2e90" />
+                                <parmlist id="5278" addr="0x7fca469b4210" >
                                     <parm id="5279">
-                                        <attributelist id="5280" addr="0x7f99f1e66210" >
-                                            <attribute name="name" value="label" id="5281" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="5282" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="5283" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                    </parm >
-                                </parmlist >
-                                <attribute name="type" value="void" id="5284" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_6" id="5285" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="5286" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="5287" addr="0x7f99f1e66450" >
-                            <attributelist id="5288" addr="0x7f99f1e66450" >
-                                <attribute name="name" value="setLabel" id="5289" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="5290" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e609f0" id="5291" addr="0x7f99f1e609f0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e66330" id="5292" addr="0x7f99f1e66330" />
-                                <attribute name="kind" value="function" id="5293" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setLabel" id="5294" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e64e90" id="5295" addr="0x7f99f1e64e90" />
-                                <attribute name="decl" value="f()." id="5296" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="5297" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e64e90" id="5298" addr="0x7f99f1e64e90" />
-                                <attribute name="type" value="void" id="5299" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_7" id="5300" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="5301" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="5302" addr="0x7f99f1e66670" >
-                            <attributelist id="5303" addr="0x7f99f1e66670" >
-                                <attribute name="name" value="getLabel" id="5304" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="5305" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e609f0" id="5306" addr="0x7f99f1e609f0" />
-                                <attribute name="kind" value="function" id="5307" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getLabel" id="5308" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="5309" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="5310" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="XBMCAddon::String" id="5311" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="5312" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="5313" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="5314" addr="0x7f99f1e66990" >
-                            <attributelist id="5315" addr="0x7f99f1e66990" >
-                                <attribute name="name" value="setText" id="5316" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="5317" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e609f0" id="5318" addr="0x7f99f1e609f0" />
-                                <attribute name="kind" value="function" id="5319" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setText" id="5320" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="5321" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="5322" addr="0x7f99f1de6c90" />
-                                <parmlist id="5323" addr="0x7f99f1e668d0" >
+                                        <attributelist id="5280" addr="0x7fca469b4210" >
+                                            <attribute name="name" value="label" id="5281" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="5282" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="5283" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                    </parm >
+                                </parmlist >
+                                <attribute name="type" value="void" id="5284" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_6" id="5285" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="5286" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="5287" addr="0x7fca469b4450" >
+                            <attributelist id="5288" addr="0x7fca469b4450" >
+                                <attribute name="name" value="setLabel" id="5289" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="5290" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469ae9f0" id="5291" addr="0x7fca469ae9f0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469b4330" id="5292" addr="0x7fca469b4330" />
+                                <attribute name="kind" value="function" id="5293" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setLabel" id="5294" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469b2e90" id="5295" addr="0x7fca469b2e90" />
+                                <attribute name="decl" value="f()." id="5296" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="5297" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469b2e90" id="5298" addr="0x7fca469b2e90" />
+                                <attribute name="type" value="void" id="5299" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_7" id="5300" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="5301" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="5302" addr="0x7fca469b4670" >
+                            <attributelist id="5303" addr="0x7fca469b4670" >
+                                <attribute name="name" value="getLabel" id="5304" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="5305" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469ae9f0" id="5306" addr="0x7fca469ae9f0" />
+                                <attribute name="kind" value="function" id="5307" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getLabel" id="5308" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="5309" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="5310" addr="0x7fca46934c90" />
+                                <attribute name="type" value="XBMCAddon::String" id="5311" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="5312" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="5313" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="5314" addr="0x7fca469b4990" >
+                            <attributelist id="5315" addr="0x7fca469b4990" >
+                                <attribute name="name" value="setText" id="5316" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="5317" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469ae9f0" id="5318" addr="0x7fca469ae9f0" />
+                                <attribute name="kind" value="function" id="5319" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setText" id="5320" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="5321" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="5322" addr="0x7fca46934c90" />
+                                <parmlist id="5323" addr="0x7fca469b48d0" >
                                     <parm id="5324">
-                                        <attributelist id="5325" addr="0x7f99f1e668d0" >
-                                            <attribute name="name" value="text" id="5326" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="5327" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5325" addr="0x7fca469b48d0" >
+                                            <attribute name="name" value="text" id="5326" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="5327" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="5328" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="5329" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="5330" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="5328" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="5329" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="5330" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="5331" addr="0x7f99f1e66b90" >
-                            <attributelist id="5332" addr="0x7f99f1e66b90" >
-                                <attribute name="name" value="getText" id="5333" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="5334" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e609f0" id="5335" addr="0x7f99f1e609f0" />
-                                <attribute name="kind" value="function" id="5336" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getText" id="5337" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="5338" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="5339" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="XBMCAddon::String" id="5340" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="5341" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="5342" addr="0x7f99f1de6c90" />
+                        <cdecl id="5331" addr="0x7fca469b4b90" >
+                            <attributelist id="5332" addr="0x7fca469b4b90" >
+                                <attribute name="name" value="getText" id="5333" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="5334" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469ae9f0" id="5335" addr="0x7fca469ae9f0" />
+                                <attribute name="kind" value="function" id="5336" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getText" id="5337" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="5338" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="5339" addr="0x7fca46934c90" />
+                                <attribute name="type" value="XBMCAddon::String" id="5340" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="5341" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="5342" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="5343" addr="0x7f99f1e66fd0" >
-                            <attributelist id="5344" addr="0x7f99f1e66fd0" >
-                                <attribute name="name" value="setType" id="5345" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="5346" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e609f0" id="5347" addr="0x7f99f1e609f0" />
-                                <attribute name="kind" value="function" id="5348" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setType" id="5349" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String)." id="5350" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="5351" addr="0x7f99f1de6c90" />
-                                <parmlist id="5352" addr="0x7f99f1e66dd0" >
+                        <cdecl id="5343" addr="0x7fca469b4fd0" >
+                            <attributelist id="5344" addr="0x7fca469b4fd0" >
+                                <attribute name="name" value="setType" id="5345" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="5346" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469ae9f0" id="5347" addr="0x7fca469ae9f0" />
+                                <attribute name="kind" value="function" id="5348" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setType" id="5349" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String)." id="5350" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="5351" addr="0x7fca46934c90" />
+                                <parmlist id="5352" addr="0x7fca469b4dd0" >
                                     <parm id="5353">
-                                        <attributelist id="5354" addr="0x7f99f1e66dd0" >
-                                            <attribute name="name" value="type" id="5355" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="5356" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5354" addr="0x7fca469b4dd0" >
+                                            <attribute name="name" value="type" id="5355" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="5356" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5357">
-                                        <attributelist id="5358" addr="0x7f99f1e66f10" >
-                                            <attribute name="name" value="heading" id="5359" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="5360" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5358" addr="0x7fca469b4f10" >
+                                            <attribute name="name" value="heading" id="5359" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="5360" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="5361" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="5362" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="5363" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="5361" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="5362" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="5363" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
                     </class >
-                    <class id="5364" addr="0x7f99f1e672b0" >
-                        <attributelist id="5365" addr="0x7f99f1e672b0" >
-                            <attribute name="name" value="XBMCAddon::xbmcgui::ControlList" id="5366" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="5367" addr="0x7f99f1e40fb0" />
-                            <attribute name="symtab" value="0x7f99f1e673f0" id="5368" addr="0x7f99f1e673f0" />
-                            <attribute name="allows_typedef" value="1" id="5369" addr="0x7f99f1de6c90" />
-                            <attribute name="typepass_visit" value="1" id="5370" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_visit" value="1" id="5371" addr="0x7f99f1de6c90" />
-                            <attribute name="kind" value="class" id="5372" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_name" value="ControlList" id="5373" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_has_constructor" value="1" id="5374" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_public_constructor" value="1" id="5375" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_has_destructor" value="1" id="5376" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_default_destructor" value="1" id="5377" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_copy_constructor" value="1" id="5378" addr="0x7f99f1de6c90" />
-                            <attribute name="privatebaselist" value="0x7f99f1e67290" id="5379" addr="0x7f99f1e67290" />
-                            <attribute name="protectedbaselist" value="0x7f99f1e67270" id="5380" addr="0x7f99f1e67270" />
-                            <baselist id="5381" addr="0x7f99f1e67250" >
-                                <base name="Control" id="5382" addr="0x7f99f1e671d0" />
+                    <class id="5364" addr="0x7fca469b52b0" >
+                        <attributelist id="5365" addr="0x7fca469b52b0" >
+                            <attribute name="name" value="XBMCAddon::xbmcgui::ControlList" id="5366" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="5367" addr="0x7fca4698efb0" />
+                            <attribute name="symtab" value="0x7fca469b53f0" id="5368" addr="0x7fca469b53f0" />
+                            <attribute name="allows_typedef" value="1" id="5369" addr="0x7fca46934c90" />
+                            <attribute name="typepass_visit" value="1" id="5370" addr="0x7fca46934c90" />
+                            <attribute name="allocate_visit" value="1" id="5371" addr="0x7fca46934c90" />
+                            <attribute name="kind" value="class" id="5372" addr="0x7fca46934c90" />
+                            <attribute name="sym_name" value="ControlList" id="5373" addr="0x7fca46934c90" />
+                            <attribute name="allocate_has_constructor" value="1" id="5374" addr="0x7fca46934c90" />
+                            <attribute name="allocate_public_constructor" value="1" id="5375" addr="0x7fca46934c90" />
+                            <attribute name="allocate_has_destructor" value="1" id="5376" addr="0x7fca46934c90" />
+                            <attribute name="allocate_default_destructor" value="1" id="5377" addr="0x7fca46934c90" />
+                            <attribute name="allocate_copy_constructor" value="1" id="5378" addr="0x7fca46934c90" />
+                            <attribute name="privatebaselist" value="0x7fca469b5290" id="5379" addr="0x7fca469b5290" />
+                            <attribute name="protectedbaselist" value="0x7fca469b5270" id="5380" addr="0x7fca469b5270" />
+                            <baselist id="5381" addr="0x7fca469b5250" >
+                                <base name="Control" id="5382" addr="0x7fca469b51d0" />
                             </baselist >
-                            <attribute name="module" value="xbmcgui" id="5383" addr="0x7f99f1e402f0" />
-                            <attribute name="bases" value="0x7f99f1dd9850" id="5384" addr="0x7f99f1dd9850" />
-                            <attribute name="allbases" value="0x7f99f1dd9af0" id="5385" addr="0x7f99f1dd9af0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="5386" addr="0x7f99f1de6c90" />
-                            <typescope id="5387" addr="0x7f99f1dd97d0" >
-                                <attributelist id="5388" addr="0x7f99f1dd97d0" >
-                                    <attribute name="inherit" value="0x7f99f1dd98d0" id="5389" addr="0x7f99f1dd98d0" />
-                                    <attribute name="name" value="ControlList" id="5390" addr="0x7f99f1de6c90" />
-                                    <typetab id="5391" addr="0x7f99f1dd97f0" >
-                                        <attributelist id="5392" addr="0x7f99f1dd97f0" >
+                            <attribute name="module" value="xbmcgui" id="5383" addr="0x7fca4698e2f0" />
+                            <attribute name="bases" value="0x7fca46927850" id="5384" addr="0x7fca46927850" />
+                            <attribute name="allbases" value="0x7fca46927af0" id="5385" addr="0x7fca46927af0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="5386" addr="0x7fca46934c90" />
+                            <typescope id="5387" addr="0x7fca469277d0" >
+                                <attributelist id="5388" addr="0x7fca469277d0" >
+                                    <attribute name="inherit" value="0x7fca469278d0" id="5389" addr="0x7fca469278d0" />
+                                    <attribute name="name" value="ControlList" id="5390" addr="0x7fca46934c90" />
+                                    <typetab id="5391" addr="0x7fca469277f0" >
+                                        <attributelist id="5392" addr="0x7fca469277f0" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f99f1dd2150" id="5393" addr="0x7f99f1dd2150" />
-                                    <attribute name="qname" value="XBMCAddon::xbmcgui::ControlList" id="5394" addr="0x7f99f1de6c90" />
-                                    <attribute name="symtab" value="0x7f99f1e673f0" id="5395" addr="0x7f99f1e673f0" />
+                                    <attribute name="parent" value="0x7fca46920150" id="5393" addr="0x7fca46920150" />
+                                    <attribute name="qname" value="XBMCAddon::xbmcgui::ControlList" id="5394" addr="0x7fca46934c90" />
+                                    <attribute name="symtab" value="0x7fca469b53f0" id="5395" addr="0x7fca469b53f0" />
                                 </attributelist >
-                                <typescopesitem id="5396" addr="0x7f99f1dd98d0" >
-                                    <attributelist id="5397" addr="0x7f99f1dd98d0" >
+                                <typescopesitem id="5396" addr="0x7fca469278d0" >
+                                    <attributelist id="5397" addr="0x7fca469278d0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="5398" addr="0x7f99f1dd9770" >
-                                    <attributelist id="5399" addr="0x7f99f1dd9770" >
+                                <typescopesitem id="5398" addr="0x7fca46927770" >
+                                    <attributelist id="5399" addr="0x7fca46927770" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="5400" addr="0x7f99f1dd97f0" >
-                                    <attributelist id="5401" addr="0x7f99f1dd97f0" >
+                                <typescopesitem id="5400" addr="0x7fca469277f0" >
+                                    <attributelist id="5401" addr="0x7fca469277f0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="5402" addr="0x7f99f1dd2150" >
-                                    <attributelist id="5403" addr="0x7f99f1dd2150" >
-                                        <attribute name="name" value="xbmcgui" id="5404" addr="0x7f99f1de6c90" />
-                                        <typetab id="5405" addr="0x7f99f1dd2170" >
-                                            <attributelist id="5406" addr="0x7f99f1dd2170" >
-                                                <attribute name="InterceptorBase" value="InterceptorBase" id="5407" addr="0x7f99f1de6c90" />
-                                                <attribute name="Dialog" value="Dialog" id="5408" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="5409" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="5410" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlTextBox" value="ControlTextBox" id="5411" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="5412" addr="0x7f99f1de6c90" />
-                                                <attribute name="Window" value="Window" id="5413" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="5414" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlList" value="ControlList" id="5415" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="5416" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlImage" value="ControlImage" id="5417" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlButton" value="ControlButton" id="5418" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlGroup" value="ControlGroup" id="5419" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogBusy" value="DialogBusy" id="5420" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="5421" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSpin" value="ControlSpin" id="5422" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlEdit" value="ControlEdit" id="5423" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="5424" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="5425" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlLabel" value="ControlLabel" id="5426" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlProgress" value="ControlProgress" id="5427" addr="0x7f99f1de6c90" />
-                                                <attribute name="Control" value="Control" id="5428" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSlider" value="ControlSlider" id="5429" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgress" value="DialogProgress" id="5430" addr="0x7f99f1de6c90" />
-                                                <attribute name="Action" value="Action" id="5431" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowDialog" value="WindowDialog" id="5432" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXML" value="WindowXML" id="5433" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItem" value="ListItem" id="5434" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="5435" addr="0x7f99f1de6c90" />
+                                <typescopesitem id="5402" addr="0x7fca46920150" >
+                                    <attributelist id="5403" addr="0x7fca46920150" >
+                                        <attribute name="name" value="xbmcgui" id="5404" addr="0x7fca46934c90" />
+                                        <typetab id="5405" addr="0x7fca46920170" >
+                                            <attributelist id="5406" addr="0x7fca46920170" >
+                                                <attribute name="InterceptorBase" value="InterceptorBase" id="5407" addr="0x7fca46934c90" />
+                                                <attribute name="Dialog" value="Dialog" id="5408" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="5409" addr="0x7fca46934c90" />
+                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="5410" addr="0x7fca46934c90" />
+                                                <attribute name="ControlTextBox" value="ControlTextBox" id="5411" addr="0x7fca46934c90" />
+                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="5412" addr="0x7fca46934c90" />
+                                                <attribute name="Window" value="Window" id="5413" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="5414" addr="0x7fca46934c90" />
+                                                <attribute name="ControlList" value="ControlList" id="5415" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="5416" addr="0x7fca46934c90" />
+                                                <attribute name="ControlImage" value="ControlImage" id="5417" addr="0x7fca46934c90" />
+                                                <attribute name="ControlButton" value="ControlButton" id="5418" addr="0x7fca46934c90" />
+                                                <attribute name="ControlGroup" value="ControlGroup" id="5419" addr="0x7fca46934c90" />
+                                                <attribute name="DialogBusy" value="DialogBusy" id="5420" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="5421" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSpin" value="ControlSpin" id="5422" addr="0x7fca46934c90" />
+                                                <attribute name="ControlEdit" value="ControlEdit" id="5423" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="5424" addr="0x7fca46934c90" />
+                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="5425" addr="0x7fca46934c90" />
+                                                <attribute name="ControlLabel" value="ControlLabel" id="5426" addr="0x7fca46934c90" />
+                                                <attribute name="ControlProgress" value="ControlProgress" id="5427" addr="0x7fca46934c90" />
+                                                <attribute name="Control" value="Control" id="5428" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSlider" value="ControlSlider" id="5429" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgress" value="DialogProgress" id="5430" addr="0x7fca46934c90" />
+                                                <attribute name="Action" value="Action" id="5431" addr="0x7fca46934c90" />
+                                                <attribute name="WindowDialog" value="WindowDialog" id="5432" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXML" value="WindowXML" id="5433" addr="0x7fca46934c90" />
+                                                <attribute name="ListItem" value="ListItem" id="5434" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="5435" addr="0x7fca46934c90" />
                                             </attributelist >
-                                            <typetabsitem id="5436" addr="0x7f99f1de1dd0" >
-                                                <attributelist id="5437" addr="0x7f99f1de1dd0" >
+                                            <typetabsitem id="5436" addr="0x7fca4692fdd0" >
+                                                <attributelist id="5437" addr="0x7fca4692fdd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5438" addr="0x7f99f1dde790" >
-                                                <attributelist id="5439" addr="0x7f99f1dde790" >
+                                            <typetabsitem id="5438" addr="0x7fca4692c790" >
+                                                <attributelist id="5439" addr="0x7fca4692c790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5440" addr="0x7f99f1de3f10" >
-                                                <attributelist id="5441" addr="0x7f99f1de3f10" >
+                                            <typetabsitem id="5440" addr="0x7fca46931f10" >
+                                                <attributelist id="5441" addr="0x7fca46931f10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5442" addr="0x7f99f1dd67b0" >
-                                                <attributelist id="5443" addr="0x7f99f1dd67b0" >
+                                            <typetabsitem id="5442" addr="0x7fca469247b0" >
+                                                <attributelist id="5443" addr="0x7fca469247b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5444" addr="0x7f99f1ddafd0" >
-                                                <attributelist id="5445" addr="0x7f99f1ddafd0" >
+                                            <typetabsitem id="5444" addr="0x7fca46928fd0" >
+                                                <attributelist id="5445" addr="0x7fca46928fd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5446" addr="0x7f99f1ddd430" >
-                                                <attributelist id="5447" addr="0x7f99f1ddd430" >
+                                            <typetabsitem id="5446" addr="0x7fca4692b430" >
+                                                <attributelist id="5447" addr="0x7fca4692b430" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5448" addr="0x7f99f1de2130" >
-                                                <attributelist id="5449" addr="0x7f99f1de2130" >
+                                            <typetabsitem id="5448" addr="0x7fca46930130" >
+                                                <attributelist id="5449" addr="0x7fca46930130" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5450" addr="0x7f99f1dd2f50" >
-                                                <attributelist id="5451" addr="0x7f99f1dd2f50" >
+                                            <typetabsitem id="5450" addr="0x7fca46920f50" >
+                                                <attributelist id="5451" addr="0x7fca46920f50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5452" addr="0x7f99f1dd9650" >
-                                                <attributelist id="5453" addr="0x7f99f1dd9650" >
+                                            <typetabsitem id="5452" addr="0x7fca46927650" >
+                                                <attributelist id="5453" addr="0x7fca46927650" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5454" addr="0x7f99f1de3390" >
-                                                <attributelist id="5455" addr="0x7f99f1de3390" >
+                                            <typetabsitem id="5454" addr="0x7fca46931390" >
+                                                <attributelist id="5455" addr="0x7fca46931390" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5456" addr="0x7f99f1ddb7b0" >
-                                                <attributelist id="5457" addr="0x7f99f1ddb7b0" >
+                                            <typetabsitem id="5456" addr="0x7fca469297b0" >
+                                                <attributelist id="5457" addr="0x7fca469297b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5458" addr="0x7f99f1ddc4b0" >
-                                                <attributelist id="5459" addr="0x7f99f1ddc4b0" >
+                                            <typetabsitem id="5458" addr="0x7fca4692a4b0" >
+                                                <attributelist id="5459" addr="0x7fca4692a4b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5460" addr="0x7f99f1ddcf90" >
-                                                <attributelist id="5461" addr="0x7f99f1ddcf90" >
+                                            <typetabsitem id="5460" addr="0x7fca4692af90" >
+                                                <attributelist id="5461" addr="0x7fca4692af90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5462" addr="0x7f99f1de11b0" >
-                                                <attributelist id="5463" addr="0x7f99f1de11b0" >
+                                            <typetabsitem id="5462" addr="0x7fca4692f1b0" >
+                                                <attributelist id="5463" addr="0x7fca4692f1b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5464" addr="0x7f99f1de15b0" >
-                                                <attributelist id="5465" addr="0x7f99f1de15b0" >
+                                            <typetabsitem id="5464" addr="0x7fca4692f5b0" >
+                                                <attributelist id="5465" addr="0x7fca4692f5b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5466" addr="0x7f99f1dd77f0" >
-                                                <attributelist id="5467" addr="0x7f99f1dd77f0" >
+                                            <typetabsitem id="5466" addr="0x7fca469257f0" >
+                                                <attributelist id="5467" addr="0x7fca469257f0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5468" addr="0x7f99f1dd8b30" >
-                                                <attributelist id="5469" addr="0x7f99f1dd8b30" >
+                                            <typetabsitem id="5468" addr="0x7fca46926b30" >
+                                                <attributelist id="5469" addr="0x7fca46926b30" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5470" addr="0x7f99f1dd2c50" >
-                                                <attributelist id="5471" addr="0x7f99f1dd2c50" >
+                                            <typetabsitem id="5470" addr="0x7fca46920c50" >
+                                                <attributelist id="5471" addr="0x7fca46920c50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5472" addr="0x7f99f1dda790" >
-                                                <attributelist id="5473" addr="0x7f99f1dda790" >
+                                            <typetabsitem id="5472" addr="0x7fca46928790" >
+                                                <attributelist id="5473" addr="0x7fca46928790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5474" addr="0x7f99f1dd8030" >
-                                                <attributelist id="5475" addr="0x7f99f1dd8030" >
+                                            <typetabsitem id="5474" addr="0x7fca46926030" >
+                                                <attributelist id="5475" addr="0x7fca46926030" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5476" addr="0x7f99f1ddbe10" >
-                                                <attributelist id="5477" addr="0x7f99f1ddbe10" >
+                                            <typetabsitem id="5476" addr="0x7fca46929e10" >
+                                                <attributelist id="5477" addr="0x7fca46929e10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5478" addr="0x7f99f1dd6b10" >
-                                                <attributelist id="5479" addr="0x7f99f1dd6b10" >
+                                            <typetabsitem id="5478" addr="0x7fca46924b10" >
+                                                <attributelist id="5479" addr="0x7fca46924b10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5480" addr="0x7f99f1dddf90" >
-                                                <attributelist id="5481" addr="0x7f99f1dddf90" >
+                                            <typetabsitem id="5480" addr="0x7fca4692bf90" >
+                                                <attributelist id="5481" addr="0x7fca4692bf90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5482" addr="0x7f99f1de0530" >
-                                                <attributelist id="5483" addr="0x7f99f1de0530" >
+                                            <typetabsitem id="5482" addr="0x7fca4692e530" >
+                                                <attributelist id="5483" addr="0x7fca4692e530" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5484" addr="0x7f99f1de1e50" >
-                                                <attributelist id="5485" addr="0x7f99f1de1e50" >
+                                            <typetabsitem id="5484" addr="0x7fca4692fe50" >
+                                                <attributelist id="5485" addr="0x7fca4692fe50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5486" addr="0x7f99f1de2d90" >
-                                                <attributelist id="5487" addr="0x7f99f1de2d90" >
+                                            <typetabsitem id="5486" addr="0x7fca46930d90" >
+                                                <attributelist id="5487" addr="0x7fca46930d90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5488" addr="0x7f99f1de3410" >
-                                                <attributelist id="5489" addr="0x7f99f1de3410" >
+                                            <typetabsitem id="5488" addr="0x7fca46931410" >
+                                                <attributelist id="5489" addr="0x7fca46931410" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5490" addr="0x7f99f1dd3590" >
-                                                <attributelist id="5491" addr="0x7f99f1dd3590" >
+                                            <typetabsitem id="5490" addr="0x7fca46921590" >
+                                                <attributelist id="5491" addr="0x7fca46921590" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5492" addr="0x7f99f1dd3390" >
-                                                <attributelist id="5493" addr="0x7f99f1dd3390" >
+                                            <typetabsitem id="5492" addr="0x7fca46921390" >
+                                                <attributelist id="5493" addr="0x7fca46921390" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7f99f1dd1d70" id="5494" addr="0x7f99f1dd1d70" />
-                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="5495" addr="0x7f99f1de6c90" />
-                                        <attribute name="symtab" value="0x7f99f1e40fb0" id="5496" addr="0x7f99f1e40fb0" />
+                                        <attribute name="parent" value="0x7fca4691fd70" id="5494" addr="0x7fca4691fd70" />
+                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="5495" addr="0x7fca46934c90" />
+                                        <attribute name="symtab" value="0x7fca4698efb0" id="5496" addr="0x7fca4698efb0" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="5497" addr="0x7f99f1dd9810" >
-                                    <attributelist id="5498" addr="0x7f99f1dd9810" >
+                                <typescopesitem id="5497" addr="0x7fca46927810" >
+                                    <attributelist id="5498" addr="0x7fca46927810" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="5499" addr="0x7f99f1e673f0" >
-                                    <attributelist id="5500" addr="0x7f99f1e673f0" >
-                                        <attribute name="inherit" value="0x7f99f1e67450" id="5501" addr="0x7f99f1e67450" />
-                                        <attribute name="name" value="ControlList" id="5502" addr="0x7f99f1de6c90" />
-                                        <attribute name="csymtab" value="0x7f99f1e67410" id="5503" addr="0x7f99f1e67410" />
-                                        <attribute name="symtab" value="0x7f99f1e673d0" id="5504" addr="0x7f99f1e673d0" />
+                                <typescopesitem id="5499" addr="0x7fca469b53f0" >
+                                    <attributelist id="5500" addr="0x7fca469b53f0" >
+                                        <attribute name="inherit" value="0x7fca469b5450" id="5501" addr="0x7fca469b5450" />
+                                        <attribute name="name" value="ControlList" id="5502" addr="0x7fca46934c90" />
+                                        <attribute name="csymtab" value="0x7fca469b5410" id="5503" addr="0x7fca469b5410" />
+                                        <attribute name="symtab" value="0x7fca469b53d0" id="5504" addr="0x7fca469b53d0" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <cdecl id="5505" addr="0x7f99f1e67810" >
-                            <attributelist id="5506" addr="0x7f99f1e67810" >
-                                <attribute name="ismember" value="1" id="5507" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="internAddListItem" id="5508" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(AddonClass::Ref&lt;(XBMCAddon::xbmcgui::ListItem)>,bool)." id="5509" addr="0x7f99f1de6c90" />
-                                <parmlist id="5510" addr="0x7f99f1e67650" >
+                        <cdecl id="5505" addr="0x7fca469b5810" >
+                            <attributelist id="5506" addr="0x7fca469b5810" >
+                                <attribute name="ismember" value="1" id="5507" addr="0x7fca46934c90" />
+                                <attribute name="name" value="internAddListItem" id="5508" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(AddonClass::Ref&lt;(XBMCAddon::xbmcgui::ListItem)>,bool)." id="5509" addr="0x7fca46934c90" />
+                                <parmlist id="5510" addr="0x7fca469b5650" >
                                     <parm id="5511">
-                                        <attributelist id="5512" addr="0x7f99f1e67650" >
-                                            <attribute name="name" value="listitem" id="5513" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="AddonClass::Ref&lt;(XBMCAddon::xbmcgui::ListItem)>" id="5514" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5512" addr="0x7fca469b5650" >
+                                            <attribute name="name" value="listitem" id="5513" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="AddonClass::Ref&lt;(XBMCAddon::xbmcgui::ListItem)>" id="5514" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5515">
-                                        <attributelist id="5516" addr="0x7f99f1e67750" >
-                                            <attribute name="name" value="sendMessage" id="5517" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="5518" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5516" addr="0x7fca469b5750" >
+                                            <attribute name="name" value="sendMessage" id="5517" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="5518" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="access" value="private" id="5519" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="5520" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="void" id="5521" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e673f0" id="5522" addr="0x7f99f1e673f0" />
+                                <attribute name="access" value="private" id="5519" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="5520" addr="0x7fca46934c90" />
+                                <attribute name="type" value="void" id="5521" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469b53f0" id="5522" addr="0x7fca469b53f0" />
                             </attributelist >
                          
                         </cdecl >
-                        <access id="5523" addr="0x7f99f1e67930" >
-                            <attributelist id="5524" addr="0x7f99f1e67930" >
-                                <attribute name="kind" value="public" id="5525" addr="0x7f99f1de6c90" />
+                        <access id="5523" addr="0x7fca469b5930" >
+                            <attributelist id="5524" addr="0x7fca469b5930" >
+                                <attribute name="kind" value="public" id="5525" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="5526" addr="0x7f99f1e69030" >
-                            <attributelist id="5527" addr="0x7f99f1e69030" >
-                                <attribute name="name" value="ControlList" id="5528" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="5529" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e673f0" id="5530" addr="0x7f99f1e673f0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e69a10" id="5531" addr="0x7f99f1e69a10" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e69a10" id="5532" addr="0x7f99f1e69a10" />
-                                <attribute name="sym_name" value="ControlList" id="5533" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,long,long,long,long,long,long,long)." id="5534" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="5535" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e69030" id="5536" addr="0x7f99f1e69030" />
-                                <parmlist id="5537" addr="0x7f99f1e67a30" >
+                        <constructor id="5526" addr="0x7fca469b7030" >
+                            <attributelist id="5527" addr="0x7fca469b7030" >
+                                <attribute name="name" value="ControlList" id="5528" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="5529" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469b53f0" id="5530" addr="0x7fca469b53f0" />
+                                <attribute name="sym_nextSibling" value="0x7fca469b7a10" id="5531" addr="0x7fca469b7a10" />
+                                <attribute name="csym_nextSibling" value="0x7fca469b7a10" id="5532" addr="0x7fca469b7a10" />
+                                <attribute name="sym_name" value="ControlList" id="5533" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,long,long,long,long,long,long,long)." id="5534" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="5535" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469b7030" id="5536" addr="0x7fca469b7030" />
+                                <parmlist id="5537" addr="0x7fca469b5a30" >
                                     <parm id="5538">
-                                        <attributelist id="5539" addr="0x7f99f1e67a30" >
-                                            <attribute name="name" value="x" id="5540" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5541" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5539" addr="0x7fca469b5a30" >
+                                            <attribute name="name" value="x" id="5540" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5541" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5542">
-                                        <attributelist id="5543" addr="0x7f99f1e67b50" >
-                                            <attribute name="name" value="y" id="5544" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5545" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5543" addr="0x7fca469b5b50" >
+                                            <attribute name="name" value="y" id="5544" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5545" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5546">
-                                        <attributelist id="5547" addr="0x7f99f1e67c70" >
-                                            <attribute name="name" value="width" id="5548" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5549" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5547" addr="0x7fca469b5c70" >
+                                            <attribute name="name" value="width" id="5548" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5549" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5550">
-                                        <attributelist id="5551" addr="0x7f99f1e67d90" >
-                                            <attribute name="name" value="height" id="5552" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5553" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5551" addr="0x7fca469b5d90" >
+                                            <attribute name="name" value="height" id="5552" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5553" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5554">
-                                        <attributelist id="5555" addr="0x7f99f1e67f30" >
-                                            <attribute name="name" value="font" id="5556" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5557" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5558" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5555" addr="0x7fca469b5f30" >
+                                            <attribute name="name" value="font" id="5556" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5557" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5558" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5559">
-                                        <attributelist id="5560" addr="0x7f99f1e680d0" >
-                                            <attribute name="name" value="textColor" id="5561" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5562" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5563" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5560" addr="0x7fca469b60d0" >
+                                            <attribute name="name" value="textColor" id="5561" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5562" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5563" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5564">
-                                        <attributelist id="5565" addr="0x7f99f1e68270" >
-                                            <attribute name="name" value="buttonTexture" id="5566" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5567" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5568" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5565" addr="0x7fca469b6270" >
+                                            <attribute name="name" value="buttonTexture" id="5566" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5567" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5568" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5569">
-                                        <attributelist id="5570" addr="0x7f99f1e68410" >
-                                            <attribute name="name" value="buttonFocusTexture" id="5571" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5572" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5573" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5570" addr="0x7fca469b6410" >
+                                            <attribute name="name" value="buttonFocusTexture" id="5571" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5572" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5573" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5574">
-                                        <attributelist id="5575" addr="0x7f99f1e685b0" >
-                                            <attribute name="name" value="selectedColor" id="5576" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5577" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5578" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5575" addr="0x7fca469b65b0" >
+                                            <attribute name="name" value="selectedColor" id="5576" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5577" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5578" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5579">
-                                        <attributelist id="5580" addr="0x7f99f1e68710" >
-                                            <attribute name="name" value="_imageWidth" id="5581" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="5582" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5583" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5580" addr="0x7fca469b6710" >
+                                            <attribute name="name" value="_imageWidth" id="5581" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="5582" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5583" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5584">
-                                        <attributelist id="5585" addr="0x7f99f1e68870" >
-                                            <attribute name="name" value="_imageHeight" id="5586" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="5587" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5588" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5585" addr="0x7fca469b6870" >
+                                            <attribute name="name" value="_imageHeight" id="5586" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="5587" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5588" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5589">
-                                        <attributelist id="5590" addr="0x7f99f1e689d0" >
-                                            <attribute name="name" value="_itemTextXOffset" id="5591" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="5592" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5593" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5590" addr="0x7fca469b69d0" >
+                                            <attribute name="name" value="_itemTextXOffset" id="5591" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="5592" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5593" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5594">
-                                        <attributelist id="5595" addr="0x7f99f1e68b30" >
-                                            <attribute name="name" value="_itemTextYOffset" id="5596" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="2" id="5597" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5598" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5595" addr="0x7fca469b6b30" >
+                                            <attribute name="name" value="_itemTextYOffset" id="5596" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="2" id="5597" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5598" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5599">
-                                        <attributelist id="5600" addr="0x7f99f1e68c90" >
-                                            <attribute name="name" value="_itemHeight" id="5601" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="27" id="5602" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5603" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5600" addr="0x7fca469b6c90" >
+                                            <attribute name="name" value="_itemHeight" id="5601" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="27" id="5602" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5603" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5604">
-                                        <attributelist id="5605" addr="0x7f99f1e68df0" >
-                                            <attribute name="name" value="_space" id="5606" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="2" id="5607" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5608" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5605" addr="0x7fca469b6df0" >
+                                            <attribute name="name" value="_space" id="5606" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="2" id="5607" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5608" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5609">
-                                        <attributelist id="5610" addr="0x7f99f1e68f70" >
-                                            <attribute name="name" value="_alignmentY" id="5611" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBFONT_CENTER_Y" id="5612" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5613" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5610" addr="0x7fca469b6f70" >
+                                            <attribute name="name" value="_alignmentY" id="5611" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBFONT_CENTER_Y" id="5612" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5613" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_0" id="5614" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="5615" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="5614" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="5615" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="5616" addr="0x7f99f1e69a10" >
-                            <attributelist id="5617" addr="0x7f99f1e69a10" >
-                                <attribute name="name" value="ControlList" id="5618" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="5619" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e673f0" id="5620" addr="0x7f99f1e673f0" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e6a350" id="5621" addr="0x7f99f1e6a350" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e69030" id="5622" addr="0x7f99f1e69030" />
-                                <attribute name="sym_name" value="ControlList" id="5623" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e6a350" id="5624" addr="0x7f99f1e6a350" />
-                                <attribute name="defaultargs" value="0x7f99f1e69030" id="5625" addr="0x7f99f1e69030" />
-                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,long,long,long,long,long,long)." id="5626" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="5627" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e69030" id="5628" addr="0x7f99f1e69030" />
-                                <parmlist id="5629" addr="0x7f99f1e690d0" >
+                        <constructor id="5616" addr="0x7fca469b7a10" >
+                            <attributelist id="5617" addr="0x7fca469b7a10" >
+                                <attribute name="name" value="ControlList" id="5618" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="5619" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469b53f0" id="5620" addr="0x7fca469b53f0" />
+                                <attribute name="csym_nextSibling" value="0x7fca469b8350" id="5621" addr="0x7fca469b8350" />
+                                <attribute name="sym_previousSibling" value="0x7fca469b7030" id="5622" addr="0x7fca469b7030" />
+                                <attribute name="sym_name" value="ControlList" id="5623" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469b8350" id="5624" addr="0x7fca469b8350" />
+                                <attribute name="defaultargs" value="0x7fca469b7030" id="5625" addr="0x7fca469b7030" />
+                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,long,long,long,long,long,long)." id="5626" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="5627" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469b7030" id="5628" addr="0x7fca469b7030" />
+                                <parmlist id="5629" addr="0x7fca469b70d0" >
                                     <parm id="5630">
-                                        <attributelist id="5631" addr="0x7f99f1e690d0" >
-                                            <attribute name="name" value="x" id="5632" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5633" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5631" addr="0x7fca469b70d0" >
+                                            <attribute name="name" value="x" id="5632" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5633" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5634">
-                                        <attributelist id="5635" addr="0x7f99f1e69190" >
-                                            <attribute name="name" value="y" id="5636" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5637" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5635" addr="0x7fca469b7190" >
+                                            <attribute name="name" value="y" id="5636" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5637" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5638">
-                                        <attributelist id="5639" addr="0x7f99f1e69210" >
-                                            <attribute name="name" value="width" id="5640" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5641" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5639" addr="0x7fca469b7210" >
+                                            <attribute name="name" value="width" id="5640" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5641" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5642">
-                                        <attributelist id="5643" addr="0x7f99f1e69290" >
-                                            <attribute name="name" value="height" id="5644" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5645" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5643" addr="0x7fca469b7290" >
+                                            <attribute name="name" value="height" id="5644" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5645" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5646">
-                                        <attributelist id="5647" addr="0x7f99f1e69310" >
-                                            <attribute name="name" value="font" id="5648" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5649" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5650" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5647" addr="0x7fca469b7310" >
+                                            <attribute name="name" value="font" id="5648" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5649" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5650" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5651">
-                                        <attributelist id="5652" addr="0x7f99f1e693b0" >
-                                            <attribute name="name" value="textColor" id="5653" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5654" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5655" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5652" addr="0x7fca469b73b0" >
+                                            <attribute name="name" value="textColor" id="5653" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5654" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5655" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5656">
-                                        <attributelist id="5657" addr="0x7f99f1e69450" >
-                                            <attribute name="name" value="buttonTexture" id="5658" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5659" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5660" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5657" addr="0x7fca469b7450" >
+                                            <attribute name="name" value="buttonTexture" id="5658" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5659" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5660" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5661">
-                                        <attributelist id="5662" addr="0x7f99f1e694f0" >
-                                            <attribute name="name" value="buttonFocusTexture" id="5663" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5664" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5665" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5662" addr="0x7fca469b74f0" >
+                                            <attribute name="name" value="buttonFocusTexture" id="5663" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5664" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5665" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5666">
-                                        <attributelist id="5667" addr="0x7f99f1e69590" >
-                                            <attribute name="name" value="selectedColor" id="5668" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5669" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5670" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5667" addr="0x7fca469b7590" >
+                                            <attribute name="name" value="selectedColor" id="5668" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5669" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5670" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5671">
-                                        <attributelist id="5672" addr="0x7f99f1e69630" >
-                                            <attribute name="name" value="_imageWidth" id="5673" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="5674" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5675" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5672" addr="0x7fca469b7630" >
+                                            <attribute name="name" value="_imageWidth" id="5673" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="5674" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5675" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5676">
-                                        <attributelist id="5677" addr="0x7f99f1e696d0" >
-                                            <attribute name="name" value="_imageHeight" id="5678" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="5679" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5680" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5677" addr="0x7fca469b76d0" >
+                                            <attribute name="name" value="_imageHeight" id="5678" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="5679" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5680" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5681">
-                                        <attributelist id="5682" addr="0x7f99f1e69770" >
-                                            <attribute name="name" value="_itemTextXOffset" id="5683" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="5684" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5685" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5682" addr="0x7fca469b7770" >
+                                            <attribute name="name" value="_itemTextXOffset" id="5683" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="5684" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5685" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5686">
-                                        <attributelist id="5687" addr="0x7f99f1e69810" >
-                                            <attribute name="name" value="_itemTextYOffset" id="5688" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="2" id="5689" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5690" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5687" addr="0x7fca469b7810" >
+                                            <attribute name="name" value="_itemTextYOffset" id="5688" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="2" id="5689" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5690" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5691">
-                                        <attributelist id="5692" addr="0x7f99f1e698b0" >
-                                            <attribute name="name" value="_itemHeight" id="5693" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="27" id="5694" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5695" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5692" addr="0x7fca469b78b0" >
+                                            <attribute name="name" value="_itemHeight" id="5693" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="27" id="5694" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5695" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5696">
-                                        <attributelist id="5697" addr="0x7f99f1e69950" >
-                                            <attribute name="name" value="_space" id="5698" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="2" id="5699" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5700" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5697" addr="0x7fca469b7950" >
+                                            <attribute name="name" value="_space" id="5698" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="2" id="5699" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5700" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_1" id="5701" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="5702" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="5701" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="5702" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="5703" addr="0x7f99f1e6a350" >
-                            <attributelist id="5704" addr="0x7f99f1e6a350" >
-                                <attribute name="name" value="ControlList" id="5705" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="5706" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e673f0" id="5707" addr="0x7f99f1e673f0" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e6abf0" id="5708" addr="0x7f99f1e6abf0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e69a10" id="5709" addr="0x7f99f1e69a10" />
-                                <attribute name="sym_name" value="ControlList" id="5710" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e6abf0" id="5711" addr="0x7f99f1e6abf0" />
-                                <attribute name="defaultargs" value="0x7f99f1e69030" id="5712" addr="0x7f99f1e69030" />
-                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,long,long,long,long,long)." id="5713" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="5714" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e69030" id="5715" addr="0x7f99f1e69030" />
-                                <parmlist id="5716" addr="0x7f99f1e69ab0" >
+                        <constructor id="5703" addr="0x7fca469b8350" >
+                            <attributelist id="5704" addr="0x7fca469b8350" >
+                                <attribute name="name" value="ControlList" id="5705" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="5706" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469b53f0" id="5707" addr="0x7fca469b53f0" />
+                                <attribute name="csym_nextSibling" value="0x7fca469b8bf0" id="5708" addr="0x7fca469b8bf0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469b7a10" id="5709" addr="0x7fca469b7a10" />
+                                <attribute name="sym_name" value="ControlList" id="5710" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469b8bf0" id="5711" addr="0x7fca469b8bf0" />
+                                <attribute name="defaultargs" value="0x7fca469b7030" id="5712" addr="0x7fca469b7030" />
+                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,long,long,long,long,long)." id="5713" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="5714" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469b7030" id="5715" addr="0x7fca469b7030" />
+                                <parmlist id="5716" addr="0x7fca469b7ab0" >
                                     <parm id="5717">
-                                        <attributelist id="5718" addr="0x7f99f1e69ab0" >
-                                            <attribute name="name" value="x" id="5719" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5720" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5718" addr="0x7fca469b7ab0" >
+                                            <attribute name="name" value="x" id="5719" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5720" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5721">
-                                        <attributelist id="5722" addr="0x7f99f1e69b70" >
-                                            <attribute name="name" value="y" id="5723" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5724" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5722" addr="0x7fca469b7b70" >
+                                            <attribute name="name" value="y" id="5723" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5724" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5725">
-                                        <attributelist id="5726" addr="0x7f99f1e69bf0" >
-                                            <attribute name="name" value="width" id="5727" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5728" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5726" addr="0x7fca469b7bf0" >
+                                            <attribute name="name" value="width" id="5727" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5728" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5729">
-                                        <attributelist id="5730" addr="0x7f99f1e69c70" >
-                                            <attribute name="name" value="height" id="5731" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5732" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5730" addr="0x7fca469b7c70" >
+                                            <attribute name="name" value="height" id="5731" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5732" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5733">
-                                        <attributelist id="5734" addr="0x7f99f1e69cf0" >
-                                            <attribute name="name" value="font" id="5735" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5736" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5737" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5734" addr="0x7fca469b7cf0" >
+                                            <attribute name="name" value="font" id="5735" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5736" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5737" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5738">
-                                        <attributelist id="5739" addr="0x7f99f1e69d90" >
-                                            <attribute name="name" value="textColor" id="5740" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5741" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5742" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5739" addr="0x7fca469b7d90" >
+                                            <attribute name="name" value="textColor" id="5740" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5741" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5742" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5743">
-                                        <attributelist id="5744" addr="0x7f99f1e69e30" >
-                                            <attribute name="name" value="buttonTexture" id="5745" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5746" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5747" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5744" addr="0x7fca469b7e30" >
+                                            <attribute name="name" value="buttonTexture" id="5745" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5746" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5747" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5748">
-                                        <attributelist id="5749" addr="0x7f99f1e69ed0" >
-                                            <attribute name="name" value="buttonFocusTexture" id="5750" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5751" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5752" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5749" addr="0x7fca469b7ed0" >
+                                            <attribute name="name" value="buttonFocusTexture" id="5750" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5751" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5752" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5753">
-                                        <attributelist id="5754" addr="0x7f99f1e69f70" >
-                                            <attribute name="name" value="selectedColor" id="5755" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5756" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5757" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5754" addr="0x7fca469b7f70" >
+                                            <attribute name="name" value="selectedColor" id="5755" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5756" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5757" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5758">
-                                        <attributelist id="5759" addr="0x7f99f1e6a010" >
-                                            <attribute name="name" value="_imageWidth" id="5760" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="5761" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5762" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5759" addr="0x7fca469b8010" >
+                                            <attribute name="name" value="_imageWidth" id="5760" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="5761" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5762" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5763">
-                                        <attributelist id="5764" addr="0x7f99f1e6a0b0" >
-                                            <attribute name="name" value="_imageHeight" id="5765" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="5766" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5767" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5764" addr="0x7fca469b80b0" >
+                                            <attribute name="name" value="_imageHeight" id="5765" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="5766" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5767" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5768">
-                                        <attributelist id="5769" addr="0x7f99f1e6a150" >
-                                            <attribute name="name" value="_itemTextXOffset" id="5770" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="5771" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5772" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5769" addr="0x7fca469b8150" >
+                                            <attribute name="name" value="_itemTextXOffset" id="5770" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="5771" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5772" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5773">
-                                        <attributelist id="5774" addr="0x7f99f1e6a1f0" >
-                                            <attribute name="name" value="_itemTextYOffset" id="5775" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="2" id="5776" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5777" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5774" addr="0x7fca469b81f0" >
+                                            <attribute name="name" value="_itemTextYOffset" id="5775" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="2" id="5776" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5777" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5778">
-                                        <attributelist id="5779" addr="0x7f99f1e6a290" >
-                                            <attribute name="name" value="_itemHeight" id="5780" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="27" id="5781" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5782" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5779" addr="0x7fca469b8290" >
+                                            <attribute name="name" value="_itemHeight" id="5780" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="27" id="5781" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5782" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_2" id="5783" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="5784" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_2" id="5783" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="5784" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="5785" addr="0x7f99f1e6abf0" >
-                            <attributelist id="5786" addr="0x7f99f1e6abf0" >
-                                <attribute name="name" value="ControlList" id="5787" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="5788" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e673f0" id="5789" addr="0x7f99f1e673f0" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e6b3f0" id="5790" addr="0x7f99f1e6b3f0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e6a350" id="5791" addr="0x7f99f1e6a350" />
-                                <attribute name="sym_name" value="ControlList" id="5792" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e6b3f0" id="5793" addr="0x7f99f1e6b3f0" />
-                                <attribute name="defaultargs" value="0x7f99f1e69030" id="5794" addr="0x7f99f1e69030" />
-                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,long,long,long,long)." id="5795" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="5796" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e69030" id="5797" addr="0x7f99f1e69030" />
-                                <parmlist id="5798" addr="0x7f99f1e6a3f0" >
+                        <constructor id="5785" addr="0x7fca469b8bf0" >
+                            <attributelist id="5786" addr="0x7fca469b8bf0" >
+                                <attribute name="name" value="ControlList" id="5787" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="5788" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469b53f0" id="5789" addr="0x7fca469b53f0" />
+                                <attribute name="csym_nextSibling" value="0x7fca469b93f0" id="5790" addr="0x7fca469b93f0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469b8350" id="5791" addr="0x7fca469b8350" />
+                                <attribute name="sym_name" value="ControlList" id="5792" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469b93f0" id="5793" addr="0x7fca469b93f0" />
+                                <attribute name="defaultargs" value="0x7fca469b7030" id="5794" addr="0x7fca469b7030" />
+                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,long,long,long,long)." id="5795" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="5796" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469b7030" id="5797" addr="0x7fca469b7030" />
+                                <parmlist id="5798" addr="0x7fca469b83f0" >
                                     <parm id="5799">
-                                        <attributelist id="5800" addr="0x7f99f1e6a3f0" >
-                                            <attribute name="name" value="x" id="5801" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5802" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5800" addr="0x7fca469b83f0" >
+                                            <attribute name="name" value="x" id="5801" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5802" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5803">
-                                        <attributelist id="5804" addr="0x7f99f1e6a4b0" >
-                                            <attribute name="name" value="y" id="5805" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5806" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5804" addr="0x7fca469b84b0" >
+                                            <attribute name="name" value="y" id="5805" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5806" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5807">
-                                        <attributelist id="5808" addr="0x7f99f1e6a530" >
-                                            <attribute name="name" value="width" id="5809" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5810" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5808" addr="0x7fca469b8530" >
+                                            <attribute name="name" value="width" id="5809" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5810" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5811">
-                                        <attributelist id="5812" addr="0x7f99f1e6a5b0" >
-                                            <attribute name="name" value="height" id="5813" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5814" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5812" addr="0x7fca469b85b0" >
+                                            <attribute name="name" value="height" id="5813" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5814" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5815">
-                                        <attributelist id="5816" addr="0x7f99f1e6a630" >
-                                            <attribute name="name" value="font" id="5817" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5818" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5819" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5816" addr="0x7fca469b8630" >
+                                            <attribute name="name" value="font" id="5817" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5818" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5819" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5820">
-                                        <attributelist id="5821" addr="0x7f99f1e6a6d0" >
-                                            <attribute name="name" value="textColor" id="5822" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5823" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5824" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5821" addr="0x7fca469b86d0" >
+                                            <attribute name="name" value="textColor" id="5822" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5823" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5824" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5825">
-                                        <attributelist id="5826" addr="0x7f99f1e6a770" >
-                                            <attribute name="name" value="buttonTexture" id="5827" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5828" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5829" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5826" addr="0x7fca469b8770" >
+                                            <attribute name="name" value="buttonTexture" id="5827" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5828" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5829" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5830">
-                                        <attributelist id="5831" addr="0x7f99f1e6a810" >
-                                            <attribute name="name" value="buttonFocusTexture" id="5832" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5833" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5834" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5831" addr="0x7fca469b8810" >
+                                            <attribute name="name" value="buttonFocusTexture" id="5832" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5833" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5834" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5835">
-                                        <attributelist id="5836" addr="0x7f99f1e6a8b0" >
-                                            <attribute name="name" value="selectedColor" id="5837" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5838" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5839" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5836" addr="0x7fca469b88b0" >
+                                            <attribute name="name" value="selectedColor" id="5837" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5838" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5839" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5840">
-                                        <attributelist id="5841" addr="0x7f99f1e6a950" >
-                                            <attribute name="name" value="_imageWidth" id="5842" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="5843" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5844" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5841" addr="0x7fca469b8950" >
+                                            <attribute name="name" value="_imageWidth" id="5842" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="5843" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5844" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5845">
-                                        <attributelist id="5846" addr="0x7f99f1e6a9f0" >
-                                            <attribute name="name" value="_imageHeight" id="5847" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="5848" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5849" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5846" addr="0x7fca469b89f0" >
+                                            <attribute name="name" value="_imageHeight" id="5847" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="5848" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5849" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5850">
-                                        <attributelist id="5851" addr="0x7f99f1e6aa90" >
-                                            <attribute name="name" value="_itemTextXOffset" id="5852" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="5853" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5854" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5851" addr="0x7fca469b8a90" >
+                                            <attribute name="name" value="_itemTextXOffset" id="5852" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="5853" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5854" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5855">
-                                        <attributelist id="5856" addr="0x7f99f1e6ab30" >
-                                            <attribute name="name" value="_itemTextYOffset" id="5857" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="2" id="5858" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5859" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5856" addr="0x7fca469b8b30" >
+                                            <attribute name="name" value="_itemTextYOffset" id="5857" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="2" id="5858" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5859" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_3" id="5860" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="5861" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_3" id="5860" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="5861" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="5862" addr="0x7f99f1e6b3f0" >
-                            <attributelist id="5863" addr="0x7f99f1e6b3f0" >
-                                <attribute name="name" value="ControlList" id="5864" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="5865" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e673f0" id="5866" addr="0x7f99f1e673f0" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e6bb50" id="5867" addr="0x7f99f1e6bb50" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e6abf0" id="5868" addr="0x7f99f1e6abf0" />
-                                <attribute name="sym_name" value="ControlList" id="5869" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e6bb50" id="5870" addr="0x7f99f1e6bb50" />
-                                <attribute name="defaultargs" value="0x7f99f1e69030" id="5871" addr="0x7f99f1e69030" />
-                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,long,long,long)." id="5872" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="5873" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e69030" id="5874" addr="0x7f99f1e69030" />
-                                <parmlist id="5875" addr="0x7f99f1e6ac90" >
+                        <constructor id="5862" addr="0x7fca469b93f0" >
+                            <attributelist id="5863" addr="0x7fca469b93f0" >
+                                <attribute name="name" value="ControlList" id="5864" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="5865" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469b53f0" id="5866" addr="0x7fca469b53f0" />
+                                <attribute name="csym_nextSibling" value="0x7fca469b9b50" id="5867" addr="0x7fca469b9b50" />
+                                <attribute name="sym_previousSibling" value="0x7fca469b8bf0" id="5868" addr="0x7fca469b8bf0" />
+                                <attribute name="sym_name" value="ControlList" id="5869" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469b9b50" id="5870" addr="0x7fca469b9b50" />
+                                <attribute name="defaultargs" value="0x7fca469b7030" id="5871" addr="0x7fca469b7030" />
+                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,long,long,long)." id="5872" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="5873" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469b7030" id="5874" addr="0x7fca469b7030" />
+                                <parmlist id="5875" addr="0x7fca469b8c90" >
                                     <parm id="5876">
-                                        <attributelist id="5877" addr="0x7f99f1e6ac90" >
-                                            <attribute name="name" value="x" id="5878" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5879" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5877" addr="0x7fca469b8c90" >
+                                            <attribute name="name" value="x" id="5878" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5879" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5880">
-                                        <attributelist id="5881" addr="0x7f99f1e6ad50" >
-                                            <attribute name="name" value="y" id="5882" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5883" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5881" addr="0x7fca469b8d50" >
+                                            <attribute name="name" value="y" id="5882" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5883" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5884">
-                                        <attributelist id="5885" addr="0x7f99f1e6add0" >
-                                            <attribute name="name" value="width" id="5886" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5887" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5885" addr="0x7fca469b8dd0" >
+                                            <attribute name="name" value="width" id="5886" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5887" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5888">
-                                        <attributelist id="5889" addr="0x7f99f1e6ae50" >
-                                            <attribute name="name" value="height" id="5890" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5891" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5889" addr="0x7fca469b8e50" >
+                                            <attribute name="name" value="height" id="5890" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5891" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5892">
-                                        <attributelist id="5893" addr="0x7f99f1e6aed0" >
-                                            <attribute name="name" value="font" id="5894" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5895" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5896" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5893" addr="0x7fca469b8ed0" >
+                                            <attribute name="name" value="font" id="5894" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5895" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5896" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5897">
-                                        <attributelist id="5898" addr="0x7f99f1e6af70" >
-                                            <attribute name="name" value="textColor" id="5899" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5900" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5901" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5898" addr="0x7fca469b8f70" >
+                                            <attribute name="name" value="textColor" id="5899" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5900" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5901" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5902">
-                                        <attributelist id="5903" addr="0x7f99f1e6b010" >
-                                            <attribute name="name" value="buttonTexture" id="5904" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5905" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5906" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5903" addr="0x7fca469b9010" >
+                                            <attribute name="name" value="buttonTexture" id="5904" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5905" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5906" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5907">
-                                        <attributelist id="5908" addr="0x7f99f1e6b0b0" >
-                                            <attribute name="name" value="buttonFocusTexture" id="5909" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5910" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5911" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5908" addr="0x7fca469b90b0" >
+                                            <attribute name="name" value="buttonFocusTexture" id="5909" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5910" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5911" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5912">
-                                        <attributelist id="5913" addr="0x7f99f1e6b150" >
-                                            <attribute name="name" value="selectedColor" id="5914" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5915" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5916" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5913" addr="0x7fca469b9150" >
+                                            <attribute name="name" value="selectedColor" id="5914" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5915" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5916" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5917">
-                                        <attributelist id="5918" addr="0x7f99f1e6b1f0" >
-                                            <attribute name="name" value="_imageWidth" id="5919" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="5920" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5921" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5918" addr="0x7fca469b91f0" >
+                                            <attribute name="name" value="_imageWidth" id="5919" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="5920" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5921" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5922">
-                                        <attributelist id="5923" addr="0x7f99f1e6b290" >
-                                            <attribute name="name" value="_imageHeight" id="5924" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="5925" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5926" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5923" addr="0x7fca469b9290" >
+                                            <attribute name="name" value="_imageHeight" id="5924" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="5925" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5926" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5927">
-                                        <attributelist id="5928" addr="0x7f99f1e6b330" >
-                                            <attribute name="name" value="_itemTextXOffset" id="5929" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="5930" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5931" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5928" addr="0x7fca469b9330" >
+                                            <attribute name="name" value="_itemTextXOffset" id="5929" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="5930" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5931" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_4" id="5932" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="5933" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_4" id="5932" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="5933" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="5934" addr="0x7f99f1e6bb50" >
-                            <attributelist id="5935" addr="0x7f99f1e6bb50" >
-                                <attribute name="name" value="ControlList" id="5936" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="5937" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e673f0" id="5938" addr="0x7f99f1e673f0" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e6c210" id="5939" addr="0x7f99f1e6c210" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e6b3f0" id="5940" addr="0x7f99f1e6b3f0" />
-                                <attribute name="sym_name" value="ControlList" id="5941" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e6c210" id="5942" addr="0x7f99f1e6c210" />
-                                <attribute name="defaultargs" value="0x7f99f1e69030" id="5943" addr="0x7f99f1e69030" />
-                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,long,long)." id="5944" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="5945" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e69030" id="5946" addr="0x7f99f1e69030" />
-                                <parmlist id="5947" addr="0x7f99f1e6b490" >
+                        <constructor id="5934" addr="0x7fca469b9b50" >
+                            <attributelist id="5935" addr="0x7fca469b9b50" >
+                                <attribute name="name" value="ControlList" id="5936" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="5937" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469b53f0" id="5938" addr="0x7fca469b53f0" />
+                                <attribute name="csym_nextSibling" value="0x7fca469ba210" id="5939" addr="0x7fca469ba210" />
+                                <attribute name="sym_previousSibling" value="0x7fca469b93f0" id="5940" addr="0x7fca469b93f0" />
+                                <attribute name="sym_name" value="ControlList" id="5941" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469ba210" id="5942" addr="0x7fca469ba210" />
+                                <attribute name="defaultargs" value="0x7fca469b7030" id="5943" addr="0x7fca469b7030" />
+                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,long,long)." id="5944" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="5945" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469b7030" id="5946" addr="0x7fca469b7030" />
+                                <parmlist id="5947" addr="0x7fca469b9490" >
                                     <parm id="5948">
-                                        <attributelist id="5949" addr="0x7f99f1e6b490" >
-                                            <attribute name="name" value="x" id="5950" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5951" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5949" addr="0x7fca469b9490" >
+                                            <attribute name="name" value="x" id="5950" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5951" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5952">
-                                        <attributelist id="5953" addr="0x7f99f1e6b550" >
-                                            <attribute name="name" value="y" id="5954" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5955" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5953" addr="0x7fca469b9550" >
+                                            <attribute name="name" value="y" id="5954" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5955" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5956">
-                                        <attributelist id="5957" addr="0x7f99f1e6b5d0" >
-                                            <attribute name="name" value="width" id="5958" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5959" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5957" addr="0x7fca469b95d0" >
+                                            <attribute name="name" value="width" id="5958" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5959" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5960">
-                                        <attributelist id="5961" addr="0x7f99f1e6b650" >
-                                            <attribute name="name" value="height" id="5962" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5963" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5961" addr="0x7fca469b9650" >
+                                            <attribute name="name" value="height" id="5962" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5963" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5964">
-                                        <attributelist id="5965" addr="0x7f99f1e6b6d0" >
-                                            <attribute name="name" value="font" id="5966" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5967" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5968" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5965" addr="0x7fca469b96d0" >
+                                            <attribute name="name" value="font" id="5966" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5967" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5968" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5969">
-                                        <attributelist id="5970" addr="0x7f99f1e6b770" >
-                                            <attribute name="name" value="textColor" id="5971" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5972" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5973" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5970" addr="0x7fca469b9770" >
+                                            <attribute name="name" value="textColor" id="5971" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5972" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5973" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5974">
-                                        <attributelist id="5975" addr="0x7f99f1e6b810" >
-                                            <attribute name="name" value="buttonTexture" id="5976" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5977" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5978" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5975" addr="0x7fca469b9810" >
+                                            <attribute name="name" value="buttonTexture" id="5976" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5977" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5978" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5979">
-                                        <attributelist id="5980" addr="0x7f99f1e6b8b0" >
-                                            <attribute name="name" value="buttonFocusTexture" id="5981" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5982" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5983" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5980" addr="0x7fca469b98b0" >
+                                            <attribute name="name" value="buttonFocusTexture" id="5981" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5982" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5983" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5984">
-                                        <attributelist id="5985" addr="0x7f99f1e6b950" >
-                                            <attribute name="name" value="selectedColor" id="5986" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5987" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5988" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5985" addr="0x7fca469b9950" >
+                                            <attribute name="name" value="selectedColor" id="5986" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5987" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5988" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5989">
-                                        <attributelist id="5990" addr="0x7f99f1e6b9f0" >
-                                            <attribute name="name" value="_imageWidth" id="5991" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="5992" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5993" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5990" addr="0x7fca469b99f0" >
+                                            <attribute name="name" value="_imageWidth" id="5991" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="5992" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5993" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5994">
-                                        <attributelist id="5995" addr="0x7f99f1e6ba90" >
-                                            <attribute name="name" value="_imageHeight" id="5996" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="5997" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5998" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5995" addr="0x7fca469b9a90" >
+                                            <attribute name="name" value="_imageHeight" id="5996" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="5997" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5998" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_5" id="5999" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="6000" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_5" id="5999" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="6000" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="6001" addr="0x7f99f1e6c210" >
-                            <attributelist id="6002" addr="0x7f99f1e6c210" >
-                                <attribute name="name" value="ControlList" id="6003" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="6004" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e673f0" id="6005" addr="0x7f99f1e673f0" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e6c830" id="6006" addr="0x7f99f1e6c830" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e6bb50" id="6007" addr="0x7f99f1e6bb50" />
-                                <attribute name="sym_name" value="ControlList" id="6008" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e6c830" id="6009" addr="0x7f99f1e6c830" />
-                                <attribute name="defaultargs" value="0x7f99f1e69030" id="6010" addr="0x7f99f1e69030" />
-                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,long)." id="6011" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="6012" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e69030" id="6013" addr="0x7f99f1e69030" />
-                                <parmlist id="6014" addr="0x7f99f1e6bbf0" >
+                        <constructor id="6001" addr="0x7fca469ba210" >
+                            <attributelist id="6002" addr="0x7fca469ba210" >
+                                <attribute name="name" value="ControlList" id="6003" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="6004" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469b53f0" id="6005" addr="0x7fca469b53f0" />
+                                <attribute name="csym_nextSibling" value="0x7fca469ba830" id="6006" addr="0x7fca469ba830" />
+                                <attribute name="sym_previousSibling" value="0x7fca469b9b50" id="6007" addr="0x7fca469b9b50" />
+                                <attribute name="sym_name" value="ControlList" id="6008" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469ba830" id="6009" addr="0x7fca469ba830" />
+                                <attribute name="defaultargs" value="0x7fca469b7030" id="6010" addr="0x7fca469b7030" />
+                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,long)." id="6011" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="6012" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469b7030" id="6013" addr="0x7fca469b7030" />
+                                <parmlist id="6014" addr="0x7fca469b9bf0" >
                                     <parm id="6015">
-                                        <attributelist id="6016" addr="0x7f99f1e6bbf0" >
-                                            <attribute name="name" value="x" id="6017" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6018" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6016" addr="0x7fca469b9bf0" >
+                                            <attribute name="name" value="x" id="6017" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6018" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6019">
-                                        <attributelist id="6020" addr="0x7f99f1e6bcb0" >
-                                            <attribute name="name" value="y" id="6021" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6022" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6020" addr="0x7fca469b9cb0" >
+                                            <attribute name="name" value="y" id="6021" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6022" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6023">
-                                        <attributelist id="6024" addr="0x7f99f1e6bd30" >
-                                            <attribute name="name" value="width" id="6025" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6026" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6024" addr="0x7fca469b9d30" >
+                                            <attribute name="name" value="width" id="6025" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6026" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6027">
-                                        <attributelist id="6028" addr="0x7f99f1e6bdb0" >
-                                            <attribute name="name" value="height" id="6029" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6030" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6028" addr="0x7fca469b9db0" >
+                                            <attribute name="name" value="height" id="6029" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6030" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6031">
-                                        <attributelist id="6032" addr="0x7f99f1e6be30" >
-                                            <attribute name="name" value="font" id="6033" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="6034" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="6035" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6032" addr="0x7fca469b9e30" >
+                                            <attribute name="name" value="font" id="6033" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="6034" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="6035" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6036">
-                                        <attributelist id="6037" addr="0x7f99f1e6bed0" >
-                                            <attribute name="name" value="textColor" id="6038" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="6039" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="6040" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6037" addr="0x7fca469b9ed0" >
+                                            <attribute name="name" value="textColor" id="6038" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="6039" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="6040" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6041">
-                                        <attributelist id="6042" addr="0x7f99f1e6bf70" >
-                                            <attribute name="name" value="buttonTexture" id="6043" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="6044" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="6045" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6042" addr="0x7fca469b9f70" >
+                                            <attribute name="name" value="buttonTexture" id="6043" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="6044" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="6045" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6046">
-                                        <attributelist id="6047" addr="0x7f99f1e6c010" >
-                                            <attribute name="name" value="buttonFocusTexture" id="6048" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="6049" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="6050" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6047" addr="0x7fca469ba010" >
+                                            <attribute name="name" value="buttonFocusTexture" id="6048" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="6049" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="6050" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6051">
-                                        <attributelist id="6052" addr="0x7f99f1e6c0b0" >
-                                            <attribute name="name" value="selectedColor" id="6053" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="6054" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="6055" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6052" addr="0x7fca469ba0b0" >
+                                            <attribute name="name" value="selectedColor" id="6053" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="6054" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="6055" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6056">
-                                        <attributelist id="6057" addr="0x7f99f1e6c150" >
-                                            <attribute name="name" value="_imageWidth" id="6058" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="6059" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6060" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6057" addr="0x7fca469ba150" >
+                                            <attribute name="name" value="_imageWidth" id="6058" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="6059" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6060" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_6" id="6061" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="6062" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_6" id="6061" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="6062" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="6063" addr="0x7f99f1e6c830" >
-                            <attributelist id="6064" addr="0x7f99f1e6c830" >
-                                <attribute name="name" value="ControlList" id="6065" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="6066" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e673f0" id="6067" addr="0x7f99f1e673f0" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e6cdb0" id="6068" addr="0x7f99f1e6cdb0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e6c210" id="6069" addr="0x7f99f1e6c210" />
-                                <attribute name="sym_name" value="ControlList" id="6070" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e6cdb0" id="6071" addr="0x7f99f1e6cdb0" />
-                                <attribute name="defaultargs" value="0x7f99f1e69030" id="6072" addr="0x7f99f1e69030" />
-                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char)." id="6073" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="6074" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e69030" id="6075" addr="0x7f99f1e69030" />
-                                <parmlist id="6076" addr="0x7f99f1e6c2b0" >
+                        <constructor id="6063" addr="0x7fca469ba830" >
+                            <attributelist id="6064" addr="0x7fca469ba830" >
+                                <attribute name="name" value="ControlList" id="6065" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="6066" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469b53f0" id="6067" addr="0x7fca469b53f0" />
+                                <attribute name="csym_nextSibling" value="0x7fca469badb0" id="6068" addr="0x7fca469badb0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469ba210" id="6069" addr="0x7fca469ba210" />
+                                <attribute name="sym_name" value="ControlList" id="6070" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469badb0" id="6071" addr="0x7fca469badb0" />
+                                <attribute name="defaultargs" value="0x7fca469b7030" id="6072" addr="0x7fca469b7030" />
+                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char)." id="6073" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="6074" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469b7030" id="6075" addr="0x7fca469b7030" />
+                                <parmlist id="6076" addr="0x7fca469ba2b0" >
                                     <parm id="6077">
-                                        <attributelist id="6078" addr="0x7f99f1e6c2b0" >
-                                            <attribute name="name" value="x" id="6079" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6080" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6078" addr="0x7fca469ba2b0" >
+                                            <attribute name="name" value="x" id="6079" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6080" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6081">
-                                        <attributelist id="6082" addr="0x7f99f1e6c370" >
-                                            <attribute name="name" value="y" id="6083" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6084" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6082" addr="0x7fca469ba370" >
+                                            <attribute name="name" value="y" id="6083" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6084" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6085">
-                                        <attributelist id="6086" addr="0x7f99f1e6c3f0" >
-                                            <attribute name="name" value="width" id="6087" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6088" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6086" addr="0x7fca469ba3f0" >
+                                            <attribute name="name" value="width" id="6087" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6088" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6089">
-                                        <attributelist id="6090" addr="0x7f99f1e6c470" >
-                                            <attribute name="name" value="height" id="6091" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6092" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6090" addr="0x7fca469ba470" >
+                                            <attribute name="name" value="height" id="6091" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6092" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6093">
-                                        <attributelist id="6094" addr="0x7f99f1e6c4f0" >
-                                            <attribute name="name" value="font" id="6095" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="6096" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="6097" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6094" addr="0x7fca469ba4f0" >
+                                            <attribute name="name" value="font" id="6095" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="6096" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="6097" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6098">
-                                        <attributelist id="6099" addr="0x7f99f1e6c590" >
-                                            <attribute name="name" value="textColor" id="6100" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="6101" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="6102" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6099" addr="0x7fca469ba590" >
+                                            <attribute name="name" value="textColor" id="6100" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="6101" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="6102" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6103">
-                                        <attributelist id="6104" addr="0x7f99f1e6c630" >
-                                            <attribute name="name" value="buttonTexture" id="6105" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="6106" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="6107" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6104" addr="0x7fca469ba630" >
+                                            <attribute name="name" value="buttonTexture" id="6105" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="6106" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="6107" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6108">
-                                        <attributelist id="6109" addr="0x7f99f1e6c6d0" >
-                                            <attribute name="name" value="buttonFocusTexture" id="6110" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="6111" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="6112" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6109" addr="0x7fca469ba6d0" >
+                                            <attribute name="name" value="buttonFocusTexture" id="6110" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="6111" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="6112" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6113">
-                                        <attributelist id="6114" addr="0x7f99f1e6c770" >
-                                            <attribute name="name" value="selectedColor" id="6115" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="6116" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="6117" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6114" addr="0x7fca469ba770" >
+                                            <attribute name="name" value="selectedColor" id="6115" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="6116" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="6117" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_7" id="6118" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="6119" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_7" id="6118" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="6119" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="6120" addr="0x7f99f1e6cdb0" >
-                            <attributelist id="6121" addr="0x7f99f1e6cdb0" >
-                                <attribute name="name" value="ControlList" id="6122" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="6123" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e673f0" id="6124" addr="0x7f99f1e673f0" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e6d290" id="6125" addr="0x7f99f1e6d290" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e6c830" id="6126" addr="0x7f99f1e6c830" />
-                                <attribute name="sym_name" value="ControlList" id="6127" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e6d290" id="6128" addr="0x7f99f1e6d290" />
-                                <attribute name="defaultargs" value="0x7f99f1e69030" id="6129" addr="0x7f99f1e69030" />
-                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char)." id="6130" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="6131" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e69030" id="6132" addr="0x7f99f1e69030" />
-                                <parmlist id="6133" addr="0x7f99f1e6c8d0" >
+                        <constructor id="6120" addr="0x7fca469badb0" >
+                            <attributelist id="6121" addr="0x7fca469badb0" >
+                                <attribute name="name" value="ControlList" id="6122" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="6123" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469b53f0" id="6124" addr="0x7fca469b53f0" />
+                                <attribute name="csym_nextSibling" value="0x7fca469bb290" id="6125" addr="0x7fca469bb290" />
+                                <attribute name="sym_previousSibling" value="0x7fca469ba830" id="6126" addr="0x7fca469ba830" />
+                                <attribute name="sym_name" value="ControlList" id="6127" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469bb290" id="6128" addr="0x7fca469bb290" />
+                                <attribute name="defaultargs" value="0x7fca469b7030" id="6129" addr="0x7fca469b7030" />
+                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char)." id="6130" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="6131" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469b7030" id="6132" addr="0x7fca469b7030" />
+                                <parmlist id="6133" addr="0x7fca469ba8d0" >
                                     <parm id="6134">
-                                        <attributelist id="6135" addr="0x7f99f1e6c8d0" >
-                                            <attribute name="name" value="x" id="6136" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6137" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6135" addr="0x7fca469ba8d0" >
+                                            <attribute name="name" value="x" id="6136" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6137" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6138">
-                                        <attributelist id="6139" addr="0x7f99f1e6c990" >
-                                            <attribute name="name" value="y" id="6140" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6141" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6139" addr="0x7fca469ba990" >
+                                            <attribute name="name" value="y" id="6140" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6141" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6142">
-                                        <attributelist id="6143" addr="0x7f99f1e6ca10" >
-                                            <attribute name="name" value="width" id="6144" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6145" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6143" addr="0x7fca469baa10" >
+                                            <attribute name="name" value="width" id="6144" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6145" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6146">
-                                        <attributelist id="6147" addr="0x7f99f1e6ca90" >
-                                            <attribute name="name" value="height" id="6148" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6149" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6147" addr="0x7fca469baa90" >
+                                            <attribute name="name" value="height" id="6148" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6149" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6150">
-                                        <attributelist id="6151" addr="0x7f99f1e6cb10" >
-                                            <attribute name="name" value="font" id="6152" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="6153" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="6154" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6151" addr="0x7fca469bab10" >
+                                            <attribute name="name" value="font" id="6152" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="6153" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="6154" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6155">
-                                        <attributelist id="6156" addr="0x7f99f1e6cbb0" >
-                                            <attribute name="name" value="textColor" id="6157" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="6158" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="6159" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6156" addr="0x7fca469babb0" >
+                                            <attribute name="name" value="textColor" id="6157" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="6158" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="6159" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6160">
-                                        <attributelist id="6161" addr="0x7f99f1e6cc50" >
-                                            <attribute name="name" value="buttonTexture" id="6162" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="6163" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="6164" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6161" addr="0x7fca469bac50" >
+                                            <attribute name="name" value="buttonTexture" id="6162" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="6163" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="6164" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6165">
-                                        <attributelist id="6166" addr="0x7f99f1e6ccf0" >
-                                            <attribute name="name" value="buttonFocusTexture" id="6167" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="6168" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="6169" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6166" addr="0x7fca469bacf0" >
+                                            <attribute name="name" value="buttonFocusTexture" id="6167" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="6168" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="6169" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_8" id="6170" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="6171" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_8" id="6170" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="6171" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="6172" addr="0x7f99f1e6d290" >
-                            <attributelist id="6173" addr="0x7f99f1e6d290" >
-                                <attribute name="name" value="ControlList" id="6174" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="6175" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e673f0" id="6176" addr="0x7f99f1e673f0" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e6d6d0" id="6177" addr="0x7f99f1e6d6d0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e6cdb0" id="6178" addr="0x7f99f1e6cdb0" />
-                                <attribute name="sym_name" value="ControlList" id="6179" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e6d6d0" id="6180" addr="0x7f99f1e6d6d0" />
-                                <attribute name="defaultargs" value="0x7f99f1e69030" id="6181" addr="0x7f99f1e69030" />
-                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char)." id="6182" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="6183" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e69030" id="6184" addr="0x7f99f1e69030" />
-                                <parmlist id="6185" addr="0x7f99f1e6ce50" >
+                        <constructor id="6172" addr="0x7fca469bb290" >
+                            <attributelist id="6173" addr="0x7fca469bb290" >
+                                <attribute name="name" value="ControlList" id="6174" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="6175" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469b53f0" id="6176" addr="0x7fca469b53f0" />
+                                <attribute name="csym_nextSibling" value="0x7fca469bb6d0" id="6177" addr="0x7fca469bb6d0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469badb0" id="6178" addr="0x7fca469badb0" />
+                                <attribute name="sym_name" value="ControlList" id="6179" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469bb6d0" id="6180" addr="0x7fca469bb6d0" />
+                                <attribute name="defaultargs" value="0x7fca469b7030" id="6181" addr="0x7fca469b7030" />
+                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char)." id="6182" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="6183" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469b7030" id="6184" addr="0x7fca469b7030" />
+                                <parmlist id="6185" addr="0x7fca469bae50" >
                                     <parm id="6186">
-                                        <attributelist id="6187" addr="0x7f99f1e6ce50" >
-                                            <attribute name="name" value="x" id="6188" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6189" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6187" addr="0x7fca469bae50" >
+                                            <attribute name="name" value="x" id="6188" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6189" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6190">
-                                        <attributelist id="6191" addr="0x7f99f1e6cf10" >
-                                            <attribute name="name" value="y" id="6192" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6193" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6191" addr="0x7fca469baf10" >
+                                            <attribute name="name" value="y" id="6192" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6193" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6194">
-                                        <attributelist id="6195" addr="0x7f99f1e6cf90" >
-                                            <attribute name="name" value="width" id="6196" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6197" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6195" addr="0x7fca469baf90" >
+                                            <attribute name="name" value="width" id="6196" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6197" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6198">
-                                        <attributelist id="6199" addr="0x7f99f1e6d010" >
-                                            <attribute name="name" value="height" id="6200" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6201" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6199" addr="0x7fca469bb010" >
+                                            <attribute name="name" value="height" id="6200" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6201" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6202">
-                                        <attributelist id="6203" addr="0x7f99f1e6d090" >
-                                            <attribute name="name" value="font" id="6204" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="6205" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="6206" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6203" addr="0x7fca469bb090" >
+                                            <attribute name="name" value="font" id="6204" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="6205" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="6206" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6207">
-                                        <attributelist id="6208" addr="0x7f99f1e6d130" >
-                                            <attribute name="name" value="textColor" id="6209" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="6210" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="6211" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6208" addr="0x7fca469bb130" >
+                                            <attribute name="name" value="textColor" id="6209" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="6210" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="6211" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6212">
-                                        <attributelist id="6213" addr="0x7f99f1e6d1d0" >
-                                            <attribute name="name" value="buttonTexture" id="6214" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="6215" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="6216" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6213" addr="0x7fca469bb1d0" >
+                                            <attribute name="name" value="buttonTexture" id="6214" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="6215" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="6216" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_9" id="6217" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="6218" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_9" id="6217" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="6218" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="6219" addr="0x7f99f1e6d6d0" >
-                            <attributelist id="6220" addr="0x7f99f1e6d6d0" >
-                                <attribute name="name" value="ControlList" id="6221" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="6222" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e673f0" id="6223" addr="0x7f99f1e673f0" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e6da70" id="6224" addr="0x7f99f1e6da70" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e6d290" id="6225" addr="0x7f99f1e6d290" />
-                                <attribute name="sym_name" value="ControlList" id="6226" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e6da70" id="6227" addr="0x7f99f1e6da70" />
-                                <attribute name="defaultargs" value="0x7f99f1e69030" id="6228" addr="0x7f99f1e69030" />
-                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char)." id="6229" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="6230" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e69030" id="6231" addr="0x7f99f1e69030" />
-                                <parmlist id="6232" addr="0x7f99f1e6d330" >
+                        <constructor id="6219" addr="0x7fca469bb6d0" >
+                            <attributelist id="6220" addr="0x7fca469bb6d0" >
+                                <attribute name="name" value="ControlList" id="6221" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="6222" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469b53f0" id="6223" addr="0x7fca469b53f0" />
+                                <attribute name="csym_nextSibling" value="0x7fca469bba70" id="6224" addr="0x7fca469bba70" />
+                                <attribute name="sym_previousSibling" value="0x7fca469bb290" id="6225" addr="0x7fca469bb290" />
+                                <attribute name="sym_name" value="ControlList" id="6226" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469bba70" id="6227" addr="0x7fca469bba70" />
+                                <attribute name="defaultargs" value="0x7fca469b7030" id="6228" addr="0x7fca469b7030" />
+                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char)." id="6229" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="6230" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469b7030" id="6231" addr="0x7fca469b7030" />
+                                <parmlist id="6232" addr="0x7fca469bb330" >
                                     <parm id="6233">
-                                        <attributelist id="6234" addr="0x7f99f1e6d330" >
-                                            <attribute name="name" value="x" id="6235" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6236" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6234" addr="0x7fca469bb330" >
+                                            <attribute name="name" value="x" id="6235" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6236" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6237">
-                                        <attributelist id="6238" addr="0x7f99f1e6d3f0" >
-                                            <attribute name="name" value="y" id="6239" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6240" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6238" addr="0x7fca469bb3f0" >
+                                            <attribute name="name" value="y" id="6239" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6240" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6241">
-                                        <attributelist id="6242" addr="0x7f99f1e6d470" >
-                                            <attribute name="name" value="width" id="6243" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6244" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6242" addr="0x7fca469bb470" >
+                                            <attribute name="name" value="width" id="6243" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6244" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6245">
-                                        <attributelist id="6246" addr="0x7f99f1e6d4f0" >
-                                            <attribute name="name" value="height" id="6247" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6248" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6246" addr="0x7fca469bb4f0" >
+                                            <attribute name="name" value="height" id="6247" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6248" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6249">
-                                        <attributelist id="6250" addr="0x7f99f1e6d570" >
-                                            <attribute name="name" value="font" id="6251" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="6252" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="6253" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6250" addr="0x7fca469bb570" >
+                                            <attribute name="name" value="font" id="6251" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="6252" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="6253" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6254">
-                                        <attributelist id="6255" addr="0x7f99f1e6d610" >
-                                            <attribute name="name" value="textColor" id="6256" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="6257" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="6258" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6255" addr="0x7fca469bb610" >
+                                            <attribute name="name" value="textColor" id="6256" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="6257" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="6258" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_10" id="6259" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="6260" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_10" id="6259" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="6260" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="6261" addr="0x7f99f1e6da70" >
-                            <attributelist id="6262" addr="0x7f99f1e6da70" >
-                                <attribute name="name" value="ControlList" id="6263" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="6264" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e673f0" id="6265" addr="0x7f99f1e673f0" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e6dd70" id="6266" addr="0x7f99f1e6dd70" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e6d6d0" id="6267" addr="0x7f99f1e6d6d0" />
-                                <attribute name="sym_name" value="ControlList" id="6268" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e6dd70" id="6269" addr="0x7f99f1e6dd70" />
-                                <attribute name="defaultargs" value="0x7f99f1e69030" id="6270" addr="0x7f99f1e69030" />
-                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char)." id="6271" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="6272" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e69030" id="6273" addr="0x7f99f1e69030" />
-                                <parmlist id="6274" addr="0x7f99f1e6d770" >
+                        <constructor id="6261" addr="0x7fca469bba70" >
+                            <attributelist id="6262" addr="0x7fca469bba70" >
+                                <attribute name="name" value="ControlList" id="6263" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="6264" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469b53f0" id="6265" addr="0x7fca469b53f0" />
+                                <attribute name="csym_nextSibling" value="0x7fca469bbd70" id="6266" addr="0x7fca469bbd70" />
+                                <attribute name="sym_previousSibling" value="0x7fca469bb6d0" id="6267" addr="0x7fca469bb6d0" />
+                                <attribute name="sym_name" value="ControlList" id="6268" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469bbd70" id="6269" addr="0x7fca469bbd70" />
+                                <attribute name="defaultargs" value="0x7fca469b7030" id="6270" addr="0x7fca469b7030" />
+                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char)." id="6271" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="6272" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469b7030" id="6273" addr="0x7fca469b7030" />
+                                <parmlist id="6274" addr="0x7fca469bb770" >
                                     <parm id="6275">
-                                        <attributelist id="6276" addr="0x7f99f1e6d770" >
-                                            <attribute name="name" value="x" id="6277" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6278" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6276" addr="0x7fca469bb770" >
+                                            <attribute name="name" value="x" id="6277" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6278" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6279">
-                                        <attributelist id="6280" addr="0x7f99f1e6d830" >
-                                            <attribute name="name" value="y" id="6281" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6282" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6280" addr="0x7fca469bb830" >
+                                            <attribute name="name" value="y" id="6281" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6282" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6283">
-                                        <attributelist id="6284" addr="0x7f99f1e6d8b0" >
-                                            <attribute name="name" value="width" id="6285" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6286" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6284" addr="0x7fca469bb8b0" >
+                                            <attribute name="name" value="width" id="6285" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6286" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6287">
-                                        <attributelist id="6288" addr="0x7f99f1e6d930" >
-                                            <attribute name="name" value="height" id="6289" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6290" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6288" addr="0x7fca469bb930" >
+                                            <attribute name="name" value="height" id="6289" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6290" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6291">
-                                        <attributelist id="6292" addr="0x7f99f1e6d9b0" >
-                                            <attribute name="name" value="font" id="6293" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="6294" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="6295" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6292" addr="0x7fca469bb9b0" >
+                                            <attribute name="name" value="font" id="6293" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="6294" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="6295" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_11" id="6296" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="6297" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_11" id="6296" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="6297" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="6298" addr="0x7f99f1e6dd70" >
-                            <attributelist id="6299" addr="0x7f99f1e6dd70" >
-                                <attribute name="name" value="ControlList" id="6300" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="6301" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e673f0" id="6302" addr="0x7f99f1e673f0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e6da70" id="6303" addr="0x7f99f1e6da70" />
-                                <attribute name="sym_name" value="ControlList" id="6304" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e69030" id="6305" addr="0x7f99f1e69030" />
-                                <attribute name="decl" value="f(long,long,long,long)." id="6306" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="6307" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e69030" id="6308" addr="0x7f99f1e69030" />
-                                <parmlist id="6309" addr="0x7f99f1e6db10" >
+                        <constructor id="6298" addr="0x7fca469bbd70" >
+                            <attributelist id="6299" addr="0x7fca469bbd70" >
+                                <attribute name="name" value="ControlList" id="6300" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="6301" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469b53f0" id="6302" addr="0x7fca469b53f0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469bba70" id="6303" addr="0x7fca469bba70" />
+                                <attribute name="sym_name" value="ControlList" id="6304" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469b7030" id="6305" addr="0x7fca469b7030" />
+                                <attribute name="decl" value="f(long,long,long,long)." id="6306" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="6307" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469b7030" id="6308" addr="0x7fca469b7030" />
+                                <parmlist id="6309" addr="0x7fca469bbb10" >
                                     <parm id="6310">
-                                        <attributelist id="6311" addr="0x7f99f1e6db10" >
-                                            <attribute name="name" value="x" id="6312" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6313" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6311" addr="0x7fca469bbb10" >
+                                            <attribute name="name" value="x" id="6312" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6313" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6314">
-                                        <attributelist id="6315" addr="0x7f99f1e6dbd0" >
-                                            <attribute name="name" value="y" id="6316" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6317" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6315" addr="0x7fca469bbbd0" >
+                                            <attribute name="name" value="y" id="6316" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6317" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6318">
-                                        <attributelist id="6319" addr="0x7f99f1e6dc50" >
-                                            <attribute name="name" value="width" id="6320" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6321" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6319" addr="0x7fca469bbc50" >
+                                            <attribute name="name" value="width" id="6320" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6321" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6322">
-                                        <attributelist id="6323" addr="0x7f99f1e6dcd0" >
-                                            <attribute name="name" value="height" id="6324" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6325" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6323" addr="0x7fca469bbcd0" >
+                                            <attribute name="name" value="height" id="6324" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6325" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_12" id="6326" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="6327" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_12" id="6326" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="6327" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <destructor id="6328" addr="0x7f99f1e6ded0" >
-                            <attributelist id="6329" addr="0x7f99f1e6ded0" >
-                                <attribute name="ismember" value="1" id="6330" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="~ControlList" id="6331" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="~ControlList" id="6332" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="6333" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="6334" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e673f0" id="6335" addr="0x7f99f1e673f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="6336" addr="0x7f99f1de6c90" />
+                        <destructor id="6328" addr="0x7fca469bbed0" >
+                            <attributelist id="6329" addr="0x7fca469bbed0" >
+                                <attribute name="ismember" value="1" id="6330" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="~ControlList" id="6331" addr="0x7fca46934c90" />
+                                <attribute name="name" value="~ControlList" id="6332" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="6333" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="6334" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469b53f0" id="6335" addr="0x7fca469b53f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="6336" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </destructor >
-                        <cdecl id="6337" addr="0x7f99f1e6e4d0" >
-                            <attributelist id="6338" addr="0x7f99f1e6e4d0" >
-                                <attribute name="name" value="addItem" id="6339" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="6340" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e673f0" id="6341" addr="0x7f99f1e673f0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e6e690" id="6342" addr="0x7f99f1e6e690" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e6e690" id="6343" addr="0x7f99f1e6e690" />
-                                <attribute name="kind" value="function" id="6344" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="addItem" id="6345" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>,bool)." id="6346" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="6347" addr="0x7f99f1de6c90" />
-                                <parmlist id="6348" addr="0x7f99f1e6e2d0" >
+                        <cdecl id="6337" addr="0x7fca469bc4d0" >
+                            <attributelist id="6338" addr="0x7fca469bc4d0" >
+                                <attribute name="name" value="addItem" id="6339" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="6340" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469b53f0" id="6341" addr="0x7fca469b53f0" />
+                                <attribute name="sym_nextSibling" value="0x7fca469bc690" id="6342" addr="0x7fca469bc690" />
+                                <attribute name="csym_nextSibling" value="0x7fca469bc690" id="6343" addr="0x7fca469bc690" />
+                                <attribute name="kind" value="function" id="6344" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="addItem" id="6345" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>,bool)." id="6346" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="6347" addr="0x7fca46934c90" />
+                                <parmlist id="6348" addr="0x7fca469bc2d0" >
                                     <parm id="6349">
-                                        <attributelist id="6350" addr="0x7f99f1e6e2d0" >
-                                            <attribute name="name" value="item" id="6351" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>" id="6352" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6350" addr="0x7fca469bc2d0" >
+                                            <attribute name="name" value="item" id="6351" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>" id="6352" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6353">
-                                        <attributelist id="6354" addr="0x7f99f1e6e410" >
-                                            <attribute name="name" value="sendMessage" id="6355" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="true" id="6356" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="6357" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6354" addr="0x7fca469bc410" >
+                                            <attribute name="name" value="sendMessage" id="6355" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="true" id="6356" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="6357" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overloaded" value="0x7f99f1e6e4d0" id="6358" addr="0x7f99f1e6e4d0" />
-                                <attribute name="type" value="void" id="6359" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="6360" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="6361" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469bc4d0" id="6358" addr="0x7fca469bc4d0" />
+                                <attribute name="type" value="void" id="6359" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="6360" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="6361" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="6362" addr="0x7f99f1e6e690" >
-                            <attributelist id="6363" addr="0x7f99f1e6e690" >
-                                <attribute name="name" value="addItem" id="6364" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="6365" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e673f0" id="6366" addr="0x7f99f1e673f0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e6e4d0" id="6367" addr="0x7f99f1e6e4d0" />
-                                <attribute name="kind" value="function" id="6368" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="addItem" id="6369" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)." id="6370" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e6e4d0" id="6371" addr="0x7f99f1e6e4d0" />
-                                <attribute name="access" value="public" id="6372" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e6e4d0" id="6373" addr="0x7f99f1e6e4d0" />
-                                <parmlist id="6374" addr="0x7f99f1e6e590" >
+                        <cdecl id="6362" addr="0x7fca469bc690" >
+                            <attributelist id="6363" addr="0x7fca469bc690" >
+                                <attribute name="name" value="addItem" id="6364" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="6365" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469b53f0" id="6366" addr="0x7fca469b53f0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469bc4d0" id="6367" addr="0x7fca469bc4d0" />
+                                <attribute name="kind" value="function" id="6368" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="addItem" id="6369" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)." id="6370" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469bc4d0" id="6371" addr="0x7fca469bc4d0" />
+                                <attribute name="access" value="public" id="6372" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469bc4d0" id="6373" addr="0x7fca469bc4d0" />
+                                <parmlist id="6374" addr="0x7fca469bc590" >
                                     <parm id="6375">
-                                        <attributelist id="6376" addr="0x7f99f1e6e590" >
-                                            <attribute name="name" value="item" id="6377" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>" id="6378" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6376" addr="0x7fca469bc590" >
+                                            <attribute name="name" value="item" id="6377" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>" id="6378" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="6379" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="6380" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="6381" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="6379" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="6380" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="6381" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="6382" addr="0x7f99f1e6ee50" >
-                            <attributelist id="6383" addr="0x7f99f1e6ee50" >
-                                <attribute name="name" value="addItems" id="6384" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="6385" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e673f0" id="6386" addr="0x7f99f1e673f0" />
-                                <attribute name="kind" value="function" id="6387" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="addItems" id="6388" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>)." id="6389" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="6390" addr="0x7f99f1de6c90" />
-                                <parmlist id="6391" addr="0x7f99f1e6eed0" >
+                        <cdecl id="6382" addr="0x7fca469bce50" >
+                            <attributelist id="6383" addr="0x7fca469bce50" >
+                                <attribute name="name" value="addItems" id="6384" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="6385" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469b53f0" id="6386" addr="0x7fca469b53f0" />
+                                <attribute name="kind" value="function" id="6387" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="addItems" id="6388" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>)." id="6389" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="6390" addr="0x7fca46934c90" />
+                                <parmlist id="6391" addr="0x7fca469bced0" >
                                     <parm id="6392">
-                                        <attributelist id="6393" addr="0x7f99f1e6eed0" >
-                                            <attribute name="name" value="items" id="6394" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>" id="6395" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6393" addr="0x7fca469bced0" >
+                                            <attribute name="name" value="items" id="6394" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>" id="6395" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="6396" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="6397" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="6398" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="6396" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="6397" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="6398" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="6399" addr="0x7f99f1e6f170" >
-                            <attributelist id="6400" addr="0x7f99f1e6f170" >
-                                <attribute name="name" value="selectItem" id="6401" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="6402" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e673f0" id="6403" addr="0x7f99f1e673f0" />
-                                <attribute name="kind" value="function" id="6404" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="selectItem" id="6405" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(long)." id="6406" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="6407" addr="0x7f99f1de6c90" />
-                                <parmlist id="6408" addr="0x7f99f1e6f0b0" >
+                        <cdecl id="6399" addr="0x7fca469bd170" >
+                            <attributelist id="6400" addr="0x7fca469bd170" >
+                                <attribute name="name" value="selectItem" id="6401" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="6402" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469b53f0" id="6403" addr="0x7fca469b53f0" />
+                                <attribute name="kind" value="function" id="6404" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="selectItem" id="6405" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(long)." id="6406" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="6407" addr="0x7fca46934c90" />
+                                <parmlist id="6408" addr="0x7fca469bd0b0" >
                                     <parm id="6409">
-                                        <attributelist id="6410" addr="0x7f99f1e6f0b0" >
-                                            <attribute name="name" value="item" id="6411" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6412" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6410" addr="0x7fca469bd0b0" >
+                                            <attribute name="name" value="item" id="6411" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6412" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="6413" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="6414" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="6415" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="6413" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="6414" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="6415" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="6416" addr="0x7f99f1e6f470" >
-                            <attributelist id="6417" addr="0x7f99f1e6f470" >
-                                <attribute name="name" value="removeItem" id="6418" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="6419" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e673f0" id="6420" addr="0x7f99f1e673f0" />
-                                <attribute name="kind" value="function" id="6421" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="removeItem" id="6422" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(int)." id="6423" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="6424" addr="0x7f99f1de6c90" />
-                                <parmlist id="6425" addr="0x7f99f1e6f3b0" >
+                        <cdecl id="6416" addr="0x7fca469bd470" >
+                            <attributelist id="6417" addr="0x7fca469bd470" >
+                                <attribute name="name" value="removeItem" id="6418" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="6419" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469b53f0" id="6420" addr="0x7fca469b53f0" />
+                                <attribute name="kind" value="function" id="6421" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="removeItem" id="6422" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(int)." id="6423" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="6424" addr="0x7fca46934c90" />
+                                <parmlist id="6425" addr="0x7fca469bd3b0" >
                                     <parm id="6426">
-                                        <attributelist id="6427" addr="0x7f99f1e6f3b0" >
-                                            <attribute name="name" value="index" id="6428" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="6429" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                    </parm >
-                                </parmlist >
-                                <attribute name="type" value="void" id="6430" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="6431" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="6432" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="6433" addr="0x7f99f1e6f650" >
-                            <attributelist id="6434" addr="0x7f99f1e6f650" >
-                                <attribute name="name" value="reset" id="6435" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="6436" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e673f0" id="6437" addr="0x7f99f1e673f0" />
-                                <attribute name="kind" value="function" id="6438" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="reset" id="6439" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="6440" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="6441" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="void" id="6442" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="6443" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="6444" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="6445" addr="0x7f99f1e6f830" >
-                            <attributelist id="6446" addr="0x7f99f1e6f830" >
-                                <attribute name="name" value="getSpinControl" id="6447" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="6448" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e673f0" id="6449" addr="0x7f99f1e673f0" />
-                                <attribute name="kind" value="function" id="6450" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getSpinControl" id="6451" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f().p." id="6452" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="6453" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="XBMCAddon::xbmcgui::Control" id="6454" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="6455" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="6456" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="6457" addr="0x7f99f1e6fa50" >
-                            <attributelist id="6458" addr="0x7f99f1e6fa50" >
-                                <attribute name="name" value="getSelectedPosition" id="6459" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="6460" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e673f0" id="6461" addr="0x7f99f1e673f0" />
-                                <attribute name="kind" value="function" id="6462" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getSelectedPosition" id="6463" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="6464" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="6465" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="long" id="6466" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="6467" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="6468" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="6469" addr="0x7f99f1e6fc70" >
-                            <attributelist id="6470" addr="0x7f99f1e6fc70" >
-                                <attribute name="name" value="getSelectedItem" id="6471" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="6472" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e673f0" id="6473" addr="0x7f99f1e673f0" />
-                                <attribute name="kind" value="function" id="6474" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getSelectedItem" id="6475" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f().p." id="6476" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="6477" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="XBMCAddon::xbmcgui::ListItem" id="6478" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="6479" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="6480" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="6481" addr="0x7f99f1e700b0" >
-                            <attributelist id="6482" addr="0x7f99f1e700b0" >
-                                <attribute name="name" value="setImageDimensions" id="6483" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="6484" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e673f0" id="6485" addr="0x7f99f1e673f0" />
-                                <attribute name="kind" value="function" id="6486" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setImageDimensions" id="6487" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(long,long)." id="6488" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="6489" addr="0x7f99f1de6c90" />
-                                <parmlist id="6490" addr="0x7f99f1e6fed0" >
+                                        <attributelist id="6427" addr="0x7fca469bd3b0" >
+                                            <attribute name="name" value="index" id="6428" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="6429" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                    </parm >
+                                </parmlist >
+                                <attribute name="type" value="void" id="6430" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="6431" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="6432" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="6433" addr="0x7fca469bd650" >
+                            <attributelist id="6434" addr="0x7fca469bd650" >
+                                <attribute name="name" value="reset" id="6435" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="6436" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469b53f0" id="6437" addr="0x7fca469b53f0" />
+                                <attribute name="kind" value="function" id="6438" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="reset" id="6439" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="6440" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="6441" addr="0x7fca46934c90" />
+                                <attribute name="type" value="void" id="6442" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="6443" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="6444" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="6445" addr="0x7fca469bd830" >
+                            <attributelist id="6446" addr="0x7fca469bd830" >
+                                <attribute name="name" value="getSpinControl" id="6447" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="6448" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469b53f0" id="6449" addr="0x7fca469b53f0" />
+                                <attribute name="kind" value="function" id="6450" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getSpinControl" id="6451" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f().p." id="6452" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="6453" addr="0x7fca46934c90" />
+                                <attribute name="type" value="XBMCAddon::xbmcgui::Control" id="6454" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="6455" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="6456" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="6457" addr="0x7fca469bda50" >
+                            <attributelist id="6458" addr="0x7fca469bda50" >
+                                <attribute name="name" value="getSelectedPosition" id="6459" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="6460" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469b53f0" id="6461" addr="0x7fca469b53f0" />
+                                <attribute name="kind" value="function" id="6462" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getSelectedPosition" id="6463" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="6464" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="6465" addr="0x7fca46934c90" />
+                                <attribute name="type" value="long" id="6466" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="6467" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="6468" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="6469" addr="0x7fca469bdc70" >
+                            <attributelist id="6470" addr="0x7fca469bdc70" >
+                                <attribute name="name" value="getSelectedItem" id="6471" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="6472" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469b53f0" id="6473" addr="0x7fca469b53f0" />
+                                <attribute name="kind" value="function" id="6474" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getSelectedItem" id="6475" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f().p." id="6476" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="6477" addr="0x7fca46934c90" />
+                                <attribute name="type" value="XBMCAddon::xbmcgui::ListItem" id="6478" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="6479" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="6480" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="6481" addr="0x7fca469be0b0" >
+                            <attributelist id="6482" addr="0x7fca469be0b0" >
+                                <attribute name="name" value="setImageDimensions" id="6483" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="6484" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469b53f0" id="6485" addr="0x7fca469b53f0" />
+                                <attribute name="kind" value="function" id="6486" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setImageDimensions" id="6487" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(long,long)." id="6488" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="6489" addr="0x7fca46934c90" />
+                                <parmlist id="6490" addr="0x7fca469bded0" >
                                     <parm id="6491">
-                                        <attributelist id="6492" addr="0x7f99f1e6fed0" >
-                                            <attribute name="name" value="imageWidth" id="6493" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6494" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6492" addr="0x7fca469bded0" >
+                                            <attribute name="name" value="imageWidth" id="6493" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6494" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6495">
-                                        <attributelist id="6496" addr="0x7f99f1e6fff0" >
-                                            <attribute name="name" value="imageHeight" id="6497" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6498" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6496" addr="0x7fca469bdff0" >
+                                            <attribute name="name" value="imageHeight" id="6497" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6498" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="6499" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="6500" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="6501" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="6499" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="6500" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="6501" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="6502" addr="0x7f99f1e703b0" >
-                            <attributelist id="6503" addr="0x7f99f1e703b0" >
-                                <attribute name="name" value="setItemHeight" id="6504" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="6505" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e673f0" id="6506" addr="0x7f99f1e673f0" />
-                                <attribute name="kind" value="function" id="6507" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setItemHeight" id="6508" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(long)." id="6509" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="6510" addr="0x7f99f1de6c90" />
-                                <parmlist id="6511" addr="0x7f99f1e702f0" >
+                        <cdecl id="6502" addr="0x7fca469be3b0" >
+                            <attributelist id="6503" addr="0x7fca469be3b0" >
+                                <attribute name="name" value="setItemHeight" id="6504" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="6505" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469b53f0" id="6506" addr="0x7fca469b53f0" />
+                                <attribute name="kind" value="function" id="6507" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setItemHeight" id="6508" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(long)." id="6509" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="6510" addr="0x7fca46934c90" />
+                                <parmlist id="6511" addr="0x7fca469be2f0" >
                                     <parm id="6512">
-                                        <attributelist id="6513" addr="0x7f99f1e702f0" >
-                                            <attribute name="name" value="height" id="6514" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6515" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6513" addr="0x7fca469be2f0" >
+                                            <attribute name="name" value="height" id="6514" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6515" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="6516" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="6517" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="6518" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="6516" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="6517" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="6518" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="6519" addr="0x7f99f1e706b0" >
-                            <attributelist id="6520" addr="0x7f99f1e706b0" >
-                                <attribute name="name" value="setSpace" id="6521" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="6522" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e673f0" id="6523" addr="0x7f99f1e673f0" />
-                                <attribute name="kind" value="function" id="6524" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setSpace" id="6525" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(int)." id="6526" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="6527" addr="0x7f99f1de6c90" />
-                                <parmlist id="6528" addr="0x7f99f1e705f0" >
+                        <cdecl id="6519" addr="0x7fca469be6b0" >
+                            <attributelist id="6520" addr="0x7fca469be6b0" >
+                                <attribute name="name" value="setSpace" id="6521" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="6522" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469b53f0" id="6523" addr="0x7fca469b53f0" />
+                                <attribute name="kind" value="function" id="6524" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setSpace" id="6525" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(int)." id="6526" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="6527" addr="0x7fca46934c90" />
+                                <parmlist id="6528" addr="0x7fca469be5f0" >
                                     <parm id="6529">
-                                        <attributelist id="6530" addr="0x7f99f1e705f0" >
-                                            <attribute name="name" value="space" id="6531" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="6532" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6530" addr="0x7fca469be5f0" >
+                                            <attribute name="name" value="space" id="6531" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="6532" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="6533" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="6534" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="6535" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="6533" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="6534" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="6535" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="6536" addr="0x7f99f1e70990" >
-                            <attributelist id="6537" addr="0x7f99f1e70990" >
-                                <attribute name="name" value="setPageControlVisible" id="6538" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="6539" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e673f0" id="6540" addr="0x7f99f1e673f0" />
-                                <attribute name="kind" value="function" id="6541" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setPageControlVisible" id="6542" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(bool)." id="6543" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="6544" addr="0x7f99f1de6c90" />
-                                <parmlist id="6545" addr="0x7f99f1e708d0" >
+                        <cdecl id="6536" addr="0x7fca469be990" >
+                            <attributelist id="6537" addr="0x7fca469be990" >
+                                <attribute name="name" value="setPageControlVisible" id="6538" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="6539" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469b53f0" id="6540" addr="0x7fca469b53f0" />
+                                <attribute name="kind" value="function" id="6541" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setPageControlVisible" id="6542" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(bool)." id="6543" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="6544" addr="0x7fca46934c90" />
+                                <parmlist id="6545" addr="0x7fca469be8d0" >
                                     <parm id="6546">
-                                        <attributelist id="6547" addr="0x7f99f1e708d0" >
-                                            <attribute name="name" value="visible" id="6548" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="6549" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                    </parm >
-                                </parmlist >
-                                <attribute name="type" value="void" id="6550" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="6551" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="6552" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="6553" addr="0x7f99f1e70b90" >
-                            <attributelist id="6554" addr="0x7f99f1e70b90" >
-                                <attribute name="name" value="size" id="6555" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="6556" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e673f0" id="6557" addr="0x7f99f1e673f0" />
-                                <attribute name="kind" value="function" id="6558" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="size" id="6559" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="6560" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="6561" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="long" id="6562" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="6563" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="6564" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="6565" addr="0x7f99f1e70d90" >
-                            <attributelist id="6566" addr="0x7f99f1e70d90" >
-                                <attribute name="name" value="getItemHeight" id="6567" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="6568" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e673f0" id="6569" addr="0x7f99f1e673f0" />
-                                <attribute name="kind" value="function" id="6570" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getItemHeight" id="6571" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="6572" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="6573" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="long" id="6574" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="6575" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="6576" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="6577" addr="0x7f99f1e70f90" >
-                            <attributelist id="6578" addr="0x7f99f1e70f90" >
-                                <attribute name="name" value="getSpace" id="6579" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="6580" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e673f0" id="6581" addr="0x7f99f1e673f0" />
-                                <attribute name="kind" value="function" id="6582" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getSpace" id="6583" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="6584" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="6585" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="long" id="6586" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="6587" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="6588" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="6589" addr="0x7f99f1e712d0" >
-                            <attributelist id="6590" addr="0x7f99f1e712d0" >
-                                <attribute name="name" value="getListItem" id="6591" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="6592" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e673f0" id="6593" addr="0x7f99f1e673f0" />
-                                <attribute name="kind" value="function" id="6594" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getListItem" id="6595" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(int).p." id="6596" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="6597" addr="0x7f99f1de6c90" />
-                                <parmlist id="6598" addr="0x7f99f1e71250" >
+                                        <attributelist id="6547" addr="0x7fca469be8d0" >
+                                            <attribute name="name" value="visible" id="6548" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="6549" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                    </parm >
+                                </parmlist >
+                                <attribute name="type" value="void" id="6550" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="6551" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="6552" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="6553" addr="0x7fca469beb90" >
+                            <attributelist id="6554" addr="0x7fca469beb90" >
+                                <attribute name="name" value="size" id="6555" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="6556" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469b53f0" id="6557" addr="0x7fca469b53f0" />
+                                <attribute name="kind" value="function" id="6558" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="size" id="6559" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="6560" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="6561" addr="0x7fca46934c90" />
+                                <attribute name="type" value="long" id="6562" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="6563" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="6564" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="6565" addr="0x7fca469bed90" >
+                            <attributelist id="6566" addr="0x7fca469bed90" >
+                                <attribute name="name" value="getItemHeight" id="6567" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="6568" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469b53f0" id="6569" addr="0x7fca469b53f0" />
+                                <attribute name="kind" value="function" id="6570" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getItemHeight" id="6571" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="6572" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="6573" addr="0x7fca46934c90" />
+                                <attribute name="type" value="long" id="6574" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="6575" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="6576" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="6577" addr="0x7fca469bef90" >
+                            <attributelist id="6578" addr="0x7fca469bef90" >
+                                <attribute name="name" value="getSpace" id="6579" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="6580" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469b53f0" id="6581" addr="0x7fca469b53f0" />
+                                <attribute name="kind" value="function" id="6582" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getSpace" id="6583" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="6584" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="6585" addr="0x7fca46934c90" />
+                                <attribute name="type" value="long" id="6586" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="6587" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="6588" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="6589" addr="0x7fca469bf2d0" >
+                            <attributelist id="6590" addr="0x7fca469bf2d0" >
+                                <attribute name="name" value="getListItem" id="6591" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="6592" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469b53f0" id="6593" addr="0x7fca469b53f0" />
+                                <attribute name="kind" value="function" id="6594" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getListItem" id="6595" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(int).p." id="6596" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="6597" addr="0x7fca46934c90" />
+                                <parmlist id="6598" addr="0x7fca469bf250" >
                                     <parm id="6599">
-                                        <attributelist id="6600" addr="0x7f99f1e71250" >
-                                            <attribute name="name" value="index" id="6601" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="6602" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6600" addr="0x7fca469bf250" >
+                                            <attribute name="name" value="index" id="6601" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="6602" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="XBMCAddon::xbmcgui::ListItem" id="6603" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="6604" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="6605" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="XBMCAddon::xbmcgui::ListItem" id="6603" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="6604" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="6605" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="6606" addr="0x7f99f1e71610" >
-                            <attributelist id="6607" addr="0x7f99f1e71610" >
-                                <attribute name="name" value="setStaticContent" id="6608" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="6609" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e673f0" id="6610" addr="0x7f99f1e673f0" />
-                                <attribute name="kind" value="function" id="6611" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setStaticContent" id="6612" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(p.q(const).XBMCAddon::xbmcgui::ListItemList)." id="6613" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="6614" addr="0x7f99f1de6c90" />
-                                <parmlist id="6615" addr="0x7f99f1e71550" >
+                        <cdecl id="6606" addr="0x7fca469bf610" >
+                            <attributelist id="6607" addr="0x7fca469bf610" >
+                                <attribute name="name" value="setStaticContent" id="6608" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="6609" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469b53f0" id="6610" addr="0x7fca469b53f0" />
+                                <attribute name="kind" value="function" id="6611" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setStaticContent" id="6612" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(p.q(const).XBMCAddon::xbmcgui::ListItemList)." id="6613" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="6614" addr="0x7fca46934c90" />
+                                <parmlist id="6615" addr="0x7fca469bf550" >
                                     <parm id="6616">
-                                        <attributelist id="6617" addr="0x7f99f1e71550" >
-                                            <attribute name="name" value="items" id="6618" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::ListItemList" id="6619" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6617" addr="0x7fca469bf550" >
+                                            <attribute name="name" value="items" id="6618" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::ListItemList" id="6619" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="6620" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="6621" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="6622" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="6620" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="6621" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="6622" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
                     </class >
-                    <class id="6623" addr="0x7f99f1e71910" >
-                        <attributelist id="6624" addr="0x7f99f1e71910" >
-                            <attribute name="name" value="XBMCAddon::xbmcgui::ControlFadeLabel" id="6625" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="6626" addr="0x7f99f1e40fb0" />
-                            <attribute name="symtab" value="0x7f99f1e71a50" id="6627" addr="0x7f99f1e71a50" />
-                            <attribute name="allows_typedef" value="1" id="6628" addr="0x7f99f1de6c90" />
-                            <attribute name="typepass_visit" value="1" id="6629" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_visit" value="1" id="6630" addr="0x7f99f1de6c90" />
-                            <attribute name="kind" value="class" id="6631" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_name" value="ControlFadeLabel" id="6632" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_has_constructor" value="1" id="6633" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_public_constructor" value="1" id="6634" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_copy_constructor" value="1" id="6635" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_default_destructor" value="1" id="6636" addr="0x7f99f1de6c90" />
-                            <attribute name="privatebaselist" value="0x7f99f1e718f0" id="6637" addr="0x7f99f1e718f0" />
-                            <attribute name="protectedbaselist" value="0x7f99f1e718d0" id="6638" addr="0x7f99f1e718d0" />
-                            <baselist id="6639" addr="0x7f99f1e718b0" >
-                                <base name="Control" id="6640" addr="0x7f99f1e71830" />
+                    <class id="6623" addr="0x7fca469bf910" >
+                        <attributelist id="6624" addr="0x7fca469bf910" >
+                            <attribute name="name" value="XBMCAddon::xbmcgui::ControlFadeLabel" id="6625" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="6626" addr="0x7fca4698efb0" />
+                            <attribute name="symtab" value="0x7fca469bfa50" id="6627" addr="0x7fca469bfa50" />
+                            <attribute name="allows_typedef" value="1" id="6628" addr="0x7fca46934c90" />
+                            <attribute name="typepass_visit" value="1" id="6629" addr="0x7fca46934c90" />
+                            <attribute name="allocate_visit" value="1" id="6630" addr="0x7fca46934c90" />
+                            <attribute name="kind" value="class" id="6631" addr="0x7fca46934c90" />
+                            <attribute name="sym_name" value="ControlFadeLabel" id="6632" addr="0x7fca46934c90" />
+                            <attribute name="allocate_has_constructor" value="1" id="6633" addr="0x7fca46934c90" />
+                            <attribute name="allocate_public_constructor" value="1" id="6634" addr="0x7fca46934c90" />
+                            <attribute name="allocate_copy_constructor" value="1" id="6635" addr="0x7fca46934c90" />
+                            <attribute name="allocate_default_destructor" value="1" id="6636" addr="0x7fca46934c90" />
+                            <attribute name="privatebaselist" value="0x7fca469bf8f0" id="6637" addr="0x7fca469bf8f0" />
+                            <attribute name="protectedbaselist" value="0x7fca469bf8d0" id="6638" addr="0x7fca469bf8d0" />
+                            <baselist id="6639" addr="0x7fca469bf8b0" >
+                                <base name="Control" id="6640" addr="0x7fca469bf830" />
                             </baselist >
-                            <attribute name="module" value="xbmcgui" id="6641" addr="0x7f99f1e402f0" />
-                            <attribute name="bases" value="0x7f99f1dda970" id="6642" addr="0x7f99f1dda970" />
-                            <attribute name="allbases" value="0x7f99f1ddac10" id="6643" addr="0x7f99f1ddac10" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="6644" addr="0x7f99f1de6c90" />
-                            <typescope id="6645" addr="0x7f99f1dda910" >
-                                <attributelist id="6646" addr="0x7f99f1dda910" >
-                                    <attribute name="inherit" value="0x7f99f1dda9f0" id="6647" addr="0x7f99f1dda9f0" />
-                                    <attribute name="name" value="ControlFadeLabel" id="6648" addr="0x7f99f1de6c90" />
-                                    <typetab id="6649" addr="0x7f99f1dda8d0" >
-                                        <attributelist id="6650" addr="0x7f99f1dda8d0" >
+                            <attribute name="module" value="xbmcgui" id="6641" addr="0x7fca4698e2f0" />
+                            <attribute name="bases" value="0x7fca46928970" id="6642" addr="0x7fca46928970" />
+                            <attribute name="allbases" value="0x7fca46928c10" id="6643" addr="0x7fca46928c10" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="6644" addr="0x7fca46934c90" />
+                            <typescope id="6645" addr="0x7fca46928910" >
+                                <attributelist id="6646" addr="0x7fca46928910" >
+                                    <attribute name="inherit" value="0x7fca469289f0" id="6647" addr="0x7fca469289f0" />
+                                    <attribute name="name" value="ControlFadeLabel" id="6648" addr="0x7fca46934c90" />
+                                    <typetab id="6649" addr="0x7fca469288d0" >
+                                        <attributelist id="6650" addr="0x7fca469288d0" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f99f1dd2150" id="6651" addr="0x7f99f1dd2150" />
-                                    <attribute name="qname" value="XBMCAddon::xbmcgui::ControlFadeLabel" id="6652" addr="0x7f99f1de6c90" />
-                                    <attribute name="symtab" value="0x7f99f1e71a50" id="6653" addr="0x7f99f1e71a50" />
+                                    <attribute name="parent" value="0x7fca46920150" id="6651" addr="0x7fca46920150" />
+                                    <attribute name="qname" value="XBMCAddon::xbmcgui::ControlFadeLabel" id="6652" addr="0x7fca46934c90" />
+                                    <attribute name="symtab" value="0x7fca469bfa50" id="6653" addr="0x7fca469bfa50" />
                                 </attributelist >
-                                <typescopesitem id="6654" addr="0x7f99f1dda9f0" >
-                                    <attributelist id="6655" addr="0x7f99f1dda9f0" >
+                                <typescopesitem id="6654" addr="0x7fca469289f0" >
+                                    <attributelist id="6655" addr="0x7fca469289f0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="6656" addr="0x7f99f1dda8b0" >
-                                    <attributelist id="6657" addr="0x7f99f1dda8b0" >
+                                <typescopesitem id="6656" addr="0x7fca469288b0" >
+                                    <attributelist id="6657" addr="0x7fca469288b0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="6658" addr="0x7f99f1dda8d0" >
-                                    <attributelist id="6659" addr="0x7f99f1dda8d0" >
+                                <typescopesitem id="6658" addr="0x7fca469288d0" >
+                                    <attributelist id="6659" addr="0x7fca469288d0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="6660" addr="0x7f99f1dd2150" >
-                                    <attributelist id="6661" addr="0x7f99f1dd2150" >
-                                        <attribute name="name" value="xbmcgui" id="6662" addr="0x7f99f1de6c90" />
-                                        <typetab id="6663" addr="0x7f99f1dd2170" >
-                                            <attributelist id="6664" addr="0x7f99f1dd2170" >
-                                                <attribute name="InterceptorBase" value="InterceptorBase" id="6665" addr="0x7f99f1de6c90" />
-                                                <attribute name="Dialog" value="Dialog" id="6666" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="6667" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="6668" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlTextBox" value="ControlTextBox" id="6669" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="6670" addr="0x7f99f1de6c90" />
-                                                <attribute name="Window" value="Window" id="6671" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="6672" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlList" value="ControlList" id="6673" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="6674" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlImage" value="ControlImage" id="6675" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlButton" value="ControlButton" id="6676" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlGroup" value="ControlGroup" id="6677" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogBusy" value="DialogBusy" id="6678" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="6679" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSpin" value="ControlSpin" id="6680" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlEdit" value="ControlEdit" id="6681" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="6682" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="6683" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlLabel" value="ControlLabel" id="6684" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlProgress" value="ControlProgress" id="6685" addr="0x7f99f1de6c90" />
-                                                <attribute name="Control" value="Control" id="6686" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSlider" value="ControlSlider" id="6687" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgress" value="DialogProgress" id="6688" addr="0x7f99f1de6c90" />
-                                                <attribute name="Action" value="Action" id="6689" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowDialog" value="WindowDialog" id="6690" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXML" value="WindowXML" id="6691" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItem" value="ListItem" id="6692" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="6693" addr="0x7f99f1de6c90" />
+                                <typescopesitem id="6660" addr="0x7fca46920150" >
+                                    <attributelist id="6661" addr="0x7fca46920150" >
+                                        <attribute name="name" value="xbmcgui" id="6662" addr="0x7fca46934c90" />
+                                        <typetab id="6663" addr="0x7fca46920170" >
+                                            <attributelist id="6664" addr="0x7fca46920170" >
+                                                <attribute name="InterceptorBase" value="InterceptorBase" id="6665" addr="0x7fca46934c90" />
+                                                <attribute name="Dialog" value="Dialog" id="6666" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="6667" addr="0x7fca46934c90" />
+                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="6668" addr="0x7fca46934c90" />
+                                                <attribute name="ControlTextBox" value="ControlTextBox" id="6669" addr="0x7fca46934c90" />
+                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="6670" addr="0x7fca46934c90" />
+                                                <attribute name="Window" value="Window" id="6671" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="6672" addr="0x7fca46934c90" />
+                                                <attribute name="ControlList" value="ControlList" id="6673" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="6674" addr="0x7fca46934c90" />
+                                                <attribute name="ControlImage" value="ControlImage" id="6675" addr="0x7fca46934c90" />
+                                                <attribute name="ControlButton" value="ControlButton" id="6676" addr="0x7fca46934c90" />
+                                                <attribute name="ControlGroup" value="ControlGroup" id="6677" addr="0x7fca46934c90" />
+                                                <attribute name="DialogBusy" value="DialogBusy" id="6678" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="6679" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSpin" value="ControlSpin" id="6680" addr="0x7fca46934c90" />
+                                                <attribute name="ControlEdit" value="ControlEdit" id="6681" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="6682" addr="0x7fca46934c90" />
+                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="6683" addr="0x7fca46934c90" />
+                                                <attribute name="ControlLabel" value="ControlLabel" id="6684" addr="0x7fca46934c90" />
+                                                <attribute name="ControlProgress" value="ControlProgress" id="6685" addr="0x7fca46934c90" />
+                                                <attribute name="Control" value="Control" id="6686" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSlider" value="ControlSlider" id="6687" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgress" value="DialogProgress" id="6688" addr="0x7fca46934c90" />
+                                                <attribute name="Action" value="Action" id="6689" addr="0x7fca46934c90" />
+                                                <attribute name="WindowDialog" value="WindowDialog" id="6690" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXML" value="WindowXML" id="6691" addr="0x7fca46934c90" />
+                                                <attribute name="ListItem" value="ListItem" id="6692" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="6693" addr="0x7fca46934c90" />
                                             </attributelist >
-                                            <typetabsitem id="6694" addr="0x7f99f1de1dd0" >
-                                                <attributelist id="6695" addr="0x7f99f1de1dd0" >
+                                            <typetabsitem id="6694" addr="0x7fca4692fdd0" >
+                                                <attributelist id="6695" addr="0x7fca4692fdd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="6696" addr="0x7f99f1dde790" >
-                                                <attributelist id="6697" addr="0x7f99f1dde790" >
+                                            <typetabsitem id="6696" addr="0x7fca4692c790" >
+                                                <attributelist id="6697" addr="0x7fca4692c790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="6698" addr="0x7f99f1de3f10" >
-                                                <attributelist id="6699" addr="0x7f99f1de3f10" >
+                                            <typetabsitem id="6698" addr="0x7fca46931f10" >
+                                                <attributelist id="6699" addr="0x7fca46931f10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="6700" addr="0x7f99f1dd67b0" >
-                                                <attributelist id="6701" addr="0x7f99f1dd67b0" >
+                                            <typetabsitem id="6700" addr="0x7fca469247b0" >
+                                                <attributelist id="6701" addr="0x7fca469247b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="6702" addr="0x7f99f1ddafd0" >
-                                                <attributelist id="6703" addr="0x7f99f1ddafd0" >
+                                            <typetabsitem id="6702" addr="0x7fca46928fd0" >
+                                                <attributelist id="6703" addr="0x7fca46928fd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="6704" addr="0x7f99f1ddd430" >
-                                                <attributelist id="6705" addr="0x7f99f1ddd430" >
+                                            <typetabsitem id="6704" addr="0x7fca4692b430" >
+                                                <attributelist id="6705" addr="0x7fca4692b430" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="6706" addr="0x7f99f1de2130" >
-                                                <attributelist id="6707" addr="0x7f99f1de2130" >
+                                            <typetabsitem id="6706" addr="0x7fca46930130" >
+                                                <attributelist id="6707" addr="0x7fca46930130" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="6708" addr="0x7f99f1dd2f50" >
-                                                <attributelist id="6709" addr="0x7f99f1dd2f50" >
+                                            <typetabsitem id="6708" addr="0x7fca46920f50" >
+                                                <attributelist id="6709" addr="0x7fca46920f50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="6710" addr="0x7f99f1dd9650" >
-                                                <attributelist id="6711" addr="0x7f99f1dd9650" >
+                                            <typetabsitem id="6710" addr="0x7fca46927650" >
+                                                <attributelist id="6711" addr="0x7fca46927650" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="6712" addr="0x7f99f1de3390" >
-                                                <attributelist id="6713" addr="0x7f99f1de3390" >
+                                            <typetabsitem id="6712" addr="0x7fca46931390" >
+                                                <attributelist id="6713" addr="0x7fca46931390" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="6714" addr="0x7f99f1ddb7b0" >
-                                                <attributelist id="6715" addr="0x7f99f1ddb7b0" >
+                                            <typetabsitem id="6714" addr="0x7fca469297b0" >
+                                                <attributelist id="6715" addr="0x7fca469297b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="6716" addr="0x7f99f1ddc4b0" >
-                                                <attributelist id="6717" addr="0x7f99f1ddc4b0" >
+                                            <typetabsitem id="6716" addr="0x7fca4692a4b0" >
+                                                <attributelist id="6717" addr="0x7fca4692a4b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="6718" addr="0x7f99f1ddcf90" >
-                                                <attributelist id="6719" addr="0x7f99f1ddcf90" >
+                                            <typetabsitem id="6718" addr="0x7fca4692af90" >
+                                                <attributelist id="6719" addr="0x7fca4692af90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="6720" addr="0x7f99f1de11b0" >
-                                                <attributelist id="6721" addr="0x7f99f1de11b0" >
+                                            <typetabsitem id="6720" addr="0x7fca4692f1b0" >
+                                                <attributelist id="6721" addr="0x7fca4692f1b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="6722" addr="0x7f99f1de15b0" >
-                                                <attributelist id="6723" addr="0x7f99f1de15b0" >
+                                            <typetabsitem id="6722" addr="0x7fca4692f5b0" >
+                                                <attributelist id="6723" addr="0x7fca4692f5b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="6724" addr="0x7f99f1dd77f0" >
-                                                <attributelist id="6725" addr="0x7f99f1dd77f0" >
+                                            <typetabsitem id="6724" addr="0x7fca469257f0" >
+                                                <attributelist id="6725" addr="0x7fca469257f0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="6726" addr="0x7f99f1dd8b30" >
-                                                <attributelist id="6727" addr="0x7f99f1dd8b30" >
+                                            <typetabsitem id="6726" addr="0x7fca46926b30" >
+                                                <attributelist id="6727" addr="0x7fca46926b30" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="6728" addr="0x7f99f1dd2c50" >
-                                                <attributelist id="6729" addr="0x7f99f1dd2c50" >
+                                            <typetabsitem id="6728" addr="0x7fca46920c50" >
+                                                <attributelist id="6729" addr="0x7fca46920c50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="6730" addr="0x7f99f1dda790" >
-                                                <attributelist id="6731" addr="0x7f99f1dda790" >
+                                            <typetabsitem id="6730" addr="0x7fca46928790" >
+                                                <attributelist id="6731" addr="0x7fca46928790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="6732" addr="0x7f99f1dd8030" >
-                                                <attributelist id="6733" addr="0x7f99f1dd8030" >
+                                            <typetabsitem id="6732" addr="0x7fca46926030" >
+                                                <attributelist id="6733" addr="0x7fca46926030" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="6734" addr="0x7f99f1ddbe10" >
-                                                <attributelist id="6735" addr="0x7f99f1ddbe10" >
+                                            <typetabsitem id="6734" addr="0x7fca46929e10" >
+                                                <attributelist id="6735" addr="0x7fca46929e10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="6736" addr="0x7f99f1dd6b10" >
-                                                <attributelist id="6737" addr="0x7f99f1dd6b10" >
+                                            <typetabsitem id="6736" addr="0x7fca46924b10" >
+                                                <attributelist id="6737" addr="0x7fca46924b10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="6738" addr="0x7f99f1dddf90" >
-                                                <attributelist id="6739" addr="0x7f99f1dddf90" >
+                                            <typetabsitem id="6738" addr="0x7fca4692bf90" >
+                                                <attributelist id="6739" addr="0x7fca4692bf90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="6740" addr="0x7f99f1de0530" >
-                                                <attributelist id="6741" addr="0x7f99f1de0530" >
+                                            <typetabsitem id="6740" addr="0x7fca4692e530" >
+                                                <attributelist id="6741" addr="0x7fca4692e530" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="6742" addr="0x7f99f1de1e50" >
-                                                <attributelist id="6743" addr="0x7f99f1de1e50" >
+                                            <typetabsitem id="6742" addr="0x7fca4692fe50" >
+                                                <attributelist id="6743" addr="0x7fca4692fe50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="6744" addr="0x7f99f1de2d90" >
-                                                <attributelist id="6745" addr="0x7f99f1de2d90" >
+                                            <typetabsitem id="6744" addr="0x7fca46930d90" >
+                                                <attributelist id="6745" addr="0x7fca46930d90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="6746" addr="0x7f99f1de3410" >
-                                                <attributelist id="6747" addr="0x7f99f1de3410" >
+                                            <typetabsitem id="6746" addr="0x7fca46931410" >
+                                                <attributelist id="6747" addr="0x7fca46931410" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="6748" addr="0x7f99f1dd3590" >
-                                                <attributelist id="6749" addr="0x7f99f1dd3590" >
+                                            <typetabsitem id="6748" addr="0x7fca46921590" >
+                                                <attributelist id="6749" addr="0x7fca46921590" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="6750" addr="0x7f99f1dd3390" >
-                                                <attributelist id="6751" addr="0x7f99f1dd3390" >
+                                            <typetabsitem id="6750" addr="0x7fca46921390" >
+                                                <attributelist id="6751" addr="0x7fca46921390" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7f99f1dd1d70" id="6752" addr="0x7f99f1dd1d70" />
-                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="6753" addr="0x7f99f1de6c90" />
-                                        <attribute name="symtab" value="0x7f99f1e40fb0" id="6754" addr="0x7f99f1e40fb0" />
+                                        <attribute name="parent" value="0x7fca4691fd70" id="6752" addr="0x7fca4691fd70" />
+                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="6753" addr="0x7fca46934c90" />
+                                        <attribute name="symtab" value="0x7fca4698efb0" id="6754" addr="0x7fca4698efb0" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="6755" addr="0x7f99f1dda950" >
-                                    <attributelist id="6756" addr="0x7f99f1dda950" >
+                                <typescopesitem id="6755" addr="0x7fca46928950" >
+                                    <attributelist id="6756" addr="0x7fca46928950" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="6757" addr="0x7f99f1e71a50" >
-                                    <attributelist id="6758" addr="0x7f99f1e71a50" >
-                                        <attribute name="inherit" value="0x7f99f1e71ab0" id="6759" addr="0x7f99f1e71ab0" />
-                                        <attribute name="name" value="ControlFadeLabel" id="6760" addr="0x7f99f1de6c90" />
-                                        <attribute name="csymtab" value="0x7f99f1e71a70" id="6761" addr="0x7f99f1e71a70" />
-                                        <attribute name="symtab" value="0x7f99f1e71a30" id="6762" addr="0x7f99f1e71a30" />
+                                <typescopesitem id="6757" addr="0x7fca469bfa50" >
+                                    <attributelist id="6758" addr="0x7fca469bfa50" >
+                                        <attribute name="inherit" value="0x7fca469bfab0" id="6759" addr="0x7fca469bfab0" />
+                                        <attribute name="name" value="ControlFadeLabel" id="6760" addr="0x7fca46934c90" />
+                                        <attribute name="csymtab" value="0x7fca469bfa70" id="6761" addr="0x7fca469bfa70" />
+                                        <attribute name="symtab" value="0x7fca469bfa30" id="6762" addr="0x7fca469bfa30" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <access id="6763" addr="0x7f99f1e719d0" >
-                            <attributelist id="6764" addr="0x7f99f1e719d0" >
-                                <attribute name="kind" value="public" id="6765" addr="0x7f99f1de6c90" />
+                        <access id="6763" addr="0x7fca469bf9d0" >
+                            <attributelist id="6764" addr="0x7fca469bf9d0" >
+                                <attribute name="kind" value="public" id="6765" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="6766" addr="0x7f99f1e724f0" >
-                            <attributelist id="6767" addr="0x7f99f1e724f0" >
-                                <attribute name="name" value="ControlFadeLabel" id="6768" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="6769" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e71a50" id="6770" addr="0x7f99f1e71a50" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e72930" id="6771" addr="0x7f99f1e72930" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e72930" id="6772" addr="0x7f99f1e72930" />
-                                <attribute name="sym_name" value="ControlFadeLabel" id="6773" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char,long)." id="6774" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="6775" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e724f0" id="6776" addr="0x7f99f1e724f0" />
-                                <parmlist id="6777" addr="0x7f99f1e71c10" >
+                        <constructor id="6766" addr="0x7fca469c04f0" >
+                            <attributelist id="6767" addr="0x7fca469c04f0" >
+                                <attribute name="name" value="ControlFadeLabel" id="6768" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="6769" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469bfa50" id="6770" addr="0x7fca469bfa50" />
+                                <attribute name="sym_nextSibling" value="0x7fca469c0930" id="6771" addr="0x7fca469c0930" />
+                                <attribute name="csym_nextSibling" value="0x7fca469c0930" id="6772" addr="0x7fca469c0930" />
+                                <attribute name="sym_name" value="ControlFadeLabel" id="6773" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char,long)." id="6774" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="6775" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469c04f0" id="6776" addr="0x7fca469c04f0" />
+                                <parmlist id="6777" addr="0x7fca469bfc10" >
                                     <parm id="6778">
-                                        <attributelist id="6779" addr="0x7f99f1e71c10" >
-                                            <attribute name="name" value="x" id="6780" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6781" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6779" addr="0x7fca469bfc10" >
+                                            <attribute name="name" value="x" id="6780" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6781" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6782">
-                                        <attributelist id="6783" addr="0x7f99f1e71d30" >
-                                            <attribute name="name" value="y" id="6784" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6785" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6783" addr="0x7fca469bfd30" >
+                                            <attribute name="name" value="y" id="6784" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6785" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6786">
-                                        <attributelist id="6787" addr="0x7f99f1e71e50" >
-                                            <attribute name="name" value="width" id="6788" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6789" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6787" addr="0x7fca469bfe50" >
+                                            <attribute name="name" value="width" id="6788" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6789" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6790">
-                                        <attributelist id="6791" addr="0x7f99f1e71f70" >
-                                            <attribute name="name" value="height" id="6792" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6793" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6791" addr="0x7fca469bff70" >
+                                            <attribute name="name" value="height" id="6792" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6793" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6794">
-                                        <attributelist id="6795" addr="0x7f99f1e72110" >
-                                            <attribute name="name" value="font" id="6796" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="6797" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="6798" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6795" addr="0x7fca469c0110" >
+                                            <attribute name="name" value="font" id="6796" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="6797" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="6798" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6799">
-                                        <attributelist id="6800" addr="0x7f99f1e722b0" >
-                                            <attribute name="name" value="textColor" id="6801" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="6802" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="6803" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6800" addr="0x7fca469c02b0" >
+                                            <attribute name="name" value="textColor" id="6801" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="6802" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="6803" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6804">
-                                        <attributelist id="6805" addr="0x7f99f1e72430" >
-                                            <attribute name="name" value="_alignment" id="6806" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBFONT_LEFT" id="6807" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6808" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6805" addr="0x7fca469c0430" >
+                                            <attribute name="name" value="_alignment" id="6806" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBFONT_LEFT" id="6807" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6808" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_0" id="6809" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="6810" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="6809" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="6810" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="6811" addr="0x7f99f1e72930" >
-                            <attributelist id="6812" addr="0x7f99f1e72930" >
-                                <attribute name="name" value="ControlFadeLabel" id="6813" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="6814" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e71a50" id="6815" addr="0x7f99f1e71a50" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e72cd0" id="6816" addr="0x7f99f1e72cd0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e724f0" id="6817" addr="0x7f99f1e724f0" />
-                                <attribute name="sym_name" value="ControlFadeLabel" id="6818" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e72cd0" id="6819" addr="0x7f99f1e72cd0" />
-                                <attribute name="defaultargs" value="0x7f99f1e724f0" id="6820" addr="0x7f99f1e724f0" />
-                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char)." id="6821" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="6822" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e724f0" id="6823" addr="0x7f99f1e724f0" />
-                                <parmlist id="6824" addr="0x7f99f1e72590" >
+                        <constructor id="6811" addr="0x7fca469c0930" >
+                            <attributelist id="6812" addr="0x7fca469c0930" >
+                                <attribute name="name" value="ControlFadeLabel" id="6813" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="6814" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469bfa50" id="6815" addr="0x7fca469bfa50" />
+                                <attribute name="csym_nextSibling" value="0x7fca469c0cd0" id="6816" addr="0x7fca469c0cd0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469c04f0" id="6817" addr="0x7fca469c04f0" />
+                                <attribute name="sym_name" value="ControlFadeLabel" id="6818" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469c0cd0" id="6819" addr="0x7fca469c0cd0" />
+                                <attribute name="defaultargs" value="0x7fca469c04f0" id="6820" addr="0x7fca469c04f0" />
+                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char)." id="6821" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="6822" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469c04f0" id="6823" addr="0x7fca469c04f0" />
+                                <parmlist id="6824" addr="0x7fca469c0590" >
                                     <parm id="6825">
-                                        <attributelist id="6826" addr="0x7f99f1e72590" >
-                                            <attribute name="name" value="x" id="6827" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6828" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6826" addr="0x7fca469c0590" >
+                                            <attribute name="name" value="x" id="6827" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6828" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6829">
-                                        <attributelist id="6830" addr="0x7f99f1e72650" >
-                                            <attribute name="name" value="y" id="6831" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6832" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6830" addr="0x7fca469c0650" >
+                                            <attribute name="name" value="y" id="6831" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6832" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6833">
-                                        <attributelist id="6834" addr="0x7f99f1e726d0" >
-                                            <attribute name="name" value="width" id="6835" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6836" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6834" addr="0x7fca469c06d0" >
+                                            <attribute name="name" value="width" id="6835" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6836" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6837">
-                                        <attributelist id="6838" addr="0x7f99f1e72750" >
-                                            <attribute name="name" value="height" id="6839" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6840" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6838" addr="0x7fca469c0750" >
+                                            <attribute name="name" value="height" id="6839" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6840" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6841">
-                                        <attributelist id="6842" addr="0x7f99f1e727d0" >
-                                            <attribute name="name" value="font" id="6843" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="6844" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="6845" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6842" addr="0x7fca469c07d0" >
+                                            <attribute name="name" value="font" id="6843" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="6844" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="6845" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6846">
-                                        <attributelist id="6847" addr="0x7f99f1e72870" >
-                                            <attribute name="name" value="textColor" id="6848" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="6849" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="6850" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6847" addr="0x7fca469c0870" >
+                                            <attribute name="name" value="textColor" id="6848" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="6849" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="6850" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_1" id="6851" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="6852" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="6851" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="6852" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="6853" addr="0x7f99f1e72cd0" >
-                            <attributelist id="6854" addr="0x7f99f1e72cd0" >
-                                <attribute name="name" value="ControlFadeLabel" id="6855" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="6856" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e71a50" id="6857" addr="0x7f99f1e71a50" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e72fd0" id="6858" addr="0x7f99f1e72fd0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e72930" id="6859" addr="0x7f99f1e72930" />
-                                <attribute name="sym_name" value="ControlFadeLabel" id="6860" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e72fd0" id="6861" addr="0x7f99f1e72fd0" />
-                                <attribute name="defaultargs" value="0x7f99f1e724f0" id="6862" addr="0x7f99f1e724f0" />
-                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char)." id="6863" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="6864" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e724f0" id="6865" addr="0x7f99f1e724f0" />
-                                <parmlist id="6866" addr="0x7f99f1e729d0" >
+                        <constructor id="6853" addr="0x7fca469c0cd0" >
+                            <attributelist id="6854" addr="0x7fca469c0cd0" >
+                                <attribute name="name" value="ControlFadeLabel" id="6855" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="6856" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469bfa50" id="6857" addr="0x7fca469bfa50" />
+                                <attribute name="csym_nextSibling" value="0x7fca469c0fd0" id="6858" addr="0x7fca469c0fd0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469c0930" id="6859" addr="0x7fca469c0930" />
+                                <attribute name="sym_name" value="ControlFadeLabel" id="6860" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469c0fd0" id="6861" addr="0x7fca469c0fd0" />
+                                <attribute name="defaultargs" value="0x7fca469c04f0" id="6862" addr="0x7fca469c04f0" />
+                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char)." id="6863" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="6864" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469c04f0" id="6865" addr="0x7fca469c04f0" />
+                                <parmlist id="6866" addr="0x7fca469c09d0" >
                                     <parm id="6867">
-                                        <attributelist id="6868" addr="0x7f99f1e729d0" >
-                                            <attribute name="name" value="x" id="6869" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6870" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6868" addr="0x7fca469c09d0" >
+                                            <attribute name="name" value="x" id="6869" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6870" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6871">
-                                        <attributelist id="6872" addr="0x7f99f1e72a90" >
-                                            <attribute name="name" value="y" id="6873" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6874" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6872" addr="0x7fca469c0a90" >
+                                            <attribute name="name" value="y" id="6873" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6874" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6875">
-                                        <attributelist id="6876" addr="0x7f99f1e72b10" >
-                                            <attribute name="name" value="width" id="6877" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6878" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6876" addr="0x7fca469c0b10" >
+                                            <attribute name="name" value="width" id="6877" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6878" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6879">
-                                        <attributelist id="6880" addr="0x7f99f1e72b90" >
-                                            <attribute name="name" value="height" id="6881" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6882" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6880" addr="0x7fca469c0b90" >
+                                            <attribute name="name" value="height" id="6881" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6882" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6883">
-                                        <attributelist id="6884" addr="0x7f99f1e72c10" >
-                                            <attribute name="name" value="font" id="6885" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="6886" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="6887" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6884" addr="0x7fca469c0c10" >
+                                            <attribute name="name" value="font" id="6885" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="6886" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="6887" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_2" id="6888" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="6889" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_2" id="6888" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="6889" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="6890" addr="0x7f99f1e72fd0" >
-                            <attributelist id="6891" addr="0x7f99f1e72fd0" >
-                                <attribute name="name" value="ControlFadeLabel" id="6892" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="6893" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e71a50" id="6894" addr="0x7f99f1e71a50" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e72cd0" id="6895" addr="0x7f99f1e72cd0" />
-                                <attribute name="sym_name" value="ControlFadeLabel" id="6896" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e724f0" id="6897" addr="0x7f99f1e724f0" />
-                                <attribute name="decl" value="f(long,long,long,long)." id="6898" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="6899" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e724f0" id="6900" addr="0x7f99f1e724f0" />
-                                <parmlist id="6901" addr="0x7f99f1e72d70" >
+                        <constructor id="6890" addr="0x7fca469c0fd0" >
+                            <attributelist id="6891" addr="0x7fca469c0fd0" >
+                                <attribute name="name" value="ControlFadeLabel" id="6892" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="6893" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469bfa50" id="6894" addr="0x7fca469bfa50" />
+                                <attribute name="sym_previousSibling" value="0x7fca469c0cd0" id="6895" addr="0x7fca469c0cd0" />
+                                <attribute name="sym_name" value="ControlFadeLabel" id="6896" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469c04f0" id="6897" addr="0x7fca469c04f0" />
+                                <attribute name="decl" value="f(long,long,long,long)." id="6898" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="6899" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469c04f0" id="6900" addr="0x7fca469c04f0" />
+                                <parmlist id="6901" addr="0x7fca469c0d70" >
                                     <parm id="6902">
-                                        <attributelist id="6903" addr="0x7f99f1e72d70" >
-                                            <attribute name="name" value="x" id="6904" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6905" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6903" addr="0x7fca469c0d70" >
+                                            <attribute name="name" value="x" id="6904" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6905" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6906">
-                                        <attributelist id="6907" addr="0x7f99f1e72e30" >
-                                            <attribute name="name" value="y" id="6908" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6909" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6907" addr="0x7fca469c0e30" >
+                                            <attribute name="name" value="y" id="6908" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6909" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6910">
-                                        <attributelist id="6911" addr="0x7f99f1e72eb0" >
-                                            <attribute name="name" value="width" id="6912" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6913" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6911" addr="0x7fca469c0eb0" >
+                                            <attribute name="name" value="width" id="6912" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6913" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6914">
-                                        <attributelist id="6915" addr="0x7f99f1e72f30" >
-                                            <attribute name="name" value="height" id="6916" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6917" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6915" addr="0x7fca469c0f30" >
+                                            <attribute name="name" value="height" id="6916" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6917" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_3" id="6918" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="6919" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_3" id="6918" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="6919" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <cdecl id="6920" addr="0x7f99f1e732b0" >
-                            <attributelist id="6921" addr="0x7f99f1e732b0" >
-                                <attribute name="name" value="addLabel" id="6922" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="6923" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e71a50" id="6924" addr="0x7f99f1e71a50" />
-                                <attribute name="kind" value="function" id="6925" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="addLabel" id="6926" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="6927" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="6928" addr="0x7f99f1de6c90" />
-                                <parmlist id="6929" addr="0x7f99f1e731f0" >
+                        <cdecl id="6920" addr="0x7fca469c12b0" >
+                            <attributelist id="6921" addr="0x7fca469c12b0" >
+                                <attribute name="name" value="addLabel" id="6922" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="6923" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469bfa50" id="6924" addr="0x7fca469bfa50" />
+                                <attribute name="kind" value="function" id="6925" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="addLabel" id="6926" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="6927" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="6928" addr="0x7fca46934c90" />
+                                <parmlist id="6929" addr="0x7fca469c11f0" >
                                     <parm id="6930">
-                                        <attributelist id="6931" addr="0x7f99f1e731f0" >
-                                            <attribute name="name" value="label" id="6932" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="6933" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6931" addr="0x7fca469c11f0" >
+                                            <attribute name="name" value="label" id="6932" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="6933" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="6934" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="6935" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="6936" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="6934" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="6935" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="6936" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="6937" addr="0x7f99f1e73590" >
-                            <attributelist id="6938" addr="0x7f99f1e73590" >
-                                <attribute name="name" value="setScrolling" id="6939" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="6940" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e71a50" id="6941" addr="0x7f99f1e71a50" />
-                                <attribute name="kind" value="function" id="6942" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setScrolling" id="6943" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(bool)." id="6944" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="6945" addr="0x7f99f1de6c90" />
-                                <parmlist id="6946" addr="0x7f99f1e734d0" >
+                        <cdecl id="6937" addr="0x7fca469c1590" >
+                            <attributelist id="6938" addr="0x7fca469c1590" >
+                                <attribute name="name" value="setScrolling" id="6939" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="6940" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469bfa50" id="6941" addr="0x7fca469bfa50" />
+                                <attribute name="kind" value="function" id="6942" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setScrolling" id="6943" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(bool)." id="6944" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="6945" addr="0x7fca46934c90" />
+                                <parmlist id="6946" addr="0x7fca469c14d0" >
                                     <parm id="6947">
-                                        <attributelist id="6948" addr="0x7f99f1e734d0" >
-                                            <attribute name="name" value="scroll" id="6949" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="6950" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6948" addr="0x7fca469c14d0" >
+                                            <attribute name="name" value="scroll" id="6949" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="6950" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="6951" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="6952" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="6953" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="6951" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="6952" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="6953" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="6954" addr="0x7f99f1e73770" >
-                            <attributelist id="6955" addr="0x7f99f1e73770" >
-                                <attribute name="ismember" value="1" id="6956" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="reset" id="6957" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="reset" id="6958" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="6959" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="6960" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="6961" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="6962" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="void" id="6963" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e71a50" id="6964" addr="0x7f99f1e71a50" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="6965" addr="0x7f99f1de6c90" />
+                        <cdecl id="6954" addr="0x7fca469c1770" >
+                            <attributelist id="6955" addr="0x7fca469c1770" >
+                                <attribute name="ismember" value="1" id="6956" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="reset" id="6957" addr="0x7fca46934c90" />
+                                <attribute name="name" value="reset" id="6958" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="6959" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="6960" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="6961" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="6962" addr="0x7fca46934c90" />
+                                <attribute name="type" value="void" id="6963" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469bfa50" id="6964" addr="0x7fca469bfa50" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="6965" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
                     </class >
-                    <class id="6966" addr="0x7f99f1e73a50" >
-                        <attributelist id="6967" addr="0x7f99f1e73a50" >
-                            <attribute name="name" value="XBMCAddon::xbmcgui::ControlTextBox" id="6968" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="6969" addr="0x7f99f1e40fb0" />
-                            <attribute name="symtab" value="0x7f99f1e73b90" id="6970" addr="0x7f99f1e73b90" />
-                            <attribute name="allows_typedef" value="1" id="6971" addr="0x7f99f1de6c90" />
-                            <attribute name="typepass_visit" value="1" id="6972" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_visit" value="1" id="6973" addr="0x7f99f1de6c90" />
-                            <attribute name="kind" value="class" id="6974" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_name" value="ControlTextBox" id="6975" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_has_constructor" value="1" id="6976" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_public_constructor" value="1" id="6977" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_copy_constructor" value="1" id="6978" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_default_destructor" value="1" id="6979" addr="0x7f99f1de6c90" />
-                            <attribute name="privatebaselist" value="0x7f99f1e73a30" id="6980" addr="0x7f99f1e73a30" />
-                            <attribute name="protectedbaselist" value="0x7f99f1e73a10" id="6981" addr="0x7f99f1e73a10" />
-                            <baselist id="6982" addr="0x7f99f1e739f0" >
-                                <base name="Control" id="6983" addr="0x7f99f1e73970" />
+                    <class id="6966" addr="0x7fca469c1a50" >
+                        <attributelist id="6967" addr="0x7fca469c1a50" >
+                            <attribute name="name" value="XBMCAddon::xbmcgui::ControlTextBox" id="6968" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="6969" addr="0x7fca4698efb0" />
+                            <attribute name="symtab" value="0x7fca469c1b90" id="6970" addr="0x7fca469c1b90" />
+                            <attribute name="allows_typedef" value="1" id="6971" addr="0x7fca46934c90" />
+                            <attribute name="typepass_visit" value="1" id="6972" addr="0x7fca46934c90" />
+                            <attribute name="allocate_visit" value="1" id="6973" addr="0x7fca46934c90" />
+                            <attribute name="kind" value="class" id="6974" addr="0x7fca46934c90" />
+                            <attribute name="sym_name" value="ControlTextBox" id="6975" addr="0x7fca46934c90" />
+                            <attribute name="allocate_has_constructor" value="1" id="6976" addr="0x7fca46934c90" />
+                            <attribute name="allocate_public_constructor" value="1" id="6977" addr="0x7fca46934c90" />
+                            <attribute name="allocate_copy_constructor" value="1" id="6978" addr="0x7fca46934c90" />
+                            <attribute name="allocate_default_destructor" value="1" id="6979" addr="0x7fca46934c90" />
+                            <attribute name="privatebaselist" value="0x7fca469c1a30" id="6980" addr="0x7fca469c1a30" />
+                            <attribute name="protectedbaselist" value="0x7fca469c1a10" id="6981" addr="0x7fca469c1a10" />
+                            <baselist id="6982" addr="0x7fca469c19f0" >
+                                <base name="Control" id="6983" addr="0x7fca469c1970" />
                             </baselist >
-                            <attribute name="module" value="xbmcgui" id="6984" addr="0x7f99f1e402f0" />
-                            <attribute name="bases" value="0x7f99f1ddb110" id="6985" addr="0x7f99f1ddb110" />
-                            <attribute name="allbases" value="0x7f99f1ddb3b0" id="6986" addr="0x7f99f1ddb3b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="6987" addr="0x7f99f1de6c90" />
-                            <typescope id="6988" addr="0x7f99f1ddb090" >
-                                <attributelist id="6989" addr="0x7f99f1ddb090" >
-                                    <attribute name="inherit" value="0x7f99f1ddb190" id="6990" addr="0x7f99f1ddb190" />
-                                    <attribute name="name" value="ControlTextBox" id="6991" addr="0x7f99f1de6c90" />
-                                    <typetab id="6992" addr="0x7f99f1ddb0b0" >
-                                        <attributelist id="6993" addr="0x7f99f1ddb0b0" >
+                            <attribute name="module" value="xbmcgui" id="6984" addr="0x7fca4698e2f0" />
+                            <attribute name="bases" value="0x7fca46929110" id="6985" addr="0x7fca46929110" />
+                            <attribute name="allbases" value="0x7fca469293b0" id="6986" addr="0x7fca469293b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="6987" addr="0x7fca46934c90" />
+                            <typescope id="6988" addr="0x7fca46929090" >
+                                <attributelist id="6989" addr="0x7fca46929090" >
+                                    <attribute name="inherit" value="0x7fca46929190" id="6990" addr="0x7fca46929190" />
+                                    <attribute name="name" value="ControlTextBox" id="6991" addr="0x7fca46934c90" />
+                                    <typetab id="6992" addr="0x7fca469290b0" >
+                                        <attributelist id="6993" addr="0x7fca469290b0" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f99f1dd2150" id="6994" addr="0x7f99f1dd2150" />
-                                    <attribute name="qname" value="XBMCAddon::xbmcgui::ControlTextBox" id="6995" addr="0x7f99f1de6c90" />
-                                    <attribute name="symtab" value="0x7f99f1e73b90" id="6996" addr="0x7f99f1e73b90" />
+                                    <attribute name="parent" value="0x7fca46920150" id="6994" addr="0x7fca46920150" />
+                                    <attribute name="qname" value="XBMCAddon::xbmcgui::ControlTextBox" id="6995" addr="0x7fca46934c90" />
+                                    <attribute name="symtab" value="0x7fca469c1b90" id="6996" addr="0x7fca469c1b90" />
                                 </attributelist >
-                                <typescopesitem id="6997" addr="0x7f99f1ddb190" >
-                                    <attributelist id="6998" addr="0x7f99f1ddb190" >
+                                <typescopesitem id="6997" addr="0x7fca46929190" >
+                                    <attributelist id="6998" addr="0x7fca46929190" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="6999" addr="0x7f99f1ddb030" >
-                                    <attributelist id="7000" addr="0x7f99f1ddb030" >
+                                <typescopesitem id="6999" addr="0x7fca46929030" >
+                                    <attributelist id="7000" addr="0x7fca46929030" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="7001" addr="0x7f99f1ddb0b0" >
-                                    <attributelist id="7002" addr="0x7f99f1ddb0b0" >
+                                <typescopesitem id="7001" addr="0x7fca469290b0" >
+                                    <attributelist id="7002" addr="0x7fca469290b0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="7003" addr="0x7f99f1dd2150" >
-                                    <attributelist id="7004" addr="0x7f99f1dd2150" >
-                                        <attribute name="name" value="xbmcgui" id="7005" addr="0x7f99f1de6c90" />
-                                        <typetab id="7006" addr="0x7f99f1dd2170" >
-                                            <attributelist id="7007" addr="0x7f99f1dd2170" >
-                                                <attribute name="InterceptorBase" value="InterceptorBase" id="7008" addr="0x7f99f1de6c90" />
-                                                <attribute name="Dialog" value="Dialog" id="7009" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="7010" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="7011" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlTextBox" value="ControlTextBox" id="7012" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="7013" addr="0x7f99f1de6c90" />
-                                                <attribute name="Window" value="Window" id="7014" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="7015" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlList" value="ControlList" id="7016" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="7017" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlImage" value="ControlImage" id="7018" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlButton" value="ControlButton" id="7019" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlGroup" value="ControlGroup" id="7020" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogBusy" value="DialogBusy" id="7021" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="7022" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSpin" value="ControlSpin" id="7023" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlEdit" value="ControlEdit" id="7024" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="7025" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="7026" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlLabel" value="ControlLabel" id="7027" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlProgress" value="ControlProgress" id="7028" addr="0x7f99f1de6c90" />
-                                                <attribute name="Control" value="Control" id="7029" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSlider" value="ControlSlider" id="7030" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgress" value="DialogProgress" id="7031" addr="0x7f99f1de6c90" />
-                                                <attribute name="Action" value="Action" id="7032" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowDialog" value="WindowDialog" id="7033" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXML" value="WindowXML" id="7034" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItem" value="ListItem" id="7035" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="7036" addr="0x7f99f1de6c90" />
+                                <typescopesitem id="7003" addr="0x7fca46920150" >
+                                    <attributelist id="7004" addr="0x7fca46920150" >
+                                        <attribute name="name" value="xbmcgui" id="7005" addr="0x7fca46934c90" />
+                                        <typetab id="7006" addr="0x7fca46920170" >
+                                            <attributelist id="7007" addr="0x7fca46920170" >
+                                                <attribute name="InterceptorBase" value="InterceptorBase" id="7008" addr="0x7fca46934c90" />
+                                                <attribute name="Dialog" value="Dialog" id="7009" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="7010" addr="0x7fca46934c90" />
+                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="7011" addr="0x7fca46934c90" />
+                                                <attribute name="ControlTextBox" value="ControlTextBox" id="7012" addr="0x7fca46934c90" />
+                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="7013" addr="0x7fca46934c90" />
+                                                <attribute name="Window" value="Window" id="7014" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="7015" addr="0x7fca46934c90" />
+                                                <attribute name="ControlList" value="ControlList" id="7016" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="7017" addr="0x7fca46934c90" />
+                                                <attribute name="ControlImage" value="ControlImage" id="7018" addr="0x7fca46934c90" />
+                                                <attribute name="ControlButton" value="ControlButton" id="7019" addr="0x7fca46934c90" />
+                                                <attribute name="ControlGroup" value="ControlGroup" id="7020" addr="0x7fca46934c90" />
+                                                <attribute name="DialogBusy" value="DialogBusy" id="7021" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="7022" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSpin" value="ControlSpin" id="7023" addr="0x7fca46934c90" />
+                                                <attribute name="ControlEdit" value="ControlEdit" id="7024" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="7025" addr="0x7fca46934c90" />
+                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="7026" addr="0x7fca46934c90" />
+                                                <attribute name="ControlLabel" value="ControlLabel" id="7027" addr="0x7fca46934c90" />
+                                                <attribute name="ControlProgress" value="ControlProgress" id="7028" addr="0x7fca46934c90" />
+                                                <attribute name="Control" value="Control" id="7029" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSlider" value="ControlSlider" id="7030" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgress" value="DialogProgress" id="7031" addr="0x7fca46934c90" />
+                                                <attribute name="Action" value="Action" id="7032" addr="0x7fca46934c90" />
+                                                <attribute name="WindowDialog" value="WindowDialog" id="7033" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXML" value="WindowXML" id="7034" addr="0x7fca46934c90" />
+                                                <attribute name="ListItem" value="ListItem" id="7035" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="7036" addr="0x7fca46934c90" />
                                             </attributelist >
-                                            <typetabsitem id="7037" addr="0x7f99f1de1dd0" >
-                                                <attributelist id="7038" addr="0x7f99f1de1dd0" >
+                                            <typetabsitem id="7037" addr="0x7fca4692fdd0" >
+                                                <attributelist id="7038" addr="0x7fca4692fdd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7039" addr="0x7f99f1dde790" >
-                                                <attributelist id="7040" addr="0x7f99f1dde790" >
+                                            <typetabsitem id="7039" addr="0x7fca4692c790" >
+                                                <attributelist id="7040" addr="0x7fca4692c790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7041" addr="0x7f99f1de3f10" >
-                                                <attributelist id="7042" addr="0x7f99f1de3f10" >
+                                            <typetabsitem id="7041" addr="0x7fca46931f10" >
+                                                <attributelist id="7042" addr="0x7fca46931f10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7043" addr="0x7f99f1dd67b0" >
-                                                <attributelist id="7044" addr="0x7f99f1dd67b0" >
+                                            <typetabsitem id="7043" addr="0x7fca469247b0" >
+                                                <attributelist id="7044" addr="0x7fca469247b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7045" addr="0x7f99f1ddafd0" >
-                                                <attributelist id="7046" addr="0x7f99f1ddafd0" >
+                                            <typetabsitem id="7045" addr="0x7fca46928fd0" >
+                                                <attributelist id="7046" addr="0x7fca46928fd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7047" addr="0x7f99f1ddd430" >
-                                                <attributelist id="7048" addr="0x7f99f1ddd430" >
+                                            <typetabsitem id="7047" addr="0x7fca4692b430" >
+                                                <attributelist id="7048" addr="0x7fca4692b430" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7049" addr="0x7f99f1de2130" >
-                                                <attributelist id="7050" addr="0x7f99f1de2130" >
+                                            <typetabsitem id="7049" addr="0x7fca46930130" >
+                                                <attributelist id="7050" addr="0x7fca46930130" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7051" addr="0x7f99f1dd2f50" >
-                                                <attributelist id="7052" addr="0x7f99f1dd2f50" >
+                                            <typetabsitem id="7051" addr="0x7fca46920f50" >
+                                                <attributelist id="7052" addr="0x7fca46920f50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7053" addr="0x7f99f1dd9650" >
-                                                <attributelist id="7054" addr="0x7f99f1dd9650" >
+                                            <typetabsitem id="7053" addr="0x7fca46927650" >
+                                                <attributelist id="7054" addr="0x7fca46927650" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7055" addr="0x7f99f1de3390" >
-                                                <attributelist id="7056" addr="0x7f99f1de3390" >
+                                            <typetabsitem id="7055" addr="0x7fca46931390" >
+                                                <attributelist id="7056" addr="0x7fca46931390" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7057" addr="0x7f99f1ddb7b0" >
-                                                <attributelist id="7058" addr="0x7f99f1ddb7b0" >
+                                            <typetabsitem id="7057" addr="0x7fca469297b0" >
+                                                <attributelist id="7058" addr="0x7fca469297b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7059" addr="0x7f99f1ddc4b0" >
-                                                <attributelist id="7060" addr="0x7f99f1ddc4b0" >
+                                            <typetabsitem id="7059" addr="0x7fca4692a4b0" >
+                                                <attributelist id="7060" addr="0x7fca4692a4b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7061" addr="0x7f99f1ddcf90" >
-                                                <attributelist id="7062" addr="0x7f99f1ddcf90" >
+                                            <typetabsitem id="7061" addr="0x7fca4692af90" >
+                                                <attributelist id="7062" addr="0x7fca4692af90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7063" addr="0x7f99f1de11b0" >
-                                                <attributelist id="7064" addr="0x7f99f1de11b0" >
+                                            <typetabsitem id="7063" addr="0x7fca4692f1b0" >
+                                                <attributelist id="7064" addr="0x7fca4692f1b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7065" addr="0x7f99f1de15b0" >
-                                                <attributelist id="7066" addr="0x7f99f1de15b0" >
+                                            <typetabsitem id="7065" addr="0x7fca4692f5b0" >
+                                                <attributelist id="7066" addr="0x7fca4692f5b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7067" addr="0x7f99f1dd77f0" >
-                                                <attributelist id="7068" addr="0x7f99f1dd77f0" >
+                                            <typetabsitem id="7067" addr="0x7fca469257f0" >
+                                                <attributelist id="7068" addr="0x7fca469257f0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7069" addr="0x7f99f1dd8b30" >
-                                                <attributelist id="7070" addr="0x7f99f1dd8b30" >
+                                            <typetabsitem id="7069" addr="0x7fca46926b30" >
+                                                <attributelist id="7070" addr="0x7fca46926b30" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7071" addr="0x7f99f1dd2c50" >
-                                                <attributelist id="7072" addr="0x7f99f1dd2c50" >
+                                            <typetabsitem id="7071" addr="0x7fca46920c50" >
+                                                <attributelist id="7072" addr="0x7fca46920c50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7073" addr="0x7f99f1dda790" >
-                                                <attributelist id="7074" addr="0x7f99f1dda790" >
+                                            <typetabsitem id="7073" addr="0x7fca46928790" >
+                                                <attributelist id="7074" addr="0x7fca46928790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7075" addr="0x7f99f1dd8030" >
-                                                <attributelist id="7076" addr="0x7f99f1dd8030" >
+                                            <typetabsitem id="7075" addr="0x7fca46926030" >
+                                                <attributelist id="7076" addr="0x7fca46926030" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7077" addr="0x7f99f1ddbe10" >
-                                                <attributelist id="7078" addr="0x7f99f1ddbe10" >
+                                            <typetabsitem id="7077" addr="0x7fca46929e10" >
+                                                <attributelist id="7078" addr="0x7fca46929e10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7079" addr="0x7f99f1dd6b10" >
-                                                <attributelist id="7080" addr="0x7f99f1dd6b10" >
+                                            <typetabsitem id="7079" addr="0x7fca46924b10" >
+                                                <attributelist id="7080" addr="0x7fca46924b10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7081" addr="0x7f99f1dddf90" >
-                                                <attributelist id="7082" addr="0x7f99f1dddf90" >
+                                            <typetabsitem id="7081" addr="0x7fca4692bf90" >
+                                                <attributelist id="7082" addr="0x7fca4692bf90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7083" addr="0x7f99f1de0530" >
-                                                <attributelist id="7084" addr="0x7f99f1de0530" >
+                                            <typetabsitem id="7083" addr="0x7fca4692e530" >
+                                                <attributelist id="7084" addr="0x7fca4692e530" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7085" addr="0x7f99f1de1e50" >
-                                                <attributelist id="7086" addr="0x7f99f1de1e50" >
+                                            <typetabsitem id="7085" addr="0x7fca4692fe50" >
+                                                <attributelist id="7086" addr="0x7fca4692fe50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7087" addr="0x7f99f1de2d90" >
-                                                <attributelist id="7088" addr="0x7f99f1de2d90" >
+                                            <typetabsitem id="7087" addr="0x7fca46930d90" >
+                                                <attributelist id="7088" addr="0x7fca46930d90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7089" addr="0x7f99f1de3410" >
-                                                <attributelist id="7090" addr="0x7f99f1de3410" >
+                                            <typetabsitem id="7089" addr="0x7fca46931410" >
+                                                <attributelist id="7090" addr="0x7fca46931410" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7091" addr="0x7f99f1dd3590" >
-                                                <attributelist id="7092" addr="0x7f99f1dd3590" >
+                                            <typetabsitem id="7091" addr="0x7fca46921590" >
+                                                <attributelist id="7092" addr="0x7fca46921590" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7093" addr="0x7f99f1dd3390" >
-                                                <attributelist id="7094" addr="0x7f99f1dd3390" >
+                                            <typetabsitem id="7093" addr="0x7fca46921390" >
+                                                <attributelist id="7094" addr="0x7fca46921390" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7f99f1dd1d70" id="7095" addr="0x7f99f1dd1d70" />
-                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="7096" addr="0x7f99f1de6c90" />
-                                        <attribute name="symtab" value="0x7f99f1e40fb0" id="7097" addr="0x7f99f1e40fb0" />
+                                        <attribute name="parent" value="0x7fca4691fd70" id="7095" addr="0x7fca4691fd70" />
+                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="7096" addr="0x7fca46934c90" />
+                                        <attribute name="symtab" value="0x7fca4698efb0" id="7097" addr="0x7fca4698efb0" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="7098" addr="0x7f99f1ddb0d0" >
-                                    <attributelist id="7099" addr="0x7f99f1ddb0d0" >
+                                <typescopesitem id="7098" addr="0x7fca469290d0" >
+                                    <attributelist id="7099" addr="0x7fca469290d0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="7100" addr="0x7f99f1e73b90" >
-                                    <attributelist id="7101" addr="0x7f99f1e73b90" >
-                                        <attribute name="inherit" value="0x7f99f1e73bf0" id="7102" addr="0x7f99f1e73bf0" />
-                                        <attribute name="name" value="ControlTextBox" id="7103" addr="0x7f99f1de6c90" />
-                                        <attribute name="csymtab" value="0x7f99f1e73bb0" id="7104" addr="0x7f99f1e73bb0" />
-                                        <attribute name="symtab" value="0x7f99f1e73b70" id="7105" addr="0x7f99f1e73b70" />
+                                <typescopesitem id="7100" addr="0x7fca469c1b90" >
+                                    <attributelist id="7101" addr="0x7fca469c1b90" >
+                                        <attribute name="inherit" value="0x7fca469c1bf0" id="7102" addr="0x7fca469c1bf0" />
+                                        <attribute name="name" value="ControlTextBox" id="7103" addr="0x7fca46934c90" />
+                                        <attribute name="csymtab" value="0x7fca469c1bb0" id="7104" addr="0x7fca469c1bb0" />
+                                        <attribute name="symtab" value="0x7fca469c1b70" id="7105" addr="0x7fca469c1b70" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <access id="7106" addr="0x7f99f1e73b10" >
-                            <attributelist id="7107" addr="0x7f99f1e73b10" >
-                                <attribute name="kind" value="public" id="7108" addr="0x7f99f1de6c90" />
+                        <access id="7106" addr="0x7fca469c1b10" >
+                            <attributelist id="7107" addr="0x7fca469c1b10" >
+                                <attribute name="kind" value="public" id="7108" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="7109" addr="0x7f99f1e744b0" >
-                            <attributelist id="7110" addr="0x7f99f1e744b0" >
-                                <attribute name="name" value="ControlTextBox" id="7111" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="7112" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e73b90" id="7113" addr="0x7f99f1e73b90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e74850" id="7114" addr="0x7f99f1e74850" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e74850" id="7115" addr="0x7f99f1e74850" />
-                                <attribute name="sym_name" value="ControlTextBox" id="7116" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char)." id="7117" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="7118" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e744b0" id="7119" addr="0x7f99f1e744b0" />
-                                <parmlist id="7120" addr="0x7f99f1e73d50" >
+                        <constructor id="7109" addr="0x7fca469c24b0" >
+                            <attributelist id="7110" addr="0x7fca469c24b0" >
+                                <attribute name="name" value="ControlTextBox" id="7111" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="7112" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c1b90" id="7113" addr="0x7fca469c1b90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469c2850" id="7114" addr="0x7fca469c2850" />
+                                <attribute name="csym_nextSibling" value="0x7fca469c2850" id="7115" addr="0x7fca469c2850" />
+                                <attribute name="sym_name" value="ControlTextBox" id="7116" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char)." id="7117" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="7118" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469c24b0" id="7119" addr="0x7fca469c24b0" />
+                                <parmlist id="7120" addr="0x7fca469c1d50" >
                                     <parm id="7121">
-                                        <attributelist id="7122" addr="0x7f99f1e73d50" >
-                                            <attribute name="name" value="x" id="7123" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7124" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7122" addr="0x7fca469c1d50" >
+                                            <attribute name="name" value="x" id="7123" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7124" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7125">
-                                        <attributelist id="7126" addr="0x7f99f1e73e70" >
-                                            <attribute name="name" value="y" id="7127" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7128" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7126" addr="0x7fca469c1e70" >
+                                            <attribute name="name" value="y" id="7127" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7128" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7129">
-                                        <attributelist id="7130" addr="0x7f99f1e73f90" >
-                                            <attribute name="name" value="width" id="7131" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7132" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7130" addr="0x7fca469c1f90" >
+                                            <attribute name="name" value="width" id="7131" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7132" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7133">
-                                        <attributelist id="7134" addr="0x7f99f1e740b0" >
-                                            <attribute name="name" value="height" id="7135" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7136" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7134" addr="0x7fca469c20b0" >
+                                            <attribute name="name" value="height" id="7135" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7136" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7137">
-                                        <attributelist id="7138" addr="0x7f99f1e74250" >
-                                            <attribute name="name" value="font" id="7139" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="7140" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="7141" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7138" addr="0x7fca469c2250" >
+                                            <attribute name="name" value="font" id="7139" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="7140" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="7141" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7142">
-                                        <attributelist id="7143" addr="0x7f99f1e743f0" >
-                                            <attribute name="name" value="textColor" id="7144" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="7145" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="7146" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7143" addr="0x7fca469c23f0" >
+                                            <attribute name="name" value="textColor" id="7144" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="7145" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="7146" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_0" id="7147" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="7148" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="7147" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="7148" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="7149" addr="0x7f99f1e74850" >
-                            <attributelist id="7150" addr="0x7f99f1e74850" >
-                                <attribute name="name" value="ControlTextBox" id="7151" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="7152" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e73b90" id="7153" addr="0x7f99f1e73b90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e74b50" id="7154" addr="0x7f99f1e74b50" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e744b0" id="7155" addr="0x7f99f1e744b0" />
-                                <attribute name="sym_name" value="ControlTextBox" id="7156" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e74b50" id="7157" addr="0x7f99f1e74b50" />
-                                <attribute name="defaultargs" value="0x7f99f1e744b0" id="7158" addr="0x7f99f1e744b0" />
-                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char)." id="7159" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="7160" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e744b0" id="7161" addr="0x7f99f1e744b0" />
-                                <parmlist id="7162" addr="0x7f99f1e74550" >
+                        <constructor id="7149" addr="0x7fca469c2850" >
+                            <attributelist id="7150" addr="0x7fca469c2850" >
+                                <attribute name="name" value="ControlTextBox" id="7151" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="7152" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c1b90" id="7153" addr="0x7fca469c1b90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469c2b50" id="7154" addr="0x7fca469c2b50" />
+                                <attribute name="sym_previousSibling" value="0x7fca469c24b0" id="7155" addr="0x7fca469c24b0" />
+                                <attribute name="sym_name" value="ControlTextBox" id="7156" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469c2b50" id="7157" addr="0x7fca469c2b50" />
+                                <attribute name="defaultargs" value="0x7fca469c24b0" id="7158" addr="0x7fca469c24b0" />
+                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char)." id="7159" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="7160" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469c24b0" id="7161" addr="0x7fca469c24b0" />
+                                <parmlist id="7162" addr="0x7fca469c2550" >
                                     <parm id="7163">
-                                        <attributelist id="7164" addr="0x7f99f1e74550" >
-                                            <attribute name="name" value="x" id="7165" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7166" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7164" addr="0x7fca469c2550" >
+                                            <attribute name="name" value="x" id="7165" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7166" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7167">
-                                        <attributelist id="7168" addr="0x7f99f1e74610" >
-                                            <attribute name="name" value="y" id="7169" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7170" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7168" addr="0x7fca469c2610" >
+                                            <attribute name="name" value="y" id="7169" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7170" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7171">
-                                        <attributelist id="7172" addr="0x7f99f1e74690" >
-                                            <attribute name="name" value="width" id="7173" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7174" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7172" addr="0x7fca469c2690" >
+                                            <attribute name="name" value="width" id="7173" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7174" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7175">
-                                        <attributelist id="7176" addr="0x7f99f1e74710" >
-                                            <attribute name="name" value="height" id="7177" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7178" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7176" addr="0x7fca469c2710" >
+                                            <attribute name="name" value="height" id="7177" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7178" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7179">
-                                        <attributelist id="7180" addr="0x7f99f1e74790" >
-                                            <attribute name="name" value="font" id="7181" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="7182" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="7183" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7180" addr="0x7fca469c2790" >
+                                            <attribute name="name" value="font" id="7181" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="7182" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="7183" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_1" id="7184" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="7185" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="7184" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="7185" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="7186" addr="0x7f99f1e74b50" >
-                            <attributelist id="7187" addr="0x7f99f1e74b50" >
-                                <attribute name="name" value="ControlTextBox" id="7188" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="7189" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e73b90" id="7190" addr="0x7f99f1e73b90" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e74850" id="7191" addr="0x7f99f1e74850" />
-                                <attribute name="sym_name" value="ControlTextBox" id="7192" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e744b0" id="7193" addr="0x7f99f1e744b0" />
-                                <attribute name="decl" value="f(long,long,long,long)." id="7194" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="7195" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e744b0" id="7196" addr="0x7f99f1e744b0" />
-                                <parmlist id="7197" addr="0x7f99f1e748f0" >
+                        <constructor id="7186" addr="0x7fca469c2b50" >
+                            <attributelist id="7187" addr="0x7fca469c2b50" >
+                                <attribute name="name" value="ControlTextBox" id="7188" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="7189" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c1b90" id="7190" addr="0x7fca469c1b90" />
+                                <attribute name="sym_previousSibling" value="0x7fca469c2850" id="7191" addr="0x7fca469c2850" />
+                                <attribute name="sym_name" value="ControlTextBox" id="7192" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469c24b0" id="7193" addr="0x7fca469c24b0" />
+                                <attribute name="decl" value="f(long,long,long,long)." id="7194" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="7195" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469c24b0" id="7196" addr="0x7fca469c24b0" />
+                                <parmlist id="7197" addr="0x7fca469c28f0" >
                                     <parm id="7198">
-                                        <attributelist id="7199" addr="0x7f99f1e748f0" >
-                                            <attribute name="name" value="x" id="7200" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7201" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7199" addr="0x7fca469c28f0" >
+                                            <attribute name="name" value="x" id="7200" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7201" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7202">
-                                        <attributelist id="7203" addr="0x7f99f1e749b0" >
-                                            <attribute name="name" value="y" id="7204" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7205" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7203" addr="0x7fca469c29b0" >
+                                            <attribute name="name" value="y" id="7204" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7205" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7206">
-                                        <attributelist id="7207" addr="0x7f99f1e74a30" >
-                                            <attribute name="name" value="width" id="7208" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7209" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7207" addr="0x7fca469c2a30" >
+                                            <attribute name="name" value="width" id="7208" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7209" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7210">
-                                        <attributelist id="7211" addr="0x7f99f1e74ab0" >
-                                            <attribute name="name" value="height" id="7212" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7213" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7211" addr="0x7fca469c2ab0" >
+                                            <attribute name="name" value="height" id="7212" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7213" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_2" id="7214" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="7215" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_2" id="7214" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="7215" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <cdecl id="7216" addr="0x7f99f1e74e30" >
-                            <attributelist id="7217" addr="0x7f99f1e74e30" >
-                                <attribute name="name" value="setText" id="7218" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="7219" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e73b90" id="7220" addr="0x7f99f1e73b90" />
-                                <attribute name="kind" value="function" id="7221" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setText" id="7222" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="7223" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="7224" addr="0x7f99f1de6c90" />
-                                <parmlist id="7225" addr="0x7f99f1e74d70" >
+                        <cdecl id="7216" addr="0x7fca469c2e30" >
+                            <attributelist id="7217" addr="0x7fca469c2e30" >
+                                <attribute name="name" value="setText" id="7218" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="7219" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c1b90" id="7220" addr="0x7fca469c1b90" />
+                                <attribute name="kind" value="function" id="7221" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setText" id="7222" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="7223" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="7224" addr="0x7fca46934c90" />
+                                <parmlist id="7225" addr="0x7fca469c2d70" >
                                     <parm id="7226">
-                                        <attributelist id="7227" addr="0x7f99f1e74d70" >
-                                            <attribute name="name" value="text" id="7228" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="7229" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                    </parm >
-                                </parmlist >
-                                <attribute name="type" value="void" id="7230" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="7231" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="7232" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="7233" addr="0x7f99f1e75030" >
-                            <attributelist id="7234" addr="0x7f99f1e75030" >
-                                <attribute name="name" value="getText" id="7235" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="7236" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e73b90" id="7237" addr="0x7f99f1e73b90" />
-                                <attribute name="kind" value="function" id="7238" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getText" id="7239" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="7240" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="7241" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="XBMCAddon::String" id="7242" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="7243" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="7244" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="7245" addr="0x7f99f1e75210" >
-                            <attributelist id="7246" addr="0x7f99f1e75210" >
-                                <attribute name="name" value="reset" id="7247" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="7248" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e73b90" id="7249" addr="0x7f99f1e73b90" />
-                                <attribute name="kind" value="function" id="7250" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="reset" id="7251" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="7252" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="7253" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="void" id="7254" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="7255" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="7256" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="7257" addr="0x7f99f1e75510" >
-                            <attributelist id="7258" addr="0x7f99f1e75510" >
-                                <attribute name="name" value="scroll" id="7259" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="7260" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e73b90" id="7261" addr="0x7f99f1e73b90" />
-                                <attribute name="kind" value="function" id="7262" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="scroll" id="7263" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(long)." id="7264" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="7265" addr="0x7f99f1de6c90" />
-                                <parmlist id="7266" addr="0x7f99f1e75450" >
+                                        <attributelist id="7227" addr="0x7fca469c2d70" >
+                                            <attribute name="name" value="text" id="7228" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="7229" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                    </parm >
+                                </parmlist >
+                                <attribute name="type" value="void" id="7230" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="7231" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="7232" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="7233" addr="0x7fca469c3030" >
+                            <attributelist id="7234" addr="0x7fca469c3030" >
+                                <attribute name="name" value="getText" id="7235" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="7236" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c1b90" id="7237" addr="0x7fca469c1b90" />
+                                <attribute name="kind" value="function" id="7238" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getText" id="7239" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="7240" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="7241" addr="0x7fca46934c90" />
+                                <attribute name="type" value="XBMCAddon::String" id="7242" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="7243" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="7244" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="7245" addr="0x7fca469c3210" >
+                            <attributelist id="7246" addr="0x7fca469c3210" >
+                                <attribute name="name" value="reset" id="7247" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="7248" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c1b90" id="7249" addr="0x7fca469c1b90" />
+                                <attribute name="kind" value="function" id="7250" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="reset" id="7251" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="7252" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="7253" addr="0x7fca46934c90" />
+                                <attribute name="type" value="void" id="7254" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="7255" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="7256" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="7257" addr="0x7fca469c3510" >
+                            <attributelist id="7258" addr="0x7fca469c3510" >
+                                <attribute name="name" value="scroll" id="7259" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="7260" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c1b90" id="7261" addr="0x7fca469c1b90" />
+                                <attribute name="kind" value="function" id="7262" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="scroll" id="7263" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(long)." id="7264" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="7265" addr="0x7fca46934c90" />
+                                <parmlist id="7266" addr="0x7fca469c3450" >
                                     <parm id="7267">
-                                        <attributelist id="7268" addr="0x7f99f1e75450" >
-                                            <attribute name="name" value="id" id="7269" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7270" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7268" addr="0x7fca469c3450" >
+                                            <attribute name="name" value="id" id="7269" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7270" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="7271" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="7272" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="7273" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="7271" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="7272" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="7273" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="7274" addr="0x7f99f1e75a50" >
-                            <attributelist id="7275" addr="0x7f99f1e75a50" >
-                                <attribute name="name" value="autoScroll" id="7276" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="7277" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e73b90" id="7278" addr="0x7f99f1e73b90" />
-                                <attribute name="kind" value="function" id="7279" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="autoScroll" id="7280" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(int,int,int)." id="7281" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="7282" addr="0x7f99f1de6c90" />
-                                <parmlist id="7283" addr="0x7f99f1e75750" >
+                        <cdecl id="7274" addr="0x7fca469c3a50" >
+                            <attributelist id="7275" addr="0x7fca469c3a50" >
+                                <attribute name="name" value="autoScroll" id="7276" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="7277" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c1b90" id="7278" addr="0x7fca469c1b90" />
+                                <attribute name="kind" value="function" id="7279" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="autoScroll" id="7280" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(int,int,int)." id="7281" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="7282" addr="0x7fca46934c90" />
+                                <parmlist id="7283" addr="0x7fca469c3750" >
                                     <parm id="7284">
-                                        <attributelist id="7285" addr="0x7f99f1e75750" >
-                                            <attribute name="name" value="delay" id="7286" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="7287" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7285" addr="0x7fca469c3750" >
+                                            <attribute name="name" value="delay" id="7286" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="7287" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7288">
-                                        <attributelist id="7289" addr="0x7f99f1e75870" >
-                                            <attribute name="name" value="time" id="7290" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="7291" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7289" addr="0x7fca469c3870" >
+                                            <attribute name="name" value="time" id="7290" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="7291" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7292">
-                                        <attributelist id="7293" addr="0x7f99f1e75990" >
-                                            <attribute name="name" value="repeat" id="7294" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="7295" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7293" addr="0x7fca469c3990" >
+                                            <attribute name="name" value="repeat" id="7294" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="7295" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="7296" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="7297" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="7298" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="7296" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="7297" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="7298" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
                     </class >
-                    <class id="7299" addr="0x7f99f1e75d30" >
-                        <attributelist id="7300" addr="0x7f99f1e75d30" >
-                            <attribute name="name" value="XBMCAddon::xbmcgui::ControlImage" id="7301" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="7302" addr="0x7f99f1e40fb0" />
-                            <attribute name="symtab" value="0x7f99f1e75e70" id="7303" addr="0x7f99f1e75e70" />
-                            <attribute name="allows_typedef" value="1" id="7304" addr="0x7f99f1de6c90" />
-                            <attribute name="typepass_visit" value="1" id="7305" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_visit" value="1" id="7306" addr="0x7f99f1de6c90" />
-                            <attribute name="kind" value="class" id="7307" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_name" value="ControlImage" id="7308" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_has_constructor" value="1" id="7309" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_public_constructor" value="1" id="7310" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_copy_constructor" value="1" id="7311" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_default_destructor" value="1" id="7312" addr="0x7f99f1de6c90" />
-                            <attribute name="privatebaselist" value="0x7f99f1e75d10" id="7313" addr="0x7f99f1e75d10" />
-                            <attribute name="protectedbaselist" value="0x7f99f1e75cf0" id="7314" addr="0x7f99f1e75cf0" />
-                            <baselist id="7315" addr="0x7f99f1e75cd0" >
-                                <base name="Control" id="7316" addr="0x7f99f1e75c50" />
+                    <class id="7299" addr="0x7fca469c3d30" >
+                        <attributelist id="7300" addr="0x7fca469c3d30" >
+                            <attribute name="name" value="XBMCAddon::xbmcgui::ControlImage" id="7301" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="7302" addr="0x7fca4698efb0" />
+                            <attribute name="symtab" value="0x7fca469c3e70" id="7303" addr="0x7fca469c3e70" />
+                            <attribute name="allows_typedef" value="1" id="7304" addr="0x7fca46934c90" />
+                            <attribute name="typepass_visit" value="1" id="7305" addr="0x7fca46934c90" />
+                            <attribute name="allocate_visit" value="1" id="7306" addr="0x7fca46934c90" />
+                            <attribute name="kind" value="class" id="7307" addr="0x7fca46934c90" />
+                            <attribute name="sym_name" value="ControlImage" id="7308" addr="0x7fca46934c90" />
+                            <attribute name="allocate_has_constructor" value="1" id="7309" addr="0x7fca46934c90" />
+                            <attribute name="allocate_public_constructor" value="1" id="7310" addr="0x7fca46934c90" />
+                            <attribute name="allocate_copy_constructor" value="1" id="7311" addr="0x7fca46934c90" />
+                            <attribute name="allocate_default_destructor" value="1" id="7312" addr="0x7fca46934c90" />
+                            <attribute name="privatebaselist" value="0x7fca469c3d10" id="7313" addr="0x7fca469c3d10" />
+                            <attribute name="protectedbaselist" value="0x7fca469c3cf0" id="7314" addr="0x7fca469c3cf0" />
+                            <baselist id="7315" addr="0x7fca469c3cd0" >
+                                <base name="Control" id="7316" addr="0x7fca469c3c50" />
                             </baselist >
-                            <attribute name="module" value="xbmcgui" id="7317" addr="0x7f99f1e402f0" />
-                            <attribute name="bases" value="0x7f99f1ddb930" id="7318" addr="0x7f99f1ddb930" />
-                            <attribute name="allbases" value="0x7f99f1ddbbd0" id="7319" addr="0x7f99f1ddbbd0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="7320" addr="0x7f99f1de6c90" />
-                            <typescope id="7321" addr="0x7f99f1ddb8b0" >
-                                <attributelist id="7322" addr="0x7f99f1ddb8b0" >
-                                    <attribute name="inherit" value="0x7f99f1ddb9b0" id="7323" addr="0x7f99f1ddb9b0" />
-                                    <attribute name="name" value="ControlImage" id="7324" addr="0x7f99f1de6c90" />
-                                    <typetab id="7325" addr="0x7f99f1ddb8d0" >
-                                        <attributelist id="7326" addr="0x7f99f1ddb8d0" >
+                            <attribute name="module" value="xbmcgui" id="7317" addr="0x7fca4698e2f0" />
+                            <attribute name="bases" value="0x7fca46929930" id="7318" addr="0x7fca46929930" />
+                            <attribute name="allbases" value="0x7fca46929bd0" id="7319" addr="0x7fca46929bd0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="7320" addr="0x7fca46934c90" />
+                            <typescope id="7321" addr="0x7fca469298b0" >
+                                <attributelist id="7322" addr="0x7fca469298b0" >
+                                    <attribute name="inherit" value="0x7fca469299b0" id="7323" addr="0x7fca469299b0" />
+                                    <attribute name="name" value="ControlImage" id="7324" addr="0x7fca46934c90" />
+                                    <typetab id="7325" addr="0x7fca469298d0" >
+                                        <attributelist id="7326" addr="0x7fca469298d0" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f99f1dd2150" id="7327" addr="0x7f99f1dd2150" />
-                                    <attribute name="qname" value="XBMCAddon::xbmcgui::ControlImage" id="7328" addr="0x7f99f1de6c90" />
-                                    <attribute name="symtab" value="0x7f99f1e75e70" id="7329" addr="0x7f99f1e75e70" />
+                                    <attribute name="parent" value="0x7fca46920150" id="7327" addr="0x7fca46920150" />
+                                    <attribute name="qname" value="XBMCAddon::xbmcgui::ControlImage" id="7328" addr="0x7fca46934c90" />
+                                    <attribute name="symtab" value="0x7fca469c3e70" id="7329" addr="0x7fca469c3e70" />
                                 </attributelist >
-                                <typescopesitem id="7330" addr="0x7f99f1ddb9b0" >
-                                    <attributelist id="7331" addr="0x7f99f1ddb9b0" >
+                                <typescopesitem id="7330" addr="0x7fca469299b0" >
+                                    <attributelist id="7331" addr="0x7fca469299b0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="7332" addr="0x7f99f1ddb810" >
-                                    <attributelist id="7333" addr="0x7f99f1ddb810" >
+                                <typescopesitem id="7332" addr="0x7fca46929810" >
+                                    <attributelist id="7333" addr="0x7fca46929810" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="7334" addr="0x7f99f1ddb8d0" >
-                                    <attributelist id="7335" addr="0x7f99f1ddb8d0" >
+                                <typescopesitem id="7334" addr="0x7fca469298d0" >
+                                    <attributelist id="7335" addr="0x7fca469298d0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="7336" addr="0x7f99f1dd2150" >
-                                    <attributelist id="7337" addr="0x7f99f1dd2150" >
-                                        <attribute name="name" value="xbmcgui" id="7338" addr="0x7f99f1de6c90" />
-                                        <typetab id="7339" addr="0x7f99f1dd2170" >
-                                            <attributelist id="7340" addr="0x7f99f1dd2170" >
-                                                <attribute name="InterceptorBase" value="InterceptorBase" id="7341" addr="0x7f99f1de6c90" />
-                                                <attribute name="Dialog" value="Dialog" id="7342" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="7343" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="7344" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlTextBox" value="ControlTextBox" id="7345" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="7346" addr="0x7f99f1de6c90" />
-                                                <attribute name="Window" value="Window" id="7347" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="7348" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlList" value="ControlList" id="7349" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="7350" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlImage" value="ControlImage" id="7351" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlButton" value="ControlButton" id="7352" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlGroup" value="ControlGroup" id="7353" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogBusy" value="DialogBusy" id="7354" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="7355" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSpin" value="ControlSpin" id="7356" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlEdit" value="ControlEdit" id="7357" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="7358" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="7359" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlLabel" value="ControlLabel" id="7360" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlProgress" value="ControlProgress" id="7361" addr="0x7f99f1de6c90" />
-                                                <attribute name="Control" value="Control" id="7362" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSlider" value="ControlSlider" id="7363" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgress" value="DialogProgress" id="7364" addr="0x7f99f1de6c90" />
-                                                <attribute name="Action" value="Action" id="7365" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowDialog" value="WindowDialog" id="7366" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXML" value="WindowXML" id="7367" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItem" value="ListItem" id="7368" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="7369" addr="0x7f99f1de6c90" />
+                                <typescopesitem id="7336" addr="0x7fca46920150" >
+                                    <attributelist id="7337" addr="0x7fca46920150" >
+                                        <attribute name="name" value="xbmcgui" id="7338" addr="0x7fca46934c90" />
+                                        <typetab id="7339" addr="0x7fca46920170" >
+                                            <attributelist id="7340" addr="0x7fca46920170" >
+                                                <attribute name="InterceptorBase" value="InterceptorBase" id="7341" addr="0x7fca46934c90" />
+                                                <attribute name="Dialog" value="Dialog" id="7342" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="7343" addr="0x7fca46934c90" />
+                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="7344" addr="0x7fca46934c90" />
+                                                <attribute name="ControlTextBox" value="ControlTextBox" id="7345" addr="0x7fca46934c90" />
+                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="7346" addr="0x7fca46934c90" />
+                                                <attribute name="Window" value="Window" id="7347" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="7348" addr="0x7fca46934c90" />
+                                                <attribute name="ControlList" value="ControlList" id="7349" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="7350" addr="0x7fca46934c90" />
+                                                <attribute name="ControlImage" value="ControlImage" id="7351" addr="0x7fca46934c90" />
+                                                <attribute name="ControlButton" value="ControlButton" id="7352" addr="0x7fca46934c90" />
+                                                <attribute name="ControlGroup" value="ControlGroup" id="7353" addr="0x7fca46934c90" />
+                                                <attribute name="DialogBusy" value="DialogBusy" id="7354" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="7355" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSpin" value="ControlSpin" id="7356" addr="0x7fca46934c90" />
+                                                <attribute name="ControlEdit" value="ControlEdit" id="7357" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="7358" addr="0x7fca46934c90" />
+                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="7359" addr="0x7fca46934c90" />
+                                                <attribute name="ControlLabel" value="ControlLabel" id="7360" addr="0x7fca46934c90" />
+                                                <attribute name="ControlProgress" value="ControlProgress" id="7361" addr="0x7fca46934c90" />
+                                                <attribute name="Control" value="Control" id="7362" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSlider" value="ControlSlider" id="7363" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgress" value="DialogProgress" id="7364" addr="0x7fca46934c90" />
+                                                <attribute name="Action" value="Action" id="7365" addr="0x7fca46934c90" />
+                                                <attribute name="WindowDialog" value="WindowDialog" id="7366" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXML" value="WindowXML" id="7367" addr="0x7fca46934c90" />
+                                                <attribute name="ListItem" value="ListItem" id="7368" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="7369" addr="0x7fca46934c90" />
                                             </attributelist >
-                                            <typetabsitem id="7370" addr="0x7f99f1de1dd0" >
-                                                <attributelist id="7371" addr="0x7f99f1de1dd0" >
+                                            <typetabsitem id="7370" addr="0x7fca4692fdd0" >
+                                                <attributelist id="7371" addr="0x7fca4692fdd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7372" addr="0x7f99f1dde790" >
-                                                <attributelist id="7373" addr="0x7f99f1dde790" >
+                                            <typetabsitem id="7372" addr="0x7fca4692c790" >
+                                                <attributelist id="7373" addr="0x7fca4692c790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7374" addr="0x7f99f1de3f10" >
-                                                <attributelist id="7375" addr="0x7f99f1de3f10" >
+                                            <typetabsitem id="7374" addr="0x7fca46931f10" >
+                                                <attributelist id="7375" addr="0x7fca46931f10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7376" addr="0x7f99f1dd67b0" >
-                                                <attributelist id="7377" addr="0x7f99f1dd67b0" >
+                                            <typetabsitem id="7376" addr="0x7fca469247b0" >
+                                                <attributelist id="7377" addr="0x7fca469247b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7378" addr="0x7f99f1ddafd0" >
-                                                <attributelist id="7379" addr="0x7f99f1ddafd0" >
+                                            <typetabsitem id="7378" addr="0x7fca46928fd0" >
+                                                <attributelist id="7379" addr="0x7fca46928fd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7380" addr="0x7f99f1ddd430" >
-                                                <attributelist id="7381" addr="0x7f99f1ddd430" >
+                                            <typetabsitem id="7380" addr="0x7fca4692b430" >
+                                                <attributelist id="7381" addr="0x7fca4692b430" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7382" addr="0x7f99f1de2130" >
-                                                <attributelist id="7383" addr="0x7f99f1de2130" >
+                                            <typetabsitem id="7382" addr="0x7fca46930130" >
+                                                <attributelist id="7383" addr="0x7fca46930130" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7384" addr="0x7f99f1dd2f50" >
-                                                <attributelist id="7385" addr="0x7f99f1dd2f50" >
+                                            <typetabsitem id="7384" addr="0x7fca46920f50" >
+                                                <attributelist id="7385" addr="0x7fca46920f50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7386" addr="0x7f99f1dd9650" >
-                                                <attributelist id="7387" addr="0x7f99f1dd9650" >
+                                            <typetabsitem id="7386" addr="0x7fca46927650" >
+                                                <attributelist id="7387" addr="0x7fca46927650" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7388" addr="0x7f99f1de3390" >
-                                                <attributelist id="7389" addr="0x7f99f1de3390" >
+                                            <typetabsitem id="7388" addr="0x7fca46931390" >
+                                                <attributelist id="7389" addr="0x7fca46931390" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7390" addr="0x7f99f1ddb7b0" >
-                                                <attributelist id="7391" addr="0x7f99f1ddb7b0" >
+                                            <typetabsitem id="7390" addr="0x7fca469297b0" >
+                                                <attributelist id="7391" addr="0x7fca469297b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7392" addr="0x7f99f1ddc4b0" >
-                                                <attributelist id="7393" addr="0x7f99f1ddc4b0" >
+                                            <typetabsitem id="7392" addr="0x7fca4692a4b0" >
+                                                <attributelist id="7393" addr="0x7fca4692a4b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7394" addr="0x7f99f1ddcf90" >
-                                                <attributelist id="7395" addr="0x7f99f1ddcf90" >
+                                            <typetabsitem id="7394" addr="0x7fca4692af90" >
+                                                <attributelist id="7395" addr="0x7fca4692af90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7396" addr="0x7f99f1de11b0" >
-                                                <attributelist id="7397" addr="0x7f99f1de11b0" >
+                                            <typetabsitem id="7396" addr="0x7fca4692f1b0" >
+                                                <attributelist id="7397" addr="0x7fca4692f1b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7398" addr="0x7f99f1de15b0" >
-                                                <attributelist id="7399" addr="0x7f99f1de15b0" >
+                                            <typetabsitem id="7398" addr="0x7fca4692f5b0" >
+                                                <attributelist id="7399" addr="0x7fca4692f5b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7400" addr="0x7f99f1dd77f0" >
-                                                <attributelist id="7401" addr="0x7f99f1dd77f0" >
+                                            <typetabsitem id="7400" addr="0x7fca469257f0" >
+                                                <attributelist id="7401" addr="0x7fca469257f0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7402" addr="0x7f99f1dd8b30" >
-                                                <attributelist id="7403" addr="0x7f99f1dd8b30" >
+                                            <typetabsitem id="7402" addr="0x7fca46926b30" >
+                                                <attributelist id="7403" addr="0x7fca46926b30" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7404" addr="0x7f99f1dd2c50" >
-                                                <attributelist id="7405" addr="0x7f99f1dd2c50" >
+                                            <typetabsitem id="7404" addr="0x7fca46920c50" >
+                                                <attributelist id="7405" addr="0x7fca46920c50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7406" addr="0x7f99f1dda790" >
-                                                <attributelist id="7407" addr="0x7f99f1dda790" >
+                                            <typetabsitem id="7406" addr="0x7fca46928790" >
+                                                <attributelist id="7407" addr="0x7fca46928790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7408" addr="0x7f99f1dd8030" >
-                                                <attributelist id="7409" addr="0x7f99f1dd8030" >
+                                            <typetabsitem id="7408" addr="0x7fca46926030" >
+                                                <attributelist id="7409" addr="0x7fca46926030" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7410" addr="0x7f99f1ddbe10" >
-                                                <attributelist id="7411" addr="0x7f99f1ddbe10" >
+                                            <typetabsitem id="7410" addr="0x7fca46929e10" >
+                                                <attributelist id="7411" addr="0x7fca46929e10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7412" addr="0x7f99f1dd6b10" >
-                                                <attributelist id="7413" addr="0x7f99f1dd6b10" >
+                                            <typetabsitem id="7412" addr="0x7fca46924b10" >
+                                                <attributelist id="7413" addr="0x7fca46924b10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7414" addr="0x7f99f1dddf90" >
-                                                <attributelist id="7415" addr="0x7f99f1dddf90" >
+                                            <typetabsitem id="7414" addr="0x7fca4692bf90" >
+                                                <attributelist id="7415" addr="0x7fca4692bf90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7416" addr="0x7f99f1de0530" >
-                                                <attributelist id="7417" addr="0x7f99f1de0530" >
+                                            <typetabsitem id="7416" addr="0x7fca4692e530" >
+                                                <attributelist id="7417" addr="0x7fca4692e530" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7418" addr="0x7f99f1de1e50" >
-                                                <attributelist id="7419" addr="0x7f99f1de1e50" >
+                                            <typetabsitem id="7418" addr="0x7fca4692fe50" >
+                                                <attributelist id="7419" addr="0x7fca4692fe50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7420" addr="0x7f99f1de2d90" >
-                                                <attributelist id="7421" addr="0x7f99f1de2d90" >
+                                            <typetabsitem id="7420" addr="0x7fca46930d90" >
+                                                <attributelist id="7421" addr="0x7fca46930d90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7422" addr="0x7f99f1de3410" >
-                                                <attributelist id="7423" addr="0x7f99f1de3410" >
+                                            <typetabsitem id="7422" addr="0x7fca46931410" >
+                                                <attributelist id="7423" addr="0x7fca46931410" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7424" addr="0x7f99f1dd3590" >
-                                                <attributelist id="7425" addr="0x7f99f1dd3590" >
+                                            <typetabsitem id="7424" addr="0x7fca46921590" >
+                                                <attributelist id="7425" addr="0x7fca46921590" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7426" addr="0x7f99f1dd3390" >
-                                                <attributelist id="7427" addr="0x7f99f1dd3390" >
+                                            <typetabsitem id="7426" addr="0x7fca46921390" >
+                                                <attributelist id="7427" addr="0x7fca46921390" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7f99f1dd1d70" id="7428" addr="0x7f99f1dd1d70" />
-                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="7429" addr="0x7f99f1de6c90" />
-                                        <attribute name="symtab" value="0x7f99f1e40fb0" id="7430" addr="0x7f99f1e40fb0" />
+                                        <attribute name="parent" value="0x7fca4691fd70" id="7428" addr="0x7fca4691fd70" />
+                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="7429" addr="0x7fca46934c90" />
+                                        <attribute name="symtab" value="0x7fca4698efb0" id="7430" addr="0x7fca4698efb0" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="7431" addr="0x7f99f1ddb8f0" >
-                                    <attributelist id="7432" addr="0x7f99f1ddb8f0" >
+                                <typescopesitem id="7431" addr="0x7fca469298f0" >
+                                    <attributelist id="7432" addr="0x7fca469298f0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="7433" addr="0x7f99f1e75e70" >
-                                    <attributelist id="7434" addr="0x7f99f1e75e70" >
-                                        <attribute name="inherit" value="0x7f99f1e75ed0" id="7435" addr="0x7f99f1e75ed0" />
-                                        <attribute name="name" value="ControlImage" id="7436" addr="0x7f99f1de6c90" />
-                                        <attribute name="csymtab" value="0x7f99f1e75e90" id="7437" addr="0x7f99f1e75e90" />
-                                        <attribute name="symtab" value="0x7f99f1e75e50" id="7438" addr="0x7f99f1e75e50" />
+                                <typescopesitem id="7433" addr="0x7fca469c3e70" >
+                                    <attributelist id="7434" addr="0x7fca469c3e70" >
+                                        <attribute name="inherit" value="0x7fca469c3ed0" id="7435" addr="0x7fca469c3ed0" />
+                                        <attribute name="name" value="ControlImage" id="7436" addr="0x7fca46934c90" />
+                                        <attribute name="csymtab" value="0x7fca469c3e90" id="7437" addr="0x7fca469c3e90" />
+                                        <attribute name="symtab" value="0x7fca469c3e50" id="7438" addr="0x7fca469c3e50" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <access id="7439" addr="0x7f99f1e75df0" >
-                            <attributelist id="7440" addr="0x7f99f1e75df0" >
-                                <attribute name="kind" value="public" id="7441" addr="0x7f99f1de6c90" />
+                        <access id="7439" addr="0x7fca469c3df0" >
+                            <attributelist id="7440" addr="0x7fca469c3df0" >
+                                <attribute name="kind" value="public" id="7441" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="7442" addr="0x7f99f1e76890" >
-                            <attributelist id="7443" addr="0x7f99f1e76890" >
-                                <attribute name="name" value="ControlImage" id="7444" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="7445" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e75e70" id="7446" addr="0x7f99f1e75e70" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e76cb0" id="7447" addr="0x7f99f1e76cb0" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e76cb0" id="7448" addr="0x7f99f1e76cb0" />
-                                <attribute name="sym_name" value="ControlImage" id="7449" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,long,p.q(const).char)." id="7450" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="7451" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e76890" id="7452" addr="0x7f99f1e76890" />
-                                <parmlist id="7453" addr="0x7f99f1e76030" >
+                        <constructor id="7442" addr="0x7fca469c4890" >
+                            <attributelist id="7443" addr="0x7fca469c4890" >
+                                <attribute name="name" value="ControlImage" id="7444" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="7445" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c3e70" id="7446" addr="0x7fca469c3e70" />
+                                <attribute name="sym_nextSibling" value="0x7fca469c4cb0" id="7447" addr="0x7fca469c4cb0" />
+                                <attribute name="csym_nextSibling" value="0x7fca469c4cb0" id="7448" addr="0x7fca469c4cb0" />
+                                <attribute name="sym_name" value="ControlImage" id="7449" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,long,p.q(const).char)." id="7450" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="7451" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469c4890" id="7452" addr="0x7fca469c4890" />
+                                <parmlist id="7453" addr="0x7fca469c4030" >
                                     <parm id="7454">
-                                        <attributelist id="7455" addr="0x7f99f1e76030" >
-                                            <attribute name="name" value="x" id="7456" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7457" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7455" addr="0x7fca469c4030" >
+                                            <attribute name="name" value="x" id="7456" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7457" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7458">
-                                        <attributelist id="7459" addr="0x7f99f1e76150" >
-                                            <attribute name="name" value="y" id="7460" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7461" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7459" addr="0x7fca469c4150" >
+                                            <attribute name="name" value="y" id="7460" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7461" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7462">
-                                        <attributelist id="7463" addr="0x7f99f1e76270" >
-                                            <attribute name="name" value="width" id="7464" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7465" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7463" addr="0x7fca469c4270" >
+                                            <attribute name="name" value="width" id="7464" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7465" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7466">
-                                        <attributelist id="7467" addr="0x7f99f1e76390" >
-                                            <attribute name="name" value="height" id="7468" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7469" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7467" addr="0x7fca469c4390" >
+                                            <attribute name="name" value="height" id="7468" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7469" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7470">
-                                        <attributelist id="7471" addr="0x7f99f1e764d0" >
-                                            <attribute name="name" value="filename" id="7472" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="7473" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7471" addr="0x7fca469c44d0" >
+                                            <attribute name="name" value="filename" id="7472" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="7473" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7474">
-                                        <attributelist id="7475" addr="0x7f99f1e76630" >
-                                            <attribute name="name" value="aspectRatio" id="7476" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="0" id="7477" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7478" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7475" addr="0x7fca469c4630" >
+                                            <attribute name="name" value="aspectRatio" id="7476" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="0" id="7477" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7478" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7479">
-                                        <attributelist id="7480" addr="0x7f99f1e767d0" >
-                                            <attribute name="name" value="colorDiffuse" id="7481" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="7482" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="7483" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7480" addr="0x7fca469c47d0" >
+                                            <attribute name="name" value="colorDiffuse" id="7481" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="7482" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="7483" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_0" id="7484" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="7485" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="7484" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="7485" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="7486" addr="0x7f99f1e76cb0" >
-                            <attributelist id="7487" addr="0x7f99f1e76cb0" >
-                                <attribute name="name" value="ControlImage" id="7488" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="7489" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e75e70" id="7490" addr="0x7f99f1e75e70" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e77030" id="7491" addr="0x7f99f1e77030" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e76890" id="7492" addr="0x7f99f1e76890" />
-                                <attribute name="sym_name" value="ControlImage" id="7493" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e77030" id="7494" addr="0x7f99f1e77030" />
-                                <attribute name="defaultargs" value="0x7f99f1e76890" id="7495" addr="0x7f99f1e76890" />
-                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,long)." id="7496" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="7497" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e76890" id="7498" addr="0x7f99f1e76890" />
-                                <parmlist id="7499" addr="0x7f99f1e76930" >
+                        <constructor id="7486" addr="0x7fca469c4cb0" >
+                            <attributelist id="7487" addr="0x7fca469c4cb0" >
+                                <attribute name="name" value="ControlImage" id="7488" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="7489" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c3e70" id="7490" addr="0x7fca469c3e70" />
+                                <attribute name="csym_nextSibling" value="0x7fca469c5030" id="7491" addr="0x7fca469c5030" />
+                                <attribute name="sym_previousSibling" value="0x7fca469c4890" id="7492" addr="0x7fca469c4890" />
+                                <attribute name="sym_name" value="ControlImage" id="7493" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469c5030" id="7494" addr="0x7fca469c5030" />
+                                <attribute name="defaultargs" value="0x7fca469c4890" id="7495" addr="0x7fca469c4890" />
+                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,long)." id="7496" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="7497" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469c4890" id="7498" addr="0x7fca469c4890" />
+                                <parmlist id="7499" addr="0x7fca469c4930" >
                                     <parm id="7500">
-                                        <attributelist id="7501" addr="0x7f99f1e76930" >
-                                            <attribute name="name" value="x" id="7502" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7503" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7501" addr="0x7fca469c4930" >
+                                            <attribute name="name" value="x" id="7502" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7503" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7504">
-                                        <attributelist id="7505" addr="0x7f99f1e769f0" >
-                                            <attribute name="name" value="y" id="7506" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7507" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7505" addr="0x7fca469c49f0" >
+                                            <attribute name="name" value="y" id="7506" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7507" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7508">
-                                        <attributelist id="7509" addr="0x7f99f1e76a70" >
-                                            <attribute name="name" value="width" id="7510" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7511" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7509" addr="0x7fca469c4a70" >
+                                            <attribute name="name" value="width" id="7510" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7511" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7512">
-                                        <attributelist id="7513" addr="0x7f99f1e76af0" >
-                                            <attribute name="name" value="height" id="7514" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7515" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7513" addr="0x7fca469c4af0" >
+                                            <attribute name="name" value="height" id="7514" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7515" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7516">
-                                        <attributelist id="7517" addr="0x7f99f1e76b70" >
-                                            <attribute name="name" value="filename" id="7518" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="7519" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7517" addr="0x7fca469c4b70" >
+                                            <attribute name="name" value="filename" id="7518" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="7519" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7520">
-                                        <attributelist id="7521" addr="0x7f99f1e76bf0" >
-                                            <attribute name="name" value="aspectRatio" id="7522" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="0" id="7523" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7524" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7521" addr="0x7fca469c4bf0" >
+                                            <attribute name="name" value="aspectRatio" id="7522" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="0" id="7523" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7524" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_1" id="7525" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="7526" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="7525" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="7526" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="7527" addr="0x7f99f1e77030" >
-                            <attributelist id="7528" addr="0x7f99f1e77030" >
-                                <attribute name="name" value="ControlImage" id="7529" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="7530" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e75e70" id="7531" addr="0x7f99f1e75e70" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e76cb0" id="7532" addr="0x7f99f1e76cb0" />
-                                <attribute name="sym_name" value="ControlImage" id="7533" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e76890" id="7534" addr="0x7f99f1e76890" />
-                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char)." id="7535" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="7536" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e76890" id="7537" addr="0x7f99f1e76890" />
-                                <parmlist id="7538" addr="0x7f99f1e76d50" >
+                        <constructor id="7527" addr="0x7fca469c5030" >
+                            <attributelist id="7528" addr="0x7fca469c5030" >
+                                <attribute name="name" value="ControlImage" id="7529" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="7530" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c3e70" id="7531" addr="0x7fca469c3e70" />
+                                <attribute name="sym_previousSibling" value="0x7fca469c4cb0" id="7532" addr="0x7fca469c4cb0" />
+                                <attribute name="sym_name" value="ControlImage" id="7533" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469c4890" id="7534" addr="0x7fca469c4890" />
+                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char)." id="7535" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="7536" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469c4890" id="7537" addr="0x7fca469c4890" />
+                                <parmlist id="7538" addr="0x7fca469c4d50" >
                                     <parm id="7539">
-                                        <attributelist id="7540" addr="0x7f99f1e76d50" >
-                                            <attribute name="name" value="x" id="7541" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7542" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7540" addr="0x7fca469c4d50" >
+                                            <attribute name="name" value="x" id="7541" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7542" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7543">
-                                        <attributelist id="7544" addr="0x7f99f1e76e10" >
-                                            <attribute name="name" value="y" id="7545" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7546" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7544" addr="0x7fca469c4e10" >
+                                            <attribute name="name" value="y" id="7545" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7546" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7547">
-                                        <attributelist id="7548" addr="0x7f99f1e76e90" >
-                                            <attribute name="name" value="width" id="7549" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7550" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7548" addr="0x7fca469c4e90" >
+                                            <attribute name="name" value="width" id="7549" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7550" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7551">
-                                        <attributelist id="7552" addr="0x7f99f1e76f10" >
-                                            <attribute name="name" value="height" id="7553" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7554" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7552" addr="0x7fca469c4f10" >
+                                            <attribute name="name" value="height" id="7553" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7554" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7555">
-                                        <attributelist id="7556" addr="0x7f99f1e76f90" >
-                                            <attribute name="name" value="filename" id="7557" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="7558" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7556" addr="0x7fca469c4f90" >
+                                            <attribute name="name" value="filename" id="7557" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="7558" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_2" id="7559" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="7560" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_2" id="7559" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="7560" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <cdecl id="7561" addr="0x7f99f1e77470" >
-                            <attributelist id="7562" addr="0x7f99f1e77470" >
-                                <attribute name="name" value="setImage" id="7563" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="7564" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e75e70" id="7565" addr="0x7f99f1e75e70" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e77630" id="7566" addr="0x7f99f1e77630" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e77630" id="7567" addr="0x7f99f1e77630" />
-                                <attribute name="kind" value="function" id="7568" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setImage" id="7569" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(p.q(const).char,q(const).bool)." id="7570" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="7571" addr="0x7f99f1de6c90" />
-                                <parmlist id="7572" addr="0x7f99f1e77250" >
+                        <cdecl id="7561" addr="0x7fca469c5470" >
+                            <attributelist id="7562" addr="0x7fca469c5470" >
+                                <attribute name="name" value="setImage" id="7563" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="7564" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c3e70" id="7565" addr="0x7fca469c3e70" />
+                                <attribute name="sym_nextSibling" value="0x7fca469c5630" id="7566" addr="0x7fca469c5630" />
+                                <attribute name="csym_nextSibling" value="0x7fca469c5630" id="7567" addr="0x7fca469c5630" />
+                                <attribute name="kind" value="function" id="7568" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setImage" id="7569" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(p.q(const).char,q(const).bool)." id="7570" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="7571" addr="0x7fca46934c90" />
+                                <parmlist id="7572" addr="0x7fca469c5250" >
                                     <parm id="7573">
-                                        <attributelist id="7574" addr="0x7f99f1e77250" >
-                                            <attribute name="name" value="imageFilename" id="7575" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="7576" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7574" addr="0x7fca469c5250" >
+                                            <attribute name="name" value="imageFilename" id="7575" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="7576" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7577">
-                                        <attributelist id="7578" addr="0x7f99f1e773b0" >
-                                            <attribute name="name" value="useCache" id="7579" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="true" id="7580" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="q(const).bool" id="7581" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7578" addr="0x7fca469c53b0" >
+                                            <attribute name="name" value="useCache" id="7579" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="true" id="7580" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="q(const).bool" id="7581" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overloaded" value="0x7f99f1e77470" id="7582" addr="0x7f99f1e77470" />
-                                <attribute name="type" value="void" id="7583" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="7584" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="7585" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469c5470" id="7582" addr="0x7fca469c5470" />
+                                <attribute name="type" value="void" id="7583" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="7584" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="7585" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="7586" addr="0x7f99f1e77630" >
-                            <attributelist id="7587" addr="0x7f99f1e77630" >
-                                <attribute name="name" value="setImage" id="7588" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="7589" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e75e70" id="7590" addr="0x7f99f1e75e70" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e77470" id="7591" addr="0x7f99f1e77470" />
-                                <attribute name="kind" value="function" id="7592" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setImage" id="7593" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(p.q(const).char)." id="7594" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e77470" id="7595" addr="0x7f99f1e77470" />
-                                <attribute name="access" value="public" id="7596" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e77470" id="7597" addr="0x7f99f1e77470" />
-                                <parmlist id="7598" addr="0x7f99f1e77530" >
+                        <cdecl id="7586" addr="0x7fca469c5630" >
+                            <attributelist id="7587" addr="0x7fca469c5630" >
+                                <attribute name="name" value="setImage" id="7588" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="7589" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c3e70" id="7590" addr="0x7fca469c3e70" />
+                                <attribute name="sym_previousSibling" value="0x7fca469c5470" id="7591" addr="0x7fca469c5470" />
+                                <attribute name="kind" value="function" id="7592" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setImage" id="7593" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(p.q(const).char)." id="7594" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469c5470" id="7595" addr="0x7fca469c5470" />
+                                <attribute name="access" value="public" id="7596" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469c5470" id="7597" addr="0x7fca469c5470" />
+                                <parmlist id="7598" addr="0x7fca469c5530" >
                                     <parm id="7599">
-                                        <attributelist id="7600" addr="0x7f99f1e77530" >
-                                            <attribute name="name" value="imageFilename" id="7601" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="7602" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7600" addr="0x7fca469c5530" >
+                                            <attribute name="name" value="imageFilename" id="7601" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="7602" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="7603" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="7604" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="7605" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="7603" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="7604" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="7605" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="7606" addr="0x7f99f1e77950" >
-                            <attributelist id="7607" addr="0x7f99f1e77950" >
-                                <attribute name="name" value="setColorDiffuse" id="7608" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="7609" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e75e70" id="7610" addr="0x7f99f1e75e70" />
-                                <attribute name="kind" value="function" id="7611" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setColorDiffuse" id="7612" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(p.q(const).char)." id="7613" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="7614" addr="0x7f99f1de6c90" />
-                                <parmlist id="7615" addr="0x7f99f1e77890" >
+                        <cdecl id="7606" addr="0x7fca469c5950" >
+                            <attributelist id="7607" addr="0x7fca469c5950" >
+                                <attribute name="name" value="setColorDiffuse" id="7608" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="7609" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c3e70" id="7610" addr="0x7fca469c3e70" />
+                                <attribute name="kind" value="function" id="7611" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setColorDiffuse" id="7612" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(p.q(const).char)." id="7613" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="7614" addr="0x7fca46934c90" />
+                                <parmlist id="7615" addr="0x7fca469c5890" >
                                     <parm id="7616">
-                                        <attributelist id="7617" addr="0x7f99f1e77890" >
-                                            <attribute name="name" value="hexString" id="7618" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="7619" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7617" addr="0x7fca469c5890" >
+                                            <attribute name="name" value="hexString" id="7618" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="7619" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="7620" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="7621" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="7622" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="7620" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="7621" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="7622" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
                     </class >
-                    <class id="7623" addr="0x7f99f1e77c30" >
-                        <attributelist id="7624" addr="0x7f99f1e77c30" >
-                            <attribute name="name" value="XBMCAddon::xbmcgui::ControlProgress" id="7625" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="7626" addr="0x7f99f1e40fb0" />
-                            <attribute name="symtab" value="0x7f99f1e77d70" id="7627" addr="0x7f99f1e77d70" />
-                            <attribute name="allows_typedef" value="1" id="7628" addr="0x7f99f1de6c90" />
-                            <attribute name="typepass_visit" value="1" id="7629" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_visit" value="1" id="7630" addr="0x7f99f1de6c90" />
-                            <attribute name="kind" value="class" id="7631" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_name" value="ControlProgress" id="7632" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_has_constructor" value="1" id="7633" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_public_constructor" value="1" id="7634" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_copy_constructor" value="1" id="7635" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_default_destructor" value="1" id="7636" addr="0x7f99f1de6c90" />
-                            <attribute name="privatebaselist" value="0x7f99f1e77c10" id="7637" addr="0x7f99f1e77c10" />
-                            <attribute name="protectedbaselist" value="0x7f99f1e77bf0" id="7638" addr="0x7f99f1e77bf0" />
-                            <baselist id="7639" addr="0x7f99f1e77bd0" >
-                                <base name="Control" id="7640" addr="0x7f99f1e77b50" />
+                    <class id="7623" addr="0x7fca469c5c30" >
+                        <attributelist id="7624" addr="0x7fca469c5c30" >
+                            <attribute name="name" value="XBMCAddon::xbmcgui::ControlProgress" id="7625" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="7626" addr="0x7fca4698efb0" />
+                            <attribute name="symtab" value="0x7fca469c5d70" id="7627" addr="0x7fca469c5d70" />
+                            <attribute name="allows_typedef" value="1" id="7628" addr="0x7fca46934c90" />
+                            <attribute name="typepass_visit" value="1" id="7629" addr="0x7fca46934c90" />
+                            <attribute name="allocate_visit" value="1" id="7630" addr="0x7fca46934c90" />
+                            <attribute name="kind" value="class" id="7631" addr="0x7fca46934c90" />
+                            <attribute name="sym_name" value="ControlProgress" id="7632" addr="0x7fca46934c90" />
+                            <attribute name="allocate_has_constructor" value="1" id="7633" addr="0x7fca46934c90" />
+                            <attribute name="allocate_public_constructor" value="1" id="7634" addr="0x7fca46934c90" />
+                            <attribute name="allocate_copy_constructor" value="1" id="7635" addr="0x7fca46934c90" />
+                            <attribute name="allocate_default_destructor" value="1" id="7636" addr="0x7fca46934c90" />
+                            <attribute name="privatebaselist" value="0x7fca469c5c10" id="7637" addr="0x7fca469c5c10" />
+                            <attribute name="protectedbaselist" value="0x7fca469c5bf0" id="7638" addr="0x7fca469c5bf0" />
+                            <baselist id="7639" addr="0x7fca469c5bd0" >
+                                <base name="Control" id="7640" addr="0x7fca469c5b50" />
                             </baselist >
-                            <attribute name="module" value="xbmcgui" id="7641" addr="0x7f99f1e402f0" />
-                            <attribute name="bases" value="0x7f99f1ddbf90" id="7642" addr="0x7f99f1ddbf90" />
-                            <attribute name="allbases" value="0x7f99f1ddc230" id="7643" addr="0x7f99f1ddc230" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="7644" addr="0x7f99f1de6c90" />
-                            <typescope id="7645" addr="0x7f99f1ddbf10" >
-                                <attributelist id="7646" addr="0x7f99f1ddbf10" >
-                                    <attribute name="inherit" value="0x7f99f1ddc010" id="7647" addr="0x7f99f1ddc010" />
-                                    <attribute name="name" value="ControlProgress" id="7648" addr="0x7f99f1de6c90" />
-                                    <typetab id="7649" addr="0x7f99f1ddbf30" >
-                                        <attributelist id="7650" addr="0x7f99f1ddbf30" >
+                            <attribute name="module" value="xbmcgui" id="7641" addr="0x7fca4698e2f0" />
+                            <attribute name="bases" value="0x7fca46929f90" id="7642" addr="0x7fca46929f90" />
+                            <attribute name="allbases" value="0x7fca4692a230" id="7643" addr="0x7fca4692a230" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="7644" addr="0x7fca46934c90" />
+                            <typescope id="7645" addr="0x7fca46929f10" >
+                                <attributelist id="7646" addr="0x7fca46929f10" >
+                                    <attribute name="inherit" value="0x7fca4692a010" id="7647" addr="0x7fca4692a010" />
+                                    <attribute name="name" value="ControlProgress" id="7648" addr="0x7fca46934c90" />
+                                    <typetab id="7649" addr="0x7fca46929f30" >
+                                        <attributelist id="7650" addr="0x7fca46929f30" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f99f1dd2150" id="7651" addr="0x7f99f1dd2150" />
-                                    <attribute name="qname" value="XBMCAddon::xbmcgui::ControlProgress" id="7652" addr="0x7f99f1de6c90" />
-                                    <attribute name="symtab" value="0x7f99f1e77d70" id="7653" addr="0x7f99f1e77d70" />
+                                    <attribute name="parent" value="0x7fca46920150" id="7651" addr="0x7fca46920150" />
+                                    <attribute name="qname" value="XBMCAddon::xbmcgui::ControlProgress" id="7652" addr="0x7fca46934c90" />
+                                    <attribute name="symtab" value="0x7fca469c5d70" id="7653" addr="0x7fca469c5d70" />
                                 </attributelist >
-                                <typescopesitem id="7654" addr="0x7f99f1ddc010" >
-                                    <attributelist id="7655" addr="0x7f99f1ddc010" >
+                                <typescopesitem id="7654" addr="0x7fca4692a010" >
+                                    <attributelist id="7655" addr="0x7fca4692a010" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="7656" addr="0x7f99f1ddbeb0" >
-                                    <attributelist id="7657" addr="0x7f99f1ddbeb0" >
+                                <typescopesitem id="7656" addr="0x7fca46929eb0" >
+                                    <attributelist id="7657" addr="0x7fca46929eb0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="7658" addr="0x7f99f1ddbf30" >
-                                    <attributelist id="7659" addr="0x7f99f1ddbf30" >
+                                <typescopesitem id="7658" addr="0x7fca46929f30" >
+                                    <attributelist id="7659" addr="0x7fca46929f30" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="7660" addr="0x7f99f1dd2150" >
-                                    <attributelist id="7661" addr="0x7f99f1dd2150" >
-                                        <attribute name="name" value="xbmcgui" id="7662" addr="0x7f99f1de6c90" />
-                                        <typetab id="7663" addr="0x7f99f1dd2170" >
-                                            <attributelist id="7664" addr="0x7f99f1dd2170" >
-                                                <attribute name="InterceptorBase" value="InterceptorBase" id="7665" addr="0x7f99f1de6c90" />
-                                                <attribute name="Dialog" value="Dialog" id="7666" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="7667" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="7668" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlTextBox" value="ControlTextBox" id="7669" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="7670" addr="0x7f99f1de6c90" />
-                                                <attribute name="Window" value="Window" id="7671" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="7672" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlList" value="ControlList" id="7673" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="7674" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlImage" value="ControlImage" id="7675" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlButton" value="ControlButton" id="7676" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlGroup" value="ControlGroup" id="7677" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogBusy" value="DialogBusy" id="7678" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="7679" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSpin" value="ControlSpin" id="7680" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlEdit" value="ControlEdit" id="7681" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="7682" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="7683" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlLabel" value="ControlLabel" id="7684" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlProgress" value="ControlProgress" id="7685" addr="0x7f99f1de6c90" />
-                                                <attribute name="Control" value="Control" id="7686" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSlider" value="ControlSlider" id="7687" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgress" value="DialogProgress" id="7688" addr="0x7f99f1de6c90" />
-                                                <attribute name="Action" value="Action" id="7689" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowDialog" value="WindowDialog" id="7690" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXML" value="WindowXML" id="7691" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItem" value="ListItem" id="7692" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="7693" addr="0x7f99f1de6c90" />
+                                <typescopesitem id="7660" addr="0x7fca46920150" >
+                                    <attributelist id="7661" addr="0x7fca46920150" >
+                                        <attribute name="name" value="xbmcgui" id="7662" addr="0x7fca46934c90" />
+                                        <typetab id="7663" addr="0x7fca46920170" >
+                                            <attributelist id="7664" addr="0x7fca46920170" >
+                                                <attribute name="InterceptorBase" value="InterceptorBase" id="7665" addr="0x7fca46934c90" />
+                                                <attribute name="Dialog" value="Dialog" id="7666" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="7667" addr="0x7fca46934c90" />
+                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="7668" addr="0x7fca46934c90" />
+                                                <attribute name="ControlTextBox" value="ControlTextBox" id="7669" addr="0x7fca46934c90" />
+                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="7670" addr="0x7fca46934c90" />
+                                                <attribute name="Window" value="Window" id="7671" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="7672" addr="0x7fca46934c90" />
+                                                <attribute name="ControlList" value="ControlList" id="7673" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="7674" addr="0x7fca46934c90" />
+                                                <attribute name="ControlImage" value="ControlImage" id="7675" addr="0x7fca46934c90" />
+                                                <attribute name="ControlButton" value="ControlButton" id="7676" addr="0x7fca46934c90" />
+                                                <attribute name="ControlGroup" value="ControlGroup" id="7677" addr="0x7fca46934c90" />
+                                                <attribute name="DialogBusy" value="DialogBusy" id="7678" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="7679" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSpin" value="ControlSpin" id="7680" addr="0x7fca46934c90" />
+                                                <attribute name="ControlEdit" value="ControlEdit" id="7681" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="7682" addr="0x7fca46934c90" />
+                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="7683" addr="0x7fca46934c90" />
+                                                <attribute name="ControlLabel" value="ControlLabel" id="7684" addr="0x7fca46934c90" />
+                                                <attribute name="ControlProgress" value="ControlProgress" id="7685" addr="0x7fca46934c90" />
+                                                <attribute name="Control" value="Control" id="7686" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSlider" value="ControlSlider" id="7687" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgress" value="DialogProgress" id="7688" addr="0x7fca46934c90" />
+                                                <attribute name="Action" value="Action" id="7689" addr="0x7fca46934c90" />
+                                                <attribute name="WindowDialog" value="WindowDialog" id="7690" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXML" value="WindowXML" id="7691" addr="0x7fca46934c90" />
+                                                <attribute name="ListItem" value="ListItem" id="7692" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="7693" addr="0x7fca46934c90" />
                                             </attributelist >
-                                            <typetabsitem id="7694" addr="0x7f99f1de1dd0" >
-                                                <attributelist id="7695" addr="0x7f99f1de1dd0" >
+                                            <typetabsitem id="7694" addr="0x7fca4692fdd0" >
+                                                <attributelist id="7695" addr="0x7fca4692fdd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7696" addr="0x7f99f1dde790" >
-                                                <attributelist id="7697" addr="0x7f99f1dde790" >
+                                            <typetabsitem id="7696" addr="0x7fca4692c790" >
+                                                <attributelist id="7697" addr="0x7fca4692c790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7698" addr="0x7f99f1de3f10" >
-                                                <attributelist id="7699" addr="0x7f99f1de3f10" >
+                                            <typetabsitem id="7698" addr="0x7fca46931f10" >
+                                                <attributelist id="7699" addr="0x7fca46931f10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7700" addr="0x7f99f1dd67b0" >
-                                                <attributelist id="7701" addr="0x7f99f1dd67b0" >
+                                            <typetabsitem id="7700" addr="0x7fca469247b0" >
+                                                <attributelist id="7701" addr="0x7fca469247b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7702" addr="0x7f99f1ddafd0" >
-                                                <attributelist id="7703" addr="0x7f99f1ddafd0" >
+                                            <typetabsitem id="7702" addr="0x7fca46928fd0" >
+                                                <attributelist id="7703" addr="0x7fca46928fd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7704" addr="0x7f99f1ddd430" >
-                                                <attributelist id="7705" addr="0x7f99f1ddd430" >
+                                            <typetabsitem id="7704" addr="0x7fca4692b430" >
+                                                <attributelist id="7705" addr="0x7fca4692b430" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7706" addr="0x7f99f1de2130" >
-                                                <attributelist id="7707" addr="0x7f99f1de2130" >
+                                            <typetabsitem id="7706" addr="0x7fca46930130" >
+                                                <attributelist id="7707" addr="0x7fca46930130" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7708" addr="0x7f99f1dd2f50" >
-                                                <attributelist id="7709" addr="0x7f99f1dd2f50" >
+                                            <typetabsitem id="7708" addr="0x7fca46920f50" >
+                                                <attributelist id="7709" addr="0x7fca46920f50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7710" addr="0x7f99f1dd9650" >
-                                                <attributelist id="7711" addr="0x7f99f1dd9650" >
+                                            <typetabsitem id="7710" addr="0x7fca46927650" >
+                                                <attributelist id="7711" addr="0x7fca46927650" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7712" addr="0x7f99f1de3390" >
-                                                <attributelist id="7713" addr="0x7f99f1de3390" >
+                                            <typetabsitem id="7712" addr="0x7fca46931390" >
+                                                <attributelist id="7713" addr="0x7fca46931390" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7714" addr="0x7f99f1ddb7b0" >
-                                                <attributelist id="7715" addr="0x7f99f1ddb7b0" >
+                                            <typetabsitem id="7714" addr="0x7fca469297b0" >
+                                                <attributelist id="7715" addr="0x7fca469297b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7716" addr="0x7f99f1ddc4b0" >
-                                                <attributelist id="7717" addr="0x7f99f1ddc4b0" >
+                                            <typetabsitem id="7716" addr="0x7fca4692a4b0" >
+                                                <attributelist id="7717" addr="0x7fca4692a4b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7718" addr="0x7f99f1ddcf90" >
-                                                <attributelist id="7719" addr="0x7f99f1ddcf90" >
+                                            <typetabsitem id="7718" addr="0x7fca4692af90" >
+                                                <attributelist id="7719" addr="0x7fca4692af90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7720" addr="0x7f99f1de11b0" >
-                                                <attributelist id="7721" addr="0x7f99f1de11b0" >
+                                            <typetabsitem id="7720" addr="0x7fca4692f1b0" >
+                                                <attributelist id="7721" addr="0x7fca4692f1b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7722" addr="0x7f99f1de15b0" >
-                                                <attributelist id="7723" addr="0x7f99f1de15b0" >
+                                            <typetabsitem id="7722" addr="0x7fca4692f5b0" >
+                                                <attributelist id="7723" addr="0x7fca4692f5b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7724" addr="0x7f99f1dd77f0" >
-                                                <attributelist id="7725" addr="0x7f99f1dd77f0" >
+                                            <typetabsitem id="7724" addr="0x7fca469257f0" >
+                                                <attributelist id="7725" addr="0x7fca469257f0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7726" addr="0x7f99f1dd8b30" >
-                                                <attributelist id="7727" addr="0x7f99f1dd8b30" >
+                                            <typetabsitem id="7726" addr="0x7fca46926b30" >
+                                                <attributelist id="7727" addr="0x7fca46926b30" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7728" addr="0x7f99f1dd2c50" >
-                                                <attributelist id="7729" addr="0x7f99f1dd2c50" >
+                                            <typetabsitem id="7728" addr="0x7fca46920c50" >
+                                                <attributelist id="7729" addr="0x7fca46920c50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7730" addr="0x7f99f1dda790" >
-                                                <attributelist id="7731" addr="0x7f99f1dda790" >
+                                            <typetabsitem id="7730" addr="0x7fca46928790" >
+                                                <attributelist id="7731" addr="0x7fca46928790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7732" addr="0x7f99f1dd8030" >
-                                                <attributelist id="7733" addr="0x7f99f1dd8030" >
+                                            <typetabsitem id="7732" addr="0x7fca46926030" >
+                                                <attributelist id="7733" addr="0x7fca46926030" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7734" addr="0x7f99f1ddbe10" >
-                                                <attributelist id="7735" addr="0x7f99f1ddbe10" >
+                                            <typetabsitem id="7734" addr="0x7fca46929e10" >
+                                                <attributelist id="7735" addr="0x7fca46929e10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7736" addr="0x7f99f1dd6b10" >
-                                                <attributelist id="7737" addr="0x7f99f1dd6b10" >
+                                            <typetabsitem id="7736" addr="0x7fca46924b10" >
+                                                <attributelist id="7737" addr="0x7fca46924b10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7738" addr="0x7f99f1dddf90" >
-                                                <attributelist id="7739" addr="0x7f99f1dddf90" >
+                                            <typetabsitem id="7738" addr="0x7fca4692bf90" >
+                                                <attributelist id="7739" addr="0x7fca4692bf90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7740" addr="0x7f99f1de0530" >
-                                                <attributelist id="7741" addr="0x7f99f1de0530" >
+                                            <typetabsitem id="7740" addr="0x7fca4692e530" >
+                                                <attributelist id="7741" addr="0x7fca4692e530" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7742" addr="0x7f99f1de1e50" >
-                                                <attributelist id="7743" addr="0x7f99f1de1e50" >
+                                            <typetabsitem id="7742" addr="0x7fca4692fe50" >
+                                                <attributelist id="7743" addr="0x7fca4692fe50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7744" addr="0x7f99f1de2d90" >
-                                                <attributelist id="7745" addr="0x7f99f1de2d90" >
+                                            <typetabsitem id="7744" addr="0x7fca46930d90" >
+                                                <attributelist id="7745" addr="0x7fca46930d90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7746" addr="0x7f99f1de3410" >
-                                                <attributelist id="7747" addr="0x7f99f1de3410" >
+                                            <typetabsitem id="7746" addr="0x7fca46931410" >
+                                                <attributelist id="7747" addr="0x7fca46931410" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7748" addr="0x7f99f1dd3590" >
-                                                <attributelist id="7749" addr="0x7f99f1dd3590" >
+                                            <typetabsitem id="7748" addr="0x7fca46921590" >
+                                                <attributelist id="7749" addr="0x7fca46921590" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7750" addr="0x7f99f1dd3390" >
-                                                <attributelist id="7751" addr="0x7f99f1dd3390" >
+                                            <typetabsitem id="7750" addr="0x7fca46921390" >
+                                                <attributelist id="7751" addr="0x7fca46921390" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7f99f1dd1d70" id="7752" addr="0x7f99f1dd1d70" />
-                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="7753" addr="0x7f99f1de6c90" />
-                                        <attribute name="symtab" value="0x7f99f1e40fb0" id="7754" addr="0x7f99f1e40fb0" />
+                                        <attribute name="parent" value="0x7fca4691fd70" id="7752" addr="0x7fca4691fd70" />
+                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="7753" addr="0x7fca46934c90" />
+                                        <attribute name="symtab" value="0x7fca4698efb0" id="7754" addr="0x7fca4698efb0" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="7755" addr="0x7f99f1ddbf50" >
-                                    <attributelist id="7756" addr="0x7f99f1ddbf50" >
+                                <typescopesitem id="7755" addr="0x7fca46929f50" >
+                                    <attributelist id="7756" addr="0x7fca46929f50" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="7757" addr="0x7f99f1e77d70" >
-                                    <attributelist id="7758" addr="0x7f99f1e77d70" >
-                                        <attribute name="inherit" value="0x7f99f1e77dd0" id="7759" addr="0x7f99f1e77dd0" />
-                                        <attribute name="name" value="ControlProgress" id="7760" addr="0x7f99f1de6c90" />
-                                        <attribute name="csymtab" value="0x7f99f1e77d90" id="7761" addr="0x7f99f1e77d90" />
-                                        <attribute name="symtab" value="0x7f99f1e77d50" id="7762" addr="0x7f99f1e77d50" />
+                                <typescopesitem id="7757" addr="0x7fca469c5d70" >
+                                    <attributelist id="7758" addr="0x7fca469c5d70" >
+                                        <attribute name="inherit" value="0x7fca469c5dd0" id="7759" addr="0x7fca469c5dd0" />
+                                        <attribute name="name" value="ControlProgress" id="7760" addr="0x7fca46934c90" />
+                                        <attribute name="csymtab" value="0x7fca469c5d90" id="7761" addr="0x7fca469c5d90" />
+                                        <attribute name="symtab" value="0x7fca469c5d50" id="7762" addr="0x7fca469c5d50" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <access id="7763" addr="0x7f99f1e77cf0" >
-                            <attributelist id="7764" addr="0x7f99f1e77cf0" >
-                                <attribute name="kind" value="public" id="7765" addr="0x7f99f1de6c90" />
+                        <access id="7763" addr="0x7fca469c5cf0" >
+                            <attributelist id="7764" addr="0x7fca469c5cf0" >
+                                <attribute name="kind" value="public" id="7765" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="7766" addr="0x7f99f1e78b70" >
-                            <attributelist id="7767" addr="0x7f99f1e78b70" >
-                                <attribute name="name" value="ControlProgress" id="7768" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="7769" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e77d70" id="7770" addr="0x7f99f1e77d70" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e790f0" id="7771" addr="0x7f99f1e790f0" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e790f0" id="7772" addr="0x7f99f1e790f0" />
-                                <attribute name="sym_name" value="ControlProgress" id="7773" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char)." id="7774" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="7775" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e78b70" id="7776" addr="0x7f99f1e78b70" />
-                                <parmlist id="7777" addr="0x7f99f1e77f30" >
+                        <constructor id="7766" addr="0x7fca469c6b70" >
+                            <attributelist id="7767" addr="0x7fca469c6b70" >
+                                <attribute name="name" value="ControlProgress" id="7768" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="7769" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c5d70" id="7770" addr="0x7fca469c5d70" />
+                                <attribute name="sym_nextSibling" value="0x7fca469c70f0" id="7771" addr="0x7fca469c70f0" />
+                                <attribute name="csym_nextSibling" value="0x7fca469c70f0" id="7772" addr="0x7fca469c70f0" />
+                                <attribute name="sym_name" value="ControlProgress" id="7773" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char)." id="7774" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="7775" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469c6b70" id="7776" addr="0x7fca469c6b70" />
+                                <parmlist id="7777" addr="0x7fca469c5f30" >
                                     <parm id="7778">
-                                        <attributelist id="7779" addr="0x7f99f1e77f30" >
-                                            <attribute name="name" value="x" id="7780" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7781" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7779" addr="0x7fca469c5f30" >
+                                            <attribute name="name" value="x" id="7780" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7781" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7782">
-                                        <attributelist id="7783" addr="0x7f99f1e78050" >
-                                            <attribute name="name" value="y" id="7784" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7785" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7783" addr="0x7fca469c6050" >
+                                            <attribute name="name" value="y" id="7784" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7785" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7786">
-                                        <attributelist id="7787" addr="0x7f99f1e78170" >
-                                            <attribute name="name" value="width" id="7788" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7789" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7787" addr="0x7fca469c6170" >
+                                            <attribute name="name" value="width" id="7788" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7789" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7790">
-                                        <attributelist id="7791" addr="0x7f99f1e78290" >
-                                            <attribute name="name" value="height" id="7792" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7793" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7791" addr="0x7fca469c6290" >
+                                            <attribute name="name" value="height" id="7792" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7793" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7794">
-                                        <attributelist id="7795" addr="0x7f99f1e78430" >
-                                            <attribute name="name" value="texturebg" id="7796" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="7797" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="7798" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7795" addr="0x7fca469c6430" >
+                                            <attribute name="name" value="texturebg" id="7796" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="7797" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="7798" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7799">
-                                        <attributelist id="7800" addr="0x7f99f1e785d0" >
-                                            <attribute name="name" value="textureleft" id="7801" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="7802" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="7803" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7800" addr="0x7fca469c65d0" >
+                                            <attribute name="name" value="textureleft" id="7801" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="7802" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="7803" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7804">
-                                        <attributelist id="7805" addr="0x7f99f1e78770" >
-                                            <attribute name="name" value="texturemid" id="7806" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="7807" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="7808" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7805" addr="0x7fca469c6770" >
+                                            <attribute name="name" value="texturemid" id="7806" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="7807" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="7808" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7809">
-                                        <attributelist id="7810" addr="0x7f99f1e78910" >
-                                            <attribute name="name" value="textureright" id="7811" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="7812" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="7813" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7810" addr="0x7fca469c6910" >
+                                            <attribute name="name" value="textureright" id="7811" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="7812" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="7813" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7814">
-                                        <attributelist id="7815" addr="0x7f99f1e78ab0" >
-                                            <attribute name="name" value="textureoverlay" id="7816" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="7817" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="7818" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7815" addr="0x7fca469c6ab0" >
+                                            <attribute name="name" value="textureoverlay" id="7816" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="7817" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="7818" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_0" id="7819" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="7820" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="7819" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="7820" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="7821" addr="0x7f99f1e790f0" >
-                            <attributelist id="7822" addr="0x7f99f1e790f0" >
-                                <attribute name="name" value="ControlProgress" id="7823" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="7824" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e77d70" id="7825" addr="0x7f99f1e77d70" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e795d0" id="7826" addr="0x7f99f1e795d0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e78b70" id="7827" addr="0x7f99f1e78b70" />
-                                <attribute name="sym_name" value="ControlProgress" id="7828" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e795d0" id="7829" addr="0x7f99f1e795d0" />
-                                <attribute name="defaultargs" value="0x7f99f1e78b70" id="7830" addr="0x7f99f1e78b70" />
-                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char)." id="7831" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="7832" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e78b70" id="7833" addr="0x7f99f1e78b70" />
-                                <parmlist id="7834" addr="0x7f99f1e78c10" >
+                        <constructor id="7821" addr="0x7fca469c70f0" >
+                            <attributelist id="7822" addr="0x7fca469c70f0" >
+                                <attribute name="name" value="ControlProgress" id="7823" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="7824" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c5d70" id="7825" addr="0x7fca469c5d70" />
+                                <attribute name="csym_nextSibling" value="0x7fca469c75d0" id="7826" addr="0x7fca469c75d0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469c6b70" id="7827" addr="0x7fca469c6b70" />
+                                <attribute name="sym_name" value="ControlProgress" id="7828" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469c75d0" id="7829" addr="0x7fca469c75d0" />
+                                <attribute name="defaultargs" value="0x7fca469c6b70" id="7830" addr="0x7fca469c6b70" />
+                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char)." id="7831" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="7832" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469c6b70" id="7833" addr="0x7fca469c6b70" />
+                                <parmlist id="7834" addr="0x7fca469c6c10" >
                                     <parm id="7835">
-                                        <attributelist id="7836" addr="0x7f99f1e78c10" >
-                                            <attribute name="name" value="x" id="7837" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7838" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7836" addr="0x7fca469c6c10" >
+                                            <attribute name="name" value="x" id="7837" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7838" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7839">
-                                        <attributelist id="7840" addr="0x7f99f1e78cd0" >
-                                            <attribute name="name" value="y" id="7841" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7842" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7840" addr="0x7fca469c6cd0" >
+                                            <attribute name="name" value="y" id="7841" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7842" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7843">
-                                        <attributelist id="7844" addr="0x7f99f1e78d50" >
-                                            <attribute name="name" value="width" id="7845" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7846" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7844" addr="0x7fca469c6d50" >
+                                            <attribute name="name" value="width" id="7845" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7846" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7847">
-                                        <attributelist id="7848" addr="0x7f99f1e78dd0" >
-                                            <attribute name="name" value="height" id="7849" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7850" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7848" addr="0x7fca469c6dd0" >
+                                            <attribute name="name" value="height" id="7849" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7850" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7851">
-                                        <attributelist id="7852" addr="0x7f99f1e78e50" >
-                                            <attribute name="name" value="texturebg" id="7853" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="7854" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="7855" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7852" addr="0x7fca469c6e50" >
+                                            <attribute name="name" value="texturebg" id="7853" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="7854" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="7855" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7856">
-                                        <attributelist id="7857" addr="0x7f99f1e78ef0" >
-                                            <attribute name="name" value="textureleft" id="7858" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="7859" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="7860" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7857" addr="0x7fca469c6ef0" >
+                                            <attribute name="name" value="textureleft" id="7858" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="7859" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="7860" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7861">
-                                        <attributelist id="7862" addr="0x7f99f1e78f90" >
-                                            <attribute name="name" value="texturemid" id="7863" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="7864" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="7865" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7862" addr="0x7fca469c6f90" >
+                                            <attribute name="name" value="texturemid" id="7863" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="7864" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="7865" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7866">
-                                        <attributelist id="7867" addr="0x7f99f1e79030" >
-                                            <attribute name="name" value="textureright" id="7868" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="7869" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="7870" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7867" addr="0x7fca469c7030" >
+                                            <attribute name="name" value="textureright" id="7868" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="7869" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="7870" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_1" id="7871" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="7872" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="7871" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="7872" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="7873" addr="0x7f99f1e795d0" >
-                            <attributelist id="7874" addr="0x7f99f1e795d0" >
-                                <attribute name="name" value="ControlProgress" id="7875" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="7876" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e77d70" id="7877" addr="0x7f99f1e77d70" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e79a10" id="7878" addr="0x7f99f1e79a10" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e790f0" id="7879" addr="0x7f99f1e790f0" />
-                                <attribute name="sym_name" value="ControlProgress" id="7880" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e79a10" id="7881" addr="0x7f99f1e79a10" />
-                                <attribute name="defaultargs" value="0x7f99f1e78b70" id="7882" addr="0x7f99f1e78b70" />
-                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char)." id="7883" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="7884" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e78b70" id="7885" addr="0x7f99f1e78b70" />
-                                <parmlist id="7886" addr="0x7f99f1e79190" >
+                        <constructor id="7873" addr="0x7fca469c75d0" >
+                            <attributelist id="7874" addr="0x7fca469c75d0" >
+                                <attribute name="name" value="ControlProgress" id="7875" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="7876" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c5d70" id="7877" addr="0x7fca469c5d70" />
+                                <attribute name="csym_nextSibling" value="0x7fca469c7a10" id="7878" addr="0x7fca469c7a10" />
+                                <attribute name="sym_previousSibling" value="0x7fca469c70f0" id="7879" addr="0x7fca469c70f0" />
+                                <attribute name="sym_name" value="ControlProgress" id="7880" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469c7a10" id="7881" addr="0x7fca469c7a10" />
+                                <attribute name="defaultargs" value="0x7fca469c6b70" id="7882" addr="0x7fca469c6b70" />
+                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char)." id="7883" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="7884" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469c6b70" id="7885" addr="0x7fca469c6b70" />
+                                <parmlist id="7886" addr="0x7fca469c7190" >
                                     <parm id="7887">
-                                        <attributelist id="7888" addr="0x7f99f1e79190" >
-                                            <attribute name="name" value="x" id="7889" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7890" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7888" addr="0x7fca469c7190" >
+                                            <attribute name="name" value="x" id="7889" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7890" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7891">
-                                        <attributelist id="7892" addr="0x7f99f1e79250" >
-                                            <attribute name="name" value="y" id="7893" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7894" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7892" addr="0x7fca469c7250" >
+                                            <attribute name="name" value="y" id="7893" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7894" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7895">
-                                        <attributelist id="7896" addr="0x7f99f1e792d0" >
-                                            <attribute name="name" value="width" id="7897" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7898" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7896" addr="0x7fca469c72d0" >
+                                            <attribute name="name" value="width" id="7897" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7898" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7899">
-                                        <attributelist id="7900" addr="0x7f99f1e79350" >
-                                            <attribute name="name" value="height" id="7901" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7902" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7900" addr="0x7fca469c7350" >
+                                            <attribute name="name" value="height" id="7901" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7902" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7903">
-                                        <attributelist id="7904" addr="0x7f99f1e793d0" >
-                                            <attribute name="name" value="texturebg" id="7905" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="7906" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="7907" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7904" addr="0x7fca469c73d0" >
+                                            <attribute name="name" value="texturebg" id="7905" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="7906" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="7907" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7908">
-                                        <attributelist id="7909" addr="0x7f99f1e79470" >
-                                            <attribute name="name" value="textureleft" id="7910" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="7911" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="7912" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7909" addr="0x7fca469c7470" >
+                                            <attribute name="name" value="textureleft" id="7910" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="7911" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="7912" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7913">
-                                        <attributelist id="7914" addr="0x7f99f1e79510" >
-                                            <attribute name="name" value="texturemid" id="7915" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="7916" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="7917" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7914" addr="0x7fca469c7510" >
+                                            <attribute name="name" value="texturemid" id="7915" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="7916" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="7917" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_2" id="7918" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="7919" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_2" id="7918" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="7919" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="7920" addr="0x7f99f1e79a10" >
-                            <attributelist id="7921" addr="0x7f99f1e79a10" >
-                                <attribute name="name" value="ControlProgress" id="7922" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="7923" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e77d70" id="7924" addr="0x7f99f1e77d70" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e79db0" id="7925" addr="0x7f99f1e79db0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e795d0" id="7926" addr="0x7f99f1e795d0" />
-                                <attribute name="sym_name" value="ControlProgress" id="7927" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e79db0" id="7928" addr="0x7f99f1e79db0" />
-                                <attribute name="defaultargs" value="0x7f99f1e78b70" id="7929" addr="0x7f99f1e78b70" />
-                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char)." id="7930" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="7931" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e78b70" id="7932" addr="0x7f99f1e78b70" />
-                                <parmlist id="7933" addr="0x7f99f1e79670" >
+                        <constructor id="7920" addr="0x7fca469c7a10" >
+                            <attributelist id="7921" addr="0x7fca469c7a10" >
+                                <attribute name="name" value="ControlProgress" id="7922" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="7923" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c5d70" id="7924" addr="0x7fca469c5d70" />
+                                <attribute name="csym_nextSibling" value="0x7fca469c7db0" id="7925" addr="0x7fca469c7db0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469c75d0" id="7926" addr="0x7fca469c75d0" />
+                                <attribute name="sym_name" value="ControlProgress" id="7927" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469c7db0" id="7928" addr="0x7fca469c7db0" />
+                                <attribute name="defaultargs" value="0x7fca469c6b70" id="7929" addr="0x7fca469c6b70" />
+                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char)." id="7930" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="7931" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469c6b70" id="7932" addr="0x7fca469c6b70" />
+                                <parmlist id="7933" addr="0x7fca469c7670" >
                                     <parm id="7934">
-                                        <attributelist id="7935" addr="0x7f99f1e79670" >
-                                            <attribute name="name" value="x" id="7936" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7937" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7935" addr="0x7fca469c7670" >
+                                            <attribute name="name" value="x" id="7936" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7937" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7938">
-                                        <attributelist id="7939" addr="0x7f99f1e79730" >
-                                            <attribute name="name" value="y" id="7940" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7941" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7939" addr="0x7fca469c7730" >
+                                            <attribute name="name" value="y" id="7940" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7941" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7942">
-                                        <attributelist id="7943" addr="0x7f99f1e797b0" >
-                                            <attribute name="name" value="width" id="7944" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7945" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7943" addr="0x7fca469c77b0" >
+                                            <attribute name="name" value="width" id="7944" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7945" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7946">
-                                        <attributelist id="7947" addr="0x7f99f1e79830" >
-                                            <attribute name="name" value="height" id="7948" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7949" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7947" addr="0x7fca469c7830" >
+                                            <attribute name="name" value="height" id="7948" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7949" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7950">
-                                        <attributelist id="7951" addr="0x7f99f1e798b0" >
-                                            <attribute name="name" value="texturebg" id="7952" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="7953" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="7954" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7951" addr="0x7fca469c78b0" >
+                                            <attribute name="name" value="texturebg" id="7952" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="7953" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="7954" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7955">
-                                        <attributelist id="7956" addr="0x7f99f1e79950" >
-                                            <attribute name="name" value="textureleft" id="7957" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="7958" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="7959" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7956" addr="0x7fca469c7950" >
+                                            <attribute name="name" value="textureleft" id="7957" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="7958" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="7959" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_3" id="7960" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="7961" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_3" id="7960" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="7961" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="7962" addr="0x7f99f1e79db0" >
-                            <attributelist id="7963" addr="0x7f99f1e79db0" >
-                                <attribute name="name" value="ControlProgress" id="7964" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="7965" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e77d70" id="7966" addr="0x7f99f1e77d70" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e7a0b0" id="7967" addr="0x7f99f1e7a0b0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e79a10" id="7968" addr="0x7f99f1e79a10" />
-                                <attribute name="sym_name" value="ControlProgress" id="7969" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e7a0b0" id="7970" addr="0x7f99f1e7a0b0" />
-                                <attribute name="defaultargs" value="0x7f99f1e78b70" id="7971" addr="0x7f99f1e78b70" />
-                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char)." id="7972" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="7973" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e78b70" id="7974" addr="0x7f99f1e78b70" />
-                                <parmlist id="7975" addr="0x7f99f1e79ab0" >
+                        <constructor id="7962" addr="0x7fca469c7db0" >
+                            <attributelist id="7963" addr="0x7fca469c7db0" >
+                                <attribute name="name" value="ControlProgress" id="7964" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="7965" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c5d70" id="7966" addr="0x7fca469c5d70" />
+                                <attribute name="csym_nextSibling" value="0x7fca469c80b0" id="7967" addr="0x7fca469c80b0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469c7a10" id="7968" addr="0x7fca469c7a10" />
+                                <attribute name="sym_name" value="ControlProgress" id="7969" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469c80b0" id="7970" addr="0x7fca469c80b0" />
+                                <attribute name="defaultargs" value="0x7fca469c6b70" id="7971" addr="0x7fca469c6b70" />
+                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char)." id="7972" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="7973" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469c6b70" id="7974" addr="0x7fca469c6b70" />
+                                <parmlist id="7975" addr="0x7fca469c7ab0" >
                                     <parm id="7976">
-                                        <attributelist id="7977" addr="0x7f99f1e79ab0" >
-                                            <attribute name="name" value="x" id="7978" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7979" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7977" addr="0x7fca469c7ab0" >
+                                            <attribute name="name" value="x" id="7978" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7979" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7980">
-                                        <attributelist id="7981" addr="0x7f99f1e79b70" >
-                                            <attribute name="name" value="y" id="7982" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7983" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7981" addr="0x7fca469c7b70" >
+                                            <attribute name="name" value="y" id="7982" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7983" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7984">
-                                        <attributelist id="7985" addr="0x7f99f1e79bf0" >
-                                            <attribute name="name" value="width" id="7986" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7987" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7985" addr="0x7fca469c7bf0" >
+                                            <attribute name="name" value="width" id="7986" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7987" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7988">
-                                        <attributelist id="7989" addr="0x7f99f1e79c70" >
-                                            <attribute name="name" value="height" id="7990" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7991" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7989" addr="0x7fca469c7c70" >
+                                            <attribute name="name" value="height" id="7990" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7991" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7992">
-                                        <attributelist id="7993" addr="0x7f99f1e79cf0" >
-                                            <attribute name="name" value="texturebg" id="7994" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="7995" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="7996" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7993" addr="0x7fca469c7cf0" >
+                                            <attribute name="name" value="texturebg" id="7994" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="7995" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="7996" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_4" id="7997" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="7998" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_4" id="7997" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="7998" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="7999" addr="0x7f99f1e7a0b0" >
-                            <attributelist id="8000" addr="0x7f99f1e7a0b0" >
-                                <attribute name="name" value="ControlProgress" id="8001" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="8002" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e77d70" id="8003" addr="0x7f99f1e77d70" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e79db0" id="8004" addr="0x7f99f1e79db0" />
-                                <attribute name="sym_name" value="ControlProgress" id="8005" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e78b70" id="8006" addr="0x7f99f1e78b70" />
-                                <attribute name="decl" value="f(long,long,long,long)." id="8007" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="8008" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e78b70" id="8009" addr="0x7f99f1e78b70" />
-                                <parmlist id="8010" addr="0x7f99f1e79e50" >
+                        <constructor id="7999" addr="0x7fca469c80b0" >
+                            <attributelist id="8000" addr="0x7fca469c80b0" >
+                                <attribute name="name" value="ControlProgress" id="8001" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="8002" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c5d70" id="8003" addr="0x7fca469c5d70" />
+                                <attribute name="sym_previousSibling" value="0x7fca469c7db0" id="8004" addr="0x7fca469c7db0" />
+                                <attribute name="sym_name" value="ControlProgress" id="8005" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469c6b70" id="8006" addr="0x7fca469c6b70" />
+                                <attribute name="decl" value="f(long,long,long,long)." id="8007" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="8008" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469c6b70" id="8009" addr="0x7fca469c6b70" />
+                                <parmlist id="8010" addr="0x7fca469c7e50" >
                                     <parm id="8011">
-                                        <attributelist id="8012" addr="0x7f99f1e79e50" >
-                                            <attribute name="name" value="x" id="8013" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8014" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8012" addr="0x7fca469c7e50" >
+                                            <attribute name="name" value="x" id="8013" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8014" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8015">
-                                        <attributelist id="8016" addr="0x7f99f1e79f10" >
-                                            <attribute name="name" value="y" id="8017" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8018" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8016" addr="0x7fca469c7f10" >
+                                            <attribute name="name" value="y" id="8017" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8018" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8019">
-                                        <attributelist id="8020" addr="0x7f99f1e79f90" >
-                                            <attribute name="name" value="width" id="8021" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8022" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8020" addr="0x7fca469c7f90" >
+                                            <attribute name="name" value="width" id="8021" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8022" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8023">
-                                        <attributelist id="8024" addr="0x7f99f1e7a010" >
-                                            <attribute name="name" value="height" id="8025" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8026" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8024" addr="0x7fca469c8010" >
+                                            <attribute name="name" value="height" id="8025" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8026" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_5" id="8027" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="8028" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_5" id="8027" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="8028" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <cdecl id="8029" addr="0x7f99f1e7a370" >
-                            <attributelist id="8030" addr="0x7f99f1e7a370" >
-                                <attribute name="name" value="setPercent" id="8031" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="8032" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e77d70" id="8033" addr="0x7f99f1e77d70" />
-                                <attribute name="kind" value="function" id="8034" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setPercent" id="8035" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(float)." id="8036" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="8037" addr="0x7f99f1de6c90" />
-                                <parmlist id="8038" addr="0x7f99f1e7a2b0" >
+                        <cdecl id="8029" addr="0x7fca469c8370" >
+                            <attributelist id="8030" addr="0x7fca469c8370" >
+                                <attribute name="name" value="setPercent" id="8031" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="8032" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c5d70" id="8033" addr="0x7fca469c5d70" />
+                                <attribute name="kind" value="function" id="8034" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setPercent" id="8035" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(float)." id="8036" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="8037" addr="0x7fca46934c90" />
+                                <parmlist id="8038" addr="0x7fca469c82b0" >
                                     <parm id="8039">
-                                        <attributelist id="8040" addr="0x7f99f1e7a2b0" >
-                                            <attribute name="name" value="pct" id="8041" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="float" id="8042" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8040" addr="0x7fca469c82b0" >
+                                            <attribute name="name" value="pct" id="8041" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="float" id="8042" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="8043" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="8044" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="8045" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="8043" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="8044" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="8045" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="8046" addr="0x7f99f1e7a570" >
-                            <attributelist id="8047" addr="0x7f99f1e7a570" >
-                                <attribute name="ismember" value="1" id="8048" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getPercent" id="8049" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="getPercent" id="8050" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="8051" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="8052" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="8053" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="8054" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="float" id="8055" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e77d70" id="8056" addr="0x7f99f1e77d70" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="8057" addr="0x7f99f1de6c90" />
+                        <cdecl id="8046" addr="0x7fca469c8570" >
+                            <attributelist id="8047" addr="0x7fca469c8570" >
+                                <attribute name="ismember" value="1" id="8048" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getPercent" id="8049" addr="0x7fca46934c90" />
+                                <attribute name="name" value="getPercent" id="8050" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="8051" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="8052" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="8053" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="8054" addr="0x7fca46934c90" />
+                                <attribute name="type" value="float" id="8055" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c5d70" id="8056" addr="0x7fca469c5d70" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="8057" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
                     </class >
-                    <class id="8058" addr="0x7f99f1e7a850" >
-                        <attributelist id="8059" addr="0x7f99f1e7a850" >
-                            <attribute name="name" value="XBMCAddon::xbmcgui::ControlButton" id="8060" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="8061" addr="0x7f99f1e40fb0" />
-                            <attribute name="symtab" value="0x7f99f1e7a990" id="8062" addr="0x7f99f1e7a990" />
-                            <attribute name="allows_typedef" value="1" id="8063" addr="0x7f99f1de6c90" />
-                            <attribute name="typepass_visit" value="1" id="8064" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_visit" value="1" id="8065" addr="0x7f99f1de6c90" />
-                            <attribute name="kind" value="class" id="8066" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_name" value="ControlButton" id="8067" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_has_constructor" value="1" id="8068" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_public_constructor" value="1" id="8069" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_copy_constructor" value="1" id="8070" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_default_destructor" value="1" id="8071" addr="0x7f99f1de6c90" />
-                            <attribute name="privatebaselist" value="0x7f99f1e7a830" id="8072" addr="0x7f99f1e7a830" />
-                            <attribute name="protectedbaselist" value="0x7f99f1e7a810" id="8073" addr="0x7f99f1e7a810" />
-                            <baselist id="8074" addr="0x7f99f1e7a7f0" >
-                                <base name="Control" id="8075" addr="0x7f99f1e7a770" />
+                    <class id="8058" addr="0x7fca469c8850" >
+                        <attributelist id="8059" addr="0x7fca469c8850" >
+                            <attribute name="name" value="XBMCAddon::xbmcgui::ControlButton" id="8060" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="8061" addr="0x7fca4698efb0" />
+                            <attribute name="symtab" value="0x7fca469c8990" id="8062" addr="0x7fca469c8990" />
+                            <attribute name="allows_typedef" value="1" id="8063" addr="0x7fca46934c90" />
+                            <attribute name="typepass_visit" value="1" id="8064" addr="0x7fca46934c90" />
+                            <attribute name="allocate_visit" value="1" id="8065" addr="0x7fca46934c90" />
+                            <attribute name="kind" value="class" id="8066" addr="0x7fca46934c90" />
+                            <attribute name="sym_name" value="ControlButton" id="8067" addr="0x7fca46934c90" />
+                            <attribute name="allocate_has_constructor" value="1" id="8068" addr="0x7fca46934c90" />
+                            <attribute name="allocate_public_constructor" value="1" id="8069" addr="0x7fca46934c90" />
+                            <attribute name="allocate_copy_constructor" value="1" id="8070" addr="0x7fca46934c90" />
+                            <attribute name="allocate_default_destructor" value="1" id="8071" addr="0x7fca46934c90" />
+                            <attribute name="privatebaselist" value="0x7fca469c8830" id="8072" addr="0x7fca469c8830" />
+                            <attribute name="protectedbaselist" value="0x7fca469c8810" id="8073" addr="0x7fca469c8810" />
+                            <baselist id="8074" addr="0x7fca469c87f0" >
+                                <base name="Control" id="8075" addr="0x7fca469c8770" />
                             </baselist >
-                            <attribute name="module" value="xbmcgui" id="8076" addr="0x7f99f1e402f0" />
-                            <attribute name="bases" value="0x7f99f1ddc5f0" id="8077" addr="0x7f99f1ddc5f0" />
-                            <attribute name="allbases" value="0x7f99f1ddc890" id="8078" addr="0x7f99f1ddc890" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="8079" addr="0x7f99f1de6c90" />
-                            <typescope id="8080" addr="0x7f99f1ddc570" >
-                                <attributelist id="8081" addr="0x7f99f1ddc570" >
-                                    <attribute name="inherit" value="0x7f99f1ddc670" id="8082" addr="0x7f99f1ddc670" />
-                                    <attribute name="name" value="ControlButton" id="8083" addr="0x7f99f1de6c90" />
-                                    <typetab id="8084" addr="0x7f99f1ddc590" >
-                                        <attributelist id="8085" addr="0x7f99f1ddc590" >
+                            <attribute name="module" value="xbmcgui" id="8076" addr="0x7fca4698e2f0" />
+                            <attribute name="bases" value="0x7fca4692a5f0" id="8077" addr="0x7fca4692a5f0" />
+                            <attribute name="allbases" value="0x7fca4692a890" id="8078" addr="0x7fca4692a890" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="8079" addr="0x7fca46934c90" />
+                            <typescope id="8080" addr="0x7fca4692a570" >
+                                <attributelist id="8081" addr="0x7fca4692a570" >
+                                    <attribute name="inherit" value="0x7fca4692a670" id="8082" addr="0x7fca4692a670" />
+                                    <attribute name="name" value="ControlButton" id="8083" addr="0x7fca46934c90" />
+                                    <typetab id="8084" addr="0x7fca4692a590" >
+                                        <attributelist id="8085" addr="0x7fca4692a590" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f99f1dd2150" id="8086" addr="0x7f99f1dd2150" />
-                                    <attribute name="qname" value="XBMCAddon::xbmcgui::ControlButton" id="8087" addr="0x7f99f1de6c90" />
-                                    <attribute name="symtab" value="0x7f99f1e7a990" id="8088" addr="0x7f99f1e7a990" />
+                                    <attribute name="parent" value="0x7fca46920150" id="8086" addr="0x7fca46920150" />
+                                    <attribute name="qname" value="XBMCAddon::xbmcgui::ControlButton" id="8087" addr="0x7fca46934c90" />
+                                    <attribute name="symtab" value="0x7fca469c8990" id="8088" addr="0x7fca469c8990" />
                                 </attributelist >
-                                <typescopesitem id="8089" addr="0x7f99f1ddc670" >
-                                    <attributelist id="8090" addr="0x7f99f1ddc670" >
+                                <typescopesitem id="8089" addr="0x7fca4692a670" >
+                                    <attributelist id="8090" addr="0x7fca4692a670" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="8091" addr="0x7f99f1ddc510" >
-                                    <attributelist id="8092" addr="0x7f99f1ddc510" >
+                                <typescopesitem id="8091" addr="0x7fca4692a510" >
+                                    <attributelist id="8092" addr="0x7fca4692a510" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="8093" addr="0x7f99f1ddc590" >
-                                    <attributelist id="8094" addr="0x7f99f1ddc590" >
+                                <typescopesitem id="8093" addr="0x7fca4692a590" >
+                                    <attributelist id="8094" addr="0x7fca4692a590" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="8095" addr="0x7f99f1dd2150" >
-                                    <attributelist id="8096" addr="0x7f99f1dd2150" >
-                                        <attribute name="name" value="xbmcgui" id="8097" addr="0x7f99f1de6c90" />
-                                        <typetab id="8098" addr="0x7f99f1dd2170" >
-                                            <attributelist id="8099" addr="0x7f99f1dd2170" >
-                                                <attribute name="InterceptorBase" value="InterceptorBase" id="8100" addr="0x7f99f1de6c90" />
-                                                <attribute name="Dialog" value="Dialog" id="8101" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="8102" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="8103" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlTextBox" value="ControlTextBox" id="8104" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="8105" addr="0x7f99f1de6c90" />
-                                                <attribute name="Window" value="Window" id="8106" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="8107" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlList" value="ControlList" id="8108" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="8109" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlImage" value="ControlImage" id="8110" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlButton" value="ControlButton" id="8111" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlGroup" value="ControlGroup" id="8112" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogBusy" value="DialogBusy" id="8113" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="8114" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSpin" value="ControlSpin" id="8115" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlEdit" value="ControlEdit" id="8116" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="8117" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="8118" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlLabel" value="ControlLabel" id="8119" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlProgress" value="ControlProgress" id="8120" addr="0x7f99f1de6c90" />
-                                                <attribute name="Control" value="Control" id="8121" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSlider" value="ControlSlider" id="8122" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgress" value="DialogProgress" id="8123" addr="0x7f99f1de6c90" />
-                                                <attribute name="Action" value="Action" id="8124" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowDialog" value="WindowDialog" id="8125" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXML" value="WindowXML" id="8126" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItem" value="ListItem" id="8127" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="8128" addr="0x7f99f1de6c90" />
+                                <typescopesitem id="8095" addr="0x7fca46920150" >
+                                    <attributelist id="8096" addr="0x7fca46920150" >
+                                        <attribute name="name" value="xbmcgui" id="8097" addr="0x7fca46934c90" />
+                                        <typetab id="8098" addr="0x7fca46920170" >
+                                            <attributelist id="8099" addr="0x7fca46920170" >
+                                                <attribute name="InterceptorBase" value="InterceptorBase" id="8100" addr="0x7fca46934c90" />
+                                                <attribute name="Dialog" value="Dialog" id="8101" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="8102" addr="0x7fca46934c90" />
+                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="8103" addr="0x7fca46934c90" />
+                                                <attribute name="ControlTextBox" value="ControlTextBox" id="8104" addr="0x7fca46934c90" />
+                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="8105" addr="0x7fca46934c90" />
+                                                <attribute name="Window" value="Window" id="8106" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="8107" addr="0x7fca46934c90" />
+                                                <attribute name="ControlList" value="ControlList" id="8108" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="8109" addr="0x7fca46934c90" />
+                                                <attribute name="ControlImage" value="ControlImage" id="8110" addr="0x7fca46934c90" />
+                                                <attribute name="ControlButton" value="ControlButton" id="8111" addr="0x7fca46934c90" />
+                                                <attribute name="ControlGroup" value="ControlGroup" id="8112" addr="0x7fca46934c90" />
+                                                <attribute name="DialogBusy" value="DialogBusy" id="8113" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="8114" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSpin" value="ControlSpin" id="8115" addr="0x7fca46934c90" />
+                                                <attribute name="ControlEdit" value="ControlEdit" id="8116" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="8117" addr="0x7fca46934c90" />
+                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="8118" addr="0x7fca46934c90" />
+                                                <attribute name="ControlLabel" value="ControlLabel" id="8119" addr="0x7fca46934c90" />
+                                                <attribute name="ControlProgress" value="ControlProgress" id="8120" addr="0x7fca46934c90" />
+                                                <attribute name="Control" value="Control" id="8121" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSlider" value="ControlSlider" id="8122" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgress" value="DialogProgress" id="8123" addr="0x7fca46934c90" />
+                                                <attribute name="Action" value="Action" id="8124" addr="0x7fca46934c90" />
+                                                <attribute name="WindowDialog" value="WindowDialog" id="8125" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXML" value="WindowXML" id="8126" addr="0x7fca46934c90" />
+                                                <attribute name="ListItem" value="ListItem" id="8127" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="8128" addr="0x7fca46934c90" />
                                             </attributelist >
-                                            <typetabsitem id="8129" addr="0x7f99f1de1dd0" >
-                                                <attributelist id="8130" addr="0x7f99f1de1dd0" >
+                                            <typetabsitem id="8129" addr="0x7fca4692fdd0" >
+                                                <attributelist id="8130" addr="0x7fca4692fdd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="8131" addr="0x7f99f1dde790" >
-                                                <attributelist id="8132" addr="0x7f99f1dde790" >
+                                            <typetabsitem id="8131" addr="0x7fca4692c790" >
+                                                <attributelist id="8132" addr="0x7fca4692c790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="8133" addr="0x7f99f1de3f10" >
-                                                <attributelist id="8134" addr="0x7f99f1de3f10" >
+                                            <typetabsitem id="8133" addr="0x7fca46931f10" >
+                                                <attributelist id="8134" addr="0x7fca46931f10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="8135" addr="0x7f99f1dd67b0" >
-                                                <attributelist id="8136" addr="0x7f99f1dd67b0" >
+                                            <typetabsitem id="8135" addr="0x7fca469247b0" >
+                                                <attributelist id="8136" addr="0x7fca469247b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="8137" addr="0x7f99f1ddafd0" >
-                                                <attributelist id="8138" addr="0x7f99f1ddafd0" >
+                                            <typetabsitem id="8137" addr="0x7fca46928fd0" >
+                                                <attributelist id="8138" addr="0x7fca46928fd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="8139" addr="0x7f99f1ddd430" >
-                                                <attributelist id="8140" addr="0x7f99f1ddd430" >
+                                            <typetabsitem id="8139" addr="0x7fca4692b430" >
+                                                <attributelist id="8140" addr="0x7fca4692b430" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="8141" addr="0x7f99f1de2130" >
-                                                <attributelist id="8142" addr="0x7f99f1de2130" >
+                                            <typetabsitem id="8141" addr="0x7fca46930130" >
+                                                <attributelist id="8142" addr="0x7fca46930130" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="8143" addr="0x7f99f1dd2f50" >
-                                                <attributelist id="8144" addr="0x7f99f1dd2f50" >
+                                            <typetabsitem id="8143" addr="0x7fca46920f50" >
+                                                <attributelist id="8144" addr="0x7fca46920f50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="8145" addr="0x7f99f1dd9650" >
-                                                <attributelist id="8146" addr="0x7f99f1dd9650" >
+                                            <typetabsitem id="8145" addr="0x7fca46927650" >
+                                                <attributelist id="8146" addr="0x7fca46927650" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="8147" addr="0x7f99f1de3390" >
-                                                <attributelist id="8148" addr="0x7f99f1de3390" >
+                                            <typetabsitem id="8147" addr="0x7fca46931390" >
+                                                <attributelist id="8148" addr="0x7fca46931390" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="8149" addr="0x7f99f1ddb7b0" >
-                                                <attributelist id="8150" addr="0x7f99f1ddb7b0" >
+                                            <typetabsitem id="8149" addr="0x7fca469297b0" >
+                                                <attributelist id="8150" addr="0x7fca469297b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="8151" addr="0x7f99f1ddc4b0" >
-                                                <attributelist id="8152" addr="0x7f99f1ddc4b0" >
+                                            <typetabsitem id="8151" addr="0x7fca4692a4b0" >
+                                                <attributelist id="8152" addr="0x7fca4692a4b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="8153" addr="0x7f99f1ddcf90" >
-                                                <attributelist id="8154" addr="0x7f99f1ddcf90" >
+                                            <typetabsitem id="8153" addr="0x7fca4692af90" >
+                                                <attributelist id="8154" addr="0x7fca4692af90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="8155" addr="0x7f99f1de11b0" >
-                                                <attributelist id="8156" addr="0x7f99f1de11b0" >
+                                            <typetabsitem id="8155" addr="0x7fca4692f1b0" >
+                                                <attributelist id="8156" addr="0x7fca4692f1b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="8157" addr="0x7f99f1de15b0" >
-                                                <attributelist id="8158" addr="0x7f99f1de15b0" >
+                                            <typetabsitem id="8157" addr="0x7fca4692f5b0" >
+                                                <attributelist id="8158" addr="0x7fca4692f5b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="8159" addr="0x7f99f1dd77f0" >
-                                                <attributelist id="8160" addr="0x7f99f1dd77f0" >
+                                            <typetabsitem id="8159" addr="0x7fca469257f0" >
+                                                <attributelist id="8160" addr="0x7fca469257f0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="8161" addr="0x7f99f1dd8b30" >
-                                                <attributelist id="8162" addr="0x7f99f1dd8b30" >
+                                            <typetabsitem id="8161" addr="0x7fca46926b30" >
+                                                <attributelist id="8162" addr="0x7fca46926b30" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="8163" addr="0x7f99f1dd2c50" >
-                                                <attributelist id="8164" addr="0x7f99f1dd2c50" >
+                                            <typetabsitem id="8163" addr="0x7fca46920c50" >
+                                                <attributelist id="8164" addr="0x7fca46920c50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="8165" addr="0x7f99f1dda790" >
-                                                <attributelist id="8166" addr="0x7f99f1dda790" >
+                                            <typetabsitem id="8165" addr="0x7fca46928790" >
+                                                <attributelist id="8166" addr="0x7fca46928790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="8167" addr="0x7f99f1dd8030" >
-                                                <attributelist id="8168" addr="0x7f99f1dd8030" >
+                                            <typetabsitem id="8167" addr="0x7fca46926030" >
+                                                <attributelist id="8168" addr="0x7fca46926030" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="8169" addr="0x7f99f1ddbe10" >
-                                                <attributelist id="8170" addr="0x7f99f1ddbe10" >
+                                            <typetabsitem id="8169" addr="0x7fca46929e10" >
+                                                <attributelist id="8170" addr="0x7fca46929e10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="8171" addr="0x7f99f1dd6b10" >
-                                                <attributelist id="8172" addr="0x7f99f1dd6b10" >
+                                            <typetabsitem id="8171" addr="0x7fca46924b10" >
+                                                <attributelist id="8172" addr="0x7fca46924b10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="8173" addr="0x7f99f1dddf90" >
-                                                <attributelist id="8174" addr="0x7f99f1dddf90" >
+                                            <typetabsitem id="8173" addr="0x7fca4692bf90" >
+                                                <attributelist id="8174" addr="0x7fca4692bf90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="8175" addr="0x7f99f1de0530" >
-                                                <attributelist id="8176" addr="0x7f99f1de0530" >
+                                            <typetabsitem id="8175" addr="0x7fca4692e530" >
+                                                <attributelist id="8176" addr="0x7fca4692e530" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="8177" addr="0x7f99f1de1e50" >
-                                                <attributelist id="8178" addr="0x7f99f1de1e50" >
+                                            <typetabsitem id="8177" addr="0x7fca4692fe50" >
+                                                <attributelist id="8178" addr="0x7fca4692fe50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="8179" addr="0x7f99f1de2d90" >
-                                                <attributelist id="8180" addr="0x7f99f1de2d90" >
+                                            <typetabsitem id="8179" addr="0x7fca46930d90" >
+                                                <attributelist id="8180" addr="0x7fca46930d90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="8181" addr="0x7f99f1de3410" >
-                                                <attributelist id="8182" addr="0x7f99f1de3410" >
+                                            <typetabsitem id="8181" addr="0x7fca46931410" >
+                                                <attributelist id="8182" addr="0x7fca46931410" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="8183" addr="0x7f99f1dd3590" >
-                                                <attributelist id="8184" addr="0x7f99f1dd3590" >
+                                            <typetabsitem id="8183" addr="0x7fca46921590" >
+                                                <attributelist id="8184" addr="0x7fca46921590" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="8185" addr="0x7f99f1dd3390" >
-                                                <attributelist id="8186" addr="0x7f99f1dd3390" >
+                                            <typetabsitem id="8185" addr="0x7fca46921390" >
+                                                <attributelist id="8186" addr="0x7fca46921390" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7f99f1dd1d70" id="8187" addr="0x7f99f1dd1d70" />
-                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="8188" addr="0x7f99f1de6c90" />
-                                        <attribute name="symtab" value="0x7f99f1e40fb0" id="8189" addr="0x7f99f1e40fb0" />
+                                        <attribute name="parent" value="0x7fca4691fd70" id="8187" addr="0x7fca4691fd70" />
+                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="8188" addr="0x7fca46934c90" />
+                                        <attribute name="symtab" value="0x7fca4698efb0" id="8189" addr="0x7fca4698efb0" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="8190" addr="0x7f99f1ddc5b0" >
-                                    <attributelist id="8191" addr="0x7f99f1ddc5b0" >
+                                <typescopesitem id="8190" addr="0x7fca4692a5b0" >
+                                    <attributelist id="8191" addr="0x7fca4692a5b0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="8192" addr="0x7f99f1e7a990" >
-                                    <attributelist id="8193" addr="0x7f99f1e7a990" >
-                                        <attribute name="inherit" value="0x7f99f1e7a9f0" id="8194" addr="0x7f99f1e7a9f0" />
-                                        <attribute name="name" value="ControlButton" id="8195" addr="0x7f99f1de6c90" />
-                                        <attribute name="csymtab" value="0x7f99f1e7a9b0" id="8196" addr="0x7f99f1e7a9b0" />
-                                        <attribute name="symtab" value="0x7f99f1e7a970" id="8197" addr="0x7f99f1e7a970" />
+                                <typescopesitem id="8192" addr="0x7fca469c8990" >
+                                    <attributelist id="8193" addr="0x7fca469c8990" >
+                                        <attribute name="inherit" value="0x7fca469c89f0" id="8194" addr="0x7fca469c89f0" />
+                                        <attribute name="name" value="ControlButton" id="8195" addr="0x7fca46934c90" />
+                                        <attribute name="csymtab" value="0x7fca469c89b0" id="8196" addr="0x7fca469c89b0" />
+                                        <attribute name="symtab" value="0x7fca469c8970" id="8197" addr="0x7fca469c8970" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <access id="8198" addr="0x7f99f1e7a910" >
-                            <attributelist id="8199" addr="0x7f99f1e7a910" >
-                                <attribute name="kind" value="public" id="8200" addr="0x7f99f1de6c90" />
+                        <access id="8198" addr="0x7fca469c8910" >
+                            <attributelist id="8199" addr="0x7fca469c8910" >
+                                <attribute name="kind" value="public" id="8200" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="8201" addr="0x7f99f1e7c250" >
-                            <attributelist id="8202" addr="0x7f99f1e7c250" >
-                                <attribute name="name" value="ControlButton" id="8203" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="8204" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e7a990" id="8205" addr="0x7f99f1e7a990" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e7cc10" id="8206" addr="0x7f99f1e7cc10" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e7cc10" id="8207" addr="0x7f99f1e7cc10" />
-                                <attribute name="sym_name" value="ControlButton" id="8208" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,long,p.q(const).char,p.q(const).char)." id="8209" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="8210" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e7c250" id="8211" addr="0x7f99f1e7c250" />
-                                <parmlist id="8212" addr="0x7f99f1e7ab50" >
+                        <constructor id="8201" addr="0x7fca469ca250" >
+                            <attributelist id="8202" addr="0x7fca469ca250" >
+                                <attribute name="name" value="ControlButton" id="8203" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="8204" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c8990" id="8205" addr="0x7fca469c8990" />
+                                <attribute name="sym_nextSibling" value="0x7fca469cac10" id="8206" addr="0x7fca469cac10" />
+                                <attribute name="csym_nextSibling" value="0x7fca469cac10" id="8207" addr="0x7fca469cac10" />
+                                <attribute name="sym_name" value="ControlButton" id="8208" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,long,p.q(const).char,p.q(const).char)." id="8209" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="8210" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469ca250" id="8211" addr="0x7fca469ca250" />
+                                <parmlist id="8212" addr="0x7fca469c8b50" >
                                     <parm id="8213">
-                                        <attributelist id="8214" addr="0x7f99f1e7ab50" >
-                                            <attribute name="name" value="x" id="8215" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8216" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8214" addr="0x7fca469c8b50" >
+                                            <attribute name="name" value="x" id="8215" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8216" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8217">
-                                        <attributelist id="8218" addr="0x7f99f1e7ac70" >
-                                            <attribute name="name" value="y" id="8219" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8220" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8218" addr="0x7fca469c8c70" >
+                                            <attribute name="name" value="y" id="8219" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8220" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8221">
-                                        <attributelist id="8222" addr="0x7f99f1e7ad90" >
-                                            <attribute name="name" value="width" id="8223" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8224" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8222" addr="0x7fca469c8d90" >
+                                            <attribute name="name" value="width" id="8223" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8224" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8225">
-                                        <attributelist id="8226" addr="0x7f99f1e7aeb0" >
-                                            <attribute name="name" value="height" id="8227" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8228" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8226" addr="0x7fca469c8eb0" >
+                                            <attribute name="name" value="height" id="8227" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8228" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8229">
-                                        <attributelist id="8230" addr="0x7f99f1e7aff0" >
-                                            <attribute name="name" value="label" id="8231" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="8232" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8230" addr="0x7fca469c8ff0" >
+                                            <attribute name="name" value="label" id="8231" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="8232" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8233">
-                                        <attributelist id="8234" addr="0x7f99f1e7b190" >
-                                            <attribute name="name" value="focusTexture" id="8235" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8236" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8237" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8234" addr="0x7fca469c9190" >
+                                            <attribute name="name" value="focusTexture" id="8235" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8236" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8237" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8238">
-                                        <attributelist id="8239" addr="0x7f99f1e7b330" >
-                                            <attribute name="name" value="noFocusTexture" id="8240" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8241" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8242" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8239" addr="0x7fca469c9330" >
+                                            <attribute name="name" value="noFocusTexture" id="8240" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8241" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8242" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8243">
-                                        <attributelist id="8244" addr="0x7f99f1e7b490" >
-                                            <attribute name="name" value="textOffsetX" id="8245" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="8246" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8247" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8244" addr="0x7fca469c9490" >
+                                            <attribute name="name" value="textOffsetX" id="8245" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="8246" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8247" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8248">
-                                        <attributelist id="8249" addr="0x7f99f1e7b5f0" >
-                                            <attribute name="name" value="textOffsetY" id="8250" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="2" id="8251" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8252" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8249" addr="0x7fca469c95f0" >
+                                            <attribute name="name" value="textOffsetY" id="8250" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="2" id="8251" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8252" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8253">
-                                        <attributelist id="8254" addr="0x7f99f1e7b810" >
-                                            <attribute name="name" value="alignment" id="8255" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="(XBFONT_LEFT|XBFONT_CENTER_Y)" id="8256" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8257" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8254" addr="0x7fca469c9810" >
+                                            <attribute name="name" value="alignment" id="8255" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="(XBFONT_LEFT|XBFONT_CENTER_Y)" id="8256" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8257" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8258">
-                                        <attributelist id="8259" addr="0x7f99f1e7b9b0" >
-                                            <attribute name="name" value="font" id="8260" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8261" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8262" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8259" addr="0x7fca469c99b0" >
+                                            <attribute name="name" value="font" id="8260" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8261" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8262" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8263">
-                                        <attributelist id="8264" addr="0x7f99f1e7bb50" >
-                                            <attribute name="name" value="textColor" id="8265" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8266" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8267" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8264" addr="0x7fca469c9b50" >
+                                            <attribute name="name" value="textColor" id="8265" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8266" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8267" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8268">
-                                        <attributelist id="8269" addr="0x7f99f1e7bcf0" >
-                                            <attribute name="name" value="disabledColor" id="8270" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8271" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8272" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8269" addr="0x7fca469c9cf0" >
+                                            <attribute name="name" value="disabledColor" id="8270" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8271" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8272" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8273">
-                                        <attributelist id="8274" addr="0x7f99f1e7be50" >
-                                            <attribute name="name" value="angle" id="8275" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="0" id="8276" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8277" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8274" addr="0x7fca469c9e50" >
+                                            <attribute name="name" value="angle" id="8275" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="0" id="8276" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8277" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8278">
-                                        <attributelist id="8279" addr="0x7f99f1e7bff0" >
-                                            <attribute name="name" value="shadowColor" id="8280" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8281" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8282" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8279" addr="0x7fca469c9ff0" >
+                                            <attribute name="name" value="shadowColor" id="8280" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8281" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8282" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8283">
-                                        <attributelist id="8284" addr="0x7f99f1e7c190" >
-                                            <attribute name="name" value="focusedColor" id="8285" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8286" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8287" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8284" addr="0x7fca469ca190" >
+                                            <attribute name="name" value="focusedColor" id="8285" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8286" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8287" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_0" id="8288" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="8289" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="8288" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="8289" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="8290" addr="0x7f99f1e7cc10" >
-                            <attributelist id="8291" addr="0x7f99f1e7cc10" >
-                                <attribute name="name" value="ControlButton" id="8292" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="8293" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e7a990" id="8294" addr="0x7f99f1e7a990" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e7d530" id="8295" addr="0x7f99f1e7d530" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e7c250" id="8296" addr="0x7f99f1e7c250" />
-                                <attribute name="sym_name" value="ControlButton" id="8297" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e7d530" id="8298" addr="0x7f99f1e7d530" />
-                                <attribute name="defaultargs" value="0x7f99f1e7c250" id="8299" addr="0x7f99f1e7c250" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,long,p.q(const).char)." id="8300" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="8301" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e7c250" id="8302" addr="0x7f99f1e7c250" />
-                                <parmlist id="8303" addr="0x7f99f1e7c2f0" >
+                        <constructor id="8290" addr="0x7fca469cac10" >
+                            <attributelist id="8291" addr="0x7fca469cac10" >
+                                <attribute name="name" value="ControlButton" id="8292" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="8293" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c8990" id="8294" addr="0x7fca469c8990" />
+                                <attribute name="csym_nextSibling" value="0x7fca469cb530" id="8295" addr="0x7fca469cb530" />
+                                <attribute name="sym_previousSibling" value="0x7fca469ca250" id="8296" addr="0x7fca469ca250" />
+                                <attribute name="sym_name" value="ControlButton" id="8297" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469cb530" id="8298" addr="0x7fca469cb530" />
+                                <attribute name="defaultargs" value="0x7fca469ca250" id="8299" addr="0x7fca469ca250" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,long,p.q(const).char)." id="8300" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="8301" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469ca250" id="8302" addr="0x7fca469ca250" />
+                                <parmlist id="8303" addr="0x7fca469ca2f0" >
                                     <parm id="8304">
-                                        <attributelist id="8305" addr="0x7f99f1e7c2f0" >
-                                            <attribute name="name" value="x" id="8306" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8307" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8305" addr="0x7fca469ca2f0" >
+                                            <attribute name="name" value="x" id="8306" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8307" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8308">
-                                        <attributelist id="8309" addr="0x7f99f1e7c3b0" >
-                                            <attribute name="name" value="y" id="8310" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8311" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8309" addr="0x7fca469ca3b0" >
+                                            <attribute name="name" value="y" id="8310" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8311" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8312">
-                                        <attributelist id="8313" addr="0x7f99f1e7c430" >
-                                            <attribute name="name" value="width" id="8314" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8315" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8313" addr="0x7fca469ca430" >
+                                            <attribute name="name" value="width" id="8314" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8315" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8316">
-                                        <attributelist id="8317" addr="0x7f99f1e7c4b0" >
-                                            <attribute name="name" value="height" id="8318" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8319" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8317" addr="0x7fca469ca4b0" >
+                                            <attribute name="name" value="height" id="8318" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8319" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8320">
-                                        <attributelist id="8321" addr="0x7f99f1e7c530" >
-                                            <attribute name="name" value="label" id="8322" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="8323" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8321" addr="0x7fca469ca530" >
+                                            <attribute name="name" value="label" id="8322" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="8323" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8324">
-                                        <attributelist id="8325" addr="0x7f99f1e7c5b0" >
-                                            <attribute name="name" value="focusTexture" id="8326" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8327" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8328" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8325" addr="0x7fca469ca5b0" >
+                                            <attribute name="name" value="focusTexture" id="8326" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8327" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8328" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8329">
-                                        <attributelist id="8330" addr="0x7f99f1e7c650" >
-                                            <attribute name="name" value="noFocusTexture" id="8331" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8332" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8333" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8330" addr="0x7fca469ca650" >
+                                            <attribute name="name" value="noFocusTexture" id="8331" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8332" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8333" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8334">
-                                        <attributelist id="8335" addr="0x7f99f1e7c6f0" >
-                                            <attribute name="name" value="textOffsetX" id="8336" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="8337" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8338" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8335" addr="0x7fca469ca6f0" >
+                                            <attribute name="name" value="textOffsetX" id="8336" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="8337" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8338" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8339">
-                                        <attributelist id="8340" addr="0x7f99f1e7c790" >
-                                            <attribute name="name" value="textOffsetY" id="8341" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="2" id="8342" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8343" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8340" addr="0x7fca469ca790" >
+                                            <attribute name="name" value="textOffsetY" id="8341" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="2" id="8342" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8343" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8344">
-                                        <attributelist id="8345" addr="0x7f99f1e7c830" >
-                                            <attribute name="name" value="alignment" id="8346" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="(XBFONT_LEFT|XBFONT_CENTER_Y)" id="8347" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8348" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8345" addr="0x7fca469ca830" >
+                                            <attribute name="name" value="alignment" id="8346" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="(XBFONT_LEFT|XBFONT_CENTER_Y)" id="8347" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8348" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8349">
-                                        <attributelist id="8350" addr="0x7f99f1e7c8d0" >
-                                            <attribute name="name" value="font" id="8351" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8352" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8353" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8350" addr="0x7fca469ca8d0" >
+                                            <attribute name="name" value="font" id="8351" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8352" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8353" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8354">
-                                        <attributelist id="8355" addr="0x7f99f1e7c970" >
-                                            <attribute name="name" value="textColor" id="8356" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8357" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8358" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8355" addr="0x7fca469ca970" >
+                                            <attribute name="name" value="textColor" id="8356" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8357" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8358" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8359">
-                                        <attributelist id="8360" addr="0x7f99f1e7ca10" >
-                                            <attribute name="name" value="disabledColor" id="8361" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8362" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8363" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8360" addr="0x7fca469caa10" >
+                                            <attribute name="name" value="disabledColor" id="8361" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8362" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8363" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8364">
-                                        <attributelist id="8365" addr="0x7f99f1e7cab0" >
-                                            <attribute name="name" value="angle" id="8366" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="0" id="8367" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8368" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8365" addr="0x7fca469caab0" >
+                                            <attribute name="name" value="angle" id="8366" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="0" id="8367" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8368" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8369">
-                                        <attributelist id="8370" addr="0x7f99f1e7cb50" >
-                                            <attribute name="name" value="shadowColor" id="8371" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8372" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8373" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8370" addr="0x7fca469cab50" >
+                                            <attribute name="name" value="shadowColor" id="8371" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8372" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8373" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_1" id="8374" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="8375" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="8374" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="8375" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="8376" addr="0x7f99f1e7d530" >
-                            <attributelist id="8377" addr="0x7f99f1e7d530" >
-                                <attribute name="name" value="ControlButton" id="8378" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="8379" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e7a990" id="8380" addr="0x7f99f1e7a990" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e7ddb0" id="8381" addr="0x7f99f1e7ddb0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e7cc10" id="8382" addr="0x7f99f1e7cc10" />
-                                <attribute name="sym_name" value="ControlButton" id="8383" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e7ddb0" id="8384" addr="0x7f99f1e7ddb0" />
-                                <attribute name="defaultargs" value="0x7f99f1e7c250" id="8385" addr="0x7f99f1e7c250" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,long)." id="8386" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="8387" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e7c250" id="8388" addr="0x7f99f1e7c250" />
-                                <parmlist id="8389" addr="0x7f99f1e7ccb0" >
+                        <constructor id="8376" addr="0x7fca469cb530" >
+                            <attributelist id="8377" addr="0x7fca469cb530" >
+                                <attribute name="name" value="ControlButton" id="8378" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="8379" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c8990" id="8380" addr="0x7fca469c8990" />
+                                <attribute name="csym_nextSibling" value="0x7fca469cbdb0" id="8381" addr="0x7fca469cbdb0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469cac10" id="8382" addr="0x7fca469cac10" />
+                                <attribute name="sym_name" value="ControlButton" id="8383" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469cbdb0" id="8384" addr="0x7fca469cbdb0" />
+                                <attribute name="defaultargs" value="0x7fca469ca250" id="8385" addr="0x7fca469ca250" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,long)." id="8386" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="8387" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469ca250" id="8388" addr="0x7fca469ca250" />
+                                <parmlist id="8389" addr="0x7fca469cacb0" >
                                     <parm id="8390">
-                                        <attributelist id="8391" addr="0x7f99f1e7ccb0" >
-                                            <attribute name="name" value="x" id="8392" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8393" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8391" addr="0x7fca469cacb0" >
+                                            <attribute name="name" value="x" id="8392" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8393" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8394">
-                                        <attributelist id="8395" addr="0x7f99f1e7cd70" >
-                                            <attribute name="name" value="y" id="8396" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8397" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8395" addr="0x7fca469cad70" >
+                                            <attribute name="name" value="y" id="8396" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8397" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8398">
-                                        <attributelist id="8399" addr="0x7f99f1e7cdf0" >
-                                            <attribute name="name" value="width" id="8400" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8401" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8399" addr="0x7fca469cadf0" >
+                                            <attribute name="name" value="width" id="8400" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8401" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8402">
-                                        <attributelist id="8403" addr="0x7f99f1e7ce70" >
-                                            <attribute name="name" value="height" id="8404" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8405" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8403" addr="0x7fca469cae70" >
+                                            <attribute name="name" value="height" id="8404" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8405" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8406">
-                                        <attributelist id="8407" addr="0x7f99f1e7cef0" >
-                                            <attribute name="name" value="label" id="8408" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="8409" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8407" addr="0x7fca469caef0" >
+                                            <attribute name="name" value="label" id="8408" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="8409" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8410">
-                                        <attributelist id="8411" addr="0x7f99f1e7cf70" >
-                                            <attribute name="name" value="focusTexture" id="8412" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8413" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8414" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8411" addr="0x7fca469caf70" >
+                                            <attribute name="name" value="focusTexture" id="8412" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8413" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8414" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8415">
-                                        <attributelist id="8416" addr="0x7f99f1e7d010" >
-                                            <attribute name="name" value="noFocusTexture" id="8417" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8418" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8419" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8416" addr="0x7fca469cb010" >
+                                            <attribute name="name" value="noFocusTexture" id="8417" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8418" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8419" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8420">
-                                        <attributelist id="8421" addr="0x7f99f1e7d0b0" >
-                                            <attribute name="name" value="textOffsetX" id="8422" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="8423" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8424" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8421" addr="0x7fca469cb0b0" >
+                                            <attribute name="name" value="textOffsetX" id="8422" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="8423" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8424" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8425">
-                                        <attributelist id="8426" addr="0x7f99f1e7d150" >
-                                            <attribute name="name" value="textOffsetY" id="8427" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="2" id="8428" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8429" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8426" addr="0x7fca469cb150" >
+                                            <attribute name="name" value="textOffsetY" id="8427" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="2" id="8428" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8429" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8430">
-                                        <attributelist id="8431" addr="0x7f99f1e7d1f0" >
-                                            <attribute name="name" value="alignment" id="8432" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="(XBFONT_LEFT|XBFONT_CENTER_Y)" id="8433" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8434" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8431" addr="0x7fca469cb1f0" >
+                                            <attribute name="name" value="alignment" id="8432" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="(XBFONT_LEFT|XBFONT_CENTER_Y)" id="8433" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8434" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8435">
-                                        <attributelist id="8436" addr="0x7f99f1e7d290" >
-                                            <attribute name="name" value="font" id="8437" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8438" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8439" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8436" addr="0x7fca469cb290" >
+                                            <attribute name="name" value="font" id="8437" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8438" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8439" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8440">
-                                        <attributelist id="8441" addr="0x7f99f1e7d330" >
-                                            <attribute name="name" value="textColor" id="8442" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8443" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8444" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8441" addr="0x7fca469cb330" >
+                                            <attribute name="name" value="textColor" id="8442" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8443" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8444" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8445">
-                                        <attributelist id="8446" addr="0x7f99f1e7d3d0" >
-                                            <attribute name="name" value="disabledColor" id="8447" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8448" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8449" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8446" addr="0x7fca469cb3d0" >
+                                            <attribute name="name" value="disabledColor" id="8447" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8448" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8449" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8450">
-                                        <attributelist id="8451" addr="0x7f99f1e7d470" >
-                                            <attribute name="name" value="angle" id="8452" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="0" id="8453" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8454" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8451" addr="0x7fca469cb470" >
+                                            <attribute name="name" value="angle" id="8452" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="0" id="8453" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8454" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_2" id="8455" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="8456" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_2" id="8455" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="8456" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="8457" addr="0x7f99f1e7ddb0" >
-                            <attributelist id="8458" addr="0x7f99f1e7ddb0" >
-                                <attribute name="name" value="ControlButton" id="8459" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="8460" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e7a990" id="8461" addr="0x7f99f1e7a990" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e7e590" id="8462" addr="0x7f99f1e7e590" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e7d530" id="8463" addr="0x7f99f1e7d530" />
-                                <attribute name="sym_name" value="ControlButton" id="8464" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e7e590" id="8465" addr="0x7f99f1e7e590" />
-                                <attribute name="defaultargs" value="0x7f99f1e7c250" id="8466" addr="0x7f99f1e7c250" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char)." id="8467" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="8468" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e7c250" id="8469" addr="0x7f99f1e7c250" />
-                                <parmlist id="8470" addr="0x7f99f1e7d5d0" >
+                        <constructor id="8457" addr="0x7fca469cbdb0" >
+                            <attributelist id="8458" addr="0x7fca469cbdb0" >
+                                <attribute name="name" value="ControlButton" id="8459" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="8460" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c8990" id="8461" addr="0x7fca469c8990" />
+                                <attribute name="csym_nextSibling" value="0x7fca469cc590" id="8462" addr="0x7fca469cc590" />
+                                <attribute name="sym_previousSibling" value="0x7fca469cb530" id="8463" addr="0x7fca469cb530" />
+                                <attribute name="sym_name" value="ControlButton" id="8464" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469cc590" id="8465" addr="0x7fca469cc590" />
+                                <attribute name="defaultargs" value="0x7fca469ca250" id="8466" addr="0x7fca469ca250" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char)." id="8467" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="8468" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469ca250" id="8469" addr="0x7fca469ca250" />
+                                <parmlist id="8470" addr="0x7fca469cb5d0" >
                                     <parm id="8471">
-                                        <attributelist id="8472" addr="0x7f99f1e7d5d0" >
-                                            <attribute name="name" value="x" id="8473" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8474" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8472" addr="0x7fca469cb5d0" >
+                                            <attribute name="name" value="x" id="8473" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8474" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8475">
-                                        <attributelist id="8476" addr="0x7f99f1e7d690" >
-                                            <attribute name="name" value="y" id="8477" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8478" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8476" addr="0x7fca469cb690" >
+                                            <attribute name="name" value="y" id="8477" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8478" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8479">
-                                        <attributelist id="8480" addr="0x7f99f1e7d710" >
-                                            <attribute name="name" value="width" id="8481" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8482" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8480" addr="0x7fca469cb710" >
+                                            <attribute name="name" value="width" id="8481" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8482" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8483">
-                                        <attributelist id="8484" addr="0x7f99f1e7d790" >
-                                            <attribute name="name" value="height" id="8485" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8486" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8484" addr="0x7fca469cb790" >
+                                            <attribute name="name" value="height" id="8485" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8486" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8487">
-                                        <attributelist id="8488" addr="0x7f99f1e7d810" >
-                                            <attribute name="name" value="label" id="8489" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="8490" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8488" addr="0x7fca469cb810" >
+                                            <attribute name="name" value="label" id="8489" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="8490" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8491">
-                                        <attributelist id="8492" addr="0x7f99f1e7d890" >
-                                            <attribute name="name" value="focusTexture" id="8493" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8494" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8495" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8492" addr="0x7fca469cb890" >
+                                            <attribute name="name" value="focusTexture" id="8493" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8494" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8495" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8496">
-                                        <attributelist id="8497" addr="0x7f99f1e7d930" >
-                                            <attribute name="name" value="noFocusTexture" id="8498" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8499" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8500" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8497" addr="0x7fca469cb930" >
+                                            <attribute name="name" value="noFocusTexture" id="8498" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8499" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8500" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8501">
-                                        <attributelist id="8502" addr="0x7f99f1e7d9d0" >
-                                            <attribute name="name" value="textOffsetX" id="8503" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="8504" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8505" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8502" addr="0x7fca469cb9d0" >
+                                            <attribute name="name" value="textOffsetX" id="8503" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="8504" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8505" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8506">
-                                        <attributelist id="8507" addr="0x7f99f1e7da70" >
-                                            <attribute name="name" value="textOffsetY" id="8508" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="2" id="8509" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8510" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8507" addr="0x7fca469cba70" >
+                                            <attribute name="name" value="textOffsetY" id="8508" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="2" id="8509" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8510" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8511">
-                                        <attributelist id="8512" addr="0x7f99f1e7db10" >
-                                            <attribute name="name" value="alignment" id="8513" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="(XBFONT_LEFT|XBFONT_CENTER_Y)" id="8514" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8515" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8512" addr="0x7fca469cbb10" >
+                                            <attribute name="name" value="alignment" id="8513" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="(XBFONT_LEFT|XBFONT_CENTER_Y)" id="8514" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8515" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8516">
-                                        <attributelist id="8517" addr="0x7f99f1e7dbb0" >
-                                            <attribute name="name" value="font" id="8518" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8519" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8520" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8517" addr="0x7fca469cbbb0" >
+                                            <attribute name="name" value="font" id="8518" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8519" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8520" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8521">
-                                        <attributelist id="8522" addr="0x7f99f1e7dc50" >
-                                            <attribute name="name" value="textColor" id="8523" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8524" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8525" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8522" addr="0x7fca469cbc50" >
+                                            <attribute name="name" value="textColor" id="8523" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8524" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8525" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8526">
-                                        <attributelist id="8527" addr="0x7f99f1e7dcf0" >
-                                            <attribute name="name" value="disabledColor" id="8528" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8529" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8530" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8527" addr="0x7fca469cbcf0" >
+                                            <attribute name="name" value="disabledColor" id="8528" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8529" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8530" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_3" id="8531" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="8532" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_3" id="8531" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="8532" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="8533" addr="0x7f99f1e7e590" >
-                            <attributelist id="8534" addr="0x7f99f1e7e590" >
-                                <attribute name="name" value="ControlButton" id="8535" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="8536" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e7a990" id="8537" addr="0x7f99f1e7a990" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e7ecd0" id="8538" addr="0x7f99f1e7ecd0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e7ddb0" id="8539" addr="0x7f99f1e7ddb0" />
-                                <attribute name="sym_name" value="ControlButton" id="8540" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e7ecd0" id="8541" addr="0x7f99f1e7ecd0" />
-                                <attribute name="defaultargs" value="0x7f99f1e7c250" id="8542" addr="0x7f99f1e7c250" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,long,long,long,p.q(const).char,p.q(const).char)." id="8543" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="8544" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e7c250" id="8545" addr="0x7f99f1e7c250" />
-                                <parmlist id="8546" addr="0x7f99f1e7de50" >
+                        <constructor id="8533" addr="0x7fca469cc590" >
+                            <attributelist id="8534" addr="0x7fca469cc590" >
+                                <attribute name="name" value="ControlButton" id="8535" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="8536" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c8990" id="8537" addr="0x7fca469c8990" />
+                                <attribute name="csym_nextSibling" value="0x7fca469cccd0" id="8538" addr="0x7fca469cccd0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469cbdb0" id="8539" addr="0x7fca469cbdb0" />
+                                <attribute name="sym_name" value="ControlButton" id="8540" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469cccd0" id="8541" addr="0x7fca469cccd0" />
+                                <attribute name="defaultargs" value="0x7fca469ca250" id="8542" addr="0x7fca469ca250" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,long,long,long,p.q(const).char,p.q(const).char)." id="8543" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="8544" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469ca250" id="8545" addr="0x7fca469ca250" />
+                                <parmlist id="8546" addr="0x7fca469cbe50" >
                                     <parm id="8547">
-                                        <attributelist id="8548" addr="0x7f99f1e7de50" >
-                                            <attribute name="name" value="x" id="8549" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8550" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8548" addr="0x7fca469cbe50" >
+                                            <attribute name="name" value="x" id="8549" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8550" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8551">
-                                        <attributelist id="8552" addr="0x7f99f1e7df10" >
-                                            <attribute name="name" value="y" id="8553" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8554" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8552" addr="0x7fca469cbf10" >
+                                            <attribute name="name" value="y" id="8553" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8554" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8555">
-                                        <attributelist id="8556" addr="0x7f99f1e7df90" >
-                                            <attribute name="name" value="width" id="8557" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8558" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8556" addr="0x7fca469cbf90" >
+                                            <attribute name="name" value="width" id="8557" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8558" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8559">
-                                        <attributelist id="8560" addr="0x7f99f1e7e010" >
-                                            <attribute name="name" value="height" id="8561" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8562" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8560" addr="0x7fca469cc010" >
+                                            <attribute name="name" value="height" id="8561" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8562" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8563">
-                                        <attributelist id="8564" addr="0x7f99f1e7e090" >
-                                            <attribute name="name" value="label" id="8565" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="8566" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8564" addr="0x7fca469cc090" >
+                                            <attribute name="name" value="label" id="8565" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="8566" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8567">
-                                        <attributelist id="8568" addr="0x7f99f1e7e110" >
-                                            <attribute name="name" value="focusTexture" id="8569" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8570" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8571" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8568" addr="0x7fca469cc110" >
+                                            <attribute name="name" value="focusTexture" id="8569" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8570" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8571" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8572">
-                                        <attributelist id="8573" addr="0x7f99f1e7e1b0" >
-                                            <attribute name="name" value="noFocusTexture" id="8574" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8575" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8576" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8573" addr="0x7fca469cc1b0" >
+                                            <attribute name="name" value="noFocusTexture" id="8574" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8575" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8576" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8577">
-                                        <attributelist id="8578" addr="0x7f99f1e7e250" >
-                                            <attribute name="name" value="textOffsetX" id="8579" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="8580" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8581" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8578" addr="0x7fca469cc250" >
+                                            <attribute name="name" value="textOffsetX" id="8579" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="8580" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8581" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8582">
-                                        <attributelist id="8583" addr="0x7f99f1e7e2f0" >
-                                            <attribute name="name" value="textOffsetY" id="8584" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="2" id="8585" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8586" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8583" addr="0x7fca469cc2f0" >
+                                            <attribute name="name" value="textOffsetY" id="8584" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="2" id="8585" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8586" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8587">
-                                        <attributelist id="8588" addr="0x7f99f1e7e390" >
-                                            <attribute name="name" value="alignment" id="8589" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="(XBFONT_LEFT|XBFONT_CENTER_Y)" id="8590" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8591" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8588" addr="0x7fca469cc390" >
+                                            <attribute name="name" value="alignment" id="8589" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="(XBFONT_LEFT|XBFONT_CENTER_Y)" id="8590" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8591" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8592">
-                                        <attributelist id="8593" addr="0x7f99f1e7e430" >
-                                            <attribute name="name" value="font" id="8594" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8595" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8596" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8593" addr="0x7fca469cc430" >
+                                            <attribute name="name" value="font" id="8594" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8595" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8596" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8597">
-                                        <attributelist id="8598" addr="0x7f99f1e7e4d0" >
-                                            <attribute name="name" value="textColor" id="8599" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8600" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8601" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8598" addr="0x7fca469cc4d0" >
+                                            <attribute name="name" value="textColor" id="8599" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8600" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8601" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_4" id="8602" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="8603" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_4" id="8602" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="8603" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="8604" addr="0x7f99f1e7ecd0" >
-                            <attributelist id="8605" addr="0x7f99f1e7ecd0" >
-                                <attribute name="name" value="ControlButton" id="8606" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="8607" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e7a990" id="8608" addr="0x7f99f1e7a990" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e7f370" id="8609" addr="0x7f99f1e7f370" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e7e590" id="8610" addr="0x7f99f1e7e590" />
-                                <attribute name="sym_name" value="ControlButton" id="8611" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e7f370" id="8612" addr="0x7f99f1e7f370" />
-                                <attribute name="defaultargs" value="0x7f99f1e7c250" id="8613" addr="0x7f99f1e7c250" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,long,long,long,p.q(const).char)." id="8614" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="8615" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e7c250" id="8616" addr="0x7f99f1e7c250" />
-                                <parmlist id="8617" addr="0x7f99f1e7e630" >
+                        <constructor id="8604" addr="0x7fca469cccd0" >
+                            <attributelist id="8605" addr="0x7fca469cccd0" >
+                                <attribute name="name" value="ControlButton" id="8606" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="8607" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c8990" id="8608" addr="0x7fca469c8990" />
+                                <attribute name="csym_nextSibling" value="0x7fca469cd370" id="8609" addr="0x7fca469cd370" />
+                                <attribute name="sym_previousSibling" value="0x7fca469cc590" id="8610" addr="0x7fca469cc590" />
+                                <attribute name="sym_name" value="ControlButton" id="8611" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469cd370" id="8612" addr="0x7fca469cd370" />
+                                <attribute name="defaultargs" value="0x7fca469ca250" id="8613" addr="0x7fca469ca250" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,long,long,long,p.q(const).char)." id="8614" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="8615" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469ca250" id="8616" addr="0x7fca469ca250" />
+                                <parmlist id="8617" addr="0x7fca469cc630" >
                                     <parm id="8618">
-                                        <attributelist id="8619" addr="0x7f99f1e7e630" >
-                                            <attribute name="name" value="x" id="8620" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8621" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8619" addr="0x7fca469cc630" >
+                                            <attribute name="name" value="x" id="8620" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8621" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8622">
-                                        <attributelist id="8623" addr="0x7f99f1e7e6f0" >
-                                            <attribute name="name" value="y" id="8624" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8625" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8623" addr="0x7fca469cc6f0" >
+                                            <attribute name="name" value="y" id="8624" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8625" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8626">
-                                        <attributelist id="8627" addr="0x7f99f1e7e770" >
-                                            <attribute name="name" value="width" id="8628" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8629" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8627" addr="0x7fca469cc770" >
+                                            <attribute name="name" value="width" id="8628" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8629" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8630">
-                                        <attributelist id="8631" addr="0x7f99f1e7e7f0" >
-                                            <attribute name="name" value="height" id="8632" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8633" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8631" addr="0x7fca469cc7f0" >
+                                            <attribute name="name" value="height" id="8632" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8633" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8634">
-                                        <attributelist id="8635" addr="0x7f99f1e7e870" >
-                                            <attribute name="name" value="label" id="8636" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="8637" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8635" addr="0x7fca469cc870" >
+                                            <attribute name="name" value="label" id="8636" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="8637" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8638">
-                                        <attributelist id="8639" addr="0x7f99f1e7e8f0" >
-                                            <attribute name="name" value="focusTexture" id="8640" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8641" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8642" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8639" addr="0x7fca469cc8f0" >
+                                            <attribute name="name" value="focusTexture" id="8640" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8641" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8642" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8643">
-                                        <attributelist id="8644" addr="0x7f99f1e7e990" >
-                                            <attribute name="name" value="noFocusTexture" id="8645" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8646" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8647" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8644" addr="0x7fca469cc990" >
+                                            <attribute name="name" value="noFocusTexture" id="8645" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8646" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8647" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8648">
-                                        <attributelist id="8649" addr="0x7f99f1e7ea30" >
-                                            <attribute name="name" value="textOffsetX" id="8650" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="8651" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8652" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8649" addr="0x7fca469cca30" >
+                                            <attribute name="name" value="textOffsetX" id="8650" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="8651" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8652" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8653">
-                                        <attributelist id="8654" addr="0x7f99f1e7ead0" >
-                                            <attribute name="name" value="textOffsetY" id="8655" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="2" id="8656" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8657" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8654" addr="0x7fca469ccad0" >
+                                            <attribute name="name" value="textOffsetY" id="8655" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="2" id="8656" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8657" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8658">
-                                        <attributelist id="8659" addr="0x7f99f1e7eb70" >
-                                            <attribute name="name" value="alignment" id="8660" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="(XBFONT_LEFT|XBFONT_CENTER_Y)" id="8661" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8662" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8659" addr="0x7fca469ccb70" >
+                                            <attribute name="name" value="alignment" id="8660" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="(XBFONT_LEFT|XBFONT_CENTER_Y)" id="8661" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8662" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8663">
-                                        <attributelist id="8664" addr="0x7f99f1e7ec10" >
-                                            <attribute name="name" value="font" id="8665" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8666" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8667" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8664" addr="0x7fca469ccc10" >
+                                            <attribute name="name" value="font" id="8665" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8666" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8667" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_5" id="8668" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="8669" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_5" id="8668" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="8669" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="8670" addr="0x7f99f1e7f370" >
-                            <attributelist id="8671" addr="0x7f99f1e7f370" >
-                                <attribute name="name" value="ControlButton" id="8672" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="8673" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e7a990" id="8674" addr="0x7f99f1e7a990" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e7f970" id="8675" addr="0x7f99f1e7f970" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e7ecd0" id="8676" addr="0x7f99f1e7ecd0" />
-                                <attribute name="sym_name" value="ControlButton" id="8677" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e7f970" id="8678" addr="0x7f99f1e7f970" />
-                                <attribute name="defaultargs" value="0x7f99f1e7c250" id="8679" addr="0x7f99f1e7c250" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,long,long,long)." id="8680" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="8681" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e7c250" id="8682" addr="0x7f99f1e7c250" />
-                                <parmlist id="8683" addr="0x7f99f1e7ed70" >
+                        <constructor id="8670" addr="0x7fca469cd370" >
+                            <attributelist id="8671" addr="0x7fca469cd370" >
+                                <attribute name="name" value="ControlButton" id="8672" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="8673" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c8990" id="8674" addr="0x7fca469c8990" />
+                                <attribute name="csym_nextSibling" value="0x7fca469cd970" id="8675" addr="0x7fca469cd970" />
+                                <attribute name="sym_previousSibling" value="0x7fca469cccd0" id="8676" addr="0x7fca469cccd0" />
+                                <attribute name="sym_name" value="ControlButton" id="8677" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469cd970" id="8678" addr="0x7fca469cd970" />
+                                <attribute name="defaultargs" value="0x7fca469ca250" id="8679" addr="0x7fca469ca250" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,long,long,long)." id="8680" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="8681" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469ca250" id="8682" addr="0x7fca469ca250" />
+                                <parmlist id="8683" addr="0x7fca469ccd70" >
                                     <parm id="8684">
-                                        <attributelist id="8685" addr="0x7f99f1e7ed70" >
-                                            <attribute name="name" value="x" id="8686" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8687" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8685" addr="0x7fca469ccd70" >
+                                            <attribute name="name" value="x" id="8686" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8687" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8688">
-                                        <attributelist id="8689" addr="0x7f99f1e7ee30" >
-                                            <attribute name="name" value="y" id="8690" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8691" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8689" addr="0x7fca469cce30" >
+                                            <attribute name="name" value="y" id="8690" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8691" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8692">
-                                        <attributelist id="8693" addr="0x7f99f1e7eeb0" >
-                                            <attribute name="name" value="width" id="8694" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8695" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8693" addr="0x7fca469cceb0" >
+                                            <attribute name="name" value="width" id="8694" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8695" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8696">
-                                        <attributelist id="8697" addr="0x7f99f1e7ef30" >
-                                            <attribute name="name" value="height" id="8698" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8699" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8697" addr="0x7fca469ccf30" >
+                                            <attribute name="name" value="height" id="8698" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8699" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8700">
-                                        <attributelist id="8701" addr="0x7f99f1e7efb0" >
-                                            <attribute name="name" value="label" id="8702" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="8703" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8701" addr="0x7fca469ccfb0" >
+                                            <attribute name="name" value="label" id="8702" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="8703" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8704">
-                                        <attributelist id="8705" addr="0x7f99f1e7f030" >
-                                            <attribute name="name" value="focusTexture" id="8706" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8707" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8708" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8705" addr="0x7fca469cd030" >
+                                            <attribute name="name" value="focusTexture" id="8706" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8707" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8708" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8709">
-                                        <attributelist id="8710" addr="0x7f99f1e7f0d0" >
-                                            <attribute name="name" value="noFocusTexture" id="8711" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8712" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8713" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8710" addr="0x7fca469cd0d0" >
+                                            <attribute name="name" value="noFocusTexture" id="8711" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8712" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8713" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8714">
-                                        <attributelist id="8715" addr="0x7f99f1e7f170" >
-                                            <attribute name="name" value="textOffsetX" id="8716" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="8717" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8718" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8715" addr="0x7fca469cd170" >
+                                            <attribute name="name" value="textOffsetX" id="8716" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="8717" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8718" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8719">
-                                        <attributelist id="8720" addr="0x7f99f1e7f210" >
-                                            <attribute name="name" value="textOffsetY" id="8721" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="2" id="8722" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8723" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8720" addr="0x7fca469cd210" >
+                                            <attribute name="name" value="textOffsetY" id="8721" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="2" id="8722" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8723" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8724">
-                                        <attributelist id="8725" addr="0x7f99f1e7f2b0" >
-                                            <attribute name="name" value="alignment" id="8726" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="(XBFONT_LEFT|XBFONT_CENTER_Y)" id="8727" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8728" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8725" addr="0x7fca469cd2b0" >
+                                            <attribute name="name" value="alignment" id="8726" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="(XBFONT_LEFT|XBFONT_CENTER_Y)" id="8727" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8728" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_6" id="8729" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="8730" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_6" id="8729" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="8730" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="8731" addr="0x7f99f1e7f970" >
-                            <attributelist id="8732" addr="0x7f99f1e7f970" >
-                                <attribute name="name" value="ControlButton" id="8733" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="8734" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e7a990" id="8735" addr="0x7f99f1e7a990" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e7fed0" id="8736" addr="0x7f99f1e7fed0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e7f370" id="8737" addr="0x7f99f1e7f370" />
-                                <attribute name="sym_name" value="ControlButton" id="8738" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e7fed0" id="8739" addr="0x7f99f1e7fed0" />
-                                <attribute name="defaultargs" value="0x7f99f1e7c250" id="8740" addr="0x7f99f1e7c250" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,long,long)." id="8741" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="8742" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e7c250" id="8743" addr="0x7f99f1e7c250" />
-                                <parmlist id="8744" addr="0x7f99f1e7f410" >
+                        <constructor id="8731" addr="0x7fca469cd970" >
+                            <attributelist id="8732" addr="0x7fca469cd970" >
+                                <attribute name="name" value="ControlButton" id="8733" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="8734" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c8990" id="8735" addr="0x7fca469c8990" />
+                                <attribute name="csym_nextSibling" value="0x7fca469cded0" id="8736" addr="0x7fca469cded0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469cd370" id="8737" addr="0x7fca469cd370" />
+                                <attribute name="sym_name" value="ControlButton" id="8738" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469cded0" id="8739" addr="0x7fca469cded0" />
+                                <attribute name="defaultargs" value="0x7fca469ca250" id="8740" addr="0x7fca469ca250" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,long,long)." id="8741" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="8742" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469ca250" id="8743" addr="0x7fca469ca250" />
+                                <parmlist id="8744" addr="0x7fca469cd410" >
                                     <parm id="8745">
-                                        <attributelist id="8746" addr="0x7f99f1e7f410" >
-                                            <attribute name="name" value="x" id="8747" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8748" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8746" addr="0x7fca469cd410" >
+                                            <attribute name="name" value="x" id="8747" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8748" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8749">
-                                        <attributelist id="8750" addr="0x7f99f1e7f4d0" >
-                                            <attribute name="name" value="y" id="8751" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8752" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8750" addr="0x7fca469cd4d0" >
+                                            <attribute name="name" value="y" id="8751" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8752" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8753">
-                                        <attributelist id="8754" addr="0x7f99f1e7f550" >
-                                            <attribute name="name" value="width" id="8755" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8756" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8754" addr="0x7fca469cd550" >
+                                            <attribute name="name" value="width" id="8755" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8756" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8757">
-                                        <attributelist id="8758" addr="0x7f99f1e7f5d0" >
-                                            <attribute name="name" value="height" id="8759" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8760" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8758" addr="0x7fca469cd5d0" >
+                                            <attribute name="name" value="height" id="8759" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8760" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8761">
-                                        <attributelist id="8762" addr="0x7f99f1e7f650" >
-                                            <attribute name="name" value="label" id="8763" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="8764" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8762" addr="0x7fca469cd650" >
+                                            <attribute name="name" value="label" id="8763" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="8764" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8765">
-                                        <attributelist id="8766" addr="0x7f99f1e7f6d0" >
-                                            <attribute name="name" value="focusTexture" id="8767" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8768" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8769" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8766" addr="0x7fca469cd6d0" >
+                                            <attribute name="name" value="focusTexture" id="8767" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8768" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8769" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8770">
-                                        <attributelist id="8771" addr="0x7f99f1e7f770" >
-                                            <attribute name="name" value="noFocusTexture" id="8772" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8773" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8774" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8771" addr="0x7fca469cd770" >
+                                            <attribute name="name" value="noFocusTexture" id="8772" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8773" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8774" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8775">
-                                        <attributelist id="8776" addr="0x7f99f1e7f810" >
-                                            <attribute name="name" value="textOffsetX" id="8777" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="8778" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8779" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8776" addr="0x7fca469cd810" >
+                                            <attribute name="name" value="textOffsetX" id="8777" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="8778" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8779" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8780">
-                                        <attributelist id="8781" addr="0x7f99f1e7f8b0" >
-                                            <attribute name="name" value="textOffsetY" id="8782" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="2" id="8783" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8784" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8781" addr="0x7fca469cd8b0" >
+                                            <attribute name="name" value="textOffsetY" id="8782" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="2" id="8783" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8784" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_7" id="8785" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="8786" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_7" id="8785" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="8786" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="8787" addr="0x7f99f1e7fed0" >
-                            <attributelist id="8788" addr="0x7f99f1e7fed0" >
-                                <attribute name="name" value="ControlButton" id="8789" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="8790" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e7a990" id="8791" addr="0x7f99f1e7a990" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e80390" id="8792" addr="0x7f99f1e80390" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e7f970" id="8793" addr="0x7f99f1e7f970" />
-                                <attribute name="sym_name" value="ControlButton" id="8794" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e80390" id="8795" addr="0x7f99f1e80390" />
-                                <attribute name="defaultargs" value="0x7f99f1e7c250" id="8796" addr="0x7f99f1e7c250" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,long)." id="8797" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="8798" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e7c250" id="8799" addr="0x7f99f1e7c250" />
-                                <parmlist id="8800" addr="0x7f99f1e7fa10" >
+                        <constructor id="8787" addr="0x7fca469cded0" >
+                            <attributelist id="8788" addr="0x7fca469cded0" >
+                                <attribute name="name" value="ControlButton" id="8789" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="8790" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c8990" id="8791" addr="0x7fca469c8990" />
+                                <attribute name="csym_nextSibling" value="0x7fca469ce390" id="8792" addr="0x7fca469ce390" />
+                                <attribute name="sym_previousSibling" value="0x7fca469cd970" id="8793" addr="0x7fca469cd970" />
+                                <attribute name="sym_name" value="ControlButton" id="8794" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469ce390" id="8795" addr="0x7fca469ce390" />
+                                <attribute name="defaultargs" value="0x7fca469ca250" id="8796" addr="0x7fca469ca250" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,long)." id="8797" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="8798" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469ca250" id="8799" addr="0x7fca469ca250" />
+                                <parmlist id="8800" addr="0x7fca469cda10" >
                                     <parm id="8801">
-                                        <attributelist id="8802" addr="0x7f99f1e7fa10" >
-                                            <attribute name="name" value="x" id="8803" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8804" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8802" addr="0x7fca469cda10" >
+                                            <attribute name="name" value="x" id="8803" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8804" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8805">
-                                        <attributelist id="8806" addr="0x7f99f1e7fad0" >
-                                            <attribute name="name" value="y" id="8807" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8808" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8806" addr="0x7fca469cdad0" >
+                                            <attribute name="name" value="y" id="8807" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8808" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8809">
-                                        <attributelist id="8810" addr="0x7f99f1e7fb50" >
-                                            <attribute name="name" value="width" id="8811" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8812" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8810" addr="0x7fca469cdb50" >
+                                            <attribute name="name" value="width" id="8811" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8812" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8813">
-                                        <attributelist id="8814" addr="0x7f99f1e7fbd0" >
-                                            <attribute name="name" value="height" id="8815" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8816" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8814" addr="0x7fca469cdbd0" >
+                                            <attribute name="name" value="height" id="8815" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8816" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8817">
-                                        <attributelist id="8818" addr="0x7f99f1e7fc50" >
-                                            <attribute name="name" value="label" id="8819" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="8820" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8818" addr="0x7fca469cdc50" >
+                                            <attribute name="name" value="label" id="8819" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="8820" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8821">
-                                        <attributelist id="8822" addr="0x7f99f1e7fcd0" >
-                                            <attribute name="name" value="focusTexture" id="8823" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8824" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8825" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8822" addr="0x7fca469cdcd0" >
+                                            <attribute name="name" value="focusTexture" id="8823" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8824" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8825" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8826">
-                                        <attributelist id="8827" addr="0x7f99f1e7fd70" >
-                                            <attribute name="name" value="noFocusTexture" id="8828" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8829" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8830" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8827" addr="0x7fca469cdd70" >
+                                            <attribute name="name" value="noFocusTexture" id="8828" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8829" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8830" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8831">
-                                        <attributelist id="8832" addr="0x7f99f1e7fe10" >
-                                            <attribute name="name" value="textOffsetX" id="8833" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="8834" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8835" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8832" addr="0x7fca469cde10" >
+                                            <attribute name="name" value="textOffsetX" id="8833" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="8834" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8835" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_8" id="8836" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="8837" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_8" id="8836" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="8837" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="8838" addr="0x7f99f1e80390" >
-                            <attributelist id="8839" addr="0x7f99f1e80390" >
-                                <attribute name="name" value="ControlButton" id="8840" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="8841" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e7a990" id="8842" addr="0x7f99f1e7a990" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e807b0" id="8843" addr="0x7f99f1e807b0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e7fed0" id="8844" addr="0x7f99f1e7fed0" />
-                                <attribute name="sym_name" value="ControlButton" id="8845" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e807b0" id="8846" addr="0x7f99f1e807b0" />
-                                <attribute name="defaultargs" value="0x7f99f1e7c250" id="8847" addr="0x7f99f1e7c250" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char)." id="8848" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="8849" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e7c250" id="8850" addr="0x7f99f1e7c250" />
-                                <parmlist id="8851" addr="0x7f99f1e7ff70" >
+                        <constructor id="8838" addr="0x7fca469ce390" >
+                            <attributelist id="8839" addr="0x7fca469ce390" >
+                                <attribute name="name" value="ControlButton" id="8840" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="8841" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c8990" id="8842" addr="0x7fca469c8990" />
+                                <attribute name="csym_nextSibling" value="0x7fca469ce7b0" id="8843" addr="0x7fca469ce7b0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469cded0" id="8844" addr="0x7fca469cded0" />
+                                <attribute name="sym_name" value="ControlButton" id="8845" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469ce7b0" id="8846" addr="0x7fca469ce7b0" />
+                                <attribute name="defaultargs" value="0x7fca469ca250" id="8847" addr="0x7fca469ca250" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char)." id="8848" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="8849" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469ca250" id="8850" addr="0x7fca469ca250" />
+                                <parmlist id="8851" addr="0x7fca469cdf70" >
                                     <parm id="8852">
-                                        <attributelist id="8853" addr="0x7f99f1e7ff70" >
-                                            <attribute name="name" value="x" id="8854" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8855" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8853" addr="0x7fca469cdf70" >
+                                            <attribute name="name" value="x" id="8854" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8855" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8856">
-                                        <attributelist id="8857" addr="0x7f99f1e80030" >
-                                            <attribute name="name" value="y" id="8858" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8859" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8857" addr="0x7fca469ce030" >
+                                            <attribute name="name" value="y" id="8858" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8859" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8860">
-                                        <attributelist id="8861" addr="0x7f99f1e800b0" >
-                                            <attribute name="name" value="width" id="8862" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8863" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8861" addr="0x7fca469ce0b0" >
+                                            <attribute name="name" value="width" id="8862" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8863" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8864">
-                                        <attributelist id="8865" addr="0x7f99f1e80130" >
-                                            <attribute name="name" value="height" id="8866" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8867" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8865" addr="0x7fca469ce130" >
+                                            <attribute name="name" value="height" id="8866" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8867" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8868">
-                                        <attributelist id="8869" addr="0x7f99f1e801b0" >
-                                            <attribute name="name" value="label" id="8870" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="8871" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8869" addr="0x7fca469ce1b0" >
+                                            <attribute name="name" value="label" id="8870" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="8871" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8872">
-                                        <attributelist id="8873" addr="0x7f99f1e80230" >
-                                            <attribute name="name" value="focusTexture" id="8874" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8875" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8876" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8873" addr="0x7fca469ce230" >
+                                            <attribute name="name" value="focusTexture" id="8874" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8875" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8876" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8877">
-                                        <attributelist id="8878" addr="0x7f99f1e802d0" >
-                                            <attribute name="name" value="noFocusTexture" id="8879" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8880" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8881" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8878" addr="0x7fca469ce2d0" >
+                                            <attribute name="name" value="noFocusTexture" id="8879" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8880" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8881" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_9" id="8882" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="8883" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_9" id="8882" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="8883" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="8884" addr="0x7f99f1e807b0" >
-                            <attributelist id="8885" addr="0x7f99f1e807b0" >
-                                <attribute name="name" value="ControlButton" id="8886" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="8887" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e7a990" id="8888" addr="0x7f99f1e7a990" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e80b30" id="8889" addr="0x7f99f1e80b30" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e80390" id="8890" addr="0x7f99f1e80390" />
-                                <attribute name="sym_name" value="ControlButton" id="8891" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e80b30" id="8892" addr="0x7f99f1e80b30" />
-                                <attribute name="defaultargs" value="0x7f99f1e7c250" id="8893" addr="0x7f99f1e7c250" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char)." id="8894" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="8895" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e7c250" id="8896" addr="0x7f99f1e7c250" />
-                                <parmlist id="8897" addr="0x7f99f1e80430" >
+                        <constructor id="8884" addr="0x7fca469ce7b0" >
+                            <attributelist id="8885" addr="0x7fca469ce7b0" >
+                                <attribute name="name" value="ControlButton" id="8886" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="8887" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c8990" id="8888" addr="0x7fca469c8990" />
+                                <attribute name="csym_nextSibling" value="0x7fca469ceb30" id="8889" addr="0x7fca469ceb30" />
+                                <attribute name="sym_previousSibling" value="0x7fca469ce390" id="8890" addr="0x7fca469ce390" />
+                                <attribute name="sym_name" value="ControlButton" id="8891" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469ceb30" id="8892" addr="0x7fca469ceb30" />
+                                <attribute name="defaultargs" value="0x7fca469ca250" id="8893" addr="0x7fca469ca250" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char)." id="8894" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="8895" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469ca250" id="8896" addr="0x7fca469ca250" />
+                                <parmlist id="8897" addr="0x7fca469ce430" >
                                     <parm id="8898">
-                                        <attributelist id="8899" addr="0x7f99f1e80430" >
-                                            <attribute name="name" value="x" id="8900" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8901" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8899" addr="0x7fca469ce430" >
+                                            <attribute name="name" value="x" id="8900" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8901" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8902">
-                                        <attributelist id="8903" addr="0x7f99f1e804f0" >
-                                            <attribute name="name" value="y" id="8904" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8905" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8903" addr="0x7fca469ce4f0" >
+                                            <attribute name="name" value="y" id="8904" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8905" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8906">
-                                        <attributelist id="8907" addr="0x7f99f1e80570" >
-                                            <attribute name="name" value="width" id="8908" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8909" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8907" addr="0x7fca469ce570" >
+                                            <attribute name="name" value="width" id="8908" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8909" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8910">
-                                        <attributelist id="8911" addr="0x7f99f1e805f0" >
-                                            <attribute name="name" value="height" id="8912" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8913" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8911" addr="0x7fca469ce5f0" >
+                                            <attribute name="name" value="height" id="8912" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8913" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8914">
-                                        <attributelist id="8915" addr="0x7f99f1e80670" >
-                                            <attribute name="name" value="label" id="8916" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="8917" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8915" addr="0x7fca469ce670" >
+                                            <attribute name="name" value="label" id="8916" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="8917" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8918">
-                                        <attributelist id="8919" addr="0x7f99f1e806f0" >
-                                            <attribute name="name" value="focusTexture" id="8920" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8921" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8922" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8919" addr="0x7fca469ce6f0" >
+                                            <attribute name="name" value="focusTexture" id="8920" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8921" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8922" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_10" id="8923" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="8924" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_10" id="8923" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="8924" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="8925" addr="0x7f99f1e80b30" >
-                            <attributelist id="8926" addr="0x7f99f1e80b30" >
-                                <attribute name="name" value="ControlButton" id="8927" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="8928" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e7a990" id="8929" addr="0x7f99f1e7a990" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e807b0" id="8930" addr="0x7f99f1e807b0" />
-                                <attribute name="sym_name" value="ControlButton" id="8931" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e7c250" id="8932" addr="0x7f99f1e7c250" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String)." id="8933" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="8934" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e7c250" id="8935" addr="0x7f99f1e7c250" />
-                                <parmlist id="8936" addr="0x7f99f1e80850" >
+                        <constructor id="8925" addr="0x7fca469ceb30" >
+                            <attributelist id="8926" addr="0x7fca469ceb30" >
+                                <attribute name="name" value="ControlButton" id="8927" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="8928" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c8990" id="8929" addr="0x7fca469c8990" />
+                                <attribute name="sym_previousSibling" value="0x7fca469ce7b0" id="8930" addr="0x7fca469ce7b0" />
+                                <attribute name="sym_name" value="ControlButton" id="8931" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469ca250" id="8932" addr="0x7fca469ca250" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String)." id="8933" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="8934" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469ca250" id="8935" addr="0x7fca469ca250" />
+                                <parmlist id="8936" addr="0x7fca469ce850" >
                                     <parm id="8937">
-                                        <attributelist id="8938" addr="0x7f99f1e80850" >
-                                            <attribute name="name" value="x" id="8939" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8940" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8938" addr="0x7fca469ce850" >
+                                            <attribute name="name" value="x" id="8939" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8940" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8941">
-                                        <attributelist id="8942" addr="0x7f99f1e80910" >
-                                            <attribute name="name" value="y" id="8943" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8944" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8942" addr="0x7fca469ce910" >
+                                            <attribute name="name" value="y" id="8943" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8944" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8945">
-                                        <attributelist id="8946" addr="0x7f99f1e80990" >
-                                            <attribute name="name" value="width" id="8947" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8948" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8946" addr="0x7fca469ce990" >
+                                            <attribute name="name" value="width" id="8947" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8948" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8949">
-                                        <attributelist id="8950" addr="0x7f99f1e80a10" >
-                                            <attribute name="name" value="height" id="8951" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8952" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8950" addr="0x7fca469cea10" >
+                                            <attribute name="name" value="height" id="8951" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8952" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8953">
-                                        <attributelist id="8954" addr="0x7f99f1e80a90" >
-                                            <attribute name="name" value="label" id="8955" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="8956" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8954" addr="0x7fca469cea90" >
+                                            <attribute name="name" value="label" id="8955" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="8956" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_11" id="8957" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="8958" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_11" id="8957" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="8958" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <cdecl id="8959" addr="0x7f99f1e81830" >
-                            <attributelist id="8960" addr="0x7f99f1e81830" >
-                                <attribute name="name" value="setLabel" id="8961" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="8962" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e7a990" id="8963" addr="0x7f99f1e7a990" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e81d30" id="8964" addr="0x7f99f1e81d30" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e81d30" id="8965" addr="0x7f99f1e81d30" />
-                                <attribute name="kind" value="function" id="8966" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setLabel" id="8967" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,r.q(const).XBMCAddon::String)." id="8968" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="8969" addr="0x7f99f1de6c90" />
-                                <parmlist id="8970" addr="0x7f99f1e80db0" >
+                        <cdecl id="8959" addr="0x7fca469cf830" >
+                            <attributelist id="8960" addr="0x7fca469cf830" >
+                                <attribute name="name" value="setLabel" id="8961" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="8962" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c8990" id="8963" addr="0x7fca469c8990" />
+                                <attribute name="sym_nextSibling" value="0x7fca469cfd30" id="8964" addr="0x7fca469cfd30" />
+                                <attribute name="csym_nextSibling" value="0x7fca469cfd30" id="8965" addr="0x7fca469cfd30" />
+                                <attribute name="kind" value="function" id="8966" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setLabel" id="8967" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,r.q(const).XBMCAddon::String)." id="8968" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="8969" addr="0x7fca46934c90" />
+                                <parmlist id="8970" addr="0x7fca469cedb0" >
                                     <parm id="8971">
-                                        <attributelist id="8972" addr="0x7f99f1e80db0" >
-                                            <attribute name="name" value="label" id="8973" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="8974" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="8975" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8972" addr="0x7fca469cedb0" >
+                                            <attribute name="name" value="label" id="8973" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="8974" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="8975" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8976">
-                                        <attributelist id="8977" addr="0x7f99f1e80f50" >
-                                            <attribute name="name" value="font" id="8978" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8979" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8980" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8977" addr="0x7fca469cef50" >
+                                            <attribute name="name" value="font" id="8978" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8979" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8980" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8981">
-                                        <attributelist id="8982" addr="0x7f99f1e810f0" >
-                                            <attribute name="name" value="textColor" id="8983" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8984" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8985" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8982" addr="0x7fca469cf0f0" >
+                                            <attribute name="name" value="textColor" id="8983" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8984" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8985" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8986">
-                                        <attributelist id="8987" addr="0x7f99f1e81290" >
-                                            <attribute name="name" value="disabledColor" id="8988" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8989" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8990" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8987" addr="0x7fca469cf290" >
+                                            <attribute name="name" value="disabledColor" id="8988" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8989" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8990" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8991">
-                                        <attributelist id="8992" addr="0x7f99f1e81430" >
-                                            <attribute name="name" value="shadowColor" id="8993" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8994" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8995" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8992" addr="0x7fca469cf430" >
+                                            <attribute name="name" value="shadowColor" id="8993" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8994" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8995" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8996">
-                                        <attributelist id="8997" addr="0x7f99f1e815d0" >
-                                            <attribute name="name" value="focusedColor" id="8998" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8999" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9000" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8997" addr="0x7fca469cf5d0" >
+                                            <attribute name="name" value="focusedColor" id="8998" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8999" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9000" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9001">
-                                        <attributelist id="9002" addr="0x7f99f1e81770" >
-                                            <attribute name="name" value="label2" id="9003" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="9004" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="9005" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                    </parm >
-                                </parmlist >
-                                <attribute name="sym_overloaded" value="0x7f99f1e81830" id="9006" addr="0x7f99f1e81830" />
-                                <attribute name="type" value="void" id="9007" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="9008" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="9009" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="9010" addr="0x7f99f1e81d30" >
-                            <attributelist id="9011" addr="0x7f99f1e81d30" >
-                                <attribute name="name" value="setLabel" id="9012" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="9013" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e7a990" id="9014" addr="0x7f99f1e7a990" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e81830" id="9015" addr="0x7f99f1e81830" />
-                                <attribute name="kind" value="function" id="9016" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setLabel" id="9017" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e82190" id="9018" addr="0x7f99f1e82190" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e82190" id="9019" addr="0x7f99f1e82190" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char)." id="9020" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e81830" id="9021" addr="0x7f99f1e81830" />
-                                <attribute name="access" value="public" id="9022" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e81830" id="9023" addr="0x7f99f1e81830" />
-                                <parmlist id="9024" addr="0x7f99f1e818f0" >
+                                        <attributelist id="9002" addr="0x7fca469cf770" >
+                                            <attribute name="name" value="label2" id="9003" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="9004" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="9005" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                    </parm >
+                                </parmlist >
+                                <attribute name="sym_overloaded" value="0x7fca469cf830" id="9006" addr="0x7fca469cf830" />
+                                <attribute name="type" value="void" id="9007" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="9008" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="9009" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="9010" addr="0x7fca469cfd30" >
+                            <attributelist id="9011" addr="0x7fca469cfd30" >
+                                <attribute name="name" value="setLabel" id="9012" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="9013" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c8990" id="9014" addr="0x7fca469c8990" />
+                                <attribute name="sym_previousSibling" value="0x7fca469cf830" id="9015" addr="0x7fca469cf830" />
+                                <attribute name="kind" value="function" id="9016" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setLabel" id="9017" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469d0190" id="9018" addr="0x7fca469d0190" />
+                                <attribute name="sym_nextSibling" value="0x7fca469d0190" id="9019" addr="0x7fca469d0190" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char)." id="9020" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469cf830" id="9021" addr="0x7fca469cf830" />
+                                <attribute name="access" value="public" id="9022" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469cf830" id="9023" addr="0x7fca469cf830" />
+                                <parmlist id="9024" addr="0x7fca469cf8f0" >
                                     <parm id="9025">
-                                        <attributelist id="9026" addr="0x7f99f1e818f0" >
-                                            <attribute name="name" value="label" id="9027" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="9028" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="9029" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9026" addr="0x7fca469cf8f0" >
+                                            <attribute name="name" value="label" id="9027" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="9028" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="9029" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9030">
-                                        <attributelist id="9031" addr="0x7f99f1e819f0" >
-                                            <attribute name="name" value="font" id="9032" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9033" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9034" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9031" addr="0x7fca469cf9f0" >
+                                            <attribute name="name" value="font" id="9032" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9033" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9034" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9035">
-                                        <attributelist id="9036" addr="0x7f99f1e81a90" >
-                                            <attribute name="name" value="textColor" id="9037" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9038" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9039" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9036" addr="0x7fca469cfa90" >
+                                            <attribute name="name" value="textColor" id="9037" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9038" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9039" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9040">
-                                        <attributelist id="9041" addr="0x7f99f1e81b30" >
-                                            <attribute name="name" value="disabledColor" id="9042" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9043" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9044" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9041" addr="0x7fca469cfb30" >
+                                            <attribute name="name" value="disabledColor" id="9042" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9043" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9044" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9045">
-                                        <attributelist id="9046" addr="0x7f99f1e81bd0" >
-                                            <attribute name="name" value="shadowColor" id="9047" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9048" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9049" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9046" addr="0x7fca469cfbd0" >
+                                            <attribute name="name" value="shadowColor" id="9047" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9048" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9049" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9050">
-                                        <attributelist id="9051" addr="0x7f99f1e81c70" >
-                                            <attribute name="name" value="focusedColor" id="9052" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9053" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9054" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                    </parm >
-                                </parmlist >
-                                <attribute name="type" value="void" id="9055" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="9056" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="9057" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="9058" addr="0x7f99f1e82190" >
-                            <attributelist id="9059" addr="0x7f99f1e82190" >
-                                <attribute name="name" value="setLabel" id="9060" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="9061" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e7a990" id="9062" addr="0x7f99f1e7a990" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e81d30" id="9063" addr="0x7f99f1e81d30" />
-                                <attribute name="kind" value="function" id="9064" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setLabel" id="9065" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e82550" id="9066" addr="0x7f99f1e82550" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e82550" id="9067" addr="0x7f99f1e82550" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char)." id="9068" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e81830" id="9069" addr="0x7f99f1e81830" />
-                                <attribute name="access" value="public" id="9070" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e81830" id="9071" addr="0x7f99f1e81830" />
-                                <parmlist id="9072" addr="0x7f99f1e81df0" >
+                                        <attributelist id="9051" addr="0x7fca469cfc70" >
+                                            <attribute name="name" value="focusedColor" id="9052" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9053" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9054" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                    </parm >
+                                </parmlist >
+                                <attribute name="type" value="void" id="9055" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="9056" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="9057" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="9058" addr="0x7fca469d0190" >
+                            <attributelist id="9059" addr="0x7fca469d0190" >
+                                <attribute name="name" value="setLabel" id="9060" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="9061" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c8990" id="9062" addr="0x7fca469c8990" />
+                                <attribute name="sym_previousSibling" value="0x7fca469cfd30" id="9063" addr="0x7fca469cfd30" />
+                                <attribute name="kind" value="function" id="9064" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setLabel" id="9065" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469d0550" id="9066" addr="0x7fca469d0550" />
+                                <attribute name="sym_nextSibling" value="0x7fca469d0550" id="9067" addr="0x7fca469d0550" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char)." id="9068" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469cf830" id="9069" addr="0x7fca469cf830" />
+                                <attribute name="access" value="public" id="9070" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469cf830" id="9071" addr="0x7fca469cf830" />
+                                <parmlist id="9072" addr="0x7fca469cfdf0" >
                                     <parm id="9073">
-                                        <attributelist id="9074" addr="0x7f99f1e81df0" >
-                                            <attribute name="name" value="label" id="9075" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="9076" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="9077" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9074" addr="0x7fca469cfdf0" >
+                                            <attribute name="name" value="label" id="9075" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="9076" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="9077" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9078">
-                                        <attributelist id="9079" addr="0x7f99f1e81ef0" >
-                                            <attribute name="name" value="font" id="9080" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9081" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9082" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9079" addr="0x7fca469cfef0" >
+                                            <attribute name="name" value="font" id="9080" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9081" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9082" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9083">
-                                        <attributelist id="9084" addr="0x7f99f1e81f90" >
-                                            <attribute name="name" value="textColor" id="9085" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9086" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9087" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9084" addr="0x7fca469cff90" >
+                                            <attribute name="name" value="textColor" id="9085" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9086" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9087" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9088">
-                                        <attributelist id="9089" addr="0x7f99f1e82030" >
-                                            <attribute name="name" value="disabledColor" id="9090" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9091" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9092" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9089" addr="0x7fca469d0030" >
+                                            <attribute name="name" value="disabledColor" id="9090" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9091" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9092" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9093">
-                                        <attributelist id="9094" addr="0x7f99f1e820d0" >
-                                            <attribute name="name" value="shadowColor" id="9095" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9096" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9097" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                    </parm >
-                                </parmlist >
-                                <attribute name="type" value="void" id="9098" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_2" id="9099" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="9100" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="9101" addr="0x7f99f1e82550" >
-                            <attributelist id="9102" addr="0x7f99f1e82550" >
-                                <attribute name="name" value="setLabel" id="9103" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="9104" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e7a990" id="9105" addr="0x7f99f1e7a990" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e82190" id="9106" addr="0x7f99f1e82190" />
-                                <attribute name="kind" value="function" id="9107" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setLabel" id="9108" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e82870" id="9109" addr="0x7f99f1e82870" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e82870" id="9110" addr="0x7f99f1e82870" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char,p.q(const).char)." id="9111" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e81830" id="9112" addr="0x7f99f1e81830" />
-                                <attribute name="access" value="public" id="9113" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e81830" id="9114" addr="0x7f99f1e81830" />
-                                <parmlist id="9115" addr="0x7f99f1e82250" >
+                                        <attributelist id="9094" addr="0x7fca469d00d0" >
+                                            <attribute name="name" value="shadowColor" id="9095" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9096" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9097" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                    </parm >
+                                </parmlist >
+                                <attribute name="type" value="void" id="9098" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_2" id="9099" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="9100" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="9101" addr="0x7fca469d0550" >
+                            <attributelist id="9102" addr="0x7fca469d0550" >
+                                <attribute name="name" value="setLabel" id="9103" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="9104" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c8990" id="9105" addr="0x7fca469c8990" />
+                                <attribute name="sym_previousSibling" value="0x7fca469d0190" id="9106" addr="0x7fca469d0190" />
+                                <attribute name="kind" value="function" id="9107" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setLabel" id="9108" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469d0870" id="9109" addr="0x7fca469d0870" />
+                                <attribute name="sym_nextSibling" value="0x7fca469d0870" id="9110" addr="0x7fca469d0870" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char,p.q(const).char)." id="9111" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469cf830" id="9112" addr="0x7fca469cf830" />
+                                <attribute name="access" value="public" id="9113" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469cf830" id="9114" addr="0x7fca469cf830" />
+                                <parmlist id="9115" addr="0x7fca469d0250" >
                                     <parm id="9116">
-                                        <attributelist id="9117" addr="0x7f99f1e82250" >
-                                            <attribute name="name" value="label" id="9118" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="9119" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="9120" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9117" addr="0x7fca469d0250" >
+                                            <attribute name="name" value="label" id="9118" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="9119" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="9120" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9121">
-                                        <attributelist id="9122" addr="0x7f99f1e82350" >
-                                            <attribute name="name" value="font" id="9123" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9124" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9125" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9122" addr="0x7fca469d0350" >
+                                            <attribute name="name" value="font" id="9123" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9124" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9125" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9126">
-                                        <attributelist id="9127" addr="0x7f99f1e823f0" >
-                                            <attribute name="name" value="textColor" id="9128" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9129" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9130" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9127" addr="0x7fca469d03f0" >
+                                            <attribute name="name" value="textColor" id="9128" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9129" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9130" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9131">
-                                        <attributelist id="9132" addr="0x7f99f1e82490" >
-                                            <attribute name="name" value="disabledColor" id="9133" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9134" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9135" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                    </parm >
-                                </parmlist >
-                                <attribute name="type" value="void" id="9136" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_3" id="9137" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="9138" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="9139" addr="0x7f99f1e82870" >
-                            <attributelist id="9140" addr="0x7f99f1e82870" >
-                                <attribute name="name" value="setLabel" id="9141" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="9142" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e7a990" id="9143" addr="0x7f99f1e7a990" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e82550" id="9144" addr="0x7f99f1e82550" />
-                                <attribute name="kind" value="function" id="9145" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setLabel" id="9146" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e82af0" id="9147" addr="0x7f99f1e82af0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e82af0" id="9148" addr="0x7f99f1e82af0" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char)." id="9149" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e81830" id="9150" addr="0x7f99f1e81830" />
-                                <attribute name="access" value="public" id="9151" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e81830" id="9152" addr="0x7f99f1e81830" />
-                                <parmlist id="9153" addr="0x7f99f1e82610" >
+                                        <attributelist id="9132" addr="0x7fca469d0490" >
+                                            <attribute name="name" value="disabledColor" id="9133" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9134" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9135" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                    </parm >
+                                </parmlist >
+                                <attribute name="type" value="void" id="9136" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_3" id="9137" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="9138" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="9139" addr="0x7fca469d0870" >
+                            <attributelist id="9140" addr="0x7fca469d0870" >
+                                <attribute name="name" value="setLabel" id="9141" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="9142" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c8990" id="9143" addr="0x7fca469c8990" />
+                                <attribute name="sym_previousSibling" value="0x7fca469d0550" id="9144" addr="0x7fca469d0550" />
+                                <attribute name="kind" value="function" id="9145" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setLabel" id="9146" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469d0af0" id="9147" addr="0x7fca469d0af0" />
+                                <attribute name="sym_nextSibling" value="0x7fca469d0af0" id="9148" addr="0x7fca469d0af0" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char)." id="9149" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469cf830" id="9150" addr="0x7fca469cf830" />
+                                <attribute name="access" value="public" id="9151" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469cf830" id="9152" addr="0x7fca469cf830" />
+                                <parmlist id="9153" addr="0x7fca469d0610" >
                                     <parm id="9154">
-                                        <attributelist id="9155" addr="0x7f99f1e82610" >
-                                            <attribute name="name" value="label" id="9156" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="9157" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="9158" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9155" addr="0x7fca469d0610" >
+                                            <attribute name="name" value="label" id="9156" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="9157" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="9158" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9159">
-                                        <attributelist id="9160" addr="0x7f99f1e82710" >
-                                            <attribute name="name" value="font" id="9161" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9162" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9163" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9160" addr="0x7fca469d0710" >
+                                            <attribute name="name" value="font" id="9161" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9162" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9163" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9164">
-                                        <attributelist id="9165" addr="0x7f99f1e827b0" >
-                                            <attribute name="name" value="textColor" id="9166" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9167" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9168" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                    </parm >
-                                </parmlist >
-                                <attribute name="type" value="void" id="9169" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_4" id="9170" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="9171" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="9172" addr="0x7f99f1e82af0" >
-                            <attributelist id="9173" addr="0x7f99f1e82af0" >
-                                <attribute name="name" value="setLabel" id="9174" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="9175" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e7a990" id="9176" addr="0x7f99f1e7a990" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e82870" id="9177" addr="0x7f99f1e82870" />
-                                <attribute name="kind" value="function" id="9178" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setLabel" id="9179" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e82cd0" id="9180" addr="0x7f99f1e82cd0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e82cd0" id="9181" addr="0x7f99f1e82cd0" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char)." id="9182" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e81830" id="9183" addr="0x7f99f1e81830" />
-                                <attribute name="access" value="public" id="9184" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e81830" id="9185" addr="0x7f99f1e81830" />
-                                <parmlist id="9186" addr="0x7f99f1e82930" >
+                                        <attributelist id="9165" addr="0x7fca469d07b0" >
+                                            <attribute name="name" value="textColor" id="9166" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9167" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9168" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                    </parm >
+                                </parmlist >
+                                <attribute name="type" value="void" id="9169" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_4" id="9170" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="9171" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="9172" addr="0x7fca469d0af0" >
+                            <attributelist id="9173" addr="0x7fca469d0af0" >
+                                <attribute name="name" value="setLabel" id="9174" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="9175" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c8990" id="9176" addr="0x7fca469c8990" />
+                                <attribute name="sym_previousSibling" value="0x7fca469d0870" id="9177" addr="0x7fca469d0870" />
+                                <attribute name="kind" value="function" id="9178" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setLabel" id="9179" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469d0cd0" id="9180" addr="0x7fca469d0cd0" />
+                                <attribute name="sym_nextSibling" value="0x7fca469d0cd0" id="9181" addr="0x7fca469d0cd0" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char)." id="9182" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469cf830" id="9183" addr="0x7fca469cf830" />
+                                <attribute name="access" value="public" id="9184" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469cf830" id="9185" addr="0x7fca469cf830" />
+                                <parmlist id="9186" addr="0x7fca469d0930" >
                                     <parm id="9187">
-                                        <attributelist id="9188" addr="0x7f99f1e82930" >
-                                            <attribute name="name" value="label" id="9189" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="9190" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="9191" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9188" addr="0x7fca469d0930" >
+                                            <attribute name="name" value="label" id="9189" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="9190" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="9191" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9192">
-                                        <attributelist id="9193" addr="0x7f99f1e82a30" >
-                                            <attribute name="name" value="font" id="9194" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9195" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9196" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                    </parm >
-                                </parmlist >
-                                <attribute name="type" value="void" id="9197" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_5" id="9198" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="9199" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="9200" addr="0x7f99f1e82cd0" >
-                            <attributelist id="9201" addr="0x7f99f1e82cd0" >
-                                <attribute name="name" value="setLabel" id="9202" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="9203" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e7a990" id="9204" addr="0x7f99f1e7a990" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e82af0" id="9205" addr="0x7f99f1e82af0" />
-                                <attribute name="kind" value="function" id="9206" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setLabel" id="9207" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e82df0" id="9208" addr="0x7f99f1e82df0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e82df0" id="9209" addr="0x7f99f1e82df0" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="9210" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e81830" id="9211" addr="0x7f99f1e81830" />
-                                <attribute name="access" value="public" id="9212" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e81830" id="9213" addr="0x7f99f1e81830" />
-                                <parmlist id="9214" addr="0x7f99f1e82bb0" >
+                                        <attributelist id="9193" addr="0x7fca469d0a30" >
+                                            <attribute name="name" value="font" id="9194" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9195" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9196" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                    </parm >
+                                </parmlist >
+                                <attribute name="type" value="void" id="9197" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_5" id="9198" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="9199" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="9200" addr="0x7fca469d0cd0" >
+                            <attributelist id="9201" addr="0x7fca469d0cd0" >
+                                <attribute name="name" value="setLabel" id="9202" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="9203" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c8990" id="9204" addr="0x7fca469c8990" />
+                                <attribute name="sym_previousSibling" value="0x7fca469d0af0" id="9205" addr="0x7fca469d0af0" />
+                                <attribute name="kind" value="function" id="9206" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setLabel" id="9207" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469d0df0" id="9208" addr="0x7fca469d0df0" />
+                                <attribute name="sym_nextSibling" value="0x7fca469d0df0" id="9209" addr="0x7fca469d0df0" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="9210" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469cf830" id="9211" addr="0x7fca469cf830" />
+                                <attribute name="access" value="public" id="9212" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469cf830" id="9213" addr="0x7fca469cf830" />
+                                <parmlist id="9214" addr="0x7fca469d0bb0" >
                                     <parm id="9215">
-                                        <attributelist id="9216" addr="0x7f99f1e82bb0" >
-                                            <attribute name="name" value="label" id="9217" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="9218" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="9219" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                    </parm >
-                                </parmlist >
-                                <attribute name="type" value="void" id="9220" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_6" id="9221" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="9222" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="9223" addr="0x7f99f1e82df0" >
-                            <attributelist id="9224" addr="0x7f99f1e82df0" >
-                                <attribute name="name" value="setLabel" id="9225" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="9226" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e7a990" id="9227" addr="0x7f99f1e7a990" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e82cd0" id="9228" addr="0x7f99f1e82cd0" />
-                                <attribute name="kind" value="function" id="9229" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setLabel" id="9230" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e81830" id="9231" addr="0x7f99f1e81830" />
-                                <attribute name="decl" value="f()." id="9232" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="9233" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e81830" id="9234" addr="0x7f99f1e81830" />
-                                <attribute name="type" value="void" id="9235" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_7" id="9236" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="9237" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="9238" addr="0x7f99f1e83130" >
-                            <attributelist id="9239" addr="0x7f99f1e83130" >
-                                <attribute name="name" value="setDisabledColor" id="9240" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="9241" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e7a990" id="9242" addr="0x7f99f1e7a990" />
-                                <attribute name="kind" value="function" id="9243" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setDisabledColor" id="9244" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(p.q(const).char)." id="9245" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="9246" addr="0x7f99f1de6c90" />
-                                <parmlist id="9247" addr="0x7f99f1e83070" >
+                                        <attributelist id="9216" addr="0x7fca469d0bb0" >
+                                            <attribute name="name" value="label" id="9217" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="9218" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="9219" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                    </parm >
+                                </parmlist >
+                                <attribute name="type" value="void" id="9220" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_6" id="9221" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="9222" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="9223" addr="0x7fca469d0df0" >
+                            <attributelist id="9224" addr="0x7fca469d0df0" >
+                                <attribute name="name" value="setLabel" id="9225" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="9226" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c8990" id="9227" addr="0x7fca469c8990" />
+                                <attribute name="sym_previousSibling" value="0x7fca469d0cd0" id="9228" addr="0x7fca469d0cd0" />
+                                <attribute name="kind" value="function" id="9229" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setLabel" id="9230" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469cf830" id="9231" addr="0x7fca469cf830" />
+                                <attribute name="decl" value="f()." id="9232" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="9233" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469cf830" id="9234" addr="0x7fca469cf830" />
+                                <attribute name="type" value="void" id="9235" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_7" id="9236" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="9237" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="9238" addr="0x7fca469d1130" >
+                            <attributelist id="9239" addr="0x7fca469d1130" >
+                                <attribute name="name" value="setDisabledColor" id="9240" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="9241" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c8990" id="9242" addr="0x7fca469c8990" />
+                                <attribute name="kind" value="function" id="9243" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setDisabledColor" id="9244" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(p.q(const).char)." id="9245" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="9246" addr="0x7fca46934c90" />
+                                <parmlist id="9247" addr="0x7fca469d1070" >
                                     <parm id="9248">
-                                        <attributelist id="9249" addr="0x7f99f1e83070" >
-                                            <attribute name="name" value="color" id="9250" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9251" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9249" addr="0x7fca469d1070" >
+                                            <attribute name="name" value="color" id="9250" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9251" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="9252" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="9253" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="9254" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="9252" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="9253" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="9254" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="9255" addr="0x7f99f1e83330" >
-                            <attributelist id="9256" addr="0x7f99f1e83330" >
-                                <attribute name="feature_python_coerceToUnicode" value="true" id="9257" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="getLabel" id="9258" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="9259" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e7a990" id="9260" addr="0x7f99f1e7a990" />
-                                <attribute name="kind" value="function" id="9261" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getLabel" id="9262" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="9263" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="9264" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="XBMCAddon::String" id="9265" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="9266" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="9267" addr="0x7f99f1de6c90" />
+                        <cdecl id="9255" addr="0x7fca469d1330" >
+                            <attributelist id="9256" addr="0x7fca469d1330" >
+                                <attribute name="feature_python_coerceToUnicode" value="true" id="9257" addr="0x7fca46934c90" />
+                                <attribute name="name" value="getLabel" id="9258" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="9259" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c8990" id="9260" addr="0x7fca469c8990" />
+                                <attribute name="kind" value="function" id="9261" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getLabel" id="9262" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="9263" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="9264" addr="0x7fca46934c90" />
+                                <attribute name="type" value="XBMCAddon::String" id="9265" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="9266" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="9267" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="9268" addr="0x7f99f1e83550" >
-                            <attributelist id="9269" addr="0x7f99f1e83550" >
-                                <attribute name="feature_python_coerceToUnicode" value="true" id="9270" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="getLabel2" id="9271" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="9272" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e7a990" id="9273" addr="0x7f99f1e7a990" />
-                                <attribute name="kind" value="function" id="9274" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getLabel2" id="9275" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="9276" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="9277" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="XBMCAddon::String" id="9278" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="9279" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="9280" addr="0x7f99f1de6c90" />
+                        <cdecl id="9268" addr="0x7fca469d1550" >
+                            <attributelist id="9269" addr="0x7fca469d1550" >
+                                <attribute name="feature_python_coerceToUnicode" value="true" id="9270" addr="0x7fca46934c90" />
+                                <attribute name="name" value="getLabel2" id="9271" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="9272" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c8990" id="9273" addr="0x7fca469c8990" />
+                                <attribute name="kind" value="function" id="9274" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getLabel2" id="9275" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="9276" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="9277" addr="0x7fca46934c90" />
+                                <attribute name="type" value="XBMCAddon::String" id="9278" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="9279" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="9280" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
                     </class >
-                    <class id="9281" addr="0x7f99f1e83850" >
-                        <attributelist id="9282" addr="0x7f99f1e83850" >
-                            <attribute name="name" value="XBMCAddon::xbmcgui::ControlGroup" id="9283" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="9284" addr="0x7f99f1e40fb0" />
-                            <attribute name="symtab" value="0x7f99f1e83990" id="9285" addr="0x7f99f1e83990" />
-                            <attribute name="allows_typedef" value="1" id="9286" addr="0x7f99f1de6c90" />
-                            <attribute name="typepass_visit" value="1" id="9287" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_visit" value="1" id="9288" addr="0x7f99f1de6c90" />
-                            <attribute name="kind" value="class" id="9289" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_name" value="ControlGroup" id="9290" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_has_constructor" value="1" id="9291" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_public_constructor" value="1" id="9292" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_copy_constructor" value="1" id="9293" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_default_destructor" value="1" id="9294" addr="0x7f99f1de6c90" />
-                            <attribute name="privatebaselist" value="0x7f99f1e83830" id="9295" addr="0x7f99f1e83830" />
-                            <attribute name="protectedbaselist" value="0x7f99f1e83810" id="9296" addr="0x7f99f1e83810" />
-                            <baselist id="9297" addr="0x7f99f1e837f0" >
-                                <base name="Control" id="9298" addr="0x7f99f1e83770" />
+                    <class id="9281" addr="0x7fca469d1850" >
+                        <attributelist id="9282" addr="0x7fca469d1850" >
+                            <attribute name="name" value="XBMCAddon::xbmcgui::ControlGroup" id="9283" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="9284" addr="0x7fca4698efb0" />
+                            <attribute name="symtab" value="0x7fca469d1990" id="9285" addr="0x7fca469d1990" />
+                            <attribute name="allows_typedef" value="1" id="9286" addr="0x7fca46934c90" />
+                            <attribute name="typepass_visit" value="1" id="9287" addr="0x7fca46934c90" />
+                            <attribute name="allocate_visit" value="1" id="9288" addr="0x7fca46934c90" />
+                            <attribute name="kind" value="class" id="9289" addr="0x7fca46934c90" />
+                            <attribute name="sym_name" value="ControlGroup" id="9290" addr="0x7fca46934c90" />
+                            <attribute name="allocate_has_constructor" value="1" id="9291" addr="0x7fca46934c90" />
+                            <attribute name="allocate_public_constructor" value="1" id="9292" addr="0x7fca46934c90" />
+                            <attribute name="allocate_copy_constructor" value="1" id="9293" addr="0x7fca46934c90" />
+                            <attribute name="allocate_default_destructor" value="1" id="9294" addr="0x7fca46934c90" />
+                            <attribute name="privatebaselist" value="0x7fca469d1830" id="9295" addr="0x7fca469d1830" />
+                            <attribute name="protectedbaselist" value="0x7fca469d1810" id="9296" addr="0x7fca469d1810" />
+                            <baselist id="9297" addr="0x7fca469d17f0" >
+                                <base name="Control" id="9298" addr="0x7fca469d1770" />
                             </baselist >
-                            <attribute name="module" value="xbmcgui" id="9299" addr="0x7f99f1e402f0" />
-                            <attribute name="bases" value="0x7f99f1ddd0d0" id="9300" addr="0x7f99f1ddd0d0" />
-                            <attribute name="allbases" value="0x7f99f1ddd370" id="9301" addr="0x7f99f1ddd370" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="9302" addr="0x7f99f1de6c90" />
-                            <typescope id="9303" addr="0x7f99f1ddd050" >
-                                <attributelist id="9304" addr="0x7f99f1ddd050" >
-                                    <attribute name="inherit" value="0x7f99f1ddd150" id="9305" addr="0x7f99f1ddd150" />
-                                    <attribute name="name" value="ControlGroup" id="9306" addr="0x7f99f1de6c90" />
-                                    <typetab id="9307" addr="0x7f99f1ddd070" >
-                                        <attributelist id="9308" addr="0x7f99f1ddd070" >
+                            <attribute name="module" value="xbmcgui" id="9299" addr="0x7fca4698e2f0" />
+                            <attribute name="bases" value="0x7fca4692b0d0" id="9300" addr="0x7fca4692b0d0" />
+                            <attribute name="allbases" value="0x7fca4692b370" id="9301" addr="0x7fca4692b370" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="9302" addr="0x7fca46934c90" />
+                            <typescope id="9303" addr="0x7fca4692b050" >
+                                <attributelist id="9304" addr="0x7fca4692b050" >
+                                    <attribute name="inherit" value="0x7fca4692b150" id="9305" addr="0x7fca4692b150" />
+                                    <attribute name="name" value="ControlGroup" id="9306" addr="0x7fca46934c90" />
+                                    <typetab id="9307" addr="0x7fca4692b070" >
+                                        <attributelist id="9308" addr="0x7fca4692b070" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f99f1dd2150" id="9309" addr="0x7f99f1dd2150" />
-                                    <attribute name="qname" value="XBMCAddon::xbmcgui::ControlGroup" id="9310" addr="0x7f99f1de6c90" />
-                                    <attribute name="symtab" value="0x7f99f1e83990" id="9311" addr="0x7f99f1e83990" />
+                                    <attribute name="parent" value="0x7fca46920150" id="9309" addr="0x7fca46920150" />
+                                    <attribute name="qname" value="XBMCAddon::xbmcgui::ControlGroup" id="9310" addr="0x7fca46934c90" />
+                                    <attribute name="symtab" value="0x7fca469d1990" id="9311" addr="0x7fca469d1990" />
                                 </attributelist >
-                                <typescopesitem id="9312" addr="0x7f99f1ddd150" >
-                                    <attributelist id="9313" addr="0x7f99f1ddd150" >
+                                <typescopesitem id="9312" addr="0x7fca4692b150" >
+                                    <attributelist id="9313" addr="0x7fca4692b150" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="9314" addr="0x7f99f1ddcff0" >
-                                    <attributelist id="9315" addr="0x7f99f1ddcff0" >
+                                <typescopesitem id="9314" addr="0x7fca4692aff0" >
+                                    <attributelist id="9315" addr="0x7fca4692aff0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="9316" addr="0x7f99f1ddd070" >
-                                    <attributelist id="9317" addr="0x7f99f1ddd070" >
+                                <typescopesitem id="9316" addr="0x7fca4692b070" >
+                                    <attributelist id="9317" addr="0x7fca4692b070" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="9318" addr="0x7f99f1dd2150" >
-                                    <attributelist id="9319" addr="0x7f99f1dd2150" >
-                                        <attribute name="name" value="xbmcgui" id="9320" addr="0x7f99f1de6c90" />
-                                        <typetab id="9321" addr="0x7f99f1dd2170" >
-                                            <attributelist id="9322" addr="0x7f99f1dd2170" >
-                                                <attribute name="InterceptorBase" value="InterceptorBase" id="9323" addr="0x7f99f1de6c90" />
-                                                <attribute name="Dialog" value="Dialog" id="9324" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="9325" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="9326" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlTextBox" value="ControlTextBox" id="9327" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="9328" addr="0x7f99f1de6c90" />
-                                                <attribute name="Window" value="Window" id="9329" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="9330" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlList" value="ControlList" id="9331" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="9332" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlImage" value="ControlImage" id="9333" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlButton" value="ControlButton" id="9334" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlGroup" value="ControlGroup" id="9335" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogBusy" value="DialogBusy" id="9336" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="9337" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSpin" value="ControlSpin" id="9338" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlEdit" value="ControlEdit" id="9339" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="9340" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="9341" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlLabel" value="ControlLabel" id="9342" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlProgress" value="ControlProgress" id="9343" addr="0x7f99f1de6c90" />
-                                                <attribute name="Control" value="Control" id="9344" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSlider" value="ControlSlider" id="9345" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgress" value="DialogProgress" id="9346" addr="0x7f99f1de6c90" />
-                                                <attribute name="Action" value="Action" id="9347" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowDialog" value="WindowDialog" id="9348" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXML" value="WindowXML" id="9349" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItem" value="ListItem" id="9350" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="9351" addr="0x7f99f1de6c90" />
+                                <typescopesitem id="9318" addr="0x7fca46920150" >
+                                    <attributelist id="9319" addr="0x7fca46920150" >
+                                        <attribute name="name" value="xbmcgui" id="9320" addr="0x7fca46934c90" />
+                                        <typetab id="9321" addr="0x7fca46920170" >
+                                            <attributelist id="9322" addr="0x7fca46920170" >
+                                                <attribute name="InterceptorBase" value="InterceptorBase" id="9323" addr="0x7fca46934c90" />
+                                                <attribute name="Dialog" value="Dialog" id="9324" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="9325" addr="0x7fca46934c90" />
+                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="9326" addr="0x7fca46934c90" />
+                                                <attribute name="ControlTextBox" value="ControlTextBox" id="9327" addr="0x7fca46934c90" />
+                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="9328" addr="0x7fca46934c90" />
+                                                <attribute name="Window" value="Window" id="9329" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="9330" addr="0x7fca46934c90" />
+                                                <attribute name="ControlList" value="ControlList" id="9331" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="9332" addr="0x7fca46934c90" />
+                                                <attribute name="ControlImage" value="ControlImage" id="9333" addr="0x7fca46934c90" />
+                                                <attribute name="ControlButton" value="ControlButton" id="9334" addr="0x7fca46934c90" />
+                                                <attribute name="ControlGroup" value="ControlGroup" id="9335" addr="0x7fca46934c90" />
+                                                <attribute name="DialogBusy" value="DialogBusy" id="9336" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="9337" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSpin" value="ControlSpin" id="9338" addr="0x7fca46934c90" />
+                                                <attribute name="ControlEdit" value="ControlEdit" id="9339" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="9340" addr="0x7fca46934c90" />
+                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="9341" addr="0x7fca46934c90" />
+                                                <attribute name="ControlLabel" value="ControlLabel" id="9342" addr="0x7fca46934c90" />
+                                                <attribute name="ControlProgress" value="ControlProgress" id="9343" addr="0x7fca46934c90" />
+                                                <attribute name="Control" value="Control" id="9344" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSlider" value="ControlSlider" id="9345" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgress" value="DialogProgress" id="9346" addr="0x7fca46934c90" />
+                                                <attribute name="Action" value="Action" id="9347" addr="0x7fca46934c90" />
+                                                <attribute name="WindowDialog" value="WindowDialog" id="9348" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXML" value="WindowXML" id="9349" addr="0x7fca46934c90" />
+                                                <attribute name="ListItem" value="ListItem" id="9350" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="9351" addr="0x7fca46934c90" />
                                             </attributelist >
-                                            <typetabsitem id="9352" addr="0x7f99f1de1dd0" >
-                                                <attributelist id="9353" addr="0x7f99f1de1dd0" >
+                                            <typetabsitem id="9352" addr="0x7fca4692fdd0" >
+                                                <attributelist id="9353" addr="0x7fca4692fdd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9354" addr="0x7f99f1dde790" >
-                                                <attributelist id="9355" addr="0x7f99f1dde790" >
+                                            <typetabsitem id="9354" addr="0x7fca4692c790" >
+                                                <attributelist id="9355" addr="0x7fca4692c790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9356" addr="0x7f99f1de3f10" >
-                                                <attributelist id="9357" addr="0x7f99f1de3f10" >
+                                            <typetabsitem id="9356" addr="0x7fca46931f10" >
+                                                <attributelist id="9357" addr="0x7fca46931f10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9358" addr="0x7f99f1dd67b0" >
-                                                <attributelist id="9359" addr="0x7f99f1dd67b0" >
+                                            <typetabsitem id="9358" addr="0x7fca469247b0" >
+                                                <attributelist id="9359" addr="0x7fca469247b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9360" addr="0x7f99f1ddafd0" >
-                                                <attributelist id="9361" addr="0x7f99f1ddafd0" >
+                                            <typetabsitem id="9360" addr="0x7fca46928fd0" >
+                                                <attributelist id="9361" addr="0x7fca46928fd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9362" addr="0x7f99f1ddd430" >
-                                                <attributelist id="9363" addr="0x7f99f1ddd430" >
+                                            <typetabsitem id="9362" addr="0x7fca4692b430" >
+                                                <attributelist id="9363" addr="0x7fca4692b430" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9364" addr="0x7f99f1de2130" >
-                                                <attributelist id="9365" addr="0x7f99f1de2130" >
+                                            <typetabsitem id="9364" addr="0x7fca46930130" >
+                                                <attributelist id="9365" addr="0x7fca46930130" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9366" addr="0x7f99f1dd2f50" >
-                                                <attributelist id="9367" addr="0x7f99f1dd2f50" >
+                                            <typetabsitem id="9366" addr="0x7fca46920f50" >
+                                                <attributelist id="9367" addr="0x7fca46920f50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9368" addr="0x7f99f1dd9650" >
-                                                <attributelist id="9369" addr="0x7f99f1dd9650" >
+                                            <typetabsitem id="9368" addr="0x7fca46927650" >
+                                                <attributelist id="9369" addr="0x7fca46927650" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9370" addr="0x7f99f1de3390" >
-                                                <attributelist id="9371" addr="0x7f99f1de3390" >
+                                            <typetabsitem id="9370" addr="0x7fca46931390" >
+                                                <attributelist id="9371" addr="0x7fca46931390" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9372" addr="0x7f99f1ddb7b0" >
-                                                <attributelist id="9373" addr="0x7f99f1ddb7b0" >
+                                            <typetabsitem id="9372" addr="0x7fca469297b0" >
+                                                <attributelist id="9373" addr="0x7fca469297b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9374" addr="0x7f99f1ddc4b0" >
-                                                <attributelist id="9375" addr="0x7f99f1ddc4b0" >
+                                            <typetabsitem id="9374" addr="0x7fca4692a4b0" >
+                                                <attributelist id="9375" addr="0x7fca4692a4b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9376" addr="0x7f99f1ddcf90" >
-                                                <attributelist id="9377" addr="0x7f99f1ddcf90" >
+                                            <typetabsitem id="9376" addr="0x7fca4692af90" >
+                                                <attributelist id="9377" addr="0x7fca4692af90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9378" addr="0x7f99f1de11b0" >
-                                                <attributelist id="9379" addr="0x7f99f1de11b0" >
+                                            <typetabsitem id="9378" addr="0x7fca4692f1b0" >
+                                                <attributelist id="9379" addr="0x7fca4692f1b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9380" addr="0x7f99f1de15b0" >
-                                                <attributelist id="9381" addr="0x7f99f1de15b0" >
+                                            <typetabsitem id="9380" addr="0x7fca4692f5b0" >
+                                                <attributelist id="9381" addr="0x7fca4692f5b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9382" addr="0x7f99f1dd77f0" >
-                                                <attributelist id="9383" addr="0x7f99f1dd77f0" >
+                                            <typetabsitem id="9382" addr="0x7fca469257f0" >
+                                                <attributelist id="9383" addr="0x7fca469257f0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9384" addr="0x7f99f1dd8b30" >
-                                                <attributelist id="9385" addr="0x7f99f1dd8b30" >
+                                            <typetabsitem id="9384" addr="0x7fca46926b30" >
+                                                <attributelist id="9385" addr="0x7fca46926b30" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9386" addr="0x7f99f1dd2c50" >
-                                                <attributelist id="9387" addr="0x7f99f1dd2c50" >
+                                            <typetabsitem id="9386" addr="0x7fca46920c50" >
+                                                <attributelist id="9387" addr="0x7fca46920c50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9388" addr="0x7f99f1dda790" >
-                                                <attributelist id="9389" addr="0x7f99f1dda790" >
+                                            <typetabsitem id="9388" addr="0x7fca46928790" >
+                                                <attributelist id="9389" addr="0x7fca46928790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9390" addr="0x7f99f1dd8030" >
-                                                <attributelist id="9391" addr="0x7f99f1dd8030" >
+                                            <typetabsitem id="9390" addr="0x7fca46926030" >
+                                                <attributelist id="9391" addr="0x7fca46926030" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9392" addr="0x7f99f1ddbe10" >
-                                                <attributelist id="9393" addr="0x7f99f1ddbe10" >
+                                            <typetabsitem id="9392" addr="0x7fca46929e10" >
+                                                <attributelist id="9393" addr="0x7fca46929e10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9394" addr="0x7f99f1dd6b10" >
-                                                <attributelist id="9395" addr="0x7f99f1dd6b10" >
+                                            <typetabsitem id="9394" addr="0x7fca46924b10" >
+                                                <attributelist id="9395" addr="0x7fca46924b10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9396" addr="0x7f99f1dddf90" >
-                                                <attributelist id="9397" addr="0x7f99f1dddf90" >
+                                            <typetabsitem id="9396" addr="0x7fca4692bf90" >
+                                                <attributelist id="9397" addr="0x7fca4692bf90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9398" addr="0x7f99f1de0530" >
-                                                <attributelist id="9399" addr="0x7f99f1de0530" >
+                                            <typetabsitem id="9398" addr="0x7fca4692e530" >
+                                                <attributelist id="9399" addr="0x7fca4692e530" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9400" addr="0x7f99f1de1e50" >
-                                                <attributelist id="9401" addr="0x7f99f1de1e50" >
+                                            <typetabsitem id="9400" addr="0x7fca4692fe50" >
+                                                <attributelist id="9401" addr="0x7fca4692fe50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9402" addr="0x7f99f1de2d90" >
-                                                <attributelist id="9403" addr="0x7f99f1de2d90" >
+                                            <typetabsitem id="9402" addr="0x7fca46930d90" >
+                                                <attributelist id="9403" addr="0x7fca46930d90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9404" addr="0x7f99f1de3410" >
-                                                <attributelist id="9405" addr="0x7f99f1de3410" >
+                                            <typetabsitem id="9404" addr="0x7fca46931410" >
+                                                <attributelist id="9405" addr="0x7fca46931410" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9406" addr="0x7f99f1dd3590" >
-                                                <attributelist id="9407" addr="0x7f99f1dd3590" >
+                                            <typetabsitem id="9406" addr="0x7fca46921590" >
+                                                <attributelist id="9407" addr="0x7fca46921590" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9408" addr="0x7f99f1dd3390" >
-                                                <attributelist id="9409" addr="0x7f99f1dd3390" >
+                                            <typetabsitem id="9408" addr="0x7fca46921390" >
+                                                <attributelist id="9409" addr="0x7fca46921390" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7f99f1dd1d70" id="9410" addr="0x7f99f1dd1d70" />
-                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="9411" addr="0x7f99f1de6c90" />
-                                        <attribute name="symtab" value="0x7f99f1e40fb0" id="9412" addr="0x7f99f1e40fb0" />
+                                        <attribute name="parent" value="0x7fca4691fd70" id="9410" addr="0x7fca4691fd70" />
+                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="9411" addr="0x7fca46934c90" />
+                                        <attribute name="symtab" value="0x7fca4698efb0" id="9412" addr="0x7fca4698efb0" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="9413" addr="0x7f99f1ddd090" >
-                                    <attributelist id="9414" addr="0x7f99f1ddd090" >
+                                <typescopesitem id="9413" addr="0x7fca4692b090" >
+                                    <attributelist id="9414" addr="0x7fca4692b090" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="9415" addr="0x7f99f1e83990" >
-                                    <attributelist id="9416" addr="0x7f99f1e83990" >
-                                        <attribute name="inherit" value="0x7f99f1e839f0" id="9417" addr="0x7f99f1e839f0" />
-                                        <attribute name="name" value="ControlGroup" id="9418" addr="0x7f99f1de6c90" />
-                                        <attribute name="csymtab" value="0x7f99f1e839b0" id="9419" addr="0x7f99f1e839b0" />
-                                        <attribute name="symtab" value="0x7f99f1e83970" id="9420" addr="0x7f99f1e83970" />
+                                <typescopesitem id="9415" addr="0x7fca469d1990" >
+                                    <attributelist id="9416" addr="0x7fca469d1990" >
+                                        <attribute name="inherit" value="0x7fca469d19f0" id="9417" addr="0x7fca469d19f0" />
+                                        <attribute name="name" value="ControlGroup" id="9418" addr="0x7fca46934c90" />
+                                        <attribute name="csymtab" value="0x7fca469d19b0" id="9419" addr="0x7fca469d19b0" />
+                                        <attribute name="symtab" value="0x7fca469d1970" id="9420" addr="0x7fca469d1970" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <access id="9421" addr="0x7f99f1e83910" >
-                            <attributelist id="9422" addr="0x7f99f1e83910" >
-                                <attribute name="kind" value="public" id="9423" addr="0x7f99f1de6c90" />
+                        <access id="9421" addr="0x7fca469d1910" >
+                            <attributelist id="9422" addr="0x7fca469d1910" >
+                                <attribute name="kind" value="public" id="9423" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="9424" addr="0x7f99f1e83f70" >
-                            <attributelist id="9425" addr="0x7f99f1e83f70" >
-                                <attribute name="ismember" value="1" id="9426" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="ControlGroup" id="9427" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="ControlGroup" id="9428" addr="0x7f99f1de6c90" />
-                                <parmlist id="9429" addr="0x7f99f1e83b50" >
+                        <constructor id="9424" addr="0x7fca469d1f70" >
+                            <attributelist id="9425" addr="0x7fca469d1f70" >
+                                <attribute name="ismember" value="1" id="9426" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="ControlGroup" id="9427" addr="0x7fca46934c90" />
+                                <attribute name="name" value="ControlGroup" id="9428" addr="0x7fca46934c90" />
+                                <parmlist id="9429" addr="0x7fca469d1b50" >
                                     <parm id="9430">
-                                        <attributelist id="9431" addr="0x7f99f1e83b50" >
-                                            <attribute name="name" value="x" id="9432" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="9433" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9431" addr="0x7fca469d1b50" >
+                                            <attribute name="name" value="x" id="9432" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="9433" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9434">
-                                        <attributelist id="9435" addr="0x7f99f1e83c70" >
-                                            <attribute name="name" value="y" id="9436" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="9437" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9435" addr="0x7fca469d1c70" >
+                                            <attribute name="name" value="y" id="9436" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="9437" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9438">
-                                        <attributelist id="9439" addr="0x7f99f1e83d90" >
-                                            <attribute name="name" value="width" id="9440" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="9441" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9439" addr="0x7fca469d1d90" >
+                                            <attribute name="name" value="width" id="9440" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="9441" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9442">
-                                        <attributelist id="9443" addr="0x7f99f1e83eb0" >
-                                            <attribute name="name" value="height" id="9444" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="9445" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9443" addr="0x7fca469d1eb0" >
+                                            <attribute name="name" value="height" id="9444" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="9445" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="decl" value="f(long,long,long,long)." id="9446" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="9447" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="9448" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e83990" id="9449" addr="0x7f99f1e83990" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="9450" addr="0x7f99f1de6c90" />
+                                <attribute name="decl" value="f(long,long,long,long)." id="9446" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="9447" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="9448" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469d1990" id="9449" addr="0x7fca469d1990" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="9450" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
                     </class >
-                    <class id="9451" addr="0x7f99f1e84210" >
-                        <attributelist id="9452" addr="0x7f99f1e84210" >
-                            <attribute name="name" value="XBMCAddon::xbmcgui::ControlRadioButton" id="9453" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="9454" addr="0x7f99f1e40fb0" />
-                            <attribute name="symtab" value="0x7f99f1e84350" id="9455" addr="0x7f99f1e84350" />
-                            <attribute name="allows_typedef" value="1" id="9456" addr="0x7f99f1de6c90" />
-                            <attribute name="typepass_visit" value="1" id="9457" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_visit" value="1" id="9458" addr="0x7f99f1de6c90" />
-                            <attribute name="kind" value="class" id="9459" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_name" value="ControlRadioButton" id="9460" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_has_constructor" value="1" id="9461" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_public_constructor" value="1" id="9462" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_copy_constructor" value="1" id="9463" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_default_destructor" value="1" id="9464" addr="0x7f99f1de6c90" />
-                            <attribute name="privatebaselist" value="0x7f99f1e841f0" id="9465" addr="0x7f99f1e841f0" />
-                            <attribute name="protectedbaselist" value="0x7f99f1e841d0" id="9466" addr="0x7f99f1e841d0" />
-                            <baselist id="9467" addr="0x7f99f1e841b0" >
-                                <base name="Control" id="9468" addr="0x7f99f1e84130" />
+                    <class id="9451" addr="0x7fca469d2210" >
+                        <attributelist id="9452" addr="0x7fca469d2210" >
+                            <attribute name="name" value="XBMCAddon::xbmcgui::ControlRadioButton" id="9453" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="9454" addr="0x7fca4698efb0" />
+                            <attribute name="symtab" value="0x7fca469d2350" id="9455" addr="0x7fca469d2350" />
+                            <attribute name="allows_typedef" value="1" id="9456" addr="0x7fca46934c90" />
+                            <attribute name="typepass_visit" value="1" id="9457" addr="0x7fca46934c90" />
+                            <attribute name="allocate_visit" value="1" id="9458" addr="0x7fca46934c90" />
+                            <attribute name="kind" value="class" id="9459" addr="0x7fca46934c90" />
+                            <attribute name="sym_name" value="ControlRadioButton" id="9460" addr="0x7fca46934c90" />
+                            <attribute name="allocate_has_constructor" value="1" id="9461" addr="0x7fca46934c90" />
+                            <attribute name="allocate_public_constructor" value="1" id="9462" addr="0x7fca46934c90" />
+                            <attribute name="allocate_copy_constructor" value="1" id="9463" addr="0x7fca46934c90" />
+                            <attribute name="allocate_default_destructor" value="1" id="9464" addr="0x7fca46934c90" />
+                            <attribute name="privatebaselist" value="0x7fca469d21f0" id="9465" addr="0x7fca469d21f0" />
+                            <attribute name="protectedbaselist" value="0x7fca469d21d0" id="9466" addr="0x7fca469d21d0" />
+                            <baselist id="9467" addr="0x7fca469d21b0" >
+                                <base name="Control" id="9468" addr="0x7fca469d2130" />
                             </baselist >
-                            <attribute name="module" value="xbmcgui" id="9469" addr="0x7f99f1e402f0" />
-                            <attribute name="bases" value="0x7f99f1ddd570" id="9470" addr="0x7f99f1ddd570" />
-                            <attribute name="allbases" value="0x7f99f1ddd810" id="9471" addr="0x7f99f1ddd810" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="9472" addr="0x7f99f1de6c90" />
-                            <typescope id="9473" addr="0x7f99f1ddd4f0" >
-                                <attributelist id="9474" addr="0x7f99f1ddd4f0" >
-                                    <attribute name="inherit" value="0x7f99f1ddd5f0" id="9475" addr="0x7f99f1ddd5f0" />
-                                    <attribute name="name" value="ControlRadioButton" id="9476" addr="0x7f99f1de6c90" />
-                                    <typetab id="9477" addr="0x7f99f1ddd510" >
-                                        <attributelist id="9478" addr="0x7f99f1ddd510" >
+                            <attribute name="module" value="xbmcgui" id="9469" addr="0x7fca4698e2f0" />
+                            <attribute name="bases" value="0x7fca4692b570" id="9470" addr="0x7fca4692b570" />
+                            <attribute name="allbases" value="0x7fca4692b810" id="9471" addr="0x7fca4692b810" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="9472" addr="0x7fca46934c90" />
+                            <typescope id="9473" addr="0x7fca4692b4f0" >
+                                <attributelist id="9474" addr="0x7fca4692b4f0" >
+                                    <attribute name="inherit" value="0x7fca4692b5f0" id="9475" addr="0x7fca4692b5f0" />
+                                    <attribute name="name" value="ControlRadioButton" id="9476" addr="0x7fca46934c90" />
+                                    <typetab id="9477" addr="0x7fca4692b510" >
+                                        <attributelist id="9478" addr="0x7fca4692b510" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f99f1dd2150" id="9479" addr="0x7f99f1dd2150" />
-                                    <attribute name="qname" value="XBMCAddon::xbmcgui::ControlRadioButton" id="9480" addr="0x7f99f1de6c90" />
-                                    <attribute name="symtab" value="0x7f99f1e84350" id="9481" addr="0x7f99f1e84350" />
+                                    <attribute name="parent" value="0x7fca46920150" id="9479" addr="0x7fca46920150" />
+                                    <attribute name="qname" value="XBMCAddon::xbmcgui::ControlRadioButton" id="9480" addr="0x7fca46934c90" />
+                                    <attribute name="symtab" value="0x7fca469d2350" id="9481" addr="0x7fca469d2350" />
                                 </attributelist >
-                                <typescopesitem id="9482" addr="0x7f99f1ddd5f0" >
-                                    <attributelist id="9483" addr="0x7f99f1ddd5f0" >
+                                <typescopesitem id="9482" addr="0x7fca4692b5f0" >
+                                    <attributelist id="9483" addr="0x7fca4692b5f0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="9484" addr="0x7f99f1ddd490" >
-                                    <attributelist id="9485" addr="0x7f99f1ddd490" >
+                                <typescopesitem id="9484" addr="0x7fca4692b490" >
+                                    <attributelist id="9485" addr="0x7fca4692b490" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="9486" addr="0x7f99f1ddd510" >
-                                    <attributelist id="9487" addr="0x7f99f1ddd510" >
+                                <typescopesitem id="9486" addr="0x7fca4692b510" >
+                                    <attributelist id="9487" addr="0x7fca4692b510" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="9488" addr="0x7f99f1dd2150" >
-                                    <attributelist id="9489" addr="0x7f99f1dd2150" >
-                                        <attribute name="name" value="xbmcgui" id="9490" addr="0x7f99f1de6c90" />
-                                        <typetab id="9491" addr="0x7f99f1dd2170" >
-                                            <attributelist id="9492" addr="0x7f99f1dd2170" >
-                                                <attribute name="InterceptorBase" value="InterceptorBase" id="9493" addr="0x7f99f1de6c90" />
-                                                <attribute name="Dialog" value="Dialog" id="9494" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="9495" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="9496" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlTextBox" value="ControlTextBox" id="9497" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="9498" addr="0x7f99f1de6c90" />
-                                                <attribute name="Window" value="Window" id="9499" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="9500" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlList" value="ControlList" id="9501" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="9502" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlImage" value="ControlImage" id="9503" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlButton" value="ControlButton" id="9504" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlGroup" value="ControlGroup" id="9505" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogBusy" value="DialogBusy" id="9506" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="9507" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSpin" value="ControlSpin" id="9508" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlEdit" value="ControlEdit" id="9509" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="9510" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="9511" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlLabel" value="ControlLabel" id="9512" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlProgress" value="ControlProgress" id="9513" addr="0x7f99f1de6c90" />
-                                                <attribute name="Control" value="Control" id="9514" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSlider" value="ControlSlider" id="9515" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgress" value="DialogProgress" id="9516" addr="0x7f99f1de6c90" />
-                                                <attribute name="Action" value="Action" id="9517" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowDialog" value="WindowDialog" id="9518" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXML" value="WindowXML" id="9519" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItem" value="ListItem" id="9520" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="9521" addr="0x7f99f1de6c90" />
+                                <typescopesitem id="9488" addr="0x7fca46920150" >
+                                    <attributelist id="9489" addr="0x7fca46920150" >
+                                        <attribute name="name" value="xbmcgui" id="9490" addr="0x7fca46934c90" />
+                                        <typetab id="9491" addr="0x7fca46920170" >
+                                            <attributelist id="9492" addr="0x7fca46920170" >
+                                                <attribute name="InterceptorBase" value="InterceptorBase" id="9493" addr="0x7fca46934c90" />
+                                                <attribute name="Dialog" value="Dialog" id="9494" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="9495" addr="0x7fca46934c90" />
+                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="9496" addr="0x7fca46934c90" />
+                                                <attribute name="ControlTextBox" value="ControlTextBox" id="9497" addr="0x7fca46934c90" />
+                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="9498" addr="0x7fca46934c90" />
+                                                <attribute name="Window" value="Window" id="9499" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="9500" addr="0x7fca46934c90" />
+                                                <attribute name="ControlList" value="ControlList" id="9501" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="9502" addr="0x7fca46934c90" />
+                                                <attribute name="ControlImage" value="ControlImage" id="9503" addr="0x7fca46934c90" />
+                                                <attribute name="ControlButton" value="ControlButton" id="9504" addr="0x7fca46934c90" />
+                                                <attribute name="ControlGroup" value="ControlGroup" id="9505" addr="0x7fca46934c90" />
+                                                <attribute name="DialogBusy" value="DialogBusy" id="9506" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="9507" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSpin" value="ControlSpin" id="9508" addr="0x7fca46934c90" />
+                                                <attribute name="ControlEdit" value="ControlEdit" id="9509" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="9510" addr="0x7fca46934c90" />
+                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="9511" addr="0x7fca46934c90" />
+                                                <attribute name="ControlLabel" value="ControlLabel" id="9512" addr="0x7fca46934c90" />
+                                                <attribute name="ControlProgress" value="ControlProgress" id="9513" addr="0x7fca46934c90" />
+                                                <attribute name="Control" value="Control" id="9514" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSlider" value="ControlSlider" id="9515" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgress" value="DialogProgress" id="9516" addr="0x7fca46934c90" />
+                                                <attribute name="Action" value="Action" id="9517" addr="0x7fca46934c90" />
+                                                <attribute name="WindowDialog" value="WindowDialog" id="9518" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXML" value="WindowXML" id="9519" addr="0x7fca46934c90" />
+                                                <attribute name="ListItem" value="ListItem" id="9520" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="9521" addr="0x7fca46934c90" />
                                             </attributelist >
-                                            <typetabsitem id="9522" addr="0x7f99f1de1dd0" >
-                                                <attributelist id="9523" addr="0x7f99f1de1dd0" >
+                                            <typetabsitem id="9522" addr="0x7fca4692fdd0" >
+                                                <attributelist id="9523" addr="0x7fca4692fdd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9524" addr="0x7f99f1dde790" >
-                                                <attributelist id="9525" addr="0x7f99f1dde790" >
+                                            <typetabsitem id="9524" addr="0x7fca4692c790" >
+                                                <attributelist id="9525" addr="0x7fca4692c790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9526" addr="0x7f99f1de3f10" >
-                                                <attributelist id="9527" addr="0x7f99f1de3f10" >
+                                            <typetabsitem id="9526" addr="0x7fca46931f10" >
+                                                <attributelist id="9527" addr="0x7fca46931f10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9528" addr="0x7f99f1dd67b0" >
-                                                <attributelist id="9529" addr="0x7f99f1dd67b0" >
+                                            <typetabsitem id="9528" addr="0x7fca469247b0" >
+                                                <attributelist id="9529" addr="0x7fca469247b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9530" addr="0x7f99f1ddafd0" >
-                                                <attributelist id="9531" addr="0x7f99f1ddafd0" >
+                                            <typetabsitem id="9530" addr="0x7fca46928fd0" >
+                                                <attributelist id="9531" addr="0x7fca46928fd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9532" addr="0x7f99f1ddd430" >
-                                                <attributelist id="9533" addr="0x7f99f1ddd430" >
+                                            <typetabsitem id="9532" addr="0x7fca4692b430" >
+                                                <attributelist id="9533" addr="0x7fca4692b430" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9534" addr="0x7f99f1de2130" >
-                                                <attributelist id="9535" addr="0x7f99f1de2130" >
+                                            <typetabsitem id="9534" addr="0x7fca46930130" >
+                                                <attributelist id="9535" addr="0x7fca46930130" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9536" addr="0x7f99f1dd2f50" >
-                                                <attributelist id="9537" addr="0x7f99f1dd2f50" >
+                                            <typetabsitem id="9536" addr="0x7fca46920f50" >
+                                                <attributelist id="9537" addr="0x7fca46920f50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9538" addr="0x7f99f1dd9650" >
-                                                <attributelist id="9539" addr="0x7f99f1dd9650" >
+                                            <typetabsitem id="9538" addr="0x7fca46927650" >
+                                                <attributelist id="9539" addr="0x7fca46927650" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9540" addr="0x7f99f1de3390" >
-                                                <attributelist id="9541" addr="0x7f99f1de3390" >
+                                            <typetabsitem id="9540" addr="0x7fca46931390" >
+                                                <attributelist id="9541" addr="0x7fca46931390" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9542" addr="0x7f99f1ddb7b0" >
-                                                <attributelist id="9543" addr="0x7f99f1ddb7b0" >
+                                            <typetabsitem id="9542" addr="0x7fca469297b0" >
+                                                <attributelist id="9543" addr="0x7fca469297b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9544" addr="0x7f99f1ddc4b0" >
-                                                <attributelist id="9545" addr="0x7f99f1ddc4b0" >
+                                            <typetabsitem id="9544" addr="0x7fca4692a4b0" >
+                                                <attributelist id="9545" addr="0x7fca4692a4b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9546" addr="0x7f99f1ddcf90" >
-                                                <attributelist id="9547" addr="0x7f99f1ddcf90" >
+                                            <typetabsitem id="9546" addr="0x7fca4692af90" >
+                                                <attributelist id="9547" addr="0x7fca4692af90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9548" addr="0x7f99f1de11b0" >
-                                                <attributelist id="9549" addr="0x7f99f1de11b0" >
+                                            <typetabsitem id="9548" addr="0x7fca4692f1b0" >
+                                                <attributelist id="9549" addr="0x7fca4692f1b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9550" addr="0x7f99f1de15b0" >
-                                                <attributelist id="9551" addr="0x7f99f1de15b0" >
+                                            <typetabsitem id="9550" addr="0x7fca4692f5b0" >
+                                                <attributelist id="9551" addr="0x7fca4692f5b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9552" addr="0x7f99f1dd77f0" >
-                                                <attributelist id="9553" addr="0x7f99f1dd77f0" >
+                                            <typetabsitem id="9552" addr="0x7fca469257f0" >
+                                                <attributelist id="9553" addr="0x7fca469257f0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9554" addr="0x7f99f1dd8b30" >
-                                                <attributelist id="9555" addr="0x7f99f1dd8b30" >
+                                            <typetabsitem id="9554" addr="0x7fca46926b30" >
+                                                <attributelist id="9555" addr="0x7fca46926b30" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9556" addr="0x7f99f1dd2c50" >
-                                                <attributelist id="9557" addr="0x7f99f1dd2c50" >
+                                            <typetabsitem id="9556" addr="0x7fca46920c50" >
+                                                <attributelist id="9557" addr="0x7fca46920c50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9558" addr="0x7f99f1dda790" >
-                                                <attributelist id="9559" addr="0x7f99f1dda790" >
+                                            <typetabsitem id="9558" addr="0x7fca46928790" >
+                                                <attributelist id="9559" addr="0x7fca46928790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9560" addr="0x7f99f1dd8030" >
-                                                <attributelist id="9561" addr="0x7f99f1dd8030" >
+                                            <typetabsitem id="9560" addr="0x7fca46926030" >
+                                                <attributelist id="9561" addr="0x7fca46926030" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9562" addr="0x7f99f1ddbe10" >
-                                                <attributelist id="9563" addr="0x7f99f1ddbe10" >
+                                            <typetabsitem id="9562" addr="0x7fca46929e10" >
+                                                <attributelist id="9563" addr="0x7fca46929e10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9564" addr="0x7f99f1dd6b10" >
-                                                <attributelist id="9565" addr="0x7f99f1dd6b10" >
+                                            <typetabsitem id="9564" addr="0x7fca46924b10" >
+                                                <attributelist id="9565" addr="0x7fca46924b10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9566" addr="0x7f99f1dddf90" >
-                                                <attributelist id="9567" addr="0x7f99f1dddf90" >
+                                            <typetabsitem id="9566" addr="0x7fca4692bf90" >
+                                                <attributelist id="9567" addr="0x7fca4692bf90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9568" addr="0x7f99f1de0530" >
-                                                <attributelist id="9569" addr="0x7f99f1de0530" >
+                                            <typetabsitem id="9568" addr="0x7fca4692e530" >
+                                                <attributelist id="9569" addr="0x7fca4692e530" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9570" addr="0x7f99f1de1e50" >
-                                                <attributelist id="9571" addr="0x7f99f1de1e50" >
+                                            <typetabsitem id="9570" addr="0x7fca4692fe50" >
+                                                <attributelist id="9571" addr="0x7fca4692fe50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9572" addr="0x7f99f1de2d90" >
-                                                <attributelist id="9573" addr="0x7f99f1de2d90" >
+                                            <typetabsitem id="9572" addr="0x7fca46930d90" >
+                                                <attributelist id="9573" addr="0x7fca46930d90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9574" addr="0x7f99f1de3410" >
-                                                <attributelist id="9575" addr="0x7f99f1de3410" >
+                                            <typetabsitem id="9574" addr="0x7fca46931410" >
+                                                <attributelist id="9575" addr="0x7fca46931410" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9576" addr="0x7f99f1dd3590" >
-                                                <attributelist id="9577" addr="0x7f99f1dd3590" >
+                                            <typetabsitem id="9576" addr="0x7fca46921590" >
+                                                <attributelist id="9577" addr="0x7fca46921590" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9578" addr="0x7f99f1dd3390" >
-                                                <attributelist id="9579" addr="0x7f99f1dd3390" >
+                                            <typetabsitem id="9578" addr="0x7fca46921390" >
+                                                <attributelist id="9579" addr="0x7fca46921390" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7f99f1dd1d70" id="9580" addr="0x7f99f1dd1d70" />
-                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="9581" addr="0x7f99f1de6c90" />
-                                        <attribute name="symtab" value="0x7f99f1e40fb0" id="9582" addr="0x7f99f1e40fb0" />
+                                        <attribute name="parent" value="0x7fca4691fd70" id="9580" addr="0x7fca4691fd70" />
+                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="9581" addr="0x7fca46934c90" />
+                                        <attribute name="symtab" value="0x7fca4698efb0" id="9582" addr="0x7fca4698efb0" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="9583" addr="0x7f99f1ddd530" >
-                                    <attributelist id="9584" addr="0x7f99f1ddd530" >
+                                <typescopesitem id="9583" addr="0x7fca4692b530" >
+                                    <attributelist id="9584" addr="0x7fca4692b530" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="9585" addr="0x7f99f1e84350" >
-                                    <attributelist id="9586" addr="0x7f99f1e84350" >
-                                        <attribute name="inherit" value="0x7f99f1e843b0" id="9587" addr="0x7f99f1e843b0" />
-                                        <attribute name="name" value="ControlRadioButton" id="9588" addr="0x7f99f1de6c90" />
-                                        <attribute name="csymtab" value="0x7f99f1e84370" id="9589" addr="0x7f99f1e84370" />
-                                        <attribute name="symtab" value="0x7f99f1e84330" id="9590" addr="0x7f99f1e84330" />
+                                <typescopesitem id="9585" addr="0x7fca469d2350" >
+                                    <attributelist id="9586" addr="0x7fca469d2350" >
+                                        <attribute name="inherit" value="0x7fca469d23b0" id="9587" addr="0x7fca469d23b0" />
+                                        <attribute name="name" value="ControlRadioButton" id="9588" addr="0x7fca46934c90" />
+                                        <attribute name="csymtab" value="0x7fca469d2370" id="9589" addr="0x7fca469d2370" />
+                                        <attribute name="symtab" value="0x7fca469d2330" id="9590" addr="0x7fca469d2330" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <access id="9591" addr="0x7f99f1e842d0" >
-                            <attributelist id="9592" addr="0x7f99f1e842d0" >
-                                <attribute name="kind" value="public" id="9593" addr="0x7f99f1de6c90" />
+                        <access id="9591" addr="0x7fca469d22d0" >
+                            <attributelist id="9592" addr="0x7fca469d22d0" >
+                                <attribute name="kind" value="public" id="9593" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="9594" addr="0x7f99f1e865d0" >
-                            <attributelist id="9595" addr="0x7f99f1e865d0" >
-                                <attribute name="name" value="ControlRadioButton" id="9596" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="9597" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e84350" id="9598" addr="0x7f99f1e84350" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e87350" id="9599" addr="0x7f99f1e87350" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e87350" id="9600" addr="0x7f99f1e87350" />
-                                <attribute name="sym_name" value="ControlRadioButton" id="9601" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,long,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char)." id="9602" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="9603" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e865d0" id="9604" addr="0x7f99f1e865d0" />
-                                <parmlist id="9605" addr="0x7f99f1e84510" >
+                        <constructor id="9594" addr="0x7fca469d45d0" >
+                            <attributelist id="9595" addr="0x7fca469d45d0" >
+                                <attribute name="name" value="ControlRadioButton" id="9596" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="9597" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469d2350" id="9598" addr="0x7fca469d2350" />
+                                <attribute name="sym_nextSibling" value="0x7fca469d5350" id="9599" addr="0x7fca469d5350" />
+                                <attribute name="csym_nextSibling" value="0x7fca469d5350" id="9600" addr="0x7fca469d5350" />
+                                <attribute name="sym_name" value="ControlRadioButton" id="9601" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,long,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char)." id="9602" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="9603" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469d45d0" id="9604" addr="0x7fca469d45d0" />
+                                <parmlist id="9605" addr="0x7fca469d2510" >
                                     <parm id="9606">
-                                        <attributelist id="9607" addr="0x7f99f1e84510" >
-                                            <attribute name="name" value="x" id="9608" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="9609" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9607" addr="0x7fca469d2510" >
+                                            <attribute name="name" value="x" id="9608" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="9609" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9610">
-                                        <attributelist id="9611" addr="0x7f99f1e84630" >
-                                            <attribute name="name" value="y" id="9612" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="9613" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9611" addr="0x7fca469d2630" >
+                                            <attribute name="name" value="y" id="9612" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="9613" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9614">
-                                        <attributelist id="9615" addr="0x7f99f1e84750" >
-                                            <attribute name="name" value="width" id="9616" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="9617" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9615" addr="0x7fca469d2750" >
+                                            <attribute name="name" value="width" id="9616" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="9617" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9618">
-                                        <attributelist id="9619" addr="0x7f99f1e84870" >
-                                            <attribute name="name" value="height" id="9620" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="9621" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9619" addr="0x7fca469d2870" >
+                                            <attribute name="name" value="height" id="9620" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="9621" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9622">
-                                        <attributelist id="9623" addr="0x7f99f1e849b0" >
-                                            <attribute name="name" value="label" id="9624" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="9625" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9623" addr="0x7fca469d29b0" >
+                                            <attribute name="name" value="label" id="9624" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="9625" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9626">
-                                        <attributelist id="9627" addr="0x7f99f1e84b50" >
-                                            <attribute name="name" value="focusOnTexture" id="9628" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9629" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9630" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9627" addr="0x7fca469d2b50" >
+                                            <attribute name="name" value="focusOnTexture" id="9628" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9629" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9630" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9631">
-                                        <attributelist id="9632" addr="0x7f99f1e84cf0" >
-                                            <attribute name="name" value="noFocusOnTexture" id="9633" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9634" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9635" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9632" addr="0x7fca469d2cf0" >
+                                            <attribute name="name" value="noFocusOnTexture" id="9633" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9634" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9635" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9636">
-                                        <attributelist id="9637" addr="0x7f99f1e84e90" >
-                                            <attribute name="name" value="focusOffTexture" id="9638" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9639" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9640" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9637" addr="0x7fca469d2e90" >
+                                            <attribute name="name" value="focusOffTexture" id="9638" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9639" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9640" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9641">
-                                        <attributelist id="9642" addr="0x7f99f1e85030" >
-                                            <attribute name="name" value="noFocusOffTexture" id="9643" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9644" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9645" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9642" addr="0x7fca469d3030" >
+                                            <attribute name="name" value="noFocusOffTexture" id="9643" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9644" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9645" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9646">
-                                        <attributelist id="9647" addr="0x7f99f1e851d0" >
-                                            <attribute name="name" value="focusTexture" id="9648" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9649" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9650" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9647" addr="0x7fca469d31d0" >
+                                            <attribute name="name" value="focusTexture" id="9648" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9649" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9650" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9651">
-                                        <attributelist id="9652" addr="0x7f99f1e85370" >
-                                            <attribute name="name" value="noFocusTexture" id="9653" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9654" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9655" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9652" addr="0x7fca469d3370" >
+                                            <attribute name="name" value="noFocusTexture" id="9653" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9654" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9655" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9656">
-                                        <attributelist id="9657" addr="0x7f99f1e854d0" >
-                                            <attribute name="name" value="textOffsetX" id="9658" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="9659" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="9660" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9657" addr="0x7fca469d34d0" >
+                                            <attribute name="name" value="textOffsetX" id="9658" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="9659" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="9660" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9661">
-                                        <attributelist id="9662" addr="0x7f99f1e85630" >
-                                            <attribute name="name" value="textOffsetY" id="9663" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="2" id="9664" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="9665" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9662" addr="0x7fca469d3630" >
+                                            <attribute name="name" value="textOffsetY" id="9663" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="2" id="9664" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="9665" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9666">
-                                        <attributelist id="9667" addr="0x7f99f1e85850" >
-                                            <attribute name="name" value="_alignment" id="9668" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="(XBFONT_LEFT|XBFONT_CENTER_Y)" id="9669" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="9670" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9667" addr="0x7fca469d3850" >
+                                            <attribute name="name" value="_alignment" id="9668" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="(XBFONT_LEFT|XBFONT_CENTER_Y)" id="9669" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="9670" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9671">
-                                        <attributelist id="9672" addr="0x7f99f1e859f0" >
-                                            <attribute name="name" value="font" id="9673" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9674" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9675" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9672" addr="0x7fca469d39f0" >
+                                            <attribute name="name" value="font" id="9673" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9674" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9675" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9676">
-                                        <attributelist id="9677" addr="0x7f99f1e85b90" >
-                                            <attribute name="name" value="textColor" id="9678" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9679" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9680" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9677" addr="0x7fca469d3b90" >
+                                            <attribute name="name" value="textColor" id="9678" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9679" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9680" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9681">
-                                        <attributelist id="9682" addr="0x7f99f1e85d30" >
-                                            <attribute name="name" value="disabledColor" id="9683" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9684" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9685" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9682" addr="0x7fca469d3d30" >
+                                            <attribute name="name" value="disabledColor" id="9683" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9684" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9685" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9686">
-                                        <attributelist id="9687" addr="0x7f99f1e85e90" >
-                                            <attribute name="name" value="angle" id="9688" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="0" id="9689" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="9690" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9687" addr="0x7fca469d3e90" >
+                                            <attribute name="name" value="angle" id="9688" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="0" id="9689" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="9690" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9691">
-                                        <attributelist id="9692" addr="0x7f99f1e86030" >
-                                            <attribute name="name" value="shadowColor" id="9693" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9694" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9695" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9692" addr="0x7fca469d4030" >
+                                            <attribute name="name" value="shadowColor" id="9693" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9694" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9695" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9696">
-                                        <attributelist id="9697" addr="0x7f99f1e861d0" >
-                                            <attribute name="name" value="focusedColor" id="9698" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9699" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9700" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9697" addr="0x7fca469d41d0" >
+                                            <attribute name="name" value="focusedColor" id="9698" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9699" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9700" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9701">
-                                        <attributelist id="9702" addr="0x7f99f1e86370" >
-                                            <attribute name="name" value="disabledOnTexture" id="9703" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9704" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9705" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9702" addr="0x7fca469d4370" >
+                                            <attribute name="name" value="disabledOnTexture" id="9703" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9704" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9705" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9706">
-                                        <attributelist id="9707" addr="0x7f99f1e86510" >
-                                            <attribute name="name" value="disabledOffTexture" id="9708" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9709" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9710" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9707" addr="0x7fca469d4510" >
+                                            <attribute name="name" value="disabledOffTexture" id="9708" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9709" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9710" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_0" id="9711" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="9712" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="9711" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="9712" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="9713" addr="0x7f99f1e87350" >
-                            <attributelist id="9714" addr="0x7f99f1e87350" >
-                                <attribute name="name" value="ControlRadioButton" id="9715" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="9716" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e84350" id="9717" addr="0x7f99f1e84350" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e88030" id="9718" addr="0x7f99f1e88030" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e865d0" id="9719" addr="0x7f99f1e865d0" />
-                                <attribute name="sym_name" value="ControlRadioButton" id="9720" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e88030" id="9721" addr="0x7f99f1e88030" />
-                                <attribute name="defaultargs" value="0x7f99f1e865d0" id="9722" addr="0x7f99f1e865d0" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,long,p.q(const).char,p.q(const).char,p.q(const).char)." id="9723" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="9724" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e865d0" id="9725" addr="0x7f99f1e865d0" />
-                                <parmlist id="9726" addr="0x7f99f1e86670" >
+                        <constructor id="9713" addr="0x7fca469d5350" >
+                            <attributelist id="9714" addr="0x7fca469d5350" >
+                                <attribute name="name" value="ControlRadioButton" id="9715" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="9716" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469d2350" id="9717" addr="0x7fca469d2350" />
+                                <attribute name="csym_nextSibling" value="0x7fca469d6030" id="9718" addr="0x7fca469d6030" />
+                                <attribute name="sym_previousSibling" value="0x7fca469d45d0" id="9719" addr="0x7fca469d45d0" />
+                                <attribute name="sym_name" value="ControlRadioButton" id="9720" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469d6030" id="9721" addr="0x7fca469d6030" />
+                                <attribute name="defaultargs" value="0x7fca469d45d0" id="9722" addr="0x7fca469d45d0" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,long,p.q(const).char,p.q(const).char,p.q(const).char)." id="9723" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="9724" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469d45d0" id="9725" addr="0x7fca469d45d0" />
+                                <parmlist id="9726" addr="0x7fca469d4670" >
                                     <parm id="9727">
-                                        <attributelist id="9728" addr="0x7f99f1e86670" >
-                                            <attribute name="name" value="x" id="9729" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="9730" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9728" addr="0x7fca469d4670" >
+                                            <attribute name="name" value="x" id="9729" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="9730" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9731">
-                                        <attributelist id="9732" addr="0x7f99f1e86730" >
-                                            <attribute name="name" value="y" id="9733" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="9734" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9732" addr="0x7fca469d4730" >
+                                            <attribute name="name" value="y" id="9733" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="9734" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9735">
-                                        <attributelist id="9736" addr="0x7f99f1e867b0" >
-                                            <attribute name="name" value="width" id="9737" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="9738" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9736" addr="0x7fca469d47b0" >
+                                            <attribute name="name" value="width" id="9737" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="9738" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9739">
-                                        <attributelist id="9740" addr="0x7f99f1e86830" >
-                                            <attribute name="name" value="height" id="9741" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="9742" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9740" addr="0x7fca469d4830" >
+                                            <attribute name="name" value="height" id="9741" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="9742" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9743">
-                                        <attributelist id="9744" addr="0x7f99f1e868b0" >
-                                            <attribute name="name" value="label" id="9745" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="9746" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9744" addr="0x7fca469d48b0" >
+                                            <attribute name="name" value="label" id="9745" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="9746" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9747">
-                                        <attributelist id="9748" addr="0x7f99f1e86930" >
-                                            <attribute name="name" value="focusOnTexture" id="9749" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9750" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9751" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9748" addr="0x7fca469d4930" >
+                                            <attribute name="name" value="focusOnTexture" id="9749" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9750" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9751" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9752">
-                                        <attributelist id="9753" addr="0x7f99f1e869d0" >
-                                            <attribute name="name" value="noFocusOnTexture" id="9754" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9755" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9756" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9753" addr="0x7fca469d49d0" >
+                                            <attribute name="name" value="noFocusOnTexture" id="9754" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9755" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9756" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9757">
-                                        <attributelist id="9758" addr="0x7f99f1e86a70" >
-                                            <attribute name="name" value="focusOffTexture" id="9759" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9760" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9761" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9758" addr="0x7fca469d4a70" >
+                                            <attribute name="name" value="focusOffTexture" id="9759" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9760" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9761" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9762">
-                                        <attributelist id="9763" addr="0x7f99f1e86b10" >
-                                            <attribute name="name" value="noFocusOffTexture" id="9764" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9765" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9766" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9763" addr="0x7fca469d4b10" >
+                                            <attribute name="name" value="noFocusOffTexture" id="9764" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9765" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9766" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9767">
-                                        <attributelist id="9768" addr="0x7f99f1e86bb0" >
-                                            <attribute name="name" value="focusTexture" id="9769" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9770" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9771" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9768" addr="0x7fca469d4bb0" >
+                                            <attribute name="name" value="focusTexture" id="9769" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9770" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9771" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9772">
-                                        <attributelist id="9773" addr="0x7f99f1e86c50" >
-                                            <attribute name="name" value="noFocusTexture" id="9774" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9775" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9776" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9773" addr="0x7fca469d4c50" >
+                                            <attribute name="name" value="noFocusTexture" id="9774" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9775" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9776" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9777">
-                                        <attributelist id="9778" addr="0x7f99f1e86cf0" >
-                                            <attribute name="name" value="textOffsetX" id="9779" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="9780" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="9781" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9778" addr="0x7fca469d4cf0" >
+                                            <attribute name="name" value="textOffsetX" id="9779" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="9780" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="9781" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9782">
-                                        <attributelist id="9783" addr="0x7f99f1e86d90" >
-                                            <attribute name="name" value="textOffsetY" id="9784" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="2" id="9785" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="9786" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9783" addr="0x7fca469d4d90" >
+                                            <attribute name="name" value="textOffsetY" id="9784" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="2" id="9785" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="9786" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9787">
-                                        <attributelist id="9788" addr="0x7f99f1e86e30" >
-                                            <attribute name="name" value="_alignment" id="9789" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="(XBFONT_LEFT|XBFONT_CENTER_Y)" id="9790" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="9791" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9788" addr="0x7fca469d4e30" >
+                                            <attribute name="name" value="_alignment" id="9789" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="(XBFONT_LEFT|XBFONT_CENTER_Y)" id="9790" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="9791" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9792">
-                                        <attributelist id="9793" addr="0x7f99f1e86ed0" >
-                                            <attribute name="name" value="font" id="9794" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9795" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9796" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9793" addr="0x7fca469d4ed0" >
+                                            <attribute name="name" value="font" id="9794" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9795" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9796" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9797">
-                                        <attributelist id="9798" addr="0x7f99f1e86f70" >
-                                            <attribute name="name" value="textColor" id="9799" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9800" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9801" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9798" addr="0x7fca469d4f70" >
+                                            <attribute name="name" value="textColor" id="9799" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9800" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9801" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9802">
-                                        <attributelist id="9803" addr="0x7f99f1e87010" >
-                                            <attribute name="name" value="disabledColor" id="9804" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9805" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9806" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9803" addr="0x7fca469d5010" >
+                                            <attribute name="name" value="disabledColor" id="9804" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9805" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9806" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9807">
-                                        <attributelist id="9808" addr="0x7f99f1e870b0" >
-                                            <attribute name="name" value="angle" id="9809" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="0" id="9810" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="9811" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9808" addr="0x7fca469d50b0" >
+                                            <attribute name="name" value="angle" id="9809" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="0" id="9810" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="9811" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9812">
-                                        <attributelist id="9813" addr="0x7f99f1e87150" >
-                                            <attribute name="name" value="shadowColor" id="9814" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9815" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9816" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9813" addr="0x7fca469d5150" >
+                                            <attribute name="name" value="shadowColor" id="9814" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9815" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9816" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9817">
-                                        <attributelist id="9818" addr="0x7f99f1e871f0" >
-                                            <attribute name="name" value="focusedColor" id="9819" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9820" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9821" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9818" addr="0x7fca469d51f0" >
+                                            <attribute name="name" value="focusedColor" id="9819" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9820" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9821" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9822">
-                                        <attributelist id="9823" addr="0x7f99f1e87290" >
-                                            <attribute name="name" value="disabledOnTexture" id="9824" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9825" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9826" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9823" addr="0x7fca469d5290" >
+                                            <attribute name="name" value="disabledOnTexture" id="9824" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9825" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9826" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_1" id="9827" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="9828" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="9827" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="9828" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="9829" addr="0x7f99f1e88030" >
-                            <attributelist id="9830" addr="0x7f99f1e88030" >
-                                <attribute name="name" value="ControlRadioButton" id="9831" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="9832" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e84350" id="9833" addr="0x7f99f1e84350" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e88c70" id="9834" addr="0x7f99f1e88c70" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e87350" id="9835" addr="0x7f99f1e87350" />
-                                <attribute name="sym_name" value="ControlRadioButton" id="9836" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e88c70" id="9837" addr="0x7f99f1e88c70" />
-                                <attribute name="defaultargs" value="0x7f99f1e865d0" id="9838" addr="0x7f99f1e865d0" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,long,p.q(const).char,p.q(const).char)." id="9839" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="9840" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e865d0" id="9841" addr="0x7f99f1e865d0" />
-                                <parmlist id="9842" addr="0x7f99f1e873f0" >
+                        <constructor id="9829" addr="0x7fca469d6030" >
+                            <attributelist id="9830" addr="0x7fca469d6030" >
+                                <attribute name="name" value="ControlRadioButton" id="9831" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="9832" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469d2350" id="9833" addr="0x7fca469d2350" />
+                                <attribute name="csym_nextSibling" value="0x7fca469d6c70" id="9834" addr="0x7fca469d6c70" />
+                                <attribute name="sym_previousSibling" value="0x7fca469d5350" id="9835" addr="0x7fca469d5350" />
+                                <attribute name="sym_name" value="ControlRadioButton" id="9836" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469d6c70" id="9837" addr="0x7fca469d6c70" />
+                                <attribute name="defaultargs" value="0x7fca469d45d0" id="9838" addr="0x7fca469d45d0" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,long,p.q(const).char,p.q(const).char)." id="9839" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="9840" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469d45d0" id="9841" addr="0x7fca469d45d0" />
+                                <parmlist id="9842" addr="0x7fca469d53f0" >
                                     <parm id="9843">
-                                        <attributelist id="9844" addr="0x7f99f1e873f0" >
-                                            <attribute name="name" value="x" id="9845" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="9846" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9844" addr="0x7fca469d53f0" >
+                                            <attribute name="name" value="x" id="9845" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="9846" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9847">
-                                        <attributelist id="9848" addr="0x7f99f1e874b0" >
-                                            <attribute name="name" value="y" id="9849" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="9850" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9848" addr="0x7fca469d54b0" >
+                                            <attribute name="name" value="y" id="9849" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="9850" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9851">
-                                        <attributelist id="9852" addr="0x7f99f1e87530" >
-                                            <attribute name="name" value="width" id="9853" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="9854" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9852" addr="0x7fca469d5530" >
+                                            <attribute name="name" value="width" id="9853" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="9854" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9855">
-                                        <attributelist id="9856" addr="0x7f99f1e875b0" >
-                                            <attribute name="name" value="height" id="9857" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="9858" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9856" addr="0x7fca469d55b0" >
+                                            <attribute name="name" value="height" id="9857" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="9858" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9859">
-                                        <attributelist id="9860" addr="0x7f99f1e87630" >
-                                            <attribute name="name" value="label" id="9861" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="9862" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9860" addr="0x7fca469d5630" >
+                                            <attribute name="name" value="label" id="9861" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="9862" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9863">
-                                        <attributelist id="9864" addr="0x7f99f1e876b0" >
-                                            <attribute name="name" value="focusOnTexture" id="9865" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9866" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9867" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9864" addr="0x7fca469d56b0" >
+                                            <attribute name="name" value="focusOnTexture" id="9865" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9866" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9867" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9868">
-                                        <attributelist id="9869" addr="0x7f99f1e87750" >
-                                            <attribute name="name" value="noFocusOnTexture" id="9870" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9871" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9872" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9869" addr="0x7fca469d5750" >
+                                            <attribute name="name" value="noFocusOnTexture" id="9870" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9871" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9872" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9873">
-                                        <attributelist id="9874" addr="0x7f99f1e877f0" >
-                                            <attribute name="name" value="focusOffTexture" id="9875" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9876" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9877" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9874" addr="0x7fca469d57f0" >
+                                            <attribute name="name" value="focusOffTexture" id="9875" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9876" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9877" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9878">
-                                        <attributelist id="9879" addr="0x7f99f1e87890" >
-                                            <attribute name="name" value="noFocusOffTexture" id="9880" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9881" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9882" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9879" addr="0x7fca469d5890" >
+                                            <attribute name="name" value="noFocusOffTexture" id="9880" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9881" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9882" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9883">
-                                        <attributelist id="9884" addr="0x7f99f1e87930" >
-                                            <attribute name="name" value="focusTexture" id="9885" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9886" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9887" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9884" addr="0x7fca469d5930" >
+                                            <attribute name="name" value="focusTexture" id="9885" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9886" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9887" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9888">
-                                        <attributelist id="9889" addr="0x7f99f1e879d0" >
-                                            <attribute name="name" value="noFocusTexture" id="9890" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9891" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9892" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9889" addr="0x7fca469d59d0" >
+                                            <attribute name="name" value="noFocusTexture" id="9890" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9891" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9892" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9893">
-                                        <attributelist id="9894" addr="0x7f99f1e87a70" >
-                                            <attribute name="name" value="textOffsetX" id="9895" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="9896" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="9897" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9894" addr="0x7fca469d5a70" >
+                                            <attribute name="name" value="textOffsetX" id="9895" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="9896" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="9897" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9898">
-                                        <attributelist id="9899" addr="0x7f99f1e87b10" >
-                                            <attribute name="name" value="textOffsetY" id="9900" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="2" id="9901" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="9902" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9899" addr="0x7fca469d5b10" >
+                                            <attribute name="name" value="textOffsetY" id="9900" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="2" id="9901" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="9902" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9903">
-                                        <attributelist id="9904" addr="0x7f99f1e87bb0" >
-                                            <attribute name="name" value="_alignment" id="9905" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="(XBFONT_LEFT|XBFONT_CENTER_Y)" id="9906" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="9907" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9904" addr="0x7fca469d5bb0" >
+                                            <attribute name="name" value="_alignment" id="9905" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="(XBFONT_LEFT|XBFONT_CENTER_Y)" id="9906" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="9907" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9908">
-                                        <attributelist id="9909" addr="0x7f99f1e87c50" >
-                                            <attribute name="name" value="font" id="9910" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9911" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9912" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9909" addr="0x7fca469d5c50" >
+                                            <attribute name="name" value="font" id="9910" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9911" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9912" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9913">
-                                        <attributelist id="9914" addr="0x7f99f1e87cf0" >
-                                            <attribute name="name" value="textColor" id="9915" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9916" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9917" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9914" addr="0x7fca469d5cf0" >
+                                            <attribute name="name" value="textColor" id="9915" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9916" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9917" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9918">
-                                        <attributelist id="9919" addr="0x7f99f1e87d90" >
-                                            <attribute name="name" value="disabledColor" id="9920" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9921" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9922" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9919" addr="0x7fca469d5d90" >
+                                            <attribute name="name" value="disabledColor" id="9920" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9921" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9922" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9923">
-                                        <attributelist id="9924" addr="0x7f99f1e87e30" >
-                                            <attribute name="name" value="angle" id="9925" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="0" id="9926" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="9927" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9924" addr="0x7fca469d5e30" >
+                                            <attribute name="name" value="angle" id="9925" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="0" id="9926" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="9927" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9928">
-                                        <attributelist id="9929" addr="0x7f99f1e87ed0" >
-                                            <attribute name="name" value="shadowColor" id="9930" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9931" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9932" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9929" addr="0x7fca469d5ed0" >
+                                            <attribute name="name" value="shadowColor" id="9930" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9931" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9932" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9933">
-                                        <attributelist id="9934" addr="0x7f99f1e87f70" >
-                                            <attribute name="name" value="focusedColor" id="9935" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9936" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9937" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9934" addr="0x7fca469d5f70" >
+                                            <attribute name="name" value="focusedColor" id="9935" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9936" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9937" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_2" id="9938" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="9939" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_2" id="9938" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="9939" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="9940" addr="0x7f99f1e88c70" >
-                            <attributelist id="9941" addr="0x7f99f1e88c70" >
-                                <attribute name="name" value="ControlRadioButton" id="9942" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="9943" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e84350" id="9944" addr="0x7f99f1e84350" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e89810" id="9945" addr="0x7f99f1e89810" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e88030" id="9946" addr="0x7f99f1e88030" />
-                                <attribute name="sym_name" value="ControlRadioButton" id="9947" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e89810" id="9948" addr="0x7f99f1e89810" />
-                                <attribute name="defaultargs" value="0x7f99f1e865d0" id="9949" addr="0x7f99f1e865d0" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,long,p.q(const).char)." id="9950" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="9951" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e865d0" id="9952" addr="0x7f99f1e865d0" />
-                                <parmlist id="9953" addr="0x7f99f1e880d0" >
+                        <constructor id="9940" addr="0x7fca469d6c70" >
+                            <attributelist id="9941" addr="0x7fca469d6c70" >
+                                <attribute name="name" value="ControlRadioButton" id="9942" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="9943" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469d2350" id="9944" addr="0x7fca469d2350" />
+                                <attribute name="csym_nextSibling" value="0x7fca469d7810" id="9945" addr="0x7fca469d7810" />
+                                <attribute name="sym_previousSibling" value="0x7fca469d6030" id="9946" addr="0x7fca469d6030" />
+                                <attribute name="sym_name" value="ControlRadioButton" id="9947" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469d7810" id="9948" addr="0x7fca469d7810" />
+                                <attribute name="defaultargs" value="0x7fca469d45d0" id="9949" addr="0x7fca469d45d0" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,long,p.q(const).char)." id="9950" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="9951" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469d45d0" id="9952" addr="0x7fca469d45d0" />
+                                <parmlist id="9953" addr="0x7fca469d60d0" >
                                     <parm id="9954">
-                                        <attributelist id="9955" addr="0x7f99f1e880d0" >
-                                            <attribute name="name" value="x" id="9956" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="9957" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9955" addr="0x7fca469d60d0" >
+                                            <attribute name="name" value="x" id="9956" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="9957" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9958">
-                                        <attributelist id="9959" addr="0x7f99f1e88190" >
-                                            <attribute name="name" value="y" id="9960" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="9961" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9959" addr="0x7fca469d6190" >
+                                            <attribute name="name" value="y" id="9960" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="9961" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9962">
-                                        <attributelist id="9963" addr="0x7f99f1e88210" >
-                                            <attribute name="name" value="width" id="9964" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="9965" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9963" addr="0x7fca469d6210" >
+                                            <attribute name="name" value="width" id="9964" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="9965" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9966">
-                                        <attributelist id="9967" addr="0x7f99f1e88290" >
-                                            <attribute name="name" value="height" id="9968" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="9969" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9967" addr="0x7fca469d6290" >
+                                            <attribute name="name" value="height" id="9968" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="9969" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9970">
-                                        <attributelist id="9971" addr="0x7f99f1e88310" >
-                                            <attribute name="name" value="label" id="9972" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="9973" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9971" addr="0x7fca469d6310" >
+                                            <attribute name="name" value="label" id="9972" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="9973" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9974">
-                                        <attributelist id="9975" addr="0x7f99f1e88390" >
-                                            <attribute name="name" value="focusOnTexture" id="9976" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9977" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9978" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9975" addr="0x7fca469d6390" >
+                                            <attribute name="name" value="focusOnTexture" id="9976" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9977" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9978" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9979">
-                                        <attributelist id="9980" addr="0x7f99f1e88430" >
-                                            <attribute name="name" value="noFocusOnTexture" id="9981" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9982" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9983" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9980" addr="0x7fca469d6430" >
+                                            <attribute name="name" value="noFocusOnTexture" id="9981" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9982" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9983" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9984">
-                                        <attributelist id="9985" addr="0x7f99f1e884d0" >
-                                            <attribute name="name" value="focusOffTexture" id="9986" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9987" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9988" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9985" addr="0x7fca469d64d0" >
+                                            <attribute name="name" value="focusOffTexture" id="9986" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9987" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9988" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9989">
-                                        <attributelist id="9990" addr="0x7f99f1e88570" >
-                                            <attribute name="name" value="noFocusOffTexture" id="9991" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9992" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9993" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9990" addr="0x7fca469d6570" >
+                                            <attribute name="name" value="noFocusOffTexture" id="9991" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9992" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9993" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9994">
-                                        <attributelist id="9995" addr="0x7f99f1e88610" >
-                                            <attribute name="name" value="focusTexture" id="9996" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9997" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9998" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9995" addr="0x7fca469d6610" >
+                                            <attribute name="name" value="focusTexture" id="9996" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9997" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9998" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9999">
-                                        <attributelist id="10000" addr="0x7f99f1e886b0" >
-                                            <attribute name="name" value="noFocusTexture" id="10001" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10002" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10003" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10000" addr="0x7fca469d66b0" >
+                                            <attribute name="name" value="noFocusTexture" id="10001" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10002" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10003" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10004">
-                                        <attributelist id="10005" addr="0x7f99f1e88750" >
-                                            <attribute name="name" value="textOffsetX" id="10006" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="10007" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10008" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10005" addr="0x7fca469d6750" >
+                                            <attribute name="name" value="textOffsetX" id="10006" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="10007" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10008" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10009">
-                                        <attributelist id="10010" addr="0x7f99f1e887f0" >
-                                            <attribute name="name" value="textOffsetY" id="10011" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="2" id="10012" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10013" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10010" addr="0x7fca469d67f0" >
+                                            <attribute name="name" value="textOffsetY" id="10011" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="2" id="10012" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10013" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10014">
-                                        <attributelist id="10015" addr="0x7f99f1e88890" >
-                                            <attribute name="name" value="_alignment" id="10016" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="(XBFONT_LEFT|XBFONT_CENTER_Y)" id="10017" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10018" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10015" addr="0x7fca469d6890" >
+                                            <attribute name="name" value="_alignment" id="10016" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="(XBFONT_LEFT|XBFONT_CENTER_Y)" id="10017" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10018" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10019">
-                                        <attributelist id="10020" addr="0x7f99f1e88930" >
-                                            <attribute name="name" value="font" id="10021" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10022" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10023" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10020" addr="0x7fca469d6930" >
+                                            <attribute name="name" value="font" id="10021" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10022" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10023" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10024">
-                                        <attributelist id="10025" addr="0x7f99f1e889d0" >
-                                            <attribute name="name" value="textColor" id="10026" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10027" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10028" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10025" addr="0x7fca469d69d0" >
+                                            <attribute name="name" value="textColor" id="10026" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10027" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10028" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10029">
-                                        <attributelist id="10030" addr="0x7f99f1e88a70" >
-                                            <attribute name="name" value="disabledColor" id="10031" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10032" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10033" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10030" addr="0x7fca469d6a70" >
+                                            <attribute name="name" value="disabledColor" id="10031" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10032" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10033" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10034">
-                                        <attributelist id="10035" addr="0x7f99f1e88b10" >
-                                            <attribute name="name" value="angle" id="10036" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="0" id="10037" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10038" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10035" addr="0x7fca469d6b10" >
+                                            <attribute name="name" value="angle" id="10036" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="0" id="10037" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10038" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10039">
-                                        <attributelist id="10040" addr="0x7f99f1e88bb0" >
-                                            <attribute name="name" value="shadowColor" id="10041" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10042" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10043" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10040" addr="0x7fca469d6bb0" >
+                                            <attribute name="name" value="shadowColor" id="10041" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10042" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10043" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_3" id="10044" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="10045" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_3" id="10044" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="10045" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="10046" addr="0x7f99f1e89810" >
-                            <attributelist id="10047" addr="0x7f99f1e89810" >
-                                <attribute name="name" value="ControlRadioButton" id="10048" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="10049" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e84350" id="10050" addr="0x7f99f1e84350" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e8a310" id="10051" addr="0x7f99f1e8a310" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e88c70" id="10052" addr="0x7f99f1e88c70" />
-                                <attribute name="sym_name" value="ControlRadioButton" id="10053" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e8a310" id="10054" addr="0x7f99f1e8a310" />
-                                <attribute name="defaultargs" value="0x7f99f1e865d0" id="10055" addr="0x7f99f1e865d0" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,long)." id="10056" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="10057" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e865d0" id="10058" addr="0x7f99f1e865d0" />
-                                <parmlist id="10059" addr="0x7f99f1e88d10" >
+                        <constructor id="10046" addr="0x7fca469d7810" >
+                            <attributelist id="10047" addr="0x7fca469d7810" >
+                                <attribute name="name" value="ControlRadioButton" id="10048" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="10049" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469d2350" id="10050" addr="0x7fca469d2350" />
+                                <attribute name="csym_nextSibling" value="0x7fca469d8310" id="10051" addr="0x7fca469d8310" />
+                                <attribute name="sym_previousSibling" value="0x7fca469d6c70" id="10052" addr="0x7fca469d6c70" />
+                                <attribute name="sym_name" value="ControlRadioButton" id="10053" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469d8310" id="10054" addr="0x7fca469d8310" />
+                                <attribute name="defaultargs" value="0x7fca469d45d0" id="10055" addr="0x7fca469d45d0" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,long)." id="10056" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="10057" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469d45d0" id="10058" addr="0x7fca469d45d0" />
+                                <parmlist id="10059" addr="0x7fca469d6d10" >
                                     <parm id="10060">
-                                        <attributelist id="10061" addr="0x7f99f1e88d10" >
-                                            <attribute name="name" value="x" id="10062" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10063" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10061" addr="0x7fca469d6d10" >
+                                            <attribute name="name" value="x" id="10062" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10063" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10064">
-                                        <attributelist id="10065" addr="0x7f99f1e88dd0" >
-                                            <attribute name="name" value="y" id="10066" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10067" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10065" addr="0x7fca469d6dd0" >
+                                            <attribute name="name" value="y" id="10066" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10067" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10068">
-                                        <attributelist id="10069" addr="0x7f99f1e88e50" >
-                                            <attribute name="name" value="width" id="10070" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10071" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10069" addr="0x7fca469d6e50" >
+                                            <attribute name="name" value="width" id="10070" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10071" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10072">
-                                        <attributelist id="10073" addr="0x7f99f1e88ed0" >
-                                            <attribute name="name" value="height" id="10074" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10075" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10073" addr="0x7fca469d6ed0" >
+                                            <attribute name="name" value="height" id="10074" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10075" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10076">
-                                        <attributelist id="10077" addr="0x7f99f1e88f50" >
-                                            <attribute name="name" value="label" id="10078" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="10079" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10077" addr="0x7fca469d6f50" >
+                                            <attribute name="name" value="label" id="10078" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="10079" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10080">
-                                        <attributelist id="10081" addr="0x7f99f1e88fd0" >
-                                            <attribute name="name" value="focusOnTexture" id="10082" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10083" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10084" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10081" addr="0x7fca469d6fd0" >
+                                            <attribute name="name" value="focusOnTexture" id="10082" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10083" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10084" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10085">
-                                        <attributelist id="10086" addr="0x7f99f1e89070" >
-                                            <attribute name="name" value="noFocusOnTexture" id="10087" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10088" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10089" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10086" addr="0x7fca469d7070" >
+                                            <attribute name="name" value="noFocusOnTexture" id="10087" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10088" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10089" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10090">
-                                        <attributelist id="10091" addr="0x7f99f1e89110" >
-                                            <attribute name="name" value="focusOffTexture" id="10092" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10093" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10094" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10091" addr="0x7fca469d7110" >
+                                            <attribute name="name" value="focusOffTexture" id="10092" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10093" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10094" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10095">
-                                        <attributelist id="10096" addr="0x7f99f1e891b0" >
-                                            <attribute name="name" value="noFocusOffTexture" id="10097" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10098" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10099" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10096" addr="0x7fca469d71b0" >
+                                            <attribute name="name" value="noFocusOffTexture" id="10097" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10098" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10099" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10100">
-                                        <attributelist id="10101" addr="0x7f99f1e89250" >
-                                            <attribute name="name" value="focusTexture" id="10102" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10103" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10104" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10101" addr="0x7fca469d7250" >
+                                            <attribute name="name" value="focusTexture" id="10102" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10103" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10104" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10105">
-                                        <attributelist id="10106" addr="0x7f99f1e892f0" >
-                                            <attribute name="name" value="noFocusTexture" id="10107" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10108" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10109" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10106" addr="0x7fca469d72f0" >
+                                            <attribute name="name" value="noFocusTexture" id="10107" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10108" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10109" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10110">
-                                        <attributelist id="10111" addr="0x7f99f1e89390" >
-                                            <attribute name="name" value="textOffsetX" id="10112" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="10113" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10114" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10111" addr="0x7fca469d7390" >
+                                            <attribute name="name" value="textOffsetX" id="10112" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="10113" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10114" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10115">
-                                        <attributelist id="10116" addr="0x7f99f1e89430" >
-                                            <attribute name="name" value="textOffsetY" id="10117" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="2" id="10118" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10119" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10116" addr="0x7fca469d7430" >
+                                            <attribute name="name" value="textOffsetY" id="10117" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="2" id="10118" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10119" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10120">
-                                        <attributelist id="10121" addr="0x7f99f1e894d0" >
-                                            <attribute name="name" value="_alignment" id="10122" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="(XBFONT_LEFT|XBFONT_CENTER_Y)" id="10123" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10124" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10121" addr="0x7fca469d74d0" >
+                                            <attribute name="name" value="_alignment" id="10122" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="(XBFONT_LEFT|XBFONT_CENTER_Y)" id="10123" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10124" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10125">
-                                        <attributelist id="10126" addr="0x7f99f1e89570" >
-                                            <attribute name="name" value="font" id="10127" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10128" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10129" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10126" addr="0x7fca469d7570" >
+                                            <attribute name="name" value="font" id="10127" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10128" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10129" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10130">
-                                        <attributelist id="10131" addr="0x7f99f1e89610" >
-                                            <attribute name="name" value="textColor" id="10132" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10133" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10134" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10131" addr="0x7fca469d7610" >
+                                            <attribute name="name" value="textColor" id="10132" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10133" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10134" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10135">
-                                        <attributelist id="10136" addr="0x7f99f1e896b0" >
-                                            <attribute name="name" value="disabledColor" id="10137" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10138" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10139" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10136" addr="0x7fca469d76b0" >
+                                            <attribute name="name" value="disabledColor" id="10137" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10138" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10139" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10140">
-                                        <attributelist id="10141" addr="0x7f99f1e89750" >
-                                            <attribute name="name" value="angle" id="10142" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="0" id="10143" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10144" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10141" addr="0x7fca469d7750" >
+                                            <attribute name="name" value="angle" id="10142" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="0" id="10143" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10144" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_4" id="10145" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="10146" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_4" id="10145" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="10146" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="10147" addr="0x7f99f1e8a310" >
-                            <attributelist id="10148" addr="0x7f99f1e8a310" >
-                                <attribute name="name" value="ControlRadioButton" id="10149" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="10150" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e84350" id="10151" addr="0x7f99f1e84350" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e8ad70" id="10152" addr="0x7f99f1e8ad70" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e89810" id="10153" addr="0x7f99f1e89810" />
-                                <attribute name="sym_name" value="ControlRadioButton" id="10154" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e8ad70" id="10155" addr="0x7f99f1e8ad70" />
-                                <attribute name="defaultargs" value="0x7f99f1e865d0" id="10156" addr="0x7f99f1e865d0" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char)." id="10157" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="10158" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e865d0" id="10159" addr="0x7f99f1e865d0" />
-                                <parmlist id="10160" addr="0x7f99f1e898b0" >
+                        <constructor id="10147" addr="0x7fca469d8310" >
+                            <attributelist id="10148" addr="0x7fca469d8310" >
+                                <attribute name="name" value="ControlRadioButton" id="10149" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="10150" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469d2350" id="10151" addr="0x7fca469d2350" />
+                                <attribute name="csym_nextSibling" value="0x7fca469d8d70" id="10152" addr="0x7fca469d8d70" />
+                                <attribute name="sym_previousSibling" value="0x7fca469d7810" id="10153" addr="0x7fca469d7810" />
+                                <attribute name="sym_name" value="ControlRadioButton" id="10154" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469d8d70" id="10155" addr="0x7fca469d8d70" />
+                                <attribute name="defaultargs" value="0x7fca469d45d0" id="10156" addr="0x7fca469d45d0" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char)." id="10157" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="10158" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469d45d0" id="10159" addr="0x7fca469d45d0" />
+                                <parmlist id="10160" addr="0x7fca469d78b0" >
                                     <parm id="10161">
-                                        <attributelist id="10162" addr="0x7f99f1e898b0" >
-                                            <attribute name="name" value="x" id="10163" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10164" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10162" addr="0x7fca469d78b0" >
+                                            <attribute name="name" value="x" id="10163" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10164" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10165">
-                                        <attributelist id="10166" addr="0x7f99f1e89970" >
-                                            <attribute name="name" value="y" id="10167" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10168" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10166" addr="0x7fca469d7970" >
+                                            <attribute name="name" value="y" id="10167" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10168" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10169">
-                                        <attributelist id="10170" addr="0x7f99f1e899f0" >
-                                            <attribute name="name" value="width" id="10171" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10172" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10170" addr="0x7fca469d79f0" >
+                                            <attribute name="name" value="width" id="10171" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10172" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10173">
-                                        <attributelist id="10174" addr="0x7f99f1e89a70" >
-                                            <attribute name="name" value="height" id="10175" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10176" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10174" addr="0x7fca469d7a70" >
+                                            <attribute name="name" value="height" id="10175" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10176" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10177">
-                                        <attributelist id="10178" addr="0x7f99f1e89af0" >
-                                            <attribute name="name" value="label" id="10179" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="10180" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10178" addr="0x7fca469d7af0" >
+                                            <attribute name="name" value="label" id="10179" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="10180" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10181">
-                                        <attributelist id="10182" addr="0x7f99f1e89b70" >
-                                            <attribute name="name" value="focusOnTexture" id="10183" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10184" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10185" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10182" addr="0x7fca469d7b70" >
+                                            <attribute name="name" value="focusOnTexture" id="10183" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10184" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10185" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10186">
-                                        <attributelist id="10187" addr="0x7f99f1e89c10" >
-                                            <attribute name="name" value="noFocusOnTexture" id="10188" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10189" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10190" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10187" addr="0x7fca469d7c10" >
+                                            <attribute name="name" value="noFocusOnTexture" id="10188" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10189" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10190" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10191">
-                                        <attributelist id="10192" addr="0x7f99f1e89cb0" >
-                                            <attribute name="name" value="focusOffTexture" id="10193" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10194" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10195" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10192" addr="0x7fca469d7cb0" >
+                                            <attribute name="name" value="focusOffTexture" id="10193" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10194" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10195" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10196">
-                                        <attributelist id="10197" addr="0x7f99f1e89d50" >
-                                            <attribute name="name" value="noFocusOffTexture" id="10198" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10199" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10200" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10197" addr="0x7fca469d7d50" >
+                                            <attribute name="name" value="noFocusOffTexture" id="10198" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10199" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10200" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10201">
-                                        <attributelist id="10202" addr="0x7f99f1e89df0" >
-                                            <attribute name="name" value="focusTexture" id="10203" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10204" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10205" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10202" addr="0x7fca469d7df0" >
+                                            <attribute name="name" value="focusTexture" id="10203" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10204" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10205" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10206">
-                                        <attributelist id="10207" addr="0x7f99f1e89e90" >
-                                            <attribute name="name" value="noFocusTexture" id="10208" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10209" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10210" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10207" addr="0x7fca469d7e90" >
+                                            <attribute name="name" value="noFocusTexture" id="10208" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10209" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10210" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10211">
-                                        <attributelist id="10212" addr="0x7f99f1e89f30" >
-                                            <attribute name="name" value="textOffsetX" id="10213" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="10214" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10215" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10212" addr="0x7fca469d7f30" >
+                                            <attribute name="name" value="textOffsetX" id="10213" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="10214" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10215" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10216">
-                                        <attributelist id="10217" addr="0x7f99f1e89fd0" >
-                                            <attribute name="name" value="textOffsetY" id="10218" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="2" id="10219" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10220" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10217" addr="0x7fca469d7fd0" >
+                                            <attribute name="name" value="textOffsetY" id="10218" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="2" id="10219" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10220" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10221">
-                                        <attributelist id="10222" addr="0x7f99f1e8a070" >
-                                            <attribute name="name" value="_alignment" id="10223" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="(XBFONT_LEFT|XBFONT_CENTER_Y)" id="10224" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10225" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10222" addr="0x7fca469d8070" >
+                                            <attribute name="name" value="_alignment" id="10223" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="(XBFONT_LEFT|XBFONT_CENTER_Y)" id="10224" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10225" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10226">
-                                        <attributelist id="10227" addr="0x7f99f1e8a110" >
-                                            <attribute name="name" value="font" id="10228" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10229" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10230" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10227" addr="0x7fca469d8110" >
+                                            <attribute name="name" value="font" id="10228" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10229" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10230" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10231">
-                                        <attributelist id="10232" addr="0x7f99f1e8a1b0" >
-                                            <attribute name="name" value="textColor" id="10233" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10234" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10235" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10232" addr="0x7fca469d81b0" >
+                                            <attribute name="name" value="textColor" id="10233" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10234" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10235" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10236">
-                                        <attributelist id="10237" addr="0x7f99f1e8a250" >
-                                            <attribute name="name" value="disabledColor" id="10238" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10239" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10240" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10237" addr="0x7fca469d8250" >
+                                            <attribute name="name" value="disabledColor" id="10238" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10239" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10240" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_5" id="10241" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="10242" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_5" id="10241" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="10242" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="10243" addr="0x7f99f1e8ad70" >
-                            <attributelist id="10244" addr="0x7f99f1e8ad70" >
-                                <attribute name="name" value="ControlRadioButton" id="10245" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="10246" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e84350" id="10247" addr="0x7f99f1e84350" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e8b730" id="10248" addr="0x7f99f1e8b730" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e8a310" id="10249" addr="0x7f99f1e8a310" />
-                                <attribute name="sym_name" value="ControlRadioButton" id="10250" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e8b730" id="10251" addr="0x7f99f1e8b730" />
-                                <attribute name="defaultargs" value="0x7f99f1e865d0" id="10252" addr="0x7f99f1e865d0" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,long,long,long,p.q(const).char,p.q(const).char)." id="10253" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="10254" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e865d0" id="10255" addr="0x7f99f1e865d0" />
-                                <parmlist id="10256" addr="0x7f99f1e8a3b0" >
+                        <constructor id="10243" addr="0x7fca469d8d70" >
+                            <attributelist id="10244" addr="0x7fca469d8d70" >
+                                <attribute name="name" value="ControlRadioButton" id="10245" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="10246" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469d2350" id="10247" addr="0x7fca469d2350" />
+                                <attribute name="csym_nextSibling" value="0x7fca469d9730" id="10248" addr="0x7fca469d9730" />
+                                <attribute name="sym_previousSibling" value="0x7fca469d8310" id="10249" addr="0x7fca469d8310" />
+                                <attribute name="sym_name" value="ControlRadioButton" id="10250" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469d9730" id="10251" addr="0x7fca469d9730" />
+                                <attribute name="defaultargs" value="0x7fca469d45d0" id="10252" addr="0x7fca469d45d0" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,long,long,long,p.q(const).char,p.q(const).char)." id="10253" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="10254" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469d45d0" id="10255" addr="0x7fca469d45d0" />
+                                <parmlist id="10256" addr="0x7fca469d83b0" >
                                     <parm id="10257">
-                                        <attributelist id="10258" addr="0x7f99f1e8a3b0" >
-                                            <attribute name="name" value="x" id="10259" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10260" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10258" addr="0x7fca469d83b0" >
+                                            <attribute name="name" value="x" id="10259" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10260" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10261">
-                                        <attributelist id="10262" addr="0x7f99f1e8a470" >
-                                            <attribute name="name" value="y" id="10263" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10264" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10262" addr="0x7fca469d8470" >
+                                            <attribute name="name" value="y" id="10263" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10264" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10265">
-                                        <attributelist id="10266" addr="0x7f99f1e8a4f0" >
-                                            <attribute name="name" value="width" id="10267" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10268" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10266" addr="0x7fca469d84f0" >
+                                            <attribute name="name" value="width" id="10267" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10268" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10269">
-                                        <attributelist id="10270" addr="0x7f99f1e8a570" >
-                                            <attribute name="name" value="height" id="10271" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10272" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10270" addr="0x7fca469d8570" >
+                                            <attribute name="name" value="height" id="10271" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10272" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10273">
-                                        <attributelist id="10274" addr="0x7f99f1e8a5f0" >
-                                            <attribute name="name" value="label" id="10275" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="10276" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10274" addr="0x7fca469d85f0" >
+                                            <attribute name="name" value="label" id="10275" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="10276" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10277">
-                                        <attributelist id="10278" addr="0x7f99f1e8a670" >
-                                            <attribute name="name" value="focusOnTexture" id="10279" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10280" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10281" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10278" addr="0x7fca469d8670" >
+                                            <attribute name="name" value="focusOnTexture" id="10279" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10280" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10281" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10282">
-                                        <attributelist id="10283" addr="0x7f99f1e8a710" >
-                                            <attribute name="name" value="noFocusOnTexture" id="10284" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10285" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10286" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10283" addr="0x7fca469d8710" >
+                                            <attribute name="name" value="noFocusOnTexture" id="10284" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10285" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10286" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10287">
-                                        <attributelist id="10288" addr="0x7f99f1e8a7b0" >
-                                            <attribute name="name" value="focusOffTexture" id="10289" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10290" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10291" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10288" addr="0x7fca469d87b0" >
+                                            <attribute name="name" value="focusOffTexture" id="10289" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10290" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10291" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10292">
-                                        <attributelist id="10293" addr="0x7f99f1e8a850" >
-                                            <attribute name="name" value="noFocusOffTexture" id="10294" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10295" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10296" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10293" addr="0x7fca469d8850" >
+                                            <attribute name="name" value="noFocusOffTexture" id="10294" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10295" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10296" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10297">
-                                        <attributelist id="10298" addr="0x7f99f1e8a8f0" >
-                                            <attribute name="name" value="focusTexture" id="10299" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10300" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10301" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10298" addr="0x7fca469d88f0" >
+                                            <attribute name="name" value="focusTexture" id="10299" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10300" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10301" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10302">
-                                        <attributelist id="10303" addr="0x7f99f1e8a990" >
-                                            <attribute name="name" value="noFocusTexture" id="10304" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10305" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10306" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10303" addr="0x7fca469d8990" >
+                                            <attribute name="name" value="noFocusTexture" id="10304" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10305" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10306" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10307">
-                                        <attributelist id="10308" addr="0x7f99f1e8aa30" >
-                                            <attribute name="name" value="textOffsetX" id="10309" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="10310" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10311" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10308" addr="0x7fca469d8a30" >
+                                            <attribute name="name" value="textOffsetX" id="10309" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="10310" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10311" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10312">
-                                        <attributelist id="10313" addr="0x7f99f1e8aad0" >
-                                            <attribute name="name" value="textOffsetY" id="10314" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="2" id="10315" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10316" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10313" addr="0x7fca469d8ad0" >
+                                            <attribute name="name" value="textOffsetY" id="10314" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="2" id="10315" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10316" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10317">
-                                        <attributelist id="10318" addr="0x7f99f1e8ab70" >
-                                            <attribute name="name" value="_alignment" id="10319" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="(XBFONT_LEFT|XBFONT_CENTER_Y)" id="10320" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10321" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10318" addr="0x7fca469d8b70" >
+                                            <attribute name="name" value="_alignment" id="10319" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="(XBFONT_LEFT|XBFONT_CENTER_Y)" id="10320" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10321" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10322">
-                                        <attributelist id="10323" addr="0x7f99f1e8ac10" >
-                                            <attribute name="name" value="font" id="10324" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10325" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10326" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10323" addr="0x7fca469d8c10" >
+                                            <attribute name="name" value="font" id="10324" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10325" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10326" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10327">
-                                        <attributelist id="10328" addr="0x7f99f1e8acb0" >
-                                            <attribute name="name" value="textColor" id="10329" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10330" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10331" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10328" addr="0x7fca469d8cb0" >
+                                            <attribute name="name" value="textColor" id="10329" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10330" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10331" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_6" id="10332" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="10333" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_6" id="10332" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="10333" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="10334" addr="0x7f99f1e8b730" >
-                            <attributelist id="10335" addr="0x7f99f1e8b730" >
-                                <attribute name="name" value="ControlRadioButton" id="10336" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="10337" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e84350" id="10338" addr="0x7f99f1e84350" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e8c050" id="10339" addr="0x7f99f1e8c050" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e8ad70" id="10340" addr="0x7f99f1e8ad70" />
-                                <attribute name="sym_name" value="ControlRadioButton" id="10341" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e8c050" id="10342" addr="0x7f99f1e8c050" />
-                                <attribute name="defaultargs" value="0x7f99f1e865d0" id="10343" addr="0x7f99f1e865d0" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,long,long,long,p.q(const).char)." id="10344" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="10345" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e865d0" id="10346" addr="0x7f99f1e865d0" />
-                                <parmlist id="10347" addr="0x7f99f1e8ae10" >
+                        <constructor id="10334" addr="0x7fca469d9730" >
+                            <attributelist id="10335" addr="0x7fca469d9730" >
+                                <attribute name="name" value="ControlRadioButton" id="10336" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="10337" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469d2350" id="10338" addr="0x7fca469d2350" />
+                                <attribute name="csym_nextSibling" value="0x7fca469da050" id="10339" addr="0x7fca469da050" />
+                                <attribute name="sym_previousSibling" value="0x7fca469d8d70" id="10340" addr="0x7fca469d8d70" />
+                                <attribute name="sym_name" value="ControlRadioButton" id="10341" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469da050" id="10342" addr="0x7fca469da050" />
+                                <attribute name="defaultargs" value="0x7fca469d45d0" id="10343" addr="0x7fca469d45d0" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,long,long,long,p.q(const).char)." id="10344" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="10345" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469d45d0" id="10346" addr="0x7fca469d45d0" />
+                                <parmlist id="10347" addr="0x7fca469d8e10" >
                                     <parm id="10348">
-                                        <attributelist id="10349" addr="0x7f99f1e8ae10" >
-                                            <attribute name="name" value="x" id="10350" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10351" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10349" addr="0x7fca469d8e10" >
+                                            <attribute name="name" value="x" id="10350" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10351" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10352">
-                                        <attributelist id="10353" addr="0x7f99f1e8aed0" >
-                                            <attribute name="name" value="y" id="10354" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10355" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10353" addr="0x7fca469d8ed0" >
+                                            <attribute name="name" value="y" id="10354" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10355" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10356">
-                                        <attributelist id="10357" addr="0x7f99f1e8af50" >
-                                            <attribute name="name" value="width" id="10358" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10359" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10357" addr="0x7fca469d8f50" >
+                                            <attribute name="name" value="width" id="10358" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10359" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10360">
-                                        <attributelist id="10361" addr="0x7f99f1e8afd0" >
-                                            <attribute name="name" value="height" id="10362" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10363" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10361" addr="0x7fca469d8fd0" >
+                                            <attribute name="name" value="height" id="10362" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10363" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10364">
-                                        <attributelist id="10365" addr="0x7f99f1e8b050" >
-                                            <attribute name="name" value="label" id="10366" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="10367" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10365" addr="0x7fca469d9050" >
+                                            <attribute name="name" value="label" id="10366" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="10367" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10368">
-                                        <attributelist id="10369" addr="0x7f99f1e8b0d0" >
-                                            <attribute name="name" value="focusOnTexture" id="10370" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10371" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10372" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10369" addr="0x7fca469d90d0" >
+                                            <attribute name="name" value="focusOnTexture" id="10370" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10371" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10372" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10373">
-                                        <attributelist id="10374" addr="0x7f99f1e8b170" >
-                                            <attribute name="name" value="noFocusOnTexture" id="10375" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10376" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10377" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10374" addr="0x7fca469d9170" >
+                                            <attribute name="name" value="noFocusOnTexture" id="10375" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10376" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10377" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10378">
-                                        <attributelist id="10379" addr="0x7f99f1e8b210" >
-                                            <attribute name="name" value="focusOffTexture" id="10380" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10381" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10382" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10379" addr="0x7fca469d9210" >
+                                            <attribute name="name" value="focusOffTexture" id="10380" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10381" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10382" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10383">
-                                        <attributelist id="10384" addr="0x7f99f1e8b2b0" >
-                                            <attribute name="name" value="noFocusOffTexture" id="10385" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10386" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10387" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10384" addr="0x7fca469d92b0" >
+                                            <attribute name="name" value="noFocusOffTexture" id="10385" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10386" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10387" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10388">
-                                        <attributelist id="10389" addr="0x7f99f1e8b350" >
-                                            <attribute name="name" value="focusTexture" id="10390" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10391" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10392" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10389" addr="0x7fca469d9350" >
+                                            <attribute name="name" value="focusTexture" id="10390" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10391" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10392" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10393">
-                                        <attributelist id="10394" addr="0x7f99f1e8b3f0" >
-                                            <attribute name="name" value="noFocusTexture" id="10395" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10396" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10397" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10394" addr="0x7fca469d93f0" >
+                                            <attribute name="name" value="noFocusTexture" id="10395" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10396" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10397" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10398">
-                                        <attributelist id="10399" addr="0x7f99f1e8b490" >
-                                            <attribute name="name" value="textOffsetX" id="10400" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="10401" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10402" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10399" addr="0x7fca469d9490" >
+                                            <attribute name="name" value="textOffsetX" id="10400" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="10401" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10402" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10403">
-                                        <attributelist id="10404" addr="0x7f99f1e8b530" >
-                                            <attribute name="name" value="textOffsetY" id="10405" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="2" id="10406" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10407" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10404" addr="0x7fca469d9530" >
+                                            <attribute name="name" value="textOffsetY" id="10405" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="2" id="10406" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10407" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10408">
-                                        <attributelist id="10409" addr="0x7f99f1e8b5d0" >
-                                            <attribute name="name" value="_alignment" id="10410" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="(XBFONT_LEFT|XBFONT_CENTER_Y)" id="10411" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10412" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10409" addr="0x7fca469d95d0" >
+                                            <attribute name="name" value="_alignment" id="10410" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="(XBFONT_LEFT|XBFONT_CENTER_Y)" id="10411" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10412" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10413">
-                                        <attributelist id="10414" addr="0x7f99f1e8b670" >
-                                            <attribute name="name" value="font" id="10415" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10416" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10417" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10414" addr="0x7fca469d9670" >
+                                            <attribute name="name" value="font" id="10415" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10416" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10417" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_7" id="10418" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="10419" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_7" id="10418" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="10419" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="10420" addr="0x7f99f1e8c050" >
-                            <attributelist id="10421" addr="0x7f99f1e8c050" >
-                                <attribute name="name" value="ControlRadioButton" id="10422" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="10423" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e84350" id="10424" addr="0x7f99f1e84350" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e8c8d0" id="10425" addr="0x7f99f1e8c8d0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e8b730" id="10426" addr="0x7f99f1e8b730" />
-                                <attribute name="sym_name" value="ControlRadioButton" id="10427" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e8c8d0" id="10428" addr="0x7f99f1e8c8d0" />
-                                <attribute name="defaultargs" value="0x7f99f1e865d0" id="10429" addr="0x7f99f1e865d0" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,long,long,long)." id="10430" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="10431" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e865d0" id="10432" addr="0x7f99f1e865d0" />
-                                <parmlist id="10433" addr="0x7f99f1e8b7d0" >
+                        <constructor id="10420" addr="0x7fca469da050" >
+                            <attributelist id="10421" addr="0x7fca469da050" >
+                                <attribute name="name" value="ControlRadioButton" id="10422" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="10423" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469d2350" id="10424" addr="0x7fca469d2350" />
+                                <attribute name="csym_nextSibling" value="0x7fca469da8d0" id="10425" addr="0x7fca469da8d0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469d9730" id="10426" addr="0x7fca469d9730" />
+                                <attribute name="sym_name" value="ControlRadioButton" id="10427" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469da8d0" id="10428" addr="0x7fca469da8d0" />
+                                <attribute name="defaultargs" value="0x7fca469d45d0" id="10429" addr="0x7fca469d45d0" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,long,long,long)." id="10430" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="10431" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469d45d0" id="10432" addr="0x7fca469d45d0" />
+                                <parmlist id="10433" addr="0x7fca469d97d0" >
                                     <parm id="10434">
-                                        <attributelist id="10435" addr="0x7f99f1e8b7d0" >
-                                            <attribute name="name" value="x" id="10436" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10437" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10435" addr="0x7fca469d97d0" >
+                                            <attribute name="name" value="x" id="10436" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10437" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10438">
-                                        <attributelist id="10439" addr="0x7f99f1e8b890" >
-                                            <attribute name="name" value="y" id="10440" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10441" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10439" addr="0x7fca469d9890" >
+                                            <attribute name="name" value="y" id="10440" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10441" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10442">
-                                        <attributelist id="10443" addr="0x7f99f1e8b910" >
-                                            <attribute name="name" value="width" id="10444" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10445" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10443" addr="0x7fca469d9910" >
+                                            <attribute name="name" value="width" id="10444" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10445" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10446">
-                                        <attributelist id="10447" addr="0x7f99f1e8b990" >
-                                            <attribute name="name" value="height" id="10448" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10449" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10447" addr="0x7fca469d9990" >
+                                            <attribute name="name" value="height" id="10448" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10449" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10450">
-                                        <attributelist id="10451" addr="0x7f99f1e8ba10" >
-                                            <attribute name="name" value="label" id="10452" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="10453" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10451" addr="0x7fca469d9a10" >
+                                            <attribute name="name" value="label" id="10452" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="10453" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10454">
-                                        <attributelist id="10455" addr="0x7f99f1e8ba90" >
-                                            <attribute name="name" value="focusOnTexture" id="10456" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10457" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10458" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10455" addr="0x7fca469d9a90" >
+                                            <attribute name="name" value="focusOnTexture" id="10456" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10457" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10458" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10459">
-                                        <attributelist id="10460" addr="0x7f99f1e8bb30" >
-                                            <attribute name="name" value="noFocusOnTexture" id="10461" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10462" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10463" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10460" addr="0x7fca469d9b30" >
+                                            <attribute name="name" value="noFocusOnTexture" id="10461" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10462" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10463" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10464">
-                                        <attributelist id="10465" addr="0x7f99f1e8bbd0" >
-                                            <attribute name="name" value="focusOffTexture" id="10466" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10467" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10468" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10465" addr="0x7fca469d9bd0" >
+                                            <attribute name="name" value="focusOffTexture" id="10466" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10467" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10468" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10469">
-                                        <attributelist id="10470" addr="0x7f99f1e8bc70" >
-                                            <attribute name="name" value="noFocusOffTexture" id="10471" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10472" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10473" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10470" addr="0x7fca469d9c70" >
+                                            <attribute name="name" value="noFocusOffTexture" id="10471" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10472" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10473" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10474">
-                                        <attributelist id="10475" addr="0x7f99f1e8bd10" >
-                                            <attribute name="name" value="focusTexture" id="10476" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10477" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10478" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10475" addr="0x7fca469d9d10" >
+                                            <attribute name="name" value="focusTexture" id="10476" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10477" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10478" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10479">
-                                        <attributelist id="10480" addr="0x7f99f1e8bdb0" >
-                                            <attribute name="name" value="noFocusTexture" id="10481" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10482" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10483" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10480" addr="0x7fca469d9db0" >
+                                            <attribute name="name" value="noFocusTexture" id="10481" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10482" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10483" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10484">
-                                        <attributelist id="10485" addr="0x7f99f1e8be50" >
-                                            <attribute name="name" value="textOffsetX" id="10486" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="10487" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10488" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10485" addr="0x7fca469d9e50" >
+                                            <attribute name="name" value="textOffsetX" id="10486" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="10487" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10488" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10489">
-                                        <attributelist id="10490" addr="0x7f99f1e8bef0" >
-                                            <attribute name="name" value="textOffsetY" id="10491" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="2" id="10492" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10493" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10490" addr="0x7fca469d9ef0" >
+                                            <attribute name="name" value="textOffsetY" id="10491" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="2" id="10492" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10493" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10494">
-                                        <attributelist id="10495" addr="0x7f99f1e8bf90" >
-                                            <attribute name="name" value="_alignment" id="10496" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="(XBFONT_LEFT|XBFONT_CENTER_Y)" id="10497" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10498" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10495" addr="0x7fca469d9f90" >
+                                            <attribute name="name" value="_alignment" id="10496" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="(XBFONT_LEFT|XBFONT_CENTER_Y)" id="10497" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10498" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_8" id="10499" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="10500" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_8" id="10499" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="10500" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="10501" addr="0x7f99f1e8c8d0" >
-                            <attributelist id="10502" addr="0x7f99f1e8c8d0" >
-                                <attribute name="name" value="ControlRadioButton" id="10503" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="10504" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e84350" id="10505" addr="0x7f99f1e84350" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e8d0b0" id="10506" addr="0x7f99f1e8d0b0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e8c050" id="10507" addr="0x7f99f1e8c050" />
-                                <attribute name="sym_name" value="ControlRadioButton" id="10508" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e8d0b0" id="10509" addr="0x7f99f1e8d0b0" />
-                                <attribute name="defaultargs" value="0x7f99f1e865d0" id="10510" addr="0x7f99f1e865d0" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,long,long)." id="10511" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="10512" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e865d0" id="10513" addr="0x7f99f1e865d0" />
-                                <parmlist id="10514" addr="0x7f99f1e8c0f0" >
+                        <constructor id="10501" addr="0x7fca469da8d0" >
+                            <attributelist id="10502" addr="0x7fca469da8d0" >
+                                <attribute name="name" value="ControlRadioButton" id="10503" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="10504" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469d2350" id="10505" addr="0x7fca469d2350" />
+                                <attribute name="csym_nextSibling" value="0x7fca469db0b0" id="10506" addr="0x7fca469db0b0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469da050" id="10507" addr="0x7fca469da050" />
+                                <attribute name="sym_name" value="ControlRadioButton" id="10508" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469db0b0" id="10509" addr="0x7fca469db0b0" />
+                                <attribute name="defaultargs" value="0x7fca469d45d0" id="10510" addr="0x7fca469d45d0" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,long,long)." id="10511" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="10512" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469d45d0" id="10513" addr="0x7fca469d45d0" />
+                                <parmlist id="10514" addr="0x7fca469da0f0" >
                                     <parm id="10515">
-                                        <attributelist id="10516" addr="0x7f99f1e8c0f0" >
-                                            <attribute name="name" value="x" id="10517" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10518" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10516" addr="0x7fca469da0f0" >
+                                            <attribute name="name" value="x" id="10517" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10518" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10519">
-                                        <attributelist id="10520" addr="0x7f99f1e8c1b0" >
-                                            <attribute name="name" value="y" id="10521" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10522" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10520" addr="0x7fca469da1b0" >
+                                            <attribute name="name" value="y" id="10521" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10522" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10523">
-                                        <attributelist id="10524" addr="0x7f99f1e8c230" >
-                                            <attribute name="name" value="width" id="10525" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10526" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10524" addr="0x7fca469da230" >
+                                            <attribute name="name" value="width" id="10525" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10526" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10527">
-                                        <attributelist id="10528" addr="0x7f99f1e8c2b0" >
-                                            <attribute name="name" value="height" id="10529" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10530" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10528" addr="0x7fca469da2b0" >
+                                            <attribute name="name" value="height" id="10529" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10530" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10531">
-                                        <attributelist id="10532" addr="0x7f99f1e8c330" >
-                                            <attribute name="name" value="label" id="10533" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="10534" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10532" addr="0x7fca469da330" >
+                                            <attribute name="name" value="label" id="10533" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="10534" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10535">
-                                        <attributelist id="10536" addr="0x7f99f1e8c3b0" >
-                                            <attribute name="name" value="focusOnTexture" id="10537" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10538" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10539" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10536" addr="0x7fca469da3b0" >
+                                            <attribute name="name" value="focusOnTexture" id="10537" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10538" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10539" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10540">
-                                        <attributelist id="10541" addr="0x7f99f1e8c450" >
-                                            <attribute name="name" value="noFocusOnTexture" id="10542" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10543" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10544" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10541" addr="0x7fca469da450" >
+                                            <attribute name="name" value="noFocusOnTexture" id="10542" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10543" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10544" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10545">
-                                        <attributelist id="10546" addr="0x7f99f1e8c4f0" >
-                                            <attribute name="name" value="focusOffTexture" id="10547" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10548" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10549" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10546" addr="0x7fca469da4f0" >
+                                            <attribute name="name" value="focusOffTexture" id="10547" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10548" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10549" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10550">
-                                        <attributelist id="10551" addr="0x7f99f1e8c590" >
-                                            <attribute name="name" value="noFocusOffTexture" id="10552" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10553" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10554" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10551" addr="0x7fca469da590" >
+                                            <attribute name="name" value="noFocusOffTexture" id="10552" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10553" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10554" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10555">
-                                        <attributelist id="10556" addr="0x7f99f1e8c630" >
-                                            <attribute name="name" value="focusTexture" id="10557" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10558" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10559" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10556" addr="0x7fca469da630" >
+                                            <attribute name="name" value="focusTexture" id="10557" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10558" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10559" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10560">
-                                        <attributelist id="10561" addr="0x7f99f1e8c6d0" >
-                                            <attribute name="name" value="noFocusTexture" id="10562" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10563" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10564" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10561" addr="0x7fca469da6d0" >
+                                            <attribute name="name" value="noFocusTexture" id="10562" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10563" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10564" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10565">
-                                        <attributelist id="10566" addr="0x7f99f1e8c770" >
-                                            <attribute name="name" value="textOffsetX" id="10567" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="10568" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10569" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10566" addr="0x7fca469da770" >
+                                            <attribute name="name" value="textOffsetX" id="10567" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="10568" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10569" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10570">
-                                        <attributelist id="10571" addr="0x7f99f1e8c810" >
-                                            <attribute name="name" value="textOffsetY" id="10572" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="2" id="10573" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10574" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10571" addr="0x7fca469da810" >
+                                            <attribute name="name" value="textOffsetY" id="10572" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="2" id="10573" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10574" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_9" id="10575" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="10576" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_9" id="10575" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="10576" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="10577" addr="0x7f99f1e8d0b0" >
-                            <attributelist id="10578" addr="0x7f99f1e8d0b0" >
-                                <attribute name="name" value="ControlRadioButton" id="10579" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="10580" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e84350" id="10581" addr="0x7f99f1e84350" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e8d7f0" id="10582" addr="0x7f99f1e8d7f0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e8c8d0" id="10583" addr="0x7f99f1e8c8d0" />
-                                <attribute name="sym_name" value="ControlRadioButton" id="10584" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e8d7f0" id="10585" addr="0x7f99f1e8d7f0" />
-                                <attribute name="defaultargs" value="0x7f99f1e865d0" id="10586" addr="0x7f99f1e865d0" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,long)." id="10587" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="10588" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e865d0" id="10589" addr="0x7f99f1e865d0" />
-                                <parmlist id="10590" addr="0x7f99f1e8c970" >
+                        <constructor id="10577" addr="0x7fca469db0b0" >
+                            <attributelist id="10578" addr="0x7fca469db0b0" >
+                                <attribute name="name" value="ControlRadioButton" id="10579" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="10580" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469d2350" id="10581" addr="0x7fca469d2350" />
+                                <attribute name="csym_nextSibling" value="0x7fca469db7f0" id="10582" addr="0x7fca469db7f0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469da8d0" id="10583" addr="0x7fca469da8d0" />
+                                <attribute name="sym_name" value="ControlRadioButton" id="10584" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469db7f0" id="10585" addr="0x7fca469db7f0" />
+                                <attribute name="defaultargs" value="0x7fca469d45d0" id="10586" addr="0x7fca469d45d0" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,long)." id="10587" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="10588" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469d45d0" id="10589" addr="0x7fca469d45d0" />
+                                <parmlist id="10590" addr="0x7fca469da970" >
                                     <parm id="10591">
-                                        <attributelist id="10592" addr="0x7f99f1e8c970" >
-                                            <attribute name="name" value="x" id="10593" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10594" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10592" addr="0x7fca469da970" >
+                                            <attribute name="name" value="x" id="10593" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10594" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10595">
-                                        <attributelist id="10596" addr="0x7f99f1e8ca30" >
-                                            <attribute name="name" value="y" id="10597" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10598" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10596" addr="0x7fca469daa30" >
+                                            <attribute name="name" value="y" id="10597" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10598" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10599">
-                                        <attributelist id="10600" addr="0x7f99f1e8cab0" >
-                                            <attribute name="name" value="width" id="10601" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10602" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10600" addr="0x7fca469daab0" >
+                                            <attribute name="name" value="width" id="10601" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10602" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10603">
-                                        <attributelist id="10604" addr="0x7f99f1e8cb30" >
-                                            <attribute name="name" value="height" id="10605" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10606" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10604" addr="0x7fca469dab30" >
+                                            <attribute name="name" value="height" id="10605" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10606" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10607">
-                                        <attributelist id="10608" addr="0x7f99f1e8cbb0" >
-                                            <attribute name="name" value="label" id="10609" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="10610" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10608" addr="0x7fca469dabb0" >
+                                            <attribute name="name" value="label" id="10609" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="10610" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10611">
-                                        <attributelist id="10612" addr="0x7f99f1e8cc30" >
-                                            <attribute name="name" value="focusOnTexture" id="10613" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10614" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10615" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10612" addr="0x7fca469dac30" >
+                                            <attribute name="name" value="focusOnTexture" id="10613" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10614" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10615" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10616">
-                                        <attributelist id="10617" addr="0x7f99f1e8ccd0" >
-                                            <attribute name="name" value="noFocusOnTexture" id="10618" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10619" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10620" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10617" addr="0x7fca469dacd0" >
+                                            <attribute name="name" value="noFocusOnTexture" id="10618" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10619" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10620" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10621">
-                                        <attributelist id="10622" addr="0x7f99f1e8cd70" >
-                                            <attribute name="name" value="focusOffTexture" id="10623" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10624" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10625" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10622" addr="0x7fca469dad70" >
+                                            <attribute name="name" value="focusOffTexture" id="10623" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10624" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10625" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10626">
-                                        <attributelist id="10627" addr="0x7f99f1e8ce10" >
-                                            <attribute name="name" value="noFocusOffTexture" id="10628" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10629" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10630" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10627" addr="0x7fca469dae10" >
+                                            <attribute name="name" value="noFocusOffTexture" id="10628" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10629" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10630" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10631">
-                                        <attributelist id="10632" addr="0x7f99f1e8ceb0" >
-                                            <attribute name="name" value="focusTexture" id="10633" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10634" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10635" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10632" addr="0x7fca469daeb0" >
+                                            <attribute name="name" value="focusTexture" id="10633" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10634" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10635" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10636">
-                                        <attributelist id="10637" addr="0x7f99f1e8cf50" >
-                                            <attribute name="name" value="noFocusTexture" id="10638" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10639" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10640" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10637" addr="0x7fca469daf50" >
+                                            <attribute name="name" value="noFocusTexture" id="10638" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10639" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10640" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10641">
-                                        <attributelist id="10642" addr="0x7f99f1e8cff0" >
-                                            <attribute name="name" value="textOffsetX" id="10643" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="10644" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10645" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10642" addr="0x7fca469daff0" >
+                                            <attribute name="name" value="textOffsetX" id="10643" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="10644" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10645" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_10" id="10646" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="10647" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_10" id="10646" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="10647" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="10648" addr="0x7f99f1e8d7f0" >
-                            <attributelist id="10649" addr="0x7f99f1e8d7f0" >
-                                <attribute name="name" value="ControlRadioButton" id="10650" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="10651" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e84350" id="10652" addr="0x7f99f1e84350" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e8de90" id="10653" addr="0x7f99f1e8de90" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e8d0b0" id="10654" addr="0x7f99f1e8d0b0" />
-                                <attribute name="sym_name" value="ControlRadioButton" id="10655" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e8de90" id="10656" addr="0x7f99f1e8de90" />
-                                <attribute name="defaultargs" value="0x7f99f1e865d0" id="10657" addr="0x7f99f1e865d0" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char)." id="10658" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="10659" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e865d0" id="10660" addr="0x7f99f1e865d0" />
-                                <parmlist id="10661" addr="0x7f99f1e8d150" >
+                        <constructor id="10648" addr="0x7fca469db7f0" >
+                            <attributelist id="10649" addr="0x7fca469db7f0" >
+                                <attribute name="name" value="ControlRadioButton" id="10650" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="10651" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469d2350" id="10652" addr="0x7fca469d2350" />
+                                <attribute name="csym_nextSibling" value="0x7fca469dbe90" id="10653" addr="0x7fca469dbe90" />
+                                <attribute name="sym_previousSibling" value="0x7fca469db0b0" id="10654" addr="0x7fca469db0b0" />
+                                <attribute name="sym_name" value="ControlRadioButton" id="10655" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469dbe90" id="10656" addr="0x7fca469dbe90" />
+                                <attribute name="defaultargs" value="0x7fca469d45d0" id="10657" addr="0x7fca469d45d0" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char)." id="10658" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="10659" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469d45d0" id="10660" addr="0x7fca469d45d0" />
+                                <parmlist id="10661" addr="0x7fca469db150" >
                                     <parm id="10662">
-                                        <attributelist id="10663" addr="0x7f99f1e8d150" >
-                                            <attribute name="name" value="x" id="10664" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10665" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10663" addr="0x7fca469db150" >
+                                            <attribute name="name" value="x" id="10664" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10665" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10666">
-                                        <attributelist id="10667" addr="0x7f99f1e8d210" >
-                                            <attribute name="name" value="y" id="10668" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10669" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10667" addr="0x7fca469db210" >
+                                            <attribute name="name" value="y" id="10668" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10669" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10670">
-                                        <attributelist id="10671" addr="0x7f99f1e8d290" >
-                                            <attribute name="name" value="width" id="10672" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10673" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10671" addr="0x7fca469db290" >
+                                            <attribute name="name" value="width" id="10672" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10673" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10674">
-                                        <attributelist id="10675" addr="0x7f99f1e8d310" >
-                                            <attribute name="name" value="height" id="10676" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10677" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10675" addr="0x7fca469db310" >
+                                            <attribute name="name" value="height" id="10676" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10677" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10678">
-                                        <attributelist id="10679" addr="0x7f99f1e8d390" >
-                                            <attribute name="name" value="label" id="10680" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="10681" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10679" addr="0x7fca469db390" >
+                                            <attribute name="name" value="label" id="10680" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="10681" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10682">
-                                        <attributelist id="10683" addr="0x7f99f1e8d410" >
-                                            <attribute name="name" value="focusOnTexture" id="10684" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10685" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10686" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10683" addr="0x7fca469db410" >
+                                            <attribute name="name" value="focusOnTexture" id="10684" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10685" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10686" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10687">
-                                        <attributelist id="10688" addr="0x7f99f1e8d4b0" >
-                                            <attribute name="name" value="noFocusOnTexture" id="10689" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10690" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10691" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10688" addr="0x7fca469db4b0" >
+                                            <attribute name="name" value="noFocusOnTexture" id="10689" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10690" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10691" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10692">
-                                        <attributelist id="10693" addr="0x7f99f1e8d550" >
-                                            <attribute name="name" value="focusOffTexture" id="10694" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10695" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10696" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10693" addr="0x7fca469db550" >
+                                            <attribute name="name" value="focusOffTexture" id="10694" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10695" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10696" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10697">
-                                        <attributelist id="10698" addr="0x7f99f1e8d5f0" >
-                                            <attribute name="name" value="noFocusOffTexture" id="10699" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10700" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10701" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10698" addr="0x7fca469db5f0" >
+                                            <attribute name="name" value="noFocusOffTexture" id="10699" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10700" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10701" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10702">
-                                        <attributelist id="10703" addr="0x7f99f1e8d690" >
-                                            <attribute name="name" value="focusTexture" id="10704" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10705" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10706" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10703" addr="0x7fca469db690" >
+                                            <attribute name="name" value="focusTexture" id="10704" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10705" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10706" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10707">
-                                        <attributelist id="10708" addr="0x7f99f1e8d730" >
-                                            <attribute name="name" value="noFocusTexture" id="10709" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10710" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10711" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10708" addr="0x7fca469db730" >
+                                            <attribute name="name" value="noFocusTexture" id="10709" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10710" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10711" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_11" id="10712" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="10713" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_11" id="10712" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="10713" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="10714" addr="0x7f99f1e8de90" >
-                            <attributelist id="10715" addr="0x7f99f1e8de90" >
-                                <attribute name="name" value="ControlRadioButton" id="10716" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="10717" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e84350" id="10718" addr="0x7f99f1e84350" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e8e490" id="10719" addr="0x7f99f1e8e490" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e8d7f0" id="10720" addr="0x7f99f1e8d7f0" />
-                                <attribute name="sym_name" value="ControlRadioButton" id="10721" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e8e490" id="10722" addr="0x7f99f1e8e490" />
-                                <attribute name="defaultargs" value="0x7f99f1e865d0" id="10723" addr="0x7f99f1e865d0" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char)." id="10724" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="10725" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e865d0" id="10726" addr="0x7f99f1e865d0" />
-                                <parmlist id="10727" addr="0x7f99f1e8d890" >
+                        <constructor id="10714" addr="0x7fca469dbe90" >
+                            <attributelist id="10715" addr="0x7fca469dbe90" >
+                                <attribute name="name" value="ControlRadioButton" id="10716" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="10717" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469d2350" id="10718" addr="0x7fca469d2350" />
+                                <attribute name="csym_nextSibling" value="0x7fca469dc490" id="10719" addr="0x7fca469dc490" />
+                                <attribute name="sym_previousSibling" value="0x7fca469db7f0" id="10720" addr="0x7fca469db7f0" />
+                                <attribute name="sym_name" value="ControlRadioButton" id="10721" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469dc490" id="10722" addr="0x7fca469dc490" />
+                                <attribute name="defaultargs" value="0x7fca469d45d0" id="10723" addr="0x7fca469d45d0" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char)." id="10724" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="10725" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469d45d0" id="10726" addr="0x7fca469d45d0" />
+                                <parmlist id="10727" addr="0x7fca469db890" >
                                     <parm id="10728">
-                                        <attributelist id="10729" addr="0x7f99f1e8d890" >
-                                            <attribute name="name" value="x" id="10730" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10731" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10729" addr="0x7fca469db890" >
+                                            <attribute name="name" value="x" id="10730" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10731" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10732">
-                                        <attributelist id="10733" addr="0x7f99f1e8d950" >
-                                            <attribute name="name" value="y" id="10734" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10735" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10733" addr="0x7fca469db950" >
+                                            <attribute name="name" value="y" id="10734" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10735" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10736">
-                                        <attributelist id="10737" addr="0x7f99f1e8d9d0" >
-                                            <attribute name="name" value="width" id="10738" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10739" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10737" addr="0x7fca469db9d0" >
+                                            <attribute name="name" value="width" id="10738" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10739" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10740">
-                                        <attributelist id="10741" addr="0x7f99f1e8da50" >
-                                            <attribute name="name" value="height" id="10742" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10743" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10741" addr="0x7fca469dba50" >
+                                            <attribute name="name" value="height" id="10742" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10743" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10744">
-                                        <attributelist id="10745" addr="0x7f99f1e8dad0" >
-                                            <attribute name="name" value="label" id="10746" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="10747" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10745" addr="0x7fca469dbad0" >
+                                            <attribute name="name" value="label" id="10746" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="10747" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10748">
-                                        <attributelist id="10749" addr="0x7f99f1e8db50" >
-                                            <attribute name="name" value="focusOnTexture" id="10750" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10751" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10752" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10749" addr="0x7fca469dbb50" >
+                                            <attribute name="name" value="focusOnTexture" id="10750" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10751" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10752" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10753">
-                                        <attributelist id="10754" addr="0x7f99f1e8dbf0" >
-                                            <attribute name="name" value="noFocusOnTexture" id="10755" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10756" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10757" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10754" addr="0x7fca469dbbf0" >
+                                            <attribute name="name" value="noFocusOnTexture" id="10755" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10756" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10757" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10758">
-                                        <attributelist id="10759" addr="0x7f99f1e8dc90" >
-                                            <attribute name="name" value="focusOffTexture" id="10760" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10761" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10762" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10759" addr="0x7fca469dbc90" >
+                                            <attribute name="name" value="focusOffTexture" id="10760" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10761" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10762" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10763">
-                                        <attributelist id="10764" addr="0x7f99f1e8dd30" >
-                                            <attribute name="name" value="noFocusOffTexture" id="10765" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10766" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10767" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10764" addr="0x7fca469dbd30" >
+                                            <attribute name="name" value="noFocusOffTexture" id="10765" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10766" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10767" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10768">
-                                        <attributelist id="10769" addr="0x7f99f1e8ddd0" >
-                                            <attribute name="name" value="focusTexture" id="10770" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10771" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10772" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10769" addr="0x7fca469dbdd0" >
+                                            <attribute name="name" value="focusTexture" id="10770" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10771" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10772" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_12" id="10773" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="10774" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_12" id="10773" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="10774" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="10775" addr="0x7f99f1e8e490" >
-                            <attributelist id="10776" addr="0x7f99f1e8e490" >
-                                <attribute name="name" value="ControlRadioButton" id="10777" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="10778" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e84350" id="10779" addr="0x7f99f1e84350" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e8e9f0" id="10780" addr="0x7f99f1e8e9f0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e8de90" id="10781" addr="0x7f99f1e8de90" />
-                                <attribute name="sym_name" value="ControlRadioButton" id="10782" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e8e9f0" id="10783" addr="0x7f99f1e8e9f0" />
-                                <attribute name="defaultargs" value="0x7f99f1e865d0" id="10784" addr="0x7f99f1e865d0" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char)." id="10785" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="10786" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e865d0" id="10787" addr="0x7f99f1e865d0" />
-                                <parmlist id="10788" addr="0x7f99f1e8df30" >
+                        <constructor id="10775" addr="0x7fca469dc490" >
+                            <attributelist id="10776" addr="0x7fca469dc490" >
+                                <attribute name="name" value="ControlRadioButton" id="10777" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="10778" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469d2350" id="10779" addr="0x7fca469d2350" />
+                                <attribute name="csym_nextSibling" value="0x7fca469dc9f0" id="10780" addr="0x7fca469dc9f0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469dbe90" id="10781" addr="0x7fca469dbe90" />
+                                <attribute name="sym_name" value="ControlRadioButton" id="10782" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469dc9f0" id="10783" addr="0x7fca469dc9f0" />
+                                <attribute name="defaultargs" value="0x7fca469d45d0" id="10784" addr="0x7fca469d45d0" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char)." id="10785" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="10786" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469d45d0" id="10787" addr="0x7fca469d45d0" />
+                                <parmlist id="10788" addr="0x7fca469dbf30" >
                                     <parm id="10789">
-                                        <attributelist id="10790" addr="0x7f99f1e8df30" >
-                                            <attribute name="name" value="x" id="10791" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10792" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10790" addr="0x7fca469dbf30" >
+                                            <attribute name="name" value="x" id="10791" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10792" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10793">
-                                        <attributelist id="10794" addr="0x7f99f1e8dff0" >
-                                            <attribute name="name" value="y" id="10795" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10796" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10794" addr="0x7fca469dbff0" >
+                                            <attribute name="name" value="y" id="10795" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10796" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10797">
-                                        <attributelist id="10798" addr="0x7f99f1e8e070" >
-                                            <attribute name="name" value="width" id="10799" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10800" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10798" addr="0x7fca469dc070" >
+                                            <attribute name="name" value="width" id="10799" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10800" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10801">
-                                        <attributelist id="10802" addr="0x7f99f1e8e0f0" >
-                                            <attribute name="name" value="height" id="10803" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10804" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10802" addr="0x7fca469dc0f0" >
+                                            <attribute name="name" value="height" id="10803" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10804" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10805">
-                                        <attributelist id="10806" addr="0x7f99f1e8e170" >
-                                            <attribute name="name" value="label" id="10807" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="10808" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10806" addr="0x7fca469dc170" >
+                                            <attribute name="name" value="label" id="10807" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="10808" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10809">
-                                        <attributelist id="10810" addr="0x7f99f1e8e1f0" >
-                                            <attribute name="name" value="focusOnTexture" id="10811" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10812" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10813" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10810" addr="0x7fca469dc1f0" >
+                                            <attribute name="name" value="focusOnTexture" id="10811" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10812" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10813" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10814">
-                                        <attributelist id="10815" addr="0x7f99f1e8e290" >
-                                            <attribute name="name" value="noFocusOnTexture" id="10816" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10817" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10818" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10815" addr="0x7fca469dc290" >
+                                            <attribute name="name" value="noFocusOnTexture" id="10816" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10817" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10818" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10819">
-                                        <attributelist id="10820" addr="0x7f99f1e8e330" >
-                                            <attribute name="name" value="focusOffTexture" id="10821" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10822" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10823" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10820" addr="0x7fca469dc330" >
+                                            <attribute name="name" value="focusOffTexture" id="10821" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10822" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10823" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10824">
-                                        <attributelist id="10825" addr="0x7f99f1e8e3d0" >
-                                            <attribute name="name" value="noFocusOffTexture" id="10826" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10827" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10828" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10825" addr="0x7fca469dc3d0" >
+                                            <attribute name="name" value="noFocusOffTexture" id="10826" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10827" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10828" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_13" id="10829" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="10830" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_13" id="10829" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="10830" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="10831" addr="0x7f99f1e8e9f0" >
-                            <attributelist id="10832" addr="0x7f99f1e8e9f0" >
-                                <attribute name="name" value="ControlRadioButton" id="10833" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="10834" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e84350" id="10835" addr="0x7f99f1e84350" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e8eeb0" id="10836" addr="0x7f99f1e8eeb0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e8e490" id="10837" addr="0x7f99f1e8e490" />
-                                <attribute name="sym_name" value="ControlRadioButton" id="10838" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e8eeb0" id="10839" addr="0x7f99f1e8eeb0" />
-                                <attribute name="defaultargs" value="0x7f99f1e865d0" id="10840" addr="0x7f99f1e865d0" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char)." id="10841" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="10842" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e865d0" id="10843" addr="0x7f99f1e865d0" />
-                                <parmlist id="10844" addr="0x7f99f1e8e530" >
+                        <constructor id="10831" addr="0x7fca469dc9f0" >
+                            <attributelist id="10832" addr="0x7fca469dc9f0" >
+                                <attribute name="name" value="ControlRadioButton" id="10833" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="10834" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469d2350" id="10835" addr="0x7fca469d2350" />
+                                <attribute name="csym_nextSibling" value="0x7fca469dceb0" id="10836" addr="0x7fca469dceb0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469dc490" id="10837" addr="0x7fca469dc490" />
+                                <attribute name="sym_name" value="ControlRadioButton" id="10838" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469dceb0" id="10839" addr="0x7fca469dceb0" />
+                                <attribute name="defaultargs" value="0x7fca469d45d0" id="10840" addr="0x7fca469d45d0" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char)." id="10841" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="10842" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469d45d0" id="10843" addr="0x7fca469d45d0" />
+                                <parmlist id="10844" addr="0x7fca469dc530" >
                                     <parm id="10845">
-                                        <attributelist id="10846" addr="0x7f99f1e8e530" >
-                                            <attribute name="name" value="x" id="10847" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10848" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10846" addr="0x7fca469dc530" >
+                                            <attribute name="name" value="x" id="10847" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10848" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10849">
-                                        <attributelist id="10850" addr="0x7f99f1e8e5f0" >
-                                            <attribute name="name" value="y" id="10851" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10852" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10850" addr="0x7fca469dc5f0" >
+                                            <attribute name="name" value="y" id="10851" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10852" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10853">
-                                        <attributelist id="10854" addr="0x7f99f1e8e670" >
-                                            <attribute name="name" value="width" id="10855" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10856" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10854" addr="0x7fca469dc670" >
+                                            <attribute name="name" value="width" id="10855" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10856" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10857">
-                                        <attributelist id="10858" addr="0x7f99f1e8e6f0" >
-                                            <attribute name="name" value="height" id="10859" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10860" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10858" addr="0x7fca469dc6f0" >
+                                            <attribute name="name" value="height" id="10859" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10860" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10861">
-                                        <attributelist id="10862" addr="0x7f99f1e8e770" >
-                                            <attribute name="name" value="label" id="10863" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="10864" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10862" addr="0x7fca469dc770" >
+                                            <attribute name="name" value="label" id="10863" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="10864" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10865">
-                                        <attributelist id="10866" addr="0x7f99f1e8e7f0" >
-                                            <attribute name="name" value="focusOnTexture" id="10867" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10868" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10869" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10866" addr="0x7fca469dc7f0" >
+                                            <attribute name="name" value="focusOnTexture" id="10867" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10868" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10869" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10870">
-                                        <attributelist id="10871" addr="0x7f99f1e8e890" >
-                                            <attribute name="name" value="noFocusOnTexture" id="10872" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10873" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10874" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10871" addr="0x7fca469dc890" >
+                                            <attribute name="name" value="noFocusOnTexture" id="10872" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10873" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10874" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10875">
-                                        <attributelist id="10876" addr="0x7f99f1e8e930" >
-                                            <attribute name="name" value="focusOffTexture" id="10877" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10878" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10879" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10876" addr="0x7fca469dc930" >
+                                            <attribute name="name" value="focusOffTexture" id="10877" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10878" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10879" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_14" id="10880" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="10881" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_14" id="10880" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="10881" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="10882" addr="0x7f99f1e8eeb0" >
-                            <attributelist id="10883" addr="0x7f99f1e8eeb0" >
-                                <attribute name="name" value="ControlRadioButton" id="10884" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="10885" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e84350" id="10886" addr="0x7f99f1e84350" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e8f2d0" id="10887" addr="0x7f99f1e8f2d0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e8e9f0" id="10888" addr="0x7f99f1e8e9f0" />
-                                <attribute name="sym_name" value="ControlRadioButton" id="10889" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e8f2d0" id="10890" addr="0x7f99f1e8f2d0" />
-                                <attribute name="defaultargs" value="0x7f99f1e865d0" id="10891" addr="0x7f99f1e865d0" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char)." id="10892" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="10893" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e865d0" id="10894" addr="0x7f99f1e865d0" />
-                                <parmlist id="10895" addr="0x7f99f1e8ea90" >
+                        <constructor id="10882" addr="0x7fca469dceb0" >
+                            <attributelist id="10883" addr="0x7fca469dceb0" >
+                                <attribute name="name" value="ControlRadioButton" id="10884" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="10885" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469d2350" id="10886" addr="0x7fca469d2350" />
+                                <attribute name="csym_nextSibling" value="0x7fca469dd2d0" id="10887" addr="0x7fca469dd2d0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469dc9f0" id="10888" addr="0x7fca469dc9f0" />
+                                <attribute name="sym_name" value="ControlRadioButton" id="10889" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469dd2d0" id="10890" addr="0x7fca469dd2d0" />
+                                <attribute name="defaultargs" value="0x7fca469d45d0" id="10891" addr="0x7fca469d45d0" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char)." id="10892" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="10893" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469d45d0" id="10894" addr="0x7fca469d45d0" />
+                                <parmlist id="10895" addr="0x7fca469dca90" >
                                     <parm id="10896">
-                                        <attributelist id="10897" addr="0x7f99f1e8ea90" >
-                                            <attribute name="name" value="x" id="10898" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10899" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10897" addr="0x7fca469dca90" >
+                                            <attribute name="name" value="x" id="10898" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10899" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10900">
-                                        <attributelist id="10901" addr="0x7f99f1e8eb50" >
-                                            <attribute name="name" value="y" id="10902" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10903" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10901" addr="0x7fca469dcb50" >
+                                            <attribute name="name" value="y" id="10902" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10903" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10904">
-                                        <attributelist id="10905" addr="0x7f99f1e8ebd0" >
-                                            <attribute name="name" value="width" id="10906" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10907" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10905" addr="0x7fca469dcbd0" >
+                                            <attribute name="name" value="width" id="10906" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10907" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10908">
-                                        <attributelist id="10909" addr="0x7f99f1e8ec50" >
-                                            <attribute name="name" value="height" id="10910" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10911" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10909" addr="0x7fca469dcc50" >
+                                            <attribute name="name" value="height" id="10910" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10911" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10912">
-                                        <attributelist id="10913" addr="0x7f99f1e8ecd0" >
-                                            <attribute name="name" value="label" id="10914" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="10915" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10913" addr="0x7fca469dccd0" >
+                                            <attribute name="name" value="label" id="10914" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="10915" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10916">
-                                        <attributelist id="10917" addr="0x7f99f1e8ed50" >
-                                            <attribute name="name" value="focusOnTexture" id="10918" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10919" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10920" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10917" addr="0x7fca469dcd50" >
+                                            <attribute name="name" value="focusOnTexture" id="10918" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10919" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10920" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10921">
-                                        <attributelist id="10922" addr="0x7f99f1e8edf0" >
-                                            <attribute name="name" value="noFocusOnTexture" id="10923" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10924" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10925" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10922" addr="0x7fca469dcdf0" >
+                                            <attribute name="name" value="noFocusOnTexture" id="10923" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10924" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10925" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_15" id="10926" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="10927" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_15" id="10926" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="10927" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="10928" addr="0x7f99f1e8f2d0" >
-                            <attributelist id="10929" addr="0x7f99f1e8f2d0" >
-                                <attribute name="name" value="ControlRadioButton" id="10930" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="10931" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e84350" id="10932" addr="0x7f99f1e84350" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e8f650" id="10933" addr="0x7f99f1e8f650" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e8eeb0" id="10934" addr="0x7f99f1e8eeb0" />
-                                <attribute name="sym_name" value="ControlRadioButton" id="10935" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e8f650" id="10936" addr="0x7f99f1e8f650" />
-                                <attribute name="defaultargs" value="0x7f99f1e865d0" id="10937" addr="0x7f99f1e865d0" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char)." id="10938" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="10939" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e865d0" id="10940" addr="0x7f99f1e865d0" />
-                                <parmlist id="10941" addr="0x7f99f1e8ef50" >
+                        <constructor id="10928" addr="0x7fca469dd2d0" >
+                            <attributelist id="10929" addr="0x7fca469dd2d0" >
+                                <attribute name="name" value="ControlRadioButton" id="10930" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="10931" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469d2350" id="10932" addr="0x7fca469d2350" />
+                                <attribute name="csym_nextSibling" value="0x7fca469dd650" id="10933" addr="0x7fca469dd650" />
+                                <attribute name="sym_previousSibling" value="0x7fca469dceb0" id="10934" addr="0x7fca469dceb0" />
+                                <attribute name="sym_name" value="ControlRadioButton" id="10935" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469dd650" id="10936" addr="0x7fca469dd650" />
+                                <attribute name="defaultargs" value="0x7fca469d45d0" id="10937" addr="0x7fca469d45d0" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char)." id="10938" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="10939" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469d45d0" id="10940" addr="0x7fca469d45d0" />
+                                <parmlist id="10941" addr="0x7fca469dcf50" >
                                     <parm id="10942">
-                                        <attributelist id="10943" addr="0x7f99f1e8ef50" >
-                                            <attribute name="name" value="x" id="10944" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10945" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10943" addr="0x7fca469dcf50" >
+                                            <attribute name="name" value="x" id="10944" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10945" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10946">
-                                        <attributelist id="10947" addr="0x7f99f1e8f010" >
-                                            <attribute name="name" value="y" id="10948" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10949" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10947" addr="0x7fca469dd010" >
+                                            <attribute name="name" value="y" id="10948" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10949" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10950">
-                                        <attributelist id="10951" addr="0x7f99f1e8f090" >
-                                            <attribute name="name" value="width" id="10952" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10953" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10951" addr="0x7fca469dd090" >
+                                            <attribute name="name" value="width" id="10952" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10953" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10954">
-                                        <attributelist id="10955" addr="0x7f99f1e8f110" >
-                                            <attribute name="name" value="height" id="10956" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10957" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10955" addr="0x7fca469dd110" >
+                                            <attribute name="name" value="height" id="10956" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10957" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10958">
-                                        <attributelist id="10959" addr="0x7f99f1e8f190" >
-                                            <attribute name="name" value="label" id="10960" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="10961" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10959" addr="0x7fca469dd190" >
+                                            <attribute name="name" value="label" id="10960" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="10961" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10962">
-                                        <attributelist id="10963" addr="0x7f99f1e8f210" >
-                                            <attribute name="name" value="focusOnTexture" id="10964" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10965" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10966" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10963" addr="0x7fca469dd210" >
+                                            <attribute name="name" value="focusOnTexture" id="10964" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10965" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10966" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_16" id="10967" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="10968" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_16" id="10967" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="10968" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="10969" addr="0x7f99f1e8f650" >
-                            <attributelist id="10970" addr="0x7f99f1e8f650" >
-                                <attribute name="name" value="ControlRadioButton" id="10971" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="10972" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e84350" id="10973" addr="0x7f99f1e84350" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e8f2d0" id="10974" addr="0x7f99f1e8f2d0" />
-                                <attribute name="sym_name" value="ControlRadioButton" id="10975" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e865d0" id="10976" addr="0x7f99f1e865d0" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String)." id="10977" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="10978" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e865d0" id="10979" addr="0x7f99f1e865d0" />
-                                <parmlist id="10980" addr="0x7f99f1e8f370" >
+                        <constructor id="10969" addr="0x7fca469dd650" >
+                            <attributelist id="10970" addr="0x7fca469dd650" >
+                                <attribute name="name" value="ControlRadioButton" id="10971" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="10972" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469d2350" id="10973" addr="0x7fca469d2350" />
+                                <attribute name="sym_previousSibling" value="0x7fca469dd2d0" id="10974" addr="0x7fca469dd2d0" />
+                                <attribute name="sym_name" value="ControlRadioButton" id="10975" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469d45d0" id="10976" addr="0x7fca469d45d0" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String)." id="10977" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="10978" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469d45d0" id="10979" addr="0x7fca469d45d0" />
+                                <parmlist id="10980" addr="0x7fca469dd370" >
                                     <parm id="10981">
-                                        <attributelist id="10982" addr="0x7f99f1e8f370" >
-                                            <attribute name="name" value="x" id="10983" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10984" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10982" addr="0x7fca469dd370" >
+                                            <attribute name="name" value="x" id="10983" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10984" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10985">
-                                        <attributelist id="10986" addr="0x7f99f1e8f430" >
-                                            <attribute name="name" value="y" id="10987" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10988" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10986" addr="0x7fca469dd430" >
+                                            <attribute name="name" value="y" id="10987" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10988" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10989">
-                                        <attributelist id="10990" addr="0x7f99f1e8f4b0" >
-                                            <attribute name="name" value="width" id="10991" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10992" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10990" addr="0x7fca469dd4b0" >
+                                            <attribute name="name" value="width" id="10991" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10992" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10993">
-                                        <attributelist id="10994" addr="0x7f99f1e8f530" >
-                                            <attribute name="name" value="height" id="10995" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10996" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10994" addr="0x7fca469dd530" >
+                                            <attribute name="name" value="height" id="10995" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10996" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10997">
-                                        <attributelist id="10998" addr="0x7f99f1e8f5b0" >
-                                            <attribute name="name" value="label" id="10999" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="11000" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10998" addr="0x7fca469dd5b0" >
+                                            <attribute name="name" value="label" id="10999" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="11000" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_17" id="11001" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="11002" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_17" id="11001" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="11002" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <cdecl id="11003" addr="0x7f99f1e8f8f0" >
-                            <attributelist id="11004" addr="0x7f99f1e8f8f0" >
-                                <attribute name="name" value="setSelected" id="11005" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="11006" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e84350" id="11007" addr="0x7f99f1e84350" />
-                                <attribute name="kind" value="function" id="11008" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setSelected" id="11009" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(bool)." id="11010" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="11011" addr="0x7f99f1de6c90" />
-                                <parmlist id="11012" addr="0x7f99f1e8f830" >
+                        <cdecl id="11003" addr="0x7fca469dd8f0" >
+                            <attributelist id="11004" addr="0x7fca469dd8f0" >
+                                <attribute name="name" value="setSelected" id="11005" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="11006" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469d2350" id="11007" addr="0x7fca469d2350" />
+                                <attribute name="kind" value="function" id="11008" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setSelected" id="11009" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(bool)." id="11010" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="11011" addr="0x7fca46934c90" />
+                                <parmlist id="11012" addr="0x7fca469dd830" >
                                     <parm id="11013">
-                                        <attributelist id="11014" addr="0x7f99f1e8f830" >
-                                            <attribute name="name" value="selected" id="11015" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="11016" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11014" addr="0x7fca469dd830" >
+                                            <attribute name="name" value="selected" id="11015" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="11016" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="11017" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="11018" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="11019" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="11017" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="11018" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="11019" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="11020" addr="0x7f99f1e8fad0" >
-                            <attributelist id="11021" addr="0x7f99f1e8fad0" >
-                                <attribute name="name" value="isSelected" id="11022" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="11023" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e84350" id="11024" addr="0x7f99f1e84350" />
-                                <attribute name="kind" value="function" id="11025" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="isSelected" id="11026" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="11027" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="11028" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="bool" id="11029" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="11030" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="11031" addr="0x7f99f1de6c90" />
+                        <cdecl id="11020" addr="0x7fca469ddad0" >
+                            <attributelist id="11021" addr="0x7fca469ddad0" >
+                                <attribute name="name" value="isSelected" id="11022" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="11023" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469d2350" id="11024" addr="0x7fca469d2350" />
+                                <attribute name="kind" value="function" id="11025" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="isSelected" id="11026" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="11027" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="11028" addr="0x7fca46934c90" />
+                                <attribute name="type" value="bool" id="11029" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="11030" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="11031" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="11032" addr="0x7f99f1e90810" >
-                            <attributelist id="11033" addr="0x7f99f1e90810" >
-                                <attribute name="name" value="setLabel" id="11034" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="11035" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e84350" id="11036" addr="0x7f99f1e84350" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e90d10" id="11037" addr="0x7f99f1e90d10" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e90d10" id="11038" addr="0x7f99f1e90d10" />
-                                <attribute name="kind" value="function" id="11039" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setLabel" id="11040" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,r.q(const).XBMCAddon::String)." id="11041" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="11042" addr="0x7f99f1de6c90" />
-                                <parmlist id="11043" addr="0x7f99f1e8fd90" >
+                        <cdecl id="11032" addr="0x7fca469de810" >
+                            <attributelist id="11033" addr="0x7fca469de810" >
+                                <attribute name="name" value="setLabel" id="11034" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="11035" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469d2350" id="11036" addr="0x7fca469d2350" />
+                                <attribute name="sym_nextSibling" value="0x7fca469ded10" id="11037" addr="0x7fca469ded10" />
+                                <attribute name="csym_nextSibling" value="0x7fca469ded10" id="11038" addr="0x7fca469ded10" />
+                                <attribute name="kind" value="function" id="11039" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setLabel" id="11040" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,r.q(const).XBMCAddon::String)." id="11041" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="11042" addr="0x7fca46934c90" />
+                                <parmlist id="11043" addr="0x7fca469ddd90" >
                                     <parm id="11044">
-                                        <attributelist id="11045" addr="0x7f99f1e8fd90" >
-                                            <attribute name="name" value="label" id="11046" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="11047" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="11048" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11045" addr="0x7fca469ddd90" >
+                                            <attribute name="name" value="label" id="11046" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="11047" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="11048" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11049">
-                                        <attributelist id="11050" addr="0x7f99f1e8ff30" >
-                                            <attribute name="name" value="font" id="11051" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="11052" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="11053" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11050" addr="0x7fca469ddf30" >
+                                            <attribute name="name" value="font" id="11051" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="11052" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="11053" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11054">
-                                        <attributelist id="11055" addr="0x7f99f1e900d0" >
-                                            <attribute name="name" value="textColor" id="11056" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="11057" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="11058" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11055" addr="0x7fca469de0d0" >
+                                            <attribute name="name" value="textColor" id="11056" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="11057" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="11058" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11059">
-                                        <attributelist id="11060" addr="0x7f99f1e90270" >
-                                            <attribute name="name" value="disabledColor" id="11061" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="11062" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="11063" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11060" addr="0x7fca469de270" >
+                                            <attribute name="name" value="disabledColor" id="11061" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="11062" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="11063" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11064">
-                                        <attributelist id="11065" addr="0x7f99f1e90410" >
-                                            <attribute name="name" value="shadowColor" id="11066" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="11067" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="11068" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11065" addr="0x7fca469de410" >
+                                            <attribute name="name" value="shadowColor" id="11066" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="11067" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="11068" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11069">
-                                        <attributelist id="11070" addr="0x7f99f1e905b0" >
-                                            <attribute name="name" value="focusedColor" id="11071" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="11072" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="11073" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11070" addr="0x7fca469de5b0" >
+                                            <attribute name="name" value="focusedColor" id="11071" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="11072" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="11073" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11074">
-                                        <attributelist id="11075" addr="0x7f99f1e90750" >
-                                            <attribute name="name" value="label2" id="11076" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="11077" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="11078" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                    </parm >
-                                </parmlist >
-                                <attribute name="sym_overloaded" value="0x7f99f1e90810" id="11079" addr="0x7f99f1e90810" />
-                                <attribute name="type" value="void" id="11080" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="11081" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="11082" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="11083" addr="0x7f99f1e90d10" >
-                            <attributelist id="11084" addr="0x7f99f1e90d10" >
-                                <attribute name="name" value="setLabel" id="11085" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="11086" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e84350" id="11087" addr="0x7f99f1e84350" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e90810" id="11088" addr="0x7f99f1e90810" />
-                                <attribute name="kind" value="function" id="11089" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setLabel" id="11090" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e91170" id="11091" addr="0x7f99f1e91170" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e91170" id="11092" addr="0x7f99f1e91170" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char)." id="11093" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e90810" id="11094" addr="0x7f99f1e90810" />
-                                <attribute name="access" value="public" id="11095" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e90810" id="11096" addr="0x7f99f1e90810" />
-                                <parmlist id="11097" addr="0x7f99f1e908d0" >
+                                        <attributelist id="11075" addr="0x7fca469de750" >
+                                            <attribute name="name" value="label2" id="11076" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="11077" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="11078" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                    </parm >
+                                </parmlist >
+                                <attribute name="sym_overloaded" value="0x7fca469de810" id="11079" addr="0x7fca469de810" />
+                                <attribute name="type" value="void" id="11080" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="11081" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="11082" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="11083" addr="0x7fca469ded10" >
+                            <attributelist id="11084" addr="0x7fca469ded10" >
+                                <attribute name="name" value="setLabel" id="11085" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="11086" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469d2350" id="11087" addr="0x7fca469d2350" />
+                                <attribute name="sym_previousSibling" value="0x7fca469de810" id="11088" addr="0x7fca469de810" />
+                                <attribute name="kind" value="function" id="11089" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setLabel" id="11090" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469df170" id="11091" addr="0x7fca469df170" />
+                                <attribute name="sym_nextSibling" value="0x7fca469df170" id="11092" addr="0x7fca469df170" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char)." id="11093" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469de810" id="11094" addr="0x7fca469de810" />
+                                <attribute name="access" value="public" id="11095" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469de810" id="11096" addr="0x7fca469de810" />
+                                <parmlist id="11097" addr="0x7fca469de8d0" >
                                     <parm id="11098">
-                                        <attributelist id="11099" addr="0x7f99f1e908d0" >
-                                            <attribute name="name" value="label" id="11100" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="11101" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="11102" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11099" addr="0x7fca469de8d0" >
+                                            <attribute name="name" value="label" id="11100" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="11101" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="11102" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11103">
-                                        <attributelist id="11104" addr="0x7f99f1e909d0" >
-                                            <attribute name="name" value="font" id="11105" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="11106" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="11107" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11104" addr="0x7fca469de9d0" >
+                                            <attribute name="name" value="font" id="11105" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="11106" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="11107" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11108">
-                                        <attributelist id="11109" addr="0x7f99f1e90a70" >
-                                            <attribute name="name" value="textColor" id="11110" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="11111" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="11112" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11109" addr="0x7fca469dea70" >
+                                            <attribute name="name" value="textColor" id="11110" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="11111" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="11112" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11113">
-                                        <attributelist id="11114" addr="0x7f99f1e90b10" >
-                                            <attribute name="name" value="disabledColor" id="11115" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="11116" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="11117" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11114" addr="0x7fca469deb10" >
+                                            <attribute name="name" value="disabledColor" id="11115" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="11116" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="11117" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11118">
-                                        <attributelist id="11119" addr="0x7f99f1e90bb0" >
-                                            <attribute name="name" value="shadowColor" id="11120" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="11121" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="11122" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11119" addr="0x7fca469debb0" >
+                                            <attribute name="name" value="shadowColor" id="11120" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="11121" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="11122" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11123">
-                                        <attributelist id="11124" addr="0x7f99f1e90c50" >
-                                            <attribute name="name" value="focusedColor" id="11125" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="11126" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="11127" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                    </parm >
-                                </parmlist >
-                                <attribute name="type" value="void" id="11128" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="11129" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="11130" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="11131" addr="0x7f99f1e91170" >
-                            <attributelist id="11132" addr="0x7f99f1e91170" >
-                                <attribute name="name" value="setLabel" id="11133" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="11134" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e84350" id="11135" addr="0x7f99f1e84350" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e90d10" id="11136" addr="0x7f99f1e90d10" />
-                                <attribute name="kind" value="function" id="11137" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setLabel" id="11138" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e91530" id="11139" addr="0x7f99f1e91530" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e91530" id="11140" addr="0x7f99f1e91530" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char)." id="11141" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e90810" id="11142" addr="0x7f99f1e90810" />
-                                <attribute name="access" value="public" id="11143" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e90810" id="11144" addr="0x7f99f1e90810" />
-                                <parmlist id="11145" addr="0x7f99f1e90dd0" >
+                                        <attributelist id="11124" addr="0x7fca469dec50" >
+                                            <attribute name="name" value="focusedColor" id="11125" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="11126" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="11127" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                    </parm >
+                                </parmlist >
+                                <attribute name="type" value="void" id="11128" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="11129" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="11130" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="11131" addr="0x7fca469df170" >
+                            <attributelist id="11132" addr="0x7fca469df170" >
+                                <attribute name="name" value="setLabel" id="11133" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="11134" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469d2350" id="11135" addr="0x7fca469d2350" />
+                                <attribute name="sym_previousSibling" value="0x7fca469ded10" id="11136" addr="0x7fca469ded10" />
+                                <attribute name="kind" value="function" id="11137" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setLabel" id="11138" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469df530" id="11139" addr="0x7fca469df530" />
+                                <attribute name="sym_nextSibling" value="0x7fca469df530" id="11140" addr="0x7fca469df530" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char)." id="11141" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469de810" id="11142" addr="0x7fca469de810" />
+                                <attribute name="access" value="public" id="11143" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469de810" id="11144" addr="0x7fca469de810" />
+                                <parmlist id="11145" addr="0x7fca469dedd0" >
                                     <parm id="11146">
-                                        <attributelist id="11147" addr="0x7f99f1e90dd0" >
-                                            <attribute name="name" value="label" id="11148" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="11149" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="11150" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11147" addr="0x7fca469dedd0" >
+                                            <attribute name="name" value="label" id="11148" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="11149" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="11150" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11151">
-                                        <attributelist id="11152" addr="0x7f99f1e90ed0" >
-                                            <attribute name="name" value="font" id="11153" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="11154" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="11155" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11152" addr="0x7fca469deed0" >
+                                            <attribute name="name" value="font" id="11153" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="11154" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="11155" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11156">
-                                        <attributelist id="11157" addr="0x7f99f1e90f70" >
-                                            <attribute name="name" value="textColor" id="11158" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="11159" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="11160" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11157" addr="0x7fca469def70" >
+                                            <attribute name="name" value="textColor" id="11158" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="11159" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="11160" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11161">
-                                        <attributelist id="11162" addr="0x7f99f1e91010" >
-                                            <attribute name="name" value="disabledColor" id="11163" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="11164" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="11165" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11162" addr="0x7fca469df010" >
+                                            <attribute name="name" value="disabledColor" id="11163" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="11164" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="11165" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11166">
-                                        <attributelist id="11167" addr="0x7f99f1e910b0" >
-                                            <attribute name="name" value="shadowColor" id="11168" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="11169" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="11170" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                    </parm >
-                                </parmlist >
-                                <attribute name="type" value="void" id="11171" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_2" id="11172" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="11173" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="11174" addr="0x7f99f1e91530" >
-                            <attributelist id="11175" addr="0x7f99f1e91530" >
-                                <attribute name="name" value="setLabel" id="11176" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="11177" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e84350" id="11178" addr="0x7f99f1e84350" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e91170" id="11179" addr="0x7f99f1e91170" />
-                                <attribute name="kind" value="function" id="11180" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setLabel" id="11181" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e91850" id="11182" addr="0x7f99f1e91850" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e91850" id="11183" addr="0x7f99f1e91850" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char,p.q(const).char)." id="11184" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e90810" id="11185" addr="0x7f99f1e90810" />
-                                <attribute name="access" value="public" id="11186" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e90810" id="11187" addr="0x7f99f1e90810" />
-                                <parmlist id="11188" addr="0x7f99f1e91230" >
+                                        <attributelist id="11167" addr="0x7fca469df0b0" >
+                                            <attribute name="name" value="shadowColor" id="11168" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="11169" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="11170" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                    </parm >
+                                </parmlist >
+                                <attribute name="type" value="void" id="11171" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_2" id="11172" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="11173" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="11174" addr="0x7fca469df530" >
+                            <attributelist id="11175" addr="0x7fca469df530" >
+                                <attribute name="name" value="setLabel" id="11176" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="11177" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469d2350" id="11178" addr="0x7fca469d2350" />
+                                <attribute name="sym_previousSibling" value="0x7fca469df170" id="11179" addr="0x7fca469df170" />
+                                <attribute name="kind" value="function" id="11180" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setLabel" id="11181" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469df850" id="11182" addr="0x7fca469df850" />
+                                <attribute name="sym_nextSibling" value="0x7fca469df850" id="11183" addr="0x7fca469df850" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char,p.q(const).char)." id="11184" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469de810" id="11185" addr="0x7fca469de810" />
+                                <attribute name="access" value="public" id="11186" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469de810" id="11187" addr="0x7fca469de810" />
+                                <parmlist id="11188" addr="0x7fca469df230" >
                                     <parm id="11189">
-                                        <attributelist id="11190" addr="0x7f99f1e91230" >
-                                            <attribute name="name" value="label" id="11191" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="11192" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="11193" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11190" addr="0x7fca469df230" >
+                                            <attribute name="name" value="label" id="11191" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="11192" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="11193" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11194">
-                                        <attributelist id="11195" addr="0x7f99f1e91330" >
-                                            <attribute name="name" value="font" id="11196" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="11197" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="11198" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11195" addr="0x7fca469df330" >
+                                            <attribute name="name" value="font" id="11196" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="11197" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="11198" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11199">
-                                        <attributelist id="11200" addr="0x7f99f1e913d0" >
-                                            <attribute name="name" value="textColor" id="11201" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="11202" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="11203" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11200" addr="0x7fca469df3d0" >
+                                            <attribute name="name" value="textColor" id="11201" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="11202" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="11203" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11204">
-                                        <attributelist id="11205" addr="0x7f99f1e91470" >
-                                            <attribute name="name" value="disabledColor" id="11206" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="11207" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="11208" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                    </parm >
-                                </parmlist >
-                                <attribute name="type" value="void" id="11209" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_3" id="11210" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="11211" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="11212" addr="0x7f99f1e91850" >
-                            <attributelist id="11213" addr="0x7f99f1e91850" >
-                                <attribute name="name" value="setLabel" id="11214" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="11215" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e84350" id="11216" addr="0x7f99f1e84350" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e91530" id="11217" addr="0x7f99f1e91530" />
-                                <attribute name="kind" value="function" id="11218" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setLabel" id="11219" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e91ad0" id="11220" addr="0x7f99f1e91ad0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e91ad0" id="11221" addr="0x7f99f1e91ad0" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char)." id="11222" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e90810" id="11223" addr="0x7f99f1e90810" />
-                                <attribute name="access" value="public" id="11224" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e90810" id="11225" addr="0x7f99f1e90810" />
-                                <parmlist id="11226" addr="0x7f99f1e915f0" >
+                                        <attributelist id="11205" addr="0x7fca469df470" >
+                                            <attribute name="name" value="disabledColor" id="11206" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="11207" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="11208" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                    </parm >
+                                </parmlist >
+                                <attribute name="type" value="void" id="11209" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_3" id="11210" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="11211" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="11212" addr="0x7fca469df850" >
+                            <attributelist id="11213" addr="0x7fca469df850" >
+                                <attribute name="name" value="setLabel" id="11214" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="11215" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469d2350" id="11216" addr="0x7fca469d2350" />
+                                <attribute name="sym_previousSibling" value="0x7fca469df530" id="11217" addr="0x7fca469df530" />
+                                <attribute name="kind" value="function" id="11218" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setLabel" id="11219" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469dfad0" id="11220" addr="0x7fca469dfad0" />
+                                <attribute name="sym_nextSibling" value="0x7fca469dfad0" id="11221" addr="0x7fca469dfad0" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char)." id="11222" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469de810" id="11223" addr="0x7fca469de810" />
+                                <attribute name="access" value="public" id="11224" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469de810" id="11225" addr="0x7fca469de810" />
+                                <parmlist id="11226" addr="0x7fca469df5f0" >
                                     <parm id="11227">
-                                        <attributelist id="11228" addr="0x7f99f1e915f0" >
-                                            <attribute name="name" value="label" id="11229" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="11230" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="11231" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11228" addr="0x7fca469df5f0" >
+                                            <attribute name="name" value="label" id="11229" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="11230" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="11231" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11232">
-                                        <attributelist id="11233" addr="0x7f99f1e916f0" >
-                                            <attribute name="name" value="font" id="11234" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="11235" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="11236" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11233" addr="0x7fca469df6f0" >
+                                            <attribute name="name" value="font" id="11234" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="11235" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="11236" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11237">
-                                        <attributelist id="11238" addr="0x7f99f1e91790" >
-                                            <attribute name="name" value="textColor" id="11239" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="11240" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="11241" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                    </parm >
-                                </parmlist >
-                                <attribute name="type" value="void" id="11242" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_4" id="11243" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="11244" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="11245" addr="0x7f99f1e91ad0" >
-                            <attributelist id="11246" addr="0x7f99f1e91ad0" >
-                                <attribute name="name" value="setLabel" id="11247" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="11248" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e84350" id="11249" addr="0x7f99f1e84350" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e91850" id="11250" addr="0x7f99f1e91850" />
-                                <attribute name="kind" value="function" id="11251" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setLabel" id="11252" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e91cb0" id="11253" addr="0x7f99f1e91cb0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e91cb0" id="11254" addr="0x7f99f1e91cb0" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char)." id="11255" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e90810" id="11256" addr="0x7f99f1e90810" />
-                                <attribute name="access" value="public" id="11257" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e90810" id="11258" addr="0x7f99f1e90810" />
-                                <parmlist id="11259" addr="0x7f99f1e91910" >
+                                        <attributelist id="11238" addr="0x7fca469df790" >
+                                            <attribute name="name" value="textColor" id="11239" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="11240" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="11241" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                    </parm >
+                                </parmlist >
+                                <attribute name="type" value="void" id="11242" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_4" id="11243" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="11244" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="11245" addr="0x7fca469dfad0" >
+                            <attributelist id="11246" addr="0x7fca469dfad0" >
+                                <attribute name="name" value="setLabel" id="11247" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="11248" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469d2350" id="11249" addr="0x7fca469d2350" />
+                                <attribute name="sym_previousSibling" value="0x7fca469df850" id="11250" addr="0x7fca469df850" />
+                                <attribute name="kind" value="function" id="11251" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setLabel" id="11252" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469dfcb0" id="11253" addr="0x7fca469dfcb0" />
+                                <attribute name="sym_nextSibling" value="0x7fca469dfcb0" id="11254" addr="0x7fca469dfcb0" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char)." id="11255" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469de810" id="11256" addr="0x7fca469de810" />
+                                <attribute name="access" value="public" id="11257" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469de810" id="11258" addr="0x7fca469de810" />
+                                <parmlist id="11259" addr="0x7fca469df910" >
                                     <parm id="11260">
-                                        <attributelist id="11261" addr="0x7f99f1e91910" >
-                                            <attribute name="name" value="label" id="11262" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="11263" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="11264" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11261" addr="0x7fca469df910" >
+                                            <attribute name="name" value="label" id="11262" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="11263" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="11264" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11265">
-                                        <attributelist id="11266" addr="0x7f99f1e91a10" >
-                                            <attribute name="name" value="font" id="11267" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="11268" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="11269" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                    </parm >
-                                </parmlist >
-                                <attribute name="type" value="void" id="11270" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_5" id="11271" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="11272" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="11273" addr="0x7f99f1e91cb0" >
-                            <attributelist id="11274" addr="0x7f99f1e91cb0" >
-                                <attribute name="name" value="setLabel" id="11275" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="11276" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e84350" id="11277" addr="0x7f99f1e84350" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e91ad0" id="11278" addr="0x7f99f1e91ad0" />
-                                <attribute name="kind" value="function" id="11279" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setLabel" id="11280" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e91dd0" id="11281" addr="0x7f99f1e91dd0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e91dd0" id="11282" addr="0x7f99f1e91dd0" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="11283" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e90810" id="11284" addr="0x7f99f1e90810" />
-                                <attribute name="access" value="public" id="11285" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e90810" id="11286" addr="0x7f99f1e90810" />
-                                <parmlist id="11287" addr="0x7f99f1e91b90" >
+                                        <attributelist id="11266" addr="0x7fca469dfa10" >
+                                            <attribute name="name" value="font" id="11267" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="11268" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="11269" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                    </parm >
+                                </parmlist >
+                                <attribute name="type" value="void" id="11270" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_5" id="11271" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="11272" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="11273" addr="0x7fca469dfcb0" >
+                            <attributelist id="11274" addr="0x7fca469dfcb0" >
+                                <attribute name="name" value="setLabel" id="11275" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="11276" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469d2350" id="11277" addr="0x7fca469d2350" />
+                                <attribute name="sym_previousSibling" value="0x7fca469dfad0" id="11278" addr="0x7fca469dfad0" />
+                                <attribute name="kind" value="function" id="11279" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setLabel" id="11280" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469dfdd0" id="11281" addr="0x7fca469dfdd0" />
+                                <attribute name="sym_nextSibling" value="0x7fca469dfdd0" id="11282" addr="0x7fca469dfdd0" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="11283" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469de810" id="11284" addr="0x7fca469de810" />
+                                <attribute name="access" value="public" id="11285" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469de810" id="11286" addr="0x7fca469de810" />
+                                <parmlist id="11287" addr="0x7fca469dfb90" >
                                     <parm id="11288">
-                                        <attributelist id="11289" addr="0x7f99f1e91b90" >
-                                            <attribute name="name" value="label" id="11290" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="11291" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="11292" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                    </parm >
-                                </parmlist >
-                                <attribute name="type" value="void" id="11293" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_6" id="11294" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="11295" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="11296" addr="0x7f99f1e91dd0" >
-                            <attributelist id="11297" addr="0x7f99f1e91dd0" >
-                                <attribute name="name" value="setLabel" id="11298" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="11299" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e84350" id="11300" addr="0x7f99f1e84350" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e91cb0" id="11301" addr="0x7f99f1e91cb0" />
-                                <attribute name="kind" value="function" id="11302" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setLabel" id="11303" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e90810" id="11304" addr="0x7f99f1e90810" />
-                                <attribute name="decl" value="f()." id="11305" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="11306" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e90810" id="11307" addr="0x7f99f1e90810" />
-                                <attribute name="type" value="void" id="11308" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_7" id="11309" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="11310" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="11311" addr="0x7f99f1e92450" >
-                            <attributelist id="11312" addr="0x7f99f1e92450" >
-                                <attribute name="name" value="setRadioDimension" id="11313" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="11314" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e84350" id="11315" addr="0x7f99f1e84350" />
-                                <attribute name="kind" value="function" id="11316" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setRadioDimension" id="11317" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(long,long,long,long)." id="11318" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="11319" addr="0x7f99f1de6c90" />
-                                <parmlist id="11320" addr="0x7f99f1e92030" >
+                                        <attributelist id="11289" addr="0x7fca469dfb90" >
+                                            <attribute name="name" value="label" id="11290" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="11291" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="11292" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                    </parm >
+                                </parmlist >
+                                <attribute name="type" value="void" id="11293" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_6" id="11294" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="11295" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="11296" addr="0x7fca469dfdd0" >
+                            <attributelist id="11297" addr="0x7fca469dfdd0" >
+                                <attribute name="name" value="setLabel" id="11298" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="11299" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469d2350" id="11300" addr="0x7fca469d2350" />
+                                <attribute name="sym_previousSibling" value="0x7fca469dfcb0" id="11301" addr="0x7fca469dfcb0" />
+                                <attribute name="kind" value="function" id="11302" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setLabel" id="11303" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469de810" id="11304" addr="0x7fca469de810" />
+                                <attribute name="decl" value="f()." id="11305" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="11306" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469de810" id="11307" addr="0x7fca469de810" />
+                                <attribute name="type" value="void" id="11308" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_7" id="11309" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="11310" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="11311" addr="0x7fca469e0450" >
+                            <attributelist id="11312" addr="0x7fca469e0450" >
+                                <attribute name="name" value="setRadioDimension" id="11313" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="11314" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469d2350" id="11315" addr="0x7fca469d2350" />
+                                <attribute name="kind" value="function" id="11316" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setRadioDimension" id="11317" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(long,long,long,long)." id="11318" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="11319" addr="0x7fca46934c90" />
+                                <parmlist id="11320" addr="0x7fca469e0030" >
                                     <parm id="11321">
-                                        <attributelist id="11322" addr="0x7f99f1e92030" >
-                                            <attribute name="name" value="x" id="11323" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="11324" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11322" addr="0x7fca469e0030" >
+                                            <attribute name="name" value="x" id="11323" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="11324" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11325">
-                                        <attributelist id="11326" addr="0x7f99f1e92150" >
-                                            <attribute name="name" value="y" id="11327" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="11328" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11326" addr="0x7fca469e0150" >
+                                            <attribute name="name" value="y" id="11327" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="11328" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11329">
-                                        <attributelist id="11330" addr="0x7f99f1e92270" >
-                                            <attribute name="name" value="width" id="11331" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="11332" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11330" addr="0x7fca469e0270" >
+                                            <attribute name="name" value="width" id="11331" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="11332" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11333">
-                                        <attributelist id="11334" addr="0x7f99f1e92390" >
-                                            <attribute name="name" value="height" id="11335" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="11336" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11334" addr="0x7fca469e0390" >
+                                            <attribute name="name" value="height" id="11335" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="11336" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="11337" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="11338" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="11339" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="11337" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="11338" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="11339" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
                     </class >
-                    <class id="11340" addr="0x7f99f1e92730" >
-                        <attributelist id="11341" addr="0x7f99f1e92730" >
-                            <attribute name="name" value="XBMCAddon::xbmcgui::ControlSlider" id="11342" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="11343" addr="0x7f99f1e40fb0" />
-                            <attribute name="symtab" value="0x7f99f1e92870" id="11344" addr="0x7f99f1e92870" />
-                            <attribute name="allows_typedef" value="1" id="11345" addr="0x7f99f1de6c90" />
-                            <attribute name="typepass_visit" value="1" id="11346" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_visit" value="1" id="11347" addr="0x7f99f1de6c90" />
-                            <attribute name="kind" value="class" id="11348" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_name" value="ControlSlider" id="11349" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_has_constructor" value="1" id="11350" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_public_constructor" value="1" id="11351" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_copy_constructor" value="1" id="11352" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_default_destructor" value="1" id="11353" addr="0x7f99f1de6c90" />
-                            <attribute name="privatebaselist" value="0x7f99f1e92710" id="11354" addr="0x7f99f1e92710" />
-                            <attribute name="protectedbaselist" value="0x7f99f1e926f0" id="11355" addr="0x7f99f1e926f0" />
-                            <baselist id="11356" addr="0x7f99f1e926d0" >
-                                <base name="Control" id="11357" addr="0x7f99f1e92650" />
+                    <class id="11340" addr="0x7fca469e0730" >
+                        <attributelist id="11341" addr="0x7fca469e0730" >
+                            <attribute name="name" value="XBMCAddon::xbmcgui::ControlSlider" id="11342" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="11343" addr="0x7fca4698efb0" />
+                            <attribute name="symtab" value="0x7fca469e0870" id="11344" addr="0x7fca469e0870" />
+                            <attribute name="allows_typedef" value="1" id="11345" addr="0x7fca46934c90" />
+                            <attribute name="typepass_visit" value="1" id="11346" addr="0x7fca46934c90" />
+                            <attribute name="allocate_visit" value="1" id="11347" addr="0x7fca46934c90" />
+                            <attribute name="kind" value="class" id="11348" addr="0x7fca46934c90" />
+                            <attribute name="sym_name" value="ControlSlider" id="11349" addr="0x7fca46934c90" />
+                            <attribute name="allocate_has_constructor" value="1" id="11350" addr="0x7fca46934c90" />
+                            <attribute name="allocate_public_constructor" value="1" id="11351" addr="0x7fca46934c90" />
+                            <attribute name="allocate_copy_constructor" value="1" id="11352" addr="0x7fca46934c90" />
+                            <attribute name="allocate_default_destructor" value="1" id="11353" addr="0x7fca46934c90" />
+                            <attribute name="privatebaselist" value="0x7fca469e0710" id="11354" addr="0x7fca469e0710" />
+                            <attribute name="protectedbaselist" value="0x7fca469e06f0" id="11355" addr="0x7fca469e06f0" />
+                            <baselist id="11356" addr="0x7fca469e06d0" >
+                                <base name="Control" id="11357" addr="0x7fca469e0650" />
                             </baselist >
-                            <attribute name="module" value="xbmcgui" id="11358" addr="0x7f99f1e402f0" />
-                            <attribute name="bases" value="0x7f99f1dde0d0" id="11359" addr="0x7f99f1dde0d0" />
-                            <attribute name="allbases" value="0x7f99f1dde370" id="11360" addr="0x7f99f1dde370" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="11361" addr="0x7f99f1de6c90" />
-                            <typescope id="11362" addr="0x7f99f1dde050" >
-                                <attributelist id="11363" addr="0x7f99f1dde050" >
-                                    <attribute name="inherit" value="0x7f99f1dde150" id="11364" addr="0x7f99f1dde150" />
-                                    <attribute name="name" value="ControlSlider" id="11365" addr="0x7f99f1de6c90" />
-                                    <typetab id="11366" addr="0x7f99f1dde070" >
-                                        <attributelist id="11367" addr="0x7f99f1dde070" >
+                            <attribute name="module" value="xbmcgui" id="11358" addr="0x7fca4698e2f0" />
+                            <attribute name="bases" value="0x7fca4692c0d0" id="11359" addr="0x7fca4692c0d0" />
+                            <attribute name="allbases" value="0x7fca4692c370" id="11360" addr="0x7fca4692c370" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="11361" addr="0x7fca46934c90" />
+                            <typescope id="11362" addr="0x7fca4692c050" >
+                                <attributelist id="11363" addr="0x7fca4692c050" >
+                                    <attribute name="inherit" value="0x7fca4692c150" id="11364" addr="0x7fca4692c150" />
+                                    <attribute name="name" value="ControlSlider" id="11365" addr="0x7fca46934c90" />
+                                    <typetab id="11366" addr="0x7fca4692c070" >
+                                        <attributelist id="11367" addr="0x7fca4692c070" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f99f1dd2150" id="11368" addr="0x7f99f1dd2150" />
-                                    <attribute name="qname" value="XBMCAddon::xbmcgui::ControlSlider" id="11369" addr="0x7f99f1de6c90" />
-                                    <attribute name="symtab" value="0x7f99f1e92870" id="11370" addr="0x7f99f1e92870" />
+                                    <attribute name="parent" value="0x7fca46920150" id="11368" addr="0x7fca46920150" />
+                                    <attribute name="qname" value="XBMCAddon::xbmcgui::ControlSlider" id="11369" addr="0x7fca46934c90" />
+                                    <attribute name="symtab" value="0x7fca469e0870" id="11370" addr="0x7fca469e0870" />
                                 </attributelist >
-                                <typescopesitem id="11371" addr="0x7f99f1dde150" >
-                                    <attributelist id="11372" addr="0x7f99f1dde150" >
+                                <typescopesitem id="11371" addr="0x7fca4692c150" >
+                                    <attributelist id="11372" addr="0x7fca4692c150" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="11373" addr="0x7f99f1dddfd0" >
-                                    <attributelist id="11374" addr="0x7f99f1dddfd0" >
+                                <typescopesitem id="11373" addr="0x7fca4692bfd0" >
+                                    <attributelist id="11374" addr="0x7fca4692bfd0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="11375" addr="0x7f99f1dde070" >
-                                    <attributelist id="11376" addr="0x7f99f1dde070" >
+                                <typescopesitem id="11375" addr="0x7fca4692c070" >
+                                    <attributelist id="11376" addr="0x7fca4692c070" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="11377" addr="0x7f99f1dd2150" >
-                                    <attributelist id="11378" addr="0x7f99f1dd2150" >
-                                        <attribute name="name" value="xbmcgui" id="11379" addr="0x7f99f1de6c90" />
-                                        <typetab id="11380" addr="0x7f99f1dd2170" >
-                                            <attributelist id="11381" addr="0x7f99f1dd2170" >
-                                                <attribute name="InterceptorBase" value="InterceptorBase" id="11382" addr="0x7f99f1de6c90" />
-                                                <attribute name="Dialog" value="Dialog" id="11383" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="11384" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="11385" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlTextBox" value="ControlTextBox" id="11386" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="11387" addr="0x7f99f1de6c90" />
-                                                <attribute name="Window" value="Window" id="11388" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="11389" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlList" value="ControlList" id="11390" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="11391" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlImage" value="ControlImage" id="11392" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlButton" value="ControlButton" id="11393" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlGroup" value="ControlGroup" id="11394" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogBusy" value="DialogBusy" id="11395" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="11396" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSpin" value="ControlSpin" id="11397" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlEdit" value="ControlEdit" id="11398" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="11399" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="11400" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlLabel" value="ControlLabel" id="11401" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlProgress" value="ControlProgress" id="11402" addr="0x7f99f1de6c90" />
-                                                <attribute name="Control" value="Control" id="11403" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSlider" value="ControlSlider" id="11404" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgress" value="DialogProgress" id="11405" addr="0x7f99f1de6c90" />
-                                                <attribute name="Action" value="Action" id="11406" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowDialog" value="WindowDialog" id="11407" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXML" value="WindowXML" id="11408" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItem" value="ListItem" id="11409" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="11410" addr="0x7f99f1de6c90" />
+                                <typescopesitem id="11377" addr="0x7fca46920150" >
+                                    <attributelist id="11378" addr="0x7fca46920150" >
+                                        <attribute name="name" value="xbmcgui" id="11379" addr="0x7fca46934c90" />
+                                        <typetab id="11380" addr="0x7fca46920170" >
+                                            <attributelist id="11381" addr="0x7fca46920170" >
+                                                <attribute name="InterceptorBase" value="InterceptorBase" id="11382" addr="0x7fca46934c90" />
+                                                <attribute name="Dialog" value="Dialog" id="11383" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="11384" addr="0x7fca46934c90" />
+                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="11385" addr="0x7fca46934c90" />
+                                                <attribute name="ControlTextBox" value="ControlTextBox" id="11386" addr="0x7fca46934c90" />
+                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="11387" addr="0x7fca46934c90" />
+                                                <attribute name="Window" value="Window" id="11388" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="11389" addr="0x7fca46934c90" />
+                                                <attribute name="ControlList" value="ControlList" id="11390" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="11391" addr="0x7fca46934c90" />
+                                                <attribute name="ControlImage" value="ControlImage" id="11392" addr="0x7fca46934c90" />
+                                                <attribute name="ControlButton" value="ControlButton" id="11393" addr="0x7fca46934c90" />
+                                                <attribute name="ControlGroup" value="ControlGroup" id="11394" addr="0x7fca46934c90" />
+                                                <attribute name="DialogBusy" value="DialogBusy" id="11395" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="11396" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSpin" value="ControlSpin" id="11397" addr="0x7fca46934c90" />
+                                                <attribute name="ControlEdit" value="ControlEdit" id="11398" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="11399" addr="0x7fca46934c90" />
+                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="11400" addr="0x7fca46934c90" />
+                                                <attribute name="ControlLabel" value="ControlLabel" id="11401" addr="0x7fca46934c90" />
+                                                <attribute name="ControlProgress" value="ControlProgress" id="11402" addr="0x7fca46934c90" />
+                                                <attribute name="Control" value="Control" id="11403" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSlider" value="ControlSlider" id="11404" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgress" value="DialogProgress" id="11405" addr="0x7fca46934c90" />
+                                                <attribute name="Action" value="Action" id="11406" addr="0x7fca46934c90" />
+                                                <attribute name="WindowDialog" value="WindowDialog" id="11407" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXML" value="WindowXML" id="11408" addr="0x7fca46934c90" />
+                                                <attribute name="ListItem" value="ListItem" id="11409" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="11410" addr="0x7fca46934c90" />
                                             </attributelist >
-                                            <typetabsitem id="11411" addr="0x7f99f1de1dd0" >
-                                                <attributelist id="11412" addr="0x7f99f1de1dd0" >
+                                            <typetabsitem id="11411" addr="0x7fca4692fdd0" >
+                                                <attributelist id="11412" addr="0x7fca4692fdd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="11413" addr="0x7f99f1dde790" >
-                                                <attributelist id="11414" addr="0x7f99f1dde790" >
+                                            <typetabsitem id="11413" addr="0x7fca4692c790" >
+                                                <attributelist id="11414" addr="0x7fca4692c790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="11415" addr="0x7f99f1de3f10" >
-                                                <attributelist id="11416" addr="0x7f99f1de3f10" >
+                                            <typetabsitem id="11415" addr="0x7fca46931f10" >
+                                                <attributelist id="11416" addr="0x7fca46931f10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="11417" addr="0x7f99f1dd67b0" >
-                                                <attributelist id="11418" addr="0x7f99f1dd67b0" >
+                                            <typetabsitem id="11417" addr="0x7fca469247b0" >
+                                                <attributelist id="11418" addr="0x7fca469247b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="11419" addr="0x7f99f1ddafd0" >
-                                                <attributelist id="11420" addr="0x7f99f1ddafd0" >
+                                            <typetabsitem id="11419" addr="0x7fca46928fd0" >
+                                                <attributelist id="11420" addr="0x7fca46928fd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="11421" addr="0x7f99f1ddd430" >
-                                                <attributelist id="11422" addr="0x7f99f1ddd430" >
+                                            <typetabsitem id="11421" addr="0x7fca4692b430" >
+                                                <attributelist id="11422" addr="0x7fca4692b430" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="11423" addr="0x7f99f1de2130" >
-                                                <attributelist id="11424" addr="0x7f99f1de2130" >
+                                            <typetabsitem id="11423" addr="0x7fca46930130" >
+                                                <attributelist id="11424" addr="0x7fca46930130" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="11425" addr="0x7f99f1dd2f50" >
-                                                <attributelist id="11426" addr="0x7f99f1dd2f50" >
+                                            <typetabsitem id="11425" addr="0x7fca46920f50" >
+                                                <attributelist id="11426" addr="0x7fca46920f50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="11427" addr="0x7f99f1dd9650" >
-                                                <attributelist id="11428" addr="0x7f99f1dd9650" >
+                                            <typetabsitem id="11427" addr="0x7fca46927650" >
+                                                <attributelist id="11428" addr="0x7fca46927650" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="11429" addr="0x7f99f1de3390" >
-                                                <attributelist id="11430" addr="0x7f99f1de3390" >
+                                            <typetabsitem id="11429" addr="0x7fca46931390" >
+                                                <attributelist id="11430" addr="0x7fca46931390" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="11431" addr="0x7f99f1ddb7b0" >
-                                                <attributelist id="11432" addr="0x7f99f1ddb7b0" >
+                                            <typetabsitem id="11431" addr="0x7fca469297b0" >
+                                                <attributelist id="11432" addr="0x7fca469297b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="11433" addr="0x7f99f1ddc4b0" >
-                                                <attributelist id="11434" addr="0x7f99f1ddc4b0" >
+                                            <typetabsitem id="11433" addr="0x7fca4692a4b0" >
+                                                <attributelist id="11434" addr="0x7fca4692a4b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="11435" addr="0x7f99f1ddcf90" >
-                                                <attributelist id="11436" addr="0x7f99f1ddcf90" >
+                                            <typetabsitem id="11435" addr="0x7fca4692af90" >
+                                                <attributelist id="11436" addr="0x7fca4692af90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="11437" addr="0x7f99f1de11b0" >
-                                                <attributelist id="11438" addr="0x7f99f1de11b0" >
+                                            <typetabsitem id="11437" addr="0x7fca4692f1b0" >
+                                                <attributelist id="11438" addr="0x7fca4692f1b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="11439" addr="0x7f99f1de15b0" >
-                                                <attributelist id="11440" addr="0x7f99f1de15b0" >
+                                            <typetabsitem id="11439" addr="0x7fca4692f5b0" >
+                                                <attributelist id="11440" addr="0x7fca4692f5b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="11441" addr="0x7f99f1dd77f0" >
-                                                <attributelist id="11442" addr="0x7f99f1dd77f0" >
+                                            <typetabsitem id="11441" addr="0x7fca469257f0" >
+                                                <attributelist id="11442" addr="0x7fca469257f0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="11443" addr="0x7f99f1dd8b30" >
-                                                <attributelist id="11444" addr="0x7f99f1dd8b30" >
+                                            <typetabsitem id="11443" addr="0x7fca46926b30" >
+                                                <attributelist id="11444" addr="0x7fca46926b30" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="11445" addr="0x7f99f1dd2c50" >
-                                                <attributelist id="11446" addr="0x7f99f1dd2c50" >
+                                            <typetabsitem id="11445" addr="0x7fca46920c50" >
+                                                <attributelist id="11446" addr="0x7fca46920c50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="11447" addr="0x7f99f1dda790" >
-                                                <attributelist id="11448" addr="0x7f99f1dda790" >
+                                            <typetabsitem id="11447" addr="0x7fca46928790" >
+                                                <attributelist id="11448" addr="0x7fca46928790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="11449" addr="0x7f99f1dd8030" >
-                                                <attributelist id="11450" addr="0x7f99f1dd8030" >
+                                            <typetabsitem id="11449" addr="0x7fca46926030" >
+                                                <attributelist id="11450" addr="0x7fca46926030" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="11451" addr="0x7f99f1ddbe10" >
-                                                <attributelist id="11452" addr="0x7f99f1ddbe10" >
+                                            <typetabsitem id="11451" addr="0x7fca46929e10" >
+                                                <attributelist id="11452" addr="0x7fca46929e10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="11453" addr="0x7f99f1dd6b10" >
-                                                <attributelist id="11454" addr="0x7f99f1dd6b10" >
+                                            <typetabsitem id="11453" addr="0x7fca46924b10" >
+                                                <attributelist id="11454" addr="0x7fca46924b10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="11455" addr="0x7f99f1dddf90" >
-                                                <attributelist id="11456" addr="0x7f99f1dddf90" >
+                                            <typetabsitem id="11455" addr="0x7fca4692bf90" >
+                                                <attributelist id="11456" addr="0x7fca4692bf90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="11457" addr="0x7f99f1de0530" >
-                                                <attributelist id="11458" addr="0x7f99f1de0530" >
+                                            <typetabsitem id="11457" addr="0x7fca4692e530" >
+                                                <attributelist id="11458" addr="0x7fca4692e530" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="11459" addr="0x7f99f1de1e50" >
-                                                <attributelist id="11460" addr="0x7f99f1de1e50" >
+                                            <typetabsitem id="11459" addr="0x7fca4692fe50" >
+                                                <attributelist id="11460" addr="0x7fca4692fe50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="11461" addr="0x7f99f1de2d90" >
-                                                <attributelist id="11462" addr="0x7f99f1de2d90" >
+                                            <typetabsitem id="11461" addr="0x7fca46930d90" >
+                                                <attributelist id="11462" addr="0x7fca46930d90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="11463" addr="0x7f99f1de3410" >
-                                                <attributelist id="11464" addr="0x7f99f1de3410" >
+                                            <typetabsitem id="11463" addr="0x7fca46931410" >
+                                                <attributelist id="11464" addr="0x7fca46931410" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="11465" addr="0x7f99f1dd3590" >
-                                                <attributelist id="11466" addr="0x7f99f1dd3590" >
+                                            <typetabsitem id="11465" addr="0x7fca46921590" >
+                                                <attributelist id="11466" addr="0x7fca46921590" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="11467" addr="0x7f99f1dd3390" >
-                                                <attributelist id="11468" addr="0x7f99f1dd3390" >
+                                            <typetabsitem id="11467" addr="0x7fca46921390" >
+                                                <attributelist id="11468" addr="0x7fca46921390" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7f99f1dd1d70" id="11469" addr="0x7f99f1dd1d70" />
-                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="11470" addr="0x7f99f1de6c90" />
-                                        <attribute name="symtab" value="0x7f99f1e40fb0" id="11471" addr="0x7f99f1e40fb0" />
+                                        <attribute name="parent" value="0x7fca4691fd70" id="11469" addr="0x7fca4691fd70" />
+                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="11470" addr="0x7fca46934c90" />
+                                        <attribute name="symtab" value="0x7fca4698efb0" id="11471" addr="0x7fca4698efb0" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="11472" addr="0x7f99f1dde090" >
-                                    <attributelist id="11473" addr="0x7f99f1dde090" >
+                                <typescopesitem id="11472" addr="0x7fca4692c090" >
+                                    <attributelist id="11473" addr="0x7fca4692c090" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="11474" addr="0x7f99f1e92870" >
-                                    <attributelist id="11475" addr="0x7f99f1e92870" >
-                                        <attribute name="inherit" value="0x7f99f1e928d0" id="11476" addr="0x7f99f1e928d0" />
-                                        <attribute name="name" value="ControlSlider" id="11477" addr="0x7f99f1de6c90" />
-                                        <attribute name="csymtab" value="0x7f99f1e92890" id="11478" addr="0x7f99f1e92890" />
-                                        <attribute name="symtab" value="0x7f99f1e92850" id="11479" addr="0x7f99f1e92850" />
+                                <typescopesitem id="11474" addr="0x7fca469e0870" >
+                                    <attributelist id="11475" addr="0x7fca469e0870" >
+                                        <attribute name="inherit" value="0x7fca469e08d0" id="11476" addr="0x7fca469e08d0" />
+                                        <attribute name="name" value="ControlSlider" id="11477" addr="0x7fca46934c90" />
+                                        <attribute name="csymtab" value="0x7fca469e0890" id="11478" addr="0x7fca469e0890" />
+                                        <attribute name="symtab" value="0x7fca469e0850" id="11479" addr="0x7fca469e0850" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <access id="11480" addr="0x7f99f1e927f0" >
-                            <attributelist id="11481" addr="0x7f99f1e927f0" >
-                                <attribute name="kind" value="public" id="11482" addr="0x7f99f1de6c90" />
+                        <access id="11480" addr="0x7fca469e07f0" >
+                            <attributelist id="11481" addr="0x7fca469e07f0" >
+                                <attribute name="kind" value="public" id="11482" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="11483" addr="0x7f99f1e93490" >
-                            <attributelist id="11484" addr="0x7f99f1e93490" >
-                                <attribute name="name" value="ControlSlider" id="11485" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="11486" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e92870" id="11487" addr="0x7f99f1e92870" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e93970" id="11488" addr="0x7f99f1e93970" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e93970" id="11489" addr="0x7f99f1e93970" />
-                                <attribute name="sym_name" value="ControlSlider" id="11490" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,int)." id="11491" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="11492" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e93490" id="11493" addr="0x7f99f1e93490" />
-                                <parmlist id="11494" addr="0x7f99f1e92a30" >
+                        <constructor id="11483" addr="0x7fca469e1490" >
+                            <attributelist id="11484" addr="0x7fca469e1490" >
+                                <attribute name="name" value="ControlSlider" id="11485" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="11486" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e0870" id="11487" addr="0x7fca469e0870" />
+                                <attribute name="sym_nextSibling" value="0x7fca469e1970" id="11488" addr="0x7fca469e1970" />
+                                <attribute name="csym_nextSibling" value="0x7fca469e1970" id="11489" addr="0x7fca469e1970" />
+                                <attribute name="sym_name" value="ControlSlider" id="11490" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,int)." id="11491" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="11492" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469e1490" id="11493" addr="0x7fca469e1490" />
+                                <parmlist id="11494" addr="0x7fca469e0a30" >
                                     <parm id="11495">
-                                        <attributelist id="11496" addr="0x7f99f1e92a30" >
-                                            <attribute name="name" value="x" id="11497" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="11498" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11496" addr="0x7fca469e0a30" >
+                                            <attribute name="name" value="x" id="11497" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="11498" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11499">
-                                        <attributelist id="11500" addr="0x7f99f1e92b50" >
-                                            <attribute name="name" value="y" id="11501" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="11502" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11500" addr="0x7fca469e0b50" >
+                                            <attribute name="name" value="y" id="11501" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="11502" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11503">
-                                        <attributelist id="11504" addr="0x7f99f1e92c70" >
-                                            <attribute name="name" value="width" id="11505" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="11506" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11504" addr="0x7fca469e0c70" >
+                                            <attribute name="name" value="width" id="11505" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="11506" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11507">
-                                        <attributelist id="11508" addr="0x7f99f1e92d90" >
-                                            <attribute name="name" value="height" id="11509" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="11510" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11508" addr="0x7fca469e0d90" >
+                                            <attribute name="name" value="height" id="11509" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="11510" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11511">
-                                        <attributelist id="11512" addr="0x7f99f1e92f30" >
-                                            <attribute name="name" value="textureback" id="11513" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="11514" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="11515" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11512" addr="0x7fca469e0f30" >
+                                            <attribute name="name" value="textureback" id="11513" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="11514" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="11515" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11516">
-                                        <attributelist id="11517" addr="0x7f99f1e930d0" >
-                                            <attribute name="name" value="texture" id="11518" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="11519" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="11520" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11517" addr="0x7fca469e10d0" >
+                                            <attribute name="name" value="texture" id="11518" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="11519" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="11520" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11521">
-                                        <attributelist id="11522" addr="0x7f99f1e93270" >
-                                            <attribute name="name" value="texturefocus" id="11523" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="11524" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="11525" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11522" addr="0x7fca469e1270" >
+                                            <attribute name="name" value="texturefocus" id="11523" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="11524" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="11525" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11526">
-                                        <attributelist id="11527" addr="0x7f99f1e933d0" >
-                                            <attribute name="name" value="orientation" id="11528" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="1" id="11529" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="11530" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11527" addr="0x7fca469e13d0" >
+                                            <attribute name="name" value="orientation" id="11528" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="1" id="11529" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="11530" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_0" id="11531" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="11532" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="11531" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="11532" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="11533" addr="0x7f99f1e93970" >
-                            <attributelist id="11534" addr="0x7f99f1e93970" >
-                                <attribute name="name" value="ControlSlider" id="11535" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="11536" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e92870" id="11537" addr="0x7f99f1e92870" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e93db0" id="11538" addr="0x7f99f1e93db0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e93490" id="11539" addr="0x7f99f1e93490" />
-                                <attribute name="sym_name" value="ControlSlider" id="11540" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e93db0" id="11541" addr="0x7f99f1e93db0" />
-                                <attribute name="defaultargs" value="0x7f99f1e93490" id="11542" addr="0x7f99f1e93490" />
-                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char)." id="11543" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="11544" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e93490" id="11545" addr="0x7f99f1e93490" />
-                                <parmlist id="11546" addr="0x7f99f1e93530" >
+                        <constructor id="11533" addr="0x7fca469e1970" >
+                            <attributelist id="11534" addr="0x7fca469e1970" >
+                                <attribute name="name" value="ControlSlider" id="11535" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="11536" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e0870" id="11537" addr="0x7fca469e0870" />
+                                <attribute name="csym_nextSibling" value="0x7fca469e1db0" id="11538" addr="0x7fca469e1db0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469e1490" id="11539" addr="0x7fca469e1490" />
+                                <attribute name="sym_name" value="ControlSlider" id="11540" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469e1db0" id="11541" addr="0x7fca469e1db0" />
+                                <attribute name="defaultargs" value="0x7fca469e1490" id="11542" addr="0x7fca469e1490" />
+                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char)." id="11543" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="11544" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469e1490" id="11545" addr="0x7fca469e1490" />
+                                <parmlist id="11546" addr="0x7fca469e1530" >
                                     <parm id="11547">
-                                        <attributelist id="11548" addr="0x7f99f1e93530" >
-                                            <attribute name="name" value="x" id="11549" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="11550" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11548" addr="0x7fca469e1530" >
+                                            <attribute name="name" value="x" id="11549" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="11550" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11551">
-                                        <attributelist id="11552" addr="0x7f99f1e935f0" >
-                                            <attribute name="name" value="y" id="11553" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="11554" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11552" addr="0x7fca469e15f0" >
+                                            <attribute name="name" value="y" id="11553" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="11554" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11555">
-                                        <attributelist id="11556" addr="0x7f99f1e93670" >
-                                            <attribute name="name" value="width" id="11557" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="11558" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11556" addr="0x7fca469e1670" >
+                                            <attribute name="name" value="width" id="11557" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="11558" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11559">
-                                        <attributelist id="11560" addr="0x7f99f1e936f0" >
-                                            <attribute name="name" value="height" id="11561" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="11562" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11560" addr="0x7fca469e16f0" >
+                                            <attribute name="name" value="height" id="11561" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="11562" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11563">
-                                        <attributelist id="11564" addr="0x7f99f1e93770" >
-                                            <attribute name="name" value="textureback" id="11565" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="11566" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="11567" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11564" addr="0x7fca469e1770" >
+                                            <attribute name="name" value="textureback" id="11565" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="11566" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="11567" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11568">
-                                        <attributelist id="11569" addr="0x7f99f1e93810" >
-                                            <attribute name="name" value="texture" id="11570" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="11571" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="11572" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11569" addr="0x7fca469e1810" >
+                                            <attribute name="name" value="texture" id="11570" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="11571" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="11572" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11573">
-                                        <attributelist id="11574" addr="0x7f99f1e938b0" >
-                                            <attribute name="name" value="texturefocus" id="11575" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="11576" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="11577" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11574" addr="0x7fca469e18b0" >
+                                            <attribute name="name" value="texturefocus" id="11575" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="11576" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="11577" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_1" id="11578" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="11579" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="11578" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="11579" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="11580" addr="0x7f99f1e93db0" >
-                            <attributelist id="11581" addr="0x7f99f1e93db0" >
-                                <attribute name="name" value="ControlSlider" id="11582" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="11583" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e92870" id="11584" addr="0x7f99f1e92870" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e94150" id="11585" addr="0x7f99f1e94150" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e93970" id="11586" addr="0x7f99f1e93970" />
-                                <attribute name="sym_name" value="ControlSlider" id="11587" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e94150" id="11588" addr="0x7f99f1e94150" />
-                                <attribute name="defaultargs" value="0x7f99f1e93490" id="11589" addr="0x7f99f1e93490" />
-                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char)." id="11590" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="11591" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e93490" id="11592" addr="0x7f99f1e93490" />
-                                <parmlist id="11593" addr="0x7f99f1e93a10" >
+                        <constructor id="11580" addr="0x7fca469e1db0" >
+                            <attributelist id="11581" addr="0x7fca469e1db0" >
+                                <attribute name="name" value="ControlSlider" id="11582" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="11583" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e0870" id="11584" addr="0x7fca469e0870" />
+                                <attribute name="csym_nextSibling" value="0x7fca469e2150" id="11585" addr="0x7fca469e2150" />
+                                <attribute name="sym_previousSibling" value="0x7fca469e1970" id="11586" addr="0x7fca469e1970" />
+                                <attribute name="sym_name" value="ControlSlider" id="11587" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469e2150" id="11588" addr="0x7fca469e2150" />
+                                <attribute name="defaultargs" value="0x7fca469e1490" id="11589" addr="0x7fca469e1490" />
+                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char)." id="11590" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="11591" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469e1490" id="11592" addr="0x7fca469e1490" />
+                                <parmlist id="11593" addr="0x7fca469e1a10" >
                                     <parm id="11594">
-                                        <attributelist id="11595" addr="0x7f99f1e93a10" >
-                                            <attribute name="name" value="x" id="11596" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="11597" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11595" addr="0x7fca469e1a10" >
+                                            <attribute name="name" value="x" id="11596" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="11597" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11598">
-                                        <attributelist id="11599" addr="0x7f99f1e93ad0" >
-                                            <attribute name="name" value="y" id="11600" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="11601" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11599" addr="0x7fca469e1ad0" >
+                                            <attribute name="name" value="y" id="11600" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="11601" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11602">
-                                        <attributelist id="11603" addr="0x7f99f1e93b50" >
-                                            <attribute name="name" value="width" id="11604" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="11605" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11603" addr="0x7fca469e1b50" >
+                                            <attribute name="name" value="width" id="11604" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="11605" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11606">
-                                        <attributelist id="11607" addr="0x7f99f1e93bd0" >
-                                            <attribute name="name" value="height" id="11608" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="11609" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11607" addr="0x7fca469e1bd0" >
+                                            <attribute name="name" value="height" id="11608" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="11609" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11610">
-                                        <attributelist id="11611" addr="0x7f99f1e93c50" >
-                                            <attribute name="name" value="textureback" id="11612" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="11613" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="11614" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11611" addr="0x7fca469e1c50" >
+                                            <attribute name="name" value="textureback" id="11612" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="11613" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="11614" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11615">
-                                        <attributelist id="11616" addr="0x7f99f1e93cf0" >
-                                            <attribute name="name" value="texture" id="11617" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="11618" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="11619" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11616" addr="0x7fca469e1cf0" >
+                                            <attribute name="name" value="texture" id="11617" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="11618" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="11619" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_2" id="11620" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="11621" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_2" id="11620" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="11621" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="11622" addr="0x7f99f1e94150" >
-                            <attributelist id="11623" addr="0x7f99f1e94150" >
-                                <attribute name="name" value="ControlSlider" id="11624" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="11625" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e92870" id="11626" addr="0x7f99f1e92870" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e94450" id="11627" addr="0x7f99f1e94450" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e93db0" id="11628" addr="0x7f99f1e93db0" />
-                                <attribute name="sym_name" value="ControlSlider" id="11629" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e94450" id="11630" addr="0x7f99f1e94450" />
-                                <attribute name="defaultargs" value="0x7f99f1e93490" id="11631" addr="0x7f99f1e93490" />
-                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char)." id="11632" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="11633" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e93490" id="11634" addr="0x7f99f1e93490" />
-                                <parmlist id="11635" addr="0x7f99f1e93e50" >
+                        <constructor id="11622" addr="0x7fca469e2150" >
+                            <attributelist id="11623" addr="0x7fca469e2150" >
+                                <attribute name="name" value="ControlSlider" id="11624" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="11625" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e0870" id="11626" addr="0x7fca469e0870" />
+                                <attribute name="csym_nextSibling" value="0x7fca469e2450" id="11627" addr="0x7fca469e2450" />
+                                <attribute name="sym_previousSibling" value="0x7fca469e1db0" id="11628" addr="0x7fca469e1db0" />
+                                <attribute name="sym_name" value="ControlSlider" id="11629" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469e2450" id="11630" addr="0x7fca469e2450" />
+                                <attribute name="defaultargs" value="0x7fca469e1490" id="11631" addr="0x7fca469e1490" />
+                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char)." id="11632" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="11633" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469e1490" id="11634" addr="0x7fca469e1490" />
+                                <parmlist id="11635" addr="0x7fca469e1e50" >
                                     <parm id="11636">
-                                        <attributelist id="11637" addr="0x7f99f1e93e50" >
-                                            <attribute name="name" value="x" id="11638" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="11639" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11637" addr="0x7fca469e1e50" >
+                                            <attribute name="name" value="x" id="11638" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="11639" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11640">
-                                        <attributelist id="11641" addr="0x7f99f1e93f10" >
-                                            <attribute name="name" value="y" id="11642" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="11643" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11641" addr="0x7fca469e1f10" >
+                                            <attribute name="name" value="y" id="11642" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="11643" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11644">
-                                        <attributelist id="11645" addr="0x7f99f1e93f90" >
-                                            <attribute name="name" value="width" id="11646" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="11647" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11645" addr="0x7fca469e1f90" >
+                                            <attribute name="name" value="width" id="11646" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="11647" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11648">
-                                        <attributelist id="11649" addr="0x7f99f1e94010" >
-                                            <attribute name="name" value="height" id="11650" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="11651" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11649" addr="0x7fca469e2010" >
+                                            <attribute name="name" value="height" id="11650" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="11651" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11652">
-                                        <attributelist id="11653" addr="0x7f99f1e94090" >
-                                            <attribute name="name" value="textureback" id="11654" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="11655" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="11656" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11653" addr="0x7fca469e2090" >
+                                            <attribute name="name" value="textureback" id="11654" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="11655" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="11656" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_3" id="11657" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="11658" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_3" id="11657" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="11658" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="11659" addr="0x7f99f1e94450" >
-                            <attributelist id="11660" addr="0x7f99f1e94450" >
-                                <attribute name="name" value="ControlSlider" id="11661" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="11662" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e92870" id="11663" addr="0x7f99f1e92870" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e94150" id="11664" addr="0x7f99f1e94150" />
-                                <attribute name="sym_name" value="ControlSlider" id="11665" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e93490" id="11666" addr="0x7f99f1e93490" />
-                                <attribute name="decl" value="f(long,long,long,long)." id="11667" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="11668" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e93490" id="11669" addr="0x7f99f1e93490" />
-                                <parmlist id="11670" addr="0x7f99f1e941f0" >
+                        <constructor id="11659" addr="0x7fca469e2450" >
+                            <attributelist id="11660" addr="0x7fca469e2450" >
+                                <attribute name="name" value="ControlSlider" id="11661" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="11662" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e0870" id="11663" addr="0x7fca469e0870" />
+                                <attribute name="sym_previousSibling" value="0x7fca469e2150" id="11664" addr="0x7fca469e2150" />
+                                <attribute name="sym_name" value="ControlSlider" id="11665" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469e1490" id="11666" addr="0x7fca469e1490" />
+                                <attribute name="decl" value="f(long,long,long,long)." id="11667" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="11668" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469e1490" id="11669" addr="0x7fca469e1490" />
+                                <parmlist id="11670" addr="0x7fca469e21f0" >
                                     <parm id="11671">
-                                        <attributelist id="11672" addr="0x7f99f1e941f0" >
-                                            <attribute name="name" value="x" id="11673" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="11674" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11672" addr="0x7fca469e21f0" >
+                                            <attribute name="name" value="x" id="11673" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="11674" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11675">
-                                        <attributelist id="11676" addr="0x7f99f1e942b0" >
-                                            <attribute name="name" value="y" id="11677" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="11678" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11676" addr="0x7fca469e22b0" >
+                                            <attribute name="name" value="y" id="11677" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="11678" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11679">
-                                        <attributelist id="11680" addr="0x7f99f1e94330" >
-                                            <attribute name="name" value="width" id="11681" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="11682" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11680" addr="0x7fca469e2330" >
+                                            <attribute name="name" value="width" id="11681" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="11682" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11683">
-                                        <attributelist id="11684" addr="0x7f99f1e943b0" >
-                                            <attribute name="name" value="height" id="11685" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="11686" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11684" addr="0x7fca469e23b0" >
+                                            <attribute name="name" value="height" id="11685" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="11686" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_4" id="11687" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="11688" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_4" id="11687" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="11688" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <cdecl id="11689" addr="0x7f99f1e94610" >
-                            <attributelist id="11690" addr="0x7f99f1e94610" >
-                                <attribute name="name" value="getPercent" id="11691" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="11692" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e92870" id="11693" addr="0x7f99f1e92870" />
-                                <attribute name="kind" value="function" id="11694" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getPercent" id="11695" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="11696" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="11697" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="float" id="11698" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="11699" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="11700" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="11701" addr="0x7f99f1e94910" >
-                            <attributelist id="11702" addr="0x7f99f1e94910" >
-                                <attribute name="name" value="setPercent" id="11703" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="11704" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e92870" id="11705" addr="0x7f99f1e92870" />
-                                <attribute name="kind" value="function" id="11706" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setPercent" id="11707" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(float)." id="11708" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="11709" addr="0x7f99f1de6c90" />
-                                <parmlist id="11710" addr="0x7f99f1e94850" >
+                        <cdecl id="11689" addr="0x7fca469e2610" >
+                            <attributelist id="11690" addr="0x7fca469e2610" >
+                                <attribute name="name" value="getPercent" id="11691" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="11692" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e0870" id="11693" addr="0x7fca469e0870" />
+                                <attribute name="kind" value="function" id="11694" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getPercent" id="11695" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="11696" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="11697" addr="0x7fca46934c90" />
+                                <attribute name="type" value="float" id="11698" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="11699" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="11700" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="11701" addr="0x7fca469e2910" >
+                            <attributelist id="11702" addr="0x7fca469e2910" >
+                                <attribute name="name" value="setPercent" id="11703" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="11704" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e0870" id="11705" addr="0x7fca469e0870" />
+                                <attribute name="kind" value="function" id="11706" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setPercent" id="11707" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(float)." id="11708" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="11709" addr="0x7fca46934c90" />
+                                <parmlist id="11710" addr="0x7fca469e2850" >
                                     <parm id="11711">
-                                        <attributelist id="11712" addr="0x7f99f1e94850" >
-                                            <attribute name="name" value="pct" id="11713" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="float" id="11714" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11712" addr="0x7fca469e2850" >
+                                            <attribute name="name" value="pct" id="11713" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="float" id="11714" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="11715" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="11716" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="11717" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="11715" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="11716" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="11717" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="11718" addr="0x7f99f1e94b10" >
-                            <attributelist id="11719" addr="0x7f99f1e94b10" >
-                                <attribute name="name" value="getInt" id="11720" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="11721" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e92870" id="11722" addr="0x7f99f1e92870" />
-                                <attribute name="kind" value="function" id="11723" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getInt" id="11724" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="11725" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="11726" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="int" id="11727" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="11728" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="11729" addr="0x7f99f1de6c90" />
+                        <cdecl id="11718" addr="0x7fca469e2b10" >
+                            <attributelist id="11719" addr="0x7fca469e2b10" >
+                                <attribute name="name" value="getInt" id="11720" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="11721" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e0870" id="11722" addr="0x7fca469e0870" />
+                                <attribute name="kind" value="function" id="11723" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getInt" id="11724" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="11725" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="11726" addr="0x7fca46934c90" />
+                                <attribute name="type" value="int" id="11727" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="11728" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="11729" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="11730" addr="0x7f99f1e95170" >
-                            <attributelist id="11731" addr="0x7f99f1e95170" >
-                                <attribute name="name" value="setInt" id="11732" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="11733" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e92870" id="11734" addr="0x7f99f1e92870" />
-                                <attribute name="kind" value="function" id="11735" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setInt" id="11736" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(int,int,int,int)." id="11737" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="11738" addr="0x7f99f1de6c90" />
-                                <parmlist id="11739" addr="0x7f99f1e94d50" >
+                        <cdecl id="11730" addr="0x7fca469e3170" >
+                            <attributelist id="11731" addr="0x7fca469e3170" >
+                                <attribute name="name" value="setInt" id="11732" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="11733" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e0870" id="11734" addr="0x7fca469e0870" />
+                                <attribute name="kind" value="function" id="11735" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setInt" id="11736" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(int,int,int,int)." id="11737" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="11738" addr="0x7fca46934c90" />
+                                <parmlist id="11739" addr="0x7fca469e2d50" >
                                     <parm id="11740">
-                                        <attributelist id="11741" addr="0x7f99f1e94d50" >
-                                            <attribute name="name" value="value" id="11742" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="11743" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11741" addr="0x7fca469e2d50" >
+                                            <attribute name="name" value="value" id="11742" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="11743" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11744">
-                                        <attributelist id="11745" addr="0x7f99f1e94e70" >
-                                            <attribute name="name" value="min" id="11746" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="11747" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11745" addr="0x7fca469e2e70" >
+                                            <attribute name="name" value="min" id="11746" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="11747" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11748">
-                                        <attributelist id="11749" addr="0x7f99f1e94f90" >
-                                            <attribute name="name" value="delta" id="11750" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="11751" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11749" addr="0x7fca469e2f90" >
+                                            <attribute name="name" value="delta" id="11750" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="11751" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11752">
-                                        <attributelist id="11753" addr="0x7f99f1e950b0" >
-                                            <attribute name="name" value="max" id="11754" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="11755" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11753" addr="0x7fca469e30b0" >
+                                            <attribute name="name" value="max" id="11754" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="11755" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="11756" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="11757" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="11758" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="11756" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="11757" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="11758" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="11759" addr="0x7f99f1e95370" >
-                            <attributelist id="11760" addr="0x7f99f1e95370" >
-                                <attribute name="name" value="getFloat" id="11761" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="11762" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e92870" id="11763" addr="0x7f99f1e92870" />
-                                <attribute name="kind" value="function" id="11764" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getFloat" id="11765" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="11766" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="11767" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="float" id="11768" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="11769" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="11770" addr="0x7f99f1de6c90" />
+                        <cdecl id="11759" addr="0x7fca469e3370" >
+                            <attributelist id="11760" addr="0x7fca469e3370" >
+                                <attribute name="name" value="getFloat" id="11761" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="11762" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e0870" id="11763" addr="0x7fca469e0870" />
+                                <attribute name="kind" value="function" id="11764" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getFloat" id="11765" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="11766" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="11767" addr="0x7fca46934c90" />
+                                <attribute name="type" value="float" id="11768" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="11769" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="11770" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="11771" addr="0x7f99f1e959d0" >
-                            <attributelist id="11772" addr="0x7f99f1e959d0" >
-                                <attribute name="name" value="setFloat" id="11773" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="11774" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e92870" id="11775" addr="0x7f99f1e92870" />
-                                <attribute name="kind" value="function" id="11776" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setFloat" id="11777" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(float,float,float,float)." id="11778" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="11779" addr="0x7f99f1de6c90" />
-                                <parmlist id="11780" addr="0x7f99f1e955b0" >
+                        <cdecl id="11771" addr="0x7fca469e39d0" >
+                            <attributelist id="11772" addr="0x7fca469e39d0" >
+                                <attribute name="name" value="setFloat" id="11773" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="11774" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e0870" id="11775" addr="0x7fca469e0870" />
+                                <attribute name="kind" value="function" id="11776" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setFloat" id="11777" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(float,float,float,float)." id="11778" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="11779" addr="0x7fca46934c90" />
+                                <parmlist id="11780" addr="0x7fca469e35b0" >
                                     <parm id="11781">
-                                        <attributelist id="11782" addr="0x7f99f1e955b0" >
-                                            <attribute name="name" value="value" id="11783" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="float" id="11784" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11782" addr="0x7fca469e35b0" >
+                                            <attribute name="name" value="value" id="11783" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="float" id="11784" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11785">
-                                        <attributelist id="11786" addr="0x7f99f1e956d0" >
-                                            <attribute name="name" value="min" id="11787" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="float" id="11788" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11786" addr="0x7fca469e36d0" >
+                                            <attribute name="name" value="min" id="11787" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="float" id="11788" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11789">
-                                        <attributelist id="11790" addr="0x7f99f1e957f0" >
-                                            <attribute name="name" value="delta" id="11791" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="float" id="11792" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11790" addr="0x7fca469e37f0" >
+                                            <attribute name="name" value="delta" id="11791" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="float" id="11792" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11793">
-                                        <attributelist id="11794" addr="0x7f99f1e95910" >
-                                            <attribute name="name" value="max" id="11795" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="float" id="11796" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11794" addr="0x7fca469e3910" >
+                                            <attribute name="name" value="max" id="11795" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="float" id="11796" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="11797" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="11798" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="11799" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="11797" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="11798" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="11799" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
@@ -16764,4317 +16764,4317 @@
                 </namespace >
             </namespace >
         </include >
-        <include id="11800" addr="0x7f99f1e95c10" >
-            <attributelist id="11801" addr="0x7f99f1e95c10" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/Dialog.h" id="11802" addr="0x7f99f1de6c90" />
+        <include id="11800" addr="0x7fca469e3c10" >
+            <attributelist id="11801" addr="0x7fca469e3c10" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/Dialog.h" id="11802" addr="0x7fca46934c90" />
             </attributelist >
 
-            <constant id="11803" addr="0x7f99f1e95cd0" >
-                <attributelist id="11804" addr="0x7f99f1e95cd0" >
-                    <attribute name="sym_name" value="INPUT_ALPHANUM" id="11805" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="INPUT_ALPHANUM" id="11806" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="0" id="11807" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="11808" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="0" id="11809" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="11810" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="11811" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="11812" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="11813" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="11814" addr="0x7f99f1e95e30" >
-                <attributelist id="11815" addr="0x7f99f1e95e30" >
-                    <attribute name="sym_name" value="INPUT_NUMERIC" id="11816" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="INPUT_NUMERIC" id="11817" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="1" id="11818" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="11819" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="1" id="11820" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="11821" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="11822" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="11823" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="11824" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="11825" addr="0x7f99f1e95f90" >
-                <attributelist id="11826" addr="0x7f99f1e95f90" >
-                    <attribute name="sym_name" value="INPUT_DATE" id="11827" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="INPUT_DATE" id="11828" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="2" id="11829" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="11830" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="2" id="11831" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="11832" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="11833" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="11834" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="11835" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="11836" addr="0x7f99f1e960f0" >
-                <attributelist id="11837" addr="0x7f99f1e960f0" >
-                    <attribute name="sym_name" value="INPUT_TIME" id="11838" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="INPUT_TIME" id="11839" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="3" id="11840" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="11841" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="3" id="11842" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="11843" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="11844" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="11845" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="11846" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="11847" addr="0x7f99f1e96250" >
-                <attributelist id="11848" addr="0x7f99f1e96250" >
-                    <attribute name="sym_name" value="INPUT_IPADDRESS" id="11849" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="INPUT_IPADDRESS" id="11850" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="4" id="11851" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="11852" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="4" id="11853" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="11854" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="11855" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="11856" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="11857" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="11858" addr="0x7f99f1e963b0" >
-                <attributelist id="11859" addr="0x7f99f1e963b0" >
-                    <attribute name="sym_name" value="INPUT_PASSWORD" id="11860" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="INPUT_PASSWORD" id="11861" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="5" id="11862" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="11863" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="5" id="11864" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="11865" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="11866" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="11867" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="11868" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="11869" addr="0x7f99f1e96510" >
-                <attributelist id="11870" addr="0x7f99f1e96510" >
-                    <attribute name="sym_name" value="PASSWORD_VERIFY" id="11871" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="PASSWORD_VERIFY" id="11872" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="1" id="11873" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="11874" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="1" id="11875" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="11876" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="11877" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="11878" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="11879" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="11880" addr="0x7f99f1e96670" >
-                <attributelist id="11881" addr="0x7f99f1e96670" >
-                    <attribute name="sym_name" value="ALPHANUM_HIDE_INPUT" id="11882" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ALPHANUM_HIDE_INPUT" id="11883" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="2" id="11884" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="11885" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="2" id="11886" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="11887" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="11888" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="11889" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="11890" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <namespace id="11891" addr="0x7f99f1e967b0" >
-                <attributelist id="11892" addr="0x7f99f1e967b0" >
-                    <attribute name="sym_name" value="XBMCAddon" id="11893" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="XBMCAddon" id="11894" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_previousSibling" value="0x7f99f1e54770" id="11895" addr="0x7f99f1e54770" />
-                    <attribute name="csym_nextSibling" value="0x7f99f1dabd50" id="11896" addr="0x7f99f1dabd50" />
-                    <attribute name="sym_nextSibling" value="0x7f99f1dabd50" id="11897" addr="0x7f99f1dabd50" />
-                    <typescope id="11898" addr="0x7f99f1dd1d70" >
-                        <attributelist id="11899" addr="0x7f99f1dd1d70" >
-                            <attribute name="name" value="XBMCAddon" id="11900" addr="0x7f99f1de6c90" />
-                            <typetab id="11901" addr="0x7f99f1dd1db0" >
-                                <attributelist id="11902" addr="0x7f99f1dd1db0" >
-                                    <attribute name="Dictionary" value="Dictionary" id="11903" addr="0x7f99f1de6c90" />
-                                    <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="11904" addr="0x7f99f1de6c90" />
-                                    <attribute name="String" value="std::string" id="11905" addr="0x7f99f1de6c90" />
-                                    <attribute name="StringOrInt" value="XBMCAddon::String" id="11906" addr="0x7f99f1de6c90" />
+            <constant id="11803" addr="0x7fca469e3cd0" >
+                <attributelist id="11804" addr="0x7fca469e3cd0" >
+                    <attribute name="sym_name" value="INPUT_ALPHANUM" id="11805" addr="0x7fca46934c90" />
+                    <attribute name="name" value="INPUT_ALPHANUM" id="11806" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="0" id="11807" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="11808" addr="0x7fca46934c90" />
+                    <attribute name="value" value="0" id="11809" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="11810" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="11811" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="11812" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="11813" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="11814" addr="0x7fca469e3e30" >
+                <attributelist id="11815" addr="0x7fca469e3e30" >
+                    <attribute name="sym_name" value="INPUT_NUMERIC" id="11816" addr="0x7fca46934c90" />
+                    <attribute name="name" value="INPUT_NUMERIC" id="11817" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="1" id="11818" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="11819" addr="0x7fca46934c90" />
+                    <attribute name="value" value="1" id="11820" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="11821" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="11822" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="11823" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="11824" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="11825" addr="0x7fca469e3f90" >
+                <attributelist id="11826" addr="0x7fca469e3f90" >
+                    <attribute name="sym_name" value="INPUT_DATE" id="11827" addr="0x7fca46934c90" />
+                    <attribute name="name" value="INPUT_DATE" id="11828" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="2" id="11829" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="11830" addr="0x7fca46934c90" />
+                    <attribute name="value" value="2" id="11831" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="11832" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="11833" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="11834" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="11835" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="11836" addr="0x7fca469e40f0" >
+                <attributelist id="11837" addr="0x7fca469e40f0" >
+                    <attribute name="sym_name" value="INPUT_TIME" id="11838" addr="0x7fca46934c90" />
+                    <attribute name="name" value="INPUT_TIME" id="11839" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="3" id="11840" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="11841" addr="0x7fca46934c90" />
+                    <attribute name="value" value="3" id="11842" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="11843" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="11844" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="11845" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="11846" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="11847" addr="0x7fca469e4250" >
+                <attributelist id="11848" addr="0x7fca469e4250" >
+                    <attribute name="sym_name" value="INPUT_IPADDRESS" id="11849" addr="0x7fca46934c90" />
+                    <attribute name="name" value="INPUT_IPADDRESS" id="11850" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="4" id="11851" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="11852" addr="0x7fca46934c90" />
+                    <attribute name="value" value="4" id="11853" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="11854" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="11855" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="11856" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="11857" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="11858" addr="0x7fca469e43b0" >
+                <attributelist id="11859" addr="0x7fca469e43b0" >
+                    <attribute name="sym_name" value="INPUT_PASSWORD" id="11860" addr="0x7fca46934c90" />
+                    <attribute name="name" value="INPUT_PASSWORD" id="11861" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="5" id="11862" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="11863" addr="0x7fca46934c90" />
+                    <attribute name="value" value="5" id="11864" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="11865" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="11866" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="11867" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="11868" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="11869" addr="0x7fca469e4510" >
+                <attributelist id="11870" addr="0x7fca469e4510" >
+                    <attribute name="sym_name" value="PASSWORD_VERIFY" id="11871" addr="0x7fca46934c90" />
+                    <attribute name="name" value="PASSWORD_VERIFY" id="11872" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="1" id="11873" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="11874" addr="0x7fca46934c90" />
+                    <attribute name="value" value="1" id="11875" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="11876" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="11877" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="11878" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="11879" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="11880" addr="0x7fca469e4670" >
+                <attributelist id="11881" addr="0x7fca469e4670" >
+                    <attribute name="sym_name" value="ALPHANUM_HIDE_INPUT" id="11882" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ALPHANUM_HIDE_INPUT" id="11883" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="2" id="11884" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="11885" addr="0x7fca46934c90" />
+                    <attribute name="value" value="2" id="11886" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="11887" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="11888" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="11889" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="11890" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <namespace id="11891" addr="0x7fca469e47b0" >
+                <attributelist id="11892" addr="0x7fca469e47b0" >
+                    <attribute name="sym_name" value="XBMCAddon" id="11893" addr="0x7fca46934c90" />
+                    <attribute name="name" value="XBMCAddon" id="11894" addr="0x7fca46934c90" />
+                    <attribute name="sym_previousSibling" value="0x7fca469a2770" id="11895" addr="0x7fca469a2770" />
+                    <attribute name="csym_nextSibling" value="0x7fca468f9d50" id="11896" addr="0x7fca468f9d50" />
+                    <attribute name="sym_nextSibling" value="0x7fca468f9d50" id="11897" addr="0x7fca468f9d50" />
+                    <typescope id="11898" addr="0x7fca4691fd70" >
+                        <attributelist id="11899" addr="0x7fca4691fd70" >
+                            <attribute name="name" value="XBMCAddon" id="11900" addr="0x7fca46934c90" />
+                            <typetab id="11901" addr="0x7fca4691fdb0" >
+                                <attributelist id="11902" addr="0x7fca4691fdb0" >
+                                    <attribute name="Dictionary" value="Dictionary" id="11903" addr="0x7fca46934c90" />
+                                    <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="11904" addr="0x7fca46934c90" />
+                                    <attribute name="String" value="std::string" id="11905" addr="0x7fca46934c90" />
+                                    <attribute name="StringOrInt" value="XBMCAddon::String" id="11906" addr="0x7fca46934c90" />
                                 </attributelist >
-                                <typetabsitem id="11907" addr="0x7f99f1dd28b0" >
-                                    <attributelist id="11908" addr="0x7f99f1dd28b0" >
+                                <typetabsitem id="11907" addr="0x7fca469208b0" >
+                                    <attributelist id="11908" addr="0x7fca469208b0" >
                                     </attributelist >
                                 </typetabsitem >
-                                <typetabsitem id="11909" addr="0x7f99f1dd2910" >
-                                    <attributelist id="11910" addr="0x7f99f1dd2910" >
+                                <typetabsitem id="11909" addr="0x7fca46920910" >
+                                    <attributelist id="11910" addr="0x7fca46920910" >
                                     </attributelist >
                                 </typetabsitem >
-                                <typetabsitem id="11911" addr="0x7f99f1dd1f90" >
-                                    <attributelist id="11912" addr="0x7f99f1dd1f90" >
+                                <typetabsitem id="11911" addr="0x7fca4691ff90" >
+                                    <attributelist id="11912" addr="0x7fca4691ff90" >
                                     </attributelist >
                                 </typetabsitem >
-                                <typetabsitem id="11913" addr="0x7f99f1dd2710" >
-                                    <attributelist id="11914" addr="0x7f99f1dd2710" >
+                                <typetabsitem id="11913" addr="0x7fca46920710" >
+                                    <attributelist id="11914" addr="0x7fca46920710" >
                                     </attributelist >
                                 </typetabsitem >
                             </typetab >
-                            <attribute name="parent" value="0x7f99f1e1da30" id="11915" addr="0x7f99f1e1da30" />
-                            <attribute name="qname" value="XBMCAddon" id="11916" addr="0x7f99f1de6c90" />
-                            <attribute name="symtab" value="0x7f99f1e408b0" id="11917" addr="0x7f99f1e408b0" />
+                            <attribute name="parent" value="0x7fca4696ba30" id="11915" addr="0x7fca4696ba30" />
+                            <attribute name="qname" value="XBMCAddon" id="11916" addr="0x7fca46934c90" />
+                            <attribute name="symtab" value="0x7fca4698e8b0" id="11917" addr="0x7fca4698e8b0" />
                         </attributelist >
-                        <typescopesitem id="11918" addr="0x7f99f1e40870" >
-                            <attributelist id="11919" addr="0x7f99f1e40870" >
+                        <typescopesitem id="11918" addr="0x7fca4698e870" >
+                            <attributelist id="11919" addr="0x7fca4698e870" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="11920" addr="0x7f99f1dd1db0" >
-                            <attributelist id="11921" addr="0x7f99f1dd1db0" >
-                                <attribute name="Dictionary" value="Dictionary" id="11922" addr="0x7f99f1de6c90" />
-                                <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="11923" addr="0x7f99f1de6c90" />
-                                <attribute name="String" value="std::string" id="11924" addr="0x7f99f1de6c90" />
-                                <attribute name="StringOrInt" value="XBMCAddon::String" id="11925" addr="0x7f99f1de6c90" />
+                        <typescopesitem id="11920" addr="0x7fca4691fdb0" >
+                            <attributelist id="11921" addr="0x7fca4691fdb0" >
+                                <attribute name="Dictionary" value="Dictionary" id="11922" addr="0x7fca46934c90" />
+                                <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="11923" addr="0x7fca46934c90" />
+                                <attribute name="String" value="std::string" id="11924" addr="0x7fca46934c90" />
+                                <attribute name="StringOrInt" value="XBMCAddon::String" id="11925" addr="0x7fca46934c90" />
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="11926" addr="0x7f99f1e1da30" >
-                            <attributelist id="11927" addr="0x7f99f1e1da30" >
-                                <attribute name="name" value="" id="11928" addr="0x7f99f1de6c90" />
-                                <typetab id="11929" addr="0x7f99f1e1da90" >
-                                    <attributelist id="11930" addr="0x7f99f1e1da90" >
+                        <typescopesitem id="11926" addr="0x7fca4696ba30" >
+                            <attributelist id="11927" addr="0x7fca4696ba30" >
+                                <attribute name="name" value="" id="11928" addr="0x7fca46934c90" />
+                                <typetab id="11929" addr="0x7fca4696ba90" >
+                                    <attributelist id="11930" addr="0x7fca4696ba90" >
                                     </attributelist >
                                 </typetab >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="11931" addr="0x7f99f1dd1eb0" >
-                            <attributelist id="11932" addr="0x7f99f1dd1eb0" >
+                        <typescopesitem id="11931" addr="0x7fca4691feb0" >
+                            <attributelist id="11932" addr="0x7fca4691feb0" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="11933" addr="0x7f99f1e408b0" >
-                            <attributelist id="11934" addr="0x7f99f1e408b0" >
-                                <attribute name="name" value="XBMCAddon" id="11935" addr="0x7f99f1de6c90" />
-                                <attribute name="csymtab" value="0x7f99f1e408f0" id="11936" addr="0x7f99f1e408f0" />
-                                <attribute name="symtab" value="0x7f99f1e40890" id="11937" addr="0x7f99f1e40890" />
+                        <typescopesitem id="11933" addr="0x7fca4698e8b0" >
+                            <attributelist id="11934" addr="0x7fca4698e8b0" >
+                                <attribute name="name" value="XBMCAddon" id="11935" addr="0x7fca46934c90" />
+                                <attribute name="csymtab" value="0x7fca4698e8f0" id="11936" addr="0x7fca4698e8f0" />
+                                <attribute name="symtab" value="0x7fca4698e890" id="11937" addr="0x7fca4698e890" />
                             </attributelist >
                         </typescopesitem >
                     </typescope >
-                    <attribute name="symtab" value="0x7f99f1e408b0" id="11938" addr="0x7f99f1e408b0" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="11939" addr="0x7f99f1e1d950" />
+                    <attribute name="symtab" value="0x7fca4698e8b0" id="11938" addr="0x7fca4698e8b0" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="11939" addr="0x7fca4696b950" />
                 </attributelist >
 
-                <namespace id="11940" addr="0x7f99f1e96830" >
-                    <attributelist id="11941" addr="0x7f99f1e96830" >
-                        <attribute name="feature_knownbasetypes" value="AddonClass,AddonCallback" id="11942" addr="0x7f99f1de6c90" />
-                        <attribute name="name" value="xbmcgui" id="11943" addr="0x7f99f1de6c90" />
-                        <attribute name="sym_symtab" value="0x7f99f1e408b0" id="11944" addr="0x7f99f1e408b0" />
-                        <attribute name="symtab" value="0x7f99f1e40fb0" id="11945" addr="0x7f99f1e40fb0" />
-                        <attribute name="sym_nextSibling" value="0x7f99f1dabdd0" id="11946" addr="0x7f99f1dabdd0" />
-                        <attribute name="csym_nextSibling" value="0x7f99f1dabdd0" id="11947" addr="0x7f99f1dabdd0" />
-                        <attribute name="sym_previousSibling" value="0x7f99f1e547f0" id="11948" addr="0x7f99f1e547f0" />
-                        <attribute name="feature_knownapitypes" value="XBMCAddon::xbmc::InfoTagVideo,xbmc::InfoTagMusic" id="11949" addr="0x7f99f1de6c90" />
-                        <attribute name="sym_name" value="xbmcgui" id="11950" addr="0x7f99f1de6c90" />
-                        <typescope id="11951" addr="0x7f99f1dd2150" >
-                            <attributelist id="11952" addr="0x7f99f1dd2150" >
-                                <attribute name="name" value="xbmcgui" id="11953" addr="0x7f99f1de6c90" />
-                                <typetab id="11954" addr="0x7f99f1dd2170" >
-                                    <attributelist id="11955" addr="0x7f99f1dd2170" >
-                                        <attribute name="InterceptorBase" value="InterceptorBase" id="11956" addr="0x7f99f1de6c90" />
-                                        <attribute name="Dialog" value="Dialog" id="11957" addr="0x7f99f1de6c90" />
-                                        <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="11958" addr="0x7f99f1de6c90" />
-                                        <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="11959" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlTextBox" value="ControlTextBox" id="11960" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlRadioButton" value="ControlRadioButton" id="11961" addr="0x7f99f1de6c90" />
-                                        <attribute name="Window" value="Window" id="11962" addr="0x7f99f1de6c90" />
-                                        <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="11963" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlList" value="ControlList" id="11964" addr="0x7f99f1de6c90" />
-                                        <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="11965" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlImage" value="ControlImage" id="11966" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlButton" value="ControlButton" id="11967" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlGroup" value="ControlGroup" id="11968" addr="0x7f99f1de6c90" />
-                                        <attribute name="DialogBusy" value="DialogBusy" id="11969" addr="0x7f99f1de6c90" />
-                                        <attribute name="DialogProgressBG" value="DialogProgressBG" id="11970" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlSpin" value="ControlSpin" id="11971" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlEdit" value="ControlEdit" id="11972" addr="0x7f99f1de6c90" />
-                                        <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="11973" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="11974" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlLabel" value="ControlLabel" id="11975" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlProgress" value="ControlProgress" id="11976" addr="0x7f99f1de6c90" />
-                                        <attribute name="Control" value="Control" id="11977" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlSlider" value="ControlSlider" id="11978" addr="0x7f99f1de6c90" />
-                                        <attribute name="DialogProgress" value="DialogProgress" id="11979" addr="0x7f99f1de6c90" />
-                                        <attribute name="Action" value="Action" id="11980" addr="0x7f99f1de6c90" />
-                                        <attribute name="WindowDialog" value="WindowDialog" id="11981" addr="0x7f99f1de6c90" />
-                                        <attribute name="WindowXML" value="WindowXML" id="11982" addr="0x7f99f1de6c90" />
-                                        <attribute name="ListItem" value="ListItem" id="11983" addr="0x7f99f1de6c90" />
-                                        <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="11984" addr="0x7f99f1de6c90" />
+                <namespace id="11940" addr="0x7fca469e4830" >
+                    <attributelist id="11941" addr="0x7fca469e4830" >
+                        <attribute name="feature_knownbasetypes" value="AddonClass,AddonCallback" id="11942" addr="0x7fca46934c90" />
+                        <attribute name="name" value="xbmcgui" id="11943" addr="0x7fca46934c90" />
+                        <attribute name="sym_symtab" value="0x7fca4698e8b0" id="11944" addr="0x7fca4698e8b0" />
+                        <attribute name="symtab" value="0x7fca4698efb0" id="11945" addr="0x7fca4698efb0" />
+                        <attribute name="sym_nextSibling" value="0x7fca468f9dd0" id="11946" addr="0x7fca468f9dd0" />
+                        <attribute name="csym_nextSibling" value="0x7fca468f9dd0" id="11947" addr="0x7fca468f9dd0" />
+                        <attribute name="sym_previousSibling" value="0x7fca469a27f0" id="11948" addr="0x7fca469a27f0" />
+                        <attribute name="feature_knownapitypes" value="XBMCAddon::xbmc::InfoTagVideo,xbmc::InfoTagMusic" id="11949" addr="0x7fca46934c90" />
+                        <attribute name="sym_name" value="xbmcgui" id="11950" addr="0x7fca46934c90" />
+                        <typescope id="11951" addr="0x7fca46920150" >
+                            <attributelist id="11952" addr="0x7fca46920150" >
+                                <attribute name="name" value="xbmcgui" id="11953" addr="0x7fca46934c90" />
+                                <typetab id="11954" addr="0x7fca46920170" >
+                                    <attributelist id="11955" addr="0x7fca46920170" >
+                                        <attribute name="InterceptorBase" value="InterceptorBase" id="11956" addr="0x7fca46934c90" />
+                                        <attribute name="Dialog" value="Dialog" id="11957" addr="0x7fca46934c90" />
+                                        <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="11958" addr="0x7fca46934c90" />
+                                        <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="11959" addr="0x7fca46934c90" />
+                                        <attribute name="ControlTextBox" value="ControlTextBox" id="11960" addr="0x7fca46934c90" />
+                                        <attribute name="ControlRadioButton" value="ControlRadioButton" id="11961" addr="0x7fca46934c90" />
+                                        <attribute name="Window" value="Window" id="11962" addr="0x7fca46934c90" />
+                                        <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="11963" addr="0x7fca46934c90" />
+                                        <attribute name="ControlList" value="ControlList" id="11964" addr="0x7fca46934c90" />
+                                        <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="11965" addr="0x7fca46934c90" />
+                                        <attribute name="ControlImage" value="ControlImage" id="11966" addr="0x7fca46934c90" />
+                                        <attribute name="ControlButton" value="ControlButton" id="11967" addr="0x7fca46934c90" />
+                                        <attribute name="ControlGroup" value="ControlGroup" id="11968" addr="0x7fca46934c90" />
+                                        <attribute name="DialogBusy" value="DialogBusy" id="11969" addr="0x7fca46934c90" />
+                                        <attribute name="DialogProgressBG" value="DialogProgressBG" id="11970" addr="0x7fca46934c90" />
+                                        <attribute name="ControlSpin" value="ControlSpin" id="11971" addr="0x7fca46934c90" />
+                                        <attribute name="ControlEdit" value="ControlEdit" id="11972" addr="0x7fca46934c90" />
+                                        <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="11973" addr="0x7fca46934c90" />
+                                        <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="11974" addr="0x7fca46934c90" />
+                                        <attribute name="ControlLabel" value="ControlLabel" id="11975" addr="0x7fca46934c90" />
+                                        <attribute name="ControlProgress" value="ControlProgress" id="11976" addr="0x7fca46934c90" />
+                                        <attribute name="Control" value="Control" id="11977" addr="0x7fca46934c90" />
+                                        <attribute name="ControlSlider" value="ControlSlider" id="11978" addr="0x7fca46934c90" />
+                                        <attribute name="DialogProgress" value="DialogProgress" id="11979" addr="0x7fca46934c90" />
+                                        <attribute name="Action" value="Action" id="11980" addr="0x7fca46934c90" />
+                                        <attribute name="WindowDialog" value="WindowDialog" id="11981" addr="0x7fca46934c90" />
+                                        <attribute name="WindowXML" value="WindowXML" id="11982" addr="0x7fca46934c90" />
+                                        <attribute name="ListItem" value="ListItem" id="11983" addr="0x7fca46934c90" />
+                                        <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="11984" addr="0x7fca46934c90" />
                                     </attributelist >
-                                    <typetabsitem id="11985" addr="0x7f99f1de1dd0" >
-                                        <attributelist id="11986" addr="0x7f99f1de1dd0" >
+                                    <typetabsitem id="11985" addr="0x7fca4692fdd0" >
+                                        <attributelist id="11986" addr="0x7fca4692fdd0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="11987" addr="0x7f99f1dde790" >
-                                        <attributelist id="11988" addr="0x7f99f1dde790" >
+                                    <typetabsitem id="11987" addr="0x7fca4692c790" >
+                                        <attributelist id="11988" addr="0x7fca4692c790" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="11989" addr="0x7f99f1de3f10" >
-                                        <attributelist id="11990" addr="0x7f99f1de3f10" >
+                                    <typetabsitem id="11989" addr="0x7fca46931f10" >
+                                        <attributelist id="11990" addr="0x7fca46931f10" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="11991" addr="0x7f99f1dd67b0" >
-                                        <attributelist id="11992" addr="0x7f99f1dd67b0" >
+                                    <typetabsitem id="11991" addr="0x7fca469247b0" >
+                                        <attributelist id="11992" addr="0x7fca469247b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="11993" addr="0x7f99f1ddafd0" >
-                                        <attributelist id="11994" addr="0x7f99f1ddafd0" >
+                                    <typetabsitem id="11993" addr="0x7fca46928fd0" >
+                                        <attributelist id="11994" addr="0x7fca46928fd0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="11995" addr="0x7f99f1ddd430" >
-                                        <attributelist id="11996" addr="0x7f99f1ddd430" >
+                                    <typetabsitem id="11995" addr="0x7fca4692b430" >
+                                        <attributelist id="11996" addr="0x7fca4692b430" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="11997" addr="0x7f99f1de2130" >
-                                        <attributelist id="11998" addr="0x7f99f1de2130" >
+                                    <typetabsitem id="11997" addr="0x7fca46930130" >
+                                        <attributelist id="11998" addr="0x7fca46930130" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="11999" addr="0x7f99f1dd2f50" >
-                                        <attributelist id="12000" addr="0x7f99f1dd2f50" >
+                                    <typetabsitem id="11999" addr="0x7fca46920f50" >
+                                        <attributelist id="12000" addr="0x7fca46920f50" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="12001" addr="0x7f99f1dd9650" >
-                                        <attributelist id="12002" addr="0x7f99f1dd9650" >
+                                    <typetabsitem id="12001" addr="0x7fca46927650" >
+                                        <attributelist id="12002" addr="0x7fca46927650" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="12003" addr="0x7f99f1de3390" >
-                                        <attributelist id="12004" addr="0x7f99f1de3390" >
+                                    <typetabsitem id="12003" addr="0x7fca46931390" >
+                                        <attributelist id="12004" addr="0x7fca46931390" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="12005" addr="0x7f99f1ddb7b0" >
-                                        <attributelist id="12006" addr="0x7f99f1ddb7b0" >
+                                    <typetabsitem id="12005" addr="0x7fca469297b0" >
+                                        <attributelist id="12006" addr="0x7fca469297b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="12007" addr="0x7f99f1ddc4b0" >
-                                        <attributelist id="12008" addr="0x7f99f1ddc4b0" >
+                                    <typetabsitem id="12007" addr="0x7fca4692a4b0" >
+                                        <attributelist id="12008" addr="0x7fca4692a4b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="12009" addr="0x7f99f1ddcf90" >
-                                        <attributelist id="12010" addr="0x7f99f1ddcf90" >
+                                    <typetabsitem id="12009" addr="0x7fca4692af90" >
+                                        <attributelist id="12010" addr="0x7fca4692af90" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="12011" addr="0x7f99f1de11b0" >
-                                        <attributelist id="12012" addr="0x7f99f1de11b0" >
+                                    <typetabsitem id="12011" addr="0x7fca4692f1b0" >
+                                        <attributelist id="12012" addr="0x7fca4692f1b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="12013" addr="0x7f99f1de15b0" >
-                                        <attributelist id="12014" addr="0x7f99f1de15b0" >
+                                    <typetabsitem id="12013" addr="0x7fca4692f5b0" >
+                                        <attributelist id="12014" addr="0x7fca4692f5b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="12015" addr="0x7f99f1dd77f0" >
-                                        <attributelist id="12016" addr="0x7f99f1dd77f0" >
+                                    <typetabsitem id="12015" addr="0x7fca469257f0" >
+                                        <attributelist id="12016" addr="0x7fca469257f0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="12017" addr="0x7f99f1dd8b30" >
-                                        <attributelist id="12018" addr="0x7f99f1dd8b30" >
+                                    <typetabsitem id="12017" addr="0x7fca46926b30" >
+                                        <attributelist id="12018" addr="0x7fca46926b30" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="12019" addr="0x7f99f1dd2c50" >
-                                        <attributelist id="12020" addr="0x7f99f1dd2c50" >
+                                    <typetabsitem id="12019" addr="0x7fca46920c50" >
+                                        <attributelist id="12020" addr="0x7fca46920c50" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="12021" addr="0x7f99f1dda790" >
-                                        <attributelist id="12022" addr="0x7f99f1dda790" >
+                                    <typetabsitem id="12021" addr="0x7fca46928790" >
+                                        <attributelist id="12022" addr="0x7fca46928790" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="12023" addr="0x7f99f1dd8030" >
-                                        <attributelist id="12024" addr="0x7f99f1dd8030" >
+                                    <typetabsitem id="12023" addr="0x7fca46926030" >
+                                        <attributelist id="12024" addr="0x7fca46926030" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="12025" addr="0x7f99f1ddbe10" >
-                                        <attributelist id="12026" addr="0x7f99f1ddbe10" >
+                                    <typetabsitem id="12025" addr="0x7fca46929e10" >
+                                        <attributelist id="12026" addr="0x7fca46929e10" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="12027" addr="0x7f99f1dd6b10" >
-                                        <attributelist id="12028" addr="0x7f99f1dd6b10" >
+                                    <typetabsitem id="12027" addr="0x7fca46924b10" >
+                                        <attributelist id="12028" addr="0x7fca46924b10" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="12029" addr="0x7f99f1dddf90" >
-                                        <attributelist id="12030" addr="0x7f99f1dddf90" >
+                                    <typetabsitem id="12029" addr="0x7fca4692bf90" >
+                                        <attributelist id="12030" addr="0x7fca4692bf90" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="12031" addr="0x7f99f1de0530" >
-                                        <attributelist id="12032" addr="0x7f99f1de0530" >
+                                    <typetabsitem id="12031" addr="0x7fca4692e530" >
+                                        <attributelist id="12032" addr="0x7fca4692e530" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="12033" addr="0x7f99f1de1e50" >
-                                        <attributelist id="12034" addr="0x7f99f1de1e50" >
+                                    <typetabsitem id="12033" addr="0x7fca4692fe50" >
+                                        <attributelist id="12034" addr="0x7fca4692fe50" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="12035" addr="0x7f99f1de2d90" >
-                                        <attributelist id="12036" addr="0x7f99f1de2d90" >
+                                    <typetabsitem id="12035" addr="0x7fca46930d90" >
+                                        <attributelist id="12036" addr="0x7fca46930d90" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="12037" addr="0x7f99f1de3410" >
-                                        <attributelist id="12038" addr="0x7f99f1de3410" >
+                                    <typetabsitem id="12037" addr="0x7fca46931410" >
+                                        <attributelist id="12038" addr="0x7fca46931410" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="12039" addr="0x7f99f1dd3590" >
-                                        <attributelist id="12040" addr="0x7f99f1dd3590" >
+                                    <typetabsitem id="12039" addr="0x7fca46921590" >
+                                        <attributelist id="12040" addr="0x7fca46921590" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="12041" addr="0x7f99f1dd3390" >
-                                        <attributelist id="12042" addr="0x7f99f1dd3390" >
+                                    <typetabsitem id="12041" addr="0x7fca46921390" >
+                                        <attributelist id="12042" addr="0x7fca46921390" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
-                                <attribute name="parent" value="0x7f99f1dd1d70" id="12043" addr="0x7f99f1dd1d70" />
-                                <attribute name="qname" value="XBMCAddon::xbmcgui" id="12044" addr="0x7f99f1de6c90" />
-                                <attribute name="symtab" value="0x7f99f1e40fb0" id="12045" addr="0x7f99f1e40fb0" />
+                                <attribute name="parent" value="0x7fca4691fd70" id="12043" addr="0x7fca4691fd70" />
+                                <attribute name="qname" value="XBMCAddon::xbmcgui" id="12044" addr="0x7fca46934c90" />
+                                <attribute name="symtab" value="0x7fca4698efb0" id="12045" addr="0x7fca4698efb0" />
                             </attributelist >
-                            <typescopesitem id="12046" addr="0x7f99f1e40f70" >
-                                <attributelist id="12047" addr="0x7f99f1e40f70" >
+                            <typescopesitem id="12046" addr="0x7fca4698ef70" >
+                                <attributelist id="12047" addr="0x7fca4698ef70" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="12048" addr="0x7f99f1dd2170" >
-                                <attributelist id="12049" addr="0x7f99f1dd2170" >
-                                    <attribute name="InterceptorBase" value="InterceptorBase" id="12050" addr="0x7f99f1de6c90" />
-                                    <attribute name="Dialog" value="Dialog" id="12051" addr="0x7f99f1de6c90" />
-                                    <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="12052" addr="0x7f99f1de6c90" />
-                                    <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="12053" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlTextBox" value="ControlTextBox" id="12054" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlRadioButton" value="ControlRadioButton" id="12055" addr="0x7f99f1de6c90" />
-                                    <attribute name="Window" value="Window" id="12056" addr="0x7f99f1de6c90" />
-                                    <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="12057" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlList" value="ControlList" id="12058" addr="0x7f99f1de6c90" />
-                                    <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="12059" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlImage" value="ControlImage" id="12060" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlButton" value="ControlButton" id="12061" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlGroup" value="ControlGroup" id="12062" addr="0x7f99f1de6c90" />
-                                    <attribute name="DialogBusy" value="DialogBusy" id="12063" addr="0x7f99f1de6c90" />
-                                    <attribute name="DialogProgressBG" value="DialogProgressBG" id="12064" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlSpin" value="ControlSpin" id="12065" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlEdit" value="ControlEdit" id="12066" addr="0x7f99f1de6c90" />
-                                    <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="12067" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="12068" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlLabel" value="ControlLabel" id="12069" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlProgress" value="ControlProgress" id="12070" addr="0x7f99f1de6c90" />
-                                    <attribute name="Control" value="Control" id="12071" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlSlider" value="ControlSlider" id="12072" addr="0x7f99f1de6c90" />
-                                    <attribute name="DialogProgress" value="DialogProgress" id="12073" addr="0x7f99f1de6c90" />
-                                    <attribute name="Action" value="Action" id="12074" addr="0x7f99f1de6c90" />
-                                    <attribute name="WindowDialog" value="WindowDialog" id="12075" addr="0x7f99f1de6c90" />
-                                    <attribute name="WindowXML" value="WindowXML" id="12076" addr="0x7f99f1de6c90" />
-                                    <attribute name="ListItem" value="ListItem" id="12077" addr="0x7f99f1de6c90" />
-                                    <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="12078" addr="0x7f99f1de6c90" />
+                            <typescopesitem id="12048" addr="0x7fca46920170" >
+                                <attributelist id="12049" addr="0x7fca46920170" >
+                                    <attribute name="InterceptorBase" value="InterceptorBase" id="12050" addr="0x7fca46934c90" />
+                                    <attribute name="Dialog" value="Dialog" id="12051" addr="0x7fca46934c90" />
+                                    <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="12052" addr="0x7fca46934c90" />
+                                    <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="12053" addr="0x7fca46934c90" />
+                                    <attribute name="ControlTextBox" value="ControlTextBox" id="12054" addr="0x7fca46934c90" />
+                                    <attribute name="ControlRadioButton" value="ControlRadioButton" id="12055" addr="0x7fca46934c90" />
+                                    <attribute name="Window" value="Window" id="12056" addr="0x7fca46934c90" />
+                                    <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="12057" addr="0x7fca46934c90" />
+                                    <attribute name="ControlList" value="ControlList" id="12058" addr="0x7fca46934c90" />
+                                    <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="12059" addr="0x7fca46934c90" />
+                                    <attribute name="ControlImage" value="ControlImage" id="12060" addr="0x7fca46934c90" />
+                                    <attribute name="ControlButton" value="ControlButton" id="12061" addr="0x7fca46934c90" />
+                                    <attribute name="ControlGroup" value="ControlGroup" id="12062" addr="0x7fca46934c90" />
+                                    <attribute name="DialogBusy" value="DialogBusy" id="12063" addr="0x7fca46934c90" />
+                                    <attribute name="DialogProgressBG" value="DialogProgressBG" id="12064" addr="0x7fca46934c90" />
+                                    <attribute name="ControlSpin" value="ControlSpin" id="12065" addr="0x7fca46934c90" />
+                                    <attribute name="ControlEdit" value="ControlEdit" id="12066" addr="0x7fca46934c90" />
+                                    <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="12067" addr="0x7fca46934c90" />
+                                    <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="12068" addr="0x7fca46934c90" />
+                                    <attribute name="ControlLabel" value="ControlLabel" id="12069" addr="0x7fca46934c90" />
+                                    <attribute name="ControlProgress" value="ControlProgress" id="12070" addr="0x7fca46934c90" />
+                                    <attribute name="Control" value="Control" id="12071" addr="0x7fca46934c90" />
+                                    <attribute name="ControlSlider" value="ControlSlider" id="12072" addr="0x7fca46934c90" />
+                                    <attribute name="DialogProgress" value="DialogProgress" id="12073" addr="0x7fca46934c90" />
+                                    <attribute name="Action" value="Action" id="12074" addr="0x7fca46934c90" />
+                                    <attribute name="WindowDialog" value="WindowDialog" id="12075" addr="0x7fca46934c90" />
+                                    <attribute name="WindowXML" value="WindowXML" id="12076" addr="0x7fca46934c90" />
+                                    <attribute name="ListItem" value="ListItem" id="12077" addr="0x7fca46934c90" />
+                                    <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="12078" addr="0x7fca46934c90" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="12079" addr="0x7f99f1dd1d70" >
-                                <attributelist id="12080" addr="0x7f99f1dd1d70" >
-                                    <attribute name="name" value="XBMCAddon" id="12081" addr="0x7f99f1de6c90" />
-                                    <typetab id="12082" addr="0x7f99f1dd1db0" >
-                                        <attributelist id="12083" addr="0x7f99f1dd1db0" >
-                                            <attribute name="Dictionary" value="Dictionary" id="12084" addr="0x7f99f1de6c90" />
-                                            <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="12085" addr="0x7f99f1de6c90" />
-                                            <attribute name="String" value="std::string" id="12086" addr="0x7f99f1de6c90" />
-                                            <attribute name="StringOrInt" value="XBMCAddon::String" id="12087" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                        <typetabsitem id="12088" addr="0x7f99f1dd28b0" >
-                                            <attributelist id="12089" addr="0x7f99f1dd28b0" >
+                            <typescopesitem id="12079" addr="0x7fca4691fd70" >
+                                <attributelist id="12080" addr="0x7fca4691fd70" >
+                                    <attribute name="name" value="XBMCAddon" id="12081" addr="0x7fca46934c90" />
+                                    <typetab id="12082" addr="0x7fca4691fdb0" >
+                                        <attributelist id="12083" addr="0x7fca4691fdb0" >
+                                            <attribute name="Dictionary" value="Dictionary" id="12084" addr="0x7fca46934c90" />
+                                            <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="12085" addr="0x7fca46934c90" />
+                                            <attribute name="String" value="std::string" id="12086" addr="0x7fca46934c90" />
+                                            <attribute name="StringOrInt" value="XBMCAddon::String" id="12087" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                        <typetabsitem id="12088" addr="0x7fca469208b0" >
+                                            <attributelist id="12089" addr="0x7fca469208b0" >
                                             </attributelist >
                                         </typetabsitem >
-                                        <typetabsitem id="12090" addr="0x7f99f1dd2910" >
-                                            <attributelist id="12091" addr="0x7f99f1dd2910" >
+                                        <typetabsitem id="12090" addr="0x7fca46920910" >
+                                            <attributelist id="12091" addr="0x7fca46920910" >
                                             </attributelist >
                                         </typetabsitem >
-                                        <typetabsitem id="12092" addr="0x7f99f1dd1f90" >
-                                            <attributelist id="12093" addr="0x7f99f1dd1f90" >
+                                        <typetabsitem id="12092" addr="0x7fca4691ff90" >
+                                            <attributelist id="12093" addr="0x7fca4691ff90" >
                                             </attributelist >
                                         </typetabsitem >
-                                        <typetabsitem id="12094" addr="0x7f99f1dd2710" >
-                                            <attributelist id="12095" addr="0x7f99f1dd2710" >
+                                        <typetabsitem id="12094" addr="0x7fca46920710" >
+                                            <attributelist id="12095" addr="0x7fca46920710" >
                                             </attributelist >
                                         </typetabsitem >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f99f1e1da30" id="12096" addr="0x7f99f1e1da30" />
-                                    <attribute name="qname" value="XBMCAddon" id="12097" addr="0x7f99f1de6c90" />
-                                    <attribute name="symtab" value="0x7f99f1e408b0" id="12098" addr="0x7f99f1e408b0" />
+                                    <attribute name="parent" value="0x7fca4696ba30" id="12096" addr="0x7fca4696ba30" />
+                                    <attribute name="qname" value="XBMCAddon" id="12097" addr="0x7fca46934c90" />
+                                    <attribute name="symtab" value="0x7fca4698e8b0" id="12098" addr="0x7fca4698e8b0" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="12099" addr="0x7f99f1dd2190" >
-                                <attributelist id="12100" addr="0x7f99f1dd2190" >
+                            <typescopesitem id="12099" addr="0x7fca46920190" >
+                                <attributelist id="12100" addr="0x7fca46920190" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="12101" addr="0x7f99f1e40fb0" >
-                                <attributelist id="12102" addr="0x7f99f1e40fb0" >
-                                    <attribute name="name" value="xbmcgui" id="12103" addr="0x7f99f1de6c90" />
-                                    <attribute name="csymtab" value="0x7f99f1e40ff0" id="12104" addr="0x7f99f1e40ff0" />
-                                    <attribute name="symtab" value="0x7f99f1e40f90" id="12105" addr="0x7f99f1e40f90" />
+                            <typescopesitem id="12101" addr="0x7fca4698efb0" >
+                                <attributelist id="12102" addr="0x7fca4698efb0" >
+                                    <attribute name="name" value="xbmcgui" id="12103" addr="0x7fca46934c90" />
+                                    <attribute name="csymtab" value="0x7fca4698eff0" id="12104" addr="0x7fca4698eff0" />
+                                    <attribute name="symtab" value="0x7fca4698ef90" id="12105" addr="0x7fca4698ef90" />
                                 </attributelist >
                             </typescopesitem >
                         </typescope >
                     </attributelist >
 
-                    <class id="12106" addr="0x7f99f1e969b0" >
-                        <attributelist id="12107" addr="0x7f99f1e969b0" >
-                            <attribute name="name" value="XBMCAddon::xbmcgui::Dialog" id="12108" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="12109" addr="0x7f99f1e40fb0" />
-                            <attribute name="symtab" value="0x7f99f1e96af0" id="12110" addr="0x7f99f1e96af0" />
-                            <attribute name="allows_typedef" value="1" id="12111" addr="0x7f99f1de6c90" />
-                            <attribute name="typepass_visit" value="1" id="12112" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_visit" value="1" id="12113" addr="0x7f99f1de6c90" />
-                            <attribute name="kind" value="class" id="12114" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_name" value="Dialog" id="12115" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_default_constructor" value="1" id="12116" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_has_constructor" value="1" id="12117" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_public_constructor" value="1" id="12118" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_has_destructor" value="1" id="12119" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_default_destructor" value="1" id="12120" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_copy_constructor" value="1" id="12121" addr="0x7f99f1de6c90" />
-                            <attribute name="privatebaselist" value="0x7f99f1e96990" id="12122" addr="0x7f99f1e96990" />
-                            <attribute name="protectedbaselist" value="0x7f99f1e96970" id="12123" addr="0x7f99f1e96970" />
-                            <baselist id="12124" addr="0x7f99f1e96950" >
-                                <base name="AddonClass" id="12125" addr="0x7f99f1e968d0" />
+                    <class id="12106" addr="0x7fca469e49b0" >
+                        <attributelist id="12107" addr="0x7fca469e49b0" >
+                            <attribute name="name" value="XBMCAddon::xbmcgui::Dialog" id="12108" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="12109" addr="0x7fca4698efb0" />
+                            <attribute name="symtab" value="0x7fca469e4af0" id="12110" addr="0x7fca469e4af0" />
+                            <attribute name="allows_typedef" value="1" id="12111" addr="0x7fca46934c90" />
+                            <attribute name="typepass_visit" value="1" id="12112" addr="0x7fca46934c90" />
+                            <attribute name="allocate_visit" value="1" id="12113" addr="0x7fca46934c90" />
+                            <attribute name="kind" value="class" id="12114" addr="0x7fca46934c90" />
+                            <attribute name="sym_name" value="Dialog" id="12115" addr="0x7fca46934c90" />
+                            <attribute name="allocate_default_constructor" value="1" id="12116" addr="0x7fca46934c90" />
+                            <attribute name="allocate_has_constructor" value="1" id="12117" addr="0x7fca46934c90" />
+                            <attribute name="allocate_public_constructor" value="1" id="12118" addr="0x7fca46934c90" />
+                            <attribute name="allocate_has_destructor" value="1" id="12119" addr="0x7fca46934c90" />
+                            <attribute name="allocate_default_destructor" value="1" id="12120" addr="0x7fca46934c90" />
+                            <attribute name="allocate_copy_constructor" value="1" id="12121" addr="0x7fca46934c90" />
+                            <attribute name="privatebaselist" value="0x7fca469e4990" id="12122" addr="0x7fca469e4990" />
+                            <attribute name="protectedbaselist" value="0x7fca469e4970" id="12123" addr="0x7fca469e4970" />
+                            <baselist id="12124" addr="0x7fca469e4950" >
+                                <base name="AddonClass" id="12125" addr="0x7fca469e48d0" />
                             </baselist >
-                            <attribute name="module" value="xbmcgui" id="12126" addr="0x7f99f1e402f0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="12127" addr="0x7f99f1de6c90" />
-                            <typescope id="12128" addr="0x7f99f1dde850" >
-                                <attributelist id="12129" addr="0x7f99f1dde850" >
-                                    <attribute name="name" value="Dialog" id="12130" addr="0x7f99f1de6c90" />
-                                    <typetab id="12131" addr="0x7f99f1dde870" >
-                                        <attributelist id="12132" addr="0x7f99f1dde870" >
+                            <attribute name="module" value="xbmcgui" id="12126" addr="0x7fca4698e2f0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="12127" addr="0x7fca46934c90" />
+                            <typescope id="12128" addr="0x7fca4692c850" >
+                                <attributelist id="12129" addr="0x7fca4692c850" >
+                                    <attribute name="name" value="Dialog" id="12130" addr="0x7fca46934c90" />
+                                    <typetab id="12131" addr="0x7fca4692c870" >
+                                        <attributelist id="12132" addr="0x7fca4692c870" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f99f1dd2150" id="12133" addr="0x7f99f1dd2150" />
-                                    <attribute name="qname" value="XBMCAddon::xbmcgui::Dialog" id="12134" addr="0x7f99f1de6c90" />
-                                    <attribute name="symtab" value="0x7f99f1e96af0" id="12135" addr="0x7f99f1e96af0" />
+                                    <attribute name="parent" value="0x7fca46920150" id="12133" addr="0x7fca46920150" />
+                                    <attribute name="qname" value="XBMCAddon::xbmcgui::Dialog" id="12134" addr="0x7fca46934c90" />
+                                    <attribute name="symtab" value="0x7fca469e4af0" id="12135" addr="0x7fca469e4af0" />
                                 </attributelist >
-                                <typescopesitem id="12136" addr="0x7f99f1dde7f0" >
-                                    <attributelist id="12137" addr="0x7f99f1dde7f0" >
+                                <typescopesitem id="12136" addr="0x7fca4692c7f0" >
+                                    <attributelist id="12137" addr="0x7fca4692c7f0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="12138" addr="0x7f99f1dde870" >
-                                    <attributelist id="12139" addr="0x7f99f1dde870" >
+                                <typescopesitem id="12138" addr="0x7fca4692c870" >
+                                    <attributelist id="12139" addr="0x7fca4692c870" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="12140" addr="0x7f99f1dd2150" >
-                                    <attributelist id="12141" addr="0x7f99f1dd2150" >
-                                        <attribute name="name" value="xbmcgui" id="12142" addr="0x7f99f1de6c90" />
-                                        <typetab id="12143" addr="0x7f99f1dd2170" >
-                                            <attributelist id="12144" addr="0x7f99f1dd2170" >
-                                                <attribute name="InterceptorBase" value="InterceptorBase" id="12145" addr="0x7f99f1de6c90" />
-                                                <attribute name="Dialog" value="Dialog" id="12146" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="12147" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="12148" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlTextBox" value="ControlTextBox" id="12149" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="12150" addr="0x7f99f1de6c90" />
-                                                <attribute name="Window" value="Window" id="12151" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="12152" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlList" value="ControlList" id="12153" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="12154" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlImage" value="ControlImage" id="12155" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlButton" value="ControlButton" id="12156" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlGroup" value="ControlGroup" id="12157" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogBusy" value="DialogBusy" id="12158" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="12159" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSpin" value="ControlSpin" id="12160" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlEdit" value="ControlEdit" id="12161" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="12162" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="12163" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlLabel" value="ControlLabel" id="12164" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlProgress" value="ControlProgress" id="12165" addr="0x7f99f1de6c90" />
-                                                <attribute name="Control" value="Control" id="12166" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSlider" value="ControlSlider" id="12167" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgress" value="DialogProgress" id="12168" addr="0x7f99f1de6c90" />
-                                                <attribute name="Action" value="Action" id="12169" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowDialog" value="WindowDialog" id="12170" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXML" value="WindowXML" id="12171" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItem" value="ListItem" id="12172" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="12173" addr="0x7f99f1de6c90" />
+                                <typescopesitem id="12140" addr="0x7fca46920150" >
+                                    <attributelist id="12141" addr="0x7fca46920150" >
+                                        <attribute name="name" value="xbmcgui" id="12142" addr="0x7fca46934c90" />
+                                        <typetab id="12143" addr="0x7fca46920170" >
+                                            <attributelist id="12144" addr="0x7fca46920170" >
+                                                <attribute name="InterceptorBase" value="InterceptorBase" id="12145" addr="0x7fca46934c90" />
+                                                <attribute name="Dialog" value="Dialog" id="12146" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="12147" addr="0x7fca46934c90" />
+                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="12148" addr="0x7fca46934c90" />
+                                                <attribute name="ControlTextBox" value="ControlTextBox" id="12149" addr="0x7fca46934c90" />
+                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="12150" addr="0x7fca46934c90" />
+                                                <attribute name="Window" value="Window" id="12151" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="12152" addr="0x7fca46934c90" />
+                                                <attribute name="ControlList" value="ControlList" id="12153" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="12154" addr="0x7fca46934c90" />
+                                                <attribute name="ControlImage" value="ControlImage" id="12155" addr="0x7fca46934c90" />
+                                                <attribute name="ControlButton" value="ControlButton" id="12156" addr="0x7fca46934c90" />
+                                                <attribute name="ControlGroup" value="ControlGroup" id="12157" addr="0x7fca46934c90" />
+                                                <attribute name="DialogBusy" value="DialogBusy" id="12158" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="12159" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSpin" value="ControlSpin" id="12160" addr="0x7fca46934c90" />
+                                                <attribute name="ControlEdit" value="ControlEdit" id="12161" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="12162" addr="0x7fca46934c90" />
+                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="12163" addr="0x7fca46934c90" />
+                                                <attribute name="ControlLabel" value="ControlLabel" id="12164" addr="0x7fca46934c90" />
+                                                <attribute name="ControlProgress" value="ControlProgress" id="12165" addr="0x7fca46934c90" />
+                                                <attribute name="Control" value="Control" id="12166" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSlider" value="ControlSlider" id="12167" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgress" value="DialogProgress" id="12168" addr="0x7fca46934c90" />
+                                                <attribute name="Action" value="Action" id="12169" addr="0x7fca46934c90" />
+                                                <attribute name="WindowDialog" value="WindowDialog" id="12170" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXML" value="WindowXML" id="12171" addr="0x7fca46934c90" />
+                                                <attribute name="ListItem" value="ListItem" id="12172" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="12173" addr="0x7fca46934c90" />
                                             </attributelist >
-                                            <typetabsitem id="12174" addr="0x7f99f1de1dd0" >
-                                                <attributelist id="12175" addr="0x7f99f1de1dd0" >
+                                            <typetabsitem id="12174" addr="0x7fca4692fdd0" >
+                                                <attributelist id="12175" addr="0x7fca4692fdd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="12176" addr="0x7f99f1dde790" >
-                                                <attributelist id="12177" addr="0x7f99f1dde790" >
+                                            <typetabsitem id="12176" addr="0x7fca4692c790" >
+                                                <attributelist id="12177" addr="0x7fca4692c790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="12178" addr="0x7f99f1de3f10" >
-                                                <attributelist id="12179" addr="0x7f99f1de3f10" >
+                                            <typetabsitem id="12178" addr="0x7fca46931f10" >
+                                                <attributelist id="12179" addr="0x7fca46931f10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="12180" addr="0x7f99f1dd67b0" >
-                                                <attributelist id="12181" addr="0x7f99f1dd67b0" >
+                                            <typetabsitem id="12180" addr="0x7fca469247b0" >
+                                                <attributelist id="12181" addr="0x7fca469247b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="12182" addr="0x7f99f1ddafd0" >
-                                                <attributelist id="12183" addr="0x7f99f1ddafd0" >
+                                            <typetabsitem id="12182" addr="0x7fca46928fd0" >
+                                                <attributelist id="12183" addr="0x7fca46928fd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="12184" addr="0x7f99f1ddd430" >
-                                                <attributelist id="12185" addr="0x7f99f1ddd430" >
+                                            <typetabsitem id="12184" addr="0x7fca4692b430" >
+                                                <attributelist id="12185" addr="0x7fca4692b430" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="12186" addr="0x7f99f1de2130" >
-                                                <attributelist id="12187" addr="0x7f99f1de2130" >
+                                            <typetabsitem id="12186" addr="0x7fca46930130" >
+                                                <attributelist id="12187" addr="0x7fca46930130" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="12188" addr="0x7f99f1dd2f50" >
-                                                <attributelist id="12189" addr="0x7f99f1dd2f50" >
+                                            <typetabsitem id="12188" addr="0x7fca46920f50" >
+                                                <attributelist id="12189" addr="0x7fca46920f50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="12190" addr="0x7f99f1dd9650" >
-                                                <attributelist id="12191" addr="0x7f99f1dd9650" >
+                                            <typetabsitem id="12190" addr="0x7fca46927650" >
+                                                <attributelist id="12191" addr="0x7fca46927650" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="12192" addr="0x7f99f1de3390" >
-                                                <attributelist id="12193" addr="0x7f99f1de3390" >
+                                            <typetabsitem id="12192" addr="0x7fca46931390" >
+                                                <attributelist id="12193" addr="0x7fca46931390" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="12194" addr="0x7f99f1ddb7b0" >
-                                                <attributelist id="12195" addr="0x7f99f1ddb7b0" >
+                                            <typetabsitem id="12194" addr="0x7fca469297b0" >
+                                                <attributelist id="12195" addr="0x7fca469297b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="12196" addr="0x7f99f1ddc4b0" >
-                                                <attributelist id="12197" addr="0x7f99f1ddc4b0" >
+                                            <typetabsitem id="12196" addr="0x7fca4692a4b0" >
+                                                <attributelist id="12197" addr="0x7fca4692a4b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="12198" addr="0x7f99f1ddcf90" >
-                                                <attributelist id="12199" addr="0x7f99f1ddcf90" >
+                                            <typetabsitem id="12198" addr="0x7fca4692af90" >
+                                                <attributelist id="12199" addr="0x7fca4692af90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="12200" addr="0x7f99f1de11b0" >
-                                                <attributelist id="12201" addr="0x7f99f1de11b0" >
+                                            <typetabsitem id="12200" addr="0x7fca4692f1b0" >
+                                                <attributelist id="12201" addr="0x7fca4692f1b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="12202" addr="0x7f99f1de15b0" >
-                                                <attributelist id="12203" addr="0x7f99f1de15b0" >
+                                            <typetabsitem id="12202" addr="0x7fca4692f5b0" >
+                                                <attributelist id="12203" addr="0x7fca4692f5b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="12204" addr="0x7f99f1dd77f0" >
-                                                <attributelist id="12205" addr="0x7f99f1dd77f0" >
+                                            <typetabsitem id="12204" addr="0x7fca469257f0" >
+                                                <attributelist id="12205" addr="0x7fca469257f0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="12206" addr="0x7f99f1dd8b30" >
-                                                <attributelist id="12207" addr="0x7f99f1dd8b30" >
+                                            <typetabsitem id="12206" addr="0x7fca46926b30" >
+                                                <attributelist id="12207" addr="0x7fca46926b30" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="12208" addr="0x7f99f1dd2c50" >
-                                                <attributelist id="12209" addr="0x7f99f1dd2c50" >
+                                            <typetabsitem id="12208" addr="0x7fca46920c50" >
+                                                <attributelist id="12209" addr="0x7fca46920c50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="12210" addr="0x7f99f1dda790" >
-                                                <attributelist id="12211" addr="0x7f99f1dda790" >
+                                            <typetabsitem id="12210" addr="0x7fca46928790" >
+                                                <attributelist id="12211" addr="0x7fca46928790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="12212" addr="0x7f99f1dd8030" >
-                                                <attributelist id="12213" addr="0x7f99f1dd8030" >
+                                            <typetabsitem id="12212" addr="0x7fca46926030" >
+                                                <attributelist id="12213" addr="0x7fca46926030" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="12214" addr="0x7f99f1ddbe10" >
-                                                <attributelist id="12215" addr="0x7f99f1ddbe10" >
+                                            <typetabsitem id="12214" addr="0x7fca46929e10" >
+                                                <attributelist id="12215" addr="0x7fca46929e10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="12216" addr="0x7f99f1dd6b10" >
-                                                <attributelist id="12217" addr="0x7f99f1dd6b10" >
+                                            <typetabsitem id="12216" addr="0x7fca46924b10" >
+                                                <attributelist id="12217" addr="0x7fca46924b10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="12218" addr="0x7f99f1dddf90" >
-                                                <attributelist id="12219" addr="0x7f99f1dddf90" >
+                                            <typetabsitem id="12218" addr="0x7fca4692bf90" >
+                                                <attributelist id="12219" addr="0x7fca4692bf90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="12220" addr="0x7f99f1de0530" >
-                                                <attributelist id="12221" addr="0x7f99f1de0530" >
+                                            <typetabsitem id="12220" addr="0x7fca4692e530" >
+                                                <attributelist id="12221" addr="0x7fca4692e530" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="12222" addr="0x7f99f1de1e50" >
-                                                <attributelist id="12223" addr="0x7f99f1de1e50" >
+                                            <typetabsitem id="12222" addr="0x7fca4692fe50" >
+                                                <attributelist id="12223" addr="0x7fca4692fe50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="12224" addr="0x7f99f1de2d90" >
-                                                <attributelist id="12225" addr="0x7f99f1de2d90" >
+                                            <typetabsitem id="12224" addr="0x7fca46930d90" >
+                                                <attributelist id="12225" addr="0x7fca46930d90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="12226" addr="0x7f99f1de3410" >
-                                                <attributelist id="12227" addr="0x7f99f1de3410" >
+                                            <typetabsitem id="12226" addr="0x7fca46931410" >
+                                                <attributelist id="12227" addr="0x7fca46931410" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="12228" addr="0x7f99f1dd3590" >
-                                                <attributelist id="12229" addr="0x7f99f1dd3590" >
+                                            <typetabsitem id="12228" addr="0x7fca46921590" >
+                                                <attributelist id="12229" addr="0x7fca46921590" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="12230" addr="0x7f99f1dd3390" >
-                                                <attributelist id="12231" addr="0x7f99f1dd3390" >
+                                            <typetabsitem id="12230" addr="0x7fca46921390" >
+                                                <attributelist id="12231" addr="0x7fca46921390" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7f99f1dd1d70" id="12232" addr="0x7f99f1dd1d70" />
-                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="12233" addr="0x7f99f1de6c90" />
-                                        <attribute name="symtab" value="0x7f99f1e40fb0" id="12234" addr="0x7f99f1e40fb0" />
+                                        <attribute name="parent" value="0x7fca4691fd70" id="12232" addr="0x7fca4691fd70" />
+                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="12233" addr="0x7fca46934c90" />
+                                        <attribute name="symtab" value="0x7fca4698efb0" id="12234" addr="0x7fca4698efb0" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="12235" addr="0x7f99f1dde890" >
-                                    <attributelist id="12236" addr="0x7f99f1dde890" >
+                                <typescopesitem id="12235" addr="0x7fca4692c890" >
+                                    <attributelist id="12236" addr="0x7fca4692c890" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="12237" addr="0x7f99f1e96af0" >
-                                    <attributelist id="12238" addr="0x7f99f1e96af0" >
-                                        <attribute name="name" value="Dialog" id="12239" addr="0x7f99f1de6c90" />
-                                        <attribute name="csymtab" value="0x7f99f1e96b10" id="12240" addr="0x7f99f1e96b10" />
-                                        <attribute name="symtab" value="0x7f99f1e96ab0" id="12241" addr="0x7f99f1e96ab0" />
+                                <typescopesitem id="12237" addr="0x7fca469e4af0" >
+                                    <attributelist id="12238" addr="0x7fca469e4af0" >
+                                        <attribute name="name" value="Dialog" id="12239" addr="0x7fca46934c90" />
+                                        <attribute name="csymtab" value="0x7fca469e4b10" id="12240" addr="0x7fca469e4b10" />
+                                        <attribute name="symtab" value="0x7fca469e4ab0" id="12241" addr="0x7fca469e4ab0" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <access id="12242" addr="0x7f99f1e96a70" >
-                            <attributelist id="12243" addr="0x7f99f1e96a70" >
-                                <attribute name="kind" value="public" id="12244" addr="0x7f99f1de6c90" />
+                        <access id="12242" addr="0x7fca469e4a70" >
+                            <attributelist id="12243" addr="0x7fca469e4a70" >
+                                <attribute name="kind" value="public" id="12244" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="12245" addr="0x7f99f1e96c50" >
-                            <attributelist id="12246" addr="0x7f99f1e96c50" >
-                                <attribute name="ismember" value="1" id="12247" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="Dialog" id="12248" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="Dialog" id="12249" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="12250" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="12251" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="12252" addr="0x7f99f1de6c90" />
-                                <attribute name="value" value="default" id="12253" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="12254" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="12255" addr="0x7f99f1de6c90" />
+                        <constructor id="12245" addr="0x7fca469e4c50" >
+                            <attributelist id="12246" addr="0x7fca469e4c50" >
+                                <attribute name="ismember" value="1" id="12247" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="Dialog" id="12248" addr="0x7fca46934c90" />
+                                <attribute name="name" value="Dialog" id="12249" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="12250" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="12251" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="12252" addr="0x7fca46934c90" />
+                                <attribute name="value" value="default" id="12253" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="12254" addr="0x7fca469e4af0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="12255" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <destructor id="12256" addr="0x7f99f1e96db0" >
-                            <attributelist id="12257" addr="0x7f99f1e96db0" >
-                                <attribute name="ismember" value="1" id="12258" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="~Dialog" id="12259" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="~Dialog" id="12260" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="12261" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="12262" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="12263" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="12264" addr="0x7f99f1de6c90" />
+                        <destructor id="12256" addr="0x7fca469e4db0" >
+                            <attributelist id="12257" addr="0x7fca469e4db0" >
+                                <attribute name="ismember" value="1" id="12258" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="~Dialog" id="12259" addr="0x7fca46934c90" />
+                                <attribute name="name" value="~Dialog" id="12260" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="12261" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="12262" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="12263" addr="0x7fca469e4af0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="12264" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </destructor >
-                        <cdecl id="12265" addr="0x7f99f1e979b0" >
-                            <attributelist id="12266" addr="0x7f99f1e979b0" >
-                                <attribute name="name" value="yesno" id="12267" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="12268" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="12269" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e97e50" id="12270" addr="0x7f99f1e97e50" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e97e50" id="12271" addr="0x7f99f1e97e50" />
-                                <attribute name="kind" value="function" id="12272" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="yesno" id="12273" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,int)." id="12274" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="12275" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e979b0" id="12276" addr="0x7f99f1e979b0" />
-                                <parmlist id="12277" addr="0x7f99f1e96fd0" >
+                        <cdecl id="12265" addr="0x7fca469e59b0" >
+                            <attributelist id="12266" addr="0x7fca469e59b0" >
+                                <attribute name="name" value="yesno" id="12267" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="12268" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="12269" addr="0x7fca469e4af0" />
+                                <attribute name="sym_nextSibling" value="0x7fca469e5e50" id="12270" addr="0x7fca469e5e50" />
+                                <attribute name="csym_nextSibling" value="0x7fca469e5e50" id="12271" addr="0x7fca469e5e50" />
+                                <attribute name="kind" value="function" id="12272" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="yesno" id="12273" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,int)." id="12274" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="12275" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469e59b0" id="12276" addr="0x7fca469e59b0" />
+                                <parmlist id="12277" addr="0x7fca469e4fd0" >
                                     <parm id="12278">
-                                        <attributelist id="12279" addr="0x7f99f1e96fd0" >
-                                            <attribute name="name" value="heading" id="12280" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12281" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12279" addr="0x7fca469e4fd0" >
+                                            <attribute name="name" value="heading" id="12280" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12281" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12282">
-                                        <attributelist id="12283" addr="0x7f99f1e97110" >
-                                            <attribute name="name" value="line1" id="12284" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12285" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12283" addr="0x7fca469e5110" >
+                                            <attribute name="name" value="line1" id="12284" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12285" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12286">
-                                        <attributelist id="12287" addr="0x7f99f1e972b0" >
-                                            <attribute name="name" value="line2" id="12288" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="12289" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12290" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12287" addr="0x7fca469e52b0" >
+                                            <attribute name="name" value="line2" id="12288" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="12289" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12290" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12291">
-                                        <attributelist id="12292" addr="0x7f99f1e97450" >
-                                            <attribute name="name" value="line3" id="12293" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="12294" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12295" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12292" addr="0x7fca469e5450" >
+                                            <attribute name="name" value="line3" id="12293" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="12294" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12295" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12296">
-                                        <attributelist id="12297" addr="0x7f99f1e975f0" >
-                                            <attribute name="name" value="nolabel" id="12298" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="12299" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12300" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12297" addr="0x7fca469e55f0" >
+                                            <attribute name="name" value="nolabel" id="12298" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="12299" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12300" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12301">
-                                        <attributelist id="12302" addr="0x7f99f1e97790" >
-                                            <attribute name="name" value="yeslabel" id="12303" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="12304" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12305" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12302" addr="0x7fca469e5790" >
+                                            <attribute name="name" value="yeslabel" id="12303" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="12304" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12305" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12306">
-                                        <attributelist id="12307" addr="0x7f99f1e978f0" >
-                                            <attribute name="name" value="autoclose" id="12308" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="0" id="12309" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="12310" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12307" addr="0x7fca469e58f0" >
+                                            <attribute name="name" value="autoclose" id="12308" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="0" id="12309" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="12310" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="bool" id="12311" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="12312" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="bool" id="12311" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="12312" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="12313" addr="0x7f99f1e97e50" >
-                            <attributelist id="12314" addr="0x7f99f1e97e50" >
-                                <attribute name="name" value="yesno" id="12315" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="12316" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="12317" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e979b0" id="12318" addr="0x7f99f1e979b0" />
-                                <attribute name="kind" value="function" id="12319" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="yesno" id="12320" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e98250" id="12321" addr="0x7f99f1e98250" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e98250" id="12322" addr="0x7f99f1e98250" />
-                                <attribute name="defaultargs" value="0x7f99f1e979b0" id="12323" addr="0x7f99f1e979b0" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="12324" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="12325" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e979b0" id="12326" addr="0x7f99f1e979b0" />
-                                <parmlist id="12327" addr="0x7f99f1e97a50" >
+                        <cdecl id="12313" addr="0x7fca469e5e50" >
+                            <attributelist id="12314" addr="0x7fca469e5e50" >
+                                <attribute name="name" value="yesno" id="12315" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="12316" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="12317" addr="0x7fca469e4af0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469e59b0" id="12318" addr="0x7fca469e59b0" />
+                                <attribute name="kind" value="function" id="12319" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="yesno" id="12320" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469e6250" id="12321" addr="0x7fca469e6250" />
+                                <attribute name="sym_nextSibling" value="0x7fca469e6250" id="12322" addr="0x7fca469e6250" />
+                                <attribute name="defaultargs" value="0x7fca469e59b0" id="12323" addr="0x7fca469e59b0" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="12324" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="12325" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469e59b0" id="12326" addr="0x7fca469e59b0" />
+                                <parmlist id="12327" addr="0x7fca469e5a50" >
                                     <parm id="12328">
-                                        <attributelist id="12329" addr="0x7f99f1e97a50" >
-                                            <attribute name="name" value="heading" id="12330" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12331" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12329" addr="0x7fca469e5a50" >
+                                            <attribute name="name" value="heading" id="12330" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12331" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12332">
-                                        <attributelist id="12333" addr="0x7f99f1e97b30" >
-                                            <attribute name="name" value="line1" id="12334" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12335" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12333" addr="0x7fca469e5b30" >
+                                            <attribute name="name" value="line1" id="12334" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12335" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12336">
-                                        <attributelist id="12337" addr="0x7f99f1e97bb0" >
-                                            <attribute name="name" value="line2" id="12338" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="12339" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12340" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12337" addr="0x7fca469e5bb0" >
+                                            <attribute name="name" value="line2" id="12338" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="12339" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12340" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12341">
-                                        <attributelist id="12342" addr="0x7f99f1e97c50" >
-                                            <attribute name="name" value="line3" id="12343" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="12344" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12345" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12342" addr="0x7fca469e5c50" >
+                                            <attribute name="name" value="line3" id="12343" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="12344" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12345" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12346">
-                                        <attributelist id="12347" addr="0x7f99f1e97cf0" >
-                                            <attribute name="name" value="nolabel" id="12348" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="12349" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12350" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12347" addr="0x7fca469e5cf0" >
+                                            <attribute name="name" value="nolabel" id="12348" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="12349" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12350" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12351">
-                                        <attributelist id="12352" addr="0x7f99f1e97d90" >
-                                            <attribute name="name" value="yeslabel" id="12353" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="12354" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12355" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12352" addr="0x7fca469e5d90" >
+                                            <attribute name="name" value="yeslabel" id="12353" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="12354" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12355" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="bool" id="12356" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="12357" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="bool" id="12356" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="12357" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="12358" addr="0x7f99f1e98250" >
-                            <attributelist id="12359" addr="0x7f99f1e98250" >
-                                <attribute name="name" value="yesno" id="12360" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="12361" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="12362" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e97e50" id="12363" addr="0x7f99f1e97e50" />
-                                <attribute name="kind" value="function" id="12364" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="yesno" id="12365" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e985b0" id="12366" addr="0x7f99f1e985b0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e985b0" id="12367" addr="0x7f99f1e985b0" />
-                                <attribute name="defaultargs" value="0x7f99f1e979b0" id="12368" addr="0x7f99f1e979b0" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="12369" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="12370" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e979b0" id="12371" addr="0x7f99f1e979b0" />
-                                <parmlist id="12372" addr="0x7f99f1e97ef0" >
+                        <cdecl id="12358" addr="0x7fca469e6250" >
+                            <attributelist id="12359" addr="0x7fca469e6250" >
+                                <attribute name="name" value="yesno" id="12360" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="12361" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="12362" addr="0x7fca469e4af0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469e5e50" id="12363" addr="0x7fca469e5e50" />
+                                <attribute name="kind" value="function" id="12364" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="yesno" id="12365" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469e65b0" id="12366" addr="0x7fca469e65b0" />
+                                <attribute name="sym_nextSibling" value="0x7fca469e65b0" id="12367" addr="0x7fca469e65b0" />
+                                <attribute name="defaultargs" value="0x7fca469e59b0" id="12368" addr="0x7fca469e59b0" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="12369" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="12370" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469e59b0" id="12371" addr="0x7fca469e59b0" />
+                                <parmlist id="12372" addr="0x7fca469e5ef0" >
                                     <parm id="12373">
-                                        <attributelist id="12374" addr="0x7f99f1e97ef0" >
-                                            <attribute name="name" value="heading" id="12375" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12376" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12374" addr="0x7fca469e5ef0" >
+                                            <attribute name="name" value="heading" id="12375" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12376" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12377">
-                                        <attributelist id="12378" addr="0x7f99f1e97fd0" >
-                                            <attribute name="name" value="line1" id="12379" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12380" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12378" addr="0x7fca469e5fd0" >
+                                            <attribute name="name" value="line1" id="12379" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12380" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12381">
-                                        <attributelist id="12382" addr="0x7f99f1e98050" >
-                                            <attribute name="name" value="line2" id="12383" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="12384" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12385" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12382" addr="0x7fca469e6050" >
+                                            <attribute name="name" value="line2" id="12383" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="12384" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12385" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12386">
-                                        <attributelist id="12387" addr="0x7f99f1e980f0" >
-                                            <attribute name="name" value="line3" id="12388" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="12389" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12390" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12387" addr="0x7fca469e60f0" >
+                                            <attribute name="name" value="line3" id="12388" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="12389" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12390" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12391">
-                                        <attributelist id="12392" addr="0x7f99f1e98190" >
-                                            <attribute name="name" value="nolabel" id="12393" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="12394" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12395" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12392" addr="0x7fca469e6190" >
+                                            <attribute name="name" value="nolabel" id="12393" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="12394" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12395" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="bool" id="12396" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_2" id="12397" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="bool" id="12396" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_2" id="12397" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="12398" addr="0x7f99f1e985b0" >
-                            <attributelist id="12399" addr="0x7f99f1e985b0" >
-                                <attribute name="name" value="yesno" id="12400" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="12401" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="12402" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e98250" id="12403" addr="0x7f99f1e98250" />
-                                <attribute name="kind" value="function" id="12404" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="yesno" id="12405" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e98870" id="12406" addr="0x7f99f1e98870" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e98870" id="12407" addr="0x7f99f1e98870" />
-                                <attribute name="defaultargs" value="0x7f99f1e979b0" id="12408" addr="0x7f99f1e979b0" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="12409" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="12410" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e979b0" id="12411" addr="0x7f99f1e979b0" />
-                                <parmlist id="12412" addr="0x7f99f1e982f0" >
+                        <cdecl id="12398" addr="0x7fca469e65b0" >
+                            <attributelist id="12399" addr="0x7fca469e65b0" >
+                                <attribute name="name" value="yesno" id="12400" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="12401" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="12402" addr="0x7fca469e4af0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469e6250" id="12403" addr="0x7fca469e6250" />
+                                <attribute name="kind" value="function" id="12404" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="yesno" id="12405" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469e6870" id="12406" addr="0x7fca469e6870" />
+                                <attribute name="sym_nextSibling" value="0x7fca469e6870" id="12407" addr="0x7fca469e6870" />
+                                <attribute name="defaultargs" value="0x7fca469e59b0" id="12408" addr="0x7fca469e59b0" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="12409" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="12410" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469e59b0" id="12411" addr="0x7fca469e59b0" />
+                                <parmlist id="12412" addr="0x7fca469e62f0" >
                                     <parm id="12413">
-                                        <attributelist id="12414" addr="0x7f99f1e982f0" >
-                                            <attribute name="name" value="heading" id="12415" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12416" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12414" addr="0x7fca469e62f0" >
+                                            <attribute name="name" value="heading" id="12415" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12416" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12417">
-                                        <attributelist id="12418" addr="0x7f99f1e983d0" >
-                                            <attribute name="name" value="line1" id="12419" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12420" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12418" addr="0x7fca469e63d0" >
+                                            <attribute name="name" value="line1" id="12419" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12420" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12421">
-                                        <attributelist id="12422" addr="0x7f99f1e98450" >
-                                            <attribute name="name" value="line2" id="12423" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="12424" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12425" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12422" addr="0x7fca469e6450" >
+                                            <attribute name="name" value="line2" id="12423" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="12424" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12425" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12426">
-                                        <attributelist id="12427" addr="0x7f99f1e984f0" >
-                                            <attribute name="name" value="line3" id="12428" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="12429" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12430" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12427" addr="0x7fca469e64f0" >
+                                            <attribute name="name" value="line3" id="12428" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="12429" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12430" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="bool" id="12431" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_3" id="12432" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="bool" id="12431" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_3" id="12432" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="12433" addr="0x7f99f1e98870" >
-                            <attributelist id="12434" addr="0x7f99f1e98870" >
-                                <attribute name="name" value="yesno" id="12435" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="12436" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="12437" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e985b0" id="12438" addr="0x7f99f1e985b0" />
-                                <attribute name="kind" value="function" id="12439" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="yesno" id="12440" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e98a90" id="12441" addr="0x7f99f1e98a90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e98a90" id="12442" addr="0x7f99f1e98a90" />
-                                <attribute name="defaultargs" value="0x7f99f1e979b0" id="12443" addr="0x7f99f1e979b0" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="12444" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="12445" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e979b0" id="12446" addr="0x7f99f1e979b0" />
-                                <parmlist id="12447" addr="0x7f99f1e98650" >
+                        <cdecl id="12433" addr="0x7fca469e6870" >
+                            <attributelist id="12434" addr="0x7fca469e6870" >
+                                <attribute name="name" value="yesno" id="12435" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="12436" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="12437" addr="0x7fca469e4af0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469e65b0" id="12438" addr="0x7fca469e65b0" />
+                                <attribute name="kind" value="function" id="12439" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="yesno" id="12440" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469e6a90" id="12441" addr="0x7fca469e6a90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469e6a90" id="12442" addr="0x7fca469e6a90" />
+                                <attribute name="defaultargs" value="0x7fca469e59b0" id="12443" addr="0x7fca469e59b0" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="12444" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="12445" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469e59b0" id="12446" addr="0x7fca469e59b0" />
+                                <parmlist id="12447" addr="0x7fca469e6650" >
                                     <parm id="12448">
-                                        <attributelist id="12449" addr="0x7f99f1e98650" >
-                                            <attribute name="name" value="heading" id="12450" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12451" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12449" addr="0x7fca469e6650" >
+                                            <attribute name="name" value="heading" id="12450" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12451" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12452">
-                                        <attributelist id="12453" addr="0x7f99f1e98730" >
-                                            <attribute name="name" value="line1" id="12454" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12455" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12453" addr="0x7fca469e6730" >
+                                            <attribute name="name" value="line1" id="12454" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12455" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12456">
-                                        <attributelist id="12457" addr="0x7f99f1e987b0" >
-                                            <attribute name="name" value="line2" id="12458" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="12459" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12460" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12457" addr="0x7fca469e67b0" >
+                                            <attribute name="name" value="line2" id="12458" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="12459" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12460" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="bool" id="12461" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_4" id="12462" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="bool" id="12461" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_4" id="12462" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="12463" addr="0x7f99f1e98a90" >
-                            <attributelist id="12464" addr="0x7f99f1e98a90" >
-                                <attribute name="name" value="yesno" id="12465" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="12466" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="12467" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e98870" id="12468" addr="0x7f99f1e98870" />
-                                <attribute name="kind" value="function" id="12469" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="yesno" id="12470" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e979b0" id="12471" addr="0x7f99f1e979b0" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="12472" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="12473" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e979b0" id="12474" addr="0x7f99f1e979b0" />
-                                <parmlist id="12475" addr="0x7f99f1e98910" >
+                        <cdecl id="12463" addr="0x7fca469e6a90" >
+                            <attributelist id="12464" addr="0x7fca469e6a90" >
+                                <attribute name="name" value="yesno" id="12465" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="12466" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="12467" addr="0x7fca469e4af0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469e6870" id="12468" addr="0x7fca469e6870" />
+                                <attribute name="kind" value="function" id="12469" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="yesno" id="12470" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469e59b0" id="12471" addr="0x7fca469e59b0" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="12472" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="12473" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469e59b0" id="12474" addr="0x7fca469e59b0" />
+                                <parmlist id="12475" addr="0x7fca469e6910" >
                                     <parm id="12476">
-                                        <attributelist id="12477" addr="0x7f99f1e98910" >
-                                            <attribute name="name" value="heading" id="12478" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12479" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12477" addr="0x7fca469e6910" >
+                                            <attribute name="name" value="heading" id="12478" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12479" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12480">
-                                        <attributelist id="12481" addr="0x7f99f1e989f0" >
-                                            <attribute name="name" value="line1" id="12482" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12483" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12481" addr="0x7fca469e69f0" >
+                                            <attribute name="name" value="line1" id="12482" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12483" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="bool" id="12484" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_5" id="12485" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="bool" id="12484" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_5" id="12485" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="12486" addr="0x7f99f1e98d90" >
-                            <attributelist id="12487" addr="0x7f99f1e98d90" >
-                                <attribute name="name" value="info" id="12488" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="12489" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="12490" addr="0x7f99f1e96af0" />
-                                <attribute name="kind" value="function" id="12491" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="info" id="12492" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(p.q(const).XBMCAddon::xbmcgui::ListItem)." id="12493" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="12494" addr="0x7f99f1de6c90" />
-                                <parmlist id="12495" addr="0x7f99f1e98cd0" >
+                        <cdecl id="12486" addr="0x7fca469e6d90" >
+                            <attributelist id="12487" addr="0x7fca469e6d90" >
+                                <attribute name="name" value="info" id="12488" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="12489" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="12490" addr="0x7fca469e4af0" />
+                                <attribute name="kind" value="function" id="12491" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="info" id="12492" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(p.q(const).XBMCAddon::xbmcgui::ListItem)." id="12493" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="12494" addr="0x7fca46934c90" />
+                                <parmlist id="12495" addr="0x7fca469e6cd0" >
                                     <parm id="12496">
-                                        <attributelist id="12497" addr="0x7f99f1e98cd0" >
-                                            <attribute name="name" value="item" id="12498" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::ListItem" id="12499" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12497" addr="0x7fca469e6cd0" >
+                                            <attribute name="name" value="item" id="12498" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::ListItem" id="12499" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="bool" id="12500" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="12501" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="bool" id="12500" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="12501" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="12502" addr="0x7f99f1e99a50" >
-                            <attributelist id="12503" addr="0x7f99f1e99a50" >
-                                <attribute name="name" value="select" id="12504" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="12505" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="12506" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e99db0" id="12507" addr="0x7f99f1e99db0" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e99db0" id="12508" addr="0x7f99f1e99db0" />
-                                <attribute name="kind" value="function" id="12509" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="select" id="12510" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>,int,int,bool)." id="12511" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="12512" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e99a50" id="12513" addr="0x7f99f1e99a50" />
-                                <parmlist id="12514" addr="0x7f99f1e99010" >
+                        <cdecl id="12502" addr="0x7fca469e7a50" >
+                            <attributelist id="12503" addr="0x7fca469e7a50" >
+                                <attribute name="name" value="select" id="12504" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="12505" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="12506" addr="0x7fca469e4af0" />
+                                <attribute name="sym_nextSibling" value="0x7fca469e7db0" id="12507" addr="0x7fca469e7db0" />
+                                <attribute name="csym_nextSibling" value="0x7fca469e7db0" id="12508" addr="0x7fca469e7db0" />
+                                <attribute name="kind" value="function" id="12509" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="select" id="12510" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>,int,int,bool)." id="12511" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="12512" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469e7a50" id="12513" addr="0x7fca469e7a50" />
+                                <parmlist id="12514" addr="0x7fca469e7010" >
                                     <parm id="12515">
-                                        <attributelist id="12516" addr="0x7f99f1e99010" >
-                                            <attribute name="name" value="heading" id="12517" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12518" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12516" addr="0x7fca469e7010" >
+                                            <attribute name="name" value="heading" id="12517" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12518" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12519">
-                                        <attributelist id="12520" addr="0x7f99f1e99690" >
-                                            <attribute name="name" value="list" id="12521" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>" id="12522" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12520" addr="0x7fca469e7690" >
+                                            <attribute name="name" value="list" id="12521" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>" id="12522" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12523">
-                                        <attributelist id="12524" addr="0x7f99f1e996d0" >
-                                            <attribute name="name" value="autoclose" id="12525" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="0" id="12526" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="12527" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12524" addr="0x7fca469e76d0" >
+                                            <attribute name="name" value="autoclose" id="12525" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="0" id="12526" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="12527" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12528">
-                                        <attributelist id="12529" addr="0x7f99f1e99850" >
-                                            <attribute name="name" value="preselect" id="12530" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="-1" id="12531" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="12532" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12529" addr="0x7fca469e7850" >
+                                            <attribute name="name" value="preselect" id="12530" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="-1" id="12531" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="12532" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12533">
-                                        <attributelist id="12534" addr="0x7f99f1e99990" >
-                                            <attribute name="name" value="useDetails" id="12535" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="false" id="12536" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="12537" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12534" addr="0x7fca469e7990" >
+                                            <attribute name="name" value="useDetails" id="12535" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="false" id="12536" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="12537" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="int" id="12538" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="12539" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="int" id="12538" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="12539" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="12540" addr="0x7f99f1e99db0" >
-                            <attributelist id="12541" addr="0x7f99f1e99db0" >
-                                <attribute name="name" value="select" id="12542" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="12543" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="12544" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e99a50" id="12545" addr="0x7f99f1e99a50" />
-                                <attribute name="kind" value="function" id="12546" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="select" id="12547" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e9a070" id="12548" addr="0x7f99f1e9a070" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e9a070" id="12549" addr="0x7f99f1e9a070" />
-                                <attribute name="defaultargs" value="0x7f99f1e99a50" id="12550" addr="0x7f99f1e99a50" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>,int,int)." id="12551" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="12552" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e99a50" id="12553" addr="0x7f99f1e99a50" />
-                                <parmlist id="12554" addr="0x7f99f1e99af0" >
+                        <cdecl id="12540" addr="0x7fca469e7db0" >
+                            <attributelist id="12541" addr="0x7fca469e7db0" >
+                                <attribute name="name" value="select" id="12542" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="12543" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="12544" addr="0x7fca469e4af0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469e7a50" id="12545" addr="0x7fca469e7a50" />
+                                <attribute name="kind" value="function" id="12546" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="select" id="12547" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469e8070" id="12548" addr="0x7fca469e8070" />
+                                <attribute name="sym_nextSibling" value="0x7fca469e8070" id="12549" addr="0x7fca469e8070" />
+                                <attribute name="defaultargs" value="0x7fca469e7a50" id="12550" addr="0x7fca469e7a50" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>,int,int)." id="12551" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="12552" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469e7a50" id="12553" addr="0x7fca469e7a50" />
+                                <parmlist id="12554" addr="0x7fca469e7af0" >
                                     <parm id="12555">
-                                        <attributelist id="12556" addr="0x7f99f1e99af0" >
-                                            <attribute name="name" value="heading" id="12557" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12558" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12556" addr="0x7fca469e7af0" >
+                                            <attribute name="name" value="heading" id="12557" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12558" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12559">
-                                        <attributelist id="12560" addr="0x7f99f1e99bd0" >
-                                            <attribute name="name" value="list" id="12561" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>" id="12562" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12560" addr="0x7fca469e7bd0" >
+                                            <attribute name="name" value="list" id="12561" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>" id="12562" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12563">
-                                        <attributelist id="12564" addr="0x7f99f1e99c50" >
-                                            <attribute name="name" value="autoclose" id="12565" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="0" id="12566" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="12567" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12564" addr="0x7fca469e7c50" >
+                                            <attribute name="name" value="autoclose" id="12565" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="0" id="12566" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="12567" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12568">
-                                        <attributelist id="12569" addr="0x7f99f1e99cf0" >
-                                            <attribute name="name" value="preselect" id="12570" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="-1" id="12571" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="12572" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12569" addr="0x7fca469e7cf0" >
+                                            <attribute name="name" value="preselect" id="12570" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="-1" id="12571" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="12572" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="int" id="12573" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="12574" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="int" id="12573" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="12574" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="12575" addr="0x7f99f1e9a070" >
-                            <attributelist id="12576" addr="0x7f99f1e9a070" >
-                                <attribute name="name" value="select" id="12577" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="12578" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="12579" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e99db0" id="12580" addr="0x7f99f1e99db0" />
-                                <attribute name="kind" value="function" id="12581" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="select" id="12582" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e9a290" id="12583" addr="0x7f99f1e9a290" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e9a290" id="12584" addr="0x7f99f1e9a290" />
-                                <attribute name="defaultargs" value="0x7f99f1e99a50" id="12585" addr="0x7f99f1e99a50" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>,int)." id="12586" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="12587" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e99a50" id="12588" addr="0x7f99f1e99a50" />
-                                <parmlist id="12589" addr="0x7f99f1e99e50" >
+                        <cdecl id="12575" addr="0x7fca469e8070" >
+                            <attributelist id="12576" addr="0x7fca469e8070" >
+                                <attribute name="name" value="select" id="12577" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="12578" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="12579" addr="0x7fca469e4af0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469e7db0" id="12580" addr="0x7fca469e7db0" />
+                                <attribute name="kind" value="function" id="12581" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="select" id="12582" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469e8290" id="12583" addr="0x7fca469e8290" />
+                                <attribute name="sym_nextSibling" value="0x7fca469e8290" id="12584" addr="0x7fca469e8290" />
+                                <attribute name="defaultargs" value="0x7fca469e7a50" id="12585" addr="0x7fca469e7a50" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>,int)." id="12586" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="12587" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469e7a50" id="12588" addr="0x7fca469e7a50" />
+                                <parmlist id="12589" addr="0x7fca469e7e50" >
                                     <parm id="12590">
-                                        <attributelist id="12591" addr="0x7f99f1e99e50" >
-                                            <attribute name="name" value="heading" id="12592" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12593" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12591" addr="0x7fca469e7e50" >
+                                            <attribute name="name" value="heading" id="12592" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12593" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12594">
-                                        <attributelist id="12595" addr="0x7f99f1e99f30" >
-                                            <attribute name="name" value="list" id="12596" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>" id="12597" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12595" addr="0x7fca469e7f30" >
+                                            <attribute name="name" value="list" id="12596" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>" id="12597" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12598">
-                                        <attributelist id="12599" addr="0x7f99f1e99fb0" >
-                                            <attribute name="name" value="autoclose" id="12600" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="0" id="12601" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="12602" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12599" addr="0x7fca469e7fb0" >
+                                            <attribute name="name" value="autoclose" id="12600" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="0" id="12601" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="12602" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="int" id="12603" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_2" id="12604" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="int" id="12603" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_2" id="12604" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="12605" addr="0x7f99f1e9a290" >
-                            <attributelist id="12606" addr="0x7f99f1e9a290" >
-                                <attribute name="name" value="select" id="12607" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="12608" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="12609" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e9a070" id="12610" addr="0x7f99f1e9a070" />
-                                <attribute name="kind" value="function" id="12611" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="select" id="12612" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e99a50" id="12613" addr="0x7f99f1e99a50" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>)." id="12614" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="12615" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e99a50" id="12616" addr="0x7f99f1e99a50" />
-                                <parmlist id="12617" addr="0x7f99f1e9a110" >
+                        <cdecl id="12605" addr="0x7fca469e8290" >
+                            <attributelist id="12606" addr="0x7fca469e8290" >
+                                <attribute name="name" value="select" id="12607" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="12608" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="12609" addr="0x7fca469e4af0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469e8070" id="12610" addr="0x7fca469e8070" />
+                                <attribute name="kind" value="function" id="12611" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="select" id="12612" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469e7a50" id="12613" addr="0x7fca469e7a50" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>)." id="12614" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="12615" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469e7a50" id="12616" addr="0x7fca469e7a50" />
+                                <parmlist id="12617" addr="0x7fca469e8110" >
                                     <parm id="12618">
-                                        <attributelist id="12619" addr="0x7f99f1e9a110" >
-                                            <attribute name="name" value="heading" id="12620" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12621" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12619" addr="0x7fca469e8110" >
+                                            <attribute name="name" value="heading" id="12620" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12621" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12622">
-                                        <attributelist id="12623" addr="0x7f99f1e9a1f0" >
-                                            <attribute name="name" value="list" id="12624" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>" id="12625" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12623" addr="0x7fca469e81f0" >
+                                            <attribute name="name" value="list" id="12624" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>" id="12625" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="int" id="12626" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_3" id="12627" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="int" id="12626" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_3" id="12627" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="12628" addr="0x7f99f1e9a690" >
-                            <attributelist id="12629" addr="0x7f99f1e9a690" >
-                                <attribute name="name" value="contextmenu" id="12630" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="12631" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="12632" addr="0x7f99f1e96af0" />
-                                <attribute name="kind" value="function" id="12633" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="contextmenu" id="12634" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).std::vector&lt;(XBMCAddon::String)>)." id="12635" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="12636" addr="0x7f99f1de6c90" />
-                                <parmlist id="12637" addr="0x7f99f1e9a5d0" >
+                        <cdecl id="12628" addr="0x7fca469e8690" >
+                            <attributelist id="12629" addr="0x7fca469e8690" >
+                                <attribute name="name" value="contextmenu" id="12630" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="12631" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="12632" addr="0x7fca469e4af0" />
+                                <attribute name="kind" value="function" id="12633" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="contextmenu" id="12634" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).std::vector&lt;(XBMCAddon::String)>)." id="12635" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="12636" addr="0x7fca46934c90" />
+                                <parmlist id="12637" addr="0x7fca469e85d0" >
                                     <parm id="12638">
-                                        <attributelist id="12639" addr="0x7f99f1e9a5d0" >
-                                            <attribute name="name" value="list" id="12640" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).std::vector&lt;(XBMCAddon::String)>" id="12641" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12639" addr="0x7fca469e85d0" >
+                                            <attribute name="name" value="list" id="12640" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).std::vector&lt;(XBMCAddon::String)>" id="12641" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="int" id="12642" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="12643" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="int" id="12642" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="12643" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="12644" addr="0x7f99f1e9b710" >
-                            <attributelist id="12645" addr="0x7f99f1e9b710" >
-                                <attribute name="name" value="multiselect" id="12646" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="12647" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="12648" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e9ba70" id="12649" addr="0x7f99f1e9ba70" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e9ba70" id="12650" addr="0x7f99f1e9ba70" />
-                                <attribute name="kind" value="function" id="12651" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="multiselect" id="12652" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>,int,r.q(const).std::vector&lt;(int)>,bool)." id="12653" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="12654" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e9b710" id="12655" addr="0x7f99f1e9b710" />
-                                <parmlist id="12656" addr="0x7f99f1e9aa30" >
+                        <cdecl id="12644" addr="0x7fca469e9710" >
+                            <attributelist id="12645" addr="0x7fca469e9710" >
+                                <attribute name="name" value="multiselect" id="12646" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="12647" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="12648" addr="0x7fca469e4af0" />
+                                <attribute name="sym_nextSibling" value="0x7fca469e9a70" id="12649" addr="0x7fca469e9a70" />
+                                <attribute name="csym_nextSibling" value="0x7fca469e9a70" id="12650" addr="0x7fca469e9a70" />
+                                <attribute name="kind" value="function" id="12651" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="multiselect" id="12652" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>,int,r.q(const).std::vector&lt;(int)>,bool)." id="12653" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="12654" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469e9710" id="12655" addr="0x7fca469e9710" />
+                                <parmlist id="12656" addr="0x7fca469e8a30" >
                                     <parm id="12657">
-                                        <attributelist id="12658" addr="0x7f99f1e9aa30" >
-                                            <attribute name="name" value="heading" id="12659" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12660" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12658" addr="0x7fca469e8a30" >
+                                            <attribute name="name" value="heading" id="12659" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12660" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12661">
-                                        <attributelist id="12662" addr="0x7f99f1e9afd0" >
-                                            <attribute name="name" value="options" id="12663" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>" id="12664" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12662" addr="0x7fca469e8fd0" >
+                                            <attribute name="name" value="options" id="12663" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>" id="12664" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12665">
-                                        <attributelist id="12666" addr="0x7f99f1e9b130" >
-                                            <attribute name="name" value="autoclose" id="12667" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="0" id="12668" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="12669" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12666" addr="0x7fca469e9130" >
+                                            <attribute name="name" value="autoclose" id="12667" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="0" id="12668" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="12669" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12670">
-                                        <attributelist id="12671" addr="0x7f99f1e9b4d0" >
-                                            <attribute name="name" value="preselect" id="12672" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="std::vector&lt; int >()" id="12673" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).std::vector&lt;(int)>" id="12674" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12671" addr="0x7fca469e94d0" >
+                                            <attribute name="name" value="preselect" id="12672" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="std::vector&lt; int >()" id="12673" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).std::vector&lt;(int)>" id="12674" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12675">
-                                        <attributelist id="12676" addr="0x7f99f1e9b650" >
-                                            <attribute name="name" value="useDetails" id="12677" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="false" id="12678" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="12679" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12676" addr="0x7fca469e9650" >
+                                            <attribute name="name" value="useDetails" id="12677" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="false" id="12678" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="12679" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="std::unique_ptr&lt;(std::vector&lt;(int)>)>" id="12680" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="12681" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="std::unique_ptr&lt;(std::vector&lt;(int)>)>" id="12680" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="12681" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="12682" addr="0x7f99f1e9ba70" >
-                            <attributelist id="12683" addr="0x7f99f1e9ba70" >
-                                <attribute name="name" value="multiselect" id="12684" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="12685" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="12686" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e9b710" id="12687" addr="0x7f99f1e9b710" />
-                                <attribute name="kind" value="function" id="12688" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="multiselect" id="12689" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e9bd30" id="12690" addr="0x7f99f1e9bd30" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e9bd30" id="12691" addr="0x7f99f1e9bd30" />
-                                <attribute name="defaultargs" value="0x7f99f1e9b710" id="12692" addr="0x7f99f1e9b710" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>,int,r.q(const).std::vector&lt;(int)>)." id="12693" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="12694" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e9b710" id="12695" addr="0x7f99f1e9b710" />
-                                <parmlist id="12696" addr="0x7f99f1e9b7b0" >
+                        <cdecl id="12682" addr="0x7fca469e9a70" >
+                            <attributelist id="12683" addr="0x7fca469e9a70" >
+                                <attribute name="name" value="multiselect" id="12684" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="12685" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="12686" addr="0x7fca469e4af0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469e9710" id="12687" addr="0x7fca469e9710" />
+                                <attribute name="kind" value="function" id="12688" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="multiselect" id="12689" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469e9d30" id="12690" addr="0x7fca469e9d30" />
+                                <attribute name="sym_nextSibling" value="0x7fca469e9d30" id="12691" addr="0x7fca469e9d30" />
+                                <attribute name="defaultargs" value="0x7fca469e9710" id="12692" addr="0x7fca469e9710" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>,int,r.q(const).std::vector&lt;(int)>)." id="12693" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="12694" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469e9710" id="12695" addr="0x7fca469e9710" />
+                                <parmlist id="12696" addr="0x7fca469e97b0" >
                                     <parm id="12697">
-                                        <attributelist id="12698" addr="0x7f99f1e9b7b0" >
-                                            <attribute name="name" value="heading" id="12699" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12700" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12698" addr="0x7fca469e97b0" >
+                                            <attribute name="name" value="heading" id="12699" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12700" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12701">
-                                        <attributelist id="12702" addr="0x7f99f1e9b890" >
-                                            <attribute name="name" value="options" id="12703" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>" id="12704" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12702" addr="0x7fca469e9890" >
+                                            <attribute name="name" value="options" id="12703" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>" id="12704" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12705">
-                                        <attributelist id="12706" addr="0x7f99f1e9b910" >
-                                            <attribute name="name" value="autoclose" id="12707" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="0" id="12708" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="12709" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12706" addr="0x7fca469e9910" >
+                                            <attribute name="name" value="autoclose" id="12707" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="0" id="12708" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="12709" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12710">
-                                        <attributelist id="12711" addr="0x7f99f1e9b9b0" >
-                                            <attribute name="name" value="preselect" id="12712" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="std::vector&lt; int >()" id="12713" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).std::vector&lt;(int)>" id="12714" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12711" addr="0x7fca469e99b0" >
+                                            <attribute name="name" value="preselect" id="12712" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="std::vector&lt; int >()" id="12713" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).std::vector&lt;(int)>" id="12714" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="std::unique_ptr&lt;(std::vector&lt;(int)>)>" id="12715" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="12716" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="std::unique_ptr&lt;(std::vector&lt;(int)>)>" id="12715" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="12716" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="12717" addr="0x7f99f1e9bd30" >
-                            <attributelist id="12718" addr="0x7f99f1e9bd30" >
-                                <attribute name="name" value="multiselect" id="12719" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="12720" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="12721" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e9ba70" id="12722" addr="0x7f99f1e9ba70" />
-                                <attribute name="kind" value="function" id="12723" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="multiselect" id="12724" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e9bf50" id="12725" addr="0x7f99f1e9bf50" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e9bf50" id="12726" addr="0x7f99f1e9bf50" />
-                                <attribute name="defaultargs" value="0x7f99f1e9b710" id="12727" addr="0x7f99f1e9b710" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>,int)." id="12728" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="12729" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e9b710" id="12730" addr="0x7f99f1e9b710" />
-                                <parmlist id="12731" addr="0x7f99f1e9bb10" >
+                        <cdecl id="12717" addr="0x7fca469e9d30" >
+                            <attributelist id="12718" addr="0x7fca469e9d30" >
+                                <attribute name="name" value="multiselect" id="12719" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="12720" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="12721" addr="0x7fca469e4af0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469e9a70" id="12722" addr="0x7fca469e9a70" />
+                                <attribute name="kind" value="function" id="12723" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="multiselect" id="12724" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469e9f50" id="12725" addr="0x7fca469e9f50" />
+                                <attribute name="sym_nextSibling" value="0x7fca469e9f50" id="12726" addr="0x7fca469e9f50" />
+                                <attribute name="defaultargs" value="0x7fca469e9710" id="12727" addr="0x7fca469e9710" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>,int)." id="12728" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="12729" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469e9710" id="12730" addr="0x7fca469e9710" />
+                                <parmlist id="12731" addr="0x7fca469e9b10" >
                                     <parm id="12732">
-                                        <attributelist id="12733" addr="0x7f99f1e9bb10" >
-                                            <attribute name="name" value="heading" id="12734" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12735" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12733" addr="0x7fca469e9b10" >
+                                            <attribute name="name" value="heading" id="12734" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12735" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12736">
-                                        <attributelist id="12737" addr="0x7f99f1e9bbf0" >
-                                            <attribute name="name" value="options" id="12738" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>" id="12739" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12737" addr="0x7fca469e9bf0" >
+                                            <attribute name="name" value="options" id="12738" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>" id="12739" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12740">
-                                        <attributelist id="12741" addr="0x7f99f1e9bc70" >
-                                            <attribute name="name" value="autoclose" id="12742" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="0" id="12743" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="12744" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12741" addr="0x7fca469e9c70" >
+                                            <attribute name="name" value="autoclose" id="12742" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="0" id="12743" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="12744" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="std::unique_ptr&lt;(std::vector&lt;(int)>)>" id="12745" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_2" id="12746" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="std::unique_ptr&lt;(std::vector&lt;(int)>)>" id="12745" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_2" id="12746" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="12747" addr="0x7f99f1e9bf50" >
-                            <attributelist id="12748" addr="0x7f99f1e9bf50" >
-                                <attribute name="name" value="multiselect" id="12749" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="12750" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="12751" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e9bd30" id="12752" addr="0x7f99f1e9bd30" />
-                                <attribute name="kind" value="function" id="12753" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="multiselect" id="12754" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e9b710" id="12755" addr="0x7f99f1e9b710" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>)." id="12756" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="12757" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e9b710" id="12758" addr="0x7f99f1e9b710" />
-                                <parmlist id="12759" addr="0x7f99f1e9bdd0" >
+                        <cdecl id="12747" addr="0x7fca469e9f50" >
+                            <attributelist id="12748" addr="0x7fca469e9f50" >
+                                <attribute name="name" value="multiselect" id="12749" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="12750" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="12751" addr="0x7fca469e4af0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469e9d30" id="12752" addr="0x7fca469e9d30" />
+                                <attribute name="kind" value="function" id="12753" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="multiselect" id="12754" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469e9710" id="12755" addr="0x7fca469e9710" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>)." id="12756" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="12757" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469e9710" id="12758" addr="0x7fca469e9710" />
+                                <parmlist id="12759" addr="0x7fca469e9dd0" >
                                     <parm id="12760">
-                                        <attributelist id="12761" addr="0x7f99f1e9bdd0" >
-                                            <attribute name="name" value="heading" id="12762" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12763" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12761" addr="0x7fca469e9dd0" >
+                                            <attribute name="name" value="heading" id="12762" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12763" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12764">
-                                        <attributelist id="12765" addr="0x7f99f1e9beb0" >
-                                            <attribute name="name" value="options" id="12766" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>" id="12767" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12765" addr="0x7fca469e9eb0" >
+                                            <attribute name="name" value="options" id="12766" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>" id="12767" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="std::unique_ptr&lt;(std::vector&lt;(int)>)>" id="12768" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_3" id="12769" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="std::unique_ptr&lt;(std::vector&lt;(int)>)>" id="12768" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_3" id="12769" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="12770" addr="0x7f99f1e9c6d0" >
-                            <attributelist id="12771" addr="0x7f99f1e9c6d0" >
-                                <attribute name="name" value="ok" id="12772" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="12773" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="12774" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e9c990" id="12775" addr="0x7f99f1e9c990" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e9c990" id="12776" addr="0x7f99f1e9c990" />
-                                <attribute name="kind" value="function" id="12777" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="ok" id="12778" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="12779" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="12780" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e9c6d0" id="12781" addr="0x7f99f1e9c6d0" />
-                                <parmlist id="12782" addr="0x7f99f1e9c190" >
+                        <cdecl id="12770" addr="0x7fca469ea6d0" >
+                            <attributelist id="12771" addr="0x7fca469ea6d0" >
+                                <attribute name="name" value="ok" id="12772" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="12773" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="12774" addr="0x7fca469e4af0" />
+                                <attribute name="sym_nextSibling" value="0x7fca469ea990" id="12775" addr="0x7fca469ea990" />
+                                <attribute name="csym_nextSibling" value="0x7fca469ea990" id="12776" addr="0x7fca469ea990" />
+                                <attribute name="kind" value="function" id="12777" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="ok" id="12778" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="12779" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="12780" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469ea6d0" id="12781" addr="0x7fca469ea6d0" />
+                                <parmlist id="12782" addr="0x7fca469ea190" >
                                     <parm id="12783">
-                                        <attributelist id="12784" addr="0x7f99f1e9c190" >
-                                            <attribute name="name" value="heading" id="12785" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12786" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12784" addr="0x7fca469ea190" >
+                                            <attribute name="name" value="heading" id="12785" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12786" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12787">
-                                        <attributelist id="12788" addr="0x7f99f1e9c2d0" >
-                                            <attribute name="name" value="line1" id="12789" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12790" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12788" addr="0x7fca469ea2d0" >
+                                            <attribute name="name" value="line1" id="12789" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12790" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12791">
-                                        <attributelist id="12792" addr="0x7f99f1e9c470" >
-                                            <attribute name="name" value="line2" id="12793" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="12794" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12795" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12792" addr="0x7fca469ea470" >
+                                            <attribute name="name" value="line2" id="12793" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="12794" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12795" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12796">
-                                        <attributelist id="12797" addr="0x7f99f1e9c610" >
-                                            <attribute name="name" value="line3" id="12798" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="12799" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12800" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12797" addr="0x7fca469ea610" >
+                                            <attribute name="name" value="line3" id="12798" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="12799" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12800" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="bool" id="12801" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="12802" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="bool" id="12801" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="12802" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="12803" addr="0x7f99f1e9c990" >
-                            <attributelist id="12804" addr="0x7f99f1e9c990" >
-                                <attribute name="name" value="ok" id="12805" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="12806" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="12807" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e9c6d0" id="12808" addr="0x7f99f1e9c6d0" />
-                                <attribute name="kind" value="function" id="12809" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="ok" id="12810" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e9cbb0" id="12811" addr="0x7f99f1e9cbb0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e9cbb0" id="12812" addr="0x7f99f1e9cbb0" />
-                                <attribute name="defaultargs" value="0x7f99f1e9c6d0" id="12813" addr="0x7f99f1e9c6d0" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="12814" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="12815" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e9c6d0" id="12816" addr="0x7f99f1e9c6d0" />
-                                <parmlist id="12817" addr="0x7f99f1e9c770" >
+                        <cdecl id="12803" addr="0x7fca469ea990" >
+                            <attributelist id="12804" addr="0x7fca469ea990" >
+                                <attribute name="name" value="ok" id="12805" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="12806" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="12807" addr="0x7fca469e4af0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469ea6d0" id="12808" addr="0x7fca469ea6d0" />
+                                <attribute name="kind" value="function" id="12809" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="ok" id="12810" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469eabb0" id="12811" addr="0x7fca469eabb0" />
+                                <attribute name="sym_nextSibling" value="0x7fca469eabb0" id="12812" addr="0x7fca469eabb0" />
+                                <attribute name="defaultargs" value="0x7fca469ea6d0" id="12813" addr="0x7fca469ea6d0" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="12814" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="12815" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469ea6d0" id="12816" addr="0x7fca469ea6d0" />
+                                <parmlist id="12817" addr="0x7fca469ea770" >
                                     <parm id="12818">
-                                        <attributelist id="12819" addr="0x7f99f1e9c770" >
-                                            <attribute name="name" value="heading" id="12820" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12821" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12819" addr="0x7fca469ea770" >
+                                            <attribute name="name" value="heading" id="12820" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12821" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12822">
-                                        <attributelist id="12823" addr="0x7f99f1e9c850" >
-                                            <attribute name="name" value="line1" id="12824" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12825" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12823" addr="0x7fca469ea850" >
+                                            <attribute name="name" value="line1" id="12824" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12825" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12826">
-                                        <attributelist id="12827" addr="0x7f99f1e9c8d0" >
-                                            <attribute name="name" value="line2" id="12828" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="12829" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12830" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12827" addr="0x7fca469ea8d0" >
+                                            <attribute name="name" value="line2" id="12828" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="12829" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12830" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="bool" id="12831" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="12832" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="bool" id="12831" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="12832" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="12833" addr="0x7f99f1e9cbb0" >
-                            <attributelist id="12834" addr="0x7f99f1e9cbb0" >
-                                <attribute name="name" value="ok" id="12835" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="12836" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="12837" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e9c990" id="12838" addr="0x7f99f1e9c990" />
-                                <attribute name="kind" value="function" id="12839" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="ok" id="12840" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e9c6d0" id="12841" addr="0x7f99f1e9c6d0" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="12842" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="12843" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e9c6d0" id="12844" addr="0x7f99f1e9c6d0" />
-                                <parmlist id="12845" addr="0x7f99f1e9ca30" >
+                        <cdecl id="12833" addr="0x7fca469eabb0" >
+                            <attributelist id="12834" addr="0x7fca469eabb0" >
+                                <attribute name="name" value="ok" id="12835" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="12836" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="12837" addr="0x7fca469e4af0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469ea990" id="12838" addr="0x7fca469ea990" />
+                                <attribute name="kind" value="function" id="12839" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="ok" id="12840" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469ea6d0" id="12841" addr="0x7fca469ea6d0" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="12842" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="12843" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469ea6d0" id="12844" addr="0x7fca469ea6d0" />
+                                <parmlist id="12845" addr="0x7fca469eaa30" >
                                     <parm id="12846">
-                                        <attributelist id="12847" addr="0x7f99f1e9ca30" >
-                                            <attribute name="name" value="heading" id="12848" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12849" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12847" addr="0x7fca469eaa30" >
+                                            <attribute name="name" value="heading" id="12848" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12849" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12850">
-                                        <attributelist id="12851" addr="0x7f99f1e9cb10" >
-                                            <attribute name="name" value="line1" id="12852" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12853" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12851" addr="0x7fca469eab10" >
+                                            <attribute name="name" value="line1" id="12852" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12853" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="bool" id="12854" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_2" id="12855" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="bool" id="12854" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_2" id="12855" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="12856" addr="0x7f99f1d9c130" >
-                            <attributelist id="12857" addr="0x7f99f1d9c130" >
-                                <attribute name="name" value="textviewer" id="12858" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="12859" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="12860" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1d9c350" id="12861" addr="0x7f99f1d9c350" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1d9c350" id="12862" addr="0x7f99f1d9c350" />
-                                <attribute name="kind" value="function" id="12863" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="textviewer" id="12864" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,bool)." id="12865" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="12866" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1d9c130" id="12867" addr="0x7f99f1d9c130" />
-                                <parmlist id="12868" addr="0x7f99f1e9cdf0" >
+                        <cdecl id="12856" addr="0x7fca468ea130" >
+                            <attributelist id="12857" addr="0x7fca468ea130" >
+                                <attribute name="name" value="textviewer" id="12858" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="12859" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="12860" addr="0x7fca469e4af0" />
+                                <attribute name="sym_nextSibling" value="0x7fca468ea350" id="12861" addr="0x7fca468ea350" />
+                                <attribute name="csym_nextSibling" value="0x7fca468ea350" id="12862" addr="0x7fca468ea350" />
+                                <attribute name="kind" value="function" id="12863" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="textviewer" id="12864" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,bool)." id="12865" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="12866" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468ea130" id="12867" addr="0x7fca468ea130" />
+                                <parmlist id="12868" addr="0x7fca469eadf0" >
                                     <parm id="12869">
-                                        <attributelist id="12870" addr="0x7f99f1e9cdf0" >
-                                            <attribute name="name" value="heading" id="12871" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12872" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12870" addr="0x7fca469eadf0" >
+                                            <attribute name="name" value="heading" id="12871" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12872" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12873">
-                                        <attributelist id="12874" addr="0x7f99f1e9cf30" >
-                                            <attribute name="name" value="text" id="12875" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12876" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12874" addr="0x7fca469eaf30" >
+                                            <attribute name="name" value="text" id="12875" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12876" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12877">
-                                        <attributelist id="12878" addr="0x7f99f1d9c070" >
-                                            <attribute name="name" value="usemono" id="12879" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="false" id="12880" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="12881" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12878" addr="0x7fca468ea070" >
+                                            <attribute name="name" value="usemono" id="12879" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="false" id="12880" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="12881" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="12882" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="12883" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="12882" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="12883" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="12884" addr="0x7f99f1d9c350" >
-                            <attributelist id="12885" addr="0x7f99f1d9c350" >
-                                <attribute name="name" value="textviewer" id="12886" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="12887" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="12888" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1d9c130" id="12889" addr="0x7f99f1d9c130" />
-                                <attribute name="kind" value="function" id="12890" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="textviewer" id="12891" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1d9c130" id="12892" addr="0x7f99f1d9c130" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="12893" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="12894" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1d9c130" id="12895" addr="0x7f99f1d9c130" />
-                                <parmlist id="12896" addr="0x7f99f1d9c1d0" >
+                        <cdecl id="12884" addr="0x7fca468ea350" >
+                            <attributelist id="12885" addr="0x7fca468ea350" >
+                                <attribute name="name" value="textviewer" id="12886" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="12887" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="12888" addr="0x7fca469e4af0" />
+                                <attribute name="sym_previousSibling" value="0x7fca468ea130" id="12889" addr="0x7fca468ea130" />
+                                <attribute name="kind" value="function" id="12890" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="textviewer" id="12891" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca468ea130" id="12892" addr="0x7fca468ea130" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="12893" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="12894" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468ea130" id="12895" addr="0x7fca468ea130" />
+                                <parmlist id="12896" addr="0x7fca468ea1d0" >
                                     <parm id="12897">
-                                        <attributelist id="12898" addr="0x7f99f1d9c1d0" >
-                                            <attribute name="name" value="heading" id="12899" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12900" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12898" addr="0x7fca468ea1d0" >
+                                            <attribute name="name" value="heading" id="12899" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12900" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12901">
-                                        <attributelist id="12902" addr="0x7f99f1d9c2b0" >
-                                            <attribute name="name" value="text" id="12903" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12904" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12902" addr="0x7fca468ea2b0" >
+                                            <attribute name="name" value="text" id="12903" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12904" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="12905" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="12906" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="12905" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="12906" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="12907" addr="0x7f99f1d9d270" >
-                            <attributelist id="12908" addr="0x7f99f1d9d270" >
-                                <attribute name="name" value="browse" id="12909" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="12910" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="12911" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1d9d790" id="12912" addr="0x7f99f1d9d790" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1d9d790" id="12913" addr="0x7f99f1d9d790" />
-                                <attribute name="kind" value="function" id="12914" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="browse" id="12915" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,bool,bool,r.q(const).XBMCAddon::String,bool)." id="12916" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="12917" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1d9d270" id="12918" addr="0x7f99f1d9d270" />
-                                <parmlist id="12919" addr="0x7f99f1d9c790" >
+                        <cdecl id="12907" addr="0x7fca468eb270" >
+                            <attributelist id="12908" addr="0x7fca468eb270" >
+                                <attribute name="name" value="browse" id="12909" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="12910" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="12911" addr="0x7fca469e4af0" />
+                                <attribute name="sym_nextSibling" value="0x7fca468eb790" id="12912" addr="0x7fca468eb790" />
+                                <attribute name="csym_nextSibling" value="0x7fca468eb790" id="12913" addr="0x7fca468eb790" />
+                                <attribute name="kind" value="function" id="12914" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="browse" id="12915" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,bool,bool,r.q(const).XBMCAddon::String,bool)." id="12916" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="12917" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468eb270" id="12918" addr="0x7fca468eb270" />
+                                <parmlist id="12919" addr="0x7fca468ea790" >
                                     <parm id="12920">
-                                        <attributelist id="12921" addr="0x7f99f1d9c790" >
-                                            <attribute name="name" value="type" id="12922" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="12923" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12921" addr="0x7fca468ea790" >
+                                            <attribute name="name" value="type" id="12922" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="12923" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12924">
-                                        <attributelist id="12925" addr="0x7f99f1d9c970" >
-                                            <attribute name="name" value="heading" id="12926" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12927" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12925" addr="0x7fca468ea970" >
+                                            <attribute name="name" value="heading" id="12926" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12927" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12928">
-                                        <attributelist id="12929" addr="0x7f99f1d9cab0" >
-                                            <attribute name="name" value="shares" id="12930" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12931" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12929" addr="0x7fca468eaab0" >
+                                            <attribute name="name" value="shares" id="12930" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12931" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12932">
-                                        <attributelist id="12933" addr="0x7f99f1d9cc50" >
-                                            <attribute name="name" value="mask" id="12934" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="12935" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12936" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12933" addr="0x7fca468eac50" >
+                                            <attribute name="name" value="mask" id="12934" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="12935" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12936" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12937">
-                                        <attributelist id="12938" addr="0x7f99f1d9cd90" >
-                                            <attribute name="name" value="useThumbs" id="12939" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="false" id="12940" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="12941" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12938" addr="0x7fca468ead90" >
+                                            <attribute name="name" value="useThumbs" id="12939" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="false" id="12940" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="12941" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12942">
-                                        <attributelist id="12943" addr="0x7f99f1d9ced0" >
-                                            <attribute name="name" value="treatAsFolder" id="12944" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="false" id="12945" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="12946" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12943" addr="0x7fca468eaed0" >
+                                            <attribute name="name" value="treatAsFolder" id="12944" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="false" id="12945" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="12946" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12947">
-                                        <attributelist id="12948" addr="0x7f99f1d9d070" >
-                                            <attribute name="name" value="defaultt" id="12949" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="12950" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12951" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12948" addr="0x7fca468eb070" >
+                                            <attribute name="name" value="defaultt" id="12949" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="12950" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12951" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12952">
-                                        <attributelist id="12953" addr="0x7f99f1d9d1b0" >
-                                            <attribute name="name" value="enableMultiple" id="12954" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="false" id="12955" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="12956" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12953" addr="0x7fca468eb1b0" >
+                                            <attribute name="name" value="enableMultiple" id="12954" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="false" id="12955" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="12956" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="Alternative&lt;(XBMCAddon::String,std::vector&lt;(XBMCAddon::String)>)>" id="12957" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="12958" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="Alternative&lt;(XBMCAddon::String,std::vector&lt;(XBMCAddon::String)>)>" id="12957" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="12958" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="12959" addr="0x7f99f1d9d790" >
-                            <attributelist id="12960" addr="0x7f99f1d9d790" >
-                                <attribute name="name" value="browse" id="12961" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="12962" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="12963" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1d9d270" id="12964" addr="0x7f99f1d9d270" />
-                                <attribute name="kind" value="function" id="12965" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="browse" id="12966" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1d9dc10" id="12967" addr="0x7f99f1d9dc10" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1d9dc10" id="12968" addr="0x7f99f1d9dc10" />
-                                <attribute name="defaultargs" value="0x7f99f1d9d270" id="12969" addr="0x7f99f1d9d270" />
-                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,bool,bool,r.q(const).XBMCAddon::String)." id="12970" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="12971" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1d9d270" id="12972" addr="0x7f99f1d9d270" />
-                                <parmlist id="12973" addr="0x7f99f1d9d310" >
+                        <cdecl id="12959" addr="0x7fca468eb790" >
+                            <attributelist id="12960" addr="0x7fca468eb790" >
+                                <attribute name="name" value="browse" id="12961" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="12962" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="12963" addr="0x7fca469e4af0" />
+                                <attribute name="sym_previousSibling" value="0x7fca468eb270" id="12964" addr="0x7fca468eb270" />
+                                <attribute name="kind" value="function" id="12965" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="browse" id="12966" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca468ebc10" id="12967" addr="0x7fca468ebc10" />
+                                <attribute name="sym_nextSibling" value="0x7fca468ebc10" id="12968" addr="0x7fca468ebc10" />
+                                <attribute name="defaultargs" value="0x7fca468eb270" id="12969" addr="0x7fca468eb270" />
+                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,bool,bool,r.q(const).XBMCAddon::String)." id="12970" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="12971" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468eb270" id="12972" addr="0x7fca468eb270" />
+                                <parmlist id="12973" addr="0x7fca468eb310" >
                                     <parm id="12974">
-                                        <attributelist id="12975" addr="0x7f99f1d9d310" >
-                                            <attribute name="name" value="type" id="12976" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="12977" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12975" addr="0x7fca468eb310" >
+                                            <attribute name="name" value="type" id="12976" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="12977" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12978">
-                                        <attributelist id="12979" addr="0x7f99f1d9d3f0" >
-                                            <attribute name="name" value="heading" id="12980" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12981" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12979" addr="0x7fca468eb3f0" >
+                                            <attribute name="name" value="heading" id="12980" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12981" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12982">
-                                        <attributelist id="12983" addr="0x7f99f1d9d470" >
-                                            <attribute name="name" value="shares" id="12984" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12985" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12983" addr="0x7fca468eb470" >
+                                            <attribute name="name" value="shares" id="12984" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12985" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12986">
-                                        <attributelist id="12987" addr="0x7f99f1d9d4f0" >
-                                            <attribute name="name" value="mask" id="12988" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="12989" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12990" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12987" addr="0x7fca468eb4f0" >
+                                            <attribute name="name" value="mask" id="12988" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="12989" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12990" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12991">
-                                        <attributelist id="12992" addr="0x7f99f1d9d590" >
-                                            <attribute name="name" value="useThumbs" id="12993" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="false" id="12994" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="12995" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12992" addr="0x7fca468eb590" >
+                                            <attribute name="name" value="useThumbs" id="12993" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="false" id="12994" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="12995" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12996">
-                                        <attributelist id="12997" addr="0x7f99f1d9d630" >
-                                            <attribute name="name" value="treatAsFolder" id="12998" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="false" id="12999" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="13000" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12997" addr="0x7fca468eb630" >
+                                            <attribute name="name" value="treatAsFolder" id="12998" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="false" id="12999" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="13000" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13001">
-                                        <attributelist id="13002" addr="0x7f99f1d9d6d0" >
-                                            <attribute name="name" value="defaultt" id="13003" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="13004" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13005" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13002" addr="0x7fca468eb6d0" >
+                                            <attribute name="name" value="defaultt" id="13003" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="13004" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13005" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="Alternative&lt;(XBMCAddon::String,std::vector&lt;(XBMCAddon::String)>)>" id="13006" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="13007" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="Alternative&lt;(XBMCAddon::String,std::vector&lt;(XBMCAddon::String)>)>" id="13006" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="13007" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="13008" addr="0x7f99f1d9dc10" >
-                            <attributelist id="13009" addr="0x7f99f1d9dc10" >
-                                <attribute name="name" value="browse" id="13010" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="13011" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="13012" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1d9d790" id="13013" addr="0x7f99f1d9d790" />
-                                <attribute name="kind" value="function" id="13014" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="browse" id="13015" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1d9dff0" id="13016" addr="0x7f99f1d9dff0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1d9dff0" id="13017" addr="0x7f99f1d9dff0" />
-                                <attribute name="defaultargs" value="0x7f99f1d9d270" id="13018" addr="0x7f99f1d9d270" />
-                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,bool,bool)." id="13019" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="13020" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1d9d270" id="13021" addr="0x7f99f1d9d270" />
-                                <parmlist id="13022" addr="0x7f99f1d9d830" >
+                        <cdecl id="13008" addr="0x7fca468ebc10" >
+                            <attributelist id="13009" addr="0x7fca468ebc10" >
+                                <attribute name="name" value="browse" id="13010" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="13011" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="13012" addr="0x7fca469e4af0" />
+                                <attribute name="sym_previousSibling" value="0x7fca468eb790" id="13013" addr="0x7fca468eb790" />
+                                <attribute name="kind" value="function" id="13014" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="browse" id="13015" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca468ebff0" id="13016" addr="0x7fca468ebff0" />
+                                <attribute name="sym_nextSibling" value="0x7fca468ebff0" id="13017" addr="0x7fca468ebff0" />
+                                <attribute name="defaultargs" value="0x7fca468eb270" id="13018" addr="0x7fca468eb270" />
+                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,bool,bool)." id="13019" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="13020" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468eb270" id="13021" addr="0x7fca468eb270" />
+                                <parmlist id="13022" addr="0x7fca468eb830" >
                                     <parm id="13023">
-                                        <attributelist id="13024" addr="0x7f99f1d9d830" >
-                                            <attribute name="name" value="type" id="13025" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="13026" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13024" addr="0x7fca468eb830" >
+                                            <attribute name="name" value="type" id="13025" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="13026" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13027">
-                                        <attributelist id="13028" addr="0x7f99f1d9d910" >
-                                            <attribute name="name" value="heading" id="13029" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13030" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13028" addr="0x7fca468eb910" >
+                                            <attribute name="name" value="heading" id="13029" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13030" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13031">
-                                        <attributelist id="13032" addr="0x7f99f1d9d990" >
-                                            <attribute name="name" value="shares" id="13033" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13034" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13032" addr="0x7fca468eb990" >
+                                            <attribute name="name" value="shares" id="13033" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13034" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13035">
-                                        <attributelist id="13036" addr="0x7f99f1d9da10" >
-                                            <attribute name="name" value="mask" id="13037" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="13038" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13039" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13036" addr="0x7fca468eba10" >
+                                            <attribute name="name" value="mask" id="13037" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="13038" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13039" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13040">
-                                        <attributelist id="13041" addr="0x7f99f1d9dab0" >
-                                            <attribute name="name" value="useThumbs" id="13042" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="false" id="13043" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="13044" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13041" addr="0x7fca468ebab0" >
+                                            <attribute name="name" value="useThumbs" id="13042" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="false" id="13043" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="13044" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13045">
-                                        <attributelist id="13046" addr="0x7f99f1d9db50" >
-                                            <attribute name="name" value="treatAsFolder" id="13047" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="false" id="13048" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="13049" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13046" addr="0x7fca468ebb50" >
+                                            <attribute name="name" value="treatAsFolder" id="13047" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="false" id="13048" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="13049" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="Alternative&lt;(XBMCAddon::String,std::vector&lt;(XBMCAddon::String)>)>" id="13050" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_2" id="13051" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="Alternative&lt;(XBMCAddon::String,std::vector&lt;(XBMCAddon::String)>)>" id="13050" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_2" id="13051" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="13052" addr="0x7f99f1d9dff0" >
-                            <attributelist id="13053" addr="0x7f99f1d9dff0" >
-                                <attribute name="name" value="browse" id="13054" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="13055" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="13056" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1d9dc10" id="13057" addr="0x7f99f1d9dc10" />
-                                <attribute name="kind" value="function" id="13058" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="browse" id="13059" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1d9e330" id="13060" addr="0x7f99f1d9e330" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1d9e330" id="13061" addr="0x7f99f1d9e330" />
-                                <attribute name="defaultargs" value="0x7f99f1d9d270" id="13062" addr="0x7f99f1d9d270" />
-                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,bool)." id="13063" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="13064" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1d9d270" id="13065" addr="0x7f99f1d9d270" />
-                                <parmlist id="13066" addr="0x7f99f1d9dcb0" >
+                        <cdecl id="13052" addr="0x7fca468ebff0" >
+                            <attributelist id="13053" addr="0x7fca468ebff0" >
+                                <attribute name="name" value="browse" id="13054" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="13055" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="13056" addr="0x7fca469e4af0" />
+                                <attribute name="sym_previousSibling" value="0x7fca468ebc10" id="13057" addr="0x7fca468ebc10" />
+                                <attribute name="kind" value="function" id="13058" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="browse" id="13059" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca468ec330" id="13060" addr="0x7fca468ec330" />
+                                <attribute name="sym_nextSibling" value="0x7fca468ec330" id="13061" addr="0x7fca468ec330" />
+                                <attribute name="defaultargs" value="0x7fca468eb270" id="13062" addr="0x7fca468eb270" />
+                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,bool)." id="13063" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="13064" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468eb270" id="13065" addr="0x7fca468eb270" />
+                                <parmlist id="13066" addr="0x7fca468ebcb0" >
                                     <parm id="13067">
-                                        <attributelist id="13068" addr="0x7f99f1d9dcb0" >
-                                            <attribute name="name" value="type" id="13069" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="13070" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13068" addr="0x7fca468ebcb0" >
+                                            <attribute name="name" value="type" id="13069" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="13070" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13071">
-                                        <attributelist id="13072" addr="0x7f99f1d9dd90" >
-                                            <attribute name="name" value="heading" id="13073" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13074" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13072" addr="0x7fca468ebd90" >
+                                            <attribute name="name" value="heading" id="13073" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13074" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13075">
-                                        <attributelist id="13076" addr="0x7f99f1d9de10" >
-                                            <attribute name="name" value="shares" id="13077" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13078" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13076" addr="0x7fca468ebe10" >
+                                            <attribute name="name" value="shares" id="13077" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13078" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13079">
-                                        <attributelist id="13080" addr="0x7f99f1d9de90" >
-                                            <attribute name="name" value="mask" id="13081" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="13082" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13083" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13080" addr="0x7fca468ebe90" >
+                                            <attribute name="name" value="mask" id="13081" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="13082" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13083" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13084">
-                                        <attributelist id="13085" addr="0x7f99f1d9df30" >
-                                            <attribute name="name" value="useThumbs" id="13086" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="false" id="13087" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="13088" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13085" addr="0x7fca468ebf30" >
+                                            <attribute name="name" value="useThumbs" id="13086" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="false" id="13087" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="13088" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="Alternative&lt;(XBMCAddon::String,std::vector&lt;(XBMCAddon::String)>)>" id="13089" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_3" id="13090" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="Alternative&lt;(XBMCAddon::String,std::vector&lt;(XBMCAddon::String)>)>" id="13089" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_3" id="13090" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="13091" addr="0x7f99f1d9e330" >
-                            <attributelist id="13092" addr="0x7f99f1d9e330" >
-                                <attribute name="name" value="browse" id="13093" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="13094" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="13095" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1d9dff0" id="13096" addr="0x7f99f1d9dff0" />
-                                <attribute name="kind" value="function" id="13097" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="browse" id="13098" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1d9e5d0" id="13099" addr="0x7f99f1d9e5d0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1d9e5d0" id="13100" addr="0x7f99f1d9e5d0" />
-                                <attribute name="defaultargs" value="0x7f99f1d9d270" id="13101" addr="0x7f99f1d9d270" />
-                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="13102" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="13103" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1d9d270" id="13104" addr="0x7f99f1d9d270" />
-                                <parmlist id="13105" addr="0x7f99f1d9e090" >
+                        <cdecl id="13091" addr="0x7fca468ec330" >
+                            <attributelist id="13092" addr="0x7fca468ec330" >
+                                <attribute name="name" value="browse" id="13093" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="13094" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="13095" addr="0x7fca469e4af0" />
+                                <attribute name="sym_previousSibling" value="0x7fca468ebff0" id="13096" addr="0x7fca468ebff0" />
+                                <attribute name="kind" value="function" id="13097" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="browse" id="13098" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca468ec5d0" id="13099" addr="0x7fca468ec5d0" />
+                                <attribute name="sym_nextSibling" value="0x7fca468ec5d0" id="13100" addr="0x7fca468ec5d0" />
+                                <attribute name="defaultargs" value="0x7fca468eb270" id="13101" addr="0x7fca468eb270" />
+                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="13102" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="13103" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468eb270" id="13104" addr="0x7fca468eb270" />
+                                <parmlist id="13105" addr="0x7fca468ec090" >
                                     <parm id="13106">
-                                        <attributelist id="13107" addr="0x7f99f1d9e090" >
-                                            <attribute name="name" value="type" id="13108" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="13109" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13107" addr="0x7fca468ec090" >
+                                            <attribute name="name" value="type" id="13108" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="13109" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13110">
-                                        <attributelist id="13111" addr="0x7f99f1d9e170" >
-                                            <attribute name="name" value="heading" id="13112" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13113" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13111" addr="0x7fca468ec170" >
+                                            <attribute name="name" value="heading" id="13112" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13113" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13114">
-                                        <attributelist id="13115" addr="0x7f99f1d9e1f0" >
-                                            <attribute name="name" value="shares" id="13116" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13117" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13115" addr="0x7fca468ec1f0" >
+                                            <attribute name="name" value="shares" id="13116" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13117" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13118">
-                                        <attributelist id="13119" addr="0x7f99f1d9e270" >
-                                            <attribute name="name" value="mask" id="13120" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="13121" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13122" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13119" addr="0x7fca468ec270" >
+                                            <attribute name="name" value="mask" id="13120" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="13121" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13122" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="Alternative&lt;(XBMCAddon::String,std::vector&lt;(XBMCAddon::String)>)>" id="13123" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_4" id="13124" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="Alternative&lt;(XBMCAddon::String,std::vector&lt;(XBMCAddon::String)>)>" id="13123" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_4" id="13124" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="13125" addr="0x7f99f1d9e5d0" >
-                            <attributelist id="13126" addr="0x7f99f1d9e5d0" >
-                                <attribute name="name" value="browse" id="13127" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="13128" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="13129" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1d9e330" id="13130" addr="0x7f99f1d9e330" />
-                                <attribute name="kind" value="function" id="13131" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="browse" id="13132" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1d9d270" id="13133" addr="0x7f99f1d9d270" />
-                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="13134" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="13135" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1d9d270" id="13136" addr="0x7f99f1d9d270" />
-                                <parmlist id="13137" addr="0x7f99f1d9e3d0" >
+                        <cdecl id="13125" addr="0x7fca468ec5d0" >
+                            <attributelist id="13126" addr="0x7fca468ec5d0" >
+                                <attribute name="name" value="browse" id="13127" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="13128" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="13129" addr="0x7fca469e4af0" />
+                                <attribute name="sym_previousSibling" value="0x7fca468ec330" id="13130" addr="0x7fca468ec330" />
+                                <attribute name="kind" value="function" id="13131" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="browse" id="13132" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca468eb270" id="13133" addr="0x7fca468eb270" />
+                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="13134" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="13135" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468eb270" id="13136" addr="0x7fca468eb270" />
+                                <parmlist id="13137" addr="0x7fca468ec3d0" >
                                     <parm id="13138">
-                                        <attributelist id="13139" addr="0x7f99f1d9e3d0" >
-                                            <attribute name="name" value="type" id="13140" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="13141" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13139" addr="0x7fca468ec3d0" >
+                                            <attribute name="name" value="type" id="13140" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="13141" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13142">
-                                        <attributelist id="13143" addr="0x7f99f1d9e4b0" >
-                                            <attribute name="name" value="heading" id="13144" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13145" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13143" addr="0x7fca468ec4b0" >
+                                            <attribute name="name" value="heading" id="13144" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13145" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13146">
-                                        <attributelist id="13147" addr="0x7f99f1d9e530" >
-                                            <attribute name="name" value="shares" id="13148" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13149" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13147" addr="0x7fca468ec530" >
+                                            <attribute name="name" value="shares" id="13148" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13149" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="Alternative&lt;(XBMCAddon::String,std::vector&lt;(XBMCAddon::String)>)>" id="13150" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_5" id="13151" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="Alternative&lt;(XBMCAddon::String,std::vector&lt;(XBMCAddon::String)>)>" id="13150" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_5" id="13151" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="13152" addr="0x7f99f1d9f110" >
-                            <attributelist id="13153" addr="0x7f99f1d9f110" >
-                                <attribute name="name" value="browseSingle" id="13154" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="13155" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="13156" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1d9f590" id="13157" addr="0x7f99f1d9f590" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1d9f590" id="13158" addr="0x7f99f1d9f590" />
-                                <attribute name="kind" value="function" id="13159" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="browseSingle" id="13160" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,bool,bool,r.q(const).XBMCAddon::String)." id="13161" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="13162" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1d9f110" id="13163" addr="0x7f99f1d9f110" />
-                                <parmlist id="13164" addr="0x7f99f1d9e810" >
+                        <cdecl id="13152" addr="0x7fca468ed110" >
+                            <attributelist id="13153" addr="0x7fca468ed110" >
+                                <attribute name="name" value="browseSingle" id="13154" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="13155" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="13156" addr="0x7fca469e4af0" />
+                                <attribute name="sym_nextSibling" value="0x7fca468ed590" id="13157" addr="0x7fca468ed590" />
+                                <attribute name="csym_nextSibling" value="0x7fca468ed590" id="13158" addr="0x7fca468ed590" />
+                                <attribute name="kind" value="function" id="13159" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="browseSingle" id="13160" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,bool,bool,r.q(const).XBMCAddon::String)." id="13161" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="13162" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468ed110" id="13163" addr="0x7fca468ed110" />
+                                <parmlist id="13164" addr="0x7fca468ec810" >
                                     <parm id="13165">
-                                        <attributelist id="13166" addr="0x7f99f1d9e810" >
-                                            <attribute name="name" value="type" id="13167" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="13168" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13166" addr="0x7fca468ec810" >
+                                            <attribute name="name" value="type" id="13167" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="13168" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13169">
-                                        <attributelist id="13170" addr="0x7f99f1d9e950" >
-                                            <attribute name="name" value="heading" id="13171" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13172" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13170" addr="0x7fca468ec950" >
+                                            <attribute name="name" value="heading" id="13171" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13172" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13173">
-                                        <attributelist id="13174" addr="0x7f99f1d9ea90" >
-                                            <attribute name="name" value="shares" id="13175" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13176" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13174" addr="0x7fca468eca90" >
+                                            <attribute name="name" value="shares" id="13175" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13176" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13177">
-                                        <attributelist id="13178" addr="0x7f99f1d9ec30" >
-                                            <attribute name="name" value="mask" id="13179" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="13180" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13181" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13178" addr="0x7fca468ecc30" >
+                                            <attribute name="name" value="mask" id="13179" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="13180" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13181" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13182">
-                                        <attributelist id="13183" addr="0x7f99f1d9ed70" >
-                                            <attribute name="name" value="useThumbs" id="13184" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="false" id="13185" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="13186" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13183" addr="0x7fca468ecd70" >
+                                            <attribute name="name" value="useThumbs" id="13184" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="false" id="13185" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="13186" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13187">
-                                        <attributelist id="13188" addr="0x7f99f1d9eeb0" >
-                                            <attribute name="name" value="treatAsFolder" id="13189" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="false" id="13190" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="13191" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13188" addr="0x7fca468eceb0" >
+                                            <attribute name="name" value="treatAsFolder" id="13189" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="false" id="13190" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="13191" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13192">
-                                        <attributelist id="13193" addr="0x7f99f1d9f050" >
-                                            <attribute name="name" value="defaultt" id="13194" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="13195" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13196" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13193" addr="0x7fca468ed050" >
+                                            <attribute name="name" value="defaultt" id="13194" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="13195" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13196" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="XBMCAddon::String" id="13197" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="13198" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="XBMCAddon::String" id="13197" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="13198" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="13199" addr="0x7f99f1d9f590" >
-                            <attributelist id="13200" addr="0x7f99f1d9f590" >
-                                <attribute name="name" value="browseSingle" id="13201" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="13202" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="13203" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1d9f110" id="13204" addr="0x7f99f1d9f110" />
-                                <attribute name="kind" value="function" id="13205" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="browseSingle" id="13206" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1d9f970" id="13207" addr="0x7f99f1d9f970" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1d9f970" id="13208" addr="0x7f99f1d9f970" />
-                                <attribute name="defaultargs" value="0x7f99f1d9f110" id="13209" addr="0x7f99f1d9f110" />
-                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,bool,bool)." id="13210" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="13211" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1d9f110" id="13212" addr="0x7f99f1d9f110" />
-                                <parmlist id="13213" addr="0x7f99f1d9f1b0" >
+                        <cdecl id="13199" addr="0x7fca468ed590" >
+                            <attributelist id="13200" addr="0x7fca468ed590" >
+                                <attribute name="name" value="browseSingle" id="13201" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="13202" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="13203" addr="0x7fca469e4af0" />
+                                <attribute name="sym_previousSibling" value="0x7fca468ed110" id="13204" addr="0x7fca468ed110" />
+                                <attribute name="kind" value="function" id="13205" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="browseSingle" id="13206" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca468ed970" id="13207" addr="0x7fca468ed970" />
+                                <attribute name="sym_nextSibling" value="0x7fca468ed970" id="13208" addr="0x7fca468ed970" />
+                                <attribute name="defaultargs" value="0x7fca468ed110" id="13209" addr="0x7fca468ed110" />
+                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,bool,bool)." id="13210" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="13211" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468ed110" id="13212" addr="0x7fca468ed110" />
+                                <parmlist id="13213" addr="0x7fca468ed1b0" >
                                     <parm id="13214">
-                                        <attributelist id="13215" addr="0x7f99f1d9f1b0" >
-                                            <attribute name="name" value="type" id="13216" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="13217" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13215" addr="0x7fca468ed1b0" >
+                                            <attribute name="name" value="type" id="13216" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="13217" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13218">
-                                        <attributelist id="13219" addr="0x7f99f1d9f290" >
-                                            <attribute name="name" value="heading" id="13220" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13221" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13219" addr="0x7fca468ed290" >
+                                            <attribute name="name" value="heading" id="13220" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13221" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13222">
-                                        <attributelist id="13223" addr="0x7f99f1d9f310" >
-                                            <attribute name="name" value="shares" id="13224" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13225" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13223" addr="0x7fca468ed310" >
+                                            <attribute name="name" value="shares" id="13224" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13225" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13226">
-                                        <attributelist id="13227" addr="0x7f99f1d9f390" >
-                                            <attribute name="name" value="mask" id="13228" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="13229" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13230" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13227" addr="0x7fca468ed390" >
+                                            <attribute name="name" value="mask" id="13228" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="13229" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13230" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13231">
-                                        <attributelist id="13232" addr="0x7f99f1d9f430" >
-                                            <attribute name="name" value="useThumbs" id="13233" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="false" id="13234" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="13235" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13232" addr="0x7fca468ed430" >
+                                            <attribute name="name" value="useThumbs" id="13233" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="false" id="13234" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="13235" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13236">
-                                        <attributelist id="13237" addr="0x7f99f1d9f4d0" >
-                                            <attribute name="name" value="treatAsFolder" id="13238" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="false" id="13239" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="13240" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13237" addr="0x7fca468ed4d0" >
+                                            <attribute name="name" value="treatAsFolder" id="13238" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="false" id="13239" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="13240" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="XBMCAddon::String" id="13241" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="13242" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="XBMCAddon::String" id="13241" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="13242" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="13243" addr="0x7f99f1d9f970" >
-                            <attributelist id="13244" addr="0x7f99f1d9f970" >
-                                <attribute name="name" value="browseSingle" id="13245" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="13246" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="13247" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1d9f590" id="13248" addr="0x7f99f1d9f590" />
-                                <attribute name="kind" value="function" id="13249" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="browseSingle" id="13250" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1d9fcb0" id="13251" addr="0x7f99f1d9fcb0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1d9fcb0" id="13252" addr="0x7f99f1d9fcb0" />
-                                <attribute name="defaultargs" value="0x7f99f1d9f110" id="13253" addr="0x7f99f1d9f110" />
-                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,bool)." id="13254" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="13255" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1d9f110" id="13256" addr="0x7f99f1d9f110" />
-                                <parmlist id="13257" addr="0x7f99f1d9f630" >
+                        <cdecl id="13243" addr="0x7fca468ed970" >
+                            <attributelist id="13244" addr="0x7fca468ed970" >
+                                <attribute name="name" value="browseSingle" id="13245" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="13246" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="13247" addr="0x7fca469e4af0" />
+                                <attribute name="sym_previousSibling" value="0x7fca468ed590" id="13248" addr="0x7fca468ed590" />
+                                <attribute name="kind" value="function" id="13249" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="browseSingle" id="13250" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca468edcb0" id="13251" addr="0x7fca468edcb0" />
+                                <attribute name="sym_nextSibling" value="0x7fca468edcb0" id="13252" addr="0x7fca468edcb0" />
+                                <attribute name="defaultargs" value="0x7fca468ed110" id="13253" addr="0x7fca468ed110" />
+                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,bool)." id="13254" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="13255" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468ed110" id="13256" addr="0x7fca468ed110" />
+                                <parmlist id="13257" addr="0x7fca468ed630" >
                                     <parm id="13258">
-                                        <attributelist id="13259" addr="0x7f99f1d9f630" >
-                                            <attribute name="name" value="type" id="13260" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="13261" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13259" addr="0x7fca468ed630" >
+                                            <attribute name="name" value="type" id="13260" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="13261" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13262">
-                                        <attributelist id="13263" addr="0x7f99f1d9f710" >
-                                            <attribute name="name" value="heading" id="13264" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13265" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13263" addr="0x7fca468ed710" >
+                                            <attribute name="name" value="heading" id="13264" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13265" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13266">
-                                        <attributelist id="13267" addr="0x7f99f1d9f790" >
-                                            <attribute name="name" value="shares" id="13268" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13269" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13267" addr="0x7fca468ed790" >
+                                            <attribute name="name" value="shares" id="13268" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13269" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13270">
-                                        <attributelist id="13271" addr="0x7f99f1d9f810" >
-                                            <attribute name="name" value="mask" id="13272" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="13273" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13274" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13271" addr="0x7fca468ed810" >
+                                            <attribute name="name" value="mask" id="13272" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="13273" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13274" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13275">
-                                        <attributelist id="13276" addr="0x7f99f1d9f8b0" >
-                                            <attribute name="name" value="useThumbs" id="13277" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="false" id="13278" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="13279" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13276" addr="0x7fca468ed8b0" >
+                                            <attribute name="name" value="useThumbs" id="13277" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="false" id="13278" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="13279" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="XBMCAddon::String" id="13280" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_2" id="13281" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="XBMCAddon::String" id="13280" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_2" id="13281" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="13282" addr="0x7f99f1d9fcb0" >
-                            <attributelist id="13283" addr="0x7f99f1d9fcb0" >
-                                <attribute name="name" value="browseSingle" id="13284" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="13285" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="13286" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1d9f970" id="13287" addr="0x7f99f1d9f970" />
-                                <attribute name="kind" value="function" id="13288" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="browseSingle" id="13289" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1d9ff50" id="13290" addr="0x7f99f1d9ff50" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1d9ff50" id="13291" addr="0x7f99f1d9ff50" />
-                                <attribute name="defaultargs" value="0x7f99f1d9f110" id="13292" addr="0x7f99f1d9f110" />
-                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="13293" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="13294" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1d9f110" id="13295" addr="0x7f99f1d9f110" />
-                                <parmlist id="13296" addr="0x7f99f1d9fa10" >
+                        <cdecl id="13282" addr="0x7fca468edcb0" >
+                            <attributelist id="13283" addr="0x7fca468edcb0" >
+                                <attribute name="name" value="browseSingle" id="13284" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="13285" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="13286" addr="0x7fca469e4af0" />
+                                <attribute name="sym_previousSibling" value="0x7fca468ed970" id="13287" addr="0x7fca468ed970" />
+                                <attribute name="kind" value="function" id="13288" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="browseSingle" id="13289" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca468edf50" id="13290" addr="0x7fca468edf50" />
+                                <attribute name="sym_nextSibling" value="0x7fca468edf50" id="13291" addr="0x7fca468edf50" />
+                                <attribute name="defaultargs" value="0x7fca468ed110" id="13292" addr="0x7fca468ed110" />
+                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="13293" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="13294" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468ed110" id="13295" addr="0x7fca468ed110" />
+                                <parmlist id="13296" addr="0x7fca468eda10" >
                                     <parm id="13297">
-                                        <attributelist id="13298" addr="0x7f99f1d9fa10" >
-                                            <attribute name="name" value="type" id="13299" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="13300" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13298" addr="0x7fca468eda10" >
+                                            <attribute name="name" value="type" id="13299" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="13300" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13301">
-                                        <attributelist id="13302" addr="0x7f99f1d9faf0" >
-                                            <attribute name="name" value="heading" id="13303" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13304" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13302" addr="0x7fca468edaf0" >
+                                            <attribute name="name" value="heading" id="13303" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13304" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13305">
-                                        <attributelist id="13306" addr="0x7f99f1d9fb70" >
-                                            <attribute name="name" value="shares" id="13307" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13308" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13306" addr="0x7fca468edb70" >
+                                            <attribute name="name" value="shares" id="13307" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13308" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13309">
-                                        <attributelist id="13310" addr="0x7f99f1d9fbf0" >
-                                            <attribute name="name" value="mask" id="13311" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="13312" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13313" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13310" addr="0x7fca468edbf0" >
+                                            <attribute name="name" value="mask" id="13311" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="13312" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13313" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="XBMCAddon::String" id="13314" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_3" id="13315" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="XBMCAddon::String" id="13314" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_3" id="13315" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="13316" addr="0x7f99f1d9ff50" >
-                            <attributelist id="13317" addr="0x7f99f1d9ff50" >
-                                <attribute name="name" value="browseSingle" id="13318" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="13319" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="13320" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1d9fcb0" id="13321" addr="0x7f99f1d9fcb0" />
-                                <attribute name="kind" value="function" id="13322" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="browseSingle" id="13323" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1d9f110" id="13324" addr="0x7f99f1d9f110" />
-                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="13325" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="13326" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1d9f110" id="13327" addr="0x7f99f1d9f110" />
-                                <parmlist id="13328" addr="0x7f99f1d9fd50" >
+                        <cdecl id="13316" addr="0x7fca468edf50" >
+                            <attributelist id="13317" addr="0x7fca468edf50" >
+                                <attribute name="name" value="browseSingle" id="13318" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="13319" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="13320" addr="0x7fca469e4af0" />
+                                <attribute name="sym_previousSibling" value="0x7fca468edcb0" id="13321" addr="0x7fca468edcb0" />
+                                <attribute name="kind" value="function" id="13322" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="browseSingle" id="13323" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca468ed110" id="13324" addr="0x7fca468ed110" />
+                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="13325" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="13326" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468ed110" id="13327" addr="0x7fca468ed110" />
+                                <parmlist id="13328" addr="0x7fca468edd50" >
                                     <parm id="13329">
-                                        <attributelist id="13330" addr="0x7f99f1d9fd50" >
-                                            <attribute name="name" value="type" id="13331" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="13332" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13330" addr="0x7fca468edd50" >
+                                            <attribute name="name" value="type" id="13331" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="13332" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13333">
-                                        <attributelist id="13334" addr="0x7f99f1d9fe30" >
-                                            <attribute name="name" value="heading" id="13335" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13336" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13334" addr="0x7fca468ede30" >
+                                            <attribute name="name" value="heading" id="13335" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13336" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13337">
-                                        <attributelist id="13338" addr="0x7f99f1d9feb0" >
-                                            <attribute name="name" value="shares" id="13339" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13340" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13338" addr="0x7fca468edeb0" >
+                                            <attribute name="name" value="shares" id="13339" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13340" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="XBMCAddon::String" id="13341" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_4" id="13342" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="XBMCAddon::String" id="13341" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_4" id="13342" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="13343" addr="0x7f99f1da0b70" >
-                            <attributelist id="13344" addr="0x7f99f1da0b70" >
-                                <attribute name="name" value="browseMultiple" id="13345" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="13346" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="13347" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1da0ff0" id="13348" addr="0x7f99f1da0ff0" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1da0ff0" id="13349" addr="0x7f99f1da0ff0" />
-                                <attribute name="kind" value="function" id="13350" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="browseMultiple" id="13351" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,bool,bool,r.q(const).XBMCAddon::String)." id="13352" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="13353" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1da0b70" id="13354" addr="0x7f99f1da0b70" />
-                                <parmlist id="13355" addr="0x7f99f1da0270" >
+                        <cdecl id="13343" addr="0x7fca468eeb70" >
+                            <attributelist id="13344" addr="0x7fca468eeb70" >
+                                <attribute name="name" value="browseMultiple" id="13345" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="13346" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="13347" addr="0x7fca469e4af0" />
+                                <attribute name="sym_nextSibling" value="0x7fca468eeff0" id="13348" addr="0x7fca468eeff0" />
+                                <attribute name="csym_nextSibling" value="0x7fca468eeff0" id="13349" addr="0x7fca468eeff0" />
+                                <attribute name="kind" value="function" id="13350" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="browseMultiple" id="13351" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,bool,bool,r.q(const).XBMCAddon::String)." id="13352" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="13353" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468eeb70" id="13354" addr="0x7fca468eeb70" />
+                                <parmlist id="13355" addr="0x7fca468ee270" >
                                     <parm id="13356">
-                                        <attributelist id="13357" addr="0x7f99f1da0270" >
-                                            <attribute name="name" value="type" id="13358" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="13359" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13357" addr="0x7fca468ee270" >
+                                            <attribute name="name" value="type" id="13358" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="13359" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13360">
-                                        <attributelist id="13361" addr="0x7f99f1da03b0" >
-                                            <attribute name="name" value="heading" id="13362" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13363" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13361" addr="0x7fca468ee3b0" >
+                                            <attribute name="name" value="heading" id="13362" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13363" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13364">
-                                        <attributelist id="13365" addr="0x7f99f1da04f0" >
-                                            <attribute name="name" value="shares" id="13366" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13367" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13365" addr="0x7fca468ee4f0" >
+                                            <attribute name="name" value="shares" id="13366" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13367" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13368">
-                                        <attributelist id="13369" addr="0x7f99f1da0690" >
-                                            <attribute name="name" value="mask" id="13370" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="13371" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13372" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13369" addr="0x7fca468ee690" >
+                                            <attribute name="name" value="mask" id="13370" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="13371" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13372" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13373">
-                                        <attributelist id="13374" addr="0x7f99f1da07d0" >
-                                            <attribute name="name" value="useThumbs" id="13375" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="false" id="13376" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="13377" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13374" addr="0x7fca468ee7d0" >
+                                            <attribute name="name" value="useThumbs" id="13375" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="false" id="13376" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="13377" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13378">
-                                        <attributelist id="13379" addr="0x7f99f1da0910" >
-                                            <attribute name="name" value="treatAsFolder" id="13380" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="false" id="13381" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="13382" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13379" addr="0x7fca468ee910" >
+                                            <attribute name="name" value="treatAsFolder" id="13380" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="false" id="13381" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="13382" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13383">
-                                        <attributelist id="13384" addr="0x7f99f1da0ab0" >
-                                            <attribute name="name" value="defaultt" id="13385" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="13386" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13387" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13384" addr="0x7fca468eeab0" >
+                                            <attribute name="name" value="defaultt" id="13385" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="13386" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13387" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="std::vector&lt;(XBMCAddon::String)>" id="13388" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="13389" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="std::vector&lt;(XBMCAddon::String)>" id="13388" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="13389" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="13390" addr="0x7f99f1da0ff0" >
-                            <attributelist id="13391" addr="0x7f99f1da0ff0" >
-                                <attribute name="name" value="browseMultiple" id="13392" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="13393" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="13394" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1da0b70" id="13395" addr="0x7f99f1da0b70" />
-                                <attribute name="kind" value="function" id="13396" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="browseMultiple" id="13397" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1da13d0" id="13398" addr="0x7f99f1da13d0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1da13d0" id="13399" addr="0x7f99f1da13d0" />
-                                <attribute name="defaultargs" value="0x7f99f1da0b70" id="13400" addr="0x7f99f1da0b70" />
-                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,bool,bool)." id="13401" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="13402" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1da0b70" id="13403" addr="0x7f99f1da0b70" />
-                                <parmlist id="13404" addr="0x7f99f1da0c10" >
+                        <cdecl id="13390" addr="0x7fca468eeff0" >
+                            <attributelist id="13391" addr="0x7fca468eeff0" >
+                                <attribute name="name" value="browseMultiple" id="13392" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="13393" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="13394" addr="0x7fca469e4af0" />
+                                <attribute name="sym_previousSibling" value="0x7fca468eeb70" id="13395" addr="0x7fca468eeb70" />
+                                <attribute name="kind" value="function" id="13396" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="browseMultiple" id="13397" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca468ef3d0" id="13398" addr="0x7fca468ef3d0" />
+                                <attribute name="sym_nextSibling" value="0x7fca468ef3d0" id="13399" addr="0x7fca468ef3d0" />
+                                <attribute name="defaultargs" value="0x7fca468eeb70" id="13400" addr="0x7fca468eeb70" />
+                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,bool,bool)." id="13401" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="13402" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468eeb70" id="13403" addr="0x7fca468eeb70" />
+                                <parmlist id="13404" addr="0x7fca468eec10" >
                                     <parm id="13405">
-                                        <attributelist id="13406" addr="0x7f99f1da0c10" >
-                                            <attribute name="name" value="type" id="13407" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="13408" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13406" addr="0x7fca468eec10" >
+                                            <attribute name="name" value="type" id="13407" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="13408" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13409">
-                                        <attributelist id="13410" addr="0x7f99f1da0cf0" >
-                                            <attribute name="name" value="heading" id="13411" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13412" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13410" addr="0x7fca468eecf0" >
+                                            <attribute name="name" value="heading" id="13411" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13412" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13413">
-                                        <attributelist id="13414" addr="0x7f99f1da0d70" >
-                                            <attribute name="name" value="shares" id="13415" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13416" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13414" addr="0x7fca468eed70" >
+                                            <attribute name="name" value="shares" id="13415" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13416" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13417">
-                                        <attributelist id="13418" addr="0x7f99f1da0df0" >
-                                            <attribute name="name" value="mask" id="13419" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="13420" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13421" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13418" addr="0x7fca468eedf0" >
+                                            <attribute name="name" value="mask" id="13419" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="13420" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13421" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13422">
-                                        <attributelist id="13423" addr="0x7f99f1da0e90" >
-                                            <attribute name="name" value="useThumbs" id="13424" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="false" id="13425" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="13426" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13423" addr="0x7fca468eee90" >
+                                            <attribute name="name" value="useThumbs" id="13424" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="false" id="13425" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="13426" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13427">
-                                        <attributelist id="13428" addr="0x7f99f1da0f30" >
-                                            <attribute name="name" value="treatAsFolder" id="13429" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="false" id="13430" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="13431" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13428" addr="0x7fca468eef30" >
+                                            <attribute name="name" value="treatAsFolder" id="13429" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="false" id="13430" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="13431" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="std::vector&lt;(XBMCAddon::String)>" id="13432" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="13433" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="std::vector&lt;(XBMCAddon::String)>" id="13432" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="13433" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="13434" addr="0x7f99f1da13d0" >
-                            <attributelist id="13435" addr="0x7f99f1da13d0" >
-                                <attribute name="name" value="browseMultiple" id="13436" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="13437" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="13438" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1da0ff0" id="13439" addr="0x7f99f1da0ff0" />
-                                <attribute name="kind" value="function" id="13440" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="browseMultiple" id="13441" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1da1710" id="13442" addr="0x7f99f1da1710" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1da1710" id="13443" addr="0x7f99f1da1710" />
-                                <attribute name="defaultargs" value="0x7f99f1da0b70" id="13444" addr="0x7f99f1da0b70" />
-                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,bool)." id="13445" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="13446" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1da0b70" id="13447" addr="0x7f99f1da0b70" />
-                                <parmlist id="13448" addr="0x7f99f1da1090" >
+                        <cdecl id="13434" addr="0x7fca468ef3d0" >
+                            <attributelist id="13435" addr="0x7fca468ef3d0" >
+                                <attribute name="name" value="browseMultiple" id="13436" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="13437" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="13438" addr="0x7fca469e4af0" />
+                                <attribute name="sym_previousSibling" value="0x7fca468eeff0" id="13439" addr="0x7fca468eeff0" />
+                                <attribute name="kind" value="function" id="13440" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="browseMultiple" id="13441" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca468ef710" id="13442" addr="0x7fca468ef710" />
+                                <attribute name="sym_nextSibling" value="0x7fca468ef710" id="13443" addr="0x7fca468ef710" />
+                                <attribute name="defaultargs" value="0x7fca468eeb70" id="13444" addr="0x7fca468eeb70" />
+                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,bool)." id="13445" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="13446" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468eeb70" id="13447" addr="0x7fca468eeb70" />
+                                <parmlist id="13448" addr="0x7fca468ef090" >
                                     <parm id="13449">
-                                        <attributelist id="13450" addr="0x7f99f1da1090" >
-                                            <attribute name="name" value="type" id="13451" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="13452" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13450" addr="0x7fca468ef090" >
+                                            <attribute name="name" value="type" id="13451" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="13452" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13453">
-                                        <attributelist id="13454" addr="0x7f99f1da1170" >
-                                            <attribute name="name" value="heading" id="13455" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13456" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13454" addr="0x7fca468ef170" >
+                                            <attribute name="name" value="heading" id="13455" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13456" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13457">
-                                        <attributelist id="13458" addr="0x7f99f1da11f0" >
-                                            <attribute name="name" value="shares" id="13459" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13460" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13458" addr="0x7fca468ef1f0" >
+                                            <attribute name="name" value="shares" id="13459" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13460" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13461">
-                                        <attributelist id="13462" addr="0x7f99f1da1270" >
-                                            <attribute name="name" value="mask" id="13463" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="13464" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13465" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13462" addr="0x7fca468ef270" >
+                                            <attribute name="name" value="mask" id="13463" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="13464" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13465" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13466">
-                                        <attributelist id="13467" addr="0x7f99f1da1310" >
-                                            <attribute name="name" value="useThumbs" id="13468" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="false" id="13469" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="13470" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13467" addr="0x7fca468ef310" >
+                                            <attribute name="name" value="useThumbs" id="13468" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="false" id="13469" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="13470" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="std::vector&lt;(XBMCAddon::String)>" id="13471" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_2" id="13472" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="std::vector&lt;(XBMCAddon::String)>" id="13471" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_2" id="13472" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="13473" addr="0x7f99f1da1710" >
-                            <attributelist id="13474" addr="0x7f99f1da1710" >
-                                <attribute name="name" value="browseMultiple" id="13475" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="13476" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="13477" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1da13d0" id="13478" addr="0x7f99f1da13d0" />
-                                <attribute name="kind" value="function" id="13479" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="browseMultiple" id="13480" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1da19b0" id="13481" addr="0x7f99f1da19b0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1da19b0" id="13482" addr="0x7f99f1da19b0" />
-                                <attribute name="defaultargs" value="0x7f99f1da0b70" id="13483" addr="0x7f99f1da0b70" />
-                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="13484" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="13485" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1da0b70" id="13486" addr="0x7f99f1da0b70" />
-                                <parmlist id="13487" addr="0x7f99f1da1470" >
+                        <cdecl id="13473" addr="0x7fca468ef710" >
+                            <attributelist id="13474" addr="0x7fca468ef710" >
+                                <attribute name="name" value="browseMultiple" id="13475" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="13476" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="13477" addr="0x7fca469e4af0" />
+                                <attribute name="sym_previousSibling" value="0x7fca468ef3d0" id="13478" addr="0x7fca468ef3d0" />
+                                <attribute name="kind" value="function" id="13479" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="browseMultiple" id="13480" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca468ef9b0" id="13481" addr="0x7fca468ef9b0" />
+                                <attribute name="sym_nextSibling" value="0x7fca468ef9b0" id="13482" addr="0x7fca468ef9b0" />
+                                <attribute name="defaultargs" value="0x7fca468eeb70" id="13483" addr="0x7fca468eeb70" />
+                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="13484" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="13485" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468eeb70" id="13486" addr="0x7fca468eeb70" />
+                                <parmlist id="13487" addr="0x7fca468ef470" >
                                     <parm id="13488">
-                                        <attributelist id="13489" addr="0x7f99f1da1470" >
-                                            <attribute name="name" value="type" id="13490" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="13491" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13489" addr="0x7fca468ef470" >
+                                            <attribute name="name" value="type" id="13490" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="13491" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13492">
-                                        <attributelist id="13493" addr="0x7f99f1da1550" >
-                                            <attribute name="name" value="heading" id="13494" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13495" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13493" addr="0x7fca468ef550" >
+                                            <attribute name="name" value="heading" id="13494" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13495" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13496">
-                                        <attributelist id="13497" addr="0x7f99f1da15d0" >
-                                            <attribute name="name" value="shares" id="13498" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13499" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13497" addr="0x7fca468ef5d0" >
+                                            <attribute name="name" value="shares" id="13498" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13499" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13500">
-                                        <attributelist id="13501" addr="0x7f99f1da1650" >
-                                            <attribute name="name" value="mask" id="13502" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="13503" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13504" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13501" addr="0x7fca468ef650" >
+                                            <attribute name="name" value="mask" id="13502" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="13503" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13504" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="std::vector&lt;(XBMCAddon::String)>" id="13505" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_3" id="13506" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="std::vector&lt;(XBMCAddon::String)>" id="13505" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_3" id="13506" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="13507" addr="0x7f99f1da19b0" >
-                            <attributelist id="13508" addr="0x7f99f1da19b0" >
-                                <attribute name="name" value="browseMultiple" id="13509" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="13510" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="13511" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1da1710" id="13512" addr="0x7f99f1da1710" />
-                                <attribute name="kind" value="function" id="13513" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="browseMultiple" id="13514" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1da0b70" id="13515" addr="0x7f99f1da0b70" />
-                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="13516" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="13517" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1da0b70" id="13518" addr="0x7f99f1da0b70" />
-                                <parmlist id="13519" addr="0x7f99f1da17b0" >
+                        <cdecl id="13507" addr="0x7fca468ef9b0" >
+                            <attributelist id="13508" addr="0x7fca468ef9b0" >
+                                <attribute name="name" value="browseMultiple" id="13509" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="13510" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="13511" addr="0x7fca469e4af0" />
+                                <attribute name="sym_previousSibling" value="0x7fca468ef710" id="13512" addr="0x7fca468ef710" />
+                                <attribute name="kind" value="function" id="13513" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="browseMultiple" id="13514" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca468eeb70" id="13515" addr="0x7fca468eeb70" />
+                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="13516" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="13517" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468eeb70" id="13518" addr="0x7fca468eeb70" />
+                                <parmlist id="13519" addr="0x7fca468ef7b0" >
                                     <parm id="13520">
-                                        <attributelist id="13521" addr="0x7f99f1da17b0" >
-                                            <attribute name="name" value="type" id="13522" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="13523" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13521" addr="0x7fca468ef7b0" >
+                                            <attribute name="name" value="type" id="13522" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="13523" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13524">
-                                        <attributelist id="13525" addr="0x7f99f1da1890" >
-                                            <attribute name="name" value="heading" id="13526" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13527" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13525" addr="0x7fca468ef890" >
+                                            <attribute name="name" value="heading" id="13526" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13527" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13528">
-                                        <attributelist id="13529" addr="0x7f99f1da1910" >
-                                            <attribute name="name" value="shares" id="13530" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13531" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13529" addr="0x7fca468ef910" >
+                                            <attribute name="name" value="shares" id="13530" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13531" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="std::vector&lt;(XBMCAddon::String)>" id="13532" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_4" id="13533" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="std::vector&lt;(XBMCAddon::String)>" id="13532" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_4" id="13533" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="13534" addr="0x7f99f1da1f90" >
-                            <attributelist id="13535" addr="0x7f99f1da1f90" >
-                                <attribute name="name" value="numeric" id="13536" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="13537" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="13538" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1da21b0" id="13539" addr="0x7f99f1da21b0" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1da21b0" id="13540" addr="0x7f99f1da21b0" />
-                                <attribute name="kind" value="function" id="13541" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="numeric" id="13542" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="13543" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="13544" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1da1f90" id="13545" addr="0x7f99f1da1f90" />
-                                <parmlist id="13546" addr="0x7f99f1da1bf0" >
+                        <cdecl id="13534" addr="0x7fca468eff90" >
+                            <attributelist id="13535" addr="0x7fca468eff90" >
+                                <attribute name="name" value="numeric" id="13536" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="13537" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="13538" addr="0x7fca469e4af0" />
+                                <attribute name="sym_nextSibling" value="0x7fca468f01b0" id="13539" addr="0x7fca468f01b0" />
+                                <attribute name="csym_nextSibling" value="0x7fca468f01b0" id="13540" addr="0x7fca468f01b0" />
+                                <attribute name="kind" value="function" id="13541" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="numeric" id="13542" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="13543" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="13544" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468eff90" id="13545" addr="0x7fca468eff90" />
+                                <parmlist id="13546" addr="0x7fca468efbf0" >
                                     <parm id="13547">
-                                        <attributelist id="13548" addr="0x7f99f1da1bf0" >
-                                            <attribute name="name" value="type" id="13549" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="13550" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13548" addr="0x7fca468efbf0" >
+                                            <attribute name="name" value="type" id="13549" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="13550" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13551">
-                                        <attributelist id="13552" addr="0x7f99f1da1d30" >
-                                            <attribute name="name" value="heading" id="13553" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13554" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13552" addr="0x7fca468efd30" >
+                                            <attribute name="name" value="heading" id="13553" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13554" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13555">
-                                        <attributelist id="13556" addr="0x7f99f1da1ed0" >
-                                            <attribute name="name" value="defaultt" id="13557" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="13558" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13559" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13556" addr="0x7fca468efed0" >
+                                            <attribute name="name" value="defaultt" id="13557" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="13558" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13559" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="XBMCAddon::String" id="13560" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="13561" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="XBMCAddon::String" id="13560" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="13561" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="13562" addr="0x7f99f1da21b0" >
-                            <attributelist id="13563" addr="0x7f99f1da21b0" >
-                                <attribute name="name" value="numeric" id="13564" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="13565" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="13566" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1da1f90" id="13567" addr="0x7f99f1da1f90" />
-                                <attribute name="kind" value="function" id="13568" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="numeric" id="13569" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1da1f90" id="13570" addr="0x7f99f1da1f90" />
-                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String)." id="13571" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="13572" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1da1f90" id="13573" addr="0x7f99f1da1f90" />
-                                <parmlist id="13574" addr="0x7f99f1da2030" >
+                        <cdecl id="13562" addr="0x7fca468f01b0" >
+                            <attributelist id="13563" addr="0x7fca468f01b0" >
+                                <attribute name="name" value="numeric" id="13564" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="13565" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="13566" addr="0x7fca469e4af0" />
+                                <attribute name="sym_previousSibling" value="0x7fca468eff90" id="13567" addr="0x7fca468eff90" />
+                                <attribute name="kind" value="function" id="13568" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="numeric" id="13569" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca468eff90" id="13570" addr="0x7fca468eff90" />
+                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String)." id="13571" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="13572" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468eff90" id="13573" addr="0x7fca468eff90" />
+                                <parmlist id="13574" addr="0x7fca468f0030" >
                                     <parm id="13575">
-                                        <attributelist id="13576" addr="0x7f99f1da2030" >
-                                            <attribute name="name" value="type" id="13577" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="13578" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13576" addr="0x7fca468f0030" >
+                                            <attribute name="name" value="type" id="13577" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="13578" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13579">
-                                        <attributelist id="13580" addr="0x7f99f1da2110" >
-                                            <attribute name="name" value="heading" id="13581" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13582" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13580" addr="0x7fca468f0110" >
+                                            <attribute name="name" value="heading" id="13581" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13582" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="XBMCAddon::String" id="13583" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="13584" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="XBMCAddon::String" id="13583" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="13584" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="13585" addr="0x7f99f1da2a30" >
-                            <attributelist id="13586" addr="0x7f99f1da2a30" >
-                                <attribute name="name" value="notification" id="13587" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="13588" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="13589" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1da2d90" id="13590" addr="0x7f99f1da2d90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1da2d90" id="13591" addr="0x7f99f1da2d90" />
-                                <attribute name="kind" value="function" id="13592" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="notification" id="13593" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,int,bool)." id="13594" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="13595" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1da2a30" id="13596" addr="0x7f99f1da2a30" />
-                                <parmlist id="13597" addr="0x7f99f1da23f0" >
+                        <cdecl id="13585" addr="0x7fca468f0a30" >
+                            <attributelist id="13586" addr="0x7fca468f0a30" >
+                                <attribute name="name" value="notification" id="13587" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="13588" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="13589" addr="0x7fca469e4af0" />
+                                <attribute name="sym_nextSibling" value="0x7fca468f0d90" id="13590" addr="0x7fca468f0d90" />
+                                <attribute name="csym_nextSibling" value="0x7fca468f0d90" id="13591" addr="0x7fca468f0d90" />
+                                <attribute name="kind" value="function" id="13592" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="notification" id="13593" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,int,bool)." id="13594" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="13595" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468f0a30" id="13596" addr="0x7fca468f0a30" />
+                                <parmlist id="13597" addr="0x7fca468f03f0" >
                                     <parm id="13598">
-                                        <attributelist id="13599" addr="0x7f99f1da23f0" >
-                                            <attribute name="name" value="heading" id="13600" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13601" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13599" addr="0x7fca468f03f0" >
+                                            <attribute name="name" value="heading" id="13600" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13601" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13602">
-                                        <attributelist id="13603" addr="0x7f99f1da2530" >
-                                            <attribute name="name" value="message" id="13604" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13605" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13603" addr="0x7fca468f0530" >
+                                            <attribute name="name" value="message" id="13604" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13605" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13606">
-                                        <attributelist id="13607" addr="0x7f99f1da26d0" >
-                                            <attribute name="name" value="icon" id="13608" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="13609" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13610" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13607" addr="0x7fca468f06d0" >
+                                            <attribute name="name" value="icon" id="13608" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="13609" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13610" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13611">
-                                        <attributelist id="13612" addr="0x7f99f1da2830" >
-                                            <attribute name="name" value="time" id="13613" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="0" id="13614" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="13615" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13612" addr="0x7fca468f0830" >
+                                            <attribute name="name" value="time" id="13613" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="0" id="13614" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="13615" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13616">
-                                        <attributelist id="13617" addr="0x7f99f1da2970" >
-                                            <attribute name="name" value="sound" id="13618" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="true" id="13619" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="13620" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13617" addr="0x7fca468f0970" >
+                                            <attribute name="name" value="sound" id="13618" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="true" id="13619" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="13620" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="13621" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="13622" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="13621" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="13622" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="13623" addr="0x7f99f1da2d90" >
-                            <attributelist id="13624" addr="0x7f99f1da2d90" >
-                                <attribute name="name" value="notification" id="13625" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="13626" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="13627" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1da2a30" id="13628" addr="0x7f99f1da2a30" />
-                                <attribute name="kind" value="function" id="13629" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="notification" id="13630" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1da3050" id="13631" addr="0x7f99f1da3050" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1da3050" id="13632" addr="0x7f99f1da3050" />
-                                <attribute name="defaultargs" value="0x7f99f1da2a30" id="13633" addr="0x7f99f1da2a30" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,int)." id="13634" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="13635" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1da2a30" id="13636" addr="0x7f99f1da2a30" />
-                                <parmlist id="13637" addr="0x7f99f1da2ad0" >
+                        <cdecl id="13623" addr="0x7fca468f0d90" >
+                            <attributelist id="13624" addr="0x7fca468f0d90" >
+                                <attribute name="name" value="notification" id="13625" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="13626" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="13627" addr="0x7fca469e4af0" />
+                                <attribute name="sym_previousSibling" value="0x7fca468f0a30" id="13628" addr="0x7fca468f0a30" />
+                                <attribute name="kind" value="function" id="13629" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="notification" id="13630" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca468f1050" id="13631" addr="0x7fca468f1050" />
+                                <attribute name="sym_nextSibling" value="0x7fca468f1050" id="13632" addr="0x7fca468f1050" />
+                                <attribute name="defaultargs" value="0x7fca468f0a30" id="13633" addr="0x7fca468f0a30" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,int)." id="13634" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="13635" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468f0a30" id="13636" addr="0x7fca468f0a30" />
+                                <parmlist id="13637" addr="0x7fca468f0ad0" >
                                     <parm id="13638">
-                                        <attributelist id="13639" addr="0x7f99f1da2ad0" >
-                                            <attribute name="name" value="heading" id="13640" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13641" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13639" addr="0x7fca468f0ad0" >
+                                            <attribute name="name" value="heading" id="13640" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13641" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13642">
-                                        <attributelist id="13643" addr="0x7f99f1da2bb0" >
-                                            <attribute name="name" value="message" id="13644" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13645" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13643" addr="0x7fca468f0bb0" >
+                                            <attribute name="name" value="message" id="13644" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13645" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13646">
-                                        <attributelist id="13647" addr="0x7f99f1da2c30" >
-                                            <attribute name="name" value="icon" id="13648" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="13649" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13650" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13647" addr="0x7fca468f0c30" >
+                                            <attribute name="name" value="icon" id="13648" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="13649" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13650" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13651">
-                                        <attributelist id="13652" addr="0x7f99f1da2cd0" >
-                                            <attribute name="name" value="time" id="13653" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="0" id="13654" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="13655" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13652" addr="0x7fca468f0cd0" >
+                                            <attribute name="name" value="time" id="13653" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="0" id="13654" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="13655" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="13656" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="13657" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="13656" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="13657" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="13658" addr="0x7f99f1da3050" >
-                            <attributelist id="13659" addr="0x7f99f1da3050" >
-                                <attribute name="name" value="notification" id="13660" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="13661" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="13662" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1da2d90" id="13663" addr="0x7f99f1da2d90" />
-                                <attribute name="kind" value="function" id="13664" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="notification" id="13665" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1da3270" id="13666" addr="0x7f99f1da3270" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1da3270" id="13667" addr="0x7f99f1da3270" />
-                                <attribute name="defaultargs" value="0x7f99f1da2a30" id="13668" addr="0x7f99f1da2a30" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="13669" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="13670" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1da2a30" id="13671" addr="0x7f99f1da2a30" />
-                                <parmlist id="13672" addr="0x7f99f1da2e30" >
+                        <cdecl id="13658" addr="0x7fca468f1050" >
+                            <attributelist id="13659" addr="0x7fca468f1050" >
+                                <attribute name="name" value="notification" id="13660" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="13661" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="13662" addr="0x7fca469e4af0" />
+                                <attribute name="sym_previousSibling" value="0x7fca468f0d90" id="13663" addr="0x7fca468f0d90" />
+                                <attribute name="kind" value="function" id="13664" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="notification" id="13665" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca468f1270" id="13666" addr="0x7fca468f1270" />
+                                <attribute name="sym_nextSibling" value="0x7fca468f1270" id="13667" addr="0x7fca468f1270" />
+                                <attribute name="defaultargs" value="0x7fca468f0a30" id="13668" addr="0x7fca468f0a30" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="13669" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="13670" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468f0a30" id="13671" addr="0x7fca468f0a30" />
+                                <parmlist id="13672" addr="0x7fca468f0e30" >
                                     <parm id="13673">
-                                        <attributelist id="13674" addr="0x7f99f1da2e30" >
-                                            <attribute name="name" value="heading" id="13675" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13676" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13674" addr="0x7fca468f0e30" >
+                                            <attribute name="name" value="heading" id="13675" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13676" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13677">
-                                        <attributelist id="13678" addr="0x7f99f1da2f10" >
-                                            <attribute name="name" value="message" id="13679" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13680" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13678" addr="0x7fca468f0f10" >
+                                            <attribute name="name" value="message" id="13679" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13680" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13681">
-                                        <attributelist id="13682" addr="0x7f99f1da2f90" >
-                                            <attribute name="name" value="icon" id="13683" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="13684" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13685" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13682" addr="0x7fca468f0f90" >
+                                            <attribute name="name" value="icon" id="13683" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="13684" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13685" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="13686" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_2" id="13687" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="13686" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_2" id="13687" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="13688" addr="0x7f99f1da3270" >
-                            <attributelist id="13689" addr="0x7f99f1da3270" >
-                                <attribute name="name" value="notification" id="13690" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="13691" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="13692" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1da3050" id="13693" addr="0x7f99f1da3050" />
-                                <attribute name="kind" value="function" id="13694" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="notification" id="13695" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1da2a30" id="13696" addr="0x7f99f1da2a30" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="13697" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="13698" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1da2a30" id="13699" addr="0x7f99f1da2a30" />
-                                <parmlist id="13700" addr="0x7f99f1da30f0" >
+                        <cdecl id="13688" addr="0x7fca468f1270" >
+                            <attributelist id="13689" addr="0x7fca468f1270" >
+                                <attribute name="name" value="notification" id="13690" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="13691" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="13692" addr="0x7fca469e4af0" />
+                                <attribute name="sym_previousSibling" value="0x7fca468f1050" id="13693" addr="0x7fca468f1050" />
+                                <attribute name="kind" value="function" id="13694" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="notification" id="13695" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca468f0a30" id="13696" addr="0x7fca468f0a30" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="13697" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="13698" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468f0a30" id="13699" addr="0x7fca468f0a30" />
+                                <parmlist id="13700" addr="0x7fca468f10f0" >
                                     <parm id="13701">
-                                        <attributelist id="13702" addr="0x7f99f1da30f0" >
-                                            <attribute name="name" value="heading" id="13703" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13704" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13702" addr="0x7fca468f10f0" >
+                                            <attribute name="name" value="heading" id="13703" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13704" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13705">
-                                        <attributelist id="13706" addr="0x7f99f1da31d0" >
-                                            <attribute name="name" value="message" id="13707" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13708" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13706" addr="0x7fca468f11d0" >
+                                            <attribute name="name" value="message" id="13707" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13708" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="13709" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_3" id="13710" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="13709" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_3" id="13710" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="13711" addr="0x7f99f1da3b50" >
-                            <attributelist id="13712" addr="0x7f99f1da3b50" >
-                                <attribute name="name" value="input" id="13713" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="13714" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="13715" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1da3ed0" id="13716" addr="0x7f99f1da3ed0" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1da3ed0" id="13717" addr="0x7f99f1da3ed0" />
-                                <attribute name="kind" value="function" id="13718" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="input" id="13719" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,int,int,int)." id="13720" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="13721" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1da3b50" id="13722" addr="0x7f99f1da3b50" />
-                                <parmlist id="13723" addr="0x7f99f1da34d0" >
+                        <cdecl id="13711" addr="0x7fca468f1b50" >
+                            <attributelist id="13712" addr="0x7fca468f1b50" >
+                                <attribute name="name" value="input" id="13713" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="13714" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="13715" addr="0x7fca469e4af0" />
+                                <attribute name="sym_nextSibling" value="0x7fca468f1ed0" id="13716" addr="0x7fca468f1ed0" />
+                                <attribute name="csym_nextSibling" value="0x7fca468f1ed0" id="13717" addr="0x7fca468f1ed0" />
+                                <attribute name="kind" value="function" id="13718" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="input" id="13719" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,int,int,int)." id="13720" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="13721" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468f1b50" id="13722" addr="0x7fca468f1b50" />
+                                <parmlist id="13723" addr="0x7fca468f14d0" >
                                     <parm id="13724">
-                                        <attributelist id="13725" addr="0x7f99f1da34d0" >
-                                            <attribute name="name" value="heading" id="13726" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13727" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13725" addr="0x7fca468f14d0" >
+                                            <attribute name="name" value="heading" id="13726" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13727" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13728">
-                                        <attributelist id="13729" addr="0x7f99f1da3670" >
-                                            <attribute name="name" value="defaultt" id="13730" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="13731" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13732" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13729" addr="0x7fca468f1670" >
+                                            <attribute name="name" value="defaultt" id="13730" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="13731" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13732" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13733">
-                                        <attributelist id="13734" addr="0x7f99f1da37d0" >
-                                            <attribute name="name" value="type" id="13735" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="0" id="13736" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="13737" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13734" addr="0x7fca468f17d0" >
+                                            <attribute name="name" value="type" id="13735" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="0" id="13736" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="13737" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13738">
-                                        <attributelist id="13739" addr="0x7f99f1da3930" >
-                                            <attribute name="name" value="option" id="13740" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="0" id="13741" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="13742" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13739" addr="0x7fca468f1930" >
+                                            <attribute name="name" value="option" id="13740" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="0" id="13741" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="13742" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13743">
-                                        <attributelist id="13744" addr="0x7f99f1da3a90" >
-                                            <attribute name="name" value="autoclose" id="13745" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="0" id="13746" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="13747" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13744" addr="0x7fca468f1a90" >
+                                            <attribute name="name" value="autoclose" id="13745" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="0" id="13746" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="13747" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="XBMCAddon::String" id="13748" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="13749" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="XBMCAddon::String" id="13748" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="13749" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="13750" addr="0x7f99f1da3ed0" >
-                            <attributelist id="13751" addr="0x7f99f1da3ed0" >
-                                <attribute name="name" value="input" id="13752" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="13753" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="13754" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1da3b50" id="13755" addr="0x7f99f1da3b50" />
-                                <attribute name="kind" value="function" id="13756" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="input" id="13757" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1da41b0" id="13758" addr="0x7f99f1da41b0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1da41b0" id="13759" addr="0x7f99f1da41b0" />
-                                <attribute name="defaultargs" value="0x7f99f1da3b50" id="13760" addr="0x7f99f1da3b50" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,int,int)." id="13761" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="13762" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1da3b50" id="13763" addr="0x7f99f1da3b50" />
-                                <parmlist id="13764" addr="0x7f99f1da3bf0" >
+                        <cdecl id="13750" addr="0x7fca468f1ed0" >
+                            <attributelist id="13751" addr="0x7fca468f1ed0" >
+                                <attribute name="name" value="input" id="13752" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="13753" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="13754" addr="0x7fca469e4af0" />
+                                <attribute name="sym_previousSibling" value="0x7fca468f1b50" id="13755" addr="0x7fca468f1b50" />
+                                <attribute name="kind" value="function" id="13756" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="input" id="13757" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca468f21b0" id="13758" addr="0x7fca468f21b0" />
+                                <attribute name="sym_nextSibling" value="0x7fca468f21b0" id="13759" addr="0x7fca468f21b0" />
+                                <attribute name="defaultargs" value="0x7fca468f1b50" id="13760" addr="0x7fca468f1b50" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,int,int)." id="13761" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="13762" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468f1b50" id="13763" addr="0x7fca468f1b50" />
+                                <parmlist id="13764" addr="0x7fca468f1bf0" >
                                     <parm id="13765">
-                                        <attributelist id="13766" addr="0x7f99f1da3bf0" >
-                                            <attribute name="name" value="heading" id="13767" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13768" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13766" addr="0x7fca468f1bf0" >
+                                            <attribute name="name" value="heading" id="13767" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13768" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13769">
-                                        <attributelist id="13770" addr="0x7f99f1da3cd0" >
-                                            <attribute name="name" value="defaultt" id="13771" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="13772" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13773" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13770" addr="0x7fca468f1cd0" >
+                                            <attribute name="name" value="defaultt" id="13771" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="13772" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13773" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13774">
-                                        <attributelist id="13775" addr="0x7f99f1da3d70" >
-                                            <attribute name="name" value="type" id="13776" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="0" id="13777" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="13778" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13775" addr="0x7fca468f1d70" >
+                                            <attribute name="name" value="type" id="13776" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="0" id="13777" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="13778" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13779">
-                                        <attributelist id="13780" addr="0x7f99f1da3e10" >
-                                            <attribute name="name" value="option" id="13781" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="0" id="13782" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="13783" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13780" addr="0x7fca468f1e10" >
+                                            <attribute name="name" value="option" id="13781" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="0" id="13782" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="13783" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="XBMCAddon::String" id="13784" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="13785" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="XBMCAddon::String" id="13784" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="13785" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="13786" addr="0x7f99f1da41b0" >
-                            <attributelist id="13787" addr="0x7f99f1da41b0" >
-                                <attribute name="name" value="input" id="13788" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="13789" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="13790" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1da3ed0" id="13791" addr="0x7f99f1da3ed0" />
-                                <attribute name="kind" value="function" id="13792" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="input" id="13793" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1da43f0" id="13794" addr="0x7f99f1da43f0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1da43f0" id="13795" addr="0x7f99f1da43f0" />
-                                <attribute name="defaultargs" value="0x7f99f1da3b50" id="13796" addr="0x7f99f1da3b50" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,int)." id="13797" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="13798" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1da3b50" id="13799" addr="0x7f99f1da3b50" />
-                                <parmlist id="13800" addr="0x7f99f1da3f70" >
+                        <cdecl id="13786" addr="0x7fca468f21b0" >
+                            <attributelist id="13787" addr="0x7fca468f21b0" >
+                                <attribute name="name" value="input" id="13788" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="13789" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="13790" addr="0x7fca469e4af0" />
+                                <attribute name="sym_previousSibling" value="0x7fca468f1ed0" id="13791" addr="0x7fca468f1ed0" />
+                                <attribute name="kind" value="function" id="13792" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="input" id="13793" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca468f23f0" id="13794" addr="0x7fca468f23f0" />
+                                <attribute name="sym_nextSibling" value="0x7fca468f23f0" id="13795" addr="0x7fca468f23f0" />
+                                <attribute name="defaultargs" value="0x7fca468f1b50" id="13796" addr="0x7fca468f1b50" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,int)." id="13797" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="13798" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468f1b50" id="13799" addr="0x7fca468f1b50" />
+                                <parmlist id="13800" addr="0x7fca468f1f70" >
                                     <parm id="13801">
-                                        <attributelist id="13802" addr="0x7f99f1da3f70" >
-                                            <attribute name="name" value="heading" id="13803" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13804" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13802" addr="0x7fca468f1f70" >
+                                            <attribute name="name" value="heading" id="13803" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13804" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13805">
-                                        <attributelist id="13806" addr="0x7f99f1da4050" >
-                                            <attribute name="name" value="defaultt" id="13807" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="13808" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13809" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13806" addr="0x7fca468f2050" >
+                                            <attribute name="name" value="defaultt" id="13807" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="13808" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13809" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13810">
-                                        <attributelist id="13811" addr="0x7f99f1da40f0" >
-                                            <attribute name="name" value="type" id="13812" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="0" id="13813" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="13814" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13811" addr="0x7fca468f20f0" >
+                                            <attribute name="name" value="type" id="13812" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="0" id="13813" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="13814" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="XBMCAddon::String" id="13815" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_2" id="13816" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="XBMCAddon::String" id="13815" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_2" id="13816" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="13817" addr="0x7f99f1da43f0" >
-                            <attributelist id="13818" addr="0x7f99f1da43f0" >
-                                <attribute name="name" value="input" id="13819" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="13820" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="13821" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1da41b0" id="13822" addr="0x7f99f1da41b0" />
-                                <attribute name="kind" value="function" id="13823" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="input" id="13824" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1da4590" id="13825" addr="0x7f99f1da4590" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1da4590" id="13826" addr="0x7f99f1da4590" />
-                                <attribute name="defaultargs" value="0x7f99f1da3b50" id="13827" addr="0x7f99f1da3b50" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="13828" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="13829" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1da3b50" id="13830" addr="0x7f99f1da3b50" />
-                                <parmlist id="13831" addr="0x7f99f1da4250" >
+                        <cdecl id="13817" addr="0x7fca468f23f0" >
+                            <attributelist id="13818" addr="0x7fca468f23f0" >
+                                <attribute name="name" value="input" id="13819" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="13820" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="13821" addr="0x7fca469e4af0" />
+                                <attribute name="sym_previousSibling" value="0x7fca468f21b0" id="13822" addr="0x7fca468f21b0" />
+                                <attribute name="kind" value="function" id="13823" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="input" id="13824" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca468f2590" id="13825" addr="0x7fca468f2590" />
+                                <attribute name="sym_nextSibling" value="0x7fca468f2590" id="13826" addr="0x7fca468f2590" />
+                                <attribute name="defaultargs" value="0x7fca468f1b50" id="13827" addr="0x7fca468f1b50" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="13828" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="13829" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468f1b50" id="13830" addr="0x7fca468f1b50" />
+                                <parmlist id="13831" addr="0x7fca468f2250" >
                                     <parm id="13832">
-                                        <attributelist id="13833" addr="0x7f99f1da4250" >
-                                            <attribute name="name" value="heading" id="13834" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13835" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13833" addr="0x7fca468f2250" >
+                                            <attribute name="name" value="heading" id="13834" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13835" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13836">
-                                        <attributelist id="13837" addr="0x7f99f1da4330" >
-                                            <attribute name="name" value="defaultt" id="13838" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="13839" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13840" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13837" addr="0x7fca468f2330" >
+                                            <attribute name="name" value="defaultt" id="13838" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="13839" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13840" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="XBMCAddon::String" id="13841" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_3" id="13842" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="XBMCAddon::String" id="13841" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_3" id="13842" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="13843" addr="0x7f99f1da4590" >
-                            <attributelist id="13844" addr="0x7f99f1da4590" >
-                                <attribute name="name" value="input" id="13845" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="13846" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="13847" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1da43f0" id="13848" addr="0x7f99f1da43f0" />
-                                <attribute name="kind" value="function" id="13849" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="input" id="13850" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1da3b50" id="13851" addr="0x7f99f1da3b50" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="13852" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="13853" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1da3b50" id="13854" addr="0x7f99f1da3b50" />
-                                <parmlist id="13855" addr="0x7f99f1da4490" >
+                        <cdecl id="13843" addr="0x7fca468f2590" >
+                            <attributelist id="13844" addr="0x7fca468f2590" >
+                                <attribute name="name" value="input" id="13845" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="13846" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="13847" addr="0x7fca469e4af0" />
+                                <attribute name="sym_previousSibling" value="0x7fca468f23f0" id="13848" addr="0x7fca468f23f0" />
+                                <attribute name="kind" value="function" id="13849" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="input" id="13850" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca468f1b50" id="13851" addr="0x7fca468f1b50" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="13852" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="13853" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468f1b50" id="13854" addr="0x7fca468f1b50" />
+                                <parmlist id="13855" addr="0x7fca468f2490" >
                                     <parm id="13856">
-                                        <attributelist id="13857" addr="0x7f99f1da4490" >
-                                            <attribute name="name" value="heading" id="13858" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13859" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13857" addr="0x7fca468f2490" >
+                                            <attribute name="name" value="heading" id="13858" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13859" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="XBMCAddon::String" id="13860" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_4" id="13861" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="XBMCAddon::String" id="13860" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_4" id="13861" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
                     </class >
-                    <class id="13862" addr="0x7f99f1da4850" >
-                        <attributelist id="13863" addr="0x7f99f1da4850" >
-                            <attribute name="name" value="XBMCAddon::xbmcgui::DialogProgress" id="13864" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="13865" addr="0x7f99f1e40fb0" />
-                            <attribute name="symtab" value="0x7f99f1da4990" id="13866" addr="0x7f99f1da4990" />
-                            <attribute name="allows_typedef" value="1" id="13867" addr="0x7f99f1de6c90" />
-                            <attribute name="typepass_visit" value="1" id="13868" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_visit" value="1" id="13869" addr="0x7f99f1de6c90" />
-                            <attribute name="kind" value="class" id="13870" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_name" value="DialogProgress" id="13871" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_default_constructor" value="1" id="13872" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_has_constructor" value="1" id="13873" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_public_constructor" value="1" id="13874" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_has_destructor" value="1" id="13875" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_default_destructor" value="1" id="13876" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_copy_constructor" value="1" id="13877" addr="0x7f99f1de6c90" />
-                            <attribute name="privatebaselist" value="0x7f99f1da4830" id="13878" addr="0x7f99f1da4830" />
-                            <attribute name="protectedbaselist" value="0x7f99f1da4810" id="13879" addr="0x7f99f1da4810" />
-                            <baselist id="13880" addr="0x7f99f1da47f0" >
-                                <base name="AddonClass" id="13881" addr="0x7f99f1da4770" />
+                    <class id="13862" addr="0x7fca468f2850" >
+                        <attributelist id="13863" addr="0x7fca468f2850" >
+                            <attribute name="name" value="XBMCAddon::xbmcgui::DialogProgress" id="13864" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="13865" addr="0x7fca4698efb0" />
+                            <attribute name="symtab" value="0x7fca468f2990" id="13866" addr="0x7fca468f2990" />
+                            <attribute name="allows_typedef" value="1" id="13867" addr="0x7fca46934c90" />
+                            <attribute name="typepass_visit" value="1" id="13868" addr="0x7fca46934c90" />
+                            <attribute name="allocate_visit" value="1" id="13869" addr="0x7fca46934c90" />
+                            <attribute name="kind" value="class" id="13870" addr="0x7fca46934c90" />
+                            <attribute name="sym_name" value="DialogProgress" id="13871" addr="0x7fca46934c90" />
+                            <attribute name="allocate_default_constructor" value="1" id="13872" addr="0x7fca46934c90" />
+                            <attribute name="allocate_has_constructor" value="1" id="13873" addr="0x7fca46934c90" />
+                            <attribute name="allocate_public_constructor" value="1" id="13874" addr="0x7fca46934c90" />
+                            <attribute name="allocate_has_destructor" value="1" id="13875" addr="0x7fca46934c90" />
+                            <attribute name="allocate_default_destructor" value="1" id="13876" addr="0x7fca46934c90" />
+                            <attribute name="allocate_copy_constructor" value="1" id="13877" addr="0x7fca46934c90" />
+                            <attribute name="privatebaselist" value="0x7fca468f2830" id="13878" addr="0x7fca468f2830" />
+                            <attribute name="protectedbaselist" value="0x7fca468f2810" id="13879" addr="0x7fca468f2810" />
+                            <baselist id="13880" addr="0x7fca468f27f0" >
+                                <base name="AddonClass" id="13881" addr="0x7fca468f2770" />
                             </baselist >
-                            <attribute name="module" value="xbmcgui" id="13882" addr="0x7f99f1e402f0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="13883" addr="0x7f99f1de6c90" />
-                            <typescope id="13884" addr="0x7f99f1de0810" >
-                                <attributelist id="13885" addr="0x7f99f1de0810" >
-                                    <attribute name="name" value="DialogProgress" id="13886" addr="0x7f99f1de6c90" />
-                                    <typetab id="13887" addr="0x7f99f1de0830" >
-                                        <attributelist id="13888" addr="0x7f99f1de0830" >
+                            <attribute name="module" value="xbmcgui" id="13882" addr="0x7fca4698e2f0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="13883" addr="0x7fca46934c90" />
+                            <typescope id="13884" addr="0x7fca4692e810" >
+                                <attributelist id="13885" addr="0x7fca4692e810" >
+                                    <attribute name="name" value="DialogProgress" id="13886" addr="0x7fca46934c90" />
+                                    <typetab id="13887" addr="0x7fca4692e830" >
+                                        <attributelist id="13888" addr="0x7fca4692e830" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f99f1dd2150" id="13889" addr="0x7f99f1dd2150" />
-                                    <attribute name="qname" value="XBMCAddon::xbmcgui::DialogProgress" id="13890" addr="0x7f99f1de6c90" />
-                                    <attribute name="symtab" value="0x7f99f1da4990" id="13891" addr="0x7f99f1da4990" />
+                                    <attribute name="parent" value="0x7fca46920150" id="13889" addr="0x7fca46920150" />
+                                    <attribute name="qname" value="XBMCAddon::xbmcgui::DialogProgress" id="13890" addr="0x7fca46934c90" />
+                                    <attribute name="symtab" value="0x7fca468f2990" id="13891" addr="0x7fca468f2990" />
                                 </attributelist >
-                                <typescopesitem id="13892" addr="0x7f99f1de07b0" >
-                                    <attributelist id="13893" addr="0x7f99f1de07b0" >
+                                <typescopesitem id="13892" addr="0x7fca4692e7b0" >
+                                    <attributelist id="13893" addr="0x7fca4692e7b0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="13894" addr="0x7f99f1de0830" >
-                                    <attributelist id="13895" addr="0x7f99f1de0830" >
+                                <typescopesitem id="13894" addr="0x7fca4692e830" >
+                                    <attributelist id="13895" addr="0x7fca4692e830" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="13896" addr="0x7f99f1dd2150" >
-                                    <attributelist id="13897" addr="0x7f99f1dd2150" >
-                                        <attribute name="name" value="xbmcgui" id="13898" addr="0x7f99f1de6c90" />
-                                        <typetab id="13899" addr="0x7f99f1dd2170" >
-                                            <attributelist id="13900" addr="0x7f99f1dd2170" >
-                                                <attribute name="InterceptorBase" value="InterceptorBase" id="13901" addr="0x7f99f1de6c90" />
-                                                <attribute name="Dialog" value="Dialog" id="13902" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="13903" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="13904" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlTextBox" value="ControlTextBox" id="13905" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="13906" addr="0x7f99f1de6c90" />
-                                                <attribute name="Window" value="Window" id="13907" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="13908" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlList" value="ControlList" id="13909" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="13910" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlImage" value="ControlImage" id="13911" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlButton" value="ControlButton" id="13912" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlGroup" value="ControlGroup" id="13913" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogBusy" value="DialogBusy" id="13914" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="13915" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSpin" value="ControlSpin" id="13916" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlEdit" value="ControlEdit" id="13917" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="13918" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="13919" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlLabel" value="ControlLabel" id="13920" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlProgress" value="ControlProgress" id="13921" addr="0x7f99f1de6c90" />
-                                                <attribute name="Control" value="Control" id="13922" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSlider" value="ControlSlider" id="13923" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgress" value="DialogProgress" id="13924" addr="0x7f99f1de6c90" />
-                                                <attribute name="Action" value="Action" id="13925" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowDialog" value="WindowDialog" id="13926" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXML" value="WindowXML" id="13927" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItem" value="ListItem" id="13928" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="13929" addr="0x7f99f1de6c90" />
+                                <typescopesitem id="13896" addr="0x7fca46920150" >
+                                    <attributelist id="13897" addr="0x7fca46920150" >
+                                        <attribute name="name" value="xbmcgui" id="13898" addr="0x7fca46934c90" />
+                                        <typetab id="13899" addr="0x7fca46920170" >
+                                            <attributelist id="13900" addr="0x7fca46920170" >
+                                                <attribute name="InterceptorBase" value="InterceptorBase" id="13901" addr="0x7fca46934c90" />
+                                                <attribute name="Dialog" value="Dialog" id="13902" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="13903" addr="0x7fca46934c90" />
+                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="13904" addr="0x7fca46934c90" />
+                                                <attribute name="ControlTextBox" value="ControlTextBox" id="13905" addr="0x7fca46934c90" />
+                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="13906" addr="0x7fca46934c90" />
+                                                <attribute name="Window" value="Window" id="13907" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="13908" addr="0x7fca46934c90" />
+                                                <attribute name="ControlList" value="ControlList" id="13909" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="13910" addr="0x7fca46934c90" />
+                                                <attribute name="ControlImage" value="ControlImage" id="13911" addr="0x7fca46934c90" />
+                                                <attribute name="ControlButton" value="ControlButton" id="13912" addr="0x7fca46934c90" />
+                                                <attribute name="ControlGroup" value="ControlGroup" id="13913" addr="0x7fca46934c90" />
+                                                <attribute name="DialogBusy" value="DialogBusy" id="13914" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="13915" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSpin" value="ControlSpin" id="13916" addr="0x7fca46934c90" />
+                                                <attribute name="ControlEdit" value="ControlEdit" id="13917" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="13918" addr="0x7fca46934c90" />
+                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="13919" addr="0x7fca46934c90" />
+                                                <attribute name="ControlLabel" value="ControlLabel" id="13920" addr="0x7fca46934c90" />
+                                                <attribute name="ControlProgress" value="ControlProgress" id="13921" addr="0x7fca46934c90" />
+                                                <attribute name="Control" value="Control" id="13922" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSlider" value="ControlSlider" id="13923" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgress" value="DialogProgress" id="13924" addr="0x7fca46934c90" />
+                                                <attribute name="Action" value="Action" id="13925" addr="0x7fca46934c90" />
+                                                <attribute name="WindowDialog" value="WindowDialog" id="13926" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXML" value="WindowXML" id="13927" addr="0x7fca46934c90" />
+                                                <attribute name="ListItem" value="ListItem" id="13928" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="13929" addr="0x7fca46934c90" />
                                             </attributelist >
-                                            <typetabsitem id="13930" addr="0x7f99f1de1dd0" >
-                                                <attributelist id="13931" addr="0x7f99f1de1dd0" >
+                                            <typetabsitem id="13930" addr="0x7fca4692fdd0" >
+                                                <attributelist id="13931" addr="0x7fca4692fdd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="13932" addr="0x7f99f1dde790" >
-                                                <attributelist id="13933" addr="0x7f99f1dde790" >
+                                            <typetabsitem id="13932" addr="0x7fca4692c790" >
+                                                <attributelist id="13933" addr="0x7fca4692c790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="13934" addr="0x7f99f1de3f10" >
-                                                <attributelist id="13935" addr="0x7f99f1de3f10" >
+                                            <typetabsitem id="13934" addr="0x7fca46931f10" >
+                                                <attributelist id="13935" addr="0x7fca46931f10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="13936" addr="0x7f99f1dd67b0" >
-                                                <attributelist id="13937" addr="0x7f99f1dd67b0" >
+                                            <typetabsitem id="13936" addr="0x7fca469247b0" >
+                                                <attributelist id="13937" addr="0x7fca469247b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="13938" addr="0x7f99f1ddafd0" >
-                                                <attributelist id="13939" addr="0x7f99f1ddafd0" >
+                                            <typetabsitem id="13938" addr="0x7fca46928fd0" >
+                                                <attributelist id="13939" addr="0x7fca46928fd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="13940" addr="0x7f99f1ddd430" >
-                                                <attributelist id="13941" addr="0x7f99f1ddd430" >
+                                            <typetabsitem id="13940" addr="0x7fca4692b430" >
+                                                <attributelist id="13941" addr="0x7fca4692b430" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="13942" addr="0x7f99f1de2130" >
-                                                <attributelist id="13943" addr="0x7f99f1de2130" >
+                                            <typetabsitem id="13942" addr="0x7fca46930130" >
+                                                <attributelist id="13943" addr="0x7fca46930130" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="13944" addr="0x7f99f1dd2f50" >
-                                                <attributelist id="13945" addr="0x7f99f1dd2f50" >
+                                            <typetabsitem id="13944" addr="0x7fca46920f50" >
+                                                <attributelist id="13945" addr="0x7fca46920f50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="13946" addr="0x7f99f1dd9650" >
-                                                <attributelist id="13947" addr="0x7f99f1dd9650" >
+                                            <typetabsitem id="13946" addr="0x7fca46927650" >
+                                                <attributelist id="13947" addr="0x7fca46927650" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="13948" addr="0x7f99f1de3390" >
-                                                <attributelist id="13949" addr="0x7f99f1de3390" >
+                                            <typetabsitem id="13948" addr="0x7fca46931390" >
+                                                <attributelist id="13949" addr="0x7fca46931390" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="13950" addr="0x7f99f1ddb7b0" >
-                                                <attributelist id="13951" addr="0x7f99f1ddb7b0" >
+                                            <typetabsitem id="13950" addr="0x7fca469297b0" >
+                                                <attributelist id="13951" addr="0x7fca469297b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="13952" addr="0x7f99f1ddc4b0" >
-                                                <attributelist id="13953" addr="0x7f99f1ddc4b0" >
+                                            <typetabsitem id="13952" addr="0x7fca4692a4b0" >
+                                                <attributelist id="13953" addr="0x7fca4692a4b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="13954" addr="0x7f99f1ddcf90" >
-                                                <attributelist id="13955" addr="0x7f99f1ddcf90" >
+                                            <typetabsitem id="13954" addr="0x7fca4692af90" >
+                                                <attributelist id="13955" addr="0x7fca4692af90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="13956" addr="0x7f99f1de11b0" >
-                                                <attributelist id="13957" addr="0x7f99f1de11b0" >
+                                            <typetabsitem id="13956" addr="0x7fca4692f1b0" >
+                                                <attributelist id="13957" addr="0x7fca4692f1b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="13958" addr="0x7f99f1de15b0" >
-                                                <attributelist id="13959" addr="0x7f99f1de15b0" >
+                                            <typetabsitem id="13958" addr="0x7fca4692f5b0" >
+                                                <attributelist id="13959" addr="0x7fca4692f5b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="13960" addr="0x7f99f1dd77f0" >
-                                                <attributelist id="13961" addr="0x7f99f1dd77f0" >
+                                            <typetabsitem id="13960" addr="0x7fca469257f0" >
+                                                <attributelist id="13961" addr="0x7fca469257f0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="13962" addr="0x7f99f1dd8b30" >
-                                                <attributelist id="13963" addr="0x7f99f1dd8b30" >
+                                            <typetabsitem id="13962" addr="0x7fca46926b30" >
+                                                <attributelist id="13963" addr="0x7fca46926b30" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="13964" addr="0x7f99f1dd2c50" >
-                                                <attributelist id="13965" addr="0x7f99f1dd2c50" >
+                                            <typetabsitem id="13964" addr="0x7fca46920c50" >
+                                                <attributelist id="13965" addr="0x7fca46920c50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="13966" addr="0x7f99f1dda790" >
-                                                <attributelist id="13967" addr="0x7f99f1dda790" >
+                                            <typetabsitem id="13966" addr="0x7fca46928790" >
+                                                <attributelist id="13967" addr="0x7fca46928790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="13968" addr="0x7f99f1dd8030" >
-                                                <attributelist id="13969" addr="0x7f99f1dd8030" >
+                                            <typetabsitem id="13968" addr="0x7fca46926030" >
+                                                <attributelist id="13969" addr="0x7fca46926030" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="13970" addr="0x7f99f1ddbe10" >
-                                                <attributelist id="13971" addr="0x7f99f1ddbe10" >
+                                            <typetabsitem id="13970" addr="0x7fca46929e10" >
+                                                <attributelist id="13971" addr="0x7fca46929e10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="13972" addr="0x7f99f1dd6b10" >
-                                                <attributelist id="13973" addr="0x7f99f1dd6b10" >
+                                            <typetabsitem id="13972" addr="0x7fca46924b10" >
+                                                <attributelist id="13973" addr="0x7fca46924b10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="13974" addr="0x7f99f1dddf90" >
-                                                <attributelist id="13975" addr="0x7f99f1dddf90" >
+                                            <typetabsitem id="13974" addr="0x7fca4692bf90" >
+                                                <attributelist id="13975" addr="0x7fca4692bf90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="13976" addr="0x7f99f1de0530" >
-                                                <attributelist id="13977" addr="0x7f99f1de0530" >
+                                            <typetabsitem id="13976" addr="0x7fca4692e530" >
+                                                <attributelist id="13977" addr="0x7fca4692e530" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="13978" addr="0x7f99f1de1e50" >
-                                                <attributelist id="13979" addr="0x7f99f1de1e50" >
+                                            <typetabsitem id="13978" addr="0x7fca4692fe50" >
+                                                <attributelist id="13979" addr="0x7fca4692fe50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="13980" addr="0x7f99f1de2d90" >
-                                                <attributelist id="13981" addr="0x7f99f1de2d90" >
+                                            <typetabsitem id="13980" addr="0x7fca46930d90" >
+                                                <attributelist id="13981" addr="0x7fca46930d90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="13982" addr="0x7f99f1de3410" >
-                                                <attributelist id="13983" addr="0x7f99f1de3410" >
+                                            <typetabsitem id="13982" addr="0x7fca46931410" >
+                                                <attributelist id="13983" addr="0x7fca46931410" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="13984" addr="0x7f99f1dd3590" >
-                                                <attributelist id="13985" addr="0x7f99f1dd3590" >
+                                            <typetabsitem id="13984" addr="0x7fca46921590" >
+                                                <attributelist id="13985" addr="0x7fca46921590" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="13986" addr="0x7f99f1dd3390" >
-                                                <attributelist id="13987" addr="0x7f99f1dd3390" >
+                                            <typetabsitem id="13986" addr="0x7fca46921390" >
+                                                <attributelist id="13987" addr="0x7fca46921390" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7f99f1dd1d70" id="13988" addr="0x7f99f1dd1d70" />
-                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="13989" addr="0x7f99f1de6c90" />
-                                        <attribute name="symtab" value="0x7f99f1e40fb0" id="13990" addr="0x7f99f1e40fb0" />
+                                        <attribute name="parent" value="0x7fca4691fd70" id="13988" addr="0x7fca4691fd70" />
+                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="13989" addr="0x7fca46934c90" />
+                                        <attribute name="symtab" value="0x7fca4698efb0" id="13990" addr="0x7fca4698efb0" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="13991" addr="0x7f99f1de0850" >
-                                    <attributelist id="13992" addr="0x7f99f1de0850" >
+                                <typescopesitem id="13991" addr="0x7fca4692e850" >
+                                    <attributelist id="13992" addr="0x7fca4692e850" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="13993" addr="0x7f99f1da4990" >
-                                    <attributelist id="13994" addr="0x7f99f1da4990" >
-                                        <attribute name="name" value="DialogProgress" id="13995" addr="0x7f99f1de6c90" />
-                                        <attribute name="csymtab" value="0x7f99f1da49b0" id="13996" addr="0x7f99f1da49b0" />
-                                        <attribute name="symtab" value="0x7f99f1da4950" id="13997" addr="0x7f99f1da4950" />
+                                <typescopesitem id="13993" addr="0x7fca468f2990" >
+                                    <attributelist id="13994" addr="0x7fca468f2990" >
+                                        <attribute name="name" value="DialogProgress" id="13995" addr="0x7fca46934c90" />
+                                        <attribute name="csymtab" value="0x7fca468f29b0" id="13996" addr="0x7fca468f29b0" />
+                                        <attribute name="symtab" value="0x7fca468f2950" id="13997" addr="0x7fca468f2950" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <cdecl id="13998" addr="0x7f99f1da4af0" >
-                            <attributelist id="13999" addr="0x7f99f1da4af0" >
-                                <attribute name="ismember" value="1" id="14000" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="dlg" id="14001" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="p." id="14002" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="private" id="14003" addr="0x7f99f1de6c90" />
-                                <attribute name="value" value="nullptr" id="14004" addr="0x7f99f1de6c90" />
-                                <attribute name="valuetype" value="int" id="14005" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="variable" id="14006" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="CGUIDialogProgress" id="14007" addr="0x7f99f1de6c90" />
-                                <attribute name="hasvalue" value="1" id="14008" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1da4990" id="14009" addr="0x7f99f1da4990" />
+                        <cdecl id="13998" addr="0x7fca468f2af0" >
+                            <attributelist id="13999" addr="0x7fca468f2af0" >
+                                <attribute name="ismember" value="1" id="14000" addr="0x7fca46934c90" />
+                                <attribute name="name" value="dlg" id="14001" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="p." id="14002" addr="0x7fca46934c90" />
+                                <attribute name="access" value="private" id="14003" addr="0x7fca46934c90" />
+                                <attribute name="value" value="nullptr" id="14004" addr="0x7fca46934c90" />
+                                <attribute name="valuetype" value="int" id="14005" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="variable" id="14006" addr="0x7fca46934c90" />
+                                <attribute name="type" value="CGUIDialogProgress" id="14007" addr="0x7fca46934c90" />
+                                <attribute name="hasvalue" value="1" id="14008" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468f2990" id="14009" addr="0x7fca468f2990" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="14010" addr="0x7f99f1da4d50" >
-                            <attributelist id="14011" addr="0x7f99f1da4d50" >
-                                <attribute name="value" value="false" id="14012" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="open" id="14013" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="14014" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1da4990" id="14015" addr="0x7f99f1da4990" />
-                                <attribute name="hasvalue" value="1" id="14016" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="variable" id="14017" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="" id="14018" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="private" id="14019" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="bool" id="14020" addr="0x7f99f1de6c90" />
-                                <attribute name="valuetype" value="bool" id="14021" addr="0x7f99f1de6c90" />
+                        <cdecl id="14010" addr="0x7fca468f2d50" >
+                            <attributelist id="14011" addr="0x7fca468f2d50" >
+                                <attribute name="value" value="false" id="14012" addr="0x7fca46934c90" />
+                                <attribute name="name" value="open" id="14013" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="14014" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468f2990" id="14015" addr="0x7fca468f2990" />
+                                <attribute name="hasvalue" value="1" id="14016" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="variable" id="14017" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="" id="14018" addr="0x7fca46934c90" />
+                                <attribute name="access" value="private" id="14019" addr="0x7fca46934c90" />
+                                <attribute name="type" value="bool" id="14020" addr="0x7fca46934c90" />
+                                <attribute name="valuetype" value="bool" id="14021" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <access id="14022" addr="0x7f99f1da4e70" >
-                            <attributelist id="14023" addr="0x7f99f1da4e70" >
-                                <attribute name="kind" value="protected" id="14024" addr="0x7f99f1de6c90" />
+                        <access id="14022" addr="0x7fca468f2e70" >
+                            <attributelist id="14023" addr="0x7fca468f2e70" >
+                                <attribute name="kind" value="protected" id="14024" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </access >
-                        <cdecl id="14025" addr="0x7f99f1da4fb0" >
-                            <attributelist id="14026" addr="0x7f99f1da4fb0" >
-                                <attribute name="ismember" value="1" id="14027" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="deallocating" id="14028" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="deallocating" id="14029" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="14030" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="protected" id="14031" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="14032" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="void" id="14033" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1da4990" id="14034" addr="0x7f99f1da4990" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="14035" addr="0x7f99f1de6c90" />
+                        <cdecl id="14025" addr="0x7fca468f2fb0" >
+                            <attributelist id="14026" addr="0x7fca468f2fb0" >
+                                <attribute name="ismember" value="1" id="14027" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="deallocating" id="14028" addr="0x7fca46934c90" />
+                                <attribute name="name" value="deallocating" id="14029" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="14030" addr="0x7fca46934c90" />
+                                <attribute name="access" value="protected" id="14031" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="14032" addr="0x7fca46934c90" />
+                                <attribute name="type" value="void" id="14033" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468f2990" id="14034" addr="0x7fca468f2990" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="14035" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <access id="14036" addr="0x7f99f1da5050" >
-                            <attributelist id="14037" addr="0x7f99f1da5050" >
-                                <attribute name="kind" value="public" id="14038" addr="0x7f99f1de6c90" />
+                        <access id="14036" addr="0x7fca468f3050" >
+                            <attributelist id="14037" addr="0x7fca468f3050" >
+                                <attribute name="kind" value="public" id="14038" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="14039" addr="0x7f99f1da51d0" >
-                            <attributelist id="14040" addr="0x7f99f1da51d0" >
-                                <attribute name="ismember" value="1" id="14041" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="DialogProgress" id="14042" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="DialogProgress" id="14043" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="14044" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="14045" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="14046" addr="0x7f99f1de6c90" />
-                                <attribute name="value" value="default" id="14047" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1da4990" id="14048" addr="0x7f99f1da4990" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="14049" addr="0x7f99f1de6c90" />
+                        <constructor id="14039" addr="0x7fca468f31d0" >
+                            <attributelist id="14040" addr="0x7fca468f31d0" >
+                                <attribute name="ismember" value="1" id="14041" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="DialogProgress" id="14042" addr="0x7fca46934c90" />
+                                <attribute name="name" value="DialogProgress" id="14043" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="14044" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="14045" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="14046" addr="0x7fca46934c90" />
+                                <attribute name="value" value="default" id="14047" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468f2990" id="14048" addr="0x7fca468f2990" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="14049" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <destructor id="14050" addr="0x7f99f1da5330" >
-                            <attributelist id="14051" addr="0x7f99f1da5330" >
-                                <attribute name="ismember" value="1" id="14052" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="~DialogProgress" id="14053" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="~DialogProgress" id="14054" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="14055" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="14056" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1da4990" id="14057" addr="0x7f99f1da4990" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="14058" addr="0x7f99f1de6c90" />
+                        <destructor id="14050" addr="0x7fca468f3330" >
+                            <attributelist id="14051" addr="0x7fca468f3330" >
+                                <attribute name="ismember" value="1" id="14052" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="~DialogProgress" id="14053" addr="0x7fca46934c90" />
+                                <attribute name="name" value="~DialogProgress" id="14054" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="14055" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="14056" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468f2990" id="14057" addr="0x7fca468f2990" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="14058" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </destructor >
-                        <cdecl id="14059" addr="0x7f99f1da5af0" >
-                            <attributelist id="14060" addr="0x7f99f1da5af0" >
-                                <attribute name="name" value="create" id="14061" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="14062" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1da4990" id="14063" addr="0x7f99f1da4990" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1da5dd0" id="14064" addr="0x7f99f1da5dd0" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1da5dd0" id="14065" addr="0x7f99f1da5dd0" />
-                                <attribute name="kind" value="function" id="14066" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="create" id="14067" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="14068" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="14069" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1da5af0" id="14070" addr="0x7f99f1da5af0" />
-                                <parmlist id="14071" addr="0x7f99f1da5550" >
+                        <cdecl id="14059" addr="0x7fca468f3af0" >
+                            <attributelist id="14060" addr="0x7fca468f3af0" >
+                                <attribute name="name" value="create" id="14061" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="14062" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468f2990" id="14063" addr="0x7fca468f2990" />
+                                <attribute name="sym_nextSibling" value="0x7fca468f3dd0" id="14064" addr="0x7fca468f3dd0" />
+                                <attribute name="csym_nextSibling" value="0x7fca468f3dd0" id="14065" addr="0x7fca468f3dd0" />
+                                <attribute name="kind" value="function" id="14066" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="create" id="14067" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="14068" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="14069" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468f3af0" id="14070" addr="0x7fca468f3af0" />
+                                <parmlist id="14071" addr="0x7fca468f3550" >
                                     <parm id="14072">
-                                        <attributelist id="14073" addr="0x7f99f1da5550" >
-                                            <attribute name="name" value="heading" id="14074" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14075" addr="0x7f99f1de6c90" />
+                                        <attributelist id="14073" addr="0x7fca468f3550" >
+                                            <attribute name="name" value="heading" id="14074" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14075" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="14076">
-                                        <attributelist id="14077" addr="0x7f99f1da56f0" >
-                                            <attribute name="name" value="line1" id="14078" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="14079" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14080" addr="0x7f99f1de6c90" />
+                                        <attributelist id="14077" addr="0x7fca468f36f0" >
+                                            <attribute name="name" value="line1" id="14078" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="14079" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14080" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="14081">
-                                        <attributelist id="14082" addr="0x7f99f1da5890" >
-                                            <attribute name="name" value="line2" id="14083" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="14084" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14085" addr="0x7f99f1de6c90" />
+                                        <attributelist id="14082" addr="0x7fca468f3890" >
+                                            <attribute name="name" value="line2" id="14083" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="14084" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14085" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="14086">
-                                        <attributelist id="14087" addr="0x7f99f1da5a30" >
-                                            <attribute name="name" value="line3" id="14088" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="14089" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14090" addr="0x7f99f1de6c90" />
+                                        <attributelist id="14087" addr="0x7fca468f3a30" >
+                                            <attribute name="name" value="line3" id="14088" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="14089" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14090" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="14091" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="14092" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="14091" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="14092" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="14093" addr="0x7f99f1da5dd0" >
-                            <attributelist id="14094" addr="0x7f99f1da5dd0" >
-                                <attribute name="name" value="create" id="14095" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="14096" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1da4990" id="14097" addr="0x7f99f1da4990" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1da5af0" id="14098" addr="0x7f99f1da5af0" />
-                                <attribute name="kind" value="function" id="14099" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="create" id="14100" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1da6010" id="14101" addr="0x7f99f1da6010" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1da6010" id="14102" addr="0x7f99f1da6010" />
-                                <attribute name="defaultargs" value="0x7f99f1da5af0" id="14103" addr="0x7f99f1da5af0" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="14104" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="14105" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1da5af0" id="14106" addr="0x7f99f1da5af0" />
-                                <parmlist id="14107" addr="0x7f99f1da5b90" >
+                        <cdecl id="14093" addr="0x7fca468f3dd0" >
+                            <attributelist id="14094" addr="0x7fca468f3dd0" >
+                                <attribute name="name" value="create" id="14095" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="14096" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468f2990" id="14097" addr="0x7fca468f2990" />
+                                <attribute name="sym_previousSibling" value="0x7fca468f3af0" id="14098" addr="0x7fca468f3af0" />
+                                <attribute name="kind" value="function" id="14099" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="create" id="14100" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca468f4010" id="14101" addr="0x7fca468f4010" />
+                                <attribute name="sym_nextSibling" value="0x7fca468f4010" id="14102" addr="0x7fca468f4010" />
+                                <attribute name="defaultargs" value="0x7fca468f3af0" id="14103" addr="0x7fca468f3af0" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="14104" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="14105" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468f3af0" id="14106" addr="0x7fca468f3af0" />
+                                <parmlist id="14107" addr="0x7fca468f3b90" >
                                     <parm id="14108">
-                                        <attributelist id="14109" addr="0x7f99f1da5b90" >
-                                            <attribute name="name" value="heading" id="14110" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14111" addr="0x7f99f1de6c90" />
+                                        <attributelist id="14109" addr="0x7fca468f3b90" >
+                                            <attribute name="name" value="heading" id="14110" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14111" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="14112">
-                                        <attributelist id="14113" addr="0x7f99f1da5c70" >
-                                            <attribute name="name" value="line1" id="14114" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="14115" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14116" addr="0x7f99f1de6c90" />
+                                        <attributelist id="14113" addr="0x7fca468f3c70" >
+                                            <attribute name="name" value="line1" id="14114" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="14115" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14116" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="14117">
-                                        <attributelist id="14118" addr="0x7f99f1da5d10" >
-                                            <attribute name="name" value="line2" id="14119" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="14120" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14121" addr="0x7f99f1de6c90" />
+                                        <attributelist id="14118" addr="0x7fca468f3d10" >
+                                            <attribute name="name" value="line2" id="14119" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="14120" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14121" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="14122" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="14123" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="14122" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="14123" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="14124" addr="0x7f99f1da6010" >
-                            <attributelist id="14125" addr="0x7f99f1da6010" >
-                                <attribute name="name" value="create" id="14126" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="14127" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1da4990" id="14128" addr="0x7f99f1da4990" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1da5dd0" id="14129" addr="0x7f99f1da5dd0" />
-                                <attribute name="kind" value="function" id="14130" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="create" id="14131" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1da61b0" id="14132" addr="0x7f99f1da61b0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1da61b0" id="14133" addr="0x7f99f1da61b0" />
-                                <attribute name="defaultargs" value="0x7f99f1da5af0" id="14134" addr="0x7f99f1da5af0" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="14135" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="14136" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1da5af0" id="14137" addr="0x7f99f1da5af0" />
-                                <parmlist id="14138" addr="0x7f99f1da5e70" >
+                        <cdecl id="14124" addr="0x7fca468f4010" >
+                            <attributelist id="14125" addr="0x7fca468f4010" >
+                                <attribute name="name" value="create" id="14126" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="14127" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468f2990" id="14128" addr="0x7fca468f2990" />
+                                <attribute name="sym_previousSibling" value="0x7fca468f3dd0" id="14129" addr="0x7fca468f3dd0" />
+                                <attribute name="kind" value="function" id="14130" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="create" id="14131" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca468f41b0" id="14132" addr="0x7fca468f41b0" />
+                                <attribute name="sym_nextSibling" value="0x7fca468f41b0" id="14133" addr="0x7fca468f41b0" />
+                                <attribute name="defaultargs" value="0x7fca468f3af0" id="14134" addr="0x7fca468f3af0" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="14135" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="14136" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468f3af0" id="14137" addr="0x7fca468f3af0" />
+                                <parmlist id="14138" addr="0x7fca468f3e70" >
                                     <parm id="14139">
-                                        <attributelist id="14140" addr="0x7f99f1da5e70" >
-                                            <attribute name="name" value="heading" id="14141" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14142" addr="0x7f99f1de6c90" />
+                                        <attributelist id="14140" addr="0x7fca468f3e70" >
+                                            <attribute name="name" value="heading" id="14141" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14142" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="14143">
-                                        <attributelist id="14144" addr="0x7f99f1da5f50" >
-                                            <attribute name="name" value="line1" id="14145" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="14146" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14147" addr="0x7f99f1de6c90" />
+                                        <attributelist id="14144" addr="0x7fca468f3f50" >
+                                            <attribute name="name" value="line1" id="14145" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="14146" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14147" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="14148" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_2" id="14149" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="14148" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_2" id="14149" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="14150" addr="0x7f99f1da61b0" >
-                            <attributelist id="14151" addr="0x7f99f1da61b0" >
-                                <attribute name="name" value="create" id="14152" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="14153" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1da4990" id="14154" addr="0x7f99f1da4990" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1da6010" id="14155" addr="0x7f99f1da6010" />
-                                <attribute name="kind" value="function" id="14156" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="create" id="14157" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1da5af0" id="14158" addr="0x7f99f1da5af0" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="14159" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="14160" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1da5af0" id="14161" addr="0x7f99f1da5af0" />
-                                <parmlist id="14162" addr="0x7f99f1da60b0" >
+                        <cdecl id="14150" addr="0x7fca468f41b0" >
+                            <attributelist id="14151" addr="0x7fca468f41b0" >
+                                <attribute name="name" value="create" id="14152" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="14153" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468f2990" id="14154" addr="0x7fca468f2990" />
+                                <attribute name="sym_previousSibling" value="0x7fca468f4010" id="14155" addr="0x7fca468f4010" />
+                                <attribute name="kind" value="function" id="14156" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="create" id="14157" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca468f3af0" id="14158" addr="0x7fca468f3af0" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="14159" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="14160" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468f3af0" id="14161" addr="0x7fca468f3af0" />
+                                <parmlist id="14162" addr="0x7fca468f40b0" >
                                     <parm id="14163">
-                                        <attributelist id="14164" addr="0x7f99f1da60b0" >
-                                            <attribute name="name" value="heading" id="14165" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14166" addr="0x7f99f1de6c90" />
+                                        <attributelist id="14164" addr="0x7fca468f40b0" >
+                                            <attribute name="name" value="heading" id="14165" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14166" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="14167" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_3" id="14168" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="14167" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_3" id="14168" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="14169" addr="0x7f99f1da6970" >
-                            <attributelist id="14170" addr="0x7f99f1da6970" >
-                                <attribute name="name" value="update" id="14171" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="14172" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1da4990" id="14173" addr="0x7f99f1da4990" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1da6c50" id="14174" addr="0x7f99f1da6c50" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1da6c50" id="14175" addr="0x7f99f1da6c50" />
-                                <attribute name="kind" value="function" id="14176" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="update" id="14177" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="14178" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="14179" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1da6970" id="14180" addr="0x7f99f1da6970" />
-                                <parmlist id="14181" addr="0x7f99f1da63d0" >
+                        <cdecl id="14169" addr="0x7fca468f4970" >
+                            <attributelist id="14170" addr="0x7fca468f4970" >
+                                <attribute name="name" value="update" id="14171" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="14172" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468f2990" id="14173" addr="0x7fca468f2990" />
+                                <attribute name="sym_nextSibling" value="0x7fca468f4c50" id="14174" addr="0x7fca468f4c50" />
+                                <attribute name="csym_nextSibling" value="0x7fca468f4c50" id="14175" addr="0x7fca468f4c50" />
+                                <attribute name="kind" value="function" id="14176" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="update" id="14177" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="14178" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="14179" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468f4970" id="14180" addr="0x7fca468f4970" />
+                                <parmlist id="14181" addr="0x7fca468f43d0" >
                                     <parm id="14182">
-                                        <attributelist id="14183" addr="0x7f99f1da63d0" >
-                                            <attribute name="name" value="percent" id="14184" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="14185" addr="0x7f99f1de6c90" />
+                                        <attributelist id="14183" addr="0x7fca468f43d0" >
+                                            <attribute name="name" value="percent" id="14184" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="14185" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="14186">
-                                        <attributelist id="14187" addr="0x7f99f1da6570" >
-                                            <attribute name="name" value="line1" id="14188" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="14189" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14190" addr="0x7f99f1de6c90" />
+                                        <attributelist id="14187" addr="0x7fca468f4570" >
+                                            <attribute name="name" value="line1" id="14188" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="14189" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14190" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="14191">
-                                        <attributelist id="14192" addr="0x7f99f1da6710" >
-                                            <attribute name="name" value="line2" id="14193" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="14194" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14195" addr="0x7f99f1de6c90" />
+                                        <attributelist id="14192" addr="0x7fca468f4710" >
+                                            <attribute name="name" value="line2" id="14193" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="14194" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14195" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="14196">
-                                        <attributelist id="14197" addr="0x7f99f1da68b0" >
-                                            <attribute name="name" value="line3" id="14198" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="14199" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14200" addr="0x7f99f1de6c90" />
+                                        <attributelist id="14197" addr="0x7fca468f48b0" >
+                                            <attribute name="name" value="line3" id="14198" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="14199" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14200" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="14201" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="14202" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="14201" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="14202" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="14203" addr="0x7f99f1da6c50" >
-                            <attributelist id="14204" addr="0x7f99f1da6c50" >
-                                <attribute name="name" value="update" id="14205" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="14206" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1da4990" id="14207" addr="0x7f99f1da4990" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1da6970" id="14208" addr="0x7f99f1da6970" />
-                                <attribute name="kind" value="function" id="14209" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="update" id="14210" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1da6e90" id="14211" addr="0x7f99f1da6e90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1da6e90" id="14212" addr="0x7f99f1da6e90" />
-                                <attribute name="defaultargs" value="0x7f99f1da6970" id="14213" addr="0x7f99f1da6970" />
-                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="14214" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="14215" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1da6970" id="14216" addr="0x7f99f1da6970" />
-                                <parmlist id="14217" addr="0x7f99f1da6a10" >
+                        <cdecl id="14203" addr="0x7fca468f4c50" >
+                            <attributelist id="14204" addr="0x7fca468f4c50" >
+                                <attribute name="name" value="update" id="14205" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="14206" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468f2990" id="14207" addr="0x7fca468f2990" />
+                                <attribute name="sym_previousSibling" value="0x7fca468f4970" id="14208" addr="0x7fca468f4970" />
+                                <attribute name="kind" value="function" id="14209" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="update" id="14210" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca468f4e90" id="14211" addr="0x7fca468f4e90" />
+                                <attribute name="sym_nextSibling" value="0x7fca468f4e90" id="14212" addr="0x7fca468f4e90" />
+                                <attribute name="defaultargs" value="0x7fca468f4970" id="14213" addr="0x7fca468f4970" />
+                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="14214" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="14215" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468f4970" id="14216" addr="0x7fca468f4970" />
+                                <parmlist id="14217" addr="0x7fca468f4a10" >
                                     <parm id="14218">
-                                        <attributelist id="14219" addr="0x7f99f1da6a10" >
-                                            <attribute name="name" value="percent" id="14220" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="14221" addr="0x7f99f1de6c90" />
+                                        <attributelist id="14219" addr="0x7fca468f4a10" >
+                                            <attribute name="name" value="percent" id="14220" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="14221" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="14222">
-                                        <attributelist id="14223" addr="0x7f99f1da6af0" >
-                                            <attribute name="name" value="line1" id="14224" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="14225" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14226" addr="0x7f99f1de6c90" />
+                                        <attributelist id="14223" addr="0x7fca468f4af0" >
+                                            <attribute name="name" value="line1" id="14224" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="14225" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14226" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="14227">
-                                        <attributelist id="14228" addr="0x7f99f1da6b90" >
-                                            <attribute name="name" value="line2" id="14229" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="14230" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14231" addr="0x7f99f1de6c90" />
+                                        <attributelist id="14228" addr="0x7fca468f4b90" >
+                                            <attribute name="name" value="line2" id="14229" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="14230" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14231" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="14232" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="14233" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="14232" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="14233" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="14234" addr="0x7f99f1da6e90" >
-                            <attributelist id="14235" addr="0x7f99f1da6e90" >
-                                <attribute name="name" value="update" id="14236" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="14237" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1da4990" id="14238" addr="0x7f99f1da4990" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1da6c50" id="14239" addr="0x7f99f1da6c50" />
-                                <attribute name="kind" value="function" id="14240" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="update" id="14241" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1da7030" id="14242" addr="0x7f99f1da7030" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1da7030" id="14243" addr="0x7f99f1da7030" />
-                                <attribute name="defaultargs" value="0x7f99f1da6970" id="14244" addr="0x7f99f1da6970" />
-                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String)." id="14245" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="14246" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1da6970" id="14247" addr="0x7f99f1da6970" />
-                                <parmlist id="14248" addr="0x7f99f1da6cf0" >
+                        <cdecl id="14234" addr="0x7fca468f4e90" >
+                            <attributelist id="14235" addr="0x7fca468f4e90" >
+                                <attribute name="name" value="update" id="14236" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="14237" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468f2990" id="14238" addr="0x7fca468f2990" />
+                                <attribute name="sym_previousSibling" value="0x7fca468f4c50" id="14239" addr="0x7fca468f4c50" />
+                                <attribute name="kind" value="function" id="14240" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="update" id="14241" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca468f5030" id="14242" addr="0x7fca468f5030" />
+                                <attribute name="sym_nextSibling" value="0x7fca468f5030" id="14243" addr="0x7fca468f5030" />
+                                <attribute name="defaultargs" value="0x7fca468f4970" id="14244" addr="0x7fca468f4970" />
+                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String)." id="14245" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="14246" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468f4970" id="14247" addr="0x7fca468f4970" />
+                                <parmlist id="14248" addr="0x7fca468f4cf0" >
                                     <parm id="14249">
-                                        <attributelist id="14250" addr="0x7f99f1da6cf0" >
-                                            <attribute name="name" value="percent" id="14251" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="14252" addr="0x7f99f1de6c90" />
+                                        <attributelist id="14250" addr="0x7fca468f4cf0" >
+                                            <attribute name="name" value="percent" id="14251" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="14252" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="14253">
-                                        <attributelist id="14254" addr="0x7f99f1da6dd0" >
-                                            <attribute name="name" value="line1" id="14255" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="14256" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14257" addr="0x7f99f1de6c90" />
+                                        <attributelist id="14254" addr="0x7fca468f4dd0" >
+                                            <attribute name="name" value="line1" id="14255" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="14256" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14257" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="14258" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_2" id="14259" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="14258" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_2" id="14259" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="14260" addr="0x7f99f1da7030" >
-                            <attributelist id="14261" addr="0x7f99f1da7030" >
-                                <attribute name="name" value="update" id="14262" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="14263" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1da4990" id="14264" addr="0x7f99f1da4990" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1da6e90" id="14265" addr="0x7f99f1da6e90" />
-                                <attribute name="kind" value="function" id="14266" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="update" id="14267" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1da6970" id="14268" addr="0x7f99f1da6970" />
-                                <attribute name="decl" value="f(int)." id="14269" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="14270" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1da6970" id="14271" addr="0x7f99f1da6970" />
-                                <parmlist id="14272" addr="0x7f99f1da6f30" >
+                        <cdecl id="14260" addr="0x7fca468f5030" >
+                            <attributelist id="14261" addr="0x7fca468f5030" >
+                                <attribute name="name" value="update" id="14262" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="14263" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468f2990" id="14264" addr="0x7fca468f2990" />
+                                <attribute name="sym_previousSibling" value="0x7fca468f4e90" id="14265" addr="0x7fca468f4e90" />
+                                <attribute name="kind" value="function" id="14266" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="update" id="14267" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca468f4970" id="14268" addr="0x7fca468f4970" />
+                                <attribute name="decl" value="f(int)." id="14269" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="14270" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468f4970" id="14271" addr="0x7fca468f4970" />
+                                <parmlist id="14272" addr="0x7fca468f4f30" >
                                     <parm id="14273">
-                                        <attributelist id="14274" addr="0x7f99f1da6f30" >
-                                            <attribute name="name" value="percent" id="14275" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="14276" addr="0x7f99f1de6c90" />
+                                        <attributelist id="14274" addr="0x7fca468f4f30" >
+                                            <attribute name="name" value="percent" id="14275" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="14276" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="14277" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_3" id="14278" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="14277" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_3" id="14278" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="14279" addr="0x7f99f1da71f0" >
-                            <attributelist id="14280" addr="0x7f99f1da71f0" >
-                                <attribute name="ismember" value="1" id="14281" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="close" id="14282" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="close" id="14283" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="14284" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="14285" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="14286" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="void" id="14287" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1da4990" id="14288" addr="0x7f99f1da4990" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="14289" addr="0x7f99f1de6c90" />
+                        <cdecl id="14279" addr="0x7fca468f51f0" >
+                            <attributelist id="14280" addr="0x7fca468f51f0" >
+                                <attribute name="ismember" value="1" id="14281" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="close" id="14282" addr="0x7fca46934c90" />
+                                <attribute name="name" value="close" id="14283" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="14284" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="14285" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="14286" addr="0x7fca46934c90" />
+                                <attribute name="type" value="void" id="14287" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468f2990" id="14288" addr="0x7fca468f2990" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="14289" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="14290" addr="0x7f99f1da73b0" >
-                            <attributelist id="14291" addr="0x7f99f1da73b0" >
-                                <attribute name="ismember" value="1" id="14292" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="iscanceled" id="14293" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="iscanceled" id="14294" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="14295" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="14296" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="14297" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="bool" id="14298" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1da4990" id="14299" addr="0x7f99f1da4990" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="14300" addr="0x7f99f1de6c90" />
+                        <cdecl id="14290" addr="0x7fca468f53b0" >
+                            <attributelist id="14291" addr="0x7fca468f53b0" >
+                                <attribute name="ismember" value="1" id="14292" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="iscanceled" id="14293" addr="0x7fca46934c90" />
+                                <attribute name="name" value="iscanceled" id="14294" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="14295" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="14296" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="14297" addr="0x7fca46934c90" />
+                                <attribute name="type" value="bool" id="14298" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468f2990" id="14299" addr="0x7fca468f2990" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="14300" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
                     </class >
-                    <class id="14301" addr="0x7f99f1da7670" >
-                        <attributelist id="14302" addr="0x7f99f1da7670" >
-                            <attribute name="name" value="XBMCAddon::xbmcgui::DialogBusy" id="14303" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="14304" addr="0x7f99f1e40fb0" />
-                            <attribute name="symtab" value="0x7f99f1da77b0" id="14305" addr="0x7f99f1da77b0" />
-                            <attribute name="allows_typedef" value="1" id="14306" addr="0x7f99f1de6c90" />
-                            <attribute name="typepass_visit" value="1" id="14307" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_visit" value="1" id="14308" addr="0x7f99f1de6c90" />
-                            <attribute name="kind" value="class" id="14309" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_name" value="DialogBusy" id="14310" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_default_constructor" value="1" id="14311" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_has_constructor" value="1" id="14312" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_public_constructor" value="1" id="14313" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_has_destructor" value="1" id="14314" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_default_destructor" value="1" id="14315" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_copy_constructor" value="1" id="14316" addr="0x7f99f1de6c90" />
-                            <attribute name="privatebaselist" value="0x7f99f1da7650" id="14317" addr="0x7f99f1da7650" />
-                            <attribute name="protectedbaselist" value="0x7f99f1da7630" id="14318" addr="0x7f99f1da7630" />
-                            <baselist id="14319" addr="0x7f99f1da7610" >
-                                <base name="AddonClass" id="14320" addr="0x7f99f1da7590" />
+                    <class id="14301" addr="0x7fca468f5670" >
+                        <attributelist id="14302" addr="0x7fca468f5670" >
+                            <attribute name="name" value="XBMCAddon::xbmcgui::DialogBusy" id="14303" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="14304" addr="0x7fca4698efb0" />
+                            <attribute name="symtab" value="0x7fca468f57b0" id="14305" addr="0x7fca468f57b0" />
+                            <attribute name="allows_typedef" value="1" id="14306" addr="0x7fca46934c90" />
+                            <attribute name="typepass_visit" value="1" id="14307" addr="0x7fca46934c90" />
+                            <attribute name="allocate_visit" value="1" id="14308" addr="0x7fca46934c90" />
+                            <attribute name="kind" value="class" id="14309" addr="0x7fca46934c90" />
+                            <attribute name="sym_name" value="DialogBusy" id="14310" addr="0x7fca46934c90" />
+                            <attribute name="allocate_default_constructor" value="1" id="14311" addr="0x7fca46934c90" />
+                            <attribute name="allocate_has_constructor" value="1" id="14312" addr="0x7fca46934c90" />
+                            <attribute name="allocate_public_constructor" value="1" id="14313" addr="0x7fca46934c90" />
+                            <attribute name="allocate_has_destructor" value="1" id="14314" addr="0x7fca46934c90" />
+                            <attribute name="allocate_default_destructor" value="1" id="14315" addr="0x7fca46934c90" />
+                            <attribute name="allocate_copy_constructor" value="1" id="14316" addr="0x7fca46934c90" />
+                            <attribute name="privatebaselist" value="0x7fca468f5650" id="14317" addr="0x7fca468f5650" />
+                            <attribute name="protectedbaselist" value="0x7fca468f5630" id="14318" addr="0x7fca468f5630" />
+                            <baselist id="14319" addr="0x7fca468f5610" >
+                                <base name="AddonClass" id="14320" addr="0x7fca468f5590" />
                             </baselist >
-                            <attribute name="module" value="xbmcgui" id="14321" addr="0x7f99f1e402f0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="14322" addr="0x7f99f1de6c90" />
-                            <typescope id="14323" addr="0x7f99f1de1270" >
-                                <attributelist id="14324" addr="0x7f99f1de1270" >
-                                    <attribute name="name" value="DialogBusy" id="14325" addr="0x7f99f1de6c90" />
-                                    <typetab id="14326" addr="0x7f99f1de1290" >
-                                        <attributelist id="14327" addr="0x7f99f1de1290" >
+                            <attribute name="module" value="xbmcgui" id="14321" addr="0x7fca4698e2f0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="14322" addr="0x7fca46934c90" />
+                            <typescope id="14323" addr="0x7fca4692f270" >
+                                <attributelist id="14324" addr="0x7fca4692f270" >
+                                    <attribute name="name" value="DialogBusy" id="14325" addr="0x7fca46934c90" />
+                                    <typetab id="14326" addr="0x7fca4692f290" >
+                                        <attributelist id="14327" addr="0x7fca4692f290" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f99f1dd2150" id="14328" addr="0x7f99f1dd2150" />
-                                    <attribute name="qname" value="XBMCAddon::xbmcgui::DialogBusy" id="14329" addr="0x7f99f1de6c90" />
-                                    <attribute name="symtab" value="0x7f99f1da77b0" id="14330" addr="0x7f99f1da77b0" />
+                                    <attribute name="parent" value="0x7fca46920150" id="14328" addr="0x7fca46920150" />
+                                    <attribute name="qname" value="XBMCAddon::xbmcgui::DialogBusy" id="14329" addr="0x7fca46934c90" />
+                                    <attribute name="symtab" value="0x7fca468f57b0" id="14330" addr="0x7fca468f57b0" />
                                 </attributelist >
-                                <typescopesitem id="14331" addr="0x7f99f1de1210" >
-                                    <attributelist id="14332" addr="0x7f99f1de1210" >
+                                <typescopesitem id="14331" addr="0x7fca4692f210" >
+                                    <attributelist id="14332" addr="0x7fca4692f210" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="14333" addr="0x7f99f1de1290" >
-                                    <attributelist id="14334" addr="0x7f99f1de1290" >
+                                <typescopesitem id="14333" addr="0x7fca4692f290" >
+                                    <attributelist id="14334" addr="0x7fca4692f290" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="14335" addr="0x7f99f1dd2150" >
-                                    <attributelist id="14336" addr="0x7f99f1dd2150" >
-                                        <attribute name="name" value="xbmcgui" id="14337" addr="0x7f99f1de6c90" />
-                                        <typetab id="14338" addr="0x7f99f1dd2170" >
-                                            <attributelist id="14339" addr="0x7f99f1dd2170" >
-                                                <attribute name="InterceptorBase" value="InterceptorBase" id="14340" addr="0x7f99f1de6c90" />
-                                                <attribute name="Dialog" value="Dialog" id="14341" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="14342" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="14343" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlTextBox" value="ControlTextBox" id="14344" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="14345" addr="0x7f99f1de6c90" />
-                                                <attribute name="Window" value="Window" id="14346" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="14347" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlList" value="ControlList" id="14348" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="14349" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlImage" value="ControlImage" id="14350" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlButton" value="ControlButton" id="14351" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlGroup" value="ControlGroup" id="14352" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogBusy" value="DialogBusy" id="14353" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="14354" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSpin" value="ControlSpin" id="14355" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlEdit" value="ControlEdit" id="14356" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="14357" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="14358" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlLabel" value="ControlLabel" id="14359" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlProgress" value="ControlProgress" id="14360" addr="0x7f99f1de6c90" />
-                                                <attribute name="Control" value="Control" id="14361" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSlider" value="ControlSlider" id="14362" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgress" value="DialogProgress" id="14363" addr="0x7f99f1de6c90" />
-                                                <attribute name="Action" value="Action" id="14364" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowDialog" value="WindowDialog" id="14365" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXML" value="WindowXML" id="14366" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItem" value="ListItem" id="14367" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="14368" addr="0x7f99f1de6c90" />
+                                <typescopesitem id="14335" addr="0x7fca46920150" >
+                                    <attributelist id="14336" addr="0x7fca46920150" >
+                                        <attribute name="name" value="xbmcgui" id="14337" addr="0x7fca46934c90" />
+                                        <typetab id="14338" addr="0x7fca46920170" >
+                                            <attributelist id="14339" addr="0x7fca46920170" >
+                                                <attribute name="InterceptorBase" value="InterceptorBase" id="14340" addr="0x7fca46934c90" />
+                                                <attribute name="Dialog" value="Dialog" id="14341" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="14342" addr="0x7fca46934c90" />
+                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="14343" addr="0x7fca46934c90" />
+                                                <attribute name="ControlTextBox" value="ControlTextBox" id="14344" addr="0x7fca46934c90" />
+                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="14345" addr="0x7fca46934c90" />
+                                                <attribute name="Window" value="Window" id="14346" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="14347" addr="0x7fca46934c90" />
+                                                <attribute name="ControlList" value="ControlList" id="14348" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="14349" addr="0x7fca46934c90" />
+                                                <attribute name="ControlImage" value="ControlImage" id="14350" addr="0x7fca46934c90" />
+                                                <attribute name="ControlButton" value="ControlButton" id="14351" addr="0x7fca46934c90" />
+                                                <attribute name="ControlGroup" value="ControlGroup" id="14352" addr="0x7fca46934c90" />
+                                                <attribute name="DialogBusy" value="DialogBusy" id="14353" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="14354" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSpin" value="ControlSpin" id="14355" addr="0x7fca46934c90" />
+                                                <attribute name="ControlEdit" value="ControlEdit" id="14356" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="14357" addr="0x7fca46934c90" />
+                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="14358" addr="0x7fca46934c90" />
+                                                <attribute name="ControlLabel" value="ControlLabel" id="14359" addr="0x7fca46934c90" />
+                                                <attribute name="ControlProgress" value="ControlProgress" id="14360" addr="0x7fca46934c90" />
+                                                <attribute name="Control" value="Control" id="14361" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSlider" value="ControlSlider" id="14362" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgress" value="DialogProgress" id="14363" addr="0x7fca46934c90" />
+                                                <attribute name="Action" value="Action" id="14364" addr="0x7fca46934c90" />
+                                                <attribute name="WindowDialog" value="WindowDialog" id="14365" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXML" value="WindowXML" id="14366" addr="0x7fca46934c90" />
+                                                <attribute name="ListItem" value="ListItem" id="14367" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="14368" addr="0x7fca46934c90" />
                                             </attributelist >
-                                            <typetabsitem id="14369" addr="0x7f99f1de1dd0" >
-                                                <attributelist id="14370" addr="0x7f99f1de1dd0" >
+                                            <typetabsitem id="14369" addr="0x7fca4692fdd0" >
+                                                <attributelist id="14370" addr="0x7fca4692fdd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14371" addr="0x7f99f1dde790" >
-                                                <attributelist id="14372" addr="0x7f99f1dde790" >
+                                            <typetabsitem id="14371" addr="0x7fca4692c790" >
+                                                <attributelist id="14372" addr="0x7fca4692c790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14373" addr="0x7f99f1de3f10" >
-                                                <attributelist id="14374" addr="0x7f99f1de3f10" >
+                                            <typetabsitem id="14373" addr="0x7fca46931f10" >
+                                                <attributelist id="14374" addr="0x7fca46931f10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14375" addr="0x7f99f1dd67b0" >
-                                                <attributelist id="14376" addr="0x7f99f1dd67b0" >
+                                            <typetabsitem id="14375" addr="0x7fca469247b0" >
+                                                <attributelist id="14376" addr="0x7fca469247b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14377" addr="0x7f99f1ddafd0" >
-                                                <attributelist id="14378" addr="0x7f99f1ddafd0" >
+                                            <typetabsitem id="14377" addr="0x7fca46928fd0" >
+                                                <attributelist id="14378" addr="0x7fca46928fd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14379" addr="0x7f99f1ddd430" >
-                                                <attributelist id="14380" addr="0x7f99f1ddd430" >
+                                            <typetabsitem id="14379" addr="0x7fca4692b430" >
+                                                <attributelist id="14380" addr="0x7fca4692b430" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14381" addr="0x7f99f1de2130" >
-                                                <attributelist id="14382" addr="0x7f99f1de2130" >
+                                            <typetabsitem id="14381" addr="0x7fca46930130" >
+                                                <attributelist id="14382" addr="0x7fca46930130" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14383" addr="0x7f99f1dd2f50" >
-                                                <attributelist id="14384" addr="0x7f99f1dd2f50" >
+                                            <typetabsitem id="14383" addr="0x7fca46920f50" >
+                                                <attributelist id="14384" addr="0x7fca46920f50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14385" addr="0x7f99f1dd9650" >
-                                                <attributelist id="14386" addr="0x7f99f1dd9650" >
+                                            <typetabsitem id="14385" addr="0x7fca46927650" >
+                                                <attributelist id="14386" addr="0x7fca46927650" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14387" addr="0x7f99f1de3390" >
-                                                <attributelist id="14388" addr="0x7f99f1de3390" >
+                                            <typetabsitem id="14387" addr="0x7fca46931390" >
+                                                <attributelist id="14388" addr="0x7fca46931390" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14389" addr="0x7f99f1ddb7b0" >
-                                                <attributelist id="14390" addr="0x7f99f1ddb7b0" >
+                                            <typetabsitem id="14389" addr="0x7fca469297b0" >
+                                                <attributelist id="14390" addr="0x7fca469297b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14391" addr="0x7f99f1ddc4b0" >
-                                                <attributelist id="14392" addr="0x7f99f1ddc4b0" >
+                                            <typetabsitem id="14391" addr="0x7fca4692a4b0" >
+                                                <attributelist id="14392" addr="0x7fca4692a4b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14393" addr="0x7f99f1ddcf90" >
-                                                <attributelist id="14394" addr="0x7f99f1ddcf90" >
+                                            <typetabsitem id="14393" addr="0x7fca4692af90" >
+                                                <attributelist id="14394" addr="0x7fca4692af90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14395" addr="0x7f99f1de11b0" >
-                                                <attributelist id="14396" addr="0x7f99f1de11b0" >
+                                            <typetabsitem id="14395" addr="0x7fca4692f1b0" >
+                                                <attributelist id="14396" addr="0x7fca4692f1b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14397" addr="0x7f99f1de15b0" >
-                                                <attributelist id="14398" addr="0x7f99f1de15b0" >
+                                            <typetabsitem id="14397" addr="0x7fca4692f5b0" >
+                                                <attributelist id="14398" addr="0x7fca4692f5b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14399" addr="0x7f99f1dd77f0" >
-                                                <attributelist id="14400" addr="0x7f99f1dd77f0" >
+                                            <typetabsitem id="14399" addr="0x7fca469257f0" >
+                                                <attributelist id="14400" addr="0x7fca469257f0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14401" addr="0x7f99f1dd8b30" >
-                                                <attributelist id="14402" addr="0x7f99f1dd8b30" >
+                                            <typetabsitem id="14401" addr="0x7fca46926b30" >
+                                                <attributelist id="14402" addr="0x7fca46926b30" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14403" addr="0x7f99f1dd2c50" >
-                                                <attributelist id="14404" addr="0x7f99f1dd2c50" >
+                                            <typetabsitem id="14403" addr="0x7fca46920c50" >
+                                                <attributelist id="14404" addr="0x7fca46920c50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14405" addr="0x7f99f1dda790" >
-                                                <attributelist id="14406" addr="0x7f99f1dda790" >
+                                            <typetabsitem id="14405" addr="0x7fca46928790" >
+                                                <attributelist id="14406" addr="0x7fca46928790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14407" addr="0x7f99f1dd8030" >
-                                                <attributelist id="14408" addr="0x7f99f1dd8030" >
+                                            <typetabsitem id="14407" addr="0x7fca46926030" >
+                                                <attributelist id="14408" addr="0x7fca46926030" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14409" addr="0x7f99f1ddbe10" >
-                                                <attributelist id="14410" addr="0x7f99f1ddbe10" >
+                                            <typetabsitem id="14409" addr="0x7fca46929e10" >
+                                                <attributelist id="14410" addr="0x7fca46929e10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14411" addr="0x7f99f1dd6b10" >
-                                                <attributelist id="14412" addr="0x7f99f1dd6b10" >
+                                            <typetabsitem id="14411" addr="0x7fca46924b10" >
+                                                <attributelist id="14412" addr="0x7fca46924b10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14413" addr="0x7f99f1dddf90" >
-                                                <attributelist id="14414" addr="0x7f99f1dddf90" >
+                                            <typetabsitem id="14413" addr="0x7fca4692bf90" >
+                                                <attributelist id="14414" addr="0x7fca4692bf90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14415" addr="0x7f99f1de0530" >
-                                                <attributelist id="14416" addr="0x7f99f1de0530" >
+                                            <typetabsitem id="14415" addr="0x7fca4692e530" >
+                                                <attributelist id="14416" addr="0x7fca4692e530" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14417" addr="0x7f99f1de1e50" >
-                                                <attributelist id="14418" addr="0x7f99f1de1e50" >
+                                            <typetabsitem id="14417" addr="0x7fca4692fe50" >
+                                                <attributelist id="14418" addr="0x7fca4692fe50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14419" addr="0x7f99f1de2d90" >
-                                                <attributelist id="14420" addr="0x7f99f1de2d90" >
+                                            <typetabsitem id="14419" addr="0x7fca46930d90" >
+                                                <attributelist id="14420" addr="0x7fca46930d90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14421" addr="0x7f99f1de3410" >
-                                                <attributelist id="14422" addr="0x7f99f1de3410" >
+                                            <typetabsitem id="14421" addr="0x7fca46931410" >
+                                                <attributelist id="14422" addr="0x7fca46931410" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14423" addr="0x7f99f1dd3590" >
-                                                <attributelist id="14424" addr="0x7f99f1dd3590" >
+                                            <typetabsitem id="14423" addr="0x7fca46921590" >
+                                                <attributelist id="14424" addr="0x7fca46921590" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14425" addr="0x7f99f1dd3390" >
-                                                <attributelist id="14426" addr="0x7f99f1dd3390" >
+                                            <typetabsitem id="14425" addr="0x7fca46921390" >
+                                                <attributelist id="14426" addr="0x7fca46921390" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7f99f1dd1d70" id="14427" addr="0x7f99f1dd1d70" />
-                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="14428" addr="0x7f99f1de6c90" />
-                                        <attribute name="symtab" value="0x7f99f1e40fb0" id="14429" addr="0x7f99f1e40fb0" />
+                                        <attribute name="parent" value="0x7fca4691fd70" id="14427" addr="0x7fca4691fd70" />
+                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="14428" addr="0x7fca46934c90" />
+                                        <attribute name="symtab" value="0x7fca4698efb0" id="14429" addr="0x7fca4698efb0" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="14430" addr="0x7f99f1de12b0" >
-                                    <attributelist id="14431" addr="0x7f99f1de12b0" >
+                                <typescopesitem id="14430" addr="0x7fca4692f2b0" >
+                                    <attributelist id="14431" addr="0x7fca4692f2b0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="14432" addr="0x7f99f1da77b0" >
-                                    <attributelist id="14433" addr="0x7f99f1da77b0" >
-                                        <attribute name="name" value="DialogBusy" id="14434" addr="0x7f99f1de6c90" />
-                                        <attribute name="csymtab" value="0x7f99f1da77d0" id="14435" addr="0x7f99f1da77d0" />
-                                        <attribute name="symtab" value="0x7f99f1da7770" id="14436" addr="0x7f99f1da7770" />
+                                <typescopesitem id="14432" addr="0x7fca468f57b0" >
+                                    <attributelist id="14433" addr="0x7fca468f57b0" >
+                                        <attribute name="name" value="DialogBusy" id="14434" addr="0x7fca46934c90" />
+                                        <attribute name="csymtab" value="0x7fca468f57d0" id="14435" addr="0x7fca468f57d0" />
+                                        <attribute name="symtab" value="0x7fca468f5770" id="14436" addr="0x7fca468f5770" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <access id="14437" addr="0x7f99f1da7730" >
-                            <attributelist id="14438" addr="0x7f99f1da7730" >
-                                <attribute name="kind" value="protected" id="14439" addr="0x7f99f1de6c90" />
+                        <access id="14437" addr="0x7fca468f5730" >
+                            <attributelist id="14438" addr="0x7fca468f5730" >
+                                <attribute name="kind" value="protected" id="14439" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </access >
-                        <cdecl id="14440" addr="0x7f99f1da7910" >
-                            <attributelist id="14441" addr="0x7f99f1da7910" >
-                                <attribute name="ismember" value="1" id="14442" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="deallocating" id="14443" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="deallocating" id="14444" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="14445" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="protected" id="14446" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="14447" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="void" id="14448" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1da77b0" id="14449" addr="0x7f99f1da77b0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="14450" addr="0x7f99f1de6c90" />
+                        <cdecl id="14440" addr="0x7fca468f5910" >
+                            <attributelist id="14441" addr="0x7fca468f5910" >
+                                <attribute name="ismember" value="1" id="14442" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="deallocating" id="14443" addr="0x7fca46934c90" />
+                                <attribute name="name" value="deallocating" id="14444" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="14445" addr="0x7fca46934c90" />
+                                <attribute name="access" value="protected" id="14446" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="14447" addr="0x7fca46934c90" />
+                                <attribute name="type" value="void" id="14448" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468f57b0" id="14449" addr="0x7fca468f57b0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="14450" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <access id="14451" addr="0x7f99f1da79b0" >
-                            <attributelist id="14452" addr="0x7f99f1da79b0" >
-                                <attribute name="kind" value="public" id="14453" addr="0x7f99f1de6c90" />
+                        <access id="14451" addr="0x7fca468f59b0" >
+                            <attributelist id="14452" addr="0x7fca468f59b0" >
+                                <attribute name="kind" value="public" id="14453" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="14454" addr="0x7f99f1da7af0" >
-                            <attributelist id="14455" addr="0x7f99f1da7af0" >
-                                <attribute name="ismember" value="1" id="14456" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="DialogBusy" id="14457" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="DialogBusy" id="14458" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="14459" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="14460" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="14461" addr="0x7f99f1de6c90" />
-                                <attribute name="code" value="{}" id="14462" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1da77b0" id="14463" addr="0x7f99f1da77b0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="14464" addr="0x7f99f1de6c90" />
+                        <constructor id="14454" addr="0x7fca468f5af0" >
+                            <attributelist id="14455" addr="0x7fca468f5af0" >
+                                <attribute name="ismember" value="1" id="14456" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="DialogBusy" id="14457" addr="0x7fca46934c90" />
+                                <attribute name="name" value="DialogBusy" id="14458" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="14459" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="14460" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="14461" addr="0x7fca46934c90" />
+                                <attribute name="code" value="{}" id="14462" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468f57b0" id="14463" addr="0x7fca468f57b0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="14464" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <destructor id="14465" addr="0x7f99f1da7c70" >
-                            <attributelist id="14466" addr="0x7f99f1da7c70" >
-                                <attribute name="ismember" value="1" id="14467" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="~DialogBusy" id="14468" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="~DialogBusy" id="14469" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="14470" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="14471" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1da77b0" id="14472" addr="0x7f99f1da77b0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="14473" addr="0x7f99f1de6c90" />
+                        <destructor id="14465" addr="0x7fca468f5c70" >
+                            <attributelist id="14466" addr="0x7fca468f5c70" >
+                                <attribute name="ismember" value="1" id="14467" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="~DialogBusy" id="14468" addr="0x7fca46934c90" />
+                                <attribute name="name" value="~DialogBusy" id="14469" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="14470" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="14471" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468f57b0" id="14472" addr="0x7fca468f57b0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="14473" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </destructor >
-                        <cdecl id="14474" addr="0x7f99f1da7e10" >
-                            <attributelist id="14475" addr="0x7f99f1da7e10" >
-                                <attribute name="ismember" value="1" id="14476" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="create" id="14477" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="create" id="14478" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="14479" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="14480" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="14481" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="void" id="14482" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1da77b0" id="14483" addr="0x7f99f1da77b0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="14484" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="14485" addr="0x7f99f1da8110" >
-                            <attributelist id="14486" addr="0x7f99f1da8110" >
-                                <attribute name="name" value="update" id="14487" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="14488" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1da77b0" id="14489" addr="0x7f99f1da77b0" />
-                                <attribute name="kind" value="function" id="14490" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="update" id="14491" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="q(const).f(int)." id="14492" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="14493" addr="0x7f99f1de6c90" />
-                                <parmlist id="14494" addr="0x7f99f1da8030" >
+                        <cdecl id="14474" addr="0x7fca468f5e10" >
+                            <attributelist id="14475" addr="0x7fca468f5e10" >
+                                <attribute name="ismember" value="1" id="14476" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="create" id="14477" addr="0x7fca46934c90" />
+                                <attribute name="name" value="create" id="14478" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="14479" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="14480" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="14481" addr="0x7fca46934c90" />
+                                <attribute name="type" value="void" id="14482" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468f57b0" id="14483" addr="0x7fca468f57b0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="14484" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="14485" addr="0x7fca468f6110" >
+                            <attributelist id="14486" addr="0x7fca468f6110" >
+                                <attribute name="name" value="update" id="14487" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="14488" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468f57b0" id="14489" addr="0x7fca468f57b0" />
+                                <attribute name="kind" value="function" id="14490" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="update" id="14491" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="q(const).f(int)." id="14492" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="14493" addr="0x7fca46934c90" />
+                                <parmlist id="14494" addr="0x7fca468f6030" >
                                     <parm id="14495">
-                                        <attributelist id="14496" addr="0x7f99f1da8030" >
-                                            <attribute name="name" value="percent" id="14497" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="14498" addr="0x7f99f1de6c90" />
+                                        <attributelist id="14496" addr="0x7fca468f6030" >
+                                            <attribute name="name" value="percent" id="14497" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="14498" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="14499" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="14500" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="14499" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="14500" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="14501" addr="0x7f99f1da82d0" >
-                            <attributelist id="14502" addr="0x7f99f1da82d0" >
-                                <attribute name="ismember" value="1" id="14503" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="close" id="14504" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="close" id="14505" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="14506" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="14507" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="14508" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="void" id="14509" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1da77b0" id="14510" addr="0x7f99f1da77b0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="14511" addr="0x7f99f1de6c90" />
+                        <cdecl id="14501" addr="0x7fca468f62d0" >
+                            <attributelist id="14502" addr="0x7fca468f62d0" >
+                                <attribute name="ismember" value="1" id="14503" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="close" id="14504" addr="0x7fca46934c90" />
+                                <attribute name="name" value="close" id="14505" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="14506" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="14507" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="14508" addr="0x7fca46934c90" />
+                                <attribute name="type" value="void" id="14509" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468f57b0" id="14510" addr="0x7fca468f57b0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="14511" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="14512" addr="0x7f99f1da84b0" >
-                            <attributelist id="14513" addr="0x7f99f1da84b0" >
-                                <attribute name="ismember" value="1" id="14514" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="iscanceled" id="14515" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="iscanceled" id="14516" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="q(const).f()." id="14517" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="14518" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="14519" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="bool" id="14520" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1da77b0" id="14521" addr="0x7f99f1da77b0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="14522" addr="0x7f99f1de6c90" />
+                        <cdecl id="14512" addr="0x7fca468f64b0" >
+                            <attributelist id="14513" addr="0x7fca468f64b0" >
+                                <attribute name="ismember" value="1" id="14514" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="iscanceled" id="14515" addr="0x7fca46934c90" />
+                                <attribute name="name" value="iscanceled" id="14516" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="q(const).f()." id="14517" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="14518" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="14519" addr="0x7fca46934c90" />
+                                <attribute name="type" value="bool" id="14520" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468f57b0" id="14521" addr="0x7fca468f57b0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="14522" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
                     </class >
-                    <class id="14523" addr="0x7f99f1da8770" >
-                        <attributelist id="14524" addr="0x7f99f1da8770" >
-                            <attribute name="name" value="XBMCAddon::xbmcgui::DialogProgressBG" id="14525" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="14526" addr="0x7f99f1e40fb0" />
-                            <attribute name="symtab" value="0x7f99f1da88b0" id="14527" addr="0x7f99f1da88b0" />
-                            <attribute name="allows_typedef" value="1" id="14528" addr="0x7f99f1de6c90" />
-                            <attribute name="typepass_visit" value="1" id="14529" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_visit" value="1" id="14530" addr="0x7f99f1de6c90" />
-                            <attribute name="kind" value="class" id="14531" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_name" value="DialogProgressBG" id="14532" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_default_constructor" value="1" id="14533" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_has_constructor" value="1" id="14534" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_public_constructor" value="1" id="14535" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_has_destructor" value="1" id="14536" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_default_destructor" value="1" id="14537" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_copy_constructor" value="1" id="14538" addr="0x7f99f1de6c90" />
-                            <attribute name="privatebaselist" value="0x7f99f1da8750" id="14539" addr="0x7f99f1da8750" />
-                            <attribute name="protectedbaselist" value="0x7f99f1da8730" id="14540" addr="0x7f99f1da8730" />
-                            <baselist id="14541" addr="0x7f99f1da8710" >
-                                <base name="AddonClass" id="14542" addr="0x7f99f1da8690" />
+                    <class id="14523" addr="0x7fca468f6770" >
+                        <attributelist id="14524" addr="0x7fca468f6770" >
+                            <attribute name="name" value="XBMCAddon::xbmcgui::DialogProgressBG" id="14525" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="14526" addr="0x7fca4698efb0" />
+                            <attribute name="symtab" value="0x7fca468f68b0" id="14527" addr="0x7fca468f68b0" />
+                            <attribute name="allows_typedef" value="1" id="14528" addr="0x7fca46934c90" />
+                            <attribute name="typepass_visit" value="1" id="14529" addr="0x7fca46934c90" />
+                            <attribute name="allocate_visit" value="1" id="14530" addr="0x7fca46934c90" />
+                            <attribute name="kind" value="class" id="14531" addr="0x7fca46934c90" />
+                            <attribute name="sym_name" value="DialogProgressBG" id="14532" addr="0x7fca46934c90" />
+                            <attribute name="allocate_default_constructor" value="1" id="14533" addr="0x7fca46934c90" />
+                            <attribute name="allocate_has_constructor" value="1" id="14534" addr="0x7fca46934c90" />
+                            <attribute name="allocate_public_constructor" value="1" id="14535" addr="0x7fca46934c90" />
+                            <attribute name="allocate_has_destructor" value="1" id="14536" addr="0x7fca46934c90" />
+                            <attribute name="allocate_default_destructor" value="1" id="14537" addr="0x7fca46934c90" />
+                            <attribute name="allocate_copy_constructor" value="1" id="14538" addr="0x7fca46934c90" />
+                            <attribute name="privatebaselist" value="0x7fca468f6750" id="14539" addr="0x7fca468f6750" />
+                            <attribute name="protectedbaselist" value="0x7fca468f6730" id="14540" addr="0x7fca468f6730" />
+                            <baselist id="14541" addr="0x7fca468f6710" >
+                                <base name="AddonClass" id="14542" addr="0x7fca468f6690" />
                             </baselist >
-                            <attribute name="module" value="xbmcgui" id="14543" addr="0x7f99f1e402f0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="14544" addr="0x7f99f1de6c90" />
-                            <typescope id="14545" addr="0x7f99f1de1690" >
-                                <attributelist id="14546" addr="0x7f99f1de1690" >
-                                    <attribute name="name" value="DialogProgressBG" id="14547" addr="0x7f99f1de6c90" />
-                                    <typetab id="14548" addr="0x7f99f1de16b0" >
-                                        <attributelist id="14549" addr="0x7f99f1de16b0" >
+                            <attribute name="module" value="xbmcgui" id="14543" addr="0x7fca4698e2f0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="14544" addr="0x7fca46934c90" />
+                            <typescope id="14545" addr="0x7fca4692f690" >
+                                <attributelist id="14546" addr="0x7fca4692f690" >
+                                    <attribute name="name" value="DialogProgressBG" id="14547" addr="0x7fca46934c90" />
+                                    <typetab id="14548" addr="0x7fca4692f6b0" >
+                                        <attributelist id="14549" addr="0x7fca4692f6b0" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f99f1dd2150" id="14550" addr="0x7f99f1dd2150" />
-                                    <attribute name="qname" value="XBMCAddon::xbmcgui::DialogProgressBG" id="14551" addr="0x7f99f1de6c90" />
-                                    <attribute name="symtab" value="0x7f99f1da88b0" id="14552" addr="0x7f99f1da88b0" />
+                                    <attribute name="parent" value="0x7fca46920150" id="14550" addr="0x7fca46920150" />
+                                    <attribute name="qname" value="XBMCAddon::xbmcgui::DialogProgressBG" id="14551" addr="0x7fca46934c90" />
+                                    <attribute name="symtab" value="0x7fca468f68b0" id="14552" addr="0x7fca468f68b0" />
                                 </attributelist >
-                                <typescopesitem id="14553" addr="0x7f99f1de1630" >
-                                    <attributelist id="14554" addr="0x7f99f1de1630" >
+                                <typescopesitem id="14553" addr="0x7fca4692f630" >
+                                    <attributelist id="14554" addr="0x7fca4692f630" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="14555" addr="0x7f99f1de16b0" >
-                                    <attributelist id="14556" addr="0x7f99f1de16b0" >
+                                <typescopesitem id="14555" addr="0x7fca4692f6b0" >
+                                    <attributelist id="14556" addr="0x7fca4692f6b0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="14557" addr="0x7f99f1dd2150" >
-                                    <attributelist id="14558" addr="0x7f99f1dd2150" >
-                                        <attribute name="name" value="xbmcgui" id="14559" addr="0x7f99f1de6c90" />
-                                        <typetab id="14560" addr="0x7f99f1dd2170" >
-                                            <attributelist id="14561" addr="0x7f99f1dd2170" >
-                                                <attribute name="InterceptorBase" value="InterceptorBase" id="14562" addr="0x7f99f1de6c90" />
-                                                <attribute name="Dialog" value="Dialog" id="14563" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="14564" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="14565" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlTextBox" value="ControlTextBox" id="14566" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="14567" addr="0x7f99f1de6c90" />
-                                                <attribute name="Window" value="Window" id="14568" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="14569" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlList" value="ControlList" id="14570" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="14571" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlImage" value="ControlImage" id="14572" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlButton" value="ControlButton" id="14573" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlGroup" value="ControlGroup" id="14574" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogBusy" value="DialogBusy" id="14575" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="14576" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSpin" value="ControlSpin" id="14577" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlEdit" value="ControlEdit" id="14578" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="14579" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="14580" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlLabel" value="ControlLabel" id="14581" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlProgress" value="ControlProgress" id="14582" addr="0x7f99f1de6c90" />
-                                                <attribute name="Control" value="Control" id="14583" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSlider" value="ControlSlider" id="14584" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgress" value="DialogProgress" id="14585" addr="0x7f99f1de6c90" />
-                                                <attribute name="Action" value="Action" id="14586" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowDialog" value="WindowDialog" id="14587" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXML" value="WindowXML" id="14588" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItem" value="ListItem" id="14589" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="14590" addr="0x7f99f1de6c90" />
+                                <typescopesitem id="14557" addr="0x7fca46920150" >
+                                    <attributelist id="14558" addr="0x7fca46920150" >
+                                        <attribute name="name" value="xbmcgui" id="14559" addr="0x7fca46934c90" />
+                                        <typetab id="14560" addr="0x7fca46920170" >
+                                            <attributelist id="14561" addr="0x7fca46920170" >
+                                                <attribute name="InterceptorBase" value="InterceptorBase" id="14562" addr="0x7fca46934c90" />
+                                                <attribute name="Dialog" value="Dialog" id="14563" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="14564" addr="0x7fca46934c90" />
+                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="14565" addr="0x7fca46934c90" />
+                                                <attribute name="ControlTextBox" value="ControlTextBox" id="14566" addr="0x7fca46934c90" />
+                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="14567" addr="0x7fca46934c90" />
+                                                <attribute name="Window" value="Window" id="14568" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="14569" addr="0x7fca46934c90" />
+                                                <attribute name="ControlList" value="ControlList" id="14570" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="14571" addr="0x7fca46934c90" />
+                                                <attribute name="ControlImage" value="ControlImage" id="14572" addr="0x7fca46934c90" />
+                                                <attribute name="ControlButton" value="ControlButton" id="14573" addr="0x7fca46934c90" />
+                                                <attribute name="ControlGroup" value="ControlGroup" id="14574" addr="0x7fca46934c90" />
+                                                <attribute name="DialogBusy" value="DialogBusy" id="14575" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="14576" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSpin" value="ControlSpin" id="14577" addr="0x7fca46934c90" />
+                                                <attribute name="ControlEdit" value="ControlEdit" id="14578" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="14579" addr="0x7fca46934c90" />
+                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="14580" addr="0x7fca46934c90" />
+                                                <attribute name="ControlLabel" value="ControlLabel" id="14581" addr="0x7fca46934c90" />
+                                                <attribute name="ControlProgress" value="ControlProgress" id="14582" addr="0x7fca46934c90" />
+                                                <attribute name="Control" value="Control" id="14583" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSlider" value="ControlSlider" id="14584" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgress" value="DialogProgress" id="14585" addr="0x7fca46934c90" />
+                                                <attribute name="Action" value="Action" id="14586" addr="0x7fca46934c90" />
+                                                <attribute name="WindowDialog" value="WindowDialog" id="14587" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXML" value="WindowXML" id="14588" addr="0x7fca46934c90" />
+                                                <attribute name="ListItem" value="ListItem" id="14589" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="14590" addr="0x7fca46934c90" />
                                             </attributelist >
-                                            <typetabsitem id="14591" addr="0x7f99f1de1dd0" >
-                                                <attributelist id="14592" addr="0x7f99f1de1dd0" >
+                                            <typetabsitem id="14591" addr="0x7fca4692fdd0" >
+                                                <attributelist id="14592" addr="0x7fca4692fdd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14593" addr="0x7f99f1dde790" >
-                                                <attributelist id="14594" addr="0x7f99f1dde790" >
+                                            <typetabsitem id="14593" addr="0x7fca4692c790" >
+                                                <attributelist id="14594" addr="0x7fca4692c790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14595" addr="0x7f99f1de3f10" >
-                                                <attributelist id="14596" addr="0x7f99f1de3f10" >
+                                            <typetabsitem id="14595" addr="0x7fca46931f10" >
+                                                <attributelist id="14596" addr="0x7fca46931f10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14597" addr="0x7f99f1dd67b0" >
-                                                <attributelist id="14598" addr="0x7f99f1dd67b0" >
+                                            <typetabsitem id="14597" addr="0x7fca469247b0" >
+                                                <attributelist id="14598" addr="0x7fca469247b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14599" addr="0x7f99f1ddafd0" >
-                                                <attributelist id="14600" addr="0x7f99f1ddafd0" >
+                                            <typetabsitem id="14599" addr="0x7fca46928fd0" >
+                                                <attributelist id="14600" addr="0x7fca46928fd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14601" addr="0x7f99f1ddd430" >
-                                                <attributelist id="14602" addr="0x7f99f1ddd430" >
+                                            <typetabsitem id="14601" addr="0x7fca4692b430" >
+                                                <attributelist id="14602" addr="0x7fca4692b430" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14603" addr="0x7f99f1de2130" >
-                                                <attributelist id="14604" addr="0x7f99f1de2130" >
+                                            <typetabsitem id="14603" addr="0x7fca46930130" >
+                                                <attributelist id="14604" addr="0x7fca46930130" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14605" addr="0x7f99f1dd2f50" >
-                                                <attributelist id="14606" addr="0x7f99f1dd2f50" >
+                                            <typetabsitem id="14605" addr="0x7fca46920f50" >
+                                                <attributelist id="14606" addr="0x7fca46920f50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14607" addr="0x7f99f1dd9650" >
-                                                <attributelist id="14608" addr="0x7f99f1dd9650" >
+                                            <typetabsitem id="14607" addr="0x7fca46927650" >
+                                                <attributelist id="14608" addr="0x7fca46927650" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14609" addr="0x7f99f1de3390" >
-                                                <attributelist id="14610" addr="0x7f99f1de3390" >
+                                            <typetabsitem id="14609" addr="0x7fca46931390" >
+                                                <attributelist id="14610" addr="0x7fca46931390" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14611" addr="0x7f99f1ddb7b0" >
-                                                <attributelist id="14612" addr="0x7f99f1ddb7b0" >
+                                            <typetabsitem id="14611" addr="0x7fca469297b0" >
+                                                <attributelist id="14612" addr="0x7fca469297b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14613" addr="0x7f99f1ddc4b0" >
-                                                <attributelist id="14614" addr="0x7f99f1ddc4b0" >
+                                            <typetabsitem id="14613" addr="0x7fca4692a4b0" >
+                                                <attributelist id="14614" addr="0x7fca4692a4b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14615" addr="0x7f99f1ddcf90" >
-                                                <attributelist id="14616" addr="0x7f99f1ddcf90" >
+                                            <typetabsitem id="14615" addr="0x7fca4692af90" >
+                                                <attributelist id="14616" addr="0x7fca4692af90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14617" addr="0x7f99f1de11b0" >
-                                                <attributelist id="14618" addr="0x7f99f1de11b0" >
+                                            <typetabsitem id="14617" addr="0x7fca4692f1b0" >
+                                                <attributelist id="14618" addr="0x7fca4692f1b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14619" addr="0x7f99f1de15b0" >
-                                                <attributelist id="14620" addr="0x7f99f1de15b0" >
+                                            <typetabsitem id="14619" addr="0x7fca4692f5b0" >
+                                                <attributelist id="14620" addr="0x7fca4692f5b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14621" addr="0x7f99f1dd77f0" >
-                                                <attributelist id="14622" addr="0x7f99f1dd77f0" >
+                                            <typetabsitem id="14621" addr="0x7fca469257f0" >
+                                                <attributelist id="14622" addr="0x7fca469257f0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14623" addr="0x7f99f1dd8b30" >
-                                                <attributelist id="14624" addr="0x7f99f1dd8b30" >
+                                            <typetabsitem id="14623" addr="0x7fca46926b30" >
+                                                <attributelist id="14624" addr="0x7fca46926b30" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14625" addr="0x7f99f1dd2c50" >
-                                                <attributelist id="14626" addr="0x7f99f1dd2c50" >
+                                            <typetabsitem id="14625" addr="0x7fca46920c50" >
+                                                <attributelist id="14626" addr="0x7fca46920c50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14627" addr="0x7f99f1dda790" >
-                                                <attributelist id="14628" addr="0x7f99f1dda790" >
+                                            <typetabsitem id="14627" addr="0x7fca46928790" >
+                                                <attributelist id="14628" addr="0x7fca46928790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14629" addr="0x7f99f1dd8030" >
-                                                <attributelist id="14630" addr="0x7f99f1dd8030" >
+                                            <typetabsitem id="14629" addr="0x7fca46926030" >
+                                                <attributelist id="14630" addr="0x7fca46926030" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14631" addr="0x7f99f1ddbe10" >
-                                                <attributelist id="14632" addr="0x7f99f1ddbe10" >
+                                            <typetabsitem id="14631" addr="0x7fca46929e10" >
+                                                <attributelist id="14632" addr="0x7fca46929e10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14633" addr="0x7f99f1dd6b10" >
-                                                <attributelist id="14634" addr="0x7f99f1dd6b10" >
+                                            <typetabsitem id="14633" addr="0x7fca46924b10" >
+                                                <attributelist id="14634" addr="0x7fca46924b10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14635" addr="0x7f99f1dddf90" >
-                                                <attributelist id="14636" addr="0x7f99f1dddf90" >
+                                            <typetabsitem id="14635" addr="0x7fca4692bf90" >
+                                                <attributelist id="14636" addr="0x7fca4692bf90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14637" addr="0x7f99f1de0530" >
-                                                <attributelist id="14638" addr="0x7f99f1de0530" >
+                                            <typetabsitem id="14637" addr="0x7fca4692e530" >
+                                                <attributelist id="14638" addr="0x7fca4692e530" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14639" addr="0x7f99f1de1e50" >
-                                                <attributelist id="14640" addr="0x7f99f1de1e50" >
+                                            <typetabsitem id="14639" addr="0x7fca4692fe50" >
+                                                <attributelist id="14640" addr="0x7fca4692fe50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14641" addr="0x7f99f1de2d90" >
-                                                <attributelist id="14642" addr="0x7f99f1de2d90" >
+                                            <typetabsitem id="14641" addr="0x7fca46930d90" >
+                                                <attributelist id="14642" addr="0x7fca46930d90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14643" addr="0x7f99f1de3410" >
-                                                <attributelist id="14644" addr="0x7f99f1de3410" >
+                                            <typetabsitem id="14643" addr="0x7fca46931410" >
+                                                <attributelist id="14644" addr="0x7fca46931410" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14645" addr="0x7f99f1dd3590" >
-                                                <attributelist id="14646" addr="0x7f99f1dd3590" >
+                                            <typetabsitem id="14645" addr="0x7fca46921590" >
+                                                <attributelist id="14646" addr="0x7fca46921590" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14647" addr="0x7f99f1dd3390" >
-                                                <attributelist id="14648" addr="0x7f99f1dd3390" >
+                                            <typetabsitem id="14647" addr="0x7fca46921390" >
+                                                <attributelist id="14648" addr="0x7fca46921390" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7f99f1dd1d70" id="14649" addr="0x7f99f1dd1d70" />
-                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="14650" addr="0x7f99f1de6c90" />
-                                        <attribute name="symtab" value="0x7f99f1e40fb0" id="14651" addr="0x7f99f1e40fb0" />
+                                        <attribute name="parent" value="0x7fca4691fd70" id="14649" addr="0x7fca4691fd70" />
+                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="14650" addr="0x7fca46934c90" />
+                                        <attribute name="symtab" value="0x7fca4698efb0" id="14651" addr="0x7fca4698efb0" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="14652" addr="0x7f99f1de16d0" >
-                                    <attributelist id="14653" addr="0x7f99f1de16d0" >
+                                <typescopesitem id="14652" addr="0x7fca4692f6d0" >
+                                    <attributelist id="14653" addr="0x7fca4692f6d0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="14654" addr="0x7f99f1da88b0" >
-                                    <attributelist id="14655" addr="0x7f99f1da88b0" >
-                                        <attribute name="name" value="DialogProgressBG" id="14656" addr="0x7f99f1de6c90" />
-                                        <attribute name="csymtab" value="0x7f99f1da88d0" id="14657" addr="0x7f99f1da88d0" />
-                                        <attribute name="symtab" value="0x7f99f1da8870" id="14658" addr="0x7f99f1da8870" />
+                                <typescopesitem id="14654" addr="0x7fca468f68b0" >
+                                    <attributelist id="14655" addr="0x7fca468f68b0" >
+                                        <attribute name="name" value="DialogProgressBG" id="14656" addr="0x7fca46934c90" />
+                                        <attribute name="csymtab" value="0x7fca468f68d0" id="14657" addr="0x7fca468f68d0" />
+                                        <attribute name="symtab" value="0x7fca468f6870" id="14658" addr="0x7fca468f6870" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <cdecl id="14659" addr="0x7f99f1da8a10" >
-                            <attributelist id="14660" addr="0x7f99f1da8a10" >
-                                <attribute name="ismember" value="1" id="14661" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="dlg" id="14662" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="p." id="14663" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="private" id="14664" addr="0x7f99f1de6c90" />
-                                <attribute name="value" value="nullptr" id="14665" addr="0x7f99f1de6c90" />
-                                <attribute name="valuetype" value="int" id="14666" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="variable" id="14667" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="CGUIDialogExtendedProgressBar" id="14668" addr="0x7f99f1de6c90" />
-                                <attribute name="hasvalue" value="1" id="14669" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1da88b0" id="14670" addr="0x7f99f1da88b0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="14671" addr="0x7f99f1da8c70" >
-                            <attributelist id="14672" addr="0x7f99f1da8c70" >
-                                <attribute name="value" value="nullptr" id="14673" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="handle" id="14674" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="14675" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1da88b0" id="14676" addr="0x7f99f1da88b0" />
-                                <attribute name="hasvalue" value="1" id="14677" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="variable" id="14678" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="p." id="14679" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="private" id="14680" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="CGUIDialogProgressBarHandle" id="14681" addr="0x7f99f1de6c90" />
-                                <attribute name="valuetype" value="int" id="14682" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="14683" addr="0x7f99f1da8e90" >
-                            <attributelist id="14684" addr="0x7f99f1da8e90" >
-                                <attribute name="value" value="false" id="14685" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="open" id="14686" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="14687" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1da88b0" id="14688" addr="0x7f99f1da88b0" />
-                                <attribute name="hasvalue" value="1" id="14689" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="variable" id="14690" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="" id="14691" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="private" id="14692" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="bool" id="14693" addr="0x7f99f1de6c90" />
-                                <attribute name="valuetype" value="bool" id="14694" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <access id="14695" addr="0x7f99f1da8fb0" >
-                            <attributelist id="14696" addr="0x7f99f1da8fb0" >
-                                <attribute name="kind" value="protected" id="14697" addr="0x7f99f1de6c90" />
+                        <cdecl id="14659" addr="0x7fca468f6a10" >
+                            <attributelist id="14660" addr="0x7fca468f6a10" >
+                                <attribute name="ismember" value="1" id="14661" addr="0x7fca46934c90" />
+                                <attribute name="name" value="dlg" id="14662" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="p." id="14663" addr="0x7fca46934c90" />
+                                <attribute name="access" value="private" id="14664" addr="0x7fca46934c90" />
+                                <attribute name="value" value="nullptr" id="14665" addr="0x7fca46934c90" />
+                                <attribute name="valuetype" value="int" id="14666" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="variable" id="14667" addr="0x7fca46934c90" />
+                                <attribute name="type" value="CGUIDialogExtendedProgressBar" id="14668" addr="0x7fca46934c90" />
+                                <attribute name="hasvalue" value="1" id="14669" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468f68b0" id="14670" addr="0x7fca468f68b0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="14671" addr="0x7fca468f6c70" >
+                            <attributelist id="14672" addr="0x7fca468f6c70" >
+                                <attribute name="value" value="nullptr" id="14673" addr="0x7fca46934c90" />
+                                <attribute name="name" value="handle" id="14674" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="14675" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468f68b0" id="14676" addr="0x7fca468f68b0" />
+                                <attribute name="hasvalue" value="1" id="14677" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="variable" id="14678" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="p." id="14679" addr="0x7fca46934c90" />
+                                <attribute name="access" value="private" id="14680" addr="0x7fca46934c90" />
+                                <attribute name="type" value="CGUIDialogProgressBarHandle" id="14681" addr="0x7fca46934c90" />
+                                <attribute name="valuetype" value="int" id="14682" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="14683" addr="0x7fca468f6e90" >
+                            <attributelist id="14684" addr="0x7fca468f6e90" >
+                                <attribute name="value" value="false" id="14685" addr="0x7fca46934c90" />
+                                <attribute name="name" value="open" id="14686" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="14687" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468f68b0" id="14688" addr="0x7fca468f68b0" />
+                                <attribute name="hasvalue" value="1" id="14689" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="variable" id="14690" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="" id="14691" addr="0x7fca46934c90" />
+                                <attribute name="access" value="private" id="14692" addr="0x7fca46934c90" />
+                                <attribute name="type" value="bool" id="14693" addr="0x7fca46934c90" />
+                                <attribute name="valuetype" value="bool" id="14694" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <access id="14695" addr="0x7fca468f6fb0" >
+                            <attributelist id="14696" addr="0x7fca468f6fb0" >
+                                <attribute name="kind" value="protected" id="14697" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </access >
-                        <cdecl id="14698" addr="0x7f99f1da90b0" >
-                            <attributelist id="14699" addr="0x7f99f1da90b0" >
-                                <attribute name="ismember" value="1" id="14700" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="deallocating" id="14701" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="deallocating" id="14702" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="14703" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="protected" id="14704" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="14705" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="void" id="14706" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1da88b0" id="14707" addr="0x7f99f1da88b0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="14708" addr="0x7f99f1de6c90" />
+                        <cdecl id="14698" addr="0x7fca468f70b0" >
+                            <attributelist id="14699" addr="0x7fca468f70b0" >
+                                <attribute name="ismember" value="1" id="14700" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="deallocating" id="14701" addr="0x7fca46934c90" />
+                                <attribute name="name" value="deallocating" id="14702" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="14703" addr="0x7fca46934c90" />
+                                <attribute name="access" value="protected" id="14704" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="14705" addr="0x7fca46934c90" />
+                                <attribute name="type" value="void" id="14706" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468f68b0" id="14707" addr="0x7fca468f68b0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="14708" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <access id="14709" addr="0x7f99f1da9150" >
-                            <attributelist id="14710" addr="0x7f99f1da9150" >
-                                <attribute name="kind" value="public" id="14711" addr="0x7f99f1de6c90" />
+                        <access id="14709" addr="0x7fca468f7150" >
+                            <attributelist id="14710" addr="0x7fca468f7150" >
+                                <attribute name="kind" value="public" id="14711" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="14712" addr="0x7f99f1da92d0" >
-                            <attributelist id="14713" addr="0x7f99f1da92d0" >
-                                <attribute name="ismember" value="1" id="14714" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="DialogProgressBG" id="14715" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="DialogProgressBG" id="14716" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="14717" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="14718" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="14719" addr="0x7f99f1de6c90" />
-                                <attribute name="value" value="default" id="14720" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1da88b0" id="14721" addr="0x7f99f1da88b0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="14722" addr="0x7f99f1de6c90" />
+                        <constructor id="14712" addr="0x7fca468f72d0" >
+                            <attributelist id="14713" addr="0x7fca468f72d0" >
+                                <attribute name="ismember" value="1" id="14714" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="DialogProgressBG" id="14715" addr="0x7fca46934c90" />
+                                <attribute name="name" value="DialogProgressBG" id="14716" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="14717" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="14718" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="14719" addr="0x7fca46934c90" />
+                                <attribute name="value" value="default" id="14720" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468f68b0" id="14721" addr="0x7fca468f68b0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="14722" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <destructor id="14723" addr="0x7f99f1da9430" >
-                            <attributelist id="14724" addr="0x7f99f1da9430" >
-                                <attribute name="ismember" value="1" id="14725" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="~DialogProgressBG" id="14726" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="~DialogProgressBG" id="14727" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="14728" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="14729" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1da88b0" id="14730" addr="0x7f99f1da88b0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="14731" addr="0x7f99f1de6c90" />
+                        <destructor id="14723" addr="0x7fca468f7430" >
+                            <attributelist id="14724" addr="0x7fca468f7430" >
+                                <attribute name="ismember" value="1" id="14725" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="~DialogProgressBG" id="14726" addr="0x7fca46934c90" />
+                                <attribute name="name" value="~DialogProgressBG" id="14727" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="14728" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="14729" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468f68b0" id="14730" addr="0x7fca468f68b0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="14731" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </destructor >
-                        <cdecl id="14732" addr="0x7f99f1da98b0" >
-                            <attributelist id="14733" addr="0x7f99f1da98b0" >
-                                <attribute name="name" value="create" id="14734" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="14735" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1da88b0" id="14736" addr="0x7f99f1da88b0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1da9a50" id="14737" addr="0x7f99f1da9a50" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1da9a50" id="14738" addr="0x7f99f1da9a50" />
-                                <attribute name="kind" value="function" id="14739" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="create" id="14740" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="14741" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="14742" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1da98b0" id="14743" addr="0x7f99f1da98b0" />
-                                <parmlist id="14744" addr="0x7f99f1da9650" >
+                        <cdecl id="14732" addr="0x7fca468f78b0" >
+                            <attributelist id="14733" addr="0x7fca468f78b0" >
+                                <attribute name="name" value="create" id="14734" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="14735" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468f68b0" id="14736" addr="0x7fca468f68b0" />
+                                <attribute name="sym_nextSibling" value="0x7fca468f7a50" id="14737" addr="0x7fca468f7a50" />
+                                <attribute name="csym_nextSibling" value="0x7fca468f7a50" id="14738" addr="0x7fca468f7a50" />
+                                <attribute name="kind" value="function" id="14739" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="create" id="14740" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="14741" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="14742" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468f78b0" id="14743" addr="0x7fca468f78b0" />
+                                <parmlist id="14744" addr="0x7fca468f7650" >
                                     <parm id="14745">
-                                        <attributelist id="14746" addr="0x7f99f1da9650" >
-                                            <attribute name="name" value="heading" id="14747" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14748" addr="0x7f99f1de6c90" />
+                                        <attributelist id="14746" addr="0x7fca468f7650" >
+                                            <attribute name="name" value="heading" id="14747" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14748" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="14749">
-                                        <attributelist id="14750" addr="0x7f99f1da97f0" >
-                                            <attribute name="name" value="message" id="14751" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="14752" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14753" addr="0x7f99f1de6c90" />
+                                        <attributelist id="14750" addr="0x7fca468f77f0" >
+                                            <attribute name="name" value="message" id="14751" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="14752" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14753" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="14754" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="14755" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="14754" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="14755" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="14756" addr="0x7f99f1da9a50" >
-                            <attributelist id="14757" addr="0x7f99f1da9a50" >
-                                <attribute name="name" value="create" id="14758" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="14759" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1da88b0" id="14760" addr="0x7f99f1da88b0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1da98b0" id="14761" addr="0x7f99f1da98b0" />
-                                <attribute name="kind" value="function" id="14762" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="create" id="14763" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1da98b0" id="14764" addr="0x7f99f1da98b0" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="14765" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="14766" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1da98b0" id="14767" addr="0x7f99f1da98b0" />
-                                <parmlist id="14768" addr="0x7f99f1da9950" >
+                        <cdecl id="14756" addr="0x7fca468f7a50" >
+                            <attributelist id="14757" addr="0x7fca468f7a50" >
+                                <attribute name="name" value="create" id="14758" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="14759" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468f68b0" id="14760" addr="0x7fca468f68b0" />
+                                <attribute name="sym_previousSibling" value="0x7fca468f78b0" id="14761" addr="0x7fca468f78b0" />
+                                <attribute name="kind" value="function" id="14762" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="create" id="14763" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca468f78b0" id="14764" addr="0x7fca468f78b0" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="14765" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="14766" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468f78b0" id="14767" addr="0x7fca468f78b0" />
+                                <parmlist id="14768" addr="0x7fca468f7950" >
                                     <parm id="14769">
-                                        <attributelist id="14770" addr="0x7f99f1da9950" >
-                                            <attribute name="name" value="heading" id="14771" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14772" addr="0x7f99f1de6c90" />
+                                        <attributelist id="14770" addr="0x7fca468f7950" >
+                                            <attribute name="name" value="heading" id="14771" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14772" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="14773" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="14774" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="14773" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="14774" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="14775" addr="0x7f99f1daa0b0" >
-                            <attributelist id="14776" addr="0x7f99f1daa0b0" >
-                                <attribute name="name" value="update" id="14777" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="14778" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1da88b0" id="14779" addr="0x7f99f1da88b0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1daa310" id="14780" addr="0x7f99f1daa310" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1daa310" id="14781" addr="0x7f99f1daa310" />
-                                <attribute name="kind" value="function" id="14782" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="update" id="14783" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="14784" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="14785" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1daa0b0" id="14786" addr="0x7f99f1daa0b0" />
-                                <parmlist id="14787" addr="0x7f99f1da9cb0" >
+                        <cdecl id="14775" addr="0x7fca468f80b0" >
+                            <attributelist id="14776" addr="0x7fca468f80b0" >
+                                <attribute name="name" value="update" id="14777" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="14778" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468f68b0" id="14779" addr="0x7fca468f68b0" />
+                                <attribute name="sym_nextSibling" value="0x7fca468f8310" id="14780" addr="0x7fca468f8310" />
+                                <attribute name="csym_nextSibling" value="0x7fca468f8310" id="14781" addr="0x7fca468f8310" />
+                                <attribute name="kind" value="function" id="14782" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="update" id="14783" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="14784" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="14785" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468f80b0" id="14786" addr="0x7fca468f80b0" />
+                                <parmlist id="14787" addr="0x7fca468f7cb0" >
                                     <parm id="14788">
-                                        <attributelist id="14789" addr="0x7f99f1da9cb0" >
-                                            <attribute name="name" value="percent" id="14790" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="0" id="14791" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="14792" addr="0x7f99f1de6c90" />
+                                        <attributelist id="14789" addr="0x7fca468f7cb0" >
+                                            <attribute name="name" value="percent" id="14790" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="0" id="14791" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="14792" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="14793">
-                                        <attributelist id="14794" addr="0x7f99f1da9e50" >
-                                            <attribute name="name" value="heading" id="14795" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="14796" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14797" addr="0x7f99f1de6c90" />
+                                        <attributelist id="14794" addr="0x7fca468f7e50" >
+                                            <attribute name="name" value="heading" id="14795" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="14796" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14797" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="14798">
-                                        <attributelist id="14799" addr="0x7f99f1da9ff0" >
-                                            <attribute name="name" value="message" id="14800" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="14801" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14802" addr="0x7f99f1de6c90" />
+                                        <attributelist id="14799" addr="0x7fca468f7ff0" >
+                                            <attribute name="name" value="message" id="14800" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="14801" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14802" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="14803" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="14804" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="14803" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="14804" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="14805" addr="0x7f99f1daa310" >
-                            <attributelist id="14806" addr="0x7f99f1daa310" >
-                                <attribute name="name" value="update" id="14807" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="14808" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1da88b0" id="14809" addr="0x7f99f1da88b0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1daa0b0" id="14810" addr="0x7f99f1daa0b0" />
-                                <attribute name="kind" value="function" id="14811" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="update" id="14812" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1daa4d0" id="14813" addr="0x7f99f1daa4d0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1daa4d0" id="14814" addr="0x7f99f1daa4d0" />
-                                <attribute name="defaultargs" value="0x7f99f1daa0b0" id="14815" addr="0x7f99f1daa0b0" />
-                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String)." id="14816" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="14817" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1daa0b0" id="14818" addr="0x7f99f1daa0b0" />
-                                <parmlist id="14819" addr="0x7f99f1daa150" >
+                        <cdecl id="14805" addr="0x7fca468f8310" >
+                            <attributelist id="14806" addr="0x7fca468f8310" >
+                                <attribute name="name" value="update" id="14807" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="14808" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468f68b0" id="14809" addr="0x7fca468f68b0" />
+                                <attribute name="sym_previousSibling" value="0x7fca468f80b0" id="14810" addr="0x7fca468f80b0" />
+                                <attribute name="kind" value="function" id="14811" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="update" id="14812" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca468f84d0" id="14813" addr="0x7fca468f84d0" />
+                                <attribute name="sym_nextSibling" value="0x7fca468f84d0" id="14814" addr="0x7fca468f84d0" />
+                                <attribute name="defaultargs" value="0x7fca468f80b0" id="14815" addr="0x7fca468f80b0" />
+                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String)." id="14816" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="14817" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468f80b0" id="14818" addr="0x7fca468f80b0" />
+                                <parmlist id="14819" addr="0x7fca468f8150" >
                                     <parm id="14820">
-                                        <attributelist id="14821" addr="0x7f99f1daa150" >
-                                            <attribute name="name" value="percent" id="14822" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="0" id="14823" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="14824" addr="0x7f99f1de6c90" />
+                                        <attributelist id="14821" addr="0x7fca468f8150" >
+                                            <attribute name="name" value="percent" id="14822" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="0" id="14823" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="14824" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="14825">
-                                        <attributelist id="14826" addr="0x7f99f1daa250" >
-                                            <attribute name="name" value="heading" id="14827" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="14828" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14829" addr="0x7f99f1de6c90" />
+                                        <attributelist id="14826" addr="0x7fca468f8250" >
+                                            <attribute name="name" value="heading" id="14827" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="14828" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14829" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="14830" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="14831" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="14830" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="14831" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="14832" addr="0x7f99f1daa4d0" >
-                            <attributelist id="14833" addr="0x7f99f1daa4d0" >
-                                <attribute name="name" value="update" id="14834" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="14835" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1da88b0" id="14836" addr="0x7f99f1da88b0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1daa310" id="14837" addr="0x7f99f1daa310" />
-                                <attribute name="kind" value="function" id="14838" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="update" id="14839" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1daa5d0" id="14840" addr="0x7f99f1daa5d0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1daa5d0" id="14841" addr="0x7f99f1daa5d0" />
-                                <attribute name="defaultargs" value="0x7f99f1daa0b0" id="14842" addr="0x7f99f1daa0b0" />
-                                <attribute name="decl" value="f(int)." id="14843" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="14844" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1daa0b0" id="14845" addr="0x7f99f1daa0b0" />
-                                <parmlist id="14846" addr="0x7f99f1daa3b0" >
+                        <cdecl id="14832" addr="0x7fca468f84d0" >
+                            <attributelist id="14833" addr="0x7fca468f84d0" >
+                                <attribute name="name" value="update" id="14834" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="14835" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468f68b0" id="14836" addr="0x7fca468f68b0" />
+                                <attribute name="sym_previousSibling" value="0x7fca468f8310" id="14837" addr="0x7fca468f8310" />
+                                <attribute name="kind" value="function" id="14838" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="update" id="14839" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca468f85d0" id="14840" addr="0x7fca468f85d0" />
+                                <attribute name="sym_nextSibling" value="0x7fca468f85d0" id="14841" addr="0x7fca468f85d0" />
+                                <attribute name="defaultargs" value="0x7fca468f80b0" id="14842" addr="0x7fca468f80b0" />
+                                <attribute name="decl" value="f(int)." id="14843" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="14844" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468f80b0" id="14845" addr="0x7fca468f80b0" />
+                                <parmlist id="14846" addr="0x7fca468f83b0" >
                                     <parm id="14847">
-                                        <attributelist id="14848" addr="0x7f99f1daa3b0" >
-                                            <attribute name="name" value="percent" id="14849" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="0" id="14850" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="14851" addr="0x7f99f1de6c90" />
+                                        <attributelist id="14848" addr="0x7fca468f83b0" >
+                                            <attribute name="name" value="percent" id="14849" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="0" id="14850" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="14851" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="14852" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_2" id="14853" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="14852" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_2" id="14853" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="14854" addr="0x7f99f1daa5d0" >
-                            <attributelist id="14855" addr="0x7f99f1daa5d0" >
-                                <attribute name="name" value="update" id="14856" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="14857" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1da88b0" id="14858" addr="0x7f99f1da88b0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1daa4d0" id="14859" addr="0x7f99f1daa4d0" />
-                                <attribute name="kind" value="function" id="14860" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="update" id="14861" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1daa0b0" id="14862" addr="0x7f99f1daa0b0" />
-                                <attribute name="decl" value="f()." id="14863" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="14864" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1daa0b0" id="14865" addr="0x7f99f1daa0b0" />
-                                <attribute name="type" value="void" id="14866" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_3" id="14867" addr="0x7f99f1de6c90" />
+                        <cdecl id="14854" addr="0x7fca468f85d0" >
+                            <attributelist id="14855" addr="0x7fca468f85d0" >
+                                <attribute name="name" value="update" id="14856" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="14857" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468f68b0" id="14858" addr="0x7fca468f68b0" />
+                                <attribute name="sym_previousSibling" value="0x7fca468f84d0" id="14859" addr="0x7fca468f84d0" />
+                                <attribute name="kind" value="function" id="14860" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="update" id="14861" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca468f80b0" id="14862" addr="0x7fca468f80b0" />
+                                <attribute name="decl" value="f()." id="14863" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="14864" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468f80b0" id="14865" addr="0x7fca468f80b0" />
+                                <attribute name="type" value="void" id="14866" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_3" id="14867" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="14868" addr="0x7f99f1daa7b0" >
-                            <attributelist id="14869" addr="0x7f99f1daa7b0" >
-                                <attribute name="ismember" value="1" id="14870" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="close" id="14871" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="close" id="14872" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="14873" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="14874" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="14875" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="void" id="14876" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1da88b0" id="14877" addr="0x7f99f1da88b0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="14878" addr="0x7f99f1de6c90" />
+                        <cdecl id="14868" addr="0x7fca468f87b0" >
+                            <attributelist id="14869" addr="0x7fca468f87b0" >
+                                <attribute name="ismember" value="1" id="14870" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="close" id="14871" addr="0x7fca46934c90" />
+                                <attribute name="name" value="close" id="14872" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="14873" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="14874" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="14875" addr="0x7fca46934c90" />
+                                <attribute name="type" value="void" id="14876" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468f68b0" id="14877" addr="0x7fca468f68b0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="14878" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="14879" addr="0x7f99f1daa970" >
-                            <attributelist id="14880" addr="0x7f99f1daa970" >
-                                <attribute name="ismember" value="1" id="14881" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="isFinished" id="14882" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="isFinished" id="14883" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="14884" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="14885" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="14886" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="bool" id="14887" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1da88b0" id="14888" addr="0x7f99f1da88b0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="14889" addr="0x7f99f1de6c90" />
+                        <cdecl id="14879" addr="0x7fca468f8970" >
+                            <attributelist id="14880" addr="0x7fca468f8970" >
+                                <attribute name="ismember" value="1" id="14881" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="isFinished" id="14882" addr="0x7fca46934c90" />
+                                <attribute name="name" value="isFinished" id="14883" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="14884" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="14885" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="14886" addr="0x7fca46934c90" />
+                                <attribute name="type" value="bool" id="14887" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468f68b0" id="14888" addr="0x7fca468f68b0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="14889" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
@@ -21082,1507 +21082,1507 @@
                 </namespace >
             </namespace >
         </include >
-        <include id="14890" addr="0x7f99f1dabcb0" >
-            <attributelist id="14891" addr="0x7f99f1dabcb0" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/Window.h" id="14892" addr="0x7f99f1de6c90" />
+        <include id="14890" addr="0x7fca468f9cb0" >
+            <attributelist id="14891" addr="0x7fca468f9cb0" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/Window.h" id="14892" addr="0x7fca46934c90" />
             </attributelist >
 
-            <namespace id="14893" addr="0x7f99f1dabd50" >
-                <attributelist id="14894" addr="0x7f99f1dabd50" >
-                    <attribute name="sym_name" value="XBMCAddon" id="14895" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="XBMCAddon" id="14896" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_previousSibling" value="0x7f99f1e967b0" id="14897" addr="0x7f99f1e967b0" />
-                    <attribute name="csym_nextSibling" value="0x7f99f1db2850" id="14898" addr="0x7f99f1db2850" />
-                    <attribute name="sym_nextSibling" value="0x7f99f1db2850" id="14899" addr="0x7f99f1db2850" />
-                    <typescope id="14900" addr="0x7f99f1dd1d70" >
-                        <attributelist id="14901" addr="0x7f99f1dd1d70" >
-                            <attribute name="name" value="XBMCAddon" id="14902" addr="0x7f99f1de6c90" />
-                            <typetab id="14903" addr="0x7f99f1dd1db0" >
-                                <attributelist id="14904" addr="0x7f99f1dd1db0" >
-                                    <attribute name="Dictionary" value="Dictionary" id="14905" addr="0x7f99f1de6c90" />
-                                    <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="14906" addr="0x7f99f1de6c90" />
-                                    <attribute name="String" value="std::string" id="14907" addr="0x7f99f1de6c90" />
-                                    <attribute name="StringOrInt" value="XBMCAddon::String" id="14908" addr="0x7f99f1de6c90" />
+            <namespace id="14893" addr="0x7fca468f9d50" >
+                <attributelist id="14894" addr="0x7fca468f9d50" >
+                    <attribute name="sym_name" value="XBMCAddon" id="14895" addr="0x7fca46934c90" />
+                    <attribute name="name" value="XBMCAddon" id="14896" addr="0x7fca46934c90" />
+                    <attribute name="sym_previousSibling" value="0x7fca469e47b0" id="14897" addr="0x7fca469e47b0" />
+                    <attribute name="csym_nextSibling" value="0x7fca46900850" id="14898" addr="0x7fca46900850" />
+                    <attribute name="sym_nextSibling" value="0x7fca46900850" id="14899" addr="0x7fca46900850" />
+                    <typescope id="14900" addr="0x7fca4691fd70" >
+                        <attributelist id="14901" addr="0x7fca4691fd70" >
+                            <attribute name="name" value="XBMCAddon" id="14902" addr="0x7fca46934c90" />
+                            <typetab id="14903" addr="0x7fca4691fdb0" >
+                                <attributelist id="14904" addr="0x7fca4691fdb0" >
+                                    <attribute name="Dictionary" value="Dictionary" id="14905" addr="0x7fca46934c90" />
+                                    <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="14906" addr="0x7fca46934c90" />
+                                    <attribute name="String" value="std::string" id="14907" addr="0x7fca46934c90" />
+                                    <attribute name="StringOrInt" value="XBMCAddon::String" id="14908" addr="0x7fca46934c90" />
                                 </attributelist >
-                                <typetabsitem id="14909" addr="0x7f99f1dd28b0" >
-                                    <attributelist id="14910" addr="0x7f99f1dd28b0" >
+                                <typetabsitem id="14909" addr="0x7fca469208b0" >
+                                    <attributelist id="14910" addr="0x7fca469208b0" >
                                     </attributelist >
                                 </typetabsitem >
-                                <typetabsitem id="14911" addr="0x7f99f1dd2910" >
-                                    <attributelist id="14912" addr="0x7f99f1dd2910" >
+                                <typetabsitem id="14911" addr="0x7fca46920910" >
+                                    <attributelist id="14912" addr="0x7fca46920910" >
                                     </attributelist >
                                 </typetabsitem >
-                                <typetabsitem id="14913" addr="0x7f99f1dd1f90" >
-                                    <attributelist id="14914" addr="0x7f99f1dd1f90" >
+                                <typetabsitem id="14913" addr="0x7fca4691ff90" >
+                                    <attributelist id="14914" addr="0x7fca4691ff90" >
                                     </attributelist >
                                 </typetabsitem >
-                                <typetabsitem id="14915" addr="0x7f99f1dd2710" >
-                                    <attributelist id="14916" addr="0x7f99f1dd2710" >
+                                <typetabsitem id="14915" addr="0x7fca46920710" >
+                                    <attributelist id="14916" addr="0x7fca46920710" >
                                     </attributelist >
                                 </typetabsitem >
                             </typetab >
-                            <attribute name="parent" value="0x7f99f1e1da30" id="14917" addr="0x7f99f1e1da30" />
-                            <attribute name="qname" value="XBMCAddon" id="14918" addr="0x7f99f1de6c90" />
-                            <attribute name="symtab" value="0x7f99f1e408b0" id="14919" addr="0x7f99f1e408b0" />
+                            <attribute name="parent" value="0x7fca4696ba30" id="14917" addr="0x7fca4696ba30" />
+                            <attribute name="qname" value="XBMCAddon" id="14918" addr="0x7fca46934c90" />
+                            <attribute name="symtab" value="0x7fca4698e8b0" id="14919" addr="0x7fca4698e8b0" />
                         </attributelist >
-                        <typescopesitem id="14920" addr="0x7f99f1e40870" >
-                            <attributelist id="14921" addr="0x7f99f1e40870" >
+                        <typescopesitem id="14920" addr="0x7fca4698e870" >
+                            <attributelist id="14921" addr="0x7fca4698e870" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="14922" addr="0x7f99f1dd1db0" >
-                            <attributelist id="14923" addr="0x7f99f1dd1db0" >
-                                <attribute name="Dictionary" value="Dictionary" id="14924" addr="0x7f99f1de6c90" />
-                                <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="14925" addr="0x7f99f1de6c90" />
-                                <attribute name="String" value="std::string" id="14926" addr="0x7f99f1de6c90" />
-                                <attribute name="StringOrInt" value="XBMCAddon::String" id="14927" addr="0x7f99f1de6c90" />
+                        <typescopesitem id="14922" addr="0x7fca4691fdb0" >
+                            <attributelist id="14923" addr="0x7fca4691fdb0" >
+                                <attribute name="Dictionary" value="Dictionary" id="14924" addr="0x7fca46934c90" />
+                                <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="14925" addr="0x7fca46934c90" />
+                                <attribute name="String" value="std::string" id="14926" addr="0x7fca46934c90" />
+                                <attribute name="StringOrInt" value="XBMCAddon::String" id="14927" addr="0x7fca46934c90" />
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="14928" addr="0x7f99f1e1da30" >
-                            <attributelist id="14929" addr="0x7f99f1e1da30" >
-                                <attribute name="name" value="" id="14930" addr="0x7f99f1de6c90" />
-                                <typetab id="14931" addr="0x7f99f1e1da90" >
-                                    <attributelist id="14932" addr="0x7f99f1e1da90" >
+                        <typescopesitem id="14928" addr="0x7fca4696ba30" >
+                            <attributelist id="14929" addr="0x7fca4696ba30" >
+                                <attribute name="name" value="" id="14930" addr="0x7fca46934c90" />
+                                <typetab id="14931" addr="0x7fca4696ba90" >
+                                    <attributelist id="14932" addr="0x7fca4696ba90" >
                                     </attributelist >
                                 </typetab >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="14933" addr="0x7f99f1dd1eb0" >
-                            <attributelist id="14934" addr="0x7f99f1dd1eb0" >
+                        <typescopesitem id="14933" addr="0x7fca4691feb0" >
+                            <attributelist id="14934" addr="0x7fca4691feb0" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="14935" addr="0x7f99f1e408b0" >
-                            <attributelist id="14936" addr="0x7f99f1e408b0" >
-                                <attribute name="name" value="XBMCAddon" id="14937" addr="0x7f99f1de6c90" />
-                                <attribute name="csymtab" value="0x7f99f1e408f0" id="14938" addr="0x7f99f1e408f0" />
-                                <attribute name="symtab" value="0x7f99f1e40890" id="14939" addr="0x7f99f1e40890" />
+                        <typescopesitem id="14935" addr="0x7fca4698e8b0" >
+                            <attributelist id="14936" addr="0x7fca4698e8b0" >
+                                <attribute name="name" value="XBMCAddon" id="14937" addr="0x7fca46934c90" />
+                                <attribute name="csymtab" value="0x7fca4698e8f0" id="14938" addr="0x7fca4698e8f0" />
+                                <attribute name="symtab" value="0x7fca4698e890" id="14939" addr="0x7fca4698e890" />
                             </attributelist >
                         </typescopesitem >
                     </typescope >
-                    <attribute name="symtab" value="0x7f99f1e408b0" id="14940" addr="0x7f99f1e408b0" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="14941" addr="0x7f99f1e1d950" />
+                    <attribute name="symtab" value="0x7fca4698e8b0" id="14940" addr="0x7fca4698e8b0" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="14941" addr="0x7fca4696b950" />
                 </attributelist >
 
-                <namespace id="14942" addr="0x7f99f1dabdd0" >
-                    <attributelist id="14943" addr="0x7f99f1dabdd0" >
-                        <attribute name="feature_knownbasetypes" value="AddonClass,AddonCallback" id="14944" addr="0x7f99f1de6c90" />
-                        <attribute name="name" value="xbmcgui" id="14945" addr="0x7f99f1de6c90" />
-                        <attribute name="sym_symtab" value="0x7f99f1e408b0" id="14946" addr="0x7f99f1e408b0" />
-                        <attribute name="symtab" value="0x7f99f1e40fb0" id="14947" addr="0x7f99f1e40fb0" />
-                        <attribute name="sym_nextSibling" value="0x7f99f1db28d0" id="14948" addr="0x7f99f1db28d0" />
-                        <attribute name="csym_nextSibling" value="0x7f99f1db28d0" id="14949" addr="0x7f99f1db28d0" />
-                        <attribute name="sym_previousSibling" value="0x7f99f1e96830" id="14950" addr="0x7f99f1e96830" />
-                        <attribute name="feature_knownapitypes" value="XBMCAddon::xbmc::InfoTagVideo,xbmc::InfoTagMusic" id="14951" addr="0x7f99f1de6c90" />
-                        <attribute name="sym_name" value="xbmcgui" id="14952" addr="0x7f99f1de6c90" />
-                        <typescope id="14953" addr="0x7f99f1dd2150" >
-                            <attributelist id="14954" addr="0x7f99f1dd2150" >
-                                <attribute name="name" value="xbmcgui" id="14955" addr="0x7f99f1de6c90" />
-                                <typetab id="14956" addr="0x7f99f1dd2170" >
-                                    <attributelist id="14957" addr="0x7f99f1dd2170" >
-                                        <attribute name="InterceptorBase" value="InterceptorBase" id="14958" addr="0x7f99f1de6c90" />
-                                        <attribute name="Dialog" value="Dialog" id="14959" addr="0x7f99f1de6c90" />
-                                        <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="14960" addr="0x7f99f1de6c90" />
-                                        <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="14961" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlTextBox" value="ControlTextBox" id="14962" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlRadioButton" value="ControlRadioButton" id="14963" addr="0x7f99f1de6c90" />
-                                        <attribute name="Window" value="Window" id="14964" addr="0x7f99f1de6c90" />
-                                        <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="14965" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlList" value="ControlList" id="14966" addr="0x7f99f1de6c90" />
-                                        <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="14967" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlImage" value="ControlImage" id="14968" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlButton" value="ControlButton" id="14969" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlGroup" value="ControlGroup" id="14970" addr="0x7f99f1de6c90" />
-                                        <attribute name="DialogBusy" value="DialogBusy" id="14971" addr="0x7f99f1de6c90" />
-                                        <attribute name="DialogProgressBG" value="DialogProgressBG" id="14972" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlSpin" value="ControlSpin" id="14973" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlEdit" value="ControlEdit" id="14974" addr="0x7f99f1de6c90" />
-                                        <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="14975" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="14976" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlLabel" value="ControlLabel" id="14977" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlProgress" value="ControlProgress" id="14978" addr="0x7f99f1de6c90" />
-                                        <attribute name="Control" value="Control" id="14979" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlSlider" value="ControlSlider" id="14980" addr="0x7f99f1de6c90" />
-                                        <attribute name="DialogProgress" value="DialogProgress" id="14981" addr="0x7f99f1de6c90" />
-                                        <attribute name="Action" value="Action" id="14982" addr="0x7f99f1de6c90" />
-                                        <attribute name="WindowDialog" value="WindowDialog" id="14983" addr="0x7f99f1de6c90" />
-                                        <attribute name="WindowXML" value="WindowXML" id="14984" addr="0x7f99f1de6c90" />
-                                        <attribute name="ListItem" value="ListItem" id="14985" addr="0x7f99f1de6c90" />
-                                        <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="14986" addr="0x7f99f1de6c90" />
+                <namespace id="14942" addr="0x7fca468f9dd0" >
+                    <attributelist id="14943" addr="0x7fca468f9dd0" >
+                        <attribute name="feature_knownbasetypes" value="AddonClass,AddonCallback" id="14944" addr="0x7fca46934c90" />
+                        <attribute name="name" value="xbmcgui" id="14945" addr="0x7fca46934c90" />
+                        <attribute name="sym_symtab" value="0x7fca4698e8b0" id="14946" addr="0x7fca4698e8b0" />
+                        <attribute name="symtab" value="0x7fca4698efb0" id="14947" addr="0x7fca4698efb0" />
+                        <attribute name="sym_nextSibling" value="0x7fca469008d0" id="14948" addr="0x7fca469008d0" />
+                        <attribute name="csym_nextSibling" value="0x7fca469008d0" id="14949" addr="0x7fca469008d0" />
+                        <attribute name="sym_previousSibling" value="0x7fca469e4830" id="14950" addr="0x7fca469e4830" />
+                        <attribute name="feature_knownapitypes" value="XBMCAddon::xbmc::InfoTagVideo,xbmc::InfoTagMusic" id="14951" addr="0x7fca46934c90" />
+                        <attribute name="sym_name" value="xbmcgui" id="14952" addr="0x7fca46934c90" />
+                        <typescope id="14953" addr="0x7fca46920150" >
+                            <attributelist id="14954" addr="0x7fca46920150" >
+                                <attribute name="name" value="xbmcgui" id="14955" addr="0x7fca46934c90" />
+                                <typetab id="14956" addr="0x7fca46920170" >
+                                    <attributelist id="14957" addr="0x7fca46920170" >
+                                        <attribute name="InterceptorBase" value="InterceptorBase" id="14958" addr="0x7fca46934c90" />
+                                        <attribute name="Dialog" value="Dialog" id="14959" addr="0x7fca46934c90" />
+                                        <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="14960" addr="0x7fca46934c90" />
+                                        <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="14961" addr="0x7fca46934c90" />
+                                        <attribute name="ControlTextBox" value="ControlTextBox" id="14962" addr="0x7fca46934c90" />
+                                        <attribute name="ControlRadioButton" value="ControlRadioButton" id="14963" addr="0x7fca46934c90" />
+                                        <attribute name="Window" value="Window" id="14964" addr="0x7fca46934c90" />
+                                        <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="14965" addr="0x7fca46934c90" />
+                                        <attribute name="ControlList" value="ControlList" id="14966" addr="0x7fca46934c90" />
+                                        <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="14967" addr="0x7fca46934c90" />
+                                        <attribute name="ControlImage" value="ControlImage" id="14968" addr="0x7fca46934c90" />
+                                        <attribute name="ControlButton" value="ControlButton" id="14969" addr="0x7fca46934c90" />
+                                        <attribute name="ControlGroup" value="ControlGroup" id="14970" addr="0x7fca46934c90" />
+                                        <attribute name="DialogBusy" value="DialogBusy" id="14971" addr="0x7fca46934c90" />
+                                        <attribute name="DialogProgressBG" value="DialogProgressBG" id="14972" addr="0x7fca46934c90" />
+                                        <attribute name="ControlSpin" value="ControlSpin" id="14973" addr="0x7fca46934c90" />
+                                        <attribute name="ControlEdit" value="ControlEdit" id="14974" addr="0x7fca46934c90" />
+                                        <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="14975" addr="0x7fca46934c90" />
+                                        <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="14976" addr="0x7fca46934c90" />
+                                        <attribute name="ControlLabel" value="ControlLabel" id="14977" addr="0x7fca46934c90" />
+                                        <attribute name="ControlProgress" value="ControlProgress" id="14978" addr="0x7fca46934c90" />
+                                        <attribute name="Control" value="Control" id="14979" addr="0x7fca46934c90" />
+                                        <attribute name="ControlSlider" value="ControlSlider" id="14980" addr="0x7fca46934c90" />
+                                        <attribute name="DialogProgress" value="DialogProgress" id="14981" addr="0x7fca46934c90" />
+                                        <attribute name="Action" value="Action" id="14982" addr="0x7fca46934c90" />
+                                        <attribute name="WindowDialog" value="WindowDialog" id="14983" addr="0x7fca46934c90" />
+                                        <attribute name="WindowXML" value="WindowXML" id="14984" addr="0x7fca46934c90" />
+                                        <attribute name="ListItem" value="ListItem" id="14985" addr="0x7fca46934c90" />
+                                        <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="14986" addr="0x7fca46934c90" />
                                     </attributelist >
-                                    <typetabsitem id="14987" addr="0x7f99f1de1dd0" >
-                                        <attributelist id="14988" addr="0x7f99f1de1dd0" >
+                                    <typetabsitem id="14987" addr="0x7fca4692fdd0" >
+                                        <attributelist id="14988" addr="0x7fca4692fdd0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="14989" addr="0x7f99f1dde790" >
-                                        <attributelist id="14990" addr="0x7f99f1dde790" >
+                                    <typetabsitem id="14989" addr="0x7fca4692c790" >
+                                        <attributelist id="14990" addr="0x7fca4692c790" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="14991" addr="0x7f99f1de3f10" >
-                                        <attributelist id="14992" addr="0x7f99f1de3f10" >
+                                    <typetabsitem id="14991" addr="0x7fca46931f10" >
+                                        <attributelist id="14992" addr="0x7fca46931f10" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="14993" addr="0x7f99f1dd67b0" >
-                                        <attributelist id="14994" addr="0x7f99f1dd67b0" >
+                                    <typetabsitem id="14993" addr="0x7fca469247b0" >
+                                        <attributelist id="14994" addr="0x7fca469247b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="14995" addr="0x7f99f1ddafd0" >
-                                        <attributelist id="14996" addr="0x7f99f1ddafd0" >
+                                    <typetabsitem id="14995" addr="0x7fca46928fd0" >
+                                        <attributelist id="14996" addr="0x7fca46928fd0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="14997" addr="0x7f99f1ddd430" >
-                                        <attributelist id="14998" addr="0x7f99f1ddd430" >
+                                    <typetabsitem id="14997" addr="0x7fca4692b430" >
+                                        <attributelist id="14998" addr="0x7fca4692b430" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="14999" addr="0x7f99f1de2130" >
-                                        <attributelist id="15000" addr="0x7f99f1de2130" >
+                                    <typetabsitem id="14999" addr="0x7fca46930130" >
+                                        <attributelist id="15000" addr="0x7fca46930130" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="15001" addr="0x7f99f1dd2f50" >
-                                        <attributelist id="15002" addr="0x7f99f1dd2f50" >
+                                    <typetabsitem id="15001" addr="0x7fca46920f50" >
+                                        <attributelist id="15002" addr="0x7fca46920f50" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="15003" addr="0x7f99f1dd9650" >
-                                        <attributelist id="15004" addr="0x7f99f1dd9650" >
+                                    <typetabsitem id="15003" addr="0x7fca46927650" >
+                                        <attributelist id="15004" addr="0x7fca46927650" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="15005" addr="0x7f99f1de3390" >
-                                        <attributelist id="15006" addr="0x7f99f1de3390" >
+                                    <typetabsitem id="15005" addr="0x7fca46931390" >
+                                        <attributelist id="15006" addr="0x7fca46931390" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="15007" addr="0x7f99f1ddb7b0" >
-                                        <attributelist id="15008" addr="0x7f99f1ddb7b0" >
+                                    <typetabsitem id="15007" addr="0x7fca469297b0" >
+                                        <attributelist id="15008" addr="0x7fca469297b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="15009" addr="0x7f99f1ddc4b0" >
-                                        <attributelist id="15010" addr="0x7f99f1ddc4b0" >
+                                    <typetabsitem id="15009" addr="0x7fca4692a4b0" >
+                                        <attributelist id="15010" addr="0x7fca4692a4b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="15011" addr="0x7f99f1ddcf90" >
-                                        <attributelist id="15012" addr="0x7f99f1ddcf90" >
+                                    <typetabsitem id="15011" addr="0x7fca4692af90" >
+                                        <attributelist id="15012" addr="0x7fca4692af90" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="15013" addr="0x7f99f1de11b0" >
-                                        <attributelist id="15014" addr="0x7f99f1de11b0" >
+                                    <typetabsitem id="15013" addr="0x7fca4692f1b0" >
+                                        <attributelist id="15014" addr="0x7fca4692f1b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="15015" addr="0x7f99f1de15b0" >
-                                        <attributelist id="15016" addr="0x7f99f1de15b0" >
+                                    <typetabsitem id="15015" addr="0x7fca4692f5b0" >
+                                        <attributelist id="15016" addr="0x7fca4692f5b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="15017" addr="0x7f99f1dd77f0" >
-                                        <attributelist id="15018" addr="0x7f99f1dd77f0" >
+                                    <typetabsitem id="15017" addr="0x7fca469257f0" >
+                                        <attributelist id="15018" addr="0x7fca469257f0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="15019" addr="0x7f99f1dd8b30" >
-                                        <attributelist id="15020" addr="0x7f99f1dd8b30" >
+                                    <typetabsitem id="15019" addr="0x7fca46926b30" >
+                                        <attributelist id="15020" addr="0x7fca46926b30" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="15021" addr="0x7f99f1dd2c50" >
-                                        <attributelist id="15022" addr="0x7f99f1dd2c50" >
+                                    <typetabsitem id="15021" addr="0x7fca46920c50" >
+                                        <attributelist id="15022" addr="0x7fca46920c50" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="15023" addr="0x7f99f1dda790" >
-                                        <attributelist id="15024" addr="0x7f99f1dda790" >
+                                    <typetabsitem id="15023" addr="0x7fca46928790" >
+                                        <attributelist id="15024" addr="0x7fca46928790" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="15025" addr="0x7f99f1dd8030" >
-                                        <attributelist id="15026" addr="0x7f99f1dd8030" >
+                                    <typetabsitem id="15025" addr="0x7fca46926030" >
+                                        <attributelist id="15026" addr="0x7fca46926030" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="15027" addr="0x7f99f1ddbe10" >
-                                        <attributelist id="15028" addr="0x7f99f1ddbe10" >
+                                    <typetabsitem id="15027" addr="0x7fca46929e10" >
+                                        <attributelist id="15028" addr="0x7fca46929e10" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="15029" addr="0x7f99f1dd6b10" >
-                                        <attributelist id="15030" addr="0x7f99f1dd6b10" >
+                                    <typetabsitem id="15029" addr="0x7fca46924b10" >
+                                        <attributelist id="15030" addr="0x7fca46924b10" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="15031" addr="0x7f99f1dddf90" >
-                                        <attributelist id="15032" addr="0x7f99f1dddf90" >
+                                    <typetabsitem id="15031" addr="0x7fca4692bf90" >
+                                        <attributelist id="15032" addr="0x7fca4692bf90" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="15033" addr="0x7f99f1de0530" >
-                                        <attributelist id="15034" addr="0x7f99f1de0530" >
+                                    <typetabsitem id="15033" addr="0x7fca4692e530" >
+                                        <attributelist id="15034" addr="0x7fca4692e530" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="15035" addr="0x7f99f1de1e50" >
-                                        <attributelist id="15036" addr="0x7f99f1de1e50" >
+                                    <typetabsitem id="15035" addr="0x7fca4692fe50" >
+                                        <attributelist id="15036" addr="0x7fca4692fe50" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="15037" addr="0x7f99f1de2d90" >
-                                        <attributelist id="15038" addr="0x7f99f1de2d90" >
+                                    <typetabsitem id="15037" addr="0x7fca46930d90" >
+                                        <attributelist id="15038" addr="0x7fca46930d90" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="15039" addr="0x7f99f1de3410" >
-                                        <attributelist id="15040" addr="0x7f99f1de3410" >
+                                    <typetabsitem id="15039" addr="0x7fca46931410" >
+                                        <attributelist id="15040" addr="0x7fca46931410" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="15041" addr="0x7f99f1dd3590" >
-                                        <attributelist id="15042" addr="0x7f99f1dd3590" >
+                                    <typetabsitem id="15041" addr="0x7fca46921590" >
+                                        <attributelist id="15042" addr="0x7fca46921590" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="15043" addr="0x7f99f1dd3390" >
-                                        <attributelist id="15044" addr="0x7f99f1dd3390" >
+                                    <typetabsitem id="15043" addr="0x7fca46921390" >
+                                        <attributelist id="15044" addr="0x7fca46921390" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
-                                <attribute name="parent" value="0x7f99f1dd1d70" id="15045" addr="0x7f99f1dd1d70" />
-                                <attribute name="qname" value="XBMCAddon::xbmcgui" id="15046" addr="0x7f99f1de6c90" />
-                                <attribute name="symtab" value="0x7f99f1e40fb0" id="15047" addr="0x7f99f1e40fb0" />
+                                <attribute name="parent" value="0x7fca4691fd70" id="15045" addr="0x7fca4691fd70" />
+                                <attribute name="qname" value="XBMCAddon::xbmcgui" id="15046" addr="0x7fca46934c90" />
+                                <attribute name="symtab" value="0x7fca4698efb0" id="15047" addr="0x7fca4698efb0" />
                             </attributelist >
-                            <typescopesitem id="15048" addr="0x7f99f1e40f70" >
-                                <attributelist id="15049" addr="0x7f99f1e40f70" >
+                            <typescopesitem id="15048" addr="0x7fca4698ef70" >
+                                <attributelist id="15049" addr="0x7fca4698ef70" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="15050" addr="0x7f99f1dd2170" >
-                                <attributelist id="15051" addr="0x7f99f1dd2170" >
-                                    <attribute name="InterceptorBase" value="InterceptorBase" id="15052" addr="0x7f99f1de6c90" />
-                                    <attribute name="Dialog" value="Dialog" id="15053" addr="0x7f99f1de6c90" />
-                                    <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="15054" addr="0x7f99f1de6c90" />
-                                    <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="15055" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlTextBox" value="ControlTextBox" id="15056" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlRadioButton" value="ControlRadioButton" id="15057" addr="0x7f99f1de6c90" />
-                                    <attribute name="Window" value="Window" id="15058" addr="0x7f99f1de6c90" />
-                                    <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="15059" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlList" value="ControlList" id="15060" addr="0x7f99f1de6c90" />
-                                    <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="15061" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlImage" value="ControlImage" id="15062" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlButton" value="ControlButton" id="15063" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlGroup" value="ControlGroup" id="15064" addr="0x7f99f1de6c90" />
-                                    <attribute name="DialogBusy" value="DialogBusy" id="15065" addr="0x7f99f1de6c90" />
-                                    <attribute name="DialogProgressBG" value="DialogProgressBG" id="15066" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlSpin" value="ControlSpin" id="15067" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlEdit" value="ControlEdit" id="15068" addr="0x7f99f1de6c90" />
-                                    <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="15069" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="15070" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlLabel" value="ControlLabel" id="15071" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlProgress" value="ControlProgress" id="15072" addr="0x7f99f1de6c90" />
-                                    <attribute name="Control" value="Control" id="15073" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlSlider" value="ControlSlider" id="15074" addr="0x7f99f1de6c90" />
-                                    <attribute name="DialogProgress" value="DialogProgress" id="15075" addr="0x7f99f1de6c90" />
-                                    <attribute name="Action" value="Action" id="15076" addr="0x7f99f1de6c90" />
-                                    <attribute name="WindowDialog" value="WindowDialog" id="15077" addr="0x7f99f1de6c90" />
-                                    <attribute name="WindowXML" value="WindowXML" id="15078" addr="0x7f99f1de6c90" />
-                                    <attribute name="ListItem" value="ListItem" id="15079" addr="0x7f99f1de6c90" />
-                                    <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="15080" addr="0x7f99f1de6c90" />
+                            <typescopesitem id="15050" addr="0x7fca46920170" >
+                                <attributelist id="15051" addr="0x7fca46920170" >
+                                    <attribute name="InterceptorBase" value="InterceptorBase" id="15052" addr="0x7fca46934c90" />
+                                    <attribute name="Dialog" value="Dialog" id="15053" addr="0x7fca46934c90" />
+                                    <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="15054" addr="0x7fca46934c90" />
+                                    <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="15055" addr="0x7fca46934c90" />
+                                    <attribute name="ControlTextBox" value="ControlTextBox" id="15056" addr="0x7fca46934c90" />
+                                    <attribute name="ControlRadioButton" value="ControlRadioButton" id="15057" addr="0x7fca46934c90" />
+                                    <attribute name="Window" value="Window" id="15058" addr="0x7fca46934c90" />
+                                    <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="15059" addr="0x7fca46934c90" />
+                                    <attribute name="ControlList" value="ControlList" id="15060" addr="0x7fca46934c90" />
+                                    <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="15061" addr="0x7fca46934c90" />
+                                    <attribute name="ControlImage" value="ControlImage" id="15062" addr="0x7fca46934c90" />
+                                    <attribute name="ControlButton" value="ControlButton" id="15063" addr="0x7fca46934c90" />
+                                    <attribute name="ControlGroup" value="ControlGroup" id="15064" addr="0x7fca46934c90" />
+                                    <attribute name="DialogBusy" value="DialogBusy" id="15065" addr="0x7fca46934c90" />
+                                    <attribute name="DialogProgressBG" value="DialogProgressBG" id="15066" addr="0x7fca46934c90" />
+                                    <attribute name="ControlSpin" value="ControlSpin" id="15067" addr="0x7fca46934c90" />
+                                    <attribute name="ControlEdit" value="ControlEdit" id="15068" addr="0x7fca46934c90" />
+                                    <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="15069" addr="0x7fca46934c90" />
+                                    <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="15070" addr="0x7fca46934c90" />
+                                    <attribute name="ControlLabel" value="ControlLabel" id="15071" addr="0x7fca46934c90" />
+                                    <attribute name="ControlProgress" value="ControlProgress" id="15072" addr="0x7fca46934c90" />
+                                    <attribute name="Control" value="Control" id="15073" addr="0x7fca46934c90" />
+                                    <attribute name="ControlSlider" value="ControlSlider" id="15074" addr="0x7fca46934c90" />
+                                    <attribute name="DialogProgress" value="DialogProgress" id="15075" addr="0x7fca46934c90" />
+                                    <attribute name="Action" value="Action" id="15076" addr="0x7fca46934c90" />
+                                    <attribute name="WindowDialog" value="WindowDialog" id="15077" addr="0x7fca46934c90" />
+                                    <attribute name="WindowXML" value="WindowXML" id="15078" addr="0x7fca46934c90" />
+                                    <attribute name="ListItem" value="ListItem" id="15079" addr="0x7fca46934c90" />
+                                    <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="15080" addr="0x7fca46934c90" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="15081" addr="0x7f99f1dd1d70" >
-                                <attributelist id="15082" addr="0x7f99f1dd1d70" >
-                                    <attribute name="name" value="XBMCAddon" id="15083" addr="0x7f99f1de6c90" />
-                                    <typetab id="15084" addr="0x7f99f1dd1db0" >
-                                        <attributelist id="15085" addr="0x7f99f1dd1db0" >
-                                            <attribute name="Dictionary" value="Dictionary" id="15086" addr="0x7f99f1de6c90" />
-                                            <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="15087" addr="0x7f99f1de6c90" />
-                                            <attribute name="String" value="std::string" id="15088" addr="0x7f99f1de6c90" />
-                                            <attribute name="StringOrInt" value="XBMCAddon::String" id="15089" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                        <typetabsitem id="15090" addr="0x7f99f1dd28b0" >
-                                            <attributelist id="15091" addr="0x7f99f1dd28b0" >
+                            <typescopesitem id="15081" addr="0x7fca4691fd70" >
+                                <attributelist id="15082" addr="0x7fca4691fd70" >
+                                    <attribute name="name" value="XBMCAddon" id="15083" addr="0x7fca46934c90" />
+                                    <typetab id="15084" addr="0x7fca4691fdb0" >
+                                        <attributelist id="15085" addr="0x7fca4691fdb0" >
+                                            <attribute name="Dictionary" value="Dictionary" id="15086" addr="0x7fca46934c90" />
+                                            <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="15087" addr="0x7fca46934c90" />
+                                            <attribute name="String" value="std::string" id="15088" addr="0x7fca46934c90" />
+                                            <attribute name="StringOrInt" value="XBMCAddon::String" id="15089" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                        <typetabsitem id="15090" addr="0x7fca469208b0" >
+                                            <attributelist id="15091" addr="0x7fca469208b0" >
                                             </attributelist >
                                         </typetabsitem >
-                                        <typetabsitem id="15092" addr="0x7f99f1dd2910" >
-                                            <attributelist id="15093" addr="0x7f99f1dd2910" >
+                                        <typetabsitem id="15092" addr="0x7fca46920910" >
+                                            <attributelist id="15093" addr="0x7fca46920910" >
                                             </attributelist >
                                         </typetabsitem >
-                                        <typetabsitem id="15094" addr="0x7f99f1dd1f90" >
-                                            <attributelist id="15095" addr="0x7f99f1dd1f90" >
+                                        <typetabsitem id="15094" addr="0x7fca4691ff90" >
+                                            <attributelist id="15095" addr="0x7fca4691ff90" >
                                             </attributelist >
                                         </typetabsitem >
-                                        <typetabsitem id="15096" addr="0x7f99f1dd2710" >
-                                            <attributelist id="15097" addr="0x7f99f1dd2710" >
+                                        <typetabsitem id="15096" addr="0x7fca46920710" >
+                                            <attributelist id="15097" addr="0x7fca46920710" >
                                             </attributelist >
                                         </typetabsitem >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f99f1e1da30" id="15098" addr="0x7f99f1e1da30" />
-                                    <attribute name="qname" value="XBMCAddon" id="15099" addr="0x7f99f1de6c90" />
-                                    <attribute name="symtab" value="0x7f99f1e408b0" id="15100" addr="0x7f99f1e408b0" />
+                                    <attribute name="parent" value="0x7fca4696ba30" id="15098" addr="0x7fca4696ba30" />
+                                    <attribute name="qname" value="XBMCAddon" id="15099" addr="0x7fca46934c90" />
+                                    <attribute name="symtab" value="0x7fca4698e8b0" id="15100" addr="0x7fca4698e8b0" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="15101" addr="0x7f99f1dd2190" >
-                                <attributelist id="15102" addr="0x7f99f1dd2190" >
+                            <typescopesitem id="15101" addr="0x7fca46920190" >
+                                <attributelist id="15102" addr="0x7fca46920190" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="15103" addr="0x7f99f1e40fb0" >
-                                <attributelist id="15104" addr="0x7f99f1e40fb0" >
-                                    <attribute name="name" value="xbmcgui" id="15105" addr="0x7f99f1de6c90" />
-                                    <attribute name="csymtab" value="0x7f99f1e40ff0" id="15106" addr="0x7f99f1e40ff0" />
-                                    <attribute name="symtab" value="0x7f99f1e40f90" id="15107" addr="0x7f99f1e40f90" />
+                            <typescopesitem id="15103" addr="0x7fca4698efb0" >
+                                <attributelist id="15104" addr="0x7fca4698efb0" >
+                                    <attribute name="name" value="xbmcgui" id="15105" addr="0x7fca46934c90" />
+                                    <attribute name="csymtab" value="0x7fca4698eff0" id="15106" addr="0x7fca4698eff0" />
+                                    <attribute name="symtab" value="0x7fca4698ef90" id="15107" addr="0x7fca4698ef90" />
                                 </attributelist >
                             </typescopesitem >
                         </typescope >
                     </attributelist >
 
-                    <classforward id="15108" addr="0x7f99f1dabe70" >
-                        <attributelist id="15109" addr="0x7f99f1dabe70" >
-                            <attribute name="sym_name" value="InterceptorBase" id="15110" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="InterceptorBase" id="15111" addr="0x7f99f1de6c90" />
-                            <attribute name="kind" value="class" id="15112" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_weak" value="1" id="15113" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="15114" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="15115" addr="0x7f99f1de6c90" />
+                    <classforward id="15108" addr="0x7fca468f9e70" >
+                        <attributelist id="15109" addr="0x7fca468f9e70" >
+                            <attribute name="sym_name" value="InterceptorBase" id="15110" addr="0x7fca46934c90" />
+                            <attribute name="name" value="InterceptorBase" id="15111" addr="0x7fca46934c90" />
+                            <attribute name="kind" value="class" id="15112" addr="0x7fca46934c90" />
+                            <attribute name="sym_weak" value="1" id="15113" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="15114" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="15115" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </classforward >
-                    <class id="15116" addr="0x7f99f1dac070" >
-                        <attributelist id="15117" addr="0x7f99f1dac070" >
-                            <attribute name="name" value="XBMCAddon::xbmcgui::Action" id="15118" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="15119" addr="0x7f99f1e40fb0" />
-                            <attribute name="symtab" value="0x7f99f1dac1d0" id="15120" addr="0x7f99f1dac1d0" />
-                            <attribute name="allows_typedef" value="1" id="15121" addr="0x7f99f1de6c90" />
-                            <attribute name="typepass_visit" value="1" id="15122" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_visit" value="1" id="15123" addr="0x7f99f1de6c90" />
-                            <attribute name="kind" value="class" id="15124" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_name" value="Action" id="15125" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_default_constructor" value="1" id="15126" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_has_constructor" value="1" id="15127" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_public_constructor" value="1" id="15128" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_copy_constructor" value="1" id="15129" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_default_destructor" value="1" id="15130" addr="0x7f99f1de6c90" />
-                            <attribute name="privatebaselist" value="0x7f99f1dac050" id="15131" addr="0x7f99f1dac050" />
-                            <attribute name="protectedbaselist" value="0x7f99f1dac030" id="15132" addr="0x7f99f1dac030" />
-                            <baselist id="15133" addr="0x7f99f1dac010" >
-                                <base name="AddonClass" id="15134" addr="0x7f99f1dabf90" />
+                    <class id="15116" addr="0x7fca468fa070" >
+                        <attributelist id="15117" addr="0x7fca468fa070" >
+                            <attribute name="name" value="XBMCAddon::xbmcgui::Action" id="15118" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="15119" addr="0x7fca4698efb0" />
+                            <attribute name="symtab" value="0x7fca468fa1d0" id="15120" addr="0x7fca468fa1d0" />
+                            <attribute name="allows_typedef" value="1" id="15121" addr="0x7fca46934c90" />
+                            <attribute name="typepass_visit" value="1" id="15122" addr="0x7fca46934c90" />
+                            <attribute name="allocate_visit" value="1" id="15123" addr="0x7fca46934c90" />
+                            <attribute name="kind" value="class" id="15124" addr="0x7fca46934c90" />
+                            <attribute name="sym_name" value="Action" id="15125" addr="0x7fca46934c90" />
+                            <attribute name="allocate_default_constructor" value="1" id="15126" addr="0x7fca46934c90" />
+                            <attribute name="allocate_has_constructor" value="1" id="15127" addr="0x7fca46934c90" />
+                            <attribute name="allocate_public_constructor" value="1" id="15128" addr="0x7fca46934c90" />
+                            <attribute name="allocate_copy_constructor" value="1" id="15129" addr="0x7fca46934c90" />
+                            <attribute name="allocate_default_destructor" value="1" id="15130" addr="0x7fca46934c90" />
+                            <attribute name="privatebaselist" value="0x7fca468fa050" id="15131" addr="0x7fca468fa050" />
+                            <attribute name="protectedbaselist" value="0x7fca468fa030" id="15132" addr="0x7fca468fa030" />
+                            <baselist id="15133" addr="0x7fca468fa010" >
+                                <base name="AddonClass" id="15134" addr="0x7fca468f9f90" />
                             </baselist >
-                            <attribute name="module" value="xbmcgui" id="15135" addr="0x7f99f1e402f0" />
-                            <attribute name="feature_python_rcmp" value="{ XBMC_TRACE;&#10;    if (method == Py_EQ)&#10;    {&#10;      XBMCAddon::xbmcgui::Action* a1 = (Action*)retrieveApiInstance(obj1,&amp;TyXBMCAddon_xbmcgui_Action_Type,&quot;rcmp&quot;,&quot;XBMCAddon::xbmcgui::Action&quot;);&#10;      if (PyObject_TypeCheck(obj2, &amp;(TyXBMCAddon_xbmcgui_Action_Type.pythonType)))&#10;      {&#10;        // both are Action objects&#10;        XBMCAddon::xbmcgui::Action* a2 = (Action*)retrieveApiInstance(obj2,&amp;TyXBMCAddon_xbmcgui_Action_Type,&quot;rcmp&quot;,&quot;XBMCAddon::xbmcgui::Action&quot;);&#10;&#10;        if (a1->id == a2->id &amp;&amp;&#10;            a1->buttonCode == a2->buttonCode &amp;&amp;&#10;            a1->fAmount1 == a2->fAmount1 &amp;&amp;&#10;            a1->fAmount2 == a2->fAmount2 &amp;&amp;&#10;            a1->fRepeat == a2->fRepeat &amp;&amp;&#10;            a1->strAction == a2->strAction)&#10;        {&#10;          Py_RETURN_TRUE;&#10;        }&#10;        else&#10;        {&#10;          Py_RETURN_FALSE;&#10;        }&#10;      }&#10;      else&#10;      {&#10;        // for backwards compatability in python scripts&#10;        PyObject* o1 = PyLong_FromLong(a1->id);&#10;        return PyObject_RichCompare(o1, obj2, method);&#10;      }&#10;    }&#10;    Py_INCREF(Py_NotImplemented);&#10;    return Py_NotImplemented;&#10;  }" id="15136" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="15137" addr="0x7f99f1de6c90" />
-                            <typescope id="15138" addr="0x7f99f1de1f10" >
-                                <attributelist id="15139" addr="0x7f99f1de1f10" >
-                                    <attribute name="name" value="Action" id="15140" addr="0x7f99f1de6c90" />
-                                    <typetab id="15141" addr="0x7f99f1de1f30" >
-                                        <attributelist id="15142" addr="0x7f99f1de1f30" >
+                            <attribute name="module" value="xbmcgui" id="15135" addr="0x7fca4698e2f0" />
+                            <attribute name="feature_python_rcmp" value="{ XBMC_TRACE;&#10;    if (method == Py_EQ)&#10;    {&#10;      XBMCAddon::xbmcgui::Action* a1 = (Action*)retrieveApiInstance(obj1,&amp;TyXBMCAddon_xbmcgui_Action_Type,&quot;rcmp&quot;,&quot;XBMCAddon::xbmcgui::Action&quot;);&#10;      if (PyObject_TypeCheck(obj2, &amp;(TyXBMCAddon_xbmcgui_Action_Type.pythonType)))&#10;      {&#10;        // both are Action objects&#10;        XBMCAddon::xbmcgui::Action* a2 = (Action*)retrieveApiInstance(obj2,&amp;TyXBMCAddon_xbmcgui_Action_Type,&quot;rcmp&quot;,&quot;XBMCAddon::xbmcgui::Action&quot;);&#10;&#10;        if (a1->id == a2->id &amp;&amp;&#10;            a1->buttonCode == a2->buttonCode &amp;&amp;&#10;            a1->fAmount1 == a2->fAmount1 &amp;&amp;&#10;            a1->fAmount2 == a2->fAmount2 &amp;&amp;&#10;            a1->fRepeat == a2->fRepeat &amp;&amp;&#10;            a1->strAction == a2->strAction)&#10;        {&#10;          Py_RETURN_TRUE;&#10;        }&#10;        else&#10;        {&#10;          Py_RETURN_FALSE;&#10;        }&#10;      }&#10;      else&#10;      {&#10;        // for backwards compatability in python scripts&#10;        PyObject* o1 = PyLong_FromLong(a1->id);&#10;        return PyObject_RichCompare(o1, obj2, method);&#10;      }&#10;    }&#10;    Py_INCREF(Py_NotImplemented);&#10;    return Py_NotImplemented;&#10;  }" id="15136" addr="0x7fca46934c90" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="15137" addr="0x7fca46934c90" />
+                            <typescope id="15138" addr="0x7fca4692ff10" >
+                                <attributelist id="15139" addr="0x7fca4692ff10" >
+                                    <attribute name="name" value="Action" id="15140" addr="0x7fca46934c90" />
+                                    <typetab id="15141" addr="0x7fca4692ff30" >
+                                        <attributelist id="15142" addr="0x7fca4692ff30" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f99f1dd2150" id="15143" addr="0x7f99f1dd2150" />
-                                    <attribute name="qname" value="XBMCAddon::xbmcgui::Action" id="15144" addr="0x7f99f1de6c90" />
-                                    <attribute name="symtab" value="0x7f99f1dac1d0" id="15145" addr="0x7f99f1dac1d0" />
+                                    <attribute name="parent" value="0x7fca46920150" id="15143" addr="0x7fca46920150" />
+                                    <attribute name="qname" value="XBMCAddon::xbmcgui::Action" id="15144" addr="0x7fca46934c90" />
+                                    <attribute name="symtab" value="0x7fca468fa1d0" id="15145" addr="0x7fca468fa1d0" />
                                 </attributelist >
-                                <typescopesitem id="15146" addr="0x7f99f1de1eb0" >
-                                    <attributelist id="15147" addr="0x7f99f1de1eb0" >
+                                <typescopesitem id="15146" addr="0x7fca4692feb0" >
+                                    <attributelist id="15147" addr="0x7fca4692feb0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="15148" addr="0x7f99f1de1f30" >
-                                    <attributelist id="15149" addr="0x7f99f1de1f30" >
+                                <typescopesitem id="15148" addr="0x7fca4692ff30" >
+                                    <attributelist id="15149" addr="0x7fca4692ff30" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="15150" addr="0x7f99f1dd2150" >
-                                    <attributelist id="15151" addr="0x7f99f1dd2150" >
-                                        <attribute name="name" value="xbmcgui" id="15152" addr="0x7f99f1de6c90" />
-                                        <typetab id="15153" addr="0x7f99f1dd2170" >
-                                            <attributelist id="15154" addr="0x7f99f1dd2170" >
-                                                <attribute name="InterceptorBase" value="InterceptorBase" id="15155" addr="0x7f99f1de6c90" />
-                                                <attribute name="Dialog" value="Dialog" id="15156" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="15157" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="15158" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlTextBox" value="ControlTextBox" id="15159" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="15160" addr="0x7f99f1de6c90" />
-                                                <attribute name="Window" value="Window" id="15161" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="15162" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlList" value="ControlList" id="15163" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="15164" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlImage" value="ControlImage" id="15165" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlButton" value="ControlButton" id="15166" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlGroup" value="ControlGroup" id="15167" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogBusy" value="DialogBusy" id="15168" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="15169" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSpin" value="ControlSpin" id="15170" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlEdit" value="ControlEdit" id="15171" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="15172" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="15173" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlLabel" value="ControlLabel" id="15174" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlProgress" value="ControlProgress" id="15175" addr="0x7f99f1de6c90" />
-                                                <attribute name="Control" value="Control" id="15176" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSlider" value="ControlSlider" id="15177" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgress" value="DialogProgress" id="15178" addr="0x7f99f1de6c90" />
-                                                <attribute name="Action" value="Action" id="15179" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowDialog" value="WindowDialog" id="15180" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXML" value="WindowXML" id="15181" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItem" value="ListItem" id="15182" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="15183" addr="0x7f99f1de6c90" />
+                                <typescopesitem id="15150" addr="0x7fca46920150" >
+                                    <attributelist id="15151" addr="0x7fca46920150" >
+                                        <attribute name="name" value="xbmcgui" id="15152" addr="0x7fca46934c90" />
+                                        <typetab id="15153" addr="0x7fca46920170" >
+                                            <attributelist id="15154" addr="0x7fca46920170" >
+                                                <attribute name="InterceptorBase" value="InterceptorBase" id="15155" addr="0x7fca46934c90" />
+                                                <attribute name="Dialog" value="Dialog" id="15156" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="15157" addr="0x7fca46934c90" />
+                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="15158" addr="0x7fca46934c90" />
+                                                <attribute name="ControlTextBox" value="ControlTextBox" id="15159" addr="0x7fca46934c90" />
+                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="15160" addr="0x7fca46934c90" />
+                                                <attribute name="Window" value="Window" id="15161" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="15162" addr="0x7fca46934c90" />
+                                                <attribute name="ControlList" value="ControlList" id="15163" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="15164" addr="0x7fca46934c90" />
+                                                <attribute name="ControlImage" value="ControlImage" id="15165" addr="0x7fca46934c90" />
+                                                <attribute name="ControlButton" value="ControlButton" id="15166" addr="0x7fca46934c90" />
+                                                <attribute name="ControlGroup" value="ControlGroup" id="15167" addr="0x7fca46934c90" />
+                                                <attribute name="DialogBusy" value="DialogBusy" id="15168" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="15169" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSpin" value="ControlSpin" id="15170" addr="0x7fca46934c90" />
+                                                <attribute name="ControlEdit" value="ControlEdit" id="15171" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="15172" addr="0x7fca46934c90" />
+                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="15173" addr="0x7fca46934c90" />
+                                                <attribute name="ControlLabel" value="ControlLabel" id="15174" addr="0x7fca46934c90" />
+                                                <attribute name="ControlProgress" value="ControlProgress" id="15175" addr="0x7fca46934c90" />
+                                                <attribute name="Control" value="Control" id="15176" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSlider" value="ControlSlider" id="15177" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgress" value="DialogProgress" id="15178" addr="0x7fca46934c90" />
+                                                <attribute name="Action" value="Action" id="15179" addr="0x7fca46934c90" />
+                                                <attribute name="WindowDialog" value="WindowDialog" id="15180" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXML" value="WindowXML" id="15181" addr="0x7fca46934c90" />
+                                                <attribute name="ListItem" value="ListItem" id="15182" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="15183" addr="0x7fca46934c90" />
                                             </attributelist >
-                                            <typetabsitem id="15184" addr="0x7f99f1de1dd0" >
-                                                <attributelist id="15185" addr="0x7f99f1de1dd0" >
+                                            <typetabsitem id="15184" addr="0x7fca4692fdd0" >
+                                                <attributelist id="15185" addr="0x7fca4692fdd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15186" addr="0x7f99f1dde790" >
-                                                <attributelist id="15187" addr="0x7f99f1dde790" >
+                                            <typetabsitem id="15186" addr="0x7fca4692c790" >
+                                                <attributelist id="15187" addr="0x7fca4692c790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15188" addr="0x7f99f1de3f10" >
-                                                <attributelist id="15189" addr="0x7f99f1de3f10" >
+                                            <typetabsitem id="15188" addr="0x7fca46931f10" >
+                                                <attributelist id="15189" addr="0x7fca46931f10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15190" addr="0x7f99f1dd67b0" >
-                                                <attributelist id="15191" addr="0x7f99f1dd67b0" >
+                                            <typetabsitem id="15190" addr="0x7fca469247b0" >
+                                                <attributelist id="15191" addr="0x7fca469247b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15192" addr="0x7f99f1ddafd0" >
-                                                <attributelist id="15193" addr="0x7f99f1ddafd0" >
+                                            <typetabsitem id="15192" addr="0x7fca46928fd0" >
+                                                <attributelist id="15193" addr="0x7fca46928fd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15194" addr="0x7f99f1ddd430" >
-                                                <attributelist id="15195" addr="0x7f99f1ddd430" >
+                                            <typetabsitem id="15194" addr="0x7fca4692b430" >
+                                                <attributelist id="15195" addr="0x7fca4692b430" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15196" addr="0x7f99f1de2130" >
-                                                <attributelist id="15197" addr="0x7f99f1de2130" >
+                                            <typetabsitem id="15196" addr="0x7fca46930130" >
+                                                <attributelist id="15197" addr="0x7fca46930130" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15198" addr="0x7f99f1dd2f50" >
-                                                <attributelist id="15199" addr="0x7f99f1dd2f50" >
+                                            <typetabsitem id="15198" addr="0x7fca46920f50" >
+                                                <attributelist id="15199" addr="0x7fca46920f50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15200" addr="0x7f99f1dd9650" >
-                                                <attributelist id="15201" addr="0x7f99f1dd9650" >
+                                            <typetabsitem id="15200" addr="0x7fca46927650" >
+                                                <attributelist id="15201" addr="0x7fca46927650" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15202" addr="0x7f99f1de3390" >
-                                                <attributelist id="15203" addr="0x7f99f1de3390" >
+                                            <typetabsitem id="15202" addr="0x7fca46931390" >
+                                                <attributelist id="15203" addr="0x7fca46931390" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15204" addr="0x7f99f1ddb7b0" >
-                                                <attributelist id="15205" addr="0x7f99f1ddb7b0" >
+                                            <typetabsitem id="15204" addr="0x7fca469297b0" >
+                                                <attributelist id="15205" addr="0x7fca469297b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15206" addr="0x7f99f1ddc4b0" >
-                                                <attributelist id="15207" addr="0x7f99f1ddc4b0" >
+                                            <typetabsitem id="15206" addr="0x7fca4692a4b0" >
+                                                <attributelist id="15207" addr="0x7fca4692a4b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15208" addr="0x7f99f1ddcf90" >
-                                                <attributelist id="15209" addr="0x7f99f1ddcf90" >
+                                            <typetabsitem id="15208" addr="0x7fca4692af90" >
+                                                <attributelist id="15209" addr="0x7fca4692af90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15210" addr="0x7f99f1de11b0" >
-                                                <attributelist id="15211" addr="0x7f99f1de11b0" >
+                                            <typetabsitem id="15210" addr="0x7fca4692f1b0" >
+                                                <attributelist id="15211" addr="0x7fca4692f1b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15212" addr="0x7f99f1de15b0" >
-                                                <attributelist id="15213" addr="0x7f99f1de15b0" >
+                                            <typetabsitem id="15212" addr="0x7fca4692f5b0" >
+                                                <attributelist id="15213" addr="0x7fca4692f5b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15214" addr="0x7f99f1dd77f0" >
-                                                <attributelist id="15215" addr="0x7f99f1dd77f0" >
+                                            <typetabsitem id="15214" addr="0x7fca469257f0" >
+                                                <attributelist id="15215" addr="0x7fca469257f0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15216" addr="0x7f99f1dd8b30" >
-                                                <attributelist id="15217" addr="0x7f99f1dd8b30" >
+                                            <typetabsitem id="15216" addr="0x7fca46926b30" >
+                                                <attributelist id="15217" addr="0x7fca46926b30" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15218" addr="0x7f99f1dd2c50" >
-                                                <attributelist id="15219" addr="0x7f99f1dd2c50" >
+                                            <typetabsitem id="15218" addr="0x7fca46920c50" >
+                                                <attributelist id="15219" addr="0x7fca46920c50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15220" addr="0x7f99f1dda790" >
-                                                <attributelist id="15221" addr="0x7f99f1dda790" >
+                                            <typetabsitem id="15220" addr="0x7fca46928790" >
+                                                <attributelist id="15221" addr="0x7fca46928790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15222" addr="0x7f99f1dd8030" >
-                                                <attributelist id="15223" addr="0x7f99f1dd8030" >
+                                            <typetabsitem id="15222" addr="0x7fca46926030" >
+                                                <attributelist id="15223" addr="0x7fca46926030" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15224" addr="0x7f99f1ddbe10" >
-                                                <attributelist id="15225" addr="0x7f99f1ddbe10" >
+                                            <typetabsitem id="15224" addr="0x7fca46929e10" >
+                                                <attributelist id="15225" addr="0x7fca46929e10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15226" addr="0x7f99f1dd6b10" >
-                                                <attributelist id="15227" addr="0x7f99f1dd6b10" >
+                                            <typetabsitem id="15226" addr="0x7fca46924b10" >
+                                                <attributelist id="15227" addr="0x7fca46924b10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15228" addr="0x7f99f1dddf90" >
-                                                <attributelist id="15229" addr="0x7f99f1dddf90" >
+                                            <typetabsitem id="15228" addr="0x7fca4692bf90" >
+                                                <attributelist id="15229" addr="0x7fca4692bf90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15230" addr="0x7f99f1de0530" >
-                                                <attributelist id="15231" addr="0x7f99f1de0530" >
+                                            <typetabsitem id="15230" addr="0x7fca4692e530" >
+                                                <attributelist id="15231" addr="0x7fca4692e530" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15232" addr="0x7f99f1de1e50" >
-                                                <attributelist id="15233" addr="0x7f99f1de1e50" >
+                                            <typetabsitem id="15232" addr="0x7fca4692fe50" >
+                                                <attributelist id="15233" addr="0x7fca4692fe50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15234" addr="0x7f99f1de2d90" >
-                                                <attributelist id="15235" addr="0x7f99f1de2d90" >
+                                            <typetabsitem id="15234" addr="0x7fca46930d90" >
+                                                <attributelist id="15235" addr="0x7fca46930d90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15236" addr="0x7f99f1de3410" >
-                                                <attributelist id="15237" addr="0x7f99f1de3410" >
+                                            <typetabsitem id="15236" addr="0x7fca46931410" >
+                                                <attributelist id="15237" addr="0x7fca46931410" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15238" addr="0x7f99f1dd3590" >
-                                                <attributelist id="15239" addr="0x7f99f1dd3590" >
+                                            <typetabsitem id="15238" addr="0x7fca46921590" >
+                                                <attributelist id="15239" addr="0x7fca46921590" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15240" addr="0x7f99f1dd3390" >
-                                                <attributelist id="15241" addr="0x7f99f1dd3390" >
+                                            <typetabsitem id="15240" addr="0x7fca46921390" >
+                                                <attributelist id="15241" addr="0x7fca46921390" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7f99f1dd1d70" id="15242" addr="0x7f99f1dd1d70" />
-                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="15243" addr="0x7f99f1de6c90" />
-                                        <attribute name="symtab" value="0x7f99f1e40fb0" id="15244" addr="0x7f99f1e40fb0" />
+                                        <attribute name="parent" value="0x7fca4691fd70" id="15242" addr="0x7fca4691fd70" />
+                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="15243" addr="0x7fca46934c90" />
+                                        <attribute name="symtab" value="0x7fca4698efb0" id="15244" addr="0x7fca4698efb0" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="15245" addr="0x7f99f1de1f50" >
-                                    <attributelist id="15246" addr="0x7f99f1de1f50" >
+                                <typescopesitem id="15245" addr="0x7fca4692ff50" >
+                                    <attributelist id="15246" addr="0x7fca4692ff50" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="15247" addr="0x7f99f1dac1d0" >
-                                    <attributelist id="15248" addr="0x7f99f1dac1d0" >
-                                        <attribute name="name" value="Action" id="15249" addr="0x7f99f1de6c90" />
-                                        <attribute name="csymtab" value="0x7f99f1dac1f0" id="15250" addr="0x7f99f1dac1f0" />
-                                        <attribute name="symtab" value="0x7f99f1dac190" id="15251" addr="0x7f99f1dac190" />
+                                <typescopesitem id="15247" addr="0x7fca468fa1d0" >
+                                    <attributelist id="15248" addr="0x7fca468fa1d0" >
+                                        <attribute name="name" value="Action" id="15249" addr="0x7fca46934c90" />
+                                        <attribute name="csymtab" value="0x7fca468fa1f0" id="15250" addr="0x7fca468fa1f0" />
+                                        <attribute name="symtab" value="0x7fca468fa190" id="15251" addr="0x7fca468fa190" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <access id="15252" addr="0x7f99f1dac150" >
-                            <attributelist id="15253" addr="0x7f99f1dac150" >
-                                <attribute name="kind" value="public" id="15254" addr="0x7f99f1de6c90" />
+                        <access id="15252" addr="0x7fca468fa150" >
+                            <attributelist id="15253" addr="0x7fca468fa150" >
+                                <attribute name="kind" value="public" id="15254" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="15255" addr="0x7f99f1dac330" >
-                            <attributelist id="15256" addr="0x7f99f1dac330" >
-                                <attribute name="value" value="default" id="15257" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="Action" id="15258" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="15259" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1dac1d0" id="15260" addr="0x7f99f1dac1d0" />
-                                <attribute name="sym_name" value="Action" id="15261" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="15262" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="15263" addr="0x7f99f1de6c90" />
-                                <attribute name="code" value="{ XBMC_TRACE;&#10;    if (method == Py_EQ)&#10;    {&#10;      XBMCAddon::xbmcgui::Action* a1 = (Action*)retrieveApiInstance(obj1,&amp;TyXBMCAddon_xbmcgui_Action_Type,&quot;rcmp&quot;,&quot;XBMCAddon::xbmcgui::Action&quot;);&#10;      if (PyObject_TypeCheck(obj2, &amp;(TyXBMCAddon_xbmcgui_Action_Type.pythonType)))&#10;      {&#10;        // both are Action objects&#10;        XBMCAddon::xbmcgui::Action* a2 = (Action*)retrieveApiInstance(obj2,&amp;TyXBMCAddon_xbmcgui_Action_Type,&quot;rcmp&quot;,&quot;XBMCAddon::xbmcgui::Action&quot;);&#10;&#10;        if (a1->id == a2->id &amp;&amp;&#10;            a1->buttonCode == a2->buttonCode &amp;&amp;&#10;            a1->fAmount1 == a2->fAmount1 &amp;&amp;&#10;            a1->fAmount2 == a2->fAmount2 &amp;&amp;&#10;            a1->fRepeat == a2->fRepeat &amp;&amp;&#10;            a1->strAction == a2->strAction)&#10;        {&#10;          Py_RETURN_TRUE;&#10;        }&#10;        else&#10;        {&#10;          Py_RETURN_FALSE;&#10;        }&#10;      }&#10;      else&#10;      {&#10;        // for backwards compatability in python scripts&#10;        PyObject* o1 = PyLong_FromLong(a1->id);&#10;        return PyObject_RichCompare(o1, obj2, method);&#10;      }&#10;    }&#10;    Py_INCREF(Py_NotImplemented);&#10;    return Py_NotImplemented;&#10;  }" id="15264" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="15265" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="15266" addr="0x7f99f1de6c90" />
+                        <constructor id="15255" addr="0x7fca468fa330" >
+                            <attributelist id="15256" addr="0x7fca468fa330" >
+                                <attribute name="value" value="default" id="15257" addr="0x7fca46934c90" />
+                                <attribute name="name" value="Action" id="15258" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="15259" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468fa1d0" id="15260" addr="0x7fca468fa1d0" />
+                                <attribute name="sym_name" value="Action" id="15261" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="15262" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="15263" addr="0x7fca46934c90" />
+                                <attribute name="code" value="{ XBMC_TRACE;&#10;    if (method == Py_EQ)&#10;    {&#10;      XBMCAddon::xbmcgui::Action* a1 = (Action*)retrieveApiInstance(obj1,&amp;TyXBMCAddon_xbmcgui_Action_Type,&quot;rcmp&quot;,&quot;XBMCAddon::xbmcgui::Action&quot;);&#10;      if (PyObject_TypeCheck(obj2, &amp;(TyXBMCAddon_xbmcgui_Action_Type.pythonType)))&#10;      {&#10;        // both are Action objects&#10;        XBMCAddon::xbmcgui::Action* a2 = (Action*)retrieveApiInstance(obj2,&amp;TyXBMCAddon_xbmcgui_Action_Type,&quot;rcmp&quot;,&quot;XBMCAddon::xbmcgui::Action&quot;);&#10;&#10;        if (a1->id == a2->id &amp;&amp;&#10;            a1->buttonCode == a2->buttonCode &amp;&amp;&#10;            a1->fAmount1 == a2->fAmount1 &amp;&amp;&#10;            a1->fAmount2 == a2->fAmount2 &amp;&amp;&#10;            a1->fRepeat == a2->fRepeat &amp;&amp;&#10;            a1->strAction == a2->strAction)&#10;        {&#10;          Py_RETURN_TRUE;&#10;        }&#10;        else&#10;        {&#10;          Py_RETURN_FALSE;&#10;        }&#10;      }&#10;      else&#10;      {&#10;        // for backwards compatability in python scripts&#10;        PyObject* o1 = PyLong_FromLong(a1->id);&#10;        return PyObject_RichCompare(o1, obj2, method);&#10;      }&#10;    }&#10;    Py_INCREF(Py_NotImplemented);&#10;    return Py_NotImplemented;&#10;  }" id="15264" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="15265" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="15266" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <cdecl id="15267" addr="0x7f99f1dac4f0" >
-                            <attributelist id="15268" addr="0x7f99f1dac4f0" >
-                                <attribute name="name" value="getId" id="15269" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="15270" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1dac1d0" id="15271" addr="0x7f99f1dac1d0" />
-                                <attribute name="kind" value="function" id="15272" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getId" id="15273" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="15274" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="15275" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="long" id="15276" addr="0x7f99f1de6c90" />
-                                <attribute name="code" value="{ XBMC_TRACE; return id; }" id="15277" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="15278" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="15279" addr="0x7f99f1dac6d0" >
-                            <attributelist id="15280" addr="0x7f99f1dac6d0" >
-                                <attribute name="name" value="getButtonCode" id="15281" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="15282" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1dac1d0" id="15283" addr="0x7f99f1dac1d0" />
-                                <attribute name="kind" value="function" id="15284" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getButtonCode" id="15285" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="15286" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="15287" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="long" id="15288" addr="0x7f99f1de6c90" />
-                                <attribute name="code" value="{ XBMC_TRACE; return buttonCode; }" id="15289" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="15290" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="15291" addr="0x7f99f1dac8b0" >
-                            <attributelist id="15292" addr="0x7f99f1dac8b0" >
-                                <attribute name="name" value="getAmount1" id="15293" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="15294" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1dac1d0" id="15295" addr="0x7f99f1dac1d0" />
-                                <attribute name="kind" value="function" id="15296" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getAmount1" id="15297" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="15298" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="15299" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="float" id="15300" addr="0x7f99f1de6c90" />
-                                <attribute name="code" value="{ XBMC_TRACE; return fAmount1; }" id="15301" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="15302" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="15303" addr="0x7f99f1daca90" >
-                            <attributelist id="15304" addr="0x7f99f1daca90" >
-                                <attribute name="ismember" value="1" id="15305" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getAmount2" id="15306" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="getAmount2" id="15307" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="15308" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="15309" addr="0x7f99f1de6c90" />
-                                <attribute name="code" value="{ XBMC_TRACE; return fAmount2; }" id="15310" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="15311" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="float" id="15312" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1dac1d0" id="15313" addr="0x7f99f1dac1d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="15314" addr="0x7f99f1de6c90" />
+                        <cdecl id="15267" addr="0x7fca468fa4f0" >
+                            <attributelist id="15268" addr="0x7fca468fa4f0" >
+                                <attribute name="name" value="getId" id="15269" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="15270" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468fa1d0" id="15271" addr="0x7fca468fa1d0" />
+                                <attribute name="kind" value="function" id="15272" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getId" id="15273" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="15274" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="15275" addr="0x7fca46934c90" />
+                                <attribute name="type" value="long" id="15276" addr="0x7fca46934c90" />
+                                <attribute name="code" value="{ XBMC_TRACE; return id; }" id="15277" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="15278" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="15279" addr="0x7fca468fa6d0" >
+                            <attributelist id="15280" addr="0x7fca468fa6d0" >
+                                <attribute name="name" value="getButtonCode" id="15281" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="15282" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468fa1d0" id="15283" addr="0x7fca468fa1d0" />
+                                <attribute name="kind" value="function" id="15284" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getButtonCode" id="15285" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="15286" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="15287" addr="0x7fca46934c90" />
+                                <attribute name="type" value="long" id="15288" addr="0x7fca46934c90" />
+                                <attribute name="code" value="{ XBMC_TRACE; return buttonCode; }" id="15289" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="15290" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="15291" addr="0x7fca468fa8b0" >
+                            <attributelist id="15292" addr="0x7fca468fa8b0" >
+                                <attribute name="name" value="getAmount1" id="15293" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="15294" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468fa1d0" id="15295" addr="0x7fca468fa1d0" />
+                                <attribute name="kind" value="function" id="15296" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getAmount1" id="15297" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="15298" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="15299" addr="0x7fca46934c90" />
+                                <attribute name="type" value="float" id="15300" addr="0x7fca46934c90" />
+                                <attribute name="code" value="{ XBMC_TRACE; return fAmount1; }" id="15301" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="15302" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="15303" addr="0x7fca468faa90" >
+                            <attributelist id="15304" addr="0x7fca468faa90" >
+                                <attribute name="ismember" value="1" id="15305" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getAmount2" id="15306" addr="0x7fca46934c90" />
+                                <attribute name="name" value="getAmount2" id="15307" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="15308" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="15309" addr="0x7fca46934c90" />
+                                <attribute name="code" value="{ XBMC_TRACE; return fAmount2; }" id="15310" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="15311" addr="0x7fca46934c90" />
+                                <attribute name="type" value="float" id="15312" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468fa1d0" id="15313" addr="0x7fca468fa1d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="15314" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
                     </class >
-                    <class id="15315" addr="0x7f99f1dacd70" >
-                        <attributelist id="15316" addr="0x7f99f1dacd70" >
-                            <attribute name="name" value="XBMCAddon::xbmcgui::Window" id="15317" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="15318" addr="0x7f99f1e40fb0" />
-                            <attribute name="symtab" value="0x7f99f1daced0" id="15319" addr="0x7f99f1daced0" />
-                            <attribute name="allows_typedef" value="1" id="15320" addr="0x7f99f1de6c90" />
-                            <attribute name="typepass_visit" value="1" id="15321" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_visit" value="1" id="15322" addr="0x7f99f1de6c90" />
-                            <attribute name="kind" value="class" id="15323" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_name" value="Window" id="15324" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_default_constructor" value="1" id="15325" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_has_constructor" value="1" id="15326" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_public_constructor" value="1" id="15327" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_has_destructor" value="1" id="15328" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_default_destructor" value="1" id="15329" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_copy_constructor" value="1" id="15330" addr="0x7f99f1de6c90" />
-                            <attribute name="privatebaselist" value="0x7f99f1dacd50" id="15331" addr="0x7f99f1dacd50" />
-                            <attribute name="protectedbaselist" value="0x7f99f1dacd30" id="15332" addr="0x7f99f1dacd30" />
-                            <baselist id="15333" addr="0x7f99f1dacd10" >
-                                <base name="AddonCallback" id="15334" addr="0x7f99f1dacc90" />
+                    <class id="15315" addr="0x7fca468fad70" >
+                        <attributelist id="15316" addr="0x7fca468fad70" >
+                            <attribute name="name" value="XBMCAddon::xbmcgui::Window" id="15317" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="15318" addr="0x7fca4698efb0" />
+                            <attribute name="symtab" value="0x7fca468faed0" id="15319" addr="0x7fca468faed0" />
+                            <attribute name="allows_typedef" value="1" id="15320" addr="0x7fca46934c90" />
+                            <attribute name="typepass_visit" value="1" id="15321" addr="0x7fca46934c90" />
+                            <attribute name="allocate_visit" value="1" id="15322" addr="0x7fca46934c90" />
+                            <attribute name="kind" value="class" id="15323" addr="0x7fca46934c90" />
+                            <attribute name="sym_name" value="Window" id="15324" addr="0x7fca46934c90" />
+                            <attribute name="allocate_default_constructor" value="1" id="15325" addr="0x7fca46934c90" />
+                            <attribute name="allocate_has_constructor" value="1" id="15326" addr="0x7fca46934c90" />
+                            <attribute name="allocate_public_constructor" value="1" id="15327" addr="0x7fca46934c90" />
+                            <attribute name="allocate_has_destructor" value="1" id="15328" addr="0x7fca46934c90" />
+                            <attribute name="allocate_default_destructor" value="1" id="15329" addr="0x7fca46934c90" />
+                            <attribute name="allocate_copy_constructor" value="1" id="15330" addr="0x7fca46934c90" />
+                            <attribute name="privatebaselist" value="0x7fca468fad50" id="15331" addr="0x7fca468fad50" />
+                            <attribute name="protectedbaselist" value="0x7fca468fad30" id="15332" addr="0x7fca468fad30" />
+                            <baselist id="15333" addr="0x7fca468fad10" >
+                                <base name="AddonCallback" id="15334" addr="0x7fca468fac90" />
                             </baselist >
-                            <attribute name="module" value="xbmcgui" id="15335" addr="0x7f99f1e402f0" />
-                            <attribute name="feature_director" value="1" id="15336" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="15337" addr="0x7f99f1de6c90" />
-                            <typescope id="15338" addr="0x7f99f1de21f0" >
-                                <attributelist id="15339" addr="0x7f99f1de21f0" >
-                                    <attribute name="name" value="Window" id="15340" addr="0x7f99f1de6c90" />
-                                    <typetab id="15341" addr="0x7f99f1de2210" >
-                                        <attributelist id="15342" addr="0x7f99f1de2210" >
+                            <attribute name="module" value="xbmcgui" id="15335" addr="0x7fca4698e2f0" />
+                            <attribute name="feature_director" value="1" id="15336" addr="0x7fca46934c90" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="15337" addr="0x7fca46934c90" />
+                            <typescope id="15338" addr="0x7fca469301f0" >
+                                <attributelist id="15339" addr="0x7fca469301f0" >
+                                    <attribute name="name" value="Window" id="15340" addr="0x7fca46934c90" />
+                                    <typetab id="15341" addr="0x7fca46930210" >
+                                        <attributelist id="15342" addr="0x7fca46930210" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f99f1dd2150" id="15343" addr="0x7f99f1dd2150" />
-                                    <attribute name="qname" value="XBMCAddon::xbmcgui::Window" id="15344" addr="0x7f99f1de6c90" />
-                                    <attribute name="symtab" value="0x7f99f1daced0" id="15345" addr="0x7f99f1daced0" />
+                                    <attribute name="parent" value="0x7fca46920150" id="15343" addr="0x7fca46920150" />
+                                    <attribute name="qname" value="XBMCAddon::xbmcgui::Window" id="15344" addr="0x7fca46934c90" />
+                                    <attribute name="symtab" value="0x7fca468faed0" id="15345" addr="0x7fca468faed0" />
                                 </attributelist >
-                                <typescopesitem id="15346" addr="0x7f99f1de2190" >
-                                    <attributelist id="15347" addr="0x7f99f1de2190" >
+                                <typescopesitem id="15346" addr="0x7fca46930190" >
+                                    <attributelist id="15347" addr="0x7fca46930190" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="15348" addr="0x7f99f1de2210" >
-                                    <attributelist id="15349" addr="0x7f99f1de2210" >
+                                <typescopesitem id="15348" addr="0x7fca46930210" >
+                                    <attributelist id="15349" addr="0x7fca46930210" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="15350" addr="0x7f99f1dd2150" >
-                                    <attributelist id="15351" addr="0x7f99f1dd2150" >
-                                        <attribute name="name" value="xbmcgui" id="15352" addr="0x7f99f1de6c90" />
-                                        <typetab id="15353" addr="0x7f99f1dd2170" >
-                                            <attributelist id="15354" addr="0x7f99f1dd2170" >
-                                                <attribute name="InterceptorBase" value="InterceptorBase" id="15355" addr="0x7f99f1de6c90" />
-                                                <attribute name="Dialog" value="Dialog" id="15356" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="15357" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="15358" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlTextBox" value="ControlTextBox" id="15359" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="15360" addr="0x7f99f1de6c90" />
-                                                <attribute name="Window" value="Window" id="15361" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="15362" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlList" value="ControlList" id="15363" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="15364" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlImage" value="ControlImage" id="15365" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlButton" value="ControlButton" id="15366" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlGroup" value="ControlGroup" id="15367" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogBusy" value="DialogBusy" id="15368" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="15369" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSpin" value="ControlSpin" id="15370" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlEdit" value="ControlEdit" id="15371" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="15372" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="15373" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlLabel" value="ControlLabel" id="15374" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlProgress" value="ControlProgress" id="15375" addr="0x7f99f1de6c90" />
-                                                <attribute name="Control" value="Control" id="15376" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSlider" value="ControlSlider" id="15377" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgress" value="DialogProgress" id="15378" addr="0x7f99f1de6c90" />
-                                                <attribute name="Action" value="Action" id="15379" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowDialog" value="WindowDialog" id="15380" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXML" value="WindowXML" id="15381" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItem" value="ListItem" id="15382" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="15383" addr="0x7f99f1de6c90" />
+                                <typescopesitem id="15350" addr="0x7fca46920150" >
+                                    <attributelist id="15351" addr="0x7fca46920150" >
+                                        <attribute name="name" value="xbmcgui" id="15352" addr="0x7fca46934c90" />
+                                        <typetab id="15353" addr="0x7fca46920170" >
+                                            <attributelist id="15354" addr="0x7fca46920170" >
+                                                <attribute name="InterceptorBase" value="InterceptorBase" id="15355" addr="0x7fca46934c90" />
+                                                <attribute name="Dialog" value="Dialog" id="15356" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="15357" addr="0x7fca46934c90" />
+                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="15358" addr="0x7fca46934c90" />
+                                                <attribute name="ControlTextBox" value="ControlTextBox" id="15359" addr="0x7fca46934c90" />
+                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="15360" addr="0x7fca46934c90" />
+                                                <attribute name="Window" value="Window" id="15361" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="15362" addr="0x7fca46934c90" />
+                                                <attribute name="ControlList" value="ControlList" id="15363" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="15364" addr="0x7fca46934c90" />
+                                                <attribute name="ControlImage" value="ControlImage" id="15365" addr="0x7fca46934c90" />
+                                                <attribute name="ControlButton" value="ControlButton" id="15366" addr="0x7fca46934c90" />
+                                                <attribute name="ControlGroup" value="ControlGroup" id="15367" addr="0x7fca46934c90" />
+                                                <attribute name="DialogBusy" value="DialogBusy" id="15368" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="15369" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSpin" value="ControlSpin" id="15370" addr="0x7fca46934c90" />
+                                                <attribute name="ControlEdit" value="ControlEdit" id="15371" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="15372" addr="0x7fca46934c90" />
+                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="15373" addr="0x7fca46934c90" />
+                                                <attribute name="ControlLabel" value="ControlLabel" id="15374" addr="0x7fca46934c90" />
+                                                <attribute name="ControlProgress" value="ControlProgress" id="15375" addr="0x7fca46934c90" />
+                                                <attribute name="Control" value="Control" id="15376" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSlider" value="ControlSlider" id="15377" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgress" value="DialogProgress" id="15378" addr="0x7fca46934c90" />
+                                                <attribute name="Action" value="Action" id="15379" addr="0x7fca46934c90" />
+                                                <attribute name="WindowDialog" value="WindowDialog" id="15380" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXML" value="WindowXML" id="15381" addr="0x7fca46934c90" />
+                                                <attribute name="ListItem" value="ListItem" id="15382" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="15383" addr="0x7fca46934c90" />
                                             </attributelist >
-                                            <typetabsitem id="15384" addr="0x7f99f1de1dd0" >
-                                                <attributelist id="15385" addr="0x7f99f1de1dd0" >
+                                            <typetabsitem id="15384" addr="0x7fca4692fdd0" >
+                                                <attributelist id="15385" addr="0x7fca4692fdd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15386" addr="0x7f99f1dde790" >
-                                                <attributelist id="15387" addr="0x7f99f1dde790" >
+                                            <typetabsitem id="15386" addr="0x7fca4692c790" >
+                                                <attributelist id="15387" addr="0x7fca4692c790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15388" addr="0x7f99f1de3f10" >
-                                                <attributelist id="15389" addr="0x7f99f1de3f10" >
+                                            <typetabsitem id="15388" addr="0x7fca46931f10" >
+                                                <attributelist id="15389" addr="0x7fca46931f10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15390" addr="0x7f99f1dd67b0" >
-                                                <attributelist id="15391" addr="0x7f99f1dd67b0" >
+                                            <typetabsitem id="15390" addr="0x7fca469247b0" >
+                                                <attributelist id="15391" addr="0x7fca469247b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15392" addr="0x7f99f1ddafd0" >
-                                                <attributelist id="15393" addr="0x7f99f1ddafd0" >
+                                            <typetabsitem id="15392" addr="0x7fca46928fd0" >
+                                                <attributelist id="15393" addr="0x7fca46928fd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15394" addr="0x7f99f1ddd430" >
-                                                <attributelist id="15395" addr="0x7f99f1ddd430" >
+                                            <typetabsitem id="15394" addr="0x7fca4692b430" >
+                                                <attributelist id="15395" addr="0x7fca4692b430" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15396" addr="0x7f99f1de2130" >
-                                                <attributelist id="15397" addr="0x7f99f1de2130" >
+                                            <typetabsitem id="15396" addr="0x7fca46930130" >
+                                                <attributelist id="15397" addr="0x7fca46930130" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15398" addr="0x7f99f1dd2f50" >
-                                                <attributelist id="15399" addr="0x7f99f1dd2f50" >
+                                            <typetabsitem id="15398" addr="0x7fca46920f50" >
+                                                <attributelist id="15399" addr="0x7fca46920f50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15400" addr="0x7f99f1dd9650" >
-                                                <attributelist id="15401" addr="0x7f99f1dd9650" >
+                                            <typetabsitem id="15400" addr="0x7fca46927650" >
+                                                <attributelist id="15401" addr="0x7fca46927650" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15402" addr="0x7f99f1de3390" >
-                                                <attributelist id="15403" addr="0x7f99f1de3390" >
+                                            <typetabsitem id="15402" addr="0x7fca46931390" >
+                                                <attributelist id="15403" addr="0x7fca46931390" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15404" addr="0x7f99f1ddb7b0" >
-                                                <attributelist id="15405" addr="0x7f99f1ddb7b0" >
+                                            <typetabsitem id="15404" addr="0x7fca469297b0" >
+                                                <attributelist id="15405" addr="0x7fca469297b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15406" addr="0x7f99f1ddc4b0" >
-                                                <attributelist id="15407" addr="0x7f99f1ddc4b0" >
+                                            <typetabsitem id="15406" addr="0x7fca4692a4b0" >
+                                                <attributelist id="15407" addr="0x7fca4692a4b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15408" addr="0x7f99f1ddcf90" >
-                                                <attributelist id="15409" addr="0x7f99f1ddcf90" >
+                                            <typetabsitem id="15408" addr="0x7fca4692af90" >
+                                                <attributelist id="15409" addr="0x7fca4692af90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15410" addr="0x7f99f1de11b0" >
-                                                <attributelist id="15411" addr="0x7f99f1de11b0" >
+                                            <typetabsitem id="15410" addr="0x7fca4692f1b0" >
+                                                <attributelist id="15411" addr="0x7fca4692f1b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15412" addr="0x7f99f1de15b0" >
-                                                <attributelist id="15413" addr="0x7f99f1de15b0" >
+                                            <typetabsitem id="15412" addr="0x7fca4692f5b0" >
+                                                <attributelist id="15413" addr="0x7fca4692f5b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15414" addr="0x7f99f1dd77f0" >
-                                                <attributelist id="15415" addr="0x7f99f1dd77f0" >
+                                            <typetabsitem id="15414" addr="0x7fca469257f0" >
+                                                <attributelist id="15415" addr="0x7fca469257f0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15416" addr="0x7f99f1dd8b30" >
-                                                <attributelist id="15417" addr="0x7f99f1dd8b30" >
+                                            <typetabsitem id="15416" addr="0x7fca46926b30" >
+                                                <attributelist id="15417" addr="0x7fca46926b30" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15418" addr="0x7f99f1dd2c50" >
-                                                <attributelist id="15419" addr="0x7f99f1dd2c50" >
+                                            <typetabsitem id="15418" addr="0x7fca46920c50" >
+                                                <attributelist id="15419" addr="0x7fca46920c50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15420" addr="0x7f99f1dda790" >
-                                                <attributelist id="15421" addr="0x7f99f1dda790" >
+                                            <typetabsitem id="15420" addr="0x7fca46928790" >
+                                                <attributelist id="15421" addr="0x7fca46928790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15422" addr="0x7f99f1dd8030" >
-                                                <attributelist id="15423" addr="0x7f99f1dd8030" >
+                                            <typetabsitem id="15422" addr="0x7fca46926030" >
+                                                <attributelist id="15423" addr="0x7fca46926030" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15424" addr="0x7f99f1ddbe10" >
-                                                <attributelist id="15425" addr="0x7f99f1ddbe10" >
+                                            <typetabsitem id="15424" addr="0x7fca46929e10" >
+                                                <attributelist id="15425" addr="0x7fca46929e10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15426" addr="0x7f99f1dd6b10" >
-                                                <attributelist id="15427" addr="0x7f99f1dd6b10" >
+                                            <typetabsitem id="15426" addr="0x7fca46924b10" >
+                                                <attributelist id="15427" addr="0x7fca46924b10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15428" addr="0x7f99f1dddf90" >
-                                                <attributelist id="15429" addr="0x7f99f1dddf90" >
+                                            <typetabsitem id="15428" addr="0x7fca4692bf90" >
+                                                <attributelist id="15429" addr="0x7fca4692bf90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15430" addr="0x7f99f1de0530" >
-                                                <attributelist id="15431" addr="0x7f99f1de0530" >
+                                            <typetabsitem id="15430" addr="0x7fca4692e530" >
+                                                <attributelist id="15431" addr="0x7fca4692e530" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15432" addr="0x7f99f1de1e50" >
-                                                <attributelist id="15433" addr="0x7f99f1de1e50" >
+                                            <typetabsitem id="15432" addr="0x7fca4692fe50" >
+                                                <attributelist id="15433" addr="0x7fca4692fe50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15434" addr="0x7f99f1de2d90" >
-                                                <attributelist id="15435" addr="0x7f99f1de2d90" >
+                                            <typetabsitem id="15434" addr="0x7fca46930d90" >
+                                                <attributelist id="15435" addr="0x7fca46930d90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15436" addr="0x7f99f1de3410" >
-                                                <attributelist id="15437" addr="0x7f99f1de3410" >
+                                            <typetabsitem id="15436" addr="0x7fca46931410" >
+                                                <attributelist id="15437" addr="0x7fca46931410" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15438" addr="0x7f99f1dd3590" >
-                                                <attributelist id="15439" addr="0x7f99f1dd3590" >
+                                            <typetabsitem id="15438" addr="0x7fca46921590" >
+                                                <attributelist id="15439" addr="0x7fca46921590" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15440" addr="0x7f99f1dd3390" >
-                                                <attributelist id="15441" addr="0x7f99f1dd3390" >
+                                            <typetabsitem id="15440" addr="0x7fca46921390" >
+                                                <attributelist id="15441" addr="0x7fca46921390" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7f99f1dd1d70" id="15442" addr="0x7f99f1dd1d70" />
-                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="15443" addr="0x7f99f1de6c90" />
-                                        <attribute name="symtab" value="0x7f99f1e40fb0" id="15444" addr="0x7f99f1e40fb0" />
+                                        <attribute name="parent" value="0x7fca4691fd70" id="15442" addr="0x7fca4691fd70" />
+                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="15443" addr="0x7fca46934c90" />
+                                        <attribute name="symtab" value="0x7fca4698efb0" id="15444" addr="0x7fca4698efb0" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="15445" addr="0x7f99f1de2230" >
-                                    <attributelist id="15446" addr="0x7f99f1de2230" >
+                                <typescopesitem id="15445" addr="0x7fca46930230" >
+                                    <attributelist id="15446" addr="0x7fca46930230" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="15447" addr="0x7f99f1daced0" >
-                                    <attributelist id="15448" addr="0x7f99f1daced0" >
-                                        <attribute name="name" value="Window" id="15449" addr="0x7f99f1de6c90" />
-                                        <attribute name="csymtab" value="0x7f99f1dacef0" id="15450" addr="0x7f99f1dacef0" />
-                                        <attribute name="symtab" value="0x7f99f1dace90" id="15451" addr="0x7f99f1dace90" />
+                                <typescopesitem id="15447" addr="0x7fca468faed0" >
+                                    <attributelist id="15448" addr="0x7fca468faed0" >
+                                        <attribute name="name" value="Window" id="15449" addr="0x7fca46934c90" />
+                                        <attribute name="csymtab" value="0x7fca468faef0" id="15450" addr="0x7fca468faef0" />
+                                        <attribute name="symtab" value="0x7fca468fae90" id="15451" addr="0x7fca468fae90" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <cdecl id="15452" addr="0x7f99f1dad050" >
-                            <attributelist id="15453" addr="0x7f99f1dad050" >
-                                <attribute name="ismember" value="1" id="15454" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="isDisposed" id="15455" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="" id="15456" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="private" id="15457" addr="0x7f99f1de6c90" />
-                                <attribute name="value" value="false" id="15458" addr="0x7f99f1de6c90" />
-                                <attribute name="valuetype" value="bool" id="15459" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="variable" id="15460" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="bool" id="15461" addr="0x7f99f1de6c90" />
-                                <attribute name="hasvalue" value="1" id="15462" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1daced0" id="15463" addr="0x7f99f1daced0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="15464" addr="0x7f99f1dad550" >
-                            <attributelist id="15465" addr="0x7f99f1dad550" >
-                                <attribute name="ismember" value="1" id="15466" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="doAddControl" id="15467" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(p.XBMCAddon::xbmcgui::Control,p.CCriticalSection,bool)." id="15468" addr="0x7f99f1de6c90" />
-                                <parmlist id="15469" addr="0x7f99f1dad270" >
+                        <cdecl id="15452" addr="0x7fca468fb050" >
+                            <attributelist id="15453" addr="0x7fca468fb050" >
+                                <attribute name="ismember" value="1" id="15454" addr="0x7fca46934c90" />
+                                <attribute name="name" value="isDisposed" id="15455" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="" id="15456" addr="0x7fca46934c90" />
+                                <attribute name="access" value="private" id="15457" addr="0x7fca46934c90" />
+                                <attribute name="value" value="false" id="15458" addr="0x7fca46934c90" />
+                                <attribute name="valuetype" value="bool" id="15459" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="variable" id="15460" addr="0x7fca46934c90" />
+                                <attribute name="type" value="bool" id="15461" addr="0x7fca46934c90" />
+                                <attribute name="hasvalue" value="1" id="15462" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468faed0" id="15463" addr="0x7fca468faed0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="15464" addr="0x7fca468fb550" >
+                            <attributelist id="15465" addr="0x7fca468fb550" >
+                                <attribute name="ismember" value="1" id="15466" addr="0x7fca46934c90" />
+                                <attribute name="name" value="doAddControl" id="15467" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(p.XBMCAddon::xbmcgui::Control,p.CCriticalSection,bool)." id="15468" addr="0x7fca46934c90" />
+                                <parmlist id="15469" addr="0x7fca468fb270" >
                                     <parm id="15470">
-                                        <attributelist id="15471" addr="0x7f99f1dad270" >
-                                            <attribute name="name" value="pControl" id="15472" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.XBMCAddon::xbmcgui::Control" id="15473" addr="0x7f99f1de6c90" />
+                                        <attributelist id="15471" addr="0x7fca468fb270" >
+                                            <attribute name="name" value="pControl" id="15472" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.XBMCAddon::xbmcgui::Control" id="15473" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="15474">
-                                        <attributelist id="15475" addr="0x7f99f1dad390" >
-                                            <attribute name="name" value="gcontext" id="15476" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.CCriticalSection" id="15477" addr="0x7f99f1de6c90" />
+                                        <attributelist id="15475" addr="0x7fca468fb390" >
+                                            <attribute name="name" value="gcontext" id="15476" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.CCriticalSection" id="15477" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="15478">
-                                        <attributelist id="15479" addr="0x7f99f1dad490" >
-                                            <attribute name="name" value="wait" id="15480" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="15481" addr="0x7f99f1de6c90" />
+                                        <attributelist id="15479" addr="0x7fca468fb490" >
+                                            <attribute name="name" value="wait" id="15480" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="15481" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="access" value="private" id="15482" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="15483" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="void" id="15484" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1daced0" id="15485" addr="0x7f99f1daced0" />
+                                <attribute name="access" value="private" id="15482" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="15483" addr="0x7fca46934c90" />
+                                <attribute name="type" value="void" id="15484" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468faed0" id="15485" addr="0x7fca468faed0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="15486" addr="0x7f99f1dada10" >
-                            <attributelist id="15487" addr="0x7f99f1dada10" >
-                                <attribute name="ismember" value="1" id="15488" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="doRemoveControl" id="15489" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(p.XBMCAddon::xbmcgui::Control,p.CCriticalSection,bool)." id="15490" addr="0x7f99f1de6c90" />
-                                <parmlist id="15491" addr="0x7f99f1dad730" >
+                        <cdecl id="15486" addr="0x7fca468fba10" >
+                            <attributelist id="15487" addr="0x7fca468fba10" >
+                                <attribute name="ismember" value="1" id="15488" addr="0x7fca46934c90" />
+                                <attribute name="name" value="doRemoveControl" id="15489" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(p.XBMCAddon::xbmcgui::Control,p.CCriticalSection,bool)." id="15490" addr="0x7fca46934c90" />
+                                <parmlist id="15491" addr="0x7fca468fb730" >
                                     <parm id="15492">
-                                        <attributelist id="15493" addr="0x7f99f1dad730" >
-                                            <attribute name="name" value="pControl" id="15494" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.XBMCAddon::xbmcgui::Control" id="15495" addr="0x7f99f1de6c90" />
+                                        <attributelist id="15493" addr="0x7fca468fb730" >
+                                            <attribute name="name" value="pControl" id="15494" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.XBMCAddon::xbmcgui::Control" id="15495" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="15496">
-                                        <attributelist id="15497" addr="0x7f99f1dad850" >
-                                            <attribute name="name" value="gcontext" id="15498" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.CCriticalSection" id="15499" addr="0x7f99f1de6c90" />
+                                        <attributelist id="15497" addr="0x7fca468fb850" >
+                                            <attribute name="name" value="gcontext" id="15498" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.CCriticalSection" id="15499" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="15500">
-                                        <attributelist id="15501" addr="0x7f99f1dad950" >
-                                            <attribute name="name" value="wait" id="15502" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="15503" addr="0x7f99f1de6c90" />
+                                        <attributelist id="15501" addr="0x7fca468fb950" >
+                                            <attribute name="name" value="wait" id="15502" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="15503" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="access" value="private" id="15504" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="15505" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="void" id="15506" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1daced0" id="15507" addr="0x7f99f1daced0" />
+                                <attribute name="access" value="private" id="15504" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="15505" addr="0x7fca46934c90" />
+                                <attribute name="type" value="void" id="15506" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468faed0" id="15507" addr="0x7fca468faed0" />
                             </attributelist >
                          
                         </cdecl >
-                        <access id="15508" addr="0x7f99f1dadb30" >
-                            <attributelist id="15509" addr="0x7f99f1dadb30" >
-                                <attribute name="kind" value="protected" id="15510" addr="0x7f99f1de6c90" />
+                        <access id="15508" addr="0x7fca468fbb30" >
+                            <attributelist id="15509" addr="0x7fca468fbb30" >
+                                <attribute name="kind" value="protected" id="15510" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </access >
-                        <access id="15511" addr="0x7f99f1dadb10" >
-                            <attributelist id="15512" addr="0x7f99f1dadb10" >
-                                <attribute name="kind" value="public" id="15513" addr="0x7f99f1de6c90" />
+                        <access id="15511" addr="0x7fca468fbb10" >
+                            <attributelist id="15512" addr="0x7fca468fbb10" >
+                                <attribute name="kind" value="public" id="15513" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="15514" addr="0x7f99f1daddb0" >
-                            <attributelist id="15515" addr="0x7f99f1daddb0" >
-                                <attribute name="name" value="Window" id="15516" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="15517" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1daced0" id="15518" addr="0x7f99f1daced0" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1dadeb0" id="15519" addr="0x7f99f1dadeb0" />
-                                <attribute name="sym_name" value="Window" id="15520" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1dadeb0" id="15521" addr="0x7f99f1dadeb0" />
-                                <attribute name="decl" value="f(int)." id="15522" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="15523" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_director" value="1" id="15524" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_python_nokwds" value="true" id="15525" addr="0x7f99f1de6c90" />
-                                <parmlist id="15526" addr="0x7f99f1dadcf0" >
+                        <constructor id="15514" addr="0x7fca468fbdb0" >
+                            <attributelist id="15515" addr="0x7fca468fbdb0" >
+                                <attribute name="name" value="Window" id="15516" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="15517" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468faed0" id="15518" addr="0x7fca468faed0" />
+                                <attribute name="csym_nextSibling" value="0x7fca468fbeb0" id="15519" addr="0x7fca468fbeb0" />
+                                <attribute name="sym_name" value="Window" id="15520" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca468fbeb0" id="15521" addr="0x7fca468fbeb0" />
+                                <attribute name="decl" value="f(int)." id="15522" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="15523" addr="0x7fca46934c90" />
+                                <attribute name="feature_director" value="1" id="15524" addr="0x7fca46934c90" />
+                                <attribute name="feature_python_nokwds" value="true" id="15525" addr="0x7fca46934c90" />
+                                <parmlist id="15526" addr="0x7fca468fbcf0" >
                                     <parm id="15527">
-                                        <attributelist id="15528" addr="0x7f99f1dadcf0" >
-                                            <attribute name="name" value="existingWindowId" id="15529" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="-1" id="15530" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="15531" addr="0x7f99f1de6c90" />
+                                        <attributelist id="15528" addr="0x7fca468fbcf0" >
+                                            <attribute name="name" value="existingWindowId" id="15529" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="-1" id="15530" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="15531" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overloaded" value="0x7f99f1daddb0" id="15532" addr="0x7f99f1daddb0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="15533" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="explicit" id="15534" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="15535" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468fbdb0" id="15532" addr="0x7fca468fbdb0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="15533" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="explicit" id="15534" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="15535" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="15536" addr="0x7f99f1dadeb0" >
-                            <attributelist id="15537" addr="0x7f99f1dadeb0" >
-                                <attribute name="name" value="Window" id="15538" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="15539" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1daced0" id="15540" addr="0x7f99f1daced0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1daddb0" id="15541" addr="0x7f99f1daddb0" />
-                                <attribute name="sym_name" value="Window" id="15542" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="15543" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1daddb0" id="15544" addr="0x7f99f1daddb0" />
-                                <attribute name="access" value="public" id="15545" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_director" value="1" id="15546" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1daddb0" id="15547" addr="0x7f99f1daddb0" />
-                                <attribute name="feature_python_nokwds" value="true" id="15548" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="15549" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="explicit" id="15550" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="15551" addr="0x7f99f1de6c90" />
+                        <constructor id="15536" addr="0x7fca468fbeb0" >
+                            <attributelist id="15537" addr="0x7fca468fbeb0" >
+                                <attribute name="name" value="Window" id="15538" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="15539" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468faed0" id="15540" addr="0x7fca468faed0" />
+                                <attribute name="sym_previousSibling" value="0x7fca468fbdb0" id="15541" addr="0x7fca468fbdb0" />
+                                <attribute name="sym_name" value="Window" id="15542" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="15543" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca468fbdb0" id="15544" addr="0x7fca468fbdb0" />
+                                <attribute name="access" value="public" id="15545" addr="0x7fca46934c90" />
+                                <attribute name="feature_director" value="1" id="15546" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468fbdb0" id="15547" addr="0x7fca468fbdb0" />
+                                <attribute name="feature_python_nokwds" value="true" id="15548" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="15549" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="explicit" id="15550" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="15551" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <destructor id="15552" addr="0x7f99f1dae0d0" >
-                            <attributelist id="15553" addr="0x7f99f1dae0d0" >
-                                <attribute name="ismember" value="1" id="15554" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="~Window" id="15555" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="~Window" id="15556" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="15557" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="15558" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1daced0" id="15559" addr="0x7f99f1daced0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="15560" addr="0x7f99f1de6c90" />
+                        <destructor id="15552" addr="0x7fca468fc0d0" >
+                            <attributelist id="15553" addr="0x7fca468fc0d0" >
+                                <attribute name="ismember" value="1" id="15554" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="~Window" id="15555" addr="0x7fca46934c90" />
+                                <attribute name="name" value="~Window" id="15556" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="15557" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="15558" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468faed0" id="15559" addr="0x7fca468faed0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="15560" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </destructor >
-                        <cdecl id="15561" addr="0x7f99f1dae390" >
-                            <attributelist id="15562" addr="0x7f99f1dae390" >
-                                <attribute name="name" value="onAction" id="15563" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="15564" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1daced0" id="15565" addr="0x7f99f1daced0" />
-                                <attribute name="kind" value="function" id="15566" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="onAction" id="15567" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(p.XBMCAddon::xbmcgui::Action)." id="15568" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="15569" addr="0x7f99f1de6c90" />
-                                <parmlist id="15570" addr="0x7f99f1dae2d0" >
+                        <cdecl id="15561" addr="0x7fca468fc390" >
+                            <attributelist id="15562" addr="0x7fca468fc390" >
+                                <attribute name="name" value="onAction" id="15563" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="15564" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468faed0" id="15565" addr="0x7fca468faed0" />
+                                <attribute name="kind" value="function" id="15566" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="onAction" id="15567" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(p.XBMCAddon::xbmcgui::Action)." id="15568" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="15569" addr="0x7fca46934c90" />
+                                <parmlist id="15570" addr="0x7fca468fc2d0" >
                                     <parm id="15571">
-                                        <attributelist id="15572" addr="0x7f99f1dae2d0" >
-                                            <attribute name="name" value="action" id="15573" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.XBMCAddon::xbmcgui::Action" id="15574" addr="0x7f99f1de6c90" />
+                                        <attributelist id="15572" addr="0x7fca468fc2d0" >
+                                            <attribute name="name" value="action" id="15573" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.XBMCAddon::xbmcgui::Action" id="15574" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="15575" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="15576" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="15577" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="15575" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="15576" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="15577" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="15578" addr="0x7f99f1dae6b0" >
-                            <attributelist id="15579" addr="0x7f99f1dae6b0" >
-                                <attribute name="name" value="onControl" id="15580" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="15581" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1daced0" id="15582" addr="0x7f99f1daced0" />
-                                <attribute name="kind" value="function" id="15583" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="onControl" id="15584" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(p.XBMCAddon::xbmcgui::Control)." id="15585" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="15586" addr="0x7f99f1de6c90" />
-                                <parmlist id="15587" addr="0x7f99f1dae5f0" >
+                        <cdecl id="15578" addr="0x7fca468fc6b0" >
+                            <attributelist id="15579" addr="0x7fca468fc6b0" >
+                                <attribute name="name" value="onControl" id="15580" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="15581" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468faed0" id="15582" addr="0x7fca468faed0" />
+                                <attribute name="kind" value="function" id="15583" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="onControl" id="15584" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(p.XBMCAddon::xbmcgui::Control)." id="15585" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="15586" addr="0x7fca46934c90" />
+                                <parmlist id="15587" addr="0x7fca468fc5f0" >
                                     <parm id="15588">
-                                        <attributelist id="15589" addr="0x7f99f1dae5f0" >
-                                            <attribute name="name" value="control" id="15590" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.XBMCAddon::xbmcgui::Control" id="15591" addr="0x7f99f1de6c90" />
+                                        <attributelist id="15589" addr="0x7fca468fc5f0" >
+                                            <attribute name="name" value="control" id="15590" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.XBMCAddon::xbmcgui::Control" id="15591" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="15592" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="15593" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="15594" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="15592" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="15593" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="15594" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="15595" addr="0x7f99f1dae9b0" >
-                            <attributelist id="15596" addr="0x7f99f1dae9b0" >
-                                <attribute name="name" value="onClick" id="15597" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="15598" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1daced0" id="15599" addr="0x7f99f1daced0" />
-                                <attribute name="kind" value="function" id="15600" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="onClick" id="15601" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(int)." id="15602" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="15603" addr="0x7f99f1de6c90" />
-                                <parmlist id="15604" addr="0x7f99f1dae8f0" >
+                        <cdecl id="15595" addr="0x7fca468fc9b0" >
+                            <attributelist id="15596" addr="0x7fca468fc9b0" >
+                                <attribute name="name" value="onClick" id="15597" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="15598" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468faed0" id="15599" addr="0x7fca468faed0" />
+                                <attribute name="kind" value="function" id="15600" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="onClick" id="15601" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(int)." id="15602" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="15603" addr="0x7fca46934c90" />
+                                <parmlist id="15604" addr="0x7fca468fc8f0" >
                                     <parm id="15605">
-                                        <attributelist id="15606" addr="0x7f99f1dae8f0" >
-                                            <attribute name="name" value="controlId" id="15607" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="15608" addr="0x7f99f1de6c90" />
+                                        <attributelist id="15606" addr="0x7fca468fc8f0" >
+                                            <attribute name="name" value="controlId" id="15607" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="15608" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="15609" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="15610" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="15611" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="15609" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="15610" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="15611" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="15612" addr="0x7f99f1daecb0" >
-                            <attributelist id="15613" addr="0x7f99f1daecb0" >
-                                <attribute name="name" value="onDoubleClick" id="15614" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="15615" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1daced0" id="15616" addr="0x7f99f1daced0" />
-                                <attribute name="kind" value="function" id="15617" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="onDoubleClick" id="15618" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(int)." id="15619" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="15620" addr="0x7f99f1de6c90" />
-                                <parmlist id="15621" addr="0x7f99f1daebf0" >
+                        <cdecl id="15612" addr="0x7fca468fccb0" >
+                            <attributelist id="15613" addr="0x7fca468fccb0" >
+                                <attribute name="name" value="onDoubleClick" id="15614" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="15615" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468faed0" id="15616" addr="0x7fca468faed0" />
+                                <attribute name="kind" value="function" id="15617" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="onDoubleClick" id="15618" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(int)." id="15619" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="15620" addr="0x7fca46934c90" />
+                                <parmlist id="15621" addr="0x7fca468fcbf0" >
                                     <parm id="15622">
-                                        <attributelist id="15623" addr="0x7f99f1daebf0" >
-                                            <attribute name="name" value="controlId" id="15624" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="15625" addr="0x7f99f1de6c90" />
+                                        <attributelist id="15623" addr="0x7fca468fcbf0" >
+                                            <attribute name="name" value="controlId" id="15624" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="15625" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="15626" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="15627" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="15628" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="15626" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="15627" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="15628" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="15629" addr="0x7f99f1daefb0" >
-                            <attributelist id="15630" addr="0x7f99f1daefb0" >
-                                <attribute name="name" value="onFocus" id="15631" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="15632" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1daced0" id="15633" addr="0x7f99f1daced0" />
-                                <attribute name="kind" value="function" id="15634" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="onFocus" id="15635" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(int)." id="15636" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="15637" addr="0x7f99f1de6c90" />
-                                <parmlist id="15638" addr="0x7f99f1daeef0" >
+                        <cdecl id="15629" addr="0x7fca468fcfb0" >
+                            <attributelist id="15630" addr="0x7fca468fcfb0" >
+                                <attribute name="name" value="onFocus" id="15631" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="15632" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468faed0" id="15633" addr="0x7fca468faed0" />
+                                <attribute name="kind" value="function" id="15634" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="onFocus" id="15635" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(int)." id="15636" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="15637" addr="0x7fca46934c90" />
+                                <parmlist id="15638" addr="0x7fca468fcef0" >
                                     <parm id="15639">
-                                        <attributelist id="15640" addr="0x7f99f1daeef0" >
-                                            <attribute name="name" value="controlId" id="15641" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="15642" addr="0x7f99f1de6c90" />
+                                        <attributelist id="15640" addr="0x7fca468fcef0" >
+                                            <attribute name="name" value="controlId" id="15641" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="15642" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="15643" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="15644" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="15645" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="15643" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="15644" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="15645" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="15646" addr="0x7f99f1daf190" >
-                            <attributelist id="15647" addr="0x7f99f1daf190" >
-                                <attribute name="name" value="onInit" id="15648" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="15649" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1daced0" id="15650" addr="0x7f99f1daced0" />
-                                <attribute name="kind" value="function" id="15651" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="onInit" id="15652" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="15653" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="15654" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="void" id="15655" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="15656" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="15657" addr="0x7f99f1de6c90" />
+                        <cdecl id="15646" addr="0x7fca468fd190" >
+                            <attributelist id="15647" addr="0x7fca468fd190" >
+                                <attribute name="name" value="onInit" id="15648" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="15649" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468faed0" id="15650" addr="0x7fca468faed0" />
+                                <attribute name="kind" value="function" id="15651" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="onInit" id="15652" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="15653" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="15654" addr="0x7fca46934c90" />
+                                <attribute name="type" value="void" id="15655" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="15656" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="15657" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="15658" addr="0x7f99f1daf370" >
-                            <attributelist id="15659" addr="0x7f99f1daf370" >
-                                <attribute name="ismember" value="1" id="15660" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="show" id="15661" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="show" id="15662" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="15663" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="15664" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="15665" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="void" id="15666" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1daced0" id="15667" addr="0x7f99f1daced0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="15668" addr="0x7f99f1de6c90" />
+                        <cdecl id="15658" addr="0x7fca468fd370" >
+                            <attributelist id="15659" addr="0x7fca468fd370" >
+                                <attribute name="ismember" value="1" id="15660" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="show" id="15661" addr="0x7fca46934c90" />
+                                <attribute name="name" value="show" id="15662" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="15663" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="15664" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="15665" addr="0x7fca46934c90" />
+                                <attribute name="type" value="void" id="15666" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468faed0" id="15667" addr="0x7fca468faed0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="15668" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="15669" addr="0x7f99f1daf650" >
-                            <attributelist id="15670" addr="0x7f99f1daf650" >
-                                <attribute name="name" value="setFocus" id="15671" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="15672" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1daced0" id="15673" addr="0x7f99f1daced0" />
-                                <attribute name="kind" value="function" id="15674" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setFocus" id="15675" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(p.XBMCAddon::xbmcgui::Control)." id="15676" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="15677" addr="0x7f99f1de6c90" />
-                                <parmlist id="15678" addr="0x7f99f1daf590" >
+                        <cdecl id="15669" addr="0x7fca468fd650" >
+                            <attributelist id="15670" addr="0x7fca468fd650" >
+                                <attribute name="name" value="setFocus" id="15671" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="15672" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468faed0" id="15673" addr="0x7fca468faed0" />
+                                <attribute name="kind" value="function" id="15674" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setFocus" id="15675" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(p.XBMCAddon::xbmcgui::Control)." id="15676" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="15677" addr="0x7fca46934c90" />
+                                <parmlist id="15678" addr="0x7fca468fd590" >
                                     <parm id="15679">
-                                        <attributelist id="15680" addr="0x7f99f1daf590" >
-                                            <attribute name="name" value="pControl" id="15681" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.XBMCAddon::xbmcgui::Control" id="15682" addr="0x7f99f1de6c90" />
+                                        <attributelist id="15680" addr="0x7fca468fd590" >
+                                            <attribute name="name" value="pControl" id="15681" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.XBMCAddon::xbmcgui::Control" id="15682" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="15683" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="15684" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="15683" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="15684" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="15685" addr="0x7f99f1daf930" >
-                            <attributelist id="15686" addr="0x7f99f1daf930" >
-                                <attribute name="name" value="setFocusId" id="15687" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="15688" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1daced0" id="15689" addr="0x7f99f1daced0" />
-                                <attribute name="kind" value="function" id="15690" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setFocusId" id="15691" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(int)." id="15692" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="15693" addr="0x7f99f1de6c90" />
-                                <parmlist id="15694" addr="0x7f99f1daf870" >
+                        <cdecl id="15685" addr="0x7fca468fd930" >
+                            <attributelist id="15686" addr="0x7fca468fd930" >
+                                <attribute name="name" value="setFocusId" id="15687" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="15688" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468faed0" id="15689" addr="0x7fca468faed0" />
+                                <attribute name="kind" value="function" id="15690" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setFocusId" id="15691" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(int)." id="15692" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="15693" addr="0x7fca46934c90" />
+                                <parmlist id="15694" addr="0x7fca468fd870" >
                                     <parm id="15695">
-                                        <attributelist id="15696" addr="0x7f99f1daf870" >
-                                            <attribute name="name" value="iControlId" id="15697" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="15698" addr="0x7f99f1de6c90" />
+                                        <attributelist id="15696" addr="0x7fca468fd870" >
+                                            <attribute name="name" value="iControlId" id="15697" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="15698" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="15699" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="15700" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="15699" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="15700" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="15701" addr="0x7f99f1dafaf0" >
-                            <attributelist id="15702" addr="0x7f99f1dafaf0" >
-                                <attribute name="ismember" value="1" id="15703" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getFocus" id="15704" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="getFocus" id="15705" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f().p." id="15706" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="15707" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="15708" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="XBMCAddon::xbmcgui::Control" id="15709" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1daced0" id="15710" addr="0x7f99f1daced0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="15711" addr="0x7f99f1de6c90" />
+                        <cdecl id="15701" addr="0x7fca468fdaf0" >
+                            <attributelist id="15702" addr="0x7fca468fdaf0" >
+                                <attribute name="ismember" value="1" id="15703" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getFocus" id="15704" addr="0x7fca46934c90" />
+                                <attribute name="name" value="getFocus" id="15705" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f().p." id="15706" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="15707" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="15708" addr="0x7fca46934c90" />
+                                <attribute name="type" value="XBMCAddon::xbmcgui::Control" id="15709" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468faed0" id="15710" addr="0x7fca468faed0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="15711" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="15712" addr="0x7f99f1dafcf0" >
-                            <attributelist id="15713" addr="0x7f99f1dafcf0" >
-                                <attribute name="ismember" value="1" id="15714" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getFocusId" id="15715" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="getFocusId" id="15716" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="15717" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="15718" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="15719" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="long" id="15720" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1daced0" id="15721" addr="0x7f99f1daced0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="15722" addr="0x7f99f1de6c90" />
+                        <cdecl id="15712" addr="0x7fca468fdcf0" >
+                            <attributelist id="15713" addr="0x7fca468fdcf0" >
+                                <attribute name="ismember" value="1" id="15714" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getFocusId" id="15715" addr="0x7fca46934c90" />
+                                <attribute name="name" value="getFocusId" id="15716" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="15717" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="15718" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="15719" addr="0x7fca46934c90" />
+                                <attribute name="type" value="long" id="15720" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468faed0" id="15721" addr="0x7fca468faed0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="15722" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="15723" addr="0x7f99f1daffd0" >
-                            <attributelist id="15724" addr="0x7f99f1daffd0" >
-                                <attribute name="name" value="removeControl" id="15725" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="15726" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1daced0" id="15727" addr="0x7f99f1daced0" />
-                                <attribute name="kind" value="function" id="15728" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="removeControl" id="15729" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(p.XBMCAddon::xbmcgui::Control)." id="15730" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="15731" addr="0x7f99f1de6c90" />
-                                <parmlist id="15732" addr="0x7f99f1daff10" >
+                        <cdecl id="15723" addr="0x7fca468fdfd0" >
+                            <attributelist id="15724" addr="0x7fca468fdfd0" >
+                                <attribute name="name" value="removeControl" id="15725" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="15726" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468faed0" id="15727" addr="0x7fca468faed0" />
+                                <attribute name="kind" value="function" id="15728" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="removeControl" id="15729" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(p.XBMCAddon::xbmcgui::Control)." id="15730" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="15731" addr="0x7fca46934c90" />
+                                <parmlist id="15732" addr="0x7fca468fdf10" >
                                     <parm id="15733">
-                                        <attributelist id="15734" addr="0x7f99f1daff10" >
-                                            <attribute name="name" value="pControl" id="15735" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.XBMCAddon::xbmcgui::Control" id="15736" addr="0x7f99f1de6c90" />
+                                        <attributelist id="15734" addr="0x7fca468fdf10" >
+                                            <attribute name="name" value="pControl" id="15735" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.XBMCAddon::xbmcgui::Control" id="15736" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="15737" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="15738" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="15737" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="15738" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="15739" addr="0x7f99f1db03b0" >
-                            <attributelist id="15740" addr="0x7f99f1db03b0" >
-                                <attribute name="name" value="removeControls" id="15741" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="15742" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1daced0" id="15743" addr="0x7f99f1daced0" />
-                                <attribute name="kind" value="function" id="15744" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="removeControls" id="15745" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(std::vector&lt;(p.XBMCAddon::xbmcgui::Control)>)." id="15746" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="15747" addr="0x7f99f1de6c90" />
-                                <parmlist id="15748" addr="0x7f99f1db02f0" >
+                        <cdecl id="15739" addr="0x7fca468fe3b0" >
+                            <attributelist id="15740" addr="0x7fca468fe3b0" >
+                                <attribute name="name" value="removeControls" id="15741" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="15742" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468faed0" id="15743" addr="0x7fca468faed0" />
+                                <attribute name="kind" value="function" id="15744" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="removeControls" id="15745" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(std::vector&lt;(p.XBMCAddon::xbmcgui::Control)>)." id="15746" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="15747" addr="0x7fca46934c90" />
+                                <parmlist id="15748" addr="0x7fca468fe2f0" >
                                     <parm id="15749">
-                                        <attributelist id="15750" addr="0x7f99f1db02f0" >
-                                            <attribute name="name" value="pControls" id="15751" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="std::vector&lt;(p.XBMCAddon::xbmcgui::Control)>" id="15752" addr="0x7f99f1de6c90" />
+                                        <attributelist id="15750" addr="0x7fca468fe2f0" >
+                                            <attribute name="name" value="pControls" id="15751" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="std::vector&lt;(p.XBMCAddon::xbmcgui::Control)>" id="15752" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="15753" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="15754" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="15753" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="15754" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="15755" addr="0x7f99f1db0590" >
-                            <attributelist id="15756" addr="0x7f99f1db0590" >
-                                <attribute name="ismember" value="1" id="15757" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getHeight" id="15758" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="getHeight" id="15759" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="15760" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="15761" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="15762" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="long" id="15763" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1daced0" id="15764" addr="0x7f99f1daced0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="15765" addr="0x7f99f1de6c90" />
+                        <cdecl id="15755" addr="0x7fca468fe590" >
+                            <attributelist id="15756" addr="0x7fca468fe590" >
+                                <attribute name="ismember" value="1" id="15757" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getHeight" id="15758" addr="0x7fca46934c90" />
+                                <attribute name="name" value="getHeight" id="15759" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="15760" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="15761" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="15762" addr="0x7fca46934c90" />
+                                <attribute name="type" value="long" id="15763" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468faed0" id="15764" addr="0x7fca468faed0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="15765" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="15766" addr="0x7f99f1db0770" >
-                            <attributelist id="15767" addr="0x7f99f1db0770" >
-                                <attribute name="ismember" value="1" id="15768" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getWidth" id="15769" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="getWidth" id="15770" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="15771" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="15772" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="15773" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="long" id="15774" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1daced0" id="15775" addr="0x7f99f1daced0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="15776" addr="0x7f99f1de6c90" />
+                        <cdecl id="15766" addr="0x7fca468fe770" >
+                            <attributelist id="15767" addr="0x7fca468fe770" >
+                                <attribute name="ismember" value="1" id="15768" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getWidth" id="15769" addr="0x7fca46934c90" />
+                                <attribute name="name" value="getWidth" id="15770" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="15771" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="15772" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="15773" addr="0x7fca46934c90" />
+                                <attribute name="type" value="long" id="15774" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468faed0" id="15775" addr="0x7fca468faed0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="15776" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="15777" addr="0x7f99f1db0950" >
-                            <attributelist id="15778" addr="0x7f99f1db0950" >
-                                <attribute name="ismember" value="1" id="15779" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getResolution" id="15780" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="getResolution" id="15781" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="15782" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="15783" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="15784" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="long" id="15785" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1daced0" id="15786" addr="0x7f99f1daced0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="15787" addr="0x7f99f1de6c90" />
+                        <cdecl id="15777" addr="0x7fca468fe950" >
+                            <attributelist id="15778" addr="0x7fca468fe950" >
+                                <attribute name="ismember" value="1" id="15779" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getResolution" id="15780" addr="0x7fca46934c90" />
+                                <attribute name="name" value="getResolution" id="15781" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="15782" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="15783" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="15784" addr="0x7fca46934c90" />
+                                <attribute name="type" value="long" id="15785" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468faed0" id="15786" addr="0x7fca468faed0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="15787" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="15788" addr="0x7f99f1db0c30" >
-                            <attributelist id="15789" addr="0x7f99f1db0c30" >
-                                <attribute name="name" value="setCoordinateResolution" id="15790" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="15791" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1daced0" id="15792" addr="0x7f99f1daced0" />
-                                <attribute name="kind" value="function" id="15793" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setCoordinateResolution" id="15794" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(long)." id="15795" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="15796" addr="0x7f99f1de6c90" />
-                                <parmlist id="15797" addr="0x7f99f1db0b70" >
+                        <cdecl id="15788" addr="0x7fca468fec30" >
+                            <attributelist id="15789" addr="0x7fca468fec30" >
+                                <attribute name="name" value="setCoordinateResolution" id="15790" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="15791" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468faed0" id="15792" addr="0x7fca468faed0" />
+                                <attribute name="kind" value="function" id="15793" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setCoordinateResolution" id="15794" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(long)." id="15795" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="15796" addr="0x7fca46934c90" />
+                                <parmlist id="15797" addr="0x7fca468feb70" >
                                     <parm id="15798">
-                                        <attributelist id="15799" addr="0x7f99f1db0b70" >
-                                            <attribute name="name" value="res" id="15800" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="15801" addr="0x7f99f1de6c90" />
+                                        <attributelist id="15799" addr="0x7fca468feb70" >
+                                            <attribute name="name" value="res" id="15800" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="15801" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="15802" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="15803" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="15802" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="15803" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="15804" addr="0x7f99f1db1070" >
-                            <attributelist id="15805" addr="0x7f99f1db1070" >
-                                <attribute name="name" value="setProperty" id="15806" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="15807" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1daced0" id="15808" addr="0x7f99f1daced0" />
-                                <attribute name="kind" value="function" id="15809" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setProperty" id="15810" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(p.q(const).char,r.q(const).XBMCAddon::String)." id="15811" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="15812" addr="0x7f99f1de6c90" />
-                                <parmlist id="15813" addr="0x7f99f1db0e70" >
+                        <cdecl id="15804" addr="0x7fca468ff070" >
+                            <attributelist id="15805" addr="0x7fca468ff070" >
+                                <attribute name="name" value="setProperty" id="15806" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="15807" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468faed0" id="15808" addr="0x7fca468faed0" />
+                                <attribute name="kind" value="function" id="15809" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setProperty" id="15810" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(p.q(const).char,r.q(const).XBMCAddon::String)." id="15811" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="15812" addr="0x7fca46934c90" />
+                                <parmlist id="15813" addr="0x7fca468fee70" >
                                     <parm id="15814">
-                                        <attributelist id="15815" addr="0x7f99f1db0e70" >
-                                            <attribute name="name" value="key" id="15816" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="15817" addr="0x7f99f1de6c90" />
+                                        <attributelist id="15815" addr="0x7fca468fee70" >
+                                            <attribute name="name" value="key" id="15816" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="15817" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="15818">
-                                        <attributelist id="15819" addr="0x7f99f1db0fb0" >
-                                            <attribute name="name" value="value" id="15820" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="15821" addr="0x7f99f1de6c90" />
+                                        <attributelist id="15819" addr="0x7fca468fefb0" >
+                                            <attribute name="name" value="value" id="15820" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="15821" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="15822" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="15823" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="15822" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="15823" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="15824" addr="0x7f99f1db1390" >
-                            <attributelist id="15825" addr="0x7f99f1db1390" >
-                                <attribute name="name" value="getProperty" id="15826" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="15827" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1daced0" id="15828" addr="0x7f99f1daced0" />
-                                <attribute name="kind" value="function" id="15829" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getProperty" id="15830" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(p.q(const).char)." id="15831" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="15832" addr="0x7f99f1de6c90" />
-                                <parmlist id="15833" addr="0x7f99f1db12d0" >
+                        <cdecl id="15824" addr="0x7fca468ff390" >
+                            <attributelist id="15825" addr="0x7fca468ff390" >
+                                <attribute name="name" value="getProperty" id="15826" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="15827" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468faed0" id="15828" addr="0x7fca468faed0" />
+                                <attribute name="kind" value="function" id="15829" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getProperty" id="15830" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(p.q(const).char)." id="15831" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="15832" addr="0x7fca46934c90" />
+                                <parmlist id="15833" addr="0x7fca468ff2d0" >
                                     <parm id="15834">
-                                        <attributelist id="15835" addr="0x7f99f1db12d0" >
-                                            <attribute name="name" value="key" id="15836" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="15837" addr="0x7f99f1de6c90" />
+                                        <attributelist id="15835" addr="0x7fca468ff2d0" >
+                                            <attribute name="name" value="key" id="15836" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="15837" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="XBMCAddon::String" id="15838" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="15839" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="XBMCAddon::String" id="15838" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="15839" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="15840" addr="0x7f99f1db1690" >
-                            <attributelist id="15841" addr="0x7f99f1db1690" >
-                                <attribute name="name" value="clearProperty" id="15842" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="15843" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1daced0" id="15844" addr="0x7f99f1daced0" />
-                                <attribute name="kind" value="function" id="15845" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="clearProperty" id="15846" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(p.q(const).char)." id="15847" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="15848" addr="0x7f99f1de6c90" />
-                                <parmlist id="15849" addr="0x7f99f1db15d0" >
+                        <cdecl id="15840" addr="0x7fca468ff690" >
+                            <attributelist id="15841" addr="0x7fca468ff690" >
+                                <attribute name="name" value="clearProperty" id="15842" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="15843" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468faed0" id="15844" addr="0x7fca468faed0" />
+                                <attribute name="kind" value="function" id="15845" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="clearProperty" id="15846" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(p.q(const).char)." id="15847" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="15848" addr="0x7fca46934c90" />
+                                <parmlist id="15849" addr="0x7fca468ff5d0" >
                                     <parm id="15850">
-                                        <attributelist id="15851" addr="0x7f99f1db15d0" >
-                                            <attribute name="name" value="key" id="15852" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="15853" addr="0x7f99f1de6c90" />
+                                        <attributelist id="15851" addr="0x7fca468ff5d0" >
+                                            <attribute name="name" value="key" id="15852" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="15853" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="15854" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="15855" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="15854" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="15855" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="15856" addr="0x7f99f1db1850" >
-                            <attributelist id="15857" addr="0x7f99f1db1850" >
-                                <attribute name="ismember" value="1" id="15858" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="clearProperties" id="15859" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="clearProperties" id="15860" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="15861" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="15862" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="15863" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="void" id="15864" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1daced0" id="15865" addr="0x7f99f1daced0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="15866" addr="0x7f99f1de6c90" />
+                        <cdecl id="15856" addr="0x7fca468ff850" >
+                            <attributelist id="15857" addr="0x7fca468ff850" >
+                                <attribute name="ismember" value="1" id="15858" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="clearProperties" id="15859" addr="0x7fca46934c90" />
+                                <attribute name="name" value="clearProperties" id="15860" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="15861" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="15862" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="15863" addr="0x7fca46934c90" />
+                                <attribute name="type" value="void" id="15864" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468faed0" id="15865" addr="0x7fca468faed0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="15866" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="15867" addr="0x7f99f1db1a10" >
-                            <attributelist id="15868" addr="0x7f99f1db1a10" >
-                                <attribute name="ismember" value="1" id="15869" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="close" id="15870" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="close" id="15871" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="15872" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="15873" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="15874" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="void" id="15875" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1daced0" id="15876" addr="0x7f99f1daced0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="15877" addr="0x7f99f1de6c90" />
+                        <cdecl id="15867" addr="0x7fca468ffa10" >
+                            <attributelist id="15868" addr="0x7fca468ffa10" >
+                                <attribute name="ismember" value="1" id="15869" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="close" id="15870" addr="0x7fca46934c90" />
+                                <attribute name="name" value="close" id="15871" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="15872" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="15873" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="15874" addr="0x7fca46934c90" />
+                                <attribute name="type" value="void" id="15875" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468faed0" id="15876" addr="0x7fca468faed0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="15877" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="15878" addr="0x7f99f1db1bd0" >
-                            <attributelist id="15879" addr="0x7f99f1db1bd0" >
-                                <attribute name="ismember" value="1" id="15880" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="doModal" id="15881" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="doModal" id="15882" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="15883" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="15884" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="15885" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="void" id="15886" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1daced0" id="15887" addr="0x7f99f1daced0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="15888" addr="0x7f99f1de6c90" />
+                        <cdecl id="15878" addr="0x7fca468ffbd0" >
+                            <attributelist id="15879" addr="0x7fca468ffbd0" >
+                                <attribute name="ismember" value="1" id="15880" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="doModal" id="15881" addr="0x7fca46934c90" />
+                                <attribute name="name" value="doModal" id="15882" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="15883" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="15884" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="15885" addr="0x7fca46934c90" />
+                                <attribute name="type" value="void" id="15886" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468faed0" id="15887" addr="0x7fca468faed0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="15888" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="15889" addr="0x7f99f1db1eb0" >
-                            <attributelist id="15890" addr="0x7f99f1db1eb0" >
-                                <attribute name="name" value="addControl" id="15891" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="15892" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1daced0" id="15893" addr="0x7f99f1daced0" />
-                                <attribute name="kind" value="function" id="15894" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="addControl" id="15895" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(p.XBMCAddon::xbmcgui::Control)." id="15896" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="15897" addr="0x7f99f1de6c90" />
-                                <parmlist id="15898" addr="0x7f99f1db1df0" >
+                        <cdecl id="15889" addr="0x7fca468ffeb0" >
+                            <attributelist id="15890" addr="0x7fca468ffeb0" >
+                                <attribute name="name" value="addControl" id="15891" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="15892" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468faed0" id="15893" addr="0x7fca468faed0" />
+                                <attribute name="kind" value="function" id="15894" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="addControl" id="15895" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(p.XBMCAddon::xbmcgui::Control)." id="15896" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="15897" addr="0x7fca46934c90" />
+                                <parmlist id="15898" addr="0x7fca468ffdf0" >
                                     <parm id="15899">
-                                        <attributelist id="15900" addr="0x7f99f1db1df0" >
-                                            <attribute name="name" value="pControl" id="15901" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.XBMCAddon::xbmcgui::Control" id="15902" addr="0x7f99f1de6c90" />
+                                        <attributelist id="15900" addr="0x7fca468ffdf0" >
+                                            <attribute name="name" value="pControl" id="15901" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.XBMCAddon::xbmcgui::Control" id="15902" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="15903" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="15904" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="15903" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="15904" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="15905" addr="0x7f99f1db2290" >
-                            <attributelist id="15906" addr="0x7f99f1db2290" >
-                                <attribute name="name" value="addControls" id="15907" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="15908" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1daced0" id="15909" addr="0x7f99f1daced0" />
-                                <attribute name="kind" value="function" id="15910" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="addControls" id="15911" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(std::vector&lt;(p.XBMCAddon::xbmcgui::Control)>)." id="15912" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="15913" addr="0x7f99f1de6c90" />
-                                <parmlist id="15914" addr="0x7f99f1db21d0" >
+                        <cdecl id="15905" addr="0x7fca46900290" >
+                            <attributelist id="15906" addr="0x7fca46900290" >
+                                <attribute name="name" value="addControls" id="15907" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="15908" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468faed0" id="15909" addr="0x7fca468faed0" />
+                                <attribute name="kind" value="function" id="15910" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="addControls" id="15911" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(std::vector&lt;(p.XBMCAddon::xbmcgui::Control)>)." id="15912" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="15913" addr="0x7fca46934c90" />
+                                <parmlist id="15914" addr="0x7fca469001d0" >
                                     <parm id="15915">
-                                        <attributelist id="15916" addr="0x7f99f1db21d0" >
-                                            <attribute name="name" value="pControls" id="15917" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="std::vector&lt;(p.XBMCAddon::xbmcgui::Control)>" id="15918" addr="0x7f99f1de6c90" />
+                                        <attributelist id="15916" addr="0x7fca469001d0" >
+                                            <attribute name="name" value="pControls" id="15917" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="std::vector&lt;(p.XBMCAddon::xbmcgui::Control)>" id="15918" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="15919" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="15920" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="15919" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="15920" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="15921" addr="0x7f99f1db2570" >
-                            <attributelist id="15922" addr="0x7f99f1db2570" >
-                                <attribute name="ismember" value="1" id="15923" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getControl" id="15924" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="getControl" id="15925" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(int).p." id="15926" addr="0x7f99f1de6c90" />
-                                <parmlist id="15927" addr="0x7f99f1db24f0" >
+                        <cdecl id="15921" addr="0x7fca46900570" >
+                            <attributelist id="15922" addr="0x7fca46900570" >
+                                <attribute name="ismember" value="1" id="15923" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getControl" id="15924" addr="0x7fca46934c90" />
+                                <attribute name="name" value="getControl" id="15925" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(int).p." id="15926" addr="0x7fca46934c90" />
+                                <parmlist id="15927" addr="0x7fca469004f0" >
                                     <parm id="15928">
-                                        <attributelist id="15929" addr="0x7f99f1db24f0" >
-                                            <attribute name="name" value="iControlId" id="15930" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="15931" addr="0x7f99f1de6c90" />
+                                        <attributelist id="15929" addr="0x7fca469004f0" >
+                                            <attribute name="name" value="iControlId" id="15930" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="15931" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="access" value="public" id="15932" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="15933" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="XBMCAddon::xbmcgui::Control" id="15934" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1daced0" id="15935" addr="0x7f99f1daced0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="15936" addr="0x7f99f1de6c90" />
+                                <attribute name="access" value="public" id="15932" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="15933" addr="0x7fca46934c90" />
+                                <attribute name="type" value="XBMCAddon::xbmcgui::Control" id="15934" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468faed0" id="15935" addr="0x7fca468faed0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="15936" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
@@ -22590,588 +22590,588 @@
                 </namespace >
             </namespace >
         </include >
-        <include id="15937" addr="0x7f99f1db27b0" >
-            <attributelist id="15938" addr="0x7f99f1db27b0" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/WindowDialog.h" id="15939" addr="0x7f99f1de6c90" />
+        <include id="15937" addr="0x7fca469007b0" >
+            <attributelist id="15938" addr="0x7fca469007b0" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/WindowDialog.h" id="15939" addr="0x7fca46934c90" />
             </attributelist >
 
-            <namespace id="15940" addr="0x7f99f1db2850" >
-                <attributelist id="15941" addr="0x7f99f1db2850" >
-                    <attribute name="sym_name" value="XBMCAddon" id="15942" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="XBMCAddon" id="15943" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_previousSibling" value="0x7f99f1dabd50" id="15944" addr="0x7f99f1dabd50" />
-                    <attribute name="csym_nextSibling" value="0x7f99f1db3250" id="15945" addr="0x7f99f1db3250" />
-                    <attribute name="sym_nextSibling" value="0x7f99f1db3250" id="15946" addr="0x7f99f1db3250" />
-                    <typescope id="15947" addr="0x7f99f1dd1d70" >
-                        <attributelist id="15948" addr="0x7f99f1dd1d70" >
-                            <attribute name="name" value="XBMCAddon" id="15949" addr="0x7f99f1de6c90" />
-                            <typetab id="15950" addr="0x7f99f1dd1db0" >
-                                <attributelist id="15951" addr="0x7f99f1dd1db0" >
-                                    <attribute name="Dictionary" value="Dictionary" id="15952" addr="0x7f99f1de6c90" />
-                                    <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="15953" addr="0x7f99f1de6c90" />
-                                    <attribute name="String" value="std::string" id="15954" addr="0x7f99f1de6c90" />
-                                    <attribute name="StringOrInt" value="XBMCAddon::String" id="15955" addr="0x7f99f1de6c90" />
+            <namespace id="15940" addr="0x7fca46900850" >
+                <attributelist id="15941" addr="0x7fca46900850" >
+                    <attribute name="sym_name" value="XBMCAddon" id="15942" addr="0x7fca46934c90" />
+                    <attribute name="name" value="XBMCAddon" id="15943" addr="0x7fca46934c90" />
+                    <attribute name="sym_previousSibling" value="0x7fca468f9d50" id="15944" addr="0x7fca468f9d50" />
+                    <attribute name="csym_nextSibling" value="0x7fca46901250" id="15945" addr="0x7fca46901250" />
+                    <attribute name="sym_nextSibling" value="0x7fca46901250" id="15946" addr="0x7fca46901250" />
+                    <typescope id="15947" addr="0x7fca4691fd70" >
+                        <attributelist id="15948" addr="0x7fca4691fd70" >
+                            <attribute name="name" value="XBMCAddon" id="15949" addr="0x7fca46934c90" />
+                            <typetab id="15950" addr="0x7fca4691fdb0" >
+                                <attributelist id="15951" addr="0x7fca4691fdb0" >
+                                    <attribute name="Dictionary" value="Dictionary" id="15952" addr="0x7fca46934c90" />
+                                    <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="15953" addr="0x7fca46934c90" />
+                                    <attribute name="String" value="std::string" id="15954" addr="0x7fca46934c90" />
+                                    <attribute name="StringOrInt" value="XBMCAddon::String" id="15955" addr="0x7fca46934c90" />
                                 </attributelist >
-                                <typetabsitem id="15956" addr="0x7f99f1dd28b0" >
-                                    <attributelist id="15957" addr="0x7f99f1dd28b0" >
+                                <typetabsitem id="15956" addr="0x7fca469208b0" >
+                                    <attributelist id="15957" addr="0x7fca469208b0" >
                                     </attributelist >
                                 </typetabsitem >
-                                <typetabsitem id="15958" addr="0x7f99f1dd2910" >
-                                    <attributelist id="15959" addr="0x7f99f1dd2910" >
+                                <typetabsitem id="15958" addr="0x7fca46920910" >
+                                    <attributelist id="15959" addr="0x7fca46920910" >
                                     </attributelist >
                                 </typetabsitem >
-                                <typetabsitem id="15960" addr="0x7f99f1dd1f90" >
-                                    <attributelist id="15961" addr="0x7f99f1dd1f90" >
+                                <typetabsitem id="15960" addr="0x7fca4691ff90" >
+                                    <attributelist id="15961" addr="0x7fca4691ff90" >
                                     </attributelist >
                                 </typetabsitem >
-                                <typetabsitem id="15962" addr="0x7f99f1dd2710" >
-                                    <attributelist id="15963" addr="0x7f99f1dd2710" >
+                                <typetabsitem id="15962" addr="0x7fca46920710" >
+                                    <attributelist id="15963" addr="0x7fca46920710" >
                                     </attributelist >
                                 </typetabsitem >
                             </typetab >
-                            <attribute name="parent" value="0x7f99f1e1da30" id="15964" addr="0x7f99f1e1da30" />
-                            <attribute name="qname" value="XBMCAddon" id="15965" addr="0x7f99f1de6c90" />
-                            <attribute name="symtab" value="0x7f99f1e408b0" id="15966" addr="0x7f99f1e408b0" />
+                            <attribute name="parent" value="0x7fca4696ba30" id="15964" addr="0x7fca4696ba30" />
+                            <attribute name="qname" value="XBMCAddon" id="15965" addr="0x7fca46934c90" />
+                            <attribute name="symtab" value="0x7fca4698e8b0" id="15966" addr="0x7fca4698e8b0" />
                         </attributelist >
-                        <typescopesitem id="15967" addr="0x7f99f1e40870" >
-                            <attributelist id="15968" addr="0x7f99f1e40870" >
+                        <typescopesitem id="15967" addr="0x7fca4698e870" >
+                            <attributelist id="15968" addr="0x7fca4698e870" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="15969" addr="0x7f99f1dd1db0" >
-                            <attributelist id="15970" addr="0x7f99f1dd1db0" >
-                                <attribute name="Dictionary" value="Dictionary" id="15971" addr="0x7f99f1de6c90" />
-                                <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="15972" addr="0x7f99f1de6c90" />
-                                <attribute name="String" value="std::string" id="15973" addr="0x7f99f1de6c90" />
-                                <attribute name="StringOrInt" value="XBMCAddon::String" id="15974" addr="0x7f99f1de6c90" />
+                        <typescopesitem id="15969" addr="0x7fca4691fdb0" >
+                            <attributelist id="15970" addr="0x7fca4691fdb0" >
+                                <attribute name="Dictionary" value="Dictionary" id="15971" addr="0x7fca46934c90" />
+                                <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="15972" addr="0x7fca46934c90" />
+                                <attribute name="String" value="std::string" id="15973" addr="0x7fca46934c90" />
+                                <attribute name="StringOrInt" value="XBMCAddon::String" id="15974" addr="0x7fca46934c90" />
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="15975" addr="0x7f99f1e1da30" >
-                            <attributelist id="15976" addr="0x7f99f1e1da30" >
-                                <attribute name="name" value="" id="15977" addr="0x7f99f1de6c90" />
-                                <typetab id="15978" addr="0x7f99f1e1da90" >
-                                    <attributelist id="15979" addr="0x7f99f1e1da90" >
+                        <typescopesitem id="15975" addr="0x7fca4696ba30" >
+                            <attributelist id="15976" addr="0x7fca4696ba30" >
+                                <attribute name="name" value="" id="15977" addr="0x7fca46934c90" />
+                                <typetab id="15978" addr="0x7fca4696ba90" >
+                                    <attributelist id="15979" addr="0x7fca4696ba90" >
                                     </attributelist >
                                 </typetab >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="15980" addr="0x7f99f1dd1eb0" >
-                            <attributelist id="15981" addr="0x7f99f1dd1eb0" >
+                        <typescopesitem id="15980" addr="0x7fca4691feb0" >
+                            <attributelist id="15981" addr="0x7fca4691feb0" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="15982" addr="0x7f99f1e408b0" >
-                            <attributelist id="15983" addr="0x7f99f1e408b0" >
-                                <attribute name="name" value="XBMCAddon" id="15984" addr="0x7f99f1de6c90" />
-                                <attribute name="csymtab" value="0x7f99f1e408f0" id="15985" addr="0x7f99f1e408f0" />
-                                <attribute name="symtab" value="0x7f99f1e40890" id="15986" addr="0x7f99f1e40890" />
+                        <typescopesitem id="15982" addr="0x7fca4698e8b0" >
+                            <attributelist id="15983" addr="0x7fca4698e8b0" >
+                                <attribute name="name" value="XBMCAddon" id="15984" addr="0x7fca46934c90" />
+                                <attribute name="csymtab" value="0x7fca4698e8f0" id="15985" addr="0x7fca4698e8f0" />
+                                <attribute name="symtab" value="0x7fca4698e890" id="15986" addr="0x7fca4698e890" />
                             </attributelist >
                         </typescopesitem >
                     </typescope >
-                    <attribute name="symtab" value="0x7f99f1e408b0" id="15987" addr="0x7f99f1e408b0" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="15988" addr="0x7f99f1e1d950" />
+                    <attribute name="symtab" value="0x7fca4698e8b0" id="15987" addr="0x7fca4698e8b0" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="15988" addr="0x7fca4696b950" />
                 </attributelist >
 
-                <namespace id="15989" addr="0x7f99f1db28d0" >
-                    <attributelist id="15990" addr="0x7f99f1db28d0" >
-                        <attribute name="feature_knownbasetypes" value="AddonClass,AddonCallback" id="15991" addr="0x7f99f1de6c90" />
-                        <attribute name="name" value="xbmcgui" id="15992" addr="0x7f99f1de6c90" />
-                        <attribute name="sym_symtab" value="0x7f99f1e408b0" id="15993" addr="0x7f99f1e408b0" />
-                        <attribute name="symtab" value="0x7f99f1e40fb0" id="15994" addr="0x7f99f1e40fb0" />
-                        <attribute name="sym_nextSibling" value="0x7f99f1db32d0" id="15995" addr="0x7f99f1db32d0" />
-                        <attribute name="csym_nextSibling" value="0x7f99f1db32d0" id="15996" addr="0x7f99f1db32d0" />
-                        <attribute name="sym_previousSibling" value="0x7f99f1dabdd0" id="15997" addr="0x7f99f1dabdd0" />
-                        <attribute name="feature_knownapitypes" value="XBMCAddon::xbmc::InfoTagVideo,xbmc::InfoTagMusic" id="15998" addr="0x7f99f1de6c90" />
-                        <attribute name="sym_name" value="xbmcgui" id="15999" addr="0x7f99f1de6c90" />
-                        <typescope id="16000" addr="0x7f99f1dd2150" >
-                            <attributelist id="16001" addr="0x7f99f1dd2150" >
-                                <attribute name="name" value="xbmcgui" id="16002" addr="0x7f99f1de6c90" />
-                                <typetab id="16003" addr="0x7f99f1dd2170" >
-                                    <attributelist id="16004" addr="0x7f99f1dd2170" >
-                                        <attribute name="InterceptorBase" value="InterceptorBase" id="16005" addr="0x7f99f1de6c90" />
-                                        <attribute name="Dialog" value="Dialog" id="16006" addr="0x7f99f1de6c90" />
-                                        <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="16007" addr="0x7f99f1de6c90" />
-                                        <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="16008" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlTextBox" value="ControlTextBox" id="16009" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlRadioButton" value="ControlRadioButton" id="16010" addr="0x7f99f1de6c90" />
-                                        <attribute name="Window" value="Window" id="16011" addr="0x7f99f1de6c90" />
-                                        <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="16012" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlList" value="ControlList" id="16013" addr="0x7f99f1de6c90" />
-                                        <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="16014" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlImage" value="ControlImage" id="16015" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlButton" value="ControlButton" id="16016" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlGroup" value="ControlGroup" id="16017" addr="0x7f99f1de6c90" />
-                                        <attribute name="DialogBusy" value="DialogBusy" id="16018" addr="0x7f99f1de6c90" />
-                                        <attribute name="DialogProgressBG" value="DialogProgressBG" id="16019" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlSpin" value="ControlSpin" id="16020" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlEdit" value="ControlEdit" id="16021" addr="0x7f99f1de6c90" />
-                                        <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="16022" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="16023" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlLabel" value="ControlLabel" id="16024" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlProgress" value="ControlProgress" id="16025" addr="0x7f99f1de6c90" />
-                                        <attribute name="Control" value="Control" id="16026" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlSlider" value="ControlSlider" id="16027" addr="0x7f99f1de6c90" />
-                                        <attribute name="DialogProgress" value="DialogProgress" id="16028" addr="0x7f99f1de6c90" />
-                                        <attribute name="Action" value="Action" id="16029" addr="0x7f99f1de6c90" />
-                                        <attribute name="WindowDialog" value="WindowDialog" id="16030" addr="0x7f99f1de6c90" />
-                                        <attribute name="WindowXML" value="WindowXML" id="16031" addr="0x7f99f1de6c90" />
-                                        <attribute name="ListItem" value="ListItem" id="16032" addr="0x7f99f1de6c90" />
-                                        <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="16033" addr="0x7f99f1de6c90" />
+                <namespace id="15989" addr="0x7fca469008d0" >
+                    <attributelist id="15990" addr="0x7fca469008d0" >
+                        <attribute name="feature_knownbasetypes" value="AddonClass,AddonCallback" id="15991" addr="0x7fca46934c90" />
+                        <attribute name="name" value="xbmcgui" id="15992" addr="0x7fca46934c90" />
+                        <attribute name="sym_symtab" value="0x7fca4698e8b0" id="15993" addr="0x7fca4698e8b0" />
+                        <attribute name="symtab" value="0x7fca4698efb0" id="15994" addr="0x7fca4698efb0" />
+                        <attribute name="sym_nextSibling" value="0x7fca469012d0" id="15995" addr="0x7fca469012d0" />
+                        <attribute name="csym_nextSibling" value="0x7fca469012d0" id="15996" addr="0x7fca469012d0" />
+                        <attribute name="sym_previousSibling" value="0x7fca468f9dd0" id="15997" addr="0x7fca468f9dd0" />
+                        <attribute name="feature_knownapitypes" value="XBMCAddon::xbmc::InfoTagVideo,xbmc::InfoTagMusic" id="15998" addr="0x7fca46934c90" />
+                        <attribute name="sym_name" value="xbmcgui" id="15999" addr="0x7fca46934c90" />
+                        <typescope id="16000" addr="0x7fca46920150" >
+                            <attributelist id="16001" addr="0x7fca46920150" >
+                                <attribute name="name" value="xbmcgui" id="16002" addr="0x7fca46934c90" />
+                                <typetab id="16003" addr="0x7fca46920170" >
+                                    <attributelist id="16004" addr="0x7fca46920170" >
+                                        <attribute name="InterceptorBase" value="InterceptorBase" id="16005" addr="0x7fca46934c90" />
+                                        <attribute name="Dialog" value="Dialog" id="16006" addr="0x7fca46934c90" />
+                                        <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="16007" addr="0x7fca46934c90" />
+                                        <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="16008" addr="0x7fca46934c90" />
+                                        <attribute name="ControlTextBox" value="ControlTextBox" id="16009" addr="0x7fca46934c90" />
+                                        <attribute name="ControlRadioButton" value="ControlRadioButton" id="16010" addr="0x7fca46934c90" />
+                                        <attribute name="Window" value="Window" id="16011" addr="0x7fca46934c90" />
+                                        <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="16012" addr="0x7fca46934c90" />
+                                        <attribute name="ControlList" value="ControlList" id="16013" addr="0x7fca46934c90" />
+                                        <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="16014" addr="0x7fca46934c90" />
+                                        <attribute name="ControlImage" value="ControlImage" id="16015" addr="0x7fca46934c90" />
+                                        <attribute name="ControlButton" value="ControlButton" id="16016" addr="0x7fca46934c90" />
+                                        <attribute name="ControlGroup" value="ControlGroup" id="16017" addr="0x7fca46934c90" />
+                                        <attribute name="DialogBusy" value="DialogBusy" id="16018" addr="0x7fca46934c90" />
+                                        <attribute name="DialogProgressBG" value="DialogProgressBG" id="16019" addr="0x7fca46934c90" />
+                                        <attribute name="ControlSpin" value="ControlSpin" id="16020" addr="0x7fca46934c90" />
+                                        <attribute name="ControlEdit" value="ControlEdit" id="16021" addr="0x7fca46934c90" />
+                                        <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="16022" addr="0x7fca46934c90" />
+                                        <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="16023" addr="0x7fca46934c90" />
+                                        <attribute name="ControlLabel" value="ControlLabel" id="16024" addr="0x7fca46934c90" />
+                                        <attribute name="ControlProgress" value="ControlProgress" id="16025" addr="0x7fca46934c90" />
+                                        <attribute name="Control" value="Control" id="16026" addr="0x7fca46934c90" />
+                                        <attribute name="ControlSlider" value="ControlSlider" id="16027" addr="0x7fca46934c90" />
+                                        <attribute name="DialogProgress" value="DialogProgress" id="16028" addr="0x7fca46934c90" />
+                                        <attribute name="Action" value="Action" id="16029" addr="0x7fca46934c90" />
+                                        <attribute name="WindowDialog" value="WindowDialog" id="16030" addr="0x7fca46934c90" />
+                                        <attribute name="WindowXML" value="WindowXML" id="16031" addr="0x7fca46934c90" />
+                                        <attribute name="ListItem" value="ListItem" id="16032" addr="0x7fca46934c90" />
+                                        <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="16033" addr="0x7fca46934c90" />
                                     </attributelist >
-                                    <typetabsitem id="16034" addr="0x7f99f1de1dd0" >
-                                        <attributelist id="16035" addr="0x7f99f1de1dd0" >
+                                    <typetabsitem id="16034" addr="0x7fca4692fdd0" >
+                                        <attributelist id="16035" addr="0x7fca4692fdd0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16036" addr="0x7f99f1dde790" >
-                                        <attributelist id="16037" addr="0x7f99f1dde790" >
+                                    <typetabsitem id="16036" addr="0x7fca4692c790" >
+                                        <attributelist id="16037" addr="0x7fca4692c790" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16038" addr="0x7f99f1de3f10" >
-                                        <attributelist id="16039" addr="0x7f99f1de3f10" >
+                                    <typetabsitem id="16038" addr="0x7fca46931f10" >
+                                        <attributelist id="16039" addr="0x7fca46931f10" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16040" addr="0x7f99f1dd67b0" >
-                                        <attributelist id="16041" addr="0x7f99f1dd67b0" >
+                                    <typetabsitem id="16040" addr="0x7fca469247b0" >
+                                        <attributelist id="16041" addr="0x7fca469247b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16042" addr="0x7f99f1ddafd0" >
-                                        <attributelist id="16043" addr="0x7f99f1ddafd0" >
+                                    <typetabsitem id="16042" addr="0x7fca46928fd0" >
+                                        <attributelist id="16043" addr="0x7fca46928fd0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16044" addr="0x7f99f1ddd430" >
-                                        <attributelist id="16045" addr="0x7f99f1ddd430" >
+                                    <typetabsitem id="16044" addr="0x7fca4692b430" >
+                                        <attributelist id="16045" addr="0x7fca4692b430" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16046" addr="0x7f99f1de2130" >
-                                        <attributelist id="16047" addr="0x7f99f1de2130" >
+                                    <typetabsitem id="16046" addr="0x7fca46930130" >
+                                        <attributelist id="16047" addr="0x7fca46930130" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16048" addr="0x7f99f1dd2f50" >
-                                        <attributelist id="16049" addr="0x7f99f1dd2f50" >
+                                    <typetabsitem id="16048" addr="0x7fca46920f50" >
+                                        <attributelist id="16049" addr="0x7fca46920f50" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16050" addr="0x7f99f1dd9650" >
-                                        <attributelist id="16051" addr="0x7f99f1dd9650" >
+                                    <typetabsitem id="16050" addr="0x7fca46927650" >
+                                        <attributelist id="16051" addr="0x7fca46927650" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16052" addr="0x7f99f1de3390" >
-                                        <attributelist id="16053" addr="0x7f99f1de3390" >
+                                    <typetabsitem id="16052" addr="0x7fca46931390" >
+                                        <attributelist id="16053" addr="0x7fca46931390" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16054" addr="0x7f99f1ddb7b0" >
-                                        <attributelist id="16055" addr="0x7f99f1ddb7b0" >
+                                    <typetabsitem id="16054" addr="0x7fca469297b0" >
+                                        <attributelist id="16055" addr="0x7fca469297b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16056" addr="0x7f99f1ddc4b0" >
-                                        <attributelist id="16057" addr="0x7f99f1ddc4b0" >
+                                    <typetabsitem id="16056" addr="0x7fca4692a4b0" >
+                                        <attributelist id="16057" addr="0x7fca4692a4b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16058" addr="0x7f99f1ddcf90" >
-                                        <attributelist id="16059" addr="0x7f99f1ddcf90" >
+                                    <typetabsitem id="16058" addr="0x7fca4692af90" >
+                                        <attributelist id="16059" addr="0x7fca4692af90" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16060" addr="0x7f99f1de11b0" >
-                                        <attributelist id="16061" addr="0x7f99f1de11b0" >
+                                    <typetabsitem id="16060" addr="0x7fca4692f1b0" >
+                                        <attributelist id="16061" addr="0x7fca4692f1b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16062" addr="0x7f99f1de15b0" >
-                                        <attributelist id="16063" addr="0x7f99f1de15b0" >
+                                    <typetabsitem id="16062" addr="0x7fca4692f5b0" >
+                                        <attributelist id="16063" addr="0x7fca4692f5b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16064" addr="0x7f99f1dd77f0" >
-                                        <attributelist id="16065" addr="0x7f99f1dd77f0" >
+                                    <typetabsitem id="16064" addr="0x7fca469257f0" >
+                                        <attributelist id="16065" addr="0x7fca469257f0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16066" addr="0x7f99f1dd8b30" >
-                                        <attributelist id="16067" addr="0x7f99f1dd8b30" >
+                                    <typetabsitem id="16066" addr="0x7fca46926b30" >
+                                        <attributelist id="16067" addr="0x7fca46926b30" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16068" addr="0x7f99f1dd2c50" >
-                                        <attributelist id="16069" addr="0x7f99f1dd2c50" >
+                                    <typetabsitem id="16068" addr="0x7fca46920c50" >
+                                        <attributelist id="16069" addr="0x7fca46920c50" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16070" addr="0x7f99f1dda790" >
-                                        <attributelist id="16071" addr="0x7f99f1dda790" >
+                                    <typetabsitem id="16070" addr="0x7fca46928790" >
+                                        <attributelist id="16071" addr="0x7fca46928790" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16072" addr="0x7f99f1dd8030" >
-                                        <attributelist id="16073" addr="0x7f99f1dd8030" >
+                                    <typetabsitem id="16072" addr="0x7fca46926030" >
+                                        <attributelist id="16073" addr="0x7fca46926030" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16074" addr="0x7f99f1ddbe10" >
-                                        <attributelist id="16075" addr="0x7f99f1ddbe10" >
+                                    <typetabsitem id="16074" addr="0x7fca46929e10" >
+                                        <attributelist id="16075" addr="0x7fca46929e10" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16076" addr="0x7f99f1dd6b10" >
-                                        <attributelist id="16077" addr="0x7f99f1dd6b10" >
+                                    <typetabsitem id="16076" addr="0x7fca46924b10" >
+                                        <attributelist id="16077" addr="0x7fca46924b10" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16078" addr="0x7f99f1dddf90" >
-                                        <attributelist id="16079" addr="0x7f99f1dddf90" >
+                                    <typetabsitem id="16078" addr="0x7fca4692bf90" >
+                                        <attributelist id="16079" addr="0x7fca4692bf90" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16080" addr="0x7f99f1de0530" >
-                                        <attributelist id="16081" addr="0x7f99f1de0530" >
+                                    <typetabsitem id="16080" addr="0x7fca4692e530" >
+                                        <attributelist id="16081" addr="0x7fca4692e530" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16082" addr="0x7f99f1de1e50" >
-                                        <attributelist id="16083" addr="0x7f99f1de1e50" >
+                                    <typetabsitem id="16082" addr="0x7fca4692fe50" >
+                                        <attributelist id="16083" addr="0x7fca4692fe50" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16084" addr="0x7f99f1de2d90" >
-                                        <attributelist id="16085" addr="0x7f99f1de2d90" >
+                                    <typetabsitem id="16084" addr="0x7fca46930d90" >
+                                        <attributelist id="16085" addr="0x7fca46930d90" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16086" addr="0x7f99f1de3410" >
-                                        <attributelist id="16087" addr="0x7f99f1de3410" >
+                                    <typetabsitem id="16086" addr="0x7fca46931410" >
+                                        <attributelist id="16087" addr="0x7fca46931410" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16088" addr="0x7f99f1dd3590" >
-                                        <attributelist id="16089" addr="0x7f99f1dd3590" >
+                                    <typetabsitem id="16088" addr="0x7fca46921590" >
+                                        <attributelist id="16089" addr="0x7fca46921590" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16090" addr="0x7f99f1dd3390" >
-                                        <attributelist id="16091" addr="0x7f99f1dd3390" >
+                                    <typetabsitem id="16090" addr="0x7fca46921390" >
+                                        <attributelist id="16091" addr="0x7fca46921390" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
-                                <attribute name="parent" value="0x7f99f1dd1d70" id="16092" addr="0x7f99f1dd1d70" />
-                                <attribute name="qname" value="XBMCAddon::xbmcgui" id="16093" addr="0x7f99f1de6c90" />
-                                <attribute name="symtab" value="0x7f99f1e40fb0" id="16094" addr="0x7f99f1e40fb0" />
+                                <attribute name="parent" value="0x7fca4691fd70" id="16092" addr="0x7fca4691fd70" />
+                                <attribute name="qname" value="XBMCAddon::xbmcgui" id="16093" addr="0x7fca46934c90" />
+                                <attribute name="symtab" value="0x7fca4698efb0" id="16094" addr="0x7fca4698efb0" />
                             </attributelist >
-                            <typescopesitem id="16095" addr="0x7f99f1e40f70" >
-                                <attributelist id="16096" addr="0x7f99f1e40f70" >
+                            <typescopesitem id="16095" addr="0x7fca4698ef70" >
+                                <attributelist id="16096" addr="0x7fca4698ef70" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="16097" addr="0x7f99f1dd2170" >
-                                <attributelist id="16098" addr="0x7f99f1dd2170" >
-                                    <attribute name="InterceptorBase" value="InterceptorBase" id="16099" addr="0x7f99f1de6c90" />
-                                    <attribute name="Dialog" value="Dialog" id="16100" addr="0x7f99f1de6c90" />
-                                    <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="16101" addr="0x7f99f1de6c90" />
-                                    <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="16102" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlTextBox" value="ControlTextBox" id="16103" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlRadioButton" value="ControlRadioButton" id="16104" addr="0x7f99f1de6c90" />
-                                    <attribute name="Window" value="Window" id="16105" addr="0x7f99f1de6c90" />
-                                    <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="16106" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlList" value="ControlList" id="16107" addr="0x7f99f1de6c90" />
-                                    <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="16108" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlImage" value="ControlImage" id="16109" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlButton" value="ControlButton" id="16110" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlGroup" value="ControlGroup" id="16111" addr="0x7f99f1de6c90" />
-                                    <attribute name="DialogBusy" value="DialogBusy" id="16112" addr="0x7f99f1de6c90" />
-                                    <attribute name="DialogProgressBG" value="DialogProgressBG" id="16113" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlSpin" value="ControlSpin" id="16114" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlEdit" value="ControlEdit" id="16115" addr="0x7f99f1de6c90" />
-                                    <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="16116" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="16117" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlLabel" value="ControlLabel" id="16118" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlProgress" value="ControlProgress" id="16119" addr="0x7f99f1de6c90" />
-                                    <attribute name="Control" value="Control" id="16120" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlSlider" value="ControlSlider" id="16121" addr="0x7f99f1de6c90" />
-                                    <attribute name="DialogProgress" value="DialogProgress" id="16122" addr="0x7f99f1de6c90" />
-                                    <attribute name="Action" value="Action" id="16123" addr="0x7f99f1de6c90" />
-                                    <attribute name="WindowDialog" value="WindowDialog" id="16124" addr="0x7f99f1de6c90" />
-                                    <attribute name="WindowXML" value="WindowXML" id="16125" addr="0x7f99f1de6c90" />
-                                    <attribute name="ListItem" value="ListItem" id="16126" addr="0x7f99f1de6c90" />
-                                    <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="16127" addr="0x7f99f1de6c90" />
+                            <typescopesitem id="16097" addr="0x7fca46920170" >
+                                <attributelist id="16098" addr="0x7fca46920170" >
+                                    <attribute name="InterceptorBase" value="InterceptorBase" id="16099" addr="0x7fca46934c90" />
+                                    <attribute name="Dialog" value="Dialog" id="16100" addr="0x7fca46934c90" />
+                                    <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="16101" addr="0x7fca46934c90" />
+                                    <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="16102" addr="0x7fca46934c90" />
+                                    <attribute name="ControlTextBox" value="ControlTextBox" id="16103" addr="0x7fca46934c90" />
+                                    <attribute name="ControlRadioButton" value="ControlRadioButton" id="16104" addr="0x7fca46934c90" />
+                                    <attribute name="Window" value="Window" id="16105" addr="0x7fca46934c90" />
+                                    <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="16106" addr="0x7fca46934c90" />
+                                    <attribute name="ControlList" value="ControlList" id="16107" addr="0x7fca46934c90" />
+                                    <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="16108" addr="0x7fca46934c90" />
+                                    <attribute name="ControlImage" value="ControlImage" id="16109" addr="0x7fca46934c90" />
+                                    <attribute name="ControlButton" value="ControlButton" id="16110" addr="0x7fca46934c90" />
+                                    <attribute name="ControlGroup" value="ControlGroup" id="16111" addr="0x7fca46934c90" />
+                                    <attribute name="DialogBusy" value="DialogBusy" id="16112" addr="0x7fca46934c90" />
+                                    <attribute name="DialogProgressBG" value="DialogProgressBG" id="16113" addr="0x7fca46934c90" />
+                                    <attribute name="ControlSpin" value="ControlSpin" id="16114" addr="0x7fca46934c90" />
+                                    <attribute name="ControlEdit" value="ControlEdit" id="16115" addr="0x7fca46934c90" />
+                                    <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="16116" addr="0x7fca46934c90" />
+                                    <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="16117" addr="0x7fca46934c90" />
+                                    <attribute name="ControlLabel" value="ControlLabel" id="16118" addr="0x7fca46934c90" />
+                                    <attribute name="ControlProgress" value="ControlProgress" id="16119" addr="0x7fca46934c90" />
+                                    <attribute name="Control" value="Control" id="16120" addr="0x7fca46934c90" />
+                                    <attribute name="ControlSlider" value="ControlSlider" id="16121" addr="0x7fca46934c90" />
+                                    <attribute name="DialogProgress" value="DialogProgress" id="16122" addr="0x7fca46934c90" />
+                                    <attribute name="Action" value="Action" id="16123" addr="0x7fca46934c90" />
+                                    <attribute name="WindowDialog" value="WindowDialog" id="16124" addr="0x7fca46934c90" />
+                                    <attribute name="WindowXML" value="WindowXML" id="16125" addr="0x7fca46934c90" />
+                                    <attribute name="ListItem" value="ListItem" id="16126" addr="0x7fca46934c90" />
+                                    <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="16127" addr="0x7fca46934c90" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="16128" addr="0x7f99f1dd1d70" >
-                                <attributelist id="16129" addr="0x7f99f1dd1d70" >
-                                    <attribute name="name" value="XBMCAddon" id="16130" addr="0x7f99f1de6c90" />
-                                    <typetab id="16131" addr="0x7f99f1dd1db0" >
-                                        <attributelist id="16132" addr="0x7f99f1dd1db0" >
-                                            <attribute name="Dictionary" value="Dictionary" id="16133" addr="0x7f99f1de6c90" />
-                                            <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="16134" addr="0x7f99f1de6c90" />
-                                            <attribute name="String" value="std::string" id="16135" addr="0x7f99f1de6c90" />
-                                            <attribute name="StringOrInt" value="XBMCAddon::String" id="16136" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                        <typetabsitem id="16137" addr="0x7f99f1dd28b0" >
-                                            <attributelist id="16138" addr="0x7f99f1dd28b0" >
+                            <typescopesitem id="16128" addr="0x7fca4691fd70" >
+                                <attributelist id="16129" addr="0x7fca4691fd70" >
+                                    <attribute name="name" value="XBMCAddon" id="16130" addr="0x7fca46934c90" />
+                                    <typetab id="16131" addr="0x7fca4691fdb0" >
+                                        <attributelist id="16132" addr="0x7fca4691fdb0" >
+                                            <attribute name="Dictionary" value="Dictionary" id="16133" addr="0x7fca46934c90" />
+                                            <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="16134" addr="0x7fca46934c90" />
+                                            <attribute name="String" value="std::string" id="16135" addr="0x7fca46934c90" />
+                                            <attribute name="StringOrInt" value="XBMCAddon::String" id="16136" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                        <typetabsitem id="16137" addr="0x7fca469208b0" >
+                                            <attributelist id="16138" addr="0x7fca469208b0" >
                                             </attributelist >
                                         </typetabsitem >
-                                        <typetabsitem id="16139" addr="0x7f99f1dd2910" >
-                                            <attributelist id="16140" addr="0x7f99f1dd2910" >
+                                        <typetabsitem id="16139" addr="0x7fca46920910" >
+                                            <attributelist id="16140" addr="0x7fca46920910" >
                                             </attributelist >
                                         </typetabsitem >
-                                        <typetabsitem id="16141" addr="0x7f99f1dd1f90" >
-                                            <attributelist id="16142" addr="0x7f99f1dd1f90" >
+                                        <typetabsitem id="16141" addr="0x7fca4691ff90" >
+                                            <attributelist id="16142" addr="0x7fca4691ff90" >
                                             </attributelist >
                                         </typetabsitem >
-                                        <typetabsitem id="16143" addr="0x7f99f1dd2710" >
-                                            <attributelist id="16144" addr="0x7f99f1dd2710" >
+                                        <typetabsitem id="16143" addr="0x7fca46920710" >
+                                            <attributelist id="16144" addr="0x7fca46920710" >
                                             </attributelist >
                                         </typetabsitem >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f99f1e1da30" id="16145" addr="0x7f99f1e1da30" />
-                                    <attribute name="qname" value="XBMCAddon" id="16146" addr="0x7f99f1de6c90" />
-                                    <attribute name="symtab" value="0x7f99f1e408b0" id="16147" addr="0x7f99f1e408b0" />
+                                    <attribute name="parent" value="0x7fca4696ba30" id="16145" addr="0x7fca4696ba30" />
+                                    <attribute name="qname" value="XBMCAddon" id="16146" addr="0x7fca46934c90" />
+                                    <attribute name="symtab" value="0x7fca4698e8b0" id="16147" addr="0x7fca4698e8b0" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="16148" addr="0x7f99f1dd2190" >
-                                <attributelist id="16149" addr="0x7f99f1dd2190" >
+                            <typescopesitem id="16148" addr="0x7fca46920190" >
+                                <attributelist id="16149" addr="0x7fca46920190" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="16150" addr="0x7f99f1e40fb0" >
-                                <attributelist id="16151" addr="0x7f99f1e40fb0" >
-                                    <attribute name="name" value="xbmcgui" id="16152" addr="0x7f99f1de6c90" />
-                                    <attribute name="csymtab" value="0x7f99f1e40ff0" id="16153" addr="0x7f99f1e40ff0" />
-                                    <attribute name="symtab" value="0x7f99f1e40f90" id="16154" addr="0x7f99f1e40f90" />
+                            <typescopesitem id="16150" addr="0x7fca4698efb0" >
+                                <attributelist id="16151" addr="0x7fca4698efb0" >
+                                    <attribute name="name" value="xbmcgui" id="16152" addr="0x7fca46934c90" />
+                                    <attribute name="csymtab" value="0x7fca4698eff0" id="16153" addr="0x7fca4698eff0" />
+                                    <attribute name="symtab" value="0x7fca4698ef90" id="16154" addr="0x7fca4698ef90" />
                                 </attributelist >
                             </typescopesitem >
                         </typescope >
                     </attributelist >
 
-                    <class id="16155" addr="0x7f99f1db2af0" >
-                        <attributelist id="16156" addr="0x7f99f1db2af0" >
-                            <attribute name="name" value="XBMCAddon::xbmcgui::WindowDialog" id="16157" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="16158" addr="0x7f99f1e40fb0" />
-                            <attribute name="symtab" value="0x7f99f1db2c90" id="16159" addr="0x7f99f1db2c90" />
-                            <attribute name="allows_typedef" value="1" id="16160" addr="0x7f99f1de6c90" />
-                            <attribute name="typepass_visit" value="1" id="16161" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_visit" value="1" id="16162" addr="0x7f99f1de6c90" />
-                            <attribute name="kind" value="class" id="16163" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_name" value="WindowDialog" id="16164" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_default_constructor" value="1" id="16165" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_has_constructor" value="1" id="16166" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_public_constructor" value="1" id="16167" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_has_destructor" value="1" id="16168" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_default_destructor" value="1" id="16169" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_copy_constructor" value="1" id="16170" addr="0x7f99f1de6c90" />
-                            <attribute name="privatebaselist" value="0x7f99f1db2a30" id="16171" addr="0x7f99f1db2a30" />
-                            <attribute name="protectedbaselist" value="0x7f99f1db2a10" id="16172" addr="0x7f99f1db2a10" />
-                            <baselist id="16173" addr="0x7f99f1db29f0" >
-                                <base name="Window" id="16174" addr="0x7f99f1db2970" />
+                    <class id="16155" addr="0x7fca46900af0" >
+                        <attributelist id="16156" addr="0x7fca46900af0" >
+                            <attribute name="name" value="XBMCAddon::xbmcgui::WindowDialog" id="16157" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="16158" addr="0x7fca4698efb0" />
+                            <attribute name="symtab" value="0x7fca46900c90" id="16159" addr="0x7fca46900c90" />
+                            <attribute name="allows_typedef" value="1" id="16160" addr="0x7fca46934c90" />
+                            <attribute name="typepass_visit" value="1" id="16161" addr="0x7fca46934c90" />
+                            <attribute name="allocate_visit" value="1" id="16162" addr="0x7fca46934c90" />
+                            <attribute name="kind" value="class" id="16163" addr="0x7fca46934c90" />
+                            <attribute name="sym_name" value="WindowDialog" id="16164" addr="0x7fca46934c90" />
+                            <attribute name="allocate_default_constructor" value="1" id="16165" addr="0x7fca46934c90" />
+                            <attribute name="allocate_has_constructor" value="1" id="16166" addr="0x7fca46934c90" />
+                            <attribute name="allocate_public_constructor" value="1" id="16167" addr="0x7fca46934c90" />
+                            <attribute name="allocate_has_destructor" value="1" id="16168" addr="0x7fca46934c90" />
+                            <attribute name="allocate_default_destructor" value="1" id="16169" addr="0x7fca46934c90" />
+                            <attribute name="allocate_copy_constructor" value="1" id="16170" addr="0x7fca46934c90" />
+                            <attribute name="privatebaselist" value="0x7fca46900a30" id="16171" addr="0x7fca46900a30" />
+                            <attribute name="protectedbaselist" value="0x7fca46900a10" id="16172" addr="0x7fca46900a10" />
+                            <baselist id="16173" addr="0x7fca469009f0" >
+                                <base name="Window" id="16174" addr="0x7fca46900970" />
                             </baselist >
-                            <attribute name="module" value="xbmcgui" id="16175" addr="0x7f99f1e402f0" />
-                            <attribute name="feature_director" value="1" id="16176" addr="0x7f99f1de6c90" />
-                            <attribute name="bases" value="0x7f99f1de2ed0" id="16177" addr="0x7f99f1de2ed0" />
-                            <attribute name="allbases" value="0x7f99f1de3330" id="16178" addr="0x7f99f1de3330" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="16179" addr="0x7f99f1de6c90" />
-                            <typescope id="16180" addr="0x7f99f1de2e50" >
-                                <attributelist id="16181" addr="0x7f99f1de2e50" >
-                                    <attribute name="inherit" value="0x7f99f1de2f70" id="16182" addr="0x7f99f1de2f70" />
-                                    <attribute name="name" value="WindowDialog" id="16183" addr="0x7f99f1de6c90" />
-                                    <typetab id="16184" addr="0x7f99f1de2e70" >
-                                        <attributelist id="16185" addr="0x7f99f1de2e70" >
+                            <attribute name="module" value="xbmcgui" id="16175" addr="0x7fca4698e2f0" />
+                            <attribute name="feature_director" value="1" id="16176" addr="0x7fca46934c90" />
+                            <attribute name="bases" value="0x7fca46930ed0" id="16177" addr="0x7fca46930ed0" />
+                            <attribute name="allbases" value="0x7fca46931330" id="16178" addr="0x7fca46931330" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="16179" addr="0x7fca46934c90" />
+                            <typescope id="16180" addr="0x7fca46930e50" >
+                                <attributelist id="16181" addr="0x7fca46930e50" >
+                                    <attribute name="inherit" value="0x7fca46930f70" id="16182" addr="0x7fca46930f70" />
+                                    <attribute name="name" value="WindowDialog" id="16183" addr="0x7fca46934c90" />
+                                    <typetab id="16184" addr="0x7fca46930e70" >
+                                        <attributelist id="16185" addr="0x7fca46930e70" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f99f1dd2150" id="16186" addr="0x7f99f1dd2150" />
-                                    <attribute name="qname" value="XBMCAddon::xbmcgui::WindowDialog" id="16187" addr="0x7f99f1de6c90" />
-                                    <attribute name="symtab" value="0x7f99f1db2c90" id="16188" addr="0x7f99f1db2c90" />
+                                    <attribute name="parent" value="0x7fca46920150" id="16186" addr="0x7fca46920150" />
+                                    <attribute name="qname" value="XBMCAddon::xbmcgui::WindowDialog" id="16187" addr="0x7fca46934c90" />
+                                    <attribute name="symtab" value="0x7fca46900c90" id="16188" addr="0x7fca46900c90" />
                                 </attributelist >
-                                <typescopesitem id="16189" addr="0x7f99f1de2f70" >
-                                    <attributelist id="16190" addr="0x7f99f1de2f70" >
+                                <typescopesitem id="16189" addr="0x7fca46930f70" >
+                                    <attributelist id="16190" addr="0x7fca46930f70" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="16191" addr="0x7f99f1de2df0" >
-                                    <attributelist id="16192" addr="0x7f99f1de2df0" >
+                                <typescopesitem id="16191" addr="0x7fca46930df0" >
+                                    <attributelist id="16192" addr="0x7fca46930df0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="16193" addr="0x7f99f1de2e70" >
-                                    <attributelist id="16194" addr="0x7f99f1de2e70" >
+                                <typescopesitem id="16193" addr="0x7fca46930e70" >
+                                    <attributelist id="16194" addr="0x7fca46930e70" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="16195" addr="0x7f99f1dd2150" >
-                                    <attributelist id="16196" addr="0x7f99f1dd2150" >
-                                        <attribute name="name" value="xbmcgui" id="16197" addr="0x7f99f1de6c90" />
-                                        <typetab id="16198" addr="0x7f99f1dd2170" >
-                                            <attributelist id="16199" addr="0x7f99f1dd2170" >
-                                                <attribute name="InterceptorBase" value="InterceptorBase" id="16200" addr="0x7f99f1de6c90" />
-                                                <attribute name="Dialog" value="Dialog" id="16201" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="16202" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="16203" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlTextBox" value="ControlTextBox" id="16204" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="16205" addr="0x7f99f1de6c90" />
-                                                <attribute name="Window" value="Window" id="16206" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="16207" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlList" value="ControlList" id="16208" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="16209" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlImage" value="ControlImage" id="16210" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlButton" value="ControlButton" id="16211" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlGroup" value="ControlGroup" id="16212" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogBusy" value="DialogBusy" id="16213" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="16214" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSpin" value="ControlSpin" id="16215" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlEdit" value="ControlEdit" id="16216" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="16217" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="16218" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlLabel" value="ControlLabel" id="16219" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlProgress" value="ControlProgress" id="16220" addr="0x7f99f1de6c90" />
-                                                <attribute name="Control" value="Control" id="16221" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSlider" value="ControlSlider" id="16222" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgress" value="DialogProgress" id="16223" addr="0x7f99f1de6c90" />
-                                                <attribute name="Action" value="Action" id="16224" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowDialog" value="WindowDialog" id="16225" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXML" value="WindowXML" id="16226" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItem" value="ListItem" id="16227" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="16228" addr="0x7f99f1de6c90" />
+                                <typescopesitem id="16195" addr="0x7fca46920150" >
+                                    <attributelist id="16196" addr="0x7fca46920150" >
+                                        <attribute name="name" value="xbmcgui" id="16197" addr="0x7fca46934c90" />
+                                        <typetab id="16198" addr="0x7fca46920170" >
+                                            <attributelist id="16199" addr="0x7fca46920170" >
+                                                <attribute name="InterceptorBase" value="InterceptorBase" id="16200" addr="0x7fca46934c90" />
+                                                <attribute name="Dialog" value="Dialog" id="16201" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="16202" addr="0x7fca46934c90" />
+                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="16203" addr="0x7fca46934c90" />
+                                                <attribute name="ControlTextBox" value="ControlTextBox" id="16204" addr="0x7fca46934c90" />
+                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="16205" addr="0x7fca46934c90" />
+                                                <attribute name="Window" value="Window" id="16206" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="16207" addr="0x7fca46934c90" />
+                                                <attribute name="ControlList" value="ControlList" id="16208" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="16209" addr="0x7fca46934c90" />
+                                                <attribute name="ControlImage" value="ControlImage" id="16210" addr="0x7fca46934c90" />
+                                                <attribute name="ControlButton" value="ControlButton" id="16211" addr="0x7fca46934c90" />
+                                                <attribute name="ControlGroup" value="ControlGroup" id="16212" addr="0x7fca46934c90" />
+                                                <attribute name="DialogBusy" value="DialogBusy" id="16213" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="16214" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSpin" value="ControlSpin" id="16215" addr="0x7fca46934c90" />
+                                                <attribute name="ControlEdit" value="ControlEdit" id="16216" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="16217" addr="0x7fca46934c90" />
+                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="16218" addr="0x7fca46934c90" />
+                                                <attribute name="ControlLabel" value="ControlLabel" id="16219" addr="0x7fca46934c90" />
+                                                <attribute name="ControlProgress" value="ControlProgress" id="16220" addr="0x7fca46934c90" />
+                                                <attribute name="Control" value="Control" id="16221" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSlider" value="ControlSlider" id="16222" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgress" value="DialogProgress" id="16223" addr="0x7fca46934c90" />
+                                                <attribute name="Action" value="Action" id="16224" addr="0x7fca46934c90" />
+                                                <attribute name="WindowDialog" value="WindowDialog" id="16225" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXML" value="WindowXML" id="16226" addr="0x7fca46934c90" />
+                                                <attribute name="ListItem" value="ListItem" id="16227" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="16228" addr="0x7fca46934c90" />
                                             </attributelist >
-                                            <typetabsitem id="16229" addr="0x7f99f1de1dd0" >
-                                                <attributelist id="16230" addr="0x7f99f1de1dd0" >
+                                            <typetabsitem id="16229" addr="0x7fca4692fdd0" >
+                                                <attributelist id="16230" addr="0x7fca4692fdd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16231" addr="0x7f99f1dde790" >
-                                                <attributelist id="16232" addr="0x7f99f1dde790" >
+                                            <typetabsitem id="16231" addr="0x7fca4692c790" >
+                                                <attributelist id="16232" addr="0x7fca4692c790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16233" addr="0x7f99f1de3f10" >
-                                                <attributelist id="16234" addr="0x7f99f1de3f10" >
+                                            <typetabsitem id="16233" addr="0x7fca46931f10" >
+                                                <attributelist id="16234" addr="0x7fca46931f10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16235" addr="0x7f99f1dd67b0" >
-                                                <attributelist id="16236" addr="0x7f99f1dd67b0" >
+                                            <typetabsitem id="16235" addr="0x7fca469247b0" >
+                                                <attributelist id="16236" addr="0x7fca469247b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16237" addr="0x7f99f1ddafd0" >
-                                                <attributelist id="16238" addr="0x7f99f1ddafd0" >
+                                            <typetabsitem id="16237" addr="0x7fca46928fd0" >
+                                                <attributelist id="16238" addr="0x7fca46928fd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16239" addr="0x7f99f1ddd430" >
-                                                <attributelist id="16240" addr="0x7f99f1ddd430" >
+                                            <typetabsitem id="16239" addr="0x7fca4692b430" >
+                                                <attributelist id="16240" addr="0x7fca4692b430" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16241" addr="0x7f99f1de2130" >
-                                                <attributelist id="16242" addr="0x7f99f1de2130" >
+                                            <typetabsitem id="16241" addr="0x7fca46930130" >
+                                                <attributelist id="16242" addr="0x7fca46930130" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16243" addr="0x7f99f1dd2f50" >
-                                                <attributelist id="16244" addr="0x7f99f1dd2f50" >
+                                            <typetabsitem id="16243" addr="0x7fca46920f50" >
+                                                <attributelist id="16244" addr="0x7fca46920f50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16245" addr="0x7f99f1dd9650" >
-                                                <attributelist id="16246" addr="0x7f99f1dd9650" >
+                                            <typetabsitem id="16245" addr="0x7fca46927650" >
+                                                <attributelist id="16246" addr="0x7fca46927650" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16247" addr="0x7f99f1de3390" >
-                                                <attributelist id="16248" addr="0x7f99f1de3390" >
+                                            <typetabsitem id="16247" addr="0x7fca46931390" >
+                                                <attributelist id="16248" addr="0x7fca46931390" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16249" addr="0x7f99f1ddb7b0" >
-                                                <attributelist id="16250" addr="0x7f99f1ddb7b0" >
+                                            <typetabsitem id="16249" addr="0x7fca469297b0" >
+                                                <attributelist id="16250" addr="0x7fca469297b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16251" addr="0x7f99f1ddc4b0" >
-                                                <attributelist id="16252" addr="0x7f99f1ddc4b0" >
+                                            <typetabsitem id="16251" addr="0x7fca4692a4b0" >
+                                                <attributelist id="16252" addr="0x7fca4692a4b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16253" addr="0x7f99f1ddcf90" >
-                                                <attributelist id="16254" addr="0x7f99f1ddcf90" >
+                                            <typetabsitem id="16253" addr="0x7fca4692af90" >
+                                                <attributelist id="16254" addr="0x7fca4692af90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16255" addr="0x7f99f1de11b0" >
-                                                <attributelist id="16256" addr="0x7f99f1de11b0" >
+                                            <typetabsitem id="16255" addr="0x7fca4692f1b0" >
+                                                <attributelist id="16256" addr="0x7fca4692f1b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16257" addr="0x7f99f1de15b0" >
-                                                <attributelist id="16258" addr="0x7f99f1de15b0" >
+                                            <typetabsitem id="16257" addr="0x7fca4692f5b0" >
+                                                <attributelist id="16258" addr="0x7fca4692f5b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16259" addr="0x7f99f1dd77f0" >
-                                                <attributelist id="16260" addr="0x7f99f1dd77f0" >
+                                            <typetabsitem id="16259" addr="0x7fca469257f0" >
+                                                <attributelist id="16260" addr="0x7fca469257f0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16261" addr="0x7f99f1dd8b30" >
-                                                <attributelist id="16262" addr="0x7f99f1dd8b30" >
+                                            <typetabsitem id="16261" addr="0x7fca46926b30" >
+                                                <attributelist id="16262" addr="0x7fca46926b30" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16263" addr="0x7f99f1dd2c50" >
-                                                <attributelist id="16264" addr="0x7f99f1dd2c50" >
+                                            <typetabsitem id="16263" addr="0x7fca46920c50" >
+                                                <attributelist id="16264" addr="0x7fca46920c50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16265" addr="0x7f99f1dda790" >
-                                                <attributelist id="16266" addr="0x7f99f1dda790" >
+                                            <typetabsitem id="16265" addr="0x7fca46928790" >
+                                                <attributelist id="16266" addr="0x7fca46928790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16267" addr="0x7f99f1dd8030" >
-                                                <attributelist id="16268" addr="0x7f99f1dd8030" >
+                                            <typetabsitem id="16267" addr="0x7fca46926030" >
+                                                <attributelist id="16268" addr="0x7fca46926030" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16269" addr="0x7f99f1ddbe10" >
-                                                <attributelist id="16270" addr="0x7f99f1ddbe10" >
+                                            <typetabsitem id="16269" addr="0x7fca46929e10" >
+                                                <attributelist id="16270" addr="0x7fca46929e10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16271" addr="0x7f99f1dd6b10" >
-                                                <attributelist id="16272" addr="0x7f99f1dd6b10" >
+                                            <typetabsitem id="16271" addr="0x7fca46924b10" >
+                                                <attributelist id="16272" addr="0x7fca46924b10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16273" addr="0x7f99f1dddf90" >
-                                                <attributelist id="16274" addr="0x7f99f1dddf90" >
+                                            <typetabsitem id="16273" addr="0x7fca4692bf90" >
+                                                <attributelist id="16274" addr="0x7fca4692bf90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16275" addr="0x7f99f1de0530" >
-                                                <attributelist id="16276" addr="0x7f99f1de0530" >
+                                            <typetabsitem id="16275" addr="0x7fca4692e530" >
+                                                <attributelist id="16276" addr="0x7fca4692e530" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16277" addr="0x7f99f1de1e50" >
-                                                <attributelist id="16278" addr="0x7f99f1de1e50" >
+                                            <typetabsitem id="16277" addr="0x7fca4692fe50" >
+                                                <attributelist id="16278" addr="0x7fca4692fe50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16279" addr="0x7f99f1de2d90" >
-                                                <attributelist id="16280" addr="0x7f99f1de2d90" >
+                                            <typetabsitem id="16279" addr="0x7fca46930d90" >
+                                                <attributelist id="16280" addr="0x7fca46930d90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16281" addr="0x7f99f1de3410" >
-                                                <attributelist id="16282" addr="0x7f99f1de3410" >
+                                            <typetabsitem id="16281" addr="0x7fca46931410" >
+                                                <attributelist id="16282" addr="0x7fca46931410" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16283" addr="0x7f99f1dd3590" >
-                                                <attributelist id="16284" addr="0x7f99f1dd3590" >
+                                            <typetabsitem id="16283" addr="0x7fca46921590" >
+                                                <attributelist id="16284" addr="0x7fca46921590" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16285" addr="0x7f99f1dd3390" >
-                                                <attributelist id="16286" addr="0x7f99f1dd3390" >
+                                            <typetabsitem id="16285" addr="0x7fca46921390" >
+                                                <attributelist id="16286" addr="0x7fca46921390" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7f99f1dd1d70" id="16287" addr="0x7f99f1dd1d70" />
-                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="16288" addr="0x7f99f1de6c90" />
-                                        <attribute name="symtab" value="0x7f99f1e40fb0" id="16289" addr="0x7f99f1e40fb0" />
+                                        <attribute name="parent" value="0x7fca4691fd70" id="16287" addr="0x7fca4691fd70" />
+                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="16288" addr="0x7fca46934c90" />
+                                        <attribute name="symtab" value="0x7fca4698efb0" id="16289" addr="0x7fca4698efb0" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="16290" addr="0x7f99f1de2e90" >
-                                    <attributelist id="16291" addr="0x7f99f1de2e90" >
+                                <typescopesitem id="16290" addr="0x7fca46930e90" >
+                                    <attributelist id="16291" addr="0x7fca46930e90" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="16292" addr="0x7f99f1db2c90" >
-                                    <attributelist id="16293" addr="0x7f99f1db2c90" >
-                                        <attribute name="inherit" value="0x7f99f1db2d10" id="16294" addr="0x7f99f1db2d10" />
-                                        <attribute name="name" value="WindowDialog" id="16295" addr="0x7f99f1de6c90" />
-                                        <attribute name="csymtab" value="0x7f99f1db2c10" id="16296" addr="0x7f99f1db2c10" />
-                                        <attribute name="symtab" value="0x7f99f1db2c30" id="16297" addr="0x7f99f1db2c30" />
+                                <typescopesitem id="16292" addr="0x7fca46900c90" >
+                                    <attributelist id="16293" addr="0x7fca46900c90" >
+                                        <attribute name="inherit" value="0x7fca46900d10" id="16294" addr="0x7fca46900d10" />
+                                        <attribute name="name" value="WindowDialog" id="16295" addr="0x7fca46934c90" />
+                                        <attribute name="csymtab" value="0x7fca46900c10" id="16296" addr="0x7fca46900c10" />
+                                        <attribute name="symtab" value="0x7fca46900c30" id="16297" addr="0x7fca46900c30" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <access id="16298" addr="0x7f99f1db2bd0" >
-                            <attributelist id="16299" addr="0x7f99f1db2bd0" >
-                                <attribute name="kind" value="public" id="16300" addr="0x7f99f1de6c90" />
+                        <access id="16298" addr="0x7fca46900bd0" >
+                            <attributelist id="16299" addr="0x7fca46900bd0" >
+                                <attribute name="kind" value="public" id="16300" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="16301" addr="0x7f99f1db2e10" >
-                            <attributelist id="16302" addr="0x7f99f1db2e10" >
-                                <attribute name="name" value="WindowDialog" id="16303" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="16304" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1db2c90" id="16305" addr="0x7f99f1db2c90" />
-                                <attribute name="sym_name" value="WindowDialog" id="16306" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="16307" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="16308" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_director" value="1" id="16309" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_python_nokwds" value="true" id="16310" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="16311" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="16312" addr="0x7f99f1de6c90" />
+                        <constructor id="16301" addr="0x7fca46900e10" >
+                            <attributelist id="16302" addr="0x7fca46900e10" >
+                                <attribute name="name" value="WindowDialog" id="16303" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="16304" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca46900c90" id="16305" addr="0x7fca46900c90" />
+                                <attribute name="sym_name" value="WindowDialog" id="16306" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="16307" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="16308" addr="0x7fca46934c90" />
+                                <attribute name="feature_director" value="1" id="16309" addr="0x7fca46934c90" />
+                                <attribute name="feature_python_nokwds" value="true" id="16310" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="16311" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="16312" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <destructor id="16313" addr="0x7f99f1db2fb0" >
-                            <attributelist id="16314" addr="0x7f99f1db2fb0" >
-                                <attribute name="ismember" value="1" id="16315" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="~WindowDialog" id="16316" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="~WindowDialog" id="16317" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="16318" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="16319" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1db2c90" id="16320" addr="0x7f99f1db2c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="16321" addr="0x7f99f1de6c90" />
+                        <destructor id="16313" addr="0x7fca46900fb0" >
+                            <attributelist id="16314" addr="0x7fca46900fb0" >
+                                <attribute name="ismember" value="1" id="16315" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="~WindowDialog" id="16316" addr="0x7fca46934c90" />
+                                <attribute name="name" value="~WindowDialog" id="16317" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="16318" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="16319" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca46900c90" id="16320" addr="0x7fca46900c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="16321" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </destructor >
@@ -23179,1390 +23179,1390 @@
                 </namespace >
             </namespace >
         </include >
-        <include id="16322" addr="0x7f99f1db31b0" >
-            <attributelist id="16323" addr="0x7f99f1db31b0" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/WindowXML.h" id="16324" addr="0x7f99f1de6c90" />
+        <include id="16322" addr="0x7fca469011b0" >
+            <attributelist id="16323" addr="0x7fca469011b0" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/WindowXML.h" id="16324" addr="0x7fca46934c90" />
             </attributelist >
 
-            <namespace id="16325" addr="0x7f99f1db3250" >
-                <attributelist id="16326" addr="0x7f99f1db3250" >
-                    <attribute name="sym_name" value="XBMCAddon" id="16327" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="XBMCAddon" id="16328" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_previousSibling" value="0x7f99f1db2850" id="16329" addr="0x7f99f1db2850" />
-                    <typescope id="16330" addr="0x7f99f1dd1d70" >
-                        <attributelist id="16331" addr="0x7f99f1dd1d70" >
-                            <attribute name="name" value="XBMCAddon" id="16332" addr="0x7f99f1de6c90" />
-                            <typetab id="16333" addr="0x7f99f1dd1db0" >
-                                <attributelist id="16334" addr="0x7f99f1dd1db0" >
-                                    <attribute name="Dictionary" value="Dictionary" id="16335" addr="0x7f99f1de6c90" />
-                                    <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="16336" addr="0x7f99f1de6c90" />
-                                    <attribute name="String" value="std::string" id="16337" addr="0x7f99f1de6c90" />
-                                    <attribute name="StringOrInt" value="XBMCAddon::String" id="16338" addr="0x7f99f1de6c90" />
+            <namespace id="16325" addr="0x7fca46901250" >
+                <attributelist id="16326" addr="0x7fca46901250" >
+                    <attribute name="sym_name" value="XBMCAddon" id="16327" addr="0x7fca46934c90" />
+                    <attribute name="name" value="XBMCAddon" id="16328" addr="0x7fca46934c90" />
+                    <attribute name="sym_previousSibling" value="0x7fca46900850" id="16329" addr="0x7fca46900850" />
+                    <typescope id="16330" addr="0x7fca4691fd70" >
+                        <attributelist id="16331" addr="0x7fca4691fd70" >
+                            <attribute name="name" value="XBMCAddon" id="16332" addr="0x7fca46934c90" />
+                            <typetab id="16333" addr="0x7fca4691fdb0" >
+                                <attributelist id="16334" addr="0x7fca4691fdb0" >
+                                    <attribute name="Dictionary" value="Dictionary" id="16335" addr="0x7fca46934c90" />
+                                    <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="16336" addr="0x7fca46934c90" />
+                                    <attribute name="String" value="std::string" id="16337" addr="0x7fca46934c90" />
+                                    <attribute name="StringOrInt" value="XBMCAddon::String" id="16338" addr="0x7fca46934c90" />
                                 </attributelist >
-                                <typetabsitem id="16339" addr="0x7f99f1dd28b0" >
-                                    <attributelist id="16340" addr="0x7f99f1dd28b0" >
+                                <typetabsitem id="16339" addr="0x7fca469208b0" >
+                                    <attributelist id="16340" addr="0x7fca469208b0" >
                                     </attributelist >
                                 </typetabsitem >
-                                <typetabsitem id="16341" addr="0x7f99f1dd2910" >
-                                    <attributelist id="16342" addr="0x7f99f1dd2910" >
+                                <typetabsitem id="16341" addr="0x7fca46920910" >
+                                    <attributelist id="16342" addr="0x7fca46920910" >
                                     </attributelist >
                                 </typetabsitem >
-                                <typetabsitem id="16343" addr="0x7f99f1dd1f90" >
-                                    <attributelist id="16344" addr="0x7f99f1dd1f90" >
+                                <typetabsitem id="16343" addr="0x7fca4691ff90" >
+                                    <attributelist id="16344" addr="0x7fca4691ff90" >
                                     </attributelist >
                                 </typetabsitem >
-                                <typetabsitem id="16345" addr="0x7f99f1dd2710" >
-                                    <attributelist id="16346" addr="0x7f99f1dd2710" >
+                                <typetabsitem id="16345" addr="0x7fca46920710" >
+                                    <attributelist id="16346" addr="0x7fca46920710" >
                                     </attributelist >
                                 </typetabsitem >
                             </typetab >
-                            <attribute name="parent" value="0x7f99f1e1da30" id="16347" addr="0x7f99f1e1da30" />
-                            <attribute name="qname" value="XBMCAddon" id="16348" addr="0x7f99f1de6c90" />
-                            <attribute name="symtab" value="0x7f99f1e408b0" id="16349" addr="0x7f99f1e408b0" />
+                            <attribute name="parent" value="0x7fca4696ba30" id="16347" addr="0x7fca4696ba30" />
+                            <attribute name="qname" value="XBMCAddon" id="16348" addr="0x7fca46934c90" />
+                            <attribute name="symtab" value="0x7fca4698e8b0" id="16349" addr="0x7fca4698e8b0" />
                         </attributelist >
-                        <typescopesitem id="16350" addr="0x7f99f1e40870" >
-                            <attributelist id="16351" addr="0x7f99f1e40870" >
+                        <typescopesitem id="16350" addr="0x7fca4698e870" >
+                            <attributelist id="16351" addr="0x7fca4698e870" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="16352" addr="0x7f99f1dd1db0" >
-                            <attributelist id="16353" addr="0x7f99f1dd1db0" >
-                                <attribute name="Dictionary" value="Dictionary" id="16354" addr="0x7f99f1de6c90" />
-                                <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="16355" addr="0x7f99f1de6c90" />
-                                <attribute name="String" value="std::string" id="16356" addr="0x7f99f1de6c90" />
-                                <attribute name="StringOrInt" value="XBMCAddon::String" id="16357" addr="0x7f99f1de6c90" />
+                        <typescopesitem id="16352" addr="0x7fca4691fdb0" >
+                            <attributelist id="16353" addr="0x7fca4691fdb0" >
+                                <attribute name="Dictionary" value="Dictionary" id="16354" addr="0x7fca46934c90" />
+                                <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="16355" addr="0x7fca46934c90" />
+                                <attribute name="String" value="std::string" id="16356" addr="0x7fca46934c90" />
+                                <attribute name="StringOrInt" value="XBMCAddon::String" id="16357" addr="0x7fca46934c90" />
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="16358" addr="0x7f99f1e1da30" >
-                            <attributelist id="16359" addr="0x7f99f1e1da30" >
-                                <attribute name="name" value="" id="16360" addr="0x7f99f1de6c90" />
-                                <typetab id="16361" addr="0x7f99f1e1da90" >
-                                    <attributelist id="16362" addr="0x7f99f1e1da90" >
+                        <typescopesitem id="16358" addr="0x7fca4696ba30" >
+                            <attributelist id="16359" addr="0x7fca4696ba30" >
+                                <attribute name="name" value="" id="16360" addr="0x7fca46934c90" />
+                                <typetab id="16361" addr="0x7fca4696ba90" >
+                                    <attributelist id="16362" addr="0x7fca4696ba90" >
                                     </attributelist >
                                 </typetab >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="16363" addr="0x7f99f1dd1eb0" >
-                            <attributelist id="16364" addr="0x7f99f1dd1eb0" >
+                        <typescopesitem id="16363" addr="0x7fca4691feb0" >
+                            <attributelist id="16364" addr="0x7fca4691feb0" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="16365" addr="0x7f99f1e408b0" >
-                            <attributelist id="16366" addr="0x7f99f1e408b0" >
-                                <attribute name="name" value="XBMCAddon" id="16367" addr="0x7f99f1de6c90" />
-                                <attribute name="csymtab" value="0x7f99f1e408f0" id="16368" addr="0x7f99f1e408f0" />
-                                <attribute name="symtab" value="0x7f99f1e40890" id="16369" addr="0x7f99f1e40890" />
+                        <typescopesitem id="16365" addr="0x7fca4698e8b0" >
+                            <attributelist id="16366" addr="0x7fca4698e8b0" >
+                                <attribute name="name" value="XBMCAddon" id="16367" addr="0x7fca46934c90" />
+                                <attribute name="csymtab" value="0x7fca4698e8f0" id="16368" addr="0x7fca4698e8f0" />
+                                <attribute name="symtab" value="0x7fca4698e890" id="16369" addr="0x7fca4698e890" />
                             </attributelist >
                         </typescopesitem >
                     </typescope >
-                    <attribute name="symtab" value="0x7f99f1e408b0" id="16370" addr="0x7f99f1e408b0" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="16371" addr="0x7f99f1e1d950" />
+                    <attribute name="symtab" value="0x7fca4698e8b0" id="16370" addr="0x7fca4698e8b0" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="16371" addr="0x7fca4696b950" />
                 </attributelist >
 
-                <namespace id="16372" addr="0x7f99f1db32d0" >
-                    <attributelist id="16373" addr="0x7f99f1db32d0" >
-                        <attribute name="sym_name" value="xbmcgui" id="16374" addr="0x7f99f1de6c90" />
-                        <attribute name="name" value="xbmcgui" id="16375" addr="0x7f99f1de6c90" />
-                        <attribute name="feature_knownbasetypes" value="AddonClass,AddonCallback" id="16376" addr="0x7f99f1de6c90" />
-                        <attribute name="feature_knownapitypes" value="XBMCAddon::xbmc::InfoTagVideo,xbmc::InfoTagMusic" id="16377" addr="0x7f99f1de6c90" />
-                        <attribute name="sym_previousSibling" value="0x7f99f1db28d0" id="16378" addr="0x7f99f1db28d0" />
-                        <typescope id="16379" addr="0x7f99f1dd2150" >
-                            <attributelist id="16380" addr="0x7f99f1dd2150" >
-                                <attribute name="name" value="xbmcgui" id="16381" addr="0x7f99f1de6c90" />
-                                <typetab id="16382" addr="0x7f99f1dd2170" >
-                                    <attributelist id="16383" addr="0x7f99f1dd2170" >
-                                        <attribute name="InterceptorBase" value="InterceptorBase" id="16384" addr="0x7f99f1de6c90" />
-                                        <attribute name="Dialog" value="Dialog" id="16385" addr="0x7f99f1de6c90" />
-                                        <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="16386" addr="0x7f99f1de6c90" />
-                                        <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="16387" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlTextBox" value="ControlTextBox" id="16388" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlRadioButton" value="ControlRadioButton" id="16389" addr="0x7f99f1de6c90" />
-                                        <attribute name="Window" value="Window" id="16390" addr="0x7f99f1de6c90" />
-                                        <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="16391" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlList" value="ControlList" id="16392" addr="0x7f99f1de6c90" />
-                                        <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="16393" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlImage" value="ControlImage" id="16394" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlButton" value="ControlButton" id="16395" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlGroup" value="ControlGroup" id="16396" addr="0x7f99f1de6c90" />
-                                        <attribute name="DialogBusy" value="DialogBusy" id="16397" addr="0x7f99f1de6c90" />
-                                        <attribute name="DialogProgressBG" value="DialogProgressBG" id="16398" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlSpin" value="ControlSpin" id="16399" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlEdit" value="ControlEdit" id="16400" addr="0x7f99f1de6c90" />
-                                        <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="16401" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="16402" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlLabel" value="ControlLabel" id="16403" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlProgress" value="ControlProgress" id="16404" addr="0x7f99f1de6c90" />
-                                        <attribute name="Control" value="Control" id="16405" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlSlider" value="ControlSlider" id="16406" addr="0x7f99f1de6c90" />
-                                        <attribute name="DialogProgress" value="DialogProgress" id="16407" addr="0x7f99f1de6c90" />
-                                        <attribute name="Action" value="Action" id="16408" addr="0x7f99f1de6c90" />
-                                        <attribute name="WindowDialog" value="WindowDialog" id="16409" addr="0x7f99f1de6c90" />
-                                        <attribute name="WindowXML" value="WindowXML" id="16410" addr="0x7f99f1de6c90" />
-                                        <attribute name="ListItem" value="ListItem" id="16411" addr="0x7f99f1de6c90" />
-                                        <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="16412" addr="0x7f99f1de6c90" />
+                <namespace id="16372" addr="0x7fca469012d0" >
+                    <attributelist id="16373" addr="0x7fca469012d0" >
+                        <attribute name="sym_name" value="xbmcgui" id="16374" addr="0x7fca46934c90" />
+                        <attribute name="name" value="xbmcgui" id="16375" addr="0x7fca46934c90" />
+                        <attribute name="feature_knownbasetypes" value="AddonClass,AddonCallback" id="16376" addr="0x7fca46934c90" />
+                        <attribute name="feature_knownapitypes" value="XBMCAddon::xbmc::InfoTagVideo,xbmc::InfoTagMusic" id="16377" addr="0x7fca46934c90" />
+                        <attribute name="sym_previousSibling" value="0x7fca469008d0" id="16378" addr="0x7fca469008d0" />
+                        <typescope id="16379" addr="0x7fca46920150" >
+                            <attributelist id="16380" addr="0x7fca46920150" >
+                                <attribute name="name" value="xbmcgui" id="16381" addr="0x7fca46934c90" />
+                                <typetab id="16382" addr="0x7fca46920170" >
+                                    <attributelist id="16383" addr="0x7fca46920170" >
+                                        <attribute name="InterceptorBase" value="InterceptorBase" id="16384" addr="0x7fca46934c90" />
+                                        <attribute name="Dialog" value="Dialog" id="16385" addr="0x7fca46934c90" />
+                                        <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="16386" addr="0x7fca46934c90" />
+                                        <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="16387" addr="0x7fca46934c90" />
+                                        <attribute name="ControlTextBox" value="ControlTextBox" id="16388" addr="0x7fca46934c90" />
+                                        <attribute name="ControlRadioButton" value="ControlRadioButton" id="16389" addr="0x7fca46934c90" />
+                                        <attribute name="Window" value="Window" id="16390" addr="0x7fca46934c90" />
+                                        <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="16391" addr="0x7fca46934c90" />
+                                        <attribute name="ControlList" value="ControlList" id="16392" addr="0x7fca46934c90" />
+                                        <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="16393" addr="0x7fca46934c90" />
+                                        <attribute name="ControlImage" value="ControlImage" id="16394" addr="0x7fca46934c90" />
+                                        <attribute name="ControlButton" value="ControlButton" id="16395" addr="0x7fca46934c90" />
+                                        <attribute name="ControlGroup" value="ControlGroup" id="16396" addr="0x7fca46934c90" />
+                                        <attribute name="DialogBusy" value="DialogBusy" id="16397" addr="0x7fca46934c90" />
+                                        <attribute name="DialogProgressBG" value="DialogProgressBG" id="16398" addr="0x7fca46934c90" />
+                                        <attribute name="ControlSpin" value="ControlSpin" id="16399" addr="0x7fca46934c90" />
+                                        <attribute name="ControlEdit" value="ControlEdit" id="16400" addr="0x7fca46934c90" />
+                                        <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="16401" addr="0x7fca46934c90" />
+                                        <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="16402" addr="0x7fca46934c90" />
+                                        <attribute name="ControlLabel" value="ControlLabel" id="16403" addr="0x7fca46934c90" />
+                                        <attribute name="ControlProgress" value="ControlProgress" id="16404" addr="0x7fca46934c90" />
+                                        <attribute name="Control" value="Control" id="16405" addr="0x7fca46934c90" />
+                                        <attribute name="ControlSlider" value="ControlSlider" id="16406" addr="0x7fca46934c90" />
+                                        <attribute name="DialogProgress" value="DialogProgress" id="16407" addr="0x7fca46934c90" />
+                                        <attribute name="Action" value="Action" id="16408" addr="0x7fca46934c90" />
+                                        <attribute name="WindowDialog" value="WindowDialog" id="16409" addr="0x7fca46934c90" />
+                                        <attribute name="WindowXML" value="WindowXML" id="16410" addr="0x7fca46934c90" />
+                                        <attribute name="ListItem" value="ListItem" id="16411" addr="0x7fca46934c90" />
+                                        <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="16412" addr="0x7fca46934c90" />
                                     </attributelist >
-                                    <typetabsitem id="16413" addr="0x7f99f1de1dd0" >
-                                        <attributelist id="16414" addr="0x7f99f1de1dd0" >
+                                    <typetabsitem id="16413" addr="0x7fca4692fdd0" >
+                                        <attributelist id="16414" addr="0x7fca4692fdd0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16415" addr="0x7f99f1dde790" >
-                                        <attributelist id="16416" addr="0x7f99f1dde790" >
+                                    <typetabsitem id="16415" addr="0x7fca4692c790" >
+                                        <attributelist id="16416" addr="0x7fca4692c790" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16417" addr="0x7f99f1de3f10" >
-                                        <attributelist id="16418" addr="0x7f99f1de3f10" >
+                                    <typetabsitem id="16417" addr="0x7fca46931f10" >
+                                        <attributelist id="16418" addr="0x7fca46931f10" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16419" addr="0x7f99f1dd67b0" >
-                                        <attributelist id="16420" addr="0x7f99f1dd67b0" >
+                                    <typetabsitem id="16419" addr="0x7fca469247b0" >
+                                        <attributelist id="16420" addr="0x7fca469247b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16421" addr="0x7f99f1ddafd0" >
-                                        <attributelist id="16422" addr="0x7f99f1ddafd0" >
+                                    <typetabsitem id="16421" addr="0x7fca46928fd0" >
+                                        <attributelist id="16422" addr="0x7fca46928fd0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16423" addr="0x7f99f1ddd430" >
-                                        <attributelist id="16424" addr="0x7f99f1ddd430" >
+                                    <typetabsitem id="16423" addr="0x7fca4692b430" >
+                                        <attributelist id="16424" addr="0x7fca4692b430" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16425" addr="0x7f99f1de2130" >
-                                        <attributelist id="16426" addr="0x7f99f1de2130" >
+                                    <typetabsitem id="16425" addr="0x7fca46930130" >
+                                        <attributelist id="16426" addr="0x7fca46930130" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16427" addr="0x7f99f1dd2f50" >
-                                        <attributelist id="16428" addr="0x7f99f1dd2f50" >
+                                    <typetabsitem id="16427" addr="0x7fca46920f50" >
+                                        <attributelist id="16428" addr="0x7fca46920f50" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16429" addr="0x7f99f1dd9650" >
-                                        <attributelist id="16430" addr="0x7f99f1dd9650" >
+                                    <typetabsitem id="16429" addr="0x7fca46927650" >
+                                        <attributelist id="16430" addr="0x7fca46927650" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16431" addr="0x7f99f1de3390" >
-                                        <attributelist id="16432" addr="0x7f99f1de3390" >
+                                    <typetabsitem id="16431" addr="0x7fca46931390" >
+                                        <attributelist id="16432" addr="0x7fca46931390" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16433" addr="0x7f99f1ddb7b0" >
-                                        <attributelist id="16434" addr="0x7f99f1ddb7b0" >
+                                    <typetabsitem id="16433" addr="0x7fca469297b0" >
+                                        <attributelist id="16434" addr="0x7fca469297b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16435" addr="0x7f99f1ddc4b0" >
-                                        <attributelist id="16436" addr="0x7f99f1ddc4b0" >
+                                    <typetabsitem id="16435" addr="0x7fca4692a4b0" >
+                                        <attributelist id="16436" addr="0x7fca4692a4b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16437" addr="0x7f99f1ddcf90" >
-                                        <attributelist id="16438" addr="0x7f99f1ddcf90" >
+                                    <typetabsitem id="16437" addr="0x7fca4692af90" >
+                                        <attributelist id="16438" addr="0x7fca4692af90" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16439" addr="0x7f99f1de11b0" >
-                                        <attributelist id="16440" addr="0x7f99f1de11b0" >
+                                    <typetabsitem id="16439" addr="0x7fca4692f1b0" >
+                                        <attributelist id="16440" addr="0x7fca4692f1b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16441" addr="0x7f99f1de15b0" >
-                                        <attributelist id="16442" addr="0x7f99f1de15b0" >
+                                    <typetabsitem id="16441" addr="0x7fca4692f5b0" >
+                                        <attributelist id="16442" addr="0x7fca4692f5b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16443" addr="0x7f99f1dd77f0" >
-                                        <attributelist id="16444" addr="0x7f99f1dd77f0" >
+                                    <typetabsitem id="16443" addr="0x7fca469257f0" >
+                                        <attributelist id="16444" addr="0x7fca469257f0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16445" addr="0x7f99f1dd8b30" >
-                                        <attributelist id="16446" addr="0x7f99f1dd8b30" >
+                                    <typetabsitem id="16445" addr="0x7fca46926b30" >
+                                        <attributelist id="16446" addr="0x7fca46926b30" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16447" addr="0x7f99f1dd2c50" >
-                                        <attributelist id="16448" addr="0x7f99f1dd2c50" >
+                                    <typetabsitem id="16447" addr="0x7fca46920c50" >
+                                        <attributelist id="16448" addr="0x7fca46920c50" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16449" addr="0x7f99f1dda790" >
-                                        <attributelist id="16450" addr="0x7f99f1dda790" >
+                                    <typetabsitem id="16449" addr="0x7fca46928790" >
+                                        <attributelist id="16450" addr="0x7fca46928790" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16451" addr="0x7f99f1dd8030" >
-                                        <attributelist id="16452" addr="0x7f99f1dd8030" >
+                                    <typetabsitem id="16451" addr="0x7fca46926030" >
+                                        <attributelist id="16452" addr="0x7fca46926030" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16453" addr="0x7f99f1ddbe10" >
-                                        <attributelist id="16454" addr="0x7f99f1ddbe10" >
+                                    <typetabsitem id="16453" addr="0x7fca46929e10" >
+                                        <attributelist id="16454" addr="0x7fca46929e10" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16455" addr="0x7f99f1dd6b10" >
-                                        <attributelist id="16456" addr="0x7f99f1dd6b10" >
+                                    <typetabsitem id="16455" addr="0x7fca46924b10" >
+                                        <attributelist id="16456" addr="0x7fca46924b10" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16457" addr="0x7f99f1dddf90" >
-                                        <attributelist id="16458" addr="0x7f99f1dddf90" >
+                                    <typetabsitem id="16457" addr="0x7fca4692bf90" >
+                                        <attributelist id="16458" addr="0x7fca4692bf90" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16459" addr="0x7f99f1de0530" >
-                                        <attributelist id="16460" addr="0x7f99f1de0530" >
+                                    <typetabsitem id="16459" addr="0x7fca4692e530" >
+                                        <attributelist id="16460" addr="0x7fca4692e530" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16461" addr="0x7f99f1de1e50" >
-                                        <attributelist id="16462" addr="0x7f99f1de1e50" >
+                                    <typetabsitem id="16461" addr="0x7fca4692fe50" >
+                                        <attributelist id="16462" addr="0x7fca4692fe50" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16463" addr="0x7f99f1de2d90" >
-                                        <attributelist id="16464" addr="0x7f99f1de2d90" >
+                                    <typetabsitem id="16463" addr="0x7fca46930d90" >
+                                        <attributelist id="16464" addr="0x7fca46930d90" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16465" addr="0x7f99f1de3410" >
-                                        <attributelist id="16466" addr="0x7f99f1de3410" >
+                                    <typetabsitem id="16465" addr="0x7fca46931410" >
+                                        <attributelist id="16466" addr="0x7fca46931410" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16467" addr="0x7f99f1dd3590" >
-                                        <attributelist id="16468" addr="0x7f99f1dd3590" >
+                                    <typetabsitem id="16467" addr="0x7fca46921590" >
+                                        <attributelist id="16468" addr="0x7fca46921590" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16469" addr="0x7f99f1dd3390" >
-                                        <attributelist id="16470" addr="0x7f99f1dd3390" >
+                                    <typetabsitem id="16469" addr="0x7fca46921390" >
+                                        <attributelist id="16470" addr="0x7fca46921390" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
-                                <attribute name="parent" value="0x7f99f1dd1d70" id="16471" addr="0x7f99f1dd1d70" />
-                                <attribute name="qname" value="XBMCAddon::xbmcgui" id="16472" addr="0x7f99f1de6c90" />
-                                <attribute name="symtab" value="0x7f99f1e40fb0" id="16473" addr="0x7f99f1e40fb0" />
+                                <attribute name="parent" value="0x7fca4691fd70" id="16471" addr="0x7fca4691fd70" />
+                                <attribute name="qname" value="XBMCAddon::xbmcgui" id="16472" addr="0x7fca46934c90" />
+                                <attribute name="symtab" value="0x7fca4698efb0" id="16473" addr="0x7fca4698efb0" />
                             </attributelist >
-                            <typescopesitem id="16474" addr="0x7f99f1e40f70" >
-                                <attributelist id="16475" addr="0x7f99f1e40f70" >
+                            <typescopesitem id="16474" addr="0x7fca4698ef70" >
+                                <attributelist id="16475" addr="0x7fca4698ef70" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="16476" addr="0x7f99f1dd2170" >
-                                <attributelist id="16477" addr="0x7f99f1dd2170" >
-                                    <attribute name="InterceptorBase" value="InterceptorBase" id="16478" addr="0x7f99f1de6c90" />
-                                    <attribute name="Dialog" value="Dialog" id="16479" addr="0x7f99f1de6c90" />
-                                    <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="16480" addr="0x7f99f1de6c90" />
-                                    <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="16481" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlTextBox" value="ControlTextBox" id="16482" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlRadioButton" value="ControlRadioButton" id="16483" addr="0x7f99f1de6c90" />
-                                    <attribute name="Window" value="Window" id="16484" addr="0x7f99f1de6c90" />
-                                    <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="16485" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlList" value="ControlList" id="16486" addr="0x7f99f1de6c90" />
-                                    <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="16487" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlImage" value="ControlImage" id="16488" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlButton" value="ControlButton" id="16489" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlGroup" value="ControlGroup" id="16490" addr="0x7f99f1de6c90" />
-                                    <attribute name="DialogBusy" value="DialogBusy" id="16491" addr="0x7f99f1de6c90" />
-                                    <attribute name="DialogProgressBG" value="DialogProgressBG" id="16492" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlSpin" value="ControlSpin" id="16493" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlEdit" value="ControlEdit" id="16494" addr="0x7f99f1de6c90" />
-                                    <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="16495" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="16496" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlLabel" value="ControlLabel" id="16497" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlProgress" value="ControlProgress" id="16498" addr="0x7f99f1de6c90" />
-                                    <attribute name="Control" value="Control" id="16499" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlSlider" value="ControlSlider" id="16500" addr="0x7f99f1de6c90" />
-                                    <attribute name="DialogProgress" value="DialogProgress" id="16501" addr="0x7f99f1de6c90" />
-                                    <attribute name="Action" value="Action" id="16502" addr="0x7f99f1de6c90" />
-                                    <attribute name="WindowDialog" value="WindowDialog" id="16503" addr="0x7f99f1de6c90" />
-                                    <attribute name="WindowXML" value="WindowXML" id="16504" addr="0x7f99f1de6c90" />
-                                    <attribute name="ListItem" value="ListItem" id="16505" addr="0x7f99f1de6c90" />
-                                    <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="16506" addr="0x7f99f1de6c90" />
+                            <typescopesitem id="16476" addr="0x7fca46920170" >
+                                <attributelist id="16477" addr="0x7fca46920170" >
+                                    <attribute name="InterceptorBase" value="InterceptorBase" id="16478" addr="0x7fca46934c90" />
+                                    <attribute name="Dialog" value="Dialog" id="16479" addr="0x7fca46934c90" />
+                                    <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="16480" addr="0x7fca46934c90" />
+                                    <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="16481" addr="0x7fca46934c90" />
+                                    <attribute name="ControlTextBox" value="ControlTextBox" id="16482" addr="0x7fca46934c90" />
+                                    <attribute name="ControlRadioButton" value="ControlRadioButton" id="16483" addr="0x7fca46934c90" />
+                                    <attribute name="Window" value="Window" id="16484" addr="0x7fca46934c90" />
+                                    <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="16485" addr="0x7fca46934c90" />
+                                    <attribute name="ControlList" value="ControlList" id="16486" addr="0x7fca46934c90" />
+                                    <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="16487" addr="0x7fca46934c90" />
+                                    <attribute name="ControlImage" value="ControlImage" id="16488" addr="0x7fca46934c90" />
+                                    <attribute name="ControlButton" value="ControlButton" id="16489" addr="0x7fca46934c90" />
+                                    <attribute name="ControlGroup" value="ControlGroup" id="16490" addr="0x7fca46934c90" />
+                                    <attribute name="DialogBusy" value="DialogBusy" id="16491" addr="0x7fca46934c90" />
+                                    <attribute name="DialogProgressBG" value="DialogProgressBG" id="16492" addr="0x7fca46934c90" />
+                                    <attribute name="ControlSpin" value="ControlSpin" id="16493" addr="0x7fca46934c90" />
+                                    <attribute name="ControlEdit" value="ControlEdit" id="16494" addr="0x7fca46934c90" />
+                                    <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="16495" addr="0x7fca46934c90" />
+                                    <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="16496" addr="0x7fca46934c90" />
+                                    <attribute name="ControlLabel" value="ControlLabel" id="16497" addr="0x7fca46934c90" />
+                                    <attribute name="ControlProgress" value="ControlProgress" id="16498" addr="0x7fca46934c90" />
+                                    <attribute name="Control" value="Control" id="16499" addr="0x7fca46934c90" />
+                                    <attribute name="ControlSlider" value="ControlSlider" id="16500" addr="0x7fca46934c90" />
+                                    <attribute name="DialogProgress" value="DialogProgress" id="16501" addr="0x7fca46934c90" />
+                                    <attribute name="Action" value="Action" id="16502" addr="0x7fca46934c90" />
+                                    <attribute name="WindowDialog" value="WindowDialog" id="16503" addr="0x7fca46934c90" />
+                                    <attribute name="WindowXML" value="WindowXML" id="16504" addr="0x7fca46934c90" />
+                                    <attribute name="ListItem" value="ListItem" id="16505" addr="0x7fca46934c90" />
+                                    <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="16506" addr="0x7fca46934c90" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="16507" addr="0x7f99f1dd1d70" >
-                                <attributelist id="16508" addr="0x7f99f1dd1d70" >
-                                    <attribute name="name" value="XBMCAddon" id="16509" addr="0x7f99f1de6c90" />
-                                    <typetab id="16510" addr="0x7f99f1dd1db0" >
-                                        <attributelist id="16511" addr="0x7f99f1dd1db0" >
-                                            <attribute name="Dictionary" value="Dictionary" id="16512" addr="0x7f99f1de6c90" />
-                                            <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="16513" addr="0x7f99f1de6c90" />
-                                            <attribute name="String" value="std::string" id="16514" addr="0x7f99f1de6c90" />
-                                            <attribute name="StringOrInt" value="XBMCAddon::String" id="16515" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                        <typetabsitem id="16516" addr="0x7f99f1dd28b0" >
-                                            <attributelist id="16517" addr="0x7f99f1dd28b0" >
+                            <typescopesitem id="16507" addr="0x7fca4691fd70" >
+                                <attributelist id="16508" addr="0x7fca4691fd70" >
+                                    <attribute name="name" value="XBMCAddon" id="16509" addr="0x7fca46934c90" />
+                                    <typetab id="16510" addr="0x7fca4691fdb0" >
+                                        <attributelist id="16511" addr="0x7fca4691fdb0" >
+                                            <attribute name="Dictionary" value="Dictionary" id="16512" addr="0x7fca46934c90" />
+                                            <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="16513" addr="0x7fca46934c90" />
+                                            <attribute name="String" value="std::string" id="16514" addr="0x7fca46934c90" />
+                                            <attribute name="StringOrInt" value="XBMCAddon::String" id="16515" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                        <typetabsitem id="16516" addr="0x7fca469208b0" >
+                                            <attributelist id="16517" addr="0x7fca469208b0" >
                                             </attributelist >
                                         </typetabsitem >
-                                        <typetabsitem id="16518" addr="0x7f99f1dd2910" >
-                                            <attributelist id="16519" addr="0x7f99f1dd2910" >
+                                        <typetabsitem id="16518" addr="0x7fca46920910" >
+                                            <attributelist id="16519" addr="0x7fca46920910" >
                                             </attributelist >
                                         </typetabsitem >
-                                        <typetabsitem id="16520" addr="0x7f99f1dd1f90" >
-                                            <attributelist id="16521" addr="0x7f99f1dd1f90" >
+                                        <typetabsitem id="16520" addr="0x7fca4691ff90" >
+                                            <attributelist id="16521" addr="0x7fca4691ff90" >
                                             </attributelist >
                                         </typetabsitem >
-                                        <typetabsitem id="16522" addr="0x7f99f1dd2710" >
-                                            <attributelist id="16523" addr="0x7f99f1dd2710" >
+                                        <typetabsitem id="16522" addr="0x7fca46920710" >
+                                            <attributelist id="16523" addr="0x7fca46920710" >
                                             </attributelist >
                                         </typetabsitem >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f99f1e1da30" id="16524" addr="0x7f99f1e1da30" />
-                                    <attribute name="qname" value="XBMCAddon" id="16525" addr="0x7f99f1de6c90" />
-                                    <attribute name="symtab" value="0x7f99f1e408b0" id="16526" addr="0x7f99f1e408b0" />
+                                    <attribute name="parent" value="0x7fca4696ba30" id="16524" addr="0x7fca4696ba30" />
+                                    <attribute name="qname" value="XBMCAddon" id="16525" addr="0x7fca46934c90" />
+                                    <attribute name="symtab" value="0x7fca4698e8b0" id="16526" addr="0x7fca4698e8b0" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="16527" addr="0x7f99f1dd2190" >
-                                <attributelist id="16528" addr="0x7f99f1dd2190" >
+                            <typescopesitem id="16527" addr="0x7fca46920190" >
+                                <attributelist id="16528" addr="0x7fca46920190" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="16529" addr="0x7f99f1e40fb0" >
-                                <attributelist id="16530" addr="0x7f99f1e40fb0" >
-                                    <attribute name="name" value="xbmcgui" id="16531" addr="0x7f99f1de6c90" />
-                                    <attribute name="csymtab" value="0x7f99f1e40ff0" id="16532" addr="0x7f99f1e40ff0" />
-                                    <attribute name="symtab" value="0x7f99f1e40f90" id="16533" addr="0x7f99f1e40f90" />
+                            <typescopesitem id="16529" addr="0x7fca4698efb0" >
+                                <attributelist id="16530" addr="0x7fca4698efb0" >
+                                    <attribute name="name" value="xbmcgui" id="16531" addr="0x7fca46934c90" />
+                                    <attribute name="csymtab" value="0x7fca4698eff0" id="16532" addr="0x7fca4698eff0" />
+                                    <attribute name="symtab" value="0x7fca4698ef90" id="16533" addr="0x7fca4698ef90" />
                                 </attributelist >
                             </typescopesitem >
                         </typescope >
-                        <attribute name="symtab" value="0x7f99f1e40fb0" id="16534" addr="0x7f99f1e40fb0" />
-                        <attribute name="sym_symtab" value="0x7f99f1e408b0" id="16535" addr="0x7f99f1e408b0" />
+                        <attribute name="symtab" value="0x7fca4698efb0" id="16534" addr="0x7fca4698efb0" />
+                        <attribute name="sym_symtab" value="0x7fca4698e8b0" id="16535" addr="0x7fca4698e8b0" />
                     </attributelist >
 
-                    <classforward id="16536" addr="0x7f99f1db3370" >
-                        <attributelist id="16537" addr="0x7f99f1db3370" >
-                            <attribute name="sym_name" value="ListItem" id="16538" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="ListItem" id="16539" addr="0x7f99f1de6c90" />
-                            <attribute name="kind" value="class" id="16540" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_weak" value="1" id="16541" addr="0x7f99f1de6c90" />
+                    <classforward id="16536" addr="0x7fca46901370" >
+                        <attributelist id="16537" addr="0x7fca46901370" >
+                            <attribute name="sym_name" value="ListItem" id="16538" addr="0x7fca46934c90" />
+                            <attribute name="name" value="ListItem" id="16539" addr="0x7fca46934c90" />
+                            <attribute name="kind" value="class" id="16540" addr="0x7fca46934c90" />
+                            <attribute name="sym_weak" value="1" id="16541" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </classforward >
-                    <classforward id="16542" addr="0x7f99f1db3470" >
-                        <attributelist id="16543" addr="0x7f99f1db3470" >
-                            <attribute name="sym_name" value="WindowXMLInterceptor" id="16544" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="WindowXMLInterceptor" id="16545" addr="0x7f99f1de6c90" />
-                            <attribute name="kind" value="class" id="16546" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_weak" value="1" id="16547" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="16548" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="16549" addr="0x7f99f1de6c90" />
+                    <classforward id="16542" addr="0x7fca46901470" >
+                        <attributelist id="16543" addr="0x7fca46901470" >
+                            <attribute name="sym_name" value="WindowXMLInterceptor" id="16544" addr="0x7fca46934c90" />
+                            <attribute name="name" value="WindowXMLInterceptor" id="16545" addr="0x7fca46934c90" />
+                            <attribute name="kind" value="class" id="16546" addr="0x7fca46934c90" />
+                            <attribute name="sym_weak" value="1" id="16547" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="16548" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="16549" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </classforward >
-                    <class id="16550" addr="0x7f99f1db3670" >
-                        <attributelist id="16551" addr="0x7f99f1db3670" >
-                            <attribute name="name" value="XBMCAddon::xbmcgui::WindowXML" id="16552" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="16553" addr="0x7f99f1e40fb0" />
-                            <attribute name="symtab" value="0x7f99f1db3810" id="16554" addr="0x7f99f1db3810" />
-                            <attribute name="allows_typedef" value="1" id="16555" addr="0x7f99f1de6c90" />
-                            <attribute name="typepass_visit" value="1" id="16556" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_visit" value="1" id="16557" addr="0x7f99f1de6c90" />
-                            <attribute name="kind" value="class" id="16558" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_name" value="WindowXML" id="16559" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_has_constructor" value="1" id="16560" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_public_constructor" value="1" id="16561" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_has_destructor" value="1" id="16562" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_default_destructor" value="1" id="16563" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_copy_constructor" value="1" id="16564" addr="0x7f99f1de6c90" />
-                            <attribute name="privatebaselist" value="0x7f99f1db3650" id="16565" addr="0x7f99f1db3650" />
-                            <attribute name="protectedbaselist" value="0x7f99f1db3630" id="16566" addr="0x7f99f1db3630" />
-                            <baselist id="16567" addr="0x7f99f1db3610" >
-                                <base name="Window" id="16568" addr="0x7f99f1db3590" />
+                    <class id="16550" addr="0x7fca46901670" >
+                        <attributelist id="16551" addr="0x7fca46901670" >
+                            <attribute name="name" value="XBMCAddon::xbmcgui::WindowXML" id="16552" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="16553" addr="0x7fca4698efb0" />
+                            <attribute name="symtab" value="0x7fca46901810" id="16554" addr="0x7fca46901810" />
+                            <attribute name="allows_typedef" value="1" id="16555" addr="0x7fca46934c90" />
+                            <attribute name="typepass_visit" value="1" id="16556" addr="0x7fca46934c90" />
+                            <attribute name="allocate_visit" value="1" id="16557" addr="0x7fca46934c90" />
+                            <attribute name="kind" value="class" id="16558" addr="0x7fca46934c90" />
+                            <attribute name="sym_name" value="WindowXML" id="16559" addr="0x7fca46934c90" />
+                            <attribute name="allocate_has_constructor" value="1" id="16560" addr="0x7fca46934c90" />
+                            <attribute name="allocate_public_constructor" value="1" id="16561" addr="0x7fca46934c90" />
+                            <attribute name="allocate_has_destructor" value="1" id="16562" addr="0x7fca46934c90" />
+                            <attribute name="allocate_default_destructor" value="1" id="16563" addr="0x7fca46934c90" />
+                            <attribute name="allocate_copy_constructor" value="1" id="16564" addr="0x7fca46934c90" />
+                            <attribute name="privatebaselist" value="0x7fca46901650" id="16565" addr="0x7fca46901650" />
+                            <attribute name="protectedbaselist" value="0x7fca46901630" id="16566" addr="0x7fca46901630" />
+                            <baselist id="16567" addr="0x7fca46901610" >
+                                <base name="Window" id="16568" addr="0x7fca46901590" />
                             </baselist >
-                            <attribute name="module" value="xbmcgui" id="16569" addr="0x7f99f1e402f0" />
-                            <attribute name="feature_director" value="1" id="16570" addr="0x7f99f1de6c90" />
-                            <attribute name="bases" value="0x7f99f1de3550" id="16571" addr="0x7f99f1de3550" />
-                            <attribute name="allbases" value="0x7f99f1de37f0" id="16572" addr="0x7f99f1de37f0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="16573" addr="0x7f99f1de6c90" />
-                            <typescope id="16574" addr="0x7f99f1de34d0" >
-                                <attributelist id="16575" addr="0x7f99f1de34d0" >
-                                    <attribute name="inherit" value="0x7f99f1de35d0" id="16576" addr="0x7f99f1de35d0" />
-                                    <attribute name="name" value="WindowXML" id="16577" addr="0x7f99f1de6c90" />
-                                    <typetab id="16578" addr="0x7f99f1de34f0" >
-                                        <attributelist id="16579" addr="0x7f99f1de34f0" >
+                            <attribute name="module" value="xbmcgui" id="16569" addr="0x7fca4698e2f0" />
+                            <attribute name="feature_director" value="1" id="16570" addr="0x7fca46934c90" />
+                            <attribute name="bases" value="0x7fca46931550" id="16571" addr="0x7fca46931550" />
+                            <attribute name="allbases" value="0x7fca469317f0" id="16572" addr="0x7fca469317f0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="16573" addr="0x7fca46934c90" />
+                            <typescope id="16574" addr="0x7fca469314d0" >
+                                <attributelist id="16575" addr="0x7fca469314d0" >
+                                    <attribute name="inherit" value="0x7fca469315d0" id="16576" addr="0x7fca469315d0" />
+                                    <attribute name="name" value="WindowXML" id="16577" addr="0x7fca46934c90" />
+                                    <typetab id="16578" addr="0x7fca469314f0" >
+                                        <attributelist id="16579" addr="0x7fca469314f0" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f99f1dd2150" id="16580" addr="0x7f99f1dd2150" />
-                                    <attribute name="qname" value="XBMCAddon::xbmcgui::WindowXML" id="16581" addr="0x7f99f1de6c90" />
-                                    <attribute name="symtab" value="0x7f99f1db3810" id="16582" addr="0x7f99f1db3810" />
+                                    <attribute name="parent" value="0x7fca46920150" id="16580" addr="0x7fca46920150" />
+                                    <attribute name="qname" value="XBMCAddon::xbmcgui::WindowXML" id="16581" addr="0x7fca46934c90" />
+                                    <attribute name="symtab" value="0x7fca46901810" id="16582" addr="0x7fca46901810" />
                                 </attributelist >
-                                <typescopesitem id="16583" addr="0x7f99f1de35d0" >
-                                    <attributelist id="16584" addr="0x7f99f1de35d0" >
+                                <typescopesitem id="16583" addr="0x7fca469315d0" >
+                                    <attributelist id="16584" addr="0x7fca469315d0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="16585" addr="0x7f99f1de3470" >
-                                    <attributelist id="16586" addr="0x7f99f1de3470" >
+                                <typescopesitem id="16585" addr="0x7fca46931470" >
+                                    <attributelist id="16586" addr="0x7fca46931470" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="16587" addr="0x7f99f1de34f0" >
-                                    <attributelist id="16588" addr="0x7f99f1de34f0" >
+                                <typescopesitem id="16587" addr="0x7fca469314f0" >
+                                    <attributelist id="16588" addr="0x7fca469314f0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="16589" addr="0x7f99f1dd2150" >
-                                    <attributelist id="16590" addr="0x7f99f1dd2150" >
-                                        <attribute name="name" value="xbmcgui" id="16591" addr="0x7f99f1de6c90" />
-                                        <typetab id="16592" addr="0x7f99f1dd2170" >
-                                            <attributelist id="16593" addr="0x7f99f1dd2170" >
-                                                <attribute name="InterceptorBase" value="InterceptorBase" id="16594" addr="0x7f99f1de6c90" />
-                                                <attribute name="Dialog" value="Dialog" id="16595" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="16596" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="16597" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlTextBox" value="ControlTextBox" id="16598" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="16599" addr="0x7f99f1de6c90" />
-                                                <attribute name="Window" value="Window" id="16600" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="16601" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlList" value="ControlList" id="16602" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="16603" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlImage" value="ControlImage" id="16604" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlButton" value="ControlButton" id="16605" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlGroup" value="ControlGroup" id="16606" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogBusy" value="DialogBusy" id="16607" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="16608" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSpin" value="ControlSpin" id="16609" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlEdit" value="ControlEdit" id="16610" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="16611" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="16612" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlLabel" value="ControlLabel" id="16613" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlProgress" value="ControlProgress" id="16614" addr="0x7f99f1de6c90" />
-                                                <attribute name="Control" value="Control" id="16615" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSlider" value="ControlSlider" id="16616" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgress" value="DialogProgress" id="16617" addr="0x7f99f1de6c90" />
-                                                <attribute name="Action" value="Action" id="16618" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowDialog" value="WindowDialog" id="16619" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXML" value="WindowXML" id="16620" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItem" value="ListItem" id="16621" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="16622" addr="0x7f99f1de6c90" />
+                                <typescopesitem id="16589" addr="0x7fca46920150" >
+                                    <attributelist id="16590" addr="0x7fca46920150" >
+                                        <attribute name="name" value="xbmcgui" id="16591" addr="0x7fca46934c90" />
+                                        <typetab id="16592" addr="0x7fca46920170" >
+                                            <attributelist id="16593" addr="0x7fca46920170" >
+                                                <attribute name="InterceptorBase" value="InterceptorBase" id="16594" addr="0x7fca46934c90" />
+                                                <attribute name="Dialog" value="Dialog" id="16595" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="16596" addr="0x7fca46934c90" />
+                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="16597" addr="0x7fca46934c90" />
+                                                <attribute name="ControlTextBox" value="ControlTextBox" id="16598" addr="0x7fca46934c90" />
+                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="16599" addr="0x7fca46934c90" />
+                                                <attribute name="Window" value="Window" id="16600" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="16601" addr="0x7fca46934c90" />
+                                                <attribute name="ControlList" value="ControlList" id="16602" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="16603" addr="0x7fca46934c90" />
+                                                <attribute name="ControlImage" value="ControlImage" id="16604" addr="0x7fca46934c90" />
+                                                <attribute name="ControlButton" value="ControlButton" id="16605" addr="0x7fca46934c90" />
+                                                <attribute name="ControlGroup" value="ControlGroup" id="16606" addr="0x7fca46934c90" />
+                                                <attribute name="DialogBusy" value="DialogBusy" id="16607" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="16608" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSpin" value="ControlSpin" id="16609" addr="0x7fca46934c90" />
+                                                <attribute name="ControlEdit" value="ControlEdit" id="16610" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="16611" addr="0x7fca46934c90" />
+                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="16612" addr="0x7fca46934c90" />
+                                                <attribute name="ControlLabel" value="ControlLabel" id="16613" addr="0x7fca46934c90" />
+                                                <attribute name="ControlProgress" value="ControlProgress" id="16614" addr="0x7fca46934c90" />
+                                                <attribute name="Control" value="Control" id="16615" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSlider" value="ControlSlider" id="16616" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgress" value="DialogProgress" id="16617" addr="0x7fca46934c90" />
+                                                <attribute name="Action" value="Action" id="16618" addr="0x7fca46934c90" />
+                                                <attribute name="WindowDialog" value="WindowDialog" id="16619" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXML" value="WindowXML" id="16620" addr="0x7fca46934c90" />
+                                                <attribute name="ListItem" value="ListItem" id="16621" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="16622" addr="0x7fca46934c90" />
                                             </attributelist >
-                                            <typetabsitem id="16623" addr="0x7f99f1de1dd0" >
-                                                <attributelist id="16624" addr="0x7f99f1de1dd0" >
+                                            <typetabsitem id="16623" addr="0x7fca4692fdd0" >
+                                                <attributelist id="16624" addr="0x7fca4692fdd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16625" addr="0x7f99f1dde790" >
-                                                <attributelist id="16626" addr="0x7f99f1dde790" >
+                                            <typetabsitem id="16625" addr="0x7fca4692c790" >
+                                                <attributelist id="16626" addr="0x7fca4692c790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16627" addr="0x7f99f1de3f10" >
-                                                <attributelist id="16628" addr="0x7f99f1de3f10" >
+                                            <typetabsitem id="16627" addr="0x7fca46931f10" >
+                                                <attributelist id="16628" addr="0x7fca46931f10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16629" addr="0x7f99f1dd67b0" >
-                                                <attributelist id="16630" addr="0x7f99f1dd67b0" >
+                                            <typetabsitem id="16629" addr="0x7fca469247b0" >
+                                                <attributelist id="16630" addr="0x7fca469247b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16631" addr="0x7f99f1ddafd0" >
-                                                <attributelist id="16632" addr="0x7f99f1ddafd0" >
+                                            <typetabsitem id="16631" addr="0x7fca46928fd0" >
+                                                <attributelist id="16632" addr="0x7fca46928fd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16633" addr="0x7f99f1ddd430" >
-                                                <attributelist id="16634" addr="0x7f99f1ddd430" >
+                                            <typetabsitem id="16633" addr="0x7fca4692b430" >
+                                                <attributelist id="16634" addr="0x7fca4692b430" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16635" addr="0x7f99f1de2130" >
-                                                <attributelist id="16636" addr="0x7f99f1de2130" >
+                                            <typetabsitem id="16635" addr="0x7fca46930130" >
+                                                <attributelist id="16636" addr="0x7fca46930130" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16637" addr="0x7f99f1dd2f50" >
-                                                <attributelist id="16638" addr="0x7f99f1dd2f50" >
+                                            <typetabsitem id="16637" addr="0x7fca46920f50" >
+                                                <attributelist id="16638" addr="0x7fca46920f50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16639" addr="0x7f99f1dd9650" >
-                                                <attributelist id="16640" addr="0x7f99f1dd9650" >
+                                            <typetabsitem id="16639" addr="0x7fca46927650" >
+                                                <attributelist id="16640" addr="0x7fca46927650" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16641" addr="0x7f99f1de3390" >
-                                                <attributelist id="16642" addr="0x7f99f1de3390" >
+                                            <typetabsitem id="16641" addr="0x7fca46931390" >
+                                                <attributelist id="16642" addr="0x7fca46931390" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16643" addr="0x7f99f1ddb7b0" >
-                                                <attributelist id="16644" addr="0x7f99f1ddb7b0" >
+                                            <typetabsitem id="16643" addr="0x7fca469297b0" >
+                                                <attributelist id="16644" addr="0x7fca469297b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16645" addr="0x7f99f1ddc4b0" >
-                                                <attributelist id="16646" addr="0x7f99f1ddc4b0" >
+                                            <typetabsitem id="16645" addr="0x7fca4692a4b0" >
+                                                <attributelist id="16646" addr="0x7fca4692a4b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16647" addr="0x7f99f1ddcf90" >
-                                                <attributelist id="16648" addr="0x7f99f1ddcf90" >
+                                            <typetabsitem id="16647" addr="0x7fca4692af90" >
+                                                <attributelist id="16648" addr="0x7fca4692af90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16649" addr="0x7f99f1de11b0" >
-                                                <attributelist id="16650" addr="0x7f99f1de11b0" >
+                                            <typetabsitem id="16649" addr="0x7fca4692f1b0" >
+                                                <attributelist id="16650" addr="0x7fca4692f1b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16651" addr="0x7f99f1de15b0" >
-                                                <attributelist id="16652" addr="0x7f99f1de15b0" >
+                                            <typetabsitem id="16651" addr="0x7fca4692f5b0" >
+                                                <attributelist id="16652" addr="0x7fca4692f5b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16653" addr="0x7f99f1dd77f0" >
-                                                <attributelist id="16654" addr="0x7f99f1dd77f0" >
+                                            <typetabsitem id="16653" addr="0x7fca469257f0" >
+                                                <attributelist id="16654" addr="0x7fca469257f0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16655" addr="0x7f99f1dd8b30" >
-                                                <attributelist id="16656" addr="0x7f99f1dd8b30" >
+                                            <typetabsitem id="16655" addr="0x7fca46926b30" >
+                                                <attributelist id="16656" addr="0x7fca46926b30" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16657" addr="0x7f99f1dd2c50" >
-                                                <attributelist id="16658" addr="0x7f99f1dd2c50" >
+                                            <typetabsitem id="16657" addr="0x7fca46920c50" >
+                                                <attributelist id="16658" addr="0x7fca46920c50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16659" addr="0x7f99f1dda790" >
-                                                <attributelist id="16660" addr="0x7f99f1dda790" >
+                                            <typetabsitem id="16659" addr="0x7fca46928790" >
+                                                <attributelist id="16660" addr="0x7fca46928790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16661" addr="0x7f99f1dd8030" >
-                                                <attributelist id="16662" addr="0x7f99f1dd8030" >
+                                            <typetabsitem id="16661" addr="0x7fca46926030" >
+                                                <attributelist id="16662" addr="0x7fca46926030" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16663" addr="0x7f99f1ddbe10" >
-                                                <attributelist id="16664" addr="0x7f99f1ddbe10" >
+                                            <typetabsitem id="16663" addr="0x7fca46929e10" >
+                                                <attributelist id="16664" addr="0x7fca46929e10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16665" addr="0x7f99f1dd6b10" >
-                                                <attributelist id="16666" addr="0x7f99f1dd6b10" >
+                                            <typetabsitem id="16665" addr="0x7fca46924b10" >
+                                                <attributelist id="16666" addr="0x7fca46924b10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16667" addr="0x7f99f1dddf90" >
-                                                <attributelist id="16668" addr="0x7f99f1dddf90" >
+                                            <typetabsitem id="16667" addr="0x7fca4692bf90" >
+                                                <attributelist id="16668" addr="0x7fca4692bf90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16669" addr="0x7f99f1de0530" >
-                                                <attributelist id="16670" addr="0x7f99f1de0530" >
+                                            <typetabsitem id="16669" addr="0x7fca4692e530" >
+                                                <attributelist id="16670" addr="0x7fca4692e530" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16671" addr="0x7f99f1de1e50" >
-                                                <attributelist id="16672" addr="0x7f99f1de1e50" >
+                                            <typetabsitem id="16671" addr="0x7fca4692fe50" >
+                                                <attributelist id="16672" addr="0x7fca4692fe50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16673" addr="0x7f99f1de2d90" >
-                                                <attributelist id="16674" addr="0x7f99f1de2d90" >
+                                            <typetabsitem id="16673" addr="0x7fca46930d90" >
+                                                <attributelist id="16674" addr="0x7fca46930d90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16675" addr="0x7f99f1de3410" >
-                                                <attributelist id="16676" addr="0x7f99f1de3410" >
+                                            <typetabsitem id="16675" addr="0x7fca46931410" >
+                                                <attributelist id="16676" addr="0x7fca46931410" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16677" addr="0x7f99f1dd3590" >
-                                                <attributelist id="16678" addr="0x7f99f1dd3590" >
+                                            <typetabsitem id="16677" addr="0x7fca46921590" >
+                                                <attributelist id="16678" addr="0x7fca46921590" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16679" addr="0x7f99f1dd3390" >
-                                                <attributelist id="16680" addr="0x7f99f1dd3390" >
+                                            <typetabsitem id="16679" addr="0x7fca46921390" >
+                                                <attributelist id="16680" addr="0x7fca46921390" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7f99f1dd1d70" id="16681" addr="0x7f99f1dd1d70" />
-                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="16682" addr="0x7f99f1de6c90" />
-                                        <attribute name="symtab" value="0x7f99f1e40fb0" id="16683" addr="0x7f99f1e40fb0" />
+                                        <attribute name="parent" value="0x7fca4691fd70" id="16681" addr="0x7fca4691fd70" />
+                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="16682" addr="0x7fca46934c90" />
+                                        <attribute name="symtab" value="0x7fca4698efb0" id="16683" addr="0x7fca4698efb0" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="16684" addr="0x7f99f1de3510" >
-                                    <attributelist id="16685" addr="0x7f99f1de3510" >
+                                <typescopesitem id="16684" addr="0x7fca46931510" >
+                                    <attributelist id="16685" addr="0x7fca46931510" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="16686" addr="0x7f99f1db3810" >
-                                    <attributelist id="16687" addr="0x7f99f1db3810" >
-                                        <attribute name="inherit" value="0x7f99f1db3890" id="16688" addr="0x7f99f1db3890" />
-                                        <attribute name="name" value="WindowXML" id="16689" addr="0x7f99f1de6c90" />
-                                        <attribute name="csymtab" value="0x7f99f1db3790" id="16690" addr="0x7f99f1db3790" />
-                                        <attribute name="symtab" value="0x7f99f1db37b0" id="16691" addr="0x7f99f1db37b0" />
+                                <typescopesitem id="16686" addr="0x7fca46901810" >
+                                    <attributelist id="16687" addr="0x7fca46901810" >
+                                        <attribute name="inherit" value="0x7fca46901890" id="16688" addr="0x7fca46901890" />
+                                        <attribute name="name" value="WindowXML" id="16689" addr="0x7fca46934c90" />
+                                        <attribute name="csymtab" value="0x7fca46901790" id="16690" addr="0x7fca46901790" />
+                                        <attribute name="symtab" value="0x7fca469017b0" id="16691" addr="0x7fca469017b0" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <cdecl id="16692" addr="0x7f99f1db3970" >
-                            <attributelist id="16693" addr="0x7f99f1db3970" >
-                                <attribute name="ismember" value="1" id="16694" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="sFallBackPath" id="16695" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="" id="16696" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="private" id="16697" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="variable" id="16698" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="std::string" id="16699" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1db3810" id="16700" addr="0x7f99f1db3810" />
+                        <cdecl id="16692" addr="0x7fca46901970" >
+                            <attributelist id="16693" addr="0x7fca46901970" >
+                                <attribute name="ismember" value="1" id="16694" addr="0x7fca46934c90" />
+                                <attribute name="name" value="sFallBackPath" id="16695" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="" id="16696" addr="0x7fca46934c90" />
+                                <attribute name="access" value="private" id="16697" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="variable" id="16698" addr="0x7fca46934c90" />
+                                <attribute name="type" value="std::string" id="16699" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca46901810" id="16700" addr="0x7fca46901810" />
                             </attributelist >
                          
                         </cdecl >
-                        <access id="16701" addr="0x7f99f1db3a50" >
-                            <attributelist id="16702" addr="0x7f99f1db3a50" >
-                                <attribute name="kind" value="protected" id="16703" addr="0x7f99f1de6c90" />
+                        <access id="16701" addr="0x7fca46901a50" >
+                            <attributelist id="16702" addr="0x7fca46901a50" >
+                                <attribute name="kind" value="protected" id="16703" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </access >
-                        <access id="16704" addr="0x7f99f1db3af0" >
-                            <attributelist id="16705" addr="0x7f99f1db3af0" >
-                                <attribute name="kind" value="public" id="16706" addr="0x7f99f1de6c90" />
+                        <access id="16704" addr="0x7fca46901af0" >
+                            <attributelist id="16705" addr="0x7fca46901af0" >
+                                <attribute name="kind" value="public" id="16706" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="16707" addr="0x7f99f1db4290" >
-                            <attributelist id="16708" addr="0x7f99f1db4290" >
-                                <attribute name="name" value="WindowXML" id="16709" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="16710" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1db3810" id="16711" addr="0x7f99f1db3810" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1db4610" id="16712" addr="0x7f99f1db4610" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1db4610" id="16713" addr="0x7f99f1db4610" />
-                                <attribute name="sym_name" value="WindowXML" id="16714" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).String,r.q(const).String,r.q(const).String,r.q(const).String,bool)." id="16715" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="16716" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_director" value="1" id="16717" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_python_nokwds" value="true" id="16718" addr="0x7f99f1de6c90" />
-                                <parmlist id="16719" addr="0x7f99f1db3c50" >
+                        <constructor id="16707" addr="0x7fca46902290" >
+                            <attributelist id="16708" addr="0x7fca46902290" >
+                                <attribute name="name" value="WindowXML" id="16709" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="16710" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca46901810" id="16711" addr="0x7fca46901810" />
+                                <attribute name="sym_nextSibling" value="0x7fca46902610" id="16712" addr="0x7fca46902610" />
+                                <attribute name="csym_nextSibling" value="0x7fca46902610" id="16713" addr="0x7fca46902610" />
+                                <attribute name="sym_name" value="WindowXML" id="16714" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).String,r.q(const).String,r.q(const).String,r.q(const).String,bool)." id="16715" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="16716" addr="0x7fca46934c90" />
+                                <attribute name="feature_director" value="1" id="16717" addr="0x7fca46934c90" />
+                                <attribute name="feature_python_nokwds" value="true" id="16718" addr="0x7fca46934c90" />
+                                <parmlist id="16719" addr="0x7fca46901c50" >
                                     <parm id="16720">
-                                        <attributelist id="16721" addr="0x7f99f1db3c50" >
-                                            <attribute name="name" value="xmlFilename" id="16722" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="16723" addr="0x7f99f1de6c90" />
+                                        <attributelist id="16721" addr="0x7fca46901c50" >
+                                            <attribute name="name" value="xmlFilename" id="16722" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="16723" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="16724">
-                                        <attributelist id="16725" addr="0x7f99f1db3d90" >
-                                            <attribute name="name" value="scriptPath" id="16726" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="16727" addr="0x7f99f1de6c90" />
+                                        <attributelist id="16725" addr="0x7fca46901d90" >
+                                            <attribute name="name" value="scriptPath" id="16726" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="16727" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="16728">
-                                        <attributelist id="16729" addr="0x7f99f1db3f10" >
-                                            <attribute name="name" value="defaultSkin" id="16730" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="&quot;Default&quot;" id="16731" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="16732" addr="0x7f99f1de6c90" />
+                                        <attributelist id="16729" addr="0x7fca46901f10" >
+                                            <attribute name="name" value="defaultSkin" id="16730" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="&quot;Default&quot;" id="16731" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="16732" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="16733">
-                                        <attributelist id="16734" addr="0x7f99f1db4090" >
-                                            <attribute name="name" value="defaultRes" id="16735" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="&quot;720p&quot;" id="16736" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="16737" addr="0x7f99f1de6c90" />
+                                        <attributelist id="16734" addr="0x7fca46902090" >
+                                            <attribute name="name" value="defaultRes" id="16735" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="&quot;720p&quot;" id="16736" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="16737" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="16738">
-                                        <attributelist id="16739" addr="0x7f99f1db41d0" >
-                                            <attribute name="name" value="isMedia" id="16740" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="false" id="16741" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="16742" addr="0x7f99f1de6c90" />
+                                        <attributelist id="16739" addr="0x7fca469021d0" >
+                                            <attribute name="name" value="isMedia" id="16740" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="false" id="16741" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="16742" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overloaded" value="0x7f99f1db4290" id="16743" addr="0x7f99f1db4290" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="16744" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="16745" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overloaded" value="0x7fca46902290" id="16743" addr="0x7fca46902290" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="16744" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="16745" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="16746" addr="0x7f99f1db4610" >
-                            <attributelist id="16747" addr="0x7f99f1db4610" >
-                                <attribute name="name" value="WindowXML" id="16748" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="16749" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1db3810" id="16750" addr="0x7f99f1db3810" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1db4290" id="16751" addr="0x7f99f1db4290" />
-                                <attribute name="sym_name" value="WindowXML" id="16752" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1db48f0" id="16753" addr="0x7f99f1db48f0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1db48f0" id="16754" addr="0x7f99f1db48f0" />
-                                <attribute name="decl" value="f(r.q(const).String,r.q(const).String,r.q(const).String,r.q(const).String)." id="16755" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1db4290" id="16756" addr="0x7f99f1db4290" />
-                                <attribute name="access" value="public" id="16757" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_director" value="1" id="16758" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1db4290" id="16759" addr="0x7f99f1db4290" />
-                                <attribute name="feature_python_nokwds" value="true" id="16760" addr="0x7f99f1de6c90" />
-                                <parmlist id="16761" addr="0x7f99f1db4330" >
+                        <constructor id="16746" addr="0x7fca46902610" >
+                            <attributelist id="16747" addr="0x7fca46902610" >
+                                <attribute name="name" value="WindowXML" id="16748" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="16749" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca46901810" id="16750" addr="0x7fca46901810" />
+                                <attribute name="sym_previousSibling" value="0x7fca46902290" id="16751" addr="0x7fca46902290" />
+                                <attribute name="sym_name" value="WindowXML" id="16752" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469028f0" id="16753" addr="0x7fca469028f0" />
+                                <attribute name="sym_nextSibling" value="0x7fca469028f0" id="16754" addr="0x7fca469028f0" />
+                                <attribute name="decl" value="f(r.q(const).String,r.q(const).String,r.q(const).String,r.q(const).String)." id="16755" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca46902290" id="16756" addr="0x7fca46902290" />
+                                <attribute name="access" value="public" id="16757" addr="0x7fca46934c90" />
+                                <attribute name="feature_director" value="1" id="16758" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca46902290" id="16759" addr="0x7fca46902290" />
+                                <attribute name="feature_python_nokwds" value="true" id="16760" addr="0x7fca46934c90" />
+                                <parmlist id="16761" addr="0x7fca46902330" >
                                     <parm id="16762">
-                                        <attributelist id="16763" addr="0x7f99f1db4330" >
-                                            <attribute name="name" value="xmlFilename" id="16764" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="16765" addr="0x7f99f1de6c90" />
+                                        <attributelist id="16763" addr="0x7fca46902330" >
+                                            <attribute name="name" value="xmlFilename" id="16764" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="16765" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="16766">
-                                        <attributelist id="16767" addr="0x7f99f1db4430" >
-                                            <attribute name="name" value="scriptPath" id="16768" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="16769" addr="0x7f99f1de6c90" />
+                                        <attributelist id="16767" addr="0x7fca46902430" >
+                                            <attribute name="name" value="scriptPath" id="16768" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="16769" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="16770">
-                                        <attributelist id="16771" addr="0x7f99f1db44b0" >
-                                            <attribute name="name" value="defaultSkin" id="16772" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="&quot;Default&quot;" id="16773" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="16774" addr="0x7f99f1de6c90" />
+                                        <attributelist id="16771" addr="0x7fca469024b0" >
+                                            <attribute name="name" value="defaultSkin" id="16772" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="&quot;Default&quot;" id="16773" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="16774" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="16775">
-                                        <attributelist id="16776" addr="0x7f99f1db4550" >
-                                            <attribute name="name" value="defaultRes" id="16777" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="&quot;720p&quot;" id="16778" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="16779" addr="0x7f99f1de6c90" />
+                                        <attributelist id="16776" addr="0x7fca46902550" >
+                                            <attribute name="name" value="defaultRes" id="16777" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="&quot;720p&quot;" id="16778" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="16779" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_1" id="16780" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="16781" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="16780" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="16781" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="16782" addr="0x7f99f1db48f0" >
-                            <attributelist id="16783" addr="0x7f99f1db48f0" >
-                                <attribute name="name" value="WindowXML" id="16784" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="16785" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1db3810" id="16786" addr="0x7f99f1db3810" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1db4610" id="16787" addr="0x7f99f1db4610" />
-                                <attribute name="sym_name" value="WindowXML" id="16788" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1db4b30" id="16789" addr="0x7f99f1db4b30" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1db4b30" id="16790" addr="0x7f99f1db4b30" />
-                                <attribute name="decl" value="f(r.q(const).String,r.q(const).String,r.q(const).String)." id="16791" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1db4290" id="16792" addr="0x7f99f1db4290" />
-                                <attribute name="access" value="public" id="16793" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_director" value="1" id="16794" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1db4290" id="16795" addr="0x7f99f1db4290" />
-                                <attribute name="feature_python_nokwds" value="true" id="16796" addr="0x7f99f1de6c90" />
-                                <parmlist id="16797" addr="0x7f99f1db46b0" >
+                        <constructor id="16782" addr="0x7fca469028f0" >
+                            <attributelist id="16783" addr="0x7fca469028f0" >
+                                <attribute name="name" value="WindowXML" id="16784" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="16785" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca46901810" id="16786" addr="0x7fca46901810" />
+                                <attribute name="sym_previousSibling" value="0x7fca46902610" id="16787" addr="0x7fca46902610" />
+                                <attribute name="sym_name" value="WindowXML" id="16788" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca46902b30" id="16789" addr="0x7fca46902b30" />
+                                <attribute name="sym_nextSibling" value="0x7fca46902b30" id="16790" addr="0x7fca46902b30" />
+                                <attribute name="decl" value="f(r.q(const).String,r.q(const).String,r.q(const).String)." id="16791" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca46902290" id="16792" addr="0x7fca46902290" />
+                                <attribute name="access" value="public" id="16793" addr="0x7fca46934c90" />
+                                <attribute name="feature_director" value="1" id="16794" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca46902290" id="16795" addr="0x7fca46902290" />
+                                <attribute name="feature_python_nokwds" value="true" id="16796" addr="0x7fca46934c90" />
+                                <parmlist id="16797" addr="0x7fca469026b0" >
                                     <parm id="16798">
-                                        <attributelist id="16799" addr="0x7f99f1db46b0" >
-                                            <attribute name="name" value="xmlFilename" id="16800" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="16801" addr="0x7f99f1de6c90" />
+                                        <attributelist id="16799" addr="0x7fca469026b0" >
+                                            <attribute name="name" value="xmlFilename" id="16800" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="16801" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="16802">
-                                        <attributelist id="16803" addr="0x7f99f1db47b0" >
-                                            <attribute name="name" value="scriptPath" id="16804" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="16805" addr="0x7f99f1de6c90" />
+                                        <attributelist id="16803" addr="0x7fca469027b0" >
+                                            <attribute name="name" value="scriptPath" id="16804" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="16805" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="16806">
-                                        <attributelist id="16807" addr="0x7f99f1db4830" >
-                                            <attribute name="name" value="defaultSkin" id="16808" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="&quot;Default&quot;" id="16809" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="16810" addr="0x7f99f1de6c90" />
+                                        <attributelist id="16807" addr="0x7fca46902830" >
+                                            <attribute name="name" value="defaultSkin" id="16808" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="&quot;Default&quot;" id="16809" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="16810" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_2" id="16811" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="16812" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_2" id="16811" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="16812" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="16813" addr="0x7f99f1db4b30" >
-                            <attributelist id="16814" addr="0x7f99f1db4b30" >
-                                <attribute name="name" value="WindowXML" id="16815" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="16816" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1db3810" id="16817" addr="0x7f99f1db3810" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1db48f0" id="16818" addr="0x7f99f1db48f0" />
-                                <attribute name="sym_name" value="WindowXML" id="16819" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).String,r.q(const).String)." id="16820" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1db4290" id="16821" addr="0x7f99f1db4290" />
-                                <attribute name="access" value="public" id="16822" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_director" value="1" id="16823" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1db4290" id="16824" addr="0x7f99f1db4290" />
-                                <attribute name="feature_python_nokwds" value="true" id="16825" addr="0x7f99f1de6c90" />
-                                <parmlist id="16826" addr="0x7f99f1db4990" >
+                        <constructor id="16813" addr="0x7fca46902b30" >
+                            <attributelist id="16814" addr="0x7fca46902b30" >
+                                <attribute name="name" value="WindowXML" id="16815" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="16816" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca46901810" id="16817" addr="0x7fca46901810" />
+                                <attribute name="sym_previousSibling" value="0x7fca469028f0" id="16818" addr="0x7fca469028f0" />
+                                <attribute name="sym_name" value="WindowXML" id="16819" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).String,r.q(const).String)." id="16820" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca46902290" id="16821" addr="0x7fca46902290" />
+                                <attribute name="access" value="public" id="16822" addr="0x7fca46934c90" />
+                                <attribute name="feature_director" value="1" id="16823" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca46902290" id="16824" addr="0x7fca46902290" />
+                                <attribute name="feature_python_nokwds" value="true" id="16825" addr="0x7fca46934c90" />
+                                <parmlist id="16826" addr="0x7fca46902990" >
                                     <parm id="16827">
-                                        <attributelist id="16828" addr="0x7f99f1db4990" >
-                                            <attribute name="name" value="xmlFilename" id="16829" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="16830" addr="0x7f99f1de6c90" />
+                                        <attributelist id="16828" addr="0x7fca46902990" >
+                                            <attribute name="name" value="xmlFilename" id="16829" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="16830" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="16831">
-                                        <attributelist id="16832" addr="0x7f99f1db4a90" >
-                                            <attribute name="name" value="scriptPath" id="16833" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="16834" addr="0x7f99f1de6c90" />
+                                        <attributelist id="16832" addr="0x7fca46902a90" >
+                                            <attribute name="name" value="scriptPath" id="16833" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="16834" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_3" id="16835" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="16836" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_3" id="16835" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="16836" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <destructor id="16837" addr="0x7f99f1db4cd0" >
-                            <attributelist id="16838" addr="0x7f99f1db4cd0" >
-                                <attribute name="ismember" value="1" id="16839" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="~WindowXML" id="16840" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="~WindowXML" id="16841" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="16842" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="16843" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1db3810" id="16844" addr="0x7f99f1db3810" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="16845" addr="0x7f99f1de6c90" />
+                        <destructor id="16837" addr="0x7fca46902cd0" >
+                            <attributelist id="16838" addr="0x7fca46902cd0" >
+                                <attribute name="ismember" value="1" id="16839" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="~WindowXML" id="16840" addr="0x7fca46934c90" />
+                                <attribute name="name" value="~WindowXML" id="16841" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="16842" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="16843" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca46901810" id="16844" addr="0x7fca46901810" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="16845" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </destructor >
-                        <cdecl id="16846" addr="0x7f99f1db52d0" >
-                            <attributelist id="16847" addr="0x7f99f1db52d0" >
-                                <attribute name="name" value="addItem" id="16848" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="16849" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1db3810" id="16850" addr="0x7f99f1db3810" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1db5470" id="16851" addr="0x7f99f1db5470" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1db5470" id="16852" addr="0x7f99f1db5470" />
-                                <attribute name="kind" value="function" id="16853" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="addItem" id="16854" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>,int)." id="16855" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="16856" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1db52d0" id="16857" addr="0x7f99f1db52d0" />
-                                <parmlist id="16858" addr="0x7f99f1db5090" >
+                        <cdecl id="16846" addr="0x7fca469032d0" >
+                            <attributelist id="16847" addr="0x7fca469032d0" >
+                                <attribute name="name" value="addItem" id="16848" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="16849" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca46901810" id="16850" addr="0x7fca46901810" />
+                                <attribute name="sym_nextSibling" value="0x7fca46903470" id="16851" addr="0x7fca46903470" />
+                                <attribute name="csym_nextSibling" value="0x7fca46903470" id="16852" addr="0x7fca46903470" />
+                                <attribute name="kind" value="function" id="16853" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="addItem" id="16854" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>,int)." id="16855" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="16856" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469032d0" id="16857" addr="0x7fca469032d0" />
+                                <parmlist id="16858" addr="0x7fca46903090" >
                                     <parm id="16859">
-                                        <attributelist id="16860" addr="0x7f99f1db5090" >
-                                            <attribute name="name" value="item" id="16861" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>" id="16862" addr="0x7f99f1de6c90" />
+                                        <attributelist id="16860" addr="0x7fca46903090" >
+                                            <attribute name="name" value="item" id="16861" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>" id="16862" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="16863">
-                                        <attributelist id="16864" addr="0x7f99f1db5210" >
-                                            <attribute name="name" value="position" id="16865" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="INT_MAX" id="16866" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="16867" addr="0x7f99f1de6c90" />
+                                        <attributelist id="16864" addr="0x7fca46903210" >
+                                            <attribute name="name" value="position" id="16865" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="INT_MAX" id="16866" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="16867" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="16868" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="16869" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="16868" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="16869" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="16870" addr="0x7f99f1db5470" >
-                            <attributelist id="16871" addr="0x7f99f1db5470" >
-                                <attribute name="name" value="addItem" id="16872" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="16873" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1db3810" id="16874" addr="0x7f99f1db3810" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1db52d0" id="16875" addr="0x7f99f1db52d0" />
-                                <attribute name="kind" value="function" id="16876" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="addItem" id="16877" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1db52d0" id="16878" addr="0x7f99f1db52d0" />
-                                <attribute name="decl" value="f(r.q(const).Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)." id="16879" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="16880" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1db52d0" id="16881" addr="0x7f99f1db52d0" />
-                                <parmlist id="16882" addr="0x7f99f1db5370" >
+                        <cdecl id="16870" addr="0x7fca46903470" >
+                            <attributelist id="16871" addr="0x7fca46903470" >
+                                <attribute name="name" value="addItem" id="16872" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="16873" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca46901810" id="16874" addr="0x7fca46901810" />
+                                <attribute name="sym_previousSibling" value="0x7fca469032d0" id="16875" addr="0x7fca469032d0" />
+                                <attribute name="kind" value="function" id="16876" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="addItem" id="16877" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469032d0" id="16878" addr="0x7fca469032d0" />
+                                <attribute name="decl" value="f(r.q(const).Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)." id="16879" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="16880" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469032d0" id="16881" addr="0x7fca469032d0" />
+                                <parmlist id="16882" addr="0x7fca46903370" >
                                     <parm id="16883">
-                                        <attributelist id="16884" addr="0x7f99f1db5370" >
-                                            <attribute name="name" value="item" id="16885" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>" id="16886" addr="0x7f99f1de6c90" />
+                                        <attributelist id="16884" addr="0x7fca46903370" >
+                                            <attribute name="name" value="item" id="16885" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>" id="16886" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="16887" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="16888" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="16887" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="16888" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="16889" addr="0x7f99f1db5bf0" >
-                            <attributelist id="16890" addr="0x7f99f1db5bf0" >
-                                <attribute name="name" value="addItems" id="16891" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="16892" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1db3810" id="16893" addr="0x7f99f1db3810" />
-                                <attribute name="kind" value="function" id="16894" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="addItems" id="16895" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>)." id="16896" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="16897" addr="0x7f99f1de6c90" />
-                                <parmlist id="16898" addr="0x7f99f1db5b10" >
+                        <cdecl id="16889" addr="0x7fca46903bf0" >
+                            <attributelist id="16890" addr="0x7fca46903bf0" >
+                                <attribute name="name" value="addItems" id="16891" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="16892" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca46901810" id="16893" addr="0x7fca46901810" />
+                                <attribute name="kind" value="function" id="16894" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="addItems" id="16895" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>)." id="16896" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="16897" addr="0x7fca46934c90" />
+                                <parmlist id="16898" addr="0x7fca46903b10" >
                                     <parm id="16899">
-                                        <attributelist id="16900" addr="0x7f99f1db5b10" >
-                                            <attribute name="name" value="items" id="16901" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>" id="16902" addr="0x7f99f1de6c90" />
+                                        <attributelist id="16900" addr="0x7fca46903b10" >
+                                            <attribute name="name" value="items" id="16901" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>" id="16902" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="16903" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="16904" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="16903" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="16904" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="16905" addr="0x7f99f1db5ed0" >
-                            <attributelist id="16906" addr="0x7f99f1db5ed0" >
-                                <attribute name="name" value="removeItem" id="16907" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="16908" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1db3810" id="16909" addr="0x7f99f1db3810" />
-                                <attribute name="kind" value="function" id="16910" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="removeItem" id="16911" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(int)." id="16912" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="16913" addr="0x7f99f1de6c90" />
-                                <parmlist id="16914" addr="0x7f99f1db5e10" >
+                        <cdecl id="16905" addr="0x7fca46903ed0" >
+                            <attributelist id="16906" addr="0x7fca46903ed0" >
+                                <attribute name="name" value="removeItem" id="16907" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="16908" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca46901810" id="16909" addr="0x7fca46901810" />
+                                <attribute name="kind" value="function" id="16910" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="removeItem" id="16911" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(int)." id="16912" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="16913" addr="0x7fca46934c90" />
+                                <parmlist id="16914" addr="0x7fca46903e10" >
                                     <parm id="16915">
-                                        <attributelist id="16916" addr="0x7f99f1db5e10" >
-                                            <attribute name="name" value="position" id="16917" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="16918" addr="0x7f99f1de6c90" />
+                                        <attributelist id="16916" addr="0x7fca46903e10" >
+                                            <attribute name="name" value="position" id="16917" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="16918" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="16919" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="16920" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="16919" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="16920" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="16921" addr="0x7f99f1db60b0" >
-                            <attributelist id="16922" addr="0x7f99f1db60b0" >
-                                <attribute name="ismember" value="1" id="16923" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getCurrentListPosition" id="16924" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="getCurrentListPosition" id="16925" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="16926" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="16927" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="16928" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="int" id="16929" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1db3810" id="16930" addr="0x7f99f1db3810" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="16931" addr="0x7f99f1de6c90" />
+                        <cdecl id="16921" addr="0x7fca469040b0" >
+                            <attributelist id="16922" addr="0x7fca469040b0" >
+                                <attribute name="ismember" value="1" id="16923" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getCurrentListPosition" id="16924" addr="0x7fca46934c90" />
+                                <attribute name="name" value="getCurrentListPosition" id="16925" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="16926" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="16927" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="16928" addr="0x7fca46934c90" />
+                                <attribute name="type" value="int" id="16929" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca46901810" id="16930" addr="0x7fca46901810" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="16931" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="16932" addr="0x7f99f1db6390" >
-                            <attributelist id="16933" addr="0x7f99f1db6390" >
-                                <attribute name="name" value="setCurrentListPosition" id="16934" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="16935" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1db3810" id="16936" addr="0x7f99f1db3810" />
-                                <attribute name="kind" value="function" id="16937" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setCurrentListPosition" id="16938" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(int)." id="16939" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="16940" addr="0x7f99f1de6c90" />
-                                <parmlist id="16941" addr="0x7f99f1db62d0" >
+                        <cdecl id="16932" addr="0x7fca46904390" >
+                            <attributelist id="16933" addr="0x7fca46904390" >
+                                <attribute name="name" value="setCurrentListPosition" id="16934" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="16935" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca46901810" id="16936" addr="0x7fca46901810" />
+                                <attribute name="kind" value="function" id="16937" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setCurrentListPosition" id="16938" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(int)." id="16939" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="16940" addr="0x7fca46934c90" />
+                                <parmlist id="16941" addr="0x7fca469042d0" >
                                     <parm id="16942">
-                                        <attributelist id="16943" addr="0x7f99f1db62d0" >
-                                            <attribute name="name" value="position" id="16944" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="16945" addr="0x7f99f1de6c90" />
+                                        <attributelist id="16943" addr="0x7fca469042d0" >
+                                            <attribute name="name" value="position" id="16944" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="16945" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="16946" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="16947" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="16946" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="16947" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="16948" addr="0x7f99f1db6670" >
-                            <attributelist id="16949" addr="0x7f99f1db6670" >
-                                <attribute name="name" value="getListItem" id="16950" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="16951" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1db3810" id="16952" addr="0x7f99f1db3810" />
-                                <attribute name="kind" value="function" id="16953" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getListItem" id="16954" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(int).p." id="16955" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="16956" addr="0x7f99f1de6c90" />
-                                <parmlist id="16957" addr="0x7f99f1db65f0" >
+                        <cdecl id="16948" addr="0x7fca46904670" >
+                            <attributelist id="16949" addr="0x7fca46904670" >
+                                <attribute name="name" value="getListItem" id="16950" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="16951" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca46901810" id="16952" addr="0x7fca46901810" />
+                                <attribute name="kind" value="function" id="16953" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getListItem" id="16954" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(int).p." id="16955" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="16956" addr="0x7fca46934c90" />
+                                <parmlist id="16957" addr="0x7fca469045f0" >
                                     <parm id="16958">
-                                        <attributelist id="16959" addr="0x7f99f1db65f0" >
-                                            <attribute name="name" value="position" id="16960" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="16961" addr="0x7f99f1de6c90" />
+                                        <attributelist id="16959" addr="0x7fca469045f0" >
+                                            <attribute name="name" value="position" id="16960" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="16961" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="XBMCAddon::xbmcgui::ListItem" id="16962" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="16963" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="XBMCAddon::xbmcgui::ListItem" id="16962" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="16963" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="16964" addr="0x7f99f1db6870" >
-                            <attributelist id="16965" addr="0x7f99f1db6870" >
-                                <attribute name="ismember" value="1" id="16966" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getListSize" id="16967" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="getListSize" id="16968" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="16969" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="16970" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="16971" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="int" id="16972" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1db3810" id="16973" addr="0x7f99f1db3810" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="16974" addr="0x7f99f1de6c90" />
+                        <cdecl id="16964" addr="0x7fca46904870" >
+                            <attributelist id="16965" addr="0x7fca46904870" >
+                                <attribute name="ismember" value="1" id="16966" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getListSize" id="16967" addr="0x7fca46934c90" />
+                                <attribute name="name" value="getListSize" id="16968" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="16969" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="16970" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="16971" addr="0x7fca46934c90" />
+                                <attribute name="type" value="int" id="16972" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca46901810" id="16973" addr="0x7fca46901810" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="16974" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="16975" addr="0x7f99f1db6a30" >
-                            <attributelist id="16976" addr="0x7f99f1db6a30" >
-                                <attribute name="ismember" value="1" id="16977" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="clearList" id="16978" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="clearList" id="16979" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="16980" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="16981" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="16982" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="void" id="16983" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1db3810" id="16984" addr="0x7f99f1db3810" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="16985" addr="0x7f99f1de6c90" />
+                        <cdecl id="16975" addr="0x7fca46904a30" >
+                            <attributelist id="16976" addr="0x7fca46904a30" >
+                                <attribute name="ismember" value="1" id="16977" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="clearList" id="16978" addr="0x7fca46934c90" />
+                                <attribute name="name" value="clearList" id="16979" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="16980" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="16981" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="16982" addr="0x7fca46934c90" />
+                                <attribute name="type" value="void" id="16983" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca46901810" id="16984" addr="0x7fca46901810" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="16985" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="16986" addr="0x7f99f1db6e70" >
-                            <attributelist id="16987" addr="0x7f99f1db6e70" >
-                                <attribute name="name" value="setContainerProperty" id="16988" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="16989" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1db3810" id="16990" addr="0x7f99f1db3810" />
-                                <attribute name="kind" value="function" id="16991" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setContainerProperty" id="16992" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="16993" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="16994" addr="0x7f99f1de6c90" />
-                                <parmlist id="16995" addr="0x7f99f1db6c70" >
+                        <cdecl id="16986" addr="0x7fca46904e70" >
+                            <attributelist id="16987" addr="0x7fca46904e70" >
+                                <attribute name="name" value="setContainerProperty" id="16988" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="16989" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca46901810" id="16990" addr="0x7fca46901810" />
+                                <attribute name="kind" value="function" id="16991" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setContainerProperty" id="16992" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="16993" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="16994" addr="0x7fca46934c90" />
+                                <parmlist id="16995" addr="0x7fca46904c70" >
                                     <parm id="16996">
-                                        <attributelist id="16997" addr="0x7f99f1db6c70" >
-                                            <attribute name="name" value="strProperty" id="16998" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="16999" addr="0x7f99f1de6c90" />
+                                        <attributelist id="16997" addr="0x7fca46904c70" >
+                                            <attribute name="name" value="strProperty" id="16998" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="16999" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="17000">
-                                        <attributelist id="17001" addr="0x7f99f1db6db0" >
-                                            <attribute name="name" value="strValue" id="17002" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="17003" addr="0x7f99f1de6c90" />
+                                        <attributelist id="17001" addr="0x7fca46904db0" >
+                                            <attribute name="name" value="strValue" id="17002" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="17003" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="17004" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="17005" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="17004" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="17005" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="17006" addr="0x7f99f1db7170" >
-                            <attributelist id="17007" addr="0x7f99f1db7170" >
-                                <attribute name="name" value="setContent" id="17008" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="17009" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1db3810" id="17010" addr="0x7f99f1db3810" />
-                                <attribute name="kind" value="function" id="17011" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setContent" id="17012" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="17013" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="17014" addr="0x7f99f1de6c90" />
-                                <parmlist id="17015" addr="0x7f99f1db70b0" >
+                        <cdecl id="17006" addr="0x7fca46905170" >
+                            <attributelist id="17007" addr="0x7fca46905170" >
+                                <attribute name="name" value="setContent" id="17008" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="17009" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca46901810" id="17010" addr="0x7fca46901810" />
+                                <attribute name="kind" value="function" id="17011" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setContent" id="17012" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="17013" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="17014" addr="0x7fca46934c90" />
+                                <parmlist id="17015" addr="0x7fca469050b0" >
                                     <parm id="17016">
-                                        <attributelist id="17017" addr="0x7f99f1db70b0" >
-                                            <attribute name="name" value="strValue" id="17018" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="17019" addr="0x7f99f1de6c90" />
+                                        <attributelist id="17017" addr="0x7fca469050b0" >
+                                            <attribute name="name" value="strValue" id="17018" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="17019" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="17020" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="17021" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="17020" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="17021" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="17022" addr="0x7f99f1db7350" >
-                            <attributelist id="17023" addr="0x7f99f1db7350" >
-                                <attribute name="ismember" value="1" id="17024" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getCurrentContainerId" id="17025" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="getCurrentContainerId" id="17026" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="17027" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="17028" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="17029" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="int" id="17030" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1db3810" id="17031" addr="0x7f99f1db3810" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="17032" addr="0x7f99f1de6c90" />
+                        <cdecl id="17022" addr="0x7fca46905350" >
+                            <attributelist id="17023" addr="0x7fca46905350" >
+                                <attribute name="ismember" value="1" id="17024" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getCurrentContainerId" id="17025" addr="0x7fca46934c90" />
+                                <attribute name="name" value="getCurrentContainerId" id="17026" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="17027" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="17028" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="17029" addr="0x7fca46934c90" />
+                                <attribute name="type" value="int" id="17030" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca46901810" id="17031" addr="0x7fca46901810" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="17032" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
                     </class >
-                    <class id="17033" addr="0x7f99f1db76b0" >
-                        <attributelist id="17034" addr="0x7f99f1db76b0" >
-                            <attribute name="name" value="XBMCAddon::xbmcgui::WindowXMLDialog" id="17035" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="17036" addr="0x7f99f1e40fb0" />
-                            <attribute name="symtab" value="0x7f99f1db7850" id="17037" addr="0x7f99f1db7850" />
-                            <attribute name="allows_typedef" value="1" id="17038" addr="0x7f99f1de6c90" />
-                            <attribute name="typepass_visit" value="1" id="17039" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_visit" value="1" id="17040" addr="0x7f99f1de6c90" />
-                            <attribute name="kind" value="class" id="17041" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_name" value="WindowXMLDialog" id="17042" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_has_constructor" value="1" id="17043" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_public_constructor" value="1" id="17044" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_has_destructor" value="1" id="17045" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_default_destructor" value="1" id="17046" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_copy_constructor" value="1" id="17047" addr="0x7f99f1de6c90" />
-                            <attribute name="privatebaselist" value="0x7f99f1db75f0" id="17048" addr="0x7f99f1db75f0" />
-                            <attribute name="protectedbaselist" value="0x7f99f1db75d0" id="17049" addr="0x7f99f1db75d0" />
-                            <baselist id="17050" addr="0x7f99f1db75b0" >
-                                <base name="WindowXML" id="17051" addr="0x7f99f1db7530" />
+                    <class id="17033" addr="0x7fca469056b0" >
+                        <attributelist id="17034" addr="0x7fca469056b0" >
+                            <attribute name="name" value="XBMCAddon::xbmcgui::WindowXMLDialog" id="17035" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="17036" addr="0x7fca4698efb0" />
+                            <attribute name="symtab" value="0x7fca46905850" id="17037" addr="0x7fca46905850" />
+                            <attribute name="allows_typedef" value="1" id="17038" addr="0x7fca46934c90" />
+                            <attribute name="typepass_visit" value="1" id="17039" addr="0x7fca46934c90" />
+                            <attribute name="allocate_visit" value="1" id="17040" addr="0x7fca46934c90" />
+                            <attribute name="kind" value="class" id="17041" addr="0x7fca46934c90" />
+                            <attribute name="sym_name" value="WindowXMLDialog" id="17042" addr="0x7fca46934c90" />
+                            <attribute name="allocate_has_constructor" value="1" id="17043" addr="0x7fca46934c90" />
+                            <attribute name="allocate_public_constructor" value="1" id="17044" addr="0x7fca46934c90" />
+                            <attribute name="allocate_has_destructor" value="1" id="17045" addr="0x7fca46934c90" />
+                            <attribute name="allocate_default_destructor" value="1" id="17046" addr="0x7fca46934c90" />
+                            <attribute name="allocate_copy_constructor" value="1" id="17047" addr="0x7fca46934c90" />
+                            <attribute name="privatebaselist" value="0x7fca469055f0" id="17048" addr="0x7fca469055f0" />
+                            <attribute name="protectedbaselist" value="0x7fca469055d0" id="17049" addr="0x7fca469055d0" />
+                            <baselist id="17050" addr="0x7fca469055b0" >
+                                <base name="WindowXML" id="17051" addr="0x7fca46905530" />
                             </baselist >
-                            <attribute name="module" value="xbmcgui" id="17052" addr="0x7f99f1e402f0" />
-                            <attribute name="feature_director" value="1" id="17053" addr="0x7f99f1de6c90" />
-                            <attribute name="bases" value="0x7f99f1de43f0" id="17054" addr="0x7f99f1de43f0" />
-                            <attribute name="allbases" value="0x7f99f1de4930" id="17055" addr="0x7f99f1de4930" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="17056" addr="0x7f99f1de6c90" />
-                            <typescope id="17057" addr="0x7f99f1de4370" >
-                                <attributelist id="17058" addr="0x7f99f1de4370" >
-                                    <attribute name="inherit" value="0x7f99f1de4490" id="17059" addr="0x7f99f1de4490" />
-                                    <attribute name="name" value="WindowXMLDialog" id="17060" addr="0x7f99f1de6c90" />
-                                    <typetab id="17061" addr="0x7f99f1de4390" >
-                                        <attributelist id="17062" addr="0x7f99f1de4390" >
+                            <attribute name="module" value="xbmcgui" id="17052" addr="0x7fca4698e2f0" />
+                            <attribute name="feature_director" value="1" id="17053" addr="0x7fca46934c90" />
+                            <attribute name="bases" value="0x7fca469323f0" id="17054" addr="0x7fca469323f0" />
+                            <attribute name="allbases" value="0x7fca46932930" id="17055" addr="0x7fca46932930" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="17056" addr="0x7fca46934c90" />
+                            <typescope id="17057" addr="0x7fca46932370" >
+                                <attributelist id="17058" addr="0x7fca46932370" >
+                                    <attribute name="inherit" value="0x7fca46932490" id="17059" addr="0x7fca46932490" />
+                                    <attribute name="name" value="WindowXMLDialog" id="17060" addr="0x7fca46934c90" />
+                                    <typetab id="17061" addr="0x7fca46932390" >
+                                        <attributelist id="17062" addr="0x7fca46932390" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f99f1dd2150" id="17063" addr="0x7f99f1dd2150" />
-                                    <attribute name="qname" value="XBMCAddon::xbmcgui::WindowXMLDialog" id="17064" addr="0x7f99f1de6c90" />
-                                    <attribute name="symtab" value="0x7f99f1db7850" id="17065" addr="0x7f99f1db7850" />
+                                    <attribute name="parent" value="0x7fca46920150" id="17063" addr="0x7fca46920150" />
+                                    <attribute name="qname" value="XBMCAddon::xbmcgui::WindowXMLDialog" id="17064" addr="0x7fca46934c90" />
+                                    <attribute name="symtab" value="0x7fca46905850" id="17065" addr="0x7fca46905850" />
                                 </attributelist >
-                                <typescopesitem id="17066" addr="0x7f99f1de4490" >
-                                    <attributelist id="17067" addr="0x7f99f1de4490" >
+                                <typescopesitem id="17066" addr="0x7fca46932490" >
+                                    <attributelist id="17067" addr="0x7fca46932490" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="17068" addr="0x7f99f1de4310" >
-                                    <attributelist id="17069" addr="0x7f99f1de4310" >
+                                <typescopesitem id="17068" addr="0x7fca46932310" >
+                                    <attributelist id="17069" addr="0x7fca46932310" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="17070" addr="0x7f99f1de4390" >
-                                    <attributelist id="17071" addr="0x7f99f1de4390" >
+                                <typescopesitem id="17070" addr="0x7fca46932390" >
+                                    <attributelist id="17071" addr="0x7fca46932390" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="17072" addr="0x7f99f1dd2150" >
-                                    <attributelist id="17073" addr="0x7f99f1dd2150" >
-                                        <attribute name="name" value="xbmcgui" id="17074" addr="0x7f99f1de6c90" />
-                                        <typetab id="17075" addr="0x7f99f1dd2170" >
-                                            <attributelist id="17076" addr="0x7f99f1dd2170" >
-                                                <attribute name="InterceptorBase" value="InterceptorBase" id="17077" addr="0x7f99f1de6c90" />
-                                                <attribute name="Dialog" value="Dialog" id="17078" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="17079" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="17080" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlTextBox" value="ControlTextBox" id="17081" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="17082" addr="0x7f99f1de6c90" />
-                                                <attribute name="Window" value="Window" id="17083" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="17084" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlList" value="ControlList" id="17085" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="17086" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlImage" value="ControlImage" id="17087" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlButton" value="ControlButton" id="17088" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlGroup" value="ControlGroup" id="17089" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogBusy" value="DialogBusy" id="17090" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="17091" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSpin" value="ControlSpin" id="17092" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlEdit" value="ControlEdit" id="17093" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="17094" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="17095" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlLabel" value="ControlLabel" id="17096" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlProgress" value="ControlProgress" id="17097" addr="0x7f99f1de6c90" />
-                                                <attribute name="Control" value="Control" id="17098" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSlider" value="ControlSlider" id="17099" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgress" value="DialogProgress" id="17100" addr="0x7f99f1de6c90" />
-                                                <attribute name="Action" value="Action" id="17101" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowDialog" value="WindowDialog" id="17102" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXML" value="WindowXML" id="17103" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItem" value="ListItem" id="17104" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="17105" addr="0x7f99f1de6c90" />
+                                <typescopesitem id="17072" addr="0x7fca46920150" >
+                                    <attributelist id="17073" addr="0x7fca46920150" >
+                                        <attribute name="name" value="xbmcgui" id="17074" addr="0x7fca46934c90" />
+                                        <typetab id="17075" addr="0x7fca46920170" >
+                                            <attributelist id="17076" addr="0x7fca46920170" >
+                                                <attribute name="InterceptorBase" value="InterceptorBase" id="17077" addr="0x7fca46934c90" />
+                                                <attribute name="Dialog" value="Dialog" id="17078" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="17079" addr="0x7fca46934c90" />
+                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="17080" addr="0x7fca46934c90" />
+                                                <attribute name="ControlTextBox" value="ControlTextBox" id="17081" addr="0x7fca46934c90" />
+                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="17082" addr="0x7fca46934c90" />
+                                                <attribute name="Window" value="Window" id="17083" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="17084" addr="0x7fca46934c90" />
+                                                <attribute name="ControlList" value="ControlList" id="17085" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="17086" addr="0x7fca46934c90" />
+                                                <attribute name="ControlImage" value="ControlImage" id="17087" addr="0x7fca46934c90" />
+                                                <attribute name="ControlButton" value="ControlButton" id="17088" addr="0x7fca46934c90" />
+                                                <attribute name="ControlGroup" value="ControlGroup" id="17089" addr="0x7fca46934c90" />
+                                                <attribute name="DialogBusy" value="DialogBusy" id="17090" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="17091" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSpin" value="ControlSpin" id="17092" addr="0x7fca46934c90" />
+                                                <attribute name="ControlEdit" value="ControlEdit" id="17093" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="17094" addr="0x7fca46934c90" />
+                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="17095" addr="0x7fca46934c90" />
+                                                <attribute name="ControlLabel" value="ControlLabel" id="17096" addr="0x7fca46934c90" />
+                                                <attribute name="ControlProgress" value="ControlProgress" id="17097" addr="0x7fca46934c90" />
+                                                <attribute name="Control" value="Control" id="17098" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSlider" value="ControlSlider" id="17099" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgress" value="DialogProgress" id="17100" addr="0x7fca46934c90" />
+                                                <attribute name="Action" value="Action" id="17101" addr="0x7fca46934c90" />
+                                                <attribute name="WindowDialog" value="WindowDialog" id="17102" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXML" value="WindowXML" id="17103" addr="0x7fca46934c90" />
+                                                <attribute name="ListItem" value="ListItem" id="17104" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="17105" addr="0x7fca46934c90" />
                                             </attributelist >
-                                            <typetabsitem id="17106" addr="0x7f99f1de1dd0" >
-                                                <attributelist id="17107" addr="0x7f99f1de1dd0" >
+                                            <typetabsitem id="17106" addr="0x7fca4692fdd0" >
+                                                <attributelist id="17107" addr="0x7fca4692fdd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="17108" addr="0x7f99f1dde790" >
-                                                <attributelist id="17109" addr="0x7f99f1dde790" >
+                                            <typetabsitem id="17108" addr="0x7fca4692c790" >
+                                                <attributelist id="17109" addr="0x7fca4692c790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="17110" addr="0x7f99f1de3f10" >
-                                                <attributelist id="17111" addr="0x7f99f1de3f10" >
+                                            <typetabsitem id="17110" addr="0x7fca46931f10" >
+                                                <attributelist id="17111" addr="0x7fca46931f10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="17112" addr="0x7f99f1dd67b0" >
-                                                <attributelist id="17113" addr="0x7f99f1dd67b0" >
+                                            <typetabsitem id="17112" addr="0x7fca469247b0" >
+                                                <attributelist id="17113" addr="0x7fca469247b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="17114" addr="0x7f99f1ddafd0" >
-                                                <attributelist id="17115" addr="0x7f99f1ddafd0" >
+                                            <typetabsitem id="17114" addr="0x7fca46928fd0" >
+                                                <attributelist id="17115" addr="0x7fca46928fd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="17116" addr="0x7f99f1ddd430" >
-                                                <attributelist id="17117" addr="0x7f99f1ddd430" >
+                                            <typetabsitem id="17116" addr="0x7fca4692b430" >
+                                                <attributelist id="17117" addr="0x7fca4692b430" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="17118" addr="0x7f99f1de2130" >
-                                                <attributelist id="17119" addr="0x7f99f1de2130" >
+                                            <typetabsitem id="17118" addr="0x7fca46930130" >
+                                                <attributelist id="17119" addr="0x7fca46930130" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="17120" addr="0x7f99f1dd2f50" >
-                                                <attributelist id="17121" addr="0x7f99f1dd2f50" >
+                                            <typetabsitem id="17120" addr="0x7fca46920f50" >
+                                                <attributelist id="17121" addr="0x7fca46920f50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="17122" addr="0x7f99f1dd9650" >
-                                                <attributelist id="17123" addr="0x7f99f1dd9650" >
+                                            <typetabsitem id="17122" addr="0x7fca46927650" >
+                                                <attributelist id="17123" addr="0x7fca46927650" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="17124" addr="0x7f99f1de3390" >
-                                                <attributelist id="17125" addr="0x7f99f1de3390" >
+                                            <typetabsitem id="17124" addr="0x7fca46931390" >
+                                                <attributelist id="17125" addr="0x7fca46931390" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="17126" addr="0x7f99f1ddb7b0" >
-                                                <attributelist id="17127" addr="0x7f99f1ddb7b0" >
+                                            <typetabsitem id="17126" addr="0x7fca469297b0" >
+                                                <attributelist id="17127" addr="0x7fca469297b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="17128" addr="0x7f99f1ddc4b0" >
-                                                <attributelist id="17129" addr="0x7f99f1ddc4b0" >
+                                            <typetabsitem id="17128" addr="0x7fca4692a4b0" >
+                                                <attributelist id="17129" addr="0x7fca4692a4b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="17130" addr="0x7f99f1ddcf90" >
-                                                <attributelist id="17131" addr="0x7f99f1ddcf90" >
+                                            <typetabsitem id="17130" addr="0x7fca4692af90" >
+                                                <attributelist id="17131" addr="0x7fca4692af90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="17132" addr="0x7f99f1de11b0" >
-                                                <attributelist id="17133" addr="0x7f99f1de11b0" >
+                                            <typetabsitem id="17132" addr="0x7fca4692f1b0" >
+                                                <attributelist id="17133" addr="0x7fca4692f1b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="17134" addr="0x7f99f1de15b0" >
-                                                <attributelist id="17135" addr="0x7f99f1de15b0" >
+                                            <typetabsitem id="17134" addr="0x7fca4692f5b0" >
+                                                <attributelist id="17135" addr="0x7fca4692f5b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="17136" addr="0x7f99f1dd77f0" >
-                                                <attributelist id="17137" addr="0x7f99f1dd77f0" >
+                                            <typetabsitem id="17136" addr="0x7fca469257f0" >
+                                                <attributelist id="17137" addr="0x7fca469257f0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="17138" addr="0x7f99f1dd8b30" >
-                                                <attributelist id="17139" addr="0x7f99f1dd8b30" >
+                                            <typetabsitem id="17138" addr="0x7fca46926b30" >
+                                                <attributelist id="17139" addr="0x7fca46926b30" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="17140" addr="0x7f99f1dd2c50" >
-                                                <attributelist id="17141" addr="0x7f99f1dd2c50" >
+                                            <typetabsitem id="17140" addr="0x7fca46920c50" >
+                                                <attributelist id="17141" addr="0x7fca46920c50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="17142" addr="0x7f99f1dda790" >
-                                                <attributelist id="17143" addr="0x7f99f1dda790" >
+                                            <typetabsitem id="17142" addr="0x7fca46928790" >
+                                                <attributelist id="17143" addr="0x7fca46928790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="17144" addr="0x7f99f1dd8030" >
-                                                <attributelist id="17145" addr="0x7f99f1dd8030" >
+                                            <typetabsitem id="17144" addr="0x7fca46926030" >
+                                                <attributelist id="17145" addr="0x7fca46926030" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="17146" addr="0x7f99f1ddbe10" >
-                                                <attributelist id="17147" addr="0x7f99f1ddbe10" >
+                                            <typetabsitem id="17146" addr="0x7fca46929e10" >
+                                                <attributelist id="17147" addr="0x7fca46929e10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="17148" addr="0x7f99f1dd6b10" >
-                                                <attributelist id="17149" addr="0x7f99f1dd6b10" >
+                                            <typetabsitem id="17148" addr="0x7fca46924b10" >
+                                                <attributelist id="17149" addr="0x7fca46924b10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="17150" addr="0x7f99f1dddf90" >
-                                                <attributelist id="17151" addr="0x7f99f1dddf90" >
+                                            <typetabsitem id="17150" addr="0x7fca4692bf90" >
+                                                <attributelist id="17151" addr="0x7fca4692bf90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="17152" addr="0x7f99f1de0530" >
-                                                <attributelist id="17153" addr="0x7f99f1de0530" >
+                                            <typetabsitem id="17152" addr="0x7fca4692e530" >
+                                                <attributelist id="17153" addr="0x7fca4692e530" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="17154" addr="0x7f99f1de1e50" >
-                                                <attributelist id="17155" addr="0x7f99f1de1e50" >
+                                            <typetabsitem id="17154" addr="0x7fca4692fe50" >
+                                                <attributelist id="17155" addr="0x7fca4692fe50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="17156" addr="0x7f99f1de2d90" >
-                                                <attributelist id="17157" addr="0x7f99f1de2d90" >
+                                            <typetabsitem id="17156" addr="0x7fca46930d90" >
+                                                <attributelist id="17157" addr="0x7fca46930d90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="17158" addr="0x7f99f1de3410" >
-                                                <attributelist id="17159" addr="0x7f99f1de3410" >
+                                            <typetabsitem id="17158" addr="0x7fca46931410" >
+                                                <attributelist id="17159" addr="0x7fca46931410" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="17160" addr="0x7f99f1dd3590" >
-                                                <attributelist id="17161" addr="0x7f99f1dd3590" >
+                                            <typetabsitem id="17160" addr="0x7fca46921590" >
+                                                <attributelist id="17161" addr="0x7fca46921590" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="17162" addr="0x7f99f1dd3390" >
-                                                <attributelist id="17163" addr="0x7f99f1dd3390" >
+                                            <typetabsitem id="17162" addr="0x7fca46921390" >
+                                                <attributelist id="17163" addr="0x7fca46921390" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7f99f1dd1d70" id="17164" addr="0x7f99f1dd1d70" />
-                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="17165" addr="0x7f99f1de6c90" />
-                                        <attribute name="symtab" value="0x7f99f1e40fb0" id="17166" addr="0x7f99f1e40fb0" />
+                                        <attribute name="parent" value="0x7fca4691fd70" id="17164" addr="0x7fca4691fd70" />
+                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="17165" addr="0x7fca46934c90" />
+                                        <attribute name="symtab" value="0x7fca4698efb0" id="17166" addr="0x7fca4698efb0" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="17167" addr="0x7f99f1de43b0" >
-                                    <attributelist id="17168" addr="0x7f99f1de43b0" >
+                                <typescopesitem id="17167" addr="0x7fca469323b0" >
+                                    <attributelist id="17168" addr="0x7fca469323b0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="17169" addr="0x7f99f1db7850" >
-                                    <attributelist id="17170" addr="0x7f99f1db7850" >
-                                        <attribute name="inherit" value="0x7f99f1db7930" id="17171" addr="0x7f99f1db7930" />
-                                        <attribute name="name" value="WindowXMLDialog" id="17172" addr="0x7f99f1de6c90" />
-                                        <attribute name="csymtab" value="0x7f99f1db77d0" id="17173" addr="0x7f99f1db77d0" />
-                                        <attribute name="symtab" value="0x7f99f1db77f0" id="17174" addr="0x7f99f1db77f0" />
+                                <typescopesitem id="17169" addr="0x7fca46905850" >
+                                    <attributelist id="17170" addr="0x7fca46905850" >
+                                        <attribute name="inherit" value="0x7fca46905930" id="17171" addr="0x7fca46905930" />
+                                        <attribute name="name" value="WindowXMLDialog" id="17172" addr="0x7fca46934c90" />
+                                        <attribute name="csymtab" value="0x7fca469057d0" id="17173" addr="0x7fca469057d0" />
+                                        <attribute name="symtab" value="0x7fca469057f0" id="17174" addr="0x7fca469057f0" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <access id="17175" addr="0x7f99f1db7790" >
-                            <attributelist id="17176" addr="0x7f99f1db7790" >
-                                <attribute name="kind" value="public" id="17177" addr="0x7f99f1de6c90" />
+                        <access id="17175" addr="0x7fca46905790" >
+                            <attributelist id="17176" addr="0x7fca46905790" >
+                                <attribute name="kind" value="public" id="17177" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="17178" addr="0x7f99f1db7fb0" >
-                            <attributelist id="17179" addr="0x7f99f1db7fb0" >
-                                <attribute name="name" value="WindowXMLDialog" id="17180" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="17181" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1db7850" id="17182" addr="0x7f99f1db7850" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1db8290" id="17183" addr="0x7f99f1db8290" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1db8290" id="17184" addr="0x7f99f1db8290" />
-                                <attribute name="sym_name" value="WindowXMLDialog" id="17185" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).String,r.q(const).String,r.q(const).String,r.q(const).String)." id="17186" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="17187" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_director" value="1" id="17188" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_python_nokwds" value="true" id="17189" addr="0x7f99f1de6c90" />
-                                <parmlist id="17190" addr="0x7f99f1db7ab0" >
+                        <constructor id="17178" addr="0x7fca46905fb0" >
+                            <attributelist id="17179" addr="0x7fca46905fb0" >
+                                <attribute name="name" value="WindowXMLDialog" id="17180" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="17181" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca46905850" id="17182" addr="0x7fca46905850" />
+                                <attribute name="sym_nextSibling" value="0x7fca46906290" id="17183" addr="0x7fca46906290" />
+                                <attribute name="csym_nextSibling" value="0x7fca46906290" id="17184" addr="0x7fca46906290" />
+                                <attribute name="sym_name" value="WindowXMLDialog" id="17185" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).String,r.q(const).String,r.q(const).String,r.q(const).String)." id="17186" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="17187" addr="0x7fca46934c90" />
+                                <attribute name="feature_director" value="1" id="17188" addr="0x7fca46934c90" />
+                                <attribute name="feature_python_nokwds" value="true" id="17189" addr="0x7fca46934c90" />
+                                <parmlist id="17190" addr="0x7fca46905ab0" >
                                     <parm id="17191">
-                                        <attributelist id="17192" addr="0x7f99f1db7ab0" >
-                                            <attribute name="name" value="xmlFilename" id="17193" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="17194" addr="0x7f99f1de6c90" />
+                                        <attributelist id="17192" addr="0x7fca46905ab0" >
+                                            <attribute name="name" value="xmlFilename" id="17193" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="17194" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="17195">
-                                        <attributelist id="17196" addr="0x7f99f1db7bf0" >
-                                            <attribute name="name" value="scriptPath" id="17197" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="17198" addr="0x7f99f1de6c90" />
+                                        <attributelist id="17196" addr="0x7fca46905bf0" >
+                                            <attribute name="name" value="scriptPath" id="17197" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="17198" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="17199">
-                                        <attributelist id="17200" addr="0x7f99f1db7d70" >
-                                            <attribute name="name" value="defaultSkin" id="17201" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="&quot;Default&quot;" id="17202" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="17203" addr="0x7f99f1de6c90" />
+                                        <attributelist id="17200" addr="0x7fca46905d70" >
+                                            <attribute name="name" value="defaultSkin" id="17201" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="&quot;Default&quot;" id="17202" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="17203" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="17204">
-                                        <attributelist id="17205" addr="0x7f99f1db7ef0" >
-                                            <attribute name="name" value="defaultRes" id="17206" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="&quot;720p&quot;" id="17207" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="17208" addr="0x7f99f1de6c90" />
+                                        <attributelist id="17205" addr="0x7fca46905ef0" >
+                                            <attribute name="name" value="defaultRes" id="17206" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="&quot;720p&quot;" id="17207" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="17208" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overloaded" value="0x7f99f1db7fb0" id="17209" addr="0x7f99f1db7fb0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="17210" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="17211" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overloaded" value="0x7fca46905fb0" id="17209" addr="0x7fca46905fb0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="17210" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="17211" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="17212" addr="0x7f99f1db8290" >
-                            <attributelist id="17213" addr="0x7f99f1db8290" >
-                                <attribute name="name" value="WindowXMLDialog" id="17214" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="17215" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1db7850" id="17216" addr="0x7f99f1db7850" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1db7fb0" id="17217" addr="0x7f99f1db7fb0" />
-                                <attribute name="sym_name" value="WindowXMLDialog" id="17218" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1db84d0" id="17219" addr="0x7f99f1db84d0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1db84d0" id="17220" addr="0x7f99f1db84d0" />
-                                <attribute name="decl" value="f(r.q(const).String,r.q(const).String,r.q(const).String)." id="17221" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1db7fb0" id="17222" addr="0x7f99f1db7fb0" />
-                                <attribute name="access" value="public" id="17223" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_director" value="1" id="17224" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1db7fb0" id="17225" addr="0x7f99f1db7fb0" />
-                                <attribute name="feature_python_nokwds" value="true" id="17226" addr="0x7f99f1de6c90" />
-                                <parmlist id="17227" addr="0x7f99f1db8050" >
+                        <constructor id="17212" addr="0x7fca46906290" >
+                            <attributelist id="17213" addr="0x7fca46906290" >
+                                <attribute name="name" value="WindowXMLDialog" id="17214" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="17215" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca46905850" id="17216" addr="0x7fca46905850" />
+                                <attribute name="sym_previousSibling" value="0x7fca46905fb0" id="17217" addr="0x7fca46905fb0" />
+                                <attribute name="sym_name" value="WindowXMLDialog" id="17218" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469064d0" id="17219" addr="0x7fca469064d0" />
+                                <attribute name="sym_nextSibling" value="0x7fca469064d0" id="17220" addr="0x7fca469064d0" />
+                                <attribute name="decl" value="f(r.q(const).String,r.q(const).String,r.q(const).String)." id="17221" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca46905fb0" id="17222" addr="0x7fca46905fb0" />
+                                <attribute name="access" value="public" id="17223" addr="0x7fca46934c90" />
+                                <attribute name="feature_director" value="1" id="17224" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca46905fb0" id="17225" addr="0x7fca46905fb0" />
+                                <attribute name="feature_python_nokwds" value="true" id="17226" addr="0x7fca46934c90" />
+                                <parmlist id="17227" addr="0x7fca46906050" >
                                     <parm id="17228">
-                                        <attributelist id="17229" addr="0x7f99f1db8050" >
-                                            <attribute name="name" value="xmlFilename" id="17230" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="17231" addr="0x7f99f1de6c90" />
+                                        <attributelist id="17229" addr="0x7fca46906050" >
+                                            <attribute name="name" value="xmlFilename" id="17230" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="17231" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="17232">
-                                        <attributelist id="17233" addr="0x7f99f1db8150" >
-                                            <attribute name="name" value="scriptPath" id="17234" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="17235" addr="0x7f99f1de6c90" />
+                                        <attributelist id="17233" addr="0x7fca46906150" >
+                                            <attribute name="name" value="scriptPath" id="17234" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="17235" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="17236">
-                                        <attributelist id="17237" addr="0x7f99f1db81d0" >
-                                            <attribute name="name" value="defaultSkin" id="17238" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="&quot;Default&quot;" id="17239" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="17240" addr="0x7f99f1de6c90" />
+                                        <attributelist id="17237" addr="0x7fca469061d0" >
+                                            <attribute name="name" value="defaultSkin" id="17238" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="&quot;Default&quot;" id="17239" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="17240" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_1" id="17241" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="17242" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="17241" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="17242" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="17243" addr="0x7f99f1db84d0" >
-                            <attributelist id="17244" addr="0x7f99f1db84d0" >
-                                <attribute name="name" value="WindowXMLDialog" id="17245" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="17246" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1db7850" id="17247" addr="0x7f99f1db7850" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1db8290" id="17248" addr="0x7f99f1db8290" />
-                                <attribute name="sym_name" value="WindowXMLDialog" id="17249" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).String,r.q(const).String)." id="17250" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1db7fb0" id="17251" addr="0x7f99f1db7fb0" />
-                                <attribute name="access" value="public" id="17252" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_director" value="1" id="17253" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1db7fb0" id="17254" addr="0x7f99f1db7fb0" />
-                                <attribute name="feature_python_nokwds" value="true" id="17255" addr="0x7f99f1de6c90" />
-                                <parmlist id="17256" addr="0x7f99f1db8330" >
+                        <constructor id="17243" addr="0x7fca469064d0" >
+                            <attributelist id="17244" addr="0x7fca469064d0" >
+                                <attribute name="name" value="WindowXMLDialog" id="17245" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="17246" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca46905850" id="17247" addr="0x7fca46905850" />
+                                <attribute name="sym_previousSibling" value="0x7fca46906290" id="17248" addr="0x7fca46906290" />
+                                <attribute name="sym_name" value="WindowXMLDialog" id="17249" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).String,r.q(const).String)." id="17250" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca46905fb0" id="17251" addr="0x7fca46905fb0" />
+                                <attribute name="access" value="public" id="17252" addr="0x7fca46934c90" />
+                                <attribute name="feature_director" value="1" id="17253" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca46905fb0" id="17254" addr="0x7fca46905fb0" />
+                                <attribute name="feature_python_nokwds" value="true" id="17255" addr="0x7fca46934c90" />
+                                <parmlist id="17256" addr="0x7fca46906330" >
                                     <parm id="17257">
-                                        <attributelist id="17258" addr="0x7f99f1db8330" >
-                                            <attribute name="name" value="xmlFilename" id="17259" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="17260" addr="0x7f99f1de6c90" />
+                                        <attributelist id="17258" addr="0x7fca46906330" >
+                                            <attribute name="name" value="xmlFilename" id="17259" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="17260" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="17261">
-                                        <attributelist id="17262" addr="0x7f99f1db8430" >
-                                            <attribute name="name" value="scriptPath" id="17263" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="17264" addr="0x7f99f1de6c90" />
+                                        <attributelist id="17262" addr="0x7fca46906430" >
+                                            <attribute name="name" value="scriptPath" id="17263" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="17264" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_2" id="17265" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="17266" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_2" id="17265" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="17266" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <destructor id="17267" addr="0x7f99f1db8670" >
-                            <attributelist id="17268" addr="0x7f99f1db8670" >
-                                <attribute name="ismember" value="1" id="17269" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="~WindowXMLDialog" id="17270" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="~WindowXMLDialog" id="17271" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="17272" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="17273" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1db7850" id="17274" addr="0x7f99f1db7850" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="17275" addr="0x7f99f1de6c90" />
+                        <destructor id="17267" addr="0x7fca46906670" >
+                            <attributelist id="17268" addr="0x7fca46906670" >
+                                <attribute name="ismember" value="1" id="17269" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="~WindowXMLDialog" id="17270" addr="0x7fca46934c90" />
+                                <attribute name="name" value="~WindowXMLDialog" id="17271" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="17272" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="17273" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca46905850" id="17274" addr="0x7fca46905850" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="17275" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </destructor >
@@ -24570,4116 +24570,4116 @@
                 </namespace >
             </namespace >
         </include >
-        <include id="17276" addr="0x7f99f1db8870" >
-            <attributelist id="17277" addr="0x7f99f1db8870" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/input/actions/ActionIDs.h" id="17278" addr="0x7f99f1de6c90" />
+        <include id="17276" addr="0x7fca46906870" >
+            <attributelist id="17277" addr="0x7fca46906870" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/input/actions/ActionIDs.h" id="17278" addr="0x7fca46934c90" />
             </attributelist >
 
-            <constant id="17279" addr="0x7f99f1db8930" >
-                <attributelist id="17280" addr="0x7f99f1db8930" >
-                    <attribute name="sym_name" value="ACTION_NONE" id="17281" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_NONE" id="17282" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="0" id="17283" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17284" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="0" id="17285" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17286" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17287" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17288" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17289" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17290" addr="0x7f99f1db8a90" >
-                <attributelist id="17291" addr="0x7f99f1db8a90" >
-                    <attribute name="sym_name" value="ACTION_MOVE_LEFT" id="17292" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_MOVE_LEFT" id="17293" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="1" id="17294" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17295" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="1" id="17296" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17297" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17298" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17299" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17300" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17301" addr="0x7f99f1db8bf0" >
-                <attributelist id="17302" addr="0x7f99f1db8bf0" >
-                    <attribute name="sym_name" value="ACTION_MOVE_RIGHT" id="17303" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_MOVE_RIGHT" id="17304" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="2" id="17305" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17306" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="2" id="17307" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17308" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17309" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17310" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17311" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17312" addr="0x7f99f1db8d50" >
-                <attributelist id="17313" addr="0x7f99f1db8d50" >
-                    <attribute name="sym_name" value="ACTION_MOVE_UP" id="17314" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_MOVE_UP" id="17315" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="3" id="17316" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17317" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="3" id="17318" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17319" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17320" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17321" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17322" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17323" addr="0x7f99f1db8eb0" >
-                <attributelist id="17324" addr="0x7f99f1db8eb0" >
-                    <attribute name="sym_name" value="ACTION_MOVE_DOWN" id="17325" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_MOVE_DOWN" id="17326" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="4" id="17327" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17328" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="4" id="17329" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17330" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17331" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17332" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17333" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17334" addr="0x7f99f1db9010" >
-                <attributelist id="17335" addr="0x7f99f1db9010" >
-                    <attribute name="sym_name" value="ACTION_PAGE_UP" id="17336" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_PAGE_UP" id="17337" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="5" id="17338" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17339" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="5" id="17340" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17341" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17342" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17343" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17344" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17345" addr="0x7f99f1db9170" >
-                <attributelist id="17346" addr="0x7f99f1db9170" >
-                    <attribute name="sym_name" value="ACTION_PAGE_DOWN" id="17347" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_PAGE_DOWN" id="17348" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="6" id="17349" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17350" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="6" id="17351" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17352" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17353" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17354" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17355" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17356" addr="0x7f99f1db92d0" >
-                <attributelist id="17357" addr="0x7f99f1db92d0" >
-                    <attribute name="sym_name" value="ACTION_SELECT_ITEM" id="17358" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_SELECT_ITEM" id="17359" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="7" id="17360" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17361" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="7" id="17362" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17363" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17364" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17365" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17366" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17367" addr="0x7f99f1db9430" >
-                <attributelist id="17368" addr="0x7f99f1db9430" >
-                    <attribute name="sym_name" value="ACTION_HIGHLIGHT_ITEM" id="17369" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_HIGHLIGHT_ITEM" id="17370" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="8" id="17371" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17372" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="8" id="17373" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17374" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17375" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17376" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17377" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17378" addr="0x7f99f1db9590" >
-                <attributelist id="17379" addr="0x7f99f1db9590" >
-                    <attribute name="sym_name" value="ACTION_PARENT_DIR" id="17380" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_PARENT_DIR" id="17381" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="9" id="17382" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17383" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="9" id="17384" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17385" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17386" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17387" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17388" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17389" addr="0x7f99f1db96f0" >
-                <attributelist id="17390" addr="0x7f99f1db96f0" >
-                    <attribute name="sym_name" value="ACTION_PREVIOUS_MENU" id="17391" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_PREVIOUS_MENU" id="17392" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="10" id="17393" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17394" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="10" id="17395" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17396" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17397" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17398" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17399" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17400" addr="0x7f99f1db9850" >
-                <attributelist id="17401" addr="0x7f99f1db9850" >
-                    <attribute name="sym_name" value="ACTION_SHOW_INFO" id="17402" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_SHOW_INFO" id="17403" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="11" id="17404" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17405" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="11" id="17406" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17407" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17408" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17409" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17410" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17411" addr="0x7f99f1db99b0" >
-                <attributelist id="17412" addr="0x7f99f1db99b0" >
-                    <attribute name="sym_name" value="ACTION_PAUSE" id="17413" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_PAUSE" id="17414" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="12" id="17415" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17416" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="12" id="17417" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17418" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17419" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17420" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17421" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17422" addr="0x7f99f1db9b10" >
-                <attributelist id="17423" addr="0x7f99f1db9b10" >
-                    <attribute name="sym_name" value="ACTION_STOP" id="17424" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_STOP" id="17425" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="13" id="17426" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17427" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="13" id="17428" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17429" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17430" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17431" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17432" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17433" addr="0x7f99f1db9c70" >
-                <attributelist id="17434" addr="0x7f99f1db9c70" >
-                    <attribute name="sym_name" value="ACTION_NEXT_ITEM" id="17435" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_NEXT_ITEM" id="17436" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="14" id="17437" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17438" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="14" id="17439" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17440" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17441" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17442" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17443" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17444" addr="0x7f99f1db9dd0" >
-                <attributelist id="17445" addr="0x7f99f1db9dd0" >
-                    <attribute name="sym_name" value="ACTION_PREV_ITEM" id="17446" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_PREV_ITEM" id="17447" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="15" id="17448" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17449" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="15" id="17450" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17451" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17452" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17453" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17454" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17455" addr="0x7f99f1db9f30" >
-                <attributelist id="17456" addr="0x7f99f1db9f30" >
-                    <attribute name="sym_name" value="ACTION_FORWARD" id="17457" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_FORWARD" id="17458" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="16" id="17459" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17460" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="16" id="17461" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17462" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17463" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17464" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17465" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17466" addr="0x7f99f1dba090" >
-                <attributelist id="17467" addr="0x7f99f1dba090" >
-                    <attribute name="sym_name" value="ACTION_REWIND" id="17468" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_REWIND" id="17469" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="17" id="17470" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17471" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="17" id="17472" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17473" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17474" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17475" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17476" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17477" addr="0x7f99f1dba1f0" >
-                <attributelist id="17478" addr="0x7f99f1dba1f0" >
-                    <attribute name="sym_name" value="ACTION_SHOW_GUI" id="17479" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_SHOW_GUI" id="17480" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="18" id="17481" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17482" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="18" id="17483" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17484" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17485" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17486" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17487" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17488" addr="0x7f99f1dba350" >
-                <attributelist id="17489" addr="0x7f99f1dba350" >
-                    <attribute name="sym_name" value="ACTION_ASPECT_RATIO" id="17490" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_ASPECT_RATIO" id="17491" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="19" id="17492" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17493" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="19" id="17494" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17495" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17496" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17497" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17498" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17499" addr="0x7f99f1dba4b0" >
-                <attributelist id="17500" addr="0x7f99f1dba4b0" >
-                    <attribute name="sym_name" value="ACTION_STEP_FORWARD" id="17501" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_STEP_FORWARD" id="17502" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="20" id="17503" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17504" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="20" id="17505" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17506" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17507" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17508" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17509" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17510" addr="0x7f99f1dba610" >
-                <attributelist id="17511" addr="0x7f99f1dba610" >
-                    <attribute name="sym_name" value="ACTION_STEP_BACK" id="17512" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_STEP_BACK" id="17513" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="21" id="17514" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17515" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="21" id="17516" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17517" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17518" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17519" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17520" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17521" addr="0x7f99f1dba770" >
-                <attributelist id="17522" addr="0x7f99f1dba770" >
-                    <attribute name="sym_name" value="ACTION_BIG_STEP_FORWARD" id="17523" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_BIG_STEP_FORWARD" id="17524" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="22" id="17525" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17526" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="22" id="17527" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17528" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17529" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17530" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17531" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17532" addr="0x7f99f1dba8d0" >
-                <attributelist id="17533" addr="0x7f99f1dba8d0" >
-                    <attribute name="sym_name" value="ACTION_BIG_STEP_BACK" id="17534" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_BIG_STEP_BACK" id="17535" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="23" id="17536" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17537" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="23" id="17538" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17539" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17540" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17541" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17542" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17543" addr="0x7f99f1dbaa30" >
-                <attributelist id="17544" addr="0x7f99f1dbaa30" >
-                    <attribute name="sym_name" value="ACTION_SHOW_OSD" id="17545" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_SHOW_OSD" id="17546" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="24" id="17547" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17548" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="24" id="17549" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17550" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17551" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17552" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17553" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17554" addr="0x7f99f1dbab90" >
-                <attributelist id="17555" addr="0x7f99f1dbab90" >
-                    <attribute name="sym_name" value="ACTION_SHOW_SUBTITLES" id="17556" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_SHOW_SUBTITLES" id="17557" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="25" id="17558" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17559" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="25" id="17560" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17561" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17562" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17563" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17564" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17565" addr="0x7f99f1dbacf0" >
-                <attributelist id="17566" addr="0x7f99f1dbacf0" >
-                    <attribute name="sym_name" value="ACTION_NEXT_SUBTITLE" id="17567" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_NEXT_SUBTITLE" id="17568" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="26" id="17569" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17570" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="26" id="17571" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17572" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17573" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17574" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17575" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17576" addr="0x7f99f1dbae50" >
-                <attributelist id="17577" addr="0x7f99f1dbae50" >
-                    <attribute name="sym_name" value="ACTION_BROWSE_SUBTITLE" id="17578" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_BROWSE_SUBTITLE" id="17579" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="247" id="17580" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17581" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="247" id="17582" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17583" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17584" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17585" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17586" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17587" addr="0x7f99f1dbafb0" >
-                <attributelist id="17588" addr="0x7f99f1dbafb0" >
-                    <attribute name="sym_name" value="ACTION_PLAYER_DEBUG" id="17589" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_PLAYER_DEBUG" id="17590" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="27" id="17591" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17592" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="27" id="17593" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17594" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17595" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17596" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17597" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17598" addr="0x7f99f1dbb110" >
-                <attributelist id="17599" addr="0x7f99f1dbb110" >
-                    <attribute name="sym_name" value="ACTION_NEXT_PICTURE" id="17600" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_NEXT_PICTURE" id="17601" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="28" id="17602" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17603" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="28" id="17604" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17605" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17606" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17607" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17608" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17609" addr="0x7f99f1dbb270" >
-                <attributelist id="17610" addr="0x7f99f1dbb270" >
-                    <attribute name="sym_name" value="ACTION_PREV_PICTURE" id="17611" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_PREV_PICTURE" id="17612" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="29" id="17613" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17614" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="29" id="17615" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17616" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17617" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17618" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17619" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17620" addr="0x7f99f1dbb3d0" >
-                <attributelist id="17621" addr="0x7f99f1dbb3d0" >
-                    <attribute name="sym_name" value="ACTION_ZOOM_OUT" id="17622" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_ZOOM_OUT" id="17623" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="30" id="17624" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17625" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="30" id="17626" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17627" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17628" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17629" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17630" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17631" addr="0x7f99f1dbb530" >
-                <attributelist id="17632" addr="0x7f99f1dbb530" >
-                    <attribute name="sym_name" value="ACTION_ZOOM_IN" id="17633" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_ZOOM_IN" id="17634" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="31" id="17635" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17636" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="31" id="17637" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17638" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17639" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17640" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17641" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17642" addr="0x7f99f1dbb690" >
-                <attributelist id="17643" addr="0x7f99f1dbb690" >
-                    <attribute name="sym_name" value="ACTION_TOGGLE_SOURCE_DEST" id="17644" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_TOGGLE_SOURCE_DEST" id="17645" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="32" id="17646" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17647" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="32" id="17648" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17649" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17650" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17651" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17652" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17653" addr="0x7f99f1dbb7f0" >
-                <attributelist id="17654" addr="0x7f99f1dbb7f0" >
-                    <attribute name="sym_name" value="ACTION_SHOW_PLAYLIST" id="17655" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_SHOW_PLAYLIST" id="17656" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="33" id="17657" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17658" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="33" id="17659" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17660" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17661" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17662" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17663" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17664" addr="0x7f99f1dbb950" >
-                <attributelist id="17665" addr="0x7f99f1dbb950" >
-                    <attribute name="sym_name" value="ACTION_QUEUE_ITEM" id="17666" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_QUEUE_ITEM" id="17667" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="34" id="17668" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17669" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="34" id="17670" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17671" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17672" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17673" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17674" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17675" addr="0x7f99f1dbbab0" >
-                <attributelist id="17676" addr="0x7f99f1dbbab0" >
-                    <attribute name="sym_name" value="ACTION_REMOVE_ITEM" id="17677" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_REMOVE_ITEM" id="17678" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="35" id="17679" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17680" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="35" id="17681" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17682" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17683" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17684" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17685" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17686" addr="0x7f99f1dbbc10" >
-                <attributelist id="17687" addr="0x7f99f1dbbc10" >
-                    <attribute name="sym_name" value="ACTION_SHOW_FULLSCREEN" id="17688" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_SHOW_FULLSCREEN" id="17689" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="36" id="17690" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17691" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="36" id="17692" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17693" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17694" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17695" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17696" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17697" addr="0x7f99f1dbbd70" >
-                <attributelist id="17698" addr="0x7f99f1dbbd70" >
-                    <attribute name="sym_name" value="ACTION_ZOOM_LEVEL_NORMAL" id="17699" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_ZOOM_LEVEL_NORMAL" id="17700" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="37" id="17701" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17702" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="37" id="17703" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17704" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17705" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17706" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17707" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17708" addr="0x7f99f1dbbed0" >
-                <attributelist id="17709" addr="0x7f99f1dbbed0" >
-                    <attribute name="sym_name" value="ACTION_ZOOM_LEVEL_1" id="17710" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_ZOOM_LEVEL_1" id="17711" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="38" id="17712" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17713" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="38" id="17714" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17715" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17716" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17717" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17718" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17719" addr="0x7f99f1dbc030" >
-                <attributelist id="17720" addr="0x7f99f1dbc030" >
-                    <attribute name="sym_name" value="ACTION_ZOOM_LEVEL_2" id="17721" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_ZOOM_LEVEL_2" id="17722" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="39" id="17723" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17724" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="39" id="17725" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17726" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17727" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17728" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17729" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17730" addr="0x7f99f1dbc190" >
-                <attributelist id="17731" addr="0x7f99f1dbc190" >
-                    <attribute name="sym_name" value="ACTION_ZOOM_LEVEL_3" id="17732" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_ZOOM_LEVEL_3" id="17733" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="40" id="17734" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17735" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="40" id="17736" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17737" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17738" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17739" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17740" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17741" addr="0x7f99f1dbc2f0" >
-                <attributelist id="17742" addr="0x7f99f1dbc2f0" >
-                    <attribute name="sym_name" value="ACTION_ZOOM_LEVEL_4" id="17743" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_ZOOM_LEVEL_4" id="17744" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="41" id="17745" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17746" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="41" id="17747" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17748" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17749" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17750" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17751" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17752" addr="0x7f99f1dbc450" >
-                <attributelist id="17753" addr="0x7f99f1dbc450" >
-                    <attribute name="sym_name" value="ACTION_ZOOM_LEVEL_5" id="17754" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_ZOOM_LEVEL_5" id="17755" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="42" id="17756" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17757" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="42" id="17758" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17759" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17760" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17761" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17762" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17763" addr="0x7f99f1dbc5b0" >
-                <attributelist id="17764" addr="0x7f99f1dbc5b0" >
-                    <attribute name="sym_name" value="ACTION_ZOOM_LEVEL_6" id="17765" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_ZOOM_LEVEL_6" id="17766" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="43" id="17767" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17768" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="43" id="17769" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17770" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17771" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17772" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17773" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17774" addr="0x7f99f1dbc710" >
-                <attributelist id="17775" addr="0x7f99f1dbc710" >
-                    <attribute name="sym_name" value="ACTION_ZOOM_LEVEL_7" id="17776" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_ZOOM_LEVEL_7" id="17777" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="44" id="17778" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17779" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="44" id="17780" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17781" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17782" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17783" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17784" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17785" addr="0x7f99f1dbc870" >
-                <attributelist id="17786" addr="0x7f99f1dbc870" >
-                    <attribute name="sym_name" value="ACTION_ZOOM_LEVEL_8" id="17787" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_ZOOM_LEVEL_8" id="17788" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="45" id="17789" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17790" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="45" id="17791" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17792" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17793" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17794" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17795" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17796" addr="0x7f99f1dbc9d0" >
-                <attributelist id="17797" addr="0x7f99f1dbc9d0" >
-                    <attribute name="sym_name" value="ACTION_ZOOM_LEVEL_9" id="17798" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_ZOOM_LEVEL_9" id="17799" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="46" id="17800" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17801" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="46" id="17802" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17803" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17804" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17805" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17806" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17807" addr="0x7f99f1dbcb30" >
-                <attributelist id="17808" addr="0x7f99f1dbcb30" >
-                    <attribute name="sym_name" value="ACTION_CALIBRATE_SWAP_ARROWS" id="17809" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_CALIBRATE_SWAP_ARROWS" id="17810" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="47" id="17811" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17812" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="47" id="17813" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17814" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17815" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17816" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17817" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17818" addr="0x7f99f1dbcc90" >
-                <attributelist id="17819" addr="0x7f99f1dbcc90" >
-                    <attribute name="sym_name" value="ACTION_CALIBRATE_RESET" id="17820" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_CALIBRATE_RESET" id="17821" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="48" id="17822" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17823" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="48" id="17824" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17825" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17826" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17827" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17828" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17829" addr="0x7f99f1dbcdf0" >
-                <attributelist id="17830" addr="0x7f99f1dbcdf0" >
-                    <attribute name="sym_name" value="ACTION_ANALOG_MOVE" id="17831" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_ANALOG_MOVE" id="17832" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="49" id="17833" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17834" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="49" id="17835" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17836" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17837" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17838" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17839" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17840" addr="0x7f99f1dbcf50" >
-                <attributelist id="17841" addr="0x7f99f1dbcf50" >
-                    <attribute name="sym_name" value="ACTION_ROTATE_PICTURE_CW" id="17842" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_ROTATE_PICTURE_CW" id="17843" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="50" id="17844" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17845" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="50" id="17846" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17847" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17848" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17849" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17850" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17851" addr="0x7f99f1dbd0b0" >
-                <attributelist id="17852" addr="0x7f99f1dbd0b0" >
-                    <attribute name="sym_name" value="ACTION_ROTATE_PICTURE_CCW" id="17853" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_ROTATE_PICTURE_CCW" id="17854" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="51" id="17855" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17856" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="51" id="17857" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17858" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17859" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17860" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17861" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17862" addr="0x7f99f1dbd210" >
-                <attributelist id="17863" addr="0x7f99f1dbd210" >
-                    <attribute name="sym_name" value="ACTION_SUBTITLE_DELAY_MIN" id="17864" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_SUBTITLE_DELAY_MIN" id="17865" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="52" id="17866" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17867" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="52" id="17868" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17869" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17870" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17871" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17872" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17873" addr="0x7f99f1dbd370" >
-                <attributelist id="17874" addr="0x7f99f1dbd370" >
-                    <attribute name="sym_name" value="ACTION_SUBTITLE_DELAY_PLUS" id="17875" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_SUBTITLE_DELAY_PLUS" id="17876" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="53" id="17877" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17878" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="53" id="17879" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17880" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17881" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17882" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17883" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17884" addr="0x7f99f1dbd4d0" >
-                <attributelist id="17885" addr="0x7f99f1dbd4d0" >
-                    <attribute name="sym_name" value="ACTION_AUDIO_DELAY_MIN" id="17886" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_AUDIO_DELAY_MIN" id="17887" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="54" id="17888" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17889" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="54" id="17890" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17891" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17892" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17893" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17894" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17895" addr="0x7f99f1dbd630" >
-                <attributelist id="17896" addr="0x7f99f1dbd630" >
-                    <attribute name="sym_name" value="ACTION_AUDIO_DELAY_PLUS" id="17897" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_AUDIO_DELAY_PLUS" id="17898" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="55" id="17899" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17900" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="55" id="17901" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17902" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17903" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17904" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17905" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17906" addr="0x7f99f1dbd790" >
-                <attributelist id="17907" addr="0x7f99f1dbd790" >
-                    <attribute name="sym_name" value="ACTION_AUDIO_NEXT_LANGUAGE" id="17908" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_AUDIO_NEXT_LANGUAGE" id="17909" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="56" id="17910" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17911" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="56" id="17912" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17913" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17914" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17915" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17916" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17917" addr="0x7f99f1dbd8f0" >
-                <attributelist id="17918" addr="0x7f99f1dbd8f0" >
-                    <attribute name="sym_name" value="ACTION_CHANGE_RESOLUTION" id="17919" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_CHANGE_RESOLUTION" id="17920" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="57" id="17921" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17922" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="57" id="17923" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17924" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17925" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17926" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17927" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17928" addr="0x7f99f1dbda50" >
-                <attributelist id="17929" addr="0x7f99f1dbda50" >
-                    <attribute name="sym_name" value="REMOTE_0" id="17930" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="REMOTE_0" id="17931" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="58" id="17932" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17933" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="58" id="17934" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17935" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17936" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17937" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17938" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17939" addr="0x7f99f1dbdbb0" >
-                <attributelist id="17940" addr="0x7f99f1dbdbb0" >
-                    <attribute name="sym_name" value="REMOTE_1" id="17941" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="REMOTE_1" id="17942" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="59" id="17943" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17944" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="59" id="17945" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17946" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17947" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17948" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17949" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17950" addr="0x7f99f1dbdd10" >
-                <attributelist id="17951" addr="0x7f99f1dbdd10" >
-                    <attribute name="sym_name" value="REMOTE_2" id="17952" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="REMOTE_2" id="17953" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="60" id="17954" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17955" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="60" id="17956" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17957" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17958" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17959" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17960" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17961" addr="0x7f99f1dbde70" >
-                <attributelist id="17962" addr="0x7f99f1dbde70" >
-                    <attribute name="sym_name" value="REMOTE_3" id="17963" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="REMOTE_3" id="17964" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="61" id="17965" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17966" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="61" id="17967" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17968" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17969" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17970" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17971" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17972" addr="0x7f99f1dbdfd0" >
-                <attributelist id="17973" addr="0x7f99f1dbdfd0" >
-                    <attribute name="sym_name" value="REMOTE_4" id="17974" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="REMOTE_4" id="17975" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="62" id="17976" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17977" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="62" id="17978" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17979" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17980" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17981" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17982" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17983" addr="0x7f99f1dbe130" >
-                <attributelist id="17984" addr="0x7f99f1dbe130" >
-                    <attribute name="sym_name" value="REMOTE_5" id="17985" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="REMOTE_5" id="17986" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="63" id="17987" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17988" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="63" id="17989" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17990" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17991" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17992" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17993" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17994" addr="0x7f99f1dbe290" >
-                <attributelist id="17995" addr="0x7f99f1dbe290" >
-                    <attribute name="sym_name" value="REMOTE_6" id="17996" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="REMOTE_6" id="17997" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="64" id="17998" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17999" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="64" id="18000" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18001" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18002" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18003" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18004" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18005" addr="0x7f99f1dbe3f0" >
-                <attributelist id="18006" addr="0x7f99f1dbe3f0" >
-                    <attribute name="sym_name" value="REMOTE_7" id="18007" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="REMOTE_7" id="18008" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="65" id="18009" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18010" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="65" id="18011" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18012" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18013" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18014" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18015" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18016" addr="0x7f99f1dbe550" >
-                <attributelist id="18017" addr="0x7f99f1dbe550" >
-                    <attribute name="sym_name" value="REMOTE_8" id="18018" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="REMOTE_8" id="18019" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="66" id="18020" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18021" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="66" id="18022" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18023" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18024" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18025" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18026" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18027" addr="0x7f99f1dbe6b0" >
-                <attributelist id="18028" addr="0x7f99f1dbe6b0" >
-                    <attribute name="sym_name" value="REMOTE_9" id="18029" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="REMOTE_9" id="18030" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="67" id="18031" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18032" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="67" id="18033" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18034" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18035" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18036" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18037" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18038" addr="0x7f99f1dbe810" >
-                <attributelist id="18039" addr="0x7f99f1dbe810" >
-                    <attribute name="sym_name" value="ACTION_PLAYER_PROCESS_INFO" id="18040" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_PLAYER_PROCESS_INFO" id="18041" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="69" id="18042" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18043" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="69" id="18044" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18045" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18046" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18047" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18048" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18049" addr="0x7f99f1dbe970" >
-                <attributelist id="18050" addr="0x7f99f1dbe970" >
-                    <attribute name="sym_name" value="ACTION_PLAYER_PROGRAM_SELECT" id="18051" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_PLAYER_PROGRAM_SELECT" id="18052" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="70" id="18053" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18054" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="70" id="18055" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18056" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18057" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18058" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18059" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18060" addr="0x7f99f1dbead0" >
-                <attributelist id="18061" addr="0x7f99f1dbead0" >
-                    <attribute name="sym_name" value="ACTION_PLAYER_RESOLUTION_SELECT" id="18062" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_PLAYER_RESOLUTION_SELECT" id="18063" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="71" id="18064" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18065" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="71" id="18066" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18067" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18068" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18069" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18070" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18071" addr="0x7f99f1dbec30" >
-                <attributelist id="18072" addr="0x7f99f1dbec30" >
-                    <attribute name="sym_name" value="ACTION_SMALL_STEP_BACK" id="18073" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_SMALL_STEP_BACK" id="18074" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="76" id="18075" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18076" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="76" id="18077" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18078" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18079" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18080" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18081" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18082" addr="0x7f99f1dbed90" >
-                <attributelist id="18083" addr="0x7f99f1dbed90" >
-                    <attribute name="sym_name" value="ACTION_PLAYER_FORWARD" id="18084" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_PLAYER_FORWARD" id="18085" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="77" id="18086" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18087" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="77" id="18088" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18089" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18090" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18091" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18092" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18093" addr="0x7f99f1dbeef0" >
-                <attributelist id="18094" addr="0x7f99f1dbeef0" >
-                    <attribute name="sym_name" value="ACTION_PLAYER_REWIND" id="18095" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_PLAYER_REWIND" id="18096" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="78" id="18097" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18098" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="78" id="18099" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18100" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18101" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18102" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18103" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18104" addr="0x7f99f1dbf050" >
-                <attributelist id="18105" addr="0x7f99f1dbf050" >
-                    <attribute name="sym_name" value="ACTION_PLAYER_PLAY" id="18106" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_PLAYER_PLAY" id="18107" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="79" id="18108" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18109" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="79" id="18110" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18111" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18112" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18113" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18114" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18115" addr="0x7f99f1dbf1b0" >
-                <attributelist id="18116" addr="0x7f99f1dbf1b0" >
-                    <attribute name="sym_name" value="ACTION_DELETE_ITEM" id="18117" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_DELETE_ITEM" id="18118" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="80" id="18119" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18120" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="80" id="18121" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18122" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18123" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18124" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18125" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18126" addr="0x7f99f1dbf310" >
-                <attributelist id="18127" addr="0x7f99f1dbf310" >
-                    <attribute name="sym_name" value="ACTION_COPY_ITEM" id="18128" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_COPY_ITEM" id="18129" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="81" id="18130" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18131" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="81" id="18132" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18133" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18134" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18135" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18136" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18137" addr="0x7f99f1dbf470" >
-                <attributelist id="18138" addr="0x7f99f1dbf470" >
-                    <attribute name="sym_name" value="ACTION_MOVE_ITEM" id="18139" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_MOVE_ITEM" id="18140" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="82" id="18141" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18142" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="82" id="18143" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18144" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18145" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18146" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18147" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18148" addr="0x7f99f1dbf5d0" >
-                <attributelist id="18149" addr="0x7f99f1dbf5d0" >
-                    <attribute name="sym_name" value="ACTION_TAKE_SCREENSHOT" id="18150" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_TAKE_SCREENSHOT" id="18151" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="85" id="18152" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18153" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="85" id="18154" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18155" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18156" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18157" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18158" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18159" addr="0x7f99f1dbf730" >
-                <attributelist id="18160" addr="0x7f99f1dbf730" >
-                    <attribute name="sym_name" value="ACTION_RENAME_ITEM" id="18161" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_RENAME_ITEM" id="18162" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="87" id="18163" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18164" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="87" id="18165" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18166" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18167" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18168" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18169" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18170" addr="0x7f99f1dbf890" >
-                <attributelist id="18171" addr="0x7f99f1dbf890" >
-                    <attribute name="sym_name" value="ACTION_VOLUME_UP" id="18172" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_VOLUME_UP" id="18173" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="88" id="18174" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18175" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="88" id="18176" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18177" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18178" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18179" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18180" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18181" addr="0x7f99f1dbf9f0" >
-                <attributelist id="18182" addr="0x7f99f1dbf9f0" >
-                    <attribute name="sym_name" value="ACTION_VOLUME_DOWN" id="18183" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_VOLUME_DOWN" id="18184" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="89" id="18185" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18186" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="89" id="18187" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18188" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18189" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18190" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18191" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18192" addr="0x7f99f1dbfb50" >
-                <attributelist id="18193" addr="0x7f99f1dbfb50" >
-                    <attribute name="sym_name" value="ACTION_VOLAMP" id="18194" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_VOLAMP" id="18195" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="90" id="18196" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18197" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="90" id="18198" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18199" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18200" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18201" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18202" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18203" addr="0x7f99f1dbfcb0" >
-                <attributelist id="18204" addr="0x7f99f1dbfcb0" >
-                    <attribute name="sym_name" value="ACTION_MUTE" id="18205" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_MUTE" id="18206" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="91" id="18207" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18208" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="91" id="18209" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18210" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18211" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18212" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18213" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18214" addr="0x7f99f1dbfe10" >
-                <attributelist id="18215" addr="0x7f99f1dbfe10" >
-                    <attribute name="sym_name" value="ACTION_NAV_BACK" id="18216" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_NAV_BACK" id="18217" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="92" id="18218" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18219" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="92" id="18220" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18221" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18222" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18223" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18224" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18225" addr="0x7f99f1dbff70" >
-                <attributelist id="18226" addr="0x7f99f1dbff70" >
-                    <attribute name="sym_name" value="ACTION_VOLAMP_UP" id="18227" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_VOLAMP_UP" id="18228" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="93" id="18229" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18230" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="93" id="18231" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18232" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18233" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18234" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18235" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18236" addr="0x7f99f1dc00d0" >
-                <attributelist id="18237" addr="0x7f99f1dc00d0" >
-                    <attribute name="sym_name" value="ACTION_VOLAMP_DOWN" id="18238" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_VOLAMP_DOWN" id="18239" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="94" id="18240" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18241" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="94" id="18242" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18243" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18244" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18245" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18246" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18247" addr="0x7f99f1dc0230" >
-                <attributelist id="18248" addr="0x7f99f1dc0230" >
-                    <attribute name="sym_name" value="ACTION_CREATE_EPISODE_BOOKMARK" id="18249" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_CREATE_EPISODE_BOOKMARK" id="18250" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="95" id="18251" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18252" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="95" id="18253" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18254" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18255" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18256" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18257" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18258" addr="0x7f99f1dc0390" >
-                <attributelist id="18259" addr="0x7f99f1dc0390" >
-                    <attribute name="sym_name" value="ACTION_CREATE_BOOKMARK" id="18260" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_CREATE_BOOKMARK" id="18261" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="96" id="18262" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18263" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="96" id="18264" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18265" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18266" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18267" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18268" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18269" addr="0x7f99f1dc04f0" >
-                <attributelist id="18270" addr="0x7f99f1dc04f0" >
-                    <attribute name="sym_name" value="ACTION_CHAPTER_OR_BIG_STEP_FORWARD" id="18271" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_CHAPTER_OR_BIG_STEP_FORWARD" id="18272" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="97" id="18273" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18274" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="97" id="18275" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18276" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18277" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18278" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18279" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18280" addr="0x7f99f1dc0650" >
-                <attributelist id="18281" addr="0x7f99f1dc0650" >
-                    <attribute name="sym_name" value="ACTION_CHAPTER_OR_BIG_STEP_BACK" id="18282" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_CHAPTER_OR_BIG_STEP_BACK" id="18283" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="98" id="18284" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18285" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="98" id="18286" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18287" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18288" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18289" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18290" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18291" addr="0x7f99f1dc07b0" >
-                <attributelist id="18292" addr="0x7f99f1dc07b0" >
-                    <attribute name="sym_name" value="ACTION_CYCLE_SUBTITLE" id="18293" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_CYCLE_SUBTITLE" id="18294" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="99" id="18295" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18296" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="99" id="18297" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18298" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18299" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18300" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18301" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18302" addr="0x7f99f1dc0910" >
-                <attributelist id="18303" addr="0x7f99f1dc0910" >
-                    <attribute name="sym_name" value="ACTION_MOUSE_START" id="18304" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_MOUSE_START" id="18305" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="100" id="18306" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18307" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="100" id="18308" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18309" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18310" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18311" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18312" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18313" addr="0x7f99f1dc0a70" >
-                <attributelist id="18314" addr="0x7f99f1dc0a70" >
-                    <attribute name="sym_name" value="ACTION_MOUSE_LEFT_CLICK" id="18315" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_MOUSE_LEFT_CLICK" id="18316" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="100" id="18317" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18318" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="100" id="18319" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18320" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18321" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18322" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18323" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18324" addr="0x7f99f1dc0bd0" >
-                <attributelist id="18325" addr="0x7f99f1dc0bd0" >
-                    <attribute name="sym_name" value="ACTION_MOUSE_RIGHT_CLICK" id="18326" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_MOUSE_RIGHT_CLICK" id="18327" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="101" id="18328" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18329" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="101" id="18330" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18331" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18332" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18333" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18334" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18335" addr="0x7f99f1dc0d30" >
-                <attributelist id="18336" addr="0x7f99f1dc0d30" >
-                    <attribute name="sym_name" value="ACTION_MOUSE_MIDDLE_CLICK" id="18337" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_MOUSE_MIDDLE_CLICK" id="18338" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="102" id="18339" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18340" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="102" id="18341" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18342" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18343" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18344" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18345" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18346" addr="0x7f99f1dc0e90" >
-                <attributelist id="18347" addr="0x7f99f1dc0e90" >
-                    <attribute name="sym_name" value="ACTION_MOUSE_DOUBLE_CLICK" id="18348" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_MOUSE_DOUBLE_CLICK" id="18349" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="103" id="18350" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18351" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="103" id="18352" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18353" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18354" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18355" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18356" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18357" addr="0x7f99f1dc0ff0" >
-                <attributelist id="18358" addr="0x7f99f1dc0ff0" >
-                    <attribute name="sym_name" value="ACTION_MOUSE_WHEEL_UP" id="18359" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_MOUSE_WHEEL_UP" id="18360" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="104" id="18361" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18362" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="104" id="18363" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18364" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18365" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18366" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18367" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18368" addr="0x7f99f1dc1150" >
-                <attributelist id="18369" addr="0x7f99f1dc1150" >
-                    <attribute name="sym_name" value="ACTION_MOUSE_WHEEL_DOWN" id="18370" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_MOUSE_WHEEL_DOWN" id="18371" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="105" id="18372" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18373" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="105" id="18374" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18375" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18376" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18377" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18378" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18379" addr="0x7f99f1dc12b0" >
-                <attributelist id="18380" addr="0x7f99f1dc12b0" >
-                    <attribute name="sym_name" value="ACTION_MOUSE_DRAG" id="18381" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_MOUSE_DRAG" id="18382" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="106" id="18383" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18384" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="106" id="18385" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18386" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18387" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18388" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18389" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18390" addr="0x7f99f1dc1410" >
-                <attributelist id="18391" addr="0x7f99f1dc1410" >
-                    <attribute name="sym_name" value="ACTION_MOUSE_MOVE" id="18392" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_MOUSE_MOVE" id="18393" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="107" id="18394" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18395" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="107" id="18396" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18397" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18398" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18399" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18400" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18401" addr="0x7f99f1dc1570" >
-                <attributelist id="18402" addr="0x7f99f1dc1570" >
-                    <attribute name="sym_name" value="ACTION_MOUSE_LONG_CLICK" id="18403" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_MOUSE_LONG_CLICK" id="18404" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="108" id="18405" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18406" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="108" id="18407" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18408" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18409" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18410" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18411" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18412" addr="0x7f99f1dc16d0" >
-                <attributelist id="18413" addr="0x7f99f1dc16d0" >
-                    <attribute name="sym_name" value="ACTION_MOUSE_END" id="18414" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_MOUSE_END" id="18415" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="109" id="18416" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18417" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="109" id="18418" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18419" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18420" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18421" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18422" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18423" addr="0x7f99f1dc1830" >
-                <attributelist id="18424" addr="0x7f99f1dc1830" >
-                    <attribute name="sym_name" value="ACTION_BACKSPACE" id="18425" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_BACKSPACE" id="18426" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="110" id="18427" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18428" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="110" id="18429" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18430" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18431" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18432" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18433" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18434" addr="0x7f99f1dc1990" >
-                <attributelist id="18435" addr="0x7f99f1dc1990" >
-                    <attribute name="sym_name" value="ACTION_SCROLL_UP" id="18436" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_SCROLL_UP" id="18437" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="111" id="18438" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18439" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="111" id="18440" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18441" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18442" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18443" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18444" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18445" addr="0x7f99f1dc1af0" >
-                <attributelist id="18446" addr="0x7f99f1dc1af0" >
-                    <attribute name="sym_name" value="ACTION_SCROLL_DOWN" id="18447" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_SCROLL_DOWN" id="18448" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="112" id="18449" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18450" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="112" id="18451" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18452" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18453" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18454" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18455" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18456" addr="0x7f99f1dc1c50" >
-                <attributelist id="18457" addr="0x7f99f1dc1c50" >
-                    <attribute name="sym_name" value="ACTION_ANALOG_FORWARD" id="18458" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_ANALOG_FORWARD" id="18459" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="113" id="18460" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18461" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="113" id="18462" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18463" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18464" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18465" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18466" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18467" addr="0x7f99f1dc1db0" >
-                <attributelist id="18468" addr="0x7f99f1dc1db0" >
-                    <attribute name="sym_name" value="ACTION_ANALOG_REWIND" id="18469" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_ANALOG_REWIND" id="18470" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="114" id="18471" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18472" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="114" id="18473" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18474" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18475" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18476" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18477" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18478" addr="0x7f99f1dc1f10" >
-                <attributelist id="18479" addr="0x7f99f1dc1f10" >
-                    <attribute name="sym_name" value="ACTION_MOVE_ITEM_UP" id="18480" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_MOVE_ITEM_UP" id="18481" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="115" id="18482" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18483" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="115" id="18484" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18485" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18486" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18487" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18488" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18489" addr="0x7f99f1dc2070" >
-                <attributelist id="18490" addr="0x7f99f1dc2070" >
-                    <attribute name="sym_name" value="ACTION_MOVE_ITEM_DOWN" id="18491" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_MOVE_ITEM_DOWN" id="18492" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="116" id="18493" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18494" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="116" id="18495" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18496" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18497" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18498" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18499" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18500" addr="0x7f99f1dc21d0" >
-                <attributelist id="18501" addr="0x7f99f1dc21d0" >
-                    <attribute name="sym_name" value="ACTION_CONTEXT_MENU" id="18502" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_CONTEXT_MENU" id="18503" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="117" id="18504" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18505" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="117" id="18506" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18507" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18508" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18509" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18510" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18511" addr="0x7f99f1dc2330" >
-                <attributelist id="18512" addr="0x7f99f1dc2330" >
-                    <attribute name="sym_name" value="ACTION_SHIFT" id="18513" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_SHIFT" id="18514" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="118" id="18515" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18516" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="118" id="18517" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18518" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18519" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18520" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18521" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18522" addr="0x7f99f1dc2490" >
-                <attributelist id="18523" addr="0x7f99f1dc2490" >
-                    <attribute name="sym_name" value="ACTION_SYMBOLS" id="18524" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_SYMBOLS" id="18525" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="119" id="18526" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18527" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="119" id="18528" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18529" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18530" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18531" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18532" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18533" addr="0x7f99f1dc25f0" >
-                <attributelist id="18534" addr="0x7f99f1dc25f0" >
-                    <attribute name="sym_name" value="ACTION_CURSOR_LEFT" id="18535" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_CURSOR_LEFT" id="18536" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="120" id="18537" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18538" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="120" id="18539" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18540" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18541" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18542" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18543" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18544" addr="0x7f99f1dc2750" >
-                <attributelist id="18545" addr="0x7f99f1dc2750" >
-                    <attribute name="sym_name" value="ACTION_CURSOR_RIGHT" id="18546" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_CURSOR_RIGHT" id="18547" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="121" id="18548" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18549" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="121" id="18550" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18551" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18552" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18553" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18554" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18555" addr="0x7f99f1dc28b0" >
-                <attributelist id="18556" addr="0x7f99f1dc28b0" >
-                    <attribute name="sym_name" value="ACTION_BUILT_IN_FUNCTION" id="18557" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_BUILT_IN_FUNCTION" id="18558" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="122" id="18559" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18560" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="122" id="18561" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18562" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18563" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18564" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18565" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18566" addr="0x7f99f1dc2a10" >
-                <attributelist id="18567" addr="0x7f99f1dc2a10" >
-                    <attribute name="sym_name" value="ACTION_SHOW_OSD_TIME" id="18568" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_SHOW_OSD_TIME" id="18569" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="123" id="18570" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18571" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="123" id="18572" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18573" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18574" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18575" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18576" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18577" addr="0x7f99f1dc2b70" >
-                <attributelist id="18578" addr="0x7f99f1dc2b70" >
-                    <attribute name="sym_name" value="ACTION_ANALOG_SEEK_FORWARD" id="18579" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_ANALOG_SEEK_FORWARD" id="18580" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="124" id="18581" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18582" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="124" id="18583" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18584" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18585" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18586" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18587" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18588" addr="0x7f99f1dc2cd0" >
-                <attributelist id="18589" addr="0x7f99f1dc2cd0" >
-                    <attribute name="sym_name" value="ACTION_ANALOG_SEEK_BACK" id="18590" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_ANALOG_SEEK_BACK" id="18591" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="125" id="18592" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18593" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="125" id="18594" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18595" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18596" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18597" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18598" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18599" addr="0x7f99f1dc2e30" >
-                <attributelist id="18600" addr="0x7f99f1dc2e30" >
-                    <attribute name="sym_name" value="ACTION_VIS_PRESET_SHOW" id="18601" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_VIS_PRESET_SHOW" id="18602" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="126" id="18603" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18604" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="126" id="18605" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18606" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18607" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18608" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18609" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18610" addr="0x7f99f1dc2f90" >
-                <attributelist id="18611" addr="0x7f99f1dc2f90" >
-                    <attribute name="sym_name" value="ACTION_VIS_PRESET_NEXT" id="18612" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_VIS_PRESET_NEXT" id="18613" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="128" id="18614" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18615" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="128" id="18616" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18617" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18618" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18619" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18620" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18621" addr="0x7f99f1dc30f0" >
-                <attributelist id="18622" addr="0x7f99f1dc30f0" >
-                    <attribute name="sym_name" value="ACTION_VIS_PRESET_PREV" id="18623" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_VIS_PRESET_PREV" id="18624" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="129" id="18625" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18626" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="129" id="18627" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18628" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18629" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18630" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18631" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18632" addr="0x7f99f1dc3250" >
-                <attributelist id="18633" addr="0x7f99f1dc3250" >
-                    <attribute name="sym_name" value="ACTION_VIS_PRESET_LOCK" id="18634" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_VIS_PRESET_LOCK" id="18635" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="130" id="18636" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18637" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="130" id="18638" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18639" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18640" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18641" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18642" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18643" addr="0x7f99f1dc33b0" >
-                <attributelist id="18644" addr="0x7f99f1dc33b0" >
-                    <attribute name="sym_name" value="ACTION_VIS_PRESET_RANDOM" id="18645" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_VIS_PRESET_RANDOM" id="18646" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="131" id="18647" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18648" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="131" id="18649" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18650" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18651" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18652" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18653" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18654" addr="0x7f99f1dc3510" >
-                <attributelist id="18655" addr="0x7f99f1dc3510" >
-                    <attribute name="sym_name" value="ACTION_VIS_RATE_PRESET_PLUS" id="18656" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_VIS_RATE_PRESET_PLUS" id="18657" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="132" id="18658" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18659" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="132" id="18660" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18661" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18662" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18663" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18664" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18665" addr="0x7f99f1dc3670" >
-                <attributelist id="18666" addr="0x7f99f1dc3670" >
-                    <attribute name="sym_name" value="ACTION_VIS_RATE_PRESET_MINUS" id="18667" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_VIS_RATE_PRESET_MINUS" id="18668" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="133" id="18669" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18670" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="133" id="18671" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18672" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18673" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18674" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18675" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18676" addr="0x7f99f1dc37d0" >
-                <attributelist id="18677" addr="0x7f99f1dc37d0" >
-                    <attribute name="sym_name" value="ACTION_SHOW_VIDEOMENU" id="18678" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_SHOW_VIDEOMENU" id="18679" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="134" id="18680" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18681" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="134" id="18682" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18683" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18684" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18685" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18686" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18687" addr="0x7f99f1dc3930" >
-                <attributelist id="18688" addr="0x7f99f1dc3930" >
-                    <attribute name="sym_name" value="ACTION_ENTER" id="18689" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_ENTER" id="18690" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="135" id="18691" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18692" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="135" id="18693" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18694" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18695" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18696" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18697" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18698" addr="0x7f99f1dc3a90" >
-                <attributelist id="18699" addr="0x7f99f1dc3a90" >
-                    <attribute name="sym_name" value="ACTION_INCREASE_RATING" id="18700" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_INCREASE_RATING" id="18701" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="136" id="18702" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18703" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="136" id="18704" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18705" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18706" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18707" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18708" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18709" addr="0x7f99f1dc3bf0" >
-                <attributelist id="18710" addr="0x7f99f1dc3bf0" >
-                    <attribute name="sym_name" value="ACTION_DECREASE_RATING" id="18711" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_DECREASE_RATING" id="18712" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="137" id="18713" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18714" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="137" id="18715" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18716" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18717" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18718" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18719" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18720" addr="0x7f99f1dc3d50" >
-                <attributelist id="18721" addr="0x7f99f1dc3d50" >
-                    <attribute name="sym_name" value="ACTION_NEXT_SCENE" id="18722" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_NEXT_SCENE" id="18723" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="138" id="18724" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18725" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="138" id="18726" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18727" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18728" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18729" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18730" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18731" addr="0x7f99f1dc3eb0" >
-                <attributelist id="18732" addr="0x7f99f1dc3eb0" >
-                    <attribute name="sym_name" value="ACTION_PREV_SCENE" id="18733" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_PREV_SCENE" id="18734" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="139" id="18735" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18736" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="139" id="18737" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18738" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18739" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18740" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18741" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18742" addr="0x7f99f1dc4010" >
-                <attributelist id="18743" addr="0x7f99f1dc4010" >
-                    <attribute name="sym_name" value="ACTION_NEXT_LETTER" id="18744" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_NEXT_LETTER" id="18745" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="140" id="18746" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18747" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="140" id="18748" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18749" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18750" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18751" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18752" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18753" addr="0x7f99f1dc4170" >
-                <attributelist id="18754" addr="0x7f99f1dc4170" >
-                    <attribute name="sym_name" value="ACTION_PREV_LETTER" id="18755" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_PREV_LETTER" id="18756" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="141" id="18757" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18758" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="141" id="18759" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18760" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18761" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18762" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18763" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18764" addr="0x7f99f1dc42d0" >
-                <attributelist id="18765" addr="0x7f99f1dc42d0" >
-                    <attribute name="sym_name" value="ACTION_JUMP_SMS2" id="18766" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_JUMP_SMS2" id="18767" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="142" id="18768" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18769" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="142" id="18770" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18771" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18772" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18773" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18774" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18775" addr="0x7f99f1dc4430" >
-                <attributelist id="18776" addr="0x7f99f1dc4430" >
-                    <attribute name="sym_name" value="ACTION_JUMP_SMS3" id="18777" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_JUMP_SMS3" id="18778" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="143" id="18779" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18780" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="143" id="18781" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18782" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18783" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18784" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18785" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18786" addr="0x7f99f1dc4590" >
-                <attributelist id="18787" addr="0x7f99f1dc4590" >
-                    <attribute name="sym_name" value="ACTION_JUMP_SMS4" id="18788" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_JUMP_SMS4" id="18789" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="144" id="18790" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18791" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="144" id="18792" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18793" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18794" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18795" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18796" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18797" addr="0x7f99f1dc46f0" >
-                <attributelist id="18798" addr="0x7f99f1dc46f0" >
-                    <attribute name="sym_name" value="ACTION_JUMP_SMS5" id="18799" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_JUMP_SMS5" id="18800" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="145" id="18801" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18802" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="145" id="18803" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18804" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18805" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18806" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18807" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18808" addr="0x7f99f1dc4850" >
-                <attributelist id="18809" addr="0x7f99f1dc4850" >
-                    <attribute name="sym_name" value="ACTION_JUMP_SMS6" id="18810" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_JUMP_SMS6" id="18811" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="146" id="18812" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18813" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="146" id="18814" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18815" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18816" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18817" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18818" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18819" addr="0x7f99f1dc49b0" >
-                <attributelist id="18820" addr="0x7f99f1dc49b0" >
-                    <attribute name="sym_name" value="ACTION_JUMP_SMS7" id="18821" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_JUMP_SMS7" id="18822" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="147" id="18823" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18824" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="147" id="18825" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18826" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18827" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18828" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18829" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18830" addr="0x7f99f1dc4b10" >
-                <attributelist id="18831" addr="0x7f99f1dc4b10" >
-                    <attribute name="sym_name" value="ACTION_JUMP_SMS8" id="18832" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_JUMP_SMS8" id="18833" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="148" id="18834" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18835" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="148" id="18836" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18837" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18838" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18839" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18840" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18841" addr="0x7f99f1dc4c70" >
-                <attributelist id="18842" addr="0x7f99f1dc4c70" >
-                    <attribute name="sym_name" value="ACTION_JUMP_SMS9" id="18843" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_JUMP_SMS9" id="18844" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="149" id="18845" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18846" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="149" id="18847" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18848" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18849" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18850" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18851" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18852" addr="0x7f99f1dc4dd0" >
-                <attributelist id="18853" addr="0x7f99f1dc4dd0" >
-                    <attribute name="sym_name" value="ACTION_FILTER_CLEAR" id="18854" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_FILTER_CLEAR" id="18855" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="150" id="18856" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18857" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="150" id="18858" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18859" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18860" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18861" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18862" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18863" addr="0x7f99f1dc4f30" >
-                <attributelist id="18864" addr="0x7f99f1dc4f30" >
-                    <attribute name="sym_name" value="ACTION_FILTER_SMS2" id="18865" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_FILTER_SMS2" id="18866" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="151" id="18867" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18868" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="151" id="18869" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18870" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18871" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18872" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18873" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18874" addr="0x7f99f1dc5090" >
-                <attributelist id="18875" addr="0x7f99f1dc5090" >
-                    <attribute name="sym_name" value="ACTION_FILTER_SMS3" id="18876" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_FILTER_SMS3" id="18877" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="152" id="18878" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18879" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="152" id="18880" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18881" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18882" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18883" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18884" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18885" addr="0x7f99f1dc51f0" >
-                <attributelist id="18886" addr="0x7f99f1dc51f0" >
-                    <attribute name="sym_name" value="ACTION_FILTER_SMS4" id="18887" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_FILTER_SMS4" id="18888" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="153" id="18889" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18890" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="153" id="18891" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18892" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18893" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18894" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18895" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18896" addr="0x7f99f1dc5350" >
-                <attributelist id="18897" addr="0x7f99f1dc5350" >
-                    <attribute name="sym_name" value="ACTION_FILTER_SMS5" id="18898" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_FILTER_SMS5" id="18899" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="154" id="18900" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18901" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="154" id="18902" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18903" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18904" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18905" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18906" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18907" addr="0x7f99f1dc54b0" >
-                <attributelist id="18908" addr="0x7f99f1dc54b0" >
-                    <attribute name="sym_name" value="ACTION_FILTER_SMS6" id="18909" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_FILTER_SMS6" id="18910" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="155" id="18911" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18912" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="155" id="18913" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18914" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18915" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18916" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18917" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18918" addr="0x7f99f1dc5610" >
-                <attributelist id="18919" addr="0x7f99f1dc5610" >
-                    <attribute name="sym_name" value="ACTION_FILTER_SMS7" id="18920" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_FILTER_SMS7" id="18921" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="156" id="18922" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18923" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="156" id="18924" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18925" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18926" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18927" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18928" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18929" addr="0x7f99f1dc5770" >
-                <attributelist id="18930" addr="0x7f99f1dc5770" >
-                    <attribute name="sym_name" value="ACTION_FILTER_SMS8" id="18931" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_FILTER_SMS8" id="18932" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="157" id="18933" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18934" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="157" id="18935" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18936" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18937" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18938" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18939" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18940" addr="0x7f99f1dc58d0" >
-                <attributelist id="18941" addr="0x7f99f1dc58d0" >
-                    <attribute name="sym_name" value="ACTION_FILTER_SMS9" id="18942" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_FILTER_SMS9" id="18943" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="158" id="18944" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18945" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="158" id="18946" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18947" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18948" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18949" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18950" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18951" addr="0x7f99f1dc5a30" >
-                <attributelist id="18952" addr="0x7f99f1dc5a30" >
-                    <attribute name="sym_name" value="ACTION_FIRST_PAGE" id="18953" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_FIRST_PAGE" id="18954" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="159" id="18955" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18956" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="159" id="18957" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18958" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18959" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18960" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18961" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18962" addr="0x7f99f1dc5b90" >
-                <attributelist id="18963" addr="0x7f99f1dc5b90" >
-                    <attribute name="sym_name" value="ACTION_LAST_PAGE" id="18964" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_LAST_PAGE" id="18965" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="160" id="18966" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18967" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="160" id="18968" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18969" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18970" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18971" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18972" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18973" addr="0x7f99f1dc5cf0" >
-                <attributelist id="18974" addr="0x7f99f1dc5cf0" >
-                    <attribute name="sym_name" value="ACTION_AUDIO_DELAY" id="18975" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_AUDIO_DELAY" id="18976" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="161" id="18977" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18978" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="161" id="18979" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18980" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18981" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18982" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18983" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18984" addr="0x7f99f1dc5e50" >
-                <attributelist id="18985" addr="0x7f99f1dc5e50" >
-                    <attribute name="sym_name" value="ACTION_SUBTITLE_DELAY" id="18986" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_SUBTITLE_DELAY" id="18987" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="162" id="18988" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18989" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="162" id="18990" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18991" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18992" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18993" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18994" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18995" addr="0x7f99f1dc5fb0" >
-                <attributelist id="18996" addr="0x7f99f1dc5fb0" >
-                    <attribute name="sym_name" value="ACTION_MENU" id="18997" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_MENU" id="18998" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="163" id="18999" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19000" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="163" id="19001" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19002" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19003" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19004" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19005" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19006" addr="0x7f99f1dc6110" >
-                <attributelist id="19007" addr="0x7f99f1dc6110" >
-                    <attribute name="sym_name" value="ACTION_SET_RATING" id="19008" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_SET_RATING" id="19009" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="164" id="19010" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19011" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="164" id="19012" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19013" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19014" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19015" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19016" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19017" addr="0x7f99f1dc6270" >
-                <attributelist id="19018" addr="0x7f99f1dc6270" >
-                    <attribute name="sym_name" value="ACTION_RECORD" id="19019" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_RECORD" id="19020" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="170" id="19021" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19022" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="170" id="19023" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19024" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19025" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19026" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19027" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19028" addr="0x7f99f1dc63d0" >
-                <attributelist id="19029" addr="0x7f99f1dc63d0" >
-                    <attribute name="sym_name" value="ACTION_PASTE" id="19030" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_PASTE" id="19031" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="180" id="19032" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19033" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="180" id="19034" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19035" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19036" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19037" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19038" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19039" addr="0x7f99f1dc6530" >
-                <attributelist id="19040" addr="0x7f99f1dc6530" >
-                    <attribute name="sym_name" value="ACTION_NEXT_CONTROL" id="19041" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_NEXT_CONTROL" id="19042" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="181" id="19043" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19044" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="181" id="19045" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19046" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19047" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19048" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19049" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19050" addr="0x7f99f1dc6690" >
-                <attributelist id="19051" addr="0x7f99f1dc6690" >
-                    <attribute name="sym_name" value="ACTION_PREV_CONTROL" id="19052" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_PREV_CONTROL" id="19053" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="182" id="19054" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19055" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="182" id="19056" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19057" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19058" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19059" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19060" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19061" addr="0x7f99f1dc67f0" >
-                <attributelist id="19062" addr="0x7f99f1dc67f0" >
-                    <attribute name="sym_name" value="ACTION_CHANNEL_SWITCH" id="19063" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_CHANNEL_SWITCH" id="19064" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="183" id="19065" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19066" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="183" id="19067" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19068" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19069" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19070" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19071" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19072" addr="0x7f99f1dc6950" >
-                <attributelist id="19073" addr="0x7f99f1dc6950" >
-                    <attribute name="sym_name" value="ACTION_CHANNEL_UP" id="19074" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_CHANNEL_UP" id="19075" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="184" id="19076" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19077" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="184" id="19078" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19079" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19080" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19081" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19082" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19083" addr="0x7f99f1dc6ab0" >
-                <attributelist id="19084" addr="0x7f99f1dc6ab0" >
-                    <attribute name="sym_name" value="ACTION_CHANNEL_DOWN" id="19085" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_CHANNEL_DOWN" id="19086" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="185" id="19087" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19088" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="185" id="19089" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19090" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19091" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19092" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19093" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19094" addr="0x7f99f1dc6c10" >
-                <attributelist id="19095" addr="0x7f99f1dc6c10" >
-                    <attribute name="sym_name" value="ACTION_NEXT_CHANNELGROUP" id="19096" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_NEXT_CHANNELGROUP" id="19097" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="186" id="19098" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19099" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="186" id="19100" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19101" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19102" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19103" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19104" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19105" addr="0x7f99f1dc6d70" >
-                <attributelist id="19106" addr="0x7f99f1dc6d70" >
-                    <attribute name="sym_name" value="ACTION_PREVIOUS_CHANNELGROUP" id="19107" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_PREVIOUS_CHANNELGROUP" id="19108" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="187" id="19109" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19110" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="187" id="19111" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19112" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19113" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19114" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19115" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19116" addr="0x7f99f1dc6ed0" >
-                <attributelist id="19117" addr="0x7f99f1dc6ed0" >
-                    <attribute name="sym_name" value="ACTION_PVR_PLAY" id="19118" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_PVR_PLAY" id="19119" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="188" id="19120" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19121" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="188" id="19122" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19123" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19124" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19125" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19126" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19127" addr="0x7f99f1dc7030" >
-                <attributelist id="19128" addr="0x7f99f1dc7030" >
-                    <attribute name="sym_name" value="ACTION_PVR_PLAY_TV" id="19129" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_PVR_PLAY_TV" id="19130" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="189" id="19131" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19132" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="189" id="19133" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19134" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19135" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19136" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19137" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19138" addr="0x7f99f1dc7190" >
-                <attributelist id="19139" addr="0x7f99f1dc7190" >
-                    <attribute name="sym_name" value="ACTION_PVR_PLAY_RADIO" id="19140" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_PVR_PLAY_RADIO" id="19141" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="190" id="19142" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19143" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="190" id="19144" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19145" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19146" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19147" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19148" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19149" addr="0x7f99f1dc72f0" >
-                <attributelist id="19150" addr="0x7f99f1dc72f0" >
-                    <attribute name="sym_name" value="ACTION_PVR_SHOW_TIMER_RULE" id="19151" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_PVR_SHOW_TIMER_RULE" id="19152" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="191" id="19153" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19154" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="191" id="19155" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19156" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19157" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19158" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19159" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19160" addr="0x7f99f1dc7450" >
-                <attributelist id="19161" addr="0x7f99f1dc7450" >
-                    <attribute name="sym_name" value="ACTION_CHANNEL_NUMBER_SEP" id="19162" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_CHANNEL_NUMBER_SEP" id="19163" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="192" id="19164" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19165" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="192" id="19166" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19167" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19168" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19169" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19170" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19171" addr="0x7f99f1dc75b0" >
-                <attributelist id="19172" addr="0x7f99f1dc75b0" >
-                    <attribute name="sym_name" value="ACTION_TOGGLE_FULLSCREEN" id="19173" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_TOGGLE_FULLSCREEN" id="19174" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="199" id="19175" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19176" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="199" id="19177" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19178" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19179" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19180" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19181" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19182" addr="0x7f99f1dc7710" >
-                <attributelist id="19183" addr="0x7f99f1dc7710" >
-                    <attribute name="sym_name" value="ACTION_TOGGLE_WATCHED" id="19184" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_TOGGLE_WATCHED" id="19185" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="200" id="19186" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19187" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="200" id="19188" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19189" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19190" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19191" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19192" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19193" addr="0x7f99f1dc7870" >
-                <attributelist id="19194" addr="0x7f99f1dc7870" >
-                    <attribute name="sym_name" value="ACTION_SCAN_ITEM" id="19195" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_SCAN_ITEM" id="19196" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="201" id="19197" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19198" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="201" id="19199" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19200" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19201" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19202" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19203" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19204" addr="0x7f99f1dc79d0" >
-                <attributelist id="19205" addr="0x7f99f1dc79d0" >
-                    <attribute name="sym_name" value="ACTION_TOGGLE_DIGITAL_ANALOG" id="19206" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_TOGGLE_DIGITAL_ANALOG" id="19207" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="202" id="19208" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19209" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="202" id="19210" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19211" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19212" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19213" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19214" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19215" addr="0x7f99f1dc7b30" >
-                <attributelist id="19216" addr="0x7f99f1dc7b30" >
-                    <attribute name="sym_name" value="ACTION_RELOAD_KEYMAPS" id="19217" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_RELOAD_KEYMAPS" id="19218" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="203" id="19219" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19220" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="203" id="19221" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19222" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19223" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19224" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19225" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19226" addr="0x7f99f1dc7c90" >
-                <attributelist id="19227" addr="0x7f99f1dc7c90" >
-                    <attribute name="sym_name" value="ACTION_GUIPROFILE_BEGIN" id="19228" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_GUIPROFILE_BEGIN" id="19229" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="204" id="19230" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19231" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="204" id="19232" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19233" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19234" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19235" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19236" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19237" addr="0x7f99f1dc7df0" >
-                <attributelist id="19238" addr="0x7f99f1dc7df0" >
-                    <attribute name="sym_name" value="ACTION_TELETEXT_RED" id="19239" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_TELETEXT_RED" id="19240" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="215" id="19241" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19242" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="215" id="19243" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19244" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19245" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19246" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19247" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19248" addr="0x7f99f1dc7f50" >
-                <attributelist id="19249" addr="0x7f99f1dc7f50" >
-                    <attribute name="sym_name" value="ACTION_TELETEXT_GREEN" id="19250" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_TELETEXT_GREEN" id="19251" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="216" id="19252" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19253" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="216" id="19254" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19255" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19256" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19257" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19258" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19259" addr="0x7f99f1dc80b0" >
-                <attributelist id="19260" addr="0x7f99f1dc80b0" >
-                    <attribute name="sym_name" value="ACTION_TELETEXT_YELLOW" id="19261" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_TELETEXT_YELLOW" id="19262" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="217" id="19263" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19264" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="217" id="19265" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19266" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19267" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19268" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19269" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19270" addr="0x7f99f1dc8210" >
-                <attributelist id="19271" addr="0x7f99f1dc8210" >
-                    <attribute name="sym_name" value="ACTION_TELETEXT_BLUE" id="19272" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_TELETEXT_BLUE" id="19273" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="218" id="19274" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19275" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="218" id="19276" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19277" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19278" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19279" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19280" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19281" addr="0x7f99f1dc8370" >
-                <attributelist id="19282" addr="0x7f99f1dc8370" >
-                    <attribute name="sym_name" value="ACTION_INCREASE_PAR" id="19283" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_INCREASE_PAR" id="19284" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="219" id="19285" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19286" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="219" id="19287" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19288" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19289" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19290" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19291" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19292" addr="0x7f99f1dc84d0" >
-                <attributelist id="19293" addr="0x7f99f1dc84d0" >
-                    <attribute name="sym_name" value="ACTION_DECREASE_PAR" id="19294" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_DECREASE_PAR" id="19295" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="220" id="19296" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19297" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="220" id="19298" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19299" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19300" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19301" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19302" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19303" addr="0x7f99f1dc8630" >
-                <attributelist id="19304" addr="0x7f99f1dc8630" >
-                    <attribute name="sym_name" value="ACTION_VSHIFT_UP" id="19305" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_VSHIFT_UP" id="19306" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="227" id="19307" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19308" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="227" id="19309" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19310" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19311" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19312" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19313" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19314" addr="0x7f99f1dc8790" >
-                <attributelist id="19315" addr="0x7f99f1dc8790" >
-                    <attribute name="sym_name" value="ACTION_VSHIFT_DOWN" id="19316" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_VSHIFT_DOWN" id="19317" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="228" id="19318" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19319" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="228" id="19320" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19321" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19322" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19323" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19324" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19325" addr="0x7f99f1dc88f0" >
-                <attributelist id="19326" addr="0x7f99f1dc88f0" >
-                    <attribute name="sym_name" value="ACTION_PLAYER_PLAYPAUSE" id="19327" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_PLAYER_PLAYPAUSE" id="19328" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="229" id="19329" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19330" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="229" id="19331" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19332" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19333" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19334" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19335" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19336" addr="0x7f99f1dc8a50" >
-                <attributelist id="19337" addr="0x7f99f1dc8a50" >
-                    <attribute name="sym_name" value="ACTION_SUBTITLE_VSHIFT_UP" id="19338" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_SUBTITLE_VSHIFT_UP" id="19339" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="230" id="19340" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19341" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="230" id="19342" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19343" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19344" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19345" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19346" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19347" addr="0x7f99f1dc8bb0" >
-                <attributelist id="19348" addr="0x7f99f1dc8bb0" >
-                    <attribute name="sym_name" value="ACTION_SUBTITLE_VSHIFT_DOWN" id="19349" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_SUBTITLE_VSHIFT_DOWN" id="19350" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="231" id="19351" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19352" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="231" id="19353" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19354" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19355" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19356" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19357" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19358" addr="0x7f99f1dc8d10" >
-                <attributelist id="19359" addr="0x7f99f1dc8d10" >
-                    <attribute name="sym_name" value="ACTION_SUBTITLE_ALIGN" id="19360" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_SUBTITLE_ALIGN" id="19361" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="232" id="19362" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19363" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="232" id="19364" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19365" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19366" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19367" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19368" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19369" addr="0x7f99f1dc8e70" >
-                <attributelist id="19370" addr="0x7f99f1dc8e70" >
-                    <attribute name="sym_name" value="ACTION_FILTER" id="19371" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_FILTER" id="19372" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="233" id="19373" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19374" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="233" id="19375" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19376" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19377" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19378" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19379" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19380" addr="0x7f99f1dc8fd0" >
-                <attributelist id="19381" addr="0x7f99f1dc8fd0" >
-                    <attribute name="sym_name" value="ACTION_SWITCH_PLAYER" id="19382" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_SWITCH_PLAYER" id="19383" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="234" id="19384" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19385" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="234" id="19386" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19387" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19388" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19389" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19390" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19391" addr="0x7f99f1dc9130" >
-                <attributelist id="19392" addr="0x7f99f1dc9130" >
-                    <attribute name="sym_name" value="ACTION_STEREOMODE_NEXT" id="19393" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_STEREOMODE_NEXT" id="19394" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="235" id="19395" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19396" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="235" id="19397" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19398" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19399" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19400" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19401" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19402" addr="0x7f99f1dc9290" >
-                <attributelist id="19403" addr="0x7f99f1dc9290" >
-                    <attribute name="sym_name" value="ACTION_STEREOMODE_PREVIOUS" id="19404" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_STEREOMODE_PREVIOUS" id="19405" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="236" id="19406" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19407" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="236" id="19408" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19409" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19410" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19411" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19412" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19413" addr="0x7f99f1dc93f0" >
-                <attributelist id="19414" addr="0x7f99f1dc93f0" >
-                    <attribute name="sym_name" value="ACTION_STEREOMODE_TOGGLE" id="19415" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_STEREOMODE_TOGGLE" id="19416" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="237" id="19417" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19418" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="237" id="19419" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19420" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19421" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19422" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19423" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19424" addr="0x7f99f1dc9550" >
-                <attributelist id="19425" addr="0x7f99f1dc9550" >
-                    <attribute name="sym_name" value="ACTION_STEREOMODE_SELECT" id="19426" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_STEREOMODE_SELECT" id="19427" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="238" id="19428" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19429" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="238" id="19430" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19431" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19432" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19433" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19434" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19435" addr="0x7f99f1dc96b0" >
-                <attributelist id="19436" addr="0x7f99f1dc96b0" >
-                    <attribute name="sym_name" value="ACTION_STEREOMODE_TOMONO" id="19437" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_STEREOMODE_TOMONO" id="19438" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="239" id="19439" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19440" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="239" id="19441" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19442" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19443" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19444" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19445" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19446" addr="0x7f99f1dc9810" >
-                <attributelist id="19447" addr="0x7f99f1dc9810" >
-                    <attribute name="sym_name" value="ACTION_STEREOMODE_SET" id="19448" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_STEREOMODE_SET" id="19449" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="240" id="19450" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19451" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="240" id="19452" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19453" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19454" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19455" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19456" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19457" addr="0x7f99f1dc9970" >
-                <attributelist id="19458" addr="0x7f99f1dc9970" >
-                    <attribute name="sym_name" value="ACTION_SETTINGS_RESET" id="19459" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_SETTINGS_RESET" id="19460" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="241" id="19461" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19462" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="241" id="19463" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19464" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19465" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19466" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19467" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19468" addr="0x7f99f1dc9ad0" >
-                <attributelist id="19469" addr="0x7f99f1dc9ad0" >
-                    <attribute name="sym_name" value="ACTION_SETTINGS_LEVEL_CHANGE" id="19470" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_SETTINGS_LEVEL_CHANGE" id="19471" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="242" id="19472" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19473" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="242" id="19474" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19475" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19476" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19477" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19478" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19479" addr="0x7f99f1dc9c30" >
-                <attributelist id="19480" addr="0x7f99f1dc9c30" >
-                    <attribute name="sym_name" value="ACTION_TRIGGER_OSD" id="19481" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_TRIGGER_OSD" id="19482" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="243" id="19483" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19484" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="243" id="19485" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19486" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19487" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19488" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19489" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19490" addr="0x7f99f1dc9d90" >
-                <attributelist id="19491" addr="0x7f99f1dc9d90" >
-                    <attribute name="sym_name" value="ACTION_INPUT_TEXT" id="19492" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_INPUT_TEXT" id="19493" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="244" id="19494" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19495" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="244" id="19496" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19497" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19498" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19499" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19500" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19501" addr="0x7f99f1dc9ef0" >
-                <attributelist id="19502" addr="0x7f99f1dc9ef0" >
-                    <attribute name="sym_name" value="ACTION_VOLUME_SET" id="19503" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_VOLUME_SET" id="19504" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="245" id="19505" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19506" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="245" id="19507" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19508" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19509" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19510" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19511" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19512" addr="0x7f99f1dca050" >
-                <attributelist id="19513" addr="0x7f99f1dca050" >
-                    <attribute name="sym_name" value="ACTION_TOGGLE_COMMSKIP" id="19514" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_TOGGLE_COMMSKIP" id="19515" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="246" id="19516" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19517" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="246" id="19518" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19519" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19520" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19521" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19522" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19523" addr="0x7f99f1dca1b0" >
-                <attributelist id="19524" addr="0x7f99f1dca1b0" >
-                    <attribute name="sym_name" value="ACTION_PLAYER_RESET" id="19525" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_PLAYER_RESET" id="19526" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="248" id="19527" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19528" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="248" id="19529" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19530" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19531" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19532" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19533" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19534" addr="0x7f99f1dca310" >
-                <attributelist id="19535" addr="0x7f99f1dca310" >
-                    <attribute name="sym_name" value="ACTION_TOGGLE_FONT" id="19536" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_TOGGLE_FONT" id="19537" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="249" id="19538" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19539" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="249" id="19540" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19541" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19542" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19543" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19544" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19545" addr="0x7f99f1dca470" >
-                <attributelist id="19546" addr="0x7f99f1dca470" >
-                    <attribute name="sym_name" value="ACTION_VIDEO_NEXT_STREAM" id="19547" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_VIDEO_NEXT_STREAM" id="19548" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="250" id="19549" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19550" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="250" id="19551" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19552" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19553" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19554" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19555" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19556" addr="0x7f99f1dca5d0" >
-                <attributelist id="19557" addr="0x7f99f1dca5d0" >
-                    <attribute name="sym_name" value="ACTION_QUEUE_ITEM_NEXT" id="19558" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_QUEUE_ITEM_NEXT" id="19559" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="251" id="19560" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19561" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="251" id="19562" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19563" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19564" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19565" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19566" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19567" addr="0x7f99f1dca730" >
-                <attributelist id="19568" addr="0x7f99f1dca730" >
-                    <attribute name="sym_name" value="ACTION_VOICE_RECOGNIZE" id="19569" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_VOICE_RECOGNIZE" id="19570" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="300" id="19571" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19572" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="300" id="19573" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19574" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19575" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19576" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19577" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19578" addr="0x7f99f1dca890" >
-                <attributelist id="19579" addr="0x7f99f1dca890" >
-                    <attribute name="sym_name" value="ACTION_TOUCH_TAP" id="19580" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_TOUCH_TAP" id="19581" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="401" id="19582" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19583" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="401" id="19584" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19585" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19586" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19587" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19588" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19589" addr="0x7f99f1dca9f0" >
-                <attributelist id="19590" addr="0x7f99f1dca9f0" >
-                    <attribute name="sym_name" value="ACTION_TOUCH_TAP_TEN" id="19591" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_TOUCH_TAP_TEN" id="19592" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="410" id="19593" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19594" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="410" id="19595" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19596" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19597" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19598" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19599" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19600" addr="0x7f99f1dcab50" >
-                <attributelist id="19601" addr="0x7f99f1dcab50" >
-                    <attribute name="sym_name" value="ACTION_TOUCH_LONGPRESS" id="19602" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_TOUCH_LONGPRESS" id="19603" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="411" id="19604" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19605" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="411" id="19606" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19607" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19608" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19609" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19610" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19611" addr="0x7f99f1dcacb0" >
-                <attributelist id="19612" addr="0x7f99f1dcacb0" >
-                    <attribute name="sym_name" value="ACTION_TOUCH_LONGPRESS_TEN" id="19613" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_TOUCH_LONGPRESS_TEN" id="19614" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="420" id="19615" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19616" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="420" id="19617" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19618" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19619" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19620" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19621" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19622" addr="0x7f99f1dcae10" >
-                <attributelist id="19623" addr="0x7f99f1dcae10" >
-                    <attribute name="sym_name" value="ACTION_GESTURE_NOTIFY" id="19624" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_GESTURE_NOTIFY" id="19625" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="500" id="19626" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19627" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="500" id="19628" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19629" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19630" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19631" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19632" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19633" addr="0x7f99f1dcaf70" >
-                <attributelist id="19634" addr="0x7f99f1dcaf70" >
-                    <attribute name="sym_name" value="ACTION_GESTURE_BEGIN" id="19635" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_GESTURE_BEGIN" id="19636" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="501" id="19637" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19638" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="501" id="19639" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19640" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19641" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19642" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19643" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19644" addr="0x7f99f1dcb0d0" >
-                <attributelist id="19645" addr="0x7f99f1dcb0d0" >
-                    <attribute name="sym_name" value="ACTION_GESTURE_ZOOM" id="19646" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_GESTURE_ZOOM" id="19647" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="502" id="19648" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19649" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="502" id="19650" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19651" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19652" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19653" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19654" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19655" addr="0x7f99f1dcb230" >
-                <attributelist id="19656" addr="0x7f99f1dcb230" >
-                    <attribute name="sym_name" value="ACTION_GESTURE_ROTATE" id="19657" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_GESTURE_ROTATE" id="19658" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="503" id="19659" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19660" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="503" id="19661" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19662" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19663" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19664" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19665" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19666" addr="0x7f99f1dcb390" >
-                <attributelist id="19667" addr="0x7f99f1dcb390" >
-                    <attribute name="sym_name" value="ACTION_GESTURE_PAN" id="19668" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_GESTURE_PAN" id="19669" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="504" id="19670" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19671" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="504" id="19672" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19673" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19674" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19675" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19676" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19677" addr="0x7f99f1dcb4f0" >
-                <attributelist id="19678" addr="0x7f99f1dcb4f0" >
-                    <attribute name="sym_name" value="ACTION_GESTURE_ABORT" id="19679" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_GESTURE_ABORT" id="19680" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="505" id="19681" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19682" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="505" id="19683" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19684" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19685" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19686" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19687" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19688" addr="0x7f99f1dcb650" >
-                <attributelist id="19689" addr="0x7f99f1dcb650" >
-                    <attribute name="sym_name" value="ACTION_GESTURE_SWIPE_LEFT" id="19690" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_GESTURE_SWIPE_LEFT" id="19691" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="511" id="19692" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19693" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="511" id="19694" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19695" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19696" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19697" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19698" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19699" addr="0x7f99f1dcb7b0" >
-                <attributelist id="19700" addr="0x7f99f1dcb7b0" >
-                    <attribute name="sym_name" value="ACTION_GESTURE_SWIPE_LEFT_TEN" id="19701" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_GESTURE_SWIPE_LEFT_TEN" id="19702" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="520" id="19703" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19704" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="520" id="19705" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19706" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19707" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19708" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19709" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19710" addr="0x7f99f1dcb910" >
-                <attributelist id="19711" addr="0x7f99f1dcb910" >
-                    <attribute name="sym_name" value="ACTION_GESTURE_SWIPE_RIGHT" id="19712" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_GESTURE_SWIPE_RIGHT" id="19713" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="521" id="19714" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19715" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="521" id="19716" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19717" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19718" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19719" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19720" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19721" addr="0x7f99f1dcba70" >
-                <attributelist id="19722" addr="0x7f99f1dcba70" >
-                    <attribute name="sym_name" value="ACTION_GESTURE_SWIPE_RIGHT_TEN" id="19723" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_GESTURE_SWIPE_RIGHT_TEN" id="19724" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="530" id="19725" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19726" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="530" id="19727" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19728" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19729" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19730" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19731" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19732" addr="0x7f99f1dcbbd0" >
-                <attributelist id="19733" addr="0x7f99f1dcbbd0" >
-                    <attribute name="sym_name" value="ACTION_GESTURE_SWIPE_UP" id="19734" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_GESTURE_SWIPE_UP" id="19735" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="531" id="19736" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19737" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="531" id="19738" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19739" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19740" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19741" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19742" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19743" addr="0x7f99f1dcbd30" >
-                <attributelist id="19744" addr="0x7f99f1dcbd30" >
-                    <attribute name="sym_name" value="ACTION_GESTURE_SWIPE_UP_TEN" id="19745" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_GESTURE_SWIPE_UP_TEN" id="19746" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="540" id="19747" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19748" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="540" id="19749" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19750" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19751" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19752" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19753" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19754" addr="0x7f99f1dcbe90" >
-                <attributelist id="19755" addr="0x7f99f1dcbe90" >
-                    <attribute name="sym_name" value="ACTION_GESTURE_SWIPE_DOWN" id="19756" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_GESTURE_SWIPE_DOWN" id="19757" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="541" id="19758" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19759" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="541" id="19760" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19761" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19762" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19763" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19764" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19765" addr="0x7f99f1dcbff0" >
-                <attributelist id="19766" addr="0x7f99f1dcbff0" >
-                    <attribute name="sym_name" value="ACTION_GESTURE_SWIPE_DOWN_TEN" id="19767" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_GESTURE_SWIPE_DOWN_TEN" id="19768" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="550" id="19769" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19770" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="550" id="19771" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19772" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19773" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19774" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19775" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19776" addr="0x7f99f1dcc150" >
-                <attributelist id="19777" addr="0x7f99f1dcc150" >
-                    <attribute name="sym_name" value="ACTION_GESTURE_END" id="19778" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_GESTURE_END" id="19779" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="599" id="19780" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19781" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="599" id="19782" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19783" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19784" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19785" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19786" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19787" addr="0x7f99f1dcc2b0" >
-                <attributelist id="19788" addr="0x7f99f1dcc2b0" >
-                    <attribute name="sym_name" value="ACTION_ANALOG_MOVE_X_LEFT" id="19789" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_ANALOG_MOVE_X_LEFT" id="19790" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="601" id="19791" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19792" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="601" id="19793" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19794" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19795" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19796" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19797" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19798" addr="0x7f99f1dcc410" >
-                <attributelist id="19799" addr="0x7f99f1dcc410" >
-                    <attribute name="sym_name" value="ACTION_ANALOG_MOVE_X_RIGHT" id="19800" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_ANALOG_MOVE_X_RIGHT" id="19801" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="602" id="19802" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19803" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="602" id="19804" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19805" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19806" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19807" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19808" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19809" addr="0x7f99f1dcc570" >
-                <attributelist id="19810" addr="0x7f99f1dcc570" >
-                    <attribute name="sym_name" value="ACTION_ANALOG_MOVE_Y_UP" id="19811" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_ANALOG_MOVE_Y_UP" id="19812" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="603" id="19813" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19814" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="603" id="19815" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19816" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19817" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19818" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19819" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19820" addr="0x7f99f1dcc6d0" >
-                <attributelist id="19821" addr="0x7f99f1dcc6d0" >
-                    <attribute name="sym_name" value="ACTION_ANALOG_MOVE_Y_DOWN" id="19822" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_ANALOG_MOVE_Y_DOWN" id="19823" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="604" id="19824" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19825" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="604" id="19826" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19827" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19828" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19829" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19830" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19831" addr="0x7f99f1dcc830" >
-                <attributelist id="19832" addr="0x7f99f1dcc830" >
-                    <attribute name="sym_name" value="ACTION_ERROR" id="19833" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_ERROR" id="19834" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="998" id="19835" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19836" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="998" id="19837" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19838" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19839" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19840" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19841" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19842" addr="0x7f99f1dcc990" >
-                <attributelist id="19843" addr="0x7f99f1dcc990" >
-                    <attribute name="sym_name" value="ACTION_NOOP" id="19844" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_NOOP" id="19845" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="999" id="19846" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19847" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="999" id="19848" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19849" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19850" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19851" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19852" addr="0x7f99f1de6c90" />
+            <constant id="17279" addr="0x7fca46906930" >
+                <attributelist id="17280" addr="0x7fca46906930" >
+                    <attribute name="sym_name" value="ACTION_NONE" id="17281" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_NONE" id="17282" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="0" id="17283" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17284" addr="0x7fca46934c90" />
+                    <attribute name="value" value="0" id="17285" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17286" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17287" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17288" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17289" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17290" addr="0x7fca46906a90" >
+                <attributelist id="17291" addr="0x7fca46906a90" >
+                    <attribute name="sym_name" value="ACTION_MOVE_LEFT" id="17292" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_MOVE_LEFT" id="17293" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="1" id="17294" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17295" addr="0x7fca46934c90" />
+                    <attribute name="value" value="1" id="17296" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17297" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17298" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17299" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17300" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17301" addr="0x7fca46906bf0" >
+                <attributelist id="17302" addr="0x7fca46906bf0" >
+                    <attribute name="sym_name" value="ACTION_MOVE_RIGHT" id="17303" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_MOVE_RIGHT" id="17304" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="2" id="17305" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17306" addr="0x7fca46934c90" />
+                    <attribute name="value" value="2" id="17307" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17308" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17309" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17310" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17311" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17312" addr="0x7fca46906d50" >
+                <attributelist id="17313" addr="0x7fca46906d50" >
+                    <attribute name="sym_name" value="ACTION_MOVE_UP" id="17314" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_MOVE_UP" id="17315" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="3" id="17316" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17317" addr="0x7fca46934c90" />
+                    <attribute name="value" value="3" id="17318" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17319" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17320" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17321" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17322" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17323" addr="0x7fca46906eb0" >
+                <attributelist id="17324" addr="0x7fca46906eb0" >
+                    <attribute name="sym_name" value="ACTION_MOVE_DOWN" id="17325" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_MOVE_DOWN" id="17326" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="4" id="17327" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17328" addr="0x7fca46934c90" />
+                    <attribute name="value" value="4" id="17329" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17330" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17331" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17332" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17333" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17334" addr="0x7fca46907010" >
+                <attributelist id="17335" addr="0x7fca46907010" >
+                    <attribute name="sym_name" value="ACTION_PAGE_UP" id="17336" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_PAGE_UP" id="17337" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="5" id="17338" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17339" addr="0x7fca46934c90" />
+                    <attribute name="value" value="5" id="17340" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17341" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17342" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17343" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17344" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17345" addr="0x7fca46907170" >
+                <attributelist id="17346" addr="0x7fca46907170" >
+                    <attribute name="sym_name" value="ACTION_PAGE_DOWN" id="17347" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_PAGE_DOWN" id="17348" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="6" id="17349" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17350" addr="0x7fca46934c90" />
+                    <attribute name="value" value="6" id="17351" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17352" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17353" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17354" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17355" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17356" addr="0x7fca469072d0" >
+                <attributelist id="17357" addr="0x7fca469072d0" >
+                    <attribute name="sym_name" value="ACTION_SELECT_ITEM" id="17358" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_SELECT_ITEM" id="17359" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="7" id="17360" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17361" addr="0x7fca46934c90" />
+                    <attribute name="value" value="7" id="17362" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17363" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17364" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17365" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17366" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17367" addr="0x7fca46907430" >
+                <attributelist id="17368" addr="0x7fca46907430" >
+                    <attribute name="sym_name" value="ACTION_HIGHLIGHT_ITEM" id="17369" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_HIGHLIGHT_ITEM" id="17370" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="8" id="17371" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17372" addr="0x7fca46934c90" />
+                    <attribute name="value" value="8" id="17373" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17374" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17375" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17376" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17377" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17378" addr="0x7fca46907590" >
+                <attributelist id="17379" addr="0x7fca46907590" >
+                    <attribute name="sym_name" value="ACTION_PARENT_DIR" id="17380" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_PARENT_DIR" id="17381" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="9" id="17382" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17383" addr="0x7fca46934c90" />
+                    <attribute name="value" value="9" id="17384" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17385" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17386" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17387" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17388" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17389" addr="0x7fca469076f0" >
+                <attributelist id="17390" addr="0x7fca469076f0" >
+                    <attribute name="sym_name" value="ACTION_PREVIOUS_MENU" id="17391" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_PREVIOUS_MENU" id="17392" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="10" id="17393" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17394" addr="0x7fca46934c90" />
+                    <attribute name="value" value="10" id="17395" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17396" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17397" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17398" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17399" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17400" addr="0x7fca46907850" >
+                <attributelist id="17401" addr="0x7fca46907850" >
+                    <attribute name="sym_name" value="ACTION_SHOW_INFO" id="17402" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_SHOW_INFO" id="17403" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="11" id="17404" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17405" addr="0x7fca46934c90" />
+                    <attribute name="value" value="11" id="17406" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17407" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17408" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17409" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17410" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17411" addr="0x7fca469079b0" >
+                <attributelist id="17412" addr="0x7fca469079b0" >
+                    <attribute name="sym_name" value="ACTION_PAUSE" id="17413" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_PAUSE" id="17414" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="12" id="17415" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17416" addr="0x7fca46934c90" />
+                    <attribute name="value" value="12" id="17417" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17418" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17419" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17420" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17421" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17422" addr="0x7fca46907b10" >
+                <attributelist id="17423" addr="0x7fca46907b10" >
+                    <attribute name="sym_name" value="ACTION_STOP" id="17424" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_STOP" id="17425" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="13" id="17426" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17427" addr="0x7fca46934c90" />
+                    <attribute name="value" value="13" id="17428" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17429" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17430" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17431" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17432" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17433" addr="0x7fca46907c70" >
+                <attributelist id="17434" addr="0x7fca46907c70" >
+                    <attribute name="sym_name" value="ACTION_NEXT_ITEM" id="17435" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_NEXT_ITEM" id="17436" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="14" id="17437" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17438" addr="0x7fca46934c90" />
+                    <attribute name="value" value="14" id="17439" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17440" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17441" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17442" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17443" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17444" addr="0x7fca46907dd0" >
+                <attributelist id="17445" addr="0x7fca46907dd0" >
+                    <attribute name="sym_name" value="ACTION_PREV_ITEM" id="17446" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_PREV_ITEM" id="17447" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="15" id="17448" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17449" addr="0x7fca46934c90" />
+                    <attribute name="value" value="15" id="17450" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17451" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17452" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17453" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17454" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17455" addr="0x7fca46907f30" >
+                <attributelist id="17456" addr="0x7fca46907f30" >
+                    <attribute name="sym_name" value="ACTION_FORWARD" id="17457" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_FORWARD" id="17458" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="16" id="17459" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17460" addr="0x7fca46934c90" />
+                    <attribute name="value" value="16" id="17461" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17462" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17463" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17464" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17465" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17466" addr="0x7fca46908090" >
+                <attributelist id="17467" addr="0x7fca46908090" >
+                    <attribute name="sym_name" value="ACTION_REWIND" id="17468" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_REWIND" id="17469" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="17" id="17470" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17471" addr="0x7fca46934c90" />
+                    <attribute name="value" value="17" id="17472" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17473" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17474" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17475" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17476" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17477" addr="0x7fca469081f0" >
+                <attributelist id="17478" addr="0x7fca469081f0" >
+                    <attribute name="sym_name" value="ACTION_SHOW_GUI" id="17479" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_SHOW_GUI" id="17480" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="18" id="17481" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17482" addr="0x7fca46934c90" />
+                    <attribute name="value" value="18" id="17483" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17484" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17485" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17486" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17487" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17488" addr="0x7fca46908350" >
+                <attributelist id="17489" addr="0x7fca46908350" >
+                    <attribute name="sym_name" value="ACTION_ASPECT_RATIO" id="17490" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_ASPECT_RATIO" id="17491" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="19" id="17492" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17493" addr="0x7fca46934c90" />
+                    <attribute name="value" value="19" id="17494" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17495" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17496" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17497" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17498" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17499" addr="0x7fca469084b0" >
+                <attributelist id="17500" addr="0x7fca469084b0" >
+                    <attribute name="sym_name" value="ACTION_STEP_FORWARD" id="17501" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_STEP_FORWARD" id="17502" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="20" id="17503" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17504" addr="0x7fca46934c90" />
+                    <attribute name="value" value="20" id="17505" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17506" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17507" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17508" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17509" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17510" addr="0x7fca46908610" >
+                <attributelist id="17511" addr="0x7fca46908610" >
+                    <attribute name="sym_name" value="ACTION_STEP_BACK" id="17512" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_STEP_BACK" id="17513" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="21" id="17514" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17515" addr="0x7fca46934c90" />
+                    <attribute name="value" value="21" id="17516" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17517" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17518" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17519" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17520" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17521" addr="0x7fca46908770" >
+                <attributelist id="17522" addr="0x7fca46908770" >
+                    <attribute name="sym_name" value="ACTION_BIG_STEP_FORWARD" id="17523" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_BIG_STEP_FORWARD" id="17524" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="22" id="17525" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17526" addr="0x7fca46934c90" />
+                    <attribute name="value" value="22" id="17527" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17528" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17529" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17530" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17531" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17532" addr="0x7fca469088d0" >
+                <attributelist id="17533" addr="0x7fca469088d0" >
+                    <attribute name="sym_name" value="ACTION_BIG_STEP_BACK" id="17534" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_BIG_STEP_BACK" id="17535" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="23" id="17536" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17537" addr="0x7fca46934c90" />
+                    <attribute name="value" value="23" id="17538" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17539" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17540" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17541" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17542" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17543" addr="0x7fca46908a30" >
+                <attributelist id="17544" addr="0x7fca46908a30" >
+                    <attribute name="sym_name" value="ACTION_SHOW_OSD" id="17545" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_SHOW_OSD" id="17546" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="24" id="17547" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17548" addr="0x7fca46934c90" />
+                    <attribute name="value" value="24" id="17549" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17550" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17551" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17552" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17553" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17554" addr="0x7fca46908b90" >
+                <attributelist id="17555" addr="0x7fca46908b90" >
+                    <attribute name="sym_name" value="ACTION_SHOW_SUBTITLES" id="17556" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_SHOW_SUBTITLES" id="17557" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="25" id="17558" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17559" addr="0x7fca46934c90" />
+                    <attribute name="value" value="25" id="17560" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17561" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17562" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17563" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17564" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17565" addr="0x7fca46908cf0" >
+                <attributelist id="17566" addr="0x7fca46908cf0" >
+                    <attribute name="sym_name" value="ACTION_NEXT_SUBTITLE" id="17567" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_NEXT_SUBTITLE" id="17568" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="26" id="17569" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17570" addr="0x7fca46934c90" />
+                    <attribute name="value" value="26" id="17571" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17572" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17573" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17574" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17575" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17576" addr="0x7fca46908e50" >
+                <attributelist id="17577" addr="0x7fca46908e50" >
+                    <attribute name="sym_name" value="ACTION_BROWSE_SUBTITLE" id="17578" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_BROWSE_SUBTITLE" id="17579" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="247" id="17580" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17581" addr="0x7fca46934c90" />
+                    <attribute name="value" value="247" id="17582" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17583" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17584" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17585" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17586" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17587" addr="0x7fca46908fb0" >
+                <attributelist id="17588" addr="0x7fca46908fb0" >
+                    <attribute name="sym_name" value="ACTION_PLAYER_DEBUG" id="17589" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_PLAYER_DEBUG" id="17590" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="27" id="17591" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17592" addr="0x7fca46934c90" />
+                    <attribute name="value" value="27" id="17593" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17594" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17595" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17596" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17597" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17598" addr="0x7fca46909110" >
+                <attributelist id="17599" addr="0x7fca46909110" >
+                    <attribute name="sym_name" value="ACTION_NEXT_PICTURE" id="17600" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_NEXT_PICTURE" id="17601" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="28" id="17602" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17603" addr="0x7fca46934c90" />
+                    <attribute name="value" value="28" id="17604" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17605" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17606" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17607" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17608" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17609" addr="0x7fca46909270" >
+                <attributelist id="17610" addr="0x7fca46909270" >
+                    <attribute name="sym_name" value="ACTION_PREV_PICTURE" id="17611" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_PREV_PICTURE" id="17612" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="29" id="17613" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17614" addr="0x7fca46934c90" />
+                    <attribute name="value" value="29" id="17615" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17616" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17617" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17618" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17619" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17620" addr="0x7fca469093d0" >
+                <attributelist id="17621" addr="0x7fca469093d0" >
+                    <attribute name="sym_name" value="ACTION_ZOOM_OUT" id="17622" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_ZOOM_OUT" id="17623" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="30" id="17624" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17625" addr="0x7fca46934c90" />
+                    <attribute name="value" value="30" id="17626" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17627" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17628" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17629" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17630" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17631" addr="0x7fca46909530" >
+                <attributelist id="17632" addr="0x7fca46909530" >
+                    <attribute name="sym_name" value="ACTION_ZOOM_IN" id="17633" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_ZOOM_IN" id="17634" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="31" id="17635" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17636" addr="0x7fca46934c90" />
+                    <attribute name="value" value="31" id="17637" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17638" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17639" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17640" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17641" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17642" addr="0x7fca46909690" >
+                <attributelist id="17643" addr="0x7fca46909690" >
+                    <attribute name="sym_name" value="ACTION_TOGGLE_SOURCE_DEST" id="17644" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_TOGGLE_SOURCE_DEST" id="17645" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="32" id="17646" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17647" addr="0x7fca46934c90" />
+                    <attribute name="value" value="32" id="17648" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17649" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17650" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17651" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17652" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17653" addr="0x7fca469097f0" >
+                <attributelist id="17654" addr="0x7fca469097f0" >
+                    <attribute name="sym_name" value="ACTION_SHOW_PLAYLIST" id="17655" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_SHOW_PLAYLIST" id="17656" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="33" id="17657" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17658" addr="0x7fca46934c90" />
+                    <attribute name="value" value="33" id="17659" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17660" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17661" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17662" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17663" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17664" addr="0x7fca46909950" >
+                <attributelist id="17665" addr="0x7fca46909950" >
+                    <attribute name="sym_name" value="ACTION_QUEUE_ITEM" id="17666" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_QUEUE_ITEM" id="17667" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="34" id="17668" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17669" addr="0x7fca46934c90" />
+                    <attribute name="value" value="34" id="17670" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17671" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17672" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17673" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17674" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17675" addr="0x7fca46909ab0" >
+                <attributelist id="17676" addr="0x7fca46909ab0" >
+                    <attribute name="sym_name" value="ACTION_REMOVE_ITEM" id="17677" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_REMOVE_ITEM" id="17678" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="35" id="17679" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17680" addr="0x7fca46934c90" />
+                    <attribute name="value" value="35" id="17681" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17682" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17683" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17684" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17685" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17686" addr="0x7fca46909c10" >
+                <attributelist id="17687" addr="0x7fca46909c10" >
+                    <attribute name="sym_name" value="ACTION_SHOW_FULLSCREEN" id="17688" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_SHOW_FULLSCREEN" id="17689" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="36" id="17690" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17691" addr="0x7fca46934c90" />
+                    <attribute name="value" value="36" id="17692" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17693" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17694" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17695" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17696" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17697" addr="0x7fca46909d70" >
+                <attributelist id="17698" addr="0x7fca46909d70" >
+                    <attribute name="sym_name" value="ACTION_ZOOM_LEVEL_NORMAL" id="17699" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_ZOOM_LEVEL_NORMAL" id="17700" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="37" id="17701" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17702" addr="0x7fca46934c90" />
+                    <attribute name="value" value="37" id="17703" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17704" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17705" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17706" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17707" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17708" addr="0x7fca46909ed0" >
+                <attributelist id="17709" addr="0x7fca46909ed0" >
+                    <attribute name="sym_name" value="ACTION_ZOOM_LEVEL_1" id="17710" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_ZOOM_LEVEL_1" id="17711" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="38" id="17712" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17713" addr="0x7fca46934c90" />
+                    <attribute name="value" value="38" id="17714" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17715" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17716" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17717" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17718" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17719" addr="0x7fca4690a030" >
+                <attributelist id="17720" addr="0x7fca4690a030" >
+                    <attribute name="sym_name" value="ACTION_ZOOM_LEVEL_2" id="17721" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_ZOOM_LEVEL_2" id="17722" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="39" id="17723" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17724" addr="0x7fca46934c90" />
+                    <attribute name="value" value="39" id="17725" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17726" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17727" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17728" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17729" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17730" addr="0x7fca4690a190" >
+                <attributelist id="17731" addr="0x7fca4690a190" >
+                    <attribute name="sym_name" value="ACTION_ZOOM_LEVEL_3" id="17732" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_ZOOM_LEVEL_3" id="17733" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="40" id="17734" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17735" addr="0x7fca46934c90" />
+                    <attribute name="value" value="40" id="17736" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17737" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17738" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17739" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17740" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17741" addr="0x7fca4690a2f0" >
+                <attributelist id="17742" addr="0x7fca4690a2f0" >
+                    <attribute name="sym_name" value="ACTION_ZOOM_LEVEL_4" id="17743" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_ZOOM_LEVEL_4" id="17744" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="41" id="17745" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17746" addr="0x7fca46934c90" />
+                    <attribute name="value" value="41" id="17747" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17748" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17749" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17750" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17751" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17752" addr="0x7fca4690a450" >
+                <attributelist id="17753" addr="0x7fca4690a450" >
+                    <attribute name="sym_name" value="ACTION_ZOOM_LEVEL_5" id="17754" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_ZOOM_LEVEL_5" id="17755" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="42" id="17756" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17757" addr="0x7fca46934c90" />
+                    <attribute name="value" value="42" id="17758" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17759" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17760" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17761" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17762" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17763" addr="0x7fca4690a5b0" >
+                <attributelist id="17764" addr="0x7fca4690a5b0" >
+                    <attribute name="sym_name" value="ACTION_ZOOM_LEVEL_6" id="17765" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_ZOOM_LEVEL_6" id="17766" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="43" id="17767" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17768" addr="0x7fca46934c90" />
+                    <attribute name="value" value="43" id="17769" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17770" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17771" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17772" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17773" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17774" addr="0x7fca4690a710" >
+                <attributelist id="17775" addr="0x7fca4690a710" >
+                    <attribute name="sym_name" value="ACTION_ZOOM_LEVEL_7" id="17776" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_ZOOM_LEVEL_7" id="17777" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="44" id="17778" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17779" addr="0x7fca46934c90" />
+                    <attribute name="value" value="44" id="17780" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17781" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17782" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17783" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17784" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17785" addr="0x7fca4690a870" >
+                <attributelist id="17786" addr="0x7fca4690a870" >
+                    <attribute name="sym_name" value="ACTION_ZOOM_LEVEL_8" id="17787" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_ZOOM_LEVEL_8" id="17788" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="45" id="17789" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17790" addr="0x7fca46934c90" />
+                    <attribute name="value" value="45" id="17791" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17792" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17793" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17794" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17795" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17796" addr="0x7fca4690a9d0" >
+                <attributelist id="17797" addr="0x7fca4690a9d0" >
+                    <attribute name="sym_name" value="ACTION_ZOOM_LEVEL_9" id="17798" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_ZOOM_LEVEL_9" id="17799" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="46" id="17800" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17801" addr="0x7fca46934c90" />
+                    <attribute name="value" value="46" id="17802" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17803" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17804" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17805" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17806" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17807" addr="0x7fca4690ab30" >
+                <attributelist id="17808" addr="0x7fca4690ab30" >
+                    <attribute name="sym_name" value="ACTION_CALIBRATE_SWAP_ARROWS" id="17809" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_CALIBRATE_SWAP_ARROWS" id="17810" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="47" id="17811" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17812" addr="0x7fca46934c90" />
+                    <attribute name="value" value="47" id="17813" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17814" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17815" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17816" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17817" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17818" addr="0x7fca4690ac90" >
+                <attributelist id="17819" addr="0x7fca4690ac90" >
+                    <attribute name="sym_name" value="ACTION_CALIBRATE_RESET" id="17820" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_CALIBRATE_RESET" id="17821" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="48" id="17822" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17823" addr="0x7fca46934c90" />
+                    <attribute name="value" value="48" id="17824" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17825" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17826" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17827" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17828" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17829" addr="0x7fca4690adf0" >
+                <attributelist id="17830" addr="0x7fca4690adf0" >
+                    <attribute name="sym_name" value="ACTION_ANALOG_MOVE" id="17831" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_ANALOG_MOVE" id="17832" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="49" id="17833" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17834" addr="0x7fca46934c90" />
+                    <attribute name="value" value="49" id="17835" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17836" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17837" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17838" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17839" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17840" addr="0x7fca4690af50" >
+                <attributelist id="17841" addr="0x7fca4690af50" >
+                    <attribute name="sym_name" value="ACTION_ROTATE_PICTURE_CW" id="17842" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_ROTATE_PICTURE_CW" id="17843" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="50" id="17844" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17845" addr="0x7fca46934c90" />
+                    <attribute name="value" value="50" id="17846" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17847" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17848" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17849" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17850" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17851" addr="0x7fca4690b0b0" >
+                <attributelist id="17852" addr="0x7fca4690b0b0" >
+                    <attribute name="sym_name" value="ACTION_ROTATE_PICTURE_CCW" id="17853" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_ROTATE_PICTURE_CCW" id="17854" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="51" id="17855" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17856" addr="0x7fca46934c90" />
+                    <attribute name="value" value="51" id="17857" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17858" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17859" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17860" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17861" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17862" addr="0x7fca4690b210" >
+                <attributelist id="17863" addr="0x7fca4690b210" >
+                    <attribute name="sym_name" value="ACTION_SUBTITLE_DELAY_MIN" id="17864" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_SUBTITLE_DELAY_MIN" id="17865" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="52" id="17866" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17867" addr="0x7fca46934c90" />
+                    <attribute name="value" value="52" id="17868" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17869" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17870" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17871" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17872" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17873" addr="0x7fca4690b370" >
+                <attributelist id="17874" addr="0x7fca4690b370" >
+                    <attribute name="sym_name" value="ACTION_SUBTITLE_DELAY_PLUS" id="17875" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_SUBTITLE_DELAY_PLUS" id="17876" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="53" id="17877" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17878" addr="0x7fca46934c90" />
+                    <attribute name="value" value="53" id="17879" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17880" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17881" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17882" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17883" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17884" addr="0x7fca4690b4d0" >
+                <attributelist id="17885" addr="0x7fca4690b4d0" >
+                    <attribute name="sym_name" value="ACTION_AUDIO_DELAY_MIN" id="17886" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_AUDIO_DELAY_MIN" id="17887" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="54" id="17888" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17889" addr="0x7fca46934c90" />
+                    <attribute name="value" value="54" id="17890" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17891" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17892" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17893" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17894" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17895" addr="0x7fca4690b630" >
+                <attributelist id="17896" addr="0x7fca4690b630" >
+                    <attribute name="sym_name" value="ACTION_AUDIO_DELAY_PLUS" id="17897" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_AUDIO_DELAY_PLUS" id="17898" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="55" id="17899" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17900" addr="0x7fca46934c90" />
+                    <attribute name="value" value="55" id="17901" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17902" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17903" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17904" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17905" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17906" addr="0x7fca4690b790" >
+                <attributelist id="17907" addr="0x7fca4690b790" >
+                    <attribute name="sym_name" value="ACTION_AUDIO_NEXT_LANGUAGE" id="17908" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_AUDIO_NEXT_LANGUAGE" id="17909" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="56" id="17910" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17911" addr="0x7fca46934c90" />
+                    <attribute name="value" value="56" id="17912" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17913" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17914" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17915" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17916" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17917" addr="0x7fca4690b8f0" >
+                <attributelist id="17918" addr="0x7fca4690b8f0" >
+                    <attribute name="sym_name" value="ACTION_CHANGE_RESOLUTION" id="17919" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_CHANGE_RESOLUTION" id="17920" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="57" id="17921" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17922" addr="0x7fca46934c90" />
+                    <attribute name="value" value="57" id="17923" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17924" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17925" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17926" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17927" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17928" addr="0x7fca4690ba50" >
+                <attributelist id="17929" addr="0x7fca4690ba50" >
+                    <attribute name="sym_name" value="REMOTE_0" id="17930" addr="0x7fca46934c90" />
+                    <attribute name="name" value="REMOTE_0" id="17931" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="58" id="17932" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17933" addr="0x7fca46934c90" />
+                    <attribute name="value" value="58" id="17934" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17935" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17936" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17937" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17938" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17939" addr="0x7fca4690bbb0" >
+                <attributelist id="17940" addr="0x7fca4690bbb0" >
+                    <attribute name="sym_name" value="REMOTE_1" id="17941" addr="0x7fca46934c90" />
+                    <attribute name="name" value="REMOTE_1" id="17942" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="59" id="17943" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17944" addr="0x7fca46934c90" />
+                    <attribute name="value" value="59" id="17945" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17946" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17947" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17948" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17949" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17950" addr="0x7fca4690bd10" >
+                <attributelist id="17951" addr="0x7fca4690bd10" >
+                    <attribute name="sym_name" value="REMOTE_2" id="17952" addr="0x7fca46934c90" />
+                    <attribute name="name" value="REMOTE_2" id="17953" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="60" id="17954" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17955" addr="0x7fca46934c90" />
+                    <attribute name="value" value="60" id="17956" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17957" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17958" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17959" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17960" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17961" addr="0x7fca4690be70" >
+                <attributelist id="17962" addr="0x7fca4690be70" >
+                    <attribute name="sym_name" value="REMOTE_3" id="17963" addr="0x7fca46934c90" />
+                    <attribute name="name" value="REMOTE_3" id="17964" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="61" id="17965" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17966" addr="0x7fca46934c90" />
+                    <attribute name="value" value="61" id="17967" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17968" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17969" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17970" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17971" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17972" addr="0x7fca4690bfd0" >
+                <attributelist id="17973" addr="0x7fca4690bfd0" >
+                    <attribute name="sym_name" value="REMOTE_4" id="17974" addr="0x7fca46934c90" />
+                    <attribute name="name" value="REMOTE_4" id="17975" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="62" id="17976" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17977" addr="0x7fca46934c90" />
+                    <attribute name="value" value="62" id="17978" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17979" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17980" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17981" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17982" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17983" addr="0x7fca4690c130" >
+                <attributelist id="17984" addr="0x7fca4690c130" >
+                    <attribute name="sym_name" value="REMOTE_5" id="17985" addr="0x7fca46934c90" />
+                    <attribute name="name" value="REMOTE_5" id="17986" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="63" id="17987" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17988" addr="0x7fca46934c90" />
+                    <attribute name="value" value="63" id="17989" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17990" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17991" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17992" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17993" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17994" addr="0x7fca4690c290" >
+                <attributelist id="17995" addr="0x7fca4690c290" >
+                    <attribute name="sym_name" value="REMOTE_6" id="17996" addr="0x7fca46934c90" />
+                    <attribute name="name" value="REMOTE_6" id="17997" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="64" id="17998" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17999" addr="0x7fca46934c90" />
+                    <attribute name="value" value="64" id="18000" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18001" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18002" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18003" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18004" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18005" addr="0x7fca4690c3f0" >
+                <attributelist id="18006" addr="0x7fca4690c3f0" >
+                    <attribute name="sym_name" value="REMOTE_7" id="18007" addr="0x7fca46934c90" />
+                    <attribute name="name" value="REMOTE_7" id="18008" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="65" id="18009" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18010" addr="0x7fca46934c90" />
+                    <attribute name="value" value="65" id="18011" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18012" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18013" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18014" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18015" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18016" addr="0x7fca4690c550" >
+                <attributelist id="18017" addr="0x7fca4690c550" >
+                    <attribute name="sym_name" value="REMOTE_8" id="18018" addr="0x7fca46934c90" />
+                    <attribute name="name" value="REMOTE_8" id="18019" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="66" id="18020" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18021" addr="0x7fca46934c90" />
+                    <attribute name="value" value="66" id="18022" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18023" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18024" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18025" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18026" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18027" addr="0x7fca4690c6b0" >
+                <attributelist id="18028" addr="0x7fca4690c6b0" >
+                    <attribute name="sym_name" value="REMOTE_9" id="18029" addr="0x7fca46934c90" />
+                    <attribute name="name" value="REMOTE_9" id="18030" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="67" id="18031" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18032" addr="0x7fca46934c90" />
+                    <attribute name="value" value="67" id="18033" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18034" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18035" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18036" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18037" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18038" addr="0x7fca4690c810" >
+                <attributelist id="18039" addr="0x7fca4690c810" >
+                    <attribute name="sym_name" value="ACTION_PLAYER_PROCESS_INFO" id="18040" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_PLAYER_PROCESS_INFO" id="18041" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="69" id="18042" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18043" addr="0x7fca46934c90" />
+                    <attribute name="value" value="69" id="18044" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18045" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18046" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18047" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18048" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18049" addr="0x7fca4690c970" >
+                <attributelist id="18050" addr="0x7fca4690c970" >
+                    <attribute name="sym_name" value="ACTION_PLAYER_PROGRAM_SELECT" id="18051" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_PLAYER_PROGRAM_SELECT" id="18052" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="70" id="18053" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18054" addr="0x7fca46934c90" />
+                    <attribute name="value" value="70" id="18055" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18056" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18057" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18058" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18059" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18060" addr="0x7fca4690cad0" >
+                <attributelist id="18061" addr="0x7fca4690cad0" >
+                    <attribute name="sym_name" value="ACTION_PLAYER_RESOLUTION_SELECT" id="18062" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_PLAYER_RESOLUTION_SELECT" id="18063" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="71" id="18064" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18065" addr="0x7fca46934c90" />
+                    <attribute name="value" value="71" id="18066" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18067" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18068" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18069" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18070" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18071" addr="0x7fca4690cc30" >
+                <attributelist id="18072" addr="0x7fca4690cc30" >
+                    <attribute name="sym_name" value="ACTION_SMALL_STEP_BACK" id="18073" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_SMALL_STEP_BACK" id="18074" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="76" id="18075" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18076" addr="0x7fca46934c90" />
+                    <attribute name="value" value="76" id="18077" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18078" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18079" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18080" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18081" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18082" addr="0x7fca4690cd90" >
+                <attributelist id="18083" addr="0x7fca4690cd90" >
+                    <attribute name="sym_name" value="ACTION_PLAYER_FORWARD" id="18084" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_PLAYER_FORWARD" id="18085" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="77" id="18086" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18087" addr="0x7fca46934c90" />
+                    <attribute name="value" value="77" id="18088" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18089" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18090" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18091" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18092" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18093" addr="0x7fca4690cef0" >
+                <attributelist id="18094" addr="0x7fca4690cef0" >
+                    <attribute name="sym_name" value="ACTION_PLAYER_REWIND" id="18095" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_PLAYER_REWIND" id="18096" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="78" id="18097" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18098" addr="0x7fca46934c90" />
+                    <attribute name="value" value="78" id="18099" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18100" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18101" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18102" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18103" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18104" addr="0x7fca4690d050" >
+                <attributelist id="18105" addr="0x7fca4690d050" >
+                    <attribute name="sym_name" value="ACTION_PLAYER_PLAY" id="18106" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_PLAYER_PLAY" id="18107" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="79" id="18108" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18109" addr="0x7fca46934c90" />
+                    <attribute name="value" value="79" id="18110" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18111" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18112" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18113" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18114" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18115" addr="0x7fca4690d1b0" >
+                <attributelist id="18116" addr="0x7fca4690d1b0" >
+                    <attribute name="sym_name" value="ACTION_DELETE_ITEM" id="18117" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_DELETE_ITEM" id="18118" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="80" id="18119" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18120" addr="0x7fca46934c90" />
+                    <attribute name="value" value="80" id="18121" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18122" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18123" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18124" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18125" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18126" addr="0x7fca4690d310" >
+                <attributelist id="18127" addr="0x7fca4690d310" >
+                    <attribute name="sym_name" value="ACTION_COPY_ITEM" id="18128" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_COPY_ITEM" id="18129" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="81" id="18130" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18131" addr="0x7fca46934c90" />
+                    <attribute name="value" value="81" id="18132" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18133" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18134" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18135" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18136" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18137" addr="0x7fca4690d470" >
+                <attributelist id="18138" addr="0x7fca4690d470" >
+                    <attribute name="sym_name" value="ACTION_MOVE_ITEM" id="18139" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_MOVE_ITEM" id="18140" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="82" id="18141" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18142" addr="0x7fca46934c90" />
+                    <attribute name="value" value="82" id="18143" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18144" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18145" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18146" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18147" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18148" addr="0x7fca4690d5d0" >
+                <attributelist id="18149" addr="0x7fca4690d5d0" >
+                    <attribute name="sym_name" value="ACTION_TAKE_SCREENSHOT" id="18150" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_TAKE_SCREENSHOT" id="18151" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="85" id="18152" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18153" addr="0x7fca46934c90" />
+                    <attribute name="value" value="85" id="18154" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18155" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18156" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18157" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18158" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18159" addr="0x7fca4690d730" >
+                <attributelist id="18160" addr="0x7fca4690d730" >
+                    <attribute name="sym_name" value="ACTION_RENAME_ITEM" id="18161" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_RENAME_ITEM" id="18162" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="87" id="18163" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18164" addr="0x7fca46934c90" />
+                    <attribute name="value" value="87" id="18165" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18166" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18167" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18168" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18169" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18170" addr="0x7fca4690d890" >
+                <attributelist id="18171" addr="0x7fca4690d890" >
+                    <attribute name="sym_name" value="ACTION_VOLUME_UP" id="18172" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_VOLUME_UP" id="18173" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="88" id="18174" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18175" addr="0x7fca46934c90" />
+                    <attribute name="value" value="88" id="18176" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18177" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18178" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18179" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18180" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18181" addr="0x7fca4690d9f0" >
+                <attributelist id="18182" addr="0x7fca4690d9f0" >
+                    <attribute name="sym_name" value="ACTION_VOLUME_DOWN" id="18183" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_VOLUME_DOWN" id="18184" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="89" id="18185" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18186" addr="0x7fca46934c90" />
+                    <attribute name="value" value="89" id="18187" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18188" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18189" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18190" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18191" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18192" addr="0x7fca4690db50" >
+                <attributelist id="18193" addr="0x7fca4690db50" >
+                    <attribute name="sym_name" value="ACTION_VOLAMP" id="18194" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_VOLAMP" id="18195" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="90" id="18196" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18197" addr="0x7fca46934c90" />
+                    <attribute name="value" value="90" id="18198" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18199" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18200" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18201" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18202" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18203" addr="0x7fca4690dcb0" >
+                <attributelist id="18204" addr="0x7fca4690dcb0" >
+                    <attribute name="sym_name" value="ACTION_MUTE" id="18205" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_MUTE" id="18206" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="91" id="18207" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18208" addr="0x7fca46934c90" />
+                    <attribute name="value" value="91" id="18209" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18210" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18211" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18212" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18213" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18214" addr="0x7fca4690de10" >
+                <attributelist id="18215" addr="0x7fca4690de10" >
+                    <attribute name="sym_name" value="ACTION_NAV_BACK" id="18216" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_NAV_BACK" id="18217" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="92" id="18218" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18219" addr="0x7fca46934c90" />
+                    <attribute name="value" value="92" id="18220" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18221" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18222" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18223" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18224" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18225" addr="0x7fca4690df70" >
+                <attributelist id="18226" addr="0x7fca4690df70" >
+                    <attribute name="sym_name" value="ACTION_VOLAMP_UP" id="18227" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_VOLAMP_UP" id="18228" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="93" id="18229" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18230" addr="0x7fca46934c90" />
+                    <attribute name="value" value="93" id="18231" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18232" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18233" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18234" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18235" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18236" addr="0x7fca4690e0d0" >
+                <attributelist id="18237" addr="0x7fca4690e0d0" >
+                    <attribute name="sym_name" value="ACTION_VOLAMP_DOWN" id="18238" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_VOLAMP_DOWN" id="18239" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="94" id="18240" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18241" addr="0x7fca46934c90" />
+                    <attribute name="value" value="94" id="18242" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18243" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18244" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18245" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18246" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18247" addr="0x7fca4690e230" >
+                <attributelist id="18248" addr="0x7fca4690e230" >
+                    <attribute name="sym_name" value="ACTION_CREATE_EPISODE_BOOKMARK" id="18249" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_CREATE_EPISODE_BOOKMARK" id="18250" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="95" id="18251" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18252" addr="0x7fca46934c90" />
+                    <attribute name="value" value="95" id="18253" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18254" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18255" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18256" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18257" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18258" addr="0x7fca4690e390" >
+                <attributelist id="18259" addr="0x7fca4690e390" >
+                    <attribute name="sym_name" value="ACTION_CREATE_BOOKMARK" id="18260" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_CREATE_BOOKMARK" id="18261" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="96" id="18262" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18263" addr="0x7fca46934c90" />
+                    <attribute name="value" value="96" id="18264" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18265" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18266" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18267" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18268" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18269" addr="0x7fca4690e4f0" >
+                <attributelist id="18270" addr="0x7fca4690e4f0" >
+                    <attribute name="sym_name" value="ACTION_CHAPTER_OR_BIG_STEP_FORWARD" id="18271" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_CHAPTER_OR_BIG_STEP_FORWARD" id="18272" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="97" id="18273" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18274" addr="0x7fca46934c90" />
+                    <attribute name="value" value="97" id="18275" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18276" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18277" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18278" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18279" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18280" addr="0x7fca4690e650" >
+                <attributelist id="18281" addr="0x7fca4690e650" >
+                    <attribute name="sym_name" value="ACTION_CHAPTER_OR_BIG_STEP_BACK" id="18282" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_CHAPTER_OR_BIG_STEP_BACK" id="18283" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="98" id="18284" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18285" addr="0x7fca46934c90" />
+                    <attribute name="value" value="98" id="18286" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18287" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18288" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18289" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18290" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18291" addr="0x7fca4690e7b0" >
+                <attributelist id="18292" addr="0x7fca4690e7b0" >
+                    <attribute name="sym_name" value="ACTION_CYCLE_SUBTITLE" id="18293" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_CYCLE_SUBTITLE" id="18294" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="99" id="18295" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18296" addr="0x7fca46934c90" />
+                    <attribute name="value" value="99" id="18297" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18298" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18299" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18300" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18301" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18302" addr="0x7fca4690e910" >
+                <attributelist id="18303" addr="0x7fca4690e910" >
+                    <attribute name="sym_name" value="ACTION_MOUSE_START" id="18304" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_MOUSE_START" id="18305" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="100" id="18306" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18307" addr="0x7fca46934c90" />
+                    <attribute name="value" value="100" id="18308" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18309" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18310" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18311" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18312" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18313" addr="0x7fca4690ea70" >
+                <attributelist id="18314" addr="0x7fca4690ea70" >
+                    <attribute name="sym_name" value="ACTION_MOUSE_LEFT_CLICK" id="18315" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_MOUSE_LEFT_CLICK" id="18316" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="100" id="18317" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18318" addr="0x7fca46934c90" />
+                    <attribute name="value" value="100" id="18319" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18320" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18321" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18322" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18323" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18324" addr="0x7fca4690ebd0" >
+                <attributelist id="18325" addr="0x7fca4690ebd0" >
+                    <attribute name="sym_name" value="ACTION_MOUSE_RIGHT_CLICK" id="18326" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_MOUSE_RIGHT_CLICK" id="18327" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="101" id="18328" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18329" addr="0x7fca46934c90" />
+                    <attribute name="value" value="101" id="18330" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18331" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18332" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18333" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18334" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18335" addr="0x7fca4690ed30" >
+                <attributelist id="18336" addr="0x7fca4690ed30" >
+                    <attribute name="sym_name" value="ACTION_MOUSE_MIDDLE_CLICK" id="18337" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_MOUSE_MIDDLE_CLICK" id="18338" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="102" id="18339" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18340" addr="0x7fca46934c90" />
+                    <attribute name="value" value="102" id="18341" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18342" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18343" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18344" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18345" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18346" addr="0x7fca4690ee90" >
+                <attributelist id="18347" addr="0x7fca4690ee90" >
+                    <attribute name="sym_name" value="ACTION_MOUSE_DOUBLE_CLICK" id="18348" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_MOUSE_DOUBLE_CLICK" id="18349" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="103" id="18350" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18351" addr="0x7fca46934c90" />
+                    <attribute name="value" value="103" id="18352" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18353" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18354" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18355" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18356" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18357" addr="0x7fca4690eff0" >
+                <attributelist id="18358" addr="0x7fca4690eff0" >
+                    <attribute name="sym_name" value="ACTION_MOUSE_WHEEL_UP" id="18359" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_MOUSE_WHEEL_UP" id="18360" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="104" id="18361" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18362" addr="0x7fca46934c90" />
+                    <attribute name="value" value="104" id="18363" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18364" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18365" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18366" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18367" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18368" addr="0x7fca4690f150" >
+                <attributelist id="18369" addr="0x7fca4690f150" >
+                    <attribute name="sym_name" value="ACTION_MOUSE_WHEEL_DOWN" id="18370" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_MOUSE_WHEEL_DOWN" id="18371" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="105" id="18372" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18373" addr="0x7fca46934c90" />
+                    <attribute name="value" value="105" id="18374" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18375" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18376" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18377" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18378" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18379" addr="0x7fca4690f2b0" >
+                <attributelist id="18380" addr="0x7fca4690f2b0" >
+                    <attribute name="sym_name" value="ACTION_MOUSE_DRAG" id="18381" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_MOUSE_DRAG" id="18382" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="106" id="18383" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18384" addr="0x7fca46934c90" />
+                    <attribute name="value" value="106" id="18385" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18386" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18387" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18388" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18389" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18390" addr="0x7fca4690f410" >
+                <attributelist id="18391" addr="0x7fca4690f410" >
+                    <attribute name="sym_name" value="ACTION_MOUSE_MOVE" id="18392" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_MOUSE_MOVE" id="18393" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="107" id="18394" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18395" addr="0x7fca46934c90" />
+                    <attribute name="value" value="107" id="18396" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18397" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18398" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18399" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18400" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18401" addr="0x7fca4690f570" >
+                <attributelist id="18402" addr="0x7fca4690f570" >
+                    <attribute name="sym_name" value="ACTION_MOUSE_LONG_CLICK" id="18403" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_MOUSE_LONG_CLICK" id="18404" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="108" id="18405" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18406" addr="0x7fca46934c90" />
+                    <attribute name="value" value="108" id="18407" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18408" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18409" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18410" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18411" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18412" addr="0x7fca4690f6d0" >
+                <attributelist id="18413" addr="0x7fca4690f6d0" >
+                    <attribute name="sym_name" value="ACTION_MOUSE_END" id="18414" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_MOUSE_END" id="18415" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="109" id="18416" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18417" addr="0x7fca46934c90" />
+                    <attribute name="value" value="109" id="18418" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18419" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18420" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18421" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18422" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18423" addr="0x7fca4690f830" >
+                <attributelist id="18424" addr="0x7fca4690f830" >
+                    <attribute name="sym_name" value="ACTION_BACKSPACE" id="18425" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_BACKSPACE" id="18426" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="110" id="18427" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18428" addr="0x7fca46934c90" />
+                    <attribute name="value" value="110" id="18429" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18430" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18431" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18432" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18433" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18434" addr="0x7fca4690f990" >
+                <attributelist id="18435" addr="0x7fca4690f990" >
+                    <attribute name="sym_name" value="ACTION_SCROLL_UP" id="18436" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_SCROLL_UP" id="18437" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="111" id="18438" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18439" addr="0x7fca46934c90" />
+                    <attribute name="value" value="111" id="18440" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18441" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18442" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18443" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18444" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18445" addr="0x7fca4690faf0" >
+                <attributelist id="18446" addr="0x7fca4690faf0" >
+                    <attribute name="sym_name" value="ACTION_SCROLL_DOWN" id="18447" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_SCROLL_DOWN" id="18448" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="112" id="18449" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18450" addr="0x7fca46934c90" />
+                    <attribute name="value" value="112" id="18451" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18452" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18453" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18454" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18455" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18456" addr="0x7fca4690fc50" >
+                <attributelist id="18457" addr="0x7fca4690fc50" >
+                    <attribute name="sym_name" value="ACTION_ANALOG_FORWARD" id="18458" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_ANALOG_FORWARD" id="18459" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="113" id="18460" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18461" addr="0x7fca46934c90" />
+                    <attribute name="value" value="113" id="18462" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18463" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18464" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18465" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18466" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18467" addr="0x7fca4690fdb0" >
+                <attributelist id="18468" addr="0x7fca4690fdb0" >
+                    <attribute name="sym_name" value="ACTION_ANALOG_REWIND" id="18469" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_ANALOG_REWIND" id="18470" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="114" id="18471" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18472" addr="0x7fca46934c90" />
+                    <attribute name="value" value="114" id="18473" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18474" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18475" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18476" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18477" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18478" addr="0x7fca4690ff10" >
+                <attributelist id="18479" addr="0x7fca4690ff10" >
+                    <attribute name="sym_name" value="ACTION_MOVE_ITEM_UP" id="18480" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_MOVE_ITEM_UP" id="18481" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="115" id="18482" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18483" addr="0x7fca46934c90" />
+                    <attribute name="value" value="115" id="18484" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18485" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18486" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18487" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18488" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18489" addr="0x7fca46910070" >
+                <attributelist id="18490" addr="0x7fca46910070" >
+                    <attribute name="sym_name" value="ACTION_MOVE_ITEM_DOWN" id="18491" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_MOVE_ITEM_DOWN" id="18492" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="116" id="18493" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18494" addr="0x7fca46934c90" />
+                    <attribute name="value" value="116" id="18495" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18496" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18497" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18498" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18499" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18500" addr="0x7fca469101d0" >
+                <attributelist id="18501" addr="0x7fca469101d0" >
+                    <attribute name="sym_name" value="ACTION_CONTEXT_MENU" id="18502" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_CONTEXT_MENU" id="18503" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="117" id="18504" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18505" addr="0x7fca46934c90" />
+                    <attribute name="value" value="117" id="18506" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18507" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18508" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18509" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18510" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18511" addr="0x7fca46910330" >
+                <attributelist id="18512" addr="0x7fca46910330" >
+                    <attribute name="sym_name" value="ACTION_SHIFT" id="18513" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_SHIFT" id="18514" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="118" id="18515" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18516" addr="0x7fca46934c90" />
+                    <attribute name="value" value="118" id="18517" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18518" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18519" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18520" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18521" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18522" addr="0x7fca46910490" >
+                <attributelist id="18523" addr="0x7fca46910490" >
+                    <attribute name="sym_name" value="ACTION_SYMBOLS" id="18524" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_SYMBOLS" id="18525" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="119" id="18526" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18527" addr="0x7fca46934c90" />
+                    <attribute name="value" value="119" id="18528" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18529" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18530" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18531" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18532" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18533" addr="0x7fca469105f0" >
+                <attributelist id="18534" addr="0x7fca469105f0" >
+                    <attribute name="sym_name" value="ACTION_CURSOR_LEFT" id="18535" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_CURSOR_LEFT" id="18536" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="120" id="18537" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18538" addr="0x7fca46934c90" />
+                    <attribute name="value" value="120" id="18539" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18540" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18541" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18542" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18543" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18544" addr="0x7fca46910750" >
+                <attributelist id="18545" addr="0x7fca46910750" >
+                    <attribute name="sym_name" value="ACTION_CURSOR_RIGHT" id="18546" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_CURSOR_RIGHT" id="18547" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="121" id="18548" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18549" addr="0x7fca46934c90" />
+                    <attribute name="value" value="121" id="18550" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18551" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18552" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18553" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18554" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18555" addr="0x7fca469108b0" >
+                <attributelist id="18556" addr="0x7fca469108b0" >
+                    <attribute name="sym_name" value="ACTION_BUILT_IN_FUNCTION" id="18557" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_BUILT_IN_FUNCTION" id="18558" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="122" id="18559" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18560" addr="0x7fca46934c90" />
+                    <attribute name="value" value="122" id="18561" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18562" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18563" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18564" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18565" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18566" addr="0x7fca46910a10" >
+                <attributelist id="18567" addr="0x7fca46910a10" >
+                    <attribute name="sym_name" value="ACTION_SHOW_OSD_TIME" id="18568" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_SHOW_OSD_TIME" id="18569" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="123" id="18570" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18571" addr="0x7fca46934c90" />
+                    <attribute name="value" value="123" id="18572" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18573" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18574" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18575" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18576" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18577" addr="0x7fca46910b70" >
+                <attributelist id="18578" addr="0x7fca46910b70" >
+                    <attribute name="sym_name" value="ACTION_ANALOG_SEEK_FORWARD" id="18579" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_ANALOG_SEEK_FORWARD" id="18580" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="124" id="18581" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18582" addr="0x7fca46934c90" />
+                    <attribute name="value" value="124" id="18583" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18584" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18585" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18586" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18587" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18588" addr="0x7fca46910cd0" >
+                <attributelist id="18589" addr="0x7fca46910cd0" >
+                    <attribute name="sym_name" value="ACTION_ANALOG_SEEK_BACK" id="18590" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_ANALOG_SEEK_BACK" id="18591" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="125" id="18592" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18593" addr="0x7fca46934c90" />
+                    <attribute name="value" value="125" id="18594" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18595" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18596" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18597" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18598" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18599" addr="0x7fca46910e30" >
+                <attributelist id="18600" addr="0x7fca46910e30" >
+                    <attribute name="sym_name" value="ACTION_VIS_PRESET_SHOW" id="18601" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_VIS_PRESET_SHOW" id="18602" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="126" id="18603" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18604" addr="0x7fca46934c90" />
+                    <attribute name="value" value="126" id="18605" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18606" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18607" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18608" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18609" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18610" addr="0x7fca46910f90" >
+                <attributelist id="18611" addr="0x7fca46910f90" >
+                    <attribute name="sym_name" value="ACTION_VIS_PRESET_NEXT" id="18612" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_VIS_PRESET_NEXT" id="18613" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="128" id="18614" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18615" addr="0x7fca46934c90" />
+                    <attribute name="value" value="128" id="18616" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18617" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18618" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18619" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18620" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18621" addr="0x7fca469110f0" >
+                <attributelist id="18622" addr="0x7fca469110f0" >
+                    <attribute name="sym_name" value="ACTION_VIS_PRESET_PREV" id="18623" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_VIS_PRESET_PREV" id="18624" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="129" id="18625" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18626" addr="0x7fca46934c90" />
+                    <attribute name="value" value="129" id="18627" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18628" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18629" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18630" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18631" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18632" addr="0x7fca46911250" >
+                <attributelist id="18633" addr="0x7fca46911250" >
+                    <attribute name="sym_name" value="ACTION_VIS_PRESET_LOCK" id="18634" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_VIS_PRESET_LOCK" id="18635" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="130" id="18636" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18637" addr="0x7fca46934c90" />
+                    <attribute name="value" value="130" id="18638" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18639" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18640" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18641" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18642" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18643" addr="0x7fca469113b0" >
+                <attributelist id="18644" addr="0x7fca469113b0" >
+                    <attribute name="sym_name" value="ACTION_VIS_PRESET_RANDOM" id="18645" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_VIS_PRESET_RANDOM" id="18646" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="131" id="18647" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18648" addr="0x7fca46934c90" />
+                    <attribute name="value" value="131" id="18649" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18650" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18651" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18652" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18653" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18654" addr="0x7fca46911510" >
+                <attributelist id="18655" addr="0x7fca46911510" >
+                    <attribute name="sym_name" value="ACTION_VIS_RATE_PRESET_PLUS" id="18656" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_VIS_RATE_PRESET_PLUS" id="18657" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="132" id="18658" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18659" addr="0x7fca46934c90" />
+                    <attribute name="value" value="132" id="18660" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18661" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18662" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18663" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18664" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18665" addr="0x7fca46911670" >
+                <attributelist id="18666" addr="0x7fca46911670" >
+                    <attribute name="sym_name" value="ACTION_VIS_RATE_PRESET_MINUS" id="18667" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_VIS_RATE_PRESET_MINUS" id="18668" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="133" id="18669" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18670" addr="0x7fca46934c90" />
+                    <attribute name="value" value="133" id="18671" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18672" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18673" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18674" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18675" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18676" addr="0x7fca469117d0" >
+                <attributelist id="18677" addr="0x7fca469117d0" >
+                    <attribute name="sym_name" value="ACTION_SHOW_VIDEOMENU" id="18678" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_SHOW_VIDEOMENU" id="18679" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="134" id="18680" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18681" addr="0x7fca46934c90" />
+                    <attribute name="value" value="134" id="18682" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18683" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18684" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18685" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18686" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18687" addr="0x7fca46911930" >
+                <attributelist id="18688" addr="0x7fca46911930" >
+                    <attribute name="sym_name" value="ACTION_ENTER" id="18689" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_ENTER" id="18690" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="135" id="18691" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18692" addr="0x7fca46934c90" />
+                    <attribute name="value" value="135" id="18693" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18694" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18695" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18696" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18697" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18698" addr="0x7fca46911a90" >
+                <attributelist id="18699" addr="0x7fca46911a90" >
+                    <attribute name="sym_name" value="ACTION_INCREASE_RATING" id="18700" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_INCREASE_RATING" id="18701" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="136" id="18702" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18703" addr="0x7fca46934c90" />
+                    <attribute name="value" value="136" id="18704" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18705" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18706" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18707" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18708" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18709" addr="0x7fca46911bf0" >
+                <attributelist id="18710" addr="0x7fca46911bf0" >
+                    <attribute name="sym_name" value="ACTION_DECREASE_RATING" id="18711" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_DECREASE_RATING" id="18712" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="137" id="18713" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18714" addr="0x7fca46934c90" />
+                    <attribute name="value" value="137" id="18715" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18716" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18717" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18718" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18719" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18720" addr="0x7fca46911d50" >
+                <attributelist id="18721" addr="0x7fca46911d50" >
+                    <attribute name="sym_name" value="ACTION_NEXT_SCENE" id="18722" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_NEXT_SCENE" id="18723" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="138" id="18724" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18725" addr="0x7fca46934c90" />
+                    <attribute name="value" value="138" id="18726" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18727" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18728" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18729" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18730" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18731" addr="0x7fca46911eb0" >
+                <attributelist id="18732" addr="0x7fca46911eb0" >
+                    <attribute name="sym_name" value="ACTION_PREV_SCENE" id="18733" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_PREV_SCENE" id="18734" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="139" id="18735" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18736" addr="0x7fca46934c90" />
+                    <attribute name="value" value="139" id="18737" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18738" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18739" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18740" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18741" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18742" addr="0x7fca46912010" >
+                <attributelist id="18743" addr="0x7fca46912010" >
+                    <attribute name="sym_name" value="ACTION_NEXT_LETTER" id="18744" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_NEXT_LETTER" id="18745" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="140" id="18746" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18747" addr="0x7fca46934c90" />
+                    <attribute name="value" value="140" id="18748" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18749" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18750" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18751" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18752" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18753" addr="0x7fca46912170" >
+                <attributelist id="18754" addr="0x7fca46912170" >
+                    <attribute name="sym_name" value="ACTION_PREV_LETTER" id="18755" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_PREV_LETTER" id="18756" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="141" id="18757" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18758" addr="0x7fca46934c90" />
+                    <attribute name="value" value="141" id="18759" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18760" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18761" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18762" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18763" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18764" addr="0x7fca469122d0" >
+                <attributelist id="18765" addr="0x7fca469122d0" >
+                    <attribute name="sym_name" value="ACTION_JUMP_SMS2" id="18766" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_JUMP_SMS2" id="18767" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="142" id="18768" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18769" addr="0x7fca46934c90" />
+                    <attribute name="value" value="142" id="18770" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18771" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18772" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18773" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18774" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18775" addr="0x7fca46912430" >
+                <attributelist id="18776" addr="0x7fca46912430" >
+                    <attribute name="sym_name" value="ACTION_JUMP_SMS3" id="18777" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_JUMP_SMS3" id="18778" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="143" id="18779" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18780" addr="0x7fca46934c90" />
+                    <attribute name="value" value="143" id="18781" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18782" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18783" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18784" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18785" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18786" addr="0x7fca46912590" >
+                <attributelist id="18787" addr="0x7fca46912590" >
+                    <attribute name="sym_name" value="ACTION_JUMP_SMS4" id="18788" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_JUMP_SMS4" id="18789" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="144" id="18790" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18791" addr="0x7fca46934c90" />
+                    <attribute name="value" value="144" id="18792" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18793" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18794" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18795" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18796" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18797" addr="0x7fca469126f0" >
+                <attributelist id="18798" addr="0x7fca469126f0" >
+                    <attribute name="sym_name" value="ACTION_JUMP_SMS5" id="18799" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_JUMP_SMS5" id="18800" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="145" id="18801" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18802" addr="0x7fca46934c90" />
+                    <attribute name="value" value="145" id="18803" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18804" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18805" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18806" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18807" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18808" addr="0x7fca46912850" >
+                <attributelist id="18809" addr="0x7fca46912850" >
+                    <attribute name="sym_name" value="ACTION_JUMP_SMS6" id="18810" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_JUMP_SMS6" id="18811" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="146" id="18812" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18813" addr="0x7fca46934c90" />
+                    <attribute name="value" value="146" id="18814" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18815" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18816" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18817" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18818" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18819" addr="0x7fca469129b0" >
+                <attributelist id="18820" addr="0x7fca469129b0" >
+                    <attribute name="sym_name" value="ACTION_JUMP_SMS7" id="18821" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_JUMP_SMS7" id="18822" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="147" id="18823" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18824" addr="0x7fca46934c90" />
+                    <attribute name="value" value="147" id="18825" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18826" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18827" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18828" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18829" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18830" addr="0x7fca46912b10" >
+                <attributelist id="18831" addr="0x7fca46912b10" >
+                    <attribute name="sym_name" value="ACTION_JUMP_SMS8" id="18832" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_JUMP_SMS8" id="18833" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="148" id="18834" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18835" addr="0x7fca46934c90" />
+                    <attribute name="value" value="148" id="18836" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18837" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18838" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18839" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18840" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18841" addr="0x7fca46912c70" >
+                <attributelist id="18842" addr="0x7fca46912c70" >
+                    <attribute name="sym_name" value="ACTION_JUMP_SMS9" id="18843" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_JUMP_SMS9" id="18844" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="149" id="18845" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18846" addr="0x7fca46934c90" />
+                    <attribute name="value" value="149" id="18847" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18848" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18849" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18850" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18851" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18852" addr="0x7fca46912dd0" >
+                <attributelist id="18853" addr="0x7fca46912dd0" >
+                    <attribute name="sym_name" value="ACTION_FILTER_CLEAR" id="18854" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_FILTER_CLEAR" id="18855" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="150" id="18856" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18857" addr="0x7fca46934c90" />
+                    <attribute name="value" value="150" id="18858" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18859" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18860" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18861" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18862" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18863" addr="0x7fca46912f30" >
+                <attributelist id="18864" addr="0x7fca46912f30" >
+                    <attribute name="sym_name" value="ACTION_FILTER_SMS2" id="18865" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_FILTER_SMS2" id="18866" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="151" id="18867" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18868" addr="0x7fca46934c90" />
+                    <attribute name="value" value="151" id="18869" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18870" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18871" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18872" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18873" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18874" addr="0x7fca46913090" >
+                <attributelist id="18875" addr="0x7fca46913090" >
+                    <attribute name="sym_name" value="ACTION_FILTER_SMS3" id="18876" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_FILTER_SMS3" id="18877" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="152" id="18878" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18879" addr="0x7fca46934c90" />
+                    <attribute name="value" value="152" id="18880" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18881" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18882" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18883" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18884" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18885" addr="0x7fca469131f0" >
+                <attributelist id="18886" addr="0x7fca469131f0" >
+                    <attribute name="sym_name" value="ACTION_FILTER_SMS4" id="18887" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_FILTER_SMS4" id="18888" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="153" id="18889" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18890" addr="0x7fca46934c90" />
+                    <attribute name="value" value="153" id="18891" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18892" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18893" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18894" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18895" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18896" addr="0x7fca46913350" >
+                <attributelist id="18897" addr="0x7fca46913350" >
+                    <attribute name="sym_name" value="ACTION_FILTER_SMS5" id="18898" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_FILTER_SMS5" id="18899" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="154" id="18900" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18901" addr="0x7fca46934c90" />
+                    <attribute name="value" value="154" id="18902" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18903" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18904" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18905" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18906" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18907" addr="0x7fca469134b0" >
+                <attributelist id="18908" addr="0x7fca469134b0" >
+                    <attribute name="sym_name" value="ACTION_FILTER_SMS6" id="18909" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_FILTER_SMS6" id="18910" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="155" id="18911" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18912" addr="0x7fca46934c90" />
+                    <attribute name="value" value="155" id="18913" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18914" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18915" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18916" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18917" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18918" addr="0x7fca46913610" >
+                <attributelist id="18919" addr="0x7fca46913610" >
+                    <attribute name="sym_name" value="ACTION_FILTER_SMS7" id="18920" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_FILTER_SMS7" id="18921" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="156" id="18922" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18923" addr="0x7fca46934c90" />
+                    <attribute name="value" value="156" id="18924" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18925" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18926" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18927" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18928" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18929" addr="0x7fca46913770" >
+                <attributelist id="18930" addr="0x7fca46913770" >
+                    <attribute name="sym_name" value="ACTION_FILTER_SMS8" id="18931" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_FILTER_SMS8" id="18932" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="157" id="18933" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18934" addr="0x7fca46934c90" />
+                    <attribute name="value" value="157" id="18935" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18936" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18937" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18938" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18939" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18940" addr="0x7fca469138d0" >
+                <attributelist id="18941" addr="0x7fca469138d0" >
+                    <attribute name="sym_name" value="ACTION_FILTER_SMS9" id="18942" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_FILTER_SMS9" id="18943" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="158" id="18944" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18945" addr="0x7fca46934c90" />
+                    <attribute name="value" value="158" id="18946" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18947" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18948" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18949" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18950" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18951" addr="0x7fca46913a30" >
+                <attributelist id="18952" addr="0x7fca46913a30" >
+                    <attribute name="sym_name" value="ACTION_FIRST_PAGE" id="18953" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_FIRST_PAGE" id="18954" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="159" id="18955" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18956" addr="0x7fca46934c90" />
+                    <attribute name="value" value="159" id="18957" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18958" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18959" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18960" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18961" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18962" addr="0x7fca46913b90" >
+                <attributelist id="18963" addr="0x7fca46913b90" >
+                    <attribute name="sym_name" value="ACTION_LAST_PAGE" id="18964" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_LAST_PAGE" id="18965" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="160" id="18966" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18967" addr="0x7fca46934c90" />
+                    <attribute name="value" value="160" id="18968" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18969" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18970" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18971" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18972" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18973" addr="0x7fca46913cf0" >
+                <attributelist id="18974" addr="0x7fca46913cf0" >
+                    <attribute name="sym_name" value="ACTION_AUDIO_DELAY" id="18975" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_AUDIO_DELAY" id="18976" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="161" id="18977" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18978" addr="0x7fca46934c90" />
+                    <attribute name="value" value="161" id="18979" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18980" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18981" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18982" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18983" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18984" addr="0x7fca46913e50" >
+                <attributelist id="18985" addr="0x7fca46913e50" >
+                    <attribute name="sym_name" value="ACTION_SUBTITLE_DELAY" id="18986" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_SUBTITLE_DELAY" id="18987" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="162" id="18988" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18989" addr="0x7fca46934c90" />
+                    <attribute name="value" value="162" id="18990" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18991" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18992" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18993" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18994" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18995" addr="0x7fca46913fb0" >
+                <attributelist id="18996" addr="0x7fca46913fb0" >
+                    <attribute name="sym_name" value="ACTION_MENU" id="18997" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_MENU" id="18998" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="163" id="18999" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19000" addr="0x7fca46934c90" />
+                    <attribute name="value" value="163" id="19001" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19002" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19003" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19004" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19005" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19006" addr="0x7fca46914110" >
+                <attributelist id="19007" addr="0x7fca46914110" >
+                    <attribute name="sym_name" value="ACTION_SET_RATING" id="19008" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_SET_RATING" id="19009" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="164" id="19010" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19011" addr="0x7fca46934c90" />
+                    <attribute name="value" value="164" id="19012" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19013" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19014" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19015" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19016" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19017" addr="0x7fca46914270" >
+                <attributelist id="19018" addr="0x7fca46914270" >
+                    <attribute name="sym_name" value="ACTION_RECORD" id="19019" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_RECORD" id="19020" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="170" id="19021" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19022" addr="0x7fca46934c90" />
+                    <attribute name="value" value="170" id="19023" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19024" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19025" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19026" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19027" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19028" addr="0x7fca469143d0" >
+                <attributelist id="19029" addr="0x7fca469143d0" >
+                    <attribute name="sym_name" value="ACTION_PASTE" id="19030" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_PASTE" id="19031" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="180" id="19032" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19033" addr="0x7fca46934c90" />
+                    <attribute name="value" value="180" id="19034" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19035" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19036" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19037" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19038" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19039" addr="0x7fca46914530" >
+                <attributelist id="19040" addr="0x7fca46914530" >
+                    <attribute name="sym_name" value="ACTION_NEXT_CONTROL" id="19041" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_NEXT_CONTROL" id="19042" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="181" id="19043" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19044" addr="0x7fca46934c90" />
+                    <attribute name="value" value="181" id="19045" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19046" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19047" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19048" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19049" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19050" addr="0x7fca46914690" >
+                <attributelist id="19051" addr="0x7fca46914690" >
+                    <attribute name="sym_name" value="ACTION_PREV_CONTROL" id="19052" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_PREV_CONTROL" id="19053" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="182" id="19054" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19055" addr="0x7fca46934c90" />
+                    <attribute name="value" value="182" id="19056" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19057" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19058" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19059" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19060" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19061" addr="0x7fca469147f0" >
+                <attributelist id="19062" addr="0x7fca469147f0" >
+                    <attribute name="sym_name" value="ACTION_CHANNEL_SWITCH" id="19063" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_CHANNEL_SWITCH" id="19064" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="183" id="19065" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19066" addr="0x7fca46934c90" />
+                    <attribute name="value" value="183" id="19067" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19068" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19069" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19070" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19071" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19072" addr="0x7fca46914950" >
+                <attributelist id="19073" addr="0x7fca46914950" >
+                    <attribute name="sym_name" value="ACTION_CHANNEL_UP" id="19074" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_CHANNEL_UP" id="19075" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="184" id="19076" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19077" addr="0x7fca46934c90" />
+                    <attribute name="value" value="184" id="19078" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19079" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19080" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19081" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19082" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19083" addr="0x7fca46914ab0" >
+                <attributelist id="19084" addr="0x7fca46914ab0" >
+                    <attribute name="sym_name" value="ACTION_CHANNEL_DOWN" id="19085" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_CHANNEL_DOWN" id="19086" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="185" id="19087" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19088" addr="0x7fca46934c90" />
+                    <attribute name="value" value="185" id="19089" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19090" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19091" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19092" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19093" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19094" addr="0x7fca46914c10" >
+                <attributelist id="19095" addr="0x7fca46914c10" >
+                    <attribute name="sym_name" value="ACTION_NEXT_CHANNELGROUP" id="19096" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_NEXT_CHANNELGROUP" id="19097" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="186" id="19098" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19099" addr="0x7fca46934c90" />
+                    <attribute name="value" value="186" id="19100" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19101" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19102" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19103" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19104" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19105" addr="0x7fca46914d70" >
+                <attributelist id="19106" addr="0x7fca46914d70" >
+                    <attribute name="sym_name" value="ACTION_PREVIOUS_CHANNELGROUP" id="19107" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_PREVIOUS_CHANNELGROUP" id="19108" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="187" id="19109" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19110" addr="0x7fca46934c90" />
+                    <attribute name="value" value="187" id="19111" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19112" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19113" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19114" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19115" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19116" addr="0x7fca46914ed0" >
+                <attributelist id="19117" addr="0x7fca46914ed0" >
+                    <attribute name="sym_name" value="ACTION_PVR_PLAY" id="19118" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_PVR_PLAY" id="19119" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="188" id="19120" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19121" addr="0x7fca46934c90" />
+                    <attribute name="value" value="188" id="19122" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19123" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19124" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19125" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19126" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19127" addr="0x7fca46915030" >
+                <attributelist id="19128" addr="0x7fca46915030" >
+                    <attribute name="sym_name" value="ACTION_PVR_PLAY_TV" id="19129" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_PVR_PLAY_TV" id="19130" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="189" id="19131" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19132" addr="0x7fca46934c90" />
+                    <attribute name="value" value="189" id="19133" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19134" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19135" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19136" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19137" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19138" addr="0x7fca46915190" >
+                <attributelist id="19139" addr="0x7fca46915190" >
+                    <attribute name="sym_name" value="ACTION_PVR_PLAY_RADIO" id="19140" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_PVR_PLAY_RADIO" id="19141" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="190" id="19142" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19143" addr="0x7fca46934c90" />
+                    <attribute name="value" value="190" id="19144" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19145" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19146" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19147" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19148" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19149" addr="0x7fca469152f0" >
+                <attributelist id="19150" addr="0x7fca469152f0" >
+                    <attribute name="sym_name" value="ACTION_PVR_SHOW_TIMER_RULE" id="19151" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_PVR_SHOW_TIMER_RULE" id="19152" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="191" id="19153" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19154" addr="0x7fca46934c90" />
+                    <attribute name="value" value="191" id="19155" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19156" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19157" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19158" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19159" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19160" addr="0x7fca46915450" >
+                <attributelist id="19161" addr="0x7fca46915450" >
+                    <attribute name="sym_name" value="ACTION_CHANNEL_NUMBER_SEP" id="19162" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_CHANNEL_NUMBER_SEP" id="19163" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="192" id="19164" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19165" addr="0x7fca46934c90" />
+                    <attribute name="value" value="192" id="19166" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19167" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19168" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19169" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19170" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19171" addr="0x7fca469155b0" >
+                <attributelist id="19172" addr="0x7fca469155b0" >
+                    <attribute name="sym_name" value="ACTION_TOGGLE_FULLSCREEN" id="19173" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_TOGGLE_FULLSCREEN" id="19174" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="199" id="19175" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19176" addr="0x7fca46934c90" />
+                    <attribute name="value" value="199" id="19177" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19178" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19179" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19180" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19181" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19182" addr="0x7fca46915710" >
+                <attributelist id="19183" addr="0x7fca46915710" >
+                    <attribute name="sym_name" value="ACTION_TOGGLE_WATCHED" id="19184" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_TOGGLE_WATCHED" id="19185" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="200" id="19186" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19187" addr="0x7fca46934c90" />
+                    <attribute name="value" value="200" id="19188" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19189" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19190" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19191" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19192" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19193" addr="0x7fca46915870" >
+                <attributelist id="19194" addr="0x7fca46915870" >
+                    <attribute name="sym_name" value="ACTION_SCAN_ITEM" id="19195" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_SCAN_ITEM" id="19196" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="201" id="19197" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19198" addr="0x7fca46934c90" />
+                    <attribute name="value" value="201" id="19199" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19200" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19201" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19202" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19203" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19204" addr="0x7fca469159d0" >
+                <attributelist id="19205" addr="0x7fca469159d0" >
+                    <attribute name="sym_name" value="ACTION_TOGGLE_DIGITAL_ANALOG" id="19206" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_TOGGLE_DIGITAL_ANALOG" id="19207" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="202" id="19208" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19209" addr="0x7fca46934c90" />
+                    <attribute name="value" value="202" id="19210" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19211" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19212" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19213" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19214" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19215" addr="0x7fca46915b30" >
+                <attributelist id="19216" addr="0x7fca46915b30" >
+                    <attribute name="sym_name" value="ACTION_RELOAD_KEYMAPS" id="19217" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_RELOAD_KEYMAPS" id="19218" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="203" id="19219" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19220" addr="0x7fca46934c90" />
+                    <attribute name="value" value="203" id="19221" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19222" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19223" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19224" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19225" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19226" addr="0x7fca46915c90" >
+                <attributelist id="19227" addr="0x7fca46915c90" >
+                    <attribute name="sym_name" value="ACTION_GUIPROFILE_BEGIN" id="19228" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_GUIPROFILE_BEGIN" id="19229" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="204" id="19230" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19231" addr="0x7fca46934c90" />
+                    <attribute name="value" value="204" id="19232" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19233" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19234" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19235" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19236" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19237" addr="0x7fca46915df0" >
+                <attributelist id="19238" addr="0x7fca46915df0" >
+                    <attribute name="sym_name" value="ACTION_TELETEXT_RED" id="19239" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_TELETEXT_RED" id="19240" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="215" id="19241" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19242" addr="0x7fca46934c90" />
+                    <attribute name="value" value="215" id="19243" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19244" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19245" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19246" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19247" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19248" addr="0x7fca46915f50" >
+                <attributelist id="19249" addr="0x7fca46915f50" >
+                    <attribute name="sym_name" value="ACTION_TELETEXT_GREEN" id="19250" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_TELETEXT_GREEN" id="19251" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="216" id="19252" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19253" addr="0x7fca46934c90" />
+                    <attribute name="value" value="216" id="19254" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19255" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19256" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19257" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19258" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19259" addr="0x7fca469160b0" >
+                <attributelist id="19260" addr="0x7fca469160b0" >
+                    <attribute name="sym_name" value="ACTION_TELETEXT_YELLOW" id="19261" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_TELETEXT_YELLOW" id="19262" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="217" id="19263" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19264" addr="0x7fca46934c90" />
+                    <attribute name="value" value="217" id="19265" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19266" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19267" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19268" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19269" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19270" addr="0x7fca46916210" >
+                <attributelist id="19271" addr="0x7fca46916210" >
+                    <attribute name="sym_name" value="ACTION_TELETEXT_BLUE" id="19272" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_TELETEXT_BLUE" id="19273" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="218" id="19274" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19275" addr="0x7fca46934c90" />
+                    <attribute name="value" value="218" id="19276" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19277" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19278" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19279" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19280" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19281" addr="0x7fca46916370" >
+                <attributelist id="19282" addr="0x7fca46916370" >
+                    <attribute name="sym_name" value="ACTION_INCREASE_PAR" id="19283" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_INCREASE_PAR" id="19284" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="219" id="19285" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19286" addr="0x7fca46934c90" />
+                    <attribute name="value" value="219" id="19287" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19288" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19289" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19290" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19291" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19292" addr="0x7fca469164d0" >
+                <attributelist id="19293" addr="0x7fca469164d0" >
+                    <attribute name="sym_name" value="ACTION_DECREASE_PAR" id="19294" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_DECREASE_PAR" id="19295" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="220" id="19296" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19297" addr="0x7fca46934c90" />
+                    <attribute name="value" value="220" id="19298" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19299" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19300" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19301" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19302" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19303" addr="0x7fca46916630" >
+                <attributelist id="19304" addr="0x7fca46916630" >
+                    <attribute name="sym_name" value="ACTION_VSHIFT_UP" id="19305" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_VSHIFT_UP" id="19306" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="227" id="19307" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19308" addr="0x7fca46934c90" />
+                    <attribute name="value" value="227" id="19309" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19310" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19311" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19312" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19313" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19314" addr="0x7fca46916790" >
+                <attributelist id="19315" addr="0x7fca46916790" >
+                    <attribute name="sym_name" value="ACTION_VSHIFT_DOWN" id="19316" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_VSHIFT_DOWN" id="19317" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="228" id="19318" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19319" addr="0x7fca46934c90" />
+                    <attribute name="value" value="228" id="19320" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19321" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19322" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19323" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19324" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19325" addr="0x7fca469168f0" >
+                <attributelist id="19326" addr="0x7fca469168f0" >
+                    <attribute name="sym_name" value="ACTION_PLAYER_PLAYPAUSE" id="19327" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_PLAYER_PLAYPAUSE" id="19328" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="229" id="19329" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19330" addr="0x7fca46934c90" />
+                    <attribute name="value" value="229" id="19331" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19332" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19333" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19334" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19335" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19336" addr="0x7fca46916a50" >
+                <attributelist id="19337" addr="0x7fca46916a50" >
+                    <attribute name="sym_name" value="ACTION_SUBTITLE_VSHIFT_UP" id="19338" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_SUBTITLE_VSHIFT_UP" id="19339" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="230" id="19340" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19341" addr="0x7fca46934c90" />
+                    <attribute name="value" value="230" id="19342" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19343" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19344" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19345" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19346" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19347" addr="0x7fca46916bb0" >
+                <attributelist id="19348" addr="0x7fca46916bb0" >
+                    <attribute name="sym_name" value="ACTION_SUBTITLE_VSHIFT_DOWN" id="19349" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_SUBTITLE_VSHIFT_DOWN" id="19350" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="231" id="19351" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19352" addr="0x7fca46934c90" />
+                    <attribute name="value" value="231" id="19353" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19354" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19355" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19356" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19357" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19358" addr="0x7fca46916d10" >
+                <attributelist id="19359" addr="0x7fca46916d10" >
+                    <attribute name="sym_name" value="ACTION_SUBTITLE_ALIGN" id="19360" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_SUBTITLE_ALIGN" id="19361" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="232" id="19362" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19363" addr="0x7fca46934c90" />
+                    <attribute name="value" value="232" id="19364" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19365" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19366" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19367" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19368" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19369" addr="0x7fca46916e70" >
+                <attributelist id="19370" addr="0x7fca46916e70" >
+                    <attribute name="sym_name" value="ACTION_FILTER" id="19371" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_FILTER" id="19372" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="233" id="19373" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19374" addr="0x7fca46934c90" />
+                    <attribute name="value" value="233" id="19375" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19376" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19377" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19378" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19379" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19380" addr="0x7fca46916fd0" >
+                <attributelist id="19381" addr="0x7fca46916fd0" >
+                    <attribute name="sym_name" value="ACTION_SWITCH_PLAYER" id="19382" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_SWITCH_PLAYER" id="19383" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="234" id="19384" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19385" addr="0x7fca46934c90" />
+                    <attribute name="value" value="234" id="19386" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19387" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19388" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19389" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19390" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19391" addr="0x7fca46917130" >
+                <attributelist id="19392" addr="0x7fca46917130" >
+                    <attribute name="sym_name" value="ACTION_STEREOMODE_NEXT" id="19393" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_STEREOMODE_NEXT" id="19394" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="235" id="19395" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19396" addr="0x7fca46934c90" />
+                    <attribute name="value" value="235" id="19397" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19398" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19399" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19400" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19401" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19402" addr="0x7fca46917290" >
+                <attributelist id="19403" addr="0x7fca46917290" >
+                    <attribute name="sym_name" value="ACTION_STEREOMODE_PREVIOUS" id="19404" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_STEREOMODE_PREVIOUS" id="19405" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="236" id="19406" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19407" addr="0x7fca46934c90" />
+                    <attribute name="value" value="236" id="19408" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19409" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19410" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19411" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19412" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19413" addr="0x7fca469173f0" >
+                <attributelist id="19414" addr="0x7fca469173f0" >
+                    <attribute name="sym_name" value="ACTION_STEREOMODE_TOGGLE" id="19415" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_STEREOMODE_TOGGLE" id="19416" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="237" id="19417" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19418" addr="0x7fca46934c90" />
+                    <attribute name="value" value="237" id="19419" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19420" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19421" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19422" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19423" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19424" addr="0x7fca46917550" >
+                <attributelist id="19425" addr="0x7fca46917550" >
+                    <attribute name="sym_name" value="ACTION_STEREOMODE_SELECT" id="19426" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_STEREOMODE_SELECT" id="19427" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="238" id="19428" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19429" addr="0x7fca46934c90" />
+                    <attribute name="value" value="238" id="19430" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19431" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19432" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19433" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19434" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19435" addr="0x7fca469176b0" >
+                <attributelist id="19436" addr="0x7fca469176b0" >
+                    <attribute name="sym_name" value="ACTION_STEREOMODE_TOMONO" id="19437" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_STEREOMODE_TOMONO" id="19438" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="239" id="19439" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19440" addr="0x7fca46934c90" />
+                    <attribute name="value" value="239" id="19441" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19442" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19443" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19444" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19445" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19446" addr="0x7fca46917810" >
+                <attributelist id="19447" addr="0x7fca46917810" >
+                    <attribute name="sym_name" value="ACTION_STEREOMODE_SET" id="19448" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_STEREOMODE_SET" id="19449" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="240" id="19450" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19451" addr="0x7fca46934c90" />
+                    <attribute name="value" value="240" id="19452" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19453" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19454" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19455" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19456" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19457" addr="0x7fca46917970" >
+                <attributelist id="19458" addr="0x7fca46917970" >
+                    <attribute name="sym_name" value="ACTION_SETTINGS_RESET" id="19459" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_SETTINGS_RESET" id="19460" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="241" id="19461" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19462" addr="0x7fca46934c90" />
+                    <attribute name="value" value="241" id="19463" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19464" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19465" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19466" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19467" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19468" addr="0x7fca46917ad0" >
+                <attributelist id="19469" addr="0x7fca46917ad0" >
+                    <attribute name="sym_name" value="ACTION_SETTINGS_LEVEL_CHANGE" id="19470" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_SETTINGS_LEVEL_CHANGE" id="19471" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="242" id="19472" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19473" addr="0x7fca46934c90" />
+                    <attribute name="value" value="242" id="19474" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19475" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19476" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19477" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19478" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19479" addr="0x7fca46917c30" >
+                <attributelist id="19480" addr="0x7fca46917c30" >
+                    <attribute name="sym_name" value="ACTION_TRIGGER_OSD" id="19481" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_TRIGGER_OSD" id="19482" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="243" id="19483" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19484" addr="0x7fca46934c90" />
+                    <attribute name="value" value="243" id="19485" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19486" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19487" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19488" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19489" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19490" addr="0x7fca46917d90" >
+                <attributelist id="19491" addr="0x7fca46917d90" >
+                    <attribute name="sym_name" value="ACTION_INPUT_TEXT" id="19492" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_INPUT_TEXT" id="19493" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="244" id="19494" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19495" addr="0x7fca46934c90" />
+                    <attribute name="value" value="244" id="19496" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19497" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19498" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19499" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19500" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19501" addr="0x7fca46917ef0" >
+                <attributelist id="19502" addr="0x7fca46917ef0" >
+                    <attribute name="sym_name" value="ACTION_VOLUME_SET" id="19503" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_VOLUME_SET" id="19504" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="245" id="19505" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19506" addr="0x7fca46934c90" />
+                    <attribute name="value" value="245" id="19507" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19508" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19509" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19510" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19511" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19512" addr="0x7fca46918050" >
+                <attributelist id="19513" addr="0x7fca46918050" >
+                    <attribute name="sym_name" value="ACTION_TOGGLE_COMMSKIP" id="19514" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_TOGGLE_COMMSKIP" id="19515" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="246" id="19516" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19517" addr="0x7fca46934c90" />
+                    <attribute name="value" value="246" id="19518" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19519" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19520" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19521" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19522" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19523" addr="0x7fca469181b0" >
+                <attributelist id="19524" addr="0x7fca469181b0" >
+                    <attribute name="sym_name" value="ACTION_PLAYER_RESET" id="19525" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_PLAYER_RESET" id="19526" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="248" id="19527" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19528" addr="0x7fca46934c90" />
+                    <attribute name="value" value="248" id="19529" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19530" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19531" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19532" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19533" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19534" addr="0x7fca46918310" >
+                <attributelist id="19535" addr="0x7fca46918310" >
+                    <attribute name="sym_name" value="ACTION_TOGGLE_FONT" id="19536" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_TOGGLE_FONT" id="19537" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="249" id="19538" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19539" addr="0x7fca46934c90" />
+                    <attribute name="value" value="249" id="19540" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19541" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19542" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19543" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19544" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19545" addr="0x7fca46918470" >
+                <attributelist id="19546" addr="0x7fca46918470" >
+                    <attribute name="sym_name" value="ACTION_VIDEO_NEXT_STREAM" id="19547" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_VIDEO_NEXT_STREAM" id="19548" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="250" id="19549" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19550" addr="0x7fca46934c90" />
+                    <attribute name="value" value="250" id="19551" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19552" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19553" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19554" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19555" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19556" addr="0x7fca469185d0" >
+                <attributelist id="19557" addr="0x7fca469185d0" >
+                    <attribute name="sym_name" value="ACTION_QUEUE_ITEM_NEXT" id="19558" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_QUEUE_ITEM_NEXT" id="19559" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="251" id="19560" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19561" addr="0x7fca46934c90" />
+                    <attribute name="value" value="251" id="19562" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19563" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19564" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19565" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19566" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19567" addr="0x7fca46918730" >
+                <attributelist id="19568" addr="0x7fca46918730" >
+                    <attribute name="sym_name" value="ACTION_VOICE_RECOGNIZE" id="19569" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_VOICE_RECOGNIZE" id="19570" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="300" id="19571" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19572" addr="0x7fca46934c90" />
+                    <attribute name="value" value="300" id="19573" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19574" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19575" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19576" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19577" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19578" addr="0x7fca46918890" >
+                <attributelist id="19579" addr="0x7fca46918890" >
+                    <attribute name="sym_name" value="ACTION_TOUCH_TAP" id="19580" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_TOUCH_TAP" id="19581" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="401" id="19582" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19583" addr="0x7fca46934c90" />
+                    <attribute name="value" value="401" id="19584" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19585" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19586" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19587" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19588" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19589" addr="0x7fca469189f0" >
+                <attributelist id="19590" addr="0x7fca469189f0" >
+                    <attribute name="sym_name" value="ACTION_TOUCH_TAP_TEN" id="19591" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_TOUCH_TAP_TEN" id="19592" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="410" id="19593" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19594" addr="0x7fca46934c90" />
+                    <attribute name="value" value="410" id="19595" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19596" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19597" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19598" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19599" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19600" addr="0x7fca46918b50" >
+                <attributelist id="19601" addr="0x7fca46918b50" >
+                    <attribute name="sym_name" value="ACTION_TOUCH_LONGPRESS" id="19602" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_TOUCH_LONGPRESS" id="19603" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="411" id="19604" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19605" addr="0x7fca46934c90" />
+                    <attribute name="value" value="411" id="19606" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19607" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19608" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19609" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19610" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19611" addr="0x7fca46918cb0" >
+                <attributelist id="19612" addr="0x7fca46918cb0" >
+                    <attribute name="sym_name" value="ACTION_TOUCH_LONGPRESS_TEN" id="19613" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_TOUCH_LONGPRESS_TEN" id="19614" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="420" id="19615" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19616" addr="0x7fca46934c90" />
+                    <attribute name="value" value="420" id="19617" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19618" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19619" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19620" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19621" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19622" addr="0x7fca46918e10" >
+                <attributelist id="19623" addr="0x7fca46918e10" >
+                    <attribute name="sym_name" value="ACTION_GESTURE_NOTIFY" id="19624" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_GESTURE_NOTIFY" id="19625" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="500" id="19626" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19627" addr="0x7fca46934c90" />
+                    <attribute name="value" value="500" id="19628" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19629" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19630" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19631" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19632" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19633" addr="0x7fca46918f70" >
+                <attributelist id="19634" addr="0x7fca46918f70" >
+                    <attribute name="sym_name" value="ACTION_GESTURE_BEGIN" id="19635" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_GESTURE_BEGIN" id="19636" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="501" id="19637" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19638" addr="0x7fca46934c90" />
+                    <attribute name="value" value="501" id="19639" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19640" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19641" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19642" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19643" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19644" addr="0x7fca469190d0" >
+                <attributelist id="19645" addr="0x7fca469190d0" >
+                    <attribute name="sym_name" value="ACTION_GESTURE_ZOOM" id="19646" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_GESTURE_ZOOM" id="19647" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="502" id="19648" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19649" addr="0x7fca46934c90" />
+                    <attribute name="value" value="502" id="19650" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19651" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19652" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19653" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19654" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19655" addr="0x7fca46919230" >
+                <attributelist id="19656" addr="0x7fca46919230" >
+                    <attribute name="sym_name" value="ACTION_GESTURE_ROTATE" id="19657" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_GESTURE_ROTATE" id="19658" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="503" id="19659" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19660" addr="0x7fca46934c90" />
+                    <attribute name="value" value="503" id="19661" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19662" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19663" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19664" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19665" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19666" addr="0x7fca46919390" >
+                <attributelist id="19667" addr="0x7fca46919390" >
+                    <attribute name="sym_name" value="ACTION_GESTURE_PAN" id="19668" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_GESTURE_PAN" id="19669" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="504" id="19670" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19671" addr="0x7fca46934c90" />
+                    <attribute name="value" value="504" id="19672" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19673" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19674" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19675" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19676" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19677" addr="0x7fca469194f0" >
+                <attributelist id="19678" addr="0x7fca469194f0" >
+                    <attribute name="sym_name" value="ACTION_GESTURE_ABORT" id="19679" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_GESTURE_ABORT" id="19680" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="505" id="19681" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19682" addr="0x7fca46934c90" />
+                    <attribute name="value" value="505" id="19683" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19684" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19685" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19686" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19687" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19688" addr="0x7fca46919650" >
+                <attributelist id="19689" addr="0x7fca46919650" >
+                    <attribute name="sym_name" value="ACTION_GESTURE_SWIPE_LEFT" id="19690" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_GESTURE_SWIPE_LEFT" id="19691" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="511" id="19692" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19693" addr="0x7fca46934c90" />
+                    <attribute name="value" value="511" id="19694" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19695" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19696" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19697" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19698" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19699" addr="0x7fca469197b0" >
+                <attributelist id="19700" addr="0x7fca469197b0" >
+                    <attribute name="sym_name" value="ACTION_GESTURE_SWIPE_LEFT_TEN" id="19701" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_GESTURE_SWIPE_LEFT_TEN" id="19702" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="520" id="19703" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19704" addr="0x7fca46934c90" />
+                    <attribute name="value" value="520" id="19705" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19706" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19707" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19708" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19709" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19710" addr="0x7fca46919910" >
+                <attributelist id="19711" addr="0x7fca46919910" >
+                    <attribute name="sym_name" value="ACTION_GESTURE_SWIPE_RIGHT" id="19712" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_GESTURE_SWIPE_RIGHT" id="19713" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="521" id="19714" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19715" addr="0x7fca46934c90" />
+                    <attribute name="value" value="521" id="19716" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19717" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19718" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19719" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19720" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19721" addr="0x7fca46919a70" >
+                <attributelist id="19722" addr="0x7fca46919a70" >
+                    <attribute name="sym_name" value="ACTION_GESTURE_SWIPE_RIGHT_TEN" id="19723" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_GESTURE_SWIPE_RIGHT_TEN" id="19724" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="530" id="19725" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19726" addr="0x7fca46934c90" />
+                    <attribute name="value" value="530" id="19727" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19728" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19729" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19730" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19731" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19732" addr="0x7fca46919bd0" >
+                <attributelist id="19733" addr="0x7fca46919bd0" >
+                    <attribute name="sym_name" value="ACTION_GESTURE_SWIPE_UP" id="19734" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_GESTURE_SWIPE_UP" id="19735" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="531" id="19736" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19737" addr="0x7fca46934c90" />
+                    <attribute name="value" value="531" id="19738" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19739" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19740" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19741" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19742" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19743" addr="0x7fca46919d30" >
+                <attributelist id="19744" addr="0x7fca46919d30" >
+                    <attribute name="sym_name" value="ACTION_GESTURE_SWIPE_UP_TEN" id="19745" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_GESTURE_SWIPE_UP_TEN" id="19746" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="540" id="19747" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19748" addr="0x7fca46934c90" />
+                    <attribute name="value" value="540" id="19749" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19750" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19751" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19752" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19753" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19754" addr="0x7fca46919e90" >
+                <attributelist id="19755" addr="0x7fca46919e90" >
+                    <attribute name="sym_name" value="ACTION_GESTURE_SWIPE_DOWN" id="19756" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_GESTURE_SWIPE_DOWN" id="19757" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="541" id="19758" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19759" addr="0x7fca46934c90" />
+                    <attribute name="value" value="541" id="19760" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19761" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19762" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19763" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19764" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19765" addr="0x7fca46919ff0" >
+                <attributelist id="19766" addr="0x7fca46919ff0" >
+                    <attribute name="sym_name" value="ACTION_GESTURE_SWIPE_DOWN_TEN" id="19767" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_GESTURE_SWIPE_DOWN_TEN" id="19768" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="550" id="19769" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19770" addr="0x7fca46934c90" />
+                    <attribute name="value" value="550" id="19771" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19772" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19773" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19774" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19775" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19776" addr="0x7fca4691a150" >
+                <attributelist id="19777" addr="0x7fca4691a150" >
+                    <attribute name="sym_name" value="ACTION_GESTURE_END" id="19778" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_GESTURE_END" id="19779" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="599" id="19780" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19781" addr="0x7fca46934c90" />
+                    <attribute name="value" value="599" id="19782" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19783" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19784" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19785" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19786" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19787" addr="0x7fca4691a2b0" >
+                <attributelist id="19788" addr="0x7fca4691a2b0" >
+                    <attribute name="sym_name" value="ACTION_ANALOG_MOVE_X_LEFT" id="19789" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_ANALOG_MOVE_X_LEFT" id="19790" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="601" id="19791" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19792" addr="0x7fca46934c90" />
+                    <attribute name="value" value="601" id="19793" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19794" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19795" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19796" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19797" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19798" addr="0x7fca4691a410" >
+                <attributelist id="19799" addr="0x7fca4691a410" >
+                    <attribute name="sym_name" value="ACTION_ANALOG_MOVE_X_RIGHT" id="19800" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_ANALOG_MOVE_X_RIGHT" id="19801" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="602" id="19802" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19803" addr="0x7fca46934c90" />
+                    <attribute name="value" value="602" id="19804" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19805" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19806" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19807" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19808" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19809" addr="0x7fca4691a570" >
+                <attributelist id="19810" addr="0x7fca4691a570" >
+                    <attribute name="sym_name" value="ACTION_ANALOG_MOVE_Y_UP" id="19811" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_ANALOG_MOVE_Y_UP" id="19812" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="603" id="19813" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19814" addr="0x7fca46934c90" />
+                    <attribute name="value" value="603" id="19815" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19816" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19817" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19818" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19819" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19820" addr="0x7fca4691a6d0" >
+                <attributelist id="19821" addr="0x7fca4691a6d0" >
+                    <attribute name="sym_name" value="ACTION_ANALOG_MOVE_Y_DOWN" id="19822" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_ANALOG_MOVE_Y_DOWN" id="19823" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="604" id="19824" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19825" addr="0x7fca46934c90" />
+                    <attribute name="value" value="604" id="19826" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19827" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19828" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19829" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19830" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19831" addr="0x7fca4691a830" >
+                <attributelist id="19832" addr="0x7fca4691a830" >
+                    <attribute name="sym_name" value="ACTION_ERROR" id="19833" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_ERROR" id="19834" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="998" id="19835" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19836" addr="0x7fca46934c90" />
+                    <attribute name="value" value="998" id="19837" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19838" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19839" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19840" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19841" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19842" addr="0x7fca4691a990" >
+                <attributelist id="19843" addr="0x7fca4691a990" >
+                    <attribute name="sym_name" value="ACTION_NOOP" id="19844" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_NOOP" id="19845" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="999" id="19846" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19847" addr="0x7fca46934c90" />
+                    <attribute name="value" value="999" id="19848" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19849" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19850" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19851" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19852" addr="0x7fca46934c90" />
                 </attributelist >
              
             </constant >
         </include >
-        <include id="19853" addr="0x7f99f1dccab0" >
-            <attributelist id="19854" addr="0x7f99f1dccab0" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/input/Key.h" id="19855" addr="0x7f99f1de6c90" />
+        <include id="19853" addr="0x7fca4691aab0" >
+            <attributelist id="19854" addr="0x7fca4691aab0" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/input/Key.h" id="19855" addr="0x7fca46934c90" />
             </attributelist >
 
-            <constant id="19856" addr="0x7f99f1dccb70" >
-                <attributelist id="19857" addr="0x7f99f1dccb70" >
-                    <attribute name="sym_name" value="KEY_BUTTON_A" id="19858" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_BUTTON_A" id="19859" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="256" id="19860" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19861" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="256" id="19862" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19863" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19864" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19865" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19866" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19867" addr="0x7f99f1dcccd0" >
-                <attributelist id="19868" addr="0x7f99f1dcccd0" >
-                    <attribute name="sym_name" value="KEY_BUTTON_B" id="19869" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_BUTTON_B" id="19870" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="257" id="19871" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19872" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="257" id="19873" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19874" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19875" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19876" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19877" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19878" addr="0x7f99f1dcce30" >
-                <attributelist id="19879" addr="0x7f99f1dcce30" >
-                    <attribute name="sym_name" value="KEY_BUTTON_X" id="19880" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_BUTTON_X" id="19881" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="258" id="19882" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19883" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="258" id="19884" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19885" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19886" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19887" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19888" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19889" addr="0x7f99f1dccf90" >
-                <attributelist id="19890" addr="0x7f99f1dccf90" >
-                    <attribute name="sym_name" value="KEY_BUTTON_Y" id="19891" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_BUTTON_Y" id="19892" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="259" id="19893" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19894" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="259" id="19895" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19896" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19897" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19898" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19899" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19900" addr="0x7f99f1dcd0f0" >
-                <attributelist id="19901" addr="0x7f99f1dcd0f0" >
-                    <attribute name="sym_name" value="KEY_BUTTON_BLACK" id="19902" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_BUTTON_BLACK" id="19903" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="260" id="19904" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19905" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="260" id="19906" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19907" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19908" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19909" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19910" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19911" addr="0x7f99f1dcd250" >
-                <attributelist id="19912" addr="0x7f99f1dcd250" >
-                    <attribute name="sym_name" value="KEY_BUTTON_WHITE" id="19913" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_BUTTON_WHITE" id="19914" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="261" id="19915" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19916" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="261" id="19917" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19918" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19919" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19920" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19921" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19922" addr="0x7f99f1dcd3b0" >
-                <attributelist id="19923" addr="0x7f99f1dcd3b0" >
-                    <attribute name="sym_name" value="KEY_BUTTON_LEFT_TRIGGER" id="19924" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_BUTTON_LEFT_TRIGGER" id="19925" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="262" id="19926" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19927" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="262" id="19928" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19929" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19930" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19931" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19932" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19933" addr="0x7f99f1dcd510" >
-                <attributelist id="19934" addr="0x7f99f1dcd510" >
-                    <attribute name="sym_name" value="KEY_BUTTON_RIGHT_TRIGGER" id="19935" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_BUTTON_RIGHT_TRIGGER" id="19936" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="263" id="19937" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19938" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="263" id="19939" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19940" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19941" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19942" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19943" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19944" addr="0x7f99f1dcd670" >
-                <attributelist id="19945" addr="0x7f99f1dcd670" >
-                    <attribute name="sym_name" value="KEY_BUTTON_LEFT_THUMB_STICK" id="19946" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_BUTTON_LEFT_THUMB_STICK" id="19947" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="264" id="19948" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19949" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="264" id="19950" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19951" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19952" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19953" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19954" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19955" addr="0x7f99f1dcd7d0" >
-                <attributelist id="19956" addr="0x7f99f1dcd7d0" >
-                    <attribute name="sym_name" value="KEY_BUTTON_RIGHT_THUMB_STICK" id="19957" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_BUTTON_RIGHT_THUMB_STICK" id="19958" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="265" id="19959" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19960" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="265" id="19961" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19962" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19963" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19964" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19965" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19966" addr="0x7f99f1dcd930" >
-                <attributelist id="19967" addr="0x7f99f1dcd930" >
-                    <attribute name="sym_name" value="KEY_BUTTON_RIGHT_THUMB_STICK_UP" id="19968" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_BUTTON_RIGHT_THUMB_STICK_UP" id="19969" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="266" id="19970" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19971" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="266" id="19972" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19973" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19974" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19975" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19976" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19977" addr="0x7f99f1dcda90" >
-                <attributelist id="19978" addr="0x7f99f1dcda90" >
-                    <attribute name="sym_name" value="KEY_BUTTON_RIGHT_THUMB_STICK_DOWN" id="19979" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_BUTTON_RIGHT_THUMB_STICK_DOWN" id="19980" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="267" id="19981" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19982" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="267" id="19983" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19984" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19985" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19986" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19987" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19988" addr="0x7f99f1dcdbf0" >
-                <attributelist id="19989" addr="0x7f99f1dcdbf0" >
-                    <attribute name="sym_name" value="KEY_BUTTON_RIGHT_THUMB_STICK_LEFT" id="19990" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_BUTTON_RIGHT_THUMB_STICK_LEFT" id="19991" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="268" id="19992" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19993" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="268" id="19994" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19995" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19996" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19997" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19998" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19999" addr="0x7f99f1dcdd50" >
-                <attributelist id="20000" addr="0x7f99f1dcdd50" >
-                    <attribute name="sym_name" value="KEY_BUTTON_RIGHT_THUMB_STICK_RIGHT" id="20001" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_BUTTON_RIGHT_THUMB_STICK_RIGHT" id="20002" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="269" id="20003" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20004" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="269" id="20005" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20006" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20007" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20008" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20009" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20010" addr="0x7f99f1dcdeb0" >
-                <attributelist id="20011" addr="0x7f99f1dcdeb0" >
-                    <attribute name="sym_name" value="KEY_BUTTON_DPAD_UP" id="20012" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_BUTTON_DPAD_UP" id="20013" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="270" id="20014" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20015" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="270" id="20016" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20017" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20018" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20019" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20020" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20021" addr="0x7f99f1dce010" >
-                <attributelist id="20022" addr="0x7f99f1dce010" >
-                    <attribute name="sym_name" value="KEY_BUTTON_DPAD_DOWN" id="20023" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_BUTTON_DPAD_DOWN" id="20024" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="271" id="20025" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20026" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="271" id="20027" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20028" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20029" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20030" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20031" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20032" addr="0x7f99f1dce170" >
-                <attributelist id="20033" addr="0x7f99f1dce170" >
-                    <attribute name="sym_name" value="KEY_BUTTON_DPAD_LEFT" id="20034" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_BUTTON_DPAD_LEFT" id="20035" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="272" id="20036" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20037" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="272" id="20038" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20039" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20040" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20041" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20042" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20043" addr="0x7f99f1dce2d0" >
-                <attributelist id="20044" addr="0x7f99f1dce2d0" >
-                    <attribute name="sym_name" value="KEY_BUTTON_DPAD_RIGHT" id="20045" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_BUTTON_DPAD_RIGHT" id="20046" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="273" id="20047" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20048" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="273" id="20049" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20050" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20051" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20052" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20053" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20054" addr="0x7f99f1dce430" >
-                <attributelist id="20055" addr="0x7f99f1dce430" >
-                    <attribute name="sym_name" value="KEY_BUTTON_START" id="20056" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_BUTTON_START" id="20057" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="274" id="20058" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20059" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="274" id="20060" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20061" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20062" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20063" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20064" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20065" addr="0x7f99f1dce590" >
-                <attributelist id="20066" addr="0x7f99f1dce590" >
-                    <attribute name="sym_name" value="KEY_BUTTON_BACK" id="20067" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_BUTTON_BACK" id="20068" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="275" id="20069" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20070" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="275" id="20071" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20072" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20073" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20074" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20075" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20076" addr="0x7f99f1dce6f0" >
-                <attributelist id="20077" addr="0x7f99f1dce6f0" >
-                    <attribute name="sym_name" value="KEY_BUTTON_LEFT_THUMB_BUTTON" id="20078" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_BUTTON_LEFT_THUMB_BUTTON" id="20079" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="276" id="20080" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20081" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="276" id="20082" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20083" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20084" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20085" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20086" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20087" addr="0x7f99f1dce850" >
-                <attributelist id="20088" addr="0x7f99f1dce850" >
-                    <attribute name="sym_name" value="KEY_BUTTON_RIGHT_THUMB_BUTTON" id="20089" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_BUTTON_RIGHT_THUMB_BUTTON" id="20090" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="277" id="20091" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20092" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="277" id="20093" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20094" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20095" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20096" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20097" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20098" addr="0x7f99f1dce9b0" >
-                <attributelist id="20099" addr="0x7f99f1dce9b0" >
-                    <attribute name="sym_name" value="KEY_BUTTON_LEFT_ANALOG_TRIGGER" id="20100" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_BUTTON_LEFT_ANALOG_TRIGGER" id="20101" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="278" id="20102" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20103" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="278" id="20104" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20105" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20106" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20107" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20108" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20109" addr="0x7f99f1dceb10" >
-                <attributelist id="20110" addr="0x7f99f1dceb10" >
-                    <attribute name="sym_name" value="KEY_BUTTON_RIGHT_ANALOG_TRIGGER" id="20111" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_BUTTON_RIGHT_ANALOG_TRIGGER" id="20112" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="279" id="20113" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20114" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="279" id="20115" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20116" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20117" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20118" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20119" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20120" addr="0x7f99f1dcec70" >
-                <attributelist id="20121" addr="0x7f99f1dcec70" >
-                    <attribute name="sym_name" value="KEY_BUTTON_LEFT_THUMB_STICK_UP" id="20122" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_BUTTON_LEFT_THUMB_STICK_UP" id="20123" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="280" id="20124" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20125" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="280" id="20126" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20127" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20128" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20129" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20130" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20131" addr="0x7f99f1dcedd0" >
-                <attributelist id="20132" addr="0x7f99f1dcedd0" >
-                    <attribute name="sym_name" value="KEY_BUTTON_LEFT_THUMB_STICK_DOWN" id="20133" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_BUTTON_LEFT_THUMB_STICK_DOWN" id="20134" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="281" id="20135" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20136" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="281" id="20137" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20138" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20139" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20140" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20141" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20142" addr="0x7f99f1dcef30" >
-                <attributelist id="20143" addr="0x7f99f1dcef30" >
-                    <attribute name="sym_name" value="KEY_BUTTON_LEFT_THUMB_STICK_LEFT" id="20144" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_BUTTON_LEFT_THUMB_STICK_LEFT" id="20145" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="282" id="20146" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20147" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="282" id="20148" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20149" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20150" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20151" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20152" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20153" addr="0x7f99f1dcf090" >
-                <attributelist id="20154" addr="0x7f99f1dcf090" >
-                    <attribute name="sym_name" value="KEY_BUTTON_LEFT_THUMB_STICK_RIGHT" id="20155" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_BUTTON_LEFT_THUMB_STICK_RIGHT" id="20156" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="283" id="20157" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20158" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="283" id="20159" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20160" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20161" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20162" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20163" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20164" addr="0x7f99f1dcf1f0" >
-                <attributelist id="20165" addr="0x7f99f1dcf1f0" >
-                    <attribute name="sym_name" value="KEY_VKEY" id="20166" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_VKEY" id="20167" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="0xF000" id="20168" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20169" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="0xF000" id="20170" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20171" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20172" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20173" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20174" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20175" addr="0x7f99f1dcf350" >
-                <attributelist id="20176" addr="0x7f99f1dcf350" >
-                    <attribute name="sym_name" value="KEY_ASCII" id="20177" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_ASCII" id="20178" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="0xF100" id="20179" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20180" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="0xF100" id="20181" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20182" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20183" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20184" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20185" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20186" addr="0x7f99f1dcf4b0" >
-                <attributelist id="20187" addr="0x7f99f1dcf4b0" >
-                    <attribute name="sym_name" value="KEY_UNICODE" id="20188" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_UNICODE" id="20189" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="0xF200" id="20190" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20191" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="0xF200" id="20192" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20193" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20194" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20195" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20196" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20197" addr="0x7f99f1dcf610" >
-                <attributelist id="20198" addr="0x7f99f1dcf610" >
-                    <attribute name="sym_name" value="KEY_VMOUSE" id="20199" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_VMOUSE" id="20200" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="0xEFFF" id="20201" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20202" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="0xEFFF" id="20203" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20204" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20205" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20206" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20207" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20208" addr="0x7f99f1dcf770" >
-                <attributelist id="20209" addr="0x7f99f1dcf770" >
-                    <attribute name="sym_name" value="KEY_MOUSE_START" id="20210" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_MOUSE_START" id="20211" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="0xE000" id="20212" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20213" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="0xE000" id="20214" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20215" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20216" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20217" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20218" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20219" addr="0x7f99f1dcf8d0" >
-                <attributelist id="20220" addr="0x7f99f1dcf8d0" >
-                    <attribute name="sym_name" value="KEY_MOUSE_CLICK" id="20221" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_MOUSE_CLICK" id="20222" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="0xE000" id="20223" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20224" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="0xE000" id="20225" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20226" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20227" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20228" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20229" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20230" addr="0x7f99f1dcfa30" >
-                <attributelist id="20231" addr="0x7f99f1dcfa30" >
-                    <attribute name="sym_name" value="KEY_MOUSE_RIGHTCLICK" id="20232" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_MOUSE_RIGHTCLICK" id="20233" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="0xE001" id="20234" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20235" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="0xE001" id="20236" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20237" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20238" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20239" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20240" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20241" addr="0x7f99f1dcfb90" >
-                <attributelist id="20242" addr="0x7f99f1dcfb90" >
-                    <attribute name="sym_name" value="KEY_MOUSE_MIDDLECLICK" id="20243" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_MOUSE_MIDDLECLICK" id="20244" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="0xE002" id="20245" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20246" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="0xE002" id="20247" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20248" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20249" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20250" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20251" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20252" addr="0x7f99f1dcfcf0" >
-                <attributelist id="20253" addr="0x7f99f1dcfcf0" >
-                    <attribute name="sym_name" value="KEY_MOUSE_DOUBLE_CLICK" id="20254" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_MOUSE_DOUBLE_CLICK" id="20255" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="0xE010" id="20256" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20257" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="0xE010" id="20258" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20259" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20260" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20261" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20262" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20263" addr="0x7f99f1dcfe50" >
-                <attributelist id="20264" addr="0x7f99f1dcfe50" >
-                    <attribute name="sym_name" value="KEY_MOUSE_LONG_CLICK" id="20265" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_MOUSE_LONG_CLICK" id="20266" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="0xE020" id="20267" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20268" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="0xE020" id="20269" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20270" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20271" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20272" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20273" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20274" addr="0x7f99f1dcffb0" >
-                <attributelist id="20275" addr="0x7f99f1dcffb0" >
-                    <attribute name="sym_name" value="KEY_MOUSE_WHEEL_UP" id="20276" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_MOUSE_WHEEL_UP" id="20277" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="0xE101" id="20278" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20279" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="0xE101" id="20280" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20281" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20282" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20283" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20284" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20285" addr="0x7f99f1dd0110" >
-                <attributelist id="20286" addr="0x7f99f1dd0110" >
-                    <attribute name="sym_name" value="KEY_MOUSE_WHEEL_DOWN" id="20287" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_MOUSE_WHEEL_DOWN" id="20288" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="0xE102" id="20289" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20290" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="0xE102" id="20291" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20292" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20293" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20294" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20295" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20296" addr="0x7f99f1dd0270" >
-                <attributelist id="20297" addr="0x7f99f1dd0270" >
-                    <attribute name="sym_name" value="KEY_MOUSE_MOVE" id="20298" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_MOUSE_MOVE" id="20299" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="0xE103" id="20300" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20301" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="0xE103" id="20302" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20303" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20304" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20305" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20306" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20307" addr="0x7f99f1dd03d0" >
-                <attributelist id="20308" addr="0x7f99f1dd03d0" >
-                    <attribute name="sym_name" value="KEY_MOUSE_DRAG" id="20309" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_MOUSE_DRAG" id="20310" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="0xE104" id="20311" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20312" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="0xE104" id="20313" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20314" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20315" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20316" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20317" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20318" addr="0x7f99f1dd0530" >
-                <attributelist id="20319" addr="0x7f99f1dd0530" >
-                    <attribute name="sym_name" value="KEY_MOUSE_DRAG_START" id="20320" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_MOUSE_DRAG_START" id="20321" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="0xE105" id="20322" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20323" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="0xE105" id="20324" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20325" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20326" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20327" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20328" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20329" addr="0x7f99f1dd0690" >
-                <attributelist id="20330" addr="0x7f99f1dd0690" >
-                    <attribute name="sym_name" value="KEY_MOUSE_DRAG_END" id="20331" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_MOUSE_DRAG_END" id="20332" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="0xE106" id="20333" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20334" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="0xE106" id="20335" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20336" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20337" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20338" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20339" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20340" addr="0x7f99f1dd07f0" >
-                <attributelist id="20341" addr="0x7f99f1dd07f0" >
-                    <attribute name="sym_name" value="KEY_MOUSE_RDRAG" id="20342" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_MOUSE_RDRAG" id="20343" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="0xE107" id="20344" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20345" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="0xE107" id="20346" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20347" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20348" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20349" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20350" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20351" addr="0x7f99f1dd0950" >
-                <attributelist id="20352" addr="0x7f99f1dd0950" >
-                    <attribute name="sym_name" value="KEY_MOUSE_RDRAG_START" id="20353" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_MOUSE_RDRAG_START" id="20354" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="0xE108" id="20355" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20356" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="0xE108" id="20357" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20358" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20359" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20360" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20361" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20362" addr="0x7f99f1dd0ab0" >
-                <attributelist id="20363" addr="0x7f99f1dd0ab0" >
-                    <attribute name="sym_name" value="KEY_MOUSE_RDRAG_END" id="20364" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_MOUSE_RDRAG_END" id="20365" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="0xE109" id="20366" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20367" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="0xE109" id="20368" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20369" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20370" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20371" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20372" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20373" addr="0x7f99f1dd0c10" >
-                <attributelist id="20374" addr="0x7f99f1dd0c10" >
-                    <attribute name="sym_name" value="KEY_MOUSE_NOOP" id="20375" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_MOUSE_NOOP" id="20376" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="0xEFFF" id="20377" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20378" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="0xEFFF" id="20379" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20380" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20381" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20382" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20383" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20384" addr="0x7f99f1dd0d70" >
-                <attributelist id="20385" addr="0x7f99f1dd0d70" >
-                    <attribute name="sym_name" value="KEY_MOUSE_END" id="20386" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_MOUSE_END" id="20387" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="0xEFFF" id="20388" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20389" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="0xEFFF" id="20390" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20391" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20392" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20393" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20394" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20395" addr="0x7f99f1dd0ed0" >
-                <attributelist id="20396" addr="0x7f99f1dd0ed0" >
-                    <attribute name="sym_name" value="KEY_APPCOMMAND" id="20397" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_APPCOMMAND" id="20398" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="0xD000" id="20399" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20400" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="0xD000" id="20401" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20402" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20403" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20404" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20405" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20406" addr="0x7f99f1dd1030" >
-                <attributelist id="20407" addr="0x7f99f1dd1030" >
-                    <attribute name="sym_name" value="KEY_INVALID" id="20408" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_INVALID" id="20409" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="0xFFFF" id="20410" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20411" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="0xFFFF" id="20412" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20413" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20414" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20415" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20416" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20417" addr="0x7f99f1dd1190" >
-                <attributelist id="20418" addr="0x7f99f1dd1190" >
-                    <attribute name="sym_name" value="ICON_TYPE_NONE" id="20419" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ICON_TYPE_NONE" id="20420" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="101" id="20421" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20422" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="101" id="20423" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20424" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20425" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20426" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20427" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20428" addr="0x7f99f1dd12f0" >
-                <attributelist id="20429" addr="0x7f99f1dd12f0" >
-                    <attribute name="sym_name" value="ICON_TYPE_PROGRAMS" id="20430" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ICON_TYPE_PROGRAMS" id="20431" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="102" id="20432" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20433" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="102" id="20434" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20435" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20436" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20437" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20438" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20439" addr="0x7f99f1dd1450" >
-                <attributelist id="20440" addr="0x7f99f1dd1450" >
-                    <attribute name="sym_name" value="ICON_TYPE_MUSIC" id="20441" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ICON_TYPE_MUSIC" id="20442" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="103" id="20443" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20444" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="103" id="20445" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20446" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20447" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20448" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20449" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20450" addr="0x7f99f1dd15b0" >
-                <attributelist id="20451" addr="0x7f99f1dd15b0" >
-                    <attribute name="sym_name" value="ICON_TYPE_PICTURES" id="20452" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ICON_TYPE_PICTURES" id="20453" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="104" id="20454" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20455" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="104" id="20456" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20457" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20458" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20459" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20460" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20461" addr="0x7f99f1dd1710" >
-                <attributelist id="20462" addr="0x7f99f1dd1710" >
-                    <attribute name="sym_name" value="ICON_TYPE_VIDEOS" id="20463" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ICON_TYPE_VIDEOS" id="20464" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="105" id="20465" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20466" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="105" id="20467" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20468" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20469" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20470" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20471" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20472" addr="0x7f99f1dd1870" >
-                <attributelist id="20473" addr="0x7f99f1dd1870" >
-                    <attribute name="sym_name" value="ICON_TYPE_FILES" id="20474" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ICON_TYPE_FILES" id="20475" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="106" id="20476" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20477" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="106" id="20478" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20479" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20480" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20481" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20482" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20483" addr="0x7f99f1dd19d0" >
-                <attributelist id="20484" addr="0x7f99f1dd19d0" >
-                    <attribute name="sym_name" value="ICON_TYPE_WEATHER" id="20485" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ICON_TYPE_WEATHER" id="20486" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="107" id="20487" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20488" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="107" id="20489" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20490" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20491" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20492" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20493" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20494" addr="0x7f99f1dd1b30" >
-                <attributelist id="20495" addr="0x7f99f1dd1b30" >
-                    <attribute name="sym_name" value="ICON_TYPE_SETTINGS" id="20496" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ICON_TYPE_SETTINGS" id="20497" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="109" id="20498" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20499" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="109" id="20500" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20501" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20502" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20503" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20504" addr="0x7f99f1de6c90" />
+            <constant id="19856" addr="0x7fca4691ab70" >
+                <attributelist id="19857" addr="0x7fca4691ab70" >
+                    <attribute name="sym_name" value="KEY_BUTTON_A" id="19858" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_BUTTON_A" id="19859" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="256" id="19860" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19861" addr="0x7fca46934c90" />
+                    <attribute name="value" value="256" id="19862" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19863" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19864" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19865" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19866" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19867" addr="0x7fca4691acd0" >
+                <attributelist id="19868" addr="0x7fca4691acd0" >
+                    <attribute name="sym_name" value="KEY_BUTTON_B" id="19869" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_BUTTON_B" id="19870" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="257" id="19871" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19872" addr="0x7fca46934c90" />
+                    <attribute name="value" value="257" id="19873" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19874" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19875" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19876" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19877" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19878" addr="0x7fca4691ae30" >
+                <attributelist id="19879" addr="0x7fca4691ae30" >
+                    <attribute name="sym_name" value="KEY_BUTTON_X" id="19880" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_BUTTON_X" id="19881" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="258" id="19882" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19883" addr="0x7fca46934c90" />
+                    <attribute name="value" value="258" id="19884" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19885" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19886" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19887" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19888" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19889" addr="0x7fca4691af90" >
+                <attributelist id="19890" addr="0x7fca4691af90" >
+                    <attribute name="sym_name" value="KEY_BUTTON_Y" id="19891" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_BUTTON_Y" id="19892" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="259" id="19893" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19894" addr="0x7fca46934c90" />
+                    <attribute name="value" value="259" id="19895" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19896" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19897" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19898" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19899" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19900" addr="0x7fca4691b0f0" >
+                <attributelist id="19901" addr="0x7fca4691b0f0" >
+                    <attribute name="sym_name" value="KEY_BUTTON_BLACK" id="19902" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_BUTTON_BLACK" id="19903" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="260" id="19904" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19905" addr="0x7fca46934c90" />
+                    <attribute name="value" value="260" id="19906" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19907" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19908" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19909" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19910" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19911" addr="0x7fca4691b250" >
+                <attributelist id="19912" addr="0x7fca4691b250" >
+                    <attribute name="sym_name" value="KEY_BUTTON_WHITE" id="19913" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_BUTTON_WHITE" id="19914" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="261" id="19915" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19916" addr="0x7fca46934c90" />
+                    <attribute name="value" value="261" id="19917" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19918" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19919" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19920" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19921" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19922" addr="0x7fca4691b3b0" >
+                <attributelist id="19923" addr="0x7fca4691b3b0" >
+                    <attribute name="sym_name" value="KEY_BUTTON_LEFT_TRIGGER" id="19924" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_BUTTON_LEFT_TRIGGER" id="19925" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="262" id="19926" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19927" addr="0x7fca46934c90" />
+                    <attribute name="value" value="262" id="19928" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19929" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19930" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19931" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19932" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19933" addr="0x7fca4691b510" >
+                <attributelist id="19934" addr="0x7fca4691b510" >
+                    <attribute name="sym_name" value="KEY_BUTTON_RIGHT_TRIGGER" id="19935" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_BUTTON_RIGHT_TRIGGER" id="19936" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="263" id="19937" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19938" addr="0x7fca46934c90" />
+                    <attribute name="value" value="263" id="19939" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19940" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19941" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19942" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19943" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19944" addr="0x7fca4691b670" >
+                <attributelist id="19945" addr="0x7fca4691b670" >
+                    <attribute name="sym_name" value="KEY_BUTTON_LEFT_THUMB_STICK" id="19946" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_BUTTON_LEFT_THUMB_STICK" id="19947" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="264" id="19948" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19949" addr="0x7fca46934c90" />
+                    <attribute name="value" value="264" id="19950" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19951" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19952" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19953" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19954" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19955" addr="0x7fca4691b7d0" >
+                <attributelist id="19956" addr="0x7fca4691b7d0" >
+                    <attribute name="sym_name" value="KEY_BUTTON_RIGHT_THUMB_STICK" id="19957" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_BUTTON_RIGHT_THUMB_STICK" id="19958" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="265" id="19959" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19960" addr="0x7fca46934c90" />
+                    <attribute name="value" value="265" id="19961" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19962" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19963" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19964" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19965" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19966" addr="0x7fca4691b930" >
+                <attributelist id="19967" addr="0x7fca4691b930" >
+                    <attribute name="sym_name" value="KEY_BUTTON_RIGHT_THUMB_STICK_UP" id="19968" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_BUTTON_RIGHT_THUMB_STICK_UP" id="19969" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="266" id="19970" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19971" addr="0x7fca46934c90" />
+                    <attribute name="value" value="266" id="19972" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19973" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19974" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19975" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19976" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19977" addr="0x7fca4691ba90" >
+                <attributelist id="19978" addr="0x7fca4691ba90" >
+                    <attribute name="sym_name" value="KEY_BUTTON_RIGHT_THUMB_STICK_DOWN" id="19979" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_BUTTON_RIGHT_THUMB_STICK_DOWN" id="19980" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="267" id="19981" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19982" addr="0x7fca46934c90" />
+                    <attribute name="value" value="267" id="19983" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19984" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19985" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19986" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19987" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19988" addr="0x7fca4691bbf0" >
+                <attributelist id="19989" addr="0x7fca4691bbf0" >
+                    <attribute name="sym_name" value="KEY_BUTTON_RIGHT_THUMB_STICK_LEFT" id="19990" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_BUTTON_RIGHT_THUMB_STICK_LEFT" id="19991" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="268" id="19992" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19993" addr="0x7fca46934c90" />
+                    <attribute name="value" value="268" id="19994" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19995" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19996" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19997" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19998" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19999" addr="0x7fca4691bd50" >
+                <attributelist id="20000" addr="0x7fca4691bd50" >
+                    <attribute name="sym_name" value="KEY_BUTTON_RIGHT_THUMB_STICK_RIGHT" id="20001" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_BUTTON_RIGHT_THUMB_STICK_RIGHT" id="20002" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="269" id="20003" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20004" addr="0x7fca46934c90" />
+                    <attribute name="value" value="269" id="20005" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20006" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20007" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20008" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20009" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20010" addr="0x7fca4691beb0" >
+                <attributelist id="20011" addr="0x7fca4691beb0" >
+                    <attribute name="sym_name" value="KEY_BUTTON_DPAD_UP" id="20012" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_BUTTON_DPAD_UP" id="20013" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="270" id="20014" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20015" addr="0x7fca46934c90" />
+                    <attribute name="value" value="270" id="20016" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20017" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20018" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20019" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20020" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20021" addr="0x7fca4691c010" >
+                <attributelist id="20022" addr="0x7fca4691c010" >
+                    <attribute name="sym_name" value="KEY_BUTTON_DPAD_DOWN" id="20023" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_BUTTON_DPAD_DOWN" id="20024" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="271" id="20025" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20026" addr="0x7fca46934c90" />
+                    <attribute name="value" value="271" id="20027" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20028" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20029" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20030" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20031" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20032" addr="0x7fca4691c170" >
+                <attributelist id="20033" addr="0x7fca4691c170" >
+                    <attribute name="sym_name" value="KEY_BUTTON_DPAD_LEFT" id="20034" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_BUTTON_DPAD_LEFT" id="20035" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="272" id="20036" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20037" addr="0x7fca46934c90" />
+                    <attribute name="value" value="272" id="20038" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20039" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20040" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20041" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20042" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20043" addr="0x7fca4691c2d0" >
+                <attributelist id="20044" addr="0x7fca4691c2d0" >
+                    <attribute name="sym_name" value="KEY_BUTTON_DPAD_RIGHT" id="20045" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_BUTTON_DPAD_RIGHT" id="20046" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="273" id="20047" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20048" addr="0x7fca46934c90" />
+                    <attribute name="value" value="273" id="20049" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20050" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20051" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20052" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20053" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20054" addr="0x7fca4691c430" >
+                <attributelist id="20055" addr="0x7fca4691c430" >
+                    <attribute name="sym_name" value="KEY_BUTTON_START" id="20056" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_BUTTON_START" id="20057" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="274" id="20058" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20059" addr="0x7fca46934c90" />
+                    <attribute name="value" value="274" id="20060" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20061" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20062" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20063" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20064" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20065" addr="0x7fca4691c590" >
+                <attributelist id="20066" addr="0x7fca4691c590" >
+                    <attribute name="sym_name" value="KEY_BUTTON_BACK" id="20067" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_BUTTON_BACK" id="20068" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="275" id="20069" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20070" addr="0x7fca46934c90" />
+                    <attribute name="value" value="275" id="20071" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20072" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20073" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20074" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20075" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20076" addr="0x7fca4691c6f0" >
+                <attributelist id="20077" addr="0x7fca4691c6f0" >
+                    <attribute name="sym_name" value="KEY_BUTTON_LEFT_THUMB_BUTTON" id="20078" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_BUTTON_LEFT_THUMB_BUTTON" id="20079" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="276" id="20080" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20081" addr="0x7fca46934c90" />
+                    <attribute name="value" value="276" id="20082" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20083" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20084" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20085" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20086" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20087" addr="0x7fca4691c850" >
+                <attributelist id="20088" addr="0x7fca4691c850" >
+                    <attribute name="sym_name" value="KEY_BUTTON_RIGHT_THUMB_BUTTON" id="20089" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_BUTTON_RIGHT_THUMB_BUTTON" id="20090" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="277" id="20091" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20092" addr="0x7fca46934c90" />
+                    <attribute name="value" value="277" id="20093" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20094" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20095" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20096" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20097" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20098" addr="0x7fca4691c9b0" >
+                <attributelist id="20099" addr="0x7fca4691c9b0" >
+                    <attribute name="sym_name" value="KEY_BUTTON_LEFT_ANALOG_TRIGGER" id="20100" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_BUTTON_LEFT_ANALOG_TRIGGER" id="20101" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="278" id="20102" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20103" addr="0x7fca46934c90" />
+                    <attribute name="value" value="278" id="20104" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20105" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20106" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20107" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20108" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20109" addr="0x7fca4691cb10" >
+                <attributelist id="20110" addr="0x7fca4691cb10" >
+                    <attribute name="sym_name" value="KEY_BUTTON_RIGHT_ANALOG_TRIGGER" id="20111" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_BUTTON_RIGHT_ANALOG_TRIGGER" id="20112" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="279" id="20113" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20114" addr="0x7fca46934c90" />
+                    <attribute name="value" value="279" id="20115" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20116" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20117" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20118" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20119" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20120" addr="0x7fca4691cc70" >
+                <attributelist id="20121" addr="0x7fca4691cc70" >
+                    <attribute name="sym_name" value="KEY_BUTTON_LEFT_THUMB_STICK_UP" id="20122" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_BUTTON_LEFT_THUMB_STICK_UP" id="20123" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="280" id="20124" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20125" addr="0x7fca46934c90" />
+                    <attribute name="value" value="280" id="20126" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20127" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20128" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20129" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20130" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20131" addr="0x7fca4691cdd0" >
+                <attributelist id="20132" addr="0x7fca4691cdd0" >
+                    <attribute name="sym_name" value="KEY_BUTTON_LEFT_THUMB_STICK_DOWN" id="20133" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_BUTTON_LEFT_THUMB_STICK_DOWN" id="20134" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="281" id="20135" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20136" addr="0x7fca46934c90" />
+                    <attribute name="value" value="281" id="20137" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20138" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20139" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20140" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20141" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20142" addr="0x7fca4691cf30" >
+                <attributelist id="20143" addr="0x7fca4691cf30" >
+                    <attribute name="sym_name" value="KEY_BUTTON_LEFT_THUMB_STICK_LEFT" id="20144" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_BUTTON_LEFT_THUMB_STICK_LEFT" id="20145" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="282" id="20146" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20147" addr="0x7fca46934c90" />
+                    <attribute name="value" value="282" id="20148" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20149" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20150" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20151" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20152" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20153" addr="0x7fca4691d090" >
+                <attributelist id="20154" addr="0x7fca4691d090" >
+                    <attribute name="sym_name" value="KEY_BUTTON_LEFT_THUMB_STICK_RIGHT" id="20155" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_BUTTON_LEFT_THUMB_STICK_RIGHT" id="20156" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="283" id="20157" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20158" addr="0x7fca46934c90" />
+                    <attribute name="value" value="283" id="20159" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20160" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20161" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20162" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20163" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20164" addr="0x7fca4691d1f0" >
+                <attributelist id="20165" addr="0x7fca4691d1f0" >
+                    <attribute name="sym_name" value="KEY_VKEY" id="20166" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_VKEY" id="20167" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="0xF000" id="20168" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20169" addr="0x7fca46934c90" />
+                    <attribute name="value" value="0xF000" id="20170" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20171" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20172" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20173" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20174" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20175" addr="0x7fca4691d350" >
+                <attributelist id="20176" addr="0x7fca4691d350" >
+                    <attribute name="sym_name" value="KEY_ASCII" id="20177" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_ASCII" id="20178" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="0xF100" id="20179" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20180" addr="0x7fca46934c90" />
+                    <attribute name="value" value="0xF100" id="20181" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20182" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20183" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20184" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20185" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20186" addr="0x7fca4691d4b0" >
+                <attributelist id="20187" addr="0x7fca4691d4b0" >
+                    <attribute name="sym_name" value="KEY_UNICODE" id="20188" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_UNICODE" id="20189" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="0xF200" id="20190" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20191" addr="0x7fca46934c90" />
+                    <attribute name="value" value="0xF200" id="20192" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20193" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20194" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20195" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20196" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20197" addr="0x7fca4691d610" >
+                <attributelist id="20198" addr="0x7fca4691d610" >
+                    <attribute name="sym_name" value="KEY_VMOUSE" id="20199" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_VMOUSE" id="20200" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="0xEFFF" id="20201" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20202" addr="0x7fca46934c90" />
+                    <attribute name="value" value="0xEFFF" id="20203" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20204" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20205" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20206" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20207" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20208" addr="0x7fca4691d770" >
+                <attributelist id="20209" addr="0x7fca4691d770" >
+                    <attribute name="sym_name" value="KEY_MOUSE_START" id="20210" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_MOUSE_START" id="20211" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="0xE000" id="20212" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20213" addr="0x7fca46934c90" />
+                    <attribute name="value" value="0xE000" id="20214" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20215" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20216" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20217" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20218" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20219" addr="0x7fca4691d8d0" >
+                <attributelist id="20220" addr="0x7fca4691d8d0" >
+                    <attribute name="sym_name" value="KEY_MOUSE_CLICK" id="20221" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_MOUSE_CLICK" id="20222" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="0xE000" id="20223" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20224" addr="0x7fca46934c90" />
+                    <attribute name="value" value="0xE000" id="20225" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20226" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20227" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20228" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20229" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20230" addr="0x7fca4691da30" >
+                <attributelist id="20231" addr="0x7fca4691da30" >
+                    <attribute name="sym_name" value="KEY_MOUSE_RIGHTCLICK" id="20232" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_MOUSE_RIGHTCLICK" id="20233" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="0xE001" id="20234" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20235" addr="0x7fca46934c90" />
+                    <attribute name="value" value="0xE001" id="20236" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20237" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20238" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20239" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20240" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20241" addr="0x7fca4691db90" >
+                <attributelist id="20242" addr="0x7fca4691db90" >
+                    <attribute name="sym_name" value="KEY_MOUSE_MIDDLECLICK" id="20243" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_MOUSE_MIDDLECLICK" id="20244" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="0xE002" id="20245" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20246" addr="0x7fca46934c90" />
+                    <attribute name="value" value="0xE002" id="20247" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20248" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20249" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20250" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20251" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20252" addr="0x7fca4691dcf0" >
+                <attributelist id="20253" addr="0x7fca4691dcf0" >
+                    <attribute name="sym_name" value="KEY_MOUSE_DOUBLE_CLICK" id="20254" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_MOUSE_DOUBLE_CLICK" id="20255" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="0xE010" id="20256" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20257" addr="0x7fca46934c90" />
+                    <attribute name="value" value="0xE010" id="20258" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20259" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20260" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20261" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20262" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20263" addr="0x7fca4691de50" >
+                <attributelist id="20264" addr="0x7fca4691de50" >
+                    <attribute name="sym_name" value="KEY_MOUSE_LONG_CLICK" id="20265" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_MOUSE_LONG_CLICK" id="20266" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="0xE020" id="20267" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20268" addr="0x7fca46934c90" />
+                    <attribute name="value" value="0xE020" id="20269" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20270" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20271" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20272" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20273" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20274" addr="0x7fca4691dfb0" >
+                <attributelist id="20275" addr="0x7fca4691dfb0" >
+                    <attribute name="sym_name" value="KEY_MOUSE_WHEEL_UP" id="20276" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_MOUSE_WHEEL_UP" id="20277" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="0xE101" id="20278" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20279" addr="0x7fca46934c90" />
+                    <attribute name="value" value="0xE101" id="20280" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20281" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20282" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20283" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20284" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20285" addr="0x7fca4691e110" >
+                <attributelist id="20286" addr="0x7fca4691e110" >
+                    <attribute name="sym_name" value="KEY_MOUSE_WHEEL_DOWN" id="20287" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_MOUSE_WHEEL_DOWN" id="20288" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="0xE102" id="20289" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20290" addr="0x7fca46934c90" />
+                    <attribute name="value" value="0xE102" id="20291" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20292" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20293" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20294" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20295" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20296" addr="0x7fca4691e270" >
+                <attributelist id="20297" addr="0x7fca4691e270" >
+                    <attribute name="sym_name" value="KEY_MOUSE_MOVE" id="20298" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_MOUSE_MOVE" id="20299" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="0xE103" id="20300" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20301" addr="0x7fca46934c90" />
+                    <attribute name="value" value="0xE103" id="20302" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20303" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20304" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20305" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20306" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20307" addr="0x7fca4691e3d0" >
+                <attributelist id="20308" addr="0x7fca4691e3d0" >
+                    <attribute name="sym_name" value="KEY_MOUSE_DRAG" id="20309" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_MOUSE_DRAG" id="20310" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="0xE104" id="20311" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20312" addr="0x7fca46934c90" />
+                    <attribute name="value" value="0xE104" id="20313" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20314" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20315" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20316" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20317" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20318" addr="0x7fca4691e530" >
+                <attributelist id="20319" addr="0x7fca4691e530" >
+                    <attribute name="sym_name" value="KEY_MOUSE_DRAG_START" id="20320" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_MOUSE_DRAG_START" id="20321" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="0xE105" id="20322" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20323" addr="0x7fca46934c90" />
+                    <attribute name="value" value="0xE105" id="20324" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20325" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20326" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20327" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20328" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20329" addr="0x7fca4691e690" >
+                <attributelist id="20330" addr="0x7fca4691e690" >
+                    <attribute name="sym_name" value="KEY_MOUSE_DRAG_END" id="20331" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_MOUSE_DRAG_END" id="20332" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="0xE106" id="20333" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20334" addr="0x7fca46934c90" />
+                    <attribute name="value" value="0xE106" id="20335" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20336" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20337" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20338" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20339" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20340" addr="0x7fca4691e7f0" >
+                <attributelist id="20341" addr="0x7fca4691e7f0" >
+                    <attribute name="sym_name" value="KEY_MOUSE_RDRAG" id="20342" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_MOUSE_RDRAG" id="20343" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="0xE107" id="20344" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20345" addr="0x7fca46934c90" />
+                    <attribute name="value" value="0xE107" id="20346" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20347" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20348" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20349" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20350" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20351" addr="0x7fca4691e950" >
+                <attributelist id="20352" addr="0x7fca4691e950" >
+                    <attribute name="sym_name" value="KEY_MOUSE_RDRAG_START" id="20353" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_MOUSE_RDRAG_START" id="20354" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="0xE108" id="20355" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20356" addr="0x7fca46934c90" />
+                    <attribute name="value" value="0xE108" id="20357" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20358" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20359" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20360" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20361" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20362" addr="0x7fca4691eab0" >
+                <attributelist id="20363" addr="0x7fca4691eab0" >
+                    <attribute name="sym_name" value="KEY_MOUSE_RDRAG_END" id="20364" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_MOUSE_RDRAG_END" id="20365" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="0xE109" id="20366" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20367" addr="0x7fca46934c90" />
+                    <attribute name="value" value="0xE109" id="20368" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20369" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20370" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20371" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20372" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20373" addr="0x7fca4691ec10" >
+                <attributelist id="20374" addr="0x7fca4691ec10" >
+                    <attribute name="sym_name" value="KEY_MOUSE_NOOP" id="20375" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_MOUSE_NOOP" id="20376" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="0xEFFF" id="20377" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20378" addr="0x7fca46934c90" />
+                    <attribute name="value" value="0xEFFF" id="20379" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20380" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20381" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20382" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20383" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20384" addr="0x7fca4691ed70" >
+                <attributelist id="20385" addr="0x7fca4691ed70" >
+                    <attribute name="sym_name" value="KEY_MOUSE_END" id="20386" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_MOUSE_END" id="20387" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="0xEFFF" id="20388" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20389" addr="0x7fca46934c90" />
+                    <attribute name="value" value="0xEFFF" id="20390" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20391" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20392" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20393" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20394" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20395" addr="0x7fca4691eed0" >
+                <attributelist id="20396" addr="0x7fca4691eed0" >
+                    <attribute name="sym_name" value="KEY_APPCOMMAND" id="20397" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_APPCOMMAND" id="20398" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="0xD000" id="20399" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20400" addr="0x7fca46934c90" />
+                    <attribute name="value" value="0xD000" id="20401" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20402" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20403" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20404" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20405" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20406" addr="0x7fca4691f030" >
+                <attributelist id="20407" addr="0x7fca4691f030" >
+                    <attribute name="sym_name" value="KEY_INVALID" id="20408" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_INVALID" id="20409" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="0xFFFF" id="20410" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20411" addr="0x7fca46934c90" />
+                    <attribute name="value" value="0xFFFF" id="20412" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20413" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20414" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20415" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20416" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20417" addr="0x7fca4691f190" >
+                <attributelist id="20418" addr="0x7fca4691f190" >
+                    <attribute name="sym_name" value="ICON_TYPE_NONE" id="20419" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ICON_TYPE_NONE" id="20420" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="101" id="20421" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20422" addr="0x7fca46934c90" />
+                    <attribute name="value" value="101" id="20423" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20424" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20425" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20426" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20427" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20428" addr="0x7fca4691f2f0" >
+                <attributelist id="20429" addr="0x7fca4691f2f0" >
+                    <attribute name="sym_name" value="ICON_TYPE_PROGRAMS" id="20430" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ICON_TYPE_PROGRAMS" id="20431" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="102" id="20432" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20433" addr="0x7fca46934c90" />
+                    <attribute name="value" value="102" id="20434" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20435" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20436" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20437" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20438" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20439" addr="0x7fca4691f450" >
+                <attributelist id="20440" addr="0x7fca4691f450" >
+                    <attribute name="sym_name" value="ICON_TYPE_MUSIC" id="20441" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ICON_TYPE_MUSIC" id="20442" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="103" id="20443" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20444" addr="0x7fca46934c90" />
+                    <attribute name="value" value="103" id="20445" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20446" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20447" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20448" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20449" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20450" addr="0x7fca4691f5b0" >
+                <attributelist id="20451" addr="0x7fca4691f5b0" >
+                    <attribute name="sym_name" value="ICON_TYPE_PICTURES" id="20452" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ICON_TYPE_PICTURES" id="20453" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="104" id="20454" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20455" addr="0x7fca46934c90" />
+                    <attribute name="value" value="104" id="20456" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20457" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20458" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20459" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20460" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20461" addr="0x7fca4691f710" >
+                <attributelist id="20462" addr="0x7fca4691f710" >
+                    <attribute name="sym_name" value="ICON_TYPE_VIDEOS" id="20463" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ICON_TYPE_VIDEOS" id="20464" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="105" id="20465" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20466" addr="0x7fca46934c90" />
+                    <attribute name="value" value="105" id="20467" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20468" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20469" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20470" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20471" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20472" addr="0x7fca4691f870" >
+                <attributelist id="20473" addr="0x7fca4691f870" >
+                    <attribute name="sym_name" value="ICON_TYPE_FILES" id="20474" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ICON_TYPE_FILES" id="20475" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="106" id="20476" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20477" addr="0x7fca46934c90" />
+                    <attribute name="value" value="106" id="20478" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20479" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20480" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20481" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20482" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20483" addr="0x7fca4691f9d0" >
+                <attributelist id="20484" addr="0x7fca4691f9d0" >
+                    <attribute name="sym_name" value="ICON_TYPE_WEATHER" id="20485" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ICON_TYPE_WEATHER" id="20486" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="107" id="20487" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20488" addr="0x7fca46934c90" />
+                    <attribute name="value" value="107" id="20489" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20490" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20491" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20492" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20493" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20494" addr="0x7fca4691fb30" >
+                <attributelist id="20495" addr="0x7fca4691fb30" >
+                    <attribute name="sym_name" value="ICON_TYPE_SETTINGS" id="20496" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ICON_TYPE_SETTINGS" id="20497" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="109" id="20498" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20499" addr="0x7fca46934c90" />
+                    <attribute name="value" value="109" id="20500" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20501" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20502" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20503" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20504" addr="0x7fca46934c90" />
                 </attributelist >
              
             </constant >
diff --git a/srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmcplugin.i.cpp b/srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmcplugin.i.cpp
similarity index 99%
rename from srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmcplugin.i.cpp
rename to srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmcplugin.i.cpp
index 2d1b00d0b78..c85af24f4fc 100644
--- a/srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmcplugin.i.cpp
+++ b/srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmcplugin.i.cpp
@@ -849,7 +849,7 @@ namespace PythonBindings
 
    // constants
    PyModule_AddStringConstant(module, "__author__", "Team Kodi <http://kodi.tv>");
-   PyModule_AddStringConstant(module, "__date__", "Wed Jun 19 18:36:50 GMT 2019");
+   PyModule_AddStringConstant(module, "__date__", "Sun Sep 01 10:46:59 GMT 2019");
    PyModule_AddStringConstant(module, "__version__", "2.26.0");
    PyModule_AddStringConstant(module, "__credits__", "Team Kodi");
    PyModule_AddStringConstant(module, "__platform__", "ALL");
diff --git a/srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmcplugin.i.xml b/srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmcplugin.i.xml
similarity index 59%
rename from srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmcplugin.i.xml
rename to srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmcplugin.i.xml
index 1c1828a07d7..f4128e7c44b 100644
--- a/srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmcplugin.i.xml
+++ b/srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmcplugin.i.xml
@@ -1,141 +1,141 @@
 <?xml version="1.0" ?> 
-<top id="1" addr="0x7f8396ae7b30" >
-    <attributelist id="2" addr="0x7f8396ae7b30" >
-        <attribute name="outfile" value="AddonModuleXbmcplugin.i.xml" id="3" addr="0x7f8396b0aa10" />
-        <attribute name="name" value="xbmcplugin" id="4" addr="0x7f8396b0aa10" />
-        <attribute name="module" value="xbmcplugin" id="5" addr="0x7f8396afcfd0" />
-        <attribute name="inputfile" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmcplugin.i" id="6" addr="0x7f8396b0aa10" />
-        <attribute name="classes" value="0x7f8396afa590" id="7" addr="0x7f8396afa590" />
-        <attribute name="infile" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmcplugin.i" id="8" addr="0x7f8396b0aa10" />
-        <attribute name="outfile_h" value="AddonModuleXbmcplugin.i.h" id="9" addr="0x7f8396b0aa10" />
+<top id="1" addr="0x7f390a855b30" >
+    <attributelist id="2" addr="0x7f390a855b30" >
+        <attribute name="outfile" value="AddonModuleXbmcplugin.i.xml" id="3" addr="0x7f390a878a10" />
+        <attribute name="name" value="xbmcplugin" id="4" addr="0x7f390a878a10" />
+        <attribute name="module" value="xbmcplugin" id="5" addr="0x7f390a86afd0" />
+        <attribute name="inputfile" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmcplugin.i" id="6" addr="0x7f390a878a10" />
+        <attribute name="classes" value="0x7f390a868590" id="7" addr="0x7f390a868590" />
+        <attribute name="infile" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmcplugin.i" id="8" addr="0x7f390a878a10" />
+        <attribute name="outfile_h" value="AddonModuleXbmcplugin.i.h" id="9" addr="0x7f390a878a10" />
     </attributelist >
 
-    <include id="10" addr="0x7f8396af7ed0" >
-        <attributelist id="11" addr="0x7f8396af7ed0" >
-            <attribute name="name" value="/usr/share/swig/3.0.12/swig.swg" id="12" addr="0x7f8396b0aa10" />
+    <include id="10" addr="0x7f390a865ed0" >
+        <attributelist id="11" addr="0x7f390a865ed0" >
+            <attribute name="name" value="/usr/share/swig/3.0.12/swig.swg" id="12" addr="0x7f390a878a10" />
         </attributelist >
 
-        <include id="13" addr="0x7f8396af7f30" >
-            <attributelist id="14" addr="0x7f8396af7f30" >
-                <attribute name="name" value="/usr/share/swig/3.0.12/swigwarnings.swg" id="15" addr="0x7f8396b0aa10" />
+        <include id="13" addr="0x7f390a865f30" >
+            <attributelist id="14" addr="0x7f390a865f30" >
+                <attribute name="name" value="/usr/share/swig/3.0.12/swigwarnings.swg" id="15" addr="0x7f390a878a10" />
             </attributelist >
 
-            <include id="16" addr="0x7f8396af8050" >
-                <attributelist id="17" addr="0x7f8396af8050" >
-                    <attribute name="name" value="/usr/share/swig/3.0.12/swigwarn.swg" id="18" addr="0x7f8396b0aa10" />
+            <include id="16" addr="0x7f390a866050" >
+                <attributelist id="17" addr="0x7f390a866050" >
+                    <attribute name="name" value="/usr/share/swig/3.0.12/swigwarn.swg" id="18" addr="0x7f390a878a10" />
                 </attributelist >
              
             </include >
         </include >
-        <namespace id="19" addr="0x7f8396afa0b0" >
-            <attributelist id="20" addr="0x7f8396afa0b0" >
-                <attribute name="sym_name" value="std" id="21" addr="0x7f8396b0aa10" />
-                <attribute name="name" value="std" id="22" addr="0x7f8396b0aa10" />
-                <typescope id="23" addr="0x7f8396b08df0" >
-                    <attributelist id="24" addr="0x7f8396b08df0" >
-                        <attribute name="name" value="std" id="25" addr="0x7f8396b0aa10" />
-                        <typetab id="26" addr="0x7f8396b08e10" >
-                            <attributelist id="27" addr="0x7f8396b08e10" >
-                                <attribute name="initializer_list" value="initializer_list" id="28" addr="0x7f8396b0aa10" />
+        <namespace id="19" addr="0x7f390a8680b0" >
+            <attributelist id="20" addr="0x7f390a8680b0" >
+                <attribute name="sym_name" value="std" id="21" addr="0x7f390a878a10" />
+                <attribute name="name" value="std" id="22" addr="0x7f390a878a10" />
+                <typescope id="23" addr="0x7f390a876df0" >
+                    <attributelist id="24" addr="0x7f390a876df0" >
+                        <attribute name="name" value="std" id="25" addr="0x7f390a878a10" />
+                        <typetab id="26" addr="0x7f390a876e10" >
+                            <attributelist id="27" addr="0x7f390a876e10" >
+                                <attribute name="initializer_list" value="initializer_list" id="28" addr="0x7f390a878a10" />
                             </attributelist >
-                            <typetabsitem id="29" addr="0x7f8396b08f50" >
-                                <attributelist id="30" addr="0x7f8396b08f50" >
+                            <typetabsitem id="29" addr="0x7f390a876f50" >
+                                <attributelist id="30" addr="0x7f390a876f50" >
                                 </attributelist >
                             </typetabsitem >
                         </typetab >
-                        <attribute name="parent" value="0x7f8396ae6a30" id="31" addr="0x7f8396ae6a30" />
-                        <attribute name="qname" value="std" id="32" addr="0x7f8396b0aa10" />
-                        <attribute name="symtab" value="0x7f8396afa010" id="33" addr="0x7f8396afa010" />
+                        <attribute name="parent" value="0x7f390a854a30" id="31" addr="0x7f390a854a30" />
+                        <attribute name="qname" value="std" id="32" addr="0x7f390a878a10" />
+                        <attribute name="symtab" value="0x7f390a868010" id="33" addr="0x7f390a868010" />
                     </attributelist >
-                    <typescopesitem id="34" addr="0x7f8396af9f70" >
-                        <attributelist id="35" addr="0x7f8396af9f70" >
+                    <typescopesitem id="34" addr="0x7f390a867f70" >
+                        <attributelist id="35" addr="0x7f390a867f70" >
                         </attributelist >
                     </typescopesitem >
-                    <typescopesitem id="36" addr="0x7f8396b08e10" >
-                        <attributelist id="37" addr="0x7f8396b08e10" >
-                            <attribute name="initializer_list" value="initializer_list" id="38" addr="0x7f8396b0aa10" />
+                    <typescopesitem id="36" addr="0x7f390a876e10" >
+                        <attributelist id="37" addr="0x7f390a876e10" >
+                            <attribute name="initializer_list" value="initializer_list" id="38" addr="0x7f390a878a10" />
                         </attributelist >
                     </typescopesitem >
-                    <typescopesitem id="39" addr="0x7f8396ae6a30" >
-                        <attributelist id="40" addr="0x7f8396ae6a30" >
-                            <attribute name="name" value="" id="41" addr="0x7f8396b0aa10" />
-                            <typetab id="42" addr="0x7f8396ae6a90" >
-                                <attributelist id="43" addr="0x7f8396ae6a90" >
+                    <typescopesitem id="39" addr="0x7f390a854a30" >
+                        <attributelist id="40" addr="0x7f390a854a30" >
+                            <attribute name="name" value="" id="41" addr="0x7f390a878a10" />
+                            <typetab id="42" addr="0x7f390a854a90" >
+                                <attributelist id="43" addr="0x7f390a854a90" >
                                 </attributelist >
                             </typetab >
                         </attributelist >
                     </typescopesitem >
-                    <typescopesitem id="44" addr="0x7f8396b08e30" >
-                        <attributelist id="45" addr="0x7f8396b08e30" >
+                    <typescopesitem id="44" addr="0x7f390a876e30" >
+                        <attributelist id="45" addr="0x7f390a876e30" >
                         </attributelist >
                     </typescopesitem >
-                    <typescopesitem id="46" addr="0x7f8396afa010" >
-                        <attributelist id="47" addr="0x7f8396afa010" >
-                            <attribute name="name" value="std" id="48" addr="0x7f8396b0aa10" />
-                            <attribute name="csymtab" value="0x7f8396afa050" id="49" addr="0x7f8396afa050" />
-                            <attribute name="symtab" value="0x7f8396af9ff0" id="50" addr="0x7f8396af9ff0" />
+                    <typescopesitem id="46" addr="0x7f390a868010" >
+                        <attributelist id="47" addr="0x7f390a868010" >
+                            <attribute name="name" value="std" id="48" addr="0x7f390a878a10" />
+                            <attribute name="csymtab" value="0x7f390a868050" id="49" addr="0x7f390a868050" />
+                            <attribute name="symtab" value="0x7f390a867ff0" id="50" addr="0x7f390a867ff0" />
                         </attributelist >
                     </typescopesitem >
                 </typescope >
-                <attribute name="symtab" value="0x7f8396afa010" id="51" addr="0x7f8396afa010" />
-                <attribute name="sym_symtab" value="0x7f8396ae6950" id="52" addr="0x7f8396ae6950" />
-                <attribute name="sym_overname" value="__SWIG_0" id="53" addr="0x7f8396b0aa10" />
+                <attribute name="symtab" value="0x7f390a868010" id="51" addr="0x7f390a868010" />
+                <attribute name="sym_symtab" value="0x7f390a854950" id="52" addr="0x7f390a854950" />
+                <attribute name="sym_overname" value="__SWIG_0" id="53" addr="0x7f390a878a10" />
             </attributelist >
 
-            <template id="54" addr="0x7f8396afa230" >
-                <attributelist id="55" addr="0x7f8396afa230" >
-                    <attribute name="templatetype" value="class" id="56" addr="0x7f8396b0aa10" />
-                    <attribute name="sym_typename" value="1" id="57" addr="0x7f8396b0aa10" />
-                    <attribute name="name" value="initializer_list" id="58" addr="0x7f8396b0aa10" />
-                    <attribute name="sym_symtab" value="0x7f8396afa010" id="59" addr="0x7f8396afa010" />
-                    <attribute name="symtab" value="0x7f8396afa450" id="60" addr="0x7f8396afa450" />
-                    <attribute name="allows_typedef" value="1" id="61" addr="0x7f8396b0aa10" />
-                    <attribute name="kind" value="class" id="62" addr="0x7f8396b0aa10" />
-                    <attribute name="sym_name" value="initializer_list" id="63" addr="0x7f8396b0aa10" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="64" addr="0x7f8396b0aa10" />
-                    <templateparms id="65" addr="0x7f8396afa150" >
+            <template id="54" addr="0x7f390a868230" >
+                <attributelist id="55" addr="0x7f390a868230" >
+                    <attribute name="templatetype" value="class" id="56" addr="0x7f390a878a10" />
+                    <attribute name="sym_typename" value="1" id="57" addr="0x7f390a878a10" />
+                    <attribute name="name" value="initializer_list" id="58" addr="0x7f390a878a10" />
+                    <attribute name="sym_symtab" value="0x7f390a868010" id="59" addr="0x7f390a868010" />
+                    <attribute name="symtab" value="0x7f390a868450" id="60" addr="0x7f390a868450" />
+                    <attribute name="allows_typedef" value="1" id="61" addr="0x7f390a878a10" />
+                    <attribute name="kind" value="class" id="62" addr="0x7f390a878a10" />
+                    <attribute name="sym_name" value="initializer_list" id="63" addr="0x7f390a878a10" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="64" addr="0x7f390a878a10" />
+                    <templateparms id="65" addr="0x7f390a868150" >
                         <parm id="66">
-                            <attributelist id="67" addr="0x7f8396afa150" >
-                                <attribute name="name" value="T" id="68" addr="0x7f8396b0aa10" />
-                                <attribute name="type" value="typename T" id="69" addr="0x7f8396b0aa10" />
+                            <attributelist id="67" addr="0x7f390a868150" >
+                                <attribute name="name" value="T" id="68" addr="0x7f390a878a10" />
+                                <attribute name="type" value="typename T" id="69" addr="0x7f390a878a10" />
                             </attributelist >
                         </parm >
                     </templateparms >
                 </attributelist >
 
-                <access id="70" addr="0x7f8396afa610" >
-                    <attributelist id="71" addr="0x7f8396afa610" >
-                        <attribute name="kind" value="public" id="72" addr="0x7f8396b0aa10" />
+                <access id="70" addr="0x7f390a868610" >
+                    <attributelist id="71" addr="0x7f390a868610" >
+                        <attribute name="kind" value="public" id="72" addr="0x7f390a878a10" />
                     </attributelist >
                  
                 </access >
             </template >
-            <typemap id="73" addr="0x7f8396afac70" >
-                <attributelist id="74" addr="0x7f8396afac70" >
-                    <kwargs id="75" addr="0x7f8396afa970" >
-                        <attributelist id="76" addr="0x7f8396afa970" >
-                            <attribute name="name" value="warning" id="77" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="476:Initialization using std::initializer_list." id="78" addr="0x7f8396b0aa10" />
-                        </attributelist >
-                        <kwargssitem id="79" addr="0x7f8396afaaf0" >
-                            <attributelist id="80" addr="0x7f8396afaaf0" >
+            <typemap id="73" addr="0x7f390a868c70" >
+                <attributelist id="74" addr="0x7f390a868c70" >
+                    <kwargs id="75" addr="0x7f390a868970" >
+                        <attributelist id="76" addr="0x7f390a868970" >
+                            <attribute name="name" value="warning" id="77" addr="0x7f390a878a10" />
+                            <attribute name="value" value="476:Initialization using std::initializer_list." id="78" addr="0x7f390a878a10" />
+                        </attributelist >
+                        <kwargssitem id="79" addr="0x7f390a868af0" >
+                            <attributelist id="80" addr="0x7f390a868af0" >
                             </attributelist >
                         </kwargssitem >
-                        <kwargssitem id="81" addr="0x7f8396afa950" >
-                            <attributelist id="82" addr="0x7f8396afa950" >
+                        <kwargssitem id="81" addr="0x7f390a868950" >
+                            <attributelist id="82" addr="0x7f390a868950" >
                             </attributelist >
                         </kwargssitem >
                     </kwargs >
-                    <attribute name="code" value="" id="83" addr="0x7f8396b0aa10" />
-                    <attribute name="method" value="in" id="84" addr="0x7f8396b0aa10" />
+                    <attribute name="code" value="" id="83" addr="0x7f390a878a10" />
+                    <attribute name="method" value="in" id="84" addr="0x7f390a878a10" />
                 </attributelist >
 
-                <typemapitem id="85" addr="0x7f8396afab90" >
-                    <attributelist id="86" addr="0x7f8396afab90" >
-                        <parmlist id="87" addr="0x7f8396afabd0" >
+                <typemapitem id="85" addr="0x7f390a868b90" >
+                    <attributelist id="86" addr="0x7f390a868b90" >
+                        <parmlist id="87" addr="0x7f390a868bd0" >
                             <parm id="88">
-                                <attributelist id="89" addr="0x7f8396afabd0" >
-                                    <attribute name="type" value="std::initializer_list&lt;(T)>" id="90" addr="0x7f8396b0aa10" />
+                                <attributelist id="89" addr="0x7f390a868bd0" >
+                                    <attribute name="type" value="std::initializer_list&lt;(T)>" id="90" addr="0x7f390a878a10" />
                                 </attributelist >
                             </parm >
                         </parmlist >
@@ -143,32 +143,32 @@
                  
                 </typemapitem >
             </typemap >
-            <typemap id="91" addr="0x7f8396afaff0" >
-                <attributelist id="92" addr="0x7f8396afaff0" >
-                    <kwargs id="93" addr="0x7f8396afad90" >
-                        <attributelist id="94" addr="0x7f8396afad90" >
-                            <attribute name="name" value="precedence" id="95" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="0" id="96" addr="0x7f8396b0aa10" />
-                        </attributelist >
-                        <kwargssitem id="97" addr="0x7f8396afadb0" >
-                            <attributelist id="98" addr="0x7f8396afadb0" >
+            <typemap id="91" addr="0x7f390a868ff0" >
+                <attributelist id="92" addr="0x7f390a868ff0" >
+                    <kwargs id="93" addr="0x7f390a868d90" >
+                        <attributelist id="94" addr="0x7f390a868d90" >
+                            <attribute name="name" value="precedence" id="95" addr="0x7f390a878a10" />
+                            <attribute name="value" value="0" id="96" addr="0x7f390a878a10" />
+                        </attributelist >
+                        <kwargssitem id="97" addr="0x7f390a868db0" >
+                            <attributelist id="98" addr="0x7f390a868db0" >
                             </attributelist >
                         </kwargssitem >
-                        <kwargssitem id="99" addr="0x7f8396afadd0" >
-                            <attributelist id="100" addr="0x7f8396afadd0" >
+                        <kwargssitem id="99" addr="0x7f390a868dd0" >
+                            <attributelist id="100" addr="0x7f390a868dd0" >
                             </attributelist >
                         </kwargssitem >
                     </kwargs >
-                    <attribute name="code" value="" id="101" addr="0x7f8396b0aa10" />
-                    <attribute name="method" value="typecheck" id="102" addr="0x7f8396b0aa10" />
+                    <attribute name="code" value="" id="101" addr="0x7f390a878a10" />
+                    <attribute name="method" value="typecheck" id="102" addr="0x7f390a878a10" />
                 </attributelist >
 
-                <typemapitem id="103" addr="0x7f8396afaf30" >
-                    <attributelist id="104" addr="0x7f8396afaf30" >
-                        <parmlist id="105" addr="0x7f8396afaf70" >
+                <typemapitem id="103" addr="0x7f390a868f30" >
+                    <attributelist id="104" addr="0x7f390a868f30" >
+                        <parmlist id="105" addr="0x7f390a868f70" >
                             <parm id="106">
-                                <attributelist id="107" addr="0x7f8396afaf70" >
-                                    <attribute name="type" value="std::initializer_list&lt;(T)>" id="108" addr="0x7f8396b0aa10" />
+                                <attributelist id="107" addr="0x7f390a868f70" >
+                                    <attribute name="type" value="std::initializer_list&lt;(T)>" id="108" addr="0x7f390a878a10" />
                                 </attributelist >
                             </parm >
                         </parmlist >
@@ -177,18 +177,18 @@
                 </typemapitem >
             </typemap >
         </namespace >
-        <typemap id="109" addr="0x7f8396afb210" >
-            <attributelist id="110" addr="0x7f8396afb210" >
-                <attribute name="code" value="delete [] $1;" id="111" addr="0x7f8396b0aa10" />
-                <attribute name="method" value="newfree" id="112" addr="0x7f8396b0aa10" />
+        <typemap id="109" addr="0x7f390a869210" >
+            <attributelist id="110" addr="0x7f390a869210" >
+                <attribute name="code" value="delete [] $1;" id="111" addr="0x7f390a878a10" />
+                <attribute name="method" value="newfree" id="112" addr="0x7f390a878a10" />
             </attributelist >
 
-            <typemapitem id="113" addr="0x7f8396afb130" >
-                <attributelist id="114" addr="0x7f8396afb130" >
-                    <parmlist id="115" addr="0x7f8396afb170" >
+            <typemapitem id="113" addr="0x7f390a869130" >
+                <attributelist id="114" addr="0x7f390a869130" >
+                    <parmlist id="115" addr="0x7f390a869170" >
                         <parm id="116">
-                            <attributelist id="117" addr="0x7f8396afb170" >
-                                <attribute name="type" value="p.char" id="118" addr="0x7f8396b0aa10" />
+                            <attributelist id="117" addr="0x7f390a869170" >
+                                <attribute name="type" value="p.char" id="118" addr="0x7f390a878a10" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -196,18 +196,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="119" addr="0x7f8396afb3f0" >
-            <attributelist id="120" addr="0x7f8396afb3f0" >
-                <attribute name="code" value="{&#10;  delete [] $1;&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="121" addr="0x7f8396b0aa10" />
-                <attribute name="method" value="memberin" id="122" addr="0x7f8396b0aa10" />
+        <typemap id="119" addr="0x7f390a8693f0" >
+            <attributelist id="120" addr="0x7f390a8693f0" >
+                <attribute name="code" value="{&#10;  delete [] $1;&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="121" addr="0x7f390a878a10" />
+                <attribute name="method" value="memberin" id="122" addr="0x7f390a878a10" />
             </attributelist >
 
-            <typemapitem id="123" addr="0x7f8396afb330" >
-                <attributelist id="124" addr="0x7f8396afb330" >
-                    <parmlist id="125" addr="0x7f8396afb370" >
+            <typemapitem id="123" addr="0x7f390a869330" >
+                <attributelist id="124" addr="0x7f390a869330" >
+                    <parmlist id="125" addr="0x7f390a869370" >
                         <parm id="126">
-                            <attributelist id="127" addr="0x7f8396afb370" >
-                                <attribute name="type" value="p.char" id="128" addr="0x7f8396b0aa10" />
+                            <attributelist id="127" addr="0x7f390a869370" >
+                                <attribute name="type" value="p.char" id="128" addr="0x7f390a878a10" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -215,32 +215,32 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="129" addr="0x7f8396afb650" >
-            <attributelist id="130" addr="0x7f8396afb650" >
-                <kwargs id="131" addr="0x7f8396afb490" >
-                    <attributelist id="132" addr="0x7f8396afb490" >
-                        <attribute name="name" value="warning" id="133" addr="0x7f8396b0aa10" />
-                        <attribute name="value" value="451:Setting a const char * variable may leak memory." id="134" addr="0x7f8396b0aa10" />
+        <typemap id="129" addr="0x7f390a869650" >
+            <attributelist id="130" addr="0x7f390a869650" >
+                <kwargs id="131" addr="0x7f390a869490" >
+                    <attributelist id="132" addr="0x7f390a869490" >
+                        <attribute name="name" value="warning" id="133" addr="0x7f390a878a10" />
+                        <attribute name="value" value="451:Setting a const char * variable may leak memory." id="134" addr="0x7f390a878a10" />
                     </attributelist >
-                    <kwargssitem id="135" addr="0x7f8396afb4b0" >
-                        <attributelist id="136" addr="0x7f8396afb4b0" >
+                    <kwargssitem id="135" addr="0x7f390a8694b0" >
+                        <attributelist id="136" addr="0x7f390a8694b0" >
                         </attributelist >
                     </kwargssitem >
-                    <kwargssitem id="137" addr="0x7f8396afb470" >
-                        <attributelist id="138" addr="0x7f8396afb470" >
+                    <kwargssitem id="137" addr="0x7f390a869470" >
+                        <attributelist id="138" addr="0x7f390a869470" >
                         </attributelist >
                     </kwargssitem >
                 </kwargs >
-                <attribute name="code" value="{&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="139" addr="0x7f8396b0aa10" />
-                <attribute name="method" value="memberin" id="140" addr="0x7f8396b0aa10" />
+                <attribute name="code" value="{&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="139" addr="0x7f390a878a10" />
+                <attribute name="method" value="memberin" id="140" addr="0x7f390a878a10" />
             </attributelist >
 
-            <typemapitem id="141" addr="0x7f8396afb590" >
-                <attributelist id="142" addr="0x7f8396afb590" >
-                    <parmlist id="143" addr="0x7f8396afb5d0" >
+            <typemapitem id="141" addr="0x7f390a869590" >
+                <attributelist id="142" addr="0x7f390a869590" >
+                    <parmlist id="143" addr="0x7f390a8695d0" >
                         <parm id="144">
-                            <attributelist id="145" addr="0x7f8396afb5d0" >
-                                <attribute name="type" value="p.q(const).char" id="146" addr="0x7f8396b0aa10" />
+                            <attributelist id="145" addr="0x7f390a8695d0" >
+                                <attribute name="type" value="p.q(const).char" id="146" addr="0x7f390a878a10" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -248,18 +248,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="147" addr="0x7f8396afb830" >
-            <attributelist id="148" addr="0x7f8396afb830" >
-                <attribute name="code" value="{&#10;  delete [] $1;&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="149" addr="0x7f8396b0aa10" />
-                <attribute name="method" value="globalin" id="150" addr="0x7f8396b0aa10" />
+        <typemap id="147" addr="0x7f390a869830" >
+            <attributelist id="148" addr="0x7f390a869830" >
+                <attribute name="code" value="{&#10;  delete [] $1;&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="149" addr="0x7f390a878a10" />
+                <attribute name="method" value="globalin" id="150" addr="0x7f390a878a10" />
             </attributelist >
 
-            <typemapitem id="151" addr="0x7f8396afb770" >
-                <attributelist id="152" addr="0x7f8396afb770" >
-                    <parmlist id="153" addr="0x7f8396afb7b0" >
+            <typemapitem id="151" addr="0x7f390a869770" >
+                <attributelist id="152" addr="0x7f390a869770" >
+                    <parmlist id="153" addr="0x7f390a8697b0" >
                         <parm id="154">
-                            <attributelist id="155" addr="0x7f8396afb7b0" >
-                                <attribute name="type" value="p.char" id="156" addr="0x7f8396b0aa10" />
+                            <attributelist id="155" addr="0x7f390a8697b0" >
+                                <attribute name="type" value="p.char" id="156" addr="0x7f390a878a10" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -267,32 +267,32 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="157" addr="0x7f8396afba90" >
-            <attributelist id="158" addr="0x7f8396afba90" >
-                <kwargs id="159" addr="0x7f8396afb8d0" >
-                    <attributelist id="160" addr="0x7f8396afb8d0" >
-                        <attribute name="name" value="warning" id="161" addr="0x7f8396b0aa10" />
-                        <attribute name="value" value="451:Setting a const char * variable may leak memory." id="162" addr="0x7f8396b0aa10" />
+        <typemap id="157" addr="0x7f390a869a90" >
+            <attributelist id="158" addr="0x7f390a869a90" >
+                <kwargs id="159" addr="0x7f390a8698d0" >
+                    <attributelist id="160" addr="0x7f390a8698d0" >
+                        <attribute name="name" value="warning" id="161" addr="0x7f390a878a10" />
+                        <attribute name="value" value="451:Setting a const char * variable may leak memory." id="162" addr="0x7f390a878a10" />
                     </attributelist >
-                    <kwargssitem id="163" addr="0x7f8396afb8f0" >
-                        <attributelist id="164" addr="0x7f8396afb8f0" >
+                    <kwargssitem id="163" addr="0x7f390a8698f0" >
+                        <attributelist id="164" addr="0x7f390a8698f0" >
                         </attributelist >
                     </kwargssitem >
-                    <kwargssitem id="165" addr="0x7f8396afb8b0" >
-                        <attributelist id="166" addr="0x7f8396afb8b0" >
+                    <kwargssitem id="165" addr="0x7f390a8698b0" >
+                        <attributelist id="166" addr="0x7f390a8698b0" >
                         </attributelist >
                     </kwargssitem >
                 </kwargs >
-                <attribute name="code" value="{&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="167" addr="0x7f8396b0aa10" />
-                <attribute name="method" value="globalin" id="168" addr="0x7f8396b0aa10" />
+                <attribute name="code" value="{&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="167" addr="0x7f390a878a10" />
+                <attribute name="method" value="globalin" id="168" addr="0x7f390a878a10" />
             </attributelist >
 
-            <typemapitem id="169" addr="0x7f8396afb9d0" >
-                <attributelist id="170" addr="0x7f8396afb9d0" >
-                    <parmlist id="171" addr="0x7f8396afba10" >
+            <typemapitem id="169" addr="0x7f390a8699d0" >
+                <attributelist id="170" addr="0x7f390a8699d0" >
+                    <parmlist id="171" addr="0x7f390a869a10" >
                         <parm id="172">
-                            <attributelist id="173" addr="0x7f8396afba10" >
-                                <attribute name="type" value="p.q(const).char" id="174" addr="0x7f8396b0aa10" />
+                            <attributelist id="173" addr="0x7f390a869a10" >
+                                <attribute name="type" value="p.q(const).char" id="174" addr="0x7f390a878a10" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -300,18 +300,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="175" addr="0x7f8396afbcb0" >
-            <attributelist id="176" addr="0x7f8396afbcb0" >
-                <attribute name="code" value="{&#10;  if($input) {&#10;    strncpy((char*)$1, (const char *)$input, $1_dim0-1);&#10;    $1[$1_dim0-1] = 0;&#10;  } else {&#10;    $1[0] = 0;&#10;  }&#10;}" id="177" addr="0x7f8396b0aa10" />
-                <attribute name="method" value="memberin" id="178" addr="0x7f8396b0aa10" />
+        <typemap id="175" addr="0x7f390a869cb0" >
+            <attributelist id="176" addr="0x7f390a869cb0" >
+                <attribute name="code" value="{&#10;  if($input) {&#10;    strncpy((char*)$1, (const char *)$input, $1_dim0-1);&#10;    $1[$1_dim0-1] = 0;&#10;  } else {&#10;    $1[0] = 0;&#10;  }&#10;}" id="177" addr="0x7f390a878a10" />
+                <attribute name="method" value="memberin" id="178" addr="0x7f390a878a10" />
             </attributelist >
 
-            <typemapitem id="179" addr="0x7f8396afbbf0" >
-                <attributelist id="180" addr="0x7f8396afbbf0" >
-                    <parmlist id="181" addr="0x7f8396afbc30" >
+            <typemapitem id="179" addr="0x7f390a869bf0" >
+                <attributelist id="180" addr="0x7f390a869bf0" >
+                    <parmlist id="181" addr="0x7f390a869c30" >
                         <parm id="182">
-                            <attributelist id="183" addr="0x7f8396afbc30" >
-                                <attribute name="type" value="a(ANY).char" id="184" addr="0x7f8396b0aa10" />
+                            <attributelist id="183" addr="0x7f390a869c30" >
+                                <attribute name="type" value="a(ANY).char" id="184" addr="0x7f390a878a10" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -319,18 +319,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="185" addr="0x7f8396afbed0" >
-            <attributelist id="186" addr="0x7f8396afbed0" >
-                <attribute name="code" value="{&#10;  if($input) {&#10;    strncpy((char*)$1, (const char *)$input, $1_dim0-1);&#10;    $1[$1_dim0-1] = 0;&#10;  } else {&#10;    $1[0] = 0;&#10;  }&#10;}" id="187" addr="0x7f8396b0aa10" />
-                <attribute name="method" value="globalin" id="188" addr="0x7f8396b0aa10" />
+        <typemap id="185" addr="0x7f390a869ed0" >
+            <attributelist id="186" addr="0x7f390a869ed0" >
+                <attribute name="code" value="{&#10;  if($input) {&#10;    strncpy((char*)$1, (const char *)$input, $1_dim0-1);&#10;    $1[$1_dim0-1] = 0;&#10;  } else {&#10;    $1[0] = 0;&#10;  }&#10;}" id="187" addr="0x7f390a878a10" />
+                <attribute name="method" value="globalin" id="188" addr="0x7f390a878a10" />
             </attributelist >
 
-            <typemapitem id="189" addr="0x7f8396afbe10" >
-                <attributelist id="190" addr="0x7f8396afbe10" >
-                    <parmlist id="191" addr="0x7f8396afbe50" >
+            <typemapitem id="189" addr="0x7f390a869e10" >
+                <attributelist id="190" addr="0x7f390a869e10" >
+                    <parmlist id="191" addr="0x7f390a869e50" >
                         <parm id="192">
-                            <attributelist id="193" addr="0x7f8396afbe50" >
-                                <attribute name="type" value="a(ANY).char" id="194" addr="0x7f8396b0aa10" />
+                            <attributelist id="193" addr="0x7f390a869e50" >
+                                <attribute name="type" value="a(ANY).char" id="194" addr="0x7f390a878a10" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -338,18 +338,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="195" addr="0x7f8396afc0b0" >
-            <attributelist id="196" addr="0x7f8396afc0b0" >
-                <attribute name="code" value="{&#10;  if ($input) strcpy((char *)$1, (const char *)$input);&#10;  else $1[0] = 0;&#10;}" id="197" addr="0x7f8396b0aa10" />
-                <attribute name="method" value="memberin" id="198" addr="0x7f8396b0aa10" />
+        <typemap id="195" addr="0x7f390a86a0b0" >
+            <attributelist id="196" addr="0x7f390a86a0b0" >
+                <attribute name="code" value="{&#10;  if ($input) strcpy((char *)$1, (const char *)$input);&#10;  else $1[0] = 0;&#10;}" id="197" addr="0x7f390a878a10" />
+                <attribute name="method" value="memberin" id="198" addr="0x7f390a878a10" />
             </attributelist >
 
-            <typemapitem id="199" addr="0x7f8396afbff0" >
-                <attributelist id="200" addr="0x7f8396afbff0" >
-                    <parmlist id="201" addr="0x7f8396afc030" >
+            <typemapitem id="199" addr="0x7f390a869ff0" >
+                <attributelist id="200" addr="0x7f390a869ff0" >
+                    <parmlist id="201" addr="0x7f390a86a030" >
                         <parm id="202">
-                            <attributelist id="203" addr="0x7f8396afc030" >
-                                <attribute name="type" value="a().char" id="204" addr="0x7f8396b0aa10" />
+                            <attributelist id="203" addr="0x7f390a86a030" >
+                                <attribute name="type" value="a().char" id="204" addr="0x7f390a878a10" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -357,18 +357,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="205" addr="0x7f8396afc290" >
-            <attributelist id="206" addr="0x7f8396afc290" >
-                <attribute name="code" value="{&#10;  if ($input) strcpy((char *)$1, (const char *)$input);&#10;  else $1[0] = 0;&#10;}" id="207" addr="0x7f8396b0aa10" />
-                <attribute name="method" value="globalin" id="208" addr="0x7f8396b0aa10" />
+        <typemap id="205" addr="0x7f390a86a290" >
+            <attributelist id="206" addr="0x7f390a86a290" >
+                <attribute name="code" value="{&#10;  if ($input) strcpy((char *)$1, (const char *)$input);&#10;  else $1[0] = 0;&#10;}" id="207" addr="0x7f390a878a10" />
+                <attribute name="method" value="globalin" id="208" addr="0x7f390a878a10" />
             </attributelist >
 
-            <typemapitem id="209" addr="0x7f8396afc1d0" >
-                <attributelist id="210" addr="0x7f8396afc1d0" >
-                    <parmlist id="211" addr="0x7f8396afc210" >
+            <typemapitem id="209" addr="0x7f390a86a1d0" >
+                <attributelist id="210" addr="0x7f390a86a1d0" >
+                    <parmlist id="211" addr="0x7f390a86a210" >
                         <parm id="212">
-                            <attributelist id="213" addr="0x7f8396afc210" >
-                                <attribute name="type" value="a().char" id="214" addr="0x7f8396b0aa10" />
+                            <attributelist id="213" addr="0x7f390a86a210" >
+                                <attribute name="type" value="a().char" id="214" addr="0x7f390a878a10" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -376,18 +376,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="215" addr="0x7f8396afc4b0" >
-            <attributelist id="216" addr="0x7f8396afc4b0" >
-                <attribute name="code" value="{&#10;  size_t ii;&#10;  $1_basetype *b = ($1_basetype *) $1;&#10;  for (ii = 0; ii &lt; (size_t)$1_size; ii++) b[ii] = *(($1_basetype *) $input + ii);&#10;}" id="217" addr="0x7f8396b0aa10" />
-                <attribute name="method" value="memberin" id="218" addr="0x7f8396b0aa10" />
+        <typemap id="215" addr="0x7f390a86a4b0" >
+            <attributelist id="216" addr="0x7f390a86a4b0" >
+                <attribute name="code" value="{&#10;  size_t ii;&#10;  $1_basetype *b = ($1_basetype *) $1;&#10;  for (ii = 0; ii &lt; (size_t)$1_size; ii++) b[ii] = *(($1_basetype *) $input + ii);&#10;}" id="217" addr="0x7f390a878a10" />
+                <attribute name="method" value="memberin" id="218" addr="0x7f390a878a10" />
             </attributelist >
 
-            <typemapitem id="219" addr="0x7f8396afc3f0" >
-                <attributelist id="220" addr="0x7f8396afc3f0" >
-                    <parmlist id="221" addr="0x7f8396afc430" >
+            <typemapitem id="219" addr="0x7f390a86a3f0" >
+                <attributelist id="220" addr="0x7f390a86a3f0" >
+                    <parmlist id="221" addr="0x7f390a86a430" >
                         <parm id="222">
-                            <attributelist id="223" addr="0x7f8396afc430" >
-                                <attribute name="type" value="a(ANY).SWIGTYPE" id="224" addr="0x7f8396b0aa10" />
+                            <attributelist id="223" addr="0x7f390a86a430" >
+                                <attribute name="type" value="a(ANY).SWIGTYPE" id="224" addr="0x7f390a878a10" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -395,18 +395,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="225" addr="0x7f8396afc6d0" >
-            <attributelist id="226" addr="0x7f8396afc6d0" >
-                <attribute name="code" value="{&#10;  size_t ii;&#10;  $1_basetype *b = ($1_basetype *) $1;&#10;  for (ii = 0; ii &lt; (size_t)$1_size; ii++) b[ii] = *(($1_basetype *) $input + ii);&#10;}" id="227" addr="0x7f8396b0aa10" />
-                <attribute name="method" value="globalin" id="228" addr="0x7f8396b0aa10" />
+        <typemap id="225" addr="0x7f390a86a6d0" >
+            <attributelist id="226" addr="0x7f390a86a6d0" >
+                <attribute name="code" value="{&#10;  size_t ii;&#10;  $1_basetype *b = ($1_basetype *) $1;&#10;  for (ii = 0; ii &lt; (size_t)$1_size; ii++) b[ii] = *(($1_basetype *) $input + ii);&#10;}" id="227" addr="0x7f390a878a10" />
+                <attribute name="method" value="globalin" id="228" addr="0x7f390a878a10" />
             </attributelist >
 
-            <typemapitem id="229" addr="0x7f8396afc610" >
-                <attributelist id="230" addr="0x7f8396afc610" >
-                    <parmlist id="231" addr="0x7f8396afc650" >
+            <typemapitem id="229" addr="0x7f390a86a610" >
+                <attributelist id="230" addr="0x7f390a86a610" >
+                    <parmlist id="231" addr="0x7f390a86a650" >
                         <parm id="232">
-                            <attributelist id="233" addr="0x7f8396afc650" >
-                                <attribute name="type" value="a(ANY).SWIGTYPE" id="234" addr="0x7f8396b0aa10" />
+                            <attributelist id="233" addr="0x7f390a86a650" >
+                                <attribute name="type" value="a(ANY).SWIGTYPE" id="234" addr="0x7f390a878a10" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -414,18 +414,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="235" addr="0x7f8396afc930" >
-            <attributelist id="236" addr="0x7f8396afc930" >
-                <attribute name="code" value="{&#10;  $basetype (*inp)[$1_dim1] = ($basetype (*)[$1_dim1])($input);&#10;  $basetype (*dest)[$1_dim1] = ($basetype (*)[$1_dim1])($1);&#10;  size_t ii = 0;&#10;  for (; ii &lt; $1_dim0; ++ii) {&#10;    $basetype *ip = inp[ii];&#10;    $basetype *dp = dest[ii];&#10;    size_t jj = 0;&#10;    for (; jj &lt; $1_dim1; ++jj) dp[jj] = ip[jj];&#10;  }&#10;}" id="237" addr="0x7f8396b0aa10" />
-                <attribute name="method" value="memberin" id="238" addr="0x7f8396b0aa10" />
+        <typemap id="235" addr="0x7f390a86a930" >
+            <attributelist id="236" addr="0x7f390a86a930" >
+                <attribute name="code" value="{&#10;  $basetype (*inp)[$1_dim1] = ($basetype (*)[$1_dim1])($input);&#10;  $basetype (*dest)[$1_dim1] = ($basetype (*)[$1_dim1])($1);&#10;  size_t ii = 0;&#10;  for (; ii &lt; $1_dim0; ++ii) {&#10;    $basetype *ip = inp[ii];&#10;    $basetype *dp = dest[ii];&#10;    size_t jj = 0;&#10;    for (; jj &lt; $1_dim1; ++jj) dp[jj] = ip[jj];&#10;  }&#10;}" id="237" addr="0x7f390a878a10" />
+                <attribute name="method" value="memberin" id="238" addr="0x7f390a878a10" />
             </attributelist >
 
-            <typemapitem id="239" addr="0x7f8396afc810" >
-                <attributelist id="240" addr="0x7f8396afc810" >
-                    <parmlist id="241" addr="0x7f8396afc8b0" >
+            <typemapitem id="239" addr="0x7f390a86a810" >
+                <attributelist id="240" addr="0x7f390a86a810" >
+                    <parmlist id="241" addr="0x7f390a86a8b0" >
                         <parm id="242">
-                            <attributelist id="243" addr="0x7f8396afc8b0" >
-                                <attribute name="type" value="a(ANY).a(ANY).SWIGTYPE" id="244" addr="0x7f8396b0aa10" />
+                            <attributelist id="243" addr="0x7f390a86a8b0" >
+                                <attribute name="type" value="a(ANY).a(ANY).SWIGTYPE" id="244" addr="0x7f390a878a10" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -433,18 +433,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="245" addr="0x7f8396afcb90" >
-            <attributelist id="246" addr="0x7f8396afcb90" >
-                <attribute name="code" value="{&#10;  $basetype (*inp)[$1_dim1] = ($basetype (*)[$1_dim1])($input);&#10;  $basetype (*dest)[$1_dim1] = ($basetype (*)[$1_dim1])($1);&#10;  size_t ii = 0;&#10;  for (; ii &lt; $1_dim0; ++ii) {&#10;    $basetype *ip = inp[ii];&#10;    $basetype *dp = dest[ii];&#10;    size_t jj = 0;&#10;    for (; jj &lt; $1_dim1; ++jj) dp[jj] = ip[jj];&#10;  }&#10;}" id="247" addr="0x7f8396b0aa10" />
-                <attribute name="method" value="globalin" id="248" addr="0x7f8396b0aa10" />
+        <typemap id="245" addr="0x7f390a86ab90" >
+            <attributelist id="246" addr="0x7f390a86ab90" >
+                <attribute name="code" value="{&#10;  $basetype (*inp)[$1_dim1] = ($basetype (*)[$1_dim1])($input);&#10;  $basetype (*dest)[$1_dim1] = ($basetype (*)[$1_dim1])($1);&#10;  size_t ii = 0;&#10;  for (; ii &lt; $1_dim0; ++ii) {&#10;    $basetype *ip = inp[ii];&#10;    $basetype *dp = dest[ii];&#10;    size_t jj = 0;&#10;    for (; jj &lt; $1_dim1; ++jj) dp[jj] = ip[jj];&#10;  }&#10;}" id="247" addr="0x7f390a878a10" />
+                <attribute name="method" value="globalin" id="248" addr="0x7f390a878a10" />
             </attributelist >
 
-            <typemapitem id="249" addr="0x7f8396afca70" >
-                <attributelist id="250" addr="0x7f8396afca70" >
-                    <parmlist id="251" addr="0x7f8396afcb10" >
+            <typemapitem id="249" addr="0x7f390a86aa70" >
+                <attributelist id="250" addr="0x7f390a86aa70" >
+                    <parmlist id="251" addr="0x7f390a86ab10" >
                         <parm id="252">
-                            <attributelist id="253" addr="0x7f8396afcb10" >
-                                <attribute name="type" value="a(ANY).a(ANY).SWIGTYPE" id="254" addr="0x7f8396b0aa10" />
+                            <attributelist id="253" addr="0x7f390a86ab10" >
+                                <attribute name="type" value="a(ANY).a(ANY).SWIGTYPE" id="254" addr="0x7f390a878a10" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -452,1621 +452,1621 @@
              
             </typemapitem >
         </typemap >
-        <insert id="255" addr="0x7f8396afcc50" >
-            <attributelist id="256" addr="0x7f8396afcc50" >
-                <attribute name="code" value="&#10;#ifdef __cplusplus&#10;/* SwigValueWrapper is described in swig.swg */&#10;template&lt;typename T> class SwigValueWrapper {&#10;  struct SwigMovePointer {&#10;    T *ptr;&#10;    SwigMovePointer(T *p) : ptr(p) { }&#10;    ~SwigMovePointer() { delete ptr; }&#10;    SwigMovePointer&amp; operator=(SwigMovePointer&amp; rhs) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = rhs.ptr; rhs.ptr = 0; return *this; }&#10;  } pointer;&#10;  SwigValueWrapper&amp; operator=(const SwigValueWrapper&lt;T>&amp; rhs);&#10;  SwigValueWrapper(const SwigValueWrapper&lt;T>&amp; rhs);&#10;public:&#10;  SwigValueWrapper() : pointer(0) { }&#10;  SwigValueWrapper&amp; operator=(const T&amp; t) { SwigMovePointer tmp(new T(t)); pointer = tmp; return *this; }&#10;  operator T&amp;() const { return *pointer.ptr; }&#10;  T *operator&amp;() { return pointer.ptr; }&#10;};" id="257" addr="0x7f8396b0aa10" />
-                <attribute name="section" value="runtime" id="258" addr="0x7f8396b0aa10" />
+        <insert id="255" addr="0x7f390a86ac50" >
+            <attributelist id="256" addr="0x7f390a86ac50" >
+                <attribute name="code" value="&#10;#ifdef __cplusplus&#10;/* SwigValueWrapper is described in swig.swg */&#10;template&lt;typename T> class SwigValueWrapper {&#10;  struct SwigMovePointer {&#10;    T *ptr;&#10;    SwigMovePointer(T *p) : ptr(p) { }&#10;    ~SwigMovePointer() { delete ptr; }&#10;    SwigMovePointer&amp; operator=(SwigMovePointer&amp; rhs) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = rhs.ptr; rhs.ptr = 0; return *this; }&#10;  } pointer;&#10;  SwigValueWrapper&amp; operator=(const SwigValueWrapper&lt;T>&amp; rhs);&#10;  SwigValueWrapper(const SwigValueWrapper&lt;T>&amp; rhs);&#10;public:&#10;  SwigValueWrapper() : pointer(0) { }&#10;  SwigValueWrapper&amp; operator=(const T&amp; t) { SwigMovePointer tmp(new T(t)); pointer = tmp; return *this; }&#10;  operator T&amp;() const { return *pointer.ptr; }&#10;  T *operator&amp;() { return pointer.ptr; }&#10;};" id="257" addr="0x7f390a878a10" />
+                <attribute name="section" value="runtime" id="258" addr="0x7f390a878a10" />
             </attributelist >
          
         </insert >
-        <insert id="259" addr="0x7f8396afcd30" >
-            <attributelist id="260" addr="0x7f8396afcd30" >
-                <attribute name="code" value="&#10;template &lt;typename T> T SwigValueInit() {&#10;  return T();&#10;}&#10;#endif&#10;" id="261" addr="0x7f8396b0aa10" />
-                <attribute name="section" value="runtime" id="262" addr="0x7f8396b0aa10" />
+        <insert id="259" addr="0x7f390a86ad30" >
+            <attributelist id="260" addr="0x7f390a86ad30" >
+                <attribute name="code" value="&#10;template &lt;typename T> T SwigValueInit() {&#10;  return T();&#10;}&#10;#endif&#10;" id="261" addr="0x7f390a878a10" />
+                <attribute name="section" value="runtime" id="262" addr="0x7f390a878a10" />
             </attributelist >
          
         </insert >
-        <insert id="263" addr="0x7f8396afce10" >
-            <attributelist id="264" addr="0x7f8396afce10" >
-                <attribute name="code" value="/* -----------------------------------------------------------------------------&#10; *  This section contains generic SWIG labels for method/variable&#10; *  declarations/attributes, and other compiler dependent labels.&#10; * ----------------------------------------------------------------------------- */&#10;&#10;/* template workaround for compilers that cannot correctly implement the C++ standard */&#10;#ifndef SWIGTEMPLATEDISAMBIGUATOR&#10;# if defined(__SUNPRO_CC) &amp;&amp; (__SUNPRO_CC &lt;= 0x560)&#10;#  define SWIGTEMPLATEDISAMBIGUATOR template&#10;# elif defined(__HP_aCC)&#10;/* Needed even with `aCC -AA' when `aCC -V' reports HP ANSI C++ B3910B A.03.55 */&#10;/* If we find a maximum version that requires this, the test would be __HP_aCC &lt;= 35500 for A.03.55 */&#10;#  define SWIGTEMPLATEDISAMBIGUATOR template&#10;# else&#10;#  define SWIGTEMPLATEDISAMBIGUATOR&#10;# endif&#10;#endif&#10;&#10;/* inline attribute */&#10;#ifndef SWIGINLINE&#10;# if defined(__cplusplus) || (defined(__GNUC__) &amp;&amp; !defined(__STRICT_ANSI__))&#10;#   define SWIGINLINE inline&#10;# else&#10;#   define SWIGINLINE&#10;# endif&#10;#endif&#10;&#10;/* attribute recognised by some compilers to avoid 'unused' warnings */&#10;#ifndef SWIGUNUSED&#10;# if defined(__GNUC__)&#10;#   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 &amp;&amp; __GNUC_MINOR__ >= 4))&#10;#     define SWIGUNUSED __attribute__ ((__unused__))&#10;#   else&#10;#     define SWIGUNUSED&#10;#   endif&#10;# elif defined(__ICC)&#10;#   define SWIGUNUSED __attribute__ ((__unused__))&#10;# else&#10;#   define SWIGUNUSED&#10;# endif&#10;#endif&#10;&#10;#ifndef SWIG_MSC_UNSUPPRESS_4505&#10;# if defined(_MSC_VER)&#10;#   pragma warning(disable : 4505) /* unreferenced local function has been removed */&#10;# endif&#10;#endif&#10;&#10;#ifndef SWIGUNUSEDPARM&#10;# ifdef __cplusplus&#10;#   define SWIGUNUSEDPARM(p)&#10;# else&#10;#   define SWIGUNUSEDPARM(p) p SWIGUNUSED&#10;# endif&#10;#endif&#10;&#10;/* internal SWIG method */&#10;#ifndef SWIGINTERN&#10;# define SWIGINTERN static SWIGUNUSED&#10;#endif&#10;&#10;/* internal inline SWIG method */&#10;#ifndef SWIGINTERNINLINE&#10;# define SWIGINTERNINLINE SWIGINTERN SWIGINLINE&#10;#endif&#10;&#10;/* exporting methods */&#10;#if defined(__GNUC__)&#10;#  if (__GNUC__ >= 4) || (__GNUC__ == 3 &amp;&amp; __GNUC_MINOR__ >= 4)&#10;#    ifndef GCC_HASCLASSVISIBILITY&#10;#      define GCC_HASCLASSVISIBILITY&#10;#    endif&#10;#  endif&#10;#endif&#10;&#10;#ifndef SWIGEXPORT&#10;# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)&#10;#   if defined(STATIC_LINKED)&#10;#     define SWIGEXPORT&#10;#   else&#10;#     define SWIGEXPORT __declspec(dllexport)&#10;#   endif&#10;# else&#10;#   if defined(__GNUC__) &amp;&amp; defined(GCC_HASCLASSVISIBILITY)&#10;#     define SWIGEXPORT __attribute__ ((visibility(&quot;default&quot;)))&#10;#   else&#10;#     define SWIGEXPORT&#10;#   endif&#10;# endif&#10;#endif&#10;&#10;/* calling conventions for Windows */&#10;#ifndef SWIGSTDCALL&#10;# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)&#10;#   define SWIGSTDCALL __stdcall&#10;# else&#10;#   define SWIGSTDCALL&#10;# endif&#10;#endif&#10;&#10;/* Deal with Microsoft's attempt at deprecating C standard runtime functions */&#10;#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) &amp;&amp; defined(_MSC_VER) &amp;&amp; !defined(_CRT_SECURE_NO_DEPRECATE)&#10;# define _CRT_SECURE_NO_DEPRECATE&#10;#endif&#10;&#10;/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */&#10;#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) &amp;&amp; defined(_MSC_VER) &amp;&amp; !defined(_SCL_SECURE_NO_DEPRECATE)&#10;# define _SCL_SECURE_NO_DEPRECATE&#10;#endif&#10;&#10;/* Deal with Apple's deprecated 'AssertMacros.h' from Carbon-framework */&#10;#if defined(__APPLE__) &amp;&amp; !defined(__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES)&#10;# define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0&#10;#endif&#10;&#10;/* Intel's compiler complains if a variable which was never initialised is&#10; * cast to void, which is a common idiom which we use to indicate that we&#10; * are aware a variable isn't used.  So we just silence that warning.&#10; * See: https://github.com/swig/swig/issues/192 for more discussion.&#10; */&#10;#ifdef __INTEL_COMPILER&#10;# pragma warning disable 592&#10;#endif&#10;" id="265" addr="0x7f8396b0aa10" />
-                <attribute name="section" value="runtime" id="266" addr="0x7f8396b0aa10" />
+        <insert id="263" addr="0x7f390a86ae10" >
+            <attributelist id="264" addr="0x7f390a86ae10" >
+                <attribute name="code" value="/* -----------------------------------------------------------------------------&#10; *  This section contains generic SWIG labels for method/variable&#10; *  declarations/attributes, and other compiler dependent labels.&#10; * ----------------------------------------------------------------------------- */&#10;&#10;/* template workaround for compilers that cannot correctly implement the C++ standard */&#10;#ifndef SWIGTEMPLATEDISAMBIGUATOR&#10;# if defined(__SUNPRO_CC) &amp;&amp; (__SUNPRO_CC &lt;= 0x560)&#10;#  define SWIGTEMPLATEDISAMBIGUATOR template&#10;# elif defined(__HP_aCC)&#10;/* Needed even with `aCC -AA' when `aCC -V' reports HP ANSI C++ B3910B A.03.55 */&#10;/* If we find a maximum version that requires this, the test would be __HP_aCC &lt;= 35500 for A.03.55 */&#10;#  define SWIGTEMPLATEDISAMBIGUATOR template&#10;# else&#10;#  define SWIGTEMPLATEDISAMBIGUATOR&#10;# endif&#10;#endif&#10;&#10;/* inline attribute */&#10;#ifndef SWIGINLINE&#10;# if defined(__cplusplus) || (defined(__GNUC__) &amp;&amp; !defined(__STRICT_ANSI__))&#10;#   define SWIGINLINE inline&#10;# else&#10;#   define SWIGINLINE&#10;# endif&#10;#endif&#10;&#10;/* attribute recognised by some compilers to avoid 'unused' warnings */&#10;#ifndef SWIGUNUSED&#10;# if defined(__GNUC__)&#10;#   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 &amp;&amp; __GNUC_MINOR__ >= 4))&#10;#     define SWIGUNUSED __attribute__ ((__unused__))&#10;#   else&#10;#     define SWIGUNUSED&#10;#   endif&#10;# elif defined(__ICC)&#10;#   define SWIGUNUSED __attribute__ ((__unused__))&#10;# else&#10;#   define SWIGUNUSED&#10;# endif&#10;#endif&#10;&#10;#ifndef SWIG_MSC_UNSUPPRESS_4505&#10;# if defined(_MSC_VER)&#10;#   pragma warning(disable : 4505) /* unreferenced local function has been removed */&#10;# endif&#10;#endif&#10;&#10;#ifndef SWIGUNUSEDPARM&#10;# ifdef __cplusplus&#10;#   define SWIGUNUSEDPARM(p)&#10;# else&#10;#   define SWIGUNUSEDPARM(p) p SWIGUNUSED&#10;# endif&#10;#endif&#10;&#10;/* internal SWIG method */&#10;#ifndef SWIGINTERN&#10;# define SWIGINTERN static SWIGUNUSED&#10;#endif&#10;&#10;/* internal inline SWIG method */&#10;#ifndef SWIGINTERNINLINE&#10;# define SWIGINTERNINLINE SWIGINTERN SWIGINLINE&#10;#endif&#10;&#10;/* exporting methods */&#10;#if defined(__GNUC__)&#10;#  if (__GNUC__ >= 4) || (__GNUC__ == 3 &amp;&amp; __GNUC_MINOR__ >= 4)&#10;#    ifndef GCC_HASCLASSVISIBILITY&#10;#      define GCC_HASCLASSVISIBILITY&#10;#    endif&#10;#  endif&#10;#endif&#10;&#10;#ifndef SWIGEXPORT&#10;# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)&#10;#   if defined(STATIC_LINKED)&#10;#     define SWIGEXPORT&#10;#   else&#10;#     define SWIGEXPORT __declspec(dllexport)&#10;#   endif&#10;# else&#10;#   if defined(__GNUC__) &amp;&amp; defined(GCC_HASCLASSVISIBILITY)&#10;#     define SWIGEXPORT __attribute__ ((visibility(&quot;default&quot;)))&#10;#   else&#10;#     define SWIGEXPORT&#10;#   endif&#10;# endif&#10;#endif&#10;&#10;/* calling conventions for Windows */&#10;#ifndef SWIGSTDCALL&#10;# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)&#10;#   define SWIGSTDCALL __stdcall&#10;# else&#10;#   define SWIGSTDCALL&#10;# endif&#10;#endif&#10;&#10;/* Deal with Microsoft's attempt at deprecating C standard runtime functions */&#10;#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) &amp;&amp; defined(_MSC_VER) &amp;&amp; !defined(_CRT_SECURE_NO_DEPRECATE)&#10;# define _CRT_SECURE_NO_DEPRECATE&#10;#endif&#10;&#10;/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */&#10;#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) &amp;&amp; defined(_MSC_VER) &amp;&amp; !defined(_SCL_SECURE_NO_DEPRECATE)&#10;# define _SCL_SECURE_NO_DEPRECATE&#10;#endif&#10;&#10;/* Deal with Apple's deprecated 'AssertMacros.h' from Carbon-framework */&#10;#if defined(__APPLE__) &amp;&amp; !defined(__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES)&#10;# define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0&#10;#endif&#10;&#10;/* Intel's compiler complains if a variable which was never initialised is&#10; * cast to void, which is a common idiom which we use to indicate that we&#10; * are aware a variable isn't used.  So we just silence that warning.&#10; * See: https://github.com/swig/swig/issues/192 for more discussion.&#10; */&#10;#ifdef __INTEL_COMPILER&#10;# pragma warning disable 592&#10;#endif&#10;" id="265" addr="0x7f390a878a10" />
+                <attribute name="section" value="runtime" id="266" addr="0x7f390a878a10" />
             </attributelist >
          
         </insert >
     </include >
-    <include id="267" addr="0x7f8396afcf90" >
-        <attributelist id="268" addr="0x7f8396afcf90" >
-            <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmcplugin.i" id="269" addr="0x7f8396b0aa10" />
-            <attribute name="module" value="" id="270" addr="0x7f8396afd030" />
-            <attribute name="options" value="0x7f8396afcf10" id="271" addr="0x7f8396afcf10" />
+    <include id="267" addr="0x7f390a86af90" >
+        <attributelist id="268" addr="0x7f390a86af90" >
+            <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmcplugin.i" id="269" addr="0x7f390a878a10" />
+            <attribute name="module" value="" id="270" addr="0x7f390a86b030" />
+            <attribute name="options" value="0x7f390a86af10" id="271" addr="0x7f390a86af10" />
         </attributelist >
 
-        <module id="272" addr="0x7f8396afcfd0" >
-            <attributelist id="273" addr="0x7f8396afcfd0" >
-                <attribute name="name" value="xbmcplugin" id="274" addr="0x7f8396b0aa10" />
+        <module id="272" addr="0x7f390a86afd0" >
+            <attributelist id="273" addr="0x7f390a86afd0" >
+                <attribute name="name" value="xbmcplugin" id="274" addr="0x7f390a878a10" />
             </attributelist >
          
         </module >
-        <insert id="275" addr="0x7f8396afd070" >
-            <attributelist id="276" addr="0x7f8396afd070" >
-                <attribute name="code" value="&#10;#if defined(TARGET_WINDOWS)&#10;#  include &lt;windows.h>&#10;#endif&#10;&#10;#include &quot;interfaces/legacy/ModuleXbmcplugin.h&quot;&#10;&#10;using namespace XBMCAddon;&#10;using namespace xbmcplugin;&#10;&#10;#if defined(__GNUG__)&#10;#pragma GCC diagnostic ignored &quot;-Wstrict-aliasing&quot;&#10;#endif&#10;&#10;" id="277" addr="0x7f8396b0aa10" />
+        <insert id="275" addr="0x7f390a86b070" >
+            <attributelist id="276" addr="0x7f390a86b070" >
+                <attribute name="code" value="&#10;#if defined(TARGET_WINDOWS)&#10;#  include &lt;windows.h>&#10;#endif&#10;&#10;#include &quot;interfaces/legacy/ModuleXbmcplugin.h&quot;&#10;&#10;using namespace XBMCAddon;&#10;using namespace xbmcplugin;&#10;&#10;#if defined(__GNUG__)&#10;#pragma GCC diagnostic ignored &quot;-Wstrict-aliasing&quot;&#10;#endif&#10;&#10;" id="277" addr="0x7f390a878a10" />
             </attributelist >
          
         </insert >
-        <include id="278" addr="0x7f8396afd290" >
-            <attributelist id="279" addr="0x7f8396afd290" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/swighelper.h" id="280" addr="0x7f8396b0aa10" />
+        <include id="278" addr="0x7f390a86b290" >
+            <attributelist id="279" addr="0x7f390a86b290" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/swighelper.h" id="280" addr="0x7f390a878a10" />
             </attributelist >
          
         </include >
-        <include id="281" addr="0x7f8396afd310" >
-            <attributelist id="282" addr="0x7f8396afd310" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/AddonString.h" id="283" addr="0x7f8396b0aa10" />
+        <include id="281" addr="0x7f390a86b310" >
+            <attributelist id="282" addr="0x7f390a86b310" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/AddonString.h" id="283" addr="0x7f390a878a10" />
             </attributelist >
 
-            <namespace id="284" addr="0x7f8396afd450" >
-                <attributelist id="285" addr="0x7f8396afd450" >
-                    <attribute name="sym_name" value="XBMCAddon" id="286" addr="0x7f8396b0aa10" />
-                    <attribute name="name" value="XBMCAddon" id="287" addr="0x7f8396b0aa10" />
-                    <attribute name="csym_nextSibling" value="0x7f8396afda10" id="288" addr="0x7f8396afda10" />
-                    <attribute name="sym_nextSibling" value="0x7f8396afda10" id="289" addr="0x7f8396afda10" />
-                    <typescope id="290" addr="0x7f8396b08e90" >
-                        <attributelist id="291" addr="0x7f8396b08e90" >
-                            <attribute name="name" value="XBMCAddon" id="292" addr="0x7f8396b0aa10" />
-                            <typetab id="293" addr="0x7f8396b08ed0" >
-                                <attributelist id="294" addr="0x7f8396b08ed0" >
-                                    <attribute name="String" value="std::string" id="295" addr="0x7f8396b0aa10" />
+            <namespace id="284" addr="0x7f390a86b450" >
+                <attributelist id="285" addr="0x7f390a86b450" >
+                    <attribute name="sym_name" value="XBMCAddon" id="286" addr="0x7f390a878a10" />
+                    <attribute name="name" value="XBMCAddon" id="287" addr="0x7f390a878a10" />
+                    <attribute name="csym_nextSibling" value="0x7f390a86ba10" id="288" addr="0x7f390a86ba10" />
+                    <attribute name="sym_nextSibling" value="0x7f390a86ba10" id="289" addr="0x7f390a86ba10" />
+                    <typescope id="290" addr="0x7f390a876e90" >
+                        <attributelist id="291" addr="0x7f390a876e90" >
+                            <attribute name="name" value="XBMCAddon" id="292" addr="0x7f390a878a10" />
+                            <typetab id="293" addr="0x7f390a876ed0" >
+                                <attributelist id="294" addr="0x7f390a876ed0" >
+                                    <attribute name="String" value="std::string" id="295" addr="0x7f390a878a10" />
                                 </attributelist >
-                                <typetabsitem id="296" addr="0x7f8396b090b0" >
-                                    <attributelist id="297" addr="0x7f8396b090b0" >
+                                <typetabsitem id="296" addr="0x7f390a8770b0" >
+                                    <attributelist id="297" addr="0x7f390a8770b0" >
                                     </attributelist >
                                 </typetabsitem >
                             </typetab >
-                            <attribute name="parent" value="0x7f8396ae6a30" id="298" addr="0x7f8396ae6a30" />
-                            <attribute name="qname" value="XBMCAddon" id="299" addr="0x7f8396b0aa10" />
-                            <attribute name="symtab" value="0x7f8396afd3b0" id="300" addr="0x7f8396afd3b0" />
+                            <attribute name="parent" value="0x7f390a854a30" id="298" addr="0x7f390a854a30" />
+                            <attribute name="qname" value="XBMCAddon" id="299" addr="0x7f390a878a10" />
+                            <attribute name="symtab" value="0x7f390a86b3b0" id="300" addr="0x7f390a86b3b0" />
                         </attributelist >
-                        <typescopesitem id="301" addr="0x7f8396afd370" >
-                            <attributelist id="302" addr="0x7f8396afd370" >
+                        <typescopesitem id="301" addr="0x7f390a86b370" >
+                            <attributelist id="302" addr="0x7f390a86b370" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="303" addr="0x7f8396b08ed0" >
-                            <attributelist id="304" addr="0x7f8396b08ed0" >
-                                <attribute name="String" value="std::string" id="305" addr="0x7f8396b0aa10" />
+                        <typescopesitem id="303" addr="0x7f390a876ed0" >
+                            <attributelist id="304" addr="0x7f390a876ed0" >
+                                <attribute name="String" value="std::string" id="305" addr="0x7f390a878a10" />
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="306" addr="0x7f8396ae6a30" >
-                            <attributelist id="307" addr="0x7f8396ae6a30" >
-                                <attribute name="name" value="" id="308" addr="0x7f8396b0aa10" />
-                                <typetab id="309" addr="0x7f8396ae6a90" >
-                                    <attributelist id="310" addr="0x7f8396ae6a90" >
+                        <typescopesitem id="306" addr="0x7f390a854a30" >
+                            <attributelist id="307" addr="0x7f390a854a30" >
+                                <attribute name="name" value="" id="308" addr="0x7f390a878a10" />
+                                <typetab id="309" addr="0x7f390a854a90" >
+                                    <attributelist id="310" addr="0x7f390a854a90" >
                                     </attributelist >
                                 </typetab >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="311" addr="0x7f8396b08fd0" >
-                            <attributelist id="312" addr="0x7f8396b08fd0" >
+                        <typescopesitem id="311" addr="0x7f390a876fd0" >
+                            <attributelist id="312" addr="0x7f390a876fd0" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="313" addr="0x7f8396afd3b0" >
-                            <attributelist id="314" addr="0x7f8396afd3b0" >
-                                <attribute name="name" value="XBMCAddon" id="315" addr="0x7f8396b0aa10" />
-                                <attribute name="csymtab" value="0x7f8396afd3f0" id="316" addr="0x7f8396afd3f0" />
-                                <attribute name="symtab" value="0x7f8396afd390" id="317" addr="0x7f8396afd390" />
+                        <typescopesitem id="313" addr="0x7f390a86b3b0" >
+                            <attributelist id="314" addr="0x7f390a86b3b0" >
+                                <attribute name="name" value="XBMCAddon" id="315" addr="0x7f390a878a10" />
+                                <attribute name="csymtab" value="0x7f390a86b3f0" id="316" addr="0x7f390a86b3f0" />
+                                <attribute name="symtab" value="0x7f390a86b390" id="317" addr="0x7f390a86b390" />
                             </attributelist >
                         </typescopesitem >
                     </typescope >
-                    <attribute name="symtab" value="0x7f8396afd3b0" id="318" addr="0x7f8396afd3b0" />
-                    <attribute name="sym_symtab" value="0x7f8396ae6950" id="319" addr="0x7f8396ae6950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="320" addr="0x7f8396b0aa10" />
+                    <attribute name="symtab" value="0x7f390a86b3b0" id="318" addr="0x7f390a86b3b0" />
+                    <attribute name="sym_symtab" value="0x7f390a854950" id="319" addr="0x7f390a854950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="320" addr="0x7f390a878a10" />
                 </attributelist >
 
-                <cdecl id="321" addr="0x7f8396afd570" >
-                    <attributelist id="322" addr="0x7f8396afd570" >
-                        <attribute name="sym_name" value="String" id="323" addr="0x7f8396b0aa10" />
-                        <attribute name="name" value="XBMCAddon::String" id="324" addr="0x7f8396b0aa10" />
-                        <attribute name="decl" value="" id="325" addr="0x7f8396b0aa10" />
-                        <attribute name="storage" value="typedef" id="326" addr="0x7f8396b0aa10" />
-                        <attribute name="kind" value="typedef" id="327" addr="0x7f8396b0aa10" />
-                        <attribute name="type" value="std::string" id="328" addr="0x7f8396b0aa10" />
-                        <attribute name="sym_symtab" value="0x7f8396afd3b0" id="329" addr="0x7f8396afd3b0" />
-                        <attribute name="sym_overname" value="__SWIG_0" id="330" addr="0x7f8396b0aa10" />
+                <cdecl id="321" addr="0x7f390a86b570" >
+                    <attributelist id="322" addr="0x7f390a86b570" >
+                        <attribute name="sym_name" value="String" id="323" addr="0x7f390a878a10" />
+                        <attribute name="name" value="XBMCAddon::String" id="324" addr="0x7f390a878a10" />
+                        <attribute name="decl" value="" id="325" addr="0x7f390a878a10" />
+                        <attribute name="storage" value="typedef" id="326" addr="0x7f390a878a10" />
+                        <attribute name="kind" value="typedef" id="327" addr="0x7f390a878a10" />
+                        <attribute name="type" value="std::string" id="328" addr="0x7f390a878a10" />
+                        <attribute name="sym_symtab" value="0x7f390a86b3b0" id="329" addr="0x7f390a86b3b0" />
+                        <attribute name="sym_overname" value="__SWIG_0" id="330" addr="0x7f390a878a10" />
                     </attributelist >
                  
                 </cdecl >
-                <cdecl id="331" addr="0x7f8396afd770" >
-                    <attributelist id="332" addr="0x7f8396afd770" >
-                        <attribute name="sym_name" value="emptyString" id="333" addr="0x7f8396b0aa10" />
-                        <attribute name="name" value="XBMCAddon::emptyString" id="334" addr="0x7f8396b0aa10" />
-                        <attribute name="decl" value="" id="335" addr="0x7f8396b0aa10" />
-                        <attribute name="storage" value="extern" id="336" addr="0x7f8396b0aa10" />
-                        <attribute name="kind" value="variable" id="337" addr="0x7f8396b0aa10" />
-                        <attribute name="type" value="XBMCAddon::String" id="338" addr="0x7f8396b0aa10" />
-                        <attribute name="sym_symtab" value="0x7f8396afd3b0" id="339" addr="0x7f8396afd3b0" />
-                        <attribute name="sym_overname" value="__SWIG_0" id="340" addr="0x7f8396b0aa10" />
+                <cdecl id="331" addr="0x7f390a86b770" >
+                    <attributelist id="332" addr="0x7f390a86b770" >
+                        <attribute name="sym_name" value="emptyString" id="333" addr="0x7f390a878a10" />
+                        <attribute name="name" value="XBMCAddon::emptyString" id="334" addr="0x7f390a878a10" />
+                        <attribute name="decl" value="" id="335" addr="0x7f390a878a10" />
+                        <attribute name="storage" value="extern" id="336" addr="0x7f390a878a10" />
+                        <attribute name="kind" value="variable" id="337" addr="0x7f390a878a10" />
+                        <attribute name="type" value="XBMCAddon::String" id="338" addr="0x7f390a878a10" />
+                        <attribute name="sym_symtab" value="0x7f390a86b3b0" id="339" addr="0x7f390a86b3b0" />
+                        <attribute name="sym_overname" value="__SWIG_0" id="340" addr="0x7f390a878a10" />
                     </attributelist >
                  
                 </cdecl >
             </namespace >
         </include >
-        <include id="341" addr="0x7f8396afd950" >
-            <attributelist id="342" addr="0x7f8396afd950" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/ModuleXbmcplugin.h" id="343" addr="0x7f8396b0aa10" />
+        <include id="341" addr="0x7f390a86b950" >
+            <attributelist id="342" addr="0x7f390a86b950" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/ModuleXbmcplugin.h" id="343" addr="0x7f390a878a10" />
             </attributelist >
 
-            <namespace id="344" addr="0x7f8396afda10" >
-                <attributelist id="345" addr="0x7f8396afda10" >
-                    <attribute name="sym_name" value="XBMCAddon" id="346" addr="0x7f8396b0aa10" />
-                    <attribute name="name" value="XBMCAddon" id="347" addr="0x7f8396b0aa10" />
-                    <attribute name="sym_previousSibling" value="0x7f8396afd450" id="348" addr="0x7f8396afd450" />
-                    <typescope id="349" addr="0x7f8396b08e90" >
-                        <attributelist id="350" addr="0x7f8396b08e90" >
-                            <attribute name="name" value="XBMCAddon" id="351" addr="0x7f8396b0aa10" />
-                            <typetab id="352" addr="0x7f8396b08ed0" >
-                                <attributelist id="353" addr="0x7f8396b08ed0" >
-                                    <attribute name="String" value="std::string" id="354" addr="0x7f8396b0aa10" />
+            <namespace id="344" addr="0x7f390a86ba10" >
+                <attributelist id="345" addr="0x7f390a86ba10" >
+                    <attribute name="sym_name" value="XBMCAddon" id="346" addr="0x7f390a878a10" />
+                    <attribute name="name" value="XBMCAddon" id="347" addr="0x7f390a878a10" />
+                    <attribute name="sym_previousSibling" value="0x7f390a86b450" id="348" addr="0x7f390a86b450" />
+                    <typescope id="349" addr="0x7f390a876e90" >
+                        <attributelist id="350" addr="0x7f390a876e90" >
+                            <attribute name="name" value="XBMCAddon" id="351" addr="0x7f390a878a10" />
+                            <typetab id="352" addr="0x7f390a876ed0" >
+                                <attributelist id="353" addr="0x7f390a876ed0" >
+                                    <attribute name="String" value="std::string" id="354" addr="0x7f390a878a10" />
                                 </attributelist >
-                                <typetabsitem id="355" addr="0x7f8396b090b0" >
-                                    <attributelist id="356" addr="0x7f8396b090b0" >
+                                <typetabsitem id="355" addr="0x7f390a8770b0" >
+                                    <attributelist id="356" addr="0x7f390a8770b0" >
                                     </attributelist >
                                 </typetabsitem >
                             </typetab >
-                            <attribute name="parent" value="0x7f8396ae6a30" id="357" addr="0x7f8396ae6a30" />
-                            <attribute name="qname" value="XBMCAddon" id="358" addr="0x7f8396b0aa10" />
-                            <attribute name="symtab" value="0x7f8396afd3b0" id="359" addr="0x7f8396afd3b0" />
+                            <attribute name="parent" value="0x7f390a854a30" id="357" addr="0x7f390a854a30" />
+                            <attribute name="qname" value="XBMCAddon" id="358" addr="0x7f390a878a10" />
+                            <attribute name="symtab" value="0x7f390a86b3b0" id="359" addr="0x7f390a86b3b0" />
                         </attributelist >
-                        <typescopesitem id="360" addr="0x7f8396afd370" >
-                            <attributelist id="361" addr="0x7f8396afd370" >
+                        <typescopesitem id="360" addr="0x7f390a86b370" >
+                            <attributelist id="361" addr="0x7f390a86b370" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="362" addr="0x7f8396b08ed0" >
-                            <attributelist id="363" addr="0x7f8396b08ed0" >
-                                <attribute name="String" value="std::string" id="364" addr="0x7f8396b0aa10" />
+                        <typescopesitem id="362" addr="0x7f390a876ed0" >
+                            <attributelist id="363" addr="0x7f390a876ed0" >
+                                <attribute name="String" value="std::string" id="364" addr="0x7f390a878a10" />
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="365" addr="0x7f8396ae6a30" >
-                            <attributelist id="366" addr="0x7f8396ae6a30" >
-                                <attribute name="name" value="" id="367" addr="0x7f8396b0aa10" />
-                                <typetab id="368" addr="0x7f8396ae6a90" >
-                                    <attributelist id="369" addr="0x7f8396ae6a90" >
+                        <typescopesitem id="365" addr="0x7f390a854a30" >
+                            <attributelist id="366" addr="0x7f390a854a30" >
+                                <attribute name="name" value="" id="367" addr="0x7f390a878a10" />
+                                <typetab id="368" addr="0x7f390a854a90" >
+                                    <attributelist id="369" addr="0x7f390a854a90" >
                                     </attributelist >
                                 </typetab >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="370" addr="0x7f8396b08fd0" >
-                            <attributelist id="371" addr="0x7f8396b08fd0" >
+                        <typescopesitem id="370" addr="0x7f390a876fd0" >
+                            <attributelist id="371" addr="0x7f390a876fd0" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="372" addr="0x7f8396afd3b0" >
-                            <attributelist id="373" addr="0x7f8396afd3b0" >
-                                <attribute name="name" value="XBMCAddon" id="374" addr="0x7f8396b0aa10" />
-                                <attribute name="csymtab" value="0x7f8396afd3f0" id="375" addr="0x7f8396afd3f0" />
-                                <attribute name="symtab" value="0x7f8396afd390" id="376" addr="0x7f8396afd390" />
+                        <typescopesitem id="372" addr="0x7f390a86b3b0" >
+                            <attributelist id="373" addr="0x7f390a86b3b0" >
+                                <attribute name="name" value="XBMCAddon" id="374" addr="0x7f390a878a10" />
+                                <attribute name="csymtab" value="0x7f390a86b3f0" id="375" addr="0x7f390a86b3f0" />
+                                <attribute name="symtab" value="0x7f390a86b390" id="376" addr="0x7f390a86b390" />
                             </attributelist >
                         </typescopesitem >
                     </typescope >
-                    <attribute name="symtab" value="0x7f8396afd3b0" id="377" addr="0x7f8396afd3b0" />
-                    <attribute name="sym_symtab" value="0x7f8396ae6950" id="378" addr="0x7f8396ae6950" />
+                    <attribute name="symtab" value="0x7f390a86b3b0" id="377" addr="0x7f390a86b3b0" />
+                    <attribute name="sym_symtab" value="0x7f390a854950" id="378" addr="0x7f390a854950" />
                 </attributelist >
 
-                <namespace id="379" addr="0x7f8396afdb30" >
-                    <attributelist id="380" addr="0x7f8396afdb30" >
-                        <attribute name="sym_name" value="xbmcplugin" id="381" addr="0x7f8396b0aa10" />
-                        <attribute name="name" value="xbmcplugin" id="382" addr="0x7f8396b0aa10" />
-                        <attribute name="feature_knownapitypes" value="XBMCAddon::xbmcgui::ListItem" id="383" addr="0x7f8396b0aa10" />
-                        <typescope id="384" addr="0x7f8396b09290" >
-                            <attributelist id="385" addr="0x7f8396b09290" >
-                                <attribute name="name" value="xbmcplugin" id="386" addr="0x7f8396b0aa10" />
-                                <typetab id="387" addr="0x7f8396b092b0" >
-                                    <attributelist id="388" addr="0x7f8396b092b0" >
+                <namespace id="379" addr="0x7f390a86bb30" >
+                    <attributelist id="380" addr="0x7f390a86bb30" >
+                        <attribute name="sym_name" value="xbmcplugin" id="381" addr="0x7f390a878a10" />
+                        <attribute name="name" value="xbmcplugin" id="382" addr="0x7f390a878a10" />
+                        <attribute name="feature_knownapitypes" value="XBMCAddon::xbmcgui::ListItem" id="383" addr="0x7f390a878a10" />
+                        <typescope id="384" addr="0x7f390a877290" >
+                            <attributelist id="385" addr="0x7f390a877290" >
+                                <attribute name="name" value="xbmcplugin" id="386" addr="0x7f390a878a10" />
+                                <typetab id="387" addr="0x7f390a8772b0" >
+                                    <attributelist id="388" addr="0x7f390a8772b0" >
                                     </attributelist >
                                 </typetab >
-                                <attribute name="parent" value="0x7f8396b08e90" id="389" addr="0x7f8396b08e90" />
-                                <attribute name="qname" value="XBMCAddon::xbmcplugin" id="390" addr="0x7f8396b0aa10" />
-                                <attribute name="symtab" value="0x7f8396afdab0" id="391" addr="0x7f8396afdab0" />
+                                <attribute name="parent" value="0x7f390a876e90" id="389" addr="0x7f390a876e90" />
+                                <attribute name="qname" value="XBMCAddon::xbmcplugin" id="390" addr="0x7f390a878a10" />
+                                <attribute name="symtab" value="0x7f390a86bab0" id="391" addr="0x7f390a86bab0" />
                             </attributelist >
-                            <typescopesitem id="392" addr="0x7f8396afda70" >
-                                <attributelist id="393" addr="0x7f8396afda70" >
+                            <typescopesitem id="392" addr="0x7f390a86ba70" >
+                                <attributelist id="393" addr="0x7f390a86ba70" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="394" addr="0x7f8396b092b0" >
-                                <attributelist id="395" addr="0x7f8396b092b0" >
+                            <typescopesitem id="394" addr="0x7f390a8772b0" >
+                                <attributelist id="395" addr="0x7f390a8772b0" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="396" addr="0x7f8396b08e90" >
-                                <attributelist id="397" addr="0x7f8396b08e90" >
-                                    <attribute name="name" value="XBMCAddon" id="398" addr="0x7f8396b0aa10" />
-                                    <typetab id="399" addr="0x7f8396b08ed0" >
-                                        <attributelist id="400" addr="0x7f8396b08ed0" >
-                                            <attribute name="String" value="std::string" id="401" addr="0x7f8396b0aa10" />
+                            <typescopesitem id="396" addr="0x7f390a876e90" >
+                                <attributelist id="397" addr="0x7f390a876e90" >
+                                    <attribute name="name" value="XBMCAddon" id="398" addr="0x7f390a878a10" />
+                                    <typetab id="399" addr="0x7f390a876ed0" >
+                                        <attributelist id="400" addr="0x7f390a876ed0" >
+                                            <attribute name="String" value="std::string" id="401" addr="0x7f390a878a10" />
                                         </attributelist >
-                                        <typetabsitem id="402" addr="0x7f8396b090b0" >
-                                            <attributelist id="403" addr="0x7f8396b090b0" >
+                                        <typetabsitem id="402" addr="0x7f390a8770b0" >
+                                            <attributelist id="403" addr="0x7f390a8770b0" >
                                             </attributelist >
                                         </typetabsitem >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f8396ae6a30" id="404" addr="0x7f8396ae6a30" />
-                                    <attribute name="qname" value="XBMCAddon" id="405" addr="0x7f8396b0aa10" />
-                                    <attribute name="symtab" value="0x7f8396afd3b0" id="406" addr="0x7f8396afd3b0" />
+                                    <attribute name="parent" value="0x7f390a854a30" id="404" addr="0x7f390a854a30" />
+                                    <attribute name="qname" value="XBMCAddon" id="405" addr="0x7f390a878a10" />
+                                    <attribute name="symtab" value="0x7f390a86b3b0" id="406" addr="0x7f390a86b3b0" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="407" addr="0x7f8396b092d0" >
-                                <attributelist id="408" addr="0x7f8396b092d0" >
+                            <typescopesitem id="407" addr="0x7f390a8772d0" >
+                                <attributelist id="408" addr="0x7f390a8772d0" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="409" addr="0x7f8396afdab0" >
-                                <attributelist id="410" addr="0x7f8396afdab0" >
-                                    <attribute name="name" value="xbmcplugin" id="411" addr="0x7f8396b0aa10" />
-                                    <attribute name="csymtab" value="0x7f8396afdaf0" id="412" addr="0x7f8396afdaf0" />
-                                    <attribute name="symtab" value="0x7f8396afda90" id="413" addr="0x7f8396afda90" />
+                            <typescopesitem id="409" addr="0x7f390a86bab0" >
+                                <attributelist id="410" addr="0x7f390a86bab0" >
+                                    <attribute name="name" value="xbmcplugin" id="411" addr="0x7f390a878a10" />
+                                    <attribute name="csymtab" value="0x7f390a86baf0" id="412" addr="0x7f390a86baf0" />
+                                    <attribute name="symtab" value="0x7f390a86ba90" id="413" addr="0x7f390a86ba90" />
                                 </attributelist >
                             </typescopesitem >
                         </typescope >
-                        <attribute name="symtab" value="0x7f8396afdab0" id="414" addr="0x7f8396afdab0" />
-                        <attribute name="sym_symtab" value="0x7f8396afd3b0" id="415" addr="0x7f8396afd3b0" />
-                        <attribute name="sym_overname" value="__SWIG_0" id="416" addr="0x7f8396b0aa10" />
+                        <attribute name="symtab" value="0x7f390a86bab0" id="414" addr="0x7f390a86bab0" />
+                        <attribute name="sym_symtab" value="0x7f390a86b3b0" id="415" addr="0x7f390a86b3b0" />
+                        <attribute name="sym_overname" value="__SWIG_0" id="416" addr="0x7f390a878a10" />
                     </attributelist >
 
-                    <cdecl id="417" addr="0x7f8396afe2b0" >
-                        <attributelist id="418" addr="0x7f8396afe2b0" >
-                            <attribute name="name" value="XBMCAddon::xbmcplugin::addDirectoryItem" id="419" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="420" addr="0x7f8396afdab0" />
-                            <attribute name="sym_nextSibling" value="0x7f8396afe5b0" id="421" addr="0x7f8396afe5b0" />
-                            <attribute name="csym_nextSibling" value="0x7f8396afe5b0" id="422" addr="0x7f8396afe5b0" />
-                            <attribute name="kind" value="function" id="423" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_name" value="addDirectoryItem" id="424" addr="0x7f8396b0aa10" />
-                            <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem,bool,int)." id="425" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_overloaded" value="0x7f8396afe2b0" id="426" addr="0x7f8396afe2b0" />
-                            <parmlist id="427" addr="0x7f8396afdc90" >
+                    <cdecl id="417" addr="0x7f390a86c2b0" >
+                        <attributelist id="418" addr="0x7f390a86c2b0" >
+                            <attribute name="name" value="XBMCAddon::xbmcplugin::addDirectoryItem" id="419" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="420" addr="0x7f390a86bab0" />
+                            <attribute name="sym_nextSibling" value="0x7f390a86c5b0" id="421" addr="0x7f390a86c5b0" />
+                            <attribute name="csym_nextSibling" value="0x7f390a86c5b0" id="422" addr="0x7f390a86c5b0" />
+                            <attribute name="kind" value="function" id="423" addr="0x7f390a878a10" />
+                            <attribute name="sym_name" value="addDirectoryItem" id="424" addr="0x7f390a878a10" />
+                            <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem,bool,int)." id="425" addr="0x7f390a878a10" />
+                            <attribute name="sym_overloaded" value="0x7f390a86c2b0" id="426" addr="0x7f390a86c2b0" />
+                            <parmlist id="427" addr="0x7f390a86bc90" >
                                 <parm id="428">
-                                    <attributelist id="429" addr="0x7f8396afdc90" >
-                                        <attribute name="name" value="handle" id="430" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="int" id="431" addr="0x7f8396b0aa10" />
+                                    <attributelist id="429" addr="0x7f390a86bc90" >
+                                        <attribute name="name" value="handle" id="430" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="int" id="431" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="432">
-                                    <attributelist id="433" addr="0x7f8396afddd0" >
-                                        <attribute name="name" value="url" id="434" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="435" addr="0x7f8396b0aa10" />
+                                    <attributelist id="433" addr="0x7f390a86bdd0" >
+                                        <attribute name="name" value="url" id="434" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="435" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="436">
-                                    <attributelist id="437" addr="0x7f8396afdf50" >
-                                        <attribute name="name" value="listitem" id="438" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::ListItem" id="439" addr="0x7f8396b0aa10" />
+                                    <attributelist id="437" addr="0x7f390a86bf50" >
+                                        <attribute name="name" value="listitem" id="438" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::ListItem" id="439" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="440">
-                                    <attributelist id="441" addr="0x7f8396afe090" >
-                                        <attribute name="name" value="isFolder" id="442" addr="0x7f8396b0aa10" />
-                                        <attribute name="value" value="false" id="443" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="bool" id="444" addr="0x7f8396b0aa10" />
+                                    <attributelist id="441" addr="0x7f390a86c090" >
+                                        <attribute name="name" value="isFolder" id="442" addr="0x7f390a878a10" />
+                                        <attribute name="value" value="false" id="443" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="bool" id="444" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="445">
-                                    <attributelist id="446" addr="0x7f8396afe1f0" >
-                                        <attribute name="name" value="totalItems" id="447" addr="0x7f8396b0aa10" />
-                                        <attribute name="value" value="0" id="448" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="int" id="449" addr="0x7f8396b0aa10" />
+                                    <attributelist id="446" addr="0x7f390a86c1f0" >
+                                        <attribute name="name" value="totalItems" id="447" addr="0x7f390a878a10" />
+                                        <attribute name="value" value="0" id="448" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="int" id="449" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="type" value="bool" id="450" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="451" addr="0x7f8396b0aa10" />
+                            <attribute name="type" value="bool" id="450" addr="0x7f390a878a10" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="451" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="452" addr="0x7f8396afe5b0" >
-                        <attributelist id="453" addr="0x7f8396afe5b0" >
-                            <attribute name="name" value="XBMCAddon::xbmcplugin::addDirectoryItem" id="454" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="455" addr="0x7f8396afdab0" />
-                            <attribute name="sym_nextSibling" value="0x7f8396afe8b0" id="456" addr="0x7f8396afe8b0" />
-                            <attribute name="csym_nextSibling" value="0x7f8396afe8b0" id="457" addr="0x7f8396afe8b0" />
-                            <attribute name="sym_previousSibling" value="0x7f8396afe2b0" id="458" addr="0x7f8396afe2b0" />
-                            <attribute name="kind" value="function" id="459" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_name" value="addDirectoryItem" id="460" addr="0x7f8396b0aa10" />
-                            <attribute name="defaultargs" value="0x7f8396afe2b0" id="461" addr="0x7f8396afe2b0" />
-                            <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem,bool)." id="462" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_overloaded" value="0x7f8396afe2b0" id="463" addr="0x7f8396afe2b0" />
-                            <parmlist id="464" addr="0x7f8396afe310" >
+                    <cdecl id="452" addr="0x7f390a86c5b0" >
+                        <attributelist id="453" addr="0x7f390a86c5b0" >
+                            <attribute name="name" value="XBMCAddon::xbmcplugin::addDirectoryItem" id="454" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="455" addr="0x7f390a86bab0" />
+                            <attribute name="sym_nextSibling" value="0x7f390a86c8b0" id="456" addr="0x7f390a86c8b0" />
+                            <attribute name="csym_nextSibling" value="0x7f390a86c8b0" id="457" addr="0x7f390a86c8b0" />
+                            <attribute name="sym_previousSibling" value="0x7f390a86c2b0" id="458" addr="0x7f390a86c2b0" />
+                            <attribute name="kind" value="function" id="459" addr="0x7f390a878a10" />
+                            <attribute name="sym_name" value="addDirectoryItem" id="460" addr="0x7f390a878a10" />
+                            <attribute name="defaultargs" value="0x7f390a86c2b0" id="461" addr="0x7f390a86c2b0" />
+                            <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem,bool)." id="462" addr="0x7f390a878a10" />
+                            <attribute name="sym_overloaded" value="0x7f390a86c2b0" id="463" addr="0x7f390a86c2b0" />
+                            <parmlist id="464" addr="0x7f390a86c310" >
                                 <parm id="465">
-                                    <attributelist id="466" addr="0x7f8396afe310" >
-                                        <attribute name="name" value="handle" id="467" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="int" id="468" addr="0x7f8396b0aa10" />
+                                    <attributelist id="466" addr="0x7f390a86c310" >
+                                        <attribute name="name" value="handle" id="467" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="int" id="468" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="469">
-                                    <attributelist id="470" addr="0x7f8396afe3f0" >
-                                        <attribute name="name" value="url" id="471" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="472" addr="0x7f8396b0aa10" />
+                                    <attributelist id="470" addr="0x7f390a86c3f0" >
+                                        <attribute name="name" value="url" id="471" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="472" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="473">
-                                    <attributelist id="474" addr="0x7f8396afe470" >
-                                        <attribute name="name" value="listitem" id="475" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::ListItem" id="476" addr="0x7f8396b0aa10" />
+                                    <attributelist id="474" addr="0x7f390a86c470" >
+                                        <attribute name="name" value="listitem" id="475" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::ListItem" id="476" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="477">
-                                    <attributelist id="478" addr="0x7f8396afe4f0" >
-                                        <attribute name="name" value="isFolder" id="479" addr="0x7f8396b0aa10" />
-                                        <attribute name="value" value="false" id="480" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="bool" id="481" addr="0x7f8396b0aa10" />
+                                    <attributelist id="478" addr="0x7f390a86c4f0" >
+                                        <attribute name="name" value="isFolder" id="479" addr="0x7f390a878a10" />
+                                        <attribute name="value" value="false" id="480" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="bool" id="481" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="type" value="bool" id="482" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_overname" value="__SWIG_1" id="483" addr="0x7f8396b0aa10" />
+                            <attribute name="type" value="bool" id="482" addr="0x7f390a878a10" />
+                            <attribute name="sym_overname" value="__SWIG_1" id="483" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="484" addr="0x7f8396afe8b0" >
-                        <attributelist id="485" addr="0x7f8396afe8b0" >
-                            <attribute name="name" value="XBMCAddon::xbmcplugin::addDirectoryItem" id="486" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="487" addr="0x7f8396afdab0" />
-                            <attribute name="sym_previousSibling" value="0x7f8396afe5b0" id="488" addr="0x7f8396afe5b0" />
-                            <attribute name="kind" value="function" id="489" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_name" value="addDirectoryItem" id="490" addr="0x7f8396b0aa10" />
-                            <attribute name="defaultargs" value="0x7f8396afe2b0" id="491" addr="0x7f8396afe2b0" />
-                            <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)." id="492" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_overloaded" value="0x7f8396afe2b0" id="493" addr="0x7f8396afe2b0" />
-                            <parmlist id="494" addr="0x7f8396afe710" >
+                    <cdecl id="484" addr="0x7f390a86c8b0" >
+                        <attributelist id="485" addr="0x7f390a86c8b0" >
+                            <attribute name="name" value="XBMCAddon::xbmcplugin::addDirectoryItem" id="486" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="487" addr="0x7f390a86bab0" />
+                            <attribute name="sym_previousSibling" value="0x7f390a86c5b0" id="488" addr="0x7f390a86c5b0" />
+                            <attribute name="kind" value="function" id="489" addr="0x7f390a878a10" />
+                            <attribute name="sym_name" value="addDirectoryItem" id="490" addr="0x7f390a878a10" />
+                            <attribute name="defaultargs" value="0x7f390a86c2b0" id="491" addr="0x7f390a86c2b0" />
+                            <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)." id="492" addr="0x7f390a878a10" />
+                            <attribute name="sym_overloaded" value="0x7f390a86c2b0" id="493" addr="0x7f390a86c2b0" />
+                            <parmlist id="494" addr="0x7f390a86c710" >
                                 <parm id="495">
-                                    <attributelist id="496" addr="0x7f8396afe710" >
-                                        <attribute name="name" value="handle" id="497" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="int" id="498" addr="0x7f8396b0aa10" />
+                                    <attributelist id="496" addr="0x7f390a86c710" >
+                                        <attribute name="name" value="handle" id="497" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="int" id="498" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="499">
-                                    <attributelist id="500" addr="0x7f8396afe790" >
-                                        <attribute name="name" value="url" id="501" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="502" addr="0x7f8396b0aa10" />
+                                    <attributelist id="500" addr="0x7f390a86c790" >
+                                        <attribute name="name" value="url" id="501" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="502" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="503">
-                                    <attributelist id="504" addr="0x7f8396afe810" >
-                                        <attribute name="name" value="listitem" id="505" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::ListItem" id="506" addr="0x7f8396b0aa10" />
+                                    <attributelist id="504" addr="0x7f390a86c810" >
+                                        <attribute name="name" value="listitem" id="505" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::ListItem" id="506" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="type" value="bool" id="507" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_overname" value="__SWIG_2" id="508" addr="0x7f8396b0aa10" />
+                            <attribute name="type" value="bool" id="507" addr="0x7f390a878a10" />
+                            <attribute name="sym_overname" value="__SWIG_2" id="508" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="509" addr="0x7f8396aff2b0" >
-                        <attributelist id="510" addr="0x7f8396aff2b0" >
-                            <attribute name="name" value="XBMCAddon::xbmcplugin::addDirectoryItems" id="511" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="512" addr="0x7f8396afdab0" />
-                            <attribute name="sym_nextSibling" value="0x7f8396aff490" id="513" addr="0x7f8396aff490" />
-                            <attribute name="csym_nextSibling" value="0x7f8396aff490" id="514" addr="0x7f8396aff490" />
-                            <attribute name="kind" value="function" id="515" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_name" value="addDirectoryItems" id="516" addr="0x7f8396b0aa10" />
-                            <attribute name="decl" value="f(int,r.q(const).std::vector&lt;(Tuple&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem,bool)>)>,int)." id="517" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_overloaded" value="0x7f8396aff2b0" id="518" addr="0x7f8396aff2b0" />
-                            <parmlist id="519" addr="0x7f8396afea90" >
+                    <cdecl id="509" addr="0x7f390a86d2b0" >
+                        <attributelist id="510" addr="0x7f390a86d2b0" >
+                            <attribute name="name" value="XBMCAddon::xbmcplugin::addDirectoryItems" id="511" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="512" addr="0x7f390a86bab0" />
+                            <attribute name="sym_nextSibling" value="0x7f390a86d490" id="513" addr="0x7f390a86d490" />
+                            <attribute name="csym_nextSibling" value="0x7f390a86d490" id="514" addr="0x7f390a86d490" />
+                            <attribute name="kind" value="function" id="515" addr="0x7f390a878a10" />
+                            <attribute name="sym_name" value="addDirectoryItems" id="516" addr="0x7f390a878a10" />
+                            <attribute name="decl" value="f(int,r.q(const).std::vector&lt;(Tuple&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem,bool)>)>,int)." id="517" addr="0x7f390a878a10" />
+                            <attribute name="sym_overloaded" value="0x7f390a86d2b0" id="518" addr="0x7f390a86d2b0" />
+                            <parmlist id="519" addr="0x7f390a86ca90" >
                                 <parm id="520">
-                                    <attributelist id="521" addr="0x7f8396afea90" >
-                                        <attribute name="name" value="handle" id="522" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="int" id="523" addr="0x7f8396b0aa10" />
+                                    <attributelist id="521" addr="0x7f390a86ca90" >
+                                        <attribute name="name" value="handle" id="522" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="int" id="523" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="524">
-                                    <attributelist id="525" addr="0x7f8396aff1f0" >
-                                        <attribute name="name" value="items" id="526" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="r.q(const).std::vector&lt;(Tuple&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem,bool)>)>" id="527" addr="0x7f8396b0aa10" />
+                                    <attributelist id="525" addr="0x7f390a86d1f0" >
+                                        <attribute name="name" value="items" id="526" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="r.q(const).std::vector&lt;(Tuple&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem,bool)>)>" id="527" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="528">
-                                    <attributelist id="529" addr="0x7f8396aff110" >
-                                        <attribute name="name" value="totalItems" id="530" addr="0x7f8396b0aa10" />
-                                        <attribute name="value" value="0" id="531" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="int" id="532" addr="0x7f8396b0aa10" />
+                                    <attributelist id="529" addr="0x7f390a86d110" >
+                                        <attribute name="name" value="totalItems" id="530" addr="0x7f390a878a10" />
+                                        <attribute name="value" value="0" id="531" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="int" id="532" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="type" value="bool" id="533" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="534" addr="0x7f8396b0aa10" />
+                            <attribute name="type" value="bool" id="533" addr="0x7f390a878a10" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="534" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="535" addr="0x7f8396aff490" >
-                        <attributelist id="536" addr="0x7f8396aff490" >
-                            <attribute name="name" value="XBMCAddon::xbmcplugin::addDirectoryItems" id="537" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="538" addr="0x7f8396afdab0" />
-                            <attribute name="sym_previousSibling" value="0x7f8396aff2b0" id="539" addr="0x7f8396aff2b0" />
-                            <attribute name="kind" value="function" id="540" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_name" value="addDirectoryItems" id="541" addr="0x7f8396b0aa10" />
-                            <attribute name="defaultargs" value="0x7f8396aff2b0" id="542" addr="0x7f8396aff2b0" />
-                            <attribute name="decl" value="f(int,r.q(const).std::vector&lt;(Tuple&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem,bool)>)>)." id="543" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_overloaded" value="0x7f8396aff2b0" id="544" addr="0x7f8396aff2b0" />
-                            <parmlist id="545" addr="0x7f8396aff310" >
+                    <cdecl id="535" addr="0x7f390a86d490" >
+                        <attributelist id="536" addr="0x7f390a86d490" >
+                            <attribute name="name" value="XBMCAddon::xbmcplugin::addDirectoryItems" id="537" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="538" addr="0x7f390a86bab0" />
+                            <attribute name="sym_previousSibling" value="0x7f390a86d2b0" id="539" addr="0x7f390a86d2b0" />
+                            <attribute name="kind" value="function" id="540" addr="0x7f390a878a10" />
+                            <attribute name="sym_name" value="addDirectoryItems" id="541" addr="0x7f390a878a10" />
+                            <attribute name="defaultargs" value="0x7f390a86d2b0" id="542" addr="0x7f390a86d2b0" />
+                            <attribute name="decl" value="f(int,r.q(const).std::vector&lt;(Tuple&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem,bool)>)>)." id="543" addr="0x7f390a878a10" />
+                            <attribute name="sym_overloaded" value="0x7f390a86d2b0" id="544" addr="0x7f390a86d2b0" />
+                            <parmlist id="545" addr="0x7f390a86d310" >
                                 <parm id="546">
-                                    <attributelist id="547" addr="0x7f8396aff310" >
-                                        <attribute name="name" value="handle" id="548" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="int" id="549" addr="0x7f8396b0aa10" />
+                                    <attributelist id="547" addr="0x7f390a86d310" >
+                                        <attribute name="name" value="handle" id="548" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="int" id="549" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="550">
-                                    <attributelist id="551" addr="0x7f8396aff3f0" >
-                                        <attribute name="name" value="items" id="552" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="r.q(const).std::vector&lt;(Tuple&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem,bool)>)>" id="553" addr="0x7f8396b0aa10" />
+                                    <attributelist id="551" addr="0x7f390a86d3f0" >
+                                        <attribute name="name" value="items" id="552" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="r.q(const).std::vector&lt;(Tuple&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem,bool)>)>" id="553" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="type" value="bool" id="554" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_overname" value="__SWIG_1" id="555" addr="0x7f8396b0aa10" />
+                            <attribute name="type" value="bool" id="554" addr="0x7f390a878a10" />
+                            <attribute name="sym_overname" value="__SWIG_1" id="555" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="556" addr="0x7f8396affaf0" >
-                        <attributelist id="557" addr="0x7f8396affaf0" >
-                            <attribute name="name" value="XBMCAddon::xbmcplugin::endOfDirectory" id="558" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="559" addr="0x7f8396afdab0" />
-                            <attribute name="sym_nextSibling" value="0x7f8396affd90" id="560" addr="0x7f8396affd90" />
-                            <attribute name="csym_nextSibling" value="0x7f8396affd90" id="561" addr="0x7f8396affd90" />
-                            <attribute name="kind" value="function" id="562" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_name" value="endOfDirectory" id="563" addr="0x7f8396b0aa10" />
-                            <attribute name="decl" value="f(int,bool,bool,bool)." id="564" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_overloaded" value="0x7f8396affaf0" id="565" addr="0x7f8396affaf0" />
-                            <parmlist id="566" addr="0x7f8396aff670" >
+                    <cdecl id="556" addr="0x7f390a86daf0" >
+                        <attributelist id="557" addr="0x7f390a86daf0" >
+                            <attribute name="name" value="XBMCAddon::xbmcplugin::endOfDirectory" id="558" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="559" addr="0x7f390a86bab0" />
+                            <attribute name="sym_nextSibling" value="0x7f390a86dd90" id="560" addr="0x7f390a86dd90" />
+                            <attribute name="csym_nextSibling" value="0x7f390a86dd90" id="561" addr="0x7f390a86dd90" />
+                            <attribute name="kind" value="function" id="562" addr="0x7f390a878a10" />
+                            <attribute name="sym_name" value="endOfDirectory" id="563" addr="0x7f390a878a10" />
+                            <attribute name="decl" value="f(int,bool,bool,bool)." id="564" addr="0x7f390a878a10" />
+                            <attribute name="sym_overloaded" value="0x7f390a86daf0" id="565" addr="0x7f390a86daf0" />
+                            <parmlist id="566" addr="0x7f390a86d670" >
                                 <parm id="567">
-                                    <attributelist id="568" addr="0x7f8396aff670" >
-                                        <attribute name="name" value="handle" id="569" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="int" id="570" addr="0x7f8396b0aa10" />
+                                    <attributelist id="568" addr="0x7f390a86d670" >
+                                        <attribute name="name" value="handle" id="569" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="int" id="570" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="571">
-                                    <attributelist id="572" addr="0x7f8396aff7b0" >
-                                        <attribute name="name" value="succeeded" id="573" addr="0x7f8396b0aa10" />
-                                        <attribute name="value" value="true" id="574" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="bool" id="575" addr="0x7f8396b0aa10" />
+                                    <attributelist id="572" addr="0x7f390a86d7b0" >
+                                        <attribute name="name" value="succeeded" id="573" addr="0x7f390a878a10" />
+                                        <attribute name="value" value="true" id="574" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="bool" id="575" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="576">
-                                    <attributelist id="577" addr="0x7f8396aff8f0" >
-                                        <attribute name="name" value="updateListing" id="578" addr="0x7f8396b0aa10" />
-                                        <attribute name="value" value="false" id="579" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="bool" id="580" addr="0x7f8396b0aa10" />
+                                    <attributelist id="577" addr="0x7f390a86d8f0" >
+                                        <attribute name="name" value="updateListing" id="578" addr="0x7f390a878a10" />
+                                        <attribute name="value" value="false" id="579" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="bool" id="580" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="581">
-                                    <attributelist id="582" addr="0x7f8396affa30" >
-                                        <attribute name="name" value="cacheToDisc" id="583" addr="0x7f8396b0aa10" />
-                                        <attribute name="value" value="true" id="584" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="bool" id="585" addr="0x7f8396b0aa10" />
+                                    <attributelist id="582" addr="0x7f390a86da30" >
+                                        <attribute name="name" value="cacheToDisc" id="583" addr="0x7f390a878a10" />
+                                        <attribute name="value" value="true" id="584" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="bool" id="585" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="type" value="void" id="586" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="587" addr="0x7f8396b0aa10" />
+                            <attribute name="type" value="void" id="586" addr="0x7f390a878a10" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="587" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="588" addr="0x7f8396affd90" >
-                        <attributelist id="589" addr="0x7f8396affd90" >
-                            <attribute name="name" value="XBMCAddon::xbmcplugin::endOfDirectory" id="590" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="591" addr="0x7f8396afdab0" />
-                            <attribute name="sym_nextSibling" value="0x7f8396afff90" id="592" addr="0x7f8396afff90" />
-                            <attribute name="csym_nextSibling" value="0x7f8396afff90" id="593" addr="0x7f8396afff90" />
-                            <attribute name="sym_previousSibling" value="0x7f8396affaf0" id="594" addr="0x7f8396affaf0" />
-                            <attribute name="kind" value="function" id="595" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_name" value="endOfDirectory" id="596" addr="0x7f8396b0aa10" />
-                            <attribute name="defaultargs" value="0x7f8396affaf0" id="597" addr="0x7f8396affaf0" />
-                            <attribute name="decl" value="f(int,bool,bool)." id="598" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_overloaded" value="0x7f8396affaf0" id="599" addr="0x7f8396affaf0" />
-                            <parmlist id="600" addr="0x7f8396affb50" >
+                    <cdecl id="588" addr="0x7f390a86dd90" >
+                        <attributelist id="589" addr="0x7f390a86dd90" >
+                            <attribute name="name" value="XBMCAddon::xbmcplugin::endOfDirectory" id="590" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="591" addr="0x7f390a86bab0" />
+                            <attribute name="sym_nextSibling" value="0x7f390a86df90" id="592" addr="0x7f390a86df90" />
+                            <attribute name="csym_nextSibling" value="0x7f390a86df90" id="593" addr="0x7f390a86df90" />
+                            <attribute name="sym_previousSibling" value="0x7f390a86daf0" id="594" addr="0x7f390a86daf0" />
+                            <attribute name="kind" value="function" id="595" addr="0x7f390a878a10" />
+                            <attribute name="sym_name" value="endOfDirectory" id="596" addr="0x7f390a878a10" />
+                            <attribute name="defaultargs" value="0x7f390a86daf0" id="597" addr="0x7f390a86daf0" />
+                            <attribute name="decl" value="f(int,bool,bool)." id="598" addr="0x7f390a878a10" />
+                            <attribute name="sym_overloaded" value="0x7f390a86daf0" id="599" addr="0x7f390a86daf0" />
+                            <parmlist id="600" addr="0x7f390a86db50" >
                                 <parm id="601">
-                                    <attributelist id="602" addr="0x7f8396affb50" >
-                                        <attribute name="name" value="handle" id="603" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="int" id="604" addr="0x7f8396b0aa10" />
+                                    <attributelist id="602" addr="0x7f390a86db50" >
+                                        <attribute name="name" value="handle" id="603" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="int" id="604" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="605">
-                                    <attributelist id="606" addr="0x7f8396affc30" >
-                                        <attribute name="name" value="succeeded" id="607" addr="0x7f8396b0aa10" />
-                                        <attribute name="value" value="true" id="608" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="bool" id="609" addr="0x7f8396b0aa10" />
+                                    <attributelist id="606" addr="0x7f390a86dc30" >
+                                        <attribute name="name" value="succeeded" id="607" addr="0x7f390a878a10" />
+                                        <attribute name="value" value="true" id="608" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="bool" id="609" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="610">
-                                    <attributelist id="611" addr="0x7f8396affcd0" >
-                                        <attribute name="name" value="updateListing" id="612" addr="0x7f8396b0aa10" />
-                                        <attribute name="value" value="false" id="613" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="bool" id="614" addr="0x7f8396b0aa10" />
+                                    <attributelist id="611" addr="0x7f390a86dcd0" >
+                                        <attribute name="name" value="updateListing" id="612" addr="0x7f390a878a10" />
+                                        <attribute name="value" value="false" id="613" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="bool" id="614" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="type" value="void" id="615" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_overname" value="__SWIG_1" id="616" addr="0x7f8396b0aa10" />
+                            <attribute name="type" value="void" id="615" addr="0x7f390a878a10" />
+                            <attribute name="sym_overname" value="__SWIG_1" id="616" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="617" addr="0x7f8396afff90" >
-                        <attributelist id="618" addr="0x7f8396afff90" >
-                            <attribute name="name" value="XBMCAddon::xbmcplugin::endOfDirectory" id="619" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="620" addr="0x7f8396afdab0" />
-                            <attribute name="sym_nextSibling" value="0x7f8396b000f0" id="621" addr="0x7f8396b000f0" />
-                            <attribute name="csym_nextSibling" value="0x7f8396b000f0" id="622" addr="0x7f8396b000f0" />
-                            <attribute name="sym_previousSibling" value="0x7f8396affd90" id="623" addr="0x7f8396affd90" />
-                            <attribute name="kind" value="function" id="624" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_name" value="endOfDirectory" id="625" addr="0x7f8396b0aa10" />
-                            <attribute name="defaultargs" value="0x7f8396affaf0" id="626" addr="0x7f8396affaf0" />
-                            <attribute name="decl" value="f(int,bool)." id="627" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_overloaded" value="0x7f8396affaf0" id="628" addr="0x7f8396affaf0" />
-                            <parmlist id="629" addr="0x7f8396affdf0" >
+                    <cdecl id="617" addr="0x7f390a86df90" >
+                        <attributelist id="618" addr="0x7f390a86df90" >
+                            <attribute name="name" value="XBMCAddon::xbmcplugin::endOfDirectory" id="619" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="620" addr="0x7f390a86bab0" />
+                            <attribute name="sym_nextSibling" value="0x7f390a86e0f0" id="621" addr="0x7f390a86e0f0" />
+                            <attribute name="csym_nextSibling" value="0x7f390a86e0f0" id="622" addr="0x7f390a86e0f0" />
+                            <attribute name="sym_previousSibling" value="0x7f390a86dd90" id="623" addr="0x7f390a86dd90" />
+                            <attribute name="kind" value="function" id="624" addr="0x7f390a878a10" />
+                            <attribute name="sym_name" value="endOfDirectory" id="625" addr="0x7f390a878a10" />
+                            <attribute name="defaultargs" value="0x7f390a86daf0" id="626" addr="0x7f390a86daf0" />
+                            <attribute name="decl" value="f(int,bool)." id="627" addr="0x7f390a878a10" />
+                            <attribute name="sym_overloaded" value="0x7f390a86daf0" id="628" addr="0x7f390a86daf0" />
+                            <parmlist id="629" addr="0x7f390a86ddf0" >
                                 <parm id="630">
-                                    <attributelist id="631" addr="0x7f8396affdf0" >
-                                        <attribute name="name" value="handle" id="632" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="int" id="633" addr="0x7f8396b0aa10" />
+                                    <attributelist id="631" addr="0x7f390a86ddf0" >
+                                        <attribute name="name" value="handle" id="632" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="int" id="633" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="634">
-                                    <attributelist id="635" addr="0x7f8396affed0" >
-                                        <attribute name="name" value="succeeded" id="636" addr="0x7f8396b0aa10" />
-                                        <attribute name="value" value="true" id="637" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="bool" id="638" addr="0x7f8396b0aa10" />
+                                    <attributelist id="635" addr="0x7f390a86ded0" >
+                                        <attribute name="name" value="succeeded" id="636" addr="0x7f390a878a10" />
+                                        <attribute name="value" value="true" id="637" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="bool" id="638" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="type" value="void" id="639" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_overname" value="__SWIG_2" id="640" addr="0x7f8396b0aa10" />
+                            <attribute name="type" value="void" id="639" addr="0x7f390a878a10" />
+                            <attribute name="sym_overname" value="__SWIG_2" id="640" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="641" addr="0x7f8396b000f0" >
-                        <attributelist id="642" addr="0x7f8396b000f0" >
-                            <attribute name="name" value="XBMCAddon::xbmcplugin::endOfDirectory" id="643" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="644" addr="0x7f8396afdab0" />
-                            <attribute name="sym_previousSibling" value="0x7f8396afff90" id="645" addr="0x7f8396afff90" />
-                            <attribute name="kind" value="function" id="646" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_name" value="endOfDirectory" id="647" addr="0x7f8396b0aa10" />
-                            <attribute name="defaultargs" value="0x7f8396affaf0" id="648" addr="0x7f8396affaf0" />
-                            <attribute name="decl" value="f(int)." id="649" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_overloaded" value="0x7f8396affaf0" id="650" addr="0x7f8396affaf0" />
-                            <parmlist id="651" addr="0x7f8396affff0" >
+                    <cdecl id="641" addr="0x7f390a86e0f0" >
+                        <attributelist id="642" addr="0x7f390a86e0f0" >
+                            <attribute name="name" value="XBMCAddon::xbmcplugin::endOfDirectory" id="643" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="644" addr="0x7f390a86bab0" />
+                            <attribute name="sym_previousSibling" value="0x7f390a86df90" id="645" addr="0x7f390a86df90" />
+                            <attribute name="kind" value="function" id="646" addr="0x7f390a878a10" />
+                            <attribute name="sym_name" value="endOfDirectory" id="647" addr="0x7f390a878a10" />
+                            <attribute name="defaultargs" value="0x7f390a86daf0" id="648" addr="0x7f390a86daf0" />
+                            <attribute name="decl" value="f(int)." id="649" addr="0x7f390a878a10" />
+                            <attribute name="sym_overloaded" value="0x7f390a86daf0" id="650" addr="0x7f390a86daf0" />
+                            <parmlist id="651" addr="0x7f390a86dff0" >
                                 <parm id="652">
-                                    <attributelist id="653" addr="0x7f8396affff0" >
-                                        <attribute name="name" value="handle" id="654" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="int" id="655" addr="0x7f8396b0aa10" />
+                                    <attributelist id="653" addr="0x7f390a86dff0" >
+                                        <attribute name="name" value="handle" id="654" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="int" id="655" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="type" value="void" id="656" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_overname" value="__SWIG_3" id="657" addr="0x7f8396b0aa10" />
+                            <attribute name="type" value="void" id="656" addr="0x7f390a878a10" />
+                            <attribute name="sym_overname" value="__SWIG_3" id="657" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="658" addr="0x7f8396b00610" >
-                        <attributelist id="659" addr="0x7f8396b00610" >
-                            <attribute name="sym_name" value="setResolvedUrl" id="660" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="XBMCAddon::xbmcplugin::setResolvedUrl" id="661" addr="0x7f8396b0aa10" />
-                            <attribute name="decl" value="f(int,bool,p.q(const).XBMCAddon::xbmcgui::ListItem)." id="662" addr="0x7f8396b0aa10" />
-                            <parmlist id="663" addr="0x7f8396b002d0" >
+                    <cdecl id="658" addr="0x7f390a86e610" >
+                        <attributelist id="659" addr="0x7f390a86e610" >
+                            <attribute name="sym_name" value="setResolvedUrl" id="660" addr="0x7f390a878a10" />
+                            <attribute name="name" value="XBMCAddon::xbmcplugin::setResolvedUrl" id="661" addr="0x7f390a878a10" />
+                            <attribute name="decl" value="f(int,bool,p.q(const).XBMCAddon::xbmcgui::ListItem)." id="662" addr="0x7f390a878a10" />
+                            <parmlist id="663" addr="0x7f390a86e2d0" >
                                 <parm id="664">
-                                    <attributelist id="665" addr="0x7f8396b002d0" >
-                                        <attribute name="name" value="handle" id="666" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="int" id="667" addr="0x7f8396b0aa10" />
+                                    <attributelist id="665" addr="0x7f390a86e2d0" >
+                                        <attribute name="name" value="handle" id="666" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="int" id="667" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="668">
-                                    <attributelist id="669" addr="0x7f8396b003d0" >
-                                        <attribute name="name" value="succeeded" id="670" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="bool" id="671" addr="0x7f8396b0aa10" />
+                                    <attributelist id="669" addr="0x7f390a86e3d0" >
+                                        <attribute name="name" value="succeeded" id="670" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="bool" id="671" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="672">
-                                    <attributelist id="673" addr="0x7f8396b00550" >
-                                        <attribute name="name" value="listitem" id="674" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::ListItem" id="675" addr="0x7f8396b0aa10" />
+                                    <attributelist id="673" addr="0x7f390a86e550" >
+                                        <attribute name="name" value="listitem" id="674" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::ListItem" id="675" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="kind" value="function" id="676" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="void" id="677" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="678" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="679" addr="0x7f8396b0aa10" />
+                            <attribute name="kind" value="function" id="676" addr="0x7f390a878a10" />
+                            <attribute name="type" value="void" id="677" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="678" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="679" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="680" addr="0x7f8396b00b70" >
-                        <attributelist id="681" addr="0x7f8396b00b70" >
-                            <attribute name="name" value="XBMCAddon::xbmcplugin::addSortMethod" id="682" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="683" addr="0x7f8396afdab0" />
-                            <attribute name="sym_nextSibling" value="0x7f8396b00d50" id="684" addr="0x7f8396b00d50" />
-                            <attribute name="csym_nextSibling" value="0x7f8396b00d50" id="685" addr="0x7f8396b00d50" />
-                            <attribute name="kind" value="function" id="686" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_name" value="addSortMethod" id="687" addr="0x7f8396b0aa10" />
-                            <attribute name="decl" value="f(int,int,r.q(const).XBMCAddon::String)." id="688" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_overloaded" value="0x7f8396b00b70" id="689" addr="0x7f8396b00b70" />
-                            <parmlist id="690" addr="0x7f8396b007f0" >
+                    <cdecl id="680" addr="0x7f390a86eb70" >
+                        <attributelist id="681" addr="0x7f390a86eb70" >
+                            <attribute name="name" value="XBMCAddon::xbmcplugin::addSortMethod" id="682" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="683" addr="0x7f390a86bab0" />
+                            <attribute name="sym_nextSibling" value="0x7f390a86ed50" id="684" addr="0x7f390a86ed50" />
+                            <attribute name="csym_nextSibling" value="0x7f390a86ed50" id="685" addr="0x7f390a86ed50" />
+                            <attribute name="kind" value="function" id="686" addr="0x7f390a878a10" />
+                            <attribute name="sym_name" value="addSortMethod" id="687" addr="0x7f390a878a10" />
+                            <attribute name="decl" value="f(int,int,r.q(const).XBMCAddon::String)." id="688" addr="0x7f390a878a10" />
+                            <attribute name="sym_overloaded" value="0x7f390a86eb70" id="689" addr="0x7f390a86eb70" />
+                            <parmlist id="690" addr="0x7f390a86e7f0" >
                                 <parm id="691">
-                                    <attributelist id="692" addr="0x7f8396b007f0" >
-                                        <attribute name="name" value="handle" id="693" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="int" id="694" addr="0x7f8396b0aa10" />
+                                    <attributelist id="692" addr="0x7f390a86e7f0" >
+                                        <attribute name="name" value="handle" id="693" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="int" id="694" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="695">
-                                    <attributelist id="696" addr="0x7f8396b00910" >
-                                        <attribute name="name" value="sortMethod" id="697" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="int" id="698" addr="0x7f8396b0aa10" />
+                                    <attributelist id="696" addr="0x7f390a86e910" >
+                                        <attribute name="name" value="sortMethod" id="697" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="int" id="698" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="699">
-                                    <attributelist id="700" addr="0x7f8396b00ab0" >
-                                        <attribute name="name" value="label2Mask" id="701" addr="0x7f8396b0aa10" />
-                                        <attribute name="value" value="XBMCAddon::emptyString" id="702" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="703" addr="0x7f8396b0aa10" />
+                                    <attributelist id="700" addr="0x7f390a86eab0" >
+                                        <attribute name="name" value="label2Mask" id="701" addr="0x7f390a878a10" />
+                                        <attribute name="value" value="XBMCAddon::emptyString" id="702" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="703" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="type" value="void" id="704" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="705" addr="0x7f8396b0aa10" />
+                            <attribute name="type" value="void" id="704" addr="0x7f390a878a10" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="705" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="706" addr="0x7f8396b00d50" >
-                        <attributelist id="707" addr="0x7f8396b00d50" >
-                            <attribute name="name" value="XBMCAddon::xbmcplugin::addSortMethod" id="708" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="709" addr="0x7f8396afdab0" />
-                            <attribute name="sym_previousSibling" value="0x7f8396b00b70" id="710" addr="0x7f8396b00b70" />
-                            <attribute name="kind" value="function" id="711" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_name" value="addSortMethod" id="712" addr="0x7f8396b0aa10" />
-                            <attribute name="defaultargs" value="0x7f8396b00b70" id="713" addr="0x7f8396b00b70" />
-                            <attribute name="decl" value="f(int,int)." id="714" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_overloaded" value="0x7f8396b00b70" id="715" addr="0x7f8396b00b70" />
-                            <parmlist id="716" addr="0x7f8396b00bd0" >
+                    <cdecl id="706" addr="0x7f390a86ed50" >
+                        <attributelist id="707" addr="0x7f390a86ed50" >
+                            <attribute name="name" value="XBMCAddon::xbmcplugin::addSortMethod" id="708" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="709" addr="0x7f390a86bab0" />
+                            <attribute name="sym_previousSibling" value="0x7f390a86eb70" id="710" addr="0x7f390a86eb70" />
+                            <attribute name="kind" value="function" id="711" addr="0x7f390a878a10" />
+                            <attribute name="sym_name" value="addSortMethod" id="712" addr="0x7f390a878a10" />
+                            <attribute name="defaultargs" value="0x7f390a86eb70" id="713" addr="0x7f390a86eb70" />
+                            <attribute name="decl" value="f(int,int)." id="714" addr="0x7f390a878a10" />
+                            <attribute name="sym_overloaded" value="0x7f390a86eb70" id="715" addr="0x7f390a86eb70" />
+                            <parmlist id="716" addr="0x7f390a86ebd0" >
                                 <parm id="717">
-                                    <attributelist id="718" addr="0x7f8396b00bd0" >
-                                        <attribute name="name" value="handle" id="719" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="int" id="720" addr="0x7f8396b0aa10" />
+                                    <attributelist id="718" addr="0x7f390a86ebd0" >
+                                        <attribute name="name" value="handle" id="719" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="int" id="720" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="721">
-                                    <attributelist id="722" addr="0x7f8396b00cb0" >
-                                        <attribute name="name" value="sortMethod" id="723" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="int" id="724" addr="0x7f8396b0aa10" />
+                                    <attributelist id="722" addr="0x7f390a86ecb0" >
+                                        <attribute name="name" value="sortMethod" id="723" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="int" id="724" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="type" value="void" id="725" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_overname" value="__SWIG_1" id="726" addr="0x7f8396b0aa10" />
+                            <attribute name="type" value="void" id="725" addr="0x7f390a878a10" />
+                            <attribute name="sym_overname" value="__SWIG_1" id="726" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="727" addr="0x7f8396b01150" >
-                        <attributelist id="728" addr="0x7f8396b01150" >
-                            <attribute name="sym_name" value="getSetting" id="729" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="XBMCAddon::xbmcplugin::getSetting" id="730" addr="0x7f8396b0aa10" />
-                            <attribute name="decl" value="f(int,p.q(const).char)." id="731" addr="0x7f8396b0aa10" />
-                            <parmlist id="732" addr="0x7f8396b00f50" >
+                    <cdecl id="727" addr="0x7f390a86f150" >
+                        <attributelist id="728" addr="0x7f390a86f150" >
+                            <attribute name="sym_name" value="getSetting" id="729" addr="0x7f390a878a10" />
+                            <attribute name="name" value="XBMCAddon::xbmcplugin::getSetting" id="730" addr="0x7f390a878a10" />
+                            <attribute name="decl" value="f(int,p.q(const).char)." id="731" addr="0x7f390a878a10" />
+                            <parmlist id="732" addr="0x7f390a86ef50" >
                                 <parm id="733">
-                                    <attributelist id="734" addr="0x7f8396b00f50" >
-                                        <attribute name="name" value="handle" id="735" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="int" id="736" addr="0x7f8396b0aa10" />
+                                    <attributelist id="734" addr="0x7f390a86ef50" >
+                                        <attribute name="name" value="handle" id="735" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="int" id="736" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="737">
-                                    <attributelist id="738" addr="0x7f8396b01090" >
-                                        <attribute name="name" value="id" id="739" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="p.q(const).char" id="740" addr="0x7f8396b0aa10" />
+                                    <attributelist id="738" addr="0x7f390a86f090" >
+                                        <attribute name="name" value="id" id="739" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="p.q(const).char" id="740" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="kind" value="function" id="741" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="XBMCAddon::String" id="742" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="743" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="744" addr="0x7f8396b0aa10" />
+                            <attribute name="kind" value="function" id="741" addr="0x7f390a878a10" />
+                            <attribute name="type" value="XBMCAddon::String" id="742" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="743" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="744" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="745" addr="0x7f8396b01670" >
-                        <attributelist id="746" addr="0x7f8396b01670" >
-                            <attribute name="sym_name" value="setSetting" id="747" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="XBMCAddon::xbmcplugin::setSetting" id="748" addr="0x7f8396b0aa10" />
-                            <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="749" addr="0x7f8396b0aa10" />
-                            <parmlist id="750" addr="0x7f8396b01330" >
+                    <cdecl id="745" addr="0x7f390a86f670" >
+                        <attributelist id="746" addr="0x7f390a86f670" >
+                            <attribute name="sym_name" value="setSetting" id="747" addr="0x7f390a878a10" />
+                            <attribute name="name" value="XBMCAddon::xbmcplugin::setSetting" id="748" addr="0x7f390a878a10" />
+                            <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="749" addr="0x7f390a878a10" />
+                            <parmlist id="750" addr="0x7f390a86f330" >
                                 <parm id="751">
-                                    <attributelist id="752" addr="0x7f8396b01330" >
-                                        <attribute name="name" value="handle" id="753" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="int" id="754" addr="0x7f8396b0aa10" />
+                                    <attributelist id="752" addr="0x7f390a86f330" >
+                                        <attribute name="name" value="handle" id="753" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="int" id="754" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="755">
-                                    <attributelist id="756" addr="0x7f8396b01470" >
-                                        <attribute name="name" value="id" id="757" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="758" addr="0x7f8396b0aa10" />
+                                    <attributelist id="756" addr="0x7f390a86f470" >
+                                        <attribute name="name" value="id" id="757" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="758" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="759">
-                                    <attributelist id="760" addr="0x7f8396b015b0" >
-                                        <attribute name="name" value="value" id="761" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="762" addr="0x7f8396b0aa10" />
+                                    <attributelist id="760" addr="0x7f390a86f5b0" >
+                                        <attribute name="name" value="value" id="761" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="762" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="kind" value="function" id="763" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="void" id="764" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="765" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="766" addr="0x7f8396b0aa10" />
+                            <attribute name="kind" value="function" id="763" addr="0x7f390a878a10" />
+                            <attribute name="type" value="void" id="764" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="765" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="766" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="767" addr="0x7f8396b01a50" >
-                        <attributelist id="768" addr="0x7f8396b01a50" >
-                            <attribute name="sym_name" value="setContent" id="769" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="XBMCAddon::xbmcplugin::setContent" id="770" addr="0x7f8396b0aa10" />
-                            <attribute name="decl" value="f(int,p.q(const).char)." id="771" addr="0x7f8396b0aa10" />
-                            <parmlist id="772" addr="0x7f8396b01850" >
+                    <cdecl id="767" addr="0x7f390a86fa50" >
+                        <attributelist id="768" addr="0x7f390a86fa50" >
+                            <attribute name="sym_name" value="setContent" id="769" addr="0x7f390a878a10" />
+                            <attribute name="name" value="XBMCAddon::xbmcplugin::setContent" id="770" addr="0x7f390a878a10" />
+                            <attribute name="decl" value="f(int,p.q(const).char)." id="771" addr="0x7f390a878a10" />
+                            <parmlist id="772" addr="0x7f390a86f850" >
                                 <parm id="773">
-                                    <attributelist id="774" addr="0x7f8396b01850" >
-                                        <attribute name="name" value="handle" id="775" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="int" id="776" addr="0x7f8396b0aa10" />
+                                    <attributelist id="774" addr="0x7f390a86f850" >
+                                        <attribute name="name" value="handle" id="775" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="int" id="776" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="777">
-                                    <attributelist id="778" addr="0x7f8396b01990" >
-                                        <attribute name="name" value="content" id="779" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="p.q(const).char" id="780" addr="0x7f8396b0aa10" />
+                                    <attributelist id="778" addr="0x7f390a86f990" >
+                                        <attribute name="name" value="content" id="779" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="p.q(const).char" id="780" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="kind" value="function" id="781" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="void" id="782" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="783" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="784" addr="0x7f8396b0aa10" />
+                            <attribute name="kind" value="function" id="781" addr="0x7f390a878a10" />
+                            <attribute name="type" value="void" id="782" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="783" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="784" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="785" addr="0x7f8396b01e30" >
-                        <attributelist id="786" addr="0x7f8396b01e30" >
-                            <attribute name="sym_name" value="setPluginCategory" id="787" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="XBMCAddon::xbmcplugin::setPluginCategory" id="788" addr="0x7f8396b0aa10" />
-                            <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String)." id="789" addr="0x7f8396b0aa10" />
-                            <parmlist id="790" addr="0x7f8396b01c30" >
+                    <cdecl id="785" addr="0x7f390a86fe30" >
+                        <attributelist id="786" addr="0x7f390a86fe30" >
+                            <attribute name="sym_name" value="setPluginCategory" id="787" addr="0x7f390a878a10" />
+                            <attribute name="name" value="XBMCAddon::xbmcplugin::setPluginCategory" id="788" addr="0x7f390a878a10" />
+                            <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String)." id="789" addr="0x7f390a878a10" />
+                            <parmlist id="790" addr="0x7f390a86fc30" >
                                 <parm id="791">
-                                    <attributelist id="792" addr="0x7f8396b01c30" >
-                                        <attribute name="name" value="handle" id="793" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="int" id="794" addr="0x7f8396b0aa10" />
+                                    <attributelist id="792" addr="0x7f390a86fc30" >
+                                        <attribute name="name" value="handle" id="793" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="int" id="794" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="795">
-                                    <attributelist id="796" addr="0x7f8396b01d70" >
-                                        <attribute name="name" value="category" id="797" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="798" addr="0x7f8396b0aa10" />
+                                    <attributelist id="796" addr="0x7f390a86fd70" >
+                                        <attribute name="name" value="category" id="797" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="798" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="kind" value="function" id="799" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="void" id="800" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="801" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="802" addr="0x7f8396b0aa10" />
+                            <attribute name="kind" value="function" id="799" addr="0x7f390a878a10" />
+                            <attribute name="type" value="void" id="800" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="801" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="802" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="803" addr="0x7f8396b02750" >
-                        <attributelist id="804" addr="0x7f8396b02750" >
-                            <attribute name="name" value="XBMCAddon::xbmcplugin::setPluginFanart" id="805" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="806" addr="0x7f8396afdab0" />
-                            <attribute name="sym_nextSibling" value="0x7f8396b02a90" id="807" addr="0x7f8396b02a90" />
-                            <attribute name="csym_nextSibling" value="0x7f8396b02a90" id="808" addr="0x7f8396b02a90" />
-                            <attribute name="kind" value="function" id="809" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_name" value="setPluginFanart" id="810" addr="0x7f8396b0aa10" />
-                            <attribute name="decl" value="f(int,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char)." id="811" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_overloaded" value="0x7f8396b02750" id="812" addr="0x7f8396b02750" />
-                            <parmlist id="813" addr="0x7f8396b02010" >
+                    <cdecl id="803" addr="0x7f390a870750" >
+                        <attributelist id="804" addr="0x7f390a870750" >
+                            <attribute name="name" value="XBMCAddon::xbmcplugin::setPluginFanart" id="805" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="806" addr="0x7f390a86bab0" />
+                            <attribute name="sym_nextSibling" value="0x7f390a870a90" id="807" addr="0x7f390a870a90" />
+                            <attribute name="csym_nextSibling" value="0x7f390a870a90" id="808" addr="0x7f390a870a90" />
+                            <attribute name="kind" value="function" id="809" addr="0x7f390a878a10" />
+                            <attribute name="sym_name" value="setPluginFanart" id="810" addr="0x7f390a878a10" />
+                            <attribute name="decl" value="f(int,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char)." id="811" addr="0x7f390a878a10" />
+                            <attribute name="sym_overloaded" value="0x7f390a870750" id="812" addr="0x7f390a870750" />
+                            <parmlist id="813" addr="0x7f390a870010" >
                                 <parm id="814">
-                                    <attributelist id="815" addr="0x7f8396b02010" >
-                                        <attribute name="name" value="handle" id="816" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="int" id="817" addr="0x7f8396b0aa10" />
+                                    <attributelist id="815" addr="0x7f390a870010" >
+                                        <attribute name="name" value="handle" id="816" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="int" id="817" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="818">
-                                    <attributelist id="819" addr="0x7f8396b021b0" >
-                                        <attribute name="name" value="image" id="820" addr="0x7f8396b0aa10" />
-                                        <attribute name="value" value="NULL" id="821" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="p.q(const).char" id="822" addr="0x7f8396b0aa10" />
+                                    <attributelist id="819" addr="0x7f390a8701b0" >
+                                        <attribute name="name" value="image" id="820" addr="0x7f390a878a10" />
+                                        <attribute name="value" value="NULL" id="821" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="p.q(const).char" id="822" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="823">
-                                    <attributelist id="824" addr="0x7f8396b02350" >
-                                        <attribute name="name" value="color1" id="825" addr="0x7f8396b0aa10" />
-                                        <attribute name="value" value="NULL" id="826" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="p.q(const).char" id="827" addr="0x7f8396b0aa10" />
+                                    <attributelist id="824" addr="0x7f390a870350" >
+                                        <attribute name="name" value="color1" id="825" addr="0x7f390a878a10" />
+                                        <attribute name="value" value="NULL" id="826" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="p.q(const).char" id="827" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="828">
-                                    <attributelist id="829" addr="0x7f8396b024f0" >
-                                        <attribute name="name" value="color2" id="830" addr="0x7f8396b0aa10" />
-                                        <attribute name="value" value="NULL" id="831" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="p.q(const).char" id="832" addr="0x7f8396b0aa10" />
+                                    <attributelist id="829" addr="0x7f390a8704f0" >
+                                        <attribute name="name" value="color2" id="830" addr="0x7f390a878a10" />
+                                        <attribute name="value" value="NULL" id="831" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="p.q(const).char" id="832" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="833">
-                                    <attributelist id="834" addr="0x7f8396b02690" >
-                                        <attribute name="name" value="color3" id="835" addr="0x7f8396b0aa10" />
-                                        <attribute name="value" value="NULL" id="836" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="p.q(const).char" id="837" addr="0x7f8396b0aa10" />
+                                    <attributelist id="834" addr="0x7f390a870690" >
+                                        <attribute name="name" value="color3" id="835" addr="0x7f390a878a10" />
+                                        <attribute name="value" value="NULL" id="836" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="p.q(const).char" id="837" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="type" value="void" id="838" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="839" addr="0x7f8396b0aa10" />
+                            <attribute name="type" value="void" id="838" addr="0x7f390a878a10" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="839" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="840" addr="0x7f8396b02a90" >
-                        <attributelist id="841" addr="0x7f8396b02a90" >
-                            <attribute name="name" value="XBMCAddon::xbmcplugin::setPluginFanart" id="842" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="843" addr="0x7f8396afdab0" />
-                            <attribute name="sym_nextSibling" value="0x7f8396b02d30" id="844" addr="0x7f8396b02d30" />
-                            <attribute name="csym_nextSibling" value="0x7f8396b02d30" id="845" addr="0x7f8396b02d30" />
-                            <attribute name="sym_previousSibling" value="0x7f8396b02750" id="846" addr="0x7f8396b02750" />
-                            <attribute name="kind" value="function" id="847" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_name" value="setPluginFanart" id="848" addr="0x7f8396b0aa10" />
-                            <attribute name="defaultargs" value="0x7f8396b02750" id="849" addr="0x7f8396b02750" />
-                            <attribute name="decl" value="f(int,p.q(const).char,p.q(const).char,p.q(const).char)." id="850" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_overloaded" value="0x7f8396b02750" id="851" addr="0x7f8396b02750" />
-                            <parmlist id="852" addr="0x7f8396b027b0" >
+                    <cdecl id="840" addr="0x7f390a870a90" >
+                        <attributelist id="841" addr="0x7f390a870a90" >
+                            <attribute name="name" value="XBMCAddon::xbmcplugin::setPluginFanart" id="842" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="843" addr="0x7f390a86bab0" />
+                            <attribute name="sym_nextSibling" value="0x7f390a870d30" id="844" addr="0x7f390a870d30" />
+                            <attribute name="csym_nextSibling" value="0x7f390a870d30" id="845" addr="0x7f390a870d30" />
+                            <attribute name="sym_previousSibling" value="0x7f390a870750" id="846" addr="0x7f390a870750" />
+                            <attribute name="kind" value="function" id="847" addr="0x7f390a878a10" />
+                            <attribute name="sym_name" value="setPluginFanart" id="848" addr="0x7f390a878a10" />
+                            <attribute name="defaultargs" value="0x7f390a870750" id="849" addr="0x7f390a870750" />
+                            <attribute name="decl" value="f(int,p.q(const).char,p.q(const).char,p.q(const).char)." id="850" addr="0x7f390a878a10" />
+                            <attribute name="sym_overloaded" value="0x7f390a870750" id="851" addr="0x7f390a870750" />
+                            <parmlist id="852" addr="0x7f390a8707b0" >
                                 <parm id="853">
-                                    <attributelist id="854" addr="0x7f8396b027b0" >
-                                        <attribute name="name" value="handle" id="855" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="int" id="856" addr="0x7f8396b0aa10" />
+                                    <attributelist id="854" addr="0x7f390a8707b0" >
+                                        <attribute name="name" value="handle" id="855" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="int" id="856" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="857">
-                                    <attributelist id="858" addr="0x7f8396b02890" >
-                                        <attribute name="name" value="image" id="859" addr="0x7f8396b0aa10" />
-                                        <attribute name="value" value="NULL" id="860" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="p.q(const).char" id="861" addr="0x7f8396b0aa10" />
+                                    <attributelist id="858" addr="0x7f390a870890" >
+                                        <attribute name="name" value="image" id="859" addr="0x7f390a878a10" />
+                                        <attribute name="value" value="NULL" id="860" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="p.q(const).char" id="861" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="862">
-                                    <attributelist id="863" addr="0x7f8396b02930" >
-                                        <attribute name="name" value="color1" id="864" addr="0x7f8396b0aa10" />
-                                        <attribute name="value" value="NULL" id="865" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="p.q(const).char" id="866" addr="0x7f8396b0aa10" />
+                                    <attributelist id="863" addr="0x7f390a870930" >
+                                        <attribute name="name" value="color1" id="864" addr="0x7f390a878a10" />
+                                        <attribute name="value" value="NULL" id="865" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="p.q(const).char" id="866" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="867">
-                                    <attributelist id="868" addr="0x7f8396b029d0" >
-                                        <attribute name="name" value="color2" id="869" addr="0x7f8396b0aa10" />
-                                        <attribute name="value" value="NULL" id="870" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="p.q(const).char" id="871" addr="0x7f8396b0aa10" />
+                                    <attributelist id="868" addr="0x7f390a8709d0" >
+                                        <attribute name="name" value="color2" id="869" addr="0x7f390a878a10" />
+                                        <attribute name="value" value="NULL" id="870" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="p.q(const).char" id="871" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="type" value="void" id="872" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_overname" value="__SWIG_1" id="873" addr="0x7f8396b0aa10" />
+                            <attribute name="type" value="void" id="872" addr="0x7f390a878a10" />
+                            <attribute name="sym_overname" value="__SWIG_1" id="873" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="874" addr="0x7f8396b02d30" >
-                        <attributelist id="875" addr="0x7f8396b02d30" >
-                            <attribute name="name" value="XBMCAddon::xbmcplugin::setPluginFanart" id="876" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="877" addr="0x7f8396afdab0" />
-                            <attribute name="sym_nextSibling" value="0x7f8396b02f30" id="878" addr="0x7f8396b02f30" />
-                            <attribute name="csym_nextSibling" value="0x7f8396b02f30" id="879" addr="0x7f8396b02f30" />
-                            <attribute name="sym_previousSibling" value="0x7f8396b02a90" id="880" addr="0x7f8396b02a90" />
-                            <attribute name="kind" value="function" id="881" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_name" value="setPluginFanart" id="882" addr="0x7f8396b0aa10" />
-                            <attribute name="defaultargs" value="0x7f8396b02750" id="883" addr="0x7f8396b02750" />
-                            <attribute name="decl" value="f(int,p.q(const).char,p.q(const).char)." id="884" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_overloaded" value="0x7f8396b02750" id="885" addr="0x7f8396b02750" />
-                            <parmlist id="886" addr="0x7f8396b02af0" >
+                    <cdecl id="874" addr="0x7f390a870d30" >
+                        <attributelist id="875" addr="0x7f390a870d30" >
+                            <attribute name="name" value="XBMCAddon::xbmcplugin::setPluginFanart" id="876" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="877" addr="0x7f390a86bab0" />
+                            <attribute name="sym_nextSibling" value="0x7f390a870f30" id="878" addr="0x7f390a870f30" />
+                            <attribute name="csym_nextSibling" value="0x7f390a870f30" id="879" addr="0x7f390a870f30" />
+                            <attribute name="sym_previousSibling" value="0x7f390a870a90" id="880" addr="0x7f390a870a90" />
+                            <attribute name="kind" value="function" id="881" addr="0x7f390a878a10" />
+                            <attribute name="sym_name" value="setPluginFanart" id="882" addr="0x7f390a878a10" />
+                            <attribute name="defaultargs" value="0x7f390a870750" id="883" addr="0x7f390a870750" />
+                            <attribute name="decl" value="f(int,p.q(const).char,p.q(const).char)." id="884" addr="0x7f390a878a10" />
+                            <attribute name="sym_overloaded" value="0x7f390a870750" id="885" addr="0x7f390a870750" />
+                            <parmlist id="886" addr="0x7f390a870af0" >
                                 <parm id="887">
-                                    <attributelist id="888" addr="0x7f8396b02af0" >
-                                        <attribute name="name" value="handle" id="889" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="int" id="890" addr="0x7f8396b0aa10" />
+                                    <attributelist id="888" addr="0x7f390a870af0" >
+                                        <attribute name="name" value="handle" id="889" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="int" id="890" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="891">
-                                    <attributelist id="892" addr="0x7f8396b02bd0" >
-                                        <attribute name="name" value="image" id="893" addr="0x7f8396b0aa10" />
-                                        <attribute name="value" value="NULL" id="894" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="p.q(const).char" id="895" addr="0x7f8396b0aa10" />
+                                    <attributelist id="892" addr="0x7f390a870bd0" >
+                                        <attribute name="name" value="image" id="893" addr="0x7f390a878a10" />
+                                        <attribute name="value" value="NULL" id="894" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="p.q(const).char" id="895" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="896">
-                                    <attributelist id="897" addr="0x7f8396b02c70" >
-                                        <attribute name="name" value="color1" id="898" addr="0x7f8396b0aa10" />
-                                        <attribute name="value" value="NULL" id="899" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="p.q(const).char" id="900" addr="0x7f8396b0aa10" />
+                                    <attributelist id="897" addr="0x7f390a870c70" >
+                                        <attribute name="name" value="color1" id="898" addr="0x7f390a878a10" />
+                                        <attribute name="value" value="NULL" id="899" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="p.q(const).char" id="900" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="type" value="void" id="901" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_overname" value="__SWIG_2" id="902" addr="0x7f8396b0aa10" />
+                            <attribute name="type" value="void" id="901" addr="0x7f390a878a10" />
+                            <attribute name="sym_overname" value="__SWIG_2" id="902" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="903" addr="0x7f8396b02f30" >
-                        <attributelist id="904" addr="0x7f8396b02f30" >
-                            <attribute name="name" value="XBMCAddon::xbmcplugin::setPluginFanart" id="905" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="906" addr="0x7f8396afdab0" />
-                            <attribute name="sym_nextSibling" value="0x7f8396b03090" id="907" addr="0x7f8396b03090" />
-                            <attribute name="csym_nextSibling" value="0x7f8396b03090" id="908" addr="0x7f8396b03090" />
-                            <attribute name="sym_previousSibling" value="0x7f8396b02d30" id="909" addr="0x7f8396b02d30" />
-                            <attribute name="kind" value="function" id="910" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_name" value="setPluginFanart" id="911" addr="0x7f8396b0aa10" />
-                            <attribute name="defaultargs" value="0x7f8396b02750" id="912" addr="0x7f8396b02750" />
-                            <attribute name="decl" value="f(int,p.q(const).char)." id="913" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_overloaded" value="0x7f8396b02750" id="914" addr="0x7f8396b02750" />
-                            <parmlist id="915" addr="0x7f8396b02d90" >
+                    <cdecl id="903" addr="0x7f390a870f30" >
+                        <attributelist id="904" addr="0x7f390a870f30" >
+                            <attribute name="name" value="XBMCAddon::xbmcplugin::setPluginFanart" id="905" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="906" addr="0x7f390a86bab0" />
+                            <attribute name="sym_nextSibling" value="0x7f390a871090" id="907" addr="0x7f390a871090" />
+                            <attribute name="csym_nextSibling" value="0x7f390a871090" id="908" addr="0x7f390a871090" />
+                            <attribute name="sym_previousSibling" value="0x7f390a870d30" id="909" addr="0x7f390a870d30" />
+                            <attribute name="kind" value="function" id="910" addr="0x7f390a878a10" />
+                            <attribute name="sym_name" value="setPluginFanart" id="911" addr="0x7f390a878a10" />
+                            <attribute name="defaultargs" value="0x7f390a870750" id="912" addr="0x7f390a870750" />
+                            <attribute name="decl" value="f(int,p.q(const).char)." id="913" addr="0x7f390a878a10" />
+                            <attribute name="sym_overloaded" value="0x7f390a870750" id="914" addr="0x7f390a870750" />
+                            <parmlist id="915" addr="0x7f390a870d90" >
                                 <parm id="916">
-                                    <attributelist id="917" addr="0x7f8396b02d90" >
-                                        <attribute name="name" value="handle" id="918" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="int" id="919" addr="0x7f8396b0aa10" />
+                                    <attributelist id="917" addr="0x7f390a870d90" >
+                                        <attribute name="name" value="handle" id="918" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="int" id="919" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="920">
-                                    <attributelist id="921" addr="0x7f8396b02e70" >
-                                        <attribute name="name" value="image" id="922" addr="0x7f8396b0aa10" />
-                                        <attribute name="value" value="NULL" id="923" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="p.q(const).char" id="924" addr="0x7f8396b0aa10" />
+                                    <attributelist id="921" addr="0x7f390a870e70" >
+                                        <attribute name="name" value="image" id="922" addr="0x7f390a878a10" />
+                                        <attribute name="value" value="NULL" id="923" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="p.q(const).char" id="924" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="type" value="void" id="925" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_overname" value="__SWIG_3" id="926" addr="0x7f8396b0aa10" />
+                            <attribute name="type" value="void" id="925" addr="0x7f390a878a10" />
+                            <attribute name="sym_overname" value="__SWIG_3" id="926" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="927" addr="0x7f8396b03090" >
-                        <attributelist id="928" addr="0x7f8396b03090" >
-                            <attribute name="name" value="XBMCAddon::xbmcplugin::setPluginFanart" id="929" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="930" addr="0x7f8396afdab0" />
-                            <attribute name="sym_previousSibling" value="0x7f8396b02f30" id="931" addr="0x7f8396b02f30" />
-                            <attribute name="kind" value="function" id="932" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_name" value="setPluginFanart" id="933" addr="0x7f8396b0aa10" />
-                            <attribute name="defaultargs" value="0x7f8396b02750" id="934" addr="0x7f8396b02750" />
-                            <attribute name="decl" value="f(int)." id="935" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_overloaded" value="0x7f8396b02750" id="936" addr="0x7f8396b02750" />
-                            <parmlist id="937" addr="0x7f8396b02f90" >
+                    <cdecl id="927" addr="0x7f390a871090" >
+                        <attributelist id="928" addr="0x7f390a871090" >
+                            <attribute name="name" value="XBMCAddon::xbmcplugin::setPluginFanart" id="929" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="930" addr="0x7f390a86bab0" />
+                            <attribute name="sym_previousSibling" value="0x7f390a870f30" id="931" addr="0x7f390a870f30" />
+                            <attribute name="kind" value="function" id="932" addr="0x7f390a878a10" />
+                            <attribute name="sym_name" value="setPluginFanart" id="933" addr="0x7f390a878a10" />
+                            <attribute name="defaultargs" value="0x7f390a870750" id="934" addr="0x7f390a870750" />
+                            <attribute name="decl" value="f(int)." id="935" addr="0x7f390a878a10" />
+                            <attribute name="sym_overloaded" value="0x7f390a870750" id="936" addr="0x7f390a870750" />
+                            <parmlist id="937" addr="0x7f390a870f90" >
                                 <parm id="938">
-                                    <attributelist id="939" addr="0x7f8396b02f90" >
-                                        <attribute name="name" value="handle" id="940" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="int" id="941" addr="0x7f8396b0aa10" />
+                                    <attributelist id="939" addr="0x7f390a870f90" >
+                                        <attribute name="name" value="handle" id="940" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="int" id="941" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="type" value="void" id="942" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_overname" value="__SWIG_4" id="943" addr="0x7f8396b0aa10" />
+                            <attribute name="type" value="void" id="942" addr="0x7f390a878a10" />
+                            <attribute name="sym_overname" value="__SWIG_4" id="943" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="944" addr="0x7f8396b035b0" >
-                        <attributelist id="945" addr="0x7f8396b035b0" >
-                            <attribute name="sym_name" value="setProperty" id="946" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="XBMCAddon::xbmcplugin::setProperty" id="947" addr="0x7f8396b0aa10" />
-                            <attribute name="decl" value="f(int,p.q(const).char,r.q(const).XBMCAddon::String)." id="948" addr="0x7f8396b0aa10" />
-                            <parmlist id="949" addr="0x7f8396b03270" >
+                    <cdecl id="944" addr="0x7f390a8715b0" >
+                        <attributelist id="945" addr="0x7f390a8715b0" >
+                            <attribute name="sym_name" value="setProperty" id="946" addr="0x7f390a878a10" />
+                            <attribute name="name" value="XBMCAddon::xbmcplugin::setProperty" id="947" addr="0x7f390a878a10" />
+                            <attribute name="decl" value="f(int,p.q(const).char,r.q(const).XBMCAddon::String)." id="948" addr="0x7f390a878a10" />
+                            <parmlist id="949" addr="0x7f390a871270" >
                                 <parm id="950">
-                                    <attributelist id="951" addr="0x7f8396b03270" >
-                                        <attribute name="name" value="handle" id="952" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="int" id="953" addr="0x7f8396b0aa10" />
+                                    <attributelist id="951" addr="0x7f390a871270" >
+                                        <attribute name="name" value="handle" id="952" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="int" id="953" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="954">
-                                    <attributelist id="955" addr="0x7f8396b033b0" >
-                                        <attribute name="name" value="key" id="956" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="p.q(const).char" id="957" addr="0x7f8396b0aa10" />
+                                    <attributelist id="955" addr="0x7f390a8713b0" >
+                                        <attribute name="name" value="key" id="956" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="p.q(const).char" id="957" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="958">
-                                    <attributelist id="959" addr="0x7f8396b034f0" >
-                                        <attribute name="name" value="value" id="960" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="961" addr="0x7f8396b0aa10" />
+                                    <attributelist id="959" addr="0x7f390a8714f0" >
+                                        <attribute name="name" value="value" id="960" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="961" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="kind" value="function" id="962" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="void" id="963" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="964" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="965" addr="0x7f8396b0aa10" />
+                            <attribute name="kind" value="function" id="962" addr="0x7f390a878a10" />
+                            <attribute name="type" value="void" id="963" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="964" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="965" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </cdecl >
-                    <constant id="966" addr="0x7f8396b03790" >
-                        <attributelist id="967" addr="0x7f8396b03790" >
-                            <attribute name="sym_name" value="SORT_METHOD_NONE" id="968" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_NONE" id="969" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_NONE" id="970" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="971" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_NONE" id="972" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="973" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="974" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="975" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="976" addr="0x7f8396b0aa10" />
+                    <constant id="966" addr="0x7f390a871790" >
+                        <attributelist id="967" addr="0x7f390a871790" >
+                            <attribute name="sym_name" value="SORT_METHOD_NONE" id="968" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_NONE" id="969" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_NONE" id="970" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="971" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_NONE" id="972" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="973" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="974" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="975" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="976" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="977" addr="0x7f8396b039d0" >
-                        <attributelist id="978" addr="0x7f8396b039d0" >
-                            <attribute name="sym_name" value="SORT_METHOD_LABEL" id="979" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_LABEL" id="980" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_LABEL" id="981" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="982" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_LABEL" id="983" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="984" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="985" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="986" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="987" addr="0x7f8396b0aa10" />
+                    <constant id="977" addr="0x7f390a8719d0" >
+                        <attributelist id="978" addr="0x7f390a8719d0" >
+                            <attribute name="sym_name" value="SORT_METHOD_LABEL" id="979" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_LABEL" id="980" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_LABEL" id="981" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="982" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_LABEL" id="983" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="984" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="985" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="986" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="987" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="988" addr="0x7f8396b03bd0" >
-                        <attributelist id="989" addr="0x7f8396b03bd0" >
-                            <attribute name="sym_name" value="SORT_METHOD_LABEL_IGNORE_THE" id="990" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_LABEL_IGNORE_THE" id="991" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_LABEL_IGNORE_THE" id="992" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="993" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_LABEL_IGNORE_THE" id="994" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="995" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="996" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="997" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="998" addr="0x7f8396b0aa10" />
+                    <constant id="988" addr="0x7f390a871bd0" >
+                        <attributelist id="989" addr="0x7f390a871bd0" >
+                            <attribute name="sym_name" value="SORT_METHOD_LABEL_IGNORE_THE" id="990" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_LABEL_IGNORE_THE" id="991" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_LABEL_IGNORE_THE" id="992" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="993" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_LABEL_IGNORE_THE" id="994" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="995" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="996" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="997" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="998" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="999" addr="0x7f8396b03dd0" >
-                        <attributelist id="1000" addr="0x7f8396b03dd0" >
-                            <attribute name="sym_name" value="SORT_METHOD_DATE" id="1001" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_DATE" id="1002" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_DATE" id="1003" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1004" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_DATE" id="1005" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1006" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1007" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1008" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1009" addr="0x7f8396b0aa10" />
+                    <constant id="999" addr="0x7f390a871dd0" >
+                        <attributelist id="1000" addr="0x7f390a871dd0" >
+                            <attribute name="sym_name" value="SORT_METHOD_DATE" id="1001" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_DATE" id="1002" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_DATE" id="1003" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1004" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_DATE" id="1005" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1006" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1007" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1008" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1009" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1010" addr="0x7f8396b03fd0" >
-                        <attributelist id="1011" addr="0x7f8396b03fd0" >
-                            <attribute name="sym_name" value="SORT_METHOD_SIZE" id="1012" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_SIZE" id="1013" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_SIZE" id="1014" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1015" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_SIZE" id="1016" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1017" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1018" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1019" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1020" addr="0x7f8396b0aa10" />
+                    <constant id="1010" addr="0x7f390a871fd0" >
+                        <attributelist id="1011" addr="0x7f390a871fd0" >
+                            <attribute name="sym_name" value="SORT_METHOD_SIZE" id="1012" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_SIZE" id="1013" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_SIZE" id="1014" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1015" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_SIZE" id="1016" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1017" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1018" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1019" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1020" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1021" addr="0x7f8396b041d0" >
-                        <attributelist id="1022" addr="0x7f8396b041d0" >
-                            <attribute name="sym_name" value="SORT_METHOD_FILE" id="1023" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_FILE" id="1024" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_FILE" id="1025" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1026" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_FILE" id="1027" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1028" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1029" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1030" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1031" addr="0x7f8396b0aa10" />
+                    <constant id="1021" addr="0x7f390a8721d0" >
+                        <attributelist id="1022" addr="0x7f390a8721d0" >
+                            <attribute name="sym_name" value="SORT_METHOD_FILE" id="1023" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_FILE" id="1024" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_FILE" id="1025" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1026" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_FILE" id="1027" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1028" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1029" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1030" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1031" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1032" addr="0x7f8396b043d0" >
-                        <attributelist id="1033" addr="0x7f8396b043d0" >
-                            <attribute name="sym_name" value="SORT_METHOD_DRIVE_TYPE" id="1034" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_DRIVE_TYPE" id="1035" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_DRIVE_TYPE" id="1036" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1037" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_DRIVE_TYPE" id="1038" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1039" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1040" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1041" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1042" addr="0x7f8396b0aa10" />
+                    <constant id="1032" addr="0x7f390a8723d0" >
+                        <attributelist id="1033" addr="0x7f390a8723d0" >
+                            <attribute name="sym_name" value="SORT_METHOD_DRIVE_TYPE" id="1034" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_DRIVE_TYPE" id="1035" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_DRIVE_TYPE" id="1036" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1037" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_DRIVE_TYPE" id="1038" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1039" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1040" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1041" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1042" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1043" addr="0x7f8396b045d0" >
-                        <attributelist id="1044" addr="0x7f8396b045d0" >
-                            <attribute name="sym_name" value="SORT_METHOD_TRACKNUM" id="1045" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_TRACKNUM" id="1046" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_TRACKNUM" id="1047" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1048" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_TRACKNUM" id="1049" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1050" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1051" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1052" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1053" addr="0x7f8396b0aa10" />
+                    <constant id="1043" addr="0x7f390a8725d0" >
+                        <attributelist id="1044" addr="0x7f390a8725d0" >
+                            <attribute name="sym_name" value="SORT_METHOD_TRACKNUM" id="1045" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_TRACKNUM" id="1046" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_TRACKNUM" id="1047" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1048" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_TRACKNUM" id="1049" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1050" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1051" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1052" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1053" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1054" addr="0x7f8396b047d0" >
-                        <attributelist id="1055" addr="0x7f8396b047d0" >
-                            <attribute name="sym_name" value="SORT_METHOD_DURATION" id="1056" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_DURATION" id="1057" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_DURATION" id="1058" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1059" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_DURATION" id="1060" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1061" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1062" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1063" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1064" addr="0x7f8396b0aa10" />
+                    <constant id="1054" addr="0x7f390a8727d0" >
+                        <attributelist id="1055" addr="0x7f390a8727d0" >
+                            <attribute name="sym_name" value="SORT_METHOD_DURATION" id="1056" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_DURATION" id="1057" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_DURATION" id="1058" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1059" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_DURATION" id="1060" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1061" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1062" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1063" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1064" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1065" addr="0x7f8396b049d0" >
-                        <attributelist id="1066" addr="0x7f8396b049d0" >
-                            <attribute name="sym_name" value="SORT_METHOD_TITLE" id="1067" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_TITLE" id="1068" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_TITLE" id="1069" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1070" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_TITLE" id="1071" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1072" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1073" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1074" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1075" addr="0x7f8396b0aa10" />
+                    <constant id="1065" addr="0x7f390a8729d0" >
+                        <attributelist id="1066" addr="0x7f390a8729d0" >
+                            <attribute name="sym_name" value="SORT_METHOD_TITLE" id="1067" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_TITLE" id="1068" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_TITLE" id="1069" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1070" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_TITLE" id="1071" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1072" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1073" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1074" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1075" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1076" addr="0x7f8396b04bd0" >
-                        <attributelist id="1077" addr="0x7f8396b04bd0" >
-                            <attribute name="sym_name" value="SORT_METHOD_TITLE_IGNORE_THE" id="1078" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_TITLE_IGNORE_THE" id="1079" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_TITLE_IGNORE_THE" id="1080" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1081" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_TITLE_IGNORE_THE" id="1082" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1083" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1084" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1085" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1086" addr="0x7f8396b0aa10" />
+                    <constant id="1076" addr="0x7f390a872bd0" >
+                        <attributelist id="1077" addr="0x7f390a872bd0" >
+                            <attribute name="sym_name" value="SORT_METHOD_TITLE_IGNORE_THE" id="1078" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_TITLE_IGNORE_THE" id="1079" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_TITLE_IGNORE_THE" id="1080" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1081" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_TITLE_IGNORE_THE" id="1082" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1083" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1084" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1085" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1086" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1087" addr="0x7f8396b04dd0" >
-                        <attributelist id="1088" addr="0x7f8396b04dd0" >
-                            <attribute name="sym_name" value="SORT_METHOD_ARTIST" id="1089" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_ARTIST" id="1090" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_ARTIST" id="1091" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1092" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_ARTIST" id="1093" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1094" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1095" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1096" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1097" addr="0x7f8396b0aa10" />
+                    <constant id="1087" addr="0x7f390a872dd0" >
+                        <attributelist id="1088" addr="0x7f390a872dd0" >
+                            <attribute name="sym_name" value="SORT_METHOD_ARTIST" id="1089" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_ARTIST" id="1090" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_ARTIST" id="1091" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1092" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_ARTIST" id="1093" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1094" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1095" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1096" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1097" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1098" addr="0x7f8396b04fd0" >
-                        <attributelist id="1099" addr="0x7f8396b04fd0" >
-                            <attribute name="sym_name" value="SORT_METHOD_ARTIST_IGNORE_THE" id="1100" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_ARTIST_IGNORE_THE" id="1101" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_ARTIST_IGNORE_THE" id="1102" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1103" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_ARTIST_IGNORE_THE" id="1104" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1105" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1106" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1107" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1108" addr="0x7f8396b0aa10" />
+                    <constant id="1098" addr="0x7f390a872fd0" >
+                        <attributelist id="1099" addr="0x7f390a872fd0" >
+                            <attribute name="sym_name" value="SORT_METHOD_ARTIST_IGNORE_THE" id="1100" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_ARTIST_IGNORE_THE" id="1101" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_ARTIST_IGNORE_THE" id="1102" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1103" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_ARTIST_IGNORE_THE" id="1104" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1105" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1106" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1107" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1108" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1109" addr="0x7f8396b051d0" >
-                        <attributelist id="1110" addr="0x7f8396b051d0" >
-                            <attribute name="sym_name" value="SORT_METHOD_ALBUM" id="1111" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_ALBUM" id="1112" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_ALBUM" id="1113" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1114" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_ALBUM" id="1115" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1116" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1117" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1118" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1119" addr="0x7f8396b0aa10" />
+                    <constant id="1109" addr="0x7f390a8731d0" >
+                        <attributelist id="1110" addr="0x7f390a8731d0" >
+                            <attribute name="sym_name" value="SORT_METHOD_ALBUM" id="1111" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_ALBUM" id="1112" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_ALBUM" id="1113" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1114" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_ALBUM" id="1115" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1116" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1117" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1118" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1119" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1120" addr="0x7f8396b053d0" >
-                        <attributelist id="1121" addr="0x7f8396b053d0" >
-                            <attribute name="sym_name" value="SORT_METHOD_ALBUM_IGNORE_THE" id="1122" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_ALBUM_IGNORE_THE" id="1123" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_ALBUM_IGNORE_THE" id="1124" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1125" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_ALBUM_IGNORE_THE" id="1126" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1127" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1128" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1129" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1130" addr="0x7f8396b0aa10" />
+                    <constant id="1120" addr="0x7f390a8733d0" >
+                        <attributelist id="1121" addr="0x7f390a8733d0" >
+                            <attribute name="sym_name" value="SORT_METHOD_ALBUM_IGNORE_THE" id="1122" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_ALBUM_IGNORE_THE" id="1123" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_ALBUM_IGNORE_THE" id="1124" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1125" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_ALBUM_IGNORE_THE" id="1126" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1127" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1128" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1129" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1130" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1131" addr="0x7f8396b055d0" >
-                        <attributelist id="1132" addr="0x7f8396b055d0" >
-                            <attribute name="sym_name" value="SORT_METHOD_GENRE" id="1133" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_GENRE" id="1134" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_GENRE" id="1135" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1136" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_GENRE" id="1137" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1138" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1139" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1140" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1141" addr="0x7f8396b0aa10" />
+                    <constant id="1131" addr="0x7f390a8735d0" >
+                        <attributelist id="1132" addr="0x7f390a8735d0" >
+                            <attribute name="sym_name" value="SORT_METHOD_GENRE" id="1133" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_GENRE" id="1134" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_GENRE" id="1135" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1136" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_GENRE" id="1137" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1138" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1139" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1140" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1141" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1142" addr="0x7f8396b057d0" >
-                        <attributelist id="1143" addr="0x7f8396b057d0" >
-                            <attribute name="sym_name" value="SORT_METHOD_VIDEO_YEAR" id="1144" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_VIDEO_YEAR" id="1145" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_YEAR" id="1146" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1147" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_YEAR" id="1148" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1149" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1150" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1151" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1152" addr="0x7f8396b0aa10" />
+                    <constant id="1142" addr="0x7f390a8737d0" >
+                        <attributelist id="1143" addr="0x7f390a8737d0" >
+                            <attribute name="sym_name" value="SORT_METHOD_VIDEO_YEAR" id="1144" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_VIDEO_YEAR" id="1145" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_YEAR" id="1146" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1147" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_YEAR" id="1148" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1149" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1150" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1151" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1152" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1153" addr="0x7f8396b059d0" >
-                        <attributelist id="1154" addr="0x7f8396b059d0" >
-                            <attribute name="sym_name" value="SORT_METHOD_VIDEO_RATING" id="1155" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_VIDEO_RATING" id="1156" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_VIDEO_RATING" id="1157" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1158" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_VIDEO_RATING" id="1159" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1160" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1161" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1162" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1163" addr="0x7f8396b0aa10" />
+                    <constant id="1153" addr="0x7f390a8739d0" >
+                        <attributelist id="1154" addr="0x7f390a8739d0" >
+                            <attribute name="sym_name" value="SORT_METHOD_VIDEO_RATING" id="1155" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_VIDEO_RATING" id="1156" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_VIDEO_RATING" id="1157" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1158" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_VIDEO_RATING" id="1159" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1160" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1161" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1162" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1163" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1164" addr="0x7f8396b05bd0" >
-                        <attributelist id="1165" addr="0x7f8396b05bd0" >
-                            <attribute name="sym_name" value="SORT_METHOD_PROGRAM_COUNT" id="1166" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_PROGRAM_COUNT" id="1167" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_PROGRAM_COUNT" id="1168" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1169" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_PROGRAM_COUNT" id="1170" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1171" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1172" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1173" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1174" addr="0x7f8396b0aa10" />
+                    <constant id="1164" addr="0x7f390a873bd0" >
+                        <attributelist id="1165" addr="0x7f390a873bd0" >
+                            <attribute name="sym_name" value="SORT_METHOD_PROGRAM_COUNT" id="1166" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_PROGRAM_COUNT" id="1167" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_PROGRAM_COUNT" id="1168" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1169" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_PROGRAM_COUNT" id="1170" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1171" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1172" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1173" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1174" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1175" addr="0x7f8396b05dd0" >
-                        <attributelist id="1176" addr="0x7f8396b05dd0" >
-                            <attribute name="sym_name" value="SORT_METHOD_PLAYLIST_ORDER" id="1177" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_PLAYLIST_ORDER" id="1178" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_PLAYLIST_ORDER" id="1179" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1180" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_PLAYLIST_ORDER" id="1181" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1182" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1183" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1184" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1185" addr="0x7f8396b0aa10" />
+                    <constant id="1175" addr="0x7f390a873dd0" >
+                        <attributelist id="1176" addr="0x7f390a873dd0" >
+                            <attribute name="sym_name" value="SORT_METHOD_PLAYLIST_ORDER" id="1177" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_PLAYLIST_ORDER" id="1178" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_PLAYLIST_ORDER" id="1179" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1180" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_PLAYLIST_ORDER" id="1181" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1182" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1183" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1184" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1185" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1186" addr="0x7f8396b05fd0" >
-                        <attributelist id="1187" addr="0x7f8396b05fd0" >
-                            <attribute name="sym_name" value="SORT_METHOD_EPISODE" id="1188" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_EPISODE" id="1189" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_EPISODE" id="1190" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1191" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_EPISODE" id="1192" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1193" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1194" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1195" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1196" addr="0x7f8396b0aa10" />
+                    <constant id="1186" addr="0x7f390a873fd0" >
+                        <attributelist id="1187" addr="0x7f390a873fd0" >
+                            <attribute name="sym_name" value="SORT_METHOD_EPISODE" id="1188" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_EPISODE" id="1189" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_EPISODE" id="1190" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1191" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_EPISODE" id="1192" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1193" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1194" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1195" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1196" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1197" addr="0x7f8396b061d0" >
-                        <attributelist id="1198" addr="0x7f8396b061d0" >
-                            <attribute name="sym_name" value="SORT_METHOD_VIDEO_TITLE" id="1199" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_VIDEO_TITLE" id="1200" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_VIDEO_TITLE" id="1201" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1202" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_VIDEO_TITLE" id="1203" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1204" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1205" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1206" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1207" addr="0x7f8396b0aa10" />
+                    <constant id="1197" addr="0x7f390a8741d0" >
+                        <attributelist id="1198" addr="0x7f390a8741d0" >
+                            <attribute name="sym_name" value="SORT_METHOD_VIDEO_TITLE" id="1199" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_VIDEO_TITLE" id="1200" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_VIDEO_TITLE" id="1201" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1202" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_VIDEO_TITLE" id="1203" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1204" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1205" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1206" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1207" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1208" addr="0x7f8396b063d0" >
-                        <attributelist id="1209" addr="0x7f8396b063d0" >
-                            <attribute name="sym_name" value="SORT_METHOD_VIDEO_SORT_TITLE" id="1210" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_VIDEO_SORT_TITLE" id="1211" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_VIDEO_SORT_TITLE" id="1212" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1213" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_VIDEO_SORT_TITLE" id="1214" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1215" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1216" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1217" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1218" addr="0x7f8396b0aa10" />
+                    <constant id="1208" addr="0x7f390a8743d0" >
+                        <attributelist id="1209" addr="0x7f390a8743d0" >
+                            <attribute name="sym_name" value="SORT_METHOD_VIDEO_SORT_TITLE" id="1210" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_VIDEO_SORT_TITLE" id="1211" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_VIDEO_SORT_TITLE" id="1212" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1213" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_VIDEO_SORT_TITLE" id="1214" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1215" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1216" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1217" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1218" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1219" addr="0x7f8396b065d0" >
-                        <attributelist id="1220" addr="0x7f8396b065d0" >
-                            <attribute name="sym_name" value="SORT_METHOD_VIDEO_SORT_TITLE_IGNORE_THE" id="1221" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_VIDEO_SORT_TITLE_IGNORE_THE" id="1222" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_VIDEO_SORT_TITLE_IGNORE_THE" id="1223" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1224" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_VIDEO_SORT_TITLE_IGNORE_THE" id="1225" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1226" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1227" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1228" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1229" addr="0x7f8396b0aa10" />
+                    <constant id="1219" addr="0x7f390a8745d0" >
+                        <attributelist id="1220" addr="0x7f390a8745d0" >
+                            <attribute name="sym_name" value="SORT_METHOD_VIDEO_SORT_TITLE_IGNORE_THE" id="1221" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_VIDEO_SORT_TITLE_IGNORE_THE" id="1222" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_VIDEO_SORT_TITLE_IGNORE_THE" id="1223" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1224" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_VIDEO_SORT_TITLE_IGNORE_THE" id="1225" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1226" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1227" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1228" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1229" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1230" addr="0x7f8396b067d0" >
-                        <attributelist id="1231" addr="0x7f8396b067d0" >
-                            <attribute name="sym_name" value="SORT_METHOD_PRODUCTIONCODE" id="1232" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_PRODUCTIONCODE" id="1233" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_PRODUCTIONCODE" id="1234" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1235" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_PRODUCTIONCODE" id="1236" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1237" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1238" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1239" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1240" addr="0x7f8396b0aa10" />
+                    <constant id="1230" addr="0x7f390a8747d0" >
+                        <attributelist id="1231" addr="0x7f390a8747d0" >
+                            <attribute name="sym_name" value="SORT_METHOD_PRODUCTIONCODE" id="1232" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_PRODUCTIONCODE" id="1233" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_PRODUCTIONCODE" id="1234" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1235" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_PRODUCTIONCODE" id="1236" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1237" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1238" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1239" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1240" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1241" addr="0x7f8396b069d0" >
-                        <attributelist id="1242" addr="0x7f8396b069d0" >
-                            <attribute name="sym_name" value="SORT_METHOD_SONG_RATING" id="1243" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_SONG_RATING" id="1244" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_SONG_RATING" id="1245" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1246" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_SONG_RATING" id="1247" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1248" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1249" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1250" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1251" addr="0x7f8396b0aa10" />
+                    <constant id="1241" addr="0x7f390a8749d0" >
+                        <attributelist id="1242" addr="0x7f390a8749d0" >
+                            <attribute name="sym_name" value="SORT_METHOD_SONG_RATING" id="1243" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_SONG_RATING" id="1244" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_SONG_RATING" id="1245" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1246" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_SONG_RATING" id="1247" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1248" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1249" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1250" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1251" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1252" addr="0x7f8396b06bd0" >
-                        <attributelist id="1253" addr="0x7f8396b06bd0" >
-                            <attribute name="sym_name" value="SORT_METHOD_MPAA_RATING" id="1254" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_MPAA_RATING" id="1255" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_MPAA_RATING" id="1256" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1257" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_MPAA_RATING" id="1258" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1259" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1260" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1261" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1262" addr="0x7f8396b0aa10" />
+                    <constant id="1252" addr="0x7f390a874bd0" >
+                        <attributelist id="1253" addr="0x7f390a874bd0" >
+                            <attribute name="sym_name" value="SORT_METHOD_MPAA_RATING" id="1254" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_MPAA_RATING" id="1255" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_MPAA_RATING" id="1256" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1257" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_MPAA_RATING" id="1258" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1259" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1260" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1261" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1262" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1263" addr="0x7f8396b06dd0" >
-                        <attributelist id="1264" addr="0x7f8396b06dd0" >
-                            <attribute name="sym_name" value="SORT_METHOD_VIDEO_RUNTIME" id="1265" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_VIDEO_RUNTIME" id="1266" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_VIDEO_RUNTIME" id="1267" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1268" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_VIDEO_RUNTIME" id="1269" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1270" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1271" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1272" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1273" addr="0x7f8396b0aa10" />
+                    <constant id="1263" addr="0x7f390a874dd0" >
+                        <attributelist id="1264" addr="0x7f390a874dd0" >
+                            <attribute name="sym_name" value="SORT_METHOD_VIDEO_RUNTIME" id="1265" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_VIDEO_RUNTIME" id="1266" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_VIDEO_RUNTIME" id="1267" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1268" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_VIDEO_RUNTIME" id="1269" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1270" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1271" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1272" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1273" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1274" addr="0x7f8396b06fd0" >
-                        <attributelist id="1275" addr="0x7f8396b06fd0" >
-                            <attribute name="sym_name" value="SORT_METHOD_STUDIO" id="1276" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_STUDIO" id="1277" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_STUDIO" id="1278" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1279" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_STUDIO" id="1280" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1281" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1282" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1283" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1284" addr="0x7f8396b0aa10" />
+                    <constant id="1274" addr="0x7f390a874fd0" >
+                        <attributelist id="1275" addr="0x7f390a874fd0" >
+                            <attribute name="sym_name" value="SORT_METHOD_STUDIO" id="1276" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_STUDIO" id="1277" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_STUDIO" id="1278" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1279" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_STUDIO" id="1280" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1281" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1282" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1283" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1284" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1285" addr="0x7f8396b071d0" >
-                        <attributelist id="1286" addr="0x7f8396b071d0" >
-                            <attribute name="sym_name" value="SORT_METHOD_STUDIO_IGNORE_THE" id="1287" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_STUDIO_IGNORE_THE" id="1288" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_STUDIO_IGNORE_THE" id="1289" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1290" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_STUDIO_IGNORE_THE" id="1291" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1292" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1293" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1294" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1295" addr="0x7f8396b0aa10" />
+                    <constant id="1285" addr="0x7f390a8751d0" >
+                        <attributelist id="1286" addr="0x7f390a8751d0" >
+                            <attribute name="sym_name" value="SORT_METHOD_STUDIO_IGNORE_THE" id="1287" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_STUDIO_IGNORE_THE" id="1288" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_STUDIO_IGNORE_THE" id="1289" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1290" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_STUDIO_IGNORE_THE" id="1291" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1292" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1293" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1294" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1295" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1296" addr="0x7f8396b073d0" >
-                        <attributelist id="1297" addr="0x7f8396b073d0" >
-                            <attribute name="sym_name" value="SORT_METHOD_UNSORTED" id="1298" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_UNSORTED" id="1299" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_UNSORTED" id="1300" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1301" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_UNSORTED" id="1302" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1303" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1304" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1305" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1306" addr="0x7f8396b0aa10" />
+                    <constant id="1296" addr="0x7f390a8753d0" >
+                        <attributelist id="1297" addr="0x7f390a8753d0" >
+                            <attribute name="sym_name" value="SORT_METHOD_UNSORTED" id="1298" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_UNSORTED" id="1299" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_UNSORTED" id="1300" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1301" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_UNSORTED" id="1302" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1303" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1304" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1305" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1306" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1307" addr="0x7f8396b075d0" >
-                        <attributelist id="1308" addr="0x7f8396b075d0" >
-                            <attribute name="sym_name" value="SORT_METHOD_BITRATE" id="1309" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_BITRATE" id="1310" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_BITRATE" id="1311" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1312" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_BITRATE" id="1313" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1314" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1315" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1316" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1317" addr="0x7f8396b0aa10" />
+                    <constant id="1307" addr="0x7f390a8755d0" >
+                        <attributelist id="1308" addr="0x7f390a8755d0" >
+                            <attribute name="sym_name" value="SORT_METHOD_BITRATE" id="1309" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_BITRATE" id="1310" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_BITRATE" id="1311" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1312" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_BITRATE" id="1313" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1314" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1315" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1316" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1317" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1318" addr="0x7f8396b077d0" >
-                        <attributelist id="1319" addr="0x7f8396b077d0" >
-                            <attribute name="sym_name" value="SORT_METHOD_LISTENERS" id="1320" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_LISTENERS" id="1321" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_LISTENERS" id="1322" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1323" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_LISTENERS" id="1324" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1325" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1326" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1327" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1328" addr="0x7f8396b0aa10" />
+                    <constant id="1318" addr="0x7f390a8757d0" >
+                        <attributelist id="1319" addr="0x7f390a8757d0" >
+                            <attribute name="sym_name" value="SORT_METHOD_LISTENERS" id="1320" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_LISTENERS" id="1321" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_LISTENERS" id="1322" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1323" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_LISTENERS" id="1324" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1325" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1326" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1327" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1328" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1329" addr="0x7f8396b079d0" >
-                        <attributelist id="1330" addr="0x7f8396b079d0" >
-                            <attribute name="sym_name" value="SORT_METHOD_COUNTRY" id="1331" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_COUNTRY" id="1332" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_COUNTRY" id="1333" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1334" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_COUNTRY" id="1335" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1336" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1337" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1338" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1339" addr="0x7f8396b0aa10" />
+                    <constant id="1329" addr="0x7f390a8759d0" >
+                        <attributelist id="1330" addr="0x7f390a8759d0" >
+                            <attribute name="sym_name" value="SORT_METHOD_COUNTRY" id="1331" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_COUNTRY" id="1332" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_COUNTRY" id="1333" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1334" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_COUNTRY" id="1335" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1336" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1337" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1338" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1339" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1340" addr="0x7f8396b07bd0" >
-                        <attributelist id="1341" addr="0x7f8396b07bd0" >
-                            <attribute name="sym_name" value="SORT_METHOD_DATEADDED" id="1342" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_DATEADDED" id="1343" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_DATEADDED" id="1344" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1345" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_DATEADDED" id="1346" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1347" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1348" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1349" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1350" addr="0x7f8396b0aa10" />
+                    <constant id="1340" addr="0x7f390a875bd0" >
+                        <attributelist id="1341" addr="0x7f390a875bd0" >
+                            <attribute name="sym_name" value="SORT_METHOD_DATEADDED" id="1342" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_DATEADDED" id="1343" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_DATEADDED" id="1344" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1345" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_DATEADDED" id="1346" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1347" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1348" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1349" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1350" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1351" addr="0x7f8396b07dd0" >
-                        <attributelist id="1352" addr="0x7f8396b07dd0" >
-                            <attribute name="sym_name" value="SORT_METHOD_FULLPATH" id="1353" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_FULLPATH" id="1354" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_FULLPATH" id="1355" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1356" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_FULLPATH" id="1357" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1358" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1359" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1360" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1361" addr="0x7f8396b0aa10" />
+                    <constant id="1351" addr="0x7f390a875dd0" >
+                        <attributelist id="1352" addr="0x7f390a875dd0" >
+                            <attribute name="sym_name" value="SORT_METHOD_FULLPATH" id="1353" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_FULLPATH" id="1354" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_FULLPATH" id="1355" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1356" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_FULLPATH" id="1357" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1358" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1359" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1360" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1361" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1362" addr="0x7f8396b07fd0" >
-                        <attributelist id="1363" addr="0x7f8396b07fd0" >
-                            <attribute name="sym_name" value="SORT_METHOD_LABEL_IGNORE_FOLDERS" id="1364" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_LABEL_IGNORE_FOLDERS" id="1365" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_LABEL_IGNORE_FOLDERS" id="1366" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1367" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_LABEL_IGNORE_FOLDERS" id="1368" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1369" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1370" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1371" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1372" addr="0x7f8396b0aa10" />
+                    <constant id="1362" addr="0x7f390a875fd0" >
+                        <attributelist id="1363" addr="0x7f390a875fd0" >
+                            <attribute name="sym_name" value="SORT_METHOD_LABEL_IGNORE_FOLDERS" id="1364" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_LABEL_IGNORE_FOLDERS" id="1365" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_LABEL_IGNORE_FOLDERS" id="1366" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1367" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_LABEL_IGNORE_FOLDERS" id="1368" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1369" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1370" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1371" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1372" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1373" addr="0x7f8396b081d0" >
-                        <attributelist id="1374" addr="0x7f8396b081d0" >
-                            <attribute name="sym_name" value="SORT_METHOD_LASTPLAYED" id="1375" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_LASTPLAYED" id="1376" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_LASTPLAYED" id="1377" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1378" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_LASTPLAYED" id="1379" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1380" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1381" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1382" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1383" addr="0x7f8396b0aa10" />
+                    <constant id="1373" addr="0x7f390a8761d0" >
+                        <attributelist id="1374" addr="0x7f390a8761d0" >
+                            <attribute name="sym_name" value="SORT_METHOD_LASTPLAYED" id="1375" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_LASTPLAYED" id="1376" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_LASTPLAYED" id="1377" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1378" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_LASTPLAYED" id="1379" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1380" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1381" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1382" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1383" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1384" addr="0x7f8396b083d0" >
-                        <attributelist id="1385" addr="0x7f8396b083d0" >
-                            <attribute name="sym_name" value="SORT_METHOD_PLAYCOUNT" id="1386" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_PLAYCOUNT" id="1387" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_PLAYCOUNT" id="1388" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1389" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_PLAYCOUNT" id="1390" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1391" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1392" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1393" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1394" addr="0x7f8396b0aa10" />
+                    <constant id="1384" addr="0x7f390a8763d0" >
+                        <attributelist id="1385" addr="0x7f390a8763d0" >
+                            <attribute name="sym_name" value="SORT_METHOD_PLAYCOUNT" id="1386" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_PLAYCOUNT" id="1387" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_PLAYCOUNT" id="1388" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1389" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_PLAYCOUNT" id="1390" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1391" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1392" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1393" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1394" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1395" addr="0x7f8396b085d0" >
-                        <attributelist id="1396" addr="0x7f8396b085d0" >
-                            <attribute name="sym_name" value="SORT_METHOD_CHANNEL" id="1397" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_CHANNEL" id="1398" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_CHANNEL" id="1399" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1400" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_CHANNEL" id="1401" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1402" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1403" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1404" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1405" addr="0x7f8396b0aa10" />
+                    <constant id="1395" addr="0x7f390a8765d0" >
+                        <attributelist id="1396" addr="0x7f390a8765d0" >
+                            <attribute name="sym_name" value="SORT_METHOD_CHANNEL" id="1397" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_CHANNEL" id="1398" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_CHANNEL" id="1399" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1400" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_CHANNEL" id="1401" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1402" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1403" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1404" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1405" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1406" addr="0x7f8396b087d0" >
-                        <attributelist id="1407" addr="0x7f8396b087d0" >
-                            <attribute name="sym_name" value="SORT_METHOD_DATE_TAKEN" id="1408" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_DATE_TAKEN" id="1409" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_DATE_TAKEN" id="1410" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1411" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_DATE_TAKEN" id="1412" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1413" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1414" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1415" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1416" addr="0x7f8396b0aa10" />
+                    <constant id="1406" addr="0x7f390a8767d0" >
+                        <attributelist id="1407" addr="0x7f390a8767d0" >
+                            <attribute name="sym_name" value="SORT_METHOD_DATE_TAKEN" id="1408" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_DATE_TAKEN" id="1409" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_DATE_TAKEN" id="1410" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1411" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_DATE_TAKEN" id="1412" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1413" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1414" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1415" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1416" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1417" addr="0x7f8396b089d0" >
-                        <attributelist id="1418" addr="0x7f8396b089d0" >
-                            <attribute name="sym_name" value="SORT_METHOD_VIDEO_USER_RATING" id="1419" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_VIDEO_USER_RATING" id="1420" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_VIDEO_USER_RATING" id="1421" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1422" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_VIDEO_USER_RATING" id="1423" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1424" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1425" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1426" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1427" addr="0x7f8396b0aa10" />
+                    <constant id="1417" addr="0x7f390a8769d0" >
+                        <attributelist id="1418" addr="0x7f390a8769d0" >
+                            <attribute name="sym_name" value="SORT_METHOD_VIDEO_USER_RATING" id="1419" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_VIDEO_USER_RATING" id="1420" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_VIDEO_USER_RATING" id="1421" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1422" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_VIDEO_USER_RATING" id="1423" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1424" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1425" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1426" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1427" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1428" addr="0x7f8396b08bd0" >
-                        <attributelist id="1429" addr="0x7f8396b08bd0" >
-                            <attribute name="sym_name" value="SORT_METHOD_SONG_USER_RATING" id="1430" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_SONG_USER_RATING" id="1431" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_SONG_USER_RATING" id="1432" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1433" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_SONG_USER_RATING" id="1434" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1435" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1436" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1437" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1438" addr="0x7f8396b0aa10" />
+                    <constant id="1428" addr="0x7f390a876bd0" >
+                        <attributelist id="1429" addr="0x7f390a876bd0" >
+                            <attribute name="sym_name" value="SORT_METHOD_SONG_USER_RATING" id="1430" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_SONG_USER_RATING" id="1431" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_SONG_USER_RATING" id="1432" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1433" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_SONG_USER_RATING" id="1434" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1435" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1436" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1437" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1438" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
diff --git a/srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmcvfs.i.cpp b/srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmcvfs.i.cpp
similarity index 99%
rename from srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmcvfs.i.cpp
rename to srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmcvfs.i.cpp
index 332776462db..7f812820c6e 100644
--- a/srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmcvfs.i.cpp
+++ b/srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmcvfs.i.cpp
@@ -1575,7 +1575,7 @@ namespace PythonBindings
 
    // constants
    PyModule_AddStringConstant(module, "__author__", "Team Kodi <http://kodi.tv>");
-   PyModule_AddStringConstant(module, "__date__", "Wed Jun 19 18:36:52 GMT 2019");
+   PyModule_AddStringConstant(module, "__date__", "Sun Sep 01 10:46:59 GMT 2019");
    PyModule_AddStringConstant(module, "__version__", "2.26.0");
    PyModule_AddStringConstant(module, "__credits__", "Team Kodi");
    PyModule_AddStringConstant(module, "__platform__", "ALL");
diff --git a/srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmcvfs.i.xml b/srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmcvfs.i.xml
similarity index 59%
rename from srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmcvfs.i.xml
rename to srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmcvfs.i.xml
index f2f53954482..c6fb95bf1f8 100644
--- a/srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmcvfs.i.xml
+++ b/srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmcvfs.i.xml
@@ -1,141 +1,141 @@
 <?xml version="1.0" ?> 
-<top id="1" addr="0x7f20c7094b30" >
-    <attributelist id="2" addr="0x7f20c7094b30" >
-        <attribute name="outfile" value="AddonModuleXbmcvfs.i.xml" id="3" addr="0x7f20c70b39f0" />
-        <attribute name="name" value="xbmcvfs" id="4" addr="0x7f20c70b39f0" />
-        <attribute name="module" value="xbmcvfs" id="5" addr="0x7f20c70aa090" />
-        <attribute name="inputfile" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmcvfs.i" id="6" addr="0x7f20c70b39f0" />
-        <attribute name="classes" value="0x7f20c70a7650" id="7" addr="0x7f20c70a7650" />
-        <attribute name="infile" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmcvfs.i" id="8" addr="0x7f20c70b39f0" />
-        <attribute name="outfile_h" value="AddonModuleXbmcvfs.i.h" id="9" addr="0x7f20c70b39f0" />
+<top id="1" addr="0x7f658f81fb30" >
+    <attributelist id="2" addr="0x7f658f81fb30" >
+        <attribute name="outfile" value="AddonModuleXbmcvfs.i.xml" id="3" addr="0x7f658f83e9f0" />
+        <attribute name="name" value="xbmcvfs" id="4" addr="0x7f658f83e9f0" />
+        <attribute name="module" value="xbmcvfs" id="5" addr="0x7f658f835090" />
+        <attribute name="inputfile" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmcvfs.i" id="6" addr="0x7f658f83e9f0" />
+        <attribute name="classes" value="0x7f658f832650" id="7" addr="0x7f658f832650" />
+        <attribute name="infile" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmcvfs.i" id="8" addr="0x7f658f83e9f0" />
+        <attribute name="outfile_h" value="AddonModuleXbmcvfs.i.h" id="9" addr="0x7f658f83e9f0" />
     </attributelist >
 
-    <include id="10" addr="0x7f20c70a4ed0" >
-        <attributelist id="11" addr="0x7f20c70a4ed0" >
-            <attribute name="name" value="/usr/share/swig/3.0.12/swig.swg" id="12" addr="0x7f20c70b39f0" />
+    <include id="10" addr="0x7f658f82fed0" >
+        <attributelist id="11" addr="0x7f658f82fed0" >
+            <attribute name="name" value="/usr/share/swig/3.0.12/swig.swg" id="12" addr="0x7f658f83e9f0" />
         </attributelist >
 
-        <include id="13" addr="0x7f20c70a4f30" >
-            <attributelist id="14" addr="0x7f20c70a4f30" >
-                <attribute name="name" value="/usr/share/swig/3.0.12/swigwarnings.swg" id="15" addr="0x7f20c70b39f0" />
+        <include id="13" addr="0x7f658f82ff30" >
+            <attributelist id="14" addr="0x7f658f82ff30" >
+                <attribute name="name" value="/usr/share/swig/3.0.12/swigwarnings.swg" id="15" addr="0x7f658f83e9f0" />
             </attributelist >
 
-            <include id="16" addr="0x7f20c70a54f0" >
-                <attributelist id="17" addr="0x7f20c70a54f0" >
-                    <attribute name="name" value="/usr/share/swig/3.0.12/swigwarn.swg" id="18" addr="0x7f20c70b39f0" />
+            <include id="16" addr="0x7f658f8304f0" >
+                <attributelist id="17" addr="0x7f658f8304f0" >
+                    <attribute name="name" value="/usr/share/swig/3.0.12/swigwarn.swg" id="18" addr="0x7f658f83e9f0" />
                 </attributelist >
              
             </include >
         </include >
-        <namespace id="19" addr="0x7f20c70a7170" >
-            <attributelist id="20" addr="0x7f20c70a7170" >
-                <attribute name="sym_name" value="std" id="21" addr="0x7f20c70b39f0" />
-                <attribute name="name" value="std" id="22" addr="0x7f20c70b39f0" />
-                <typescope id="23" addr="0x7f20c70b19f0" >
-                    <attributelist id="24" addr="0x7f20c70b19f0" >
-                        <attribute name="name" value="std" id="25" addr="0x7f20c70b39f0" />
-                        <typetab id="26" addr="0x7f20c70b1a10" >
-                            <attributelist id="27" addr="0x7f20c70b1a10" >
-                                <attribute name="initializer_list" value="initializer_list" id="28" addr="0x7f20c70b39f0" />
-                            </attributelist >
-                            <typetabsitem id="29" addr="0x7f20c70b1b30" >
-                                <attributelist id="30" addr="0x7f20c70b1b30" >
+        <namespace id="19" addr="0x7f658f832170" >
+            <attributelist id="20" addr="0x7f658f832170" >
+                <attribute name="sym_name" value="std" id="21" addr="0x7f658f83e9f0" />
+                <attribute name="name" value="std" id="22" addr="0x7f658f83e9f0" />
+                <typescope id="23" addr="0x7f658f83c9f0" >
+                    <attributelist id="24" addr="0x7f658f83c9f0" >
+                        <attribute name="name" value="std" id="25" addr="0x7f658f83e9f0" />
+                        <typetab id="26" addr="0x7f658f83ca10" >
+                            <attributelist id="27" addr="0x7f658f83ca10" >
+                                <attribute name="initializer_list" value="initializer_list" id="28" addr="0x7f658f83e9f0" />
+                            </attributelist >
+                            <typetabsitem id="29" addr="0x7f658f83cb30" >
+                                <attributelist id="30" addr="0x7f658f83cb30" >
                                 </attributelist >
                             </typetabsitem >
                         </typetab >
-                        <attribute name="parent" value="0x7f20c7093a30" id="31" addr="0x7f20c7093a30" />
-                        <attribute name="qname" value="std" id="32" addr="0x7f20c70b39f0" />
-                        <attribute name="symtab" value="0x7f20c70a70d0" id="33" addr="0x7f20c70a70d0" />
+                        <attribute name="parent" value="0x7f658f81ea30" id="31" addr="0x7f658f81ea30" />
+                        <attribute name="qname" value="std" id="32" addr="0x7f658f83e9f0" />
+                        <attribute name="symtab" value="0x7f658f8320d0" id="33" addr="0x7f658f8320d0" />
                     </attributelist >
-                    <typescopesitem id="34" addr="0x7f20c70a7030" >
-                        <attributelist id="35" addr="0x7f20c70a7030" >
+                    <typescopesitem id="34" addr="0x7f658f832030" >
+                        <attributelist id="35" addr="0x7f658f832030" >
                         </attributelist >
                     </typescopesitem >
-                    <typescopesitem id="36" addr="0x7f20c70b1a10" >
-                        <attributelist id="37" addr="0x7f20c70b1a10" >
-                            <attribute name="initializer_list" value="initializer_list" id="38" addr="0x7f20c70b39f0" />
+                    <typescopesitem id="36" addr="0x7f658f83ca10" >
+                        <attributelist id="37" addr="0x7f658f83ca10" >
+                            <attribute name="initializer_list" value="initializer_list" id="38" addr="0x7f658f83e9f0" />
                         </attributelist >
                     </typescopesitem >
-                    <typescopesitem id="39" addr="0x7f20c7093a30" >
-                        <attributelist id="40" addr="0x7f20c7093a30" >
-                            <attribute name="name" value="" id="41" addr="0x7f20c70b39f0" />
-                            <typetab id="42" addr="0x7f20c7093a90" >
-                                <attributelist id="43" addr="0x7f20c7093a90" >
+                    <typescopesitem id="39" addr="0x7f658f81ea30" >
+                        <attributelist id="40" addr="0x7f658f81ea30" >
+                            <attribute name="name" value="" id="41" addr="0x7f658f83e9f0" />
+                            <typetab id="42" addr="0x7f658f81ea90" >
+                                <attributelist id="43" addr="0x7f658f81ea90" >
                                 </attributelist >
                             </typetab >
                         </attributelist >
                     </typescopesitem >
-                    <typescopesitem id="44" addr="0x7f20c70b1a30" >
-                        <attributelist id="45" addr="0x7f20c70b1a30" >
+                    <typescopesitem id="44" addr="0x7f658f83ca30" >
+                        <attributelist id="45" addr="0x7f658f83ca30" >
                         </attributelist >
                     </typescopesitem >
-                    <typescopesitem id="46" addr="0x7f20c70a70d0" >
-                        <attributelist id="47" addr="0x7f20c70a70d0" >
-                            <attribute name="name" value="std" id="48" addr="0x7f20c70b39f0" />
-                            <attribute name="csymtab" value="0x7f20c70a7110" id="49" addr="0x7f20c70a7110" />
-                            <attribute name="symtab" value="0x7f20c70a70b0" id="50" addr="0x7f20c70a70b0" />
+                    <typescopesitem id="46" addr="0x7f658f8320d0" >
+                        <attributelist id="47" addr="0x7f658f8320d0" >
+                            <attribute name="name" value="std" id="48" addr="0x7f658f83e9f0" />
+                            <attribute name="csymtab" value="0x7f658f832110" id="49" addr="0x7f658f832110" />
+                            <attribute name="symtab" value="0x7f658f8320b0" id="50" addr="0x7f658f8320b0" />
                         </attributelist >
                     </typescopesitem >
                 </typescope >
-                <attribute name="symtab" value="0x7f20c70a70d0" id="51" addr="0x7f20c70a70d0" />
-                <attribute name="sym_symtab" value="0x7f20c7093950" id="52" addr="0x7f20c7093950" />
-                <attribute name="sym_overname" value="__SWIG_0" id="53" addr="0x7f20c70b39f0" />
+                <attribute name="symtab" value="0x7f658f8320d0" id="51" addr="0x7f658f8320d0" />
+                <attribute name="sym_symtab" value="0x7f658f81e950" id="52" addr="0x7f658f81e950" />
+                <attribute name="sym_overname" value="__SWIG_0" id="53" addr="0x7f658f83e9f0" />
             </attributelist >
 
-            <template id="54" addr="0x7f20c70a72f0" >
-                <attributelist id="55" addr="0x7f20c70a72f0" >
-                    <attribute name="templatetype" value="class" id="56" addr="0x7f20c70b39f0" />
-                    <attribute name="sym_typename" value="1" id="57" addr="0x7f20c70b39f0" />
-                    <attribute name="name" value="initializer_list" id="58" addr="0x7f20c70b39f0" />
-                    <attribute name="sym_symtab" value="0x7f20c70a70d0" id="59" addr="0x7f20c70a70d0" />
-                    <attribute name="symtab" value="0x7f20c70a7510" id="60" addr="0x7f20c70a7510" />
-                    <attribute name="allows_typedef" value="1" id="61" addr="0x7f20c70b39f0" />
-                    <attribute name="kind" value="class" id="62" addr="0x7f20c70b39f0" />
-                    <attribute name="sym_name" value="initializer_list" id="63" addr="0x7f20c70b39f0" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="64" addr="0x7f20c70b39f0" />
-                    <templateparms id="65" addr="0x7f20c70a7210" >
+            <template id="54" addr="0x7f658f8322f0" >
+                <attributelist id="55" addr="0x7f658f8322f0" >
+                    <attribute name="templatetype" value="class" id="56" addr="0x7f658f83e9f0" />
+                    <attribute name="sym_typename" value="1" id="57" addr="0x7f658f83e9f0" />
+                    <attribute name="name" value="initializer_list" id="58" addr="0x7f658f83e9f0" />
+                    <attribute name="sym_symtab" value="0x7f658f8320d0" id="59" addr="0x7f658f8320d0" />
+                    <attribute name="symtab" value="0x7f658f832510" id="60" addr="0x7f658f832510" />
+                    <attribute name="allows_typedef" value="1" id="61" addr="0x7f658f83e9f0" />
+                    <attribute name="kind" value="class" id="62" addr="0x7f658f83e9f0" />
+                    <attribute name="sym_name" value="initializer_list" id="63" addr="0x7f658f83e9f0" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="64" addr="0x7f658f83e9f0" />
+                    <templateparms id="65" addr="0x7f658f832210" >
                         <parm id="66">
-                            <attributelist id="67" addr="0x7f20c70a7210" >
-                                <attribute name="name" value="T" id="68" addr="0x7f20c70b39f0" />
-                                <attribute name="type" value="typename T" id="69" addr="0x7f20c70b39f0" />
+                            <attributelist id="67" addr="0x7f658f832210" >
+                                <attribute name="name" value="T" id="68" addr="0x7f658f83e9f0" />
+                                <attribute name="type" value="typename T" id="69" addr="0x7f658f83e9f0" />
                             </attributelist >
                         </parm >
                     </templateparms >
                 </attributelist >
 
-                <access id="70" addr="0x7f20c70a76d0" >
-                    <attributelist id="71" addr="0x7f20c70a76d0" >
-                        <attribute name="kind" value="public" id="72" addr="0x7f20c70b39f0" />
+                <access id="70" addr="0x7f658f8326d0" >
+                    <attributelist id="71" addr="0x7f658f8326d0" >
+                        <attribute name="kind" value="public" id="72" addr="0x7f658f83e9f0" />
                     </attributelist >
                  
                 </access >
             </template >
-            <typemap id="73" addr="0x7f20c70a7d30" >
-                <attributelist id="74" addr="0x7f20c70a7d30" >
-                    <kwargs id="75" addr="0x7f20c70a7a30" >
-                        <attributelist id="76" addr="0x7f20c70a7a30" >
-                            <attribute name="name" value="warning" id="77" addr="0x7f20c70b39f0" />
-                            <attribute name="value" value="476:Initialization using std::initializer_list." id="78" addr="0x7f20c70b39f0" />
+            <typemap id="73" addr="0x7f658f832d30" >
+                <attributelist id="74" addr="0x7f658f832d30" >
+                    <kwargs id="75" addr="0x7f658f832a30" >
+                        <attributelist id="76" addr="0x7f658f832a30" >
+                            <attribute name="name" value="warning" id="77" addr="0x7f658f83e9f0" />
+                            <attribute name="value" value="476:Initialization using std::initializer_list." id="78" addr="0x7f658f83e9f0" />
                         </attributelist >
-                        <kwargssitem id="79" addr="0x7f20c70a7bb0" >
-                            <attributelist id="80" addr="0x7f20c70a7bb0" >
+                        <kwargssitem id="79" addr="0x7f658f832bb0" >
+                            <attributelist id="80" addr="0x7f658f832bb0" >
                             </attributelist >
                         </kwargssitem >
-                        <kwargssitem id="81" addr="0x7f20c70a7a10" >
-                            <attributelist id="82" addr="0x7f20c70a7a10" >
+                        <kwargssitem id="81" addr="0x7f658f832a10" >
+                            <attributelist id="82" addr="0x7f658f832a10" >
                             </attributelist >
                         </kwargssitem >
                     </kwargs >
-                    <attribute name="code" value="" id="83" addr="0x7f20c70b39f0" />
-                    <attribute name="method" value="in" id="84" addr="0x7f20c70b39f0" />
+                    <attribute name="code" value="" id="83" addr="0x7f658f83e9f0" />
+                    <attribute name="method" value="in" id="84" addr="0x7f658f83e9f0" />
                 </attributelist >
 
-                <typemapitem id="85" addr="0x7f20c70a7c50" >
-                    <attributelist id="86" addr="0x7f20c70a7c50" >
-                        <parmlist id="87" addr="0x7f20c70a7c90" >
+                <typemapitem id="85" addr="0x7f658f832c50" >
+                    <attributelist id="86" addr="0x7f658f832c50" >
+                        <parmlist id="87" addr="0x7f658f832c90" >
                             <parm id="88">
-                                <attributelist id="89" addr="0x7f20c70a7c90" >
-                                    <attribute name="type" value="std::initializer_list&lt;(T)>" id="90" addr="0x7f20c70b39f0" />
+                                <attributelist id="89" addr="0x7f658f832c90" >
+                                    <attribute name="type" value="std::initializer_list&lt;(T)>" id="90" addr="0x7f658f83e9f0" />
                                 </attributelist >
                             </parm >
                         </parmlist >
@@ -143,32 +143,32 @@
                  
                 </typemapitem >
             </typemap >
-            <typemap id="91" addr="0x7f20c70a80b0" >
-                <attributelist id="92" addr="0x7f20c70a80b0" >
-                    <kwargs id="93" addr="0x7f20c70a7e50" >
-                        <attributelist id="94" addr="0x7f20c70a7e50" >
-                            <attribute name="name" value="precedence" id="95" addr="0x7f20c70b39f0" />
-                            <attribute name="value" value="0" id="96" addr="0x7f20c70b39f0" />
+            <typemap id="91" addr="0x7f658f8330b0" >
+                <attributelist id="92" addr="0x7f658f8330b0" >
+                    <kwargs id="93" addr="0x7f658f832e50" >
+                        <attributelist id="94" addr="0x7f658f832e50" >
+                            <attribute name="name" value="precedence" id="95" addr="0x7f658f83e9f0" />
+                            <attribute name="value" value="0" id="96" addr="0x7f658f83e9f0" />
                         </attributelist >
-                        <kwargssitem id="97" addr="0x7f20c70a7e70" >
-                            <attributelist id="98" addr="0x7f20c70a7e70" >
+                        <kwargssitem id="97" addr="0x7f658f832e70" >
+                            <attributelist id="98" addr="0x7f658f832e70" >
                             </attributelist >
                         </kwargssitem >
-                        <kwargssitem id="99" addr="0x7f20c70a7e90" >
-                            <attributelist id="100" addr="0x7f20c70a7e90" >
+                        <kwargssitem id="99" addr="0x7f658f832e90" >
+                            <attributelist id="100" addr="0x7f658f832e90" >
                             </attributelist >
                         </kwargssitem >
                     </kwargs >
-                    <attribute name="code" value="" id="101" addr="0x7f20c70b39f0" />
-                    <attribute name="method" value="typecheck" id="102" addr="0x7f20c70b39f0" />
+                    <attribute name="code" value="" id="101" addr="0x7f658f83e9f0" />
+                    <attribute name="method" value="typecheck" id="102" addr="0x7f658f83e9f0" />
                 </attributelist >
 
-                <typemapitem id="103" addr="0x7f20c70a7ff0" >
-                    <attributelist id="104" addr="0x7f20c70a7ff0" >
-                        <parmlist id="105" addr="0x7f20c70a8030" >
+                <typemapitem id="103" addr="0x7f658f832ff0" >
+                    <attributelist id="104" addr="0x7f658f832ff0" >
+                        <parmlist id="105" addr="0x7f658f833030" >
                             <parm id="106">
-                                <attributelist id="107" addr="0x7f20c70a8030" >
-                                    <attribute name="type" value="std::initializer_list&lt;(T)>" id="108" addr="0x7f20c70b39f0" />
+                                <attributelist id="107" addr="0x7f658f833030" >
+                                    <attribute name="type" value="std::initializer_list&lt;(T)>" id="108" addr="0x7f658f83e9f0" />
                                 </attributelist >
                             </parm >
                         </parmlist >
@@ -177,18 +177,18 @@
                 </typemapitem >
             </typemap >
         </namespace >
-        <typemap id="109" addr="0x7f20c70a82d0" >
-            <attributelist id="110" addr="0x7f20c70a82d0" >
-                <attribute name="code" value="delete [] $1;" id="111" addr="0x7f20c70b39f0" />
-                <attribute name="method" value="newfree" id="112" addr="0x7f20c70b39f0" />
+        <typemap id="109" addr="0x7f658f8332d0" >
+            <attributelist id="110" addr="0x7f658f8332d0" >
+                <attribute name="code" value="delete [] $1;" id="111" addr="0x7f658f83e9f0" />
+                <attribute name="method" value="newfree" id="112" addr="0x7f658f83e9f0" />
             </attributelist >
 
-            <typemapitem id="113" addr="0x7f20c70a81f0" >
-                <attributelist id="114" addr="0x7f20c70a81f0" >
-                    <parmlist id="115" addr="0x7f20c70a8230" >
+            <typemapitem id="113" addr="0x7f658f8331f0" >
+                <attributelist id="114" addr="0x7f658f8331f0" >
+                    <parmlist id="115" addr="0x7f658f833230" >
                         <parm id="116">
-                            <attributelist id="117" addr="0x7f20c70a8230" >
-                                <attribute name="type" value="p.char" id="118" addr="0x7f20c70b39f0" />
+                            <attributelist id="117" addr="0x7f658f833230" >
+                                <attribute name="type" value="p.char" id="118" addr="0x7f658f83e9f0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -196,18 +196,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="119" addr="0x7f20c70a84b0" >
-            <attributelist id="120" addr="0x7f20c70a84b0" >
-                <attribute name="code" value="{&#10;  delete [] $1;&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="121" addr="0x7f20c70b39f0" />
-                <attribute name="method" value="memberin" id="122" addr="0x7f20c70b39f0" />
+        <typemap id="119" addr="0x7f658f8334b0" >
+            <attributelist id="120" addr="0x7f658f8334b0" >
+                <attribute name="code" value="{&#10;  delete [] $1;&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="121" addr="0x7f658f83e9f0" />
+                <attribute name="method" value="memberin" id="122" addr="0x7f658f83e9f0" />
             </attributelist >
 
-            <typemapitem id="123" addr="0x7f20c70a83f0" >
-                <attributelist id="124" addr="0x7f20c70a83f0" >
-                    <parmlist id="125" addr="0x7f20c70a8430" >
+            <typemapitem id="123" addr="0x7f658f8333f0" >
+                <attributelist id="124" addr="0x7f658f8333f0" >
+                    <parmlist id="125" addr="0x7f658f833430" >
                         <parm id="126">
-                            <attributelist id="127" addr="0x7f20c70a8430" >
-                                <attribute name="type" value="p.char" id="128" addr="0x7f20c70b39f0" />
+                            <attributelist id="127" addr="0x7f658f833430" >
+                                <attribute name="type" value="p.char" id="128" addr="0x7f658f83e9f0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -215,32 +215,32 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="129" addr="0x7f20c70a8710" >
-            <attributelist id="130" addr="0x7f20c70a8710" >
-                <kwargs id="131" addr="0x7f20c70a8550" >
-                    <attributelist id="132" addr="0x7f20c70a8550" >
-                        <attribute name="name" value="warning" id="133" addr="0x7f20c70b39f0" />
-                        <attribute name="value" value="451:Setting a const char * variable may leak memory." id="134" addr="0x7f20c70b39f0" />
+        <typemap id="129" addr="0x7f658f833710" >
+            <attributelist id="130" addr="0x7f658f833710" >
+                <kwargs id="131" addr="0x7f658f833550" >
+                    <attributelist id="132" addr="0x7f658f833550" >
+                        <attribute name="name" value="warning" id="133" addr="0x7f658f83e9f0" />
+                        <attribute name="value" value="451:Setting a const char * variable may leak memory." id="134" addr="0x7f658f83e9f0" />
                     </attributelist >
-                    <kwargssitem id="135" addr="0x7f20c70a8570" >
-                        <attributelist id="136" addr="0x7f20c70a8570" >
+                    <kwargssitem id="135" addr="0x7f658f833570" >
+                        <attributelist id="136" addr="0x7f658f833570" >
                         </attributelist >
                     </kwargssitem >
-                    <kwargssitem id="137" addr="0x7f20c70a8530" >
-                        <attributelist id="138" addr="0x7f20c70a8530" >
+                    <kwargssitem id="137" addr="0x7f658f833530" >
+                        <attributelist id="138" addr="0x7f658f833530" >
                         </attributelist >
                     </kwargssitem >
                 </kwargs >
-                <attribute name="code" value="{&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="139" addr="0x7f20c70b39f0" />
-                <attribute name="method" value="memberin" id="140" addr="0x7f20c70b39f0" />
+                <attribute name="code" value="{&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="139" addr="0x7f658f83e9f0" />
+                <attribute name="method" value="memberin" id="140" addr="0x7f658f83e9f0" />
             </attributelist >
 
-            <typemapitem id="141" addr="0x7f20c70a8650" >
-                <attributelist id="142" addr="0x7f20c70a8650" >
-                    <parmlist id="143" addr="0x7f20c70a8690" >
+            <typemapitem id="141" addr="0x7f658f833650" >
+                <attributelist id="142" addr="0x7f658f833650" >
+                    <parmlist id="143" addr="0x7f658f833690" >
                         <parm id="144">
-                            <attributelist id="145" addr="0x7f20c70a8690" >
-                                <attribute name="type" value="p.q(const).char" id="146" addr="0x7f20c70b39f0" />
+                            <attributelist id="145" addr="0x7f658f833690" >
+                                <attribute name="type" value="p.q(const).char" id="146" addr="0x7f658f83e9f0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -248,18 +248,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="147" addr="0x7f20c70a88f0" >
-            <attributelist id="148" addr="0x7f20c70a88f0" >
-                <attribute name="code" value="{&#10;  delete [] $1;&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="149" addr="0x7f20c70b39f0" />
-                <attribute name="method" value="globalin" id="150" addr="0x7f20c70b39f0" />
+        <typemap id="147" addr="0x7f658f8338f0" >
+            <attributelist id="148" addr="0x7f658f8338f0" >
+                <attribute name="code" value="{&#10;  delete [] $1;&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="149" addr="0x7f658f83e9f0" />
+                <attribute name="method" value="globalin" id="150" addr="0x7f658f83e9f0" />
             </attributelist >
 
-            <typemapitem id="151" addr="0x7f20c70a8830" >
-                <attributelist id="152" addr="0x7f20c70a8830" >
-                    <parmlist id="153" addr="0x7f20c70a8870" >
+            <typemapitem id="151" addr="0x7f658f833830" >
+                <attributelist id="152" addr="0x7f658f833830" >
+                    <parmlist id="153" addr="0x7f658f833870" >
                         <parm id="154">
-                            <attributelist id="155" addr="0x7f20c70a8870" >
-                                <attribute name="type" value="p.char" id="156" addr="0x7f20c70b39f0" />
+                            <attributelist id="155" addr="0x7f658f833870" >
+                                <attribute name="type" value="p.char" id="156" addr="0x7f658f83e9f0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -267,32 +267,32 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="157" addr="0x7f20c70a8b50" >
-            <attributelist id="158" addr="0x7f20c70a8b50" >
-                <kwargs id="159" addr="0x7f20c70a8990" >
-                    <attributelist id="160" addr="0x7f20c70a8990" >
-                        <attribute name="name" value="warning" id="161" addr="0x7f20c70b39f0" />
-                        <attribute name="value" value="451:Setting a const char * variable may leak memory." id="162" addr="0x7f20c70b39f0" />
+        <typemap id="157" addr="0x7f658f833b50" >
+            <attributelist id="158" addr="0x7f658f833b50" >
+                <kwargs id="159" addr="0x7f658f833990" >
+                    <attributelist id="160" addr="0x7f658f833990" >
+                        <attribute name="name" value="warning" id="161" addr="0x7f658f83e9f0" />
+                        <attribute name="value" value="451:Setting a const char * variable may leak memory." id="162" addr="0x7f658f83e9f0" />
                     </attributelist >
-                    <kwargssitem id="163" addr="0x7f20c70a89b0" >
-                        <attributelist id="164" addr="0x7f20c70a89b0" >
+                    <kwargssitem id="163" addr="0x7f658f8339b0" >
+                        <attributelist id="164" addr="0x7f658f8339b0" >
                         </attributelist >
                     </kwargssitem >
-                    <kwargssitem id="165" addr="0x7f20c70a8970" >
-                        <attributelist id="166" addr="0x7f20c70a8970" >
+                    <kwargssitem id="165" addr="0x7f658f833970" >
+                        <attributelist id="166" addr="0x7f658f833970" >
                         </attributelist >
                     </kwargssitem >
                 </kwargs >
-                <attribute name="code" value="{&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="167" addr="0x7f20c70b39f0" />
-                <attribute name="method" value="globalin" id="168" addr="0x7f20c70b39f0" />
+                <attribute name="code" value="{&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="167" addr="0x7f658f83e9f0" />
+                <attribute name="method" value="globalin" id="168" addr="0x7f658f83e9f0" />
             </attributelist >
 
-            <typemapitem id="169" addr="0x7f20c70a8a90" >
-                <attributelist id="170" addr="0x7f20c70a8a90" >
-                    <parmlist id="171" addr="0x7f20c70a8ad0" >
+            <typemapitem id="169" addr="0x7f658f833a90" >
+                <attributelist id="170" addr="0x7f658f833a90" >
+                    <parmlist id="171" addr="0x7f658f833ad0" >
                         <parm id="172">
-                            <attributelist id="173" addr="0x7f20c70a8ad0" >
-                                <attribute name="type" value="p.q(const).char" id="174" addr="0x7f20c70b39f0" />
+                            <attributelist id="173" addr="0x7f658f833ad0" >
+                                <attribute name="type" value="p.q(const).char" id="174" addr="0x7f658f83e9f0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -300,18 +300,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="175" addr="0x7f20c70a8d70" >
-            <attributelist id="176" addr="0x7f20c70a8d70" >
-                <attribute name="code" value="{&#10;  if($input) {&#10;    strncpy((char*)$1, (const char *)$input, $1_dim0-1);&#10;    $1[$1_dim0-1] = 0;&#10;  } else {&#10;    $1[0] = 0;&#10;  }&#10;}" id="177" addr="0x7f20c70b39f0" />
-                <attribute name="method" value="memberin" id="178" addr="0x7f20c70b39f0" />
+        <typemap id="175" addr="0x7f658f833d70" >
+            <attributelist id="176" addr="0x7f658f833d70" >
+                <attribute name="code" value="{&#10;  if($input) {&#10;    strncpy((char*)$1, (const char *)$input, $1_dim0-1);&#10;    $1[$1_dim0-1] = 0;&#10;  } else {&#10;    $1[0] = 0;&#10;  }&#10;}" id="177" addr="0x7f658f83e9f0" />
+                <attribute name="method" value="memberin" id="178" addr="0x7f658f83e9f0" />
             </attributelist >
 
-            <typemapitem id="179" addr="0x7f20c70a8cb0" >
-                <attributelist id="180" addr="0x7f20c70a8cb0" >
-                    <parmlist id="181" addr="0x7f20c70a8cf0" >
+            <typemapitem id="179" addr="0x7f658f833cb0" >
+                <attributelist id="180" addr="0x7f658f833cb0" >
+                    <parmlist id="181" addr="0x7f658f833cf0" >
                         <parm id="182">
-                            <attributelist id="183" addr="0x7f20c70a8cf0" >
-                                <attribute name="type" value="a(ANY).char" id="184" addr="0x7f20c70b39f0" />
+                            <attributelist id="183" addr="0x7f658f833cf0" >
+                                <attribute name="type" value="a(ANY).char" id="184" addr="0x7f658f83e9f0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -319,18 +319,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="185" addr="0x7f20c70a8f90" >
-            <attributelist id="186" addr="0x7f20c70a8f90" >
-                <attribute name="code" value="{&#10;  if($input) {&#10;    strncpy((char*)$1, (const char *)$input, $1_dim0-1);&#10;    $1[$1_dim0-1] = 0;&#10;  } else {&#10;    $1[0] = 0;&#10;  }&#10;}" id="187" addr="0x7f20c70b39f0" />
-                <attribute name="method" value="globalin" id="188" addr="0x7f20c70b39f0" />
+        <typemap id="185" addr="0x7f658f833f90" >
+            <attributelist id="186" addr="0x7f658f833f90" >
+                <attribute name="code" value="{&#10;  if($input) {&#10;    strncpy((char*)$1, (const char *)$input, $1_dim0-1);&#10;    $1[$1_dim0-1] = 0;&#10;  } else {&#10;    $1[0] = 0;&#10;  }&#10;}" id="187" addr="0x7f658f83e9f0" />
+                <attribute name="method" value="globalin" id="188" addr="0x7f658f83e9f0" />
             </attributelist >
 
-            <typemapitem id="189" addr="0x7f20c70a8ed0" >
-                <attributelist id="190" addr="0x7f20c70a8ed0" >
-                    <parmlist id="191" addr="0x7f20c70a8f10" >
+            <typemapitem id="189" addr="0x7f658f833ed0" >
+                <attributelist id="190" addr="0x7f658f833ed0" >
+                    <parmlist id="191" addr="0x7f658f833f10" >
                         <parm id="192">
-                            <attributelist id="193" addr="0x7f20c70a8f10" >
-                                <attribute name="type" value="a(ANY).char" id="194" addr="0x7f20c70b39f0" />
+                            <attributelist id="193" addr="0x7f658f833f10" >
+                                <attribute name="type" value="a(ANY).char" id="194" addr="0x7f658f83e9f0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -338,18 +338,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="195" addr="0x7f20c70a9170" >
-            <attributelist id="196" addr="0x7f20c70a9170" >
-                <attribute name="code" value="{&#10;  if ($input) strcpy((char *)$1, (const char *)$input);&#10;  else $1[0] = 0;&#10;}" id="197" addr="0x7f20c70b39f0" />
-                <attribute name="method" value="memberin" id="198" addr="0x7f20c70b39f0" />
+        <typemap id="195" addr="0x7f658f834170" >
+            <attributelist id="196" addr="0x7f658f834170" >
+                <attribute name="code" value="{&#10;  if ($input) strcpy((char *)$1, (const char *)$input);&#10;  else $1[0] = 0;&#10;}" id="197" addr="0x7f658f83e9f0" />
+                <attribute name="method" value="memberin" id="198" addr="0x7f658f83e9f0" />
             </attributelist >
 
-            <typemapitem id="199" addr="0x7f20c70a90b0" >
-                <attributelist id="200" addr="0x7f20c70a90b0" >
-                    <parmlist id="201" addr="0x7f20c70a90f0" >
+            <typemapitem id="199" addr="0x7f658f8340b0" >
+                <attributelist id="200" addr="0x7f658f8340b0" >
+                    <parmlist id="201" addr="0x7f658f8340f0" >
                         <parm id="202">
-                            <attributelist id="203" addr="0x7f20c70a90f0" >
-                                <attribute name="type" value="a().char" id="204" addr="0x7f20c70b39f0" />
+                            <attributelist id="203" addr="0x7f658f8340f0" >
+                                <attribute name="type" value="a().char" id="204" addr="0x7f658f83e9f0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -357,18 +357,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="205" addr="0x7f20c70a9350" >
-            <attributelist id="206" addr="0x7f20c70a9350" >
-                <attribute name="code" value="{&#10;  if ($input) strcpy((char *)$1, (const char *)$input);&#10;  else $1[0] = 0;&#10;}" id="207" addr="0x7f20c70b39f0" />
-                <attribute name="method" value="globalin" id="208" addr="0x7f20c70b39f0" />
+        <typemap id="205" addr="0x7f658f834350" >
+            <attributelist id="206" addr="0x7f658f834350" >
+                <attribute name="code" value="{&#10;  if ($input) strcpy((char *)$1, (const char *)$input);&#10;  else $1[0] = 0;&#10;}" id="207" addr="0x7f658f83e9f0" />
+                <attribute name="method" value="globalin" id="208" addr="0x7f658f83e9f0" />
             </attributelist >
 
-            <typemapitem id="209" addr="0x7f20c70a9290" >
-                <attributelist id="210" addr="0x7f20c70a9290" >
-                    <parmlist id="211" addr="0x7f20c70a92d0" >
+            <typemapitem id="209" addr="0x7f658f834290" >
+                <attributelist id="210" addr="0x7f658f834290" >
+                    <parmlist id="211" addr="0x7f658f8342d0" >
                         <parm id="212">
-                            <attributelist id="213" addr="0x7f20c70a92d0" >
-                                <attribute name="type" value="a().char" id="214" addr="0x7f20c70b39f0" />
+                            <attributelist id="213" addr="0x7f658f8342d0" >
+                                <attribute name="type" value="a().char" id="214" addr="0x7f658f83e9f0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -376,18 +376,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="215" addr="0x7f20c70a9570" >
-            <attributelist id="216" addr="0x7f20c70a9570" >
-                <attribute name="code" value="{&#10;  size_t ii;&#10;  $1_basetype *b = ($1_basetype *) $1;&#10;  for (ii = 0; ii &lt; (size_t)$1_size; ii++) b[ii] = *(($1_basetype *) $input + ii);&#10;}" id="217" addr="0x7f20c70b39f0" />
-                <attribute name="method" value="memberin" id="218" addr="0x7f20c70b39f0" />
+        <typemap id="215" addr="0x7f658f834570" >
+            <attributelist id="216" addr="0x7f658f834570" >
+                <attribute name="code" value="{&#10;  size_t ii;&#10;  $1_basetype *b = ($1_basetype *) $1;&#10;  for (ii = 0; ii &lt; (size_t)$1_size; ii++) b[ii] = *(($1_basetype *) $input + ii);&#10;}" id="217" addr="0x7f658f83e9f0" />
+                <attribute name="method" value="memberin" id="218" addr="0x7f658f83e9f0" />
             </attributelist >
 
-            <typemapitem id="219" addr="0x7f20c70a94b0" >
-                <attributelist id="220" addr="0x7f20c70a94b0" >
-                    <parmlist id="221" addr="0x7f20c70a94f0" >
+            <typemapitem id="219" addr="0x7f658f8344b0" >
+                <attributelist id="220" addr="0x7f658f8344b0" >
+                    <parmlist id="221" addr="0x7f658f8344f0" >
                         <parm id="222">
-                            <attributelist id="223" addr="0x7f20c70a94f0" >
-                                <attribute name="type" value="a(ANY).SWIGTYPE" id="224" addr="0x7f20c70b39f0" />
+                            <attributelist id="223" addr="0x7f658f8344f0" >
+                                <attribute name="type" value="a(ANY).SWIGTYPE" id="224" addr="0x7f658f83e9f0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -395,18 +395,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="225" addr="0x7f20c70a9790" >
-            <attributelist id="226" addr="0x7f20c70a9790" >
-                <attribute name="code" value="{&#10;  size_t ii;&#10;  $1_basetype *b = ($1_basetype *) $1;&#10;  for (ii = 0; ii &lt; (size_t)$1_size; ii++) b[ii] = *(($1_basetype *) $input + ii);&#10;}" id="227" addr="0x7f20c70b39f0" />
-                <attribute name="method" value="globalin" id="228" addr="0x7f20c70b39f0" />
+        <typemap id="225" addr="0x7f658f834790" >
+            <attributelist id="226" addr="0x7f658f834790" >
+                <attribute name="code" value="{&#10;  size_t ii;&#10;  $1_basetype *b = ($1_basetype *) $1;&#10;  for (ii = 0; ii &lt; (size_t)$1_size; ii++) b[ii] = *(($1_basetype *) $input + ii);&#10;}" id="227" addr="0x7f658f83e9f0" />
+                <attribute name="method" value="globalin" id="228" addr="0x7f658f83e9f0" />
             </attributelist >
 
-            <typemapitem id="229" addr="0x7f20c70a96d0" >
-                <attributelist id="230" addr="0x7f20c70a96d0" >
-                    <parmlist id="231" addr="0x7f20c70a9710" >
+            <typemapitem id="229" addr="0x7f658f8346d0" >
+                <attributelist id="230" addr="0x7f658f8346d0" >
+                    <parmlist id="231" addr="0x7f658f834710" >
                         <parm id="232">
-                            <attributelist id="233" addr="0x7f20c70a9710" >
-                                <attribute name="type" value="a(ANY).SWIGTYPE" id="234" addr="0x7f20c70b39f0" />
+                            <attributelist id="233" addr="0x7f658f834710" >
+                                <attribute name="type" value="a(ANY).SWIGTYPE" id="234" addr="0x7f658f83e9f0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -414,18 +414,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="235" addr="0x7f20c70a99f0" >
-            <attributelist id="236" addr="0x7f20c70a99f0" >
-                <attribute name="code" value="{&#10;  $basetype (*inp)[$1_dim1] = ($basetype (*)[$1_dim1])($input);&#10;  $basetype (*dest)[$1_dim1] = ($basetype (*)[$1_dim1])($1);&#10;  size_t ii = 0;&#10;  for (; ii &lt; $1_dim0; ++ii) {&#10;    $basetype *ip = inp[ii];&#10;    $basetype *dp = dest[ii];&#10;    size_t jj = 0;&#10;    for (; jj &lt; $1_dim1; ++jj) dp[jj] = ip[jj];&#10;  }&#10;}" id="237" addr="0x7f20c70b39f0" />
-                <attribute name="method" value="memberin" id="238" addr="0x7f20c70b39f0" />
+        <typemap id="235" addr="0x7f658f8349f0" >
+            <attributelist id="236" addr="0x7f658f8349f0" >
+                <attribute name="code" value="{&#10;  $basetype (*inp)[$1_dim1] = ($basetype (*)[$1_dim1])($input);&#10;  $basetype (*dest)[$1_dim1] = ($basetype (*)[$1_dim1])($1);&#10;  size_t ii = 0;&#10;  for (; ii &lt; $1_dim0; ++ii) {&#10;    $basetype *ip = inp[ii];&#10;    $basetype *dp = dest[ii];&#10;    size_t jj = 0;&#10;    for (; jj &lt; $1_dim1; ++jj) dp[jj] = ip[jj];&#10;  }&#10;}" id="237" addr="0x7f658f83e9f0" />
+                <attribute name="method" value="memberin" id="238" addr="0x7f658f83e9f0" />
             </attributelist >
 
-            <typemapitem id="239" addr="0x7f20c70a98d0" >
-                <attributelist id="240" addr="0x7f20c70a98d0" >
-                    <parmlist id="241" addr="0x7f20c70a9970" >
+            <typemapitem id="239" addr="0x7f658f8348d0" >
+                <attributelist id="240" addr="0x7f658f8348d0" >
+                    <parmlist id="241" addr="0x7f658f834970" >
                         <parm id="242">
-                            <attributelist id="243" addr="0x7f20c70a9970" >
-                                <attribute name="type" value="a(ANY).a(ANY).SWIGTYPE" id="244" addr="0x7f20c70b39f0" />
+                            <attributelist id="243" addr="0x7f658f834970" >
+                                <attribute name="type" value="a(ANY).a(ANY).SWIGTYPE" id="244" addr="0x7f658f83e9f0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -433,18 +433,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="245" addr="0x7f20c70a9c50" >
-            <attributelist id="246" addr="0x7f20c70a9c50" >
-                <attribute name="code" value="{&#10;  $basetype (*inp)[$1_dim1] = ($basetype (*)[$1_dim1])($input);&#10;  $basetype (*dest)[$1_dim1] = ($basetype (*)[$1_dim1])($1);&#10;  size_t ii = 0;&#10;  for (; ii &lt; $1_dim0; ++ii) {&#10;    $basetype *ip = inp[ii];&#10;    $basetype *dp = dest[ii];&#10;    size_t jj = 0;&#10;    for (; jj &lt; $1_dim1; ++jj) dp[jj] = ip[jj];&#10;  }&#10;}" id="247" addr="0x7f20c70b39f0" />
-                <attribute name="method" value="globalin" id="248" addr="0x7f20c70b39f0" />
+        <typemap id="245" addr="0x7f658f834c50" >
+            <attributelist id="246" addr="0x7f658f834c50" >
+                <attribute name="code" value="{&#10;  $basetype (*inp)[$1_dim1] = ($basetype (*)[$1_dim1])($input);&#10;  $basetype (*dest)[$1_dim1] = ($basetype (*)[$1_dim1])($1);&#10;  size_t ii = 0;&#10;  for (; ii &lt; $1_dim0; ++ii) {&#10;    $basetype *ip = inp[ii];&#10;    $basetype *dp = dest[ii];&#10;    size_t jj = 0;&#10;    for (; jj &lt; $1_dim1; ++jj) dp[jj] = ip[jj];&#10;  }&#10;}" id="247" addr="0x7f658f83e9f0" />
+                <attribute name="method" value="globalin" id="248" addr="0x7f658f83e9f0" />
             </attributelist >
 
-            <typemapitem id="249" addr="0x7f20c70a9b30" >
-                <attributelist id="250" addr="0x7f20c70a9b30" >
-                    <parmlist id="251" addr="0x7f20c70a9bd0" >
+            <typemapitem id="249" addr="0x7f658f834b30" >
+                <attributelist id="250" addr="0x7f658f834b30" >
+                    <parmlist id="251" addr="0x7f658f834bd0" >
                         <parm id="252">
-                            <attributelist id="253" addr="0x7f20c70a9bd0" >
-                                <attribute name="type" value="a(ANY).a(ANY).SWIGTYPE" id="254" addr="0x7f20c70b39f0" />
+                            <attributelist id="253" addr="0x7f658f834bd0" >
+                                <attribute name="type" value="a(ANY).a(ANY).SWIGTYPE" id="254" addr="0x7f658f83e9f0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -452,607 +452,607 @@
              
             </typemapitem >
         </typemap >
-        <insert id="255" addr="0x7f20c70a9d10" >
-            <attributelist id="256" addr="0x7f20c70a9d10" >
-                <attribute name="code" value="&#10;#ifdef __cplusplus&#10;/* SwigValueWrapper is described in swig.swg */&#10;template&lt;typename T> class SwigValueWrapper {&#10;  struct SwigMovePointer {&#10;    T *ptr;&#10;    SwigMovePointer(T *p) : ptr(p) { }&#10;    ~SwigMovePointer() { delete ptr; }&#10;    SwigMovePointer&amp; operator=(SwigMovePointer&amp; rhs) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = rhs.ptr; rhs.ptr = 0; return *this; }&#10;  } pointer;&#10;  SwigValueWrapper&amp; operator=(const SwigValueWrapper&lt;T>&amp; rhs);&#10;  SwigValueWrapper(const SwigValueWrapper&lt;T>&amp; rhs);&#10;public:&#10;  SwigValueWrapper() : pointer(0) { }&#10;  SwigValueWrapper&amp; operator=(const T&amp; t) { SwigMovePointer tmp(new T(t)); pointer = tmp; return *this; }&#10;  operator T&amp;() const { return *pointer.ptr; }&#10;  T *operator&amp;() { return pointer.ptr; }&#10;};" id="257" addr="0x7f20c70b39f0" />
-                <attribute name="section" value="runtime" id="258" addr="0x7f20c70b39f0" />
+        <insert id="255" addr="0x7f658f834d10" >
+            <attributelist id="256" addr="0x7f658f834d10" >
+                <attribute name="code" value="&#10;#ifdef __cplusplus&#10;/* SwigValueWrapper is described in swig.swg */&#10;template&lt;typename T> class SwigValueWrapper {&#10;  struct SwigMovePointer {&#10;    T *ptr;&#10;    SwigMovePointer(T *p) : ptr(p) { }&#10;    ~SwigMovePointer() { delete ptr; }&#10;    SwigMovePointer&amp; operator=(SwigMovePointer&amp; rhs) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = rhs.ptr; rhs.ptr = 0; return *this; }&#10;  } pointer;&#10;  SwigValueWrapper&amp; operator=(const SwigValueWrapper&lt;T>&amp; rhs);&#10;  SwigValueWrapper(const SwigValueWrapper&lt;T>&amp; rhs);&#10;public:&#10;  SwigValueWrapper() : pointer(0) { }&#10;  SwigValueWrapper&amp; operator=(const T&amp; t) { SwigMovePointer tmp(new T(t)); pointer = tmp; return *this; }&#10;  operator T&amp;() const { return *pointer.ptr; }&#10;  T *operator&amp;() { return pointer.ptr; }&#10;};" id="257" addr="0x7f658f83e9f0" />
+                <attribute name="section" value="runtime" id="258" addr="0x7f658f83e9f0" />
             </attributelist >
          
         </insert >
-        <insert id="259" addr="0x7f20c70a9df0" >
-            <attributelist id="260" addr="0x7f20c70a9df0" >
-                <attribute name="code" value="&#10;template &lt;typename T> T SwigValueInit() {&#10;  return T();&#10;}&#10;#endif&#10;" id="261" addr="0x7f20c70b39f0" />
-                <attribute name="section" value="runtime" id="262" addr="0x7f20c70b39f0" />
+        <insert id="259" addr="0x7f658f834df0" >
+            <attributelist id="260" addr="0x7f658f834df0" >
+                <attribute name="code" value="&#10;template &lt;typename T> T SwigValueInit() {&#10;  return T();&#10;}&#10;#endif&#10;" id="261" addr="0x7f658f83e9f0" />
+                <attribute name="section" value="runtime" id="262" addr="0x7f658f83e9f0" />
             </attributelist >
          
         </insert >
-        <insert id="263" addr="0x7f20c70a9ed0" >
-            <attributelist id="264" addr="0x7f20c70a9ed0" >
-                <attribute name="code" value="/* -----------------------------------------------------------------------------&#10; *  This section contains generic SWIG labels for method/variable&#10; *  declarations/attributes, and other compiler dependent labels.&#10; * ----------------------------------------------------------------------------- */&#10;&#10;/* template workaround for compilers that cannot correctly implement the C++ standard */&#10;#ifndef SWIGTEMPLATEDISAMBIGUATOR&#10;# if defined(__SUNPRO_CC) &amp;&amp; (__SUNPRO_CC &lt;= 0x560)&#10;#  define SWIGTEMPLATEDISAMBIGUATOR template&#10;# elif defined(__HP_aCC)&#10;/* Needed even with `aCC -AA' when `aCC -V' reports HP ANSI C++ B3910B A.03.55 */&#10;/* If we find a maximum version that requires this, the test would be __HP_aCC &lt;= 35500 for A.03.55 */&#10;#  define SWIGTEMPLATEDISAMBIGUATOR template&#10;# else&#10;#  define SWIGTEMPLATEDISAMBIGUATOR&#10;# endif&#10;#endif&#10;&#10;/* inline attribute */&#10;#ifndef SWIGINLINE&#10;# if defined(__cplusplus) || (defined(__GNUC__) &amp;&amp; !defined(__STRICT_ANSI__))&#10;#   define SWIGINLINE inline&#10;# else&#10;#   define SWIGINLINE&#10;# endif&#10;#endif&#10;&#10;/* attribute recognised by some compilers to avoid 'unused' warnings */&#10;#ifndef SWIGUNUSED&#10;# if defined(__GNUC__)&#10;#   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 &amp;&amp; __GNUC_MINOR__ >= 4))&#10;#     define SWIGUNUSED __attribute__ ((__unused__))&#10;#   else&#10;#     define SWIGUNUSED&#10;#   endif&#10;# elif defined(__ICC)&#10;#   define SWIGUNUSED __attribute__ ((__unused__))&#10;# else&#10;#   define SWIGUNUSED&#10;# endif&#10;#endif&#10;&#10;#ifndef SWIG_MSC_UNSUPPRESS_4505&#10;# if defined(_MSC_VER)&#10;#   pragma warning(disable : 4505) /* unreferenced local function has been removed */&#10;# endif&#10;#endif&#10;&#10;#ifndef SWIGUNUSEDPARM&#10;# ifdef __cplusplus&#10;#   define SWIGUNUSEDPARM(p)&#10;# else&#10;#   define SWIGUNUSEDPARM(p) p SWIGUNUSED&#10;# endif&#10;#endif&#10;&#10;/* internal SWIG method */&#10;#ifndef SWIGINTERN&#10;# define SWIGINTERN static SWIGUNUSED&#10;#endif&#10;&#10;/* internal inline SWIG method */&#10;#ifndef SWIGINTERNINLINE&#10;# define SWIGINTERNINLINE SWIGINTERN SWIGINLINE&#10;#endif&#10;&#10;/* exporting methods */&#10;#if defined(__GNUC__)&#10;#  if (__GNUC__ >= 4) || (__GNUC__ == 3 &amp;&amp; __GNUC_MINOR__ >= 4)&#10;#    ifndef GCC_HASCLASSVISIBILITY&#10;#      define GCC_HASCLASSVISIBILITY&#10;#    endif&#10;#  endif&#10;#endif&#10;&#10;#ifndef SWIGEXPORT&#10;# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)&#10;#   if defined(STATIC_LINKED)&#10;#     define SWIGEXPORT&#10;#   else&#10;#     define SWIGEXPORT __declspec(dllexport)&#10;#   endif&#10;# else&#10;#   if defined(__GNUC__) &amp;&amp; defined(GCC_HASCLASSVISIBILITY)&#10;#     define SWIGEXPORT __attribute__ ((visibility(&quot;default&quot;)))&#10;#   else&#10;#     define SWIGEXPORT&#10;#   endif&#10;# endif&#10;#endif&#10;&#10;/* calling conventions for Windows */&#10;#ifndef SWIGSTDCALL&#10;# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)&#10;#   define SWIGSTDCALL __stdcall&#10;# else&#10;#   define SWIGSTDCALL&#10;# endif&#10;#endif&#10;&#10;/* Deal with Microsoft's attempt at deprecating C standard runtime functions */&#10;#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) &amp;&amp; defined(_MSC_VER) &amp;&amp; !defined(_CRT_SECURE_NO_DEPRECATE)&#10;# define _CRT_SECURE_NO_DEPRECATE&#10;#endif&#10;&#10;/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */&#10;#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) &amp;&amp; defined(_MSC_VER) &amp;&amp; !defined(_SCL_SECURE_NO_DEPRECATE)&#10;# define _SCL_SECURE_NO_DEPRECATE&#10;#endif&#10;&#10;/* Deal with Apple's deprecated 'AssertMacros.h' from Carbon-framework */&#10;#if defined(__APPLE__) &amp;&amp; !defined(__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES)&#10;# define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0&#10;#endif&#10;&#10;/* Intel's compiler complains if a variable which was never initialised is&#10; * cast to void, which is a common idiom which we use to indicate that we&#10; * are aware a variable isn't used.  So we just silence that warning.&#10; * See: https://github.com/swig/swig/issues/192 for more discussion.&#10; */&#10;#ifdef __INTEL_COMPILER&#10;# pragma warning disable 592&#10;#endif&#10;" id="265" addr="0x7f20c70b39f0" />
-                <attribute name="section" value="runtime" id="266" addr="0x7f20c70b39f0" />
+        <insert id="263" addr="0x7f658f834ed0" >
+            <attributelist id="264" addr="0x7f658f834ed0" >
+                <attribute name="code" value="/* -----------------------------------------------------------------------------&#10; *  This section contains generic SWIG labels for method/variable&#10; *  declarations/attributes, and other compiler dependent labels.&#10; * ----------------------------------------------------------------------------- */&#10;&#10;/* template workaround for compilers that cannot correctly implement the C++ standard */&#10;#ifndef SWIGTEMPLATEDISAMBIGUATOR&#10;# if defined(__SUNPRO_CC) &amp;&amp; (__SUNPRO_CC &lt;= 0x560)&#10;#  define SWIGTEMPLATEDISAMBIGUATOR template&#10;# elif defined(__HP_aCC)&#10;/* Needed even with `aCC -AA' when `aCC -V' reports HP ANSI C++ B3910B A.03.55 */&#10;/* If we find a maximum version that requires this, the test would be __HP_aCC &lt;= 35500 for A.03.55 */&#10;#  define SWIGTEMPLATEDISAMBIGUATOR template&#10;# else&#10;#  define SWIGTEMPLATEDISAMBIGUATOR&#10;# endif&#10;#endif&#10;&#10;/* inline attribute */&#10;#ifndef SWIGINLINE&#10;# if defined(__cplusplus) || (defined(__GNUC__) &amp;&amp; !defined(__STRICT_ANSI__))&#10;#   define SWIGINLINE inline&#10;# else&#10;#   define SWIGINLINE&#10;# endif&#10;#endif&#10;&#10;/* attribute recognised by some compilers to avoid 'unused' warnings */&#10;#ifndef SWIGUNUSED&#10;# if defined(__GNUC__)&#10;#   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 &amp;&amp; __GNUC_MINOR__ >= 4))&#10;#     define SWIGUNUSED __attribute__ ((__unused__))&#10;#   else&#10;#     define SWIGUNUSED&#10;#   endif&#10;# elif defined(__ICC)&#10;#   define SWIGUNUSED __attribute__ ((__unused__))&#10;# else&#10;#   define SWIGUNUSED&#10;# endif&#10;#endif&#10;&#10;#ifndef SWIG_MSC_UNSUPPRESS_4505&#10;# if defined(_MSC_VER)&#10;#   pragma warning(disable : 4505) /* unreferenced local function has been removed */&#10;# endif&#10;#endif&#10;&#10;#ifndef SWIGUNUSEDPARM&#10;# ifdef __cplusplus&#10;#   define SWIGUNUSEDPARM(p)&#10;# else&#10;#   define SWIGUNUSEDPARM(p) p SWIGUNUSED&#10;# endif&#10;#endif&#10;&#10;/* internal SWIG method */&#10;#ifndef SWIGINTERN&#10;# define SWIGINTERN static SWIGUNUSED&#10;#endif&#10;&#10;/* internal inline SWIG method */&#10;#ifndef SWIGINTERNINLINE&#10;# define SWIGINTERNINLINE SWIGINTERN SWIGINLINE&#10;#endif&#10;&#10;/* exporting methods */&#10;#if defined(__GNUC__)&#10;#  if (__GNUC__ >= 4) || (__GNUC__ == 3 &amp;&amp; __GNUC_MINOR__ >= 4)&#10;#    ifndef GCC_HASCLASSVISIBILITY&#10;#      define GCC_HASCLASSVISIBILITY&#10;#    endif&#10;#  endif&#10;#endif&#10;&#10;#ifndef SWIGEXPORT&#10;# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)&#10;#   if defined(STATIC_LINKED)&#10;#     define SWIGEXPORT&#10;#   else&#10;#     define SWIGEXPORT __declspec(dllexport)&#10;#   endif&#10;# else&#10;#   if defined(__GNUC__) &amp;&amp; defined(GCC_HASCLASSVISIBILITY)&#10;#     define SWIGEXPORT __attribute__ ((visibility(&quot;default&quot;)))&#10;#   else&#10;#     define SWIGEXPORT&#10;#   endif&#10;# endif&#10;#endif&#10;&#10;/* calling conventions for Windows */&#10;#ifndef SWIGSTDCALL&#10;# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)&#10;#   define SWIGSTDCALL __stdcall&#10;# else&#10;#   define SWIGSTDCALL&#10;# endif&#10;#endif&#10;&#10;/* Deal with Microsoft's attempt at deprecating C standard runtime functions */&#10;#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) &amp;&amp; defined(_MSC_VER) &amp;&amp; !defined(_CRT_SECURE_NO_DEPRECATE)&#10;# define _CRT_SECURE_NO_DEPRECATE&#10;#endif&#10;&#10;/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */&#10;#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) &amp;&amp; defined(_MSC_VER) &amp;&amp; !defined(_SCL_SECURE_NO_DEPRECATE)&#10;# define _SCL_SECURE_NO_DEPRECATE&#10;#endif&#10;&#10;/* Deal with Apple's deprecated 'AssertMacros.h' from Carbon-framework */&#10;#if defined(__APPLE__) &amp;&amp; !defined(__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES)&#10;# define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0&#10;#endif&#10;&#10;/* Intel's compiler complains if a variable which was never initialised is&#10; * cast to void, which is a common idiom which we use to indicate that we&#10; * are aware a variable isn't used.  So we just silence that warning.&#10; * See: https://github.com/swig/swig/issues/192 for more discussion.&#10; */&#10;#ifdef __INTEL_COMPILER&#10;# pragma warning disable 592&#10;#endif&#10;" id="265" addr="0x7f658f83e9f0" />
+                <attribute name="section" value="runtime" id="266" addr="0x7f658f83e9f0" />
             </attributelist >
          
         </insert >
     </include >
-    <include id="267" addr="0x7f20c70aa050" >
-        <attributelist id="268" addr="0x7f20c70aa050" >
-            <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmcvfs.i" id="269" addr="0x7f20c70b39f0" />
-            <attribute name="module" value="" id="270" addr="0x7f20c70aa0f0" />
-            <attribute name="options" value="0x7f20c70a9fd0" id="271" addr="0x7f20c70a9fd0" />
+    <include id="267" addr="0x7f658f835050" >
+        <attributelist id="268" addr="0x7f658f835050" >
+            <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmcvfs.i" id="269" addr="0x7f658f83e9f0" />
+            <attribute name="module" value="" id="270" addr="0x7f658f8350f0" />
+            <attribute name="options" value="0x7f658f834fd0" id="271" addr="0x7f658f834fd0" />
         </attributelist >
 
-        <module id="272" addr="0x7f20c70aa090" >
-            <attributelist id="273" addr="0x7f20c70aa090" >
-                <attribute name="name" value="xbmcvfs" id="274" addr="0x7f20c70b39f0" />
+        <module id="272" addr="0x7f658f835090" >
+            <attributelist id="273" addr="0x7f658f835090" >
+                <attribute name="name" value="xbmcvfs" id="274" addr="0x7f658f83e9f0" />
             </attributelist >
          
         </module >
-        <insert id="275" addr="0x7f20c70aa130" >
-            <attributelist id="276" addr="0x7f20c70aa130" >
-                <attribute name="code" value="&#10;#if defined(TARGET_WINDOWS)&#10;#  include &lt;windows.h>&#10;#endif&#10;&#10;#include &quot;interfaces/legacy/ModuleXbmcvfs.h&quot;&#10;#include &quot;interfaces/legacy/File.h&quot;&#10;#include &quot;interfaces/legacy/Stat.h&quot;&#10;#include &quot;utils/log.h&quot;&#10;&#10;using namespace XBMCAddon;&#10;using namespace xbmcvfs;&#10;&#10;#if defined(__GNUG__)&#10;#pragma GCC diagnostic ignored &quot;-Wstrict-aliasing&quot;&#10;#endif&#10;&#10;" id="277" addr="0x7f20c70b39f0" />
+        <insert id="275" addr="0x7f658f835130" >
+            <attributelist id="276" addr="0x7f658f835130" >
+                <attribute name="code" value="&#10;#if defined(TARGET_WINDOWS)&#10;#  include &lt;windows.h>&#10;#endif&#10;&#10;#include &quot;interfaces/legacy/ModuleXbmcvfs.h&quot;&#10;#include &quot;interfaces/legacy/File.h&quot;&#10;#include &quot;interfaces/legacy/Stat.h&quot;&#10;#include &quot;utils/log.h&quot;&#10;&#10;using namespace XBMCAddon;&#10;using namespace xbmcvfs;&#10;&#10;#if defined(__GNUG__)&#10;#pragma GCC diagnostic ignored &quot;-Wstrict-aliasing&quot;&#10;#endif&#10;&#10;" id="277" addr="0x7f658f83e9f0" />
             </attributelist >
          
         </insert >
-        <include id="278" addr="0x7f20c70aa1b0" >
-            <attributelist id="279" addr="0x7f20c70aa1b0" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/swighelper.h" id="280" addr="0x7f20c70b39f0" />
+        <include id="278" addr="0x7f658f8351b0" >
+            <attributelist id="279" addr="0x7f658f8351b0" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/swighelper.h" id="280" addr="0x7f658f83e9f0" />
             </attributelist >
          
         </include >
-        <include id="281" addr="0x7f20c70aa230" >
-            <attributelist id="282" addr="0x7f20c70aa230" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/AddonString.h" id="283" addr="0x7f20c70b39f0" />
+        <include id="281" addr="0x7f658f835230" >
+            <attributelist id="282" addr="0x7f658f835230" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/AddonString.h" id="283" addr="0x7f658f83e9f0" />
             </attributelist >
 
-            <namespace id="284" addr="0x7f20c70aa370" >
-                <attributelist id="285" addr="0x7f20c70aa370" >
-                    <attribute name="sym_name" value="XBMCAddon" id="286" addr="0x7f20c70b39f0" />
-                    <attribute name="name" value="XBMCAddon" id="287" addr="0x7f20c70b39f0" />
-                    <attribute name="csym_nextSibling" value="0x7f20c70aa930" id="288" addr="0x7f20c70aa930" />
-                    <attribute name="sym_nextSibling" value="0x7f20c70aa930" id="289" addr="0x7f20c70aa930" />
-                    <typescope id="290" addr="0x7f20c70b1a70" >
-                        <attributelist id="291" addr="0x7f20c70b1a70" >
-                            <attribute name="name" value="XBMCAddon" id="292" addr="0x7f20c70b39f0" />
-                            <typetab id="293" addr="0x7f20c70b1ab0" >
-                                <attributelist id="294" addr="0x7f20c70b1ab0" >
-                                    <attribute name="String" value="std::string" id="295" addr="0x7f20c70b39f0" />
+            <namespace id="284" addr="0x7f658f835370" >
+                <attributelist id="285" addr="0x7f658f835370" >
+                    <attribute name="sym_name" value="XBMCAddon" id="286" addr="0x7f658f83e9f0" />
+                    <attribute name="name" value="XBMCAddon" id="287" addr="0x7f658f83e9f0" />
+                    <attribute name="csym_nextSibling" value="0x7f658f835930" id="288" addr="0x7f658f835930" />
+                    <attribute name="sym_nextSibling" value="0x7f658f835930" id="289" addr="0x7f658f835930" />
+                    <typescope id="290" addr="0x7f658f83ca70" >
+                        <attributelist id="291" addr="0x7f658f83ca70" >
+                            <attribute name="name" value="XBMCAddon" id="292" addr="0x7f658f83e9f0" />
+                            <typetab id="293" addr="0x7f658f83cab0" >
+                                <attributelist id="294" addr="0x7f658f83cab0" >
+                                    <attribute name="String" value="std::string" id="295" addr="0x7f658f83e9f0" />
                                 </attributelist >
-                                <typetabsitem id="296" addr="0x7f20c70b1c90" >
-                                    <attributelist id="297" addr="0x7f20c70b1c90" >
+                                <typetabsitem id="296" addr="0x7f658f83cc90" >
+                                    <attributelist id="297" addr="0x7f658f83cc90" >
                                     </attributelist >
                                 </typetabsitem >
                             </typetab >
-                            <attribute name="parent" value="0x7f20c7093a30" id="298" addr="0x7f20c7093a30" />
-                            <attribute name="qname" value="XBMCAddon" id="299" addr="0x7f20c70b39f0" />
-                            <attribute name="symtab" value="0x7f20c70aa2d0" id="300" addr="0x7f20c70aa2d0" />
+                            <attribute name="parent" value="0x7f658f81ea30" id="298" addr="0x7f658f81ea30" />
+                            <attribute name="qname" value="XBMCAddon" id="299" addr="0x7f658f83e9f0" />
+                            <attribute name="symtab" value="0x7f658f8352d0" id="300" addr="0x7f658f8352d0" />
                         </attributelist >
-                        <typescopesitem id="301" addr="0x7f20c70aa290" >
-                            <attributelist id="302" addr="0x7f20c70aa290" >
+                        <typescopesitem id="301" addr="0x7f658f835290" >
+                            <attributelist id="302" addr="0x7f658f835290" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="303" addr="0x7f20c70b1ab0" >
-                            <attributelist id="304" addr="0x7f20c70b1ab0" >
-                                <attribute name="String" value="std::string" id="305" addr="0x7f20c70b39f0" />
+                        <typescopesitem id="303" addr="0x7f658f83cab0" >
+                            <attributelist id="304" addr="0x7f658f83cab0" >
+                                <attribute name="String" value="std::string" id="305" addr="0x7f658f83e9f0" />
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="306" addr="0x7f20c7093a30" >
-                            <attributelist id="307" addr="0x7f20c7093a30" >
-                                <attribute name="name" value="" id="308" addr="0x7f20c70b39f0" />
-                                <typetab id="309" addr="0x7f20c7093a90" >
-                                    <attributelist id="310" addr="0x7f20c7093a90" >
+                        <typescopesitem id="306" addr="0x7f658f81ea30" >
+                            <attributelist id="307" addr="0x7f658f81ea30" >
+                                <attribute name="name" value="" id="308" addr="0x7f658f83e9f0" />
+                                <typetab id="309" addr="0x7f658f81ea90" >
+                                    <attributelist id="310" addr="0x7f658f81ea90" >
                                     </attributelist >
                                 </typetab >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="311" addr="0x7f20c70b1bb0" >
-                            <attributelist id="312" addr="0x7f20c70b1bb0" >
+                        <typescopesitem id="311" addr="0x7f658f83cbb0" >
+                            <attributelist id="312" addr="0x7f658f83cbb0" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="313" addr="0x7f20c70aa2d0" >
-                            <attributelist id="314" addr="0x7f20c70aa2d0" >
-                                <attribute name="name" value="XBMCAddon" id="315" addr="0x7f20c70b39f0" />
-                                <attribute name="csymtab" value="0x7f20c70aa310" id="316" addr="0x7f20c70aa310" />
-                                <attribute name="symtab" value="0x7f20c70aa2b0" id="317" addr="0x7f20c70aa2b0" />
+                        <typescopesitem id="313" addr="0x7f658f8352d0" >
+                            <attributelist id="314" addr="0x7f658f8352d0" >
+                                <attribute name="name" value="XBMCAddon" id="315" addr="0x7f658f83e9f0" />
+                                <attribute name="csymtab" value="0x7f658f835310" id="316" addr="0x7f658f835310" />
+                                <attribute name="symtab" value="0x7f658f8352b0" id="317" addr="0x7f658f8352b0" />
                             </attributelist >
                         </typescopesitem >
                     </typescope >
-                    <attribute name="symtab" value="0x7f20c70aa2d0" id="318" addr="0x7f20c70aa2d0" />
-                    <attribute name="sym_symtab" value="0x7f20c7093950" id="319" addr="0x7f20c7093950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="320" addr="0x7f20c70b39f0" />
+                    <attribute name="symtab" value="0x7f658f8352d0" id="318" addr="0x7f658f8352d0" />
+                    <attribute name="sym_symtab" value="0x7f658f81e950" id="319" addr="0x7f658f81e950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="320" addr="0x7f658f83e9f0" />
                 </attributelist >
 
-                <cdecl id="321" addr="0x7f20c70aa490" >
-                    <attributelist id="322" addr="0x7f20c70aa490" >
-                        <attribute name="sym_name" value="String" id="323" addr="0x7f20c70b39f0" />
-                        <attribute name="name" value="XBMCAddon::String" id="324" addr="0x7f20c70b39f0" />
-                        <attribute name="decl" value="" id="325" addr="0x7f20c70b39f0" />
-                        <attribute name="storage" value="typedef" id="326" addr="0x7f20c70b39f0" />
-                        <attribute name="kind" value="typedef" id="327" addr="0x7f20c70b39f0" />
-                        <attribute name="type" value="std::string" id="328" addr="0x7f20c70b39f0" />
-                        <attribute name="sym_symtab" value="0x7f20c70aa2d0" id="329" addr="0x7f20c70aa2d0" />
-                        <attribute name="sym_overname" value="__SWIG_0" id="330" addr="0x7f20c70b39f0" />
+                <cdecl id="321" addr="0x7f658f835490" >
+                    <attributelist id="322" addr="0x7f658f835490" >
+                        <attribute name="sym_name" value="String" id="323" addr="0x7f658f83e9f0" />
+                        <attribute name="name" value="XBMCAddon::String" id="324" addr="0x7f658f83e9f0" />
+                        <attribute name="decl" value="" id="325" addr="0x7f658f83e9f0" />
+                        <attribute name="storage" value="typedef" id="326" addr="0x7f658f83e9f0" />
+                        <attribute name="kind" value="typedef" id="327" addr="0x7f658f83e9f0" />
+                        <attribute name="type" value="std::string" id="328" addr="0x7f658f83e9f0" />
+                        <attribute name="sym_symtab" value="0x7f658f8352d0" id="329" addr="0x7f658f8352d0" />
+                        <attribute name="sym_overname" value="__SWIG_0" id="330" addr="0x7f658f83e9f0" />
                     </attributelist >
                  
                 </cdecl >
-                <cdecl id="331" addr="0x7f20c70aa690" >
-                    <attributelist id="332" addr="0x7f20c70aa690" >
-                        <attribute name="sym_name" value="emptyString" id="333" addr="0x7f20c70b39f0" />
-                        <attribute name="name" value="XBMCAddon::emptyString" id="334" addr="0x7f20c70b39f0" />
-                        <attribute name="decl" value="" id="335" addr="0x7f20c70b39f0" />
-                        <attribute name="storage" value="extern" id="336" addr="0x7f20c70b39f0" />
-                        <attribute name="kind" value="variable" id="337" addr="0x7f20c70b39f0" />
-                        <attribute name="type" value="XBMCAddon::String" id="338" addr="0x7f20c70b39f0" />
-                        <attribute name="sym_symtab" value="0x7f20c70aa2d0" id="339" addr="0x7f20c70aa2d0" />
-                        <attribute name="sym_overname" value="__SWIG_0" id="340" addr="0x7f20c70b39f0" />
+                <cdecl id="331" addr="0x7f658f835690" >
+                    <attributelist id="332" addr="0x7f658f835690" >
+                        <attribute name="sym_name" value="emptyString" id="333" addr="0x7f658f83e9f0" />
+                        <attribute name="name" value="XBMCAddon::emptyString" id="334" addr="0x7f658f83e9f0" />
+                        <attribute name="decl" value="" id="335" addr="0x7f658f83e9f0" />
+                        <attribute name="storage" value="extern" id="336" addr="0x7f658f83e9f0" />
+                        <attribute name="kind" value="variable" id="337" addr="0x7f658f83e9f0" />
+                        <attribute name="type" value="XBMCAddon::String" id="338" addr="0x7f658f83e9f0" />
+                        <attribute name="sym_symtab" value="0x7f658f8352d0" id="339" addr="0x7f658f8352d0" />
+                        <attribute name="sym_overname" value="__SWIG_0" id="340" addr="0x7f658f83e9f0" />
                     </attributelist >
                  
                 </cdecl >
             </namespace >
         </include >
-        <include id="341" addr="0x7f20c70aa870" >
-            <attributelist id="342" addr="0x7f20c70aa870" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/File.h" id="343" addr="0x7f20c70b39f0" />
+        <include id="341" addr="0x7f658f835870" >
+            <attributelist id="342" addr="0x7f658f835870" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/File.h" id="343" addr="0x7f658f83e9f0" />
             </attributelist >
 
-            <namespace id="344" addr="0x7f20c70aa930" >
-                <attributelist id="345" addr="0x7f20c70aa930" >
-                    <attribute name="sym_name" value="XBMCAddon" id="346" addr="0x7f20c70b39f0" />
-                    <attribute name="name" value="XBMCAddon" id="347" addr="0x7f20c70b39f0" />
-                    <attribute name="sym_previousSibling" value="0x7f20c70aa370" id="348" addr="0x7f20c70aa370" />
-                    <attribute name="csym_nextSibling" value="0x7f20c70ad5d0" id="349" addr="0x7f20c70ad5d0" />
-                    <attribute name="sym_nextSibling" value="0x7f20c70ad5d0" id="350" addr="0x7f20c70ad5d0" />
-                    <typescope id="351" addr="0x7f20c70b1a70" >
-                        <attributelist id="352" addr="0x7f20c70b1a70" >
-                            <attribute name="name" value="XBMCAddon" id="353" addr="0x7f20c70b39f0" />
-                            <typetab id="354" addr="0x7f20c70b1ab0" >
-                                <attributelist id="355" addr="0x7f20c70b1ab0" >
-                                    <attribute name="String" value="std::string" id="356" addr="0x7f20c70b39f0" />
+            <namespace id="344" addr="0x7f658f835930" >
+                <attributelist id="345" addr="0x7f658f835930" >
+                    <attribute name="sym_name" value="XBMCAddon" id="346" addr="0x7f658f83e9f0" />
+                    <attribute name="name" value="XBMCAddon" id="347" addr="0x7f658f83e9f0" />
+                    <attribute name="sym_previousSibling" value="0x7f658f835370" id="348" addr="0x7f658f835370" />
+                    <attribute name="csym_nextSibling" value="0x7f658f8385d0" id="349" addr="0x7f658f8385d0" />
+                    <attribute name="sym_nextSibling" value="0x7f658f8385d0" id="350" addr="0x7f658f8385d0" />
+                    <typescope id="351" addr="0x7f658f83ca70" >
+                        <attributelist id="352" addr="0x7f658f83ca70" >
+                            <attribute name="name" value="XBMCAddon" id="353" addr="0x7f658f83e9f0" />
+                            <typetab id="354" addr="0x7f658f83cab0" >
+                                <attributelist id="355" addr="0x7f658f83cab0" >
+                                    <attribute name="String" value="std::string" id="356" addr="0x7f658f83e9f0" />
                                 </attributelist >
-                                <typetabsitem id="357" addr="0x7f20c70b1c90" >
-                                    <attributelist id="358" addr="0x7f20c70b1c90" >
+                                <typetabsitem id="357" addr="0x7f658f83cc90" >
+                                    <attributelist id="358" addr="0x7f658f83cc90" >
                                     </attributelist >
                                 </typetabsitem >
                             </typetab >
-                            <attribute name="parent" value="0x7f20c7093a30" id="359" addr="0x7f20c7093a30" />
-                            <attribute name="qname" value="XBMCAddon" id="360" addr="0x7f20c70b39f0" />
-                            <attribute name="symtab" value="0x7f20c70aa2d0" id="361" addr="0x7f20c70aa2d0" />
+                            <attribute name="parent" value="0x7f658f81ea30" id="359" addr="0x7f658f81ea30" />
+                            <attribute name="qname" value="XBMCAddon" id="360" addr="0x7f658f83e9f0" />
+                            <attribute name="symtab" value="0x7f658f8352d0" id="361" addr="0x7f658f8352d0" />
                         </attributelist >
-                        <typescopesitem id="362" addr="0x7f20c70aa290" >
-                            <attributelist id="363" addr="0x7f20c70aa290" >
+                        <typescopesitem id="362" addr="0x7f658f835290" >
+                            <attributelist id="363" addr="0x7f658f835290" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="364" addr="0x7f20c70b1ab0" >
-                            <attributelist id="365" addr="0x7f20c70b1ab0" >
-                                <attribute name="String" value="std::string" id="366" addr="0x7f20c70b39f0" />
+                        <typescopesitem id="364" addr="0x7f658f83cab0" >
+                            <attributelist id="365" addr="0x7f658f83cab0" >
+                                <attribute name="String" value="std::string" id="366" addr="0x7f658f83e9f0" />
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="367" addr="0x7f20c7093a30" >
-                            <attributelist id="368" addr="0x7f20c7093a30" >
-                                <attribute name="name" value="" id="369" addr="0x7f20c70b39f0" />
-                                <typetab id="370" addr="0x7f20c7093a90" >
-                                    <attributelist id="371" addr="0x7f20c7093a90" >
+                        <typescopesitem id="367" addr="0x7f658f81ea30" >
+                            <attributelist id="368" addr="0x7f658f81ea30" >
+                                <attribute name="name" value="" id="369" addr="0x7f658f83e9f0" />
+                                <typetab id="370" addr="0x7f658f81ea90" >
+                                    <attributelist id="371" addr="0x7f658f81ea90" >
                                     </attributelist >
                                 </typetab >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="372" addr="0x7f20c70b1bb0" >
-                            <attributelist id="373" addr="0x7f20c70b1bb0" >
+                        <typescopesitem id="372" addr="0x7f658f83cbb0" >
+                            <attributelist id="373" addr="0x7f658f83cbb0" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="374" addr="0x7f20c70aa2d0" >
-                            <attributelist id="375" addr="0x7f20c70aa2d0" >
-                                <attribute name="name" value="XBMCAddon" id="376" addr="0x7f20c70b39f0" />
-                                <attribute name="csymtab" value="0x7f20c70aa310" id="377" addr="0x7f20c70aa310" />
-                                <attribute name="symtab" value="0x7f20c70aa2b0" id="378" addr="0x7f20c70aa2b0" />
+                        <typescopesitem id="374" addr="0x7f658f8352d0" >
+                            <attributelist id="375" addr="0x7f658f8352d0" >
+                                <attribute name="name" value="XBMCAddon" id="376" addr="0x7f658f83e9f0" />
+                                <attribute name="csymtab" value="0x7f658f835310" id="377" addr="0x7f658f835310" />
+                                <attribute name="symtab" value="0x7f658f8352b0" id="378" addr="0x7f658f8352b0" />
                             </attributelist >
                         </typescopesitem >
                     </typescope >
-                    <attribute name="symtab" value="0x7f20c70aa2d0" id="379" addr="0x7f20c70aa2d0" />
-                    <attribute name="sym_symtab" value="0x7f20c7093950" id="380" addr="0x7f20c7093950" />
+                    <attribute name="symtab" value="0x7f658f8352d0" id="379" addr="0x7f658f8352d0" />
+                    <attribute name="sym_symtab" value="0x7f658f81e950" id="380" addr="0x7f658f81e950" />
                 </attributelist >
 
-                <namespace id="381" addr="0x7f20c70aaa50" >
-                    <attributelist id="382" addr="0x7f20c70aaa50" >
-                        <attribute name="sym_name" value="xbmcvfs" id="383" addr="0x7f20c70b39f0" />
-                        <attribute name="name" value="xbmcvfs" id="384" addr="0x7f20c70b39f0" />
-                        <attribute name="csym_nextSibling" value="0x7f20c70ad650" id="385" addr="0x7f20c70ad650" />
-                        <attribute name="sym_nextSibling" value="0x7f20c70ad650" id="386" addr="0x7f20c70ad650" />
-                        <typescope id="387" addr="0x7f20c70b1e50" >
-                            <attributelist id="388" addr="0x7f20c70b1e50" >
-                                <attribute name="name" value="xbmcvfs" id="389" addr="0x7f20c70b39f0" />
-                                <typetab id="390" addr="0x7f20c70b1e70" >
-                                    <attributelist id="391" addr="0x7f20c70b1e70" >
-                                        <attribute name="Stat" value="Stat" id="392" addr="0x7f20c70b39f0" />
-                                        <attribute name="File" value="File" id="393" addr="0x7f20c70b39f0" />
+                <namespace id="381" addr="0x7f658f835a50" >
+                    <attributelist id="382" addr="0x7f658f835a50" >
+                        <attribute name="sym_name" value="xbmcvfs" id="383" addr="0x7f658f83e9f0" />
+                        <attribute name="name" value="xbmcvfs" id="384" addr="0x7f658f83e9f0" />
+                        <attribute name="csym_nextSibling" value="0x7f658f838650" id="385" addr="0x7f658f838650" />
+                        <attribute name="sym_nextSibling" value="0x7f658f838650" id="386" addr="0x7f658f838650" />
+                        <typescope id="387" addr="0x7f658f83ce50" >
+                            <attributelist id="388" addr="0x7f658f83ce50" >
+                                <attribute name="name" value="xbmcvfs" id="389" addr="0x7f658f83e9f0" />
+                                <typetab id="390" addr="0x7f658f83ce70" >
+                                    <attributelist id="391" addr="0x7f658f83ce70" >
+                                        <attribute name="Stat" value="Stat" id="392" addr="0x7f658f83e9f0" />
+                                        <attribute name="File" value="File" id="393" addr="0x7f658f83e9f0" />
                                     </attributelist >
-                                    <typetabsitem id="394" addr="0x7f20c70b29b0" >
-                                        <attributelist id="395" addr="0x7f20c70b29b0" >
+                                    <typetabsitem id="394" addr="0x7f658f83d9b0" >
+                                        <attributelist id="395" addr="0x7f658f83d9b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="396" addr="0x7f20c70b1f50" >
-                                        <attributelist id="397" addr="0x7f20c70b1f50" >
+                                    <typetabsitem id="396" addr="0x7f658f83cf50" >
+                                        <attributelist id="397" addr="0x7f658f83cf50" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
-                                <attribute name="parent" value="0x7f20c70b1a70" id="398" addr="0x7f20c70b1a70" />
-                                <attribute name="qname" value="XBMCAddon::xbmcvfs" id="399" addr="0x7f20c70b39f0" />
-                                <attribute name="symtab" value="0x7f20c70aa9d0" id="400" addr="0x7f20c70aa9d0" />
+                                <attribute name="parent" value="0x7f658f83ca70" id="398" addr="0x7f658f83ca70" />
+                                <attribute name="qname" value="XBMCAddon::xbmcvfs" id="399" addr="0x7f658f83e9f0" />
+                                <attribute name="symtab" value="0x7f658f8359d0" id="400" addr="0x7f658f8359d0" />
                             </attributelist >
-                            <typescopesitem id="401" addr="0x7f20c70aa990" >
-                                <attributelist id="402" addr="0x7f20c70aa990" >
+                            <typescopesitem id="401" addr="0x7f658f835990" >
+                                <attributelist id="402" addr="0x7f658f835990" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="403" addr="0x7f20c70b1e70" >
-                                <attributelist id="404" addr="0x7f20c70b1e70" >
-                                    <attribute name="Stat" value="Stat" id="405" addr="0x7f20c70b39f0" />
-                                    <attribute name="File" value="File" id="406" addr="0x7f20c70b39f0" />
+                            <typescopesitem id="403" addr="0x7f658f83ce70" >
+                                <attributelist id="404" addr="0x7f658f83ce70" >
+                                    <attribute name="Stat" value="Stat" id="405" addr="0x7f658f83e9f0" />
+                                    <attribute name="File" value="File" id="406" addr="0x7f658f83e9f0" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="407" addr="0x7f20c70b1a70" >
-                                <attributelist id="408" addr="0x7f20c70b1a70" >
-                                    <attribute name="name" value="XBMCAddon" id="409" addr="0x7f20c70b39f0" />
-                                    <typetab id="410" addr="0x7f20c70b1ab0" >
-                                        <attributelist id="411" addr="0x7f20c70b1ab0" >
-                                            <attribute name="String" value="std::string" id="412" addr="0x7f20c70b39f0" />
+                            <typescopesitem id="407" addr="0x7f658f83ca70" >
+                                <attributelist id="408" addr="0x7f658f83ca70" >
+                                    <attribute name="name" value="XBMCAddon" id="409" addr="0x7f658f83e9f0" />
+                                    <typetab id="410" addr="0x7f658f83cab0" >
+                                        <attributelist id="411" addr="0x7f658f83cab0" >
+                                            <attribute name="String" value="std::string" id="412" addr="0x7f658f83e9f0" />
                                         </attributelist >
-                                        <typetabsitem id="413" addr="0x7f20c70b1c90" >
-                                            <attributelist id="414" addr="0x7f20c70b1c90" >
+                                        <typetabsitem id="413" addr="0x7f658f83cc90" >
+                                            <attributelist id="414" addr="0x7f658f83cc90" >
                                             </attributelist >
                                         </typetabsitem >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f20c7093a30" id="415" addr="0x7f20c7093a30" />
-                                    <attribute name="qname" value="XBMCAddon" id="416" addr="0x7f20c70b39f0" />
-                                    <attribute name="symtab" value="0x7f20c70aa2d0" id="417" addr="0x7f20c70aa2d0" />
+                                    <attribute name="parent" value="0x7f658f81ea30" id="415" addr="0x7f658f81ea30" />
+                                    <attribute name="qname" value="XBMCAddon" id="416" addr="0x7f658f83e9f0" />
+                                    <attribute name="symtab" value="0x7f658f8352d0" id="417" addr="0x7f658f8352d0" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="418" addr="0x7f20c70b1e90" >
-                                <attributelist id="419" addr="0x7f20c70b1e90" >
+                            <typescopesitem id="418" addr="0x7f658f83ce90" >
+                                <attributelist id="419" addr="0x7f658f83ce90" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="420" addr="0x7f20c70aa9d0" >
-                                <attributelist id="421" addr="0x7f20c70aa9d0" >
-                                    <attribute name="name" value="xbmcvfs" id="422" addr="0x7f20c70b39f0" />
-                                    <attribute name="csymtab" value="0x7f20c70aaa10" id="423" addr="0x7f20c70aaa10" />
-                                    <attribute name="symtab" value="0x7f20c70aa9b0" id="424" addr="0x7f20c70aa9b0" />
+                            <typescopesitem id="420" addr="0x7f658f8359d0" >
+                                <attributelist id="421" addr="0x7f658f8359d0" >
+                                    <attribute name="name" value="xbmcvfs" id="422" addr="0x7f658f83e9f0" />
+                                    <attribute name="csymtab" value="0x7f658f835a10" id="423" addr="0x7f658f835a10" />
+                                    <attribute name="symtab" value="0x7f658f8359b0" id="424" addr="0x7f658f8359b0" />
                                 </attributelist >
                             </typescopesitem >
                         </typescope >
-                        <attribute name="symtab" value="0x7f20c70aa9d0" id="425" addr="0x7f20c70aa9d0" />
-                        <attribute name="sym_symtab" value="0x7f20c70aa2d0" id="426" addr="0x7f20c70aa2d0" />
-                        <attribute name="sym_overname" value="__SWIG_0" id="427" addr="0x7f20c70b39f0" />
+                        <attribute name="symtab" value="0x7f658f8359d0" id="425" addr="0x7f658f8359d0" />
+                        <attribute name="sym_symtab" value="0x7f658f8352d0" id="426" addr="0x7f658f8352d0" />
+                        <attribute name="sym_overname" value="__SWIG_0" id="427" addr="0x7f658f83e9f0" />
                     </attributelist >
 
-                    <class id="428" addr="0x7f20c70aac50" >
-                        <attributelist id="429" addr="0x7f20c70aac50" >
-                            <attribute name="name" value="XBMCAddon::xbmcvfs::File" id="430" addr="0x7f20c70b39f0" />
-                            <attribute name="sym_symtab" value="0x7f20c70aa9d0" id="431" addr="0x7f20c70aa9d0" />
-                            <attribute name="symtab" value="0x7f20c70aadd0" id="432" addr="0x7f20c70aadd0" />
-                            <attribute name="allows_typedef" value="1" id="433" addr="0x7f20c70b39f0" />
-                            <attribute name="typepass_visit" value="1" id="434" addr="0x7f20c70b39f0" />
-                            <attribute name="allocate_visit" value="1" id="435" addr="0x7f20c70b39f0" />
-                            <attribute name="kind" value="class" id="436" addr="0x7f20c70b39f0" />
-                            <attribute name="sym_name" value="File" id="437" addr="0x7f20c70b39f0" />
-                            <attribute name="allocate_has_constructor" value="1" id="438" addr="0x7f20c70b39f0" />
-                            <attribute name="allocate_public_constructor" value="1" id="439" addr="0x7f20c70b39f0" />
-                            <attribute name="allocate_has_destructor" value="1" id="440" addr="0x7f20c70b39f0" />
-                            <attribute name="allocate_default_destructor" value="1" id="441" addr="0x7f20c70b39f0" />
-                            <attribute name="allocate_copy_constructor" value="1" id="442" addr="0x7f20c70b39f0" />
-                            <attribute name="privatebaselist" value="0x7f20c70aabd0" id="443" addr="0x7f20c70aabd0" />
-                            <attribute name="protectedbaselist" value="0x7f20c70aabb0" id="444" addr="0x7f20c70aabb0" />
-                            <baselist id="445" addr="0x7f20c70aab90" >
-                                <base name="AddonClass" id="446" addr="0x7f20c70aaaf0" />
+                    <class id="428" addr="0x7f658f835c50" >
+                        <attributelist id="429" addr="0x7f658f835c50" >
+                            <attribute name="name" value="XBMCAddon::xbmcvfs::File" id="430" addr="0x7f658f83e9f0" />
+                            <attribute name="sym_symtab" value="0x7f658f8359d0" id="431" addr="0x7f658f8359d0" />
+                            <attribute name="symtab" value="0x7f658f835dd0" id="432" addr="0x7f658f835dd0" />
+                            <attribute name="allows_typedef" value="1" id="433" addr="0x7f658f83e9f0" />
+                            <attribute name="typepass_visit" value="1" id="434" addr="0x7f658f83e9f0" />
+                            <attribute name="allocate_visit" value="1" id="435" addr="0x7f658f83e9f0" />
+                            <attribute name="kind" value="class" id="436" addr="0x7f658f83e9f0" />
+                            <attribute name="sym_name" value="File" id="437" addr="0x7f658f83e9f0" />
+                            <attribute name="allocate_has_constructor" value="1" id="438" addr="0x7f658f83e9f0" />
+                            <attribute name="allocate_public_constructor" value="1" id="439" addr="0x7f658f83e9f0" />
+                            <attribute name="allocate_has_destructor" value="1" id="440" addr="0x7f658f83e9f0" />
+                            <attribute name="allocate_default_destructor" value="1" id="441" addr="0x7f658f83e9f0" />
+                            <attribute name="allocate_copy_constructor" value="1" id="442" addr="0x7f658f83e9f0" />
+                            <attribute name="privatebaselist" value="0x7f658f835bd0" id="443" addr="0x7f658f835bd0" />
+                            <attribute name="protectedbaselist" value="0x7f658f835bb0" id="444" addr="0x7f658f835bb0" />
+                            <baselist id="445" addr="0x7f658f835b90" >
+                                <base name="AddonClass" id="446" addr="0x7f658f835af0" />
                             </baselist >
-                            <attribute name="module" value="xbmcvfs" id="447" addr="0x7f20c70aa090" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="448" addr="0x7f20c70b39f0" />
-                            <typescope id="449" addr="0x7f20c70b2050" >
-                                <attributelist id="450" addr="0x7f20c70b2050" >
-                                    <attribute name="name" value="File" id="451" addr="0x7f20c70b39f0" />
-                                    <typetab id="452" addr="0x7f20c70b2070" >
-                                        <attributelist id="453" addr="0x7f20c70b2070" >
+                            <attribute name="module" value="xbmcvfs" id="447" addr="0x7f658f835090" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="448" addr="0x7f658f83e9f0" />
+                            <typescope id="449" addr="0x7f658f83d050" >
+                                <attributelist id="450" addr="0x7f658f83d050" >
+                                    <attribute name="name" value="File" id="451" addr="0x7f658f83e9f0" />
+                                    <typetab id="452" addr="0x7f658f83d070" >
+                                        <attributelist id="453" addr="0x7f658f83d070" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f20c70b1e50" id="454" addr="0x7f20c70b1e50" />
-                                    <attribute name="qname" value="XBMCAddon::xbmcvfs::File" id="455" addr="0x7f20c70b39f0" />
-                                    <attribute name="symtab" value="0x7f20c70aadd0" id="456" addr="0x7f20c70aadd0" />
+                                    <attribute name="parent" value="0x7f658f83ce50" id="454" addr="0x7f658f83ce50" />
+                                    <attribute name="qname" value="XBMCAddon::xbmcvfs::File" id="455" addr="0x7f658f83e9f0" />
+                                    <attribute name="symtab" value="0x7f658f835dd0" id="456" addr="0x7f658f835dd0" />
                                 </attributelist >
-                                <typescopesitem id="457" addr="0x7f20c70b1fb0" >
-                                    <attributelist id="458" addr="0x7f20c70b1fb0" >
+                                <typescopesitem id="457" addr="0x7f658f83cfb0" >
+                                    <attributelist id="458" addr="0x7f658f83cfb0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="459" addr="0x7f20c70b2070" >
-                                    <attributelist id="460" addr="0x7f20c70b2070" >
+                                <typescopesitem id="459" addr="0x7f658f83d070" >
+                                    <attributelist id="460" addr="0x7f658f83d070" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="461" addr="0x7f20c70b1e50" >
-                                    <attributelist id="462" addr="0x7f20c70b1e50" >
-                                        <attribute name="name" value="xbmcvfs" id="463" addr="0x7f20c70b39f0" />
-                                        <typetab id="464" addr="0x7f20c70b1e70" >
-                                            <attributelist id="465" addr="0x7f20c70b1e70" >
-                                                <attribute name="Stat" value="Stat" id="466" addr="0x7f20c70b39f0" />
-                                                <attribute name="File" value="File" id="467" addr="0x7f20c70b39f0" />
+                                <typescopesitem id="461" addr="0x7f658f83ce50" >
+                                    <attributelist id="462" addr="0x7f658f83ce50" >
+                                        <attribute name="name" value="xbmcvfs" id="463" addr="0x7f658f83e9f0" />
+                                        <typetab id="464" addr="0x7f658f83ce70" >
+                                            <attributelist id="465" addr="0x7f658f83ce70" >
+                                                <attribute name="Stat" value="Stat" id="466" addr="0x7f658f83e9f0" />
+                                                <attribute name="File" value="File" id="467" addr="0x7f658f83e9f0" />
                                             </attributelist >
-                                            <typetabsitem id="468" addr="0x7f20c70b29b0" >
-                                                <attributelist id="469" addr="0x7f20c70b29b0" >
+                                            <typetabsitem id="468" addr="0x7f658f83d9b0" >
+                                                <attributelist id="469" addr="0x7f658f83d9b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="470" addr="0x7f20c70b1f50" >
-                                                <attributelist id="471" addr="0x7f20c70b1f50" >
+                                            <typetabsitem id="470" addr="0x7f658f83cf50" >
+                                                <attributelist id="471" addr="0x7f658f83cf50" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7f20c70b1a70" id="472" addr="0x7f20c70b1a70" />
-                                        <attribute name="qname" value="XBMCAddon::xbmcvfs" id="473" addr="0x7f20c70b39f0" />
-                                        <attribute name="symtab" value="0x7f20c70aa9d0" id="474" addr="0x7f20c70aa9d0" />
+                                        <attribute name="parent" value="0x7f658f83ca70" id="472" addr="0x7f658f83ca70" />
+                                        <attribute name="qname" value="XBMCAddon::xbmcvfs" id="473" addr="0x7f658f83e9f0" />
+                                        <attribute name="symtab" value="0x7f658f8359d0" id="474" addr="0x7f658f8359d0" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="475" addr="0x7f20c70b2090" >
-                                    <attributelist id="476" addr="0x7f20c70b2090" >
+                                <typescopesitem id="475" addr="0x7f658f83d090" >
+                                    <attributelist id="476" addr="0x7f658f83d090" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="477" addr="0x7f20c70aadd0" >
-                                    <attributelist id="478" addr="0x7f20c70aadd0" >
-                                        <attribute name="name" value="File" id="479" addr="0x7f20c70b39f0" />
-                                        <attribute name="csymtab" value="0x7f20c70aae30" id="480" addr="0x7f20c70aae30" />
-                                        <attribute name="symtab" value="0x7f20c70aadb0" id="481" addr="0x7f20c70aadb0" />
+                                <typescopesitem id="477" addr="0x7f658f835dd0" >
+                                    <attributelist id="478" addr="0x7f658f835dd0" >
+                                        <attribute name="name" value="File" id="479" addr="0x7f658f83e9f0" />
+                                        <attribute name="csymtab" value="0x7f658f835e30" id="480" addr="0x7f658f835e30" />
+                                        <attribute name="symtab" value="0x7f658f835db0" id="481" addr="0x7f658f835db0" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <cdecl id="482" addr="0x7f20c70aaf30" >
-                            <attributelist id="483" addr="0x7f20c70aaf30" >
-                                <attribute name="ismember" value="1" id="484" addr="0x7f20c70b39f0" />
-                                <attribute name="name" value="file" id="485" addr="0x7f20c70b39f0" />
-                                <attribute name="decl" value="p." id="486" addr="0x7f20c70b39f0" />
-                                <attribute name="access" value="private" id="487" addr="0x7f20c70b39f0" />
-                                <attribute name="kind" value="variable" id="488" addr="0x7f20c70b39f0" />
-                                <attribute name="type" value="XFILE::CFile" id="489" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_symtab" value="0x7f20c70aadd0" id="490" addr="0x7f20c70aadd0" />
+                        <cdecl id="482" addr="0x7f658f835f30" >
+                            <attributelist id="483" addr="0x7f658f835f30" >
+                                <attribute name="ismember" value="1" id="484" addr="0x7f658f83e9f0" />
+                                <attribute name="name" value="file" id="485" addr="0x7f658f83e9f0" />
+                                <attribute name="decl" value="p." id="486" addr="0x7f658f83e9f0" />
+                                <attribute name="access" value="private" id="487" addr="0x7f658f83e9f0" />
+                                <attribute name="kind" value="variable" id="488" addr="0x7f658f83e9f0" />
+                                <attribute name="type" value="XFILE::CFile" id="489" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_symtab" value="0x7f658f835dd0" id="490" addr="0x7f658f835dd0" />
                             </attributelist >
                          
                         </cdecl >
-                        <access id="491" addr="0x7f20c70ab0f0" >
-                            <attributelist id="492" addr="0x7f20c70ab0f0" >
-                                <attribute name="kind" value="public" id="493" addr="0x7f20c70b39f0" />
+                        <access id="491" addr="0x7f658f8360f0" >
+                            <attributelist id="492" addr="0x7f658f8360f0" >
+                                <attribute name="kind" value="public" id="493" addr="0x7f658f83e9f0" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="494" addr="0x7f20c70ab4f0" >
-                            <attributelist id="495" addr="0x7f20c70ab4f0" >
-                                <attribute name="name" value="File" id="496" addr="0x7f20c70b39f0" />
-                                <attribute name="ismember" value="1" id="497" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_symtab" value="0x7f20c70aadd0" id="498" addr="0x7f20c70aadd0" />
-                                <attribute name="sym_nextSibling" value="0x7f20c70ab6d0" id="499" addr="0x7f20c70ab6d0" />
-                                <attribute name="csym_nextSibling" value="0x7f20c70ab6d0" id="500" addr="0x7f20c70ab6d0" />
-                                <attribute name="sym_name" value="File" id="501" addr="0x7f20c70b39f0" />
-                                <attribute name="decl" value="f(r.q(const).String,p.q(const).char)." id="502" addr="0x7f20c70b39f0" />
-                                <attribute name="access" value="public" id="503" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_overloaded" value="0x7f20c70ab4f0" id="504" addr="0x7f20c70ab4f0" />
-                                <parmlist id="505" addr="0x7f20c70ab250" >
+                        <constructor id="494" addr="0x7f658f8364f0" >
+                            <attributelist id="495" addr="0x7f658f8364f0" >
+                                <attribute name="name" value="File" id="496" addr="0x7f658f83e9f0" />
+                                <attribute name="ismember" value="1" id="497" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_symtab" value="0x7f658f835dd0" id="498" addr="0x7f658f835dd0" />
+                                <attribute name="sym_nextSibling" value="0x7f658f8366d0" id="499" addr="0x7f658f8366d0" />
+                                <attribute name="csym_nextSibling" value="0x7f658f8366d0" id="500" addr="0x7f658f8366d0" />
+                                <attribute name="sym_name" value="File" id="501" addr="0x7f658f83e9f0" />
+                                <attribute name="decl" value="f(r.q(const).String,p.q(const).char)." id="502" addr="0x7f658f83e9f0" />
+                                <attribute name="access" value="public" id="503" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_overloaded" value="0x7f658f8364f0" id="504" addr="0x7f658f8364f0" />
+                                <parmlist id="505" addr="0x7f658f836250" >
                                     <parm id="506">
-                                        <attributelist id="507" addr="0x7f20c70ab250" >
-                                            <attribute name="name" value="filepath" id="508" addr="0x7f20c70b39f0" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="509" addr="0x7f20c70b39f0" />
+                                        <attributelist id="507" addr="0x7f658f836250" >
+                                            <attribute name="name" value="filepath" id="508" addr="0x7f658f83e9f0" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="509" addr="0x7f658f83e9f0" />
                                         </attributelist >
                                     </parm >
                                     <parm id="510">
-                                        <attributelist id="511" addr="0x7f20c70ab3f0" >
-                                            <attribute name="name" value="mode" id="512" addr="0x7f20c70b39f0" />
-                                            <attribute name="value" value="NULL" id="513" addr="0x7f20c70b39f0" />
-                                            <attribute name="type" value="p.q(const).char" id="514" addr="0x7f20c70b39f0" />
+                                        <attributelist id="511" addr="0x7f658f8363f0" >
+                                            <attribute name="name" value="mode" id="512" addr="0x7f658f83e9f0" />
+                                            <attribute name="value" value="NULL" id="513" addr="0x7f658f83e9f0" />
+                                            <attribute name="type" value="p.q(const).char" id="514" addr="0x7f658f83e9f0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="code" value="{&#10;        DelayedCallGuard dg(languageHook);&#10;        if (mode &amp;&amp; strncmp(mode, &quot;w&quot;, 1) == 0)&#10;          file->OpenForWrite(filepath,true);&#10;        else&#10;          file->Open(filepath, XFILE::READ_NO_CACHE);&#10;      }" id="515" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="516" addr="0x7f20c70b39f0" />
-                                <attribute name="feature_new" value="1" id="517" addr="0x7f20c70b39f0" />
+                                <attribute name="code" value="{&#10;        DelayedCallGuard dg(languageHook);&#10;        if (mode &amp;&amp; strncmp(mode, &quot;w&quot;, 1) == 0)&#10;          file->OpenForWrite(filepath,true);&#10;        else&#10;          file->Open(filepath, XFILE::READ_NO_CACHE);&#10;      }" id="515" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="516" addr="0x7f658f83e9f0" />
+                                <attribute name="feature_new" value="1" id="517" addr="0x7f658f83e9f0" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="518" addr="0x7f20c70ab6d0" >
-                            <attributelist id="519" addr="0x7f20c70ab6d0" >
-                                <attribute name="name" value="File" id="520" addr="0x7f20c70b39f0" />
-                                <attribute name="ismember" value="1" id="521" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_symtab" value="0x7f20c70aadd0" id="522" addr="0x7f20c70aadd0" />
-                                <attribute name="sym_previousSibling" value="0x7f20c70ab4f0" id="523" addr="0x7f20c70ab4f0" />
-                                <attribute name="sym_name" value="File" id="524" addr="0x7f20c70b39f0" />
-                                <attribute name="defaultargs" value="0x7f20c70ab4f0" id="525" addr="0x7f20c70ab4f0" />
-                                <attribute name="decl" value="f(r.q(const).String)." id="526" addr="0x7f20c70b39f0" />
-                                <attribute name="access" value="public" id="527" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_overloaded" value="0x7f20c70ab4f0" id="528" addr="0x7f20c70ab4f0" />
-                                <parmlist id="529" addr="0x7f20c70ab5d0" >
+                        <constructor id="518" addr="0x7f658f8366d0" >
+                            <attributelist id="519" addr="0x7f658f8366d0" >
+                                <attribute name="name" value="File" id="520" addr="0x7f658f83e9f0" />
+                                <attribute name="ismember" value="1" id="521" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_symtab" value="0x7f658f835dd0" id="522" addr="0x7f658f835dd0" />
+                                <attribute name="sym_previousSibling" value="0x7f658f8364f0" id="523" addr="0x7f658f8364f0" />
+                                <attribute name="sym_name" value="File" id="524" addr="0x7f658f83e9f0" />
+                                <attribute name="defaultargs" value="0x7f658f8364f0" id="525" addr="0x7f658f8364f0" />
+                                <attribute name="decl" value="f(r.q(const).String)." id="526" addr="0x7f658f83e9f0" />
+                                <attribute name="access" value="public" id="527" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_overloaded" value="0x7f658f8364f0" id="528" addr="0x7f658f8364f0" />
+                                <parmlist id="529" addr="0x7f658f8365d0" >
                                     <parm id="530">
-                                        <attributelist id="531" addr="0x7f20c70ab5d0" >
-                                            <attribute name="name" value="filepath" id="532" addr="0x7f20c70b39f0" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="533" addr="0x7f20c70b39f0" />
+                                        <attributelist id="531" addr="0x7f658f8365d0" >
+                                            <attribute name="name" value="filepath" id="532" addr="0x7f658f83e9f0" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="533" addr="0x7f658f83e9f0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="code" value="{&#10;        DelayedCallGuard dg(languageHook);&#10;        if (mode &amp;&amp; strncmp(mode, &quot;w&quot;, 1) == 0)&#10;          file->OpenForWrite(filepath,true);&#10;        else&#10;          file->Open(filepath, XFILE::READ_NO_CACHE);&#10;      }" id="534" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="535" addr="0x7f20c70b39f0" />
-                                <attribute name="feature_new" value="1" id="536" addr="0x7f20c70b39f0" />
+                                <attribute name="code" value="{&#10;        DelayedCallGuard dg(languageHook);&#10;        if (mode &amp;&amp; strncmp(mode, &quot;w&quot;, 1) == 0)&#10;          file->OpenForWrite(filepath,true);&#10;        else&#10;          file->Open(filepath, XFILE::READ_NO_CACHE);&#10;      }" id="534" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="535" addr="0x7f658f83e9f0" />
+                                <attribute name="feature_new" value="1" id="536" addr="0x7f658f83e9f0" />
                             </attributelist >
                          
                         </constructor >
-                        <destructor id="537" addr="0x7f20c70ab8d0" >
-                            <attributelist id="538" addr="0x7f20c70ab8d0" >
-                                <attribute name="ismember" value="1" id="539" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_name" value="~File" id="540" addr="0x7f20c70b39f0" />
-                                <attribute name="name" value="~File" id="541" addr="0x7f20c70b39f0" />
-                                <attribute name="decl" value="f()." id="542" addr="0x7f20c70b39f0" />
-                                <attribute name="access" value="public" id="543" addr="0x7f20c70b39f0" />
-                                <attribute name="code" value="{ delete file; }" id="544" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_symtab" value="0x7f20c70aadd0" id="545" addr="0x7f20c70aadd0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="546" addr="0x7f20c70b39f0" />
+                        <destructor id="537" addr="0x7f658f8368d0" >
+                            <attributelist id="538" addr="0x7f658f8368d0" >
+                                <attribute name="ismember" value="1" id="539" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_name" value="~File" id="540" addr="0x7f658f83e9f0" />
+                                <attribute name="name" value="~File" id="541" addr="0x7f658f83e9f0" />
+                                <attribute name="decl" value="f()." id="542" addr="0x7f658f83e9f0" />
+                                <attribute name="access" value="public" id="543" addr="0x7f658f83e9f0" />
+                                <attribute name="code" value="{ delete file; }" id="544" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_symtab" value="0x7f658f835dd0" id="545" addr="0x7f658f835dd0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="546" addr="0x7f658f83e9f0" />
                             </attributelist >
                          
                         </destructor >
-                        <cdecl id="547" addr="0x7f20c70abc10" >
-                            <attributelist id="548" addr="0x7f20c70abc10" >
-                                <attribute name="name" value="read" id="549" addr="0x7f20c70b39f0" />
-                                <attribute name="ismember" value="1" id="550" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_symtab" value="0x7f20c70aadd0" id="551" addr="0x7f20c70aadd0" />
-                                <attribute name="sym_nextSibling" value="0x7f20c70abd30" id="552" addr="0x7f20c70abd30" />
-                                <attribute name="csym_nextSibling" value="0x7f20c70abd30" id="553" addr="0x7f20c70abd30" />
-                                <attribute name="kind" value="function" id="554" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_name" value="read" id="555" addr="0x7f20c70b39f0" />
-                                <attribute name="decl" value="f(unsigned long)." id="556" addr="0x7f20c70b39f0" />
-                                <attribute name="access" value="public" id="557" addr="0x7f20c70b39f0" />
-                                <parmlist id="558" addr="0x7f20c70abb70" >
+                        <cdecl id="547" addr="0x7f658f836c10" >
+                            <attributelist id="548" addr="0x7f658f836c10" >
+                                <attribute name="name" value="read" id="549" addr="0x7f658f83e9f0" />
+                                <attribute name="ismember" value="1" id="550" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_symtab" value="0x7f658f835dd0" id="551" addr="0x7f658f835dd0" />
+                                <attribute name="sym_nextSibling" value="0x7f658f836d30" id="552" addr="0x7f658f836d30" />
+                                <attribute name="csym_nextSibling" value="0x7f658f836d30" id="553" addr="0x7f658f836d30" />
+                                <attribute name="kind" value="function" id="554" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_name" value="read" id="555" addr="0x7f658f83e9f0" />
+                                <attribute name="decl" value="f(unsigned long)." id="556" addr="0x7f658f83e9f0" />
+                                <attribute name="access" value="public" id="557" addr="0x7f658f83e9f0" />
+                                <parmlist id="558" addr="0x7f658f836b70" >
                                     <parm id="559">
-                                        <attributelist id="560" addr="0x7f20c70abb70" >
-                                            <attribute name="name" value="numBytes" id="561" addr="0x7f20c70b39f0" />
-                                            <attribute name="value" value="0" id="562" addr="0x7f20c70b39f0" />
-                                            <attribute name="type" value="unsigned long" id="563" addr="0x7f20c70b39f0" />
+                                        <attributelist id="560" addr="0x7f658f836b70" >
+                                            <attribute name="name" value="numBytes" id="561" addr="0x7f658f83e9f0" />
+                                            <attribute name="value" value="0" id="562" addr="0x7f658f83e9f0" />
+                                            <attribute name="type" value="unsigned long" id="563" addr="0x7f658f83e9f0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overloaded" value="0x7f20c70abc10" id="564" addr="0x7f20c70abc10" />
-                                <attribute name="type" value="XBMCAddon::String" id="565" addr="0x7f20c70b39f0" />
-                                <attribute name="code" value="{&#10;        XbmcCommons::Buffer b = readBytes(numBytes);&#10;        return b.getString(numBytes == 0 ? b.remaining() : std::min((unsigned long)b.remaining(),numBytes));&#10;      }" id="566" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="567" addr="0x7f20c70b39f0" />
+                                <attribute name="sym_overloaded" value="0x7f658f836c10" id="564" addr="0x7f658f836c10" />
+                                <attribute name="type" value="XBMCAddon::String" id="565" addr="0x7f658f83e9f0" />
+                                <attribute name="code" value="{&#10;        XbmcCommons::Buffer b = readBytes(numBytes);&#10;        return b.getString(numBytes == 0 ? b.remaining() : std::min((unsigned long)b.remaining(),numBytes));&#10;      }" id="566" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="567" addr="0x7f658f83e9f0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="568" addr="0x7f20c70abd30" >
-                            <attributelist id="569" addr="0x7f20c70abd30" >
-                                <attribute name="name" value="read" id="570" addr="0x7f20c70b39f0" />
-                                <attribute name="ismember" value="1" id="571" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_symtab" value="0x7f20c70aadd0" id="572" addr="0x7f20c70aadd0" />
-                                <attribute name="sym_previousSibling" value="0x7f20c70abc10" id="573" addr="0x7f20c70abc10" />
-                                <attribute name="kind" value="function" id="574" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_name" value="read" id="575" addr="0x7f20c70b39f0" />
-                                <attribute name="defaultargs" value="0x7f20c70abc10" id="576" addr="0x7f20c70abc10" />
-                                <attribute name="decl" value="f()." id="577" addr="0x7f20c70b39f0" />
-                                <attribute name="access" value="public" id="578" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_overloaded" value="0x7f20c70abc10" id="579" addr="0x7f20c70abc10" />
-                                <attribute name="type" value="XBMCAddon::String" id="580" addr="0x7f20c70b39f0" />
-                                <attribute name="code" value="{&#10;        XbmcCommons::Buffer b = readBytes(numBytes);&#10;        return b.getString(numBytes == 0 ? b.remaining() : std::min((unsigned long)b.remaining(),numBytes));&#10;      }" id="581" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="582" addr="0x7f20c70b39f0" />
+                        <cdecl id="568" addr="0x7f658f836d30" >
+                            <attributelist id="569" addr="0x7f658f836d30" >
+                                <attribute name="name" value="read" id="570" addr="0x7f658f83e9f0" />
+                                <attribute name="ismember" value="1" id="571" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_symtab" value="0x7f658f835dd0" id="572" addr="0x7f658f835dd0" />
+                                <attribute name="sym_previousSibling" value="0x7f658f836c10" id="573" addr="0x7f658f836c10" />
+                                <attribute name="kind" value="function" id="574" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_name" value="read" id="575" addr="0x7f658f83e9f0" />
+                                <attribute name="defaultargs" value="0x7f658f836c10" id="576" addr="0x7f658f836c10" />
+                                <attribute name="decl" value="f()." id="577" addr="0x7f658f83e9f0" />
+                                <attribute name="access" value="public" id="578" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_overloaded" value="0x7f658f836c10" id="579" addr="0x7f658f836c10" />
+                                <attribute name="type" value="XBMCAddon::String" id="580" addr="0x7f658f83e9f0" />
+                                <attribute name="code" value="{&#10;        XbmcCommons::Buffer b = readBytes(numBytes);&#10;        return b.getString(numBytes == 0 ? b.remaining() : std::min((unsigned long)b.remaining(),numBytes));&#10;      }" id="581" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="582" addr="0x7f658f83e9f0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="583" addr="0x7f20c70ac0f0" >
-                            <attributelist id="584" addr="0x7f20c70ac0f0" >
-                                <attribute name="name" value="readBytes" id="585" addr="0x7f20c70b39f0" />
-                                <attribute name="ismember" value="1" id="586" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_symtab" value="0x7f20c70aadd0" id="587" addr="0x7f20c70aadd0" />
-                                <attribute name="sym_nextSibling" value="0x7f20c70ac1f0" id="588" addr="0x7f20c70ac1f0" />
-                                <attribute name="csym_nextSibling" value="0x7f20c70ac1f0" id="589" addr="0x7f20c70ac1f0" />
-                                <attribute name="kind" value="function" id="590" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_name" value="readBytes" id="591" addr="0x7f20c70b39f0" />
-                                <attribute name="decl" value="f(unsigned long)." id="592" addr="0x7f20c70b39f0" />
-                                <attribute name="access" value="public" id="593" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_overloaded" value="0x7f20c70ac0f0" id="594" addr="0x7f20c70ac0f0" />
-                                <parmlist id="595" addr="0x7f20c70ac030" >
+                        <cdecl id="583" addr="0x7f658f8370f0" >
+                            <attributelist id="584" addr="0x7f658f8370f0" >
+                                <attribute name="name" value="readBytes" id="585" addr="0x7f658f83e9f0" />
+                                <attribute name="ismember" value="1" id="586" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_symtab" value="0x7f658f835dd0" id="587" addr="0x7f658f835dd0" />
+                                <attribute name="sym_nextSibling" value="0x7f658f8371f0" id="588" addr="0x7f658f8371f0" />
+                                <attribute name="csym_nextSibling" value="0x7f658f8371f0" id="589" addr="0x7f658f8371f0" />
+                                <attribute name="kind" value="function" id="590" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_name" value="readBytes" id="591" addr="0x7f658f83e9f0" />
+                                <attribute name="decl" value="f(unsigned long)." id="592" addr="0x7f658f83e9f0" />
+                                <attribute name="access" value="public" id="593" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_overloaded" value="0x7f658f8370f0" id="594" addr="0x7f658f8370f0" />
+                                <parmlist id="595" addr="0x7f658f837030" >
                                     <parm id="596">
-                                        <attributelist id="597" addr="0x7f20c70ac030" >
-                                            <attribute name="name" value="numBytes" id="598" addr="0x7f20c70b39f0" />
-                                            <attribute name="value" value="0" id="599" addr="0x7f20c70b39f0" />
-                                            <attribute name="type" value="unsigned long" id="600" addr="0x7f20c70b39f0" />
+                                        <attributelist id="597" addr="0x7f658f837030" >
+                                            <attribute name="name" value="numBytes" id="598" addr="0x7f658f83e9f0" />
+                                            <attribute name="value" value="0" id="599" addr="0x7f658f83e9f0" />
+                                            <attribute name="type" value="unsigned long" id="600" addr="0x7f658f83e9f0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="XbmcCommons::Buffer" id="601" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="602" addr="0x7f20c70b39f0" />
+                                <attribute name="type" value="XbmcCommons::Buffer" id="601" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="602" addr="0x7f658f83e9f0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="603" addr="0x7f20c70ac1f0" >
-                            <attributelist id="604" addr="0x7f20c70ac1f0" >
-                                <attribute name="name" value="readBytes" id="605" addr="0x7f20c70b39f0" />
-                                <attribute name="ismember" value="1" id="606" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_symtab" value="0x7f20c70aadd0" id="607" addr="0x7f20c70aadd0" />
-                                <attribute name="sym_previousSibling" value="0x7f20c70ac0f0" id="608" addr="0x7f20c70ac0f0" />
-                                <attribute name="kind" value="function" id="609" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_name" value="readBytes" id="610" addr="0x7f20c70b39f0" />
-                                <attribute name="defaultargs" value="0x7f20c70ac0f0" id="611" addr="0x7f20c70ac0f0" />
-                                <attribute name="decl" value="f()." id="612" addr="0x7f20c70b39f0" />
-                                <attribute name="access" value="public" id="613" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_overloaded" value="0x7f20c70ac0f0" id="614" addr="0x7f20c70ac0f0" />
-                                <attribute name="type" value="XbmcCommons::Buffer" id="615" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="616" addr="0x7f20c70b39f0" />
+                        <cdecl id="603" addr="0x7f658f8371f0" >
+                            <attributelist id="604" addr="0x7f658f8371f0" >
+                                <attribute name="name" value="readBytes" id="605" addr="0x7f658f83e9f0" />
+                                <attribute name="ismember" value="1" id="606" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_symtab" value="0x7f658f835dd0" id="607" addr="0x7f658f835dd0" />
+                                <attribute name="sym_previousSibling" value="0x7f658f8370f0" id="608" addr="0x7f658f8370f0" />
+                                <attribute name="kind" value="function" id="609" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_name" value="readBytes" id="610" addr="0x7f658f83e9f0" />
+                                <attribute name="defaultargs" value="0x7f658f8370f0" id="611" addr="0x7f658f8370f0" />
+                                <attribute name="decl" value="f()." id="612" addr="0x7f658f83e9f0" />
+                                <attribute name="access" value="public" id="613" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_overloaded" value="0x7f658f8370f0" id="614" addr="0x7f658f8370f0" />
+                                <attribute name="type" value="XbmcCommons::Buffer" id="615" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="616" addr="0x7f658f83e9f0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="617" addr="0x7f20c70ac510" >
-                            <attributelist id="618" addr="0x7f20c70ac510" >
-                                <attribute name="name" value="write" id="619" addr="0x7f20c70b39f0" />
-                                <attribute name="ismember" value="1" id="620" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_symtab" value="0x7f20c70aadd0" id="621" addr="0x7f20c70aadd0" />
-                                <attribute name="kind" value="function" id="622" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_name" value="write" id="623" addr="0x7f20c70b39f0" />
-                                <attribute name="decl" value="f(r.XbmcCommons::Buffer)." id="624" addr="0x7f20c70b39f0" />
-                                <attribute name="access" value="public" id="625" addr="0x7f20c70b39f0" />
-                                <parmlist id="626" addr="0x7f20c70ac450" >
+                        <cdecl id="617" addr="0x7f658f837510" >
+                            <attributelist id="618" addr="0x7f658f837510" >
+                                <attribute name="name" value="write" id="619" addr="0x7f658f83e9f0" />
+                                <attribute name="ismember" value="1" id="620" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_symtab" value="0x7f658f835dd0" id="621" addr="0x7f658f835dd0" />
+                                <attribute name="kind" value="function" id="622" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_name" value="write" id="623" addr="0x7f658f83e9f0" />
+                                <attribute name="decl" value="f(r.XbmcCommons::Buffer)." id="624" addr="0x7f658f83e9f0" />
+                                <attribute name="access" value="public" id="625" addr="0x7f658f83e9f0" />
+                                <parmlist id="626" addr="0x7f658f837450" >
                                     <parm id="627">
-                                        <attributelist id="628" addr="0x7f20c70ac450" >
-                                            <attribute name="name" value="buffer" id="629" addr="0x7f20c70b39f0" />
-                                            <attribute name="type" value="r.XbmcCommons::Buffer" id="630" addr="0x7f20c70b39f0" />
+                                        <attributelist id="628" addr="0x7f658f837450" >
+                                            <attribute name="name" value="buffer" id="629" addr="0x7f658f83e9f0" />
+                                            <attribute name="type" value="r.XbmcCommons::Buffer" id="630" addr="0x7f658f83e9f0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="bool" id="631" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="632" addr="0x7f20c70b39f0" />
+                                <attribute name="type" value="bool" id="631" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="632" addr="0x7f658f83e9f0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="633" addr="0x7f20c70ac730" >
-                            <attributelist id="634" addr="0x7f20c70ac730" >
-                                <attribute name="name" value="size" id="635" addr="0x7f20c70b39f0" />
-                                <attribute name="ismember" value="1" id="636" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_symtab" value="0x7f20c70aadd0" id="637" addr="0x7f20c70aadd0" />
-                                <attribute name="kind" value="function" id="638" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_name" value="size" id="639" addr="0x7f20c70b39f0" />
-                                <attribute name="decl" value="f()." id="640" addr="0x7f20c70b39f0" />
-                                <attribute name="access" value="public" id="641" addr="0x7f20c70b39f0" />
-                                <attribute name="type" value="long long" id="642" addr="0x7f20c70b39f0" />
-                                <attribute name="code" value="{ DelayedCallGuard dg(languageHook); return file->GetLength(); }" id="643" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="644" addr="0x7f20c70b39f0" />
+                        <cdecl id="633" addr="0x7f658f837730" >
+                            <attributelist id="634" addr="0x7f658f837730" >
+                                <attribute name="name" value="size" id="635" addr="0x7f658f83e9f0" />
+                                <attribute name="ismember" value="1" id="636" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_symtab" value="0x7f658f835dd0" id="637" addr="0x7f658f835dd0" />
+                                <attribute name="kind" value="function" id="638" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_name" value="size" id="639" addr="0x7f658f83e9f0" />
+                                <attribute name="decl" value="f()." id="640" addr="0x7f658f83e9f0" />
+                                <attribute name="access" value="public" id="641" addr="0x7f658f83e9f0" />
+                                <attribute name="type" value="long long" id="642" addr="0x7f658f83e9f0" />
+                                <attribute name="code" value="{ DelayedCallGuard dg(languageHook); return file->GetLength(); }" id="643" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="644" addr="0x7f658f83e9f0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="645" addr="0x7f20c70acc10" >
-                            <attributelist id="646" addr="0x7f20c70acc10" >
-                                <attribute name="name" value="seek" id="647" addr="0x7f20c70b39f0" />
-                                <attribute name="ismember" value="1" id="648" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_symtab" value="0x7f20c70aadd0" id="649" addr="0x7f20c70aadd0" />
-                                <attribute name="kind" value="function" id="650" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_name" value="seek" id="651" addr="0x7f20c70b39f0" />
-                                <attribute name="decl" value="f(long long,int)." id="652" addr="0x7f20c70b39f0" />
-                                <attribute name="access" value="public" id="653" addr="0x7f20c70b39f0" />
-                                <parmlist id="654" addr="0x7f20c70aca50" >
+                        <cdecl id="645" addr="0x7f658f837c10" >
+                            <attributelist id="646" addr="0x7f658f837c10" >
+                                <attribute name="name" value="seek" id="647" addr="0x7f658f83e9f0" />
+                                <attribute name="ismember" value="1" id="648" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_symtab" value="0x7f658f835dd0" id="649" addr="0x7f658f835dd0" />
+                                <attribute name="kind" value="function" id="650" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_name" value="seek" id="651" addr="0x7f658f83e9f0" />
+                                <attribute name="decl" value="f(long long,int)." id="652" addr="0x7f658f83e9f0" />
+                                <attribute name="access" value="public" id="653" addr="0x7f658f83e9f0" />
+                                <parmlist id="654" addr="0x7f658f837a50" >
                                     <parm id="655">
-                                        <attributelist id="656" addr="0x7f20c70aca50" >
-                                            <attribute name="name" value="seekBytes" id="657" addr="0x7f20c70b39f0" />
-                                            <attribute name="type" value="long long" id="658" addr="0x7f20c70b39f0" />
+                                        <attributelist id="656" addr="0x7f658f837a50" >
+                                            <attribute name="name" value="seekBytes" id="657" addr="0x7f658f83e9f0" />
+                                            <attribute name="type" value="long long" id="658" addr="0x7f658f83e9f0" />
                                         </attributelist >
                                     </parm >
                                     <parm id="659">
-                                        <attributelist id="660" addr="0x7f20c70acb70" >
-                                            <attribute name="name" value="iWhence" id="661" addr="0x7f20c70b39f0" />
-                                            <attribute name="type" value="int" id="662" addr="0x7f20c70b39f0" />
+                                        <attributelist id="660" addr="0x7f658f837b70" >
+                                            <attribute name="name" value="iWhence" id="661" addr="0x7f658f83e9f0" />
+                                            <attribute name="type" value="int" id="662" addr="0x7f658f83e9f0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="long long" id="663" addr="0x7f20c70b39f0" />
-                                <attribute name="code" value="{ DelayedCallGuard dg(languageHook); return file->Seek(seekBytes,iWhence); }" id="664" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="665" addr="0x7f20c70b39f0" />
+                                <attribute name="type" value="long long" id="663" addr="0x7f658f83e9f0" />
+                                <attribute name="code" value="{ DelayedCallGuard dg(languageHook); return file->Seek(seekBytes,iWhence); }" id="664" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="665" addr="0x7f658f83e9f0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="666" addr="0x7f20c70acdd0" >
-                            <attributelist id="667" addr="0x7f20c70acdd0" >
-                                <attribute name="ismember" value="1" id="668" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_name" value="close" id="669" addr="0x7f20c70b39f0" />
-                                <attribute name="name" value="close" id="670" addr="0x7f20c70b39f0" />
-                                <attribute name="decl" value="f()." id="671" addr="0x7f20c70b39f0" />
-                                <attribute name="access" value="public" id="672" addr="0x7f20c70b39f0" />
-                                <attribute name="code" value="{ DelayedCallGuard dg(languageHook); file->Close(); }" id="673" addr="0x7f20c70b39f0" />
-                                <attribute name="kind" value="function" id="674" addr="0x7f20c70b39f0" />
-                                <attribute name="type" value="void" id="675" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_symtab" value="0x7f20c70aadd0" id="676" addr="0x7f20c70aadd0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="677" addr="0x7f20c70b39f0" />
+                        <cdecl id="666" addr="0x7f658f837dd0" >
+                            <attributelist id="667" addr="0x7f658f837dd0" >
+                                <attribute name="ismember" value="1" id="668" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_name" value="close" id="669" addr="0x7f658f83e9f0" />
+                                <attribute name="name" value="close" id="670" addr="0x7f658f83e9f0" />
+                                <attribute name="decl" value="f()." id="671" addr="0x7f658f83e9f0" />
+                                <attribute name="access" value="public" id="672" addr="0x7f658f83e9f0" />
+                                <attribute name="code" value="{ DelayedCallGuard dg(languageHook); file->Close(); }" id="673" addr="0x7f658f83e9f0" />
+                                <attribute name="kind" value="function" id="674" addr="0x7f658f83e9f0" />
+                                <attribute name="type" value="void" id="675" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_symtab" value="0x7f658f835dd0" id="676" addr="0x7f658f835dd0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="677" addr="0x7f658f83e9f0" />
                             </attributelist >
                          
                         </cdecl >
@@ -1060,402 +1060,402 @@
                 </namespace >
             </namespace >
         </include >
-        <include id="678" addr="0x7f20c70ad530" >
-            <attributelist id="679" addr="0x7f20c70ad530" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/Stat.h" id="680" addr="0x7f20c70b39f0" />
+        <include id="678" addr="0x7f658f838530" >
+            <attributelist id="679" addr="0x7f658f838530" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/Stat.h" id="680" addr="0x7f658f83e9f0" />
             </attributelist >
 
-            <namespace id="681" addr="0x7f20c70ad5d0" >
-                <attributelist id="682" addr="0x7f20c70ad5d0" >
-                    <attribute name="sym_name" value="XBMCAddon" id="683" addr="0x7f20c70b39f0" />
-                    <attribute name="name" value="XBMCAddon" id="684" addr="0x7f20c70b39f0" />
-                    <attribute name="sym_previousSibling" value="0x7f20c70aa930" id="685" addr="0x7f20c70aa930" />
-                    <attribute name="csym_nextSibling" value="0x7f20c70af930" id="686" addr="0x7f20c70af930" />
-                    <attribute name="sym_nextSibling" value="0x7f20c70af930" id="687" addr="0x7f20c70af930" />
-                    <typescope id="688" addr="0x7f20c70b1a70" >
-                        <attributelist id="689" addr="0x7f20c70b1a70" >
-                            <attribute name="name" value="XBMCAddon" id="690" addr="0x7f20c70b39f0" />
-                            <typetab id="691" addr="0x7f20c70b1ab0" >
-                                <attributelist id="692" addr="0x7f20c70b1ab0" >
-                                    <attribute name="String" value="std::string" id="693" addr="0x7f20c70b39f0" />
+            <namespace id="681" addr="0x7f658f8385d0" >
+                <attributelist id="682" addr="0x7f658f8385d0" >
+                    <attribute name="sym_name" value="XBMCAddon" id="683" addr="0x7f658f83e9f0" />
+                    <attribute name="name" value="XBMCAddon" id="684" addr="0x7f658f83e9f0" />
+                    <attribute name="sym_previousSibling" value="0x7f658f835930" id="685" addr="0x7f658f835930" />
+                    <attribute name="csym_nextSibling" value="0x7f658f83a930" id="686" addr="0x7f658f83a930" />
+                    <attribute name="sym_nextSibling" value="0x7f658f83a930" id="687" addr="0x7f658f83a930" />
+                    <typescope id="688" addr="0x7f658f83ca70" >
+                        <attributelist id="689" addr="0x7f658f83ca70" >
+                            <attribute name="name" value="XBMCAddon" id="690" addr="0x7f658f83e9f0" />
+                            <typetab id="691" addr="0x7f658f83cab0" >
+                                <attributelist id="692" addr="0x7f658f83cab0" >
+                                    <attribute name="String" value="std::string" id="693" addr="0x7f658f83e9f0" />
                                 </attributelist >
-                                <typetabsitem id="694" addr="0x7f20c70b1c90" >
-                                    <attributelist id="695" addr="0x7f20c70b1c90" >
+                                <typetabsitem id="694" addr="0x7f658f83cc90" >
+                                    <attributelist id="695" addr="0x7f658f83cc90" >
                                     </attributelist >
                                 </typetabsitem >
                             </typetab >
-                            <attribute name="parent" value="0x7f20c7093a30" id="696" addr="0x7f20c7093a30" />
-                            <attribute name="qname" value="XBMCAddon" id="697" addr="0x7f20c70b39f0" />
-                            <attribute name="symtab" value="0x7f20c70aa2d0" id="698" addr="0x7f20c70aa2d0" />
+                            <attribute name="parent" value="0x7f658f81ea30" id="696" addr="0x7f658f81ea30" />
+                            <attribute name="qname" value="XBMCAddon" id="697" addr="0x7f658f83e9f0" />
+                            <attribute name="symtab" value="0x7f658f8352d0" id="698" addr="0x7f658f8352d0" />
                         </attributelist >
-                        <typescopesitem id="699" addr="0x7f20c70aa290" >
-                            <attributelist id="700" addr="0x7f20c70aa290" >
+                        <typescopesitem id="699" addr="0x7f658f835290" >
+                            <attributelist id="700" addr="0x7f658f835290" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="701" addr="0x7f20c70b1ab0" >
-                            <attributelist id="702" addr="0x7f20c70b1ab0" >
-                                <attribute name="String" value="std::string" id="703" addr="0x7f20c70b39f0" />
+                        <typescopesitem id="701" addr="0x7f658f83cab0" >
+                            <attributelist id="702" addr="0x7f658f83cab0" >
+                                <attribute name="String" value="std::string" id="703" addr="0x7f658f83e9f0" />
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="704" addr="0x7f20c7093a30" >
-                            <attributelist id="705" addr="0x7f20c7093a30" >
-                                <attribute name="name" value="" id="706" addr="0x7f20c70b39f0" />
-                                <typetab id="707" addr="0x7f20c7093a90" >
-                                    <attributelist id="708" addr="0x7f20c7093a90" >
+                        <typescopesitem id="704" addr="0x7f658f81ea30" >
+                            <attributelist id="705" addr="0x7f658f81ea30" >
+                                <attribute name="name" value="" id="706" addr="0x7f658f83e9f0" />
+                                <typetab id="707" addr="0x7f658f81ea90" >
+                                    <attributelist id="708" addr="0x7f658f81ea90" >
                                     </attributelist >
                                 </typetab >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="709" addr="0x7f20c70b1bb0" >
-                            <attributelist id="710" addr="0x7f20c70b1bb0" >
+                        <typescopesitem id="709" addr="0x7f658f83cbb0" >
+                            <attributelist id="710" addr="0x7f658f83cbb0" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="711" addr="0x7f20c70aa2d0" >
-                            <attributelist id="712" addr="0x7f20c70aa2d0" >
-                                <attribute name="name" value="XBMCAddon" id="713" addr="0x7f20c70b39f0" />
-                                <attribute name="csymtab" value="0x7f20c70aa310" id="714" addr="0x7f20c70aa310" />
-                                <attribute name="symtab" value="0x7f20c70aa2b0" id="715" addr="0x7f20c70aa2b0" />
+                        <typescopesitem id="711" addr="0x7f658f8352d0" >
+                            <attributelist id="712" addr="0x7f658f8352d0" >
+                                <attribute name="name" value="XBMCAddon" id="713" addr="0x7f658f83e9f0" />
+                                <attribute name="csymtab" value="0x7f658f835310" id="714" addr="0x7f658f835310" />
+                                <attribute name="symtab" value="0x7f658f8352b0" id="715" addr="0x7f658f8352b0" />
                             </attributelist >
                         </typescopesitem >
                     </typescope >
-                    <attribute name="symtab" value="0x7f20c70aa2d0" id="716" addr="0x7f20c70aa2d0" />
-                    <attribute name="sym_symtab" value="0x7f20c7093950" id="717" addr="0x7f20c7093950" />
+                    <attribute name="symtab" value="0x7f658f8352d0" id="716" addr="0x7f658f8352d0" />
+                    <attribute name="sym_symtab" value="0x7f658f81e950" id="717" addr="0x7f658f81e950" />
                 </attributelist >
 
-                <namespace id="718" addr="0x7f20c70ad650" >
-                    <attributelist id="719" addr="0x7f20c70ad650" >
-                        <attribute name="sym_name" value="xbmcvfs" id="720" addr="0x7f20c70b39f0" />
-                        <attribute name="name" value="xbmcvfs" id="721" addr="0x7f20c70b39f0" />
-                        <attribute name="sym_previousSibling" value="0x7f20c70aaa50" id="722" addr="0x7f20c70aaa50" />
-                        <attribute name="csym_nextSibling" value="0x7f20c70af9b0" id="723" addr="0x7f20c70af9b0" />
-                        <attribute name="sym_nextSibling" value="0x7f20c70af9b0" id="724" addr="0x7f20c70af9b0" />
-                        <typescope id="725" addr="0x7f20c70b1e50" >
-                            <attributelist id="726" addr="0x7f20c70b1e50" >
-                                <attribute name="name" value="xbmcvfs" id="727" addr="0x7f20c70b39f0" />
-                                <typetab id="728" addr="0x7f20c70b1e70" >
-                                    <attributelist id="729" addr="0x7f20c70b1e70" >
-                                        <attribute name="Stat" value="Stat" id="730" addr="0x7f20c70b39f0" />
-                                        <attribute name="File" value="File" id="731" addr="0x7f20c70b39f0" />
+                <namespace id="718" addr="0x7f658f838650" >
+                    <attributelist id="719" addr="0x7f658f838650" >
+                        <attribute name="sym_name" value="xbmcvfs" id="720" addr="0x7f658f83e9f0" />
+                        <attribute name="name" value="xbmcvfs" id="721" addr="0x7f658f83e9f0" />
+                        <attribute name="sym_previousSibling" value="0x7f658f835a50" id="722" addr="0x7f658f835a50" />
+                        <attribute name="csym_nextSibling" value="0x7f658f83a9b0" id="723" addr="0x7f658f83a9b0" />
+                        <attribute name="sym_nextSibling" value="0x7f658f83a9b0" id="724" addr="0x7f658f83a9b0" />
+                        <typescope id="725" addr="0x7f658f83ce50" >
+                            <attributelist id="726" addr="0x7f658f83ce50" >
+                                <attribute name="name" value="xbmcvfs" id="727" addr="0x7f658f83e9f0" />
+                                <typetab id="728" addr="0x7f658f83ce70" >
+                                    <attributelist id="729" addr="0x7f658f83ce70" >
+                                        <attribute name="Stat" value="Stat" id="730" addr="0x7f658f83e9f0" />
+                                        <attribute name="File" value="File" id="731" addr="0x7f658f83e9f0" />
                                     </attributelist >
-                                    <typetabsitem id="732" addr="0x7f20c70b29b0" >
-                                        <attributelist id="733" addr="0x7f20c70b29b0" >
+                                    <typetabsitem id="732" addr="0x7f658f83d9b0" >
+                                        <attributelist id="733" addr="0x7f658f83d9b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="734" addr="0x7f20c70b1f50" >
-                                        <attributelist id="735" addr="0x7f20c70b1f50" >
+                                    <typetabsitem id="734" addr="0x7f658f83cf50" >
+                                        <attributelist id="735" addr="0x7f658f83cf50" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
-                                <attribute name="parent" value="0x7f20c70b1a70" id="736" addr="0x7f20c70b1a70" />
-                                <attribute name="qname" value="XBMCAddon::xbmcvfs" id="737" addr="0x7f20c70b39f0" />
-                                <attribute name="symtab" value="0x7f20c70aa9d0" id="738" addr="0x7f20c70aa9d0" />
+                                <attribute name="parent" value="0x7f658f83ca70" id="736" addr="0x7f658f83ca70" />
+                                <attribute name="qname" value="XBMCAddon::xbmcvfs" id="737" addr="0x7f658f83e9f0" />
+                                <attribute name="symtab" value="0x7f658f8359d0" id="738" addr="0x7f658f8359d0" />
                             </attributelist >
-                            <typescopesitem id="739" addr="0x7f20c70aa990" >
-                                <attributelist id="740" addr="0x7f20c70aa990" >
+                            <typescopesitem id="739" addr="0x7f658f835990" >
+                                <attributelist id="740" addr="0x7f658f835990" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="741" addr="0x7f20c70b1e70" >
-                                <attributelist id="742" addr="0x7f20c70b1e70" >
-                                    <attribute name="Stat" value="Stat" id="743" addr="0x7f20c70b39f0" />
-                                    <attribute name="File" value="File" id="744" addr="0x7f20c70b39f0" />
+                            <typescopesitem id="741" addr="0x7f658f83ce70" >
+                                <attributelist id="742" addr="0x7f658f83ce70" >
+                                    <attribute name="Stat" value="Stat" id="743" addr="0x7f658f83e9f0" />
+                                    <attribute name="File" value="File" id="744" addr="0x7f658f83e9f0" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="745" addr="0x7f20c70b1a70" >
-                                <attributelist id="746" addr="0x7f20c70b1a70" >
-                                    <attribute name="name" value="XBMCAddon" id="747" addr="0x7f20c70b39f0" />
-                                    <typetab id="748" addr="0x7f20c70b1ab0" >
-                                        <attributelist id="749" addr="0x7f20c70b1ab0" >
-                                            <attribute name="String" value="std::string" id="750" addr="0x7f20c70b39f0" />
+                            <typescopesitem id="745" addr="0x7f658f83ca70" >
+                                <attributelist id="746" addr="0x7f658f83ca70" >
+                                    <attribute name="name" value="XBMCAddon" id="747" addr="0x7f658f83e9f0" />
+                                    <typetab id="748" addr="0x7f658f83cab0" >
+                                        <attributelist id="749" addr="0x7f658f83cab0" >
+                                            <attribute name="String" value="std::string" id="750" addr="0x7f658f83e9f0" />
                                         </attributelist >
-                                        <typetabsitem id="751" addr="0x7f20c70b1c90" >
-                                            <attributelist id="752" addr="0x7f20c70b1c90" >
+                                        <typetabsitem id="751" addr="0x7f658f83cc90" >
+                                            <attributelist id="752" addr="0x7f658f83cc90" >
                                             </attributelist >
                                         </typetabsitem >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f20c7093a30" id="753" addr="0x7f20c7093a30" />
-                                    <attribute name="qname" value="XBMCAddon" id="754" addr="0x7f20c70b39f0" />
-                                    <attribute name="symtab" value="0x7f20c70aa2d0" id="755" addr="0x7f20c70aa2d0" />
+                                    <attribute name="parent" value="0x7f658f81ea30" id="753" addr="0x7f658f81ea30" />
+                                    <attribute name="qname" value="XBMCAddon" id="754" addr="0x7f658f83e9f0" />
+                                    <attribute name="symtab" value="0x7f658f8352d0" id="755" addr="0x7f658f8352d0" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="756" addr="0x7f20c70b1e90" >
-                                <attributelist id="757" addr="0x7f20c70b1e90" >
+                            <typescopesitem id="756" addr="0x7f658f83ce90" >
+                                <attributelist id="757" addr="0x7f658f83ce90" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="758" addr="0x7f20c70aa9d0" >
-                                <attributelist id="759" addr="0x7f20c70aa9d0" >
-                                    <attribute name="name" value="xbmcvfs" id="760" addr="0x7f20c70b39f0" />
-                                    <attribute name="csymtab" value="0x7f20c70aaa10" id="761" addr="0x7f20c70aaa10" />
-                                    <attribute name="symtab" value="0x7f20c70aa9b0" id="762" addr="0x7f20c70aa9b0" />
+                            <typescopesitem id="758" addr="0x7f658f8359d0" >
+                                <attributelist id="759" addr="0x7f658f8359d0" >
+                                    <attribute name="name" value="xbmcvfs" id="760" addr="0x7f658f83e9f0" />
+                                    <attribute name="csymtab" value="0x7f658f835a10" id="761" addr="0x7f658f835a10" />
+                                    <attribute name="symtab" value="0x7f658f8359b0" id="762" addr="0x7f658f8359b0" />
                                 </attributelist >
                             </typescopesitem >
                         </typescope >
-                        <attribute name="symtab" value="0x7f20c70aa9d0" id="763" addr="0x7f20c70aa9d0" />
-                        <attribute name="sym_symtab" value="0x7f20c70aa2d0" id="764" addr="0x7f20c70aa2d0" />
+                        <attribute name="symtab" value="0x7f658f8359d0" id="763" addr="0x7f658f8359d0" />
+                        <attribute name="sym_symtab" value="0x7f658f8352d0" id="764" addr="0x7f658f8352d0" />
                     </attributelist >
 
-                    <class id="765" addr="0x7f20c70ad7d0" >
-                        <attributelist id="766" addr="0x7f20c70ad7d0" >
-                            <attribute name="name" value="XBMCAddon::xbmcvfs::Stat" id="767" addr="0x7f20c70b39f0" />
-                            <attribute name="sym_symtab" value="0x7f20c70aa9d0" id="768" addr="0x7f20c70aa9d0" />
-                            <attribute name="symtab" value="0x7f20c70ad910" id="769" addr="0x7f20c70ad910" />
-                            <attribute name="allows_typedef" value="1" id="770" addr="0x7f20c70b39f0" />
-                            <attribute name="typepass_visit" value="1" id="771" addr="0x7f20c70b39f0" />
-                            <attribute name="allocate_visit" value="1" id="772" addr="0x7f20c70b39f0" />
-                            <attribute name="kind" value="class" id="773" addr="0x7f20c70b39f0" />
-                            <attribute name="sym_name" value="Stat" id="774" addr="0x7f20c70b39f0" />
-                            <attribute name="allocate_has_constructor" value="1" id="775" addr="0x7f20c70b39f0" />
-                            <attribute name="allocate_public_constructor" value="1" id="776" addr="0x7f20c70b39f0" />
-                            <attribute name="allocate_copy_constructor" value="1" id="777" addr="0x7f20c70b39f0" />
-                            <attribute name="allocate_default_destructor" value="1" id="778" addr="0x7f20c70b39f0" />
-                            <attribute name="privatebaselist" value="0x7f20c70ad7b0" id="779" addr="0x7f20c70ad7b0" />
-                            <attribute name="protectedbaselist" value="0x7f20c70ad790" id="780" addr="0x7f20c70ad790" />
-                            <baselist id="781" addr="0x7f20c70ad770" >
-                                <base name="AddonClass" id="782" addr="0x7f20c70ad6f0" />
+                    <class id="765" addr="0x7f658f8387d0" >
+                        <attributelist id="766" addr="0x7f658f8387d0" >
+                            <attribute name="name" value="XBMCAddon::xbmcvfs::Stat" id="767" addr="0x7f658f83e9f0" />
+                            <attribute name="sym_symtab" value="0x7f658f8359d0" id="768" addr="0x7f658f8359d0" />
+                            <attribute name="symtab" value="0x7f658f838910" id="769" addr="0x7f658f838910" />
+                            <attribute name="allows_typedef" value="1" id="770" addr="0x7f658f83e9f0" />
+                            <attribute name="typepass_visit" value="1" id="771" addr="0x7f658f83e9f0" />
+                            <attribute name="allocate_visit" value="1" id="772" addr="0x7f658f83e9f0" />
+                            <attribute name="kind" value="class" id="773" addr="0x7f658f83e9f0" />
+                            <attribute name="sym_name" value="Stat" id="774" addr="0x7f658f83e9f0" />
+                            <attribute name="allocate_has_constructor" value="1" id="775" addr="0x7f658f83e9f0" />
+                            <attribute name="allocate_public_constructor" value="1" id="776" addr="0x7f658f83e9f0" />
+                            <attribute name="allocate_copy_constructor" value="1" id="777" addr="0x7f658f83e9f0" />
+                            <attribute name="allocate_default_destructor" value="1" id="778" addr="0x7f658f83e9f0" />
+                            <attribute name="privatebaselist" value="0x7f658f8387b0" id="779" addr="0x7f658f8387b0" />
+                            <attribute name="protectedbaselist" value="0x7f658f838790" id="780" addr="0x7f658f838790" />
+                            <baselist id="781" addr="0x7f658f838770" >
+                                <base name="AddonClass" id="782" addr="0x7f658f8386f0" />
                             </baselist >
-                            <attribute name="module" value="xbmcvfs" id="783" addr="0x7f20c70aa090" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="784" addr="0x7f20c70b39f0" />
-                            <typescope id="785" addr="0x7f20c70b2a70" >
-                                <attributelist id="786" addr="0x7f20c70b2a70" >
-                                    <attribute name="name" value="Stat" id="787" addr="0x7f20c70b39f0" />
-                                    <typetab id="788" addr="0x7f20c70b2a90" >
-                                        <attributelist id="789" addr="0x7f20c70b2a90" >
+                            <attribute name="module" value="xbmcvfs" id="783" addr="0x7f658f835090" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="784" addr="0x7f658f83e9f0" />
+                            <typescope id="785" addr="0x7f658f83da70" >
+                                <attributelist id="786" addr="0x7f658f83da70" >
+                                    <attribute name="name" value="Stat" id="787" addr="0x7f658f83e9f0" />
+                                    <typetab id="788" addr="0x7f658f83da90" >
+                                        <attributelist id="789" addr="0x7f658f83da90" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f20c70b1e50" id="790" addr="0x7f20c70b1e50" />
-                                    <attribute name="qname" value="XBMCAddon::xbmcvfs::Stat" id="791" addr="0x7f20c70b39f0" />
-                                    <attribute name="symtab" value="0x7f20c70ad910" id="792" addr="0x7f20c70ad910" />
+                                    <attribute name="parent" value="0x7f658f83ce50" id="790" addr="0x7f658f83ce50" />
+                                    <attribute name="qname" value="XBMCAddon::xbmcvfs::Stat" id="791" addr="0x7f658f83e9f0" />
+                                    <attribute name="symtab" value="0x7f658f838910" id="792" addr="0x7f658f838910" />
                                 </attributelist >
-                                <typescopesitem id="793" addr="0x7f20c70b2a10" >
-                                    <attributelist id="794" addr="0x7f20c70b2a10" >
+                                <typescopesitem id="793" addr="0x7f658f83da10" >
+                                    <attributelist id="794" addr="0x7f658f83da10" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="795" addr="0x7f20c70b2a90" >
-                                    <attributelist id="796" addr="0x7f20c70b2a90" >
+                                <typescopesitem id="795" addr="0x7f658f83da90" >
+                                    <attributelist id="796" addr="0x7f658f83da90" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="797" addr="0x7f20c70b1e50" >
-                                    <attributelist id="798" addr="0x7f20c70b1e50" >
-                                        <attribute name="name" value="xbmcvfs" id="799" addr="0x7f20c70b39f0" />
-                                        <typetab id="800" addr="0x7f20c70b1e70" >
-                                            <attributelist id="801" addr="0x7f20c70b1e70" >
-                                                <attribute name="Stat" value="Stat" id="802" addr="0x7f20c70b39f0" />
-                                                <attribute name="File" value="File" id="803" addr="0x7f20c70b39f0" />
+                                <typescopesitem id="797" addr="0x7f658f83ce50" >
+                                    <attributelist id="798" addr="0x7f658f83ce50" >
+                                        <attribute name="name" value="xbmcvfs" id="799" addr="0x7f658f83e9f0" />
+                                        <typetab id="800" addr="0x7f658f83ce70" >
+                                            <attributelist id="801" addr="0x7f658f83ce70" >
+                                                <attribute name="Stat" value="Stat" id="802" addr="0x7f658f83e9f0" />
+                                                <attribute name="File" value="File" id="803" addr="0x7f658f83e9f0" />
                                             </attributelist >
-                                            <typetabsitem id="804" addr="0x7f20c70b29b0" >
-                                                <attributelist id="805" addr="0x7f20c70b29b0" >
+                                            <typetabsitem id="804" addr="0x7f658f83d9b0" >
+                                                <attributelist id="805" addr="0x7f658f83d9b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="806" addr="0x7f20c70b1f50" >
-                                                <attributelist id="807" addr="0x7f20c70b1f50" >
+                                            <typetabsitem id="806" addr="0x7f658f83cf50" >
+                                                <attributelist id="807" addr="0x7f658f83cf50" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7f20c70b1a70" id="808" addr="0x7f20c70b1a70" />
-                                        <attribute name="qname" value="XBMCAddon::xbmcvfs" id="809" addr="0x7f20c70b39f0" />
-                                        <attribute name="symtab" value="0x7f20c70aa9d0" id="810" addr="0x7f20c70aa9d0" />
+                                        <attribute name="parent" value="0x7f658f83ca70" id="808" addr="0x7f658f83ca70" />
+                                        <attribute name="qname" value="XBMCAddon::xbmcvfs" id="809" addr="0x7f658f83e9f0" />
+                                        <attribute name="symtab" value="0x7f658f8359d0" id="810" addr="0x7f658f8359d0" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="811" addr="0x7f20c70b2ab0" >
-                                    <attributelist id="812" addr="0x7f20c70b2ab0" >
+                                <typescopesitem id="811" addr="0x7f658f83dab0" >
+                                    <attributelist id="812" addr="0x7f658f83dab0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="813" addr="0x7f20c70ad910" >
-                                    <attributelist id="814" addr="0x7f20c70ad910" >
-                                        <attribute name="name" value="Stat" id="815" addr="0x7f20c70b39f0" />
-                                        <attribute name="csymtab" value="0x7f20c70ad930" id="816" addr="0x7f20c70ad930" />
-                                        <attribute name="symtab" value="0x7f20c70ad8d0" id="817" addr="0x7f20c70ad8d0" />
+                                <typescopesitem id="813" addr="0x7f658f838910" >
+                                    <attributelist id="814" addr="0x7f658f838910" >
+                                        <attribute name="name" value="Stat" id="815" addr="0x7f658f83e9f0" />
+                                        <attribute name="csymtab" value="0x7f658f838930" id="816" addr="0x7f658f838930" />
+                                        <attribute name="symtab" value="0x7f658f8388d0" id="817" addr="0x7f658f8388d0" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <cdecl id="818" addr="0x7f20c70ada30" >
-                            <attributelist id="819" addr="0x7f20c70ada30" >
-                                <attribute name="ismember" value="1" id="820" addr="0x7f20c70b39f0" />
-                                <attribute name="name" value="st" id="821" addr="0x7f20c70b39f0" />
-                                <attribute name="decl" value="" id="822" addr="0x7f20c70b39f0" />
-                                <attribute name="access" value="private" id="823" addr="0x7f20c70b39f0" />
-                                <attribute name="kind" value="variable" id="824" addr="0x7f20c70b39f0" />
-                                <attribute name="type" value="__stat64" id="825" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_symtab" value="0x7f20c70ad910" id="826" addr="0x7f20c70ad910" />
+                        <cdecl id="818" addr="0x7f658f838a30" >
+                            <attributelist id="819" addr="0x7f658f838a30" >
+                                <attribute name="ismember" value="1" id="820" addr="0x7f658f83e9f0" />
+                                <attribute name="name" value="st" id="821" addr="0x7f658f83e9f0" />
+                                <attribute name="decl" value="" id="822" addr="0x7f658f83e9f0" />
+                                <attribute name="access" value="private" id="823" addr="0x7f658f83e9f0" />
+                                <attribute name="kind" value="variable" id="824" addr="0x7f658f83e9f0" />
+                                <attribute name="type" value="__stat64" id="825" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_symtab" value="0x7f658f838910" id="826" addr="0x7f658f838910" />
                             </attributelist >
                          
                         </cdecl >
-                        <access id="827" addr="0x7f20c70adb10" >
-                            <attributelist id="828" addr="0x7f20c70adb10" >
-                                <attribute name="kind" value="public" id="829" addr="0x7f20c70b39f0" />
+                        <access id="827" addr="0x7f658f838b10" >
+                            <attributelist id="828" addr="0x7f658f838b10" >
+                                <attribute name="kind" value="public" id="829" addr="0x7f658f83e9f0" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="830" addr="0x7f20c70add50" >
-                            <attributelist id="831" addr="0x7f20c70add50" >
-                                <attribute name="name" value="Stat" id="832" addr="0x7f20c70b39f0" />
-                                <attribute name="ismember" value="1" id="833" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_symtab" value="0x7f20c70ad910" id="834" addr="0x7f20c70ad910" />
-                                <attribute name="sym_name" value="Stat" id="835" addr="0x7f20c70b39f0" />
-                                <attribute name="decl" value="f(r.q(const).String)." id="836" addr="0x7f20c70b39f0" />
-                                <attribute name="access" value="public" id="837" addr="0x7f20c70b39f0" />
-                                <parmlist id="838" addr="0x7f20c70adcb0" >
+                        <constructor id="830" addr="0x7f658f838d50" >
+                            <attributelist id="831" addr="0x7f658f838d50" >
+                                <attribute name="name" value="Stat" id="832" addr="0x7f658f83e9f0" />
+                                <attribute name="ismember" value="1" id="833" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_symtab" value="0x7f658f838910" id="834" addr="0x7f658f838910" />
+                                <attribute name="sym_name" value="Stat" id="835" addr="0x7f658f83e9f0" />
+                                <attribute name="decl" value="f(r.q(const).String)." id="836" addr="0x7f658f83e9f0" />
+                                <attribute name="access" value="public" id="837" addr="0x7f658f83e9f0" />
+                                <parmlist id="838" addr="0x7f658f838cb0" >
                                     <parm id="839">
-                                        <attributelist id="840" addr="0x7f20c70adcb0" >
-                                            <attribute name="name" value="path" id="841" addr="0x7f20c70b39f0" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="842" addr="0x7f20c70b39f0" />
+                                        <attributelist id="840" addr="0x7f658f838cb0" >
+                                            <attribute name="name" value="path" id="841" addr="0x7f658f83e9f0" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="842" addr="0x7f658f83e9f0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="code" value="{&#10;        DelayedCallGuard dg;&#10;        XFILE::CFile::Stat(path, &amp;st);&#10;      }" id="843" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="844" addr="0x7f20c70b39f0" />
-                                <attribute name="feature_new" value="1" id="845" addr="0x7f20c70b39f0" />
+                                <attribute name="code" value="{&#10;        DelayedCallGuard dg;&#10;        XFILE::CFile::Stat(path, &amp;st);&#10;      }" id="843" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="844" addr="0x7f658f83e9f0" />
+                                <attribute name="feature_new" value="1" id="845" addr="0x7f658f83e9f0" />
                             </attributelist >
                          
                         </constructor >
-                        <cdecl id="846" addr="0x7f20c70adf70" >
-                            <attributelist id="847" addr="0x7f20c70adf70" >
-                                <attribute name="name" value="st_mode" id="848" addr="0x7f20c70b39f0" />
-                                <attribute name="ismember" value="1" id="849" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_symtab" value="0x7f20c70ad910" id="850" addr="0x7f20c70ad910" />
-                                <attribute name="kind" value="function" id="851" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_name" value="st_mode" id="852" addr="0x7f20c70b39f0" />
-                                <attribute name="decl" value="f()." id="853" addr="0x7f20c70b39f0" />
-                                <attribute name="access" value="public" id="854" addr="0x7f20c70b39f0" />
-                                <attribute name="type" value="long long" id="855" addr="0x7f20c70b39f0" />
-                                <attribute name="code" value="{ return st.st_mode; }" id="856" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="857" addr="0x7f20c70b39f0" />
+                        <cdecl id="846" addr="0x7f658f838f70" >
+                            <attributelist id="847" addr="0x7f658f838f70" >
+                                <attribute name="name" value="st_mode" id="848" addr="0x7f658f83e9f0" />
+                                <attribute name="ismember" value="1" id="849" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_symtab" value="0x7f658f838910" id="850" addr="0x7f658f838910" />
+                                <attribute name="kind" value="function" id="851" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_name" value="st_mode" id="852" addr="0x7f658f83e9f0" />
+                                <attribute name="decl" value="f()." id="853" addr="0x7f658f83e9f0" />
+                                <attribute name="access" value="public" id="854" addr="0x7f658f83e9f0" />
+                                <attribute name="type" value="long long" id="855" addr="0x7f658f83e9f0" />
+                                <attribute name="code" value="{ return st.st_mode; }" id="856" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="857" addr="0x7f658f83e9f0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="858" addr="0x7f20c70ae1d0" >
-                            <attributelist id="859" addr="0x7f20c70ae1d0" >
-                                <attribute name="name" value="st_ino" id="860" addr="0x7f20c70b39f0" />
-                                <attribute name="ismember" value="1" id="861" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_symtab" value="0x7f20c70ad910" id="862" addr="0x7f20c70ad910" />
-                                <attribute name="kind" value="function" id="863" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_name" value="st_ino" id="864" addr="0x7f20c70b39f0" />
-                                <attribute name="decl" value="f()." id="865" addr="0x7f20c70b39f0" />
-                                <attribute name="access" value="public" id="866" addr="0x7f20c70b39f0" />
-                                <attribute name="type" value="long long" id="867" addr="0x7f20c70b39f0" />
-                                <attribute name="code" value="{ return st.st_ino; }" id="868" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="869" addr="0x7f20c70b39f0" />
+                        <cdecl id="858" addr="0x7f658f8391d0" >
+                            <attributelist id="859" addr="0x7f658f8391d0" >
+                                <attribute name="name" value="st_ino" id="860" addr="0x7f658f83e9f0" />
+                                <attribute name="ismember" value="1" id="861" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_symtab" value="0x7f658f838910" id="862" addr="0x7f658f838910" />
+                                <attribute name="kind" value="function" id="863" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_name" value="st_ino" id="864" addr="0x7f658f83e9f0" />
+                                <attribute name="decl" value="f()." id="865" addr="0x7f658f83e9f0" />
+                                <attribute name="access" value="public" id="866" addr="0x7f658f83e9f0" />
+                                <attribute name="type" value="long long" id="867" addr="0x7f658f83e9f0" />
+                                <attribute name="code" value="{ return st.st_ino; }" id="868" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="869" addr="0x7f658f83e9f0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="870" addr="0x7f20c70ae430" >
-                            <attributelist id="871" addr="0x7f20c70ae430" >
-                                <attribute name="name" value="st_dev" id="872" addr="0x7f20c70b39f0" />
-                                <attribute name="ismember" value="1" id="873" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_symtab" value="0x7f20c70ad910" id="874" addr="0x7f20c70ad910" />
-                                <attribute name="kind" value="function" id="875" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_name" value="st_dev" id="876" addr="0x7f20c70b39f0" />
-                                <attribute name="decl" value="f()." id="877" addr="0x7f20c70b39f0" />
-                                <attribute name="access" value="public" id="878" addr="0x7f20c70b39f0" />
-                                <attribute name="type" value="long long" id="879" addr="0x7f20c70b39f0" />
-                                <attribute name="code" value="{ return st.st_dev; }" id="880" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="881" addr="0x7f20c70b39f0" />
+                        <cdecl id="870" addr="0x7f658f839430" >
+                            <attributelist id="871" addr="0x7f658f839430" >
+                                <attribute name="name" value="st_dev" id="872" addr="0x7f658f83e9f0" />
+                                <attribute name="ismember" value="1" id="873" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_symtab" value="0x7f658f838910" id="874" addr="0x7f658f838910" />
+                                <attribute name="kind" value="function" id="875" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_name" value="st_dev" id="876" addr="0x7f658f83e9f0" />
+                                <attribute name="decl" value="f()." id="877" addr="0x7f658f83e9f0" />
+                                <attribute name="access" value="public" id="878" addr="0x7f658f83e9f0" />
+                                <attribute name="type" value="long long" id="879" addr="0x7f658f83e9f0" />
+                                <attribute name="code" value="{ return st.st_dev; }" id="880" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="881" addr="0x7f658f83e9f0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="882" addr="0x7f20c70ae690" >
-                            <attributelist id="883" addr="0x7f20c70ae690" >
-                                <attribute name="name" value="st_nlink" id="884" addr="0x7f20c70b39f0" />
-                                <attribute name="ismember" value="1" id="885" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_symtab" value="0x7f20c70ad910" id="886" addr="0x7f20c70ad910" />
-                                <attribute name="kind" value="function" id="887" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_name" value="st_nlink" id="888" addr="0x7f20c70b39f0" />
-                                <attribute name="decl" value="f()." id="889" addr="0x7f20c70b39f0" />
-                                <attribute name="access" value="public" id="890" addr="0x7f20c70b39f0" />
-                                <attribute name="type" value="long long" id="891" addr="0x7f20c70b39f0" />
-                                <attribute name="code" value="{ return st.st_nlink; }" id="892" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="893" addr="0x7f20c70b39f0" />
+                        <cdecl id="882" addr="0x7f658f839690" >
+                            <attributelist id="883" addr="0x7f658f839690" >
+                                <attribute name="name" value="st_nlink" id="884" addr="0x7f658f83e9f0" />
+                                <attribute name="ismember" value="1" id="885" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_symtab" value="0x7f658f838910" id="886" addr="0x7f658f838910" />
+                                <attribute name="kind" value="function" id="887" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_name" value="st_nlink" id="888" addr="0x7f658f83e9f0" />
+                                <attribute name="decl" value="f()." id="889" addr="0x7f658f83e9f0" />
+                                <attribute name="access" value="public" id="890" addr="0x7f658f83e9f0" />
+                                <attribute name="type" value="long long" id="891" addr="0x7f658f83e9f0" />
+                                <attribute name="code" value="{ return st.st_nlink; }" id="892" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="893" addr="0x7f658f83e9f0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="894" addr="0x7f20c70ae8f0" >
-                            <attributelist id="895" addr="0x7f20c70ae8f0" >
-                                <attribute name="name" value="st_uid" id="896" addr="0x7f20c70b39f0" />
-                                <attribute name="ismember" value="1" id="897" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_symtab" value="0x7f20c70ad910" id="898" addr="0x7f20c70ad910" />
-                                <attribute name="kind" value="function" id="899" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_name" value="st_uid" id="900" addr="0x7f20c70b39f0" />
-                                <attribute name="decl" value="f()." id="901" addr="0x7f20c70b39f0" />
-                                <attribute name="access" value="public" id="902" addr="0x7f20c70b39f0" />
-                                <attribute name="type" value="long long" id="903" addr="0x7f20c70b39f0" />
-                                <attribute name="code" value="{ return st.st_uid; }" id="904" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="905" addr="0x7f20c70b39f0" />
+                        <cdecl id="894" addr="0x7f658f8398f0" >
+                            <attributelist id="895" addr="0x7f658f8398f0" >
+                                <attribute name="name" value="st_uid" id="896" addr="0x7f658f83e9f0" />
+                                <attribute name="ismember" value="1" id="897" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_symtab" value="0x7f658f838910" id="898" addr="0x7f658f838910" />
+                                <attribute name="kind" value="function" id="899" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_name" value="st_uid" id="900" addr="0x7f658f83e9f0" />
+                                <attribute name="decl" value="f()." id="901" addr="0x7f658f83e9f0" />
+                                <attribute name="access" value="public" id="902" addr="0x7f658f83e9f0" />
+                                <attribute name="type" value="long long" id="903" addr="0x7f658f83e9f0" />
+                                <attribute name="code" value="{ return st.st_uid; }" id="904" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="905" addr="0x7f658f83e9f0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="906" addr="0x7f20c70aeb50" >
-                            <attributelist id="907" addr="0x7f20c70aeb50" >
-                                <attribute name="name" value="st_gid" id="908" addr="0x7f20c70b39f0" />
-                                <attribute name="ismember" value="1" id="909" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_symtab" value="0x7f20c70ad910" id="910" addr="0x7f20c70ad910" />
-                                <attribute name="kind" value="function" id="911" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_name" value="st_gid" id="912" addr="0x7f20c70b39f0" />
-                                <attribute name="decl" value="f()." id="913" addr="0x7f20c70b39f0" />
-                                <attribute name="access" value="public" id="914" addr="0x7f20c70b39f0" />
-                                <attribute name="type" value="long long" id="915" addr="0x7f20c70b39f0" />
-                                <attribute name="code" value="{ return st.st_gid; }" id="916" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="917" addr="0x7f20c70b39f0" />
+                        <cdecl id="906" addr="0x7f658f839b50" >
+                            <attributelist id="907" addr="0x7f658f839b50" >
+                                <attribute name="name" value="st_gid" id="908" addr="0x7f658f83e9f0" />
+                                <attribute name="ismember" value="1" id="909" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_symtab" value="0x7f658f838910" id="910" addr="0x7f658f838910" />
+                                <attribute name="kind" value="function" id="911" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_name" value="st_gid" id="912" addr="0x7f658f83e9f0" />
+                                <attribute name="decl" value="f()." id="913" addr="0x7f658f83e9f0" />
+                                <attribute name="access" value="public" id="914" addr="0x7f658f83e9f0" />
+                                <attribute name="type" value="long long" id="915" addr="0x7f658f83e9f0" />
+                                <attribute name="code" value="{ return st.st_gid; }" id="916" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="917" addr="0x7f658f83e9f0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="918" addr="0x7f20c70aedb0" >
-                            <attributelist id="919" addr="0x7f20c70aedb0" >
-                                <attribute name="name" value="st_size" id="920" addr="0x7f20c70b39f0" />
-                                <attribute name="ismember" value="1" id="921" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_symtab" value="0x7f20c70ad910" id="922" addr="0x7f20c70ad910" />
-                                <attribute name="kind" value="function" id="923" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_name" value="st_size" id="924" addr="0x7f20c70b39f0" />
-                                <attribute name="decl" value="f()." id="925" addr="0x7f20c70b39f0" />
-                                <attribute name="access" value="public" id="926" addr="0x7f20c70b39f0" />
-                                <attribute name="type" value="long long" id="927" addr="0x7f20c70b39f0" />
-                                <attribute name="code" value="{ return st.st_size; }" id="928" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="929" addr="0x7f20c70b39f0" />
+                        <cdecl id="918" addr="0x7f658f839db0" >
+                            <attributelist id="919" addr="0x7f658f839db0" >
+                                <attribute name="name" value="st_size" id="920" addr="0x7f658f83e9f0" />
+                                <attribute name="ismember" value="1" id="921" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_symtab" value="0x7f658f838910" id="922" addr="0x7f658f838910" />
+                                <attribute name="kind" value="function" id="923" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_name" value="st_size" id="924" addr="0x7f658f83e9f0" />
+                                <attribute name="decl" value="f()." id="925" addr="0x7f658f83e9f0" />
+                                <attribute name="access" value="public" id="926" addr="0x7f658f83e9f0" />
+                                <attribute name="type" value="long long" id="927" addr="0x7f658f83e9f0" />
+                                <attribute name="code" value="{ return st.st_size; }" id="928" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="929" addr="0x7f658f83e9f0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="930" addr="0x7f20c70af010" >
-                            <attributelist id="931" addr="0x7f20c70af010" >
-                                <attribute name="name" value="atime" id="932" addr="0x7f20c70b39f0" />
-                                <attribute name="ismember" value="1" id="933" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_symtab" value="0x7f20c70ad910" id="934" addr="0x7f20c70ad910" />
-                                <attribute name="kind" value="function" id="935" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_name" value="st_atime" id="936" addr="0x7f20c70b39f0" />
-                                <attribute name="decl" value="f()." id="937" addr="0x7f20c70b39f0" />
-                                <attribute name="access" value="public" id="938" addr="0x7f20c70b39f0" />
-                                <attribute name="type" value="long long" id="939" addr="0x7f20c70b39f0" />
-                                <attribute name="code" value="{ return st.st_atime; }" id="940" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="941" addr="0x7f20c70b39f0" />
+                        <cdecl id="930" addr="0x7f658f83a010" >
+                            <attributelist id="931" addr="0x7f658f83a010" >
+                                <attribute name="name" value="atime" id="932" addr="0x7f658f83e9f0" />
+                                <attribute name="ismember" value="1" id="933" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_symtab" value="0x7f658f838910" id="934" addr="0x7f658f838910" />
+                                <attribute name="kind" value="function" id="935" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_name" value="st_atime" id="936" addr="0x7f658f83e9f0" />
+                                <attribute name="decl" value="f()." id="937" addr="0x7f658f83e9f0" />
+                                <attribute name="access" value="public" id="938" addr="0x7f658f83e9f0" />
+                                <attribute name="type" value="long long" id="939" addr="0x7f658f83e9f0" />
+                                <attribute name="code" value="{ return st.st_atime; }" id="940" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="941" addr="0x7f658f83e9f0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="942" addr="0x7f20c70af270" >
-                            <attributelist id="943" addr="0x7f20c70af270" >
-                                <attribute name="name" value="mtime" id="944" addr="0x7f20c70b39f0" />
-                                <attribute name="ismember" value="1" id="945" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_symtab" value="0x7f20c70ad910" id="946" addr="0x7f20c70ad910" />
-                                <attribute name="kind" value="function" id="947" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_name" value="st_mtime" id="948" addr="0x7f20c70b39f0" />
-                                <attribute name="decl" value="f()." id="949" addr="0x7f20c70b39f0" />
-                                <attribute name="access" value="public" id="950" addr="0x7f20c70b39f0" />
-                                <attribute name="type" value="long long" id="951" addr="0x7f20c70b39f0" />
-                                <attribute name="code" value="{ return st.st_mtime; }" id="952" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="953" addr="0x7f20c70b39f0" />
+                        <cdecl id="942" addr="0x7f658f83a270" >
+                            <attributelist id="943" addr="0x7f658f83a270" >
+                                <attribute name="name" value="mtime" id="944" addr="0x7f658f83e9f0" />
+                                <attribute name="ismember" value="1" id="945" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_symtab" value="0x7f658f838910" id="946" addr="0x7f658f838910" />
+                                <attribute name="kind" value="function" id="947" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_name" value="st_mtime" id="948" addr="0x7f658f83e9f0" />
+                                <attribute name="decl" value="f()." id="949" addr="0x7f658f83e9f0" />
+                                <attribute name="access" value="public" id="950" addr="0x7f658f83e9f0" />
+                                <attribute name="type" value="long long" id="951" addr="0x7f658f83e9f0" />
+                                <attribute name="code" value="{ return st.st_mtime; }" id="952" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="953" addr="0x7f658f83e9f0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="954" addr="0x7f20c70af4d0" >
-                            <attributelist id="955" addr="0x7f20c70af4d0" >
-                                <attribute name="ismember" value="1" id="956" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_name" value="st_ctime" id="957" addr="0x7f20c70b39f0" />
-                                <attribute name="name" value="ctime" id="958" addr="0x7f20c70b39f0" />
-                                <attribute name="decl" value="f()." id="959" addr="0x7f20c70b39f0" />
-                                <attribute name="access" value="public" id="960" addr="0x7f20c70b39f0" />
-                                <attribute name="code" value="{ return st.st_ctime; }" id="961" addr="0x7f20c70b39f0" />
-                                <attribute name="kind" value="function" id="962" addr="0x7f20c70b39f0" />
-                                <attribute name="type" value="long long" id="963" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_symtab" value="0x7f20c70ad910" id="964" addr="0x7f20c70ad910" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="965" addr="0x7f20c70b39f0" />
+                        <cdecl id="954" addr="0x7f658f83a4d0" >
+                            <attributelist id="955" addr="0x7f658f83a4d0" >
+                                <attribute name="ismember" value="1" id="956" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_name" value="st_ctime" id="957" addr="0x7f658f83e9f0" />
+                                <attribute name="name" value="ctime" id="958" addr="0x7f658f83e9f0" />
+                                <attribute name="decl" value="f()." id="959" addr="0x7f658f83e9f0" />
+                                <attribute name="access" value="public" id="960" addr="0x7f658f83e9f0" />
+                                <attribute name="code" value="{ return st.st_ctime; }" id="961" addr="0x7f658f83e9f0" />
+                                <attribute name="kind" value="function" id="962" addr="0x7f658f83e9f0" />
+                                <attribute name="type" value="long long" id="963" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_symtab" value="0x7f658f838910" id="964" addr="0x7f658f838910" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="965" addr="0x7f658f83e9f0" />
                             </attributelist >
                          
                         </cdecl >
@@ -1463,337 +1463,337 @@
                 </namespace >
             </namespace >
         </include >
-        <include id="966" addr="0x7f20c70af890" >
-            <attributelist id="967" addr="0x7f20c70af890" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/ModuleXbmcvfs.h" id="968" addr="0x7f20c70b39f0" />
+        <include id="966" addr="0x7f658f83a890" >
+            <attributelist id="967" addr="0x7f658f83a890" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/ModuleXbmcvfs.h" id="968" addr="0x7f658f83e9f0" />
             </attributelist >
 
-            <namespace id="969" addr="0x7f20c70af930" >
-                <attributelist id="970" addr="0x7f20c70af930" >
-                    <attribute name="sym_name" value="XBMCAddon" id="971" addr="0x7f20c70b39f0" />
-                    <attribute name="name" value="XBMCAddon" id="972" addr="0x7f20c70b39f0" />
-                    <attribute name="sym_previousSibling" value="0x7f20c70ad5d0" id="973" addr="0x7f20c70ad5d0" />
-                    <typescope id="974" addr="0x7f20c70b1a70" >
-                        <attributelist id="975" addr="0x7f20c70b1a70" >
-                            <attribute name="name" value="XBMCAddon" id="976" addr="0x7f20c70b39f0" />
-                            <typetab id="977" addr="0x7f20c70b1ab0" >
-                                <attributelist id="978" addr="0x7f20c70b1ab0" >
-                                    <attribute name="String" value="std::string" id="979" addr="0x7f20c70b39f0" />
+            <namespace id="969" addr="0x7f658f83a930" >
+                <attributelist id="970" addr="0x7f658f83a930" >
+                    <attribute name="sym_name" value="XBMCAddon" id="971" addr="0x7f658f83e9f0" />
+                    <attribute name="name" value="XBMCAddon" id="972" addr="0x7f658f83e9f0" />
+                    <attribute name="sym_previousSibling" value="0x7f658f8385d0" id="973" addr="0x7f658f8385d0" />
+                    <typescope id="974" addr="0x7f658f83ca70" >
+                        <attributelist id="975" addr="0x7f658f83ca70" >
+                            <attribute name="name" value="XBMCAddon" id="976" addr="0x7f658f83e9f0" />
+                            <typetab id="977" addr="0x7f658f83cab0" >
+                                <attributelist id="978" addr="0x7f658f83cab0" >
+                                    <attribute name="String" value="std::string" id="979" addr="0x7f658f83e9f0" />
                                 </attributelist >
-                                <typetabsitem id="980" addr="0x7f20c70b1c90" >
-                                    <attributelist id="981" addr="0x7f20c70b1c90" >
+                                <typetabsitem id="980" addr="0x7f658f83cc90" >
+                                    <attributelist id="981" addr="0x7f658f83cc90" >
                                     </attributelist >
                                 </typetabsitem >
                             </typetab >
-                            <attribute name="parent" value="0x7f20c7093a30" id="982" addr="0x7f20c7093a30" />
-                            <attribute name="qname" value="XBMCAddon" id="983" addr="0x7f20c70b39f0" />
-                            <attribute name="symtab" value="0x7f20c70aa2d0" id="984" addr="0x7f20c70aa2d0" />
+                            <attribute name="parent" value="0x7f658f81ea30" id="982" addr="0x7f658f81ea30" />
+                            <attribute name="qname" value="XBMCAddon" id="983" addr="0x7f658f83e9f0" />
+                            <attribute name="symtab" value="0x7f658f8352d0" id="984" addr="0x7f658f8352d0" />
                         </attributelist >
-                        <typescopesitem id="985" addr="0x7f20c70aa290" >
-                            <attributelist id="986" addr="0x7f20c70aa290" >
+                        <typescopesitem id="985" addr="0x7f658f835290" >
+                            <attributelist id="986" addr="0x7f658f835290" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="987" addr="0x7f20c70b1ab0" >
-                            <attributelist id="988" addr="0x7f20c70b1ab0" >
-                                <attribute name="String" value="std::string" id="989" addr="0x7f20c70b39f0" />
+                        <typescopesitem id="987" addr="0x7f658f83cab0" >
+                            <attributelist id="988" addr="0x7f658f83cab0" >
+                                <attribute name="String" value="std::string" id="989" addr="0x7f658f83e9f0" />
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="990" addr="0x7f20c7093a30" >
-                            <attributelist id="991" addr="0x7f20c7093a30" >
-                                <attribute name="name" value="" id="992" addr="0x7f20c70b39f0" />
-                                <typetab id="993" addr="0x7f20c7093a90" >
-                                    <attributelist id="994" addr="0x7f20c7093a90" >
+                        <typescopesitem id="990" addr="0x7f658f81ea30" >
+                            <attributelist id="991" addr="0x7f658f81ea30" >
+                                <attribute name="name" value="" id="992" addr="0x7f658f83e9f0" />
+                                <typetab id="993" addr="0x7f658f81ea90" >
+                                    <attributelist id="994" addr="0x7f658f81ea90" >
                                     </attributelist >
                                 </typetab >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="995" addr="0x7f20c70b1bb0" >
-                            <attributelist id="996" addr="0x7f20c70b1bb0" >
+                        <typescopesitem id="995" addr="0x7f658f83cbb0" >
+                            <attributelist id="996" addr="0x7f658f83cbb0" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="997" addr="0x7f20c70aa2d0" >
-                            <attributelist id="998" addr="0x7f20c70aa2d0" >
-                                <attribute name="name" value="XBMCAddon" id="999" addr="0x7f20c70b39f0" />
-                                <attribute name="csymtab" value="0x7f20c70aa310" id="1000" addr="0x7f20c70aa310" />
-                                <attribute name="symtab" value="0x7f20c70aa2b0" id="1001" addr="0x7f20c70aa2b0" />
+                        <typescopesitem id="997" addr="0x7f658f8352d0" >
+                            <attributelist id="998" addr="0x7f658f8352d0" >
+                                <attribute name="name" value="XBMCAddon" id="999" addr="0x7f658f83e9f0" />
+                                <attribute name="csymtab" value="0x7f658f835310" id="1000" addr="0x7f658f835310" />
+                                <attribute name="symtab" value="0x7f658f8352b0" id="1001" addr="0x7f658f8352b0" />
                             </attributelist >
                         </typescopesitem >
                     </typescope >
-                    <attribute name="symtab" value="0x7f20c70aa2d0" id="1002" addr="0x7f20c70aa2d0" />
-                    <attribute name="sym_symtab" value="0x7f20c7093950" id="1003" addr="0x7f20c7093950" />
+                    <attribute name="symtab" value="0x7f658f8352d0" id="1002" addr="0x7f658f8352d0" />
+                    <attribute name="sym_symtab" value="0x7f658f81e950" id="1003" addr="0x7f658f81e950" />
                 </attributelist >
 
-                <namespace id="1004" addr="0x7f20c70af9b0" >
-                    <attributelist id="1005" addr="0x7f20c70af9b0" >
-                        <attribute name="sym_name" value="xbmcvfs" id="1006" addr="0x7f20c70b39f0" />
-                        <attribute name="name" value="xbmcvfs" id="1007" addr="0x7f20c70b39f0" />
-                        <attribute name="sym_previousSibling" value="0x7f20c70ad650" id="1008" addr="0x7f20c70ad650" />
-                        <typescope id="1009" addr="0x7f20c70b1e50" >
-                            <attributelist id="1010" addr="0x7f20c70b1e50" >
-                                <attribute name="name" value="xbmcvfs" id="1011" addr="0x7f20c70b39f0" />
-                                <typetab id="1012" addr="0x7f20c70b1e70" >
-                                    <attributelist id="1013" addr="0x7f20c70b1e70" >
-                                        <attribute name="Stat" value="Stat" id="1014" addr="0x7f20c70b39f0" />
-                                        <attribute name="File" value="File" id="1015" addr="0x7f20c70b39f0" />
+                <namespace id="1004" addr="0x7f658f83a9b0" >
+                    <attributelist id="1005" addr="0x7f658f83a9b0" >
+                        <attribute name="sym_name" value="xbmcvfs" id="1006" addr="0x7f658f83e9f0" />
+                        <attribute name="name" value="xbmcvfs" id="1007" addr="0x7f658f83e9f0" />
+                        <attribute name="sym_previousSibling" value="0x7f658f838650" id="1008" addr="0x7f658f838650" />
+                        <typescope id="1009" addr="0x7f658f83ce50" >
+                            <attributelist id="1010" addr="0x7f658f83ce50" >
+                                <attribute name="name" value="xbmcvfs" id="1011" addr="0x7f658f83e9f0" />
+                                <typetab id="1012" addr="0x7f658f83ce70" >
+                                    <attributelist id="1013" addr="0x7f658f83ce70" >
+                                        <attribute name="Stat" value="Stat" id="1014" addr="0x7f658f83e9f0" />
+                                        <attribute name="File" value="File" id="1015" addr="0x7f658f83e9f0" />
                                     </attributelist >
-                                    <typetabsitem id="1016" addr="0x7f20c70b29b0" >
-                                        <attributelist id="1017" addr="0x7f20c70b29b0" >
+                                    <typetabsitem id="1016" addr="0x7f658f83d9b0" >
+                                        <attributelist id="1017" addr="0x7f658f83d9b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1018" addr="0x7f20c70b1f50" >
-                                        <attributelist id="1019" addr="0x7f20c70b1f50" >
+                                    <typetabsitem id="1018" addr="0x7f658f83cf50" >
+                                        <attributelist id="1019" addr="0x7f658f83cf50" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
-                                <attribute name="parent" value="0x7f20c70b1a70" id="1020" addr="0x7f20c70b1a70" />
-                                <attribute name="qname" value="XBMCAddon::xbmcvfs" id="1021" addr="0x7f20c70b39f0" />
-                                <attribute name="symtab" value="0x7f20c70aa9d0" id="1022" addr="0x7f20c70aa9d0" />
+                                <attribute name="parent" value="0x7f658f83ca70" id="1020" addr="0x7f658f83ca70" />
+                                <attribute name="qname" value="XBMCAddon::xbmcvfs" id="1021" addr="0x7f658f83e9f0" />
+                                <attribute name="symtab" value="0x7f658f8359d0" id="1022" addr="0x7f658f8359d0" />
                             </attributelist >
-                            <typescopesitem id="1023" addr="0x7f20c70aa990" >
-                                <attributelist id="1024" addr="0x7f20c70aa990" >
+                            <typescopesitem id="1023" addr="0x7f658f835990" >
+                                <attributelist id="1024" addr="0x7f658f835990" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="1025" addr="0x7f20c70b1e70" >
-                                <attributelist id="1026" addr="0x7f20c70b1e70" >
-                                    <attribute name="Stat" value="Stat" id="1027" addr="0x7f20c70b39f0" />
-                                    <attribute name="File" value="File" id="1028" addr="0x7f20c70b39f0" />
+                            <typescopesitem id="1025" addr="0x7f658f83ce70" >
+                                <attributelist id="1026" addr="0x7f658f83ce70" >
+                                    <attribute name="Stat" value="Stat" id="1027" addr="0x7f658f83e9f0" />
+                                    <attribute name="File" value="File" id="1028" addr="0x7f658f83e9f0" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="1029" addr="0x7f20c70b1a70" >
-                                <attributelist id="1030" addr="0x7f20c70b1a70" >
-                                    <attribute name="name" value="XBMCAddon" id="1031" addr="0x7f20c70b39f0" />
-                                    <typetab id="1032" addr="0x7f20c70b1ab0" >
-                                        <attributelist id="1033" addr="0x7f20c70b1ab0" >
-                                            <attribute name="String" value="std::string" id="1034" addr="0x7f20c70b39f0" />
+                            <typescopesitem id="1029" addr="0x7f658f83ca70" >
+                                <attributelist id="1030" addr="0x7f658f83ca70" >
+                                    <attribute name="name" value="XBMCAddon" id="1031" addr="0x7f658f83e9f0" />
+                                    <typetab id="1032" addr="0x7f658f83cab0" >
+                                        <attributelist id="1033" addr="0x7f658f83cab0" >
+                                            <attribute name="String" value="std::string" id="1034" addr="0x7f658f83e9f0" />
                                         </attributelist >
-                                        <typetabsitem id="1035" addr="0x7f20c70b1c90" >
-                                            <attributelist id="1036" addr="0x7f20c70b1c90" >
+                                        <typetabsitem id="1035" addr="0x7f658f83cc90" >
+                                            <attributelist id="1036" addr="0x7f658f83cc90" >
                                             </attributelist >
                                         </typetabsitem >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f20c7093a30" id="1037" addr="0x7f20c7093a30" />
-                                    <attribute name="qname" value="XBMCAddon" id="1038" addr="0x7f20c70b39f0" />
-                                    <attribute name="symtab" value="0x7f20c70aa2d0" id="1039" addr="0x7f20c70aa2d0" />
+                                    <attribute name="parent" value="0x7f658f81ea30" id="1037" addr="0x7f658f81ea30" />
+                                    <attribute name="qname" value="XBMCAddon" id="1038" addr="0x7f658f83e9f0" />
+                                    <attribute name="symtab" value="0x7f658f8352d0" id="1039" addr="0x7f658f8352d0" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="1040" addr="0x7f20c70b1e90" >
-                                <attributelist id="1041" addr="0x7f20c70b1e90" >
+                            <typescopesitem id="1040" addr="0x7f658f83ce90" >
+                                <attributelist id="1041" addr="0x7f658f83ce90" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="1042" addr="0x7f20c70aa9d0" >
-                                <attributelist id="1043" addr="0x7f20c70aa9d0" >
-                                    <attribute name="name" value="xbmcvfs" id="1044" addr="0x7f20c70b39f0" />
-                                    <attribute name="csymtab" value="0x7f20c70aaa10" id="1045" addr="0x7f20c70aaa10" />
-                                    <attribute name="symtab" value="0x7f20c70aa9b0" id="1046" addr="0x7f20c70aa9b0" />
+                            <typescopesitem id="1042" addr="0x7f658f8359d0" >
+                                <attributelist id="1043" addr="0x7f658f8359d0" >
+                                    <attribute name="name" value="xbmcvfs" id="1044" addr="0x7f658f83e9f0" />
+                                    <attribute name="csymtab" value="0x7f658f835a10" id="1045" addr="0x7f658f835a10" />
+                                    <attribute name="symtab" value="0x7f658f8359b0" id="1046" addr="0x7f658f8359b0" />
                                 </attributelist >
                             </typescopesitem >
                         </typescope >
-                        <attribute name="symtab" value="0x7f20c70aa9d0" id="1047" addr="0x7f20c70aa9d0" />
-                        <attribute name="sym_symtab" value="0x7f20c70aa2d0" id="1048" addr="0x7f20c70aa2d0" />
+                        <attribute name="symtab" value="0x7f658f8359d0" id="1047" addr="0x7f658f8359d0" />
+                        <attribute name="sym_symtab" value="0x7f658f8352d0" id="1048" addr="0x7f658f8352d0" />
                     </attributelist >
 
-                    <cdecl id="1049" addr="0x7f20c70afd30" >
-                        <attributelist id="1050" addr="0x7f20c70afd30" >
-                            <attribute name="sym_name" value="copy" id="1051" addr="0x7f20c70b39f0" />
-                            <attribute name="name" value="XBMCAddon::xbmcvfs::copy" id="1052" addr="0x7f20c70b39f0" />
-                            <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="1053" addr="0x7f20c70b39f0" />
-                            <parmlist id="1054" addr="0x7f20c70afb30" >
+                    <cdecl id="1049" addr="0x7f658f83ad30" >
+                        <attributelist id="1050" addr="0x7f658f83ad30" >
+                            <attribute name="sym_name" value="copy" id="1051" addr="0x7f658f83e9f0" />
+                            <attribute name="name" value="XBMCAddon::xbmcvfs::copy" id="1052" addr="0x7f658f83e9f0" />
+                            <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="1053" addr="0x7f658f83e9f0" />
+                            <parmlist id="1054" addr="0x7f658f83ab30" >
                                 <parm id="1055">
-                                    <attributelist id="1056" addr="0x7f20c70afb30" >
-                                        <attribute name="name" value="strSource" id="1057" addr="0x7f20c70b39f0" />
-                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="1058" addr="0x7f20c70b39f0" />
+                                    <attributelist id="1056" addr="0x7f658f83ab30" >
+                                        <attribute name="name" value="strSource" id="1057" addr="0x7f658f83e9f0" />
+                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="1058" addr="0x7f658f83e9f0" />
                                     </attributelist >
                                 </parm >
                                 <parm id="1059">
-                                    <attributelist id="1060" addr="0x7f20c70afc70" >
-                                        <attribute name="name" value="strDestination" id="1061" addr="0x7f20c70b39f0" />
-                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="1062" addr="0x7f20c70b39f0" />
+                                    <attributelist id="1060" addr="0x7f658f83ac70" >
+                                        <attribute name="name" value="strDestination" id="1061" addr="0x7f658f83e9f0" />
+                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="1062" addr="0x7f658f83e9f0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="kind" value="function" id="1063" addr="0x7f20c70b39f0" />
-                            <attribute name="type" value="bool" id="1064" addr="0x7f20c70b39f0" />
-                            <attribute name="sym_symtab" value="0x7f20c70aa9d0" id="1065" addr="0x7f20c70aa9d0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1066" addr="0x7f20c70b39f0" />
+                            <attribute name="kind" value="function" id="1063" addr="0x7f658f83e9f0" />
+                            <attribute name="type" value="bool" id="1064" addr="0x7f658f83e9f0" />
+                            <attribute name="sym_symtab" value="0x7f658f8359d0" id="1065" addr="0x7f658f8359d0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1066" addr="0x7f658f83e9f0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="1067" addr="0x7f20c70afff0" >
-                        <attributelist id="1068" addr="0x7f20c70afff0" >
-                            <attribute name="sym_name" value="delete" id="1069" addr="0x7f20c70b39f0" />
-                            <attribute name="name" value="XBMCAddon::xbmcvfs::deleteFile" id="1070" addr="0x7f20c70b39f0" />
-                            <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="1071" addr="0x7f20c70b39f0" />
-                            <parmlist id="1072" addr="0x7f20c70aff30" >
+                    <cdecl id="1067" addr="0x7f658f83aff0" >
+                        <attributelist id="1068" addr="0x7f658f83aff0" >
+                            <attribute name="sym_name" value="delete" id="1069" addr="0x7f658f83e9f0" />
+                            <attribute name="name" value="XBMCAddon::xbmcvfs::deleteFile" id="1070" addr="0x7f658f83e9f0" />
+                            <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="1071" addr="0x7f658f83e9f0" />
+                            <parmlist id="1072" addr="0x7f658f83af30" >
                                 <parm id="1073">
-                                    <attributelist id="1074" addr="0x7f20c70aff30" >
-                                        <attribute name="name" value="file" id="1075" addr="0x7f20c70b39f0" />
-                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="1076" addr="0x7f20c70b39f0" />
+                                    <attributelist id="1074" addr="0x7f658f83af30" >
+                                        <attribute name="name" value="file" id="1075" addr="0x7f658f83e9f0" />
+                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="1076" addr="0x7f658f83e9f0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="kind" value="function" id="1077" addr="0x7f20c70b39f0" />
-                            <attribute name="type" value="bool" id="1078" addr="0x7f20c70b39f0" />
-                            <attribute name="sym_symtab" value="0x7f20c70aa9d0" id="1079" addr="0x7f20c70aa9d0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1080" addr="0x7f20c70b39f0" />
+                            <attribute name="kind" value="function" id="1077" addr="0x7f658f83e9f0" />
+                            <attribute name="type" value="bool" id="1078" addr="0x7f658f83e9f0" />
+                            <attribute name="sym_symtab" value="0x7f658f8359d0" id="1079" addr="0x7f658f8359d0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1080" addr="0x7f658f83e9f0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="1081" addr="0x7f20c70b03f0" >
-                        <attributelist id="1082" addr="0x7f20c70b03f0" >
-                            <attribute name="sym_name" value="rename" id="1083" addr="0x7f20c70b39f0" />
-                            <attribute name="name" value="XBMCAddon::xbmcvfs::rename" id="1084" addr="0x7f20c70b39f0" />
-                            <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="1085" addr="0x7f20c70b39f0" />
-                            <parmlist id="1086" addr="0x7f20c70b01f0" >
+                    <cdecl id="1081" addr="0x7f658f83b3f0" >
+                        <attributelist id="1082" addr="0x7f658f83b3f0" >
+                            <attribute name="sym_name" value="rename" id="1083" addr="0x7f658f83e9f0" />
+                            <attribute name="name" value="XBMCAddon::xbmcvfs::rename" id="1084" addr="0x7f658f83e9f0" />
+                            <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="1085" addr="0x7f658f83e9f0" />
+                            <parmlist id="1086" addr="0x7f658f83b1f0" >
                                 <parm id="1087">
-                                    <attributelist id="1088" addr="0x7f20c70b01f0" >
-                                        <attribute name="name" value="file" id="1089" addr="0x7f20c70b39f0" />
-                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="1090" addr="0x7f20c70b39f0" />
+                                    <attributelist id="1088" addr="0x7f658f83b1f0" >
+                                        <attribute name="name" value="file" id="1089" addr="0x7f658f83e9f0" />
+                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="1090" addr="0x7f658f83e9f0" />
                                     </attributelist >
                                 </parm >
                                 <parm id="1091">
-                                    <attributelist id="1092" addr="0x7f20c70b0330" >
-                                        <attribute name="name" value="newFile" id="1093" addr="0x7f20c70b39f0" />
-                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="1094" addr="0x7f20c70b39f0" />
+                                    <attributelist id="1092" addr="0x7f658f83b330" >
+                                        <attribute name="name" value="newFile" id="1093" addr="0x7f658f83e9f0" />
+                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="1094" addr="0x7f658f83e9f0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="kind" value="function" id="1095" addr="0x7f20c70b39f0" />
-                            <attribute name="type" value="bool" id="1096" addr="0x7f20c70b39f0" />
-                            <attribute name="sym_symtab" value="0x7f20c70aa9d0" id="1097" addr="0x7f20c70aa9d0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1098" addr="0x7f20c70b39f0" />
+                            <attribute name="kind" value="function" id="1095" addr="0x7f658f83e9f0" />
+                            <attribute name="type" value="bool" id="1096" addr="0x7f658f83e9f0" />
+                            <attribute name="sym_symtab" value="0x7f658f8359d0" id="1097" addr="0x7f658f8359d0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1098" addr="0x7f658f83e9f0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="1099" addr="0x7f20c70b06b0" >
-                        <attributelist id="1100" addr="0x7f20c70b06b0" >
-                            <attribute name="sym_name" value="exists" id="1101" addr="0x7f20c70b39f0" />
-                            <attribute name="name" value="XBMCAddon::xbmcvfs::exists" id="1102" addr="0x7f20c70b39f0" />
-                            <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="1103" addr="0x7f20c70b39f0" />
-                            <parmlist id="1104" addr="0x7f20c70b05f0" >
+                    <cdecl id="1099" addr="0x7f658f83b6b0" >
+                        <attributelist id="1100" addr="0x7f658f83b6b0" >
+                            <attribute name="sym_name" value="exists" id="1101" addr="0x7f658f83e9f0" />
+                            <attribute name="name" value="XBMCAddon::xbmcvfs::exists" id="1102" addr="0x7f658f83e9f0" />
+                            <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="1103" addr="0x7f658f83e9f0" />
+                            <parmlist id="1104" addr="0x7f658f83b5f0" >
                                 <parm id="1105">
-                                    <attributelist id="1106" addr="0x7f20c70b05f0" >
-                                        <attribute name="name" value="path" id="1107" addr="0x7f20c70b39f0" />
-                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="1108" addr="0x7f20c70b39f0" />
+                                    <attributelist id="1106" addr="0x7f658f83b5f0" >
+                                        <attribute name="name" value="path" id="1107" addr="0x7f658f83e9f0" />
+                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="1108" addr="0x7f658f83e9f0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="kind" value="function" id="1109" addr="0x7f20c70b39f0" />
-                            <attribute name="type" value="bool" id="1110" addr="0x7f20c70b39f0" />
-                            <attribute name="sym_symtab" value="0x7f20c70aa9d0" id="1111" addr="0x7f20c70aa9d0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1112" addr="0x7f20c70b39f0" />
+                            <attribute name="kind" value="function" id="1109" addr="0x7f658f83e9f0" />
+                            <attribute name="type" value="bool" id="1110" addr="0x7f658f83e9f0" />
+                            <attribute name="sym_symtab" value="0x7f658f8359d0" id="1111" addr="0x7f658f8359d0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1112" addr="0x7f658f83e9f0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="1113" addr="0x7f20c70b0970" >
-                        <attributelist id="1114" addr="0x7f20c70b0970" >
-                            <attribute name="sym_name" value="mkdir" id="1115" addr="0x7f20c70b39f0" />
-                            <attribute name="name" value="XBMCAddon::xbmcvfs::mkdir" id="1116" addr="0x7f20c70b39f0" />
-                            <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="1117" addr="0x7f20c70b39f0" />
-                            <parmlist id="1118" addr="0x7f20c70b08b0" >
+                    <cdecl id="1113" addr="0x7f658f83b970" >
+                        <attributelist id="1114" addr="0x7f658f83b970" >
+                            <attribute name="sym_name" value="mkdir" id="1115" addr="0x7f658f83e9f0" />
+                            <attribute name="name" value="XBMCAddon::xbmcvfs::mkdir" id="1116" addr="0x7f658f83e9f0" />
+                            <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="1117" addr="0x7f658f83e9f0" />
+                            <parmlist id="1118" addr="0x7f658f83b8b0" >
                                 <parm id="1119">
-                                    <attributelist id="1120" addr="0x7f20c70b08b0" >
-                                        <attribute name="name" value="path" id="1121" addr="0x7f20c70b39f0" />
-                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="1122" addr="0x7f20c70b39f0" />
+                                    <attributelist id="1120" addr="0x7f658f83b8b0" >
+                                        <attribute name="name" value="path" id="1121" addr="0x7f658f83e9f0" />
+                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="1122" addr="0x7f658f83e9f0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="kind" value="function" id="1123" addr="0x7f20c70b39f0" />
-                            <attribute name="type" value="bool" id="1124" addr="0x7f20c70b39f0" />
-                            <attribute name="sym_symtab" value="0x7f20c70aa9d0" id="1125" addr="0x7f20c70aa9d0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1126" addr="0x7f20c70b39f0" />
+                            <attribute name="kind" value="function" id="1123" addr="0x7f658f83e9f0" />
+                            <attribute name="type" value="bool" id="1124" addr="0x7f658f83e9f0" />
+                            <attribute name="sym_symtab" value="0x7f658f8359d0" id="1125" addr="0x7f658f8359d0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1126" addr="0x7f658f83e9f0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="1127" addr="0x7f20c70b0c30" >
-                        <attributelist id="1128" addr="0x7f20c70b0c30" >
-                            <attribute name="sym_name" value="mkdirs" id="1129" addr="0x7f20c70b39f0" />
-                            <attribute name="name" value="XBMCAddon::xbmcvfs::mkdirs" id="1130" addr="0x7f20c70b39f0" />
-                            <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="1131" addr="0x7f20c70b39f0" />
-                            <parmlist id="1132" addr="0x7f20c70b0b70" >
+                    <cdecl id="1127" addr="0x7f658f83bc30" >
+                        <attributelist id="1128" addr="0x7f658f83bc30" >
+                            <attribute name="sym_name" value="mkdirs" id="1129" addr="0x7f658f83e9f0" />
+                            <attribute name="name" value="XBMCAddon::xbmcvfs::mkdirs" id="1130" addr="0x7f658f83e9f0" />
+                            <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="1131" addr="0x7f658f83e9f0" />
+                            <parmlist id="1132" addr="0x7f658f83bb70" >
                                 <parm id="1133">
-                                    <attributelist id="1134" addr="0x7f20c70b0b70" >
-                                        <attribute name="name" value="path" id="1135" addr="0x7f20c70b39f0" />
-                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="1136" addr="0x7f20c70b39f0" />
+                                    <attributelist id="1134" addr="0x7f658f83bb70" >
+                                        <attribute name="name" value="path" id="1135" addr="0x7f658f83e9f0" />
+                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="1136" addr="0x7f658f83e9f0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="kind" value="function" id="1137" addr="0x7f20c70b39f0" />
-                            <attribute name="type" value="bool" id="1138" addr="0x7f20c70b39f0" />
-                            <attribute name="sym_symtab" value="0x7f20c70aa9d0" id="1139" addr="0x7f20c70aa9d0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1140" addr="0x7f20c70b39f0" />
+                            <attribute name="kind" value="function" id="1137" addr="0x7f658f83e9f0" />
+                            <attribute name="type" value="bool" id="1138" addr="0x7f658f83e9f0" />
+                            <attribute name="sym_symtab" value="0x7f658f8359d0" id="1139" addr="0x7f658f8359d0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1140" addr="0x7f658f83e9f0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="1141" addr="0x7f20c70b1030" >
-                        <attributelist id="1142" addr="0x7f20c70b1030" >
-                            <attribute name="name" value="XBMCAddon::xbmcvfs::rmdir" id="1143" addr="0x7f20c70b39f0" />
-                            <attribute name="sym_symtab" value="0x7f20c70aa9d0" id="1144" addr="0x7f20c70aa9d0" />
-                            <attribute name="sym_nextSibling" value="0x7f20c70b1190" id="1145" addr="0x7f20c70b1190" />
-                            <attribute name="csym_nextSibling" value="0x7f20c70b1190" id="1146" addr="0x7f20c70b1190" />
-                            <attribute name="kind" value="function" id="1147" addr="0x7f20c70b39f0" />
-                            <attribute name="sym_name" value="rmdir" id="1148" addr="0x7f20c70b39f0" />
-                            <attribute name="decl" value="f(r.q(const).XBMCAddon::String,bool)." id="1149" addr="0x7f20c70b39f0" />
-                            <attribute name="sym_overloaded" value="0x7f20c70b1030" id="1150" addr="0x7f20c70b1030" />
-                            <parmlist id="1151" addr="0x7f20c70b0e30" >
+                    <cdecl id="1141" addr="0x7f658f83c030" >
+                        <attributelist id="1142" addr="0x7f658f83c030" >
+                            <attribute name="name" value="XBMCAddon::xbmcvfs::rmdir" id="1143" addr="0x7f658f83e9f0" />
+                            <attribute name="sym_symtab" value="0x7f658f8359d0" id="1144" addr="0x7f658f8359d0" />
+                            <attribute name="sym_nextSibling" value="0x7f658f83c190" id="1145" addr="0x7f658f83c190" />
+                            <attribute name="csym_nextSibling" value="0x7f658f83c190" id="1146" addr="0x7f658f83c190" />
+                            <attribute name="kind" value="function" id="1147" addr="0x7f658f83e9f0" />
+                            <attribute name="sym_name" value="rmdir" id="1148" addr="0x7f658f83e9f0" />
+                            <attribute name="decl" value="f(r.q(const).XBMCAddon::String,bool)." id="1149" addr="0x7f658f83e9f0" />
+                            <attribute name="sym_overloaded" value="0x7f658f83c030" id="1150" addr="0x7f658f83c030" />
+                            <parmlist id="1151" addr="0x7f658f83be30" >
                                 <parm id="1152">
-                                    <attributelist id="1153" addr="0x7f20c70b0e30" >
-                                        <attribute name="name" value="path" id="1154" addr="0x7f20c70b39f0" />
-                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="1155" addr="0x7f20c70b39f0" />
+                                    <attributelist id="1153" addr="0x7f658f83be30" >
+                                        <attribute name="name" value="path" id="1154" addr="0x7f658f83e9f0" />
+                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="1155" addr="0x7f658f83e9f0" />
                                     </attributelist >
                                 </parm >
                                 <parm id="1156">
-                                    <attributelist id="1157" addr="0x7f20c70b0f70" >
-                                        <attribute name="name" value="force" id="1158" addr="0x7f20c70b39f0" />
-                                        <attribute name="value" value="false" id="1159" addr="0x7f20c70b39f0" />
-                                        <attribute name="type" value="bool" id="1160" addr="0x7f20c70b39f0" />
+                                    <attributelist id="1157" addr="0x7f658f83bf70" >
+                                        <attribute name="name" value="force" id="1158" addr="0x7f658f83e9f0" />
+                                        <attribute name="value" value="false" id="1159" addr="0x7f658f83e9f0" />
+                                        <attribute name="type" value="bool" id="1160" addr="0x7f658f83e9f0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="type" value="bool" id="1161" addr="0x7f20c70b39f0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1162" addr="0x7f20c70b39f0" />
+                            <attribute name="type" value="bool" id="1161" addr="0x7f658f83e9f0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1162" addr="0x7f658f83e9f0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="1163" addr="0x7f20c70b1190" >
-                        <attributelist id="1164" addr="0x7f20c70b1190" >
-                            <attribute name="name" value="XBMCAddon::xbmcvfs::rmdir" id="1165" addr="0x7f20c70b39f0" />
-                            <attribute name="sym_symtab" value="0x7f20c70aa9d0" id="1166" addr="0x7f20c70aa9d0" />
-                            <attribute name="sym_previousSibling" value="0x7f20c70b1030" id="1167" addr="0x7f20c70b1030" />
-                            <attribute name="kind" value="function" id="1168" addr="0x7f20c70b39f0" />
-                            <attribute name="sym_name" value="rmdir" id="1169" addr="0x7f20c70b39f0" />
-                            <attribute name="defaultargs" value="0x7f20c70b1030" id="1170" addr="0x7f20c70b1030" />
-                            <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="1171" addr="0x7f20c70b39f0" />
-                            <attribute name="sym_overloaded" value="0x7f20c70b1030" id="1172" addr="0x7f20c70b1030" />
-                            <parmlist id="1173" addr="0x7f20c70b1090" >
+                    <cdecl id="1163" addr="0x7f658f83c190" >
+                        <attributelist id="1164" addr="0x7f658f83c190" >
+                            <attribute name="name" value="XBMCAddon::xbmcvfs::rmdir" id="1165" addr="0x7f658f83e9f0" />
+                            <attribute name="sym_symtab" value="0x7f658f8359d0" id="1166" addr="0x7f658f8359d0" />
+                            <attribute name="sym_previousSibling" value="0x7f658f83c030" id="1167" addr="0x7f658f83c030" />
+                            <attribute name="kind" value="function" id="1168" addr="0x7f658f83e9f0" />
+                            <attribute name="sym_name" value="rmdir" id="1169" addr="0x7f658f83e9f0" />
+                            <attribute name="defaultargs" value="0x7f658f83c030" id="1170" addr="0x7f658f83c030" />
+                            <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="1171" addr="0x7f658f83e9f0" />
+                            <attribute name="sym_overloaded" value="0x7f658f83c030" id="1172" addr="0x7f658f83c030" />
+                            <parmlist id="1173" addr="0x7f658f83c090" >
                                 <parm id="1174">
-                                    <attributelist id="1175" addr="0x7f20c70b1090" >
-                                        <attribute name="name" value="path" id="1176" addr="0x7f20c70b39f0" />
-                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="1177" addr="0x7f20c70b39f0" />
+                                    <attributelist id="1175" addr="0x7f658f83c090" >
+                                        <attribute name="name" value="path" id="1176" addr="0x7f658f83e9f0" />
+                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="1177" addr="0x7f658f83e9f0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="type" value="bool" id="1178" addr="0x7f20c70b39f0" />
-                            <attribute name="sym_overname" value="__SWIG_1" id="1179" addr="0x7f20c70b39f0" />
+                            <attribute name="type" value="bool" id="1178" addr="0x7f658f83e9f0" />
+                            <attribute name="sym_overname" value="__SWIG_1" id="1179" addr="0x7f658f83e9f0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="1180" addr="0x7f20c70b1830" >
-                        <attributelist id="1181" addr="0x7f20c70b1830" >
-                            <attribute name="sym_name" value="listdir" id="1182" addr="0x7f20c70b39f0" />
-                            <attribute name="name" value="XBMCAddon::xbmcvfs::listdir" id="1183" addr="0x7f20c70b39f0" />
-                            <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="1184" addr="0x7f20c70b39f0" />
-                            <parmlist id="1185" addr="0x7f20c70b1770" >
+                    <cdecl id="1180" addr="0x7f658f83c830" >
+                        <attributelist id="1181" addr="0x7f658f83c830" >
+                            <attribute name="sym_name" value="listdir" id="1182" addr="0x7f658f83e9f0" />
+                            <attribute name="name" value="XBMCAddon::xbmcvfs::listdir" id="1183" addr="0x7f658f83e9f0" />
+                            <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="1184" addr="0x7f658f83e9f0" />
+                            <parmlist id="1185" addr="0x7f658f83c770" >
                                 <parm id="1186">
-                                    <attributelist id="1187" addr="0x7f20c70b1770" >
-                                        <attribute name="name" value="path" id="1188" addr="0x7f20c70b39f0" />
-                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="1189" addr="0x7f20c70b39f0" />
+                                    <attributelist id="1187" addr="0x7f658f83c770" >
+                                        <attribute name="name" value="path" id="1188" addr="0x7f658f83e9f0" />
+                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="1189" addr="0x7f658f83e9f0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="kind" value="function" id="1190" addr="0x7f20c70b39f0" />
-                            <attribute name="type" value="Tuple&lt;(std::vector&lt;(XBMCAddon::String)>,std::vector&lt;(XBMCAddon::String)>)>" id="1191" addr="0x7f20c70b39f0" />
-                            <attribute name="sym_symtab" value="0x7f20c70aa9d0" id="1192" addr="0x7f20c70aa9d0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1193" addr="0x7f20c70b39f0" />
+                            <attribute name="kind" value="function" id="1190" addr="0x7f658f83e9f0" />
+                            <attribute name="type" value="Tuple&lt;(std::vector&lt;(XBMCAddon::String)>,std::vector&lt;(XBMCAddon::String)>)>" id="1191" addr="0x7f658f83e9f0" />
+                            <attribute name="sym_symtab" value="0x7f658f8359d0" id="1192" addr="0x7f658f8359d0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1193" addr="0x7f658f83e9f0" />
                         </attributelist >
                      
                     </cdecl >
diff --git a/srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmcwsgi.i.cpp b/srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmcwsgi.i.cpp
similarity index 99%
rename from srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmcwsgi.i.cpp
rename to srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmcwsgi.i.cpp
index 33a94d530bf..02911664b92 100644
--- a/srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmcwsgi.i.cpp
+++ b/srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmcwsgi.i.cpp
@@ -1259,7 +1259,7 @@ namespace PythonBindings
 
    // constants
    PyModule_AddStringConstant(module, "__author__", "Team Kodi <http://kodi.tv>");
-   PyModule_AddStringConstant(module, "__date__", "Wed Jun 19 18:36:44 GMT 2019");
+   PyModule_AddStringConstant(module, "__date__", "Sun Sep 01 10:46:49 GMT 2019");
    PyModule_AddStringConstant(module, "__version__", "2.26.0");
    PyModule_AddStringConstant(module, "__credits__", "Team Kodi");
    PyModule_AddStringConstant(module, "__platform__", "ALL");
diff --git a/srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmcwsgi.i.xml b/srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmcwsgi.i.xml
similarity index 61%
rename from srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmcwsgi.i.xml
rename to srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmcwsgi.i.xml
index b94f0b8905c..2d03f4dffa3 100644
--- a/srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmcwsgi.i.xml
+++ b/srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmcwsgi.i.xml
@@ -1,146 +1,146 @@
 <?xml version="1.0" ?> 
-<top id="1" addr="0x7f1a04090b30" >
-    <attributelist id="2" addr="0x7f1a04090b30" >
-        <attribute name="outfile" value="AddonModuleXbmcwsgi.i.xml" id="3" addr="0x7f1a040af550" />
-        <attribute name="name" value="xbmcwsgi" id="4" addr="0x7f1a040af550" />
-        <attribute name="module" value="xbmcwsgi" id="5" addr="0x7f1a040a6270" />
-        <attribute name="inputfile" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmcwsgi.i" id="6" addr="0x7f1a040af550" />
-        <attribute name="classes" value="0x7f1a040a3770" id="7" addr="0x7f1a040a3770" />
-        <attribute name="infile" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmcwsgi.i" id="8" addr="0x7f1a040af550" />
-        <attribute name="outfile_h" value="AddonModuleXbmcwsgi.i.h" id="9" addr="0x7f1a040af550" />
+<top id="1" addr="0x7fb6eb3d7b30" >
+    <attributelist id="2" addr="0x7fb6eb3d7b30" >
+        <attribute name="outfile" value="AddonModuleXbmcwsgi.i.xml" id="3" addr="0x7fb6eb3f6550" />
+        <attribute name="name" value="xbmcwsgi" id="4" addr="0x7fb6eb3f6550" />
+        <attribute name="module" value="xbmcwsgi" id="5" addr="0x7fb6eb3ed270" />
+        <attribute name="inputfile" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmcwsgi.i" id="6" addr="0x7fb6eb3f6550" />
+        <attribute name="classes" value="0x7fb6eb3ea770" id="7" addr="0x7fb6eb3ea770" />
+        <attribute name="infile" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmcwsgi.i" id="8" addr="0x7fb6eb3f6550" />
+        <attribute name="outfile_h" value="AddonModuleXbmcwsgi.i.h" id="9" addr="0x7fb6eb3f6550" />
     </attributelist >
 
-    <include id="10" addr="0x7f1a040a0ed0" >
-        <attributelist id="11" addr="0x7f1a040a0ed0" >
-            <attribute name="name" value="/usr/share/swig/3.0.12/swig.swg" id="12" addr="0x7f1a040af550" />
+    <include id="10" addr="0x7fb6eb3e7ed0" >
+        <attributelist id="11" addr="0x7fb6eb3e7ed0" >
+            <attribute name="name" value="/usr/share/swig/3.0.12/swig.swg" id="12" addr="0x7fb6eb3f6550" />
         </attributelist >
 
-        <include id="13" addr="0x7f1a040a0f30" >
-            <attributelist id="14" addr="0x7f1a040a0f30" >
-                <attribute name="name" value="/usr/share/swig/3.0.12/swigwarnings.swg" id="15" addr="0x7f1a040af550" />
+        <include id="13" addr="0x7fb6eb3e7f30" >
+            <attributelist id="14" addr="0x7fb6eb3e7f30" >
+                <attribute name="name" value="/usr/share/swig/3.0.12/swigwarnings.swg" id="15" addr="0x7fb6eb3f6550" />
             </attributelist >
 
-            <include id="16" addr="0x7f1a040a1550" >
-                <attributelist id="17" addr="0x7f1a040a1550" >
-                    <attribute name="name" value="/usr/share/swig/3.0.12/swigwarn.swg" id="18" addr="0x7f1a040af550" />
+            <include id="16" addr="0x7fb6eb3e8550" >
+                <attributelist id="17" addr="0x7fb6eb3e8550" >
+                    <attribute name="name" value="/usr/share/swig/3.0.12/swigwarn.swg" id="18" addr="0x7fb6eb3f6550" />
                 </attributelist >
              
             </include >
         </include >
-        <namespace id="19" addr="0x7f1a040a3290" >
-            <attributelist id="20" addr="0x7f1a040a3290" >
-                <attribute name="sym_name" value="std" id="21" addr="0x7f1a040af550" />
-                <attribute name="name" value="std" id="22" addr="0x7f1a040af550" />
-                <typescope id="23" addr="0x7f1a040ac5b0" >
-                    <attributelist id="24" addr="0x7f1a040ac5b0" >
-                        <attribute name="name" value="std" id="25" addr="0x7f1a040af550" />
-                        <typetab id="26" addr="0x7f1a040ac5d0" >
-                            <attributelist id="27" addr="0x7f1a040ac5d0" >
-                                <attribute name="initializer_list" value="initializer_list" id="28" addr="0x7f1a040af550" />
-                            </attributelist >
-                            <typetabsitem id="29" addr="0x7f1a040ac710" >
-                                <attributelist id="30" addr="0x7f1a040ac710" >
+        <namespace id="19" addr="0x7fb6eb3ea290" >
+            <attributelist id="20" addr="0x7fb6eb3ea290" >
+                <attribute name="sym_name" value="std" id="21" addr="0x7fb6eb3f6550" />
+                <attribute name="name" value="std" id="22" addr="0x7fb6eb3f6550" />
+                <typescope id="23" addr="0x7fb6eb3f35b0" >
+                    <attributelist id="24" addr="0x7fb6eb3f35b0" >
+                        <attribute name="name" value="std" id="25" addr="0x7fb6eb3f6550" />
+                        <typetab id="26" addr="0x7fb6eb3f35d0" >
+                            <attributelist id="27" addr="0x7fb6eb3f35d0" >
+                                <attribute name="initializer_list" value="initializer_list" id="28" addr="0x7fb6eb3f6550" />
+                            </attributelist >
+                            <typetabsitem id="29" addr="0x7fb6eb3f3710" >
+                                <attributelist id="30" addr="0x7fb6eb3f3710" >
                                 </attributelist >
                             </typetabsitem >
                         </typetab >
-                        <attribute name="parent" value="0x7f1a0408fa30" id="31" addr="0x7f1a0408fa30" />
-                        <attribute name="qname" value="std" id="32" addr="0x7f1a040af550" />
-                        <attribute name="symtab" value="0x7f1a040a31f0" id="33" addr="0x7f1a040a31f0" />
+                        <attribute name="parent" value="0x7fb6eb3d6a30" id="31" addr="0x7fb6eb3d6a30" />
+                        <attribute name="qname" value="std" id="32" addr="0x7fb6eb3f6550" />
+                        <attribute name="symtab" value="0x7fb6eb3ea1f0" id="33" addr="0x7fb6eb3ea1f0" />
                     </attributelist >
-                    <typescopesitem id="34" addr="0x7f1a040a3150" >
-                        <attributelist id="35" addr="0x7f1a040a3150" >
+                    <typescopesitem id="34" addr="0x7fb6eb3ea150" >
+                        <attributelist id="35" addr="0x7fb6eb3ea150" >
                         </attributelist >
                     </typescopesitem >
-                    <typescopesitem id="36" addr="0x7f1a040ac5d0" >
-                        <attributelist id="37" addr="0x7f1a040ac5d0" >
-                            <attribute name="initializer_list" value="initializer_list" id="38" addr="0x7f1a040af550" />
+                    <typescopesitem id="36" addr="0x7fb6eb3f35d0" >
+                        <attributelist id="37" addr="0x7fb6eb3f35d0" >
+                            <attribute name="initializer_list" value="initializer_list" id="38" addr="0x7fb6eb3f6550" />
                         </attributelist >
                     </typescopesitem >
-                    <typescopesitem id="39" addr="0x7f1a0408fa30" >
-                        <attributelist id="40" addr="0x7f1a0408fa30" >
-                            <attribute name="name" value="" id="41" addr="0x7f1a040af550" />
-                            <typetab id="42" addr="0x7f1a0408fa90" >
-                                <attributelist id="43" addr="0x7f1a0408fa90" >
-                                    <attribute name="HTTPPythonRequest" value="HTTPPythonRequest" id="44" addr="0x7f1a040af550" />
+                    <typescopesitem id="39" addr="0x7fb6eb3d6a30" >
+                        <attributelist id="40" addr="0x7fb6eb3d6a30" >
+                            <attribute name="name" value="" id="41" addr="0x7fb6eb3f6550" />
+                            <typetab id="42" addr="0x7fb6eb3d6a90" >
+                                <attributelist id="43" addr="0x7fb6eb3d6a90" >
+                                    <attribute name="HTTPPythonRequest" value="HTTPPythonRequest" id="44" addr="0x7fb6eb3f6550" />
                                 </attributelist >
-                                <typetabsitem id="45" addr="0x7f1a040ac7b0" >
-                                    <attributelist id="46" addr="0x7f1a040ac7b0" >
+                                <typetabsitem id="45" addr="0x7fb6eb3f37b0" >
+                                    <attributelist id="46" addr="0x7fb6eb3f37b0" >
                                     </attributelist >
                                 </typetabsitem >
                             </typetab >
                         </attributelist >
                     </typescopesitem >
-                    <typescopesitem id="47" addr="0x7f1a040ac5f0" >
-                        <attributelist id="48" addr="0x7f1a040ac5f0" >
+                    <typescopesitem id="47" addr="0x7fb6eb3f35f0" >
+                        <attributelist id="48" addr="0x7fb6eb3f35f0" >
                         </attributelist >
                     </typescopesitem >
-                    <typescopesitem id="49" addr="0x7f1a040a31f0" >
-                        <attributelist id="50" addr="0x7f1a040a31f0" >
-                            <attribute name="name" value="std" id="51" addr="0x7f1a040af550" />
-                            <attribute name="csymtab" value="0x7f1a040a3230" id="52" addr="0x7f1a040a3230" />
-                            <attribute name="symtab" value="0x7f1a040a31d0" id="53" addr="0x7f1a040a31d0" />
+                    <typescopesitem id="49" addr="0x7fb6eb3ea1f0" >
+                        <attributelist id="50" addr="0x7fb6eb3ea1f0" >
+                            <attribute name="name" value="std" id="51" addr="0x7fb6eb3f6550" />
+                            <attribute name="csymtab" value="0x7fb6eb3ea230" id="52" addr="0x7fb6eb3ea230" />
+                            <attribute name="symtab" value="0x7fb6eb3ea1d0" id="53" addr="0x7fb6eb3ea1d0" />
                         </attributelist >
                     </typescopesitem >
                 </typescope >
-                <attribute name="symtab" value="0x7f1a040a31f0" id="54" addr="0x7f1a040a31f0" />
-                <attribute name="sym_symtab" value="0x7f1a0408f950" id="55" addr="0x7f1a0408f950" />
-                <attribute name="sym_overname" value="__SWIG_0" id="56" addr="0x7f1a040af550" />
+                <attribute name="symtab" value="0x7fb6eb3ea1f0" id="54" addr="0x7fb6eb3ea1f0" />
+                <attribute name="sym_symtab" value="0x7fb6eb3d6950" id="55" addr="0x7fb6eb3d6950" />
+                <attribute name="sym_overname" value="__SWIG_0" id="56" addr="0x7fb6eb3f6550" />
             </attributelist >
 
-            <template id="57" addr="0x7f1a040a3410" >
-                <attributelist id="58" addr="0x7f1a040a3410" >
-                    <attribute name="templatetype" value="class" id="59" addr="0x7f1a040af550" />
-                    <attribute name="sym_typename" value="1" id="60" addr="0x7f1a040af550" />
-                    <attribute name="name" value="initializer_list" id="61" addr="0x7f1a040af550" />
-                    <attribute name="sym_symtab" value="0x7f1a040a31f0" id="62" addr="0x7f1a040a31f0" />
-                    <attribute name="symtab" value="0x7f1a040a3630" id="63" addr="0x7f1a040a3630" />
-                    <attribute name="allows_typedef" value="1" id="64" addr="0x7f1a040af550" />
-                    <attribute name="kind" value="class" id="65" addr="0x7f1a040af550" />
-                    <attribute name="sym_name" value="initializer_list" id="66" addr="0x7f1a040af550" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="67" addr="0x7f1a040af550" />
-                    <templateparms id="68" addr="0x7f1a040a3330" >
+            <template id="57" addr="0x7fb6eb3ea410" >
+                <attributelist id="58" addr="0x7fb6eb3ea410" >
+                    <attribute name="templatetype" value="class" id="59" addr="0x7fb6eb3f6550" />
+                    <attribute name="sym_typename" value="1" id="60" addr="0x7fb6eb3f6550" />
+                    <attribute name="name" value="initializer_list" id="61" addr="0x7fb6eb3f6550" />
+                    <attribute name="sym_symtab" value="0x7fb6eb3ea1f0" id="62" addr="0x7fb6eb3ea1f0" />
+                    <attribute name="symtab" value="0x7fb6eb3ea630" id="63" addr="0x7fb6eb3ea630" />
+                    <attribute name="allows_typedef" value="1" id="64" addr="0x7fb6eb3f6550" />
+                    <attribute name="kind" value="class" id="65" addr="0x7fb6eb3f6550" />
+                    <attribute name="sym_name" value="initializer_list" id="66" addr="0x7fb6eb3f6550" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="67" addr="0x7fb6eb3f6550" />
+                    <templateparms id="68" addr="0x7fb6eb3ea330" >
                         <parm id="69">
-                            <attributelist id="70" addr="0x7f1a040a3330" >
-                                <attribute name="name" value="T" id="71" addr="0x7f1a040af550" />
-                                <attribute name="type" value="typename T" id="72" addr="0x7f1a040af550" />
+                            <attributelist id="70" addr="0x7fb6eb3ea330" >
+                                <attribute name="name" value="T" id="71" addr="0x7fb6eb3f6550" />
+                                <attribute name="type" value="typename T" id="72" addr="0x7fb6eb3f6550" />
                             </attributelist >
                         </parm >
                     </templateparms >
                 </attributelist >
 
-                <access id="73" addr="0x7f1a040a37f0" >
-                    <attributelist id="74" addr="0x7f1a040a37f0" >
-                        <attribute name="kind" value="public" id="75" addr="0x7f1a040af550" />
+                <access id="73" addr="0x7fb6eb3ea7f0" >
+                    <attributelist id="74" addr="0x7fb6eb3ea7f0" >
+                        <attribute name="kind" value="public" id="75" addr="0x7fb6eb3f6550" />
                     </attributelist >
                  
                 </access >
             </template >
-            <typemap id="76" addr="0x7f1a040a3e50" >
-                <attributelist id="77" addr="0x7f1a040a3e50" >
-                    <kwargs id="78" addr="0x7f1a040a3b50" >
-                        <attributelist id="79" addr="0x7f1a040a3b50" >
-                            <attribute name="name" value="warning" id="80" addr="0x7f1a040af550" />
-                            <attribute name="value" value="476:Initialization using std::initializer_list." id="81" addr="0x7f1a040af550" />
+            <typemap id="76" addr="0x7fb6eb3eae50" >
+                <attributelist id="77" addr="0x7fb6eb3eae50" >
+                    <kwargs id="78" addr="0x7fb6eb3eab50" >
+                        <attributelist id="79" addr="0x7fb6eb3eab50" >
+                            <attribute name="name" value="warning" id="80" addr="0x7fb6eb3f6550" />
+                            <attribute name="value" value="476:Initialization using std::initializer_list." id="81" addr="0x7fb6eb3f6550" />
                         </attributelist >
-                        <kwargssitem id="82" addr="0x7f1a040a3cd0" >
-                            <attributelist id="83" addr="0x7f1a040a3cd0" >
+                        <kwargssitem id="82" addr="0x7fb6eb3eacd0" >
+                            <attributelist id="83" addr="0x7fb6eb3eacd0" >
                             </attributelist >
                         </kwargssitem >
-                        <kwargssitem id="84" addr="0x7f1a040a3b30" >
-                            <attributelist id="85" addr="0x7f1a040a3b30" >
+                        <kwargssitem id="84" addr="0x7fb6eb3eab30" >
+                            <attributelist id="85" addr="0x7fb6eb3eab30" >
                             </attributelist >
                         </kwargssitem >
                     </kwargs >
-                    <attribute name="code" value="" id="86" addr="0x7f1a040af550" />
-                    <attribute name="method" value="in" id="87" addr="0x7f1a040af550" />
+                    <attribute name="code" value="" id="86" addr="0x7fb6eb3f6550" />
+                    <attribute name="method" value="in" id="87" addr="0x7fb6eb3f6550" />
                 </attributelist >
 
-                <typemapitem id="88" addr="0x7f1a040a3d70" >
-                    <attributelist id="89" addr="0x7f1a040a3d70" >
-                        <parmlist id="90" addr="0x7f1a040a3db0" >
+                <typemapitem id="88" addr="0x7fb6eb3ead70" >
+                    <attributelist id="89" addr="0x7fb6eb3ead70" >
+                        <parmlist id="90" addr="0x7fb6eb3eadb0" >
                             <parm id="91">
-                                <attributelist id="92" addr="0x7f1a040a3db0" >
-                                    <attribute name="type" value="std::initializer_list&lt;(T)>" id="93" addr="0x7f1a040af550" />
+                                <attributelist id="92" addr="0x7fb6eb3eadb0" >
+                                    <attribute name="type" value="std::initializer_list&lt;(T)>" id="93" addr="0x7fb6eb3f6550" />
                                 </attributelist >
                             </parm >
                         </parmlist >
@@ -148,32 +148,32 @@
                  
                 </typemapitem >
             </typemap >
-            <typemap id="94" addr="0x7f1a040a41d0" >
-                <attributelist id="95" addr="0x7f1a040a41d0" >
-                    <kwargs id="96" addr="0x7f1a040a3f70" >
-                        <attributelist id="97" addr="0x7f1a040a3f70" >
-                            <attribute name="name" value="precedence" id="98" addr="0x7f1a040af550" />
-                            <attribute name="value" value="0" id="99" addr="0x7f1a040af550" />
+            <typemap id="94" addr="0x7fb6eb3eb1d0" >
+                <attributelist id="95" addr="0x7fb6eb3eb1d0" >
+                    <kwargs id="96" addr="0x7fb6eb3eaf70" >
+                        <attributelist id="97" addr="0x7fb6eb3eaf70" >
+                            <attribute name="name" value="precedence" id="98" addr="0x7fb6eb3f6550" />
+                            <attribute name="value" value="0" id="99" addr="0x7fb6eb3f6550" />
                         </attributelist >
-                        <kwargssitem id="100" addr="0x7f1a040a3f90" >
-                            <attributelist id="101" addr="0x7f1a040a3f90" >
+                        <kwargssitem id="100" addr="0x7fb6eb3eaf90" >
+                            <attributelist id="101" addr="0x7fb6eb3eaf90" >
                             </attributelist >
                         </kwargssitem >
-                        <kwargssitem id="102" addr="0x7f1a040a3fb0" >
-                            <attributelist id="103" addr="0x7f1a040a3fb0" >
+                        <kwargssitem id="102" addr="0x7fb6eb3eafb0" >
+                            <attributelist id="103" addr="0x7fb6eb3eafb0" >
                             </attributelist >
                         </kwargssitem >
                     </kwargs >
-                    <attribute name="code" value="" id="104" addr="0x7f1a040af550" />
-                    <attribute name="method" value="typecheck" id="105" addr="0x7f1a040af550" />
+                    <attribute name="code" value="" id="104" addr="0x7fb6eb3f6550" />
+                    <attribute name="method" value="typecheck" id="105" addr="0x7fb6eb3f6550" />
                 </attributelist >
 
-                <typemapitem id="106" addr="0x7f1a040a4110" >
-                    <attributelist id="107" addr="0x7f1a040a4110" >
-                        <parmlist id="108" addr="0x7f1a040a4150" >
+                <typemapitem id="106" addr="0x7fb6eb3eb110" >
+                    <attributelist id="107" addr="0x7fb6eb3eb110" >
+                        <parmlist id="108" addr="0x7fb6eb3eb150" >
                             <parm id="109">
-                                <attributelist id="110" addr="0x7f1a040a4150" >
-                                    <attribute name="type" value="std::initializer_list&lt;(T)>" id="111" addr="0x7f1a040af550" />
+                                <attributelist id="110" addr="0x7fb6eb3eb150" >
+                                    <attribute name="type" value="std::initializer_list&lt;(T)>" id="111" addr="0x7fb6eb3f6550" />
                                 </attributelist >
                             </parm >
                         </parmlist >
@@ -182,18 +182,18 @@
                 </typemapitem >
             </typemap >
         </namespace >
-        <typemap id="112" addr="0x7f1a040a43f0" >
-            <attributelist id="113" addr="0x7f1a040a43f0" >
-                <attribute name="code" value="delete [] $1;" id="114" addr="0x7f1a040af550" />
-                <attribute name="method" value="newfree" id="115" addr="0x7f1a040af550" />
+        <typemap id="112" addr="0x7fb6eb3eb3f0" >
+            <attributelist id="113" addr="0x7fb6eb3eb3f0" >
+                <attribute name="code" value="delete [] $1;" id="114" addr="0x7fb6eb3f6550" />
+                <attribute name="method" value="newfree" id="115" addr="0x7fb6eb3f6550" />
             </attributelist >
 
-            <typemapitem id="116" addr="0x7f1a040a4310" >
-                <attributelist id="117" addr="0x7f1a040a4310" >
-                    <parmlist id="118" addr="0x7f1a040a4350" >
+            <typemapitem id="116" addr="0x7fb6eb3eb310" >
+                <attributelist id="117" addr="0x7fb6eb3eb310" >
+                    <parmlist id="118" addr="0x7fb6eb3eb350" >
                         <parm id="119">
-                            <attributelist id="120" addr="0x7f1a040a4350" >
-                                <attribute name="type" value="p.char" id="121" addr="0x7f1a040af550" />
+                            <attributelist id="120" addr="0x7fb6eb3eb350" >
+                                <attribute name="type" value="p.char" id="121" addr="0x7fb6eb3f6550" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -201,18 +201,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="122" addr="0x7f1a040a45d0" >
-            <attributelist id="123" addr="0x7f1a040a45d0" >
-                <attribute name="code" value="{&#10;  delete [] $1;&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="124" addr="0x7f1a040af550" />
-                <attribute name="method" value="memberin" id="125" addr="0x7f1a040af550" />
+        <typemap id="122" addr="0x7fb6eb3eb5d0" >
+            <attributelist id="123" addr="0x7fb6eb3eb5d0" >
+                <attribute name="code" value="{&#10;  delete [] $1;&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="124" addr="0x7fb6eb3f6550" />
+                <attribute name="method" value="memberin" id="125" addr="0x7fb6eb3f6550" />
             </attributelist >
 
-            <typemapitem id="126" addr="0x7f1a040a4510" >
-                <attributelist id="127" addr="0x7f1a040a4510" >
-                    <parmlist id="128" addr="0x7f1a040a4550" >
+            <typemapitem id="126" addr="0x7fb6eb3eb510" >
+                <attributelist id="127" addr="0x7fb6eb3eb510" >
+                    <parmlist id="128" addr="0x7fb6eb3eb550" >
                         <parm id="129">
-                            <attributelist id="130" addr="0x7f1a040a4550" >
-                                <attribute name="type" value="p.char" id="131" addr="0x7f1a040af550" />
+                            <attributelist id="130" addr="0x7fb6eb3eb550" >
+                                <attribute name="type" value="p.char" id="131" addr="0x7fb6eb3f6550" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -220,32 +220,32 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="132" addr="0x7f1a040a4830" >
-            <attributelist id="133" addr="0x7f1a040a4830" >
-                <kwargs id="134" addr="0x7f1a040a4670" >
-                    <attributelist id="135" addr="0x7f1a040a4670" >
-                        <attribute name="name" value="warning" id="136" addr="0x7f1a040af550" />
-                        <attribute name="value" value="451:Setting a const char * variable may leak memory." id="137" addr="0x7f1a040af550" />
+        <typemap id="132" addr="0x7fb6eb3eb830" >
+            <attributelist id="133" addr="0x7fb6eb3eb830" >
+                <kwargs id="134" addr="0x7fb6eb3eb670" >
+                    <attributelist id="135" addr="0x7fb6eb3eb670" >
+                        <attribute name="name" value="warning" id="136" addr="0x7fb6eb3f6550" />
+                        <attribute name="value" value="451:Setting a const char * variable may leak memory." id="137" addr="0x7fb6eb3f6550" />
                     </attributelist >
-                    <kwargssitem id="138" addr="0x7f1a040a4690" >
-                        <attributelist id="139" addr="0x7f1a040a4690" >
+                    <kwargssitem id="138" addr="0x7fb6eb3eb690" >
+                        <attributelist id="139" addr="0x7fb6eb3eb690" >
                         </attributelist >
                     </kwargssitem >
-                    <kwargssitem id="140" addr="0x7f1a040a4650" >
-                        <attributelist id="141" addr="0x7f1a040a4650" >
+                    <kwargssitem id="140" addr="0x7fb6eb3eb650" >
+                        <attributelist id="141" addr="0x7fb6eb3eb650" >
                         </attributelist >
                     </kwargssitem >
                 </kwargs >
-                <attribute name="code" value="{&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="142" addr="0x7f1a040af550" />
-                <attribute name="method" value="memberin" id="143" addr="0x7f1a040af550" />
+                <attribute name="code" value="{&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="142" addr="0x7fb6eb3f6550" />
+                <attribute name="method" value="memberin" id="143" addr="0x7fb6eb3f6550" />
             </attributelist >
 
-            <typemapitem id="144" addr="0x7f1a040a4770" >
-                <attributelist id="145" addr="0x7f1a040a4770" >
-                    <parmlist id="146" addr="0x7f1a040a47b0" >
+            <typemapitem id="144" addr="0x7fb6eb3eb770" >
+                <attributelist id="145" addr="0x7fb6eb3eb770" >
+                    <parmlist id="146" addr="0x7fb6eb3eb7b0" >
                         <parm id="147">
-                            <attributelist id="148" addr="0x7f1a040a47b0" >
-                                <attribute name="type" value="p.q(const).char" id="149" addr="0x7f1a040af550" />
+                            <attributelist id="148" addr="0x7fb6eb3eb7b0" >
+                                <attribute name="type" value="p.q(const).char" id="149" addr="0x7fb6eb3f6550" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -253,18 +253,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="150" addr="0x7f1a040a4a10" >
-            <attributelist id="151" addr="0x7f1a040a4a10" >
-                <attribute name="code" value="{&#10;  delete [] $1;&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="152" addr="0x7f1a040af550" />
-                <attribute name="method" value="globalin" id="153" addr="0x7f1a040af550" />
+        <typemap id="150" addr="0x7fb6eb3eba10" >
+            <attributelist id="151" addr="0x7fb6eb3eba10" >
+                <attribute name="code" value="{&#10;  delete [] $1;&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="152" addr="0x7fb6eb3f6550" />
+                <attribute name="method" value="globalin" id="153" addr="0x7fb6eb3f6550" />
             </attributelist >
 
-            <typemapitem id="154" addr="0x7f1a040a4950" >
-                <attributelist id="155" addr="0x7f1a040a4950" >
-                    <parmlist id="156" addr="0x7f1a040a4990" >
+            <typemapitem id="154" addr="0x7fb6eb3eb950" >
+                <attributelist id="155" addr="0x7fb6eb3eb950" >
+                    <parmlist id="156" addr="0x7fb6eb3eb990" >
                         <parm id="157">
-                            <attributelist id="158" addr="0x7f1a040a4990" >
-                                <attribute name="type" value="p.char" id="159" addr="0x7f1a040af550" />
+                            <attributelist id="158" addr="0x7fb6eb3eb990" >
+                                <attribute name="type" value="p.char" id="159" addr="0x7fb6eb3f6550" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -272,32 +272,32 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="160" addr="0x7f1a040a4c70" >
-            <attributelist id="161" addr="0x7f1a040a4c70" >
-                <kwargs id="162" addr="0x7f1a040a4ab0" >
-                    <attributelist id="163" addr="0x7f1a040a4ab0" >
-                        <attribute name="name" value="warning" id="164" addr="0x7f1a040af550" />
-                        <attribute name="value" value="451:Setting a const char * variable may leak memory." id="165" addr="0x7f1a040af550" />
+        <typemap id="160" addr="0x7fb6eb3ebc70" >
+            <attributelist id="161" addr="0x7fb6eb3ebc70" >
+                <kwargs id="162" addr="0x7fb6eb3ebab0" >
+                    <attributelist id="163" addr="0x7fb6eb3ebab0" >
+                        <attribute name="name" value="warning" id="164" addr="0x7fb6eb3f6550" />
+                        <attribute name="value" value="451:Setting a const char * variable may leak memory." id="165" addr="0x7fb6eb3f6550" />
                     </attributelist >
-                    <kwargssitem id="166" addr="0x7f1a040a4ad0" >
-                        <attributelist id="167" addr="0x7f1a040a4ad0" >
+                    <kwargssitem id="166" addr="0x7fb6eb3ebad0" >
+                        <attributelist id="167" addr="0x7fb6eb3ebad0" >
                         </attributelist >
                     </kwargssitem >
-                    <kwargssitem id="168" addr="0x7f1a040a4a90" >
-                        <attributelist id="169" addr="0x7f1a040a4a90" >
+                    <kwargssitem id="168" addr="0x7fb6eb3eba90" >
+                        <attributelist id="169" addr="0x7fb6eb3eba90" >
                         </attributelist >
                     </kwargssitem >
                 </kwargs >
-                <attribute name="code" value="{&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="170" addr="0x7f1a040af550" />
-                <attribute name="method" value="globalin" id="171" addr="0x7f1a040af550" />
+                <attribute name="code" value="{&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="170" addr="0x7fb6eb3f6550" />
+                <attribute name="method" value="globalin" id="171" addr="0x7fb6eb3f6550" />
             </attributelist >
 
-            <typemapitem id="172" addr="0x7f1a040a4bb0" >
-                <attributelist id="173" addr="0x7f1a040a4bb0" >
-                    <parmlist id="174" addr="0x7f1a040a4bf0" >
+            <typemapitem id="172" addr="0x7fb6eb3ebbb0" >
+                <attributelist id="173" addr="0x7fb6eb3ebbb0" >
+                    <parmlist id="174" addr="0x7fb6eb3ebbf0" >
                         <parm id="175">
-                            <attributelist id="176" addr="0x7f1a040a4bf0" >
-                                <attribute name="type" value="p.q(const).char" id="177" addr="0x7f1a040af550" />
+                            <attributelist id="176" addr="0x7fb6eb3ebbf0" >
+                                <attribute name="type" value="p.q(const).char" id="177" addr="0x7fb6eb3f6550" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -305,18 +305,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="178" addr="0x7f1a040a4e90" >
-            <attributelist id="179" addr="0x7f1a040a4e90" >
-                <attribute name="code" value="{&#10;  if($input) {&#10;    strncpy((char*)$1, (const char *)$input, $1_dim0-1);&#10;    $1[$1_dim0-1] = 0;&#10;  } else {&#10;    $1[0] = 0;&#10;  }&#10;}" id="180" addr="0x7f1a040af550" />
-                <attribute name="method" value="memberin" id="181" addr="0x7f1a040af550" />
+        <typemap id="178" addr="0x7fb6eb3ebe90" >
+            <attributelist id="179" addr="0x7fb6eb3ebe90" >
+                <attribute name="code" value="{&#10;  if($input) {&#10;    strncpy((char*)$1, (const char *)$input, $1_dim0-1);&#10;    $1[$1_dim0-1] = 0;&#10;  } else {&#10;    $1[0] = 0;&#10;  }&#10;}" id="180" addr="0x7fb6eb3f6550" />
+                <attribute name="method" value="memberin" id="181" addr="0x7fb6eb3f6550" />
             </attributelist >
 
-            <typemapitem id="182" addr="0x7f1a040a4dd0" >
-                <attributelist id="183" addr="0x7f1a040a4dd0" >
-                    <parmlist id="184" addr="0x7f1a040a4e10" >
+            <typemapitem id="182" addr="0x7fb6eb3ebdd0" >
+                <attributelist id="183" addr="0x7fb6eb3ebdd0" >
+                    <parmlist id="184" addr="0x7fb6eb3ebe10" >
                         <parm id="185">
-                            <attributelist id="186" addr="0x7f1a040a4e10" >
-                                <attribute name="type" value="a(ANY).char" id="187" addr="0x7f1a040af550" />
+                            <attributelist id="186" addr="0x7fb6eb3ebe10" >
+                                <attribute name="type" value="a(ANY).char" id="187" addr="0x7fb6eb3f6550" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -324,18 +324,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="188" addr="0x7f1a040a50b0" >
-            <attributelist id="189" addr="0x7f1a040a50b0" >
-                <attribute name="code" value="{&#10;  if($input) {&#10;    strncpy((char*)$1, (const char *)$input, $1_dim0-1);&#10;    $1[$1_dim0-1] = 0;&#10;  } else {&#10;    $1[0] = 0;&#10;  }&#10;}" id="190" addr="0x7f1a040af550" />
-                <attribute name="method" value="globalin" id="191" addr="0x7f1a040af550" />
+        <typemap id="188" addr="0x7fb6eb3ec0b0" >
+            <attributelist id="189" addr="0x7fb6eb3ec0b0" >
+                <attribute name="code" value="{&#10;  if($input) {&#10;    strncpy((char*)$1, (const char *)$input, $1_dim0-1);&#10;    $1[$1_dim0-1] = 0;&#10;  } else {&#10;    $1[0] = 0;&#10;  }&#10;}" id="190" addr="0x7fb6eb3f6550" />
+                <attribute name="method" value="globalin" id="191" addr="0x7fb6eb3f6550" />
             </attributelist >
 
-            <typemapitem id="192" addr="0x7f1a040a4ff0" >
-                <attributelist id="193" addr="0x7f1a040a4ff0" >
-                    <parmlist id="194" addr="0x7f1a040a5030" >
+            <typemapitem id="192" addr="0x7fb6eb3ebff0" >
+                <attributelist id="193" addr="0x7fb6eb3ebff0" >
+                    <parmlist id="194" addr="0x7fb6eb3ec030" >
                         <parm id="195">
-                            <attributelist id="196" addr="0x7f1a040a5030" >
-                                <attribute name="type" value="a(ANY).char" id="197" addr="0x7f1a040af550" />
+                            <attributelist id="196" addr="0x7fb6eb3ec030" >
+                                <attribute name="type" value="a(ANY).char" id="197" addr="0x7fb6eb3f6550" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -343,18 +343,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="198" addr="0x7f1a040a5290" >
-            <attributelist id="199" addr="0x7f1a040a5290" >
-                <attribute name="code" value="{&#10;  if ($input) strcpy((char *)$1, (const char *)$input);&#10;  else $1[0] = 0;&#10;}" id="200" addr="0x7f1a040af550" />
-                <attribute name="method" value="memberin" id="201" addr="0x7f1a040af550" />
+        <typemap id="198" addr="0x7fb6eb3ec290" >
+            <attributelist id="199" addr="0x7fb6eb3ec290" >
+                <attribute name="code" value="{&#10;  if ($input) strcpy((char *)$1, (const char *)$input);&#10;  else $1[0] = 0;&#10;}" id="200" addr="0x7fb6eb3f6550" />
+                <attribute name="method" value="memberin" id="201" addr="0x7fb6eb3f6550" />
             </attributelist >
 
-            <typemapitem id="202" addr="0x7f1a040a51d0" >
-                <attributelist id="203" addr="0x7f1a040a51d0" >
-                    <parmlist id="204" addr="0x7f1a040a5210" >
+            <typemapitem id="202" addr="0x7fb6eb3ec1d0" >
+                <attributelist id="203" addr="0x7fb6eb3ec1d0" >
+                    <parmlist id="204" addr="0x7fb6eb3ec210" >
                         <parm id="205">
-                            <attributelist id="206" addr="0x7f1a040a5210" >
-                                <attribute name="type" value="a().char" id="207" addr="0x7f1a040af550" />
+                            <attributelist id="206" addr="0x7fb6eb3ec210" >
+                                <attribute name="type" value="a().char" id="207" addr="0x7fb6eb3f6550" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -362,18 +362,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="208" addr="0x7f1a040a5470" >
-            <attributelist id="209" addr="0x7f1a040a5470" >
-                <attribute name="code" value="{&#10;  if ($input) strcpy((char *)$1, (const char *)$input);&#10;  else $1[0] = 0;&#10;}" id="210" addr="0x7f1a040af550" />
-                <attribute name="method" value="globalin" id="211" addr="0x7f1a040af550" />
+        <typemap id="208" addr="0x7fb6eb3ec470" >
+            <attributelist id="209" addr="0x7fb6eb3ec470" >
+                <attribute name="code" value="{&#10;  if ($input) strcpy((char *)$1, (const char *)$input);&#10;  else $1[0] = 0;&#10;}" id="210" addr="0x7fb6eb3f6550" />
+                <attribute name="method" value="globalin" id="211" addr="0x7fb6eb3f6550" />
             </attributelist >
 
-            <typemapitem id="212" addr="0x7f1a040a53b0" >
-                <attributelist id="213" addr="0x7f1a040a53b0" >
-                    <parmlist id="214" addr="0x7f1a040a53f0" >
+            <typemapitem id="212" addr="0x7fb6eb3ec3b0" >
+                <attributelist id="213" addr="0x7fb6eb3ec3b0" >
+                    <parmlist id="214" addr="0x7fb6eb3ec3f0" >
                         <parm id="215">
-                            <attributelist id="216" addr="0x7f1a040a53f0" >
-                                <attribute name="type" value="a().char" id="217" addr="0x7f1a040af550" />
+                            <attributelist id="216" addr="0x7fb6eb3ec3f0" >
+                                <attribute name="type" value="a().char" id="217" addr="0x7fb6eb3f6550" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -381,18 +381,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="218" addr="0x7f1a040a5690" >
-            <attributelist id="219" addr="0x7f1a040a5690" >
-                <attribute name="code" value="{&#10;  size_t ii;&#10;  $1_basetype *b = ($1_basetype *) $1;&#10;  for (ii = 0; ii &lt; (size_t)$1_size; ii++) b[ii] = *(($1_basetype *) $input + ii);&#10;}" id="220" addr="0x7f1a040af550" />
-                <attribute name="method" value="memberin" id="221" addr="0x7f1a040af550" />
+        <typemap id="218" addr="0x7fb6eb3ec690" >
+            <attributelist id="219" addr="0x7fb6eb3ec690" >
+                <attribute name="code" value="{&#10;  size_t ii;&#10;  $1_basetype *b = ($1_basetype *) $1;&#10;  for (ii = 0; ii &lt; (size_t)$1_size; ii++) b[ii] = *(($1_basetype *) $input + ii);&#10;}" id="220" addr="0x7fb6eb3f6550" />
+                <attribute name="method" value="memberin" id="221" addr="0x7fb6eb3f6550" />
             </attributelist >
 
-            <typemapitem id="222" addr="0x7f1a040a55d0" >
-                <attributelist id="223" addr="0x7f1a040a55d0" >
-                    <parmlist id="224" addr="0x7f1a040a5610" >
+            <typemapitem id="222" addr="0x7fb6eb3ec5d0" >
+                <attributelist id="223" addr="0x7fb6eb3ec5d0" >
+                    <parmlist id="224" addr="0x7fb6eb3ec610" >
                         <parm id="225">
-                            <attributelist id="226" addr="0x7f1a040a5610" >
-                                <attribute name="type" value="a(ANY).SWIGTYPE" id="227" addr="0x7f1a040af550" />
+                            <attributelist id="226" addr="0x7fb6eb3ec610" >
+                                <attribute name="type" value="a(ANY).SWIGTYPE" id="227" addr="0x7fb6eb3f6550" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -400,18 +400,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="228" addr="0x7f1a040a58b0" >
-            <attributelist id="229" addr="0x7f1a040a58b0" >
-                <attribute name="code" value="{&#10;  size_t ii;&#10;  $1_basetype *b = ($1_basetype *) $1;&#10;  for (ii = 0; ii &lt; (size_t)$1_size; ii++) b[ii] = *(($1_basetype *) $input + ii);&#10;}" id="230" addr="0x7f1a040af550" />
-                <attribute name="method" value="globalin" id="231" addr="0x7f1a040af550" />
+        <typemap id="228" addr="0x7fb6eb3ec8b0" >
+            <attributelist id="229" addr="0x7fb6eb3ec8b0" >
+                <attribute name="code" value="{&#10;  size_t ii;&#10;  $1_basetype *b = ($1_basetype *) $1;&#10;  for (ii = 0; ii &lt; (size_t)$1_size; ii++) b[ii] = *(($1_basetype *) $input + ii);&#10;}" id="230" addr="0x7fb6eb3f6550" />
+                <attribute name="method" value="globalin" id="231" addr="0x7fb6eb3f6550" />
             </attributelist >
 
-            <typemapitem id="232" addr="0x7f1a040a57f0" >
-                <attributelist id="233" addr="0x7f1a040a57f0" >
-                    <parmlist id="234" addr="0x7f1a040a5830" >
+            <typemapitem id="232" addr="0x7fb6eb3ec7f0" >
+                <attributelist id="233" addr="0x7fb6eb3ec7f0" >
+                    <parmlist id="234" addr="0x7fb6eb3ec830" >
                         <parm id="235">
-                            <attributelist id="236" addr="0x7f1a040a5830" >
-                                <attribute name="type" value="a(ANY).SWIGTYPE" id="237" addr="0x7f1a040af550" />
+                            <attributelist id="236" addr="0x7fb6eb3ec830" >
+                                <attribute name="type" value="a(ANY).SWIGTYPE" id="237" addr="0x7fb6eb3f6550" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -419,18 +419,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="238" addr="0x7f1a040a5b10" >
-            <attributelist id="239" addr="0x7f1a040a5b10" >
-                <attribute name="code" value="{&#10;  $basetype (*inp)[$1_dim1] = ($basetype (*)[$1_dim1])($input);&#10;  $basetype (*dest)[$1_dim1] = ($basetype (*)[$1_dim1])($1);&#10;  size_t ii = 0;&#10;  for (; ii &lt; $1_dim0; ++ii) {&#10;    $basetype *ip = inp[ii];&#10;    $basetype *dp = dest[ii];&#10;    size_t jj = 0;&#10;    for (; jj &lt; $1_dim1; ++jj) dp[jj] = ip[jj];&#10;  }&#10;}" id="240" addr="0x7f1a040af550" />
-                <attribute name="method" value="memberin" id="241" addr="0x7f1a040af550" />
+        <typemap id="238" addr="0x7fb6eb3ecb10" >
+            <attributelist id="239" addr="0x7fb6eb3ecb10" >
+                <attribute name="code" value="{&#10;  $basetype (*inp)[$1_dim1] = ($basetype (*)[$1_dim1])($input);&#10;  $basetype (*dest)[$1_dim1] = ($basetype (*)[$1_dim1])($1);&#10;  size_t ii = 0;&#10;  for (; ii &lt; $1_dim0; ++ii) {&#10;    $basetype *ip = inp[ii];&#10;    $basetype *dp = dest[ii];&#10;    size_t jj = 0;&#10;    for (; jj &lt; $1_dim1; ++jj) dp[jj] = ip[jj];&#10;  }&#10;}" id="240" addr="0x7fb6eb3f6550" />
+                <attribute name="method" value="memberin" id="241" addr="0x7fb6eb3f6550" />
             </attributelist >
 
-            <typemapitem id="242" addr="0x7f1a040a59f0" >
-                <attributelist id="243" addr="0x7f1a040a59f0" >
-                    <parmlist id="244" addr="0x7f1a040a5a90" >
+            <typemapitem id="242" addr="0x7fb6eb3ec9f0" >
+                <attributelist id="243" addr="0x7fb6eb3ec9f0" >
+                    <parmlist id="244" addr="0x7fb6eb3eca90" >
                         <parm id="245">
-                            <attributelist id="246" addr="0x7f1a040a5a90" >
-                                <attribute name="type" value="a(ANY).a(ANY).SWIGTYPE" id="247" addr="0x7f1a040af550" />
+                            <attributelist id="246" addr="0x7fb6eb3eca90" >
+                                <attribute name="type" value="a(ANY).a(ANY).SWIGTYPE" id="247" addr="0x7fb6eb3f6550" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -438,18 +438,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="248" addr="0x7f1a040a5d70" >
-            <attributelist id="249" addr="0x7f1a040a5d70" >
-                <attribute name="code" value="{&#10;  $basetype (*inp)[$1_dim1] = ($basetype (*)[$1_dim1])($input);&#10;  $basetype (*dest)[$1_dim1] = ($basetype (*)[$1_dim1])($1);&#10;  size_t ii = 0;&#10;  for (; ii &lt; $1_dim0; ++ii) {&#10;    $basetype *ip = inp[ii];&#10;    $basetype *dp = dest[ii];&#10;    size_t jj = 0;&#10;    for (; jj &lt; $1_dim1; ++jj) dp[jj] = ip[jj];&#10;  }&#10;}" id="250" addr="0x7f1a040af550" />
-                <attribute name="method" value="globalin" id="251" addr="0x7f1a040af550" />
+        <typemap id="248" addr="0x7fb6eb3ecd70" >
+            <attributelist id="249" addr="0x7fb6eb3ecd70" >
+                <attribute name="code" value="{&#10;  $basetype (*inp)[$1_dim1] = ($basetype (*)[$1_dim1])($input);&#10;  $basetype (*dest)[$1_dim1] = ($basetype (*)[$1_dim1])($1);&#10;  size_t ii = 0;&#10;  for (; ii &lt; $1_dim0; ++ii) {&#10;    $basetype *ip = inp[ii];&#10;    $basetype *dp = dest[ii];&#10;    size_t jj = 0;&#10;    for (; jj &lt; $1_dim1; ++jj) dp[jj] = ip[jj];&#10;  }&#10;}" id="250" addr="0x7fb6eb3f6550" />
+                <attribute name="method" value="globalin" id="251" addr="0x7fb6eb3f6550" />
             </attributelist >
 
-            <typemapitem id="252" addr="0x7f1a040a5c50" >
-                <attributelist id="253" addr="0x7f1a040a5c50" >
-                    <parmlist id="254" addr="0x7f1a040a5cf0" >
+            <typemapitem id="252" addr="0x7fb6eb3ecc50" >
+                <attributelist id="253" addr="0x7fb6eb3ecc50" >
+                    <parmlist id="254" addr="0x7fb6eb3eccf0" >
                         <parm id="255">
-                            <attributelist id="256" addr="0x7f1a040a5cf0" >
-                                <attribute name="type" value="a(ANY).a(ANY).SWIGTYPE" id="257" addr="0x7f1a040af550" />
+                            <attributelist id="256" addr="0x7fb6eb3eccf0" >
+                                <attribute name="type" value="a(ANY).a(ANY).SWIGTYPE" id="257" addr="0x7fb6eb3f6550" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -457,513 +457,513 @@
              
             </typemapitem >
         </typemap >
-        <insert id="258" addr="0x7f1a040a5e30" >
-            <attributelist id="259" addr="0x7f1a040a5e30" >
-                <attribute name="code" value="&#10;#ifdef __cplusplus&#10;/* SwigValueWrapper is described in swig.swg */&#10;template&lt;typename T> class SwigValueWrapper {&#10;  struct SwigMovePointer {&#10;    T *ptr;&#10;    SwigMovePointer(T *p) : ptr(p) { }&#10;    ~SwigMovePointer() { delete ptr; }&#10;    SwigMovePointer&amp; operator=(SwigMovePointer&amp; rhs) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = rhs.ptr; rhs.ptr = 0; return *this; }&#10;  } pointer;&#10;  SwigValueWrapper&amp; operator=(const SwigValueWrapper&lt;T>&amp; rhs);&#10;  SwigValueWrapper(const SwigValueWrapper&lt;T>&amp; rhs);&#10;public:&#10;  SwigValueWrapper() : pointer(0) { }&#10;  SwigValueWrapper&amp; operator=(const T&amp; t) { SwigMovePointer tmp(new T(t)); pointer = tmp; return *this; }&#10;  operator T&amp;() const { return *pointer.ptr; }&#10;  T *operator&amp;() { return pointer.ptr; }&#10;};" id="260" addr="0x7f1a040af550" />
-                <attribute name="section" value="runtime" id="261" addr="0x7f1a040af550" />
+        <insert id="258" addr="0x7fb6eb3ece30" >
+            <attributelist id="259" addr="0x7fb6eb3ece30" >
+                <attribute name="code" value="&#10;#ifdef __cplusplus&#10;/* SwigValueWrapper is described in swig.swg */&#10;template&lt;typename T> class SwigValueWrapper {&#10;  struct SwigMovePointer {&#10;    T *ptr;&#10;    SwigMovePointer(T *p) : ptr(p) { }&#10;    ~SwigMovePointer() { delete ptr; }&#10;    SwigMovePointer&amp; operator=(SwigMovePointer&amp; rhs) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = rhs.ptr; rhs.ptr = 0; return *this; }&#10;  } pointer;&#10;  SwigValueWrapper&amp; operator=(const SwigValueWrapper&lt;T>&amp; rhs);&#10;  SwigValueWrapper(const SwigValueWrapper&lt;T>&amp; rhs);&#10;public:&#10;  SwigValueWrapper() : pointer(0) { }&#10;  SwigValueWrapper&amp; operator=(const T&amp; t) { SwigMovePointer tmp(new T(t)); pointer = tmp; return *this; }&#10;  operator T&amp;() const { return *pointer.ptr; }&#10;  T *operator&amp;() { return pointer.ptr; }&#10;};" id="260" addr="0x7fb6eb3f6550" />
+                <attribute name="section" value="runtime" id="261" addr="0x7fb6eb3f6550" />
             </attributelist >
          
         </insert >
-        <insert id="262" addr="0x7f1a040a5f10" >
-            <attributelist id="263" addr="0x7f1a040a5f10" >
-                <attribute name="code" value="&#10;template &lt;typename T> T SwigValueInit() {&#10;  return T();&#10;}&#10;#endif&#10;" id="264" addr="0x7f1a040af550" />
-                <attribute name="section" value="runtime" id="265" addr="0x7f1a040af550" />
+        <insert id="262" addr="0x7fb6eb3ecf10" >
+            <attributelist id="263" addr="0x7fb6eb3ecf10" >
+                <attribute name="code" value="&#10;template &lt;typename T> T SwigValueInit() {&#10;  return T();&#10;}&#10;#endif&#10;" id="264" addr="0x7fb6eb3f6550" />
+                <attribute name="section" value="runtime" id="265" addr="0x7fb6eb3f6550" />
             </attributelist >
          
         </insert >
-        <insert id="266" addr="0x7f1a040a5ff0" >
-            <attributelist id="267" addr="0x7f1a040a5ff0" >
-                <attribute name="code" value="/* -----------------------------------------------------------------------------&#10; *  This section contains generic SWIG labels for method/variable&#10; *  declarations/attributes, and other compiler dependent labels.&#10; * ----------------------------------------------------------------------------- */&#10;&#10;/* template workaround for compilers that cannot correctly implement the C++ standard */&#10;#ifndef SWIGTEMPLATEDISAMBIGUATOR&#10;# if defined(__SUNPRO_CC) &amp;&amp; (__SUNPRO_CC &lt;= 0x560)&#10;#  define SWIGTEMPLATEDISAMBIGUATOR template&#10;# elif defined(__HP_aCC)&#10;/* Needed even with `aCC -AA' when `aCC -V' reports HP ANSI C++ B3910B A.03.55 */&#10;/* If we find a maximum version that requires this, the test would be __HP_aCC &lt;= 35500 for A.03.55 */&#10;#  define SWIGTEMPLATEDISAMBIGUATOR template&#10;# else&#10;#  define SWIGTEMPLATEDISAMBIGUATOR&#10;# endif&#10;#endif&#10;&#10;/* inline attribute */&#10;#ifndef SWIGINLINE&#10;# if defined(__cplusplus) || (defined(__GNUC__) &amp;&amp; !defined(__STRICT_ANSI__))&#10;#   define SWIGINLINE inline&#10;# else&#10;#   define SWIGINLINE&#10;# endif&#10;#endif&#10;&#10;/* attribute recognised by some compilers to avoid 'unused' warnings */&#10;#ifndef SWIGUNUSED&#10;# if defined(__GNUC__)&#10;#   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 &amp;&amp; __GNUC_MINOR__ >= 4))&#10;#     define SWIGUNUSED __attribute__ ((__unused__))&#10;#   else&#10;#     define SWIGUNUSED&#10;#   endif&#10;# elif defined(__ICC)&#10;#   define SWIGUNUSED __attribute__ ((__unused__))&#10;# else&#10;#   define SWIGUNUSED&#10;# endif&#10;#endif&#10;&#10;#ifndef SWIG_MSC_UNSUPPRESS_4505&#10;# if defined(_MSC_VER)&#10;#   pragma warning(disable : 4505) /* unreferenced local function has been removed */&#10;# endif&#10;#endif&#10;&#10;#ifndef SWIGUNUSEDPARM&#10;# ifdef __cplusplus&#10;#   define SWIGUNUSEDPARM(p)&#10;# else&#10;#   define SWIGUNUSEDPARM(p) p SWIGUNUSED&#10;# endif&#10;#endif&#10;&#10;/* internal SWIG method */&#10;#ifndef SWIGINTERN&#10;# define SWIGINTERN static SWIGUNUSED&#10;#endif&#10;&#10;/* internal inline SWIG method */&#10;#ifndef SWIGINTERNINLINE&#10;# define SWIGINTERNINLINE SWIGINTERN SWIGINLINE&#10;#endif&#10;&#10;/* exporting methods */&#10;#if defined(__GNUC__)&#10;#  if (__GNUC__ >= 4) || (__GNUC__ == 3 &amp;&amp; __GNUC_MINOR__ >= 4)&#10;#    ifndef GCC_HASCLASSVISIBILITY&#10;#      define GCC_HASCLASSVISIBILITY&#10;#    endif&#10;#  endif&#10;#endif&#10;&#10;#ifndef SWIGEXPORT&#10;# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)&#10;#   if defined(STATIC_LINKED)&#10;#     define SWIGEXPORT&#10;#   else&#10;#     define SWIGEXPORT __declspec(dllexport)&#10;#   endif&#10;# else&#10;#   if defined(__GNUC__) &amp;&amp; defined(GCC_HASCLASSVISIBILITY)&#10;#     define SWIGEXPORT __attribute__ ((visibility(&quot;default&quot;)))&#10;#   else&#10;#     define SWIGEXPORT&#10;#   endif&#10;# endif&#10;#endif&#10;&#10;/* calling conventions for Windows */&#10;#ifndef SWIGSTDCALL&#10;# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)&#10;#   define SWIGSTDCALL __stdcall&#10;# else&#10;#   define SWIGSTDCALL&#10;# endif&#10;#endif&#10;&#10;/* Deal with Microsoft's attempt at deprecating C standard runtime functions */&#10;#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) &amp;&amp; defined(_MSC_VER) &amp;&amp; !defined(_CRT_SECURE_NO_DEPRECATE)&#10;# define _CRT_SECURE_NO_DEPRECATE&#10;#endif&#10;&#10;/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */&#10;#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) &amp;&amp; defined(_MSC_VER) &amp;&amp; !defined(_SCL_SECURE_NO_DEPRECATE)&#10;# define _SCL_SECURE_NO_DEPRECATE&#10;#endif&#10;&#10;/* Deal with Apple's deprecated 'AssertMacros.h' from Carbon-framework */&#10;#if defined(__APPLE__) &amp;&amp; !defined(__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES)&#10;# define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0&#10;#endif&#10;&#10;/* Intel's compiler complains if a variable which was never initialised is&#10; * cast to void, which is a common idiom which we use to indicate that we&#10; * are aware a variable isn't used.  So we just silence that warning.&#10; * See: https://github.com/swig/swig/issues/192 for more discussion.&#10; */&#10;#ifdef __INTEL_COMPILER&#10;# pragma warning disable 592&#10;#endif&#10;" id="268" addr="0x7f1a040af550" />
-                <attribute name="section" value="runtime" id="269" addr="0x7f1a040af550" />
+        <insert id="266" addr="0x7fb6eb3ecff0" >
+            <attributelist id="267" addr="0x7fb6eb3ecff0" >
+                <attribute name="code" value="/* -----------------------------------------------------------------------------&#10; *  This section contains generic SWIG labels for method/variable&#10; *  declarations/attributes, and other compiler dependent labels.&#10; * ----------------------------------------------------------------------------- */&#10;&#10;/* template workaround for compilers that cannot correctly implement the C++ standard */&#10;#ifndef SWIGTEMPLATEDISAMBIGUATOR&#10;# if defined(__SUNPRO_CC) &amp;&amp; (__SUNPRO_CC &lt;= 0x560)&#10;#  define SWIGTEMPLATEDISAMBIGUATOR template&#10;# elif defined(__HP_aCC)&#10;/* Needed even with `aCC -AA' when `aCC -V' reports HP ANSI C++ B3910B A.03.55 */&#10;/* If we find a maximum version that requires this, the test would be __HP_aCC &lt;= 35500 for A.03.55 */&#10;#  define SWIGTEMPLATEDISAMBIGUATOR template&#10;# else&#10;#  define SWIGTEMPLATEDISAMBIGUATOR&#10;# endif&#10;#endif&#10;&#10;/* inline attribute */&#10;#ifndef SWIGINLINE&#10;# if defined(__cplusplus) || (defined(__GNUC__) &amp;&amp; !defined(__STRICT_ANSI__))&#10;#   define SWIGINLINE inline&#10;# else&#10;#   define SWIGINLINE&#10;# endif&#10;#endif&#10;&#10;/* attribute recognised by some compilers to avoid 'unused' warnings */&#10;#ifndef SWIGUNUSED&#10;# if defined(__GNUC__)&#10;#   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 &amp;&amp; __GNUC_MINOR__ >= 4))&#10;#     define SWIGUNUSED __attribute__ ((__unused__))&#10;#   else&#10;#     define SWIGUNUSED&#10;#   endif&#10;# elif defined(__ICC)&#10;#   define SWIGUNUSED __attribute__ ((__unused__))&#10;# else&#10;#   define SWIGUNUSED&#10;# endif&#10;#endif&#10;&#10;#ifndef SWIG_MSC_UNSUPPRESS_4505&#10;# if defined(_MSC_VER)&#10;#   pragma warning(disable : 4505) /* unreferenced local function has been removed */&#10;# endif&#10;#endif&#10;&#10;#ifndef SWIGUNUSEDPARM&#10;# ifdef __cplusplus&#10;#   define SWIGUNUSEDPARM(p)&#10;# else&#10;#   define SWIGUNUSEDPARM(p) p SWIGUNUSED&#10;# endif&#10;#endif&#10;&#10;/* internal SWIG method */&#10;#ifndef SWIGINTERN&#10;# define SWIGINTERN static SWIGUNUSED&#10;#endif&#10;&#10;/* internal inline SWIG method */&#10;#ifndef SWIGINTERNINLINE&#10;# define SWIGINTERNINLINE SWIGINTERN SWIGINLINE&#10;#endif&#10;&#10;/* exporting methods */&#10;#if defined(__GNUC__)&#10;#  if (__GNUC__ >= 4) || (__GNUC__ == 3 &amp;&amp; __GNUC_MINOR__ >= 4)&#10;#    ifndef GCC_HASCLASSVISIBILITY&#10;#      define GCC_HASCLASSVISIBILITY&#10;#    endif&#10;#  endif&#10;#endif&#10;&#10;#ifndef SWIGEXPORT&#10;# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)&#10;#   if defined(STATIC_LINKED)&#10;#     define SWIGEXPORT&#10;#   else&#10;#     define SWIGEXPORT __declspec(dllexport)&#10;#   endif&#10;# else&#10;#   if defined(__GNUC__) &amp;&amp; defined(GCC_HASCLASSVISIBILITY)&#10;#     define SWIGEXPORT __attribute__ ((visibility(&quot;default&quot;)))&#10;#   else&#10;#     define SWIGEXPORT&#10;#   endif&#10;# endif&#10;#endif&#10;&#10;/* calling conventions for Windows */&#10;#ifndef SWIGSTDCALL&#10;# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)&#10;#   define SWIGSTDCALL __stdcall&#10;# else&#10;#   define SWIGSTDCALL&#10;# endif&#10;#endif&#10;&#10;/* Deal with Microsoft's attempt at deprecating C standard runtime functions */&#10;#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) &amp;&amp; defined(_MSC_VER) &amp;&amp; !defined(_CRT_SECURE_NO_DEPRECATE)&#10;# define _CRT_SECURE_NO_DEPRECATE&#10;#endif&#10;&#10;/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */&#10;#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) &amp;&amp; defined(_MSC_VER) &amp;&amp; !defined(_SCL_SECURE_NO_DEPRECATE)&#10;# define _SCL_SECURE_NO_DEPRECATE&#10;#endif&#10;&#10;/* Deal with Apple's deprecated 'AssertMacros.h' from Carbon-framework */&#10;#if defined(__APPLE__) &amp;&amp; !defined(__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES)&#10;# define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0&#10;#endif&#10;&#10;/* Intel's compiler complains if a variable which was never initialised is&#10; * cast to void, which is a common idiom which we use to indicate that we&#10; * are aware a variable isn't used.  So we just silence that warning.&#10; * See: https://github.com/swig/swig/issues/192 for more discussion.&#10; */&#10;#ifdef __INTEL_COMPILER&#10;# pragma warning disable 592&#10;#endif&#10;" id="268" addr="0x7fb6eb3f6550" />
+                <attribute name="section" value="runtime" id="269" addr="0x7fb6eb3f6550" />
             </attributelist >
          
         </insert >
     </include >
-    <include id="270" addr="0x7f1a040a6170" >
-        <attributelist id="271" addr="0x7f1a040a6170" >
-            <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmcwsgi.i" id="272" addr="0x7f1a040af550" />
-            <attribute name="module" value="" id="273" addr="0x7f1a040a62d0" />
-            <attribute name="options" value="0x7f1a040a60f0" id="274" addr="0x7f1a040a60f0" />
+    <include id="270" addr="0x7fb6eb3ed170" >
+        <attributelist id="271" addr="0x7fb6eb3ed170" >
+            <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmcwsgi.i" id="272" addr="0x7fb6eb3f6550" />
+            <attribute name="module" value="" id="273" addr="0x7fb6eb3ed2d0" />
+            <attribute name="options" value="0x7fb6eb3ed0f0" id="274" addr="0x7fb6eb3ed0f0" />
         </attributelist >
 
-        <insert id="275" addr="0x7f1a040a6210" >
-            <attributelist id="276" addr="0x7f1a040a6210" >
-                <attribute name="code" value="&#10;#if defined(TARGET_WINDOWS)&#10;#  include &lt;windows.h>&#10;#endif&#10;&#10;#ifdef HAS_WEB_SERVER&#10;" id="277" addr="0x7f1a040af550" />
-                <attribute name="section" value="begin" id="278" addr="0x7f1a040af550" />
+        <insert id="275" addr="0x7fb6eb3ed210" >
+            <attributelist id="276" addr="0x7fb6eb3ed210" >
+                <attribute name="code" value="&#10;#if defined(TARGET_WINDOWS)&#10;#  include &lt;windows.h>&#10;#endif&#10;&#10;#ifdef HAS_WEB_SERVER&#10;" id="277" addr="0x7fb6eb3f6550" />
+                <attribute name="section" value="begin" id="278" addr="0x7fb6eb3f6550" />
             </attributelist >
          
         </insert >
-        <module id="279" addr="0x7f1a040a6270" >
-            <attributelist id="280" addr="0x7f1a040a6270" >
-                <attribute name="name" value="xbmcwsgi" id="281" addr="0x7f1a040af550" />
+        <module id="279" addr="0x7fb6eb3ed270" >
+            <attributelist id="280" addr="0x7fb6eb3ed270" >
+                <attribute name="name" value="xbmcwsgi" id="281" addr="0x7fb6eb3f6550" />
             </attributelist >
          
         </module >
-        <insert id="282" addr="0x7f1a040a6310" >
-            <attributelist id="283" addr="0x7f1a040a6310" >
-                <attribute name="code" value="&#10;#include &quot;interfaces/legacy/wsgi/WsgiErrorStream.h&quot;&#10;#include &quot;interfaces/legacy/wsgi/WsgiInputStream.h&quot;&#10;#include &quot;interfaces/legacy/wsgi/WsgiResponse.h&quot;&#10;#include &quot;interfaces/legacy/wsgi/WsgiResponseBody.h&quot;&#10;&#10;using namespace XBMCAddon;&#10;using namespace xbmcwsgi;&#10;&#10;#if defined(__GNUG__)&#10;#pragma GCC diagnostic ignored &quot;-Wstrict-aliasing&quot;&#10;#endif&#10;&#10;" id="284" addr="0x7f1a040af550" />
+        <insert id="282" addr="0x7fb6eb3ed310" >
+            <attributelist id="283" addr="0x7fb6eb3ed310" >
+                <attribute name="code" value="&#10;#include &quot;interfaces/legacy/wsgi/WsgiErrorStream.h&quot;&#10;#include &quot;interfaces/legacy/wsgi/WsgiInputStream.h&quot;&#10;#include &quot;interfaces/legacy/wsgi/WsgiResponse.h&quot;&#10;#include &quot;interfaces/legacy/wsgi/WsgiResponseBody.h&quot;&#10;&#10;using namespace XBMCAddon;&#10;using namespace xbmcwsgi;&#10;&#10;#if defined(__GNUG__)&#10;#pragma GCC diagnostic ignored &quot;-Wstrict-aliasing&quot;&#10;#endif&#10;&#10;" id="284" addr="0x7fb6eb3f6550" />
             </attributelist >
          
         </insert >
-        <include id="285" addr="0x7f1a040a6830" >
-            <attributelist id="286" addr="0x7f1a040a6830" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/swighelper.h" id="287" addr="0x7f1a040af550" />
+        <include id="285" addr="0x7fb6eb3ed830" >
+            <attributelist id="286" addr="0x7fb6eb3ed830" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/swighelper.h" id="287" addr="0x7fb6eb3f6550" />
             </attributelist >
          
         </include >
-        <include id="288" addr="0x7f1a040a68b0" >
-            <attributelist id="289" addr="0x7f1a040a68b0" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/AddonString.h" id="290" addr="0x7f1a040af550" />
+        <include id="288" addr="0x7fb6eb3ed8b0" >
+            <attributelist id="289" addr="0x7fb6eb3ed8b0" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/AddonString.h" id="290" addr="0x7fb6eb3f6550" />
             </attributelist >
 
-            <namespace id="291" addr="0x7f1a040a69f0" >
-                <attributelist id="292" addr="0x7f1a040a69f0" >
-                    <attribute name="sym_name" value="XBMCAddon" id="293" addr="0x7f1a040af550" />
-                    <attribute name="name" value="XBMCAddon" id="294" addr="0x7f1a040af550" />
-                    <attribute name="csym_nextSibling" value="0x7f1a040a70d0" id="295" addr="0x7f1a040a70d0" />
-                    <attribute name="sym_nextSibling" value="0x7f1a040a70d0" id="296" addr="0x7f1a040a70d0" />
-                    <typescope id="297" addr="0x7f1a040ac650" >
-                        <attributelist id="298" addr="0x7f1a040ac650" >
-                            <attribute name="name" value="XBMCAddon" id="299" addr="0x7f1a040af550" />
-                            <typetab id="300" addr="0x7f1a040ac690" >
-                                <attributelist id="301" addr="0x7f1a040ac690" >
-                                    <attribute name="String" value="std::string" id="302" addr="0x7f1a040af550" />
+            <namespace id="291" addr="0x7fb6eb3ed9f0" >
+                <attributelist id="292" addr="0x7fb6eb3ed9f0" >
+                    <attribute name="sym_name" value="XBMCAddon" id="293" addr="0x7fb6eb3f6550" />
+                    <attribute name="name" value="XBMCAddon" id="294" addr="0x7fb6eb3f6550" />
+                    <attribute name="csym_nextSibling" value="0x7fb6eb3ee0d0" id="295" addr="0x7fb6eb3ee0d0" />
+                    <attribute name="sym_nextSibling" value="0x7fb6eb3ee0d0" id="296" addr="0x7fb6eb3ee0d0" />
+                    <typescope id="297" addr="0x7fb6eb3f3650" >
+                        <attributelist id="298" addr="0x7fb6eb3f3650" >
+                            <attribute name="name" value="XBMCAddon" id="299" addr="0x7fb6eb3f6550" />
+                            <typetab id="300" addr="0x7fb6eb3f3690" >
+                                <attributelist id="301" addr="0x7fb6eb3f3690" >
+                                    <attribute name="String" value="std::string" id="302" addr="0x7fb6eb3f6550" />
                                 </attributelist >
-                                <typetabsitem id="303" addr="0x7f1a040ac870" >
-                                    <attributelist id="304" addr="0x7f1a040ac870" >
+                                <typetabsitem id="303" addr="0x7fb6eb3f3870" >
+                                    <attributelist id="304" addr="0x7fb6eb3f3870" >
                                     </attributelist >
                                 </typetabsitem >
                             </typetab >
-                            <attribute name="parent" value="0x7f1a0408fa30" id="305" addr="0x7f1a0408fa30" />
-                            <attribute name="qname" value="XBMCAddon" id="306" addr="0x7f1a040af550" />
-                            <attribute name="symtab" value="0x7f1a040a6950" id="307" addr="0x7f1a040a6950" />
+                            <attribute name="parent" value="0x7fb6eb3d6a30" id="305" addr="0x7fb6eb3d6a30" />
+                            <attribute name="qname" value="XBMCAddon" id="306" addr="0x7fb6eb3f6550" />
+                            <attribute name="symtab" value="0x7fb6eb3ed950" id="307" addr="0x7fb6eb3ed950" />
                         </attributelist >
-                        <typescopesitem id="308" addr="0x7f1a040a6910" >
-                            <attributelist id="309" addr="0x7f1a040a6910" >
+                        <typescopesitem id="308" addr="0x7fb6eb3ed910" >
+                            <attributelist id="309" addr="0x7fb6eb3ed910" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="310" addr="0x7f1a040ac690" >
-                            <attributelist id="311" addr="0x7f1a040ac690" >
-                                <attribute name="String" value="std::string" id="312" addr="0x7f1a040af550" />
+                        <typescopesitem id="310" addr="0x7fb6eb3f3690" >
+                            <attributelist id="311" addr="0x7fb6eb3f3690" >
+                                <attribute name="String" value="std::string" id="312" addr="0x7fb6eb3f6550" />
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="313" addr="0x7f1a0408fa30" >
-                            <attributelist id="314" addr="0x7f1a0408fa30" >
-                                <attribute name="name" value="" id="315" addr="0x7f1a040af550" />
-                                <typetab id="316" addr="0x7f1a0408fa90" >
-                                    <attributelist id="317" addr="0x7f1a0408fa90" >
-                                        <attribute name="HTTPPythonRequest" value="HTTPPythonRequest" id="318" addr="0x7f1a040af550" />
+                        <typescopesitem id="313" addr="0x7fb6eb3d6a30" >
+                            <attributelist id="314" addr="0x7fb6eb3d6a30" >
+                                <attribute name="name" value="" id="315" addr="0x7fb6eb3f6550" />
+                                <typetab id="316" addr="0x7fb6eb3d6a90" >
+                                    <attributelist id="317" addr="0x7fb6eb3d6a90" >
+                                        <attribute name="HTTPPythonRequest" value="HTTPPythonRequest" id="318" addr="0x7fb6eb3f6550" />
                                     </attributelist >
-                                    <typetabsitem id="319" addr="0x7f1a040ac7b0" >
-                                        <attributelist id="320" addr="0x7f1a040ac7b0" >
+                                    <typetabsitem id="319" addr="0x7fb6eb3f37b0" >
+                                        <attributelist id="320" addr="0x7fb6eb3f37b0" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="321" addr="0x7f1a040ac790" >
-                            <attributelist id="322" addr="0x7f1a040ac790" >
+                        <typescopesitem id="321" addr="0x7fb6eb3f3790" >
+                            <attributelist id="322" addr="0x7fb6eb3f3790" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="323" addr="0x7f1a040a6950" >
-                            <attributelist id="324" addr="0x7f1a040a6950" >
-                                <attribute name="name" value="XBMCAddon" id="325" addr="0x7f1a040af550" />
-                                <attribute name="csymtab" value="0x7f1a040a6990" id="326" addr="0x7f1a040a6990" />
-                                <attribute name="symtab" value="0x7f1a040a6930" id="327" addr="0x7f1a040a6930" />
+                        <typescopesitem id="323" addr="0x7fb6eb3ed950" >
+                            <attributelist id="324" addr="0x7fb6eb3ed950" >
+                                <attribute name="name" value="XBMCAddon" id="325" addr="0x7fb6eb3f6550" />
+                                <attribute name="csymtab" value="0x7fb6eb3ed990" id="326" addr="0x7fb6eb3ed990" />
+                                <attribute name="symtab" value="0x7fb6eb3ed930" id="327" addr="0x7fb6eb3ed930" />
                             </attributelist >
                         </typescopesitem >
                     </typescope >
-                    <attribute name="symtab" value="0x7f1a040a6950" id="328" addr="0x7f1a040a6950" />
-                    <attribute name="sym_symtab" value="0x7f1a0408f950" id="329" addr="0x7f1a0408f950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="330" addr="0x7f1a040af550" />
+                    <attribute name="symtab" value="0x7fb6eb3ed950" id="328" addr="0x7fb6eb3ed950" />
+                    <attribute name="sym_symtab" value="0x7fb6eb3d6950" id="329" addr="0x7fb6eb3d6950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="330" addr="0x7fb6eb3f6550" />
                 </attributelist >
 
-                <cdecl id="331" addr="0x7f1a040a6b10" >
-                    <attributelist id="332" addr="0x7f1a040a6b10" >
-                        <attribute name="sym_name" value="String" id="333" addr="0x7f1a040af550" />
-                        <attribute name="name" value="XBMCAddon::String" id="334" addr="0x7f1a040af550" />
-                        <attribute name="decl" value="" id="335" addr="0x7f1a040af550" />
-                        <attribute name="storage" value="typedef" id="336" addr="0x7f1a040af550" />
-                        <attribute name="kind" value="typedef" id="337" addr="0x7f1a040af550" />
-                        <attribute name="type" value="std::string" id="338" addr="0x7f1a040af550" />
-                        <attribute name="sym_symtab" value="0x7f1a040a6950" id="339" addr="0x7f1a040a6950" />
-                        <attribute name="sym_overname" value="__SWIG_0" id="340" addr="0x7f1a040af550" />
+                <cdecl id="331" addr="0x7fb6eb3edb10" >
+                    <attributelist id="332" addr="0x7fb6eb3edb10" >
+                        <attribute name="sym_name" value="String" id="333" addr="0x7fb6eb3f6550" />
+                        <attribute name="name" value="XBMCAddon::String" id="334" addr="0x7fb6eb3f6550" />
+                        <attribute name="decl" value="" id="335" addr="0x7fb6eb3f6550" />
+                        <attribute name="storage" value="typedef" id="336" addr="0x7fb6eb3f6550" />
+                        <attribute name="kind" value="typedef" id="337" addr="0x7fb6eb3f6550" />
+                        <attribute name="type" value="std::string" id="338" addr="0x7fb6eb3f6550" />
+                        <attribute name="sym_symtab" value="0x7fb6eb3ed950" id="339" addr="0x7fb6eb3ed950" />
+                        <attribute name="sym_overname" value="__SWIG_0" id="340" addr="0x7fb6eb3f6550" />
                     </attributelist >
                  
                 </cdecl >
-                <cdecl id="341" addr="0x7f1a040a6d10" >
-                    <attributelist id="342" addr="0x7f1a040a6d10" >
-                        <attribute name="sym_name" value="emptyString" id="343" addr="0x7f1a040af550" />
-                        <attribute name="name" value="XBMCAddon::emptyString" id="344" addr="0x7f1a040af550" />
-                        <attribute name="decl" value="" id="345" addr="0x7f1a040af550" />
-                        <attribute name="storage" value="extern" id="346" addr="0x7f1a040af550" />
-                        <attribute name="kind" value="variable" id="347" addr="0x7f1a040af550" />
-                        <attribute name="type" value="XBMCAddon::String" id="348" addr="0x7f1a040af550" />
-                        <attribute name="sym_symtab" value="0x7f1a040a6950" id="349" addr="0x7f1a040a6950" />
-                        <attribute name="sym_overname" value="__SWIG_0" id="350" addr="0x7f1a040af550" />
+                <cdecl id="341" addr="0x7fb6eb3edd10" >
+                    <attributelist id="342" addr="0x7fb6eb3edd10" >
+                        <attribute name="sym_name" value="emptyString" id="343" addr="0x7fb6eb3f6550" />
+                        <attribute name="name" value="XBMCAddon::emptyString" id="344" addr="0x7fb6eb3f6550" />
+                        <attribute name="decl" value="" id="345" addr="0x7fb6eb3f6550" />
+                        <attribute name="storage" value="extern" id="346" addr="0x7fb6eb3f6550" />
+                        <attribute name="kind" value="variable" id="347" addr="0x7fb6eb3f6550" />
+                        <attribute name="type" value="XBMCAddon::String" id="348" addr="0x7fb6eb3f6550" />
+                        <attribute name="sym_symtab" value="0x7fb6eb3ed950" id="349" addr="0x7fb6eb3ed950" />
+                        <attribute name="sym_overname" value="__SWIG_0" id="350" addr="0x7fb6eb3f6550" />
                     </attributelist >
                  
                 </cdecl >
             </namespace >
         </include >
-        <include id="351" addr="0x7f1a040a6ef0" >
-            <attributelist id="352" addr="0x7f1a040a6ef0" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/wsgi/WsgiErrorStream.h" id="353" addr="0x7f1a040af550" />
+        <include id="351" addr="0x7fb6eb3edef0" >
+            <attributelist id="352" addr="0x7fb6eb3edef0" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/wsgi/WsgiErrorStream.h" id="353" addr="0x7fb6eb3f6550" />
             </attributelist >
 
-            <classforward id="354" addr="0x7f1a040a6f90" >
-                <attributelist id="355" addr="0x7f1a040a6f90" >
-                    <attribute name="sym_name" value="HTTPPythonRequest" id="356" addr="0x7f1a040af550" />
-                    <attribute name="name" value="HTTPPythonRequest" id="357" addr="0x7f1a040af550" />
-                    <attribute name="kind" value="struct" id="358" addr="0x7f1a040af550" />
-                    <attribute name="sym_weak" value="1" id="359" addr="0x7f1a040af550" />
-                    <attribute name="sym_symtab" value="0x7f1a0408f950" id="360" addr="0x7f1a0408f950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="361" addr="0x7f1a040af550" />
+            <classforward id="354" addr="0x7fb6eb3edf90" >
+                <attributelist id="355" addr="0x7fb6eb3edf90" >
+                    <attribute name="sym_name" value="HTTPPythonRequest" id="356" addr="0x7fb6eb3f6550" />
+                    <attribute name="name" value="HTTPPythonRequest" id="357" addr="0x7fb6eb3f6550" />
+                    <attribute name="kind" value="struct" id="358" addr="0x7fb6eb3f6550" />
+                    <attribute name="sym_weak" value="1" id="359" addr="0x7fb6eb3f6550" />
+                    <attribute name="sym_symtab" value="0x7fb6eb3d6950" id="360" addr="0x7fb6eb3d6950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="361" addr="0x7fb6eb3f6550" />
                 </attributelist >
              
             </classforward >
-            <namespace id="362" addr="0x7f1a040a70d0" >
-                <attributelist id="363" addr="0x7f1a040a70d0" >
-                    <attribute name="sym_name" value="XBMCAddon" id="364" addr="0x7f1a040af550" />
-                    <attribute name="name" value="XBMCAddon" id="365" addr="0x7f1a040af550" />
-                    <attribute name="sym_previousSibling" value="0x7f1a040a69f0" id="366" addr="0x7f1a040a69f0" />
-                    <attribute name="csym_nextSibling" value="0x7f1a040a8590" id="367" addr="0x7f1a040a8590" />
-                    <attribute name="sym_nextSibling" value="0x7f1a040a8590" id="368" addr="0x7f1a040a8590" />
-                    <typescope id="369" addr="0x7f1a040ac650" >
-                        <attributelist id="370" addr="0x7f1a040ac650" >
-                            <attribute name="name" value="XBMCAddon" id="371" addr="0x7f1a040af550" />
-                            <typetab id="372" addr="0x7f1a040ac690" >
-                                <attributelist id="373" addr="0x7f1a040ac690" >
-                                    <attribute name="String" value="std::string" id="374" addr="0x7f1a040af550" />
+            <namespace id="362" addr="0x7fb6eb3ee0d0" >
+                <attributelist id="363" addr="0x7fb6eb3ee0d0" >
+                    <attribute name="sym_name" value="XBMCAddon" id="364" addr="0x7fb6eb3f6550" />
+                    <attribute name="name" value="XBMCAddon" id="365" addr="0x7fb6eb3f6550" />
+                    <attribute name="sym_previousSibling" value="0x7fb6eb3ed9f0" id="366" addr="0x7fb6eb3ed9f0" />
+                    <attribute name="csym_nextSibling" value="0x7fb6eb3ef590" id="367" addr="0x7fb6eb3ef590" />
+                    <attribute name="sym_nextSibling" value="0x7fb6eb3ef590" id="368" addr="0x7fb6eb3ef590" />
+                    <typescope id="369" addr="0x7fb6eb3f3650" >
+                        <attributelist id="370" addr="0x7fb6eb3f3650" >
+                            <attribute name="name" value="XBMCAddon" id="371" addr="0x7fb6eb3f6550" />
+                            <typetab id="372" addr="0x7fb6eb3f3690" >
+                                <attributelist id="373" addr="0x7fb6eb3f3690" >
+                                    <attribute name="String" value="std::string" id="374" addr="0x7fb6eb3f6550" />
                                 </attributelist >
-                                <typetabsitem id="375" addr="0x7f1a040ac870" >
-                                    <attributelist id="376" addr="0x7f1a040ac870" >
+                                <typetabsitem id="375" addr="0x7fb6eb3f3870" >
+                                    <attributelist id="376" addr="0x7fb6eb3f3870" >
                                     </attributelist >
                                 </typetabsitem >
                             </typetab >
-                            <attribute name="parent" value="0x7f1a0408fa30" id="377" addr="0x7f1a0408fa30" />
-                            <attribute name="qname" value="XBMCAddon" id="378" addr="0x7f1a040af550" />
-                            <attribute name="symtab" value="0x7f1a040a6950" id="379" addr="0x7f1a040a6950" />
+                            <attribute name="parent" value="0x7fb6eb3d6a30" id="377" addr="0x7fb6eb3d6a30" />
+                            <attribute name="qname" value="XBMCAddon" id="378" addr="0x7fb6eb3f6550" />
+                            <attribute name="symtab" value="0x7fb6eb3ed950" id="379" addr="0x7fb6eb3ed950" />
                         </attributelist >
-                        <typescopesitem id="380" addr="0x7f1a040a6910" >
-                            <attributelist id="381" addr="0x7f1a040a6910" >
+                        <typescopesitem id="380" addr="0x7fb6eb3ed910" >
+                            <attributelist id="381" addr="0x7fb6eb3ed910" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="382" addr="0x7f1a040ac690" >
-                            <attributelist id="383" addr="0x7f1a040ac690" >
-                                <attribute name="String" value="std::string" id="384" addr="0x7f1a040af550" />
+                        <typescopesitem id="382" addr="0x7fb6eb3f3690" >
+                            <attributelist id="383" addr="0x7fb6eb3f3690" >
+                                <attribute name="String" value="std::string" id="384" addr="0x7fb6eb3f6550" />
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="385" addr="0x7f1a0408fa30" >
-                            <attributelist id="386" addr="0x7f1a0408fa30" >
-                                <attribute name="name" value="" id="387" addr="0x7f1a040af550" />
-                                <typetab id="388" addr="0x7f1a0408fa90" >
-                                    <attributelist id="389" addr="0x7f1a0408fa90" >
-                                        <attribute name="HTTPPythonRequest" value="HTTPPythonRequest" id="390" addr="0x7f1a040af550" />
+                        <typescopesitem id="385" addr="0x7fb6eb3d6a30" >
+                            <attributelist id="386" addr="0x7fb6eb3d6a30" >
+                                <attribute name="name" value="" id="387" addr="0x7fb6eb3f6550" />
+                                <typetab id="388" addr="0x7fb6eb3d6a90" >
+                                    <attributelist id="389" addr="0x7fb6eb3d6a90" >
+                                        <attribute name="HTTPPythonRequest" value="HTTPPythonRequest" id="390" addr="0x7fb6eb3f6550" />
                                     </attributelist >
-                                    <typetabsitem id="391" addr="0x7f1a040ac7b0" >
-                                        <attributelist id="392" addr="0x7f1a040ac7b0" >
+                                    <typetabsitem id="391" addr="0x7fb6eb3f37b0" >
+                                        <attributelist id="392" addr="0x7fb6eb3f37b0" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="393" addr="0x7f1a040ac790" >
-                            <attributelist id="394" addr="0x7f1a040ac790" >
+                        <typescopesitem id="393" addr="0x7fb6eb3f3790" >
+                            <attributelist id="394" addr="0x7fb6eb3f3790" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="395" addr="0x7f1a040a6950" >
-                            <attributelist id="396" addr="0x7f1a040a6950" >
-                                <attribute name="name" value="XBMCAddon" id="397" addr="0x7f1a040af550" />
-                                <attribute name="csymtab" value="0x7f1a040a6990" id="398" addr="0x7f1a040a6990" />
-                                <attribute name="symtab" value="0x7f1a040a6930" id="399" addr="0x7f1a040a6930" />
+                        <typescopesitem id="395" addr="0x7fb6eb3ed950" >
+                            <attributelist id="396" addr="0x7fb6eb3ed950" >
+                                <attribute name="name" value="XBMCAddon" id="397" addr="0x7fb6eb3f6550" />
+                                <attribute name="csymtab" value="0x7fb6eb3ed990" id="398" addr="0x7fb6eb3ed990" />
+                                <attribute name="symtab" value="0x7fb6eb3ed930" id="399" addr="0x7fb6eb3ed930" />
                             </attributelist >
                         </typescopesitem >
                     </typescope >
-                    <attribute name="symtab" value="0x7f1a040a6950" id="400" addr="0x7f1a040a6950" />
-                    <attribute name="sym_symtab" value="0x7f1a0408f950" id="401" addr="0x7f1a0408f950" />
+                    <attribute name="symtab" value="0x7fb6eb3ed950" id="400" addr="0x7fb6eb3ed950" />
+                    <attribute name="sym_symtab" value="0x7fb6eb3d6950" id="401" addr="0x7fb6eb3d6950" />
                 </attributelist >
 
-                <namespace id="402" addr="0x7f1a040a71f0" >
-                    <attributelist id="403" addr="0x7f1a040a71f0" >
-                        <attribute name="sym_name" value="xbmcwsgi" id="404" addr="0x7f1a040af550" />
-                        <attribute name="name" value="xbmcwsgi" id="405" addr="0x7f1a040af550" />
-                        <attribute name="csym_nextSibling" value="0x7f1a040a8610" id="406" addr="0x7f1a040a8610" />
-                        <attribute name="sym_nextSibling" value="0x7f1a040a8610" id="407" addr="0x7f1a040a8610" />
-                        <typescope id="408" addr="0x7f1a040acab0" >
-                            <attributelist id="409" addr="0x7f1a040acab0" >
-                                <attribute name="name" value="xbmcwsgi" id="410" addr="0x7f1a040af550" />
-                                <typetab id="411" addr="0x7f1a040acad0" >
-                                    <attributelist id="412" addr="0x7f1a040acad0" >
-                                        <attribute name="WsgiInputStreamIterator" value="WsgiInputStreamIterator" id="413" addr="0x7f1a040af550" />
-                                        <attribute name="WsgiHttpHeader" value="Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>" id="414" addr="0x7f1a040af550" />
-                                        <attribute name="WsgiErrorStream" value="WsgiErrorStream" id="415" addr="0x7f1a040af550" />
-                                        <attribute name="WsgiInputStream" value="WsgiInputStream" id="416" addr="0x7f1a040af550" />
-                                        <attribute name="WsgiResponse" value="WsgiResponse" id="417" addr="0x7f1a040af550" />
-                                        <attribute name="WsgiResponseBody" value="WsgiResponseBody" id="418" addr="0x7f1a040af550" />
+                <namespace id="402" addr="0x7fb6eb3ee1f0" >
+                    <attributelist id="403" addr="0x7fb6eb3ee1f0" >
+                        <attribute name="sym_name" value="xbmcwsgi" id="404" addr="0x7fb6eb3f6550" />
+                        <attribute name="name" value="xbmcwsgi" id="405" addr="0x7fb6eb3f6550" />
+                        <attribute name="csym_nextSibling" value="0x7fb6eb3ef610" id="406" addr="0x7fb6eb3ef610" />
+                        <attribute name="sym_nextSibling" value="0x7fb6eb3ef610" id="407" addr="0x7fb6eb3ef610" />
+                        <typescope id="408" addr="0x7fb6eb3f3ab0" >
+                            <attributelist id="409" addr="0x7fb6eb3f3ab0" >
+                                <attribute name="name" value="xbmcwsgi" id="410" addr="0x7fb6eb3f6550" />
+                                <typetab id="411" addr="0x7fb6eb3f3ad0" >
+                                    <attributelist id="412" addr="0x7fb6eb3f3ad0" >
+                                        <attribute name="WsgiInputStreamIterator" value="WsgiInputStreamIterator" id="413" addr="0x7fb6eb3f6550" />
+                                        <attribute name="WsgiHttpHeader" value="Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>" id="414" addr="0x7fb6eb3f6550" />
+                                        <attribute name="WsgiErrorStream" value="WsgiErrorStream" id="415" addr="0x7fb6eb3f6550" />
+                                        <attribute name="WsgiInputStream" value="WsgiInputStream" id="416" addr="0x7fb6eb3f6550" />
+                                        <attribute name="WsgiResponse" value="WsgiResponse" id="417" addr="0x7fb6eb3f6550" />
+                                        <attribute name="WsgiResponseBody" value="WsgiResponseBody" id="418" addr="0x7fb6eb3f6550" />
                                     </attributelist >
-                                    <typetabsitem id="419" addr="0x7f1a040ad450" >
-                                        <attributelist id="420" addr="0x7f1a040ad450" >
+                                    <typetabsitem id="419" addr="0x7fb6eb3f4450" >
+                                        <attributelist id="420" addr="0x7fb6eb3f4450" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="421" addr="0x7f1a040adff0" >
-                                        <attributelist id="422" addr="0x7f1a040adff0" >
+                                    <typetabsitem id="421" addr="0x7fb6eb3f4ff0" >
+                                        <attributelist id="422" addr="0x7fb6eb3f4ff0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="423" addr="0x7f1a040acbb0" >
-                                        <attributelist id="424" addr="0x7f1a040acbb0" >
+                                    <typetabsitem id="423" addr="0x7fb6eb3f3bb0" >
+                                        <attributelist id="424" addr="0x7fb6eb3f3bb0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="425" addr="0x7f1a040ad830" >
-                                        <attributelist id="426" addr="0x7f1a040ad830" >
+                                    <typetabsitem id="425" addr="0x7fb6eb3f4830" >
+                                        <attributelist id="426" addr="0x7fb6eb3f4830" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="427" addr="0x7f1a040ae250" >
-                                        <attributelist id="428" addr="0x7f1a040ae250" >
+                                    <typetabsitem id="427" addr="0x7fb6eb3f5250" >
+                                        <attributelist id="428" addr="0x7fb6eb3f5250" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="429" addr="0x7f1a040aebb0" >
-                                        <attributelist id="430" addr="0x7f1a040aebb0" >
+                                    <typetabsitem id="429" addr="0x7fb6eb3f5bb0" >
+                                        <attributelist id="430" addr="0x7fb6eb3f5bb0" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
-                                <attribute name="parent" value="0x7f1a040ac650" id="431" addr="0x7f1a040ac650" />
-                                <attribute name="qname" value="XBMCAddon::xbmcwsgi" id="432" addr="0x7f1a040af550" />
-                                <attribute name="symtab" value="0x7f1a040a7170" id="433" addr="0x7f1a040a7170" />
+                                <attribute name="parent" value="0x7fb6eb3f3650" id="431" addr="0x7fb6eb3f3650" />
+                                <attribute name="qname" value="XBMCAddon::xbmcwsgi" id="432" addr="0x7fb6eb3f6550" />
+                                <attribute name="symtab" value="0x7fb6eb3ee170" id="433" addr="0x7fb6eb3ee170" />
                             </attributelist >
-                            <typescopesitem id="434" addr="0x7f1a040a7130" >
-                                <attributelist id="435" addr="0x7f1a040a7130" >
+                            <typescopesitem id="434" addr="0x7fb6eb3ee130" >
+                                <attributelist id="435" addr="0x7fb6eb3ee130" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="436" addr="0x7f1a040acad0" >
-                                <attributelist id="437" addr="0x7f1a040acad0" >
-                                    <attribute name="WsgiInputStreamIterator" value="WsgiInputStreamIterator" id="438" addr="0x7f1a040af550" />
-                                    <attribute name="WsgiHttpHeader" value="Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>" id="439" addr="0x7f1a040af550" />
-                                    <attribute name="WsgiErrorStream" value="WsgiErrorStream" id="440" addr="0x7f1a040af550" />
-                                    <attribute name="WsgiInputStream" value="WsgiInputStream" id="441" addr="0x7f1a040af550" />
-                                    <attribute name="WsgiResponse" value="WsgiResponse" id="442" addr="0x7f1a040af550" />
-                                    <attribute name="WsgiResponseBody" value="WsgiResponseBody" id="443" addr="0x7f1a040af550" />
+                            <typescopesitem id="436" addr="0x7fb6eb3f3ad0" >
+                                <attributelist id="437" addr="0x7fb6eb3f3ad0" >
+                                    <attribute name="WsgiInputStreamIterator" value="WsgiInputStreamIterator" id="438" addr="0x7fb6eb3f6550" />
+                                    <attribute name="WsgiHttpHeader" value="Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>" id="439" addr="0x7fb6eb3f6550" />
+                                    <attribute name="WsgiErrorStream" value="WsgiErrorStream" id="440" addr="0x7fb6eb3f6550" />
+                                    <attribute name="WsgiInputStream" value="WsgiInputStream" id="441" addr="0x7fb6eb3f6550" />
+                                    <attribute name="WsgiResponse" value="WsgiResponse" id="442" addr="0x7fb6eb3f6550" />
+                                    <attribute name="WsgiResponseBody" value="WsgiResponseBody" id="443" addr="0x7fb6eb3f6550" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="444" addr="0x7f1a040ac650" >
-                                <attributelist id="445" addr="0x7f1a040ac650" >
-                                    <attribute name="name" value="XBMCAddon" id="446" addr="0x7f1a040af550" />
-                                    <typetab id="447" addr="0x7f1a040ac690" >
-                                        <attributelist id="448" addr="0x7f1a040ac690" >
-                                            <attribute name="String" value="std::string" id="449" addr="0x7f1a040af550" />
+                            <typescopesitem id="444" addr="0x7fb6eb3f3650" >
+                                <attributelist id="445" addr="0x7fb6eb3f3650" >
+                                    <attribute name="name" value="XBMCAddon" id="446" addr="0x7fb6eb3f6550" />
+                                    <typetab id="447" addr="0x7fb6eb3f3690" >
+                                        <attributelist id="448" addr="0x7fb6eb3f3690" >
+                                            <attribute name="String" value="std::string" id="449" addr="0x7fb6eb3f6550" />
                                         </attributelist >
-                                        <typetabsitem id="450" addr="0x7f1a040ac870" >
-                                            <attributelist id="451" addr="0x7f1a040ac870" >
+                                        <typetabsitem id="450" addr="0x7fb6eb3f3870" >
+                                            <attributelist id="451" addr="0x7fb6eb3f3870" >
                                             </attributelist >
                                         </typetabsitem >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f1a0408fa30" id="452" addr="0x7f1a0408fa30" />
-                                    <attribute name="qname" value="XBMCAddon" id="453" addr="0x7f1a040af550" />
-                                    <attribute name="symtab" value="0x7f1a040a6950" id="454" addr="0x7f1a040a6950" />
+                                    <attribute name="parent" value="0x7fb6eb3d6a30" id="452" addr="0x7fb6eb3d6a30" />
+                                    <attribute name="qname" value="XBMCAddon" id="453" addr="0x7fb6eb3f6550" />
+                                    <attribute name="symtab" value="0x7fb6eb3ed950" id="454" addr="0x7fb6eb3ed950" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="455" addr="0x7f1a040acaf0" >
-                                <attributelist id="456" addr="0x7f1a040acaf0" >
+                            <typescopesitem id="455" addr="0x7fb6eb3f3af0" >
+                                <attributelist id="456" addr="0x7fb6eb3f3af0" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="457" addr="0x7f1a040a7170" >
-                                <attributelist id="458" addr="0x7f1a040a7170" >
-                                    <attribute name="name" value="xbmcwsgi" id="459" addr="0x7f1a040af550" />
-                                    <attribute name="csymtab" value="0x7f1a040a71b0" id="460" addr="0x7f1a040a71b0" />
-                                    <attribute name="symtab" value="0x7f1a040a7150" id="461" addr="0x7f1a040a7150" />
+                            <typescopesitem id="457" addr="0x7fb6eb3ee170" >
+                                <attributelist id="458" addr="0x7fb6eb3ee170" >
+                                    <attribute name="name" value="xbmcwsgi" id="459" addr="0x7fb6eb3f6550" />
+                                    <attribute name="csymtab" value="0x7fb6eb3ee1b0" id="460" addr="0x7fb6eb3ee1b0" />
+                                    <attribute name="symtab" value="0x7fb6eb3ee150" id="461" addr="0x7fb6eb3ee150" />
                                 </attributelist >
                             </typescopesitem >
                         </typescope >
-                        <attribute name="symtab" value="0x7f1a040a7170" id="462" addr="0x7f1a040a7170" />
-                        <attribute name="sym_symtab" value="0x7f1a040a6950" id="463" addr="0x7f1a040a6950" />
-                        <attribute name="sym_overname" value="__SWIG_0" id="464" addr="0x7f1a040af550" />
+                        <attribute name="symtab" value="0x7fb6eb3ee170" id="462" addr="0x7fb6eb3ee170" />
+                        <attribute name="sym_symtab" value="0x7fb6eb3ed950" id="463" addr="0x7fb6eb3ed950" />
+                        <attribute name="sym_overname" value="__SWIG_0" id="464" addr="0x7fb6eb3f6550" />
                     </attributelist >
 
-                    <class id="465" addr="0x7f1a040a73f0" >
-                        <attributelist id="466" addr="0x7f1a040a73f0" >
-                            <attribute name="name" value="XBMCAddon::xbmcwsgi::WsgiErrorStream" id="467" addr="0x7f1a040af550" />
-                            <attribute name="sym_symtab" value="0x7f1a040a7170" id="468" addr="0x7f1a040a7170" />
-                            <attribute name="symtab" value="0x7f1a040a7570" id="469" addr="0x7f1a040a7570" />
-                            <attribute name="allows_typedef" value="1" id="470" addr="0x7f1a040af550" />
-                            <attribute name="typepass_visit" value="1" id="471" addr="0x7f1a040af550" />
-                            <attribute name="allocate_visit" value="1" id="472" addr="0x7f1a040af550" />
-                            <attribute name="kind" value="class" id="473" addr="0x7f1a040af550" />
-                            <attribute name="sym_name" value="WsgiErrorStream" id="474" addr="0x7f1a040af550" />
-                            <attribute name="allocate_default_constructor" value="1" id="475" addr="0x7f1a040af550" />
-                            <attribute name="allocate_has_constructor" value="1" id="476" addr="0x7f1a040af550" />
-                            <attribute name="allocate_public_constructor" value="1" id="477" addr="0x7f1a040af550" />
-                            <attribute name="allocate_has_destructor" value="1" id="478" addr="0x7f1a040af550" />
-                            <attribute name="allocate_default_destructor" value="1" id="479" addr="0x7f1a040af550" />
-                            <attribute name="allocate_copy_constructor" value="1" id="480" addr="0x7f1a040af550" />
-                            <attribute name="privatebaselist" value="0x7f1a040a7370" id="481" addr="0x7f1a040a7370" />
-                            <attribute name="protectedbaselist" value="0x7f1a040a7350" id="482" addr="0x7f1a040a7350" />
-                            <baselist id="483" addr="0x7f1a040a7330" >
-                                <base name="AddonClass" id="484" addr="0x7f1a040a7290" />
+                    <class id="465" addr="0x7fb6eb3ee3f0" >
+                        <attributelist id="466" addr="0x7fb6eb3ee3f0" >
+                            <attribute name="name" value="XBMCAddon::xbmcwsgi::WsgiErrorStream" id="467" addr="0x7fb6eb3f6550" />
+                            <attribute name="sym_symtab" value="0x7fb6eb3ee170" id="468" addr="0x7fb6eb3ee170" />
+                            <attribute name="symtab" value="0x7fb6eb3ee570" id="469" addr="0x7fb6eb3ee570" />
+                            <attribute name="allows_typedef" value="1" id="470" addr="0x7fb6eb3f6550" />
+                            <attribute name="typepass_visit" value="1" id="471" addr="0x7fb6eb3f6550" />
+                            <attribute name="allocate_visit" value="1" id="472" addr="0x7fb6eb3f6550" />
+                            <attribute name="kind" value="class" id="473" addr="0x7fb6eb3f6550" />
+                            <attribute name="sym_name" value="WsgiErrorStream" id="474" addr="0x7fb6eb3f6550" />
+                            <attribute name="allocate_default_constructor" value="1" id="475" addr="0x7fb6eb3f6550" />
+                            <attribute name="allocate_has_constructor" value="1" id="476" addr="0x7fb6eb3f6550" />
+                            <attribute name="allocate_public_constructor" value="1" id="477" addr="0x7fb6eb3f6550" />
+                            <attribute name="allocate_has_destructor" value="1" id="478" addr="0x7fb6eb3f6550" />
+                            <attribute name="allocate_default_destructor" value="1" id="479" addr="0x7fb6eb3f6550" />
+                            <attribute name="allocate_copy_constructor" value="1" id="480" addr="0x7fb6eb3f6550" />
+                            <attribute name="privatebaselist" value="0x7fb6eb3ee370" id="481" addr="0x7fb6eb3ee370" />
+                            <attribute name="protectedbaselist" value="0x7fb6eb3ee350" id="482" addr="0x7fb6eb3ee350" />
+                            <baselist id="483" addr="0x7fb6eb3ee330" >
+                                <base name="AddonClass" id="484" addr="0x7fb6eb3ee290" />
                             </baselist >
-                            <attribute name="module" value="xbmcwsgi" id="485" addr="0x7f1a040a6270" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="486" addr="0x7f1a040af550" />
-                            <typescope id="487" addr="0x7f1a040accb0" >
-                                <attributelist id="488" addr="0x7f1a040accb0" >
-                                    <attribute name="name" value="WsgiErrorStream" id="489" addr="0x7f1a040af550" />
-                                    <typetab id="490" addr="0x7f1a040accd0" >
-                                        <attributelist id="491" addr="0x7f1a040accd0" >
+                            <attribute name="module" value="xbmcwsgi" id="485" addr="0x7fb6eb3ed270" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="486" addr="0x7fb6eb3f6550" />
+                            <typescope id="487" addr="0x7fb6eb3f3cb0" >
+                                <attributelist id="488" addr="0x7fb6eb3f3cb0" >
+                                    <attribute name="name" value="WsgiErrorStream" id="489" addr="0x7fb6eb3f6550" />
+                                    <typetab id="490" addr="0x7fb6eb3f3cd0" >
+                                        <attributelist id="491" addr="0x7fb6eb3f3cd0" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f1a040acab0" id="492" addr="0x7f1a040acab0" />
-                                    <attribute name="qname" value="XBMCAddon::xbmcwsgi::WsgiErrorStream" id="493" addr="0x7f1a040af550" />
-                                    <attribute name="symtab" value="0x7f1a040a7570" id="494" addr="0x7f1a040a7570" />
+                                    <attribute name="parent" value="0x7fb6eb3f3ab0" id="492" addr="0x7fb6eb3f3ab0" />
+                                    <attribute name="qname" value="XBMCAddon::xbmcwsgi::WsgiErrorStream" id="493" addr="0x7fb6eb3f6550" />
+                                    <attribute name="symtab" value="0x7fb6eb3ee570" id="494" addr="0x7fb6eb3ee570" />
                                 </attributelist >
-                                <typescopesitem id="495" addr="0x7f1a040acc10" >
-                                    <attributelist id="496" addr="0x7f1a040acc10" >
+                                <typescopesitem id="495" addr="0x7fb6eb3f3c10" >
+                                    <attributelist id="496" addr="0x7fb6eb3f3c10" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="497" addr="0x7f1a040accd0" >
-                                    <attributelist id="498" addr="0x7f1a040accd0" >
+                                <typescopesitem id="497" addr="0x7fb6eb3f3cd0" >
+                                    <attributelist id="498" addr="0x7fb6eb3f3cd0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="499" addr="0x7f1a040acab0" >
-                                    <attributelist id="500" addr="0x7f1a040acab0" >
-                                        <attribute name="name" value="xbmcwsgi" id="501" addr="0x7f1a040af550" />
-                                        <typetab id="502" addr="0x7f1a040acad0" >
-                                            <attributelist id="503" addr="0x7f1a040acad0" >
-                                                <attribute name="WsgiInputStreamIterator" value="WsgiInputStreamIterator" id="504" addr="0x7f1a040af550" />
-                                                <attribute name="WsgiHttpHeader" value="Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>" id="505" addr="0x7f1a040af550" />
-                                                <attribute name="WsgiErrorStream" value="WsgiErrorStream" id="506" addr="0x7f1a040af550" />
-                                                <attribute name="WsgiInputStream" value="WsgiInputStream" id="507" addr="0x7f1a040af550" />
-                                                <attribute name="WsgiResponse" value="WsgiResponse" id="508" addr="0x7f1a040af550" />
-                                                <attribute name="WsgiResponseBody" value="WsgiResponseBody" id="509" addr="0x7f1a040af550" />
+                                <typescopesitem id="499" addr="0x7fb6eb3f3ab0" >
+                                    <attributelist id="500" addr="0x7fb6eb3f3ab0" >
+                                        <attribute name="name" value="xbmcwsgi" id="501" addr="0x7fb6eb3f6550" />
+                                        <typetab id="502" addr="0x7fb6eb3f3ad0" >
+                                            <attributelist id="503" addr="0x7fb6eb3f3ad0" >
+                                                <attribute name="WsgiInputStreamIterator" value="WsgiInputStreamIterator" id="504" addr="0x7fb6eb3f6550" />
+                                                <attribute name="WsgiHttpHeader" value="Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>" id="505" addr="0x7fb6eb3f6550" />
+                                                <attribute name="WsgiErrorStream" value="WsgiErrorStream" id="506" addr="0x7fb6eb3f6550" />
+                                                <attribute name="WsgiInputStream" value="WsgiInputStream" id="507" addr="0x7fb6eb3f6550" />
+                                                <attribute name="WsgiResponse" value="WsgiResponse" id="508" addr="0x7fb6eb3f6550" />
+                                                <attribute name="WsgiResponseBody" value="WsgiResponseBody" id="509" addr="0x7fb6eb3f6550" />
                                             </attributelist >
-                                            <typetabsitem id="510" addr="0x7f1a040ad450" >
-                                                <attributelist id="511" addr="0x7f1a040ad450" >
+                                            <typetabsitem id="510" addr="0x7fb6eb3f4450" >
+                                                <attributelist id="511" addr="0x7fb6eb3f4450" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="512" addr="0x7f1a040adff0" >
-                                                <attributelist id="513" addr="0x7f1a040adff0" >
+                                            <typetabsitem id="512" addr="0x7fb6eb3f4ff0" >
+                                                <attributelist id="513" addr="0x7fb6eb3f4ff0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="514" addr="0x7f1a040acbb0" >
-                                                <attributelist id="515" addr="0x7f1a040acbb0" >
+                                            <typetabsitem id="514" addr="0x7fb6eb3f3bb0" >
+                                                <attributelist id="515" addr="0x7fb6eb3f3bb0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="516" addr="0x7f1a040ad830" >
-                                                <attributelist id="517" addr="0x7f1a040ad830" >
+                                            <typetabsitem id="516" addr="0x7fb6eb3f4830" >
+                                                <attributelist id="517" addr="0x7fb6eb3f4830" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="518" addr="0x7f1a040ae250" >
-                                                <attributelist id="519" addr="0x7f1a040ae250" >
+                                            <typetabsitem id="518" addr="0x7fb6eb3f5250" >
+                                                <attributelist id="519" addr="0x7fb6eb3f5250" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="520" addr="0x7f1a040aebb0" >
-                                                <attributelist id="521" addr="0x7f1a040aebb0" >
+                                            <typetabsitem id="520" addr="0x7fb6eb3f5bb0" >
+                                                <attributelist id="521" addr="0x7fb6eb3f5bb0" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7f1a040ac650" id="522" addr="0x7f1a040ac650" />
-                                        <attribute name="qname" value="XBMCAddon::xbmcwsgi" id="523" addr="0x7f1a040af550" />
-                                        <attribute name="symtab" value="0x7f1a040a7170" id="524" addr="0x7f1a040a7170" />
+                                        <attribute name="parent" value="0x7fb6eb3f3650" id="522" addr="0x7fb6eb3f3650" />
+                                        <attribute name="qname" value="XBMCAddon::xbmcwsgi" id="523" addr="0x7fb6eb3f6550" />
+                                        <attribute name="symtab" value="0x7fb6eb3ee170" id="524" addr="0x7fb6eb3ee170" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="525" addr="0x7f1a040accf0" >
-                                    <attributelist id="526" addr="0x7f1a040accf0" >
+                                <typescopesitem id="525" addr="0x7fb6eb3f3cf0" >
+                                    <attributelist id="526" addr="0x7fb6eb3f3cf0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="527" addr="0x7f1a040a7570" >
-                                    <attributelist id="528" addr="0x7f1a040a7570" >
-                                        <attribute name="name" value="WsgiErrorStream" id="529" addr="0x7f1a040af550" />
-                                        <attribute name="csymtab" value="0x7f1a040a75d0" id="530" addr="0x7f1a040a75d0" />
-                                        <attribute name="symtab" value="0x7f1a040a7550" id="531" addr="0x7f1a040a7550" />
+                                <typescopesitem id="527" addr="0x7fb6eb3ee570" >
+                                    <attributelist id="528" addr="0x7fb6eb3ee570" >
+                                        <attribute name="name" value="WsgiErrorStream" id="529" addr="0x7fb6eb3f6550" />
+                                        <attribute name="csymtab" value="0x7fb6eb3ee5d0" id="530" addr="0x7fb6eb3ee5d0" />
+                                        <attribute name="symtab" value="0x7fb6eb3ee550" id="531" addr="0x7fb6eb3ee550" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <access id="532" addr="0x7f1a040a7510" >
-                            <attributelist id="533" addr="0x7f1a040a7510" >
-                                <attribute name="kind" value="public" id="534" addr="0x7f1a040af550" />
+                        <access id="532" addr="0x7fb6eb3ee510" >
+                            <attributelist id="533" addr="0x7fb6eb3ee510" >
+                                <attribute name="kind" value="public" id="534" addr="0x7fb6eb3f6550" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="535" addr="0x7f1a040a76f0" >
-                            <attributelist id="536" addr="0x7f1a040a76f0" >
-                                <attribute name="ismember" value="1" id="537" addr="0x7f1a040af550" />
-                                <attribute name="sym_name" value="WsgiErrorStream" id="538" addr="0x7f1a040af550" />
-                                <attribute name="name" value="WsgiErrorStream" id="539" addr="0x7f1a040af550" />
-                                <attribute name="decl" value="f()." id="540" addr="0x7f1a040af550" />
-                                <attribute name="access" value="public" id="541" addr="0x7f1a040af550" />
-                                <attribute name="feature_new" value="1" id="542" addr="0x7f1a040af550" />
-                                <attribute name="sym_symtab" value="0x7f1a040a7570" id="543" addr="0x7f1a040a7570" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="544" addr="0x7f1a040af550" />
+                        <constructor id="535" addr="0x7fb6eb3ee6f0" >
+                            <attributelist id="536" addr="0x7fb6eb3ee6f0" >
+                                <attribute name="ismember" value="1" id="537" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_name" value="WsgiErrorStream" id="538" addr="0x7fb6eb3f6550" />
+                                <attribute name="name" value="WsgiErrorStream" id="539" addr="0x7fb6eb3f6550" />
+                                <attribute name="decl" value="f()." id="540" addr="0x7fb6eb3f6550" />
+                                <attribute name="access" value="public" id="541" addr="0x7fb6eb3f6550" />
+                                <attribute name="feature_new" value="1" id="542" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_symtab" value="0x7fb6eb3ee570" id="543" addr="0x7fb6eb3ee570" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="544" addr="0x7fb6eb3f6550" />
                             </attributelist >
                          
                         </constructor >
-                        <destructor id="545" addr="0x7f1a040a78f0" >
-                            <attributelist id="546" addr="0x7f1a040a78f0" >
-                                <attribute name="ismember" value="1" id="547" addr="0x7f1a040af550" />
-                                <attribute name="sym_name" value="~WsgiErrorStream" id="548" addr="0x7f1a040af550" />
-                                <attribute name="name" value="~WsgiErrorStream" id="549" addr="0x7f1a040af550" />
-                                <attribute name="decl" value="f()." id="550" addr="0x7f1a040af550" />
-                                <attribute name="access" value="public" id="551" addr="0x7f1a040af550" />
-                                <attribute name="sym_symtab" value="0x7f1a040a7570" id="552" addr="0x7f1a040a7570" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="553" addr="0x7f1a040af550" />
+                        <destructor id="545" addr="0x7fb6eb3ee8f0" >
+                            <attributelist id="546" addr="0x7fb6eb3ee8f0" >
+                                <attribute name="ismember" value="1" id="547" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_name" value="~WsgiErrorStream" id="548" addr="0x7fb6eb3f6550" />
+                                <attribute name="name" value="~WsgiErrorStream" id="549" addr="0x7fb6eb3f6550" />
+                                <attribute name="decl" value="f()." id="550" addr="0x7fb6eb3f6550" />
+                                <attribute name="access" value="public" id="551" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_symtab" value="0x7fb6eb3ee570" id="552" addr="0x7fb6eb3ee570" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="553" addr="0x7fb6eb3f6550" />
                             </attributelist >
                          
                         </destructor >
-                        <cdecl id="554" addr="0x7f1a040a7a70" >
-                            <attributelist id="555" addr="0x7f1a040a7a70" >
-                                <attribute name="name" value="flush" id="556" addr="0x7f1a040af550" />
-                                <attribute name="ismember" value="1" id="557" addr="0x7f1a040af550" />
-                                <attribute name="sym_symtab" value="0x7f1a040a7570" id="558" addr="0x7f1a040a7570" />
-                                <attribute name="kind" value="function" id="559" addr="0x7f1a040af550" />
-                                <attribute name="sym_name" value="flush" id="560" addr="0x7f1a040af550" />
-                                <attribute name="decl" value="f()." id="561" addr="0x7f1a040af550" />
-                                <attribute name="access" value="public" id="562" addr="0x7f1a040af550" />
-                                <attribute name="type" value="void" id="563" addr="0x7f1a040af550" />
-                                <attribute name="code" value="{ }" id="564" addr="0x7f1a040af550" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="565" addr="0x7f1a040af550" />
+                        <cdecl id="554" addr="0x7fb6eb3eea70" >
+                            <attributelist id="555" addr="0x7fb6eb3eea70" >
+                                <attribute name="name" value="flush" id="556" addr="0x7fb6eb3f6550" />
+                                <attribute name="ismember" value="1" id="557" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_symtab" value="0x7fb6eb3ee570" id="558" addr="0x7fb6eb3ee570" />
+                                <attribute name="kind" value="function" id="559" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_name" value="flush" id="560" addr="0x7fb6eb3f6550" />
+                                <attribute name="decl" value="f()." id="561" addr="0x7fb6eb3f6550" />
+                                <attribute name="access" value="public" id="562" addr="0x7fb6eb3f6550" />
+                                <attribute name="type" value="void" id="563" addr="0x7fb6eb3f6550" />
+                                <attribute name="code" value="{ }" id="564" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="565" addr="0x7fb6eb3f6550" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="566" addr="0x7f1a040a7d90" >
-                            <attributelist id="567" addr="0x7f1a040a7d90" >
-                                <attribute name="name" value="write" id="568" addr="0x7f1a040af550" />
-                                <attribute name="ismember" value="1" id="569" addr="0x7f1a040af550" />
-                                <attribute name="sym_symtab" value="0x7f1a040a7570" id="570" addr="0x7f1a040a7570" />
-                                <attribute name="kind" value="function" id="571" addr="0x7f1a040af550" />
-                                <attribute name="sym_name" value="write" id="572" addr="0x7f1a040af550" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="573" addr="0x7f1a040af550" />
-                                <attribute name="access" value="public" id="574" addr="0x7f1a040af550" />
-                                <parmlist id="575" addr="0x7f1a040a7cd0" >
+                        <cdecl id="566" addr="0x7fb6eb3eed90" >
+                            <attributelist id="567" addr="0x7fb6eb3eed90" >
+                                <attribute name="name" value="write" id="568" addr="0x7fb6eb3f6550" />
+                                <attribute name="ismember" value="1" id="569" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_symtab" value="0x7fb6eb3ee570" id="570" addr="0x7fb6eb3ee570" />
+                                <attribute name="kind" value="function" id="571" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_name" value="write" id="572" addr="0x7fb6eb3f6550" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="573" addr="0x7fb6eb3f6550" />
+                                <attribute name="access" value="public" id="574" addr="0x7fb6eb3f6550" />
+                                <parmlist id="575" addr="0x7fb6eb3eecd0" >
                                     <parm id="576">
-                                        <attributelist id="577" addr="0x7f1a040a7cd0" >
-                                            <attribute name="name" value="str" id="578" addr="0x7f1a040af550" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="579" addr="0x7f1a040af550" />
+                                        <attributelist id="577" addr="0x7fb6eb3eecd0" >
+                                            <attribute name="name" value="str" id="578" addr="0x7fb6eb3f6550" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="579" addr="0x7fb6eb3f6550" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="580" addr="0x7f1a040af550" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="581" addr="0x7f1a040af550" />
+                                <attribute name="type" value="void" id="580" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="581" addr="0x7fb6eb3f6550" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="582" addr="0x7f1a040a8170" >
-                            <attributelist id="583" addr="0x7f1a040a8170" >
-                                <attribute name="ismember" value="1" id="584" addr="0x7f1a040af550" />
-                                <attribute name="sym_name" value="writelines" id="585" addr="0x7f1a040af550" />
-                                <attribute name="name" value="writelines" id="586" addr="0x7f1a040af550" />
-                                <attribute name="decl" value="f(r.q(const).std::vector&lt;(XBMCAddon::String)>)." id="587" addr="0x7f1a040af550" />
-                                <parmlist id="588" addr="0x7f1a040a80b0" >
+                        <cdecl id="582" addr="0x7fb6eb3ef170" >
+                            <attributelist id="583" addr="0x7fb6eb3ef170" >
+                                <attribute name="ismember" value="1" id="584" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_name" value="writelines" id="585" addr="0x7fb6eb3f6550" />
+                                <attribute name="name" value="writelines" id="586" addr="0x7fb6eb3f6550" />
+                                <attribute name="decl" value="f(r.q(const).std::vector&lt;(XBMCAddon::String)>)." id="587" addr="0x7fb6eb3f6550" />
+                                <parmlist id="588" addr="0x7fb6eb3ef0b0" >
                                     <parm id="589">
-                                        <attributelist id="590" addr="0x7f1a040a80b0" >
-                                            <attribute name="name" value="seq" id="591" addr="0x7f1a040af550" />
-                                            <attribute name="type" value="r.q(const).std::vector&lt;(XBMCAddon::String)>" id="592" addr="0x7f1a040af550" />
+                                        <attributelist id="590" addr="0x7fb6eb3ef0b0" >
+                                            <attribute name="name" value="seq" id="591" addr="0x7fb6eb3f6550" />
+                                            <attribute name="type" value="r.q(const).std::vector&lt;(XBMCAddon::String)>" id="592" addr="0x7fb6eb3f6550" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="access" value="public" id="593" addr="0x7f1a040af550" />
-                                <attribute name="kind" value="function" id="594" addr="0x7f1a040af550" />
-                                <attribute name="type" value="void" id="595" addr="0x7f1a040af550" />
-                                <attribute name="sym_symtab" value="0x7f1a040a7570" id="596" addr="0x7f1a040a7570" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="597" addr="0x7f1a040af550" />
+                                <attribute name="access" value="public" id="593" addr="0x7fb6eb3f6550" />
+                                <attribute name="kind" value="function" id="594" addr="0x7fb6eb3f6550" />
+                                <attribute name="type" value="void" id="595" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_symtab" value="0x7fb6eb3ee570" id="596" addr="0x7fb6eb3ee570" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="597" addr="0x7fb6eb3f6550" />
                             </attributelist >
                          
                         </cdecl >
@@ -971,576 +971,576 @@
                 </namespace >
             </namespace >
         </include >
-        <include id="598" addr="0x7f1a040a83d0" >
-            <attributelist id="599" addr="0x7f1a040a83d0" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/wsgi/WsgiInputStream.h" id="600" addr="0x7f1a040af550" />
+        <include id="598" addr="0x7fb6eb3ef3d0" >
+            <attributelist id="599" addr="0x7fb6eb3ef3d0" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/wsgi/WsgiInputStream.h" id="600" addr="0x7fb6eb3f6550" />
             </attributelist >
 
-            <classforward id="601" addr="0x7f1a040a8470" >
-                <attributelist id="602" addr="0x7f1a040a8470" >
-                    <attribute name="sym_name" value="HTTPPythonRequest" id="603" addr="0x7f1a040af550" />
-                    <attribute name="name" value="HTTPPythonRequest" id="604" addr="0x7f1a040af550" />
-                    <attribute name="kind" value="struct" id="605" addr="0x7f1a040af550" />
-                    <attribute name="sym_weak" value="1" id="606" addr="0x7f1a040af550" />
-                    <attribute name="sym_symtab" value="0x7f1a0408f950" id="607" addr="0x7f1a0408f950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="608" addr="0x7f1a040af550" />
+            <classforward id="601" addr="0x7fb6eb3ef470" >
+                <attributelist id="602" addr="0x7fb6eb3ef470" >
+                    <attribute name="sym_name" value="HTTPPythonRequest" id="603" addr="0x7fb6eb3f6550" />
+                    <attribute name="name" value="HTTPPythonRequest" id="604" addr="0x7fb6eb3f6550" />
+                    <attribute name="kind" value="struct" id="605" addr="0x7fb6eb3f6550" />
+                    <attribute name="sym_weak" value="1" id="606" addr="0x7fb6eb3f6550" />
+                    <attribute name="sym_symtab" value="0x7fb6eb3d6950" id="607" addr="0x7fb6eb3d6950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="608" addr="0x7fb6eb3f6550" />
                 </attributelist >
              
             </classforward >
-            <namespace id="609" addr="0x7f1a040a8590" >
-                <attributelist id="610" addr="0x7f1a040a8590" >
-                    <attribute name="sym_name" value="XBMCAddon" id="611" addr="0x7f1a040af550" />
-                    <attribute name="name" value="XBMCAddon" id="612" addr="0x7f1a040af550" />
-                    <attribute name="sym_previousSibling" value="0x7f1a040a70d0" id="613" addr="0x7f1a040a70d0" />
-                    <attribute name="csym_nextSibling" value="0x7f1a040aa3f0" id="614" addr="0x7f1a040aa3f0" />
-                    <attribute name="sym_nextSibling" value="0x7f1a040aa3f0" id="615" addr="0x7f1a040aa3f0" />
-                    <typescope id="616" addr="0x7f1a040ac650" >
-                        <attributelist id="617" addr="0x7f1a040ac650" >
-                            <attribute name="name" value="XBMCAddon" id="618" addr="0x7f1a040af550" />
-                            <typetab id="619" addr="0x7f1a040ac690" >
-                                <attributelist id="620" addr="0x7f1a040ac690" >
-                                    <attribute name="String" value="std::string" id="621" addr="0x7f1a040af550" />
+            <namespace id="609" addr="0x7fb6eb3ef590" >
+                <attributelist id="610" addr="0x7fb6eb3ef590" >
+                    <attribute name="sym_name" value="XBMCAddon" id="611" addr="0x7fb6eb3f6550" />
+                    <attribute name="name" value="XBMCAddon" id="612" addr="0x7fb6eb3f6550" />
+                    <attribute name="sym_previousSibling" value="0x7fb6eb3ee0d0" id="613" addr="0x7fb6eb3ee0d0" />
+                    <attribute name="csym_nextSibling" value="0x7fb6eb3f13f0" id="614" addr="0x7fb6eb3f13f0" />
+                    <attribute name="sym_nextSibling" value="0x7fb6eb3f13f0" id="615" addr="0x7fb6eb3f13f0" />
+                    <typescope id="616" addr="0x7fb6eb3f3650" >
+                        <attributelist id="617" addr="0x7fb6eb3f3650" >
+                            <attribute name="name" value="XBMCAddon" id="618" addr="0x7fb6eb3f6550" />
+                            <typetab id="619" addr="0x7fb6eb3f3690" >
+                                <attributelist id="620" addr="0x7fb6eb3f3690" >
+                                    <attribute name="String" value="std::string" id="621" addr="0x7fb6eb3f6550" />
                                 </attributelist >
-                                <typetabsitem id="622" addr="0x7f1a040ac870" >
-                                    <attributelist id="623" addr="0x7f1a040ac870" >
+                                <typetabsitem id="622" addr="0x7fb6eb3f3870" >
+                                    <attributelist id="623" addr="0x7fb6eb3f3870" >
                                     </attributelist >
                                 </typetabsitem >
                             </typetab >
-                            <attribute name="parent" value="0x7f1a0408fa30" id="624" addr="0x7f1a0408fa30" />
-                            <attribute name="qname" value="XBMCAddon" id="625" addr="0x7f1a040af550" />
-                            <attribute name="symtab" value="0x7f1a040a6950" id="626" addr="0x7f1a040a6950" />
+                            <attribute name="parent" value="0x7fb6eb3d6a30" id="624" addr="0x7fb6eb3d6a30" />
+                            <attribute name="qname" value="XBMCAddon" id="625" addr="0x7fb6eb3f6550" />
+                            <attribute name="symtab" value="0x7fb6eb3ed950" id="626" addr="0x7fb6eb3ed950" />
                         </attributelist >
-                        <typescopesitem id="627" addr="0x7f1a040a6910" >
-                            <attributelist id="628" addr="0x7f1a040a6910" >
+                        <typescopesitem id="627" addr="0x7fb6eb3ed910" >
+                            <attributelist id="628" addr="0x7fb6eb3ed910" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="629" addr="0x7f1a040ac690" >
-                            <attributelist id="630" addr="0x7f1a040ac690" >
-                                <attribute name="String" value="std::string" id="631" addr="0x7f1a040af550" />
+                        <typescopesitem id="629" addr="0x7fb6eb3f3690" >
+                            <attributelist id="630" addr="0x7fb6eb3f3690" >
+                                <attribute name="String" value="std::string" id="631" addr="0x7fb6eb3f6550" />
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="632" addr="0x7f1a0408fa30" >
-                            <attributelist id="633" addr="0x7f1a0408fa30" >
-                                <attribute name="name" value="" id="634" addr="0x7f1a040af550" />
-                                <typetab id="635" addr="0x7f1a0408fa90" >
-                                    <attributelist id="636" addr="0x7f1a0408fa90" >
-                                        <attribute name="HTTPPythonRequest" value="HTTPPythonRequest" id="637" addr="0x7f1a040af550" />
+                        <typescopesitem id="632" addr="0x7fb6eb3d6a30" >
+                            <attributelist id="633" addr="0x7fb6eb3d6a30" >
+                                <attribute name="name" value="" id="634" addr="0x7fb6eb3f6550" />
+                                <typetab id="635" addr="0x7fb6eb3d6a90" >
+                                    <attributelist id="636" addr="0x7fb6eb3d6a90" >
+                                        <attribute name="HTTPPythonRequest" value="HTTPPythonRequest" id="637" addr="0x7fb6eb3f6550" />
                                     </attributelist >
-                                    <typetabsitem id="638" addr="0x7f1a040ac7b0" >
-                                        <attributelist id="639" addr="0x7f1a040ac7b0" >
+                                    <typetabsitem id="638" addr="0x7fb6eb3f37b0" >
+                                        <attributelist id="639" addr="0x7fb6eb3f37b0" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="640" addr="0x7f1a040ac790" >
-                            <attributelist id="641" addr="0x7f1a040ac790" >
+                        <typescopesitem id="640" addr="0x7fb6eb3f3790" >
+                            <attributelist id="641" addr="0x7fb6eb3f3790" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="642" addr="0x7f1a040a6950" >
-                            <attributelist id="643" addr="0x7f1a040a6950" >
-                                <attribute name="name" value="XBMCAddon" id="644" addr="0x7f1a040af550" />
-                                <attribute name="csymtab" value="0x7f1a040a6990" id="645" addr="0x7f1a040a6990" />
-                                <attribute name="symtab" value="0x7f1a040a6930" id="646" addr="0x7f1a040a6930" />
+                        <typescopesitem id="642" addr="0x7fb6eb3ed950" >
+                            <attributelist id="643" addr="0x7fb6eb3ed950" >
+                                <attribute name="name" value="XBMCAddon" id="644" addr="0x7fb6eb3f6550" />
+                                <attribute name="csymtab" value="0x7fb6eb3ed990" id="645" addr="0x7fb6eb3ed990" />
+                                <attribute name="symtab" value="0x7fb6eb3ed930" id="646" addr="0x7fb6eb3ed930" />
                             </attributelist >
                         </typescopesitem >
                     </typescope >
-                    <attribute name="symtab" value="0x7f1a040a6950" id="647" addr="0x7f1a040a6950" />
-                    <attribute name="sym_symtab" value="0x7f1a0408f950" id="648" addr="0x7f1a0408f950" />
+                    <attribute name="symtab" value="0x7fb6eb3ed950" id="647" addr="0x7fb6eb3ed950" />
+                    <attribute name="sym_symtab" value="0x7fb6eb3d6950" id="648" addr="0x7fb6eb3d6950" />
                 </attributelist >
 
-                <namespace id="649" addr="0x7f1a040a8610" >
-                    <attributelist id="650" addr="0x7f1a040a8610" >
-                        <attribute name="sym_name" value="xbmcwsgi" id="651" addr="0x7f1a040af550" />
-                        <attribute name="name" value="xbmcwsgi" id="652" addr="0x7f1a040af550" />
-                        <attribute name="sym_previousSibling" value="0x7f1a040a71f0" id="653" addr="0x7f1a040a71f0" />
-                        <attribute name="csym_nextSibling" value="0x7f1a040aa470" id="654" addr="0x7f1a040aa470" />
-                        <attribute name="sym_nextSibling" value="0x7f1a040aa470" id="655" addr="0x7f1a040aa470" />
-                        <typescope id="656" addr="0x7f1a040acab0" >
-                            <attributelist id="657" addr="0x7f1a040acab0" >
-                                <attribute name="name" value="xbmcwsgi" id="658" addr="0x7f1a040af550" />
-                                <typetab id="659" addr="0x7f1a040acad0" >
-                                    <attributelist id="660" addr="0x7f1a040acad0" >
-                                        <attribute name="WsgiInputStreamIterator" value="WsgiInputStreamIterator" id="661" addr="0x7f1a040af550" />
-                                        <attribute name="WsgiHttpHeader" value="Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>" id="662" addr="0x7f1a040af550" />
-                                        <attribute name="WsgiErrorStream" value="WsgiErrorStream" id="663" addr="0x7f1a040af550" />
-                                        <attribute name="WsgiInputStream" value="WsgiInputStream" id="664" addr="0x7f1a040af550" />
-                                        <attribute name="WsgiResponse" value="WsgiResponse" id="665" addr="0x7f1a040af550" />
-                                        <attribute name="WsgiResponseBody" value="WsgiResponseBody" id="666" addr="0x7f1a040af550" />
+                <namespace id="649" addr="0x7fb6eb3ef610" >
+                    <attributelist id="650" addr="0x7fb6eb3ef610" >
+                        <attribute name="sym_name" value="xbmcwsgi" id="651" addr="0x7fb6eb3f6550" />
+                        <attribute name="name" value="xbmcwsgi" id="652" addr="0x7fb6eb3f6550" />
+                        <attribute name="sym_previousSibling" value="0x7fb6eb3ee1f0" id="653" addr="0x7fb6eb3ee1f0" />
+                        <attribute name="csym_nextSibling" value="0x7fb6eb3f1470" id="654" addr="0x7fb6eb3f1470" />
+                        <attribute name="sym_nextSibling" value="0x7fb6eb3f1470" id="655" addr="0x7fb6eb3f1470" />
+                        <typescope id="656" addr="0x7fb6eb3f3ab0" >
+                            <attributelist id="657" addr="0x7fb6eb3f3ab0" >
+                                <attribute name="name" value="xbmcwsgi" id="658" addr="0x7fb6eb3f6550" />
+                                <typetab id="659" addr="0x7fb6eb3f3ad0" >
+                                    <attributelist id="660" addr="0x7fb6eb3f3ad0" >
+                                        <attribute name="WsgiInputStreamIterator" value="WsgiInputStreamIterator" id="661" addr="0x7fb6eb3f6550" />
+                                        <attribute name="WsgiHttpHeader" value="Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>" id="662" addr="0x7fb6eb3f6550" />
+                                        <attribute name="WsgiErrorStream" value="WsgiErrorStream" id="663" addr="0x7fb6eb3f6550" />
+                                        <attribute name="WsgiInputStream" value="WsgiInputStream" id="664" addr="0x7fb6eb3f6550" />
+                                        <attribute name="WsgiResponse" value="WsgiResponse" id="665" addr="0x7fb6eb3f6550" />
+                                        <attribute name="WsgiResponseBody" value="WsgiResponseBody" id="666" addr="0x7fb6eb3f6550" />
                                     </attributelist >
-                                    <typetabsitem id="667" addr="0x7f1a040ad450" >
-                                        <attributelist id="668" addr="0x7f1a040ad450" >
+                                    <typetabsitem id="667" addr="0x7fb6eb3f4450" >
+                                        <attributelist id="668" addr="0x7fb6eb3f4450" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="669" addr="0x7f1a040adff0" >
-                                        <attributelist id="670" addr="0x7f1a040adff0" >
+                                    <typetabsitem id="669" addr="0x7fb6eb3f4ff0" >
+                                        <attributelist id="670" addr="0x7fb6eb3f4ff0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="671" addr="0x7f1a040acbb0" >
-                                        <attributelist id="672" addr="0x7f1a040acbb0" >
+                                    <typetabsitem id="671" addr="0x7fb6eb3f3bb0" >
+                                        <attributelist id="672" addr="0x7fb6eb3f3bb0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="673" addr="0x7f1a040ad830" >
-                                        <attributelist id="674" addr="0x7f1a040ad830" >
+                                    <typetabsitem id="673" addr="0x7fb6eb3f4830" >
+                                        <attributelist id="674" addr="0x7fb6eb3f4830" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="675" addr="0x7f1a040ae250" >
-                                        <attributelist id="676" addr="0x7f1a040ae250" >
+                                    <typetabsitem id="675" addr="0x7fb6eb3f5250" >
+                                        <attributelist id="676" addr="0x7fb6eb3f5250" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="677" addr="0x7f1a040aebb0" >
-                                        <attributelist id="678" addr="0x7f1a040aebb0" >
+                                    <typetabsitem id="677" addr="0x7fb6eb3f5bb0" >
+                                        <attributelist id="678" addr="0x7fb6eb3f5bb0" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
-                                <attribute name="parent" value="0x7f1a040ac650" id="679" addr="0x7f1a040ac650" />
-                                <attribute name="qname" value="XBMCAddon::xbmcwsgi" id="680" addr="0x7f1a040af550" />
-                                <attribute name="symtab" value="0x7f1a040a7170" id="681" addr="0x7f1a040a7170" />
+                                <attribute name="parent" value="0x7fb6eb3f3650" id="679" addr="0x7fb6eb3f3650" />
+                                <attribute name="qname" value="XBMCAddon::xbmcwsgi" id="680" addr="0x7fb6eb3f6550" />
+                                <attribute name="symtab" value="0x7fb6eb3ee170" id="681" addr="0x7fb6eb3ee170" />
                             </attributelist >
-                            <typescopesitem id="682" addr="0x7f1a040a7130" >
-                                <attributelist id="683" addr="0x7f1a040a7130" >
+                            <typescopesitem id="682" addr="0x7fb6eb3ee130" >
+                                <attributelist id="683" addr="0x7fb6eb3ee130" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="684" addr="0x7f1a040acad0" >
-                                <attributelist id="685" addr="0x7f1a040acad0" >
-                                    <attribute name="WsgiInputStreamIterator" value="WsgiInputStreamIterator" id="686" addr="0x7f1a040af550" />
-                                    <attribute name="WsgiHttpHeader" value="Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>" id="687" addr="0x7f1a040af550" />
-                                    <attribute name="WsgiErrorStream" value="WsgiErrorStream" id="688" addr="0x7f1a040af550" />
-                                    <attribute name="WsgiInputStream" value="WsgiInputStream" id="689" addr="0x7f1a040af550" />
-                                    <attribute name="WsgiResponse" value="WsgiResponse" id="690" addr="0x7f1a040af550" />
-                                    <attribute name="WsgiResponseBody" value="WsgiResponseBody" id="691" addr="0x7f1a040af550" />
+                            <typescopesitem id="684" addr="0x7fb6eb3f3ad0" >
+                                <attributelist id="685" addr="0x7fb6eb3f3ad0" >
+                                    <attribute name="WsgiInputStreamIterator" value="WsgiInputStreamIterator" id="686" addr="0x7fb6eb3f6550" />
+                                    <attribute name="WsgiHttpHeader" value="Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>" id="687" addr="0x7fb6eb3f6550" />
+                                    <attribute name="WsgiErrorStream" value="WsgiErrorStream" id="688" addr="0x7fb6eb3f6550" />
+                                    <attribute name="WsgiInputStream" value="WsgiInputStream" id="689" addr="0x7fb6eb3f6550" />
+                                    <attribute name="WsgiResponse" value="WsgiResponse" id="690" addr="0x7fb6eb3f6550" />
+                                    <attribute name="WsgiResponseBody" value="WsgiResponseBody" id="691" addr="0x7fb6eb3f6550" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="692" addr="0x7f1a040ac650" >
-                                <attributelist id="693" addr="0x7f1a040ac650" >
-                                    <attribute name="name" value="XBMCAddon" id="694" addr="0x7f1a040af550" />
-                                    <typetab id="695" addr="0x7f1a040ac690" >
-                                        <attributelist id="696" addr="0x7f1a040ac690" >
-                                            <attribute name="String" value="std::string" id="697" addr="0x7f1a040af550" />
+                            <typescopesitem id="692" addr="0x7fb6eb3f3650" >
+                                <attributelist id="693" addr="0x7fb6eb3f3650" >
+                                    <attribute name="name" value="XBMCAddon" id="694" addr="0x7fb6eb3f6550" />
+                                    <typetab id="695" addr="0x7fb6eb3f3690" >
+                                        <attributelist id="696" addr="0x7fb6eb3f3690" >
+                                            <attribute name="String" value="std::string" id="697" addr="0x7fb6eb3f6550" />
                                         </attributelist >
-                                        <typetabsitem id="698" addr="0x7f1a040ac870" >
-                                            <attributelist id="699" addr="0x7f1a040ac870" >
+                                        <typetabsitem id="698" addr="0x7fb6eb3f3870" >
+                                            <attributelist id="699" addr="0x7fb6eb3f3870" >
                                             </attributelist >
                                         </typetabsitem >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f1a0408fa30" id="700" addr="0x7f1a0408fa30" />
-                                    <attribute name="qname" value="XBMCAddon" id="701" addr="0x7f1a040af550" />
-                                    <attribute name="symtab" value="0x7f1a040a6950" id="702" addr="0x7f1a040a6950" />
+                                    <attribute name="parent" value="0x7fb6eb3d6a30" id="700" addr="0x7fb6eb3d6a30" />
+                                    <attribute name="qname" value="XBMCAddon" id="701" addr="0x7fb6eb3f6550" />
+                                    <attribute name="symtab" value="0x7fb6eb3ed950" id="702" addr="0x7fb6eb3ed950" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="703" addr="0x7f1a040acaf0" >
-                                <attributelist id="704" addr="0x7f1a040acaf0" >
+                            <typescopesitem id="703" addr="0x7fb6eb3f3af0" >
+                                <attributelist id="704" addr="0x7fb6eb3f3af0" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="705" addr="0x7f1a040a7170" >
-                                <attributelist id="706" addr="0x7f1a040a7170" >
-                                    <attribute name="name" value="xbmcwsgi" id="707" addr="0x7f1a040af550" />
-                                    <attribute name="csymtab" value="0x7f1a040a71b0" id="708" addr="0x7f1a040a71b0" />
-                                    <attribute name="symtab" value="0x7f1a040a7150" id="709" addr="0x7f1a040a7150" />
+                            <typescopesitem id="705" addr="0x7fb6eb3ee170" >
+                                <attributelist id="706" addr="0x7fb6eb3ee170" >
+                                    <attribute name="name" value="xbmcwsgi" id="707" addr="0x7fb6eb3f6550" />
+                                    <attribute name="csymtab" value="0x7fb6eb3ee1b0" id="708" addr="0x7fb6eb3ee1b0" />
+                                    <attribute name="symtab" value="0x7fb6eb3ee150" id="709" addr="0x7fb6eb3ee150" />
                                 </attributelist >
                             </typescopesitem >
                         </typescope >
-                        <attribute name="symtab" value="0x7f1a040a7170" id="710" addr="0x7f1a040a7170" />
-                        <attribute name="sym_symtab" value="0x7f1a040a6950" id="711" addr="0x7f1a040a6950" />
+                        <attribute name="symtab" value="0x7fb6eb3ee170" id="710" addr="0x7fb6eb3ee170" />
+                        <attribute name="sym_symtab" value="0x7fb6eb3ed950" id="711" addr="0x7fb6eb3ed950" />
                     </attributelist >
 
-                    <class id="712" addr="0x7f1a040a8790" >
-                        <attributelist id="713" addr="0x7f1a040a8790" >
-                            <attribute name="name" value="XBMCAddon::xbmcwsgi::WsgiInputStreamIterator" id="714" addr="0x7f1a040af550" />
-                            <attribute name="sym_symtab" value="0x7f1a040a7170" id="715" addr="0x7f1a040a7170" />
-                            <attribute name="symtab" value="0x7f1a040a88f0" id="716" addr="0x7f1a040a88f0" />
-                            <attribute name="allows_typedef" value="1" id="717" addr="0x7f1a040af550" />
-                            <attribute name="typepass_visit" value="1" id="718" addr="0x7f1a040af550" />
-                            <attribute name="allocate_visit" value="1" id="719" addr="0x7f1a040af550" />
-                            <attribute name="kind" value="class" id="720" addr="0x7f1a040af550" />
-                            <attribute name="sym_name" value="WsgiInputStreamIterator" id="721" addr="0x7f1a040af550" />
-                            <attribute name="allocate_default_constructor" value="1" id="722" addr="0x7f1a040af550" />
-                            <attribute name="allocate_has_constructor" value="1" id="723" addr="0x7f1a040af550" />
-                            <attribute name="allocate_public_constructor" value="1" id="724" addr="0x7f1a040af550" />
-                            <attribute name="allocate_has_destructor" value="1" id="725" addr="0x7f1a040af550" />
-                            <attribute name="allocate_default_destructor" value="1" id="726" addr="0x7f1a040af550" />
-                            <attribute name="allocate_copy_constructor" value="1" id="727" addr="0x7f1a040af550" />
-                            <attribute name="privatebaselist" value="0x7f1a040a8770" id="728" addr="0x7f1a040a8770" />
-                            <attribute name="protectedbaselist" value="0x7f1a040a8750" id="729" addr="0x7f1a040a8750" />
-                            <baselist id="730" addr="0x7f1a040a8730" >
-                                <base name="AddonClass" id="731" addr="0x7f1a040a86b0" />
+                    <class id="712" addr="0x7fb6eb3ef790" >
+                        <attributelist id="713" addr="0x7fb6eb3ef790" >
+                            <attribute name="name" value="XBMCAddon::xbmcwsgi::WsgiInputStreamIterator" id="714" addr="0x7fb6eb3f6550" />
+                            <attribute name="sym_symtab" value="0x7fb6eb3ee170" id="715" addr="0x7fb6eb3ee170" />
+                            <attribute name="symtab" value="0x7fb6eb3ef8f0" id="716" addr="0x7fb6eb3ef8f0" />
+                            <attribute name="allows_typedef" value="1" id="717" addr="0x7fb6eb3f6550" />
+                            <attribute name="typepass_visit" value="1" id="718" addr="0x7fb6eb3f6550" />
+                            <attribute name="allocate_visit" value="1" id="719" addr="0x7fb6eb3f6550" />
+                            <attribute name="kind" value="class" id="720" addr="0x7fb6eb3f6550" />
+                            <attribute name="sym_name" value="WsgiInputStreamIterator" id="721" addr="0x7fb6eb3f6550" />
+                            <attribute name="allocate_default_constructor" value="1" id="722" addr="0x7fb6eb3f6550" />
+                            <attribute name="allocate_has_constructor" value="1" id="723" addr="0x7fb6eb3f6550" />
+                            <attribute name="allocate_public_constructor" value="1" id="724" addr="0x7fb6eb3f6550" />
+                            <attribute name="allocate_has_destructor" value="1" id="725" addr="0x7fb6eb3f6550" />
+                            <attribute name="allocate_default_destructor" value="1" id="726" addr="0x7fb6eb3f6550" />
+                            <attribute name="allocate_copy_constructor" value="1" id="727" addr="0x7fb6eb3f6550" />
+                            <attribute name="privatebaselist" value="0x7fb6eb3ef770" id="728" addr="0x7fb6eb3ef770" />
+                            <attribute name="protectedbaselist" value="0x7fb6eb3ef750" id="729" addr="0x7fb6eb3ef750" />
+                            <baselist id="730" addr="0x7fb6eb3ef730" >
+                                <base name="AddonClass" id="731" addr="0x7fb6eb3ef6b0" />
                             </baselist >
-                            <attribute name="module" value="xbmcwsgi" id="732" addr="0x7f1a040a6270" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="733" addr="0x7f1a040af550" />
-                            <typescope id="734" addr="0x7f1a040ad4f0" >
-                                <attributelist id="735" addr="0x7f1a040ad4f0" >
-                                    <attribute name="name" value="WsgiInputStreamIterator" id="736" addr="0x7f1a040af550" />
-                                    <typetab id="737" addr="0x7f1a040ad510" >
-                                        <attributelist id="738" addr="0x7f1a040ad510" >
+                            <attribute name="module" value="xbmcwsgi" id="732" addr="0x7fb6eb3ed270" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="733" addr="0x7fb6eb3f6550" />
+                            <typescope id="734" addr="0x7fb6eb3f44f0" >
+                                <attributelist id="735" addr="0x7fb6eb3f44f0" >
+                                    <attribute name="name" value="WsgiInputStreamIterator" id="736" addr="0x7fb6eb3f6550" />
+                                    <typetab id="737" addr="0x7fb6eb3f4510" >
+                                        <attributelist id="738" addr="0x7fb6eb3f4510" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f1a040acab0" id="739" addr="0x7f1a040acab0" />
-                                    <attribute name="qname" value="XBMCAddon::xbmcwsgi::WsgiInputStreamIterator" id="740" addr="0x7f1a040af550" />
-                                    <attribute name="symtab" value="0x7f1a040a88f0" id="741" addr="0x7f1a040a88f0" />
+                                    <attribute name="parent" value="0x7fb6eb3f3ab0" id="739" addr="0x7fb6eb3f3ab0" />
+                                    <attribute name="qname" value="XBMCAddon::xbmcwsgi::WsgiInputStreamIterator" id="740" addr="0x7fb6eb3f6550" />
+                                    <attribute name="symtab" value="0x7fb6eb3ef8f0" id="741" addr="0x7fb6eb3ef8f0" />
                                 </attributelist >
-                                <typescopesitem id="742" addr="0x7f1a040ad490" >
-                                    <attributelist id="743" addr="0x7f1a040ad490" >
+                                <typescopesitem id="742" addr="0x7fb6eb3f4490" >
+                                    <attributelist id="743" addr="0x7fb6eb3f4490" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="744" addr="0x7f1a040ad510" >
-                                    <attributelist id="745" addr="0x7f1a040ad510" >
+                                <typescopesitem id="744" addr="0x7fb6eb3f4510" >
+                                    <attributelist id="745" addr="0x7fb6eb3f4510" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="746" addr="0x7f1a040acab0" >
-                                    <attributelist id="747" addr="0x7f1a040acab0" >
-                                        <attribute name="name" value="xbmcwsgi" id="748" addr="0x7f1a040af550" />
-                                        <typetab id="749" addr="0x7f1a040acad0" >
-                                            <attributelist id="750" addr="0x7f1a040acad0" >
-                                                <attribute name="WsgiInputStreamIterator" value="WsgiInputStreamIterator" id="751" addr="0x7f1a040af550" />
-                                                <attribute name="WsgiHttpHeader" value="Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>" id="752" addr="0x7f1a040af550" />
-                                                <attribute name="WsgiErrorStream" value="WsgiErrorStream" id="753" addr="0x7f1a040af550" />
-                                                <attribute name="WsgiInputStream" value="WsgiInputStream" id="754" addr="0x7f1a040af550" />
-                                                <attribute name="WsgiResponse" value="WsgiResponse" id="755" addr="0x7f1a040af550" />
-                                                <attribute name="WsgiResponseBody" value="WsgiResponseBody" id="756" addr="0x7f1a040af550" />
+                                <typescopesitem id="746" addr="0x7fb6eb3f3ab0" >
+                                    <attributelist id="747" addr="0x7fb6eb3f3ab0" >
+                                        <attribute name="name" value="xbmcwsgi" id="748" addr="0x7fb6eb3f6550" />
+                                        <typetab id="749" addr="0x7fb6eb3f3ad0" >
+                                            <attributelist id="750" addr="0x7fb6eb3f3ad0" >
+                                                <attribute name="WsgiInputStreamIterator" value="WsgiInputStreamIterator" id="751" addr="0x7fb6eb3f6550" />
+                                                <attribute name="WsgiHttpHeader" value="Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>" id="752" addr="0x7fb6eb3f6550" />
+                                                <attribute name="WsgiErrorStream" value="WsgiErrorStream" id="753" addr="0x7fb6eb3f6550" />
+                                                <attribute name="WsgiInputStream" value="WsgiInputStream" id="754" addr="0x7fb6eb3f6550" />
+                                                <attribute name="WsgiResponse" value="WsgiResponse" id="755" addr="0x7fb6eb3f6550" />
+                                                <attribute name="WsgiResponseBody" value="WsgiResponseBody" id="756" addr="0x7fb6eb3f6550" />
                                             </attributelist >
-                                            <typetabsitem id="757" addr="0x7f1a040ad450" >
-                                                <attributelist id="758" addr="0x7f1a040ad450" >
+                                            <typetabsitem id="757" addr="0x7fb6eb3f4450" >
+                                                <attributelist id="758" addr="0x7fb6eb3f4450" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="759" addr="0x7f1a040adff0" >
-                                                <attributelist id="760" addr="0x7f1a040adff0" >
+                                            <typetabsitem id="759" addr="0x7fb6eb3f4ff0" >
+                                                <attributelist id="760" addr="0x7fb6eb3f4ff0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="761" addr="0x7f1a040acbb0" >
-                                                <attributelist id="762" addr="0x7f1a040acbb0" >
+                                            <typetabsitem id="761" addr="0x7fb6eb3f3bb0" >
+                                                <attributelist id="762" addr="0x7fb6eb3f3bb0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="763" addr="0x7f1a040ad830" >
-                                                <attributelist id="764" addr="0x7f1a040ad830" >
+                                            <typetabsitem id="763" addr="0x7fb6eb3f4830" >
+                                                <attributelist id="764" addr="0x7fb6eb3f4830" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="765" addr="0x7f1a040ae250" >
-                                                <attributelist id="766" addr="0x7f1a040ae250" >
+                                            <typetabsitem id="765" addr="0x7fb6eb3f5250" >
+                                                <attributelist id="766" addr="0x7fb6eb3f5250" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="767" addr="0x7f1a040aebb0" >
-                                                <attributelist id="768" addr="0x7f1a040aebb0" >
+                                            <typetabsitem id="767" addr="0x7fb6eb3f5bb0" >
+                                                <attributelist id="768" addr="0x7fb6eb3f5bb0" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7f1a040ac650" id="769" addr="0x7f1a040ac650" />
-                                        <attribute name="qname" value="XBMCAddon::xbmcwsgi" id="770" addr="0x7f1a040af550" />
-                                        <attribute name="symtab" value="0x7f1a040a7170" id="771" addr="0x7f1a040a7170" />
+                                        <attribute name="parent" value="0x7fb6eb3f3650" id="769" addr="0x7fb6eb3f3650" />
+                                        <attribute name="qname" value="XBMCAddon::xbmcwsgi" id="770" addr="0x7fb6eb3f6550" />
+                                        <attribute name="symtab" value="0x7fb6eb3ee170" id="771" addr="0x7fb6eb3ee170" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="772" addr="0x7f1a040ad530" >
-                                    <attributelist id="773" addr="0x7f1a040ad530" >
+                                <typescopesitem id="772" addr="0x7fb6eb3f4530" >
+                                    <attributelist id="773" addr="0x7fb6eb3f4530" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="774" addr="0x7f1a040a88f0" >
-                                    <attributelist id="775" addr="0x7f1a040a88f0" >
-                                        <attribute name="name" value="WsgiInputStreamIterator" id="776" addr="0x7f1a040af550" />
-                                        <attribute name="csymtab" value="0x7f1a040a8910" id="777" addr="0x7f1a040a8910" />
-                                        <attribute name="symtab" value="0x7f1a040a88b0" id="778" addr="0x7f1a040a88b0" />
+                                <typescopesitem id="774" addr="0x7fb6eb3ef8f0" >
+                                    <attributelist id="775" addr="0x7fb6eb3ef8f0" >
+                                        <attribute name="name" value="WsgiInputStreamIterator" id="776" addr="0x7fb6eb3f6550" />
+                                        <attribute name="csymtab" value="0x7fb6eb3ef910" id="777" addr="0x7fb6eb3ef910" />
+                                        <attribute name="symtab" value="0x7fb6eb3ef8b0" id="778" addr="0x7fb6eb3ef8b0" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
-                            <attribute name="feature_iterator" value="std::string" id="779" addr="0x7f1a040af550" />
+                            <attribute name="feature_iterator" value="std::string" id="779" addr="0x7fb6eb3f6550" />
                         </attributelist >
 
-                        <access id="780" addr="0x7f1a040a8870" >
-                            <attributelist id="781" addr="0x7f1a040a8870" >
-                                <attribute name="kind" value="public" id="782" addr="0x7f1a040af550" />
+                        <access id="780" addr="0x7fb6eb3ef870" >
+                            <attributelist id="781" addr="0x7fb6eb3ef870" >
+                                <attribute name="kind" value="public" id="782" addr="0x7fb6eb3f6550" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="783" addr="0x7f1a040a8a30" >
-                            <attributelist id="784" addr="0x7f1a040a8a30" >
-                                <attribute name="ismember" value="1" id="785" addr="0x7f1a040af550" />
-                                <attribute name="sym_name" value="WsgiInputStreamIterator" id="786" addr="0x7f1a040af550" />
-                                <attribute name="name" value="WsgiInputStreamIterator" id="787" addr="0x7f1a040af550" />
-                                <attribute name="decl" value="f()." id="788" addr="0x7f1a040af550" />
-                                <attribute name="access" value="public" id="789" addr="0x7f1a040af550" />
-                                <attribute name="feature_new" value="1" id="790" addr="0x7f1a040af550" />
-                                <attribute name="feature_iterator" value="std::string" id="791" addr="0x7f1a040af550" />
-                                <attribute name="sym_symtab" value="0x7f1a040a88f0" id="792" addr="0x7f1a040a88f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="793" addr="0x7f1a040af550" />
+                        <constructor id="783" addr="0x7fb6eb3efa30" >
+                            <attributelist id="784" addr="0x7fb6eb3efa30" >
+                                <attribute name="ismember" value="1" id="785" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_name" value="WsgiInputStreamIterator" id="786" addr="0x7fb6eb3f6550" />
+                                <attribute name="name" value="WsgiInputStreamIterator" id="787" addr="0x7fb6eb3f6550" />
+                                <attribute name="decl" value="f()." id="788" addr="0x7fb6eb3f6550" />
+                                <attribute name="access" value="public" id="789" addr="0x7fb6eb3f6550" />
+                                <attribute name="feature_new" value="1" id="790" addr="0x7fb6eb3f6550" />
+                                <attribute name="feature_iterator" value="std::string" id="791" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_symtab" value="0x7fb6eb3ef8f0" id="792" addr="0x7fb6eb3ef8f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="793" addr="0x7fb6eb3f6550" />
                             </attributelist >
                          
                         </constructor >
-                        <destructor id="794" addr="0x7f1a040a8bb0" >
-                            <attributelist id="795" addr="0x7f1a040a8bb0" >
-                                <attribute name="ismember" value="1" id="796" addr="0x7f1a040af550" />
-                                <attribute name="sym_name" value="~WsgiInputStreamIterator" id="797" addr="0x7f1a040af550" />
-                                <attribute name="name" value="~WsgiInputStreamIterator" id="798" addr="0x7f1a040af550" />
-                                <attribute name="decl" value="f()." id="799" addr="0x7f1a040af550" />
-                                <attribute name="access" value="public" id="800" addr="0x7f1a040af550" />
-                                <attribute name="sym_symtab" value="0x7f1a040a88f0" id="801" addr="0x7f1a040a88f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="802" addr="0x7f1a040af550" />
+                        <destructor id="794" addr="0x7fb6eb3efbb0" >
+                            <attributelist id="795" addr="0x7fb6eb3efbb0" >
+                                <attribute name="ismember" value="1" id="796" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_name" value="~WsgiInputStreamIterator" id="797" addr="0x7fb6eb3f6550" />
+                                <attribute name="name" value="~WsgiInputStreamIterator" id="798" addr="0x7fb6eb3f6550" />
+                                <attribute name="decl" value="f()." id="799" addr="0x7fb6eb3f6550" />
+                                <attribute name="access" value="public" id="800" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_symtab" value="0x7fb6eb3ef8f0" id="801" addr="0x7fb6eb3ef8f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="802" addr="0x7fb6eb3f6550" />
                             </attributelist >
                          
                         </destructor >
-                        <cdecl id="803" addr="0x7f1a040a8f10" >
-                            <attributelist id="804" addr="0x7f1a040a8f10" >
-                                <attribute name="name" value="read" id="805" addr="0x7f1a040af550" />
-                                <attribute name="ismember" value="1" id="806" addr="0x7f1a040af550" />
-                                <attribute name="sym_symtab" value="0x7f1a040a88f0" id="807" addr="0x7f1a040a88f0" />
-                                <attribute name="sym_nextSibling" value="0x7f1a040a9010" id="808" addr="0x7f1a040a9010" />
-                                <attribute name="csym_nextSibling" value="0x7f1a040a9010" id="809" addr="0x7f1a040a9010" />
-                                <attribute name="kind" value="function" id="810" addr="0x7f1a040af550" />
-                                <attribute name="sym_name" value="read" id="811" addr="0x7f1a040af550" />
-                                <attribute name="decl" value="q(const).f(unsigned long)." id="812" addr="0x7f1a040af550" />
-                                <attribute name="access" value="public" id="813" addr="0x7f1a040af550" />
-                                <attribute name="sym_overloaded" value="0x7f1a040a8f10" id="814" addr="0x7f1a040a8f10" />
-                                <parmlist id="815" addr="0x7f1a040a8e30" >
+                        <cdecl id="803" addr="0x7fb6eb3eff10" >
+                            <attributelist id="804" addr="0x7fb6eb3eff10" >
+                                <attribute name="name" value="read" id="805" addr="0x7fb6eb3f6550" />
+                                <attribute name="ismember" value="1" id="806" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_symtab" value="0x7fb6eb3ef8f0" id="807" addr="0x7fb6eb3ef8f0" />
+                                <attribute name="sym_nextSibling" value="0x7fb6eb3f0010" id="808" addr="0x7fb6eb3f0010" />
+                                <attribute name="csym_nextSibling" value="0x7fb6eb3f0010" id="809" addr="0x7fb6eb3f0010" />
+                                <attribute name="kind" value="function" id="810" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_name" value="read" id="811" addr="0x7fb6eb3f6550" />
+                                <attribute name="decl" value="q(const).f(unsigned long)." id="812" addr="0x7fb6eb3f6550" />
+                                <attribute name="access" value="public" id="813" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_overloaded" value="0x7fb6eb3eff10" id="814" addr="0x7fb6eb3eff10" />
+                                <parmlist id="815" addr="0x7fb6eb3efe30" >
                                     <parm id="816">
-                                        <attributelist id="817" addr="0x7f1a040a8e30" >
-                                            <attribute name="name" value="size" id="818" addr="0x7f1a040af550" />
-                                            <attribute name="value" value="0" id="819" addr="0x7f1a040af550" />
-                                            <attribute name="type" value="unsigned long" id="820" addr="0x7f1a040af550" />
+                                        <attributelist id="817" addr="0x7fb6eb3efe30" >
+                                            <attribute name="name" value="size" id="818" addr="0x7fb6eb3f6550" />
+                                            <attribute name="value" value="0" id="819" addr="0x7fb6eb3f6550" />
+                                            <attribute name="type" value="unsigned long" id="820" addr="0x7fb6eb3f6550" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="XBMCAddon::String" id="821" addr="0x7f1a040af550" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="822" addr="0x7f1a040af550" />
+                                <attribute name="type" value="XBMCAddon::String" id="821" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="822" addr="0x7fb6eb3f6550" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="823" addr="0x7f1a040a9010" >
-                            <attributelist id="824" addr="0x7f1a040a9010" >
-                                <attribute name="name" value="read" id="825" addr="0x7f1a040af550" />
-                                <attribute name="ismember" value="1" id="826" addr="0x7f1a040af550" />
-                                <attribute name="sym_symtab" value="0x7f1a040a88f0" id="827" addr="0x7f1a040a88f0" />
-                                <attribute name="sym_previousSibling" value="0x7f1a040a8f10" id="828" addr="0x7f1a040a8f10" />
-                                <attribute name="kind" value="function" id="829" addr="0x7f1a040af550" />
-                                <attribute name="sym_name" value="read" id="830" addr="0x7f1a040af550" />
-                                <attribute name="defaultargs" value="0x7f1a040a8f10" id="831" addr="0x7f1a040a8f10" />
-                                <attribute name="decl" value="q(const).f()." id="832" addr="0x7f1a040af550" />
-                                <attribute name="access" value="public" id="833" addr="0x7f1a040af550" />
-                                <attribute name="sym_overloaded" value="0x7f1a040a8f10" id="834" addr="0x7f1a040a8f10" />
-                                <attribute name="type" value="XBMCAddon::String" id="835" addr="0x7f1a040af550" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="836" addr="0x7f1a040af550" />
+                        <cdecl id="823" addr="0x7fb6eb3f0010" >
+                            <attributelist id="824" addr="0x7fb6eb3f0010" >
+                                <attribute name="name" value="read" id="825" addr="0x7fb6eb3f6550" />
+                                <attribute name="ismember" value="1" id="826" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_symtab" value="0x7fb6eb3ef8f0" id="827" addr="0x7fb6eb3ef8f0" />
+                                <attribute name="sym_previousSibling" value="0x7fb6eb3eff10" id="828" addr="0x7fb6eb3eff10" />
+                                <attribute name="kind" value="function" id="829" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_name" value="read" id="830" addr="0x7fb6eb3f6550" />
+                                <attribute name="defaultargs" value="0x7fb6eb3eff10" id="831" addr="0x7fb6eb3eff10" />
+                                <attribute name="decl" value="q(const).f()." id="832" addr="0x7fb6eb3f6550" />
+                                <attribute name="access" value="public" id="833" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_overloaded" value="0x7fb6eb3eff10" id="834" addr="0x7fb6eb3eff10" />
+                                <attribute name="type" value="XBMCAddon::String" id="835" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="836" addr="0x7fb6eb3f6550" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="837" addr="0x7f1a040a93f0" >
-                            <attributelist id="838" addr="0x7f1a040a93f0" >
-                                <attribute name="name" value="readline" id="839" addr="0x7f1a040af550" />
-                                <attribute name="ismember" value="1" id="840" addr="0x7f1a040af550" />
-                                <attribute name="sym_symtab" value="0x7f1a040a88f0" id="841" addr="0x7f1a040a88f0" />
-                                <attribute name="sym_nextSibling" value="0x7f1a040a94f0" id="842" addr="0x7f1a040a94f0" />
-                                <attribute name="csym_nextSibling" value="0x7f1a040a94f0" id="843" addr="0x7f1a040a94f0" />
-                                <attribute name="kind" value="function" id="844" addr="0x7f1a040af550" />
-                                <attribute name="sym_name" value="readline" id="845" addr="0x7f1a040af550" />
-                                <attribute name="decl" value="q(const).f(unsigned long)." id="846" addr="0x7f1a040af550" />
-                                <attribute name="access" value="public" id="847" addr="0x7f1a040af550" />
-                                <attribute name="sym_overloaded" value="0x7f1a040a93f0" id="848" addr="0x7f1a040a93f0" />
-                                <parmlist id="849" addr="0x7f1a040a9310" >
+                        <cdecl id="837" addr="0x7fb6eb3f03f0" >
+                            <attributelist id="838" addr="0x7fb6eb3f03f0" >
+                                <attribute name="name" value="readline" id="839" addr="0x7fb6eb3f6550" />
+                                <attribute name="ismember" value="1" id="840" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_symtab" value="0x7fb6eb3ef8f0" id="841" addr="0x7fb6eb3ef8f0" />
+                                <attribute name="sym_nextSibling" value="0x7fb6eb3f04f0" id="842" addr="0x7fb6eb3f04f0" />
+                                <attribute name="csym_nextSibling" value="0x7fb6eb3f04f0" id="843" addr="0x7fb6eb3f04f0" />
+                                <attribute name="kind" value="function" id="844" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_name" value="readline" id="845" addr="0x7fb6eb3f6550" />
+                                <attribute name="decl" value="q(const).f(unsigned long)." id="846" addr="0x7fb6eb3f6550" />
+                                <attribute name="access" value="public" id="847" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_overloaded" value="0x7fb6eb3f03f0" id="848" addr="0x7fb6eb3f03f0" />
+                                <parmlist id="849" addr="0x7fb6eb3f0310" >
                                     <parm id="850">
-                                        <attributelist id="851" addr="0x7f1a040a9310" >
-                                            <attribute name="name" value="size" id="852" addr="0x7f1a040af550" />
-                                            <attribute name="value" value="0" id="853" addr="0x7f1a040af550" />
-                                            <attribute name="type" value="unsigned long" id="854" addr="0x7f1a040af550" />
+                                        <attributelist id="851" addr="0x7fb6eb3f0310" >
+                                            <attribute name="name" value="size" id="852" addr="0x7fb6eb3f6550" />
+                                            <attribute name="value" value="0" id="853" addr="0x7fb6eb3f6550" />
+                                            <attribute name="type" value="unsigned long" id="854" addr="0x7fb6eb3f6550" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="XBMCAddon::String" id="855" addr="0x7f1a040af550" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="856" addr="0x7f1a040af550" />
+                                <attribute name="type" value="XBMCAddon::String" id="855" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="856" addr="0x7fb6eb3f6550" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="857" addr="0x7f1a040a94f0" >
-                            <attributelist id="858" addr="0x7f1a040a94f0" >
-                                <attribute name="name" value="readline" id="859" addr="0x7f1a040af550" />
-                                <attribute name="ismember" value="1" id="860" addr="0x7f1a040af550" />
-                                <attribute name="sym_symtab" value="0x7f1a040a88f0" id="861" addr="0x7f1a040a88f0" />
-                                <attribute name="sym_previousSibling" value="0x7f1a040a93f0" id="862" addr="0x7f1a040a93f0" />
-                                <attribute name="kind" value="function" id="863" addr="0x7f1a040af550" />
-                                <attribute name="sym_name" value="readline" id="864" addr="0x7f1a040af550" />
-                                <attribute name="defaultargs" value="0x7f1a040a93f0" id="865" addr="0x7f1a040a93f0" />
-                                <attribute name="decl" value="q(const).f()." id="866" addr="0x7f1a040af550" />
-                                <attribute name="access" value="public" id="867" addr="0x7f1a040af550" />
-                                <attribute name="sym_overloaded" value="0x7f1a040a93f0" id="868" addr="0x7f1a040a93f0" />
-                                <attribute name="type" value="XBMCAddon::String" id="869" addr="0x7f1a040af550" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="870" addr="0x7f1a040af550" />
+                        <cdecl id="857" addr="0x7fb6eb3f04f0" >
+                            <attributelist id="858" addr="0x7fb6eb3f04f0" >
+                                <attribute name="name" value="readline" id="859" addr="0x7fb6eb3f6550" />
+                                <attribute name="ismember" value="1" id="860" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_symtab" value="0x7fb6eb3ef8f0" id="861" addr="0x7fb6eb3ef8f0" />
+                                <attribute name="sym_previousSibling" value="0x7fb6eb3f03f0" id="862" addr="0x7fb6eb3f03f0" />
+                                <attribute name="kind" value="function" id="863" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_name" value="readline" id="864" addr="0x7fb6eb3f6550" />
+                                <attribute name="defaultargs" value="0x7fb6eb3f03f0" id="865" addr="0x7fb6eb3f03f0" />
+                                <attribute name="decl" value="q(const).f()." id="866" addr="0x7fb6eb3f6550" />
+                                <attribute name="access" value="public" id="867" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_overloaded" value="0x7fb6eb3f03f0" id="868" addr="0x7fb6eb3f03f0" />
+                                <attribute name="type" value="XBMCAddon::String" id="869" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="870" addr="0x7fb6eb3f6550" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="871" addr="0x7f1a040a9970" >
-                            <attributelist id="872" addr="0x7f1a040a9970" >
-                                <attribute name="name" value="readlines" id="873" addr="0x7f1a040af550" />
-                                <attribute name="ismember" value="1" id="874" addr="0x7f1a040af550" />
-                                <attribute name="sym_symtab" value="0x7f1a040a88f0" id="875" addr="0x7f1a040a88f0" />
-                                <attribute name="sym_nextSibling" value="0x7f1a040a9a70" id="876" addr="0x7f1a040a9a70" />
-                                <attribute name="csym_nextSibling" value="0x7f1a040a9a70" id="877" addr="0x7f1a040a9a70" />
-                                <attribute name="kind" value="function" id="878" addr="0x7f1a040af550" />
-                                <attribute name="sym_name" value="readlines" id="879" addr="0x7f1a040af550" />
-                                <attribute name="decl" value="q(const).f(unsigned long)." id="880" addr="0x7f1a040af550" />
-                                <attribute name="access" value="public" id="881" addr="0x7f1a040af550" />
-                                <attribute name="sym_overloaded" value="0x7f1a040a9970" id="882" addr="0x7f1a040a9970" />
-                                <parmlist id="883" addr="0x7f1a040a9890" >
+                        <cdecl id="871" addr="0x7fb6eb3f0970" >
+                            <attributelist id="872" addr="0x7fb6eb3f0970" >
+                                <attribute name="name" value="readlines" id="873" addr="0x7fb6eb3f6550" />
+                                <attribute name="ismember" value="1" id="874" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_symtab" value="0x7fb6eb3ef8f0" id="875" addr="0x7fb6eb3ef8f0" />
+                                <attribute name="sym_nextSibling" value="0x7fb6eb3f0a70" id="876" addr="0x7fb6eb3f0a70" />
+                                <attribute name="csym_nextSibling" value="0x7fb6eb3f0a70" id="877" addr="0x7fb6eb3f0a70" />
+                                <attribute name="kind" value="function" id="878" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_name" value="readlines" id="879" addr="0x7fb6eb3f6550" />
+                                <attribute name="decl" value="q(const).f(unsigned long)." id="880" addr="0x7fb6eb3f6550" />
+                                <attribute name="access" value="public" id="881" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_overloaded" value="0x7fb6eb3f0970" id="882" addr="0x7fb6eb3f0970" />
+                                <parmlist id="883" addr="0x7fb6eb3f0890" >
                                     <parm id="884">
-                                        <attributelist id="885" addr="0x7f1a040a9890" >
-                                            <attribute name="name" value="sizehint" id="886" addr="0x7f1a040af550" />
-                                            <attribute name="value" value="0" id="887" addr="0x7f1a040af550" />
-                                            <attribute name="type" value="unsigned long" id="888" addr="0x7f1a040af550" />
+                                        <attributelist id="885" addr="0x7fb6eb3f0890" >
+                                            <attribute name="name" value="sizehint" id="886" addr="0x7fb6eb3f6550" />
+                                            <attribute name="value" value="0" id="887" addr="0x7fb6eb3f6550" />
+                                            <attribute name="type" value="unsigned long" id="888" addr="0x7fb6eb3f6550" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="std::vector&lt;(XBMCAddon::String)>" id="889" addr="0x7f1a040af550" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="890" addr="0x7f1a040af550" />
+                                <attribute name="type" value="std::vector&lt;(XBMCAddon::String)>" id="889" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="890" addr="0x7fb6eb3f6550" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="891" addr="0x7f1a040a9a70" >
-                            <attributelist id="892" addr="0x7f1a040a9a70" >
-                                <attribute name="name" value="readlines" id="893" addr="0x7f1a040af550" />
-                                <attribute name="ismember" value="1" id="894" addr="0x7f1a040af550" />
-                                <attribute name="sym_symtab" value="0x7f1a040a88f0" id="895" addr="0x7f1a040a88f0" />
-                                <attribute name="sym_previousSibling" value="0x7f1a040a9970" id="896" addr="0x7f1a040a9970" />
-                                <attribute name="kind" value="function" id="897" addr="0x7f1a040af550" />
-                                <attribute name="sym_name" value="readlines" id="898" addr="0x7f1a040af550" />
-                                <attribute name="defaultargs" value="0x7f1a040a9970" id="899" addr="0x7f1a040a9970" />
-                                <attribute name="decl" value="q(const).f()." id="900" addr="0x7f1a040af550" />
-                                <attribute name="access" value="public" id="901" addr="0x7f1a040af550" />
-                                <attribute name="sym_overloaded" value="0x7f1a040a9970" id="902" addr="0x7f1a040a9970" />
-                                <attribute name="type" value="std::vector&lt;(XBMCAddon::String)>" id="903" addr="0x7f1a040af550" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="904" addr="0x7f1a040af550" />
+                        <cdecl id="891" addr="0x7fb6eb3f0a70" >
+                            <attributelist id="892" addr="0x7fb6eb3f0a70" >
+                                <attribute name="name" value="readlines" id="893" addr="0x7fb6eb3f6550" />
+                                <attribute name="ismember" value="1" id="894" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_symtab" value="0x7fb6eb3ef8f0" id="895" addr="0x7fb6eb3ef8f0" />
+                                <attribute name="sym_previousSibling" value="0x7fb6eb3f0970" id="896" addr="0x7fb6eb3f0970" />
+                                <attribute name="kind" value="function" id="897" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_name" value="readlines" id="898" addr="0x7fb6eb3f6550" />
+                                <attribute name="defaultargs" value="0x7fb6eb3f0970" id="899" addr="0x7fb6eb3f0970" />
+                                <attribute name="decl" value="q(const).f()." id="900" addr="0x7fb6eb3f6550" />
+                                <attribute name="access" value="public" id="901" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_overloaded" value="0x7fb6eb3f0970" id="902" addr="0x7fb6eb3f0970" />
+                                <attribute name="type" value="std::vector&lt;(XBMCAddon::String)>" id="903" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="904" addr="0x7fb6eb3f6550" />
                             </attributelist >
                          
                         </cdecl >
                     </class >
-                    <class id="905" addr="0x7f1a040a9d50" >
-                        <attributelist id="906" addr="0x7f1a040a9d50" >
-                            <attribute name="name" value="XBMCAddon::xbmcwsgi::WsgiInputStream" id="907" addr="0x7f1a040af550" />
-                            <attribute name="sym_symtab" value="0x7f1a040a7170" id="908" addr="0x7f1a040a7170" />
-                            <attribute name="symtab" value="0x7f1a040a9eb0" id="909" addr="0x7f1a040a9eb0" />
-                            <attribute name="allows_typedef" value="1" id="910" addr="0x7f1a040af550" />
-                            <attribute name="typepass_visit" value="1" id="911" addr="0x7f1a040af550" />
-                            <attribute name="allocate_visit" value="1" id="912" addr="0x7f1a040af550" />
-                            <attribute name="feature_iterable" value="XBMCAddon::xbmcwsgi::WsgiInputStreamIterator" id="913" addr="0x7f1a040af550" />
-                            <attribute name="kind" value="class" id="914" addr="0x7f1a040af550" />
-                            <attribute name="sym_name" value="WsgiInputStream" id="915" addr="0x7f1a040af550" />
-                            <attribute name="allocate_default_constructor" value="1" id="916" addr="0x7f1a040af550" />
-                            <attribute name="allocate_has_constructor" value="1" id="917" addr="0x7f1a040af550" />
-                            <attribute name="allocate_public_constructor" value="1" id="918" addr="0x7f1a040af550" />
-                            <attribute name="allocate_has_destructor" value="1" id="919" addr="0x7f1a040af550" />
-                            <attribute name="allocate_default_destructor" value="1" id="920" addr="0x7f1a040af550" />
-                            <attribute name="allocate_copy_constructor" value="1" id="921" addr="0x7f1a040af550" />
-                            <attribute name="privatebaselist" value="0x7f1a040a9d30" id="922" addr="0x7f1a040a9d30" />
-                            <attribute name="protectedbaselist" value="0x7f1a040a9d10" id="923" addr="0x7f1a040a9d10" />
-                            <baselist id="924" addr="0x7f1a040a9cf0" >
-                                <base name="WsgiInputStreamIterator" id="925" addr="0x7f1a040a9c70" />
+                    <class id="905" addr="0x7fb6eb3f0d50" >
+                        <attributelist id="906" addr="0x7fb6eb3f0d50" >
+                            <attribute name="name" value="XBMCAddon::xbmcwsgi::WsgiInputStream" id="907" addr="0x7fb6eb3f6550" />
+                            <attribute name="sym_symtab" value="0x7fb6eb3ee170" id="908" addr="0x7fb6eb3ee170" />
+                            <attribute name="symtab" value="0x7fb6eb3f0eb0" id="909" addr="0x7fb6eb3f0eb0" />
+                            <attribute name="allows_typedef" value="1" id="910" addr="0x7fb6eb3f6550" />
+                            <attribute name="typepass_visit" value="1" id="911" addr="0x7fb6eb3f6550" />
+                            <attribute name="allocate_visit" value="1" id="912" addr="0x7fb6eb3f6550" />
+                            <attribute name="feature_iterable" value="XBMCAddon::xbmcwsgi::WsgiInputStreamIterator" id="913" addr="0x7fb6eb3f6550" />
+                            <attribute name="kind" value="class" id="914" addr="0x7fb6eb3f6550" />
+                            <attribute name="sym_name" value="WsgiInputStream" id="915" addr="0x7fb6eb3f6550" />
+                            <attribute name="allocate_default_constructor" value="1" id="916" addr="0x7fb6eb3f6550" />
+                            <attribute name="allocate_has_constructor" value="1" id="917" addr="0x7fb6eb3f6550" />
+                            <attribute name="allocate_public_constructor" value="1" id="918" addr="0x7fb6eb3f6550" />
+                            <attribute name="allocate_has_destructor" value="1" id="919" addr="0x7fb6eb3f6550" />
+                            <attribute name="allocate_default_destructor" value="1" id="920" addr="0x7fb6eb3f6550" />
+                            <attribute name="allocate_copy_constructor" value="1" id="921" addr="0x7fb6eb3f6550" />
+                            <attribute name="privatebaselist" value="0x7fb6eb3f0d30" id="922" addr="0x7fb6eb3f0d30" />
+                            <attribute name="protectedbaselist" value="0x7fb6eb3f0d10" id="923" addr="0x7fb6eb3f0d10" />
+                            <baselist id="924" addr="0x7fb6eb3f0cf0" >
+                                <base name="WsgiInputStreamIterator" id="925" addr="0x7fb6eb3f0c70" />
                             </baselist >
-                            <attribute name="module" value="xbmcwsgi" id="926" addr="0x7f1a040a6270" />
-                            <attribute name="bases" value="0x7f1a040adab0" id="927" addr="0x7f1a040adab0" />
-                            <attribute name="allbases" value="0x7f1a040adf50" id="928" addr="0x7f1a040adf50" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="929" addr="0x7f1a040af550" />
-                            <typescope id="930" addr="0x7f1a040ad8d0" >
-                                <attributelist id="931" addr="0x7f1a040ad8d0" >
-                                    <attribute name="inherit" value="0x7f1a040adb30" id="932" addr="0x7f1a040adb30" />
-                                    <attribute name="name" value="WsgiInputStream" id="933" addr="0x7f1a040af550" />
-                                    <typetab id="934" addr="0x7f1a040ad910" >
-                                        <attributelist id="935" addr="0x7f1a040ad910" >
+                            <attribute name="module" value="xbmcwsgi" id="926" addr="0x7fb6eb3ed270" />
+                            <attribute name="bases" value="0x7fb6eb3f4ab0" id="927" addr="0x7fb6eb3f4ab0" />
+                            <attribute name="allbases" value="0x7fb6eb3f4f50" id="928" addr="0x7fb6eb3f4f50" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="929" addr="0x7fb6eb3f6550" />
+                            <typescope id="930" addr="0x7fb6eb3f48d0" >
+                                <attributelist id="931" addr="0x7fb6eb3f48d0" >
+                                    <attribute name="inherit" value="0x7fb6eb3f4b30" id="932" addr="0x7fb6eb3f4b30" />
+                                    <attribute name="name" value="WsgiInputStream" id="933" addr="0x7fb6eb3f6550" />
+                                    <typetab id="934" addr="0x7fb6eb3f4910" >
+                                        <attributelist id="935" addr="0x7fb6eb3f4910" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f1a040acab0" id="936" addr="0x7f1a040acab0" />
-                                    <attribute name="qname" value="XBMCAddon::xbmcwsgi::WsgiInputStream" id="937" addr="0x7f1a040af550" />
-                                    <attribute name="symtab" value="0x7f1a040a9eb0" id="938" addr="0x7f1a040a9eb0" />
+                                    <attribute name="parent" value="0x7fb6eb3f3ab0" id="936" addr="0x7fb6eb3f3ab0" />
+                                    <attribute name="qname" value="XBMCAddon::xbmcwsgi::WsgiInputStream" id="937" addr="0x7fb6eb3f6550" />
+                                    <attribute name="symtab" value="0x7fb6eb3f0eb0" id="938" addr="0x7fb6eb3f0eb0" />
                                 </attributelist >
-                                <typescopesitem id="939" addr="0x7f1a040adb30" >
-                                    <attributelist id="940" addr="0x7f1a040adb30" >
+                                <typescopesitem id="939" addr="0x7fb6eb3f4b30" >
+                                    <attributelist id="940" addr="0x7fb6eb3f4b30" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="941" addr="0x7f1a040ad9b0" >
-                                    <attributelist id="942" addr="0x7f1a040ad9b0" >
+                                <typescopesitem id="941" addr="0x7fb6eb3f49b0" >
+                                    <attributelist id="942" addr="0x7fb6eb3f49b0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="943" addr="0x7f1a040ad910" >
-                                    <attributelist id="944" addr="0x7f1a040ad910" >
+                                <typescopesitem id="943" addr="0x7fb6eb3f4910" >
+                                    <attributelist id="944" addr="0x7fb6eb3f4910" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="945" addr="0x7f1a040acab0" >
-                                    <attributelist id="946" addr="0x7f1a040acab0" >
-                                        <attribute name="name" value="xbmcwsgi" id="947" addr="0x7f1a040af550" />
-                                        <typetab id="948" addr="0x7f1a040acad0" >
-                                            <attributelist id="949" addr="0x7f1a040acad0" >
-                                                <attribute name="WsgiInputStreamIterator" value="WsgiInputStreamIterator" id="950" addr="0x7f1a040af550" />
-                                                <attribute name="WsgiHttpHeader" value="Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>" id="951" addr="0x7f1a040af550" />
-                                                <attribute name="WsgiErrorStream" value="WsgiErrorStream" id="952" addr="0x7f1a040af550" />
-                                                <attribute name="WsgiInputStream" value="WsgiInputStream" id="953" addr="0x7f1a040af550" />
-                                                <attribute name="WsgiResponse" value="WsgiResponse" id="954" addr="0x7f1a040af550" />
-                                                <attribute name="WsgiResponseBody" value="WsgiResponseBody" id="955" addr="0x7f1a040af550" />
+                                <typescopesitem id="945" addr="0x7fb6eb3f3ab0" >
+                                    <attributelist id="946" addr="0x7fb6eb3f3ab0" >
+                                        <attribute name="name" value="xbmcwsgi" id="947" addr="0x7fb6eb3f6550" />
+                                        <typetab id="948" addr="0x7fb6eb3f3ad0" >
+                                            <attributelist id="949" addr="0x7fb6eb3f3ad0" >
+                                                <attribute name="WsgiInputStreamIterator" value="WsgiInputStreamIterator" id="950" addr="0x7fb6eb3f6550" />
+                                                <attribute name="WsgiHttpHeader" value="Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>" id="951" addr="0x7fb6eb3f6550" />
+                                                <attribute name="WsgiErrorStream" value="WsgiErrorStream" id="952" addr="0x7fb6eb3f6550" />
+                                                <attribute name="WsgiInputStream" value="WsgiInputStream" id="953" addr="0x7fb6eb3f6550" />
+                                                <attribute name="WsgiResponse" value="WsgiResponse" id="954" addr="0x7fb6eb3f6550" />
+                                                <attribute name="WsgiResponseBody" value="WsgiResponseBody" id="955" addr="0x7fb6eb3f6550" />
                                             </attributelist >
-                                            <typetabsitem id="956" addr="0x7f1a040ad450" >
-                                                <attributelist id="957" addr="0x7f1a040ad450" >
+                                            <typetabsitem id="956" addr="0x7fb6eb3f4450" >
+                                                <attributelist id="957" addr="0x7fb6eb3f4450" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="958" addr="0x7f1a040adff0" >
-                                                <attributelist id="959" addr="0x7f1a040adff0" >
+                                            <typetabsitem id="958" addr="0x7fb6eb3f4ff0" >
+                                                <attributelist id="959" addr="0x7fb6eb3f4ff0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="960" addr="0x7f1a040acbb0" >
-                                                <attributelist id="961" addr="0x7f1a040acbb0" >
+                                            <typetabsitem id="960" addr="0x7fb6eb3f3bb0" >
+                                                <attributelist id="961" addr="0x7fb6eb3f3bb0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="962" addr="0x7f1a040ad830" >
-                                                <attributelist id="963" addr="0x7f1a040ad830" >
+                                            <typetabsitem id="962" addr="0x7fb6eb3f4830" >
+                                                <attributelist id="963" addr="0x7fb6eb3f4830" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="964" addr="0x7f1a040ae250" >
-                                                <attributelist id="965" addr="0x7f1a040ae250" >
+                                            <typetabsitem id="964" addr="0x7fb6eb3f5250" >
+                                                <attributelist id="965" addr="0x7fb6eb3f5250" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="966" addr="0x7f1a040aebb0" >
-                                                <attributelist id="967" addr="0x7f1a040aebb0" >
+                                            <typetabsitem id="966" addr="0x7fb6eb3f5bb0" >
+                                                <attributelist id="967" addr="0x7fb6eb3f5bb0" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7f1a040ac650" id="968" addr="0x7f1a040ac650" />
-                                        <attribute name="qname" value="XBMCAddon::xbmcwsgi" id="969" addr="0x7f1a040af550" />
-                                        <attribute name="symtab" value="0x7f1a040a7170" id="970" addr="0x7f1a040a7170" />
+                                        <attribute name="parent" value="0x7fb6eb3f3650" id="968" addr="0x7fb6eb3f3650" />
+                                        <attribute name="qname" value="XBMCAddon::xbmcwsgi" id="969" addr="0x7fb6eb3f6550" />
+                                        <attribute name="symtab" value="0x7fb6eb3ee170" id="970" addr="0x7fb6eb3ee170" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="971" addr="0x7f1a040ada10" >
-                                    <attributelist id="972" addr="0x7f1a040ada10" >
+                                <typescopesitem id="971" addr="0x7fb6eb3f4a10" >
+                                    <attributelist id="972" addr="0x7fb6eb3f4a10" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="973" addr="0x7f1a040a9eb0" >
-                                    <attributelist id="974" addr="0x7f1a040a9eb0" >
-                                        <attribute name="inherit" value="0x7f1a040a9f10" id="975" addr="0x7f1a040a9f10" />
-                                        <attribute name="name" value="WsgiInputStream" id="976" addr="0x7f1a040af550" />
-                                        <attribute name="csymtab" value="0x7f1a040a9ed0" id="977" addr="0x7f1a040a9ed0" />
-                                        <attribute name="symtab" value="0x7f1a040a9e90" id="978" addr="0x7f1a040a9e90" />
+                                <typescopesitem id="973" addr="0x7fb6eb3f0eb0" >
+                                    <attributelist id="974" addr="0x7fb6eb3f0eb0" >
+                                        <attribute name="inherit" value="0x7fb6eb3f0f10" id="975" addr="0x7fb6eb3f0f10" />
+                                        <attribute name="name" value="WsgiInputStream" id="976" addr="0x7fb6eb3f6550" />
+                                        <attribute name="csymtab" value="0x7fb6eb3f0ed0" id="977" addr="0x7fb6eb3f0ed0" />
+                                        <attribute name="symtab" value="0x7fb6eb3f0e90" id="978" addr="0x7fb6eb3f0e90" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <access id="979" addr="0x7f1a040a9e30" >
-                            <attributelist id="980" addr="0x7f1a040a9e30" >
-                                <attribute name="kind" value="public" id="981" addr="0x7f1a040af550" />
+                        <access id="979" addr="0x7fb6eb3f0e30" >
+                            <attributelist id="980" addr="0x7fb6eb3f0e30" >
+                                <attribute name="kind" value="public" id="981" addr="0x7fb6eb3f6550" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="982" addr="0x7f1a040aa010" >
-                            <attributelist id="983" addr="0x7f1a040aa010" >
-                                <attribute name="ismember" value="1" id="984" addr="0x7f1a040af550" />
-                                <attribute name="sym_name" value="WsgiInputStream" id="985" addr="0x7f1a040af550" />
-                                <attribute name="name" value="WsgiInputStream" id="986" addr="0x7f1a040af550" />
-                                <attribute name="decl" value="f()." id="987" addr="0x7f1a040af550" />
-                                <attribute name="access" value="public" id="988" addr="0x7f1a040af550" />
-                                <attribute name="feature_new" value="1" id="989" addr="0x7f1a040af550" />
-                                <attribute name="feature_iterable" value="XBMCAddon::xbmcwsgi::WsgiInputStreamIterator" id="990" addr="0x7f1a040af550" />
-                                <attribute name="sym_symtab" value="0x7f1a040a9eb0" id="991" addr="0x7f1a040a9eb0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="992" addr="0x7f1a040af550" />
+                        <constructor id="982" addr="0x7fb6eb3f1010" >
+                            <attributelist id="983" addr="0x7fb6eb3f1010" >
+                                <attribute name="ismember" value="1" id="984" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_name" value="WsgiInputStream" id="985" addr="0x7fb6eb3f6550" />
+                                <attribute name="name" value="WsgiInputStream" id="986" addr="0x7fb6eb3f6550" />
+                                <attribute name="decl" value="f()." id="987" addr="0x7fb6eb3f6550" />
+                                <attribute name="access" value="public" id="988" addr="0x7fb6eb3f6550" />
+                                <attribute name="feature_new" value="1" id="989" addr="0x7fb6eb3f6550" />
+                                <attribute name="feature_iterable" value="XBMCAddon::xbmcwsgi::WsgiInputStreamIterator" id="990" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_symtab" value="0x7fb6eb3f0eb0" id="991" addr="0x7fb6eb3f0eb0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="992" addr="0x7fb6eb3f6550" />
                             </attributelist >
                          
                         </constructor >
-                        <destructor id="993" addr="0x7f1a040aa190" >
-                            <attributelist id="994" addr="0x7f1a040aa190" >
-                                <attribute name="ismember" value="1" id="995" addr="0x7f1a040af550" />
-                                <attribute name="sym_name" value="~WsgiInputStream" id="996" addr="0x7f1a040af550" />
-                                <attribute name="name" value="~WsgiInputStream" id="997" addr="0x7f1a040af550" />
-                                <attribute name="decl" value="f()." id="998" addr="0x7f1a040af550" />
-                                <attribute name="access" value="public" id="999" addr="0x7f1a040af550" />
-                                <attribute name="sym_symtab" value="0x7f1a040a9eb0" id="1000" addr="0x7f1a040a9eb0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="1001" addr="0x7f1a040af550" />
+                        <destructor id="993" addr="0x7fb6eb3f1190" >
+                            <attributelist id="994" addr="0x7fb6eb3f1190" >
+                                <attribute name="ismember" value="1" id="995" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_name" value="~WsgiInputStream" id="996" addr="0x7fb6eb3f6550" />
+                                <attribute name="name" value="~WsgiInputStream" id="997" addr="0x7fb6eb3f6550" />
+                                <attribute name="decl" value="f()." id="998" addr="0x7fb6eb3f6550" />
+                                <attribute name="access" value="public" id="999" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_symtab" value="0x7fb6eb3f0eb0" id="1000" addr="0x7fb6eb3f0eb0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="1001" addr="0x7fb6eb3f6550" />
                             </attributelist >
                          
                         </destructor >
@@ -1548,376 +1548,376 @@
                 </namespace >
             </namespace >
         </include >
-        <include id="1002" addr="0x7f1a040aa350" >
-            <attributelist id="1003" addr="0x7f1a040aa350" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/wsgi/WsgiResponse.h" id="1004" addr="0x7f1a040af550" />
+        <include id="1002" addr="0x7fb6eb3f1350" >
+            <attributelist id="1003" addr="0x7fb6eb3f1350" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/wsgi/WsgiResponse.h" id="1004" addr="0x7fb6eb3f6550" />
             </attributelist >
 
-            <namespace id="1005" addr="0x7f1a040aa3f0" >
-                <attributelist id="1006" addr="0x7f1a040aa3f0" >
-                    <attribute name="sym_name" value="XBMCAddon" id="1007" addr="0x7f1a040af550" />
-                    <attribute name="name" value="XBMCAddon" id="1008" addr="0x7f1a040af550" />
-                    <attribute name="sym_previousSibling" value="0x7f1a040a8590" id="1009" addr="0x7f1a040a8590" />
-                    <attribute name="csym_nextSibling" value="0x7f1a040ab990" id="1010" addr="0x7f1a040ab990" />
-                    <attribute name="sym_nextSibling" value="0x7f1a040ab990" id="1011" addr="0x7f1a040ab990" />
-                    <typescope id="1012" addr="0x7f1a040ac650" >
-                        <attributelist id="1013" addr="0x7f1a040ac650" >
-                            <attribute name="name" value="XBMCAddon" id="1014" addr="0x7f1a040af550" />
-                            <typetab id="1015" addr="0x7f1a040ac690" >
-                                <attributelist id="1016" addr="0x7f1a040ac690" >
-                                    <attribute name="String" value="std::string" id="1017" addr="0x7f1a040af550" />
+            <namespace id="1005" addr="0x7fb6eb3f13f0" >
+                <attributelist id="1006" addr="0x7fb6eb3f13f0" >
+                    <attribute name="sym_name" value="XBMCAddon" id="1007" addr="0x7fb6eb3f6550" />
+                    <attribute name="name" value="XBMCAddon" id="1008" addr="0x7fb6eb3f6550" />
+                    <attribute name="sym_previousSibling" value="0x7fb6eb3ef590" id="1009" addr="0x7fb6eb3ef590" />
+                    <attribute name="csym_nextSibling" value="0x7fb6eb3f2990" id="1010" addr="0x7fb6eb3f2990" />
+                    <attribute name="sym_nextSibling" value="0x7fb6eb3f2990" id="1011" addr="0x7fb6eb3f2990" />
+                    <typescope id="1012" addr="0x7fb6eb3f3650" >
+                        <attributelist id="1013" addr="0x7fb6eb3f3650" >
+                            <attribute name="name" value="XBMCAddon" id="1014" addr="0x7fb6eb3f6550" />
+                            <typetab id="1015" addr="0x7fb6eb3f3690" >
+                                <attributelist id="1016" addr="0x7fb6eb3f3690" >
+                                    <attribute name="String" value="std::string" id="1017" addr="0x7fb6eb3f6550" />
                                 </attributelist >
-                                <typetabsitem id="1018" addr="0x7f1a040ac870" >
-                                    <attributelist id="1019" addr="0x7f1a040ac870" >
+                                <typetabsitem id="1018" addr="0x7fb6eb3f3870" >
+                                    <attributelist id="1019" addr="0x7fb6eb3f3870" >
                                     </attributelist >
                                 </typetabsitem >
                             </typetab >
-                            <attribute name="parent" value="0x7f1a0408fa30" id="1020" addr="0x7f1a0408fa30" />
-                            <attribute name="qname" value="XBMCAddon" id="1021" addr="0x7f1a040af550" />
-                            <attribute name="symtab" value="0x7f1a040a6950" id="1022" addr="0x7f1a040a6950" />
+                            <attribute name="parent" value="0x7fb6eb3d6a30" id="1020" addr="0x7fb6eb3d6a30" />
+                            <attribute name="qname" value="XBMCAddon" id="1021" addr="0x7fb6eb3f6550" />
+                            <attribute name="symtab" value="0x7fb6eb3ed950" id="1022" addr="0x7fb6eb3ed950" />
                         </attributelist >
-                        <typescopesitem id="1023" addr="0x7f1a040a6910" >
-                            <attributelist id="1024" addr="0x7f1a040a6910" >
+                        <typescopesitem id="1023" addr="0x7fb6eb3ed910" >
+                            <attributelist id="1024" addr="0x7fb6eb3ed910" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="1025" addr="0x7f1a040ac690" >
-                            <attributelist id="1026" addr="0x7f1a040ac690" >
-                                <attribute name="String" value="std::string" id="1027" addr="0x7f1a040af550" />
+                        <typescopesitem id="1025" addr="0x7fb6eb3f3690" >
+                            <attributelist id="1026" addr="0x7fb6eb3f3690" >
+                                <attribute name="String" value="std::string" id="1027" addr="0x7fb6eb3f6550" />
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="1028" addr="0x7f1a0408fa30" >
-                            <attributelist id="1029" addr="0x7f1a0408fa30" >
-                                <attribute name="name" value="" id="1030" addr="0x7f1a040af550" />
-                                <typetab id="1031" addr="0x7f1a0408fa90" >
-                                    <attributelist id="1032" addr="0x7f1a0408fa90" >
-                                        <attribute name="HTTPPythonRequest" value="HTTPPythonRequest" id="1033" addr="0x7f1a040af550" />
+                        <typescopesitem id="1028" addr="0x7fb6eb3d6a30" >
+                            <attributelist id="1029" addr="0x7fb6eb3d6a30" >
+                                <attribute name="name" value="" id="1030" addr="0x7fb6eb3f6550" />
+                                <typetab id="1031" addr="0x7fb6eb3d6a90" >
+                                    <attributelist id="1032" addr="0x7fb6eb3d6a90" >
+                                        <attribute name="HTTPPythonRequest" value="HTTPPythonRequest" id="1033" addr="0x7fb6eb3f6550" />
                                     </attributelist >
-                                    <typetabsitem id="1034" addr="0x7f1a040ac7b0" >
-                                        <attributelist id="1035" addr="0x7f1a040ac7b0" >
+                                    <typetabsitem id="1034" addr="0x7fb6eb3f37b0" >
+                                        <attributelist id="1035" addr="0x7fb6eb3f37b0" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="1036" addr="0x7f1a040ac790" >
-                            <attributelist id="1037" addr="0x7f1a040ac790" >
+                        <typescopesitem id="1036" addr="0x7fb6eb3f3790" >
+                            <attributelist id="1037" addr="0x7fb6eb3f3790" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="1038" addr="0x7f1a040a6950" >
-                            <attributelist id="1039" addr="0x7f1a040a6950" >
-                                <attribute name="name" value="XBMCAddon" id="1040" addr="0x7f1a040af550" />
-                                <attribute name="csymtab" value="0x7f1a040a6990" id="1041" addr="0x7f1a040a6990" />
-                                <attribute name="symtab" value="0x7f1a040a6930" id="1042" addr="0x7f1a040a6930" />
+                        <typescopesitem id="1038" addr="0x7fb6eb3ed950" >
+                            <attributelist id="1039" addr="0x7fb6eb3ed950" >
+                                <attribute name="name" value="XBMCAddon" id="1040" addr="0x7fb6eb3f6550" />
+                                <attribute name="csymtab" value="0x7fb6eb3ed990" id="1041" addr="0x7fb6eb3ed990" />
+                                <attribute name="symtab" value="0x7fb6eb3ed930" id="1042" addr="0x7fb6eb3ed930" />
                             </attributelist >
                         </typescopesitem >
                     </typescope >
-                    <attribute name="symtab" value="0x7f1a040a6950" id="1043" addr="0x7f1a040a6950" />
-                    <attribute name="sym_symtab" value="0x7f1a0408f950" id="1044" addr="0x7f1a0408f950" />
+                    <attribute name="symtab" value="0x7fb6eb3ed950" id="1043" addr="0x7fb6eb3ed950" />
+                    <attribute name="sym_symtab" value="0x7fb6eb3d6950" id="1044" addr="0x7fb6eb3d6950" />
                 </attributelist >
 
-                <namespace id="1045" addr="0x7f1a040aa470" >
-                    <attributelist id="1046" addr="0x7f1a040aa470" >
-                        <attribute name="sym_name" value="xbmcwsgi" id="1047" addr="0x7f1a040af550" />
-                        <attribute name="name" value="xbmcwsgi" id="1048" addr="0x7f1a040af550" />
-                        <attribute name="sym_previousSibling" value="0x7f1a040a8610" id="1049" addr="0x7f1a040a8610" />
-                        <attribute name="csym_nextSibling" value="0x7f1a040aba10" id="1050" addr="0x7f1a040aba10" />
-                        <attribute name="sym_nextSibling" value="0x7f1a040aba10" id="1051" addr="0x7f1a040aba10" />
-                        <typescope id="1052" addr="0x7f1a040acab0" >
-                            <attributelist id="1053" addr="0x7f1a040acab0" >
-                                <attribute name="name" value="xbmcwsgi" id="1054" addr="0x7f1a040af550" />
-                                <typetab id="1055" addr="0x7f1a040acad0" >
-                                    <attributelist id="1056" addr="0x7f1a040acad0" >
-                                        <attribute name="WsgiInputStreamIterator" value="WsgiInputStreamIterator" id="1057" addr="0x7f1a040af550" />
-                                        <attribute name="WsgiHttpHeader" value="Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>" id="1058" addr="0x7f1a040af550" />
-                                        <attribute name="WsgiErrorStream" value="WsgiErrorStream" id="1059" addr="0x7f1a040af550" />
-                                        <attribute name="WsgiInputStream" value="WsgiInputStream" id="1060" addr="0x7f1a040af550" />
-                                        <attribute name="WsgiResponse" value="WsgiResponse" id="1061" addr="0x7f1a040af550" />
-                                        <attribute name="WsgiResponseBody" value="WsgiResponseBody" id="1062" addr="0x7f1a040af550" />
+                <namespace id="1045" addr="0x7fb6eb3f1470" >
+                    <attributelist id="1046" addr="0x7fb6eb3f1470" >
+                        <attribute name="sym_name" value="xbmcwsgi" id="1047" addr="0x7fb6eb3f6550" />
+                        <attribute name="name" value="xbmcwsgi" id="1048" addr="0x7fb6eb3f6550" />
+                        <attribute name="sym_previousSibling" value="0x7fb6eb3ef610" id="1049" addr="0x7fb6eb3ef610" />
+                        <attribute name="csym_nextSibling" value="0x7fb6eb3f2a10" id="1050" addr="0x7fb6eb3f2a10" />
+                        <attribute name="sym_nextSibling" value="0x7fb6eb3f2a10" id="1051" addr="0x7fb6eb3f2a10" />
+                        <typescope id="1052" addr="0x7fb6eb3f3ab0" >
+                            <attributelist id="1053" addr="0x7fb6eb3f3ab0" >
+                                <attribute name="name" value="xbmcwsgi" id="1054" addr="0x7fb6eb3f6550" />
+                                <typetab id="1055" addr="0x7fb6eb3f3ad0" >
+                                    <attributelist id="1056" addr="0x7fb6eb3f3ad0" >
+                                        <attribute name="WsgiInputStreamIterator" value="WsgiInputStreamIterator" id="1057" addr="0x7fb6eb3f6550" />
+                                        <attribute name="WsgiHttpHeader" value="Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>" id="1058" addr="0x7fb6eb3f6550" />
+                                        <attribute name="WsgiErrorStream" value="WsgiErrorStream" id="1059" addr="0x7fb6eb3f6550" />
+                                        <attribute name="WsgiInputStream" value="WsgiInputStream" id="1060" addr="0x7fb6eb3f6550" />
+                                        <attribute name="WsgiResponse" value="WsgiResponse" id="1061" addr="0x7fb6eb3f6550" />
+                                        <attribute name="WsgiResponseBody" value="WsgiResponseBody" id="1062" addr="0x7fb6eb3f6550" />
                                     </attributelist >
-                                    <typetabsitem id="1063" addr="0x7f1a040ad450" >
-                                        <attributelist id="1064" addr="0x7f1a040ad450" >
+                                    <typetabsitem id="1063" addr="0x7fb6eb3f4450" >
+                                        <attributelist id="1064" addr="0x7fb6eb3f4450" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1065" addr="0x7f1a040adff0" >
-                                        <attributelist id="1066" addr="0x7f1a040adff0" >
+                                    <typetabsitem id="1065" addr="0x7fb6eb3f4ff0" >
+                                        <attributelist id="1066" addr="0x7fb6eb3f4ff0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1067" addr="0x7f1a040acbb0" >
-                                        <attributelist id="1068" addr="0x7f1a040acbb0" >
+                                    <typetabsitem id="1067" addr="0x7fb6eb3f3bb0" >
+                                        <attributelist id="1068" addr="0x7fb6eb3f3bb0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1069" addr="0x7f1a040ad830" >
-                                        <attributelist id="1070" addr="0x7f1a040ad830" >
+                                    <typetabsitem id="1069" addr="0x7fb6eb3f4830" >
+                                        <attributelist id="1070" addr="0x7fb6eb3f4830" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1071" addr="0x7f1a040ae250" >
-                                        <attributelist id="1072" addr="0x7f1a040ae250" >
+                                    <typetabsitem id="1071" addr="0x7fb6eb3f5250" >
+                                        <attributelist id="1072" addr="0x7fb6eb3f5250" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1073" addr="0x7f1a040aebb0" >
-                                        <attributelist id="1074" addr="0x7f1a040aebb0" >
+                                    <typetabsitem id="1073" addr="0x7fb6eb3f5bb0" >
+                                        <attributelist id="1074" addr="0x7fb6eb3f5bb0" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
-                                <attribute name="parent" value="0x7f1a040ac650" id="1075" addr="0x7f1a040ac650" />
-                                <attribute name="qname" value="XBMCAddon::xbmcwsgi" id="1076" addr="0x7f1a040af550" />
-                                <attribute name="symtab" value="0x7f1a040a7170" id="1077" addr="0x7f1a040a7170" />
+                                <attribute name="parent" value="0x7fb6eb3f3650" id="1075" addr="0x7fb6eb3f3650" />
+                                <attribute name="qname" value="XBMCAddon::xbmcwsgi" id="1076" addr="0x7fb6eb3f6550" />
+                                <attribute name="symtab" value="0x7fb6eb3ee170" id="1077" addr="0x7fb6eb3ee170" />
                             </attributelist >
-                            <typescopesitem id="1078" addr="0x7f1a040a7130" >
-                                <attributelist id="1079" addr="0x7f1a040a7130" >
+                            <typescopesitem id="1078" addr="0x7fb6eb3ee130" >
+                                <attributelist id="1079" addr="0x7fb6eb3ee130" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="1080" addr="0x7f1a040acad0" >
-                                <attributelist id="1081" addr="0x7f1a040acad0" >
-                                    <attribute name="WsgiInputStreamIterator" value="WsgiInputStreamIterator" id="1082" addr="0x7f1a040af550" />
-                                    <attribute name="WsgiHttpHeader" value="Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>" id="1083" addr="0x7f1a040af550" />
-                                    <attribute name="WsgiErrorStream" value="WsgiErrorStream" id="1084" addr="0x7f1a040af550" />
-                                    <attribute name="WsgiInputStream" value="WsgiInputStream" id="1085" addr="0x7f1a040af550" />
-                                    <attribute name="WsgiResponse" value="WsgiResponse" id="1086" addr="0x7f1a040af550" />
-                                    <attribute name="WsgiResponseBody" value="WsgiResponseBody" id="1087" addr="0x7f1a040af550" />
+                            <typescopesitem id="1080" addr="0x7fb6eb3f3ad0" >
+                                <attributelist id="1081" addr="0x7fb6eb3f3ad0" >
+                                    <attribute name="WsgiInputStreamIterator" value="WsgiInputStreamIterator" id="1082" addr="0x7fb6eb3f6550" />
+                                    <attribute name="WsgiHttpHeader" value="Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>" id="1083" addr="0x7fb6eb3f6550" />
+                                    <attribute name="WsgiErrorStream" value="WsgiErrorStream" id="1084" addr="0x7fb6eb3f6550" />
+                                    <attribute name="WsgiInputStream" value="WsgiInputStream" id="1085" addr="0x7fb6eb3f6550" />
+                                    <attribute name="WsgiResponse" value="WsgiResponse" id="1086" addr="0x7fb6eb3f6550" />
+                                    <attribute name="WsgiResponseBody" value="WsgiResponseBody" id="1087" addr="0x7fb6eb3f6550" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="1088" addr="0x7f1a040ac650" >
-                                <attributelist id="1089" addr="0x7f1a040ac650" >
-                                    <attribute name="name" value="XBMCAddon" id="1090" addr="0x7f1a040af550" />
-                                    <typetab id="1091" addr="0x7f1a040ac690" >
-                                        <attributelist id="1092" addr="0x7f1a040ac690" >
-                                            <attribute name="String" value="std::string" id="1093" addr="0x7f1a040af550" />
+                            <typescopesitem id="1088" addr="0x7fb6eb3f3650" >
+                                <attributelist id="1089" addr="0x7fb6eb3f3650" >
+                                    <attribute name="name" value="XBMCAddon" id="1090" addr="0x7fb6eb3f6550" />
+                                    <typetab id="1091" addr="0x7fb6eb3f3690" >
+                                        <attributelist id="1092" addr="0x7fb6eb3f3690" >
+                                            <attribute name="String" value="std::string" id="1093" addr="0x7fb6eb3f6550" />
                                         </attributelist >
-                                        <typetabsitem id="1094" addr="0x7f1a040ac870" >
-                                            <attributelist id="1095" addr="0x7f1a040ac870" >
+                                        <typetabsitem id="1094" addr="0x7fb6eb3f3870" >
+                                            <attributelist id="1095" addr="0x7fb6eb3f3870" >
                                             </attributelist >
                                         </typetabsitem >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f1a0408fa30" id="1096" addr="0x7f1a0408fa30" />
-                                    <attribute name="qname" value="XBMCAddon" id="1097" addr="0x7f1a040af550" />
-                                    <attribute name="symtab" value="0x7f1a040a6950" id="1098" addr="0x7f1a040a6950" />
+                                    <attribute name="parent" value="0x7fb6eb3d6a30" id="1096" addr="0x7fb6eb3d6a30" />
+                                    <attribute name="qname" value="XBMCAddon" id="1097" addr="0x7fb6eb3f6550" />
+                                    <attribute name="symtab" value="0x7fb6eb3ed950" id="1098" addr="0x7fb6eb3ed950" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="1099" addr="0x7f1a040acaf0" >
-                                <attributelist id="1100" addr="0x7f1a040acaf0" >
+                            <typescopesitem id="1099" addr="0x7fb6eb3f3af0" >
+                                <attributelist id="1100" addr="0x7fb6eb3f3af0" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="1101" addr="0x7f1a040a7170" >
-                                <attributelist id="1102" addr="0x7f1a040a7170" >
-                                    <attribute name="name" value="xbmcwsgi" id="1103" addr="0x7f1a040af550" />
-                                    <attribute name="csymtab" value="0x7f1a040a71b0" id="1104" addr="0x7f1a040a71b0" />
-                                    <attribute name="symtab" value="0x7f1a040a7150" id="1105" addr="0x7f1a040a7150" />
+                            <typescopesitem id="1101" addr="0x7fb6eb3ee170" >
+                                <attributelist id="1102" addr="0x7fb6eb3ee170" >
+                                    <attribute name="name" value="xbmcwsgi" id="1103" addr="0x7fb6eb3f6550" />
+                                    <attribute name="csymtab" value="0x7fb6eb3ee1b0" id="1104" addr="0x7fb6eb3ee1b0" />
+                                    <attribute name="symtab" value="0x7fb6eb3ee150" id="1105" addr="0x7fb6eb3ee150" />
                                 </attributelist >
                             </typescopesitem >
                         </typescope >
-                        <attribute name="symtab" value="0x7f1a040a7170" id="1106" addr="0x7f1a040a7170" />
-                        <attribute name="sym_symtab" value="0x7f1a040a6950" id="1107" addr="0x7f1a040a6950" />
+                        <attribute name="symtab" value="0x7fb6eb3ee170" id="1106" addr="0x7fb6eb3ee170" />
+                        <attribute name="sym_symtab" value="0x7fb6eb3ed950" id="1107" addr="0x7fb6eb3ed950" />
                     </attributelist >
 
-                    <cdecl id="1108" addr="0x7f1a040aa6d0" >
-                        <attributelist id="1109" addr="0x7f1a040aa6d0" >
-                            <attribute name="sym_name" value="WsgiHttpHeader" id="1110" addr="0x7f1a040af550" />
-                            <attribute name="name" value="XBMCAddon::xbmcwsgi::WsgiHttpHeader" id="1111" addr="0x7f1a040af550" />
-                            <attribute name="decl" value="" id="1112" addr="0x7f1a040af550" />
-                            <attribute name="storage" value="typedef" id="1113" addr="0x7f1a040af550" />
-                            <attribute name="kind" value="typedef" id="1114" addr="0x7f1a040af550" />
-                            <attribute name="type" value="Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>" id="1115" addr="0x7f1a040af550" />
-                            <attribute name="sym_symtab" value="0x7f1a040a7170" id="1116" addr="0x7f1a040a7170" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1117" addr="0x7f1a040af550" />
+                    <cdecl id="1108" addr="0x7fb6eb3f16d0" >
+                        <attributelist id="1109" addr="0x7fb6eb3f16d0" >
+                            <attribute name="sym_name" value="WsgiHttpHeader" id="1110" addr="0x7fb6eb3f6550" />
+                            <attribute name="name" value="XBMCAddon::xbmcwsgi::WsgiHttpHeader" id="1111" addr="0x7fb6eb3f6550" />
+                            <attribute name="decl" value="" id="1112" addr="0x7fb6eb3f6550" />
+                            <attribute name="storage" value="typedef" id="1113" addr="0x7fb6eb3f6550" />
+                            <attribute name="kind" value="typedef" id="1114" addr="0x7fb6eb3f6550" />
+                            <attribute name="type" value="Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>" id="1115" addr="0x7fb6eb3f6550" />
+                            <attribute name="sym_symtab" value="0x7fb6eb3ee170" id="1116" addr="0x7fb6eb3ee170" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1117" addr="0x7fb6eb3f6550" />
                         </attributelist >
                      
                     </cdecl >
-                    <class id="1118" addr="0x7f1a040aa8f0" >
-                        <attributelist id="1119" addr="0x7f1a040aa8f0" >
-                            <attribute name="name" value="XBMCAddon::xbmcwsgi::WsgiResponse" id="1120" addr="0x7f1a040af550" />
-                            <attribute name="sym_symtab" value="0x7f1a040a7170" id="1121" addr="0x7f1a040a7170" />
-                            <attribute name="symtab" value="0x7f1a040aabb0" id="1122" addr="0x7f1a040aabb0" />
-                            <attribute name="allows_typedef" value="1" id="1123" addr="0x7f1a040af550" />
-                            <attribute name="typepass_visit" value="1" id="1124" addr="0x7f1a040af550" />
-                            <attribute name="allocate_visit" value="1" id="1125" addr="0x7f1a040af550" />
-                            <attribute name="kind" value="class" id="1126" addr="0x7f1a040af550" />
-                            <attribute name="sym_name" value="WsgiResponse" id="1127" addr="0x7f1a040af550" />
-                            <attribute name="allocate_default_constructor" value="1" id="1128" addr="0x7f1a040af550" />
-                            <attribute name="allocate_has_constructor" value="1" id="1129" addr="0x7f1a040af550" />
-                            <attribute name="allocate_public_constructor" value="1" id="1130" addr="0x7f1a040af550" />
-                            <attribute name="allocate_has_destructor" value="1" id="1131" addr="0x7f1a040af550" />
-                            <attribute name="allocate_default_destructor" value="1" id="1132" addr="0x7f1a040af550" />
-                            <attribute name="allocate_copy_constructor" value="1" id="1133" addr="0x7f1a040af550" />
-                            <attribute name="privatebaselist" value="0x7f1a040aa8d0" id="1134" addr="0x7f1a040aa8d0" />
-                            <attribute name="protectedbaselist" value="0x7f1a040aa8b0" id="1135" addr="0x7f1a040aa8b0" />
-                            <baselist id="1136" addr="0x7f1a040aaab0" >
-                                <base name="AddonClass" id="1137" addr="0x7f1a040aa870" />
+                    <class id="1118" addr="0x7fb6eb3f18f0" >
+                        <attributelist id="1119" addr="0x7fb6eb3f18f0" >
+                            <attribute name="name" value="XBMCAddon::xbmcwsgi::WsgiResponse" id="1120" addr="0x7fb6eb3f6550" />
+                            <attribute name="sym_symtab" value="0x7fb6eb3ee170" id="1121" addr="0x7fb6eb3ee170" />
+                            <attribute name="symtab" value="0x7fb6eb3f1bb0" id="1122" addr="0x7fb6eb3f1bb0" />
+                            <attribute name="allows_typedef" value="1" id="1123" addr="0x7fb6eb3f6550" />
+                            <attribute name="typepass_visit" value="1" id="1124" addr="0x7fb6eb3f6550" />
+                            <attribute name="allocate_visit" value="1" id="1125" addr="0x7fb6eb3f6550" />
+                            <attribute name="kind" value="class" id="1126" addr="0x7fb6eb3f6550" />
+                            <attribute name="sym_name" value="WsgiResponse" id="1127" addr="0x7fb6eb3f6550" />
+                            <attribute name="allocate_default_constructor" value="1" id="1128" addr="0x7fb6eb3f6550" />
+                            <attribute name="allocate_has_constructor" value="1" id="1129" addr="0x7fb6eb3f6550" />
+                            <attribute name="allocate_public_constructor" value="1" id="1130" addr="0x7fb6eb3f6550" />
+                            <attribute name="allocate_has_destructor" value="1" id="1131" addr="0x7fb6eb3f6550" />
+                            <attribute name="allocate_default_destructor" value="1" id="1132" addr="0x7fb6eb3f6550" />
+                            <attribute name="allocate_copy_constructor" value="1" id="1133" addr="0x7fb6eb3f6550" />
+                            <attribute name="privatebaselist" value="0x7fb6eb3f18d0" id="1134" addr="0x7fb6eb3f18d0" />
+                            <attribute name="protectedbaselist" value="0x7fb6eb3f18b0" id="1135" addr="0x7fb6eb3f18b0" />
+                            <baselist id="1136" addr="0x7fb6eb3f1ab0" >
+                                <base name="AddonClass" id="1137" addr="0x7fb6eb3f1870" />
                             </baselist >
-                            <attribute name="module" value="xbmcwsgi" id="1138" addr="0x7f1a040a6270" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1139" addr="0x7f1a040af550" />
-                            <typescope id="1140" addr="0x7f1a040ae2d0" >
-                                <attributelist id="1141" addr="0x7f1a040ae2d0" >
-                                    <attribute name="name" value="WsgiResponse" id="1142" addr="0x7f1a040af550" />
-                                    <typetab id="1143" addr="0x7f1a040ae2f0" >
-                                        <attributelist id="1144" addr="0x7f1a040ae2f0" >
+                            <attribute name="module" value="xbmcwsgi" id="1138" addr="0x7fb6eb3ed270" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1139" addr="0x7fb6eb3f6550" />
+                            <typescope id="1140" addr="0x7fb6eb3f52d0" >
+                                <attributelist id="1141" addr="0x7fb6eb3f52d0" >
+                                    <attribute name="name" value="WsgiResponse" id="1142" addr="0x7fb6eb3f6550" />
+                                    <typetab id="1143" addr="0x7fb6eb3f52f0" >
+                                        <attributelist id="1144" addr="0x7fb6eb3f52f0" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f1a040acab0" id="1145" addr="0x7f1a040acab0" />
-                                    <attribute name="qname" value="XBMCAddon::xbmcwsgi::WsgiResponse" id="1146" addr="0x7f1a040af550" />
-                                    <attribute name="symtab" value="0x7f1a040aabb0" id="1147" addr="0x7f1a040aabb0" />
+                                    <attribute name="parent" value="0x7fb6eb3f3ab0" id="1145" addr="0x7fb6eb3f3ab0" />
+                                    <attribute name="qname" value="XBMCAddon::xbmcwsgi::WsgiResponse" id="1146" addr="0x7fb6eb3f6550" />
+                                    <attribute name="symtab" value="0x7fb6eb3f1bb0" id="1147" addr="0x7fb6eb3f1bb0" />
                                 </attributelist >
-                                <typescopesitem id="1148" addr="0x7f1a040ae2b0" >
-                                    <attributelist id="1149" addr="0x7f1a040ae2b0" >
+                                <typescopesitem id="1148" addr="0x7fb6eb3f52b0" >
+                                    <attributelist id="1149" addr="0x7fb6eb3f52b0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="1150" addr="0x7f1a040ae2f0" >
-                                    <attributelist id="1151" addr="0x7f1a040ae2f0" >
+                                <typescopesitem id="1150" addr="0x7fb6eb3f52f0" >
+                                    <attributelist id="1151" addr="0x7fb6eb3f52f0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="1152" addr="0x7f1a040acab0" >
-                                    <attributelist id="1153" addr="0x7f1a040acab0" >
-                                        <attribute name="name" value="xbmcwsgi" id="1154" addr="0x7f1a040af550" />
-                                        <typetab id="1155" addr="0x7f1a040acad0" >
-                                            <attributelist id="1156" addr="0x7f1a040acad0" >
-                                                <attribute name="WsgiInputStreamIterator" value="WsgiInputStreamIterator" id="1157" addr="0x7f1a040af550" />
-                                                <attribute name="WsgiHttpHeader" value="Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>" id="1158" addr="0x7f1a040af550" />
-                                                <attribute name="WsgiErrorStream" value="WsgiErrorStream" id="1159" addr="0x7f1a040af550" />
-                                                <attribute name="WsgiInputStream" value="WsgiInputStream" id="1160" addr="0x7f1a040af550" />
-                                                <attribute name="WsgiResponse" value="WsgiResponse" id="1161" addr="0x7f1a040af550" />
-                                                <attribute name="WsgiResponseBody" value="WsgiResponseBody" id="1162" addr="0x7f1a040af550" />
+                                <typescopesitem id="1152" addr="0x7fb6eb3f3ab0" >
+                                    <attributelist id="1153" addr="0x7fb6eb3f3ab0" >
+                                        <attribute name="name" value="xbmcwsgi" id="1154" addr="0x7fb6eb3f6550" />
+                                        <typetab id="1155" addr="0x7fb6eb3f3ad0" >
+                                            <attributelist id="1156" addr="0x7fb6eb3f3ad0" >
+                                                <attribute name="WsgiInputStreamIterator" value="WsgiInputStreamIterator" id="1157" addr="0x7fb6eb3f6550" />
+                                                <attribute name="WsgiHttpHeader" value="Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>" id="1158" addr="0x7fb6eb3f6550" />
+                                                <attribute name="WsgiErrorStream" value="WsgiErrorStream" id="1159" addr="0x7fb6eb3f6550" />
+                                                <attribute name="WsgiInputStream" value="WsgiInputStream" id="1160" addr="0x7fb6eb3f6550" />
+                                                <attribute name="WsgiResponse" value="WsgiResponse" id="1161" addr="0x7fb6eb3f6550" />
+                                                <attribute name="WsgiResponseBody" value="WsgiResponseBody" id="1162" addr="0x7fb6eb3f6550" />
                                             </attributelist >
-                                            <typetabsitem id="1163" addr="0x7f1a040ad450" >
-                                                <attributelist id="1164" addr="0x7f1a040ad450" >
+                                            <typetabsitem id="1163" addr="0x7fb6eb3f4450" >
+                                                <attributelist id="1164" addr="0x7fb6eb3f4450" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1165" addr="0x7f1a040adff0" >
-                                                <attributelist id="1166" addr="0x7f1a040adff0" >
+                                            <typetabsitem id="1165" addr="0x7fb6eb3f4ff0" >
+                                                <attributelist id="1166" addr="0x7fb6eb3f4ff0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1167" addr="0x7f1a040acbb0" >
-                                                <attributelist id="1168" addr="0x7f1a040acbb0" >
+                                            <typetabsitem id="1167" addr="0x7fb6eb3f3bb0" >
+                                                <attributelist id="1168" addr="0x7fb6eb3f3bb0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1169" addr="0x7f1a040ad830" >
-                                                <attributelist id="1170" addr="0x7f1a040ad830" >
+                                            <typetabsitem id="1169" addr="0x7fb6eb3f4830" >
+                                                <attributelist id="1170" addr="0x7fb6eb3f4830" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1171" addr="0x7f1a040ae250" >
-                                                <attributelist id="1172" addr="0x7f1a040ae250" >
+                                            <typetabsitem id="1171" addr="0x7fb6eb3f5250" >
+                                                <attributelist id="1172" addr="0x7fb6eb3f5250" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1173" addr="0x7f1a040aebb0" >
-                                                <attributelist id="1174" addr="0x7f1a040aebb0" >
+                                            <typetabsitem id="1173" addr="0x7fb6eb3f5bb0" >
+                                                <attributelist id="1174" addr="0x7fb6eb3f5bb0" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7f1a040ac650" id="1175" addr="0x7f1a040ac650" />
-                                        <attribute name="qname" value="XBMCAddon::xbmcwsgi" id="1176" addr="0x7f1a040af550" />
-                                        <attribute name="symtab" value="0x7f1a040a7170" id="1177" addr="0x7f1a040a7170" />
+                                        <attribute name="parent" value="0x7fb6eb3f3650" id="1175" addr="0x7fb6eb3f3650" />
+                                        <attribute name="qname" value="XBMCAddon::xbmcwsgi" id="1176" addr="0x7fb6eb3f6550" />
+                                        <attribute name="symtab" value="0x7fb6eb3ee170" id="1177" addr="0x7fb6eb3ee170" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="1178" addr="0x7f1a040ae310" >
-                                    <attributelist id="1179" addr="0x7f1a040ae310" >
+                                <typescopesitem id="1178" addr="0x7fb6eb3f5310" >
+                                    <attributelist id="1179" addr="0x7fb6eb3f5310" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="1180" addr="0x7f1a040aabb0" >
-                                    <attributelist id="1181" addr="0x7f1a040aabb0" >
-                                        <attribute name="name" value="WsgiResponse" id="1182" addr="0x7f1a040af550" />
-                                        <attribute name="csymtab" value="0x7f1a040aabd0" id="1183" addr="0x7f1a040aabd0" />
-                                        <attribute name="symtab" value="0x7f1a040aab70" id="1184" addr="0x7f1a040aab70" />
+                                <typescopesitem id="1180" addr="0x7fb6eb3f1bb0" >
+                                    <attributelist id="1181" addr="0x7fb6eb3f1bb0" >
+                                        <attribute name="name" value="WsgiResponse" id="1182" addr="0x7fb6eb3f6550" />
+                                        <attribute name="csymtab" value="0x7fb6eb3f1bd0" id="1183" addr="0x7fb6eb3f1bd0" />
+                                        <attribute name="symtab" value="0x7fb6eb3f1b70" id="1184" addr="0x7fb6eb3f1b70" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <access id="1185" addr="0x7f1a040aab30" >
-                            <attributelist id="1186" addr="0x7f1a040aab30" >
-                                <attribute name="kind" value="public" id="1187" addr="0x7f1a040af550" />
+                        <access id="1185" addr="0x7fb6eb3f1b30" >
+                            <attributelist id="1186" addr="0x7fb6eb3f1b30" >
+                                <attribute name="kind" value="public" id="1187" addr="0x7fb6eb3f6550" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="1188" addr="0x7f1a040aacf0" >
-                            <attributelist id="1189" addr="0x7f1a040aacf0" >
-                                <attribute name="ismember" value="1" id="1190" addr="0x7f1a040af550" />
-                                <attribute name="sym_name" value="WsgiResponse" id="1191" addr="0x7f1a040af550" />
-                                <attribute name="name" value="WsgiResponse" id="1192" addr="0x7f1a040af550" />
-                                <attribute name="decl" value="f()." id="1193" addr="0x7f1a040af550" />
-                                <attribute name="access" value="public" id="1194" addr="0x7f1a040af550" />
-                                <attribute name="feature_new" value="1" id="1195" addr="0x7f1a040af550" />
-                                <attribute name="sym_symtab" value="0x7f1a040aabb0" id="1196" addr="0x7f1a040aabb0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="1197" addr="0x7f1a040af550" />
+                        <constructor id="1188" addr="0x7fb6eb3f1cf0" >
+                            <attributelist id="1189" addr="0x7fb6eb3f1cf0" >
+                                <attribute name="ismember" value="1" id="1190" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_name" value="WsgiResponse" id="1191" addr="0x7fb6eb3f6550" />
+                                <attribute name="name" value="WsgiResponse" id="1192" addr="0x7fb6eb3f6550" />
+                                <attribute name="decl" value="f()." id="1193" addr="0x7fb6eb3f6550" />
+                                <attribute name="access" value="public" id="1194" addr="0x7fb6eb3f6550" />
+                                <attribute name="feature_new" value="1" id="1195" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_symtab" value="0x7fb6eb3f1bb0" id="1196" addr="0x7fb6eb3f1bb0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="1197" addr="0x7fb6eb3f6550" />
                             </attributelist >
                          
                         </constructor >
-                        <destructor id="1198" addr="0x7f1a040aae50" >
-                            <attributelist id="1199" addr="0x7f1a040aae50" >
-                                <attribute name="ismember" value="1" id="1200" addr="0x7f1a040af550" />
-                                <attribute name="sym_name" value="~WsgiResponse" id="1201" addr="0x7f1a040af550" />
-                                <attribute name="name" value="~WsgiResponse" id="1202" addr="0x7f1a040af550" />
-                                <attribute name="decl" value="f()." id="1203" addr="0x7f1a040af550" />
-                                <attribute name="access" value="public" id="1204" addr="0x7f1a040af550" />
-                                <attribute name="sym_symtab" value="0x7f1a040aabb0" id="1205" addr="0x7f1a040aabb0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="1206" addr="0x7f1a040af550" />
+                        <destructor id="1198" addr="0x7fb6eb3f1e50" >
+                            <attributelist id="1199" addr="0x7fb6eb3f1e50" >
+                                <attribute name="ismember" value="1" id="1200" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_name" value="~WsgiResponse" id="1201" addr="0x7fb6eb3f6550" />
+                                <attribute name="name" value="~WsgiResponse" id="1202" addr="0x7fb6eb3f6550" />
+                                <attribute name="decl" value="f()." id="1203" addr="0x7fb6eb3f6550" />
+                                <attribute name="access" value="public" id="1204" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_symtab" value="0x7fb6eb3f1bb0" id="1205" addr="0x7fb6eb3f1bb0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="1206" addr="0x7fb6eb3f6550" />
                             </attributelist >
                          
                         </destructor >
-                        <cdecl id="1207" addr="0x7f1a040ab4d0" >
-                            <attributelist id="1208" addr="0x7f1a040ab4d0" >
-                                <attribute name="name" value="operator ()" id="1209" addr="0x7f1a040af550" />
-                                <attribute name="ismember" value="1" id="1210" addr="0x7f1a040af550" />
-                                <attribute name="sym_symtab" value="0x7f1a040aabb0" id="1211" addr="0x7f1a040aabb0" />
-                                <attribute name="sym_nextSibling" value="0x7f1a040ab710" id="1212" addr="0x7f1a040ab710" />
-                                <attribute name="csym_nextSibling" value="0x7f1a040ab710" id="1213" addr="0x7f1a040ab710" />
-                                <attribute name="kind" value="function" id="1214" addr="0x7f1a040af550" />
-                                <attribute name="sym_name" value="operator ()" id="1215" addr="0x7f1a040af550" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).std::vector&lt;(XBMCAddon::xbmcwsgi::WsgiHttpHeader)>,p.void).p." id="1216" addr="0x7f1a040af550" />
-                                <attribute name="access" value="public" id="1217" addr="0x7f1a040af550" />
-                                <attribute name="sym_overloaded" value="0x7f1a040ab4d0" id="1218" addr="0x7f1a040ab4d0" />
-                                <parmlist id="1219" addr="0x7f1a040ab0d0" >
+                        <cdecl id="1207" addr="0x7fb6eb3f24d0" >
+                            <attributelist id="1208" addr="0x7fb6eb3f24d0" >
+                                <attribute name="name" value="operator ()" id="1209" addr="0x7fb6eb3f6550" />
+                                <attribute name="ismember" value="1" id="1210" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_symtab" value="0x7fb6eb3f1bb0" id="1211" addr="0x7fb6eb3f1bb0" />
+                                <attribute name="sym_nextSibling" value="0x7fb6eb3f2710" id="1212" addr="0x7fb6eb3f2710" />
+                                <attribute name="csym_nextSibling" value="0x7fb6eb3f2710" id="1213" addr="0x7fb6eb3f2710" />
+                                <attribute name="kind" value="function" id="1214" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_name" value="operator ()" id="1215" addr="0x7fb6eb3f6550" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).std::vector&lt;(XBMCAddon::xbmcwsgi::WsgiHttpHeader)>,p.void).p." id="1216" addr="0x7fb6eb3f6550" />
+                                <attribute name="access" value="public" id="1217" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_overloaded" value="0x7fb6eb3f24d0" id="1218" addr="0x7fb6eb3f24d0" />
+                                <parmlist id="1219" addr="0x7fb6eb3f20d0" >
                                     <parm id="1220">
-                                        <attributelist id="1221" addr="0x7f1a040ab0d0" >
-                                            <attribute name="name" value="status" id="1222" addr="0x7f1a040af550" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1223" addr="0x7f1a040af550" />
+                                        <attributelist id="1221" addr="0x7fb6eb3f20d0" >
+                                            <attribute name="name" value="status" id="1222" addr="0x7fb6eb3f6550" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1223" addr="0x7fb6eb3f6550" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1224">
-                                        <attributelist id="1225" addr="0x7f1a040ab2f0" >
-                                            <attribute name="name" value="response_headers" id="1226" addr="0x7f1a040af550" />
-                                            <attribute name="type" value="r.q(const).std::vector&lt;(XBMCAddon::xbmcwsgi::WsgiHttpHeader)>" id="1227" addr="0x7f1a040af550" />
+                                        <attributelist id="1225" addr="0x7fb6eb3f22f0" >
+                                            <attribute name="name" value="response_headers" id="1226" addr="0x7fb6eb3f6550" />
+                                            <attribute name="type" value="r.q(const).std::vector&lt;(XBMCAddon::xbmcwsgi::WsgiHttpHeader)>" id="1227" addr="0x7fb6eb3f6550" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1228">
-                                        <attributelist id="1229" addr="0x7f1a040ab450" >
-                                            <attribute name="name" value="exc_info" id="1230" addr="0x7f1a040af550" />
-                                            <attribute name="value" value="NULL" id="1231" addr="0x7f1a040af550" />
-                                            <attribute name="type" value="p.void" id="1232" addr="0x7f1a040af550" />
+                                        <attributelist id="1229" addr="0x7fb6eb3f2450" >
+                                            <attribute name="name" value="exc_info" id="1230" addr="0x7fb6eb3f6550" />
+                                            <attribute name="value" value="NULL" id="1231" addr="0x7fb6eb3f6550" />
+                                            <attribute name="type" value="p.void" id="1232" addr="0x7fb6eb3f6550" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="WsgiResponseBody" id="1233" addr="0x7f1a040af550" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="1234" addr="0x7f1a040af550" />
+                                <attribute name="type" value="WsgiResponseBody" id="1233" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="1234" addr="0x7fb6eb3f6550" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="1235" addr="0x7f1a040ab710" >
-                            <attributelist id="1236" addr="0x7f1a040ab710" >
-                                <attribute name="name" value="operator ()" id="1237" addr="0x7f1a040af550" />
-                                <attribute name="ismember" value="1" id="1238" addr="0x7f1a040af550" />
-                                <attribute name="sym_symtab" value="0x7f1a040aabb0" id="1239" addr="0x7f1a040aabb0" />
-                                <attribute name="sym_previousSibling" value="0x7f1a040ab4d0" id="1240" addr="0x7f1a040ab4d0" />
-                                <attribute name="kind" value="function" id="1241" addr="0x7f1a040af550" />
-                                <attribute name="sym_name" value="operator ()" id="1242" addr="0x7f1a040af550" />
-                                <attribute name="defaultargs" value="0x7f1a040ab4d0" id="1243" addr="0x7f1a040ab4d0" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).std::vector&lt;(XBMCAddon::xbmcwsgi::WsgiHttpHeader)>).p." id="1244" addr="0x7f1a040af550" />
-                                <attribute name="access" value="public" id="1245" addr="0x7f1a040af550" />
-                                <attribute name="sym_overloaded" value="0x7f1a040ab4d0" id="1246" addr="0x7f1a040ab4d0" />
-                                <parmlist id="1247" addr="0x7f1a040ab590" >
+                        <cdecl id="1235" addr="0x7fb6eb3f2710" >
+                            <attributelist id="1236" addr="0x7fb6eb3f2710" >
+                                <attribute name="name" value="operator ()" id="1237" addr="0x7fb6eb3f6550" />
+                                <attribute name="ismember" value="1" id="1238" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_symtab" value="0x7fb6eb3f1bb0" id="1239" addr="0x7fb6eb3f1bb0" />
+                                <attribute name="sym_previousSibling" value="0x7fb6eb3f24d0" id="1240" addr="0x7fb6eb3f24d0" />
+                                <attribute name="kind" value="function" id="1241" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_name" value="operator ()" id="1242" addr="0x7fb6eb3f6550" />
+                                <attribute name="defaultargs" value="0x7fb6eb3f24d0" id="1243" addr="0x7fb6eb3f24d0" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).std::vector&lt;(XBMCAddon::xbmcwsgi::WsgiHttpHeader)>).p." id="1244" addr="0x7fb6eb3f6550" />
+                                <attribute name="access" value="public" id="1245" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_overloaded" value="0x7fb6eb3f24d0" id="1246" addr="0x7fb6eb3f24d0" />
+                                <parmlist id="1247" addr="0x7fb6eb3f2590" >
                                     <parm id="1248">
-                                        <attributelist id="1249" addr="0x7f1a040ab590" >
-                                            <attribute name="name" value="status" id="1250" addr="0x7f1a040af550" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1251" addr="0x7f1a040af550" />
+                                        <attributelist id="1249" addr="0x7fb6eb3f2590" >
+                                            <attribute name="name" value="status" id="1250" addr="0x7fb6eb3f6550" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1251" addr="0x7fb6eb3f6550" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1252">
-                                        <attributelist id="1253" addr="0x7f1a040ab670" >
-                                            <attribute name="name" value="response_headers" id="1254" addr="0x7f1a040af550" />
-                                            <attribute name="type" value="r.q(const).std::vector&lt;(XBMCAddon::xbmcwsgi::WsgiHttpHeader)>" id="1255" addr="0x7f1a040af550" />
+                                        <attributelist id="1253" addr="0x7fb6eb3f2670" >
+                                            <attribute name="name" value="response_headers" id="1254" addr="0x7fb6eb3f6550" />
+                                            <attribute name="type" value="r.q(const).std::vector&lt;(XBMCAddon::xbmcwsgi::WsgiHttpHeader)>" id="1255" addr="0x7fb6eb3f6550" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="WsgiResponseBody" id="1256" addr="0x7f1a040af550" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="1257" addr="0x7f1a040af550" />
+                                <attribute name="type" value="WsgiResponseBody" id="1256" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="1257" addr="0x7fb6eb3f6550" />
                             </attributelist >
                          
                         </cdecl >
@@ -1925,312 +1925,312 @@
                 </namespace >
             </namespace >
         </include >
-        <include id="1258" addr="0x7f1a040ab8f0" >
-            <attributelist id="1259" addr="0x7f1a040ab8f0" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/wsgi/WsgiResponseBody.h" id="1260" addr="0x7f1a040af550" />
+        <include id="1258" addr="0x7fb6eb3f28f0" >
+            <attributelist id="1259" addr="0x7fb6eb3f28f0" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/wsgi/WsgiResponseBody.h" id="1260" addr="0x7fb6eb3f6550" />
             </attributelist >
 
-            <namespace id="1261" addr="0x7f1a040ab990" >
-                <attributelist id="1262" addr="0x7f1a040ab990" >
-                    <attribute name="sym_name" value="XBMCAddon" id="1263" addr="0x7f1a040af550" />
-                    <attribute name="name" value="XBMCAddon" id="1264" addr="0x7f1a040af550" />
-                    <attribute name="sym_previousSibling" value="0x7f1a040aa3f0" id="1265" addr="0x7f1a040aa3f0" />
-                    <typescope id="1266" addr="0x7f1a040ac650" >
-                        <attributelist id="1267" addr="0x7f1a040ac650" >
-                            <attribute name="name" value="XBMCAddon" id="1268" addr="0x7f1a040af550" />
-                            <typetab id="1269" addr="0x7f1a040ac690" >
-                                <attributelist id="1270" addr="0x7f1a040ac690" >
-                                    <attribute name="String" value="std::string" id="1271" addr="0x7f1a040af550" />
+            <namespace id="1261" addr="0x7fb6eb3f2990" >
+                <attributelist id="1262" addr="0x7fb6eb3f2990" >
+                    <attribute name="sym_name" value="XBMCAddon" id="1263" addr="0x7fb6eb3f6550" />
+                    <attribute name="name" value="XBMCAddon" id="1264" addr="0x7fb6eb3f6550" />
+                    <attribute name="sym_previousSibling" value="0x7fb6eb3f13f0" id="1265" addr="0x7fb6eb3f13f0" />
+                    <typescope id="1266" addr="0x7fb6eb3f3650" >
+                        <attributelist id="1267" addr="0x7fb6eb3f3650" >
+                            <attribute name="name" value="XBMCAddon" id="1268" addr="0x7fb6eb3f6550" />
+                            <typetab id="1269" addr="0x7fb6eb3f3690" >
+                                <attributelist id="1270" addr="0x7fb6eb3f3690" >
+                                    <attribute name="String" value="std::string" id="1271" addr="0x7fb6eb3f6550" />
                                 </attributelist >
-                                <typetabsitem id="1272" addr="0x7f1a040ac870" >
-                                    <attributelist id="1273" addr="0x7f1a040ac870" >
+                                <typetabsitem id="1272" addr="0x7fb6eb3f3870" >
+                                    <attributelist id="1273" addr="0x7fb6eb3f3870" >
                                     </attributelist >
                                 </typetabsitem >
                             </typetab >
-                            <attribute name="parent" value="0x7f1a0408fa30" id="1274" addr="0x7f1a0408fa30" />
-                            <attribute name="qname" value="XBMCAddon" id="1275" addr="0x7f1a040af550" />
-                            <attribute name="symtab" value="0x7f1a040a6950" id="1276" addr="0x7f1a040a6950" />
+                            <attribute name="parent" value="0x7fb6eb3d6a30" id="1274" addr="0x7fb6eb3d6a30" />
+                            <attribute name="qname" value="XBMCAddon" id="1275" addr="0x7fb6eb3f6550" />
+                            <attribute name="symtab" value="0x7fb6eb3ed950" id="1276" addr="0x7fb6eb3ed950" />
                         </attributelist >
-                        <typescopesitem id="1277" addr="0x7f1a040a6910" >
-                            <attributelist id="1278" addr="0x7f1a040a6910" >
+                        <typescopesitem id="1277" addr="0x7fb6eb3ed910" >
+                            <attributelist id="1278" addr="0x7fb6eb3ed910" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="1279" addr="0x7f1a040ac690" >
-                            <attributelist id="1280" addr="0x7f1a040ac690" >
-                                <attribute name="String" value="std::string" id="1281" addr="0x7f1a040af550" />
+                        <typescopesitem id="1279" addr="0x7fb6eb3f3690" >
+                            <attributelist id="1280" addr="0x7fb6eb3f3690" >
+                                <attribute name="String" value="std::string" id="1281" addr="0x7fb6eb3f6550" />
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="1282" addr="0x7f1a0408fa30" >
-                            <attributelist id="1283" addr="0x7f1a0408fa30" >
-                                <attribute name="name" value="" id="1284" addr="0x7f1a040af550" />
-                                <typetab id="1285" addr="0x7f1a0408fa90" >
-                                    <attributelist id="1286" addr="0x7f1a0408fa90" >
-                                        <attribute name="HTTPPythonRequest" value="HTTPPythonRequest" id="1287" addr="0x7f1a040af550" />
+                        <typescopesitem id="1282" addr="0x7fb6eb3d6a30" >
+                            <attributelist id="1283" addr="0x7fb6eb3d6a30" >
+                                <attribute name="name" value="" id="1284" addr="0x7fb6eb3f6550" />
+                                <typetab id="1285" addr="0x7fb6eb3d6a90" >
+                                    <attributelist id="1286" addr="0x7fb6eb3d6a90" >
+                                        <attribute name="HTTPPythonRequest" value="HTTPPythonRequest" id="1287" addr="0x7fb6eb3f6550" />
                                     </attributelist >
-                                    <typetabsitem id="1288" addr="0x7f1a040ac7b0" >
-                                        <attributelist id="1289" addr="0x7f1a040ac7b0" >
+                                    <typetabsitem id="1288" addr="0x7fb6eb3f37b0" >
+                                        <attributelist id="1289" addr="0x7fb6eb3f37b0" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="1290" addr="0x7f1a040ac790" >
-                            <attributelist id="1291" addr="0x7f1a040ac790" >
+                        <typescopesitem id="1290" addr="0x7fb6eb3f3790" >
+                            <attributelist id="1291" addr="0x7fb6eb3f3790" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="1292" addr="0x7f1a040a6950" >
-                            <attributelist id="1293" addr="0x7f1a040a6950" >
-                                <attribute name="name" value="XBMCAddon" id="1294" addr="0x7f1a040af550" />
-                                <attribute name="csymtab" value="0x7f1a040a6990" id="1295" addr="0x7f1a040a6990" />
-                                <attribute name="symtab" value="0x7f1a040a6930" id="1296" addr="0x7f1a040a6930" />
+                        <typescopesitem id="1292" addr="0x7fb6eb3ed950" >
+                            <attributelist id="1293" addr="0x7fb6eb3ed950" >
+                                <attribute name="name" value="XBMCAddon" id="1294" addr="0x7fb6eb3f6550" />
+                                <attribute name="csymtab" value="0x7fb6eb3ed990" id="1295" addr="0x7fb6eb3ed990" />
+                                <attribute name="symtab" value="0x7fb6eb3ed930" id="1296" addr="0x7fb6eb3ed930" />
                             </attributelist >
                         </typescopesitem >
                     </typescope >
-                    <attribute name="symtab" value="0x7f1a040a6950" id="1297" addr="0x7f1a040a6950" />
-                    <attribute name="sym_symtab" value="0x7f1a0408f950" id="1298" addr="0x7f1a0408f950" />
+                    <attribute name="symtab" value="0x7fb6eb3ed950" id="1297" addr="0x7fb6eb3ed950" />
+                    <attribute name="sym_symtab" value="0x7fb6eb3d6950" id="1298" addr="0x7fb6eb3d6950" />
                 </attributelist >
 
-                <namespace id="1299" addr="0x7f1a040aba10" >
-                    <attributelist id="1300" addr="0x7f1a040aba10" >
-                        <attribute name="sym_name" value="xbmcwsgi" id="1301" addr="0x7f1a040af550" />
-                        <attribute name="name" value="xbmcwsgi" id="1302" addr="0x7f1a040af550" />
-                        <attribute name="sym_previousSibling" value="0x7f1a040aa470" id="1303" addr="0x7f1a040aa470" />
-                        <typescope id="1304" addr="0x7f1a040acab0" >
-                            <attributelist id="1305" addr="0x7f1a040acab0" >
-                                <attribute name="name" value="xbmcwsgi" id="1306" addr="0x7f1a040af550" />
-                                <typetab id="1307" addr="0x7f1a040acad0" >
-                                    <attributelist id="1308" addr="0x7f1a040acad0" >
-                                        <attribute name="WsgiInputStreamIterator" value="WsgiInputStreamIterator" id="1309" addr="0x7f1a040af550" />
-                                        <attribute name="WsgiHttpHeader" value="Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>" id="1310" addr="0x7f1a040af550" />
-                                        <attribute name="WsgiErrorStream" value="WsgiErrorStream" id="1311" addr="0x7f1a040af550" />
-                                        <attribute name="WsgiInputStream" value="WsgiInputStream" id="1312" addr="0x7f1a040af550" />
-                                        <attribute name="WsgiResponse" value="WsgiResponse" id="1313" addr="0x7f1a040af550" />
-                                        <attribute name="WsgiResponseBody" value="WsgiResponseBody" id="1314" addr="0x7f1a040af550" />
+                <namespace id="1299" addr="0x7fb6eb3f2a10" >
+                    <attributelist id="1300" addr="0x7fb6eb3f2a10" >
+                        <attribute name="sym_name" value="xbmcwsgi" id="1301" addr="0x7fb6eb3f6550" />
+                        <attribute name="name" value="xbmcwsgi" id="1302" addr="0x7fb6eb3f6550" />
+                        <attribute name="sym_previousSibling" value="0x7fb6eb3f1470" id="1303" addr="0x7fb6eb3f1470" />
+                        <typescope id="1304" addr="0x7fb6eb3f3ab0" >
+                            <attributelist id="1305" addr="0x7fb6eb3f3ab0" >
+                                <attribute name="name" value="xbmcwsgi" id="1306" addr="0x7fb6eb3f6550" />
+                                <typetab id="1307" addr="0x7fb6eb3f3ad0" >
+                                    <attributelist id="1308" addr="0x7fb6eb3f3ad0" >
+                                        <attribute name="WsgiInputStreamIterator" value="WsgiInputStreamIterator" id="1309" addr="0x7fb6eb3f6550" />
+                                        <attribute name="WsgiHttpHeader" value="Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>" id="1310" addr="0x7fb6eb3f6550" />
+                                        <attribute name="WsgiErrorStream" value="WsgiErrorStream" id="1311" addr="0x7fb6eb3f6550" />
+                                        <attribute name="WsgiInputStream" value="WsgiInputStream" id="1312" addr="0x7fb6eb3f6550" />
+                                        <attribute name="WsgiResponse" value="WsgiResponse" id="1313" addr="0x7fb6eb3f6550" />
+                                        <attribute name="WsgiResponseBody" value="WsgiResponseBody" id="1314" addr="0x7fb6eb3f6550" />
                                     </attributelist >
-                                    <typetabsitem id="1315" addr="0x7f1a040ad450" >
-                                        <attributelist id="1316" addr="0x7f1a040ad450" >
+                                    <typetabsitem id="1315" addr="0x7fb6eb3f4450" >
+                                        <attributelist id="1316" addr="0x7fb6eb3f4450" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1317" addr="0x7f1a040adff0" >
-                                        <attributelist id="1318" addr="0x7f1a040adff0" >
+                                    <typetabsitem id="1317" addr="0x7fb6eb3f4ff0" >
+                                        <attributelist id="1318" addr="0x7fb6eb3f4ff0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1319" addr="0x7f1a040acbb0" >
-                                        <attributelist id="1320" addr="0x7f1a040acbb0" >
+                                    <typetabsitem id="1319" addr="0x7fb6eb3f3bb0" >
+                                        <attributelist id="1320" addr="0x7fb6eb3f3bb0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1321" addr="0x7f1a040ad830" >
-                                        <attributelist id="1322" addr="0x7f1a040ad830" >
+                                    <typetabsitem id="1321" addr="0x7fb6eb3f4830" >
+                                        <attributelist id="1322" addr="0x7fb6eb3f4830" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1323" addr="0x7f1a040ae250" >
-                                        <attributelist id="1324" addr="0x7f1a040ae250" >
+                                    <typetabsitem id="1323" addr="0x7fb6eb3f5250" >
+                                        <attributelist id="1324" addr="0x7fb6eb3f5250" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1325" addr="0x7f1a040aebb0" >
-                                        <attributelist id="1326" addr="0x7f1a040aebb0" >
+                                    <typetabsitem id="1325" addr="0x7fb6eb3f5bb0" >
+                                        <attributelist id="1326" addr="0x7fb6eb3f5bb0" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
-                                <attribute name="parent" value="0x7f1a040ac650" id="1327" addr="0x7f1a040ac650" />
-                                <attribute name="qname" value="XBMCAddon::xbmcwsgi" id="1328" addr="0x7f1a040af550" />
-                                <attribute name="symtab" value="0x7f1a040a7170" id="1329" addr="0x7f1a040a7170" />
+                                <attribute name="parent" value="0x7fb6eb3f3650" id="1327" addr="0x7fb6eb3f3650" />
+                                <attribute name="qname" value="XBMCAddon::xbmcwsgi" id="1328" addr="0x7fb6eb3f6550" />
+                                <attribute name="symtab" value="0x7fb6eb3ee170" id="1329" addr="0x7fb6eb3ee170" />
                             </attributelist >
-                            <typescopesitem id="1330" addr="0x7f1a040a7130" >
-                                <attributelist id="1331" addr="0x7f1a040a7130" >
+                            <typescopesitem id="1330" addr="0x7fb6eb3ee130" >
+                                <attributelist id="1331" addr="0x7fb6eb3ee130" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="1332" addr="0x7f1a040acad0" >
-                                <attributelist id="1333" addr="0x7f1a040acad0" >
-                                    <attribute name="WsgiInputStreamIterator" value="WsgiInputStreamIterator" id="1334" addr="0x7f1a040af550" />
-                                    <attribute name="WsgiHttpHeader" value="Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>" id="1335" addr="0x7f1a040af550" />
-                                    <attribute name="WsgiErrorStream" value="WsgiErrorStream" id="1336" addr="0x7f1a040af550" />
-                                    <attribute name="WsgiInputStream" value="WsgiInputStream" id="1337" addr="0x7f1a040af550" />
-                                    <attribute name="WsgiResponse" value="WsgiResponse" id="1338" addr="0x7f1a040af550" />
-                                    <attribute name="WsgiResponseBody" value="WsgiResponseBody" id="1339" addr="0x7f1a040af550" />
+                            <typescopesitem id="1332" addr="0x7fb6eb3f3ad0" >
+                                <attributelist id="1333" addr="0x7fb6eb3f3ad0" >
+                                    <attribute name="WsgiInputStreamIterator" value="WsgiInputStreamIterator" id="1334" addr="0x7fb6eb3f6550" />
+                                    <attribute name="WsgiHttpHeader" value="Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>" id="1335" addr="0x7fb6eb3f6550" />
+                                    <attribute name="WsgiErrorStream" value="WsgiErrorStream" id="1336" addr="0x7fb6eb3f6550" />
+                                    <attribute name="WsgiInputStream" value="WsgiInputStream" id="1337" addr="0x7fb6eb3f6550" />
+                                    <attribute name="WsgiResponse" value="WsgiResponse" id="1338" addr="0x7fb6eb3f6550" />
+                                    <attribute name="WsgiResponseBody" value="WsgiResponseBody" id="1339" addr="0x7fb6eb3f6550" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="1340" addr="0x7f1a040ac650" >
-                                <attributelist id="1341" addr="0x7f1a040ac650" >
-                                    <attribute name="name" value="XBMCAddon" id="1342" addr="0x7f1a040af550" />
-                                    <typetab id="1343" addr="0x7f1a040ac690" >
-                                        <attributelist id="1344" addr="0x7f1a040ac690" >
-                                            <attribute name="String" value="std::string" id="1345" addr="0x7f1a040af550" />
+                            <typescopesitem id="1340" addr="0x7fb6eb3f3650" >
+                                <attributelist id="1341" addr="0x7fb6eb3f3650" >
+                                    <attribute name="name" value="XBMCAddon" id="1342" addr="0x7fb6eb3f6550" />
+                                    <typetab id="1343" addr="0x7fb6eb3f3690" >
+                                        <attributelist id="1344" addr="0x7fb6eb3f3690" >
+                                            <attribute name="String" value="std::string" id="1345" addr="0x7fb6eb3f6550" />
                                         </attributelist >
-                                        <typetabsitem id="1346" addr="0x7f1a040ac870" >
-                                            <attributelist id="1347" addr="0x7f1a040ac870" >
+                                        <typetabsitem id="1346" addr="0x7fb6eb3f3870" >
+                                            <attributelist id="1347" addr="0x7fb6eb3f3870" >
                                             </attributelist >
                                         </typetabsitem >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f1a0408fa30" id="1348" addr="0x7f1a0408fa30" />
-                                    <attribute name="qname" value="XBMCAddon" id="1349" addr="0x7f1a040af550" />
-                                    <attribute name="symtab" value="0x7f1a040a6950" id="1350" addr="0x7f1a040a6950" />
+                                    <attribute name="parent" value="0x7fb6eb3d6a30" id="1348" addr="0x7fb6eb3d6a30" />
+                                    <attribute name="qname" value="XBMCAddon" id="1349" addr="0x7fb6eb3f6550" />
+                                    <attribute name="symtab" value="0x7fb6eb3ed950" id="1350" addr="0x7fb6eb3ed950" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="1351" addr="0x7f1a040acaf0" >
-                                <attributelist id="1352" addr="0x7f1a040acaf0" >
+                            <typescopesitem id="1351" addr="0x7fb6eb3f3af0" >
+                                <attributelist id="1352" addr="0x7fb6eb3f3af0" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="1353" addr="0x7f1a040a7170" >
-                                <attributelist id="1354" addr="0x7f1a040a7170" >
-                                    <attribute name="name" value="xbmcwsgi" id="1355" addr="0x7f1a040af550" />
-                                    <attribute name="csymtab" value="0x7f1a040a71b0" id="1356" addr="0x7f1a040a71b0" />
-                                    <attribute name="symtab" value="0x7f1a040a7150" id="1357" addr="0x7f1a040a7150" />
+                            <typescopesitem id="1353" addr="0x7fb6eb3ee170" >
+                                <attributelist id="1354" addr="0x7fb6eb3ee170" >
+                                    <attribute name="name" value="xbmcwsgi" id="1355" addr="0x7fb6eb3f6550" />
+                                    <attribute name="csymtab" value="0x7fb6eb3ee1b0" id="1356" addr="0x7fb6eb3ee1b0" />
+                                    <attribute name="symtab" value="0x7fb6eb3ee150" id="1357" addr="0x7fb6eb3ee150" />
                                 </attributelist >
                             </typescopesitem >
                         </typescope >
-                        <attribute name="symtab" value="0x7f1a040a7170" id="1358" addr="0x7f1a040a7170" />
-                        <attribute name="sym_symtab" value="0x7f1a040a6950" id="1359" addr="0x7f1a040a6950" />
+                        <attribute name="symtab" value="0x7fb6eb3ee170" id="1358" addr="0x7fb6eb3ee170" />
+                        <attribute name="sym_symtab" value="0x7fb6eb3ed950" id="1359" addr="0x7fb6eb3ed950" />
                     </attributelist >
 
-                    <class id="1360" addr="0x7f1a040abb90" >
-                        <attributelist id="1361" addr="0x7f1a040abb90" >
-                            <attribute name="name" value="XBMCAddon::xbmcwsgi::WsgiResponseBody" id="1362" addr="0x7f1a040af550" />
-                            <attribute name="sym_symtab" value="0x7f1a040a7170" id="1363" addr="0x7f1a040a7170" />
-                            <attribute name="symtab" value="0x7f1a040abcd0" id="1364" addr="0x7f1a040abcd0" />
-                            <attribute name="allows_typedef" value="1" id="1365" addr="0x7f1a040af550" />
-                            <attribute name="typepass_visit" value="1" id="1366" addr="0x7f1a040af550" />
-                            <attribute name="allocate_visit" value="1" id="1367" addr="0x7f1a040af550" />
-                            <attribute name="kind" value="class" id="1368" addr="0x7f1a040af550" />
-                            <attribute name="sym_name" value="WsgiResponseBody" id="1369" addr="0x7f1a040af550" />
-                            <attribute name="allocate_default_constructor" value="1" id="1370" addr="0x7f1a040af550" />
-                            <attribute name="allocate_has_constructor" value="1" id="1371" addr="0x7f1a040af550" />
-                            <attribute name="allocate_public_constructor" value="1" id="1372" addr="0x7f1a040af550" />
-                            <attribute name="allocate_has_destructor" value="1" id="1373" addr="0x7f1a040af550" />
-                            <attribute name="allocate_default_destructor" value="1" id="1374" addr="0x7f1a040af550" />
-                            <attribute name="allocate_copy_constructor" value="1" id="1375" addr="0x7f1a040af550" />
-                            <attribute name="privatebaselist" value="0x7f1a040abb70" id="1376" addr="0x7f1a040abb70" />
-                            <attribute name="protectedbaselist" value="0x7f1a040abb50" id="1377" addr="0x7f1a040abb50" />
-                            <baselist id="1378" addr="0x7f1a040abb30" >
-                                <base name="AddonClass" id="1379" addr="0x7f1a040abab0" />
+                    <class id="1360" addr="0x7fb6eb3f2b90" >
+                        <attributelist id="1361" addr="0x7fb6eb3f2b90" >
+                            <attribute name="name" value="XBMCAddon::xbmcwsgi::WsgiResponseBody" id="1362" addr="0x7fb6eb3f6550" />
+                            <attribute name="sym_symtab" value="0x7fb6eb3ee170" id="1363" addr="0x7fb6eb3ee170" />
+                            <attribute name="symtab" value="0x7fb6eb3f2cd0" id="1364" addr="0x7fb6eb3f2cd0" />
+                            <attribute name="allows_typedef" value="1" id="1365" addr="0x7fb6eb3f6550" />
+                            <attribute name="typepass_visit" value="1" id="1366" addr="0x7fb6eb3f6550" />
+                            <attribute name="allocate_visit" value="1" id="1367" addr="0x7fb6eb3f6550" />
+                            <attribute name="kind" value="class" id="1368" addr="0x7fb6eb3f6550" />
+                            <attribute name="sym_name" value="WsgiResponseBody" id="1369" addr="0x7fb6eb3f6550" />
+                            <attribute name="allocate_default_constructor" value="1" id="1370" addr="0x7fb6eb3f6550" />
+                            <attribute name="allocate_has_constructor" value="1" id="1371" addr="0x7fb6eb3f6550" />
+                            <attribute name="allocate_public_constructor" value="1" id="1372" addr="0x7fb6eb3f6550" />
+                            <attribute name="allocate_has_destructor" value="1" id="1373" addr="0x7fb6eb3f6550" />
+                            <attribute name="allocate_default_destructor" value="1" id="1374" addr="0x7fb6eb3f6550" />
+                            <attribute name="allocate_copy_constructor" value="1" id="1375" addr="0x7fb6eb3f6550" />
+                            <attribute name="privatebaselist" value="0x7fb6eb3f2b70" id="1376" addr="0x7fb6eb3f2b70" />
+                            <attribute name="protectedbaselist" value="0x7fb6eb3f2b50" id="1377" addr="0x7fb6eb3f2b50" />
+                            <baselist id="1378" addr="0x7fb6eb3f2b30" >
+                                <base name="AddonClass" id="1379" addr="0x7fb6eb3f2ab0" />
                             </baselist >
-                            <attribute name="module" value="xbmcwsgi" id="1380" addr="0x7f1a040a6270" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1381" addr="0x7f1a040af550" />
-                            <typescope id="1382" addr="0x7f1a040aec30" >
-                                <attributelist id="1383" addr="0x7f1a040aec30" >
-                                    <attribute name="name" value="WsgiResponseBody" id="1384" addr="0x7f1a040af550" />
-                                    <typetab id="1385" addr="0x7f1a040aec50" >
-                                        <attributelist id="1386" addr="0x7f1a040aec50" >
+                            <attribute name="module" value="xbmcwsgi" id="1380" addr="0x7fb6eb3ed270" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1381" addr="0x7fb6eb3f6550" />
+                            <typescope id="1382" addr="0x7fb6eb3f5c30" >
+                                <attributelist id="1383" addr="0x7fb6eb3f5c30" >
+                                    <attribute name="name" value="WsgiResponseBody" id="1384" addr="0x7fb6eb3f6550" />
+                                    <typetab id="1385" addr="0x7fb6eb3f5c50" >
+                                        <attributelist id="1386" addr="0x7fb6eb3f5c50" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f1a040acab0" id="1387" addr="0x7f1a040acab0" />
-                                    <attribute name="qname" value="XBMCAddon::xbmcwsgi::WsgiResponseBody" id="1388" addr="0x7f1a040af550" />
-                                    <attribute name="symtab" value="0x7f1a040abcd0" id="1389" addr="0x7f1a040abcd0" />
+                                    <attribute name="parent" value="0x7fb6eb3f3ab0" id="1387" addr="0x7fb6eb3f3ab0" />
+                                    <attribute name="qname" value="XBMCAddon::xbmcwsgi::WsgiResponseBody" id="1388" addr="0x7fb6eb3f6550" />
+                                    <attribute name="symtab" value="0x7fb6eb3f2cd0" id="1389" addr="0x7fb6eb3f2cd0" />
                                 </attributelist >
-                                <typescopesitem id="1390" addr="0x7f1a040aebd0" >
-                                    <attributelist id="1391" addr="0x7f1a040aebd0" >
+                                <typescopesitem id="1390" addr="0x7fb6eb3f5bd0" >
+                                    <attributelist id="1391" addr="0x7fb6eb3f5bd0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="1392" addr="0x7f1a040aec50" >
-                                    <attributelist id="1393" addr="0x7f1a040aec50" >
+                                <typescopesitem id="1392" addr="0x7fb6eb3f5c50" >
+                                    <attributelist id="1393" addr="0x7fb6eb3f5c50" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="1394" addr="0x7f1a040acab0" >
-                                    <attributelist id="1395" addr="0x7f1a040acab0" >
-                                        <attribute name="name" value="xbmcwsgi" id="1396" addr="0x7f1a040af550" />
-                                        <typetab id="1397" addr="0x7f1a040acad0" >
-                                            <attributelist id="1398" addr="0x7f1a040acad0" >
-                                                <attribute name="WsgiInputStreamIterator" value="WsgiInputStreamIterator" id="1399" addr="0x7f1a040af550" />
-                                                <attribute name="WsgiHttpHeader" value="Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>" id="1400" addr="0x7f1a040af550" />
-                                                <attribute name="WsgiErrorStream" value="WsgiErrorStream" id="1401" addr="0x7f1a040af550" />
-                                                <attribute name="WsgiInputStream" value="WsgiInputStream" id="1402" addr="0x7f1a040af550" />
-                                                <attribute name="WsgiResponse" value="WsgiResponse" id="1403" addr="0x7f1a040af550" />
-                                                <attribute name="WsgiResponseBody" value="WsgiResponseBody" id="1404" addr="0x7f1a040af550" />
+                                <typescopesitem id="1394" addr="0x7fb6eb3f3ab0" >
+                                    <attributelist id="1395" addr="0x7fb6eb3f3ab0" >
+                                        <attribute name="name" value="xbmcwsgi" id="1396" addr="0x7fb6eb3f6550" />
+                                        <typetab id="1397" addr="0x7fb6eb3f3ad0" >
+                                            <attributelist id="1398" addr="0x7fb6eb3f3ad0" >
+                                                <attribute name="WsgiInputStreamIterator" value="WsgiInputStreamIterator" id="1399" addr="0x7fb6eb3f6550" />
+                                                <attribute name="WsgiHttpHeader" value="Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>" id="1400" addr="0x7fb6eb3f6550" />
+                                                <attribute name="WsgiErrorStream" value="WsgiErrorStream" id="1401" addr="0x7fb6eb3f6550" />
+                                                <attribute name="WsgiInputStream" value="WsgiInputStream" id="1402" addr="0x7fb6eb3f6550" />
+                                                <attribute name="WsgiResponse" value="WsgiResponse" id="1403" addr="0x7fb6eb3f6550" />
+                                                <attribute name="WsgiResponseBody" value="WsgiResponseBody" id="1404" addr="0x7fb6eb3f6550" />
                                             </attributelist >
-                                            <typetabsitem id="1405" addr="0x7f1a040ad450" >
-                                                <attributelist id="1406" addr="0x7f1a040ad450" >
+                                            <typetabsitem id="1405" addr="0x7fb6eb3f4450" >
+                                                <attributelist id="1406" addr="0x7fb6eb3f4450" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1407" addr="0x7f1a040adff0" >
-                                                <attributelist id="1408" addr="0x7f1a040adff0" >
+                                            <typetabsitem id="1407" addr="0x7fb6eb3f4ff0" >
+                                                <attributelist id="1408" addr="0x7fb6eb3f4ff0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1409" addr="0x7f1a040acbb0" >
-                                                <attributelist id="1410" addr="0x7f1a040acbb0" >
+                                            <typetabsitem id="1409" addr="0x7fb6eb3f3bb0" >
+                                                <attributelist id="1410" addr="0x7fb6eb3f3bb0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1411" addr="0x7f1a040ad830" >
-                                                <attributelist id="1412" addr="0x7f1a040ad830" >
+                                            <typetabsitem id="1411" addr="0x7fb6eb3f4830" >
+                                                <attributelist id="1412" addr="0x7fb6eb3f4830" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1413" addr="0x7f1a040ae250" >
-                                                <attributelist id="1414" addr="0x7f1a040ae250" >
+                                            <typetabsitem id="1413" addr="0x7fb6eb3f5250" >
+                                                <attributelist id="1414" addr="0x7fb6eb3f5250" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1415" addr="0x7f1a040aebb0" >
-                                                <attributelist id="1416" addr="0x7f1a040aebb0" >
+                                            <typetabsitem id="1415" addr="0x7fb6eb3f5bb0" >
+                                                <attributelist id="1416" addr="0x7fb6eb3f5bb0" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7f1a040ac650" id="1417" addr="0x7f1a040ac650" />
-                                        <attribute name="qname" value="XBMCAddon::xbmcwsgi" id="1418" addr="0x7f1a040af550" />
-                                        <attribute name="symtab" value="0x7f1a040a7170" id="1419" addr="0x7f1a040a7170" />
+                                        <attribute name="parent" value="0x7fb6eb3f3650" id="1417" addr="0x7fb6eb3f3650" />
+                                        <attribute name="qname" value="XBMCAddon::xbmcwsgi" id="1418" addr="0x7fb6eb3f6550" />
+                                        <attribute name="symtab" value="0x7fb6eb3ee170" id="1419" addr="0x7fb6eb3ee170" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="1420" addr="0x7f1a040aec70" >
-                                    <attributelist id="1421" addr="0x7f1a040aec70" >
+                                <typescopesitem id="1420" addr="0x7fb6eb3f5c70" >
+                                    <attributelist id="1421" addr="0x7fb6eb3f5c70" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="1422" addr="0x7f1a040abcd0" >
-                                    <attributelist id="1423" addr="0x7f1a040abcd0" >
-                                        <attribute name="name" value="WsgiResponseBody" id="1424" addr="0x7f1a040af550" />
-                                        <attribute name="csymtab" value="0x7f1a040abcf0" id="1425" addr="0x7f1a040abcf0" />
-                                        <attribute name="symtab" value="0x7f1a040abc90" id="1426" addr="0x7f1a040abc90" />
+                                <typescopesitem id="1422" addr="0x7fb6eb3f2cd0" >
+                                    <attributelist id="1423" addr="0x7fb6eb3f2cd0" >
+                                        <attribute name="name" value="WsgiResponseBody" id="1424" addr="0x7fb6eb3f6550" />
+                                        <attribute name="csymtab" value="0x7fb6eb3f2cf0" id="1425" addr="0x7fb6eb3f2cf0" />
+                                        <attribute name="symtab" value="0x7fb6eb3f2c90" id="1426" addr="0x7fb6eb3f2c90" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <access id="1427" addr="0x7f1a040abc50" >
-                            <attributelist id="1428" addr="0x7f1a040abc50" >
-                                <attribute name="kind" value="public" id="1429" addr="0x7f1a040af550" />
+                        <access id="1427" addr="0x7fb6eb3f2c50" >
+                            <attributelist id="1428" addr="0x7fb6eb3f2c50" >
+                                <attribute name="kind" value="public" id="1429" addr="0x7fb6eb3f6550" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="1430" addr="0x7f1a040abe10" >
-                            <attributelist id="1431" addr="0x7f1a040abe10" >
-                                <attribute name="ismember" value="1" id="1432" addr="0x7f1a040af550" />
-                                <attribute name="sym_name" value="WsgiResponseBody" id="1433" addr="0x7f1a040af550" />
-                                <attribute name="name" value="WsgiResponseBody" id="1434" addr="0x7f1a040af550" />
-                                <attribute name="decl" value="f()." id="1435" addr="0x7f1a040af550" />
-                                <attribute name="access" value="public" id="1436" addr="0x7f1a040af550" />
-                                <attribute name="feature_new" value="1" id="1437" addr="0x7f1a040af550" />
-                                <attribute name="sym_symtab" value="0x7f1a040abcd0" id="1438" addr="0x7f1a040abcd0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="1439" addr="0x7f1a040af550" />
+                        <constructor id="1430" addr="0x7fb6eb3f2e10" >
+                            <attributelist id="1431" addr="0x7fb6eb3f2e10" >
+                                <attribute name="ismember" value="1" id="1432" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_name" value="WsgiResponseBody" id="1433" addr="0x7fb6eb3f6550" />
+                                <attribute name="name" value="WsgiResponseBody" id="1434" addr="0x7fb6eb3f6550" />
+                                <attribute name="decl" value="f()." id="1435" addr="0x7fb6eb3f6550" />
+                                <attribute name="access" value="public" id="1436" addr="0x7fb6eb3f6550" />
+                                <attribute name="feature_new" value="1" id="1437" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_symtab" value="0x7fb6eb3f2cd0" id="1438" addr="0x7fb6eb3f2cd0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="1439" addr="0x7fb6eb3f6550" />
                             </attributelist >
                          
                         </constructor >
-                        <destructor id="1440" addr="0x7f1a040abf70" >
-                            <attributelist id="1441" addr="0x7f1a040abf70" >
-                                <attribute name="ismember" value="1" id="1442" addr="0x7f1a040af550" />
-                                <attribute name="sym_name" value="~WsgiResponseBody" id="1443" addr="0x7f1a040af550" />
-                                <attribute name="name" value="~WsgiResponseBody" id="1444" addr="0x7f1a040af550" />
-                                <attribute name="decl" value="f()." id="1445" addr="0x7f1a040af550" />
-                                <attribute name="access" value="public" id="1446" addr="0x7f1a040af550" />
-                                <attribute name="sym_symtab" value="0x7f1a040abcd0" id="1447" addr="0x7f1a040abcd0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="1448" addr="0x7f1a040af550" />
+                        <destructor id="1440" addr="0x7fb6eb3f2f70" >
+                            <attributelist id="1441" addr="0x7fb6eb3f2f70" >
+                                <attribute name="ismember" value="1" id="1442" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_name" value="~WsgiResponseBody" id="1443" addr="0x7fb6eb3f6550" />
+                                <attribute name="name" value="~WsgiResponseBody" id="1444" addr="0x7fb6eb3f6550" />
+                                <attribute name="decl" value="f()." id="1445" addr="0x7fb6eb3f6550" />
+                                <attribute name="access" value="public" id="1446" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_symtab" value="0x7fb6eb3f2cd0" id="1447" addr="0x7fb6eb3f2cd0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="1448" addr="0x7fb6eb3f6550" />
                             </attributelist >
                          
                         </destructor >
-                        <cdecl id="1449" addr="0x7f1a040ac270" >
-                            <attributelist id="1450" addr="0x7f1a040ac270" >
-                                <attribute name="ismember" value="1" id="1451" addr="0x7f1a040af550" />
-                                <attribute name="sym_name" value="operator ()" id="1452" addr="0x7f1a040af550" />
-                                <attribute name="name" value="operator ()" id="1453" addr="0x7f1a040af550" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="1454" addr="0x7f1a040af550" />
-                                <parmlist id="1455" addr="0x7f1a040ac1b0" >
+                        <cdecl id="1449" addr="0x7fb6eb3f3270" >
+                            <attributelist id="1450" addr="0x7fb6eb3f3270" >
+                                <attribute name="ismember" value="1" id="1451" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_name" value="operator ()" id="1452" addr="0x7fb6eb3f6550" />
+                                <attribute name="name" value="operator ()" id="1453" addr="0x7fb6eb3f6550" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="1454" addr="0x7fb6eb3f6550" />
+                                <parmlist id="1455" addr="0x7fb6eb3f31b0" >
                                     <parm id="1456">
-                                        <attributelist id="1457" addr="0x7f1a040ac1b0" >
-                                            <attribute name="name" value="data" id="1458" addr="0x7f1a040af550" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1459" addr="0x7f1a040af550" />
+                                        <attributelist id="1457" addr="0x7fb6eb3f31b0" >
+                                            <attribute name="name" value="data" id="1458" addr="0x7fb6eb3f6550" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1459" addr="0x7fb6eb3f6550" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="access" value="public" id="1460" addr="0x7f1a040af550" />
-                                <attribute name="kind" value="function" id="1461" addr="0x7f1a040af550" />
-                                <attribute name="type" value="void" id="1462" addr="0x7f1a040af550" />
-                                <attribute name="sym_symtab" value="0x7f1a040abcd0" id="1463" addr="0x7f1a040abcd0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="1464" addr="0x7f1a040af550" />
+                                <attribute name="access" value="public" id="1460" addr="0x7fb6eb3f6550" />
+                                <attribute name="kind" value="function" id="1461" addr="0x7fb6eb3f6550" />
+                                <attribute name="type" value="void" id="1462" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_symtab" value="0x7fb6eb3f2cd0" id="1463" addr="0x7fb6eb3f2cd0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="1464" addr="0x7fb6eb3f6550" />
                             </attributelist >
                          
                         </cdecl >
@@ -2238,10 +2238,10 @@
                 </namespace >
             </namespace >
         </include >
-        <insert id="1465" addr="0x7f1a040ac470" >
-            <attributelist id="1466" addr="0x7f1a040ac470" >
-                <attribute name="code" value="&#10;#endif&#10;" id="1467" addr="0x7f1a040af550" />
-                <attribute name="section" value="footer" id="1468" addr="0x7f1a040af550" />
+        <insert id="1465" addr="0x7fb6eb3f3470" >
+            <attributelist id="1466" addr="0x7fb6eb3f3470" >
+                <attribute name="code" value="&#10;#endif&#10;" id="1467" addr="0x7fb6eb3f6550" />
+                <attribute name="section" value="footer" id="1468" addr="0x7fb6eb3f6550" />
             </attributelist >
          
         </insert >
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index ce7c880920a..e419b16dc1d 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,6 +1,6 @@
 # Template file for 'kodi'
 pkgname=kodi
-version=18.3
+version=18.4
 revision=1
 _codename="Leia"
 wrksrc="xbmc-${version}-${_codename}"
@@ -11,7 +11,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://www.kodi.tv"
 distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz"
-checksum=4f265901c00f582beb8d6ad96c9c303e5ab82611e828c7121ae822b07c0915cc
+checksum=bf2be186d8ae5b5377e43c06a538012bb9f51a0e98f8244b70a401006861d110
 patch_args="-Np1"
 LDFLAGS+=" -Wl,-z,stack-size=1048576"
 
diff --git a/srcpkgs/kolourpaint/template b/srcpkgs/kolourpaint/template
index 6af501c8730..d1a1847c168 100644
--- a/srcpkgs/kolourpaint/template
+++ b/srcpkgs/kolourpaint/template
@@ -1,20 +1,16 @@
 # Template file for 'kolourpaint'
 pkgname=kolourpaint
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules kcoreaddons"
+hostmakedepends="extra-cmake-modules kcoreaddons kdoctools qt5-host-tools qt5-qmake"
 makedepends="kdelibs4support-devel kparts-devel libksane-devel qt5-devel"
 short_desc="Free, easy-to-use paint program for KDE"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="BSD-2-Clause, GPL-2.0-or-later, LGPL-2.1-only, GFDL-1.2-only"
 homepage="http://www.kolourpaint.org/"
 distfiles="${KDE_SITE}/applications/${version}/src/kolourpaint-${version}.tar.xz"
-checksum=00596d813eff27e45de7f51ae411b144ee21a7ae2baf576e248046dbd97e097d
-
-if [ -n "$CROSS_BUILD" ]; then
-	hostmakedepends+=" python qt5-host-tools qt5-qmake kconfig kdoctools"
-fi
+checksum=e8bde8d516159ae93dfe56565eea2919d2154606fd1814202f30caf21f659cda
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/kompare/template b/srcpkgs/kompare/template
index a49d43aaf40..0940f11d1da 100644
--- a/srcpkgs/kompare/template
+++ b/srcpkgs/kompare/template
@@ -1,9 +1,9 @@
 # Template file for 'kompare'
 pkgname=kompare
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python
+hostmakedepends="extra-cmake-modules kcoreaddons kdoctools
  qt5-host-tools qt5-qmake"
 makedepends="ktexteditor-devel libkomparediff2-devel"
 short_desc="File difference viewer"
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/development/kompare/"
 distfiles="${KDE_SITE}/applications/${version}/src/kompare-${version}.tar.xz"
-checksum=695c4096c3ac15ab38e5cfb4114f9425c8ccb2f618a65b5f36f3ddee5edec212
+checksum=b14f23ac6eb72622a06e2e489fc2d684124f520ad13e032338397fef342659eb
diff --git a/srcpkgs/konqueror/template b/srcpkgs/konqueror/template
index d07cd3eff27..91acdcbfe85 100644
--- a/srcpkgs/konqueror/template
+++ b/srcpkgs/konqueror/template
@@ -1,6 +1,6 @@
 # Template file for 'konqueror'
 pkgname=konqueror
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -14,10 +14,10 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://konqueror.org"
 distfiles="${KDE_SITE}/applications/${version}/src/konqueror-${version}.tar.xz"
-checksum=cc37709dcf183c68effb5332c29527b13fe7aae78216b84680ef6cc73192f971
+checksum=336da877ea44fb100ca5396bc843994d77d0939fe3c969ad8fa85f0e1644d111
 
 case "$XBPS_TARGET_MACHINE" in
-        arm*) broken="depends on qt5-webengine";;
+	arm*) broken="depends on qt5-webengine";;
 esac
 
 konqueror-devel_package() {
@@ -28,4 +28,3 @@ konqueror-devel_package() {
 		vmove usr/lib/cmake
 	}
 }
-
diff --git a/srcpkgs/konquest/template b/srcpkgs/konquest/template
index c0b650eb2e3..8a21e7999b1 100644
--- a/srcpkgs/konquest/template
+++ b/srcpkgs/konquest/template
@@ -1,6 +1,6 @@
 # Template file for 'konquest'
 pkgname=konquest
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kcoreaddons kdoctools"
@@ -11,4 +11,4 @@ maintainer="Olga Ustuzhanina <me@laserbat.pw>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/games/konquest/"
 distfiles="${KDE_SITE}/applications/${version}/src/konquest-${version}.tar.xz"
-checksum=94919dce58182859f7e720ece73be81b5bafc359afdc1c29f4f45a3b24155e60
+checksum=3dda62a480e37d97aabdc4670a8ac1cf209605ed274c872ee3575ff1ecff6936
diff --git a/srcpkgs/konsole/template b/srcpkgs/konsole/template
index 9dc40652103..c8c5886fa6b 100644
--- a/srcpkgs/konsole/template
+++ b/srcpkgs/konsole/template
@@ -1,6 +1,6 @@
 # Template file for 'konsole'
 pkgname=konsole
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://www.kde.org/applications/system/konsole/"
 distfiles="${KDE_SITE}/applications/${version}/src/konsole-${version}.tar.xz"
-checksum=4d495bf42fad1f457282a57f19fe2aece1ddbc88239352f0ebadfbcebf52ad6e
+checksum=4702fe52279c99e7d8da313285ace26955776669a78bdcb6dac7aec76cabe5ed
 replaces="konsole5>=0"
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/kontact/template b/srcpkgs/kontact/template
index d1993b539f0..41d3f4dcaa2 100644
--- a/srcpkgs/kontact/template
+++ b/srcpkgs/kontact/template
@@ -1,6 +1,6 @@
 # Template file for 'kontact'
 pkgname=kontact
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kdoctools
@@ -12,7 +12,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/office/kontact"
 distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=e47d3b4133e24b1c90a3a15f99a77cef442eefa0f2570dd34d5a9e302e845d9b
+checksum=d24023381304fbe388a0840921599d13c86912a1285acfc0a7d607962e37c5cf
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*) broken="depends on qt5-webengine";;
diff --git a/srcpkgs/kontactinterface/template b/srcpkgs/kontactinterface/template
index e81c8c458f9..0124aa7c65b 100644
--- a/srcpkgs/kontactinterface/template
+++ b/srcpkgs/kontactinterface/template
@@ -1,6 +1,6 @@
 # Template file for 'kontactinterface'
 pkgname=kontactinterface
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://kontact.kde.org"
 distfiles="${KDE_SITE}/applications/${version}/src/kontactinterface-${version}.tar.xz"
-checksum=e490fb4dc0e762d4f12a837ecbddc2f14276672d8f46d10029987222b372f3bc
+checksum=cbd34915ddf6fbcf02395f7c876050f2b732f3769627489f04979e419cfdc869
 
 kontactinterface-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/korganizer/template b/srcpkgs/korganizer/template
index e02249f923c..b8e16241e0e 100644
--- a/srcpkgs/korganizer/template
+++ b/srcpkgs/korganizer/template
@@ -1,7 +1,7 @@
 # Template file for 'korganizer'
 pkgname=korganizer
-version=19.08.0
-revision=1
+version=19.08.2
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kdoctools
  kcoreaddons kconfig"
@@ -12,4 +12,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/office/korganizer"
 distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=fbb6db9e517f7065ed978c6356989a38cea0c9520693d5e67fa04d8cfa625722
+checksum=969930b66a445873a28bfe2e67876388259e35e89ffce45607583b4a668d9194
diff --git a/srcpkgs/kpackage/template b/srcpkgs/kpackage/template
index 9a986b6fcf4..30227c8f014 100644
--- a/srcpkgs/kpackage/template
+++ b/srcpkgs/kpackage/template
@@ -1,6 +1,6 @@
 # Template file for 'kpackage'
 pkgname=kpackage
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kpackage"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8ff82d14fe0dd92ac774d5cd9cd6334b01574f0f5c584266f97359dde5db9a5f
+checksum=050b7f942ef0ce8ea99c1bddb119ee41905a70c2a5d52a9af63a4ea9599ca7c0
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"
diff --git a/srcpkgs/kparts/template b/srcpkgs/kparts/template
index 1a3d4eea5fb..522cae7772a 100644
--- a/srcpkgs/kparts/template
+++ b/srcpkgs/kparts/template
@@ -1,6 +1,6 @@
 # Template file for 'kparts'
 pkgname=kparts
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kparts"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f223b38f34f009bb25511ce7d97c607102cbb0a1bd0253ec1b7d1fe1b7c81436
+checksum=dc269356119c396ceea7a8fc3932209cec13eabb43974b4016b555921319a055
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python"
diff --git a/srcpkgs/kpartx/template b/srcpkgs/kpartx/template
index f73aa91f340..9281b1bfb77 100644
--- a/srcpkgs/kpartx/template
+++ b/srcpkgs/kpartx/template
@@ -1,6 +1,6 @@
 # Template file for 'kpartx'
 pkgname=kpartx
-version=0.8.2
+version=0.8.3
 revision=1
 wrksrc="multipath-tools-${version}"
 build_wrksrc=kpartx
@@ -12,11 +12,11 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://christophe.varoqui.free.fr/"
 distfiles="https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=refs/tags/${version}>kpartx-${version}.tar.gz"
-checksum=ba58d81bf6fc5ed30bbe278ec02bf63f59f3f121dbec32b1ba35cb9a1695cc74
+checksum=08c77873181832e4b5684bad5d08199602e6a708f43987fa459d054827f5f2d5
 LDFLAGS="-ldevmapper"
 CFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DLIBDM_API_COOKIE -I../libmultipath"
 
 post_extract() {
-	sed -i 's/daddr_t/uint32_t/g' kpartx/solaris.c
+	sed -i 's/__kernel_uint32_t/uint32_t/g' kpartx/solaris.c
 	sed -i 's,<sysmacros.h>,<sys/sysmacros.h>,g' kpartx/lopart.c
 }
diff --git a/srcpkgs/kpat/template b/srcpkgs/kpat/template
index 3ba58a18ae3..0785ce9134c 100644
--- a/srcpkgs/kpat/template
+++ b/srcpkgs/kpat/template
@@ -1,6 +1,6 @@
 # Template file for 'kpat'
 pkgname=kpat
-version=19.04.3
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kcoreaddons kdoctools
@@ -12,4 +12,8 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/games/kpatience/"
 distfiles="${KDE_SITE}/applications/${version}/src/kpat-${version}.tar.xz"
-checksum=ca9d53d400a2be3ca421d6d916cafeff3b9dcf220e627a1762f96817e952e8e2
+checksum=6322d86e12996da3d95f6d4afd1d2e70cfd1771698bab393aaf987fd4fe0ef67
+
+pre_check() {
+	export QT_QPA_PLATFORM=offscreen
+}
diff --git a/srcpkgs/kpeople/template b/srcpkgs/kpeople/template
index 6b4fed3f22c..ab3a49d4455 100644
--- a/srcpkgs/kpeople/template
+++ b/srcpkgs/kpeople/template
@@ -1,6 +1,6 @@
 # Template file for 'kpeople'
 pkgname=kpeople
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kpeople"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=549edacd7b63d704dd165bc803ae03f8d9e8c1ba31f8dbaea3f7e12c466b4298
+checksum=d43d6229a4963ff631d5b0b690bc1230d55e7bcb1abc03d245c33488a28050e0
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python"
diff --git a/srcpkgs/kpimtextedit/template b/srcpkgs/kpimtextedit/template
index cc55c716533..8b4297059d0 100644
--- a/srcpkgs/kpimtextedit/template
+++ b/srcpkgs/kpimtextedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kpimtextedit'
 pkgname=kpimtextedit
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python qt5-qmake qt5-host-tools
@@ -13,7 +13,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/applications/kpimtextedit"
 distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=45fcc5898e921c41eb28bb64ddd6d8240f4261360b9149a149ae4c281844dfcb
+checksum=e565774d77f310165fc44c8b109ef835aae82a2f763d89d1ffb6e5b820cd850d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-tools-devel"
diff --git a/srcpkgs/kplotting/template b/srcpkgs/kplotting/template
index 558d9b25220..417a284cd5d 100644
--- a/srcpkgs/kplotting/template
+++ b/srcpkgs/kplotting/template
@@ -1,17 +1,17 @@
 # Template file for 'kplotting'
 pkgname=kplotting
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
-makedepends="qt5-devel"
+makedepends="qt5-devel qt5-tools-devel"
 short_desc="QWidget-derived class for easy data-plotting"
 maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kplotting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=95781b50bef0e081e48b472b4fcbbcd3301ec45245498261e4a3ec8e42b892ba
+checksum=2957b8c5262e717950771a4f7bace00ff115069bb0db22b77e819d21c9c07786
 
 kplotting-devel_package() {
 	short_desc+=" - development"
@@ -19,6 +19,7 @@ kplotting-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/qt5/mkspecs
+		vmove usr/lib/qt5/plugins/designer
 		vmove usr/lib/cmake
 		vmove "usr/lib/*.so"
 	}
diff --git a/srcpkgs/kpty/template b/srcpkgs/kpty/template
index 19762ebd58d..52b79a6a717 100644
--- a/srcpkgs/kpty/template
+++ b/srcpkgs/kpty/template
@@ -1,6 +1,6 @@
 # Template file for 'kpty'
 pkgname=kpty
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kpty"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b91a88c00d3387927d1f6886a04e6e5bcc615ee1d0e72f647d51320ebf73471c
+checksum=79d2a9969cf2c20b41b701145f223151f618b50d4cf1466c2038b46902086683
 
 kpty-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kqtquickcharts/template b/srcpkgs/kqtquickcharts/template
index ceac9d10c2c..db13d938b0a 100644
--- a/srcpkgs/kqtquickcharts/template
+++ b/srcpkgs/kqtquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kqtquickcharts'
 pkgname=kqtquickcharts
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://edu.kde.org/"
 distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=6b25edca7643287acaf436ba58124077b89d067e2881a5dbfbd8833b68f3cb05
+checksum=3341f99ba3a35e9c4fd70911faebaf4312d7700a342edd242de2118f9a77c9fb
 
 kqtquickcharts-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/krdc/template b/srcpkgs/krdc/template
index f7cd2ff95cb..f6adfb75eaa 100644
--- a/srcpkgs/krdc/template
+++ b/srcpkgs/krdc/template
@@ -1,6 +1,6 @@
 # Template file for 'krdc'
 pkgname=krdc
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,10 +13,10 @@ makedepends="kconfig-devel kcmutils-devel kdnssd-devel knotifyconfig-devel
 depends="freerdp"
 short_desc="Remote Desktop Client supporting VNC and RDP"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
-license="GPL-2.0-or-later, GFDL-2.1, LGPL-2.1-or-later"
+license="GPL-2.0-or-later, GFDL-1.2-only, LGPL-2.1-or-later"
 homepage="https://kde.org/applications/internet/krdc/"
 distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=62c995dc1b6eabf2486d475ad089cb3e286d37c6927e4c5bd2455489f52a3e75
+checksum=c5e6193115afe742f25365bacb55aea21428acf38407659f77636217c589d8ff
 
 krdc-devel_package() {
 	short_desc+=" - development files"
@@ -26,4 +26,3 @@ krdc-devel_package() {
 		vmove "usr/lib/*.so"
 	}
 }
-
diff --git a/srcpkgs/krfb/template b/srcpkgs/krfb/template
index 8e570b88cf7..2afb73fd176 100644
--- a/srcpkgs/krfb/template
+++ b/srcpkgs/krfb/template
@@ -1,6 +1,6 @@
 # Template file for 'krfb'
 pkgname=krfb
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python kdoctools
@@ -11,7 +11,7 @@ makedepends="qt5-devel qt5-x11extras-devel ki18n-devel kcompletion-devel
  kxmlgui-devel libvncserver-devel libXtst-devel xcb-util-image-devel"
 short_desc="KDE Desktop Sharing"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
-license="GPL-2.0-or-later, GFDL-2.1, LGPL-2.1-or-later"
+license="GPL-2.0-or-later, GFDL-1.2-only, LGPL-2.1-or-later"
 homepage="https://www.kde.org/applications/system/krfb"
 distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=1142e493a37ce867b069ac278215377b56061b2412ee2dd46b0db456fb1419d4
+checksum=08877020abf6b7ac38e393443c34e7791456fc5bea8c43c552551148fd67b67e
diff --git a/srcpkgs/krita/patches/musl.patch b/srcpkgs/krita/patches/musl.patch
new file mode 100644
index 00000000000..fc87b4a9aea
--- /dev/null
+++ b/srcpkgs/krita/patches/musl.patch
@@ -0,0 +1,11 @@
+--- libs/image/tests/kis_paint_device_test.cpp	2019-09-30 15:18:28.000000000 +0200
++++ -	2019-10-01 16:45:18.829596521 +0200
+@@ -2354,7 +2354,7 @@
+ 
+         qDebug() << "Iteration:" << i;
+ 
+-#ifdef Q_OS_LINUX
++#ifdef __GLIBC__ 
+         struct mallinfo info = mallinfo();
+         qDebug() << "Allocated on heap:" << (info.arena >> 20) << "MiB";
+         qDebug() << "Mmaped regions:" << info.hblks << (info.hblkhd >> 20) << "MiB";
diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index 8c9a5671bb6..7a59fc9ac58 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,6 +1,6 @@
 # Template file for 'krita'
 pkgname=krita
-version=4.2.5
+version=4.2.7.1
 revision=1
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
@@ -16,7 +16,8 @@ short_desc="Painting and image editing program"
 maintainer="John <johnz@posteo.net>"
 license="GPL-3.0-only"
 homepage="https://krita.org/"
+KDE_SITE="http://ftp5.gwdg.de/pub/linux/kde/stable/"
 distfiles="${KDE_SITE}/krita/${version}/krita-${version}.tar.gz"
-checksum=fce4342ae54f7c9b2a318d49d678699d760485ef406b3db235542b9cabc824b8
+checksum=28218030edca9dfa1c7e255401ca6fc8fe0e5329f7611cfc196e35746d312086
 nocross=yes
 replaces="calligra-krita>=0"
diff --git a/srcpkgs/kross/template b/srcpkgs/kross/template
index c36dee6d3c0..9e02a2cf17c 100644
--- a/srcpkgs/kross/template
+++ b/srcpkgs/kross/template
@@ -1,6 +1,6 @@
 # Template file for 'kross'
 pkgname=kross
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,13 +11,17 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kross"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=103837799febbd62365a6445db046a2ee4add13d7d250abf925872cac642986e
+checksum=ecc1f2ac39b4d9d53e52b30aca40cfc1d5b7cfc834a321f1e3dbd4d5e7bb515d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools-devel"
 	configure_args+=" -DMEINPROC5_EXECUTABLE=/usr/bin/meinproc5"
 fi
 
+case "$XBPS_TARGET_MACHINE" in
+	armv6l-musl) makedepends+=" libatomic-devel";;
+esac
+
 kross-devel_package() {
 	short_desc+=" - development"
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kruler/template b/srcpkgs/kruler/template
index a35ebf3f80d..35c32e99b84 100644
--- a/srcpkgs/kruler/template
+++ b/srcpkgs/kruler/template
@@ -1,17 +1,14 @@
 # Template file for 'kruler'
 pkgname=kruler
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules kcoreaddons pkg-config"
+hostmakedepends="extra-cmake-modules kconfig kcoreaddons kdoctools
+ pkg-config qt5-host-tools qt5-qmake"
 makedepends="kparts-devel"
 short_desc="Screen Ruler"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/kruler/"
 distfiles="${KDE_SITE}/applications/${version}/src/kruler-${version}.tar.xz"
-checksum=a78d054359b559b612dd1dac8f0974f554fb7a52bd8de7152de88866719f9226
-
-if [ -n "$CROSS_BUILD" ]; then
-	hostmakedepends+=" kconfig kdoctools python qt5-host-tools qt5-qmake"
-fi
+checksum=2a3c51a60f503807694cf49796b3bf82c6992ec4c0c15cf38adae92a8dbc24cc
diff --git a/srcpkgs/krunner/template b/srcpkgs/krunner/template
index de0a5a2dafa..80d859ee981 100644
--- a/srcpkgs/krunner/template
+++ b/srcpkgs/krunner/template
@@ -1,6 +1,6 @@
 # Template file for 'krunner'
 pkgname=krunner
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/frameworks/krunner"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f32ea603a9bcb9c2e39231f99bfc6079d118eebbf2c72e0818e2a9cd060543be
+checksum=aa58b6301de114e7f0a420982f1387dfadac2112aac1339182af18f4f4e7583e
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/krusader/template b/srcpkgs/krusader/template
index 957b09c7517..9f184d53be8 100644
--- a/srcpkgs/krusader/template
+++ b/srcpkgs/krusader/template
@@ -1,7 +1,7 @@
 # Template file for 'krusader'
 pkgname=krusader
-version=2.7.1
-revision=2
+version=2.7.2
+revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config kdoctools qt5-qmake qt5-host-tools kcoreaddons"
 makedepends="kparts-devel plasma-framework-devel ksolid-devel"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.krusader.org/"
 distfiles="${KDE_SITE}/krusader/${version}/krusader-${version}.tar.xz"
-checksum=d5c14d7e0698b84a1285efe7058074f760924d13d0823e1b5123fbe771907deb
+checksum=41a39a43b3c42dd1d1ecaea86df30caff6a061fecc1d66f60859b2a3ca976109
diff --git a/srcpkgs/kscreen/template b/srcpkgs/kscreen/template
index 83f1b8e3f95..76fcf23a625 100644
--- a/srcpkgs/kscreen/template
+++ b/srcpkgs/kscreen/template
@@ -1,18 +1,20 @@
 # Template file for 'kscreen'
 pkgname=kscreen
-version=5.16.4
+version=5.17.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
-hostmakedepends="extra-cmake-modules qt5-devel qt5-qmake kcoreaddons"
-makedepends="kxmlgui-devel libkscreen-devel plasma-framework-devel"
+hostmakedepends="extra-cmake-modules qt5-devel qt5-qmake
+ kcmutils kcoreaddons"
+makedepends="kxmlgui-devel libkscreen-devel plasma-framework-devel
+ kcmutils-devel"
 depends="hicolor-icon-theme"
 short_desc="KDE screen management software"
 maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/plasma/kscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=40c29ad2236459a267eed3cad4a6fc64b5e3f12df8567fcf8869ba770c2e2328
+checksum=9a1e689f0b8ac69fd9c471a5f4f54a846c1ec8a1914ab9b71754a81cd4c5d6ee
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/kscreenlocker/template b/srcpkgs/kscreenlocker/template
index 5281af68768..1740e089354 100644
--- a/srcpkgs/kscreenlocker/template
+++ b/srcpkgs/kscreenlocker/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreenlocker'
 pkgname=kscreenlocker
-version=5.16.4
+version=5.17.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/plasma/kscreenlocker"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=92a858f1f4bd6f209f328ca6456dfadc6b542e2a1e3d04ecdcc70f70c1cc2f6f
+checksum=2047e1dad90fd1c298ab23c7668fa60fd1189b1d232aca0ed5976d086ac1f3cb
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wayland-devel"
diff --git a/srcpkgs/kservice/template b/srcpkgs/kservice/template
index 9985a75d774..f85e659236f 100644
--- a/srcpkgs/kservice/template
+++ b/srcpkgs/kservice/template
@@ -1,6 +1,6 @@
 # Template file for 'kservice'
 pkgname=kservice
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kservice"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4489ac4553522bb76604e284338ab37a7a2369eea45dadd96a955fedf8ca99f9
+checksum=93ff8eef9bafccec78fe972aefd8d839086c9e3e13a8affc35d8e5c813bfaae5
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel kcoreaddons kdoctools"
diff --git a/srcpkgs/ksh/files/LICENSE b/srcpkgs/ksh/files/LICENSE
deleted file mode 100644
index ebd0b184eff..00000000000
--- a/srcpkgs/ksh/files/LICENSE
+++ /dev/null
@@ -1,229 +0,0 @@
-Copyright:
-
-  Copyright (c) 1982-2012 AT&T Intellectual Property
-
-Upstream Author: David Korn <dgk@research.att.com>
-
-License:
-
-+------------------------------------------------------------------------------+
-|          This license covers all software that refers to the URL             |
-|             http://www.eclipse.org/org/documents/epl-v10.html                |
-+------------------------------------------------------------------------------+
-
-Eclipse Public License - v 1.0
-
-   THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
-   LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
-   CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-   1. DEFINITIONS
-
-   "Contribution" means:
-
-   a)  in  the  case  of  the  initial  Contributor, the initial code and
-   documentation distributed under this Agreement, and
-
-   b) in the case of each subsequent Contributor:
-
-   i) changes to the Program, and
-
-   ii) additions to the Program;
-
-   where such changes and/or additions to the Program originate from and are
-   distributed by that particular Contributor. A Contribution 'originates' from
-   a Contributor if it was added to the Program by such Contributor itself or
-   anyone acting on such Contributor's behalf. Contributions do not include
-   additions  to  the Program which: (i) are separate modules of software
-   distributed  in  conjunction  with the Program under their own license
-   agreement, and (ii) are not derivative works of the Program.
-
-   "Contributor" means any person or entity that distributes the Program.
-
-   "Licensed Patents" mean patent claims licensable by a Contributor which are
-   necessarily infringed by the use or sale of its Contribution alone or when
-   combined with the Program.
-
-   "Program"  means the Contributions distributed in accordance with this
-   Agreement.
-
-   "Recipient" means anyone who receives the Program under this Agreement,
-   including all Contributors.
-
-   2. GRANT OF RIGHTS
-
-   a) Subject to the terms of this Agreement, each Contributor hereby grants
-   Recipient a non-exclusive, worldwide, royalty-free copyright license to
-   reproduce, prepare derivative works of, publicly display, publicly perform,
-   distribute and sublicense the Contribution of such Contributor, if any, and
-   such derivative works, in source code and object code form.
-
-   b) Subject to the terms of this Agreement, each Contributor hereby grants
-   Recipient a non-exclusive, worldwide, royalty-free patent license under
-   Licensed Patents to make, use, sell, offer to sell, import and otherwise
-   transfer the Contribution of such Contributor, if any, in source code and
-   object code form. This patent license shall apply to the combination of the
-   Contribution and the Program if, at the time the Contribution is added by
-   the Contributor, such addition of the Contribution causes such combination
-   to be covered by the Licensed Patents. The patent license shall not apply to
-   any other combinations which include the Contribution. No hardware per se is
-   licensed hereunder.
-
-   c) Recipient understands that although each Contributor grants the licenses
-   to its Contributions set forth herein, no assurances are provided by any
-   Contributor  that  the  Program  does not infringe the patent or other
-   intellectual property rights of any other entity. Each Contributor disclaims
-   any liability to Recipient for claims brought by any other entity based on
-   infringement of intellectual property rights or otherwise. As a condition to
-   exercising the rights and licenses granted hereunder, each Recipient hereby
-   assumes sole responsibility to secure any other intellectual property rights
-   needed, if any. For example, if a third party patent license is required to
-   allow Recipient to distribute the Program, it is Recipient's responsibility
-   to acquire that license before distributing the Program.
-
-   d) Each Contributor represents that to its knowledge it has sufficient
-   copyright rights in its Contribution, if any, to grant the copyright license
-   set forth in this Agreement.
-
-   3. REQUIREMENTS
-
-   A Contributor may choose to distribute the Program in object code form under
-   its own license agreement, provided that:
-
-   a) it complies with the terms and conditions of this Agreement; and
-
-   b) its license agreement:
-
-   i) effectively disclaims on behalf of all Contributors all warranties and
-   conditions, express and implied, including warranties or conditions of title
-   and   non-infringement,   and  implied  warranties  or  conditions  of
-   merchantability and fitness for a particular purpose;
-
-   ii) effectively excludes on behalf of all Contributors all liability for
-   damages, including direct, indirect, special, incidental and consequential
-   damages, such as lost profits;
-
-   iii) states that any provisions which differ from this Agreement are offered
-   by that Contributor alone and not by any other party; and
-
-   iv)  states  that  source  code for the Program is available from such
-   Contributor, and informs licensees how to obtain it in a reasonable manner
-   on or through a medium customarily used for software exchange.
-
-   When the Program is made available in source code form:
-
-   a) it must be made available under this Agreement; and
-
-   b) a copy of this Agreement must be included with each copy of the Program.
-
-   Contributors may not remove or alter any copyright notices contained within
-   the Program.
-
-   Each Contributor must identify itself as the originator of its Contribution,
-   if any, in a manner that reasonably allows subsequent Recipients to identify
-   the originator of the Contribution.
-
-   4. COMMERCIAL DISTRIBUTION
-
-   Commercial distributors of software may accept certain responsibilities with
-   respect to end users, business partners and the like. While this license is
-   intended to facilitate the commercial use of the Program, the Contributor
-   who includes the Program in a commercial product offering should do so in a
-   manner which does not create potential liability for other Contributors.
-   Therefore, if a Contributor includes the Program in a commercial product
-   offering, such Contributor ("Commercial Contributor") hereby agrees to
-   defend and indemnify every other Contributor ("Indemnified Contributor")
-   against any losses, damages and costs (collectively "Losses") arising from
-   claims, lawsuits and other legal actions brought by a third party against
-   the Indemnified Contributor to the extent caused by the acts or omissions of
-   such Commercial Contributor in connection with its distribution of the
-   Program in a commercial product offering. The obligations in this section do
-   not  apply  to  any claims or Losses relating to any actual or alleged
-   intellectual property infringement. In order to qualify, an Indemnified
-   Contributor must: a) promptly notify the Commercial Contributor in writing
-   of such claim, and b) allow the Commercial Contributor to control, and
-   cooperate with the Commercial Contributor in, the defense and any related
-   settlement negotiations. The Indemnified Contributor may participate in any
-   such claim at its own expense.
-
-   For example, a Contributor might include the Program in a commercial product
-   offering, Product X. That Contributor is then a Commercial Contributor. If
-   that  Commercial  Contributor then makes performance claims, or offers
-   warranties related to Product X, those performance claims and warranties are
-   such Commercial Contributor's responsibility alone. Under this section, the
-   Commercial  Contributor  would have to defend claims against the other
-   Contributors related to those performance claims and warranties, and if a
-   court requires any other Contributor to pay any damages as a result, the
-   Commercial Contributor must pay those damages.
-
-   5. NO WARRANTY
-
-   EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON
-   AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER
-   EXPRESS  OR  IMPLIED  INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR
-   CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A
-   PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the
-   appropriateness of using and distributing the Program and assumes all risks
-   associated with its exercise of rights under this Agreement , including but
-   not  limited to the risks and costs of program errors, compliance with
-   applicable laws, damage to or loss of data, programs or equipment, and
-   unavailability or interruption of operations.
-
-   6. DISCLAIMER OF LIABILITY
-
-   EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
-   CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION
-   LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-   ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
-   EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY
-   OF SUCH DAMAGES.
-
-   7. GENERAL
-
-   If  any  provision of this Agreement is invalid or unenforceable under
-   applicable law, it shall not affect the validity or enforceability of the
-   remainder of the terms of this Agreement, and without further action by the
-   parties hereto, such provision shall be reformed to the minimum extent
-   necessary to make such provision valid and enforceable.
-
-   If Recipient institutes patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Program itself
-   (excluding combinations of the Program with other software or hardware)
-   infringes such Recipient's patent(s), then such Recipient's rights granted
-   under Section 2(b) shall terminate as of the date such litigation is filed.
-
-   All Recipient's rights under this Agreement shall terminate if it fails to
-   comply with any of the material terms or conditions of this Agreement and
-   does not cure such failure in a reasonable period of time after becoming
-   aware of such noncompliance. If all Recipient's rights under this Agreement
-   terminate, Recipient agrees to cease use and distribution of the Program as
-   soon as reasonably practicable. However, Recipient's obligations under this
-   Agreement and any licenses granted by Recipient relating to the Program
-   shall continue and survive.
-
-   Everyone is permitted to copy and distribute copies of this Agreement, but
-   in order to avoid inconsistency the Agreement is copyrighted and may only be
-   modified in the following manner. The Agreement Steward reserves the right
-   to publish new versions (including revisions) of this Agreement from time to
-   time. No one other than the Agreement Steward has the right to modify this
-   Agreement. The Eclipse Foundation is the initial Agreement Steward. The
-   Eclipse Foundation may assign the responsibility to serve as the Agreement
-   Steward to a suitable separate entity. Each new version of the Agreement
-   will  be given a distinguishing version number. The Program (including
-   Contributions) may always be distributed subject to the version of the
-   Agreement under which it was received. In addition, after a new version of
-   the Agreement is published, Contributor may elect to distribute the Program
-   (including its Contributions) under the new version. Except as expressly
-   stated in Sections 2(a) and 2(b) above, Recipient receives no rights or
-   licenses  to  the  intellectual property of any Contributor under this
-   Agreement, whether expressly, by implication, estoppel or otherwise. All
-   rights  in  the Program not expressly granted under this Agreement are
-   reserved.
-
-   This Agreement is governed by the laws of the State of New York and the
-   intellectual property laws of the United States of America. No party to this
-   Agreement will bring a legal action under this Agreement more than one year
-   after the cause of action arose. Each party waives its rights to a jury
-   trial in any resulting litigation.
diff --git a/srcpkgs/ksh/template b/srcpkgs/ksh/template
index 711d70d8a0a..2709dacc0b0 100644
--- a/srcpkgs/ksh/template
+++ b/srcpkgs/ksh/template
@@ -1,19 +1,19 @@
 # Template file for 'ksh'
 pkgname=ksh
-version=2018.01.19
-revision=2
-_githash=0280d4fdadd3ad690c7b69b795a2f0621b29c445
-wrksrc="ast-${_githash}"
+version=2020.0.0
+revision=1
+wrksrc="ast-${version}"
 build_style=meson
-register_shell="/bin/ksh"
+configure_args="-Dbuild-api-tests=false -Dbuild-api-tests-only=true"
 short_desc="AT&T's Korn shell (ksh93)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
 homepage="http://www.kornshell.com/"
-distfiles="https://github.com/att/ast/archive/${_githash}.tar.gz"
-checksum=5088ec1a726180e28ffbce5a6c31489100c37d913fd381e534db2607117fc3f7
+distfiles="https://github.com/att/ast/archive/${version}.tar.gz"
+checksum=76597c96c4f94423b9225b5de50ea54be08d5bbaa1e0e594a7eec603bd60ecaf
 nocross=yes
 
+register_shell="/bin/ksh"
 alternatives="
  ksh:ksh:/usr/bin/ksh93
  ksh:ksh.1:/usr/share/man/man1/ksh93.1
@@ -24,14 +24,25 @@ if [ "$build_option_static" ]; then
 	LDFLAGS+=" -static"
 fi
 
+case "$XBPS_TARGET_MACHINE" in
+*-musl)
+	makedepends+=" musl-fts-devel"
+esac
+
 post_extract() {
 	sed -i -e 's/= library/= static_library/'  \
 		-e 's/install: true/install: false/' src/lib/*/meson.build
+	sed -i 's/vpoi/void*/g' src/cmd/ksh93/include/name.h
+	if [ "$build_option_static" ]; then
+		# Drop tests that use .so
+		sed -i '/some tests/,$d' src/cmd/ksh93/meson.build
+		sed -i '/libsample_files/,$d' src/lib/libdll/meson.build
+	fi
 }
 post_install() {
 	mv ${DESTDIR}/usr/bin/ksh ${DESTDIR}/usr/bin/ksh93
 	mv ${DESTDIR}/usr/share/man/man1/ksh.1 ${DESTDIR}/usr/share/man/man1/ksh93.1
 	vmkdir usr/share/ksh
 	vcopy src/cmd/ksh93/fun usr/share/ksh/functions
-	vlicense ${FILESDIR}/LICENSE
+	vlicense LICENSE
 }
diff --git a/srcpkgs/ksmtp/template b/srcpkgs/ksmtp/template
index bc0882d3ef2..8d17864269b 100644
--- a/srcpkgs/ksmtp/template
+++ b/srcpkgs/ksmtp/template
@@ -1,6 +1,6 @@
 # Template file for 'ksmtp'
 pkgname=ksmtp
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/applications/${version}/src/ksmtp-${version}.tar.xz"
-checksum=2947d49f183fe25dc340dd3fa6145c85b1896c8adb08bab9966e1f99a927a003
+checksum=0d1308fd01f7261e78bedb465983be2ccf5a1514cfa31125e0a3488f67ab6590
 
 ksmtp-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/ksnip/patches/useGNUInstallDirs.patch b/srcpkgs/ksnip/patches/useGNUInstallDirs.patch
new file mode 100644
index 00000000000..dc0f9bc685c
--- /dev/null
+++ b/srcpkgs/ksnip/patches/useGNUInstallDirs.patch
@@ -0,0 +1,10 @@
+--- src/CMakeLists.txt	2019-03-14 18:04:48.000000000 +0100
++++ -	2019-08-29 21:09:44.259815517 +0200
+@@ -109,5 +109,6 @@
+ endif ()
+ 
+ if (UNIX AND NOT APPLE)
+-	install(TARGETS ksnip RUNTIME DESTINATION /bin)
++	include (GNUInstallDirs)
++	install(TARGETS ksnip RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+ endif ()
diff --git a/srcpkgs/ksnip/template b/srcpkgs/ksnip/template
new file mode 100644
index 00000000000..25614b21e68
--- /dev/null
+++ b/srcpkgs/ksnip/template
@@ -0,0 +1,14 @@
+# Template file for 'ksnip'
+pkgname=ksnip
+version=1.5.0
+revision=2
+build_style=cmake
+hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools"
+makedepends="qt5-x11extras-devel qt5-tools-devel libXfixes-devel
+ kImageAnnotator-devel kColorPicker-devel"
+short_desc="Qt based cross-platform screenshot tool with annotation features"
+maintainer="John <johnz@posteo.net>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/DamirPorobic/ksnip"
+distfiles="https://github.com/DamirPorobic/ksnip/archive/v${version}.tar.gz"
+checksum=d235b201717b0a058f93ebfb592140b0eb36a2222f7a21cc0694c50fd215c6ca
diff --git a/srcpkgs/ksolid/template b/srcpkgs/ksolid/template
index ca15e11587b..f7b56dc8079 100644
--- a/srcpkgs/ksolid/template
+++ b/srcpkgs/ksolid/template
@@ -1,6 +1,6 @@
 # Template file for 'ksolid'
 pkgname=ksolid
-version=5.61.0
+version=5.63.0
 revision=1
 wrksrc="${pkgname#k}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/frameworks/solid"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#k}-${version}.tar.xz"
-checksum=c3a032086eacbb836fc102bd77236285ad5a808c0537ff55dbacda539ba3eacf
+checksum=d4729dca2d6775e897612f8d0f0c5c23335f86aad84270a5b20e8606fd242244
 
 libksolid_package() {
 	short_desc+=" - runtime library"
diff --git a/srcpkgs/ksshaskpass/template b/srcpkgs/ksshaskpass/template
index 73d72970768..35a22e99420 100644
--- a/srcpkgs/ksshaskpass/template
+++ b/srcpkgs/ksshaskpass/template
@@ -1,6 +1,6 @@
 # Template file for 'ksshaskpass'
 pkgname=ksshaskpass
-version=5.16.4
+version=5.17.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/plasma/ksshaskpass"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e3ff91e5c160b8e83b48215fca5d70f4baeef95b6c3b32e8cfc749183b0ec97c
+checksum=75ed318ebac038b6309b78f10dd1ef6e23935e93f7575372e2c2c4bbe607febb
diff --git a/srcpkgs/ksysguard/template b/srcpkgs/ksysguard/template
index bf1a37a184e..993a03235bc 100644
--- a/srcpkgs/ksysguard/template
+++ b/srcpkgs/ksysguard/template
@@ -1,6 +1,6 @@
 # Template file for 'ksysguard'
 pkgname=ksysguard
-version=5.16.4
+version=5.17.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later, GFDL-1.2"
 homepage="https://projects.kde.org/projects/plasma/ksysguard"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=10abf3bfa676275b6fded5e49979466a011e0552b9357c1b8923f01184c029d5
+checksum=4181535cc74f73c0a75fcf7a377595bd0381125a6f5537b116327b94402013d5
diff --git a/srcpkgs/ksystemlog/template b/srcpkgs/ksystemlog/template
index e7f0f5f575e..5b94cb45174 100644
--- a/srcpkgs/ksystemlog/template
+++ b/srcpkgs/ksystemlog/template
@@ -1,22 +1,17 @@
 # Template file for 'ksystemlog'
 pkgname=ksystemlog
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules kcoreaddons pkg-config"
+hostmakedepends="extra-cmake-modules kconfig kcoreaddons kdoctools pkg-config qt5-host-tools qt5-qmake"
 makedepends="kparts-devel qt5-devel"
 short_desc="KDE System log viewer tool"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/system/ksystemlog/"
 distfiles="${KDE_SITE}/applications/${version}/src/ksystemlog-${version}.tar.xz"
-checksum=1231a9dd9a697fe2379a93a3a4d5c026aedf70a8f7e14d8a626ef6b782fb4259
+checksum=742bff9c71cc42d7a57a7732f039a944f60fe4dd70cf71c32f37ba914b57b5de
 
-if [ -n "$CROSS_BUILD" ]; then
-	hostmakedepends+=" kconfig kdoctools python qt5-host-tools qt5-qmake"
-fi
-
-do_check() {
-	# Requires xserver running
-	:
+pre_check() {
+	export QT_QPA_PLATFORM=offscreen
 }
diff --git a/srcpkgs/kteatime/template b/srcpkgs/kteatime/template
index 80f41a87ffe..9e83e8e4d57 100644
--- a/srcpkgs/kteatime/template
+++ b/srcpkgs/kteatime/template
@@ -1,17 +1,14 @@
 # Template file for 'kteatime'
 pkgname=kteatime
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules kcoreaddons pkg-config"
+hostmakedepends="extra-cmake-modules kcoreaddons kdoctools
+ pkg-config qt5-host-tools qt5-qmake"
 makedepends="kparts-devel knotifyconfig-devel"
 short_desc="Handy timer for steeping tea"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/games/kteatime/"
 distfiles="${KDE_SITE}/applications/${version}/src/kteatime-${version}.tar.xz"
-checksum=3be9667867ef41a638c8f97fefb213b078b0ba3171add881438588bc8afba342
-
-if [ -n "$CROSS_BUILD" ]; then
-	hostmakedepends+=" kdoctools python qt5-host-tools qt5-qmake"
-fi
+checksum=075470af370b7913fdb085dd6984da91f863b6c03a4b713854e85437e6f9cdbe
diff --git a/srcpkgs/ktexteditor/template b/srcpkgs/ktexteditor/template
index 45e2d5636c4..1f74c78469d 100644
--- a/srcpkgs/ktexteditor/template
+++ b/srcpkgs/ktexteditor/template
@@ -1,6 +1,6 @@
 # Template file for 'ktexteditor'
 pkgname=ktexteditor
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/frameworks/ktexteditor"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ae99eacb445f8bc27af379d1ec54e8df4d25f601fc12053bc2928a8c639ad0cb
+checksum=0abbefbad6d66da767b99621f1dc2c4e1568012bff809fc4469608337236d46d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kauth kparts"
diff --git a/srcpkgs/ktextwidgets/template b/srcpkgs/ktextwidgets/template
index 6e8f5214751..d91182727ec 100644
--- a/srcpkgs/ktextwidgets/template
+++ b/srcpkgs/ktextwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'ktextwidgets'
 pkgname=ktextwidgets
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/frameworks/ktextwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a2fddad3dda750ea6bdb104c460e50586946ded3e1f46a8729dbd304016a0b5a
+checksum=0a62b21fc2fc94984d89da81372551b380a2c71293df3f3def29bc559aaa61e1
 
 ktextwidgets-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/ktnef/template b/srcpkgs/ktnef/template
index b6719ae0551..b2f95634a2e 100644
--- a/srcpkgs/ktnef/template
+++ b/srcpkgs/ktnef/template
@@ -1,7 +1,7 @@
 # Template file for 'ktnef'
 pkgname=ktnef
-version=19.08.0
-revision=1
+version=19.08.2
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python
  kcoreaddons"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/applications/${version}/src/ktnef-${version}.tar.xz"
-checksum=54b2e09a872e8f8e4e8a1ef77975b1d063ef0d07999b1bf2a696675659e6d52f
+checksum=d8efabe72eedd5e89f3de9637a1a6d68ce670ec071e031470aa6852f9ad8561d
 
 ktnef-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/ktouch/template b/srcpkgs/ktouch/template
index 3998be000ae..6b91895d660 100644
--- a/srcpkgs/ktouch/template
+++ b/srcpkgs/ktouch/template
@@ -1,6 +1,6 @@
 # Template file for 'ktouch'
 pkgname=ktouch
-version=19.04.3
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kcoreaddons kdoctools
@@ -15,7 +15,7 @@ maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/education/ktouch"
 distfiles="${KDE_SITE}/applications/${version}/src/ktouch-${version}.tar.xz"
-checksum=dce3f72204f43ddde109a39fca65f2936e9d9db686e6b3edf8ae04bc9c1c0e55
+checksum=d36659c21d05465c7a77330dbfbbab09946093eac1db6c02147d81a838eba636
 
 post_configure() {
 	sed -e 's|/usr/bin/qmlcachegen|/usr/bin/qmlcachegen-qt5|g' \
diff --git a/srcpkgs/ktuberling/template b/srcpkgs/ktuberling/template
index 60182b0d972..a0f8028ad94 100644
--- a/srcpkgs/ktuberling/template
+++ b/srcpkgs/ktuberling/template
@@ -1,6 +1,6 @@
 # Template file for 'ktuberling'
 pkgname=ktuberling
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake kdoctools
@@ -12,4 +12,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-3.0-or-later"
 homepage="https://www.kde.org/applications/games/ktuberling"
 distfiles="${KDE_SITE}/applications/${version}/src/ktuberling-${version}.tar.xz"
-checksum=ca751ad3cc06475955fa9cb037a1a60539f59b7e3d22aa7d47e9fd4f2771cd5f
+checksum=e6cfcd7175c7ed081ecd743c2fdd845f88b25d6cb4d46f9e6d58e35eb11c66ad
diff --git a/srcpkgs/kturtle/template b/srcpkgs/kturtle/template
index 5f584c978be..915b8d66be5 100644
--- a/srcpkgs/kturtle/template
+++ b/srcpkgs/kturtle/template
@@ -1,14 +1,14 @@
 # Template file for 'kturtle'
 pkgname=kturtle
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools
- pkg-config python qt5-host-tools qt5-qmake"
+ pkg-config qt5-host-tools qt5-qmake"
 makedepends="kparts-devel knewstuff-devel knotifyconfig-devel"
 short_desc="Educational Programming Environment"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/education/kturtle/"
 distfiles="${KDE_SITE}/applications/${version}/src/kturtle-${version}.tar.xz"
-checksum=0e7453e785344a792747b5d51d2c4a190d41e87ddf7e0a9ea49d107a2dd03db8
+checksum=1f1245c444aba511aea0630f80953171dd11334f55f6b9547a844e25293cf833
diff --git a/srcpkgs/kubecfg/template b/srcpkgs/kubecfg/template
index f7d77867b47..27b7bbd6e4f 100644
--- a/srcpkgs/kubecfg/template
+++ b/srcpkgs/kubecfg/template
@@ -1,6 +1,6 @@
 # Template file for 'kubecfg'
 pkgname=kubecfg
-version=0.12.4
+version=0.13.1
 revision=1
 build_style=go
 go_import_path="github.com/bitnami/kubecfg"
@@ -10,4 +10,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://github.com/bitnami/kubecfg"
 distfiles="https://github.com/bitnami/kubecfg/archive/v${version}.tar.gz"
-checksum=0d38cecc0e1737d2d27c0ce31e1d36b3c5cdc19f4c2ab77d254229ab9685d915
+checksum=1ebed3c7d815bbc8fcfcd3b49f7dd75f725167f7129f5acd9b66f9eb8a98ac5d
diff --git a/srcpkgs/kubernetes/template b/srcpkgs/kubernetes/template
index 4069ad34f4c..a62969210af 100644
--- a/srcpkgs/kubernetes/template
+++ b/srcpkgs/kubernetes/template
@@ -1,6 +1,6 @@
 # Template file for 'kubernetes'
 pkgname=kubernetes
-version=1.15.2
+version=1.16.0
 revision=1
 build_style=go
 nocross=yes
@@ -13,7 +13,7 @@ license="Apache-2.0"
 go_import_path="github.com/kubernetes/kubernetes"
 homepage="http://kubernetes.io"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=05362a263bdc6329accd11efd1de6ce94b9612ff6570e5faf3ab90730510171b
+checksum=a8b2ee84ce38fa14404d7e56daa87aa2f2fb13e0114fb1150f294c992ab3f36c
 system_accounts="kube"
 make_dirs="/var/lib/kubelet 0755 kube kube"
 conf_files="/etc/kubernetes/*"
diff --git a/srcpkgs/kunitconversion/template b/srcpkgs/kunitconversion/template
index 14caf321b10..17982bdda18 100644
--- a/srcpkgs/kunitconversion/template
+++ b/srcpkgs/kunitconversion/template
@@ -1,6 +1,6 @@
 # Template file for 'kunitconversion'
 pkgname=kunitconversion
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools ki18n-devel"
@@ -10,7 +10,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kunitconversion"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e5ffa3ff954c46b2416823467fcecd37c6ddb8304529703bc9cc3a24b74b6c24
+checksum=ffe759050f0ac56d26049906b7beb5be8bc16d15917a16d287962725bb14f87b
 
 kunitconversion-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kvantum/template b/srcpkgs/kvantum/template
index f696bb3005f..70f28253833 100644
--- a/srcpkgs/kvantum/template
+++ b/srcpkgs/kvantum/template
@@ -1,6 +1,6 @@
 # Template file for 'kvantum'
 pkgname=kvantum
-version=0.11.1
+version=0.12.1
 revision=1
 wrksrc="Kvantum-${version}"
 build_wrksrc=Kvantum
@@ -13,7 +13,7 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/tsujan/Kvantum"
 distfiles="https://github.com/tsujan/Kvantum/archive/V${version}.tar.gz"
-checksum=c91101157873803e3365607d83d31a02e17364390f074d7defd6860ae01bdd51
+checksum=a12cc341eb5fd75cf592d1e99623ad0692d96b1ab22c2e52260f978524a12358
 nocross="https://build.voidlinux.org/builders/aarch64-musl_builder/builds/21436/steps/shell_3/logs/stdio"
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/kvirc/template b/srcpkgs/kvirc/template
index 022c1d46baf..c10c2dc7e0e 100644
--- a/srcpkgs/kvirc/template
+++ b/srcpkgs/kvirc/template
@@ -1,7 +1,7 @@
 # Template file for 'kvirc'
 pkgname=kvirc
 version=5.0.0
-revision=2
+revision=3
 wrksrc="KVIrc-$version"
 build_style=cmake
 configure_args="-DWANT_ENV_FLAGS=1 -DWANT_KDE=0"
diff --git a/srcpkgs/kwallet-pam/template b/srcpkgs/kwallet-pam/template
index 9880e6299d0..53241183580 100644
--- a/srcpkgs/kwallet-pam/template
+++ b/srcpkgs/kwallet-pam/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet-pam'
 pkgname=kwallet-pam
-version=5.16.4
+version=5.17.0
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -11,4 +11,4 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/plasma/kwallet-pam"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=7332dd9729c55f4b24260b3ec1266f72284f834eed66ce76badd4ac5af3dd429
+checksum=224af4870be35075f4aec8bf9984eff7ef65d1656a2c5ca2ba1fdb5efcc574bc
diff --git a/srcpkgs/kwallet/template b/srcpkgs/kwallet/template
index cf0d635b41d..c5c8bb2e79e 100644
--- a/srcpkgs/kwallet/template
+++ b/srcpkgs/kwallet/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet'
 pkgname=kwallet
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kwallet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=628ded35a8f44750a770bf10bba9a763994660923a689eee05f8dfb7e92baec8
+checksum=0f094d52f1a14f04006dcbec4c8bcd7972a6e6b6fb62c6c9c5dc40405faee3b6
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"
diff --git a/srcpkgs/kwalletmanager/template b/srcpkgs/kwalletmanager/template
index 4f5373e9d7d..8e49ab6d314 100644
--- a/srcpkgs/kwalletmanager/template
+++ b/srcpkgs/kwalletmanager/template
@@ -1,17 +1,14 @@
 # Template file for 'kwalletmanager'
 pkgname=kwalletmanager
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules pkg-config kauth"
+hostmakedepends="extra-cmake-modules kauth kdoctools pkg-config
+ qt5-host-tools qt5-qmake"
 makedepends="kcmutils-devel kparts-devel qt5-devel"
 short_desc="KDE Wallet Management Tools"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://www.kde.org/applications/system/kwalletmanager/"
 distfiles="${KDE_SITE}/applications/${version}/src/kwalletmanager-${version}.tar.xz"
-checksum=aaf6c646cc8e7387dc034636fb94029fc0fda3c7fc89b6b633dc42349fd0a471
-
-if [ -n "$CROSS_BUILD" ]; then
-	hostmakedepends+=" kconfig kdoctools python qt5-host-tools qt5-qmake"
-fi
+checksum=5c0cd648d6bf4515cd71b4575ab8051004dcf505c2bfe502fb42b7ba01cb51b2
diff --git a/srcpkgs/kwayland-integration/template b/srcpkgs/kwayland-integration/template
index b27441c0cd6..c41abc036ef 100644
--- a/srcpkgs/kwayland-integration/template
+++ b/srcpkgs/kwayland-integration/template
@@ -1,14 +1,14 @@
 # Template file for 'kwayland-integration'
 pkgname=kwayland-integration
-version=5.16.4
+version=5.17.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules qt5-devel qt5-qmake"
-makedepends="kidletime-devel kwayland-devel kwindowsystem-devel"
+makedepends="kidletime-devel kwayland-devel kwindowsystem-devel kguiaddons-devel"
 short_desc="Integration plugins for Kwayland"
 maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/plasma/kwayland-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=f15ae33af1d9ff999ec45d00752f202242f71fc022ae72b9522e5bf3a20edace
+checksum=6cf410dd8286e9d6b26e10d8ba297d36d13c93a329c463326b47f0bffeb3c4c2
diff --git a/srcpkgs/kwayland/template b/srcpkgs/kwayland/template
index 1014df3c3ff..06a59d9b1e8 100644
--- a/srcpkgs/kwayland/template
+++ b/srcpkgs/kwayland/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland'
 pkgname=kwayland
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kwayland"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=42d3bc629710e09074006af288986b00683853660648c9364fb09d49db3f0e07
+checksum=afcd39152c364a44c85c78e56bcaa5bb70c0a221ecfae3811b14e60a7884e80f
 
 kwayland-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kwidgetsaddons/template b/srcpkgs/kwidgetsaddons/template
index 106a71b09a2..6062876e94e 100644
--- a/srcpkgs/kwidgetsaddons/template
+++ b/srcpkgs/kwidgetsaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kwidgetsaddons'
 pkgname=kwidgetsaddons
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kwidgetsaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5abc169f431fba18418f23ff1749414d8318baff868a7b821916cc44508c6891
+checksum=cce332723324bf3991dc6e6ad8994ff96aae243631f7b4449505fb39f6d8efdb
 
 kwidgetsaddons-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template
index 23f32f2649b..a12e2083e98 100644
--- a/srcpkgs/kwin/template
+++ b/srcpkgs/kwin/template
@@ -1,6 +1,6 @@
 # Template file for 'kwin'
 pkgname=kwin
-version=5.16.4
+version=5.17.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -15,13 +15,17 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/plasma/kwin"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=71b96f1efef0b3f4974900373285a08d425a63628404fe9e89c27f61119383e6
+checksum=d99443978a0f5f12d93d1d877312144d9387762933e12ac614992ae6e92daed7
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-qmake qt5-host-tools kcoreaddons kconfig"
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
 fi
 
+case "$XBPS_TARGET_MACHINE" in
+	armv6l-musl) makedepends+=" libatomic-devel";;
+esac
+
 kwin-devel_package() {
 	short_desc+=" - development"
 	depends="${makedepends} ${sourcepkg}-${version}_${revision}"
diff --git a/srcpkgs/kwindowsystem/template b/srcpkgs/kwindowsystem/template
index 755ed4bde6a..77d7786a0b7 100644
--- a/srcpkgs/kwindowsystem/template
+++ b/srcpkgs/kwindowsystem/template
@@ -1,6 +1,6 @@
 # Template file for 'kwindowsystem'
 pkgname=kwindowsystem
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kwindowsystem"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=17958b612e751e838aa7a0d4f8c7a8a8d83d3f4ace5498fe1f2b8650a2d8f984
+checksum=e8e7eebe02d17c9cc17a2b4e44f8ed78c4fca782bf5991900e77ad3c2f5a7359
 
 kwindowsystem-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kwrited/template b/srcpkgs/kwrited/template
index 04b10dea089..43c544387de 100644
--- a/srcpkgs/kwrited/template
+++ b/srcpkgs/kwrited/template
@@ -1,6 +1,6 @@
 # Template file for 'kwrited'
 pkgname=kwrited
-version=5.16.4
+version=5.17.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/plasma/kwrited"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=c3011ee1c7a431b25797e12fa0b16e6d92277c8fe5dc1e656121a135ad156c0f
+checksum=514bbfbd3e4ab1ea764eb61b5f62606f6359d74d55908ee7296ad8491fc6e361
diff --git a/srcpkgs/kxmlgui/template b/srcpkgs/kxmlgui/template
index 1bb61b1fe80..3e37301c8aa 100644
--- a/srcpkgs/kxmlgui/template
+++ b/srcpkgs/kxmlgui/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlgui'
 pkgname=kxmlgui
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kxmlgui"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=867ff1c3ad464bb6268d00ca290569ef1da7659d3fd2f6349015bc3e2562836b
+checksum=f1a0b8e72da813251f22b675e5f1596d2675c41eb02a8aa8ea8423faae721574
 
 kxmlgui-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kxmlrpcclient/template b/srcpkgs/kxmlrpcclient/template
index 0b386cb6c18..7c5ca929c8a 100644
--- a/srcpkgs/kxmlrpcclient/template
+++ b/srcpkgs/kxmlrpcclient/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlrpcclient'
 pkgname=kxmlrpcclient
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later, BSD-2-Clause"
 homepage="https://projects.kde.org/projects/frameworks/kxmlrpcclient"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=382b4730e4b32c1d300f8fdb6269e40995ec282ebe1cbb044ab1a2b2b68c3a1a
+checksum=2c215687514d0c2f71f4fcf25d9a104e1ab6822eeb03fd8e9f17df28bb67024d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python"
diff --git a/srcpkgs/latte-dock/template b/srcpkgs/latte-dock/template
index e89e335a6d1..c33a4d86976 100644
--- a/srcpkgs/latte-dock/template
+++ b/srcpkgs/latte-dock/template
@@ -1,6 +1,6 @@
 # Template file for 'latte-dock'
 pkgname=latte-dock
-version=0.9.0
+version=0.9.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DENABLE_MAKE_UNIQUE=OFF"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://phabricator.kde.org/source/latte-dock/"
 changelog="https://phabricator.kde.org/source/latte-dock/browse/master/CHANGELOG.md"
 distfiles="${KDE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=d7233401d535474b1834a55a5103e744958abbe0a0aa1a48aa29ee3788ccb424
+checksum=30232ce9b0fe8f5338c924a4f2d1661c8c3f3b221ccfcaf69d09160f31599447
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kconfig-devel kcoreaddons-devel kpackage-devel"
diff --git a/srcpkgs/lazarus/template b/srcpkgs/lazarus/template
index fe0f677c762..42f49b6415e 100644
--- a/srcpkgs/lazarus/template
+++ b/srcpkgs/lazarus/template
@@ -8,7 +8,7 @@ hostmakedepends="fpc rsync"
 makedepends="fpc-src qt5pas-devel"
 depends="fpc-src fpc gdb perl"
 short_desc="Delphi-like IDE for FreePascal"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, MPL-2.0, LGPL-2.0-or-later"
 homepage="http://www.lazarus.freepascal.org"
 distfiles="${SOURCEFORGE_SITE}/project/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20${version}/lazarus-${version}.tar.gz"
diff --git a/srcpkgs/lazydocker/template b/srcpkgs/lazydocker/template
index 18a26c428d0..8891289c480 100644
--- a/srcpkgs/lazydocker/template
+++ b/srcpkgs/lazydocker/template
@@ -1,6 +1,6 @@
 # Template file for 'lazydocker'
 pkgname=lazydocker
-version=0.7
+version=0.7.4
 revision=1
 wrksrc="lazydocker-${version}"
 build_style=go
@@ -11,7 +11,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"
 homepage="https://github.com/jesseduffield/lazydocker"
 distfiles="https://github.com/jesseduffield/lazydocker/archive/v${version}.tar.gz"
-checksum=902ca698e1de8cb700266b4e19c5321d4fafa65b3e22d32df0e02ca89ca921f0
+checksum=537f0dfdd4a425b326c10233c1f9ab0189d4d706a68ba756ff9921efc6cccef5
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/lazygit/template b/srcpkgs/lazygit/template
index 30e865f0ac2..359de11e955 100644
--- a/srcpkgs/lazygit/template
+++ b/srcpkgs/lazygit/template
@@ -1,17 +1,17 @@
 # Template file for 'lazygit'
 pkgname=lazygit
-version=0.8.1
+version=0.8.2
 revision=1
 build_style=go
 go_import_path=github.com/jesseduffield/lazygit
 hostmakedepends="git"
 depends="git"
 short_desc="Simple terminal UI for git commands"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/jesseduffield/lazygit"
 distfiles="https://github.com/jesseduffield/lazygit/archive/v${version}.tar.gz"
-checksum=274ba05573b38cccc56cb63053eec0972535979b95f1f30b6ca318d991f2c14c
+checksum=aaaa4cb789d387a08eb46ca95159561cdb4a2f4e70315ce68ed61bbd30fe24ee
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/lbreakouthd/template b/srcpkgs/lbreakouthd/template
index 3eb55d309f6..4c92d60ad52 100644
--- a/srcpkgs/lbreakouthd/template
+++ b/srcpkgs/lbreakouthd/template
@@ -1,6 +1,6 @@
 # Template file for 'lbreakouthd'
 pkgname=lbreakouthd
-version=1.0.4
+version=1.0.5
 revision=1
 build_style=gnu-configure
 configure_args="--localstatedir=/var/${pkgname}"
@@ -10,4 +10,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://lgames.sourceforge.net/LBreakoutHD/"
 distfiles="${SOURCEFORGE_SITE}/lgames/$pkgname-$version.tar.gz"
-checksum=43d2c268b0494d72816e9f106fae17b311fa665a153377e2f0cc0e0362aa30af
+checksum=f3296ecdfe8e860ce30c7262d370b5725745847a131b582902cbfbcbb73c84a1
diff --git a/srcpkgs/lego/template b/srcpkgs/lego/template
index 298c4500093..cb146a55cf9 100644
--- a/srcpkgs/lego/template
+++ b/srcpkgs/lego/template
@@ -1,16 +1,17 @@
 # Template file for 'lego'
 pkgname=lego
-version=2.7.2
+version=3.0.2
 revision=1
 build_style=go
-go_import_path="github.com/go-acme/${pkgname}"
+go_import_path="github.com/go-acme/${pkgname}/v3"
 go_package="${go_import_path}/cmd/${pkgname}"
+hostmakedepends="git"
 short_desc="Let's Encrypt client and ACME library written in Go"
 maintainer="Anachron <gith@cron.world>"
 license="MIT"
 homepage="https://go-acme.github.io/lego"
 distfiles="https://github.com/go-acme/lego/archive/v${version}.tar.gz"
-checksum=eb585fe8cd23671bea4b09c8f03d7a331f5b734aa652210f8cec897a6d6b8dbc
+checksum=a5389cc39f4fb70fb0f550436ddacb6d524ab6056815d2d2df0ecbfefa053a25
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/lesspipe/template b/srcpkgs/lesspipe/template
index 1e3aa32bd9d..40ee9a36cf1 100644
--- a/srcpkgs/lesspipe/template
+++ b/srcpkgs/lesspipe/template
@@ -1,15 +1,15 @@
 # Template file for 'lesspipe'
 pkgname=lesspipe
-version=1.83
+version=1.84
 revision=1
 archs=noarch
 depends="less"
-short_desc="An input filter for the pager less"
+short_desc="Input filter for the pager less"
 maintainer="Olga Ustuzhanina <me@laserbat.pw>"
 license="GPL-2.0-only"
 homepage="http://www-zeuthen.desy.de/~friebel/unix/lesspipe.html"
-distfiles="https://www-zeuthen.desy.de/~friebel/unix/less/lesspipe-${version}.tar.gz"
-checksum=d616f0d51852e60fb0d0801eec9c31b10e0acc6fdfdc62ec46ef7bfd60ce675e
+distfiles="https://github.com/wofr06/lesspipe/archive/${version}.tar.gz"
+checksum=5eb4811cc8ded108e98448bd83057e730906f643ad689ccd695828f2a46c4410
 
 do_install() {
 	vbin code2color
diff --git a/srcpkgs/libArcus/template b/srcpkgs/libArcus/template
index c0c44d46916..8e6c97ada21 100644
--- a/srcpkgs/libArcus/template
+++ b/srcpkgs/libArcus/template
@@ -1,6 +1,6 @@
 # Template file for 'libArcus'
 pkgname=libArcus
-version=4.2.0
+version=4.3.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_EXAMPLES=OFF"
@@ -12,7 +12,7 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/Ultimaker/libArcus"
 distfiles="https://github.com/Ultimaker/libArcus/archive/${version}.tar.gz"
-checksum=f355ae80a7d219013bba14ec8f50a411345c00a6e974b4649db3c5322fa9b28a
+checksum=8f3211a76d352db5b508772abad41b7d223af22d174807f05f9be34ddaa7f268
 
 libArcus-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libGL/patches/add-glx-use-tls.patch b/srcpkgs/libGL/patches/add-glx-use-tls.patch
deleted file mode 100644
index 7ded1a1b2ee..00000000000
--- a/srcpkgs/libGL/patches/add-glx-use-tls.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From f895a39b7437381a86383dd97250aa2cc7393bff Mon Sep 17 00:00:00 2001
-From: maxice8 <thinkabit.ukim@gmail.com>
-Date: Thu, 9 Aug 2018 18:37:30 -0300
-Subject: [PATCH] meson: add glx-use-tls option.
-
----
- meson.build       | 6 +++++-
- meson_options.txt | 6 ++++++
- 2 files changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 5dbb786..1ab3092 100644
---- meson.build
-+++ meson.build
-@@ -340,7 +340,11 @@ if with_egl and not (with_platform_drm or with_platform_surfaceless)
-   endif
- endif
- 
--pre_args += '-DGLX_USE_TLS'
-+with_glx_use_tls = get_option('glx-use-tls')
-+if with_glx_use_tls
-+  pre_args += '-DGLX_USE_TLS'
-+endif
-+
- if with_glx != 'disabled'
-   if not (with_platform_x11 and with_any_opengl)
-     if with_glx == 'auto'
-diff --git a/meson_options.txt b/meson_options.txt
-index 496fe38..12981dd 100644
---- meson_options.txt
-+++ meson_options.txt
-@@ -195,6 +195,12 @@ option(
-   choices : ['auto', 'disabled', 'dri', 'xlib', 'gallium-xlib'],
-   description : 'Build support for GLX platform'
- )
-+option(
-+  'glx-use-tls',
-+  type : 'boolean',
-+  value : true,
-+  description : 'Build support for initial-exec TLS model on GLX platform'
-+)
- option(
-   'egl',
-   type : 'combo',
--- 
-2.18.0
-
diff --git a/srcpkgs/libGL/patches/add-use-elf-tls.patch b/srcpkgs/libGL/patches/add-use-elf-tls.patch
new file mode 100644
index 00000000000..b922d8601e7
--- /dev/null
+++ b/srcpkgs/libGL/patches/add-use-elf-tls.patch
@@ -0,0 +1,28 @@
+diff --git meson.build meson.build
+index 4afd8ca..ab9b365 100644
+--- meson.build
++++ meson.build
+@@ -378,7 +378,8 @@ if with_egl and not (with_platform_drm or with_platform_surfaceless or with_plat
+ endif
+ 
+ # Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS.
+-if not with_platform_android or get_option('platform-sdk-version') >= 29
++with_use_elf_tls = get_option('use-elf-tls')
++if with_use_elf_tls and not with_platform_android or get_option('platform-sdk-version') >= 29
+   pre_args += '-DUSE_ELF_TLS'
+ endif
+ 
+diff --git meson_options.txt meson_options.txt
+index b768c15..2533220 100644
+--- meson_options.txt
++++ meson_options.txt
+@@ -358,3 +358,9 @@ option(
+   value : 25,
+   description : 'Android Platform SDK version. Default: Nougat version.'
+ )
++option(
++  'use-elf-tls',
++  type : 'boolean',
++  value : true,
++  description : 'Build support for initial-exec TLS model'
++)
diff --git a/srcpkgs/libGL/patches/musl.patch b/srcpkgs/libGL/patches/musl.patch
index dc71d18c3d8..92a37bd577c 100644
--- a/srcpkgs/libGL/patches/musl.patch
+++ b/srcpkgs/libGL/patches/musl.patch
@@ -32,44 +32,6 @@
  #include <unistd.h>
  #include <fcntl.h>
  #else
---- src/gallium/state_trackers/nine/nine_debug.c
-+++ src/gallium/state_trackers/nine/nine_debug.c
-@@ -73,8 +73,8 @@
-     }
- 
- #if defined(HAVE_PTHREAD)
--#  if defined(__GNU_LIBRARY__) && defined(__GLIBC__) && defined(__GLIBC_MINOR__) && \
--      (__GLIBC__ >= 3 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 12))
-+#  if defined(__linux__) && !(defined(__GLIBC__) || \
-+      (__GLIBC__ < 3 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 12)))
-     if (dbg_flags & DBG_TID)
-         tid = pthread_self();
- #  endif
---- src/util/u_thread.h
-+++ src/util/u_thread.h
-@@ -61,9 +61,8 @@
- static inline void u_thread_setname( const char *name )
- {
- #if defined(HAVE_PTHREAD)
--#  if defined(__GNU_LIBRARY__) && defined(__GLIBC__) && defined(__GLIBC_MINOR__) && \
--      (__GLIBC__ >= 3 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 12)) && \
--      defined(__linux__)
-+#  if defined(__linux__) && !(defined(__GLIBC__) || \
-+      (__GLIBC__ < 3 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 12)))
-    pthread_setname_np(pthread_self(), name);
- #  endif
- #endif
-@@ -93,8 +92,8 @@
- static inline bool u_thread_is_self(thrd_t thread)
- {
- #if defined(HAVE_PTHREAD)
--#  if defined(__GNU_LIBRARY__) && defined(__GLIBC__) && defined(__GLIBC_MINOR__) && \
--      (__GLIBC__ >= 3 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 12))
-+#  if defined(__linux__) && !(defined(__GLIBC__) || \
-+      (__GLIBC__ < 3 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 12)))
-    return pthread_equal(pthread_self(), thread);
- #  endif
- #endif
 --- src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
 +++ src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
 @@ -28,6 +28,8 @@
@@ -80,4 +42,4 @@
 +
  #include "radv_radeon_winsys.h"
  #include "ac_gpu_info.h"
- #include "addrlib/addrinterface.h"<Paste>
+ #include "addrlib/addrinterface.h"
diff --git a/srcpkgs/libGL/patches/ppc-auxval.patch b/srcpkgs/libGL/patches/ppc-auxval.patch
new file mode 100644
index 00000000000..3fe2725eb45
--- /dev/null
+++ b/srcpkgs/libGL/patches/ppc-auxval.patch
@@ -0,0 +1,55 @@
+Upstream: https://gitlab.freedesktop.org/mesa/mesa/merge_requests/1785
+Status: Merged
+
+--- src/util/u_cpu_detect.c
++++ src/util/u_cpu_detect.c
+@@ -92,7 +92,7 @@ static int has_cpuid(void);
+ #endif
+ 
+ 
+-#if defined(PIPE_ARCH_PPC) && !defined(PIPE_OS_APPLE)
++#if defined(PIPE_ARCH_PPC) && !defined(PIPE_OS_APPLE) && !defined(PIPE_OS_LINUX)
+ static jmp_buf  __lv_powerpc_jmpbuf;
+ static volatile sig_atomic_t __lv_powerpc_canjump = 0;
+ 
+@@ -126,8 +126,29 @@ check_os_altivec_support(void)
+          util_cpu_caps.has_altivec = 1;
+       }
+    }
+-#else /* !PIPE_OS_APPLE */
+-   /* not on Apple/Darwin, do it the brute-force way */
++#elif defined(PIPE_OS_LINUX) /* !PIPE_OS_APPLE */
++#if defined(PIPE_ARCH_PPC_64)
++    Elf64_auxv_t aux;
++#else
++    Elf32_auxv_t aux;
++#endif
++    int fd = open("/proc/self/auxv", O_RDONLY | O_CLOEXEC);
++    if (fd >= 0) {
++       while (read(fd, &aux, sizeof(aux)) == sizeof(aux)) {
++          if (aux.a_type == AT_HWCAP) {
++             char *env_vsx = getenv("GALLIVM_VSX");
++             uint64_t hwcap = aux.a_un.a_val;
++             util_cpu_caps.has_altivec = (hwcap >> 28) & 1;
++             if (!env_vsx || env_vsx[0] != '0') {
++                util_cpu_caps.has_vsx  = (hwcap >>  7) & 1;
++             }
++             break;
++          }
++       }
++       close(fd);
++    }
++#else /* !PIPE_OS_APPLE && !PIPE_OS_LINUX */
++   /* not on Apple/Darwin or Linux, do it the brute-force way */
+    /* this is borrowed from the libmpeg2 library */
+    signal(SIGILL, sigill_handler);
+    if (setjmp(__lv_powerpc_jmpbuf)) {
+@@ -171,7 +192,7 @@ check_os_altivec_support(void)
+          util_cpu_caps.has_altivec = 0;
+       }
+    }
+-#endif /* !PIPE_OS_APPLE */
++#endif /* !PIPE_OS_APPLE && !PIPE_OS_LINUX */
+ }
+ #endif /* PIPE_ARCH_PPC */
+ 
diff --git a/srcpkgs/libGL/template b/srcpkgs/libGL/template
index 23b4f47aaef..3ce62fe073f 100644
--- a/srcpkgs/libGL/template
+++ b/srcpkgs/libGL/template
@@ -1,27 +1,31 @@
 # Template file for 'libGL'
 pkgname=libGL
-version=19.1.4
+version=19.2.1
 revision=1
 wrksrc="mesa-${version}"
 build_style=meson
 configure_args="-Dshared-glapi=true -Dgbm=true -Degl=true
  -Dgallium-vdpau=true -Dgallium-xvmc=true -Dosmesa=gallium
  -Dgles1=true -Dgles2=true -Dgallium-va=true -Dlmsensors=true
- -Dplatforms=x11,drm,wayland,surfaceless -Dllvm=true
+ -Dplatforms=x11,drm,$(vopt_if wayland wayland,)surfaceless -Dllvm=true
  -Db_lto=false"
 hostmakedepends="flex libxml2-python llvm pkg-config
- python3-Mako wayland-protocols wayland-devel"
+ python3-Mako $(vopt_if wayland 'wayland-protocols wayland-devel')"
 makedepends="elfutils-devel expat-devel libXdamage-devel libXvMC-devel
  libXxf86vm-devel libatomic-devel libdrm-devel libffi-devel libva-devel
  libvdpau-devel libxshmfence-devel ncurses-devel talloc-devel zlib-devel
- wayland-devel wayland-protocols llvm libsensors-devel libXrandr-devel"
+ $(vopt_if wayland 'wayland-devel wayland-protocols') llvm
+ libsensors-devel libXrandr-devel"
 short_desc="Graphics library similar to SGI's OpenGL"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT, LGPL-2.1-or-later"
 homepage="https://www.mesa3d.org/"
 changelog="https://www.mesa3d.org/relnotes/${version}.html"
 distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=a6d268a7d9edcfd92b6da80f2e34e6e0a7baaa442efbeba2fc66c404943c6bfb
+checksum=4cc53ca1a8d12c6ff0e5ea44a5213c05c88447ab50d7e28bb350cd29199f01e9
+
+build_options="wayland"
+build_options_default="wayland"
 
 # Set subpackages manually to set proper rdeps in 32bit pkgs.
 subpackages="libglapi libgbm libEGL libGLES libOSMesa"
@@ -44,14 +48,21 @@ ppc*)
 	configure_args+=" -Dgallium-drivers=r300,r600,radeonsi,swrast,nouveau,virgl"
 	configure_args+=" -Ddri-drivers=r100,r200,nouveau"
 	configure_args+=" -Dvulkan-drivers=amd"
-	configure_args+=" -Ddri3=true"
+	configure_args+=" -Dgallium-xa=false -Ddri3=true -Dgallium-opencl=icd"
+	# Explicitly control power8 feature usage, disable on BE
+	case "$XBPS_TARGET_MACHINE" in
+		ppc64le*) configure_args+=" -Dpower8=true";;
+		*) configure_args+=" -Dpower8=false";;
+	esac
 	hostmakedepends+=" clang"
+	makedepends+=" libclc-git"
 	subpackages+=" mesa-ati-dri mesa-nouveau-dri"
+	subpackages+=" mesa-opencl"
 	;;
 aarch64*)
 	configure_args+=" -Dgallium-drivers=nouveau,tegra,swrast,vc4"
 	configure_args+=" -Dvulkan-drivers= -Ddri-drivers="
-	configure_args+=" -Ddri3=true"
+	configure_args+=" -Dgallium-xa=false -Ddri3=true"
 	subpackages+=" mesa-tegra-dri mesa-nouveau-dri mesa-vc4-dri"
 	;;
 armv7l*)
@@ -88,7 +99,7 @@ esac
 
 case "$XBPS_TARGET_MACHINE" in
 	# Disable TLS with musl: https://bugs.freedesktop.org/show_bug.cgi?id=35268
-	*-musl) configure_args+=" -Dglx-use-tls=false";;
+	*-musl) configure_args+=" -Duse-elf-tls=false";;
 	*) configure_args+=" -Dglx=dri";;
 esac
 
@@ -176,13 +187,8 @@ mesa-ati-dri_package() {
 		vmove usr/lib/dri/r*
 		vmove "usr/share/vulkan/icd.d/radeon_icd*.json"
 		vmove "usr/lib/libvulkan_radeon.so"
-		case "$XBPS_TARGET_MACHINE" in
-			ppc*) ;;
-			*)
-				vmove "usr/lib/gallium-pipe/pipe_r[36]00.so"
-				vmove usr/lib/gallium-pipe/pipe_radeonsi.so
-			;;
-		esac
+		vmove "usr/lib/gallium-pipe/pipe_r[36]00.so"
+		vmove usr/lib/gallium-pipe/pipe_radeonsi.so
 	}
 }
 
@@ -204,7 +210,7 @@ mesa-nouveau-dri_package() {
 		vmove "usr/lib/xorg/modules/drivers/nouveau*"
 		vmove "usr/lib/dri/nouveau*"
 		case "$XBPS_TARGET_MACHINE" in
-			aarch64*|ppc*) ;;
+			aarch64*) ;;
 			*) vmove usr/lib/gallium-pipe/pipe_nouveau.so ;;
 		esac
 	}
diff --git a/srcpkgs/libICE/template b/srcpkgs/libICE/template
index 30e281586a1..a22ef076799 100644
--- a/srcpkgs/libICE/template
+++ b/srcpkgs/libICE/template
@@ -1,13 +1,12 @@
 # Template file for 'libICE'
 pkgname=libICE
 version=1.0.10
-revision=1
-patch_args="-Np1"
+revision=2
 build_style=gnu-configure
-hostmakedepends="pkg-config automake libtool xorg-util-macros"
+hostmakedepends="automake libtool pkg-config xorg-util-macros xtrans"
 makedepends="xtrans xorgproto"
 short_desc="Inter Client Exchange (ICE) library for X"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org/"
 distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
diff --git a/srcpkgs/libSM/template b/srcpkgs/libSM/template
index a34c3cb2d35..8ed244b8a46 100644
--- a/srcpkgs/libSM/template
+++ b/srcpkgs/libSM/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libuuid-devel libICE-devel"
 short_desc="X Session Management Library"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org/"
 distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
diff --git a/srcpkgs/libSavitar/template b/srcpkgs/libSavitar/template
index e93c00ce82d..a9d3020158f 100644
--- a/srcpkgs/libSavitar/template
+++ b/srcpkgs/libSavitar/template
@@ -1,16 +1,16 @@
 # Template file for 'libSavitar'
 pkgname=libSavitar
-version=4.2.0
+version=4.3.0
 revision=1
 build_style=cmake
 hostmakedepends="python3"
 makedepends="python3-sip-devel python3-devel pugixml-devel"
 short_desc="C++ implementation of 3mf loading"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/Ultimaker/libSavitar"
 distfiles="https://github.com/Ultimaker/libSavitar/archive/${version}.tar.gz"
-checksum=6a77df183fef2ddaeb8de26f69315e1868ee722844f4c1fbb9cd5a054805d1a1
+checksum=b7f34e10c705082a6d7bcf8599efece8491f9c8e45eb603f761a0e56b64d5236
 nocross="can't find sip on cross environment"
 
 libSavitar-devel_package() {
diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template
index 37109ba0260..9a5799e66f6 100644
--- a/srcpkgs/libX11/template
+++ b/srcpkgs/libX11/template
@@ -1,6 +1,6 @@
 # Template file for 'libX11'
 pkgname=libX11
-version=1.6.8
+version=1.6.9
 revision=1
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-xlocaledir --without-xmlto
@@ -12,7 +12,7 @@ maintainer="maxice8 <thinkbit.ukim@gmail.com>"
 license="MIT"
 homepage="http://xorg.freedesktop.org/"
 distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
-checksum=b289a845c189e251e0e884cc0f9269bbe97c238df3741e854ec4c17c21e473d5
+checksum=9cc7e8d000d6193fa5af580d50d689380b8287052270f5bb26a5fb6b58b2bed1
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" libtool automake xorgproto xtrans"
diff --git a/srcpkgs/libXau/template b/srcpkgs/libXau/template
index 71664e0728f..cb5d513754e 100644
--- a/srcpkgs/libXau/template
+++ b/srcpkgs/libXau/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="xorgproto"
 short_desc="Authorization Protocol for X"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="$XORG_SITE"
 distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
diff --git a/srcpkgs/libXcomposite/template b/srcpkgs/libXcomposite/template
index dfac74be5d1..d015a9ed734 100644
--- a/srcpkgs/libXcomposite/template
+++ b/srcpkgs/libXcomposite/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="xorgproto libXfixes-devel"
 short_desc="X Composite Library"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="X11"
 homepage="https://wiki.freedesktop.org/xorg/"
 distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
diff --git a/srcpkgs/libXcursor/template b/srcpkgs/libXcursor/template
index ae59ca8e708..9d785a99bd0 100644
--- a/srcpkgs/libXcursor/template
+++ b/srcpkgs/libXcursor/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="xorgproto libXfixes-devel libXrender-devel"
 short_desc="Client-side cursor loading library for X"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://wiki.freedesktop.org/xorg/"
 distfiles="${XORG_SITE}/lib/libXcursor-${version}.tar.bz2"
diff --git a/srcpkgs/libXdamage/template b/srcpkgs/libXdamage/template
index ea68281cf5c..7626b8cfba6 100644
--- a/srcpkgs/libXdamage/template
+++ b/srcpkgs/libXdamage/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="xorgproto libXfixes-devel"
 short_desc="Xdamage extension Library"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="X11"
 homepage="https://wiki.freedesktop.org/xorg/"
 distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
diff --git a/srcpkgs/libXext/template b/srcpkgs/libXext/template
index 22fa3d5216b..50ebe66644b 100644
--- a/srcpkgs/libXext/template
+++ b/srcpkgs/libXext/template
@@ -7,7 +7,7 @@ configure_args="--enable-malloc0returnsnull"
 hostmakedepends="pkg-config"
 makedepends="xorgproto libX11-devel"
 short_desc="X Extension library"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="$XORG_SITE"
 distfiles="${XORG_SITE}/lib/libXext-${version}.tar.bz2"
diff --git a/srcpkgs/libXfont2/template b/srcpkgs/libXfont2/template
index 0d32a2f9731..8164b2b239b 100644
--- a/srcpkgs/libXfont2/template
+++ b/srcpkgs/libXfont2/template
@@ -1,7 +1,7 @@
 # Template file for 'libXfont2'
 pkgname=libXfont2
-version=2.0.3
-revision=2
+version=2.0.4
+revision=1
 hostmakedepends="pkg-config"
 makedepends="xorgproto xtrans freetype-devel libfontenc-devel"
 build_style=gnu-configure
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 homepage="http://xorg.freedesktop.org/"
 license="MIT"
 distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
-checksum=0e8ab7fd737ccdfe87e1f02b55f221f0bd4503a1c5f28be4ed6a54586bac9c4e
+checksum=6d151b3368e5035efede4b6264c0fdc6662c1c99dbc2de425e3480cababc69e6
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/libXft/template b/srcpkgs/libXft/template
index cfeaf7e68ed..dd6263d3a42 100644
--- a/srcpkgs/libXft/template
+++ b/srcpkgs/libXft/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="xorgproto libXrender-devel freetype-devel fontconfig-devel"
 short_desc="Library for configuring and customizing font access"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="$XORG_SITE"
 distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
diff --git a/srcpkgs/libXmu/template b/srcpkgs/libXmu/template
index da7db8a4770..ab0687cc764 100644
--- a/srcpkgs/libXmu/template
+++ b/srcpkgs/libXmu/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libXext-devel libXt-devel"
 short_desc="X Miscellaneous Utilities library"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://wiki.freedesktop.org/xorg/"
 distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
diff --git a/srcpkgs/libXpresent/template b/srcpkgs/libXpresent/template
index bcd86a9fa97..201b01a1843 100644
--- a/srcpkgs/libXpresent/template
+++ b/srcpkgs/libXpresent/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="pkg-config xorg-util-macros"
 makedepends="libXfixes-devel libXrandr-devel"
 short_desc="XPresent extension C library"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="X11"
 homepage="https://cgit.freedesktop.org/xorg/lib/libXpresent/"
 distfiles="${XORG_SITE}/lib/libXpresent-${version}.tar.gz"
diff --git a/srcpkgs/libXrandr/template b/srcpkgs/libXrandr/template
index 923923990ae..c5a7b2c2f2c 100644
--- a/srcpkgs/libXrandr/template
+++ b/srcpkgs/libXrandr/template
@@ -7,7 +7,7 @@ configure_args="--enable-malloc0returnsnull"
 hostmakedepends="pkg-config"
 makedepends="xorgproto libXext-devel libXrender-devel"
 short_desc="X RandR Library from X.org"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="$XORG_SITE"
 distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
diff --git a/srcpkgs/libXvMC/template b/srcpkgs/libXvMC/template
index 04b8abb1e83..5d635e6e3d0 100644
--- a/srcpkgs/libXvMC/template
+++ b/srcpkgs/libXvMC/template
@@ -7,7 +7,7 @@ configure_args="--enable-malloc0returnsnull"
 hostmakedepends="pkg-config"
 makedepends="xorgproto libX11-devel libXext-devel libXv-devel"
 short_desc="XVideo Motion Compensation Library"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://wiki.freedesktop.org/xorg/"
 distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
diff --git a/srcpkgs/libXxf86dga/template b/srcpkgs/libXxf86dga/template
index 59ba465d119..fe22492d3a2 100644
--- a/srcpkgs/libXxf86dga/template
+++ b/srcpkgs/libXxf86dga/template
@@ -7,7 +7,7 @@ configure_args="--enable-malloc0returnsnull"
 hostmakedepends="pkg-config"
 makedepends="xorgproto libXext-devel"
 short_desc="Library for the XFree86-DGA X extension"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="$XORG_SITE"
 distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
diff --git a/srcpkgs/libaacs/template b/srcpkgs/libaacs/template
index 2e2ef4b538f..15e2650c2d6 100644
--- a/srcpkgs/libaacs/template
+++ b/srcpkgs/libaacs/template
@@ -7,7 +7,7 @@ configure_args="--disable-static"
 hostmakedepends="flex pkg-config"
 makedepends="libgcrypt-devel"
 short_desc="Open implementation of AACS specification"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.videolan.org/developers/libaacs.html"
 distfiles="http://ftp.videolan.org/pub/videolan/libaacs/${version}/libaacs-${version}.tar.bz2"
diff --git a/srcpkgs/libabw/template b/srcpkgs/libabw/template
index c2b71bbca97..e617508a0b3 100644
--- a/srcpkgs/libabw/template
+++ b/srcpkgs/libabw/template
@@ -1,7 +1,7 @@
 # Template file for 'libabw'
 pkgname=libabw
-version=0.1.2
-revision=2
+version=0.1.3
+revision=1
 build_style=gnu-configure
 short_desc="Library that parses the file format of AbiWord documents"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -10,7 +10,7 @@ homepage="https://wiki.documentfoundation.org/DLP/Libraries/libabw"
 distfiles="http://dev-www.libreoffice.org/src/${pkgname}/${pkgname}-${version}.tar.xz"
 makedepends="librevenge-devel boost-devel libxml2-devel"
 hostmakedepends="automake libtool pkg-config perl gperf"
-checksum=0b72944d5af81dda0a5c5803ee84cbac4b81441a4d767aa57029adc6744c2485
+checksum=e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed
 
 CXXFLAGS="-Wno-deprecated-copy"
 
diff --git a/srcpkgs/libaom/template b/srcpkgs/libaom/template
index a5cc3f2f24c..7cb2fcf07db 100644
--- a/srcpkgs/libaom/template
+++ b/srcpkgs/libaom/template
@@ -7,7 +7,7 @@ build_style=cmake
 configure_args="-DENABLE_DOCS=OFF -DBUILD_SHARED_LIBS=ON -DENABLE_TESTS=OFF"
 hostmakedepends="yasm doxygen perl python"
 short_desc="AV1 Codec library implementation"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://aomedia.org/"
 changelog="https://aomedia.googlesource.com/aom/+/master/CHANGELOG"
diff --git a/srcpkgs/libappindicator/template b/srcpkgs/libappindicator/template
index e5ee82c85ef..aea3a8752fd 100644
--- a/srcpkgs/libappindicator/template
+++ b/srcpkgs/libappindicator/template
@@ -1,7 +1,7 @@
 # Template file for 'libappindicator'
 pkgname=libappindicator
 version=12.10.0
-revision=2
+revision=3
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--with-gtk=3"
@@ -29,7 +29,7 @@ pre_configure() {
 
 libappindicator-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision} gtk+3-devel libdbusmenu-glib-devel"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
diff --git a/srcpkgs/libassuan/template b/srcpkgs/libassuan/template
index b0cbc600bf8..5a0daa6c247 100644
--- a/srcpkgs/libassuan/template
+++ b/srcpkgs/libassuan/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="--with-libgpg-error-prefix=${XBPS_CROSS_BASE}/usr"
 makedepends="libgpg-error-devel"
 short_desc="IPC library used by some GnuPG related software"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnupg.org/related_software/libassuan"
 distfiles="https://www.gnupg.org/ftp/gcrypt/libassuan/libassuan-${version}.tar.bz2"
diff --git a/srcpkgs/libbaseencode/template b/srcpkgs/libbaseencode/template
index c12e9485f1b..384a189224d 100644
--- a/srcpkgs/libbaseencode/template
+++ b/srcpkgs/libbaseencode/template
@@ -4,7 +4,7 @@ version=1.0.9
 revision=1
 build_style=cmake
 short_desc="Library for encoding decoding data use base32 or base64"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/paolostivanin/libbaseencode"
 distfiles="https://github.com/paolostivanin/libbaseencode/archive/v${version}.tar.gz"
diff --git a/srcpkgs/libblockdev/template b/srcpkgs/libblockdev/template
index 431d40f6505..1df156e3c5b 100644
--- a/srcpkgs/libblockdev/template
+++ b/srcpkgs/libblockdev/template
@@ -8,7 +8,7 @@ makedepends="cryptsetup-devel device-mapper-devel dmraid-devel libbytesize-devel
  libglib-devel libkmod-devel libparted-devel nss-devel
  volume_key-devel libyaml-devel"
 short_desc="Library for manipulating block devices"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/storaged-project/libblockdev"
 changelog="https://raw.githubusercontent.com/storaged-project/libblockdev/master/NEWS.rst"
diff --git a/srcpkgs/libbsd/template b/srcpkgs/libbsd/template
index 59a6ed9781e..1600ec38023 100644
--- a/srcpkgs/libbsd/template
+++ b/srcpkgs/libbsd/template
@@ -1,19 +1,20 @@
 # Template file for 'libbsd'
 pkgname=libbsd
-version=0.9.1
+version=0.10.0
 revision=1
 build_style=gnu-configure
 makedepends="libressl-devel"
 short_desc="Provides useful functions commonly found on BSD system"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="ISC, MIT, Beerware, BSD-2-Clause, BSD-3-Clause, BSD-4-Clause"
 homepage="https://libbsd.freedesktop.org/"
 distfiles="https://libbsd.freedesktop.org/releases/libbsd-${version}.tar.xz"
-checksum=56d835742327d69faccd16955a60b6dcf30684a8da518c4eca0ac713b9e0a7a4
+checksum=34b8adc726883d0e85b3118fa13605e179a62b31ba51f676136ecb2d0bc1a887
 
 post_install() {
 	vlicense COPYING
 }
+
 libbsd-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
@@ -22,6 +23,6 @@ libbsd-devel_package() {
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
-		vmove usr/share
+		vmove usr/share/man
 	}
 }
diff --git a/srcpkgs/libbytesize/template b/srcpkgs/libbytesize/template
index 497444b5fa7..ee1862d889d 100644
--- a/srcpkgs/libbytesize/template
+++ b/srcpkgs/libbytesize/template
@@ -7,7 +7,7 @@ hostmakedepends="python3"
 makedepends="mpfr-devel pcre-devel"
 checkdepends="python3-six python-six"
 short_desc="A library for operations with sizes in bytes"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/storaged-project/libbytesize"
 changelog="https://raw.githubusercontent.com/storaged-project/libbytesize/master/NEWS.rst"
diff --git a/srcpkgs/libcacard/template b/srcpkgs/libcacard/template
index ff0a0692bbb..4b6ccc3e9e6 100644
--- a/srcpkgs/libcacard/template
+++ b/srcpkgs/libcacard/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="nss-devel libglib-devel pcsclite-devel"
 short_desc="Library to provide emulation of smart cards to a virtual card reader"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://cgit.freedesktop.org/spice/libcacard/"
 distfiles="https://www.spice-space.org/download/libcacard/libcacard-${version}.tar.xz"
diff --git a/srcpkgs/libcap-ng/template b/srcpkgs/libcap-ng/template
index fc82ca857e7..f462636c4c1 100644
--- a/srcpkgs/libcap-ng/template
+++ b/srcpkgs/libcap-ng/template
@@ -1,15 +1,15 @@
 # Template file for 'libcap-ng'
 pkgname=libcap-ng
-version=0.7.9
+version=0.7.10
 revision=1
 build_style=gnu-configure
 configure_args="--without-python --without-python3"
-short_desc="An alternate POSIX capabilities library"
+short_desc="Alternate POSIX capabilities library"
 maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://people.redhat.com/sgrubb/libcap-ng/"
-license="GPL-2, LGPL-2.1"
 distfiles="http://people.redhat.com/sgrubb/$pkgname/$pkgname-$version.tar.gz"
-checksum=4a1532bcf3731aade40936f6d6a586ed5a66ca4c7455e1338d1f6c3e09221328
+checksum=a84ca7b4e0444283ed269b7a29f5b6187f647c82e2b876636b49b9a744f0ffbf
 
 subpackages="libcap-ng-devel libcap-ng-progs"
 
diff --git a/srcpkgs/libclc-git/template b/srcpkgs/libclc-git/template
index 20ee5f6b589..40c42db08ed 100644
--- a/srcpkgs/libclc-git/template
+++ b/srcpkgs/libclc-git/template
@@ -1,7 +1,7 @@
 # Template file for 'libclc-git'
 pkgname=libclc-git
 version=20181127
-revision=1
+revision=2
 _git_hash=1ecb16dd7d8b8e9151027faab996f27b2ac508e3
 wrksrc="libclc-${_git_hash}"
 build_style=configure
diff --git a/srcpkgs/libcloudproviders/template b/srcpkgs/libcloudproviders/template
index 2718d70e276..624c29bdea2 100644
--- a/srcpkgs/libcloudproviders/template
+++ b/srcpkgs/libcloudproviders/template
@@ -9,7 +9,7 @@ configure_args="-Dintrospection=$(vopt_if gir true false)
 hostmakedepends="pkg-config glib-devel $(vopt_if vala 'vala-devel')"
 makedepends="libglib-devel"
 short_desc="DBus API for cloud storage sync clients to expose their services"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/Incubator/libcloudproviders"
 distfiles="${homepage}/-/archive/${version}/libcloudproviders-${version}.tar.gz"
diff --git a/srcpkgs/libcmis/patches/no-include-cxx-headers-from-extern-c.patch b/srcpkgs/libcmis/patches/no-include-cxx-headers-from-extern-c.patch
new file mode 100644
index 00000000000..c82cf900561
--- /dev/null
+++ b/srcpkgs/libcmis/patches/no-include-cxx-headers-from-extern-c.patch
@@ -0,0 +1,19 @@
+FTBFS: /usr/include/c++/9.2/memory:146:1: error: template with C linkage
+
+--- inc/libcmis-c/repository.h
++++ inc/libcmis-c/repository.h
+@@ -28,12 +28,12 @@
+ #ifndef _REPOSITORY_H_
+ #define _REPOSITORY_H_
+ 
++#include <libxml/tree.h>
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+ 
+-#include <libxml/tree.h>
+-
+ #include "libcmis-c/libcmis-c-api.h"
+ #include "libcmis-c/types.h"
+ 
diff --git a/srcpkgs/libcmis/template b/srcpkgs/libcmis/template
index 9913168a635..eaf3215cff9 100644
--- a/srcpkgs/libcmis/template
+++ b/srcpkgs/libcmis/template
@@ -1,7 +1,7 @@
 # Template file for 'libcmis'
 pkgname=libcmis
 version=0.5.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="DOCBOOK2MAN=docbook2man --disable-werror"
 hostmakedepends="pkg-config docbook2x"
diff --git a/srcpkgs/libcotp/template b/srcpkgs/libcotp/template
index e779793cb4a..9e147ff7deb 100644
--- a/srcpkgs/libcotp/template
+++ b/srcpkgs/libcotp/template
@@ -6,7 +6,7 @@ build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="libbaseencode-devel libgcrypt-devel"
 short_desc="Library for generating TOTP and HOTP"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/paolostivanin/libcotp"
 distfiles="https://github.com/paolostivanin/libcotp/archive/v${version}.tar.gz"
diff --git a/srcpkgs/libcxx/patches/ppc.patch b/srcpkgs/libcxx/patches/ppc.patch
new file mode 100644
index 00000000000..adcb0c57b0d
--- /dev/null
+++ b/srcpkgs/libcxx/patches/ppc.patch
@@ -0,0 +1,22 @@
+This ensures `is_iec559` is defined correctly under all long double ABIs,
+including musl and its 64-bit long double. Also, `__ppc__` or `__ppc64__`
+is not defined on gcc.
+
+--- include/limits
++++ include/limits
+@@ -426,8 +426,14 @@ protected:
+     _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type signaling_NaN() _NOEXCEPT {return __builtin_nansl("");}
+     _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type denorm_min() _NOEXCEPT {return __LDBL_DENORM_MIN__;}
+ 
+-#if (defined(__ppc__) || defined(__ppc64__))
++#if defined(__powerpc__) || defined(__powerpc64__)
++#if (__LDBL_MAX_EXP__ > __DBL_MAX_EXP__) || (__LDBL_MANT_DIG__ == __DBL_MANT_DIG__)
++    /* IEEE 754 quadruple or double precision */
++    static _LIBCPP_CONSTEXPR const bool is_iec559 = true;
++#else
++    /* 128-bit IBM double-double */
+     static _LIBCPP_CONSTEXPR const bool is_iec559 = false;
++#endif
+ #else
+     static _LIBCPP_CONSTEXPR const bool is_iec559 = true;
+ #endif
diff --git a/srcpkgs/libcxx/template b/srcpkgs/libcxx/template
index 81de61b9f30..58af53e149e 100644
--- a/srcpkgs/libcxx/template
+++ b/srcpkgs/libcxx/template
@@ -1,41 +1,26 @@
 # Template file for 'libcxx'
 pkgname=libcxx
-version=7.0.1
+version=9.0.0
 revision=1
 wrksrc="${pkgname}-${version}.src"
 build_style=cmake
 configure_args+=" -DLIBCXX_CXX_ABI=libcxxabi -DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=ON
  -DLIBCXX_CXX_ABI_LIBRARY_PATH=${XBPS_CROSS_BASE}/usr/lib
  -DLIBCXXABI_USE_LLVM_UNWINDER=1"
-hostmakedepends="llvm7 python"
+hostmakedepends="llvm9 python3"
 makedepends="libcxxabi-devel llvm llvm-libunwind-devel"
 make_build_args="VERBOSE=1"
-short_desc="New implementation of the C++ standard library, targeting C++11"
+short_desc="New implementation of the C++ standard library, targeting C++11, C++14 and above"
 maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="https://libcxx.llvm.org"
 license="NCSA, MIT"
+homepage="https://libcxx.llvm.org"
 distfiles="https://www.llvm.org/releases/${version}/${pkgname}-${version}.src.tar.xz"
-checksum=020002618b319dc2a8ba1f2cba88b8cc6a209005ed8ad29f9de0c562c6ebb9f1
+checksum=3c4162972b5d3204ba47ac384aa456855a17b5e97422723d4758251acf1ed28c
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) configure_args+=" -DLIBCXX_HAS_MUSL_LIBC=YES"
 esac
 
-# Doesn't build on AArch64 with GCC
-case "$XBPS_TARGET_MACHINE" in
-	aarch64*)
-		hostmakedepends+=" clang"
-		pre_configure() {
-			export CC="clang"
-			export CXX="clang++"
-
-			CFLAGS+=" --target=$XBPS_CROSS_TRIPLET --sysroot=${XBPS_CROSS_BASE}"
-			CXXFLAGS+=" --target=${XBPS_CROSS_TRIPLET} --sysroot=${XBPS_CROSS_BASE}"
-		}
-	;;
-esac
-
-
 post_extract() {
 	case "$XBPS_TARGET_MACHINE" in
 	*-musl) patch -Np1 <${FILESDIR}/libcxx-0001-musl-hacks.patch
diff --git a/srcpkgs/libcxxabi/template b/srcpkgs/libcxxabi/template
index 258ce27f382..03b9424deee 100644
--- a/srcpkgs/libcxxabi/template
+++ b/srcpkgs/libcxxabi/template
@@ -1,6 +1,6 @@
 # Template file for 'libcxxabi'
 pkgname=libcxxabi
-version=7.0.1
+version=9.0.0
 revision=1
 wrksrc="${pkgname}-${version}.src"
 build_style=cmake
@@ -8,33 +8,21 @@ configure_args="-DLIBCXXABI_LIBCXX_INCLUDES=../libcxx/include
  -DLIBCXXABI_USE_LLVM_UNWINDER=1
  -DLLVM_DEFAULT_TARGET_TRIPLE=${XBPS_CROSS_TRIPLET:-$XBPS_TRIPLET}"
 make_build_args="VERBOSE=1"
-hostmakedepends="llvm7"
-makedepends="llvm7 llvm-libunwind-devel"
+hostmakedepends="llvm9"
+makedepends="llvm9 llvm-libunwind-devel"
 short_desc="Low-level support for libc++ standard library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="NCSA, MIT"
 homepage="https://libcxxabi.llvm.org"
 distfiles="https://www.llvm.org/releases/${version}/${pkgname}-${version}.src.tar.xz
  https://www.llvm.org/releases/${version}/libcxx-${version}.src.tar.xz"
-checksum="8168903a157ca7ab8423d3b974eaa497230b1564ceb57260be2bd14412e8ded8
- 020002618b319dc2a8ba1f2cba88b8cc6a209005ed8ad29f9de0c562c6ebb9f1"
+checksum="675041783565c906ac2f7f8b2bc5c40f14d871ecfa8ade34855aa18de95530e9
+ 3c4162972b5d3204ba47ac384aa456855a17b5e97422723d4758251acf1ed28c"
 
-# Aarch64 fails to build with gcc
 case "$XBPS_TARGET_MACHINE" in
 	armv[67]l)
 		broken="invalid operands of types 'char [8]' and 'const uint64_t' to binary 'operator&'"
 	;;
-	aarch64*)
-		hostmakedepends+=" clang"
-		configure_args+=" -DLIBCXXABI_TARGET_TRIPLE=${XBPS_CROSS_TRIPLET}"
-		pre_configure() {
-			export CC="clang"
-			export CXX="clang++"
-
-			CFLAGS+=" --target=${XBPS_CROSS_TRIPLET} --sysroot=${XBPS_CROSS_BASE}"
-			CXXFLAGS+=" --target=${XBPS_CROSS_TRIPLET} --sysroot=${XBPS_CROSS_BASE} -I$(ls -d ${XBPS_CROSS_BASE}/usr/include/c++/*/${XBPS_CROSS_TRIPLET} | head -n1)"
-		}
-	;;
 esac
 
 post_extract() {
diff --git a/srcpkgs/libdazzle/template b/srcpkgs/libdazzle/template
index 3ce55a10ff5..70bdd3558fd 100644
--- a/srcpkgs/libdazzle/template
+++ b/srcpkgs/libdazzle/template
@@ -1,6 +1,6 @@
 # Template file for 'libdazzle'
 pkgname=libdazzle
-version=3.32.3
+version=3.34.1
 revision=1
 build_style=meson
 build_helper="gir"
@@ -14,7 +14,7 @@ license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/libdazzle"
 changelog="https://raw.githubusercontent.com/GNOME/libdazzle/libdazzle-3-32/NEWS"
 distfiles="${GNOME_SITE}/libdazzle/${version%.*}/libdazzle-${version}.tar.xz"
-checksum=6c8d9b1514b5f6422107596f4145b89b8f2a99abef6383e086dfcd28c28667e8
+checksum=3d981cbb9d9bb87bfaff7bfd44d9847223b3ef81e69225e4d1f6ac725a669505
 
 build_options="gir vala"
 build_options_default="gir vala"
diff --git a/srcpkgs/libdrm/template b/srcpkgs/libdrm/template
index b1accf70d4c..77318b0b4c4 100644
--- a/srcpkgs/libdrm/template
+++ b/srcpkgs/libdrm/template
@@ -8,7 +8,7 @@ configure_args="-Dudev=true -Dvalgrind=false"
 hostmakedepends="pkg-config"
 makedepends="eudev-libudev-devel libpciaccess-devel"
 short_desc="Userspace interface to kernel DRM services"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://dri.freedesktop.org/"
 distfiles="https://gitlab.freedesktop.org/mesa/drm/-/archive/libdrm-${version}/drm-libdrm-${version}.tar.gz"
diff --git a/srcpkgs/libdwarf/template b/srcpkgs/libdwarf/template
index 8e280c25c89..e7a757ce85c 100644
--- a/srcpkgs/libdwarf/template
+++ b/srcpkgs/libdwarf/template
@@ -1,6 +1,6 @@
 # Template file for 'libdwarf'
 pkgname=libdwarf
-version=20190529
+version=20191002
 revision=1
 build_style=gnu-configure
 configure_args="--prefix=/usr --enable-shared"
@@ -10,7 +10,7 @@ maintainer="John Regan <john@jrjrtech.com>"
 license="LGPL-2.1-only"
 homepage="https://www.prevanders.net/dwarf.html"
 distfiles="https://prevanders.net/${pkgname}-${version}.tar.gz"
-checksum=b414c3bff758df211d972de72df1da9f496224da3f649b950b7d7239ec69172c
+checksum=c1594995813653e7ce6dabc36f86b2074598fedacf8b789ada6c0f47a5f12f49
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" elfutils-devel"
diff --git a/srcpkgs/libebml/template b/srcpkgs/libebml/template
index 0f99d3d8c0c..4b3e5bef448 100644
--- a/srcpkgs/libebml/template
+++ b/srcpkgs/libebml/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
 short_desc="Extensible Binary Meta Language library"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://dl.matroska.org/downloads/libebml/"
 distfiles="https://dl.matroska.org/downloads/libebml/libebml-${version}.tar.xz"
diff --git a/srcpkgs/libfakekey/template b/srcpkgs/libfakekey/template
index b312a2d17a5..17df937adc3 100644
--- a/srcpkgs/libfakekey/template
+++ b/srcpkgs/libfakekey/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="libXtst-devel"
 short_desc="X virtual keyboard library"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.yoctoproject.org/tools-resources/projects/matchbox"
 distfiles="https://git.yoctoproject.org/cgit/cgit.cgi/libfakekey/snapshot/libfakekey-${version}.tar.gz"
diff --git a/srcpkgs/libfilezilla/template b/srcpkgs/libfilezilla/template
index cf2f937389e..ea03f727cb9 100644
--- a/srcpkgs/libfilezilla/template
+++ b/srcpkgs/libfilezilla/template
@@ -1,7 +1,7 @@
 # Template file for 'libfilezilla'
 # filezilla needs to be rebuilt when libfilezilla version changes, ABI is not stable
 pkgname=libfilezilla
-version=0.18.1
+version=0.18.2
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://lib.filezilla-project.org/"
 changelog="https://svn.filezilla-project.org/filezilla/libfilezilla/trunk/NEWS?view=co"
 distfiles="https://download.filezilla-project.org/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=cb7bae8a27a6ff7ea37c89a0ed4347d5c7b0c847473b29894dcadc154b8a7f97
+checksum=40d86929b486a6809c4b52d607f21a00e634e0b9b792504fe2964c117b522dc9
 
 case "$XBPS_TARGET_MACHINE" in
 	armv[56]*|ppc|ppc-musl*)
diff --git a/srcpkgs/libfontenc/template b/srcpkgs/libfontenc/template
index ccdce031345..02e28e72510 100644
--- a/srcpkgs/libfontenc/template
+++ b/srcpkgs/libfontenc/template
@@ -7,7 +7,7 @@ configure_args="--with-fontrootdir=/usr/share/fonts/X11"
 hostmakedepends="pkg-config"
 makedepends="xorgproto zlib-devel"
 short_desc="Fontenc Library from X.org"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org/"
 distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
diff --git a/srcpkgs/libgcrypt/template b/srcpkgs/libgcrypt/template
index fbe8669d903..1a8e3c67ba7 100644
--- a/srcpkgs/libgcrypt/template
+++ b/srcpkgs/libgcrypt/template
@@ -1,7 +1,7 @@
 # Template file for 'libgcrypt'
 pkgname=libgcrypt
-version=1.8.4
-revision=2
+version=1.8.5
+revision=1
 build_style=gnu-configure
 configure_args="--enable-static --without-capabilities"
 makedepends="libgpg-error-devel"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.gnupg.org"
 distfiles="https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-${version}.tar.bz2"
-checksum=f638143a0672628fde0cad745e9b14deb85dffb175709cacc1f4fe24b93f2227
+checksum=3b4a2a94cb637eff5bdebbcaf46f4d95c4f25206f459809339cdada0eb577ac3
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc|ppc-musl) configure_args+=" ac_cv_sys_symbol_underscore=no" ;;
@@ -31,6 +31,7 @@ libgcrypt-devel_package() {
 	pkg_install() {
 		vmove usr/bin/libgcrypt-config
 		vmove usr/include
+		vmove usr/lib/pkgconfig
 		vmove usr/share
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.a"
diff --git a/srcpkgs/libgdiplus/template b/srcpkgs/libgdiplus/template
index 36b62972714..214ea493907 100644
--- a/srcpkgs/libgdiplus/template
+++ b/srcpkgs/libgdiplus/template
@@ -1,6 +1,6 @@
 # Template file for 'libgdiplus'
 pkgname=libgdiplus
-version=5.6.1
+version=6.0.4
 revision=1
 build_style=gnu-configure
 configure_args="--with-cairo=system"
@@ -8,11 +8,11 @@ hostmakedepends="pkg-config automake libtool"
 makedepends="tiff-devel cairo-devel giflib-devel glib-devel libexif-devel
  libpng-devel"
 short_desc="Open Source Implementation of the GDI+ API"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1, MPL-1.1, MIT"
+maintainer="Helmut Pozimski <helmut@pozimski.eu>"
+license="MIT"
 homepage="http://www.mono-project.com/"
 distfiles="https://github.com/mono/${pkgname}/archive/${version}.tar.gz"
-checksum=deff863023950b1d1de7e47e44fc31c8ba39cfc06334737261965f697b2ad312
+checksum=9a5e3f98018116f99361520348e9713cd05680c231d689a83d87acfaf237d3a8
 
 pre_configure() {
 	autoreconf -fiv
@@ -31,4 +31,3 @@ libgdiplus-devel_package() {
 		vmove usr/lib/pkgconfig
 	}
 }
-
diff --git a/srcpkgs/libgit2-0.27/template b/srcpkgs/libgit2-0.27/template
deleted file mode 100644
index c76c0d3ba1a..00000000000
--- a/srcpkgs/libgit2-0.27/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'libgit2-0.27'
-pkgname=libgit2-0.27
-version=0.27.8
-revision=2
-wrksrc="libgit2-${version}"
-build_style=cmake
-configure_args="-DTHREADSAFE=ON"
-hostmakedepends="python git pkg-config"
-makedepends="zlib-devel libressl-devel http-parser-devel libssh2-devel libuv-devel"
-short_desc="Git linkable library"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later WITH GCC-exception-2.0"
-homepage="https://libgit2.org"
-distfiles="https://github.com/libgit2/libgit2/archive/v${version}.tar.gz"
-checksum=8313873d49dc01e8b880ec334d7430ae67496a89aaa8c6e7bbd3affb47a00c76
-
-case "$XBPS_TARGET_MACHINE" in
-	*-musl)
-		# Don't use qsort_r, see src/util.c
-		CFLAGS="-D__ANDROID_API__"
-		;;
-esac
-
-post_install() {
-	rm -rf ${DESTDIR}/usr/include
-	rm -rf ${DESTDIR}/usr/lib/libgit2.so
-	rm -rf ${DESTDIR}/usr/lib/pkgconfig
-}
diff --git a/srcpkgs/libgit2-0.27/update b/srcpkgs/libgit2-0.27/update
deleted file mode 100644
index e80c8970aed..00000000000
--- a/srcpkgs/libgit2-0.27/update
+++ /dev/null
@@ -1,3 +0,0 @@
-site="https://github.com/libgit2/libgit2/tags"
-pattern='archive/v?\K[\d.]+(?=\.tar\.gz)'
-ignore="0.[123456789][12345689]*"
diff --git a/srcpkgs/libgnome-games-support/template b/srcpkgs/libgnome-games-support/template
index bdf2a3b9068..abe3af0ff4d 100644
--- a/srcpkgs/libgnome-games-support/template
+++ b/srcpkgs/libgnome-games-support/template
@@ -1,6 +1,6 @@
 # Template file for 'libgnome-games-support'
 pkgname=libgnome-games-support
-version=1.4.3
+version=1.4.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config gobject-introspection vala"
@@ -10,7 +10,7 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-3.0-or-later"
 homepage="https://git.gnome.org/browse/libgnome-games-support/"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=704a7a93aa5066f84738b60d696cf393dfbbf1a3e339f9adbb40af0cf70eca3c
+checksum=f8a6ae569868abb4e90cf48e505dff527a635cb21a4af33039379860b3ad6bfe
 
 libgnome-games-support-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/libgravatar/template b/srcpkgs/libgravatar/template
index 972fab026ca..875e8a86243 100644
--- a/srcpkgs/libgravatar/template
+++ b/srcpkgs/libgravatar/template
@@ -1,6 +1,6 @@
 # Template file for 'libgravatar'
 pkgname=libgravatar
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python kcoreaddons kconfig"
@@ -10,7 +10,7 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/applications/${version}/src/libgravatar-${version}.tar.xz"
-checksum=f8dd753abdc868623b878433c0b2ed53d4d4ab2cb62c69cb94c433e51cb713a9
+checksum=393370a9d7d4a74627469b2e67bb3f7a0ef73dac8b11a3ab5af6c384c20a0de5
 
 libgravatar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libgta/template b/srcpkgs/libgta/template
index 60258e70e74..8249797ef9f 100644
--- a/srcpkgs/libgta/template
+++ b/srcpkgs/libgta/template
@@ -1,6 +1,6 @@
 # Template file for 'libgta'
 pkgname=libgta
-version=1.0.9
+version=1.2.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
@@ -10,7 +10,7 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="LGPL-2.1-or-later"
 homepage="https://marlam.de/gta/"
 distfiles="https://marlam.de/gta/releases/libgta-${version}.tar.xz"
-checksum=4618028869f39202565722a514777d611f041700a15a8f4bdbec201c3a099892
+checksum=5a41a71b009b7ea6b425e94d9e2949c560b4fb26f57ba6104b9de9e2e0566b68
 
 post_install() {
 	#examples only
@@ -25,6 +25,5 @@ libgta-devel_package() {
 		vmove usr/lib/pkgconfig
 		vmove usr/lib/*.a
 		vmove usr/lib/*.so
-		vmove usr/share/libgta/cmake
 	}
 }
diff --git a/srcpkgs/libgusb/template b/srcpkgs/libgusb/template
index 95bcccd7111..44970c06c2f 100644
--- a/srcpkgs/libgusb/template
+++ b/srcpkgs/libgusb/template
@@ -10,7 +10,7 @@ hostmakedepends="pkg-config $(vopt_if vala vala)"
 makedepends="libglib-devel libusb-devel libgudev-devel $(vopt_if vala vala-devel)
  usbutils"
 short_desc="GLib wrapper around libusb1"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/hughsie/libgusb"
 distfiles="http://people.freedesktop.org/~hughsient/releases/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/libgweather/patches/conditionalize-gir.patch b/srcpkgs/libgweather/patches/conditionalize-gir.patch
deleted file mode 100644
index 2d134bf88f6..00000000000
--- a/srcpkgs/libgweather/patches/conditionalize-gir.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-diff --git libgweather/meson.build libgweather/meson.build
-index 301e7e8..7da6a4e 100644
---- libgweather/meson.build
-+++ libgweather/meson.build
-@@ -65,29 +65,31 @@ lib_libgweather = shared_library('gweather-3',
-   install: true,
- )
- 
--gweather_gir = gnome.generate_gir(lib_libgweather,
--  sources: introspection_sources,
--  dependencies: deps_libgweather,
--  nsversion: '3.0',
--  namespace: 'GWeather',
--  includes: ['GObject-2.0', 'Gtk-3.0'],
--  symbol_prefix: 'gweather',
--  identifier_prefix: 'GWeather',
--  export_packages: 'gweather-3.0',
--  header: 'libgweather/gweather.h',
--  extra_args: [
--    '--warn-all',
--    '-DGWEATHER_COMPILATION',
--  ],
--  install: true,
--)
-+if get_option('introspection')
-+  gweather_gir = gnome.generate_gir(lib_libgweather,
-+    sources: introspection_sources,
-+    dependencies: deps_libgweather,
-+    nsversion: '3.0',
-+    namespace: 'GWeather',
-+    includes: ['GObject-2.0', 'Gtk-3.0'],
-+    symbol_prefix: 'gweather',
-+    identifier_prefix: 'GWeather',
-+    export_packages: 'gweather-3.0',
-+    header: 'libgweather/gweather.h',
-+    extra_args: [
-+      '--warn-all',
-+      '-DGWEATHER_COMPILATION',
-+    ],
-+    install: true,
-+  )
- 
--libgweather_dep = declare_dependency(
--  sources: [gweather_enum_types[1], gweather_gir],
--  dependencies: deps_libgweather,
--  link_with: lib_libgweather,
--  include_directories: root_inc,
--)
-+  libgweather_dep = declare_dependency(
-+    sources: [gweather_enum_types[1], gweather_gir],
-+    dependencies: deps_libgweather,
-+    link_with: lib_libgweather,
-+    include_directories: root_inc,
-+  )
-+endif
- 
- if enable_vala
-   gnome.generate_vapi('gweather-3.0',
-@@ -102,31 +104,33 @@ test_cargs = ['-DTEST_SRCDIR="@0@/"'.format(meson.current_source_dir()),
-               '-DSCHEMASDIR="@0@/schemas"'.format(meson.source_root()),
-               '-DSCHEMAS_BUILDDIR="@0@/schemas"'.format(meson.build_root())]
- 
--executable('test_locations',
--  ['test_locations.c'],
--  c_args: test_cargs,
--  dependencies: libgweather_dep,
--  install: false)
--executable('test_locations_utc',
--  ['test_locations_utc.c'],
--  c_args: test_cargs,
--  dependencies: libgweather_dep,
--  install: false)
-+if get_option('test')
-+  executable('test_locations',
-+    ['test_locations.c'],
-+    c_args: test_cargs,
-+    dependencies: libgweather_dep,
-+    install: false)
-+  executable('test_locations_utc',
-+    ['test_locations_utc.c'],
-+    c_args: test_cargs,
-+    dependencies: libgweather_dep,
-+    install: false)
- 
--exe = executable('test_libgweather',
--  ['test_libgweather.c'],
--  c_args: test_cargs,
--  dependencies: libgweather_dep,
--  install: false)
--test('test_named_timezones', exe)
-+  exe = executable('test_libgweather',
-+    ['test_libgweather.c'],
-+    c_args: test_cargs,
-+    dependencies: libgweather_dep,
-+    install: false)
-+  test('test_named_timezones', exe)
- 
--executable('test_metar',
--  ['test_metar.c', gweather_c_sources],
--  c_args: test_cargs,
--  dependencies: libgweather_dep,
--  install: false)
--executable('test_sun_moon',
--  ['test_sun_moon.c', 'weather-sun.c', 'weather-moon.c'],
--  c_args: test_cargs,
--  dependencies: libgweather_dep,
--  install: false)
-+  executable('test_metar',
-+    ['test_metar.c', gweather_c_sources],
-+    c_args: test_cargs,
-+    dependencies: libgweather_dep,
-+    install: false)
-+  executable('test_sun_moon',
-+    ['test_sun_moon.c', 'weather-sun.c', 'weather-moon.c'],
-+    c_args: test_cargs,
-+    dependencies: libgweather_dep,
-+    install: false)
-+endif
-diff --git meson_options.txt meson_options.txt
-index 19b2c6a..3025a5f 100644
---- meson_options.txt
-+++ meson_options.txt
-@@ -8,3 +8,7 @@ option('enable_vala', type: 'combo', choices : ['true', 'false', 'auto'], value
-        description: 'Install vala bindings')
- option('gtk_doc', type: 'boolean', value: false,
-        description: 'Whether to generate the API reference')
-+option('introspection', type: 'boolean', value: false,
-+       description: 'Whether to generate gobject introspection data')
-+option('test', type: 'boolean', value: false,
-+       description: 'Whether to build test executables')
diff --git a/srcpkgs/libgweather/template b/srcpkgs/libgweather/template
index 25f1cd3aee0..45a4f54e370 100644
--- a/srcpkgs/libgweather/template
+++ b/srcpkgs/libgweather/template
@@ -1,6 +1,6 @@
 # Template file for 'libgweather'
 pkgname=libgweather
-version=3.32.2
+version=3.34.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -15,7 +15,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/LibGWeather"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=28ed5ff00d6faf1dc885c4252a538e43ff3f614fcf6a0f20c3b63604295d3c02
+checksum=02245395d639d9749fe2d19b7e66b64a152b9509ab0e5aad92514538b9c6f1b9
 
 build_options="gir vala"
 build_options_default="gir vala"
diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template
index 1f55582449f..7a34bee0e77 100644
--- a/srcpkgs/libheif/template
+++ b/srcpkgs/libheif/template
@@ -1,6 +1,6 @@
 # Template file for 'libheif'
 pkgname=libheif
-version=1.4.0
+version=1.5.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake autoconf pkg-config libtool"
@@ -9,7 +9,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="LGPL-3.0-or-later"
 homepage="http://www.libheif.org"
 distfiles="https://github.com/strukturag/libheif/archive/v${version}.tar.gz"
-checksum=3b7cead51077ee42e687248b8cd9269fda95a5f7ef4e502c54d08d189e395368
+checksum=87e3febd4d97fb483e3ac7b5399547bdc3093476058594e379bb075866d4eaf1
 
 pre_configure() {
 	./autogen.sh
diff --git a/srcpkgs/libhtp/template b/srcpkgs/libhtp/template
index 762c5ebd042..3d69926f865 100644
--- a/srcpkgs/libhtp/template
+++ b/srcpkgs/libhtp/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="automake libtool"
 makedepends="zlib-devel"
 short_desc="Security-aware parser for HTTP"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/OISF/libhtp"
 distfiles="https://github.com/OISF/libhtp/archive/${version}.tar.gz"
diff --git a/srcpkgs/libical/template b/srcpkgs/libical/template
index 40f24327ef4..39580e43de5 100644
--- a/srcpkgs/libical/template
+++ b/srcpkgs/libical/template
@@ -1,18 +1,26 @@
 # Template file for 'libical'
 pkgname=libical
-version=3.0.4
+version=3.0.6
 revision=2
 build_style=cmake
-hostmakedepends="libglib-devel libxml2-devel perl pkg-config"
-makedepends="libglib-devel libxml2-devel"
+build_helper="gir"
+configure_args="-DICAL_BUILD_DOCS=false
+ $(vopt_if gir '-DGOBJECT_INTROSPECTION=true -DICAL_GLIB_VAPI=true')"
+hostmakedepends="libglib-devel libxml2-devel perl pkg-config $(vopt_if gir vala)"
+makedepends="libglib-devel libxml2-devel $(vopt_if gir vala-devel)"
 checkdepends="tzdata"
 short_desc="Reference implementation of the iCalendar data type and format"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1, MPL-1"
+license="LGPL-2.1-only, MPL-2.0"
 homepage="http://libical.github.io/libical/"
 distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz"
-checksum=20f39343701ccd3ad896a9f9e982fdf85c1d3a35572e9d962216b69a64aef2ae
+checksum=fd2404a3df42390268e9fb804ef9f235e429b6f0da8992a148cbb3614946d99b
 patch_args="-Np1"
+disable_parallel_build=y
+build_options="gir"
+if [ -z "$CROSS_BUILD" ]; then
+	build_options_default="gir"
+fi
 
 libical-devel_package() {
 	depends="icu-devel ${sourcepkg}>=${version}_${revision}"
@@ -22,6 +30,10 @@ libical-devel_package() {
 		vmove usr/lib/pkgconfig
 		vmove usr/lib/*.a
 		vmove usr/lib/*.so
+		if [ "$build_option_gir" ]; then
+			vmove usr/share/gir-1.0
+			vmove usr/share/vala
+		fi
 		vmove usr/lib/cmake
 	}
 }
diff --git a/srcpkgs/libinput/template b/srcpkgs/libinput/template
index 34ee0a6e26b..c316ad8c060 100644
--- a/srcpkgs/libinput/template
+++ b/srcpkgs/libinput/template
@@ -1,6 +1,6 @@
 # Template file for 'libinput'
 pkgname=libinput
-version=1.14.0
+version=1.14.1
 revision=1
 build_style=meson
 configure_args="-Ddebug-gui=false -Ddocumentation=false -Dtests=false"
@@ -8,11 +8,11 @@ hostmakedepends="pkg-config"
 makedepends="libevdev-devel libwacom-devel mtdev-devel eudev-libudev-devel"
 checkdepends="valgrind check-devel"
 short_desc="Provides handling input devices in Wayland compositors and X"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="bra1nwave <brainwave@openmailbox.org>"
 license="MIT"
 homepage="https://www.freedesktop.org/wiki/Software/libinput"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=7cb85c24f8920b81bc5360220107e267ab4e0e718704c7690a8c7b03fa14fc67
+checksum=e333a3242835c019ca37d2cef8b51a87d3138eb47444119c0153dc7a8656ee70
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -Dtests=true"
diff --git a/srcpkgs/libite/template b/srcpkgs/libite/template
index fc17d3c6ca1..a673e5e4b24 100644
--- a/srcpkgs/libite/template
+++ b/srcpkgs/libite/template
@@ -1,16 +1,16 @@
 # Template file for 'libite'
 pkgname=libite
-version=2.0.2
+version=2.1.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool"
 short_desc="Lightweight library of frog DNA"
 maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT, ISC, BSD"
+license="MIT, ISC, BSD-2-Clause, BSD-3-Clause"
 homepage="https://github.com/troglobit/libite"
 #changelog="https://raw.githubusercontent.com/troglobit/libite/master/ChangeLog.md"
 distfiles="https://github.com/troglobit/libite/archive/v${version}.tar.gz"
-checksum=bd5d08066f3e53cc8967beb6f0620286aad7a24d49fb730caa1c6d09a26bb705
+checksum=fa441c6de3add45e66e842db0b0001fa978e3b3708f3dd1831fbd6bc7e9c07f7
 
 pre_configure() {
 	./autogen.sh
diff --git a/srcpkgs/libjpeg-turbo/template b/srcpkgs/libjpeg-turbo/template
index 8d3cfc1212a..d8af7da8d38 100644
--- a/srcpkgs/libjpeg-turbo/template
+++ b/srcpkgs/libjpeg-turbo/template
@@ -1,6 +1,6 @@
 # Template file for 'libjpeg-turbo'
 pkgname=libjpeg-turbo
-version=2.0.2
+version=2.0.3
 revision=1
 build_style=cmake
 configure_args="-DWITH_JPEG8=1 -DCMAKE_INSTALL_LIBDIR=/usr/lib"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="IJG, BSD-3-Clause, Zlib"
 homepage="https://libjpeg-turbo.org/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=acb8599fe5399af114287ee5907aea4456f8f2c1cc96d26c28aebfdf5ee82fed
+checksum=4246de500544d4ee408ee57048aa4aadc6f165fc17f141da87669f20ed3241b7
 
 provides="jpeg-8_1"
 replaces="jpeg>=0"
diff --git a/srcpkgs/libkcddb/template b/srcpkgs/libkcddb/template
index c5b7e39f080..9ef6dadc564 100644
--- a/srcpkgs/libkcddb/template
+++ b/srcpkgs/libkcddb/template
@@ -1,10 +1,9 @@
 # Template file for 'libkcddb'
 pkgname=libkcddb
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
-configure_args="-DBUILD_TESTING=OFF"
-hostmakedepends="extra-cmake-modules kconfig kcoreaddons kdoctools python
+hostmakedepends="extra-cmake-modules kconfig kcoreaddons kdoctools
  qt5-host-tools qt5-qmake"
 makedepends="kio-devel libmusicbrainz5-devel"
 short_desc="KDE CDDB library"
@@ -12,7 +11,11 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, BSD-3-Clause, GFDL-1.2-only"
 homepage="https://projects.kde.org/projects/kde/kdemultimedia/libkcddb"
 distfiles="${KDE_SITE}/applications/${version}/src/libkcddb-${version}.tar.xz"
-checksum=f97b90660bfd403aa64be8e6221a89087f74ab443431a9f692fe14cc90d82151
+checksum=f3e4c650b0abe10f281037bd6c805243a656fecdfc046a8586324c760ba90e48
+
+pre_check() {
+	export QT_QPA_PLATFORM=offscreen
+}
 
 libkcddb-devel_package() {
 	depends="libkcddb>=${version}_${revision}"
diff --git a/srcpkgs/libkdcraw5/template b/srcpkgs/libkdcraw5/template
index dbf8111374a..3088ede258b 100644
--- a/srcpkgs/libkdcraw5/template
+++ b/srcpkgs/libkdcraw5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdcraw5'
 pkgname=libkdcraw5
-version=19.08.0
+version=19.08.2
 revision=1
 wrksrc="libkdcraw-${version}"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/"
 distfiles="${KDE_SITE}/applications/${version}/src/libkdcraw-${version}.tar.xz"
-checksum=5c00a6f28445ba5a45284c3cee0ee3f158ad9e184fea5ee8adc83ac3000b26b1
+checksum=735ab40633efec394c6265d83f86ad7caf278f63d1dd33cc6edf572da4925fcb
 
 libkdcraw5-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libkdegames/template b/srcpkgs/libkdegames/template
index f0a6682f021..e8c5f09334d 100644
--- a/srcpkgs/libkdegames/template
+++ b/srcpkgs/libkdegames/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdegames'
 pkgname=libkdegames
-version=19.04.3
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/games/"
 distfiles="${KDE_SITE}/applications/${version}/src/libkdegames-${version}.tar.xz"
-checksum=187aa81539113bc6786d861e1f5302fa17533ae1108299bbd1a86be18accfbc4
+checksum=83456cec44502a1f79c0be00c983090e32fd8aea5fec1461fbfbd37b5f8866ac
 
 do_check() {
 	: # requires xserver
diff --git a/srcpkgs/libkdepim/template b/srcpkgs/libkdepim/template
index 59cfcd321d9..952a646c28d 100644
--- a/srcpkgs/libkdepim/template
+++ b/srcpkgs/libkdepim/template
@@ -1,7 +1,7 @@
 # Template file for 'libkdepim'
 pkgname=libkdepim
-version=19.08.0
-revision=1
+version=19.08.2
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python kcoreaddons"
 makedepends="akonadi5-devel akonadi-contacts-devel kcmutils-devel kldap-devel akonadi-search-devel"
@@ -10,7 +10,7 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/applications/${version}/src/libkdepim-${version}.tar.xz"
-checksum=4ff394bda799ebe700d12d60ab8171c64e054c6acb105870cd955b5ddce42eab
+checksum=67578e4c98e7e5d94249144e3720ae5fbc17231d4ecc46cb0e1be6e7ced4a71b
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/libkexiv25/template b/srcpkgs/libkexiv25/template
index 29acf0d26b8..d8f84c03e56 100644
--- a/srcpkgs/libkexiv25/template
+++ b/srcpkgs/libkexiv25/template
@@ -1,6 +1,6 @@
 # Template file for 'libkexiv25'
 pkgname=libkexiv25
-version=19.08.0
+version=19.08.2
 revision=1
 wrksrc="libkexiv2-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Denis Revin <denis.revin@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/kde/kdegraphics/libs/libkexiv2"
 distfiles="${KDE_SITE}/applications/${version}/src/libkexiv2-${version}.tar.xz"
-checksum=42bb1a8b69efbb4ab8b1d939279d3eb02b2d8030bcb917739f4f61fb5a10db15
+checksum=abdafabe834862e157356f2686ae871f00302d82ae639dbf89030d19ccc54b1b
 
 libkexiv25-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/libkgapi/template b/srcpkgs/libkgapi/template
index 9e88e9570d3..acd3495a396 100644
--- a/srcpkgs/libkgapi/template
+++ b/srcpkgs/libkgapi/template
@@ -1,7 +1,7 @@
 # Template file for 'libkgapi'
 pkgname=libkgapi
-version=19.08.0
-revision=1
+version=19.08.2
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake python3
  kcoreaddons"
@@ -12,7 +12,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/extragear/libs/libkgapi"
 distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=bc8a54e0997f4e3e0e840e350c6a9dee26582028415c5e9863d53a3280faa9f6
+checksum=b220908dd4a21e589a25b964b7786f1154f63ca98bf90c43ced3120adf4fb0a6
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*) broken="depends on qt5-webengine";;
diff --git a/srcpkgs/libkipi5/template b/srcpkgs/libkipi5/template
index d77e1bfcd75..ab69e110e77 100644
--- a/srcpkgs/libkipi5/template
+++ b/srcpkgs/libkipi5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkipi5'
 pkgname=libkipi5
-version=19.08.0
+version=19.08.2
 revision=1
 wrksrc="libkipi-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/kde/kdegraphics/libs/libkipi"
 distfiles="${KDE_SITE}/applications/${version}/src/libkipi-${version}.tar.xz"
-checksum=94b184c3128fe7ded9e816e2a6124ee0dcf016b1325636dd41b157866b461989
+checksum=fcaf576afb961d9a36c1f69c034c43b9f0991cbd0726ea684c2c49096f36d5c6
 conflicts="libkipi"
 
 libkipi5-devel_package() {
diff --git a/srcpkgs/libkleo/template b/srcpkgs/libkleo/template
index 771f5b52e97..e3c3c48c5d0 100644
--- a/srcpkgs/libkleo/template
+++ b/srcpkgs/libkleo/template
@@ -1,6 +1,6 @@
 # Template file for 'libkleo'
 pkgname=libkleo
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/applications/${version}/src/libkleo-${version}.tar.xz"
-checksum=a0a022f3da4d8f73c020ab55221c74d5c1590b2cbdb3b754218be17622a59cc6
+checksum=0acf296ffb0144096071e47ce1365b9e5b07b59cad4700f89c875c7bee4573bd
 
 libkleo-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/libknet1-devel b/srcpkgs/libknet1-devel
new file mode 120000
index 00000000000..0dca2d60545
--- /dev/null
+++ b/srcpkgs/libknet1-devel
@@ -0,0 +1 @@
+libknet1
\ No newline at end of file
diff --git a/srcpkgs/libknet1/patches/01_musl_fix.diff b/srcpkgs/libknet1/patches/01_musl_fix.diff
new file mode 100644
index 00000000000..f636c79bb8d
--- /dev/null
+++ b/srcpkgs/libknet1/patches/01_musl_fix.diff
@@ -0,0 +1,210 @@
+https://github.com/kronosnet/kronosnet/commit/512e433b0b3d8bf14818dcb8c8eb7748d7e899be
+
+diff --git a/configure.ac b/configure.ac
+index 778b12a5..e430aeb8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -205,6 +205,10 @@ AC_SEARCH_LIBS([dlopen], [dl dld], , [AC_MSG_ERROR([dlopen not found])])
+ AC_SUBST([dl_LIBS], [$LIBS])
+ LIBS="$saved_LIBS"
+ 
++# Check RTLD_DI_ORIGIN (not decalred by musl. glibc has it as an enum so cannot use ifdef)
++AC_CHECK_DECL([RTLD_DI_ORIGIN], [AC_DEFINE([HAVE_RTLD_DI_ORIGIN], 1,
++    [define when RTLD_DI_ORIGIN is declared])], ,[[#include <dlfcn.h>]])
++
+ # OS detection
+ 
+ AC_MSG_CHECKING([for os in ${host_os}])
+diff --git a/libknet/common.c b/libknet/common.c
+index 00907c91..ed8ac899 100644
+--- a/libknet/common.c
++++ b/libknet/common.c
+@@ -12,6 +12,8 @@
+ #include <fcntl.h>
+ #include <dlfcn.h>
+ #include <errno.h>
++#include <libgen.h>
++#include <link.h>
+ #include <string.h>
+ #include <sys/param.h>
+ #include <sys/types.h>
+@@ -54,6 +56,30 @@ int _fdset_nonblock(int fd)
+ 	return 0;
+ }
+ 
++static int get_lib_dir(void *lib_handle, char dir[MAXPATHLEN])
++{
++	int res;
++#ifndef HAVE_RTLD_DI_ORIGIN
++	struct link_map *lm;
++	char l_name[MAXPATHLEN];
++#endif
++
++#ifdef HAVE_RTLD_DI_ORIGIN
++	res = dlinfo(lib_handle, RTLD_DI_ORIGIN, dir);
++#else
++	/*
++	 * musl libc doesn't support RTLD_DI_ORIGIN
++	 */
++	res = dlinfo(lib_handle, RTLD_DI_LINKMAP, &lm);
++	if (res == 0) {
++		snprintf(l_name, sizeof(l_name), "%s", lm->l_name);
++		snprintf(dir, MAXPATHLEN, "%s", dirname(l_name));
++	}
++#endif
++
++	return res;
++}
++
+ static void *open_lib(knet_handle_t knet_h, const char *libname, int extra_flags)
+ {
+ 	void *ret = NULL;
+@@ -81,7 +107,7 @@ static void *open_lib(knet_handle_t knet_h, const char *libname, int extra_flags
+ 	memset(dir, 0, sizeof(dir));
+ 	memset(link, 0, sizeof(link));
+ 	memset(path, 0, sizeof(path));
+-	if (dlinfo(ret, RTLD_DI_ORIGIN, &dir) < 0) {
++	if (get_lib_dir(ret, dir) < 0) {
+ 		/*
+ 		 * should we dlclose and return error?
+ 		 */
+diff --git a/libknet/compat.c b/libknet/compat.c
+index e808f332..2e73c9fc 100644
+--- a/libknet/compat.c
++++ b/libknet/compat.c
+@@ -22,7 +22,7 @@
+ #include <sys/types.h>
+ #include <sys/event.h>
+ #include <sys/time.h>
+-#include <sys/errno.h>
++#include <errno.h>
+ 
+ static int32_t
+ _poll_to_filter_(int32_t event)
+diff --git a/libknet/crypto.c b/libknet/crypto.c
+index afa4f88c..2c4d5f5c 100644
+--- a/libknet/crypto.c
++++ b/libknet/crypto.c
+@@ -8,7 +8,7 @@
+ 
+ #include "config.h"
+ 
+-#include <sys/errno.h>
++#include <errno.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <pthread.h>
+diff --git a/libknet/handle.c b/libknet/handle.c
+index fcb129a7..6ecc91f7 100644
+--- a/libknet/handle.c
++++ b/libknet/handle.c
+@@ -456,9 +456,24 @@ static void _close_epolls(knet_handle_t knet_h)
+ static int _start_threads(knet_handle_t knet_h)
+ {
+ 	int savederrno = 0;
++	pthread_attr_t attr;
+ 
+ 	set_thread_status(knet_h, KNET_THREAD_PMTUD, KNET_THREAD_REGISTERED);
+-	savederrno = pthread_create(&knet_h->pmtud_link_handler_thread, 0,
++
++	savederrno = pthread_attr_init(&attr);
++	if (savederrno) {
++		log_err(knet_h, KNET_SUB_HANDLE, "Unable to init pthread attributes: %s",
++			strerror(savederrno));
++		goto exit_fail;
++	}
++	savederrno = pthread_attr_setstacksize(&attr, KNET_THREAD_STACK_SIZE);
++	if (savederrno) {
++		log_err(knet_h, KNET_SUB_HANDLE, "Unable to set stack size attribute: %s",
++			strerror(savederrno));
++		goto exit_fail;
++	}
++
++	savederrno = pthread_create(&knet_h->pmtud_link_handler_thread, &attr,
+ 				    _handle_pmtud_link_thread, (void *) knet_h);
+ 	if (savederrno) {
+ 		log_err(knet_h, KNET_SUB_HANDLE, "Unable to start pmtud link thread: %s",
+@@ -467,7 +482,7 @@ static int _start_threads(knet_handle_t knet_h)
+ 	}
+ 
+ 	set_thread_status(knet_h, KNET_THREAD_DST_LINK, KNET_THREAD_REGISTERED);
+-	savederrno = pthread_create(&knet_h->dst_link_handler_thread, 0,
++	savederrno = pthread_create(&knet_h->dst_link_handler_thread, &attr,
+ 				    _handle_dst_link_handler_thread, (void *) knet_h);
+ 	if (savederrno) {
+ 		log_err(knet_h, KNET_SUB_HANDLE, "Unable to start dst cache thread: %s",
+@@ -476,7 +491,7 @@ static int _start_threads(knet_handle_t knet_h)
+ 	}
+ 
+ 	set_thread_status(knet_h, KNET_THREAD_TX, KNET_THREAD_REGISTERED);
+-	savederrno = pthread_create(&knet_h->send_to_links_thread, 0,
++	savederrno = pthread_create(&knet_h->send_to_links_thread, &attr,
+ 				    _handle_send_to_links_thread, (void *) knet_h);
+ 	if (savederrno) {
+ 		log_err(knet_h, KNET_SUB_HANDLE, "Unable to start datafd to link thread: %s",
+@@ -485,7 +500,7 @@ static int _start_threads(knet_handle_t knet_h)
+ 	}
+ 
+ 	set_thread_status(knet_h, KNET_THREAD_RX, KNET_THREAD_REGISTERED);
+-	savederrno = pthread_create(&knet_h->recv_from_links_thread, 0,
++	savederrno = pthread_create(&knet_h->recv_from_links_thread, &attr,
+ 				    _handle_recv_from_links_thread, (void *) knet_h);
+ 	if (savederrno) {
+ 		log_err(knet_h, KNET_SUB_HANDLE, "Unable to start link to datafd thread: %s",
+@@ -494,7 +509,7 @@ static int _start_threads(knet_handle_t knet_h)
+ 	}
+ 
+ 	set_thread_status(knet_h, KNET_THREAD_HB, KNET_THREAD_REGISTERED);
+-	savederrno = pthread_create(&knet_h->heartbt_thread, 0,
++	savederrno = pthread_create(&knet_h->heartbt_thread, &attr,
+ 				    _handle_heartbt_thread, (void *) knet_h);
+ 	if (savederrno) {
+ 		log_err(knet_h, KNET_SUB_HANDLE, "Unable to start heartbeat thread: %s",
+@@ -502,6 +517,15 @@ static int _start_threads(knet_handle_t knet_h)
+ 		goto exit_fail;
+ 	}
+ 
++	savederrno = pthread_attr_destroy(&attr);
++	if (savederrno) {
++		log_err(knet_h, KNET_SUB_HANDLE, "Unable to destroy pthread attributes: %s",
++			strerror(savederrno));
++		/*
++		 * Do not return error code. Error is not critical.
++		 */
++	}
++
+ 	return 0;
+ 
+ exit_fail:
+diff --git a/libknet/internals.h b/libknet/internals.h
+index 3911b847..13530687 100644
+--- a/libknet/internals.h
++++ b/libknet/internals.h
+@@ -37,6 +37,14 @@
+ 
+ #define KNET_INTERNAL_DATA_CHANNEL KNET_DATAFD_MAX
+ 
++/*
++ * Size of threads stack. Value is choosen by experimenting, how much is needed
++ * to sucesfully finish test suite, and at the time of writing patch it was
++ * ~300KiB. To have some room for future enhancement it is increased
++ * by factor of 3 and rounded.
++ */
++#define KNET_THREAD_STACK_SIZE (1024 * 1024)
++
+ typedef void *knet_transport_link_t; /* per link transport handle */
+ typedef void *knet_transport_t;      /* per knet_h transport handle */
+ struct  knet_transport_ops;          /* Forward because of circular dependancy */
+diff --git a/libknet/onwire.c b/libknet/onwire.c
+index 143ac4b7..e3fd293b 100644
+--- a/libknet/onwire.c
++++ b/libknet/onwire.c
+@@ -8,7 +8,7 @@
+ 
+ #include "config.h"
+ 
+-#include <sys/errno.h>
++#include <errno.h>
+ #include <stdlib.h>
+ #include <string.h>
+ 
diff --git a/srcpkgs/libknet1/template b/srcpkgs/libknet1/template
new file mode 100644
index 00000000000..cb2b377182e
--- /dev/null
+++ b/srcpkgs/libknet1/template
@@ -0,0 +1,58 @@
+# Template file for 'libknet1'
+# only libraries and development files now, if interested in kronosnetd update!
+pkgname=libknet1
+version=1.11
+revision=2
+wrksrc=kronosnet-${version}
+build_style=gnu-configure
+configure_args="--disable-dependency-tracking --disable-libknet-sctp
+ --disable-kronosnetd --disable-poc --disable-static"
+hostmakedepends="automake doxygen libtool libxml2-devel pkg-config libqb-devel"
+makedepends="bzip2-devel liblz4-devel liblzma-devel libnl3-devel libqb-devel
+ libressl-devel libxml2-devel libzstd-devel lzo-devel nss-devel zlib-devel"
+short_desc="Kronosnet core switching implementation (libraries)"
+maintainer="Jiří Bělka <jirib79@gmail.com>"
+license="GPL-2.0-or-later, LGPL-2.1-only"
+homepage="https://www.kronosnet.org"
+distfiles="https://kronosnet.org/releases/kronosnet-${version}.tar.bz2"
+checksum=c2ee20a9b5b0791ed5379b38b0b51d549603933925a839f045455553f03e6114
+
+patch_args='-Np1'
+
+pre_configure() {
+	autoreconf -fi
+}
+
+post_install() {
+	rm -rf ${DESTDIR}/usr/share/doc/kronosnet
+	vdoc README
+}
+
+libknet1-devel_package() {
+	depends="libknet1>=${version}_${revision}"
+	short_desc="Kronosnet core switching implementation (development files)"
+	pkg_install() {
+		vmove usr/include/libknet.h
+		vmove usr/lib/libknet.so
+		vmove usr/lib/pkgconfig/libknet.pc
+		vmove "usr/share/man/man3/knet*"
+	}
+}
+
+libnozzle1_package() {
+	short_desc="Userland wrapper around kernel tap devices"
+	pkg_install() {
+		vmove "usr/lib/libnozzle.so.*"
+	}
+}
+
+libnozzle1-devel_package() {
+	depends="libnozzle1>=${version}_${revision}"
+	short_desc="Userland wrapper around kernel tap devices (development files)"
+	pkg_install() {
+		vmove usr/include/libnozzle.h
+		vmove usr/lib/libnozzle.so
+		vmove usr/lib/pkgconfig/libnozzle.pc
+		vmove "usr/share/man/man3/nozzle*"
+	}
+}
diff --git a/srcpkgs/libkomparediff2/template b/srcpkgs/libkomparediff2/template
index 6bce0931217..910c497cfce 100644
--- a/srcpkgs/libkomparediff2/template
+++ b/srcpkgs/libkomparediff2/template
@@ -1,20 +1,16 @@
 # Template file for 'libkomparediff2'
 pkgname=libkomparediff2
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules kcoreaddons"
+hostmakedepends="extra-cmake-modules kcoreaddons qt5-host-tools qt5-qmake"
 makedepends="kparts-devel"
 short_desc="Library to compare files and strings"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://www.kde.org/"
 distfiles="${KDE_SITE}/applications/${version}/src/libkomparediff2-${version}.tar.xz"
-checksum=d86765e6514bdcf838ed36ae5968f9b2b7cb2e74f4fe884ae87f58b9bcc963fe
-
-if [ -n "$CROSS_BUILD" ]; then
-	hostmakedepends+=" python qt5-host-tools qt5-qmake"
-fi
+checksum=c5738f96dbda3d7272ad08ff9518722ae9b7ee737ab7e27c9e88cedb418371d7
 
 libkomparediff2-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libksane/template b/srcpkgs/libksane/template
index ddd0352f5a1..6fde743ddc3 100644
--- a/srcpkgs/libksane/template
+++ b/srcpkgs/libksane/template
@@ -1,6 +1,6 @@
 # Template file for 'libksane'
 pkgname=libksane
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="travankor <travankor@tuta.io>"
 license="LGPL-2.1-or-later"
 homepage="https://www.kde.org/applications/graphics/"
 distfiles="${KDE_SITE}/applications/${version}/src/libksane-${version}.tar.xz"
-checksum=62c670c316a47facbd0beedb0fcc35247fbbd285892a90ab06ebb8f74b8a6329
+checksum=97e05423f4a9205b9db0bbce5111615d6bf8e8d53a391d3398275babccd91aa0
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"
diff --git a/srcpkgs/libkscreen/template b/srcpkgs/libkscreen/template
index f2fe25cf4f5..7680e0cbcf0 100644
--- a/srcpkgs/libkscreen/template
+++ b/srcpkgs/libkscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'libkscreen'
 pkgname=libkscreen
-version=5.16.4
+version=5.17.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/extragear/libs/libkscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=f20f33a2f32b3db39e94ca9d10e240591650357d03c1a2f8eb6c5faa4d1bf723
+checksum=80f72afc9a2409dfe80853c007b596e4c1bcc92bee95741b894646ef3176dd7e
 
 libkscreen-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/libksieve/template b/srcpkgs/libksieve/template
index caaef566ac4..492e9e5f931 100644
--- a/srcpkgs/libksieve/template
+++ b/srcpkgs/libksieve/template
@@ -1,6 +1,6 @@
 # Template file for 'libksieve'
 pkgname=libksieve
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python
@@ -12,7 +12,7 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/applications/${version}/src/libksieve-${version}.tar.xz"
-checksum=48d0925a8dd0adfa6ccd4945b14e2e562b8855faa6bed43de0442a273fd41966
+checksum=5c5bb9182e53a2a928d70985f6dd514c8b308891c4899b942784e80d221318f6
 
 libksieve-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/libksysguard/template b/srcpkgs/libksysguard/template
index 5aad6f6ff5f..a848c5421ca 100644
--- a/srcpkgs/libksysguard/template
+++ b/srcpkgs/libksysguard/template
@@ -1,6 +1,6 @@
 # Template file for 'libksysguard'
 pkgname=libksysguard
-version=5.16.4
+version=5.17.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/plasma/libksysguard"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=b9a8166bf808a54dd80eb8f760047c63989f1f10a9a7f649c8298c9a5031368f
+checksum=87370f4c16ba489e988f39e53015a677b1e30070e79888b07f9826695ec7e9ac
 
 libksysguard-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/liblastfm-qt5/template b/srcpkgs/liblastfm-qt5/template
index 13335612e9f..abb7eacc8d4 100644
--- a/srcpkgs/liblastfm-qt5/template
+++ b/srcpkgs/liblastfm-qt5/template
@@ -1,7 +1,7 @@
 # Template file for 'liblastfm-qt5'
 pkgname=liblastfm-qt5
-version=1.0.9
-revision=4
+version=1.1.0
+revision=1
 wrksrc=${pkgname%-*}-${version}
 build_style=cmake
 makedepends="qt5-devel qt5-plugin-pgsql qt5-plugin-mysql qt5-plugin-sqlite
@@ -11,7 +11,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/lastfm/liblastfm"
 distfiles="https://github.com/lastfm/${pkgname%-*}/archive/${version}.tar.gz"
-checksum=5276b5fe00932479ce6fe370ba3213f3ab842d70a7d55e4bead6e26738425f7b
+checksum=f61f0daa384e081a8f2bd2f7a2148babff22696e5b72ecdac86940a10100b1c8
 
 if [ -n "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel"
diff --git a/srcpkgs/libllvm9 b/srcpkgs/libllvm9
new file mode 120000
index 00000000000..14540d7bad2
--- /dev/null
+++ b/srcpkgs/libllvm9
@@ -0,0 +1 @@
+llvm9
\ No newline at end of file
diff --git a/srcpkgs/libluv-devel b/srcpkgs/libluv-devel
new file mode 120000
index 00000000000..26d5f9b015d
--- /dev/null
+++ b/srcpkgs/libluv-devel
@@ -0,0 +1 @@
+libluv
\ No newline at end of file
diff --git a/srcpkgs/libluv/template b/srcpkgs/libluv/template
new file mode 100644
index 00000000000..9cc67b6d4e0
--- /dev/null
+++ b/srcpkgs/libluv/template
@@ -0,0 +1,37 @@
+# Template file for 'libluv'
+pkgname=libluv
+version=1.30.1.0
+revision=1
+_distver="${version%.*}-${version##*.}"
+wrksrc=luv-${_distver}
+build_style=cmake
+configure_args="-DLUA_BUILD_TYPE=System -DBUILD_MODULE=OFF -DBUILD_SHARED_LIBS=ON"
+makedepends="libuv-devel LuaJIT-devel"
+depends="lua libuv LuaJIT"
+short_desc="Bare libuv bindings for lua"
+maintainer="andry-dev <peketribal2@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/luvit/luv"
+distfiles="https://github.com/luvit/luv/releases/download/${_distver}/luv-${_distver}.tar.gz
+			https://raw.githubusercontent.com/luvit/luv/${_distver}/libluv.pc.in"
+checksum="420fc299f3b25aff55b839e9fe590982f45045b3e53ebeab2449eca7e23a106a
+			be2a4909c724e09a50de42b1caa3c82c1b1afee8b80abf20c6944f1df1c7fd0e"
+skip_extraction="libluv.pc.in"
+
+if [ "$CROSS_BUILD" -a "$XBPS_MACHINE" = "x86_64" ]; then
+	hostmakedepends+=" gcc-multilib"
+fi
+
+post_extract() {
+	cp ${XBPS_SRCDISTDIR}/libluv-${version}/libluv.pc.in ${wrksrc}/libluv.pc.in
+}
+
+libluv-devel_package() {
+	depends="${makedepends} libluv>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/libmatroska/template b/srcpkgs/libmatroska/template
index 8afd80e7084..2af96c75bd6 100644
--- a/srcpkgs/libmatroska/template
+++ b/srcpkgs/libmatroska/template
@@ -6,7 +6,7 @@ build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
 makedepends="libebml-devel"
 short_desc="Extensible open standard Audio/Video container format"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://dl.matroska.org/downloads/libmatroska/"
 distfiles="https://dl.matroska.org/downloads/libmatroska/libmatroska-${version}.tar.xz"
diff --git a/srcpkgs/libmediainfo/template b/srcpkgs/libmediainfo/template
index ab11a9b9815..bbf21cbd5d4 100644
--- a/srcpkgs/libmediainfo/template
+++ b/srcpkgs/libmediainfo/template
@@ -1,6 +1,6 @@
 # Template file for 'libmediainfo'
 pkgname=libmediainfo
-version=19.07
+version=19.09
 revision=1
 wrksrc=MediaInfoLib
 build_wrksrc=Project/GNU/Library
@@ -13,7 +13,7 @@ maintainer="John <johnz@posteo.net>"
 license="BSD-2-Clause"
 homepage="https://mediaarea.net/MediaInfo"
 distfiles="https://mediaarea.net/download/source/libmediainfo/${version}/${pkgname}_${version}.tar.xz"
-checksum=5acbe3f0a48e10cacb588381454f30149c947ffa89659680165ed1a0603d6d4c
+checksum=ff06e1a449dfbe6f2c51f27ae1187d3e72386cb54476fbb189ffaacf845f478e
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/libmicrodns/template b/srcpkgs/libmicrodns/template
index abe44a57a94..efcbce9fd37 100644
--- a/srcpkgs/libmicrodns/template
+++ b/srcpkgs/libmicrodns/template
@@ -1,6 +1,6 @@
 # Template file for 'libmicrodns'
 pkgname=libmicrodns
-version=0.0.10
+version=0.1.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="autoconf automake libtool pkg-config"
@@ -9,7 +9,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="LGPL-2.1-only"
 homepage="https://github.com/videolabs/libmicrodns"
 distfiles="https://github.com/videolabs/libmicrodns/archive/${version}.tar.gz"
-checksum=623e3077bd940816215d9707c217dc8f957d3dee9b7fd3ea7aaa4de0cd881833
+checksum=aa16c9863962f54db991a0176ae75e60b9ab83f63c3b436806682c8a66443444
 
 pre_configure() {
 	./bootstrap
diff --git a/srcpkgs/libmirage/template b/srcpkgs/libmirage/template
index 41b9001ede9..4938bff24cf 100644
--- a/srcpkgs/libmirage/template
+++ b/srcpkgs/libmirage/template
@@ -1,7 +1,7 @@
 # Template file for 'libmirage'
 pkgname=libmirage
-version=3.2.2
-revision=2
+version=3.2.3
+revision=1
 build_style=cmake
 build_helper="gir"
 configure_args="-DPOST_INSTALL_HOOKS=OFF"
@@ -12,7 +12,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://cdemu.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/cdemu/libmirage-${version}.tar.bz2"
-checksum=f1f2d2b1eaa42f2cb1c6edbeefb4c76031c7f2f6de5d71c702117a075474993f
+checksum=ce93d053850936eee981a6ce1484cf85e77aef90241ed29c9e63a0313ddeae22
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/libmpack/template b/srcpkgs/libmpack/template
index d96dd3b358e..8672ebeb54d 100644
--- a/srcpkgs/libmpack/template
+++ b/srcpkgs/libmpack/template
@@ -7,7 +7,7 @@ make_build_args="LIBTOOL=${XBPS_CROSS_BASE}/usr/bin/libtool"
 make_install_args="LIBTOOL=${XBPS_CROSS_BASE}/usr/bin/libtool"
 makedepends="libtool"
 short_desc="Simple implementation of msgpack in C"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MTI"
 homepage="https://github.com/libmpack/libmpack"
 distfiles="https://github.com/libmpack/libmpack/archive/${version}.tar.gz"
diff --git a/srcpkgs/libnftnl/template b/srcpkgs/libnftnl/template
index 688d6be3d48..9c07119c7f1 100644
--- a/srcpkgs/libnftnl/template
+++ b/srcpkgs/libnftnl/template
@@ -1,6 +1,6 @@
 # Template file for 'libnftnl'
 pkgname=libnftnl
-version=1.1.3
+version=1.1.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.netfilter.org/projects/libnftnl/"
 distfiles="https://www.netfilter.org/projects/${pkgname}/files/${pkgname}-${version}.tar.bz2"
-checksum=22dd97d3b06ae8c67499506e2bfd6803ce116479076ec3700e7a4c7cd9fcba0f
+checksum=c8c7988347adf261efac5bba59f8e5f995ffb65f247a88cc144e69620573ed20
 
 libnftnl-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libnl3/patches/musl.patch b/srcpkgs/libnl3/patches/musl.patch
deleted file mode 100644
index 3d4481729ca..00000000000
--- a/srcpkgs/libnl3/patches/musl.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- include/linux-private/linux/ipv6.h	2016-12-10 08:04:32.000000000 -0700
-+++ include/linux-private/linux/ipv6.h	2017-07-03 06:45:50.412094448 -0600
-@@ -2,7 +2,9 @@
- #define _IPV6_H
- 
- #include <asm/byteorder.h>
-+#if defined(__GLIBC__)
- #include <linux/in6.h>
-+#endif
- 
- /* The latest drafts declared increase in minimal mtu up to 1280. */
- 
diff --git a/srcpkgs/libnl3/template b/srcpkgs/libnl3/template
index 0223bca7e16..2530d4f12a7 100644
--- a/srcpkgs/libnl3/template
+++ b/srcpkgs/libnl3/template
@@ -1,6 +1,6 @@
 # Template file for 'libnl3'
 pkgname=libnl3
-version=3.4.0
+version=3.5.0
 revision=1
 wrksrc="libnl-${version}"
 build_style=gnu-configure
@@ -8,11 +8,11 @@ configure_args="--disable-static"
 hostmakedepends="automake flex libtool pkg-config"
 conf_files="/etc/libnl/pktloc /etc/libnl/classid"
 short_desc="Netlink Protocol Library Suite"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
+maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
+license="LGPL-2.1-only"
 homepage="https://github.com/thom311/libnl"
 distfiles="https://github.com/thom311/libnl/releases/download/libnl${version//./_}/libnl-${version}.tar.gz"
-checksum=b7287637ae71c6db6f89e1422c995f0407ff2fe50cecd61a312b6a9b0921f5bf
+checksum=352133ec9545da76f77e70ccb48c9d7e5324d67f6474744647a7ed382b5e05fa
 
 pre_configure() {
 	autoreconf -fi
@@ -28,6 +28,7 @@ libnl3-devel_package() {
 		vmove usr/lib/*.so
 	}
 }
+
 libnl3-progs_package() {
 	short_desc+=" - cli utilities"
 	pkg_install() {
diff --git a/srcpkgs/libnotify/template b/srcpkgs/libnotify/template
index 99ba36df8a0..4f482ae9f82 100644
--- a/srcpkgs/libnotify/template
+++ b/srcpkgs/libnotify/template
@@ -1,23 +1,21 @@
 # Template file for 'libnotify'
 pkgname=libnotify
-version=0.7.8
-revision=1
-build_style=meson
+version=0.7.7
+revision=3
+build_style=gnu-configure
 build_helper="gir"
-configure_args="-Dc_args=-O2 -Dintrospection=$(vopt_if gir enabled disabled)
- -Dgtk_doc=false -Ddocbook_docs=$(vopt_if docbook enabled disabled)"
+configure_args="--disable-static $(vopt_enable gir introspection)"
 hostmakedepends="pkg-config glib-devel"
-makedepends="libglib-devel libpng-devel gdk-pixbuf-devel gtk+3-devel
- $(vopt_if gtk_doc gtk-doc) $(vopt_if docbook 'xmlto docbook-xsl')"
+makedepends="libglib-devel libpng-devel gdk-pixbuf-devel gtk+3-devel"
 short_desc="Desktop notification library"
-maintainer="biopsin <biopsin@yahoo.no>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="http://library.gnome.org/devel/notification-spec/"
 distfiles="${GNOME_SITE}/${pkgname}/0.7/${pkgname}-${version}.tar.xz"
-checksum=69209e0b663776a00c7b6c0e560302a8dbf66b2551d55616304f240bba66e18c
+checksum=9cb4ce315b2655860c524d46b56010874214ec27e854086c1a1d0260137efc04
 
 # Package build options
-build_options="gir docbook"
+build_options="gir"
 build_options_default="gir"
 
 libnotify-devel_package() {
diff --git a/srcpkgs/libnozzle1 b/srcpkgs/libnozzle1
new file mode 120000
index 00000000000..0dca2d60545
--- /dev/null
+++ b/srcpkgs/libnozzle1
@@ -0,0 +1 @@
+libknet1
\ No newline at end of file
diff --git a/srcpkgs/libnozzle1-devel b/srcpkgs/libnozzle1-devel
new file mode 120000
index 00000000000..0dca2d60545
--- /dev/null
+++ b/srcpkgs/libnozzle1-devel
@@ -0,0 +1 @@
+libknet1
\ No newline at end of file
diff --git a/srcpkgs/libogg/template b/srcpkgs/libogg/template
index 5ba98b4258b..ec29abc33c1 100644
--- a/srcpkgs/libogg/template
+++ b/srcpkgs/libogg/template
@@ -1,14 +1,18 @@
-# Template file for 'libogg'.
+# Template file for 'libogg'
 pkgname=libogg
-version=1.3.3
+version=1.3.4
 revision=1
 build_style=gnu-configure
-short_desc="The Ogg bitstream file format library"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD"
+short_desc="Ogg bitstream file format library"
+maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
+license="BSD-3-Clause"
 homepage="http://www.xiph.org/ogg/"
 distfiles="http://downloads.xiph.org/releases/ogg/$pkgname-$version.tar.xz"
-checksum=4f3fc6178a533d392064f14776b23c397ed4b9f48f5de297aba73b643f955c08
+checksum=c163bc12bc300c401b6aa35907ac682671ea376f13ae0969a220f7ddf71893fe
+
+post_install() {
+	vlicense COPYING LICENSE
+}
 
 libogg-devel_package() {
 	depends="libogg>=${version}_${revision}"
diff --git a/srcpkgs/liboping/template b/srcpkgs/liboping/template
index 44b9e705044..8ebdebef50d 100644
--- a/srcpkgs/liboping/template
+++ b/srcpkgs/liboping/template
@@ -1,7 +1,7 @@
 # Template file for 'liboping'
 pkgname=liboping
 version=1.10.0
-revision=6
+revision=7
 build_style=gnu-configure
 hostmakedepends="perl"
 makedepends="ncurses-devel"
@@ -38,7 +38,7 @@ liboping-devel_package() {
 }
 liboping-perl_package() {
 	short_desc+=" - perl bindings"
-	shlib_requires="libperl.so.5.28"
+	shlib_requires="libperl.so.5.30"
 	depends="perl"
 	pkg_install() {
 		vmove usr/share/man/man3/Net::Oping.3p
diff --git a/srcpkgs/libopusenc/template b/srcpkgs/libopusenc/template
index 22970fb9495..cc34301b252 100644
--- a/srcpkgs/libopusenc/template
+++ b/srcpkgs/libopusenc/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="opus-devel"
 short_desc="Library for encoding .opus files"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://git.xiph.org/?p=libopusenc.git"
 distfiles="https://archive.mozilla.org/pub/opus/libopusenc-${version}.tar.gz"
diff --git a/srcpkgs/libosinfo/template b/srcpkgs/libosinfo/template
index d3bc1ab4c9f..afaa912941b 100644
--- a/srcpkgs/libosinfo/template
+++ b/srcpkgs/libosinfo/template
@@ -1,22 +1,22 @@
 # Template file for 'libosinfo'
 pkgname=libosinfo
-version=1.5.0
+version=1.6.0
 revision=1
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-static $(vopt_enable gir introspection)"
 hostmakedepends="glib-devel intltool pkg-config wget
  $(vopt_if vala vala)"
-makedepends="libxslt-devel libglib-devel"
+makedepends="libxslt-devel libglib-devel libsoup-devel"
 depends="osinfo-db"
 checkdepends="libosinfo"
 short_desc="GObject based library API for managing info about operating systems"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://libosinfo.org/"
 changelog="https://gitlab.com/libosinfo/libosinfo/raw/master/NEWS"
 distfiles="https://releases.pagure.org/libosinfo/${pkgname}-${version}.tar.gz"
-checksum=bf692567983478c92bde78d454c18d6196abb032b5a77f430b09a7ef92ec6089
+checksum=3c385c1cceb46301fdc79115e7b28e3df7aa26fafce0a787a60132a86a1990c7
 
 # Package build options
 build_options="gir vala"
diff --git a/srcpkgs/libpcap/patches/fix-musl.patch b/srcpkgs/libpcap/patches/fix-musl.patch
deleted file mode 100644
index 15a0dcad7e4..00000000000
--- a/srcpkgs/libpcap/patches/fix-musl.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- pcap-usb-linux.c
-+++ pcap-usb-linux.c
-@@ -50,6 +50,7 @@
- #include <stdlib.h>
- #include <unistd.h>
- #include <fcntl.h>
-+#include <limits.h>
- #include <string.h>
- #include <dirent.h>
- #include <byteswap.h>
diff --git a/srcpkgs/libpcap/template b/srcpkgs/libpcap/template
index 0f0183ebfe2..e0d42dfa0a1 100644
--- a/srcpkgs/libpcap/template
+++ b/srcpkgs/libpcap/template
@@ -1,6 +1,6 @@
 # Template file for 'libpcap'
 pkgname=libpcap
-version=1.9.0
+version=1.9.1
 revision=1
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-libnl --with-pcap=linux
@@ -9,11 +9,11 @@ hostmakedepends="pkg-config flex"
 makedepends="libnl3-devel $(vopt_if bluetooth libbluetooth-devel)
  $(vopt_if dbus dbus-devel) $(vopt_if usb libusb-devel)"
 short_desc="System-independent interface for user-level packet capture"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="BSD-3-Clause"
 homepage="https://www.tcpdump.org/"
 distfiles="https://www.tcpdump.org/release/${pkgname}-${version}.tar.gz"
-checksum=2edb88808e5913fdaa8e9c1fcaf272e19b2485338742b5074b9fe44d68f37019
+checksum=635237637c5b619bcceba91900666b64d56ecb7be63f298f601ec786ce087094
 
 build_options="bluetooth dbus usb"
 build_options_default="usb"
diff --git a/srcpkgs/libpipeline/template b/srcpkgs/libpipeline/template
index 826a9efe693..b1ffab2d00c 100644
--- a/srcpkgs/libpipeline/template
+++ b/srcpkgs/libpipeline/template
@@ -5,8 +5,8 @@ revision=1
 build_style=gnu-configure
 checkdepends="check-devel pkg-config"
 short_desc="Pipeline manipulation library"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
-license="GPL-3.0-or-alter"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-3.0-or-later"
 homepage="http://libpipeline.nongnu.org/"
 distfiles="https://download-mirror.savannah.gnu.org/releases/libpipeline/libpipeline-${version}.tar.gz"
 checksum=d633706b7d845f08b42bc66ddbe845d57e726bf89298e2cee29f09577e2f902f
diff --git a/srcpkgs/libplacebo/template b/srcpkgs/libplacebo/template
index b1b89537d11..ae932e0f323 100644
--- a/srcpkgs/libplacebo/template
+++ b/srcpkgs/libplacebo/template
@@ -7,7 +7,7 @@ configure_args="-Dvulkan=enabled -Dglslang=enabled -Dshaderc=enabled"
 hostmakedepends="pkg-config"
 makedepends="vulkan-loader glslang-devel shaderc Vulkan-Headers lcms2-devel"
 short_desc="Reusable library for GPU-accelerated video/image rendering"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/haasn/libplacebo"
 distfiles="https://github.com/haasn/libplacebo/archive/v${version}.tar.gz"
diff --git a/srcpkgs/libpsl/template b/srcpkgs/libpsl/template
index f7a3826f97a..cbdd6ba99fd 100644
--- a/srcpkgs/libpsl/template
+++ b/srcpkgs/libpsl/template
@@ -1,11 +1,12 @@
 # Template file for 'libpsl'
 pkgname=libpsl
 version=0.21.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config python"
+makedepends="icu-devel"
 short_desc="Public Suffix List library functions"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://rockdaboot.github.io/libpsl/"
 distfiles="https://github.com/rockdaboot/libpsl/releases/download/libpsl-${version}/libpsl-${version}.tar.gz"
diff --git a/srcpkgs/libpwquality-python3 b/srcpkgs/libpwquality-python3
new file mode 120000
index 00000000000..db26e623f28
--- /dev/null
+++ b/srcpkgs/libpwquality-python3
@@ -0,0 +1 @@
+libpwquality
\ No newline at end of file
diff --git a/srcpkgs/libpwquality/template b/srcpkgs/libpwquality/template
index 3093808c526..e5a656236d7 100644
--- a/srcpkgs/libpwquality/template
+++ b/srcpkgs/libpwquality/template
@@ -1,22 +1,28 @@
 # Template file for 'libpwquality'
 pkgname=libpwquality
-version=1.4.0
+version=1.4.1
 revision=1
 build_style=gnu-configure
-configure_args="--disable-static --enable-pam --disable-python-bindings
- --with-securedir=/usr/lib/security"
+configure_args="--disable-static --enable-pam --with-securedir=/usr/lib/security"
 hostmakedepends="libtool automake gettext-devel"
-makedepends="cracklib-devel pam-devel"
+makedepends="cracklib-devel pam-devel python3-devel"
 conf_files="/etc/security/pwquality.conf"
 short_desc="Library for password quality checking and generating random passwords"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="bra1nwave <brainwave@openmailbox.org>"
+license="GPL-2.0-or-later"
 homepage="https://github.com/libpwquality/libpwquality"
-license="GPL-2"
+changelog="https://raw.githubusercontent.com/libpwquality/libpwquality/master/NEWS"
 distfiles="${homepage}/releases/download/libpwquality-${version}/libpwquality-${version}.tar.bz2"
-checksum=1de6ff046cf2172d265a2cb6f8da439d894f3e4e8157b056c515515232fade6b
+checksum=a97d72b5c56b7e279c6e86dad70c1493ea5796f00a596fb9f3173b96f9bf5e46
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" python3"
+	CFLAGS+=" -I${XBPS_CROSS_BASE}/${py3_inc}"
+fi
 
 pre_configure() {
 	autoreconf -fi
+	vsed -i python/Makefile.am -e 's|CFLAGS=.*|LDSHARED="${CC} -pthread -shared" &|g'
 }
 
 libpwquality-devel_package() {
@@ -26,5 +32,14 @@ libpwquality-devel_package() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
+		vmove usr/share/man/man3
+	}
+}
+
+libpwquality-python3_package() {
+	lib32disabled=yes
+	short_desc+=" - Python3 bindings"
+	pkg_install() {
+		vmove "usr/lib/python3*"
 	}
 }
diff --git a/srcpkgs/libqmatrixclient/template b/srcpkgs/libqmatrixclient/template
index 7b6f01f5b84..cb5854c4d71 100644
--- a/srcpkgs/libqmatrixclient/template
+++ b/srcpkgs/libqmatrixclient/template
@@ -1,17 +1,18 @@
 # Template file for 'libqmatrixclient'
 pkgname=libqmatrixclient
-version=0.5.1.2
+version=0.5.2
 revision=1
+wrksrc="libQuotient-${version}"
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=1 -DQMATRIXCLIENT_INSTALL_EXAMPLE=0"
 hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-devel qt5-multimedia-devel"
-short_desc="Qt5 library to write cross-platfrom clients for Matrix"
+short_desc="Qt5 library to write cross-platform clients for Matrix"
 maintainer="Karol Kosek <krkkx@protonmail.com>"
 license="LGPL-2.1-or-later"
-homepage="https://matrix.org/docs/projects/sdk/libqmatrixclient.html"
-distfiles="https://github.com/QMatrixClient/libqmatrixclient/archive/${version}.tar.gz"
-checksum=c5de2aaef010a1d4d1d81c711bc983366d41c482487c828db3f0e6fa7a6e050d
+homepage="https://matrix.org/docs/projects/sdk/quotient"
+distfiles="https://github.com/quotient-im/libQuotient/archive/${version}.tar.gz"
+checksum=1848bc0af53ce42c2b1a1a4fdeccb054af1f9e0f765cadf609f62727ce23dfd2
 
 libqmatrixclient-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libqtxdg/template b/srcpkgs/libqtxdg/template
index b6efb58ac2e..6e50997334b 100644
--- a/srcpkgs/libqtxdg/template
+++ b/srcpkgs/libqtxdg/template
@@ -1,7 +1,7 @@
 # Template file for 'libqtxdg'
 pkgname=libqtxdg
 version=3.3.1
-revision=2
+revision=3
 build_style=cmake
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools lxqt-build-tools"
 makedepends="qt5-svg-devel"
diff --git a/srcpkgs/libratbag/template b/srcpkgs/libratbag/template
index c1a053d981a..71b280cf705 100644
--- a/srcpkgs/libratbag/template
+++ b/srcpkgs/libratbag/template
@@ -10,7 +10,7 @@ makedepends="elogind-devel eudev-libudev-devel libglib-devel libevdev-devel
  python3-devel"
 depends="dbus python3-evdev python3-gobject"
 short_desc="DBus daemon to configure gaming mice"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/libratbag/libratbag"
 distfiles="https://github.com/libratbag/libratbag/archive/v${version}.tar.gz"
@@ -18,12 +18,6 @@ checksum=d8a9a4b90025456700336c4e84a06edfce8deffeb71779ea22e00c27b0fda244
 
 LDFLAGS="-lm"
 
-case "$XBPS_TARGET_MACHINE" in
-	x86_64*|i686*) ;;
-	*-musl) broken="Requires gobject introspection" ;;
-	* ) ;;
-esac
-
 post_install() {
 	vsv ratbagd
 	vlicense COPYING
diff --git a/srcpkgs/libraw/template b/srcpkgs/libraw/template
index 748ae0111ba..20f1b5e343d 100644
--- a/srcpkgs/libraw/template
+++ b/srcpkgs/libraw/template
@@ -1,6 +1,6 @@
 # Template file for 'libraw'
 pkgname=libraw
-version=0.19.3
+version=0.19.5
 revision=1
 wrksrc="LibRaw-${version}"
 build_style=gnu-configure
@@ -12,7 +12,7 @@ license="LGPL-2.1-only, CDDL-1.0"
 homepage="https://www.libraw.org"
 changelog="https://github.com/LibRaw/LibRaw/raw/${version%.*}-stable/Changelog.txt"
 distfiles="https://www.libraw.org/data/LibRaw-${version}.tar.gz"
-checksum=fd96d6188b8539e0724c89cfa9de392eb28ea71db117ef0661846d76cdc24177
+checksum=40a262d7cc71702711a0faec106118ee004f86c86cc228281d12d16da03e02f5
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/librdkafka/template b/srcpkgs/librdkafka/template
index fafd4daab4f..e38a6fa505e 100644
--- a/srcpkgs/librdkafka/template
+++ b/srcpkgs/librdkafka/template
@@ -1,6 +1,6 @@
 # Template file for 'librdkafka'
 pkgname=librdkafka
-version=1.1.0
+version=1.2.0
 revision=1
 build_style=configure
 configure_args="--prefix=/usr"
@@ -10,7 +10,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/edenhill/librdkafka"
 distfiles="https://github.com/edenhill/librdkafka/archive/v${version}.tar.gz"
-checksum=123b47404c16bcde194b4bd1221c21fdce832ad12912bd8074f88f64b2b86f2b
+checksum=eedde1c96104e4ac2d22a4230e34f35dd60d53976ae2563e3dd7c27190a96859
 
 librdkafka-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 7973ff6974d..6e8685ac0fd 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -254,6 +254,11 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 esac
 
+case "$XBPS_TARGET_MACHINE" in
+	ppc64*) ;;
+	ppc*) makedepends+=" libatomic-devel";;
+esac
+
 CXXFLAGS+=" -DGLM_ENABLE_EXPERIMENTAL -DU_USING_ICU_NAMESPACE=1"
 
 # Move files listed in a <name>_list.txt into $PKGDESTDIR
diff --git a/srcpkgs/librime/template b/srcpkgs/librime/template
index e3fbd400460..540bcfb4e98 100644
--- a/srcpkgs/librime/template
+++ b/srcpkgs/librime/template
@@ -1,6 +1,6 @@
 # Template file for 'librime'
 pkgname=librime
-version=1.4.0
+version=1.5.3
 revision=1
 build_style=cmake
 configure_args="-DENABLE_LOGGING=OFF -DBUILD_TEST=OFF"
@@ -10,7 +10,7 @@ maintainer="Yuxuan Shui <yshuiv7@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/rime/librime"
 distfiles="https://github.com/rime/librime/archive/${version}.tar.gz"
-checksum=26963d9d8b0024ba8d53acbe02d6456d60a8ec506717383995699e0c0063d456
+checksum=df4279df6bc0419c18d9325e7d76dfdab8f91f0ee00a954f19a27f66dd99f503
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/libsass/template b/srcpkgs/libsass/template
index a49c4268253..da214bca923 100644
--- a/srcpkgs/libsass/template
+++ b/srcpkgs/libsass/template
@@ -1,7 +1,8 @@
 # Template file for 'libsass'
 pkgname=libsass
+reverts="3.6.2_1"
 version=3.6.1
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool"
 short_desc="C implementation of Sass CSS preprocessor"
diff --git a/srcpkgs/libsidplayfp/template b/srcpkgs/libsidplayfp/template
index b75d0846a12..c7e831ec584 100644
--- a/srcpkgs/libsidplayfp/template
+++ b/srcpkgs/libsidplayfp/template
@@ -1,6 +1,6 @@
 # Template file for 'libsidplayfp'
 pkgname=libsidplayfp
-version=2.0.0
+version=2.0.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="autoconf"
@@ -9,7 +9,7 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"
 homepage="https://sourceforge.net/projects/sidplay-residfp/"
 distfiles="${SOURCEFORGE_SITE}/sidplay-residfp/${pkgname}/${version%.*}/${pkgname}-${version}.tar.gz"
-checksum=94a2d9f80e71ac1c8328e38ae675e0a0f3806a8ede80510ffa22e16b07045f51
+checksum=7655218ce256694a3b14eeba939d4f2b61bbe0d6a94ebe4ad185b85b13b6989b
 
 libsidplayfp-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/libsigsegv/patches/ppc-musl.patch b/srcpkgs/libsigsegv/patches/ppc-musl.patch
new file mode 100644
index 00000000000..fa04a36f2e7
--- /dev/null
+++ b/srcpkgs/libsigsegv/patches/ppc-musl.patch
@@ -0,0 +1,16 @@
+This fixes build on 32-bit ppc with musl.
+
+--- src/fault-linux-powerpc.h
++++ src/fault-linux-powerpc.h
+@@ -29,9 +29,8 @@
+ #if defined(__powerpc64__) || defined(_ARCH_PPC64) /* 64-bit */
+ # define SIGSEGV_FAULT_STACKPOINTER  ((ucontext_t *) ucp)->uc_mcontext.gp_regs[1]
+ #else /* 32-bit */
+-/* both should be equivalent */
+-# if 0
+-#  define SIGSEGV_FAULT_STACKPOINTER  ((ucontext_t *) ucp)->uc_mcontext.regs->gpr[1]
++# if !defined(__GLIBC__)
++#  define SIGSEGV_FAULT_STACKPOINTER  ((ucontext_t *) ucp)->uc_regs->gregs[1]
+ # else
+ #  define SIGSEGV_FAULT_STACKPOINTER  ((ucontext_t *) ucp)->uc_mcontext.uc_regs->gregs[1]
+ # endif
diff --git a/srcpkgs/libsmbios/template b/srcpkgs/libsmbios/template
index 642a40c867b..31d8ffda65f 100644
--- a/srcpkgs/libsmbios/template
+++ b/srcpkgs/libsmbios/template
@@ -8,7 +8,7 @@ hostmakedepends="automake doxygen gettext-devel help2man libtool pkg-config"
 makedepends="libxml2-devel python3-devel"
 checkdepends="python3"
 short_desc="Library for SMBIOS access"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, OLS-2.1"
 homepage="https://github.com/dell/libsmbios"
 distfiles="https://github.com/dell/libsmbios/archive/v${version}.tar.gz"
diff --git a/srcpkgs/libtickit/template b/srcpkgs/libtickit/template
index c4fb3dd6588..fe57eb13541 100644
--- a/srcpkgs/libtickit/template
+++ b/srcpkgs/libtickit/template
@@ -10,7 +10,7 @@ hostmakedepends="pkg-config"
 makedepends="unibilium-devel libtermkey-devel libtool"
 checkdepends="perl"
 short_desc="Library for building interactive full-screen terminal programs"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://www.leonerd.org.uk/code/libtickit/"
 distfiles="http://www.leonerd.org.uk/code/libtickit/libtickit-${version}.tar.gz"
diff --git a/srcpkgs/libu2f-host/template b/srcpkgs/libu2f-host/template
index f14e04b8ba3..0942b9d03d8 100644
--- a/srcpkgs/libu2f-host/template
+++ b/srcpkgs/libu2f-host/template
@@ -1,7 +1,7 @@
 # Template file for 'libu2f-host'
 pkgname=libu2f-host
-version=1.1.9
-revision=2
+version=1.1.10
+revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl=yes --with-udevrulesdir=/usr/lib/udev/rules.d"
@@ -9,11 +9,11 @@ hostmakedepends="automake gengetopt libtool pkg-config"
 makedepends="hidapi-devel json-c-devel libressl-devel"
 short_desc="C library and tool that implements the host-side of the U2F protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1-or-later, GPL-3-or-later"
+license="LGPL-2.1-or-later, GPL-3.0-or-later"
 homepage="https://developers.yubico.com/libu2f-host/"
 #changelog="https://raw.githubusercontent.com/Yubico/libu2f-host/master/NEWS"
 distfiles="https://github.com/Yubico/libu2f-host/archive/libu2f-host-${version}.tar.gz"
-checksum=f2d9ac7d0bb448d213a81aa3c2e97ae48b277144040c74b5c4f33d871338e93c
+checksum=45937c6c04349f865d9f047d3a68cc50ea24e9085d18ac2c7d31fa38eb749303
 conf_files="/usr/lib/udev/rules.d/70-u2f.rules"
 
 pre_configure() {
@@ -21,7 +21,7 @@ pre_configure() {
 }
 
 post_install() {
-	vsed -e 's:TAG+="uaccess":TAG+="uaccess", MODE="0660", GROUP="users":' \
+	vsed -e 's:GROUP="plugdev":GROUP="users":' \
 		 -i ${DESTDIR}/usr/lib/udev/rules.d/70-u2f.rules
 }
 
diff --git a/srcpkgs/liburcu/template b/srcpkgs/liburcu/template
index 39f6ae05fd5..cad447027e1 100644
--- a/srcpkgs/liburcu/template
+++ b/srcpkgs/liburcu/template
@@ -1,6 +1,6 @@
 # Template file for 'liburcu'
 pkgname=liburcu
-version=0.10.2
+version=0.11.1
 revision=1
 wrksrc="userspace-rcu-${version}"
 build_style=gnu-configure
@@ -10,7 +10,7 @@ maintainer="Simon Thoby <simonthoby@live.fr>"
 license="LGPL-2.1-or-later"
 homepage="https://liburcu.org"
 distfiles="https://www.lttng.org/files/urcu/userspace-rcu-${version}.tar.bz2"
-checksum=b3f6888daf6fe02c1f8097f4a0898e41b5fe9975e121dc792b9ddef4b17261cc
+checksum=92b9971bf3f1c443edd6c09e7bf5ff3b43531e778841f16377a812c8feeb3350
 
 liburcu-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/liburing-devel b/srcpkgs/liburing-devel
new file mode 120000
index 00000000000..84e26155468
--- /dev/null
+++ b/srcpkgs/liburing-devel
@@ -0,0 +1 @@
+liburing
\ No newline at end of file
diff --git a/srcpkgs/liburing/template b/srcpkgs/liburing/template
new file mode 100644
index 00000000000..061f29d1525
--- /dev/null
+++ b/srcpkgs/liburing/template
@@ -0,0 +1,25 @@
+# Template file for 'liburing'
+pkgname=liburing
+version=0.1
+revision=1
+archs="i686* x86_64*"
+build_style=configure
+configure_args="--mandir=/usr/share/man"
+short_desc="Linux-native io_uring I/O access library"
+maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
+license="LGPL-2.1-only"
+homepage="http://git.kernel.dk/cgit/liburing/"
+distfiles="${homepage}/snapshot/${pkgname}-${version}.tar.xz"
+checksum=a018ca58d38d5d4b544bfaa539f8dba60ed30e74ffae91ffbc8bea70d304fc5e
+
+liburing-devel_package() {
+	short_desc+=" - development files"
+	depends="liburing-${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove usr/share/man
+	}
+}
diff --git a/srcpkgs/libuv/template b/srcpkgs/libuv/template
index b3e8d99a126..80b3c0fb6d9 100644
--- a/srcpkgs/libuv/template
+++ b/srcpkgs/libuv/template
@@ -1,6 +1,6 @@
 # Template file for 'libuv'
 pkgname=libuv
-version=1.31.0
+version=1.32.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
@@ -10,7 +10,7 @@ license="MIT, CC-BY-SA-4.0"
 homepage="https://libuv.org/"
 changelog="https://raw.githubusercontent.com/libuv/libuv/v1.x/ChangeLog"
 distfiles="https://github.com/libuv/libuv/archive/v${version}.tar.gz"
-checksum=ab041ea5d1965a33d4e03ea87718b8922ba4e54abb46c71cf9e040edef2556c0
+checksum=c9818f38eee79d4e56f3ae55320d207ab183c5d4aff0fb148b5d6f5702f371cd
 
 LDFLAGS="-pthread"
 
diff --git a/srcpkgs/libva/template b/srcpkgs/libva/template
index 9e38a090ece..dec3914117d 100644
--- a/srcpkgs/libva/template
+++ b/srcpkgs/libva/template
@@ -3,9 +3,11 @@ pkgname=libva
 version=2.5.0
 revision=1
 build_style=meson
-configure_args="-Dwith_glx=no -Dwith_wayland=yes -Dwith_egl=yes"
-hostmakedepends="pkg-config wayland-devel"
-makedepends="libXfixes-devel libXext-devel libdrm-devel wayland-devel"
+configure_args="-Dwith_glx=no $(vopt_if wayland -Dwith_wayland=yes)
+ -Dwith_egl=yes"
+hostmakedepends="pkg-config $(vopt_if wayland wayland-devel)"
+makedepends="libXfixes-devel libXext-devel libdrm-devel
+ $(vopt_if wayland wayland-devel)"
 short_desc="Video Acceleration (VA) API"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
@@ -14,12 +16,15 @@ changelog="https://raw.githubusercontent.com/intel/libva/master/NEWS"
 distfiles="https://github.com/intel/libva/archive/${version}.tar.gz"
 checksum=9b6264dade6b6d3edb59c6c4f3c9217d1d5a195635fc07da875d565f58624418
 
+build_options="wayland"
+build_options_default="wayland"
+
 post_install() {
 	vlicense COPYING
 }
 
 libva-devel_package() {
-	depends="wayland-devel ${sourcepkg}>=${version}_${revision}"
+	depends="$(vopt_if wayland wayland-devel) ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
diff --git a/srcpkgs/libvarnishapi b/srcpkgs/libvarnishapi
new file mode 120000
index 00000000000..1605f8f84bb
--- /dev/null
+++ b/srcpkgs/libvarnishapi
@@ -0,0 +1 @@
+varnish
\ No newline at end of file
diff --git a/srcpkgs/libvarnishapi-devel b/srcpkgs/libvarnishapi-devel
new file mode 120000
index 00000000000..1605f8f84bb
--- /dev/null
+++ b/srcpkgs/libvarnishapi-devel
@@ -0,0 +1 @@
+varnish
\ No newline at end of file
diff --git a/srcpkgs/libversion/template b/srcpkgs/libversion/template
index f2453f4486a..5a2bb2d33c8 100644
--- a/srcpkgs/libversion/template
+++ b/srcpkgs/libversion/template
@@ -1,14 +1,14 @@
 # Template file for 'libversion'
 pkgname=libversion
-version=2.9.0
+version=3.0.0
 revision=1
 build_style=cmake
 short_desc="Advanced version string comparison library"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/repology/libversion"
 distfiles="https://github.com/repology/libversion/archive/${version}.tar.gz"
-checksum=ab95e62759a53c2ea2428b39d2e864589f64137c1150f56d166a4754b34736ea
+checksum=e7e576de4044dd186f642132ee3fec5392d909f69fc8e26590f4c372f92adee0
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/libvirt-python/template b/srcpkgs/libvirt-python/template
index bfdf3e351a1..a2f0e038166 100644
--- a/srcpkgs/libvirt-python/template
+++ b/srcpkgs/libvirt-python/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt-python'
 pkgname=libvirt-python
-version=5.6.0
+version=5.8.0
 revision=1
 build_style=python-module
 pycompile_module="libvirt.py libvirt_lxc.py libvirt_qemu.py"
@@ -10,8 +10,8 @@ short_desc="Libvirt virtualization API Python2 binding"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://pypi.org/project/libvirt-python/"
-distfiles="${PYPI_SITE}/l/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=4df13fed9528a7eec153ab70196dcd481f6377ae5bf9ef84e07dfa1515202486
+distfiles="https://libvirt.org/sources/python/libvirt-python-${version}.tar.gz"
+checksum=4617fa535364a155425dc99f639b3a0fe9f703eb36feb56b3917b5443a1ddf4f
 
 libvirt-python3_package() {
 	short_desc="${short_desc/Python2/Python3}"
diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template
index be48c124409..4468112a048 100644
--- a/srcpkgs/libvirt/template
+++ b/srcpkgs/libvirt/template
@@ -1,7 +1,7 @@
 # Template file for 'libvirt'
 pkgname=libvirt
-version=5.6.0
-revision=1
+version=5.8.0
+revision=2
 build_style=gnu-configure
 configure_args="--without-hal --with-storage-lvm --with-qemu
  --with-qemu-user=libvirt --with-qemu-group=libvirt --without-netcf
@@ -13,19 +13,19 @@ license="LGPL-2.1-or-later"
 homepage="https://libvirt.org"
 changelog="https://libvirt.org/news.html"
 distfiles="https://libvirt.org/sources/${pkgname}-${version}.tar.xz"
-checksum=65f4f9924e10135aa694ca8bcb0b55725883d08e0b32c42111603d573aabb9b4
+checksum=e23328289b18bdedc1e966f6c26402b2983149c660ed8bd52cda6feab0c20c55
 
 # FIX https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=701649
 system_accounts="libvirt"
 libvirt_groups="disk,kvm"
 
 hostmakedepends="automake libtool perl pkg-config lvm2 parted gettext-devel
- iptables libxslt docbook-xsl dnsmasq python"
+ iptables libxslt docbook-xsl dnsmasq python3"
 makedepends="readline-devel libcap-ng-devel libnl3-devel attr-devel
  gnutls-devel libsasl-devel libcurl-devel libpcap-devel libxml2-devel
  libparted-devel device-mapper-devel dbus-devel eudev-libudev-devel libblkid-devel
  libpciaccess-devel avahi-libs-devel polkit-devel yajl-devel jansson-devel
- python-devel libssh2-devel fuse-devel libtirpc-devel
+ python3-devel libssh2-devel fuse-devel libtirpc-devel
  libapparmor-devel"
 depends="iptables dnsmasq"
 
@@ -56,6 +56,7 @@ make_dirs="
 pre_configure() {
 	autoreconf -fi
 }
+
 post_install() {
 	# runit services
 	vsv libvirtd
@@ -65,6 +66,12 @@ post_install() {
 	rm -rf ${DESTDIR}/etc/sysconfig
 	# Remove unused stuff.
 	rm -rf ${DESTDIR}/var/log
+
+	# workaround for musl not providing an utmpx implementation
+	if [ "$XBPS_TARGET_LIBC" = "musl" ];
+	then
+		echo "remember_owner = 0" >> ${DESTDIR}/etc/libvirt/qemu.conf
+	fi
 }
 
 libvirt-devel_package() {
@@ -74,6 +81,6 @@ libvirt-devel_package() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
-		vmove usr/share/gtk-doc
+		vmove usr/share/doc
 	}
 }
diff --git a/srcpkgs/libvoikko/template b/srcpkgs/libvoikko/template
index 1ad274550fc..8d21b0f9c71 100644
--- a/srcpkgs/libvoikko/template
+++ b/srcpkgs/libvoikko/template
@@ -7,7 +7,7 @@ configure_args="--enable-hfst=false --with-dictionary-path=/usr/share/voikko"
 pycompile_module="libvoikko.py"
 hostmakedepends="python3"
 short_desc="Free linguistic software and data for Finnish"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://voikko.puimula.org/"
 distfiles="https://www.puimula.org/voikko-sources/libvoikko/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/libvpx5/template b/srcpkgs/libvpx5/template
index 9aae59228ea..d6ce843134a 100644
--- a/srcpkgs/libvpx5/template
+++ b/srcpkgs/libvpx5/template
@@ -20,6 +20,12 @@ do_configure() {
 			armv7*) _cross="--target=armv7-linux-gcc";;
 			*) _cross="--target=generic-gnu";;
 		esac
+	else
+		# ppc32 is not a supported config, force generic-gnu
+		case "$XBPS_TARGET_MACHINE" in
+			ppc64*) ;;
+			ppc*) _cross="--target=generic-gnu";;
+		esac
 	fi
 	CFLAGS+=" -fPIC"
 
diff --git a/srcpkgs/libvterm/template b/srcpkgs/libvterm/template
index 33cd7b58192..c203793c157 100644
--- a/srcpkgs/libvterm/template
+++ b/srcpkgs/libvterm/template
@@ -1,9 +1,7 @@
 # Template file for 'libvterm'
 pkgname=libvterm
-version=0.0.20151229
-revision=2
-_commit=04c0777b139cfbddb057c0cbfc007677dd9f1b4f
-wrksrc="${pkgname}-${_commit}"
+version=0.1.1
+revision=1
 build_style=gnu-makefile
 make_install_target="install-lib install-inc"
 hostmakedepends="libtool perl pkg-config"
@@ -11,8 +9,8 @@ short_desc="Abstract VT220/xterm/ECMA-48 emulation library"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="MIT"
 homepage="http://www.leonerd.org.uk/code/libvterm"
-distfiles="https://github.com/neovim/${pkgname}/archive/${_commit}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=01a28630fd46fa78b8c05e6caecc9139ef43bc40ff9f225e634326265dfcd4f4
+distfiles="https://launchpad.net/libvterm/trunk/v${version%.*}/+download/libvterm-${version}.tar.gz"
+checksum=9bb88e7c67ea0ac5a0f8d1df3f432d3865e5ff36a778e9a2b34a58aba857b5d8
 
 post_extract() {
 	if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/libwaylandpp/template b/srcpkgs/libwaylandpp/template
index 476c1e1eba8..4aba7b67e68 100644
--- a/srcpkgs/libwaylandpp/template
+++ b/srcpkgs/libwaylandpp/template
@@ -10,7 +10,7 @@ configure_args="-DBUILD_SCANNER=TRUE -DBUILD_LIBRARIES=TRUE
 hostmakedepends="pkg-config doxygen graphviz"
 makedepends="wayland-devel MesaLib-devel pugixml-devel"
 short_desc="Wayland C++ bindings"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/NilsBrause/waylandpp"
 distfiles="https://github.com/NilsBrause/waylandpp/archive/${version}.tar.gz"
diff --git a/srcpkgs/libwebp/template b/srcpkgs/libwebp/template
index e84fd5f7fc9..a8ff2161763 100644
--- a/srcpkgs/libwebp/template
+++ b/srcpkgs/libwebp/template
@@ -8,7 +8,7 @@ configure_args="--disable-static --enable-libwebpmux
 hostmakedepends="pkg-config"
 makedepends="giflib-devel libfreeglut-devel libpng-devel tiff-devel"
 short_desc="WebP image format"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://developers.google.com/speed/webp/"
 distfiles="http://downloads.webmproject.org/releases/webp/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/libxcb/template b/srcpkgs/libxcb/template
index 2a4ea6fb572..8e82e0588b3 100644
--- a/srcpkgs/libxcb/template
+++ b/srcpkgs/libxcb/template
@@ -7,7 +7,7 @@ configure_args="--disable-build-docs --disable-static --enable-xinput --enable-x
 hostmakedepends="automake libtool pkg-config xorg-util-macros xcb-proto"
 makedepends="xcb-proto libXdmcp-devel libXau-devel"
 short_desc="X protocol C-language Binding"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://xcb.freedesktop.org"
 distfiles="${homepage}/dist/${pkgname}-${version}.tar.bz2"
diff --git a/srcpkgs/libxfce4panel b/srcpkgs/libxfce4panel
new file mode 120000
index 00000000000..36ca0abaa74
--- /dev/null
+++ b/srcpkgs/libxfce4panel
@@ -0,0 +1 @@
+xfce4-panel
\ No newline at end of file
diff --git a/srcpkgs/libxkbcommon/template b/srcpkgs/libxkbcommon/template
index 3e7ea0c7d75..332834bbe6c 100644
--- a/srcpkgs/libxkbcommon/template
+++ b/srcpkgs/libxkbcommon/template
@@ -9,7 +9,7 @@ hostmakedepends="pkg-config bison wayland-protocols"
 makedepends="xkeyboard-config libxcb-devel wayland-devel"
 depends="xkeyboard-config"
 short_desc="Library to handle keyboard descriptions"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://xkbcommon.org/"
 distfiles="https://github.com/xkbcommon/libxkbcommon/archive/xkbcommon-${version}.tar.gz"
diff --git a/srcpkgs/libxmlb/template b/srcpkgs/libxmlb/template
index 544f2c54efe..0abddd71a4d 100644
--- a/srcpkgs/libxmlb/template
+++ b/srcpkgs/libxmlb/template
@@ -9,7 +9,7 @@ configure_args="-Dgtkdoc=false -Dtests=false -Dstemmer=false
 hostmakedepends="pkg-config python3"
 makedepends="libglib-devel libuuid-devel"
 short_desc="Library to help create and query binary XML blobs"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/hughsie/libxmlb"
 distfiles="https://github.com/hughsie/libxmlb/archive/${version}.tar.gz"
diff --git a/srcpkgs/libxo/template b/srcpkgs/libxo/template
index cd7baa252aa..a19ed2c80ed 100644
--- a/srcpkgs/libxo/template
+++ b/srcpkgs/libxo/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
 short_desc="Library for programs to output XML, JSON and HTML"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://juniper.github.io/libxo/libxo-manual.html"
 distfiles="https://github.com/Juniper/libxo/releases/download/${version}/libxo-${version}.tar.gz"
diff --git a/srcpkgs/libyaml/template b/srcpkgs/libyaml/template
index 291c57a7b1f..c5cc5a672f6 100644
--- a/srcpkgs/libyaml/template
+++ b/srcpkgs/libyaml/template
@@ -5,7 +5,7 @@ revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool"
 short_desc="Fast YAML 1.1 parser and emitter library"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://pyyaml.org/wiki/LibYAML"
 distfiles="https://github.com/yaml/libyaml/archive/${version}.tar.gz"
diff --git a/srcpkgs/libzim/template b/srcpkgs/libzim/template
index 3cba5ebd729..dd93ba5a4bd 100644
--- a/srcpkgs/libzim/template
+++ b/srcpkgs/libzim/template
@@ -1,6 +1,6 @@
 # Template file for 'libzim'
 pkgname=libzim
-version=5.0.2
+version=6.0.2
 revision=1
 build_style=meson
 hostmakedepends="pkg-config git"
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.openzim.org/wiki/OpenZIM"
 changelog="https://github.com/openzim/libzim/blob/${version}/ChangeLog"
 distfiles="https://github.com/openzim/libzim/archive/${version}.tar.gz"
-checksum=f6106515950433491bd1981abce0c565e86ec70c32b3afdb286a6cb8b8c120e8
+checksum=993b6885b18e54b3df1493895e61f05e525d846f17d0d3cea57fb74f6415b457
 replaces="libzim-tools>=0"
 
 build_options="zlib xapian"
diff --git a/srcpkgs/libzip/template b/srcpkgs/libzip/template
index 1bdca94a900..d2acb87c54f 100644
--- a/srcpkgs/libzip/template
+++ b/srcpkgs/libzip/template
@@ -6,7 +6,7 @@ build_style=cmake
 hostmakedepends="perl groff"
 makedepends="bzip2-devel libressl-devel zlib-devel"
 short_desc="C library for reading, creating, and modifying zip archives"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://libzip.org/"
 distfiles="https://libzip.org/download/libzip-${version}.tar.gz"
diff --git a/srcpkgs/licensechecker/template b/srcpkgs/licensechecker/template
index 83a5089ba49..ec09ba9751f 100644
--- a/srcpkgs/licensechecker/template
+++ b/srcpkgs/licensechecker/template
@@ -7,7 +7,7 @@ build_style=go
 go_import_path=github.com/boyter/lc
 hostmakedepends="git"
 short_desc="Identify software licenses used on a source tree"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/boyter/lc"
 distfiles="https://github.com/boyter/lc/archive/v${version}.tar.gz"
diff --git a/srcpkgs/licensor/template b/srcpkgs/licensor/template
new file mode 100644
index 00000000000..44335c296eb
--- /dev/null
+++ b/srcpkgs/licensor/template
@@ -0,0 +1,15 @@
+# Template file for 'licensor'
+pkgname=licensor
+version=2.0.0
+revision=1
+build_style=cargo
+short_desc="Write licenses to stdout"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="MIT"
+homepage="https://github.com/raftario/licensor"
+distfiles="https://github.com/raftario/licensor/archive/v${version}.tar.gz"
+checksum=9c9b93ac68bd48f62ab31079acd131b71ff96a0a60caf2811bf2670e016fdd1f
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/lightsoff/template b/srcpkgs/lightsoff/template
index 8b74964142c..a817b4185dc 100644
--- a/srcpkgs/lightsoff/template
+++ b/srcpkgs/lightsoff/template
@@ -1,7 +1,7 @@
 # Template file for 'lightsoff'
 pkgname=lightsoff
-version=3.32.0
-revision=2
+version=3.34.0
+revision=1
 build_style=meson
 hostmakedepends="glib-devel itstool pkg-config vala"
 makedepends="clutter-gtk-devel librsvg-devel"
@@ -10,4 +10,4 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Lightsoff"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2e699608163cedcafbf2ea7962ed16a26b7be5b11142da1fa8d6faa4e58a836d
+checksum=daba8cd7950f4258105ebb78c7764f31de479cd205533596ca266c274c02d8fb
diff --git a/srcpkgs/lightzone/template b/srcpkgs/lightzone/template
index 05444b796aa..b1ae0abe33a 100644
--- a/srcpkgs/lightzone/template
+++ b/srcpkgs/lightzone/template
@@ -11,7 +11,7 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="BSD-3-clause"
 homepage="http://www.lightzoneproject.org/"
 distfiles="https://github.com/ktgw0316/LightZone/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=b8e022bc565acdd91ca617cf38098109c9a33febc45641aaf55be7458761a21a
+checksum=b7400ccee7554bc563b47c02af28a0abd4840efa6502984fd83b18bfd337e0f6
 nocross="Cross building dcraw_lz is not supported"
 # JNI binaries are not PIE
 nopie=yes
diff --git a/srcpkgs/links-x11/template b/srcpkgs/links-x11/template
index aee66abbb0d..c5b95549301 100644
--- a/srcpkgs/links-x11/template
+++ b/srcpkgs/links-x11/template
@@ -1,7 +1,7 @@
 # Template file for 'links-x11'
 pkgname=links-x11
-version=2.19
-revision=2
+version=2.20.2
+revision=1
 wrksrc="${pkgname%-x11}-${version}"
 build_style=gnu-configure
 configure_args="--with-ssl --enable-graphics --enable-x"
@@ -13,7 +13,7 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
 license="GPL-2.0-or-later"
 homepage="http://links.twibright.com/"
 distfiles="http://links.twibright.com/download/links-${version}.tar.bz2"
-checksum=70758c7dd9bb70f045407900e0a90f1114947fce832c2f9bdefd5c0158089a0a
+checksum=4b4f07d0e6261118d1365a5a5bfa31e1eafdbd280cfae6f0e9eedfea51a2f424
 conflicts="links"
 
 post_install() {
diff --git a/srcpkgs/links/template b/srcpkgs/links/template
index 06e2249ac96..078442df00f 100644
--- a/srcpkgs/links/template
+++ b/srcpkgs/links/template
@@ -1,7 +1,7 @@
 # Template file for 'links'
 pkgname=links
-version=2.19
-revision=2
+version=2.20.2
+revision=1
 build_style=gnu-configure
 configure_args="--with-ssl --enable-graphics"
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://links.twibright.com/"
 distfiles="http://links.twibright.com/download/links-${version}.tar.bz2"
-checksum=70758c7dd9bb70f045407900e0a90f1114947fce832c2f9bdefd5c0158089a0a
+checksum=4b4f07d0e6261118d1365a5a5bfa31e1eafdbd280cfae6f0e9eedfea51a2f424
 
 post_install() {
 	mkdir -p ${DESTDIR}/usr/share/doc/
diff --git a/srcpkgs/linux-driver-management/template b/srcpkgs/linux-driver-management/template
index d712ca0f834..b110b1d1c3b 100644
--- a/srcpkgs/linux-driver-management/template
+++ b/srcpkgs/linux-driver-management/template
@@ -12,7 +12,7 @@ makedepends="libusb-devel libglib-devel eudev-libudev-devel libgirepository-deve
  xorg-server-devel libkmod-devel gobject-introspection"
 checkdepends="check-devel"
 short_desc="Distro agnostic Plug'n'Play system for Linux"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1"
 homepage="https://github.com/solus-project/linux-driver-management"
 distfiles="https://github.com/solus-project/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/linux-firmware/template b/srcpkgs/linux-firmware/template
index b342b3de9f9..85fa4950879 100644
--- a/srcpkgs/linux-firmware/template
+++ b/srcpkgs/linux-firmware/template
@@ -1,8 +1,8 @@
 # Template file for 'linux-firmware'
 pkgname=linux-firmware
-version=20190717
+version=20190923
 revision=1
-_githash=bf13a71b18af229b4c900b321ef1f8443028ded8
+_githash=417a9c6e197a8d3eec792494efc87a2b42f76324
 archs=noarch
 wrksrc="${pkgname}-${_githash}"
 depends="${pkgname}-amd-${version}_${revision} ${pkgname}-network-${version}_${revision}"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="See /usr/share/licenses/${pkgname}"
 homepage="https://www.kernel.org/"
 distfiles="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/${pkgname}-${_githash}.tar.gz"
-checksum=306b4cbd4237d2cf013e27923df2b721d5d570882a6bf27782c03429be244887
+checksum=42960270d2523266c1ae7bc27d093e94fa5c262b07a2ee5bb7900aff3a41b6b3
 
 do_install() {
 	vmkdir usr/lib/firmware
@@ -72,5 +72,6 @@ linux-firmware-network_package() {
 		vmove usr/lib/firmware/mrvl
 		vmove usr/lib/firmware/ueagle-atm
 		vmove usr/lib/firmware/ti-connectivity
+		vmove usr/lib/firmware/dpaa2
 	}
 }
diff --git a/srcpkgs/linux-tools/patches/musl.patch b/srcpkgs/linux-tools/patches/musl.patch
index 740607a8f7e..d43f29ae2ed 100644
--- a/srcpkgs/linux-tools/patches/musl.patch
+++ b/srcpkgs/linux-tools/patches/musl.patch
@@ -10,10 +10,11 @@
  #include <asm/byteorder.h>
 --- tools/power/x86/turbostat/turbostat.c.orig
 +++ tools/power/x86/turbostat/turbostat.c
-@@ -43,6 +43,7 @@
+@@ -43,7 +43,8 @@
  #include <cpuid.h>
  #include <linux/capability.h>
  #include <errno.h>
+ #include <math.h>
 +#include <limits.h>
  
  char *proc_stat = "/proc/stat";
diff --git a/srcpkgs/linux-tools/patches/turbostat.patch b/srcpkgs/linux-tools/patches/turbostat.patch
deleted file mode 100644
index a060eaa1cd7..00000000000
--- a/srcpkgs/linux-tools/patches/turbostat.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- tools/power/x86/turbostat/Makefile.orig
-+++ tools/power/x86/turbostat/Makefile
-@@ -8,13 +8,13 @@
- endif
- 
- turbostat : turbostat.c
--CFLAGS +=	-Wall
--CFLAGS +=	-DMSRHEADER='"../../../../arch/x86/include/asm/msr-index.h"'
--CFLAGS +=	-DINTEL_FAMILY_HEADER='"../../../../arch/x86/include/asm/intel-family.h"'
-+override CFLAGS +=	-Wall
-+override CFLAGS +=	-DMSRHEADER='"../../../../arch/x86/include/asm/msr-index.h"'
-+override CFLAGS +=	-DINTEL_FAMILY_HEADER='"../../../../arch/x86/include/asm/intel-family.h"'
- 
- %: %.c
- 	@mkdir -p $(BUILD_OUTPUT)
--	$(CC) $(CFLAGS) $< -o $(BUILD_OUTPUT)/$@
-+	$(CC) $(CFLAGS) $< -o $(BUILD_OUTPUT)/$@ $(LDFLAGS)
- 
- .PHONY : clean
- clean :
diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index 5b33eae81a7..6c177c8b580 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'linux-tools'
 pkgname=linux-tools
-version=4.20
+version=5.3.1
 revision=1
 wrksrc="linux-${version}"
 build_style=meta
@@ -13,8 +13,8 @@ short_desc="Linux kernel tools meta-pkg"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
-distfiles="${KERNEL_SITE}/kernel/v4.x/linux-${version}.tar.xz"
-checksum=ad0823183522e743972382df0aa08fb5ae3077f662b125f1e599b0b2aaa12438
+distfiles="${KERNEL_SITE}/kernel/v5.x/linux-${version}.tar.xz"
+checksum=9890b5a909d316211d045a95f5f0680e39749f2319cb26d7cd067efaa692f858
 
 subpackages="cpupower libcpupower libcpupower-devel libusbip libusbip-devel usbip perf freefall tmon"
 
diff --git a/srcpkgs/linux/template b/srcpkgs/linux/template
index 144705af252..84485c2eebc 100644
--- a/srcpkgs/linux/template
+++ b/srcpkgs/linux/template
@@ -1,11 +1,11 @@
 # Template file for 'linux'
 pkgname=linux
-version=4.19
-revision=2
+version=5.2
+revision=1
 build_style=meta
 homepage="http://www.voidlinux.org/"
 short_desc="The Linux kernel meta package"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Lean Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 
 case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/linux3.16/template b/srcpkgs/linux3.16/template
index ad95b8ff1ee..f7a731f7825 100644
--- a/srcpkgs/linux3.16/template
+++ b/srcpkgs/linux3.16/template
@@ -1,6 +1,6 @@
 # Template file for 'linux3.16'
 pkgname=linux3.16
-version=3.16.72
+version=3.16.75
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="${KERNEL_SITE}/kernel/v3.x/linux-${version}.tar.xz"
-checksum=c8ba0f3afd9bce85064ed780d3be7a443c894798b5ac6acfbbd607027180dd82
+checksum=ed1bd5e5e0fc50139b687be27f6847cddc9d759a780b8545bb0b8cb63301211c
 patch_args="-Np1"
 
 _kernver="${version}_${revision}"
diff --git a/srcpkgs/linux4.14/template b/srcpkgs/linux4.14/template
index 725d41ac501..d87edbbf86f 100644
--- a/srcpkgs/linux4.14/template
+++ b/srcpkgs/linux4.14/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.14'
 pkgname=linux4.14
-version=4.14.139
+version=4.14.149
 revision=1
 patch_args="-Np1"
 wrksrc="linux-${version}"
@@ -9,7 +9,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel and modules (${version%.*} series)"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=8c62d495444dba90200740ec770d274780b010e957cfc447f07999d717e37042
+checksum=e69dabd2368440ce1650cda0cf043e1ba3f3343f940a43b68e761739fcb3f296
 
 nodebug=yes  # -dbg package is generated below manually
 nostrip=yes
diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index 948381bee85..be0ee554735 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
-version=4.19.67
+version=4.19.80
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=5a1c3d60c38a7a0a086fcd6fdce5603c31c487852b1b64c071ee6de62c98a502
+checksum=80a9ba764e088aa7fddfef5a97c0236905e291468a37832243b6f3828d36e7ec
 patch_args="-Np1"
 
 nodebug=yes  # -dbg package is generated below manually
diff --git a/srcpkgs/linux4.4/files/i386-dotconfig b/srcpkgs/linux4.4/files/i386-dotconfig
index 6063db86127..55830056944 100644
--- a/srcpkgs/linux4.4/files/i386-dotconfig
+++ b/srcpkgs/linux4.4/files/i386-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 4.4.179 Kernel Configuration
+# Linux/i386 4.4.191 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -7176,6 +7176,7 @@ CONFIG_TEST_STRING_HELPERS=m
 CONFIG_TEST_KSTRTOX=m
 CONFIG_TEST_PRINTF=m
 # CONFIG_TEST_RHASHTABLE is not set
+# CONFIG_TEST_HASH is not set
 # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
 # CONFIG_DMA_API_DEBUG is not set
 # CONFIG_TEST_LKM is not set
diff --git a/srcpkgs/linux4.4/files/x86_64-dotconfig b/srcpkgs/linux4.4/files/x86_64-dotconfig
index 9be64cc009e..aaef40c9351 100644
--- a/srcpkgs/linux4.4/files/x86_64-dotconfig
+++ b/srcpkgs/linux4.4/files/x86_64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 4.4.179 Kernel Configuration
+# Linux/x86_64 4.4.191 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -7256,6 +7256,7 @@ CONFIG_TEST_STRING_HELPERS=m
 CONFIG_TEST_KSTRTOX=m
 CONFIG_TEST_PRINTF=m
 # CONFIG_TEST_RHASHTABLE is not set
+# CONFIG_TEST_HASH is not set
 # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
 # CONFIG_DMA_API_DEBUG is not set
 # CONFIG_TEST_LKM is not set
diff --git a/srcpkgs/linux4.4/patches/gcc9.patch b/srcpkgs/linux4.4/patches/gcc9.patch
deleted file mode 100644
index e367f0c0347..00000000000
--- a/srcpkgs/linux4.4/patches/gcc9.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- include/linux/module.h	2019-06-27 02:13:33.000000000 +0200
-+++ include/linux/module.h	2019-06-29 15:05:26.469682800 +0200
-@@ -127,13 +127,13 @@
- #define module_init(initfn)					\
- 	static inline initcall_t __maybe_unused __inittest(void)		\
- 	{ return initfn; }					\
--	int init_module(void) __attribute__((alias(#initfn)));
-+	int init_module(void) __attribute((__copy__(initfn))) __attribute__((alias(#initfn)));
- 
- /* This is only required if you want to be unloadable. */
- #define module_exit(exitfn)					\
- 	static inline exitcall_t __maybe_unused __exittest(void)		\
- 	{ return exitfn; }					\
--	void cleanup_module(void) __attribute__((alias(#exitfn)));
-+	void cleanup_module(void) __attribute((__copy__(exitfn))) __attribute__((alias(#exitfn)));
- 
- #endif
- 
diff --git a/srcpkgs/linux4.4/template b/srcpkgs/linux4.4/template
index 7bec5788871..a0adea6b297 100644
--- a/srcpkgs/linux4.4/template
+++ b/srcpkgs/linux4.4/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.4'
 pkgname=linux4.4
-version=4.4.189
+version=4.4.196
 revision=1
 wrksrc="linux-${version}"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -8,7 +8,7 @@ homepage="https://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="The Linux kernel and modules (${version%.*} series)"
 distfiles="${KERNEL_SITE}/kernel/v4.x/linux-${version}.tar.xz"
-checksum=974239a3b7713de2ed46da06446cf0a87e97c871d89a87a71f3521fe84d98859
+checksum=169e3f07701336138905bdedd22a0089b45e2e53b9aa6d2ed6c44f215476a76d
 
 nocross=yes
 nodebug=yes
diff --git a/srcpkgs/linux4.9/files/arm64-dotconfig b/srcpkgs/linux4.9/files/arm64-dotconfig
index 20a7ba616be..1e26d295bb1 100644
--- a/srcpkgs/linux4.9/files/arm64-dotconfig
+++ b/srcpkgs/linux4.9/files/arm64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.9.169 Kernel Configuration
+# Linux/arm64 4.9.190 Kernel Configuration
 #
 CONFIG_ARM64=y
 CONFIG_64BIT=y
@@ -6598,6 +6598,7 @@ CONFIG_ARM_SCPI_POWER_DOMAIN=y
 # CONFIG_FIRMWARE_MEMMAP is not set
 CONFIG_DMIID=y
 CONFIG_DMI_SYSFS=y
+CONFIG_ISCSI_IBFT=m
 CONFIG_RASPBERRYPI_FIRMWARE=y
 # CONFIG_FW_CFG_SYSFS is not set
 CONFIG_QCOM_SCM=y
diff --git a/srcpkgs/linux4.9/template b/srcpkgs/linux4.9/template
index fadc53383e8..5fbd7f49484 100644
--- a/srcpkgs/linux4.9/template
+++ b/srcpkgs/linux4.9/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.9'
 pkgname=linux4.9
-version=4.9.189
+version=4.9.196
 revision=1
 patch_args="-Np1"
 wrksrc="linux-${version}"
@@ -9,7 +9,7 @@ homepage="https://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel and modules (${version%.*} series)"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=93d945661246f726b694455c80c140717d2beff5a718445a51183439bbe5d0b3
+checksum=e0ab12b04a975630ece2142a1ac15cfe45140b8c3359226b035c15ca7c92c6ef
 
 nodebug=yes  # -dbg package is generated below manually
 nostrip=yes
diff --git a/srcpkgs/linux5.1-dbg b/srcpkgs/linux5.1-dbg
deleted file mode 120000
index c81974f85e6..00000000000
--- a/srcpkgs/linux5.1-dbg
+++ /dev/null
@@ -1 +0,0 @@
-linux5.1
\ No newline at end of file
diff --git a/srcpkgs/linux5.1-headers b/srcpkgs/linux5.1-headers
deleted file mode 120000
index c81974f85e6..00000000000
--- a/srcpkgs/linux5.1-headers
+++ /dev/null
@@ -1 +0,0 @@
-linux5.1
\ No newline at end of file
diff --git a/srcpkgs/linux5.2/files/x86_64-dotconfig b/srcpkgs/linux5.2/files/x86_64-dotconfig
index b9609bb0ca9..a8eca2f5a15 100644
--- a/srcpkgs/linux5.2/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.2/files/x86_64-dotconfig
@@ -355,7 +355,7 @@ CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y
 CONFIG_NR_CPUS_RANGE_BEGIN=2
 CONFIG_NR_CPUS_RANGE_END=512
 CONFIG_NR_CPUS_DEFAULT=64
-CONFIG_NR_CPUS=64
+CONFIG_NR_CPUS=256
 CONFIG_SCHED_SMT=y
 CONFIG_SCHED_MC=y
 CONFIG_SCHED_MC_PRIO=y
diff --git a/srcpkgs/linux5.2/template b/srcpkgs/linux5.2/template
index ab84f9f24bf..2e9e9ab9185 100644
--- a/srcpkgs/linux5.2/template
+++ b/srcpkgs/linux5.2/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.2'
 pkgname=linux5.2
-version=5.2.9
+version=5.2.21
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=b6f02a4b306ca5cd314d72615bfc2650166969613135da202630e6c4e1b5d4e6
+checksum=9a8ee3ff75dabffa76141c8dc7529dfbb3ca07888a3708a13f15b412268b3538
 patch_args="-Np1"
 
 nodebug=yes  # -dbg package is generated below manually
diff --git a/srcpkgs/linux5.3-dbg b/srcpkgs/linux5.3-dbg
new file mode 120000
index 00000000000..fdc7705758b
--- /dev/null
+++ b/srcpkgs/linux5.3-dbg
@@ -0,0 +1 @@
+linux5.3
\ No newline at end of file
diff --git a/srcpkgs/linux5.3-headers b/srcpkgs/linux5.3-headers
new file mode 120000
index 00000000000..fdc7705758b
--- /dev/null
+++ b/srcpkgs/linux5.3-headers
@@ -0,0 +1 @@
+linux5.3
\ No newline at end of file
diff --git a/srcpkgs/linux5.1/files/DocBook/Makefile b/srcpkgs/linux5.3/files/DocBook/Makefile
similarity index 100%
rename from srcpkgs/linux5.1/files/DocBook/Makefile
rename to srcpkgs/linux5.3/files/DocBook/Makefile
diff --git a/srcpkgs/linux5.1/files/arm-dotconfig b/srcpkgs/linux5.3/files/arm-dotconfig
similarity index 91%
rename from srcpkgs/linux5.1/files/arm-dotconfig
rename to srcpkgs/linux5.3/files/arm-dotconfig
index c74059779f6..953e48769aa 100644
--- a/srcpkgs/linux5.1/files/arm-dotconfig
+++ b/srcpkgs/linux5.3/files/arm-dotconfig
@@ -1,14 +1,15 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 5.1.18 Kernel Configuration
+# Linux/arm 5.3.0 Kernel Configuration
 #
 
 #
-# Compiler: arm-linux-gnueabihf-gcc (GCC) 9.1.0
+# Compiler: armv7l-linux-gnueabihf-gcc (GCC) 9.2.0
 #
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=90100
+CONFIG_GCC_VERSION=90200
 CONFIG_CLANG_VERSION=0
+CONFIG_CC_CAN_LINK=y
 CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y
 CONFIG_CC_DISABLE_WARN_MAYBE_UNINITIALIZED=y
@@ -21,6 +22,7 @@ CONFIG_BUILDTIME_EXTABLE_SORT=y
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 # CONFIG_COMPILE_TEST is not set
+# CONFIG_HEADER_TEST is not set
 CONFIG_LOCALVERSION="_1"
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_BUILD_SALT=""
@@ -58,6 +60,8 @@ CONFIG_HANDLE_DOMAIN_IRQ=y
 CONFIG_IRQ_FORCED_THREADING=y
 CONFIG_SPARSE_IRQ=y
 # CONFIG_GENERIC_IRQ_DEBUGFS is not set
+# end of IRQ subsystem
+
 CONFIG_GENERIC_IRQ_MULTI_HANDLER=y
 CONFIG_ARCH_CLOCKSOURCE_DATA=y
 CONFIG_GENERIC_CLOCKEVENTS=y
@@ -71,10 +75,13 @@ CONFIG_NO_HZ_COMMON=y
 CONFIG_NO_HZ_IDLE=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
+# end of Timers subsystem
+
 # CONFIG_PREEMPT_NONE is not set
 # CONFIG_PREEMPT_VOLUNTARY is not set
 CONFIG_PREEMPT=y
 CONFIG_PREEMPT_COUNT=y
+CONFIG_PREEMPTION=y
 
 #
 # CPU/Task time and stats accounting
@@ -88,7 +95,9 @@ CONFIG_TASKSTATS=y
 CONFIG_TASK_DELAY_ACCT=y
 CONFIG_TASK_XACCT=y
 CONFIG_TASK_IO_ACCOUNTING=y
-# CONFIG_PSI is not set
+CONFIG_PSI=y
+CONFIG_PSI_DEFAULT_DISABLED=y
+# end of CPU/Task time and stats accounting
 
 #
 # RCU Subsystem
@@ -100,15 +109,23 @@ CONFIG_TREE_SRCU=y
 CONFIG_TASKS_RCU=y
 CONFIG_RCU_STALL_COMMON=y
 CONFIG_RCU_NEED_SEGCBLIST=y
+# end of RCU Subsystem
+
 CONFIG_BUILD_BIN2C=y
 # CONFIG_IKCONFIG is not set
+CONFIG_IKHEADERS=m
 CONFIG_LOG_BUF_SHIFT=17
 CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
 CONFIG_GENERIC_SCHED_CLOCK=y
+
+#
+# Scheduler features
+#
+# end of Scheduler features
+
 CONFIG_CGROUPS=y
 # CONFIG_MEMCG is not set
 CONFIG_BLK_CGROUP=y
-# CONFIG_DEBUG_BLK_CGROUP is not set
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
 # CONFIG_CFS_BANDWIDTH is not set
@@ -143,7 +160,6 @@ CONFIG_RD_LZ4=y
 # CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_SYSCTL=y
-CONFIG_ANON_INODES=y
 CONFIG_HAVE_UID16=y
 CONFIG_BPF=y
 CONFIG_EXPERT=y
@@ -188,6 +204,8 @@ CONFIG_PERF_USE_VMALLOC=y
 #
 CONFIG_PERF_EVENTS=y
 # CONFIG_DEBUG_PERF_USE_VMALLOC is not set
+# end of Kernel Performance Events And Counters
+
 CONFIG_VM_EVENT_COUNTERS=y
 # CONFIG_COMPAT_BRK is not set
 CONFIG_SLAB=y
@@ -195,9 +213,12 @@ CONFIG_SLAB=y
 # CONFIG_SLOB is not set
 CONFIG_SLAB_MERGE_DEFAULT=y
 CONFIG_SLAB_FREELIST_RANDOM=y
+CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
 CONFIG_SYSTEM_DATA_VERIFICATION=y
 CONFIG_PROFILING=y
 CONFIG_TRACEPOINTS=y
+# end of General setup
+
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -205,7 +226,6 @@ CONFIG_HAVE_PROC_CPU=y
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 CONFIG_FIX_EARLYCON_MEM=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
@@ -224,7 +244,6 @@ CONFIG_ARCH_MULTIPLATFORM=y
 # CONFIG_ARCH_EBSA110 is not set
 # CONFIG_ARCH_EP93XX is not set
 # CONFIG_ARCH_FOOTBRIDGE is not set
-# CONFIG_ARCH_NETX is not set
 # CONFIG_ARCH_IOP13XX is not set
 # CONFIG_ARCH_IOP32X is not set
 # CONFIG_ARCH_IOP33X is not set
@@ -254,6 +273,8 @@ CONFIG_ARCH_MULTI_V4_V5=y
 # CONFIG_ARCH_MULTI_V6 is not set
 # CONFIG_ARCH_MULTI_V7 is not set
 CONFIG_ARCH_MULTI_CPU_AUTO=y
+# end of Multiple platform selection
+
 # CONFIG_MACH_ASM9260 is not set
 # CONFIG_ARCH_ASPEED is not set
 # CONFIG_ARCH_AT91 is not set
@@ -309,10 +330,12 @@ CONFIG_CACHE_FEROCEON_L2=y
 CONFIG_ARM_L1_CACHE_SHIFT=5
 CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y
 CONFIG_DEBUG_ALIGN_RODATA=y
+# end of System Type
 
 #
 # Bus support
 #
+# end of Bus support
 
 #
 # Kernel Features
@@ -346,6 +369,7 @@ CONFIG_UACCESS_WITH_MEMCPY=y
 # CONFIG_SECCOMP is not set
 CONFIG_PARAVIRT=y
 # CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
+# end of Kernel Features
 
 #
 # Boot options
@@ -365,6 +389,7 @@ CONFIG_ATAGS_PROC=y
 # CONFIG_CRASH_DUMP is not set
 CONFIG_AUTO_ZRELADDR=y
 # CONFIG_EFI is not set
+# end of Boot options
 
 #
 # CPU Power Management
@@ -394,6 +419,7 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
 # CONFIG_CPUFREQ_DT is not set
 CONFIG_ARM_KIRKWOOD_CPUFREQ=y
 # CONFIG_QORIQ_CPUFREQ is not set
+# end of CPU Frequency scaling
 
 #
 # CPU Idle
@@ -409,6 +435,9 @@ CONFIG_CPU_IDLE_GOV_TEO=y
 # CONFIG_ARM_CPUIDLE is not set
 CONFIG_ARM_KIRKWOOD_CPUIDLE=y
 # CONFIG_ARM_MVEBU_V7_CPUIDLE is not set
+# end of ARM CPU Idle Drivers
+# end of CPU Idle
+# end of CPU Power Management
 
 #
 # Floating point emulation
@@ -421,6 +450,7 @@ CONFIG_FPE_NWFPE=y
 # CONFIG_FPE_NWFPE_XP is not set
 # CONFIG_FPE_FASTFPE is not set
 # CONFIG_VFP is not set
+# end of Floating point emulation
 
 #
 # Power management options
@@ -448,6 +478,7 @@ CONFIG_CPU_PM=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ARM_CPU_SUSPEND=y
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+# end of Power management options
 
 #
 # Firmware Drivers
@@ -459,6 +490,9 @@ CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 #
 # Tegra firmware driver
 #
+# end of Tegra firmware driver
+# end of Firmware Drivers
+
 # CONFIG_ARM_CRYPTO is not set
 # CONFIG_VIRTUALIZATION is not set
 
@@ -482,6 +516,7 @@ CONFIG_HAVE_DMA_CONTIGUOUS=y
 CONFIG_GENERIC_SMP_IDLE_THREAD=y
 CONFIG_GENERIC_IDLE_POLL_SETUP=y
 CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
+CONFIG_ARCH_HAS_KEEPINITRD=y
 CONFIG_ARCH_HAS_SET_MEMORY=y
 CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y
 CONFIG_ARCH_32BIT_OFF_T=y
@@ -517,19 +552,28 @@ CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
 CONFIG_STRICT_MODULE_RWX=y
 CONFIG_ARCH_HAS_PHYS_TO_DMA=y
 CONFIG_REFCOUNT_FULL=y
+# CONFIG_LOCK_EVENT_COUNTS is not set
 
 #
 # GCOV-based kernel profiling
 #
 # CONFIG_GCOV_KERNEL is not set
 CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
+# end of GCOV-based kernel profiling
+
 CONFIG_PLUGIN_HOSTCC="g++"
 CONFIG_HAVE_GCC_PLUGINS=y
 CONFIG_GCC_PLUGINS=y
+
+#
+# GCC plugins
+#
 # CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set
-CONFIG_GCC_PLUGIN_LATENT_ENTROPY=y
-# CONFIG_GCC_PLUGIN_STRUCTLEAK is not set
+# CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
 # CONFIG_GCC_PLUGIN_RANDSTRUCT is not set
+# end of GCC plugins
+# end of General architecture-dependent options
+
 CONFIG_RT_MUTEXES=y
 CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
@@ -542,7 +586,6 @@ CONFIG_MODVERSIONS=y
 # CONFIG_MODULE_COMPRESS is not set
 CONFIG_MODULES_TREE_LOOKUP=y
 CONFIG_BLOCK=y
-CONFIG_LBDAF=y
 CONFIG_BLK_SCSI_REQUEST=y
 CONFIG_BLK_DEV_BSG=y
 CONFIG_BLK_DEV_BSGLIB=y
@@ -585,6 +628,8 @@ CONFIG_KARMA_PARTITION=y
 CONFIG_EFI_PARTITION=y
 # CONFIG_SYSV68_PARTITION is not set
 # CONFIG_CMDLINE_PARTITION is not set
+# end of Partition Types
+
 CONFIG_BLK_MQ_PCI=y
 CONFIG_BLK_MQ_VIRTIO=y
 CONFIG_BLK_PM=y
@@ -596,6 +641,9 @@ CONFIG_MQ_IOSCHED_DEADLINE=m
 CONFIG_MQ_IOSCHED_KYBER=m
 CONFIG_IOSCHED_BFQ=m
 CONFIG_BFQ_GROUP_IOSCHED=y
+# CONFIG_BFQ_CGROUP_DEBUG is not set
+# end of IO Schedulers
+
 CONFIG_ASN1=y
 CONFIG_UNINLINE_SPIN_UNLOCK=y
 CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
@@ -609,15 +657,19 @@ CONFIG_BINFMT_ELF_FDPIC=y
 CONFIG_ELFCORE=y
 CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 CONFIG_BINFMT_SCRIPT=y
+CONFIG_ARCH_HAS_BINFMT_FLAT=y
 # CONFIG_BINFMT_FLAT is not set
+CONFIG_BINFMT_FLAT_ARGVP_ENVP_ON_STACK=y
 CONFIG_BINFMT_MISC=m
 CONFIG_COREDUMP=y
+# end of Executable file formats
 
 #
 # Memory Management options
 #
 CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
+CONFIG_ARCH_KEEP_MEMBLOCK=y
 CONFIG_SPLIT_PTLOCK_CPUS=999999
 CONFIG_MEMORY_BALLOON=y
 CONFIG_BALLOON_COMPACTION=y
@@ -641,6 +693,8 @@ CONFIG_GENERIC_EARLY_IOREMAP=y
 CONFIG_FRAME_VECTOR=y
 # CONFIG_PERCPU_STATS is not set
 # CONFIG_GUP_BENCHMARK is not set
+# end of Memory Management options
+
 CONFIG_NET=y
 CONFIG_NET_INGRESS=y
 CONFIG_NET_EGRESS=y
@@ -701,9 +755,6 @@ CONFIG_INET_ESP_OFFLOAD=m
 CONFIG_INET_IPCOMP=m
 CONFIG_INET_XFRM_TUNNEL=m
 CONFIG_INET_TUNNEL=m
-CONFIG_INET_XFRM_MODE_TRANSPORT=m
-CONFIG_INET_XFRM_MODE_TUNNEL=m
-CONFIG_INET_XFRM_MODE_BEET=m
 CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 CONFIG_INET_UDP_DIAG=m
@@ -742,10 +793,6 @@ CONFIG_IPV6_MIP6=m
 # CONFIG_IPV6_ILA is not set
 CONFIG_INET6_XFRM_TUNNEL=m
 CONFIG_INET6_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-CONFIG_INET6_XFRM_MODE_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_BEET=m
-CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
 CONFIG_IPV6_VTI=m
 CONFIG_IPV6_SIT=m
 CONFIG_IPV6_SIT_6RD=y
@@ -811,7 +858,6 @@ CONFIG_NF_CT_NETLINK=m
 CONFIG_NF_CT_NETLINK_TIMEOUT=m
 # CONFIG_NETFILTER_NETLINK_GLUE_CT is not set
 CONFIG_NF_NAT=m
-CONFIG_NF_NAT_NEEDED=y
 CONFIG_NF_NAT_AMANDA=m
 CONFIG_NF_NAT_FTP=m
 CONFIG_NF_NAT_IRC=m
@@ -846,6 +892,7 @@ CONFIG_NFT_XFRM=m
 CONFIG_NFT_SOCKET=m
 CONFIG_NFT_OSF=m
 CONFIG_NFT_TPROXY=m
+# CONFIG_NFT_SYNPROXY is not set
 CONFIG_NF_FLOW_TABLE_INET=m
 CONFIG_NF_FLOW_TABLE=m
 CONFIG_NETFILTER_XTABLES=m
@@ -880,6 +927,7 @@ CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
 CONFIG_NETFILTER_XT_TARGET_RATEEST=m
 CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
+CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m
 CONFIG_NETFILTER_XT_TARGET_TEE=m
 CONFIG_NETFILTER_XT_TARGET_TPROXY=m
 CONFIG_NETFILTER_XT_TARGET_TRACE=m
@@ -936,6 +984,8 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m
 CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
 CONFIG_NETFILTER_XT_MATCH_TIME=m
 CONFIG_NETFILTER_XT_MATCH_U32=m
+# end of Core Netfilter Configuration
+
 CONFIG_IP_SET=m
 CONFIG_IP_SET_MAX=256
 CONFIG_IP_SET_BITMAP_IP=m
@@ -1010,7 +1060,6 @@ CONFIG_NF_DEFRAG_IPV4=m
 CONFIG_NF_SOCKET_IPV4=m
 CONFIG_NF_TPROXY_IPV4=m
 CONFIG_NF_TABLES_IPV4=y
-CONFIG_NFT_CHAIN_ROUTE_IPV4=m
 CONFIG_NFT_REJECT_IPV4=m
 CONFIG_NFT_DUP_IPV4=m
 CONFIG_NFT_FIB_IPV4=m
@@ -1044,6 +1093,7 @@ CONFIG_IP_NF_SECURITY=m
 CONFIG_IP_NF_ARPTABLES=m
 CONFIG_IP_NF_ARPFILTER=m
 CONFIG_IP_NF_ARP_MANGLE=m
+# end of IP: Netfilter Configuration
 
 #
 # IPv6: Netfilter Configuration
@@ -1051,7 +1101,6 @@ CONFIG_IP_NF_ARP_MANGLE=m
 CONFIG_NF_SOCKET_IPV6=m
 CONFIG_NF_TPROXY_IPV6=m
 CONFIG_NF_TABLES_IPV6=y
-CONFIG_NFT_CHAIN_ROUTE_IPV6=m
 CONFIG_NFT_REJECT_IPV6=m
 CONFIG_NFT_DUP_IPV6=m
 CONFIG_NFT_FIB_IPV6=m
@@ -1080,8 +1129,11 @@ CONFIG_IP6_NF_SECURITY=m
 CONFIG_IP6_NF_NAT=m
 CONFIG_IP6_NF_TARGET_MASQUERADE=m
 CONFIG_IP6_NF_TARGET_NPT=m
+# end of IPv6: Netfilter Configuration
+
 CONFIG_NF_DEFRAG_IPV6=m
 # CONFIG_NF_TABLES_BRIDGE is not set
+# CONFIG_NF_CONNTRACK_BRIDGE is not set
 CONFIG_BRIDGE_NF_EBTABLES=m
 CONFIG_BRIDGE_EBT_BROUTE=m
 CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -1114,11 +1166,14 @@ CONFIG_INET_DCCP_DIAG=m
 CONFIG_IP_DCCP_CCID3=y
 # CONFIG_IP_DCCP_CCID3_DEBUG is not set
 CONFIG_IP_DCCP_TFRC_LIB=y
+# end of DCCP CCIDs Configuration
 
 #
 # DCCP Kernel Hacking
 #
 # CONFIG_IP_DCCP_DEBUG is not set
+# end of DCCP Kernel Hacking
+
 CONFIG_IP_SCTP=m
 # CONFIG_SCTP_DBG_OBJCNT is not set
 CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5=y
@@ -1152,17 +1207,21 @@ CONFIG_BRIDGE_IGMP_SNOOPING=y
 # CONFIG_BRIDGE_VLAN_FILTERING is not set
 CONFIG_HAVE_NET_DSA=y
 CONFIG_NET_DSA=m
-CONFIG_NET_DSA_LEGACY=y
-CONFIG_NET_DSA_TAG_BRCM=y
-CONFIG_NET_DSA_TAG_BRCM_PREPEND=y
-CONFIG_NET_DSA_TAG_DSA=y
-CONFIG_NET_DSA_TAG_EDSA=y
-CONFIG_NET_DSA_TAG_GSWIP=y
-CONFIG_NET_DSA_TAG_KSZ=y
-CONFIG_NET_DSA_TAG_KSZ9477=y
-CONFIG_NET_DSA_TAG_MTK=y
-CONFIG_NET_DSA_TAG_TRAILER=y
-CONFIG_NET_DSA_TAG_QCA=y
+CONFIG_NET_DSA_TAG_8021Q=m
+CONFIG_NET_DSA_TAG_BRCM_COMMON=m
+CONFIG_NET_DSA_TAG_BRCM=m
+CONFIG_NET_DSA_TAG_BRCM_PREPEND=m
+CONFIG_NET_DSA_TAG_GSWIP=m
+CONFIG_NET_DSA_TAG_DSA=m
+CONFIG_NET_DSA_TAG_EDSA=m
+CONFIG_NET_DSA_TAG_MTK=m
+CONFIG_NET_DSA_TAG_KSZ_COMMON=m
+CONFIG_NET_DSA_TAG_KSZ=m
+CONFIG_NET_DSA_TAG_KSZ9477=m
+CONFIG_NET_DSA_TAG_QCA=m
+CONFIG_NET_DSA_TAG_LAN9303=m
+CONFIG_NET_DSA_TAG_SJA1105=m
+CONFIG_NET_DSA_TAG_TRAILER=m
 CONFIG_VLAN_8021Q=m
 CONFIG_VLAN_8021Q_GVRP=y
 # CONFIG_VLAN_8021Q_MVRP is not set
@@ -1274,16 +1333,18 @@ CONFIG_NET_ACT_PEDIT=m
 CONFIG_NET_ACT_SIMP=m
 CONFIG_NET_ACT_SKBEDIT=m
 CONFIG_NET_ACT_CSUM=m
+# CONFIG_NET_ACT_MPLS is not set
 CONFIG_NET_ACT_VLAN=m
 CONFIG_NET_ACT_BPF=m
 CONFIG_NET_ACT_CONNMARK=m
+# CONFIG_NET_ACT_CTINFO is not set
 # CONFIG_NET_ACT_SKBMOD is not set
 CONFIG_NET_ACT_IFE=m
 CONFIG_NET_ACT_TUNNEL_KEY=m
+# CONFIG_NET_ACT_CT is not set
 CONFIG_NET_IFE_SKBMARK=m
 CONFIG_NET_IFE_SKBPRIO=m
 CONFIG_NET_IFE_SKBTCINDEX=m
-CONFIG_NET_CLS_IND=y
 CONFIG_NET_SCH_FIFO=y
 CONFIG_DCB=y
 CONFIG_DNS_RESOLVER=y
@@ -1295,6 +1356,7 @@ CONFIG_BATMAN_ADV_BLA=y
 # CONFIG_BATMAN_ADV_MCAST is not set
 CONFIG_BATMAN_ADV_DEBUGFS=y
 # CONFIG_BATMAN_ADV_DEBUG is not set
+CONFIG_BATMAN_ADV_SYSFS=y
 # CONFIG_BATMAN_ADV_TRACING is not set
 # CONFIG_OPENVSWITCH is not set
 # CONFIG_VSOCKETS is not set
@@ -1317,6 +1379,9 @@ CONFIG_BQL=y
 #
 CONFIG_NET_PKTGEN=m
 CONFIG_NET_DROP_MONITOR=y
+# end of Network testing
+# end of Networking options
+
 CONFIG_HAMRADIO=y
 
 #
@@ -1338,6 +1403,8 @@ CONFIG_BAYCOM_SER_HDX=m
 CONFIG_BAYCOM_PAR=m
 CONFIG_BAYCOM_EPP=m
 CONFIG_YAM=m
+# end of AX.25 network device drivers
+
 CONFIG_CAN=m
 CONFIG_CAN_RAW=m
 CONFIG_CAN_BCM=m
@@ -1375,6 +1442,7 @@ CONFIG_CAN_SOFTING=m
 #
 # CONFIG_CAN_HI311X is not set
 CONFIG_CAN_MCP251X=m
+# end of CAN SPI interfaces
 
 #
 # CAN USB interfaces
@@ -1387,7 +1455,11 @@ CONFIG_CAN_ESD_USB2=m
 CONFIG_CAN_MCBA_USB=m
 # CONFIG_CAN_PEAK_USB is not set
 CONFIG_CAN_UCAN=m
+# end of CAN USB interfaces
+
 # CONFIG_CAN_DEBUG_DEVICES is not set
+# end of CAN Device Drivers
+
 CONFIG_BT=m
 CONFIG_BT_BREDR=y
 CONFIG_BT_RFCOMM=m
@@ -1413,6 +1485,7 @@ CONFIG_BT_RTL=m
 CONFIG_BT_HCIBTUSB=m
 CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
 CONFIG_BT_HCIBTUSB_BCM=y
+# CONFIG_BT_HCIBTUSB_MTK is not set
 CONFIG_BT_HCIBTUSB_RTL=y
 CONFIG_BT_HCIBTSDIO=m
 CONFIG_BT_HCIUART=m
@@ -1436,7 +1509,10 @@ CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
 CONFIG_BT_ATH3K=m
 # CONFIG_BT_WILINK is not set
+CONFIG_BT_MTKSDIO=m
 CONFIG_BT_MTKUART=m
+# end of Bluetooth device drivers
+
 CONFIG_AF_RXRPC=m
 CONFIG_AF_RXRPC_IPV6=y
 # CONFIG_AF_RXRPC_INJECT_LOSS is not set
@@ -1546,6 +1622,8 @@ CONFIG_PCI_MVEBU=y
 # Cadence PCIe controllers support
 #
 # CONFIG_PCIE_CADENCE_HOST is not set
+# end of Cadence PCIe controllers support
+
 # CONFIG_PCI_FTPCI100 is not set
 # CONFIG_PCI_HOST_GENERIC is not set
 CONFIG_PCIE_XILINX=y
@@ -1555,16 +1633,21 @@ CONFIG_PCIE_XILINX=y
 #
 # DesignWare PCI Core Support
 #
+# end of DesignWare PCI Core Support
+# end of PCI controller drivers
 
 #
 # PCI Endpoint
 #
 # CONFIG_PCI_ENDPOINT is not set
+# end of PCI Endpoint
 
 #
 # PCI switch controller drivers
 #
 # CONFIG_PCI_SW_SWITCHTEC is not set
+# end of PCI switch controller drivers
+
 # CONFIG_PCCARD is not set
 CONFIG_RAPIDIO=m
 CONFIG_RAPIDIO_TSI721=m
@@ -1584,6 +1667,7 @@ CONFIG_RAPIDIO_CPS_XX=m
 CONFIG_RAPIDIO_TSI568=m
 CONFIG_RAPIDIO_CPS_GEN2=m
 CONFIG_RAPIDIO_RXS_GEN3=m
+# end of RapidIO Switch drivers
 
 #
 # Generic Driver Options
@@ -1601,6 +1685,9 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
 CONFIG_EXTRA_FIRMWARE=""
 # CONFIG_FW_LOADER_USER_HELPER is not set
+# CONFIG_FW_LOADER_COMPRESS is not set
+# end of Firmware loader
+
 CONFIG_WANT_DEV_COREDUMP=y
 CONFIG_ALLOW_DEV_COREDUMP=y
 CONFIG_DEV_COREDUMP=y
@@ -1617,6 +1704,7 @@ CONFIG_REGMAP_MMIO=y
 CONFIG_REGMAP_IRQ=y
 CONFIG_DMA_SHARED_BUFFER=y
 # CONFIG_DMA_FENCE_TRACE is not set
+# end of Generic Driver Options
 
 #
 # Bus devices
@@ -1627,6 +1715,8 @@ CONFIG_MVEBU_MBUS=y
 # CONFIG_SUN50I_DE2_BUS is not set
 CONFIG_SUNXI_RSB=m
 # CONFIG_VEXPRESS_CONFIG is not set
+# end of Bus devices
+
 CONFIG_CONNECTOR=m
 CONFIG_GNSS=m
 CONFIG_GNSS_SERIAL=m
@@ -1636,14 +1726,15 @@ CONFIG_GNSS_UBX_SERIAL=m
 CONFIG_MTD=y
 # CONFIG_MTD_TESTS is not set
 CONFIG_MTD_CMDLINE_PARTS=y
-# CONFIG_MTD_AFS_PARTS is not set
 CONFIG_MTD_OF_PARTS=y
 CONFIG_MTD_AR7_PARTS=m
 
 #
 # Partition parsers
 #
+# CONFIG_MTD_AFS_PARTS is not set
 # CONFIG_MTD_REDBOOT_PARTS is not set
+# end of Partition parsers
 
 #
 # User Modules And Translation Layers
@@ -1690,6 +1781,7 @@ CONFIG_MTD_CFI_UTIL=y
 # CONFIG_MTD_RAM is not set
 # CONFIG_MTD_ROM is not set
 # CONFIG_MTD_ABSENT is not set
+# end of RAM/ROM/Flash chip drivers
 
 #
 # Mapping drivers for chip access
@@ -1701,6 +1793,7 @@ CONFIG_MTD_PHYSMAP=y
 # CONFIG_MTD_IMPA7 is not set
 # CONFIG_MTD_INTEL_VR_NOR is not set
 # CONFIG_MTD_PLATRAM is not set
+# end of Mapping drivers for chip access
 
 #
 # Self-contained MTD device drivers
@@ -1721,25 +1814,35 @@ CONFIG_MTD_SST25L=m
 # Disk-On-Chip Device Drivers
 #
 # CONFIG_MTD_DOCG3 is not set
+# end of Self-contained MTD device drivers
+
 CONFIG_MTD_NAND_CORE=m
 # CONFIG_MTD_ONENAND is not set
-CONFIG_MTD_NAND_ECC=y
-# CONFIG_MTD_NAND_ECC_SMC is not set
-CONFIG_MTD_NAND=y
-# CONFIG_MTD_NAND_ECC_BCH is not set
-CONFIG_MTD_SM_COMMON=m
+CONFIG_MTD_NAND_ECC_SW_HAMMING=m
+# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
+CONFIG_MTD_RAW_NAND=m
+CONFIG_MTD_NAND_ECC_SW_BCH=y
+
+#
+# Raw/parallel NAND flash controllers
+#
 # CONFIG_MTD_NAND_DENALI_PCI is not set
 # CONFIG_MTD_NAND_DENALI_DT is not set
-# CONFIG_MTD_NAND_GPIO is not set
-CONFIG_MTD_NAND_RICOH=m
-# CONFIG_MTD_NAND_DISKONCHIP is not set
 # CONFIG_MTD_NAND_CAFE is not set
+CONFIG_MTD_NAND_ORION=m
 # CONFIG_MTD_NAND_MARVELL is not set
-CONFIG_MTD_NAND_NANDSIM=m
 # CONFIG_MTD_NAND_BRCMNAND is not set
-# CONFIG_MTD_NAND_PLATFORM is not set
-CONFIG_MTD_NAND_ORION=y
 CONFIG_MTD_NAND_SUNXI=m
+# CONFIG_MTD_NAND_GPIO is not set
+# CONFIG_MTD_NAND_PLATFORM is not set
+
+#
+# Misc
+#
+CONFIG_MTD_SM_COMMON=m
+CONFIG_MTD_NAND_NANDSIM=m
+CONFIG_MTD_NAND_RICOH=m
+# CONFIG_MTD_NAND_DISKONCHIP is not set
 CONFIG_MTD_SPI_NAND=m
 
 #
@@ -1747,6 +1850,8 @@ CONFIG_MTD_SPI_NAND=m
 #
 # CONFIG_MTD_LPDDR is not set
 # CONFIG_MTD_LPDDR2_NVM is not set
+# end of LPDDR & LPDDR2 PCM memory drivers
+
 CONFIG_MTD_SPI_NOR=y
 CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y
 CONFIG_SPI_CADENCE_QUADSPI=m
@@ -1757,6 +1862,7 @@ CONFIG_MTD_UBI_BEB_LIMIT=20
 # CONFIG_MTD_UBI_FASTMAP is not set
 # CONFIG_MTD_UBI_GLUEBI is not set
 CONFIG_MTD_UBI_BLOCK=y
+# CONFIG_MTD_HYPERBUS is not set
 CONFIG_DTC=y
 CONFIG_OF=y
 # CONFIG_OF_UNITTEST is not set
@@ -1808,6 +1914,7 @@ CONFIG_BLK_DEV_RBD=m
 # CONFIG_BLK_DEV_NVME is not set
 # CONFIG_NVME_FC is not set
 # CONFIG_NVME_TARGET is not set
+# end of NVME Support
 
 #
 # Misc devices
@@ -1832,11 +1939,11 @@ CONFIG_SENSORS_BH1770=m
 CONFIG_SENSORS_APDS990X=m
 CONFIG_HMC6352=m
 CONFIG_DS1682=m
-# CONFIG_USB_SWITCH_FSA9480 is not set
 # CONFIG_LATTICE_ECP3_CONFIG is not set
 CONFIG_SRAM=y
 CONFIG_SRAM_EXEC=y
 # CONFIG_PCI_ENDPOINT_TEST is not set
+# CONFIG_XILINX_SDFEC is not set
 CONFIG_MISC_RTSX=m
 CONFIG_PVPANIC=m
 CONFIG_C2PORT=m
@@ -1852,6 +1959,8 @@ CONFIG_EEPROM_93CX6=m
 # CONFIG_EEPROM_93XX46 is not set
 # CONFIG_EEPROM_IDT_89HPESX is not set
 CONFIG_EEPROM_EE1004=m
+# end of EEPROM support
+
 CONFIG_CB710_CORE=m
 # CONFIG_CB710_DEBUG is not set
 CONFIG_CB710_DEBUG_ASSUMPTIONS=y
@@ -1860,6 +1969,8 @@ CONFIG_CB710_DEBUG_ASSUMPTIONS=y
 # Texas Instruments shared transport line discipline
 #
 CONFIG_TI_ST=m
+# end of Texas Instruments shared transport line discipline
+
 # CONFIG_SENSORS_LIS3_SPI is not set
 CONFIG_SENSORS_LIS3_I2C=m
 # CONFIG_ALTERA_STAPL is not set
@@ -1902,11 +2013,15 @@ CONFIG_VOP_BUS=m
 #
 CONFIG_VOP=m
 CONFIG_VHOST_RING=m
+# end of Intel MIC & related support
+
 # CONFIG_ECHO is not set
 CONFIG_MISC_ALCOR_PCI=m
 CONFIG_MISC_RTSX_PCI=m
 CONFIG_MISC_RTSX_USB=m
 CONFIG_HABANA_AI=m
+# end of Misc devices
+
 CONFIG_HAVE_IDE=y
 # CONFIG_IDE is not set
 
@@ -1925,7 +2040,6 @@ CONFIG_SCSI_NETLINK=y
 #
 CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_ST=m
-CONFIG_CHR_DEV_OSST=m
 CONFIG_BLK_DEV_SR=m
 CONFIG_BLK_DEV_SR_VENDOR=y
 CONFIG_CHR_DEV_SG=m
@@ -1946,6 +2060,8 @@ CONFIG_SCSI_SAS_LIBSAS=m
 CONFIG_SCSI_SAS_ATA=y
 CONFIG_SCSI_SAS_HOST_SMP=y
 CONFIG_SCSI_SRP_ATTRS=m
+# end of SCSI Transports
+
 CONFIG_SCSI_LOWLEVEL=y
 CONFIG_ISCSI_TCP=m
 CONFIG_ISCSI_BOOT_SYSFS=m
@@ -1983,6 +2099,7 @@ CONFIG_LIBFCOE=m
 CONFIG_FCOE=m
 # CONFIG_SCSI_SNIC is not set
 # CONFIG_SCSI_DMX3191D is not set
+# CONFIG_SCSI_FDOMAIN_PCI is not set
 CONFIG_SCSI_GDTH=m
 # CONFIG_SCSI_IPS is not set
 # CONFIG_SCSI_INITIO is not set
@@ -2005,6 +2122,8 @@ CONFIG_SCSI_PM8001=m
 CONFIG_SCSI_VIRTIO=m
 # CONFIG_SCSI_CHELSIO_FCOE is not set
 # CONFIG_SCSI_DH is not set
+# end of SCSI device support
+
 CONFIG_ATA=y
 CONFIG_ATA_VERBOSE_ERROR=y
 CONFIG_SATA_PMP=y
@@ -2132,6 +2251,7 @@ CONFIG_DM_MULTIPATH=m
 CONFIG_DM_MULTIPATH_QL=m
 CONFIG_DM_MULTIPATH_ST=m
 CONFIG_DM_DELAY=m
+CONFIG_DM_DUST=m
 CONFIG_DM_UEVENT=y
 CONFIG_DM_FLAKEY=m
 # CONFIG_DM_VERITY is not set
@@ -2163,6 +2283,8 @@ CONFIG_FIREWIRE_OHCI=m
 CONFIG_FIREWIRE_SBP2=m
 CONFIG_FIREWIRE_NET=m
 CONFIG_FIREWIRE_NOSY=m
+# end of IEEE 1394 (FireWire) support
+
 CONFIG_NETDEVICES=y
 CONFIG_MII=y
 CONFIG_NET_CORE=y
@@ -2235,11 +2357,16 @@ CONFIG_NET_DSA_MICROCHIP_KSZ9477_SPI=m
 CONFIG_NET_DSA_MV88E6XXX=m
 CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y
 # CONFIG_NET_DSA_MV88E6XXX_PTP is not set
+CONFIG_NET_DSA_SJA1105=m
+# CONFIG_NET_DSA_SJA1105_PTP is not set
 CONFIG_NET_DSA_QCA8K=m
 # CONFIG_NET_DSA_REALTEK_SMI is not set
 # CONFIG_NET_DSA_SMSC_LAN9303_I2C is not set
 # CONFIG_NET_DSA_SMSC_LAN9303_MDIO is not set
-# CONFIG_NET_DSA_VITESSE_VSC73XX is not set
+# CONFIG_NET_DSA_VITESSE_VSC73XX_SPI is not set
+# CONFIG_NET_DSA_VITESSE_VSC73XX_PLATFORM is not set
+# end of Distributed Switch Architecture drivers
+
 CONFIG_ETHERNET=y
 CONFIG_MDIO=m
 CONFIG_NET_VENDOR_3COM=y
@@ -2310,6 +2437,7 @@ CONFIG_EZCHIP_NPS_MANAGEMENT_ENET=m
 CONFIG_NET_VENDOR_FARADAY=y
 # CONFIG_FTMAC100 is not set
 # CONFIG_FTGMAC100 is not set
+CONFIG_NET_VENDOR_GOOGLE=y
 # CONFIG_NET_VENDOR_HISILICON is not set
 CONFIG_NET_VENDOR_HP=y
 # CONFIG_HP100 is not set
@@ -2419,7 +2547,6 @@ CONFIG_NET_VENDOR_TEHUTI=y
 # CONFIG_TEHUTI is not set
 CONFIG_NET_VENDOR_TI=y
 # CONFIG_TI_CPSW_PHY_SEL is not set
-# CONFIG_TI_CPSW_ALE is not set
 # CONFIG_TLAN is not set
 CONFIG_NET_VENDOR_VIA=y
 # CONFIG_VIA_RHINE is not set
@@ -2427,6 +2554,8 @@ CONFIG_NET_VENDOR_VIA=y
 CONFIG_NET_VENDOR_WIZNET=y
 # CONFIG_WIZNET_W5100 is not set
 # CONFIG_WIZNET_W5300 is not set
+CONFIG_NET_VENDOR_XILINX=y
+# CONFIG_XILINX_AXI_EMAC is not set
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
 CONFIG_MDIO_DEVICE=y
@@ -2477,6 +2606,7 @@ CONFIG_MICROCHIP_PHY=m
 # CONFIG_MICROCHIP_T1_PHY is not set
 CONFIG_MICROSEMI_PHY=m
 CONFIG_NATIONAL_PHY=m
+# CONFIG_NXP_TJA11XX_PHY is not set
 CONFIG_QSEMI_PHY=m
 CONFIG_REALTEK_PHY=m
 CONFIG_RENESAS_PHY=m
@@ -2650,6 +2780,8 @@ CONFIG_IWL3945=m
 # iwl3945 / iwl4965 Debugging Options
 #
 # CONFIG_IWLEGACY_DEBUG is not set
+# end of iwl3945 / iwl4965 Debugging Options
+
 CONFIG_IWLWIFI=m
 CONFIG_IWLWIFI_LEDS=y
 CONFIG_IWLDVM=m
@@ -2661,6 +2793,8 @@ CONFIG_IWLWIFI_OPMODE_MODULAR=y
 #
 # CONFIG_IWLWIFI_DEBUG is not set
 # CONFIG_IWLWIFI_DEVICE_TRACING is not set
+# end of Debugging Options
+
 # CONFIG_WLAN_VENDOR_INTERSIL is not set
 CONFIG_WLAN_VENDOR_MARVELL=y
 CONFIG_LIBERTAS=m
@@ -2691,6 +2825,7 @@ CONFIG_MT76x2_COMMON=m
 # CONFIG_MT76x2E is not set
 CONFIG_MT76x2U=m
 CONFIG_MT7603E=m
+CONFIG_MT7615E=m
 CONFIG_WLAN_VENDOR_RALINK=y
 CONFIG_RT2X00=m
 CONFIG_RT2400PCI=m
@@ -2742,6 +2877,13 @@ CONFIG_RTL8192C_COMMON=m
 CONFIG_RTL8723_COMMON=m
 CONFIG_RTLBTCOEXIST=m
 # CONFIG_RTL8XXXU is not set
+CONFIG_RTW88=m
+CONFIG_RTW88_CORE=m
+CONFIG_RTW88_PCI=m
+CONFIG_RTW88_8822BE=y
+CONFIG_RTW88_8822CE=y
+# CONFIG_RTW88_DEBUG is not set
+# CONFIG_RTW88_DEBUGFS is not set
 # CONFIG_WLAN_VENDOR_RSI is not set
 CONFIG_WLAN_VENDOR_ST=y
 # CONFIG_CW1200 is not set
@@ -2760,34 +2902,18 @@ CONFIG_VIRT_WIFI=m
 CONFIG_WIMAX_I2400M=m
 CONFIG_WIMAX_I2400M_USB=m
 CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
+# end of WiMAX Wireless Broadband devices
+
 # CONFIG_WAN is not set
 CONFIG_IEEE802154_DRIVERS=m
 CONFIG_VMXNET3=m
 # CONFIG_NETDEVSIM is not set
 CONFIG_NET_FAILOVER=m
 CONFIG_ISDN=y
-# CONFIG_ISDN_I4L is not set
 CONFIG_ISDN_CAPI=m
 CONFIG_CAPI_TRACE=y
 CONFIG_ISDN_CAPI_CAPI20=m
 CONFIG_ISDN_CAPI_MIDDLEWARE=y
-
-#
-# CAPI hardware drivers
-#
-CONFIG_CAPI_AVM=y
-CONFIG_ISDN_DRV_AVMB1_B1PCI=m
-CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
-CONFIG_ISDN_DRV_AVMB1_T1PCI=m
-CONFIG_ISDN_DRV_AVMB1_C4=m
-CONFIG_ISDN_DRV_GIGASET=m
-CONFIG_GIGASET_CAPI=y
-CONFIG_GIGASET_BASE=m
-CONFIG_GIGASET_M105=m
-CONFIG_GIGASET_M101=m
-# CONFIG_GIGASET_DEBUG is not set
-CONFIG_HYSDN=m
-CONFIG_HYSDN_CAPI=y
 CONFIG_MISDN=m
 CONFIG_MISDN_DSP=m
 CONFIG_MISDN_L1OIP=m
@@ -2835,6 +2961,7 @@ CONFIG_INPUT_KEYBOARD=y
 CONFIG_KEYBOARD_ADP5588=m
 # CONFIG_KEYBOARD_ADP5589 is not set
 CONFIG_KEYBOARD_ATKBD=y
+CONFIG_KEYBOARD_QT1050=m
 # CONFIG_KEYBOARD_QT1070 is not set
 CONFIG_KEYBOARD_QT2160=m
 CONFIG_KEYBOARD_DLINK_DIR685=m
@@ -2886,8 +3013,8 @@ CONFIG_JOYSTICK_INTERACT=m
 CONFIG_JOYSTICK_SIDEWINDER=m
 CONFIG_JOYSTICK_TMDC=m
 CONFIG_JOYSTICK_IFORCE=m
-CONFIG_JOYSTICK_IFORCE_USB=y
-CONFIG_JOYSTICK_IFORCE_232=y
+CONFIG_JOYSTICK_IFORCE_USB=m
+CONFIG_JOYSTICK_IFORCE_232=m
 CONFIG_JOYSTICK_WARRIOR=m
 CONFIG_JOYSTICK_MAGELLAN=m
 CONFIG_JOYSTICK_SPACEORB=m
@@ -3003,16 +3130,19 @@ CONFIG_TOUCHSCREEN_TPS6507X=m
 # CONFIG_TOUCHSCREEN_ZET6223 is not set
 # CONFIG_TOUCHSCREEN_ZFORCE is not set
 # CONFIG_TOUCHSCREEN_ROHM_BU21023 is not set
+CONFIG_TOUCHSCREEN_IQS5XX=m
 CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_AD714X is not set
 # CONFIG_INPUT_ATMEL_CAPTOUCH is not set
 # CONFIG_INPUT_BMA150 is not set
 # CONFIG_INPUT_E3X0_BUTTON is not set
 CONFIG_INPUT_MSM_VIBRATOR=m
+CONFIG_INPUT_MAX77650_ONKEY=m
 # CONFIG_INPUT_MMA8450 is not set
 # CONFIG_INPUT_GP2A is not set
 CONFIG_INPUT_GPIO_BEEPER=m
 CONFIG_INPUT_GPIO_DECODER=m
+CONFIG_INPUT_GPIO_VIBRA=m
 CONFIG_INPUT_ATI_REMOTE2=m
 CONFIG_INPUT_KEYSPAN_REMOTE=m
 # CONFIG_INPUT_KXTJ9 is not set
@@ -3047,7 +3177,6 @@ CONFIG_SERIO_LIBPS2=y
 # CONFIG_SERIO_PS2MULT is not set
 # CONFIG_SERIO_ARC_PS2 is not set
 # CONFIG_SERIO_APBPS2 is not set
-CONFIG_SERIO_OLPC_APSP=m
 CONFIG_SERIO_SUN4I_PS2=m
 CONFIG_SERIO_GPIO_PS2=m
 # CONFIG_USERIO is not set
@@ -3056,6 +3185,8 @@ CONFIG_GAMEPORT=m
 # CONFIG_GAMEPORT_L4 is not set
 # CONFIG_GAMEPORT_EMU10K1 is not set
 # CONFIG_GAMEPORT_FM801 is not set
+# end of Hardware I/O ports
+# end of Input device support
 
 #
 # Character devices
@@ -3073,6 +3204,7 @@ CONFIG_UNIX98_PTYS=y
 CONFIG_NOZOMI=m
 CONFIG_N_GSM=m
 # CONFIG_TRACE_SINK is not set
+CONFIG_NULL_TTY=m
 CONFIG_LDISC_AUTOLOAD=y
 CONFIG_DEVMEM=y
 # CONFIG_DEVKMEM is not set
@@ -3109,6 +3241,7 @@ CONFIG_SERIAL_MAX3100=m
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_SERIAL_JSM is not set
+CONFIG_SERIAL_SIFIVE=m
 # CONFIG_SERIAL_SCCNXP is not set
 # CONFIG_SERIAL_SC16IS7XX is not set
 # CONFIG_SERIAL_BCM63XX is not set
@@ -3123,6 +3256,9 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_SERIAL_ST_ASC is not set
 CONFIG_SERIAL_MVEBU_UART=y
 CONFIG_SERIAL_MVEBU_CONSOLE=y
+# end of Serial drivers
+
+CONFIG_SERIAL_MCTRL_GPIO=y
 CONFIG_SERIAL_DEV_BUS=m
 # CONFIG_TTY_PRINTK is not set
 # CONFIG_PRINTER is not set
@@ -3131,6 +3267,7 @@ CONFIG_HVC_DRIVER=y
 # CONFIG_HVC_DCC is not set
 CONFIG_VIRTIO_CONSOLE=m
 # CONFIG_IPMI_HANDLER is not set
+# CONFIG_IPMB_DEVICE_INTERFACE is not set
 CONFIG_HW_RANDOM=m
 CONFIG_HW_RANDOM_TIMERIOMEM=m
 CONFIG_HW_RANDOM_OMAP=m
@@ -3140,6 +3277,7 @@ CONFIG_HW_RANDOM_VIRTIO=m
 # CONFIG_TCG_TPM is not set
 CONFIG_DEVPORT=y
 # CONFIG_XILLYBUS is not set
+# end of Character devices
 
 #
 # I2C support
@@ -3163,6 +3301,8 @@ CONFIG_I2C_MUX_PINCTRL=m
 CONFIG_I2C_MUX_REG=m
 # CONFIG_I2C_DEMUX_PINCTRL is not set
 CONFIG_I2C_MUX_MLXCPLD=m
+# end of Multiplexer I2C Chip support
+
 CONFIG_I2C_HELPER_AUTO=y
 CONFIG_I2C_SMBUS=m
 CONFIG_I2C_ALGOBIT=m
@@ -3220,12 +3360,16 @@ CONFIG_I2C_TINY_USB=m
 #
 # Other I2C/SMBus bus drivers
 #
+# end of I2C Hardware Bus support
+
 # CONFIG_I2C_STUB is not set
 CONFIG_I2C_SLAVE=y
 CONFIG_I2C_SLAVE_EEPROM=m
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
+# end of I2C support
+
 CONFIG_I3C=m
 CONFIG_CDNS_I3C_MASTER=m
 CONFIG_DW_I3C_MASTER=m
@@ -3293,6 +3437,8 @@ CONFIG_PTP_1588_CLOCK=m
 #
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
+# end of PTP clock support
+
 CONFIG_PINCTRL=y
 CONFIG_PINMUX=y
 CONFIG_PINCONF=y
@@ -3302,11 +3448,31 @@ CONFIG_GENERIC_PINCONF=y
 CONFIG_PINCTRL_MCP23S08=m
 # CONFIG_PINCTRL_SINGLE is not set
 # CONFIG_PINCTRL_SX150X is not set
+CONFIG_PINCTRL_STMFX=m
 # CONFIG_PINCTRL_OCELOT is not set
 CONFIG_PINCTRL_MVEBU=y
 CONFIG_PINCTRL_KIRKWOOD=y
 CONFIG_PINCTRL_SUNXI=y
 CONFIG_PINCTRL_SUNIV_F1C100S=y
+# CONFIG_PINCTRL_SUN4I_A10 is not set
+# CONFIG_PINCTRL_SUN5I is not set
+# CONFIG_PINCTRL_SUN6I_A31 is not set
+# CONFIG_PINCTRL_SUN6I_A31_R is not set
+# CONFIG_PINCTRL_SUN8I_A23 is not set
+# CONFIG_PINCTRL_SUN8I_A33 is not set
+# CONFIG_PINCTRL_SUN8I_A83T is not set
+# CONFIG_PINCTRL_SUN8I_A83T_R is not set
+# CONFIG_PINCTRL_SUN8I_A23_R is not set
+# CONFIG_PINCTRL_SUN8I_H3 is not set
+# CONFIG_PINCTRL_SUN8I_H3_R is not set
+# CONFIG_PINCTRL_SUN8I_V3S is not set
+# CONFIG_PINCTRL_SUN9I_A80 is not set
+# CONFIG_PINCTRL_SUN9I_A80_R is not set
+# CONFIG_PINCTRL_SUN50I_A64 is not set
+# CONFIG_PINCTRL_SUN50I_A64_R is not set
+# CONFIG_PINCTRL_SUN50I_H5 is not set
+# CONFIG_PINCTRL_SUN50I_H6 is not set
+# CONFIG_PINCTRL_SUN50I_H6_R is not set
 CONFIG_PINCTRL_MADERA=m
 CONFIG_PINCTRL_CS47L35=y
 CONFIG_PINCTRL_CS47L85=y
@@ -3333,7 +3499,6 @@ CONFIG_GPIO_CADENCE=m
 # CONFIG_GPIO_GRGPIO is not set
 # CONFIG_GPIO_HLWD is not set
 CONFIG_GPIO_MB86S7X=m
-CONFIG_GPIO_MOCKUP=m
 # CONFIG_GPIO_MPC8XXX is not set
 CONFIG_GPIO_MVEBU=y
 CONFIG_GPIO_SAMA5D2_PIOBU=m
@@ -3341,6 +3506,7 @@ CONFIG_GPIO_SYSCON=m
 # CONFIG_GPIO_XILINX is not set
 # CONFIG_GPIO_ZEVIO is not set
 CONFIG_GPIO_AMD_FCH=m
+# end of Memory mapped GPIO drivers
 
 #
 # I2C GPIO expanders
@@ -3353,13 +3519,16 @@ CONFIG_GPIO_GW_PLD=m
 # CONFIG_GPIO_PCA953X is not set
 # CONFIG_GPIO_PCF857X is not set
 # CONFIG_GPIO_TPIC2810 is not set
+# end of I2C GPIO expanders
 
 #
 # MFD GPIO expanders
 #
 # CONFIG_HTC_EGPIO is not set
 CONFIG_GPIO_MADERA=m
+CONFIG_GPIO_MAX77650=m
 CONFIG_GPIO_TQMX86=m
+# end of MFD GPIO expanders
 
 #
 # PCI GPIO expanders
@@ -3368,6 +3537,7 @@ CONFIG_GPIO_TQMX86=m
 # CONFIG_GPIO_PCI_IDIO_16 is not set
 # CONFIG_GPIO_PCIE_IDIO_24 is not set
 # CONFIG_GPIO_RDC321X is not set
+# end of PCI GPIO expanders
 
 #
 # SPI GPIO expanders
@@ -3378,10 +3548,14 @@ CONFIG_GPIO_MAX3191X=m
 # CONFIG_GPIO_MC33880 is not set
 # CONFIG_GPIO_PISOSR is not set
 # CONFIG_GPIO_XRA1403 is not set
+# end of SPI GPIO expanders
 
 #
 # USB GPIO expanders
 #
+# end of USB GPIO expanders
+
+CONFIG_GPIO_MOCKUP=m
 CONFIG_W1=m
 CONFIG_W1_CON=y
 
@@ -3393,6 +3567,7 @@ CONFIG_W1_MASTER_DS2490=m
 CONFIG_W1_MASTER_DS2482=m
 # CONFIG_W1_MASTER_DS1WM is not set
 # CONFIG_W1_MASTER_GPIO is not set
+# end of 1-wire Bus Masters
 
 #
 # 1-wire Slaves
@@ -3413,6 +3588,8 @@ CONFIG_W1_SLAVE_DS2438=m
 # CONFIG_W1_SLAVE_DS2781 is not set
 # CONFIG_W1_SLAVE_DS28E04 is not set
 # CONFIG_W1_SLAVE_DS28E17 is not set
+# end of 1-wire Slaves
+
 # CONFIG_POWER_AVS is not set
 CONFIG_POWER_RESET=y
 # CONFIG_POWER_RESET_BRCMKONA is not set
@@ -3426,8 +3603,10 @@ CONFIG_POWER_RESET_GPIO_RESTART=y
 # CONFIG_POWER_RESET_SYSCON is not set
 # CONFIG_POWER_RESET_SYSCON_POWEROFF is not set
 # CONFIG_SYSCON_REBOOT_MODE is not set
+# CONFIG_NVMEM_REBOOT_MODE is not set
 CONFIG_POWER_SUPPLY=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
+CONFIG_POWER_SUPPLY_HWMON=y
 # CONFIG_PDA_POWER is not set
 # CONFIG_TEST_POWER is not set
 CONFIG_CHARGER_ADP5061=m
@@ -3447,8 +3626,9 @@ CONFIG_CHARGER_PCF50633=m
 # CONFIG_CHARGER_LP8727 is not set
 # CONFIG_CHARGER_GPIO is not set
 # CONFIG_CHARGER_MANAGER is not set
-# CONFIG_CHARGER_LTC3651 is not set
+CONFIG_CHARGER_LT3651=m
 # CONFIG_CHARGER_DETECTOR_MAX14656 is not set
+CONFIG_CHARGER_MAX77650=m
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_BQ24257 is not set
 # CONFIG_CHARGER_BQ24735 is not set
@@ -3456,6 +3636,7 @@ CONFIG_CHARGER_PCF50633=m
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
 # CONFIG_CHARGER_RT9455 is not set
+CONFIG_CHARGER_UCS1002=m
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
@@ -3613,6 +3794,7 @@ CONFIG_THERMAL_GOV_STEP_WISE=y
 # CONFIG_CPU_THERMAL is not set
 # CONFIG_CLOCK_THERMAL is not set
 # CONFIG_THERMAL_EMULATION is not set
+CONFIG_THERMAL_MMIO=m
 # CONFIG_QORIQ_THERMAL is not set
 CONFIG_KIRKWOOD_THERMAL=m
 # CONFIG_ARMADA_THERMAL is not set
@@ -3620,8 +3802,14 @@ CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_CORE=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
 CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
+CONFIG_WATCHDOG_OPEN_TIMEOUT=0
 # CONFIG_WATCHDOG_SYSFS is not set
 
+#
+# Watchdog Pretimeout Governors
+#
+# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
+
 #
 # Watchdog Device Drivers
 #
@@ -3651,11 +3839,6 @@ CONFIG_STPMIC1_WATCHDOG=m
 # USB-based Watchdog Cards
 #
 # CONFIG_USBPCWATCHDOG is not set
-
-#
-# Watchdog Pretimeout Governors
-#
-# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
 CONFIG_SSB_POSSIBLE=y
 CONFIG_SSB=m
 CONFIG_SSB_SPROM=y
@@ -3700,9 +3883,11 @@ CONFIG_MFD_SUN4I_GPADC=m
 CONFIG_MFD_MADERA=m
 CONFIG_MFD_MADERA_I2C=m
 CONFIG_MFD_MADERA_SPI=m
+# CONFIG_MFD_CS47L15 is not set
 CONFIG_MFD_CS47L35=y
 CONFIG_MFD_CS47L85=y
 CONFIG_MFD_CS47L90=y
+# CONFIG_MFD_CS47L92 is not set
 # CONFIG_MFD_ASIC3 is not set
 # CONFIG_PMIC_DA903X is not set
 # CONFIG_MFD_DA9052_SPI is not set
@@ -3726,6 +3911,7 @@ CONFIG_LPC_SCH=m
 # CONFIG_MFD_88PM860X is not set
 # CONFIG_MFD_MAX14577 is not set
 # CONFIG_MFD_MAX77620 is not set
+CONFIG_MFD_MAX77650=m
 # CONFIG_MFD_MAX77686 is not set
 # CONFIG_MFD_MAX77693 is not set
 # CONFIG_MFD_MAX77843 is not set
@@ -3757,7 +3943,7 @@ CONFIG_MFD_SM501=m
 # CONFIG_MFD_SMSC is not set
 # CONFIG_ABX500_CORE is not set
 # CONFIG_MFD_STMPE is not set
-# CONFIG_MFD_SUN6I_PRCM is not set
+CONFIG_MFD_SUN6I_PRCM=y
 CONFIG_MFD_SYSCON=y
 CONFIG_MFD_TI_AM335X_TSCADC=m
 # CONFIG_MFD_LP3943 is not set
@@ -3797,8 +3983,12 @@ CONFIG_MFD_TQMX86=m
 # CONFIG_MFD_WM8350_I2C is not set
 # CONFIG_MFD_WM8994 is not set
 # CONFIG_MFD_ROHM_BD718XX is not set
+# CONFIG_MFD_ROHM_BD70528 is not set
 CONFIG_MFD_STPMIC1=m
+CONFIG_MFD_STMFX=m
 # CONFIG_RAVE_SP_CORE is not set
+# end of Multifunction device drivers
+
 CONFIG_REGULATOR=y
 # CONFIG_REGULATOR_DEBUG is not set
 CONFIG_REGULATOR_FIXED_VOLTAGE=m
@@ -3808,6 +3998,8 @@ CONFIG_REGULATOR_USERSPACE_CONSUMER=m
 CONFIG_REGULATOR_ACT8865=m
 # CONFIG_REGULATOR_AD5398 is not set
 # CONFIG_REGULATOR_ANATOP is not set
+# CONFIG_REGULATOR_ARIZONA_LDO1 is not set
+# CONFIG_REGULATOR_ARIZONA_MICSUPP is not set
 # CONFIG_REGULATOR_DA9210 is not set
 # CONFIG_REGULATOR_DA9211 is not set
 # CONFIG_REGULATOR_FAN53555 is not set
@@ -3821,6 +4013,7 @@ CONFIG_REGULATOR_LP3971=m
 # CONFIG_REGULATOR_LTC3589 is not set
 # CONFIG_REGULATOR_LTC3676 is not set
 CONFIG_REGULATOR_MAX1586=m
+CONFIG_REGULATOR_MAX77650=m
 CONFIG_REGULATOR_MAX8649=m
 CONFIG_REGULATOR_MAX8660=m
 # CONFIG_REGULATOR_MAX8952 is not set
@@ -3833,6 +4026,7 @@ CONFIG_REGULATOR_PCF50633=m
 # CONFIG_REGULATOR_PV88080 is not set
 # CONFIG_REGULATOR_PV88090 is not set
 # CONFIG_REGULATOR_QCOM_SPMI is not set
+# CONFIG_REGULATOR_SLG51000 is not set
 CONFIG_REGULATOR_STPMIC1=m
 # CONFIG_REGULATOR_SY8106A is not set
 # CONFIG_REGULATOR_TPS51632 is not set
@@ -4016,6 +4210,7 @@ CONFIG_DVB_USB_DIBUSB_MC=m
 CONFIG_DVB_USB_DIB0700=m
 CONFIG_DVB_USB_UMT_010=m
 CONFIG_DVB_USB_CXUSB=m
+# CONFIG_DVB_USB_CXUSB_ANALOG is not set
 CONFIG_DVB_USB_M920X=m
 CONFIG_DVB_USB_DIGITV=m
 CONFIG_DVB_USB_VP7045=m
@@ -4154,6 +4349,7 @@ CONFIG_RADIO_WL1273=m
 # Texas Instruments WL128x FM driver (ST based)
 #
 CONFIG_RADIO_WL128X=m
+# end of Texas Instruments WL128x FM driver (ST based)
 
 #
 # Supported FireWire (IEEE 1394) Adapters
@@ -4187,47 +4383,154 @@ CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
 CONFIG_MEDIA_ATTACH=y
 CONFIG_VIDEO_IR_I2C=m
 
+#
+# I2C Encoders, decoders, sensors and other helper chips
+#
+
 #
 # Audio decoders, processors and mixers
 #
+# CONFIG_VIDEO_TVAUDIO is not set
+# CONFIG_VIDEO_TDA7432 is not set
+# CONFIG_VIDEO_TDA9840 is not set
+# CONFIG_VIDEO_TDA1997X is not set
+# CONFIG_VIDEO_TEA6415C is not set
+# CONFIG_VIDEO_TEA6420 is not set
 CONFIG_VIDEO_MSP3400=m
+# CONFIG_VIDEO_CS3308 is not set
+# CONFIG_VIDEO_CS5345 is not set
 CONFIG_VIDEO_CS53L32A=m
+# CONFIG_VIDEO_TLV320AIC23B is not set
+# CONFIG_VIDEO_UDA1342 is not set
 CONFIG_VIDEO_WM8775=m
+# CONFIG_VIDEO_WM8739 is not set
+# CONFIG_VIDEO_VP27SMPX is not set
+# CONFIG_VIDEO_SONY_BTF_MPX is not set
 
 #
 # RDS decoders
 #
+# CONFIG_VIDEO_SAA6588 is not set
 
 #
 # Video decoders
 #
+# CONFIG_VIDEO_ADV7180 is not set
+# CONFIG_VIDEO_ADV7183 is not set
+# CONFIG_VIDEO_ADV748X is not set
+# CONFIG_VIDEO_ADV7604 is not set
+# CONFIG_VIDEO_ADV7842 is not set
+# CONFIG_VIDEO_BT819 is not set
+# CONFIG_VIDEO_BT856 is not set
+# CONFIG_VIDEO_BT866 is not set
+# CONFIG_VIDEO_KS0127 is not set
+# CONFIG_VIDEO_ML86V7667 is not set
+# CONFIG_VIDEO_SAA7110 is not set
 CONFIG_VIDEO_SAA711X=m
+# CONFIG_VIDEO_TC358743 is not set
+# CONFIG_VIDEO_TVP514X is not set
+# CONFIG_VIDEO_TVP5150 is not set
+# CONFIG_VIDEO_TVP7002 is not set
+# CONFIG_VIDEO_TW2804 is not set
+# CONFIG_VIDEO_TW9903 is not set
+# CONFIG_VIDEO_TW9906 is not set
+# CONFIG_VIDEO_TW9910 is not set
+# CONFIG_VIDEO_VPX3220 is not set
 
 #
 # Video and audio decoders
 #
+# CONFIG_VIDEO_SAA717X is not set
 CONFIG_VIDEO_CX25840=m
 
 #
 # Video encoders
 #
+# CONFIG_VIDEO_SAA7127 is not set
+# CONFIG_VIDEO_SAA7185 is not set
+# CONFIG_VIDEO_ADV7170 is not set
+# CONFIG_VIDEO_ADV7175 is not set
+# CONFIG_VIDEO_ADV7343 is not set
+# CONFIG_VIDEO_ADV7393 is not set
+# CONFIG_VIDEO_ADV7511 is not set
+# CONFIG_VIDEO_AD9389B is not set
+# CONFIG_VIDEO_AK881X is not set
+# CONFIG_VIDEO_THS8200 is not set
 
 #
 # Camera sensor devices
 #
+# CONFIG_VIDEO_IMX214 is not set
+# CONFIG_VIDEO_IMX258 is not set
+# CONFIG_VIDEO_IMX274 is not set
+# CONFIG_VIDEO_IMX319 is not set
+# CONFIG_VIDEO_IMX355 is not set
+# CONFIG_VIDEO_OV2640 is not set
+# CONFIG_VIDEO_OV2659 is not set
+# CONFIG_VIDEO_OV2680 is not set
+# CONFIG_VIDEO_OV2685 is not set
+# CONFIG_VIDEO_OV5640 is not set
+# CONFIG_VIDEO_OV5645 is not set
+# CONFIG_VIDEO_OV5647 is not set
+# CONFIG_VIDEO_OV6650 is not set
+# CONFIG_VIDEO_OV5670 is not set
+# CONFIG_VIDEO_OV5695 is not set
+# CONFIG_VIDEO_OV7251 is not set
+# CONFIG_VIDEO_OV772X is not set
+# CONFIG_VIDEO_OV7640 is not set
 CONFIG_VIDEO_OV7670=m
+# CONFIG_VIDEO_OV7740 is not set
+# CONFIG_VIDEO_OV8856 is not set
+# CONFIG_VIDEO_OV9640 is not set
+# CONFIG_VIDEO_OV9650 is not set
+# CONFIG_VIDEO_OV13858 is not set
+# CONFIG_VIDEO_VS6624 is not set
+# CONFIG_VIDEO_MT9M001 is not set
+# CONFIG_VIDEO_MT9M032 is not set
+# CONFIG_VIDEO_MT9M111 is not set
+# CONFIG_VIDEO_MT9P031 is not set
+# CONFIG_VIDEO_MT9T001 is not set
+# CONFIG_VIDEO_MT9T112 is not set
+# CONFIG_VIDEO_MT9V011 is not set
+# CONFIG_VIDEO_MT9V032 is not set
+# CONFIG_VIDEO_MT9V111 is not set
+# CONFIG_VIDEO_SR030PC30 is not set
+# CONFIG_VIDEO_NOON010PC30 is not set
+# CONFIG_VIDEO_M5MOLS is not set
+# CONFIG_VIDEO_RJ54N1 is not set
+# CONFIG_VIDEO_S5K6AA is not set
+# CONFIG_VIDEO_S5K6A3 is not set
+# CONFIG_VIDEO_S5K4ECGX is not set
+# CONFIG_VIDEO_S5K5BAF is not set
+# CONFIG_VIDEO_SMIAPP is not set
+# CONFIG_VIDEO_ET8EK8 is not set
+# CONFIG_VIDEO_S5C73M3 is not set
+
+#
+# Lens drivers
+#
+# CONFIG_VIDEO_AD5820 is not set
+# CONFIG_VIDEO_AK7375 is not set
+# CONFIG_VIDEO_DW9714 is not set
+# CONFIG_VIDEO_DW9807_VCM is not set
 
 #
 # Flash devices
 #
+# CONFIG_VIDEO_ADP1653 is not set
+# CONFIG_VIDEO_LM3560 is not set
+# CONFIG_VIDEO_LM3646 is not set
 
 #
 # Video improvement chips
 #
+# CONFIG_VIDEO_UPD64031A is not set
+# CONFIG_VIDEO_UPD64083 is not set
 
 #
 # Audio/Video compression chips
 #
+# CONFIG_VIDEO_SAA6752HS is not set
 
 #
 # SDR tuner chips
@@ -4236,12 +4539,29 @@ CONFIG_VIDEO_OV7670=m
 #
 # Miscellaneous helper chips
 #
+# CONFIG_VIDEO_THS7303 is not set
+# CONFIG_VIDEO_M52790 is not set
+# CONFIG_VIDEO_I2C is not set
+# CONFIG_VIDEO_ST_MIPID02 is not set
+# end of I2C Encoders, decoders, sensors and other helper chips
+
+#
+# SPI helper chips
+#
+# CONFIG_VIDEO_GS1662 is not set
+# end of SPI helper chips
 
 #
 # Media SPI Adapters
 #
 # CONFIG_CXD2880_SPI_DRV is not set
+# end of Media SPI Adapters
+
 CONFIG_MEDIA_TUNER=m
+
+#
+# Customize TV tuners
+#
 CONFIG_MEDIA_TUNER_SIMPLE=m
 CONFIG_MEDIA_TUNER_TDA18250=m
 CONFIG_MEDIA_TUNER_TDA8290=m
@@ -4250,10 +4570,12 @@ CONFIG_MEDIA_TUNER_TDA18271=m
 CONFIG_MEDIA_TUNER_TDA9887=m
 CONFIG_MEDIA_TUNER_TEA5761=m
 CONFIG_MEDIA_TUNER_TEA5767=m
+# CONFIG_MEDIA_TUNER_MSI001 is not set
 CONFIG_MEDIA_TUNER_MT20XX=m
 CONFIG_MEDIA_TUNER_MT2060=m
 CONFIG_MEDIA_TUNER_MT2063=m
 CONFIG_MEDIA_TUNER_MT2266=m
+# CONFIG_MEDIA_TUNER_MT2131 is not set
 CONFIG_MEDIA_TUNER_QT1010=m
 CONFIG_MEDIA_TUNER_XC2028=m
 CONFIG_MEDIA_TUNER_XC5000=m
@@ -4276,6 +4598,12 @@ CONFIG_MEDIA_TUNER_IT913X=m
 CONFIG_MEDIA_TUNER_R820T=m
 CONFIG_MEDIA_TUNER_MXL301RF=m
 CONFIG_MEDIA_TUNER_QM1D1C0042=m
+# CONFIG_MEDIA_TUNER_QM1D1B0004 is not set
+# end of Customize TV tuners
+
+#
+# Customise DVB Frontends
+#
 
 #
 # Multistandard (satellite) frontends
@@ -4283,7 +4611,10 @@ CONFIG_MEDIA_TUNER_QM1D1C0042=m
 CONFIG_DVB_STB0899=m
 CONFIG_DVB_STB6100=m
 CONFIG_DVB_STV090x=m
+# CONFIG_DVB_STV0910 is not set
 CONFIG_DVB_STV6110x=m
+# CONFIG_DVB_STV6111 is not set
+# CONFIG_DVB_MXL5XX is not set
 CONFIG_DVB_M88DS3103=m
 
 #
@@ -4298,8 +4629,10 @@ CONFIG_DVB_MN88473=m
 #
 # DVB-S (satellite) frontends
 #
+# CONFIG_DVB_CX24110 is not set
 CONFIG_DVB_CX24123=m
 CONFIG_DVB_MT312=m
+# CONFIG_DVB_ZL10036 is not set
 CONFIG_DVB_ZL10039=m
 CONFIG_DVB_S5H1420=m
 CONFIG_DVB_STV0288=m
@@ -4309,22 +4642,31 @@ CONFIG_DVB_STV6110=m
 CONFIG_DVB_STV0900=m
 CONFIG_DVB_TDA8083=m
 CONFIG_DVB_TDA10086=m
+# CONFIG_DVB_TDA8261 is not set
+# CONFIG_DVB_VES1X93 is not set
 CONFIG_DVB_TUNER_ITD1000=m
 CONFIG_DVB_TUNER_CX24113=m
 CONFIG_DVB_TDA826X=m
+# CONFIG_DVB_TUA6100 is not set
 CONFIG_DVB_CX24116=m
+# CONFIG_DVB_CX24117 is not set
 CONFIG_DVB_CX24120=m
 CONFIG_DVB_SI21XX=m
 CONFIG_DVB_TS2020=m
 CONFIG_DVB_DS3000=m
+# CONFIG_DVB_MB86A16 is not set
 CONFIG_DVB_TDA10071=m
 
 #
 # DVB-T (terrestrial) frontends
 #
+# CONFIG_DVB_SP8870 is not set
+# CONFIG_DVB_SP887X is not set
 CONFIG_DVB_CX22700=m
 CONFIG_DVB_CX22702=m
+# CONFIG_DVB_S5H1432 is not set
 CONFIG_DVB_DRXD=m
+# CONFIG_DVB_L64781 is not set
 CONFIG_DVB_TDA1004X=m
 CONFIG_DVB_NXT6000=m
 CONFIG_DVB_MT352=m
@@ -4333,21 +4675,26 @@ CONFIG_DVB_DIB3000MB=m
 CONFIG_DVB_DIB3000MC=m
 CONFIG_DVB_DIB7000M=m
 CONFIG_DVB_DIB7000P=m
+# CONFIG_DVB_DIB9000 is not set
 CONFIG_DVB_TDA10048=m
 CONFIG_DVB_AF9013=m
 CONFIG_DVB_EC100=m
+# CONFIG_DVB_STV0367 is not set
 CONFIG_DVB_CXD2820R=m
 CONFIG_DVB_CXD2841ER=m
 CONFIG_DVB_RTL2830=m
 CONFIG_DVB_RTL2832=m
 CONFIG_DVB_SI2168=m
 CONFIG_DVB_AS102_FE=m
+# CONFIG_DVB_ZD1301_DEMOD is not set
 CONFIG_DVB_GP8PSK_FE=m
+# CONFIG_DVB_CXD2880 is not set
 
 #
 # DVB-C (cable) frontends
 #
 CONFIG_DVB_VES1820=m
+# CONFIG_DVB_TDA10021 is not set
 CONFIG_DVB_TDA10023=m
 CONFIG_DVB_STV0297=m
 
@@ -4355,6 +4702,8 @@ CONFIG_DVB_STV0297=m
 # ATSC (North American/Korean Terrestrial/Cable DTV) frontends
 #
 CONFIG_DVB_NXT200X=m
+# CONFIG_DVB_OR51211 is not set
+# CONFIG_DVB_OR51132 is not set
 CONFIG_DVB_BCM3510=m
 CONFIG_DVB_LGDT330X=m
 CONFIG_DVB_LGDT3305=m
@@ -4377,6 +4726,7 @@ CONFIG_DVB_MB86A20S=m
 # ISDB-S (satellite) & ISDB-T (terrestrial) frontends
 #
 CONFIG_DVB_TC90522=m
+# CONFIG_DVB_MN88443X is not set
 
 #
 # Digital terrestrial only tuners/PLL
@@ -4390,13 +4740,17 @@ CONFIG_DVB_TUNER_DIB0090=m
 #
 CONFIG_DVB_DRX39XYJ=m
 CONFIG_DVB_LNBH25=m
+# CONFIG_DVB_LNBH29 is not set
 CONFIG_DVB_LNBP21=m
 CONFIG_DVB_LNBP22=m
+# CONFIG_DVB_ISL6405 is not set
 CONFIG_DVB_ISL6421=m
 CONFIG_DVB_ISL6423=m
 CONFIG_DVB_A8293=m
+# CONFIG_DVB_LGS8GL5 is not set
 CONFIG_DVB_LGS8GXX=m
 CONFIG_DVB_ATBM8830=m
+# CONFIG_DVB_TDA665x is not set
 CONFIG_DVB_IX2505V=m
 CONFIG_DVB_M88RS2000=m
 CONFIG_DVB_AF9033=m
@@ -4407,11 +4761,14 @@ CONFIG_DVB_HELENE=m
 #
 # Common Interface (EN50221) controller drivers
 #
+# CONFIG_DVB_CXD2099 is not set
 CONFIG_DVB_SP2=m
 
 #
 # Tools to develop new frontends
 #
+# CONFIG_DVB_DUMMY_FE is not set
+# end of Customise DVB Frontends
 
 #
 # Graphics support
@@ -4425,14 +4782,12 @@ CONFIG_DRM_DP_CEC=y
 #
 # ARM devices
 #
+# end of ARM devices
 
 #
 # ACP (Audio CoProcessor) Configuration
 #
-
-#
-# AMD Library routines
-#
+# end of ACP (Audio CoProcessor) Configuration
 
 #
 # Frame buffer Devices
@@ -4498,7 +4853,11 @@ CONFIG_FB_MB862XX_PCI_GDC=y
 CONFIG_FB_MB862XX_I2C=y
 # CONFIG_FB_SSD1307 is not set
 # CONFIG_FB_SM712 is not set
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
+# end of Frame buffer Devices
+
+#
+# Backlight & LCD device support
+#
 # CONFIG_LCD_CLASS_DEVICE is not set
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # CONFIG_BACKLIGHT_GENERIC is not set
@@ -4511,6 +4870,8 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # CONFIG_BACKLIGHT_LV5207LP is not set
 # CONFIG_BACKLIGHT_BD6107 is not set
 # CONFIG_BACKLIGHT_ARCXCNN is not set
+# end of Backlight & LCD device support
+
 CONFIG_VGASTATE=m
 
 #
@@ -4520,7 +4881,11 @@ CONFIG_DUMMY_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
+# end of Console display driver support
+
 # CONFIG_LOGO is not set
+# end of Graphics support
+
 CONFIG_SOUND=m
 CONFIG_SOUND_OSS_CORE=y
 # CONFIG_SOUND_OSS_CORE_PRECLAIM is not set
@@ -4627,11 +4992,14 @@ CONFIG_SND_VIRTUOSO=m
 # HD-Audio
 #
 # CONFIG_SND_HDA_INTEL is not set
+# end of HD-Audio
+
 CONFIG_SND_HDA_PREALLOC_SIZE=64
 CONFIG_SND_ARM=y
 CONFIG_SND_SPI=y
 CONFIG_SND_USB=y
 CONFIG_SND_USB_AUDIO=m
+CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER=y
 CONFIG_SND_USB_UA101=m
 CONFIG_SND_USB_CAIAQ=m
 CONFIG_SND_USB_CAIAQ_INPUT=y
@@ -4657,6 +5025,7 @@ CONFIG_SND_ISIGHT=m
 CONFIG_SND_SOC=m
 CONFIG_SND_SOC_AC97_BUS=y
 CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
+CONFIG_SND_SOC_TOPOLOGY=y
 CONFIG_SND_SOC_AMD_ACP=m
 # CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH is not set
 CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m
@@ -4674,11 +5043,14 @@ CONFIG_SND_DESIGNWARE_I2S=m
 #
 # CONFIG_SND_SOC_FSL_ASRC is not set
 # CONFIG_SND_SOC_FSL_SAI is not set
+CONFIG_SND_SOC_FSL_AUDMIX=m
 # CONFIG_SND_SOC_FSL_SSI is not set
 # CONFIG_SND_SOC_FSL_SPDIF is not set
 # CONFIG_SND_SOC_FSL_ESAI is not set
 CONFIG_SND_SOC_FSL_MICFIL=m
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
+# end of SoC Audio for Freescale CPUs
+
 CONFIG_SND_I2S_HI6210_I2S=m
 CONFIG_SND_KIRKWOOD_SOC=m
 CONFIG_SND_KIRKWOOD_SOC_ARMADA370_DB=m
@@ -4690,10 +5062,19 @@ CONFIG_SND_SOC_IMG_SPDIF_IN=m
 CONFIG_SND_SOC_IMG_SPDIF_OUT=m
 CONFIG_SND_SOC_IMG_PISTACHIO_INTERNAL_DAC=m
 CONFIG_SND_SOC_MTK_BTCVSD=m
+CONFIG_SND_SOC_SOF_TOPLEVEL=y
+CONFIG_SND_SOC_SOF_PCI=m
+CONFIG_SND_SOC_SOF_OPTIONS=m
+CONFIG_SND_SOC_SOF_NOCODEC=m
+CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT=y
+CONFIG_SND_SOC_SOF_STRICT_ABI_CHECKS=y
+# CONFIG_SND_SOC_SOF_DEBUG is not set
+CONFIG_SND_SOC_SOF=m
 
 #
 # STMicroelectronics STM32 SOC audio support
 #
+# end of STMicroelectronics STM32 SOC audio support
 
 #
 # Allwinner SoC Audio support
@@ -4701,6 +5082,8 @@ CONFIG_SND_SOC_MTK_BTCVSD=m
 CONFIG_SND_SUN4I_CODEC=m
 CONFIG_SND_SUN4I_I2S=m
 CONFIG_SND_SUN4I_SPDIF=m
+# end of Allwinner SoC Audio support
+
 CONFIG_SND_SOC_XILINX_I2S=m
 CONFIG_SND_SOC_XILINX_AUDIO_FORMATTER=m
 CONFIG_SND_SOC_XILINX_SPDIF=m
@@ -4752,6 +5135,7 @@ CONFIG_SND_SOC_CS43130=m
 CONFIG_SND_SOC_CS4341=m
 CONFIG_SND_SOC_CS4349=m
 CONFIG_SND_SOC_CS53L30=m
+# CONFIG_SND_SOC_CX2072X is not set
 CONFIG_SND_SOC_DMIC=m
 CONFIG_SND_SOC_ES7134=m
 # CONFIG_SND_SOC_ES7241 is not set
@@ -4762,6 +5146,7 @@ CONFIG_SND_SOC_ES8328_SPI=m
 CONFIG_SND_SOC_GTM601=m
 CONFIG_SND_SOC_INNO_RK3036=m
 CONFIG_SND_SOC_MAX98088=m
+# CONFIG_SND_SOC_MAX98357A is not set
 CONFIG_SND_SOC_MAX98504=m
 # CONFIG_SND_SOC_MAX9867 is not set
 CONFIG_SND_SOC_MAX98927=m
@@ -4854,6 +5239,8 @@ CONFIG_SND_SOC_NAU8810=m
 CONFIG_SND_SOC_NAU8822=m
 CONFIG_SND_SOC_NAU8824=m
 CONFIG_SND_SOC_TPA6130A2=m
+# end of CODEC drivers
+
 CONFIG_SND_SIMPLE_CARD_UTILS=m
 CONFIG_SND_SIMPLE_CARD=m
 CONFIG_SND_AUDIO_GRAPH_CARD=m
@@ -4886,6 +5273,7 @@ CONFIG_HID_CHERRY=m
 CONFIG_HID_CHICONY=m
 # CONFIG_HID_CORSAIR is not set
 CONFIG_HID_COUGAR=m
+CONFIG_HID_MACALLY=m
 CONFIG_HID_PRODIKEYS=m
 # CONFIG_HID_CMEDIA is not set
 # CONFIG_HID_CP2112 is not set
@@ -4964,6 +5352,7 @@ CONFIG_HID_TOPSEED=m
 CONFIG_HID_THRUSTMASTER=m
 CONFIG_THRUSTMASTER_FF=y
 # CONFIG_HID_UDRAW_PS3 is not set
+CONFIG_HID_U2FZERO=m
 CONFIG_HID_WACOM=m
 # CONFIG_HID_WIIMOTE is not set
 # CONFIG_HID_XINMO is not set
@@ -4973,6 +5362,7 @@ CONFIG_HID_ZYDACRON=m
 CONFIG_HID_SENSOR_HUB=y
 # CONFIG_HID_SENSOR_CUSTOM_SENSOR is not set
 # CONFIG_HID_ALPS is not set
+# end of Special HID drivers
 
 #
 # USB HID support
@@ -4986,11 +5376,16 @@ CONFIG_USB_HIDDEV=y
 #
 CONFIG_USB_KBD=m
 CONFIG_USB_MOUSE=m
+# end of USB HID Boot Protocol drivers
+# end of USB HID support
 
 #
 # I2C HID support
 #
 CONFIG_I2C_HID=m
+# end of I2C HID support
+# end of HID support
+
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 CONFIG_USB_SUPPORT=y
 CONFIG_USB_COMMON=y
@@ -5200,6 +5595,8 @@ CONFIG_USB_XUSBATM=m
 # CONFIG_USB_GPIO_VBUS is not set
 # CONFIG_USB_ISP1301 is not set
 # CONFIG_USB_ULPI is not set
+# end of USB Physical Layer drivers
+
 # CONFIG_USB_GADGET is not set
 CONFIG_TYPEC=y
 CONFIG_TYPEC_TCPM=y
@@ -5213,11 +5610,15 @@ CONFIG_TYPEC_TPS6598X=m
 # USB Type-C Multiplexer/DeMultiplexer Switch support
 #
 # CONFIG_TYPEC_MUX_PI3USB30532 is not set
+# end of USB Type-C Multiplexer/DeMultiplexer Switch support
 
 #
 # USB Type-C Alternate Mode drivers
 #
 CONFIG_TYPEC_DP_ALTMODE=m
+CONFIG_TYPEC_NVIDIA_ALTMODE=m
+# end of USB Type-C Alternate Mode drivers
+
 CONFIG_USB_ROLE_SWITCH=y
 CONFIG_USB_LED_TRIG=y
 # CONFIG_USB_ULPI_BUS is not set
@@ -5239,6 +5640,7 @@ CONFIG_SDIO_UART=m
 #
 # CONFIG_MMC_DEBUG is not set
 CONFIG_MMC_SDHCI=m
+CONFIG_MMC_SDHCI_IO_ACCESSORS=y
 CONFIG_MMC_SDHCI_PCI=m
 CONFIG_MMC_RICOH_MMC=y
 CONFIG_MMC_SDHCI_PLTFM=m
@@ -5300,6 +5702,7 @@ CONFIG_LEDS_AN30259A=m
 # CONFIG_LEDS_BCM6358 is not set
 # CONFIG_LEDS_CR0014114 is not set
 # CONFIG_LEDS_LM3530 is not set
+CONFIG_LEDS_LM3532=m
 # CONFIG_LEDS_LM3642 is not set
 # CONFIG_LEDS_LM3692X is not set
 # CONFIG_LEDS_LM3601X is not set
@@ -5324,6 +5727,7 @@ CONFIG_LEDS_LT3593=m
 # CONFIG_LEDS_NETXBIG is not set
 # CONFIG_LEDS_TCA6507 is not set
 # CONFIG_LEDS_TLC591XX is not set
+CONFIG_LEDS_MAX77650=m
 # CONFIG_LEDS_LM355x is not set
 # CONFIG_LEDS_KTD2692 is not set
 # CONFIG_LEDS_IS31FL319X is not set
@@ -5336,6 +5740,8 @@ CONFIG_LEDS_LT3593=m
 # CONFIG_LEDS_SYSCON is not set
 # CONFIG_LEDS_MLXREG is not set
 # CONFIG_LEDS_USER is not set
+# CONFIG_LEDS_SPI_BYTE is not set
+# CONFIG_LEDS_TI_LMU_COMMON is not set
 
 #
 # LED Triggers
@@ -5411,6 +5817,7 @@ CONFIG_RTC_DRV_PCF8563=y
 CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_M41T80=m
 # CONFIG_RTC_DRV_M41T80_WDT is not set
+# CONFIG_RTC_DRV_BD70528 is not set
 CONFIG_RTC_DRV_BQ32K=m
 CONFIG_RTC_DRV_S35390A=y
 CONFIG_RTC_DRV_FM3130=m
@@ -5518,6 +5925,8 @@ CONFIG_DMA_ENGINE_RAID=y
 #
 # CONFIG_SYNC_FILE is not set
 CONFIG_UDMABUF=y
+# end of DMABUF options
+
 # CONFIG_AUXDISPLAY is not set
 # CONFIG_PANEL is not set
 CONFIG_UIO=m
@@ -5541,6 +5950,8 @@ CONFIG_VIRTIO_INPUT=m
 #
 # Microsoft Hyper-V guest support
 #
+# end of Microsoft Hyper-V guest support
+
 CONFIG_STAGING=y
 # CONFIG_PRISM2_USB is not set
 # CONFIG_COMEDI is not set
@@ -5554,8 +5965,6 @@ CONFIG_RTL8723BS=m
 # CONFIG_R8712U is not set
 CONFIG_R8188EU=m
 # CONFIG_88EU_AP_MODE is not set
-CONFIG_R8822BE=m
-CONFIG_RTLWIFI_DEBUG_ST=y
 CONFIG_RTS5208=m
 # CONFIG_VT6655 is not set
 # CONFIG_VT6656 is not set
@@ -5576,11 +5985,15 @@ CONFIG_SPEAKUP_SYNTH_SOFT=m
 CONFIG_SPEAKUP_SYNTH_SPKOUT=m
 CONFIG_SPEAKUP_SYNTH_TXPRT=m
 CONFIG_SPEAKUP_SYNTH_DUMMY=m
+# end of Speakup console speech
+
 # CONFIG_STAGING_MEDIA is not set
 
 #
 # Android
 #
+# end of Android
+
 # CONFIG_STAGING_BOARD is not set
 CONFIG_LTE_GDM724X=m
 # CONFIG_FIREWIRE_SERIAL is not set
@@ -5633,6 +6046,8 @@ CONFIG_PI433=m
 #
 # Gasket devices
 #
+# end of Gasket devices
+
 CONFIG_XIL_AXIS_FIFO=m
 CONFIG_EROFS_FS=m
 # CONFIG_EROFS_FS_DEBUG is not set
@@ -5643,6 +6058,27 @@ CONFIG_EROFS_FS_SECURITY=y
 # CONFIG_EROFS_FAULT_INJECTION is not set
 CONFIG_EROFS_FS_IO_MAX_RETRIES=5
 # CONFIG_EROFS_FS_ZIP is not set
+# CONFIG_FIELDBUS_DEV is not set
+# CONFIG_KPC2000 is not set
+
+#
+# ISDN CAPI drivers
+#
+CONFIG_CAPI_AVM=y
+CONFIG_ISDN_DRV_AVMB1_B1PCI=m
+CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
+CONFIG_ISDN_DRV_AVMB1_T1PCI=m
+CONFIG_ISDN_DRV_AVMB1_C4=m
+CONFIG_ISDN_DRV_GIGASET=m
+CONFIG_GIGASET_CAPI=y
+CONFIG_GIGASET_BASE=m
+CONFIG_GIGASET_M105=m
+CONFIG_GIGASET_M101=m
+# CONFIG_GIGASET_DEBUG is not set
+CONFIG_HYSDN=m
+CONFIG_HYSDN_CAPI=y
+# end of ISDN CAPI drivers
+
 # CONFIG_GOLDFISH is not set
 # CONFIG_CHROME_PLATFORMS is not set
 # CONFIG_MELLANOX_PLATFORM is not set
@@ -5655,6 +6091,7 @@ CONFIG_COMMON_CLK=y
 #
 # CONFIG_CLK_HSDK is not set
 # CONFIG_COMMON_CLK_MAX9485 is not set
+# CONFIG_COMMON_CLK_SI5341 is not set
 # CONFIG_COMMON_CLK_SI5351 is not set
 # CONFIG_COMMON_CLK_SI514 is not set
 # CONFIG_COMMON_CLK_SI544 is not set
@@ -5667,11 +6104,18 @@ CONFIG_COMMON_CLK_CS2000_CP=m
 # CONFIG_COMMON_CLK_FIXED_MMIO is not set
 CONFIG_MVEBU_CLK_COMMON=y
 CONFIG_KIRKWOOD_CLK=y
+CONFIG_CLK_SUNXI=y
+CONFIG_CLK_SUNXI_CLOCKS=y
+CONFIG_CLK_SUNXI_PRCM_SUN6I=y
+CONFIG_CLK_SUNXI_PRCM_SUN8I=y
+CONFIG_CLK_SUNXI_PRCM_SUN9I=y
 CONFIG_SUNXI_CCU=y
 CONFIG_SUNIV_F1C100S_CCU=y
 # CONFIG_SUN8I_A83T_CCU is not set
 # CONFIG_SUN8I_DE2_CCU is not set
 # CONFIG_SUN8I_R_CCU is not set
+# end of Common Clock Framework
+
 # CONFIG_HWSPINLOCK is not set
 
 #
@@ -5682,7 +6126,8 @@ CONFIG_TIMER_PROBE=y
 CONFIG_CLKSRC_MMIO=y
 CONFIG_ORION_TIMER=y
 CONFIG_SUN4I_TIMER=y
-# CONFIG_ARM_TIMER_SP804 is not set
+# end of Clock Source drivers
+
 # CONFIG_MAILBOX is not set
 CONFIG_IOMMU_SUPPORT=y
 
@@ -5691,6 +6136,8 @@ CONFIG_IOMMU_SUPPORT=y
 #
 # CONFIG_IOMMU_IO_PGTABLE_LPAE is not set
 # CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set
+# end of Generic IOMMU Pagetable Support
+
 # CONFIG_IOMMU_DEBUGFS is not set
 # CONFIG_ARM_SMMU is not set
 
@@ -5698,11 +6145,14 @@ CONFIG_IOMMU_SUPPORT=y
 # Remoteproc drivers
 #
 # CONFIG_REMOTEPROC is not set
+# end of Remoteproc drivers
 
 #
 # Rpmsg drivers
 #
 # CONFIG_RPMSG_VIRTIO is not set
+# end of Rpmsg drivers
+
 # CONFIG_SOUNDWIRE is not set
 
 #
@@ -5712,23 +6162,34 @@ CONFIG_IOMMU_SUPPORT=y
 #
 # Amlogic SoC drivers
 #
+# end of Amlogic SoC drivers
+
+#
+# Aspeed SoC drivers
+#
+# end of Aspeed SoC drivers
 
 #
 # Broadcom SoC drivers
 #
 # CONFIG_SOC_BRCMSTB is not set
+# end of Broadcom SoC drivers
 
 #
 # NXP/Freescale QorIQ SoC drivers
 #
+# end of NXP/Freescale QorIQ SoC drivers
 
 #
 # i.MX SoC drivers
 #
+# end of i.MX SoC drivers
 
 #
 # Qualcomm SoC drivers
 #
+# end of Qualcomm SoC drivers
+
 CONFIG_SUNXI_SRAM=y
 # CONFIG_SOC_TI is not set
 
@@ -5736,6 +6197,9 @@ CONFIG_SUNXI_SRAM=y
 # Xilinx SoC drivers
 #
 # CONFIG_XILINX_VCU is not set
+# end of Xilinx SoC drivers
+# end of SOC (System On Chip) specific Drivers
+
 # CONFIG_PM_DEVFREQ is not set
 # CONFIG_EXTCON is not set
 # CONFIG_MEMORY is not set
@@ -5748,16 +6212,17 @@ CONFIG_SUNXI_SRAM=y
 # IRQ chip support
 #
 CONFIG_IRQCHIP=y
-CONFIG_ARM_GIC_MAX_NR=1
+# CONFIG_AL_FIC is not set
 CONFIG_MADERA_IRQ=m
 CONFIG_ORION_IRQCHIP=y
+# end of IRQ chip support
+
 # CONFIG_IPACK_BUS is not set
 CONFIG_ARCH_HAS_RESET_CONTROLLER=y
 CONFIG_RESET_CONTROLLER=y
 CONFIG_RESET_SIMPLE=y
 CONFIG_RESET_SUNXI=y
 CONFIG_RESET_TI_SYSCON=m
-# CONFIG_FMC is not set
 
 #
 # PHY Subsystem
@@ -5771,6 +6236,7 @@ CONFIG_PHY_CADENCE_DP=m
 CONFIG_PHY_CADENCE_DPHY=m
 CONFIG_PHY_CADENCE_SIERRA=m
 CONFIG_PHY_FSL_IMX8MQ_USB=m
+# CONFIG_PHY_MIXEL_MIPI_DPHY is not set
 CONFIG_PHY_MVEBU_A3700_UTMI=y
 # CONFIG_PHY_MVEBU_A38X_COMPHY is not set
 # CONFIG_PHY_MVEBU_CP110_COMPHY is not set
@@ -5779,6 +6245,8 @@ CONFIG_PHY_PXA_28NM_HSIC=m
 CONFIG_PHY_PXA_28NM_USB2=m
 # CONFIG_PHY_MAPPHONE_MDM6600 is not set
 CONFIG_PHY_OCELOT_SERDES=m
+# end of PHY Subsystem
+
 # CONFIG_POWERCAP is not set
 # CONFIG_MCB is not set
 
@@ -5787,14 +6255,19 @@ CONFIG_PHY_OCELOT_SERDES=m
 #
 # CONFIG_ARM_CCN is not set
 CONFIG_ARM_PMU=y
+# end of Performance monitor support
+
 CONFIG_RAS=y
 
 #
 # Android
 #
 # CONFIG_ANDROID is not set
+# end of Android
+
 CONFIG_DAX=m
 CONFIG_NVMEM=y
+CONFIG_NVMEM_SYSFS=y
 CONFIG_NVMEM_SUNXI_SID=m
 
 #
@@ -5802,6 +6275,8 @@ CONFIG_NVMEM_SUNXI_SID=m
 #
 # CONFIG_STM is not set
 # CONFIG_INTEL_TH is not set
+# end of HW tracing support
+
 # CONFIG_FPGA is not set
 # CONFIG_FSI is not set
 CONFIG_MULTIPLEXER=m
@@ -5813,10 +6288,14 @@ CONFIG_MULTIPLEXER=m
 # CONFIG_MUX_ADGS1408 is not set
 # CONFIG_MUX_GPIO is not set
 # CONFIG_MUX_MMIO is not set
+# end of Multiplexer drivers
+
 CONFIG_PM_OPP=y
 # CONFIG_SIOX is not set
 # CONFIG_SLIMBUS is not set
 CONFIG_INTERCONNECT=m
+# CONFIG_COUNTER is not set
+# end of Device Drivers
 
 #
 # File systems
@@ -5916,6 +6395,7 @@ CONFIG_FSCACHE_STATS=y
 CONFIG_CACHEFILES=m
 # CONFIG_CACHEFILES_DEBUG is not set
 # CONFIG_CACHEFILES_HISTOGRAM is not set
+# end of Caches
 
 #
 # CD-ROM/DVD Filesystems
@@ -5924,6 +6404,7 @@ CONFIG_ISO9660_FS=m
 CONFIG_JOLIET=y
 CONFIG_ZISOFS=y
 CONFIG_UDF_FS=m
+# end of CD-ROM/DVD Filesystems
 
 #
 # DOS/FAT/NT Filesystems
@@ -5937,6 +6418,7 @@ CONFIG_FAT_DEFAULT_UTF8=y
 CONFIG_NTFS_FS=m
 # CONFIG_NTFS_DEBUG is not set
 CONFIG_NTFS_RW=y
+# end of DOS/FAT/NT Filesystems
 
 #
 # Pseudo filesystems
@@ -5952,6 +6434,8 @@ CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_TMPFS_XATTR=y
 CONFIG_MEMFD_CREATE=y
 CONFIG_CONFIGFS_FS=m
+# end of Pseudo filesystems
+
 CONFIG_MISC_FILESYSTEMS=y
 CONFIG_ORANGEFS_FS=y
 CONFIG_ADFS_FS=m
@@ -5986,6 +6470,7 @@ CONFIG_UBIFS_FS=y
 CONFIG_UBIFS_FS_ADVANCED_COMPR=y
 CONFIG_UBIFS_FS_LZO=y
 CONFIG_UBIFS_FS_ZLIB=y
+CONFIG_UBIFS_FS_ZSTD=y
 # CONFIG_UBIFS_ATIME_SUPPORT is not set
 CONFIG_UBIFS_FS_XATTR=y
 CONFIG_UBIFS_FS_SECURITY=y
@@ -6065,11 +6550,12 @@ CONFIG_SUNRPC_GSS=y
 CONFIG_SUNRPC_BACKCHANNEL=y
 CONFIG_SUNRPC_SWAP=y
 CONFIG_RPCSEC_GSS_KRB5=m
-CONFIG_CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y
+# CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES is not set
 CONFIG_SUNRPC_DEBUG=y
 CONFIG_CEPH_FS=m
 # CONFIG_CEPH_FSCACHE is not set
 # CONFIG_CEPH_FS_POSIX_ACL is not set
+# CONFIG_CEPH_FS_SECURITY_LABEL is not set
 CONFIG_CIFS=m
 CONFIG_CIFS_STATS2=y
 CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
@@ -6077,7 +6563,6 @@ CONFIG_CIFS_WEAK_PW_HASH=y
 CONFIG_CIFS_UPCALL=y
 CONFIG_CIFS_XATTR=y
 CONFIG_CIFS_POSIX=y
-CONFIG_CIFS_ACL=y
 CONFIG_CIFS_DEBUG=y
 # CONFIG_CIFS_DEBUG2 is not set
 # CONFIG_CIFS_DEBUG_DUMP_KEYS is not set
@@ -6141,11 +6626,15 @@ CONFIG_NLS_KOI8_U=m
 CONFIG_NLS_UTF8=y
 CONFIG_DLM=m
 CONFIG_DLM_DEBUG=y
+CONFIG_UNICODE=y
+# CONFIG_UNICODE_NORMALIZATION_SELFTEST is not set
+# end of File systems
 
 #
 # Security options
 #
 CONFIG_KEYS=y
+# CONFIG_KEYS_REQUEST_CACHE is not set
 CONFIG_PERSISTENT_KEYRINGS=y
 CONFIG_BIG_KEYS=y
 CONFIG_ENCRYPTED_KEYS=y
@@ -6176,6 +6665,7 @@ CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024
 # CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set
 CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init"
 CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/sbin/init"
+# CONFIG_SECURITY_TOMOYO_INSECURE_BUILTIN_SETTING is not set
 CONFIG_SECURITY_APPARMOR=y
 CONFIG_SECURITY_APPARMOR_HASH=y
 CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y
@@ -6187,6 +6677,7 @@ CONFIG_INTEGRITY=y
 CONFIG_INTEGRITY_SIGNATURE=y
 CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y
 CONFIG_INTEGRITY_TRUSTED_KEYRING=y
+# CONFIG_INTEGRITY_PLATFORM_KEYRING is not set
 CONFIG_INTEGRITY_AUDIT=y
 # CONFIG_IMA is not set
 # CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set
@@ -6196,6 +6687,24 @@ CONFIG_INTEGRITY_AUDIT=y
 # CONFIG_DEFAULT_SECURITY_APPARMOR is not set
 CONFIG_DEFAULT_SECURITY_DAC=y
 CONFIG_LSM="yama,loadpin,safesetid,integrity"
+
+#
+# Kernel hardening options
+#
+
+#
+# Memory initialization
+#
+CONFIG_INIT_STACK_NONE=y
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_USER is not set
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL is not set
+# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
+# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
+# end of Memory initialization
+# end of Kernel hardening options
+# end of Security options
+
 CONFIG_XOR_BLOCKS=m
 CONFIG_ASYNC_CORE=m
 CONFIG_ASYNC_MEMCPY=m
@@ -6223,9 +6732,6 @@ CONFIG_CRYPTO_AKCIPHER=y
 CONFIG_CRYPTO_KPP2=y
 CONFIG_CRYPTO_KPP=y
 CONFIG_CRYPTO_ACOMP2=y
-CONFIG_CRYPTO_RSA=y
-CONFIG_CRYPTO_DH=y
-CONFIG_CRYPTO_ECDH=m
 CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MANAGER2=y
 # CONFIG_CRYPTO_USER is not set
@@ -6234,12 +6740,20 @@ CONFIG_CRYPTO_MANAGER2=y
 CONFIG_CRYPTO_GF128MUL=y
 CONFIG_CRYPTO_NULL=y
 CONFIG_CRYPTO_NULL2=y
-CONFIG_CRYPTO_WORKQUEUE=y
 # CONFIG_CRYPTO_CRYPTD is not set
 CONFIG_CRYPTO_AUTHENC=m
 CONFIG_CRYPTO_TEST=m
 CONFIG_CRYPTO_ENGINE=m
 
+#
+# Public-key cryptography
+#
+CONFIG_CRYPTO_RSA=y
+CONFIG_CRYPTO_DH=y
+CONFIG_CRYPTO_ECC=m
+CONFIG_CRYPTO_ECDH=m
+CONFIG_CRYPTO_ECRDSA=m
+
 #
 # Authenticated Encryption with Associated Data
 #
@@ -6283,6 +6797,7 @@ CONFIG_CRYPTO_VMAC=m
 #
 CONFIG_CRYPTO_CRC32C=y
 CONFIG_CRYPTO_CRC32=y
+# CONFIG_CRYPTO_XXHASH is not set
 CONFIG_CRYPTO_CRCT10DIF=y
 CONFIG_CRYPTO_GHASH=y
 CONFIG_CRYPTO_POLY1305=m
@@ -6298,7 +6813,7 @@ CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA512=m
 CONFIG_CRYPTO_SHA3=m
 CONFIG_CRYPTO_SM3=m
-# CONFIG_CRYPTO_STREEBOG is not set
+CONFIG_CRYPTO_STREEBOG=m
 CONFIG_CRYPTO_TGR192=m
 CONFIG_CRYPTO_WP512=m
 
@@ -6308,6 +6823,7 @@ CONFIG_CRYPTO_WP512=m
 CONFIG_CRYPTO_AES=y
 CONFIG_CRYPTO_AES_TI=m
 CONFIG_CRYPTO_ANUBIS=m
+CONFIG_CRYPTO_LIB_ARC4=y
 CONFIG_CRYPTO_ARC4=y
 CONFIG_CRYPTO_BLOWFISH=m
 CONFIG_CRYPTO_BLOWFISH_COMMON=m
@@ -6335,7 +6851,7 @@ CONFIG_CRYPTO_LZO=y
 CONFIG_CRYPTO_842=m
 CONFIG_CRYPTO_LZ4=m
 CONFIG_CRYPTO_LZ4HC=m
-# CONFIG_CRYPTO_ZSTD is not set
+CONFIG_CRYPTO_ZSTD=y
 
 #
 # Random Number Generation
@@ -6357,6 +6873,8 @@ CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_MARVELL_CESA=m
 CONFIG_CRYPTO_DEV_HIFN_795X=m
 CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
+# CONFIG_CRYPTO_DEV_ATMEL_ECC is not set
+# CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set
 CONFIG_CRYPTO_DEV_SUN4I_SS=m
 # CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG is not set
 CONFIG_CRYPTO_DEV_CHELSIO=m
@@ -6381,6 +6899,8 @@ CONFIG_SYSTEM_TRUSTED_KEYS=""
 CONFIG_SECONDARY_TRUSTED_KEYRING=y
 CONFIG_SYSTEM_BLACKLIST_KEYRING=y
 CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
+# end of Certificates for signature checking
+
 CONFIG_BINARY_PRINTF=y
 
 #
@@ -6388,11 +6908,13 @@ CONFIG_BINARY_PRINTF=y
 #
 CONFIG_RAID6_PQ=m
 CONFIG_RAID6_PQ_BENCHMARK=y
+CONFIG_PACKING=y
 CONFIG_BITREVERSE=y
-CONFIG_RATIONAL=y
 CONFIG_GENERIC_STRNCPY_FROM_USER=y
 CONFIG_GENERIC_STRNLEN_USER=y
 CONFIG_GENERIC_NET_UTILS=y
+CONFIG_CORDIC=m
+CONFIG_RATIONAL=y
 CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
 CONFIG_CRC_CCITT=m
@@ -6422,8 +6944,8 @@ CONFIG_LZO_DECOMPRESS=y
 CONFIG_LZ4_COMPRESS=m
 CONFIG_LZ4HC_COMPRESS=m
 CONFIG_LZ4_DECOMPRESS=y
-CONFIG_ZSTD_COMPRESS=m
-CONFIG_ZSTD_DECOMPRESS=m
+CONFIG_ZSTD_COMPRESS=y
+CONFIG_ZSTD_DECOMPRESS=y
 CONFIG_XZ_DEC=y
 CONFIG_XZ_DEC_X86=y
 CONFIG_XZ_DEC_POWERPC=y
@@ -6440,6 +6962,7 @@ CONFIG_DECOMPRESS_XZ=y
 CONFIG_DECOMPRESS_LZO=y
 CONFIG_DECOMPRESS_LZ4=y
 CONFIG_GENERIC_ALLOCATOR=y
+CONFIG_BCH=m
 CONFIG_TEXTSEARCH=y
 CONFIG_TEXTSEARCH_KMP=m
 CONFIG_TEXTSEARCH_BM=m
@@ -6463,11 +6986,10 @@ CONFIG_NLATTR=y
 CONFIG_GENERIC_ATOMIC64=y
 CONFIG_LRU_CACHE=m
 CONFIG_CLZ_TAB=y
-CONFIG_CORDIC=m
-# CONFIG_DDR is not set
 CONFIG_IRQ_POLL=y
 CONFIG_MPILIB=y
 CONFIG_SIGNATURE=y
+CONFIG_DIMLIB=y
 CONFIG_LIBFDT=y
 CONFIG_OID_REGISTRY=y
 CONFIG_FONT_SUPPORT=m
@@ -6477,6 +6999,7 @@ CONFIG_FONT_8x16=y
 CONFIG_SG_POOL=y
 CONFIG_SBITMAP=y
 # CONFIG_STRING_SELFTEST is not set
+# end of Library routines
 
 #
 # Kernel hacking
@@ -6492,6 +7015,7 @@ CONFIG_CONSOLE_LOGLEVEL_QUIET=4
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 CONFIG_BOOT_PRINTK_DELAY=y
 CONFIG_DYNAMIC_DEBUG=y
+# end of printk and dmesg options
 
 #
 # Compile-time checks and compiler options
@@ -6503,14 +7027,18 @@ CONFIG_STRIP_ASM_SYMS=y
 # CONFIG_READABLE_ASM is not set
 CONFIG_UNUSED_SYMBOLS=y
 CONFIG_DEBUG_FS=y
-# CONFIG_HEADERS_CHECK is not set
+# CONFIG_HEADERS_INSTALL is not set
+# CONFIG_OPTIMIZE_INLINING is not set
 # CONFIG_DEBUG_SECTION_MISMATCH is not set
 CONFIG_SECTION_MISMATCH_WARN_ONLY=y
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+# end of Compile-time checks and compiler options
+
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
 CONFIG_MAGIC_SYSRQ_SERIAL=y
 CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_MISC=y
 
 #
 # Memory Debugging
@@ -6531,6 +7059,8 @@ CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
 CONFIG_DEBUG_MEMORY_INIT=y
 CONFIG_CC_HAS_KASAN_GENERIC=y
 CONFIG_KASAN_STACK=1
+# end of Memory Debugging
+
 CONFIG_ARCH_HAS_KCOV=y
 CONFIG_CC_HAS_SANCOV_TRACE_PC=y
 # CONFIG_KCOV is not set
@@ -6545,6 +7075,8 @@ CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
 CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
 # CONFIG_WQ_WATCHDOG is not set
+# end of Debug Lockups and Hangs
+
 # CONFIG_PANIC_ON_OOPS is not set
 CONFIG_PANIC_ON_OOPS_VALUE=0
 CONFIG_PANIC_TIMEOUT=0
@@ -6565,17 +7097,20 @@ CONFIG_LOCK_DEBUGGING_SUPPORT=y
 # CONFIG_DEBUG_SPINLOCK is not set
 # CONFIG_DEBUG_MUTEXES is not set
 # CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
+# CONFIG_DEBUG_RWSEMS is not set
 # CONFIG_DEBUG_LOCK_ALLOC is not set
 # CONFIG_DEBUG_ATOMIC_SLEEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_LOCK_TORTURE_TEST is not set
 # CONFIG_WW_MUTEX_SELFTEST is not set
+# end of Lock Debugging (spinlocks, mutexes, etc...)
+
 CONFIG_STACKTRACE=y
 # CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
 # CONFIG_DEBUG_KOBJECT is not set
 CONFIG_DEBUG_BUGVERBOSE=y
 CONFIG_DEBUG_LIST=y
-# CONFIG_DEBUG_PI_LIST is not set
+# CONFIG_DEBUG_PLIST is not set
 CONFIG_DEBUG_SG=y
 # CONFIG_DEBUG_NOTIFIERS is not set
 # CONFIG_DEBUG_CREDENTIALS is not set
@@ -6589,6 +7124,8 @@ CONFIG_RCU_PERF_TEST=m
 CONFIG_RCU_CPU_STALL_TIMEOUT=21
 # CONFIG_RCU_TRACE is not set
 # CONFIG_RCU_EQS_DEBUG is not set
+# end of RCU Debugging
+
 # CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
 # CONFIG_NOTIFIER_ERROR_INJECTION is not set
@@ -6633,19 +7170,20 @@ CONFIG_PROBE_EVENTS=y
 # CONFIG_RING_BUFFER_STARTUP_TEST is not set
 CONFIG_PREEMPTIRQ_DELAY_TEST=m
 # CONFIG_TRACE_EVAL_MAP_FILE is not set
-CONFIG_TRACING_EVENTS_GPIO=y
 CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_LKDTM is not set
 # CONFIG_TEST_LIST_SORT is not set
 # CONFIG_TEST_SORT is not set
 # CONFIG_BACKTRACE_SELF_TEST is not set
 # CONFIG_RBTREE_TEST is not set
+# CONFIG_REED_SOLOMON_TEST is not set
 # CONFIG_INTERVAL_TREE_TEST is not set
 # CONFIG_PERCPU_TEST is not set
 # CONFIG_ATOMIC64_SELFTEST is not set
 # CONFIG_ASYNC_RAID6_TEST is not set
 # CONFIG_TEST_HEXDUMP is not set
 # CONFIG_TEST_STRING_HELPERS is not set
+# CONFIG_TEST_STRSCPY is not set
 # CONFIG_TEST_KSTRTOX is not set
 # CONFIG_TEST_PRINTF is not set
 # CONFIG_TEST_BITMAP is not set
@@ -6660,6 +7198,7 @@ CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_TEST_VMALLOC is not set
 # CONFIG_TEST_USER_COPY is not set
 # CONFIG_TEST_BPF is not set
+# CONFIG_TEST_BLACKHOLE_DEV is not set
 # CONFIG_FIND_BIT_BENCHMARK is not set
 # CONFIG_TEST_FIRMWARE is not set
 # CONFIG_TEST_SYSCTL is not set
@@ -6668,6 +7207,7 @@ CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_TEST_KMOD is not set
 # CONFIG_TEST_MEMCAT_P is not set
 # CONFIG_TEST_STACKINIT is not set
+# CONFIG_TEST_MEMINIT is not set
 # CONFIG_MEMTEST is not set
 CONFIG_BUG_ON_DATA_CORRUPTION=y
 # CONFIG_SAMPLES is not set
@@ -6703,3 +7243,4 @@ CONFIG_DEBUG_UNCOMPRESS=y
 CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
 CONFIG_EARLY_PRINTK=y
 # CONFIG_CORESIGHT is not set
+# end of Kernel hacking
diff --git a/srcpkgs/linux5.1/files/arm64-dotconfig b/srcpkgs/linux5.3/files/arm64-dotconfig
similarity index 91%
rename from srcpkgs/linux5.1/files/arm64-dotconfig
rename to srcpkgs/linux5.3/files/arm64-dotconfig
index 173df8dea8c..1ebc514bfc4 100644
--- a/srcpkgs/linux5.1/files/arm64-dotconfig
+++ b/srcpkgs/linux5.3/files/arm64-dotconfig
@@ -1,14 +1,15 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.1.18 Kernel Configuration
+# Linux/arm64 5.3.0 Kernel Configuration
 #
 
 #
-# Compiler: aarch64-linux-gnu-gcc (GCC) 9.1.0
+# Compiler: aarch64-linux-gnu-gcc (GCC) 9.2.0
 #
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=90100
+CONFIG_GCC_VERSION=90200
 CONFIG_CLANG_VERSION=0
+CONFIG_CC_CAN_LINK=y
 CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y
 CONFIG_IRQ_WORK=y
@@ -20,6 +21,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
 #
 CONFIG_INIT_ENV_ARG_LIMIT=32
 # CONFIG_COMPILE_TEST is not set
+# CONFIG_HEADER_TEST is not set
 CONFIG_LOCALVERSION="_1"
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_BUILD_SALT=""
@@ -50,10 +52,13 @@ CONFIG_IRQ_DOMAIN_HIERARCHY=y
 CONFIG_IRQ_FASTEOI_HIERARCHY_HANDLERS=y
 CONFIG_GENERIC_MSI_IRQ=y
 CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
+CONFIG_IRQ_MSI_IOMMU=y
 CONFIG_HANDLE_DOMAIN_IRQ=y
 CONFIG_IRQ_FORCED_THREADING=y
 CONFIG_SPARSE_IRQ=y
 # CONFIG_GENERIC_IRQ_DEBUGFS is not set
+# end of IRQ subsystem
+
 CONFIG_GENERIC_IRQ_MULTI_HANDLER=y
 CONFIG_ARCH_CLOCKSOURCE_DATA=y
 CONFIG_GENERIC_TIME_VSYSCALL=y
@@ -71,6 +76,8 @@ CONFIG_NO_HZ_IDLE=y
 # CONFIG_NO_HZ_FULL is not set
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
+# end of Timers subsystem
+
 # CONFIG_PREEMPT_NONE is not set
 CONFIG_PREEMPT_VOLUNTARY=y
 # CONFIG_PREEMPT is not set
@@ -88,7 +95,10 @@ CONFIG_TASKSTATS=y
 CONFIG_TASK_DELAY_ACCT=y
 CONFIG_TASK_XACCT=y
 CONFIG_TASK_IO_ACCOUNTING=y
-# CONFIG_PSI is not set
+CONFIG_PSI=y
+CONFIG_PSI_DEFAULT_DISABLED=y
+# end of CPU/Task time and stats accounting
+
 CONFIG_CPU_ISOLATION=y
 
 #
@@ -101,13 +111,22 @@ CONFIG_TREE_SRCU=y
 CONFIG_TASKS_RCU=y
 CONFIG_RCU_STALL_COMMON=y
 CONFIG_RCU_NEED_SEGCBLIST=y
-CONFIG_BUILD_BIN2C=y
+# end of RCU Subsystem
+
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
+CONFIG_IKHEADERS=m
 CONFIG_LOG_BUF_SHIFT=18
 CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
 CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
 CONFIG_GENERIC_SCHED_CLOCK=y
+
+#
+# Scheduler features
+#
+# CONFIG_UCLAMP_TASK is not set
+# end of Scheduler features
+
 CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
 CONFIG_ARCH_SUPPORTS_INT128=y
 CONFIG_CGROUPS=y
@@ -117,7 +136,6 @@ CONFIG_MEMCG_SWAP=y
 CONFIG_MEMCG_SWAP_ENABLED=y
 CONFIG_MEMCG_KMEM=y
 CONFIG_BLK_CGROUP=y
-# CONFIG_DEBUG_BLK_CGROUP is not set
 CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
@@ -156,7 +174,6 @@ CONFIG_RD_LZ4=y
 CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
-CONFIG_ANON_INODES=y
 CONFIG_HAVE_UID16=y
 CONFIG_SYSCTL_EXCEPTION_TRACE=y
 CONFIG_BPF=y
@@ -202,6 +219,8 @@ CONFIG_HAVE_PERF_EVENTS=y
 #
 CONFIG_PERF_EVENTS=y
 # CONFIG_DEBUG_PERF_USE_VMALLOC is not set
+# end of Kernel Performance Events And Counters
+
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_SLUB_DEBUG=y
 # CONFIG_SLUB_MEMCG_SYSFS_ON is not set
@@ -212,10 +231,13 @@ CONFIG_SLUB=y
 CONFIG_SLAB_MERGE_DEFAULT=y
 CONFIG_SLAB_FREELIST_RANDOM=y
 # CONFIG_SLAB_FREELIST_HARDENED is not set
+CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
 CONFIG_SLUB_CPU_PARTIAL=y
 CONFIG_SYSTEM_DATA_VERIFICATION=y
 CONFIG_PROFILING=y
 CONFIG_TRACEPOINTS=y
+# end of General setup
+
 CONFIG_ARM64=y
 CONFIG_64BIT=y
 CONFIG_MMU=y
@@ -229,14 +251,12 @@ CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
 CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CSUM=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_ZONE_DMA32=y
-CONFIG_HAVE_GENERIC_GUP=y
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 CONFIG_SMP=y
 CONFIG_KERNEL_MODE_NEON=y
@@ -249,6 +269,7 @@ CONFIG_ARCH_PROC_KCORE_TEXT=y
 # Platform selection
 #
 CONFIG_ARCH_ACTIONS=y
+# CONFIG_ARCH_AGILEX is not set
 CONFIG_ARCH_SUNXI=y
 CONFIG_ARCH_ALPINE=y
 CONFIG_ARCH_BCM2835=y
@@ -281,6 +302,7 @@ CONFIG_ARCH_VEXPRESS=y
 CONFIG_ARCH_XGENE=y
 CONFIG_ARCH_ZX=y
 CONFIG_ARCH_ZYNQMP=y
+# end of Platform selection
 
 #
 # Kernel Features
@@ -299,7 +321,7 @@ CONFIG_ARM64_ERRATUM_834220=y
 CONFIG_ARM64_ERRATUM_845719=y
 CONFIG_ARM64_ERRATUM_843419=y
 CONFIG_ARM64_ERRATUM_1024718=y
-CONFIG_ARM64_ERRATUM_1188873=y
+CONFIG_ARM64_ERRATUM_1418040=y
 CONFIG_ARM64_ERRATUM_1165522=y
 CONFIG_ARM64_ERRATUM_1286807=y
 CONFIG_ARM64_ERRATUM_1463225=y
@@ -315,6 +337,8 @@ CONFIG_SOCIONEXT_SYNQUACER_PREITS=y
 CONFIG_HISILICON_ERRATUM_161600802=y
 CONFIG_QCOM_FALKOR_ERRATUM_E1041=y
 CONFIG_FUJITSU_ERRATUM_010001=y
+# end of ARM errata workarounds via the alternatives framework
+
 # CONFIG_ARM64_4K_PAGES is not set
 # CONFIG_ARM64_16K_PAGES is not set
 CONFIG_ARM64_64K_PAGES=y
@@ -347,6 +371,7 @@ CONFIG_HAVE_ARCH_PFN_VALID=y
 CONFIG_HW_PERF_EVENTS=y
 CONFIG_SYS_SUPPORTS_HUGETLBFS=y
 CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
+CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
 CONFIG_SECCOMP=y
 CONFIG_PARAVIRT=y
 CONFIG_PARAVIRT_TIME_ACCOUNTING=y
@@ -361,8 +386,10 @@ CONFIG_HARDEN_BRANCH_PREDICTOR=y
 CONFIG_HARDEN_EL2_VECTORS=y
 CONFIG_ARM64_SSBD=y
 CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
-# CONFIG_ARMV8_DEPRECATED is not set
 CONFIG_ARM64_SW_TTBR0_PAN=y
+CONFIG_COMPAT=y
+CONFIG_KUSER_HELPERS=y
+# CONFIG_ARMV8_DEPRECATED is not set
 
 #
 # ARMv8.1 architectural features
@@ -371,6 +398,7 @@ CONFIG_ARM64_HW_AFDBM=y
 CONFIG_ARM64_PAN=y
 # CONFIG_ARM64_LSE_ATOMICS is not set
 CONFIG_ARM64_VHE=y
+# end of ARMv8.1 architectural features
 
 #
 # ARMv8.2 architectural features
@@ -379,18 +407,23 @@ CONFIG_ARM64_UAO=y
 CONFIG_ARM64_PMEM=y
 CONFIG_ARM64_RAS_EXTN=y
 CONFIG_ARM64_CNP=y
+# end of ARMv8.2 architectural features
 
 #
 # ARMv8.3 architectural features
 #
 CONFIG_ARM64_PTR_AUTH=y
+# end of ARMv8.3 architectural features
+
 CONFIG_ARM64_SVE=y
 CONFIG_ARM64_MODULE_PLTS=y
+# CONFIG_ARM64_PSEUDO_NMI is not set
 CONFIG_RELOCATABLE=y
 CONFIG_RANDOMIZE_BASE=y
 CONFIG_RANDOMIZE_MODULE_REGION_FULL=y
 CONFIG_CC_HAVE_STACKPROTECTOR_SYSREG=y
 CONFIG_STACKPROTECTOR_PER_TASK=y
+# end of Kernel Features
 
 #
 # Boot options
@@ -401,7 +434,8 @@ CONFIG_CMDLINE="console=ttyAMA0"
 CONFIG_EFI_STUB=y
 CONFIG_EFI=y
 CONFIG_DMI=y
-CONFIG_COMPAT=y
+# end of Boot options
+
 CONFIG_SYSVIPC_COMPAT=y
 CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y
 
@@ -431,6 +465,7 @@ CONFIG_CPU_PM=y
 CONFIG_ENERGY_MODEL=y
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
+# end of Power management options
 
 #
 # CPU Power Management
@@ -450,6 +485,8 @@ CONFIG_DT_IDLE_STATES=y
 # ARM CPU Idle Drivers
 #
 CONFIG_ARM_CPUIDLE=y
+# end of ARM CPU Idle Drivers
+# end of CPU Idle
 
 #
 # CPU Frequency scaling
@@ -481,6 +518,7 @@ CONFIG_ACPI_CPPC_CPUFREQ=y
 CONFIG_ARM_ARMADA_8K_CPUFREQ=m
 CONFIG_ARM_SCPI_CPUFREQ=y
 CONFIG_ARM_BRCMSTB_AVS_CPUFREQ=y
+# CONFIG_ARM_IMX_CPUFREQ_DT is not set
 CONFIG_ARM_MEDIATEK_CPUFREQ=m
 # CONFIG_ARM_QCOM_CPUFREQ_KRYO is not set
 CONFIG_ARM_QCOM_CPUFREQ_HW=m
@@ -488,12 +526,12 @@ CONFIG_ARM_TEGRA20_CPUFREQ=y
 CONFIG_ARM_TEGRA124_CPUFREQ=y
 CONFIG_ARM_TEGRA186_CPUFREQ=y
 # CONFIG_QORIQ_CPUFREQ is not set
+# end of CPU Frequency scaling
+# end of CPU Power Management
 
 #
 # Firmware Drivers
 #
-CONFIG_ARM_PSCI_FW=y
-# CONFIG_ARM_PSCI_CHECKER is not set
 # CONFIG_ARM_SCMI_PROTOCOL is not set
 CONFIG_ARM_SCPI_PROTOCOL=y
 CONFIG_ARM_SCPI_POWER_DOMAIN=y
@@ -501,6 +539,7 @@ CONFIG_ARM_SCPI_POWER_DOMAIN=y
 # CONFIG_FIRMWARE_MEMMAP is not set
 CONFIG_DMIID=y
 CONFIG_DMI_SYSFS=y
+# CONFIG_ISCSI_IBFT is not set
 CONFIG_RASPBERRYPI_FIRMWARE=y
 # CONFIG_FW_CFG_SYSFS is not set
 CONFIG_INTEL_STRATIX10_SERVICE=m
@@ -508,6 +547,8 @@ CONFIG_QCOM_SCM=y
 CONFIG_QCOM_SCM_64=y
 # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
 CONFIG_HAVE_ARM_SMCCC=y
+CONFIG_ARM_PSCI_FW=y
+# CONFIG_ARM_PSCI_CHECKER is not set
 # CONFIG_GOOGLE_FIRMWARE is not set
 
 #
@@ -525,6 +566,8 @@ CONFIG_EFI_BOOTLOADER_CONTROL=y
 # CONFIG_EFI_CAPSULE_LOADER is not set
 # CONFIG_EFI_TEST is not set
 CONFIG_RESET_ATTACK_MITIGATION=y
+# end of EFI (Extensible Firmware Interface) Support
+
 CONFIG_UEFI_CPER=y
 CONFIG_UEFI_CPER_ARM=y
 CONFIG_EFI_EARLYCON=y
@@ -536,12 +579,16 @@ CONFIG_IMX_SCU=y
 #
 CONFIG_TEGRA_IVC=y
 CONFIG_TEGRA_BPMP=y
+# end of Tegra firmware driver
 
 #
 # Zynq MPSoC Firmware Drivers
 #
 CONFIG_ZYNQMP_FIRMWARE=y
 # CONFIG_ZYNQMP_FIRMWARE_DEBUG is not set
+# end of Zynq MPSoC Firmware Drivers
+# end of Firmware Drivers
+
 CONFIG_ARCH_SUPPORTS_ACPI=y
 CONFIG_ACPI=y
 CONFIG_ACPI_GENERIC_GSI=y
@@ -549,6 +596,8 @@ CONFIG_ACPI_CCA_REQUIRED=y
 # CONFIG_ACPI_DEBUGGER is not set
 CONFIG_ACPI_SPCR_TABLE=y
 CONFIG_ACPI_EC_DEBUGFS=y
+CONFIG_ACPI_AC=y
+CONFIG_ACPI_BATTERY=y
 CONFIG_ACPI_BUTTON=y
 CONFIG_ACPI_FAN=y
 # CONFIG_ACPI_TAD is not set
@@ -644,10 +693,13 @@ CONFIG_HAVE_DMA_CONTIGUOUS=y
 CONFIG_GENERIC_SMP_IDLE_THREAD=y
 CONFIG_GENERIC_IDLE_POLL_SETUP=y
 CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
+CONFIG_ARCH_HAS_KEEPINITRD=y
 CONFIG_ARCH_HAS_SET_MEMORY=y
+CONFIG_ARCH_HAS_SET_DIRECT_MAP=y
 CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y
 CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
 CONFIG_HAVE_RSEQ=y
+CONFIG_HAVE_FUNCTION_ARG_ACCESS_API=y
 CONFIG_HAVE_CLK=y
 CONFIG_HAVE_HW_BREAKPOINT=y
 CONFIG_HAVE_PERF_REGS=y
@@ -655,7 +707,6 @@ CONFIG_HAVE_PERF_USER_STACK_DUMP=y
 CONFIG_HAVE_ARCH_JUMP_LABEL=y
 CONFIG_HAVE_ARCH_JUMP_LABEL_RELATIVE=y
 CONFIG_HAVE_RCU_TABLE_FREE=y
-CONFIG_HAVE_RCU_TABLE_INVALIDATE=y
 CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
 CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
 CONFIG_HAVE_CMPXCHG_LOCAL=y
@@ -694,20 +745,28 @@ CONFIG_STRICT_MODULE_RWX=y
 CONFIG_REFCOUNT_FULL=y
 CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y
 CONFIG_ARCH_USE_MEMREMAP_PROT=y
+# CONFIG_LOCK_EVENT_COUNTS is not set
 
 #
 # GCOV-based kernel profiling
 #
 # CONFIG_GCOV_KERNEL is not set
 CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
+# end of GCOV-based kernel profiling
+
 CONFIG_PLUGIN_HOSTCC="g++"
 CONFIG_HAVE_GCC_PLUGINS=y
 CONFIG_GCC_PLUGINS=y
+
+#
+# GCC plugins
+#
 # CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set
-CONFIG_GCC_PLUGIN_LATENT_ENTROPY=y
-# CONFIG_GCC_PLUGIN_STRUCTLEAK is not set
+# CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
 # CONFIG_GCC_PLUGIN_RANDSTRUCT is not set
-# CONFIG_GCC_PLUGIN_STACKLEAK is not set
+# end of GCC plugins
+# end of General architecture-dependent options
+
 CONFIG_RT_MUTEXES=y
 CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
@@ -759,6 +818,8 @@ CONFIG_KARMA_PARTITION=y
 CONFIG_EFI_PARTITION=y
 # CONFIG_SYSV68_PARTITION is not set
 # CONFIG_CMDLINE_PARTITION is not set
+# end of Partition Types
+
 CONFIG_BLOCK_COMPAT=y
 CONFIG_BLK_MQ_PCI=y
 CONFIG_BLK_MQ_VIRTIO=y
@@ -771,6 +832,9 @@ CONFIG_MQ_IOSCHED_DEADLINE=y
 CONFIG_MQ_IOSCHED_KYBER=y
 CONFIG_IOSCHED_BFQ=y
 CONFIG_BFQ_GROUP_IOSCHED=y
+# CONFIG_BFQ_CGROUP_DEBUG is not set
+# end of IO Schedulers
+
 CONFIG_PREEMPT_NOTIFIERS=y
 CONFIG_PADATA=y
 CONFIG_ASN1=y
@@ -846,6 +910,7 @@ CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 CONFIG_BINFMT_SCRIPT=y
 CONFIG_BINFMT_MISC=y
 CONFIG_COREDUMP=y
+# end of Executable file formats
 
 #
 # Memory Management options
@@ -858,6 +923,8 @@ CONFIG_HAVE_MEMORY_PRESENT=y
 CONFIG_SPARSEMEM_EXTREME=y
 CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
 CONFIG_SPARSEMEM_VMEMMAP=y
+CONFIG_HAVE_FAST_GUP=y
+CONFIG_ARCH_KEEP_MEMBLOCK=y
 CONFIG_MEMORY_ISOLATION=y
 # CONFIG_MEMORY_HOTPLUG is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
@@ -865,6 +932,7 @@ CONFIG_MEMORY_BALLOON=y
 CONFIG_BALLOON_COMPACTION=y
 CONFIG_COMPACTION=y
 CONFIG_MIGRATION=y
+CONFIG_CONTIG_ALLOC=y
 CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_MMU_NOTIFIER=y
 CONFIG_KSM=y
@@ -888,10 +956,13 @@ CONFIG_ZSMALLOC=y
 CONFIG_GENERIC_EARLY_IOREMAP=y
 # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
 # CONFIG_IDLE_PAGE_TRACKING is not set
+CONFIG_ARCH_HAS_PTE_DEVMAP=y
 CONFIG_FRAME_VECTOR=y
 # CONFIG_PERCPU_STATS is not set
 # CONFIG_GUP_BENCHMARK is not set
 CONFIG_ARCH_HAS_PTE_SPECIAL=y
+# end of Memory Management options
+
 CONFIG_NET=y
 CONFIG_COMPAT_NETLINK_MESSAGES=y
 CONFIG_NET_INGRESS=y
@@ -948,9 +1019,6 @@ CONFIG_INET_ESP=m
 CONFIG_INET_IPCOMP=m
 CONFIG_INET_XFRM_TUNNEL=m
 CONFIG_INET_TUNNEL=m
-CONFIG_INET_XFRM_MODE_TRANSPORT=m
-CONFIG_INET_XFRM_MODE_TUNNEL=m
-CONFIG_INET_XFRM_MODE_BEET=m
 CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 CONFIG_INET_UDP_DIAG=m
@@ -989,10 +1057,6 @@ CONFIG_IPV6_MIP6=y
 CONFIG_IPV6_ILA=m
 CONFIG_INET6_XFRM_TUNNEL=m
 CONFIG_INET6_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-CONFIG_INET6_XFRM_MODE_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_BEET=m
-CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
 CONFIG_IPV6_VTI=m
 CONFIG_IPV6_SIT=m
 CONFIG_IPV6_SIT_6RD=y
@@ -1060,7 +1124,6 @@ CONFIG_NF_CT_NETLINK_TIMEOUT=m
 CONFIG_NF_CT_NETLINK_HELPER=m
 CONFIG_NETFILTER_NETLINK_GLUE_CT=y
 CONFIG_NF_NAT=m
-CONFIG_NF_NAT_NEEDED=y
 CONFIG_NF_NAT_AMANDA=m
 CONFIG_NF_NAT_FTP=m
 CONFIG_NF_NAT_IRC=m
@@ -1097,6 +1160,7 @@ CONFIG_NFT_XFRM=m
 CONFIG_NFT_SOCKET=m
 CONFIG_NFT_OSF=m
 CONFIG_NFT_TPROXY=m
+# CONFIG_NFT_SYNPROXY is not set
 CONFIG_NF_DUP_NETDEV=m
 CONFIG_NFT_DUP_NETDEV=m
 CONFIG_NFT_FWD_NETDEV=m
@@ -1135,6 +1199,7 @@ CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
 CONFIG_NETFILTER_XT_TARGET_RATEEST=m
 CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
+CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m
 CONFIG_NETFILTER_XT_TARGET_TEE=m
 CONFIG_NETFILTER_XT_TARGET_TPROXY=m
 CONFIG_NETFILTER_XT_TARGET_TRACE=m
@@ -1191,6 +1256,8 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m
 CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
 CONFIG_NETFILTER_XT_MATCH_TIME=m
 CONFIG_NETFILTER_XT_MATCH_U32=m
+# end of Core Netfilter Configuration
+
 CONFIG_IP_SET=m
 CONFIG_IP_SET_MAX=256
 CONFIG_IP_SET_BITMAP_IP=m
@@ -1265,7 +1332,6 @@ CONFIG_NF_DEFRAG_IPV4=m
 CONFIG_NF_SOCKET_IPV4=m
 CONFIG_NF_TPROXY_IPV4=m
 CONFIG_NF_TABLES_IPV4=y
-CONFIG_NFT_CHAIN_ROUTE_IPV4=m
 CONFIG_NFT_REJECT_IPV4=m
 CONFIG_NFT_DUP_IPV4=m
 CONFIG_NFT_FIB_IPV4=m
@@ -1299,6 +1365,7 @@ CONFIG_IP_NF_SECURITY=m
 CONFIG_IP_NF_ARPTABLES=m
 CONFIG_IP_NF_ARPFILTER=m
 CONFIG_IP_NF_ARP_MANGLE=m
+# end of IP: Netfilter Configuration
 
 #
 # IPv6: Netfilter Configuration
@@ -1306,7 +1373,6 @@ CONFIG_IP_NF_ARP_MANGLE=m
 CONFIG_NF_SOCKET_IPV6=m
 CONFIG_NF_TPROXY_IPV6=m
 CONFIG_NF_TABLES_IPV6=y
-CONFIG_NFT_CHAIN_ROUTE_IPV6=m
 CONFIG_NFT_REJECT_IPV6=m
 CONFIG_NFT_DUP_IPV6=m
 CONFIG_NFT_FIB_IPV6=m
@@ -1335,8 +1401,11 @@ CONFIG_IP6_NF_SECURITY=m
 CONFIG_IP6_NF_NAT=m
 CONFIG_IP6_NF_TARGET_MASQUERADE=m
 CONFIG_IP6_NF_TARGET_NPT=m
+# end of IPv6: Netfilter Configuration
+
 CONFIG_NF_DEFRAG_IPV6=m
 # CONFIG_NF_TABLES_BRIDGE is not set
+# CONFIG_NF_CONNTRACK_BRIDGE is not set
 CONFIG_BRIDGE_NF_EBTABLES=m
 CONFIG_BRIDGE_EBT_BROUTE=m
 CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -1369,11 +1438,14 @@ CONFIG_INET_DCCP_DIAG=m
 CONFIG_IP_DCCP_CCID3=y
 # CONFIG_IP_DCCP_CCID3_DEBUG is not set
 CONFIG_IP_DCCP_TFRC_LIB=y
+# end of DCCP CCIDs Configuration
 
 #
 # DCCP Kernel Hacking
 #
 # CONFIG_IP_DCCP_DEBUG is not set
+# end of DCCP Kernel Hacking
+
 CONFIG_IP_SCTP=m
 # CONFIG_SCTP_DBG_OBJCNT is not set
 # CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5 is not set
@@ -1408,16 +1480,21 @@ CONFIG_BRIDGE_IGMP_SNOOPING=y
 CONFIG_BRIDGE_VLAN_FILTERING=y
 CONFIG_HAVE_NET_DSA=y
 CONFIG_NET_DSA=m
-CONFIG_NET_DSA_LEGACY=y
-CONFIG_NET_DSA_TAG_BRCM=y
-CONFIG_NET_DSA_TAG_BRCM_PREPEND=y
-CONFIG_NET_DSA_TAG_DSA=y
-CONFIG_NET_DSA_TAG_EDSA=y
-CONFIG_NET_DSA_TAG_GSWIP=y
-CONFIG_NET_DSA_TAG_KSZ=y
-CONFIG_NET_DSA_TAG_KSZ9477=y
-CONFIG_NET_DSA_TAG_TRAILER=y
-CONFIG_NET_DSA_TAG_QCA=y
+CONFIG_NET_DSA_TAG_8021Q=m
+CONFIG_NET_DSA_TAG_BRCM_COMMON=m
+CONFIG_NET_DSA_TAG_BRCM=m
+CONFIG_NET_DSA_TAG_BRCM_PREPEND=m
+CONFIG_NET_DSA_TAG_GSWIP=m
+CONFIG_NET_DSA_TAG_DSA=m
+CONFIG_NET_DSA_TAG_EDSA=m
+CONFIG_NET_DSA_TAG_MTK=m
+CONFIG_NET_DSA_TAG_KSZ_COMMON=m
+CONFIG_NET_DSA_TAG_KSZ=m
+CONFIG_NET_DSA_TAG_KSZ9477=m
+CONFIG_NET_DSA_TAG_QCA=m
+CONFIG_NET_DSA_TAG_LAN9303=m
+CONFIG_NET_DSA_TAG_SJA1105=m
+CONFIG_NET_DSA_TAG_TRAILER=m
 CONFIG_VLAN_8021Q=m
 CONFIG_VLAN_8021Q_GVRP=y
 CONFIG_VLAN_8021Q_MVRP=y
@@ -1529,16 +1606,18 @@ CONFIG_NET_ACT_PEDIT=m
 CONFIG_NET_ACT_SIMP=m
 CONFIG_NET_ACT_SKBEDIT=m
 CONFIG_NET_ACT_CSUM=m
+# CONFIG_NET_ACT_MPLS is not set
 CONFIG_NET_ACT_VLAN=m
 CONFIG_NET_ACT_BPF=m
 CONFIG_NET_ACT_CONNMARK=m
+# CONFIG_NET_ACT_CTINFO is not set
 CONFIG_NET_ACT_SKBMOD=m
 CONFIG_NET_ACT_IFE=m
 CONFIG_NET_ACT_TUNNEL_KEY=m
+# CONFIG_NET_ACT_CT is not set
 CONFIG_NET_IFE_SKBMARK=m
 CONFIG_NET_IFE_SKBPRIO=m
 CONFIG_NET_IFE_SKBTCINDEX=m
-CONFIG_NET_CLS_IND=y
 CONFIG_NET_SCH_FIFO=y
 CONFIG_DCB=y
 CONFIG_DNS_RESOLVER=y
@@ -1550,6 +1629,7 @@ CONFIG_BATMAN_ADV_NC=y
 CONFIG_BATMAN_ADV_MCAST=y
 CONFIG_BATMAN_ADV_DEBUGFS=y
 # CONFIG_BATMAN_ADV_DEBUG is not set
+CONFIG_BATMAN_ADV_SYSFS=y
 # CONFIG_BATMAN_ADV_TRACING is not set
 CONFIG_OPENVSWITCH=m
 CONFIG_OPENVSWITCH_GRE=m
@@ -1588,6 +1668,9 @@ CONFIG_NET_FLOW_LIMIT=y
 #
 CONFIG_NET_PKTGEN=m
 CONFIG_NET_DROP_MONITOR=y
+# end of Network testing
+# end of Networking options
+
 CONFIG_HAMRADIO=y
 
 #
@@ -1607,6 +1690,8 @@ CONFIG_BPQETHER=m
 CONFIG_BAYCOM_SER_FDX=m
 CONFIG_BAYCOM_SER_HDX=m
 CONFIG_YAM=m
+# end of AX.25 network device drivers
+
 CONFIG_CAN=m
 CONFIG_CAN_RAW=m
 CONFIG_CAN_BCM=m
@@ -1649,6 +1734,7 @@ CONFIG_CAN_SOFTING=m
 #
 # CONFIG_CAN_HI311X is not set
 # CONFIG_CAN_MCP251X is not set
+# end of CAN SPI interfaces
 
 #
 # CAN USB interfaces
@@ -1661,7 +1747,11 @@ CONFIG_CAN_KVASER_USB=m
 # CONFIG_CAN_MCBA_USB is not set
 CONFIG_CAN_PEAK_USB=m
 CONFIG_CAN_UCAN=m
+# end of CAN USB interfaces
+
 # CONFIG_CAN_DEBUG_DEVICES is not set
+# end of CAN Device Drivers
+
 CONFIG_BT=m
 CONFIG_BT_BREDR=y
 CONFIG_BT_RFCOMM=m
@@ -1687,6 +1777,7 @@ CONFIG_BT_QCA=m
 CONFIG_BT_HCIBTUSB=m
 CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
 CONFIG_BT_HCIBTUSB_BCM=y
+# CONFIG_BT_HCIBTUSB_MTK is not set
 CONFIG_BT_HCIBTUSB_RTL=y
 CONFIG_BT_HCIBTSDIO=m
 CONFIG_BT_HCIUART=m
@@ -1695,7 +1786,6 @@ CONFIG_BT_HCIUART_BCSP=y
 CONFIG_BT_HCIUART_ATH3K=y
 CONFIG_BT_HCIUART_INTEL=y
 # CONFIG_BT_HCIUART_AG6XX is not set
-CONFIG_BT_HCIUART_MRVL=y
 CONFIG_BT_HCIBCM203X=m
 CONFIG_BT_HCIBPA10X=m
 CONFIG_BT_HCIBFUSB=m
@@ -1703,8 +1793,11 @@ CONFIG_BT_HCIVHCI=m
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
 CONFIG_BT_ATH3K=m
+CONFIG_BT_MTKSDIO=m
 CONFIG_BT_QCOMSMD=m
 CONFIG_BT_HCIRSI=m
+# end of Bluetooth device drivers
+
 # CONFIG_AF_RXRPC is not set
 # CONFIG_AF_KCM is not set
 CONFIG_STREAM_PARSER=y
@@ -1785,6 +1878,8 @@ CONFIG_NFC_ST21NFCA_I2C=m
 # CONFIG_NFC_NXP_NCI is not set
 # CONFIG_NFC_S3FWRN5_I2C is not set
 # CONFIG_NFC_ST95HF is not set
+# end of Near Field Communication (NFC) devices
+
 # CONFIG_PSAMPLE is not set
 CONFIG_NET_IFE=m
 CONFIG_LWTUNNEL=y
@@ -1792,7 +1887,8 @@ CONFIG_LWTUNNEL_BPF=y
 CONFIG_DST_CACHE=y
 CONFIG_GRO_CELLS=y
 CONFIG_NET_SOCK_MSG=y
-# CONFIG_NET_DEVLINK is not set
+CONFIG_NET_DEVLINK=y
+CONFIG_PAGE_POOL=y
 CONFIG_FAILOVER=m
 CONFIG_HAVE_EBPF_JIT=y
 
@@ -1850,6 +1946,8 @@ CONFIG_PCI_AARDVARK=y
 # Cadence PCIe controllers support
 #
 # CONFIG_PCIE_CADENCE_HOST is not set
+# end of Cadence PCIe controllers support
+
 # CONFIG_PCIE_XILINX_NWL is not set
 # CONFIG_PCI_FTPCI100 is not set
 CONFIG_PCI_TEGRA=y
@@ -1885,16 +1983,21 @@ CONFIG_PCIE_QCOM=y
 CONFIG_PCIE_HISI_STB=y
 CONFIG_PCI_MESON=y
 CONFIG_PCIE_UNIPHIER=y
+# end of DesignWare PCI Core Support
+# end of PCI controller drivers
 
 #
 # PCI Endpoint
 #
 # CONFIG_PCI_ENDPOINT is not set
+# end of PCI Endpoint
 
 #
 # PCI switch controller drivers
 #
 # CONFIG_PCI_SW_SWITCHTEC is not set
+# end of PCI switch controller drivers
+
 # CONFIG_PCCARD is not set
 CONFIG_RAPIDIO=m
 CONFIG_RAPIDIO_TSI721=m
@@ -1914,6 +2017,7 @@ CONFIG_RAPIDIO_MPORT_CDEV=m
 # CONFIG_RAPIDIO_TSI568 is not set
 # CONFIG_RAPIDIO_CPS_GEN2 is not set
 # CONFIG_RAPIDIO_RXS_GEN3 is not set
+# end of RapidIO Switch drivers
 
 #
 # Generic Driver Options
@@ -1930,6 +2034,9 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
 CONFIG_EXTRA_FIRMWARE=""
 # CONFIG_FW_LOADER_USER_HELPER is not set
+# CONFIG_FW_LOADER_COMPRESS is not set
+# end of Firmware loader
+
 CONFIG_WANT_DEV_COREDUMP=y
 CONFIG_ALLOW_DEV_COREDUMP=y
 CONFIG_DEV_COREDUMP=y
@@ -1938,6 +2045,7 @@ CONFIG_DEBUG_DEVRES=y
 # CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
 CONFIG_TEST_ASYNC_DRIVER_PROBE=m
 CONFIG_GENERIC_CPU_AUTOPROBE=y
+CONFIG_GENERIC_CPU_VULNERABILITIES=y
 CONFIG_SOC_BUS=y
 CONFIG_REGMAP=y
 CONFIG_REGMAP_I2C=y
@@ -1949,6 +2057,7 @@ CONFIG_REGMAP_IRQ=y
 CONFIG_DMA_SHARED_BUFFER=y
 # CONFIG_DMA_FENCE_TRACE is not set
 CONFIG_GENERIC_ARCH_TOPOLOGY=y
+# end of Generic Driver Options
 
 #
 # Bus devices
@@ -1967,20 +2076,23 @@ CONFIG_TEGRA_GMI=m
 CONFIG_UNIPHIER_SYSTEM_BUS=y
 CONFIG_VEXPRESS_CONFIG=y
 # CONFIG_FSL_MC_BUS is not set
+# end of Bus devices
+
 CONFIG_CONNECTOR=y
 CONFIG_PROC_EVENTS=y
 CONFIG_GNSS=m
 CONFIG_MTD=y
 # CONFIG_MTD_TESTS is not set
 # CONFIG_MTD_CMDLINE_PARTS is not set
-# CONFIG_MTD_AFS_PARTS is not set
 CONFIG_MTD_OF_PARTS=m
 # CONFIG_MTD_AR7_PARTS is not set
 
 #
 # Partition parsers
 #
+# CONFIG_MTD_AFS_PARTS is not set
 # CONFIG_MTD_REDBOOT_PARTS is not set
+# end of Partition parsers
 
 #
 # User Modules And Translation Layers
@@ -2017,6 +2129,7 @@ CONFIG_MTD_CFI_UTIL=m
 # CONFIG_MTD_RAM is not set
 # CONFIG_MTD_ROM is not set
 # CONFIG_MTD_ABSENT is not set
+# end of RAM/ROM/Flash chip drivers
 
 #
 # Mapping drivers for chip access
@@ -2027,6 +2140,7 @@ CONFIG_MTD_PHYSMAP=m
 # CONFIG_MTD_PHYSMAP_OF is not set
 # CONFIG_MTD_INTEL_VR_NOR is not set
 # CONFIG_MTD_PLATRAM is not set
+# end of Mapping drivers for chip access
 
 #
 # Self-contained MTD device drivers
@@ -2045,15 +2159,54 @@ CONFIG_MTD_M25P80=y
 # Disk-On-Chip Device Drivers
 #
 # CONFIG_MTD_DOCG3 is not set
+# end of Self-contained MTD device drivers
+
 CONFIG_MTD_NAND_CORE=m
 # CONFIG_MTD_ONENAND is not set
-# CONFIG_MTD_NAND is not set
+CONFIG_MTD_NAND_ECC_SW_HAMMING=m
+# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
+CONFIG_MTD_RAW_NAND=m
+CONFIG_MTD_NAND_ECC_SW_BCH=y
+
+#
+# Raw/parallel NAND flash controllers
+#
+CONFIG_MTD_NAND_DENALI=m
+CONFIG_MTD_NAND_DENALI_PCI=m
+CONFIG_MTD_NAND_DENALI_DT=m
+CONFIG_MTD_NAND_CAFE=m
+CONFIG_MTD_NAND_MARVELL=m
+CONFIG_MTD_NAND_BRCMNAND=m
+CONFIG_MTD_NAND_FSL_IFC=m
+CONFIG_MTD_NAND_MXC=m
+CONFIG_MTD_NAND_SUNXI=m
+CONFIG_MTD_NAND_HISI504=m
+CONFIG_MTD_NAND_QCOM=m
+CONFIG_MTD_NAND_MTK=m
+CONFIG_MTD_NAND_TEGRA=m
+CONFIG_MTD_NAND_MESON=m
+CONFIG_MTD_NAND_GPIO=m
+CONFIG_MTD_NAND_PLATFORM=m
+
+#
+# Misc
+#
+CONFIG_MTD_SM_COMMON=m
+CONFIG_MTD_NAND_NANDSIM=m
+CONFIG_MTD_NAND_RICOH=m
+CONFIG_MTD_NAND_DISKONCHIP=m
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED=y
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0x0
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_HIGH=y
+# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set
 CONFIG_MTD_SPI_NAND=m
 
 #
 # LPDDR & LPDDR2 PCM memory drivers
 #
 # CONFIG_MTD_LPDDR is not set
+# end of LPDDR & LPDDR2 PCM memory drivers
+
 CONFIG_MTD_SPI_NOR=y
 CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y
 CONFIG_SPI_CADENCE_QUADSPI=m
@@ -2065,6 +2218,7 @@ CONFIG_MTD_UBI_BEB_LIMIT=20
 # CONFIG_MTD_UBI_FASTMAP is not set
 # CONFIG_MTD_UBI_GLUEBI is not set
 # CONFIG_MTD_UBI_BLOCK is not set
+# CONFIG_MTD_HYPERBUS is not set
 CONFIG_DTC=y
 CONFIG_OF=y
 # CONFIG_OF_UNITTEST is not set
@@ -2125,6 +2279,7 @@ CONFIG_NVME_FABRICS=m
 CONFIG_NVME_FC=m
 CONFIG_NVME_TCP=m
 # CONFIG_NVME_TARGET is not set
+# end of NVME Support
 
 #
 # Misc devices
@@ -2149,11 +2304,11 @@ CONFIG_SENSORS_BH1770=m
 CONFIG_SENSORS_APDS990X=m
 # CONFIG_HMC6352 is not set
 # CONFIG_DS1682 is not set
-# CONFIG_USB_SWITCH_FSA9480 is not set
 # CONFIG_LATTICE_ECP3_CONFIG is not set
 CONFIG_SRAM=y
 CONFIG_VEXPRESS_SYSCFG=y
 # CONFIG_PCI_ENDPOINT_TEST is not set
+# CONFIG_XILINX_SDFEC is not set
 CONFIG_MISC_RTSX=m
 CONFIG_PVPANIC=m
 # CONFIG_C2PORT is not set
@@ -2169,6 +2324,8 @@ CONFIG_EEPROM_93CX6=m
 # CONFIG_EEPROM_93XX46 is not set
 # CONFIG_EEPROM_IDT_89HPESX is not set
 CONFIG_EEPROM_EE1004=m
+# end of EEPROM support
+
 CONFIG_CB710_CORE=y
 # CONFIG_CB710_DEBUG is not set
 CONFIG_CB710_DEBUG_ASSUMPTIONS=y
@@ -2177,6 +2334,8 @@ CONFIG_CB710_DEBUG_ASSUMPTIONS=y
 # Texas Instruments shared transport line discipline
 #
 # CONFIG_TI_ST is not set
+# end of Texas Instruments shared transport line discipline
+
 CONFIG_SENSORS_LIS3_I2C=m
 CONFIG_ALTERA_STAPL=m
 
@@ -2218,12 +2377,15 @@ CONFIG_VOP_BUS=m
 #
 CONFIG_VOP=m
 CONFIG_VHOST_RING=m
+# end of Intel MIC & related support
+
 # CONFIG_GENWQE is not set
 CONFIG_ECHO=m
 CONFIG_MISC_ALCOR_PCI=m
 CONFIG_MISC_RTSX_PCI=m
 CONFIG_MISC_RTSX_USB=m
 CONFIG_HABANA_AI=m
+# end of Misc devices
 
 #
 # SCSI device support
@@ -2240,7 +2402,6 @@ CONFIG_SCSI_PROC_FS=y
 #
 CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_ST=m
-CONFIG_CHR_DEV_OSST=m
 CONFIG_BLK_DEV_SR=y
 CONFIG_BLK_DEV_SR_VENDOR=y
 CONFIG_CHR_DEV_SG=y
@@ -2261,6 +2422,8 @@ CONFIG_SCSI_SAS_LIBSAS=m
 CONFIG_SCSI_SAS_ATA=y
 CONFIG_SCSI_SAS_HOST_SMP=y
 CONFIG_SCSI_SRP_ATTRS=m
+# end of SCSI Transports
+
 CONFIG_SCSI_LOWLEVEL=y
 CONFIG_ISCSI_TCP=m
 CONFIG_ISCSI_BOOT_SYSFS=m
@@ -2301,6 +2464,7 @@ CONFIG_SCSI_UFSHCD_PLATFORM=m
 CONFIG_SCSI_UFS_CDNS_PLATFORM=m
 # CONFIG_SCSI_UFS_DWC_TC_PLATFORM is not set
 CONFIG_SCSI_UFS_QCOM=m
+CONFIG_SCSI_UFS_MEDIATEK=m
 # CONFIG_SCSI_UFS_HISI is not set
 CONFIG_SCSI_UFS_BSG=y
 CONFIG_SCSI_HPTIOP=m
@@ -2312,6 +2476,7 @@ CONFIG_FCOE=m
 CONFIG_SCSI_SNIC=m
 # CONFIG_SCSI_SNIC_DEBUG_FS is not set
 CONFIG_SCSI_DMX3191D=m
+# CONFIG_SCSI_FDOMAIN_PCI is not set
 CONFIG_SCSI_GDTH=m
 # CONFIG_SCSI_IPS is not set
 CONFIG_SCSI_INITIO=m
@@ -2346,6 +2511,8 @@ CONFIG_SCSI_DH_RDAC=m
 CONFIG_SCSI_DH_HP_SW=m
 CONFIG_SCSI_DH_EMC=m
 CONFIG_SCSI_DH_ALUA=m
+# end of SCSI device support
+
 CONFIG_HAVE_PATA_PLATFORM=y
 CONFIG_ATA=y
 CONFIG_ATA_VERBOSE_ERROR=y
@@ -2491,6 +2658,7 @@ CONFIG_DM_MULTIPATH=m
 CONFIG_DM_MULTIPATH_QL=m
 CONFIG_DM_MULTIPATH_ST=m
 CONFIG_DM_DELAY=m
+CONFIG_DM_DUST=m
 CONFIG_DM_INIT=y
 CONFIG_DM_UEVENT=y
 CONFIG_DM_FLAKEY=m
@@ -2515,6 +2683,8 @@ CONFIG_ISCSI_TARGET=m
 #
 # CONFIG_FIREWIRE is not set
 CONFIG_FIREWIRE_NOSY=m
+# end of IEEE 1394 (FireWire) support
+
 CONFIG_NETDEVICES=y
 CONFIG_MII=m
 CONFIG_NET_CORE=y
@@ -2580,11 +2750,16 @@ CONFIG_NET_DSA_MICROCHIP_KSZ9477_SPI=m
 CONFIG_NET_DSA_MV88E6XXX=m
 CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y
 # CONFIG_NET_DSA_MV88E6XXX_PTP is not set
+CONFIG_NET_DSA_SJA1105=m
+# CONFIG_NET_DSA_SJA1105_PTP is not set
 CONFIG_NET_DSA_QCA8K=m
 # CONFIG_NET_DSA_REALTEK_SMI is not set
 # CONFIG_NET_DSA_SMSC_LAN9303_I2C is not set
 # CONFIG_NET_DSA_SMSC_LAN9303_MDIO is not set
-# CONFIG_NET_DSA_VITESSE_VSC73XX is not set
+# CONFIG_NET_DSA_VITESSE_VSC73XX_SPI is not set
+# CONFIG_NET_DSA_VITESSE_VSC73XX_PLATFORM is not set
+# end of Distributed Switch Architecture drivers
+
 CONFIG_ETHERNET=y
 CONFIG_MDIO=m
 # CONFIG_NET_VENDOR_3COM is not set
@@ -2609,6 +2784,7 @@ CONFIG_AMD_XGBE_DCB=y
 CONFIG_NET_XGENE=y
 CONFIG_NET_XGENE_V2=y
 CONFIG_NET_VENDOR_AQUANTIA=y
+CONFIG_AQTION=m
 CONFIG_NET_VENDOR_ARC=y
 CONFIG_ARC_EMAC_CORE=m
 CONFIG_EMAC_ROCKCHIP=m
@@ -2662,10 +2838,14 @@ CONFIG_FEC=m
 CONFIG_FSL_ENETC=m
 CONFIG_FSL_ENETC_VF=m
 CONFIG_FSL_ENETC_PTP_CLOCK=m
+# CONFIG_FSL_ENETC_HW_TIMESTAMPING is not set
+CONFIG_NET_VENDOR_GOOGLE=y
+# CONFIG_GVE is not set
 CONFIG_NET_VENDOR_HISILICON=y
 CONFIG_HIX5HD2_GMAC=m
 # CONFIG_HISI_FEMAC is not set
 CONFIG_HIP04_ETH=m
+# CONFIG_HI13X1_GMAC is not set
 CONFIG_HNS_MDIO=m
 CONFIG_HNS=m
 CONFIG_HNS_DSAF=m
@@ -2791,6 +2971,7 @@ CONFIG_NET_VENDOR_SOCIONEXT=y
 # CONFIG_SNI_NETSEC is not set
 CONFIG_NET_VENDOR_STMICRO=y
 CONFIG_STMMAC_ETH=m
+# CONFIG_STMMAC_SELFTESTS is not set
 CONFIG_STMMAC_PLATFORM=m
 # CONFIG_DWMAC_DWC_QOS_ETH is not set
 CONFIG_DWMAC_GENERIC=m
@@ -2811,7 +2992,6 @@ CONFIG_NET_VENDOR_TEHUTI=y
 CONFIG_TEHUTI=m
 CONFIG_NET_VENDOR_TI=y
 # CONFIG_TI_CPSW_PHY_SEL is not set
-# CONFIG_TI_CPSW_ALE is not set
 # CONFIG_TLAN is not set
 CONFIG_NET_VENDOR_VIA=y
 CONFIG_VIA_RHINE=m
@@ -2829,6 +3009,7 @@ CONFIG_MDIO_BITBANG=m
 CONFIG_MDIO_BUS_MUX=y
 CONFIG_MDIO_BUS_MUX_BCM_IPROC=y
 # CONFIG_MDIO_BUS_MUX_GPIO is not set
+CONFIG_MDIO_BUS_MUX_MESON_G12A=m
 CONFIG_MDIO_BUS_MUX_MMIOREG=y
 CONFIG_MDIO_BUS_MUX_MULTIPLEXER=m
 # CONFIG_MDIO_GPIO is not set
@@ -2875,6 +3056,7 @@ CONFIG_MICROCHIP_PHY=m
 # CONFIG_MICROCHIP_T1_PHY is not set
 CONFIG_MICROSEMI_PHY=m
 CONFIG_NATIONAL_PHY=m
+# CONFIG_NXP_TJA11XX_PHY is not set
 CONFIG_QSEMI_PHY=m
 CONFIG_REALTEK_PHY=m
 CONFIG_RENESAS_PHY=m
@@ -3069,6 +3251,8 @@ CONFIG_IWL3945=m
 #
 CONFIG_IWLEGACY_DEBUG=y
 CONFIG_IWLEGACY_DEBUGFS=y
+# end of iwl3945 / iwl4965 Debugging Options
+
 CONFIG_IWLWIFI=m
 CONFIG_IWLWIFI_LEDS=y
 CONFIG_IWLDVM=m
@@ -3083,6 +3267,8 @@ CONFIG_IWLWIFI_OPMODE_MODULAR=y
 CONFIG_IWLWIFI_DEBUG=y
 CONFIG_IWLWIFI_DEBUGFS=y
 # CONFIG_IWLWIFI_DEVICE_TRACING is not set
+# end of Debugging Options
+
 CONFIG_WLAN_VENDOR_INTERSIL=y
 CONFIG_HOSTAP=m
 CONFIG_HOSTAP_FIRMWARE=y
@@ -3132,6 +3318,7 @@ CONFIG_MT76x2_COMMON=m
 # CONFIG_MT76x2E is not set
 CONFIG_MT76x2U=m
 CONFIG_MT7603E=m
+CONFIG_MT7615E=m
 CONFIG_WLAN_VENDOR_RALINK=y
 CONFIG_RT2X00=m
 CONFIG_RT2400PCI=m
@@ -3185,6 +3372,13 @@ CONFIG_RTL8723_COMMON=m
 CONFIG_RTLBTCOEXIST=m
 CONFIG_RTL8XXXU=m
 # CONFIG_RTL8XXXU_UNTESTED is not set
+CONFIG_RTW88=m
+CONFIG_RTW88_CORE=m
+CONFIG_RTW88_PCI=m
+CONFIG_RTW88_8822BE=y
+CONFIG_RTW88_8822CE=y
+# CONFIG_RTW88_DEBUG is not set
+# CONFIG_RTW88_DEBUGFS is not set
 CONFIG_WLAN_VENDOR_RSI=y
 CONFIG_RSI_91X=m
 CONFIG_RSI_DEBUGFS=y
@@ -3266,6 +3460,7 @@ CONFIG_INPUT_KEYBOARD=y
 # CONFIG_KEYBOARD_ADP5588 is not set
 # CONFIG_KEYBOARD_ADP5589 is not set
 CONFIG_KEYBOARD_ATKBD=y
+CONFIG_KEYBOARD_QT1050=m
 # CONFIG_KEYBOARD_QT1070 is not set
 # CONFIG_KEYBOARD_QT2160 is not set
 # CONFIG_KEYBOARD_DLINK_DIR685 is not set
@@ -3334,8 +3529,8 @@ CONFIG_JOYSTICK_INTERACT=m
 CONFIG_JOYSTICK_SIDEWINDER=m
 CONFIG_JOYSTICK_TMDC=m
 CONFIG_JOYSTICK_IFORCE=m
-CONFIG_JOYSTICK_IFORCE_USB=y
-CONFIG_JOYSTICK_IFORCE_232=y
+CONFIG_JOYSTICK_IFORCE_USB=m
+CONFIG_JOYSTICK_IFORCE_232=m
 CONFIG_JOYSTICK_WARRIOR=m
 CONFIG_JOYSTICK_MAGELLAN=m
 CONFIG_JOYSTICK_SPACEORB=m
@@ -3448,6 +3643,7 @@ CONFIG_TOUCHSCREEN_ST1232=m
 CONFIG_TOUCHSCREEN_ZFORCE=m
 # CONFIG_TOUCHSCREEN_COLIBRI_VF50 is not set
 # CONFIG_TOUCHSCREEN_ROHM_BU21023 is not set
+CONFIG_TOUCHSCREEN_IQS5XX=m
 CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_AD714X is not set
 # CONFIG_INPUT_ATMEL_CAPTOUCH is not set
@@ -3456,10 +3652,12 @@ CONFIG_INPUT_E3X0_BUTTON=m
 CONFIG_INPUT_MSM_VIBRATOR=m
 CONFIG_INPUT_PM8941_PWRKEY=y
 # CONFIG_INPUT_PM8XXX_VIBRATOR is not set
+CONFIG_INPUT_MAX77650_ONKEY=m
 CONFIG_INPUT_MMA8450=m
 CONFIG_INPUT_GP2A=m
 # CONFIG_INPUT_GPIO_BEEPER is not set
 # CONFIG_INPUT_GPIO_DECODER is not set
+CONFIG_INPUT_GPIO_VIBRA=m
 CONFIG_INPUT_ATI_REMOTE2=m
 CONFIG_INPUT_KEYSPAN_REMOTE=m
 CONFIG_INPUT_KXTJ9=m
@@ -3511,7 +3709,6 @@ CONFIG_SERIO_ALTERA_PS2=m
 # CONFIG_SERIO_PS2MULT is not set
 CONFIG_SERIO_ARC_PS2=m
 # CONFIG_SERIO_APBPS2 is not set
-CONFIG_SERIO_OLPC_APSP=m
 # CONFIG_SERIO_SUN4I_PS2 is not set
 CONFIG_SERIO_GPIO_PS2=m
 # CONFIG_USERIO is not set
@@ -3520,6 +3717,8 @@ CONFIG_GAMEPORT_NS558=m
 CONFIG_GAMEPORT_L4=m
 CONFIG_GAMEPORT_EMU10K1=m
 CONFIG_GAMEPORT_FM801=m
+# end of Hardware I/O ports
+# end of Input device support
 
 #
 # Character devices
@@ -3546,6 +3745,7 @@ CONFIG_NOZOMI=m
 CONFIG_N_HDLC=m
 CONFIG_N_GSM=m
 # CONFIG_TRACE_SINK is not set
+CONFIG_NULL_TTY=m
 CONFIG_LDISC_AUTOLOAD=y
 CONFIG_DEVMEM=y
 
@@ -3605,6 +3805,7 @@ CONFIG_CONSOLE_POLL=y
 CONFIG_SERIAL_JSM=m
 CONFIG_SERIAL_MSM=y
 CONFIG_SERIAL_MSM_CONSOLE=y
+CONFIG_SERIAL_SIFIVE=m
 # CONFIG_SERIAL_SCCNXP is not set
 # CONFIG_SERIAL_SC16IS7XX is not set
 # CONFIG_SERIAL_ALTERA_JTAGUART is not set
@@ -3621,7 +3822,9 @@ CONFIG_SERIAL_ARC_NR_PORTS=1
 CONFIG_SERIAL_MVEBU_UART=y
 CONFIG_SERIAL_MVEBU_CONSOLE=y
 # CONFIG_SERIAL_OWL is not set
-CONFIG_SERIAL_MCTRL_GPIO=m
+# end of Serial drivers
+
+CONFIG_SERIAL_MCTRL_GPIO=y
 # CONFIG_SERIAL_DEV_BUS is not set
 # CONFIG_TTY_PRINTK is not set
 CONFIG_HVC_DRIVER=y
@@ -3636,6 +3839,7 @@ CONFIG_IPMI_SI=m
 CONFIG_IPMI_SSIF=m
 CONFIG_IPMI_WATCHDOG=m
 CONFIG_IPMI_POWEROFF=m
+# CONFIG_IPMB_DEVICE_INTERFACE is not set
 CONFIG_HW_RANDOM=y
 CONFIG_HW_RANDOM_TIMERIOMEM=m
 CONFIG_HW_RANDOM_BCM2835=y
@@ -3668,6 +3872,7 @@ CONFIG_TCG_ATMEL=m
 # CONFIG_TCG_TIS_ST33ZP24_SPI is not set
 CONFIG_DEVPORT=y
 # CONFIG_XILLYBUS is not set
+# end of Character devices
 
 #
 # I2C support
@@ -3692,6 +3897,8 @@ CONFIG_I2C_MUX_PINCTRL=m
 CONFIG_I2C_MUX_REG=m
 CONFIG_I2C_DEMUX_PINCTRL=m
 CONFIG_I2C_MUX_MLXCPLD=m
+# end of Multiplexer I2C Chip support
+
 CONFIG_I2C_HELPER_AUTO=y
 CONFIG_I2C_SMBUS=m
 CONFIG_I2C_ALGOBIT=m
@@ -3709,6 +3916,7 @@ CONFIG_I2C_ALGOPCA=m
 # CONFIG_I2C_ALI15X3 is not set
 # CONFIG_I2C_AMD756 is not set
 # CONFIG_I2C_AMD8111 is not set
+CONFIG_I2C_AMD_MP2=m
 # CONFIG_I2C_HIX5HD2 is not set
 # CONFIG_I2C_I801 is not set
 # CONFIG_I2C_ISCH is not set
@@ -3786,12 +3994,16 @@ CONFIG_I2C_VIPERBOARD=m
 CONFIG_I2C_CROS_EC_TUNNEL=y
 CONFIG_I2C_XGENE_SLIMPRO=m
 CONFIG_I2C_ZX2967=y
+# end of I2C Hardware Bus support
+
 CONFIG_I2C_STUB=m
 CONFIG_I2C_SLAVE=y
 CONFIG_I2C_SLAVE_EEPROM=m
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
+# end of I2C support
+
 CONFIG_I3C=m
 CONFIG_CDNS_I3C_MASTER=m
 CONFIG_DW_I3C_MASTER=m
@@ -3839,6 +4051,7 @@ CONFIG_SPI_SPRD=m
 CONFIG_SPI_SPRD_ADI=m
 # CONFIG_SPI_SUN4I is not set
 # CONFIG_SPI_SUN6I is not set
+# CONFIG_SPI_SYNQUACER is not set
 CONFIG_SPI_MXIC=m
 # CONFIG_SPI_TEGRA114 is not set
 # CONFIG_SPI_TEGRA20_SFLASH is not set
@@ -3881,6 +4094,8 @@ CONFIG_PTP_1588_CLOCK=m
 CONFIG_PTP_1588_CLOCK_DTE=m
 CONFIG_PTP_1588_CLOCK_QORIQ=m
 CONFIG_DP83640_PHY=m
+# end of PTP clock support
+
 CONFIG_PINCTRL=y
 CONFIG_GENERIC_PINCTRL_GROUPS=y
 CONFIG_PINMUX=y
@@ -3889,10 +4104,12 @@ CONFIG_PINCONF=y
 CONFIG_GENERIC_PINCONF=y
 # CONFIG_DEBUG_PINCTRL is not set
 CONFIG_PINCTRL_AMD=y
+CONFIG_PINCTRL_BM1880=y
 # CONFIG_PINCTRL_MCP23S08 is not set
 CONFIG_PINCTRL_ROCKCHIP=y
 CONFIG_PINCTRL_SINGLE=y
 CONFIG_PINCTRL_SX150X=y
+CONFIG_PINCTRL_STMFX=m
 CONFIG_PINCTRL_OCELOT=y
 # CONFIG_PINCTRL_OWL is not set
 CONFIG_PINCTRL_BCM2835=y
@@ -3903,6 +4120,7 @@ CONFIG_PINCTRL_NS2_MUX=y
 CONFIG_PINCTRL_IMX=y
 CONFIG_PINCTRL_IMX_SCU=y
 # CONFIG_PINCTRL_IMX8MM is not set
+# CONFIG_PINCTRL_IMX8MN is not set
 CONFIG_PINCTRL_IMX8MQ=y
 # CONFIG_PINCTRL_IMX8QM is not set
 CONFIG_PINCTRL_IMX8QXP=y
@@ -3930,6 +4148,7 @@ CONFIG_PINCTRL_QCOM_SPMI_PMIC=y
 CONFIG_PINCTRL_QCOM_SSBI_PMIC=y
 CONFIG_PINCTRL_SDM660=m
 # CONFIG_PINCTRL_SDM845 is not set
+# CONFIG_PINCTRL_SM8150 is not set
 CONFIG_PINCTRL_SAMSUNG=y
 CONFIG_PINCTRL_EXYNOS=y
 CONFIG_PINCTRL_EXYNOS_ARM64=y
@@ -3942,7 +4161,20 @@ CONFIG_PINCTRL_PFC_R8A77970=y
 CONFIG_PINCTRL_PFC_R8A77995=y
 # CONFIG_PINCTRL_SPRD is not set
 CONFIG_PINCTRL_SUNXI=y
+# CONFIG_PINCTRL_SUN4I_A10 is not set
+# CONFIG_PINCTRL_SUN5I is not set
+# CONFIG_PINCTRL_SUN6I_A31 is not set
+# CONFIG_PINCTRL_SUN6I_A31_R is not set
+# CONFIG_PINCTRL_SUN8I_A23 is not set
+# CONFIG_PINCTRL_SUN8I_A33 is not set
+# CONFIG_PINCTRL_SUN8I_A83T is not set
+# CONFIG_PINCTRL_SUN8I_A83T_R is not set
+# CONFIG_PINCTRL_SUN8I_A23_R is not set
+# CONFIG_PINCTRL_SUN8I_H3 is not set
 CONFIG_PINCTRL_SUN8I_H3_R=y
+# CONFIG_PINCTRL_SUN8I_V3S is not set
+# CONFIG_PINCTRL_SUN9I_A80 is not set
+# CONFIG_PINCTRL_SUN9I_A80_R is not set
 CONFIG_PINCTRL_SUN50I_A64=y
 CONFIG_PINCTRL_SUN50I_A64_R=y
 CONFIG_PINCTRL_SUN50I_H5=y
@@ -3976,6 +4208,9 @@ CONFIG_PINCTRL_MT6797=y
 CONFIG_PINCTRL_MT7622=y
 CONFIG_PINCTRL_MT8173=y
 CONFIG_PINCTRL_MT8183=y
+CONFIG_PINCTRL_MT8516=y
+# end of MediaTek pinctrl drivers
+
 # CONFIG_PINCTRL_ZX296718 is not set
 CONFIG_PINCTRL_MESON=y
 CONFIG_PINCTRL_MESON_GXBB=y
@@ -4014,7 +4249,6 @@ CONFIG_GPIO_GENERIC_PLATFORM=y
 # CONFIG_GPIO_GRGPIO is not set
 # CONFIG_GPIO_HLWD is not set
 CONFIG_GPIO_MB86S7X=m
-# CONFIG_GPIO_MOCKUP is not set
 # CONFIG_GPIO_MPC8XXX is not set
 CONFIG_GPIO_MVEBU=y
 CONFIG_GPIO_MXC=y
@@ -4035,6 +4269,7 @@ CONFIG_GPIO_XGENE_SB=m
 # CONFIG_GPIO_ZYNQ is not set
 # CONFIG_GPIO_ZX is not set
 CONFIG_GPIO_AMD_FCH=m
+# end of Memory mapped GPIO drivers
 
 #
 # I2C GPIO expanders
@@ -4048,13 +4283,16 @@ CONFIG_GPIO_PCA953X=y
 CONFIG_GPIO_PCA953X_IRQ=y
 # CONFIG_GPIO_PCF857X is not set
 # CONFIG_GPIO_TPIC2810 is not set
+# end of I2C GPIO expanders
 
 #
 # MFD GPIO expanders
 #
 CONFIG_GPIO_BD9571MWV=m
 CONFIG_GPIO_MADERA=m
+CONFIG_GPIO_MAX77650=m
 CONFIG_GPIO_TQMX86=m
+# end of MFD GPIO expanders
 
 #
 # PCI GPIO expanders
@@ -4062,6 +4300,7 @@ CONFIG_GPIO_TQMX86=m
 # CONFIG_GPIO_PCI_IDIO_16 is not set
 # CONFIG_GPIO_PCIE_IDIO_24 is not set
 # CONFIG_GPIO_RDC321X is not set
+# end of PCI GPIO expanders
 
 #
 # SPI GPIO expanders
@@ -4072,11 +4311,15 @@ CONFIG_GPIO_MAX3191X=m
 # CONFIG_GPIO_MC33880 is not set
 # CONFIG_GPIO_PISOSR is not set
 # CONFIG_GPIO_XRA1403 is not set
+# end of SPI GPIO expanders
 
 #
 # USB GPIO expanders
 #
 CONFIG_GPIO_VIPERBOARD=m
+# end of USB GPIO expanders
+
+# CONFIG_GPIO_MOCKUP is not set
 CONFIG_W1=m
 CONFIG_W1_CON=y
 
@@ -4089,6 +4332,7 @@ CONFIG_W1_MASTER_DS2482=m
 CONFIG_W1_MASTER_MXC=m
 CONFIG_W1_MASTER_DS1WM=m
 # CONFIG_W1_MASTER_GPIO is not set
+# end of 1-wire Bus Masters
 
 #
 # 1-wire Slaves
@@ -4110,6 +4354,8 @@ CONFIG_W1_SLAVE_DS2780=m
 CONFIG_W1_SLAVE_DS2781=m
 CONFIG_W1_SLAVE_DS28E04=m
 CONFIG_W1_SLAVE_DS28E17=m
+# end of 1-wire Slaves
+
 # CONFIG_POWER_AVS is not set
 CONFIG_POWER_RESET=y
 # CONFIG_POWER_RESET_BRCMSTB is not set
@@ -4128,8 +4374,10 @@ CONFIG_POWER_RESET_SYSCON_POWEROFF=y
 CONFIG_REBOOT_MODE=y
 CONFIG_SYSCON_REBOOT_MODE=y
 # CONFIG_POWER_RESET_SC27XX is not set
+# CONFIG_NVMEM_REBOOT_MODE is not set
 CONFIG_POWER_SUPPLY=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
+CONFIG_POWER_SUPPLY_HWMON=y
 # CONFIG_PDA_POWER is not set
 # CONFIG_GENERIC_ADC_BATTERY is not set
 # CONFIG_TEST_POWER is not set
@@ -4151,8 +4399,9 @@ CONFIG_BATTERY_MAX1721X=m
 # CONFIG_CHARGER_LP8727 is not set
 # CONFIG_CHARGER_GPIO is not set
 # CONFIG_CHARGER_MANAGER is not set
-# CONFIG_CHARGER_LTC3651 is not set
+CONFIG_CHARGER_LT3651=m
 # CONFIG_CHARGER_DETECTOR_MAX14656 is not set
+CONFIG_CHARGER_MAX77650=m
 CONFIG_CHARGER_QCOM_SMBB=m
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_BQ24190 is not set
@@ -4165,6 +4414,7 @@ CONFIG_CHARGER_SMB347=m
 CONFIG_CHARGER_CROS_USBPD=m
 # CONFIG_CHARGER_SC2731 is not set
 CONFIG_FUEL_GAUGE_SC27XX=m
+CONFIG_CHARGER_UCS1002=m
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
@@ -4266,6 +4516,9 @@ CONFIG_SENSORS_PMBUS=m
 CONFIG_SENSORS_ADM1275=m
 CONFIG_SENSORS_IBM_CFFPS=m
 # CONFIG_SENSORS_IR35221 is not set
+CONFIG_SENSORS_IR38064=m
+# CONFIG_SENSORS_IRPS5401 is not set
+CONFIG_SENSORS_ISL68137=m
 CONFIG_SENSORS_LM25066=m
 CONFIG_SENSORS_LTC2978=m
 # CONFIG_SENSORS_LTC2978_REGULATOR is not set
@@ -4275,6 +4528,7 @@ CONFIG_SENSORS_MAX16064=m
 CONFIG_SENSORS_MAX31785=m
 CONFIG_SENSORS_MAX34440=m
 CONFIG_SENSORS_MAX8688=m
+# CONFIG_SENSORS_PXE1610 is not set
 CONFIG_SENSORS_TPS40422=m
 CONFIG_SENSORS_TPS53679=m
 CONFIG_SENSORS_UCD9000=m
@@ -4354,6 +4608,7 @@ CONFIG_CPU_THERMAL=y
 # CONFIG_CLOCK_THERMAL is not set
 # CONFIG_DEVFREQ_THERMAL is not set
 CONFIG_THERMAL_EMULATION=y
+CONFIG_THERMAL_MMIO=m
 CONFIG_HISI_THERMAL=y
 CONFIG_IMX_THERMAL=m
 # CONFIG_QORIQ_THERMAL is not set
@@ -4370,17 +4625,21 @@ CONFIG_BCM2835_THERMAL=m
 CONFIG_BRCMSTB_THERMAL=m
 CONFIG_BCM_NS_THERMAL=m
 CONFIG_BCM_SR_THERMAL=y
+# end of Broadcom thermal drivers
 
 #
 # Samsung thermal drivers
 #
 # CONFIG_EXYNOS_THERMAL is not set
+# end of Samsung thermal drivers
 
 #
 # NVIDIA Tegra thermal drivers
 #
 # CONFIG_TEGRA_SOCTHERM is not set
 CONFIG_TEGRA_BPMP_THERMAL=m
+# end of NVIDIA Tegra thermal drivers
+
 # CONFIG_GENERIC_ADC_THERMAL is not set
 
 #
@@ -4388,14 +4647,22 @@ CONFIG_TEGRA_BPMP_THERMAL=m
 #
 # CONFIG_QCOM_TSENS is not set
 CONFIG_QCOM_SPMI_TEMP_ALARM=y
+# end of Qualcomm thermal drivers
+
 # CONFIG_ZX2967_THERMAL is not set
 CONFIG_UNIPHIER_THERMAL=m
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_CORE=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
 CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
+CONFIG_WATCHDOG_OPEN_TIMEOUT=0
 # CONFIG_WATCHDOG_SYSFS is not set
 
+#
+# Watchdog Pretimeout Governors
+#
+# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
+
 #
 # Watchdog Device Drivers
 #
@@ -4414,6 +4681,7 @@ CONFIG_DW_WATCHDOG=m
 CONFIG_SUNXI_WATCHDOG=m
 # CONFIG_MAX63XX_WATCHDOG is not set
 # CONFIG_IMX2_WDT is not set
+CONFIG_IMX_SC_WDT=m
 # CONFIG_TEGRA_WATCHDOG is not set
 CONFIG_QCOM_WDT=m
 CONFIG_MESON_GXBB_WATCHDOG=m
@@ -4443,11 +4711,6 @@ CONFIG_WDTPCI=m
 # USB-based Watchdog Cards
 #
 CONFIG_USBPCWATCHDOG=m
-
-#
-# Watchdog Pretimeout Governors
-#
-# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
 CONFIG_SSB_POSSIBLE=y
 CONFIG_SSB=m
 CONFIG_SSB_SPROM=y
@@ -4475,6 +4738,7 @@ CONFIG_BCMA_DRIVER_GPIO=y
 # Multifunction device drivers
 #
 CONFIG_MFD_CORE=y
+# CONFIG_MFD_ALTERA_SYSMGR is not set
 # CONFIG_MFD_ACT8945A is not set
 CONFIG_MFD_SUN4I_GPADC=m
 # CONFIG_MFD_AS3711 is not set
@@ -4493,9 +4757,11 @@ CONFIG_MFD_CROS_EC=y
 CONFIG_MFD_MADERA=m
 CONFIG_MFD_MADERA_I2C=m
 CONFIG_MFD_MADERA_SPI=m
+# CONFIG_MFD_CS47L15 is not set
 CONFIG_MFD_CS47L35=y
 CONFIG_MFD_CS47L85=y
 CONFIG_MFD_CS47L90=y
+# CONFIG_MFD_CS47L92 is not set
 # CONFIG_PMIC_DA903X is not set
 # CONFIG_MFD_DA9052_SPI is not set
 # CONFIG_MFD_DA9052_I2C is not set
@@ -4520,6 +4786,7 @@ CONFIG_MFD_HI655X_PMIC=y
 # CONFIG_MFD_88PM860X is not set
 # CONFIG_MFD_MAX14577 is not set
 # CONFIG_MFD_MAX77620 is not set
+CONFIG_MFD_MAX77650=m
 # CONFIG_MFD_MAX77686 is not set
 # CONFIG_MFD_MAX77693 is not set
 # CONFIG_MFD_MAX77843 is not set
@@ -4551,7 +4818,7 @@ CONFIG_MFD_SM501_GPIO=y
 CONFIG_MFD_SC27XX_PMIC=m
 # CONFIG_ABX500_CORE is not set
 # CONFIG_MFD_STMPE is not set
-# CONFIG_MFD_SUN6I_PRCM is not set
+CONFIG_MFD_SUN6I_PRCM=y
 CONFIG_MFD_SYSCON=y
 # CONFIG_MFD_TI_AM335X_TSCADC is not set
 # CONFIG_MFD_LP3943 is not set
@@ -4589,8 +4856,12 @@ CONFIG_MFD_VX855=m
 # CONFIG_MFD_WM8350_I2C is not set
 # CONFIG_MFD_WM8994 is not set
 # CONFIG_MFD_ROHM_BD718XX is not set
+# CONFIG_MFD_ROHM_BD70528 is not set
 CONFIG_MFD_STPMIC1=m
+CONFIG_MFD_STMFX=m
 CONFIG_MFD_VEXPRESS_SYSREG=y
+# end of Multifunction device drivers
+
 CONFIG_REGULATOR=y
 # CONFIG_REGULATOR_DEBUG is not set
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
@@ -4600,6 +4871,8 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y
 # CONFIG_REGULATOR_ACT8865 is not set
 # CONFIG_REGULATOR_AD5398 is not set
 # CONFIG_REGULATOR_ANATOP is not set
+# CONFIG_REGULATOR_ARIZONA_LDO1 is not set
+# CONFIG_REGULATOR_ARIZONA_MICSUPP is not set
 # CONFIG_REGULATOR_BD9571MWV is not set
 # CONFIG_REGULATOR_DA9210 is not set
 # CONFIG_REGULATOR_DA9211 is not set
@@ -4615,6 +4888,7 @@ CONFIG_REGULATOR_HI655X=y
 # CONFIG_REGULATOR_LTC3589 is not set
 # CONFIG_REGULATOR_LTC3676 is not set
 # CONFIG_REGULATOR_MAX1586 is not set
+CONFIG_REGULATOR_MAX77650=m
 # CONFIG_REGULATOR_MAX8649 is not set
 # CONFIG_REGULATOR_MAX8660 is not set
 # CONFIG_REGULATOR_MAX8952 is not set
@@ -4634,6 +4908,7 @@ CONFIG_REGULATOR_QCOM_SPMI=y
 CONFIG_REGULATOR_S2MPS11=y
 # CONFIG_REGULATOR_S5M8767 is not set
 # CONFIG_REGULATOR_SC2731 is not set
+# CONFIG_REGULATOR_SLG51000 is not set
 CONFIG_REGULATOR_STPMIC1=m
 # CONFIG_REGULATOR_SY8106A is not set
 # CONFIG_REGULATOR_TPS51632 is not set
@@ -4702,7 +4977,7 @@ CONFIG_MEDIA_RADIO_SUPPORT=y
 CONFIG_MEDIA_SDR_SUPPORT=y
 CONFIG_MEDIA_CEC_SUPPORT=y
 CONFIG_MEDIA_CONTROLLER=y
-# CONFIG_MEDIA_CONTROLLER_DVB is not set
+CONFIG_MEDIA_CONTROLLER_DVB=y
 # CONFIG_MEDIA_CONTROLLER_REQUEST_API is not set
 CONFIG_VIDEO_DEV=m
 CONFIG_VIDEO_V4L2_SUBDEV_API=y
@@ -4837,6 +5112,7 @@ CONFIG_DVB_USB_DIBUSB_MC=m
 CONFIG_DVB_USB_DIB0700=m
 CONFIG_DVB_USB_UMT_010=m
 CONFIG_DVB_USB_CXUSB=m
+# CONFIG_DVB_USB_CXUSB_ANALOG is not set
 CONFIG_DVB_USB_M920X=m
 CONFIG_DVB_USB_DIGITV=m
 CONFIG_DVB_USB_VP7045=m
@@ -5019,6 +5295,8 @@ CONFIG_RADIO_WL1273=m
 #
 # Texas Instruments WL128x FM driver (ST based)
 #
+# end of Texas Instruments WL128x FM driver (ST based)
+
 CONFIG_MEDIA_COMMON_OPTIONS=y
 
 #
@@ -5048,18 +5326,24 @@ CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
 CONFIG_MEDIA_ATTACH=y
 CONFIG_VIDEO_IR_I2C=m
 
+#
+# I2C Encoders, decoders, sensors and other helper chips
+#
+
 #
 # Audio decoders, processors and mixers
 #
 CONFIG_VIDEO_TVAUDIO=m
 CONFIG_VIDEO_TDA7432=m
 CONFIG_VIDEO_TDA9840=m
+# CONFIG_VIDEO_TDA1997X is not set
 CONFIG_VIDEO_TEA6415C=m
 CONFIG_VIDEO_TEA6420=m
 CONFIG_VIDEO_MSP3400=m
 CONFIG_VIDEO_CS3308=m
 CONFIG_VIDEO_CS5345=m
 CONFIG_VIDEO_CS53L32A=m
+# CONFIG_VIDEO_TLV320AIC23B is not set
 CONFIG_VIDEO_UDA1342=m
 CONFIG_VIDEO_WM8775=m
 CONFIG_VIDEO_WM8739=m
@@ -5074,11 +5358,27 @@ CONFIG_VIDEO_SAA6588=m
 #
 # Video decoders
 #
+# CONFIG_VIDEO_ADV7180 is not set
+# CONFIG_VIDEO_ADV7183 is not set
+# CONFIG_VIDEO_ADV748X is not set
+# CONFIG_VIDEO_ADV7604 is not set
+# CONFIG_VIDEO_ADV7842 is not set
+# CONFIG_VIDEO_BT819 is not set
+# CONFIG_VIDEO_BT856 is not set
+# CONFIG_VIDEO_BT866 is not set
+# CONFIG_VIDEO_KS0127 is not set
+# CONFIG_VIDEO_ML86V7667 is not set
+# CONFIG_VIDEO_SAA7110 is not set
 CONFIG_VIDEO_SAA711X=m
+# CONFIG_VIDEO_TC358743 is not set
+# CONFIG_VIDEO_TVP514X is not set
 CONFIG_VIDEO_TVP5150=m
+# CONFIG_VIDEO_TVP7002 is not set
 CONFIG_VIDEO_TW2804=m
 CONFIG_VIDEO_TW9903=m
 CONFIG_VIDEO_TW9906=m
+# CONFIG_VIDEO_TW9910 is not set
+# CONFIG_VIDEO_VPX3220 is not set
 
 #
 # Video and audio decoders
@@ -5090,17 +5390,78 @@ CONFIG_VIDEO_CX25840=m
 # Video encoders
 #
 CONFIG_VIDEO_SAA7127=m
+# CONFIG_VIDEO_SAA7185 is not set
+# CONFIG_VIDEO_ADV7170 is not set
+# CONFIG_VIDEO_ADV7175 is not set
+# CONFIG_VIDEO_ADV7343 is not set
+# CONFIG_VIDEO_ADV7393 is not set
+# CONFIG_VIDEO_AD9389B is not set
+# CONFIG_VIDEO_AK881X is not set
+# CONFIG_VIDEO_THS8200 is not set
 
 #
 # Camera sensor devices
 #
+# CONFIG_VIDEO_IMX214 is not set
+# CONFIG_VIDEO_IMX258 is not set
+# CONFIG_VIDEO_IMX274 is not set
+# CONFIG_VIDEO_IMX319 is not set
+# CONFIG_VIDEO_IMX355 is not set
 CONFIG_VIDEO_OV2640=m
+# CONFIG_VIDEO_OV2659 is not set
+# CONFIG_VIDEO_OV2680 is not set
+# CONFIG_VIDEO_OV2685 is not set
+# CONFIG_VIDEO_OV5640 is not set
+# CONFIG_VIDEO_OV5645 is not set
+# CONFIG_VIDEO_OV5647 is not set
+# CONFIG_VIDEO_OV6650 is not set
+# CONFIG_VIDEO_OV5670 is not set
+# CONFIG_VIDEO_OV5695 is not set
+# CONFIG_VIDEO_OV7251 is not set
+# CONFIG_VIDEO_OV772X is not set
 CONFIG_VIDEO_OV7640=m
+# CONFIG_VIDEO_OV7670 is not set
+# CONFIG_VIDEO_OV7740 is not set
+# CONFIG_VIDEO_OV8856 is not set
+# CONFIG_VIDEO_OV9640 is not set
+# CONFIG_VIDEO_OV9650 is not set
+# CONFIG_VIDEO_OV13858 is not set
+# CONFIG_VIDEO_VS6624 is not set
+# CONFIG_VIDEO_MT9M001 is not set
+# CONFIG_VIDEO_MT9M032 is not set
+# CONFIG_VIDEO_MT9M111 is not set
+# CONFIG_VIDEO_MT9P031 is not set
+# CONFIG_VIDEO_MT9T001 is not set
+# CONFIG_VIDEO_MT9T112 is not set
 CONFIG_VIDEO_MT9V011=m
+# CONFIG_VIDEO_MT9V032 is not set
+# CONFIG_VIDEO_MT9V111 is not set
+# CONFIG_VIDEO_SR030PC30 is not set
+# CONFIG_VIDEO_NOON010PC30 is not set
+# CONFIG_VIDEO_M5MOLS is not set
+# CONFIG_VIDEO_RJ54N1 is not set
+# CONFIG_VIDEO_S5K6AA is not set
+# CONFIG_VIDEO_S5K6A3 is not set
+# CONFIG_VIDEO_S5K4ECGX is not set
+# CONFIG_VIDEO_S5K5BAF is not set
+# CONFIG_VIDEO_SMIAPP is not set
+# CONFIG_VIDEO_ET8EK8 is not set
+# CONFIG_VIDEO_S5C73M3 is not set
+
+#
+# Lens drivers
+#
+# CONFIG_VIDEO_AD5820 is not set
+# CONFIG_VIDEO_AK7375 is not set
+# CONFIG_VIDEO_DW9714 is not set
+# CONFIG_VIDEO_DW9807_VCM is not set
 
 #
 # Flash devices
 #
+# CONFIG_VIDEO_ADP1653 is not set
+# CONFIG_VIDEO_LM3560 is not set
+# CONFIG_VIDEO_LM3646 is not set
 
 #
 # Video improvement chips
@@ -5116,17 +5477,34 @@ CONFIG_VIDEO_SAA6752HS=m
 #
 # SDR tuner chips
 #
+# CONFIG_SDR_MAX2175 is not set
 
 #
 # Miscellaneous helper chips
 #
+# CONFIG_VIDEO_THS7303 is not set
 CONFIG_VIDEO_M52790=m
+# CONFIG_VIDEO_I2C is not set
+# CONFIG_VIDEO_ST_MIPID02 is not set
+# end of I2C Encoders, decoders, sensors and other helper chips
+
+#
+# SPI helper chips
+#
+# CONFIG_VIDEO_GS1662 is not set
+# end of SPI helper chips
 
 #
 # Media SPI Adapters
 #
 # CONFIG_CXD2880_SPI_DRV is not set
+# end of Media SPI Adapters
+
 CONFIG_MEDIA_TUNER=m
+
+#
+# Customize TV tuners
+#
 CONFIG_MEDIA_TUNER_SIMPLE=m
 CONFIG_MEDIA_TUNER_TDA18250=m
 CONFIG_MEDIA_TUNER_TDA8290=m
@@ -5135,6 +5513,7 @@ CONFIG_MEDIA_TUNER_TDA18271=m
 CONFIG_MEDIA_TUNER_TDA9887=m
 CONFIG_MEDIA_TUNER_TEA5761=m
 CONFIG_MEDIA_TUNER_TEA5767=m
+# CONFIG_MEDIA_TUNER_MSI001 is not set
 CONFIG_MEDIA_TUNER_MT20XX=m
 CONFIG_MEDIA_TUNER_MT2060=m
 CONFIG_MEDIA_TUNER_MT2063=m
@@ -5163,6 +5542,11 @@ CONFIG_MEDIA_TUNER_R820T=m
 CONFIG_MEDIA_TUNER_MXL301RF=m
 CONFIG_MEDIA_TUNER_QM1D1C0042=m
 CONFIG_MEDIA_TUNER_QM1D1B0004=m
+# end of Customize TV tuners
+
+#
+# Customise DVB Frontends
+#
 
 #
 # Multistandard (satellite) frontends
@@ -5223,6 +5607,7 @@ CONFIG_DVB_SP8870=m
 CONFIG_DVB_SP887X=m
 CONFIG_DVB_CX22700=m
 CONFIG_DVB_CX22702=m
+# CONFIG_DVB_S5H1432 is not set
 CONFIG_DVB_DRXD=m
 CONFIG_DVB_L64781=m
 CONFIG_DVB_TDA1004X=m
@@ -5233,6 +5618,7 @@ CONFIG_DVB_DIB3000MB=m
 CONFIG_DVB_DIB3000MC=m
 CONFIG_DVB_DIB7000M=m
 CONFIG_DVB_DIB7000P=m
+# CONFIG_DVB_DIB9000 is not set
 CONFIG_DVB_TDA10048=m
 CONFIG_DVB_AF9013=m
 CONFIG_DVB_EC100=m
@@ -5244,7 +5630,9 @@ CONFIG_DVB_RTL2832=m
 CONFIG_DVB_RTL2832_SDR=m
 CONFIG_DVB_SI2168=m
 CONFIG_DVB_AS102_FE=m
+# CONFIG_DVB_ZD1301_DEMOD is not set
 CONFIG_DVB_GP8PSK_FE=m
+# CONFIG_DVB_CXD2880 is not set
 
 #
 # DVB-C (cable) frontends
@@ -5282,6 +5670,7 @@ CONFIG_DVB_MB86A20S=m
 # ISDB-S (satellite) & ISDB-T (terrestrial) frontends
 #
 CONFIG_DVB_TC90522=m
+# CONFIG_DVB_MN88443X is not set
 
 #
 # Digital terrestrial only tuners/PLL
@@ -5295,18 +5684,23 @@ CONFIG_DVB_TUNER_DIB0090=m
 #
 CONFIG_DVB_DRX39XYJ=m
 CONFIG_DVB_LNBH25=m
+# CONFIG_DVB_LNBH29 is not set
 CONFIG_DVB_LNBP21=m
 CONFIG_DVB_LNBP22=m
 CONFIG_DVB_ISL6405=m
 CONFIG_DVB_ISL6421=m
 CONFIG_DVB_ISL6423=m
 CONFIG_DVB_A8293=m
+# CONFIG_DVB_LGS8GL5 is not set
 CONFIG_DVB_LGS8GXX=m
 CONFIG_DVB_ATBM8830=m
 CONFIG_DVB_TDA665x=m
 CONFIG_DVB_IX2505V=m
 CONFIG_DVB_M88RS2000=m
 CONFIG_DVB_AF9033=m
+# CONFIG_DVB_HORUS3A is not set
+# CONFIG_DVB_ASCOT2E is not set
+# CONFIG_DVB_HELENE is not set
 
 #
 # Common Interface (EN50221) controller drivers
@@ -5318,6 +5712,7 @@ CONFIG_DVB_SP2=m
 # Tools to develop new frontends
 #
 CONFIG_DVB_DUMMY_FE=m
+# end of Customise DVB Frontends
 
 #
 # Graphics support
@@ -5338,8 +5733,10 @@ CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 CONFIG_DRM_DP_CEC=y
 CONFIG_DRM_TTM=m
+CONFIG_DRM_VRAM_HELPER=m
 CONFIG_DRM_GEM_CMA_HELPER=y
 CONFIG_DRM_KMS_CMA_HELPER=y
+CONFIG_DRM_GEM_SHMEM_HELPER=y
 CONFIG_DRM_VM=y
 CONFIG_DRM_SCHED=m
 
@@ -5350,6 +5747,7 @@ CONFIG_DRM_I2C_CH7006=m
 CONFIG_DRM_I2C_SIL164=m
 CONFIG_DRM_I2C_NXP_TDA998X=m
 # CONFIG_DRM_I2C_NXP_TDA9950 is not set
+# end of I2C encoder or helper chips
 
 #
 # ARM devices
@@ -5358,32 +5756,29 @@ CONFIG_DRM_HDLCD=m
 # CONFIG_DRM_HDLCD_SHOW_UNDERRUN is not set
 CONFIG_DRM_MALI_DISPLAY=m
 CONFIG_DRM_KOMEDA=m
+# end of ARM devices
+
 CONFIG_DRM_RADEON=m
 CONFIG_DRM_RADEON_USERPTR=y
 CONFIG_DRM_AMDGPU=m
 # CONFIG_DRM_AMDGPU_SI is not set
 # CONFIG_DRM_AMDGPU_CIK is not set
-CONFIG_DRM_AMDGPU_USERPTR=y
 # CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set
 
 #
 # ACP (Audio CoProcessor) Configuration
 #
 # CONFIG_DRM_AMD_ACP is not set
+# end of ACP (Audio CoProcessor) Configuration
 
 #
 # Display Engine Configuration
 #
 CONFIG_DRM_AMD_DC=y
 # CONFIG_DEBUG_KERNEL_DC is not set
-# CONFIG_HSA_AMD is not set
+# end of Display Engine Configuration
 
-#
-# AMD Library routines
-#
-CONFIG_CHASH=m
-# CONFIG_CHASH_STATS is not set
-# CONFIG_CHASH_SELFTEST is not set
+# CONFIG_HSA_AMD is not set
 CONFIG_DRM_NOUVEAU=m
 CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT=y
 CONFIG_NOUVEAU_PLATFORM_DRIVER=y
@@ -5393,6 +5788,7 @@ CONFIG_NOUVEAU_DEBUG_DEFAULT=3
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 CONFIG_DRM_VGEM=m
 # CONFIG_DRM_VKMS is not set
+CONFIG_DRM_ATI_PCIGART=y
 # CONFIG_DRM_EXYNOS is not set
 CONFIG_DRM_UDL=m
 CONFIG_DRM_AST=m
@@ -5401,11 +5797,13 @@ CONFIG_DRM_CIRRUS_QEMU=m
 # CONFIG_DRM_RCAR_DU is not set
 # CONFIG_DRM_RCAR_DW_HDMI is not set
 # CONFIG_DRM_RCAR_LVDS is not set
+CONFIG_DRM_RCAR_WRITEBACK=y
 # CONFIG_DRM_SUN4I is not set
 CONFIG_DRM_QXL=m
 CONFIG_DRM_BOCHS=m
 CONFIG_DRM_VIRTIO_GPU=m
 CONFIG_DRM_MSM=m
+CONFIG_DRM_MSM_GPU_STATE=y
 # CONFIG_DRM_MSM_REGISTER_LOGGING is not set
 # CONFIG_DRM_MSM_GPU_SUDO is not set
 CONFIG_DRM_MSM_HDMI_HDCP=y
@@ -5427,6 +5825,7 @@ CONFIG_DRM_PANEL=y
 # CONFIG_DRM_PANEL_ARM_VERSATILE is not set
 # CONFIG_DRM_PANEL_LVDS is not set
 CONFIG_DRM_PANEL_SIMPLE=m
+CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D=m
 # CONFIG_DRM_PANEL_ILITEK_IL9322 is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9881C is not set
 # CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
@@ -5436,12 +5835,16 @@ CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04=m
 # CONFIG_DRM_PANEL_LG_LG4573 is not set
 CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO=m
 CONFIG_DRM_PANEL_ORISETECH_OTM8009A=m
+# CONFIG_DRM_PANEL_OSD_OSD101T2587_53TS is not set
 # CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00 is not set
 CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m
 # CONFIG_DRM_PANEL_RAYDIUM_RM68200 is not set
+CONFIG_DRM_PANEL_ROCKTECH_JH057N00900=m
+CONFIG_DRM_PANEL_RONBO_RB070D30=m
 CONFIG_DRM_PANEL_SAMSUNG_S6D16D0=m
 # CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set
 CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03=m
+# CONFIG_DRM_PANEL_SAMSUNG_S6E63M0 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set
 CONFIG_DRM_PANEL_SEIKO_43WVF1G=m
 # CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 is not set
@@ -5450,6 +5853,8 @@ CONFIG_DRM_PANEL_SITRONIX_ST7701=m
 # CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
 CONFIG_DRM_PANEL_TPO_TPG110=m
 CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA=m
+# end of Display Panels
+
 CONFIG_DRM_BRIDGE=y
 CONFIG_DRM_PANEL_BRIDGE=y
 
@@ -5479,6 +5884,8 @@ CONFIG_DRM_DW_HDMI=m
 # CONFIG_DRM_DW_HDMI_AHB_AUDIO is not set
 # CONFIG_DRM_DW_HDMI_I2S_AUDIO is not set
 CONFIG_DRM_DW_HDMI_CEC=m
+# end of Display Interface Bridges
+
 CONFIG_DRM_VC4=m
 CONFIG_DRM_VC4_HDMI_CEC=y
 CONFIG_DRM_ETNAVIV=m
@@ -5496,7 +5903,14 @@ CONFIG_DRM_MESON=m
 CONFIG_DRM_MESON_DW_HDMI=m
 # CONFIG_DRM_TINYDRM is not set
 # CONFIG_DRM_PL111 is not set
-# CONFIG_DRM_LEGACY is not set
+CONFIG_DRM_LIMA=m
+CONFIG_DRM_PANFROST=m
+CONFIG_DRM_LEGACY=y
+CONFIG_DRM_TDFX=m
+CONFIG_DRM_R128=m
+CONFIG_DRM_MGA=m
+CONFIG_DRM_VIA=m
+CONFIG_DRM_SAVAGE=m
 CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=m
 
 #
@@ -5562,11 +5976,14 @@ CONFIG_FB_VIRTUAL=m
 # CONFIG_FB_METRONOME is not set
 # CONFIG_FB_MB862XX is not set
 CONFIG_FB_MX3=y
-CONFIG_FB_MXS=m
 CONFIG_FB_SIMPLE=y
 CONFIG_FB_SSD1307=m
 # CONFIG_FB_SM712 is not set
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
+# end of Frame buffer Devices
+
+#
+# Backlight & LCD device support
+#
 CONFIG_LCD_CLASS_DEVICE=m
 # CONFIG_LCD_L4F00242T03 is not set
 # CONFIG_LCD_LMS283GF05 is not set
@@ -5593,6 +6010,8 @@ CONFIG_BACKLIGHT_GPIO=m
 # CONFIG_BACKLIGHT_LV5207LP is not set
 # CONFIG_BACKLIGHT_BD6107 is not set
 # CONFIG_BACKLIGHT_ARCXCNN is not set
+# end of Backlight & LCD device support
+
 CONFIG_VIDEOMODE_HELPERS=y
 CONFIG_HDMI=y
 
@@ -5606,10 +6025,14 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y
+# end of Console display driver support
+
 CONFIG_LOGO=y
 # CONFIG_LOGO_LINUX_MONO is not set
 # CONFIG_LOGO_LINUX_VGA16 is not set
 CONFIG_LOGO_LINUX_CLUT224=y
+# end of Graphics support
+
 CONFIG_SOUND=m
 CONFIG_SOUND_OSS_CORE=y
 CONFIG_SOUND_OSS_CORE_PRECLAIM=y
@@ -5622,6 +6045,7 @@ CONFIG_SND_DMAENGINE_PCM=m
 CONFIG_SND_HWDEP=m
 CONFIG_SND_SEQ_DEVICE=m
 CONFIG_SND_RAWMIDI=m
+CONFIG_SND_COMPRESS_OFFLOAD=m
 CONFIG_SND_JACK=y
 CONFIG_SND_JACK_INPUT_DEV=y
 CONFIG_SND_OSSEMUL=y
@@ -5742,12 +6166,16 @@ CONFIG_SND_HDA_CODEC_CMEDIA=m
 CONFIG_SND_HDA_CODEC_SI3054=m
 CONFIG_SND_HDA_GENERIC=m
 CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
+# end of HD-Audio
+
 CONFIG_SND_HDA_CORE=m
 CONFIG_SND_HDA_DSP_LOADER=y
+CONFIG_SND_HDA_COMPONENT=y
 CONFIG_SND_HDA_PREALLOC_SIZE=4096
 CONFIG_SND_SPI=y
 CONFIG_SND_USB=y
 CONFIG_SND_USB_AUDIO=m
+CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER=y
 CONFIG_SND_USB_UA101=m
 CONFIG_SND_USB_CAIAQ=m
 CONFIG_SND_USB_CAIAQ_INPUT=y
@@ -5761,6 +6189,9 @@ CONFIG_SND_USB_TONEPORT=m
 CONFIG_SND_USB_VARIAX=m
 CONFIG_SND_SOC=m
 CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
+CONFIG_SND_SOC_COMPRESS=y
+CONFIG_SND_SOC_TOPOLOGY=y
+CONFIG_SND_SOC_ACPI=m
 CONFIG_SND_SOC_AMD_ACP=m
 # CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH is not set
 CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m
@@ -5777,6 +6208,7 @@ CONFIG_SND_BCM2835_SOC_I2S=m
 #
 # CONFIG_SND_SOC_FSL_ASRC is not set
 CONFIG_SND_SOC_FSL_SAI=m
+CONFIG_SND_SOC_FSL_AUDMIX=m
 CONFIG_SND_SOC_FSL_SSI=m
 CONFIG_SND_SOC_FSL_SPDIF=m
 CONFIG_SND_SOC_FSL_ESAI=m
@@ -5792,6 +6224,9 @@ CONFIG_SND_SOC_IMX_ES8328=m
 CONFIG_SND_SOC_IMX_SGTL5000=m
 CONFIG_SND_SOC_IMX_SPDIF=m
 CONFIG_SND_SOC_FSL_ASOC_CARD=m
+CONFIG_SND_SOC_IMX_AUDMIX=m
+# end of SoC Audio for Freescale CPUs
+
 # CONFIG_SND_I2S_HI6210_I2S is not set
 # CONFIG_SND_KIRKWOOD_SOC is not set
 # CONFIG_SND_SOC_IMG is not set
@@ -5804,6 +6239,8 @@ CONFIG_SND_SOC_MT8173_RT5650=m
 CONFIG_SND_SOC_MT8173_RT5650_RT5514=m
 CONFIG_SND_SOC_MT8173_RT5650_RT5676=m
 CONFIG_SND_SOC_MT8183=m
+CONFIG_SND_SOC_MT8183_MT6358_TS3A227E_MAX98357A=m
+CONFIG_SND_SOC_MT8183_DA7219_MAX98357A=m
 CONFIG_SND_SOC_MTK_BTCVSD=m
 
 #
@@ -5817,6 +6254,9 @@ CONFIG_SND_SOC_MTK_BTCVSD=m
 # CONFIG_SND_MESON_AXG_SPDIFOUT is not set
 CONFIG_SND_MESON_AXG_SPDIFIN=m
 CONFIG_SND_MESON_AXG_PDM=m
+# CONFIG_SND_MESON_G12A_TOHDMITX is not set
+# end of ASoC support for Amlogic platforms
+
 CONFIG_SND_SOC_QCOM=m
 CONFIG_SND_SOC_LPASS_CPU=m
 CONFIG_SND_SOC_LPASS_PLATFORM=m
@@ -5831,11 +6271,23 @@ CONFIG_SND_SOC_APQ8016_SBC=m
 #
 # CONFIG_SND_SOC_SH4_FSI is not set
 # CONFIG_SND_SOC_RCAR is not set
+# end of SoC Audio support for Renesas SoCs
+
+CONFIG_SND_SOC_SOF_TOPLEVEL=y
+CONFIG_SND_SOC_SOF_PCI=m
+CONFIG_SND_SOC_SOF_ACPI=m
+CONFIG_SND_SOC_SOF_OPTIONS=m
+# CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT is not set
+# CONFIG_SND_SOC_SOF_STRICT_ABI_CHECKS is not set
+# CONFIG_SND_SOC_SOF_DEBUG is not set
+CONFIG_SND_SOC_SOF=m
 CONFIG_SND_SOC_SPRD=m
+# CONFIG_SND_SOC_SPRD_MCDT is not set
 
 #
 # STMicroelectronics STM32 SOC audio support
 #
+# end of STMicroelectronics STM32 SOC audio support
 
 #
 # Allwinner SoC Audio support
@@ -5847,6 +6299,8 @@ CONFIG_SND_SUN50I_CODEC_ANALOG=m
 # CONFIG_SND_SUN4I_I2S is not set
 # CONFIG_SND_SUN4I_SPDIF is not set
 CONFIG_SND_SUN8I_ADDA_PR_REGMAP=m
+# end of Allwinner SoC Audio support
+
 # CONFIG_SND_SOC_TEGRA is not set
 # CONFIG_SND_SOC_UNIPHIER is not set
 CONFIG_SND_SOC_XILINX_I2S=m
@@ -5876,7 +6330,7 @@ CONFIG_SND_SOC_AK4118=m
 # CONFIG_SND_SOC_AK5558 is not set
 # CONFIG_SND_SOC_ALC5623 is not set
 # CONFIG_SND_SOC_BD28623 is not set
-# CONFIG_SND_SOC_BT_SCO is not set
+CONFIG_SND_SOC_BT_SCO=m
 CONFIG_SND_SOC_CROS_EC_CODEC=m
 # CONFIG_SND_SOC_CS35L32 is not set
 # CONFIG_SND_SOC_CS35L33 is not set
@@ -5897,6 +6351,8 @@ CONFIG_SND_SOC_CS43130=m
 CONFIG_SND_SOC_CS4341=m
 # CONFIG_SND_SOC_CS4349 is not set
 # CONFIG_SND_SOC_CS53L30 is not set
+# CONFIG_SND_SOC_CX2072X is not set
+CONFIG_SND_SOC_DA7219=m
 CONFIG_SND_SOC_DMIC=m
 CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_ES7134 is not set
@@ -5909,6 +6365,7 @@ CONFIG_SND_SOC_ES8328_SPI=m
 # CONFIG_SND_SOC_INNO_RK3036 is not set
 CONFIG_SND_SOC_MAX98088=m
 CONFIG_SND_SOC_MAX98090=m
+CONFIG_SND_SOC_MAX98357A=m
 # CONFIG_SND_SOC_MAX98504 is not set
 # CONFIG_SND_SOC_MAX9867 is not set
 # CONFIG_SND_SOC_MAX98927 is not set
@@ -5961,7 +6418,7 @@ CONFIG_SND_SOC_SGTL5000=m
 # CONFIG_SND_SOC_TLV320AIC32X4_I2C is not set
 # CONFIG_SND_SOC_TLV320AIC32X4_SPI is not set
 # CONFIG_SND_SOC_TLV320AIC3X is not set
-# CONFIG_SND_SOC_TS3A227E is not set
+CONFIG_SND_SOC_TS3A227E=m
 # CONFIG_SND_SOC_TSCS42XX is not set
 # CONFIG_SND_SOC_TSCS454 is not set
 # CONFIG_SND_SOC_WM8510 is not set
@@ -5996,6 +6453,8 @@ CONFIG_SND_SOC_MT6358=m
 CONFIG_SND_SOC_NAU8822=m
 # CONFIG_SND_SOC_NAU8824 is not set
 # CONFIG_SND_SOC_TPA6130A2 is not set
+# end of CODEC drivers
+
 CONFIG_SND_SIMPLE_CARD_UTILS=m
 CONFIG_SND_SIMPLE_CARD=m
 # CONFIG_SND_AUDIO_GRAPH_CARD is not set
@@ -6028,6 +6487,7 @@ CONFIG_HID_CHERRY=m
 CONFIG_HID_CHICONY=m
 CONFIG_HID_CORSAIR=m
 CONFIG_HID_COUGAR=m
+CONFIG_HID_MACALLY=m
 CONFIG_HID_PRODIKEYS=m
 CONFIG_HID_CMEDIA=m
 CONFIG_HID_CP2112=m
@@ -6109,6 +6569,7 @@ CONFIG_HID_THINGM=m
 CONFIG_HID_THRUSTMASTER=m
 CONFIG_THRUSTMASTER_FF=y
 CONFIG_HID_UDRAW_PS3=m
+CONFIG_HID_U2FZERO=m
 CONFIG_HID_WACOM=m
 CONFIG_HID_WIIMOTE=m
 CONFIG_HID_XINMO=m
@@ -6118,6 +6579,7 @@ CONFIG_HID_ZYDACRON=m
 CONFIG_HID_SENSOR_HUB=m
 CONFIG_HID_SENSOR_CUSTOM_SENSOR=m
 # CONFIG_HID_ALPS is not set
+# end of Special HID drivers
 
 #
 # USB HID support
@@ -6125,11 +6587,15 @@ CONFIG_HID_SENSOR_CUSTOM_SENSOR=m
 CONFIG_USB_HID=y
 CONFIG_HID_PID=y
 CONFIG_USB_HIDDEV=y
+# end of USB HID support
 
 #
 # I2C HID support
 #
 CONFIG_I2C_HID=m
+# end of I2C HID support
+# end of HID support
+
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 CONFIG_USB_SUPPORT=y
 CONFIG_USB_COMMON=y
@@ -6270,6 +6736,7 @@ CONFIG_USB_DWC3_HOST=y
 CONFIG_USB_DWC3_EXYNOS=y
 CONFIG_USB_DWC3_PCI=y
 CONFIG_USB_DWC3_HAPS=y
+CONFIG_USB_DWC3_MESON_G12A=m
 CONFIG_USB_DWC3_OF_SIMPLE=y
 CONFIG_USB_DWC3_QCOM=y
 CONFIG_USB_DWC2=y
@@ -6401,6 +6868,8 @@ CONFIG_USB_MXS_PHY=m
 CONFIG_USB_TEGRA_PHY=y
 CONFIG_USB_ULPI=y
 CONFIG_USB_ULPI_VIEWPORT=y
+# end of USB Physical Layer drivers
+
 CONFIG_USB_GADGET=y
 # CONFIG_USB_GADGET_DEBUG is not set
 # CONFIG_USB_GADGET_DEBUG_FILES is not set
@@ -6430,6 +6899,8 @@ CONFIG_USB_FSL_USB2=m
 # CONFIG_USB_EG20T is not set
 # CONFIG_USB_GADGET_XILINX is not set
 # CONFIG_USB_DUMMY_HCD is not set
+# end of USB Peripheral Controller
+
 CONFIG_USB_LIBCOMPOSITE=m
 CONFIG_USB_F_ACM=m
 CONFIG_USB_U_SERIAL=m
@@ -6477,11 +6948,15 @@ CONFIG_TYPEC_TPS6598X=m
 # USB Type-C Multiplexer/DeMultiplexer Switch support
 #
 # CONFIG_TYPEC_MUX_PI3USB30532 is not set
+# end of USB Type-C Multiplexer/DeMultiplexer Switch support
 
 #
 # USB Type-C Alternate Mode drivers
 #
 CONFIG_TYPEC_DP_ALTMODE=m
+CONFIG_TYPEC_NVIDIA_ALTMODE=m
+# end of USB Type-C Alternate Mode drivers
+
 CONFIG_USB_ROLE_SWITCH=m
 CONFIG_USB_LED_TRIG=y
 CONFIG_USB_ULPI_BUS=y
@@ -6592,6 +7067,7 @@ CONFIG_LEDS_AS3645A=m
 # CONFIG_LEDS_BCM6358 is not set
 # CONFIG_LEDS_CR0014114 is not set
 CONFIG_LEDS_LM3530=m
+CONFIG_LEDS_LM3532=m
 # CONFIG_LEDS_LM3642 is not set
 # CONFIG_LEDS_LM3692X is not set
 # CONFIG_LEDS_LM3601X is not set
@@ -6614,6 +7090,7 @@ CONFIG_LEDS_PWM=m
 CONFIG_LEDS_LT3593=m
 # CONFIG_LEDS_TCA6507 is not set
 # CONFIG_LEDS_TLC591XX is not set
+CONFIG_LEDS_MAX77650=m
 # CONFIG_LEDS_LM355x is not set
 # CONFIG_LEDS_KTD2692 is not set
 # CONFIG_LEDS_IS31FL319X is not set
@@ -6627,6 +7104,8 @@ CONFIG_LEDS_BLINKM=m
 # CONFIG_LEDS_SYSCON is not set
 # CONFIG_LEDS_MLXREG is not set
 CONFIG_LEDS_USER=m
+# CONFIG_LEDS_SPI_BYTE is not set
+# CONFIG_LEDS_TI_LMU_COMMON is not set
 
 #
 # LED Triggers
@@ -6707,6 +7186,7 @@ CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_M41T80=m
 CONFIG_RTC_DRV_M41T80_WDT=y
+# CONFIG_RTC_DRV_BD70528 is not set
 CONFIG_RTC_DRV_BQ32K=m
 # CONFIG_RTC_DRV_S35390A is not set
 CONFIG_RTC_DRV_FM3130=m
@@ -6817,6 +7297,7 @@ CONFIG_DMA_ACPI=y
 CONFIG_DMA_OF=y
 CONFIG_ALTERA_MSGDMA=m
 # CONFIG_AMBA_PL08X is not set
+CONFIG_AXI_DMAC=m
 # CONFIG_BCM_SBA_RAID is not set
 CONFIG_DMA_BCM2835=y
 # CONFIG_DMA_SUN6I is not set
@@ -6850,6 +7331,8 @@ CONFIG_QCOM_HIDMA=y
 CONFIG_DW_DMAC_CORE=m
 CONFIG_DW_DMAC=m
 CONFIG_DW_DMAC_PCI=m
+# CONFIG_DW_EDMA is not set
+# CONFIG_DW_EDMA_PCIE is not set
 # CONFIG_RCAR_DMAC is not set
 # CONFIG_RENESAS_USB_DMAC is not set
 
@@ -6866,6 +7349,8 @@ CONFIG_DMA_ENGINE_RAID=y
 CONFIG_SYNC_FILE=y
 # CONFIG_SW_SYNC is not set
 CONFIG_UDMABUF=y
+# end of DMABUF options
+
 CONFIG_AUXDISPLAY=y
 # CONFIG_HD44780 is not set
 # CONFIG_IMG_ASCII_LCD is not set
@@ -6902,6 +7387,7 @@ CONFIG_VIRTIO=y
 CONFIG_VIRTIO_MENU=y
 CONFIG_VIRTIO_PCI=y
 CONFIG_VIRTIO_PCI_LEGACY=y
+# CONFIG_VIRTIO_PMEM is not set
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_INPUT=m
 CONFIG_VIRTIO_MMIO=m
@@ -6910,6 +7396,8 @@ CONFIG_VIRTIO_MMIO=m
 #
 # Microsoft Hyper-V guest support
 #
+# end of Microsoft Hyper-V guest support
+
 CONFIG_STAGING=y
 CONFIG_PRISM2_USB=m
 # CONFIG_COMEDI is not set
@@ -6923,8 +7411,6 @@ CONFIG_RTL8723BS=m
 CONFIG_R8712U=m
 CONFIG_R8188EU=m
 CONFIG_88EU_AP_MODE=y
-CONFIG_R8822BE=m
-CONFIG_RTLWIFI_DEBUG_ST=y
 # CONFIG_RTS5208 is not set
 # CONFIG_VT6655 is not set
 # CONFIG_VT6656 is not set
@@ -6938,14 +7424,15 @@ CONFIG_RTLWIFI_DEBUG_ST=y
 #
 CONFIG_ADIS16203=m
 CONFIG_ADIS16240=m
+# end of Accelerometers
 
 #
 # Analog to digital converters
 #
-CONFIG_AD7780=m
 CONFIG_AD7816=m
 CONFIG_AD7192=m
 CONFIG_AD7280=m
+# end of Analog to digital converters
 
 #
 # Analog digital bi-direction converters
@@ -6953,23 +7440,27 @@ CONFIG_AD7280=m
 CONFIG_ADT7316=m
 CONFIG_ADT7316_SPI=m
 CONFIG_ADT7316_I2C=m
+# end of Analog digital bi-direction converters
 
 #
 # Capacitance to digital converters
 #
 CONFIG_AD7150=m
 CONFIG_AD7746=m
+# end of Capacitance to digital converters
 
 #
 # Direct Digital Synthesis
 #
 CONFIG_AD9832=m
 CONFIG_AD9834=m
+# end of Direct Digital Synthesis
 
 #
 # Network Analyzer, Impedance Converters
 #
 CONFIG_AD5933=m
+# end of Network Analyzer, Impedance Converters
 
 #
 # Active energy metering IC
@@ -6977,11 +7468,15 @@ CONFIG_AD5933=m
 CONFIG_ADE7854=m
 CONFIG_ADE7854_I2C=m
 CONFIG_ADE7854_SPI=m
+# end of Active energy metering IC
 
 #
 # Resolver to digital converters
 #
 CONFIG_AD2S1210=m
+# end of Resolver to digital converters
+# end of IIO staging drivers
+
 # CONFIG_FB_SM750 is not set
 # CONFIG_USB_EMXX is not set
 
@@ -6989,10 +7484,13 @@ CONFIG_AD2S1210=m
 # Speakup console speech
 #
 # CONFIG_SPEAKUP is not set
+# end of Speakup console speech
+
 # CONFIG_MFD_NVEC is not set
 CONFIG_STAGING_MEDIA=y
+# CONFIG_VIDEO_ALLEGRO_DVT is not set
 # CONFIG_I2C_BCM2048 is not set
-CONFIG_VIDEO_ROCKCHIP_VPU=m
+# CONFIG_VIDEO_MESON_VDEC is not set
 # CONFIG_VIDEO_SUNXI is not set
 # CONFIG_TEGRA_VDE is not set
 
@@ -7003,6 +7501,8 @@ CONFIG_VIDEO_ROCKCHIP_VPU=m
 #
 # Android
 #
+# end of Android
+
 # CONFIG_STAGING_BOARD is not set
 # CONFIG_LTE_GDM724X is not set
 # CONFIG_GS_FPGABOOT is not set
@@ -7057,6 +7557,8 @@ CONFIG_PI433=m
 # Gasket devices
 #
 # CONFIG_STAGING_GASKET_FRAMEWORK is not set
+# end of Gasket devices
+
 CONFIG_XIL_AXIS_FIFO=m
 CONFIG_EROFS_FS=m
 # CONFIG_EROFS_FS_DEBUG is not set
@@ -7067,13 +7569,18 @@ CONFIG_EROFS_FS_POSIX_ACL=y
 # CONFIG_EROFS_FAULT_INJECTION is not set
 CONFIG_EROFS_FS_IO_MAX_RETRIES=5
 # CONFIG_EROFS_FS_ZIP is not set
+# CONFIG_FIELDBUS_DEV is not set
+# CONFIG_KPC2000 is not set
 # CONFIG_GOLDFISH is not set
 CONFIG_CHROME_PLATFORMS=y
 # CONFIG_CHROMEOS_TBMC is not set
 CONFIG_CROS_EC_I2C=m
+CONFIG_CROS_EC_RPMSG=m
 CONFIG_CROS_EC_SPI=m
 CONFIG_CROS_EC_PROTO=y
 CONFIG_CROS_KBD_LED_BACKLIGHT=y
+CONFIG_CROS_USBPD_LOGGER=m
+# CONFIG_MELLANOX_PLATFORM is not set
 CONFIG_CLKDEV_LOOKUP=y
 CONFIG_HAVE_CLK_PREPARE=y
 CONFIG_COMMON_CLK=y
@@ -7088,6 +7595,7 @@ CONFIG_CLK_VEXPRESS_OSC=y
 # CONFIG_COMMON_CLK_MAX9485 is not set
 CONFIG_COMMON_CLK_HI655X=m
 CONFIG_COMMON_CLK_SCPI=y
+# CONFIG_COMMON_CLK_SI5341 is not set
 # CONFIG_COMMON_CLK_SI5351 is not set
 # CONFIG_COMMON_CLK_SI514 is not set
 # CONFIG_COMMON_CLK_SI544 is not set
@@ -7105,9 +7613,11 @@ CONFIG_CLK_ACTIONS=y
 CONFIG_CLK_OWL_S500=y
 CONFIG_CLK_OWL_S700=y
 CONFIG_CLK_OWL_S900=y
+CONFIG_CLK_BCM2835=y
 CONFIG_COMMON_CLK_IPROC=y
 CONFIG_CLK_BCM_NS2=y
 CONFIG_CLK_BCM_SR=y
+# CONFIG_CLK_RASPBERRYPI is not set
 CONFIG_COMMON_CLK_HI3516CV300=m
 CONFIG_COMMON_CLK_HI3519=y
 CONFIG_COMMON_CLK_HI3660=y
@@ -7144,6 +7654,22 @@ CONFIG_COMMON_CLK_MT7622_ETHSYS=y
 CONFIG_COMMON_CLK_MT7622_HIFSYS=y
 CONFIG_COMMON_CLK_MT7622_AUDSYS=y
 CONFIG_COMMON_CLK_MT8173=y
+CONFIG_COMMON_CLK_MT8183=y
+# CONFIG_COMMON_CLK_MT8183_AUDIOSYS is not set
+# CONFIG_COMMON_CLK_MT8183_CAMSYS is not set
+# CONFIG_COMMON_CLK_MT8183_IMGSYS is not set
+# CONFIG_COMMON_CLK_MT8183_IPU_CORE0 is not set
+# CONFIG_COMMON_CLK_MT8183_IPU_CORE1 is not set
+# CONFIG_COMMON_CLK_MT8183_IPU_ADL is not set
+# CONFIG_COMMON_CLK_MT8183_IPU_CONN is not set
+# CONFIG_COMMON_CLK_MT8183_MFGCFG is not set
+# CONFIG_COMMON_CLK_MT8183_MMSYS is not set
+# CONFIG_COMMON_CLK_MT8183_VDECSYS is not set
+# CONFIG_COMMON_CLK_MT8183_VENCSYS is not set
+CONFIG_COMMON_CLK_MT8516=y
+# CONFIG_COMMON_CLK_MT8516_AUDSYS is not set
+# end of Clock driver for MediaTek SoC
+
 CONFIG_COMMON_CLK_MESON_INPUT=y
 CONFIG_COMMON_CLK_MESON_REGMAP=y
 CONFIG_COMMON_CLK_MESON_DUALDIV=y
@@ -7187,6 +7713,7 @@ CONFIG_MSM_MMCC_8996=y
 CONFIG_QCS_GCC_404=m
 CONFIG_SDM_CAMCC_845=m
 CONFIG_SDM_GCC_660=m
+# CONFIG_QCS_TURING_404 is not set
 CONFIG_SDM_GCC_845=m
 CONFIG_SDM_GPUCC_845=m
 # CONFIG_SDM_VIDEOCC_845 is not set
@@ -7212,6 +7739,11 @@ CONFIG_EXYNOS_ARM64_COMMON_CLK=y
 CONFIG_EXYNOS_AUDSS_CLK_CON=y
 CONFIG_SPRD_COMMON_CLK=y
 CONFIG_SPRD_SC9860_CLK=y
+CONFIG_CLK_SUNXI=y
+CONFIG_CLK_SUNXI_CLOCKS=y
+CONFIG_CLK_SUNXI_PRCM_SUN6I=y
+CONFIG_CLK_SUNXI_PRCM_SUN8I=y
+CONFIG_CLK_SUNXI_PRCM_SUN9I=y
 CONFIG_SUNXI_CCU=y
 CONFIG_SUN50I_A64_CCU=y
 CONFIG_SUN50I_H6_CCU=y
@@ -7224,6 +7756,8 @@ CONFIG_CLK_TEGRA_BPMP=y
 CONFIG_TEGRA_CLK_DFLL=y
 CONFIG_CLK_UNIPHIER=y
 # CONFIG_COMMON_CLK_ZYNQMP is not set
+# end of Common Clock Framework
+
 CONFIG_HWSPINLOCK=y
 CONFIG_HWSPINLOCK_QCOM=y
 # CONFIG_HWSPINLOCK_SPRD is not set
@@ -7253,11 +7787,14 @@ CONFIG_SYS_SUPPORTS_SH_TMU=y
 CONFIG_SH_TIMER_CMT=y
 CONFIG_SH_TIMER_TMU=y
 CONFIG_CLKSRC_VERSATILE=y
+# end of Clock Source drivers
+
 CONFIG_MAILBOX=y
 CONFIG_ARM_MHU=y
 CONFIG_IMX_MBOX=m
 # CONFIG_PLATFORM_MHU is not set
 # CONFIG_PL320_MBOX is not set
+CONFIG_ARMADA_37XX_RWTM_MBOX=m
 # CONFIG_ROCKCHIP_MBOX is not set
 CONFIG_PCC=y
 # CONFIG_ALTERA_MBOX is not set
@@ -7284,6 +7821,8 @@ CONFIG_IOMMU_IO_PGTABLE_LPAE=y
 # CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set
 CONFIG_IOMMU_IO_PGTABLE_ARMV7S=y
 # CONFIG_IOMMU_IO_PGTABLE_ARMV7S_SELFTEST is not set
+# end of Generic IOMMU Pagetable Support
+
 # CONFIG_IOMMU_DEBUGFS is not set
 # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
 CONFIG_OF_IOMMU=y
@@ -7293,14 +7832,17 @@ CONFIG_IOMMU_DMA=y
 # CONFIG_EXYNOS_IOMMU is not set
 # CONFIG_IPMMU_VMSA is not set
 CONFIG_ARM_SMMU=y
+CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT=y
 CONFIG_ARM_SMMU_V3=y
 CONFIG_MTK_IOMMU=y
 CONFIG_QCOM_IOMMU=y
+# CONFIG_VIRTIO_IOMMU is not set
 
 #
 # Remoteproc drivers
 #
 CONFIG_REMOTEPROC=y
+# CONFIG_IMX_REMOTEPROC is not set
 CONFIG_QCOM_RPROC_COMMON=m
 CONFIG_QCOM_Q6V5_COMMON=m
 CONFIG_QCOM_Q6V5_ADSP=m
@@ -7309,6 +7851,7 @@ CONFIG_QCOM_Q6V5_PAS=m
 # CONFIG_QCOM_Q6V5_WCSS is not set
 # CONFIG_QCOM_SYSMON is not set
 CONFIG_QCOM_WCNSS_PIL=m
+# end of Remoteproc drivers
 
 #
 # Rpmsg drivers
@@ -7320,6 +7863,8 @@ CONFIG_RPMSG_QCOM_GLINK_NATIVE=m
 CONFIG_RPMSG_QCOM_GLINK_SMEM=m
 CONFIG_RPMSG_QCOM_SMD=m
 CONFIG_RPMSG_VIRTIO=m
+# end of Rpmsg drivers
+
 # CONFIG_SOUNDWIRE is not set
 
 #
@@ -7335,6 +7880,12 @@ CONFIG_MESON_CLK_MEASURE=y
 CONFIG_MESON_GX_SOCINFO=y
 CONFIG_MESON_GX_PM_DOMAINS=y
 CONFIG_MESON_MX_SOCINFO=y
+# end of Amlogic SoC drivers
+
+#
+# Aspeed SoC drivers
+#
+# end of Aspeed SoC drivers
 
 #
 # Broadcom SoC drivers
@@ -7343,6 +7894,7 @@ CONFIG_BCM2835_POWER=y
 CONFIG_RASPBERRYPI_POWER=y
 CONFIG_SOC_BRCMSTB=y
 CONFIG_BRCMSTB_PM=y
+# end of Broadcom SoC drivers
 
 #
 # NXP/Freescale QorIQ SoC drivers
@@ -7351,11 +7903,15 @@ CONFIG_FSL_DPAA=y
 # CONFIG_FSL_DPAA_CHECKING is not set
 # CONFIG_FSL_BMAN_TEST is not set
 # CONFIG_FSL_QMAN_TEST is not set
+CONFIG_DPAA2_CONSOLE=y
+# end of NXP/Freescale QorIQ SoC drivers
 
 #
 # i.MX SoC drivers
 #
 CONFIG_IMX_GPCV2_PM_DOMAINS=y
+# CONFIG_IMX_SCU_SOC is not set
+# end of i.MX SoC drivers
 
 #
 # MediaTek SoC drivers
@@ -7364,10 +7920,12 @@ CONFIG_MTK_CMDQ=m
 CONFIG_MTK_INFRACFG=y
 CONFIG_MTK_PMIC_WRAP=y
 CONFIG_MTK_SCPSYS=y
+# end of MediaTek SoC drivers
 
 #
 # Qualcomm SoC drivers
 #
+# CONFIG_QCOM_AOSS_QMP is not set
 # CONFIG_QCOM_COMMAND_DB is not set
 # CONFIG_QCOM_GENI_SE is not set
 CONFIG_QCOM_GLINK_SSR=m
@@ -7383,6 +7941,8 @@ CONFIG_QCOM_SMP2P=y
 CONFIG_QCOM_SMSM=y
 CONFIG_QCOM_WCNSS_CTRL=m
 # CONFIG_QCOM_APR is not set
+# end of Qualcomm SoC drivers
+
 CONFIG_SOC_RENESAS=y
 CONFIG_ARCH_RCAR_GEN3=y
 CONFIG_ARCH_R8A774A1=y
@@ -7424,7 +7984,11 @@ CONFIG_SOC_TEGRA_POWERGATE_BPMP=y
 # CONFIG_XILINX_VCU is not set
 CONFIG_ZYNQMP_POWER=y
 CONFIG_ZYNQMP_PM_DOMAINS=y
+# end of Xilinx SoC drivers
+
 # CONFIG_SOC_ZTE is not set
+# end of SOC (System On Chip) specific Drivers
+
 CONFIG_PM_DEVFREQ=y
 
 #
@@ -7448,6 +8012,7 @@ CONFIG_EXTCON=y
 # Extcon Device Drivers
 #
 CONFIG_EXTCON_ADC_JACK=m
+# CONFIG_EXTCON_FSA9480 is not set
 CONFIG_EXTCON_GPIO=y
 # CONFIG_EXTCON_MAX3355 is not set
 CONFIG_EXTCON_PTN5150=m
@@ -7458,6 +8023,7 @@ CONFIG_EXTCON_USB_GPIO=y
 CONFIG_EXTCON_USBC_CROS_EC=m
 CONFIG_MEMORY=y
 # CONFIG_ARM_PL172_MPMC is not set
+CONFIG_FSL_IFC=y
 CONFIG_MTK_SMI=y
 CONFIG_TEGRA_MC=y
 CONFIG_IIO=y
@@ -7517,6 +8083,7 @@ CONFIG_MXC6255=m
 CONFIG_SCA3000=m
 CONFIG_STK8312=m
 CONFIG_STK8BA50=m
+# end of Accelerometers
 
 #
 # Analog to digital converters
@@ -7532,6 +8099,7 @@ CONFIG_AD7606_IFACE_PARALLEL=m
 CONFIG_AD7606_IFACE_SPI=m
 CONFIG_AD7766=m
 CONFIG_AD7768_1=m
+CONFIG_AD7780=m
 CONFIG_AD7791=m
 CONFIG_AD7793=m
 CONFIG_AD7887=m
@@ -7578,21 +8146,26 @@ CONFIG_TI_ADC128S052=m
 CONFIG_TI_ADC161S626=m
 CONFIG_TI_ADS1015=m
 # CONFIG_TI_ADS7950 is not set
+CONFIG_TI_ADS8344=m
 CONFIG_TI_ADS8688=m
 CONFIG_TI_ADS124S08=m
 # CONFIG_TI_TLC4541 is not set
 CONFIG_VF610_ADC=m
 CONFIG_VIPERBOARD_ADC=m
+# CONFIG_XILINX_XADC is not set
+# end of Analog to digital converters
 
 #
 # Analog Front Ends
 #
 # CONFIG_IIO_RESCALE is not set
+# end of Analog Front Ends
 
 #
 # Amplifiers
 #
 CONFIG_AD8366=m
+# end of Amplifiers
 
 #
 # Chemical Sensors
@@ -7606,28 +8179,31 @@ CONFIG_IAQCORE=m
 CONFIG_SENSIRION_SGP30=m
 CONFIG_SPS30=m
 CONFIG_VZ89X=m
+# end of Chemical Sensors
+
 CONFIG_IIO_CROS_EC_SENSORS_CORE=m
 CONFIG_IIO_CROS_EC_SENSORS=m
+# CONFIG_IIO_CROS_EC_SENSORS_LID_ANGLE is not set
 
 #
 # Hid Sensor IIO Common
 #
 CONFIG_HID_SENSOR_IIO_COMMON=m
 CONFIG_HID_SENSOR_IIO_TRIGGER=m
+# end of Hid Sensor IIO Common
+
 CONFIG_IIO_MS_SENSORS_I2C=m
 
 #
 # SSP Sensor Common
 #
 # CONFIG_IIO_SSP_SENSORHUB is not set
+# end of SSP Sensor Common
+
 CONFIG_IIO_ST_SENSORS_I2C=m
 CONFIG_IIO_ST_SENSORS_SPI=m
 CONFIG_IIO_ST_SENSORS_CORE=m
 
-#
-# Counters
-#
-
 #
 # Digital to analog converters
 #
@@ -7665,11 +8241,13 @@ CONFIG_TI_DAC082S085=m
 CONFIG_TI_DAC7311=m
 CONFIG_TI_DAC7612=m
 CONFIG_VF610_DAC=m
+# end of Digital to analog converters
 
 #
 # IIO dummy driver
 #
 # CONFIG_IIO_SIMPLE_DUMMY is not set
+# end of IIO dummy driver
 
 #
 # Frequency Synthesizers DDS/PLL
@@ -7679,11 +8257,15 @@ CONFIG_VF610_DAC=m
 # Clock Generator/Distribution
 #
 CONFIG_AD9523=m
+# end of Clock Generator/Distribution
 
 #
 # Phase-Locked Loop (PLL) frequency synthesizers
 #
 CONFIG_ADF4350=m
+# CONFIG_ADF4371 is not set
+# end of Phase-Locked Loop (PLL) frequency synthesizers
+# end of Frequency Synthesizers DDS/PLL
 
 #
 # Digital gyroscope sensors
@@ -7696,12 +8278,16 @@ CONFIG_ADXRS450=m
 CONFIG_BMG160=m
 CONFIG_BMG160_I2C=m
 CONFIG_BMG160_SPI=m
+CONFIG_FXAS21002C=m
+CONFIG_FXAS21002C_I2C=m
+CONFIG_FXAS21002C_SPI=m
 CONFIG_HID_SENSOR_GYRO_3D=m
 # CONFIG_MPU3050_I2C is not set
 CONFIG_IIO_ST_GYRO_3AXIS=m
 CONFIG_IIO_ST_GYRO_I2C_3AXIS=m
 CONFIG_IIO_ST_GYRO_SPI_3AXIS=m
 CONFIG_ITG3200=m
+# end of Digital gyroscope sensors
 
 #
 # Health Sensors
@@ -7714,6 +8300,8 @@ CONFIG_AFE4403=m
 CONFIG_AFE4404=m
 CONFIG_MAX30100=m
 CONFIG_MAX30102=m
+# end of Heart Rate Monitors
+# end of Health Sensors
 
 #
 # Humidity sensors
@@ -7728,6 +8316,7 @@ CONFIG_HTS221_SPI=m
 CONFIG_HTU21=m
 CONFIG_SI7005=m
 CONFIG_SI7020=m
+# end of Humidity sensors
 
 #
 # Inertial measurement units
@@ -7742,6 +8331,8 @@ CONFIG_INV_MPU6050_IIO=m
 CONFIG_INV_MPU6050_I2C=m
 CONFIG_INV_MPU6050_SPI=m
 # CONFIG_IIO_ST_LSM6DSX is not set
+# end of Inertial measurement units
+
 CONFIG_IIO_ADIS_LIB=m
 CONFIG_IIO_ADIS_LIB_BUFFER=y
 
@@ -7791,6 +8382,7 @@ CONFIG_VCNL4035=m
 CONFIG_VEML6070=m
 CONFIG_VL6180=m
 # CONFIG_ZOPT2201 is not set
+# end of Light sensors
 
 #
 # Magnetometer sensors
@@ -7813,17 +8405,20 @@ CONFIG_SENSORS_HMC5843_SPI=m
 CONFIG_SENSORS_RM3100=m
 CONFIG_SENSORS_RM3100_I2C=m
 CONFIG_SENSORS_RM3100_SPI=m
+# end of Magnetometer sensors
 
 #
 # Multiplexers
 #
 # CONFIG_IIO_MUX is not set
+# end of Multiplexers
 
 #
 # Inclinometer sensors
 #
 CONFIG_HID_SENSOR_INCLINOMETER_3D=m
 CONFIG_HID_SENSOR_DEVICE_ROTATION=m
+# end of Inclinometer sensors
 
 #
 # Triggers - standalone
@@ -7832,6 +8427,7 @@ CONFIG_IIO_HRTIMER_TRIGGER=m
 CONFIG_IIO_INTERRUPT_TRIGGER=m
 CONFIG_IIO_TIGHTLOOP_TRIGGER=m
 CONFIG_IIO_SYSFS_TRIGGER=m
+# end of Triggers - standalone
 
 #
 # Digital potentiometers
@@ -7845,11 +8441,13 @@ CONFIG_MCP4131=m
 CONFIG_MCP4531=m
 CONFIG_MCP41010=m
 CONFIG_TPL0102=m
+# end of Digital potentiometers
 
 #
 # Digital potentiostats
 #
 CONFIG_LMP91000=m
+# end of Digital potentiostats
 
 #
 # Pressure sensors
@@ -7859,6 +8457,7 @@ CONFIG_BMP280=m
 CONFIG_BMP280_I2C=m
 CONFIG_BMP280_SPI=m
 # CONFIG_IIO_CROS_EC_BARO is not set
+# CONFIG_DPS310 is not set
 CONFIG_HID_SENSOR_PRESS=m
 CONFIG_HP03=m
 CONFIG_MPL115=m
@@ -7877,28 +8476,33 @@ CONFIG_HP206C=m
 CONFIG_ZPA2326=m
 CONFIG_ZPA2326_I2C=m
 CONFIG_ZPA2326_SPI=m
+# end of Pressure sensors
 
 #
 # Lightning sensors
 #
 CONFIG_AS3935=m
+# end of Lightning sensors
 
 #
 # Proximity and distance sensors
 #
 # CONFIG_ISL29501 is not set
 CONFIG_LIDAR_LITE_V2=m
+CONFIG_MB1232=m
 CONFIG_RFD77402=m
 CONFIG_SRF04=m
 CONFIG_SX9500=m
 # CONFIG_SRF08 is not set
 CONFIG_VL53L0X_I2C=m
+# end of Proximity and distance sensors
 
 #
 # Resolver to digital converters
 #
 CONFIG_AD2S90=m
 CONFIG_AD2S1200=m
+# end of Resolver to digital converters
 
 #
 # Temperature sensors
@@ -7911,6 +8515,9 @@ CONFIG_TMP006=m
 # CONFIG_TMP007 is not set
 CONFIG_TSYS01=m
 CONFIG_TSYS02D=m
+CONFIG_MAX31856=m
+# end of Temperature sensors
+
 # CONFIG_NTB is not set
 # CONFIG_VME_BUS is not set
 CONFIG_PWM=y
@@ -7924,6 +8531,7 @@ CONFIG_PWM_CROS_EC=m
 CONFIG_PWM_HIBVT=m
 CONFIG_PWM_IMX1=m
 CONFIG_PWM_IMX27=m
+CONFIG_PWM_IMX_TPM=m
 CONFIG_PWM_MESON=m
 CONFIG_PWM_MTK_DISP=m
 CONFIG_PWM_MEDIATEK=m
@@ -7941,12 +8549,15 @@ CONFIG_PWM_ZX=m
 #
 CONFIG_IRQCHIP=y
 CONFIG_ARM_GIC=y
+CONFIG_ARM_GIC_PM=y
 CONFIG_ARM_GIC_MAX_NR=1
 CONFIG_ARM_GIC_V2M=y
 CONFIG_ARM_GIC_V3=y
 CONFIG_ARM_GIC_V3_ITS=y
 CONFIG_ARM_GIC_V3_ITS_PCI=y
 CONFIG_ALPINE_MSI=y
+# CONFIG_AL_FIC is not set
+CONFIG_BCM7038_L1_IRQ=y
 CONFIG_BRCMSTB_L2_IRQ=y
 CONFIG_DW_APB_ICTL=y
 CONFIG_HISILICON_IRQ_MBIGEN=y
@@ -7965,6 +8576,8 @@ CONFIG_IRQ_UNIPHIER_AIDET=y
 CONFIG_MESON_IRQ_GPIO=y
 # CONFIG_QCOM_PDC is not set
 CONFIG_IMX_IRQSTEER=y
+# end of IRQ chip support
+
 # CONFIG_IPACK_BUS is not set
 CONFIG_ARCH_HAS_RESET_CONTROLLER=y
 CONFIG_RESET_CONTROLLER=y
@@ -7983,11 +8596,6 @@ CONFIG_RESET_UNIPHIER_GLUE=y
 CONFIG_COMMON_RESET_HI3660=y
 CONFIG_COMMON_RESET_HI6220=y
 CONFIG_RESET_TEGRA_BPMP=y
-CONFIG_FMC=m
-CONFIG_FMC_FAKEDEV=m
-CONFIG_FMC_TRIVIAL=m
-CONFIG_FMC_WRITE_EEPROM=m
-CONFIG_FMC_CHARDEV=m
 
 #
 # PHY Subsystem
@@ -8001,6 +8609,9 @@ CONFIG_PHY_SUN6I_MIPI_DPHY=m
 CONFIG_PHY_MESON8B_USB2=y
 CONFIG_PHY_MESON_GXL_USB2=y
 CONFIG_PHY_MESON_GXL_USB3=y
+CONFIG_PHY_MESON_G12A_USB2=m
+CONFIG_PHY_MESON_G12A_USB3_PCIE=y
+CONFIG_PHY_BCM_SR_USB=y
 # CONFIG_BCM_KONA_USB2_PHY is not set
 # CONFIG_PHY_BCM_NS_USB2 is not set
 # CONFIG_PHY_BCM_NS_USB3 is not set
@@ -8013,7 +8624,9 @@ CONFIG_PHY_CADENCE_DP=m
 CONFIG_PHY_CADENCE_DPHY=m
 CONFIG_PHY_CADENCE_SIERRA=m
 CONFIG_PHY_FSL_IMX8MQ_USB=m
+# CONFIG_PHY_MIXEL_MIPI_DPHY is not set
 CONFIG_PHY_HI6220_USB=y
+CONFIG_PHY_HI3660_USB=m
 # CONFIG_PHY_HISTB_COMBPHY is not set
 # CONFIG_PHY_HISI_INNO_USB2 is not set
 # CONFIG_PHY_BERLIN_SATA is not set
@@ -8025,12 +8638,14 @@ CONFIG_PHY_MVEBU_CP110_COMPHY=m
 # CONFIG_PHY_PXA_28NM_HSIC is not set
 # CONFIG_PHY_PXA_28NM_USB2 is not set
 CONFIG_PHY_MTK_TPHY=m
+CONFIG_PHY_MTK_UFS=m
 # CONFIG_PHY_MTK_XSPHY is not set
 # CONFIG_PHY_CPCAP_USB is not set
 # CONFIG_PHY_MAPPHONE_MDM6600 is not set
 CONFIG_PHY_OCELOT_SERDES=m
 # CONFIG_PHY_QCOM_APQ8064_SATA is not set
 # CONFIG_PHY_QCOM_IPQ806X_SATA is not set
+# CONFIG_PHY_QCOM_PCIE2 is not set
 CONFIG_PHY_QCOM_QMP=m
 CONFIG_PHY_QCOM_QUSB2=m
 CONFIG_PHY_QCOM_UFS=y
@@ -8058,6 +8673,8 @@ CONFIG_PHY_UNIPHIER_USB3=m
 CONFIG_PHY_UNIPHIER_PCIE=m
 # CONFIG_PHY_TEGRA_XUSB is not set
 # CONFIG_PHY_TUSB1210 is not set
+# end of PHY Subsystem
+
 CONFIG_POWERCAP=y
 CONFIG_IDLE_INJECT=y
 # CONFIG_MCB is not set
@@ -8071,18 +8688,24 @@ CONFIG_ARM_CCI400_PMU=y
 CONFIG_ARM_CCN=y
 CONFIG_ARM_PMU=y
 CONFIG_ARM_PMU_ACPI=y
+CONFIG_ARM_SMMU_V3_PMU=m
 # CONFIG_ARM_DSU_PMU is not set
+# CONFIG_FSL_IMX8_DDR_PMU is not set
 CONFIG_HISI_PMU=y
 # CONFIG_QCOM_L2_PMU is not set
 # CONFIG_QCOM_L3_PMU is not set
 # CONFIG_XGENE_PMU is not set
 CONFIG_ARM_SPE_PMU=m
+# end of Performance monitor support
+
 CONFIG_RAS=y
 
 #
 # Android
 #
 # CONFIG_ANDROID is not set
+# end of Android
+
 CONFIG_LIBNVDIMM=y
 CONFIG_BLK_DEV_PMEM=m
 CONFIG_ND_BLK=m
@@ -8094,7 +8717,10 @@ CONFIG_NVDIMM_KEYS=y
 CONFIG_DAX_DRIVER=y
 CONFIG_DAX=y
 CONFIG_NVMEM=y
+CONFIG_NVMEM_SYSFS=y
 CONFIG_NVMEM_IMX_IIM=m
+CONFIG_NVMEM_IMX_OCOTP=m
+# CONFIG_NVMEM_IMX_OCOTP_SCU is not set
 CONFIG_MTK_EFUSE=m
 CONFIG_QCOM_QFPROM=m
 # CONFIG_ROCKCHIP_EFUSE is not set
@@ -8102,6 +8728,7 @@ CONFIG_NVMEM_BCM_OCOTP=y
 CONFIG_NVMEM_SUNXI_SID=m
 CONFIG_UNIPHIER_EFUSE=m
 CONFIG_MESON_MX_EFUSE=m
+# CONFIG_NVMEM_SNVS_LPGPR is not set
 # CONFIG_SC27XX_EFUSE is not set
 # CONFIG_NVMEM_ZYNQMP is not set
 
@@ -8110,6 +8737,8 @@ CONFIG_MESON_MX_EFUSE=m
 #
 # CONFIG_STM is not set
 # CONFIG_INTEL_TH is not set
+# end of HW tracing support
+
 # CONFIG_FPGA is not set
 # CONFIG_FSI is not set
 # CONFIG_TEE is not set
@@ -8122,11 +8751,15 @@ CONFIG_MUX_ADG792A=m
 CONFIG_MUX_ADGS1408=m
 CONFIG_MUX_GPIO=m
 CONFIG_MUX_MMIO=m
+# end of Multiplexer drivers
+
 CONFIG_PM_OPP=y
 # CONFIG_SIOX is not set
 # CONFIG_SLIMBUS is not set
 CONFIG_INTERCONNECT=m
 # CONFIG_INTERCONNECT_QCOM is not set
+# CONFIG_COUNTER is not set
+# end of Device Drivers
 
 #
 # File systems
@@ -8228,6 +8861,7 @@ CONFIG_FSCACHE_OBJECT_LIST=y
 CONFIG_CACHEFILES=m
 # CONFIG_CACHEFILES_DEBUG is not set
 # CONFIG_CACHEFILES_HISTOGRAM is not set
+# end of Caches
 
 #
 # CD-ROM/DVD Filesystems
@@ -8236,6 +8870,7 @@ CONFIG_ISO9660_FS=m
 CONFIG_JOLIET=y
 CONFIG_ZISOFS=y
 CONFIG_UDF_FS=m
+# end of CD-ROM/DVD Filesystems
 
 #
 # DOS/FAT/NT Filesystems
@@ -8249,6 +8884,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
 CONFIG_NTFS_FS=m
 # CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
+# end of DOS/FAT/NT Filesystems
 
 #
 # Pseudo filesystems
@@ -8269,6 +8905,8 @@ CONFIG_MEMFD_CREATE=y
 CONFIG_ARCH_HAS_GIGANTIC_PAGE=y
 CONFIG_CONFIGFS_FS=y
 CONFIG_EFIVAR_FS=y
+# end of Pseudo filesystems
+
 CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_ORANGEFS_FS is not set
 # CONFIG_ADFS_FS is not set
@@ -8286,6 +8924,7 @@ CONFIG_UBIFS_FS=m
 # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
 CONFIG_UBIFS_FS_LZO=y
 CONFIG_UBIFS_FS_ZLIB=y
+CONFIG_UBIFS_FS_ZSTD=y
 # CONFIG_UBIFS_ATIME_SUPPORT is not set
 CONFIG_UBIFS_FS_XATTR=y
 CONFIG_UBIFS_FS_SECURITY=y
@@ -8377,11 +9016,12 @@ CONFIG_SUNRPC_GSS=y
 CONFIG_SUNRPC_BACKCHANNEL=y
 CONFIG_SUNRPC_SWAP=y
 CONFIG_RPCSEC_GSS_KRB5=m
-CONFIG_CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y
+# CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES is not set
 CONFIG_SUNRPC_DEBUG=y
 CONFIG_CEPH_FS=m
 CONFIG_CEPH_FSCACHE=y
 CONFIG_CEPH_FS_POSIX_ACL=y
+# CONFIG_CEPH_FS_SECURITY_LABEL is not set
 CONFIG_CIFS=m
 # CONFIG_CIFS_STATS2 is not set
 CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
@@ -8389,7 +9029,6 @@ CONFIG_CIFS_WEAK_PW_HASH=y
 CONFIG_CIFS_UPCALL=y
 CONFIG_CIFS_XATTR=y
 CONFIG_CIFS_POSIX=y
-CONFIG_CIFS_ACL=y
 CONFIG_CIFS_DEBUG=y
 # CONFIG_CIFS_DEBUG2 is not set
 # CONFIG_CIFS_DEBUG_DUMP_KEYS is not set
@@ -8454,12 +9093,16 @@ CONFIG_NLS_MAC_TURKISH=m
 CONFIG_NLS_UTF8=m
 CONFIG_DLM=m
 CONFIG_DLM_DEBUG=y
+CONFIG_UNICODE=y
+# CONFIG_UNICODE_NORMALIZATION_SELFTEST is not set
+# end of File systems
 
 #
 # Security options
 #
 CONFIG_KEYS=y
 CONFIG_KEYS_COMPAT=y
+# CONFIG_KEYS_REQUEST_CACHE is not set
 CONFIG_PERSISTENT_KEYRINGS=y
 CONFIG_BIG_KEYS=y
 CONFIG_TRUSTED_KEYS=m
@@ -8498,6 +9141,25 @@ CONFIG_SECURITY_YAMA=y
 # CONFIG_DEFAULT_SECURITY_APPARMOR is not set
 CONFIG_DEFAULT_SECURITY_DAC=y
 CONFIG_LSM="yama,loadpin,safesetid,integrity"
+
+#
+# Kernel hardening options
+#
+
+#
+# Memory initialization
+#
+CONFIG_INIT_STACK_NONE=y
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_USER is not set
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL is not set
+# CONFIG_GCC_PLUGIN_STACKLEAK is not set
+# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
+# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
+# end of Memory initialization
+# end of Kernel hardening options
+# end of Security options
+
 CONFIG_XOR_BLOCKS=m
 CONFIG_ASYNC_CORE=m
 CONFIG_ASYNC_MEMCPY=m
@@ -8525,9 +9187,6 @@ CONFIG_CRYPTO_AKCIPHER=y
 CONFIG_CRYPTO_KPP2=y
 CONFIG_CRYPTO_KPP=y
 CONFIG_CRYPTO_ACOMP2=y
-CONFIG_CRYPTO_RSA=y
-CONFIG_CRYPTO_DH=y
-CONFIG_CRYPTO_ECDH=m
 CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MANAGER2=y
 CONFIG_CRYPTO_USER=m
@@ -8537,13 +9196,21 @@ CONFIG_CRYPTO_GF128MUL=y
 CONFIG_CRYPTO_NULL=y
 CONFIG_CRYPTO_NULL2=y
 CONFIG_CRYPTO_PCRYPT=m
-CONFIG_CRYPTO_WORKQUEUE=y
 CONFIG_CRYPTO_CRYPTD=y
 CONFIG_CRYPTO_AUTHENC=m
 # CONFIG_CRYPTO_TEST is not set
 CONFIG_CRYPTO_SIMD=y
 CONFIG_CRYPTO_ENGINE=m
 
+#
+# Public-key cryptography
+#
+CONFIG_CRYPTO_RSA=y
+CONFIG_CRYPTO_DH=y
+CONFIG_CRYPTO_ECC=m
+CONFIG_CRYPTO_ECDH=m
+CONFIG_CRYPTO_ECRDSA=m
+
 #
 # Authenticated Encryption with Associated Data
 #
@@ -8587,6 +9254,7 @@ CONFIG_CRYPTO_VMAC=m
 #
 CONFIG_CRYPTO_CRC32C=y
 CONFIG_CRYPTO_CRC32=y
+# CONFIG_CRYPTO_XXHASH is not set
 CONFIG_CRYPTO_CRCT10DIF=y
 CONFIG_CRYPTO_GHASH=y
 CONFIG_CRYPTO_POLY1305=m
@@ -8602,7 +9270,7 @@ CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA512=m
 CONFIG_CRYPTO_SHA3=m
 CONFIG_CRYPTO_SM3=m
-# CONFIG_CRYPTO_STREEBOG is not set
+CONFIG_CRYPTO_STREEBOG=m
 CONFIG_CRYPTO_TGR192=m
 CONFIG_CRYPTO_WP512=m
 
@@ -8612,6 +9280,7 @@ CONFIG_CRYPTO_WP512=m
 CONFIG_CRYPTO_AES=y
 CONFIG_CRYPTO_AES_TI=m
 CONFIG_CRYPTO_ANUBIS=m
+CONFIG_CRYPTO_LIB_ARC4=m
 CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_BLOWFISH=m
 CONFIG_CRYPTO_BLOWFISH_COMMON=m
@@ -8662,9 +9331,10 @@ CONFIG_CRYPTO_HW=y
 # CONFIG_CRYPTO_DEV_MARVELL_CESA is not set
 # CONFIG_CRYPTO_DEV_FSL_CAAM is not set
 CONFIG_CRYPTO_DEV_SAHARA=m
-# CONFIG_CRYPTO_DEV_MXC_SCC is not set
 # CONFIG_CRYPTO_DEV_EXYNOS_RNG is not set
 # CONFIG_CRYPTO_DEV_S5P is not set
+# CONFIG_CRYPTO_DEV_ATMEL_ECC is not set
+# CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set
 CONFIG_CRYPTO_DEV_CCP=y
 CONFIG_CRYPTO_DEV_CCP_DD=m
 CONFIG_CRYPTO_DEV_SP_CCP=y
@@ -8699,6 +9369,8 @@ CONFIG_SYSTEM_TRUSTED_KEYS=""
 # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
 # CONFIG_SECONDARY_TRUSTED_KEYRING is not set
 # CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
+# end of Certificates for signature checking
+
 CONFIG_BINARY_PRINTF=y
 
 #
@@ -8706,12 +9378,14 @@ CONFIG_BINARY_PRINTF=y
 #
 CONFIG_RAID6_PQ=m
 CONFIG_RAID6_PQ_BENCHMARK=y
+CONFIG_PACKING=y
 CONFIG_BITREVERSE=y
 CONFIG_HAVE_ARCH_BITREVERSE=y
-CONFIG_RATIONAL=y
 CONFIG_GENERIC_STRNCPY_FROM_USER=y
 CONFIG_GENERIC_STRNLEN_USER=y
 CONFIG_GENERIC_NET_UTILS=y
+CONFIG_CORDIC=m
+CONFIG_RATIONAL=y
 CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_STMP_DEVICE=y
 CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
@@ -8767,6 +9441,8 @@ CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_REED_SOLOMON=m
 CONFIG_REED_SOLOMON_ENC8=y
 CONFIG_REED_SOLOMON_DEC8=y
+CONFIG_REED_SOLOMON_DEC16=y
+CONFIG_BCH=m
 CONFIG_TEXTSEARCH=y
 CONFIG_TEXTSEARCH_KMP=m
 CONFIG_TEXTSEARCH_BM=m
@@ -8785,6 +9461,7 @@ CONFIG_ARCH_HAS_SETUP_DMA_OPS=y
 CONFIG_ARCH_HAS_TEARDOWN_DMA_OPS=y
 CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE=y
 CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU=y
+CONFIG_ARCH_HAS_DMA_PREP_COHERENT=y
 CONFIG_ARCH_HAS_DMA_COHERENT_TO_PFN=y
 CONFIG_ARCH_HAS_DMA_MMAP_PGPROT=y
 CONFIG_SWIOTLB=y
@@ -8811,13 +9488,16 @@ CONFIG_GLOB=y
 CONFIG_NLATTR=y
 CONFIG_LRU_CACHE=m
 CONFIG_CLZ_TAB=y
-CONFIG_CORDIC=m
-# CONFIG_DDR is not set
 CONFIG_IRQ_POLL=y
 CONFIG_MPILIB=y
+CONFIG_DIMLIB=y
 CONFIG_LIBFDT=y
 CONFIG_OID_REGISTRY=y
 CONFIG_UCS2_STRING=y
+CONFIG_HAVE_GENERIC_VDSO=y
+CONFIG_GENERIC_GETTIMEOFDAY=y
+CONFIG_GENERIC_COMPAT_VDSO=y
+CONFIG_CROSS_COMPILE_COMPAT_VDSO=""
 CONFIG_FONT_SUPPORT=y
 # CONFIG_FONTS is not set
 CONFIG_FONT_8x8=y
@@ -8827,6 +9507,7 @@ CONFIG_ARCH_HAS_PMEM_API=y
 CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y
 CONFIG_SBITMAP=y
 # CONFIG_STRING_SELFTEST is not set
+# end of Library routines
 
 #
 # Kernel hacking
@@ -8842,6 +9523,7 @@ CONFIG_CONSOLE_LOGLEVEL_QUIET=4
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 CONFIG_BOOT_PRINTK_DELAY=y
 CONFIG_DYNAMIC_DEBUG=y
+# end of printk and dmesg options
 
 #
 # Compile-time checks and compiler options
@@ -8850,6 +9532,7 @@ CONFIG_DEBUG_INFO=y
 # CONFIG_DEBUG_INFO_REDUCED is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
 # CONFIG_DEBUG_INFO_DWARF4 is not set
+# CONFIG_DEBUG_INFO_BTF is not set
 # CONFIG_GDB_SCRIPTS is not set
 CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_FRAME_WARN=1024
@@ -8857,16 +9540,20 @@ CONFIG_STRIP_ASM_SYMS=y
 # CONFIG_READABLE_ASM is not set
 CONFIG_UNUSED_SYMBOLS=y
 CONFIG_DEBUG_FS=y
-CONFIG_HEADERS_CHECK=y
+# CONFIG_HEADERS_INSTALL is not set
+# CONFIG_OPTIMIZE_INLINING is not set
 CONFIG_DEBUG_SECTION_MISMATCH=y
 CONFIG_SECTION_MISMATCH_WARN_ONLY=y
 CONFIG_ARCH_WANT_FRAME_POINTERS=y
 CONFIG_FRAME_POINTER=y
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+# end of Compile-time checks and compiler options
+
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x0
 CONFIG_MAGIC_SYSRQ_SERIAL=y
 CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_MISC=y
 
 #
 # Memory Debugging
@@ -8895,6 +9582,8 @@ CONFIG_HAVE_ARCH_KASAN_SW_TAGS=y
 CONFIG_CC_HAS_KASAN_GENERIC=y
 # CONFIG_KASAN is not set
 CONFIG_KASAN_STACK=1
+# end of Memory Debugging
+
 CONFIG_ARCH_HAS_KCOV=y
 CONFIG_CC_HAS_SANCOV_TRACE_PC=y
 # CONFIG_KCOV is not set
@@ -8909,6 +9598,8 @@ CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
 CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
 # CONFIG_WQ_WATCHDOG is not set
+# end of Debug Lockups and Hangs
+
 # CONFIG_PANIC_ON_OOPS is not set
 CONFIG_PANIC_ON_OOPS_VALUE=0
 CONFIG_PANIC_TIMEOUT=0
@@ -8934,13 +9625,15 @@ CONFIG_LOCK_DEBUGGING_SUPPORT=y
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_LOCK_TORTURE_TEST is not set
 # CONFIG_WW_MUTEX_SELFTEST is not set
+# end of Lock Debugging (spinlocks, mutexes, etc...)
+
 CONFIG_STACKTRACE=y
 # CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
 # CONFIG_DEBUG_KOBJECT is not set
 CONFIG_HAVE_DEBUG_BUGVERBOSE=y
 CONFIG_DEBUG_BUGVERBOSE=y
 CONFIG_DEBUG_LIST=y
-# CONFIG_DEBUG_PI_LIST is not set
+# CONFIG_DEBUG_PLIST is not set
 CONFIG_DEBUG_SG=y
 CONFIG_DEBUG_NOTIFIERS=y
 CONFIG_DEBUG_CREDENTIALS=y
@@ -8954,6 +9647,8 @@ CONFIG_RCU_TORTURE_TEST=m
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
 # CONFIG_RCU_TRACE is not set
 # CONFIG_RCU_EQS_DEBUG is not set
+# end of RCU Debugging
+
 # CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
 # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
@@ -9004,7 +9699,6 @@ CONFIG_RING_BUFFER_BENCHMARK=m
 # CONFIG_RING_BUFFER_STARTUP_TEST is not set
 CONFIG_PREEMPTIRQ_DELAY_TEST=m
 # CONFIG_TRACE_EVAL_MAP_FILE is not set
-CONFIG_TRACING_EVENTS_GPIO=y
 CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_LKDTM is not set
 # CONFIG_TEST_LIST_SORT is not set
@@ -9012,12 +9706,14 @@ CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_KPROBES_SANITY_TEST is not set
 # CONFIG_BACKTRACE_SELF_TEST is not set
 # CONFIG_RBTREE_TEST is not set
+# CONFIG_REED_SOLOMON_TEST is not set
 # CONFIG_INTERVAL_TREE_TEST is not set
 # CONFIG_PERCPU_TEST is not set
 CONFIG_ATOMIC64_SELFTEST=y
 CONFIG_ASYNC_RAID6_TEST=m
 # CONFIG_TEST_HEXDUMP is not set
 # CONFIG_TEST_STRING_HELPERS is not set
+# CONFIG_TEST_STRSCPY is not set
 CONFIG_TEST_KSTRTOX=y
 # CONFIG_TEST_PRINTF is not set
 # CONFIG_TEST_BITMAP is not set
@@ -9032,6 +9728,7 @@ CONFIG_TEST_KSTRTOX=y
 # CONFIG_TEST_VMALLOC is not set
 # CONFIG_TEST_USER_COPY is not set
 # CONFIG_TEST_BPF is not set
+# CONFIG_TEST_BLACKHOLE_DEV is not set
 # CONFIG_FIND_BIT_BENCHMARK is not set
 # CONFIG_TEST_FIRMWARE is not set
 # CONFIG_TEST_SYSCTL is not set
@@ -9040,6 +9737,7 @@ CONFIG_TEST_KSTRTOX=y
 # CONFIG_TEST_KMOD is not set
 # CONFIG_TEST_MEMCAT_P is not set
 # CONFIG_TEST_STACKINIT is not set
+# CONFIG_TEST_MEMINIT is not set
 # CONFIG_MEMTEST is not set
 CONFIG_BUG_ON_DATA_CORRUPTION=y
 # CONFIG_SAMPLES is not set
@@ -9064,3 +9762,4 @@ CONFIG_DEBUG_WX=y
 # CONFIG_DEBUG_EFI is not set
 # CONFIG_ARM64_RELOC_TEST is not set
 # CONFIG_CORESIGHT is not set
+# end of Kernel hacking
diff --git a/srcpkgs/linux5.1/files/i386-dotconfig b/srcpkgs/linux5.3/files/i386-dotconfig
similarity index 92%
rename from srcpkgs/linux5.1/files/i386-dotconfig
rename to srcpkgs/linux5.3/files/i386-dotconfig
index 103d3305a3e..7f3df1b4d27 100644
--- a/srcpkgs/linux5.1/files/i386-dotconfig
+++ b/srcpkgs/linux5.3/files/i386-dotconfig
@@ -1,13 +1,13 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 5.1.18 Kernel Configuration
+# Linux/i386 5.3.0 Kernel Configuration
 #
 
 #
-# Compiler: gcc (GCC) 8.3.0
+# Compiler: i686-pc-linux-gnu-gcc (GCC) 9.2.0
 #
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=80300
+CONFIG_GCC_VERSION=90200
 CONFIG_CLANG_VERSION=0
 CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y
@@ -20,6 +20,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
 #
 CONFIG_INIT_ENV_ARG_LIMIT=32
 # CONFIG_COMPILE_TEST is not set
+# CONFIG_HEADER_TEST is not set
 CONFIG_LOCALVERSION="_1"
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_BUILD_SALT=""
@@ -66,6 +67,8 @@ CONFIG_GENERIC_IRQ_RESERVATION_MODE=y
 CONFIG_IRQ_FORCED_THREADING=y
 CONFIG_SPARSE_IRQ=y
 # CONFIG_GENERIC_IRQ_DEBUGFS is not set
+# end of IRQ subsystem
+
 CONFIG_CLOCKSOURCE_WATCHDOG=y
 CONFIG_ARCH_CLOCKSOURCE_DATA=y
 CONFIG_ARCH_CLOCKSOURCE_INIT=y
@@ -85,10 +88,13 @@ CONFIG_NO_HZ_COMMON=y
 CONFIG_NO_HZ_IDLE=y
 # CONFIG_NO_HZ is not set
 CONFIG_HIGH_RES_TIMERS=y
+# end of Timers subsystem
+
 # CONFIG_PREEMPT_NONE is not set
 # CONFIG_PREEMPT_VOLUNTARY is not set
 CONFIG_PREEMPT=y
 CONFIG_PREEMPT_COUNT=y
+CONFIG_PREEMPTION=y
 
 #
 # CPU/Task time and stats accounting
@@ -102,7 +108,10 @@ CONFIG_TASKSTATS=y
 CONFIG_TASK_DELAY_ACCT=y
 CONFIG_TASK_XACCT=y
 CONFIG_TASK_IO_ACCOUNTING=y
-# CONFIG_PSI is not set
+CONFIG_PSI=y
+CONFIG_PSI_DEFAULT_DISABLED=y
+# end of CPU/Task time and stats accounting
+
 CONFIG_CPU_ISOLATION=y
 
 #
@@ -115,13 +124,22 @@ CONFIG_TREE_SRCU=y
 CONFIG_TASKS_RCU=y
 CONFIG_RCU_STALL_COMMON=y
 CONFIG_RCU_NEED_SEGCBLIST=y
-CONFIG_BUILD_BIN2C=y
+# end of RCU Subsystem
+
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
+CONFIG_IKHEADERS=m
 CONFIG_LOG_BUF_SHIFT=19
 CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
 CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
+
+#
+# Scheduler features
+#
+# CONFIG_UCLAMP_TASK is not set
+# end of Scheduler features
+
 CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
 CONFIG_CGROUPS=y
 CONFIG_PAGE_COUNTER=y
@@ -130,7 +148,6 @@ CONFIG_MEMCG_SWAP=y
 CONFIG_MEMCG_SWAP_ENABLED=y
 CONFIG_MEMCG_KMEM=y
 CONFIG_BLK_CGROUP=y
-# CONFIG_DEBUG_BLK_CGROUP is not set
 CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
@@ -169,7 +186,6 @@ CONFIG_RD_LZ4=y
 CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
-CONFIG_ANON_INODES=y
 CONFIG_HAVE_UID16=y
 CONFIG_SYSCTL_EXCEPTION_TRACE=y
 CONFIG_HAVE_PCSPKR_PLATFORM=y
@@ -216,6 +232,8 @@ CONFIG_HAVE_PERF_EVENTS=y
 #
 CONFIG_PERF_EVENTS=y
 # CONFIG_DEBUG_PERF_USE_VMALLOC is not set
+# end of Kernel Performance Events And Counters
+
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_SLUB_DEBUG=y
 # CONFIG_SLUB_MEMCG_SYSFS_ON is not set
@@ -226,9 +244,12 @@ CONFIG_SLUB=y
 CONFIG_SLAB_MERGE_DEFAULT=y
 CONFIG_SLAB_FREELIST_RANDOM=y
 CONFIG_SLAB_FREELIST_HARDENED=y
+CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
 CONFIG_SLUB_CPU_PARTIAL=y
 CONFIG_SYSTEM_DATA_VERIFICATION=y
 CONFIG_PROFILING=y
+# end of General setup
+
 CONFIG_X86_32=y
 CONFIG_X86=y
 CONFIG_INSTRUCTION_DECODER=y
@@ -243,9 +264,7 @@ CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8
 CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_GENERIC_BUG=y
-CONFIG_GENERIC_HWEIGHT=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_ARCH_HAS_CPU_RELAX=y
 CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
@@ -255,9 +274,7 @@ CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
 CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
 CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
-CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 CONFIG_HAVE_INTEL_TXT=y
 CONFIG_X86_32_SMP=y
@@ -288,6 +305,7 @@ CONFIG_HYPERVISOR_GUEST=y
 CONFIG_PARAVIRT=y
 # CONFIG_PARAVIRT_DEBUG is not set
 # CONFIG_PARAVIRT_SPINLOCKS is not set
+CONFIG_X86_HV_CALLBACK_VECTOR=y
 # CONFIG_XEN is not set
 CONFIG_KVM_GUEST=y
 # CONFIG_PVH is not set
@@ -335,6 +353,7 @@ CONFIG_CPU_SUP_HYGON=y
 CONFIG_CPU_SUP_CENTAUR=y
 CONFIG_CPU_SUP_TRANSMETA_32=y
 CONFIG_CPU_SUP_UMC_32=y
+CONFIG_CPU_SUP_ZHAOXIN=y
 CONFIG_HPET_TIMER=y
 CONFIG_HPET_EMULATE_RTC=y
 CONFIG_DMI=y
@@ -364,6 +383,8 @@ CONFIG_PERF_EVENTS_INTEL_UNCORE=y
 CONFIG_PERF_EVENTS_INTEL_RAPL=m
 CONFIG_PERF_EVENTS_INTEL_CSTATE=m
 CONFIG_PERF_EVENTS_AMD_POWER=m
+# end of Performance monitoring
+
 # CONFIG_X86_LEGACY_VM86 is not set
 CONFIG_X86_16BIT=y
 CONFIG_X86_ESPFIX32=y
@@ -429,6 +450,8 @@ CONFIG_HOTPLUG_CPU=y
 # CONFIG_COMPAT_VDSO is not set
 # CONFIG_CMDLINE_BOOL is not set
 CONFIG_MODIFY_LDT_SYSCALL=y
+# end of Processor type and features
+
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
 CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
@@ -553,6 +576,7 @@ CONFIG_X86_P4_CLOCKMOD=m
 # shared options
 #
 CONFIG_X86_SPEEDSTEP_LIB=m
+# end of CPU Frequency scaling
 
 #
 # CPU Idle
@@ -561,7 +585,10 @@ CONFIG_CPU_IDLE=y
 CONFIG_CPU_IDLE_GOV_LADDER=y
 CONFIG_CPU_IDLE_GOV_MENU=y
 CONFIG_CPU_IDLE_GOV_TEO=y
+# end of CPU Idle
+
 CONFIG_INTEL_IDLE=y
+# end of Power management and ACPI options
 
 #
 # Bus options (PCI etc.)
@@ -583,13 +610,15 @@ CONFIG_ISA_DMA_API=y
 # CONFIG_GEOS is not set
 CONFIG_AMD_NB=y
 # CONFIG_X86_SYSFB is not set
+# end of Bus options (PCI etc.)
 
 #
 # Binary Emulations
 #
 CONFIG_COMPAT_32=y
+# end of Binary Emulations
+
 CONFIG_HAVE_ATOMIC_IOMAP=y
-CONFIG_HAVE_GENERIC_GUP=y
 
 #
 # Firmware Drivers
@@ -622,6 +651,8 @@ CONFIG_EFI_CAPSULE_QUIRK_QUARK_CSH=y
 CONFIG_EFI_TEST=m
 CONFIG_APPLE_PROPERTIES=y
 CONFIG_RESET_ATTACK_MITIGATION=y
+# end of EFI (Extensible Firmware Interface) Support
+
 CONFIG_UEFI_CPER=y
 CONFIG_UEFI_CPER_X86=y
 CONFIG_EFI_DEV_PATH_PARSER=y
@@ -630,6 +661,9 @@ CONFIG_EFI_EARLYCON=y
 #
 # Tegra firmware driver
 #
+# end of Tegra firmware driver
+# end of Firmware Drivers
+
 CONFIG_HAVE_KVM=y
 CONFIG_HAVE_KVM_IRQCHIP=y
 CONFIG_HAVE_KVM_IRQFD=y
@@ -642,6 +676,7 @@ CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
 CONFIG_KVM_VFIO=y
 CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
 CONFIG_HAVE_KVM_IRQ_BYPASS=y
+CONFIG_HAVE_KVM_NO_POLL=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_KVM=m
 CONFIG_KVM_INTEL=m
@@ -681,6 +716,7 @@ CONFIG_HAVE_DMA_CONTIGUOUS=y
 CONFIG_GENERIC_SMP_IDLE_THREAD=y
 CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
 CONFIG_ARCH_HAS_SET_MEMORY=y
+CONFIG_ARCH_HAS_SET_DIRECT_MAP=y
 CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y
 CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y
 CONFIG_ARCH_32BIT_OFF_T=y
@@ -698,7 +734,6 @@ CONFIG_HAVE_PERF_USER_STACK_DUMP=y
 CONFIG_HAVE_ARCH_JUMP_LABEL=y
 CONFIG_HAVE_ARCH_JUMP_LABEL_RELATIVE=y
 CONFIG_HAVE_RCU_TABLE_FREE=y
-CONFIG_HAVE_RCU_TABLE_INVALIDATE=y
 CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
 CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
 CONFIG_HAVE_CMPXCHG_LOCAL=y
@@ -716,6 +751,7 @@ CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
 CONFIG_HAVE_MOVE_PMD=y
 CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
 CONFIG_HAVE_ARCH_HUGE_VMAP=y
+CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
 CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
 CONFIG_MODULES_USE_ELF_REL=y
 CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
@@ -736,15 +772,28 @@ CONFIG_ARCH_HAS_REFCOUNT=y
 CONFIG_REFCOUNT_FULL=y
 CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y
 CONFIG_ARCH_USE_MEMREMAP_PROT=y
+# CONFIG_LOCK_EVENT_COUNTS is not set
 
 #
 # GCOV-based kernel profiling
 #
 # CONFIG_GCOV_KERNEL is not set
 CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
+# end of GCOV-based kernel profiling
+
 CONFIG_PLUGIN_HOSTCC="g++"
 CONFIG_HAVE_GCC_PLUGINS=y
-# CONFIG_GCC_PLUGINS is not set
+CONFIG_GCC_PLUGINS=y
+
+#
+# GCC plugins
+#
+# CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set
+# CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
+# CONFIG_GCC_PLUGIN_RANDSTRUCT is not set
+# end of GCC plugins
+# end of General architecture-dependent options
+
 CONFIG_RT_MUTEXES=y
 CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
@@ -758,7 +807,6 @@ CONFIG_MODVERSIONS=y
 # CONFIG_TRIM_UNUSED_KSYMS is not set
 CONFIG_MODULES_TREE_LOOKUP=y
 CONFIG_BLOCK=y
-CONFIG_LBDAF=y
 CONFIG_BLK_SCSI_REQUEST=y
 CONFIG_BLK_DEV_BSG=y
 CONFIG_BLK_DEV_BSGLIB=y
@@ -798,6 +846,8 @@ CONFIG_LDM_PARTITION=y
 CONFIG_EFI_PARTITION=y
 # CONFIG_SYSV68_PARTITION is not set
 CONFIG_CMDLINE_PARTITION=y
+# end of Partition Types
+
 CONFIG_BLK_MQ_PCI=y
 CONFIG_BLK_MQ_VIRTIO=y
 CONFIG_BLK_MQ_RDMA=y
@@ -810,6 +860,9 @@ CONFIG_MQ_IOSCHED_DEADLINE=y
 CONFIG_MQ_IOSCHED_KYBER=y
 CONFIG_IOSCHED_BFQ=y
 CONFIG_BFQ_GROUP_IOSCHED=y
+# CONFIG_BFQ_CGROUP_DEBUG is not set
+# end of IO Schedulers
+
 CONFIG_PREEMPT_NOTIFIERS=y
 CONFIG_PADATA=y
 CONFIG_ASN1=y
@@ -834,6 +887,7 @@ CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 CONFIG_BINFMT_SCRIPT=y
 CONFIG_BINFMT_MISC=m
 CONFIG_COREDUMP=y
+# end of Executable file formats
 
 #
 # Memory Management options
@@ -845,7 +899,7 @@ CONFIG_SPARSEMEM=y
 CONFIG_HAVE_MEMORY_PRESENT=y
 CONFIG_SPARSEMEM_STATIC=y
 CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
-CONFIG_ARCH_DISCARD_MEMBLOCK=y
+CONFIG_HAVE_FAST_GUP=y
 CONFIG_MEMORY_ISOLATION=y
 CONFIG_MEMORY_HOTPLUG=y
 CONFIG_MEMORY_HOTPLUG_SPARSE=y
@@ -856,6 +910,7 @@ CONFIG_MEMORY_BALLOON=y
 CONFIG_BALLOON_COMPACTION=y
 CONFIG_COMPACTION=y
 CONFIG_MIGRATION=y
+CONFIG_CONTIG_ALLOC=y
 CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_BOUNCE=y
 CONFIG_VIRT_TO_BUS=y
@@ -881,7 +936,10 @@ CONFIG_IDLE_PAGE_TRACKING=y
 CONFIG_FRAME_VECTOR=y
 # CONFIG_PERCPU_STATS is not set
 # CONFIG_GUP_BENCHMARK is not set
+CONFIG_GUP_GET_PTE_LOW_HIGH=y
 CONFIG_ARCH_HAS_PTE_SPECIAL=y
+# end of Memory Management options
+
 CONFIG_NET=y
 CONFIG_NET_INGRESS=y
 CONFIG_NET_EGRESS=y
@@ -940,9 +998,6 @@ CONFIG_INET_ESP_OFFLOAD=m
 CONFIG_INET_IPCOMP=m
 CONFIG_INET_XFRM_TUNNEL=m
 CONFIG_INET_TUNNEL=m
-CONFIG_INET_XFRM_MODE_TRANSPORT=m
-CONFIG_INET_XFRM_MODE_TUNNEL=m
-CONFIG_INET_XFRM_MODE_BEET=m
 CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 CONFIG_INET_UDP_DIAG=y
@@ -980,10 +1035,6 @@ CONFIG_IPV6_MIP6=m
 CONFIG_IPV6_ILA=m
 CONFIG_INET6_XFRM_TUNNEL=m
 CONFIG_INET6_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-CONFIG_INET6_XFRM_MODE_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_BEET=m
-CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
 CONFIG_IPV6_VTI=m
 CONFIG_IPV6_SIT=m
 CONFIG_IPV6_SIT_6RD=y
@@ -1048,7 +1099,6 @@ CONFIG_NF_CT_NETLINK_TIMEOUT=m
 CONFIG_NF_CT_NETLINK_HELPER=m
 CONFIG_NETFILTER_NETLINK_GLUE_CT=y
 CONFIG_NF_NAT=m
-CONFIG_NF_NAT_NEEDED=y
 CONFIG_NF_NAT_AMANDA=m
 CONFIG_NF_NAT_FTP=m
 CONFIG_NF_NAT_IRC=m
@@ -1085,6 +1135,7 @@ CONFIG_NFT_XFRM=m
 CONFIG_NFT_SOCKET=m
 CONFIG_NFT_OSF=m
 CONFIG_NFT_TPROXY=m
+# CONFIG_NFT_SYNPROXY is not set
 CONFIG_NF_DUP_NETDEV=m
 CONFIG_NFT_DUP_NETDEV=m
 CONFIG_NFT_FWD_NETDEV=m
@@ -1123,6 +1174,7 @@ CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
 CONFIG_NETFILTER_XT_TARGET_RATEEST=m
 CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
+CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m
 CONFIG_NETFILTER_XT_TARGET_TEE=m
 CONFIG_NETFILTER_XT_TARGET_TPROXY=m
 CONFIG_NETFILTER_XT_TARGET_TRACE=m
@@ -1179,6 +1231,8 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m
 CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
 CONFIG_NETFILTER_XT_MATCH_TIME=m
 CONFIG_NETFILTER_XT_MATCH_U32=m
+# end of Core Netfilter Configuration
+
 CONFIG_IP_SET=m
 CONFIG_IP_SET_MAX=256
 CONFIG_IP_SET_BITMAP_IP=m
@@ -1253,7 +1307,6 @@ CONFIG_NF_DEFRAG_IPV4=m
 CONFIG_NF_SOCKET_IPV4=m
 CONFIG_NF_TPROXY_IPV4=m
 CONFIG_NF_TABLES_IPV4=y
-CONFIG_NFT_CHAIN_ROUTE_IPV4=m
 CONFIG_NFT_REJECT_IPV4=m
 CONFIG_NFT_DUP_IPV4=m
 CONFIG_NFT_FIB_IPV4=m
@@ -1287,6 +1340,7 @@ CONFIG_IP_NF_RAW=m
 CONFIG_IP_NF_ARPTABLES=m
 CONFIG_IP_NF_ARPFILTER=m
 CONFIG_IP_NF_ARP_MANGLE=m
+# end of IP: Netfilter Configuration
 
 #
 # IPv6: Netfilter Configuration
@@ -1294,7 +1348,6 @@ CONFIG_IP_NF_ARP_MANGLE=m
 CONFIG_NF_SOCKET_IPV6=m
 CONFIG_NF_TPROXY_IPV6=m
 CONFIG_NF_TABLES_IPV6=y
-CONFIG_NFT_CHAIN_ROUTE_IPV6=m
 CONFIG_NFT_REJECT_IPV6=m
 CONFIG_NFT_DUP_IPV6=m
 CONFIG_NFT_FIB_IPV6=m
@@ -1323,8 +1376,11 @@ CONFIG_IP6_NF_RAW=m
 CONFIG_IP6_NF_NAT=m
 CONFIG_IP6_NF_TARGET_MASQUERADE=m
 CONFIG_IP6_NF_TARGET_NPT=m
+# end of IPv6: Netfilter Configuration
+
 CONFIG_NF_DEFRAG_IPV6=m
 # CONFIG_NF_TABLES_BRIDGE is not set
+# CONFIG_NF_CONNTRACK_BRIDGE is not set
 CONFIG_BRIDGE_NF_EBTABLES=m
 CONFIG_BRIDGE_EBT_BROUTE=m
 CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -1357,11 +1413,14 @@ CONFIG_INET_DCCP_DIAG=m
 CONFIG_IP_DCCP_CCID3=y
 # CONFIG_IP_DCCP_CCID3_DEBUG is not set
 CONFIG_IP_DCCP_TFRC_LIB=y
+# end of DCCP CCIDs Configuration
 
 #
 # DCCP Kernel Hacking
 #
 # CONFIG_IP_DCCP_DEBUG is not set
+# end of DCCP Kernel Hacking
+
 CONFIG_IP_SCTP=m
 # CONFIG_SCTP_DBG_OBJCNT is not set
 # CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5 is not set
@@ -1398,16 +1457,21 @@ CONFIG_BRIDGE_IGMP_SNOOPING=y
 CONFIG_BRIDGE_VLAN_FILTERING=y
 CONFIG_HAVE_NET_DSA=y
 CONFIG_NET_DSA=m
-CONFIG_NET_DSA_LEGACY=y
-CONFIG_NET_DSA_TAG_BRCM=y
-CONFIG_NET_DSA_TAG_BRCM_PREPEND=y
-CONFIG_NET_DSA_TAG_DSA=y
-CONFIG_NET_DSA_TAG_EDSA=y
-CONFIG_NET_DSA_TAG_GSWIP=y
-CONFIG_NET_DSA_TAG_KSZ=y
-CONFIG_NET_DSA_TAG_KSZ9477=y
-CONFIG_NET_DSA_TAG_TRAILER=y
-CONFIG_NET_DSA_TAG_QCA=y
+CONFIG_NET_DSA_TAG_8021Q=m
+CONFIG_NET_DSA_TAG_BRCM_COMMON=m
+CONFIG_NET_DSA_TAG_BRCM=m
+CONFIG_NET_DSA_TAG_BRCM_PREPEND=m
+CONFIG_NET_DSA_TAG_GSWIP=m
+CONFIG_NET_DSA_TAG_DSA=m
+CONFIG_NET_DSA_TAG_EDSA=m
+CONFIG_NET_DSA_TAG_MTK=m
+CONFIG_NET_DSA_TAG_KSZ_COMMON=m
+CONFIG_NET_DSA_TAG_KSZ=m
+CONFIG_NET_DSA_TAG_KSZ9477=m
+CONFIG_NET_DSA_TAG_QCA=m
+CONFIG_NET_DSA_TAG_LAN9303=m
+CONFIG_NET_DSA_TAG_SJA1105=m
+CONFIG_NET_DSA_TAG_TRAILER=m
 CONFIG_VLAN_8021Q=m
 CONFIG_VLAN_8021Q_GVRP=y
 CONFIG_VLAN_8021Q_MVRP=y
@@ -1494,16 +1558,18 @@ CONFIG_NET_ACT_PEDIT=m
 CONFIG_NET_ACT_SIMP=m
 CONFIG_NET_ACT_SKBEDIT=m
 CONFIG_NET_ACT_CSUM=m
+# CONFIG_NET_ACT_MPLS is not set
 CONFIG_NET_ACT_VLAN=m
 CONFIG_NET_ACT_BPF=m
 CONFIG_NET_ACT_CONNMARK=m
+# CONFIG_NET_ACT_CTINFO is not set
 CONFIG_NET_ACT_SKBMOD=m
 CONFIG_NET_ACT_IFE=m
 CONFIG_NET_ACT_TUNNEL_KEY=m
+# CONFIG_NET_ACT_CT is not set
 CONFIG_NET_IFE_SKBMARK=m
 CONFIG_NET_IFE_SKBPRIO=m
 CONFIG_NET_IFE_SKBTCINDEX=m
-CONFIG_NET_CLS_IND=y
 CONFIG_NET_SCH_FIFO=y
 CONFIG_DCB=y
 CONFIG_DNS_RESOLVER=y
@@ -1515,6 +1581,7 @@ CONFIG_BATMAN_ADV_NC=y
 CONFIG_BATMAN_ADV_MCAST=y
 CONFIG_BATMAN_ADV_DEBUGFS=y
 # CONFIG_BATMAN_ADV_DEBUG is not set
+CONFIG_BATMAN_ADV_SYSFS=y
 CONFIG_OPENVSWITCH=m
 CONFIG_OPENVSWITCH_GRE=m
 CONFIG_OPENVSWITCH_VXLAN=m
@@ -1550,6 +1617,9 @@ CONFIG_NET_FLOW_LIMIT=y
 # Network testing
 #
 # CONFIG_NET_PKTGEN is not set
+# end of Network testing
+# end of Networking options
+
 # CONFIG_HAMRADIO is not set
 CONFIG_CAN=m
 CONFIG_CAN_RAW=m
@@ -1583,6 +1653,7 @@ CONFIG_CAN_SOFTING=m
 #
 # CONFIG_CAN_HI311X is not set
 CONFIG_CAN_MCP251X=m
+# end of CAN SPI interfaces
 
 #
 # CAN USB interfaces
@@ -1595,7 +1666,11 @@ CONFIG_CAN_KVASER_USB=m
 # CONFIG_CAN_MCBA_USB is not set
 CONFIG_CAN_PEAK_USB=m
 CONFIG_CAN_UCAN=m
+# end of CAN USB interfaces
+
 CONFIG_CAN_DEBUG_DEVICES=y
+# end of CAN Device Drivers
+
 CONFIG_BT=m
 CONFIG_BT_BREDR=y
 CONFIG_BT_RFCOMM=m
@@ -1620,6 +1695,7 @@ CONFIG_BT_QCA=m
 CONFIG_BT_HCIBTUSB=m
 CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
 CONFIG_BT_HCIBTUSB_BCM=y
+# CONFIG_BT_HCIBTUSB_MTK is not set
 CONFIG_BT_HCIBTUSB_RTL=y
 CONFIG_BT_HCIBTSDIO=m
 CONFIG_BT_HCIUART=m
@@ -1643,8 +1719,11 @@ CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
 CONFIG_BT_ATH3K=m
 CONFIG_BT_WILINK=m
+CONFIG_BT_MTKSDIO=m
 CONFIG_BT_MTKUART=m
 CONFIG_BT_HCIRSI=m
+# end of Bluetooth device drivers
+
 CONFIG_AF_RXRPC=m
 # CONFIG_AF_RXRPC_IPV6 is not set
 # CONFIG_AF_RXRPC_INJECT_LOSS is not set
@@ -1740,6 +1819,8 @@ CONFIG_NFC_NXP_NCI_I2C=m
 CONFIG_NFC_S3FWRN5=m
 CONFIG_NFC_S3FWRN5_I2C=m
 CONFIG_NFC_ST95HF=m
+# end of Near Field Communication (NFC) devices
+
 CONFIG_PSAMPLE=m
 CONFIG_NET_IFE=m
 CONFIG_LWTUNNEL=y
@@ -1805,6 +1886,7 @@ CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
 #
 # Cadence PCIe controllers support
 #
+# end of Cadence PCIe controllers support
 
 #
 # DesignWare PCI Core Support
@@ -1813,16 +1895,21 @@ CONFIG_PCIE_DW=y
 CONFIG_PCIE_DW_HOST=y
 # CONFIG_PCIE_DW_PLAT_HOST is not set
 CONFIG_PCI_MESON=y
+# end of DesignWare PCI Core Support
+# end of PCI controller drivers
 
 #
 # PCI Endpoint
 #
 # CONFIG_PCI_ENDPOINT is not set
+# end of PCI Endpoint
 
 #
 # PCI switch controller drivers
 #
 CONFIG_PCI_SW_SWITCHTEC=m
+# end of PCI switch controller drivers
+
 CONFIG_PCCARD=m
 # CONFIG_PCMCIA is not set
 CONFIG_CARDBUS=y
@@ -1854,6 +1941,7 @@ CONFIG_RAPIDIO_CPS_XX=m
 CONFIG_RAPIDIO_TSI568=m
 CONFIG_RAPIDIO_CPS_GEN2=m
 CONFIG_RAPIDIO_RXS_GEN3=m
+# end of RapidIO Switch drivers
 
 #
 # Generic Driver Options
@@ -1868,9 +1956,13 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 # Firmware loader
 #
 CONFIG_FW_LOADER=y
+CONFIG_FW_LOADER_PAGED_BUF=y
 CONFIG_EXTRA_FIRMWARE=""
 CONFIG_FW_LOADER_USER_HELPER=y
 # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
+# CONFIG_FW_LOADER_COMPRESS is not set
+# end of Firmware loader
+
 CONFIG_WANT_DEV_COREDUMP=y
 CONFIG_ALLOW_DEV_COREDUMP=y
 CONFIG_DEV_COREDUMP=y
@@ -1889,10 +1981,13 @@ CONFIG_REGMAP_MMIO=y
 CONFIG_REGMAP_IRQ=y
 CONFIG_DMA_SHARED_BUFFER=y
 # CONFIG_DMA_FENCE_TRACE is not set
+# end of Generic Driver Options
 
 #
 # Bus devices
 #
+# end of Bus devices
+
 CONFIG_CONNECTOR=y
 CONFIG_PROC_EVENTS=y
 CONFIG_GNSS=m
@@ -1912,6 +2007,7 @@ CONFIG_MTD_REDBOOT_PARTS=m
 CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
 # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
 # CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
+# end of Partition parsers
 
 #
 # User Modules And Translation Layers
@@ -1942,6 +2038,7 @@ CONFIG_MTD_CFI_I2=y
 # CONFIG_MTD_RAM is not set
 # CONFIG_MTD_ROM is not set
 # CONFIG_MTD_ABSENT is not set
+# end of RAM/ROM/Flash chip drivers
 
 #
 # Mapping drivers for chip access
@@ -1949,6 +2046,7 @@ CONFIG_MTD_CFI_I2=y
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
 # CONFIG_MTD_INTEL_VR_NOR is not set
 # CONFIG_MTD_PLATRAM is not set
+# end of Mapping drivers for chip access
 
 #
 # Self-contained MTD device drivers
@@ -1968,17 +2066,47 @@ CONFIG_MTD_PHRAM=m
 CONFIG_MTD_DOCG3=m
 CONFIG_BCH_CONST_M=14
 CONFIG_BCH_CONST_T=4
+# end of Self-contained MTD device drivers
+
 CONFIG_MTD_NAND_CORE=m
 # CONFIG_MTD_ONENAND is not set
-# CONFIG_MTD_NAND is not set
+CONFIG_MTD_NAND_ECC_SW_HAMMING=m
+# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
+CONFIG_MTD_RAW_NAND=m
+CONFIG_MTD_NAND_ECC_SW_BCH=y
+
+#
+# Raw/parallel NAND flash controllers
+#
+CONFIG_MTD_NAND_DENALI=m
+CONFIG_MTD_NAND_DENALI_PCI=m
+CONFIG_MTD_NAND_CAFE=m
+CONFIG_MTD_NAND_CS553X=m
+CONFIG_MTD_NAND_GPIO=m
+CONFIG_MTD_NAND_PLATFORM=m
+
+#
+# Misc
+#
+CONFIG_MTD_SM_COMMON=m
+CONFIG_MTD_NAND_NANDSIM=m
+CONFIG_MTD_NAND_RICOH=m
+CONFIG_MTD_NAND_DISKONCHIP=m
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED=y
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0x0
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_HIGH=y
+CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE=y
 CONFIG_MTD_SPI_NAND=m
 
 #
 # LPDDR & LPDDR2 PCM memory drivers
 #
 # CONFIG_MTD_LPDDR is not set
+# end of LPDDR & LPDDR2 PCM memory drivers
+
 # CONFIG_MTD_SPI_NOR is not set
 # CONFIG_MTD_UBI is not set
+# CONFIG_MTD_HYPERBUS is not set
 # CONFIG_OF is not set
 CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
 CONFIG_PARPORT=m
@@ -2041,6 +2169,7 @@ CONFIG_NVME_TARGET_RDMA=m
 CONFIG_NVME_TARGET_FC=m
 CONFIG_NVME_TARGET_FCLOOP=m
 CONFIG_NVME_TARGET_TCP=m
+# end of NVME Support
 
 #
 # Misc devices
@@ -2071,10 +2200,10 @@ CONFIG_HMC6352=m
 CONFIG_DS1682=m
 CONFIG_VMWARE_BALLOON=m
 CONFIG_PCH_PHUB=m
-CONFIG_USB_SWITCH_FSA9480=m
 CONFIG_LATTICE_ECP3_CONFIG=m
 CONFIG_SRAM=y
 # CONFIG_PCI_ENDPOINT_TEST is not set
+# CONFIG_XILINX_SDFEC is not set
 CONFIG_MISC_RTSX=m
 CONFIG_PVPANIC=m
 CONFIG_C2PORT=m
@@ -2091,6 +2220,8 @@ CONFIG_EEPROM_93CX6=m
 CONFIG_EEPROM_93XX46=m
 CONFIG_EEPROM_IDT_89HPESX=m
 CONFIG_EEPROM_EE1004=m
+# end of EEPROM support
+
 CONFIG_CB710_CORE=m
 # CONFIG_CB710_DEBUG is not set
 CONFIG_CB710_DEBUG_ASSUMPTIONS=y
@@ -2099,6 +2230,8 @@ CONFIG_CB710_DEBUG_ASSUMPTIONS=y
 # Texas Instruments shared transport line discipline
 #
 CONFIG_TI_ST=m
+# end of Texas Instruments shared transport line discipline
+
 CONFIG_SENSORS_LIS3_I2C=m
 CONFIG_ALTERA_STAPL=m
 CONFIG_INTEL_MEI=m
@@ -2145,11 +2278,15 @@ CONFIG_VOP_BUS=m
 #
 CONFIG_VOP=m
 CONFIG_VHOST_RING=m
+# end of Intel MIC & related support
+
 CONFIG_ECHO=m
 CONFIG_MISC_ALCOR_PCI=m
 CONFIG_MISC_RTSX_PCI=m
 CONFIG_MISC_RTSX_USB=m
 CONFIG_HABANA_AI=m
+# end of Misc devices
+
 CONFIG_HAVE_IDE=y
 # CONFIG_IDE is not set
 
@@ -2168,7 +2305,6 @@ CONFIG_SCSI_PROC_FS=y
 #
 CONFIG_BLK_DEV_SD=m
 CONFIG_CHR_DEV_ST=m
-CONFIG_CHR_DEV_OSST=m
 CONFIG_BLK_DEV_SR=m
 CONFIG_BLK_DEV_SR_VENDOR=y
 CONFIG_CHR_DEV_SG=m
@@ -2189,6 +2325,8 @@ CONFIG_SCSI_SAS_LIBSAS=m
 CONFIG_SCSI_SAS_ATA=y
 CONFIG_SCSI_SAS_HOST_SMP=y
 CONFIG_SCSI_SRP_ATTRS=m
+# end of SCSI Transports
+
 CONFIG_SCSI_LOWLEVEL=y
 CONFIG_ISCSI_TCP=m
 CONFIG_ISCSI_BOOT_SYSFS=m
@@ -2256,6 +2394,7 @@ CONFIG_FCOE_FNIC=m
 CONFIG_SCSI_SNIC=m
 # CONFIG_SCSI_SNIC_DEBUG_FS is not set
 CONFIG_SCSI_DMX3191D=m
+# CONFIG_SCSI_FDOMAIN_PCI is not set
 CONFIG_SCSI_GDTH=m
 CONFIG_SCSI_ISCI=m
 CONFIG_SCSI_IPS=m
@@ -2298,6 +2437,8 @@ CONFIG_SCSI_DH_RDAC=m
 CONFIG_SCSI_DH_HP_SW=m
 CONFIG_SCSI_DH_EMC=m
 CONFIG_SCSI_DH_ALUA=m
+# end of SCSI device support
+
 CONFIG_ATA=m
 CONFIG_ATA_VERBOSE_ERROR=y
 CONFIG_ATA_ACPI=y
@@ -2436,6 +2577,7 @@ CONFIG_DM_MULTIPATH=m
 CONFIG_DM_MULTIPATH_QL=m
 CONFIG_DM_MULTIPATH_ST=m
 CONFIG_DM_DELAY=m
+CONFIG_DM_DUST=m
 CONFIG_DM_UEVENT=y
 CONFIG_DM_FLAKEY=m
 CONFIG_DM_VERITY=m
@@ -2471,6 +2613,8 @@ CONFIG_FIREWIRE_OHCI=m
 CONFIG_FIREWIRE_SBP2=m
 CONFIG_FIREWIRE_NET=m
 CONFIG_FIREWIRE_NOSY=m
+# end of IEEE 1394 (FireWire) support
+
 CONFIG_MACINTOSH_DRIVERS=y
 CONFIG_MAC_EMUMOUSEBTN=m
 CONFIG_NETDEVICES=y
@@ -2574,10 +2718,14 @@ CONFIG_NET_DSA_MICROCHIP_KSZ9477_SPI=m
 CONFIG_NET_DSA_MV88E6XXX=m
 CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y
 # CONFIG_NET_DSA_MV88E6XXX_PTP is not set
+CONFIG_NET_DSA_SJA1105=m
+# CONFIG_NET_DSA_SJA1105_PTP is not set
 CONFIG_NET_DSA_QCA8K=m
 # CONFIG_NET_DSA_REALTEK_SMI is not set
 # CONFIG_NET_DSA_SMSC_LAN9303_I2C is not set
 # CONFIG_NET_DSA_SMSC_LAN9303_MDIO is not set
+# end of Distributed Switch Architecture drivers
+
 CONFIG_ETHERNET=y
 CONFIG_MDIO=m
 CONFIG_NET_VENDOR_3COM=y
@@ -2674,6 +2822,8 @@ CONFIG_BE2NET_BE3=y
 CONFIG_BE2NET_LANCER=y
 CONFIG_BE2NET_SKYHAWK=y
 CONFIG_NET_VENDOR_EZCHIP=y
+CONFIG_NET_VENDOR_GOOGLE=y
+# CONFIG_GVE is not set
 CONFIG_NET_VENDOR_HP=y
 CONFIG_HP100=m
 CONFIG_NET_VENDOR_HUAWEI=y
@@ -2829,6 +2979,7 @@ CONFIG_SMSC9420=m
 CONFIG_NET_VENDOR_SOCIONEXT=y
 CONFIG_NET_VENDOR_STMICRO=y
 CONFIG_STMMAC_ETH=m
+# CONFIG_STMMAC_SELFTESTS is not set
 CONFIG_STMMAC_PLATFORM=m
 CONFIG_DWMAC_GENERIC=m
 CONFIG_STMMAC_PCI=m
@@ -2843,7 +2994,6 @@ CONFIG_NET_VENDOR_TEHUTI=y
 CONFIG_TEHUTI=m
 CONFIG_NET_VENDOR_TI=y
 # CONFIG_TI_CPSW_PHY_SEL is not set
-CONFIG_TI_CPSW_ALE=m
 CONFIG_TLAN=m
 CONFIG_NET_VENDOR_VIA=y
 CONFIG_VIA_RHINE=m
@@ -2856,6 +3006,9 @@ CONFIG_WIZNET_W5300=m
 # CONFIG_WIZNET_BUS_INDIRECT is not set
 CONFIG_WIZNET_BUS_ANY=y
 CONFIG_WIZNET_W5100_SPI=m
+CONFIG_NET_VENDOR_XILINX=y
+# CONFIG_XILINX_AXI_EMAC is not set
+CONFIG_XILINX_LL_TEMAC=m
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
 CONFIG_NET_SB1000=m
@@ -2901,6 +3054,7 @@ CONFIG_MICROCHIP_PHY=m
 # CONFIG_MICROCHIP_T1_PHY is not set
 CONFIG_MICROSEMI_PHY=m
 CONFIG_NATIONAL_PHY=m
+# CONFIG_NXP_TJA11XX_PHY is not set
 CONFIG_QSEMI_PHY=m
 CONFIG_REALTEK_PHY=m
 CONFIG_RENESAS_PHY=m
@@ -3090,6 +3244,8 @@ CONFIG_IWL3945=m
 # iwl3945 / iwl4965 Debugging Options
 #
 # CONFIG_IWLEGACY_DEBUG is not set
+# end of iwl3945 / iwl4965 Debugging Options
+
 CONFIG_IWLWIFI=m
 CONFIG_IWLWIFI_LEDS=y
 CONFIG_IWLDVM=m
@@ -3102,6 +3258,8 @@ CONFIG_IWLWIFI_PCIE_RTPM=y
 # Debugging Options
 #
 # CONFIG_IWLWIFI_DEBUG is not set
+# end of Debugging Options
+
 CONFIG_WLAN_VENDOR_INTERSIL=y
 CONFIG_HOSTAP=m
 CONFIG_HOSTAP_FIRMWARE=y
@@ -3152,6 +3310,7 @@ CONFIG_MT76x2_COMMON=m
 # CONFIG_MT76x2E is not set
 CONFIG_MT76x2U=m
 CONFIG_MT7603E=m
+CONFIG_MT7615E=m
 CONFIG_WLAN_VENDOR_RALINK=y
 CONFIG_RT2X00=m
 CONFIG_RT2400PCI=m
@@ -3204,6 +3363,13 @@ CONFIG_RTL8723_COMMON=m
 CONFIG_RTLBTCOEXIST=m
 CONFIG_RTL8XXXU=m
 # CONFIG_RTL8XXXU_UNTESTED is not set
+CONFIG_RTW88=m
+CONFIG_RTW88_CORE=m
+CONFIG_RTW88_PCI=m
+CONFIG_RTW88_8822BE=y
+CONFIG_RTW88_8822CE=y
+# CONFIG_RTW88_DEBUG is not set
+# CONFIG_RTW88_DEBUGFS is not set
 CONFIG_WLAN_VENDOR_RSI=y
 CONFIG_RSI_91X=m
 CONFIG_RSI_DEBUGFS=y
@@ -3240,6 +3406,8 @@ CONFIG_VIRT_WIFI=m
 CONFIG_WIMAX_I2400M=m
 CONFIG_WIMAX_I2400M_USB=m
 CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
+# end of WiMAX Wireless Broadband devices
+
 # CONFIG_WAN is not set
 CONFIG_IEEE802154_DRIVERS=m
 CONFIG_IEEE802154_FAKELB=m
@@ -3290,7 +3458,9 @@ CONFIG_INPUT_KEYBOARD=y
 CONFIG_KEYBOARD_ADC=m
 CONFIG_KEYBOARD_ADP5588=m
 CONFIG_KEYBOARD_ADP5589=m
+# CONFIG_KEYBOARD_APPLESPI is not set
 CONFIG_KEYBOARD_ATKBD=y
+CONFIG_KEYBOARD_QT1050=m
 CONFIG_KEYBOARD_QT1070=m
 CONFIG_KEYBOARD_QT2160=m
 # CONFIG_KEYBOARD_DLINK_DIR685 is not set
@@ -3355,8 +3525,8 @@ CONFIG_JOYSTICK_INTERACT=m
 CONFIG_JOYSTICK_SIDEWINDER=m
 CONFIG_JOYSTICK_TMDC=m
 CONFIG_JOYSTICK_IFORCE=m
-CONFIG_JOYSTICK_IFORCE_USB=y
-CONFIG_JOYSTICK_IFORCE_232=y
+CONFIG_JOYSTICK_IFORCE_USB=m
+CONFIG_JOYSTICK_IFORCE_232=m
 CONFIG_JOYSTICK_WARRIOR=m
 CONFIG_JOYSTICK_MAGELLAN=m
 CONFIG_JOYSTICK_SPACEORB=m
@@ -3481,6 +3651,7 @@ CONFIG_TOUCHSCREEN_TPS6507X=m
 CONFIG_TOUCHSCREEN_ZET6223=m
 CONFIG_TOUCHSCREEN_ZFORCE=m
 CONFIG_TOUCHSCREEN_ROHM_BU21023=m
+CONFIG_TOUCHSCREEN_IQS5XX=m
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_AD714X=m
 CONFIG_INPUT_AD714X_I2C=m
@@ -3497,6 +3668,7 @@ CONFIG_INPUT_APANEL=m
 CONFIG_INPUT_GP2A=m
 # CONFIG_INPUT_GPIO_BEEPER is not set
 CONFIG_INPUT_GPIO_DECODER=m
+CONFIG_INPUT_GPIO_VIBRA=m
 # CONFIG_INPUT_WISTRON_BTNS is not set
 CONFIG_INPUT_ATLAS_BTNS=m
 CONFIG_INPUT_ATI_REMOTE2=m
@@ -3558,7 +3730,6 @@ CONFIG_SERIO_RAW=m
 CONFIG_SERIO_ALTERA_PS2=m
 CONFIG_SERIO_PS2MULT=m
 CONFIG_SERIO_ARC_PS2=m
-CONFIG_SERIO_OLPC_APSP=m
 CONFIG_HYPERV_KEYBOARD=m
 CONFIG_SERIO_GPIO_PS2=m
 CONFIG_USERIO=m
@@ -3567,6 +3738,8 @@ CONFIG_GAMEPORT_NS558=m
 CONFIG_GAMEPORT_L4=m
 CONFIG_GAMEPORT_EMU10K1=m
 CONFIG_GAMEPORT_FM801=m
+# end of Hardware I/O ports
+# end of Input device support
 
 #
 # Character devices
@@ -3595,6 +3768,7 @@ CONFIG_N_HDLC=m
 CONFIG_N_GSM=m
 CONFIG_TRACE_ROUTER=m
 CONFIG_TRACE_SINK=m
+CONFIG_NULL_TTY=m
 CONFIG_LDISC_AUTOLOAD=y
 CONFIG_DEVMEM=y
 # CONFIG_DEVKMEM is not set
@@ -3651,6 +3825,9 @@ CONFIG_SERIAL_RP2=m
 CONFIG_SERIAL_RP2_NR_UARTS=32
 CONFIG_SERIAL_FSL_LPUART=m
 # CONFIG_SERIAL_MEN_Z135 is not set
+# end of Serial drivers
+
+CONFIG_SERIAL_MCTRL_GPIO=y
 CONFIG_SERIAL_DEV_BUS=m
 CONFIG_TTY_PRINTK=m
 CONFIG_TTY_PRINTK_LEVEL=6
@@ -3668,6 +3845,7 @@ CONFIG_IPMI_SI=m
 CONFIG_IPMI_SSIF=m
 CONFIG_IPMI_WATCHDOG=m
 CONFIG_IPMI_POWEROFF=m
+# CONFIG_IPMB_DEVICE_INTERFACE is not set
 CONFIG_HW_RANDOM=m
 CONFIG_HW_RANDOM_TIMERIOMEM=m
 CONFIG_HW_RANDOM_INTEL=m
@@ -3707,6 +3885,8 @@ CONFIG_TELCLOCK=m
 CONFIG_DEVPORT=y
 CONFIG_XILLYBUS=m
 CONFIG_XILLYBUS_PCIE=m
+# end of Character devices
+
 # CONFIG_RANDOM_TRUST_CPU is not set
 
 #
@@ -3728,6 +3908,8 @@ CONFIG_I2C_MUX_PCA9541=m
 CONFIG_I2C_MUX_PCA954x=m
 CONFIG_I2C_MUX_REG=m
 CONFIG_I2C_MUX_MLXCPLD=m
+# end of Multiplexer I2C Chip support
+
 CONFIG_I2C_HELPER_AUTO=y
 CONFIG_I2C_SMBUS=m
 CONFIG_I2C_ALGOBIT=m
@@ -3746,6 +3928,7 @@ CONFIG_I2C_ALI15X3=m
 CONFIG_I2C_AMD756=m
 CONFIG_I2C_AMD756_S4882=m
 CONFIG_I2C_AMD8111=m
+CONFIG_I2C_AMD_MP2=m
 CONFIG_I2C_I801=m
 CONFIG_I2C_ISCH=m
 CONFIG_I2C_ISMT=m
@@ -3800,12 +3983,16 @@ CONFIG_I2C_VIPERBOARD=m
 #
 # CONFIG_I2C_CROS_EC_TUNNEL is not set
 # CONFIG_SCx200_ACB is not set
+# end of I2C Hardware Bus support
+
 # CONFIG_I2C_STUB is not set
 CONFIG_I2C_SLAVE=y
 CONFIG_I2C_SLAVE_EEPROM=m
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
+# end of I2C support
+
 CONFIG_I3C=m
 CONFIG_CDNS_I3C_MASTER=m
 CONFIG_DW_I3C_MASTER=m
@@ -3886,6 +4073,8 @@ CONFIG_PTP_1588_CLOCK=y
 #
 CONFIG_PTP_1588_CLOCK_PCH=m
 CONFIG_PTP_1588_CLOCK_KVM=y
+# end of PTP clock support
+
 CONFIG_PINCTRL=y
 CONFIG_PINMUX=y
 CONFIG_PINCONF=y
@@ -3929,9 +4118,10 @@ CONFIG_GPIO_ICH=m
 CONFIG_GPIO_LYNXPOINT=y
 CONFIG_GPIO_MB86S7X=m
 CONFIG_GPIO_MENZ127=m
-CONFIG_GPIO_MOCKUP=m
 CONFIG_GPIO_VX855=m
+# CONFIG_GPIO_XILINX is not set
 CONFIG_GPIO_AMD_FCH=m
+# end of Memory mapped GPIO drivers
 
 #
 # Port-mapped I/O GPIO drivers
@@ -3942,6 +4132,7 @@ CONFIG_GPIO_SCH=m
 CONFIG_GPIO_SCH311X=m
 # CONFIG_GPIO_WINBOND is not set
 # CONFIG_GPIO_WS16C48 is not set
+# end of Port-mapped I/O GPIO drivers
 
 #
 # I2C GPIO expanders
@@ -3952,6 +4143,7 @@ CONFIG_GPIO_MAX732X=m
 CONFIG_GPIO_PCA953X=m
 CONFIG_GPIO_PCF857X=m
 CONFIG_GPIO_TPIC2810=m
+# end of I2C GPIO expanders
 
 #
 # MFD GPIO expanders
@@ -3972,6 +4164,7 @@ CONFIG_GPIO_TPS65086=m
 CONFIG_GPIO_TQMX86=m
 CONFIG_GPIO_UCB1400=m
 # CONFIG_GPIO_WM831X is not set
+# end of MFD GPIO expanders
 
 #
 # PCI GPIO expanders
@@ -3982,6 +4175,7 @@ CONFIG_GPIO_PCH=m
 CONFIG_GPIO_PCI_IDIO_16=m
 # CONFIG_GPIO_PCIE_IDIO_24 is not set
 CONFIG_GPIO_RDC321X=m
+# end of PCI GPIO expanders
 
 #
 # SPI GPIO expanders
@@ -3991,11 +4185,15 @@ CONFIG_GPIO_MAX7301=m
 CONFIG_GPIO_MC33880=m
 CONFIG_GPIO_PISOSR=m
 # CONFIG_GPIO_XRA1403 is not set
+# end of SPI GPIO expanders
 
 #
 # USB GPIO expanders
 #
 CONFIG_GPIO_VIPERBOARD=m
+# end of USB GPIO expanders
+
+CONFIG_GPIO_MOCKUP=m
 CONFIG_W1=m
 CONFIG_W1_CON=y
 
@@ -4007,6 +4205,7 @@ CONFIG_W1_MASTER_DS2490=m
 CONFIG_W1_MASTER_DS2482=m
 CONFIG_W1_MASTER_DS1WM=m
 CONFIG_W1_MASTER_GPIO=m
+# end of 1-wire Bus Masters
 
 #
 # 1-wire Slaves
@@ -4028,6 +4227,8 @@ CONFIG_W1_SLAVE_DS2780=m
 CONFIG_W1_SLAVE_DS2781=m
 CONFIG_W1_SLAVE_DS28E04=m
 CONFIG_W1_SLAVE_DS28E17=m
+# end of 1-wire Slaves
+
 CONFIG_POWER_AVS=y
 # CONFIG_POWER_RESET is not set
 CONFIG_POWER_SUPPLY=y
@@ -4064,7 +4265,7 @@ CONFIG_CHARGER_MAX8903=m
 CONFIG_CHARGER_LP8727=m
 CONFIG_CHARGER_GPIO=m
 CONFIG_CHARGER_MANAGER=y
-# CONFIG_CHARGER_LTC3651 is not set
+CONFIG_CHARGER_LT3651=m
 CONFIG_CHARGER_BQ2415X=m
 CONFIG_CHARGER_BQ24190=m
 CONFIG_CHARGER_BQ24257=m
@@ -4181,13 +4382,15 @@ CONFIG_SENSORS_NCT6775=m
 CONFIG_SENSORS_NCT7802=m
 CONFIG_SENSORS_NCT7904=m
 CONFIG_SENSORS_NPCM7XX=m
-# CONFIG_SENSORS_OCC_P8_I2C is not set
 CONFIG_SENSORS_PCF8591=m
 CONFIG_PMBUS=m
 CONFIG_SENSORS_PMBUS=m
 CONFIG_SENSORS_ADM1275=m
 CONFIG_SENSORS_IBM_CFFPS=m
 # CONFIG_SENSORS_IR35221 is not set
+CONFIG_SENSORS_IR38064=m
+# CONFIG_SENSORS_IRPS5401 is not set
+CONFIG_SENSORS_ISL68137=m
 CONFIG_SENSORS_LM25066=m
 CONFIG_SENSORS_LTC2978=m
 # CONFIG_SENSORS_LTC2978_REGULATOR is not set
@@ -4197,6 +4400,7 @@ CONFIG_SENSORS_MAX20751=m
 CONFIG_SENSORS_MAX31785=m
 CONFIG_SENSORS_MAX34440=m
 CONFIG_SENSORS_MAX8688=m
+# CONFIG_SENSORS_PXE1610 is not set
 # CONFIG_SENSORS_TPS40422 is not set
 CONFIG_SENSORS_TPS53679=m
 CONFIG_SENSORS_UCD9000=m
@@ -4287,14 +4491,24 @@ CONFIG_INTEL_SOC_DTS_IOSF_CORE=m
 CONFIG_INT340X_THERMAL=m
 CONFIG_ACPI_THERMAL_REL=m
 CONFIG_INT3406_THERMAL=m
+# end of ACPI INT340X thermal drivers
+
 CONFIG_INTEL_PCH_THERMAL=m
+# end of Intel thermal drivers
+
 CONFIG_GENERIC_ADC_THERMAL=m
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_CORE=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
 CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
+CONFIG_WATCHDOG_OPEN_TIMEOUT=0
 CONFIG_WATCHDOG_SYSFS=y
 
+#
+# Watchdog Pretimeout Governors
+#
+# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
+
 #
 # Watchdog Device Drivers
 #
@@ -4331,8 +4545,8 @@ CONFIG_ITCO_VENDOR_SUPPORT=y
 CONFIG_IT8712F_WDT=m
 CONFIG_IT87_WDT=m
 CONFIG_HP_WATCHDOG=m
-CONFIG_KEMPLD_WDT=m
 CONFIG_HPWDT_NMI_DECODING=y
+CONFIG_KEMPLD_WDT=m
 CONFIG_SC1200_WDT=m
 CONFIG_PC87413_WDT=m
 CONFIG_NV_TCO=m
@@ -4364,11 +4578,6 @@ CONFIG_WDTPCI=m
 # USB-based Watchdog Cards
 #
 CONFIG_USBPCWATCHDOG=m
-
-#
-# Watchdog Pretimeout Governors
-#
-# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
 CONFIG_SSB_POSSIBLE=y
 CONFIG_SSB=m
 CONFIG_SSB_SPROM=y
@@ -4410,9 +4619,11 @@ CONFIG_MFD_CROS_EC=m
 CONFIG_MFD_MADERA=m
 CONFIG_MFD_MADERA_I2C=m
 CONFIG_MFD_MADERA_SPI=m
+# CONFIG_MFD_CS47L15 is not set
 CONFIG_MFD_CS47L35=y
 CONFIG_MFD_CS47L85=y
 CONFIG_MFD_CS47L90=y
+# CONFIG_MFD_CS47L92 is not set
 # CONFIG_PMIC_DA903X is not set
 CONFIG_PMIC_DA9052=y
 CONFIG_MFD_DA9052_SPI=y
@@ -4507,6 +4718,8 @@ CONFIG_MFD_WM831X_SPI=y
 # CONFIG_MFD_WM8350_I2C is not set
 # CONFIG_MFD_WM8994 is not set
 # CONFIG_RAVE_SP_CORE is not set
+# end of Multifunction device drivers
+
 CONFIG_REGULATOR=y
 # CONFIG_REGULATOR_DEBUG is not set
 CONFIG_REGULATOR_FIXED_VOLTAGE=m
@@ -4556,6 +4769,7 @@ CONFIG_REGULATOR_PWM=m
 CONFIG_REGULATOR_QCOM_SPMI=m
 CONFIG_REGULATOR_RT5033=m
 CONFIG_REGULATOR_SKY81452=m
+# CONFIG_REGULATOR_SLG51000 is not set
 CONFIG_REGULATOR_TPS51632=m
 CONFIG_REGULATOR_TPS6105X=m
 CONFIG_REGULATOR_TPS62360=m
@@ -4749,6 +4963,7 @@ CONFIG_DVB_USB_DIBUSB_MC=m
 CONFIG_DVB_USB_DIB0700=m
 CONFIG_DVB_USB_UMT_010=m
 CONFIG_DVB_USB_CXUSB=m
+# CONFIG_DVB_USB_CXUSB_ANALOG is not set
 CONFIG_DVB_USB_M920X=m
 CONFIG_DVB_USB_DIGITV=m
 CONFIG_DVB_USB_VP7045=m
@@ -4920,6 +5135,7 @@ CONFIG_RADIO_WL1273=m
 # Texas Instruments WL128x FM driver (ST based)
 #
 CONFIG_RADIO_WL128X=m
+# end of Texas Instruments WL128x FM driver (ST based)
 
 #
 # Supported FireWire (IEEE 1394) Adapters
@@ -4954,18 +5170,24 @@ CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
 CONFIG_MEDIA_ATTACH=y
 CONFIG_VIDEO_IR_I2C=m
 
+#
+# I2C Encoders, decoders, sensors and other helper chips
+#
+
 #
 # Audio decoders, processors and mixers
 #
 CONFIG_VIDEO_TVAUDIO=m
 CONFIG_VIDEO_TDA7432=m
 CONFIG_VIDEO_TDA9840=m
+# CONFIG_VIDEO_TDA1997X is not set
 CONFIG_VIDEO_TEA6415C=m
 CONFIG_VIDEO_TEA6420=m
 CONFIG_VIDEO_MSP3400=m
 CONFIG_VIDEO_CS3308=m
 CONFIG_VIDEO_CS5345=m
 CONFIG_VIDEO_CS53L32A=m
+# CONFIG_VIDEO_TLV320AIC23B is not set
 CONFIG_VIDEO_UDA1342=m
 CONFIG_VIDEO_WM8775=m
 CONFIG_VIDEO_WM8739=m
@@ -4980,17 +5202,26 @@ CONFIG_VIDEO_SAA6588=m
 #
 # Video decoders
 #
-CONFIG_VIDEO_BT819=m
-CONFIG_VIDEO_BT856=m
-CONFIG_VIDEO_BT866=m
-CONFIG_VIDEO_KS0127=m
-CONFIG_VIDEO_SAA7110=m
+# CONFIG_VIDEO_ADV7180 is not set
+# CONFIG_VIDEO_ADV7183 is not set
+# CONFIG_VIDEO_ADV7604 is not set
+# CONFIG_VIDEO_ADV7842 is not set
+# CONFIG_VIDEO_BT819 is not set
+# CONFIG_VIDEO_BT856 is not set
+# CONFIG_VIDEO_BT866 is not set
+# CONFIG_VIDEO_KS0127 is not set
+# CONFIG_VIDEO_ML86V7667 is not set
+# CONFIG_VIDEO_SAA7110 is not set
 CONFIG_VIDEO_SAA711X=m
+# CONFIG_VIDEO_TC358743 is not set
+# CONFIG_VIDEO_TVP514X is not set
 CONFIG_VIDEO_TVP5150=m
+# CONFIG_VIDEO_TVP7002 is not set
 CONFIG_VIDEO_TW2804=m
 CONFIG_VIDEO_TW9903=m
 CONFIG_VIDEO_TW9906=m
-CONFIG_VIDEO_VPX3220=m
+# CONFIG_VIDEO_TW9910 is not set
+# CONFIG_VIDEO_VPX3220 is not set
 
 #
 # Video and audio decoders
@@ -5002,21 +5233,77 @@ CONFIG_VIDEO_CX25840=m
 # Video encoders
 #
 CONFIG_VIDEO_SAA7127=m
-CONFIG_VIDEO_SAA7185=m
-CONFIG_VIDEO_ADV7170=m
-CONFIG_VIDEO_ADV7175=m
+# CONFIG_VIDEO_SAA7185 is not set
+# CONFIG_VIDEO_ADV7170 is not set
+# CONFIG_VIDEO_ADV7175 is not set
+# CONFIG_VIDEO_ADV7343 is not set
+# CONFIG_VIDEO_ADV7393 is not set
+# CONFIG_VIDEO_ADV7511 is not set
+# CONFIG_VIDEO_AD9389B is not set
+# CONFIG_VIDEO_AK881X is not set
+# CONFIG_VIDEO_THS8200 is not set
 
 #
 # Camera sensor devices
 #
+# CONFIG_VIDEO_IMX214 is not set
+# CONFIG_VIDEO_IMX258 is not set
+# CONFIG_VIDEO_IMX274 is not set
+# CONFIG_VIDEO_IMX319 is not set
+# CONFIG_VIDEO_IMX355 is not set
 CONFIG_VIDEO_OV2640=m
+# CONFIG_VIDEO_OV2659 is not set
+# CONFIG_VIDEO_OV2680 is not set
+# CONFIG_VIDEO_OV2685 is not set
+# CONFIG_VIDEO_OV5647 is not set
+# CONFIG_VIDEO_OV6650 is not set
+# CONFIG_VIDEO_OV5670 is not set
+# CONFIG_VIDEO_OV5695 is not set
+# CONFIG_VIDEO_OV7251 is not set
+# CONFIG_VIDEO_OV772X is not set
 CONFIG_VIDEO_OV7640=m
 CONFIG_VIDEO_OV7670=m
+# CONFIG_VIDEO_OV7740 is not set
+# CONFIG_VIDEO_OV8856 is not set
+# CONFIG_VIDEO_OV9640 is not set
+# CONFIG_VIDEO_OV9650 is not set
+# CONFIG_VIDEO_OV13858 is not set
+# CONFIG_VIDEO_VS6624 is not set
+# CONFIG_VIDEO_MT9M001 is not set
+# CONFIG_VIDEO_MT9M032 is not set
+# CONFIG_VIDEO_MT9M111 is not set
+# CONFIG_VIDEO_MT9P031 is not set
+# CONFIG_VIDEO_MT9T001 is not set
+# CONFIG_VIDEO_MT9T112 is not set
 CONFIG_VIDEO_MT9V011=m
+# CONFIG_VIDEO_MT9V032 is not set
+# CONFIG_VIDEO_MT9V111 is not set
+# CONFIG_VIDEO_SR030PC30 is not set
+# CONFIG_VIDEO_NOON010PC30 is not set
+# CONFIG_VIDEO_M5MOLS is not set
+# CONFIG_VIDEO_RJ54N1 is not set
+# CONFIG_VIDEO_S5K6AA is not set
+# CONFIG_VIDEO_S5K6A3 is not set
+# CONFIG_VIDEO_S5K4ECGX is not set
+# CONFIG_VIDEO_S5K5BAF is not set
+# CONFIG_VIDEO_SMIAPP is not set
+# CONFIG_VIDEO_ET8EK8 is not set
+# CONFIG_VIDEO_S5C73M3 is not set
+
+#
+# Lens drivers
+#
+# CONFIG_VIDEO_AD5820 is not set
+# CONFIG_VIDEO_AK7375 is not set
+# CONFIG_VIDEO_DW9714 is not set
+# CONFIG_VIDEO_DW9807_VCM is not set
 
 #
 # Flash devices
 #
+# CONFIG_VIDEO_ADP1653 is not set
+# CONFIG_VIDEO_LM3560 is not set
+# CONFIG_VIDEO_LM3646 is not set
 
 #
 # Video improvement chips
@@ -5036,13 +5323,29 @@ CONFIG_VIDEO_SAA6752HS=m
 #
 # Miscellaneous helper chips
 #
+# CONFIG_VIDEO_THS7303 is not set
 CONFIG_VIDEO_M52790=m
+# CONFIG_VIDEO_I2C is not set
+# CONFIG_VIDEO_ST_MIPID02 is not set
+# end of I2C Encoders, decoders, sensors and other helper chips
+
+#
+# SPI helper chips
+#
+# CONFIG_VIDEO_GS1662 is not set
+# end of SPI helper chips
 
 #
 # Media SPI Adapters
 #
 # CONFIG_CXD2880_SPI_DRV is not set
+# end of Media SPI Adapters
+
 CONFIG_MEDIA_TUNER=m
+
+#
+# Customize TV tuners
+#
 CONFIG_MEDIA_TUNER_SIMPLE=m
 CONFIG_MEDIA_TUNER_TDA18250=m
 CONFIG_MEDIA_TUNER_TDA8290=m
@@ -5051,6 +5354,7 @@ CONFIG_MEDIA_TUNER_TDA18271=m
 CONFIG_MEDIA_TUNER_TDA9887=m
 CONFIG_MEDIA_TUNER_TEA5761=m
 CONFIG_MEDIA_TUNER_TEA5767=m
+# CONFIG_MEDIA_TUNER_MSI001 is not set
 CONFIG_MEDIA_TUNER_MT20XX=m
 CONFIG_MEDIA_TUNER_MT2060=m
 CONFIG_MEDIA_TUNER_MT2063=m
@@ -5079,6 +5383,11 @@ CONFIG_MEDIA_TUNER_R820T=m
 CONFIG_MEDIA_TUNER_MXL301RF=m
 CONFIG_MEDIA_TUNER_QM1D1C0042=m
 CONFIG_MEDIA_TUNER_QM1D1B0004=m
+# end of Customize TV tuners
+
+#
+# Customise DVB Frontends
+#
 
 #
 # Multistandard (satellite) frontends
@@ -5139,6 +5448,7 @@ CONFIG_DVB_SP8870=m
 CONFIG_DVB_SP887X=m
 CONFIG_DVB_CX22700=m
 CONFIG_DVB_CX22702=m
+# CONFIG_DVB_S5H1432 is not set
 CONFIG_DVB_DRXD=m
 CONFIG_DVB_L64781=m
 CONFIG_DVB_TDA1004X=m
@@ -5149,6 +5459,7 @@ CONFIG_DVB_DIB3000MB=m
 CONFIG_DVB_DIB3000MC=m
 CONFIG_DVB_DIB7000M=m
 CONFIG_DVB_DIB7000P=m
+# CONFIG_DVB_DIB9000 is not set
 CONFIG_DVB_TDA10048=m
 CONFIG_DVB_AF9013=m
 CONFIG_DVB_EC100=m
@@ -5161,6 +5472,7 @@ CONFIG_DVB_SI2168=m
 CONFIG_DVB_AS102_FE=m
 CONFIG_DVB_ZD1301_DEMOD=m
 CONFIG_DVB_GP8PSK_FE=m
+# CONFIG_DVB_CXD2880 is not set
 
 #
 # DVB-C (cable) frontends
@@ -5198,6 +5510,7 @@ CONFIG_DVB_MB86A20S=m
 # ISDB-S (satellite) & ISDB-T (terrestrial) frontends
 #
 CONFIG_DVB_TC90522=m
+# CONFIG_DVB_MN88443X is not set
 
 #
 # Digital terrestrial only tuners/PLL
@@ -5211,12 +5524,14 @@ CONFIG_DVB_TUNER_DIB0090=m
 #
 CONFIG_DVB_DRX39XYJ=m
 CONFIG_DVB_LNBH25=m
+# CONFIG_DVB_LNBH29 is not set
 CONFIG_DVB_LNBP21=m
 CONFIG_DVB_LNBP22=m
 CONFIG_DVB_ISL6405=m
 CONFIG_DVB_ISL6421=m
 CONFIG_DVB_ISL6423=m
 CONFIG_DVB_A8293=m
+# CONFIG_DVB_LGS8GL5 is not set
 CONFIG_DVB_LGS8GXX=m
 CONFIG_DVB_ATBM8830=m
 CONFIG_DVB_TDA665x=m
@@ -5237,6 +5552,7 @@ CONFIG_DVB_SP2=m
 # Tools to develop new frontends
 #
 CONFIG_DVB_DUMMY_FE=m
+# end of Customise DVB Frontends
 
 #
 # Graphics support
@@ -5268,8 +5584,10 @@ CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 CONFIG_DRM_DP_CEC=y
 CONFIG_DRM_TTM=m
+CONFIG_DRM_VRAM_HELPER=m
 CONFIG_DRM_GEM_CMA_HELPER=y
 CONFIG_DRM_KMS_CMA_HELPER=y
+CONFIG_DRM_GEM_SHMEM_HELPER=y
 CONFIG_DRM_VM=y
 CONFIG_DRM_SCHED=m
 
@@ -5280,37 +5598,36 @@ CONFIG_DRM_I2C_CH7006=m
 CONFIG_DRM_I2C_SIL164=m
 CONFIG_DRM_I2C_NXP_TDA998X=m
 # CONFIG_DRM_I2C_NXP_TDA9950 is not set
+# end of I2C encoder or helper chips
 
 #
 # ARM devices
 #
+# end of ARM devices
+
 CONFIG_DRM_RADEON=m
 CONFIG_DRM_RADEON_USERPTR=y
 CONFIG_DRM_AMDGPU=m
 CONFIG_DRM_AMDGPU_SI=y
 CONFIG_DRM_AMDGPU_CIK=y
-CONFIG_DRM_AMDGPU_USERPTR=y
 # CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set
 
 #
 # ACP (Audio CoProcessor) Configuration
 #
 CONFIG_DRM_AMD_ACP=y
+# end of ACP (Audio CoProcessor) Configuration
 
 #
 # Display Engine Configuration
 #
 CONFIG_DRM_AMD_DC=y
 CONFIG_DRM_AMD_DC_DCN1_0=y
-CONFIG_DRM_AMD_DC_DCN1_01=y
+CONFIG_DRM_AMD_DC_DCN2_0=y
+CONFIG_DRM_AMD_DC_DSC_SUPPORT=y
 # CONFIG_DEBUG_KERNEL_DC is not set
+# end of Display Engine Configuration
 
-#
-# AMD Library routines
-#
-CONFIG_CHASH=m
-# CONFIG_CHASH_STATS is not set
-# CONFIG_CHASH_SELFTEST is not set
 CONFIG_DRM_NOUVEAU=m
 CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT=y
 CONFIG_NOUVEAU_DEBUG=5
@@ -5319,6 +5636,7 @@ CONFIG_NOUVEAU_DEBUG_DEFAULT=3
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 CONFIG_DRM_I915=m
 # CONFIG_DRM_I915_ALPHA_SUPPORT is not set
+CONFIG_DRM_I915_FORCE_PROBE=""
 CONFIG_DRM_I915_CAPTURE_ERROR=y
 CONFIG_DRM_I915_COMPRESS_ERROR=y
 CONFIG_DRM_I915_USERPTR=y
@@ -5328,6 +5646,7 @@ CONFIG_DRM_I915_USERPTR=y
 #
 # CONFIG_DRM_I915_WERROR is not set
 # CONFIG_DRM_I915_DEBUG is not set
+# CONFIG_DRM_I915_DEBUG_MMIO is not set
 # CONFIG_DRM_I915_SW_FENCE_DEBUG_OBJECTS is not set
 # CONFIG_DRM_I915_SW_FENCE_CHECK_DAG is not set
 # CONFIG_DRM_I915_DEBUG_GUC is not set
@@ -5335,8 +5654,18 @@ CONFIG_DRM_I915_USERPTR=y
 # CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS is not set
 # CONFIG_DRM_I915_DEBUG_VBLANK_EVADE is not set
 # CONFIG_DRM_I915_DEBUG_RUNTIME_PM is not set
+# end of drm/i915 Debugging
+
+#
+# drm/i915 Profile Guided Optimisation
+#
+CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND=250
+CONFIG_DRM_I915_SPIN_REQUEST=5
+# end of drm/i915 Profile Guided Optimisation
+
 CONFIG_DRM_VGEM=m
 CONFIG_DRM_VKMS=m
+CONFIG_DRM_ATI_PCIGART=y
 CONFIG_DRM_VMWGFX=m
 CONFIG_DRM_VMWGFX_FBCON=y
 CONFIG_DRM_GMA500=m
@@ -5355,6 +5684,8 @@ CONFIG_DRM_PANEL=y
 # Display Panels
 #
 CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m
+# end of Display Panels
+
 CONFIG_DRM_BRIDGE=y
 CONFIG_DRM_PANEL_BRIDGE=y
 
@@ -5362,6 +5693,8 @@ CONFIG_DRM_PANEL_BRIDGE=y
 # Display Interface Bridges
 #
 CONFIG_DRM_ANALOGIX_ANX78XX=m
+# end of Display Interface Bridges
+
 # CONFIG_DRM_ETNAVIV is not set
 CONFIG_DRM_HISI_HIBMC=m
 CONFIG_DRM_TINYDRM=m
@@ -5373,7 +5706,14 @@ CONFIG_TINYDRM_MI0283QT=m
 CONFIG_TINYDRM_REPAPER=m
 CONFIG_TINYDRM_ST7586=m
 # CONFIG_TINYDRM_ST7735R is not set
-# CONFIG_DRM_LEGACY is not set
+CONFIG_DRM_VBOXVIDEO=m
+CONFIG_DRM_LEGACY=y
+CONFIG_DRM_TDFX=m
+CONFIG_DRM_R128=m
+CONFIG_DRM_MGA=m
+CONFIG_DRM_SIS=m
+CONFIG_DRM_VIA=m
+CONFIG_DRM_SAVAGE=m
 CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
 
 #
@@ -5453,7 +5793,11 @@ CONFIG_FB_IBM_GXT4500=m
 CONFIG_FB_HYPERV=m
 # CONFIG_FB_SIMPLE is not set
 CONFIG_FB_SM712=m
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
+# end of Frame buffer Devices
+
+#
+# Backlight & LCD device support
+#
 CONFIG_LCD_CLASS_DEVICE=m
 CONFIG_LCD_L4F00242T03=m
 CONFIG_LCD_LMS283GF05=m
@@ -5488,6 +5832,8 @@ CONFIG_BACKLIGHT_GPIO=m
 CONFIG_BACKLIGHT_LV5207LP=m
 CONFIG_BACKLIGHT_BD6107=m
 # CONFIG_BACKLIGHT_ARCXCNN is not set
+# end of Backlight & LCD device support
+
 CONFIG_VGASTATE=m
 CONFIG_HDMI=y
 
@@ -5505,7 +5851,11 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y
+# end of Console display driver support
+
 # CONFIG_LOGO is not set
+# end of Graphics support
+
 CONFIG_SOUND=m
 CONFIG_SOUND_OSS_CORE=y
 CONFIG_SOUND_OSS_CORE_PRECLAIM=y
@@ -5664,6 +6014,8 @@ CONFIG_SND_HDA_CODEC_CMEDIA=m
 CONFIG_SND_HDA_CODEC_SI3054=m
 CONFIG_SND_HDA_GENERIC=m
 CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1
+# end of HD-Audio
+
 CONFIG_SND_HDA_CORE=m
 CONFIG_SND_HDA_DSP_LOADER=y
 CONFIG_SND_HDA_COMPONENT=y
@@ -5673,6 +6025,7 @@ CONFIG_SND_HDA_PREALLOC_SIZE=64
 CONFIG_SND_SPI=y
 CONFIG_SND_USB=y
 CONFIG_SND_USB_AUDIO=m
+CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER=y
 CONFIG_SND_USB_UA101=m
 CONFIG_SND_USB_USX2Y=m
 CONFIG_SND_USB_CAIAQ=m
@@ -5720,11 +6073,14 @@ CONFIG_SND_DESIGNWARE_I2S=m
 #
 # CONFIG_SND_SOC_FSL_ASRC is not set
 # CONFIG_SND_SOC_FSL_SAI is not set
+CONFIG_SND_SOC_FSL_AUDMIX=m
 # CONFIG_SND_SOC_FSL_SSI is not set
 # CONFIG_SND_SOC_FSL_SPDIF is not set
 # CONFIG_SND_SOC_FSL_ESAI is not set
 CONFIG_SND_SOC_FSL_MICFIL=m
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
+# end of SoC Audio for Freescale CPUs
+
 # CONFIG_SND_I2S_HI6210_I2S is not set
 CONFIG_SND_SOC_IMG=y
 CONFIG_SND_SOC_IMG_I2S_IN=m
@@ -5750,6 +6106,8 @@ CONFIG_SND_SOC_INTEL_KBL=m
 CONFIG_SND_SOC_INTEL_GLK=m
 CONFIG_SND_SOC_INTEL_CNL=m
 CONFIG_SND_SOC_INTEL_CFL=m
+# CONFIG_SND_SOC_INTEL_CML_H is not set
+# CONFIG_SND_SOC_INTEL_CML_LP is not set
 CONFIG_SND_SOC_INTEL_SKYLAKE_FAMILY=m
 CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
 CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
@@ -5764,6 +6122,7 @@ CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m
 # CONFIG_SND_SOC_INTEL_CHT_BSW_NAU8824_MACH is not set
+# CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH is not set
 # CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH is not set
 # CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH is not set
 # CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH is not set
@@ -5779,11 +6138,53 @@ CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98927_MACH=m
 CONFIG_SND_SOC_INTEL_KBL_RT5660_MACH=m
 CONFIG_SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH=m
+CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH=m
 CONFIG_SND_SOC_MTK_BTCVSD=m
+CONFIG_SND_SOC_SOF_TOPLEVEL=y
+CONFIG_SND_SOC_SOF_PCI=m
+CONFIG_SND_SOC_SOF_ACPI=m
+CONFIG_SND_SOC_SOF_OPTIONS=m
+# CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT is not set
+# CONFIG_SND_SOC_SOF_STRICT_ABI_CHECKS is not set
+# CONFIG_SND_SOC_SOF_DEBUG is not set
+CONFIG_SND_SOC_SOF=m
+CONFIG_SND_SOC_SOF_PROBE_WORK_QUEUE=y
+CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL=y
+CONFIG_SND_SOC_SOF_INTEL_ACPI=m
+CONFIG_SND_SOC_SOF_INTEL_PCI=m
+CONFIG_SND_SOC_SOF_INTEL_HIFI_EP_IPC=m
+CONFIG_SND_SOC_SOF_INTEL_ATOM_HIFI_EP=m
+CONFIG_SND_SOC_SOF_INTEL_COMMON=m
+CONFIG_SND_SOC_SOF_BAYTRAIL_SUPPORT=y
+CONFIG_SND_SOC_SOF_BAYTRAIL=m
+CONFIG_SND_SOC_SOF_BROADWELL_SUPPORT=y
+CONFIG_SND_SOC_SOF_BROADWELL=m
+CONFIG_SND_SOC_SOF_MERRIFIELD_SUPPORT=y
+CONFIG_SND_SOC_SOF_MERRIFIELD=m
+CONFIG_SND_SOC_SOF_APOLLOLAKE_SUPPORT=y
+CONFIG_SND_SOC_SOF_APOLLOLAKE=m
+CONFIG_SND_SOC_SOF_GEMINILAKE_SUPPORT=y
+CONFIG_SND_SOC_SOF_GEMINILAKE=m
+CONFIG_SND_SOC_SOF_CANNONLAKE_SUPPORT=y
+CONFIG_SND_SOC_SOF_CANNONLAKE=m
+CONFIG_SND_SOC_SOF_COFFEELAKE_SUPPORT=y
+CONFIG_SND_SOC_SOF_COFFEELAKE=m
+CONFIG_SND_SOC_SOF_ICELAKE_SUPPORT=y
+CONFIG_SND_SOC_SOF_ICELAKE=m
+# CONFIG_SND_SOC_SOF_COMETLAKE_LP_SUPPORT is not set
+# CONFIG_SND_SOC_SOF_COMETLAKE_H_SUPPORT is not set
+CONFIG_SND_SOC_SOF_HDA_COMMON=m
+CONFIG_SND_SOC_SOF_HDA_LINK=y
+CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC=y
+CONFIG_SND_SOC_SOF_HDA_LINK_BASELINE=m
+CONFIG_SND_SOC_SOF_HDA=m
+CONFIG_SND_SOC_SOF_XTENSA=m
 
 #
 # STMicroelectronics STM32 SOC audio support
 #
+# end of STMicroelectronics STM32 SOC audio support
+
 CONFIG_SND_SOC_XILINX_I2S=m
 CONFIG_SND_SOC_XILINX_AUDIO_FORMATTER=m
 CONFIG_SND_SOC_XILINX_SPDIF=m
@@ -5833,6 +6234,7 @@ CONFIG_SND_SOC_CS43130=m
 CONFIG_SND_SOC_CS4341=m
 CONFIG_SND_SOC_CS4349=m
 CONFIG_SND_SOC_CS53L30=m
+# CONFIG_SND_SOC_CX2072X is not set
 CONFIG_SND_SOC_DA7219=m
 CONFIG_SND_SOC_DMIC=m
 CONFIG_SND_SOC_HDMI_CODEC=m
@@ -5953,6 +6355,8 @@ CONFIG_SND_SOC_NAU8822=m
 # CONFIG_SND_SOC_NAU8824 is not set
 CONFIG_SND_SOC_NAU8825=m
 CONFIG_SND_SOC_TPA6130A2=m
+# end of CODEC drivers
+
 CONFIG_SND_SIMPLE_CARD_UTILS=m
 CONFIG_SND_SIMPLE_CARD=m
 CONFIG_SND_X86=y
@@ -5987,6 +6391,7 @@ CONFIG_HID_CHERRY=m
 CONFIG_HID_CHICONY=m
 CONFIG_HID_CORSAIR=m
 CONFIG_HID_COUGAR=m
+CONFIG_HID_MACALLY=m
 CONFIG_HID_PRODIKEYS=m
 CONFIG_HID_CMEDIA=m
 CONFIG_HID_CP2112=m
@@ -6069,6 +6474,7 @@ CONFIG_HID_THINGM=m
 CONFIG_HID_THRUSTMASTER=m
 CONFIG_THRUSTMASTER_FF=y
 CONFIG_HID_UDRAW_PS3=m
+CONFIG_HID_U2FZERO=m
 CONFIG_HID_WACOM=m
 CONFIG_HID_WIIMOTE=m
 CONFIG_HID_XINMO=m
@@ -6078,6 +6484,7 @@ CONFIG_HID_ZYDACRON=m
 CONFIG_HID_SENSOR_HUB=m
 CONFIG_HID_SENSOR_CUSTOM_SENSOR=m
 CONFIG_HID_ALPS=m
+# end of Special HID drivers
 
 #
 # USB HID support
@@ -6091,11 +6498,16 @@ CONFIG_USB_HIDDEV=y
 #
 CONFIG_USB_KBD=m
 CONFIG_USB_MOUSE=m
+# end of USB HID Boot Protocol drivers
+# end of USB HID support
 
 #
 # I2C HID support
 #
 CONFIG_I2C_HID=m
+# end of I2C HID support
+# end of HID support
+
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 CONFIG_USB_SUPPORT=y
 CONFIG_USB_COMMON=y
@@ -6339,6 +6751,8 @@ CONFIG_USB_GPIO_VBUS=m
 CONFIG_TAHVO_USB=m
 # CONFIG_TAHVO_USB_HOST_BY_DEFAULT is not set
 CONFIG_USB_ISP1301=m
+# end of USB Physical Layer drivers
+
 CONFIG_USB_GADGET=m
 # CONFIG_USB_GADGET_DEBUG is not set
 # CONFIG_USB_GADGET_DEBUG_FILES is not set
@@ -6371,6 +6785,8 @@ CONFIG_USB_NET2280=m
 CONFIG_USB_GOKU=m
 CONFIG_USB_EG20T=m
 CONFIG_USB_DUMMY_HCD=m
+# end of USB Peripheral Controller
+
 CONFIG_USB_LIBCOMPOSITE=m
 CONFIG_USB_F_ACM=m
 CONFIG_USB_U_SERIAL=m
@@ -6451,11 +6867,15 @@ CONFIG_TYPEC_TPS6598X=m
 # USB Type-C Multiplexer/DeMultiplexer Switch support
 #
 # CONFIG_TYPEC_MUX_PI3USB30532 is not set
+# end of USB Type-C Multiplexer/DeMultiplexer Switch support
 
 #
 # USB Type-C Alternate Mode drivers
 #
 CONFIG_TYPEC_DP_ALTMODE=m
+CONFIG_TYPEC_NVIDIA_ALTMODE=m
+# end of USB Type-C Alternate Mode drivers
+
 CONFIG_USB_ROLE_SWITCH=m
 # CONFIG_USB_ROLES_INTEL_XHCI is not set
 CONFIG_USB_LED_TRIG=y
@@ -6524,6 +6944,7 @@ CONFIG_LEDS_CLASS_FLASH=m
 CONFIG_LEDS_APU=m
 CONFIG_LEDS_AS3645A=m
 CONFIG_LEDS_LM3530=m
+CONFIG_LEDS_LM3532=m
 CONFIG_LEDS_LM3533=m
 CONFIG_LEDS_LM3642=m
 # CONFIG_LEDS_LM3601X is not set
@@ -6549,7 +6970,6 @@ CONFIG_LEDS_PWM=m
 CONFIG_LEDS_REGULATOR=m
 CONFIG_LEDS_BD2802=m
 CONFIG_LEDS_INTEL_SS4200=m
-CONFIG_LEDS_LT3593=m
 CONFIG_LEDS_MC13783=m
 CONFIG_LEDS_TCA6507=m
 CONFIG_LEDS_TLC591XX=m
@@ -6565,6 +6985,7 @@ CONFIG_LEDS_BLINKM=m
 # CONFIG_LEDS_MLXREG is not set
 CONFIG_LEDS_USER=m
 CONFIG_LEDS_NIC78BX=m
+# CONFIG_LEDS_TI_LMU_COMMON is not set
 
 #
 # LED Triggers
@@ -6606,12 +7027,11 @@ CONFIG_INFINIBAND_CXGB4=m
 CONFIG_INFINIBAND_I40IW=m
 CONFIG_MLX4_INFINIBAND=m
 CONFIG_MLX5_INFINIBAND=m
-CONFIG_INFINIBAND_NES=m
-# CONFIG_INFINIBAND_NES_DEBUG is not set
 CONFIG_INFINIBAND_OCRDMA=m
 CONFIG_INFINIBAND_VMWARE_PVRDMA=m
 CONFIG_INFINIBAND_USNIC=m
 CONFIG_RDMA_RXE=m
+# CONFIG_RDMA_SIW is not set
 CONFIG_INFINIBAND_IPOIB=m
 CONFIG_INFINIBAND_IPOIB_CM=y
 CONFIG_INFINIBAND_IPOIB_DEBUG=y
@@ -6687,6 +7107,7 @@ CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_M41T80=m
 CONFIG_RTC_DRV_M41T80_WDT=y
+# CONFIG_RTC_DRV_BD70528 is not set
 CONFIG_RTC_DRV_BQ32K=m
 CONFIG_RTC_DRV_S35390A=m
 CONFIG_RTC_DRV_FM3130=m
@@ -6786,6 +7207,8 @@ CONFIG_QCOM_HIDMA=m
 CONFIG_DW_DMAC_CORE=m
 CONFIG_DW_DMAC=m
 CONFIG_DW_DMAC_PCI=m
+# CONFIG_DW_EDMA is not set
+# CONFIG_DW_EDMA_PCIE is not set
 CONFIG_HSU_DMA=m
 
 #
@@ -6800,6 +7223,8 @@ CONFIG_ASYNC_TX_DMA=y
 CONFIG_SYNC_FILE=y
 # CONFIG_SW_SYNC is not set
 CONFIG_UDMABUF=y
+# end of DMABUF options
+
 CONFIG_AUXDISPLAY=y
 # CONFIG_HD44780 is not set
 CONFIG_KS0108=m
@@ -6855,8 +7280,11 @@ CONFIG_VIRTIO_MMIO=m
 # Microsoft Hyper-V guest support
 #
 CONFIG_HYPERV=m
+CONFIG_HYPERV_TIMER=y
 CONFIG_HYPERV_UTILS=m
 CONFIG_HYPERV_BALLOON=m
+# end of Microsoft Hyper-V guest support
+
 CONFIG_STAGING=y
 CONFIG_PRISM2_USB=m
 CONFIG_COMEDI=m
@@ -6953,8 +7381,6 @@ CONFIG_RTL8723BS=m
 CONFIG_R8712U=m
 CONFIG_R8188EU=m
 CONFIG_88EU_AP_MODE=y
-CONFIG_R8822BE=m
-CONFIG_RTLWIFI_DEBUG_ST=y
 CONFIG_RTS5208=m
 CONFIG_VT6655=m
 CONFIG_VT6656=m
@@ -6968,14 +7394,15 @@ CONFIG_VT6656=m
 #
 CONFIG_ADIS16203=m
 CONFIG_ADIS16240=m
+# end of Accelerometers
 
 #
 # Analog to digital converters
 #
-CONFIG_AD7780=m
 CONFIG_AD7816=m
 CONFIG_AD7192=m
 CONFIG_AD7280=m
+# end of Analog to digital converters
 
 #
 # Analog digital bi-direction converters
@@ -6983,23 +7410,27 @@ CONFIG_AD7280=m
 CONFIG_ADT7316=m
 CONFIG_ADT7316_SPI=m
 CONFIG_ADT7316_I2C=m
+# end of Analog digital bi-direction converters
 
 #
 # Capacitance to digital converters
 #
 CONFIG_AD7150=m
 CONFIG_AD7746=m
+# end of Capacitance to digital converters
 
 #
 # Direct Digital Synthesis
 #
 CONFIG_AD9832=m
 CONFIG_AD9834=m
+# end of Direct Digital Synthesis
 
 #
 # Network Analyzer, Impedance Converters
 #
 CONFIG_AD5933=m
+# end of Network Analyzer, Impedance Converters
 
 #
 # Active energy metering IC
@@ -7007,11 +7438,15 @@ CONFIG_AD5933=m
 CONFIG_ADE7854=m
 CONFIG_ADE7854_I2C=m
 CONFIG_ADE7854_SPI=m
+# end of Active energy metering IC
 
 #
 # Resolver to digital converters
 #
 CONFIG_AD2S1210=m
+# end of Resolver to digital converters
+# end of IIO staging drivers
+
 CONFIG_FB_SM750=m
 
 #
@@ -7029,16 +7464,10 @@ CONFIG_SPEAKUP_SYNTH_SOFT=m
 CONFIG_SPEAKUP_SYNTH_SPKOUT=m
 CONFIG_SPEAKUP_SYNTH_TXPRT=m
 CONFIG_SPEAKUP_SYNTH_DUMMY=m
+# end of Speakup console speech
+
 CONFIG_STAGING_MEDIA=y
 CONFIG_I2C_BCM2048=m
-CONFIG_VIDEO_ZORAN=m
-CONFIG_VIDEO_ZORAN_DC30=m
-CONFIG_VIDEO_ZORAN_ZR36060=m
-CONFIG_VIDEO_ZORAN_BUZ=m
-CONFIG_VIDEO_ZORAN_DC10=m
-CONFIG_VIDEO_ZORAN_LML33=m
-CONFIG_VIDEO_ZORAN_LML33R10=m
-CONFIG_VIDEO_ZORAN_AVS6EYES=m
 CONFIG_VIDEO_IPU3_IMGU=m
 
 #
@@ -7048,6 +7477,8 @@ CONFIG_VIDEO_IPU3_IMGU=m
 #
 # Android
 #
+# end of Android
+
 CONFIG_LTE_GDM724X=m
 CONFIG_FIREWIRE_SERIAL=m
 CONFIG_FWTTY_MAX_TOTAL_PORTS=64
@@ -7120,12 +7551,13 @@ CONFIG_GREYBUS_SDIO=m
 CONFIG_GREYBUS_SPI=m
 CONFIG_GREYBUS_UART=m
 CONFIG_GREYBUS_USB=m
-CONFIG_DRM_VBOXVIDEO=m
 CONFIG_PI433=m
 
 #
 # Gasket devices
 #
+# end of Gasket devices
+
 CONFIG_EROFS_FS=m
 # CONFIG_EROFS_FS_DEBUG is not set
 CONFIG_EROFS_FS_XATTR=y
@@ -7135,6 +7567,8 @@ CONFIG_EROFS_FS_SECURITY=y
 # CONFIG_EROFS_FAULT_INJECTION is not set
 CONFIG_EROFS_FS_IO_MAX_RETRIES=5
 # CONFIG_EROFS_FS_ZIP is not set
+# CONFIG_FIELDBUS_DEV is not set
+# CONFIG_KPC2000 is not set
 CONFIG_X86_PLATFORM_DEVICES=y
 CONFIG_ACER_WMI=m
 # CONFIG_ACER_WIRELESS is not set
@@ -7186,6 +7620,7 @@ CONFIG_ASUS_WIRELESS=m
 CONFIG_ACPI_WMI=m
 CONFIG_WMI_BMOF=m
 CONFIG_INTEL_WMI_THUNDERBOLT=m
+# CONFIG_XIAOMI_WMI is not set
 CONFIG_MSI_WMI=m
 CONFIG_PEAQ_WMI=m
 CONFIG_TOPSTAR_LAPTOP=m
@@ -7193,7 +7628,7 @@ CONFIG_ACPI_TOSHIBA=m
 CONFIG_TOSHIBA_BT_RFKILL=m
 CONFIG_TOSHIBA_HAPS=m
 CONFIG_TOSHIBA_WMI=m
-CONFIG_ACPI_CMPC=m
+# CONFIG_ACPI_CMPC is not set
 # CONFIG_INTEL_INT0002_VGPIO is not set
 CONFIG_INTEL_HID_EVENT=m
 CONFIG_INTEL_VBTN=m
@@ -7203,7 +7638,7 @@ CONFIG_IBM_RTL=m
 CONFIG_SAMSUNG_LAPTOP=m
 CONFIG_MXM_WMI=m
 CONFIG_INTEL_OAKTRAIL=m
-CONFIG_SAMSUNG_Q10=m
+# CONFIG_SAMSUNG_Q10 is not set
 CONFIG_APPLE_GMUX=m
 CONFIG_INTEL_RST=m
 CONFIG_INTEL_SMARTCONNECT=m
@@ -7225,9 +7660,10 @@ CONFIG_CHROMEOS_PSTORE=m
 CONFIG_CROS_EC_I2C=m
 CONFIG_CROS_EC_SPI=m
 CONFIG_CROS_EC_LPC=m
-# CONFIG_CROS_EC_LPC_MEC is not set
 CONFIG_CROS_EC_PROTO=y
 CONFIG_CROS_KBD_LED_BACKLIGHT=m
+CONFIG_CROS_USBPD_LOGGER=m
+# CONFIG_WILCO_EC is not set
 # CONFIG_MELLANOX_PLATFORM is not set
 CONFIG_CLKDEV_LOOKUP=y
 CONFIG_HAVE_CLK_PREPARE=y
@@ -7238,11 +7674,14 @@ CONFIG_COMMON_CLK=y
 #
 CONFIG_COMMON_CLK_WM831X=m
 # CONFIG_COMMON_CLK_MAX9485 is not set
+# CONFIG_COMMON_CLK_SI5341 is not set
 CONFIG_COMMON_CLK_SI5351=m
 # CONFIG_COMMON_CLK_SI544 is not set
 CONFIG_COMMON_CLK_CDCE706=m
 CONFIG_COMMON_CLK_CS2000_CP=m
 CONFIG_COMMON_CLK_PWM=m
+# end of Common Clock Framework
+
 # CONFIG_HWSPINLOCK is not set
 
 #
@@ -7252,6 +7691,8 @@ CONFIG_CLKSRC_I8253=y
 CONFIG_CLKEVT_I8253=y
 CONFIG_I8253_LOCK=y
 CONFIG_CLKBLD_I8253=y
+# end of Clock Source drivers
+
 CONFIG_MAILBOX=y
 # CONFIG_PCC is not set
 CONFIG_ALTERA_MBOX=m
@@ -7262,6 +7703,8 @@ CONFIG_IOMMU_SUPPORT=y
 #
 # Generic IOMMU Pagetable Support
 #
+# end of Generic IOMMU Pagetable Support
+
 # CONFIG_IOMMU_DEBUGFS is not set
 # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
 CONFIG_DMAR_TABLE=y
@@ -7275,6 +7718,7 @@ CONFIG_HYPERV_IOMMU=y
 # Remoteproc drivers
 #
 CONFIG_REMOTEPROC=m
+# end of Remoteproc drivers
 
 #
 # Rpmsg drivers
@@ -7283,6 +7727,8 @@ CONFIG_RPMSG=m
 CONFIG_RPMSG_CHAR=m
 # CONFIG_RPMSG_QCOM_GLINK_RPM is not set
 CONFIG_RPMSG_VIRTIO=m
+# end of Rpmsg drivers
+
 # CONFIG_SOUNDWIRE is not set
 
 #
@@ -7292,28 +7738,42 @@ CONFIG_RPMSG_VIRTIO=m
 #
 # Amlogic SoC drivers
 #
+# end of Amlogic SoC drivers
+
+#
+# Aspeed SoC drivers
+#
+# end of Aspeed SoC drivers
 
 #
 # Broadcom SoC drivers
 #
+# end of Broadcom SoC drivers
 
 #
 # NXP/Freescale QorIQ SoC drivers
 #
+# end of NXP/Freescale QorIQ SoC drivers
 
 #
 # i.MX SoC drivers
 #
+# end of i.MX SoC drivers
 
 #
 # Qualcomm SoC drivers
 #
+# end of Qualcomm SoC drivers
+
 # CONFIG_SOC_TI is not set
 
 #
 # Xilinx SoC drivers
 #
 # CONFIG_XILINX_VCU is not set
+# end of Xilinx SoC drivers
+# end of SOC (System On Chip) specific Drivers
+
 CONFIG_PM_DEVFREQ=y
 
 #
@@ -7337,6 +7797,7 @@ CONFIG_EXTCON=y
 CONFIG_EXTCON_ADC_JACK=m
 CONFIG_EXTCON_ARIZONA=m
 CONFIG_EXTCON_AXP288=m
+# CONFIG_EXTCON_FSA9480 is not set
 CONFIG_EXTCON_GPIO=m
 CONFIG_EXTCON_INTEL_INT3496=m
 CONFIG_EXTCON_MAX3355=m
@@ -7400,6 +7861,7 @@ CONFIG_MXC6255=m
 CONFIG_SCA3000=m
 CONFIG_STK8312=m
 CONFIG_STK8BA50=m
+# end of Accelerometers
 
 #
 # Analog to digital converters
@@ -7415,6 +7877,7 @@ CONFIG_AD7606_IFACE_PARALLEL=m
 CONFIG_AD7606_IFACE_SPI=m
 CONFIG_AD7766=m
 CONFIG_AD7768_1=m
+CONFIG_AD7780=m
 CONFIG_AD7791=m
 CONFIG_AD7793=m
 CONFIG_AD7887=m
@@ -7458,15 +7921,19 @@ CONFIG_TI_ADS7950=m
 CONFIG_TI_AM335X_ADC=m
 CONFIG_TI_TLC4541=m
 CONFIG_VIPERBOARD_ADC=m
+# CONFIG_XILINX_XADC is not set
+# end of Analog to digital converters
 
 #
 # Analog Front Ends
 #
+# end of Analog Front Ends
 
 #
 # Amplifiers
 #
 CONFIG_AD8366=m
+# end of Amplifiers
 
 #
 # Chemical Sensors
@@ -7481,14 +7948,19 @@ CONFIG_PMS7003=m
 CONFIG_SENSIRION_SGP30=m
 CONFIG_SPS30=m
 CONFIG_VZ89X=m
+# end of Chemical Sensors
+
 CONFIG_IIO_CROS_EC_SENSORS_CORE=m
 CONFIG_IIO_CROS_EC_SENSORS=m
+# CONFIG_IIO_CROS_EC_SENSORS_LID_ANGLE is not set
 
 #
 # Hid Sensor IIO Common
 #
 CONFIG_HID_SENSOR_IIO_COMMON=m
 CONFIG_HID_SENSOR_IIO_TRIGGER=m
+# end of Hid Sensor IIO Common
+
 CONFIG_IIO_MS_SENSORS_I2C=m
 
 #
@@ -7496,14 +7968,12 @@ CONFIG_IIO_MS_SENSORS_I2C=m
 #
 CONFIG_IIO_SSP_SENSORS_COMMONS=m
 CONFIG_IIO_SSP_SENSORHUB=m
+# end of SSP Sensor Common
+
 CONFIG_IIO_ST_SENSORS_I2C=m
 CONFIG_IIO_ST_SENSORS_SPI=m
 CONFIG_IIO_ST_SENSORS_CORE=m
 
-#
-# Counters
-#
-
 #
 # Digital to analog converters
 #
@@ -7538,6 +8008,7 @@ CONFIG_TI_DAC082S085=m
 # CONFIG_TI_DAC5571 is not set
 CONFIG_TI_DAC7311=m
 CONFIG_TI_DAC7612=m
+# end of Digital to analog converters
 
 #
 # IIO dummy driver
@@ -7545,6 +8016,7 @@ CONFIG_TI_DAC7612=m
 CONFIG_IIO_SIMPLE_DUMMY=m
 # CONFIG_IIO_SIMPLE_DUMMY_EVENTS is not set
 # CONFIG_IIO_SIMPLE_DUMMY_BUFFER is not set
+# end of IIO dummy driver
 
 #
 # Frequency Synthesizers DDS/PLL
@@ -7554,11 +8026,15 @@ CONFIG_IIO_SIMPLE_DUMMY=m
 # Clock Generator/Distribution
 #
 CONFIG_AD9523=m
+# end of Clock Generator/Distribution
 
 #
 # Phase-Locked Loop (PLL) frequency synthesizers
 #
 CONFIG_ADF4350=m
+# CONFIG_ADF4371 is not set
+# end of Phase-Locked Loop (PLL) frequency synthesizers
+# end of Frequency Synthesizers DDS/PLL
 
 #
 # Digital gyroscope sensors
@@ -7571,6 +8047,9 @@ CONFIG_ADXRS450=m
 CONFIG_BMG160=m
 CONFIG_BMG160_I2C=m
 CONFIG_BMG160_SPI=m
+CONFIG_FXAS21002C=m
+CONFIG_FXAS21002C_I2C=m
+CONFIG_FXAS21002C_SPI=m
 CONFIG_HID_SENSOR_GYRO_3D=m
 CONFIG_MPU3050=m
 CONFIG_MPU3050_I2C=m
@@ -7578,6 +8057,7 @@ CONFIG_IIO_ST_GYRO_3AXIS=m
 CONFIG_IIO_ST_GYRO_I2C_3AXIS=m
 CONFIG_IIO_ST_GYRO_SPI_3AXIS=m
 CONFIG_ITG3200=m
+# end of Digital gyroscope sensors
 
 #
 # Health Sensors
@@ -7590,6 +8070,8 @@ CONFIG_AFE4403=m
 CONFIG_AFE4404=m
 CONFIG_MAX30100=m
 # CONFIG_MAX30102 is not set
+# end of Heart Rate Monitors
+# end of Health Sensors
 
 #
 # Humidity sensors
@@ -7604,6 +8086,7 @@ CONFIG_HTS221_SPI=m
 CONFIG_HTU21=m
 CONFIG_SI7005=m
 CONFIG_SI7020=m
+# end of Humidity sensors
 
 #
 # Inertial measurement units
@@ -7620,6 +8103,8 @@ CONFIG_INV_MPU6050_SPI=m
 CONFIG_IIO_ST_LSM6DSX=m
 CONFIG_IIO_ST_LSM6DSX_I2C=m
 CONFIG_IIO_ST_LSM6DSX_SPI=m
+# end of Inertial measurement units
+
 CONFIG_IIO_ADIS_LIB=m
 CONFIG_IIO_ADIS_LIB_BUFFER=y
 
@@ -7669,6 +8154,7 @@ CONFIG_VCNL4035=m
 CONFIG_VEML6070=m
 # CONFIG_VL6180 is not set
 # CONFIG_ZOPT2201 is not set
+# end of Light sensors
 
 #
 # Magnetometer sensors
@@ -7689,16 +8175,19 @@ CONFIG_IIO_ST_MAGN_SPI_3AXIS=m
 CONFIG_SENSORS_RM3100=m
 CONFIG_SENSORS_RM3100_I2C=m
 CONFIG_SENSORS_RM3100_SPI=m
+# end of Magnetometer sensors
 
 #
 # Multiplexers
 #
+# end of Multiplexers
 
 #
 # Inclinometer sensors
 #
 CONFIG_HID_SENSOR_INCLINOMETER_3D=m
 # CONFIG_HID_SENSOR_DEVICE_ROTATION is not set
+# end of Inclinometer sensors
 
 #
 # Triggers - standalone
@@ -7707,6 +8196,7 @@ CONFIG_IIO_HRTIMER_TRIGGER=m
 CONFIG_IIO_INTERRUPT_TRIGGER=m
 CONFIG_IIO_TIGHTLOOP_TRIGGER=m
 CONFIG_IIO_SYSFS_TRIGGER=m
+# end of Triggers - standalone
 
 #
 # Digital potentiometers
@@ -7720,11 +8210,13 @@ CONFIG_MCP4131=m
 CONFIG_MCP4531=m
 CONFIG_MCP41010=m
 CONFIG_TPL0102=m
+# end of Digital potentiometers
 
 #
 # Digital potentiostats
 #
 CONFIG_LMP91000=m
+# end of Digital potentiostats
 
 #
 # Pressure sensors
@@ -7734,6 +8226,7 @@ CONFIG_BMP280=m
 CONFIG_BMP280_I2C=m
 CONFIG_BMP280_SPI=m
 CONFIG_IIO_CROS_EC_BARO=m
+# CONFIG_DPS310 is not set
 CONFIG_HID_SENSOR_PRESS=m
 CONFIG_HP03=m
 CONFIG_MPL115=m
@@ -7752,28 +8245,33 @@ CONFIG_HP206C=m
 CONFIG_ZPA2326=m
 CONFIG_ZPA2326_I2C=m
 CONFIG_ZPA2326_SPI=m
+# end of Pressure sensors
 
 #
 # Lightning sensors
 #
 # CONFIG_AS3935 is not set
+# end of Lightning sensors
 
 #
 # Proximity and distance sensors
 #
 CONFIG_ISL29501=m
 CONFIG_LIDAR_LITE_V2=m
+CONFIG_MB1232=m
 CONFIG_RFD77402=m
 # CONFIG_SRF04 is not set
 CONFIG_SX9500=m
 CONFIG_SRF08=m
 CONFIG_VL53L0X_I2C=m
+# end of Proximity and distance sensors
 
 #
 # Resolver to digital converters
 #
 CONFIG_AD2S90=m
 CONFIG_AD2S1200=m
+# end of Resolver to digital converters
 
 #
 # Temperature sensors
@@ -7786,7 +8284,11 @@ CONFIG_TMP006=m
 CONFIG_TMP007=m
 CONFIG_TSYS01=m
 CONFIG_TSYS02D=m
+CONFIG_MAX31856=m
+# end of Temperature sensors
+
 CONFIG_NTB=m
+# CONFIG_NTB_MSI is not set
 # CONFIG_NTB_IDT is not set
 CONFIG_NTB_SWITCHTEC=m
 CONFIG_NTB_PINGPONG=m
@@ -7806,18 +8308,14 @@ CONFIG_PWM_PCA9685=m
 #
 # IRQ chip support
 #
-CONFIG_ARM_GIC_MAX_NR=1
 CONFIG_MADERA_IRQ=m
+# end of IRQ chip support
+
 CONFIG_IPACK_BUS=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_SERIAL_IPOCTAL=m
 CONFIG_RESET_CONTROLLER=y
 # CONFIG_RESET_TI_SYSCON is not set
-CONFIG_FMC=m
-CONFIG_FMC_FAKEDEV=m
-CONFIG_FMC_TRIVIAL=m
-CONFIG_FMC_WRITE_EEPROM=m
-CONFIG_FMC_CHARDEV=m
 
 #
 # PHY Subsystem
@@ -7830,7 +8328,10 @@ CONFIG_PHY_PXA_28NM_USB2=m
 CONFIG_PHY_QCOM_USB_HS=m
 CONFIG_PHY_QCOM_USB_HSIC=m
 CONFIG_PHY_TUSB1210=m
+# end of PHY Subsystem
+
 CONFIG_POWERCAP=y
+CONFIG_INTEL_RAPL_CORE=m
 CONFIG_INTEL_RAPL=m
 CONFIG_IDLE_INJECT=y
 CONFIG_MCB=m
@@ -7840,6 +8341,8 @@ CONFIG_MCB_LPC=m
 #
 # Performance monitor support
 #
+# end of Performance monitor support
+
 CONFIG_RAS=y
 CONFIG_THUNDERBOLT=m
 
@@ -7847,11 +8350,14 @@ CONFIG_THUNDERBOLT=m
 # Android
 #
 # CONFIG_ANDROID is not set
+# end of Android
+
 # CONFIG_LIBNVDIMM is not set
 CONFIG_DAX=y
 CONFIG_DEV_DAX=m
 CONFIG_DEV_DAX_KMEM=m
 CONFIG_NVMEM=y
+CONFIG_NVMEM_SYSFS=y
 
 #
 # HW tracing support
@@ -7870,6 +8376,8 @@ CONFIG_INTEL_TH_STH=m
 CONFIG_INTEL_TH_MSU=m
 CONFIG_INTEL_TH_PTI=m
 # CONFIG_INTEL_TH_DEBUG is not set
+# end of HW tracing support
+
 CONFIG_FPGA=m
 # CONFIG_ALTERA_PR_IP_CORE is not set
 CONFIG_FPGA_MGR_ALTERA_PS_SPI=m
@@ -7891,6 +8399,8 @@ CONFIG_PM_OPP=y
 # CONFIG_SIOX is not set
 # CONFIG_SLIMBUS is not set
 CONFIG_INTERCONNECT=m
+# CONFIG_COUNTER is not set
+# end of Device Drivers
 
 #
 # File systems
@@ -7991,6 +8501,7 @@ CONFIG_FSCACHE=m
 CONFIG_CACHEFILES=m
 # CONFIG_CACHEFILES_DEBUG is not set
 # CONFIG_CACHEFILES_HISTOGRAM is not set
+# end of Caches
 
 #
 # CD-ROM/DVD Filesystems
@@ -7999,6 +8510,7 @@ CONFIG_ISO9660_FS=m
 CONFIG_JOLIET=y
 CONFIG_ZISOFS=y
 CONFIG_UDF_FS=m
+# end of CD-ROM/DVD Filesystems
 
 #
 # DOS/FAT/NT Filesystems
@@ -8012,6 +8524,7 @@ CONFIG_FAT_DEFAULT_UTF8=y
 CONFIG_NTFS_FS=m
 # CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
+# end of DOS/FAT/NT Filesystems
 
 #
 # Pseudo filesystems
@@ -8023,6 +8536,7 @@ CONFIG_PROC_VMCORE=y
 CONFIG_PROC_SYSCTL=y
 CONFIG_PROC_PAGE_MONITOR=y
 CONFIG_PROC_CHILDREN=y
+CONFIG_PROC_PID_ARCH_STATUS=y
 CONFIG_KERNFS=y
 CONFIG_SYSFS=y
 CONFIG_TMPFS=y
@@ -8033,6 +8547,8 @@ CONFIG_HUGETLB_PAGE=y
 CONFIG_MEMFD_CREATE=y
 CONFIG_CONFIGFS_FS=m
 CONFIG_EFIVAR_FS=y
+# end of Pseudo filesystems
+
 CONFIG_MISC_FILESYSTEMS=y
 CONFIG_ORANGEFS_FS=m
 CONFIG_ADFS_FS=m
@@ -8042,7 +8558,8 @@ CONFIG_ECRYPT_FS=m
 # CONFIG_ECRYPT_FS_MESSAGING is not set
 CONFIG_HFS_FS=m
 CONFIG_HFSPLUS_FS=m
-# CONFIG_BEFS_FS is not set
+CONFIG_BEFS_FS=m
+# CONFIG_BEFS_DEBUG is not set
 # CONFIG_BFS_FS is not set
 # CONFIG_EFS_FS is not set
 # CONFIG_JFFS2_FS is not set
@@ -8129,12 +8646,13 @@ CONFIG_SUNRPC_GSS=m
 CONFIG_SUNRPC_BACKCHANNEL=y
 CONFIG_SUNRPC_SWAP=y
 CONFIG_RPCSEC_GSS_KRB5=m
-CONFIG_CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y
+# CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES is not set
 # CONFIG_SUNRPC_DEBUG is not set
 CONFIG_SUNRPC_XPRT_RDMA=m
 CONFIG_CEPH_FS=m
 CONFIG_CEPH_FSCACHE=y
 CONFIG_CEPH_FS_POSIX_ACL=y
+# CONFIG_CEPH_FS_SECURITY_LABEL is not set
 CONFIG_CIFS=m
 # CONFIG_CIFS_STATS2 is not set
 CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
@@ -8142,7 +8660,6 @@ CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
 # CONFIG_CIFS_UPCALL is not set
 CONFIG_CIFS_XATTR=y
 CONFIG_CIFS_POSIX=y
-CONFIG_CIFS_ACL=y
 # CONFIG_CIFS_DEBUG is not set
 CONFIG_CIFS_DFS_UPCALL=y
 # CONFIG_CIFS_SMB_DIRECT is not set
@@ -8209,11 +8726,15 @@ CONFIG_NLS_MAC_TURKISH=m
 CONFIG_NLS_UTF8=m
 CONFIG_DLM=m
 # CONFIG_DLM_DEBUG is not set
+CONFIG_UNICODE=y
+# CONFIG_UNICODE_NORMALIZATION_SELFTEST is not set
+# end of File systems
 
 #
 # Security options
 #
 CONFIG_KEYS=y
+# CONFIG_KEYS_REQUEST_CACHE is not set
 # CONFIG_PERSISTENT_KEYRINGS is not set
 # CONFIG_BIG_KEYS is not set
 CONFIG_TRUSTED_KEYS=m
@@ -8259,6 +8780,25 @@ CONFIG_INTEGRITY_AUDIT=y
 # CONFIG_DEFAULT_SECURITY_APPARMOR is not set
 CONFIG_DEFAULT_SECURITY_DAC=y
 CONFIG_LSM="yama,loadpin,safesetid,integrity"
+
+#
+# Kernel hardening options
+#
+
+#
+# Memory initialization
+#
+CONFIG_INIT_STACK_NONE=y
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_USER is not set
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL is not set
+# CONFIG_GCC_PLUGIN_STACKLEAK is not set
+# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
+# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
+# end of Memory initialization
+# end of Kernel hardening options
+# end of Security options
+
 CONFIG_XOR_BLOCKS=m
 CONFIG_ASYNC_CORE=m
 CONFIG_ASYNC_MEMCPY=m
@@ -8286,9 +8826,6 @@ CONFIG_CRYPTO_AKCIPHER=y
 CONFIG_CRYPTO_KPP2=y
 CONFIG_CRYPTO_KPP=y
 CONFIG_CRYPTO_ACOMP2=y
-CONFIG_CRYPTO_RSA=y
-CONFIG_CRYPTO_DH=y
-CONFIG_CRYPTO_ECDH=m
 CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MANAGER2=y
 CONFIG_CRYPTO_USER=m
@@ -8297,7 +8834,6 @@ CONFIG_CRYPTO_GF128MUL=y
 CONFIG_CRYPTO_NULL=m
 CONFIG_CRYPTO_NULL2=y
 CONFIG_CRYPTO_PCRYPT=m
-CONFIG_CRYPTO_WORKQUEUE=y
 CONFIG_CRYPTO_CRYPTD=y
 CONFIG_CRYPTO_AUTHENC=m
 CONFIG_CRYPTO_TEST=m
@@ -8305,6 +8841,15 @@ CONFIG_CRYPTO_SIMD=y
 CONFIG_CRYPTO_GLUE_HELPER_X86=y
 CONFIG_CRYPTO_ENGINE=m
 
+#
+# Public-key cryptography
+#
+CONFIG_CRYPTO_RSA=y
+CONFIG_CRYPTO_DH=y
+CONFIG_CRYPTO_ECC=m
+CONFIG_CRYPTO_ECDH=m
+CONFIG_CRYPTO_ECRDSA=m
+
 #
 # Authenticated Encryption with Associated Data
 #
@@ -8350,6 +8895,7 @@ CONFIG_CRYPTO_CRC32C=m
 CONFIG_CRYPTO_CRC32C_INTEL=m
 CONFIG_CRYPTO_CRC32=m
 CONFIG_CRYPTO_CRC32_PCLMUL=m
+# CONFIG_CRYPTO_XXHASH is not set
 CONFIG_CRYPTO_CRCT10DIF=y
 CONFIG_CRYPTO_GHASH=m
 CONFIG_CRYPTO_POLY1305=m
@@ -8365,7 +8911,7 @@ CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA512=y
 CONFIG_CRYPTO_SHA3=m
 # CONFIG_CRYPTO_SM3 is not set
-# CONFIG_CRYPTO_STREEBOG is not set
+CONFIG_CRYPTO_STREEBOG=m
 CONFIG_CRYPTO_TGR192=m
 CONFIG_CRYPTO_WP512=m
 
@@ -8377,6 +8923,7 @@ CONFIG_CRYPTO_AES_TI=m
 CONFIG_CRYPTO_AES_586=m
 CONFIG_CRYPTO_AES_NI_INTEL=m
 CONFIG_CRYPTO_ANUBIS=m
+CONFIG_CRYPTO_LIB_ARC4=m
 CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_BLOWFISH=m
 CONFIG_CRYPTO_BLOWFISH_COMMON=m
@@ -8430,6 +8977,8 @@ CONFIG_CRYPTO_DEV_PADLOCK=m
 CONFIG_CRYPTO_DEV_PADLOCK_AES=m
 CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
 CONFIG_CRYPTO_DEV_GEODE=m
+# CONFIG_CRYPTO_DEV_ATMEL_ECC is not set
+# CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set
 CONFIG_CRYPTO_DEV_CCP=y
 CONFIG_CRYPTO_DEV_CCP_DD=m
 CONFIG_CRYPTO_DEV_SP_CCP=y
@@ -8462,18 +9011,21 @@ CONFIG_SYSTEM_TRUSTED_KEYS=""
 # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
 # CONFIG_SECONDARY_TRUSTED_KEYRING is not set
 # CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
+# end of Certificates for signature checking
 
 #
 # Library routines
 #
 CONFIG_RAID6_PQ=m
 CONFIG_RAID6_PQ_BENCHMARK=y
+CONFIG_PACKING=y
 CONFIG_BITREVERSE=y
-CONFIG_RATIONAL=y
 CONFIG_GENERIC_STRNCPY_FROM_USER=y
 CONFIG_GENERIC_STRNLEN_USER=y
 CONFIG_GENERIC_NET_UTILS=y
 CONFIG_GENERIC_FIND_FIRST_BIT=y
+CONFIG_CORDIC=m
+CONFIG_RATIONAL=y
 CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_GENERIC_IOMAP=y
 CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
@@ -8525,8 +9077,8 @@ CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_REED_SOLOMON=m
 CONFIG_REED_SOLOMON_ENC8=y
 CONFIG_REED_SOLOMON_DEC8=y
+CONFIG_REED_SOLOMON_DEC16=y
 CONFIG_BCH=m
-CONFIG_BCH_CONST_PARAMS=y
 CONFIG_TEXTSEARCH=y
 CONFIG_TEXTSEARCH_KMP=m
 CONFIG_TEXTSEARCH_BM=m
@@ -8554,12 +9106,14 @@ CONFIG_GLOB=y
 CONFIG_NLATTR=y
 CONFIG_LRU_CACHE=m
 CONFIG_CLZ_TAB=y
-CONFIG_CORDIC=m
-CONFIG_DDR=y
 CONFIG_IRQ_POLL=y
 CONFIG_MPILIB=y
+CONFIG_DIMLIB=y
 CONFIG_OID_REGISTRY=y
 CONFIG_UCS2_STRING=y
+CONFIG_HAVE_GENERIC_VDSO=y
+CONFIG_GENERIC_GETTIMEOFDAY=y
+CONFIG_GENERIC_VDSO_32=y
 CONFIG_FONT_SUPPORT=y
 CONFIG_FONTS=y
 # CONFIG_FONT_8x8 is not set
@@ -8576,10 +9130,12 @@ CONFIG_FONT_8x16=y
 # CONFIG_FONT_TER16x32 is not set
 CONFIG_FONT_AUTOSELECT=y
 CONFIG_SG_POOL=y
+CONFIG_ARCH_STACKWALK=y
 CONFIG_SBITMAP=y
 CONFIG_PARMAN=m
-# CONFIG_STRING_SELFTEST is not set
 CONFIG_OBJAGG=m
+# CONFIG_STRING_SELFTEST is not set
+# end of Library routines
 
 #
 # Kernel hacking
@@ -8595,6 +9151,7 @@ CONFIG_CONSOLE_LOGLEVEL_QUIET=4
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_BOOT_PRINTK_DELAY is not set
 CONFIG_DYNAMIC_DEBUG=y
+# end of printk and dmesg options
 
 #
 # Compile-time checks and compiler options
@@ -8603,6 +9160,7 @@ CONFIG_DEBUG_INFO=y
 # CONFIG_DEBUG_INFO_REDUCED is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
 # CONFIG_DEBUG_INFO_DWARF4 is not set
+# CONFIG_DEBUG_INFO_BTF is not set
 # CONFIG_GDB_SCRIPTS is not set
 # CONFIG_ENABLE_MUST_CHECK is not set
 CONFIG_FRAME_WARN=1024
@@ -8610,15 +9168,19 @@ CONFIG_STRIP_ASM_SYMS=y
 # CONFIG_READABLE_ASM is not set
 # CONFIG_UNUSED_SYMBOLS is not set
 CONFIG_DEBUG_FS=y
-# CONFIG_HEADERS_CHECK is not set
+# CONFIG_HEADERS_INSTALL is not set
+# CONFIG_OPTIMIZE_INLINING is not set
 # CONFIG_DEBUG_SECTION_MISMATCH is not set
 CONFIG_SECTION_MISMATCH_WARN_ONLY=y
 CONFIG_FRAME_POINTER=y
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+# end of Compile-time checks and compiler options
+
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
 CONFIG_MAGIC_SYSRQ_SERIAL=y
 CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_MISC=y
 
 #
 # Memory Debugging
@@ -8646,6 +9208,8 @@ CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
 # CONFIG_DEBUG_STACKOVERFLOW is not set
 CONFIG_CC_HAS_KASAN_GENERIC=y
 CONFIG_KASAN_STACK=1
+# end of Memory Debugging
+
 CONFIG_CC_HAS_SANCOV_TRACE_PC=y
 # CONFIG_DEBUG_SHIRQ is not set
 
@@ -8662,6 +9226,8 @@ CONFIG_BOOTPARAM_HARDLOCKUP_PANIC=y
 CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=1
 # CONFIG_DETECT_HUNG_TASK is not set
 # CONFIG_WQ_WATCHDOG is not set
+# end of Debug Lockups and Hangs
+
 # CONFIG_PANIC_ON_OOPS is not set
 CONFIG_PANIC_ON_OOPS_VALUE=0
 CONFIG_PANIC_TIMEOUT=0
@@ -8688,12 +9254,14 @@ CONFIG_LOCK_DEBUGGING_SUPPORT=y
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_LOCK_TORTURE_TEST is not set
 CONFIG_WW_MUTEX_SELFTEST=m
+# end of Lock Debugging (spinlocks, mutexes, etc...)
+
 CONFIG_STACKTRACE=y
 # CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
 # CONFIG_DEBUG_KOBJECT is not set
 CONFIG_DEBUG_BUGVERBOSE=y
 CONFIG_DEBUG_LIST=y
-# CONFIG_DEBUG_PI_LIST is not set
+# CONFIG_DEBUG_PLIST is not set
 CONFIG_DEBUG_SG=y
 CONFIG_DEBUG_NOTIFIERS=y
 CONFIG_DEBUG_CREDENTIALS=y
@@ -8707,6 +9275,8 @@ CONFIG_RCU_PERF_TEST=m
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
 # CONFIG_RCU_TRACE is not set
 # CONFIG_RCU_EQS_DEBUG is not set
+# end of RCU Debugging
+
 # CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
 # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
@@ -8735,12 +9305,14 @@ CONFIG_LKDTM=m
 # CONFIG_KPROBES_SANITY_TEST is not set
 # CONFIG_BACKTRACE_SELF_TEST is not set
 # CONFIG_RBTREE_TEST is not set
+# CONFIG_REED_SOLOMON_TEST is not set
 # CONFIG_INTERVAL_TREE_TEST is not set
 # CONFIG_PERCPU_TEST is not set
 # CONFIG_ATOMIC64_SELFTEST is not set
 CONFIG_ASYNC_RAID6_TEST=m
 CONFIG_TEST_HEXDUMP=m
 CONFIG_TEST_STRING_HELPERS=m
+# CONFIG_TEST_STRSCPY is not set
 CONFIG_TEST_KSTRTOX=m
 CONFIG_TEST_PRINTF=m
 CONFIG_TEST_BITMAP=m
@@ -8756,6 +9328,7 @@ CONFIG_TEST_PARMAN=m
 # CONFIG_TEST_VMALLOC is not set
 # CONFIG_TEST_USER_COPY is not set
 # CONFIG_TEST_BPF is not set
+# CONFIG_TEST_BLACKHOLE_DEV is not set
 # CONFIG_FIND_BIT_BENCHMARK is not set
 # CONFIG_TEST_FIRMWARE is not set
 # CONFIG_TEST_SYSCTL is not set
@@ -8765,6 +9338,7 @@ CONFIG_TEST_STATIC_KEYS=m
 # CONFIG_TEST_MEMCAT_P is not set
 # CONFIG_TEST_OBJAGG is not set
 # CONFIG_TEST_STACKINIT is not set
+# CONFIG_TEST_MEMINIT is not set
 # CONFIG_MEMTEST is not set
 CONFIG_BUG_ON_DATA_CORRUPTION=y
 # CONFIG_SAMPLES is not set
@@ -8789,21 +9363,16 @@ CONFIG_DOUBLEFAULT=y
 # CONFIG_DEBUG_TLBFLUSH is not set
 CONFIG_HAVE_MMIOTRACE_SUPPORT=y
 # CONFIG_X86_DECODER_SELFTEST is not set
-CONFIG_IO_DELAY_TYPE_0X80=0
-CONFIG_IO_DELAY_TYPE_0XED=1
-CONFIG_IO_DELAY_TYPE_UDELAY=2
-CONFIG_IO_DELAY_TYPE_NONE=3
 CONFIG_IO_DELAY_0X80=y
 # CONFIG_IO_DELAY_0XED is not set
 # CONFIG_IO_DELAY_UDELAY is not set
 # CONFIG_IO_DELAY_NONE is not set
-CONFIG_DEFAULT_IO_DELAY_TYPE=0
 # CONFIG_DEBUG_BOOT_PARAMS is not set
 # CONFIG_CPA_DEBUG is not set
-# CONFIG_OPTIMIZE_INLINING is not set
 # CONFIG_DEBUG_ENTRY is not set
 # CONFIG_DEBUG_NMI_SELFTEST is not set
 CONFIG_X86_DEBUG_FPU=y
 CONFIG_PUNIT_ATOM_DEBUG=m
 CONFIG_UNWINDER_FRAME_POINTER=y
 # CONFIG_UNWINDER_GUESS is not set
+# end of Kernel hacking
diff --git a/srcpkgs/linux5.1/files/mv-debug b/srcpkgs/linux5.3/files/mv-debug
similarity index 100%
rename from srcpkgs/linux5.1/files/mv-debug
rename to srcpkgs/linux5.3/files/mv-debug
diff --git a/srcpkgs/linux5.1/files/ppc-dotconfig b/srcpkgs/linux5.3/files/ppc-dotconfig
similarity index 93%
rename from srcpkgs/linux5.1/files/ppc-dotconfig
rename to srcpkgs/linux5.3/files/ppc-dotconfig
index d8d37b70a45..e6ab7a55c16 100644
--- a/srcpkgs/linux5.1/files/ppc-dotconfig
+++ b/srcpkgs/linux5.3/files/ppc-dotconfig
@@ -1,14 +1,15 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.1.18 Kernel Configuration
+# Linux/powerpc 5.3.0 Kernel Configuration
 #
 
 #
-# Compiler: powerpc-linux-gnu-gcc (GCC) 9.1.0
+# Compiler: powerpc-linux-gnu-gcc (GCC) 9.2.0
 #
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=90100
+CONFIG_GCC_VERSION=90200
 CONFIG_CLANG_VERSION=0
+CONFIG_CC_CAN_LINK=y
 CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y
 CONFIG_IRQ_WORK=y
@@ -20,6 +21,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
 #
 CONFIG_INIT_ENV_ARG_LIMIT=32
 # CONFIG_COMPILE_TEST is not set
+# CONFIG_HEADER_TEST is not set
 CONFIG_LOCALVERSION="_1"
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_BUILD_SALT=""
@@ -50,6 +52,8 @@ CONFIG_GENERIC_MSI_IRQ=y
 CONFIG_IRQ_FORCED_THREADING=y
 CONFIG_SPARSE_IRQ=y
 # CONFIG_GENERIC_IRQ_DEBUGFS is not set
+# end of IRQ subsystem
+
 CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_ARCH_HAS_TICK_BROADCAST=y
@@ -65,6 +69,8 @@ CONFIG_NO_HZ_COMMON=y
 CONFIG_NO_HZ_IDLE=y
 # CONFIG_NO_HZ is not set
 CONFIG_HIGH_RES_TIMERS=y
+# end of Timers subsystem
+
 # CONFIG_PREEMPT_NONE is not set
 CONFIG_PREEMPT_VOLUNTARY=y
 # CONFIG_PREEMPT is not set
@@ -81,7 +87,10 @@ CONFIG_TASKSTATS=y
 CONFIG_TASK_DELAY_ACCT=y
 CONFIG_TASK_XACCT=y
 CONFIG_TASK_IO_ACCOUNTING=y
-# CONFIG_PSI is not set
+CONFIG_PSI=y
+CONFIG_PSI_DEFAULT_DISABLED=y
+# end of CPU/Task time and stats accounting
+
 CONFIG_CPU_ISOLATION=y
 
 #
@@ -93,12 +102,20 @@ CONFIG_SRCU=y
 CONFIG_TREE_SRCU=y
 CONFIG_RCU_STALL_COMMON=y
 CONFIG_RCU_NEED_SEGCBLIST=y
-CONFIG_BUILD_BIN2C=y
+# end of RCU Subsystem
+
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
+CONFIG_IKHEADERS=m
 CONFIG_LOG_BUF_SHIFT=17
 CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
 CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
+
+#
+# Scheduler features
+#
+# end of Scheduler features
+
 CONFIG_CGROUPS=y
 CONFIG_PAGE_COUNTER=y
 CONFIG_MEMCG=y
@@ -106,7 +123,6 @@ CONFIG_MEMCG_SWAP=y
 # CONFIG_MEMCG_SWAP_ENABLED is not set
 CONFIG_MEMCG_KMEM=y
 CONFIG_BLK_CGROUP=y
-# CONFIG_DEBUG_BLK_CGROUP is not set
 CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
@@ -145,7 +161,6 @@ CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
 CONFIG_HAVE_LD_DEAD_CODE_DATA_ELIMINATION=y
 # CONFIG_LD_DEAD_CODE_DATA_ELIMINATION is not set
 CONFIG_SYSCTL=y
-CONFIG_ANON_INODES=y
 CONFIG_SYSCTL_EXCEPTION_TRACE=y
 CONFIG_HAVE_PCSPKR_PLATFORM=y
 CONFIG_BPF=y
@@ -189,6 +204,8 @@ CONFIG_HAVE_PERF_EVENTS=y
 # Kernel Performance Events And Counters
 #
 CONFIG_PERF_EVENTS=y
+# end of Kernel Performance Events And Counters
+
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_SLUB_DEBUG=y
 # CONFIG_SLUB_MEMCG_SYSFS_ON is not set
@@ -199,10 +216,13 @@ CONFIG_SLUB=y
 CONFIG_SLAB_MERGE_DEFAULT=y
 CONFIG_SLAB_FREELIST_RANDOM=y
 CONFIG_SLAB_FREELIST_HARDENED=y
+CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
 CONFIG_SLUB_CPU_PARTIAL=y
 CONFIG_SYSTEM_DATA_VERIFICATION=y
 CONFIG_PROFILING=y
 CONFIG_TRACEPOINTS=y
+# end of General setup
+
 # CONFIG_PPC64 is not set
 
 #
@@ -221,10 +241,16 @@ CONFIG_GENERIC_CPU=y
 CONFIG_PPC_BOOK3S=y
 CONFIG_PPC_FPU=y
 CONFIG_ALTIVEC=y
+CONFIG_PPC_HAVE_KUEP=y
+CONFIG_PPC_KUEP=y
+CONFIG_PPC_HAVE_KUAP=y
+CONFIG_PPC_KUAP=y
 CONFIG_PPC_HAVE_PMU_SUPPORT=y
 CONFIG_PPC_PERF_CTRS=y
 CONFIG_SMP=y
 CONFIG_NR_CPUS=2048
+# end of Processor support
+
 CONFIG_VDSO32=y
 CONFIG_CPU_BIG_ENDIAN=y
 CONFIG_PPC32=y
@@ -239,7 +265,6 @@ CONFIG_NMI_IPI=y
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_PPC=y
 CONFIG_EARLY_PRINTK=y
@@ -315,6 +340,7 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
 #
 # CONFIG_CPUFREQ_DT is not set
 CONFIG_CPU_FREQ_PMAC=y
+# end of CPU Frequency scaling
 
 #
 # CPUIdle driver
@@ -324,12 +350,16 @@ CONFIG_CPU_FREQ_PMAC=y
 # CPU Idle
 #
 # CONFIG_CPU_IDLE is not set
+# end of CPU Idle
+# end of CPUIdle driver
+
 CONFIG_PPC601_SYNC_FIX=y
 CONFIG_TAU=y
 # CONFIG_TAU_INT is not set
 # CONFIG_TAU_AVERAGE is not set
 # CONFIG_GEN_RTC is not set
 # CONFIG_SIMPLE_GPIO is not set
+# end of Platform support
 
 #
 # Kernel options
@@ -357,6 +387,7 @@ CONFIG_ETEXT_SHIFT=12
 CONFIG_DATA_SHIFT=12
 CONFIG_FORCE_MAX_ZONEORDER=11
 # CONFIG_CMDLINE_BOOL is not set
+CONFIG_CMDLINE=""
 CONFIG_EXTRA_TARGETS=""
 CONFIG_ARCH_WANTS_FREEZER_CONTROL=y
 CONFIG_SUSPEND=y
@@ -379,6 +410,8 @@ CONFIG_PM_CLK=y
 # CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
 CONFIG_ENERGY_MODEL=y
 CONFIG_SECCOMP=y
+# end of Kernel options
+
 CONFIG_ISA_DMA_API=y
 
 #
@@ -388,6 +421,7 @@ CONFIG_ISA_DMA_API=y
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_PPC_INDIRECT_PCI=y
 # CONFIG_FSL_LBC is not set
+# end of Bus options
 
 #
 # Advanced setup
@@ -402,6 +436,8 @@ CONFIG_PAGE_OFFSET=0xc0000000
 CONFIG_KERNEL_START=0xc0000000
 CONFIG_PHYSICAL_START=0x00000000
 CONFIG_TASK_SIZE=0xc0000000
+# end of Advanced setup
+
 CONFIG_PPC_LIB_RHEAP=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_VHOST_NET=m
@@ -442,6 +478,8 @@ CONFIG_HAVE_PERF_REGS=y
 CONFIG_HAVE_PERF_USER_STACK_DUMP=y
 CONFIG_HAVE_ARCH_JUMP_LABEL=y
 CONFIG_HAVE_RCU_TABLE_FREE=y
+CONFIG_HAVE_RCU_TABLE_NO_INVALIDATE=y
+CONFIG_HAVE_MMU_GATHER_PAGE_SIZE=y
 CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
 CONFIG_ARCH_WEAK_RELEASE_ACQUIRE=y
 CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
@@ -467,15 +505,28 @@ CONFIG_64BIT_TIME=y
 CONFIG_COMPAT_32BIT_TIME=y
 CONFIG_ARCH_HAS_PHYS_TO_DMA=y
 # CONFIG_REFCOUNT_FULL is not set
+# CONFIG_LOCK_EVENT_COUNTS is not set
 
 #
 # GCOV-based kernel profiling
 #
 # CONFIG_GCOV_KERNEL is not set
 CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
+# end of GCOV-based kernel profiling
+
 CONFIG_PLUGIN_HOSTCC="g++"
 CONFIG_HAVE_GCC_PLUGINS=y
-# CONFIG_GCC_PLUGINS is not set
+CONFIG_GCC_PLUGINS=y
+
+#
+# GCC plugins
+#
+# CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set
+# CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
+# CONFIG_GCC_PLUGIN_RANDSTRUCT is not set
+# end of GCC plugins
+# end of General architecture-dependent options
+
 CONFIG_RT_MUTEXES=y
 CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
@@ -489,7 +540,6 @@ CONFIG_MODVERSIONS=y
 # CONFIG_TRIM_UNUSED_KSYMS is not set
 CONFIG_MODULES_TREE_LOOKUP=y
 CONFIG_BLOCK=y
-CONFIG_LBDAF=y
 CONFIG_BLK_SCSI_REQUEST=y
 CONFIG_BLK_DEV_BSG=y
 CONFIG_BLK_DEV_BSGLIB=y
@@ -529,6 +579,8 @@ CONFIG_LDM_PARTITION=y
 CONFIG_EFI_PARTITION=y
 # CONFIG_SYSV68_PARTITION is not set
 CONFIG_CMDLINE_PARTITION=y
+# end of Partition Types
+
 CONFIG_BLK_MQ_PCI=y
 CONFIG_BLK_MQ_VIRTIO=y
 CONFIG_BLK_MQ_RDMA=y
@@ -541,6 +593,9 @@ CONFIG_MQ_IOSCHED_DEADLINE=y
 CONFIG_MQ_IOSCHED_KYBER=y
 CONFIG_IOSCHED_BFQ=y
 CONFIG_BFQ_GROUP_IOSCHED=y
+# CONFIG_BFQ_CGROUP_DEBUG is not set
+# end of IO Schedulers
+
 CONFIG_ASN1=y
 CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
 CONFIG_INLINE_READ_UNLOCK=y
@@ -562,6 +617,7 @@ CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 CONFIG_BINFMT_SCRIPT=y
 CONFIG_BINFMT_MISC=m
 CONFIG_COREDUMP=y
+# end of Executable file formats
 
 #
 # Memory Management options
@@ -569,7 +625,8 @@ CONFIG_COREDUMP=y
 CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
-CONFIG_HAVE_GENERIC_GUP=y
+CONFIG_HAVE_FAST_GUP=y
+CONFIG_ARCH_KEEP_MEMBLOCK=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_MEMORY_BALLOON=y
 CONFIG_BALLOON_COMPACTION=y
@@ -593,6 +650,8 @@ CONFIG_FRAME_VECTOR=y
 # CONFIG_PERCPU_STATS is not set
 # CONFIG_GUP_BENCHMARK is not set
 CONFIG_ARCH_HAS_PTE_SPECIAL=y
+# end of Memory Management options
+
 CONFIG_NET=y
 CONFIG_NET_INGRESS=y
 CONFIG_NET_EGRESS=y
@@ -652,9 +711,6 @@ CONFIG_INET_ESP_OFFLOAD=m
 CONFIG_INET_IPCOMP=m
 CONFIG_INET_XFRM_TUNNEL=m
 CONFIG_INET_TUNNEL=m
-CONFIG_INET_XFRM_MODE_TRANSPORT=m
-CONFIG_INET_XFRM_MODE_TUNNEL=m
-CONFIG_INET_XFRM_MODE_BEET=m
 CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 CONFIG_INET_UDP_DIAG=m
@@ -693,10 +749,6 @@ CONFIG_IPV6_MIP6=y
 CONFIG_IPV6_ILA=m
 CONFIG_INET6_XFRM_TUNNEL=m
 CONFIG_INET6_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-CONFIG_INET6_XFRM_MODE_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_BEET=m
-CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
 CONFIG_IPV6_VTI=m
 CONFIG_IPV6_SIT=m
 CONFIG_IPV6_SIT_6RD=y
@@ -764,7 +816,6 @@ CONFIG_NF_CT_NETLINK_TIMEOUT=m
 CONFIG_NF_CT_NETLINK_HELPER=m
 CONFIG_NETFILTER_NETLINK_GLUE_CT=y
 CONFIG_NF_NAT=m
-CONFIG_NF_NAT_NEEDED=y
 CONFIG_NF_NAT_AMANDA=m
 CONFIG_NF_NAT_FTP=m
 CONFIG_NF_NAT_IRC=m
@@ -801,6 +852,7 @@ CONFIG_NFT_XFRM=m
 CONFIG_NFT_SOCKET=m
 CONFIG_NFT_OSF=m
 CONFIG_NFT_TPROXY=m
+# CONFIG_NFT_SYNPROXY is not set
 CONFIG_NF_DUP_NETDEV=m
 CONFIG_NFT_DUP_NETDEV=m
 CONFIG_NFT_FWD_NETDEV=m
@@ -839,6 +891,7 @@ CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 # CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
 CONFIG_NETFILTER_XT_TARGET_RATEEST=m
 CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
+CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m
 CONFIG_NETFILTER_XT_TARGET_TEE=m
 CONFIG_NETFILTER_XT_TARGET_TPROXY=m
 CONFIG_NETFILTER_XT_TARGET_TRACE=m
@@ -895,6 +948,8 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m
 CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
 CONFIG_NETFILTER_XT_MATCH_TIME=m
 CONFIG_NETFILTER_XT_MATCH_U32=m
+# end of Core Netfilter Configuration
+
 CONFIG_IP_SET=m
 CONFIG_IP_SET_MAX=256
 CONFIG_IP_SET_BITMAP_IP=m
@@ -969,7 +1024,6 @@ CONFIG_NF_DEFRAG_IPV4=m
 CONFIG_NF_SOCKET_IPV4=m
 CONFIG_NF_TPROXY_IPV4=m
 CONFIG_NF_TABLES_IPV4=y
-CONFIG_NFT_CHAIN_ROUTE_IPV4=m
 CONFIG_NFT_REJECT_IPV4=m
 CONFIG_NFT_DUP_IPV4=m
 CONFIG_NFT_FIB_IPV4=m
@@ -1003,6 +1057,7 @@ CONFIG_IP_NF_SECURITY=m
 CONFIG_IP_NF_ARPTABLES=m
 CONFIG_IP_NF_ARPFILTER=m
 CONFIG_IP_NF_ARP_MANGLE=m
+# end of IP: Netfilter Configuration
 
 #
 # IPv6: Netfilter Configuration
@@ -1010,7 +1065,6 @@ CONFIG_IP_NF_ARP_MANGLE=m
 CONFIG_NF_SOCKET_IPV6=m
 CONFIG_NF_TPROXY_IPV6=m
 CONFIG_NF_TABLES_IPV6=y
-CONFIG_NFT_CHAIN_ROUTE_IPV6=m
 CONFIG_NFT_REJECT_IPV6=m
 CONFIG_NFT_DUP_IPV6=m
 CONFIG_NFT_FIB_IPV6=m
@@ -1039,15 +1093,21 @@ CONFIG_IP6_NF_SECURITY=m
 CONFIG_IP6_NF_NAT=m
 CONFIG_IP6_NF_TARGET_MASQUERADE=m
 CONFIG_IP6_NF_TARGET_NPT=m
+# end of IPv6: Netfilter Configuration
+
 CONFIG_NF_DEFRAG_IPV6=m
 
 #
 # DECnet: Netfilter Configuration
 #
 CONFIG_DECNET_NF_GRABULATOR=m
-CONFIG_NF_TABLES_BRIDGE=y
+# end of DECnet: Netfilter Configuration
+
+CONFIG_NF_TABLES_BRIDGE=m
+# CONFIG_NFT_BRIDGE_META is not set
 CONFIG_NFT_BRIDGE_REJECT=m
 CONFIG_NF_LOG_BRIDGE=m
+# CONFIG_NF_CONNTRACK_BRIDGE is not set
 CONFIG_BRIDGE_NF_EBTABLES=m
 CONFIG_BRIDGE_EBT_BROUTE=m
 CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -1080,11 +1140,14 @@ CONFIG_INET_DCCP_DIAG=m
 CONFIG_IP_DCCP_CCID3=y
 # CONFIG_IP_DCCP_CCID3_DEBUG is not set
 CONFIG_IP_DCCP_TFRC_LIB=y
+# end of DCCP CCIDs Configuration
 
 #
 # DCCP Kernel Hacking
 #
 # CONFIG_IP_DCCP_DEBUG is not set
+# end of DCCP Kernel Hacking
+
 CONFIG_IP_SCTP=m
 # CONFIG_SCTP_DBG_OBJCNT is not set
 CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5=y
@@ -1233,16 +1296,18 @@ CONFIG_NET_ACT_PEDIT=m
 CONFIG_NET_ACT_SIMP=m
 CONFIG_NET_ACT_SKBEDIT=m
 CONFIG_NET_ACT_CSUM=m
+# CONFIG_NET_ACT_MPLS is not set
 CONFIG_NET_ACT_VLAN=m
 CONFIG_NET_ACT_BPF=m
 CONFIG_NET_ACT_CONNMARK=m
+# CONFIG_NET_ACT_CTINFO is not set
 CONFIG_NET_ACT_SKBMOD=m
 CONFIG_NET_ACT_IFE=m
 CONFIG_NET_ACT_TUNNEL_KEY=m
+# CONFIG_NET_ACT_CT is not set
 CONFIG_NET_IFE_SKBMARK=m
 CONFIG_NET_IFE_SKBPRIO=m
 CONFIG_NET_IFE_SKBTCINDEX=m
-CONFIG_NET_CLS_IND=y
 CONFIG_NET_SCH_FIFO=y
 CONFIG_DCB=y
 CONFIG_DNS_RESOLVER=m
@@ -1254,6 +1319,7 @@ CONFIG_BATMAN_ADV_NC=y
 CONFIG_BATMAN_ADV_MCAST=y
 CONFIG_BATMAN_ADV_DEBUGFS=y
 # CONFIG_BATMAN_ADV_DEBUG is not set
+CONFIG_BATMAN_ADV_SYSFS=y
 # CONFIG_BATMAN_ADV_TRACING is not set
 CONFIG_OPENVSWITCH=m
 CONFIG_OPENVSWITCH_GRE=m
@@ -1289,6 +1355,9 @@ CONFIG_NET_FLOW_LIMIT=y
 #
 CONFIG_NET_PKTGEN=m
 CONFIG_NET_DROP_MONITOR=m
+# end of Network testing
+# end of Networking options
+
 CONFIG_HAMRADIO=y
 
 #
@@ -1310,6 +1379,8 @@ CONFIG_BAYCOM_SER_HDX=m
 CONFIG_BAYCOM_PAR=m
 CONFIG_BAYCOM_EPP=m
 CONFIG_YAM=m
+# end of AX.25 network device drivers
+
 CONFIG_CAN=m
 CONFIG_CAN_RAW=m
 CONFIG_CAN_BCM=m
@@ -1349,6 +1420,7 @@ CONFIG_CAN_SOFTING_CS=m
 #
 # CONFIG_CAN_HI311X is not set
 # CONFIG_CAN_MCP251X is not set
+# end of CAN SPI interfaces
 
 #
 # CAN USB interfaces
@@ -1361,7 +1433,11 @@ CONFIG_CAN_KVASER_USB=m
 CONFIG_CAN_MCBA_USB=m
 CONFIG_CAN_PEAK_USB=m
 CONFIG_CAN_UCAN=m
+# end of CAN USB interfaces
+
 # CONFIG_CAN_DEBUG_DEVICES is not set
+# end of CAN Device Drivers
+
 CONFIG_BT=m
 CONFIG_BT_BREDR=y
 CONFIG_BT_RFCOMM=m
@@ -1388,6 +1464,7 @@ CONFIG_BT_QCA=m
 CONFIG_BT_HCIBTUSB=m
 CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
 CONFIG_BT_HCIBTUSB_BCM=y
+# CONFIG_BT_HCIBTUSB_MTK is not set
 CONFIG_BT_HCIBTUSB_RTL=y
 CONFIG_BT_HCIBTSDIO=m
 CONFIG_BT_HCIUART=m
@@ -1410,8 +1487,11 @@ CONFIG_BT_HCIVHCI=m
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
 CONFIG_BT_ATH3K=m
+CONFIG_BT_MTKSDIO=m
 CONFIG_BT_MTKUART=m
 CONFIG_BT_HCIRSI=m
+# end of Bluetooth device drivers
+
 CONFIG_AF_RXRPC=m
 CONFIG_AF_RXRPC_IPV6=y
 # CONFIG_AF_RXRPC_INJECT_LOSS is not set
@@ -1483,6 +1563,8 @@ CONFIG_NFC_PN533=m
 CONFIG_NFC_PN533_USB=m
 # CONFIG_NFC_PN533_I2C is not set
 # CONFIG_NFC_ST95HF is not set
+# end of Near Field Communication (NFC) devices
+
 CONFIG_PSAMPLE=m
 CONFIG_NET_IFE=m
 CONFIG_LWTUNNEL=y
@@ -1537,6 +1619,8 @@ CONFIG_PCI_IOV=y
 # Cadence PCIe controllers support
 #
 # CONFIG_PCIE_CADENCE_HOST is not set
+# end of Cadence PCIe controllers support
+
 # CONFIG_PCI_FTPCI100 is not set
 # CONFIG_PCI_HOST_GENERIC is not set
 # CONFIG_PCIE_XILINX is not set
@@ -1544,16 +1628,21 @@ CONFIG_PCI_IOV=y
 #
 # DesignWare PCI Core Support
 #
+# end of DesignWare PCI Core Support
+# end of PCI controller drivers
 
 #
 # PCI Endpoint
 #
 # CONFIG_PCI_ENDPOINT is not set
+# end of PCI Endpoint
 
 #
 # PCI switch controller drivers
 #
 # CONFIG_PCI_SW_SWITCHTEC is not set
+# end of PCI switch controller drivers
+
 CONFIG_PCCARD=m
 CONFIG_PCMCIA=m
 CONFIG_PCMCIA_LOAD_CIS=y
@@ -1588,6 +1677,9 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
 CONFIG_EXTRA_FIRMWARE=""
 # CONFIG_FW_LOADER_USER_HELPER is not set
+# CONFIG_FW_LOADER_COMPRESS is not set
+# end of Firmware loader
+
 CONFIG_WANT_DEV_COREDUMP=y
 CONFIG_ALLOW_DEV_COREDUMP=y
 CONFIG_DEV_COREDUMP=y
@@ -1602,11 +1694,14 @@ CONFIG_REGMAP_SPI=y
 CONFIG_REGMAP_IRQ=y
 CONFIG_DMA_SHARED_BUFFER=y
 # CONFIG_DMA_FENCE_TRACE is not set
+# end of Generic Driver Options
 
 #
 # Bus devices
 #
 # CONFIG_SIMPLE_PM_BUS is not set
+# end of Bus devices
+
 CONFIG_CONNECTOR=y
 CONFIG_PROC_EVENTS=y
 CONFIG_GNSS=m
@@ -1680,6 +1775,7 @@ CONFIG_NVME_TARGET_RDMA=m
 CONFIG_NVME_TARGET_FC=m
 # CONFIG_NVME_TARGET_FCLOOP is not set
 CONFIG_NVME_TARGET_TCP=m
+# end of NVME Support
 
 #
 # Misc devices
@@ -1704,10 +1800,10 @@ CONFIG_SENSORS_BH1770=m
 CONFIG_SENSORS_APDS990X=m
 CONFIG_HMC6352=m
 CONFIG_DS1682=m
-# CONFIG_USB_SWITCH_FSA9480 is not set
 # CONFIG_LATTICE_ECP3_CONFIG is not set
 # CONFIG_SRAM is not set
 # CONFIG_PCI_ENDPOINT_TEST is not set
+# CONFIG_XILINX_SDFEC is not set
 CONFIG_MISC_RTSX=m
 CONFIG_PVPANIC=m
 CONFIG_C2PORT=m
@@ -1723,6 +1819,8 @@ CONFIG_EEPROM_93CX6=m
 # CONFIG_EEPROM_93XX46 is not set
 # CONFIG_EEPROM_IDT_89HPESX is not set
 CONFIG_EEPROM_EE1004=m
+# end of EEPROM support
+
 CONFIG_CB710_CORE=m
 # CONFIG_CB710_DEBUG is not set
 CONFIG_CB710_DEBUG_ASSUMPTIONS=y
@@ -1730,6 +1828,8 @@ CONFIG_CB710_DEBUG_ASSUMPTIONS=y
 #
 # Texas Instruments shared transport line discipline
 #
+# end of Texas Instruments shared transport line discipline
+
 # CONFIG_SENSORS_LIS3_SPI is not set
 CONFIG_SENSORS_LIS3_I2C=m
 CONFIG_ALTERA_STAPL=m
@@ -1772,11 +1872,15 @@ CONFIG_VOP_BUS=m
 #
 CONFIG_VOP=m
 CONFIG_VHOST_RING=m
+# end of Intel MIC & related support
+
 # CONFIG_ECHO is not set
 CONFIG_MISC_ALCOR_PCI=m
 CONFIG_MISC_RTSX_PCI=m
 CONFIG_MISC_RTSX_USB=m
 CONFIG_HABANA_AI=m
+# end of Misc devices
+
 CONFIG_HAVE_IDE=y
 # CONFIG_IDE is not set
 
@@ -1795,7 +1899,6 @@ CONFIG_SCSI_NETLINK=y
 #
 CONFIG_BLK_DEV_SD=m
 CONFIG_CHR_DEV_ST=m
-CONFIG_CHR_DEV_OSST=m
 CONFIG_BLK_DEV_SR=m
 CONFIG_BLK_DEV_SR_VENDOR=y
 CONFIG_CHR_DEV_SG=m
@@ -1816,6 +1919,8 @@ CONFIG_SCSI_SAS_LIBSAS=m
 CONFIG_SCSI_SAS_ATA=y
 CONFIG_SCSI_SAS_HOST_SMP=y
 CONFIG_SCSI_SRP_ATTRS=m
+# end of SCSI Transports
+
 CONFIG_SCSI_LOWLEVEL=y
 CONFIG_ISCSI_TCP=m
 CONFIG_ISCSI_BOOT_SYSFS=m
@@ -1877,6 +1982,7 @@ CONFIG_FCOE=m
 CONFIG_SCSI_SNIC=m
 # CONFIG_SCSI_SNIC_DEBUG_FS is not set
 CONFIG_SCSI_DMX3191D=m
+# CONFIG_SCSI_FDOMAIN_PCI is not set
 # CONFIG_SCSI_GDTH is not set
 CONFIG_SCSI_IPS=m
 # CONFIG_SCSI_INITIO is not set
@@ -1917,6 +2023,7 @@ CONFIG_SCSI_VIRTIO=m
 CONFIG_SCSI_CHELSIO_FCOE=m
 CONFIG_SCSI_LOWLEVEL_PCMCIA=y
 CONFIG_PCMCIA_AHA152X=m
+# CONFIG_PCMCIA_FDOMAIN is not set
 CONFIG_PCMCIA_NINJA_SCSI=m
 CONFIG_PCMCIA_QLOGIC=m
 CONFIG_PCMCIA_SYM53C500=m
@@ -1925,6 +2032,8 @@ CONFIG_SCSI_DH_RDAC=m
 CONFIG_SCSI_DH_HP_SW=m
 CONFIG_SCSI_DH_EMC=m
 CONFIG_SCSI_DH_ALUA=m
+# end of SCSI device support
+
 CONFIG_ATA=m
 CONFIG_ATA_VERBOSE_ERROR=y
 CONFIG_SATA_PMP=y
@@ -2056,6 +2165,7 @@ CONFIG_DM_MULTIPATH=m
 CONFIG_DM_MULTIPATH_QL=m
 CONFIG_DM_MULTIPATH_ST=m
 CONFIG_DM_DELAY=m
+CONFIG_DM_DUST=m
 CONFIG_DM_UEVENT=y
 CONFIG_DM_FLAKEY=m
 CONFIG_DM_VERITY=m
@@ -2091,6 +2201,8 @@ CONFIG_FIREWIRE_OHCI=m
 CONFIG_FIREWIRE_SBP2=m
 CONFIG_FIREWIRE_NET=m
 CONFIG_FIREWIRE_NOSY=m
+# end of IEEE 1394 (FireWire) support
+
 CONFIG_MACINTOSH_DRIVERS=y
 CONFIG_ADB=y
 CONFIG_ADB_CUDA=y
@@ -2201,6 +2313,8 @@ CONFIG_ATM_SOLOS=m
 #
 # Distributed Switch Architecture drivers
 #
+# end of Distributed Switch Architecture drivers
+
 CONFIG_ETHERNET=y
 CONFIG_MDIO=m
 CONFIG_NET_VENDOR_3COM=y
@@ -2308,6 +2422,8 @@ CONFIG_FEC_MPC52xx_MDIO=y
 # CONFIG_GIANFAR is not set
 CONFIG_NET_VENDOR_FUJITSU=y
 CONFIG_PCMCIA_FMVJ18X=m
+CONFIG_NET_VENDOR_GOOGLE=y
+# CONFIG_GVE is not set
 CONFIG_NET_VENDOR_HP=y
 # CONFIG_HP100 is not set
 CONFIG_NET_VENDOR_HUAWEI=y
@@ -2357,7 +2473,7 @@ CONFIG_MLX5_EN_RXNFC=y
 CONFIG_MLX5_MPFS=y
 CONFIG_MLX5_CORE_EN_DCB=y
 CONFIG_MLX5_CORE_IPOIB=y
-# CONFIG_MLX5_EN_IPSEC is not set
+# CONFIG_MLX5_FPGA_IPSEC is not set
 # CONFIG_MLXSW_CORE is not set
 CONFIG_MLXFW=m
 CONFIG_NET_VENDOR_MICREL=y
@@ -2461,7 +2577,6 @@ CONFIG_NET_VENDOR_TEHUTI=y
 CONFIG_TEHUTI=m
 CONFIG_NET_VENDOR_TI=y
 # CONFIG_TI_CPSW_PHY_SEL is not set
-# CONFIG_TI_CPSW_ALE is not set
 CONFIG_TLAN=m
 CONFIG_NET_VENDOR_VIA=y
 CONFIG_VIA_RHINE=m
@@ -2524,6 +2639,7 @@ CONFIG_MICROCHIP_PHY=m
 CONFIG_MICROCHIP_T1_PHY=m
 CONFIG_MICROSEMI_PHY=m
 CONFIG_NATIONAL_PHY=m
+# CONFIG_NXP_TJA11XX_PHY is not set
 CONFIG_QSEMI_PHY=m
 CONFIG_REALTEK_PHY=m
 CONFIG_RENESAS_PHY=m
@@ -2716,6 +2832,8 @@ CONFIG_IWL3945=m
 # iwl3945 / iwl4965 Debugging Options
 #
 # CONFIG_IWLEGACY_DEBUG is not set
+# end of iwl3945 / iwl4965 Debugging Options
+
 CONFIG_IWLWIFI=m
 CONFIG_IWLWIFI_LEDS=y
 CONFIG_IWLDVM=m
@@ -2729,6 +2847,8 @@ CONFIG_IWLWIFI_OPMODE_MODULAR=y
 #
 # CONFIG_IWLWIFI_DEBUG is not set
 # CONFIG_IWLWIFI_DEVICE_TRACING is not set
+# end of Debugging Options
+
 CONFIG_WLAN_VENDOR_INTERSIL=y
 CONFIG_HOSTAP=m
 CONFIG_HOSTAP_FIRMWARE=y
@@ -2782,6 +2902,7 @@ CONFIG_MT76x2_COMMON=m
 CONFIG_MT76x2E=m
 CONFIG_MT76x2U=m
 CONFIG_MT7603E=m
+CONFIG_MT7615E=m
 CONFIG_WLAN_VENDOR_RALINK=y
 CONFIG_RT2X00=m
 CONFIG_RT2400PCI=m
@@ -2834,6 +2955,13 @@ CONFIG_RTL8723_COMMON=m
 CONFIG_RTLBTCOEXIST=m
 CONFIG_RTL8XXXU=m
 # CONFIG_RTL8XXXU_UNTESTED is not set
+CONFIG_RTW88=m
+CONFIG_RTW88_CORE=m
+CONFIG_RTW88_PCI=m
+CONFIG_RTW88_8822BE=y
+CONFIG_RTW88_8822CE=y
+# CONFIG_RTW88_DEBUG is not set
+# CONFIG_RTW88_DEBUGFS is not set
 CONFIG_WLAN_VENDOR_RSI=y
 CONFIG_RSI_91X=m
 CONFIG_RSI_DEBUGFS=y
@@ -2862,6 +2990,8 @@ CONFIG_VIRT_WIFI=m
 CONFIG_WIMAX_I2400M=m
 CONFIG_WIMAX_I2400M_USB=m
 CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
+# end of WiMAX Wireless Broadband devices
+
 CONFIG_WAN=y
 CONFIG_LANMEDIA=m
 CONFIG_HDLC=m
@@ -2895,30 +3025,10 @@ CONFIG_IEEE802154_HWSIM=m
 # CONFIG_NETDEVSIM is not set
 CONFIG_NET_FAILOVER=m
 CONFIG_ISDN=y
-# CONFIG_ISDN_I4L is not set
 CONFIG_ISDN_CAPI=m
 CONFIG_CAPI_TRACE=y
 CONFIG_ISDN_CAPI_CAPI20=m
 CONFIG_ISDN_CAPI_MIDDLEWARE=y
-
-#
-# CAPI hardware drivers
-#
-CONFIG_CAPI_AVM=y
-CONFIG_ISDN_DRV_AVMB1_B1PCI=m
-CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
-CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
-CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
-CONFIG_ISDN_DRV_AVMB1_T1PCI=m
-CONFIG_ISDN_DRV_AVMB1_C4=m
-CONFIG_ISDN_DRV_GIGASET=m
-CONFIG_GIGASET_CAPI=y
-CONFIG_GIGASET_BASE=m
-CONFIG_GIGASET_M105=m
-CONFIG_GIGASET_M101=m
-# CONFIG_GIGASET_DEBUG is not set
-CONFIG_HYSDN=m
-CONFIG_HYSDN_CAPI=y
 CONFIG_MISDN=m
 CONFIG_MISDN_DSP=m
 CONFIG_MISDN_L1OIP=m
@@ -2967,6 +3077,7 @@ CONFIG_INPUT_KEYBOARD=y
 CONFIG_KEYBOARD_ADP5588=m
 # CONFIG_KEYBOARD_ADP5589 is not set
 CONFIG_KEYBOARD_ATKBD=m
+CONFIG_KEYBOARD_QT1050=m
 # CONFIG_KEYBOARD_QT1070 is not set
 CONFIG_KEYBOARD_QT2160=m
 # CONFIG_KEYBOARD_DLINK_DIR685 is not set
@@ -3024,8 +3135,8 @@ CONFIG_JOYSTICK_INTERACT=m
 CONFIG_JOYSTICK_SIDEWINDER=m
 CONFIG_JOYSTICK_TMDC=m
 CONFIG_JOYSTICK_IFORCE=m
-CONFIG_JOYSTICK_IFORCE_USB=y
-CONFIG_JOYSTICK_IFORCE_232=y
+CONFIG_JOYSTICK_IFORCE_USB=m
+CONFIG_JOYSTICK_IFORCE_232=m
 CONFIG_JOYSTICK_WARRIOR=m
 CONFIG_JOYSTICK_MAGELLAN=m
 CONFIG_JOYSTICK_SPACEORB=m
@@ -3133,6 +3244,7 @@ CONFIG_TOUCHSCREEN_SUR40=m
 CONFIG_TOUCHSCREEN_TPS6507X=m
 # CONFIG_TOUCHSCREEN_ZET6223 is not set
 # CONFIG_TOUCHSCREEN_ROHM_BU21023 is not set
+CONFIG_TOUCHSCREEN_IQS5XX=m
 CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_AD714X is not set
 # CONFIG_INPUT_ATMEL_CAPTOUCH is not set
@@ -3140,6 +3252,7 @@ CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_E3X0_BUTTON is not set
 CONFIG_INPUT_MSM_VIBRATOR=m
 CONFIG_INPUT_PCSPKR=m
+CONFIG_INPUT_MAX77650_ONKEY=m
 # CONFIG_INPUT_MMA8450 is not set
 CONFIG_INPUT_ATI_REMOTE2=m
 CONFIG_INPUT_KEYSPAN_REMOTE=m
@@ -3186,13 +3299,14 @@ CONFIG_SERIO_ALTERA_PS2=m
 # CONFIG_SERIO_PS2MULT is not set
 # CONFIG_SERIO_ARC_PS2 is not set
 # CONFIG_SERIO_APBPS2 is not set
-CONFIG_SERIO_OLPC_APSP=m
 # CONFIG_USERIO is not set
 CONFIG_GAMEPORT=m
 CONFIG_GAMEPORT_NS558=m
 CONFIG_GAMEPORT_L4=m
 CONFIG_GAMEPORT_EMU10K1=m
 CONFIG_GAMEPORT_FM801=m
+# end of Hardware I/O ports
+# end of Input device support
 
 #
 # Character devices
@@ -3211,6 +3325,7 @@ CONFIG_NOZOMI=m
 CONFIG_N_GSM=m
 # CONFIG_TRACE_SINK is not set
 # CONFIG_PPC_EPAPR_HV_BYTECHAN is not set
+CONFIG_NULL_TTY=m
 CONFIG_LDISC_AUTOLOAD=y
 CONFIG_DEVMEM=y
 # CONFIG_DEVKMEM is not set
@@ -3252,6 +3367,7 @@ CONFIG_SERIAL_MPC52xx=y
 CONFIG_SERIAL_MPC52xx_CONSOLE=y
 CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200
 CONFIG_SERIAL_JSM=m
+CONFIG_SERIAL_SIFIVE=m
 # CONFIG_SERIAL_SCCNXP is not set
 # CONFIG_SERIAL_SC16IS7XX is not set
 # CONFIG_SERIAL_ALTERA_JTAGUART is not set
@@ -3262,6 +3378,8 @@ CONFIG_SERIAL_RP2=m
 CONFIG_SERIAL_RP2_NR_UARTS=32
 # CONFIG_SERIAL_FSL_LPUART is not set
 # CONFIG_SERIAL_CONEXANT_DIGICOLOR is not set
+# end of Serial drivers
+
 CONFIG_SERIAL_DEV_BUS=y
 CONFIG_SERIAL_DEV_CTRL_TTYPORT=y
 CONFIG_TTY_PRINTK=m
@@ -3295,10 +3413,14 @@ CONFIG_CARDMAN_4000=m
 CONFIG_CARDMAN_4040=m
 CONFIG_SCR24X=m
 CONFIG_IPWIRELESS=m
+# end of PCMCIA character devices
+
 # CONFIG_RAW_DRIVER is not set
 # CONFIG_TCG_TPM is not set
 CONFIG_DEVPORT=y
 # CONFIG_XILLYBUS is not set
+# end of Character devices
+
 CONFIG_RANDOM_TRUST_CPU=y
 
 #
@@ -3318,6 +3440,8 @@ CONFIG_I2C_MUX=m
 # CONFIG_I2C_MUX_PCA9541 is not set
 # CONFIG_I2C_MUX_REG is not set
 # CONFIG_I2C_MUX_MLXCPLD is not set
+# end of Multiplexer I2C Chip support
+
 CONFIG_I2C_HELPER_AUTO=y
 CONFIG_I2C_SMBUS=m
 CONFIG_I2C_ALGOBIT=y
@@ -3379,11 +3503,15 @@ CONFIG_I2C_VIPERBOARD=m
 #
 # Other I2C/SMBus bus drivers
 #
+# end of I2C Hardware Bus support
+
 # CONFIG_I2C_STUB is not set
 # CONFIG_I2C_SLAVE is not set
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
+# end of I2C support
+
 CONFIG_I3C=m
 CONFIG_CDNS_I3C_MASTER=m
 CONFIG_DW_I3C_MASTER=m
@@ -3447,6 +3575,8 @@ CONFIG_PTP_1588_CLOCK=m
 #
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
+# end of PTP clock support
+
 # CONFIG_PINCTRL is not set
 # CONFIG_GPIOLIB is not set
 CONFIG_W1=m
@@ -3459,6 +3589,7 @@ CONFIG_W1_CON=y
 CONFIG_W1_MASTER_DS2490=m
 CONFIG_W1_MASTER_DS2482=m
 # CONFIG_W1_MASTER_DS1WM is not set
+# end of 1-wire Bus Masters
 
 #
 # 1-wire Slaves
@@ -3480,10 +3611,13 @@ CONFIG_W1_SLAVE_DS2780=m
 CONFIG_W1_SLAVE_DS2781=m
 CONFIG_W1_SLAVE_DS28E04=m
 CONFIG_W1_SLAVE_DS28E17=m
+# end of 1-wire Slaves
+
 # CONFIG_POWER_AVS is not set
 # CONFIG_POWER_RESET is not set
 CONFIG_POWER_SUPPLY=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
+CONFIG_POWER_SUPPLY_HWMON=y
 # CONFIG_PDA_POWER is not set
 # CONFIG_GENERIC_ADC_BATTERY is not set
 # CONFIG_TEST_POWER is not set
@@ -3504,6 +3638,7 @@ CONFIG_BATTERY_BQ27XXX_HDQ=m
 # CONFIG_CHARGER_MAX8903 is not set
 # CONFIG_CHARGER_LP8727 is not set
 # CONFIG_CHARGER_DETECTOR_MAX14656 is not set
+CONFIG_CHARGER_MAX77650=m
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
@@ -3591,7 +3726,6 @@ CONFIG_SENSORS_NTC_THERMISTOR=m
 CONFIG_SENSORS_NCT7802=m
 CONFIG_SENSORS_NCT7904=m
 CONFIG_SENSORS_NPCM7XX=m
-# CONFIG_SENSORS_OCC_P8_I2C is not set
 CONFIG_SENSORS_PCF8591=m
 # CONFIG_PMBUS is not set
 CONFIG_SENSORS_SHT21=m
@@ -3630,7 +3764,7 @@ CONFIG_SENSORS_W83795=m
 # CONFIG_SENSORS_W83795_FANCTRL is not set
 CONFIG_SENSORS_W83L785TS=m
 CONFIG_SENSORS_W83L786NG=m
-CONFIG_THERMAL=m
+CONFIG_THERMAL=y
 CONFIG_THERMAL_STATISTICS=y
 CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
 CONFIG_THERMAL_HWMON=y
@@ -3645,17 +3779,30 @@ CONFIG_THERMAL_GOV_STEP_WISE=y
 # CONFIG_THERMAL_GOV_BANG_BANG is not set
 # CONFIG_THERMAL_GOV_USER_SPACE is not set
 # CONFIG_THERMAL_GOV_POWER_ALLOCATOR is not set
+CONFIG_CPU_THERMAL=y
 # CONFIG_CLOCK_THERMAL is not set
 CONFIG_DEVFREQ_THERMAL=y
 # CONFIG_THERMAL_EMULATION is not set
+CONFIG_THERMAL_MMIO=m
 # CONFIG_QORIQ_THERMAL is not set
 # CONFIG_GENERIC_ADC_THERMAL is not set
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_CORE=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
 CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
+CONFIG_WATCHDOG_OPEN_TIMEOUT=0
 CONFIG_WATCHDOG_SYSFS=y
 
+#
+# Watchdog Pretimeout Governors
+#
+CONFIG_WATCHDOG_PRETIMEOUT_GOV=y
+CONFIG_WATCHDOG_PRETIMEOUT_GOV_SEL=m
+CONFIG_WATCHDOG_PRETIMEOUT_GOV_NOOP=y
+CONFIG_WATCHDOG_PRETIMEOUT_GOV_PANIC=m
+CONFIG_WATCHDOG_PRETIMEOUT_DEFAULT_GOV_NOOP=y
+# CONFIG_WATCHDOG_PRETIMEOUT_DEFAULT_GOV_PANIC is not set
+
 #
 # Watchdog Device Drivers
 #
@@ -3682,15 +3829,6 @@ CONFIG_WDTPCI=m
 # USB-based Watchdog Cards
 #
 CONFIG_USBPCWATCHDOG=m
-
-#
-# Watchdog Pretimeout Governors
-#
-CONFIG_WATCHDOG_PRETIMEOUT_GOV=y
-CONFIG_WATCHDOG_PRETIMEOUT_DEFAULT_GOV_NOOP=y
-# CONFIG_WATCHDOG_PRETIMEOUT_DEFAULT_GOV_PANIC is not set
-CONFIG_WATCHDOG_PRETIMEOUT_GOV_NOOP=y
-CONFIG_WATCHDOG_PRETIMEOUT_GOV_PANIC=m
 CONFIG_SSB_POSSIBLE=y
 CONFIG_SSB=m
 CONFIG_SSB_SPROM=y
@@ -3749,6 +3887,7 @@ CONFIG_LPC_SCH=m
 # CONFIG_MFD_88PM860X is not set
 # CONFIG_MFD_MAX14577 is not set
 # CONFIG_MFD_MAX77620 is not set
+CONFIG_MFD_MAX77650=m
 # CONFIG_MFD_MAX77686 is not set
 # CONFIG_MFD_MAX77693 is not set
 # CONFIG_MFD_MAX77843 is not set
@@ -3809,8 +3948,12 @@ CONFIG_MFD_TQMX86=m
 # CONFIG_MFD_WM8350_I2C is not set
 # CONFIG_MFD_WM8994 is not set
 # CONFIG_MFD_ROHM_BD718XX is not set
+# CONFIG_MFD_ROHM_BD70528 is not set
 CONFIG_MFD_STPMIC1=m
+CONFIG_MFD_STMFX=m
 # CONFIG_RAVE_SP_CORE is not set
+# end of Multifunction device drivers
+
 # CONFIG_REGULATOR is not set
 CONFIG_CEC_CORE=m
 CONFIG_RC_CORE=m
@@ -3857,7 +4000,7 @@ CONFIG_MEDIA_SDR_SUPPORT=y
 CONFIG_MEDIA_CEC_SUPPORT=y
 # CONFIG_MEDIA_CEC_RC is not set
 CONFIG_MEDIA_CONTROLLER=y
-# CONFIG_MEDIA_CONTROLLER_DVB is not set
+CONFIG_MEDIA_CONTROLLER_DVB=y
 CONFIG_VIDEO_DEV=m
 # CONFIG_VIDEO_V4L2_SUBDEV_API is not set
 CONFIG_VIDEO_V4L2=m
@@ -3987,6 +4130,7 @@ CONFIG_DVB_USB_DIBUSB_MC=m
 CONFIG_DVB_USB_DIB0700=m
 CONFIG_DVB_USB_UMT_010=m
 CONFIG_DVB_USB_CXUSB=m
+# CONFIG_DVB_USB_CXUSB_ANALOG is not set
 CONFIG_DVB_USB_M920X=m
 CONFIG_DVB_USB_DIGITV=m
 CONFIG_DVB_USB_VP7045=m
@@ -4160,6 +4304,7 @@ CONFIG_USB_MA901=m
 #
 # Texas Instruments WL128x FM driver (ST based)
 #
+# end of Texas Instruments WL128x FM driver (ST based)
 
 #
 # Supported FireWire (IEEE 1394) Adapters
@@ -4196,6 +4341,10 @@ CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
 CONFIG_MEDIA_ATTACH=y
 CONFIG_VIDEO_IR_I2C=m
 
+#
+# I2C Encoders, decoders, sensors and other helper chips
+#
+
 #
 # Audio decoders, processors and mixers
 #
@@ -4208,6 +4357,7 @@ CONFIG_VIDEO_MSP3400=m
 CONFIG_VIDEO_CS3308=m
 CONFIG_VIDEO_CS5345=m
 CONFIG_VIDEO_CS53L32A=m
+# CONFIG_VIDEO_TLV320AIC23B is not set
 CONFIG_VIDEO_UDA1342=m
 CONFIG_VIDEO_WM8775=m
 CONFIG_VIDEO_WM8739=m
@@ -4222,11 +4372,22 @@ CONFIG_VIDEO_SAA6588=m
 #
 # Video decoders
 #
+# CONFIG_VIDEO_ADV7183 is not set
+# CONFIG_VIDEO_BT819 is not set
+# CONFIG_VIDEO_BT856 is not set
+# CONFIG_VIDEO_BT866 is not set
+# CONFIG_VIDEO_KS0127 is not set
+# CONFIG_VIDEO_ML86V7667 is not set
+# CONFIG_VIDEO_SAA7110 is not set
 CONFIG_VIDEO_SAA711X=m
+# CONFIG_VIDEO_TVP514X is not set
 CONFIG_VIDEO_TVP5150=m
+# CONFIG_VIDEO_TVP7002 is not set
 CONFIG_VIDEO_TW2804=m
 CONFIG_VIDEO_TW9903=m
 CONFIG_VIDEO_TW9906=m
+# CONFIG_VIDEO_TW9910 is not set
+# CONFIG_VIDEO_VPX3220 is not set
 
 #
 # Video and audio decoders
@@ -4238,18 +4399,47 @@ CONFIG_VIDEO_CX25840=m
 # Video encoders
 #
 CONFIG_VIDEO_SAA7127=m
+# CONFIG_VIDEO_SAA7185 is not set
+# CONFIG_VIDEO_ADV7170 is not set
+# CONFIG_VIDEO_ADV7175 is not set
+# CONFIG_VIDEO_ADV7343 is not set
+# CONFIG_VIDEO_ADV7393 is not set
+# CONFIG_VIDEO_AK881X is not set
+# CONFIG_VIDEO_THS8200 is not set
 
 #
 # Camera sensor devices
 #
 CONFIG_VIDEO_OV2640=m
+# CONFIG_VIDEO_OV2659 is not set
+# CONFIG_VIDEO_OV2680 is not set
+# CONFIG_VIDEO_OV2685 is not set
+# CONFIG_VIDEO_OV6650 is not set
+# CONFIG_VIDEO_OV5695 is not set
+# CONFIG_VIDEO_OV772X is not set
 CONFIG_VIDEO_OV7640=m
 CONFIG_VIDEO_OV7670=m
+# CONFIG_VIDEO_OV7740 is not set
+# CONFIG_VIDEO_OV9640 is not set
+# CONFIG_VIDEO_VS6624 is not set
+# CONFIG_VIDEO_MT9M111 is not set
+# CONFIG_VIDEO_MT9T112 is not set
 CONFIG_VIDEO_MT9V011=m
+# CONFIG_VIDEO_MT9V111 is not set
+# CONFIG_VIDEO_SR030PC30 is not set
+# CONFIG_VIDEO_RJ54N1 is not set
+
+#
+# Lens drivers
+#
+# CONFIG_VIDEO_AD5820 is not set
 
 #
 # Flash devices
 #
+# CONFIG_VIDEO_ADP1653 is not set
+# CONFIG_VIDEO_LM3560 is not set
+# CONFIG_VIDEO_LM3646 is not set
 
 #
 # Video improvement chips
@@ -4265,17 +4455,32 @@ CONFIG_VIDEO_SAA6752HS=m
 #
 # SDR tuner chips
 #
+# CONFIG_SDR_MAX2175 is not set
 
 #
 # Miscellaneous helper chips
 #
+# CONFIG_VIDEO_THS7303 is not set
 CONFIG_VIDEO_M52790=m
+# CONFIG_VIDEO_I2C is not set
+# end of I2C Encoders, decoders, sensors and other helper chips
+
+#
+# SPI helper chips
+#
+# end of SPI helper chips
 
 #
 # Media SPI Adapters
 #
 # CONFIG_CXD2880_SPI_DRV is not set
+# end of Media SPI Adapters
+
 CONFIG_MEDIA_TUNER=m
+
+#
+# Customize TV tuners
+#
 CONFIG_MEDIA_TUNER_SIMPLE=m
 CONFIG_MEDIA_TUNER_TDA18250=m
 CONFIG_MEDIA_TUNER_TDA8290=m
@@ -4313,6 +4518,11 @@ CONFIG_MEDIA_TUNER_R820T=m
 CONFIG_MEDIA_TUNER_MXL301RF=m
 CONFIG_MEDIA_TUNER_QM1D1C0042=m
 CONFIG_MEDIA_TUNER_QM1D1B0004=m
+# end of Customize TV tuners
+
+#
+# Customise DVB Frontends
+#
 
 #
 # Multistandard (satellite) frontends
@@ -4373,6 +4583,7 @@ CONFIG_DVB_SP8870=m
 CONFIG_DVB_SP887X=m
 CONFIG_DVB_CX22700=m
 CONFIG_DVB_CX22702=m
+# CONFIG_DVB_S5H1432 is not set
 CONFIG_DVB_DRXD=m
 CONFIG_DVB_L64781=m
 CONFIG_DVB_TDA1004X=m
@@ -4383,6 +4594,7 @@ CONFIG_DVB_DIB3000MB=m
 CONFIG_DVB_DIB3000MC=m
 CONFIG_DVB_DIB7000M=m
 CONFIG_DVB_DIB7000P=m
+# CONFIG_DVB_DIB9000 is not set
 CONFIG_DVB_TDA10048=m
 CONFIG_DVB_AF9013=m
 CONFIG_DVB_EC100=m
@@ -4396,6 +4608,7 @@ CONFIG_DVB_SI2168=m
 CONFIG_DVB_AS102_FE=m
 CONFIG_DVB_ZD1301_DEMOD=m
 CONFIG_DVB_GP8PSK_FE=m
+# CONFIG_DVB_CXD2880 is not set
 
 #
 # DVB-C (cable) frontends
@@ -4433,6 +4646,7 @@ CONFIG_DVB_MB86A20S=m
 # ISDB-S (satellite) & ISDB-T (terrestrial) frontends
 #
 CONFIG_DVB_TC90522=m
+# CONFIG_DVB_MN88443X is not set
 
 #
 # Digital terrestrial only tuners/PLL
@@ -4446,12 +4660,14 @@ CONFIG_DVB_TUNER_DIB0090=m
 #
 CONFIG_DVB_DRX39XYJ=m
 CONFIG_DVB_LNBH25=m
+# CONFIG_DVB_LNBH29 is not set
 CONFIG_DVB_LNBP21=m
 CONFIG_DVB_LNBP22=m
 CONFIG_DVB_ISL6405=m
 CONFIG_DVB_ISL6421=m
 CONFIG_DVB_ISL6423=m
 CONFIG_DVB_A8293=m
+# CONFIG_DVB_LGS8GL5 is not set
 CONFIG_DVB_LGS8GXX=m
 CONFIG_DVB_ATBM8830=m
 CONFIG_DVB_TDA665x=m
@@ -4472,6 +4688,7 @@ CONFIG_DVB_SP2=m
 # Tools to develop new frontends
 #
 CONFIG_DVB_DUMMY_FE=m
+# end of Customise DVB Frontends
 
 #
 # Graphics support
@@ -4491,8 +4708,10 @@ CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 # CONFIG_DRM_DP_CEC is not set
 CONFIG_DRM_TTM=m
+CONFIG_DRM_VRAM_HELPER=m
 CONFIG_DRM_GEM_CMA_HELPER=y
 CONFIG_DRM_KMS_CMA_HELPER=y
+CONFIG_DRM_GEM_SHMEM_HELPER=y
 CONFIG_DRM_VM=y
 CONFIG_DRM_SCHED=m
 
@@ -4503,11 +4722,14 @@ CONFIG_DRM_I2C_CH7006=m
 CONFIG_DRM_I2C_SIL164=m
 # CONFIG_DRM_I2C_NXP_TDA998X is not set
 # CONFIG_DRM_I2C_NXP_TDA9950 is not set
+# end of I2C encoder or helper chips
 
 #
 # ARM devices
 #
 CONFIG_DRM_KOMEDA=m
+# end of ARM devices
+
 CONFIG_DRM_RADEON=m
 CONFIG_DRM_RADEON_USERPTR=y
 # CONFIG_DRM_AMDGPU is not set
@@ -4515,10 +4737,8 @@ CONFIG_DRM_RADEON_USERPTR=y
 #
 # ACP (Audio CoProcessor) Configuration
 #
+# end of ACP (Audio CoProcessor) Configuration
 
-#
-# AMD Library routines
-#
 CONFIG_DRM_NOUVEAU=m
 CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT=y
 CONFIG_NOUVEAU_DEBUG=5
@@ -4527,6 +4747,7 @@ CONFIG_NOUVEAU_DEBUG_DEFAULT=3
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 CONFIG_DRM_VGEM=m
 # CONFIG_DRM_VKMS is not set
+CONFIG_DRM_ATI_PCIGART=y
 CONFIG_DRM_UDL=m
 # CONFIG_DRM_AST is not set
 # CONFIG_DRM_MGAG200 is not set
@@ -4547,9 +4768,12 @@ CONFIG_DRM_PANEL=y
 # CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set
 # CONFIG_DRM_PANEL_LG_LG4573 is not set
 # CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6E63M0 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set
 # CONFIG_DRM_PANEL_SEIKO_43WVF1G is not set
 # CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
+# end of Display Panels
+
 CONFIG_DRM_BRIDGE=y
 CONFIG_DRM_PANEL_BRIDGE=y
 
@@ -4572,6 +4796,8 @@ CONFIG_DRM_PANEL_BRIDGE=y
 # CONFIG_DRM_TI_TFP410 is not set
 # CONFIG_DRM_TI_SN65DSI86 is not set
 # CONFIG_DRM_I2C_ADV7511 is not set
+# end of Display Interface Bridges
+
 CONFIG_DRM_ETNAVIV=m
 CONFIG_DRM_ETNAVIV_THERMAL=y
 # CONFIG_DRM_ARCPGU is not set
@@ -4678,7 +4904,11 @@ CONFIG_FB_MB862XX_PCI_GDC=y
 CONFIG_FB_MB862XX_I2C=y
 # CONFIG_FB_SIMPLE is not set
 # CONFIG_FB_SM712 is not set
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
+# end of Frame buffer Devices
+
+#
+# Backlight & LCD device support
+#
 # CONFIG_LCD_CLASS_DEVICE is not set
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # CONFIG_BACKLIGHT_GENERIC is not set
@@ -4689,6 +4919,8 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # CONFIG_BACKLIGHT_LV5207LP is not set
 # CONFIG_BACKLIGHT_BD6107 is not set
 # CONFIG_BACKLIGHT_ARCXCNN is not set
+# end of Backlight & LCD device support
+
 CONFIG_VGASTATE=m
 CONFIG_VIDEOMODE_HELPERS=y
 CONFIG_HDMI=y
@@ -4705,7 +4937,11 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 # CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set
+# end of Console display driver support
+
 # CONFIG_LOGO is not set
+# end of Graphics support
+
 CONFIG_SOUND=m
 CONFIG_SOUND_OSS_CORE=y
 # CONFIG_SOUND_OSS_CORE_PRECLAIM is not set
@@ -4799,8 +5035,8 @@ CONFIG_SND_ENS1370=m
 CONFIG_SND_ENS1371=m
 CONFIG_SND_ES1938=m
 CONFIG_SND_ES1968=m
-CONFIG_SND_ES1968_INPUT=y
-CONFIG_SND_ES1968_RADIO=y
+# CONFIG_SND_ES1968_INPUT is not set
+# CONFIG_SND_ES1968_RADIO is not set
 CONFIG_SND_FM801=m
 CONFIG_SND_FM801_TEA575X_BOOL=y
 CONFIG_SND_HDSP=m
@@ -4813,7 +5049,7 @@ CONFIG_SND_KORG1212=m
 CONFIG_SND_LOLA=m
 CONFIG_SND_LX6464ES=m
 CONFIG_SND_MAESTRO3=m
-CONFIG_SND_MAESTRO3_INPUT=y
+# CONFIG_SND_MAESTRO3_INPUT is not set
 CONFIG_SND_MIXART=m
 CONFIG_SND_NM256=m
 CONFIG_SND_PCXHR=m
@@ -4853,6 +5089,8 @@ CONFIG_SND_HDA_CODEC_CMEDIA=m
 CONFIG_SND_HDA_CODEC_SI3054=m
 CONFIG_SND_HDA_GENERIC=m
 CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1
+# end of HD-Audio
+
 CONFIG_SND_HDA_CORE=m
 CONFIG_SND_HDA_DSP_LOADER=y
 CONFIG_SND_HDA_PREALLOC_SIZE=2048
@@ -4869,6 +5107,7 @@ CONFIG_SND_AOA_SOUNDBUS_I2S=m
 CONFIG_SND_SPI=y
 CONFIG_SND_USB=y
 CONFIG_SND_USB_AUDIO=m
+CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER=y
 CONFIG_SND_USB_UA101=m
 CONFIG_SND_USB_USX2Y=m
 CONFIG_SND_USB_CAIAQ=m
@@ -4926,6 +5165,7 @@ CONFIG_HID_CHERRY=m
 CONFIG_HID_CHICONY=m
 CONFIG_HID_CORSAIR=m
 CONFIG_HID_COUGAR=m
+CONFIG_HID_MACALLY=m
 CONFIG_HID_PRODIKEYS=m
 CONFIG_HID_CMEDIA=m
 CONFIG_HID_CYPRESS=m
@@ -5004,6 +5244,7 @@ CONFIG_HID_THINGM=m
 CONFIG_HID_THRUSTMASTER=m
 CONFIG_THRUSTMASTER_FF=y
 CONFIG_HID_UDRAW_PS3=m
+CONFIG_HID_U2FZERO=m
 CONFIG_HID_WACOM=m
 CONFIG_HID_WIIMOTE=m
 CONFIG_HID_XINMO=m
@@ -5013,6 +5254,7 @@ CONFIG_HID_ZYDACRON=m
 CONFIG_HID_SENSOR_HUB=m
 CONFIG_HID_SENSOR_CUSTOM_SENSOR=m
 CONFIG_HID_ALPS=m
+# end of Special HID drivers
 
 #
 # USB HID support
@@ -5026,11 +5268,16 @@ CONFIG_USB_HIDDEV=y
 #
 # CONFIG_USB_KBD is not set
 # CONFIG_USB_MOUSE is not set
+# end of USB HID Boot Protocol drivers
+# end of USB HID support
 
 #
 # I2C HID support
 #
 # CONFIG_I2C_HID is not set
+# end of I2C HID support
+# end of HID support
+
 CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y
 CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
@@ -5247,6 +5494,8 @@ CONFIG_USB_XUSBATM=m
 #
 # CONFIG_NOP_USB_XCEIV is not set
 # CONFIG_USB_ISP1301 is not set
+# end of USB Physical Layer drivers
+
 # CONFIG_USB_GADGET is not set
 # CONFIG_TYPEC is not set
 # CONFIG_USB_ROLE_SWITCH is not set
@@ -5319,6 +5568,7 @@ CONFIG_LEDS_BRIGHTNESS_HW_CHANGED=y
 # CONFIG_LEDS_BCM6358 is not set
 # CONFIG_LEDS_CR0014114 is not set
 # CONFIG_LEDS_LM3530 is not set
+CONFIG_LEDS_LM3532=m
 # CONFIG_LEDS_LM3642 is not set
 # CONFIG_LEDS_LM3692X is not set
 # CONFIG_LEDS_PCA9532 is not set
@@ -5334,6 +5584,7 @@ CONFIG_LEDS_DAC124S085=m
 CONFIG_LEDS_BD2802=m
 # CONFIG_LEDS_TCA6507 is not set
 # CONFIG_LEDS_TLC591XX is not set
+CONFIG_LEDS_MAX77650=m
 # CONFIG_LEDS_LM355x is not set
 # CONFIG_LEDS_IS31FL319X is not set
 # CONFIG_LEDS_IS31FL32XX is not set
@@ -5344,6 +5595,8 @@ CONFIG_LEDS_BD2802=m
 # CONFIG_LEDS_BLINKM is not set
 # CONFIG_LEDS_MLXREG is not set
 # CONFIG_LEDS_USER is not set
+# CONFIG_LEDS_SPI_BYTE is not set
+# CONFIG_LEDS_TI_LMU_COMMON is not set
 
 #
 # LED Triggers
@@ -5384,10 +5637,9 @@ CONFIG_INFINIBAND_CXGB4=m
 CONFIG_INFINIBAND_I40IW=m
 CONFIG_MLX4_INFINIBAND=m
 CONFIG_MLX5_INFINIBAND=m
-CONFIG_INFINIBAND_NES=m
-# CONFIG_INFINIBAND_NES_DEBUG is not set
 CONFIG_INFINIBAND_OCRDMA=m
 CONFIG_RDMA_RXE=m
+# CONFIG_RDMA_SIW is not set
 CONFIG_INFINIBAND_IPOIB=m
 CONFIG_INFINIBAND_IPOIB_CM=y
 CONFIG_INFINIBAND_IPOIB_DEBUG=y
@@ -5440,6 +5692,7 @@ CONFIG_RTC_DRV_ABEOZ9=m
 # CONFIG_RTC_DRV_PCF8563 is not set
 # CONFIG_RTC_DRV_PCF8583 is not set
 # CONFIG_RTC_DRV_M41T80 is not set
+# CONFIG_RTC_DRV_BD70528 is not set
 # CONFIG_RTC_DRV_BQ32K is not set
 # CONFIG_RTC_DRV_S35390A is not set
 # CONFIG_RTC_DRV_FM3130 is not set
@@ -5531,6 +5784,8 @@ CONFIG_PPC_BESTCOMM_FEC=m
 # CONFIG_QCOM_HIDMA is not set
 # CONFIG_DW_DMAC is not set
 # CONFIG_DW_DMAC_PCI is not set
+# CONFIG_DW_EDMA is not set
+# CONFIG_DW_EDMA_PCIE is not set
 
 #
 # DMA Clients
@@ -5544,6 +5799,8 @@ CONFIG_ASYNC_TX_DMA=y
 CONFIG_SYNC_FILE=y
 # CONFIG_SW_SYNC is not set
 CONFIG_UDMABUF=y
+# end of DMABUF options
+
 # CONFIG_AUXDISPLAY is not set
 # CONFIG_PANEL is not set
 CONFIG_UIO=m
@@ -5569,6 +5826,8 @@ CONFIG_VIRTIO_MMIO=m
 #
 # Microsoft Hyper-V guest support
 #
+# end of Microsoft Hyper-V guest support
+
 CONFIG_STAGING=y
 # CONFIG_PRISM2_USB is not set
 # CONFIG_COMEDI is not set
@@ -5578,7 +5837,6 @@ CONFIG_STAGING=y
 CONFIG_R8712U=m
 CONFIG_R8188EU=m
 CONFIG_88EU_AP_MODE=y
-# CONFIG_R8822BE is not set
 # CONFIG_RTS5208 is not set
 # CONFIG_VT6655 is not set
 # CONFIG_VT6656 is not set
@@ -5592,42 +5850,52 @@ CONFIG_88EU_AP_MODE=y
 #
 # CONFIG_ADIS16203 is not set
 # CONFIG_ADIS16240 is not set
+# end of Accelerometers
 
 #
 # Analog to digital converters
 #
 # CONFIG_AD7192 is not set
 # CONFIG_AD7280 is not set
+# end of Analog to digital converters
 
 #
 # Analog digital bi-direction converters
 #
+# end of Analog digital bi-direction converters
 
 #
 # Capacitance to digital converters
 #
 # CONFIG_AD7150 is not set
 # CONFIG_AD7746 is not set
+# end of Capacitance to digital converters
 
 #
 # Direct Digital Synthesis
 #
 # CONFIG_AD9832 is not set
 # CONFIG_AD9834 is not set
+# end of Direct Digital Synthesis
 
 #
 # Network Analyzer, Impedance Converters
 #
 # CONFIG_AD5933 is not set
+# end of Network Analyzer, Impedance Converters
 
 #
 # Active energy metering IC
 #
 # CONFIG_ADE7854 is not set
+# end of Active energy metering IC
 
 #
 # Resolver to digital converters
 #
+# end of Resolver to digital converters
+# end of IIO staging drivers
+
 # CONFIG_FB_SM750 is not set
 
 #
@@ -5645,11 +5913,15 @@ CONFIG_SPEAKUP_SYNTH_SOFT=m
 CONFIG_SPEAKUP_SYNTH_SPKOUT=m
 CONFIG_SPEAKUP_SYNTH_TXPRT=m
 CONFIG_SPEAKUP_SYNTH_DUMMY=m
+# end of Speakup console speech
+
 # CONFIG_STAGING_MEDIA is not set
 
 #
 # Android
 #
+# end of Android
+
 # CONFIG_STAGING_BOARD is not set
 # CONFIG_LTE_GDM724X is not set
 # CONFIG_FIREWIRE_SERIAL is not set
@@ -5666,8 +5938,33 @@ CONFIG_SPEAKUP_SYNTH_DUMMY=m
 #
 # Gasket devices
 #
+# end of Gasket devices
+
 # CONFIG_XIL_AXIS_FIFO is not set
 # CONFIG_EROFS_FS is not set
+# CONFIG_FIELDBUS_DEV is not set
+# CONFIG_KPC2000 is not set
+
+#
+# ISDN CAPI drivers
+#
+CONFIG_CAPI_AVM=y
+CONFIG_ISDN_DRV_AVMB1_B1PCI=m
+CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
+CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
+CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
+CONFIG_ISDN_DRV_AVMB1_T1PCI=m
+CONFIG_ISDN_DRV_AVMB1_C4=m
+CONFIG_ISDN_DRV_GIGASET=m
+CONFIG_GIGASET_CAPI=y
+CONFIG_GIGASET_BASE=m
+CONFIG_GIGASET_M105=m
+CONFIG_GIGASET_M101=m
+# CONFIG_GIGASET_DEBUG is not set
+CONFIG_HYSDN=m
+CONFIG_HYSDN_CAPI=y
+# end of ISDN CAPI drivers
+
 CONFIG_CLKDEV_LOOKUP=y
 CONFIG_HAVE_CLK_PREPARE=y
 CONFIG_COMMON_CLK=y
@@ -5677,6 +5974,7 @@ CONFIG_COMMON_CLK=y
 #
 # CONFIG_CLK_HSDK is not set
 # CONFIG_COMMON_CLK_MAX9485 is not set
+# CONFIG_COMMON_CLK_SI5341 is not set
 # CONFIG_COMMON_CLK_SI5351 is not set
 # CONFIG_COMMON_CLK_SI514 is not set
 # CONFIG_COMMON_CLK_SI544 is not set
@@ -5686,6 +5984,8 @@ CONFIG_COMMON_CLK=y
 # CONFIG_COMMON_CLK_CS2000_CP is not set
 # CONFIG_COMMON_CLK_VC5 is not set
 # CONFIG_COMMON_CLK_FIXED_MMIO is not set
+# end of Common Clock Framework
+
 # CONFIG_HWSPINLOCK is not set
 
 #
@@ -5693,23 +5993,30 @@ CONFIG_COMMON_CLK=y
 #
 CONFIG_I8253_LOCK=y
 CONFIG_CLKBLD_I8253=y
+# end of Clock Source drivers
+
 # CONFIG_MAILBOX is not set
 CONFIG_IOMMU_SUPPORT=y
 
 #
 # Generic IOMMU Pagetable Support
 #
+# end of Generic IOMMU Pagetable Support
+
 # CONFIG_IOMMU_DEBUGFS is not set
 
 #
 # Remoteproc drivers
 #
 # CONFIG_REMOTEPROC is not set
+# end of Remoteproc drivers
 
 #
 # Rpmsg drivers
 #
 # CONFIG_RPMSG_VIRTIO is not set
+# end of Rpmsg drivers
+
 # CONFIG_SOUNDWIRE is not set
 
 #
@@ -5719,28 +6026,42 @@ CONFIG_IOMMU_SUPPORT=y
 #
 # Amlogic SoC drivers
 #
+# end of Amlogic SoC drivers
+
+#
+# Aspeed SoC drivers
+#
+# end of Aspeed SoC drivers
 
 #
 # Broadcom SoC drivers
 #
+# end of Broadcom SoC drivers
 
 #
 # NXP/Freescale QorIQ SoC drivers
 #
+# end of NXP/Freescale QorIQ SoC drivers
 
 #
 # i.MX SoC drivers
 #
+# end of i.MX SoC drivers
 
 #
 # Qualcomm SoC drivers
 #
+# end of Qualcomm SoC drivers
+
 # CONFIG_SOC_TI is not set
 
 #
 # Xilinx SoC drivers
 #
 # CONFIG_XILINX_VCU is not set
+# end of Xilinx SoC drivers
+# end of SOC (System On Chip) specific Drivers
+
 CONFIG_PM_DEVFREQ=y
 
 #
@@ -5805,6 +6126,7 @@ CONFIG_HID_SENSOR_ACCEL_3D=m
 # CONFIG_SCA3000 is not set
 # CONFIG_STK8312 is not set
 # CONFIG_STK8BA50 is not set
+# end of Accelerometers
 
 #
 # Analog to digital converters
@@ -5850,22 +6172,25 @@ CONFIG_MCP3911=m
 # CONFIG_TI_ADC128S052 is not set
 # CONFIG_TI_ADC161S626 is not set
 # CONFIG_TI_ADS1015 is not set
-# CONFIG_TI_ADS7950 is not set
+CONFIG_TI_ADS8344=m
 # CONFIG_TI_ADS8688 is not set
 CONFIG_TI_ADS124S08=m
 # CONFIG_TI_TLC4541 is not set
 # CONFIG_VF610_ADC is not set
 CONFIG_VIPERBOARD_ADC=m
+# CONFIG_XILINX_XADC is not set
+# end of Analog to digital converters
 
 #
 # Analog Front Ends
 #
 # CONFIG_IIO_RESCALE is not set
+# end of Analog Front Ends
 
 #
 # Amplifiers
 #
-# CONFIG_AD8366 is not set
+# end of Amplifiers
 
 #
 # Chemical Sensors
@@ -5878,21 +6203,20 @@ CONFIG_PMS7003=m
 CONFIG_SENSIRION_SGP30=m
 CONFIG_SPS30=m
 # CONFIG_VZ89X is not set
+# end of Chemical Sensors
 
 #
 # Hid Sensor IIO Common
 #
 CONFIG_HID_SENSOR_IIO_COMMON=m
 CONFIG_HID_SENSOR_IIO_TRIGGER=m
+# end of Hid Sensor IIO Common
 
 #
 # SSP Sensor Common
 #
 # CONFIG_IIO_SSP_SENSORHUB is not set
-
-#
-# Counters
-#
+# end of SSP Sensor Common
 
 #
 # Digital to analog converters
@@ -5929,10 +6253,12 @@ CONFIG_LTC1660=m
 # CONFIG_TI_DAC5571 is not set
 CONFIG_TI_DAC7311=m
 # CONFIG_VF610_DAC is not set
+# end of Digital to analog converters
 
 #
 # IIO dummy driver
 #
+# end of IIO dummy driver
 
 #
 # Frequency Synthesizers DDS/PLL
@@ -5942,11 +6268,15 @@ CONFIG_TI_DAC7311=m
 # Clock Generator/Distribution
 #
 # CONFIG_AD9523 is not set
+# end of Clock Generator/Distribution
 
 #
 # Phase-Locked Loop (PLL) frequency synthesizers
 #
 # CONFIG_ADF4350 is not set
+# CONFIG_ADF4371 is not set
+# end of Phase-Locked Loop (PLL) frequency synthesizers
+# end of Frequency Synthesizers DDS/PLL
 
 #
 # Digital gyroscope sensors
@@ -5957,10 +6287,14 @@ CONFIG_TI_DAC7311=m
 # CONFIG_ADIS16260 is not set
 # CONFIG_ADXRS450 is not set
 # CONFIG_BMG160 is not set
+CONFIG_FXAS21002C=m
+CONFIG_FXAS21002C_I2C=m
+CONFIG_FXAS21002C_SPI=m
 CONFIG_HID_SENSOR_GYRO_3D=m
 # CONFIG_MPU3050_I2C is not set
 # CONFIG_IIO_ST_GYRO_3AXIS is not set
 # CONFIG_ITG3200 is not set
+# end of Digital gyroscope sensors
 
 #
 # Health Sensors
@@ -5973,6 +6307,8 @@ CONFIG_HID_SENSOR_GYRO_3D=m
 # CONFIG_AFE4404 is not set
 # CONFIG_MAX30100 is not set
 # CONFIG_MAX30102 is not set
+# end of Heart Rate Monitors
+# end of Health Sensors
 
 #
 # Humidity sensors
@@ -5984,6 +6320,7 @@ CONFIG_HID_SENSOR_GYRO_3D=m
 # CONFIG_HTU21 is not set
 # CONFIG_SI7005 is not set
 # CONFIG_SI7020 is not set
+# end of Humidity sensors
 
 #
 # Inertial measurement units
@@ -5996,6 +6333,7 @@ CONFIG_HID_SENSOR_GYRO_3D=m
 # CONFIG_INV_MPU6050_I2C is not set
 # CONFIG_INV_MPU6050_SPI is not set
 # CONFIG_IIO_ST_LSM6DSX is not set
+# end of Inertial measurement units
 
 #
 # Light sensors
@@ -6041,6 +6379,7 @@ CONFIG_VCNL4035=m
 # CONFIG_VEML6070 is not set
 # CONFIG_VL6180 is not set
 # CONFIG_ZOPT2201 is not set
+# end of Light sensors
 
 #
 # Magnetometer sensors
@@ -6057,23 +6396,27 @@ CONFIG_HID_SENSOR_MAGNETOMETER_3D=m
 CONFIG_SENSORS_RM3100=m
 CONFIG_SENSORS_RM3100_I2C=m
 CONFIG_SENSORS_RM3100_SPI=m
+# end of Magnetometer sensors
 
 #
 # Multiplexers
 #
 # CONFIG_IIO_MUX is not set
+# end of Multiplexers
 
 #
 # Inclinometer sensors
 #
 CONFIG_HID_SENSOR_INCLINOMETER_3D=m
 CONFIG_HID_SENSOR_DEVICE_ROTATION=m
+# end of Inclinometer sensors
 
 #
 # Triggers - standalone
 #
 # CONFIG_IIO_INTERRUPT_TRIGGER is not set
 # CONFIG_IIO_SYSFS_TRIGGER is not set
+# end of Triggers - standalone
 
 #
 # Digital potentiometers
@@ -6087,17 +6430,20 @@ CONFIG_HID_SENSOR_DEVICE_ROTATION=m
 # CONFIG_MCP4531 is not set
 CONFIG_MCP41010=m
 # CONFIG_TPL0102 is not set
+# end of Digital potentiometers
 
 #
 # Digital potentiostats
 #
 # CONFIG_LMP91000 is not set
+# end of Digital potentiostats
 
 #
 # Pressure sensors
 #
 # CONFIG_ABP060MG is not set
 # CONFIG_BMP280 is not set
+# CONFIG_DPS310 is not set
 CONFIG_HID_SENSOR_PRESS=m
 # CONFIG_HP03 is not set
 # CONFIG_MPL115_I2C is not set
@@ -6109,26 +6455,31 @@ CONFIG_HID_SENSOR_PRESS=m
 # CONFIG_T5403 is not set
 # CONFIG_HP206C is not set
 # CONFIG_ZPA2326 is not set
+# end of Pressure sensors
 
 #
 # Lightning sensors
 #
 # CONFIG_AS3935 is not set
+# end of Lightning sensors
 
 #
 # Proximity and distance sensors
 #
 # CONFIG_ISL29501 is not set
 # CONFIG_LIDAR_LITE_V2 is not set
+CONFIG_MB1232=m
 # CONFIG_RFD77402 is not set
 # CONFIG_SX9500 is not set
 # CONFIG_SRF08 is not set
 CONFIG_VL53L0X_I2C=m
+# end of Proximity and distance sensors
 
 #
 # Resolver to digital converters
 #
 # CONFIG_AD2S90 is not set
+# end of Resolver to digital converters
 
 #
 # Temperature sensors
@@ -6141,6 +6492,9 @@ CONFIG_VL53L0X_I2C=m
 # CONFIG_TMP007 is not set
 # CONFIG_TSYS01 is not set
 # CONFIG_TSYS02D is not set
+CONFIG_MAX31856=m
+# end of Temperature sensors
+
 # CONFIG_NTB is not set
 # CONFIG_VME_BUS is not set
 # CONFIG_PWM is not set
@@ -6149,10 +6503,11 @@ CONFIG_VL53L0X_I2C=m
 # IRQ chip support
 #
 CONFIG_IRQCHIP=y
-CONFIG_ARM_GIC_MAX_NR=1
+# CONFIG_AL_FIC is not set
+# end of IRQ chip support
+
 # CONFIG_IPACK_BUS is not set
 # CONFIG_RESET_CONTROLLER is not set
-# CONFIG_FMC is not set
 
 #
 # PHY Subsystem
@@ -6163,29 +6518,39 @@ CONFIG_GENERIC_PHY_MIPI_DPHY=y
 # CONFIG_PHY_CADENCE_DP is not set
 CONFIG_PHY_CADENCE_DPHY=m
 # CONFIG_PHY_FSL_IMX8MQ_USB is not set
+# CONFIG_PHY_MIXEL_MIPI_DPHY is not set
 # CONFIG_PHY_PXA_28NM_HSIC is not set
 # CONFIG_PHY_PXA_28NM_USB2 is not set
 # CONFIG_PHY_CPCAP_USB is not set
+# end of PHY Subsystem
+
 # CONFIG_POWERCAP is not set
 # CONFIG_MCB is not set
 
 #
 # Performance monitor support
 #
+# end of Performance monitor support
+
 CONFIG_RAS=y
 
 #
 # Android
 #
 # CONFIG_ANDROID is not set
+# end of Android
+
 CONFIG_DAX=y
 CONFIG_NVMEM=y
+CONFIG_NVMEM_SYSFS=y
 
 #
 # HW tracing support
 #
 # CONFIG_STM is not set
 # CONFIG_INTEL_TH is not set
+# end of HW tracing support
+
 # CONFIG_FPGA is not set
 # CONFIG_FSI is not set
 CONFIG_MULTIPLEXER=m
@@ -6195,10 +6560,15 @@ CONFIG_MULTIPLEXER=m
 #
 CONFIG_MUX_ADG792A=m
 CONFIG_MUX_ADGS1408=m
+# CONFIG_MUX_MMIO is not set
+# end of Multiplexer drivers
+
 CONFIG_PM_OPP=y
 # CONFIG_SIOX is not set
 # CONFIG_SLIMBUS is not set
 CONFIG_INTERCONNECT=m
+# CONFIG_COUNTER is not set
+# end of Device Drivers
 
 #
 # File systems
@@ -6299,6 +6669,7 @@ CONFIG_FSCACHE=m
 CONFIG_CACHEFILES=m
 # CONFIG_CACHEFILES_DEBUG is not set
 # CONFIG_CACHEFILES_HISTOGRAM is not set
+# end of Caches
 
 #
 # CD-ROM/DVD Filesystems
@@ -6307,6 +6678,7 @@ CONFIG_ISO9660_FS=m
 CONFIG_JOLIET=y
 CONFIG_ZISOFS=y
 CONFIG_UDF_FS=m
+# end of CD-ROM/DVD Filesystems
 
 #
 # DOS/FAT/NT Filesystems
@@ -6320,6 +6692,7 @@ CONFIG_FAT_DEFAULT_UTF8=y
 CONFIG_NTFS_FS=m
 # CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
+# end of DOS/FAT/NT Filesystems
 
 #
 # Pseudo filesystems
@@ -6336,6 +6709,8 @@ CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_TMPFS_XATTR=y
 CONFIG_MEMFD_CREATE=y
 CONFIG_CONFIGFS_FS=y
+# end of Pseudo filesystems
+
 CONFIG_MISC_FILESYSTEMS=y
 CONFIG_ORANGEFS_FS=m
 CONFIG_ADFS_FS=m
@@ -6345,7 +6720,8 @@ CONFIG_ECRYPT_FS=m
 # CONFIG_ECRYPT_FS_MESSAGING is not set
 CONFIG_HFS_FS=m
 CONFIG_HFSPLUS_FS=m
-# CONFIG_BEFS_FS is not set
+CONFIG_BEFS_FS=m
+# CONFIG_BEFS_DEBUG is not set
 # CONFIG_BFS_FS is not set
 # CONFIG_EFS_FS is not set
 CONFIG_CRAMFS=m
@@ -6432,12 +6808,13 @@ CONFIG_SUNRPC_GSS=m
 CONFIG_SUNRPC_BACKCHANNEL=y
 CONFIG_SUNRPC_SWAP=y
 CONFIG_RPCSEC_GSS_KRB5=m
-CONFIG_CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y
+# CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES is not set
 # CONFIG_SUNRPC_DEBUG is not set
 CONFIG_SUNRPC_XPRT_RDMA=m
 CONFIG_CEPH_FS=m
 CONFIG_CEPH_FSCACHE=y
 CONFIG_CEPH_FS_POSIX_ACL=y
+# CONFIG_CEPH_FS_SECURITY_LABEL is not set
 CONFIG_CIFS=m
 # CONFIG_CIFS_STATS2 is not set
 CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
@@ -6445,7 +6822,6 @@ CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
 CONFIG_CIFS_UPCALL=y
 CONFIG_CIFS_XATTR=y
 CONFIG_CIFS_POSIX=y
-CONFIG_CIFS_ACL=y
 # CONFIG_CIFS_DEBUG is not set
 CONFIG_CIFS_DFS_UPCALL=y
 # CONFIG_CIFS_SMB_DIRECT is not set
@@ -6512,11 +6888,15 @@ CONFIG_NLS_MAC_TURKISH=m
 CONFIG_NLS_UTF8=m
 CONFIG_DLM=m
 # CONFIG_DLM_DEBUG is not set
+CONFIG_UNICODE=y
+# CONFIG_UNICODE_NORMALIZATION_SELFTEST is not set
+# end of File systems
 
 #
 # Security options
 #
 CONFIG_KEYS=y
+# CONFIG_KEYS_REQUEST_CACHE is not set
 # CONFIG_PERSISTENT_KEYRINGS is not set
 # CONFIG_BIG_KEYS is not set
 CONFIG_ENCRYPTED_KEYS=m
@@ -6559,6 +6939,24 @@ CONFIG_INTEGRITY_AUDIT=y
 CONFIG_DEFAULT_SECURITY_APPARMOR=y
 # CONFIG_DEFAULT_SECURITY_DAC is not set
 CONFIG_LSM="yama,loadpin,safesetid,integrity,apparmor,selinux,smack,tomoyo"
+
+#
+# Kernel hardening options
+#
+
+#
+# Memory initialization
+#
+CONFIG_INIT_STACK_NONE=y
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_USER is not set
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL is not set
+# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
+# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
+# end of Memory initialization
+# end of Kernel hardening options
+# end of Security options
+
 CONFIG_XOR_BLOCKS=m
 CONFIG_ASYNC_CORE=m
 CONFIG_ASYNC_MEMCPY=m
@@ -6586,9 +6984,6 @@ CONFIG_CRYPTO_AKCIPHER=y
 CONFIG_CRYPTO_KPP2=y
 CONFIG_CRYPTO_KPP=y
 CONFIG_CRYPTO_ACOMP2=y
-CONFIG_CRYPTO_RSA=y
-CONFIG_CRYPTO_DH=y
-CONFIG_CRYPTO_ECDH=m
 CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MANAGER2=y
 CONFIG_CRYPTO_USER=m
@@ -6598,12 +6993,20 @@ CONFIG_CRYPTO_GF128MUL=m
 CONFIG_CRYPTO_NULL=m
 CONFIG_CRYPTO_NULL2=y
 # CONFIG_CRYPTO_PCRYPT is not set
-CONFIG_CRYPTO_WORKQUEUE=y
 # CONFIG_CRYPTO_CRYPTD is not set
 CONFIG_CRYPTO_AUTHENC=m
 CONFIG_CRYPTO_TEST=m
 CONFIG_CRYPTO_ENGINE=m
 
+#
+# Public-key cryptography
+#
+CONFIG_CRYPTO_RSA=y
+CONFIG_CRYPTO_DH=y
+CONFIG_CRYPTO_ECC=m
+CONFIG_CRYPTO_ECDH=m
+CONFIG_CRYPTO_ECRDSA=m
+
 #
 # Authenticated Encryption with Associated Data
 #
@@ -6647,6 +7050,7 @@ CONFIG_CRYPTO_VMAC=m
 #
 CONFIG_CRYPTO_CRC32C=m
 CONFIG_CRYPTO_CRC32=m
+# CONFIG_CRYPTO_XXHASH is not set
 CONFIG_CRYPTO_CRCT10DIF=y
 CONFIG_CRYPTO_GHASH=m
 CONFIG_CRYPTO_POLY1305=m
@@ -6664,7 +7068,7 @@ CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA512=m
 CONFIG_CRYPTO_SHA3=m
 # CONFIG_CRYPTO_SM3 is not set
-# CONFIG_CRYPTO_STREEBOG is not set
+CONFIG_CRYPTO_STREEBOG=m
 CONFIG_CRYPTO_TGR192=m
 CONFIG_CRYPTO_WP512=m
 
@@ -6674,6 +7078,7 @@ CONFIG_CRYPTO_WP512=m
 CONFIG_CRYPTO_AES=y
 # CONFIG_CRYPTO_AES_TI is not set
 CONFIG_CRYPTO_ANUBIS=m
+CONFIG_CRYPTO_LIB_ARC4=m
 CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_BLOWFISH=m
 CONFIG_CRYPTO_BLOWFISH_COMMON=m
@@ -6723,6 +7128,8 @@ CONFIG_CRYPTO_HASH_INFO=y
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_HIFN_795X=m
 CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
+# CONFIG_CRYPTO_DEV_ATMEL_ECC is not set
+# CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set
 CONFIG_CRYPTO_DEV_CHELSIO=m
 # CONFIG_CHELSIO_IPSEC_INLINE is not set
 CONFIG_CRYPTO_DEV_VIRTIO=m
@@ -6743,6 +7150,8 @@ CONFIG_SYSTEM_TRUSTED_KEYS=""
 # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
 # CONFIG_SECONDARY_TRUSTED_KEYRING is not set
 # CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
+# end of Certificates for signature checking
+
 CONFIG_BINARY_PRINTF=y
 
 #
@@ -6750,11 +7159,13 @@ CONFIG_BINARY_PRINTF=y
 #
 CONFIG_RAID6_PQ=m
 CONFIG_RAID6_PQ_BENCHMARK=y
+# CONFIG_PACKING is not set
 CONFIG_BITREVERSE=y
-CONFIG_RATIONAL=y
 CONFIG_GENERIC_STRNCPY_FROM_USER=y
 CONFIG_GENERIC_STRNLEN_USER=y
 CONFIG_GENERIC_NET_UTILS=y
+CONFIG_CORDIC=m
+CONFIG_RATIONAL=y
 CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_CRC_CCITT=m
 CONFIG_CRC16=m
@@ -6825,10 +7236,9 @@ CONFIG_NLATTR=y
 CONFIG_GENERIC_ATOMIC64=y
 CONFIG_LRU_CACHE=m
 CONFIG_CLZ_TAB=y
-CONFIG_CORDIC=m
-# CONFIG_DDR is not set
 CONFIG_IRQ_POLL=y
 CONFIG_MPILIB=y
+CONFIG_DIMLIB=y
 CONFIG_LIBFDT=y
 CONFIG_OID_REGISTRY=y
 CONFIG_FONT_SUPPORT=y
@@ -6838,6 +7248,7 @@ CONFIG_FONT_8x16=y
 CONFIG_SG_POOL=y
 CONFIG_SBITMAP=y
 # CONFIG_STRING_SELFTEST is not set
+# end of Library routines
 
 #
 # Kernel hacking
@@ -6852,6 +7263,7 @@ CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
 CONFIG_CONSOLE_LOGLEVEL_QUIET=4
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 CONFIG_DYNAMIC_DEBUG=y
+# end of printk and dmesg options
 
 #
 # Compile-time checks and compiler options
@@ -6860,6 +7272,7 @@ CONFIG_DEBUG_INFO=y
 # CONFIG_DEBUG_INFO_REDUCED is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
 # CONFIG_DEBUG_INFO_DWARF4 is not set
+# CONFIG_DEBUG_INFO_BTF is not set
 # CONFIG_GDB_SCRIPTS is not set
 CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_FRAME_WARN=1024
@@ -6867,14 +7280,18 @@ CONFIG_STRIP_ASM_SYMS=y
 # CONFIG_READABLE_ASM is not set
 # CONFIG_UNUSED_SYMBOLS is not set
 CONFIG_DEBUG_FS=y
-# CONFIG_HEADERS_CHECK is not set
+# CONFIG_HEADERS_INSTALL is not set
+# CONFIG_OPTIMIZE_INLINING is not set
 # CONFIG_DEBUG_SECTION_MISMATCH is not set
 CONFIG_SECTION_MISMATCH_WARN_ONLY=y
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+# end of Compile-time checks and compiler options
+
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x01b6
 CONFIG_MAGIC_SYSRQ_SERIAL=y
 CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_MISC=y
 
 #
 # Memory Debugging
@@ -6899,8 +7316,12 @@ CONFIG_DEBUG_MEMORY_INIT=y
 # CONFIG_DEBUG_HIGHMEM is not set
 CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
 # CONFIG_DEBUG_STACKOVERFLOW is not set
+CONFIG_HAVE_ARCH_KASAN=y
 CONFIG_CC_HAS_KASAN_GENERIC=y
+# CONFIG_KASAN is not set
 CONFIG_KASAN_STACK=1
+# end of Memory Debugging
+
 CONFIG_ARCH_HAS_KCOV=y
 CONFIG_CC_HAS_SANCOV_TRACE_PC=y
 # CONFIG_KCOV is not set
@@ -6918,6 +7339,8 @@ CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
 CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
 # CONFIG_WQ_WATCHDOG is not set
+# end of Debug Lockups and Hangs
+
 # CONFIG_PANIC_ON_OOPS is not set
 CONFIG_PANIC_ON_OOPS_VALUE=0
 CONFIG_SCHED_DEBUG=y
@@ -6942,12 +7365,14 @@ CONFIG_LOCK_DEBUGGING_SUPPORT=y
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_LOCK_TORTURE_TEST is not set
 # CONFIG_WW_MUTEX_SELFTEST is not set
+# end of Lock Debugging (spinlocks, mutexes, etc...)
+
 CONFIG_STACKTRACE=y
 # CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
 # CONFIG_DEBUG_KOBJECT is not set
 CONFIG_DEBUG_BUGVERBOSE=y
 CONFIG_DEBUG_LIST=y
-# CONFIG_DEBUG_PI_LIST is not set
+# CONFIG_DEBUG_PLIST is not set
 # CONFIG_DEBUG_SG is not set
 # CONFIG_DEBUG_NOTIFIERS is not set
 # CONFIG_DEBUG_CREDENTIALS is not set
@@ -6960,6 +7385,8 @@ CONFIG_DEBUG_LIST=y
 CONFIG_RCU_CPU_STALL_TIMEOUT=21
 # CONFIG_RCU_TRACE is not set
 # CONFIG_RCU_EQS_DEBUG is not set
+# end of RCU Debugging
+
 # CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
 # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
@@ -6975,6 +7402,7 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
 CONFIG_HAVE_DYNAMIC_FTRACE=y
 CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
 CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
+CONFIG_HAVE_C_RECORDMCOUNT=y
 CONFIG_TRACER_MAX_TRACE=y
 CONFIG_TRACE_CLOCK=y
 CONFIG_RING_BUFFER=y
@@ -7021,12 +7449,14 @@ CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_KPROBES_SANITY_TEST is not set
 # CONFIG_BACKTRACE_SELF_TEST is not set
 # CONFIG_RBTREE_TEST is not set
+# CONFIG_REED_SOLOMON_TEST is not set
 # CONFIG_INTERVAL_TREE_TEST is not set
 # CONFIG_PERCPU_TEST is not set
 # CONFIG_ATOMIC64_SELFTEST is not set
 # CONFIG_ASYNC_RAID6_TEST is not set
 # CONFIG_TEST_HEXDUMP is not set
 # CONFIG_TEST_STRING_HELPERS is not set
+# CONFIG_TEST_STRSCPY is not set
 # CONFIG_TEST_KSTRTOX is not set
 # CONFIG_TEST_PRINTF is not set
 # CONFIG_TEST_BITMAP is not set
@@ -7041,6 +7471,7 @@ CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_TEST_VMALLOC is not set
 CONFIG_TEST_USER_COPY=m
 CONFIG_TEST_BPF=m
+# CONFIG_TEST_BLACKHOLE_DEV is not set
 # CONFIG_FIND_BIT_BENCHMARK is not set
 CONFIG_TEST_FIRMWARE=m
 # CONFIG_TEST_SYSCTL is not set
@@ -7049,6 +7480,7 @@ CONFIG_TEST_STATIC_KEYS=m
 # CONFIG_TEST_KMOD is not set
 # CONFIG_TEST_MEMCAT_P is not set
 # CONFIG_TEST_STACKINIT is not set
+# CONFIG_TEST_MEMINIT is not set
 # CONFIG_MEMTEST is not set
 CONFIG_BUG_ON_DATA_CORRUPTION=y
 # CONFIG_SAMPLES is not set
@@ -7072,8 +7504,10 @@ CONFIG_JUMP_LABEL_FEATURE_CHECKS=y
 CONFIG_XMON=y
 # CONFIG_XMON_DEFAULT is not set
 CONFIG_XMON_DISASSEMBLY=y
+CONFIG_XMON_DEFAULT_RO_MODE=y
 CONFIG_DEBUGGER=y
 # CONFIG_BDI_SWITCH is not set
 CONFIG_BOOTX_TEXT=y
 # CONFIG_PPC_EARLY_DEBUG is not set
 # CONFIG_PPC_PTDUMP is not set
+# end of Kernel hacking
diff --git a/srcpkgs/linux5.1/files/ppc64-dotconfig b/srcpkgs/linux5.3/files/ppc64-dotconfig
similarity index 92%
rename from srcpkgs/linux5.1/files/ppc64-dotconfig
rename to srcpkgs/linux5.3/files/ppc64-dotconfig
index 7dcd051bda6..4c6282ffdf5 100644
--- a/srcpkgs/linux5.1/files/ppc64-dotconfig
+++ b/srcpkgs/linux5.3/files/ppc64-dotconfig
@@ -1,14 +1,15 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.1.18 Kernel Configuration
+# Linux/powerpc 5.3.0 Kernel Configuration
 #
 
 #
-# Compiler: powerpc64-linux-gnu-gcc (GCC) 9.1.0
+# Compiler: powerpc64-linux-gnu-gcc (GCC) 9.2.0
 #
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=90100
+CONFIG_GCC_VERSION=90200
 CONFIG_CLANG_VERSION=0
+CONFIG_CC_CAN_LINK=y
 CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y
 CONFIG_IRQ_WORK=y
@@ -20,6 +21,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
 #
 CONFIG_INIT_ENV_ARG_LIMIT=32
 # CONFIG_COMPILE_TEST is not set
+# CONFIG_HEADER_TEST is not set
 CONFIG_LOCALVERSION="_1"
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_BUILD_SALT=""
@@ -54,6 +56,8 @@ CONFIG_GENERIC_MSI_IRQ=y
 CONFIG_IRQ_FORCED_THREADING=y
 CONFIG_SPARSE_IRQ=y
 # CONFIG_GENERIC_IRQ_DEBUGFS is not set
+# end of IRQ subsystem
+
 CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_ARCH_HAS_TICK_BROADCAST=y
@@ -70,6 +74,8 @@ CONFIG_NO_HZ_IDLE=y
 # CONFIG_NO_HZ_FULL is not set
 # CONFIG_NO_HZ is not set
 CONFIG_HIGH_RES_TIMERS=y
+# end of Timers subsystem
+
 # CONFIG_PREEMPT_NONE is not set
 CONFIG_PREEMPT_VOLUNTARY=y
 # CONFIG_PREEMPT is not set
@@ -88,7 +94,10 @@ CONFIG_TASKSTATS=y
 CONFIG_TASK_DELAY_ACCT=y
 CONFIG_TASK_XACCT=y
 CONFIG_TASK_IO_ACCOUNTING=y
-# CONFIG_PSI is not set
+CONFIG_PSI=y
+CONFIG_PSI_DEFAULT_DISABLED=y
+# end of CPU/Task time and stats accounting
+
 CONFIG_CPU_ISOLATION=y
 
 #
@@ -101,12 +110,22 @@ CONFIG_TREE_SRCU=y
 CONFIG_TASKS_RCU=y
 CONFIG_RCU_STALL_COMMON=y
 CONFIG_RCU_NEED_SEGCBLIST=y
+# end of RCU Subsystem
+
 CONFIG_BUILD_BIN2C=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
+CONFIG_IKHEADERS=m
 CONFIG_LOG_BUF_SHIFT=19
 CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
 CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
+
+#
+# Scheduler features
+#
+# CONFIG_UCLAMP_TASK is not set
+# end of Scheduler features
+
 CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
 CONFIG_NUMA_BALANCING=y
 CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
@@ -117,7 +136,6 @@ CONFIG_MEMCG_SWAP=y
 CONFIG_MEMCG_SWAP_ENABLED=y
 CONFIG_MEMCG_KMEM=y
 CONFIG_BLK_CGROUP=y
-# CONFIG_DEBUG_BLK_CGROUP is not set
 CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
@@ -158,7 +176,6 @@ CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
 CONFIG_HAVE_LD_DEAD_CODE_DATA_ELIMINATION=y
 # CONFIG_LD_DEAD_CODE_DATA_ELIMINATION is not set
 CONFIG_SYSCTL=y
-CONFIG_ANON_INODES=y
 CONFIG_SYSCTL_EXCEPTION_TRACE=y
 CONFIG_HAVE_PCSPKR_PLATFORM=y
 CONFIG_BPF=y
@@ -203,6 +220,8 @@ CONFIG_HAVE_PERF_EVENTS=y
 # Kernel Performance Events And Counters
 #
 CONFIG_PERF_EVENTS=y
+# end of Kernel Performance Events And Counters
+
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_SLUB_DEBUG=y
 # CONFIG_SLUB_MEMCG_SYSFS_ON is not set
@@ -213,10 +232,13 @@ CONFIG_SLUB=y
 CONFIG_SLAB_MERGE_DEFAULT=y
 CONFIG_SLAB_FREELIST_RANDOM=y
 CONFIG_SLAB_FREELIST_HARDENED=y
+CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
 CONFIG_SLUB_CPU_PARTIAL=y
 CONFIG_SYSTEM_DATA_VERIFICATION=y
 CONFIG_PROFILING=y
 CONFIG_TRACEPOINTS=y
+# end of General setup
+
 CONFIG_PPC64=y
 
 #
@@ -238,6 +260,11 @@ CONFIG_VSX=y
 CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
 CONFIG_PPC_RADIX_MMU=y
 CONFIG_PPC_RADIX_MMU_DEFAULT=y
+CONFIG_PPC_HAVE_KUEP=y
+CONFIG_PPC_KUEP=y
+CONFIG_PPC_HAVE_KUAP=y
+CONFIG_PPC_KUAP=y
+# CONFIG_PPC_KUAP_DEBUG is not set
 CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y
 CONFIG_PPC_MM_SLICES=y
 CONFIG_PPC_HAVE_PMU_SUPPORT=y
@@ -246,6 +273,8 @@ CONFIG_FORCE_SMP=y
 CONFIG_SMP=y
 CONFIG_NR_CPUS=2048
 CONFIG_PPC_DOORBELL=y
+# end of Processor support
+
 CONFIG_VDSO32=y
 CONFIG_CPU_BIG_ENDIAN=y
 # CONFIG_CPU_LITTLE_ENDIAN is not set
@@ -263,7 +292,6 @@ CONFIG_PPC_WATCHDOG=y
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_PPC=y
 CONFIG_PPC_BARRIER_NOSPEC=y
@@ -280,11 +308,13 @@ CONFIG_GENERIC_BUG=y
 CONFIG_EPAPR_BOOT=y
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_ARCH_SUSPEND_NONZERO_CPU=y
 CONFIG_PPC_DCR_MMIO=y
 CONFIG_PPC_DCR=y
 CONFIG_PPC_OF_PLATFORM_PCI=y
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 CONFIG_ARCH_SUPPORTS_UPROBES=y
+CONFIG_PPC_DAWR=y
 CONFIG_PGTABLE_LEVELS=4
 CONFIG_PPC_MSI_BITMAP=y
 CONFIG_PPC_XICS=y
@@ -327,6 +357,8 @@ CONFIG_PPC_PASEMI=y
 # CONFIG_PPC_PASEMI_NEMO is not set
 # CONFIG_PPC_PASEMI_IOMMU is not set
 CONFIG_PPC_PASEMI_MDIO=m
+# end of PA Semi PWRficient options
+
 CONFIG_PPC_PS3=y
 
 #
@@ -345,6 +377,8 @@ CONFIG_PS3_ROM=m
 CONFIG_PS3_FLASH=m
 CONFIG_PS3_LPM=m
 # CONFIG_PS3GELIC_UDBG is not set
+# end of PS3 Platform Options
+
 CONFIG_PPC_CELL=y
 CONFIG_PPC_CELL_COMMON=y
 CONFIG_PPC_CELL_NATIVE=y
@@ -362,6 +396,8 @@ CONFIG_PPC_IBM_CELL_POWERBUTTON=m
 CONFIG_CBE_THERM=m
 CONFIG_PPC_PMI=y
 CONFIG_CBE_CPUFREQ_SPU_GOVERNOR=m
+# end of Cell Broadband Engine options
+
 CONFIG_OPROFILE_CELL=y
 CONFIG_KVM_GUEST=y
 CONFIG_EPAPR_PARAVIRT=y
@@ -418,6 +454,7 @@ CONFIG_CPU_FREQ_MAPLE=y
 CONFIG_CPU_FREQ_PMAC64=y
 CONFIG_PPC_PASEMI_CPUFREQ=y
 CONFIG_POWERNV_CPUFREQ=y
+# end of CPU Frequency scaling
 
 #
 # CPUIdle driver
@@ -436,8 +473,13 @@ CONFIG_CPU_IDLE_GOV_TEO=y
 #
 CONFIG_PSERIES_CPUIDLE=y
 CONFIG_POWERNV_CPUIDLE=y
+# end of POWERPC CPU Idle Drivers
+# end of CPU Idle
+# end of CPUIdle driver
+
 # CONFIG_GEN_RTC is not set
 # CONFIG_SIMPLE_GPIO is not set
+# end of Platform support
 
 #
 # Kernel options
@@ -498,6 +540,7 @@ CONFIG_HIBERNATION=y
 CONFIG_PM_STD_PARTITION=""
 CONFIG_PM_SLEEP=y
 CONFIG_PM_SLEEP_SMP=y
+CONFIG_PM_SLEEP_SMP_NONZERO_CPU=y
 # CONFIG_PM_AUTOSLEEP is not set
 # CONFIG_PM_WAKELOCKS is not set
 CONFIG_PM=y
@@ -513,6 +556,8 @@ CONFIG_PM_GENERIC_DOMAINS_OF=y
 CONFIG_ENERGY_MODEL=y
 CONFIG_SECCOMP=y
 CONFIG_PPC_MEM_KEYS=y
+# end of Kernel options
+
 CONFIG_ISA_DMA_API=y
 
 #
@@ -520,6 +565,8 @@ CONFIG_ISA_DMA_API=y
 #
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_FSL_LBC=y
+# end of Bus options
+
 CONFIG_NONSTATIC_KERNEL=y
 CONFIG_PAGE_OFFSET=0xc000000000000000
 CONFIG_KERNEL_START=0xc000000000000000
@@ -587,6 +634,8 @@ CONFIG_HAVE_PERF_REGS=y
 CONFIG_HAVE_PERF_USER_STACK_DUMP=y
 CONFIG_HAVE_ARCH_JUMP_LABEL=y
 CONFIG_HAVE_RCU_TABLE_FREE=y
+CONFIG_HAVE_RCU_TABLE_NO_INVALIDATE=y
+CONFIG_HAVE_MMU_GATHER_PAGE_SIZE=y
 CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
 CONFIG_ARCH_WEAK_RELEASE_ACQUIRE=y
 CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
@@ -603,6 +652,7 @@ CONFIG_HAVE_VIRT_CPU_ACCOUNTING=y
 CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
 CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
 CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
+CONFIG_HAVE_ARCH_HUGE_VMAP=y
 CONFIG_HAVE_ARCH_SOFT_DIRTY=y
 CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
 CONFIG_MODULES_USE_ELF_RELA=y
@@ -620,15 +670,28 @@ CONFIG_64BIT_TIME=y
 CONFIG_COMPAT_32BIT_TIME=y
 CONFIG_ARCH_HAS_PHYS_TO_DMA=y
 CONFIG_REFCOUNT_FULL=y
+# CONFIG_LOCK_EVENT_COUNTS is not set
 
 #
 # GCOV-based kernel profiling
 #
 # CONFIG_GCOV_KERNEL is not set
 CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
+# end of GCOV-based kernel profiling
+
 CONFIG_PLUGIN_HOSTCC="g++"
 CONFIG_HAVE_GCC_PLUGINS=y
-# CONFIG_GCC_PLUGINS is not set
+CONFIG_GCC_PLUGINS=y
+
+#
+# GCC plugins
+#
+# CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set
+# CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
+# CONFIG_GCC_PLUGIN_RANDSTRUCT is not set
+# end of GCC plugins
+# end of General architecture-dependent options
+
 CONFIG_RT_MUTEXES=y
 CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
@@ -682,6 +745,8 @@ CONFIG_LDM_PARTITION=y
 CONFIG_EFI_PARTITION=y
 # CONFIG_SYSV68_PARTITION is not set
 CONFIG_CMDLINE_PARTITION=y
+# end of Partition Types
+
 CONFIG_BLOCK_COMPAT=y
 CONFIG_BLK_MQ_PCI=y
 CONFIG_BLK_MQ_VIRTIO=y
@@ -695,6 +760,9 @@ CONFIG_MQ_IOSCHED_DEADLINE=y
 CONFIG_MQ_IOSCHED_KYBER=y
 CONFIG_IOSCHED_BFQ=y
 CONFIG_BFQ_GROUP_IOSCHED=y
+# CONFIG_BFQ_CGROUP_DEBUG is not set
+# end of IO Schedulers
+
 CONFIG_PREEMPT_NOTIFIERS=y
 CONFIG_PADATA=y
 CONFIG_ASN1=y
@@ -707,6 +775,8 @@ CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
 CONFIG_MUTEX_SPIN_ON_OWNER=y
 CONFIG_RWSEM_SPIN_ON_OWNER=y
 CONFIG_LOCK_SPIN_ON_OWNER=y
+CONFIG_ARCH_HAS_MMIOWB=y
+CONFIG_MMIOWB=y
 CONFIG_FREEZER=y
 
 #
@@ -719,6 +789,7 @@ CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 CONFIG_BINFMT_SCRIPT=y
 CONFIG_BINFMT_MISC=m
 CONFIG_COREDUMP=y
+# end of Executable file formats
 
 #
 # Memory Management options
@@ -732,7 +803,8 @@ CONFIG_SPARSEMEM_EXTREME=y
 CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
 CONFIG_SPARSEMEM_VMEMMAP=y
 CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
-CONFIG_HAVE_GENERIC_GUP=y
+CONFIG_HAVE_FAST_GUP=y
+CONFIG_ARCH_KEEP_MEMBLOCK=y
 CONFIG_MEMORY_ISOLATION=y
 CONFIG_HAVE_BOOTMEM_INFO_NODE=y
 CONFIG_MEMORY_HOTPLUG=y
@@ -745,6 +817,7 @@ CONFIG_BALLOON_COMPACTION=y
 CONFIG_COMPACTION=y
 CONFIG_MIGRATION=y
 CONFIG_ARCH_ENABLE_THP_MIGRATION=y
+CONFIG_CONTIG_ALLOC=y
 CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_MMU_NOTIFIER=y
 CONFIG_KSM=y
@@ -772,21 +845,20 @@ CONFIG_PGTABLE_MAPPING=y
 # CONFIG_ZSMALLOC_STAT is not set
 # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
 CONFIG_IDLE_PAGE_TRACKING=y
-CONFIG_ARCH_HAS_ZONE_DEVICE=y
+CONFIG_ARCH_HAS_PTE_DEVMAP=y
 CONFIG_ZONE_DEVICE=y
-CONFIG_ARCH_HAS_HMM=y
-CONFIG_MIGRATE_VMA_HELPER=y
 CONFIG_DEV_PAGEMAP_OPS=y
-CONFIG_HMM=y
 CONFIG_HMM_MIRROR=y
 CONFIG_DEVICE_PRIVATE=y
-CONFIG_DEVICE_PUBLIC=y
 CONFIG_FRAME_VECTOR=y
 CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
 CONFIG_ARCH_HAS_PKEYS=y
 # CONFIG_PERCPU_STATS is not set
 # CONFIG_GUP_BENCHMARK is not set
 CONFIG_ARCH_HAS_PTE_SPECIAL=y
+CONFIG_ARCH_HAS_HUGEPD=y
+# end of Memory Management options
+
 CONFIG_NET=y
 CONFIG_COMPAT_NETLINK_MESSAGES=y
 CONFIG_NET_INGRESS=y
@@ -847,9 +919,6 @@ CONFIG_INET_ESP_OFFLOAD=m
 CONFIG_INET_IPCOMP=m
 CONFIG_INET_XFRM_TUNNEL=m
 CONFIG_INET_TUNNEL=m
-CONFIG_INET_XFRM_MODE_TRANSPORT=m
-CONFIG_INET_XFRM_MODE_TUNNEL=m
-CONFIG_INET_XFRM_MODE_BEET=m
 CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 CONFIG_INET_UDP_DIAG=y
@@ -887,10 +956,6 @@ CONFIG_IPV6_MIP6=m
 CONFIG_IPV6_ILA=m
 CONFIG_INET6_XFRM_TUNNEL=m
 CONFIG_INET6_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-CONFIG_INET6_XFRM_MODE_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_BEET=m
-CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
 CONFIG_IPV6_VTI=m
 CONFIG_IPV6_SIT=m
 CONFIG_IPV6_SIT_6RD=y
@@ -955,7 +1020,6 @@ CONFIG_NF_CT_NETLINK_TIMEOUT=m
 CONFIG_NF_CT_NETLINK_HELPER=m
 CONFIG_NETFILTER_NETLINK_GLUE_CT=y
 CONFIG_NF_NAT=m
-CONFIG_NF_NAT_NEEDED=y
 CONFIG_NF_NAT_AMANDA=m
 CONFIG_NF_NAT_FTP=m
 CONFIG_NF_NAT_IRC=m
@@ -992,6 +1056,7 @@ CONFIG_NFT_XFRM=m
 CONFIG_NFT_SOCKET=m
 CONFIG_NFT_OSF=m
 CONFIG_NFT_TPROXY=m
+# CONFIG_NFT_SYNPROXY is not set
 CONFIG_NF_DUP_NETDEV=m
 CONFIG_NFT_DUP_NETDEV=m
 CONFIG_NFT_FWD_NETDEV=m
@@ -1030,6 +1095,7 @@ CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
 CONFIG_NETFILTER_XT_TARGET_RATEEST=m
 CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
+CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m
 CONFIG_NETFILTER_XT_TARGET_TEE=m
 CONFIG_NETFILTER_XT_TARGET_TPROXY=m
 CONFIG_NETFILTER_XT_TARGET_TRACE=m
@@ -1086,6 +1152,8 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m
 CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
 CONFIG_NETFILTER_XT_MATCH_TIME=m
 CONFIG_NETFILTER_XT_MATCH_U32=m
+# end of Core Netfilter Configuration
+
 CONFIG_IP_SET=m
 CONFIG_IP_SET_MAX=256
 CONFIG_IP_SET_BITMAP_IP=m
@@ -1160,7 +1228,6 @@ CONFIG_NF_DEFRAG_IPV4=m
 CONFIG_NF_SOCKET_IPV4=m
 CONFIG_NF_TPROXY_IPV4=m
 CONFIG_NF_TABLES_IPV4=y
-CONFIG_NFT_CHAIN_ROUTE_IPV4=m
 CONFIG_NFT_REJECT_IPV4=m
 CONFIG_NFT_DUP_IPV4=m
 CONFIG_NFT_FIB_IPV4=m
@@ -1194,6 +1261,7 @@ CONFIG_IP_NF_RAW=m
 CONFIG_IP_NF_ARPTABLES=m
 CONFIG_IP_NF_ARPFILTER=m
 CONFIG_IP_NF_ARP_MANGLE=m
+# end of IP: Netfilter Configuration
 
 #
 # IPv6: Netfilter Configuration
@@ -1201,7 +1269,6 @@ CONFIG_IP_NF_ARP_MANGLE=m
 CONFIG_NF_SOCKET_IPV6=m
 CONFIG_NF_TPROXY_IPV6=m
 CONFIG_NF_TABLES_IPV6=y
-CONFIG_NFT_CHAIN_ROUTE_IPV6=m
 CONFIG_NFT_REJECT_IPV6=m
 CONFIG_NFT_DUP_IPV6=m
 CONFIG_NFT_FIB_IPV6=m
@@ -1230,10 +1297,14 @@ CONFIG_IP6_NF_RAW=m
 CONFIG_IP6_NF_NAT=m
 CONFIG_IP6_NF_TARGET_MASQUERADE=m
 CONFIG_IP6_NF_TARGET_NPT=m
+# end of IPv6: Netfilter Configuration
+
 CONFIG_NF_DEFRAG_IPV6=m
-CONFIG_NF_TABLES_BRIDGE=y
+CONFIG_NF_TABLES_BRIDGE=m
+# CONFIG_NFT_BRIDGE_META is not set
 CONFIG_NFT_BRIDGE_REJECT=m
 CONFIG_NF_LOG_BRIDGE=m
+# CONFIG_NF_CONNTRACK_BRIDGE is not set
 CONFIG_BRIDGE_NF_EBTABLES=m
 CONFIG_BRIDGE_EBT_BROUTE=m
 CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -1266,11 +1337,14 @@ CONFIG_INET_DCCP_DIAG=m
 CONFIG_IP_DCCP_CCID3=y
 # CONFIG_IP_DCCP_CCID3_DEBUG is not set
 CONFIG_IP_DCCP_TFRC_LIB=y
+# end of DCCP CCIDs Configuration
 
 #
 # DCCP Kernel Hacking
 #
 # CONFIG_IP_DCCP_DEBUG is not set
+# end of DCCP Kernel Hacking
+
 CONFIG_IP_SCTP=m
 # CONFIG_SCTP_DBG_OBJCNT is not set
 # CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5 is not set
@@ -1307,14 +1381,21 @@ CONFIG_BRIDGE_IGMP_SNOOPING=y
 CONFIG_BRIDGE_VLAN_FILTERING=y
 CONFIG_HAVE_NET_DSA=y
 CONFIG_NET_DSA=m
-CONFIG_NET_DSA_LEGACY=y
-CONFIG_NET_DSA_TAG_BRCM=y
-CONFIG_NET_DSA_TAG_BRCM_PREPEND=y
-CONFIG_NET_DSA_TAG_DSA=y
-CONFIG_NET_DSA_TAG_EDSA=y
-CONFIG_NET_DSA_TAG_GSWIP=y
-CONFIG_NET_DSA_TAG_TRAILER=y
-CONFIG_NET_DSA_TAG_QCA=y
+CONFIG_NET_DSA_TAG_8021Q=m
+CONFIG_NET_DSA_TAG_BRCM_COMMON=m
+CONFIG_NET_DSA_TAG_BRCM=m
+CONFIG_NET_DSA_TAG_BRCM_PREPEND=m
+CONFIG_NET_DSA_TAG_GSWIP=m
+CONFIG_NET_DSA_TAG_DSA=m
+CONFIG_NET_DSA_TAG_EDSA=m
+CONFIG_NET_DSA_TAG_MTK=m
+CONFIG_NET_DSA_TAG_KSZ_COMMON=m
+CONFIG_NET_DSA_TAG_KSZ=m
+CONFIG_NET_DSA_TAG_KSZ9477=m
+CONFIG_NET_DSA_TAG_QCA=m
+CONFIG_NET_DSA_TAG_LAN9303=m
+CONFIG_NET_DSA_TAG_SJA1105=m
+CONFIG_NET_DSA_TAG_TRAILER=m
 CONFIG_VLAN_8021Q=m
 CONFIG_VLAN_8021Q_GVRP=y
 CONFIG_VLAN_8021Q_MVRP=y
@@ -1417,16 +1498,18 @@ CONFIG_NET_ACT_PEDIT=m
 CONFIG_NET_ACT_SIMP=m
 CONFIG_NET_ACT_SKBEDIT=m
 CONFIG_NET_ACT_CSUM=m
+# CONFIG_NET_ACT_MPLS is not set
 CONFIG_NET_ACT_VLAN=m
 CONFIG_NET_ACT_BPF=m
 CONFIG_NET_ACT_CONNMARK=m
+# CONFIG_NET_ACT_CTINFO is not set
 CONFIG_NET_ACT_SKBMOD=m
 CONFIG_NET_ACT_IFE=m
 CONFIG_NET_ACT_TUNNEL_KEY=m
+# CONFIG_NET_ACT_CT is not set
 CONFIG_NET_IFE_SKBMARK=m
 CONFIG_NET_IFE_SKBPRIO=m
 CONFIG_NET_IFE_SKBTCINDEX=m
-CONFIG_NET_CLS_IND=y
 CONFIG_NET_SCH_FIFO=y
 CONFIG_DCB=y
 CONFIG_DNS_RESOLVER=y
@@ -1438,6 +1521,7 @@ CONFIG_BATMAN_ADV_NC=y
 CONFIG_BATMAN_ADV_MCAST=y
 CONFIG_BATMAN_ADV_DEBUGFS=y
 # CONFIG_BATMAN_ADV_DEBUG is not set
+CONFIG_BATMAN_ADV_SYSFS=y
 # CONFIG_BATMAN_ADV_TRACING is not set
 CONFIG_OPENVSWITCH=m
 CONFIG_OPENVSWITCH_GRE=m
@@ -1473,6 +1557,9 @@ CONFIG_NET_FLOW_LIMIT=y
 #
 # CONFIG_NET_PKTGEN is not set
 # CONFIG_NET_DROP_MONITOR is not set
+# end of Network testing
+# end of Networking options
+
 CONFIG_HAMRADIO=y
 
 #
@@ -1493,6 +1580,8 @@ CONFIG_BAYCOM_SER_FDX=m
 CONFIG_BAYCOM_SER_HDX=m
 CONFIG_BAYCOM_PAR=m
 CONFIG_YAM=m
+# end of AX.25 network device drivers
+
 CONFIG_CAN=m
 CONFIG_CAN_RAW=m
 CONFIG_CAN_BCM=m
@@ -1528,6 +1617,7 @@ CONFIG_CAN_SOFTING_CS=m
 #
 # CONFIG_CAN_HI311X is not set
 CONFIG_CAN_MCP251X=m
+# end of CAN SPI interfaces
 
 #
 # CAN USB interfaces
@@ -1540,7 +1630,11 @@ CONFIG_CAN_KVASER_USB=m
 # CONFIG_CAN_MCBA_USB is not set
 CONFIG_CAN_PEAK_USB=m
 CONFIG_CAN_UCAN=m
+# end of CAN USB interfaces
+
 CONFIG_CAN_DEBUG_DEVICES=y
+# end of CAN Device Drivers
+
 CONFIG_BT=m
 CONFIG_BT_BREDR=y
 CONFIG_BT_RFCOMM=m
@@ -1566,6 +1660,7 @@ CONFIG_BT_QCA=m
 CONFIG_BT_HCIBTUSB=m
 CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
 CONFIG_BT_HCIBTUSB_BCM=y
+# CONFIG_BT_HCIBTUSB_MTK is not set
 CONFIG_BT_HCIBTUSB_RTL=y
 CONFIG_BT_HCIBTSDIO=m
 CONFIG_BT_HCIUART=m
@@ -1592,8 +1687,11 @@ CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
 CONFIG_BT_ATH3K=m
 CONFIG_BT_WILINK=m
+CONFIG_BT_MTKSDIO=m
 CONFIG_BT_MTKUART=m
 CONFIG_BT_HCIRSI=m
+# end of Bluetooth device drivers
+
 CONFIG_AF_RXRPC=m
 CONFIG_AF_RXRPC_IPV6=y
 # CONFIG_AF_RXRPC_INJECT_LOSS is not set
@@ -1690,6 +1788,8 @@ CONFIG_NFC_NXP_NCI_I2C=m
 CONFIG_NFC_S3FWRN5=m
 CONFIG_NFC_S3FWRN5_I2C=m
 CONFIG_NFC_ST95HF=m
+# end of Near Field Communication (NFC) devices
+
 CONFIG_PSAMPLE=m
 CONFIG_NET_IFE=m
 CONFIG_LWTUNNEL=y
@@ -1754,6 +1854,8 @@ CONFIG_HOTPLUG_PCI_RPA_DLPAR=m
 CONFIG_PCIE_CADENCE=y
 CONFIG_PCIE_CADENCE_HOST=y
 CONFIG_PCIE_CADENCE_EP=y
+# end of Cadence PCIe controllers support
+
 CONFIG_PCI_FTPCI100=y
 CONFIG_PCI_HOST_COMMON=y
 CONFIG_PCI_HOST_GENERIC=y
@@ -1762,6 +1864,8 @@ CONFIG_PCIE_XILINX=y
 #
 # DesignWare PCI Core Support
 #
+# end of DesignWare PCI Core Support
+# end of PCI controller drivers
 
 #
 # PCI Endpoint
@@ -1769,11 +1873,14 @@ CONFIG_PCIE_XILINX=y
 CONFIG_PCI_ENDPOINT=y
 CONFIG_PCI_ENDPOINT_CONFIGFS=y
 # CONFIG_PCI_EPF_TEST is not set
+# end of PCI Endpoint
 
 #
 # PCI switch controller drivers
 #
 CONFIG_PCI_SW_SWITCHTEC=m
+# end of PCI switch controller drivers
+
 CONFIG_PCCARD=m
 CONFIG_PCMCIA=m
 CONFIG_PCMCIA_LOAD_CIS=y
@@ -1810,6 +1917,7 @@ CONFIG_RAPIDIO_CPS_XX=m
 CONFIG_RAPIDIO_TSI568=m
 CONFIG_RAPIDIO_CPS_GEN2=m
 CONFIG_RAPIDIO_RXS_GEN3=m
+# end of RapidIO Switch drivers
 
 #
 # Generic Driver Options
@@ -1824,9 +1932,13 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 # Firmware loader
 #
 CONFIG_FW_LOADER=y
+CONFIG_FW_LOADER_PAGED_BUF=y
 CONFIG_EXTRA_FIRMWARE=""
 CONFIG_FW_LOADER_USER_HELPER=y
 # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
+# CONFIG_FW_LOADER_COMPRESS is not set
+# end of Firmware loader
+
 CONFIG_WANT_DEV_COREDUMP=y
 CONFIG_ALLOW_DEV_COREDUMP=y
 CONFIG_DEV_COREDUMP=y
@@ -1846,11 +1958,14 @@ CONFIG_REGMAP_MMIO=y
 CONFIG_REGMAP_IRQ=y
 CONFIG_DMA_SHARED_BUFFER=y
 # CONFIG_DMA_FENCE_TRACE is not set
+# end of Generic Driver Options
 
 #
 # Bus devices
 #
 CONFIG_SIMPLE_PM_BUS=y
+# end of Bus devices
+
 CONFIG_CONNECTOR=y
 CONFIG_PROC_EVENTS=y
 CONFIG_GNSS=m
@@ -1871,6 +1986,7 @@ CONFIG_MTD_REDBOOT_PARTS=m
 CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
 # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
 # CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
+# end of Partition parsers
 
 #
 # User Modules And Translation Layers
@@ -1901,6 +2017,7 @@ CONFIG_MTD_CFI_I2=y
 CONFIG_MTD_RAM=m
 CONFIG_MTD_ROM=m
 CONFIG_MTD_ABSENT=m
+# end of RAM/ROM/Flash chip drivers
 
 #
 # Mapping drivers for chip access
@@ -1916,6 +2033,7 @@ CONFIG_MTD_PCI=m
 # CONFIG_MTD_PCMCIA is not set
 # CONFIG_MTD_INTEL_VR_NOR is not set
 CONFIG_MTD_PLATRAM=m
+# end of Mapping drivers for chip access
 
 #
 # Self-contained MTD device drivers
@@ -1939,30 +2057,39 @@ CONFIG_MTD_POWERNV_FLASH=m
 # Disk-On-Chip Device Drivers
 #
 # CONFIG_MTD_DOCG3 is not set
+# end of Self-contained MTD device drivers
+
 CONFIG_MTD_NAND_CORE=m
 CONFIG_MTD_ONENAND=m
 CONFIG_MTD_ONENAND_VERIFY_WRITE=y
 CONFIG_MTD_ONENAND_GENERIC=m
 # CONFIG_MTD_ONENAND_OTP is not set
 CONFIG_MTD_ONENAND_2X_PROGRAM=y
-CONFIG_MTD_NAND_ECC=m
-# CONFIG_MTD_NAND_ECC_SMC is not set
-CONFIG_MTD_NAND=m
-CONFIG_MTD_NAND_BCH=m
-CONFIG_MTD_NAND_ECC_BCH=y
-CONFIG_MTD_SM_COMMON=m
+CONFIG_MTD_NAND_ECC_SW_HAMMING=m
+# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
+CONFIG_MTD_RAW_NAND=m
+CONFIG_MTD_NAND_ECC_SW_BCH=y
+
+#
+# Raw/parallel NAND flash controllers
+#
 CONFIG_MTD_NAND_DENALI=m
 CONFIG_MTD_NAND_DENALI_PCI=m
+CONFIG_MTD_NAND_CAFE=m
+# CONFIG_MTD_NAND_PASEMI is not set
 CONFIG_MTD_NAND_GPIO=m
+CONFIG_MTD_NAND_PLATFORM=m
+
+#
+# Misc
+#
+CONFIG_MTD_SM_COMMON=m
+CONFIG_MTD_NAND_NANDSIM=m
 CONFIG_MTD_NAND_RICOH=m
 CONFIG_MTD_NAND_DISKONCHIP=m
 # CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set
 CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
 # CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set
-CONFIG_MTD_NAND_CAFE=m
-# CONFIG_MTD_NAND_PASEMI is not set
-CONFIG_MTD_NAND_NANDSIM=m
-CONFIG_MTD_NAND_PLATFORM=m
 CONFIG_MTD_SPI_NAND=m
 
 #
@@ -1970,6 +2097,8 @@ CONFIG_MTD_SPI_NAND=m
 #
 CONFIG_MTD_LPDDR=m
 CONFIG_MTD_QINFO_PROBE=m
+# end of LPDDR & LPDDR2 PCM memory drivers
+
 CONFIG_MTD_SPI_NOR=m
 CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y
 CONFIG_SPI_MTK_QUADSPI=m
@@ -1979,6 +2108,7 @@ CONFIG_MTD_UBI_BEB_LIMIT=20
 CONFIG_MTD_UBI_FASTMAP=y
 CONFIG_MTD_UBI_GLUEBI=m
 CONFIG_MTD_UBI_BLOCK=y
+# CONFIG_MTD_HYPERBUS is not set
 CONFIG_DTC=y
 CONFIG_OF=y
 # CONFIG_OF_UNITTEST is not set
@@ -2049,6 +2179,7 @@ CONFIG_NVME_TARGET_RDMA=m
 CONFIG_NVME_TARGET_FC=m
 CONFIG_NVME_TARGET_FCLOOP=m
 CONFIG_NVME_TARGET_TCP=m
+# end of NVME Support
 
 #
 # Misc devices
@@ -2074,10 +2205,10 @@ CONFIG_SENSORS_BH1770=m
 CONFIG_SENSORS_APDS990X=m
 CONFIG_HMC6352=m
 CONFIG_DS1682=m
-CONFIG_USB_SWITCH_FSA9480=m
 CONFIG_LATTICE_ECP3_CONFIG=m
 CONFIG_SRAM=y
 # CONFIG_PCI_ENDPOINT_TEST is not set
+# CONFIG_XILINX_SDFEC is not set
 CONFIG_MISC_RTSX=m
 CONFIG_PVPANIC=m
 CONFIG_C2PORT=m
@@ -2093,6 +2224,8 @@ CONFIG_EEPROM_93CX6=m
 CONFIG_EEPROM_93XX46=m
 CONFIG_EEPROM_IDT_89HPESX=m
 CONFIG_EEPROM_EE1004=m
+# end of EEPROM support
+
 CONFIG_CB710_CORE=m
 # CONFIG_CB710_DEBUG is not set
 CONFIG_CB710_DEBUG_ASSUMPTIONS=y
@@ -2101,6 +2234,8 @@ CONFIG_CB710_DEBUG_ASSUMPTIONS=y
 # Texas Instruments shared transport line discipline
 #
 CONFIG_TI_ST=m
+# end of Texas Instruments shared transport line discipline
+
 CONFIG_SENSORS_LIS3_SPI=m
 CONFIG_SENSORS_LIS3_I2C=m
 CONFIG_ALTERA_STAPL=m
@@ -2143,6 +2278,8 @@ CONFIG_VOP_BUS=m
 #
 CONFIG_VOP=m
 CONFIG_VHOST_RING=m
+# end of Intel MIC & related support
+
 CONFIG_GENWQE=m
 CONFIG_GENWQE_PLATFORM_ERROR_RECOVERY=0
 CONFIG_ECHO=m
@@ -2156,6 +2293,8 @@ CONFIG_MISC_ALCOR_PCI=m
 CONFIG_MISC_RTSX_PCI=m
 CONFIG_MISC_RTSX_USB=m
 CONFIG_HABANA_AI=m
+# end of Misc devices
+
 CONFIG_HAVE_IDE=y
 # CONFIG_IDE is not set
 
@@ -2174,7 +2313,6 @@ CONFIG_SCSI_PROC_FS=y
 #
 CONFIG_BLK_DEV_SD=m
 CONFIG_CHR_DEV_ST=m
-CONFIG_CHR_DEV_OSST=m
 CONFIG_BLK_DEV_SR=m
 CONFIG_BLK_DEV_SR_VENDOR=y
 CONFIG_CHR_DEV_SG=m
@@ -2195,6 +2333,8 @@ CONFIG_SCSI_SAS_LIBSAS=m
 CONFIG_SCSI_SAS_ATA=y
 CONFIG_SCSI_SAS_HOST_SMP=y
 CONFIG_SCSI_SRP_ATTRS=m
+# end of SCSI Transports
+
 CONFIG_SCSI_LOWLEVEL=y
 CONFIG_ISCSI_TCP=m
 CONFIG_ISCSI_BOOT_SYSFS=m
@@ -2256,6 +2396,7 @@ CONFIG_FCOE=m
 CONFIG_SCSI_SNIC=m
 # CONFIG_SCSI_SNIC_DEBUG_FS is not set
 CONFIG_SCSI_DMX3191D=m
+# CONFIG_SCSI_FDOMAIN_PCI is not set
 CONFIG_SCSI_GDTH=m
 CONFIG_SCSI_IPS=m
 CONFIG_SCSI_IBMVSCSI=m
@@ -2297,6 +2438,7 @@ CONFIG_SCSI_VIRTIO=m
 CONFIG_SCSI_CHELSIO_FCOE=m
 CONFIG_SCSI_LOWLEVEL_PCMCIA=y
 CONFIG_PCMCIA_AHA152X=m
+# CONFIG_PCMCIA_FDOMAIN is not set
 CONFIG_PCMCIA_QLOGIC=m
 CONFIG_PCMCIA_SYM53C500=m
 CONFIG_SCSI_DH=y
@@ -2304,6 +2446,8 @@ CONFIG_SCSI_DH_RDAC=m
 CONFIG_SCSI_DH_HP_SW=m
 CONFIG_SCSI_DH_EMC=m
 CONFIG_SCSI_DH_ALUA=m
+# end of SCSI device support
+
 CONFIG_ATA=m
 CONFIG_ATA_NONSTANDARD=y
 CONFIG_ATA_VERBOSE_ERROR=y
@@ -2439,6 +2583,7 @@ CONFIG_DM_MULTIPATH=m
 CONFIG_DM_MULTIPATH_QL=m
 CONFIG_DM_MULTIPATH_ST=m
 CONFIG_DM_DELAY=m
+CONFIG_DM_DUST=m
 CONFIG_DM_UEVENT=y
 CONFIG_DM_FLAKEY=m
 CONFIG_DM_VERITY=m
@@ -2474,6 +2619,8 @@ CONFIG_FIREWIRE_OHCI=m
 CONFIG_FIREWIRE_SBP2=m
 CONFIG_FIREWIRE_NET=m
 CONFIG_FIREWIRE_NOSY=m
+# end of IEEE 1394 (FireWire) support
+
 CONFIG_MACINTOSH_DRIVERS=y
 CONFIG_ADB_PMU=y
 CONFIG_ADB_PMU_LED=y
@@ -2580,11 +2727,16 @@ CONFIG_NET_DSA_MV88E6060=m
 CONFIG_NET_DSA_MV88E6XXX=m
 CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y
 CONFIG_NET_DSA_MV88E6XXX_PTP=y
+CONFIG_NET_DSA_SJA1105=m
+# CONFIG_NET_DSA_SJA1105_PTP is not set
 CONFIG_NET_DSA_QCA8K=m
 # CONFIG_NET_DSA_REALTEK_SMI is not set
 # CONFIG_NET_DSA_SMSC_LAN9303_I2C is not set
 # CONFIG_NET_DSA_SMSC_LAN9303_MDIO is not set
-# CONFIG_NET_DSA_VITESSE_VSC73XX is not set
+# CONFIG_NET_DSA_VITESSE_VSC73XX_SPI is not set
+# CONFIG_NET_DSA_VITESSE_VSC73XX_PLATFORM is not set
+# end of Distributed Switch Architecture drivers
+
 CONFIG_ETHERNET=y
 CONFIG_MDIO=m
 CONFIG_NET_VENDOR_3COM=y
@@ -2638,8 +2790,6 @@ CONFIG_BNXT_HWMON=y
 CONFIG_NET_VENDOR_BROCADE=y
 CONFIG_BNA=m
 CONFIG_NET_VENDOR_CADENCE=y
-CONFIG_MACB=m
-CONFIG_MACB_USE_HWSTAMP=y
 CONFIG_NET_VENDOR_CAVIUM=y
 CONFIG_THUNDER_NIC_PF=m
 CONFIG_THUNDER_NIC_VF=m
@@ -2689,6 +2839,8 @@ CONFIG_NET_VENDOR_EZCHIP=y
 CONFIG_EZCHIP_NPS_MANAGEMENT_ENET=m
 CONFIG_NET_VENDOR_FUJITSU=y
 CONFIG_PCMCIA_FMVJ18X=m
+CONFIG_NET_VENDOR_GOOGLE=y
+# CONFIG_GVE is not set
 CONFIG_NET_VENDOR_HP=y
 CONFIG_HP100=m
 CONFIG_NET_VENDOR_HUAWEI=y
@@ -2862,6 +3014,7 @@ CONFIG_SMSC9420=m
 CONFIG_NET_VENDOR_SOCIONEXT=y
 CONFIG_NET_VENDOR_STMICRO=y
 CONFIG_STMMAC_ETH=m
+# CONFIG_STMMAC_SELFTESTS is not set
 CONFIG_STMMAC_PLATFORM=m
 # CONFIG_DWMAC_DWC_QOS_ETH is not set
 CONFIG_DWMAC_GENERIC=m
@@ -2877,7 +3030,6 @@ CONFIG_NET_VENDOR_TEHUTI=y
 CONFIG_TEHUTI=m
 CONFIG_NET_VENDOR_TI=y
 # CONFIG_TI_CPSW_PHY_SEL is not set
-CONFIG_TI_CPSW_ALE=m
 CONFIG_TLAN=m
 CONFIG_NET_VENDOR_TOSHIBA=y
 # CONFIG_GELIC_NET is not set
@@ -2894,6 +3046,7 @@ CONFIG_WIZNET_W5300=m
 CONFIG_WIZNET_BUS_ANY=y
 CONFIG_WIZNET_W5100_SPI=m
 CONFIG_NET_VENDOR_XILINX=y
+CONFIG_XILINX_LL_TEMAC=m
 CONFIG_NET_VENDOR_XIRCOM=y
 CONFIG_PCMCIA_XIRC2PS=m
 CONFIG_FDDI=y
@@ -2952,6 +3105,7 @@ CONFIG_MICROCHIP_PHY=m
 CONFIG_MICROCHIP_T1_PHY=m
 CONFIG_MICROSEMI_PHY=m
 CONFIG_NATIONAL_PHY=m
+# CONFIG_NXP_TJA11XX_PHY is not set
 CONFIG_QSEMI_PHY=m
 CONFIG_REALTEK_PHY=m
 CONFIG_RENESAS_PHY=m
@@ -3150,6 +3304,8 @@ CONFIG_IWL3945=m
 #
 # CONFIG_IWLEGACY_DEBUG is not set
 CONFIG_IWLEGACY_DEBUGFS=y
+# end of iwl3945 / iwl4965 Debugging Options
+
 CONFIG_IWLWIFI=m
 CONFIG_IWLWIFI_LEDS=y
 CONFIG_IWLDVM=m
@@ -3164,6 +3320,8 @@ CONFIG_IWLWIFI_PCIE_RTPM=y
 # CONFIG_IWLWIFI_DEBUG is not set
 # CONFIG_IWLWIFI_DEBUGFS is not set
 # CONFIG_IWLWIFI_DEVICE_TRACING is not set
+# end of Debugging Options
+
 CONFIG_WLAN_VENDOR_INTERSIL=y
 CONFIG_HOSTAP=m
 CONFIG_HOSTAP_FIRMWARE=y
@@ -3219,6 +3377,7 @@ CONFIG_MT76x2_COMMON=m
 CONFIG_MT76x2E=m
 CONFIG_MT76x2U=m
 CONFIG_MT7603E=m
+CONFIG_MT7615E=m
 CONFIG_WLAN_VENDOR_RALINK=y
 CONFIG_RT2X00=m
 CONFIG_RT2400PCI=m
@@ -3272,6 +3431,13 @@ CONFIG_RTL8723_COMMON=m
 CONFIG_RTLBTCOEXIST=m
 CONFIG_RTL8XXXU=m
 # CONFIG_RTL8XXXU_UNTESTED is not set
+CONFIG_RTW88=m
+CONFIG_RTW88_CORE=m
+CONFIG_RTW88_PCI=m
+CONFIG_RTW88_8822BE=y
+CONFIG_RTW88_8822CE=y
+# CONFIG_RTW88_DEBUG is not set
+# CONFIG_RTW88_DEBUGFS is not set
 CONFIG_WLAN_VENDOR_RSI=y
 CONFIG_RSI_91X=m
 CONFIG_RSI_DEBUGFS=y
@@ -3311,6 +3477,8 @@ CONFIG_VIRT_WIFI=m
 CONFIG_WIMAX_I2400M=m
 CONFIG_WIMAX_I2400M_USB=m
 CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
+# end of WiMAX Wireless Broadband devices
+
 # CONFIG_WAN is not set
 CONFIG_IEEE802154_DRIVERS=m
 CONFIG_IEEE802154_FAKELB=m
@@ -3359,6 +3527,7 @@ CONFIG_KEYBOARD_ADC=m
 CONFIG_KEYBOARD_ADP5588=m
 CONFIG_KEYBOARD_ADP5589=m
 CONFIG_KEYBOARD_ATKBD=y
+CONFIG_KEYBOARD_QT1050=m
 CONFIG_KEYBOARD_QT1070=m
 CONFIG_KEYBOARD_QT2160=m
 # CONFIG_KEYBOARD_DLINK_DIR685 is not set
@@ -3424,8 +3593,8 @@ CONFIG_JOYSTICK_INTERACT=m
 CONFIG_JOYSTICK_SIDEWINDER=m
 CONFIG_JOYSTICK_TMDC=m
 CONFIG_JOYSTICK_IFORCE=m
-CONFIG_JOYSTICK_IFORCE_USB=y
-CONFIG_JOYSTICK_IFORCE_232=y
+CONFIG_JOYSTICK_IFORCE_USB=m
+CONFIG_JOYSTICK_IFORCE_232=m
 CONFIG_JOYSTICK_WARRIOR=m
 CONFIG_JOYSTICK_MAGELLAN=m
 CONFIG_JOYSTICK_SPACEORB=m
@@ -3557,6 +3726,7 @@ CONFIG_TOUCHSCREEN_ZET6223=m
 CONFIG_TOUCHSCREEN_ZFORCE=m
 CONFIG_TOUCHSCREEN_COLIBRI_VF50=m
 CONFIG_TOUCHSCREEN_ROHM_BU21023=m
+CONFIG_TOUCHSCREEN_IQS5XX=m
 CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_88PM860X_ONKEY is not set
 # CONFIG_INPUT_88PM80X_ONKEY is not set
@@ -3569,6 +3739,7 @@ CONFIG_INPUT_BMA150=m
 CONFIG_INPUT_E3X0_BUTTON=m
 CONFIG_INPUT_MSM_VIBRATOR=m
 CONFIG_INPUT_PCSPKR=m
+CONFIG_INPUT_MAX77650_ONKEY=m
 CONFIG_INPUT_MAX77693_HAPTIC=m
 # CONFIG_INPUT_MAX8925_ONKEY is not set
 # CONFIG_INPUT_MAX8997_HAPTIC is not set
@@ -3577,6 +3748,7 @@ CONFIG_INPUT_MMA8450=m
 CONFIG_INPUT_GP2A=m
 CONFIG_INPUT_GPIO_BEEPER=m
 CONFIG_INPUT_GPIO_DECODER=m
+CONFIG_INPUT_GPIO_VIBRA=m
 CONFIG_INPUT_CPCAP_PWRBUTTON=m
 CONFIG_INPUT_ATI_REMOTE2=m
 CONFIG_INPUT_KEYSPAN_REMOTE=m
@@ -3647,7 +3819,6 @@ CONFIG_SERIO_ALTERA_PS2=m
 CONFIG_SERIO_PS2MULT=m
 CONFIG_SERIO_ARC_PS2=m
 CONFIG_SERIO_APBPS2=m
-CONFIG_SERIO_OLPC_APSP=m
 CONFIG_SERIO_GPIO_PS2=m
 CONFIG_USERIO=m
 CONFIG_GAMEPORT=m
@@ -3655,6 +3826,8 @@ CONFIG_GAMEPORT_NS558=m
 CONFIG_GAMEPORT_L4=m
 CONFIG_GAMEPORT_EMU10K1=m
 CONFIG_GAMEPORT_FM801=m
+# end of Hardware I/O ports
+# end of Input device support
 
 #
 # Character devices
@@ -3684,6 +3857,7 @@ CONFIG_N_GSM=m
 CONFIG_TRACE_ROUTER=m
 CONFIG_TRACE_SINK=m
 # CONFIG_PPC_EPAPR_HV_BYTECHAN is not set
+CONFIG_NULL_TTY=m
 CONFIG_LDISC_AUTOLOAD=y
 CONFIG_DEVMEM=y
 # CONFIG_DEVKMEM is not set
@@ -3725,6 +3899,7 @@ CONFIG_SERIAL_PMACZILOG=m
 CONFIG_SERIAL_PMACZILOG_TTYS=y
 CONFIG_SERIAL_ICOM=m
 CONFIG_SERIAL_JSM=m
+CONFIG_SERIAL_SIFIVE=m
 CONFIG_SERIAL_SCCNXP=y
 CONFIG_SERIAL_SCCNXP_CONSOLE=y
 # CONFIG_SERIAL_SC16IS7XX is not set
@@ -3741,6 +3916,9 @@ CONFIG_SERIAL_RP2_NR_UARTS=32
 CONFIG_SERIAL_FSL_LPUART=m
 CONFIG_SERIAL_CONEXANT_DIGICOLOR=m
 # CONFIG_SERIAL_MEN_Z135 is not set
+# end of Serial drivers
+
+CONFIG_SERIAL_MCTRL_GPIO=m
 CONFIG_SERIAL_DEV_BUS=m
 CONFIG_TTY_PRINTK=m
 CONFIG_TTY_PRINTK_LEVEL=6
@@ -3767,6 +3945,7 @@ CONFIG_IPMI_SSIF=m
 CONFIG_IPMI_POWERNV=m
 CONFIG_IPMI_WATCHDOG=m
 CONFIG_IPMI_POWEROFF=m
+# CONFIG_IPMB_DEVICE_INTERFACE is not set
 CONFIG_HW_RANDOM=m
 CONFIG_HW_RANDOM_TIMERIOMEM=m
 CONFIG_HW_RANDOM_AMD=m
@@ -3785,6 +3964,8 @@ CONFIG_CARDMAN_4000=m
 CONFIG_CARDMAN_4040=m
 CONFIG_SCR24X=m
 CONFIG_IPWIRELESS=m
+# end of PCMCIA character devices
+
 CONFIG_RAW_DRIVER=m
 CONFIG_MAX_RAW_DEVS=256
 CONFIG_HANGCHECK_TIMER=m
@@ -3806,6 +3987,8 @@ CONFIG_DEVPORT=y
 CONFIG_XILLYBUS=m
 CONFIG_XILLYBUS_PCIE=m
 CONFIG_XILLYBUS_OF=m
+# end of Character devices
+
 # CONFIG_RANDOM_TRUST_CPU is not set
 
 #
@@ -3830,6 +4013,8 @@ CONFIG_I2C_MUX_PINCTRL=m
 CONFIG_I2C_MUX_REG=m
 CONFIG_I2C_DEMUX_PINCTRL=m
 CONFIG_I2C_MUX_MLXCPLD=m
+# end of Multiplexer I2C Chip support
+
 CONFIG_I2C_HELPER_AUTO=y
 CONFIG_I2C_SMBUS=m
 CONFIG_I2C_ALGOBIT=m
@@ -3898,12 +4083,16 @@ CONFIG_I2C_VIPERBOARD=m
 #
 CONFIG_I2C_OPAL=y
 CONFIG_I2C_FSI=m
+# end of I2C Hardware Bus support
+
 # CONFIG_I2C_STUB is not set
 CONFIG_I2C_SLAVE=y
 CONFIG_I2C_SLAVE_EEPROM=m
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
+# end of I2C support
+
 CONFIG_I3C=m
 CONFIG_CDNS_I3C_MASTER=m
 CONFIG_DW_I3C_MASTER=m
@@ -3984,6 +4173,8 @@ CONFIG_PTP_1588_CLOCK=y
 #
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
+# end of PTP clock support
+
 CONFIG_PINCTRL=y
 CONFIG_GENERIC_PINCTRL_GROUPS=y
 CONFIG_PINMUX=y
@@ -3997,6 +4188,7 @@ CONFIG_PINCTRL_AMD=y
 CONFIG_PINCTRL_MCP23S08=m
 CONFIG_PINCTRL_SINGLE=y
 CONFIG_PINCTRL_SX150X=y
+CONFIG_PINCTRL_STMFX=m
 CONFIG_PINCTRL_MAX77620=m
 CONFIG_PINCTRL_PALMAS=m
 CONFIG_PINCTRL_RK805=m
@@ -4028,11 +4220,11 @@ CONFIG_GPIO_GRGPIO=m
 CONFIG_GPIO_HLWD=m
 CONFIG_GPIO_MB86S7X=m
 CONFIG_GPIO_MENZ127=m
-CONFIG_GPIO_MOCKUP=m
 CONFIG_GPIO_SAMA5D2_PIOBU=m
 CONFIG_GPIO_SYSCON=m
 CONFIG_GPIO_XILINX=y
 CONFIG_GPIO_AMD_FCH=m
+# end of Memory mapped GPIO drivers
 
 #
 # I2C GPIO expanders
@@ -4045,6 +4237,7 @@ CONFIG_GPIO_MAX732X=m
 CONFIG_GPIO_PCA953X=m
 CONFIG_GPIO_PCF857X=m
 CONFIG_GPIO_TPIC2810=m
+# end of I2C GPIO expanders
 
 #
 # MFD GPIO expanders
@@ -4062,6 +4255,7 @@ CONFIG_GPIO_LP873X=m
 CONFIG_GPIO_LP87565=m
 CONFIG_GPIO_MADERA=m
 CONFIG_GPIO_MAX77620=m
+CONFIG_GPIO_MAX77650=m
 CONFIG_GPIO_PALMAS=y
 CONFIG_GPIO_RC5T583=y
 CONFIG_GPIO_STMPE=y
@@ -4078,6 +4272,7 @@ CONFIG_GPIO_UCB1400=m
 CONFIG_GPIO_WM831X=m
 CONFIG_GPIO_WM8350=m
 CONFIG_GPIO_WM8994=m
+# end of MFD GPIO expanders
 
 #
 # PCI GPIO expanders
@@ -4085,6 +4280,7 @@ CONFIG_GPIO_WM8994=m
 CONFIG_GPIO_PCI_IDIO_16=m
 CONFIG_GPIO_PCIE_IDIO_24=m
 CONFIG_GPIO_RDC321X=m
+# end of PCI GPIO expanders
 
 #
 # SPI GPIO expanders
@@ -4095,11 +4291,15 @@ CONFIG_GPIO_MAX7301=m
 CONFIG_GPIO_MC33880=m
 CONFIG_GPIO_PISOSR=m
 CONFIG_GPIO_XRA1403=m
+# end of SPI GPIO expanders
 
 #
 # USB GPIO expanders
 #
 CONFIG_GPIO_VIPERBOARD=m
+# end of USB GPIO expanders
+
+CONFIG_GPIO_MOCKUP=m
 CONFIG_W1=m
 CONFIG_W1_CON=y
 
@@ -4111,6 +4311,7 @@ CONFIG_W1_MASTER_DS2490=m
 CONFIG_W1_MASTER_DS2482=m
 CONFIG_W1_MASTER_DS1WM=m
 CONFIG_W1_MASTER_GPIO=m
+# end of 1-wire Bus Masters
 
 #
 # 1-wire Slaves
@@ -4132,6 +4333,8 @@ CONFIG_W1_SLAVE_DS2780=m
 CONFIG_W1_SLAVE_DS2781=m
 CONFIG_W1_SLAVE_DS28E04=m
 CONFIG_W1_SLAVE_DS28E17=m
+# end of 1-wire Slaves
+
 CONFIG_POWER_AVS=y
 CONFIG_POWER_RESET=y
 CONFIG_POWER_RESET_AS3722=y
@@ -4143,8 +4346,10 @@ CONFIG_POWER_RESET_SYSCON=y
 CONFIG_POWER_RESET_SYSCON_POWEROFF=y
 CONFIG_REBOOT_MODE=m
 CONFIG_SYSCON_REBOOT_MODE=m
+# CONFIG_NVMEM_REBOOT_MODE is not set
 CONFIG_POWER_SUPPLY=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
+CONFIG_POWER_SUPPLY_HWMON=y
 CONFIG_PDA_POWER=m
 CONFIG_GENERIC_ADC_BATTERY=m
 # CONFIG_MAX8925_POWER is not set
@@ -4186,9 +4391,10 @@ CONFIG_CHARGER_MAX8903=m
 CONFIG_CHARGER_LP8727=m
 CONFIG_CHARGER_GPIO=m
 CONFIG_CHARGER_MANAGER=y
-# CONFIG_CHARGER_LTC3651 is not set
+CONFIG_CHARGER_LT3651=m
 # CONFIG_CHARGER_MAX14577 is not set
 CONFIG_CHARGER_DETECTOR_MAX14656=m
+CONFIG_CHARGER_MAX77650=m
 # CONFIG_CHARGER_MAX77693 is not set
 # CONFIG_CHARGER_MAX8997 is not set
 # CONFIG_CHARGER_MAX8998 is not set
@@ -4202,6 +4408,7 @@ CONFIG_CHARGER_SMB347=m
 CONFIG_BATTERY_GAUGE_LTC2941=m
 CONFIG_BATTERY_RT5033=m
 CONFIG_CHARGER_RT9455=m
+CONFIG_CHARGER_UCS1002=m
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
@@ -4293,15 +4500,15 @@ CONFIG_SENSORS_NTC_THERMISTOR=m
 CONFIG_SENSORS_NCT7802=m
 CONFIG_SENSORS_NCT7904=m
 CONFIG_SENSORS_NPCM7XX=m
-CONFIG_SENSORS_OCC_P8_I2C=m
-CONFIG_SENSORS_OCC_P9_SBE=m
-CONFIG_SENSORS_OCC=y
 CONFIG_SENSORS_PCF8591=m
 CONFIG_PMBUS=m
 CONFIG_SENSORS_PMBUS=m
 CONFIG_SENSORS_ADM1275=m
 CONFIG_SENSORS_IBM_CFFPS=m
 # CONFIG_SENSORS_IR35221 is not set
+CONFIG_SENSORS_IR38064=m
+# CONFIG_SENSORS_IRPS5401 is not set
+CONFIG_SENSORS_ISL68137=m
 CONFIG_SENSORS_LM25066=m
 # CONFIG_SENSORS_LTC2978 is not set
 CONFIG_SENSORS_LTC3815=m
@@ -4310,6 +4517,7 @@ CONFIG_SENSORS_MAX20751=m
 CONFIG_SENSORS_MAX31785=m
 CONFIG_SENSORS_MAX34440=m
 CONFIG_SENSORS_MAX8688=m
+# CONFIG_SENSORS_PXE1610 is not set
 # CONFIG_SENSORS_TPS40422 is not set
 CONFIG_SENSORS_TPS53679=m
 CONFIG_SENSORS_UCD9000=m
@@ -4373,6 +4581,7 @@ CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
 CONFIG_CPU_THERMAL=y
 CONFIG_DEVFREQ_THERMAL=y
 CONFIG_THERMAL_EMULATION=y
+CONFIG_THERMAL_MMIO=m
 CONFIG_MAX77620_THERMAL=m
 CONFIG_QORIQ_THERMAL=m
 CONFIG_DA9062_THERMAL=m
@@ -4381,8 +4590,14 @@ CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_CORE=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
 CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
+CONFIG_WATCHDOG_OPEN_TIMEOUT=0
 CONFIG_WATCHDOG_SYSFS=y
 
+#
+# Watchdog Pretimeout Governors
+#
+# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
+
 #
 # Watchdog Device Drivers
 #
@@ -4422,11 +4637,6 @@ CONFIG_WDTPCI=m
 # USB-based Watchdog Cards
 #
 CONFIG_USBPCWATCHDOG=m
-
-#
-# Watchdog Pretimeout Governors
-#
-# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
 CONFIG_SSB_POSSIBLE=y
 CONFIG_SSB=m
 CONFIG_SSB_SPROM=y
@@ -4471,9 +4681,11 @@ CONFIG_MFD_AXP20X_I2C=m
 CONFIG_MFD_MADERA=m
 CONFIG_MFD_MADERA_I2C=m
 CONFIG_MFD_MADERA_SPI=m
+# CONFIG_MFD_CS47L15 is not set
 CONFIG_MFD_CS47L35=y
 CONFIG_MFD_CS47L85=y
 CONFIG_MFD_CS47L90=y
+# CONFIG_MFD_CS47L92 is not set
 CONFIG_PMIC_DA903X=y
 CONFIG_PMIC_DA9052=y
 CONFIG_MFD_DA9052_SPI=y
@@ -4498,6 +4710,7 @@ CONFIG_MFD_88PM805=m
 CONFIG_MFD_88PM860X=y
 CONFIG_MFD_MAX14577=m
 CONFIG_MFD_MAX77620=y
+CONFIG_MFD_MAX77650=m
 CONFIG_MFD_MAX77686=y
 CONFIG_MFD_MAX77693=m
 CONFIG_MFD_MAX77843=y
@@ -4536,6 +4749,8 @@ CONFIG_MFD_STMPE=y
 #
 CONFIG_STMPE_I2C=y
 CONFIG_STMPE_SPI=y
+# end of STMicroelectronics STMPE Interface Drivers
+
 CONFIG_MFD_SYSCON=y
 CONFIG_MFD_TI_AM335X_TSCADC=m
 CONFIG_MFD_LP3943=m
@@ -4582,8 +4797,12 @@ CONFIG_MFD_WM8350=y
 CONFIG_MFD_WM8350_I2C=y
 CONFIG_MFD_WM8994=m
 # CONFIG_MFD_ROHM_BD718XX is not set
+# CONFIG_MFD_ROHM_BD70528 is not set
 CONFIG_MFD_STPMIC1=m
+CONFIG_MFD_STMFX=m
 # CONFIG_RAVE_SP_CORE is not set
+# end of Multifunction device drivers
+
 CONFIG_REGULATOR=y
 # CONFIG_REGULATOR_DEBUG is not set
 CONFIG_REGULATOR_FIXED_VOLTAGE=m
@@ -4632,6 +4851,7 @@ CONFIG_REGULATOR_LTC3676=m
 CONFIG_REGULATOR_MAX14577=m
 CONFIG_REGULATOR_MAX1586=m
 CONFIG_REGULATOR_MAX77620=m
+CONFIG_REGULATOR_MAX77650=m
 CONFIG_REGULATOR_MAX8649=m
 CONFIG_REGULATOR_MAX8660=m
 CONFIG_REGULATOR_MAX8907=m
@@ -4664,6 +4884,7 @@ CONFIG_REGULATOR_RK808=m
 CONFIG_REGULATOR_RN5T618=m
 CONFIG_REGULATOR_RT5033=m
 CONFIG_REGULATOR_SKY81452=m
+# CONFIG_REGULATOR_SLG51000 is not set
 CONFIG_REGULATOR_STPMIC1=m
 CONFIG_REGULATOR_SY8106A=m
 CONFIG_REGULATOR_TPS51632=m
@@ -4870,6 +5091,7 @@ CONFIG_DVB_USB_DIBUSB_MC=m
 CONFIG_DVB_USB_DIB0700=m
 CONFIG_DVB_USB_UMT_010=m
 CONFIG_DVB_USB_CXUSB=m
+# CONFIG_DVB_USB_CXUSB_ANALOG is not set
 CONFIG_DVB_USB_M920X=m
 CONFIG_DVB_USB_DIGITV=m
 CONFIG_DVB_USB_VP7045=m
@@ -4968,7 +5190,6 @@ CONFIG_VIDEO_SAA7134_RC=y
 CONFIG_VIDEO_SAA7134_DVB=m
 CONFIG_VIDEO_SAA7134_GO7007=m
 CONFIG_VIDEO_SAA7164=m
-# CONFIG_VIDEO_COBALT is not set
 
 #
 # Media digital TV PCI Adapters
@@ -4996,7 +5217,6 @@ CONFIG_DVB_DDBRIDGE=m
 CONFIG_DVB_SMIPCIE=m
 CONFIG_DVB_NETUP_UNIDVB=m
 CONFIG_V4L_PLATFORM_DRIVERS=y
-CONFIG_VIDEO_CAFE_CCIC=m
 # CONFIG_VIDEO_CADENCE is not set
 CONFIG_VIDEO_ASPEED=m
 CONFIG_VIDEO_MUX=m
@@ -5041,6 +5261,7 @@ CONFIG_RADIO_WL1273=m
 # Texas Instruments WL128x FM driver (ST based)
 #
 CONFIG_RADIO_WL128X=m
+# end of Texas Instruments WL128x FM driver (ST based)
 
 #
 # Supported FireWire (IEEE 1394) Adapters
@@ -5075,18 +5296,24 @@ CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
 CONFIG_MEDIA_ATTACH=y
 CONFIG_VIDEO_IR_I2C=m
 
+#
+# I2C Encoders, decoders, sensors and other helper chips
+#
+
 #
 # Audio decoders, processors and mixers
 #
 CONFIG_VIDEO_TVAUDIO=m
 CONFIG_VIDEO_TDA7432=m
 CONFIG_VIDEO_TDA9840=m
+# CONFIG_VIDEO_TDA1997X is not set
 CONFIG_VIDEO_TEA6415C=m
 CONFIG_VIDEO_TEA6420=m
 CONFIG_VIDEO_MSP3400=m
 CONFIG_VIDEO_CS3308=m
 CONFIG_VIDEO_CS5345=m
 CONFIG_VIDEO_CS53L32A=m
+# CONFIG_VIDEO_TLV320AIC23B is not set
 CONFIG_VIDEO_UDA1342=m
 CONFIG_VIDEO_WM8775=m
 CONFIG_VIDEO_WM8739=m
@@ -5101,11 +5328,27 @@ CONFIG_VIDEO_SAA6588=m
 #
 # Video decoders
 #
+# CONFIG_VIDEO_ADV7180 is not set
+# CONFIG_VIDEO_ADV7183 is not set
+# CONFIG_VIDEO_ADV748X is not set
+# CONFIG_VIDEO_ADV7604 is not set
+# CONFIG_VIDEO_ADV7842 is not set
+# CONFIG_VIDEO_BT819 is not set
+# CONFIG_VIDEO_BT856 is not set
+# CONFIG_VIDEO_BT866 is not set
+# CONFIG_VIDEO_KS0127 is not set
+# CONFIG_VIDEO_ML86V7667 is not set
+# CONFIG_VIDEO_SAA7110 is not set
 CONFIG_VIDEO_SAA711X=m
+# CONFIG_VIDEO_TC358743 is not set
+# CONFIG_VIDEO_TVP514X is not set
 CONFIG_VIDEO_TVP5150=m
+# CONFIG_VIDEO_TVP7002 is not set
 CONFIG_VIDEO_TW2804=m
 CONFIG_VIDEO_TW9903=m
 CONFIG_VIDEO_TW9906=m
+# CONFIG_VIDEO_TW9910 is not set
+# CONFIG_VIDEO_VPX3220 is not set
 
 #
 # Video and audio decoders
@@ -5117,18 +5360,77 @@ CONFIG_VIDEO_CX25840=m
 # Video encoders
 #
 CONFIG_VIDEO_SAA7127=m
+# CONFIG_VIDEO_SAA7185 is not set
+# CONFIG_VIDEO_ADV7170 is not set
+# CONFIG_VIDEO_ADV7175 is not set
+# CONFIG_VIDEO_ADV7343 is not set
+# CONFIG_VIDEO_ADV7393 is not set
+# CONFIG_VIDEO_AD9389B is not set
+# CONFIG_VIDEO_AK881X is not set
+# CONFIG_VIDEO_THS8200 is not set
 
 #
 # Camera sensor devices
 #
+# CONFIG_VIDEO_IMX214 is not set
+# CONFIG_VIDEO_IMX258 is not set
+# CONFIG_VIDEO_IMX274 is not set
+# CONFIG_VIDEO_IMX319 is not set
+# CONFIG_VIDEO_IMX355 is not set
 CONFIG_VIDEO_OV2640=m
+# CONFIG_VIDEO_OV2659 is not set
+# CONFIG_VIDEO_OV2680 is not set
+# CONFIG_VIDEO_OV2685 is not set
+# CONFIG_VIDEO_OV5640 is not set
+# CONFIG_VIDEO_OV5645 is not set
+# CONFIG_VIDEO_OV5647 is not set
+# CONFIG_VIDEO_OV6650 is not set
+# CONFIG_VIDEO_OV5670 is not set
+# CONFIG_VIDEO_OV5695 is not set
+# CONFIG_VIDEO_OV7251 is not set
+# CONFIG_VIDEO_OV772X is not set
 CONFIG_VIDEO_OV7640=m
 CONFIG_VIDEO_OV7670=m
+# CONFIG_VIDEO_OV7740 is not set
+# CONFIG_VIDEO_OV8856 is not set
+# CONFIG_VIDEO_OV9640 is not set
+# CONFIG_VIDEO_OV9650 is not set
+# CONFIG_VIDEO_OV13858 is not set
+# CONFIG_VIDEO_VS6624 is not set
+# CONFIG_VIDEO_MT9M001 is not set
+# CONFIG_VIDEO_MT9M032 is not set
+# CONFIG_VIDEO_MT9M111 is not set
+# CONFIG_VIDEO_MT9P031 is not set
+# CONFIG_VIDEO_MT9T001 is not set
+# CONFIG_VIDEO_MT9T112 is not set
 CONFIG_VIDEO_MT9V011=m
+# CONFIG_VIDEO_MT9V032 is not set
+# CONFIG_VIDEO_MT9V111 is not set
+# CONFIG_VIDEO_SR030PC30 is not set
+# CONFIG_VIDEO_NOON010PC30 is not set
+# CONFIG_VIDEO_M5MOLS is not set
+# CONFIG_VIDEO_RJ54N1 is not set
+# CONFIG_VIDEO_S5K6AA is not set
+# CONFIG_VIDEO_S5K6A3 is not set
+# CONFIG_VIDEO_S5K4ECGX is not set
+# CONFIG_VIDEO_S5K5BAF is not set
+# CONFIG_VIDEO_ET8EK8 is not set
+# CONFIG_VIDEO_S5C73M3 is not set
+
+#
+# Lens drivers
+#
+# CONFIG_VIDEO_AD5820 is not set
+# CONFIG_VIDEO_AK7375 is not set
+# CONFIG_VIDEO_DW9714 is not set
+# CONFIG_VIDEO_DW9807_VCM is not set
 
 #
 # Flash devices
 #
+# CONFIG_VIDEO_ADP1653 is not set
+# CONFIG_VIDEO_LM3560 is not set
+# CONFIG_VIDEO_LM3646 is not set
 
 #
 # Video improvement chips
@@ -5148,13 +5450,29 @@ CONFIG_VIDEO_SAA6752HS=m
 #
 # Miscellaneous helper chips
 #
+# CONFIG_VIDEO_THS7303 is not set
 CONFIG_VIDEO_M52790=m
+# CONFIG_VIDEO_I2C is not set
+# CONFIG_VIDEO_ST_MIPID02 is not set
+# end of I2C Encoders, decoders, sensors and other helper chips
+
+#
+# SPI helper chips
+#
+# CONFIG_VIDEO_GS1662 is not set
+# end of SPI helper chips
 
 #
 # Media SPI Adapters
 #
 # CONFIG_CXD2880_SPI_DRV is not set
+# end of Media SPI Adapters
+
 CONFIG_MEDIA_TUNER=m
+
+#
+# Customize TV tuners
+#
 CONFIG_MEDIA_TUNER_SIMPLE=m
 CONFIG_MEDIA_TUNER_TDA18250=m
 CONFIG_MEDIA_TUNER_TDA8290=m
@@ -5163,6 +5481,7 @@ CONFIG_MEDIA_TUNER_TDA18271=m
 CONFIG_MEDIA_TUNER_TDA9887=m
 CONFIG_MEDIA_TUNER_TEA5761=m
 CONFIG_MEDIA_TUNER_TEA5767=m
+# CONFIG_MEDIA_TUNER_MSI001 is not set
 CONFIG_MEDIA_TUNER_MT20XX=m
 CONFIG_MEDIA_TUNER_MT2060=m
 CONFIG_MEDIA_TUNER_MT2063=m
@@ -5191,6 +5510,11 @@ CONFIG_MEDIA_TUNER_R820T=m
 CONFIG_MEDIA_TUNER_MXL301RF=m
 CONFIG_MEDIA_TUNER_QM1D1C0042=m
 CONFIG_MEDIA_TUNER_QM1D1B0004=m
+# end of Customize TV tuners
+
+#
+# Customise DVB Frontends
+#
 
 #
 # Multistandard (satellite) frontends
@@ -5251,6 +5575,7 @@ CONFIG_DVB_SP8870=m
 CONFIG_DVB_SP887X=m
 CONFIG_DVB_CX22700=m
 CONFIG_DVB_CX22702=m
+# CONFIG_DVB_S5H1432 is not set
 CONFIG_DVB_DRXD=m
 CONFIG_DVB_L64781=m
 CONFIG_DVB_TDA1004X=m
@@ -5261,6 +5586,7 @@ CONFIG_DVB_DIB3000MB=m
 CONFIG_DVB_DIB3000MC=m
 CONFIG_DVB_DIB7000M=m
 CONFIG_DVB_DIB7000P=m
+# CONFIG_DVB_DIB9000 is not set
 CONFIG_DVB_TDA10048=m
 CONFIG_DVB_AF9013=m
 CONFIG_DVB_EC100=m
@@ -5273,6 +5599,7 @@ CONFIG_DVB_SI2168=m
 CONFIG_DVB_AS102_FE=m
 CONFIG_DVB_ZD1301_DEMOD=m
 CONFIG_DVB_GP8PSK_FE=m
+# CONFIG_DVB_CXD2880 is not set
 
 #
 # DVB-C (cable) frontends
@@ -5310,6 +5637,7 @@ CONFIG_DVB_MB86A20S=m
 # ISDB-S (satellite) & ISDB-T (terrestrial) frontends
 #
 CONFIG_DVB_TC90522=m
+# CONFIG_DVB_MN88443X is not set
 
 #
 # Digital terrestrial only tuners/PLL
@@ -5323,12 +5651,14 @@ CONFIG_DVB_TUNER_DIB0090=m
 #
 CONFIG_DVB_DRX39XYJ=m
 CONFIG_DVB_LNBH25=m
+# CONFIG_DVB_LNBH29 is not set
 CONFIG_DVB_LNBP21=m
 CONFIG_DVB_LNBP22=m
 CONFIG_DVB_ISL6405=m
 CONFIG_DVB_ISL6421=m
 CONFIG_DVB_ISL6423=m
 CONFIG_DVB_A8293=m
+# CONFIG_DVB_LGS8GL5 is not set
 CONFIG_DVB_LGS8GXX=m
 CONFIG_DVB_ATBM8830=m
 CONFIG_DVB_TDA665x=m
@@ -5349,6 +5679,7 @@ CONFIG_DVB_SP2=m
 # Tools to develop new frontends
 #
 CONFIG_DVB_DUMMY_FE=m
+# end of Customise DVB Frontends
 
 #
 # Graphics support
@@ -5369,8 +5700,10 @@ CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 CONFIG_DRM_DP_CEC=y
 CONFIG_DRM_TTM=m
+CONFIG_DRM_VRAM_HELPER=m
 CONFIG_DRM_GEM_CMA_HELPER=y
 CONFIG_DRM_KMS_CMA_HELPER=y
+CONFIG_DRM_GEM_SHMEM_HELPER=y
 CONFIG_DRM_VM=y
 CONFIG_DRM_SCHED=m
 
@@ -5381,10 +5714,13 @@ CONFIG_DRM_I2C_CH7006=m
 CONFIG_DRM_I2C_SIL164=m
 CONFIG_DRM_I2C_NXP_TDA998X=m
 # CONFIG_DRM_I2C_NXP_TDA9950 is not set
+# end of I2C encoder or helper chips
 
 #
 # ARM devices
 #
+# end of ARM devices
+
 CONFIG_DRM_RADEON=m
 CONFIG_DRM_RADEON_USERPTR=y
 CONFIG_DRM_AMDGPU=m
@@ -5397,19 +5733,15 @@ CONFIG_DRM_AMDGPU_USERPTR=y
 # ACP (Audio CoProcessor) Configuration
 #
 CONFIG_DRM_AMD_ACP=y
+# end of ACP (Audio CoProcessor) Configuration
 
 #
 # Display Engine Configuration
 #
 CONFIG_DRM_AMD_DC=y
 # CONFIG_DEBUG_KERNEL_DC is not set
+# end of Display Engine Configuration
 
-#
-# AMD Library routines
-#
-CONFIG_CHASH=m
-# CONFIG_CHASH_STATS is not set
-# CONFIG_CHASH_SELFTEST is not set
 CONFIG_DRM_NOUVEAU=m
 CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT=y
 CONFIG_NOUVEAU_DEBUG=5
@@ -5419,6 +5751,7 @@ CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 # CONFIG_DRM_NOUVEAU_SVM is not set
 CONFIG_DRM_VGEM=m
 CONFIG_DRM_VKMS=m
+CONFIG_DRM_ATI_PCIGART=y
 CONFIG_DRM_UDL=m
 CONFIG_DRM_AST=m
 CONFIG_DRM_MGAG200=m
@@ -5436,6 +5769,7 @@ CONFIG_DRM_PANEL=y
 CONFIG_DRM_PANEL_ARM_VERSATILE=m
 CONFIG_DRM_PANEL_LVDS=m
 CONFIG_DRM_PANEL_SIMPLE=m
+CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D=m
 CONFIG_DRM_PANEL_ILITEK_IL9322=m
 # CONFIG_DRM_PANEL_ILITEK_ILI9881C is not set
 CONFIG_DRM_PANEL_INNOLUX_P079ZCA=m
@@ -5445,12 +5779,16 @@ CONFIG_DRM_PANEL_SAMSUNG_LD9040=m
 CONFIG_DRM_PANEL_LG_LG4573=m
 CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO=m
 CONFIG_DRM_PANEL_ORISETECH_OTM8009A=m
+# CONFIG_DRM_PANEL_OSD_OSD101T2587_53TS is not set
 CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00=m
 CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m
 CONFIG_DRM_PANEL_RAYDIUM_RM68200=m
+CONFIG_DRM_PANEL_ROCKTECH_JH057N00900=m
+CONFIG_DRM_PANEL_RONBO_RB070D30=m
 CONFIG_DRM_PANEL_SAMSUNG_S6D16D0=m
 CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2=m
 CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03=m
+# CONFIG_DRM_PANEL_SAMSUNG_S6E63M0 is not set
 CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m
 CONFIG_DRM_PANEL_SEIKO_43WVF1G=m
 CONFIG_DRM_PANEL_SHARP_LQ101R1SX01=m
@@ -5459,6 +5797,8 @@ CONFIG_DRM_PANEL_SITRONIX_ST7701=m
 CONFIG_DRM_PANEL_SITRONIX_ST7789V=m
 CONFIG_DRM_PANEL_TPO_TPG110=m
 CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA=m
+# end of Display Panels
+
 CONFIG_DRM_BRIDGE=y
 CONFIG_DRM_PANEL_BRIDGE=y
 
@@ -5488,6 +5828,8 @@ CONFIG_DRM_DW_HDMI=m
 CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
 CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
 CONFIG_DRM_DW_HDMI_CEC=m
+# end of Display Interface Bridges
+
 CONFIG_DRM_ETNAVIV=m
 CONFIG_DRM_ETNAVIV_THERMAL=y
 CONFIG_DRM_ARCPGU=m
@@ -5501,7 +5843,13 @@ CONFIG_TINYDRM_MI0283QT=m
 CONFIG_TINYDRM_REPAPER=m
 CONFIG_TINYDRM_ST7586=m
 # CONFIG_TINYDRM_ST7735R is not set
-# CONFIG_DRM_LEGACY is not set
+CONFIG_DRM_LEGACY=y
+CONFIG_DRM_TDFX=m
+CONFIG_DRM_R128=m
+CONFIG_DRM_MGA=m
+CONFIG_DRM_SIS=m
+CONFIG_DRM_VIA=m
+CONFIG_DRM_SAVAGE=m
 CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=m
 
 #
@@ -5600,7 +5948,11 @@ CONFIG_FB_MB862XX_I2C=y
 CONFIG_FB_SIMPLE=y
 CONFIG_FB_SSD1307=m
 CONFIG_FB_SM712=m
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
+# end of Frame buffer Devices
+
+#
+# Backlight & LCD device support
+#
 CONFIG_LCD_CLASS_DEVICE=m
 CONFIG_LCD_L4F00242T03=m
 CONFIG_LCD_LMS283GF05=m
@@ -5640,6 +5992,8 @@ CONFIG_BACKLIGHT_GPIO=m
 CONFIG_BACKLIGHT_LV5207LP=m
 CONFIG_BACKLIGHT_BD6107=m
 # CONFIG_BACKLIGHT_ARCXCNN is not set
+# end of Backlight & LCD device support
+
 CONFIG_VGASTATE=m
 CONFIG_VIDEOMODE_HELPERS=y
 CONFIG_HDMI=y
@@ -5658,7 +6012,11 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y
+# end of Console display driver support
+
 # CONFIG_LOGO is not set
+# end of Graphics support
+
 CONFIG_SOUND=m
 CONFIG_SOUND_OSS_CORE=y
 CONFIG_SOUND_OSS_CORE_PRECLAIM=y
@@ -5794,8 +6152,11 @@ CONFIG_SND_HDA_CODEC_CMEDIA=m
 CONFIG_SND_HDA_CODEC_SI3054=m
 CONFIG_SND_HDA_GENERIC=m
 CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1
+# end of HD-Audio
+
 CONFIG_SND_HDA_CORE=m
 CONFIG_SND_HDA_DSP_LOADER=y
+CONFIG_SND_HDA_COMPONENT=y
 CONFIG_SND_HDA_PREALLOC_SIZE=64
 CONFIG_SND_PPC=y
 CONFIG_SND_POWERMAC=m
@@ -5812,6 +6173,7 @@ CONFIG_SND_AOA_SOUNDBUS_I2S=m
 CONFIG_SND_SPI=y
 CONFIG_SND_USB=y
 CONFIG_SND_USB_AUDIO=m
+CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER=y
 CONFIG_SND_USB_UA101=m
 CONFIG_SND_USB_USX2Y=m
 CONFIG_SND_USB_CAIAQ=m
@@ -5841,6 +6203,7 @@ CONFIG_SND_PDAUDIOCF=m
 CONFIG_SND_SOC=m
 CONFIG_SND_SOC_AC97_BUS=y
 CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
+CONFIG_SND_SOC_TOPOLOGY=y
 CONFIG_SND_SOC_AMD_ACP=m
 CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m
 CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m
@@ -5856,11 +6219,14 @@ CONFIG_SND_SOC_MIKROE_PROTO=m
 #
 CONFIG_SND_SOC_FSL_ASRC=m
 CONFIG_SND_SOC_FSL_SAI=m
+CONFIG_SND_SOC_FSL_AUDMIX=m
 CONFIG_SND_SOC_FSL_SSI=m
 CONFIG_SND_SOC_FSL_SPDIF=m
 CONFIG_SND_SOC_FSL_ESAI=m
 CONFIG_SND_SOC_FSL_MICFIL=m
 CONFIG_SND_SOC_IMX_AUDMUX=m
+# end of SoC Audio for Freescale CPUs
+
 CONFIG_SND_I2S_HI6210_I2S=m
 CONFIG_SND_SOC_IMG=y
 CONFIG_SND_SOC_IMG_I2S_IN=m
@@ -5870,10 +6236,20 @@ CONFIG_SND_SOC_IMG_SPDIF_IN=m
 CONFIG_SND_SOC_IMG_SPDIF_OUT=m
 CONFIG_SND_SOC_IMG_PISTACHIO_INTERNAL_DAC=m
 CONFIG_SND_SOC_MTK_BTCVSD=m
+CONFIG_SND_SOC_SOF_TOPLEVEL=y
+CONFIG_SND_SOC_SOF_PCI=m
+CONFIG_SND_SOC_SOF_OPTIONS=m
+CONFIG_SND_SOC_SOF_NOCODEC=m
+CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT=y
+CONFIG_SND_SOC_SOF_STRICT_ABI_CHECKS=y
+# CONFIG_SND_SOC_SOF_DEBUG is not set
+CONFIG_SND_SOC_SOF=m
 
 #
 # STMicroelectronics STM32 SOC audio support
 #
+# end of STMicroelectronics STM32 SOC audio support
+
 CONFIG_SND_SOC_XILINX_I2S=m
 CONFIG_SND_SOC_XILINX_AUDIO_FORMATTER=m
 CONFIG_SND_SOC_XILINX_SPDIF=m
@@ -5925,6 +6301,7 @@ CONFIG_SND_SOC_CS43130=m
 CONFIG_SND_SOC_CS4341=m
 CONFIG_SND_SOC_CS4349=m
 CONFIG_SND_SOC_CS53L30=m
+# CONFIG_SND_SOC_CX2072X is not set
 CONFIG_SND_SOC_DA7219=m
 CONFIG_SND_SOC_DMIC=m
 CONFIG_SND_SOC_HDMI_CODEC=m
@@ -5995,9 +6372,6 @@ CONFIG_SND_SOC_TLV320AIC23=m
 CONFIG_SND_SOC_TLV320AIC23_I2C=m
 CONFIG_SND_SOC_TLV320AIC23_SPI=m
 CONFIG_SND_SOC_TLV320AIC31XX=m
-CONFIG_SND_SOC_TLV320AIC32X4=m
-CONFIG_SND_SOC_TLV320AIC32X4_I2C=m
-CONFIG_SND_SOC_TLV320AIC32X4_SPI=m
 CONFIG_SND_SOC_TLV320AIC3X=m
 CONFIG_SND_SOC_TS3A227E=m
 CONFIG_SND_SOC_TSCS42XX=m
@@ -6035,6 +6409,8 @@ CONFIG_SND_SOC_NAU8810=m
 CONFIG_SND_SOC_NAU8822=m
 CONFIG_SND_SOC_NAU8824=m
 CONFIG_SND_SOC_TPA6130A2=m
+# end of CODEC drivers
+
 CONFIG_SND_SIMPLE_CARD_UTILS=m
 CONFIG_SND_SIMPLE_CARD=m
 CONFIG_SND_AUDIO_GRAPH_CARD=m
@@ -6067,6 +6443,7 @@ CONFIG_HID_CHERRY=m
 CONFIG_HID_CHICONY=m
 CONFIG_HID_CORSAIR=m
 CONFIG_HID_COUGAR=m
+CONFIG_HID_MACALLY=m
 CONFIG_HID_PRODIKEYS=m
 CONFIG_HID_CMEDIA=m
 CONFIG_HID_CP2112=m
@@ -6147,6 +6524,7 @@ CONFIG_HID_THINGM=m
 CONFIG_HID_THRUSTMASTER=m
 CONFIG_THRUSTMASTER_FF=y
 CONFIG_HID_UDRAW_PS3=m
+CONFIG_HID_U2FZERO=m
 CONFIG_HID_WACOM=m
 CONFIG_HID_WIIMOTE=m
 CONFIG_HID_XINMO=m
@@ -6156,6 +6534,7 @@ CONFIG_HID_ZYDACRON=m
 CONFIG_HID_SENSOR_HUB=m
 CONFIG_HID_SENSOR_CUSTOM_SENSOR=m
 CONFIG_HID_ALPS=m
+# end of Special HID drivers
 
 #
 # USB HID support
@@ -6169,11 +6548,16 @@ CONFIG_USB_HIDDEV=y
 #
 CONFIG_USB_KBD=m
 CONFIG_USB_MOUSE=m
+# end of USB HID Boot Protocol drivers
+# end of USB HID support
 
 #
 # I2C HID support
 #
 CONFIG_I2C_HID=m
+# end of I2C HID support
+# end of HID support
+
 CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y
 CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
@@ -6425,6 +6809,8 @@ CONFIG_USB_GPIO_VBUS=m
 CONFIG_TAHVO_USB=m
 # CONFIG_TAHVO_USB_HOST_BY_DEFAULT is not set
 CONFIG_USB_ISP1301=m
+# end of USB Physical Layer drivers
+
 CONFIG_USB_GADGET=m
 # CONFIG_USB_GADGET_DEBUG is not set
 # CONFIG_USB_GADGET_DEBUG_FILES is not set
@@ -6459,6 +6845,8 @@ CONFIG_USB_GOKU=m
 CONFIG_USB_EG20T=m
 CONFIG_USB_GADGET_XILINX=m
 CONFIG_USB_DUMMY_HCD=m
+# end of USB Peripheral Controller
+
 CONFIG_USB_LIBCOMPOSITE=m
 CONFIG_USB_F_ACM=m
 CONFIG_USB_U_SERIAL=m
@@ -6538,11 +6926,15 @@ CONFIG_TYPEC_TPS6598X=m
 # USB Type-C Multiplexer/DeMultiplexer Switch support
 #
 # CONFIG_TYPEC_MUX_PI3USB30532 is not set
+# end of USB Type-C Multiplexer/DeMultiplexer Switch support
 
 #
 # USB Type-C Alternate Mode drivers
 #
 CONFIG_TYPEC_DP_ALTMODE=m
+CONFIG_TYPEC_NVIDIA_ALTMODE=m
+# end of USB Type-C Alternate Mode drivers
+
 CONFIG_USB_ROLE_SWITCH=m
 CONFIG_USB_LED_TRIG=y
 CONFIG_USB_ULPI_BUS=m
@@ -6627,6 +7019,7 @@ CONFIG_LEDS_BCM6358=m
 CONFIG_LEDS_CPCAP=m
 CONFIG_LEDS_CR0014114=m
 CONFIG_LEDS_LM3530=m
+CONFIG_LEDS_LM3532=m
 CONFIG_LEDS_LM3533=m
 CONFIG_LEDS_LM3642=m
 CONFIG_LEDS_LM3692X=m
@@ -6660,6 +7053,7 @@ CONFIG_LEDS_LT3593=m
 CONFIG_LEDS_MC13783=m
 CONFIG_LEDS_TCA6507=m
 CONFIG_LEDS_TLC591XX=m
+CONFIG_LEDS_MAX77650=m
 # CONFIG_LEDS_MAX77693 is not set
 # CONFIG_LEDS_MAX8997 is not set
 CONFIG_LEDS_LM355x=m
@@ -6676,6 +7070,8 @@ CONFIG_LEDS_POWERNV=m
 CONFIG_LEDS_SYSCON=y
 CONFIG_LEDS_MLXREG=m
 CONFIG_LEDS_USER=m
+# CONFIG_LEDS_SPI_BYTE is not set
+# CONFIG_LEDS_TI_LMU_COMMON is not set
 
 #
 # LED Triggers
@@ -6717,12 +7113,11 @@ CONFIG_INFINIBAND_CXGB4=m
 CONFIG_INFINIBAND_I40IW=m
 CONFIG_MLX4_INFINIBAND=m
 CONFIG_MLX5_INFINIBAND=m
-CONFIG_INFINIBAND_NES=m
-# CONFIG_INFINIBAND_NES_DEBUG is not set
 CONFIG_INFINIBAND_OCRDMA=m
 CONFIG_INFINIBAND_BNXT_RE=m
 CONFIG_INFINIBAND_QEDR=m
 CONFIG_RDMA_RXE=m
+# CONFIG_RDMA_SIW is not set
 CONFIG_INFINIBAND_IPOIB=m
 CONFIG_INFINIBAND_IPOIB_CM=y
 CONFIG_INFINIBAND_IPOIB_DEBUG=y
@@ -6795,6 +7190,7 @@ CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_M41T80=m
 CONFIG_RTC_DRV_M41T80_WDT=y
+# CONFIG_RTC_DRV_BD70528 is not set
 CONFIG_RTC_DRV_BQ32K=m
 CONFIG_RTC_DRV_TWL4030=m
 CONFIG_RTC_DRV_PALMAS=m
@@ -6910,6 +7306,8 @@ CONFIG_QCOM_HIDMA=m
 CONFIG_DW_DMAC_CORE=m
 CONFIG_DW_DMAC=m
 CONFIG_DW_DMAC_PCI=m
+# CONFIG_DW_EDMA is not set
+# CONFIG_DW_EDMA_PCIE is not set
 
 #
 # DMA Clients
@@ -6924,6 +7322,8 @@ CONFIG_DMA_ENGINE_RAID=y
 CONFIG_SYNC_FILE=y
 # CONFIG_SW_SYNC is not set
 CONFIG_UDMABUF=y
+# end of DMABUF options
+
 CONFIG_AUXDISPLAY=y
 CONFIG_HD44780=m
 CONFIG_KS0108=m
@@ -6969,6 +7369,7 @@ CONFIG_VIRTIO=m
 CONFIG_VIRTIO_MENU=y
 CONFIG_VIRTIO_PCI=m
 CONFIG_VIRTIO_PCI_LEGACY=y
+# CONFIG_VIRTIO_PMEM is not set
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_INPUT=m
 CONFIG_VIRTIO_MMIO=m
@@ -6977,6 +7378,8 @@ CONFIG_VIRTIO_MMIO=m
 #
 # Microsoft Hyper-V guest support
 #
+# end of Microsoft Hyper-V guest support
+
 CONFIG_STAGING=y
 CONFIG_PRISM2_USB=m
 CONFIG_COMEDI=m
@@ -7080,8 +7483,6 @@ CONFIG_RTL8723BS=m
 CONFIG_R8712U=m
 CONFIG_R8188EU=m
 CONFIG_88EU_AP_MODE=y
-CONFIG_R8822BE=m
-CONFIG_RTLWIFI_DEBUG_ST=y
 CONFIG_RTS5208=m
 CONFIG_VT6655=m
 CONFIG_VT6656=m
@@ -7095,14 +7496,15 @@ CONFIG_VT6656=m
 #
 CONFIG_ADIS16203=m
 CONFIG_ADIS16240=m
+# end of Accelerometers
 
 #
 # Analog to digital converters
 #
-CONFIG_AD7780=m
 CONFIG_AD7816=m
 CONFIG_AD7192=m
 CONFIG_AD7280=m
+# end of Analog to digital converters
 
 #
 # Analog digital bi-direction converters
@@ -7110,23 +7512,27 @@ CONFIG_AD7280=m
 CONFIG_ADT7316=m
 CONFIG_ADT7316_SPI=m
 CONFIG_ADT7316_I2C=m
+# end of Analog digital bi-direction converters
 
 #
 # Capacitance to digital converters
 #
 CONFIG_AD7150=m
 CONFIG_AD7746=m
+# end of Capacitance to digital converters
 
 #
 # Direct Digital Synthesis
 #
 CONFIG_AD9832=m
 CONFIG_AD9834=m
+# end of Direct Digital Synthesis
 
 #
 # Network Analyzer, Impedance Converters
 #
 CONFIG_AD5933=m
+# end of Network Analyzer, Impedance Converters
 
 #
 # Active energy metering IC
@@ -7134,11 +7540,15 @@ CONFIG_AD5933=m
 CONFIG_ADE7854=m
 CONFIG_ADE7854_I2C=m
 CONFIG_ADE7854_SPI=m
+# end of Active energy metering IC
 
 #
 # Resolver to digital converters
 #
 CONFIG_AD2S1210=m
+# end of Resolver to digital converters
+# end of IIO staging drivers
+
 CONFIG_FB_SM750=m
 
 #
@@ -7156,6 +7566,8 @@ CONFIG_SPEAKUP_SYNTH_SOFT=m
 CONFIG_SPEAKUP_SYNTH_SPKOUT=m
 CONFIG_SPEAKUP_SYNTH_TXPRT=m
 CONFIG_SPEAKUP_SYNTH_DUMMY=m
+# end of Speakup console speech
+
 CONFIG_STAGING_MEDIA=y
 CONFIG_I2C_BCM2048=m
 
@@ -7166,6 +7578,8 @@ CONFIG_I2C_BCM2048=m
 #
 # Android
 #
+# end of Android
+
 CONFIG_LTE_GDM724X=m
 CONFIG_FIREWIRE_SERIAL=m
 CONFIG_FWTTY_MAX_TOTAL_PORTS=64
@@ -7244,6 +7658,8 @@ CONFIG_PI433=m
 #
 # Gasket devices
 #
+# end of Gasket devices
+
 CONFIG_XIL_AXIS_FIFO=m
 CONFIG_EROFS_FS=m
 # CONFIG_EROFS_FS_DEBUG is not set
@@ -7254,6 +7670,8 @@ CONFIG_EROFS_FS_SECURITY=y
 # CONFIG_EROFS_FAULT_INJECTION is not set
 CONFIG_EROFS_FS_IO_MAX_RETRIES=5
 # CONFIG_EROFS_FS_ZIP is not set
+# CONFIG_FIELDBUS_DEV is not set
+# CONFIG_KPC2000 is not set
 CONFIG_HWSPINLOCK=y
 
 #
@@ -7261,6 +7679,8 @@ CONFIG_HWSPINLOCK=y
 #
 CONFIG_I8253_LOCK=y
 CONFIG_CLKBLD_I8253=y
+# end of Clock Source drivers
+
 CONFIG_MAILBOX=y
 CONFIG_PLATFORM_MHU=m
 CONFIG_ALTERA_MBOX=m
@@ -7271,6 +7691,8 @@ CONFIG_IOMMU_SUPPORT=y
 #
 # Generic IOMMU Pagetable Support
 #
+# end of Generic IOMMU Pagetable Support
+
 # CONFIG_IOMMU_DEBUGFS is not set
 # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
 CONFIG_OF_IOMMU=y
@@ -7280,6 +7702,7 @@ CONFIG_SPAPR_TCE_IOMMU=y
 # Remoteproc drivers
 #
 CONFIG_REMOTEPROC=m
+# end of Remoteproc drivers
 
 #
 # Rpmsg drivers
@@ -7288,6 +7711,8 @@ CONFIG_RPMSG=m
 CONFIG_RPMSG_CHAR=m
 # CONFIG_RPMSG_QCOM_GLINK_RPM is not set
 CONFIG_RPMSG_VIRTIO=m
+# end of Rpmsg drivers
+
 # CONFIG_SOUNDWIRE is not set
 
 #
@@ -7297,29 +7722,43 @@ CONFIG_RPMSG_VIRTIO=m
 #
 # Amlogic SoC drivers
 #
+# end of Amlogic SoC drivers
+
+#
+# Aspeed SoC drivers
+#
+# end of Aspeed SoC drivers
 
 #
 # Broadcom SoC drivers
 #
+# end of Broadcom SoC drivers
 
 #
 # NXP/Freescale QorIQ SoC drivers
 #
 CONFIG_FSL_GUTS=y
+# end of NXP/Freescale QorIQ SoC drivers
 
 #
 # i.MX SoC drivers
 #
+# end of i.MX SoC drivers
 
 #
 # Qualcomm SoC drivers
 #
+# end of Qualcomm SoC drivers
+
 CONFIG_SOC_TI=y
 
 #
 # Xilinx SoC drivers
 #
 CONFIG_XILINX_VCU=m
+# end of Xilinx SoC drivers
+# end of SOC (System On Chip) specific Drivers
+
 CONFIG_PM_DEVFREQ=y
 
 #
@@ -7342,6 +7781,7 @@ CONFIG_EXTCON=y
 #
 CONFIG_EXTCON_ADC_JACK=m
 CONFIG_EXTCON_ARIZONA=m
+# CONFIG_EXTCON_FSA9480 is not set
 CONFIG_EXTCON_GPIO=m
 CONFIG_EXTCON_MAX14577=m
 CONFIG_EXTCON_MAX3355=m
@@ -7408,6 +7848,7 @@ CONFIG_MXC6255=m
 CONFIG_SCA3000=m
 CONFIG_STK8312=m
 CONFIG_STK8BA50=m
+# end of Accelerometers
 
 #
 # Analog to digital converters
@@ -7423,6 +7864,7 @@ CONFIG_AD7606_IFACE_PARALLEL=m
 CONFIG_AD7606_IFACE_SPI=m
 CONFIG_AD7766=m
 CONFIG_AD7768_1=m
+CONFIG_AD7780=m
 CONFIG_AD7791=m
 CONFIG_AD7793=m
 CONFIG_AD7887=m
@@ -7468,6 +7910,7 @@ CONFIG_TI_ADC128S052=m
 CONFIG_TI_ADC161S626=m
 CONFIG_TI_ADS1015=m
 CONFIG_TI_ADS7950=m
+CONFIG_TI_ADS8344=m
 CONFIG_TI_ADS8688=m
 CONFIG_TI_ADS124S08=m
 CONFIG_TI_AM335X_ADC=m
@@ -7476,16 +7919,20 @@ CONFIG_TI_TLC4541=m
 # CONFIG_TWL6030_GPADC is not set
 CONFIG_VF610_ADC=m
 CONFIG_VIPERBOARD_ADC=m
+# CONFIG_XILINX_XADC is not set
+# end of Analog to digital converters
 
 #
 # Analog Front Ends
 #
 CONFIG_IIO_RESCALE=m
+# end of Analog Front Ends
 
 #
 # Amplifiers
 #
 CONFIG_AD8366=m
+# end of Amplifiers
 
 #
 # Chemical Sensors
@@ -7500,12 +7947,15 @@ CONFIG_PMS7003=m
 CONFIG_SENSIRION_SGP30=m
 CONFIG_SPS30=m
 CONFIG_VZ89X=m
+# end of Chemical Sensors
 
 #
 # Hid Sensor IIO Common
 #
 CONFIG_HID_SENSOR_IIO_COMMON=m
 CONFIG_HID_SENSOR_IIO_TRIGGER=m
+# end of Hid Sensor IIO Common
+
 CONFIG_IIO_MS_SENSORS_I2C=m
 
 #
@@ -7513,14 +7963,12 @@ CONFIG_IIO_MS_SENSORS_I2C=m
 #
 CONFIG_IIO_SSP_SENSORS_COMMONS=m
 CONFIG_IIO_SSP_SENSORHUB=m
+# end of SSP Sensor Common
+
 CONFIG_IIO_ST_SENSORS_I2C=m
 CONFIG_IIO_ST_SENSORS_SPI=m
 CONFIG_IIO_ST_SENSORS_CORE=m
 
-#
-# Counters
-#
-
 #
 # Digital to analog converters
 #
@@ -7559,6 +8007,7 @@ CONFIG_TI_DAC5571=m
 CONFIG_TI_DAC7311=m
 CONFIG_TI_DAC7612=m
 CONFIG_VF610_DAC=m
+# end of Digital to analog converters
 
 #
 # IIO dummy driver
@@ -7566,6 +8015,7 @@ CONFIG_VF610_DAC=m
 CONFIG_IIO_SIMPLE_DUMMY=m
 # CONFIG_IIO_SIMPLE_DUMMY_EVENTS is not set
 # CONFIG_IIO_SIMPLE_DUMMY_BUFFER is not set
+# end of IIO dummy driver
 
 #
 # Frequency Synthesizers DDS/PLL
@@ -7575,11 +8025,15 @@ CONFIG_IIO_SIMPLE_DUMMY=m
 # Clock Generator/Distribution
 #
 CONFIG_AD9523=m
+# end of Clock Generator/Distribution
 
 #
 # Phase-Locked Loop (PLL) frequency synthesizers
 #
 CONFIG_ADF4350=m
+# CONFIG_ADF4371 is not set
+# end of Phase-Locked Loop (PLL) frequency synthesizers
+# end of Frequency Synthesizers DDS/PLL
 
 #
 # Digital gyroscope sensors
@@ -7592,6 +8046,9 @@ CONFIG_ADXRS450=m
 CONFIG_BMG160=m
 CONFIG_BMG160_I2C=m
 CONFIG_BMG160_SPI=m
+CONFIG_FXAS21002C=m
+CONFIG_FXAS21002C_I2C=m
+CONFIG_FXAS21002C_SPI=m
 CONFIG_HID_SENSOR_GYRO_3D=m
 CONFIG_MPU3050=m
 CONFIG_MPU3050_I2C=m
@@ -7599,6 +8056,7 @@ CONFIG_IIO_ST_GYRO_3AXIS=m
 CONFIG_IIO_ST_GYRO_I2C_3AXIS=m
 CONFIG_IIO_ST_GYRO_SPI_3AXIS=m
 CONFIG_ITG3200=m
+# end of Digital gyroscope sensors
 
 #
 # Health Sensors
@@ -7611,6 +8069,8 @@ CONFIG_AFE4403=m
 CONFIG_AFE4404=m
 CONFIG_MAX30100=m
 CONFIG_MAX30102=m
+# end of Heart Rate Monitors
+# end of Health Sensors
 
 #
 # Humidity sensors
@@ -7625,6 +8085,7 @@ CONFIG_HTS221_SPI=m
 CONFIG_HTU21=m
 CONFIG_SI7005=m
 CONFIG_SI7020=m
+# end of Humidity sensors
 
 #
 # Inertial measurement units
@@ -7641,6 +8102,8 @@ CONFIG_INV_MPU6050_SPI=m
 CONFIG_IIO_ST_LSM6DSX=m
 CONFIG_IIO_ST_LSM6DSX_I2C=m
 CONFIG_IIO_ST_LSM6DSX_SPI=m
+# end of Inertial measurement units
+
 CONFIG_IIO_ADIS_LIB=m
 CONFIG_IIO_ADIS_LIB_BUFFER=y
 
@@ -7691,6 +8154,7 @@ CONFIG_VCNL4035=m
 CONFIG_VEML6070=m
 CONFIG_VL6180=m
 CONFIG_ZOPT2201=m
+# end of Light sensors
 
 #
 # Magnetometer sensors
@@ -7713,17 +8177,20 @@ CONFIG_SENSORS_HMC5843_SPI=m
 CONFIG_SENSORS_RM3100=m
 CONFIG_SENSORS_RM3100_I2C=m
 CONFIG_SENSORS_RM3100_SPI=m
+# end of Magnetometer sensors
 
 #
 # Multiplexers
 #
 CONFIG_IIO_MUX=m
+# end of Multiplexers
 
 #
 # Inclinometer sensors
 #
 CONFIG_HID_SENSOR_INCLINOMETER_3D=m
 CONFIG_HID_SENSOR_DEVICE_ROTATION=m
+# end of Inclinometer sensors
 
 #
 # Triggers - standalone
@@ -7732,6 +8199,7 @@ CONFIG_IIO_HRTIMER_TRIGGER=m
 CONFIG_IIO_INTERRUPT_TRIGGER=m
 CONFIG_IIO_TIGHTLOOP_TRIGGER=m
 CONFIG_IIO_SYSFS_TRIGGER=m
+# end of Triggers - standalone
 
 #
 # Digital potentiometers
@@ -7745,11 +8213,13 @@ CONFIG_MCP4131=m
 CONFIG_MCP4531=m
 CONFIG_MCP41010=m
 CONFIG_TPL0102=m
+# end of Digital potentiometers
 
 #
 # Digital potentiostats
 #
 CONFIG_LMP91000=m
+# end of Digital potentiostats
 
 #
 # Pressure sensors
@@ -7758,6 +8228,7 @@ CONFIG_ABP060MG=m
 CONFIG_BMP280=m
 CONFIG_BMP280_I2C=m
 CONFIG_BMP280_SPI=m
+# CONFIG_DPS310 is not set
 CONFIG_HID_SENSOR_PRESS=m
 CONFIG_HP03=m
 CONFIG_MPL115=m
@@ -7776,28 +8247,33 @@ CONFIG_HP206C=m
 CONFIG_ZPA2326=m
 CONFIG_ZPA2326_I2C=m
 CONFIG_ZPA2326_SPI=m
+# end of Pressure sensors
 
 #
 # Lightning sensors
 #
 # CONFIG_AS3935 is not set
+# end of Lightning sensors
 
 #
 # Proximity and distance sensors
 #
 CONFIG_ISL29501=m
 CONFIG_LIDAR_LITE_V2=m
+CONFIG_MB1232=m
 CONFIG_RFD77402=m
 # CONFIG_SRF04 is not set
 CONFIG_SX9500=m
 CONFIG_SRF08=m
 CONFIG_VL53L0X_I2C=m
+# end of Proximity and distance sensors
 
 #
 # Resolver to digital converters
 #
 CONFIG_AD2S90=m
 CONFIG_AD2S1200=m
+# end of Resolver to digital converters
 
 #
 # Temperature sensors
@@ -7810,7 +8286,11 @@ CONFIG_TMP006=m
 CONFIG_TMP007=m
 CONFIG_TSYS01=m
 CONFIG_TSYS02D=m
+CONFIG_MAX31856=m
+# end of Temperature sensors
+
 CONFIG_NTB=m
+# CONFIG_NTB_MSI is not set
 CONFIG_NTB_IDT=m
 CONFIG_NTB_SWITCHTEC=m
 CONFIG_NTB_PINGPONG=m
@@ -7831,18 +8311,15 @@ CONFIG_PWM_STMPE=y
 # IRQ chip support
 #
 CONFIG_IRQCHIP=y
-CONFIG_ARM_GIC_MAX_NR=1
+# CONFIG_AL_FIC is not set
 CONFIG_MADERA_IRQ=m
+# end of IRQ chip support
+
 CONFIG_IPACK_BUS=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_SERIAL_IPOCTAL=m
 CONFIG_RESET_CONTROLLER=y
 # CONFIG_RESET_TI_SYSCON is not set
-CONFIG_FMC=m
-CONFIG_FMC_FAKEDEV=m
-CONFIG_FMC_TRIVIAL=m
-CONFIG_FMC_WRITE_EEPROM=m
-CONFIG_FMC_CHARDEV=m
 
 #
 # PHY Subsystem
@@ -7854,6 +8331,7 @@ CONFIG_PHY_CADENCE_DP=m
 CONFIG_PHY_CADENCE_DPHY=m
 CONFIG_PHY_CADENCE_SIERRA=m
 CONFIG_PHY_FSL_IMX8MQ_USB=m
+# CONFIG_PHY_MIXEL_MIPI_DPHY is not set
 CONFIG_PHY_PXA_28NM_HSIC=m
 CONFIG_PHY_PXA_28NM_USB2=m
 # CONFIG_PHY_CPCAP_USB is not set
@@ -7862,6 +8340,8 @@ CONFIG_PHY_OCELOT_SERDES=m
 CONFIG_PHY_QCOM_USB_HS=m
 CONFIG_PHY_QCOM_USB_HSIC=m
 CONFIG_PHY_TUSB1210=m
+# end of PHY Subsystem
+
 CONFIG_POWERCAP=y
 CONFIG_IDLE_INJECT=y
 CONFIG_MCB=m
@@ -7871,12 +8351,16 @@ CONFIG_MCB_LPC=m
 #
 # Performance monitor support
 #
+# end of Performance monitor support
+
 CONFIG_RAS=y
 
 #
 # Android
 #
 # CONFIG_ANDROID is not set
+# end of Android
+
 CONFIG_LIBNVDIMM=y
 CONFIG_BLK_DEV_PMEM=m
 CONFIG_ND_BLK=m
@@ -7894,6 +8378,7 @@ CONFIG_DEV_DAX_PMEM=m
 CONFIG_DEV_DAX_KMEM=m
 CONFIG_DEV_DAX_PMEM_COMPAT=m
 CONFIG_NVMEM=y
+CONFIG_NVMEM_SYSFS=y
 
 #
 # HW tracing support
@@ -7912,6 +8397,8 @@ CONFIG_INTEL_TH_STH=m
 CONFIG_INTEL_TH_MSU=m
 CONFIG_INTEL_TH_PTI=m
 # CONFIG_INTEL_TH_DEBUG is not set
+# end of HW tracing support
+
 CONFIG_FPGA=m
 CONFIG_ALTERA_PR_IP_CORE=m
 CONFIG_ALTERA_PR_IP_CORE_PLAT=m
@@ -7948,10 +8435,14 @@ CONFIG_MUX_ADG792A=m
 # CONFIG_MUX_ADGS1408 is not set
 CONFIG_MUX_GPIO=m
 CONFIG_MUX_MMIO=m
+# end of Multiplexer drivers
+
 CONFIG_PM_OPP=y
 # CONFIG_SIOX is not set
 # CONFIG_SLIMBUS is not set
 CONFIG_INTERCONNECT=m
+# CONFIG_COUNTER is not set
+# end of Device Drivers
 
 #
 # File systems
@@ -8053,6 +8544,7 @@ CONFIG_FSCACHE=m
 CONFIG_CACHEFILES=m
 # CONFIG_CACHEFILES_DEBUG is not set
 # CONFIG_CACHEFILES_HISTOGRAM is not set
+# end of Caches
 
 #
 # CD-ROM/DVD Filesystems
@@ -8061,6 +8553,7 @@ CONFIG_ISO9660_FS=m
 CONFIG_JOLIET=y
 CONFIG_ZISOFS=y
 CONFIG_UDF_FS=m
+# end of CD-ROM/DVD Filesystems
 
 #
 # DOS/FAT/NT Filesystems
@@ -8074,6 +8567,7 @@ CONFIG_FAT_DEFAULT_UTF8=y
 CONFIG_NTFS_FS=m
 # CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
+# end of DOS/FAT/NT Filesystems
 
 #
 # Pseudo filesystems
@@ -8095,6 +8589,8 @@ CONFIG_HUGETLB_PAGE=y
 CONFIG_MEMFD_CREATE=y
 CONFIG_ARCH_HAS_GIGANTIC_PAGE=y
 CONFIG_CONFIGFS_FS=y
+# end of Pseudo filesystems
+
 CONFIG_MISC_FILESYSTEMS=y
 CONFIG_ORANGEFS_FS=m
 CONFIG_ADFS_FS=m
@@ -8104,7 +8600,8 @@ CONFIG_ECRYPT_FS=m
 # CONFIG_ECRYPT_FS_MESSAGING is not set
 CONFIG_HFS_FS=m
 CONFIG_HFSPLUS_FS=m
-# CONFIG_BEFS_FS is not set
+CONFIG_BEFS_FS=m
+# CONFIG_BEFS_DEBUG is not set
 # CONFIG_BFS_FS is not set
 # CONFIG_EFS_FS is not set
 CONFIG_JFFS2_FS=m
@@ -8215,12 +8712,13 @@ CONFIG_SUNRPC_GSS=m
 CONFIG_SUNRPC_BACKCHANNEL=y
 CONFIG_SUNRPC_SWAP=y
 CONFIG_RPCSEC_GSS_KRB5=m
-CONFIG_CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y
+# CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES is not set
 # CONFIG_SUNRPC_DEBUG is not set
 CONFIG_SUNRPC_XPRT_RDMA=m
 CONFIG_CEPH_FS=m
 CONFIG_CEPH_FSCACHE=y
 CONFIG_CEPH_FS_POSIX_ACL=y
+# CONFIG_CEPH_FS_SECURITY_LABEL is not set
 CONFIG_CIFS=m
 # CONFIG_CIFS_STATS2 is not set
 CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
@@ -8228,7 +8726,6 @@ CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
 CONFIG_CIFS_UPCALL=y
 CONFIG_CIFS_XATTR=y
 CONFIG_CIFS_POSIX=y
-CONFIG_CIFS_ACL=y
 # CONFIG_CIFS_DEBUG is not set
 CONFIG_CIFS_DFS_UPCALL=y
 # CONFIG_CIFS_SMB_DIRECT is not set
@@ -8295,12 +8792,16 @@ CONFIG_NLS_MAC_TURKISH=m
 CONFIG_NLS_UTF8=m
 CONFIG_DLM=m
 # CONFIG_DLM_DEBUG is not set
+CONFIG_UNICODE=y
+# CONFIG_UNICODE_NORMALIZATION_SELFTEST is not set
+# end of File systems
 
 #
 # Security options
 #
 CONFIG_KEYS=y
 CONFIG_KEYS_COMPAT=y
+# CONFIG_KEYS_REQUEST_CACHE is not set
 # CONFIG_PERSISTENT_KEYRINGS is not set
 # CONFIG_BIG_KEYS is not set
 CONFIG_TRUSTED_KEYS=m
@@ -8344,6 +8845,24 @@ CONFIG_INTEGRITY_AUDIT=y
 # CONFIG_DEFAULT_SECURITY_APPARMOR is not set
 CONFIG_DEFAULT_SECURITY_DAC=y
 CONFIG_LSM="yama,loadpin,safesetid,integrity"
+
+#
+# Kernel hardening options
+#
+
+#
+# Memory initialization
+#
+CONFIG_INIT_STACK_NONE=y
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_USER is not set
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL is not set
+# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
+# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
+# end of Memory initialization
+# end of Kernel hardening options
+# end of Security options
+
 CONFIG_XOR_BLOCKS=m
 CONFIG_ASYNC_CORE=m
 CONFIG_ASYNC_MEMCPY=m
@@ -8371,9 +8890,6 @@ CONFIG_CRYPTO_AKCIPHER=y
 CONFIG_CRYPTO_KPP2=y
 CONFIG_CRYPTO_KPP=y
 CONFIG_CRYPTO_ACOMP2=y
-CONFIG_CRYPTO_RSA=y
-CONFIG_CRYPTO_DH=y
-CONFIG_CRYPTO_ECDH=m
 CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MANAGER2=y
 CONFIG_CRYPTO_USER=m
@@ -8382,12 +8898,20 @@ CONFIG_CRYPTO_GF128MUL=m
 CONFIG_CRYPTO_NULL=y
 CONFIG_CRYPTO_NULL2=y
 CONFIG_CRYPTO_PCRYPT=m
-CONFIG_CRYPTO_WORKQUEUE=y
 CONFIG_CRYPTO_CRYPTD=m
 CONFIG_CRYPTO_AUTHENC=m
 CONFIG_CRYPTO_TEST=m
 CONFIG_CRYPTO_ENGINE=m
 
+#
+# Public-key cryptography
+#
+CONFIG_CRYPTO_RSA=y
+CONFIG_CRYPTO_DH=y
+CONFIG_CRYPTO_ECC=m
+CONFIG_CRYPTO_ECDH=m
+CONFIG_CRYPTO_ECRDSA=m
+
 #
 # Authenticated Encryption with Associated Data
 #
@@ -8432,6 +8956,7 @@ CONFIG_CRYPTO_VMAC=m
 CONFIG_CRYPTO_CRC32C=m
 CONFIG_CRYPTO_CRC32C_VPMSUM=m
 CONFIG_CRYPTO_CRC32=m
+# CONFIG_CRYPTO_XXHASH is not set
 CONFIG_CRYPTO_CRCT10DIF=y
 CONFIG_CRYPTO_CRCT10DIF_VPMSUM=m
 CONFIG_CRYPTO_VPMSUM_TESTER=m
@@ -8451,7 +8976,7 @@ CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA512=y
 CONFIG_CRYPTO_SHA3=m
 CONFIG_CRYPTO_SM3=m
-# CONFIG_CRYPTO_STREEBOG is not set
+CONFIG_CRYPTO_STREEBOG=m
 CONFIG_CRYPTO_TGR192=m
 CONFIG_CRYPTO_WP512=m
 
@@ -8461,6 +8986,7 @@ CONFIG_CRYPTO_WP512=m
 CONFIG_CRYPTO_AES=y
 CONFIG_CRYPTO_AES_TI=m
 CONFIG_CRYPTO_ANUBIS=m
+CONFIG_CRYPTO_LIB_ARC4=m
 CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_BLOWFISH=m
 CONFIG_CRYPTO_BLOWFISH_COMMON=m
@@ -8512,6 +9038,8 @@ CONFIG_CRYPTO_DEV_NX=y
 CONFIG_CRYPTO_DEV_NX_ENCRYPT=y
 CONFIG_CRYPTO_DEV_NX_COMPRESS=m
 CONFIG_CRYPTO_DEV_NX_COMPRESS_PSERIES=m
+# CONFIG_CRYPTO_DEV_ATMEL_ECC is not set
+# CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set
 # CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set
 CONFIG_CRYPTO_DEV_VMX=y
 CONFIG_CRYPTO_DEV_VMX_ENCRYPT=m
@@ -8537,6 +9065,8 @@ CONFIG_SYSTEM_TRUSTED_KEYS=""
 # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
 # CONFIG_SECONDARY_TRUSTED_KEYRING is not set
 # CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
+# end of Certificates for signature checking
+
 CONFIG_BINARY_PRINTF=y
 
 #
@@ -8544,11 +9074,13 @@ CONFIG_BINARY_PRINTF=y
 #
 CONFIG_RAID6_PQ=m
 CONFIG_RAID6_PQ_BENCHMARK=y
+CONFIG_PACKING=y
 CONFIG_BITREVERSE=y
-CONFIG_RATIONAL=y
 CONFIG_GENERIC_STRNCPY_FROM_USER=y
 CONFIG_GENERIC_STRNLEN_USER=y
 CONFIG_GENERIC_NET_UTILS=y
+CONFIG_CORDIC=m
+CONFIG_RATIONAL=y
 CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_GENERIC_IOMAP=y
 CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
@@ -8617,6 +9149,7 @@ CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_ARCH_DMA_ADDR_T_64BIT=y
 CONFIG_DMA_DECLARE_COHERENT=y
 CONFIG_DMA_VIRT_OPS=y
+CONFIG_SWIOTLB=y
 # CONFIG_DMA_API_DEBUG is not set
 CONFIG_SGL_ALLOC=y
 CONFIG_IOMMU_HELPER=y
@@ -8628,10 +9161,9 @@ CONFIG_GLOB=y
 CONFIG_NLATTR=y
 CONFIG_LRU_CACHE=m
 CONFIG_CLZ_TAB=y
-CONFIG_CORDIC=m
-CONFIG_DDR=y
 CONFIG_IRQ_POLL=y
 CONFIG_MPILIB=y
+CONFIG_DIMLIB=y
 CONFIG_LIBFDT=y
 CONFIG_OID_REGISTRY=y
 CONFIG_FONT_SUPPORT=y
@@ -8654,8 +9186,9 @@ CONFIG_ARCH_HAS_PMEM_API=y
 CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y
 CONFIG_SBITMAP=y
 CONFIG_PARMAN=m
-# CONFIG_STRING_SELFTEST is not set
 CONFIG_OBJAGG=m
+# CONFIG_STRING_SELFTEST is not set
+# end of Library routines
 
 #
 # Kernel hacking
@@ -8670,6 +9203,7 @@ CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
 CONFIG_CONSOLE_LOGLEVEL_QUIET=4
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 CONFIG_DYNAMIC_DEBUG=y
+# end of printk and dmesg options
 
 #
 # Compile-time checks and compiler options
@@ -8678,6 +9212,7 @@ CONFIG_DEBUG_INFO=y
 # CONFIG_DEBUG_INFO_REDUCED is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
 # CONFIG_DEBUG_INFO_DWARF4 is not set
+# CONFIG_DEBUG_INFO_BTF is not set
 # CONFIG_GDB_SCRIPTS is not set
 # CONFIG_ENABLE_MUST_CHECK is not set
 CONFIG_FRAME_WARN=2048
@@ -8685,14 +9220,18 @@ CONFIG_STRIP_ASM_SYMS=y
 # CONFIG_READABLE_ASM is not set
 # CONFIG_UNUSED_SYMBOLS is not set
 CONFIG_DEBUG_FS=y
-# CONFIG_HEADERS_CHECK is not set
+# CONFIG_HEADERS_INSTALL is not set
+# CONFIG_OPTIMIZE_INLINING is not set
 # CONFIG_DEBUG_SECTION_MISMATCH is not set
 CONFIG_SECTION_MISMATCH_WARN_ONLY=y
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+# end of Compile-time checks and compiler options
+
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
 CONFIG_MAGIC_SYSRQ_SERIAL=y
 CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_MISC=y
 
 #
 # Memory Debugging
@@ -8718,6 +9257,8 @@ CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
 # CONFIG_DEBUG_STACKOVERFLOW is not set
 CONFIG_CC_HAS_KASAN_GENERIC=y
 CONFIG_KASAN_STACK=1
+# end of Memory Debugging
+
 CONFIG_ARCH_HAS_KCOV=y
 CONFIG_CC_HAS_SANCOV_TRACE_PC=y
 # CONFIG_KCOV is not set
@@ -8738,6 +9279,8 @@ CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
 CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
 # CONFIG_WQ_WATCHDOG is not set
+# end of Debug Lockups and Hangs
+
 # CONFIG_PANIC_ON_OOPS is not set
 CONFIG_PANIC_ON_OOPS_VALUE=0
 # CONFIG_SCHED_DEBUG is not set
@@ -8762,12 +9305,14 @@ CONFIG_LOCK_DEBUGGING_SUPPORT=y
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_LOCK_TORTURE_TEST is not set
 CONFIG_WW_MUTEX_SELFTEST=m
+# end of Lock Debugging (spinlocks, mutexes, etc...)
+
 CONFIG_STACKTRACE=y
 # CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
 # CONFIG_DEBUG_KOBJECT is not set
 CONFIG_DEBUG_BUGVERBOSE=y
 CONFIG_DEBUG_LIST=y
-# CONFIG_DEBUG_PI_LIST is not set
+# CONFIG_DEBUG_PLIST is not set
 # CONFIG_DEBUG_SG is not set
 CONFIG_DEBUG_NOTIFIERS=y
 CONFIG_DEBUG_CREDENTIALS=y
@@ -8781,6 +9326,8 @@ CONFIG_RCU_PERF_TEST=m
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
 # CONFIG_RCU_TRACE is not set
 # CONFIG_RCU_EQS_DEBUG is not set
+# end of RCU Debugging
+
 # CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
 # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
@@ -8794,6 +9341,7 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
 CONFIG_HAVE_DYNAMIC_FTRACE=y
 CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
 CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
+CONFIG_HAVE_C_RECORDMCOUNT=y
 CONFIG_TRACE_CLOCK=y
 CONFIG_RING_BUFFER=y
 CONFIG_EVENT_TRACING=y
@@ -8831,7 +9379,6 @@ CONFIG_FTRACE_MCOUNT_RECORD=y
 # CONFIG_RING_BUFFER_STARTUP_TEST is not set
 CONFIG_PREEMPTIRQ_DELAY_TEST=m
 # CONFIG_TRACE_EVAL_MAP_FILE is not set
-CONFIG_TRACING_EVENTS_GPIO=y
 CONFIG_RUNTIME_TESTING_MENU=y
 CONFIG_LKDTM=m
 # CONFIG_TEST_LIST_SORT is not set
@@ -8839,12 +9386,14 @@ CONFIG_LKDTM=m
 # CONFIG_KPROBES_SANITY_TEST is not set
 # CONFIG_BACKTRACE_SELF_TEST is not set
 # CONFIG_RBTREE_TEST is not set
+# CONFIG_REED_SOLOMON_TEST is not set
 # CONFIG_INTERVAL_TREE_TEST is not set
 # CONFIG_PERCPU_TEST is not set
 # CONFIG_ATOMIC64_SELFTEST is not set
 CONFIG_ASYNC_RAID6_TEST=m
 # CONFIG_TEST_HEXDUMP is not set
 CONFIG_TEST_STRING_HELPERS=m
+# CONFIG_TEST_STRSCPY is not set
 CONFIG_TEST_KSTRTOX=m
 CONFIG_TEST_PRINTF=m
 CONFIG_TEST_BITMAP=m
@@ -8860,6 +9409,7 @@ CONFIG_TEST_PARMAN=m
 # CONFIG_TEST_VMALLOC is not set
 # CONFIG_TEST_USER_COPY is not set
 # CONFIG_TEST_BPF is not set
+# CONFIG_TEST_BLACKHOLE_DEV is not set
 # CONFIG_FIND_BIT_BENCHMARK is not set
 # CONFIG_TEST_FIRMWARE is not set
 # CONFIG_TEST_SYSCTL is not set
@@ -8869,6 +9419,7 @@ CONFIG_TEST_STATIC_KEYS=m
 # CONFIG_TEST_MEMCAT_P is not set
 # CONFIG_TEST_OBJAGG is not set
 # CONFIG_TEST_STACKINIT is not set
+# CONFIG_TEST_MEMINIT is not set
 # CONFIG_MEMTEST is not set
 CONFIG_BUG_ON_DATA_CORRUPTION=y
 # CONFIG_SAMPLES is not set
@@ -8893,8 +9444,10 @@ CONFIG_PRINT_STACK_DEPTH=64
 CONFIG_XMON=y
 # CONFIG_XMON_DEFAULT is not set
 CONFIG_XMON_DISASSEMBLY=y
+CONFIG_XMON_DEFAULT_RO_MODE=y
 CONFIG_DEBUGGER=y
 CONFIG_BOOTX_TEXT=y
 # CONFIG_PPC_EARLY_DEBUG is not set
 # CONFIG_PPC_PTDUMP is not set
 # CONFIG_PPC_FAST_ENDIAN_SWITCH is not set
+# end of Kernel hacking
diff --git a/srcpkgs/linux5.1/files/ppc64le-dotconfig b/srcpkgs/linux5.3/files/ppc64le-dotconfig
similarity index 92%
rename from srcpkgs/linux5.1/files/ppc64le-dotconfig
rename to srcpkgs/linux5.3/files/ppc64le-dotconfig
index a6ac040b5bf..fb8c598df75 100644
--- a/srcpkgs/linux5.1/files/ppc64le-dotconfig
+++ b/srcpkgs/linux5.3/files/ppc64le-dotconfig
@@ -1,14 +1,15 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.1.18 Kernel Configuration
+# Linux/powerpc 5.3.0 Kernel Configuration
 #
 
 #
-# Compiler: powerpc64le-linux-gnu-gcc (GCC) 9.1.0
+# Compiler: powerpc64le-linux-gnu-gcc (GCC) 9.2.0
 #
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=90100
+CONFIG_GCC_VERSION=90200
 CONFIG_CLANG_VERSION=0
+CONFIG_CC_CAN_LINK=y
 CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y
 CONFIG_IRQ_WORK=y
@@ -20,6 +21,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
 #
 CONFIG_INIT_ENV_ARG_LIMIT=32
 # CONFIG_COMPILE_TEST is not set
+# CONFIG_HEADER_TEST is not set
 CONFIG_LOCALVERSION="_1"
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_BUILD_SALT=""
@@ -53,6 +55,8 @@ CONFIG_GENERIC_MSI_IRQ=y
 CONFIG_IRQ_FORCED_THREADING=y
 CONFIG_SPARSE_IRQ=y
 # CONFIG_GENERIC_IRQ_DEBUGFS is not set
+# end of IRQ subsystem
+
 CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_ARCH_HAS_TICK_BROADCAST=y
@@ -69,6 +73,8 @@ CONFIG_NO_HZ_IDLE=y
 # CONFIG_NO_HZ_FULL is not set
 # CONFIG_NO_HZ is not set
 CONFIG_HIGH_RES_TIMERS=y
+# end of Timers subsystem
+
 # CONFIG_PREEMPT_NONE is not set
 CONFIG_PREEMPT_VOLUNTARY=y
 # CONFIG_PREEMPT is not set
@@ -88,6 +94,8 @@ CONFIG_TASK_DELAY_ACCT=y
 CONFIG_TASK_XACCT=y
 CONFIG_TASK_IO_ACCOUNTING=y
 # CONFIG_PSI is not set
+# end of CPU/Task time and stats accounting
+
 CONFIG_CPU_ISOLATION=y
 
 #
@@ -100,12 +108,22 @@ CONFIG_TREE_SRCU=y
 CONFIG_TASKS_RCU=y
 CONFIG_RCU_STALL_COMMON=y
 CONFIG_RCU_NEED_SEGCBLIST=y
+# end of RCU Subsystem
+
 CONFIG_BUILD_BIN2C=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
+CONFIG_IKHEADERS=m
 CONFIG_LOG_BUF_SHIFT=19
 CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
 CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
+
+#
+# Scheduler features
+#
+# CONFIG_UCLAMP_TASK is not set
+# end of Scheduler features
+
 CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
 CONFIG_NUMA_BALANCING=y
 CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
@@ -116,7 +134,6 @@ CONFIG_MEMCG_SWAP=y
 CONFIG_MEMCG_SWAP_ENABLED=y
 CONFIG_MEMCG_KMEM=y
 CONFIG_BLK_CGROUP=y
-# CONFIG_DEBUG_BLK_CGROUP is not set
 CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
@@ -157,7 +174,6 @@ CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
 CONFIG_HAVE_LD_DEAD_CODE_DATA_ELIMINATION=y
 # CONFIG_LD_DEAD_CODE_DATA_ELIMINATION is not set
 CONFIG_SYSCTL=y
-CONFIG_ANON_INODES=y
 CONFIG_SYSCTL_EXCEPTION_TRACE=y
 CONFIG_HAVE_PCSPKR_PLATFORM=y
 CONFIG_BPF=y
@@ -202,6 +218,8 @@ CONFIG_HAVE_PERF_EVENTS=y
 # Kernel Performance Events And Counters
 #
 CONFIG_PERF_EVENTS=y
+# end of Kernel Performance Events And Counters
+
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_SLUB_DEBUG=y
 # CONFIG_SLUB_MEMCG_SYSFS_ON is not set
@@ -212,10 +230,13 @@ CONFIG_SLUB=y
 CONFIG_SLAB_MERGE_DEFAULT=y
 CONFIG_SLAB_FREELIST_RANDOM=y
 CONFIG_SLAB_FREELIST_HARDENED=y
+CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
 CONFIG_SLUB_CPU_PARTIAL=y
 CONFIG_SYSTEM_DATA_VERIFICATION=y
 CONFIG_PROFILING=y
 CONFIG_TRACEPOINTS=y
+# end of General setup
+
 CONFIG_PPC64=y
 
 #
@@ -234,6 +255,11 @@ CONFIG_VSX=y
 CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
 CONFIG_PPC_RADIX_MMU=y
 CONFIG_PPC_RADIX_MMU_DEFAULT=y
+CONFIG_PPC_HAVE_KUEP=y
+CONFIG_PPC_KUEP=y
+CONFIG_PPC_HAVE_KUAP=y
+CONFIG_PPC_KUAP=y
+# CONFIG_PPC_KUAP_DEBUG is not set
 CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y
 CONFIG_PPC_MM_SLICES=y
 CONFIG_PPC_HAVE_PMU_SUPPORT=y
@@ -242,6 +268,8 @@ CONFIG_FORCE_SMP=y
 CONFIG_SMP=y
 CONFIG_NR_CPUS=2048
 CONFIG_PPC_DOORBELL=y
+# end of Processor support
+
 # CONFIG_CPU_BIG_ENDIAN is not set
 CONFIG_CPU_LITTLE_ENDIAN=y
 CONFIG_PPC64_BOOT_WRAPPER=y
@@ -259,7 +287,6 @@ CONFIG_PPC_WATCHDOG=y
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_PPC=y
 CONFIG_PPC_BARRIER_NOSPEC=y
@@ -275,8 +302,10 @@ CONFIG_GENERIC_BUG=y
 CONFIG_EPAPR_BOOT=y
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_ARCH_SUSPEND_NONZERO_CPU=y
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 CONFIG_ARCH_SUPPORTS_UPROBES=y
+CONFIG_PPC_DAWR=y
 CONFIG_PGTABLE_LEVELS=4
 CONFIG_PPC_MSI_BITMAP=y
 CONFIG_PPC_XICS=y
@@ -350,6 +379,7 @@ CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
 # CPU frequency scaling drivers
 #
 CONFIG_POWERNV_CPUFREQ=y
+# end of CPU Frequency scaling
 
 #
 # CPUIdle driver
@@ -368,8 +398,13 @@ CONFIG_CPU_IDLE_GOV_TEO=y
 #
 CONFIG_PSERIES_CPUIDLE=y
 CONFIG_POWERNV_CPUIDLE=y
+# end of POWERPC CPU Idle Drivers
+# end of CPU Idle
+# end of CPUIdle driver
+
 # CONFIG_GEN_RTC is not set
 # CONFIG_SIMPLE_GPIO is not set
+# end of Platform support
 
 #
 # Kernel options
@@ -430,6 +465,7 @@ CONFIG_HIBERNATION=y
 CONFIG_PM_STD_PARTITION=""
 CONFIG_PM_SLEEP=y
 CONFIG_PM_SLEEP_SMP=y
+CONFIG_PM_SLEEP_SMP_NONZERO_CPU=y
 # CONFIG_PM_AUTOSLEEP is not set
 # CONFIG_PM_WAKELOCKS is not set
 CONFIG_PM=y
@@ -445,6 +481,8 @@ CONFIG_PM_GENERIC_DOMAINS_OF=y
 CONFIG_ENERGY_MODEL=y
 CONFIG_SECCOMP=y
 CONFIG_PPC_MEM_KEYS=y
+# end of Kernel options
+
 CONFIG_ISA_DMA_API=y
 
 #
@@ -452,6 +490,8 @@ CONFIG_ISA_DMA_API=y
 #
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_FSL_LBC=y
+# end of Bus options
+
 CONFIG_NONSTATIC_KERNEL=y
 CONFIG_PAGE_OFFSET=0xc000000000000000
 CONFIG_KERNEL_START=0xc000000000000000
@@ -521,6 +561,8 @@ CONFIG_HAVE_PERF_REGS=y
 CONFIG_HAVE_PERF_USER_STACK_DUMP=y
 CONFIG_HAVE_ARCH_JUMP_LABEL=y
 CONFIG_HAVE_RCU_TABLE_FREE=y
+CONFIG_HAVE_RCU_TABLE_NO_INVALIDATE=y
+CONFIG_HAVE_MMU_GATHER_PAGE_SIZE=y
 CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
 CONFIG_ARCH_WEAK_RELEASE_ACQUIRE=y
 CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
@@ -537,6 +579,7 @@ CONFIG_HAVE_VIRT_CPU_ACCOUNTING=y
 CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
 CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
 CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
+CONFIG_HAVE_ARCH_HUGE_VMAP=y
 CONFIG_HAVE_ARCH_SOFT_DIRTY=y
 CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
 CONFIG_MODULES_USE_ELF_RELA=y
@@ -555,15 +598,28 @@ CONFIG_64BIT_TIME=y
 CONFIG_COMPAT_32BIT_TIME=y
 CONFIG_ARCH_HAS_PHYS_TO_DMA=y
 CONFIG_REFCOUNT_FULL=y
+# CONFIG_LOCK_EVENT_COUNTS is not set
 
 #
 # GCOV-based kernel profiling
 #
 # CONFIG_GCOV_KERNEL is not set
 CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
+# end of GCOV-based kernel profiling
+
 CONFIG_PLUGIN_HOSTCC="g++"
 CONFIG_HAVE_GCC_PLUGINS=y
-# CONFIG_GCC_PLUGINS is not set
+CONFIG_GCC_PLUGINS=y
+
+#
+# GCC plugins
+#
+# CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set
+# CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
+# CONFIG_GCC_PLUGIN_RANDSTRUCT is not set
+# end of GCC plugins
+# end of General architecture-dependent options
+
 CONFIG_RT_MUTEXES=y
 CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
@@ -617,6 +673,8 @@ CONFIG_LDM_PARTITION=y
 CONFIG_EFI_PARTITION=y
 # CONFIG_SYSV68_PARTITION is not set
 CONFIG_CMDLINE_PARTITION=y
+# end of Partition Types
+
 CONFIG_BLOCK_COMPAT=y
 CONFIG_BLK_MQ_PCI=y
 CONFIG_BLK_MQ_VIRTIO=y
@@ -630,6 +688,9 @@ CONFIG_MQ_IOSCHED_DEADLINE=y
 CONFIG_MQ_IOSCHED_KYBER=y
 CONFIG_IOSCHED_BFQ=y
 CONFIG_BFQ_GROUP_IOSCHED=y
+# CONFIG_BFQ_CGROUP_DEBUG is not set
+# end of IO Schedulers
+
 CONFIG_PREEMPT_NOTIFIERS=y
 CONFIG_PADATA=y
 CONFIG_ASN1=y
@@ -642,6 +703,8 @@ CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
 CONFIG_MUTEX_SPIN_ON_OWNER=y
 CONFIG_RWSEM_SPIN_ON_OWNER=y
 CONFIG_LOCK_SPIN_ON_OWNER=y
+CONFIG_ARCH_HAS_MMIOWB=y
+CONFIG_MMIOWB=y
 CONFIG_FREEZER=y
 
 #
@@ -654,6 +717,7 @@ CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 CONFIG_BINFMT_SCRIPT=y
 CONFIG_BINFMT_MISC=m
 CONFIG_COREDUMP=y
+# end of Executable file formats
 
 #
 # Memory Management options
@@ -667,7 +731,8 @@ CONFIG_SPARSEMEM_EXTREME=y
 CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
 CONFIG_SPARSEMEM_VMEMMAP=y
 CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
-CONFIG_HAVE_GENERIC_GUP=y
+CONFIG_HAVE_FAST_GUP=y
+CONFIG_ARCH_KEEP_MEMBLOCK=y
 CONFIG_MEMORY_ISOLATION=y
 CONFIG_HAVE_BOOTMEM_INFO_NODE=y
 CONFIG_MEMORY_HOTPLUG=y
@@ -680,6 +745,7 @@ CONFIG_BALLOON_COMPACTION=y
 CONFIG_COMPACTION=y
 CONFIG_MIGRATION=y
 CONFIG_ARCH_ENABLE_THP_MIGRATION=y
+CONFIG_CONTIG_ALLOC=y
 CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_MMU_NOTIFIER=y
 CONFIG_KSM=y
@@ -707,21 +773,20 @@ CONFIG_PGTABLE_MAPPING=y
 # CONFIG_ZSMALLOC_STAT is not set
 # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
 CONFIG_IDLE_PAGE_TRACKING=y
-CONFIG_ARCH_HAS_ZONE_DEVICE=y
+CONFIG_ARCH_HAS_PTE_DEVMAP=y
 CONFIG_ZONE_DEVICE=y
-CONFIG_ARCH_HAS_HMM=y
-CONFIG_MIGRATE_VMA_HELPER=y
 CONFIG_DEV_PAGEMAP_OPS=y
-CONFIG_HMM=y
 CONFIG_HMM_MIRROR=y
 CONFIG_DEVICE_PRIVATE=y
-CONFIG_DEVICE_PUBLIC=y
 CONFIG_FRAME_VECTOR=y
 CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
 CONFIG_ARCH_HAS_PKEYS=y
 # CONFIG_PERCPU_STATS is not set
 # CONFIG_GUP_BENCHMARK is not set
 CONFIG_ARCH_HAS_PTE_SPECIAL=y
+CONFIG_ARCH_HAS_HUGEPD=y
+# end of Memory Management options
+
 CONFIG_NET=y
 CONFIG_COMPAT_NETLINK_MESSAGES=y
 CONFIG_NET_INGRESS=y
@@ -782,9 +847,6 @@ CONFIG_INET_ESP_OFFLOAD=m
 CONFIG_INET_IPCOMP=m
 CONFIG_INET_XFRM_TUNNEL=m
 CONFIG_INET_TUNNEL=m
-CONFIG_INET_XFRM_MODE_TRANSPORT=m
-CONFIG_INET_XFRM_MODE_TUNNEL=m
-CONFIG_INET_XFRM_MODE_BEET=m
 CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 CONFIG_INET_UDP_DIAG=y
@@ -822,10 +884,6 @@ CONFIG_IPV6_MIP6=m
 CONFIG_IPV6_ILA=m
 CONFIG_INET6_XFRM_TUNNEL=m
 CONFIG_INET6_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-CONFIG_INET6_XFRM_MODE_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_BEET=m
-CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
 CONFIG_IPV6_VTI=m
 CONFIG_IPV6_SIT=m
 CONFIG_IPV6_SIT_6RD=y
@@ -890,7 +948,6 @@ CONFIG_NF_CT_NETLINK_TIMEOUT=m
 CONFIG_NF_CT_NETLINK_HELPER=m
 CONFIG_NETFILTER_NETLINK_GLUE_CT=y
 CONFIG_NF_NAT=m
-CONFIG_NF_NAT_NEEDED=y
 CONFIG_NF_NAT_AMANDA=m
 CONFIG_NF_NAT_FTP=m
 CONFIG_NF_NAT_IRC=m
@@ -927,6 +984,7 @@ CONFIG_NFT_XFRM=m
 CONFIG_NFT_SOCKET=m
 CONFIG_NFT_OSF=m
 CONFIG_NFT_TPROXY=m
+# CONFIG_NFT_SYNPROXY is not set
 CONFIG_NF_DUP_NETDEV=m
 CONFIG_NFT_DUP_NETDEV=m
 CONFIG_NFT_FWD_NETDEV=m
@@ -965,6 +1023,7 @@ CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
 CONFIG_NETFILTER_XT_TARGET_RATEEST=m
 CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
+CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m
 CONFIG_NETFILTER_XT_TARGET_TEE=m
 CONFIG_NETFILTER_XT_TARGET_TPROXY=m
 CONFIG_NETFILTER_XT_TARGET_TRACE=m
@@ -1021,6 +1080,8 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m
 CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
 CONFIG_NETFILTER_XT_MATCH_TIME=m
 CONFIG_NETFILTER_XT_MATCH_U32=m
+# end of Core Netfilter Configuration
+
 CONFIG_IP_SET=m
 CONFIG_IP_SET_MAX=256
 CONFIG_IP_SET_BITMAP_IP=m
@@ -1095,7 +1156,6 @@ CONFIG_NF_DEFRAG_IPV4=m
 CONFIG_NF_SOCKET_IPV4=m
 CONFIG_NF_TPROXY_IPV4=m
 CONFIG_NF_TABLES_IPV4=y
-CONFIG_NFT_CHAIN_ROUTE_IPV4=m
 CONFIG_NFT_REJECT_IPV4=m
 CONFIG_NFT_DUP_IPV4=m
 CONFIG_NFT_FIB_IPV4=m
@@ -1129,6 +1189,7 @@ CONFIG_IP_NF_RAW=m
 CONFIG_IP_NF_ARPTABLES=m
 CONFIG_IP_NF_ARPFILTER=m
 CONFIG_IP_NF_ARP_MANGLE=m
+# end of IP: Netfilter Configuration
 
 #
 # IPv6: Netfilter Configuration
@@ -1136,7 +1197,6 @@ CONFIG_IP_NF_ARP_MANGLE=m
 CONFIG_NF_SOCKET_IPV6=m
 CONFIG_NF_TPROXY_IPV6=m
 CONFIG_NF_TABLES_IPV6=y
-CONFIG_NFT_CHAIN_ROUTE_IPV6=m
 CONFIG_NFT_REJECT_IPV6=m
 CONFIG_NFT_DUP_IPV6=m
 CONFIG_NFT_FIB_IPV6=m
@@ -1165,10 +1225,14 @@ CONFIG_IP6_NF_RAW=m
 CONFIG_IP6_NF_NAT=m
 CONFIG_IP6_NF_TARGET_MASQUERADE=m
 CONFIG_IP6_NF_TARGET_NPT=m
+# end of IPv6: Netfilter Configuration
+
 CONFIG_NF_DEFRAG_IPV6=m
-CONFIG_NF_TABLES_BRIDGE=y
+CONFIG_NF_TABLES_BRIDGE=m
+# CONFIG_NFT_BRIDGE_META is not set
 CONFIG_NFT_BRIDGE_REJECT=m
 CONFIG_NF_LOG_BRIDGE=m
+# CONFIG_NF_CONNTRACK_BRIDGE is not set
 CONFIG_BRIDGE_NF_EBTABLES=m
 CONFIG_BRIDGE_EBT_BROUTE=m
 CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -1201,11 +1265,14 @@ CONFIG_INET_DCCP_DIAG=m
 CONFIG_IP_DCCP_CCID3=y
 # CONFIG_IP_DCCP_CCID3_DEBUG is not set
 CONFIG_IP_DCCP_TFRC_LIB=y
+# end of DCCP CCIDs Configuration
 
 #
 # DCCP Kernel Hacking
 #
 # CONFIG_IP_DCCP_DEBUG is not set
+# end of DCCP Kernel Hacking
+
 CONFIG_IP_SCTP=m
 # CONFIG_SCTP_DBG_OBJCNT is not set
 # CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5 is not set
@@ -1242,16 +1309,21 @@ CONFIG_BRIDGE_IGMP_SNOOPING=y
 CONFIG_BRIDGE_VLAN_FILTERING=y
 CONFIG_HAVE_NET_DSA=y
 CONFIG_NET_DSA=m
-CONFIG_NET_DSA_LEGACY=y
-CONFIG_NET_DSA_TAG_BRCM=y
-CONFIG_NET_DSA_TAG_BRCM_PREPEND=y
-CONFIG_NET_DSA_TAG_DSA=y
-CONFIG_NET_DSA_TAG_EDSA=y
-CONFIG_NET_DSA_TAG_GSWIP=y
-CONFIG_NET_DSA_TAG_KSZ=y
-CONFIG_NET_DSA_TAG_KSZ9477=y
-CONFIG_NET_DSA_TAG_TRAILER=y
-CONFIG_NET_DSA_TAG_QCA=y
+CONFIG_NET_DSA_TAG_8021Q=m
+CONFIG_NET_DSA_TAG_BRCM_COMMON=m
+CONFIG_NET_DSA_TAG_BRCM=m
+CONFIG_NET_DSA_TAG_BRCM_PREPEND=m
+CONFIG_NET_DSA_TAG_GSWIP=m
+CONFIG_NET_DSA_TAG_DSA=m
+CONFIG_NET_DSA_TAG_EDSA=m
+CONFIG_NET_DSA_TAG_MTK=m
+CONFIG_NET_DSA_TAG_KSZ_COMMON=m
+CONFIG_NET_DSA_TAG_KSZ=m
+CONFIG_NET_DSA_TAG_KSZ9477=m
+CONFIG_NET_DSA_TAG_QCA=m
+CONFIG_NET_DSA_TAG_LAN9303=m
+CONFIG_NET_DSA_TAG_SJA1105=m
+CONFIG_NET_DSA_TAG_TRAILER=m
 CONFIG_VLAN_8021Q=m
 CONFIG_VLAN_8021Q_GVRP=y
 CONFIG_VLAN_8021Q_MVRP=y
@@ -1354,16 +1426,18 @@ CONFIG_NET_ACT_PEDIT=m
 CONFIG_NET_ACT_SIMP=m
 CONFIG_NET_ACT_SKBEDIT=m
 CONFIG_NET_ACT_CSUM=m
+# CONFIG_NET_ACT_MPLS is not set
 CONFIG_NET_ACT_VLAN=m
 CONFIG_NET_ACT_BPF=m
 CONFIG_NET_ACT_CONNMARK=m
+# CONFIG_NET_ACT_CTINFO is not set
 CONFIG_NET_ACT_SKBMOD=m
 CONFIG_NET_ACT_IFE=m
 CONFIG_NET_ACT_TUNNEL_KEY=m
+# CONFIG_NET_ACT_CT is not set
 CONFIG_NET_IFE_SKBMARK=m
 CONFIG_NET_IFE_SKBPRIO=m
 CONFIG_NET_IFE_SKBTCINDEX=m
-CONFIG_NET_CLS_IND=y
 CONFIG_NET_SCH_FIFO=y
 CONFIG_DCB=y
 CONFIG_DNS_RESOLVER=y
@@ -1375,6 +1449,7 @@ CONFIG_BATMAN_ADV_NC=y
 CONFIG_BATMAN_ADV_MCAST=y
 CONFIG_BATMAN_ADV_DEBUGFS=y
 # CONFIG_BATMAN_ADV_DEBUG is not set
+CONFIG_BATMAN_ADV_SYSFS=y
 # CONFIG_BATMAN_ADV_TRACING is not set
 CONFIG_OPENVSWITCH=m
 CONFIG_OPENVSWITCH_GRE=m
@@ -1410,6 +1485,9 @@ CONFIG_NET_FLOW_LIMIT=y
 #
 # CONFIG_NET_PKTGEN is not set
 # CONFIG_NET_DROP_MONITOR is not set
+# end of Network testing
+# end of Networking options
+
 CONFIG_HAMRADIO=y
 
 #
@@ -1430,6 +1508,8 @@ CONFIG_BAYCOM_SER_FDX=m
 CONFIG_BAYCOM_SER_HDX=m
 CONFIG_BAYCOM_PAR=m
 CONFIG_YAM=m
+# end of AX.25 network device drivers
+
 CONFIG_CAN=m
 CONFIG_CAN_RAW=m
 CONFIG_CAN_BCM=m
@@ -1464,6 +1544,7 @@ CONFIG_CAN_SOFTING=m
 #
 # CONFIG_CAN_HI311X is not set
 CONFIG_CAN_MCP251X=m
+# end of CAN SPI interfaces
 
 #
 # CAN USB interfaces
@@ -1476,7 +1557,11 @@ CONFIG_CAN_KVASER_USB=m
 # CONFIG_CAN_MCBA_USB is not set
 CONFIG_CAN_PEAK_USB=m
 CONFIG_CAN_UCAN=m
+# end of CAN USB interfaces
+
 CONFIG_CAN_DEBUG_DEVICES=y
+# end of CAN Device Drivers
+
 CONFIG_BT=m
 CONFIG_BT_BREDR=y
 CONFIG_BT_RFCOMM=m
@@ -1502,6 +1587,7 @@ CONFIG_BT_QCA=m
 CONFIG_BT_HCIBTUSB=m
 CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
 CONFIG_BT_HCIBTUSB_BCM=y
+# CONFIG_BT_HCIBTUSB_MTK is not set
 CONFIG_BT_HCIBTUSB_RTL=y
 CONFIG_BT_HCIBTSDIO=m
 CONFIG_BT_HCIUART=m
@@ -1525,8 +1611,11 @@ CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
 CONFIG_BT_ATH3K=m
 CONFIG_BT_WILINK=m
+CONFIG_BT_MTKSDIO=m
 CONFIG_BT_MTKUART=m
 CONFIG_BT_HCIRSI=m
+# end of Bluetooth device drivers
+
 CONFIG_AF_RXRPC=m
 CONFIG_AF_RXRPC_IPV6=y
 # CONFIG_AF_RXRPC_INJECT_LOSS is not set
@@ -1623,6 +1712,8 @@ CONFIG_NFC_NXP_NCI_I2C=m
 CONFIG_NFC_S3FWRN5=m
 CONFIG_NFC_S3FWRN5_I2C=m
 CONFIG_NFC_ST95HF=m
+# end of Near Field Communication (NFC) devices
+
 CONFIG_PSAMPLE=m
 CONFIG_NET_IFE=m
 CONFIG_LWTUNNEL=y
@@ -1687,6 +1778,8 @@ CONFIG_HOTPLUG_PCI_RPA_DLPAR=m
 CONFIG_PCIE_CADENCE=y
 CONFIG_PCIE_CADENCE_HOST=y
 CONFIG_PCIE_CADENCE_EP=y
+# end of Cadence PCIe controllers support
+
 CONFIG_PCI_FTPCI100=y
 CONFIG_PCI_HOST_COMMON=y
 CONFIG_PCI_HOST_GENERIC=y
@@ -1695,6 +1788,8 @@ CONFIG_PCIE_XILINX=y
 #
 # DesignWare PCI Core Support
 #
+# end of DesignWare PCI Core Support
+# end of PCI controller drivers
 
 #
 # PCI Endpoint
@@ -1702,11 +1797,14 @@ CONFIG_PCIE_XILINX=y
 CONFIG_PCI_ENDPOINT=y
 CONFIG_PCI_ENDPOINT_CONFIGFS=y
 # CONFIG_PCI_EPF_TEST is not set
+# end of PCI Endpoint
 
 #
 # PCI switch controller drivers
 #
 CONFIG_PCI_SW_SWITCHTEC=m
+# end of PCI switch controller drivers
+
 # CONFIG_PCCARD is not set
 CONFIG_RAPIDIO=m
 CONFIG_RAPIDIO_TSI721=m
@@ -1726,6 +1824,7 @@ CONFIG_RAPIDIO_CPS_XX=m
 CONFIG_RAPIDIO_TSI568=m
 CONFIG_RAPIDIO_CPS_GEN2=m
 CONFIG_RAPIDIO_RXS_GEN3=m
+# end of RapidIO Switch drivers
 
 #
 # Generic Driver Options
@@ -1740,9 +1839,13 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 # Firmware loader
 #
 CONFIG_FW_LOADER=y
+CONFIG_FW_LOADER_PAGED_BUF=y
 CONFIG_EXTRA_FIRMWARE=""
 CONFIG_FW_LOADER_USER_HELPER=y
 # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
+# CONFIG_FW_LOADER_COMPRESS is not set
+# end of Firmware loader
+
 CONFIG_WANT_DEV_COREDUMP=y
 CONFIG_ALLOW_DEV_COREDUMP=y
 CONFIG_DEV_COREDUMP=y
@@ -1762,11 +1865,14 @@ CONFIG_REGMAP_MMIO=y
 CONFIG_REGMAP_IRQ=y
 CONFIG_DMA_SHARED_BUFFER=y
 # CONFIG_DMA_FENCE_TRACE is not set
+# end of Generic Driver Options
 
 #
 # Bus devices
 #
 CONFIG_SIMPLE_PM_BUS=y
+# end of Bus devices
+
 CONFIG_CONNECTOR=y
 CONFIG_PROC_EVENTS=y
 CONFIG_GNSS=m
@@ -1787,6 +1893,7 @@ CONFIG_MTD_REDBOOT_PARTS=m
 CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
 # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
 # CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
+# end of Partition parsers
 
 #
 # User Modules And Translation Layers
@@ -1817,6 +1924,7 @@ CONFIG_MTD_CFI_I2=y
 CONFIG_MTD_RAM=m
 CONFIG_MTD_ROM=m
 CONFIG_MTD_ABSENT=m
+# end of RAM/ROM/Flash chip drivers
 
 #
 # Mapping drivers for chip access
@@ -1829,6 +1937,7 @@ CONFIG_MTD_PHYSMAP=m
 CONFIG_MTD_PCI=m
 # CONFIG_MTD_INTEL_VR_NOR is not set
 CONFIG_MTD_PLATRAM=m
+# end of Mapping drivers for chip access
 
 #
 # Self-contained MTD device drivers
@@ -1852,29 +1961,38 @@ CONFIG_MTD_POWERNV_FLASH=m
 # Disk-On-Chip Device Drivers
 #
 # CONFIG_MTD_DOCG3 is not set
+# end of Self-contained MTD device drivers
+
 CONFIG_MTD_NAND_CORE=m
 CONFIG_MTD_ONENAND=m
 CONFIG_MTD_ONENAND_VERIFY_WRITE=y
 CONFIG_MTD_ONENAND_GENERIC=m
 # CONFIG_MTD_ONENAND_OTP is not set
 CONFIG_MTD_ONENAND_2X_PROGRAM=y
-CONFIG_MTD_NAND_ECC=m
-# CONFIG_MTD_NAND_ECC_SMC is not set
-CONFIG_MTD_NAND=m
-CONFIG_MTD_NAND_BCH=m
-CONFIG_MTD_NAND_ECC_BCH=y
-CONFIG_MTD_SM_COMMON=m
+CONFIG_MTD_NAND_ECC_SW_HAMMING=m
+# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
+CONFIG_MTD_RAW_NAND=m
+CONFIG_MTD_NAND_ECC_SW_BCH=y
+
+#
+# Raw/parallel NAND flash controllers
+#
 CONFIG_MTD_NAND_DENALI=m
 CONFIG_MTD_NAND_DENALI_PCI=m
+CONFIG_MTD_NAND_CAFE=m
 CONFIG_MTD_NAND_GPIO=m
+CONFIG_MTD_NAND_PLATFORM=m
+
+#
+# Misc
+#
+CONFIG_MTD_SM_COMMON=m
+CONFIG_MTD_NAND_NANDSIM=m
 CONFIG_MTD_NAND_RICOH=m
 CONFIG_MTD_NAND_DISKONCHIP=m
 # CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set
 CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
 # CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set
-CONFIG_MTD_NAND_CAFE=m
-CONFIG_MTD_NAND_NANDSIM=m
-CONFIG_MTD_NAND_PLATFORM=m
 CONFIG_MTD_SPI_NAND=m
 
 #
@@ -1882,6 +2000,8 @@ CONFIG_MTD_SPI_NAND=m
 #
 CONFIG_MTD_LPDDR=m
 CONFIG_MTD_QINFO_PROBE=m
+# end of LPDDR & LPDDR2 PCM memory drivers
+
 CONFIG_MTD_SPI_NOR=m
 CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y
 CONFIG_SPI_MTK_QUADSPI=m
@@ -1891,6 +2011,7 @@ CONFIG_MTD_UBI_BEB_LIMIT=20
 CONFIG_MTD_UBI_FASTMAP=y
 CONFIG_MTD_UBI_GLUEBI=m
 CONFIG_MTD_UBI_BLOCK=y
+# CONFIG_MTD_HYPERBUS is not set
 CONFIG_DTC=y
 CONFIG_OF=y
 # CONFIG_OF_UNITTEST is not set
@@ -1960,6 +2081,7 @@ CONFIG_NVME_TARGET_RDMA=m
 CONFIG_NVME_TARGET_FC=m
 CONFIG_NVME_TARGET_FCLOOP=m
 CONFIG_NVME_TARGET_TCP=m
+# end of NVME Support
 
 #
 # Misc devices
@@ -1985,10 +2107,10 @@ CONFIG_SENSORS_BH1770=m
 CONFIG_SENSORS_APDS990X=m
 CONFIG_HMC6352=m
 CONFIG_DS1682=m
-CONFIG_USB_SWITCH_FSA9480=m
 CONFIG_LATTICE_ECP3_CONFIG=m
 CONFIG_SRAM=y
 # CONFIG_PCI_ENDPOINT_TEST is not set
+# CONFIG_XILINX_SDFEC is not set
 CONFIG_MISC_RTSX=m
 CONFIG_PVPANIC=m
 CONFIG_C2PORT=m
@@ -2004,6 +2126,8 @@ CONFIG_EEPROM_93CX6=m
 CONFIG_EEPROM_93XX46=m
 CONFIG_EEPROM_IDT_89HPESX=m
 CONFIG_EEPROM_EE1004=m
+# end of EEPROM support
+
 CONFIG_CB710_CORE=m
 # CONFIG_CB710_DEBUG is not set
 CONFIG_CB710_DEBUG_ASSUMPTIONS=y
@@ -2012,6 +2136,8 @@ CONFIG_CB710_DEBUG_ASSUMPTIONS=y
 # Texas Instruments shared transport line discipline
 #
 CONFIG_TI_ST=m
+# end of Texas Instruments shared transport line discipline
+
 CONFIG_SENSORS_LIS3_SPI=m
 CONFIG_SENSORS_LIS3_I2C=m
 CONFIG_ALTERA_STAPL=m
@@ -2054,6 +2180,8 @@ CONFIG_VOP_BUS=m
 #
 CONFIG_VOP=m
 CONFIG_VHOST_RING=m
+# end of Intel MIC & related support
+
 CONFIG_GENWQE=m
 CONFIG_GENWQE_PLATFORM_ERROR_RECOVERY=0
 CONFIG_ECHO=m
@@ -2067,6 +2195,8 @@ CONFIG_MISC_ALCOR_PCI=m
 CONFIG_MISC_RTSX_PCI=m
 CONFIG_MISC_RTSX_USB=m
 CONFIG_HABANA_AI=m
+# end of Misc devices
+
 CONFIG_HAVE_IDE=y
 # CONFIG_IDE is not set
 
@@ -2085,7 +2215,6 @@ CONFIG_SCSI_PROC_FS=y
 #
 CONFIG_BLK_DEV_SD=m
 CONFIG_CHR_DEV_ST=m
-CONFIG_CHR_DEV_OSST=m
 CONFIG_BLK_DEV_SR=m
 CONFIG_BLK_DEV_SR_VENDOR=y
 CONFIG_CHR_DEV_SG=m
@@ -2106,6 +2235,8 @@ CONFIG_SCSI_SAS_LIBSAS=m
 CONFIG_SCSI_SAS_ATA=y
 CONFIG_SCSI_SAS_HOST_SMP=y
 CONFIG_SCSI_SRP_ATTRS=m
+# end of SCSI Transports
+
 CONFIG_SCSI_LOWLEVEL=y
 CONFIG_ISCSI_TCP=m
 CONFIG_ISCSI_BOOT_SYSFS=m
@@ -2168,6 +2299,7 @@ CONFIG_FCOE=m
 CONFIG_SCSI_SNIC=m
 # CONFIG_SCSI_SNIC_DEBUG_FS is not set
 CONFIG_SCSI_DMX3191D=m
+# CONFIG_SCSI_FDOMAIN_PCI is not set
 CONFIG_SCSI_GDTH=m
 CONFIG_SCSI_IPS=m
 CONFIG_SCSI_IBMVSCSI=m
@@ -2212,6 +2344,8 @@ CONFIG_SCSI_DH_RDAC=m
 CONFIG_SCSI_DH_HP_SW=m
 CONFIG_SCSI_DH_EMC=m
 CONFIG_SCSI_DH_ALUA=m
+# end of SCSI device support
+
 CONFIG_ATA=m
 CONFIG_ATA_VERBOSE_ERROR=y
 CONFIG_SATA_PMP=y
@@ -2344,6 +2478,7 @@ CONFIG_DM_MULTIPATH=m
 CONFIG_DM_MULTIPATH_QL=m
 CONFIG_DM_MULTIPATH_ST=m
 CONFIG_DM_DELAY=m
+CONFIG_DM_DUST=m
 CONFIG_DM_UEVENT=y
 CONFIG_DM_FLAKEY=m
 CONFIG_DM_VERITY=m
@@ -2379,6 +2514,8 @@ CONFIG_FIREWIRE_OHCI=m
 CONFIG_FIREWIRE_SBP2=m
 CONFIG_FIREWIRE_NET=m
 CONFIG_FIREWIRE_NOSY=m
+# end of IEEE 1394 (FireWire) support
+
 CONFIG_MACINTOSH_DRIVERS=y
 CONFIG_MAC_EMUMOUSEBTN=m
 CONFIG_WINDFARM=m
@@ -2476,11 +2613,16 @@ CONFIG_NET_DSA_MICROCHIP_KSZ9477_SPI=m
 CONFIG_NET_DSA_MV88E6XXX=m
 CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y
 CONFIG_NET_DSA_MV88E6XXX_PTP=y
+CONFIG_NET_DSA_SJA1105=m
+# CONFIG_NET_DSA_SJA1105_PTP is not set
 CONFIG_NET_DSA_QCA8K=m
 # CONFIG_NET_DSA_REALTEK_SMI is not set
 # CONFIG_NET_DSA_SMSC_LAN9303_I2C is not set
 # CONFIG_NET_DSA_SMSC_LAN9303_MDIO is not set
-# CONFIG_NET_DSA_VITESSE_VSC73XX is not set
+# CONFIG_NET_DSA_VITESSE_VSC73XX_SPI is not set
+# CONFIG_NET_DSA_VITESSE_VSC73XX_PLATFORM is not set
+# end of Distributed Switch Architecture drivers
+
 CONFIG_ETHERNET=y
 CONFIG_MDIO=m
 CONFIG_NET_VENDOR_3COM=y
@@ -2532,8 +2674,6 @@ CONFIG_BNXT_HWMON=y
 CONFIG_NET_VENDOR_BROCADE=y
 CONFIG_BNA=m
 CONFIG_NET_VENDOR_CADENCE=y
-CONFIG_MACB=m
-CONFIG_MACB_USE_HWSTAMP=y
 CONFIG_NET_VENDOR_CAVIUM=y
 CONFIG_THUNDER_NIC_PF=m
 CONFIG_THUNDER_NIC_VF=m
@@ -2580,6 +2720,8 @@ CONFIG_BE2NET_LANCER=y
 CONFIG_BE2NET_SKYHAWK=y
 CONFIG_NET_VENDOR_EZCHIP=y
 CONFIG_EZCHIP_NPS_MANAGEMENT_ENET=m
+CONFIG_NET_VENDOR_GOOGLE=y
+# CONFIG_GVE is not set
 CONFIG_NET_VENDOR_HP=y
 CONFIG_HP100=m
 CONFIG_NET_VENDOR_HUAWEI=y
@@ -2737,6 +2879,7 @@ CONFIG_SMSC9420=m
 CONFIG_NET_VENDOR_SOCIONEXT=y
 CONFIG_NET_VENDOR_STMICRO=y
 CONFIG_STMMAC_ETH=m
+# CONFIG_STMMAC_SELFTESTS is not set
 CONFIG_STMMAC_PLATFORM=m
 # CONFIG_DWMAC_DWC_QOS_ETH is not set
 CONFIG_DWMAC_GENERIC=m
@@ -2752,7 +2895,6 @@ CONFIG_NET_VENDOR_TEHUTI=y
 CONFIG_TEHUTI=m
 CONFIG_NET_VENDOR_TI=y
 # CONFIG_TI_CPSW_PHY_SEL is not set
-CONFIG_TI_CPSW_ALE=m
 CONFIG_TLAN=m
 CONFIG_NET_VENDOR_VIA=y
 CONFIG_VIA_RHINE=m
@@ -2766,6 +2908,7 @@ CONFIG_WIZNET_W5300=m
 CONFIG_WIZNET_BUS_ANY=y
 CONFIG_WIZNET_W5100_SPI=m
 CONFIG_NET_VENDOR_XILINX=y
+CONFIG_XILINX_LL_TEMAC=m
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
 CONFIG_MDIO_DEVICE=y
@@ -2819,6 +2962,7 @@ CONFIG_MICROCHIP_PHY=m
 CONFIG_MICROCHIP_T1_PHY=m
 CONFIG_MICROSEMI_PHY=m
 CONFIG_NATIONAL_PHY=m
+# CONFIG_NXP_TJA11XX_PHY is not set
 CONFIG_QSEMI_PHY=m
 CONFIG_REALTEK_PHY=m
 CONFIG_RENESAS_PHY=m
@@ -3015,6 +3159,8 @@ CONFIG_IWL3945=m
 #
 # CONFIG_IWLEGACY_DEBUG is not set
 CONFIG_IWLEGACY_DEBUGFS=y
+# end of iwl3945 / iwl4965 Debugging Options
+
 CONFIG_IWLWIFI=m
 CONFIG_IWLWIFI_LEDS=y
 CONFIG_IWLDVM=m
@@ -3029,6 +3175,8 @@ CONFIG_IWLWIFI_PCIE_RTPM=y
 # CONFIG_IWLWIFI_DEBUG is not set
 # CONFIG_IWLWIFI_DEBUGFS is not set
 # CONFIG_IWLWIFI_DEVICE_TRACING is not set
+# end of Debugging Options
+
 CONFIG_WLAN_VENDOR_INTERSIL=y
 CONFIG_HOSTAP=m
 CONFIG_HOSTAP_FIRMWARE=y
@@ -3079,6 +3227,7 @@ CONFIG_MT76x2_COMMON=m
 # CONFIG_MT76x2E is not set
 CONFIG_MT76x2U=m
 CONFIG_MT7603E=m
+CONFIG_MT7615E=m
 CONFIG_WLAN_VENDOR_RALINK=y
 CONFIG_RT2X00=m
 CONFIG_RT2400PCI=m
@@ -3132,6 +3281,13 @@ CONFIG_RTL8723_COMMON=m
 CONFIG_RTLBTCOEXIST=m
 CONFIG_RTL8XXXU=m
 # CONFIG_RTL8XXXU_UNTESTED is not set
+CONFIG_RTW88=m
+CONFIG_RTW88_CORE=m
+CONFIG_RTW88_PCI=m
+CONFIG_RTW88_8822BE=y
+CONFIG_RTW88_8822CE=y
+# CONFIG_RTW88_DEBUG is not set
+# CONFIG_RTW88_DEBUGFS is not set
 CONFIG_WLAN_VENDOR_RSI=y
 CONFIG_RSI_91X=m
 CONFIG_RSI_DEBUGFS=y
@@ -3169,6 +3325,8 @@ CONFIG_VIRT_WIFI=m
 CONFIG_WIMAX_I2400M=m
 CONFIG_WIMAX_I2400M_USB=m
 CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
+# end of WiMAX Wireless Broadband devices
+
 # CONFIG_WAN is not set
 CONFIG_IEEE802154_DRIVERS=m
 CONFIG_IEEE802154_FAKELB=m
@@ -3217,6 +3375,7 @@ CONFIG_KEYBOARD_ADC=m
 CONFIG_KEYBOARD_ADP5588=m
 CONFIG_KEYBOARD_ADP5589=m
 CONFIG_KEYBOARD_ATKBD=y
+CONFIG_KEYBOARD_QT1050=m
 CONFIG_KEYBOARD_QT1070=m
 CONFIG_KEYBOARD_QT2160=m
 # CONFIG_KEYBOARD_DLINK_DIR685 is not set
@@ -3282,8 +3441,8 @@ CONFIG_JOYSTICK_INTERACT=m
 CONFIG_JOYSTICK_SIDEWINDER=m
 CONFIG_JOYSTICK_TMDC=m
 CONFIG_JOYSTICK_IFORCE=m
-CONFIG_JOYSTICK_IFORCE_USB=y
-CONFIG_JOYSTICK_IFORCE_232=y
+CONFIG_JOYSTICK_IFORCE_USB=m
+CONFIG_JOYSTICK_IFORCE_232=m
 CONFIG_JOYSTICK_WARRIOR=m
 CONFIG_JOYSTICK_MAGELLAN=m
 CONFIG_JOYSTICK_SPACEORB=m
@@ -3415,6 +3574,7 @@ CONFIG_TOUCHSCREEN_ZET6223=m
 CONFIG_TOUCHSCREEN_ZFORCE=m
 CONFIG_TOUCHSCREEN_COLIBRI_VF50=m
 CONFIG_TOUCHSCREEN_ROHM_BU21023=m
+CONFIG_TOUCHSCREEN_IQS5XX=m
 CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_88PM860X_ONKEY is not set
 # CONFIG_INPUT_88PM80X_ONKEY is not set
@@ -3427,6 +3587,7 @@ CONFIG_INPUT_BMA150=m
 CONFIG_INPUT_E3X0_BUTTON=m
 CONFIG_INPUT_MSM_VIBRATOR=m
 CONFIG_INPUT_PCSPKR=m
+CONFIG_INPUT_MAX77650_ONKEY=m
 CONFIG_INPUT_MAX77693_HAPTIC=m
 # CONFIG_INPUT_MAX8925_ONKEY is not set
 # CONFIG_INPUT_MAX8997_HAPTIC is not set
@@ -3435,6 +3596,7 @@ CONFIG_INPUT_MMA8450=m
 CONFIG_INPUT_GP2A=m
 CONFIG_INPUT_GPIO_BEEPER=m
 CONFIG_INPUT_GPIO_DECODER=m
+CONFIG_INPUT_GPIO_VIBRA=m
 CONFIG_INPUT_CPCAP_PWRBUTTON=m
 CONFIG_INPUT_ATI_REMOTE2=m
 CONFIG_INPUT_KEYSPAN_REMOTE=m
@@ -3505,7 +3667,6 @@ CONFIG_SERIO_ALTERA_PS2=m
 CONFIG_SERIO_PS2MULT=m
 CONFIG_SERIO_ARC_PS2=m
 CONFIG_SERIO_APBPS2=m
-CONFIG_SERIO_OLPC_APSP=m
 CONFIG_SERIO_GPIO_PS2=m
 CONFIG_USERIO=m
 CONFIG_GAMEPORT=m
@@ -3513,6 +3674,8 @@ CONFIG_GAMEPORT_NS558=m
 CONFIG_GAMEPORT_L4=m
 CONFIG_GAMEPORT_EMU10K1=m
 CONFIG_GAMEPORT_FM801=m
+# end of Hardware I/O ports
+# end of Input device support
 
 #
 # Character devices
@@ -3542,6 +3705,7 @@ CONFIG_N_GSM=m
 CONFIG_TRACE_ROUTER=m
 CONFIG_TRACE_SINK=m
 # CONFIG_PPC_EPAPR_HV_BYTECHAN is not set
+CONFIG_NULL_TTY=m
 CONFIG_LDISC_AUTOLOAD=y
 CONFIG_DEVMEM=y
 # CONFIG_DEVKMEM is not set
@@ -3583,6 +3747,7 @@ CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_SERIAL_ICOM=m
 CONFIG_SERIAL_JSM=m
+CONFIG_SERIAL_SIFIVE=m
 CONFIG_SERIAL_SCCNXP=y
 CONFIG_SERIAL_SCCNXP_CONSOLE=y
 # CONFIG_SERIAL_SC16IS7XX is not set
@@ -3599,6 +3764,9 @@ CONFIG_SERIAL_RP2_NR_UARTS=32
 CONFIG_SERIAL_FSL_LPUART=m
 CONFIG_SERIAL_CONEXANT_DIGICOLOR=m
 # CONFIG_SERIAL_MEN_Z135 is not set
+# end of Serial drivers
+
+CONFIG_SERIAL_MCTRL_GPIO=y
 CONFIG_SERIAL_DEV_BUS=m
 CONFIG_TTY_PRINTK=m
 CONFIG_TTY_PRINTK_LEVEL=6
@@ -3625,6 +3793,7 @@ CONFIG_IPMI_SSIF=m
 CONFIG_IPMI_POWERNV=m
 CONFIG_IPMI_WATCHDOG=m
 CONFIG_IPMI_POWEROFF=m
+# CONFIG_IPMB_DEVICE_INTERFACE is not set
 CONFIG_HW_RANDOM=m
 CONFIG_HW_RANDOM_TIMERIOMEM=m
 CONFIG_HW_RANDOM_VIRTIO=m
@@ -3653,6 +3822,8 @@ CONFIG_DEVPORT=y
 CONFIG_XILLYBUS=m
 CONFIG_XILLYBUS_PCIE=m
 CONFIG_XILLYBUS_OF=m
+# end of Character devices
+
 # CONFIG_RANDOM_TRUST_CPU is not set
 
 #
@@ -3677,6 +3848,8 @@ CONFIG_I2C_MUX_PINCTRL=m
 CONFIG_I2C_MUX_REG=m
 CONFIG_I2C_DEMUX_PINCTRL=m
 CONFIG_I2C_MUX_MLXCPLD=m
+# end of Multiplexer I2C Chip support
+
 CONFIG_I2C_HELPER_AUTO=y
 CONFIG_I2C_SMBUS=m
 CONFIG_I2C_ALGOBIT=m
@@ -3739,12 +3912,16 @@ CONFIG_I2C_VIPERBOARD=m
 #
 CONFIG_I2C_OPAL=y
 CONFIG_I2C_FSI=m
+# end of I2C Hardware Bus support
+
 # CONFIG_I2C_STUB is not set
 CONFIG_I2C_SLAVE=y
 CONFIG_I2C_SLAVE_EEPROM=m
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
+# end of I2C support
+
 CONFIG_I3C=m
 CONFIG_CDNS_I3C_MASTER=m
 CONFIG_DW_I3C_MASTER=m
@@ -3825,6 +4002,8 @@ CONFIG_PTP_1588_CLOCK=y
 #
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
+# end of PTP clock support
+
 CONFIG_PINCTRL=y
 CONFIG_GENERIC_PINCTRL_GROUPS=y
 CONFIG_PINMUX=y
@@ -3838,6 +4017,7 @@ CONFIG_PINCTRL_AMD=y
 CONFIG_PINCTRL_MCP23S08=m
 CONFIG_PINCTRL_SINGLE=y
 CONFIG_PINCTRL_SX150X=y
+CONFIG_PINCTRL_STMFX=m
 CONFIG_PINCTRL_MAX77620=m
 CONFIG_PINCTRL_PALMAS=m
 CONFIG_PINCTRL_RK805=m
@@ -3869,11 +4049,11 @@ CONFIG_GPIO_GRGPIO=m
 CONFIG_GPIO_HLWD=m
 CONFIG_GPIO_MB86S7X=m
 CONFIG_GPIO_MENZ127=m
-CONFIG_GPIO_MOCKUP=m
 CONFIG_GPIO_SAMA5D2_PIOBU=m
 CONFIG_GPIO_SYSCON=m
 CONFIG_GPIO_XILINX=y
 CONFIG_GPIO_AMD_FCH=m
+# end of Memory mapped GPIO drivers
 
 #
 # I2C GPIO expanders
@@ -3886,6 +4066,7 @@ CONFIG_GPIO_MAX732X=m
 CONFIG_GPIO_PCA953X=m
 CONFIG_GPIO_PCF857X=m
 CONFIG_GPIO_TPIC2810=m
+# end of I2C GPIO expanders
 
 #
 # MFD GPIO expanders
@@ -3903,6 +4084,7 @@ CONFIG_GPIO_LP873X=m
 CONFIG_GPIO_LP87565=m
 CONFIG_GPIO_MADERA=m
 CONFIG_GPIO_MAX77620=m
+CONFIG_GPIO_MAX77650=m
 CONFIG_GPIO_PALMAS=y
 CONFIG_GPIO_RC5T583=y
 CONFIG_GPIO_STMPE=y
@@ -3919,6 +4101,7 @@ CONFIG_GPIO_UCB1400=m
 CONFIG_GPIO_WM831X=m
 CONFIG_GPIO_WM8350=m
 CONFIG_GPIO_WM8994=m
+# end of MFD GPIO expanders
 
 #
 # PCI GPIO expanders
@@ -3926,6 +4109,7 @@ CONFIG_GPIO_WM8994=m
 CONFIG_GPIO_PCI_IDIO_16=m
 CONFIG_GPIO_PCIE_IDIO_24=m
 CONFIG_GPIO_RDC321X=m
+# end of PCI GPIO expanders
 
 #
 # SPI GPIO expanders
@@ -3936,11 +4120,15 @@ CONFIG_GPIO_MAX7301=m
 CONFIG_GPIO_MC33880=m
 CONFIG_GPIO_PISOSR=m
 CONFIG_GPIO_XRA1403=m
+# end of SPI GPIO expanders
 
 #
 # USB GPIO expanders
 #
 CONFIG_GPIO_VIPERBOARD=m
+# end of USB GPIO expanders
+
+CONFIG_GPIO_MOCKUP=m
 CONFIG_W1=m
 CONFIG_W1_CON=y
 
@@ -3952,6 +4140,7 @@ CONFIG_W1_MASTER_DS2490=m
 CONFIG_W1_MASTER_DS2482=m
 CONFIG_W1_MASTER_DS1WM=m
 CONFIG_W1_MASTER_GPIO=m
+# end of 1-wire Bus Masters
 
 #
 # 1-wire Slaves
@@ -3973,10 +4162,13 @@ CONFIG_W1_SLAVE_DS2780=m
 CONFIG_W1_SLAVE_DS2781=m
 CONFIG_W1_SLAVE_DS28E04=m
 CONFIG_W1_SLAVE_DS28E17=m
+# end of 1-wire Slaves
+
 CONFIG_POWER_AVS=y
 # CONFIG_POWER_RESET is not set
 CONFIG_POWER_SUPPLY=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
+CONFIG_POWER_SUPPLY_HWMON=y
 CONFIG_PDA_POWER=m
 CONFIG_GENERIC_ADC_BATTERY=m
 # CONFIG_MAX8925_POWER is not set
@@ -4018,9 +4210,10 @@ CONFIG_CHARGER_MAX8903=m
 CONFIG_CHARGER_LP8727=m
 CONFIG_CHARGER_GPIO=m
 CONFIG_CHARGER_MANAGER=y
-# CONFIG_CHARGER_LTC3651 is not set
+CONFIG_CHARGER_LT3651=m
 # CONFIG_CHARGER_MAX14577 is not set
 CONFIG_CHARGER_DETECTOR_MAX14656=m
+CONFIG_CHARGER_MAX77650=m
 # CONFIG_CHARGER_MAX77693 is not set
 # CONFIG_CHARGER_MAX8997 is not set
 # CONFIG_CHARGER_MAX8998 is not set
@@ -4034,6 +4227,7 @@ CONFIG_CHARGER_SMB347=m
 CONFIG_BATTERY_GAUGE_LTC2941=m
 CONFIG_BATTERY_RT5033=m
 CONFIG_CHARGER_RT9455=m
+CONFIG_CHARGER_UCS1002=m
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
@@ -4125,15 +4319,15 @@ CONFIG_SENSORS_NTC_THERMISTOR=m
 CONFIG_SENSORS_NCT7802=m
 CONFIG_SENSORS_NCT7904=m
 CONFIG_SENSORS_NPCM7XX=m
-CONFIG_SENSORS_OCC_P8_I2C=m
-CONFIG_SENSORS_OCC_P9_SBE=m
-CONFIG_SENSORS_OCC=y
 CONFIG_SENSORS_PCF8591=m
 CONFIG_PMBUS=m
 CONFIG_SENSORS_PMBUS=m
 CONFIG_SENSORS_ADM1275=m
 CONFIG_SENSORS_IBM_CFFPS=m
 # CONFIG_SENSORS_IR35221 is not set
+CONFIG_SENSORS_IR38064=m
+# CONFIG_SENSORS_IRPS5401 is not set
+CONFIG_SENSORS_ISL68137=m
 CONFIG_SENSORS_LM25066=m
 # CONFIG_SENSORS_LTC2978 is not set
 CONFIG_SENSORS_LTC3815=m
@@ -4142,6 +4336,7 @@ CONFIG_SENSORS_MAX20751=m
 CONFIG_SENSORS_MAX31785=m
 CONFIG_SENSORS_MAX34440=m
 CONFIG_SENSORS_MAX8688=m
+# CONFIG_SENSORS_PXE1610 is not set
 # CONFIG_SENSORS_TPS40422 is not set
 CONFIG_SENSORS_TPS53679=m
 CONFIG_SENSORS_UCD9000=m
@@ -4205,6 +4400,7 @@ CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
 CONFIG_CPU_THERMAL=y
 CONFIG_DEVFREQ_THERMAL=y
 CONFIG_THERMAL_EMULATION=y
+CONFIG_THERMAL_MMIO=m
 CONFIG_MAX77620_THERMAL=m
 CONFIG_QORIQ_THERMAL=m
 CONFIG_DA9062_THERMAL=m
@@ -4213,8 +4409,14 @@ CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_CORE=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
 CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
+CONFIG_WATCHDOG_OPEN_TIMEOUT=0
 CONFIG_WATCHDOG_SYSFS=y
 
+#
+# Watchdog Pretimeout Governors
+#
+# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
+
 #
 # Watchdog Device Drivers
 #
@@ -4254,11 +4456,6 @@ CONFIG_WDTPCI=m
 # USB-based Watchdog Cards
 #
 CONFIG_USBPCWATCHDOG=m
-
-#
-# Watchdog Pretimeout Governors
-#
-# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
 CONFIG_SSB_POSSIBLE=y
 CONFIG_SSB=m
 CONFIG_SSB_SPROM=y
@@ -4301,9 +4498,11 @@ CONFIG_MFD_AXP20X_I2C=m
 CONFIG_MFD_MADERA=m
 CONFIG_MFD_MADERA_I2C=m
 CONFIG_MFD_MADERA_SPI=m
+# CONFIG_MFD_CS47L15 is not set
 CONFIG_MFD_CS47L35=y
 CONFIG_MFD_CS47L85=y
 CONFIG_MFD_CS47L90=y
+# CONFIG_MFD_CS47L92 is not set
 CONFIG_PMIC_DA903X=y
 CONFIG_PMIC_DA9052=y
 CONFIG_MFD_DA9052_SPI=y
@@ -4328,6 +4527,7 @@ CONFIG_MFD_88PM805=m
 CONFIG_MFD_88PM860X=y
 CONFIG_MFD_MAX14577=m
 CONFIG_MFD_MAX77620=y
+CONFIG_MFD_MAX77650=m
 CONFIG_MFD_MAX77686=y
 CONFIG_MFD_MAX77693=m
 CONFIG_MFD_MAX77843=y
@@ -4366,6 +4566,8 @@ CONFIG_MFD_STMPE=y
 #
 CONFIG_STMPE_I2C=y
 CONFIG_STMPE_SPI=y
+# end of STMicroelectronics STMPE Interface Drivers
+
 CONFIG_MFD_SYSCON=y
 CONFIG_MFD_TI_AM335X_TSCADC=m
 CONFIG_MFD_LP3943=m
@@ -4412,8 +4614,12 @@ CONFIG_MFD_WM8350=y
 CONFIG_MFD_WM8350_I2C=y
 CONFIG_MFD_WM8994=m
 # CONFIG_MFD_ROHM_BD718XX is not set
+# CONFIG_MFD_ROHM_BD70528 is not set
 CONFIG_MFD_STPMIC1=m
+CONFIG_MFD_STMFX=m
 # CONFIG_RAVE_SP_CORE is not set
+# end of Multifunction device drivers
+
 CONFIG_REGULATOR=y
 # CONFIG_REGULATOR_DEBUG is not set
 CONFIG_REGULATOR_FIXED_VOLTAGE=m
@@ -4462,6 +4668,7 @@ CONFIG_REGULATOR_LTC3676=m
 CONFIG_REGULATOR_MAX14577=m
 CONFIG_REGULATOR_MAX1586=m
 CONFIG_REGULATOR_MAX77620=m
+CONFIG_REGULATOR_MAX77650=m
 CONFIG_REGULATOR_MAX8649=m
 CONFIG_REGULATOR_MAX8660=m
 CONFIG_REGULATOR_MAX8907=m
@@ -4494,6 +4701,7 @@ CONFIG_REGULATOR_RK808=m
 CONFIG_REGULATOR_RN5T618=m
 CONFIG_REGULATOR_RT5033=m
 CONFIG_REGULATOR_SKY81452=m
+# CONFIG_REGULATOR_SLG51000 is not set
 CONFIG_REGULATOR_STPMIC1=m
 CONFIG_REGULATOR_SY8106A=m
 CONFIG_REGULATOR_TPS51632=m
@@ -4700,6 +4908,7 @@ CONFIG_DVB_USB_DIBUSB_MC=m
 CONFIG_DVB_USB_DIB0700=m
 CONFIG_DVB_USB_UMT_010=m
 CONFIG_DVB_USB_CXUSB=m
+# CONFIG_DVB_USB_CXUSB_ANALOG is not set
 CONFIG_DVB_USB_M920X=m
 CONFIG_DVB_USB_DIGITV=m
 CONFIG_DVB_USB_VP7045=m
@@ -4798,7 +5007,6 @@ CONFIG_VIDEO_SAA7134_RC=y
 CONFIG_VIDEO_SAA7134_DVB=m
 CONFIG_VIDEO_SAA7134_GO7007=m
 CONFIG_VIDEO_SAA7164=m
-# CONFIG_VIDEO_COBALT is not set
 
 #
 # Media digital TV PCI Adapters
@@ -4826,7 +5034,6 @@ CONFIG_DVB_DDBRIDGE=m
 CONFIG_DVB_SMIPCIE=m
 CONFIG_DVB_NETUP_UNIDVB=m
 CONFIG_V4L_PLATFORM_DRIVERS=y
-CONFIG_VIDEO_CAFE_CCIC=m
 # CONFIG_VIDEO_CADENCE is not set
 CONFIG_VIDEO_ASPEED=m
 CONFIG_VIDEO_MUX=m
@@ -4871,6 +5078,7 @@ CONFIG_RADIO_WL1273=m
 # Texas Instruments WL128x FM driver (ST based)
 #
 CONFIG_RADIO_WL128X=m
+# end of Texas Instruments WL128x FM driver (ST based)
 
 #
 # Supported FireWire (IEEE 1394) Adapters
@@ -4905,18 +5113,24 @@ CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
 CONFIG_MEDIA_ATTACH=y
 CONFIG_VIDEO_IR_I2C=m
 
+#
+# I2C Encoders, decoders, sensors and other helper chips
+#
+
 #
 # Audio decoders, processors and mixers
 #
 CONFIG_VIDEO_TVAUDIO=m
 CONFIG_VIDEO_TDA7432=m
 CONFIG_VIDEO_TDA9840=m
+# CONFIG_VIDEO_TDA1997X is not set
 CONFIG_VIDEO_TEA6415C=m
 CONFIG_VIDEO_TEA6420=m
 CONFIG_VIDEO_MSP3400=m
 CONFIG_VIDEO_CS3308=m
 CONFIG_VIDEO_CS5345=m
 CONFIG_VIDEO_CS53L32A=m
+# CONFIG_VIDEO_TLV320AIC23B is not set
 CONFIG_VIDEO_UDA1342=m
 CONFIG_VIDEO_WM8775=m
 CONFIG_VIDEO_WM8739=m
@@ -4931,11 +5145,27 @@ CONFIG_VIDEO_SAA6588=m
 #
 # Video decoders
 #
+# CONFIG_VIDEO_ADV7180 is not set
+# CONFIG_VIDEO_ADV7183 is not set
+# CONFIG_VIDEO_ADV748X is not set
+# CONFIG_VIDEO_ADV7604 is not set
+# CONFIG_VIDEO_ADV7842 is not set
+# CONFIG_VIDEO_BT819 is not set
+# CONFIG_VIDEO_BT856 is not set
+# CONFIG_VIDEO_BT866 is not set
+# CONFIG_VIDEO_KS0127 is not set
+# CONFIG_VIDEO_ML86V7667 is not set
+# CONFIG_VIDEO_SAA7110 is not set
 CONFIG_VIDEO_SAA711X=m
+# CONFIG_VIDEO_TC358743 is not set
+# CONFIG_VIDEO_TVP514X is not set
 CONFIG_VIDEO_TVP5150=m
+# CONFIG_VIDEO_TVP7002 is not set
 CONFIG_VIDEO_TW2804=m
 CONFIG_VIDEO_TW9903=m
 CONFIG_VIDEO_TW9906=m
+# CONFIG_VIDEO_TW9910 is not set
+# CONFIG_VIDEO_VPX3220 is not set
 
 #
 # Video and audio decoders
@@ -4947,18 +5177,77 @@ CONFIG_VIDEO_CX25840=m
 # Video encoders
 #
 CONFIG_VIDEO_SAA7127=m
+# CONFIG_VIDEO_SAA7185 is not set
+# CONFIG_VIDEO_ADV7170 is not set
+# CONFIG_VIDEO_ADV7175 is not set
+# CONFIG_VIDEO_ADV7343 is not set
+# CONFIG_VIDEO_ADV7393 is not set
+# CONFIG_VIDEO_AD9389B is not set
+# CONFIG_VIDEO_AK881X is not set
+# CONFIG_VIDEO_THS8200 is not set
 
 #
 # Camera sensor devices
 #
+# CONFIG_VIDEO_IMX214 is not set
+# CONFIG_VIDEO_IMX258 is not set
+# CONFIG_VIDEO_IMX274 is not set
+# CONFIG_VIDEO_IMX319 is not set
+# CONFIG_VIDEO_IMX355 is not set
 CONFIG_VIDEO_OV2640=m
+# CONFIG_VIDEO_OV2659 is not set
+# CONFIG_VIDEO_OV2680 is not set
+# CONFIG_VIDEO_OV2685 is not set
+# CONFIG_VIDEO_OV5640 is not set
+# CONFIG_VIDEO_OV5645 is not set
+# CONFIG_VIDEO_OV5647 is not set
+# CONFIG_VIDEO_OV6650 is not set
+# CONFIG_VIDEO_OV5670 is not set
+# CONFIG_VIDEO_OV5695 is not set
+# CONFIG_VIDEO_OV7251 is not set
+# CONFIG_VIDEO_OV772X is not set
 CONFIG_VIDEO_OV7640=m
 CONFIG_VIDEO_OV7670=m
+# CONFIG_VIDEO_OV7740 is not set
+# CONFIG_VIDEO_OV8856 is not set
+# CONFIG_VIDEO_OV9640 is not set
+# CONFIG_VIDEO_OV9650 is not set
+# CONFIG_VIDEO_OV13858 is not set
+# CONFIG_VIDEO_VS6624 is not set
+# CONFIG_VIDEO_MT9M001 is not set
+# CONFIG_VIDEO_MT9M032 is not set
+# CONFIG_VIDEO_MT9M111 is not set
+# CONFIG_VIDEO_MT9P031 is not set
+# CONFIG_VIDEO_MT9T001 is not set
+# CONFIG_VIDEO_MT9T112 is not set
 CONFIG_VIDEO_MT9V011=m
+# CONFIG_VIDEO_MT9V032 is not set
+# CONFIG_VIDEO_MT9V111 is not set
+# CONFIG_VIDEO_SR030PC30 is not set
+# CONFIG_VIDEO_NOON010PC30 is not set
+# CONFIG_VIDEO_M5MOLS is not set
+# CONFIG_VIDEO_RJ54N1 is not set
+# CONFIG_VIDEO_S5K6AA is not set
+# CONFIG_VIDEO_S5K6A3 is not set
+# CONFIG_VIDEO_S5K4ECGX is not set
+# CONFIG_VIDEO_S5K5BAF is not set
+# CONFIG_VIDEO_ET8EK8 is not set
+# CONFIG_VIDEO_S5C73M3 is not set
+
+#
+# Lens drivers
+#
+# CONFIG_VIDEO_AD5820 is not set
+# CONFIG_VIDEO_AK7375 is not set
+# CONFIG_VIDEO_DW9714 is not set
+# CONFIG_VIDEO_DW9807_VCM is not set
 
 #
 # Flash devices
 #
+# CONFIG_VIDEO_ADP1653 is not set
+# CONFIG_VIDEO_LM3560 is not set
+# CONFIG_VIDEO_LM3646 is not set
 
 #
 # Video improvement chips
@@ -4978,13 +5267,29 @@ CONFIG_VIDEO_SAA6752HS=m
 #
 # Miscellaneous helper chips
 #
+# CONFIG_VIDEO_THS7303 is not set
 CONFIG_VIDEO_M52790=m
+# CONFIG_VIDEO_I2C is not set
+# CONFIG_VIDEO_ST_MIPID02 is not set
+# end of I2C Encoders, decoders, sensors and other helper chips
+
+#
+# SPI helper chips
+#
+# CONFIG_VIDEO_GS1662 is not set
+# end of SPI helper chips
 
 #
 # Media SPI Adapters
 #
 # CONFIG_CXD2880_SPI_DRV is not set
+# end of Media SPI Adapters
+
 CONFIG_MEDIA_TUNER=m
+
+#
+# Customize TV tuners
+#
 CONFIG_MEDIA_TUNER_SIMPLE=m
 CONFIG_MEDIA_TUNER_TDA18250=m
 CONFIG_MEDIA_TUNER_TDA8290=m
@@ -4993,6 +5298,7 @@ CONFIG_MEDIA_TUNER_TDA18271=m
 CONFIG_MEDIA_TUNER_TDA9887=m
 CONFIG_MEDIA_TUNER_TEA5761=m
 CONFIG_MEDIA_TUNER_TEA5767=m
+# CONFIG_MEDIA_TUNER_MSI001 is not set
 CONFIG_MEDIA_TUNER_MT20XX=m
 CONFIG_MEDIA_TUNER_MT2060=m
 CONFIG_MEDIA_TUNER_MT2063=m
@@ -5021,6 +5327,11 @@ CONFIG_MEDIA_TUNER_R820T=m
 CONFIG_MEDIA_TUNER_MXL301RF=m
 CONFIG_MEDIA_TUNER_QM1D1C0042=m
 CONFIG_MEDIA_TUNER_QM1D1B0004=m
+# end of Customize TV tuners
+
+#
+# Customise DVB Frontends
+#
 
 #
 # Multistandard (satellite) frontends
@@ -5081,6 +5392,7 @@ CONFIG_DVB_SP8870=m
 CONFIG_DVB_SP887X=m
 CONFIG_DVB_CX22700=m
 CONFIG_DVB_CX22702=m
+# CONFIG_DVB_S5H1432 is not set
 CONFIG_DVB_DRXD=m
 CONFIG_DVB_L64781=m
 CONFIG_DVB_TDA1004X=m
@@ -5091,6 +5403,7 @@ CONFIG_DVB_DIB3000MB=m
 CONFIG_DVB_DIB3000MC=m
 CONFIG_DVB_DIB7000M=m
 CONFIG_DVB_DIB7000P=m
+# CONFIG_DVB_DIB9000 is not set
 CONFIG_DVB_TDA10048=m
 CONFIG_DVB_AF9013=m
 CONFIG_DVB_EC100=m
@@ -5103,6 +5416,7 @@ CONFIG_DVB_SI2168=m
 CONFIG_DVB_AS102_FE=m
 CONFIG_DVB_ZD1301_DEMOD=m
 CONFIG_DVB_GP8PSK_FE=m
+# CONFIG_DVB_CXD2880 is not set
 
 #
 # DVB-C (cable) frontends
@@ -5140,6 +5454,7 @@ CONFIG_DVB_MB86A20S=m
 # ISDB-S (satellite) & ISDB-T (terrestrial) frontends
 #
 CONFIG_DVB_TC90522=m
+# CONFIG_DVB_MN88443X is not set
 
 #
 # Digital terrestrial only tuners/PLL
@@ -5153,12 +5468,14 @@ CONFIG_DVB_TUNER_DIB0090=m
 #
 CONFIG_DVB_DRX39XYJ=m
 CONFIG_DVB_LNBH25=m
+# CONFIG_DVB_LNBH29 is not set
 CONFIG_DVB_LNBP21=m
 CONFIG_DVB_LNBP22=m
 CONFIG_DVB_ISL6405=m
 CONFIG_DVB_ISL6421=m
 CONFIG_DVB_ISL6423=m
 CONFIG_DVB_A8293=m
+# CONFIG_DVB_LGS8GL5 is not set
 CONFIG_DVB_LGS8GXX=m
 CONFIG_DVB_ATBM8830=m
 CONFIG_DVB_TDA665x=m
@@ -5179,6 +5496,7 @@ CONFIG_DVB_SP2=m
 # Tools to develop new frontends
 #
 CONFIG_DVB_DUMMY_FE=m
+# end of Customise DVB Frontends
 
 #
 # Graphics support
@@ -5198,8 +5516,10 @@ CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 CONFIG_DRM_DP_CEC=y
 CONFIG_DRM_TTM=m
+CONFIG_DRM_VRAM_HELPER=m
 CONFIG_DRM_GEM_CMA_HELPER=y
 CONFIG_DRM_KMS_CMA_HELPER=y
+CONFIG_DRM_GEM_SHMEM_HELPER=y
 CONFIG_DRM_VM=y
 CONFIG_DRM_SCHED=m
 
@@ -5210,10 +5530,13 @@ CONFIG_DRM_I2C_CH7006=m
 CONFIG_DRM_I2C_SIL164=m
 CONFIG_DRM_I2C_NXP_TDA998X=m
 # CONFIG_DRM_I2C_NXP_TDA9950 is not set
+# end of I2C encoder or helper chips
 
 #
 # ARM devices
 #
+# end of ARM devices
+
 CONFIG_DRM_RADEON=m
 CONFIG_DRM_RADEON_USERPTR=y
 CONFIG_DRM_AMDGPU=m
@@ -5226,19 +5549,15 @@ CONFIG_DRM_AMDGPU_USERPTR=y
 # ACP (Audio CoProcessor) Configuration
 #
 CONFIG_DRM_AMD_ACP=y
+# end of ACP (Audio CoProcessor) Configuration
 
 #
 # Display Engine Configuration
 #
 CONFIG_DRM_AMD_DC=y
 # CONFIG_DEBUG_KERNEL_DC is not set
+# end of Display Engine Configuration
 
-#
-# AMD Library routines
-#
-CONFIG_CHASH=m
-# CONFIG_CHASH_STATS is not set
-# CONFIG_CHASH_SELFTEST is not set
 CONFIG_DRM_NOUVEAU=m
 CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT=y
 CONFIG_NOUVEAU_DEBUG=5
@@ -5248,6 +5567,7 @@ CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 # CONFIG_DRM_NOUVEAU_SVM is not set
 CONFIG_DRM_VGEM=m
 CONFIG_DRM_VKMS=m
+CONFIG_DRM_ATI_PCIGART=y
 CONFIG_DRM_UDL=m
 CONFIG_DRM_AST=m
 CONFIG_DRM_MGAG200=m
@@ -5265,6 +5585,7 @@ CONFIG_DRM_PANEL=y
 CONFIG_DRM_PANEL_ARM_VERSATILE=m
 CONFIG_DRM_PANEL_LVDS=m
 CONFIG_DRM_PANEL_SIMPLE=m
+CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D=m
 CONFIG_DRM_PANEL_ILITEK_IL9322=m
 # CONFIG_DRM_PANEL_ILITEK_ILI9881C is not set
 CONFIG_DRM_PANEL_INNOLUX_P079ZCA=m
@@ -5274,12 +5595,16 @@ CONFIG_DRM_PANEL_SAMSUNG_LD9040=m
 CONFIG_DRM_PANEL_LG_LG4573=m
 CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO=m
 CONFIG_DRM_PANEL_ORISETECH_OTM8009A=m
+# CONFIG_DRM_PANEL_OSD_OSD101T2587_53TS is not set
 CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00=m
 CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m
 CONFIG_DRM_PANEL_RAYDIUM_RM68200=m
+CONFIG_DRM_PANEL_ROCKTECH_JH057N00900=m
+CONFIG_DRM_PANEL_RONBO_RB070D30=m
 CONFIG_DRM_PANEL_SAMSUNG_S6D16D0=m
 CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2=m
 CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03=m
+# CONFIG_DRM_PANEL_SAMSUNG_S6E63M0 is not set
 CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m
 CONFIG_DRM_PANEL_SEIKO_43WVF1G=m
 CONFIG_DRM_PANEL_SHARP_LQ101R1SX01=m
@@ -5288,6 +5613,8 @@ CONFIG_DRM_PANEL_SITRONIX_ST7701=m
 CONFIG_DRM_PANEL_SITRONIX_ST7789V=m
 CONFIG_DRM_PANEL_TPO_TPG110=m
 CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA=m
+# end of Display Panels
+
 CONFIG_DRM_BRIDGE=y
 CONFIG_DRM_PANEL_BRIDGE=y
 
@@ -5317,6 +5644,8 @@ CONFIG_DRM_DW_HDMI=m
 CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
 CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
 CONFIG_DRM_DW_HDMI_CEC=m
+# end of Display Interface Bridges
+
 CONFIG_DRM_ETNAVIV=m
 CONFIG_DRM_ETNAVIV_THERMAL=y
 CONFIG_DRM_ARCPGU=m
@@ -5330,7 +5659,13 @@ CONFIG_TINYDRM_MI0283QT=m
 CONFIG_TINYDRM_REPAPER=m
 CONFIG_TINYDRM_ST7586=m
 # CONFIG_TINYDRM_ST7735R is not set
-# CONFIG_DRM_LEGACY is not set
+CONFIG_DRM_LEGACY=y
+CONFIG_DRM_TDFX=m
+CONFIG_DRM_R128=m
+CONFIG_DRM_MGA=m
+CONFIG_DRM_SIS=m
+CONFIG_DRM_VIA=m
+CONFIG_DRM_SAVAGE=m
 CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=m
 
 #
@@ -5396,7 +5731,11 @@ CONFIG_FB_IBM_GXT4500=m
 CONFIG_FB_SIMPLE=y
 CONFIG_FB_SSD1307=m
 CONFIG_FB_SM712=m
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
+# end of Frame buffer Devices
+
+#
+# Backlight & LCD device support
+#
 CONFIG_LCD_CLASS_DEVICE=m
 CONFIG_LCD_L4F00242T03=m
 CONFIG_LCD_LMS283GF05=m
@@ -5436,6 +5775,8 @@ CONFIG_BACKLIGHT_GPIO=m
 CONFIG_BACKLIGHT_LV5207LP=m
 CONFIG_BACKLIGHT_BD6107=m
 # CONFIG_BACKLIGHT_ARCXCNN is not set
+# end of Backlight & LCD device support
+
 CONFIG_VGASTATE=m
 CONFIG_VIDEOMODE_HELPERS=y
 CONFIG_HDMI=y
@@ -5454,7 +5795,11 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y
+# end of Console display driver support
+
 # CONFIG_LOGO is not set
+# end of Graphics support
+
 CONFIG_SOUND=m
 CONFIG_SOUND_OSS_CORE=y
 CONFIG_SOUND_OSS_CORE_PRECLAIM=y
@@ -5590,13 +5935,17 @@ CONFIG_SND_HDA_CODEC_CMEDIA=m
 CONFIG_SND_HDA_CODEC_SI3054=m
 CONFIG_SND_HDA_GENERIC=m
 CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1
+# end of HD-Audio
+
 CONFIG_SND_HDA_CORE=m
 CONFIG_SND_HDA_DSP_LOADER=y
+CONFIG_SND_HDA_COMPONENT=y
 CONFIG_SND_HDA_PREALLOC_SIZE=64
 CONFIG_SND_PPC=y
 CONFIG_SND_SPI=y
 CONFIG_SND_USB=y
 CONFIG_SND_USB_AUDIO=m
+CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER=y
 CONFIG_SND_USB_UA101=m
 CONFIG_SND_USB_USX2Y=m
 CONFIG_SND_USB_CAIAQ=m
@@ -5623,6 +5972,7 @@ CONFIG_SND_FIREFACE=m
 CONFIG_SND_SOC=m
 CONFIG_SND_SOC_AC97_BUS=y
 CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
+CONFIG_SND_SOC_TOPOLOGY=y
 CONFIG_SND_SOC_AMD_ACP=m
 CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m
 CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m
@@ -5638,11 +5988,14 @@ CONFIG_SND_SOC_MIKROE_PROTO=m
 #
 CONFIG_SND_SOC_FSL_ASRC=m
 CONFIG_SND_SOC_FSL_SAI=m
+CONFIG_SND_SOC_FSL_AUDMIX=m
 CONFIG_SND_SOC_FSL_SSI=m
 CONFIG_SND_SOC_FSL_SPDIF=m
 CONFIG_SND_SOC_FSL_ESAI=m
 CONFIG_SND_SOC_FSL_MICFIL=m
 CONFIG_SND_SOC_IMX_AUDMUX=m
+# end of SoC Audio for Freescale CPUs
+
 CONFIG_SND_I2S_HI6210_I2S=m
 CONFIG_SND_SOC_IMG=y
 CONFIG_SND_SOC_IMG_I2S_IN=m
@@ -5652,10 +6005,20 @@ CONFIG_SND_SOC_IMG_SPDIF_IN=m
 CONFIG_SND_SOC_IMG_SPDIF_OUT=m
 CONFIG_SND_SOC_IMG_PISTACHIO_INTERNAL_DAC=m
 CONFIG_SND_SOC_MTK_BTCVSD=m
+CONFIG_SND_SOC_SOF_TOPLEVEL=y
+CONFIG_SND_SOC_SOF_PCI=m
+CONFIG_SND_SOC_SOF_OPTIONS=m
+CONFIG_SND_SOC_SOF_NOCODEC=m
+CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT=y
+# CONFIG_SND_SOC_SOF_STRICT_ABI_CHECKS is not set
+# CONFIG_SND_SOC_SOF_DEBUG is not set
+CONFIG_SND_SOC_SOF=m
 
 #
 # STMicroelectronics STM32 SOC audio support
 #
+# end of STMicroelectronics STM32 SOC audio support
+
 CONFIG_SND_SOC_XILINX_I2S=m
 CONFIG_SND_SOC_XILINX_AUDIO_FORMATTER=m
 CONFIG_SND_SOC_XILINX_SPDIF=m
@@ -5707,6 +6070,7 @@ CONFIG_SND_SOC_CS43130=m
 CONFIG_SND_SOC_CS4341=m
 CONFIG_SND_SOC_CS4349=m
 CONFIG_SND_SOC_CS53L30=m
+# CONFIG_SND_SOC_CX2072X is not set
 CONFIG_SND_SOC_DA7219=m
 CONFIG_SND_SOC_DMIC=m
 CONFIG_SND_SOC_HDMI_CODEC=m
@@ -5777,9 +6141,6 @@ CONFIG_SND_SOC_TLV320AIC23=m
 CONFIG_SND_SOC_TLV320AIC23_I2C=m
 CONFIG_SND_SOC_TLV320AIC23_SPI=m
 CONFIG_SND_SOC_TLV320AIC31XX=m
-CONFIG_SND_SOC_TLV320AIC32X4=m
-CONFIG_SND_SOC_TLV320AIC32X4_I2C=m
-CONFIG_SND_SOC_TLV320AIC32X4_SPI=m
 CONFIG_SND_SOC_TLV320AIC3X=m
 CONFIG_SND_SOC_TS3A227E=m
 CONFIG_SND_SOC_TSCS42XX=m
@@ -5817,6 +6178,8 @@ CONFIG_SND_SOC_NAU8810=m
 CONFIG_SND_SOC_NAU8822=m
 CONFIG_SND_SOC_NAU8824=m
 CONFIG_SND_SOC_TPA6130A2=m
+# end of CODEC drivers
+
 CONFIG_SND_SIMPLE_CARD_UTILS=m
 CONFIG_SND_SIMPLE_CARD=m
 CONFIG_SND_AUDIO_GRAPH_CARD=m
@@ -5849,6 +6212,7 @@ CONFIG_HID_CHERRY=m
 CONFIG_HID_CHICONY=m
 CONFIG_HID_CORSAIR=m
 CONFIG_HID_COUGAR=m
+CONFIG_HID_MACALLY=m
 CONFIG_HID_PRODIKEYS=m
 CONFIG_HID_CMEDIA=m
 CONFIG_HID_CP2112=m
@@ -5929,6 +6293,7 @@ CONFIG_HID_THINGM=m
 CONFIG_HID_THRUSTMASTER=m
 CONFIG_THRUSTMASTER_FF=y
 CONFIG_HID_UDRAW_PS3=m
+CONFIG_HID_U2FZERO=m
 CONFIG_HID_WACOM=m
 CONFIG_HID_WIIMOTE=m
 CONFIG_HID_XINMO=m
@@ -5938,6 +6303,7 @@ CONFIG_HID_ZYDACRON=m
 CONFIG_HID_SENSOR_HUB=m
 CONFIG_HID_SENSOR_CUSTOM_SENSOR=m
 CONFIG_HID_ALPS=m
+# end of Special HID drivers
 
 #
 # USB HID support
@@ -5951,11 +6317,16 @@ CONFIG_USB_HIDDEV=y
 #
 CONFIG_USB_KBD=m
 CONFIG_USB_MOUSE=m
+# end of USB HID Boot Protocol drivers
+# end of USB HID support
 
 #
 # I2C HID support
 #
 CONFIG_I2C_HID=m
+# end of I2C HID support
+# end of HID support
+
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 CONFIG_USB_SUPPORT=y
 CONFIG_USB_COMMON=y
@@ -6202,6 +6573,8 @@ CONFIG_USB_GPIO_VBUS=m
 CONFIG_TAHVO_USB=m
 # CONFIG_TAHVO_USB_HOST_BY_DEFAULT is not set
 CONFIG_USB_ISP1301=m
+# end of USB Physical Layer drivers
+
 CONFIG_USB_GADGET=m
 # CONFIG_USB_GADGET_DEBUG is not set
 # CONFIG_USB_GADGET_DEBUG_FILES is not set
@@ -6236,6 +6609,8 @@ CONFIG_USB_GOKU=m
 CONFIG_USB_EG20T=m
 CONFIG_USB_GADGET_XILINX=m
 CONFIG_USB_DUMMY_HCD=m
+# end of USB Peripheral Controller
+
 CONFIG_USB_LIBCOMPOSITE=m
 CONFIG_USB_F_ACM=m
 CONFIG_USB_U_SERIAL=m
@@ -6316,11 +6691,15 @@ CONFIG_TYPEC_TPS6598X=m
 # USB Type-C Multiplexer/DeMultiplexer Switch support
 #
 # CONFIG_TYPEC_MUX_PI3USB30532 is not set
+# end of USB Type-C Multiplexer/DeMultiplexer Switch support
 
 #
 # USB Type-C Alternate Mode drivers
 #
 CONFIG_TYPEC_DP_ALTMODE=m
+CONFIG_TYPEC_NVIDIA_ALTMODE=m
+# end of USB Type-C Alternate Mode drivers
+
 CONFIG_USB_ROLE_SWITCH=m
 CONFIG_USB_LED_TRIG=y
 CONFIG_USB_ULPI_BUS=m
@@ -6404,6 +6783,7 @@ CONFIG_LEDS_BCM6358=m
 CONFIG_LEDS_CPCAP=m
 CONFIG_LEDS_CR0014114=m
 CONFIG_LEDS_LM3530=m
+CONFIG_LEDS_LM3532=m
 CONFIG_LEDS_LM3533=m
 CONFIG_LEDS_LM3642=m
 CONFIG_LEDS_LM3692X=m
@@ -6437,6 +6817,7 @@ CONFIG_LEDS_LT3593=m
 CONFIG_LEDS_MC13783=m
 CONFIG_LEDS_TCA6507=m
 CONFIG_LEDS_TLC591XX=m
+CONFIG_LEDS_MAX77650=m
 # CONFIG_LEDS_MAX77693 is not set
 # CONFIG_LEDS_MAX8997 is not set
 CONFIG_LEDS_LM355x=m
@@ -6453,6 +6834,8 @@ CONFIG_LEDS_POWERNV=m
 CONFIG_LEDS_SYSCON=y
 CONFIG_LEDS_MLXREG=m
 CONFIG_LEDS_USER=m
+# CONFIG_LEDS_SPI_BYTE is not set
+# CONFIG_LEDS_TI_LMU_COMMON is not set
 
 #
 # LED Triggers
@@ -6491,15 +6874,15 @@ CONFIG_INFINIBAND_MTHCA=m
 CONFIG_INFINIBAND_MTHCA_DEBUG=y
 CONFIG_INFINIBAND_CXGB3=m
 CONFIG_INFINIBAND_CXGB4=m
+CONFIG_INFINIBAND_EFA=m
 CONFIG_INFINIBAND_I40IW=m
 CONFIG_MLX4_INFINIBAND=m
 CONFIG_MLX5_INFINIBAND=m
-CONFIG_INFINIBAND_NES=m
-# CONFIG_INFINIBAND_NES_DEBUG is not set
 CONFIG_INFINIBAND_OCRDMA=m
 CONFIG_INFINIBAND_BNXT_RE=m
 CONFIG_INFINIBAND_QEDR=m
 CONFIG_RDMA_RXE=m
+# CONFIG_RDMA_SIW is not set
 CONFIG_INFINIBAND_IPOIB=m
 CONFIG_INFINIBAND_IPOIB_CM=y
 CONFIG_INFINIBAND_IPOIB_DEBUG=y
@@ -6568,6 +6951,7 @@ CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_M41T80=m
 CONFIG_RTC_DRV_M41T80_WDT=y
+# CONFIG_RTC_DRV_BD70528 is not set
 CONFIG_RTC_DRV_BQ32K=m
 CONFIG_RTC_DRV_TWL4030=m
 CONFIG_RTC_DRV_PALMAS=m
@@ -6682,6 +7066,8 @@ CONFIG_QCOM_HIDMA=m
 CONFIG_DW_DMAC_CORE=m
 CONFIG_DW_DMAC=m
 CONFIG_DW_DMAC_PCI=m
+# CONFIG_DW_EDMA is not set
+# CONFIG_DW_EDMA_PCIE is not set
 
 #
 # DMA Clients
@@ -6695,6 +7081,8 @@ CONFIG_ASYNC_TX_DMA=y
 CONFIG_SYNC_FILE=y
 # CONFIG_SW_SYNC is not set
 CONFIG_UDMABUF=y
+# end of DMABUF options
+
 CONFIG_AUXDISPLAY=y
 CONFIG_HD44780=m
 CONFIG_KS0108=m
@@ -6740,6 +7128,7 @@ CONFIG_VIRTIO=m
 CONFIG_VIRTIO_MENU=y
 CONFIG_VIRTIO_PCI=m
 CONFIG_VIRTIO_PCI_LEGACY=y
+# CONFIG_VIRTIO_PMEM is not set
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_INPUT=m
 CONFIG_VIRTIO_MMIO=m
@@ -6748,6 +7137,8 @@ CONFIG_VIRTIO_MMIO=m
 #
 # Microsoft Hyper-V guest support
 #
+# end of Microsoft Hyper-V guest support
+
 CONFIG_STAGING=y
 CONFIG_PRISM2_USB=m
 CONFIG_COMEDI=m
@@ -6843,8 +7234,6 @@ CONFIG_RTL8723BS=m
 CONFIG_R8712U=m
 CONFIG_R8188EU=m
 CONFIG_88EU_AP_MODE=y
-CONFIG_R8822BE=m
-CONFIG_RTLWIFI_DEBUG_ST=y
 CONFIG_RTS5208=m
 CONFIG_VT6655=m
 CONFIG_VT6656=m
@@ -6858,14 +7247,15 @@ CONFIG_VT6656=m
 #
 CONFIG_ADIS16203=m
 CONFIG_ADIS16240=m
+# end of Accelerometers
 
 #
 # Analog to digital converters
 #
-CONFIG_AD7780=m
 CONFIG_AD7816=m
 CONFIG_AD7192=m
 CONFIG_AD7280=m
+# end of Analog to digital converters
 
 #
 # Analog digital bi-direction converters
@@ -6873,23 +7263,27 @@ CONFIG_AD7280=m
 CONFIG_ADT7316=m
 CONFIG_ADT7316_SPI=m
 CONFIG_ADT7316_I2C=m
+# end of Analog digital bi-direction converters
 
 #
 # Capacitance to digital converters
 #
 CONFIG_AD7150=m
 CONFIG_AD7746=m
+# end of Capacitance to digital converters
 
 #
 # Direct Digital Synthesis
 #
 CONFIG_AD9832=m
 CONFIG_AD9834=m
+# end of Direct Digital Synthesis
 
 #
 # Network Analyzer, Impedance Converters
 #
 CONFIG_AD5933=m
+# end of Network Analyzer, Impedance Converters
 
 #
 # Active energy metering IC
@@ -6897,11 +7291,15 @@ CONFIG_AD5933=m
 CONFIG_ADE7854=m
 CONFIG_ADE7854_I2C=m
 CONFIG_ADE7854_SPI=m
+# end of Active energy metering IC
 
 #
 # Resolver to digital converters
 #
 CONFIG_AD2S1210=m
+# end of Resolver to digital converters
+# end of IIO staging drivers
+
 CONFIG_FB_SM750=m
 
 #
@@ -6919,6 +7317,8 @@ CONFIG_SPEAKUP_SYNTH_SOFT=m
 CONFIG_SPEAKUP_SYNTH_SPKOUT=m
 CONFIG_SPEAKUP_SYNTH_TXPRT=m
 CONFIG_SPEAKUP_SYNTH_DUMMY=m
+# end of Speakup console speech
+
 CONFIG_STAGING_MEDIA=y
 CONFIG_I2C_BCM2048=m
 
@@ -6929,6 +7329,8 @@ CONFIG_I2C_BCM2048=m
 #
 # Android
 #
+# end of Android
+
 CONFIG_LTE_GDM724X=m
 CONFIG_FIREWIRE_SERIAL=m
 CONFIG_FWTTY_MAX_TOTAL_PORTS=64
@@ -7007,6 +7409,8 @@ CONFIG_PI433=m
 #
 # Gasket devices
 #
+# end of Gasket devices
+
 CONFIG_XIL_AXIS_FIFO=m
 CONFIG_EROFS_FS=m
 # CONFIG_EROFS_FS_DEBUG is not set
@@ -7017,6 +7421,8 @@ CONFIG_EROFS_FS_SECURITY=y
 # CONFIG_EROFS_FAULT_INJECTION is not set
 CONFIG_EROFS_FS_IO_MAX_RETRIES=5
 # CONFIG_EROFS_FS_ZIP is not set
+# CONFIG_FIELDBUS_DEV is not set
+# CONFIG_KPC2000 is not set
 CONFIG_HWSPINLOCK=y
 
 #
@@ -7024,6 +7430,8 @@ CONFIG_HWSPINLOCK=y
 #
 CONFIG_I8253_LOCK=y
 CONFIG_CLKBLD_I8253=y
+# end of Clock Source drivers
+
 CONFIG_MAILBOX=y
 CONFIG_PLATFORM_MHU=m
 CONFIG_ALTERA_MBOX=m
@@ -7034,6 +7442,8 @@ CONFIG_IOMMU_SUPPORT=y
 #
 # Generic IOMMU Pagetable Support
 #
+# end of Generic IOMMU Pagetable Support
+
 # CONFIG_IOMMU_DEBUGFS is not set
 # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
 CONFIG_OF_IOMMU=y
@@ -7043,6 +7453,7 @@ CONFIG_SPAPR_TCE_IOMMU=y
 # Remoteproc drivers
 #
 CONFIG_REMOTEPROC=m
+# end of Remoteproc drivers
 
 #
 # Rpmsg drivers
@@ -7051,6 +7462,8 @@ CONFIG_RPMSG=m
 CONFIG_RPMSG_CHAR=m
 # CONFIG_RPMSG_QCOM_GLINK_RPM is not set
 CONFIG_RPMSG_VIRTIO=m
+# end of Rpmsg drivers
+
 # CONFIG_SOUNDWIRE is not set
 
 #
@@ -7060,29 +7473,43 @@ CONFIG_RPMSG_VIRTIO=m
 #
 # Amlogic SoC drivers
 #
+# end of Amlogic SoC drivers
+
+#
+# Aspeed SoC drivers
+#
+# end of Aspeed SoC drivers
 
 #
 # Broadcom SoC drivers
 #
+# end of Broadcom SoC drivers
 
 #
 # NXP/Freescale QorIQ SoC drivers
 #
 CONFIG_FSL_GUTS=y
+# end of NXP/Freescale QorIQ SoC drivers
 
 #
 # i.MX SoC drivers
 #
+# end of i.MX SoC drivers
 
 #
 # Qualcomm SoC drivers
 #
+# end of Qualcomm SoC drivers
+
 CONFIG_SOC_TI=y
 
 #
 # Xilinx SoC drivers
 #
 CONFIG_XILINX_VCU=m
+# end of Xilinx SoC drivers
+# end of SOC (System On Chip) specific Drivers
+
 CONFIG_PM_DEVFREQ=y
 
 #
@@ -7105,6 +7532,7 @@ CONFIG_EXTCON=y
 #
 CONFIG_EXTCON_ADC_JACK=m
 CONFIG_EXTCON_ARIZONA=m
+# CONFIG_EXTCON_FSA9480 is not set
 CONFIG_EXTCON_GPIO=m
 CONFIG_EXTCON_MAX14577=m
 CONFIG_EXTCON_MAX3355=m
@@ -7171,6 +7599,7 @@ CONFIG_MXC6255=m
 CONFIG_SCA3000=m
 CONFIG_STK8312=m
 CONFIG_STK8BA50=m
+# end of Accelerometers
 
 #
 # Analog to digital converters
@@ -7186,6 +7615,7 @@ CONFIG_AD7606_IFACE_PARALLEL=m
 CONFIG_AD7606_IFACE_SPI=m
 CONFIG_AD7766=m
 CONFIG_AD7768_1=m
+CONFIG_AD7780=m
 CONFIG_AD7791=m
 CONFIG_AD7793=m
 CONFIG_AD7887=m
@@ -7231,6 +7661,7 @@ CONFIG_TI_ADC128S052=m
 CONFIG_TI_ADC161S626=m
 CONFIG_TI_ADS1015=m
 CONFIG_TI_ADS7950=m
+CONFIG_TI_ADS8344=m
 CONFIG_TI_ADS8688=m
 CONFIG_TI_ADS124S08=m
 CONFIG_TI_AM335X_ADC=m
@@ -7239,16 +7670,20 @@ CONFIG_TI_TLC4541=m
 # CONFIG_TWL6030_GPADC is not set
 CONFIG_VF610_ADC=m
 CONFIG_VIPERBOARD_ADC=m
+# CONFIG_XILINX_XADC is not set
+# end of Analog to digital converters
 
 #
 # Analog Front Ends
 #
 CONFIG_IIO_RESCALE=m
+# end of Analog Front Ends
 
 #
 # Amplifiers
 #
 CONFIG_AD8366=m
+# end of Amplifiers
 
 #
 # Chemical Sensors
@@ -7263,12 +7698,15 @@ CONFIG_PMS7003=m
 CONFIG_SENSIRION_SGP30=m
 CONFIG_SPS30=m
 CONFIG_VZ89X=m
+# end of Chemical Sensors
 
 #
 # Hid Sensor IIO Common
 #
 CONFIG_HID_SENSOR_IIO_COMMON=m
 CONFIG_HID_SENSOR_IIO_TRIGGER=m
+# end of Hid Sensor IIO Common
+
 CONFIG_IIO_MS_SENSORS_I2C=m
 
 #
@@ -7276,14 +7714,12 @@ CONFIG_IIO_MS_SENSORS_I2C=m
 #
 CONFIG_IIO_SSP_SENSORS_COMMONS=m
 CONFIG_IIO_SSP_SENSORHUB=m
+# end of SSP Sensor Common
+
 CONFIG_IIO_ST_SENSORS_I2C=m
 CONFIG_IIO_ST_SENSORS_SPI=m
 CONFIG_IIO_ST_SENSORS_CORE=m
 
-#
-# Counters
-#
-
 #
 # Digital to analog converters
 #
@@ -7322,6 +7758,7 @@ CONFIG_TI_DAC5571=m
 CONFIG_TI_DAC7311=m
 CONFIG_TI_DAC7612=m
 CONFIG_VF610_DAC=m
+# end of Digital to analog converters
 
 #
 # IIO dummy driver
@@ -7329,6 +7766,7 @@ CONFIG_VF610_DAC=m
 CONFIG_IIO_SIMPLE_DUMMY=m
 # CONFIG_IIO_SIMPLE_DUMMY_EVENTS is not set
 # CONFIG_IIO_SIMPLE_DUMMY_BUFFER is not set
+# end of IIO dummy driver
 
 #
 # Frequency Synthesizers DDS/PLL
@@ -7338,11 +7776,15 @@ CONFIG_IIO_SIMPLE_DUMMY=m
 # Clock Generator/Distribution
 #
 CONFIG_AD9523=m
+# end of Clock Generator/Distribution
 
 #
 # Phase-Locked Loop (PLL) frequency synthesizers
 #
 CONFIG_ADF4350=m
+# CONFIG_ADF4371 is not set
+# end of Phase-Locked Loop (PLL) frequency synthesizers
+# end of Frequency Synthesizers DDS/PLL
 
 #
 # Digital gyroscope sensors
@@ -7355,6 +7797,9 @@ CONFIG_ADXRS450=m
 CONFIG_BMG160=m
 CONFIG_BMG160_I2C=m
 CONFIG_BMG160_SPI=m
+CONFIG_FXAS21002C=m
+CONFIG_FXAS21002C_I2C=m
+CONFIG_FXAS21002C_SPI=m
 CONFIG_HID_SENSOR_GYRO_3D=m
 CONFIG_MPU3050=m
 CONFIG_MPU3050_I2C=m
@@ -7362,6 +7807,7 @@ CONFIG_IIO_ST_GYRO_3AXIS=m
 CONFIG_IIO_ST_GYRO_I2C_3AXIS=m
 CONFIG_IIO_ST_GYRO_SPI_3AXIS=m
 CONFIG_ITG3200=m
+# end of Digital gyroscope sensors
 
 #
 # Health Sensors
@@ -7374,6 +7820,8 @@ CONFIG_AFE4403=m
 CONFIG_AFE4404=m
 CONFIG_MAX30100=m
 CONFIG_MAX30102=m
+# end of Heart Rate Monitors
+# end of Health Sensors
 
 #
 # Humidity sensors
@@ -7388,6 +7836,7 @@ CONFIG_HTS221_SPI=m
 CONFIG_HTU21=m
 CONFIG_SI7005=m
 CONFIG_SI7020=m
+# end of Humidity sensors
 
 #
 # Inertial measurement units
@@ -7404,6 +7853,8 @@ CONFIG_INV_MPU6050_SPI=m
 CONFIG_IIO_ST_LSM6DSX=m
 CONFIG_IIO_ST_LSM6DSX_I2C=m
 CONFIG_IIO_ST_LSM6DSX_SPI=m
+# end of Inertial measurement units
+
 CONFIG_IIO_ADIS_LIB=m
 CONFIG_IIO_ADIS_LIB_BUFFER=y
 
@@ -7454,6 +7905,7 @@ CONFIG_VCNL4035=m
 CONFIG_VEML6070=m
 CONFIG_VL6180=m
 CONFIG_ZOPT2201=m
+# end of Light sensors
 
 #
 # Magnetometer sensors
@@ -7476,17 +7928,20 @@ CONFIG_SENSORS_HMC5843_SPI=m
 CONFIG_SENSORS_RM3100=m
 CONFIG_SENSORS_RM3100_I2C=m
 CONFIG_SENSORS_RM3100_SPI=m
+# end of Magnetometer sensors
 
 #
 # Multiplexers
 #
 CONFIG_IIO_MUX=m
+# end of Multiplexers
 
 #
 # Inclinometer sensors
 #
 CONFIG_HID_SENSOR_INCLINOMETER_3D=m
 CONFIG_HID_SENSOR_DEVICE_ROTATION=m
+# end of Inclinometer sensors
 
 #
 # Triggers - standalone
@@ -7495,6 +7950,7 @@ CONFIG_IIO_HRTIMER_TRIGGER=m
 CONFIG_IIO_INTERRUPT_TRIGGER=m
 CONFIG_IIO_TIGHTLOOP_TRIGGER=m
 CONFIG_IIO_SYSFS_TRIGGER=m
+# end of Triggers - standalone
 
 #
 # Digital potentiometers
@@ -7508,11 +7964,13 @@ CONFIG_MCP4131=m
 CONFIG_MCP4531=m
 CONFIG_MCP41010=m
 CONFIG_TPL0102=m
+# end of Digital potentiometers
 
 #
 # Digital potentiostats
 #
 CONFIG_LMP91000=m
+# end of Digital potentiostats
 
 #
 # Pressure sensors
@@ -7521,6 +7979,7 @@ CONFIG_ABP060MG=m
 CONFIG_BMP280=m
 CONFIG_BMP280_I2C=m
 CONFIG_BMP280_SPI=m
+# CONFIG_DPS310 is not set
 CONFIG_HID_SENSOR_PRESS=m
 CONFIG_HP03=m
 CONFIG_MPL115=m
@@ -7539,28 +7998,33 @@ CONFIG_HP206C=m
 CONFIG_ZPA2326=m
 CONFIG_ZPA2326_I2C=m
 CONFIG_ZPA2326_SPI=m
+# end of Pressure sensors
 
 #
 # Lightning sensors
 #
 # CONFIG_AS3935 is not set
+# end of Lightning sensors
 
 #
 # Proximity and distance sensors
 #
 CONFIG_ISL29501=m
 CONFIG_LIDAR_LITE_V2=m
+CONFIG_MB1232=m
 CONFIG_RFD77402=m
 # CONFIG_SRF04 is not set
 CONFIG_SX9500=m
 CONFIG_SRF08=m
 CONFIG_VL53L0X_I2C=m
+# end of Proximity and distance sensors
 
 #
 # Resolver to digital converters
 #
 CONFIG_AD2S90=m
 CONFIG_AD2S1200=m
+# end of Resolver to digital converters
 
 #
 # Temperature sensors
@@ -7573,7 +8037,11 @@ CONFIG_TMP006=m
 CONFIG_TMP007=m
 CONFIG_TSYS01=m
 CONFIG_TSYS02D=m
+CONFIG_MAX31856=m
+# end of Temperature sensors
+
 CONFIG_NTB=m
+# CONFIG_NTB_MSI is not set
 CONFIG_NTB_IDT=m
 CONFIG_NTB_SWITCHTEC=m
 CONFIG_NTB_PINGPONG=m
@@ -7594,18 +8062,15 @@ CONFIG_PWM_STMPE=y
 # IRQ chip support
 #
 CONFIG_IRQCHIP=y
-CONFIG_ARM_GIC_MAX_NR=1
+# CONFIG_AL_FIC is not set
 CONFIG_MADERA_IRQ=m
+# end of IRQ chip support
+
 CONFIG_IPACK_BUS=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_SERIAL_IPOCTAL=m
 CONFIG_RESET_CONTROLLER=y
 # CONFIG_RESET_TI_SYSCON is not set
-CONFIG_FMC=m
-CONFIG_FMC_FAKEDEV=m
-CONFIG_FMC_TRIVIAL=m
-CONFIG_FMC_WRITE_EEPROM=m
-CONFIG_FMC_CHARDEV=m
 
 #
 # PHY Subsystem
@@ -7617,6 +8082,7 @@ CONFIG_PHY_CADENCE_DP=m
 CONFIG_PHY_CADENCE_DPHY=m
 CONFIG_PHY_CADENCE_SIERRA=m
 CONFIG_PHY_FSL_IMX8MQ_USB=m
+# CONFIG_PHY_MIXEL_MIPI_DPHY is not set
 CONFIG_PHY_PXA_28NM_HSIC=m
 CONFIG_PHY_PXA_28NM_USB2=m
 # CONFIG_PHY_CPCAP_USB is not set
@@ -7625,6 +8091,8 @@ CONFIG_PHY_OCELOT_SERDES=m
 CONFIG_PHY_QCOM_USB_HS=m
 CONFIG_PHY_QCOM_USB_HSIC=m
 CONFIG_PHY_TUSB1210=m
+# end of PHY Subsystem
+
 CONFIG_POWERCAP=y
 CONFIG_IDLE_INJECT=y
 CONFIG_MCB=m
@@ -7634,12 +8102,16 @@ CONFIG_MCB_LPC=m
 #
 # Performance monitor support
 #
+# end of Performance monitor support
+
 CONFIG_RAS=y
 
 #
 # Android
 #
 # CONFIG_ANDROID is not set
+# end of Android
+
 CONFIG_LIBNVDIMM=y
 CONFIG_BLK_DEV_PMEM=m
 CONFIG_ND_BLK=m
@@ -7657,6 +8129,7 @@ CONFIG_DEV_DAX_PMEM=m
 CONFIG_DEV_DAX_KMEM=m
 CONFIG_DEV_DAX_PMEM_COMPAT=m
 CONFIG_NVMEM=y
+CONFIG_NVMEM_SYSFS=y
 
 #
 # HW tracing support
@@ -7675,6 +8148,8 @@ CONFIG_INTEL_TH_STH=m
 CONFIG_INTEL_TH_MSU=m
 CONFIG_INTEL_TH_PTI=m
 # CONFIG_INTEL_TH_DEBUG is not set
+# end of HW tracing support
+
 CONFIG_FPGA=m
 CONFIG_ALTERA_PR_IP_CORE=m
 CONFIG_ALTERA_PR_IP_CORE_PLAT=m
@@ -7711,10 +8186,14 @@ CONFIG_MUX_ADG792A=m
 # CONFIG_MUX_ADGS1408 is not set
 CONFIG_MUX_GPIO=m
 CONFIG_MUX_MMIO=m
+# end of Multiplexer drivers
+
 CONFIG_PM_OPP=y
 # CONFIG_SIOX is not set
 # CONFIG_SLIMBUS is not set
 CONFIG_INTERCONNECT=m
+# CONFIG_COUNTER is not set
+# end of Device Drivers
 
 #
 # File systems
@@ -7817,6 +8296,7 @@ CONFIG_FSCACHE=m
 CONFIG_CACHEFILES=m
 # CONFIG_CACHEFILES_DEBUG is not set
 # CONFIG_CACHEFILES_HISTOGRAM is not set
+# end of Caches
 
 #
 # CD-ROM/DVD Filesystems
@@ -7825,6 +8305,7 @@ CONFIG_ISO9660_FS=m
 CONFIG_JOLIET=y
 CONFIG_ZISOFS=y
 CONFIG_UDF_FS=m
+# end of CD-ROM/DVD Filesystems
 
 #
 # DOS/FAT/NT Filesystems
@@ -7838,6 +8319,7 @@ CONFIG_FAT_DEFAULT_UTF8=y
 CONFIG_NTFS_FS=m
 # CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
+# end of DOS/FAT/NT Filesystems
 
 #
 # Pseudo filesystems
@@ -7859,6 +8341,8 @@ CONFIG_HUGETLB_PAGE=y
 CONFIG_MEMFD_CREATE=y
 CONFIG_ARCH_HAS_GIGANTIC_PAGE=y
 CONFIG_CONFIGFS_FS=y
+# end of Pseudo filesystems
+
 CONFIG_MISC_FILESYSTEMS=y
 CONFIG_ORANGEFS_FS=m
 CONFIG_ADFS_FS=m
@@ -7868,7 +8352,8 @@ CONFIG_ECRYPT_FS=m
 # CONFIG_ECRYPT_FS_MESSAGING is not set
 CONFIG_HFS_FS=m
 CONFIG_HFSPLUS_FS=m
-# CONFIG_BEFS_FS is not set
+CONFIG_BEFS_FS=m
+# CONFIG_BEFS_DEBUG is not set
 # CONFIG_BFS_FS is not set
 # CONFIG_EFS_FS is not set
 CONFIG_JFFS2_FS=m
@@ -7979,12 +8464,13 @@ CONFIG_SUNRPC_GSS=m
 CONFIG_SUNRPC_BACKCHANNEL=y
 CONFIG_SUNRPC_SWAP=y
 CONFIG_RPCSEC_GSS_KRB5=m
-CONFIG_CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y
+# CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES is not set
 # CONFIG_SUNRPC_DEBUG is not set
 CONFIG_SUNRPC_XPRT_RDMA=m
 CONFIG_CEPH_FS=m
 CONFIG_CEPH_FSCACHE=y
 CONFIG_CEPH_FS_POSIX_ACL=y
+# CONFIG_CEPH_FS_SECURITY_LABEL is not set
 CONFIG_CIFS=m
 # CONFIG_CIFS_STATS2 is not set
 CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
@@ -7992,7 +8478,6 @@ CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
 CONFIG_CIFS_UPCALL=y
 CONFIG_CIFS_XATTR=y
 CONFIG_CIFS_POSIX=y
-CONFIG_CIFS_ACL=y
 # CONFIG_CIFS_DEBUG is not set
 CONFIG_CIFS_DFS_UPCALL=y
 # CONFIG_CIFS_SMB_DIRECT is not set
@@ -8059,12 +8544,16 @@ CONFIG_NLS_MAC_TURKISH=m
 CONFIG_NLS_UTF8=m
 CONFIG_DLM=m
 # CONFIG_DLM_DEBUG is not set
+CONFIG_UNICODE=y
+# CONFIG_UNICODE_NORMALIZATION_SELFTEST is not set
+# end of File systems
 
 #
 # Security options
 #
 CONFIG_KEYS=y
 CONFIG_KEYS_COMPAT=y
+# CONFIG_KEYS_REQUEST_CACHE is not set
 # CONFIG_PERSISTENT_KEYRINGS is not set
 # CONFIG_BIG_KEYS is not set
 CONFIG_TRUSTED_KEYS=m
@@ -8108,6 +8597,24 @@ CONFIG_INTEGRITY_AUDIT=y
 # CONFIG_DEFAULT_SECURITY_APPARMOR is not set
 CONFIG_DEFAULT_SECURITY_DAC=y
 CONFIG_LSM="yama,loadpin,safesetid,integrity"
+
+#
+# Kernel hardening options
+#
+
+#
+# Memory initialization
+#
+CONFIG_INIT_STACK_NONE=y
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_USER is not set
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL is not set
+# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
+# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
+# end of Memory initialization
+# end of Kernel hardening options
+# end of Security options
+
 CONFIG_XOR_BLOCKS=m
 CONFIG_ASYNC_CORE=m
 CONFIG_ASYNC_MEMCPY=m
@@ -8135,9 +8642,6 @@ CONFIG_CRYPTO_AKCIPHER=y
 CONFIG_CRYPTO_KPP2=y
 CONFIG_CRYPTO_KPP=y
 CONFIG_CRYPTO_ACOMP2=y
-CONFIG_CRYPTO_RSA=y
-CONFIG_CRYPTO_DH=y
-CONFIG_CRYPTO_ECDH=m
 CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MANAGER2=y
 CONFIG_CRYPTO_USER=m
@@ -8146,12 +8650,20 @@ CONFIG_CRYPTO_GF128MUL=m
 CONFIG_CRYPTO_NULL=m
 CONFIG_CRYPTO_NULL2=y
 CONFIG_CRYPTO_PCRYPT=m
-CONFIG_CRYPTO_WORKQUEUE=y
 CONFIG_CRYPTO_CRYPTD=m
 CONFIG_CRYPTO_AUTHENC=m
 CONFIG_CRYPTO_TEST=m
 CONFIG_CRYPTO_ENGINE=m
 
+#
+# Public-key cryptography
+#
+CONFIG_CRYPTO_RSA=y
+CONFIG_CRYPTO_DH=y
+CONFIG_CRYPTO_ECC=m
+CONFIG_CRYPTO_ECDH=m
+CONFIG_CRYPTO_ECRDSA=m
+
 #
 # Authenticated Encryption with Associated Data
 #
@@ -8196,6 +8708,7 @@ CONFIG_CRYPTO_VMAC=m
 CONFIG_CRYPTO_CRC32C=m
 CONFIG_CRYPTO_CRC32C_VPMSUM=m
 CONFIG_CRYPTO_CRC32=m
+# CONFIG_CRYPTO_XXHASH is not set
 CONFIG_CRYPTO_CRCT10DIF=y
 CONFIG_CRYPTO_CRCT10DIF_VPMSUM=m
 CONFIG_CRYPTO_VPMSUM_TESTER=m
@@ -8215,7 +8728,7 @@ CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA512=y
 CONFIG_CRYPTO_SHA3=m
 CONFIG_CRYPTO_SM3=m
-# CONFIG_CRYPTO_STREEBOG is not set
+CONFIG_CRYPTO_STREEBOG=m
 CONFIG_CRYPTO_TGR192=m
 CONFIG_CRYPTO_WP512=m
 
@@ -8225,6 +8738,7 @@ CONFIG_CRYPTO_WP512=m
 CONFIG_CRYPTO_AES=y
 CONFIG_CRYPTO_AES_TI=m
 CONFIG_CRYPTO_ANUBIS=m
+CONFIG_CRYPTO_LIB_ARC4=m
 CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_BLOWFISH=m
 CONFIG_CRYPTO_BLOWFISH_COMMON=m
@@ -8275,6 +8789,8 @@ CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_NX=y
 CONFIG_CRYPTO_DEV_NX_COMPRESS=m
 CONFIG_CRYPTO_DEV_NX_COMPRESS_PSERIES=m
+# CONFIG_CRYPTO_DEV_ATMEL_ECC is not set
+# CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set
 # CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set
 CONFIG_CRYPTO_DEV_VMX=y
 CONFIG_CRYPTO_DEV_VMX_ENCRYPT=m
@@ -8300,6 +8816,8 @@ CONFIG_SYSTEM_TRUSTED_KEYS=""
 # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
 # CONFIG_SECONDARY_TRUSTED_KEYRING is not set
 # CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
+# end of Certificates for signature checking
+
 CONFIG_BINARY_PRINTF=y
 
 #
@@ -8307,11 +8825,13 @@ CONFIG_BINARY_PRINTF=y
 #
 CONFIG_RAID6_PQ=m
 CONFIG_RAID6_PQ_BENCHMARK=y
+CONFIG_PACKING=y
 CONFIG_BITREVERSE=y
-CONFIG_RATIONAL=y
 CONFIG_GENERIC_STRNCPY_FROM_USER=y
 CONFIG_GENERIC_STRNLEN_USER=y
 CONFIG_GENERIC_NET_UTILS=y
+CONFIG_CORDIC=m
+CONFIG_RATIONAL=y
 CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_GENERIC_IOMAP=y
 CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
@@ -8381,6 +8901,7 @@ CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_ARCH_DMA_ADDR_T_64BIT=y
 CONFIG_DMA_DECLARE_COHERENT=y
 CONFIG_DMA_VIRT_OPS=y
+CONFIG_SWIOTLB=y
 # CONFIG_DMA_API_DEBUG is not set
 CONFIG_SGL_ALLOC=y
 CONFIG_IOMMU_HELPER=y
@@ -8392,10 +8913,9 @@ CONFIG_GLOB=y
 CONFIG_NLATTR=y
 CONFIG_LRU_CACHE=m
 CONFIG_CLZ_TAB=y
-CONFIG_CORDIC=m
-CONFIG_DDR=y
 CONFIG_IRQ_POLL=y
 CONFIG_MPILIB=y
+CONFIG_DIMLIB=y
 CONFIG_LIBFDT=y
 CONFIG_OID_REGISTRY=y
 CONFIG_FONT_SUPPORT=y
@@ -8418,8 +8938,9 @@ CONFIG_ARCH_HAS_PMEM_API=y
 CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y
 CONFIG_SBITMAP=y
 CONFIG_PARMAN=m
-# CONFIG_STRING_SELFTEST is not set
 CONFIG_OBJAGG=m
+# CONFIG_STRING_SELFTEST is not set
+# end of Library routines
 
 #
 # Kernel hacking
@@ -8434,6 +8955,7 @@ CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
 CONFIG_CONSOLE_LOGLEVEL_QUIET=4
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 CONFIG_DYNAMIC_DEBUG=y
+# end of printk and dmesg options
 
 #
 # Compile-time checks and compiler options
@@ -8442,6 +8964,7 @@ CONFIG_DEBUG_INFO=y
 # CONFIG_DEBUG_INFO_REDUCED is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
 # CONFIG_DEBUG_INFO_DWARF4 is not set
+# CONFIG_DEBUG_INFO_BTF is not set
 # CONFIG_GDB_SCRIPTS is not set
 # CONFIG_ENABLE_MUST_CHECK is not set
 CONFIG_FRAME_WARN=2048
@@ -8449,14 +8972,18 @@ CONFIG_STRIP_ASM_SYMS=y
 # CONFIG_READABLE_ASM is not set
 # CONFIG_UNUSED_SYMBOLS is not set
 CONFIG_DEBUG_FS=y
-# CONFIG_HEADERS_CHECK is not set
+# CONFIG_HEADERS_INSTALL is not set
+# CONFIG_OPTIMIZE_INLINING is not set
 # CONFIG_DEBUG_SECTION_MISMATCH is not set
 CONFIG_SECTION_MISMATCH_WARN_ONLY=y
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+# end of Compile-time checks and compiler options
+
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
 CONFIG_MAGIC_SYSRQ_SERIAL=y
 CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_MISC=y
 
 #
 # Memory Debugging
@@ -8482,6 +9009,8 @@ CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
 # CONFIG_DEBUG_STACKOVERFLOW is not set
 CONFIG_CC_HAS_KASAN_GENERIC=y
 CONFIG_KASAN_STACK=1
+# end of Memory Debugging
+
 CONFIG_ARCH_HAS_KCOV=y
 CONFIG_CC_HAS_SANCOV_TRACE_PC=y
 # CONFIG_KCOV is not set
@@ -8502,6 +9031,8 @@ CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
 CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
 # CONFIG_WQ_WATCHDOG is not set
+# end of Debug Lockups and Hangs
+
 # CONFIG_PANIC_ON_OOPS is not set
 CONFIG_PANIC_ON_OOPS_VALUE=0
 # CONFIG_SCHED_DEBUG is not set
@@ -8526,12 +9057,14 @@ CONFIG_LOCK_DEBUGGING_SUPPORT=y
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_LOCK_TORTURE_TEST is not set
 CONFIG_WW_MUTEX_SELFTEST=m
+# end of Lock Debugging (spinlocks, mutexes, etc...)
+
 CONFIG_STACKTRACE=y
 # CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
 # CONFIG_DEBUG_KOBJECT is not set
 CONFIG_DEBUG_BUGVERBOSE=y
 CONFIG_DEBUG_LIST=y
-# CONFIG_DEBUG_PI_LIST is not set
+# CONFIG_DEBUG_PLIST is not set
 # CONFIG_DEBUG_SG is not set
 CONFIG_DEBUG_NOTIFIERS=y
 CONFIG_DEBUG_CREDENTIALS=y
@@ -8545,6 +9078,8 @@ CONFIG_RCU_PERF_TEST=m
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
 # CONFIG_RCU_TRACE is not set
 # CONFIG_RCU_EQS_DEBUG is not set
+# end of RCU Debugging
+
 # CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
 # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
@@ -8559,6 +9094,7 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
 CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y
 CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
 CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
+CONFIG_HAVE_C_RECORDMCOUNT=y
 CONFIG_TRACE_CLOCK=y
 CONFIG_RING_BUFFER=y
 CONFIG_EVENT_TRACING=y
@@ -8598,7 +9134,6 @@ CONFIG_FTRACE_MCOUNT_RECORD=y
 # CONFIG_RING_BUFFER_STARTUP_TEST is not set
 CONFIG_PREEMPTIRQ_DELAY_TEST=m
 # CONFIG_TRACE_EVAL_MAP_FILE is not set
-CONFIG_TRACING_EVENTS_GPIO=y
 CONFIG_RUNTIME_TESTING_MENU=y
 CONFIG_LKDTM=m
 # CONFIG_TEST_LIST_SORT is not set
@@ -8606,12 +9141,14 @@ CONFIG_LKDTM=m
 # CONFIG_KPROBES_SANITY_TEST is not set
 # CONFIG_BACKTRACE_SELF_TEST is not set
 # CONFIG_RBTREE_TEST is not set
+# CONFIG_REED_SOLOMON_TEST is not set
 # CONFIG_INTERVAL_TREE_TEST is not set
 # CONFIG_PERCPU_TEST is not set
 # CONFIG_ATOMIC64_SELFTEST is not set
 CONFIG_ASYNC_RAID6_TEST=m
 # CONFIG_TEST_HEXDUMP is not set
 CONFIG_TEST_STRING_HELPERS=m
+# CONFIG_TEST_STRSCPY is not set
 CONFIG_TEST_KSTRTOX=m
 CONFIG_TEST_PRINTF=m
 CONFIG_TEST_BITMAP=m
@@ -8627,6 +9164,7 @@ CONFIG_TEST_PARMAN=m
 # CONFIG_TEST_VMALLOC is not set
 # CONFIG_TEST_USER_COPY is not set
 # CONFIG_TEST_BPF is not set
+# CONFIG_TEST_BLACKHOLE_DEV is not set
 # CONFIG_FIND_BIT_BENCHMARK is not set
 # CONFIG_TEST_FIRMWARE is not set
 # CONFIG_TEST_SYSCTL is not set
@@ -8636,6 +9174,7 @@ CONFIG_TEST_STATIC_KEYS=m
 # CONFIG_TEST_MEMCAT_P is not set
 # CONFIG_TEST_OBJAGG is not set
 # CONFIG_TEST_STACKINIT is not set
+# CONFIG_TEST_MEMINIT is not set
 # CONFIG_MEMTEST is not set
 CONFIG_BUG_ON_DATA_CORRUPTION=y
 # CONFIG_SAMPLES is not set
@@ -8660,8 +9199,10 @@ CONFIG_PRINT_STACK_DEPTH=64
 CONFIG_XMON=y
 # CONFIG_XMON_DEFAULT is not set
 CONFIG_XMON_DISASSEMBLY=y
+CONFIG_XMON_DEFAULT_RO_MODE=y
 CONFIG_DEBUGGER=y
 CONFIG_BOOTX_TEXT=y
 # CONFIG_PPC_EARLY_DEBUG is not set
 # CONFIG_PPC_PTDUMP is not set
 # CONFIG_PPC_FAST_ENDIAN_SWITCH is not set
+# end of Kernel hacking
diff --git a/srcpkgs/linux5.1/files/x86_64-dotconfig b/srcpkgs/linux5.3/files/x86_64-dotconfig
similarity index 92%
rename from srcpkgs/linux5.1/files/x86_64-dotconfig
rename to srcpkgs/linux5.3/files/x86_64-dotconfig
index c668bd92087..ec0f9b76069 100644
--- a/srcpkgs/linux5.1/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.3/files/x86_64-dotconfig
@@ -1,14 +1,15 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 5.1.18 Kernel Configuration
+# Linux/x86_64 5.3.0 Kernel Configuration
 #
 
 #
-# Compiler: gcc (GCC) 9.1.0
+# Compiler: gcc (GCC) 9.2.0
 #
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=90100
+CONFIG_GCC_VERSION=90200
 CONFIG_CLANG_VERSION=0
+CONFIG_CC_CAN_LINK=y
 CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y
 CONFIG_IRQ_WORK=y
@@ -20,6 +21,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
 #
 CONFIG_INIT_ENV_ARG_LIMIT=32
 # CONFIG_COMPILE_TEST is not set
+# CONFIG_HEADER_TEST is not set
 CONFIG_LOCALVERSION="_1"
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_BUILD_SALT=""
@@ -66,6 +68,8 @@ CONFIG_GENERIC_IRQ_RESERVATION_MODE=y
 CONFIG_IRQ_FORCED_THREADING=y
 CONFIG_SPARSE_IRQ=y
 # CONFIG_GENERIC_IRQ_DEBUGFS is not set
+# end of IRQ subsystem
+
 CONFIG_CLOCKSOURCE_WATCHDOG=y
 CONFIG_ARCH_CLOCKSOURCE_DATA=y
 CONFIG_ARCH_CLOCKSOURCE_INIT=y
@@ -86,10 +90,13 @@ CONFIG_NO_HZ_IDLE=y
 # CONFIG_NO_HZ_FULL is not set
 # CONFIG_NO_HZ is not set
 CONFIG_HIGH_RES_TIMERS=y
+# end of Timers subsystem
+
 # CONFIG_PREEMPT_NONE is not set
 # CONFIG_PREEMPT_VOLUNTARY is not set
 CONFIG_PREEMPT=y
 CONFIG_PREEMPT_COUNT=y
+CONFIG_PREEMPTION=y
 
 #
 # CPU/Task time and stats accounting
@@ -104,7 +111,10 @@ CONFIG_TASKSTATS=y
 CONFIG_TASK_DELAY_ACCT=y
 CONFIG_TASK_XACCT=y
 CONFIG_TASK_IO_ACCOUNTING=y
-# CONFIG_PSI is not set
+CONFIG_PSI=y
+CONFIG_PSI_DEFAULT_DISABLED=y
+# end of CPU/Task time and stats accounting
+
 CONFIG_CPU_ISOLATION=y
 
 #
@@ -117,13 +127,22 @@ CONFIG_TREE_SRCU=y
 CONFIG_TASKS_RCU=y
 CONFIG_RCU_STALL_COMMON=y
 CONFIG_RCU_NEED_SEGCBLIST=y
-CONFIG_BUILD_BIN2C=y
+# end of RCU Subsystem
+
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
+CONFIG_IKHEADERS=m
 CONFIG_LOG_BUF_SHIFT=19
 CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
 CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
+
+#
+# Scheduler features
+#
+# CONFIG_UCLAMP_TASK is not set
+# end of Scheduler features
+
 CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
 CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
 CONFIG_ARCH_SUPPORTS_INT128=y
@@ -136,7 +155,6 @@ CONFIG_MEMCG_SWAP=y
 CONFIG_MEMCG_SWAP_ENABLED=y
 CONFIG_MEMCG_KMEM=y
 CONFIG_BLK_CGROUP=y
-# CONFIG_DEBUG_BLK_CGROUP is not set
 CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
@@ -175,7 +193,6 @@ CONFIG_RD_LZ4=y
 CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
-CONFIG_ANON_INODES=y
 CONFIG_HAVE_UID16=y
 CONFIG_SYSCTL_EXCEPTION_TRACE=y
 CONFIG_HAVE_PCSPKR_PLATFORM=y
@@ -224,6 +241,8 @@ CONFIG_HAVE_PERF_EVENTS=y
 #
 CONFIG_PERF_EVENTS=y
 # CONFIG_DEBUG_PERF_USE_VMALLOC is not set
+# end of Kernel Performance Events And Counters
+
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_SLUB_DEBUG=y
 # CONFIG_SLUB_MEMCG_SYSFS_ON is not set
@@ -234,10 +253,13 @@ CONFIG_SLUB=y
 CONFIG_SLAB_MERGE_DEFAULT=y
 CONFIG_SLAB_FREELIST_RANDOM=y
 CONFIG_SLAB_FREELIST_HARDENED=y
+CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
 CONFIG_SLUB_CPU_PARTIAL=y
 CONFIG_SYSTEM_DATA_VERIFICATION=y
 CONFIG_PROFILING=y
 CONFIG_TRACEPOINTS=y
+# end of General setup
+
 CONFIG_64BIT=y
 CONFIG_X86_64=y
 CONFIG_X86=y
@@ -254,9 +276,7 @@ CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
-CONFIG_GENERIC_HWEIGHT=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_ARCH_HAS_CPU_RELAX=y
 CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
@@ -266,11 +286,9 @@ CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
 CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
 CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
 CONFIG_ZONE_DMA32=y
 CONFIG_AUDIT_ARCH=y
-CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 CONFIG_HAVE_INTEL_TXT=y
 CONFIG_X86_64_SMP=y
@@ -302,6 +320,7 @@ CONFIG_PARAVIRT=y
 CONFIG_PARAVIRT_XXL=y
 # CONFIG_PARAVIRT_DEBUG is not set
 # CONFIG_PARAVIRT_SPINLOCKS is not set
+CONFIG_X86_HV_CALLBACK_VECTOR=y
 CONFIG_XEN=y
 CONFIG_XEN_PV=y
 CONFIG_XEN_PV_SMP=y
@@ -318,6 +337,7 @@ CONFIG_PVH=y
 CONFIG_PARAVIRT_TIME_ACCOUNTING=y
 CONFIG_PARAVIRT_CLOCK=y
 # CONFIG_JAILHOUSE_GUEST is not set
+# CONFIG_ACRN_GUEST is not set
 # CONFIG_MK8 is not set
 # CONFIG_MPSC is not set
 # CONFIG_MCORE2 is not set
@@ -335,6 +355,7 @@ CONFIG_CPU_SUP_INTEL=y
 CONFIG_CPU_SUP_AMD=y
 CONFIG_CPU_SUP_HYGON=y
 CONFIG_CPU_SUP_CENTAUR=y
+CONFIG_CPU_SUP_ZHAOXIN=y
 CONFIG_HPET_TIMER=y
 CONFIG_HPET_EMULATE_RTC=y
 CONFIG_DMI=y
@@ -345,7 +366,7 @@ CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y
 CONFIG_NR_CPUS_RANGE_BEGIN=2
 CONFIG_NR_CPUS_RANGE_END=512
 CONFIG_NR_CPUS_DEFAULT=64
-CONFIG_NR_CPUS=64
+CONFIG_NR_CPUS=256
 CONFIG_SCHED_SMT=y
 CONFIG_SCHED_MC=y
 CONFIG_SCHED_MC_PRIO=y
@@ -367,6 +388,8 @@ CONFIG_PERF_EVENTS_INTEL_UNCORE=y
 CONFIG_PERF_EVENTS_INTEL_RAPL=m
 CONFIG_PERF_EVENTS_INTEL_CSTATE=m
 CONFIG_PERF_EVENTS_AMD_POWER=m
+# end of Performance monitoring
+
 # CONFIG_X86_16BIT is not set
 CONFIG_X86_VSYSCALL_EMULATION=y
 CONFIG_I8K=m
@@ -436,10 +459,13 @@ CONFIG_HOTPLUG_CPU=y
 # CONFIG_DEBUG_HOTPLUG_CPU0 is not set
 # CONFIG_COMPAT_VDSO is not set
 # CONFIG_LEGACY_VSYSCALL_EMULATE is not set
+# CONFIG_LEGACY_VSYSCALL_XONLY is not set
 CONFIG_LEGACY_VSYSCALL_NONE=y
 # CONFIG_CMDLINE_BOOL is not set
 CONFIG_MODIFY_LDT_SYSCALL=y
 CONFIG_HAVE_LIVEPATCH=y
+# end of Processor type and features
+
 CONFIG_ARCH_HAS_ADD_PAGES=y
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
@@ -512,6 +538,7 @@ CONFIG_ACPI_BGRT=y
 # CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set
 CONFIG_ACPI_NFIT=m
 # CONFIG_NFIT_SECURITY_DEBUG is not set
+CONFIG_ACPI_HMAT=y
 CONFIG_HAVE_ACPI_APEI=y
 CONFIG_HAVE_ACPI_APEI_NMI=y
 CONFIG_ACPI_APEI=y
@@ -565,6 +592,7 @@ CONFIG_X86_P4_CLOCKMOD=m
 # shared options
 #
 CONFIG_X86_SPEEDSTEP_LIB=m
+# end of CPU Frequency scaling
 
 #
 # CPU Idle
@@ -573,7 +601,10 @@ CONFIG_CPU_IDLE=y
 CONFIG_CPU_IDLE_GOV_LADDER=y
 CONFIG_CPU_IDLE_GOV_MENU=y
 CONFIG_CPU_IDLE_GOV_TEO=y
+# end of CPU Idle
+
 CONFIG_INTEL_IDLE=y
+# end of Power management and ACPI options
 
 #
 # Bus options (PCI etc.)
@@ -587,6 +618,7 @@ CONFIG_MMCONF_FAM10H=y
 CONFIG_ISA_DMA_API=y
 CONFIG_AMD_NB=y
 # CONFIG_X86_SYSFB is not set
+# end of Bus options (PCI etc.)
 
 #
 # Binary Emulations
@@ -597,8 +629,9 @@ CONFIG_COMPAT_32=y
 CONFIG_COMPAT=y
 CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
 CONFIG_SYSVIPC_COMPAT=y
+# end of Binary Emulations
+
 CONFIG_X86_DEV_DMA_OPS=y
-CONFIG_HAVE_GENERIC_GUP=y
 
 #
 # Firmware Drivers
@@ -630,6 +663,8 @@ CONFIG_EFI_CAPSULE_LOADER=m
 CONFIG_EFI_TEST=m
 CONFIG_APPLE_PROPERTIES=y
 CONFIG_RESET_ATTACK_MITIGATION=y
+# end of EFI (Extensible Firmware Interface) Support
+
 CONFIG_UEFI_CPER=y
 CONFIG_UEFI_CPER_X86=y
 CONFIG_EFI_DEV_PATH_PARSER=y
@@ -638,6 +673,9 @@ CONFIG_EFI_EARLYCON=y
 #
 # Tegra firmware driver
 #
+# end of Tegra firmware driver
+# end of Firmware Drivers
+
 CONFIG_HAVE_KVM=y
 CONFIG_HAVE_KVM_IRQCHIP=y
 CONFIG_HAVE_KVM_IRQFD=y
@@ -651,6 +689,7 @@ CONFIG_KVM_VFIO=y
 CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
 CONFIG_KVM_COMPAT=y
 CONFIG_HAVE_KVM_IRQ_BYPASS=y
+CONFIG_HAVE_KVM_NO_POLL=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_KVM=m
 CONFIG_KVM_INTEL=m
@@ -694,6 +733,7 @@ CONFIG_HAVE_DMA_CONTIGUOUS=y
 CONFIG_GENERIC_SMP_IDLE_THREAD=y
 CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
 CONFIG_ARCH_HAS_SET_MEMORY=y
+CONFIG_ARCH_HAS_SET_DIRECT_MAP=y
 CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y
 CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y
 CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
@@ -710,7 +750,6 @@ CONFIG_HAVE_PERF_USER_STACK_DUMP=y
 CONFIG_HAVE_ARCH_JUMP_LABEL=y
 CONFIG_HAVE_ARCH_JUMP_LABEL_RELATIVE=y
 CONFIG_HAVE_RCU_TABLE_FREE=y
-CONFIG_HAVE_RCU_TABLE_INVALIDATE=y
 CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
 CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
 CONFIG_HAVE_CMPXCHG_LOCAL=y
@@ -732,6 +771,7 @@ CONFIG_HAVE_MOVE_PMD=y
 CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
 CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD=y
 CONFIG_HAVE_ARCH_HUGE_VMAP=y
+CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
 CONFIG_HAVE_ARCH_SOFT_DIRTY=y
 CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
 CONFIG_MODULES_USE_ELF_RELA=y
@@ -760,15 +800,28 @@ CONFIG_ARCH_HAS_REFCOUNT=y
 CONFIG_REFCOUNT_FULL=y
 CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y
 CONFIG_ARCH_USE_MEMREMAP_PROT=y
+# CONFIG_LOCK_EVENT_COUNTS is not set
 
 #
 # GCOV-based kernel profiling
 #
 # CONFIG_GCOV_KERNEL is not set
 CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
+# end of GCOV-based kernel profiling
+
 CONFIG_PLUGIN_HOSTCC="g++"
 CONFIG_HAVE_GCC_PLUGINS=y
-# CONFIG_GCC_PLUGINS is not set
+CONFIG_GCC_PLUGINS=y
+
+#
+# GCC plugins
+#
+# CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set
+# CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
+# CONFIG_GCC_PLUGIN_RANDSTRUCT is not set
+# end of GCC plugins
+# end of General architecture-dependent options
+
 CONFIG_RT_MUTEXES=y
 CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
@@ -821,6 +874,8 @@ CONFIG_LDM_PARTITION=y
 CONFIG_EFI_PARTITION=y
 # CONFIG_SYSV68_PARTITION is not set
 CONFIG_CMDLINE_PARTITION=y
+# end of Partition Types
+
 CONFIG_BLOCK_COMPAT=y
 CONFIG_BLK_MQ_PCI=y
 CONFIG_BLK_MQ_VIRTIO=y
@@ -834,6 +889,9 @@ CONFIG_MQ_IOSCHED_DEADLINE=y
 CONFIG_MQ_IOSCHED_KYBER=y
 CONFIG_IOSCHED_BFQ=y
 CONFIG_BFQ_GROUP_IOSCHED=y
+# CONFIG_BFQ_CGROUP_DEBUG is not set
+# end of IO Schedulers
+
 CONFIG_PREEMPT_NOTIFIERS=y
 CONFIG_PADATA=y
 CONFIG_ASN1=y
@@ -860,6 +918,7 @@ CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 CONFIG_BINFMT_SCRIPT=y
 CONFIG_BINFMT_MISC=m
 CONFIG_COREDUMP=y
+# end of Executable file formats
 
 #
 # Memory Management options
@@ -873,7 +932,7 @@ CONFIG_SPARSEMEM_EXTREME=y
 CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
 CONFIG_SPARSEMEM_VMEMMAP=y
 CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
-CONFIG_ARCH_DISCARD_MEMBLOCK=y
+CONFIG_HAVE_FAST_GUP=y
 CONFIG_MEMORY_ISOLATION=y
 CONFIG_HAVE_BOOTMEM_INFO_NODE=y
 CONFIG_MEMORY_HOTPLUG=y
@@ -885,6 +944,7 @@ CONFIG_MEMORY_BALLOON=y
 CONFIG_BALLOON_COMPACTION=y
 CONFIG_COMPACTION=y
 CONFIG_MIGRATION=y
+CONFIG_CONTIG_ALLOC=y
 CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_BOUNCE=y
 CONFIG_VIRT_TO_BUS=y
@@ -914,19 +974,19 @@ CONFIG_PGTABLE_MAPPING=y
 CONFIG_GENERIC_EARLY_IOREMAP=y
 # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
 CONFIG_IDLE_PAGE_TRACKING=y
-CONFIG_ARCH_HAS_ZONE_DEVICE=y
+CONFIG_ARCH_HAS_PTE_DEVMAP=y
 CONFIG_ZONE_DEVICE=y
-CONFIG_ARCH_HAS_HMM=y
 CONFIG_DEV_PAGEMAP_OPS=y
 # CONFIG_HMM_MIRROR is not set
 # CONFIG_DEVICE_PRIVATE is not set
-# CONFIG_DEVICE_PUBLIC is not set
 CONFIG_FRAME_VECTOR=y
 CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
 CONFIG_ARCH_HAS_PKEYS=y
 # CONFIG_PERCPU_STATS is not set
 # CONFIG_GUP_BENCHMARK is not set
 CONFIG_ARCH_HAS_PTE_SPECIAL=y
+# end of Memory Management options
+
 CONFIG_NET=y
 CONFIG_COMPAT_NETLINK_MESSAGES=y
 CONFIG_NET_INGRESS=y
@@ -986,9 +1046,6 @@ CONFIG_INET_ESP_OFFLOAD=m
 CONFIG_INET_IPCOMP=m
 CONFIG_INET_XFRM_TUNNEL=m
 CONFIG_INET_TUNNEL=m
-CONFIG_INET_XFRM_MODE_TRANSPORT=m
-CONFIG_INET_XFRM_MODE_TUNNEL=m
-CONFIG_INET_XFRM_MODE_BEET=m
 CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 CONFIG_INET_UDP_DIAG=y
@@ -1026,10 +1083,6 @@ CONFIG_IPV6_MIP6=m
 CONFIG_IPV6_ILA=m
 CONFIG_INET6_XFRM_TUNNEL=m
 CONFIG_INET6_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-CONFIG_INET6_XFRM_MODE_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_BEET=m
-CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
 CONFIG_IPV6_VTI=m
 CONFIG_IPV6_SIT=m
 CONFIG_IPV6_SIT_6RD=y
@@ -1094,7 +1147,6 @@ CONFIG_NF_CT_NETLINK_TIMEOUT=m
 CONFIG_NF_CT_NETLINK_HELPER=m
 CONFIG_NETFILTER_NETLINK_GLUE_CT=y
 CONFIG_NF_NAT=m
-CONFIG_NF_NAT_NEEDED=y
 CONFIG_NF_NAT_AMANDA=m
 CONFIG_NF_NAT_FTP=m
 CONFIG_NF_NAT_IRC=m
@@ -1131,6 +1183,7 @@ CONFIG_NFT_XFRM=m
 CONFIG_NFT_SOCKET=m
 CONFIG_NFT_OSF=m
 CONFIG_NFT_TPROXY=m
+# CONFIG_NFT_SYNPROXY is not set
 CONFIG_NF_DUP_NETDEV=m
 CONFIG_NFT_DUP_NETDEV=m
 CONFIG_NFT_FWD_NETDEV=m
@@ -1169,6 +1222,7 @@ CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
 CONFIG_NETFILTER_XT_TARGET_RATEEST=m
 CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
+CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m
 CONFIG_NETFILTER_XT_TARGET_TEE=m
 CONFIG_NETFILTER_XT_TARGET_TPROXY=m
 CONFIG_NETFILTER_XT_TARGET_TRACE=m
@@ -1225,6 +1279,8 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m
 CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
 CONFIG_NETFILTER_XT_MATCH_TIME=m
 CONFIG_NETFILTER_XT_MATCH_U32=m
+# end of Core Netfilter Configuration
+
 CONFIG_IP_SET=m
 CONFIG_IP_SET_MAX=256
 CONFIG_IP_SET_BITMAP_IP=m
@@ -1299,7 +1355,6 @@ CONFIG_NF_DEFRAG_IPV4=m
 CONFIG_NF_SOCKET_IPV4=m
 CONFIG_NF_TPROXY_IPV4=m
 CONFIG_NF_TABLES_IPV4=y
-CONFIG_NFT_CHAIN_ROUTE_IPV4=m
 CONFIG_NFT_REJECT_IPV4=m
 CONFIG_NFT_DUP_IPV4=m
 CONFIG_NFT_FIB_IPV4=m
@@ -1333,6 +1388,7 @@ CONFIG_IP_NF_RAW=m
 CONFIG_IP_NF_ARPTABLES=m
 CONFIG_IP_NF_ARPFILTER=m
 CONFIG_IP_NF_ARP_MANGLE=m
+# end of IP: Netfilter Configuration
 
 #
 # IPv6: Netfilter Configuration
@@ -1340,7 +1396,6 @@ CONFIG_IP_NF_ARP_MANGLE=m
 CONFIG_NF_SOCKET_IPV6=m
 CONFIG_NF_TPROXY_IPV6=m
 CONFIG_NF_TABLES_IPV6=y
-CONFIG_NFT_CHAIN_ROUTE_IPV6=m
 CONFIG_NFT_REJECT_IPV6=m
 CONFIG_NFT_DUP_IPV6=m
 CONFIG_NFT_FIB_IPV6=m
@@ -1369,10 +1424,14 @@ CONFIG_IP6_NF_RAW=m
 CONFIG_IP6_NF_NAT=m
 CONFIG_IP6_NF_TARGET_MASQUERADE=m
 CONFIG_IP6_NF_TARGET_NPT=m
+# end of IPv6: Netfilter Configuration
+
 CONFIG_NF_DEFRAG_IPV6=m
-CONFIG_NF_TABLES_BRIDGE=y
+CONFIG_NF_TABLES_BRIDGE=m
+# CONFIG_NFT_BRIDGE_META is not set
 CONFIG_NFT_BRIDGE_REJECT=m
 CONFIG_NF_LOG_BRIDGE=m
+# CONFIG_NF_CONNTRACK_BRIDGE is not set
 CONFIG_BRIDGE_NF_EBTABLES=m
 CONFIG_BRIDGE_EBT_BROUTE=m
 CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -1405,11 +1464,14 @@ CONFIG_INET_DCCP_DIAG=m
 CONFIG_IP_DCCP_CCID3=y
 # CONFIG_IP_DCCP_CCID3_DEBUG is not set
 CONFIG_IP_DCCP_TFRC_LIB=y
+# end of DCCP CCIDs Configuration
 
 #
 # DCCP Kernel Hacking
 #
 # CONFIG_IP_DCCP_DEBUG is not set
+# end of DCCP Kernel Hacking
+
 CONFIG_IP_SCTP=m
 # CONFIG_SCTP_DBG_OBJCNT is not set
 # CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5 is not set
@@ -1446,16 +1508,21 @@ CONFIG_BRIDGE_IGMP_SNOOPING=y
 CONFIG_BRIDGE_VLAN_FILTERING=y
 CONFIG_HAVE_NET_DSA=y
 CONFIG_NET_DSA=m
-CONFIG_NET_DSA_LEGACY=y
-CONFIG_NET_DSA_TAG_BRCM=y
-CONFIG_NET_DSA_TAG_BRCM_PREPEND=y
-CONFIG_NET_DSA_TAG_DSA=y
-CONFIG_NET_DSA_TAG_EDSA=y
-CONFIG_NET_DSA_TAG_GSWIP=y
-CONFIG_NET_DSA_TAG_KSZ=y
-CONFIG_NET_DSA_TAG_KSZ9477=y
-CONFIG_NET_DSA_TAG_TRAILER=y
-CONFIG_NET_DSA_TAG_QCA=y
+CONFIG_NET_DSA_TAG_8021Q=m
+CONFIG_NET_DSA_TAG_BRCM_COMMON=m
+CONFIG_NET_DSA_TAG_BRCM=m
+CONFIG_NET_DSA_TAG_BRCM_PREPEND=m
+CONFIG_NET_DSA_TAG_GSWIP=m
+CONFIG_NET_DSA_TAG_DSA=m
+CONFIG_NET_DSA_TAG_EDSA=m
+CONFIG_NET_DSA_TAG_MTK=m
+CONFIG_NET_DSA_TAG_KSZ_COMMON=m
+CONFIG_NET_DSA_TAG_KSZ=m
+CONFIG_NET_DSA_TAG_KSZ9477=m
+CONFIG_NET_DSA_TAG_QCA=m
+CONFIG_NET_DSA_TAG_LAN9303=m
+CONFIG_NET_DSA_TAG_SJA1105=m
+CONFIG_NET_DSA_TAG_TRAILER=m
 CONFIG_VLAN_8021Q=m
 CONFIG_VLAN_8021Q_GVRP=y
 CONFIG_VLAN_8021Q_MVRP=y
@@ -1542,16 +1609,18 @@ CONFIG_NET_ACT_PEDIT=m
 CONFIG_NET_ACT_SIMP=m
 CONFIG_NET_ACT_SKBEDIT=m
 CONFIG_NET_ACT_CSUM=m
+# CONFIG_NET_ACT_MPLS is not set
 CONFIG_NET_ACT_VLAN=m
 CONFIG_NET_ACT_BPF=m
 CONFIG_NET_ACT_CONNMARK=m
+# CONFIG_NET_ACT_CTINFO is not set
 CONFIG_NET_ACT_SKBMOD=m
 CONFIG_NET_ACT_IFE=m
 CONFIG_NET_ACT_TUNNEL_KEY=m
+# CONFIG_NET_ACT_CT is not set
 CONFIG_NET_IFE_SKBMARK=m
 CONFIG_NET_IFE_SKBPRIO=m
 CONFIG_NET_IFE_SKBTCINDEX=m
-CONFIG_NET_CLS_IND=y
 CONFIG_NET_SCH_FIFO=y
 CONFIG_DCB=y
 CONFIG_DNS_RESOLVER=y
@@ -1563,6 +1632,7 @@ CONFIG_BATMAN_ADV_NC=y
 CONFIG_BATMAN_ADV_MCAST=y
 CONFIG_BATMAN_ADV_DEBUGFS=y
 # CONFIG_BATMAN_ADV_DEBUG is not set
+CONFIG_BATMAN_ADV_SYSFS=y
 # CONFIG_BATMAN_ADV_TRACING is not set
 CONFIG_OPENVSWITCH=m
 CONFIG_OPENVSWITCH_GRE=m
@@ -1600,6 +1670,9 @@ CONFIG_NET_FLOW_LIMIT=y
 #
 # CONFIG_NET_PKTGEN is not set
 # CONFIG_NET_DROP_MONITOR is not set
+# end of Network testing
+# end of Networking options
+
 # CONFIG_HAMRADIO is not set
 CONFIG_CAN=m
 CONFIG_CAN_RAW=m
@@ -1632,6 +1705,7 @@ CONFIG_CAN_SOFTING=m
 #
 # CONFIG_CAN_HI311X is not set
 CONFIG_CAN_MCP251X=m
+# end of CAN SPI interfaces
 
 #
 # CAN USB interfaces
@@ -1644,7 +1718,11 @@ CONFIG_CAN_KVASER_USB=m
 # CONFIG_CAN_MCBA_USB is not set
 CONFIG_CAN_PEAK_USB=m
 CONFIG_CAN_UCAN=m
+# end of CAN USB interfaces
+
 CONFIG_CAN_DEBUG_DEVICES=y
+# end of CAN Device Drivers
+
 CONFIG_BT=m
 CONFIG_BT_BREDR=y
 CONFIG_BT_RFCOMM=m
@@ -1669,6 +1747,7 @@ CONFIG_BT_QCA=m
 CONFIG_BT_HCIBTUSB=m
 CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
 CONFIG_BT_HCIBTUSB_BCM=y
+# CONFIG_BT_HCIBTUSB_MTK is not set
 CONFIG_BT_HCIBTUSB_RTL=y
 CONFIG_BT_HCIBTSDIO=m
 CONFIG_BT_HCIUART=m
@@ -1692,8 +1771,11 @@ CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
 CONFIG_BT_ATH3K=m
 CONFIG_BT_WILINK=m
+CONFIG_BT_MTKSDIO=m
 CONFIG_BT_MTKUART=m
 CONFIG_BT_HCIRSI=m
+# end of Bluetooth device drivers
+
 CONFIG_AF_RXRPC=m
 # CONFIG_AF_RXRPC_IPV6 is not set
 # CONFIG_AF_RXRPC_INJECT_LOSS is not set
@@ -1790,6 +1872,8 @@ CONFIG_NFC_NXP_NCI_I2C=m
 CONFIG_NFC_S3FWRN5=m
 CONFIG_NFC_S3FWRN5_I2C=m
 CONFIG_NFC_ST95HF=m
+# end of Near Field Communication (NFC) devices
+
 CONFIG_PSAMPLE=m
 CONFIG_NET_IFE=m
 CONFIG_LWTUNNEL=y
@@ -1856,6 +1940,8 @@ CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
 #
 # Cadence PCIe controllers support
 #
+# end of Cadence PCIe controllers support
+
 CONFIG_VMD=m
 
 #
@@ -1865,16 +1951,21 @@ CONFIG_PCIE_DW=y
 CONFIG_PCIE_DW_HOST=y
 # CONFIG_PCIE_DW_PLAT_HOST is not set
 CONFIG_PCI_MESON=y
+# end of DesignWare PCI Core Support
+# end of PCI controller drivers
 
 #
 # PCI Endpoint
 #
 # CONFIG_PCI_ENDPOINT is not set
+# end of PCI Endpoint
 
 #
 # PCI switch controller drivers
 #
 CONFIG_PCI_SW_SWITCHTEC=m
+# end of PCI switch controller drivers
+
 CONFIG_PCCARD=m
 # CONFIG_PCMCIA is not set
 CONFIG_CARDBUS=y
@@ -1906,6 +1997,7 @@ CONFIG_RAPIDIO_CPS_XX=m
 CONFIG_RAPIDIO_TSI568=m
 CONFIG_RAPIDIO_CPS_GEN2=m
 CONFIG_RAPIDIO_RXS_GEN3=m
+# end of RapidIO Switch drivers
 
 #
 # Generic Driver Options
@@ -1920,15 +2012,20 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 # Firmware loader
 #
 CONFIG_FW_LOADER=y
+CONFIG_FW_LOADER_PAGED_BUF=y
 CONFIG_EXTRA_FIRMWARE=""
 CONFIG_FW_LOADER_USER_HELPER=y
 # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
+# CONFIG_FW_LOADER_COMPRESS is not set
+# end of Firmware loader
+
 CONFIG_WANT_DEV_COREDUMP=y
 CONFIG_ALLOW_DEV_COREDUMP=y
 CONFIG_DEV_COREDUMP=y
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
 # CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
+CONFIG_HMEM_REPORTING=y
 CONFIG_TEST_ASYNC_DRIVER_PROBE=m
 CONFIG_SYS_HYPERVISOR=y
 CONFIG_GENERIC_CPU_AUTOPROBE=y
@@ -1942,10 +2039,13 @@ CONFIG_REGMAP_MMIO=y
 CONFIG_REGMAP_IRQ=y
 CONFIG_DMA_SHARED_BUFFER=y
 # CONFIG_DMA_FENCE_TRACE is not set
+# end of Generic Driver Options
 
 #
 # Bus devices
 #
+# end of Bus devices
+
 CONFIG_CONNECTOR=y
 CONFIG_PROC_EVENTS=y
 CONFIG_GNSS=m
@@ -1965,6 +2065,7 @@ CONFIG_MTD_REDBOOT_PARTS=m
 CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
 # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
 # CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
+# end of Partition parsers
 
 #
 # User Modules And Translation Layers
@@ -1995,6 +2096,7 @@ CONFIG_MTD_CFI_I2=y
 # CONFIG_MTD_RAM is not set
 # CONFIG_MTD_ROM is not set
 # CONFIG_MTD_ABSENT is not set
+# end of RAM/ROM/Flash chip drivers
 
 #
 # Mapping drivers for chip access
@@ -2002,6 +2104,7 @@ CONFIG_MTD_CFI_I2=y
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
 # CONFIG_MTD_INTEL_VR_NOR is not set
 # CONFIG_MTD_PLATRAM is not set
+# end of Mapping drivers for chip access
 
 #
 # Self-contained MTD device drivers
@@ -2021,17 +2124,46 @@ CONFIG_MTD_PHRAM=m
 CONFIG_MTD_DOCG3=m
 CONFIG_BCH_CONST_M=14
 CONFIG_BCH_CONST_T=4
+# end of Self-contained MTD device drivers
+
 CONFIG_MTD_NAND_CORE=m
 # CONFIG_MTD_ONENAND is not set
-# CONFIG_MTD_NAND is not set
+CONFIG_MTD_NAND_ECC_SW_HAMMING=m
+# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
+CONFIG_MTD_RAW_NAND=m
+CONFIG_MTD_NAND_ECC_SW_BCH=y
+
+#
+# Raw/parallel NAND flash controllers
+#
+CONFIG_MTD_NAND_DENALI=m
+CONFIG_MTD_NAND_DENALI_PCI=m
+CONFIG_MTD_NAND_CAFE=m
+CONFIG_MTD_NAND_GPIO=m
+CONFIG_MTD_NAND_PLATFORM=m
+
+#
+# Misc
+#
+CONFIG_MTD_SM_COMMON=m
+CONFIG_MTD_NAND_NANDSIM=m
+CONFIG_MTD_NAND_RICOH=m
+CONFIG_MTD_NAND_DISKONCHIP=m
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED=y
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0x0
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_HIGH=y
+CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE=y
 CONFIG_MTD_SPI_NAND=m
 
 #
 # LPDDR & LPDDR2 PCM memory drivers
 #
 # CONFIG_MTD_LPDDR is not set
+# end of LPDDR & LPDDR2 PCM memory drivers
+
 # CONFIG_MTD_SPI_NOR is not set
 # CONFIG_MTD_UBI is not set
+# CONFIG_MTD_HYPERBUS is not set
 # CONFIG_OF is not set
 CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
 CONFIG_PARPORT=m
@@ -2097,6 +2229,7 @@ CONFIG_NVME_TARGET_RDMA=m
 CONFIG_NVME_TARGET_FC=m
 CONFIG_NVME_TARGET_FCLOOP=m
 CONFIG_NVME_TARGET_TCP=m
+# end of NVME Support
 
 #
 # Misc devices
@@ -2123,10 +2256,10 @@ CONFIG_SENSORS_APDS990X=m
 CONFIG_HMC6352=m
 CONFIG_DS1682=m
 CONFIG_VMWARE_BALLOON=m
-CONFIG_USB_SWITCH_FSA9480=m
 CONFIG_LATTICE_ECP3_CONFIG=m
 CONFIG_SRAM=y
 # CONFIG_PCI_ENDPOINT_TEST is not set
+# CONFIG_XILINX_SDFEC is not set
 CONFIG_MISC_RTSX=m
 CONFIG_PVPANIC=m
 CONFIG_C2PORT=m
@@ -2143,6 +2276,8 @@ CONFIG_EEPROM_93CX6=m
 CONFIG_EEPROM_93XX46=m
 CONFIG_EEPROM_IDT_89HPESX=m
 CONFIG_EEPROM_EE1004=m
+# end of EEPROM support
+
 CONFIG_CB710_CORE=m
 # CONFIG_CB710_DEBUG is not set
 CONFIG_CB710_DEBUG_ASSUMPTIONS=y
@@ -2151,6 +2286,8 @@ CONFIG_CB710_DEBUG_ASSUMPTIONS=y
 # Texas Instruments shared transport line discipline
 #
 CONFIG_TI_ST=m
+# end of Texas Instruments shared transport line discipline
+
 CONFIG_SENSORS_LIS3_I2C=m
 CONFIG_ALTERA_STAPL=m
 CONFIG_INTEL_MEI=m
@@ -2201,6 +2338,8 @@ CONFIG_MIC_COSM=m
 #
 CONFIG_VOP=m
 CONFIG_VHOST_RING=m
+# end of Intel MIC & related support
+
 CONFIG_GENWQE=m
 CONFIG_GENWQE_PLATFORM_ERROR_RECOVERY=0
 CONFIG_ECHO=m
@@ -2208,6 +2347,8 @@ CONFIG_MISC_ALCOR_PCI=m
 CONFIG_MISC_RTSX_PCI=m
 CONFIG_MISC_RTSX_USB=m
 CONFIG_HABANA_AI=m
+# end of Misc devices
+
 CONFIG_HAVE_IDE=y
 # CONFIG_IDE is not set
 
@@ -2226,7 +2367,6 @@ CONFIG_SCSI_PROC_FS=y
 #
 CONFIG_BLK_DEV_SD=m
 CONFIG_CHR_DEV_ST=m
-CONFIG_CHR_DEV_OSST=m
 CONFIG_BLK_DEV_SR=m
 CONFIG_BLK_DEV_SR_VENDOR=y
 CONFIG_CHR_DEV_SG=m
@@ -2247,6 +2387,8 @@ CONFIG_SCSI_SAS_LIBSAS=m
 CONFIG_SCSI_SAS_ATA=y
 CONFIG_SCSI_SAS_HOST_SMP=y
 CONFIG_SCSI_SRP_ATTRS=m
+# end of SCSI Transports
+
 CONFIG_SCSI_LOWLEVEL=y
 CONFIG_ISCSI_TCP=m
 CONFIG_ISCSI_BOOT_SYSFS=m
@@ -2315,6 +2457,7 @@ CONFIG_FCOE_FNIC=m
 CONFIG_SCSI_SNIC=m
 # CONFIG_SCSI_SNIC_DEBUG_FS is not set
 CONFIG_SCSI_DMX3191D=m
+# CONFIG_SCSI_FDOMAIN_PCI is not set
 CONFIG_SCSI_GDTH=m
 CONFIG_SCSI_ISCI=m
 CONFIG_SCSI_IPS=m
@@ -2356,6 +2499,8 @@ CONFIG_SCSI_DH_RDAC=m
 CONFIG_SCSI_DH_HP_SW=m
 CONFIG_SCSI_DH_EMC=m
 CONFIG_SCSI_DH_ALUA=m
+# end of SCSI device support
+
 CONFIG_ATA=m
 CONFIG_ATA_VERBOSE_ERROR=y
 CONFIG_ATA_ACPI=y
@@ -2488,6 +2633,7 @@ CONFIG_DM_MULTIPATH=m
 CONFIG_DM_MULTIPATH_QL=m
 CONFIG_DM_MULTIPATH_ST=m
 CONFIG_DM_DELAY=m
+CONFIG_DM_DUST=m
 CONFIG_DM_UEVENT=y
 CONFIG_DM_FLAKEY=m
 CONFIG_DM_VERITY=m
@@ -2523,6 +2669,8 @@ CONFIG_FIREWIRE_OHCI=m
 CONFIG_FIREWIRE_SBP2=m
 CONFIG_FIREWIRE_NET=m
 CONFIG_FIREWIRE_NOSY=m
+# end of IEEE 1394 (FireWire) support
+
 CONFIG_MACINTOSH_DRIVERS=y
 CONFIG_MAC_EMUMOUSEBTN=m
 CONFIG_NETDEVICES=y
@@ -2626,10 +2774,14 @@ CONFIG_NET_DSA_MICROCHIP_KSZ9477_SPI=m
 CONFIG_NET_DSA_MV88E6XXX=m
 CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y
 CONFIG_NET_DSA_MV88E6XXX_PTP=y
+CONFIG_NET_DSA_SJA1105=m
+# CONFIG_NET_DSA_SJA1105_PTP is not set
 CONFIG_NET_DSA_QCA8K=m
 # CONFIG_NET_DSA_REALTEK_SMI is not set
 # CONFIG_NET_DSA_SMSC_LAN9303_I2C is not set
 # CONFIG_NET_DSA_SMSC_LAN9303_MDIO is not set
+# end of Distributed Switch Architecture drivers
+
 CONFIG_ETHERNET=y
 CONFIG_MDIO=m
 CONFIG_NET_VENDOR_3COM=y
@@ -2734,6 +2886,8 @@ CONFIG_BE2NET_BE3=y
 CONFIG_BE2NET_LANCER=y
 CONFIG_BE2NET_SKYHAWK=y
 CONFIG_NET_VENDOR_EZCHIP=y
+CONFIG_NET_VENDOR_GOOGLE=y
+# CONFIG_GVE is not set
 CONFIG_NET_VENDOR_HP=y
 CONFIG_HP100=m
 CONFIG_NET_VENDOR_HUAWEI=y
@@ -2891,6 +3045,7 @@ CONFIG_SMSC9420=m
 CONFIG_NET_VENDOR_SOCIONEXT=y
 CONFIG_NET_VENDOR_STMICRO=y
 CONFIG_STMMAC_ETH=m
+# CONFIG_STMMAC_SELFTESTS is not set
 CONFIG_STMMAC_PLATFORM=m
 CONFIG_DWMAC_GENERIC=m
 CONFIG_STMMAC_PCI=m
@@ -2905,7 +3060,6 @@ CONFIG_NET_VENDOR_TEHUTI=y
 CONFIG_TEHUTI=m
 CONFIG_NET_VENDOR_TI=y
 # CONFIG_TI_CPSW_PHY_SEL is not set
-CONFIG_TI_CPSW_ALE=m
 CONFIG_TLAN=m
 CONFIG_NET_VENDOR_VIA=y
 CONFIG_VIA_RHINE=m
@@ -2918,6 +3072,9 @@ CONFIG_WIZNET_W5300=m
 # CONFIG_WIZNET_BUS_INDIRECT is not set
 CONFIG_WIZNET_BUS_ANY=y
 CONFIG_WIZNET_W5100_SPI=m
+CONFIG_NET_VENDOR_XILINX=y
+# CONFIG_XILINX_AXI_EMAC is not set
+CONFIG_XILINX_LL_TEMAC=m
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
 CONFIG_NET_SB1000=m
@@ -2965,6 +3122,7 @@ CONFIG_MICROCHIP_PHY=m
 # CONFIG_MICROCHIP_T1_PHY is not set
 CONFIG_MICROSEMI_PHY=m
 CONFIG_NATIONAL_PHY=m
+# CONFIG_NXP_TJA11XX_PHY is not set
 CONFIG_QSEMI_PHY=m
 CONFIG_REALTEK_PHY=m
 CONFIG_RENESAS_PHY=m
@@ -3158,6 +3316,8 @@ CONFIG_IWL3945=m
 # iwl3945 / iwl4965 Debugging Options
 #
 # CONFIG_IWLEGACY_DEBUG is not set
+# end of iwl3945 / iwl4965 Debugging Options
+
 CONFIG_IWLWIFI=m
 CONFIG_IWLWIFI_LEDS=y
 CONFIG_IWLDVM=m
@@ -3171,6 +3331,8 @@ CONFIG_IWLWIFI_PCIE_RTPM=y
 #
 # CONFIG_IWLWIFI_DEBUG is not set
 # CONFIG_IWLWIFI_DEVICE_TRACING is not set
+# end of Debugging Options
+
 CONFIG_WLAN_VENDOR_INTERSIL=y
 CONFIG_HOSTAP=m
 CONFIG_HOSTAP_FIRMWARE=y
@@ -3221,6 +3383,7 @@ CONFIG_MT76x2_COMMON=m
 # CONFIG_MT76x2E is not set
 CONFIG_MT76x2U=m
 CONFIG_MT7603E=m
+CONFIG_MT7615E=m
 CONFIG_WLAN_VENDOR_RALINK=y
 CONFIG_RT2X00=m
 CONFIG_RT2400PCI=m
@@ -3273,6 +3436,13 @@ CONFIG_RTL8723_COMMON=m
 CONFIG_RTLBTCOEXIST=m
 CONFIG_RTL8XXXU=m
 # CONFIG_RTL8XXXU_UNTESTED is not set
+CONFIG_RTW88=m
+CONFIG_RTW88_CORE=m
+CONFIG_RTW88_PCI=m
+CONFIG_RTW88_8822BE=y
+CONFIG_RTW88_8822CE=y
+# CONFIG_RTW88_DEBUG is not set
+# CONFIG_RTW88_DEBUGFS is not set
 CONFIG_WLAN_VENDOR_RSI=y
 CONFIG_RSI_91X=m
 CONFIG_RSI_DEBUGFS=y
@@ -3309,6 +3479,8 @@ CONFIG_VIRT_WIFI=m
 CONFIG_WIMAX_I2400M=m
 CONFIG_WIMAX_I2400M_USB=m
 CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
+# end of WiMAX Wireless Broadband devices
+
 # CONFIG_WAN is not set
 CONFIG_IEEE802154_DRIVERS=m
 CONFIG_IEEE802154_FAKELB=m
@@ -3361,7 +3533,9 @@ CONFIG_INPUT_KEYBOARD=y
 CONFIG_KEYBOARD_ADC=m
 CONFIG_KEYBOARD_ADP5588=m
 CONFIG_KEYBOARD_ADP5589=m
+# CONFIG_KEYBOARD_APPLESPI is not set
 CONFIG_KEYBOARD_ATKBD=y
+CONFIG_KEYBOARD_QT1050=m
 CONFIG_KEYBOARD_QT1070=m
 CONFIG_KEYBOARD_QT2160=m
 # CONFIG_KEYBOARD_DLINK_DIR685 is not set
@@ -3426,8 +3600,8 @@ CONFIG_JOYSTICK_INTERACT=m
 CONFIG_JOYSTICK_SIDEWINDER=m
 CONFIG_JOYSTICK_TMDC=m
 CONFIG_JOYSTICK_IFORCE=m
-CONFIG_JOYSTICK_IFORCE_USB=y
-CONFIG_JOYSTICK_IFORCE_232=y
+CONFIG_JOYSTICK_IFORCE_USB=m
+CONFIG_JOYSTICK_IFORCE_232=m
 CONFIG_JOYSTICK_WARRIOR=m
 CONFIG_JOYSTICK_MAGELLAN=m
 CONFIG_JOYSTICK_SPACEORB=m
@@ -3552,6 +3726,7 @@ CONFIG_TOUCHSCREEN_TPS6507X=m
 CONFIG_TOUCHSCREEN_ZET6223=m
 CONFIG_TOUCHSCREEN_ZFORCE=m
 CONFIG_TOUCHSCREEN_ROHM_BU21023=m
+CONFIG_TOUCHSCREEN_IQS5XX=m
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_AD714X=m
 CONFIG_INPUT_AD714X_I2C=m
@@ -3568,6 +3743,7 @@ CONFIG_INPUT_APANEL=m
 CONFIG_INPUT_GP2A=m
 # CONFIG_INPUT_GPIO_BEEPER is not set
 CONFIG_INPUT_GPIO_DECODER=m
+CONFIG_INPUT_GPIO_VIBRA=m
 CONFIG_INPUT_ATLAS_BTNS=m
 CONFIG_INPUT_ATI_REMOTE2=m
 CONFIG_INPUT_KEYSPAN_REMOTE=m
@@ -3629,7 +3805,6 @@ CONFIG_SERIO_RAW=m
 CONFIG_SERIO_ALTERA_PS2=m
 CONFIG_SERIO_PS2MULT=m
 CONFIG_SERIO_ARC_PS2=m
-CONFIG_SERIO_OLPC_APSP=m
 CONFIG_HYPERV_KEYBOARD=m
 CONFIG_SERIO_GPIO_PS2=m
 CONFIG_USERIO=m
@@ -3638,6 +3813,8 @@ CONFIG_GAMEPORT_NS558=m
 CONFIG_GAMEPORT_L4=m
 CONFIG_GAMEPORT_EMU10K1=m
 CONFIG_GAMEPORT_FM801=m
+# end of Hardware I/O ports
+# end of Input device support
 
 #
 # Character devices
@@ -3666,6 +3843,7 @@ CONFIG_N_HDLC=m
 CONFIG_N_GSM=m
 CONFIG_TRACE_ROUTER=m
 CONFIG_TRACE_SINK=m
+CONFIG_NULL_TTY=m
 CONFIG_LDISC_AUTOLOAD=y
 CONFIG_DEVMEM=y
 # CONFIG_DEVKMEM is not set
@@ -3720,6 +3898,9 @@ CONFIG_SERIAL_RP2=m
 CONFIG_SERIAL_RP2_NR_UARTS=32
 CONFIG_SERIAL_FSL_LPUART=m
 # CONFIG_SERIAL_MEN_Z135 is not set
+# end of Serial drivers
+
+CONFIG_SERIAL_MCTRL_GPIO=y
 CONFIG_SERIAL_DEV_BUS=m
 CONFIG_TTY_PRINTK=m
 CONFIG_TTY_PRINTK_LEVEL=6
@@ -3740,6 +3921,7 @@ CONFIG_IPMI_SI=m
 CONFIG_IPMI_SSIF=m
 CONFIG_IPMI_WATCHDOG=m
 CONFIG_IPMI_POWEROFF=m
+# CONFIG_IPMB_DEVICE_INTERFACE is not set
 CONFIG_HW_RANDOM=m
 CONFIG_HW_RANDOM_TIMERIOMEM=m
 CONFIG_HW_RANDOM_INTEL=m
@@ -3776,6 +3958,8 @@ CONFIG_TELCLOCK=m
 CONFIG_DEVPORT=y
 CONFIG_XILLYBUS=m
 CONFIG_XILLYBUS_PCIE=m
+# end of Character devices
+
 # CONFIG_RANDOM_TRUST_CPU is not set
 
 #
@@ -3797,6 +3981,8 @@ CONFIG_I2C_MUX_PCA9541=m
 CONFIG_I2C_MUX_PCA954x=m
 CONFIG_I2C_MUX_REG=m
 CONFIG_I2C_MUX_MLXCPLD=m
+# end of Multiplexer I2C Chip support
+
 CONFIG_I2C_HELPER_AUTO=y
 CONFIG_I2C_SMBUS=m
 CONFIG_I2C_ALGOBIT=m
@@ -3815,6 +4001,7 @@ CONFIG_I2C_ALI15X3=m
 CONFIG_I2C_AMD756=m
 CONFIG_I2C_AMD756_S4882=m
 CONFIG_I2C_AMD8111=m
+CONFIG_I2C_AMD_MP2=m
 CONFIG_I2C_I801=m
 CONFIG_I2C_ISCH=m
 CONFIG_I2C_ISMT=m
@@ -3868,12 +4055,16 @@ CONFIG_I2C_VIPERBOARD=m
 #
 CONFIG_I2C_MLXCPLD=m
 # CONFIG_I2C_CROS_EC_TUNNEL is not set
+# end of I2C Hardware Bus support
+
 # CONFIG_I2C_STUB is not set
 CONFIG_I2C_SLAVE=y
 CONFIG_I2C_SLAVE_EEPROM=m
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
+# end of I2C support
+
 CONFIG_I3C=m
 CONFIG_CDNS_I3C_MASTER=m
 CONFIG_DW_I3C_MASTER=m
@@ -3952,6 +4143,8 @@ CONFIG_PTP_1588_CLOCK=y
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
 CONFIG_PTP_1588_CLOCK_KVM=y
+# end of PTP clock support
+
 CONFIG_PINCTRL=y
 CONFIG_PINMUX=y
 CONFIG_PINCONF=y
@@ -3995,9 +4188,10 @@ CONFIG_GPIO_ICH=m
 CONFIG_GPIO_LYNXPOINT=y
 CONFIG_GPIO_MB86S7X=m
 CONFIG_GPIO_MENZ127=m
-CONFIG_GPIO_MOCKUP=m
 CONFIG_GPIO_VX855=m
+# CONFIG_GPIO_XILINX is not set
 CONFIG_GPIO_AMD_FCH=m
+# end of Memory mapped GPIO drivers
 
 #
 # Port-mapped I/O GPIO drivers
@@ -4008,6 +4202,7 @@ CONFIG_GPIO_SCH=m
 CONFIG_GPIO_SCH311X=m
 # CONFIG_GPIO_WINBOND is not set
 # CONFIG_GPIO_WS16C48 is not set
+# end of Port-mapped I/O GPIO drivers
 
 #
 # I2C GPIO expanders
@@ -4018,6 +4213,7 @@ CONFIG_GPIO_MAX732X=m
 CONFIG_GPIO_PCA953X=m
 CONFIG_GPIO_PCF857X=m
 CONFIG_GPIO_TPIC2810=m
+# end of I2C GPIO expanders
 
 #
 # MFD GPIO expanders
@@ -4036,6 +4232,7 @@ CONFIG_GPIO_TPS65086=m
 CONFIG_GPIO_TQMX86=m
 CONFIG_GPIO_UCB1400=m
 # CONFIG_GPIO_WM831X is not set
+# end of MFD GPIO expanders
 
 #
 # PCI GPIO expanders
@@ -4045,6 +4242,7 @@ CONFIG_GPIO_ML_IOH=m
 CONFIG_GPIO_PCI_IDIO_16=m
 # CONFIG_GPIO_PCIE_IDIO_24 is not set
 CONFIG_GPIO_RDC321X=m
+# end of PCI GPIO expanders
 
 #
 # SPI GPIO expanders
@@ -4054,11 +4252,15 @@ CONFIG_GPIO_MAX7301=m
 CONFIG_GPIO_MC33880=m
 CONFIG_GPIO_PISOSR=m
 # CONFIG_GPIO_XRA1403 is not set
+# end of SPI GPIO expanders
 
 #
 # USB GPIO expanders
 #
 CONFIG_GPIO_VIPERBOARD=m
+# end of USB GPIO expanders
+
+CONFIG_GPIO_MOCKUP=m
 CONFIG_W1=m
 CONFIG_W1_CON=y
 
@@ -4070,6 +4272,7 @@ CONFIG_W1_MASTER_DS2490=m
 CONFIG_W1_MASTER_DS2482=m
 CONFIG_W1_MASTER_DS1WM=m
 CONFIG_W1_MASTER_GPIO=m
+# end of 1-wire Bus Masters
 
 #
 # 1-wire Slaves
@@ -4091,6 +4294,8 @@ CONFIG_W1_SLAVE_DS2780=m
 CONFIG_W1_SLAVE_DS2781=m
 CONFIG_W1_SLAVE_DS28E04=m
 CONFIG_W1_SLAVE_DS28E17=m
+# end of 1-wire Slaves
+
 CONFIG_POWER_AVS=y
 # CONFIG_POWER_RESET is not set
 CONFIG_POWER_SUPPLY=y
@@ -4127,7 +4332,7 @@ CONFIG_CHARGER_MAX8903=m
 CONFIG_CHARGER_LP8727=m
 CONFIG_CHARGER_GPIO=m
 CONFIG_CHARGER_MANAGER=y
-# CONFIG_CHARGER_LTC3651 is not set
+CONFIG_CHARGER_LT3651=m
 CONFIG_CHARGER_BQ2415X=m
 CONFIG_CHARGER_BQ24190=m
 CONFIG_CHARGER_BQ24257=m
@@ -4244,13 +4449,15 @@ CONFIG_SENSORS_NCT6775=m
 CONFIG_SENSORS_NCT7802=m
 CONFIG_SENSORS_NCT7904=m
 CONFIG_SENSORS_NPCM7XX=m
-# CONFIG_SENSORS_OCC_P8_I2C is not set
 CONFIG_SENSORS_PCF8591=m
 CONFIG_PMBUS=m
 CONFIG_SENSORS_PMBUS=m
 CONFIG_SENSORS_ADM1275=m
 CONFIG_SENSORS_IBM_CFFPS=m
 # CONFIG_SENSORS_IR35221 is not set
+CONFIG_SENSORS_IR38064=m
+# CONFIG_SENSORS_IRPS5401 is not set
+CONFIG_SENSORS_ISL68137=m
 CONFIG_SENSORS_LM25066=m
 CONFIG_SENSORS_LTC2978=m
 # CONFIG_SENSORS_LTC2978_REGULATOR is not set
@@ -4260,6 +4467,7 @@ CONFIG_SENSORS_MAX20751=m
 CONFIG_SENSORS_MAX31785=m
 CONFIG_SENSORS_MAX34440=m
 CONFIG_SENSORS_MAX8688=m
+# CONFIG_SENSORS_PXE1610 is not set
 # CONFIG_SENSORS_TPS40422 is not set
 CONFIG_SENSORS_TPS53679=m
 CONFIG_SENSORS_UCD9000=m
@@ -4351,14 +4559,25 @@ CONFIG_INTEL_SOC_DTS_IOSF_CORE=m
 CONFIG_INT340X_THERMAL=m
 CONFIG_ACPI_THERMAL_REL=m
 CONFIG_INT3406_THERMAL=m
+CONFIG_PROC_THERMAL_MMIO_RAPL=y
+# end of ACPI INT340X thermal drivers
+
 CONFIG_INTEL_PCH_THERMAL=m
+# end of Intel thermal drivers
+
 CONFIG_GENERIC_ADC_THERMAL=m
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_CORE=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
 CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
+CONFIG_WATCHDOG_OPEN_TIMEOUT=0
 CONFIG_WATCHDOG_SYSFS=y
 
+#
+# Watchdog Pretimeout Governors
+#
+# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
+
 #
 # Watchdog Device Drivers
 #
@@ -4394,8 +4613,8 @@ CONFIG_ITCO_VENDOR_SUPPORT=y
 CONFIG_IT8712F_WDT=m
 CONFIG_IT87_WDT=m
 CONFIG_HP_WATCHDOG=m
-CONFIG_KEMPLD_WDT=m
 CONFIG_HPWDT_NMI_DECODING=y
+CONFIG_KEMPLD_WDT=m
 CONFIG_SC1200_WDT=m
 CONFIG_PC87413_WDT=m
 CONFIG_NV_TCO=m
@@ -4426,11 +4645,6 @@ CONFIG_WDTPCI=m
 # USB-based Watchdog Cards
 #
 CONFIG_USBPCWATCHDOG=m
-
-#
-# Watchdog Pretimeout Governors
-#
-# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
 CONFIG_SSB_POSSIBLE=y
 CONFIG_SSB=m
 CONFIG_SSB_SPROM=y
@@ -4471,9 +4685,11 @@ CONFIG_MFD_CROS_EC=m
 CONFIG_MFD_MADERA=m
 CONFIG_MFD_MADERA_I2C=m
 CONFIG_MFD_MADERA_SPI=m
+# CONFIG_MFD_CS47L15 is not set
 CONFIG_MFD_CS47L35=y
 CONFIG_MFD_CS47L85=y
 CONFIG_MFD_CS47L90=y
+# CONFIG_MFD_CS47L92 is not set
 # CONFIG_PMIC_DA903X is not set
 CONFIG_PMIC_DA9052=y
 CONFIG_MFD_DA9052_SPI=y
@@ -4567,6 +4783,8 @@ CONFIG_MFD_WM831X_SPI=y
 # CONFIG_MFD_WM8350_I2C is not set
 # CONFIG_MFD_WM8994 is not set
 # CONFIG_RAVE_SP_CORE is not set
+# end of Multifunction device drivers
+
 CONFIG_REGULATOR=y
 # CONFIG_REGULATOR_DEBUG is not set
 CONFIG_REGULATOR_FIXED_VOLTAGE=m
@@ -4616,6 +4834,7 @@ CONFIG_REGULATOR_PWM=m
 CONFIG_REGULATOR_QCOM_SPMI=m
 CONFIG_REGULATOR_RT5033=m
 CONFIG_REGULATOR_SKY81452=m
+# CONFIG_REGULATOR_SLG51000 is not set
 CONFIG_REGULATOR_TPS51632=m
 CONFIG_REGULATOR_TPS6105X=m
 CONFIG_REGULATOR_TPS62360=m
@@ -4812,6 +5031,7 @@ CONFIG_DVB_USB_DIBUSB_MC=m
 CONFIG_DVB_USB_DIB0700=m
 CONFIG_DVB_USB_UMT_010=m
 CONFIG_DVB_USB_CXUSB=m
+# CONFIG_DVB_USB_CXUSB_ANALOG is not set
 CONFIG_DVB_USB_M920X=m
 CONFIG_DVB_USB_DIGITV=m
 CONFIG_DVB_USB_VP7045=m
@@ -4986,6 +5206,7 @@ CONFIG_RADIO_WL1273=m
 # Texas Instruments WL128x FM driver (ST based)
 #
 CONFIG_RADIO_WL128X=m
+# end of Texas Instruments WL128x FM driver (ST based)
 
 #
 # Supported FireWire (IEEE 1394) Adapters
@@ -5020,18 +5241,24 @@ CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
 CONFIG_MEDIA_ATTACH=y
 CONFIG_VIDEO_IR_I2C=m
 
+#
+# I2C Encoders, decoders, sensors and other helper chips
+#
+
 #
 # Audio decoders, processors and mixers
 #
 CONFIG_VIDEO_TVAUDIO=m
 CONFIG_VIDEO_TDA7432=m
 CONFIG_VIDEO_TDA9840=m
+# CONFIG_VIDEO_TDA1997X is not set
 CONFIG_VIDEO_TEA6415C=m
 CONFIG_VIDEO_TEA6420=m
 CONFIG_VIDEO_MSP3400=m
 CONFIG_VIDEO_CS3308=m
 CONFIG_VIDEO_CS5345=m
 CONFIG_VIDEO_CS53L32A=m
+# CONFIG_VIDEO_TLV320AIC23B is not set
 CONFIG_VIDEO_UDA1342=m
 CONFIG_VIDEO_WM8775=m
 CONFIG_VIDEO_WM8739=m
@@ -5046,17 +5273,26 @@ CONFIG_VIDEO_SAA6588=m
 #
 # Video decoders
 #
-CONFIG_VIDEO_BT819=m
-CONFIG_VIDEO_BT856=m
-CONFIG_VIDEO_BT866=m
-CONFIG_VIDEO_KS0127=m
-CONFIG_VIDEO_SAA7110=m
+# CONFIG_VIDEO_ADV7180 is not set
+# CONFIG_VIDEO_ADV7183 is not set
+# CONFIG_VIDEO_ADV7604 is not set
+# CONFIG_VIDEO_ADV7842 is not set
+# CONFIG_VIDEO_BT819 is not set
+# CONFIG_VIDEO_BT856 is not set
+# CONFIG_VIDEO_BT866 is not set
+# CONFIG_VIDEO_KS0127 is not set
+# CONFIG_VIDEO_ML86V7667 is not set
+# CONFIG_VIDEO_SAA7110 is not set
 CONFIG_VIDEO_SAA711X=m
+# CONFIG_VIDEO_TC358743 is not set
+# CONFIG_VIDEO_TVP514X is not set
 CONFIG_VIDEO_TVP5150=m
+# CONFIG_VIDEO_TVP7002 is not set
 CONFIG_VIDEO_TW2804=m
 CONFIG_VIDEO_TW9903=m
 CONFIG_VIDEO_TW9906=m
-CONFIG_VIDEO_VPX3220=m
+# CONFIG_VIDEO_TW9910 is not set
+# CONFIG_VIDEO_VPX3220 is not set
 
 #
 # Video and audio decoders
@@ -5068,21 +5304,77 @@ CONFIG_VIDEO_CX25840=m
 # Video encoders
 #
 CONFIG_VIDEO_SAA7127=m
-CONFIG_VIDEO_SAA7185=m
-CONFIG_VIDEO_ADV7170=m
-CONFIG_VIDEO_ADV7175=m
+# CONFIG_VIDEO_SAA7185 is not set
+# CONFIG_VIDEO_ADV7170 is not set
+# CONFIG_VIDEO_ADV7175 is not set
+# CONFIG_VIDEO_ADV7343 is not set
+# CONFIG_VIDEO_ADV7393 is not set
+# CONFIG_VIDEO_ADV7511 is not set
+# CONFIG_VIDEO_AD9389B is not set
+# CONFIG_VIDEO_AK881X is not set
+# CONFIG_VIDEO_THS8200 is not set
 
 #
 # Camera sensor devices
 #
+# CONFIG_VIDEO_IMX214 is not set
+# CONFIG_VIDEO_IMX258 is not set
+# CONFIG_VIDEO_IMX274 is not set
+# CONFIG_VIDEO_IMX319 is not set
+# CONFIG_VIDEO_IMX355 is not set
 CONFIG_VIDEO_OV2640=m
+# CONFIG_VIDEO_OV2659 is not set
+# CONFIG_VIDEO_OV2680 is not set
+# CONFIG_VIDEO_OV2685 is not set
+# CONFIG_VIDEO_OV5647 is not set
+# CONFIG_VIDEO_OV6650 is not set
+# CONFIG_VIDEO_OV5670 is not set
+# CONFIG_VIDEO_OV5695 is not set
+# CONFIG_VIDEO_OV7251 is not set
+# CONFIG_VIDEO_OV772X is not set
 CONFIG_VIDEO_OV7640=m
 CONFIG_VIDEO_OV7670=m
+# CONFIG_VIDEO_OV7740 is not set
+# CONFIG_VIDEO_OV8856 is not set
+# CONFIG_VIDEO_OV9640 is not set
+# CONFIG_VIDEO_OV9650 is not set
+# CONFIG_VIDEO_OV13858 is not set
+# CONFIG_VIDEO_VS6624 is not set
+# CONFIG_VIDEO_MT9M001 is not set
+# CONFIG_VIDEO_MT9M032 is not set
+# CONFIG_VIDEO_MT9M111 is not set
+# CONFIG_VIDEO_MT9P031 is not set
+# CONFIG_VIDEO_MT9T001 is not set
+# CONFIG_VIDEO_MT9T112 is not set
 CONFIG_VIDEO_MT9V011=m
+# CONFIG_VIDEO_MT9V032 is not set
+# CONFIG_VIDEO_MT9V111 is not set
+# CONFIG_VIDEO_SR030PC30 is not set
+# CONFIG_VIDEO_NOON010PC30 is not set
+# CONFIG_VIDEO_M5MOLS is not set
+# CONFIG_VIDEO_RJ54N1 is not set
+# CONFIG_VIDEO_S5K6AA is not set
+# CONFIG_VIDEO_S5K6A3 is not set
+# CONFIG_VIDEO_S5K4ECGX is not set
+# CONFIG_VIDEO_S5K5BAF is not set
+# CONFIG_VIDEO_SMIAPP is not set
+# CONFIG_VIDEO_ET8EK8 is not set
+# CONFIG_VIDEO_S5C73M3 is not set
+
+#
+# Lens drivers
+#
+# CONFIG_VIDEO_AD5820 is not set
+# CONFIG_VIDEO_AK7375 is not set
+# CONFIG_VIDEO_DW9714 is not set
+# CONFIG_VIDEO_DW9807_VCM is not set
 
 #
 # Flash devices
 #
+# CONFIG_VIDEO_ADP1653 is not set
+# CONFIG_VIDEO_LM3560 is not set
+# CONFIG_VIDEO_LM3646 is not set
 
 #
 # Video improvement chips
@@ -5102,13 +5394,29 @@ CONFIG_VIDEO_SAA6752HS=m
 #
 # Miscellaneous helper chips
 #
+# CONFIG_VIDEO_THS7303 is not set
 CONFIG_VIDEO_M52790=m
+# CONFIG_VIDEO_I2C is not set
+# CONFIG_VIDEO_ST_MIPID02 is not set
+# end of I2C Encoders, decoders, sensors and other helper chips
+
+#
+# SPI helper chips
+#
+# CONFIG_VIDEO_GS1662 is not set
+# end of SPI helper chips
 
 #
 # Media SPI Adapters
 #
 # CONFIG_CXD2880_SPI_DRV is not set
+# end of Media SPI Adapters
+
 CONFIG_MEDIA_TUNER=m
+
+#
+# Customize TV tuners
+#
 CONFIG_MEDIA_TUNER_SIMPLE=m
 CONFIG_MEDIA_TUNER_TDA18250=m
 CONFIG_MEDIA_TUNER_TDA8290=m
@@ -5117,6 +5425,7 @@ CONFIG_MEDIA_TUNER_TDA18271=m
 CONFIG_MEDIA_TUNER_TDA9887=m
 CONFIG_MEDIA_TUNER_TEA5761=m
 CONFIG_MEDIA_TUNER_TEA5767=m
+# CONFIG_MEDIA_TUNER_MSI001 is not set
 CONFIG_MEDIA_TUNER_MT20XX=m
 CONFIG_MEDIA_TUNER_MT2060=m
 CONFIG_MEDIA_TUNER_MT2063=m
@@ -5145,6 +5454,11 @@ CONFIG_MEDIA_TUNER_R820T=m
 CONFIG_MEDIA_TUNER_MXL301RF=m
 CONFIG_MEDIA_TUNER_QM1D1C0042=m
 CONFIG_MEDIA_TUNER_QM1D1B0004=m
+# end of Customize TV tuners
+
+#
+# Customise DVB Frontends
+#
 
 #
 # Multistandard (satellite) frontends
@@ -5205,6 +5519,7 @@ CONFIG_DVB_SP8870=m
 CONFIG_DVB_SP887X=m
 CONFIG_DVB_CX22700=m
 CONFIG_DVB_CX22702=m
+# CONFIG_DVB_S5H1432 is not set
 CONFIG_DVB_DRXD=m
 CONFIG_DVB_L64781=m
 CONFIG_DVB_TDA1004X=m
@@ -5215,6 +5530,7 @@ CONFIG_DVB_DIB3000MB=m
 CONFIG_DVB_DIB3000MC=m
 CONFIG_DVB_DIB7000M=m
 CONFIG_DVB_DIB7000P=m
+# CONFIG_DVB_DIB9000 is not set
 CONFIG_DVB_TDA10048=m
 CONFIG_DVB_AF9013=m
 CONFIG_DVB_EC100=m
@@ -5227,6 +5543,7 @@ CONFIG_DVB_SI2168=m
 CONFIG_DVB_AS102_FE=m
 CONFIG_DVB_ZD1301_DEMOD=m
 CONFIG_DVB_GP8PSK_FE=m
+# CONFIG_DVB_CXD2880 is not set
 
 #
 # DVB-C (cable) frontends
@@ -5264,6 +5581,7 @@ CONFIG_DVB_MB86A20S=m
 # ISDB-S (satellite) & ISDB-T (terrestrial) frontends
 #
 CONFIG_DVB_TC90522=m
+# CONFIG_DVB_MN88443X is not set
 
 #
 # Digital terrestrial only tuners/PLL
@@ -5277,12 +5595,14 @@ CONFIG_DVB_TUNER_DIB0090=m
 #
 CONFIG_DVB_DRX39XYJ=m
 CONFIG_DVB_LNBH25=m
+# CONFIG_DVB_LNBH29 is not set
 CONFIG_DVB_LNBP21=m
 CONFIG_DVB_LNBP22=m
 CONFIG_DVB_ISL6405=m
 CONFIG_DVB_ISL6421=m
 CONFIG_DVB_ISL6423=m
 CONFIG_DVB_A8293=m
+# CONFIG_DVB_LGS8GL5 is not set
 CONFIG_DVB_LGS8GXX=m
 CONFIG_DVB_ATBM8830=m
 CONFIG_DVB_TDA665x=m
@@ -5303,6 +5623,7 @@ CONFIG_DVB_SP2=m
 # Tools to develop new frontends
 #
 CONFIG_DVB_DUMMY_FE=m
+# end of Customise DVB Frontends
 
 #
 # Graphics support
@@ -5328,8 +5649,10 @@ CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 CONFIG_DRM_DP_CEC=y
 CONFIG_DRM_TTM=m
+CONFIG_DRM_VRAM_HELPER=m
 CONFIG_DRM_GEM_CMA_HELPER=y
 CONFIG_DRM_KMS_CMA_HELPER=y
+CONFIG_DRM_GEM_SHMEM_HELPER=y
 CONFIG_DRM_VM=y
 CONFIG_DRM_SCHED=m
 
@@ -5340,47 +5663,46 @@ CONFIG_DRM_I2C_CH7006=m
 CONFIG_DRM_I2C_SIL164=m
 CONFIG_DRM_I2C_NXP_TDA998X=m
 # CONFIG_DRM_I2C_NXP_TDA9950 is not set
+# end of I2C encoder or helper chips
 
 #
 # ARM devices
 #
+# end of ARM devices
+
 CONFIG_DRM_RADEON=m
 CONFIG_DRM_RADEON_USERPTR=y
 CONFIG_DRM_AMDGPU=m
 CONFIG_DRM_AMDGPU_SI=y
 CONFIG_DRM_AMDGPU_CIK=y
-CONFIG_DRM_AMDGPU_USERPTR=y
 # CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set
 
 #
 # ACP (Audio CoProcessor) Configuration
 #
 CONFIG_DRM_AMD_ACP=y
+# end of ACP (Audio CoProcessor) Configuration
 
 #
 # Display Engine Configuration
 #
 CONFIG_DRM_AMD_DC=y
 CONFIG_DRM_AMD_DC_DCN1_0=y
-CONFIG_DRM_AMD_DC_DCN1_01=y
+CONFIG_DRM_AMD_DC_DCN2_0=y
+CONFIG_DRM_AMD_DC_DSC_SUPPORT=y
 # CONFIG_DEBUG_KERNEL_DC is not set
-CONFIG_HSA_AMD=y
+# end of Display Engine Configuration
 
-#
-# AMD Library routines
-#
-CONFIG_CHASH=m
-# CONFIG_CHASH_STATS is not set
-# CONFIG_CHASH_SELFTEST is not set
+CONFIG_HSA_AMD=y
 CONFIG_DRM_NOUVEAU=m
 CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT=y
 CONFIG_NOUVEAU_DEBUG=5
 CONFIG_NOUVEAU_DEBUG_DEFAULT=3
 # CONFIG_NOUVEAU_DEBUG_MMU is not set
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
-# CONFIG_DRM_NOUVEAU_SVM is not set
 CONFIG_DRM_I915=m
 # CONFIG_DRM_I915_ALPHA_SUPPORT is not set
+CONFIG_DRM_I915_FORCE_PROBE=""
 CONFIG_DRM_I915_CAPTURE_ERROR=y
 CONFIG_DRM_I915_COMPRESS_ERROR=y
 CONFIG_DRM_I915_USERPTR=y
@@ -5392,6 +5714,7 @@ CONFIG_DRM_I915_GVT_KVMGT=m
 #
 # CONFIG_DRM_I915_WERROR is not set
 # CONFIG_DRM_I915_DEBUG is not set
+# CONFIG_DRM_I915_DEBUG_MMIO is not set
 # CONFIG_DRM_I915_SW_FENCE_DEBUG_OBJECTS is not set
 # CONFIG_DRM_I915_SW_FENCE_CHECK_DAG is not set
 # CONFIG_DRM_I915_DEBUG_GUC is not set
@@ -5399,8 +5722,18 @@ CONFIG_DRM_I915_GVT_KVMGT=m
 # CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS is not set
 # CONFIG_DRM_I915_DEBUG_VBLANK_EVADE is not set
 # CONFIG_DRM_I915_DEBUG_RUNTIME_PM is not set
+# end of drm/i915 Debugging
+
+#
+# drm/i915 Profile Guided Optimisation
+#
+CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND=250
+CONFIG_DRM_I915_SPIN_REQUEST=5
+# end of drm/i915 Profile Guided Optimisation
+
 CONFIG_DRM_VGEM=m
 CONFIG_DRM_VKMS=m
+CONFIG_DRM_ATI_PCIGART=y
 CONFIG_DRM_VMWGFX=m
 CONFIG_DRM_VMWGFX_FBCON=y
 CONFIG_DRM_GMA500=m
@@ -5419,6 +5752,8 @@ CONFIG_DRM_PANEL=y
 # Display Panels
 #
 CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m
+# end of Display Panels
+
 CONFIG_DRM_BRIDGE=y
 CONFIG_DRM_PANEL_BRIDGE=y
 
@@ -5426,6 +5761,8 @@ CONFIG_DRM_PANEL_BRIDGE=y
 # Display Interface Bridges
 #
 CONFIG_DRM_ANALOGIX_ANX78XX=m
+# end of Display Interface Bridges
+
 # CONFIG_DRM_ETNAVIV is not set
 CONFIG_DRM_HISI_HIBMC=m
 CONFIG_DRM_TINYDRM=m
@@ -5438,7 +5775,14 @@ CONFIG_TINYDRM_REPAPER=m
 CONFIG_TINYDRM_ST7586=m
 # CONFIG_TINYDRM_ST7735R is not set
 # CONFIG_DRM_XEN is not set
-# CONFIG_DRM_LEGACY is not set
+CONFIG_DRM_VBOXVIDEO=m
+CONFIG_DRM_LEGACY=y
+CONFIG_DRM_TDFX=m
+CONFIG_DRM_R128=m
+CONFIG_DRM_MGA=m
+CONFIG_DRM_SIS=m
+CONFIG_DRM_VIA=m
+CONFIG_DRM_SAVAGE=m
 CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
 
 #
@@ -5517,7 +5861,11 @@ CONFIG_XEN_FBDEV_FRONTEND=m
 CONFIG_FB_HYPERV=m
 # CONFIG_FB_SIMPLE is not set
 CONFIG_FB_SM712=m
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
+# end of Frame buffer Devices
+
+#
+# Backlight & LCD device support
+#
 CONFIG_LCD_CLASS_DEVICE=m
 CONFIG_LCD_L4F00242T03=m
 CONFIG_LCD_LMS283GF05=m
@@ -5551,6 +5899,8 @@ CONFIG_BACKLIGHT_GPIO=m
 CONFIG_BACKLIGHT_LV5207LP=m
 CONFIG_BACKLIGHT_BD6107=m
 # CONFIG_BACKLIGHT_ARCXCNN is not set
+# end of Backlight & LCD device support
+
 CONFIG_VGASTATE=m
 CONFIG_HDMI=y
 
@@ -5568,7 +5918,11 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y
+# end of Console display driver support
+
 # CONFIG_LOGO is not set
+# end of Graphics support
+
 CONFIG_SOUND=m
 CONFIG_SOUND_OSS_CORE=y
 CONFIG_SOUND_OSS_CORE_PRECLAIM=y
@@ -5723,6 +6077,8 @@ CONFIG_SND_HDA_CODEC_CMEDIA=m
 CONFIG_SND_HDA_CODEC_SI3054=m
 CONFIG_SND_HDA_GENERIC=m
 CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1
+# end of HD-Audio
+
 CONFIG_SND_HDA_CORE=m
 CONFIG_SND_HDA_DSP_LOADER=y
 CONFIG_SND_HDA_COMPONENT=y
@@ -5732,6 +6088,7 @@ CONFIG_SND_HDA_PREALLOC_SIZE=64
 CONFIG_SND_SPI=y
 CONFIG_SND_USB=y
 CONFIG_SND_USB_AUDIO=m
+CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER=y
 CONFIG_SND_USB_UA101=m
 CONFIG_SND_USB_USX2Y=m
 CONFIG_SND_USB_CAIAQ=m
@@ -5779,11 +6136,14 @@ CONFIG_SND_DESIGNWARE_I2S=m
 #
 # CONFIG_SND_SOC_FSL_ASRC is not set
 # CONFIG_SND_SOC_FSL_SAI is not set
+CONFIG_SND_SOC_FSL_AUDMIX=m
 # CONFIG_SND_SOC_FSL_SSI is not set
 # CONFIG_SND_SOC_FSL_SPDIF is not set
 # CONFIG_SND_SOC_FSL_ESAI is not set
 CONFIG_SND_SOC_FSL_MICFIL=m
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
+# end of SoC Audio for Freescale CPUs
+
 # CONFIG_SND_I2S_HI6210_I2S is not set
 CONFIG_SND_SOC_IMG=y
 CONFIG_SND_SOC_IMG_I2S_IN=m
@@ -5810,6 +6170,8 @@ CONFIG_SND_SOC_INTEL_KBL=m
 CONFIG_SND_SOC_INTEL_GLK=m
 CONFIG_SND_SOC_INTEL_CNL=m
 CONFIG_SND_SOC_INTEL_CFL=m
+# CONFIG_SND_SOC_INTEL_CML_H is not set
+# CONFIG_SND_SOC_INTEL_CML_LP is not set
 CONFIG_SND_SOC_INTEL_SKYLAKE_FAMILY=m
 CONFIG_SND_SOC_INTEL_SKYLAKE_SSP_CLK=m
 CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
@@ -5825,6 +6187,7 @@ CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_NAU8824_MACH=m
+# CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH is not set
 CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
@@ -5840,11 +6203,53 @@ CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98927_MACH=m
 CONFIG_SND_SOC_INTEL_KBL_RT5660_MACH=m
 CONFIG_SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH=m
+CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH=m
 CONFIG_SND_SOC_MTK_BTCVSD=m
+CONFIG_SND_SOC_SOF_TOPLEVEL=y
+CONFIG_SND_SOC_SOF_PCI=m
+CONFIG_SND_SOC_SOF_ACPI=m
+CONFIG_SND_SOC_SOF_OPTIONS=m
+# CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT is not set
+# CONFIG_SND_SOC_SOF_STRICT_ABI_CHECKS is not set
+# CONFIG_SND_SOC_SOF_DEBUG is not set
+CONFIG_SND_SOC_SOF=m
+CONFIG_SND_SOC_SOF_PROBE_WORK_QUEUE=y
+CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL=y
+CONFIG_SND_SOC_SOF_INTEL_ACPI=m
+CONFIG_SND_SOC_SOF_INTEL_PCI=m
+CONFIG_SND_SOC_SOF_INTEL_HIFI_EP_IPC=m
+CONFIG_SND_SOC_SOF_INTEL_ATOM_HIFI_EP=m
+CONFIG_SND_SOC_SOF_INTEL_COMMON=m
+CONFIG_SND_SOC_SOF_BAYTRAIL_SUPPORT=y
+CONFIG_SND_SOC_SOF_BAYTRAIL=m
+CONFIG_SND_SOC_SOF_BROADWELL_SUPPORT=y
+CONFIG_SND_SOC_SOF_BROADWELL=m
+CONFIG_SND_SOC_SOF_MERRIFIELD_SUPPORT=y
+CONFIG_SND_SOC_SOF_MERRIFIELD=m
+CONFIG_SND_SOC_SOF_APOLLOLAKE_SUPPORT=y
+CONFIG_SND_SOC_SOF_APOLLOLAKE=m
+CONFIG_SND_SOC_SOF_GEMINILAKE_SUPPORT=y
+CONFIG_SND_SOC_SOF_GEMINILAKE=m
+CONFIG_SND_SOC_SOF_CANNONLAKE_SUPPORT=y
+CONFIG_SND_SOC_SOF_CANNONLAKE=m
+CONFIG_SND_SOC_SOF_COFFEELAKE_SUPPORT=y
+CONFIG_SND_SOC_SOF_COFFEELAKE=m
+CONFIG_SND_SOC_SOF_ICELAKE_SUPPORT=y
+CONFIG_SND_SOC_SOF_ICELAKE=m
+# CONFIG_SND_SOC_SOF_COMETLAKE_LP_SUPPORT is not set
+# CONFIG_SND_SOC_SOF_COMETLAKE_H_SUPPORT is not set
+CONFIG_SND_SOC_SOF_HDA_COMMON=m
+CONFIG_SND_SOC_SOF_HDA_LINK=y
+CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC=y
+CONFIG_SND_SOC_SOF_HDA_LINK_BASELINE=m
+CONFIG_SND_SOC_SOF_HDA=m
+CONFIG_SND_SOC_SOF_XTENSA=m
 
 #
 # STMicroelectronics STM32 SOC audio support
 #
+# end of STMicroelectronics STM32 SOC audio support
+
 CONFIG_SND_SOC_XILINX_I2S=m
 CONFIG_SND_SOC_XILINX_AUDIO_FORMATTER=m
 CONFIG_SND_SOC_XILINX_SPDIF=m
@@ -5894,6 +6299,7 @@ CONFIG_SND_SOC_CS43130=m
 CONFIG_SND_SOC_CS4341=m
 CONFIG_SND_SOC_CS4349=m
 CONFIG_SND_SOC_CS53L30=m
+# CONFIG_SND_SOC_CX2072X is not set
 CONFIG_SND_SOC_DA7213=m
 CONFIG_SND_SOC_DA7219=m
 CONFIG_SND_SOC_DMIC=m
@@ -6019,6 +6425,8 @@ CONFIG_SND_SOC_NAU8822=m
 CONFIG_SND_SOC_NAU8824=m
 CONFIG_SND_SOC_NAU8825=m
 CONFIG_SND_SOC_TPA6130A2=m
+# end of CODEC drivers
+
 CONFIG_SND_SIMPLE_CARD_UTILS=m
 CONFIG_SND_SIMPLE_CARD=m
 CONFIG_SND_X86=y
@@ -6054,6 +6462,7 @@ CONFIG_HID_CHERRY=m
 CONFIG_HID_CHICONY=m
 CONFIG_HID_CORSAIR=m
 CONFIG_HID_COUGAR=m
+CONFIG_HID_MACALLY=m
 CONFIG_HID_PRODIKEYS=m
 CONFIG_HID_CMEDIA=m
 CONFIG_HID_CP2112=m
@@ -6136,6 +6545,7 @@ CONFIG_HID_THINGM=m
 CONFIG_HID_THRUSTMASTER=m
 CONFIG_THRUSTMASTER_FF=y
 CONFIG_HID_UDRAW_PS3=m
+CONFIG_HID_U2FZERO=m
 CONFIG_HID_WACOM=m
 CONFIG_HID_WIIMOTE=m
 CONFIG_HID_XINMO=m
@@ -6145,6 +6555,7 @@ CONFIG_HID_ZYDACRON=m
 CONFIG_HID_SENSOR_HUB=m
 CONFIG_HID_SENSOR_CUSTOM_SENSOR=m
 CONFIG_HID_ALPS=m
+# end of Special HID drivers
 
 #
 # USB HID support
@@ -6158,16 +6569,23 @@ CONFIG_USB_HIDDEV=y
 #
 CONFIG_USB_KBD=m
 CONFIG_USB_MOUSE=m
+# end of USB HID Boot Protocol drivers
+# end of USB HID support
 
 #
 # I2C HID support
 #
 CONFIG_I2C_HID=m
+# end of I2C HID support
 
 #
 # Intel ISH HID support
 #
 CONFIG_INTEL_ISH_HID=m
+CONFIG_INTEL_ISH_FIRMWARE_DOWNLOADER=m
+# end of Intel ISH HID support
+# end of HID support
+
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 CONFIG_USB_SUPPORT=y
 CONFIG_USB_COMMON=y
@@ -6411,6 +6829,8 @@ CONFIG_USB_GPIO_VBUS=m
 CONFIG_TAHVO_USB=m
 # CONFIG_TAHVO_USB_HOST_BY_DEFAULT is not set
 CONFIG_USB_ISP1301=m
+# end of USB Physical Layer drivers
+
 CONFIG_USB_GADGET=m
 # CONFIG_USB_GADGET_DEBUG is not set
 # CONFIG_USB_GADGET_DEBUG_FILES is not set
@@ -6443,6 +6863,8 @@ CONFIG_USB_NET2280=m
 CONFIG_USB_GOKU=m
 CONFIG_USB_EG20T=m
 CONFIG_USB_DUMMY_HCD=m
+# end of USB Peripheral Controller
+
 CONFIG_USB_LIBCOMPOSITE=m
 CONFIG_USB_F_ACM=m
 CONFIG_USB_U_SERIAL=m
@@ -6523,11 +6945,15 @@ CONFIG_TYPEC_TPS6598X=m
 # USB Type-C Multiplexer/DeMultiplexer Switch support
 #
 # CONFIG_TYPEC_MUX_PI3USB30532 is not set
+# end of USB Type-C Multiplexer/DeMultiplexer Switch support
 
 #
 # USB Type-C Alternate Mode drivers
 #
 CONFIG_TYPEC_DP_ALTMODE=m
+CONFIG_TYPEC_NVIDIA_ALTMODE=m
+# end of USB Type-C Alternate Mode drivers
+
 CONFIG_USB_ROLE_SWITCH=m
 CONFIG_USB_ROLES_INTEL_XHCI=m
 CONFIG_USB_LED_TRIG=y
@@ -6596,6 +7022,7 @@ CONFIG_LEDS_CLASS_FLASH=m
 CONFIG_LEDS_APU=m
 CONFIG_LEDS_AS3645A=m
 CONFIG_LEDS_LM3530=m
+CONFIG_LEDS_LM3532=m
 CONFIG_LEDS_LM3533=m
 CONFIG_LEDS_LM3642=m
 # CONFIG_LEDS_LM3601X is not set
@@ -6621,7 +7048,6 @@ CONFIG_LEDS_PWM=m
 CONFIG_LEDS_REGULATOR=m
 CONFIG_LEDS_BD2802=m
 CONFIG_LEDS_INTEL_SS4200=m
-CONFIG_LEDS_LT3593=m
 CONFIG_LEDS_MC13783=m
 CONFIG_LEDS_TCA6507=m
 CONFIG_LEDS_TLC591XX=m
@@ -6636,6 +7062,7 @@ CONFIG_LEDS_MLXCPLD=m
 CONFIG_LEDS_MLXREG=m
 CONFIG_LEDS_USER=m
 CONFIG_LEDS_NIC78BX=m
+# CONFIG_LEDS_TI_LMU_COMMON is not set
 
 #
 # LED Triggers
@@ -6676,11 +7103,10 @@ CONFIG_INFINIBAND_QIB=m
 CONFIG_INFINIBAND_QIB_DCA=y
 CONFIG_INFINIBAND_CXGB3=m
 CONFIG_INFINIBAND_CXGB4=m
+CONFIG_INFINIBAND_EFA=m
 CONFIG_INFINIBAND_I40IW=m
 CONFIG_MLX4_INFINIBAND=m
 CONFIG_MLX5_INFINIBAND=m
-CONFIG_INFINIBAND_NES=m
-# CONFIG_INFINIBAND_NES_DEBUG is not set
 CONFIG_INFINIBAND_OCRDMA=m
 CONFIG_INFINIBAND_VMWARE_PVRDMA=m
 CONFIG_INFINIBAND_USNIC=m
@@ -6691,6 +7117,7 @@ CONFIG_INFINIBAND_HFI1=m
 CONFIG_INFINIBAND_QEDR=m
 CONFIG_INFINIBAND_RDMAVT=m
 CONFIG_RDMA_RXE=m
+# CONFIG_RDMA_SIW is not set
 CONFIG_INFINIBAND_IPOIB=m
 CONFIG_INFINIBAND_IPOIB_CM=y
 CONFIG_INFINIBAND_IPOIB_DEBUG=y
@@ -6766,6 +7193,7 @@ CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_M41T80=m
 CONFIG_RTC_DRV_M41T80_WDT=y
+# CONFIG_RTC_DRV_BD70528 is not set
 CONFIG_RTC_DRV_BQ32K=m
 CONFIG_RTC_DRV_S35390A=m
 CONFIG_RTC_DRV_FM3130=m
@@ -6864,6 +7292,8 @@ CONFIG_QCOM_HIDMA=m
 CONFIG_DW_DMAC_CORE=m
 CONFIG_DW_DMAC=m
 CONFIG_DW_DMAC_PCI=m
+# CONFIG_DW_EDMA is not set
+# CONFIG_DW_EDMA_PCIE is not set
 CONFIG_HSU_DMA=m
 
 #
@@ -6879,6 +7309,8 @@ CONFIG_DMA_ENGINE_RAID=y
 CONFIG_SYNC_FILE=y
 # CONFIG_SW_SYNC is not set
 CONFIG_UDMABUF=y
+# end of DMABUF options
+
 CONFIG_DCA=m
 CONFIG_AUXDISPLAY=y
 # CONFIG_HD44780 is not set
@@ -6926,6 +7358,7 @@ CONFIG_VIRTIO=m
 CONFIG_VIRTIO_MENU=y
 CONFIG_VIRTIO_PCI=m
 CONFIG_VIRTIO_PCI_LEGACY=y
+# CONFIG_VIRTIO_PMEM is not set
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_INPUT=m
 CONFIG_VIRTIO_MMIO=m
@@ -6935,15 +7368,16 @@ CONFIG_VIRTIO_MMIO=m
 # Microsoft Hyper-V guest support
 #
 CONFIG_HYPERV=m
+CONFIG_HYPERV_TIMER=y
 CONFIG_HYPERV_TSCPAGE=y
 CONFIG_HYPERV_UTILS=m
 CONFIG_HYPERV_BALLOON=m
+# end of Microsoft Hyper-V guest support
 
 #
 # Xen driver support
 #
 CONFIG_XEN_BALLOON=y
-# CONFIG_XEN_SELFBALLOONING is not set
 # CONFIG_XEN_BALLOON_MEMORY_HOTPLUG is not set
 CONFIG_XEN_SCRUB_PAGES_DEFAULT=y
 CONFIG_XEN_DEV_EVTCHN=m
@@ -6957,7 +7391,6 @@ CONFIG_XEN_GNTDEV_DMABUF=y
 CONFIG_XEN_GRANT_DEV_ALLOC=m
 CONFIG_XEN_GRANT_DMA_ALLOC=y
 CONFIG_SWIOTLB_XEN=y
-CONFIG_XEN_TMEM=m
 CONFIG_XEN_PCIDEV_BACKEND=m
 CONFIG_XEN_PVCALLS_FRONTEND=m
 # CONFIG_XEN_PVCALLS_BACKEND is not set
@@ -6971,6 +7404,8 @@ CONFIG_XEN_AUTO_XLATE=y
 CONFIG_XEN_ACPI=y
 CONFIG_XEN_SYMS=y
 CONFIG_XEN_HAVE_VPMU=y
+# end of Xen driver support
+
 CONFIG_STAGING=y
 CONFIG_PRISM2_USB=m
 CONFIG_COMEDI=m
@@ -7066,8 +7501,6 @@ CONFIG_RTL8723BS=m
 CONFIG_R8712U=m
 CONFIG_R8188EU=m
 CONFIG_88EU_AP_MODE=y
-CONFIG_R8822BE=m
-CONFIG_RTLWIFI_DEBUG_ST=y
 CONFIG_RTS5208=m
 CONFIG_VT6655=m
 CONFIG_VT6656=m
@@ -7081,14 +7514,15 @@ CONFIG_VT6656=m
 #
 CONFIG_ADIS16203=m
 CONFIG_ADIS16240=m
+# end of Accelerometers
 
 #
 # Analog to digital converters
 #
-CONFIG_AD7780=m
 CONFIG_AD7816=m
 CONFIG_AD7192=m
 CONFIG_AD7280=m
+# end of Analog to digital converters
 
 #
 # Analog digital bi-direction converters
@@ -7096,23 +7530,27 @@ CONFIG_AD7280=m
 CONFIG_ADT7316=m
 CONFIG_ADT7316_SPI=m
 CONFIG_ADT7316_I2C=m
+# end of Analog digital bi-direction converters
 
 #
 # Capacitance to digital converters
 #
 CONFIG_AD7150=m
 CONFIG_AD7746=m
+# end of Capacitance to digital converters
 
 #
 # Direct Digital Synthesis
 #
 CONFIG_AD9832=m
 CONFIG_AD9834=m
+# end of Direct Digital Synthesis
 
 #
 # Network Analyzer, Impedance Converters
 #
 CONFIG_AD5933=m
+# end of Network Analyzer, Impedance Converters
 
 #
 # Active energy metering IC
@@ -7120,11 +7558,15 @@ CONFIG_AD5933=m
 CONFIG_ADE7854=m
 CONFIG_ADE7854_I2C=m
 CONFIG_ADE7854_SPI=m
+# end of Active energy metering IC
 
 #
 # Resolver to digital converters
 #
 CONFIG_AD2S1210=m
+# end of Resolver to digital converters
+# end of IIO staging drivers
+
 CONFIG_FB_SM750=m
 
 #
@@ -7142,16 +7584,10 @@ CONFIG_SPEAKUP_SYNTH_SOFT=m
 CONFIG_SPEAKUP_SYNTH_SPKOUT=m
 CONFIG_SPEAKUP_SYNTH_TXPRT=m
 CONFIG_SPEAKUP_SYNTH_DUMMY=m
+# end of Speakup console speech
+
 CONFIG_STAGING_MEDIA=y
 CONFIG_I2C_BCM2048=m
-CONFIG_VIDEO_ZORAN=m
-CONFIG_VIDEO_ZORAN_DC30=m
-CONFIG_VIDEO_ZORAN_ZR36060=m
-CONFIG_VIDEO_ZORAN_BUZ=m
-CONFIG_VIDEO_ZORAN_DC10=m
-CONFIG_VIDEO_ZORAN_LML33=m
-CONFIG_VIDEO_ZORAN_LML33R10=m
-CONFIG_VIDEO_ZORAN_AVS6EYES=m
 CONFIG_VIDEO_IPU3_IMGU=m
 
 #
@@ -7161,6 +7597,8 @@ CONFIG_VIDEO_IPU3_IMGU=m
 #
 # Android
 #
+# end of Android
+
 CONFIG_LTE_GDM724X=m
 CONFIG_FIREWIRE_SERIAL=m
 CONFIG_FWTTY_MAX_TOTAL_PORTS=64
@@ -7233,7 +7671,6 @@ CONFIG_GREYBUS_SDIO=m
 CONFIG_GREYBUS_SPI=m
 CONFIG_GREYBUS_UART=m
 CONFIG_GREYBUS_USB=m
-CONFIG_DRM_VBOXVIDEO=m
 CONFIG_PI433=m
 
 #
@@ -7241,6 +7678,8 @@ CONFIG_PI433=m
 #
 CONFIG_STAGING_GASKET_FRAMEWORK=m
 CONFIG_STAGING_APEX_DRIVER=m
+# end of Gasket devices
+
 CONFIG_EROFS_FS=m
 # CONFIG_EROFS_FS_DEBUG is not set
 CONFIG_EROFS_FS_XATTR=y
@@ -7250,6 +7689,8 @@ CONFIG_EROFS_FS_SECURITY=y
 # CONFIG_EROFS_FAULT_INJECTION is not set
 CONFIG_EROFS_FS_IO_MAX_RETRIES=5
 # CONFIG_EROFS_FS_ZIP is not set
+# CONFIG_FIELDBUS_DEV is not set
+# CONFIG_KPC2000 is not set
 CONFIG_X86_PLATFORM_DEVICES=y
 CONFIG_ACER_WMI=m
 # CONFIG_ACER_WIRELESS is not set
@@ -7300,6 +7741,7 @@ CONFIG_ASUS_WIRELESS=m
 CONFIG_ACPI_WMI=m
 CONFIG_WMI_BMOF=m
 CONFIG_INTEL_WMI_THUNDERBOLT=m
+# CONFIG_XIAOMI_WMI is not set
 CONFIG_MSI_WMI=m
 CONFIG_PEAQ_WMI=m
 CONFIG_TOPSTAR_LAPTOP=m
@@ -7307,7 +7749,7 @@ CONFIG_ACPI_TOSHIBA=m
 CONFIG_TOSHIBA_BT_RFKILL=m
 CONFIG_TOSHIBA_HAPS=m
 CONFIG_TOSHIBA_WMI=m
-CONFIG_ACPI_CMPC=m
+# CONFIG_ACPI_CMPC is not set
 # CONFIG_INTEL_INT0002_VGPIO is not set
 CONFIG_INTEL_HID_EVENT=m
 CONFIG_INTEL_VBTN=m
@@ -7317,7 +7759,7 @@ CONFIG_IBM_RTL=m
 CONFIG_SAMSUNG_LAPTOP=m
 CONFIG_MXM_WMI=m
 CONFIG_INTEL_OAKTRAIL=m
-CONFIG_SAMSUNG_Q10=m
+# CONFIG_SAMSUNG_Q10 is not set
 CONFIG_APPLE_GMUX=m
 CONFIG_INTEL_RST=m
 CONFIG_INTEL_SMARTCONNECT=m
@@ -7333,17 +7775,26 @@ CONFIG_I2C_MULTI_INSTANTIATE=m
 CONFIG_INTEL_ATOMISP2_PM=m
 CONFIG_HUAWEI_WMI=m
 CONFIG_PCENGINES_APU2=m
+
+#
+# Intel Speed Select Technology interface support
+#
+# CONFIG_INTEL_SPEED_SELECT_INTERFACE is not set
+# end of Intel Speed Select Technology interface support
+
 CONFIG_PMC_ATOM=y
 CONFIG_CHROME_PLATFORMS=y
 CONFIG_CHROMEOS_LAPTOP=m
 CONFIG_CHROMEOS_PSTORE=m
 # CONFIG_CHROMEOS_TBMC is not set
 CONFIG_CROS_EC_I2C=m
+# CONFIG_CROS_EC_ISHTP is not set
 CONFIG_CROS_EC_SPI=m
 CONFIG_CROS_EC_LPC=m
-# CONFIG_CROS_EC_LPC_MEC is not set
 CONFIG_CROS_EC_PROTO=y
 CONFIG_CROS_KBD_LED_BACKLIGHT=m
+CONFIG_CROS_USBPD_LOGGER=m
+# CONFIG_WILCO_EC is not set
 # CONFIG_MELLANOX_PLATFORM is not set
 CONFIG_CLKDEV_LOOKUP=y
 CONFIG_HAVE_CLK_PREPARE=y
@@ -7354,11 +7805,14 @@ CONFIG_COMMON_CLK=y
 #
 CONFIG_COMMON_CLK_WM831X=m
 # CONFIG_COMMON_CLK_MAX9485 is not set
+# CONFIG_COMMON_CLK_SI5341 is not set
 CONFIG_COMMON_CLK_SI5351=m
 CONFIG_COMMON_CLK_SI544=m
 CONFIG_COMMON_CLK_CDCE706=m
 CONFIG_COMMON_CLK_CS2000_CP=m
 CONFIG_COMMON_CLK_PWM=m
+# end of Common Clock Framework
+
 # CONFIG_HWSPINLOCK is not set
 
 #
@@ -7367,6 +7821,8 @@ CONFIG_COMMON_CLK_PWM=m
 CONFIG_CLKEVT_I8253=y
 CONFIG_I8253_LOCK=y
 CONFIG_CLKBLD_I8253=y
+# end of Clock Source drivers
+
 CONFIG_MAILBOX=y
 CONFIG_PCC=y
 CONFIG_ALTERA_MBOX=m
@@ -7377,6 +7833,8 @@ CONFIG_IOMMU_SUPPORT=y
 #
 # Generic IOMMU Pagetable Support
 #
+# end of Generic IOMMU Pagetable Support
+
 # CONFIG_IOMMU_DEBUGFS is not set
 # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
 CONFIG_AMD_IOMMU=y
@@ -7393,6 +7851,7 @@ CONFIG_HYPERV_IOMMU=y
 # Remoteproc drivers
 #
 CONFIG_REMOTEPROC=m
+# end of Remoteproc drivers
 
 #
 # Rpmsg drivers
@@ -7401,6 +7860,8 @@ CONFIG_RPMSG=m
 CONFIG_RPMSG_CHAR=m
 # CONFIG_RPMSG_QCOM_GLINK_RPM is not set
 CONFIG_RPMSG_VIRTIO=m
+# end of Rpmsg drivers
+
 # CONFIG_SOUNDWIRE is not set
 
 #
@@ -7410,28 +7871,42 @@ CONFIG_RPMSG_VIRTIO=m
 #
 # Amlogic SoC drivers
 #
+# end of Amlogic SoC drivers
+
+#
+# Aspeed SoC drivers
+#
+# end of Aspeed SoC drivers
 
 #
 # Broadcom SoC drivers
 #
+# end of Broadcom SoC drivers
 
 #
 # NXP/Freescale QorIQ SoC drivers
 #
+# end of NXP/Freescale QorIQ SoC drivers
 
 #
 # i.MX SoC drivers
 #
+# end of i.MX SoC drivers
 
 #
 # Qualcomm SoC drivers
 #
+# end of Qualcomm SoC drivers
+
 # CONFIG_SOC_TI is not set
 
 #
 # Xilinx SoC drivers
 #
 # CONFIG_XILINX_VCU is not set
+# end of Xilinx SoC drivers
+# end of SOC (System On Chip) specific Drivers
+
 CONFIG_PM_DEVFREQ=y
 
 #
@@ -7455,6 +7930,7 @@ CONFIG_EXTCON=y
 CONFIG_EXTCON_ADC_JACK=m
 CONFIG_EXTCON_ARIZONA=m
 CONFIG_EXTCON_AXP288=m
+# CONFIG_EXTCON_FSA9480 is not set
 CONFIG_EXTCON_GPIO=m
 CONFIG_EXTCON_INTEL_INT3496=m
 CONFIG_EXTCON_MAX3355=m
@@ -7518,6 +7994,7 @@ CONFIG_MXC6255=m
 CONFIG_SCA3000=m
 CONFIG_STK8312=m
 CONFIG_STK8BA50=m
+# end of Accelerometers
 
 #
 # Analog to digital converters
@@ -7533,6 +8010,7 @@ CONFIG_AD7606_IFACE_PARALLEL=m
 CONFIG_AD7606_IFACE_SPI=m
 CONFIG_AD7766=m
 CONFIG_AD7768_1=m
+CONFIG_AD7780=m
 CONFIG_AD7791=m
 CONFIG_AD7793=m
 CONFIG_AD7887=m
@@ -7576,15 +8054,19 @@ CONFIG_TI_ADS7950=m
 CONFIG_TI_AM335X_ADC=m
 CONFIG_TI_TLC4541=m
 CONFIG_VIPERBOARD_ADC=m
+# CONFIG_XILINX_XADC is not set
+# end of Analog to digital converters
 
 #
 # Analog Front Ends
 #
+# end of Analog Front Ends
 
 #
 # Amplifiers
 #
 CONFIG_AD8366=m
+# end of Amplifiers
 
 #
 # Chemical Sensors
@@ -7599,14 +8081,19 @@ CONFIG_PMS7003=m
 CONFIG_SENSIRION_SGP30=m
 CONFIG_SPS30=m
 CONFIG_VZ89X=m
+# end of Chemical Sensors
+
 CONFIG_IIO_CROS_EC_SENSORS_CORE=m
 CONFIG_IIO_CROS_EC_SENSORS=m
+# CONFIG_IIO_CROS_EC_SENSORS_LID_ANGLE is not set
 
 #
 # Hid Sensor IIO Common
 #
 CONFIG_HID_SENSOR_IIO_COMMON=m
 CONFIG_HID_SENSOR_IIO_TRIGGER=m
+# end of Hid Sensor IIO Common
+
 CONFIG_IIO_MS_SENSORS_I2C=m
 
 #
@@ -7614,14 +8101,12 @@ CONFIG_IIO_MS_SENSORS_I2C=m
 #
 CONFIG_IIO_SSP_SENSORS_COMMONS=m
 CONFIG_IIO_SSP_SENSORHUB=m
+# end of SSP Sensor Common
+
 CONFIG_IIO_ST_SENSORS_I2C=m
 CONFIG_IIO_ST_SENSORS_SPI=m
 CONFIG_IIO_ST_SENSORS_CORE=m
 
-#
-# Counters
-#
-
 #
 # Digital to analog converters
 #
@@ -7656,6 +8141,7 @@ CONFIG_TI_DAC082S085=m
 # CONFIG_TI_DAC5571 is not set
 CONFIG_TI_DAC7311=m
 CONFIG_TI_DAC7612=m
+# end of Digital to analog converters
 
 #
 # IIO dummy driver
@@ -7663,6 +8149,7 @@ CONFIG_TI_DAC7612=m
 CONFIG_IIO_SIMPLE_DUMMY=m
 # CONFIG_IIO_SIMPLE_DUMMY_EVENTS is not set
 # CONFIG_IIO_SIMPLE_DUMMY_BUFFER is not set
+# end of IIO dummy driver
 
 #
 # Frequency Synthesizers DDS/PLL
@@ -7672,11 +8159,15 @@ CONFIG_IIO_SIMPLE_DUMMY=m
 # Clock Generator/Distribution
 #
 CONFIG_AD9523=m
+# end of Clock Generator/Distribution
 
 #
 # Phase-Locked Loop (PLL) frequency synthesizers
 #
 CONFIG_ADF4350=m
+# CONFIG_ADF4371 is not set
+# end of Phase-Locked Loop (PLL) frequency synthesizers
+# end of Frequency Synthesizers DDS/PLL
 
 #
 # Digital gyroscope sensors
@@ -7689,6 +8180,9 @@ CONFIG_ADXRS450=m
 CONFIG_BMG160=m
 CONFIG_BMG160_I2C=m
 CONFIG_BMG160_SPI=m
+CONFIG_FXAS21002C=m
+CONFIG_FXAS21002C_I2C=m
+CONFIG_FXAS21002C_SPI=m
 CONFIG_HID_SENSOR_GYRO_3D=m
 CONFIG_MPU3050=m
 CONFIG_MPU3050_I2C=m
@@ -7696,6 +8190,7 @@ CONFIG_IIO_ST_GYRO_3AXIS=m
 CONFIG_IIO_ST_GYRO_I2C_3AXIS=m
 CONFIG_IIO_ST_GYRO_SPI_3AXIS=m
 CONFIG_ITG3200=m
+# end of Digital gyroscope sensors
 
 #
 # Health Sensors
@@ -7708,6 +8203,8 @@ CONFIG_AFE4403=m
 CONFIG_AFE4404=m
 CONFIG_MAX30100=m
 # CONFIG_MAX30102 is not set
+# end of Heart Rate Monitors
+# end of Health Sensors
 
 #
 # Humidity sensors
@@ -7722,6 +8219,7 @@ CONFIG_HTS221_SPI=m
 CONFIG_HTU21=m
 CONFIG_SI7005=m
 CONFIG_SI7020=m
+# end of Humidity sensors
 
 #
 # Inertial measurement units
@@ -7738,6 +8236,8 @@ CONFIG_INV_MPU6050_SPI=m
 CONFIG_IIO_ST_LSM6DSX=m
 CONFIG_IIO_ST_LSM6DSX_I2C=m
 CONFIG_IIO_ST_LSM6DSX_SPI=m
+# end of Inertial measurement units
+
 CONFIG_IIO_ADIS_LIB=m
 CONFIG_IIO_ADIS_LIB_BUFFER=y
 
@@ -7787,6 +8287,7 @@ CONFIG_VCNL4035=m
 CONFIG_VEML6070=m
 # CONFIG_VL6180 is not set
 # CONFIG_ZOPT2201 is not set
+# end of Light sensors
 
 #
 # Magnetometer sensors
@@ -7807,16 +8308,19 @@ CONFIG_IIO_ST_MAGN_SPI_3AXIS=m
 CONFIG_SENSORS_RM3100=m
 CONFIG_SENSORS_RM3100_I2C=m
 CONFIG_SENSORS_RM3100_SPI=m
+# end of Magnetometer sensors
 
 #
 # Multiplexers
 #
+# end of Multiplexers
 
 #
 # Inclinometer sensors
 #
 CONFIG_HID_SENSOR_INCLINOMETER_3D=m
 # CONFIG_HID_SENSOR_DEVICE_ROTATION is not set
+# end of Inclinometer sensors
 
 #
 # Triggers - standalone
@@ -7825,6 +8329,7 @@ CONFIG_IIO_HRTIMER_TRIGGER=m
 CONFIG_IIO_INTERRUPT_TRIGGER=m
 CONFIG_IIO_TIGHTLOOP_TRIGGER=m
 CONFIG_IIO_SYSFS_TRIGGER=m
+# end of Triggers - standalone
 
 #
 # Digital potentiometers
@@ -7838,11 +8343,13 @@ CONFIG_MCP4131=m
 CONFIG_MCP4531=m
 CONFIG_MCP41010=m
 CONFIG_TPL0102=m
+# end of Digital potentiometers
 
 #
 # Digital potentiostats
 #
 CONFIG_LMP91000=m
+# end of Digital potentiostats
 
 #
 # Pressure sensors
@@ -7852,6 +8359,7 @@ CONFIG_BMP280=m
 CONFIG_BMP280_I2C=m
 CONFIG_BMP280_SPI=m
 CONFIG_IIO_CROS_EC_BARO=m
+# CONFIG_DPS310 is not set
 CONFIG_HID_SENSOR_PRESS=m
 CONFIG_HP03=m
 CONFIG_MPL115=m
@@ -7870,28 +8378,33 @@ CONFIG_HP206C=m
 CONFIG_ZPA2326=m
 CONFIG_ZPA2326_I2C=m
 CONFIG_ZPA2326_SPI=m
+# end of Pressure sensors
 
 #
 # Lightning sensors
 #
 # CONFIG_AS3935 is not set
+# end of Lightning sensors
 
 #
 # Proximity and distance sensors
 #
 CONFIG_ISL29501=m
 CONFIG_LIDAR_LITE_V2=m
+CONFIG_MB1232=m
 CONFIG_RFD77402=m
 # CONFIG_SRF04 is not set
 CONFIG_SX9500=m
 CONFIG_SRF08=m
 CONFIG_VL53L0X_I2C=m
+# end of Proximity and distance sensors
 
 #
 # Resolver to digital converters
 #
 CONFIG_AD2S90=m
 CONFIG_AD2S1200=m
+# end of Resolver to digital converters
 
 #
 # Temperature sensors
@@ -7904,7 +8417,11 @@ CONFIG_TMP006=m
 CONFIG_TMP007=m
 CONFIG_TSYS01=m
 CONFIG_TSYS02D=m
+CONFIG_MAX31856=m
+# end of Temperature sensors
+
 CONFIG_NTB=m
+# CONFIG_NTB_MSI is not set
 CONFIG_NTB_AMD=m
 # CONFIG_NTB_IDT is not set
 CONFIG_NTB_INTEL=m
@@ -7926,18 +8443,14 @@ CONFIG_PWM_PCA9685=m
 #
 # IRQ chip support
 #
-CONFIG_ARM_GIC_MAX_NR=1
 CONFIG_MADERA_IRQ=m
+# end of IRQ chip support
+
 CONFIG_IPACK_BUS=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_SERIAL_IPOCTAL=m
 CONFIG_RESET_CONTROLLER=y
 # CONFIG_RESET_TI_SYSCON is not set
-CONFIG_FMC=m
-CONFIG_FMC_FAKEDEV=m
-CONFIG_FMC_TRIVIAL=m
-CONFIG_FMC_WRITE_EEPROM=m
-CONFIG_FMC_CHARDEV=m
 
 #
 # PHY Subsystem
@@ -7950,7 +8463,10 @@ CONFIG_PHY_PXA_28NM_USB2=m
 CONFIG_PHY_QCOM_USB_HS=m
 CONFIG_PHY_QCOM_USB_HSIC=m
 CONFIG_PHY_TUSB1210=m
+# end of PHY Subsystem
+
 CONFIG_POWERCAP=y
+CONFIG_INTEL_RAPL_CORE=m
 CONFIG_INTEL_RAPL=m
 CONFIG_IDLE_INJECT=y
 CONFIG_MCB=m
@@ -7960,6 +8476,8 @@ CONFIG_MCB_LPC=m
 #
 # Performance monitor support
 #
+# end of Performance monitor support
+
 CONFIG_RAS=y
 # CONFIG_RAS_CEC is not set
 CONFIG_THUNDERBOLT=m
@@ -7968,6 +8486,8 @@ CONFIG_THUNDERBOLT=m
 # Android
 #
 # CONFIG_ANDROID is not set
+# end of Android
+
 CONFIG_LIBNVDIMM=y
 CONFIG_BLK_DEV_PMEM=m
 CONFIG_ND_BLK=m
@@ -7984,6 +8504,7 @@ CONFIG_DEV_DAX_PMEM=m
 CONFIG_DEV_DAX_KMEM=m
 CONFIG_DEV_DAX_PMEM_COMPAT=m
 CONFIG_NVMEM=y
+CONFIG_NVMEM_SYSFS=y
 
 #
 # HW tracing support
@@ -8003,6 +8524,8 @@ CONFIG_INTEL_TH_STH=m
 CONFIG_INTEL_TH_MSU=m
 CONFIG_INTEL_TH_PTI=m
 # CONFIG_INTEL_TH_DEBUG is not set
+# end of HW tracing support
+
 CONFIG_FPGA=m
 # CONFIG_ALTERA_PR_IP_CORE is not set
 CONFIG_FPGA_MGR_ALTERA_PS_SPI=m
@@ -8025,6 +8548,8 @@ CONFIG_PM_OPP=y
 # CONFIG_SIOX is not set
 # CONFIG_SLIMBUS is not set
 CONFIG_INTERCONNECT=m
+# CONFIG_COUNTER is not set
+# end of Device Drivers
 
 #
 # File systems
@@ -8128,6 +8653,7 @@ CONFIG_FSCACHE=m
 CONFIG_CACHEFILES=m
 # CONFIG_CACHEFILES_DEBUG is not set
 # CONFIG_CACHEFILES_HISTOGRAM is not set
+# end of Caches
 
 #
 # CD-ROM/DVD Filesystems
@@ -8136,6 +8662,7 @@ CONFIG_ISO9660_FS=m
 CONFIG_JOLIET=y
 CONFIG_ZISOFS=y
 CONFIG_UDF_FS=m
+# end of CD-ROM/DVD Filesystems
 
 #
 # DOS/FAT/NT Filesystems
@@ -8149,6 +8676,7 @@ CONFIG_FAT_DEFAULT_UTF8=y
 CONFIG_NTFS_FS=m
 # CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
+# end of DOS/FAT/NT Filesystems
 
 #
 # Pseudo filesystems
@@ -8160,6 +8688,7 @@ CONFIG_PROC_VMCORE=y
 CONFIG_PROC_SYSCTL=y
 CONFIG_PROC_PAGE_MONITOR=y
 CONFIG_PROC_CHILDREN=y
+CONFIG_PROC_PID_ARCH_STATUS=y
 CONFIG_KERNFS=y
 CONFIG_SYSFS=y
 CONFIG_TMPFS=y
@@ -8171,6 +8700,8 @@ CONFIG_MEMFD_CREATE=y
 CONFIG_ARCH_HAS_GIGANTIC_PAGE=y
 CONFIG_CONFIGFS_FS=m
 CONFIG_EFIVAR_FS=y
+# end of Pseudo filesystems
+
 CONFIG_MISC_FILESYSTEMS=y
 CONFIG_ORANGEFS_FS=m
 CONFIG_ADFS_FS=m
@@ -8180,7 +8711,8 @@ CONFIG_ECRYPT_FS=m
 # CONFIG_ECRYPT_FS_MESSAGING is not set
 CONFIG_HFS_FS=m
 CONFIG_HFSPLUS_FS=m
-# CONFIG_BEFS_FS is not set
+CONFIG_BEFS_FS=m
+# CONFIG_BEFS_DEBUG is not set
 # CONFIG_BFS_FS is not set
 # CONFIG_EFS_FS is not set
 # CONFIG_JFFS2_FS is not set
@@ -8269,12 +8801,13 @@ CONFIG_SUNRPC_GSS=m
 CONFIG_SUNRPC_BACKCHANNEL=y
 CONFIG_SUNRPC_SWAP=y
 CONFIG_RPCSEC_GSS_KRB5=m
-CONFIG_CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y
+# CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES is not set
 # CONFIG_SUNRPC_DEBUG is not set
 CONFIG_SUNRPC_XPRT_RDMA=m
 CONFIG_CEPH_FS=m
 CONFIG_CEPH_FSCACHE=y
 CONFIG_CEPH_FS_POSIX_ACL=y
+# CONFIG_CEPH_FS_SECURITY_LABEL is not set
 CONFIG_CIFS=m
 # CONFIG_CIFS_STATS2 is not set
 CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
@@ -8282,7 +8815,6 @@ CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
 CONFIG_CIFS_UPCALL=y
 CONFIG_CIFS_XATTR=y
 CONFIG_CIFS_POSIX=y
-CONFIG_CIFS_ACL=y
 # CONFIG_CIFS_DEBUG is not set
 CONFIG_CIFS_DFS_UPCALL=y
 # CONFIG_CIFS_SMB_DIRECT is not set
@@ -8349,12 +8881,16 @@ CONFIG_NLS_MAC_TURKISH=m
 CONFIG_NLS_UTF8=m
 CONFIG_DLM=m
 # CONFIG_DLM_DEBUG is not set
+CONFIG_UNICODE=y
+# CONFIG_UNICODE_NORMALIZATION_SELFTEST is not set
+# end of File systems
 
 #
 # Security options
 #
 CONFIG_KEYS=y
 CONFIG_KEYS_COMPAT=y
+# CONFIG_KEYS_REQUEST_CACHE is not set
 # CONFIG_PERSISTENT_KEYRINGS is not set
 # CONFIG_BIG_KEYS is not set
 CONFIG_TRUSTED_KEYS=m
@@ -8400,6 +8936,25 @@ CONFIG_INTEGRITY_AUDIT=y
 # CONFIG_DEFAULT_SECURITY_APPARMOR is not set
 CONFIG_DEFAULT_SECURITY_DAC=y
 CONFIG_LSM="yama,loadpin,safesetid,integrity"
+
+#
+# Kernel hardening options
+#
+
+#
+# Memory initialization
+#
+CONFIG_INIT_STACK_NONE=y
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_USER is not set
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL is not set
+# CONFIG_GCC_PLUGIN_STACKLEAK is not set
+# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
+# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
+# end of Memory initialization
+# end of Kernel hardening options
+# end of Security options
+
 CONFIG_XOR_BLOCKS=m
 CONFIG_ASYNC_CORE=m
 CONFIG_ASYNC_MEMCPY=m
@@ -8427,9 +8982,6 @@ CONFIG_CRYPTO_AKCIPHER=y
 CONFIG_CRYPTO_KPP2=y
 CONFIG_CRYPTO_KPP=y
 CONFIG_CRYPTO_ACOMP2=y
-CONFIG_CRYPTO_RSA=y
-CONFIG_CRYPTO_DH=y
-CONFIG_CRYPTO_ECDH=m
 CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MANAGER2=y
 CONFIG_CRYPTO_USER=m
@@ -8438,7 +8990,6 @@ CONFIG_CRYPTO_GF128MUL=m
 CONFIG_CRYPTO_NULL=m
 CONFIG_CRYPTO_NULL2=y
 CONFIG_CRYPTO_PCRYPT=m
-CONFIG_CRYPTO_WORKQUEUE=y
 CONFIG_CRYPTO_CRYPTD=m
 CONFIG_CRYPTO_AUTHENC=m
 CONFIG_CRYPTO_TEST=m
@@ -8446,6 +8997,15 @@ CONFIG_CRYPTO_SIMD=m
 CONFIG_CRYPTO_GLUE_HELPER_X86=m
 CONFIG_CRYPTO_ENGINE=m
 
+#
+# Public-key cryptography
+#
+CONFIG_CRYPTO_RSA=y
+CONFIG_CRYPTO_DH=y
+CONFIG_CRYPTO_ECC=m
+CONFIG_CRYPTO_ECDH=m
+CONFIG_CRYPTO_ECRDSA=m
+
 #
 # Authenticated Encryption with Associated Data
 #
@@ -8499,6 +9059,7 @@ CONFIG_CRYPTO_CRC32C=m
 CONFIG_CRYPTO_CRC32C_INTEL=m
 CONFIG_CRYPTO_CRC32=m
 CONFIG_CRYPTO_CRC32_PCLMUL=m
+# CONFIG_CRYPTO_XXHASH is not set
 CONFIG_CRYPTO_CRCT10DIF=y
 CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m
 CONFIG_CRYPTO_GHASH=m
@@ -8519,7 +9080,7 @@ CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA512=y
 CONFIG_CRYPTO_SHA3=m
 CONFIG_CRYPTO_SM3=m
-# CONFIG_CRYPTO_STREEBOG is not set
+CONFIG_CRYPTO_STREEBOG=m
 CONFIG_CRYPTO_TGR192=m
 CONFIG_CRYPTO_WP512=m
 CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
@@ -8532,6 +9093,7 @@ CONFIG_CRYPTO_AES_TI=m
 CONFIG_CRYPTO_AES_X86_64=m
 CONFIG_CRYPTO_AES_NI_INTEL=m
 CONFIG_CRYPTO_ANUBIS=m
+CONFIG_CRYPTO_LIB_ARC4=m
 CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_BLOWFISH=m
 CONFIG_CRYPTO_BLOWFISH_COMMON=m
@@ -8596,6 +9158,8 @@ CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_PADLOCK=m
 CONFIG_CRYPTO_DEV_PADLOCK_AES=m
 CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
+# CONFIG_CRYPTO_DEV_ATMEL_ECC is not set
+# CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set
 CONFIG_CRYPTO_DEV_CCP=y
 CONFIG_CRYPTO_DEV_CCP_DD=m
 CONFIG_CRYPTO_DEV_SP_CCP=y
@@ -8630,6 +9194,8 @@ CONFIG_SYSTEM_TRUSTED_KEYS=""
 # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
 # CONFIG_SECONDARY_TRUSTED_KEYRING is not set
 # CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
+# end of Certificates for signature checking
+
 CONFIG_BINARY_PRINTF=y
 
 #
@@ -8637,12 +9203,14 @@ CONFIG_BINARY_PRINTF=y
 #
 CONFIG_RAID6_PQ=m
 CONFIG_RAID6_PQ_BENCHMARK=y
+CONFIG_PACKING=y
 CONFIG_BITREVERSE=y
-CONFIG_RATIONAL=y
 CONFIG_GENERIC_STRNCPY_FROM_USER=y
 CONFIG_GENERIC_STRNLEN_USER=y
 CONFIG_GENERIC_NET_UTILS=y
 CONFIG_GENERIC_FIND_FIRST_BIT=y
+CONFIG_CORDIC=m
+CONFIG_RATIONAL=y
 CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_GENERIC_IOMAP=y
 CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
@@ -8694,8 +9262,8 @@ CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_REED_SOLOMON=m
 CONFIG_REED_SOLOMON_ENC8=y
 CONFIG_REED_SOLOMON_DEC8=y
+CONFIG_REED_SOLOMON_DEC16=y
 CONFIG_BCH=m
-CONFIG_BCH_CONST_PARAMS=y
 CONFIG_TEXTSEARCH=y
 CONFIG_TEXTSEARCH_KMP=m
 CONFIG_TEXTSEARCH_BM=m
@@ -8724,12 +9292,13 @@ CONFIG_GLOB=y
 CONFIG_NLATTR=y
 CONFIG_LRU_CACHE=m
 CONFIG_CLZ_TAB=y
-CONFIG_CORDIC=m
-CONFIG_DDR=y
 CONFIG_IRQ_POLL=y
 CONFIG_MPILIB=y
+CONFIG_DIMLIB=y
 CONFIG_OID_REGISTRY=y
 CONFIG_UCS2_STRING=y
+CONFIG_HAVE_GENERIC_VDSO=y
+CONFIG_GENERIC_GETTIMEOFDAY=y
 CONFIG_FONT_SUPPORT=y
 CONFIG_FONTS=y
 # CONFIG_FONT_8x8 is not set
@@ -8749,10 +9318,12 @@ CONFIG_SG_POOL=y
 CONFIG_ARCH_HAS_PMEM_API=y
 CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y
 CONFIG_ARCH_HAS_UACCESS_MCSAFE=y
+CONFIG_ARCH_STACKWALK=y
 CONFIG_SBITMAP=y
 CONFIG_PARMAN=m
-# CONFIG_STRING_SELFTEST is not set
 CONFIG_OBJAGG=m
+# CONFIG_STRING_SELFTEST is not set
+# end of Library routines
 
 #
 # Kernel hacking
@@ -8768,6 +9339,7 @@ CONFIG_CONSOLE_LOGLEVEL_QUIET=4
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_BOOT_PRINTK_DELAY is not set
 CONFIG_DYNAMIC_DEBUG=y
+# end of printk and dmesg options
 
 #
 # Compile-time checks and compiler options
@@ -8776,6 +9348,7 @@ CONFIG_DEBUG_INFO=y
 # CONFIG_DEBUG_INFO_REDUCED is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
 # CONFIG_DEBUG_INFO_DWARF4 is not set
+# CONFIG_DEBUG_INFO_BTF is not set
 # CONFIG_GDB_SCRIPTS is not set
 # CONFIG_ENABLE_MUST_CHECK is not set
 CONFIG_FRAME_WARN=1024
@@ -8783,15 +9356,19 @@ CONFIG_STRIP_ASM_SYMS=y
 # CONFIG_READABLE_ASM is not set
 # CONFIG_UNUSED_SYMBOLS is not set
 CONFIG_DEBUG_FS=y
-# CONFIG_HEADERS_CHECK is not set
+# CONFIG_HEADERS_INSTALL is not set
+# CONFIG_OPTIMIZE_INLINING is not set
 # CONFIG_DEBUG_SECTION_MISMATCH is not set
 CONFIG_SECTION_MISMATCH_WARN_ONLY=y
 CONFIG_STACK_VALIDATION=y
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+# end of Compile-time checks and compiler options
+
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
 CONFIG_MAGIC_SYSRQ_SERIAL=y
 CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_MISC=y
 
 #
 # Memory Debugging
@@ -8815,12 +9392,12 @@ CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
 # CONFIG_DEBUG_VIRTUAL is not set
 CONFIG_DEBUG_MEMORY_INIT=y
 # CONFIG_DEBUG_PER_CPU_MAPS is not set
-CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
-# CONFIG_DEBUG_STACKOVERFLOW is not set
 CONFIG_HAVE_ARCH_KASAN=y
 CONFIG_CC_HAS_KASAN_GENERIC=y
 # CONFIG_KASAN is not set
 CONFIG_KASAN_STACK=1
+# end of Memory Debugging
+
 CONFIG_ARCH_HAS_KCOV=y
 CONFIG_CC_HAS_SANCOV_TRACE_PC=y
 # CONFIG_KCOV is not set
@@ -8843,6 +9420,8 @@ CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
 CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
 # CONFIG_WQ_WATCHDOG is not set
+# end of Debug Lockups and Hangs
+
 # CONFIG_PANIC_ON_OOPS is not set
 CONFIG_PANIC_ON_OOPS_VALUE=0
 CONFIG_PANIC_TIMEOUT=0
@@ -8869,12 +9448,14 @@ CONFIG_LOCK_DEBUGGING_SUPPORT=y
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_LOCK_TORTURE_TEST is not set
 CONFIG_WW_MUTEX_SELFTEST=m
+# end of Lock Debugging (spinlocks, mutexes, etc...)
+
 CONFIG_STACKTRACE=y
 # CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
 # CONFIG_DEBUG_KOBJECT is not set
 CONFIG_DEBUG_BUGVERBOSE=y
 CONFIG_DEBUG_LIST=y
-# CONFIG_DEBUG_PI_LIST is not set
+# CONFIG_DEBUG_PLIST is not set
 # CONFIG_DEBUG_SG is not set
 CONFIG_DEBUG_NOTIFIERS=y
 CONFIG_DEBUG_CREDENTIALS=y
@@ -8888,6 +9469,8 @@ CONFIG_RCU_PERF_TEST=m
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
 # CONFIG_RCU_TRACE is not set
 # CONFIG_RCU_EQS_DEBUG is not set
+# end of RCU Debugging
+
 # CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
 # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
@@ -8946,7 +9529,6 @@ CONFIG_FTRACE_MCOUNT_RECORD=y
 # CONFIG_RING_BUFFER_STARTUP_TEST is not set
 CONFIG_PREEMPTIRQ_DELAY_TEST=m
 # CONFIG_TRACE_EVAL_MAP_FILE is not set
-CONFIG_TRACING_EVENTS_GPIO=y
 # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
 CONFIG_RUNTIME_TESTING_MENU=y
 CONFIG_LKDTM=m
@@ -8955,12 +9537,14 @@ CONFIG_LKDTM=m
 # CONFIG_KPROBES_SANITY_TEST is not set
 # CONFIG_BACKTRACE_SELF_TEST is not set
 # CONFIG_RBTREE_TEST is not set
+# CONFIG_REED_SOLOMON_TEST is not set
 # CONFIG_INTERVAL_TREE_TEST is not set
 # CONFIG_PERCPU_TEST is not set
 # CONFIG_ATOMIC64_SELFTEST is not set
 CONFIG_ASYNC_RAID6_TEST=m
 # CONFIG_TEST_HEXDUMP is not set
 CONFIG_TEST_STRING_HELPERS=m
+# CONFIG_TEST_STRSCPY is not set
 CONFIG_TEST_KSTRTOX=m
 CONFIG_TEST_PRINTF=m
 CONFIG_TEST_BITMAP=m
@@ -8976,6 +9560,7 @@ CONFIG_TEST_PARMAN=m
 # CONFIG_TEST_VMALLOC is not set
 # CONFIG_TEST_USER_COPY is not set
 # CONFIG_TEST_BPF is not set
+# CONFIG_TEST_BLACKHOLE_DEV is not set
 # CONFIG_FIND_BIT_BENCHMARK is not set
 # CONFIG_TEST_FIRMWARE is not set
 # CONFIG_TEST_SYSCTL is not set
@@ -8985,6 +9570,7 @@ CONFIG_TEST_STATIC_KEYS=m
 # CONFIG_TEST_MEMCAT_P is not set
 # CONFIG_TEST_OBJAGG is not set
 # CONFIG_TEST_STACKINIT is not set
+# CONFIG_TEST_MEMINIT is not set
 # CONFIG_MEMTEST is not set
 CONFIG_BUG_ON_DATA_CORRUPTION=y
 # CONFIG_SAMPLES is not set
@@ -9010,18 +9596,12 @@ CONFIG_DOUBLEFAULT=y
 # CONFIG_IOMMU_DEBUG is not set
 CONFIG_HAVE_MMIOTRACE_SUPPORT=y
 # CONFIG_X86_DECODER_SELFTEST is not set
-CONFIG_IO_DELAY_TYPE_0X80=0
-CONFIG_IO_DELAY_TYPE_0XED=1
-CONFIG_IO_DELAY_TYPE_UDELAY=2
-CONFIG_IO_DELAY_TYPE_NONE=3
 CONFIG_IO_DELAY_0X80=y
 # CONFIG_IO_DELAY_0XED is not set
 # CONFIG_IO_DELAY_UDELAY is not set
 # CONFIG_IO_DELAY_NONE is not set
-CONFIG_DEFAULT_IO_DELAY_TYPE=0
 # CONFIG_DEBUG_BOOT_PARAMS is not set
 # CONFIG_CPA_DEBUG is not set
-# CONFIG_OPTIMIZE_INLINING is not set
 # CONFIG_DEBUG_ENTRY is not set
 # CONFIG_DEBUG_NMI_SELFTEST is not set
 CONFIG_X86_DEBUG_FPU=y
@@ -9029,3 +9609,4 @@ CONFIG_X86_DEBUG_FPU=y
 CONFIG_UNWINDER_ORC=y
 # CONFIG_UNWINDER_FRAME_POINTER is not set
 # CONFIG_UNWINDER_GUESS is not set
+# end of Kernel hacking
diff --git a/srcpkgs/linux5.1/patches/ppc64-be-elfv2.patch b/srcpkgs/linux5.3/patches/ppc64-be-elfv2.patch
similarity index 100%
rename from srcpkgs/linux5.1/patches/ppc64-be-elfv2.patch
rename to srcpkgs/linux5.3/patches/ppc64-be-elfv2.patch
diff --git a/srcpkgs/linux5.1/patches/smsc95xx-mac.patch b/srcpkgs/linux5.3/patches/smsc95xx-mac.patch
similarity index 100%
rename from srcpkgs/linux5.1/patches/smsc95xx-mac.patch
rename to srcpkgs/linux5.3/patches/smsc95xx-mac.patch
diff --git a/srcpkgs/linux5.1/template b/srcpkgs/linux5.3/template
similarity index 96%
rename from srcpkgs/linux5.1/template
rename to srcpkgs/linux5.3/template
index 223c92a605d..895134128df 100644
--- a/srcpkgs/linux5.1/template
+++ b/srcpkgs/linux5.3/template
@@ -1,14 +1,14 @@
-# Template file for 'linux5.1'
-pkgname=linux5.1
-version=5.1.21
+# Template file for 'linux5.3'
+pkgname=linux5.3
+version=5.3.7
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
-maintainer="Helmut Pozimski <helmut@pozimski.eu>"
+maintainer="Foxlet <foxlet@furcode.co>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=56495f82314f0dfb84a3fe7fad78e17be69c4fd36ef46f2452458b2fa1e341f6
+checksum=c6c9714e21531c825c306b107bc6f6c7bfa2d5270a14bad170f8de5a73d34802
 patch_args="-Np1"
 
 nodebug=yes  # -dbg package is generated below manually
@@ -18,7 +18,8 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* armv5tel* armv6l* armv7l* aarch64* ppc*"
-hostmakedepends="bc elfutils-devel flex gmp-devel kmod libmpc-devel libressl-devel perl uboot-mkimage"
+hostmakedepends="bc elfutils-devel flex gmp-devel kmod libmpc-devel 
+ libressl-devel perl uboot-mkimage cpio"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"
@@ -37,7 +38,7 @@ mutable_files="
  /usr/lib/modules/${_kernver}/modules.devname"
 
 do_configure() {
-	# 5.1 misses Documentation/DocBook. We ship the directory from 4.12 here.
+	# 5.3 misses Documentation/DocBook. We ship the directory from 4.12 here.
 	cp -a $FILESDIR/DocBook -t Documentation
 
 	# If there's a file called <arch>-dotconfig, use it to
@@ -297,7 +298,7 @@ do_install() {
 	# ... and run depmod again.
 	depmod -b ${DESTDIR}/usr -F System.map ${_kernver}
 }
-linux5.1-headers_package() {
+linux5.3-headers_package() {
 	preserve=yes
 	nostrip=yes
 	noshlibprovides=yes
@@ -307,7 +308,7 @@ linux5.1-headers_package() {
 		vmove usr/lib/modules/${_kernver}/build
 	}
 }
-linux5.1-dbg_package() {
+linux5.3-dbg_package() {
 	preserve=yes
 	nostrip=yes
 	noverifyrdeps=yes
diff --git a/srcpkgs/lld b/srcpkgs/lld
index 8ec3476f9c1..14540d7bad2 120000
--- a/srcpkgs/lld
+++ b/srcpkgs/lld
@@ -1 +1 @@
-llvm8
\ No newline at end of file
+llvm9
\ No newline at end of file
diff --git a/srcpkgs/lld-devel b/srcpkgs/lld-devel
index 8ec3476f9c1..14540d7bad2 120000
--- a/srcpkgs/lld-devel
+++ b/srcpkgs/lld-devel
@@ -1 +1 @@
-llvm8
\ No newline at end of file
+llvm9
\ No newline at end of file
diff --git a/srcpkgs/lldb b/srcpkgs/lldb
index 8ec3476f9c1..14540d7bad2 120000
--- a/srcpkgs/lldb
+++ b/srcpkgs/lldb
@@ -1 +1 @@
-llvm8
\ No newline at end of file
+llvm9
\ No newline at end of file
diff --git a/srcpkgs/lldb-devel b/srcpkgs/lldb-devel
index 8ec3476f9c1..14540d7bad2 120000
--- a/srcpkgs/lldb-devel
+++ b/srcpkgs/lldb-devel
@@ -1 +1 @@
-llvm8
\ No newline at end of file
+llvm9
\ No newline at end of file
diff --git a/srcpkgs/llvm-libunwind/patches/ppc32.patch b/srcpkgs/llvm-libunwind/patches/ppc32.patch
new file mode 100644
index 00000000000..1408a0aafb0
--- /dev/null
+++ b/srcpkgs/llvm-libunwind/patches/ppc32.patch
@@ -0,0 +1,63 @@
+This fixes build at least with gcc9 which does not define `__ppc__`.
+
+--- include/__libunwind_config.h
++++ include/__libunwind_config.h
+@@ -49,7 +49,7 @@
+ #  define _LIBUNWIND_CONTEXT_SIZE 167
+ #  define _LIBUNWIND_CURSOR_SIZE 179
+ #  define _LIBUNWIND_HIGHEST_DWARF_REGISTER _LIBUNWIND_HIGHEST_DWARF_REGISTER_PPC64
+-# elif defined(__ppc__)
++# elif defined(__powerpc__)
+ #  define _LIBUNWIND_TARGET_PPC 1
+ #  define _LIBUNWIND_CONTEXT_SIZE 117
+ #  define _LIBUNWIND_CURSOR_SIZE 124
+--- src/UnwindRegistersRestore.S
++++ src/UnwindRegistersRestore.S
+@@ -392,7 +392,7 @@ Lnovec:
+   PPC64_LR(3)
+   bctr
+ 
+-#elif defined(__ppc__)
++#elif defined(__powerpc__)
+ 
+ DEFINE_LIBUNWIND_FUNCTION(_ZN9libunwind13Registers_ppc6jumptoEv)
+ //
+--- src/UnwindRegistersSave.S
++++ src/UnwindRegistersSave.S
+@@ -554,7 +554,7 @@ DEFINE_LIBUNWIND_FUNCTION(__unw_getcontext)
+   blr
+ 
+ 
+-#elif defined(__ppc__)
++#elif defined(__powerpc__)
+ 
+ //
+ // extern int unw_getcontext(unw_context_t* thread_state)
+--- src/config.h
++++ src/config.h
+@@ -95,12 +95,12 @@
+ #define _LIBUNWIND_BUILD_SJLJ_APIS
+ #endif
+ 
+-#if defined(__i386__) || defined(__x86_64__) || defined(__ppc__) || defined(__ppc64__) || defined(__powerpc64__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc__) || defined(__powerpc64__)
+ #define _LIBUNWIND_SUPPORT_FRAME_APIS
+ #endif
+ 
+ #if defined(__i386__) || defined(__x86_64__) ||                                \
+-    defined(__ppc__) || defined(__ppc64__) || defined(__powerpc64__) ||        \
++    defined(__powerpc__) || defined(__powerpc64__) ||                          \
+     (!defined(__APPLE__) && defined(__arm__)) ||                               \
+     (defined(__arm64__) || defined(__aarch64__)) ||                            \
+     defined(__mips__)
+--- src/libunwind.cpp
++++ src/libunwind.cpp
+@@ -42,7 +42,7 @@ _LIBUNWIND_HIDDEN int __unw_init_local(unw_cursor_t *cursor,
+ # define REGISTER_KIND Registers_x86_64
+ #elif defined(__powerpc64__)
+ # define REGISTER_KIND Registers_ppc64
+-#elif defined(__ppc__)
++#elif defined(__powerpc__)
+ # define REGISTER_KIND Registers_ppc
+ #elif defined(__aarch64__)
+ # define REGISTER_KIND Registers_arm64
diff --git a/srcpkgs/llvm-libunwind/template b/srcpkgs/llvm-libunwind/template
index e6d02df3b8f..c5dd2da671e 100644
--- a/srcpkgs/llvm-libunwind/template
+++ b/srcpkgs/llvm-libunwind/template
@@ -1,18 +1,18 @@
 # Template file for 'llvm-libunwind'
 pkgname=llvm-libunwind
-version=7.0.1
+version=9.0.0
 revision=1
 build_style=cmake
 wrksrc="libunwind-${version}.src"
-hostmakedepends="llvm7"
-makedepends="llvm7"
+hostmakedepends="llvm9"
+makedepends="llvm9"
 make_build_args="VERBOSE=1"
 short_desc="LLVM version of libunwind library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="NCSA, MIT"
 homepage="https://llvm.org"
 distfiles="https://www.llvm.org/releases/${version}/libunwind-${version}.src.tar.xz"
-checksum=89c852991dfd9279dbca9d5ac10b53c67ad7d0f54bbab7156e9f057a978b5912
+checksum=976a8d09e1424fb843210eecec00a506b956e6c31adda3b0d199e945be0d0db2
 
 post_install() {
 	vmkdir usr/include
diff --git a/srcpkgs/llvm/template b/srcpkgs/llvm/template
index bb84697f830..f596bf29b1b 100644
--- a/srcpkgs/llvm/template
+++ b/srcpkgs/llvm/template
@@ -1,9 +1,10 @@
 # Template file for 'llvm'
 pkgname=llvm
-version=8.0.0
-revision=1
+version=9.0.0
+revision=2
 build_style=meta
-depends="llvm8"
+depends="llvm9"
+replaces="llvm8>=0 llvm7>=0 llvm6.0>=0 llvm3.9>=0"
 short_desc="LLVM meta package"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Public Domain"
diff --git a/srcpkgs/llvm8/files/patches/llvm/llvm-003-secureplt.patch b/srcpkgs/llvm8/files/patches/llvm/llvm-003-secureplt.patch
index bfdc7d5557c..e05442c842b 100644
--- a/srcpkgs/llvm8/files/patches/llvm/llvm-003-secureplt.patch
+++ b/srcpkgs/llvm8/files/patches/llvm/llvm-003-secureplt.patch
@@ -1,10 +1,11 @@
-Partially taken from Adélie Linux, even-more-secure-plt.patch
---- a/lib/Target/PowerPC/PPCSubtarget.cpp
-+++ b/lib/Target/PowerPC/PPCSubtarget.cpp
+Taken from Adélie Linux.
+
+--- llvm/lib/Target/PowerPC/PPCSubtarget.cpp
++++ llvm/lib/Target/PowerPC/PPCSubtarget.cpp
 @@ -138,6 +138,10 @@ void PPCSubtarget::initSubtargetFeatures(StringRef CPU, StringRef FS) {
    if (isDarwin())
      HasLazyResolverStubs = true;
- 
+
 +  // Force SecurePlt for all 32-bit Linux targets
 +  if (isTargetLinux() && !IsPPC64)
 +    SecurePlt = true;
@@ -12,22 +13,141 @@ Partially taken from Adélie Linux, even-more-secure-plt.patch
    if (HasSPE && IsPPC64)
      report_fatal_error( "SPE is only supported for 32-bit targets.\n", false);
    if (HasSPE && (HasAltivec || HasQPX || HasVSX || HasFPU))
---- a/lib/Target/PowerPC/PPCTargetMachine.cpp
-+++ b/lib/Target/PowerPC/PPCTargetMachine.cpp
-@@ -218,6 +218,10 @@ static Reloc::Model getEffectiveRelocModel(const Triple &TT,
-   if (TT.getArch() == Triple::ppc64)
-     return Reloc::PIC_;
+--- llvm/lib/Target/PowerPC/PPCISelLowering.cpp
++++ llvm/lib/Target/PowerPC/PPCISelLowering.cpp
+@@ -2769,8 +2769,12 @@ SDValue PPCTargetLowering::LowerGlobalTLSAddress(SDValue Op,
+       SDValue GOTReg = DAG.getRegister(PPC::X2, MVT::i64);
+       GOTPtr = DAG.getNode(PPCISD::ADDIS_GOT_TPREL_HA, dl,
+                            PtrVT, GOTReg, TGA);
+-    } else
+-      GOTPtr = DAG.getNode(PPCISD::PPC32_GOT, dl, PtrVT);
++    } else {
++      if (isPositionIndependent())
++        GOTPtr = DAG.getNode(PPCISD::PPC32_PICGOT, dl, PtrVT);
++      else
++        GOTPtr = DAG.getNode(PPCISD::PPC32_GOT, dl, PtrVT);
++    }
+     SDValue TPOffset = DAG.getNode(PPCISD::LD_GOT_TPREL_L, dl,
+                                    PtrVT, TGA, GOTPtr);
+     return DAG.getNode(PPCISD::ADD_TLS, dl, PtrVT, TPOffset, TGATLS);
+@@ -4941,7 +4945,8 @@ PrepareCall(SelectionDAG &DAG, SDValue &Callee, SDValue &InFlag, SDValue &Chain,
+   if (auto *G = dyn_cast<GlobalAddressSDNode>(Callee))
+     GV = G->getGlobal();
+   bool Local = TM.shouldAssumeDSOLocal(*Mod, GV);
+-  bool UsePlt = !Local && Subtarget.isTargetELF() && !isPPC64;
++  bool UsePlt = !Local && Subtarget.isTargetELF() && !isPPC64 &&
++                TM.isPositionIndependent();
  
-+  // We force SecurePlt on 32-bit ppc linux which requires PIC
-+  if (TT.isOSLinux() && (TT.getArch() == Triple::ppc))
-+    return Reloc::PIC_;
-+
-   // Rest are static by default.
-   return Reloc::Static;
+   if (isFunctionGlobalAddress(Callee)) {
+     GlobalAddressSDNode *G = cast<GlobalAddressSDNode>(Callee);
+--- llvm/test/CodeGen/PowerPC/2008-10-28-f128-i32.ll
++++ llvm/test/CodeGen/PowerPC/2008-10-28-f128-i32.ll
+@@ -62,7 +62,7 @@ define i64 @__fixunstfdi(ppc_fp128 %a) nounwind readnone {
+ ; CHECK-NEXT:    lfd 4, 328(1)
+ ; CHECK-NEXT:    fmr 1, 31
+ ; CHECK-NEXT:    fmr 2, 30
+-; CHECK-NEXT:    bl __gcc_qmul@PLT
++; CHECK-NEXT:    bl __gcc_qmul
+ ; CHECK-NEXT:    lis 3, 16864
+ ; CHECK-NEXT:    stfd 1, 280(1)
+ ; CHECK-NEXT:    fmr 29, 1
+@@ -84,7 +84,7 @@ define i64 @__fixunstfdi(ppc_fp128 %a) nounwind readnone {
+ ; CHECK-NEXT:    lfd 4, 360(1)
+ ; CHECK-NEXT:    lfd 1, 352(1)
+ ; CHECK-NEXT:    lfd 2, 344(1)
+-; CHECK-NEXT:    bl __gcc_qsub@PLT
++; CHECK-NEXT:    bl __gcc_qsub
+ ; CHECK-NEXT:    mffs 0
+ ; CHECK-NEXT:    mtfsb1 31
+ ; CHECK-NEXT:    lis 3, .LCPI0_1@ha
+@@ -117,7 +117,7 @@ define i64 @__fixunstfdi(ppc_fp128 %a) nounwind readnone {
+ ; CHECK-NEXT:  .LBB0_5: # %bb1
+ ; CHECK-NEXT:    li 4, 0
+ ; CHECK-NEXT:    mr 3, 30
+-; CHECK-NEXT:    bl __floatditf@PLT
++; CHECK-NEXT:    bl __floatditf
+ ; CHECK-NEXT:    lis 3, 17392
+ ; CHECK-NEXT:    stfd 1, 208(1)
+ ; CHECK-NEXT:    fmr 29, 1
+@@ -140,7 +140,7 @@ define i64 @__fixunstfdi(ppc_fp128 %a) nounwind readnone {
+ ; CHECK-NEXT:    lfd 4, 232(1)
+ ; CHECK-NEXT:    lfd 1, 224(1)
+ ; CHECK-NEXT:    lfd 2, 216(1)
+-; CHECK-NEXT:    bl __gcc_qadd@PLT
++; CHECK-NEXT:    bl __gcc_qadd
+ ; CHECK-NEXT:    blt 2, .LBB0_7
+ ; CHECK-NEXT:  # %bb.6: # %bb1
+ ; CHECK-NEXT:    fmr 2, 28
+@@ -163,7 +163,7 @@ define i64 @__fixunstfdi(ppc_fp128 %a) nounwind readnone {
+ ; CHECK-NEXT:    stw 3, 248(1)
+ ; CHECK-NEXT:    lfd 3, 256(1)
+ ; CHECK-NEXT:    lfd 4, 248(1)
+-; CHECK-NEXT:    bl __gcc_qsub@PLT
++; CHECK-NEXT:    bl __gcc_qsub
+ ; CHECK-NEXT:    stfd 2, 176(1)
+ ; CHECK-NEXT:    fcmpu 0, 2, 27
+ ; CHECK-NEXT:    stfd 1, 168(1)
+@@ -205,7 +205,7 @@ define i64 @__fixunstfdi(ppc_fp128 %a) nounwind readnone {
+ ; CHECK-NEXT:    lfd 4, 72(1)
+ ; CHECK-NEXT:    lfd 1, 64(1)
+ ; CHECK-NEXT:    lfd 2, 56(1)
+-; CHECK-NEXT:    bl __gcc_qsub@PLT
++; CHECK-NEXT:    bl __gcc_qsub
+ ; CHECK-NEXT:    mffs 0
+ ; CHECK-NEXT:    mtfsb1 31
+ ; CHECK-NEXT:    lis 3, .LCPI0_2@ha
+@@ -260,7 +260,7 @@ define i64 @__fixunstfdi(ppc_fp128 %a) nounwind readnone {
+ ; CHECK-NEXT:    lfd 4, 136(1)
+ ; CHECK-NEXT:    lfd 1, 128(1)
+ ; CHECK-NEXT:    lfd 2, 120(1)
+-; CHECK-NEXT:    bl __gcc_qsub@PLT
++; CHECK-NEXT:    bl __gcc_qsub
+ ; CHECK-NEXT:    mffs 0
+ ; CHECK-NEXT:    mtfsb1 31
+ ; CHECK-NEXT:    lis 3, .LCPI0_0@ha
+--- llvm/test/CodeGen/PowerPC/2010-02-12-saveCR.ll
++++ llvm/test/CodeGen/PowerPC/2010-02-12-saveCR.ll
+@@ -11,7 +11,7 @@ entry:
+ ; CHECK-DAG: ori [[T2:[0-9]+]], [[T2]], 34492
+ ; CHECK-DAG: stwx [[T1]], 1, [[T2]]
+ ; CHECK-DAG: addi 3, 1, 28
+-; CHECK: bl bar@PLT
++; CHECK: bl bar
+   %x = alloca [100000 x i8]                       ; <[100000 x i8]*> [#uses=1]
+   %"alloca point" = bitcast i32 0 to i32          ; <i32> [#uses=0]
+   %x1 = bitcast [100000 x i8]* %x to i8*          ; <i8*> [#uses=1]
+--- llvm/test/CodeGen/PowerPC/available-externally.ll
++++ llvm/test/CodeGen/PowerPC/available-externally.ll
+@@ -14,7 +14,7 @@ target triple = "powerpc-unknown-linux-gnu"
+ define i32 @foo(i64 %x) nounwind {
+ entry:
+ ; STATIC: foo:
+-; STATIC: bl exact_log2@PLT
++; STATIC: bl exact_log2
+ ; STATIC: blr
+ 
+ ; PIC: foo:
+--- llvm/test/CodeGen/PowerPC/stubs.ll
++++ llvm/test/CodeGen/PowerPC/stubs.ll
+@@ -6,4 +6,4 @@ entry:
  }
-
---- a/lib/Target/PowerPC/InstPrinter/PPCInstPrinter.cpp
-+++ b/lib/Target/PowerPC/InstPrinter/PPCInstPrinter.cpp
+ 
+ ; CHECK: test1:
+-; CHECK: bl __floatditf@PLT
++; CHECK: bl __floatditf
+--- llvm/test/CodeGen/PowerPC/umulo-128-legalisation-lowering.ll
++++ llvm/test/CodeGen/PowerPC/umulo-128-legalisation-lowering.ll
+@@ -72,7 +72,7 @@ define { i128, i8 } @muloti_test(i128 %l, i128 %r) unnamed_addr #0 {
+ ; PPC32-NEXT: mr 28, 9
+ ; PPC32-NEXT: mr 23, 6
+ ; PPC32-NEXT: mr 24, 5
+-; PPC32-NEXT: bl __multi3@PLT
++; PPC32-NEXT: bl __multi3
+ ; PPC32-NEXT: mr 7, 4
+ ; PPC32-NEXT: mullw 4, 24, 30
+ ; PPC32-NEXT: mullw 8, 29, 23
+--- llvm/lib/Target/PowerPC/InstPrinter/PPCInstPrinter.cpp
++++ llvm/lib/Target/PowerPC/InstPrinter/PPCInstPrinter.cpp
 @@ -442,13 +442,22 @@
    // On PPC64, VariantKind is VK_None, but on PPC32, it's VK_PLT, and it must
    // come at the _end_ of the expression.
@@ -55,8 +175,8 @@ Partially taken from Adélie Linux, even-more-secure-plt.patch
  }
  
  /// showRegistersWithPercentPrefix - Check if this register name should be
---- a/lib/Target/PowerPC/PPCAsmPrinter.cpp
-+++ b/lib/Target/PowerPC/PPCAsmPrinter.cpp
+--- llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp
++++ llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp
 @@ -487,8 +487,14 @@
    if (!Subtarget->isPPC64() && !Subtarget->isDarwin() &&
        isPositionIndependent())
@@ -73,8 +193,8 @@ Partially taken from Adélie Linux, even-more-secure-plt.patch
    const MachineOperand &MO = MI->getOperand(2);
    const GlobalValue *GValue = MO.getGlobal();
    MCSymbol *MOSymbol = getSymbol(GValue);
---- a/lib/Target/PowerPC/PPCISelDAGToDAG.cpp
-+++ b/lib/Target/PowerPC/PPCISelDAGToDAG.cpp
+--- llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp
++++ llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp
 @@ -4054,7 +4054,20 @@
      if (trySETCC(N))
        return;
diff --git a/srcpkgs/llvm8/template b/srcpkgs/llvm8/template
index 0af2af6b9f9..dbbc273153f 100644
--- a/srcpkgs/llvm8/template
+++ b/srcpkgs/llvm8/template
@@ -1,7 +1,7 @@
 # Template file for 'llvm8'
 pkgname=llvm8
-version=8.0.0
-revision=7
+version=8.0.1
+revision=2
 wrksrc="llvm-${version}.src"
 build_style=cmake
 configure_args="
@@ -20,27 +20,15 @@ short_desc="Low Level Virtual Machine"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="NCSA"
 homepage="https://www.llvm.org"
-distfiles="https://releases.llvm.org/${version}/llvm-${version}.src.tar.xz
-https://releases.llvm.org/${version}/lldb-${version}.src.tar.xz
-https://releases.llvm.org/${version}/lld-${version}.src.tar.xz
- https://releases.llvm.org/${version}/cfe-${version}.src.tar.xz
- https://releases.llvm.org/${version}/clang-tools-extra-${version}.src.tar.xz
- https://releases.llvm.org/${version}/compiler-rt-${version}.src.tar.xz"
-checksum="8872be1b12c61450cacc82b3d153eab02be2546ef34fa3580ed14137bb26224c
- 49918b9f09816554a20ac44c5f85a32dc0a7a00759b3259e78064d674eac0373
- 9caec8ec922e32ffa130f0fb08e4c5a242d7e68ce757631e425e9eba2e1a6e37
- 084c115aab0084e63b23eee8c233abb6739c399e29966eaeccfc6e088e0b736b
- 4f00122be408a7482f2004bcf215720d2b88cf8dc78b824abb225da8ad359d4b
- b435c7474f459e71b2831f1a4e3f1d21203cb9c0172e94e9d9b69f50354f21b1"
+distfiles="https://github.com/llvm/llvm-project/releases/download/llvmorg-${version}/llvm-${version}.src.tar.xz"
+checksum="44787a6d02f7140f145e2250d56c9f849334e11f9ae379827510ed72f12b75e7"
 disable_parallel_builds=yes
 lib32disabled=yes
 
-subpackages="clang-tools-extra clang clang-analyzer libllvm8"
-if [ -z "$CROSS_BUILD" ]; then
-	# XXX fails to cross compile due to python
-	subpackages+=" lldb lldb-devel"
-fi
-subpackages+=" lld lld-devel"
+# all of these provide llvm-config
+conflicts="llvm>=0 llvm3.9>=0 llvm6.0>=0 llvm7>=0 llvm9>=0"
+
+subpackages="libllvm8"
 
 case "$XBPS_TARGET_MACHINE" in
 	armv5*) broken="Tries to assemble VFP instructions with armv5tel arch";;
@@ -53,51 +41,6 @@ post_patch() {
 		msg_normal "Applying $i to llvm\n"
 		patch -sNp1 -i ${i}
 	done
-
-	cd ${XBPS_BUILDDIR}/cfe-${version}.src
-	for i in ${FILESDIR}/patches/cfe/cfe-*.patch; do
-		msg_normal "Applying $i to cfe\n"
-		patch -sNp1 -i ${i}
-	done
-
-	if [ -z "$CROSS_BUILD" ]; then
-		cd ${XBPS_BUILDDIR}/lldb-${version}.src
-		for i in ${FILESDIR}/patches/lldb/*.patch; do
-			msg_normal "Applying $i to lldb\n"
-			patch -sNp1 -i ${i}
-		done
-		case "$XBPS_TARGET_MACHINE" in
-			*-musl) sed -i 's|__ptrace_request|int|g' source/Plugins/Process/Linux/NativeProcessLinux.cpp ;;
-		esac
-	fi
-
-	# Move clang files into the llvm source.
-	if [ -d ${XBPS_BUILDDIR}/cfe-${version}.src ]; then
-		mv ${XBPS_BUILDDIR}/cfe-${version}.src ${wrksrc}/tools/clang
-	fi
-	# Move clang-tools-extra files into llvm source.
-	if [ -d ${XBPS_BUILDDIR}/clang-tools-extra-${version}.src ]; then
-		mv ${XBPS_BUILDDIR}/clang-tools-extra-${version}.src ${wrksrc}/tools/clang/tools/extra
-	fi
-	# Move lld files into the llvm source.
-	if [ -d ${XBPS_BUILDDIR}/lld-${version}.src ]; then
-		mv ${XBPS_BUILDDIR}/lld-${version}.src ${wrksrc}/tools/lld
-	fi
-	# Move lldb files into the llvm source.
-	if [ -z "$CROSS_BUILD" -a -d ${XBPS_BUILDDIR}/lldb-${version}.src ]; then
-		mv ${XBPS_BUILDDIR}/lldb-${version}.src ${wrksrc}/tools/lldb
-	fi
-	# Move compiler-rt files into the llvm source.
-	if [ -d ${XBPS_BUILDDIR}/compiler-rt-${version}.src ]; then
-		mv ${XBPS_BUILDDIR}/compiler-rt-${version}.src ${wrksrc}/projects/compiler-rt
-	fi
-	case "$XBPS_TARGET_MACHINE" in
-		*-musl)
-			# Disable sanitizers
-			sed -i 's/set(COMPILER_RT_HAS_SANITIZER_COMMON TRUE)/set(COMPILER_RT_HAS_SANITIZER_COMMON FALSE)/' ${wrksrc}/projects/compiler-rt/cmake/config-ix.cmake
-			;;
-	esac
-
 }
 
 pre_configure() {
@@ -120,9 +63,7 @@ pre_configure() {
 			CXXFLAGS="$BUILD_CXXFLAGS" LDFLAGS="$BUILD_LDFLAGS" \
 			cmake ../.. -DCMAKE_BUILD_TYPE=Release
 		make ${makejobs} -C utils/TableGen
-		make ${makejobs} -C tools/clang/utils/TableGen
 		configure_args+=" -DLLVM_TABLEGEN=${wrksrc}/build/HOST/bin/llvm-tblgen"
-		configure_args+=" -DCLANG_TABLEGEN=${wrksrc}/build/HOST/bin/clang-tblgen"
 		cd ../..
 	fi
 
@@ -164,105 +105,6 @@ do_install() {
 	fi
 }
 
-clang-analyzer_package() {
-	archs=noarch
-	pycompile_dirs="usr/share/scan-view"
-	depends="clang-${version}_${revision} python"
-	short_desc+=" - A source code analysis framework"
-	homepage="https://clang-analyzer.llvm.org/"
-	pkg_install() {
-		vmove usr/share/man/man1/scan-build.1
-		vmove "/usr/bin/scan-*"
-		vmove "/usr/share/scan-*"
-		vmove "/usr/libexec/*analyzer"
-	}
-}
-
-clang-tools-extra_package() {
-	depends="clang-${version}_${revision} python"
-	short_desc+=" - Extra Clang tools"
-	homepage="https://clang.llvm.org/extra/"
-	pkg_install() {
-		vmove usr/bin/clang-apply-replacements
-		vmove usr/bin/clang-query
-		vmove usr/bin/clang-rename
-		vmove usr/bin/clang-tidy
-		vmove usr/bin/modularize
-		vmove "usr/lib/libclangApplyReplacements*"
-		vmove "usr/lib/libclangQuery*"
-		vmove "usr/lib/libclangTidy*"
-		vmove "usr/share/clang/*tidy*"
-	}
-}
-
-clang_package() {
-	lib32disabled=yes
-	depends="libstdc++-devel libgcc-devel binutils"
-	case "$XBPS_TARGET_MACHINE" in
-		*-musl) depends+=" musl-devel";;
-		*) depends+=" glibc-devel";;
-	esac
-	short_desc+=" - C language family frontend"
-	alternatives="cc:cc:/usr/bin/clang"
-	homepage="https://clang.llvm.org/"
-	pkg_install() {
-		vmove usr/include/clang
-		vmove usr/include/clang-c
-		vmove "usr/bin/*clang*"
-		vmove usr/bin/c-index-test
-		vmove usr/lib/clang
-		vmove usr/lib/cmake/clang
-		vmove "usr/lib/libclang*"
-		vmove "usr/share/clang"
-	}
-}
-
-lld_package() {
-	lib32disabled=yes
-	short_desc+=" - linker"
-	homepage="https://lld.llvm.org"
-	pkg_install() {
-		vmove usr/bin/lld*
-		vmove usr/bin/wasm-ld
-		vmove usr/bin/ld.lld*
-	}
-}
-
-lld-devel_package() {
-	lib32disabled=yes
-	short_desc+=" - linker - development files"
-	homepage="https://lld.llvm.org"
-	pkg_install() {
-		vmove usr/include/lld
-		vmove "usr/lib/liblld*a"
-	}
-}
-
-lldb_package() {
-	lib32disabled=yes
-	depends+=" python-six"
-	short_desc+=" - LLDB debugger"
-	homepage="https://lldb.llvm.org/"
-	pkg_install() {
-		vmove usr/bin/*lldb*
-		vmove usr/lib/liblldb*so.*
-		vman tools/lldb/docs/lldb.1
-		vmove /usr/lib/python*
-		# Depend on python-six instead of conflicting
-		rm "${PKGDESTDIR}/usr/lib/python2.7/site-packages/six.py"
-	}
-}
-
-lldb-devel_package() {
-	depends="lldb>=${version}_${revision}"
-	short_desc+=" - LLDB debugger - development files"
-	pkg_install() {
-		vmove usr/include/lldb
-		vmove "usr/lib/liblldb*.a"
-		vmove "usr/lib/liblldb*.so"
-	}
-}
-
 libllvm8_package() {
 	short_desc+=" - runtime library"
 	pkg_install() {
diff --git a/srcpkgs/llvm9/files/llvm-Config-config.h b/srcpkgs/llvm9/files/llvm-Config-config.h
new file mode 100644
index 00000000000..c369b4551f7
--- /dev/null
+++ b/srcpkgs/llvm9/files/llvm-Config-config.h
@@ -0,0 +1,9 @@
+#include <bits/wordsize.h>
+
+#if __WORDSIZE == 32
+#include "config-32.h"
+#elif __WORDSIZE == 64
+#include "config-64.h"
+#else
+#error "Unknown word size"
+#endif
diff --git a/srcpkgs/llvm9/files/llvm-Config-llvm-config.h b/srcpkgs/llvm9/files/llvm-Config-llvm-config.h
new file mode 100644
index 00000000000..2fa08c9be69
--- /dev/null
+++ b/srcpkgs/llvm9/files/llvm-Config-llvm-config.h
@@ -0,0 +1,9 @@
+#include <bits/wordsize.h>
+
+#if __WORDSIZE == 32
+#include "llvm-config-32.h"
+#elif __WORDSIZE == 64
+#include "llvm-config-64.h"
+#else
+#error "Unknown word size"
+#endif
diff --git a/srcpkgs/llvm9/files/patches/cfe/cfe-001-fix-unwind-chain-inclusion.patch b/srcpkgs/llvm9/files/patches/cfe/cfe-001-fix-unwind-chain-inclusion.patch
new file mode 100644
index 00000000000..04244bcc274
--- /dev/null
+++ b/srcpkgs/llvm9/files/patches/cfe/cfe-001-fix-unwind-chain-inclusion.patch
@@ -0,0 +1,44 @@
+From 352974169f0d2b5da3d5321f588f5e3b5941330e Mon Sep 17 00:00:00 2001
+From: Andrea Brancaleoni <miwaxe@gmail.com>
+Date: Tue, 8 Sep 2015 22:14:57 +0200
+Subject: [PATCH 2/7] fix unwind chain inclusion
+
+---
+ lib/Headers/unwind.h | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/lib/Headers/unwind.h b/lib/Headers/unwind.h
+index 303d792..44e10cc 100644
+--- a/lib/Headers/unwind.h
++++ b/lib/Headers/unwind.h
+@@ -9,9 +9,6 @@
+ 
+ /* See "Data Definitions for libgcc_s" in the Linux Standard Base.*/
+ 
+-#ifndef __CLANG_UNWIND_H
+-#define __CLANG_UNWIND_H
+-
+ #if defined(__APPLE__) && __has_include_next(<unwind.h>)
+ /* Darwin (from 11.x on) provide an unwind.h. If that's available,
+  * use it. libunwind wraps some of its definitions in #ifdef _GNU_SOURCE,
+@@ -39,6 +36,9 @@
+ # endif
+ #else
+ 
++#ifndef __CLANG_UNWIND_H
++#define __CLANG_UNWIND_H
++
+ #include <stdint.h>
+ 
+ #ifdef __cplusplus
+@@ -322,6 +322,7 @@ _Unwind_Ptr _Unwind_GetTextRelBase(struct _Unwind_Context *);
+ }
+ #endif
+ 
++#endif /* __CLANG_UNWIND_H */
++
+ #endif
+ 
+-#endif /* __CLANG_UNWIND_H */
+-- 
+2.5.1
diff --git a/srcpkgs/llvm9/files/patches/cfe/cfe-002-add-musl-triples.patch b/srcpkgs/llvm9/files/patches/cfe/cfe-002-add-musl-triples.patch
new file mode 100644
index 00000000000..aefc88d48f5
--- /dev/null
+++ b/srcpkgs/llvm9/files/patches/cfe/cfe-002-add-musl-triples.patch
@@ -0,0 +1,91 @@
+--- a/lib/Driver/ToolChains/Gnu.cpp
++++ b/lib/Driver/ToolChains/Gnu.cpp
+@@ -1938,7 +1938,8 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes(
+   static const char *const ARMHFTriples[] = {"arm-linux-gnueabihf",
+                                              "armv7hl-redhat-linux-gnueabi",
+                                              "armv6hl-suse-linux-gnueabi",
+-                                             "armv7hl-suse-linux-gnueabi"};
++                                             "armv7hl-suse-linux-gnueabi",
++                                             "armv7l-linux-gnueabihf"};
+   static const char *const ARMebLibDirs[] = {"/lib"};
+   static const char *const ARMebTriples[] = {"armeb-linux-gnueabi",
+                                              "armeb-linux-androideabi"};
+@@ -2077,6 +2078,78 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes(
+     return;
+   }
+ 
++  if (TargetTriple.isMusl()) {
++    static const char *const AArch64MuslTriples[] = {"aarch64-linux-musl"};
++    static const char *const ARMHFMuslTriples[] = {
++        "arm-linux-musleabihf", "armv7l-linux-musleabihf"
++    };
++    static const char *const ARMMuslTriples[] = {"arm-linux-musleabi"};
++    static const char *const X86_64MuslTriples[] = {"x86_64-linux-musl"};
++    static const char *const X86MuslTriples[] = {"i686-linux-musl"};
++    static const char *const MIPSMuslTriples[] = {
++        "mips-linux-musl", "mipsel-linux-musl",
++        "mipsel-linux-muslhf", "mips-linux-muslhf"
++    };
++    static const char *const PPCMuslTriples[] = {"powerpc-linux-musl"};
++    static const char *const PPC64MuslTriples[] = {"powerpc64-linux-musl"};
++    static const char *const PPC64LEMuslTriples[] = {"powerpc64le-linux-musl"};
++
++    switch (TargetTriple.getArch()) {
++    case llvm::Triple::aarch64:
++      LibDirs.append(begin(AArch64LibDirs), end(AArch64LibDirs));
++      TripleAliases.append(begin(AArch64MuslTriples), end(AArch64MuslTriples));
++      BiarchLibDirs.append(begin(AArch64LibDirs), end(AArch64LibDirs));
++      BiarchTripleAliases.append(begin(AArch64MuslTriples), end(AArch64MuslTriples));
++      break;
++    case llvm::Triple::arm:
++      LibDirs.append(begin(ARMLibDirs), end(ARMLibDirs));
++      if (TargetTriple.getEnvironment() == llvm::Triple::MuslEABIHF) {
++        TripleAliases.append(begin(ARMHFMuslTriples), end(ARMHFMuslTriples));
++      } else {
++        TripleAliases.append(begin(ARMMuslTriples), end(ARMMuslTriples));
++      }
++      break;
++    case llvm::Triple::x86_64:
++      LibDirs.append(begin(X86_64LibDirs), end(X86_64LibDirs));
++      TripleAliases.append(begin(X86_64MuslTriples), end(X86_64MuslTriples));
++      BiarchLibDirs.append(begin(X86LibDirs), end(X86LibDirs));
++      BiarchTripleAliases.append(begin(X86MuslTriples), end(X86MuslTriples));
++      break;
++    case llvm::Triple::x86:
++      LibDirs.append(begin(X86LibDirs), end(X86LibDirs));
++      TripleAliases.append(begin(X86MuslTriples), end(X86MuslTriples));
++      BiarchLibDirs.append(begin(X86_64LibDirs), end(X86_64LibDirs));
++      BiarchTripleAliases.append(begin(X86_64MuslTriples), end(X86_64MuslTriples));
++      break;
++    case llvm::Triple::mips:
++      LibDirs.append(begin(MIPSLibDirs), end(MIPSLibDirs));
++      TripleAliases.append(begin(MIPSMuslTriples), end(MIPSMuslTriples));
++      break;
++    case llvm::Triple::ppc:
++      LibDirs.append(begin(PPCLibDirs), end(PPCLibDirs));
++      TripleAliases.append(begin(PPCMuslTriples), end(PPCMuslTriples));
++      BiarchLibDirs.append(begin(PPC64LibDirs), end(PPC64LibDirs));
++      BiarchTripleAliases.append(begin(PPC64MuslTriples), end(PPC64MuslTriples));
++      break;
++    case llvm::Triple::ppc64:
++      LibDirs.append(begin(PPC64LibDirs), end(PPC64LibDirs));
++      TripleAliases.append(begin(PPC64MuslTriples), end(PPC64MuslTriples));
++      BiarchLibDirs.append(begin(PPCLibDirs), end(PPCLibDirs));
++      BiarchTripleAliases.append(begin(PPCMuslTriples), end(PPCMuslTriples));
++      break;
++    case llvm::Triple::ppc64le:
++      LibDirs.append(begin(PPC64LELibDirs), end(PPC64LELibDirs));
++      TripleAliases.append(begin(PPC64LEMuslTriples), end(PPC64LEMuslTriples));
++      break;
++    default:
++      break;
++    }
++    TripleAliases.push_back(TargetTriple.str());
++    if (TargetTriple.str() != BiarchTriple.str())
++      BiarchTripleAliases.push_back(BiarchTriple.str());
++    return;
++  }
++
+   // Android targets should not use GNU/Linux tools or libraries.
+   if (TargetTriple.isAndroid()) {
+     static const char *const AArch64AndroidTriples[] = {
diff --git a/srcpkgs/llvm9/files/patches/cfe/cfe-003-ppc64-dynamic-linker-path.patch b/srcpkgs/llvm9/files/patches/cfe/cfe-003-ppc64-dynamic-linker-path.patch
new file mode 100644
index 00000000000..4b9b0b891d5
--- /dev/null
+++ b/srcpkgs/llvm9/files/patches/cfe/cfe-003-ppc64-dynamic-linker-path.patch
@@ -0,0 +1,18 @@
+--- a/lib/Driver/ToolChains/Linux.cpp
++++ b/lib/Driver/ToolChains/Linux.cpp
+@@ -593,12 +593,12 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
+     Loader = "ld.so.1";
+     break;
+   case llvm::Triple::ppc64:
+-    LibDir = "lib64";
++    LibDir = "lib";
+     Loader =
+-        (tools::ppc::hasPPCAbiArg(Args, "elfv2")) ? "ld64.so.2" : "ld64.so.1";
++        (tools::ppc::hasPPCAbiArg(Args, "elfv1")) ? "ld64.so.1" : "ld64.so.2";
+     break;
+   case llvm::Triple::ppc64le:
+-    LibDir = "lib64";
++    LibDir = "lib";
+     Loader =
+         (tools::ppc::hasPPCAbiArg(Args, "elfv1")) ? "ld64.so.1" : "ld64.so.2";
+     break;
diff --git a/srcpkgs/llvm9/files/patches/cfe/cfe-004-ppc64-musl-elfv2.patch b/srcpkgs/llvm9/files/patches/cfe/cfe-004-ppc64-musl-elfv2.patch
new file mode 100644
index 00000000000..14dfc007ed3
--- /dev/null
+++ b/srcpkgs/llvm9/files/patches/cfe/cfe-004-ppc64-musl-elfv2.patch
@@ -0,0 +1,27 @@
+--- a/lib/Basic/Targets/PPC.h
++++ b/lib/Basic/Targets/PPC.h
+@@ -376,11 +376,11 @@ public:
+ 
+     if ((Triple.getArch() == llvm::Triple::ppc64le)) {
+       resetDataLayout("e-m:e-i64:64-n32:64");
+-      ABI = "elfv2";
+     } else {
+       resetDataLayout("E-m:e-i64:64-n32:64");
+-      ABI = Triple.getEnvironment() == llvm::Triple::ELFv2 ? "elfv2" : "elfv1";
+     }
++    /* default to elfv2 always, ignore llvm's elfv2 triples */
++    ABI = "elfv2";
+ 
+     if (Triple.getOS() == llvm::Triple::AIX)
+       SuitableAlign = 64;
+--- a/lib/Driver/ToolChains/Clang.cpp
++++ b/lib/Driver/ToolChains/Clang.cpp
+@@ -1804,7 +1804,7 @@ void Clang::AddPPCTargetArgs(const ArgList &Args,
+         break;
+       }
+ 
+-      ABIName = "elfv1";
++      ABIName = "elfv2";
+       break;
+     }
+     case llvm::Triple::ppc64le:
diff --git a/srcpkgs/llvm9/files/patches/cfe/cfe-005-gcc9.patch b/srcpkgs/llvm9/files/patches/cfe/cfe-005-gcc9.patch
new file mode 100644
index 00000000000..f600a6657ef
--- /dev/null
+++ b/srcpkgs/llvm9/files/patches/cfe/cfe-005-gcc9.patch
@@ -0,0 +1,40 @@
+From a1445cd0340006d7635101c4c2b27ae51328642c Mon Sep 17 00:00:00 2001
+From: Serge Guelton <sguelton@redhat.com>
+Date: Thu, 19 Sep 2019 00:54:40 +0000
+Subject: [PATCH] Initialize all fields in ABIArgInfo.
+
+Due to usage of an uninitialized fields, we end up with
+a Conditional jump or move depends on uninitialised value
+
+Fixes https://bugs.llvm.org/show_bug.cgi?id=40547
+
+Commited on behalf of Martin Liska <mliska@suse.cz>
+
+git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@372281 91177308-0d34-0410-b5e6-96231b3b80d8
+---
+ include/clang/CodeGen/CGFunctionInfo.h | 10 ++++------
+ 1 file changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/include/clang/CodeGen/CGFunctionInfo.h b/include/clang/CodeGen/CGFunctionInfo.h
+index 1f81072e23d0..5069d9af42a3 100644
+--- a/include/clang/CodeGen/CGFunctionInfo.h
++++ b/include/clang/CodeGen/CGFunctionInfo.h
+@@ -109,14 +109,12 @@ class ABIArgInfo {
+     UnpaddedCoerceAndExpandType = T;
+   }
+ 
+-  ABIArgInfo(Kind K)
+-      : TheKind(K), PaddingInReg(false), InReg(false) {
+-  }
+-
+ public:
+-  ABIArgInfo()
++  ABIArgInfo(Kind K = Direct)
+       : TypeData(nullptr), PaddingType(nullptr), DirectOffset(0),
+-        TheKind(Direct), PaddingInReg(false), InReg(false) {}
++        TheKind(K), PaddingInReg(false), InAllocaSRet(false),
++        IndirectByVal(false), IndirectRealign(false), SRetAfterThis(false),
++        InReg(false), CanBeFlattened(false), SignExt(false) {}
+ 
+   static ABIArgInfo getDirect(llvm::Type *T = nullptr, unsigned Offset = 0,
+                               llvm::Type *Padding = nullptr,
diff --git a/srcpkgs/llvm9/files/patches/lldb/musl.patch b/srcpkgs/llvm9/files/patches/lldb/musl.patch
new file mode 100644
index 00000000000..37416bb478d
--- /dev/null
+++ b/srcpkgs/llvm9/files/patches/lldb/musl.patch
@@ -0,0 +1,31 @@
+--- a/source/Plugins/Process/Linux/Procfs.h
++++ b/source/Plugins/Process/Linux/Procfs.h
+@@ -10,21 +10,12 @@
+ // sys/procfs.h on Android/Linux for all supported architectures.
+ 
+ #include <sys/ptrace.h>
++#include <asm/ptrace.h>
+ 
+-#ifdef __ANDROID__
+-#if defined(__arm64__) || defined(__aarch64__)
+-typedef unsigned long elf_greg_t;
+-typedef elf_greg_t
+-    elf_gregset_t[(sizeof(struct user_pt_regs) / sizeof(elf_greg_t))];
+-typedef struct user_fpsimd_state elf_fpregset_t;
+-#ifndef NT_FPREGSET
+-#define NT_FPREGSET NT_PRFPREG
+-#endif // NT_FPREGSET
+-#elif defined(__mips__)
+-#ifndef NT_FPREGSET
+-#define NT_FPREGSET NT_PRFPREG
+-#endif // NT_FPREGSET
+-#endif
+-#else // __ANDROID__
++#if !defined(__GLIBC__) && defined(__powerpc__)
++#define pt_regs musl_pt_regs
++#include <sys/procfs.h>
++#undef pt_regs
++#else
+ #include <sys/procfs.h>
+-#endif // __ANDROID__
++#endif
diff --git a/srcpkgs/llvm9/files/patches/llvm/llvm-001-musl.patch b/srcpkgs/llvm9/files/patches/llvm/llvm-001-musl.patch
new file mode 100644
index 00000000000..a0eddbf58be
--- /dev/null
+++ b/srcpkgs/llvm9/files/patches/llvm/llvm-001-musl.patch
@@ -0,0 +1,58 @@
+From faca3fbd15d0c3108493c3c54cd93138e049ac43 Mon Sep 17 00:00:00 2001
+From: Andrea Brancaleoni <miwaxe@gmail.com>
+Date: Tue, 8 Sep 2015 22:03:02 +0200
+Subject: [PATCH 3/3] musl
+
+---
+ include/llvm/Analysis/TargetLibraryInfo.h | 9 +++++++++
+ lib/Support/DynamicLibrary.cpp            | 2 +-
+ lib/Support/Unix/Signals.inc              | 6 +++---
+ utils/unittest/googletest/src/gtest.cc    | 1 +
+ 5 files changed, 17 insertions(+), 6 deletions(-)
+
+diff --git a/include/llvm/Analysis/TargetLibraryInfo.h b/include/llvm/Analysis/TargetLibraryInfo.h
+index e0a1ee3..465b65a 100644
+--- a/include/llvm/Analysis/TargetLibraryInfo.h
++++ b/include/llvm/Analysis/TargetLibraryInfo.h
+@@ -18,6 +18,15 @@
+ #include "llvm/IR/PassManager.h"
+ #include "llvm/Pass.h"
+ 
++#undef fopen64
++#undef fseeko64
++#undef fstat64
++#undef fstatvfs64
++#undef ftello64
++#undef lstat64
++#undef stat64
++#undef tmpfile64
++
+ namespace llvm {
+ template <typename T> class ArrayRef;
+ 
+diff --git a/utils/unittest/googletest/src/gtest.cc b/utils/unittest/googletest/src/gtest.cc
+index 5780764..1d548c1 100644
+--- a/utils/unittest/googletest/src/gtest.cc
++++ b/utils/unittest/googletest/src/gtest.cc
+@@ -128,6 +128,7 @@
+ 
+ #if GTEST_CAN_STREAM_RESULTS_
+ # include <arpa/inet.h>  // NOLINT
++# include <sys/socket.h>  // NOLINT
+ # include <netdb.h>  // NOLINT
+ # include <sys/socket.h>  // NOLINT
+ # include <sys/types.h>  // NOLINT
+-- 
+2.5.1
+
+--- a/lib/Support/Unix/DynamicLibrary.inc
++++ b/lib/Support/Unix/DynamicLibrary.inc
+@@ -102,7 +102,7 @@ static void *DoSearch(const char* SymbolName) {
+ 
+ // This macro returns the address of a well-known, explicit symbol
+ #define EXPLICIT_SYMBOL(SYM) \
+-   if (!strcmp(SymbolName, #SYM)) return &SYM
++   if (!strcmp(SymbolName, #SYM)) return (void *)&SYM
+ 
+ // Under glibc we have a weird situation. The stderr/out/in symbols are both
+ // macros and global variables because of standards requirements. So, we
diff --git a/srcpkgs/llvm9/files/patches/llvm/llvm-002-musl-ppc64-elfv2.patch b/srcpkgs/llvm9/files/patches/llvm/llvm-002-musl-ppc64-elfv2.patch
new file mode 100644
index 00000000000..955a9a94626
--- /dev/null
+++ b/srcpkgs/llvm9/files/patches/llvm/llvm-002-musl-ppc64-elfv2.patch
@@ -0,0 +1,31 @@
+This patches LLVM to use ELFv2 on ppc64 uncoditionally unless overridden. We
+need this because unlike most distros we use ELFv2 for both glibc and musl
+on big endian ppc64.
+
+--- a/lib/Target/PowerPC/PPCTargetMachine.cpp
++++ b/lib/Target/PowerPC/PPCTargetMachine.cpp
+@@ -211,11 +211,11 @@ static PPCTargetMachine::PPCABI computeTargetABI(const Triple &TT,
+ 
+   switch (TT.getArch()) {
+   case Triple::ppc64le:
+-    return PPCTargetMachine::PPC_ABI_ELFv2;
+   case Triple::ppc64:
+-    if (TT.getEnvironment() == llvm::Triple::ELFv2)
+-      return PPCTargetMachine::PPC_ABI_ELFv2;
+-    return PPCTargetMachine::PPC_ABI_ELFv1;
++    /* default to ELFv2 always, don't care about llvm's stupid broken suffix
++     * triples; people can override the default properly via -mabi like gcc
++     */
++    return PPCTargetMachine::PPC_ABI_ELFv2;
+   default:
+     return PPCTargetMachine::PPC_ABI_UNKNOWN;
+   }
+--- a/test/CodeGen/PowerPC/ppc64-elf-abi.ll
++++ b/test/CodeGen/PowerPC/ppc64-elf-abi.ll
+@@ -1,4 +1,5 @@
+-; RUN: llc -verify-machineinstrs -mtriple=powerpc64-unknown-linux-gnu < %s | FileCheck %s -check-prefix=CHECK-ELFv1
++; RUN: llc -verify-machineinstrs -mtriple=powerpc64-unknown-linux-gnu < %s | FileCheck %s -check-prefix=CHECK-ELFv2
++; RUN: llc -verify-machineinstrs -mtriple=powerpc64-unknown-linux-musl < %s | FileCheck %s -check-prefix=CHECK-ELFv2
+ ; RUN: llc -verify-machineinstrs -mtriple=powerpc64-unknown-linux-gnu -target-abi elfv1 < %s | FileCheck %s -check-prefix=CHECK-ELFv1
+ ; RUN: llc -verify-machineinstrs -mtriple=powerpc64-unknown-linux-gnu -target-abi elfv2 < %s | FileCheck %s -check-prefix=CHECK-ELFv2
+ ; RUN: llc -verify-machineinstrs -mtriple=powerpc64le-unknown-linux-gnu < %s | FileCheck %s -check-prefix=CHECK-ELFv2
diff --git a/srcpkgs/llvm9/files/patches/llvm/llvm-003-secureplt.patch b/srcpkgs/llvm9/files/patches/llvm/llvm-003-secureplt.patch
new file mode 100644
index 00000000000..bbb4ae4817f
--- /dev/null
+++ b/srcpkgs/llvm9/files/patches/llvm/llvm-003-secureplt.patch
@@ -0,0 +1,130 @@
+--- llvm/lib/Target/PowerPC/PPCSubtarget.cpp
++++ llvm/lib/Target/PowerPC/PPCSubtarget.cpp
+@@ -145,8 +145,7 @@ void PPCSubtarget::initSubtargetFeatures(StringRef CPU, StringRef FS) {
+   if (isDarwin())
+     HasLazyResolverStubs = true;
+
+-  if (TargetTriple.isOSNetBSD() || TargetTriple.isOSOpenBSD() ||
+-      TargetTriple.isMusl())
++  if (TargetTriple.isOSNetBSD() || TargetTriple.isOSOpenBSD() || isTargetLinux())
+     SecurePlt = true;
+
+   if (HasSPE && IsPPC64)
+--- llvm/lib/Target/PowerPC/PPCISelLowering.cpp
++++ llvm/lib/Target/PowerPC/PPCISelLowering.cpp
+@@ -4941,7 +4945,8 @@ PrepareCall(SelectionDAG &DAG, SDValue &Callee, SDValue &InFlag, SDValue &Chain,
+   if (auto *G = dyn_cast<GlobalAddressSDNode>(Callee))
+     GV = G->getGlobal();
+   bool Local = TM.shouldAssumeDSOLocal(*Mod, GV);
+-  bool UsePlt = !Local && Subtarget.isTargetELF() && !isPPC64;
++  bool UsePlt = !Local && Subtarget.isTargetELF() && !isPPC64 &&
++                TM.isPositionIndependent();
+ 
+   if (isFunctionGlobalAddress(Callee)) {
+     GlobalAddressSDNode *G = cast<GlobalAddressSDNode>(Callee);
+--- llvm/test/CodeGen/PowerPC/2008-10-28-f128-i32.ll
++++ llvm/test/CodeGen/PowerPC/2008-10-28-f128-i32.ll
+@@ -62,7 +62,7 @@ define i64 @__fixunstfdi(ppc_fp128 %a) nounwind readnone {
+ ; CHECK-NEXT:    lfd 4, 328(1)
+ ; CHECK-NEXT:    fmr 1, 31
+ ; CHECK-NEXT:    fmr 2, 30
+-; CHECK-NEXT:    bl __gcc_qmul@PLT
++; CHECK-NEXT:    bl __gcc_qmul
+ ; CHECK-NEXT:    lis 3, 16864
+ ; CHECK-NEXT:    stfd 1, 280(1)
+ ; CHECK-NEXT:    fmr 29, 1
+@@ -84,7 +84,7 @@ define i64 @__fixunstfdi(ppc_fp128 %a) nounwind readnone {
+ ; CHECK-NEXT:    lfd 4, 360(1)
+ ; CHECK-NEXT:    lfd 1, 352(1)
+ ; CHECK-NEXT:    lfd 2, 344(1)
+-; CHECK-NEXT:    bl __gcc_qsub@PLT
++; CHECK-NEXT:    bl __gcc_qsub
+ ; CHECK-NEXT:    mffs 0
+ ; CHECK-NEXT:    mtfsb1 31
+ ; CHECK-NEXT:    lis 3, .LCPI0_1@ha
+@@ -117,7 +117,7 @@ define i64 @__fixunstfdi(ppc_fp128 %a) nounwind readnone {
+ ; CHECK-NEXT:  .LBB0_5: # %bb1
+ ; CHECK-NEXT:    li 4, 0
+ ; CHECK-NEXT:    mr 3, 30
+-; CHECK-NEXT:    bl __floatditf@PLT
++; CHECK-NEXT:    bl __floatditf
+ ; CHECK-NEXT:    lis 3, 17392
+ ; CHECK-NEXT:    stfd 1, 208(1)
+ ; CHECK-NEXT:    fmr 29, 1
+@@ -140,7 +140,7 @@ define i64 @__fixunstfdi(ppc_fp128 %a) nounwind readnone {
+ ; CHECK-NEXT:    lfd 4, 232(1)
+ ; CHECK-NEXT:    lfd 1, 224(1)
+ ; CHECK-NEXT:    lfd 2, 216(1)
+-; CHECK-NEXT:    bl __gcc_qadd@PLT
++; CHECK-NEXT:    bl __gcc_qadd
+ ; CHECK-NEXT:    blt 2, .LBB0_7
+ ; CHECK-NEXT:  # %bb.6: # %bb1
+ ; CHECK-NEXT:    fmr 2, 28
+@@ -163,7 +163,7 @@ define i64 @__fixunstfdi(ppc_fp128 %a) nounwind readnone {
+ ; CHECK-NEXT:    stw 3, 248(1)
+ ; CHECK-NEXT:    lfd 3, 256(1)
+ ; CHECK-NEXT:    lfd 4, 248(1)
+-; CHECK-NEXT:    bl __gcc_qsub@PLT
++; CHECK-NEXT:    bl __gcc_qsub
+ ; CHECK-NEXT:    stfd 2, 176(1)
+ ; CHECK-NEXT:    fcmpu 0, 2, 27
+ ; CHECK-NEXT:    stfd 1, 168(1)
+@@ -205,7 +205,7 @@ define i64 @__fixunstfdi(ppc_fp128 %a) nounwind readnone {
+ ; CHECK-NEXT:    lfd 4, 72(1)
+ ; CHECK-NEXT:    lfd 1, 64(1)
+ ; CHECK-NEXT:    lfd 2, 56(1)
+-; CHECK-NEXT:    bl __gcc_qsub@PLT
++; CHECK-NEXT:    bl __gcc_qsub
+ ; CHECK-NEXT:    mffs 0
+ ; CHECK-NEXT:    mtfsb1 31
+ ; CHECK-NEXT:    lis 3, .LCPI0_2@ha
+@@ -260,7 +260,7 @@ define i64 @__fixunstfdi(ppc_fp128 %a) nounwind readnone {
+ ; CHECK-NEXT:    lfd 4, 136(1)
+ ; CHECK-NEXT:    lfd 1, 128(1)
+ ; CHECK-NEXT:    lfd 2, 120(1)
+-; CHECK-NEXT:    bl __gcc_qsub@PLT
++; CHECK-NEXT:    bl __gcc_qsub
+ ; CHECK-NEXT:    mffs 0
+ ; CHECK-NEXT:    mtfsb1 31
+ ; CHECK-NEXT:    lis 3, .LCPI0_0@ha
+--- llvm/test/CodeGen/PowerPC/2010-02-12-saveCR.ll
++++ llvm/test/CodeGen/PowerPC/2010-02-12-saveCR.ll
+@@ -11,7 +11,7 @@ entry:
+ ; CHECK-DAG: ori [[T2:[0-9]+]], [[T2]], 34492
+ ; CHECK-DAG: stwx [[T1]], 1, [[T2]]
+ ; CHECK-DAG: addi 3, 1, 28
+-; CHECK: bl bar@PLT
++; CHECK: bl bar
+   %x = alloca [100000 x i8]                       ; <[100000 x i8]*> [#uses=1]
+   %"alloca point" = bitcast i32 0 to i32          ; <i32> [#uses=0]
+   %x1 = bitcast [100000 x i8]* %x to i8*          ; <i8*> [#uses=1]
+--- llvm/test/CodeGen/PowerPC/available-externally.ll
++++ llvm/test/CodeGen/PowerPC/available-externally.ll
+@@ -14,7 +14,7 @@ target triple = "powerpc-unknown-linux-gnu"
+ define i32 @foo(i64 %x) nounwind {
+ entry:
+ ; STATIC: foo:
+-; STATIC: bl exact_log2@PLT
++; STATIC: bl exact_log2
+ ; STATIC: blr
+ 
+ ; PIC: foo:
+--- llvm/test/CodeGen/PowerPC/stubs.ll
++++ llvm/test/CodeGen/PowerPC/stubs.ll
+@@ -6,4 +6,4 @@ entry:
+ }
+ 
+ ; CHECK: test1:
+-; CHECK: bl __floatditf@PLT
++; CHECK: bl __floatditf
+--- llvm/test/CodeGen/PowerPC/umulo-128-legalisation-lowering.ll
++++ llvm/test/CodeGen/PowerPC/umulo-128-legalisation-lowering.ll
+@@ -72,7 +72,7 @@ define { i128, i8 } @muloti_test(i128 %l, i128 %r) unnamed_addr #0 {
+ ; PPC32-NEXT: mr 28, 9
+ ; PPC32-NEXT: mr 23, 6
+ ; PPC32-NEXT: mr 24, 5
+-; PPC32-NEXT: bl __multi3@PLT
++; PPC32-NEXT: bl __multi3
+ ; PPC32-NEXT: mr 7, 4
+ ; PPC32-NEXT: mullw 4, 24, 30
+ ; PPC32-NEXT: mullw 8, 29, 23
diff --git a/srcpkgs/llvm9/files/patches/llvm/llvm-004-override-opt.patch b/srcpkgs/llvm9/files/patches/llvm/llvm-004-override-opt.patch
new file mode 100644
index 00000000000..30d1e14e193
--- /dev/null
+++ b/srcpkgs/llvm9/files/patches/llvm/llvm-004-override-opt.patch
@@ -0,0 +1,18 @@
+This allows us to override the optimization level as not all platforms can
+deal with -O3.
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -893,6 +893,12 @@ if( MINGW AND NOT "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" )
+   llvm_replace_compiler_option(CMAKE_CXX_FLAGS_RELEASE "-O3" "-O2")
+ endif()
+ 
++set(VOID_CXX_OPT_FLAGS "" CACHE STRING "Optimization level to use")
++
++if(NOT VOID_CXX_OPT_FLAGS STREQUAL "")
++  llvm_replace_compiler_option(CMAKE_CXX_FLAGS_RELEASE "-O3" "${VOID_CXX_OPT_FLAGS}")
++endif()
++
+ # Put this before tblgen. Else we have a circular dependence.
+ add_subdirectory(lib/Demangle)
+ add_subdirectory(lib/Support)
diff --git a/srcpkgs/llvm9/template b/srcpkgs/llvm9/template
new file mode 100644
index 00000000000..3c1a1a3451b
--- /dev/null
+++ b/srcpkgs/llvm9/template
@@ -0,0 +1,283 @@
+# Template file for 'llvm9'
+pkgname=llvm9
+version=9.0.0
+revision=2
+wrksrc="llvm-${version}.src"
+build_style=cmake
+configure_args="
+ -DCMAKE_BUILD_TYPE=Release
+ -DLLVM_INSTALL_UTILS=ON
+ -DLLVM_BUILD_LLVM_DYLIB=ON
+ -DLLVM_LINK_LLVM_DYLIB=ON
+ -DLLVM_ENABLE_RTTI=ON
+ -DLLVM_ENABLE_FFI=ON
+ -DLLVM_BINUTILS_INCDIR=/usr/include"
+hostmakedepends="groff perl python3 zlib-devel libffi-devel swig"
+makedepends="python3-devel zlib-devel libffi-devel libedit-devel
+ libxml2-devel binutils-devel libatomic-devel"
+depends="libllvm9"
+short_desc="Low Level Virtual Machine"
+maintainer="q66 <daniel@octaforge.org>"
+license="NCSA"
+homepage="https://www.llvm.org"
+distfiles="https://releases.llvm.org/${version}/llvm-${version}.src.tar.xz
+ https://releases.llvm.org/${version}/lldb-${version}.src.tar.xz
+ https://releases.llvm.org/${version}/lld-${version}.src.tar.xz
+ https://releases.llvm.org/${version}/cfe-${version}.src.tar.xz
+ https://releases.llvm.org/${version}/clang-tools-extra-${version}.src.tar.xz
+ https://releases.llvm.org/${version}/compiler-rt-${version}.src.tar.xz"
+checksum="d6a0565cf21f22e9b4353b2eb92622e8365000a9e90a16b09b56f8157eabfe84
+ 1e4c2f6a1f153f4b8afa2470d2e99dab493034c1ba8b7ffbbd7600de016d0794
+ 31c6748b235d09723fb73fea0c816ed5a3fab0f96b66f8fbc546a0fcc8688f91
+ 7ba81eef7c22ca5da688fdf9d88c20934d2d6b40bfe150ffd338900890aa4610
+ ea1c86ce352992d7b6f6649bc622f6a2707b9f8b7153e9f9181a35c76aa3ac10
+ 56e4cd96dd1d8c346b07b4d6b255f976570c6f2389697347a6c3dcb9e820d10e"
+disable_parallel_builds=yes
+lib32disabled=yes
+# necessary to override auto default
+python_version=3
+
+_lldb_enable=yes
+
+if [ "$CROSS_BUILD" ]; then
+	_lldb_enable=no
+fi
+
+case "$XBPS_TARGET_MACHINE" in
+	ppc64le*) ;;
+	ppc*) _lldb_enable=no ;;
+esac
+
+subpackages="clang-tools-extra clang clang-analyzer libllvm9"
+if [ "$_lldb_enable" = "yes" ]; then
+	# XXX fails to cross compile due to python
+	subpackages+=" lldb lldb-devel"
+fi
+subpackages+=" lld lld-devel"
+
+case "$XBPS_TARGET_MACHINE" in
+	armv5*) broken="Tries to assemble VFP instructions with armv5tel arch";;
+esac
+
+post_patch() {
+	# patches
+	cd ${XBPS_BUILDDIR}/llvm-${version}.src
+	for i in ${FILESDIR}/patches/llvm/llvm-*.patch; do
+		msg_normal "Applying $i to llvm\n"
+		patch -sNp1 -i ${i}
+	done
+
+	cd ${XBPS_BUILDDIR}/cfe-${version}.src
+	for i in ${FILESDIR}/patches/cfe/cfe-*.patch; do
+		msg_normal "Applying $i to cfe\n"
+		patch -sNp1 -i ${i}
+	done
+
+	if [ "$_lldb_enable" = "yes" ]; then
+		cd ${XBPS_BUILDDIR}/lldb-${version}.src
+		for i in ${FILESDIR}/patches/lldb/*.patch; do
+			msg_normal "Applying $i to lldb\n"
+			patch -sNp1 -i ${i}
+		done
+		case "$XBPS_TARGET_MACHINE" in
+			*-musl) sed -i 's|__ptrace_request|int|g' source/Plugins/Process/Linux/NativeProcessLinux.cpp ;;
+		esac
+	fi
+
+	# Move clang files into the llvm source.
+	if [ -d ${XBPS_BUILDDIR}/cfe-${version}.src ]; then
+		mv ${XBPS_BUILDDIR}/cfe-${version}.src ${wrksrc}/tools/clang
+	fi
+	# Move clang-tools-extra files into llvm source.
+	if [ -d ${XBPS_BUILDDIR}/clang-tools-extra-${version}.src ]; then
+		mv ${XBPS_BUILDDIR}/clang-tools-extra-${version}.src ${wrksrc}/tools/clang/tools/extra
+	fi
+	# Move lld files into the llvm source.
+	if [ -d ${XBPS_BUILDDIR}/lld-${version}.src ]; then
+		mv ${XBPS_BUILDDIR}/lld-${version}.src ${wrksrc}/tools/lld
+	fi
+	# Move lldb files into the llvm source.
+	if [ "$_lldb_enable" = "yes" -a -d ${XBPS_BUILDDIR}/lldb-${version}.src ]; then
+		mv ${XBPS_BUILDDIR}/lldb-${version}.src ${wrksrc}/tools/lldb
+	fi
+	# Move compiler-rt files into the llvm source.
+	if [ -d ${XBPS_BUILDDIR}/compiler-rt-${version}.src ]; then
+		mv ${XBPS_BUILDDIR}/compiler-rt-${version}.src ${wrksrc}/projects/compiler-rt
+	fi
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl)
+			# Disable sanitizers
+			sed -i 's/set(COMPILER_RT_HAS_SANITIZER_COMMON TRUE)/set(COMPILER_RT_HAS_SANITIZER_COMMON FALSE)/' ${wrksrc}/projects/compiler-rt/cmake/config-ix.cmake
+			;;
+	esac
+
+}
+
+pre_configure() {
+	# Vastly reduce size of debugging symbols:
+	CFLAGS=${CFLAGS/ -g/ -g1}
+	CXXFLAGS=${CXXFLAGS/ -g/ -g1}
+
+	# since gcc9, the build likes to blow up for ppc32 apparently because
+	# of clang being too large for a 24-bit relative call to the PLT, so
+	# optimize for size instead
+	case "$XBPS_TARGET_MACHINE" in
+		ppc|ppc-musl) configure_args+=" -DVOID_CXX_OPT_FLAGS=-Os" ;;
+	esac
+
+	if [ "$CROSS_BUILD" ]; then
+		msg_normal "Building host tblgen\n"
+		mkdir -p build/HOST
+		cd build/HOST
+		CC="$BUILD_CC" CXX="$BUILD_CXX" CFLAGS="$BUILD_CFLAGS" \
+			CXXFLAGS="$BUILD_CXXFLAGS" LDFLAGS="$BUILD_LDFLAGS" \
+			cmake ../.. -DCMAKE_BUILD_TYPE=Release
+		make ${makejobs} -C utils/TableGen
+		make ${makejobs} -C tools/clang/utils/TableGen
+		configure_args+=" -DLLVM_TABLEGEN=${wrksrc}/build/HOST/bin/llvm-tblgen"
+		configure_args+=" -DCLANG_TABLEGEN=${wrksrc}/build/HOST/bin/clang-tblgen"
+		cd ../..
+	fi
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686*) _arch="X86";;
+		x86_64*) _arch="X86";;
+		armv5*) _arch="Armv5te";;
+		armv6*) _arch="Armv6";;
+		armv7*) _arch="Armv7";;
+		aarch64*) _arch="AArch64";;
+		mips*) _arch="Mips";;
+		ppc*) _arch="PowerPC";;
+	esac
+	configure_args+=" -DLLVM_TARGET_ARCH=${_arch}"
+	configure_args+=" -DLLVM_DEFAULT_TARGET_TRIPLE=${XBPS_CROSS_TRIPLET:-$XBPS_TRIPLET}"
+}
+
+do_install() {
+	vlicense LICENSE.TXT
+
+	cd build
+	cmake -DCMAKE_INSTALL_PREFIX=${DESTDIR}/usr -P cmake_install.cmake
+
+	# Fix permissions of static libs
+	chmod -x ${DESTDIR}/usr/lib/*.a
+
+	# Required for multilib.
+	if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
+		for _header in llvm-config; do
+			mv ${DESTDIR}/usr/include/llvm/Config/${_header}{,-64}.h
+			vinstall ${FILESDIR}/llvm-Config-${_header}.h 644 \
+				usr/include/llvm/Config ${_header}.h
+		done
+	fi
+
+	# Remove llvm-config-host in cross builds.
+	if [ "$CROSS_BUILD" ]; then
+		rm -f ${DESTDIR}/usr/bin/llvm-config-host
+	fi
+}
+
+clang-analyzer_package() {
+	archs=noarch
+	pycompile_dirs="usr/share/scan-view"
+	depends="clang-${version}_${revision} python3"
+	short_desc+=" - A source code analysis framework"
+	homepage="https://clang-analyzer.llvm.org/"
+	pkg_install() {
+		vmove usr/share/man/man1/scan-build.1
+		vmove "/usr/bin/scan-*"
+		vmove "/usr/share/scan-*"
+		vmove "/usr/libexec/*analyzer"
+	}
+}
+
+clang-tools-extra_package() {
+	depends="clang-${version}_${revision} python3"
+	short_desc+=" - Extra Clang tools"
+	homepage="https://clang.llvm.org/extra/"
+	pkg_install() {
+		vmove usr/bin/clang-apply-replacements
+		vmove usr/bin/clang-query
+		vmove usr/bin/clang-rename
+		vmove usr/bin/clang-tidy
+		vmove usr/bin/modularize
+		vmove "usr/lib/libclangApplyReplacements*"
+		vmove "usr/lib/libclangQuery*"
+		vmove "usr/lib/libclangTidy*"
+		vmove "usr/share/clang/*tidy*"
+	}
+}
+
+clang_package() {
+	lib32disabled=yes
+	depends="libstdc++-devel libgcc-devel binutils"
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl) depends+=" musl-devel";;
+		*) depends+=" glibc-devel";;
+	esac
+	short_desc+=" - C language family frontend"
+	alternatives="cc:cc:/usr/bin/clang"
+	homepage="https://clang.llvm.org/"
+	pkg_install() {
+		vmove usr/include/clang
+		vmove usr/include/clang-c
+		vmove "usr/bin/*clang*"
+		vmove usr/bin/c-index-test
+		vmove usr/lib/clang
+		vmove usr/lib/cmake/clang
+		vmove "usr/lib/libclang*"
+		vmove "usr/share/clang"
+	}
+}
+
+lld_package() {
+	lib32disabled=yes
+	short_desc+=" - linker"
+	homepage="https://lld.llvm.org"
+	pkg_install() {
+		vmove usr/bin/lld*
+		vmove usr/bin/wasm-ld
+		vmove usr/bin/ld.lld*
+	}
+}
+
+lld-devel_package() {
+	lib32disabled=yes
+	short_desc+=" - linker - development files"
+	homepage="https://lld.llvm.org"
+	pkg_install() {
+		vmove usr/include/lld
+		vmove "usr/lib/liblld*a"
+	}
+}
+
+lldb_package() {
+	lib32disabled=yes
+	depends+=" python3-six"
+	short_desc+=" - LLDB debugger"
+	homepage="https://lldb.llvm.org/"
+	pkg_install() {
+		vmove usr/bin/*lldb*
+		vmove usr/lib/liblldb*so.*
+		vman tools/lldb/docs/lldb.1
+		vmove /usr/lib/python*
+		# Depend on python3-six instead of conflicting
+		rm ${PKGDESTDIR}/usr/lib/python3*/site-packages/six.py
+	}
+}
+
+lldb-devel_package() {
+	depends="lldb>=${version}_${revision}"
+	short_desc+=" - LLDB debugger - development files"
+	pkg_install() {
+		vmove usr/include/lldb
+		vmove "usr/lib/liblldb*.so"
+	}
+}
+
+libllvm9_package() {
+	short_desc+=" - runtime library"
+	pkg_install() {
+		vmove "usr/lib/libLLVM-*.so*"
+	}
+}
diff --git a/srcpkgs/llvm9/update b/srcpkgs/llvm9/update
new file mode 100644
index 00000000000..3d09eaff373
--- /dev/null
+++ b/srcpkgs/llvm9/update
@@ -0,0 +1,2 @@
+site=https://releases.llvm.org/
+pattern="'\K[\d\.]*(?=')"
diff --git a/srcpkgs/logrotate/template b/srcpkgs/logrotate/template
index 6333fb2a3ae..d335e58547e 100644
--- a/srcpkgs/logrotate/template
+++ b/srcpkgs/logrotate/template
@@ -1,6 +1,6 @@
 # Template file for 'logrotate'
 pkgname=logrotate
-version=3.15.0
+version=3.15.1
 revision=1
 build_style=gnu-configure
 makedepends="acl-devel popt-devel"
@@ -10,7 +10,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/logrotate/logrotate"
 distfiles="${homepage}/releases/download/${version}/logrotate-${version}.tar.xz"
-checksum=313612c4776a305393454c874ef590d8acf84c9ffa648717731dfe902284ff8f
+checksum=491fec9e89f1372f02a0ab66579aa2e9d63cac5178dfa672c204c88e693a908b
+make_dirs="/etc/logrotate.d 0755 root root"
 
 post_install() {
 	vconf ${FILESDIR}/logrotate.conf
diff --git a/srcpkgs/lok/template b/srcpkgs/lok/template
index 9ceec331e63..bebc928ae57 100644
--- a/srcpkgs/lok/template
+++ b/srcpkgs/lok/template
@@ -4,7 +4,7 @@ version=6.2
 revision=1
 build_style=gnu-makefile
 short_desc="A Linux port of OpenBSD's awk"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="ISC"
 homepage="https://github.com/dimkr/lok"
 distfiles="https://github.com/dimkr/lok/archive/${version}.tar.gz"
diff --git a/srcpkgs/lollypop/template b/srcpkgs/lollypop/template
index 639fcc644d5..56ace773bf3 100644
--- a/srcpkgs/lollypop/template
+++ b/srcpkgs/lollypop/template
@@ -1,9 +1,9 @@
 # Template file for 'lollypop'
 pkgname=lollypop
-version=1.1.4.11
+version=1.1.4.16
 revision=1
 # Gitlab upload tag hash
-_uhash=1d87588d659e720e70d08e6e945fe317
+_uhash=6b4e4e7a2c17f0770c1e2b3354ae5a3a
 archs=noarch
 build_style=meson
 pycompile_module="lollypop"
@@ -16,4 +16,4 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Lollypop"
 distfiles="https://gitlab.gnome.org/World/${pkgname}/uploads/${_uhash}/${pkgname}-${version}.tar.xz"
-checksum=66ea9ec9749d17b953ee29276bb7a4dfbb452b8c519dcff5ad85b60668755d1e
+checksum=e3da74c32b2edebea29aced4bb00e2d62688298fa4872949b504edf8128b19eb
diff --git a/srcpkgs/lowdown/patches/stdint_h.patch b/srcpkgs/lowdown/patches/stdint_h.patch
index 1dd64684c3d..872830c1607 100644
--- a/srcpkgs/lowdown/patches/stdint_h.patch
+++ b/srcpkgs/lowdown/patches/stdint_h.patch
@@ -1,33 +1,3 @@
---- buffer.c.orig
-+++ buffer.c
-@@ -25,6 +25,7 @@
- 
- #include <assert.h>
- #include <stdarg.h>
-+#include <stdint.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
---- diff.c.orig
-+++ diff.c
-@@ -28,6 +28,7 @@
- #if HAVE_MD5
- # include <md5.h>
- #endif
-+#include <stdint.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
---- nroff_escape.c.orig
-+++ nroff_escape.c
-@@ -20,6 +20,7 @@
- # include <sys/queue.h>
- #endif
- 
-+#include <stdint.h>
- #include <stdio.h>
- 
- #include "lowdown.h"
 --- util.c.orig
 +++ util.c
 @@ -20,6 +20,7 @@
diff --git a/srcpkgs/lowdown/template b/srcpkgs/lowdown/template
index e4716c3f1b5..c2347a47fa4 100644
--- a/srcpkgs/lowdown/template
+++ b/srcpkgs/lowdown/template
@@ -1,6 +1,6 @@
 # Template file for 'lowdown'
 pkgname=lowdown
-version=0.4.4
+version=0.4.5
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -9,7 +9,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="ISC"
 homepage="https://kristaps.bsd.lv/lowdown/"
 distfiles="https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz"
-checksum=bd3acdef18ba68151dbbbe1eb68dd04f0368739fa306e4b888359f00c413ac44
+checksum=469f788d22a59370dd4d9d97ac03e61cb01aab735fc85ad67aa5e563a96e3f91
 
 post_install() {
 	vlicense LICENSE.md
diff --git a/srcpkgs/lprng/files/lprng/run b/srcpkgs/lprng/files/lprng/run
new file mode 100755
index 00000000000..1e8435ee9ff
--- /dev/null
+++ b/srcpkgs/lprng/files/lprng/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+exec 2>&1
+exec chpst -u :_lprng lpd -F
diff --git a/srcpkgs/lprng/template b/srcpkgs/lprng/template
new file mode 100644
index 00000000000..0be77d3cde6
--- /dev/null
+++ b/srcpkgs/lprng/template
@@ -0,0 +1,24 @@
+# Template file for 'lprng'
+pkgname=lprng
+version=3.8.C
+revision=1
+build_style=gnu-configure
+configure_args="--with-userid=_lprng --with-groupid=_lprng"
+short_desc="Enhanced Printer Spooler"
+maintainer="Andrew Benson <abenson+void@gmail.com>"
+license="GPL-2.0-only"
+homepage="http://lprng.sourceforge.net/"
+distfiles="${SOURCEFORGE_SITE}/lprng/lprng/lprng-${version}.tar.gz"
+checksum=694a1747a96385b89e93f43343bf35cee5c8c73353a83814106911c99f09de10
+system_accounts="_lprng"
+conflicts="cups>=0"
+conf_files="/etc/lpd/* /etc/printcap"
+
+export CLEAR=no
+
+post_install() {
+	mv ${DESTDIR}/etc/printcap{.sample,}
+	mv ${DESTDIR}/etc/lpd/lpd.conf{.sample,}
+	mv ${DESTDIR}/etc/lpd/lpd.perms{.sample,}
+	vsv lprng
+}
diff --git a/srcpkgs/lsd/template b/srcpkgs/lsd/template
new file mode 100644
index 00000000000..c977494442b
--- /dev/null
+++ b/srcpkgs/lsd/template
@@ -0,0 +1,12 @@
+# Template file for 'lsd'
+pkgname=lsd
+version=0.16.0
+revision=1
+build_style=cargo
+short_desc="Next gen ls command with lots of pretty colors and awesome icons"
+maintainer="Lugubris <lugubris@disroot.org>"
+license="Apache-2.0"
+homepage="https://github.com/Peltoche/lsd"
+changelog="https://raw.githubusercontent.com/Peltoche/${pkgname}/${version}/CHANGELOG.md"
+distfiles="https://github.com/Peltoche/${pkgname}/archive/${version}.tar.gz"
+checksum=e2406748d78431a1c03bdd2404a204a006c19905d926e41a36587b93a791e003
diff --git a/srcpkgs/lsyncd/files/lsyncd/log/run b/srcpkgs/lsyncd/files/lsyncd/log/run
new file mode 100755
index 00000000000..114c954f1d9
--- /dev/null
+++ b/srcpkgs/lsyncd/files/lsyncd/log/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec logger -t lsyncd -p 'daemon.info'
diff --git a/srcpkgs/lsyncd/files/lsyncd/run b/srcpkgs/lsyncd/files/lsyncd/run
index 1fdafa74033..c6baeb891c2 100644
--- a/srcpkgs/lsyncd/files/lsyncd/run
+++ b/srcpkgs/lsyncd/files/lsyncd/run
@@ -1,4 +1,3 @@
 #!/bin/sh
 [ -r ./conf ] && . ./conf
-exec 1>&2
-exec lsyncd "${CONF_FILE:-'/etc/lsyncd/lsyncd.conf.lua'}"
+exec lsyncd -nodaemon "${CONF_FILE:-/etc/lsyncd/lsyncd.conf.lua}"
diff --git a/srcpkgs/lsyncd/template b/srcpkgs/lsyncd/template
index a906c4e4b24..a6923503734 100644
--- a/srcpkgs/lsyncd/template
+++ b/srcpkgs/lsyncd/template
@@ -1,14 +1,14 @@
 # Template file for 'lsyncd'
 pkgname=lsyncd
 version=2.2.3
-revision=1
+revision=2
 wrksrc="${pkgname}-release-${version}"
 build_style=cmake
 hostmakedepends="asciidoc lua"
 makedepends="lua-devel"
 depends="rsync"
 short_desc="Syncing Daemon that synchronizes local directories with remote targets"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/axkibe/lsyncd"
 distfiles="https://github.com/axkibe/lsyncd/archive/release-${version}.tar.gz"
diff --git a/srcpkgs/lttng-modules-dkms/template b/srcpkgs/lttng-modules-dkms/template
index a41e8c9af5a..36256bebb80 100644
--- a/srcpkgs/lttng-modules-dkms/template
+++ b/srcpkgs/lttng-modules-dkms/template
@@ -1,7 +1,7 @@
 # Template file for 'lttng-modules-dkms'
 pkgname=lttng-modules-dkms
-version=2.10.9
-revision=2
+version=2.10.11
+revision=1
 wrksrc="lttng-modules-${version}"
 depends="dkms"
 short_desc="LTTng modules provide Linux kernel tracing capability"
@@ -9,7 +9,7 @@ maintainer="Alexander Egorenkov <egorenar-dev@posteo.net>"
 license="LGPL-2.1-only, GPL-2.0-only, MIT"
 homepage="https://lttng.org"
 distfiles="${homepage}/files/lttng-modules/lttng-modules-${version}.tar.bz2"
-checksum=a1855bbd02d0f71ebd180e9872309862036624f012442ab9cc5852eb60340145
+checksum=7f91e39b2e8e46d8bbba2b4c8c1614f1fb380611cd1a1fccc1d1859be26112f1
 
 dkms_modules="lttng-modules ${version}"
 
diff --git a/srcpkgs/lttng-tools/template b/srcpkgs/lttng-tools/template
index 3c43dcb68fe..8aa64f9a51f 100644
--- a/srcpkgs/lttng-tools/template
+++ b/srcpkgs/lttng-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'lttng-tools'
 pkgname=lttng-tools
-version=2.10.6
+version=2.10.8
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ maintainer="Alexander Egorenkov <egorenar-dev@posteo.net>"
 license="LGPL-2.1-only, GPL-2.0-only"
 homepage="https://lttng.org"
 distfiles="${homepage}/files/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=f05df52bbebf8ce88d1b29e9e98cfc957d2ed738a345118018237ebdb581537c
+checksum=664a1145f9fd7a574da18aa3dfbbe97983985a471ca2992d6b272f1cebe6b30d
 system_groups="tracing"
 
 lttng-tools-devel_package() {
diff --git a/srcpkgs/lttng-ust/template b/srcpkgs/lttng-ust/template
index d33c1863950..87c4ef5592e 100644
--- a/srcpkgs/lttng-ust/template
+++ b/srcpkgs/lttng-ust/template
@@ -1,6 +1,6 @@
 # Template file for 'lttng-ust'
 pkgname=lttng-ust
-version=2.10.3
+version=2.10.5
 revision=1
 build_style=gnu-configure
 makedepends="liburcu-devel"
@@ -10,7 +10,7 @@ license="LGPL-2.1-only"
 homepage="http://lttng.org"
 changelog="https://github.com/lttng/lttng-ust/raw/master/ChangeLog"
 distfiles="${homepage}/files/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=9e8420f90d5f963f7aa32bc6d44adc1e491136f687c69ffb7a3075d33b40852b
+checksum=06f9ed9b2198855b1c7fcbf15fe57297ee259409ffa1b3bad87321412d98bc35
 
 lttng-ust-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} liburcu-devel"
diff --git a/srcpkgs/luaposix/template b/srcpkgs/luaposix/template
index a94293160e6..0fbd9385409 100644
--- a/srcpkgs/luaposix/template
+++ b/srcpkgs/luaposix/template
@@ -1,18 +1,18 @@
 # Template file for 'luaposix'
 pkgname=luaposix
-version=34.0.4
-revision=2
-lib32disabled=yes
+version=34.1.1
+revision=1
 wrksrc="luaposix-release-v${version}"
 hostmakedepends="lua51-devel lua52-devel lua-devel"
 makedepends="lua51-devel lua52-devel lua-devel"
 depends="lua lua-stdlib-normalize"
-short_desc="A POSIX library for Lua programming language"
+short_desc="POSIX library for Lua programming language"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://luaforge.net/projects/luaposix/"
 distfiles="https://github.com/luaposix/luaposix/archive/release-v${version}.tar.gz"
-checksum=d0110e465fdaeedd6662e9fdd40ae88131f7380bd7e1335adac70c24bb70f718
+checksum=273df2dbd9581a2f22e4265f14d0d759c487c0c9830f94395d7d690474382810
+lib32disabled=yes
 
 post_extract() {
 	cd "${wrksrc}"
diff --git a/srcpkgs/luasec/template b/srcpkgs/luasec/template
index d8abffee3b7..be68fc3d8ee 100644
--- a/srcpkgs/luasec/template
+++ b/srcpkgs/luasec/template
@@ -1,6 +1,6 @@
 # Template file for 'luasec'
 pkgname=luasec
-version=0.7.1
+version=0.8.1
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-makefile
@@ -12,7 +12,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/brunoos/luasec"
 distfiles="https://github.com/brunoos/luasec/archive/${pkgname}-${version}.tar.gz"
-checksum=3dfc7ef3c20e3d57b1ff3aaee93e73e828cfb58cc92ad261c5fd08d08fedf7d1
+checksum=cc9fc92df3be56add5c9687319951f457c31f5d12ac19cfc09d53056dc24f04e
 
 do_build() {
 	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
diff --git a/srcpkgs/lutris/template b/srcpkgs/lutris/template
index 5da50a720e8..8f54d693a12 100644
--- a/srcpkgs/lutris/template
+++ b/srcpkgs/lutris/template
@@ -1,6 +1,6 @@
 # Template file for 'lutris'
 pkgname=lutris
-version=0.5.2.2
+version=0.5.3
 revision=1
 archs=noarch
 build_style=python3-module
@@ -15,4 +15,4 @@ license="GPL-3.0-or-later"
 homepage="https://lutris.net"
 changelog="https://raw.githubusercontent.com/lutris/lutris/master/debian/changelog"
 distfiles="https://github.com/lutris/lutris/archive/v${version}.tar.gz"
-checksum=09ed6bbc501610c4bdc3653b8b9f9bfde1ae797dae29e69a2f4a4b75da337376
+checksum=673d2cfae1f427ad87df0bd69decc1aab07f3cd22476f4b74501d88398b58687
diff --git a/srcpkgs/lxqt-themes/template b/srcpkgs/lxqt-themes/template
index f7d85335c85..e93fd5d86fa 100644
--- a/srcpkgs/lxqt-themes/template
+++ b/srcpkgs/lxqt-themes/template
@@ -6,7 +6,7 @@ build_style=cmake
 hostmakedepends="lxqt-build-tools"
 depends="hicolor-icon-theme"
 short_desc="Themes, graphics and icons for LXQt"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://lxqt.org/"
 distfiles="https://github.com/lxqt/lxqt-themes/releases/download/${version}/lxqt-themes-${version}.tar.xz"
diff --git a/srcpkgs/lyx/template b/srcpkgs/lyx/template
index 2bf4b88ef75..dfc3e0d3ff2 100644
--- a/srcpkgs/lyx/template
+++ b/srcpkgs/lyx/template
@@ -1,15 +1,15 @@
 # Template file for 'lyx'
 pkgname=lyx
-version=2.3.1
+version=2.3.3
 revision=1
 build_style=gnu-configure
 configure_args="--enable-qt5 --without-included-mythes --without-included-boost"
 hostmakedepends="pkg-config bc python qt5-devel"
 makedepends="file-devel boost-devel mythes-devel enchant-devel qt5-svg-devel"
 depends="virtual?texlive GraphicsMagick python"
-short_desc="The Document Processor WYSIWYM Editor & Latex frontend"
+short_desc="Document Processor WYSIWYM Editor & Latex frontend"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.lyx.org/Home"
-distfiles="ftp://ftp.lyx.org/pub/${pkgname}/stable/2.3.x/${pkgname}-${version}-2.tar.xz"
-checksum=f5c9450ba196ed9d49fbc573f65b10d1726d16a62453466957aba2a9f6d66f84
+distfiles="ftp://ftp.lyx.org/pub/${pkgname}/stable/2.3.x/${pkgname}-${version}.tar.xz"
+checksum=991eefebddb281d276a7693f8ac119bd971aab3fa9f554cd14e4b68b04284e39
diff --git a/srcpkgs/lz4/template b/srcpkgs/lz4/template
index 4507dca85be..8fb806e8ad7 100644
--- a/srcpkgs/lz4/template
+++ b/srcpkgs/lz4/template
@@ -1,7 +1,7 @@
 # Template file for 'lz4'
 pkgname=lz4
 reverts="131_1 130_1 129_1 128_1 127_1 126_1 125_1 124_1 123_1 122_1"
-version=1.9.1
+version=1.9.2
 revision=1
 bootstrap=yes
 build_style=gnu-makefile
@@ -12,7 +12,7 @@ license="BSD-2-Clause, GPL-2.0-or-later"
 homepage="https://lz4.github.io/lz4"
 changelog="https://raw.githubusercontent.com/lz4/lz4/master/NEWS"
 distfiles="https://github.com/lz4/lz4/archive/v${version}.tar.gz"
-checksum=f8377c89dad5c9f266edc0be9b73595296ecafd5bfa1000de148096c50052dc4
+checksum=658ba6191fa44c92280d4aa2c271b0f4fbc0e34d249578dd05e50e76d0e5efcc
 
 post_install() {
 	vlicense lib/LICENSE
diff --git a/srcpkgs/magic-wormhole/template b/srcpkgs/magic-wormhole/template
new file mode 100644
index 00000000000..c07753ce6ad
--- /dev/null
+++ b/srcpkgs/magic-wormhole/template
@@ -0,0 +1,21 @@
+# Template file for 'magic-wormhole'
+pkgname=magic-wormhole
+version=0.11.2
+revision=1
+archs=noarch
+build_style=python3-module
+pycompile_module="wormhole"
+hostmakedepends="python3 python3-setuptools"
+depends="python3-autobahn python3-cffi python3-click python3-humanize
+ python3-idna python3-pynacl python3-service_identity python3-spake2
+ python3-tqdm python3-txtorcon"
+short_desc="Get things from one computer to another, safely"
+maintainer="travankor <travankor@tuta.io>"
+license="MIT"
+homepage="https://magic-wormhole.readthedocs.io/en/latest/"
+distfiles="https://github.com/warner/magic-wormhole/archive/${version}.tar.gz"
+checksum=55fd24b8c148d0f2c12160040dd061a5749bcda269adf97de6a697c9416c1052
+
+post-install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/mailcommon/template b/srcpkgs/mailcommon/template
index 836eac6d7a4..0dc9885d5d4 100644
--- a/srcpkgs/mailcommon/template
+++ b/srcpkgs/mailcommon/template
@@ -1,18 +1,18 @@
 # Template file for 'mailcommon'
 pkgname=mailcommon
-version=19.08.0
-revision=1
+version=19.08.2
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig libxslt qt5-qmake
  qt5-host-tools python kgendesignerplugin"
 makedepends="mailimporter-devel messagelib-devel kdesignerplugin-devel
- pimcommon-devel libkleo-devel qt5-multimedia-devel"
+ pimcommon-devel libkleo-devel qt5-multimedia-devel kcontacts-devel"
 short_desc="KDE PIM library providing support for mail applications"
 maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/applications/${version}/src/mailcommon-${version}.tar.xz"
-checksum=6c69b70356d9d96578c3fd472aaa36e33feb0677d7e65c36981c0596daf3aea3
+checksum=39df1544c0278600d5a1a57697835828358ae44203087e29430ce1bd0c355e20
 
 mailcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"
diff --git a/srcpkgs/mailimporter/template b/srcpkgs/mailimporter/template
index 06b6aa85c39..f7b6d25f8b0 100644
--- a/srcpkgs/mailimporter/template
+++ b/srcpkgs/mailimporter/template
@@ -1,6 +1,6 @@
 # Template file for 'mailimporter'
 pkgname=mailimporter
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python"
@@ -10,7 +10,7 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/applications/${version}/src/mailimporter-${version}.tar.xz"
-checksum=242f1a93b3521abc68ca8e1abfc75acd0b59e1e2d553df80a057645102246dd7
+checksum=27780c381919ebc9e6fc0de7021cd03277dd3962d4c4c15770fcf44cd6126814
 
 mailimporter-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/maim/template b/srcpkgs/maim/template
index 65124692841..456a07c9c87 100644
--- a/srcpkgs/maim/template
+++ b/srcpkgs/maim/template
@@ -7,7 +7,7 @@ hostmakedepends="pkg-config"
 makedepends="MesaLib-devel glm icu-devel libXcomposite-devel libXrandr-devel
  libjpeg-turbo-devel libpng-devel slop-devel"
 short_desc="Desktop screenshot utility"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/naelstrof/maim"
 distfiles="https://github.com/naelstrof/maim/archive/v${version}.tar.gz"
diff --git a/srcpkgs/makedepend/template b/srcpkgs/makedepend/template
index 4ac390afeb0..eb22f9dddd6 100644
--- a/srcpkgs/makedepend/template
+++ b/srcpkgs/makedepend/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="xorgproto"
 short_desc="Dependency generator for makefiles"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://wiki.freedesktop.org/xorg/"
 distfiles="${XORG_SITE}/util/${pkgname}-${version}.tar.bz2"
diff --git a/srcpkgs/mame/template b/srcpkgs/mame/template
index 99dc801bc70..14e9374500c 100644
--- a/srcpkgs/mame/template
+++ b/srcpkgs/mame/template
@@ -1,6 +1,6 @@
 # Template file for 'mame'
 pkgname=mame
-version=0212
+version=0214
 revision=1
 wrksrc="mame-mame${version}"
 short_desc="Multiple Arcade Machine Emulator"
@@ -8,7 +8,7 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"
 homepage="http://mamedev.org"
 distfiles="https://github.com/mamedev/mame/archive/mame${version}.tar.gz"
-checksum=3d3599c49626b240e98b1433c0813e11e471846154e8d29261d345cc78fc9a21
+checksum=8ae24e3b1de33df33957c5f642bd98828842305bcb31da130b759ba7e88b36d2
 
 hostmakedepends="perl pkg-config python"
 makedepends="SDL2_ttf-devel glm libgomp-devel libjpeg-turbo-devel
diff --git a/srcpkgs/man-db/template b/srcpkgs/man-db/template
index a3cf6934df3..b6cf1489eca 100644
--- a/srcpkgs/man-db/template
+++ b/srcpkgs/man-db/template
@@ -1,24 +1,25 @@
 # Template file for 'man-db'
 pkgname=man-db
-version=2.8.6.1
-revision=1
+version=2.8.7
+revision=2
 build_style=gnu-configure
 configure_args="--with-db=db --with-pager=less --with-gzip=/usr/bin/gzip
  --with-bzip2=/usr/bin/bzip2 --disable-rpath --enable-threads=posix
  --with-lzma=/usr/bin/lzma --with-xz=/usr/bin/xz --disable-setuid
- --without-included-regex --enable-automatic-create
- --with-systemdsystemunitdir=no"
+ --without-included-regex --enable-automatic-create --with-libseccomp
+ --without-systemdsystemunitdir --without-systemdtmpfilesdir"
 hostmakedepends="groff pkg-config"
-makedepends="db-devel gettext-devel groff libpipeline-devel zlib-devel"
+makedepends="db-devel gettext-devel groff libpipeline-devel libseccomp-devel
+ zlib-devel"
 depends="bzip2 coreutils grep groff gzip less"
 conf_files="/etc/man_db.conf"
-provides="man-0_1"
-short_desc="The on-line manual database"
+short_desc="On-line manual database"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
-homepage="http://www.nongnu.org/man-db/"
+homepage="https://www.nongnu.org/man-db/"
 distfiles="${NONGNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=2c77a2bb9dbf06f72417a6f63063e204888a22a5020ff77334d304d55f813a28
+checksum=b9cd5bb996305d08bfe9e1114edc30b4c97be807093b88af8033ed1cf9beb326
+provides="man-0_1"
 lib32disabled=yes
 
 alternatives="
@@ -37,7 +38,6 @@ pre_configure() {
 }
 
 post_install() {
-	rm -r ${DESTDIR}/usr/lib/tmpfiles.d
 	# Rename files for alternatives
 	for f in apropos man whatis; do
 		mv ${DESTDIR}/usr/bin/{$f,mandb-$f}
diff --git a/srcpkgs/man-pages/template b/srcpkgs/man-pages/template
index edb73fc0370..8bee1534bef 100644
--- a/srcpkgs/man-pages/template
+++ b/srcpkgs/man-pages/template
@@ -1,6 +1,6 @@
 # Template file for 'man-pages'
 pkgname=man-pages
-version=5.02
+version=5.03
 revision=1
 archs=noarch
 short_desc="Linux Documentation Project (LDP) manual pages"
@@ -8,7 +8,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://man7.org/linux/man-pages/index.html"
 distfiles="${KERNEL_SITE}/docs/man-pages/${pkgname}-${version}.tar.xz"
-checksum=c2faa85e625cd7567dc1dec9f23d1af1f73e2ca6468bce1bdc13387ec56f97e8
+checksum=7fe13aeaf9081f4c134c711270a66e264dce24dae3df7e9fec3dd18c8a485120
 
 do_install() {
 	make all prefix=${DESTDIR}/usr
diff --git a/srcpkgs/manuskript/template b/srcpkgs/manuskript/template
index 026cdeb7ff9..4808856f2ad 100644
--- a/srcpkgs/manuskript/template
+++ b/srcpkgs/manuskript/template
@@ -1,6 +1,6 @@
 # Template file for 'manuskript'
 pkgname=manuskript
-version=0.9.0
+version=0.10.0
 revision=1
 archs=noarch
 pycompile_dirs="usr/share/${pkgname}"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="http://www.theologeek.ch/manuskript"
 distfiles="https://github.com/olivierkes/manuskript/archive/${version}.tar.gz"
-checksum=0143628462911683c744bccbb785279efcab87b4566ecccb1b5a401f68f747d1
+checksum=d60745b85e788b75f41d3d91cbe02cf90e34dbf9807aa7bed85c91e19215d821
 pycompile_version="$py3_ver"
 
 do_install() {
diff --git a/srcpkgs/marble5/template b/srcpkgs/marble5/template
index 9df06aaae45..fc901481689 100644
--- a/srcpkgs/marble5/template
+++ b/srcpkgs/marble5/template
@@ -1,6 +1,6 @@
 # Template file for 'marble5'
 pkgname=marble5
-version=19.08.0
+version=19.08.2
 revision=1
 wrksrc="marble-${version}"
 build_style=cmake
@@ -14,7 +14,11 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://marble.kde.org"
 distfiles="${KDE_SITE}/applications/${version}/src/marble-${version}.tar.xz"
-checksum=c1c951a1357c94a61b38f0ae8a1235d194150cd351dbf25d2db3508b22b44cc1
+checksum=4add63522a51fdea7b425f29bd3d35c558a0b881336ff6a90bfc07483acbf6a6
+
+pre_configure() {
+	vsed -i CMakeLists.txt -e 's/-Wcast-align//'
+}
 
 marble5-devel_package() {
 	short_desc+=" - development files"
@@ -24,5 +28,6 @@ marble5-devel_package() {
 		vmove usr/include
 		vmove "usr/lib/*.so"
 		vmove usr/lib/cmake
+		vmove usr/lib/qt5/mkspecs
 	}
 }
diff --git a/srcpkgs/marco/template b/srcpkgs/marco/template
index 57b45366c5a..55fe6a80905 100644
--- a/srcpkgs/marco/template
+++ b/srcpkgs/marco/template
@@ -1,19 +1,19 @@
 # Template file for 'marco'
 pkgname=marco
-version=1.22.1
+version=1.22.3
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --enable-startup-notification --disable-schemas-compile"
 hostmakedepends="gdk-pixbuf-devel mate-common zenity"
 makedepends="libXt-devel libcanberra-devel libgtop-devel
- libnotify-devel mate-desktop-devel"
+ libnotify-devel mate-desktop-devel libXpresent-devel"
 depends="zenity"
-short_desc="window manager for MATE"
+short_desc="Window manager for MATE"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://mate-desktop.org"
 distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4e20f5ea006142f3e5c8931e2b354e1838cb9291ba245825ea82fa6611def7c8
+checksum=0a3979f0ba9855a6dff5b889c619d07bcea52df29c354976f018d71093c45139
 
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh
diff --git a/srcpkgs/mariadb/patches/force-c11-atomics.patch b/srcpkgs/mariadb/patches/force-c11-atomics.patch
new file mode 100644
index 00000000000..9546798bf97
--- /dev/null
+++ b/srcpkgs/mariadb/patches/force-c11-atomics.patch
@@ -0,0 +1,294 @@
+--- include/my_atomic.h
++++ include/my_atomic.h
+@@ -104,217 +104,6 @@
+   but can be added, if necessary.
+ */
+ 
+-#define intptr         void *
+-/**
+-  Currently we don't support 8-bit and 16-bit operations.
+-  It can be added later if needed.
+-*/
+-#undef MY_ATOMIC_HAS_8_16
+-
+-/*
+- * Attempt to do atomic ops without locks
+- */
+-#include "atomic/nolock.h"
+-
+-#ifndef make_atomic_cas_body
+-/* nolock.h was not able to generate even a CAS function, fall back */
+-#error atomic ops for this platform are not implemented
+-#endif
+-
+-/* define missing functions by using the already generated ones */
+-#ifndef make_atomic_add_body
+-#define make_atomic_add_body(S)                                 \
+-  int ## S tmp=*a;                                              \
+-  while (!my_atomic_cas ## S(a, &tmp, tmp+v)) ;                 \
+-  v=tmp;
+-#endif
+-#ifndef make_atomic_fas_body
+-#define make_atomic_fas_body(S)                                 \
+-  int ## S tmp=*a;                                              \
+-  while (!my_atomic_cas ## S(a, &tmp, v)) ;                     \
+-  v=tmp;
+-#endif
+-#ifndef make_atomic_load_body
+-#define make_atomic_load_body(S)                                \
+-  ret= 0; /* avoid compiler warning */                          \
+-  (void)(my_atomic_cas ## S(a, &ret, ret));
+-#endif
+-#ifndef make_atomic_store_body
+-#define make_atomic_store_body(S)                               \
+-  (void)(my_atomic_fas ## S (a, v));
+-#endif
+-
+-/*
+-  transparent_union doesn't work in g++
+-  Bug ?
+-
+-  Darwin's gcc doesn't want to put pointers in a transparent_union
+-  when built with -arch ppc64. Complains:
+-  warning: 'transparent_union' attribute ignored
+-*/
+-#if defined(__GNUC__) && !defined(__cplusplus) && \
+-      ! (defined(__APPLE__) && (defined(_ARCH_PPC64) ||defined (_ARCH_PPC)))
+-/*
+-  we want to be able to use my_atomic_xxx functions with
+-  both signed and unsigned integers. But gcc will issue a warning
+-  "passing arg N of `my_atomic_XXX' as [un]signed due to prototype"
+-  if the signedness of the argument doesn't match the prototype, or
+-  "pointer targets in passing argument N of my_atomic_XXX differ in signedness"
+-  if int* is used where uint* is expected (or vice versa).
+-  Let's shut these warnings up
+-*/
+-#define make_transparent_unions(S)                              \
+-        typedef union {                                         \
+-          int  ## S  i;                                         \
+-          uint ## S  u;                                         \
+-        } U_ ## S   __attribute__ ((transparent_union));        \
+-        typedef union {                                         \
+-          int  ## S volatile *i;                                \
+-          uint ## S volatile *u;                                \
+-        } Uv_ ## S   __attribute__ ((transparent_union));
+-#define uintptr intptr
+-make_transparent_unions(8)
+-make_transparent_unions(16)
+-make_transparent_unions(32)
+-make_transparent_unions(64)
+-make_transparent_unions(ptr)
+-#undef uintptr
+-#undef make_transparent_unions
+-#define a       U_a.i
+-#define cmp     U_cmp.i
+-#define v       U_v.i
+-#define set     U_set.i
+-#else
+-#define U_8    int8
+-#define U_16   int16
+-#define U_32   int32
+-#define U_64   int64
+-#define U_ptr  intptr
+-#define Uv_8   int8
+-#define Uv_16  int16
+-#define Uv_32  int32
+-#define Uv_64  int64
+-#define Uv_ptr intptr
+-#define U_a    volatile *a
+-#define U_cmp  *cmp
+-#define U_v    v
+-#define U_set  set
+-#endif /* __GCC__ transparent_union magic */
+-
+-#define make_atomic_cas(S)                                      \
+-static inline int my_atomic_cas ## S(Uv_ ## S U_a,              \
+-                            Uv_ ## S U_cmp, U_ ## S U_set)      \
+-{                                                               \
+-  int8 ret;                                                     \
+-  make_atomic_cas_body(S);                                      \
+-  return ret;                                                   \
+-}
+-
+-#define make_atomic_add(S)                                      \
+-static inline int ## S my_atomic_add ## S(                      \
+-                        Uv_ ## S U_a, U_ ## S U_v)              \
+-{                                                               \
+-  make_atomic_add_body(S);                                      \
+-  return v;                                                     \
+-}
+-
+-#define make_atomic_fas(S)                                      \
+-static inline int ## S my_atomic_fas ## S(                      \
+-                         Uv_ ## S U_a, U_ ## S U_v)             \
+-{                                                               \
+-  make_atomic_fas_body(S);                                      \
+-  return v;                                                     \
+-}
+-
+-#define make_atomic_load(S)                                     \
+-static inline int ## S my_atomic_load ## S(Uv_ ## S U_a)        \
+-{                                                               \
+-  int ## S ret;                                                 \
+-  make_atomic_load_body(S);                                     \
+-  return ret;                                                   \
+-}
+-
+-#define make_atomic_store(S)                                    \
+-static inline void my_atomic_store ## S(                        \
+-                     Uv_ ## S U_a, U_ ## S U_v)                 \
+-{                                                               \
+-  make_atomic_store_body(S);                                    \
+-}
+-
+-#ifdef MY_ATOMIC_HAS_8_16
+-make_atomic_cas(8)
+-make_atomic_cas(16)
+-#endif
+-make_atomic_cas(32)
+-make_atomic_cas(64)
+-make_atomic_cas(ptr)
+-
+-#ifdef MY_ATOMIC_HAS_8_16
+-make_atomic_add(8)
+-make_atomic_add(16)
+-#endif
+-make_atomic_add(32)
+-make_atomic_add(64)
+-
+-#ifdef MY_ATOMIC_HAS_8_16
+-make_atomic_load(8)
+-make_atomic_load(16)
+-#endif
+-make_atomic_load(32)
+-make_atomic_load(64)
+-make_atomic_load(ptr)
+-
+-#ifdef MY_ATOMIC_HAS_8_16
+-make_atomic_fas(8)
+-make_atomic_fas(16)
+-#endif
+-make_atomic_fas(32)
+-make_atomic_fas(64)
+-make_atomic_fas(ptr)
+-
+-#ifdef MY_ATOMIC_HAS_8_16
+-make_atomic_store(8)
+-make_atomic_store(16)
+-#endif
+-make_atomic_store(32)
+-make_atomic_store(64)
+-make_atomic_store(ptr)
+-
+-#ifdef _atomic_h_cleanup_
+-#include _atomic_h_cleanup_
+-#undef _atomic_h_cleanup_
+-#endif
+-
+-#undef U_8
+-#undef U_16
+-#undef U_32
+-#undef U_64
+-#undef U_ptr
+-#undef Uv_8
+-#undef Uv_16
+-#undef Uv_32
+-#undef Uv_64
+-#undef Uv_ptr
+-#undef a
+-#undef cmp
+-#undef v
+-#undef set
+-#undef U_a
+-#undef U_cmp
+-#undef U_v
+-#undef U_set
+-#undef make_atomic_add
+-#undef make_atomic_cas
+-#undef make_atomic_load
+-#undef make_atomic_store
+-#undef make_atomic_fas
+-#undef make_atomic_add_body
+-#undef make_atomic_cas_body
+-#undef make_atomic_load_body
+-#undef make_atomic_store_body
+-#undef make_atomic_fas_body
+-#undef intptr
+-
+ /*
+   the macro below defines (as an expression) the code that
+   will be run in spin-loops. Intel manuals recummend to have PAUSE there.
+@@ -328,7 +117,8 @@ make_atomic_store(ptr)
+ #define MY_ATOMIC_NOT_1CPU 1
+ extern int my_atomic_initialize();
+ 
+-#ifdef __ATOMIC_SEQ_CST
++#define MY_ATOMIC_MODE "gcc-atomics-smp"
++
+ #define MY_MEMORY_ORDER_RELAXED __ATOMIC_RELAXED
+ #define MY_MEMORY_ORDER_CONSUME __ATOMIC_CONSUME
+ #define MY_MEMORY_ORDER_ACQUIRE __ATOMIC_ACQUIRE
+@@ -364,43 +154,27 @@ extern int my_atomic_initialize();
+   __atomic_compare_exchange_n((P), (E), (D), false, (S), (F))
+ #define my_atomic_casptr_strong_explicit(P, E, D, S, F) \
+   __atomic_compare_exchange_n((P), (E), (D), false, (S), (F))
+-#else
+-#define MY_MEMORY_ORDER_RELAXED
+-#define MY_MEMORY_ORDER_CONSUME
+-#define MY_MEMORY_ORDER_ACQUIRE
+-#define MY_MEMORY_ORDER_RELEASE
+-#define MY_MEMORY_ORDER_ACQ_REL
+-#define MY_MEMORY_ORDER_SEQ_CST
+-
+-#define my_atomic_store32_explicit(P, D, O) my_atomic_store32((P), (D))
+-#define my_atomic_store64_explicit(P, D, O) my_atomic_store64((P), (D))
+-#define my_atomic_storeptr_explicit(P, D, O) my_atomic_storeptr((P), (D))
+-
+-#define my_atomic_load32_explicit(P, O) my_atomic_load32((P))
+-#define my_atomic_load64_explicit(P, O) my_atomic_load64((P))
+-#define my_atomic_loadptr_explicit(P, O) my_atomic_loadptr((P))
+-
+-#define my_atomic_fas32_explicit(P, D, O) my_atomic_fas32((P), (D))
+-#define my_atomic_fas64_explicit(P, D, O) my_atomic_fas64((P), (D))
+-#define my_atomic_fasptr_explicit(P, D, O) my_atomic_fasptr((P), (D))
+-
+-#define my_atomic_add32_explicit(P, A, O) my_atomic_add32((P), (A))
+-#define my_atomic_add64_explicit(P, A, O) my_atomic_add64((P), (A))
+-#define my_atomic_addptr_explicit(P, A, O) my_atomic_addptr((P), (A))
+ 
+-#define my_atomic_cas32_weak_explicit(P, E, D, S, F) \
+-  my_atomic_cas32((P), (E), (D))
+-#define my_atomic_cas64_weak_explicit(P, E, D, S, F) \
+-  my_atomic_cas64((P), (E), (D))
+-#define my_atomic_casptr_weak_explicit(P, E, D, S, F) \
+-  my_atomic_casptr((P), (E), (D))
++#define my_atomic_store32(P, D) __atomic_store_n((P), (D), __ATOMIC_SEQ_CST)
++#define my_atomic_store64(P, D) __atomic_store_n((P), (D), __ATOMIC_SEQ_CST)
++#define my_atomic_storeptr(P, D) __atomic_store_n((P), (D), __ATOMIC_SEQ_CST)
+ 
+-#define my_atomic_cas32_strong_explicit(P, E, D, S, F) \
+-  my_atomic_cas32((P), (E), (D))
+-#define my_atomic_cas64_strong_explicit(P, E, D, S, F) \
+-  my_atomic_cas64((P), (E), (D))
+-#define my_atomic_casptr_strong_explicit(P, E, D, S, F) \
+-  my_atomic_casptr((P), (E), (D))
+-#endif
++#define my_atomic_load32(P) __atomic_load_n((P), __ATOMIC_SEQ_CST)
++#define my_atomic_load64(P) __atomic_load_n((P), __ATOMIC_SEQ_CST)
++#define my_atomic_loadptr(P) __atomic_load_n((P), __ATOMIC_SEQ_CST)
++
++#define my_atomic_fas32(P, D) __atomic_exchange_n((P), (D), __ATOMIC_SEQ_CST)
++#define my_atomic_fas64(P, D) __atomic_exchange_n((P), (D), __ATOMIC_SEQ_CST)
++#define my_atomic_fasptr(P, D) __atomic_exchange_n((P), (D), __ATOMIC_SEQ_CST)
++
++#define my_atomic_add32(P, A) __atomic_fetch_add((P), (A), __ATOMIC_SEQ_CST)
++#define my_atomic_add64(P, A) __atomic_fetch_add((P), (A), __ATOMIC_SEQ_CST)
++
++#define my_atomic_cas32(P, E, D) \
++  __atomic_compare_exchange_n((P), (E), (D), 0, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST)
++#define my_atomic_cas64(P, E, D) \
++  __atomic_compare_exchange_n((P), (E), (D), 0, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST)
++#define my_atomic_casptr(P, E, D) \
++  __atomic_compare_exchange_n((P), (E), (D), 0, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST)
+ 
+ #endif /* MY_ATOMIC_INCLUDED */
diff --git a/srcpkgs/mariadb/patches/libatomic.patch b/srcpkgs/mariadb/patches/libatomic.patch
new file mode 100644
index 00000000000..0e8e872d9c2
--- /dev/null
+++ b/srcpkgs/mariadb/patches/libatomic.patch
@@ -0,0 +1,103 @@
+Source: Debian, q66
+
+This ensures arches that need libatomic properly get it where necessary.
+It also removes the sync builtin checks that are not necessary when
+using C11 atomics (like we always are because we're on a modern gcc)
+that break build on e.g. ppc32 and mips.
+
+--- configure.cmake
++++ configure.cmake
+@@ -992,35 +992,19 @@ SET(SIGNAL_WITH_VIO_CLOSE 1)
+ 
+ MARK_AS_ADVANCED(NO_ALARM)
+ 
+-
+-IF(WITH_ATOMIC_OPS STREQUAL "up")
+-  SET(MY_ATOMIC_MODE_DUMMY 1 CACHE BOOL "Assume single-CPU mode, no concurrency")
+-ELSEIF(WITH_ATOMIC_OPS STREQUAL "smp")
+-ELSEIF(NOT WITH_ATOMIC_OPS)
+-  CHECK_CXX_SOURCE_COMPILES("
+-  int main()
+-  {
+-    int foo= -10; int bar= 10;
+-    long long int foo64= -10; long long int bar64= 10;
+-    if (!__sync_fetch_and_add(&foo, bar) || foo)
+-      return -1;
+-    bar= __sync_lock_test_and_set(&foo, bar);
+-    if (bar || foo != 10)
+-      return -1;
+-    bar= __sync_val_compare_and_swap(&bar, foo, 15);
+-    if (bar)
+-      return -1;
+-    if (!__sync_fetch_and_add(&foo64, bar64) || foo64)
+-      return -1;
+-    bar64= __sync_lock_test_and_set(&foo64, bar64);
+-    if (bar64 || foo64 != 10)
+-      return -1;
+-    bar64= __sync_val_compare_and_swap(&bar64, foo, 15);
+-    if (bar64)
+-      return -1;
+-    return 0;
+-  }"
+-  HAVE_GCC_ATOMIC_BUILTINS)
++CHECK_CXX_SOURCE_COMPILES("
++int main()
++{
++  long long int var= 1;
++  long long int *ptr= &var;
++  return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
++}"
++HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
++IF (HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
++  SET(HAVE_GCC_C11_ATOMICS True)
++ELSE()
++  SET(OLD_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
++  LIST(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
+   CHECK_CXX_SOURCE_COMPILES("
+   int main()
+   {
+@@ -1028,14 +1012,13 @@ ELSEIF(NOT WITH_ATOMIC_OPS)
+     long long int *ptr= &var;
+     return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
+   }"
+-  HAVE_GCC_C11_ATOMICS)
+-ELSE()
+-  MESSAGE(FATAL_ERROR "${WITH_ATOMIC_OPS} is not a valid value for WITH_ATOMIC_OPS!")
++  HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++  IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++    SET(HAVE_GCC_C11_ATOMICS True)
++  ENDIF()
++  SET(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQUIRED_LIBRARIES})
+ ENDIF()
+ 
+-SET(WITH_ATOMIC_OPS "${WITH_ATOMIC_OPS}" CACHE STRING "Implement atomic operations using atomic CPU instructions for multi-processor (smp) or uniprocessor (up) configuration. By default gcc built-in sync functions are used, if available and 'smp' configuration otherwise.")
+-MARK_AS_ADVANCED(WITH_ATOMIC_OPS MY_ATOMIC_MODE_DUMMY)
+-
+ IF(WITH_VALGRIND)
+   SET(HAVE_valgrind 1)
+ ENDIF()
+--- mysys/CMakeLists.txt
++++ mysys/CMakeLists.txt
+@@ -74,6 +74,10 @@ TARGET_LINK_LIBRARIES(mysys dbug strings mysys_ssl ${ZLIB_LIBRARY}
+  ${LIBNSL} ${LIBM} ${LIBRT} ${LIBDL} ${LIBSOCKET} ${LIBEXECINFO})
+ DTRACE_INSTRUMENT(mysys)
+ 
++IF (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++  TARGET_LINK_LIBRARIES(mysys atomic)
++ENDIF()
++
+ IF(HAVE_BFD_H)
+   TARGET_LINK_LIBRARIES(mysys bfd)  
+ ENDIF(HAVE_BFD_H)
+--- sql/CMakeLists.txt
++++ sql/CMakeLists.txt
+@@ -172,6 +172,9 @@ ELSE()
+   SET(MYSQLD_SOURCE main.cc ${DTRACE_PROBES_ALL})
+ ENDIF()
+ 
++IF (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++  TARGET_LINK_LIBRARIES(sql atomic)
++ENDIF()
+ 
+ IF(MSVC AND NOT WITHOUT_DYNAMIC_PLUGINS)
+ 
diff --git a/srcpkgs/mariadb/patches/musl-ppc.patch b/srcpkgs/mariadb/patches/musl-ppc.patch
new file mode 100644
index 00000000000..16cbac71a94
--- /dev/null
+++ b/srcpkgs/mariadb/patches/musl-ppc.patch
@@ -0,0 +1,27 @@
+This header does not exist on musl, but there has been a
+builtin for this in gcc for ages, so just use that instead.
+
+--- storage/innobase/include/ut0ut.h
++++ storage/innobase/include/ut0ut.h
+@@ -89,8 +89,7 @@ struct ut_when_dtor {
+    independent way by using YieldProcessor. */
+ #  define UT_RELAX_CPU() YieldProcessor()
+ # elif defined(__powerpc__)
+-#include <sys/platform/ppc.h>
+-#  define UT_RELAX_CPU() __ppc_get_timebase()
++#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
+ # else
+ #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
+ # endif
+--- storage/xtradb/include/ut0ut.h
++++ storage/xtradb/include/ut0ut.h
+@@ -86,8 +86,7 @@ struct ut_when_dtor {
+    independent way by using YieldProcessor. */
+ #  define UT_RELAX_CPU() YieldProcessor()
+ # elif defined(__powerpc__)
+-#include <sys/platform/ppc.h>
+-#  define UT_RELAX_CPU() __ppc_get_timebase()
++#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
+ # else
+ #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
+ # endif
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 848e5eacdd0..c0c44217b71 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,7 +1,7 @@
 # Template file for 'mariadb'
 pkgname=mariadb
 version=10.1.30
-revision=6
+revision=7
 build_style=cmake
 configure_args="-DMYSQL_DATADIR=/var/lib/mysql
  -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8
@@ -18,8 +18,9 @@ configure_args="-DMYSQL_DATADIR=/var/lib/mysql
  -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF -DSTACK_DIRECTION=1
  -DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_INNOBASE_STORAGE_ENGINE=1"
 lib32disabled=yes
-hostmakedepends="perl bison ncurses-devel libressl-devel"
-makedepends="zlib-devel ncurses-devel libressl-devel readline-devel pcre-devel"
+hostmakedepends="perl bison ncurses-devel libressl-devel libatomic-devel"
+makedepends="zlib-devel ncurses-devel libressl-devel readline-devel pcre-devel
+ libatomic-devel"
 depends="mariadb-client"
 provides="mysql-${version}_${revision}"
 replaces="mysql>=0"
@@ -34,19 +35,7 @@ distfiles="http://archive.mariadb.org/$pkgname-$version/source/$pkgname-$version
 checksum=173a5e5a24819e0a469c3bd09b5c98491676c37c6095882a2ea34c5af0996c88
 CFLAGS="-w"
 
-case "$XBPS_TARGET_MACHINE" in
-	armv[56]*|ppc|ppc-musl) LDFLAGS="-L${XBPS_CROSS_BASE}/usr/lib -latomic"
-		hostmakedepends+=" libatomic-devel"
-		makedepends+=" libatomic-devel"
-		;;
-esac
-
 pre_configure() {
-	case "$XBPS_TARGET_MACHINE" in
-		armv[56]*|ppc|ppc-musl) find -name CMakeLists.txt -exec sed -i "{}" \
-				-e "/TARGET_LINK_LIBRARIES/s;); atomic);" \;
-			;;
-	esac
 	# We need some host binaries before starting cross compilation.
 	if [ "$CROSS_BUILD" ]; then
 		# XXX still broken: jemalloc configure execs host bins.
diff --git a/srcpkgs/mate-control-center/template b/srcpkgs/mate-control-center/template
index c09a088114f..755ab2dcd86 100644
--- a/srcpkgs/mate-control-center/template
+++ b/srcpkgs/mate-control-center/template
@@ -1,7 +1,7 @@
 # Template file for 'mate-control-center'
 pkgname=mate-control-center
 version=1.22.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static --disable-schemas-compile --disable-update-mimedb"
 hostmakedepends="dbus-glib-devel desktop-file-utils glib-devel intltool itstool pkg-config"
diff --git a/srcpkgs/mate-menus/template b/srcpkgs/mate-menus/template
index 61f03dd746c..f83288d5129 100644
--- a/srcpkgs/mate-menus/template
+++ b/srcpkgs/mate-menus/template
@@ -1,26 +1,22 @@
 # Template file for 'mate-menus'
 pkgname=mate-menus
-version=1.22.0
+version=1.22.1
 revision=1
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--disable-static $(vopt_enable python)"
-hostmakedepends="pkg-config intltool itstool $(vopt_if gir gobject-introspection)
- $(vopt_if python python)"
-makedepends="libglib-devel $(vopt_if python python-devel)"
+configure_args="--disable-static"
+hostmakedepends="pkg-config intltool itstool
+ $(vopt_if gir gobject-introspection)"
+makedepends="libglib-devel"
 short_desc="MATE menu specifications"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://mate-desktop.org"
 distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=acec93a66154fdbd78404680fca5a99112085cb99d7c43022b010527dc9a6ad2
+checksum=800d26bdba7762660ec8513cf5bcc58ff173fa1ae96621b21d17e6e0ccf1064e
 
-build_options="gir python"
-build_options_default="gir python"
-
-pre_configure() {
-	export PYTHON=/usr/bin/python2
-}
+build_options="gir"
+build_options_default="gir"
 
 mate-menus-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/mate-panel/template b/srcpkgs/mate-panel/template
index a7837eeb673..fd5e59fbdc1 100644
--- a/srcpkgs/mate-panel/template
+++ b/srcpkgs/mate-panel/template
@@ -1,7 +1,7 @@
 # Template file for 'mate-panel'
 pkgname=mate-panel
-version=1.22.1
-revision=2
+version=1.22.2
+revision=1
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-static --disable-schemas-compile
@@ -17,7 +17,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://mate-desktop.org"
 distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aa36130b9ecf4f7527978cfc9a9593bbf521be144d91d7a87ee64aa7df6d695d
+checksum=fe2406c393a6eecef16658798ce5e801f3aad6190cc2a95646af33eea375a0ea
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/mate-screensaver/template b/srcpkgs/mate-screensaver/template
index 86e616a4a01..9d6c29a64c6 100644
--- a/srcpkgs/mate-screensaver/template
+++ b/srcpkgs/mate-screensaver/template
@@ -1,18 +1,20 @@
 # Template file for 'mate-screensaver'
 pkgname=mate-screensaver
-version=1.22.0
-revision=2
+version=1.22.1
+revision=1
 build_style=gnu-configure
+configure_args="--without-console-kit"
 hostmakedepends="pkg-config intltool itstool glib-devel"
 makedepends="dbus-glib-devel libnotify-devel libXScrnSaver-devel
- libmatekbd-devel mate-menus-devel mate-desktop-devel pam-devel"
+ libmatekbd-devel mate-menus-devel mate-desktop-devel pam-devel
+elogind-devel"
 depends="mate-desktop mate-session-manager"
 short_desc="Screensaver for MATE"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://mate-desktop.org"
 distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5e0b043570dfc1904e9892956ec8377261f94ed541b7dafde22010a619f3dd9d
+checksum=6cef439cb9885df08769500b87df441a0777a6f08bd6f920fad92dfd75c19830
 
 post_install() {
 	vinstall ${FILESDIR}/${pkgname}.pam 644 etc/pam.d ${pkgname}
diff --git a/srcpkgs/mate-tweak/template b/srcpkgs/mate-tweak/template
index 3c0f6ccdf73..85b829e85e8 100644
--- a/srcpkgs/mate-tweak/template
+++ b/srcpkgs/mate-tweak/template
@@ -1,14 +1,15 @@
 # Template file for 'mate-tweak'
 pkgname=mate-tweak
-version=18.10.2
+version=19.10.4
 revision=1
 archs=noarch
 build_style=python3-module
 hostmakedepends="intltool python3-distutils-extra python3-pbr python3-setuptools"
-depends="mate-panel python3-gobject python3-psutil python3-setproctitle"
+depends="mate-panel python3-gobject python3-psutil python3-setproctitle
+ python3-distro"
 short_desc="Tweak tool for MATE"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/ubuntu-mate/mate-tweak"
 distfiles="https://github.com/ubuntu-mate/mate-tweak/archive/${version}.tar.gz"
-checksum=1e5eea75339c1e45f3d643f7c0750fac1e1814958b1dd3f846f7a49faf1fabfb
+checksum=e4c3d75ce247ab9724ecbfbb3292dbadd523b01e06d435303f6da3af88b172a5
diff --git a/srcpkgs/mathcomp/template b/srcpkgs/mathcomp/template
index 417e7334191..bc714311a6d 100644
--- a/srcpkgs/mathcomp/template
+++ b/srcpkgs/mathcomp/template
@@ -1,7 +1,7 @@
 # Template file for 'mathcomp'
 pkgname=mathcomp
 version=1.9.0
-revision=2
+revision=4
 wrksrc="math-comp-mathcomp-${version}"
 build_wrksrc="mathcomp"
 build_style=gnu-makefile
diff --git a/srcpkgs/mathjax/template b/srcpkgs/mathjax/template
index ca55b2b551e..c1088202b51 100644
--- a/srcpkgs/mathjax/template
+++ b/srcpkgs/mathjax/template
@@ -1,17 +1,17 @@
 # Template file for 'mathjax'
 pkgname=mathjax
-version=2.7.5
+version=2.7.6
 revision=1
 archs=noarch
 wrksrc="MathJax-${version}"
 depends="font-util"
-font_dirs="/usr/share/fonts/mathjax"
 short_desc="JavaScript display engine for LaTeX, MathML and AsciiMath"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://www.mathjax.org/"
 license="Apache-2.0"
+homepage="https://www.mathjax.org/"
 distfiles="https://github.com/mathjax/MathJax/archive/${version}.tar.gz"
-checksum=a25e5736553eef7b05ba00df133ad36d8f7b3b967f1e32d2f7505ac77427946f
+checksum=51a529d3361aa5cb2e1d56a37b3ed9b08f061ddcc893084b3ecefbfa978895f5
+font_dirs="/usr/share/fonts/mathjax"
 
 do_install() {
 	vmkdir usr/share/mathjax
diff --git a/srcpkgs/maxima/template b/srcpkgs/maxima/template
index 7209c853639..06342f8298c 100644
--- a/srcpkgs/maxima/template
+++ b/srcpkgs/maxima/template
@@ -1,7 +1,7 @@
 # Template file for 'maxima'
 pkgname=maxima
-version=5.42.2
-revision=3
+version=5.43.0
+revision=1
 build_style=gnu-configure
 configure_args="$(vopt_enable clisp) $(vopt_enable sbcl)"
 hostmakedepends="python perl emacs"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="http://maxima.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/maxima/maxima-${version}.tar.gz"
-checksum=167e11d6513a65c829a35f24d4ba539bcd0a82fc3dc7a6721e4f9f118c67b64d
+checksum=dcfda54511035276fd074ac736e97d41905171e43a5802bb820914c3c885ca77
 
 nopie=yes
 build_options="clisp sbcl"
@@ -45,11 +45,8 @@ maxima-emacs_package() {
 	short_desc+=" - Emacs interface"
 	depends="${sourcepkg}-${version}_${revision} virtual?emacs"
 	pkg_install() {
-		vmove usr/share/maxima/${version}/emacs
-		vmkdir usr/share/emacs/site-lisp
-		ln -sf /usr/share/maxima/${version}/emacs \
-			${PKGDESTDIR}/usr/share/emacs/site-lisp/maxima
-	}
+		vmove usr/share/emacs
+		}
 }
 
 xmaxima_package() {
diff --git a/srcpkgs/mc/template b/srcpkgs/mc/template
index 214d66adfd1..7fe95681edf 100644
--- a/srcpkgs/mc/template
+++ b/srcpkgs/mc/template
@@ -7,7 +7,7 @@ configure_args="--with-screen=slang --without-x"
 hostmakedepends="perl pkg-config"
 makedepends="e2fsprogs-devel gpm-devel libglib-devel libssh2-devel slang-devel"
 short_desc="User-friendly file manager and visual shell"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Lugubris <lugubris@disroot.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.ibiblio.org/mc/"
 distfiles="http://www.midnight-commander.org/downloads/mc-${version}.tar.xz"
diff --git a/srcpkgs/mdevd/template b/srcpkgs/mdevd/template
index c2dbbcad1af..86ee1e3058a 100644
--- a/srcpkgs/mdevd/template
+++ b/srcpkgs/mdevd/template
@@ -1,6 +1,6 @@
 # Template file for 'mdevd'
 pkgname=mdevd
-version=0.1.0.3
+version=0.1.1.0
 revision=1
 build_style=configure
 configure_args="--includedir=/usr/include --bindir=/usr/bin --libdir=/usr/lib
@@ -8,12 +8,12 @@ configure_args="--includedir=/usr/include --bindir=/usr/bin --libdir=/usr/lib
  --with-lib=${XBPS_CROSS_BASE}/usr/lib"
 makedepends="skalibs-devel"
 short_desc="Small mdev-compatible kernel hotplug daemon similar to udevd"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="ISC"
 homepage="https://skarnet.org/software/mdevd/"
 changelog="https://skarnet.org/software/mdevd/upgrade.html"
 distfiles="https://skarnet.org/software/mdevd/mdevd-${version}.tar.gz"
-checksum=d5754695dcabaa3e68d1c2bd47390d5659484f8f2e36ca6b28aedd4b83d0c3ac
+checksum=302819dceb2400f299ef8f04828a4fe9156d7334e41ce34d61db37fbc2aa7e8f
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) makedepends+=" nsss-devel" configure_args+=" --enable-nsss" ;;
diff --git a/srcpkgs/mediainfo/template b/srcpkgs/mediainfo/template
index f6311cc2344..614f67aa9dd 100644
--- a/srcpkgs/mediainfo/template
+++ b/srcpkgs/mediainfo/template
@@ -1,6 +1,6 @@
 # Template file for 'mediainfo'
 pkgname=mediainfo
-version=19.07
+version=19.09
 revision=1
 wrksrc=MediaInfo
 configure_args="--with-wx-config=wx-config-gtk3"
@@ -12,7 +12,7 @@ maintainer="John <johnz@posteo.net>"
 license="BSD-2-Clause"
 homepage="https://mediaarea.net/MediaInfo"
 distfiles="https://mediaarea.net/download/source/${pkgname}/${version}/${pkgname}_${version}.tar.xz"
-checksum=84a8991cec4f11e580fb40e922ce3f422d95f1ab489889df2366177969bb5e2c
+checksum=02f5b0ae42825776b51500f023ff883fd632dc4cbe229f00d7528bf0e8d45aa8
 replaces="mediainfo-gui>=0"
 
 build_options="CLI GUI"
diff --git a/srcpkgs/megazeux/template b/srcpkgs/megazeux/template
index f8338a8238a..2702d09bacb 100644
--- a/srcpkgs/megazeux/template
+++ b/srcpkgs/megazeux/template
@@ -1,6 +1,6 @@
 # Template file for 'megazeux'
 pkgname=megazeux
-version=2.91j
+version=2.92b
 revision=1
 wrksrc="mzx${version/.}"
 build_style=configure
@@ -13,4 +13,4 @@ maintainer="Adrian Siekierka <kontakt@asie.pl>"
 license="GPL-2.0-or-later"
 homepage="http://www.digitalmzx.net/"
 distfiles="http://vault.digitalmzx.net/download.php?latest=src&ver=${version}>${pkgname}-${version}.tar.xz"
-checksum=c641a2550178667a559918b9ac686088f0a6c9788af1f573b767711f689f6a68
+checksum=1735c098de62d2b779e3150c94e7520d6e1fc1afb0624a77c5b4490a0935a88f
diff --git a/srcpkgs/menumaker/template b/srcpkgs/menumaker/template
index 368f454cdcb..a3f3b123525 100644
--- a/srcpkgs/menumaker/template
+++ b/srcpkgs/menumaker/template
@@ -1,19 +1,19 @@
 # Template file for 'menumaker'
 pkgname=menumaker
-version=0.99.10
-revision=2
+version=0.99.11
+revision=1
 archs=noarch
 build_style=gnu-configure
+pycompile_dirs="/usr/lib/menumaker"
 hostmakedepends="python"
 makedepends="python"
 depends="python"
-pycompile_dirs="/usr/lib/menumaker"
 short_desc="Menu generation utility"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD"
+license="BSD-2-Clause"
 homepage="http://menumaker.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
-checksum=7e22db0f0d937d33bb338e03f6eac9aa549b9a790c666e519b13de39de66a4d6
+checksum=9d831adbaef2101d8b8d82e48d764c2c1a80a38e97dcf90740eb540e6db3f936
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/menutray/template b/srcpkgs/menutray/template
index 3831e2967f0..6f06e21ff21 100644
--- a/srcpkgs/menutray/template
+++ b/srcpkgs/menutray/template
@@ -1,15 +1,15 @@
 # Template file for 'menutray'
 pkgname=menutray
-version=0.52
+version=0.53
 revision=1
 archs=noarch
 depends="perl-Data-Dump perl-Gtk2 perl-Linux-DesktopFiles"
 short_desc="Application menu through a GTK+ tray status icon"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="https://trizenx.blogspot.fr/2012/02/menutray.html"
 distfiles="https://github.com/trizen/menutray/archive/${version}.tar.gz"
-checksum=6622fff0074096dd332039ca90f083ca9e4e964dfda9f2a633b98198fc1e32d2
+checksum=5d3da38bf626f0969221ef5db1cbd7d49ab1c1506aa423967b6d59780ee3b360
 
 do_install() {
 	vbin menutray
diff --git a/srcpkgs/mercurial/template b/srcpkgs/mercurial/template
index 9ccfbf7a173..325b2c1e6b3 100644
--- a/srcpkgs/mercurial/template
+++ b/srcpkgs/mercurial/template
@@ -1,6 +1,6 @@
 # Template file for 'mercurial'
 pkgname=mercurial
-version=5.0.2
+version=5.1.2
 revision=1
 build_style=python2-module
 pycompile_module="hgdemandimport hgext hgext3rd mercurial"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.mercurial-scm.org/"
 distfiles="https://www.mercurial-scm.org/release/mercurial-${version}.tar.gz"
-checksum=29b850792f1f054cece5b8de8e815dbbe266e1d11814c3755290c0879883c0f8
+checksum=15af0b090b23649e0e53621a88dde97b55a734d7cb08b77d3df284db70d44e2e
 
 post_install() {
 	vmkdir usr/share/man/man1
diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index 81a9ab6b4f1..315a0f27a92 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,7 +1,8 @@
 # Template file for 'meson'
 pkgname=meson
-version=0.51.1
-revision=1
+reverts="0.52.0_1 0.52.0_2"
+version=0.51.2
+revision=2
 archs=noarch
 build_style=python3-module
 pycompile_module="mesonbuild"
@@ -12,10 +13,10 @@ checkdepends="glib-devel gobject-introspection libsanitizer-devel ninja
 short_desc="Super fast build system"
 maintainer="Dylan Katz <muddmaker.97@gmail.com>"
 license="Apache-2.0"
-homepage="http://mesonbuild.com"
+homepage="https://mesonbuild.com"
 changelog="https://raw.githubusercontent.com/mesonbuild/meson/master/docs/markdown/Release-notes-for-${version%.?}.0.md"
 distfiles="https://github.com/mesonbuild/meson/archive/${version}.tar.gz"
-checksum=92cf7f095fe2d1c3f23824805480c29eaa381e71ae0a90ac85949d1e10f9041c
+checksum=96871cf62c9cf2b212e2f38aa3e543323403b1314fd3835e14120ef837c00f01
 
 do_check() {
 	# meson depends on trillion of things to perform actual tests
diff --git a/srcpkgs/messagelib/template b/srcpkgs/messagelib/template
index 3a5f277e4ee..7f1dd0b1bb3 100644
--- a/srcpkgs/messagelib/template
+++ b/srcpkgs/messagelib/template
@@ -1,7 +1,7 @@
 # Template file for 'messagelib'
 pkgname=messagelib
-version=19.08.0
-revision=1
+version=19.08.2
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python
  kcoreaddons kconfig"
@@ -13,7 +13,7 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/applications/${version}/src/messagelib-${version}.tar.xz"
-checksum=0797b11452874a1d8264f92e8cc6d6977f3b0416dc66ff558b124bf2a52b118d
+checksum=d761e94d2fa71c2de6a52e0c1756f52f0006ada35711189b343eccdafe0a0390
 
 if [ "$CROSS_BUILD" ]; then
 	LDFLAGS=" -Wl,-rpath-link,../../bin"
diff --git a/srcpkgs/mftrace/patches/gf2pbm.1.patch b/srcpkgs/mftrace/patches/gf2pbm.1.patch
new file mode 100644
index 00000000000..0619ff9a2fb
--- /dev/null
+++ b/srcpkgs/mftrace/patches/gf2pbm.1.patch
@@ -0,0 +1,11 @@
+--- GNUmakefile.in
++++ GNUmakefile.in
+@@ -14,7 +14,7 @@ CFLAGS += -I.
+ srcdir=@srcdir@
+ VPATH=$(srcdir)
+ NAME=mftrace
+-MANPAGES=mftrace.1 gf2pbm.1
++MANPAGES=mftrace.1
+ VERSION=@VERSION@
+ distdir=$(NAME)-$(VERSION)
+ prefix=@prefix@
diff --git a/srcpkgs/mftrace/template b/srcpkgs/mftrace/template
index 5a87c17e73f..10f2c1ecfdc 100644
--- a/srcpkgs/mftrace/template
+++ b/srcpkgs/mftrace/template
@@ -1,13 +1,13 @@
 # Template file for 'mftrace'
 pkgname=mftrace
-version=1.2.19
+version=1.2.20
 revision=1
 build_style=gnu-configure
-depends="python potrace"
-hostmakedepends="${depends}"
+hostmakedepends="python3 potrace"
+depends="${hostmakedepends}"
 short_desc="Trace a TeX bitmap font into PFA/PFB/TTF"
 maintainer="svenper <svenper@tuta.io>"
 license="GPL-2.0-or-later"
 homepage="http://lilypond.org/mftrace"
 distfiles="http://lilypond.org/downloads/sources/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=778126f4220aa31fc91fa8baafd26aaf8be9c5e8fed5c0e92a61de04d32bbdb5
+checksum=626b7a9945a768c086195ba392632a68d6af5ea24ef525dcd0a4a8b199ea5f6f
diff --git a/srcpkgs/mgba/template b/srcpkgs/mgba/template
index a74d0e97f2f..9da8531da40 100644
--- a/srcpkgs/mgba/template
+++ b/srcpkgs/mgba/template
@@ -1,6 +1,6 @@
 # Template file for 'mgba'
 pkgname=mgba
-version=0.7.2
+version=0.7.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.mgba.io/"
 distfiles="https://github.com/mgba-emu/${pkgname}/archive/${version}.tar.gz"
-checksum=ed635e05798d3fa0d55e5abb439f6d1708d519e4ecd5ed10b9bc6e319ed9dba7
+checksum=6d5e8ab6f87d3d9fa85af2543db838568dbdfcecd6797f8153f1b3a10b4a8bdd
 
 libmgba_package() {
 	short_desc+=" - shared library"
diff --git a/srcpkgs/miller/template b/srcpkgs/miller/template
index 102f1ac490a..230f819180d 100644
--- a/srcpkgs/miller/template
+++ b/srcpkgs/miller/template
@@ -1,16 +1,16 @@
 # Template file for 'miller'
 pkgname=miller
-version=5.4.0
+version=5.6.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool flex asciidoc"
 short_desc="Tool like sed/awk/cut/join/sort for name-indexed data such as CSV"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="2-clause-BSD"
+license="BSD-2-Clause"
 homepage="http://johnkerl.org/miller/"
-distfiles="https://github.com/johnkerl/${pkgname}/archive/${version}.tar.gz"
 changelog="https://github.com/johnkerl/miller/releases"
-checksum=6a7d30884a8f4a97e07895b723be13764ff49251200b832385207c5efb9647d8
+distfiles="https://github.com/johnkerl/${pkgname}/archive/v${version}.tar.gz"
+checksum=4a02dad2ea545a8085aec7fcf79b3987ddd8ce9d111d5cede488692bb0f49731
 
 pre_configure() {
 	# Disable debugging and profiling versions, broken on musl.
diff --git a/srcpkgs/milou/template b/srcpkgs/milou/template
index 027d6566d9e..3993e313560 100644
--- a/srcpkgs/milou/template
+++ b/srcpkgs/milou/template
@@ -1,18 +1,18 @@
 # Template file for 'milou'
 pkgname=milou
-version=5.16.4
+version=5.17.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules kdoctools kpackage qt5-host-tools
  qt5-qmake"
-makedepends="krunner-devel"
+makedepends="krunner-devel kitemmodels-devel"
 short_desc="KDE dedicated search application built on top of Baloo"
 maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later, LPGL-2.1-or-later"
 homepage="https://projects.kde.org/projects/plasma/milou"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=de9addbc504135839b1735742938d340cb191827606aa390f4b6ce1625c1ed89
+checksum=d8e94ecf18f2f41e3bcb66ae324996dc1db6c3addc4a506e060c7874c2764107
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/miniflux/template b/srcpkgs/miniflux/template
index 5b7ab67797d..dac523a25f3 100644
--- a/srcpkgs/miniflux/template
+++ b/srcpkgs/miniflux/template
@@ -1,6 +1,6 @@
 # Template file for 'miniflux'
 pkgname=miniflux
-version=2.0.17
+version=2.0.18
 revision=1
 build_style=go
 go_import_path="github.com/miniflux/miniflux"
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://miniflux.app"
 changelog="https://raw.githubusercontent.com/miniflux/miniflux/2.0.16/ChangeLog"
 distfiles="https://github.com/miniflux/miniflux/archive/${version}.tar.gz"
-checksum=2d0cd7c5ec1b7a083c306902b56f63fd786ece675b2874f22df29d025a5e4cc9
+checksum=5ba9317f90166c39f36e6e1bede727fed2c971f8ba5d36111184694b5f9e4338
 system_accounts="_miniflux"
 
 post_install() {
diff --git a/srcpkgs/minify/template b/srcpkgs/minify/template
index a0a3bb2977b..cd600a94834 100644
--- a/srcpkgs/minify/template
+++ b/srcpkgs/minify/template
@@ -1,6 +1,6 @@
 # Template file for 'minify'
 pkgname=minify
-version=2.5.1
+version=2.5.2
 revision=1
 build_style=go
 go_import_path="github.com/tdewolff/minify"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/tdewolff/minify"
 distfiles="https://github.com/tdewolff/${pkgname}/archive/v${version}.tar.gz"
-checksum=7ddbf32e2d032cfd615d271b088767ca2f27fedcd33c478338dc784f48698aee
+checksum=cf9518548e16bfe546d03fbb004e665006888205ef58367b3240d1fd402b1025
 
 post_install() {
 	vlicense LICENSE.md LICENSE
diff --git a/srcpkgs/minijail/template b/srcpkgs/minijail/template
new file mode 100644
index 00000000000..e27ab8f0f28
--- /dev/null
+++ b/srcpkgs/minijail/template
@@ -0,0 +1,23 @@
+# Template file for 'minijail'
+pkgname=minijail
+version=10
+revision=1
+wrksrc="${pkgname}-linux-v${version}"
+build_style=gnu-makefile
+makedepends="libcap-devel"
+short_desc="Sandboxing and containment tool used in Chrome OS and Android"
+maintainer="Cameron Nemo <cnemo@tutanota.com>"
+license="BSD-3-Clause"
+homepage="https://android.googlesource.com/platform/external/minijail"
+distfiles="https://gitlab.com/chinstrap/minijail/-/archive/linux-v${version}/minijail-linux-v${version}.tar.gz"
+checksum=29334d1bcd16c1ea09e49cef3b47a000e98be7ffe7fa9a28c8cab81643033612
+
+do_install() {
+	vbin minijail0
+	vmkdir usr/lib
+	vcopy libminijail.so usr/lib
+	vcopy libminijailpreload.so usr/lib
+	vman minijail0.1
+	vman minijail0.5
+	vlicense LICENSE
+}
diff --git a/srcpkgs/minikube/template b/srcpkgs/minikube/template
index 9f0e89398f6..427152c0ef4 100644
--- a/srcpkgs/minikube/template
+++ b/srcpkgs/minikube/template
@@ -1,6 +1,6 @@
 # Template file for 'minikube'
 pkgname=minikube
-version=1.3.0
+version=1.4.0
 revision=1
 archs="x86_64* ppc64le*"
 build_wrksrc=src/k8s.io/minikube
diff --git a/srcpkgs/minio/template b/srcpkgs/minio/template
index 22e6a96aacc..53b44b361da 100644
--- a/srcpkgs/minio/template
+++ b/srcpkgs/minio/template
@@ -1,8 +1,8 @@
 # Template file for 'minio'
 pkgname=minio
-version=2019.08.07
+version=2019.10.12
 revision=1
-_version="${version//./-}T01-59-21Z"
+_version="${version//./-}T01-39-57Z"
 wrksrc=${pkgname}-RELEASE.${_version}
 build_style=go
 go_import_path="github.com/minio/minio"
@@ -16,7 +16,7 @@ maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/minio/minio"
 distfiles="${homepage}/archive/RELEASE.${_version}.tar.gz"
-checksum=7b30d246bf138cda06929cd97ea82394d287448ae8fa3f5ac5c6eedaf03fd4eb
+checksum=8cffc57c7e405ed0e312e48c8393b1ad4081de48a1a69caa23323051bfc14d7d
 system_accounts="_minio"
 
 do_check() {
@@ -25,7 +25,6 @@ do_check() {
 
 post_install() {
 	vdoc README.md
-	vlicense LICENSE
 	vinstall ${FILESDIR}/${pkgname}.confd 644 etc/default ${pkgname}
 	vinstall ${FILESDIR}/config.json 644 etc/minio config.json
 	vsv minio
diff --git a/srcpkgs/minitalk/template b/srcpkgs/minitalk/template
index 443606d28b6..0da6bf8e487 100644
--- a/srcpkgs/minitalk/template
+++ b/srcpkgs/minitalk/template
@@ -1,21 +1,15 @@
 # Template file for 'minitalk'
 pkgname=minitalk
-version=0.2.5
-revision=2
+version=0.3.0
+revision=1
 build_style=gnu-makefile
-make_build_args="LDFLAGS+=-lreadline PREFIX=/usr"
 makedepends="readline-devel"
-short_desc="A small chat system for multiple users on a UNIX-like host "
+short_desc="Small chat system for multiple users on a UNIX-like host "
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/abenson/minitalk"
 distfiles="https://github.com/abenson/minitalk/archive/v${version}.tar.gz"
-checksum=0a6541f7b1ad36063dae4e7f09a0c0d7ea1f71e2fe8be9797045d7736cf7fe4f
-
-do_install() {
-	vbin minitalk
-	vman minitalk.1
-}
+checksum=7ed213d8de21010d75c10936f29b2492b6b737a1955d4bf80452b4d8b3bfb800
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/mkchromecast/template b/srcpkgs/mkchromecast/template
index e14b2c5b15d..8617143838c 100644
--- a/srcpkgs/mkchromecast/template
+++ b/srcpkgs/mkchromecast/template
@@ -9,7 +9,7 @@ depends="python3-Flask python3-netifaces python3-setuptools python3-requests
  python3-mutagen python3-psutil python3-PyQt5 python3-SoCo python3-chromecast
  python3-gobject pulseaudio python3-youtube-dl ffmpeg"
 short_desc="Cast Linux Audio/Video to Google cast and Sonos devices"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://mkchromecast.com/"
 distfiles="https://github.com/muammar/mkchromecast/archive/${version}.tar.gz"
diff --git a/srcpkgs/mkfontscale/template b/srcpkgs/mkfontscale/template
index 655243480ac..dafbb915ca8 100644
--- a/srcpkgs/mkfontscale/template
+++ b/srcpkgs/mkfontscale/template
@@ -7,7 +7,7 @@ configure_args="--with-bzip2"
 hostmakedepends="pkg-config"
 makedepends="xorgproto zlib-devel bzip2-devel freetype-devel libfontenc-devel"
 short_desc="X11 Scalable Font Index Generator"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://www.x.org/wiki"
 distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2"
diff --git a/srcpkgs/mkinitcpio/template b/srcpkgs/mkinitcpio/template
index ee0e621baf7..b2b710649b1 100644
--- a/srcpkgs/mkinitcpio/template
+++ b/srcpkgs/mkinitcpio/template
@@ -1,7 +1,7 @@
 # Template file for 'mkinitcpio'
 pkgname=mkinitcpio
-version=25
-revision=2
+version=26
+revision=1
 archs=noarch
 build_style=gnu-makefile
 depends="busybox-static bsdtar bash"
@@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-only"
 homepage="https://wiki.archlinux.org/index.php/Mkinitcpio"
 distfiles="https://sources.archlinux.org/other/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=e14056a9c460d15652e99620bce4308d4dd9309f82c152c4b52287e697fab599
+checksum=d1c3038f538f8e2e57333050463b79884de6f29f4b4ec4f26d1bdeaa620215c1
 
 conf_files="/etc/mkinitcpio.conf"
 
diff --git a/srcpkgs/mkpasswd b/srcpkgs/mkpasswd
new file mode 120000
index 00000000000..2c656a9178a
--- /dev/null
+++ b/srcpkgs/mkpasswd
@@ -0,0 +1 @@
+whois
\ No newline at end of file
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index 285759aedfa..b334fa41482 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,6 +1,6 @@
 # Template file for 'mkvtoolnix'
 pkgname=mkvtoolnix
-version=36.0.0
+version=38.0.0
 revision=1
 build_style=gnu-configure
 configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt"
@@ -14,7 +14,7 @@ license="GPL-2.0-only"
 homepage="https://www.bunkus.org/videotools/mkvtoolnix/"
 changelog="https://mkvtoolnix.download/doc/NEWS.md"
 distfiles="https://www.bunkus.org/videotools/${pkgname}/sources/${pkgname}-${version}.tar.xz"
-checksum=2697321755a277fd499000b7888e6beced1a1d67230110f1d631b4b83922a704
+checksum=0e1db5b5af6147dec245744a0d403120e53a44f6b81aad0d26c0f5c0e5515d00
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-boost=${XBPS_CROSS_BASE}/usr"
diff --git a/srcpkgs/mmark/template b/srcpkgs/mmark/template
index fb0e3dd8851..346802b4ac9 100644
--- a/srcpkgs/mmark/template
+++ b/srcpkgs/mmark/template
@@ -1,6 +1,6 @@
 # Template file for 'mmark'
 pkgname=mmark
-version=2.1.0
+version=2.2.0
 revision=1
 build_style=go
 go_import_path=github.com/mmarkdown/mmark
@@ -10,7 +10,7 @@ maintainer="Robert Lowry <bobertlo@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://github.com/mmarkdown/mmark/"
 distfiles="https://github.com/mmarkdown/mmark/archive/v${version}.tar.gz"
-checksum=094b56539960890319c657a098248adba577c53ec5b703a5b2525b68d15c2048
+checksum=8a7b278b93b737daf46554fa83b86538b1f6eee02f8508eb08581aa578531f02
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/modemmanager-qt5/template b/srcpkgs/modemmanager-qt5/template
index e2a54403b84..e0e33e9c004 100644
--- a/srcpkgs/modemmanager-qt5/template
+++ b/srcpkgs/modemmanager-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'modemmanager-qt5'
 pkgname=modemmanager-qt5
-version=5.61.0
+version=5.63.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/frameworks/modemmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=c9883a3aac7415045a03f0bda435a2a5ff7523538868b72dffa8e4b40e88502a
+checksum=4d0153d89be703662c11839adc5f4883df32ecc9b4781b0a20c07bcfc2c1657b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/modsecurity/template b/srcpkgs/modsecurity/template
index f781732777b..6719ce2952e 100644
--- a/srcpkgs/modsecurity/template
+++ b/srcpkgs/modsecurity/template
@@ -10,7 +10,7 @@ makedepends="apache-devel gdbm-devel libcurl-devel libxml2-devel lua-devel
  pcre-devel yajl-devel lmdb-devel"
 depends="perl-LWP"
 short_desc="Rule based web application firwall (WAF)"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://www.modsecurity.org"
 distfiles="https://github.com/SpiderLabs/ModSecurity/releases/download/v${version}/modsecurity-v${version}.tar.gz"
diff --git a/srcpkgs/mongoose/template b/srcpkgs/mongoose/template
index 30317db3b3c..8603d44fcc5 100644
--- a/srcpkgs/mongoose/template
+++ b/srcpkgs/mongoose/template
@@ -1,7 +1,7 @@
 # Template file for 'mongoose'
 pkgname=mongoose
-version=6.14
-revision=2
+version=6.16
+revision=1
 build_style=gnu-makefile
 make_use_env=compliant
 makedepends="libressl-devel"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://cesanta.com/"
 distfiles="https://github.com/cesanta/mongoose/archive/${version}.tar.gz"
-checksum=f11d2fb23eec08ee5d95da600649177b9bdcf9eaa6be407d997b174e271e4d78
+checksum=1f20f2781862560ddf3203dfb0e6fcf248a68bf92aefbeafb9d2a629c4767c02
 
 mongoose-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/mono/patches/fix-heapviz-import.patch b/srcpkgs/mono/patches/fix-heapviz-import.patch
new file mode 100644
index 00000000000..1ab78851687
--- /dev/null
+++ b/srcpkgs/mono/patches/fix-heapviz-import.patch
@@ -0,0 +1,11 @@
+--- scripts/mono-heapviz.orig
++++ scripts/mono-heapviz
+@@ -7,7 +7,7 @@
+ 
+ from __future__ import print_function
+ import sys, os
+-import Image, ImageDraw
++from PIL import Image, ImageDraw
+ from xml.sax import ContentHandler, make_parser
+ from xml.sax.handler import feature_namespaces
+ from optparse import OptionParser
diff --git a/srcpkgs/mono/patches/musl.patch b/srcpkgs/mono/patches/musl.patch
new file mode 100644
index 00000000000..0c523eb9c25
--- /dev/null
+++ b/srcpkgs/mono/patches/musl.patch
@@ -0,0 +1,11 @@
+--- mono/utils/mono-os-mutex.h	2019-09-25 17:24:27.868901488 +0200
++++ mono/utils/mono-os-mutex.h	2019-09-25 17:24:46.344659000 +0200
+@@ -57,7 +57,7 @@
+ 	if (G_UNLIKELY (res != 0))
+ 		g_error ("%s: pthread_mutexattr_settype failed with \"%s\" (%d)", __func__, g_strerror (res), res);
+ 
+-#if defined (PTHREAD_PRIO_INHERIT) && HAVE_DECL_PTHREAD_MUTEXATTR_SETPROTOCOL
++#if defined (PTHREAD_PRIO_INHERIT) && HAVE_DECL_PTHREAD_MUTEXATTR_SETPROTOCOL && defined(__GLIBC__)
+ 	/* use PTHREAD_PRIO_INHERIT if possible */
+ 	res = pthread_mutexattr_setprotocol (&attr, PTHREAD_PRIO_INHERIT);
+ 	if (G_UNLIKELY (res != 0 && res != ENOTSUP))
diff --git a/srcpkgs/mono/template b/srcpkgs/mono/template
index 3f3808af84a..170438ae0dd 100644
--- a/srcpkgs/mono/template
+++ b/srcpkgs/mono/template
@@ -1,20 +1,21 @@
 # Template file for 'mono'
 pkgname=mono
-version=6.0.0.319
+version=6.4.0.198
 revision=1
 build_style=gnu-configure
 configure_args="--disable-system-aot"
 # XXX: figure out how to split this up into subpkgs.
-hostmakedepends="perl python cmake"
+hostmakedepends="perl python3 cmake"
 makedepends="zlib-devel libX11-devel libgdiplus-devel"
-depends="ca-certificates python"
+depends="ca-certificates python3-Pillow"
 short_desc="Free implementation of the .NET platform including runtime and compiler"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="MIT, BSD-3-Clause, GPL-2.0-or-later, LGPL-2.0-or-later, MPL-1.1"
 homepage="https://www.mono-project.com"
 distfiles="https://download.mono-project.com/sources/mono/${pkgname}-${version}.tar.xz"
-checksum=6b4c80b88bf7688178797bfecc681e3dbc4c6810413c97d6f3c476061a8d261a
+checksum=d00852822525e36f9f8b3e0f537d3a41c7a718cac22d06fc63ea64988877c2ea
 lib32disabled=yes
+python_version="3"
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) configure_args+=" --disable-boehm --without-sigaltstack" ;;
diff --git a/srcpkgs/monolith/template b/srcpkgs/monolith/template
new file mode 100644
index 00000000000..19e324995d2
--- /dev/null
+++ b/srcpkgs/monolith/template
@@ -0,0 +1,22 @@
+# Template file for 'monolith'
+pkgname=monolith
+version=2.0.16
+revision=1
+build_style=cargo
+hostmakedepends="pkg-config"
+makedepends="libressl-devel"
+short_desc="Save HTML pages with ease "
+maintainer="Benjamín Albiñana <benalb@gmail.com>"
+license="Unlicense"
+homepage="https://github.com/Y2Z/monolith"
+distfiles="https://github.com/Y2Z/monolith/archive/v${version}.tar.gz"
+checksum=b2f5cd1d95d4d2ccd06e7f44e88e43ff0f2ec5d73dabe93ca56bf22656b06a0e
+
+pre_build() {
+	cargo update --package openssl-sys --precise 0.9.48
+	cargo update --package openssl --precise 0.10.22
+}
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/moserial/template b/srcpkgs/moserial/template
new file mode 100644
index 00000000000..c82955bcd70
--- /dev/null
+++ b/srcpkgs/moserial/template
@@ -0,0 +1,14 @@
+# Template file for 'moserial'
+pkgname=moserial
+version=3.0.12
+revision=1
+_majver=3.0
+build_style=gnu-configure
+hostmakedepends="intltool itstool pkg-config"
+makedepends="gtk+3-devel"
+short_desc="Clean, friendly gtk-based serial terminal for the gnome desktop"
+maintainer="Robert Lowry <bobertlo@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://wiki.gnome.org/action/show/Apps/Moserial"
+distfiles="${GNOME_SITE}/moserial/${_majver}/moserial-${version}.tar.xz"
+checksum=de2448cd37bb64c43f5533913739cbfc2fe3261f6c6a5ea289f9c200f1e7fcc9
diff --git a/srcpkgs/mozo/template b/srcpkgs/mozo/template
index 3aec7299af5..041f2454c3d 100644
--- a/srcpkgs/mozo/template
+++ b/srcpkgs/mozo/template
@@ -1,17 +1,17 @@
 # Template file for 'mozo'
 pkgname=mozo
-version=1.22.1
+version=1.22.2
 revision=1
 archs=noarch
 build_style=gnu-configure
 pycompile_module="Mozo"
 hostmakedepends="intltool itstool pkg-config"
-makedepends="glib-devel mate-menus-devel python-gobject-devel"
-depends="desktop-file-utils gtk+3 mate-menus python-gobject"
+makedepends="glib-devel mate-menus-devel python3-gobject-devel"
+depends="desktop-file-utils gtk+3 mate-menus python3-gobject"
 short_desc="MATE menu editing tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://mate-desktop.org"
 distfiles="https://pub.mate-desktop.org/releases/${version%.*}/mozo-${version}.tar.xz"
-checksum=105368e49f62afdec2a950795b5519340178aaa73388c98ebbd69b35eeb9ce79
+checksum=3ac309dabeaa5d7a1bca27e3ed1e1b3d59152ef7177e9e1d0a620392bee6ecd3
 nocross=yes
diff --git a/srcpkgs/mpDris2/files/mpDris2/run b/srcpkgs/mpDris2/files/mpDris2/run
new file mode 100644
index 00000000000..a3cbb12868b
--- /dev/null
+++ b/srcpkgs/mpDris2/files/mpDris2/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec mpDris2
\ No newline at end of file
diff --git a/srcpkgs/mpDris2/template b/srcpkgs/mpDris2/template
new file mode 100644
index 00000000000..bd2a266cd51
--- /dev/null
+++ b/srcpkgs/mpDris2/template
@@ -0,0 +1,25 @@
+# Template file for 'mpDris2'
+pkgname=mpDris2
+version=0.8
+revision=1
+build_style=gnu-configure
+hostmakedepends="autoconf automake intltool gettext-devel"
+depends="python3 python3-dbus python3-gobject python3-mpd2 python3-mutagen"
+short_desc="Provides MPRIS 2 support to mpd (Music Player Daemon)"
+maintainer="Illia Shestakov <ishestakov@airmail.cc>"
+license="GPL-3.0-only"
+homepage="https://github.com/eonpatapon/mpDris2"
+distfiles="https://github.com/eonpatapon/mpDris2/archive/${version}.tar.gz"
+checksum=b6b15c1fdddf16a6d74485ad09f56ed353a317e149c37475c00a279186da4391
+
+pre_configure() {
+	NOCONFIGURE=1 ./autogen.sh
+}
+
+post_install() {
+	rm -f ${DESTDIR}/usr/lib/systemd/user/mpDris2.service
+	vsv mpDris2
+	vdoc README.md
+	vlicense COPYING
+	vsconf src/mpDris2.conf
+}
diff --git a/srcpkgs/mpc/template b/srcpkgs/mpc/template
index da58ccfb912..ec335e49ab6 100644
--- a/srcpkgs/mpc/template
+++ b/srcpkgs/mpc/template
@@ -7,7 +7,7 @@ configure_args="-Dtest=true -Ddocumentation=enabled"
 hostmakedepends="pkg-config python3-Sphinx"
 makedepends="libmpdclient-devel check-devel"
 short_desc="Minimalist command line interface to MPD"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.musicpd.org/clients/mpc/"
 #changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/mpc/master/NEWS"
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 3e5220781ea..9488dab5217 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,6 +1,6 @@
 # Template file for 'mpd'
 pkgname=mpd
-version=0.21.13
+version=0.21.16
 revision=1
 build_style=meson
 configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
@@ -9,6 +9,7 @@ configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
  -Dchromaprint=disabled -Dsoxr=enabled -Dshout=disabled -Dadplug=disabled
  -Dfluidsynth=disabled -Dgme=disabled -Dwildmidi=disabled -Dsidplay=disabled
  -Dshine=disabled -Ddocumentation=true -Daudiofile=enabled -Dtremor=disabled
+ -Dsolaris_output=disabled
  -Djack=$(vopt_if jack enabled disabled) -Dlame=$(vopt_if lame enabled disabled)
  -Dao=$(vopt_if libao enabled disabled) -Dmpcdec=$(vopt_if mpcdec enabled disabled)
  -Dsndio=$(vopt_if sndio enabled disabled) -Dpulse=$(vopt_if pulseaudio enabled disabled)
@@ -20,19 +21,19 @@ makedepends="avahi-glib-libs-devel boost-devel faad2-devel ffmpeg-devel
  libcurl-devel libid3tag-devel libmad-devel libmikmod-devel libmms-devel
  libmodplug-devel libmpdclient-devel libnfs-devel libsamplerate-devel
  libsoup-devel libupnp1.8-devel mpg123-devel opus-devel yajl-devel
- zziplib-devel libsoxr-devel audiofile-devel
- twolame-devel $(vopt_if cdio 'libcdio-paranoia-devel')
+ zziplib-devel libsoxr-devel audiofile-devel twolame-devel
+ $(vopt_if cdio 'libcdio-paranoia-devel')
  $(vopt_if jack 'jack-devel') $(vopt_if lame 'lame-devel')
  $(vopt_if libao 'libao-devel') $(vopt_if mpcdec 'libmpcdec-devel')
  $(vopt_if pulseaudio 'pulseaudio-devel') $(vopt_if sndio 'sndio-devel')
  $(vopt_if wavpack 'wavpack-devel') $(vopt_if openal 'libopenal-devel')"
 short_desc="Flexible, powerful, server-side application for playing music"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Daniel Eyßer <daniel.eysser@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://www.musicpd.org/"
 changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v${version}/NEWS"
 distfiles="https://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz"
-checksum=95b70b268406bde15bda4464ef768f7e773417a8c776d42a678c5a5070855eea
+checksum=30cf1bddf7d7388487276745ad3515f134e07f0c57f9f97cb2b5d3befd4a4d92
 LDFLAGS+=" -Wl,-z,stack-size=1048576"
 
 system_accounts="mpd"
diff --git a/srcpkgs/mpdcron/template b/srcpkgs/mpdcron/template
index ad8623f26f2..22e9dc4d7cc 100644
--- a/srcpkgs/mpdcron/template
+++ b/srcpkgs/mpdcron/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="pkg-config automake libtool"
 makedepends="libdaemon-devel libmpdclient-devel libglib-devel"
 short_desc="Program for mpd which can execute scripts based on idle events"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2"
 homepage="https://github.com/alip/mpdcron"
 distfiles="https://github.com/alip/mpdcron/archive/v${version}.tar.gz"
diff --git a/srcpkgs/mpg123/template b/srcpkgs/mpg123/template
index 9453f09afd2..379c8ac191b 100644
--- a/srcpkgs/mpg123/template
+++ b/srcpkgs/mpg123/template
@@ -1,6 +1,6 @@
 # Template file for 'mpg123'
 pkgname=mpg123
-version=1.25.11
+version=1.25.12
 revision=1
 build_style=gnu-configure
 configure_args="--with-optimization=0 --with-default-audio=alsa
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only"
 homepage="https://www.mpg123.org/"
 distfiles="${SOURCEFORGE_SITE}/mpg123/mpg123-${version}.tar.bz2"
-checksum=df063307faa27c7d9efe63d2139b1564cfc7cdbb7c6f449c89ef8faabfa0eab2
+checksum=1ffec7c9683dfb86ea9040d6a53d6ea819ecdda215df347f79def08f1fe731d1
 
 case "$XBPS_TARGET_MACHINE" in
 	# No LFS required with musl
diff --git a/srcpkgs/mplayer/template b/srcpkgs/mplayer/template
index 8b1acdaf6dc..1c603498eae 100644
--- a/srcpkgs/mplayer/template
+++ b/srcpkgs/mplayer/template
@@ -32,8 +32,10 @@ conf_files="
 do_configure() {
 	sed 's|-march=i486||g' -i configure
 
+	# we tried runtime cpudetection for ppc32 but stuff's broken
 	case "$XBPS_TARGET_MACHINE" in
 		i686*|x86_64*|ppc64*) configure_args+=" --enable-vdpau --enable-runtime-cpudetection";;
+		ppc*) configure_args+=" --enable-vdpau --disable-altivec";;
 	esac
 
 	./configure --prefix=/usr \
diff --git a/srcpkgs/mpop/template b/srcpkgs/mpop/template
index 005947be9f3..fb36c02a722 100644
--- a/srcpkgs/mpop/template
+++ b/srcpkgs/mpop/template
@@ -1,6 +1,6 @@
 # Template file for 'mpop'
 pkgname=mpop
-version=1.4.5
+version=1.4.6
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,4 +10,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="https://marlam.de/mpop/"
 distfiles="https://marlam.de/mpop/releases/mpop-${version}.tar.xz"
-checksum=5b69723b216d4330b93af81b487952e5897dcde782e3be65a4e79c87e420c7d4
+checksum=fba142b133662c4e1d5587c96ea7d024a754584df64c8cf16e96bd40f7779160
diff --git a/srcpkgs/msbuild-bin/template b/srcpkgs/msbuild-bin/template
index 877c8e37dbc..7c7bc413595 100644
--- a/srcpkgs/msbuild-bin/template
+++ b/srcpkgs/msbuild-bin/template
@@ -1,7 +1,7 @@
 # Template file for 'msbuild-bin'
-_xamarin_rel="xamarinxplat.2018.09.26.17.53-0xamarin3+ubuntu1804b1"
+_xamarin_rel="xamarinxplat.2019.09.09.15.03-0xamarin5+ubuntu1804b1"
 pkgname=msbuild-bin
-version=16.0
+version=16.4
 revision=1
 archs=noarch
 build_style=fetch
@@ -11,7 +11,7 @@ maintainer="Aloz1 <kno0001@gmail.com>"
 license="MIT"
 homepage="https://github.com/mono/msbuild"
 distfiles="http://download.mono-project.com/repo/ubuntu/pool/main/m/msbuild/msbuild_${version}+${_xamarin_rel}_all.deb"
-checksum=4f6d32a21dc78fd241fd7bfa1ece7a1b2c6e5a33ac3984a5d5fd29563fa01be6
+checksum=47804a0ff3b7531d3c5e1d7b733189354761e08593e6d927b868b3c3f219aef3
 
 do_extract() {
 	ar x ${XBPS_SRCDISTDIR}/msbuild-bin-${version}/msbuild_${version}+${_xamarin_rel}_all.deb
diff --git a/srcpkgs/msgpack/template b/srcpkgs/msgpack/template
index e4c7ce69bf6..a82d67f52b5 100644
--- a/srcpkgs/msgpack/template
+++ b/srcpkgs/msgpack/template
@@ -1,18 +1,18 @@
 # Template file for 'msgpack'
 pkgname=msgpack
-version=3.1.1
+version=3.2.0
 revision=1
 wrksrc="msgpack-c-cpp-${version}"
 build_style=cmake
 makedepends="zlib-devel"
 checkdepends="gtest-devel"
 short_desc="Binary-based efficient object serialization library"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://msgpack.org/"
 changelog="https://raw.githubusercontent.com/msgpack/msgpack-c/master/CHANGELOG.md"
 distfiles="https://github.com/msgpack/msgpack-c/archive/cpp-${version}.tar.gz"
-checksum=bda49f996a73d2c6080ff0523e7b535917cd28c8a79c3a5da54fc29332d61d1e
+checksum=ff865a36bad5c72b8e7ebc4b7cf5f27a820fce4faff9c571c1791e3728355a39
 
 msgpack-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/msmtp/template b/srcpkgs/msmtp/template
index d7e5276c9b5..efec5345a99 100644
--- a/srcpkgs/msmtp/template
+++ b/srcpkgs/msmtp/template
@@ -1,6 +1,6 @@
 # Template file for 'msmtp'
 pkgname=msmtp
-version=1.8.5
+version=1.8.6
 revision=1
 build_style=gnu-configure
 configure_args="$(vopt_with msmtpd)
@@ -13,11 +13,11 @@ makedepends="gnutls-devel
  $(vopt_if sasl gsasl-devel)
  $(vopt_if gnome libsecret-devel)"
 short_desc="Mini SMTP client"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Peter Bui <pbui@github.bx612.space>"
 license="GPL-3.0-or-later"
 homepage="https://marlam.de/msmtp/"
 distfiles="https://marlam.de/msmtp/releases/msmtp-${version}.tar.xz"
-checksum=1613daced9c47b8c028224fc076799c2a4d72923e242be4e9e5c984cbbbb9f39
+checksum=6625f147430c65ba8527f52c4fe5d4d33552d3c0fb6d793ba7df819a3b3042e1
 
 build_options="idn sasl gnome msmtpd"
 desc_option_msmtpd="Build minimal SMTP server"
diff --git a/srcpkgs/mtm/template b/srcpkgs/mtm/template
new file mode 100644
index 00000000000..66dfe25bb22
--- /dev/null
+++ b/srcpkgs/mtm/template
@@ -0,0 +1,23 @@
+# Template file for 'mtm'
+pkgname=mtm
+version=1.1.0
+revision=1
+build_style=gnu-makefile
+hostmakedepends="ncurses"
+makedepends="ncurses-devel ncurses-libs"
+short_desc="Micro Terminal Multiplexer"
+maintainer="travankor <travankor@tuta.io>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/deadpixi/mtm"
+distfiles="https://github.com/deadpixi/mtm/archive/${version}.tar.gz"
+checksum=3f3e723466f3bb88afb7a49b66a790f3aaf6786654e8f1f056edc09fa99abd85
+
+do_build() {
+	make HEADERS='-DNCURSESW_INCLUDE_H="<ncurses.h>"'
+}
+
+do_install() {
+	make install-terminfo
+	vbin mtm
+	vman mtm.1
+}
diff --git a/srcpkgs/muffin/template b/srcpkgs/muffin/template
index a64694bcb74..bbcec2ae72f 100644
--- a/srcpkgs/muffin/template
+++ b/srcpkgs/muffin/template
@@ -1,6 +1,6 @@
 # Template file for 'muffin'
 pkgname=muffin
-version=4.0.7
+version=4.2.2
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-schemas-compile --disable-gtk-doc
@@ -15,7 +15,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
 distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=e515c5d396c258b6b6c43c3b819cb170f057c90874ece943e31cb8c8f4ba3d10
+checksum=08c64a7a951fc526d96b4e3b6b53997328904ae2430aad4c2611a4f130a5bd16
 shlib_provides="libmuffin-clutter-0.so libmuffin-cogl-pango-0.so
  libmuffin-cogl-path-0.so libmuffin-cogl-0.so"
 nocross="gobject-introspection"
diff --git a/srcpkgs/mumble/patches/link-overlay-against-libGL.patch b/srcpkgs/mumble/patches/link-overlay-against-libGL.patch
index 3fb77d7b1c7..1c1f5010c82 100644
--- a/srcpkgs/mumble/patches/link-overlay-against-libGL.patch
+++ b/srcpkgs/mumble/patches/link-overlay-against-libGL.patch
@@ -1,11 +1,11 @@
---- overlay_gl/overlay_gl.pro	2017-01-29 23:44:01.966483578 +0100
-+++ overlay_gl/overlay_gl.pro	2017-01-29 23:44:24.487186063 +0100
-@@ -7,7 +7,7 @@
- TARGET = mumble$(TARGET_ADD)
- VERSION = 1.2.19
- SOURCES = overlay.c
--LIBS *= -lrt -ldl
-+LIBS *= -lGL -lrt -ldl
- QMAKE_CFLAGS *= -fvisibility=hidden $(CFLAGS_ADD)
- QMAKE_LFLAGS -= -Wl,--no-undefined
- QMAKE_LFLAGS *= $(LFLAGS_ADD)
+--- overlay_gl/overlay_gl.pro
++++ overlay_gl/overlay_gl.pro
+@@ -22,7 +22,7 @@ unix:!macx {
+ 
+   DEFINES += TARGET_UNIX
+   linux* {
+-    LIBS *= -lrt -ldl
++    LIBS *= -lGL -lrt -ldl
+   }
+   QMAKE_CFLAGS *= -fvisibility=hidden $(CFLAGS_ADD)
+   QMAKE_LFLAGS -= -Wl,--no-undefined
diff --git a/srcpkgs/mumble/patches/musl-dlsym.patch b/srcpkgs/mumble/patches/musl-dlsym.patch
deleted file mode 100644
index abb01c87d7d..00000000000
--- a/srcpkgs/mumble/patches/musl-dlsym.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- overlay_gl/overlay.c
-+++ overlay_gl/overlay.c
-@@ -690,19 +690,24 @@ static void initializeLibrary() {
-		int nchains = 0;
-		ElfW(Sym) *symtab = NULL;
-		const char *strtab = NULL;
-+#ifdef __GLIBC__
-+		const ElfW(Addr) base = 0;
-+#else
-+		const ElfW(Addr) base = lm->l_addr;
-+#endif
-
-		ElfW(Dyn) *dyn = lm->l_ld;
-
-		while (dyn->d_tag) {
-			switch (dyn->d_tag) {
-				case DT_HASH:
--					nchains = *(int *)(dyn->d_un.d_ptr + 4);
-+					nchains = *(int *)(base + dyn->d_un.d_ptr + 4);
-					break;
-				case DT_STRTAB:
--					strtab = (const char *) dyn->d_un.d_ptr;
-+					strtab = (const char *)(base + dyn->d_un.d_ptr);
-					break;
-				case DT_SYMTAB:
--					symtab = (ElfW(Sym) *) dyn->d_un.d_ptr;
-+					symtab = (ElfW(Sym) *)(base + dyn->d_un.d_ptr);
-					break;
-			}
-			dyn ++;
diff --git a/srcpkgs/mumble/patches/protobuf-370.patch b/srcpkgs/mumble/patches/protobuf-370.patch
deleted file mode 100644
index f3f650f16a4..00000000000
--- a/srcpkgs/mumble/patches/protobuf-370.patch
+++ /dev/null
@@ -1,758 +0,0 @@
-diff --git src/mumble/ACLEditor.cpp src/mumble/ACLEditor.cpp
-index c938ffc..bf321e7 100644
---- src/mumble/ACLEditor.cpp
-+++ src/mumble/ACLEditor.cpp
-@@ -37,11 +37,12 @@
- #include "Channel.h"
- #include "ClientUser.h"
- #include "Database.h"
--#include "Global.h"
- #include "Log.h"
- #include "ServerHandler.h"
- #include "User.h"
- 
-+#include "Global.h"
-+
- ACLGroup::ACLGroup(const QString &name) : Group(NULL, name) {
- 	bInherited = false;
- }
-diff --git src/mumble/About.cpp src/mumble/About.cpp
-index 4d2cf15..96db27a 100644
---- src/mumble/About.cpp
-+++ src/mumble/About.cpp
-@@ -32,10 +32,11 @@
- 
- #include "About.h"
- 
--#include "Global.h"
- #include "MainWindow.h"
- #include "licenses.h"
- 
-+#include "Global.h"
-+
- AboutDialog::AboutDialog(QWidget *p) : QDialog(p) {
- 	setWindowTitle(tr("About Mumble"));
- 
-diff --git src/mumble/AudioOutput.cpp src/mumble/AudioOutput.cpp
-index 0695488..a9a849d 100644
---- src/mumble/AudioOutput.cpp
-+++ src/mumble/AudioOutput.cpp
-@@ -37,13 +37,14 @@
- #include "AudioOutputSample.h"
- #include "AudioOutputSpeech.h"
- #include "User.h"
--#include "Global.h"
- #include "Message.h"
- #include "Plugins.h"
- #include "PacketDataStream.h"
- #include "ServerHandler.h"
- #include "VoiceRecorder.h"
- 
-+#include "Global.h"
-+
- // Remember that we cannot use static member classes that are not pointers, as the constructor
- // for AudioOutputRegistrar() might be called before they are initialized, as the constructor
- // is called from global initialization.
-diff --git src/mumble/AudioWizard.cpp src/mumble/AudioWizard.cpp
-index 511fd9b..25f7a33 100644
---- src/mumble/AudioWizard.cpp
-+++ src/mumble/AudioWizard.cpp
-@@ -34,10 +34,11 @@
- 
- #include "AudioInput.h"
- #include "AudioOutputSample.h"
--#include "Global.h"
- #include "Log.h"
- #include "MainWindow.h"
- 
-+#include "Global.h"
-+
- CompletablePage::CompletablePage(QWizard *p) : QWizardPage(p) {
- 	bComplete = true;
- }
-diff --git src/mumble/BanEditor.cpp src/mumble/BanEditor.cpp
-index 36dad74..2b222ed 100644
---- src/mumble/BanEditor.cpp
-+++ src/mumble/BanEditor.cpp
-@@ -33,10 +33,11 @@
- #include "BanEditor.h"
- 
- #include "Channel.h"
--#include "Global.h"
- #include "Net.h"
- #include "ServerHandler.h"
- 
-+#include "Global.h"
-+
- BanEditor::BanEditor(const MumbleProto::BanList &msg, QWidget *p) : QDialog(p) {
- 	setupUi(this);
- 
-diff --git src/mumble/ConnectDialog.cpp src/mumble/ConnectDialog.cpp
-index 17d57e8..d6d87aa 100644
---- src/mumble/ConnectDialog.cpp
-+++ src/mumble/ConnectDialog.cpp
-@@ -40,10 +40,11 @@
- 
- #include "Channel.h"
- #include "Database.h"
--#include "Global.h"
- #include "ServerHandler.h"
- #include "WebFetch.h"
- 
-+#include "Global.h"
-+
- QMap<QString, QIcon> ServerItem::qmIcons;
- QList<PublicInfo> ConnectDialog::qlPublicServers;
- QString ConnectDialog::qsUserCountry, ConnectDialog::qsUserCountryCode, ConnectDialog::qsUserContinentCode;
-diff --git src/mumble/CustomElements.cpp src/mumble/CustomElements.cpp
-index b43f215..9a11524 100644
---- src/mumble/CustomElements.cpp
-+++ src/mumble/CustomElements.cpp
-@@ -34,10 +34,10 @@
- #include "CustomElements.h"
- 
- #include "ClientUser.h"
--#include "Global.h"
- #include "MainWindow.h"
- #include "Log.h"
- 
-+#include "Global.h"
- 
- LogTextBrowser::LogTextBrowser(QWidget *p)
- 	: m_pos(0)
-diff --git src/mumble/DBus.cpp src/mumble/DBus.cpp
-index 1704395..3342f11 100644
---- src/mumble/DBus.cpp
-+++ src/mumble/DBus.cpp
-@@ -34,10 +34,10 @@
- 
- #include "Channel.h"
- #include "ClientUser.h"
--#include "Global.h"
- #include "MainWindow.h"
- #include "ServerHandler.h"
- 
-+#include "Global.h"
- 
- MumbleDBus::MumbleDBus(QObject *mw) : QDBusAbstractAdaptor(mw) {
- }
-diff --git src/mumble/GlobalShortcut.cpp src/mumble/GlobalShortcut.cpp
-index d35cf91..503a26c 100644
---- src/mumble/GlobalShortcut.cpp
-+++ src/mumble/GlobalShortcut.cpp
-@@ -36,9 +36,10 @@
- #include "ClientUser.h"
- #include "Channel.h"
- #include "Database.h"
--#include "Global.h"
- #include "MainWindow.h"
- 
-+#include "Global.h"
-+
- /*!
-   \class ShortcutKeyWidget
-   Widget used to define and key combination for a shortcut. Once it gains
-diff --git src/mumble/LCD.cpp src/mumble/LCD.cpp
-index e83f692..1435a1a 100644
---- src/mumble/LCD.cpp
-+++ src/mumble/LCD.cpp
-@@ -35,10 +35,11 @@
- 
- #include "ClientUser.h"
- #include "Channel.h"
--#include "Global.h"
- #include "Message.h"
- #include "ServerHandler.h"
- 
-+#include "Global.h"
-+
- QList<LCDEngineNew> *LCDEngineRegistrar::qlInitializers;
- 
- LCDEngineRegistrar::LCDEngineRegistrar(LCDEngineNew cons) {
-diff --git src/mumble/Log.cpp src/mumble/Log.cpp
-index 093f0b3..c6bdbd2 100644
---- src/mumble/Log.cpp
-+++ src/mumble/Log.cpp
-@@ -36,13 +36,14 @@
- #include "AudioOutput.h"
- #include "AudioOutputSample.h"
- #include "Channel.h"
--#include "Global.h"
- #include "MainWindow.h"
- #include "NetworkConfig.h"
- #include "RichTextEditor.h"
- #include "ServerHandler.h"
- #include "TextToSpeech.h"
- 
-+#include "Global.h"
-+
- static ConfigWidget *LogConfigDialogNew(Settings &st) {
- 	return new LogConfig(st);
- }
-diff --git src/mumble/Log_unix.cpp src/mumble/Log_unix.cpp
-index 0a18928..c64f3bf 100644
---- src/mumble/Log_unix.cpp
-+++ src/mumble/Log_unix.cpp
-@@ -32,10 +32,11 @@
- #include "mumble_pch.hpp"
- 
- #include "Log.h"
--#include "Global.h"
- #include "MainWindow.h"
- #include "Settings.h"
- 
-+#include "Global.h"
-+
- void Log::postNotification(MsgType mt, const QString &console, const QString &plain) {
- 	// Message notification with balloon tooltips
- 	QString qsIcon;
-@@ -92,4 +93,4 @@ void Log::postNotification(MsgType mt, const QString &console, const QString &pl
- #endif
- 		postQtNotification(mt, plain);
- 	}
--}
-\ No newline at end of file
-+}
-diff --git src/mumble/LookConfig.cpp src/mumble/LookConfig.cpp
-index 5d30a2d..cddd914 100644
---- src/mumble/LookConfig.cpp
-+++ src/mumble/LookConfig.cpp
-@@ -35,9 +35,10 @@
- 
- #include "AudioInput.h"
- #include "AudioOutput.h"
--#include "Global.h"
- #include "MainWindow.h"
- 
-+#include "Global.h"
-+
- static ConfigWidget *LookConfigNew(Settings &st) {
- 	return new LookConfig(st);
- }
-diff --git src/mumble/MainWindow.cpp src/mumble/MainWindow.cpp
-index eaa4573..65ab1bd 100644
---- src/mumble/MainWindow.cpp
-+++ src/mumble/MainWindow.cpp
-@@ -46,7 +46,6 @@
- #include "Connection.h"
- #include "ConnectDialog.h"
- #include "Database.h"
--#include "Global.h"
- #include "GlobalShortcut.h"
- #include "Log.h"
- #include "Net.h"
-@@ -75,6 +74,8 @@
- #include "ConfigDialog_macx.h"
- #endif
- 
-+#include "Global.h"
-+
- /*!
-   \fn void MainWindow::findDesiredChannel()
-   This function tries to join a desired channel on connect. It gets called
-diff --git src/mumble/Messages.cpp src/mumble/Messages.cpp
-index a9109bd..77d6a58 100644
---- src/mumble/Messages.cpp
-+++ src/mumble/Messages.cpp
-@@ -41,7 +41,6 @@
- #include "Connection.h"
- #include "ConnectDialog.h"
- #include "Database.h"
--#include "Global.h"
- #include "GlobalShortcut.h"
- #include "Log.h"
- #include "MainWindow.h"
-@@ -55,6 +54,8 @@
- #include "VersionCheck.h"
- #include "ViewCert.h"
- 
-+#include "Global.h"
-+
- #define ACTOR_INIT \
- 	ClientUser *pSrc=NULL; \
- 	if (msg.has_actor()) \
-diff --git src/mumble/NetworkConfig.cpp src/mumble/NetworkConfig.cpp
-index 5556e66..0cf14ac 100644
---- src/mumble/NetworkConfig.cpp
-+++ src/mumble/NetworkConfig.cpp
-@@ -34,10 +34,11 @@
- 
- #include "NetworkConfig.h"
- 
--#include "Global.h"
- #include "MainWindow.h"
- #include "OSInfo.h"
- 
-+#include "Global.h"
-+
- static ConfigWidget *NetworkConfigNew(Settings &st) {
- 	return new NetworkConfig(st);
- }
-diff --git src/mumble/OSS.cpp src/mumble/OSS.cpp
-index 4af1326..2611d8c 100644
---- src/mumble/OSS.cpp
-+++ src/mumble/OSS.cpp
-@@ -38,9 +38,10 @@
- #include <sys/ioctl.h>
- 
- #include "User.h"
--#include "Global.h"
- #include "MainWindow.h"
- 
-+#include "Global.h"
-+
- #define NBLOCKS 8
- 
- class OSSEnumerator {
-diff --git src/mumble/Overlay.cpp src/mumble/Overlay.cpp
-index 619dd2f..d6f2b79 100644
---- src/mumble/Overlay.cpp
-+++ src/mumble/Overlay.cpp
-@@ -35,7 +35,6 @@
- #include "Channel.h"
- #include "ClientUser.h"
- #include "Database.h"
--#include "Global.h"
- #include "GlobalShortcut.h"
- #include "MainWindow.h"
- #include "Message.h"
-@@ -45,6 +44,8 @@
- #include "User.h"
- #include "WebFetch.h"
- 
-+#include "Global.h"
-+
- OverlayAppInfo::OverlayAppInfo(QString name, QIcon icon) {
- 	qsDisplayName = name;
- 	qiIcon = icon;
-diff --git src/mumble/OverlayClient.cpp src/mumble/OverlayClient.cpp
-index c3c408d..82412d1 100644
---- src/mumble/OverlayClient.cpp
-+++ src/mumble/OverlayClient.cpp
-@@ -34,7 +34,6 @@
- #include "OverlayText.h"
- #include "User.h"
- #include "Channel.h"
--#include "Global.h"
- #include "Message.h"
- #include "Database.h"
- #include "NetworkConfig.h"
-@@ -42,6 +41,8 @@
- #include "MainWindow.h"
- #include "GlobalShortcut.h"
- 
-+#include "Global.h"
-+
- OverlayClient::OverlayClient(QLocalSocket *socket, QObject *p) :
- 		QObject(p),
- 		ougUsers(&g.s.os) {
-diff --git src/mumble/OverlayConfig.cpp src/mumble/OverlayConfig.cpp
-index 9a45da3..d1f6ea4 100644
---- src/mumble/OverlayConfig.cpp
-+++ src/mumble/OverlayConfig.cpp
-@@ -34,7 +34,6 @@
- #include "OverlayText.h"
- #include "User.h"
- #include "Channel.h"
--#include "Global.h"
- #include "Message.h"
- #include "Database.h"
- #include "NetworkConfig.h"
-@@ -42,6 +41,8 @@
- #include "MainWindow.h"
- #include "GlobalShortcut.h"
- 
-+#include "Global.h"
-+
- static ConfigWidget *OverlayConfigDialogNew(Settings &st) {
- 	return new OverlayConfig(st);
- }
-diff --git src/mumble/OverlayEditor.cpp src/mumble/OverlayEditor.cpp
-index 0263c1f..2d4dc2c 100644
---- src/mumble/OverlayEditor.cpp
-+++ src/mumble/OverlayEditor.cpp
-@@ -34,7 +34,6 @@
- #include "OverlayText.h"
- #include "User.h"
- #include "Channel.h"
--#include "Global.h"
- #include "Message.h"
- #include "Database.h"
- #include "NetworkConfig.h"
-@@ -42,6 +41,8 @@
- #include "MainWindow.h"
- #include "GlobalShortcut.h"
- 
-+#include "Global.h"
-+
- OverlayEditor::OverlayEditor(QWidget *p, QGraphicsItem *qgi, OverlaySettings *osptr) :
- 		QDialog(p),
- 		qgiPromote(qgi),
-diff --git src/mumble/OverlayEditorScene.cpp src/mumble/OverlayEditorScene.cpp
-index 95fe347..a2abb1a 100644
---- src/mumble/OverlayEditorScene.cpp
-+++ src/mumble/OverlayEditorScene.cpp
-@@ -34,7 +34,6 @@
- #include "OverlayText.h"
- #include "User.h"
- #include "Channel.h"
--#include "Global.h"
- #include "Message.h"
- #include "Database.h"
- #include "NetworkConfig.h"
-@@ -42,6 +41,8 @@
- #include "MainWindow.h"
- #include "GlobalShortcut.h"
- 
-+#include "Global.h"
-+
- OverlayEditorScene::OverlayEditorScene(const OverlaySettings &srcos, QObject *p) : QGraphicsScene(p), os(srcos) {
- 	tsColor = Settings::Talking;
- 	uiZoom = 2;
-diff --git src/mumble/OverlayUser.cpp src/mumble/OverlayUser.cpp
-index 979af17..5a4a4b9 100644
---- src/mumble/OverlayUser.cpp
-+++ src/mumble/OverlayUser.cpp
-@@ -35,7 +35,6 @@
- #include "User.h"
- #include "Channel.h"
- #include "ClientUser.h"
--#include "Global.h"
- #include "Message.h"
- #include "Database.h"
- #include "NetworkConfig.h"
-@@ -43,6 +42,8 @@
- #include "MainWindow.h"
- #include "GlobalShortcut.h"
- 
-+#include "Global.h"
-+
- OverlayUser::OverlayUser(ClientUser *cu, unsigned int height, OverlaySettings *osptr) : OverlayGroup(), os(osptr), uiSize(height), cuUser(cu), tsColor(Settings::Passive) {
- 	setup();
- 	updateLayout();
-diff --git src/mumble/OverlayUserGroup.cpp src/mumble/OverlayUserGroup.cpp
-index f8831d5..f12a113 100644
---- src/mumble/OverlayUserGroup.cpp
-+++ src/mumble/OverlayUserGroup.cpp
-@@ -35,7 +35,6 @@
- #include "User.h"
- #include "Channel.h"
- #include "ClientUser.h"
--#include "Global.h"
- #include "Message.h"
- #include "Database.h"
- #include "NetworkConfig.h"
-@@ -43,6 +42,8 @@
- #include "MainWindow.h"
- #include "GlobalShortcut.h"
- 
-+#include "Global.h"
-+
- template <typename T>
- QRectF OverlayGroup::boundingRect() const {
- 	QRectF qr;
-diff --git src/mumble/Overlay_macx.mm src/mumble/Overlay_macx.mm
-index dd2a82f..925a9be 100644
---- src/mumble/Overlay_macx.mm
-+++ src/mumble/Overlay_macx.mm
-@@ -33,9 +33,10 @@
- #import <ScriptingBridge/ScriptingBridge.h>
- #include <Carbon/Carbon.h>
- #include "Overlay.h"
--#include "Global.h"
- #include "MainWindow.h"
- 
-+#include "Global.h"
-+
- extern "C" {
- #include <xar/xar.h>
- }
-diff --git src/mumble/Plugins.cpp src/mumble/Plugins.cpp
-index 82b3ec6..568b9e7 100644
---- src/mumble/Plugins.cpp
-+++ src/mumble/Plugins.cpp
-@@ -32,7 +32,6 @@
- 
- #include "Plugins.h"
- 
--#include "Global.h"
- #include "Log.h"
- #include "MainWindow.h"
- #include "Message.h"
-@@ -40,6 +39,8 @@
- #include "../../plugins/mumble_plugin.h"
- #include "WebFetch.h"
- 
-+#include "Global.h"
-+
- static ConfigWidget *PluginConfigDialogNew(Settings &st) {
- 	return new PluginConfig(st);
- }
-diff --git src/mumble/PulseAudio.cpp src/mumble/PulseAudio.cpp
-index b1ea1c1..9c32207 100644
---- src/mumble/PulseAudio.cpp
-+++ src/mumble/PulseAudio.cpp
-@@ -37,11 +37,11 @@
- #include <errno.h>
- #include <sys/ioctl.h>
- 
--#include "Global.h"
- #include "MainWindow.h"
- #include "Timer.h"
- #include "User.h"
- 
-+#include "Global.h"
- 
- static const char *mumble_sink_input = "Mumble Speakers";
- static const char *mumble_echo = "Mumble Speakers (Echo)";
-diff --git src/mumble/RichTextEditor.cpp src/mumble/RichTextEditor.cpp
-index ca4baa6..4c7f545 100644
---- src/mumble/RichTextEditor.cpp
-+++ src/mumble/RichTextEditor.cpp
-@@ -32,10 +32,11 @@
- 
- #include "RichTextEditor.h"
- 
--#include "Global.h"
- #include "Log.h"
- #include "MainWindow.h"
- 
-+#include "Global.h"
-+
- RichTextHtmlEdit::RichTextHtmlEdit(QWidget *p) : QTextEdit(p) {
- 	m_document = new LogDocument(this);
- 	setDocument(m_document);
-diff --git src/mumble/ServerHandler.cpp src/mumble/ServerHandler.cpp
-index 60125c9..a7dfffc 100644
---- src/mumble/ServerHandler.cpp
-+++ src/mumble/ServerHandler.cpp
-@@ -37,7 +37,6 @@
- #include "Cert.h"
- #include "Connection.h"
- #include "Database.h"
--#include "Global.h"
- #include "MainWindow.h"
- #include "Message.h"
- #include "NetworkConfig.h"
-@@ -47,6 +46,8 @@
- #include "SSL.h"
- #include "User.h"
- 
-+#include "Global.h"
-+
- ServerHandlerMessageEvent::ServerHandlerMessageEvent(const QByteArray &msg, unsigned int mtype, bool flush) : QEvent(static_cast<QEvent::Type>(SERVERSEND_EVENT)) {
- 	qbaMsg = msg;
- 	uiType = mtype;
-diff --git src/mumble/SocketRPC.cpp src/mumble/SocketRPC.cpp
-index 928299a..d087e53 100644
---- src/mumble/SocketRPC.cpp
-+++ src/mumble/SocketRPC.cpp
-@@ -34,10 +34,11 @@
- 
- #include "Channel.h"
- #include "ClientUser.h"
--#include "Global.h"
- #include "MainWindow.h"
- #include "ServerHandler.h"
- 
-+#include "Global.h"
-+
- SocketRPCClient::SocketRPCClient(QLocalSocket *s, QObject *p) : QObject(p), qlsSocket(s), qbBuffer(NULL) {
- 	qlsSocket->setParent(this);
- 
-diff --git src/mumble/Tokens.cpp src/mumble/Tokens.cpp
-index 777ffc3..6446215 100644
---- src/mumble/Tokens.cpp
-+++ src/mumble/Tokens.cpp
-@@ -33,9 +33,10 @@
- #include "Tokens.h"
- 
- #include "Database.h"
--#include "Global.h"
- #include "ServerHandler.h"
- 
-+#include "Global.h"
-+
- Tokens::Tokens(QWidget *p) : QDialog(p) {
- 	setupUi(this);
- 
-diff --git src/mumble/UserEdit.cpp src/mumble/UserEdit.cpp
-index 9d7f456..4490047 100644
---- src/mumble/UserEdit.cpp
-+++ src/mumble/UserEdit.cpp
-@@ -32,10 +32,11 @@
- 
- #include "UserEdit.h"
- 
--#include "Global.h"
- #include "ServerHandler.h"
- #include "User.h"
- 
-+#include "Global.h"
-+
- UserEdit::UserEdit(const MumbleProto::UserList &msg, QWidget *p) : QDialog(p) {
- 	setupUi(this);
- 
-diff --git src/mumble/UserInformation.cpp src/mumble/UserInformation.cpp
-index 6da8b80..41ba46c 100644
---- src/mumble/UserInformation.cpp
-+++ src/mumble/UserInformation.cpp
-@@ -34,11 +34,12 @@
- 
- #include "Audio.h"
- #include "CELTCodec.h"
--#include "Global.h"
- #include "Net.h"
- #include "ServerHandler.h"
- #include "ViewCert.h"
- 
-+#include "Global.h"
-+
- static QString decode_utf8_qssl_string(const QString &input) {
- 	QString i = input;
- 	return QUrl::fromPercentEncoding(i.replace(QLatin1String("\\x"), QLatin1String("%")).toLatin1());
-diff --git src/mumble/UserModel.cpp src/mumble/UserModel.cpp
-index a702e9d..1393317 100644
---- src/mumble/UserModel.cpp
-+++ src/mumble/UserModel.cpp
-@@ -36,7 +36,6 @@
- #include "ClientUser.h"
- #include "Channel.h"
- #include "Database.h"
--#include "Global.h"
- #include "LCD.h"
- #include "Log.h"
- #include "MainWindow.h"
-@@ -46,6 +45,8 @@
- #include "Usage.h"
- #include "User.h"
- 
-+#include "Global.h"
-+
- QHash <Channel *, ModelItem *> ModelItem::c_qhChannels;
- QHash <ClientUser *, ModelItem *> ModelItem::c_qhUsers;
- bool ModelItem::bUsersTop = false;
-diff --git src/mumble/UserView.cpp src/mumble/UserView.cpp
-index c462bf6..738a7a9 100644
---- src/mumble/UserView.cpp
-+++ src/mumble/UserView.cpp
-@@ -35,11 +35,12 @@
- #include "Channel.h"
- #include "ClientUser.h"
- #include "Log.h"
--#include "Global.h"
- #include "MainWindow.h"
- #include "ServerHandler.h"
- #include "UserModel.h"
- 
-+#include "Global.h"
-+
- /*!
-   \fn bool UserView::event(QEvent *evt)
-   This implementation contains a special handler to display
-diff --git src/mumble/VersionCheck.cpp src/mumble/VersionCheck.cpp
-index e60a17a..58b3418 100644
---- src/mumble/VersionCheck.cpp
-+++ src/mumble/VersionCheck.cpp
-@@ -32,10 +32,11 @@
- 
- #include "VersionCheck.h"
- 
--#include "Global.h"
- #include "MainWindow.h"
- #include "WebFetch.h"
- 
-+#include "Global.h"
-+
- VersionCheck::VersionCheck(bool autocheck, QObject *p, bool focus) : QObject(p) {
- 	bSilent = autocheck;
- 
-diff --git src/mumble/VoiceRecorder.cpp src/mumble/VoiceRecorder.cpp
-index 996b32c..0a9003b 100644
---- src/mumble/VoiceRecorder.cpp
-+++ src/mumble/VoiceRecorder.cpp
-@@ -36,11 +36,12 @@
- 
- #include "AudioOutput.h"
- #include "ClientUser.h"
--#include "Global.h"
- #include "ServerHandler.h"
- 
- #include "../Timer.h"
- 
-+#include "Global.h"
-+
- VoiceRecorder::RecordBuffer::RecordBuffer(const ClientUser *cu,
-         boost::shared_array<float> buffer, int samples, quint64 timestamp) :
- 		cuUser(cu), fBuffer(buffer), iSamples(samples), uiTimestamp(timestamp) {
-diff --git src/mumble/VoiceRecorderDialog.cpp src/mumble/VoiceRecorderDialog.cpp
-index ecede42..045bd25 100644
---- src/mumble/VoiceRecorderDialog.cpp
-+++ src/mumble/VoiceRecorderDialog.cpp
-@@ -34,10 +34,11 @@
- #include "VoiceRecorderDialog.h"
- 
- #include "AudioOutput.h"
--#include "Global.h"
- #include "ServerHandler.h"
- #include "VoiceRecorder.h"
- 
-+#include "Global.h"
-+
- VoiceRecorderDialog::VoiceRecorderDialog(QWidget *p) : QDialog(p), qtTimer(new QTimer(this)) {
- 	qtTimer->setObjectName(QLatin1String("qtTimer"));
- 	qtTimer->setInterval(200);
-diff --git src/mumble/WASAPI.cpp src/mumble/WASAPI.cpp
-index 0e46871..abd59e7 100644
---- src/mumble/WASAPI.cpp
-+++ src/mumble/WASAPI.cpp
-@@ -32,10 +32,10 @@
- 
- #include "WASAPI.h"
- #include "WASAPINotificationClient.h"
--#include "Global.h"
- #include "Timer.h"
- #include "User.h"
- 
-+#include "Global.h"
- 
- // Now that Win7 is published, which includes public versions of these
- // interfaces, we simply inherit from those but use the "old" IIDs.
-diff --git src/mumble/WASAPINotificationClient.cpp src/mumble/WASAPINotificationClient.cpp
-index 4588778..a64ee71 100644
---- src/mumble/WASAPINotificationClient.cpp
-+++ src/mumble/WASAPINotificationClient.cpp
-@@ -29,13 +29,14 @@
- */
- 
- #include <initguid.h>
--#include <Global.h>
- #include <QMutexLocker>
- #include "MainWindow.h"
- #include <boost/thread/once.hpp>
- 
- #include "WASAPINotificationClient.h"
- 
-+#include <Global.h>
-+
- HRESULT STDMETHODCALLTYPE WASAPINotificationClient::OnDefaultDeviceChanged(EDataFlow flow, ERole role, LPCWSTR pwstrDefaultDevice) {
- 	const QString device = QString::fromWCharArray(pwstrDefaultDevice);
- 
-diff --git src/mumble/os_macx.mm src/mumble/os_macx.mm
-index aa3c2f4..428fa45 100644
---- src/mumble/os_macx.mm
-+++ src/mumble/os_macx.mm
-@@ -30,10 +30,11 @@
- */
- 
- #include "mumble_pch.hpp"
--#include "Global.h"
- #include "Overlay.h"
- #include "MainWindow.h"
- 
-+#include "Global.h"
-+
- char *os_lang = NULL;
- static FILE *fConsole = NULL;
- 
-
diff --git a/srcpkgs/mumble/patches/speech-dispatcher.patch b/srcpkgs/mumble/patches/speech-dispatcher.patch
deleted file mode 100644
index 7632c4d5416..00000000000
--- a/srcpkgs/mumble/patches/speech-dispatcher.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/mumble/TextToSpeech_unix.cpp.orig       2017-02-14 16:33:58.775742063 +0100
-+++ src/mumble/TextToSpeech_unix.cpp    2017-02-14 16:34:22.172484062 +0100
-@@ -33,7 +33,7 @@
- #include "TextToSpeech.h"
- 
- #ifdef USE_SPEECHD
--#include <libspeechd.h>
-+#include <speech-dispatcher/libspeechd.h>
- #endif
- 
- #include "Global.h"
diff --git a/srcpkgs/mumble/patches/std-float.patch b/srcpkgs/mumble/patches/std-float.patch
deleted file mode 100644
index 50199c9847d..00000000000
--- a/srcpkgs/mumble/patches/std-float.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/mumble/AudioOutput.cpp.orig    2018-10-29 00:43:02.953895662 +0100
-+++ src/mumble/AudioOutput.cpp 2018-10-29 00:43:49.407481605 +0100
-@@ -431,7 +431,7 @@
-                                        top[2] = 0.0f;
-                                }
-
--                               if (std::abs<float>(front[0] * top[0] + front[1] * top[1] + front[2] * top[2]) > 0.01f) {
-+                               if (std::abs(front[0] * top[0] + front[1] * top[1] + front[2] * top[2]) > 0.01f) {
-                                        // Not perpendicular. Assume Y up and rotate 90 degrees.
-
-                                        float azimuth = 0.0f;
diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index 14cda6dc360..31305a5601e 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -1,48 +1,26 @@
 # Template file for 'mumble'
 pkgname=mumble
-version=1.2.19
-revision=16
-hostmakedepends="Ice pkg-config protobuf qt-host-tools qt-qmake"
+version=1.3.0
+revision=1
+build_style=qmake
+configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update
+ CONFIG+=no-bundled-speex CONFIG+=no-g15 CONFIG+=no-xevie CONFIG+=pulseaudio
+ CONFIG+=no-embed-qt-translations CONFIG+=no-oss"
+hostmakedepends="Ice pkg-config protobuf qt5-host-tools qt5-qmake python3"
 makedepends="Ice-devel MesaLib-devel avahi-compat-libs-devel boost-devel
  libcap-devel libressl-devel libsndfile-devel opus-devel protobuf-devel
- pulseaudio-devel qt-devel speech-dispatcher-devel speex-devel"
-depends="desktop-file-utils qt-plugin-sqlite"
+ pulseaudio-devel qt5-devel qt5-svg-devel speech-dispatcher-devel speex-devel"
+depends="desktop-file-utils qt5-plugin-sqlite"
 short_desc="Open source, low-latency, high quality voice chat for gaming"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="BSD-3-Clause"
 homepage="http://mumble.sourceforge.net/"
 distfiles="https://github.com/mumble-voip/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.gz"
-checksum=f047fb707ad93948b0bc913ec0a89cd5480d87e840c4ff2519608fc8a2dac0e8
+checksum=9a8de2547344962a81c00c37b5d8bd5a371bb685fa36cf03a3f134e37c79b80d
 
-CXXFLAGS="-std=c++11"
-
-do_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		for i in ${XBPS_CROSS_BASE}/usr/include/Qt*; do
-			CXXFLAGS+=" -I$i"
-		done
-	fi
-	# Needs bundled celt for some reason
-	qmake-qt4 -recursive main.pro \
-		CONFIG+="bundled-celt no-bundled-opus no-update no-bundled-speex no-g15 \
-			no-xevie pulseaudio no-embed-qt-translations" \
-		DEFINES+="PLUGIN_PATH=/usr/lib/mumble" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" \
-		PREFIX=/usr \
-		LIB=/usr/lib \
-		QMAKE_CC=$CC QMAKE_CXX=$CXX QMAKE_LINK=$CXX \
-		QMAKE_CFLAGS="${CFLAGS}" \
-		QMAKE_CXXFLAGS="${CXXFLAGS}" \
-		QMAKE_LFLAGS="${LDFLAGS}"
-	# qmake-qt4 ignores CXXFLAGS and LDFLAGS thus patch the Makefiles
-	sed -i */Makefile* */*/Makefile* \
-		-e "s;^\(LFLAGS.*=.*\);& $LDFLAGS;" \
-		-e "s;^\(CXXFLAGS.*=.*\);& $CXXFLAGS;"
-}
-
-do_build() {
-	make ${makejobs} release \
-		CC="$CC" CXX="$CXX" LINK="$CXX"
-}
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt5-svg-devel"
+fi
 
 do_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index acfbe2bbf89..15831775950 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,6 +1,6 @@
 # Template file for 'musikcube'
 pkgname=musikcube
-version=0.65.0
+version=0.65.1
 revision=1
 build_style=cmake
 configure_args="-DNO_NCURSESW=1 -DENABLE_SNDIO=true"
@@ -13,7 +13,7 @@ maintainer="eater <=@eater.me>"
 license="BSD-3-Clause"
 homepage="https://musikcube.com/"
 distfiles="https://github.com/clangen/musikcube/archive/${version}.tar.gz"
-checksum=2c86400eeee38ecb9642e93cf043408c651466bf5859d70d831d27a962ac7006
+checksum=e847bd71d3852e83a50b6b0a796e88386f61f09f3fb6379c866616edba4c8b72
 
 case "${XBPS_TARGET_MACHINE}" in
 	armv[56]*|ppc|ppc-musl)
diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template
index 370aebd1d47..320e7be9d6a 100644
--- a/srcpkgs/mutt/template
+++ b/srcpkgs/mutt/template
@@ -1,7 +1,7 @@
 # Template file for 'mutt'
 pkgname=mutt
-version=1.12.1
-revision=2
+version=1.12.2
+revision=1
 build_style=gnu-configure
 configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
  --enable-gpgme --with-regex --with-idn2 --with-ssl --with-sasl --enable-sidebar
@@ -11,14 +11,14 @@ conf_files="/etc/${pkgname}/Muttrc"
 hostmakedepends="libidn2-devel perl pkg-config"
 makedepends="gdbm-devel gpgme-devel libidn2-devel libressl-devel libsasl-devel
  ncurses-devel"
-depends="mime-types"
+depends="cyrus-sasl-modules mime-types"
 short_desc="Mutt Mail Client"
 maintainer="Jan S. <jan.schreib@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://www.mutt.org"
 changelog="http://mutt.org/relnotes/1.12"
 distfiles="http://ftp.mutt.org/pub/mutt/${pkgname}-${version}.tar.gz"
-checksum=01c565406ec4ffa85db90b45ece2260b25fac3646cc063bbc20a242c6ed4210c
+checksum=bc42750ce8237742b9382f2148fc547a8d8601aa4a7cd28c55fe7ca045196882
 
 pre_build() {
 	make CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS -fPIC" CPPFLAGS= mutt_md5
diff --git a/srcpkgs/mutter/patches/meta-renderer-x11.patch b/srcpkgs/mutter/patches/meta-renderer-x11.patch
deleted file mode 100644
index 55df265e33d..00000000000
--- a/srcpkgs/mutter/patches/meta-renderer-x11.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/backends/x11/meta-renderer-x11.c	2019-03-11 16:01:02.000000000 -0700
-+++ src/backends/x11/meta-renderer-x11.c	2019-03-11 23:44:53.274968331 -0700
-@@ -85,14 +85,6 @@
-   cogl_xlib_renderer_set_foreign_display (cogl_renderer, xdisplay);
-   cogl_xlib_renderer_request_reset_on_video_memory_purge (cogl_renderer, TRUE);
- 
--  /* Set up things so that if the INTEL_swap_event extension is not present,
--   * but the driver is known to have good thread support, we use an extra
--   * thread and call glXWaitVideoSync() in the thread. This allows idles
--   * to work properly, even when Mutter is constantly redrawing new frames;
--   * otherwise, without INTEL_swap_event, we'll just block in glXSwapBuffers().
--   */
--  cogl_xlib_renderer_set_threaded_swap_wait_enabled (cogl_renderer, TRUE);
--
-   return cogl_renderer;
- }
- 
diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index d33535d2bcb..5c792515f2b 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,11 +1,11 @@
 # Template file for 'mutter'
 pkgname=mutter
-version=3.32.2
-revision=1
+version=3.34.1
+revision=2
 build_helper="gir"
 build_style=meson
 configure_args="-Degl_device=true -Dudev=true -Dnative_backend=true
- -Dintrospection=true -Dxwayland_path=/usr/bin/Xwayland"
+ -Dprofiler=false -Dintrospection=true -Dxwayland_path=/usr/bin/Xwayland"
 hostmakedepends="glib-devel pkg-config zenity wayland-devel xorg-server"
 makedepends="elogind-devel glib-devel gnome-desktop-devel json-glib-devel
  libglib-devel libSM-devel libXtst-devel libcanberra-devel libinput-devel
@@ -17,9 +17,9 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/Mutter/"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6ab3ec487228d3e6a12aa5eda719608c7d6bd8960184278377b79dab443ca7c0
-shlib_provides="libmutter-clutter-4.so libmutter-cogl-4.so
- libmutter-cogl-gles2-4.so libmutter-cogl-pango-4.so libmutter-cogl-path-4.so"
+checksum=ba1826cf88bdb81e63943cac014a8e8bcf35ec178c53264401f9c72fdeab758e
+shlib_provides="libmutter-clutter-5.so libmutter-cogl-5.so
+ libmutter-cogl-pango-5.so libmutter-cogl-path-5.so"
 
 mutter-devel_package() {
 	depends="gsettings-desktop-schemas gtk+3-devel clutter-devel libX11-devel
@@ -28,7 +28,7 @@ mutter-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		vmove "usr/lib/mutter-4/*.gir"
+		vmove "usr/lib/mutter-5/*.gir"
 		vmove "usr/lib/*.so"
 	}
 }
diff --git a/srcpkgs/mymcplus/template b/srcpkgs/mymcplus/template
new file mode 100644
index 00000000000..369ac8048ed
--- /dev/null
+++ b/srcpkgs/mymcplus/template
@@ -0,0 +1,15 @@
+# Template file for 'mymcplus'
+pkgname=mymcplus
+version=3.0.2
+revision=1
+archs=noarch
+build_style=python3-module
+pycompile_module="mymcplus"
+hostmakedepends="python3-setuptools"
+depends="wxPython4 python3-PyOpenGL"
+short_desc="PlayStation 2 memory card manager"
+maintainer="Andrew Benson <abenson+void@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/thestr4ng3r/mymcplus"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=a08fbfeb46c17affb1ea48e6234bfdac2b4de0f892a89e0ee73e6edc1a3b9275
diff --git a/srcpkgs/mysql++/template b/srcpkgs/mysql++/template
index 8904aa9924f..ddd35bf816d 100644
--- a/srcpkgs/mysql++/template
+++ b/srcpkgs/mysql++/template
@@ -1,25 +1,21 @@
 # Template file for 'mysql++'
 pkgname=mysql++
-version=3.2.4
+version=3.2.5
 revision=1
 build_style=gnu-configure
 make_install_target="install_mysqlpp"
 makedepends="libmariadbclient-devel"
 short_desc="C++ wrapper for MySQLs C API"
 maintainer="DirectorX <void.directorx@protonmail.com>"
-license="LGPL-2.1-or-later, Custom"
+license="LGPL-2.1-or-later"
 homepage="https://tangentsoft.net/mysqlpp"
 distfiles="${homepage}/releases/${pkgname}-${version}.tar.gz"
-checksum=6b60727b36b1fed78e0c935d6510b31821c71ec0076967cd9fa5ecf4320d7d63
+checksum=b780beeb3a9cd9ce6a9043028527484df8e822c58c5274d4d67ec5ba2fc0a778
 
 if [ -n "$CROSS_BUILD" ]; then
 	configure_args="--exec_prefix=${XBPS_CROSS_BASE} --with-mysql-include=${XBPS_CROSS_BASE}/usr/include/mysql"
 fi
 
-post_install() {
-	vlicense COPYING.txt
-}
-
 mysql++-devel_package() {
 	depends="mysql++>=${version}_${revision} libmysqlclient-devel"
 	short_desc+=" - development files"
diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template
index 9f3d8d6d8be..4436180804f 100644
--- a/srcpkgs/namecoin/template
+++ b/srcpkgs/namecoin/template
@@ -1,7 +1,7 @@
 # Template file for 'namecoin'
 pkgname=namecoin
-version=0.17.0
-revision=2
+version=0.18.1
+revision=1
 wrksrc="${pkgname}-core-nc${version}"
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --disable-static
@@ -14,7 +14,7 @@ maintainer="ananteris <ananteris@protonmail.ch>"
 license="MIT"
 homepage="https://namecoin.org"
 distfiles="https://github.com/namecoin/namecoin-core/archive/nc${version}.tar.gz"
-checksum=b9e56cebd6756ad8ff7c8f6c9e633cb56cb139c7c4437189945b3f25acbe0082
+checksum=7117a0a0b8f48d49e4abf3577660f8a4eb9a4dea753281d19d9470725fc75d8e
 
 case "${XBPS_TARGET_MACHINE}" in
 	armv[56]*|ppc|ppc-musl)
diff --git a/srcpkgs/nano/template b/srcpkgs/nano/template
index 74a43e7cc69..dbb86bafe65 100644
--- a/srcpkgs/nano/template
+++ b/srcpkgs/nano/template
@@ -1,19 +1,18 @@
 # Template file for 'nano'
 pkgname=nano
-version=4.3
+version=4.5
 revision=1
 build_style=gnu-configure
 configure_args="--enable-utf8"
 makedepends="file-devel ncurses-devel"
 short_desc="GNU nano text editor"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Lugubris <lugubris@disroot.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.nano-editor.org/"
 changelog="http://git.savannah.gnu.org/cgit/nano.git/plain/NEWS"
 distfiles="https://www.nano-editor.org/dist/v${version%.*}/nano-${version}.tar.xz"
-checksum=00d3ad1a287a85b4bf83e5f06cedd0a9f880413682bebd52b4b1e2af8cfc0d81
+checksum=ded5c38f5ecd9de2b624e0db8013a375c169d3fbbd49575967b868847df8f533
 
 post_install() {
 	vsconf syntax/nanorc.nanorc
 }
-
diff --git a/srcpkgs/nasa-wallpaper/template b/srcpkgs/nasa-wallpaper/template
index 8bad43b2fec..c03df8ffc4a 100644
--- a/srcpkgs/nasa-wallpaper/template
+++ b/srcpkgs/nasa-wallpaper/template
@@ -6,8 +6,8 @@ build_style="cargo"
 hostmakedepends="pkg-config"
 makedepends="libressl-devel"
 short_desc="Change your desktop background with a NASA image"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Lugubris <lugubris@disroot.org>"
 license="Apache-2.0"
-homepage="https://davidpob99.github.io/nasa-wallpaper/"
+homepage="https://github.com/davidpob99/nasa-wallpaper/"
 distfiles="https://github.com/davidpob99/nasa-wallpaper/archive/v${version}.tar.gz"
 checksum=5bdf85cabc954069f7188f32c5579a6d47aae1781bc438bead7d7a0af335f5f8
diff --git a/srcpkgs/nautilus/template b/srcpkgs/nautilus/template
index 2adf829749a..ac92882eddb 100644
--- a/srcpkgs/nautilus/template
+++ b/srcpkgs/nautilus/template
@@ -1,6 +1,6 @@
 # Template file for 'nautilus'
 pkgname=nautilus
-version=3.32.3
+version=3.34.1
 revision=1
 build_style=meson
 build_helper="gir"
@@ -17,7 +17,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Nautilus"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=01e4e0dbde6e65d64ae3f35f1949f60b104902039dcd563872396723d7cf2cf5
+checksum=37ce2c16a610c589dcc7660f9092446465568e38e29bce6ed8c24f2e8e0077f3
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/nbd/template b/srcpkgs/nbd/template
index 2777c280271..d06b95b4149 100644
--- a/srcpkgs/nbd/template
+++ b/srcpkgs/nbd/template
@@ -1,6 +1,6 @@
 # Template file for 'nbd'
 pkgname=nbd
-version=3.19
+version=3.20
 revision=1
 build_style=gnu-configure
 configure_args="--enable-syslog"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://nbd.sourceforge.io/"
 distfiles="${SOURCEFORGE_SITE}/nbd/nbd-${version}.tar.gz"
-checksum=f0b52d03f35fee3a00d2f7c27974dce8fc797f35c708786e36fd2cd2fe48879d
+checksum=b6a82acbc9b1085534820dbc0d23ddbc39b7970e587e6930aec97e262feb222b
 
 system_accounts="nbd"
 nbd_homedir="/var/chroot"
diff --git a/srcpkgs/ncdc/template b/srcpkgs/ncdc/template
index cc3f162080b..fb7139175a4 100644
--- a/srcpkgs/ncdc/template
+++ b/srcpkgs/ncdc/template
@@ -1,7 +1,7 @@
 # Template file for 'ncdc'
 pkgname=ncdc
-version=1.21
-revision=2
+version=1.22.1
+revision=1
 build_style=gnu-configure
 configure_args="--with-geoip"
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ maintainer="whoami <whoami@systemli.org>"
 license="MIT"
 homepage="https://dev.yorhel.nl/ncdc"
 distfiles="https://dev.yorhel.nl/download/$pkgname-$version.tar.gz"
-checksum=22904f93a553e45b84a3e72dc6209e11194087c3244fd08c6489bacdee991982
+checksum=d15fd378aa345f423e59a38691c668f69b516cd4b8afbbcdc446007740c3afad
 
 pre_build() {
 	make CC=$CC_FOR_BUILD CFLAGS=$BUILD_CFLAGS makeheaders
diff --git a/srcpkgs/ncmpc/template b/srcpkgs/ncmpc/template
index 7e8fa648502..a28dafdd6f1 100644
--- a/srcpkgs/ncmpc/template
+++ b/srcpkgs/ncmpc/template
@@ -1,6 +1,6 @@
 # Template file for 'ncmpc'
 pkgname=ncmpc
-version=0.34
+version=0.35
 revision=1
 build_style=meson
 configure_args="-Dlirc=disabled"
@@ -11,7 +11,7 @@ maintainer="Getty Ritter <gettyritter@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://www.musicpd.org/clients/ncmpc/"
 distfiles="https://www.musicpd.org/download/ncmpc/0/ncmpc-${version}.tar.xz"
-checksum=14c5b1dc78e83fa838fb049db76c00706686c98991600a87d2c57ec2b6c9e857
+checksum=bd4f1e638290915e08be045087c1df2d562d012b14f662dd33fd7c7043ddd241
 
 post_install() {
 	vmkdir usr/share/examples/ncmpc
diff --git a/srcpkgs/ndctl/template b/srcpkgs/ndctl/template
index dd4f0a165c9..be7895d78e3 100644
--- a/srcpkgs/ndctl/template
+++ b/srcpkgs/ndctl/template
@@ -1,6 +1,6 @@
 # Template file for 'ndctl'
 pkgname=ndctl
-version=65
+version=66
 revision=1
 build_style=gnu-configure
 configure_args="--disable-docs --without-systemd"
@@ -8,11 +8,11 @@ hostmakedepends="automake libtool pkg-config xmlto"
 makedepends="eudev-libudev-devel json-c-devel libkmod-devel libuuid-devel
  bash-completion keyutils-devel"
 short_desc="Utility library for managing libnvdimm"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="LGPL-2.1-only, GPL-2.0-only"
 homepage="https://github.com/pmem/ndctl"
 distfiles="https://github.com/pmem/ndctl/archive/v${version}.tar.gz"
-checksum=01870de8ed902b14314485f71e0d36e72694c7046e0603b41df107b2827d3781
+checksum=b2b0cd5468de235d3ae8bb3de737ab2e18e854eee57c3618c648c6d7abd02e63
 conf_files="/etc/ndctl/monitor.conf"
 
 case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/neatvi/template b/srcpkgs/neatvi/template
index 632b8282c0c..ef992320ed0 100644
--- a/srcpkgs/neatvi/template
+++ b/srcpkgs/neatvi/template
@@ -1,14 +1,14 @@
 # Template file for 'neatvi'
 pkgname=neatvi
-version=06
-revision=2
+version=07
+revision=1
 build_style=gnu-makefile
 short_desc="Small ex/vi editor"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="ISC"
 homepage="http://litcave.rudi.ir/"
 distfiles="https://github.com/litcave/${pkgname}/archive/${version}.tar.gz"
-checksum=7010b7d5992743f8e854ba012d66c6965f1da5bd2cc4251edd6e153bda0cd2f1
+checksum=f35939b5095152af9e8e76dd03ef4f52d14453a70a92430dd3e92964dcca53a1
 
 alternatives="
  vi:ex:/usr/bin/neatex
diff --git a/srcpkgs/nemo-fileroller/template b/srcpkgs/nemo-fileroller/template
index 12f3e7b3021..430b2ce3241 100644
--- a/srcpkgs/nemo-fileroller/template
+++ b/srcpkgs/nemo-fileroller/template
@@ -1,6 +1,6 @@
 # Template file for 'nemo-fileroller'
 pkgname=nemo-fileroller
-version=4.0.0
+version=4.2.0
 revision=1
 wrksrc="nemo-extensions-${version}"
 build_wrksrc=nemo-fileroller
@@ -8,11 +8,11 @@ build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="nemo-devel libglib-devel"
 short_desc="Extensions for the Nemo file manager"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/linuxmint/nemo-extensions"
 distfiles="https://github.com/linuxmint/nemo-extensions/archive/${version}.tar.gz"
-checksum=4bee7336554fd3c6e87371bc4683e5bee989a67030582b89a050aad5874a04de
+checksum=8ee8698c6058762965635d8233c18a4019437f73752e2085087d812aa46c0fe5
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/nemo/template b/srcpkgs/nemo/template
index b88a4f404c5..8f5d8fa7247 100644
--- a/srcpkgs/nemo/template
+++ b/srcpkgs/nemo/template
@@ -1,7 +1,7 @@
 # Template file for 'nemo'
 pkgname=nemo
-version=4.0.6
-revision=2
+version=4.2.3
+revision=1
 build_style=meson
 pycompile_dirs="/usr/share/nemo/actions/myaction.py"
 hostmakedepends="gettext-devel glib-devel gnome-common intltool pkg-config
@@ -14,7 +14,9 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
 distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=9e7305955d1e420f85c944c921e2d622cd799785ea271ed488888e910a097e47
+checksum=f7876862340d9823f30e3b6b87bf97578089e448d57eeb7c6e41b0a2b69995f9
+nocross="ninja stops when compiling libnemo-private/eaa6409@@nemo-private@sta/nemo-file-undo-manager.c.o"
+
 
 do_check() {
 	:
diff --git a/srcpkgs/neofetch/template b/srcpkgs/neofetch/template
index dd267e28199..60cc2c36645 100644
--- a/srcpkgs/neofetch/template
+++ b/srcpkgs/neofetch/template
@@ -1,6 +1,6 @@
 # Template file for 'neofetch'
 pkgname=neofetch
-version=6.0.0
+version=6.1.0
 revision=1
 archs=noarch
 build_style=gnu-makefile
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://github.com/dylanaraps/neofetch"
 changelog="https://raw.githubusercontent.com/dylanaraps/neofetch/master/CHANGELOG.md"
 distfiles="${homepage}/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=264a7689561bb498f97f10231959bdd8f7c873671bac2ffb660de9a5863b1c76
+checksum=ece351e35286b64d362000d409b27597fcbdcf77e8e60fa0adae1f29d3c29637
 
 post_install() {
 	vlicense LICENSE.md
diff --git a/srcpkgs/neovim-remote/template b/srcpkgs/neovim-remote/template
index bd451aa1a3d..d8473bf0521 100644
--- a/srcpkgs/neovim-remote/template
+++ b/srcpkgs/neovim-remote/template
@@ -1,6 +1,6 @@
 # Template file for 'neovim-remote'
 pkgname=neovim-remote
-version=2.1.9
+version=2.2.2
 revision=1
 archs=noarch
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="dleeram <dleeram@protonmail.com>"
 license="MIT"
 homepage="https://github.com/mhinz/neovim-remote"
 distfiles="https://github.com/mhinz/neovim-remote/archive/v${version}.tar.gz"
-checksum=25d9fe4f4c90a9b68d507d1c9f81411e00342c95517d19051c5dba3a42b703aa
+checksum=3e7442f227812ad81bc9bbbced7fc6bd92a4e74670d4c44b4dca3ed0cb85d631
 
 do_check() {
 	python3 -m pytest
diff --git a/srcpkgs/neovim/template b/srcpkgs/neovim/template
index 3132bbe0bfb..8022cf1f218 100644
--- a/srcpkgs/neovim/template
+++ b/srcpkgs/neovim/template
@@ -1,17 +1,18 @@
 # Template file for 'neovim'
 pkgname=neovim
-version=0.3.8
+version=0.4.2
 revision=1
 build_style=cmake
-configure_args="-DENABLE_JEMALLOC=0"
 hostmakedepends="pkg-config gperf LuaJIT lua51-lpeg lua51-mpack"
-makedepends="libtermkey-devel libuv-devel libvterm-devel msgpack-devel LuaJIT-devel"
+makedepends="libtermkey-devel libuv-devel libvterm-devel msgpack-devel LuaJIT-devel
+ libluv-devel"
+depends="libvterm>=0.1.0"
 short_desc="Fork of Vim aiming to improve user experience, plugins and GUIs"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="Apache-2.0, custom:Vim"
 homepage="https://neovim.io"
 distfiles="https://github.com/neovim/neovim/archive/v${version}.tar.gz"
-checksum=953e134568d824dad7cbf32ee3114951732f9a750c462e430e6b593f418af76c
+checksum=9f874d3d2a74f33b931db62adebe28f8d2ec116270d1e13998b58a73348b6e56
 
 alternatives="
  vi:vi:/usr/bin/nvim
diff --git a/srcpkgs/nerd-fonts/template b/srcpkgs/nerd-fonts/template
index a02a59223e6..dc921d751e7 100644
--- a/srcpkgs/nerd-fonts/template
+++ b/srcpkgs/nerd-fonts/template
@@ -6,7 +6,7 @@ archs=noarch
 wrksrc=NerdFonts
 depends="font-util xbps-triggers nerd-fonts-ttf nerd-fonts-otf"
 short_desc="Iconic font aggregator, collection and patcher"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://nerdfonts.com"
 distfiles="https://gitlab.com/devopsdeluxe/nerd-fonts-aur/raw/v${version}/release/NerdFonts.tar.xz
diff --git a/srcpkgs/netcdf/template b/srcpkgs/netcdf/template
index c308b202250..632cf78080a 100644
--- a/srcpkgs/netcdf/template
+++ b/srcpkgs/netcdf/template
@@ -1,6 +1,6 @@
 # Template file for 'netcdf'
 pkgname=netcdf
-version=4.7.0
+version=4.7.1
 revision=1
 wrksrc="netcdf-c-${version}"
 build_style=gnu-configure
@@ -12,7 +12,7 @@ maintainer="Hans Grob <woufrous@gmail.com>"
 license="NetCDF"
 homepage="https://www.unidata.ucar.edu/software/netcdf/"
 distfiles="https://github.com/Unidata/netcdf-c/archive/v${version}.tar.gz"
-checksum=26d03164074363b3911ed79b7cddd045c22adf5ebaf978943db11a1d9f15e9d3
+checksum=583e6b89c57037293fc3878c9181bb89151da8c6015ecea404dd426fea219b2c
 
 post_install() {
 	# Remove references to hardening -specs.
diff --git a/srcpkgs/netpbm/files/netpbm-security-code.patch b/srcpkgs/netpbm/files/netpbm-security-code.patch
index 1a0d2438e97..ca74b96dff9 100644
--- a/srcpkgs/netpbm/files/netpbm-security-code.patch
+++ b/srcpkgs/netpbm/files/netpbm-security-code.patch
@@ -1016,75 +1016,6 @@ diff -up netpbm-10.58.01/urt/rle_addhist.c.security-code netpbm-10.58.01/urt/rle
      ++length;                               /*Cater for the null. */
  
      MALLOCARRAY(newc, length);
-diff -up netpbm-10.58.01/urt/rle_hdr.c.security-code netpbm-10.58.01/urt/rle_hdr.c
---- netpbm-10.58.01/urt/rle_hdr.c.security-code	2012-04-09 15:31:45.000000000 +0200
-+++ netpbm-10.58.01/urt/rle_hdr.c	2012-04-09 15:40:03.233619414 +0200
-@@ -14,6 +14,8 @@
-  * If you modify this software, you should include a notice giving the
-  * name of the person performing the modification, the date of modification,
-  * and the reason for such modification.
-+ *
-+ *  2002-12-19: Fix maths wrapping bugs. Alan Cox <alan@redhat.com>
-  */
- /* 
-  * rle_hdr.c - Functions to manipulate rle_hdr structures.
-@@ -80,7 +82,10 @@ int img_num;
-     /* Fill in with copies of the strings. */
-     if ( the_hdr->cmd != pgmname )
-     {
--	char *tmp = (char *)malloc( strlen( pgmname ) + 1 );
-+	char *tmp ;
-+
-+	overflow_add(strlen(pgmname), 1);
-+	tmp = malloc( strlen( pgmname ) + 1 );
- 	RLE_CHECK_ALLOC( pgmname, tmp, 0 );
- 	strcpy( tmp, pgmname );
- 	the_hdr->cmd = tmp;
-@@ -88,7 +93,9 @@ int img_num;
- 
-     if ( the_hdr->file_name != fname )
-     {
--	char *tmp = (char *)malloc( strlen( fname ) + 1 );
-+	char *tmp;
-+	overflow_add(strlen(fname), 1);
-+	tmp = malloc( strlen( fname ) + 1 );
- 	RLE_CHECK_ALLOC( pgmname, tmp, 0 );
- 	strcpy( tmp, fname );
- 	the_hdr->file_name = tmp;
-@@ -153,6 +160,7 @@ rle_hdr *from_hdr, *to_hdr;
-     if ( to_hdr->bg_color )
-     {
- 	int size = to_hdr->ncolors * sizeof(int);
-+	overflow2(to_hdr->ncolors, sizeof(int));
- 	to_hdr->bg_color = (int *)malloc( size );
- 	RLE_CHECK_ALLOC( to_hdr->cmd, to_hdr->bg_color, "background color" );
- 	memcpy( to_hdr->bg_color, from_hdr->bg_color, size );
-@@ -161,7 +169,7 @@ rle_hdr *from_hdr, *to_hdr;
-     if ( to_hdr->cmap )
-     {
- 	int size = to_hdr->ncmap * (1 << to_hdr->cmaplen) * sizeof(rle_map);
--	to_hdr->cmap = (rle_map *)malloc( size );
-+	to_hdr->cmap = (rle_map *)malloc3( to_hdr->ncmap, 1<<to_hdr->cmaplen, sizeof(rle_map));
- 	RLE_CHECK_ALLOC( to_hdr->cmd, to_hdr->cmap, "color map" );
- 	memcpy( to_hdr->cmap, from_hdr->cmap, size );
-     }
-@@ -174,11 +182,16 @@ rle_hdr *from_hdr, *to_hdr;
- 	int size = 0;
- 	CONST_DECL char **cp;
- 	for ( cp=to_hdr->comments; *cp; cp++ )
-+	{
-+	    overflow_add(size, 1);
- 	    size++;		/* Count the comments. */
-+ 	}
- 	/* Check if there are really any comments. */
- 	if ( size )
- 	{
-+	    overflow_add(size, 1);
- 	    size++;		/* Copy the NULL pointer, too. */
-+	    overflow2(size, sizeof(char *));
- 	    size *= sizeof(char *);
- 	    to_hdr->comments = (CONST_DECL char **)malloc( size );
- 	    RLE_CHECK_ALLOC( to_hdr->cmd, to_hdr->comments, "comments" );
 diff -up netpbm-10.58.01/urt/rle.h.security-code netpbm-10.58.01/urt/rle.h
 --- netpbm-10.58.01/urt/rle.h.security-code	2012-04-09 15:31:45.000000000 +0200
 +++ netpbm-10.58.01/urt/rle.h	2012-04-09 15:40:03.233619414 +0200
diff --git a/srcpkgs/netpbm/template b/srcpkgs/netpbm/template
index d122865d181..acd0ee176a7 100644
--- a/srcpkgs/netpbm/template
+++ b/srcpkgs/netpbm/template
@@ -1,10 +1,10 @@
 # Template file for 'netpbm'
 pkgname=netpbm
 # from http://svn.code.sf.net/p/netpbm/code/advanced/doc/HISTORY
-version=10.87.01
+version=10.88.00
 revision=1
-_githash=b4f838a9bfbb656c7d24bcf1e39c616a0804f837
-_githash_guide=659088e47395511bee20a5ac319bc6a3ea5d64cb
+_githash=ba9611399c049edc878be544d2a91f7178dce3dd
+_githash_guide=4d6a81f76b3eeab25441f7614083bbb82328499c
 create_wrksrc=yes
 build_wrksrc="netpbm-mirror-${_githash}"
 hostmakedepends="pkg-config perl python flex"
@@ -16,8 +16,8 @@ license="BSD,GPL-2,custom"
 homepage="http://netpbm.sourceforge.net/"
 distfiles="https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash}.tar.gz
  https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash_guide}.tar.gz"
-checksum="ffb52fd44bf4b0da505c5db45a8f63c856a25d8660fe45384a35e74fa1a16712
- de7e6e3f66e561cad34afb087f50b28b7fbc585687f21306de3f81d42f6f4470"
+checksum="01faa24feff72346f77091a24ac40cea600428439837a25b692897a3bde1d4bb
+ b912e8bfcfd98d931b37e130d113e86d0656922059ea451a37d88e218f865fb5"
 
 post_extract() {
 	cd $build_wrksrc
diff --git a/srcpkgs/nettle/template b/srcpkgs/nettle/template
index e687d02a79c..7ea54b2a0b4 100644
--- a/srcpkgs/nettle/template
+++ b/srcpkgs/nettle/template
@@ -1,17 +1,17 @@
 # Template file for 'nettle'
 pkgname=nettle
-version=3.4.1
+version=3.5.1
 revision=1
 build_style=gnu-configure
 configure_args="--enable-shared"
 hostmakedepends="m4"
 makedepends="gmp-devel"
 short_desc="A low-level cryptographic library"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
 homepage="http://www.lysator.liu.se/~nisse/nettle/"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=f941cf1535cd5d1819be5ccae5babef01f6db611f9b5a777bae9c7604b8a92ad
+checksum=75cca1998761b02e16f2db56da52992aef622bf55a3b45ec538bc2eedadc9419
 
 
 nettle-devel_package() {
diff --git a/srcpkgs/networkmanager-qt5/template b/srcpkgs/networkmanager-qt5/template
index fd3b584c2f3..49e62c1c757 100644
--- a/srcpkgs/networkmanager-qt5/template
+++ b/srcpkgs/networkmanager-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'networkmanager-qt5'
 pkgname=networkmanager-qt5
-version=5.61.0
+version=5.63.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/frameworks/networkmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=1ded63af93957a04292e965ecce06388f183d3adc555b4f3d33337ee15d858c3
+checksum=2fd194fa64838dbf419df0a907bac5b1105f29f2261c96de4330283fa3f9ae79
 
 networkmanager-qt5-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/newsboat/template b/srcpkgs/newsboat/template
index 784d2c6b6be..f5fc4d9debe 100644
--- a/srcpkgs/newsboat/template
+++ b/srcpkgs/newsboat/template
@@ -1,7 +1,7 @@
 # Template file for 'newsboat'
 pkgname=newsboat
-version=2.16.1
-revision=2
+version=2.17.1
+revision=1
 wrksrc="newsboat-r${version}"
 build_style=configure
 build_helper="rust"
@@ -13,12 +13,12 @@ makedepends="json-c-devel libcurl-devel libxml2-devel sqlite-devel stfl-devel
  rust-std"
 checkdepends="ncurses-base"
 short_desc="Newsboat is a fork of Newsbeuter the Mutt of RSS feed readers"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://www.newsboat.org"
 changelog="https://raw.githubusercontent.com/newsboat/newsboat/master/CHANGELOG.md"
 distfiles="https://github.com/newsboat/newsboat/archive/r${version}.tar.gz"
-checksum=c125cf906a074598104476fecddae5e4f4dd26c9d22750bb1e8ccfd7a11813c2
+checksum=4332d5e3605f57441158d06864297c8ac79bd159b12d982296b15b0bd7455cc6
 
 CXXFLAGS=" -Wno-error=sign-compare"
 
diff --git a/srcpkgs/next/template b/srcpkgs/next/template
new file mode 100644
index 00000000000..a22f08bf917
--- /dev/null
+++ b/srcpkgs/next/template
@@ -0,0 +1,21 @@
+# Template file for 'next'
+pkgname=next
+version=1.3.4
+revision=1
+build_style=gnu-makefile
+hostmakedepends="sbcl curl pkg-config"
+makedepends="webkit2gtk-devel libfixposix-devel libressl-devel"
+depends="sqlite xclip libfixposix-devel libressl-devel"
+short_desc="Keyboard-oriented, extensible web-browser"
+maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"
+license="BSD-3-Clause"
+homepage="https://next.atlas.engineer/"
+distfiles="https://github.com/atlas-engineer/next/archive/${version}.tar.gz"
+checksum=e8fe93cef62985926a25da4138f3e865b48d8c0ed19125d5f52724fd7a4c6e87
+nostrip=yes
+nopie=yes
+nocross="https://travis-ci.org/void-linux/void-packages/builds/590346382"
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/nftables/template b/srcpkgs/nftables/template
index df138f75070..3022a9a2d1f 100644
--- a/srcpkgs/nftables/template
+++ b/srcpkgs/nftables/template
@@ -1,17 +1,17 @@
 # Template file for 'nftables'
 pkgname=nftables
-version=0.9.1
+version=0.9.2
 revision=1
 build_style=gnu-configure
-configure_args="--sbindir=/usr/bin CONFIG_MAN=y DB2MAN=docbook2man"
+configure_args="--sbindir=/usr/bin --with-json"
 hostmakedepends="asciidoc docbook2x flex pkg-config"
-makedepends="gmp-devel libmnl-devel libnftnl-devel readline-devel"
+makedepends="gmp-devel jansson-devel libmnl-devel libnftnl-devel readline-devel"
 short_desc="Netfilter nftables userspace tools"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="http://netfilter.org/projects/nftables/"
 distfiles="http://www.netfilter.org/projects/${pkgname}/files/${pkgname}-${version}.tar.bz2"
-checksum=ead3bb68ed540bfbb87a96f2b69c3d65ab0c2a0c3f6e739a395c09377d1b4fce
+checksum=5cb66180143e6bfc774f4eb316206d40ac1cb6df269a90882404cbf7165513f5
 
 post_install() {
 	vsv nftables
@@ -32,5 +32,6 @@ libnftables-devel_package() {
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.a"
+		vmove usr/share/man/man3
 	}
 }
diff --git a/srcpkgs/ngspice/template b/srcpkgs/ngspice/template
index 5e2c1934b34..4b74899cbb2 100644
--- a/srcpkgs/ngspice/template
+++ b/srcpkgs/ngspice/template
@@ -1,7 +1,7 @@
 # Template file for 'ngspice'
 pkgname=ngspice
-version=30
-revision=2
+version=31
+revision=1
 build_style=gnu-configure
 configure_args="--with-readline=yes --with-ngshared --enable-xspice --enable-cider"
 hostmakedepends="bison byacc"
@@ -11,7 +11,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://ngspice.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/ngspice/ng-spice-rework/${version}/${pkgname}-${version}.tar.gz"
-checksum=08fe0e2f3768059411328a33e736df441d7e6e7304f8dad0ed5f28e15d936097
+checksum=845f3b0c962e47ded051dfbc134c3c1e4ac925c9f0ce1cb3df64eb9b9da5c282
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/nilfs-utils/patches/max-input.patch b/srcpkgs/nilfs-utils/patches/max-input.patch
deleted file mode 100644
index 5241ea55c0b..00000000000
--- a/srcpkgs/nilfs-utils/patches/max-input.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./bin/rmcp.c.orig
-+++ ./bin/rmcp.c
-@@ -51,6 +51,9 @@
- #include "nilfs.h"
- #include "parser.h"
- 
-+#ifndef MAX_INPUT
-+#define MAX_INPUT _POSIX_MAX_INPUT
-+#endif
- 
- #ifdef _GNU_SOURCE
- #include <getopt.h>
diff --git a/srcpkgs/nilfs-utils/patches/rpc-types.patch b/srcpkgs/nilfs-utils/patches/rpc-types.patch
deleted file mode 100644
index ce55c439a2a..00000000000
--- a/srcpkgs/nilfs-utils/patches/rpc-types.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./sbin/mount/sundries.h.orig
-+++ ./sbin/mount/sundries.h
-@@ -15,7 +15,7 @@
- #include <signal.h>
- #include <stdarg.h>
- #include <stdlib.h>
--#if !defined(bool_t) && !defined(__GLIBC__)
-+#if !defined(bool_t) && !defined(__GLIBC__) && HAVE_RPC_TYPES_H
- #include <rpc/types.h>
- #endif
- 
diff --git a/srcpkgs/nilfs-utils/template b/srcpkgs/nilfs-utils/template
index ea07b0af50c..c58b411bcda 100644
--- a/srcpkgs/nilfs-utils/template
+++ b/srcpkgs/nilfs-utils/template
@@ -1,6 +1,6 @@
 # Template file for 'nilfs-utils'
 pkgname=nilfs-utils
-version=2.2.7
+version=2.2.8
 revision=1
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --enable-libmount"
@@ -8,12 +8,12 @@ make_install_args="sbindir=/usr/bin"
 hostmakedepends="automake libtool"
 makedepends="libuuid-devel libmount-devel"
 conf_files="/etc/nilfs_cleanerd.conf"
-short_desc="A log-structured file system for Linux - userspace utils"
+short_desc="Log-structured file system for Linux - userspace utils"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2, LGPL-2.1"
+license="GPL-2.0-only, LGPL-2.1-only"
 homepage="http://nilfs.sourceforge.net/"
 distfiles="http://nilfs.sourceforge.net/download/$pkgname-$version.tar.bz2"
-checksum=2cf651c47f65ae1387758d90b0c51e744e2ecce0b1d77e8be9998929f74ac005
+checksum=5a29f8f59db03edf8dd1e68dfd80ff4713e0aa184cfa83a6326ac8af93d9bda6
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/nim/template b/srcpkgs/nim/template
index 2f691870035..81e3d041b87 100644
--- a/srcpkgs/nim/template
+++ b/srcpkgs/nim/template
@@ -1,23 +1,23 @@
 # Template file for 'nim'
 pkgname=nim
-version=0.20.0
+version=1.0.0
 revision=1
 _cversion=0.20.0
-_nimbleversion=0.10.2
+_nimbleversion=0.11.0
 create_wrksrc=yes
 build_wrksrc=Nim-$version
 hostmakedepends="ed"
 depends="gcc"
-short_desc="The Nim programming language"
+short_desc="Nim programming language"
 maintainer="allan <mail@may.mooo.com>"
 license="MIT"
 homepage="https://nim-lang.org/"
 distfiles="https://github.com/nim-lang/Nim/archive/v${version}.tar.gz
  https://github.com/nim-lang/csources/archive/v${_cversion}.tar.gz>csources-${_cversion}.tar.gz
  https://github.com/nim-lang/nimble/archive/v${_nimbleversion}.tar.gz>nimble-${_nimbleversion}.tar.gz"
-checksum="53f96a92cd1a46360b1fab44720d331536bbd18993a81746e973af46fdad8fbb
+checksum="6d93d25da6b5ef4e0223acb1f1abadf06be1019a8137491ddc7c6fa030e638c3
  5e6fd15d90df1a8cb7614c4ffc70aa8c4198cd854d7742016202b96dd0228d3c
- ef62b38ad41f9d84b4c9206b10541f1dc7498edda16b2031d96eaa873f4f9730"
+ a31d06128f3d1014d68297aa5cd264023d202cae74746d78ba84e335af3399d2"
 
 post_extract() {
 	mv csources-$_cversion $build_wrksrc/csources
@@ -27,17 +27,17 @@ post_extract() {
 
 do_build() {
 	cd csources
-	CC=cc LD=cc CFLAGS="-Os -pipe" LDFLAGS= sh build.sh
+	case "$XBPS_TARGET_MACHINE" in
+		i686*)
+			CC=cc LD=cc CFLAGS="-Os -pipe" LDFLAGS= \
+			sh build.sh --cpu i686;;
+		*)
+			CC=cc LD=cc CFLAGS="-Os -pipe" LDFLAGS= sh build.sh;;
+	esac
 	cd ..
 
-	ed lib/wrappers/openssl.nim <<-EDIT
-		,s/versions = "(/versions = "(.46|/
-		w
-		q
-	EDIT
-
 	bin/nim c koch
-	./koch boot -d:release
+	./koch boot -d:release -d:danger
 
 	case "$XBPS_TARGET_MACHINE" in
 		aarch64*) _arch=arm64;;
@@ -62,7 +62,7 @@ do_build() {
 			w
 			q
 		EDIT
-		bin/nim c -d:release --os:linux --cpu:$_arch --listCmd compiler/nim
+		bin/nim c -d:release -d:danger --os:linux --cpu:$_arch --listCmd compiler/nim
 		for _p in \
 			dist/nimble/src/nimble \
 			tools/nimgrep \
diff --git a/srcpkgs/ninja/template b/srcpkgs/ninja/template
index 9e7b546d923..056f59ff57c 100644
--- a/srcpkgs/ninja/template
+++ b/srcpkgs/ninja/template
@@ -4,7 +4,7 @@ version=1.9.0
 revision=1
 hostmakedepends="python asciidoc"
 short_desc="Small build system with a focus on speed"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://ninja-build.org/"
 distfiles="https://github.com/martine/ninja/archive/v${version}.tar.gz"
diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template
index 4d994ef4241..f9c9030e72e 100644
--- a/srcpkgs/nix/template
+++ b/srcpkgs/nix/template
@@ -1,7 +1,7 @@
 # Template file for 'nix'
 pkgname=nix
 version=2.2.2
-revision=3
+revision=4
 build_style=gnu-configure
 # Use /nix/var as suggested by the official Manual.
 configure_args="--localstatedir=/nix/var --with-sandbox-shell=/bin/sh"
diff --git a/srcpkgs/nnn/template b/srcpkgs/nnn/template
index c9193ba4946..28fb4230e49 100644
--- a/srcpkgs/nnn/template
+++ b/srcpkgs/nnn/template
@@ -1,6 +1,6 @@
 # Template file for 'nnn'
 pkgname=nnn
-version=2.6
+version=2.7
 revision=1
 build_style=gnu-makefile
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ license="BSD-2-Clause"
 homepage="https://github.com/jarun/nnn"
 changelog="https://raw.githubusercontent.com/jarun/nnn/master/CHANGELOG"
 distfiles="https://github.com/jarun/nnn/archive/v${version}.tar.gz"
-checksum=17fd3e517308e41065594ffe8dcde348b4d10dea4240699f4708337db48b3e25
+checksum=0592c7cbcf2cf66cacac49e9204636480820b1bc74e4187dd7ee06945a6d07c5
 
 post_install() {
 	vinstall misc/auto-completion/bash/nnn-completion.bash 644 \
diff --git a/srcpkgs/nodejs-lts/patches/ppc32.patch b/srcpkgs/nodejs-lts/patches/ppc32.patch
index fe28ab75115..343eff58512 100644
--- a/srcpkgs/nodejs-lts/patches/ppc32.patch
+++ b/srcpkgs/nodejs-lts/patches/ppc32.patch
@@ -1,3 +1,28 @@
+--- configure.py
++++ configure.py
+@@ -848,7 +848,7 @@ def host_arch_cc():
+     '__MIPSEL__'  : 'mipsel',
+     '__mips__'    : 'mips',
+     '__PPC64__'   : 'ppc64',
+-    '__PPC__'     : 'ppc64',
++    '__PPC__'     : 'ppc',
+     '__x86_64__'  : 'x64',
+     '__s390__'    : 's390',
+     '__s390x__'   : 's390x',
+--- node.gyp
++++ node.gyp
+@@ -479,6 +479,11 @@
+       'msvs_disabled_warnings!': [4244],
+ 
+       'conditions': [
++        [ 'host_arch=="mips" or host_arch=="mipsel" or host_arch=="ppc"', {
++	  'link_settings': {
++	    'libraries': [ '-latomic' ],
++	  },
++	}],
+         [ 'node_code_cache_path!=""', {
+           'sources': [ '<(node_code_cache_path)' ]
+         }, {
 --- deps/v8/src/libsampler/sampler.cc
 +++ deps/v8/src/libsampler/sampler.cc
 @@ -418,9 +418,15 @@ void SignalHandler::FillRegisterState(void* context, RegisterState* state) {
diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index b5d307fb303..b260e1c0706 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -36,6 +36,12 @@ if [ "$XBPS_WORDSIZE" -ne "$XBPS_TARGET_WORDSIZE" ]; then
         nocross="host and target must have the same pointer size"
 fi
 
+case "$XBPS_MACHINE" in
+	ppc64*) ;;
+	mips*|ppc*) hostmakedepends+=" libatomic-devel" ;;
+        *) ;;
+esac
+
 do_configure() {
 	local _args
 
diff --git a/srcpkgs/nodejs/patches/ppc32.patch b/srcpkgs/nodejs/patches/ppc32.patch
index fe28ab75115..502d471429f 100644
--- a/srcpkgs/nodejs/patches/ppc32.patch
+++ b/srcpkgs/nodejs/patches/ppc32.patch
@@ -1,17 +1,19 @@
---- deps/v8/src/libsampler/sampler.cc
+--- deps/v8/src/libsampler/sampler.cc.orig
 +++ deps/v8/src/libsampler/sampler.cc
-@@ -418,9 +418,15 @@ void SignalHandler::FillRegisterState(void* context, RegisterState* state) {
-       reinterpret_cast<void*>(ucontext->uc_mcontext.regs->gpr[PT_R31]);
+@@ -423,10 +423,17 @@
+   state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.regs->link);
  #else
    // Some C libraries, notably Musl, define the regs member as a void pointer
 +  #if !V8_TARGET_ARCH_32_BIT
    state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[32]);
    state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[1]);
    state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[31]);
+   state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[36]);
 +  #else
 +  state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[32]);
 +  state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[1]);
 +  state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[31]);
++  state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[36]);
 +  #endif
  #endif
  #elif V8_HOST_ARCH_S390
diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index e14d74894dc..42a9011ec92 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -1,6 +1,6 @@
 # Template file for 'nodejs'
 pkgname=nodejs
-version=12.8.0
+version=12.11.1
 revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
@@ -17,7 +17,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://nodejs.org/"
 distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
-checksum=6f4e4ee7bcb52f782dce5a51d6951ff87151d9504be129d68d7aff469c0f7f36
+checksum=37043ddbe60f18a52ec31e0381b66adebbc0ec24669d72f132a1fdfacdf029ae
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
 desc_option_ssl="Enable shared libressl"
@@ -36,6 +36,11 @@ if [ "$XBPS_WORDSIZE" -ne "$XBPS_TARGET_WORDSIZE" ]; then
 	nocross="host and target must have the same pointer size"
 fi
 
+case "$XBPS_TARGET_MACHINE" in
+	ppc64*) ;;
+	ppc*) broken="Node 12.x does not support 32-bit ppc" ;;
+esac
+
 # v8 requires libatomic on ppc*/s390x/mips*
 case "$XBPS_TARGET_MACHINE" in
 	mips*|ppc*) makedepends+=" libatomic-devel" ;;
diff --git a/srcpkgs/nomad/template b/srcpkgs/nomad/template
index 8b6ad81e192..ccb62542fcf 100644
--- a/srcpkgs/nomad/template
+++ b/srcpkgs/nomad/template
@@ -1,11 +1,11 @@
 # Template file for 'nomad'
 pkgname=nomad
-version=0.9.4
+version=0.9.6
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/${pkgname}"
 go_build_tags="ui release"
-_git_commit=23c4597dbb6d1d46e020301b0f63db5cff80d3f0
+_git_commit=6c4863c5f61b0cdfb609927f6f67e17d90454197
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit}"
 hostmakedepends="git"
 short_desc="Cluster scheduler designed to easily integrate into existing workflows"
@@ -13,7 +13,7 @@ maintainer="iaroki <iaroki@protonmail.com>"
 license="MPL-2.0"
 homepage="https://www.nomadproject.io/"
 distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
-checksum=46c7998a82a45e82db87b4f4575aa48dd3d5fc0acc9d69ac3536785622867058
+checksum=c37e03cbe939ddb983307e3eb501b83e025e2c915de312094384db9164ae7a05
 patch_args="-Np1"
 
 case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/nootka/template b/srcpkgs/nootka/template
index 255299f5014..3142b147987 100644
--- a/srcpkgs/nootka/template
+++ b/srcpkgs/nootka/template
@@ -1,6 +1,6 @@
 # Template file for 'nootka'
 pkgname=nootka
-version=1.4.5
+version=1.4.6
 revision=1
 wrksrc="nootka-${version}-source"
 build_style=cmake
@@ -10,8 +10,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
 homepage="https://nootka.sourceforge.io"
 distfiles="${SOURCEFORGE_SITE}/nootka/Nootka-${version}/nootka-${version}-source.tar.bz2"
-checksum=210371ffeb8f018564e1d07d935dee7f310316c67359ac40569cc74f3c3a5e16
+checksum=26b94b90065d11a47c9f6d091ebc2c1c449f4ef26202d203045199900b2e3514
+
 
 nocross="https://travis-ci.org/void-linux/void-packages/jobs/425361689
  https://travis-ci.org/void-linux/void-packages/jobs/425361690"
-
diff --git a/srcpkgs/notify-send.sh/template b/srcpkgs/notify-send.sh/template
index f36ca389f3d..a36bce58d0c 100644
--- a/srcpkgs/notify-send.sh/template
+++ b/srcpkgs/notify-send.sh/template
@@ -4,7 +4,7 @@ version=1.0
 revision=1
 depends="bash dbus glib"
 short_desc="Drop in replacement for libnotify and notify-send"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/vlevit/notify-send.sh"
 distfiles="https://github.com/vlevit/notify-send.sh/archive/v${version}.tar.gz"
diff --git a/srcpkgs/nsd/template b/srcpkgs/nsd/template
index 8015dced091..241682461ec 100644
--- a/srcpkgs/nsd/template
+++ b/srcpkgs/nsd/template
@@ -1,6 +1,6 @@
 # Template file for 'nsd'
 pkgname=nsd
-version=4.2.1
+version=4.2.2
 revision=1
 build_style=gnu-configure
 configure_args="--enable-ratelimit --enable-ratelimit-default-is-off
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://www.nlnetlabs.nl/projects/nsd/"
 changelog="https://github.com/NLnetLabs/nsd/blob/NSD_${version//./_}_REL/doc/ChangeLog"
 distfiles="https://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=d17c0ea3968cb0eb2be79f2f83eb299b7bfcc554b784007616eed6ece828871f
+checksum=83b333940a25fe6d453bcac6ea39edfa244612a879117c4a624c97eb250246fb
 system_accounts="nsd"
 nsd_homedir=/var/db/nsd
 make_dirs="/var/db/nsd 0755 nsd nsd"
diff --git a/srcpkgs/nsjail/template b/srcpkgs/nsjail/template
index 5eb375bd9d8..9eaced49863 100644
--- a/srcpkgs/nsjail/template
+++ b/srcpkgs/nsjail/template
@@ -1,7 +1,7 @@
 # Template file for 'nsjail'
 pkgname=nsjail
-version=2.8
-revision=2
+version=2.9
+revision=1
 build_style=gnu-makefile
 hostmakedepends="bison flex pkg-config protobuf"
 makedepends="libnl3-devel protobuf-devel"
@@ -11,12 +11,16 @@ license="Apache-2.0"
 homepage="http://nsjail.com"
 distfiles="https://github.com/google/nsjail/archive/${version}.tar.gz
 https://github.com/google/kafel/archive/722b93a630e53ca472a4c69f61cb3dfc44ea5041.tar.gz"
-checksum="1eb5cad7e698d467a0224614aaca04e169bde6c2cf57f2e6a01a8ad5f787bb56
+checksum="f8578a48330d3d089c9234a2b562be08043f8fe77453c322724acdf403d0afc3
  49d2327c794c90aca50a9933c00d453705534b16e5f42d8c8e19c3d274f5e5f8"
 
 archs="aarch64* armv5tel* armv6l* armv7l* x86_64*"
 CXXFLAGS="-Wno-format-truncation"
 
+case "$XBPS_TARGET_MACHINE" in
+	armv*) broken="https://build.voidlinux.org/builders/armv6l_builder/builds/20655/steps/shell_3/logs/stdio";;
+esac
+
 post_extract() {
 	rmdir kafel
 	ln -s ../kafel-* kafel
diff --git a/srcpkgs/nspr/template b/srcpkgs/nspr/template
index 1d15607b7b2..a30f39088e1 100644
--- a/srcpkgs/nspr/template
+++ b/srcpkgs/nspr/template
@@ -1,6 +1,6 @@
 # Template file for 'nspr'
 pkgname=nspr
-version=4.21
+version=4.22
 revision=1
 build_wrksrc=nspr
 build_style=gnu-configure
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="http://www.mozilla.org/projects/nspr/"
 distfiles="${MOZILLA_SITE}/nspr/releases/v${version}/src/${pkgname}-${version}.tar.gz"
-checksum=15ea32c7b100217b6e3193bc03e77f485d9bf7504051443ba9ce86d1c17c6b5a
+checksum=c9e4b6cc24856ec93202fe13704b38b38ba219f0f2aeac93090ce2b6c696d430
 
 do_configure() {
 	CFLAGS="$CFLAGS -D_PR_POLL_AVAILABLE -D_PR_HAVE_OFF64_T -D_PR_INET6 -D_PR_HAVE_INET_NTOP -D_PR_HAVE_GETHOSTBYNAME2 -D_PR_HAVE_GETADDRINFO -D_PR_INET6_PROBE"
diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index 731a6d18c8e..693e4524e26 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -1,9 +1,9 @@
 # Template file for 'nss'
 
-_nsprver=4.21
+_nsprver=4.22
 
 pkgname=nss
-version=3.44.1
+version=3.46
 revision=1
 hostmakedepends="perl"
 makedepends="nspr-devel sqlite-devel zlib-devel"
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.mozilla.org/projects/security/pki/nss"
 distfiles="${MOZILLA_SITE}/security/nss/releases/NSS_${version//\./_}_RTM/src/nss-${version}.tar.gz"
-checksum=fce4cb80c989cde35416ecbe55920856015a35151c4f21be64470e4dd4de12f8
+checksum=6b699649d285602ba258a4b0957cb841eafc94eff5735a9da8da0adbb9a10cef
 
 do_build() {
 	# Respect LDFLAGS
diff --git a/srcpkgs/nsss/template b/srcpkgs/nsss/template
index e440dc7497e..17970bcb0e7 100644
--- a/srcpkgs/nsss/template
+++ b/srcpkgs/nsss/template
@@ -1,6 +1,6 @@
 # Template file for 'nsss'
 pkgname=nsss
-version=0.0.1.1
+version=0.0.2.0
 revision=1
 build_style=configure
 configure_args="--with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
@@ -8,12 +8,12 @@ configure_args="--with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
  --bindir=/usr/bin --dynlibdir=/usr/lib"
 makedepends="skalibs-devel"
 short_desc="Minimal competing implementation of glibc's Name Switch Service"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="ISC"
 homepage="https://skarnet.org/software/nsss/"
 changelog="https://skarnet.org/software/nsss/upgrade.html"
 distfiles="https://skarnet.org/software/nsss/nsss-${version}.tar.gz"
-checksum=a7d4779f45175011b6d3c10935fe4591ea4875ef9c47be1274a56d640fddc193
+checksum=be80015c1fa79e418a3cebf49c1b6e3136d536e6eef8db33f749507b585075f1
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) ;;
diff --git a/srcpkgs/numactl/template b/srcpkgs/numactl/template
index 5f003363cb6..e162c40df80 100644
--- a/srcpkgs/numactl/template
+++ b/srcpkgs/numactl/template
@@ -1,15 +1,15 @@
 # Template file for 'numactl'
 pkgname=numactl
-version=2.0.12
+version=2.0.13
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool"
 short_desc="Simple NUMA policy support"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="LGPL-2.1-only"
 homepage="https://github.com/numactl/numactl"
 distfiles="https://github.com/numactl/numactl/archive/v${version}.tar.gz"
-checksum=7c3e819c2bdeb883de68bafe88776a01356f7ef565e75ba866c4b49a087c6bdf
+checksum=97ee012b2f294903530424b4ff7f28bcaad6a356897ce8777383f87e5c2e325d
 
 if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
 	# XXX
diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index 702bb6c0529..f9734e83b03 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -3,8 +3,8 @@
 _desc="NVIDIA drivers for linux"
 
 pkgname=nvidia
-version=430.14
-revision=2
+version=430.40
+revision=1
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Proprietary NVIDIA license"
 homepage="http://www.nvidia.com"
@@ -23,7 +23,7 @@ build_options_default="glvnd"
 if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
 	_pkg="NVIDIA-Linux-x86_64-${version}-no-compat32"
 	distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run"
-	checksum=0f583a277b1731cb8327510b75dba9cf7adf5c781247e4f48bcc9f358253278f
+	checksum=669ff38532ff05c78e1edc3c6df2055fd96437107f5919b6e5a774c3a495501b
 	subpackages="nvidia-gtklibs nvidia-dkms
 	 nvidia-opencl nvidia-libs"
 	depends="nvidia-libs-${version}_${revision}
@@ -32,7 +32,7 @@ if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
 else
 	_pkg="NVIDIA-Linux-x86_64-${version}"
 	distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run"
-	checksum=00d46ffaf3e1e430081ddbd68b74cc361cd1328e8944224dfe69630dd8540f17
+	checksum=f700899f48ba711b7e1598014e8db9a93537d7baa3d6a64067ed08578387dfd7
 	subpackages="nvidia-libs"
 	depends="pkgconf"
 fi
diff --git a/srcpkgs/nvidia340/files/kernel-5.0.patch b/srcpkgs/nvidia340/files/kernel-5.0.patch
index 01650dbfd79..b6d43e370bc 100644
--- a/srcpkgs/nvidia340/files/kernel-5.0.patch
+++ b/srcpkgs/nvidia340/files/kernel-5.0.patch
@@ -42,4 +42,48 @@
 +#endif
  
      status = RM_OK;
+
+--- kernel/uvm/nvidia_uvm_lite.c	2019-09-10 16:26:28.674315544 +0200
++++ kernel/uvm/nvidia_uvm_lite.c	2019-09-10 16:28:05.224054277 +0200
+@@ -30,6 +30,16 @@
+ #include "nvidia_uvm_lite_counters.h"
+ #include "ctrl2080mc.h"
  
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 0, 0)
++static inline void do_gettimeofday(struct timeval *tv) {
++       struct timespec64 now;  
++
++       ktime_get_real_ts64(&now);      
++       tv->tv_sec = now.tv_sec;
++       tv->tv_usec = now.tv_nsec/1000;
++}
++#endif
++
+ //
+ // nvidia_uvm_lite.c
+ // This file contains code that is specific to the UVM-Lite mode of operation.
+@@ -820,8 +830,10 @@
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
+-#else 	
+-int _fault(struct vm_fault *vmf) 	
++#elif LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0)     
++int _fault(struct vm_fault *vmf)       
++#else
++unsigned int _fault(struct vm_fault *vmf)      
+ #endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+@@ -876,8 +888,10 @@
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
+-#else
++#elif LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0)
+ int _sigbus_fault(struct vm_fault *vmf)
++#else
++unsigned int _sigbus_fault(struct vm_fault *vmf)
+ #endif
+ {
+     vmf->page = NULL;
diff --git a/srcpkgs/nvidia340/template b/srcpkgs/nvidia340/template
index 0fa1e30c6db..25d6953db03 100644
--- a/srcpkgs/nvidia340/template
+++ b/srcpkgs/nvidia340/template
@@ -4,7 +4,7 @@ _desc="NVIDIA drivers (GeForce 8, 9, 9M, 100, 100M, 200, 300 series)"
 
 pkgname=nvidia340
 version=340.107
-revision=3
+revision=4
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Proprietary NVIDIA license"
 homepage="http://www.nvidia.com"
@@ -38,7 +38,7 @@ do_extract() {
 	rm -f ${_pkg}.run
 }
 
-do_configure() {
+do_patch() {
 	cd ${_pkg}
 	patch -p0 < ${FILESDIR}/kernel-4.11.patch
 	patch -p0 < ${FILESDIR}/kernel-5.0.patch
diff --git a/srcpkgs/nvidia390/files/kernel-5.1-x86_64.patch b/srcpkgs/nvidia390/files/kernel-5.1-x86_64.patch
deleted file mode 100644
index 04af7cc80dd..00000000000
--- a/srcpkgs/nvidia390/files/kernel-5.1-x86_64.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/kernel/nvidia-uvm/uvm8.c b/kernel/nvidia-uvm/uvm8.c
-index e00923d..2e01e3c 100644
---- a/kernel/nvidia-uvm/uvm8.c
-+++ b/kernel/nvidia-uvm/uvm8.c
-@@ -172,7 +172,11 @@ static int uvm_vm_fault_sigbus(struct vm_area_struct *vma, struct vm_fault *vmf)
-     return VM_FAULT_SIGBUS;
- }
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0)
- static int uvm_vm_fault_sigbus_wrapper(struct vm_fault *vmf)
-+#else
-+static vm_fault_t uvm_vm_fault_sigbus_wrapper(struct vm_fault *vmf)
-+#endif
- {
- #if defined(NV_VM_OPS_FAULT_REMOVED_VMA_ARG)
-     return uvm_vm_fault_sigbus(vmf->vma, vmf);
-@@ -507,7 +511,11 @@ convert_error:
-     }
- }
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0)
- static int uvm_vm_fault_wrapper(struct vm_fault *vmf)
-+#else
-+static vm_fault_t uvm_vm_fault_wrapper(struct vm_fault *vmf)
-+#endif
- {
- #if defined(NV_VM_OPS_FAULT_REMOVED_VMA_ARG)
-     return uvm_vm_fault(vmf->vma, vmf);
-
diff --git a/srcpkgs/nvidia390/files/kernel-5.1.patch b/srcpkgs/nvidia390/files/kernel-5.1.patch
deleted file mode 100644
index 19d891c27b0..00000000000
--- a/srcpkgs/nvidia390/files/kernel-5.1.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-diff --git a/kernel/common/inc/nv-list-helpers.h b/kernel/common/inc/nv-list-helpers.h
-index 0aed851..d6304c9 100644
---- a/kernel/common/inc/nv-list-helpers.h
-+++ b/kernel/common/inc/nv-list-helpers.h
-@@ -26,6 +26,8 @@
- #include <linux/list.h>
- #include "conftest.h"
- 
-+#include <linux/version.h>
-+
- #if !defined (list_for_each)
- #define list_for_each(pos, head) \
-         for (pos = (head)->next; pos != (head); pos = (pos)->next)
-@@ -91,10 +93,12 @@
-         list_entry((pos)->member.next, typeof(*(pos)), member)
- #endif
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0)
- static inline int list_is_first(const struct list_head *list,
-                                 const struct list_head *head)
- {
-     return list->prev == head;
- }
-+#endif
- 
- #endif // __NV_LIST_HELPERS_H__
-diff --git a/kernel/nvidia-drm/nvidia-drm-connector.c b/kernel/nvidia-drm/nvidia-drm-connector.c
-index 24631c0..ba1497c 100644
---- a/kernel/nvidia-drm/nvidia-drm-connector.c
-+++ b/kernel/nvidia-drm/nvidia-drm-connector.c
-@@ -30,7 +30,12 @@
- #include "nvidia-drm-utils.h"
- #include "nvidia-drm-encoder.h"
- 
-+#include <linux/version.h>
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0)
- #include <drm/drm_crtc_helper.h>
-+#else
-+#include <drm/drm_probe_helper.h>
-+#endif
- 
- #include <drm/drm_atomic.h>
- #include <drm/drm_atomic_helper.h>
-diff --git a/kernel/nvidia-drm/nvidia-drm-drv.c b/kernel/nvidia-drm/nvidia-drm-drv.c
-index 1c2db68..d524d51 100644
---- a/kernel/nvidia-drm/nvidia-drm-drv.c
-+++ b/kernel/nvidia-drm/nvidia-drm-drv.c
-@@ -41,7 +41,12 @@
- 
- #include <drm/drmP.h>
- 
-+#include <linux/version.h>
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0)
- #include <drm/drm_crtc_helper.h>
-+#else
-+#include <drm/drm_probe_helper.h>
-+#endif
- 
- #if defined(NV_DRM_DRM_GEM_H_PRESENT)
- #include <drm/drm_gem.h>
-diff --git a/kernel/nvidia-drm/nvidia-drm-encoder.c b/kernel/nvidia-drm/nvidia-drm-encoder.c
-index f66bbd7..df38042 100644
---- a/kernel/nvidia-drm/nvidia-drm-encoder.c
-+++ b/kernel/nvidia-drm/nvidia-drm-encoder.c
-@@ -31,7 +31,12 @@
- #include "nvidia-drm-crtc.h"
- #include "nvidia-drm-helper.h"
- 
-+#include <linux/version.h>
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0)
- #include <drm/drm_crtc_helper.h>
-+#else
-+#include <drm/drm_probe_helper.h>
-+#endif
- 
- #include <drm/drm_atomic.h>
- #include <drm/drm_atomic_helper.h>
-diff --git a/kernel/nvidia-drm/nvidia-drm-gem-nvkms-memory.c b/kernel/nvidia-drm/nvidia-drm-gem-nvkms-memory.c
-index 8636eff..fd0c8da 100644
---- a/kernel/nvidia-drm/nvidia-drm-gem-nvkms-memory.c
-+++ b/kernel/nvidia-drm/nvidia-drm-gem-nvkms-memory.c
-@@ -29,6 +29,8 @@
- 
- #include "nv-mm.h"
- 
-+#include <linux/version.h>
-+
- static void __nv_drm_gem_nvkms_memory_free(struct nv_drm_gem_object *nv_gem)
- {
-     struct nv_drm_device *nv_dev = nv_gem->nv_dev;
-@@ -268,7 +270,11 @@ static int __nv_drm_vma_fault(struct vm_area_struct *vma,
-  */
- 
- #if defined(NV_VM_OPS_FAULT_REMOVED_VMA_ARG)
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0)
- static int nv_drm_vma_fault(struct vm_fault *vmf)
-+#else
-+static vm_fault_t nv_drm_vma_fault(struct vm_fault *vmf)
-+#endif
- {
-     return __nv_drm_vma_fault(vmf->vma, vmf);
- }
diff --git a/srcpkgs/nvidia390/files/kernel-5.2-x86_64.patch b/srcpkgs/nvidia390/files/kernel-5.2-x86_64.patch
deleted file mode 100644
index 344771d27d8..00000000000
--- a/srcpkgs/nvidia390/files/kernel-5.2-x86_64.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -u -r a/kernel/nvidia-uvm/uvm8_tools.c b/kernel/nvidia-uvm/uvm8_tools.c
---- a/kernel/nvidia-uvm/uvm8_tools.c	2019-01-27 16:12:22.000000000 +0000
-+++ b/kernel/nvidia-uvm/uvm8_tools.c	2019-07-09 04:42:40.134899491 +0000
-@@ -204,12 +204,14 @@
-     return event_tracker != NULL && !event_tracker->is_queue;
- }
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0)
- static void put_user_pages(struct page **pages, NvU64 page_count)
- {
-     NvU64 i;
-     for (i = 0; i < page_count; i++)
-         put_page(pages[i]);
- }
-+#endif
- 
- static void unmap_user_pages(struct page **pages, void *addr, NvU64 size)
- {
diff --git a/srcpkgs/nvidia390/template b/srcpkgs/nvidia390/template
index c667dd0cd6a..058d89fab67 100644
--- a/srcpkgs/nvidia390/template
+++ b/srcpkgs/nvidia390/template
@@ -3,10 +3,10 @@
 _desc="NVIDIA drivers (GeForce 400, 500 series)"
 
 pkgname=nvidia390
-version=390.116
-revision=3
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Proprietary NVIDIA license"
+version=390.129
+revision=2
+maintainer="Andrew Benson <abenson+void@gmail.com>"
+license="custom:NVIDIA Proprietary"
 homepage="http://www.nvidia.com"
 
 archs="i686 x86_64"
@@ -14,7 +14,8 @@ nopie=yes
 repository="nonfree"
 create_wrksrc=yes
 short_desc="${_desc} - Libraries and Utilities"
-depends="nvidia390-gtklibs-${version}_${revision} nvidia390-dkms-${version}_${revision} pkg-config"
+depends="nvidia390-libs-${version}_${revision} nvidia390-gtklibs-${version}_${revision}
+ nvidia390-dkms-${version}_${revision} pkg-config"
 conflicts="catalyst>=0 xserver-abi-video>24_1"
 
 build_options="glvnd"
@@ -24,11 +25,11 @@ build_options_default="glvnd"
 if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
 	_pkg="NVIDIA-Linux-x86-${version}"
 	distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86/${version}/${_pkg}.run"
-	checksum=13133f07e8c733eeca9f78decbcd17754f37f84b9038c8b235f9e89b52fc5b29
+	checksum=5854268c26f112a16c6fd7ded0031bf95cc8f4dab617ac5d701090fec19d6f36
 else
 	_pkg="NVIDIA-Linux-x86_64-${version}-no-compat32"
 	distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run"
-	checksum=de85a2eea39ca16e25645b345259b01fbe858b833286b7e6785afa273009ef6f
+	checksum=a7925a327cab828d1eb9e74f8943623c5dbc9a5e376a4c0184065d4a319696c1
 fi
 
 subpackages="nvidia390-gtklibs nvidia390-dkms nvidia390-opencl nvidia390-libs"
@@ -40,17 +41,6 @@ do_extract() {
 	rm -f ${_pkg}.run
 }
 
-do_patch() {
-	cd ${_pkg}
-	patch -p1 < ${FILESDIR}/kernel-5.1.patch
-	case "$XBPS_TARGET_MACHINE" in
-		x86_64)
-			patch -p1 < ${FILESDIR}/kernel-5.1-x86_64.patch
-			patch -p1 < ${FILESDIR}/kernel-5.2-x86_64.patch
-		;;
-	esac
-}
-
 pre_install() {
 	cd ${_pkg}
 	cp nvidia_icd.json.template nvidia_icd.json
diff --git a/srcpkgs/nvme-cli/INSTALL b/srcpkgs/nvme-cli/INSTALL
new file mode 100644
index 00000000000..64541c01d2c
--- /dev/null
+++ b/srcpkgs/nvme-cli/INSTALL
@@ -0,0 +1,12 @@
+if [ "$UPDATE" != "yes" ]; then
+	case "${ACTION}" in
+	post)
+		if [ ! -s etc/nvme/hostnqn ]; then
+			echo $(nvme gen-hostnqn) > etc/nvme/hostnqn
+		fi
+		if [ ! -s etc/nvme/hostid ]; then
+			uuidgen > etc/nvme/hostid
+		fi
+		;;
+	esac
+fi
diff --git a/srcpkgs/nvme-cli/REMOVE b/srcpkgs/nvme-cli/REMOVE
new file mode 100644
index 00000000000..2d37bea1a51
--- /dev/null
+++ b/srcpkgs/nvme-cli/REMOVE
@@ -0,0 +1,8 @@
+if [ "$UPDATE" != "yes" ]; then
+	case "${ACTION}" in
+	pre)
+		rm -f etc/nvme/hostnqn
+		rm -f etc/nvme/hostid
+		;;
+	esac
+fi
diff --git a/srcpkgs/nvme-cli/template b/srcpkgs/nvme-cli/template
index 8aa3947d890..7bcb4e97357 100644
--- a/srcpkgs/nvme-cli/template
+++ b/srcpkgs/nvme-cli/template
@@ -1,14 +1,26 @@
 # Template file for 'nvme-cli'
 pkgname=nvme-cli
-version=1.8.1
-revision=1
+version=1.9
+revision=2
 build_style=gnu-makefile
+# yeah, it must be 0 to enable
+make_build_args="LIBUUID=0"
 make_install_args="SBINDIR=/usr/bin"
+make_install_target="install-spec"
+makedepends="libuuid-devel"
+depends="util-linux"
 short_desc="NVMe management command line interface"
 maintainer="Peter Froehlich <peter.hans.froehlich@gmail.com>"
 license="GPL-2.0-only"
 homepage="http://nvmexpress.org"
 distfiles="https://github.com/linux-nvme/nvme-cli/archive/v${version}.tar.gz"
-checksum=93b9134b7a4cc36c9444b9ee52ef016be6e3e2f2ece50fab1f4a56ebe1e3612b
+checksum=d7c3d56f36f81c0933f7b7c3f90c4196be0fec758affc8062c525b6bc5ea65f5
 
 CFLAGS="-Wno-error -I."
+
+# these files are touch'd by install, remove so they don't get registered
+# by the package (which would subsequently cause trouble during removal)
+post_install() {
+	rm -f "${PKGDESTDIR}/etc/nvme/hostnqn"
+	rm -f "${PKGDESTDIR}/etc/nvme/hostid"
+}
diff --git a/srcpkgs/oblibs/template b/srcpkgs/oblibs/template
index 3a8d8f8a0bb..5f73199e067 100644
--- a/srcpkgs/oblibs/template
+++ b/srcpkgs/oblibs/template
@@ -1,17 +1,17 @@
 # Template file for 'oblibs'
 pkgname=oblibs
-version=0.0.1.3
+version=0.0.2.1
 revision=1
 wrksrc="${pkgname}-v${version}"
 build_style=configure
 configure_args="--prefix=/usr --libdir=/usr/lib --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps"
-makedepends="skalibs-devel"
+makedepends="skalibs-devel execline-devel"
 short_desc="Obarun library"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="ISC"
 homepage="https://framagit.org/Obarun/oblibs"
 distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.bz2"
-checksum=eb6a745e7c2e636807c8a258c250be5a3ba084b95773c13d9ad64fe6c14f8232
+checksum=16e12024183c464ef6a5e05caa9121ebd08c02f3b83190890d0680e6c04e799c
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/obs/template b/srcpkgs/obs/template
index 16877f7e78e..3ed426b1583 100644
--- a/srcpkgs/obs/template
+++ b/srcpkgs/obs/template
@@ -1,6 +1,6 @@
 # Template file for 'obs'
 pkgname=obs
-version=23.2.1
+version=24.0.1
 revision=1
 _commit_hash_obs_browser="693498b518cf893876f454ef581e13106e8370ec"
 _commit_hash_obs_vst="fde438f7a8afdf41a7ab386a0aa1a61175fc8427"
@@ -23,7 +23,7 @@ distfiles="https://github.com/obsproject/obs-studio/archive/${version}.tar.gz
 https://github.com/obsproject/obs-browser/archive/${_commit_hash_obs_browser}.tar.gz>obs_browser.tgz
 https://github.com/obsproject/obs-vst/archive/${_commit_hash_obs_vst}.tar.gz>obs_vst.tgz
 https://github.com/Mixer/ftl-sdk/archive/${_commit_hash_ftl_sdk}.tar.gz>ftl_sdk.tgz"
-checksum="9e40d1b1552ea2e4f3aa079a8a867a1d94346069a0c199461af1cc90e5271760
+checksum="5c298328fd5e8f372091fd605ad7196da73fe981668ddb7add0a930857bbb6e9
  354c5775bba5f43c2d94ed3ca1777dbb7b686f7f7a943683996dbb3aac1037ac
  0e450202e6a90f56132de0415a3d4615e9807b799a3d1955e45b33df68535cec
  00bb0d9dfe9cccd865eea4ebbe77e3a1f4a138b4a18ab4efb25ec3cddb6d1fd1"
diff --git a/srcpkgs/ocaml-findlib/template b/srcpkgs/ocaml-findlib/template
index 519aa89bbab..c2f9d246dc2 100644
--- a/srcpkgs/ocaml-findlib/template
+++ b/srcpkgs/ocaml-findlib/template
@@ -1,7 +1,7 @@
 # Template file for 'ocaml-findlib'
 pkgname=ocaml-findlib
-version=1.7.3
-revision=5
+version=1.8.1
+revision=2
 build_style=configure
 configure_args="-config /etc/findlib.conf -sitelib /usr/lib/ocaml -mandir /usr/share/man"
 make_build_args="all opt"
@@ -10,8 +10,8 @@ short_desc="OCaml package manager"
 maintainer="John Regan <john@jrjrtech.com>"
 license="MIT"
 homepage="http://projects.camlcity.org/projects/findlib.html"
-distfiles="http://download2.camlcity.org/download/findlib-${version}.tar.gz"
-checksum=d196608fa23c36c2aace27d5ef124a815132a5fcea668d41fa7d6c1ca246bd8b
+distfiles="http://download.camlcity.org/download/findlib-${version}.tar.gz"
+checksum=8e85cfa57e8745715432df3116697c8f41cb24b5ec16d1d5acd25e0196d34303
 wrksrc="findlib-${version}"
 nocross=yes
 nopie=yes
@@ -21,4 +21,6 @@ do_install() {
 	make prefix="$DESTDIR" install
 	vbin src/findlib/ocamlfind_opt
 	vlicense LICENSE
+
+	rm ${DESTDIR}/usr/lib/ocaml/ocamlbuild/META
 }
diff --git a/srcpkgs/ocaml-lablgtk2/template b/srcpkgs/ocaml-lablgtk2/template
index bd235dd0823..2bede4f1ce6 100644
--- a/srcpkgs/ocaml-lablgtk2/template
+++ b/srcpkgs/ocaml-lablgtk2/template
@@ -1,7 +1,7 @@
 # Template file for 'ocaml-lablgtk2'
 pkgname=ocaml-lablgtk2
 version=2.18.8
-revision=1
+revision=2
 wrksrc="lablgtk-${version}"
 build_style=gnu-configure
 configure_args="--without-glade --without-gnomeui --without-gtksourceview"
diff --git a/srcpkgs/ocaml-num/template b/srcpkgs/ocaml-num/template
index bf5af4e7a68..c8aa7bbbb9e 100644
--- a/srcpkgs/ocaml-num/template
+++ b/srcpkgs/ocaml-num/template
@@ -1,7 +1,7 @@
 # Template file for 'ocaml-num'
 pkgname=ocaml-num
 version=1.2
-revision=2
+revision=3
 build_style=gnu-makefile
 makedepends="ocaml ocaml-findlib"
 make_install_target="findlib-install"
diff --git a/srcpkgs/ocaml/template b/srcpkgs/ocaml/template
index 7ac1c214310..c246404a01a 100644
--- a/srcpkgs/ocaml/template
+++ b/srcpkgs/ocaml/template
@@ -1,6 +1,6 @@
 # Template file for 'ocaml'
 pkgname=ocaml
-version=4.08.1
+version=4.09.0
 revision=1
 build_style="gnu-configure"
 configure_args="--with-pic"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="QPL-1.0, LGPL-2.1-only"
 homepage="http://ocaml.org/"
 distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
-checksum=b53ed3d487b83fd49bc181bded066ae8e6fb592cf40514261d27d36050d5db85
+checksum=a7bc044167e7d09f8e3ea84b88ec9d81392908ecdac861d3d5015e5f0fc496a3
 nocross=yes
 patch_args="-Np1"
 
diff --git a/srcpkgs/ocamlbuild/template b/srcpkgs/ocamlbuild/template
index bb7d2201edd..b5db3a6d844 100644
--- a/srcpkgs/ocamlbuild/template
+++ b/srcpkgs/ocamlbuild/template
@@ -1,7 +1,7 @@
 # Template file for 'ocamlbuild'
 pkgname=ocamlbuild
 version=0.14.0
-revision=2
+revision=3
 build_style=gnu-makefile
 make_build_args="PREFIX=/usr"
 make_install_args="PREFIX=/usr"
diff --git a/srcpkgs/occt/files/opencascade.sh b/srcpkgs/occt/files/opencascade.sh
new file mode 100644
index 00000000000..4d30d9ff1d6
--- /dev/null
+++ b/srcpkgs/occt/files/opencascade.sh
@@ -0,0 +1,24 @@
+export CASROOT=/usr
+
+export CSF_LANGUAGE=us
+export MMGT_CLEAR=1
+export CSF_EXCEPTION_PROMPT=1
+
+export CSF_OCCTResourcePath=$CASROOT/share/opencascade/resources
+export CSF_SHMessage=$CSF_OCCTResourcePath/SHMessage
+export CSF_MDTVTexturesDirectory=$CSF_OCCTResourcePath/Textures
+export CSF_ShadersDirectory=$CSF_OCCTResourcePath/Shaders
+export CSF_XSMessage=$CSF_OCCTResourcePath/XSMessage
+export CSF_TObjMessage=$CSF_OCCTResourcePath/TObj
+export CSF_StandardDefaults=$CSF_OCCTResourcePath/StdResource
+export CSF_PluginDefaults=$CSF_OCCTResourcePath/StdResource
+export CSF_XCAFDefaults=$CSF_OCCTResourcePath/StdResource
+export CSF_TObjDefaults=$CSF_OCCTResourcePath/StdResource
+export CSF_StandardLiteDefaults=$CSF_OCCTResourcePath/StdResource
+export CSF_IGESDefaults=$CSF_OCCTResourcePath/XSTEPResource
+export CSF_STEPDefaults=$CSF_OCCTResourcePath/XSTEPResource
+export CSF_XmlOcafResource=$CSF_OCCTResourcePath/XmlOcafResource
+export CSF_MIGRATION_TYPES=$CSF_OCCTResourcePath/StdResource/MigrationSheet.txt
+export CSF_DrawPluginDefaults=$CSF_OCCTResourcePath/DrawResources
+export DRAWHOME=$CSF_OCCTResourcePath/DrawResources
+export DRAWDEFAULT=$CSF_OCCTResourcePath/DrawResources/DrawDefault
diff --git a/srcpkgs/occt/patches/musl-fenv.patch b/srcpkgs/occt/patches/musl-fenv.patch
index 4a2e880db4f..c4fd770646d 100644
--- a/srcpkgs/occt/patches/musl-fenv.patch
+++ b/srcpkgs/occt/patches/musl-fenv.patch
@@ -7,7 +7,7 @@ non-posix functions fegetexcept(3) and feenableexcept(3).
 
 --- src/OSD/OSD_signal.cxx.orig
 +++ src/OSD/OSD_signal.cxx
-@@ -645,7 +645,7 @@
+@@ -703,7 +703,7 @@
  
  #include <signal.h>
  
@@ -16,40 +16,21 @@ non-posix functions fegetexcept(3) and feenableexcept(3).
    #include <sys/signal.h>
  #endif
  
-@@ -687,7 +687,7 @@
-   // cout << "OSD::Handler: signal " << (int) theSignal << " occured inside a try block " <<  endl ;
-   if ( ADR_ACT_SIGIO_HANDLER != NULL )
-     (*ADR_ACT_SIGIO_HANDLER)() ;
--#ifdef __linux__
-+#if defined(__linux__) && defined(__GLIBC__)
-   if (fFltExceptions)
-     feenableexcept (FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW);
-     //feenableexcept (FE_INVALID | FE_DIVBYZERO);
-@@ -805,7 +805,7 @@
-   (void)theSignal; // silence GCC warnings
-   (void)theContext;
- 
--#ifdef __linux__
-+#if defined(__linux__) && defined(__GLIBC__)
-   if (fFltExceptions)
-     feenableexcept (FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW);
-     //feenableexcept (FE_INVALID | FE_DIVBYZERO);
-@@ -892,14 +892,18 @@
- #endif
-     }
- #elif defined (__linux__)
-+#if defined(__GLIBC__)
-     feenableexcept (FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW);
-+#endif
-     fFltExceptions = Standard_True;
- #endif
-   }
-   else
+@@ -914,7 +914,7 @@
+ //=======================================================================
+ void OSD::SetFloatingSignal (Standard_Boolean theFloatingSignal)
+ {
+-#if defined (__linux__)
++#if defined (__linux__) && defined(__GLIBC__)
+   feclearexcept (FE_ALL_EXCEPT);
+   if (theFloatingSignal)
    {
- #if defined (__linux__)
-+#if defined(__GLIBC__)
-     fedisableexcept (FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW);
-+#endif
-     fFltExceptions = Standard_False;
- #endif
-   }
+@@ -947,7 +947,7 @@
+ //=======================================================================
+ Standard_Boolean OSD::ToCatchFloatingSignals()
+ {
+-#if defined (__linux__)
++#if defined (__linux__) && defined(__GLIBC__)
+   return (fegetexcept() & _OSD_FPX) != 0;
+ #else
+   return Standard_False;
diff --git a/srcpkgs/occt/template b/srcpkgs/occt/template
index 70647369464..3b131d74512 100644
--- a/srcpkgs/occt/template
+++ b/srcpkgs/occt/template
@@ -1,6 +1,6 @@
 # Template file for 'occt'
 pkgname=occt
-version=7.3.0p3
+version=7.4.0
 revision=1
 _gittag="V${version//./_}"
 wrksrc=occt-${_gittag}
@@ -13,16 +13,19 @@ short_desc="OpenCASCADE Technology - library for CAD/CAM/CAE applications"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="LGPL-2.1-only"
 homepage="https://www.opencascade.com"
-# distifile: use git instead of official tarball that requires registration
+# distfile: use git instead of official tarball, which requires registration
 # see https://www.opencascade.com/content/packaging-again-debian
 distfiles="https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/tags/${_gittag};sf=tgz>occt-${_gittag}.tar.gz"
-checksum=fbd46db3e75313131b88a606024ea4d4496c3c7f6e68c23988e9d3e673d4f21b
+checksum=655da7717dac3460a22a6a7ee68860c1da56da2fec9c380d8ac0ac0349d67676
 conflicts="oce>=0"
 
 post_install() {
 	rm ${PKGDESTDIR}/usr/share/doc/opencascade/*_LGPL_*.txt
 	vlicense OCCT_LGPL_EXCEPTION.txt
 	rm ${DESTDIR}/usr/bin/custom*.sh
+
+	vmkdir /etc/profile.d
+	vinstall ${FILESDIR}/opencascade.sh 644 /etc/profile.d
 }
 
 occt-devel_package() {
diff --git a/srcpkgs/offlineimap/template b/srcpkgs/offlineimap/template
index cdbeb81a3ed..b58c5fa5bd9 100644
--- a/srcpkgs/offlineimap/template
+++ b/srcpkgs/offlineimap/template
@@ -1,19 +1,19 @@
 # Template file for 'offlineimap'
 pkgname=offlineimap
-version=7.2.4
+version=7.3.0
 revision=1
 archs=noarch
 build_style=python2-module
 pycompile_module="offlineimap"
-hostmakedepends="python-six asciidoc"
-depends="python-six"
+hostmakedepends="python-six python-rfc6555 asciidoc"
+depends="python-six python-rfc6555"
 short_desc="Powerful IMAP/Maildir synchronization and reader support"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Peter Bui <pbui@github.bx612.space>"
 license="GPL-2.0-or-later"
 homepage="http://offlineimap.org/"
 changelog="https://raw.githubusercontent.com/OfflineIMAP/offlineimap/master/Changelog.md"
 distfiles="https://github.com/OfflineIMAP/offlineimap/archive/v${version}.tar.gz"
-checksum=5b6590c82cd5f6cbfe09e89ce52622208f5d4b24e021fce7646204b417bd1d2e
+checksum=d8378e82e392c70f5c20cb08705687da30cd427f2bca539939311512777e6659
 
 post_install() {
 	make -C docs man
diff --git a/srcpkgs/ofono/template b/srcpkgs/ofono/template
index c218c991b45..379bc9f981a 100644
--- a/srcpkgs/ofono/template
+++ b/srcpkgs/ofono/template
@@ -1,18 +1,18 @@
 # Template file for 'ofono'
 pkgname=ofono
-version=1.28
+version=1.30
 revision=1
 build_style=gnu-configure
-configure_args="--disable-bluez4"
+configure_args="--disable-bluez4 --enable-external-ell"
 conf_files="/etc/ofono/phonesim.conf /etc/dbus-1/system.d/ofono.conf"
 hostmakedepends="pkg-config"
-makedepends="libglib-devel eudev-libudev-devel mobile-broadband-provider-info"
+makedepends="libglib-devel eudev-libudev-devel mobile-broadband-provider-info ell-devel"
 short_desc="Infrastructure for building mobile telephony (GMS/UTMS) applications"
 maintainer="Daniel Santana <daniel@santana.tech>"
 license="GPL-2.0-or-later"
 homepage="https://01.org/ofono"
 distfiles="${KERNEL_SITE}/network/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=93bb2cedef54f897dd5200e22b072a6e38b5d9b44be57eebbbe8d513f0beb0e4
+checksum=8079735efc5d7f33be9e792e791f2f7ff75c31ce67d477b994673e32319eec5c
 
 post_install() {
 	vsv ofonod
diff --git a/srcpkgs/ok.sh/template b/srcpkgs/ok.sh/template
index b7b908195cf..627b49f51a4 100644
--- a/srcpkgs/ok.sh/template
+++ b/srcpkgs/ok.sh/template
@@ -5,7 +5,7 @@ revision=1
 depends="curl jq"
 checkdepends="socat ${depends}"
 short_desc="GitHub API client library written in POSIX sh"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/whiteinge/ok.sh"
 distfiles="https://github.com/whiteinge/ok.sh/archive/${version}.tar.gz"
diff --git a/srcpkgs/okular/template b/srcpkgs/okular/template
index cf9991781dc..f4de8263755 100644
--- a/srcpkgs/okular/template
+++ b/srcpkgs/okular/template
@@ -1,6 +1,6 @@
 # Template file for 'okular'
 pkgname=okular
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config kcoreaddons"
@@ -14,7 +14,7 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-only"
 homepage="https://www.kde.org/applications/graphics/okular/"
 distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=721a0d02d5ff9277c4a9a13dbde0ede3528eff848622e83abc36d57d9759b3ec
+checksum=ff3d2eac444a110a611add71c30b0556085f5aaccdd821a80bd070a646c9f6b3
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-qmake qt5-host-tools kdoctools kconfig"
diff --git a/srcpkgs/olive/template b/srcpkgs/olive/template
index 0a93dbbc59a..afde6b92a34 100644
--- a/srcpkgs/olive/template
+++ b/srcpkgs/olive/template
@@ -1,6 +1,6 @@
 # Template file for 'olive'
 pkgname=olive
-version=0.1.0
+version=0.1.1
 revision=1
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-multimedia-devel qt5-svg-devel pkg-config"
@@ -10,7 +10,7 @@ maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.olivevideoeditor.org"
 distfiles="https://github.com/olive-editor/olive/archive/${version}.tar.gz"
-checksum=099fc37fd9ae0cf272a86d0fb56ede154b0b76779690631cd256339a0a440244
+checksum=0df1b596d48d8b9d9fa3f5d0055000ef3b1ac2f12ce18fdedeb54b3c0e882a89
 
 do_install() {
 	vbin olive-editor
diff --git a/srcpkgs/olm-python/template b/srcpkgs/olm-python/template
index cdb021a5652..57ac1cfa01b 100644
--- a/srcpkgs/olm-python/template
+++ b/srcpkgs/olm-python/template
@@ -1,6 +1,6 @@
 # Template file for 'olm-python'
 pkgname=olm-python
-version=3.1.3
+version=3.1.4
 revision=1
 wrksrc="olm-${version}"
 build_wrksrc=python
@@ -14,7 +14,7 @@ maintainer="Adam Beckmeyer <adam_gpg@thebeckmeyers.xyz>"
 license="Apache-2.0"
 homepage="https://gitlab.matrix.org/matrix-org/olm"
 distfiles="https://gitlab.matrix.org/matrix-org/olm/-/archive/${version}/olm-${version}.tar.bz2"
-checksum=ed898604eb8ba61b470ce492c0a21994100484e4b6e3e78fb589b16042cb1d13
+checksum=eff513cff8e5c7af657e800a2c2dbbdee5be19ee9ce24c5498a2528c4b5f1dc3
 
 pre_build() {
 	make include/olm/olm.h
diff --git a/srcpkgs/olm/template b/srcpkgs/olm/template
index 86bdaf2f767..c4d8e41b5a8 100644
--- a/srcpkgs/olm/template
+++ b/srcpkgs/olm/template
@@ -1,6 +1,6 @@
 # Template file for 'olm'
 pkgname=olm
-version=3.1.3
+version=3.1.4
 revision=1
 build_style=cmake
 short_desc="Implementation of the Double Ratchet cryptographic ratchet"
@@ -8,7 +8,7 @@ maintainer="Adam Beckmeyer <adam_gpg@thebeckmeyers.xyz>"
 license="Apache-2.0"
 homepage="https://gitlab.matrix.org/matrix-org/olm"
 distfiles="https://gitlab.matrix.org/matrix-org/olm/-/archive/${version}/olm-${version}.tar.bz2"
-checksum=ed898604eb8ba61b470ce492c0a21994100484e4b6e3e78fb589b16042cb1d13
+checksum=eff513cff8e5c7af657e800a2c2dbbdee5be19ee9ce24c5498a2528c4b5f1dc3
 
 do_check() {
 	cd build/tests
diff --git a/srcpkgs/onionshare/template b/srcpkgs/onionshare/template
index 1eb1272c56a..c585ae6101e 100644
--- a/srcpkgs/onionshare/template
+++ b/srcpkgs/onionshare/template
@@ -1,6 +1,6 @@
 # Template file for 'onionshare'
 pkgname=onionshare
-version=2.1
+version=2.2
 revision=1
 archs=noarch
 build_style=python3-module
@@ -12,13 +12,14 @@ depends="python3-cffi python3-chardet python3-click python3-cryptography
  python3-Jinja2 python3-MarkupSafe python3-pycparser python3-pycryptodome
  python3-PyQt5 python3-pysocks python3-requests python3-six python3-stem
  python3-urllib3 python3-Werkzeug python3-asn1crypto python3-altgraph
- python3-sip-PyQt5 python3-macholib python3-pefile python3-simplejson tor"
+ python3-sip-PyQt5 python3-macholib python3-pefile python3-simplejson tor
+ python3-Flask-HTTPAuth"
 short_desc="Share files anonymously and securely"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://onionshare.org/"
 distfiles="https://github.com/micahflee/onionshare/archive/v${version}.tar.gz"
-checksum=b412bc1e9d08deaa2805cfc9532b556928fa7b332d249189fb0887f27d587ddb
+checksum=7173863d7582b05aa8fd0d2207236e3cbbb38d854aad65e3b98ec5baad521fc2
 
 conf_files="/etc/apparmor.d/local/*"
 
diff --git a/srcpkgs/opam/template b/srcpkgs/opam/template
index efb8f38140b..110a00f4b73 100644
--- a/srcpkgs/opam/template
+++ b/srcpkgs/opam/template
@@ -1,7 +1,7 @@
 # Template file for 'opam'
 pkgname=opam
 version=2.0.5
-revision=1
+revision=2
 build_style=gnu-configure
 disable_parallel_build=yes
 configure_args="--docdir=/usr/share/doc/${pkgname}"
diff --git a/srcpkgs/open-iscsi/patches/ether.patch b/srcpkgs/open-iscsi/patches/ether.patch
deleted file mode 100644
index 03dcacc750f..00000000000
--- a/srcpkgs/open-iscsi/patches/ether.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- iscsiuio/src/unix/libs/qedi.c.orig
-+++ iscsiuio/src/unix/libs/qedi.c
-@@ -46,6 +46,7 @@
- #include <errno.h>
- #include <stdio.h>
- #include <string.h>
-+#include <netinet/if_ether.h>
- #include <arpa/inet.h>
- #include <linux/types.h>
- #include <linux/sockios.h>
diff --git a/srcpkgs/open-iscsi/patches/fix-musl-2.patch b/srcpkgs/open-iscsi/patches/fix-musl-2.patch
deleted file mode 100644
index 9841ed9ed9d..00000000000
--- a/srcpkgs/open-iscsi/patches/fix-musl-2.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- libopeniscsiusr/iface.c.orig	2018-01-25 05:03:12.126607300 +0100
-+++ libopeniscsiusr/iface.c	2018-01-25 05:03:24.741754982 +0100
-@@ -30,6 +30,7 @@
- #include <netdb.h>
- #include <assert.h>
- #include <inttypes.h>
-+#include <limits.h>
- 
- #include "libopeniscsiusr/libopeniscsiusr.h"
- #include "misc.h"
diff --git a/srcpkgs/open-iscsi/template b/srcpkgs/open-iscsi/template
index 0482757e1ca..154551e561a 100644
--- a/srcpkgs/open-iscsi/template
+++ b/srcpkgs/open-iscsi/template
@@ -1,17 +1,17 @@
 # Template file for 'open-iscsi'
 pkgname=open-iscsi
-version=2.0.876
+version=2.0.878
 revision=2
 conf_files="/etc/iscsi/iscsid.conf /etc/iscsi/initiatorname.iscsi"
 build_style=gnu-configure
-hostmakedepends="automake libtool"
-makedepends="libisns-devel libmount-devel libressl-devel"
+hostmakedepends="automake libtool pkg-config"
+makedepends="libisns-devel libkmod-devel libmount-devel libressl-devel"
 short_desc="Open-iSCSI userland tools"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://www.open-iscsi.com/"
 distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
-checksum=9f01327d5e100ed794dc5083fc18dc4a06a0c29c77b252e21abd1b8f56edd9a7
+checksum=5aeef0069c4a9d7f288269bcf56588d09a3c529a35f865f16dd8119ab8672208
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) CFLAGS+="-D_LINUX_IF_ETHER_H";;
@@ -20,15 +20,17 @@ post_extract() {
 	sed -i '1i#include <fcntl.h>' usr/idbm.c
 	sed -i 's/(__compar_fn_t)//' utils/fwparam_ibft/fwparam_ppc.c
 	sed -i '/CC.*-o/s/$/ $(LDFLAGS)/' utils/Makefile usr/Makefile
-	sed -i 's,<linux/if_ether.h>,<netinet/if_ether.h>,g' usr/iscsi_net_util.c
-	sed -i '1i#include <netinet/if_ether.h>' iscsiuio/src/unix/libs/bnx2x.c
 	sed -i 's/lib64/lib/g' libopeniscsiusr/Makefile
+	sed -i 's,<linux/if_ether.h>,<netinet/if_ether.h>,g' usr/iscsi_net_util.c
+	sed -i '1i#include <netinet/if_ether.h>' iscsiuio/src/unix/libs/bnx2x.c libopeniscsiusr/misc.c
 }
 do_configure() {
-	( cd iscsiuio && autoreconf -fi && ./configure ${configure_args} )
+	( cd iscsiuio && autoreconf -fi && ./configure ${configure_args} CFLAGS="-DNO_SYSTEMD" )
 }
 do_build() {
-	make ${makejobs} CC="$CC" OPTFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
+	make ${makejobs} CC="$CC" \
+		OPTFLAGS="$CFLAGS $(pkg-config --cflags libkmod) -DNO_SYSTEMD" \
+		LDFLAGS="$LDFLAGS $(pkg-config --libs libkmod)" NO_SYSTEMD=1
 }
 do_install() {
 	make install exec_prefix=/usr sbindir=/usr/bin DESTDIR="$DESTDIR"
diff --git a/srcpkgs/open-vm-tools/patches/gcc9.patch b/srcpkgs/open-vm-tools/patches/gcc9.patch
deleted file mode 100644
index 346c8187d61..00000000000
--- a/srcpkgs/open-vm-tools/patches/gcc9.patch
+++ /dev/null
@@ -1,103 +0,0 @@
---- hgfsmounter/hgfsmounter.c
-+++ hgfsmounter/hgfsmounter.c
-@@ -1,5 +1,5 @@
- /*********************************************************
-- * Copyright (C) 2006-2017 VMware, Inc. All rights reserved.
-+ * Copyright (C) 2006-2019 VMware, Inc. All rights reserved.
-  *
-  * This program is free software; you can redistribute it and/or
-  * modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published
-@@ -514,11 +514,13 @@ ParseFmask(const char *option,         // IN:
-option string along with value
-            HgfsMountInfo *mountInfo,   // OUT: mount data
-            int *flags)                 // OUT: mount flags
- {
-+   unsigned short fmask = 0;
-    ASSERT(option);
-    ASSERT(mountInfo);
- 
--   if (ParseMask(option, &mountInfo->fmask)) {
--      LOG("Setting mount fmask to %o\n", mountInfo->fmask);
-+   if (ParseMask(option, &fmask)) {
-+      LOG("Setting mount fmask to %o\n", fmask);
-+      mountInfo->fmask = fmask;
-       return TRUE;
-    }
- 
-@@ -548,11 +550,13 @@ ParseDmask(const char *option,         // IN:
-option string along with value
-            HgfsMountInfo *mountInfo,   // OUT: mount data
-            int *flags)                 // OUT: mount flags
- {
-+   unsigned short dmask = 0;
-    ASSERT(option);
-    ASSERT(mountInfo);
- 
--   if (ParseMask(option, &mountInfo->dmask)) {
--      LOG("Setting mount dmask to %o\n", mountInfo->dmask);
-+   if (ParseMask(option, &dmask)) {
-+      LOG("Setting mount dmask to %o\n", dmask);
-+      mountInfo->dmask = dmask;
-       return TRUE;
-    }
---- lib/hgfsServer/hgfsServer.c
-+++ lib/hgfsServer/hgfsServer.c
-@@ -1,5 +1,5 @@
- /*********************************************************
-- * Copyright (C) 1998-2018 VMware, Inc. All rights reserved.
-+ * Copyright (C) 1998-2019 VMware, Inc. All rights reserved.
-  *
-  * This program is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as published
-@@ -6536,11 +6536,13 @@ HgfsServerRead(HgfsInputParam *input)  // IN: Input params
-             payload = &reply->payload[0];
-          }
-          if (payload) {
-+            uint32 actualSize = 0;
-             status = HgfsPlatformReadFile(readFd, input->session, offset,
-                                           requiredSize, payload,
--                                          &reply->actualSize);
-+                                          &actualSize);
-             if (HGFS_ERROR_SUCCESS == status) {
-                reply->reserved = 0;
-+               reply->actualSize = actualSize;
-                replyPayloadSize = sizeof *reply;
- 
-                if (readUseDataBuffer) {
-@@ -6556,11 +6558,13 @@ HgfsServerRead(HgfsInputParam *input)  // IN: Input params
-          break;
-       }
-    case HGFS_OP_READ: {
-+         uint32 actualSize = 0;
-          HgfsReplyRead *reply = replyRead;
- 
-          status = HgfsPlatformReadFile(readFd, input->session, offset, requiredSize,
--                                       reply->payload, &reply->actualSize);
-+                                       reply->payload, &actualSize);
-          if (HGFS_ERROR_SUCCESS == status) {
-+            reply->actualSize = actualSize;
-             replyPayloadSize = sizeof *reply + reply->actualSize;
-          } else {
-             LOG(4, ("%s: V1 Failed to read-> %d.\n", __FUNCTION__, status));
---- lib/misc/util_misc.c
-+++ lib/misc/util_misc.c
-@@ -1,5 +1,5 @@
- /*********************************************************
-- * Copyright (C) 1998-2018 VMware, Inc. All rights reserved.
-+ * Copyright (C) 1998-2019 VMware, Inc. All rights reserved.
-  *
-  * This program is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as published
-@@ -719,8 +719,8 @@ Util_ExpandString(const char *fileName) // IN  file path to expand
-       ASSERT(!freeChunk[i]);
-       chunks[i] = expand;
-       if (chunks[i] == NULL) {
--	 Log("%s: Cannot allocate memory to expand \"%s\" in \"%s\".\n",
--             __FUNCTION__, expand, fileName);
-+	 Log("%s: Cannot allocate memory to expand $ in \"%s\".\n",
-+             __FUNCTION__, fileName);
- 	 goto out;
-       }
-       chunkSize[i] = strlen(expand);
diff --git a/srcpkgs/open-vm-tools/template b/srcpkgs/open-vm-tools/template
index 7d471b68a32..586d7b30879 100644
--- a/srcpkgs/open-vm-tools/template
+++ b/srcpkgs/open-vm-tools/template
@@ -1,32 +1,29 @@
 # Template file for 'open-vm-tools'
 pkgname=open-vm-tools
-version=10.3.10
-revision=3
-_build=12406962
+version=11.0.0
+revision=1
+_build=14549434
+archs="x86_64 i686"
 wrksrc="open-vm-tools-${version}-${_build}"
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --with-udev-rules-dir=/usr/lib/udev/rules.d
  --without-xmlsecurity --without-kernel-modules
  $(vopt_with x11 x) $(vopt_with pam)"
-hostmakedepends="automake libtool pkg-config"
+hostmakedepends="automake libtool pkg-config glib-devel"
 makedepends="fuse-devel glib-devel icu-devel libdnet-devel libmspack-devel
  libressl-devel libxerces-c-devel procps-ng-devel $(vopt_if pam 'pam-devel')
  $(vopt_if x11 'gtkmm-devel libXtst-devel xmlsec1-devel')"
 short_desc="Open source implementation of VMware Tools"
-maintainer="Carson Page <pagem.carson@gmail.com>"
+maintainer="Piraty <piraty1@inbox.ru>"
 license="GPL-2.0-only, LGPL-2.1-only"
 homepage="https://github.com/vmware/open-vm-tools"
+changelog="https://github.com/vmware/open-vm-tools/blob/master/open-vm-tools/ChangeLog"
 distfiles="https://github.com/vmware/open-vm-tools/releases/download/stable-${version}/open-vm-tools-${version}-${_build}.tar.gz"
-checksum=a3c02595c802680be258d6249513c76502d383a59597079b10984bb9136dbef5
+checksum=b95141b0eb8a46094f905c29b969ad7ee63997194df168c82e35389bb1cebc7b
 
 build_options="pam x11"
 build_options_default="pam x11"
 
-case "$XBPS_TARGET_MACHINE" in
-	*-musl) broken="Musl requires addl. patches";;
-	"arm"*|"aarch"*) broken=yes;;
-esac
-
 pre_configure() {
 	autoreconf -vfi
 }
@@ -45,4 +42,3 @@ post_install() {
 	# Install service
 	vsv vmtoolsd
 }
-
diff --git a/srcpkgs/openbsd-netcat/template b/srcpkgs/openbsd-netcat/template
index f130bc41665..ff03a91e538 100644
--- a/srcpkgs/openbsd-netcat/template
+++ b/srcpkgs/openbsd-netcat/template
@@ -1,19 +1,19 @@
 # Template file for 'openbsd-netcat'
 pkgname=openbsd-netcat
 version=1.203
-revision=1
+revision=2
 wrksrc="netcat-openbsd-${version%p*}"
 hostmakedepends="pkg-config"
 makedepends="libbsd-devel"
 short_desc="TCP/IP swiss army knife (OpenBSD/Debian variant)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="3-clause-BSD,2-clause-BSD"
+license="BSD-2-Clause,BSD-3-Clause"
 homepage="http://packages.debian.org/sid/netcat-openbsd"
 distfiles="
  ${DEBIAN_SITE}/main/n/netcat-openbsd/netcat-openbsd_${version%p*}.orig.tar.gz
- ${DEBIAN_SITE}/main/n/netcat-openbsd/netcat-openbsd_${version}-1.debian.tar.xz"
+ ${DEBIAN_SITE}/main/n/netcat-openbsd/netcat-openbsd_${version}-2.debian.tar.xz"
 checksum="b025399f1588da78108290a721157be66871b096bc9c3973ebdc8d773f750a3f
- 704a235862f50c550dba40820f523620bc943f8dc8e056a554032d23cd1356f9"
+ a90ef4278f773f9de44364c13cf195f5db2447dd5e3bcf137a7d1250b92455db"
 
 alternatives="
  nc:nc:/usr/bin/openbsd-nc
diff --git a/srcpkgs/openconnect/template b/srcpkgs/openconnect/template
index b576efb41a2..4d16fab5249 100644
--- a/srcpkgs/openconnect/template
+++ b/srcpkgs/openconnect/template
@@ -1,6 +1,6 @@
 # Template file for 'openconnect'
 pkgname=openconnect
-version=8.04
+version=8.05
 revision=1
 build_style=gnu-configure
 configure_args="--with-vpnc-script=/usr/libexec/vpnc-scripts/vpnc-script"
@@ -13,7 +13,7 @@ maintainer="Eivind Uggedal <eivind@uggedal.com>"
 license="LGPL-2.1-only"
 homepage="http://www.infradead.org/openconnect/"
 distfiles="ftp://ftp.infradead.org/pub/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=98979c6e3f78b294dc663e3fd75d5c9e9d779f247be9d4e3ab84b5e90565f81f
+checksum=335c2952d0cb36822acb112eaaf5e3b4acffc6874985fb614fec0b76c4c12992
 
 openconnect-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/opendkim/files/opendkim/run b/srcpkgs/opendkim/files/opendkim/run
new file mode 100644
index 00000000000..644eaac43a8
--- /dev/null
+++ b/srcpkgs/opendkim/files/opendkim/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+[ -r ./conf ] && . ./conf
+exec opendkim -f ${OPTS}
diff --git a/srcpkgs/opendkim/template b/srcpkgs/opendkim/template
index 98f7cd5bcce..a4a20b82939 100644
--- a/srcpkgs/opendkim/template
+++ b/srcpkgs/opendkim/template
@@ -1,14 +1,14 @@
 # Template file for 'opendkim'
 pkgname=opendkim
 version=2.10.3
-revision=9
+revision=10
 build_style=gnu-configure
 configure_args="--with-milter=${XBPS_CROSS_BASE}/usr"
-makedepends="libbsd-devel libressl-devel libmilter-devel"
 hostmakedepends="pkg-config"
+makedepends="libbsd-devel libressl-devel libmilter-devel"
 short_desc="DKIM library"
 maintainer="John Regan <john@jrjrtech.com>"
-license="BSD, Sendmail"
+license="BSD-3-Clause, Sendmail"
 homepage="http://www.opendkim.org"
 distfiles="${SOURCEFORGE_SITE}/project/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=43a0ba57bf942095fe159d0748d8933c6b1dd1117caf0273fa9a0003215e681b
@@ -16,6 +16,7 @@ checksum=43a0ba57bf942095fe159d0748d8933c6b1dd1117caf0273fa9a0003215e681b
 post_install() {
 	vlicense LICENSE
 	vlicense LICENSE.Sendmail
+	vsv opendkim
 }
 
 opendkim-devel_package() {
diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index c6b49047f19..045c70586a3 100644
--- a/srcpkgs/openldap/template
+++ b/srcpkgs/openldap/template
@@ -1,7 +1,7 @@
 # Template file for 'openldap'
 pkgname=openldap
 version=2.4.48
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--prefix=/usr
  --libexecdir=/usr/libexec
@@ -40,6 +40,7 @@ post_install() {
 	chmod 755 ${DESTDIR}/usr/lib/*.so.*
 	vmkdir usr/share/examples/openldap
 	mv ${DESTDIR}/etc/openldap/*.{example,default} ${DESTDIR}/usr/share/examples/openldap
+	chmod 0644 ${DESTDIR}/usr/share/examples/openldap/*
 }
 
 
diff --git a/srcpkgs/openmw/template b/srcpkgs/openmw/template
index aa1360ebd25..d5e28d625bc 100644
--- a/srcpkgs/openmw/template
+++ b/srcpkgs/openmw/template
@@ -16,8 +16,11 @@ changelog="https://openmw.org/2018/openmw-0-44-0-released/"
 distfiles="https://gitlab.com/OpenMW/openmw/-/archive/openmw-${version}/openmw-openmw-${version}.tar.gz"
 checksum=b63cf971f406ef5f28019f65e9e2bd9641a227459ede45d147562917f67e1c64
 
+if [ "$XBPS_TARGET_ENDIAN" != "le" ]; then
+	broken="https://gitlab.com/OpenMW/openmw/issues/564"
+fi
+
 case "${XBPS_TARGET_MACHINE}" in
-	mips | mips-musl ) broken="https://bugs.openmw.org/issues/564" ;;
 	arm*) broken="https://travis-ci.org/Johnnynator/void-packages/jobs/308902351" ;;
 esac
 
diff --git a/srcpkgs/openresolv/template b/srcpkgs/openresolv/template
index b7a22cc0cd8..efaffce0645 100644
--- a/srcpkgs/openresolv/template
+++ b/srcpkgs/openresolv/template
@@ -1,6 +1,6 @@
 # Template file for 'openresolv'
 pkgname=openresolv
-version=3.9.1
+version=3.9.2
 revision=1
 archs=noarch
 build_style=gnu-configure
@@ -11,5 +11,5 @@ conf_files="/etc/resolvconf.conf"
 hostmakedepends="runit"
 homepage="http://roy.marples.name/projects/openresolv/home"
 distfiles="http://roy.aydogan.net/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=38b8e7e131a39b1c0d4e5688618b8572adf92a5bf757ae9f272e9f81108a9ff2
+checksum=14d7e241682e5566f6b8bf4c7316c86d7a9b8e7ed48e1de4967dbf1ea84ed373
 configure_args="--bindir=/usr/bin"
diff --git a/srcpkgs/openssh/patches/setproctitle.patch b/srcpkgs/openssh/patches/setproctitle.patch
deleted file mode 100644
index dc40c330720..00000000000
--- a/srcpkgs/openssh/patches/setproctitle.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- openbsd-compat/setproctitle.c.orig
-+++ openbsd-compat/setproctitle.c
-@@ -36,6 +36,7 @@
- #ifndef HAVE_SETPROCTITLE
- 
- #include <stdarg.h>
-+#include <stdio.h>
- #include <stdlib.h>
- #include <unistd.h>
- #ifdef HAVE_SYS_PSTAT_H
diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 447973d0c7e..5dc97b69ca4 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,7 +1,7 @@
 # Template file for 'openssh'
 pkgname=openssh
-version=8.0p1
-revision=3
+version=8.1p1
+revision=1
 build_style=gnu-configure
 configure_args="--datadir=/usr/share/openssh
  --sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody
@@ -22,7 +22,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-2-Clause, ISC"
 homepage="https://www.openssh.com"
 distfiles="https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${version}.tar.gz"
-checksum=bd943879e69498e8031eb6b7f44d08cdc37d59a7ab689aa0b437320c3481fd68
+checksum=02f5dbef3835d0753556f973cd57b4c19b6b1f6cd24c03445e23ac77ca1b93ff
 conf_files="/etc/ssh/moduli /etc/ssh/ssh_config /etc/ssh/sshd_config /etc/pam.d/sshd"
 make_dirs="/var/chroot/ssh 0755 root root"
 
@@ -44,6 +44,7 @@ esac
 
 pre_configure() {
 	autoreconf -fi
+	vsed -i -e 's|#include <sys/sysctl.h>||' servconf.c
 }
 
 post_install() {
diff --git a/srcpkgs/opentmpfiles/template b/srcpkgs/opentmpfiles/template
index ffeb886cdb2..66e3bd34f2f 100644
--- a/srcpkgs/opentmpfiles/template
+++ b/srcpkgs/opentmpfiles/template
@@ -5,7 +5,7 @@ revision=1
 archs=noarch
 build_style=gnu-makefile
 short_desc="A standalone utility for handling systemd-style tmpfiles.d settings"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/OpenRC/opentmpfiles"
 distfiles="https://github.com/OpenRC/opentmpfiles/archive/${version}.tar.gz"
diff --git a/srcpkgs/openttd/template b/srcpkgs/openttd/template
index edc25e4c58f..71439c6a741 100644
--- a/srcpkgs/openttd/template
+++ b/srcpkgs/openttd/template
@@ -1,7 +1,7 @@
 # Template file for 'openttd'
 pkgname=openttd
-version=1.9.2
-revision=2
+version=1.9.3
+revision=1
 _gfxver=0.5.5
 _sfxver=0.2.3
 build_style=gnu-configure
@@ -16,7 +16,7 @@ homepage="https://www.openttd.org/"
 distfiles="https://proxy.binaries.openttd.org/openttd-releases/${version}/openttd-${version}-source.tar.xz
  https://bundles.openttdcoop.org/opengfx/releases/${_gfxver}/opengfx-${_gfxver}.zip
  https://bundles.openttdcoop.org/opensfx/releases/${_sfxver}/opensfx-${_sfxver}.zip"
-checksum="f9ff8c255145a1dd617798a9413179cc740a0cc91709455990880a15eeb7564a
+checksum="1988e17f5b6f4b8f423c849ef1c579c21f678722ae4440f87b27a5fea6385846
  c648d56c41641f04e48873d83f13f089135909cc55342a91ed27c5c1683f0dfe
  3574745ac0c138bae53b56972591db8d778ad9faffd51deae37a48a563e71662"
 
diff --git a/srcpkgs/opera/template b/srcpkgs/opera/template
index c17766d5a6e..4d75fa7a473 100644
--- a/srcpkgs/opera/template
+++ b/srcpkgs/opera/template
@@ -1,6 +1,6 @@
 # Template file for 'opera'
 pkgname=opera
-version=62.0.3331.99
+version=64.0.3417.54
 revision=1
 archs="x86_64"
 depends="ffmpeg desktop-file-utils hicolor-icon-theme"
@@ -9,7 +9,7 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="custom:Proprietary"
 homepage="https://www.opera.com/computer"
 distfiles="http://get.geo.opera.com/pub/opera/desktop/${version}/linux/${pkgname}-stable_${version}_amd64.deb"
-checksum=29a11c820eb97ce71f6ab42fac02e556bb38e532556116bd76685fbf77d2eadf
+checksum=bc6974261b73a6a318a35f2d4b28dbc7ddec6dda171517a744c16a5a824c1341
 repository="nonfree"
 nostrip=yes
 
diff --git a/srcpkgs/opus/template b/srcpkgs/opus/template
index d1d538df3b2..244dbdbb9d5 100644
--- a/srcpkgs/opus/template
+++ b/srcpkgs/opus/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-configure
 configure_args="--enable-float-approx"
 short_desc="Totally open, royalty-free, highly versatile audio codec"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://www.opus-codec.org/"
 distfiles="https://archive.mozilla.org/pub/opus/opus-${version}.tar.gz"
diff --git a/srcpkgs/orage/template b/srcpkgs/orage/template
index 6166a031d76..7edd2af8ada 100644
--- a/srcpkgs/orage/template
+++ b/srcpkgs/orage/template
@@ -1,7 +1,7 @@
 # Template file for 'orage'
 pkgname=orage
 version=4.12.1
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool flex"
 makedepends="libical-devel libnotify-devel gtk+3-devel
diff --git a/srcpkgs/orca/template b/srcpkgs/orca/template
index efd3e59543e..ac1c0e1dc0e 100644
--- a/srcpkgs/orca/template
+++ b/srcpkgs/orca/template
@@ -1,7 +1,7 @@
 # Template file for 'orca'
 pkgname=orca
-version=3.32.0
-revision=2
+version=3.34.0
+revision=1
 archs=noarch
 build_style=gnu-configure
 pycompile_module="orca"
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/Orca"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3130268296fa2c115acc4b37f3520967f06abd402251403d1ca507071efd5816
+checksum=977c8079519ffbabad76861aa2790a55671ff69f19f3f4a158bfeb7c192a0282
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" python3-gobject-devel"
diff --git a/srcpkgs/ortp/template b/srcpkgs/ortp/template
index c00442eedcf..e6aafa99520 100644
--- a/srcpkgs/ortp/template
+++ b/srcpkgs/ortp/template
@@ -6,7 +6,7 @@ build_style=cmake
 configure_args="-DENABLE_STATIC=OFF"
 makedepends="bctoolbox-devel"
 short_desc="Real-Time Transport Protocol (RFC 3550) library"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.linphone.org/technical-corner/ortp"
 distfiles="https://github.com/BelledonneCommunications/ortp/archive/${version}.tar.gz"
diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index 6e7e6fcf12c..77b630d37fd 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
 pkgname=osg
 reverts=3.6.0_1
 version=3.4.1
-revision=9
+revision=10
 wrksrc=OpenSceneGraph-OpenSceneGraph-${version}
 build_style=cmake
 # don't use /usr/lib64 on 64bit platforms
diff --git a/srcpkgs/osinfo-db-tools/template b/srcpkgs/osinfo-db-tools/template
index be64a6854a4..d326b51b3a5 100644
--- a/srcpkgs/osinfo-db-tools/template
+++ b/srcpkgs/osinfo-db-tools/template
@@ -1,15 +1,15 @@
 # Template file for 'osinfo-db-tools'
 pkgname=osinfo-db-tools
-version=1.5.0
+version=1.6.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config perl"
 makedepends="libglib-devel libarchive-devel libxslt-devel
- json-glib-devel"
+ json-glib-devel libsoup-devel"
 short_desc="Tools for managing osinfo database"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://libosinfo.org"
 changelog="https://gitlab.com/libosinfo/osinfo-db-tools/raw/master/NEWS"
 distfiles="https://releases.pagure.org/libosinfo/${pkgname}-${version}.tar.gz"
-checksum=f43160f3f3251849f8b8b37c84ad8640f2a51937d8ea38626f14aa2a159730de
+checksum=d0d5b1196d73a7abed051be48d0e5b4aa196aac4cdbf8ddf52f57c0c492b2574
diff --git a/srcpkgs/osinfo-db/template b/srcpkgs/osinfo-db/template
index d38dbe49e87..55168d856b2 100644
--- a/srcpkgs/osinfo-db/template
+++ b/srcpkgs/osinfo-db/template
@@ -1,16 +1,16 @@
 # Template file for 'osinfo-db'
 pkgname=osinfo-db
-version=20190504
+version=20190920
 revision=1
 archs=noarch
 build_style=fetch
 hostmakedepends="osinfo-db-tools"
 short_desc="Osinfo database about operating systems"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://libosinfo.org"
 distfiles="https://releases.pagure.org/libosinfo/${pkgname}-${version}.tar.xz"
-checksum=bf445f39cfbb31ed5e83c78823cb17a7637b4ff7d72de5e3e6c38fba9e1133fa
+checksum=c8e32e93079a85b7d8c79ba9bc1a21c2e0403612f454049476242a2529a67c8a
 skip_extraction="${pkgname}-${version}.tar.xz"
 
 do_install() {
diff --git a/srcpkgs/oxipng/template b/srcpkgs/oxipng/template
index 23aeadbfa63..5ed4845de3c 100644
--- a/srcpkgs/oxipng/template
+++ b/srcpkgs/oxipng/template
@@ -1,6 +1,6 @@
 # Template file for 'oxipng'
 pkgname=oxipng
-version=2.2.2
+version=2.3.0
 revision=1
 build_style=cargo
 short_desc="Multithreaded lossless PNG compression optimizer"
@@ -9,7 +9,7 @@ license="MIT"
 homepage="https://github.com/shssoichiro/oxipng"
 changelog="https://raw.githubusercontent.com/shssoichiro/oxipng/master/CHANGELOG.md"
 distfiles="https://github.com/shssoichiro/oxipng/archive/v${version}.tar.gz"
-checksum=f2addda729b287ce02a2b853aaa22420ee00cf20e178d6f2238c03438e89c7fb
+checksum=870c6ab802ca4df6d12a5570b6883e7e3b190bbe6e2fa91282af9b294c8e68b4
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/oxygen-icons5/template b/srcpkgs/oxygen-icons5/template
index 20665f7910b..48484514eb8 100644
--- a/srcpkgs/oxygen-icons5/template
+++ b/srcpkgs/oxygen-icons5/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen-icons5'
 pkgname=oxygen-icons5
-version=5.61.0
+version=5.63.0
 revision=1
 archs=noarch
 build_style=cmake
@@ -12,5 +12,5 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later, LGPL-3.0-or-later"
 homepage="https://projects.kde.org/projects/frameworks/oxygen-icons5"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1ca8f6e42186d069cb4f0581914b147cabc3be3e720c382e77048be134bb1b26
+checksum=2fe1d14add182c5537596bc19f1cafb4a1e25052cb4391d8f8d7ea18b55f0966
 conflicts="oxygen-icons>=0"
diff --git a/srcpkgs/oxygen/template b/srcpkgs/oxygen/template
index 439c17afe10..4bcf0c6cb25 100644
--- a/srcpkgs/oxygen/template
+++ b/srcpkgs/oxygen/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen'
 pkgname=oxygen
-version=5.16.4
+version=5.17.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/plasma/oxygen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=7ba8a18a0b44d2bf48c96679328f698a9bfd4d041724b960095fed67f228f2e1
+checksum=0ed752fc90634277d40f816a0ce0717b4708ced1e88596ab890112991c9614d2
diff --git a/srcpkgs/p11-kit/template b/srcpkgs/p11-kit/template
index f30554e513c..12bce5bad48 100644
--- a/srcpkgs/p11-kit/template
+++ b/srcpkgs/p11-kit/template
@@ -1,6 +1,6 @@
 # Template file for 'p11-kit'
 pkgname=p11-kit
-version=0.23.16.1
+version=0.23.18.1
 revision=1
 build_style=gnu-configure
 configure_args="--with-module-path=/usr/lib/pkcs11"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/p11-glue/p11-kit"
 distfiles="${homepage}/releases/download/${version}/p11-kit-${version}.tar.gz"
-checksum=4b34e92ae36fa493e0d94366c767f06d5f9951e3d8581d10fd935d738db1574d
+checksum=34c3bd8c0050dd7c4e6228aecf0f168de0a1b34562ddbf74a1c70904c2523c6f
 conf_files="/etc/pkcs11/pkcs11.conf"
 
 pre_configure() {
diff --git a/srcpkgs/packer/template b/srcpkgs/packer/template
index 5ecead529d6..38a8fce529a 100644
--- a/srcpkgs/packer/template
+++ b/srcpkgs/packer/template
@@ -1,15 +1,15 @@
 # Template file for 'packer'
 pkgname=packer
-version=1.4.2
+version=1.4.4
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/packer"
 short_desc="Create identical multiplatform machine images from a single source"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="MPL-2"
+license="MPL-2.0"
 homepage="http://www.packer.io"
 distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
-checksum=c35f46bcacd93ca8b99291701df351bfec935fac804839a5f8cf4f491367d0c1
+checksum=df5abcace27d81c6952d81bfd280fb5e8ec968bb72e53cfbd322417d2be61d2a
 replaces="packer-bin>=0"
 
 case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/palapeli/template b/srcpkgs/palapeli/template
index b09a4ef49f2..7aa16086376 100644
--- a/srcpkgs/palapeli/template
+++ b/srcpkgs/palapeli/template
@@ -1,6 +1,6 @@
 # Template file for 'palapeli'
 pkgname=palapeli
-version=19.04.3
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kdoctools
@@ -12,4 +12,4 @@ maintainer="Adam Beckmeyer <adam_gpg@thebeckmeyers.xyz>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/games/palapeli"
 distfiles="${KDE_SITE}/applications/${version}/src/palapeli-${version}.tar.xz"
-checksum=7cbf7a1666e16a476de9bdab7155f17f2224baa7db9d80cd77c785dead6f2e10
+checksum=bae810595c7ba7bdac0fa5c27e6c2a3a9bb1bbdae3521cfc036ec0cdcd9ef1a7
diff --git a/srcpkgs/pam_rundir/patches/fix.patch b/srcpkgs/pam_rundir/patches/fix.patch
new file mode 100644
index 00000000000..ffde6fbaf1a
--- /dev/null
+++ b/srcpkgs/pam_rundir/patches/fix.patch
@@ -0,0 +1,40 @@
+--- pam_rundir.c	2015-09-23 12:57:53.000000000 -0400
++++ pam_rundir2.c	2019-08-24 13:17:11.241470935 -0400
+@@ -24,6 +24,8 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <sys/file.h>
++#include <sys/prctl.h>
++#include <linux/securebits.h>
+ #include <string.h>
+ #include <pwd.h>
+ #include <fcntl.h>
+@@ -360,6 +362,7 @@
+         char file[sizeof (PARENT_DIR) + l + 2];
+         int fd;
+         int count = 0;
++        int secbits = -1;
+ 
+         print_filename (file, (int) pw->pw_uid, l);
+         fd = open_and_lock (file);
+@@ -396,6 +399,11 @@
+             goto done;
+         }
+ 
++        /* to bypass permission checks for mkdir, in case it isn't group
++         * writable */
++        secbits = prctl (PR_GET_SECUREBITS);
++        if (secbits != -1)
++            prctl (PR_SET_SECUREBITS, (unsigned long) secbits | SECBIT_NO_SETUID_FIXUP);
+         /* set euid so if we do create the dir, it is own by the user */
+         if (seteuid (pw->pw_uid) < 0)
+         {
+@@ -421,6 +429,8 @@
+         }
+ 
+ done:
++        if (secbits != -1)
++            prctl (PR_SET_SECUREBITS, (unsigned long) secbits);
+         close (fd); /* also unlocks */
+     }
+ 
diff --git a/srcpkgs/pam_rundir/template b/srcpkgs/pam_rundir/template
index 77e4b467f04..f08238ddb5f 100644
--- a/srcpkgs/pam_rundir/template
+++ b/srcpkgs/pam_rundir/template
@@ -1,12 +1,12 @@
 # Template file for 'pam_rundir'
 pkgname=pam_rundir
 version=1.0.0
-revision=4
+revision=5
 build_style=configure
 configure_args="--prefix=/usr --with-parentdir=/run/user"
 makedepends="pam-devel"
 short_desc="PAM Module to create and remove user runtime directories"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://jjacky.com/pam_rundir"
 distfiles="https://jjacky.com/${pkgname}/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/pam_ssh/template b/srcpkgs/pam_ssh/template
index c4100b2cab1..0d533bf169d 100644
--- a/srcpkgs/pam_ssh/template
+++ b/srcpkgs/pam_ssh/template
@@ -1,7 +1,7 @@
 # Template file for 'pam_ssh'
 pkgname=pam_ssh
-version=2.2
-revision=2
+version=2.3
+revision=1
 build_style=gnu-configure
 configure_args="--with-pam-dir=/usr/lib/security ac_cv_openssldir=/usr
  --includedir=${XBPS_CROSS_BASE}/usr/include
@@ -13,7 +13,7 @@ maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="BSD-2-Clause"
 homepage="http://pam-ssh.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/pam-ssh/${pkgname}-${version}.tar.xz"
-checksum=3543b7248a83831579d2cfcae330e7fc479c07371f36401ac147d735885f57ad
+checksum=0c456f6a5c9e47ce6825ac50d467e7a797e14239b2b9a72bfeb2df0100f4af31
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/papi/patches/gnu_source.patch b/srcpkgs/papi/patches/gnu_source.patch
new file mode 100644
index 00000000000..eed88b43d3f
--- /dev/null
+++ b/srcpkgs/papi/patches/gnu_source.patch
@@ -0,0 +1,12 @@
+--- src/components/perf_event/tests/perf_event_system_wide.c.orig	2019-10-12 17:48:40.217216625 +0200
++++ src/components/perf_event/tests/perf_event_system_wide.c	2019-10-12 17:49:48.246645644 +0200
+@@ -15,6 +15,9 @@
+ #define __USE_GNU
+ #endif
+ 
++/* For cpu_set_t */
++#define _GNU_SOURCE
++
+ /* For sched_setaffinity() */
+ #include <sched.h>
+ 
diff --git a/srcpkgs/papi/template b/srcpkgs/papi/template
index 297c00f683e..239cd5c34f0 100644
--- a/srcpkgs/papi/template
+++ b/srcpkgs/papi/template
@@ -1,16 +1,16 @@
 # Template file for 'papi'
 pkgname=papi
-version=5.6.0
+version=5.7.0
 revision=1
 wrksrc="papi-${version}"
 build_wrksrc="src"
 build_style=gnu-configure
 short_desc="Provides interface for use of performance counter hardware"
 maintainer="johannes <johannes.brechtmann@gmail.com>"
-license="BSD"
+license="BSD-3-Clause"
 homepage="http://icl.cs.utk.edu/papi/"
 distfiles="http://icl.utk.edu/projects/papi/downloads/papi-${version}.tar.gz"
-checksum=49b7293f9ca2d74d6d80bd06b5c4be303663123267b4ac0884cbcae4c914dc47
+checksum=d1a3bb848e292c805bc9f29e09c27870e2ff4cda6c2fba3b7da8b4bba6547589
 
 if [ -n "$CROSS_BUILD" ]; then
 	_ARCH="${XBPS_TARGET_MACHINE%-musl}"
@@ -29,6 +29,7 @@ papi-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/*.a
+		vmove usr/lib/*.so
 		vmove usr/lib/pkgconfig
 		vmove usr/share/man/man3
 	}
diff --git a/srcpkgs/papirus-icon-theme/template b/srcpkgs/papirus-icon-theme/template
index 6d3682855a5..856b0f373bc 100644
--- a/srcpkgs/papirus-icon-theme/template
+++ b/srcpkgs/papirus-icon-theme/template
@@ -1,6 +1,6 @@
 # Template file for 'papirus-icon-theme'
 pkgname=papirus-icon-theme
-version=20190720
+version=20191009
 revision=1
 archs=noarch
 short_desc="SVG icon theme for Linux, based on Paper Icon Set"
@@ -8,7 +8,7 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme"
 distfiles="https://github.com/PapirusDevelopmentTeam/${pkgname}/archive/${version}.tar.gz"
-checksum=8a3882c8d498f9172c2ab21dcf151aa1520fafb05c377160bc802cb39a8d9908
+checksum=1e40f8e7b9b827a8aa7c14ec5e3c8905574937d352496c4dd6b05d58ec391ca7
 
 do_install() {
 	vmkdir usr/share/icons
diff --git a/srcpkgs/parallel/template b/srcpkgs/parallel/template
index 658451aa036..6bfadca3bbd 100644
--- a/srcpkgs/parallel/template
+++ b/srcpkgs/parallel/template
@@ -1,6 +1,6 @@
 # Template file for 'parallel'
 pkgname=parallel
-version=20190722
+version=20190922
 revision=1
 archs="noarch"
 build_style=gnu-configure
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/parallel/"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=0ed0863184dbb396b4c030848e754b1ea76329c06ae9e43314bc0915eb6cbca7
+checksum=282fee2cb40a54ba32a922446365b782c4f461f848432b969de5a17b33193c63
 
 pre_configure() {
 	# no html and pdf doc
diff --git a/srcpkgs/paraview/template b/srcpkgs/paraview/template
new file mode 100644
index 00000000000..3b721b1833a
--- /dev/null
+++ b/srcpkgs/paraview/template
@@ -0,0 +1,63 @@
+# Template file for 'paraview'
+pkgname=paraview
+version=5.6.1
+revision=1
+wrksrc=ParaView-v${version}
+build_style=cmake
+configure_args="-DPARAVIEW_ENABLE_FFMPEG=ON
+ -DPARAVIEW_ENABLE_GDAL=ON
+ -DPARAVIEW_ENABLE_MATPLOTLIB=ON
+ -DPARAVIEW_ENABLE_PYTHON=ON
+ -DPARAVIEW_USE_MPI=ON
+ -DPARAVIEW_USE_VISITBRIDGE=OFF
+ -DPARAVIEW_USE_OSPRAY=OFF
+ -DVTK_PYTHON_FULL_THREADSAFE=ON
+ -DVTK_PYTHON_VERSION=3
+ -DVTK_SMP_IMPLEMENTATION_TYPE=TBB
+ -DVTKm_ENABLE_MPI=ON
+ -DVTKm_ENABLE_RENDERING=ON
+ -DVTKm_USE_DOUBLE_PRECISION=ON
+ -DVTK_USE_SYSTEM_LIBRARIES=OFF
+ -DVTK_USE_SYSTEM_DOUBLECONVERSION=ON
+ -DVTK_USE_SYSTEM_EIGEN=ON
+ -DVTK_USE_SYSTEM_EXPAT=ON
+ -DVTK_USE_SYSTEM_FREETYPE=ON
+ -DVTK_USE_SYSTEM_GLEW=ON
+ -DVTK_USE_SYSTEM_HDF5=ON
+ -DVTK_USE_SYSTEM_JPEG=ON
+ -DVTK_USE_SYSTEM_JSONCPP=ON
+ -DVTK_USE_SYSTEM_LIBPROJ=ON
+ -DVTK_USE_SYSTEM_LIBXML2=ON
+ -DVTK_USE_SYSTEM_LZMA=ON
+ -DVTK_USE_SYSTEM_MPI4PY=ON
+ -DVTK_USE_SYSTEM_NETCDF=ON
+ -DVTK_USE_SYSTEM_OGG=ON
+ -DVTK_USE_SYSTEM_PEGTL=OFF
+ -DVTK_USE_SYSTEM_PNG=ON
+ -DVTK_USE_SYSTEM_PUGIXML=ON
+ -DVTK_USE_SYSTEM_THEORA=ON
+ -DVTK_USE_SYSTEM_TIFF=ON
+ -DVTK_USE_SYSTEM_ZLIB=ON
+ -DVTK_USE_SYSTEM_PROTOBUF=ON"
+makedepends="MesaLib-devel libfreeglut-devel glu-devel libXt-devel
+ openmpi-devel qt5-devel qt5-x11extras-devel qt5-tools-devel qt5-plugin-mysql
+ qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds
+ qt5-xmlpatterns python3-devel double-conversion-devel eigen expat-devel
+ freetype-devel glew-devel hdf5-devel libjpeg-turbo-devel jsoncpp-devel
+ proj-devel libxml2-devel liblzma-devel liblz4-devel netcdf-devel libogg-devel
+ libpng-devel pugixml-devel libtheora-devel tiff-devel zlib-devel
+ protobuf-devel protobuf python3-Pygments ffmpeg-devel tbb-devel boost-devel
+ libgdal-devel python3-mpi4py"
+depends="openmpi"
+short_desc="Application for interactive, scientific visualization"
+maintainer="Anders Damsgaard <anders@adamsgaard.dk>"
+license="BSD-3-Clause"
+homepage="https://www.paraview.org"
+distfiles="https://www.paraview.org/paraview-downloads/download.php?submit=Download&version=v${version:0:3}&type=source&os=Sources&downloadFile=ParaView-v${version}.tar.xz>paraview-${version}.tar.xz"
+checksum=50ef01f54db6358b402e50d1460ef47c04d675bf26f250c6937737169f1e6612
+CFLAGS="-D_GNU_SOURCE"
+CXXFLAGS="-D_GNU_SOURCE"
+
+post_install() {
+	vlicense Copyright.txt
+}
diff --git a/srcpkgs/parted/patches/fix-glibc-2.27.patch b/srcpkgs/parted/patches/fix-glibc-2.27.patch
deleted file mode 100644
index b2ea15ce5f4..00000000000
--- a/srcpkgs/parted/patches/fix-glibc-2.27.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 5cb16c0474fd4b28ed58ac06fecfc76a7f1fa9fb Mon Sep 17 00:00:00 2001
-From: maxice8 <thinkabit.ukim@gmail.com>
-Date: Sat, 22 Sep 2018 23:08:51 -0300
-Subject: [PATCH] libparted/arch/linux.c: add missing sys/sysmacros.h include
- for 'minor', 'major'
-
-otherwise fails on glibc >= 2.27 with
-
-arch/linux.c: In function '_dm_is_part':
-arch/linux.c:551:28: warning: implicit declaration of function 'major' [-Wimplicit-function-declaration]
-         if (!_is_dm_major (major (deps->device[0])))
-                            ^~~~~
-arch/linux.c: In function '_device_probe_type':
-arch/linux.c:648:44: warning: implicit declaration of function 'minor'; did you mean 'mknod'? [-Wimplicit-function-declaration]
-         arch_specific->minor = dev_minor = minor (dev_stat.st_rdev);
-                                            ^~~~~
-                                            mknod
-  CCLD     libparted.la
-
-../libparted/.libs/libparted.so: undefined reference to `major'
-../libparted/.libs/libparted.so: undefined reference to `minor'
-collect2: error: ld returned 1 exit status
----
- libparted/arch/linux.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c
-index 0f18904..a15854f 100644
---- libparted/arch/linux.c
-+++ libparted/arch/linux.c
-@@ -41,6 +41,7 @@
- #include <sys/utsname.h>        /* for uname() */
- #include <scsi/scsi.h>
- #include <assert.h>
-+#include <sys/sysmacros.h>
- #ifdef ENABLE_DEVICE_MAPPER
- #include <libdevmapper.h>
- #endif
--- 
-2.19.0
-
-
diff --git a/srcpkgs/parted/patches/fix-includes.patch b/srcpkgs/parted/patches/fix-includes.patch
deleted file mode 100644
index aa39609f750..00000000000
--- a/srcpkgs/parted/patches/fix-includes.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- libparted/fs/xfs/platform_defs.h
-+++ libparted/fs/xfs/platform_defs.h
-@@ -35,6 +35,7 @@
- #define __XFS_PLATFORM_DEFS_H__
- 
- #include <stdio.h>
-+#include <fcntl.h>
- #include <stdarg.h>
- #include <assert.h>
- #include <endian.h>
diff --git a/srcpkgs/parted/template b/srcpkgs/parted/template
index 03b6bd4b61e..c8946b570ca 100644
--- a/srcpkgs/parted/template
+++ b/srcpkgs/parted/template
@@ -1,7 +1,7 @@
 # Template file for 'parted'
 pkgname=parted
-version=3.2
-revision=7
+version=3.3
+revision=1
 build_style=gnu-configure
 # parted wants off_t as 64bit type
 configure_args="ac_cv_sizeof_off_t=8"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.gnu.org/software/parted/"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=858b589c22297cacdf437f3baff6f04b333087521ab274f7ab677cb8c6bb78e4
+checksum=57e2b4bd87018625c515421d4524f6e3b55175b472302056391c5f7eccb83d44
 
 libparted_package() {
 	short_desc+=" - shared library"
diff --git a/srcpkgs/passphrase2pgp/template b/srcpkgs/passphrase2pgp/template
new file mode 100644
index 00000000000..38e47bb8ec0
--- /dev/null
+++ b/srcpkgs/passphrase2pgp/template
@@ -0,0 +1,13 @@
+# Template file for 'passphrase2pgp'
+pkgname=passphrase2pgp
+version=0.1.0
+revision=1
+build_style=go
+go_import_path="github.com/skeeto/passphrase2pgp"
+hostmakedepends="git"
+short_desc="Generate a PGP key from a passphrase"
+maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
+license="Unlicense"
+homepage="https://github.com/skeeto/passphrase2pgp"
+distfiles="https://github.com/skeeto/passphrase2pgp/archive/v${version}.tar.gz"
+checksum=15d26a836d9df2fa6e487d7224e6ab7d6f51139211ceb77b8ecd8c594b86699a
diff --git a/srcpkgs/pastel/template b/srcpkgs/pastel/template
new file mode 100644
index 00000000000..c78cf2f56c8
--- /dev/null
+++ b/srcpkgs/pastel/template
@@ -0,0 +1,15 @@
+# Template file for 'pastel'
+pkgname=pastel
+version=0.6.1
+revision=1
+build_style=cargo
+short_desc="Generate, analyze, convert and manipulate colors"
+maintainer="Andrew Benson <abenson+void@gmail.com>"
+license="MIT"
+homepage="https://github.com/sharkdp/pastel"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=ece0004d725133bcf552bbfe5508c087513eb52f6c363fbad6eeb9c74769a932
+
+post_install() {
+	vlicense LICENSE-MIT
+}
diff --git a/srcpkgs/patchelf/template b/srcpkgs/patchelf/template
index 1c5cca4eee7..fe2dc3ccee4 100644
--- a/srcpkgs/patchelf/template
+++ b/srcpkgs/patchelf/template
@@ -4,7 +4,7 @@ version=0.10
 revision=1
 build_style=gnu-configure
 short_desc="Utility for modifing existing ELF executables and libraries"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://nixos.org/patchelf.html"
 distfiles="https://nixos.org/releases/patchelf/patchelf-${version}/patchelf-${version}.tar.bz2"
diff --git a/srcpkgs/pax/template b/srcpkgs/pax/template
index 0e6310ebaa7..72d46d47efe 100644
--- a/srcpkgs/pax/template
+++ b/srcpkgs/pax/template
@@ -1,6 +1,6 @@
 # Template file for 'pax'
 pkgname=pax
-version=20190224
+version=20190825
 revision=1
 wrksrc="paxmirabilis-${version}"
 build_wrksrc="${pkgname}"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="3-clause-BSD"
 homepage="https://www.mirbsd.org/MirOS/dist/mir/cpio/"
 distfiles="https://www.mirbsd.org/MirOS/dist/mir/cpio/paxmirabilis-${version}.cpio.gz"
-checksum=381713ea1e6e25be83700312b3c0ce2e889edbc39ee09e3a59b9a31b800e0085
+checksum=94c9110e4778d762523c3915b97587b92ae4547129424e34ad4512da4eb09b81
 
 alternatives="
  pax:pax:/usr/bin/paxmirabilis
diff --git a/srcpkgs/pcmanfm-qt/template b/srcpkgs/pcmanfm-qt/template
index a0de0da42d4..544c2e85482 100644
--- a/srcpkgs/pcmanfm-qt/template
+++ b/srcpkgs/pcmanfm-qt/template
@@ -1,10 +1,11 @@
 # Template file for 'pcmanfm-qt'
 pkgname=pcmanfm-qt
 version=0.14.1
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools libfm-devel"
 makedepends="qt5-tools-devel qt5-x11extras-devel libfm-qt-devel"
+depends="qt5-translations"
 short_desc="LXQt pcmanfm Qt frontend"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
diff --git a/srcpkgs/pd/patches/fix-musl.patch b/srcpkgs/pd/patches/fix-musl.patch
new file mode 100644
index 00000000000..6e1d1f0eaa2
--- /dev/null
+++ b/srcpkgs/pd/patches/fix-musl.patch
@@ -0,0 +1,15 @@
+--- src/x_text.c.orig	2019-08-29 10:11:27.734179939 +0200
++++ src/x_text.c	2019-08-29 10:12:06.392225034 +0200
+@@ -475,9 +475,10 @@ found in msvcrt (which indeed it isn't i
+ on this, just call qsort if we're Microsoft and single-instance.  I hope nobody
+ will try to compile multi-instance Pd for 32-bit windows, but if they
+ do, they might run into my qsort_s problem again. */
+-#if defined(_WIN32) && !defined(PDINSTANCE)
++#if (!defined(__GLIBC__) || defined(_WIN32)) && !defined(PDINSTANCE)
+ #define MICROSOFT_STUPID_SORT
+-static void *stupid_zkeyinfo;
++#include <threads.h>
++thread_local static void *stupid_zkeyinfo;
+ static int stupid_sortcompare(const void *z1, const void *z2) {
+     return (text_sortcompare(z1, z2, stupid_zkeyinfo)); }
+ #endif
diff --git a/srcpkgs/pd/template b/srcpkgs/pd/template
index 4a15e6b2e42..5f3fb5815a3 100644
--- a/srcpkgs/pd/template
+++ b/srcpkgs/pd/template
@@ -1,7 +1,7 @@
 # Template file for 'pd'
 pkgname=pd
-version=0.49.0
-revision=1
+version=0.50.0
+revision=2
 _ver=${version%.*}-${version##*.}
 wrksrc="$pkgname-$_ver"
 build_style=gnu-configure
@@ -14,7 +14,11 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="BSD-3-Clause"
 homepage="https://puredata.info"
 distfiles="http://msp.ucsd.edu/Software/pd-$_ver.src.tar.gz"
-checksum=d2e04e75d22b0e41f27daacc0cd6ec6b05ae0ef214cc7315d57e5bfbeec23fa3
+checksum=faeacdc24054cc6ce6be801ff5dd3eb7890352295d56c03406c5b85256b1e441
+case "$XBPS_TARGET_MACHINE" in
+	*-musl) # Causes pd to fail if qsort is used without thread local storage.
+		CFLAGS="-DMICROSOFT_STUPID_SORT" ;;
+esac
 
 pre_configure() {
 	./autogen.sh
diff --git a/srcpkgs/pdd/template b/srcpkgs/pdd/template
index 691f671492c..70deb5a1ae3 100644
--- a/srcpkgs/pdd/template
+++ b/srcpkgs/pdd/template
@@ -7,7 +7,7 @@ build_style=gnu-makefile
 depends="python3-dateutil"
 checkdepends="python3-dateutil python3-pytest"
 short_desc="Tiny date, time diff calculator"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/jarun/pdd"
 changelog="https://raw.githubusercontent.com/jarun/pdd/master/CHANGELOG"
diff --git a/srcpkgs/pdfcrack/template b/srcpkgs/pdfcrack/template
index 75a6e6198d4..76a85706054 100644
--- a/srcpkgs/pdfcrack/template
+++ b/srcpkgs/pdfcrack/template
@@ -1,6 +1,6 @@
 # Template file for 'pdfcrack'
 pkgname=pdfcrack
-version=0.17
+version=0.18
 revision=1
 build_style=gnu-makefile
 short_desc="PDF password recovery tool"
@@ -8,7 +8,7 @@ maintainer="misuchiru03 <misuchiru03+void@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://sourceforge.net/projects/${pkgname}"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=561bb1ee21005b6a9cf09771571836de6625ad6c52822b08eaf33b9f32ef0e96
+checksum=8223aec52a2ae36f9a10a731513461458874f1fd8d803e4a04910d9dbf1cba0c
 
 do_install() {
 	vbin pdfcrack
diff --git a/srcpkgs/pdsh/patches/fix_configure_ac.patch b/srcpkgs/pdsh/patches/fix_configure_ac.patch
new file mode 100644
index 00000000000..9be920cd9c6
--- /dev/null
+++ b/srcpkgs/pdsh/patches/fix_configure_ac.patch
@@ -0,0 +1,18 @@
+configure.ac relies on git, which doesn't work for release tarball.
+See: https://github.com/chaos/pdsh/issues/116
+--- configure.ac	2017-06-28 19:28:26.000000000 -0500
++++ configure.ac	2019-09-11 08:41:27.613006239 -0500
+@@ -4,12 +4,11 @@
+ # Copyright (C) 2000-2002 Regents of the University of California
+ # See ./DISCLAIMER
+ #
+ # This file is to be processed with autoconf to generate a configure script.
+ 
+-AC_INIT([pdsh],
+-        m4_esyscmd([git describe --always |  awk '/.*/ {sub(/^pdsh-/, ""); printf "%s",$1; exit}']))
++AC_INIT([pdsh], 2)
+ 
+ AC_CONFIG_SRCDIR([pdsh])
+ AC_CONFIG_AUX_DIR([config])
+ AC_CONFIG_MACRO_DIR([config])
+ AC_CONFIG_SRCDIR([src/pdsh/dsh.h])
diff --git a/srcpkgs/pdsh/template b/srcpkgs/pdsh/template
new file mode 100644
index 00000000000..ad136987bd0
--- /dev/null
+++ b/srcpkgs/pdsh/template
@@ -0,0 +1,40 @@
+# Template file for 'pdsh'
+pkgname=pdsh
+version=2.33
+revision=1
+archs="~*-musl"
+wrksrc="pdsh-pdsh-${version}"
+build_style=gnu-configure
+configure_args="
+ --disable-static-modules
+ $(vopt_with rsh)
+ $(vopt_with exec)
+ $(vopt_with ssh)
+ $(vopt_with mrsh)
+ $(vopt_with xcpu)
+ $(vopt_with netgroup)
+ $(vopt_with readline)
+"
+hostmakedepends="automake autoconf libtool"
+makedepends="
+ $(vopt_if mrsh munge-devel)
+ $(vopt_if readline readline-devel)
+"
+short_desc="High performance, parallel remote shell utility"
+maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/chaos/pdsh"
+distfiles="https://github.com/chaos/pdsh/archive/pdsh-${version}.tar.gz"
+checksum=c026ccf06e4f1c6c52414282a865e45362405aa09f7d09fa86aaec98f6413554
+
+build_options="rsh exec ssh mrsh xcpu netgroup readline"
+build_options_default="rsh exec ssh mrsh readline"
+desc_option_rsh="Include support for the rsh remote module"
+desc_option_exec="Include support for the exec remote module"
+desc_option_mrsh="Include support for the mrsh remote module"
+desc_option_xcpu="Include support for the xcpu remote module"
+desc_option_netgroup="allows pdsh to use standard netgroup entries to build lists of target hosts."
+
+pre_configure() {
+	./bootstrap
+}
diff --git a/srcpkgs/peaclock/template b/srcpkgs/peaclock/template
index 4802b0358e2..49bf18466f7 100644
--- a/srcpkgs/peaclock/template
+++ b/srcpkgs/peaclock/template
@@ -1,15 +1,17 @@
 # Template file for 'peaclock'
 pkgname=peaclock
-version=0.2.0
+version=0.4.0
 revision=1
 build_style=cmake
+makedepends="icu-devel"
 short_desc="Colourful binary clock for the terminal"
 maintainer="Nathan Owens <ndowens04@gmail.com>"
 license="MIT"
 homepage="https://octobanana.com/software/peaclock"
 distfiles="https://github.com/octobanana/peaclock/archive/${version}.tar.gz"
-checksum=e8b71e62b6f408a95bfd7f1381bb2cfe390969be37f7c2f83b60cd313cde8589
+checksum=3b14608b2e507e268b1804c2383cbde241886eeba8d313d646524a44e3ab8615
 
-post_extract() {
+post_install() {
+	vsconf config/default default-config
 	vlicense LICENSE
 }
diff --git a/srcpkgs/peek/template b/srcpkgs/peek/template
index 2899f7de935..8108c8a8c68 100644
--- a/srcpkgs/peek/template
+++ b/srcpkgs/peek/template
@@ -1,15 +1,14 @@
 # Template file for 'peek'
 pkgname=peek
-version=1.3.1
+version=1.4.0
 revision=1
-build_style=cmake
-configure_args="-DGSETTINGS_COMPILE=OFF"
+build_style=meson
 hostmakedepends="glib-devel libxml2 pkg-config txt2man vala"
 makedepends="gtk+3-devel libkeybinder3-devel"
 depends="gsettings-desktop-schemas"
-maintainer="Orphaned <orphan@voidlinux.org>"
 short_desc="Simple animated GIF screen recorder with an easy to use interface"
+maintainer="Peter Bui <pbui@github.bx612.space>"
+license="GPL-3.0-or-later"
 homepage="https://github.com/phw/peek"
-license="GPL-3"
 distfiles="https://github.com/phw/peek/archive/${version}.tar.gz"
-checksum=8104b65b041858b7f7f482e1425f8f22d429524340ad341f95f08b08fe4e8602
+checksum=506c5797102629ff4a319c5fcc4eb6b771ffd680bb83ea07c1e5e8166000d605
diff --git a/srcpkgs/pelican/template b/srcpkgs/pelican/template
index ae80c9fe74f..39b72b83f6f 100644
--- a/srcpkgs/pelican/template
+++ b/srcpkgs/pelican/template
@@ -1,6 +1,6 @@
 # Template file for 'pelican'
 pkgname=pelican
-version=4.0.1
+version=4.1.3
 revision=1
 archs=noarch
 build_style=python2-module
@@ -10,12 +10,12 @@ depends="python-setuptools python-feedgenerator python-Jinja2 python-Pygments
  python-docutils python-pytz python-blinker python-Unidecode python-six
  python-dateutil"
 short_desc="Static site generator written in Python"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Lugubris <lugubris@disroot.org>"
 license="AGPL-3.0-or-later"
 homepage="https://getpelican.com/"
 changelog="https://raw.githubusercontent.com/getpelican/pelican/${version}/docs/changelog.rst"
 distfiles="${PYPI_SITE}/p/pelican/pelican-${version}.tar.gz"
-checksum=990aa8b62a7bcb34c7585e5a67d05a10690ab2fff3cb761d0a94826cec51cd17
+checksum=cf0ed7342e5cf38559cd89f9daee52dc2697739eafd6b9fbd33b06e523bf4cce
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/perl-ACL-Lite/template b/srcpkgs/perl-ACL-Lite/template
index 73f0c7c1b69..f3ce855be07 100644
--- a/srcpkgs/perl-ACL-Lite/template
+++ b/srcpkgs/perl-ACL-Lite/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Liteweight and flexible ACL checks"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/ACL-Lite"
 distfiles="${CPAN_SITE}/ACL/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Alien-Build/template b/srcpkgs/perl-Alien-Build/template
index f7cbc44b841..ad08c7e4a84 100644
--- a/srcpkgs/perl-Alien-Build/template
+++ b/srcpkgs/perl-Alien-Build/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-Alien-Build'
 pkgname=perl-Alien-Build
-version=1.65
+version=1.89
 revision=1
 archs=noarch
 wrksrc="${pkgname/perl-/}-${version}"
@@ -10,8 +10,8 @@ depends="perl-Capture-Tiny perl-FFI-CheckLib perl-Path-Tiny
  perl-File-Which perl-File-chdir perl-Archive-Zip"
 checkdepends="${depends} perl-Test-Simple perl-Test2-Suite"
 short_desc="Build external dependencies for use in CPAN"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/pod/Alien::Build"
 distfiles="https://cpan.metacpan.org/authors/id/P/PL/PLICEASE/Alien-Build-${version}.tar.gz"
-checksum=8ad4ffdf237b5e6d7e2f70e83bad2972eae13d5ab87d44fba5912b25b2817cf7
+checksum=ffe36fa5b43c2e9c8c72a074a5ebc7d17821c0e297cd226797b0c192362027cb
diff --git a/srcpkgs/perl-Archive-Zip/template b/srcpkgs/perl-Archive-Zip/template
index 99d98baa675..7cac357843a 100644
--- a/srcpkgs/perl-Archive-Zip/template
+++ b/srcpkgs/perl-Archive-Zip/template
@@ -1,17 +1,17 @@
 # Template file for 'perl-Archive-Zip'
 pkgname=perl-Archive-Zip
-version=1.64
+version=1.67
 revision=1
 archs=noarch
 wrksrc="Archive-Zip-${version}"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="$hostmakedepends"
-checkdepends="perl-Test-MockModule"
 depends="$makedepends"
+checkdepends="perl-Test-MockModule"
 short_desc="Provide a perl interface to ZIP archive files"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Archive-Zip"
 distfiles="${CPAN_SITE}/Archive/Archive-Zip-${version}.tar.gz"
-checksum=de5f84f2148038363d557b1fa33f58edc208111f789f7299fe3d8f6e11b4d17d
+checksum=be2274344c7659bf9189838dc6b9a59ec6f957c74ddfd35ff2780d56f4592774
diff --git a/srcpkgs/perl-Barcode-ZBar/template b/srcpkgs/perl-Barcode-ZBar/template
index eed855c93f3..c3dbc66416b 100644
--- a/srcpkgs/perl-Barcode-ZBar/template
+++ b/srcpkgs/perl-Barcode-ZBar/template
@@ -1,14 +1,14 @@
 # Template file for 'perl-Barcode-ZBar'
 pkgname=perl-Barcode-ZBar
 version=0.04
-revision=4
+revision=5
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="perl libzbar-devel"
 depends="${makedepends}"
 short_desc="Perl interface to the ZBar Barcode Reader"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1"
 homepage="https://metacpan.org/release/Barcode-ZBar"
 distfiles="${CPAN_SITE}/Barcode/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Bit-Vector/template b/srcpkgs/perl-Bit-Vector/template
index ab31b94d4db..bb6382b3396 100644
--- a/srcpkgs/perl-Bit-Vector/template
+++ b/srcpkgs/perl-Bit-Vector/template
@@ -1,7 +1,7 @@
 # Template build file for 'perl-Bit-Vector'
 pkgname=perl-Bit-Vector
 version=7.4
-revision=5
+revision=6
 wrksrc="Bit-Vector-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/perl-CPAN-Meta-Check/template b/srcpkgs/perl-CPAN-Meta-Check/template
index b82bc4067d1..1bce3bc0b3f 100644
--- a/srcpkgs/perl-CPAN-Meta-Check/template
+++ b/srcpkgs/perl-CPAN-Meta-Check/template
@@ -10,7 +10,7 @@ makedepends="perl"
 checkdepends="perl-Test-Differences perl-Test-Deep"
 depends="$makedepends"
 short_desc="CPAN::Meta::Check - Verify requirements in a CPAN::Meta object"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/CPAN-Meta-Check"
 distfiles="${CPAN_SITE}/CPAN/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Cairo-GObject/template b/srcpkgs/perl-Cairo-GObject/template
index e7e3315e4db..f1e72426388 100644
--- a/srcpkgs/perl-Cairo-GObject/template
+++ b/srcpkgs/perl-Cairo-GObject/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Cairo-GObject'
 pkgname=perl-Cairo-GObject
-version=1.004
-revision=3
+version=1.005
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-ExtUtils-Depends perl-ExtUtils-PkgConfig"
@@ -12,4 +12,4 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
 license="LGPL-2.1-or-later"
 homepage="http://gtk2-perl.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/gtk2-perl/Cairo_GObject/${pkgname/perl-/}-${version}.tar.gz"
-checksum=3bb9d40e802e51f56f1364abc553758152131803c12d85ba6e14bad6813409d5
+checksum=8d896444d71e1d0bca3d24e31e5d82bd0d9542aaed91d1fb7eab367bce675c50
diff --git a/srcpkgs/perl-Cairo/template b/srcpkgs/perl-Cairo/template
index c3ce831706b..ca65910b420 100644
--- a/srcpkgs/perl-Cairo/template
+++ b/srcpkgs/perl-Cairo/template
@@ -1,7 +1,7 @@
-# Template file for 'perl-Cairo'.
+# Template file for 'perl-Cairo'
 pkgname=perl-Cairo
-version=1.106
-revision=5
+version=1.107
+revision=1
 wrksrc="Cairo-$version"
 build_style=perl-module
 hostmakedepends="perl"
@@ -9,7 +9,7 @@ makedepends="perl-ExtUtils-Depends perl-ExtUtils-PkgConfig cairo-devel"
 depends="perl>=5.20 perl-Glib"
 short_desc="Perl bindings for Cairo"
 maintainer="Orphaned <orphan@voidlinux.org>"
+license="LGPL-2.1-or-later"
 homepage="http://gtk2-perl.sourceforge.net/"
-license="LGPL-2.1"
 distfiles="${SOURCEFORGE_SITE}/gtk2-perl/Cairo-$version.tar.gz"
-checksum=e64803018bc7cba49e73e258547f5378cc4249797beafec524852140f49c45c4
+checksum=5e1de126ddf93bd5b13f13a52f50d7f7af1157265b7f10e53d585ee1827be169
diff --git a/srcpkgs/perl-Carp-Clan/template b/srcpkgs/perl-Carp-Clan/template
index 78abc3fa823..59704ed94f5 100644
--- a/srcpkgs/perl-Carp-Clan/template
+++ b/srcpkgs/perl-Carp-Clan/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-Carp-Clan'
 pkgname=perl-Carp-Clan
-version=6.07
+version=6.08
 revision=1
 archs=noarch
 wrksrc="Carp-Clan-${version}"
@@ -13,4 +13,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Carp-Clan"
 distfiles="${CPAN_SITE}/Carp/Carp-Clan-${version}.tar.gz"
-checksum=0a08560737d8c5caab36f2684c8512e9771e633d3ab5629db814e1d49e274a3d
+checksum=c75f92e34422cc5a65ab05d155842b701452434e9aefb649d6e2289c47ef6708
diff --git a/srcpkgs/perl-Class-Method-Modifiers/template b/srcpkgs/perl-Class-Method-Modifiers/template
index 111d975be3d..533720aa724 100644
--- a/srcpkgs/perl-Class-Method-Modifiers/template
+++ b/srcpkgs/perl-Class-Method-Modifiers/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Class-Method-Modifiers'
 pkgname=perl-Class-Method-Modifiers
-version=2.12
-revision=2
+version=2.13
+revision=1
 archs=noarch
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -10,8 +10,8 @@ makedepends="perl"
 depends="$makedepends"
 checkdepends="perl-Test-Fatal perl-Test-Requires"
 short_desc="Provides Moose-like method modifiers"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Class-Method-Modifiers"
 distfiles="${CPAN_SITE}/Class/${pkgname/perl-/}-${version}.tar.gz"
-checksum=e44c1073020bf55b8c97975ed77235fd7e2a6a56f29b5c702301721184e27ac8
+checksum=ab5807f71018a842de6b7a4826d6c1f24b8d5b09fcce5005a3309cf6ea40fd63
diff --git a/srcpkgs/perl-Class-XSAccessor/template b/srcpkgs/perl-Class-XSAccessor/template
index 7107d122458..57ef5e24436 100644
--- a/srcpkgs/perl-Class-XSAccessor/template
+++ b/srcpkgs/perl-Class-XSAccessor/template
@@ -1,14 +1,14 @@
 # Template file for 'perl-Class-XSAccessor'
 pkgname=perl-Class-XSAccessor
 version=1.19
-revision=5
+revision=6
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="perl"
 depends="${makedepends}"
 short_desc="Generate fast XS accessors without runtime compilation"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Class-XSAccessor"
 distfiles="${CPAN_SITE}/Class/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Clone-Choose/template b/srcpkgs/perl-Clone-Choose/template
index db66feb1cc2..d5264c751eb 100644
--- a/srcpkgs/perl-Clone-Choose/template
+++ b/srcpkgs/perl-Clone-Choose/template
@@ -10,7 +10,7 @@ makedepends="perl"
 depends="$makedepends"
 checkdepends="perl-Clone perl-Clone-PP perl-Module-Runtime"
 short_desc="Clone::Choose - Choose appropriate clone utility"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Clone-Choose"
 distfiles="${CPAN_SITE}/Clone/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Clone-PP/template b/srcpkgs/perl-Clone-PP/template
index 9c23da74f0f..81ea599562d 100644
--- a/srcpkgs/perl-Clone-PP/template
+++ b/srcpkgs/perl-Clone-PP/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="perl"
 short_desc="Clone::PP - Recursively copy Perl datatypes"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Clone-PP"
 distfiles="${CPAN_SITE}/Clone/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Clone/template b/srcpkgs/perl-Clone/template
index 93473909a40..17b2dc4737f 100644
--- a/srcpkgs/perl-Clone/template
+++ b/srcpkgs/perl-Clone/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Clone'
 pkgname=perl-Clone
 version=0.43
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/perl-Config-Simple/template b/srcpkgs/perl-Config-Simple/template
index 7c5b17270f1..dc86662227a 100644
--- a/srcpkgs/perl-Config-Simple/template
+++ b/srcpkgs/perl-Config-Simple/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="perl"
 short_desc="Config::Simple - simple configuration file class"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Unknown"
 homepage="https://metacpan.org/release/Config-Simple"
 distfiles="http://search.cpan.org/CPAN/authors/id/S/SH/SHERZODR/Config-Simple-${version}.tar.gz"
diff --git a/srcpkgs/perl-Crypt-Blowfish/template b/srcpkgs/perl-Crypt-Blowfish/template
index 1bb185368bc..51bdb744eed 100644
--- a/srcpkgs/perl-Crypt-Blowfish/template
+++ b/srcpkgs/perl-Crypt-Blowfish/template
@@ -1,7 +1,7 @@
 # Template build file for 'perl-Crypt-Blowfish'.
 pkgname=perl-Crypt-Blowfish
 version=2.14
-revision=9
+revision=10
 wrksrc="Crypt-Blowfish-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/perl-Crypt-CAST5/template b/srcpkgs/perl-Crypt-CAST5/template
index 73855c7c154..b7cf8004ec9 100644
--- a/srcpkgs/perl-Crypt-CAST5/template
+++ b/srcpkgs/perl-Crypt-CAST5/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Crypt-CAST5'
 pkgname=perl-Crypt-CAST5
 version=0.05
-revision=4
+revision=5
 wrksrc="${pkgname#perl-}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/perl-Crypt-DES/template b/srcpkgs/perl-Crypt-DES/template
index 86901bc3bca..13f3b5721ef 100644
--- a/srcpkgs/perl-Crypt-DES/template
+++ b/srcpkgs/perl-Crypt-DES/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Crypt-DES'
 pkgname=perl-Crypt-DES
 version=2.07
-revision=4
+revision=5
 wrksrc="${pkgname#perl-}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/perl-Crypt-IDEA/template b/srcpkgs/perl-Crypt-IDEA/template
index bdcea2cb0cb..bb8980b9122 100644
--- a/srcpkgs/perl-Crypt-IDEA/template
+++ b/srcpkgs/perl-Crypt-IDEA/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Crypt-IDEA'
 pkgname=perl-Crypt-IDEA
 version=1.10
-revision=4
+revision=5
 wrksrc="${pkgname#perl-}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
index bf089393720..3c7220b73b4 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Crypt-OpenSSL-Bignum'
 pkgname=perl-Crypt-OpenSSL-Bignum
 version=0.09
-revision=8
+revision=9
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/perl-Crypt-OpenSSL-Guess/template b/srcpkgs/perl-Crypt-OpenSSL-Guess/template
index a60a7d3ab17..8c207e50fa0 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Guess/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Guess/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Module to Guess OpenSSL include path"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Crypt-OpenSSL-Guess"
 distfiles="${CPAN_SITE}/Crypt/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Crypt-OpenSSL-RSA/template b/srcpkgs/perl-Crypt-OpenSSL-RSA/template
index e8407944ec4..73830f64e08 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-RSA/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-RSA/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Crypt-OpenSSL-RSA'
 pkgname=perl-Crypt-OpenSSL-RSA
 version=0.31
-revision=3
+revision=4
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-Crypt-OpenSSL-Guess"
diff --git a/srcpkgs/perl-Crypt-OpenSSL-Random/template b/srcpkgs/perl-Crypt-OpenSSL-Random/template
index 3f1ae2af280..8152afd3e43 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Random/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Random/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Crypt-OpenSSL-Random'
 pkgname=perl-Crypt-OpenSSL-Random
 version=0.15
-revision=6
+revision=7
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-Crypt-OpenSSL-Guess"
diff --git a/srcpkgs/perl-Crypt-Rijndael/template b/srcpkgs/perl-Crypt-Rijndael/template
index a592e569297..608f21077b0 100644
--- a/srcpkgs/perl-Crypt-Rijndael/template
+++ b/srcpkgs/perl-Crypt-Rijndael/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Crypt-Rijndael'
 pkgname=perl-Crypt-Rijndael
-version=1.13
-revision=8
+version=1.14
+revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
@@ -9,7 +9,7 @@ makedepends="perl"
 depends="${hostmakedepends}"
 short_desc="Crypt::Rijndael - Crypt::CBC compliant Rijndael module"
 maintainer="Kevin Berry <kevin@opensourcealchemist.com>"
+license="LGPL-2.0-or-later"
 homepage="https://metacpan.org/release/Crypt-Rijndael"
-license="LGPL-3"
 distfiles="${CPAN_SITE}/Crypt/Crypt-Rijndael-${version}.tar.gz"
-checksum=cd7209a6dfe0a3dc8caffe1aa2233b0e6effec7572d76a7a93feefffe636214e
+checksum=6451c3dffe8703523be2bb08d1adca97e77df2a8a4dd46944d18a99330b7850e
diff --git a/srcpkgs/perl-CryptX/template b/srcpkgs/perl-CryptX/template
index c22ee7dc664..097b821f2d1 100644
--- a/srcpkgs/perl-CryptX/template
+++ b/srcpkgs/perl-CryptX/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-CryptX'
 pkgname=perl-CryptX
 version=0.064
-revision=1
+revision=2
 wrksrc="${pkgname#perl-}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/perl-Curses-UI/template b/srcpkgs/perl-Curses-UI/template
new file mode 100644
index 00000000000..15ab4c13a35
--- /dev/null
+++ b/srcpkgs/perl-Curses-UI/template
@@ -0,0 +1,15 @@
+# Template file for 'perl-Curses-UI'
+pkgname=perl-Curses-UI
+version=0.9609
+revision=1
+wrksrc="${pkgname/perl-/}-${version}"
+build_style=perl-module
+hostmakedepends="perl-Curses perl-Term-ReadKey"
+makedepends="$hostmakedepends"
+depends="$makedepends"
+short_desc="Curses based OO user interface framework"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="Artistic-1.0-Perl, GPL-1.0-or-later"
+homepage="https://metacpan.org/release/Curses"
+distfiles="${CPAN_SITE}/Curses/${pkgname/perl-/}-${version}.tar.gz"
+checksum=0ab827a513b6e14403184fb065a8ea1d2ebda122d2178cbf45c781f311240eaf
diff --git a/srcpkgs/perl-Curses/template b/srcpkgs/perl-Curses/template
index 362d811ccd1..d2f5c8017ad 100644
--- a/srcpkgs/perl-Curses/template
+++ b/srcpkgs/perl-Curses/template
@@ -1,13 +1,13 @@
 # Template file for 'perl-Curses'
 pkgname=perl-Curses
 version=1.36
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="perl ncurses-devel"
 short_desc="Terminal screen handling and optimization"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Curses"
 distfiles="${CPAN_SITE}/Curses/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-DBD-Pg/template b/srcpkgs/perl-DBD-Pg/template
index 74f84ebae48..c76c7647419 100644
--- a/srcpkgs/perl-DBD-Pg/template
+++ b/srcpkgs/perl-DBD-Pg/template
@@ -1,7 +1,7 @@
-# Template build file for 'perl-DBD-Pg'.
+# Template file for 'perl-DBD-Pg'
 pkgname=perl-DBD-Pg
-version=3.7.4
-revision=3
+version=3.10.0
+revision=1
 wrksrc="DBD-Pg-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-DBI"
@@ -9,8 +9,8 @@ makedepends="${hostmakedepends} postgresql-libs-devel"
 depends="perl perl-DBI"
 short_desc="DBD::Pg - PostgreSQL DBI driver"
 maintainer="John Regan <john@jrjrtech.com>"
-homepage="https://metacpan.org/release/DBD-Pg"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
+homepage="https://metacpan.org/release/DBD-Pg"
 distfiles="${CPAN_SITE}/DBD/DBD-Pg-$version.tar.gz"
-checksum=9ffa9c4e9d1d6b1483ec3259114b95998fd7e4a4168931c903b5ad5fd7a6783e
-nocross="yes"
+checksum=e103268a63e2828e3d43659bdba5f743446cbbe047a766f843112eedae105f80
+nocross=yes
diff --git a/srcpkgs/perl-DBD-SQLite/template b/srcpkgs/perl-DBD-SQLite/template
index 9f1678e715d..e36af674ffd 100644
--- a/srcpkgs/perl-DBD-SQLite/template
+++ b/srcpkgs/perl-DBD-SQLite/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-DBD-SQLite'
 pkgname=perl-DBD-SQLite
 version=1.64
-revision=1
+revision=2
 wrksrc="DBD-SQLite-${version}"
 build_style=perl-module
 configure_args="SQLITE_LOCATION=${XBPS_CROSS_BASE}/usr"
diff --git a/srcpkgs/perl-DBD-mysql/template b/srcpkgs/perl-DBD-mysql/template
index 3ee5e54edfc..fa85722d723 100644
--- a/srcpkgs/perl-DBD-mysql/template
+++ b/srcpkgs/perl-DBD-mysql/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-DBD-mysql'
 pkgname=perl-DBD-mysql
 version=4.050
-revision=2
+revision=3
 wrksrc="DBD-mysql-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-DBI perl-Devel-CheckLib"
diff --git a/srcpkgs/perl-DBI/template b/srcpkgs/perl-DBI/template
index 7cda7b4f8fc..9de63ac28e3 100644
--- a/srcpkgs/perl-DBI/template
+++ b/srcpkgs/perl-DBI/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-DBI'
 pkgname=perl-DBI
 version=1.642
-revision=1
+revision=2
 wrksrc="DBI-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/perl-Danga-Socket/template b/srcpkgs/perl-Danga-Socket/template
index 1cf9eb8c941..f656b5d69c5 100644
--- a/srcpkgs/perl-Danga-Socket/template
+++ b/srcpkgs/perl-Danga-Socket/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl-Sys-Syscall"
 depends="$makedepends"
 short_desc="Event loop and event-driven async sockets"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Danga-Socket"
 distfiles="${CPAN_SITE}/Danga/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Data-MessagePack/template b/srcpkgs/perl-Data-MessagePack/template
index 8392e1d51c7..66f493ad50d 100644
--- a/srcpkgs/perl-Data-MessagePack/template
+++ b/srcpkgs/perl-Data-MessagePack/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Data-MessagePack'
 pkgname=perl-Data-MessagePack
 version=1.00
-revision=4
+revision=5
 wrksrc="${pkgname/perl-//}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
@@ -9,7 +9,7 @@ makedepends="perl"
 checkdepends="perl-Test-Requires perl-Test-LeakTrace"
 depends="perl"
 short_desc="Data::MessagePack - MessagePack serializing/deserializing"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Data-MessagePack"
 distfiles="${CPAN_SITE}/Data/Data-MessagePack-${version}.tar.gz"
diff --git a/srcpkgs/perl-Data-Section-Simple/template b/srcpkgs/perl-Data-Section-Simple/template
index 2a92e074533..5148ad90e52 100644
--- a/srcpkgs/perl-Data-Section-Simple/template
+++ b/srcpkgs/perl-Data-Section-Simple/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="perl"
 short_desc="Data::Section::Simple - Read data from __DATA__"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Data-Section-Simple"
 distfiles="${CPAN_SITE}/Data/Data-Section-Simple-${version}.tar.gz"
diff --git a/srcpkgs/perl-Data-UUID/template b/srcpkgs/perl-Data-UUID/template
index 3a1256804f9..d3dfa60cb44 100644
--- a/srcpkgs/perl-Data-UUID/template
+++ b/srcpkgs/perl-Data-UUID/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Data-UUID'
 pkgname=perl-Data-UUID
 version=1.224
-revision=1
+revision=2
 wrksrc="Data-UUID-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/perl-Date-Manip/template b/srcpkgs/perl-Date-Manip/template
index 2c717a1225e..36ce91903b6 100644
--- a/srcpkgs/perl-Date-Manip/template
+++ b/srcpkgs/perl-Date-Manip/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-Date-Manip'
 pkgname=perl-Date-Manip
-version=6.76
+version=6.78
 revision=1
 archs=noarch
 wrksrc="${pkgname/perl-/}-${version}"
@@ -14,4 +14,4 @@ maintainer="John Regan <john@jrjrtech.com>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Date-Manip"
 distfiles="${CPAN_SITE}/Date/${pkgname/perl-/}-${version}.tar.gz"
-checksum=1c87c78c03e3479e3b695952c0a5c11d3593ca9a5340dfb14d0be3d3e7ad63a8
+checksum=cb36084401f9e89999c7046811c83ac58ea44fc12827bf61ca1167a79e915db9
diff --git a/srcpkgs/perl-DateTime-TimeZone/template b/srcpkgs/perl-DateTime-TimeZone/template
index fe80fca8d0c..5e3cd42f9e1 100644
--- a/srcpkgs/perl-DateTime-TimeZone/template
+++ b/srcpkgs/perl-DateTime-TimeZone/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-DateTime-TimeZone'
 pkgname=perl-DateTime-TimeZone
-version=2.34
+version=2.37
 revision=1
 archs=noarch
 wrksrc="${pkgname/perl-/}-${version}"
@@ -15,4 +15,4 @@ maintainer="John Regan <john@jrjrtech.com>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/DateTime-TimeZone"
 distfiles="${CPAN_SITE}/DateTime/${pkgname/perl-/}-${version}.tar.gz"
-checksum=dee1111c06f2aa705f803bc4f3d93b50df566d864a1a8bf31b55dfaf2b3de809
+checksum=6c12dfa6ad190191d437a7661c644fc38aaf109001e1d958c95dbb0aa143c421
diff --git a/srcpkgs/perl-DateTime/template b/srcpkgs/perl-DateTime/template
index aff7927c94d..a99d3ff8b29 100644
--- a/srcpkgs/perl-DateTime/template
+++ b/srcpkgs/perl-DateTime/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-DateTime'
 pkgname=perl-DateTime
-version=1.50
-revision=4
+version=1.51
+revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
@@ -13,8 +13,8 @@ maintainer="John Regan <john@jrjrtech.com>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/DateTime"
 distfiles="${CPAN_SITE}/DateTime/${pkgname/perl-/}-${version}.tar.gz"
-checksum=ed6b0c71ddd81310a82459508df9197074e6b13aea46fd279045c3ddc3c4b198
+checksum=de22da0de57a43a976322636d3a7474de4b1d6f37e044337123086cf94c16ec5
 
 # This isn't a direct dependency but when soname bumping perl it will
 # cause build failures
-hostmakedepends+=" perl-Package-Stash-XS perl-Sub-Identify perl-Variable-Magic perl-Params-Util"
+hostmakedepends+=" perl-Package-Stash-XS perl-Sub-Identify perl-Variable-Magic perl-Params-Util perl-Sub-Name"
diff --git a/srcpkgs/perl-Devel-Caller/template b/srcpkgs/perl-Devel-Caller/template
index 52f2665dc4e..8518b1a8e46 100644
--- a/srcpkgs/perl-Devel-Caller/template
+++ b/srcpkgs/perl-Devel-Caller/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Devel-Caller'
 pkgname=perl-Devel-Caller
 version=2.06
-revision=9
+revision=10
 wrksrc="${pkgname#*-}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/perl-Devel-LexAlias/template b/srcpkgs/perl-Devel-LexAlias/template
index 1ba0e341201..fe756906ed6 100644
--- a/srcpkgs/perl-Devel-LexAlias/template
+++ b/srcpkgs/perl-Devel-LexAlias/template
@@ -1,14 +1,14 @@
 # Template file for 'perl-Devel-LexAlias'
 pkgname=perl-Devel-LexAlias
 version=0.05
-revision=4
+revision=5
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="perl perl-Devel-Caller"
 depends="${makedepends}"
 short_desc="Devel::LexAlias - alias lexical variables"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Devel-LexAlias"
 distfiles="${CPAN_SITE}/Devel/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Digest-SHA1/template b/srcpkgs/perl-Digest-SHA1/template
index 31c61c34d7e..c4a2eb2330b 100644
--- a/srcpkgs/perl-Digest-SHA1/template
+++ b/srcpkgs/perl-Digest-SHA1/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Digest-SHA1'
 pkgname=perl-Digest-SHA1
 version=2.13
-revision=6
+revision=7
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/perl-Email-Address-XS/template b/srcpkgs/perl-Email-Address-XS/template
index 7b774e5a8eb..897817a9ddc 100644
--- a/srcpkgs/perl-Email-Address-XS/template
+++ b/srcpkgs/perl-Email-Address-XS/template
@@ -1,14 +1,14 @@
 # Template file for 'perl-Email-Address-XS'
 pkgname=perl-Email-Address-XS
 version=1.04
-revision=4
+revision=5
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="perl"
 depends="${makedepends}"
 short_desc="Parse and format RFC 2822 email addresses and groups"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Email-Address-XS"
 distfiles="${CPAN_SITE}/Email/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Email-Date-Format/template b/srcpkgs/perl-Email-Date-Format/template
index 4bfe7fd3854..57781d72c02 100644
--- a/srcpkgs/perl-Email-Date-Format/template
+++ b/srcpkgs/perl-Email-Date-Format/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Produce RFC 2822 date strings"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Email-Date-Format"
 distfiles="${CPAN_SITE}/Email/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Email-MIME-ContentType/template b/srcpkgs/perl-Email-MIME-ContentType/template
index 594351b7dcf..73737a61714 100644
--- a/srcpkgs/perl-Email-MIME-ContentType/template
+++ b/srcpkgs/perl-Email-MIME-ContentType/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Parse a MIME Content-Type or Content-Disposition Header"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Email-MIME-ContentType"
 distfiles="${CPAN_SITE}/Email/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Email-MIME-Encodings/template b/srcpkgs/perl-Email-MIME-Encodings/template
index 35456d74ff5..ba28cb0ac78 100644
--- a/srcpkgs/perl-Email-MIME-Encodings/template
+++ b/srcpkgs/perl-Email-MIME-Encodings/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl perl-Capture-Tiny"
 depends="$makedepends"
 short_desc="A unified interface to MIME encoding and decoding"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Email-MIME-Encodings"
 distfiles="${CPAN_SITE}/Email/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Email-MIME/template b/srcpkgs/perl-Email-MIME/template
index c57c28f38f0..794ad31cff2 100644
--- a/srcpkgs/perl-Email-MIME/template
+++ b/srcpkgs/perl-Email-MIME/template
@@ -11,7 +11,7 @@ makedepends="perl perl-Email-Address-XS perl-Email-MIME-ContentType
  perl-MIME-Types perl-Module-Runtime"
 depends="$makedepends"
 short_desc="Easy MIME message handling"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Email-MIME"
 distfiles="${CPAN_SITE}/Email/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Email-MessageID/template b/srcpkgs/perl-Email-MessageID/template
index ed39d92cc1b..5b52585b5f9 100644
--- a/srcpkgs/perl-Email-MessageID/template
+++ b/srcpkgs/perl-Email-MessageID/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Generate world unique message-ids"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Email-MessageID"
 distfiles="${CPAN_SITE}/Email/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Email-Simple/template b/srcpkgs/perl-Email-Simple/template
index 165cd8254ea..57ccc513dbe 100644
--- a/srcpkgs/perl-Email-Simple/template
+++ b/srcpkgs/perl-Email-Simple/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl perl-Email-Date-Format"
 depends="$makedepends"
 short_desc="Simple parsing of RFC2822 message format and headers"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Email-Simple"
 distfiles="${CPAN_SITE}/Email/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-FFI-CheckLib/template b/srcpkgs/perl-FFI-CheckLib/template
index cea7f57baa4..97ab1b6ff4c 100644
--- a/srcpkgs/perl-FFI-CheckLib/template
+++ b/srcpkgs/perl-FFI-CheckLib/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-FFI-CheckLib'
 pkgname=perl-FFI-CheckLib
-version=0.23
+version=0.25
 revision=1
 archs=noarch
 wrksrc="${pkgname/perl-/}-${version}"
@@ -9,8 +9,8 @@ hostmakedepends="perl"
 depends="perl"
 checkdepends="perl-Test2-Suite"
 short_desc="Check that a library is available for FFI"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/pod/FFI::CheckLib"
 distfiles="https://cpan.metacpan.org/authors/id/P/PL/PLICEASE/FFI-CheckLib-${version}.tar.gz"
-checksum=4ec7abca15f070dac2392d36b48a3ad27d80b4ee4cb2944a69e7ea0cb4da5166
+checksum=eb36b9a7cff1764a65b1b77e01e92c26207c558a3f986d0d17d2b110fa366ba4
diff --git a/srcpkgs/perl-File-BaseDir/template b/srcpkgs/perl-File-BaseDir/template
index 0303d25ed9c..ada966fc66f 100644
--- a/srcpkgs/perl-File-BaseDir/template
+++ b/srcpkgs/perl-File-BaseDir/template
@@ -10,7 +10,7 @@ makedepends="perl-File-Which perl-IPC-System-Simple"
 depends="perl"
 checkdepends="perl-Test-Pod perl-Test-Pod-Coverage xdg-user-dirs"
 short_desc="File::BaseDir - Use the Freedesktop.org base directory specification"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/File-BaseDir"
 distfiles="${CPAN_SITE}/File/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-File-Copy-Recursive/template b/srcpkgs/perl-File-Copy-Recursive/template
index 4b9209154bd..02d38a02582 100644
--- a/srcpkgs/perl-File-Copy-Recursive/template
+++ b/srcpkgs/perl-File-Copy-Recursive/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-File-Copy-Recursive'
 pkgname=perl-File-Copy-Recursive
-version=0.44
+version=0.45
 revision=1
 archs=noarch
 wrksrc="${pkgname/perl-/}-${version}"
@@ -10,8 +10,8 @@ makedepends="perl perl-Path-Tiny"
 depends="$makedepends"
 checkdepends="perl-Test-Deep perl-Test-Fatal perl-Test-File perl-Test-Warnings"
 short_desc="Perl extension for recursively copying files and directories"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/File-Copy-Recursive"
 distfiles="${CPAN_SITE}/File/${pkgname/perl-/}-${version}.tar.gz"
-checksum=ae19a0b58dc1b3cded9ba9cfb109288d8973d474c0b4bfd28b27cf60e8ca6ee4
+checksum=d3971cf78a8345e38042b208bb7b39cb695080386af629f4a04ffd6549df1157
diff --git a/srcpkgs/perl-File-Find-Rule/template b/srcpkgs/perl-File-Find-Rule/template
index a71009826e9..aecdb1ab8d5 100644
--- a/srcpkgs/perl-File-Find-Rule/template
+++ b/srcpkgs/perl-File-Find-Rule/template
@@ -9,7 +9,7 @@ hostmakedepends="perl perl-Text-Glob perl-Number-Compare"
 makedepends="perl"
 depends="$hostmakedepends"
 short_desc="Alternative interface to File::Find"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/File-Find-Rule"
 distfiles="${CPAN_SITE}/File/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-File-Flock-Retry/template b/srcpkgs/perl-File-Flock-Retry/template
index 86ff85d9d38..0d7d912386a 100644
--- a/srcpkgs/perl-File-Flock-Retry/template
+++ b/srcpkgs/perl-File-Flock-Retry/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl perl-File-chdir perl-File-Slurper"
 depends="$makedepends"
 short_desc="Yet another flock module"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/File-Flock-Retry"
 distfiles="${CPAN_SITE}/File/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-File-Slurp/template b/srcpkgs/perl-File-Slurp/template
index 9c0172a1804..242d810a33a 100644
--- a/srcpkgs/perl-File-Slurp/template
+++ b/srcpkgs/perl-File-Slurp/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-File-Slurp'
 pkgname=perl-File-Slurp
-version=9999.27
+version=9999.28
 revision=1
 archs=noarch
 wrksrc="${pkgname#perl-}-${version}"
@@ -9,8 +9,8 @@ hostmakedepends="perl"
 makedepends="$hostmakedepends"
 depends="$hostmakedepends"
 short_desc="Simple and Efficient Reading/Writing/Modifying of Complete Files"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/File-Slurp"
 distfiles="${CPAN_SITE}/File/${pkgname#perl-}-${version}.tar.gz"
-checksum=3a9d884f664c37946adb58f76b7708bf48c8b3fa9c34244f8cdb451ce41c43f4
+checksum=0587ce010bcb79db9e744f14b5498be97bf2c7f2474d971916d92f0a10827cee
diff --git a/srcpkgs/perl-File-Slurper/template b/srcpkgs/perl-File-Slurper/template
index 4d7871d4c93..4d863f45594 100644
--- a/srcpkgs/perl-File-Slurper/template
+++ b/srcpkgs/perl-File-Slurper/template
@@ -10,7 +10,7 @@ makedepends="perl"
 checkdepends="perl-Test-Warnings"
 depends="perl"
 short_desc="File::Slurper - A simple, sane and efficient module to slurp a file"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/File-Slurper"
 distfiles="${CPAN_SITE}/File/File-Slurper-${version}.tar.gz"
diff --git a/srcpkgs/perl-File-Write-Rotate/template b/srcpkgs/perl-File-Write-Rotate/template
index d0a8c9febbe..b0cce6f7c18 100644
--- a/srcpkgs/perl-File-Write-Rotate/template
+++ b/srcpkgs/perl-File-Write-Rotate/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-File-Write-Rotate'
 pkgname=perl-File-Write-Rotate
-version=0.31
-revision=2
+version=0.321
+revision=1
 archs=noarch
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -11,8 +11,8 @@ depends="$makedepends"
 checkdepends="perl-File-chdir perl-Monkey-Patch-Action perl-tainting perl-Test-Warnings
  perl-Test-Exception"
 short_desc="Write to files that archive/rotate themselves"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/File-Write-Rotate"
 distfiles="${CPAN_SITE}/File/${pkgname/perl-/}-${version}.tar.gz"
-checksum=df85cb70031a70043b576bb45abc9edce8e328c7f463f43084d7bae24927d033
+checksum=996929eaf57f4c4bd3c7e5ebc96dc584cb47c419089419fe94d096201673e5a3
diff --git a/srcpkgs/perl-File-chdir/template b/srcpkgs/perl-File-chdir/template
index 39773013f18..af6a761eaf2 100644
--- a/srcpkgs/perl-File-chdir/template
+++ b/srcpkgs/perl-File-chdir/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="More sensible way to change directories"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/File-chdir"
 distfiles="https://www.cpan.org/authors/id/D/DA/DAGOLDEN/File-chdir-${version}.tar.gz"
diff --git a/srcpkgs/perl-File-pushd/template b/srcpkgs/perl-File-pushd/template
index a387560e7a2..1ff8d169a2f 100644
--- a/srcpkgs/perl-File-pushd/template
+++ b/srcpkgs/perl-File-pushd/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="File::pushd - change directory temporarily for a limited scope"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/File-pushd"
 distfiles="${CPAN_SITE}/File/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Filesys-Df/template b/srcpkgs/perl-Filesys-Df/template
index edfe13638b9..9fdf493ed6b 100644
--- a/srcpkgs/perl-Filesys-Df/template
+++ b/srcpkgs/perl-Filesys-Df/template
@@ -1,7 +1,7 @@
 # Template build file for 'perl-Filesys-Df'
 pkgname=perl-Filesys-Df
 version=0.92
-revision=6
+revision=7
 wrksrc="Filesys-Df-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/perl-Filesys-Notify-Simple/template b/srcpkgs/perl-Filesys-Notify-Simple/template
index 2a46b6a1d31..5fb6d5f0d79 100644
--- a/srcpkgs/perl-Filesys-Notify-Simple/template
+++ b/srcpkgs/perl-Filesys-Notify-Simple/template
@@ -10,7 +10,7 @@ makedepends="perl"
 depends="$makedepends"
 checkdepends="perl-Test-SharedFork"
 short_desc="Simple and dumb file system watcher"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Filesys-Notify-Simple"
 distfiles="${CPAN_SITE}/Filesys/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Fuse/template b/srcpkgs/perl-Fuse/template
index 9090b98cb80..4f7a1349d9a 100644
--- a/srcpkgs/perl-Fuse/template
+++ b/srcpkgs/perl-Fuse/template
@@ -1,7 +1,7 @@
 # Template build file for 'perl-Fuse'.
 pkgname=perl-Fuse
 version=0.16
-revision=12
+revision=13
 wrksrc="Fuse-$version"
 build_style=perl-module
 hostmakedepends="pkg-config perl"
diff --git a/srcpkgs/perl-Getopt-Compact/template b/srcpkgs/perl-Getopt-Compact/template
index a1a76e40367..4fd53e9b485 100644
--- a/srcpkgs/perl-Getopt-Compact/template
+++ b/srcpkgs/perl-Getopt-Compact/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl perl-Text-Table"
 depends="$makedepends"
 short_desc="Getopt::Compact - getopt processing in a compact statement"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Getopt-Compact"
 distfiles="${CPAN_SITE}/Getopt/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Glib-Object-Introspection/template b/srcpkgs/perl-Glib-Object-Introspection/template
index 227e1515fe9..e0235e07ae6 100644
--- a/srcpkgs/perl-Glib-Object-Introspection/template
+++ b/srcpkgs/perl-Glib-Object-Introspection/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Glib-Object-Introspection'
 pkgname=perl-Glib-Object-Introspection
 version=0.047
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/perl-Glib/template b/srcpkgs/perl-Glib/template
index 5e9b2230f37..ed98bd58445 100644
--- a/srcpkgs/perl-Glib/template
+++ b/srcpkgs/perl-Glib/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-Glib'
 pkgname=perl-Glib
-version=1.329
+version=1.3291
 revision=1
 wrksrc="Glib-${version}"
 build_style=perl-module
@@ -12,5 +12,5 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="http://gtk2-perl.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/gtk2-perl/Glib-${version}.tar.gz"
-checksum=7b4ce1c8cf884849189efaa0b5722ecfb0d87a15f94fccc6a6017d3b3f982a35
+checksum=b983cdd87b9d3b5537edb110842313356237ab01b020b5f547f86f7e902b1f72
 nocross=yes
diff --git a/srcpkgs/perl-Goo-Canvas/template b/srcpkgs/perl-Goo-Canvas/template
index cd2f7e04c48..cfe2b60c986 100644
--- a/srcpkgs/perl-Goo-Canvas/template
+++ b/srcpkgs/perl-Goo-Canvas/template
@@ -1,7 +1,7 @@
 # Template build file for 'perl-Goo-Canvas'.
 pkgname=perl-Goo-Canvas
 version=0.06
-revision=5
+revision=6
 wrksrc="Goo-Canvas-$version"
 build_style=perl-module
 hostmakedepends="pkg-config perl perl-ExtUtils-Depends perl-ExtUtils-PkgConfig perl-Cairo perl-Gtk2"
diff --git a/srcpkgs/perl-Gtk2-ImageView/template b/srcpkgs/perl-Gtk2-ImageView/template
index 618dc79e500..b962dd87510 100644
--- a/srcpkgs/perl-Gtk2-ImageView/template
+++ b/srcpkgs/perl-Gtk2-ImageView/template
@@ -1,7 +1,7 @@
 # Template build file for 'perl-Gtk2-ImageView'
 pkgname=perl-Gtk2-ImageView
 version=0.05
-revision=5
+revision=6
 wrksrc="Gtk2-ImageView-$version"
 build_style=perl-module
 hostmakedepends="perl perl-ExtUtils-Depends perl-ExtUtils-PkgConfig"
diff --git a/srcpkgs/perl-Gtk2-Notify/template b/srcpkgs/perl-Gtk2-Notify/template
index f47ee780bd2..e1ea6ea72ba 100644
--- a/srcpkgs/perl-Gtk2-Notify/template
+++ b/srcpkgs/perl-Gtk2-Notify/template
@@ -1,7 +1,7 @@
 # Template build file for 'perl-Gtk2-Notify'
 pkgname=perl-Gtk2-Notify
 version=0.05
-revision=5
+revision=6
 build_style=perl-module
 hostmakedepends="perl perl-Gtk2 gtk+-devel libnotify-devel perl-ExtUtils-Depends perl-ExtUtils-PkgConfig"
 makedepends="${hostmakedepends}"
diff --git a/srcpkgs/perl-Gtk2/template b/srcpkgs/perl-Gtk2/template
index 8e5ce9ce37e..1e770c45e9d 100644
--- a/srcpkgs/perl-Gtk2/template
+++ b/srcpkgs/perl-Gtk2/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Gtk2'
 pkgname=perl-Gtk2
-version=1.24992
-revision=3
+version=1.24993
+revision=1
 wrksrc="Gtk2-$version"
 build_style=perl-module
 hostmakedepends="perl"
@@ -9,7 +9,7 @@ makedepends="perl-ExtUtils-Depends perl-ExtUtils-PkgConfig gtk+-devel perl-Pango
 depends="perl perl-Pango"
 short_desc="Perl bindings for Gtk2"
 maintainer="Orphaned <orphan@voidlinux.org>"
+license="LGPL-2.1-or-later"
 homepage="http://gtk2-perl.sourceforge.net/"
-license="LGPL-2.1"
 distfiles="${SOURCEFORGE_SITE}/gtk2-perl/Gtk2-$version.tar.gz"
-checksum=a2ed6902f7f29f7c8dddbe58119589f433252a12132c295c54afbac587cc8480
+checksum=49c443743b2eefe11a768002724f7f6a4c48efc94ff3cd3a559fb7e7b693c967
diff --git a/srcpkgs/perl-Gtk3/template b/srcpkgs/perl-Gtk3/template
index 7574a01da16..0c0acc3b0db 100644
--- a/srcpkgs/perl-Gtk3/template
+++ b/srcpkgs/perl-Gtk3/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-Gtk3'
 pkgname=perl-Gtk3
-version=0.035
+version=0.036
 revision=1
 archs=noarch
 wrksrc="${pkgname#perl-}-${version}"
@@ -14,4 +14,4 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
 license="LGPL-2.1-or-later"
 homepage="http://gtk2-perl.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/gtk2-perl/Gtk3/Gtk3-${version}.tar.gz"
-checksum=8fb9d69da95b724d70793e084ea40b7d62839e1b4ce6a5bb9579a4257b2419fe
+checksum=b6727f38a0ffcb7d57c3ea7653b7f06c292e419c2091b459cf1f77e1eafdc4c9
diff --git a/srcpkgs/perl-HTML-Form/template b/srcpkgs/perl-HTML-Form/template
index 835a725c159..c1e1ed34f01 100644
--- a/srcpkgs/perl-HTML-Form/template
+++ b/srcpkgs/perl-HTML-Form/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-HTML-Form'
 pkgname=perl-HTML-Form
-version=6.04
+version=6.05
 revision=1
 archs=noarch
 wrksrc="${pkgname/perl-/}-${version}"
@@ -13,4 +13,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/HTML-Form"
 distfiles="${CPAN_SITE}/HTML/HTML-Form-${version}.tar.gz"
-checksum=9cd557a8b61b9a98deceff259c4fb1d82df729ff9d0388f655b364dd16480080
+checksum=36c6c601ca829719f6651be1b80872028f82bec1712608dd860deeb67da32492
diff --git a/srcpkgs/perl-HTML-Parser/template b/srcpkgs/perl-HTML-Parser/template
index 2bbb08c0c88..51da32004cf 100644
--- a/srcpkgs/perl-HTML-Parser/template
+++ b/srcpkgs/perl-HTML-Parser/template
@@ -1,7 +1,7 @@
 # Template build file for 'perl-Parser'.
 pkgname=perl-HTML-Parser
 version=3.72
-revision=7
+revision=8
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/perl-HTML-Tree/template b/srcpkgs/perl-HTML-Tree/template
index e9f61c059c9..b77bf5c83a6 100644
--- a/srcpkgs/perl-HTML-Tree/template
+++ b/srcpkgs/perl-HTML-Tree/template
@@ -10,7 +10,7 @@ makedepends="perl perl-HTML-Parser perl-HTML-Tagset perl-LWP"
 depends="$makedepends"
 checkdepends="perl-Test-Fatal"
 short_desc="Functions that construct a HTML syntax tree"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/HTML-Tree"
 distfiles="${CPAN_SITE}/HTML/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-HTTP-Daemon/template b/srcpkgs/perl-HTTP-Daemon/template
index 51f8459bfb1..d9161622e18 100644
--- a/srcpkgs/perl-HTTP-Daemon/template
+++ b/srcpkgs/perl-HTTP-Daemon/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-HTTP-Daemon'
 pkgname=perl-HTTP-Daemon
-version=6.05
+version=6.06
 revision=1
 archs=noarch
 wrksrc="${pkgname/perl-/}-${version}"
@@ -14,4 +14,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/HTTP-Daemon"
 distfiles="${CPAN_SITE}/HTTP/HTTP-Daemon-${version}.tar.gz"
-checksum=b47fa46688bfd8a6e99eccf449dc5705e5530022b2fc8a873a9d07921345c72d
+checksum=fc03a161b54553f766457a4267e7066767f54ad01cacfe9a91d7caa2a0319bad
diff --git a/srcpkgs/perl-IO-HTML/template b/srcpkgs/perl-IO-HTML/template
index 78d16cde006..7fb1ca71ede 100644
--- a/srcpkgs/perl-IO-HTML/template
+++ b/srcpkgs/perl-IO-HTML/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Open an HTML file with automatic charset detection"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/IO-HTML"
 distfiles="${CPAN_SITE}/IO/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-IO-SessionData/template b/srcpkgs/perl-IO-SessionData/template
index ad09406c1b6..04b7108a4df 100644
--- a/srcpkgs/perl-IO-SessionData/template
+++ b/srcpkgs/perl-IO-SessionData/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Supporting module for SOAP::Lite"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/IO-SessionData"
 distfiles="${CPAN_SITE}/IO/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-IO-Tty/template b/srcpkgs/perl-IO-Tty/template
index adc11dea7fc..cbb0becda26 100644
--- a/srcpkgs/perl-IO-Tty/template
+++ b/srcpkgs/perl-IO-Tty/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-IO-Tty'
 pkgname=perl-IO-Tty
 version=1.12
-revision=7
+revision=8
 wrksrc="IO-Tty-$version"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/perl-IPC-System-Simple/template b/srcpkgs/perl-IPC-System-Simple/template
index 5ef360ef6e7..d9a3f351b0a 100644
--- a/srcpkgs/perl-IPC-System-Simple/template
+++ b/srcpkgs/perl-IPC-System-Simple/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="IPC::System::Simple - Run commands simply, with detailed diagnostics"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/IPC-System-Simple"
 distfiles="${CPAN_SITE}/IPC/${pkgname/perl-}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Image-Sane/template b/srcpkgs/perl-Image-Sane/template
index 337790c65ef..a375feb2680 100644
--- a/srcpkgs/perl-Image-Sane/template
+++ b/srcpkgs/perl-Image-Sane/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Image-Sane'
 pkgname=perl-Image-Sane
-version=0.14
-revision=5
+version=4
+revision=2
 wrksrc=Image-Sane-${version}
 build_style=perl-module
 hostmakedepends="perl perl-ExtUtils-Depends perl-ExtUtils-PkgConfig"
@@ -12,4 +12,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Image-Sane"
 distfiles="${CPAN_SITE}/Sane/RATCLIFFE/Image-Sane-${version}.tar.gz"
-checksum=a4b027c9b7650291f1acb0eb93861a7fc45aef4e08f6726843f174fa113c8ba5
+checksum=f970a0314e554f6fe29dcc651aec5bd45b32d547801d304434ae80b4b806896b
diff --git a/srcpkgs/perl-Importer/template b/srcpkgs/perl-Importer/template
index acf93800990..455ee533b1b 100644
--- a/srcpkgs/perl-Importer/template
+++ b/srcpkgs/perl-Importer/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Alternative but compatible interface to modules that export symbols"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Importer"
 distfiles="https://cpan.metacpan.org/authors/id/E/EX/EXODIST/Importer-${version}.tar.gz"
diff --git a/srcpkgs/perl-Inline-C/template b/srcpkgs/perl-Inline-C/template
index 1ded429c5e3..1ed461f4ffa 100644
--- a/srcpkgs/perl-Inline-C/template
+++ b/srcpkgs/perl-Inline-C/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-Inline-C'
 pkgname=perl-Inline-C
-version=0.80
+version=0.81
 revision=1
 archs=noarch
 wrksrc="${pkgname/perl-/}-${version}"
@@ -11,8 +11,8 @@ makedepends="perl-File-Copy-Recursive perl-Inline perl-Parse-RecDescent
 depends="$makedepends"
 checkdepends="perl-Test-Warn"
 short_desc="C language support for Inline"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Inline-C"
 distfiles="${CPAN_SITE}/Inline/${pkgname/perl-/}-${version}.tar.gz"
-checksum=35f5ff188f56b9c8a5ec342e2ff3a2d248ddbc91eead80d9361697914d5adbe3
+checksum=f185258d9050d7f79b4f00f12625cc469c2f700ff62d3e831cb18d80d2c87aac
diff --git a/srcpkgs/perl-Inline/template b/srcpkgs/perl-Inline/template
index 003c79990b4..07718a79d30 100644
--- a/srcpkgs/perl-Inline/template
+++ b/srcpkgs/perl-Inline/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-Inline'
 pkgname=perl-Inline
-version=0.82
+version=0.83
 revision=1
 archs=noarch
 wrksrc="${pkgname/perl-/}-${version}"
@@ -10,8 +10,8 @@ makedepends="perl"
 depends="$makedepends"
 checkdepends="perl-Test-Warn"
 short_desc="Write Perl Subroutines in Other Programming Languages"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Inline"
 distfiles="${CPAN_SITE}/Inline/${pkgname/perl-/}-${version}.tar.gz"
-checksum=1af94a8e95e4ba4545592341c47d8d1dc45b01822b877f7d3095a438566e874b
+checksum=171a8e5f66faf88fe5ef4de7126267cd8fb2503483432eabc3b88ac7d5be4239
diff --git a/srcpkgs/perl-JSON-XS/template b/srcpkgs/perl-JSON-XS/template
index 07ce7a7058a..aed01d75e5b 100644
--- a/srcpkgs/perl-JSON-XS/template
+++ b/srcpkgs/perl-JSON-XS/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-JSON-XS'
 pkgname=perl-JSON-XS
 version=4.02
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-Canary-Stability"
diff --git a/srcpkgs/perl-LWP-MediaTypes/template b/srcpkgs/perl-LWP-MediaTypes/template
index 6c270800659..bdb32bcf9ee 100644
--- a/srcpkgs/perl-LWP-MediaTypes/template
+++ b/srcpkgs/perl-LWP-MediaTypes/template
@@ -10,7 +10,7 @@ makedepends="$hostmakedepends"
 depends="$makedepends"
 checkdepends="perl-Test-Fatal"
 short_desc="LWP::MediaTypes - guess media type for a file or a URL"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/LWP-MediaTypes"
 distfiles="${CPAN_SITE}/LWP/LWP-MediaTypes-${version}.tar.gz"
diff --git a/srcpkgs/perl-Lchown/template b/srcpkgs/perl-Lchown/template
index 91829220c74..fd6a946af5c 100644
--- a/srcpkgs/perl-Lchown/template
+++ b/srcpkgs/perl-Lchown/template
@@ -1,12 +1,12 @@
 # Template file for 'perl-Lchown'
 pkgname=perl-Lchown
 version=1.01
-revision=12
+revision=13
 wrksrc="Lchown-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-Module-Build"
 makedepends="$hostmakedepends"
-shlib_requires=libperl.so.5.28
+shlib_requires=libperl.so.5.30
 depends="$makedepends"
 short_desc="Perl module interface to the lchown() system call"
 maintainer="Orphaned <orphan@voidlinux.org>"
diff --git a/srcpkgs/perl-Linux-Inotify2/template b/srcpkgs/perl-Linux-Inotify2/template
index 5d89f166dd6..f7162a199c2 100644
--- a/srcpkgs/perl-Linux-Inotify2/template
+++ b/srcpkgs/perl-Linux-Inotify2/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Linux-Inotify2'
 pkgname=perl-Linux-Inotify2
 version=2.1
-revision=1
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/perl-List-MoreUtils-XS/template b/srcpkgs/perl-List-MoreUtils-XS/template
index 5e07a11a533..cce89491ab5 100644
--- a/srcpkgs/perl-List-MoreUtils-XS/template
+++ b/srcpkgs/perl-List-MoreUtils-XS/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-List-MoreUtils-XS'
 pkgname=perl-List-MoreUtils-XS
 version=0.428
-revision=5
+revision=6
 wrksrc="List-MoreUtils-XS-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/perl-Locale-gettext/template b/srcpkgs/perl-Locale-gettext/template
index 8f2e09ab7e3..3316fd73fdc 100644
--- a/srcpkgs/perl-Locale-gettext/template
+++ b/srcpkgs/perl-Locale-gettext/template
@@ -1,7 +1,7 @@
 # Template build file for 'perl-Locale-gettext'
 pkgname=perl-Locale-gettext
 version=1.07
-revision=8
+revision=9
 wrksrc="Locale-gettext-$version"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/perl-MP3-Tag/template b/srcpkgs/perl-MP3-Tag/template
index 615c9cacd55..1bff6e2e7b7 100644
--- a/srcpkgs/perl-MP3-Tag/template
+++ b/srcpkgs/perl-MP3-Tag/template
@@ -1,16 +1,16 @@
 # Template file for 'perl-MP3-Tag'
 pkgname=perl-MP3-Tag
-version=1.14
+version=1.15
 revision=1
 archs=noarch
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
-hostmakedepends="perl"
+hostmakedepends="perl unzip"
 makedepends="${hostmakedepends}"
 depends="${makedepends}"
 short_desc="Module for reading tags of MP3 audio files"
 maintainer="eater <=@eater.me>"
+license="Artistic-1.0-Perl"
 homepage="https://metacpan.org/release/MP3-Tag"
-license="Artistic"
-distfiles="${CPAN_SITE}/MP3/${pkgname/perl-/}-${version}.tar.gz"
-checksum=3ec392f273ce38228ee2d7e53f7622f6f90a9c31c5079e6c9f354fb04a98c259
+distfiles="${CPAN_SITE}/MP3/${pkgname/perl-/}-${version}.zip"
+checksum=aaac48f4637edca408fd79381bc0bff0f9b11bd8e1e94de059dae993365f56d1
diff --git a/srcpkgs/perl-Mail-Box/template b/srcpkgs/perl-Mail-Box/template
index 3a1de40e86a..f2e68883b5e 100644
--- a/srcpkgs/perl-Mail-Box/template
+++ b/srcpkgs/perl-Mail-Box/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-Mail-Box'
 pkgname=perl-Mail-Box
-version=3.006
+version=3.008
 revision=1
 archs=noarch
 wrksrc="${pkgname/perl-/}-${version}"
@@ -17,4 +17,4 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Mail-Box"
 distfiles="${CPAN_SITE}/Mail/${pkgname/perl-/}-${version}.tar.gz"
-checksum=02948613e1df82b55df2ce963ec1d244e1f67f93ca5a4f9c70ee6039c23fa1ba
+checksum=b51a50945db1335503e1414d76dcc74e669c4179ea07852f9800b270d5c0d297
diff --git a/srcpkgs/perl-Mail-DKIM/template b/srcpkgs/perl-Mail-DKIM/template
index a9f16723718..e114481006e 100644
--- a/srcpkgs/perl-Mail-DKIM/template
+++ b/srcpkgs/perl-Mail-DKIM/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-Mail-DKIM'
 pkgname=perl-Mail-DKIM
-version=0.55
+version=0.57
 revision=1
 archs=noarch
 wrksrc="${pkgname/perl-/}-${version}"
@@ -15,4 +15,4 @@ maintainer="johannes <johannes.brechtmann@gmail.com>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Mail-DKIM"
 distfiles="${CPAN_SITE}/Mail/Mail-DKIM-${version}.tar.gz"
-checksum=df29ddf187025b6a8dfc1387209b7fef35557fed51f8313bd1763ae35c80daa2
+checksum=6b535354408e842eada8f4a118f7c990ee21284145229685e128414d2c87ae3a
diff --git a/srcpkgs/perl-Mail-Message/template b/srcpkgs/perl-Mail-Message/template
index 5b5a8a732db..9c54fceddbb 100644
--- a/srcpkgs/perl-Mail-Message/template
+++ b/srcpkgs/perl-Mail-Message/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl-IO-stringy perl-MailTools perl-MIME-Types perl-URI perl-User-Identity"
 depends="$makedepends"
 short_desc="Container for MIME-encoded message information"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Mail-Message"
 distfiles="${CPAN_SITE}/Mail/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Mail-POP3Client/template b/srcpkgs/perl-Mail-POP3Client/template
index 4661f3799f1..5317b8ce273 100644
--- a/srcpkgs/perl-Mail-POP3Client/template
+++ b/srcpkgs/perl-Mail-POP3Client/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Mail::POP3Client - Perl 5 module to talk to a POP3 (RFC1939) server"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Mail-POP3Client"
 distfiles="${CPAN_SITE}/Mail/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Mail-Sendmail/template b/srcpkgs/perl-Mail-Sendmail/template
index d3e49c5378e..55fdfc7f3ad 100644
--- a/srcpkgs/perl-Mail-Sendmail/template
+++ b/srcpkgs/perl-Mail-Sendmail/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Mail::Sendmail - Simple platform independent mailer"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Mail-Sendmail"
 distfiles="${CPAN_SITE}/Mail/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Mail-Transport/template b/srcpkgs/perl-Mail-Transport/template
index 68d7d8e20dd..1e1501c286e 100644
--- a/srcpkgs/perl-Mail-Transport/template
+++ b/srcpkgs/perl-Mail-Transport/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-Mail-Transport'
 pkgname=perl-Mail-Transport
-version=3.003
+version=3.004
 revision=1
 archs=noarch
 wrksrc="${pkgname/perl-/}-${version}"
@@ -9,8 +9,8 @@ hostmakedepends="perl"
 makedepends="perl perl-Mail-Message"
 depends="$makedepends"
 short_desc="Mail::Transport - base class for message exchange"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Mail-Transport"
 distfiles="${CPAN_SITE}/Mail/${pkgname/perl-/}-${version}.tar.gz"
-checksum=d7845063364175a6bd62bacf886c73a91742a5406918f378b19671312f576151
+checksum=cf315a09f617e881c01318069054ef9f17ef947ffbbc5ced2f1b00ebbad43d11
diff --git a/srcpkgs/perl-Math-BigInt-GMP/template b/srcpkgs/perl-Math-BigInt-GMP/template
index e926aa9e016..0e0ca21867a 100644
--- a/srcpkgs/perl-Math-BigInt-GMP/template
+++ b/srcpkgs/perl-Math-BigInt-GMP/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-Math-BigInt-GMP'
 pkgname=perl-Math-BigInt-GMP
-version=1.6006
+version=1.6007
 revision=1
 wrksrc="Math-BigInt-GMP-${version}"
 build_style=perl-module
@@ -9,10 +9,10 @@ makedepends="perl gmp-devel"
 depends="perl"
 short_desc="Math::BigInt::GMP - Use the GMP library for Math::BigInt routines"
 maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="https://metacpan.org/release/Math-BigInt-GMP"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
+homepage="https://metacpan.org/release/Math-BigInt-GMP"
 distfiles="${CPAN_SITE}/Math/Math-BigInt-GMP-${version}.tar.gz"
-checksum=0ec210b5dfb60b74a1923c03a8d5cd2cca287e5ea80380c4ba60b0270b1caf81
+checksum=5d725e6d20ccb37e072673628f0b0dd10e5dd011619f70f50ad58aded454c01f
 
 post_extract() {
 	sed -i /check_lib_or/d Makefile.PL
diff --git a/srcpkgs/perl-Math-FFT/template b/srcpkgs/perl-Math-FFT/template
new file mode 100644
index 00000000000..02017e387cc
--- /dev/null
+++ b/srcpkgs/perl-Math-FFT/template
@@ -0,0 +1,15 @@
+# Template file for 'perl-Math-FFT'
+pkgname=perl-Math-FFT
+version=1.34
+revision=2
+wrksrc="Math-FFT-${version}"
+build_style=perl-module
+hostmakedepends="perl"
+makedepends="perl"
+depends="perl"
+short_desc="Math::FFT - Fast Fourier Transform for perl"
+maintainer="Michal V <michal@pmsdev.tk>"
+license="Artistic-1.0-Perl, GPL-1.0-or-later"
+homepage="https://metacpan.org/release/Math-FFT"
+distfiles="${CPAN_SITE}/Math/Math-FFT-${version}.tar.gz"
+checksum=df7badbb4c1d21189ab7a3face3ecf817ee19d2df6f226451d3bc8fa2b7a7348
diff --git a/srcpkgs/perl-Math-Prime-Util-GMP/template b/srcpkgs/perl-Math-Prime-Util-GMP/template
index 1be58398a20..fad540d9ce5 100644
--- a/srcpkgs/perl-Math-Prime-Util-GMP/template
+++ b/srcpkgs/perl-Math-Prime-Util-GMP/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Math-Prime-Util-GMP'
 pkgname=perl-Math-Prime-Util-GMP
 version=0.51
-revision=2
+revision=3
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/perl-Math-Prime-Util/template b/srcpkgs/perl-Math-Prime-Util/template
index d29ec410db1..cf5d3db2cd4 100644
--- a/srcpkgs/perl-Math-Prime-Util/template
+++ b/srcpkgs/perl-Math-Prime-Util/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Math-Prime-Util'
 pkgname=perl-Math-Prime-Util
 version=0.73
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-Math-Prime-Util-GMP"
diff --git a/srcpkgs/perl-Module-Pluggable/template b/srcpkgs/perl-Module-Pluggable/template
index 24f881640b4..793c7d6c8bd 100644
--- a/srcpkgs/perl-Module-Pluggable/template
+++ b/srcpkgs/perl-Module-Pluggable/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Automatically give your module the ability to have plugins"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Module-Pluggable"
 distfiles="${CPAN_SITE}/Module/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Mojolicious/template b/srcpkgs/perl-Mojolicious/template
index 30d5f09d327..5e095d17f16 100644
--- a/srcpkgs/perl-Mojolicious/template
+++ b/srcpkgs/perl-Mojolicious/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-Mojolicious'
 pkgname=perl-Mojolicious
-version=8.14
+version=8.25
 revision=1
 archs=noarch
 wrksrc="${pkgname//perl-/}-${version}"
@@ -12,5 +12,4 @@ maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Mojolicious"
 distfiles="${CPAN_SITE}/${pkgname//perl-/}/${pkgname//perl-/}-${version}.tar.gz"
-checksum=381578a16a8c6c4600345b1a5e107f7485ff0a9a30fa3296b0d8b3507aab5535
-
+checksum=366c9f65b126d71a65eb34512fe47a0d18e1cf21dbb07f6d19a4a7c7dfdd257b
diff --git a/srcpkgs/perl-Monkey-Patch-Action/template b/srcpkgs/perl-Monkey-Patch-Action/template
index 07c4ba734d1..f13376e85df 100644
--- a/srcpkgs/perl-Monkey-Patch-Action/template
+++ b/srcpkgs/perl-Monkey-Patch-Action/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl-Sub-Delete"
 depends="$makedepends"
 short_desc="Wrap/add/replace/delete subs from other packages"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Monkey-Patch-Action"
 distfiles="${CPAN_SITE}/LWP/PERLANCAR/Monkey-Patch-Action-${version}.tar.gz"
diff --git a/srcpkgs/perl-Moo/template b/srcpkgs/perl-Moo/template
index 2fcb17a3bed..fc361c6ae6c 100644
--- a/srcpkgs/perl-Moo/template
+++ b/srcpkgs/perl-Moo/template
@@ -12,7 +12,7 @@ makedepends="perl perl-Class-Method-Modifiers perl-Devel-GlobalDestruction
 depends="$makedepends"
 checkdepends="perl-Test-Fatal"
 short_desc="Minimal Object Orientation support for Roles"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Moo"
 distfiles="https://cpan.org/authors/id/H/HA/HAARG/Moo-${version}.tar.gz"
diff --git a/srcpkgs/perl-MusicBrainz-DiscID/template b/srcpkgs/perl-MusicBrainz-DiscID/template
index 2c459e16040..d4b254144d5 100644
--- a/srcpkgs/perl-MusicBrainz-DiscID/template
+++ b/srcpkgs/perl-MusicBrainz-DiscID/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-musicbrainz-discid'
 pkgname=perl-MusicBrainz-DiscID
 version=0.04
-revision=4
+revision=5
 wrksrc="${pkgname//perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl pkg-config"
diff --git a/srcpkgs/perl-Net-DBus/template b/srcpkgs/perl-Net-DBus/template
index cfb6222e789..8a8a6401480 100644
--- a/srcpkgs/perl-Net-DBus/template
+++ b/srcpkgs/perl-Net-DBus/template
@@ -1,7 +1,7 @@
 # Template build file for 'perl-Net-DBus'.
 pkgname=perl-Net-DBus
 version=1.1.0
-revision=6
+revision=7
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl pkg-config"
diff --git a/srcpkgs/perl-Net-DNS-Resolver-Mock/template b/srcpkgs/perl-Net-DNS-Resolver-Mock/template
index 7cc7b5af2b9..dab8e29c040 100644
--- a/srcpkgs/perl-Net-DNS-Resolver-Mock/template
+++ b/srcpkgs/perl-Net-DNS-Resolver-Mock/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl perl-Net-DNS"
 depends="$makedepends"
 short_desc="Mock a DNS Resolver object for testing"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Net-DNS-Resolver-Mock"
 distfiles="${CPAN_SITE}/Net/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Net-IMAP-Client/template b/srcpkgs/perl-Net-IMAP-Client/template
index 5a6d302c01f..1e0f579548f 100644
--- a/srcpkgs/perl-Net-IMAP-Client/template
+++ b/srcpkgs/perl-Net-IMAP-Client/template
@@ -10,7 +10,7 @@ makedepends="perl perl-List-MoreUtils perl-IO-Socket-SSL"
 depends="$makedepends"
 checkdepends="perl-Test-Pod perl-Test-Pod-Coverage"
 short_desc="Not so simple IMAP client library"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Net-IMAP-Client"
 distfiles="${CPAN_SITE}/Net/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Net-IMAP-Simple/template b/srcpkgs/perl-Net-IMAP-Simple/template
index e394ca2bcc0..30d331492fb 100644
--- a/srcpkgs/perl-Net-IMAP-Simple/template
+++ b/srcpkgs/perl-Net-IMAP-Simple/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl-Parse-RecDescent"
 depends="$makedepends"
 short_desc="Perl extension for simple IMAP account handling"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Net-IMAP-Simple"
 distfiles="${CPAN_SITE}/Net/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Net-MPD/template b/srcpkgs/perl-Net-MPD/template
index 4aa330d023d..38363aa7b48 100644
--- a/srcpkgs/perl-Net-MPD/template
+++ b/srcpkgs/perl-Net-MPD/template
@@ -9,7 +9,7 @@ hostmakedepends="perl perl-Module-Build-Tiny"
 makedepends="perl"
 depends="perl mpd"
 short_desc="Net::MPD - Communicate with an MPD server"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://metacpan.org/release/Net-MPD"
 distfiles="${CPAN_SITE}/Net/Net-MPD-${version}.tar.gz"
diff --git a/srcpkgs/perl-Net-SSH2/template b/srcpkgs/perl-Net-SSH2/template
index 1243736de6e..fb1eab5c37f 100644
--- a/srcpkgs/perl-Net-SSH2/template
+++ b/srcpkgs/perl-Net-SSH2/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Net-SSH2'
 pkgname=perl-Net-SSH2
 version=0.70
-revision=2
+revision=3
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 configure_args="inc=${XBPS_CROSS_BASE}/usr/include lib=${XBPS_CROSS_BASE}/usr/lib"
diff --git a/srcpkgs/perl-Net-SSLeay/template b/srcpkgs/perl-Net-SSLeay/template
index 6222a9d4601..84d81817495 100644
--- a/srcpkgs/perl-Net-SSLeay/template
+++ b/srcpkgs/perl-Net-SSLeay/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Net-SSLeay'
 pkgname=perl-Net-SSLeay
 version=1.88
-revision=2
+revision=3
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl libressl"
diff --git a/srcpkgs/perl-NetAddr-IP/template b/srcpkgs/perl-NetAddr-IP/template
index 0206c62a099..6656608f85a 100644
--- a/srcpkgs/perl-NetAddr-IP/template
+++ b/srcpkgs/perl-NetAddr-IP/template
@@ -1,7 +1,7 @@
 # Template build file for 'perl-NetAddr-IP'.
 pkgname=perl-NetAddr-IP
 version=4.079
-revision=7
+revision=8
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/perl-Number-Compare/template b/srcpkgs/perl-Number-Compare/template
index 234a8f72106..df4eaca2780 100644
--- a/srcpkgs/perl-Number-Compare/template
+++ b/srcpkgs/perl-Number-Compare/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Numeric comparisons"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Number-Compare"
 distfiles="${CPAN_SITE}/Number/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Object-MultiType/template b/srcpkgs/perl-Object-MultiType/template
index fc604ebf8c6..7caf30b452d 100644
--- a/srcpkgs/perl-Object-MultiType/template
+++ b/srcpkgs/perl-Object-MultiType/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Perl Objects as Hash, Array, Scalar, Code and Glob at the same time"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Object-MultiType"
 distfiles="${CPAN_SITE}/Object/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-OpenGL/template b/srcpkgs/perl-OpenGL/template
index 01f850e8851..54eb38ce3e9 100644
--- a/srcpkgs/perl-OpenGL/template
+++ b/srcpkgs/perl-OpenGL/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-OpenGL'
 pkgname=perl-OpenGL
 version=0.70
-revision=1
+revision=2
 wrksrc="OpenGL-${version}"
 build_style=perl-module
 hostmakedepends="perl libfreeglut-devel libXmu-devel"
diff --git a/srcpkgs/perl-PDF-API2/template b/srcpkgs/perl-PDF-API2/template
index c75a8c69373..daa75dac3ec 100644
--- a/srcpkgs/perl-PDF-API2/template
+++ b/srcpkgs/perl-PDF-API2/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-PDF-API2'
 pkgname=perl-PDF-API2
-version=2.035
+version=2.036
 revision=1
 archs=noarch
 wrksrc="PDF-API2-${version}"
@@ -13,4 +13,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://metacpan.org/release/PDF-API2"
 distfiles="${CPAN_SITE}/PDF/PDF-API2-${version}.tar.gz"
-checksum=7e4435ff51c808451f53fa161672ba2eaa7c4d49f4ab6506801383882405bf80
+checksum=070444e9fef8beb6f115994a6ac89533fe8ba02d5e240a35bb07adcbcb511774
diff --git a/srcpkgs/perl-Package-Stash-XS/template b/srcpkgs/perl-Package-Stash-XS/template
index 4cb07baca25..87d594b7c1e 100644
--- a/srcpkgs/perl-Package-Stash-XS/template
+++ b/srcpkgs/perl-Package-Stash-XS/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Package-Stash-XS'
 pkgname=perl-Package-Stash-XS
 version=0.29
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/perl-PadWalker/template b/srcpkgs/perl-PadWalker/template
index 09ccaa1e0fd..77a8f471542 100644
--- a/srcpkgs/perl-PadWalker/template
+++ b/srcpkgs/perl-PadWalker/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-PadWalker'
 pkgname=perl-PadWalker
 version=2.3
-revision=4
+revision=5
 wrksrc="${pkgname#*-}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/perl-Pango/template b/srcpkgs/perl-Pango/template
index 730d58ce827..d2d752599e8 100644
--- a/srcpkgs/perl-Pango/template
+++ b/srcpkgs/perl-Pango/template
@@ -1,7 +1,7 @@
 # Template build file for 'perl-Pango'.
 pkgname=perl-Pango
 version=1.227
-revision=5
+revision=6
 wrksrc="Pango-$version"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/perl-Params-Util/template b/srcpkgs/perl-Params-Util/template
index aee5ca72d7a..8529d17507d 100644
--- a/srcpkgs/perl-Params-Util/template
+++ b/srcpkgs/perl-Params-Util/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Params-Util'
 pkgname=perl-Params-Util
 version=1.07
-revision=8
+revision=9
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/perl-Parse-RecDescent/template b/srcpkgs/perl-Parse-RecDescent/template
index 2ceaad7a9ed..272fe0008b6 100644
--- a/srcpkgs/perl-Parse-RecDescent/template
+++ b/srcpkgs/perl-Parse-RecDescent/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Generate Recursive-Descent Parsers"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Parse-RecDescent"
 distfiles="${CPAN_SITE}/Parse/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-PatchReader/template b/srcpkgs/perl-PatchReader/template
index ffe75775af7..51cd3172766 100644
--- a/srcpkgs/perl-PatchReader/template
+++ b/srcpkgs/perl-PatchReader/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="PatchReader - Utilities to read and manipulate patches and CVS"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Unknown"
 homepage="https://metacpan.org/release/PatchReader"
 distfiles="https://cpan.metacpan.org/authors/id/T/TM/TMANNERM/PatchReader-${version}.tar.gz"
diff --git a/srcpkgs/perl-Pegex/template b/srcpkgs/perl-Pegex/template
index 3fb7adbaa89..5700b7bec92 100644
--- a/srcpkgs/perl-Pegex/template
+++ b/srcpkgs/perl-Pegex/template
@@ -9,7 +9,7 @@ hostmakedepends="perl perl-File-ShareDir-Install"
 makedepends="perl perl-File-ShareDir-Install perl-YAML-LibYAML"
 depends="$makedepends"
 short_desc="Acmeist PEG Parser Framework"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Pegex"
 distfiles="http://search.cpan.org/CPAN/authors/id/I/IN/INGY/Pegex-${version}.tar.gz"
diff --git a/srcpkgs/perl-Pod-Simple-Text-Termcap/template b/srcpkgs/perl-Pod-Simple-Text-Termcap/template
index 9da2462b24e..65fcd4aa738 100644
--- a/srcpkgs/perl-Pod-Simple-Text-Termcap/template
+++ b/srcpkgs/perl-Pod-Simple-Text-Termcap/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Convert POD data to ASCII text with format escapes"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Pod-Simple-Text-Termcap"
 distfiles="${CPAN_SITE}/Pod/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Proc-Daemontools/template b/srcpkgs/perl-Proc-Daemontools/template
index 11ac2005782..ded05432e82 100644
--- a/srcpkgs/perl-Proc-Daemontools/template
+++ b/srcpkgs/perl-Proc-Daemontools/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Perl interface for the functionalities of Daemontools"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Proc-Daemontools"
 distfiles="${CPAN_SITE}/Proc/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Proc-Govern/template b/srcpkgs/perl-Proc-Govern/template
index 65eb1752542..f9b56c224c9 100644
--- a/srcpkgs/perl-Proc-Govern/template
+++ b/srcpkgs/perl-Proc-Govern/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Proc-Govern'
 pkgname=perl-Proc-Govern
-version=0.200
-revision=2
+version=0.208
+revision=1
 archs=noarch
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -9,8 +9,8 @@ hostmakedepends="perl"
 makedepends="perl perl-IPC-Run perl-File-Write-Rotate perl-Unix-Uptime"
 depends="$makedepends"
 short_desc="Run child process and govern its various aspects"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Proc-Govern"
 distfiles="${CPAN_SITE}/Proc/${pkgname/perl-/}-${version}.tar.gz"
-checksum=069d5e25f18929cab1ab3fe8380ff59eae7de6800aa6f8c9c71ed2d43eec88e9
+checksum=006ca518e605596b82be070b0bc3106034a189c97857e9b5165c083988ade1d7
diff --git a/srcpkgs/perl-Proc-PID-File/template b/srcpkgs/perl-Proc-PID-File/template
index 76b226feff1..c0a1929f98c 100644
--- a/srcpkgs/perl-Proc-PID-File/template
+++ b/srcpkgs/perl-Proc-PID-File/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="A module to manage process id files"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Proc-PID-File"
 distfiles="${CPAN_SITE}/Proc/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Proc-ProcessTable/template b/srcpkgs/perl-Proc-ProcessTable/template
index 840a0e460bd..58c07f2cb22 100644
--- a/srcpkgs/perl-Proc-ProcessTable/template
+++ b/srcpkgs/perl-Proc-ProcessTable/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Proc-ProcessTable'
 pkgname=perl-Proc-ProcessTable
 version=0.59
-revision=1
+revision=2
 wrksrc="Proc-ProcessTable-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/perl-Ref-Util-XS/template b/srcpkgs/perl-Ref-Util-XS/template
index 14bc317f21f..2eab774f615 100644
--- a/srcpkgs/perl-Ref-Util-XS/template
+++ b/srcpkgs/perl-Ref-Util-XS/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Ref-Util-XS'
 pkgname=perl-Ref-Util-XS
 version=0.117
-revision=1
+revision=2
 wrksrc="${pkgname#perl-}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/perl-Regexp-Grammars/template b/srcpkgs/perl-Regexp-Grammars/template
index 9bb70ecbca7..8e862310779 100644
--- a/srcpkgs/perl-Regexp-Grammars/template
+++ b/srcpkgs/perl-Regexp-Grammars/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-Regexp-Grammars'
 pkgname=perl-Regexp-Grammars
-version=1.049
+version=1.052
 revision=1
 archs=noarch
 wrksrc="${pkgname/perl-/}-${version}"
@@ -9,8 +9,8 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Add grammatical parsing features to Perl 5.10 regexes"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Regexp-Grammars"
 distfiles="${CPAN_SITE}/Regexp/${pkgname/perl-/}-${version}.tar.gz"
-checksum=2e642a7051b9ea5dccd05d53e49684ca28e99c43b811bbec37d160d3f81edf68
+checksum=d552e7aaec956fc9ff0c56602fc95bc5c97ef815a0a8df7f42d1128f39534a62
diff --git a/srcpkgs/perl-Role-Tiny/template b/srcpkgs/perl-Role-Tiny/template
index bd62ad2c418..be50a46b9b1 100644
--- a/srcpkgs/perl-Role-Tiny/template
+++ b/srcpkgs/perl-Role-Tiny/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-Role-Tiny'
 pkgname=perl-Role-Tiny
-version=2.000008
+version=2.001003
 revision=1
 archs=noarch
 wrksrc="${pkgname/perl-/}-${version}"
@@ -13,4 +13,4 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Role-Tiny"
 distfiles="${CPAN_SITE}/lib/HAARG/Role-Tiny-${version}.tar.gz"
-checksum=b1541fc5e3e0eb2dbd55b25c432293c197e0153c2c9f7747deba4df72c27146a
+checksum=6cef8d6371342a94a6a04c1be5bd7a3f2bd6ea36f1a21b4649b08d5b88b28eeb
diff --git a/srcpkgs/perl-SUPER/template b/srcpkgs/perl-SUPER/template
index 0b02c99b087..1b11e76b38e 100644
--- a/srcpkgs/perl-SUPER/template
+++ b/srcpkgs/perl-SUPER/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-SUPER'
 pkgname=perl-SUPER
-version=1.20141117
-revision=3
+version=1.20190531
+revision=1
 archs=noarch
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -9,8 +9,8 @@ hostmakedepends="perl"
 makedepends="perl perl-Sub-Identify"
 depends="$makedepends"
 short_desc="SUPER - control superclass method dispatch"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/SUPER"
 distfiles="${CPAN_SITE}/SUPER/SUPER-${version}.tar.gz"
-checksum=1a620e7d60aee9b13b1b26a44694c43fdb2bba1755cfff435dae83c7d42cc0b2
+checksum=685d1ee76e7f0e9006942923bf7df8b11c107132992917593dcf7397d417d39a
diff --git a/srcpkgs/perl-Scope-Guard/template b/srcpkgs/perl-Scope-Guard/template
index dacad0c4e7e..f17c470e784 100644
--- a/srcpkgs/perl-Scope-Guard/template
+++ b/srcpkgs/perl-Scope-Guard/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Lexically-scoped resource management"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Scope-Guard"
 distfiles="${CPAN_SITE}/Scope/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Search-Xapian/template b/srcpkgs/perl-Search-Xapian/template
index 15b15947e56..5c98eb870d7 100644
--- a/srcpkgs/perl-Search-Xapian/template
+++ b/srcpkgs/perl-Search-Xapian/template
@@ -1,7 +1,7 @@
 # Template build file for 'perl-Search-Xapian'
 pkgname=perl-Search-Xapian
 version=1.2.25.2
-revision=1
+revision=2
 wrksrc="Search-Xapian-$version"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/perl-Socket-MsgHdr/template b/srcpkgs/perl-Socket-MsgHdr/template
index 5d3a922c423..211189bc467 100644
--- a/srcpkgs/perl-Socket-MsgHdr/template
+++ b/srcpkgs/perl-Socket-MsgHdr/template
@@ -1,14 +1,14 @@
 # Template file for 'perl-Socket-MsgHdr'
 pkgname=perl-Socket-MsgHdr
 version=0.05
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Sendmsg, recvmsg and ancillary data operations"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Socket-MsgHdr"
 distfiles="${CPAN_SITE}/Socket/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Socket6/template b/srcpkgs/perl-Socket6/template
index 7cc288d0bfc..0a54eda01f4 100644
--- a/srcpkgs/perl-Socket6/template
+++ b/srcpkgs/perl-Socket6/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Socket6'
 pkgname=perl-Socket6
 version=0.29
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/perl-Spiffy/template b/srcpkgs/perl-Spiffy/template
index e773b0d0225..4412ade6858 100644
--- a/srcpkgs/perl-Spiffy/template
+++ b/srcpkgs/perl-Spiffy/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Spiffy - Spiffy Perl Interface Framework For You"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Spiffy"
 distfiles="https://www.cpan.org/authors/id/I/IN/INGY/Spiffy-${version}.tar.gz"
diff --git a/srcpkgs/perl-Sub-Delete/template b/srcpkgs/perl-Sub-Delete/template
index d61efd5dbc3..f57c5ceee74 100644
--- a/srcpkgs/perl-Sub-Delete/template
+++ b/srcpkgs/perl-Sub-Delete/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Perl module enabling one to delete subroutines"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Sub-Delete"
 distfiles="${CPAN_SITE}/Sub/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Sub-Identify/template b/srcpkgs/perl-Sub-Identify/template
index cdd8339aa2d..9dd8b94c50d 100644
--- a/srcpkgs/perl-Sub-Identify/template
+++ b/srcpkgs/perl-Sub-Identify/template
@@ -1,7 +1,7 @@
 # Template build file for 'perl-Sub-Identify'.
 pkgname=perl-Sub-Identify
 version=0.14
-revision=4
+revision=5
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/perl-Sub-Info/template b/srcpkgs/perl-Sub-Info/template
index 122134b6ad2..6026d8f5bf2 100644
--- a/srcpkgs/perl-Sub-Info/template
+++ b/srcpkgs/perl-Sub-Info/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl perl-Importer"
 depends="$makedepends"
 short_desc="Sub::Info - Tool for inspecting subroutines"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Sub-Info"
 distfiles="${CPAN_SITE}/Sub/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Sub-Name/template b/srcpkgs/perl-Sub-Name/template
index 2f7f1eea580..58e62fbbd6b 100644
--- a/srcpkgs/perl-Sub-Name/template
+++ b/srcpkgs/perl-Sub-Name/template
@@ -1,7 +1,7 @@
-# Template build file for 'perl-Sub-Name'.
+# Template file for 'perl-Sub-Name'
 pkgname=perl-Sub-Name
-version=0.21
-revision=4
+version=0.26
+revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
@@ -9,7 +9,7 @@ makedepends="perl"
 depends="perl"
 short_desc="Assigns a new name to referenced sub"
 maintainer="newbluemoon <blaumolch@mailbox.org>"
-homepage="https://metacpan.org/release/Sub-Name"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
+homepage="https://metacpan.org/release/Sub-Name"
 distfiles="${CPAN_SITE}/Sub/${pkgname/perl-/}-$version.tar.gz"
-checksum="bd32e9dee07047c10ae474c9f17d458b6e9885a6db69474c7a494ccc34c27117"
+checksum=2d2f2d697d516c89547e7c4307f1e79441641cae2c7395e7319b306d390df105
diff --git a/srcpkgs/perl-Sub-Quote/template b/srcpkgs/perl-Sub-Quote/template
index 9bf4475b1e4..1ab6d42ec20 100644
--- a/srcpkgs/perl-Sub-Quote/template
+++ b/srcpkgs/perl-Sub-Quote/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-Sub-Quote'
 pkgname=perl-Sub-Quote
-version=2.006003
+version=2.006006
 revision=1
 archs=noarch
 wrksrc="${pkgname/perl-/}-${version}"
@@ -10,8 +10,8 @@ makedepends="perl perl-Sub-Name"
 depends="$makedepends"
 checkdepends="perl-Test-Fatal"
 short_desc="Efficient generation of subroutines via string eval"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Sub-Quote"
 distfiles="${CPAN_SITE}/Sub/${pkgname/perl-/}-${version}.tar.gz"
-checksum=be1f3a6f773f351f203cdc8f614803ac492b77d15fd68d5b1f0cd3884be18176
+checksum=6e4e2af42388fa6d2609e0e82417de7cc6be47223f576592c656c73c7524d89d
diff --git a/srcpkgs/perl-Svsh/template b/srcpkgs/perl-Svsh/template
index 6fd5955024d..06a7bfa948e 100644
--- a/srcpkgs/perl-Svsh/template
+++ b/srcpkgs/perl-Svsh/template
@@ -10,7 +10,7 @@ makedepends="perl perl-namespace-clean perl-Term-ShellUI perl-Proc-ProcessTable
  perl-Term-ReadLine-Gnu perl-Moo perl-Getopt-Compact perl-Pod-Simple-Text-Termcap"
 depends="$makedepends"
 short_desc="Process supervision shell for daemontools-family of supervisors"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Svsh"
 distfiles="https://cpan.org/authors/id/I/ID/IDOPEREL/Svsh-${version}.tar.gz"
diff --git a/srcpkgs/perl-Sys-Syscall/template b/srcpkgs/perl-Sys-Syscall/template
index 01b98e87dbc..cdcc58dc479 100644
--- a/srcpkgs/perl-Sys-Syscall/template
+++ b/srcpkgs/perl-Sys-Syscall/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Access system calls that Perl doesn't normally provide access to"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Sys-Syscall"
 distfiles="${CPAN_SITE}/Sys/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Taint-Runtime/template b/srcpkgs/perl-Taint-Runtime/template
index 3f06d3308f9..9c0d0b7a17e 100644
--- a/srcpkgs/perl-Taint-Runtime/template
+++ b/srcpkgs/perl-Taint-Runtime/template
@@ -1,14 +1,14 @@
 # Template file for 'perl-Taint-Runtime'
 pkgname=perl-Taint-Runtime
 version=0.03
-revision=5
+revision=6
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="perl"
 depends="${makedepends}"
 short_desc="Runtime enable taint checking"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Taint-Runtime"
 distfiles="${CPAN_SITE}/Taint/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Template-Toolkit/template b/srcpkgs/perl-Template-Toolkit/template
index 291db570c49..b361f97fe35 100644
--- a/srcpkgs/perl-Template-Toolkit/template
+++ b/srcpkgs/perl-Template-Toolkit/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Template-Toolkit'
 pkgname=perl-Template-Toolkit
 version=2.29
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/perl-Term-ExtendedColor/template b/srcpkgs/perl-Term-ExtendedColor/template
index b4d3e4ed16c..971fc6ffbd0 100644
--- a/srcpkgs/perl-Term-ExtendedColor/template
+++ b/srcpkgs/perl-Term-ExtendedColor/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-Term-ExtendedColor'
 pkgname=perl-Term-ExtendedColor
-version=0.503
+version=0.504
 revision=1
 archs=noarch
 wrksrc="Term-ExtendedColor-${version}"
@@ -9,8 +9,8 @@ hostmakedepends="perl"
 makedepends="$hostmakedepends"
 depends="$hostmakedepends"
 short_desc="Color screen output using 256 colors"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Term-ExtendedColor"
 distfiles="${CPAN_SITE}/Term/Term-ExtendedColor-${version}.tar.gz"
-checksum=73cc7ee3314381dce3a8694874e25b9b610b44ce0bb8c5b9f0ac3e372fb72752
+checksum=8965f8f032a27df755b92b27a07901b0dbb2ee0178c0f6fa38c7f5c4d3c00380
diff --git a/srcpkgs/perl-Term-ReadKey/template b/srcpkgs/perl-Term-ReadKey/template
index 00aabd54e84..489f3123de7 100644
--- a/srcpkgs/perl-Term-ReadKey/template
+++ b/srcpkgs/perl-Term-ReadKey/template
@@ -2,7 +2,7 @@
 pkgname=perl-Term-ReadKey
 reverts="2.37_1"
 version=2.33
-revision=8
+revision=9
 wrksrc="TermReadKey-$version"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/perl-Term-ReadLine-Gnu/template b/srcpkgs/perl-Term-ReadLine-Gnu/template
index 9a7eece7590..e4f60f8c69e 100644
--- a/srcpkgs/perl-Term-ReadLine-Gnu/template
+++ b/srcpkgs/perl-Term-ReadLine-Gnu/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Term-ReadLine-Gnu'
 pkgname=perl-Term-ReadLine-Gnu
 version=1.36
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl ncurses-devel readline-devel"
diff --git a/srcpkgs/perl-Term-Table/template b/srcpkgs/perl-Term-Table/template
index 7091775438d..5c312a05282 100644
--- a/srcpkgs/perl-Term-Table/template
+++ b/srcpkgs/perl-Term-Table/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-Term-Table'
 pkgname=perl-Term-Table
-version=0.013
+version=0.014
 revision=1
 archs=noarch
 wrksrc="${pkgname/perl-/}-${version}"
@@ -9,8 +9,8 @@ hostmakedepends="perl"
 makedepends="perl perl-Importer"
 depends="$makedepends"
 short_desc="Format a header and rows into a table"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Term-Table"
 distfiles="${CPAN_SITE}/Term/${pkgname/perl-/}-${version}.tar.gz"
-checksum=ffeb36dcb25c575b9f63657d1591a14af22cd10ba23cc76de9d976b426f4fc40
+checksum=167a0669e2ef8c6386ea4dd213495e445049493ce1d5097d5632c0e928b7426d
diff --git a/srcpkgs/perl-Test-Base/template b/srcpkgs/perl-Test-Base/template
index 254b1fbfdfd..9eef8acf384 100644
--- a/srcpkgs/perl-Test-Base/template
+++ b/srcpkgs/perl-Test-Base/template
@@ -10,7 +10,7 @@ makedepends="perl perl-Text-Diff perl-Spiffy"
 depends="$makedepends"
 checkdepends="perl-Test-Deep"
 short_desc="Test::Base - A Data Driven Testing Framework"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-Base"
 distfiles="${CPAN_SITE}/Test/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Test-CPAN-Meta/template b/srcpkgs/perl-Test-CPAN-Meta/template
index 1f4b17960f7..3c21325b9e1 100644
--- a/srcpkgs/perl-Test-CPAN-Meta/template
+++ b/srcpkgs/perl-Test-CPAN-Meta/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Test::CPAN::Meta - Validate your CPAN META.yml files"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-2.0"
 homepage="https://metacpan.org/release/Test-CPAN-Meta"
 distfiles="${CPAN_SITE}/Test/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Test-Class/template b/srcpkgs/perl-Test-Class/template
index 496d28d7844..1b60133766e 100644
--- a/srcpkgs/perl-Test-Class/template
+++ b/srcpkgs/perl-Test-Class/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl perl-MRO-Compat perl-Try-Tiny perl-Test-Exception perl-Module-Runtime"
 depends="$makedepends"
 short_desc="Easily create test classes in an xUnit/JUnit style"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-Class"
 distfiles="${CPAN_SITE}/Test/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Test-Cmd/template b/srcpkgs/perl-Test-Cmd/template
index 51f316b727c..aa4e8c68a7c 100644
--- a/srcpkgs/perl-Test-Cmd/template
+++ b/srcpkgs/perl-Test-Cmd/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Test::Cmd - Perl module for portable testing of commands and scripts"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-Cmd"
 distfiles="${CPAN_SITE}/Test/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Test-Command/template b/srcpkgs/perl-Test-Command/template
index a237b30706d..2232d4c1d82 100644
--- a/srcpkgs/perl-Test-Command/template
+++ b/srcpkgs/perl-Test-Command/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Test routines for external commands"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-Command"
 distfiles="${CPAN_SITE}/Test/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Test-Deep/template b/srcpkgs/perl-Test-Deep/template
index 38e8092dba4..504bdb592e8 100644
--- a/srcpkgs/perl-Test-Deep/template
+++ b/srcpkgs/perl-Test-Deep/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Test::Deep - Extremely flexible deep comparison"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-Deep"
 distfiles="${CPAN_SITE}/Test/${pkgname/perl-}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Test-FailWarnings/template b/srcpkgs/perl-Test-FailWarnings/template
index 91da229a974..e3fdb4ab06e 100644
--- a/srcpkgs/perl-Test-FailWarnings/template
+++ b/srcpkgs/perl-Test-FailWarnings/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl perl-Capture-Tiny"
 depends="$makedepends"
 short_desc="Test::FailWarnings - Add test failures if warnings are caught"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://metacpan.org/release/Test-FailWarnings"
 distfiles="${CPAN_SITE}/Test/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Test-File-ShareDir/template b/srcpkgs/perl-Test-File-ShareDir/template
index 92b2bae7ae3..6dd421ddbde 100644
--- a/srcpkgs/perl-Test-File-ShareDir/template
+++ b/srcpkgs/perl-Test-File-ShareDir/template
@@ -11,7 +11,7 @@ makedepends="perl perl-Path-Tiny perl-File-ShareDir perl-Class-Tiny
 depends="$makedepends"
 checkdepends="perl-Test-Fatal"
 short_desc="Simplified dist oriented ShareDir tester"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-File-ShareDir"
 distfiles="${CPAN_SITE}/Test/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Test-File/template b/srcpkgs/perl-Test-File/template
index 712b9cbdec6..08d104ca38a 100644
--- a/srcpkgs/perl-Test-File/template
+++ b/srcpkgs/perl-Test-File/template
@@ -10,7 +10,7 @@ makedepends="perl"
 depends="$makedepends"
 checkdepends="perl-Test-utf8"
 short_desc="Test file attributes"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-File"
 distfiles="${CPAN_SITE}/Test/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Test-HTTP-Server-Simple/template b/srcpkgs/perl-Test-HTTP-Server-Simple/template
index 683dd071ca7..a9ea7150716 100644
--- a/srcpkgs/perl-Test-HTTP-Server-Simple/template
+++ b/srcpkgs/perl-Test-HTTP-Server-Simple/template
@@ -10,7 +10,7 @@ makedepends="perl-HTTP-Server-Simple"
 depends="$makedepends"
 checkdepends="perl-Test-Pod perl-Test-Pod-Coverage"
 short_desc="Test::More functions for HTTP::Server::Simple"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-HTTP-Server-Simple"
 distfiles="${CPAN_SITE}/Test/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Test-Inter/template b/srcpkgs/perl-Test-Inter/template
index 79f9d86f8b1..321f710da5f 100644
--- a/srcpkgs/perl-Test-Inter/template
+++ b/srcpkgs/perl-Test-Inter/template
@@ -10,7 +10,7 @@ makedepends="$hostmakedepends"
 depends="$makedepends"
 checkdepends="perl-Test-Pod-Coverage perl-Test-Pod"
 short_desc="Framework for more readable interactive test scripts"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-Inter"
 distfiles="${CPAN_SITE}/Test/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Test-LeakTrace/template b/srcpkgs/perl-Test-LeakTrace/template
index 69fe32c0d82..e400fdc0120 100644
--- a/srcpkgs/perl-Test-LeakTrace/template
+++ b/srcpkgs/perl-Test-LeakTrace/template
@@ -1,14 +1,14 @@
 # Template file for 'perl-Test-LeakTrace'
 pkgname=perl-Test-LeakTrace
 version=0.16
-revision=4
+revision=5
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="perl"
 depends="${makedepends}"
 short_desc="Test::LeakTrace - Traces memory leaks"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-LeakTrace"
 distfiles="${CPAN_SITE}/Test/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Test-MockModule/template b/srcpkgs/perl-Test-MockModule/template
index d8ba050dd04..af992603020 100644
--- a/srcpkgs/perl-Test-MockModule/template
+++ b/srcpkgs/perl-Test-MockModule/template
@@ -10,7 +10,7 @@ makedepends="perl-SUPER"
 depends="perl-SUPER"
 checkdepends="perl-Test-Pod perl-Test-Pod-Coverage perl-Test-Warnings"
 short_desc="Test::MockModule - Override subroutines in a module for unit testing"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-MockModule"
 distfiles="${CPAN_SITE}/Test/${pkgname/perl-/}-v${version}.tar.gz"
diff --git a/srcpkgs/perl-Test-Most/template b/srcpkgs/perl-Test-Most/template
index 2ff02dc2139..70013c70ae3 100644
--- a/srcpkgs/perl-Test-Most/template
+++ b/srcpkgs/perl-Test-Most/template
@@ -10,7 +10,7 @@ makedepends="perl perl-Exception-Class perl-Devel-StackTrace perl-Test-Differenc
 perl-Test-Exception perl-Test-Warn perl-Test-Deep"
 depends="$makedepends"
 short_desc="Test::Most - Most commonly needed test functions and features"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-Most"
 distfiles="${CPAN_SITE}/Test/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Test-Needs/template b/srcpkgs/perl-Test-Needs/template
index 0dc6edaf58c..e5c81edc3ac 100644
--- a/srcpkgs/perl-Test-Needs/template
+++ b/srcpkgs/perl-Test-Needs/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Test::Needs - Skip tests when modules not available"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-Needs"
 distfiles="${CPAN_SITE}/Test/Test-Needs-${version}.tar.gz"
diff --git a/srcpkgs/perl-Test-Output/template b/srcpkgs/perl-Test-Output/template
index dd678dcb29e..df03ea4add2 100644
--- a/srcpkgs/perl-Test-Output/template
+++ b/srcpkgs/perl-Test-Output/template
@@ -10,7 +10,7 @@ makedepends="perl perl-Capture-Tiny"
 depends="$makedepends"
 checkdepends="perl-Test-Pod perl-Test-Pod-Coverage"
 short_desc="Test::Output - Utilities to test STDOUT and STDERR messages"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-Output"
 distfiles="${CPAN_SITE}/Test/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Test-Requires/template b/srcpkgs/perl-Test-Requires/template
index 92273cd5fde..2c58650b6ee 100644
--- a/srcpkgs/perl-Test-Requires/template
+++ b/srcpkgs/perl-Test-Requires/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Test::Requires - Checks to see if the module can be loaded"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-Requires"
 distfiles="${CPAN_SITE}/Test/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Test-RequiresInternet/template b/srcpkgs/perl-Test-RequiresInternet/template
index f49da4bed58..69d8f515348 100644
--- a/srcpkgs/perl-Test-RequiresInternet/template
+++ b/srcpkgs/perl-Test-RequiresInternet/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Test::RequiresInternet - Easily test network connectivity"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-RequiresInternet"
 distfiles="${CPAN_SITE}/Test/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Test-SharedFork/template b/srcpkgs/perl-Test-SharedFork/template
index b646012aee3..b975ff0ecc3 100644
--- a/srcpkgs/perl-Test-SharedFork/template
+++ b/srcpkgs/perl-Test-SharedFork/template
@@ -10,7 +10,7 @@ makedepends="perl"
 depends="$makedepends"
 checkdepends="perl-Test-Requires"
 short_desc="Utility module for Test::Builder that wraps fork(2)"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-SharedFork"
 distfiles="${CPAN_SITE}/Test/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Test-Simple/template b/srcpkgs/perl-Test-Simple/template
index a710cb67081..1f5002d8f9d 100644
--- a/srcpkgs/perl-Test-Simple/template
+++ b/srcpkgs/perl-Test-Simple/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-Test-Simple'
 pkgname=perl-Test-Simple
-version=1.302162
+version=1.302168
 revision=1
 archs=noarch
 wrksrc="${pkgname/perl-/}-${version}"
@@ -9,8 +9,8 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Framework for writing test tools that work well together"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-Simple"
 distfiles="${CPAN_SITE}/Test/${pkgname/perl-/}-${version}.tar.gz"
-checksum=73a0197c3d735e060881da509f4c5fa76c4cbf7dbabd4297d3cf5f5feed31fc4
+checksum=02f6132b2062abb23474b0fc02e70a0fbbf7bf581a6010e64c08891530447ffa
diff --git a/srcpkgs/perl-Test-Subroutines/template b/srcpkgs/perl-Test-Subroutines/template
index 5a3cdd93d5a..acfd9da0cd8 100644
--- a/srcpkgs/perl-Test-Subroutines/template
+++ b/srcpkgs/perl-Test-Subroutines/template
@@ -10,7 +10,7 @@ makedepends="perl perl-Devel-LexAlias perl-File-Slurp"
 depends="$makedepends"
 checkdepends="perl-Test-Pod perl-Test-Pod-Coverage"
 short_desc="Test::Subroutines - Standalone execution of Perl program subroutines"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-Subroutines"
 distfiles="${CPAN_SITE}/Test/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Test-TCP/template b/srcpkgs/perl-Test-TCP/template
index c714bb5fc7e..31caea2c412 100644
--- a/srcpkgs/perl-Test-TCP/template
+++ b/srcpkgs/perl-Test-TCP/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-Test-TCP'
 pkgname=perl-Test-TCP
-version=2.20
+version=2.22
 revision=1
 archs=noarch
 wrksrc="Test-TCP-$version"
@@ -14,4 +14,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-TCP"
 distfiles="${CPAN_SITE}/Test/Test-TCP-${version}.tar.gz"
-checksum=49e0ea0d9114e185b695200eabb8306fd1ffcf111b0295397838eb79a3c42989
+checksum=3e53c3c06d6d0980a2bfeb915602b714e682ee211ae88c11748cf2cc714e7b57
diff --git a/srcpkgs/perl-Test-Warn/template b/srcpkgs/perl-Test-Warn/template
index 5338f333c8f..174a5303531 100644
--- a/srcpkgs/perl-Test-Warn/template
+++ b/srcpkgs/perl-Test-Warn/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="${hostmakedepends} perl-Sub-Uplevel"
 depends="$makedepends"
 short_desc="Test::Warn - Perl extension to test methods for warnings"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-Warn"
 changelog="https://fastapi.metacpan.org/source/BIGJ/Test-Warn-${version}/Changes"
diff --git a/srcpkgs/perl-Test-Warnings/template b/srcpkgs/perl-Test-Warnings/template
index ac3b4ed5f3b..5378790e5c5 100644
--- a/srcpkgs/perl-Test-Warnings/template
+++ b/srcpkgs/perl-Test-Warnings/template
@@ -1,17 +1,17 @@
 # Template file for 'perl-Test-Warnings'
 pkgname=perl-Test-Warnings
-version=0.026
-revision=2
+version=0.027
+revision=1
 archs=noarch
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="perl"
-checkdepends="perl-CPAN-Meta-Check"
 depends="$makedepends"
+checkdepends="perl-CPAN-Meta-Check"
 short_desc="Test::Warnings - Test for warnings and the lack of them"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-Warnings"
 distfiles="${CPAN_SITE}/Test/${pkgname/perl-/}-${version}.tar.gz"
-checksum=ae2b68b1b5616704598ce07f5118efe42dc4605834453b7b2be14e26f9cc9a08
+checksum=118dd9f48408557555f0af5478e0e873f9df0952cf5911f697a4ce5165880864
diff --git a/srcpkgs/perl-Test-Weaken/template b/srcpkgs/perl-Test-Weaken/template
index 84332c83821..f336b5a09b6 100644
--- a/srcpkgs/perl-Test-Weaken/template
+++ b/srcpkgs/perl-Test-Weaken/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Test::Weaken - Test that freed memory objects were, indeed, freed"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-Weaken"
 distfiles="${CPAN_SITE}/Test/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Test-Without-Module/template b/srcpkgs/perl-Test-Without-Module/template
index a8bcdaf6279..662a2293596 100644
--- a/srcpkgs/perl-Test-Without-Module/template
+++ b/srcpkgs/perl-Test-Without-Module/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Test fallback vehaivour in absence of modules"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-Without-Module"
 distfiles="${CPAN_SITE}/Test/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Test-YAML/template b/srcpkgs/perl-Test-YAML/template
index 5b9dfe1eaa6..21f167214ef 100644
--- a/srcpkgs/perl-Test-YAML/template
+++ b/srcpkgs/perl-Test-YAML/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl perl-Test-Base"
 depends="$makedepends"
 short_desc="Test::YAML - Testing Module for YAML Implementations"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-YAML"
 distfiles="${CPAN_SITE}/Test/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Test-utf8/template b/srcpkgs/perl-Test-utf8/template
index 4d62fb503ff..efb545abc01 100644
--- a/srcpkgs/perl-Test-utf8/template
+++ b/srcpkgs/perl-Test-utf8/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Handy UTF8 tests"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-utf8"
 distfiles="${CPAN_SITE}/Test/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Test2-Plugin-NoWarnings/template b/srcpkgs/perl-Test2-Plugin-NoWarnings/template
index f867cfb170e..45501cb5757 100644
--- a/srcpkgs/perl-Test2-Plugin-NoWarnings/template
+++ b/srcpkgs/perl-Test2-Plugin-NoWarnings/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Test2-Plugin-NoWarnings'
 pkgname=perl-Test2-Plugin-NoWarnings
-version=0.06
-revision=2
+version=0.08
+revision=1
 archs=noarch
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -10,8 +10,8 @@ makedepends="perl"
 depends="$makedepends"
 checkdepends="perl-IPC-Run3 perl-Test2-Suite perl-Term-Table"
 short_desc="Fail if tests warn plugin for Test2"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test2-Plugin-NoWarnings"
 distfiles="${CPAN_SITE}/Test/DROLSKY/Test2-Plugin-NoWarnings-${version}.tar.gz"
-checksum=8288c1d934f69a03224598fbb715adc079c0d1609bfbaea6c88682aab1995800
+checksum=9e914cbd54008f49f9c115539914667d3b30f7acf7a6ab5272e06162f5645988
diff --git a/srcpkgs/perl-Test2-Suite/template b/srcpkgs/perl-Test2-Suite/template
index df823b2ea23..b1ff48eea50 100644
--- a/srcpkgs/perl-Test2-Suite/template
+++ b/srcpkgs/perl-Test2-Suite/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-Test2-Suite'
 pkgname=perl-Test2-Suite
-version=0.000119
+version=0.000126
 revision=1
 archs=noarch
 wrksrc="${pkgname/perl-/}-${version}"
@@ -10,8 +10,8 @@ makedepends="perl perl-Module-Pluggable perl-Sub-Info perl-Scope-Guard
  perl-Term-Table"
 depends="$makedepends"
 short_desc="Distribution with a rich set of tools built upon the Test2 framework"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test2-Suite"
 distfiles="${CPAN_SITE}/Test/EXODIST/Test2-Suite-${version}.tar.gz"
-checksum=fd48764118acf1c30057f58f0af90696b194fbc5b637c77e08672e949c101e74
+checksum=370db8171c9105480872ae8948745dbd798b9d751aacc8aa0fc36266eeda79e3
diff --git a/srcpkgs/perl-Text-Aligner/template b/srcpkgs/perl-Text-Aligner/template
index 5d986e66ae2..fbfddf59bb5 100644
--- a/srcpkgs/perl-Text-Aligner/template
+++ b/srcpkgs/perl-Text-Aligner/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Justify strings with various alignment styles"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Text-Aligner"
 distfiles="${CPAN_SITE}/Text/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Text-Bidi/template b/srcpkgs/perl-Text-Bidi/template
index ce7c8e4674b..e08c9101542 100644
--- a/srcpkgs/perl-Text-Bidi/template
+++ b/srcpkgs/perl-Text-Bidi/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Text-Bidi'
 pkgname=perl-Text-Bidi
 version=2.15
-revision=1
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=perl-module
 hostmakedepends="perl swig"
diff --git a/srcpkgs/perl-Text-CharWidth/template b/srcpkgs/perl-Text-CharWidth/template
index 961b0a2f25f..a64c804efec 100644
--- a/srcpkgs/perl-Text-CharWidth/template
+++ b/srcpkgs/perl-Text-CharWidth/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Text-CharWidth'
 pkgname=perl-Text-CharWidth
 version=0.04
-revision=4
+revision=5
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/perl-Text-Markdown/template b/srcpkgs/perl-Text-Markdown/template
index d2c3fc74e51..753ace32d12 100644
--- a/srcpkgs/perl-Text-Markdown/template
+++ b/srcpkgs/perl-Text-Markdown/template
@@ -10,7 +10,7 @@ makedepends="perl"
 depends="$makedepends"
 checkdepends="perl-Test-Exception perl-List-MoreUtils perl-Test-Differences"
 short_desc="Convert Markdown syntax to (X)HTML"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Text-Markdown"
 distfiles="${CPAN_SITE}/Text/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Text-Table/template b/srcpkgs/perl-Text-Table/template
index 704cb8ea961..c375aaddb11 100644
--- a/srcpkgs/perl-Text-Table/template
+++ b/srcpkgs/perl-Text-Table/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl perl-Text-Aligner"
 depends="$makedepends"
 short_desc="Organize Data in Tables"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Text-Table"
 distfiles="${CPAN_SITE}/Text/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Text-XLogfile/template b/srcpkgs/perl-Text-XLogfile/template
index de13017e920..6cc929a6493 100644
--- a/srcpkgs/perl-Text-XLogfile/template
+++ b/srcpkgs/perl-Text-XLogfile/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Text::Xlogfile - Read and write xlogfiles"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Text-XLogfile"
 distfiles="${CPAN_SITE}/Text/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Time-modules/template b/srcpkgs/perl-Time-modules/template
index 4fc4637eaab..0bd579a552a 100644
--- a/srcpkgs/perl-Time-modules/template
+++ b/srcpkgs/perl-Time-modules/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Tools for dealing with time, time formats, timezones and calendars"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Unknown"
 homepage="https://metacpan.org/release/MUIR/Time-modules-${version}"
 distfiles="${CPAN_SITE}/Time/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Tk/template b/srcpkgs/perl-Tk/template
index ab62b1646f7..8ba1d3b2cde 100644
--- a/srcpkgs/perl-Tk/template
+++ b/srcpkgs/perl-Tk/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Tk'
 pkgname=perl-Tk
 version=804.034
-revision=3
+revision=4
 wrksrc="${pkgname#*-}-${version}"
 build_style=perl-module
 configure_args="X11INC=${XBPS_CROSS_BASE}/usr/include
diff --git a/srcpkgs/perl-Unicode-LineBreak/template b/srcpkgs/perl-Unicode-LineBreak/template
index 2d08705a6d0..3d335c91f29 100644
--- a/srcpkgs/perl-Unicode-LineBreak/template
+++ b/srcpkgs/perl-Unicode-LineBreak/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Unicode-LineBreak'
 pkgname=perl-Unicode-LineBreak
 version=2019.001
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl pkg-config"
diff --git a/srcpkgs/perl-Unicode-String/template b/srcpkgs/perl-Unicode-String/template
index d5d524297ca..57f71131a31 100644
--- a/srcpkgs/perl-Unicode-String/template
+++ b/srcpkgs/perl-Unicode-String/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Unicode-String'
 pkgname=perl-Unicode-String
 version=2.10
-revision=5
+revision=6
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/perl-Unix-Mknod/template b/srcpkgs/perl-Unix-Mknod/template
index c87dc1b1052..2d58c0e7124 100644
--- a/srcpkgs/perl-Unix-Mknod/template
+++ b/srcpkgs/perl-Unix-Mknod/template
@@ -1,14 +1,14 @@
 # Template file for 'perl-Unix-Mknod'
 pkgname=perl-Unix-Mknod
 version=0.04
-revision=4
+revision=5
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="perl"
 depends="${makedepends}"
 short_desc="Perl extension of mknod, major, minor and makedev"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Unix-Mknod"
 distfiles="${CPAN_SITE}/Unix/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Unix-Uptime/template b/srcpkgs/perl-Unix-Uptime/template
index 4139625e4c6..0c9454e3374 100644
--- a/srcpkgs/perl-Unix-Uptime/template
+++ b/srcpkgs/perl-Unix-Uptime/template
@@ -10,7 +10,7 @@ makedepends="perl"
 depends="$makedepends"
 checkdepends="procps-ng"
 short_desc="Determine current uptime, in seconds, and load averages"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Unix-Uptime"
 distfiles="${CPAN_SITE}/Unix/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Variable-Magic/template b/srcpkgs/perl-Variable-Magic/template
index b3526b42a4d..15438827512 100644
--- a/srcpkgs/perl-Variable-Magic/template
+++ b/srcpkgs/perl-Variable-Magic/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Variable-Magic'
 pkgname=perl-Variable-Magic
 version=0.62
-revision=4
+revision=5
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/perl-WL/template b/srcpkgs/perl-WL/template
index c2916e8ac72..0f5fdbfe394 100644
--- a/srcpkgs/perl-WL/template
+++ b/srcpkgs/perl-WL/template
@@ -9,7 +9,7 @@ hostmakedepends="perl perl-Module-Build"
 makedepends="perl perl-XML-Smart perl-Socket-MsgHdr"
 depends="$makedepends"
 short_desc="Perl bindings for wayland protocol"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/WL"
 distfiles="${CPAN_SITE}/WL/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-WWW-Curl/patches/CURL_STRICTER.patch b/srcpkgs/perl-WWW-Curl/patches/CURL_STRICTER.patch
deleted file mode 100644
index 3220b248877..00000000000
--- a/srcpkgs/perl-WWW-Curl/patches/CURL_STRICTER.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 0be0223422e6e5f4091c6e4e058d213623eed105 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
-Date: Mon, 12 Sep 2016 14:40:44 +0200
-Subject: [PATCH] Skip preprocessor symbol only CURL_STRICTER
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-CURL_STRICTER leaked into curl-constants.c when building against
-curl-7.50.2. This is a preprocessor only macro without a value.
-
-CPAN RT#117793
-
-Signed-off-by: Petr Písař <ppisar@redhat.com>
----
- Makefile.PL | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- Makefile.PL
-+++ Makefile.PL
-@@ -127,7 +127,7 @@ if (!defined($curl_h)) {
-     close H;
- 
-     for my $e (sort @syms) {
--       if($e =~ /(OBSOLETE|^CURL_EXTERN|_LAST\z|_LASTENTRY\z)/) {
-+       if($e =~ /(OBSOLETE|^CURL_EXTERN|^CURL_STRICTER\z|_LAST\z|_LASTENTRY\z)/) {
-           next;
-        }
-        my ($group) = $e =~ m/^([^_]+_)/;
--- 
-2.7.4
-
diff --git a/srcpkgs/perl-WWW-Curl/patches/curl-7.50.2.patch b/srcpkgs/perl-WWW-Curl/patches/curl-7.50.2.patch
new file mode 100644
index 00000000000..3fb8c78e833
--- /dev/null
+++ b/srcpkgs/perl-WWW-Curl/patches/curl-7.50.2.patch
@@ -0,0 +1,24 @@
+--- Makefile.PL
++++ Makefile.PL
+@@ -127,7 +127,7 @@
+     close H;
+ 
+     for my $e (sort @syms) {
+-       if($e =~ /(OBSOLETE|^CURL_EXTERN|_LAST\z|_LASTENTRY\z)/) {
++       if($e =~ /(OBSOLETE|^CURL_EXTERN|^CURL_STRICTER\z|^CURL_DID_MEMORY_FUNC_TYPEDEFS\z|_LAST\z|_LASTENTRY\z|^CURLINC_CURL_H\z)/) {
+           next;
+        }
+        my ($group) = $e =~ m/^([^_]+_)/;
+--- Curl.xs
++++ Curl.xs
+@@ -18,6 +18,10 @@
+ #include <curl/easy.h>
+ #include <curl/multi.h>
+ 
++#ifdef CURLINC_MULTI_H
++#define __CURL_MULTI_H
++#endif
++
+ #define header_callback_func writeheader_callback_func
+ 
+ /* Do a favor for older perl versions */
diff --git a/srcpkgs/perl-WWW-Curl/template b/srcpkgs/perl-WWW-Curl/template
index 423bba481c6..d74a7f39216 100644
--- a/srcpkgs/perl-WWW-Curl/template
+++ b/srcpkgs/perl-WWW-Curl/template
@@ -1,7 +1,7 @@
 # Template build file for 'perl-WWW-Curl'.
 pkgname=perl-WWW-Curl
 version=4.17
-revision=9
+revision=10
 wrksrc="WWW-Curl-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/perl-WWW-Mechanize/template b/srcpkgs/perl-WWW-Mechanize/template
index 70d872e197d..9bc6d3eea8d 100644
--- a/srcpkgs/perl-WWW-Mechanize/template
+++ b/srcpkgs/perl-WWW-Mechanize/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-WWW-Mechanize'
 pkgname=perl-WWW-Mechanize
-version=1.91
+version=1.94
 revision=1
 archs=noarch
 wrksrc="${pkgname/perl-/}-${version}"
@@ -8,7 +8,7 @@ build_style=perl-module
 hostmakedepends="perl-CGI perl-HTML-Form perl-HTML-Tree
  perl-HTTP-Response-Encoding perl-HTTP-Server-Simple perl-Test-Warn"
 makedepends="perl-CGI perl-HTML-Form perl-HTML-Tree perl-HTTP-Response-Encoding
- perl-HTTP-Server-Simple perl-Test-Warn"
+ perl-HTTP-Server-Simple perl-Test-Warn perl-HTTP-Daemon"
 depends="$makedepends"
 checkdepends="perl-Test-Deep perl-Test-Exception perl-Test-Fatal
  perl-Test-NoWarnings perl-Test-Output perl-Test-Warnings"
@@ -17,7 +17,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/WWW-Mechanize"
 distfiles="${CPAN_SITE}/WWW/${pkgname/perl-/}-${version}.tar.gz"
-checksum=eb887afa401cf8c7f5294fe00bcf890e76712a2c916327ecabc029b843256131
+checksum=c850571551276aad468a5ea2b3857310107671d943fc1c0b7cae3adf552c1002
 
 pre_configure() {
 	unset configure_args
diff --git a/srcpkgs/perl-XML-LibXML/template b/srcpkgs/perl-XML-LibXML/template
index 00c0915ded8..8f93ae53732 100644
--- a/srcpkgs/perl-XML-LibXML/template
+++ b/srcpkgs/perl-XML-LibXML/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-XML-LibXML'
 pkgname=perl-XML-LibXML
 version=2.0134
-revision=2
+revision=3
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/perl-XML-Parser-Lite/template b/srcpkgs/perl-XML-Parser-Lite/template
index 768b0eee02d..3f2bea8e8f5 100644
--- a/srcpkgs/perl-XML-Parser-Lite/template
+++ b/srcpkgs/perl-XML-Parser-Lite/template
@@ -10,7 +10,7 @@ checkdepends="perl-Test-Requires"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Lightweight pure-perl XML Parser"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/XML-Parser-Lite"
 distfiles="${CPAN_SITE}/XML/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-XML-Parser/template b/srcpkgs/perl-XML-Parser/template
index cdbf9d6a1ad..0929b5f0fcb 100644
--- a/srcpkgs/perl-XML-Parser/template
+++ b/srcpkgs/perl-XML-Parser/template
@@ -1,7 +1,7 @@
 # Template build file for 'perl-XML-Parser'.
 pkgname=perl-XML-Parser
-version=2.44
-revision=11
+version=2.46
+revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
@@ -12,4 +12,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/XML-Parser"
 distfiles="${CPAN_SITE}/XML/${pkgname/perl-/}-${version}.tar.gz"
-checksum=1ae9d07ee9c35326b3d9aad56eae71a6730a73a116b9fe9e8a4758b7cc033216
+checksum=d331332491c51cccfb4cb94ffc44f9cd73378e618498d4a37df9e043661c515d
+
+post_extract() {
+	vsed -e '/exit 0;/d' -i Makefile.PL   # broken cross check
+}
diff --git a/srcpkgs/perl-XML-Smart/template b/srcpkgs/perl-XML-Smart/template
index 6d645e813e5..622a2ecf1be 100644
--- a/srcpkgs/perl-XML-Smart/template
+++ b/srcpkgs/perl-XML-Smart/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl perl-Object-MultiType"
 depends="$makedepends"
 short_desc="Smart, easy and powerful way to access or create XML"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/XML-Smart"
 distfiles="https://search.cpan.org/CPAN/authors/id/T/TM/TMHARISH/XML-Smart-${version}.tar.gz"
diff --git a/srcpkgs/perl-YAML-LibYAML/template b/srcpkgs/perl-YAML-LibYAML/template
index 13457f4c5c4..5eac6a10652 100644
--- a/srcpkgs/perl-YAML-LibYAML/template
+++ b/srcpkgs/perl-YAML-LibYAML/template
@@ -1,15 +1,15 @@
 # Template file for 'perl-YAML-LibYAML'
 pkgname=perl-YAML-LibYAML
-version=0.77
-revision=1
+version=0.80
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Perl YAML Serialization using XS and libyaml"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/YAML-LibYAML"
 distfiles="${CPAN_SITE}/YAML/YAML-LibYAML-${version}.tar.gz"
-checksum=51efd448e401555e8b1dacb0438f56adc7a0f4c643be43a8fdcfe411d1518e13
+checksum=9d60d8d581b178372a20679a40bcfe2d9b018371a200daf32907df290a2716da
diff --git a/srcpkgs/perl-namespace-autoclean/template b/srcpkgs/perl-namespace-autoclean/template
index 6fe54d58cf0..a523c1aba25 100644
--- a/srcpkgs/perl-namespace-autoclean/template
+++ b/srcpkgs/perl-namespace-autoclean/template
@@ -1,17 +1,17 @@
-# Template build file for 'perl-namespace-autoclean'.
+# Template file for 'perl-namespace-autoclean'
 pkgname=perl-namespace-autoclean
-version=0.28
+version=0.29
 revision=1
 archs=noarch
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="${hostmakedepends} perl-Sub-Identify perl-namespace-clean perl-B-Hooks-EndOfScope"
-checkdepends="perl-Test-Requires"
 depends="${makedepends}"
+checkdepends="perl-Test-Needs"
 short_desc="Keep imports out of your namespace"
 maintainer="newbluemoon <blaumolch@mailbox.org>"
+license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/namespace-autoclean"
-license="Artistic, GPL-1"
 distfiles="${CPAN_SITE}/namespace/${pkgname/perl-/}-$version.tar.gz"
-checksum="cd410a1681add521a28805da2e138d44f0d542407b50999252a147e553c26c39"
+checksum=45ebd8e64a54a86f88d8e01ae55212967c8aa8fed57e814085def7608ac65804
diff --git a/srcpkgs/perl-pcsc/template b/srcpkgs/perl-pcsc/template
index c997b599966..5fa8d50a753 100644
--- a/srcpkgs/perl-pcsc/template
+++ b/srcpkgs/perl-pcsc/template
@@ -1,7 +1,7 @@
 # Template build file for 'perl-pcsc'.
 pkgname=perl-pcsc
 version=1.4.14
-revision=6
+revision=7
 _origname="pcsc-perl"
 wrksrc="${_origname}-${version}"
 build_style=perl-module
diff --git a/srcpkgs/perl-strictures/template b/srcpkgs/perl-strictures/template
index 7adaacf5714..f682d3b3732 100644
--- a/srcpkgs/perl-strictures/template
+++ b/srcpkgs/perl-strictures/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-strictures'
 pkgname=perl-strictures
-version=2.000005
+version=2.000006
 revision=1
 archs=noarch
 wrksrc="${pkgname/perl-/}-${version}"
@@ -9,8 +9,9 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Turn on strict and make most warnings fatal"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/strictures"
-distfiles="https://cpan.org/authors/id/E/ET/ETHER/strictures-${version}.tar.gz"
-checksum=960bdb9f82c8f09caebc417bce3fdf75b27de81f4408d0ba0b0a6d61ab86dd99
+distfiles="https4.1://cpan.org/authors/id/E/ET/ETHER/strictures-${version}.tar.gz"
+distfiles="${CPAN_SITE}/lib/HAARG/${pkgname/perl-/}-${version}.tar.gz"
+checksum=09d57974a6d1b2380c802870fed471108f51170da81458e2751859f2714f8d57
diff --git a/srcpkgs/perl-tainting/template b/srcpkgs/perl-tainting/template
index 308b66b06e3..f24735ecfba 100644
--- a/srcpkgs/perl-tainting/template
+++ b/srcpkgs/perl-tainting/template
@@ -10,7 +10,7 @@ makedepends="perl perl-Taint-Runtime"
 depends="$makedepends"
 checkdepends="perl-Test-Exception"
 short_desc="Enable taint mode lexically"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/tainting"
 distfiles="${CPAN_SITE}/LWP/PERLANCAR/tainting-${version}.tar.gz"
diff --git a/srcpkgs/perl/patches/cleanup-paths.diff b/srcpkgs/perl/patches/cleanup-paths.diff
index 2f3197b20c7..5bdcd5ef854 100644
--- a/srcpkgs/perl/patches/cleanup-paths.diff
+++ b/srcpkgs/perl/patches/cleanup-paths.diff
@@ -1,19 +1,3 @@
-From bd709251a971ce7855857ba230123605cfa710e7 Mon Sep 17 00:00:00 2001
-From: Vladimir Smirnov <civil@gentoo.org>
-Date: Mon, 19 May 2014 19:54:51 +0400
-Subject: [PATCH] Cleanup PATH and shrpenv
-
-cut the crap of inventing paths, or adding search paths that we don't
-use
-
-Patch-Name: gentoo/cleanup-paths.diff
-Original-By: Torsten Veller <tove@gentoo.org>
----
- Configure | 79 ---------------------------------------------------------------
- 1 file changed, 79 deletions(-)
-
-diff --git a/Configure b/Configure
-index b221390..63b8848 100755
 --- Configure
 +++ Configure
 @@ -107,28 +107,6 @@
@@ -45,7 +29,7 @@ index b221390..63b8848 100755
  : shall we be using ksh?
  inksh=''
  needksh=''
-@@ -8720,57 +8698,6 @@
+@@ -8795,57 +8773,6 @@
  	;;
  esac
  
@@ -64,7 +48,7 @@ index b221390..63b8848 100755
 -	solaris)
 -		xxx="-R $shrpdir"
 -		;;
--	freebsd|mirbsd|netbsd|openbsd|interix|dragonfly|bitrig)
+-	freebsd|minix|mirbsd|netbsd|openbsd|interix|dragonfly|bitrig)
 -		xxx="-Wl,-R$shrpdir"
 -		;;
 -	bsdos|linux|irix*|dec_osf|gnu*|haiku)
diff --git a/srcpkgs/perl/template b/srcpkgs/perl/template
index c25761b26b4..07b8cd45114 100644
--- a/srcpkgs/perl/template
+++ b/srcpkgs/perl/template
@@ -1,87 +1,86 @@
 # Template file for 'perl'
 pkgname=perl
-version=5.28.2
+version=5.30.0
 revision=1
 _perl_cross_version=1.3
 build_style=gnu-configure
 hostmakedepends="less"
 makedepends="zlib-devel bzip2-devel gdbm-devel db-devel"
 depends="less"
+checkdepends="iana-etc perl-AnyEvent perl-Test-Pod procps-ng"
 short_desc="Practical Extraction and Report Language"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-perl, GPL-1.0-or-later"
 homepage="https://www.perl.org"
 distfiles="https://www.cpan.org/src/5.0/perl-${version}.tar.gz
  https://github.com/arsv/perl-cross/releases/download/${_perl_cross_version}/perl-cross-${_perl_cross_version}.tar.gz"
-checksum="aa95456dddb3eb1cc5475fed4e08f91876bea71fb636fba6399054dfbabed6c7
+checksum="851213c754d98ccff042caa40ba7a796b2cee88c5325f121be5cbb61bbf975f2
  49edea1ea2cd6c5c47386ca71beda8d150c748835781354dbe7f75b1df27e703"
 
 # Before updating this package to a new major version, run ${FILESDIR}/provides.pl
 # against ${wrksrc} to find the list of built in packages.
 
-provides="perl-Archive-Tar-2.30_1
+provides="perl-Archive-Tar-2.32_1
  perl-Attribute-Handlers-1.01_1
  perl-AutoLoader-5.74_1
- perl-B-Debug-1.26_1
- perl-CPAN-2.20_1
+ perl-CPAN-2.22_1
  perl-CPAN-Meta-2.150010_1
  perl-CPAN-Meta-Requirements-2.140_1
  perl-CPAN-Meta-YAML-0.018_1
  perl-Carp-1.50_1
- perl-Compress-Raw-Bzip2-2.074_1
- perl-Compress-Raw-Zlib-2.076_1
- perl-Config-Perl-V-0.29_1
- perl-DB_File-1.840_1
- perl-Data-Dumper-2.170_1
- perl-Devel-PPPort-3.40_1
+ perl-Compress-Raw-Bzip2-2.084_1
+ perl-Compress-Raw-Zlib-2.084_1
+ perl-Config-Perl-V-0.32_1
+ perl-DB_File-1.843_1
+ perl-Data-Dumper-2.174_1
+ perl-Devel-PPPort-3.52_1
  perl-Devel-SelfStubber-1.06_1
  perl-Digest-1.17_01_1
  perl-Digest-MD5-2.55_1
- perl-Digest-SHA-6.01_1
+ perl-Digest-SHA-6.02_1
  perl-Dumpvalue-1.18_1
- perl-Encode-2.97_1
+ perl-Encode-3.01_1
  perl-Env-1.04_1
  perl-Exporter-5.73_1
- perl-ExtUtils-CBuilder-0.280230_1
+ perl-ExtUtils-CBuilder-0.280231_1
  perl-ExtUtils-Constant-0.25_1
  perl-ExtUtils-Install-2.14_1
  perl-ExtUtils-MakeMaker-7.34_1
- perl-ExtUtils-Manifest-1.70_1
- perl-ExtUtils-ParseXS-3.39_1
+ perl-ExtUtils-Manifest-1.72_1
+ perl-ExtUtils-ParseXS-3.40_1
  perl-File-Fetch-0.56_1
- perl-File-Path-2.15_1
- perl-File-Temp-0.2304_1
+ perl-File-Path-2.16_1
+ perl-File-Temp-0.2309_1
  perl-Filter-Simple-0.95_1
- perl-Filter-Util-Call-1.58_1
+ perl-Filter-Util-Call-1.59_1
  perl-Getopt-Long-2.5_1
- perl-HTTP-Tiny-0.070_1
+ perl-HTTP-Tiny-0.076_1
  perl-I18N-Collate-1.02_1
  perl-I18N-LangTags-0.43_1
- perl-IO-1.39_1
- perl-IO-Compress-2.074_1
+ perl-IO-1.40_1
+ perl-IO-Compress-2.084_1
  perl-IO-Socket-IP-0.39_1
  perl-IO-Zlib-1.10_1
- perl-IPC-Cmd-1.00_1
+ perl-IPC-Cmd-1.02_1
  perl-IPC-SysV-2.07_1
- perl-JSON-PP-2.97001_1
- perl-Locale-Codes-3.56_1
+ perl-JSON-PP-4.02_1
  perl-Locale-Maketext-1.29_1
  perl-Locale-Maketext-Simple-0.21_01_1
  perl-MIME-Base64-3.15_1
- perl-Math-BigInt-1.999811_1
- perl-Math-BigInt-FastCalc-0.5006_1
- perl-Math-BigRat-0.2613_1
+ perl-Math-BigInt-1.999816_1
+ perl-Math-BigInt-FastCalc-0.5008_1
+ perl-Math-BigRat-0.2614_1
  perl-Math-Complex-1.5901_1
  perl-Memoize-1.03_01_1
- perl-Module-CoreList-5.20180622_1
- perl-Module-Load-0.32_1
+ perl-Module-CoreList-5.20190522_1
+ perl-Module-Load-0.34_1
  perl-Module-Load-Conditional-0.68_1
  perl-Module-Loaded-0.08_1
- perl-Module-Metadata-1.000033_1
+ perl-Module-Metadata-1.000036_1
  perl-NEXT-0.67_01_1
- perl-Net-Ping-2.62_1
+ perl-Net-Ping-2.71_1
  perl-Params-Check-0.38_1
- perl-PathTools-3.74_1
+ perl-PathTools-3.78_1
  perl-Perl-OSType-1.010_1
  perl-PerlIO-via-QuotedPrint-0.08_1
  perl-Pod-Checker-1.73_1
@@ -95,7 +94,7 @@ provides="perl-Archive-Tar-2.30_1
  perl-Search-Dict-1.07_1
  perl-SelfLoader-1.25_1
  perl-Socket-2.027_1
- perl-Storable-3.08_1
+ perl-Storable-3.15_1
  perl-Sys-Syslog-0.35_1
  perl-Term-ANSIColor-4.06_1
  perl-Term-Cap-1.17_1
@@ -103,19 +102,19 @@ provides="perl-Archive-Tar-2.30_1
  perl-Term-ReadLine-1.17_1
  perl-Test-1.31_1
  perl-Test-Harness-3.42_1
- perl-Test-Simple-1.302133_1
+ perl-Test-Simple-1.302162_1
  perl-Text-Abbrev-1.02_1
  perl-Text-Balanced-2.03_1
  perl-Text-ParseWords-3.30_1
  perl-Text-Tabs-2013.0523_1
- perl-Thread-Queue-3.12_1
+ perl-Thread-Queue-3.13_1
  perl-Thread-Semaphore-2.13_1
  perl-Tie-File-1.02_1
  perl-Tie-RefHash-1.39_1
- perl-Time-HiRes-1.9759_1
- perl-Time-Local-1.25_1
- perl-Time-Piece-1.3204_1
- perl-Unicode-Collate-1.25_1
+ perl-Time-HiRes-1.9760_1
+ perl-Time-Local-1.28_1
+ perl-Time-Piece-1.33_1
+ perl-Unicode-Collate-1.27_1
  perl-Unicode-Normalize-1.26_1
  perl-Win32-0.52_1
  perl-Win32API-File-0.1203_1
@@ -123,19 +122,19 @@ provides="perl-Archive-Tar-2.30_1
  perl-autodie-2.29_1
  perl-autouse-1.11_1
  perl-base-2.27_1
- perl-bignum-0.49_1
+ perl-bignum-0.51_1
  perl-constant-1.33_1
  perl-encoding-warnings-0.13_1
- perl-experimental-0.019_1
+ perl-experimental-0.020_1
  perl-if-0.0608_1
- perl-lib-0.64_1
+ perl-lib-0.65_1
  perl-libnet-3.11_1
- perl-parent-0.236_1
- perl-perlfaq-5.021011_1
+ perl-parent-0.237_1
+ perl-perlfaq-5.20190126_1
  perl-podlators-5.006_1
  perl-threads-2.22_1
- perl-threads-shared-1.58_1
- perl-version-0.9923_1"
+ perl-threads-shared-1.60_1
+ perl-version-0.9924_1"
 
 for f in ${provides}; do
 	replaces+=" $($XBPS_UHELPER_CMD getpkgname ${f})>=0"
@@ -194,6 +193,11 @@ do_configure() {
 	}
 }
 
+do_check() {
+	export LD="$CC"
+	TEST_JOBS=${XBPS_MAKEJOBS} make test
+}
+
 post_install() {
 	find ${DESTDIR}/usr/share -type f -exec chmod 644 {} \;
 	find ${DESTDIR}/usr/lib -type f -exec chmod 644 {} \;
diff --git a/srcpkgs/peru/template b/srcpkgs/peru/template
new file mode 100644
index 00000000000..682440f0b50
--- /dev/null
+++ b/srcpkgs/peru/template
@@ -0,0 +1,20 @@
+# Template file for 'peru'
+pkgname=peru
+version=1.2.0
+revision=1
+archs=noarch
+build_style=python3-module
+pycompile_module="peru"
+hostmakedepends="python3-setuptools"
+depends="curl git mercurial python3 python3-docopt python3-yaml"
+short_desc="Tool for fetching code"
+maintainer="Andy Weidenbaum <archbaum@gmail.com>"
+license="MIT"
+homepage="https://github.com/buildinspace/peru"
+distfiles="https://github.com/buildinspace/peru/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
+checksum=fb0fb02639e1c5403c9a6ddfd9719c5ea5ddf69fb440fbcfafe234470645e1dc
+
+post_install() {
+	vlicense LICENSE
+	vdoc README.md
+}
diff --git a/srcpkgs/pfetch/template b/srcpkgs/pfetch/template
new file mode 100644
index 00000000000..5a24586d0c7
--- /dev/null
+++ b/srcpkgs/pfetch/template
@@ -0,0 +1,16 @@
+# Template file for 'pfetch'
+pkgname=pfetch
+version=0.4.0
+revision=1
+archs="noarch"
+short_desc="System information tool written in POSIX sh"
+maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
+license="MIT"
+homepage="https://github.com/dylanaraps/pfetch"
+distfiles="https://github.com/dylanaraps/pfetch/archive/${version}.tar.gz"
+checksum=4cdac9e509fe94c0a27ab80454cddd830ff1a9c64216493658caa53670454fcd
+
+do_install() {
+	vbin pfetch
+	vlicense LICENSE.md
+}
diff --git a/srcpkgs/pgbackrest/template b/srcpkgs/pgbackrest/template
index 63b00cb019e..730621d804f 100644
--- a/srcpkgs/pgbackrest/template
+++ b/srcpkgs/pgbackrest/template
@@ -1,7 +1,7 @@
 # Template file for 'pgbackrest'
 pkgname=pgbackrest
 version=2.15.1
-revision=1
+revision=2
 wrksrc="${pkgname}-release-${version}"
 build_wrksrc="src"
 build_style=gnu-configure
diff --git a/srcpkgs/pgbouncer/template b/srcpkgs/pgbouncer/template
index 78526f7ed53..6d12693733f 100644
--- a/srcpkgs/pgbouncer/template
+++ b/srcpkgs/pgbouncer/template
@@ -1,6 +1,6 @@
 # Template file for 'pgbouncer'
 pkgname=pgbouncer
-version=1.10.0
+version=1.11.0
 revision=1
 build_style=gnu-configure
 makedepends="libevent-devel"
@@ -9,7 +9,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="ISC"
 homepage="https://pgbouncer.github.io/"
 distfiles="https://pgbouncer.github.io/downloads/files/${version}/pgbouncer-${version}.tar.gz"
-checksum=d8a01442fe14ce3bd712b9e2e12456694edbbb1baedb0d6ed1f915657dd71bd5
+checksum=84802fa48a2806c53675764ce10a8b6e4733f196eb23e1aa4b954dcbe7287e70
 
 post_install() {
 	vlicense COPYRIGHT
diff --git a/srcpkgs/pgweb/template b/srcpkgs/pgweb/template
index f7ec05010cc..224a6714461 100644
--- a/srcpkgs/pgweb/template
+++ b/srcpkgs/pgweb/template
@@ -1,6 +1,6 @@
 # Template file for 'pgweb'
 pkgname=pgweb
-version=0.11.3
+version=0.11.4
 revision=1
 build_style=go
 go_import_path="github.com/sosedoff/pgweb"
@@ -9,7 +9,7 @@ maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="MIT"
 homepage="http://sosedoff.github.io/pgweb"
 distfiles="https://github.com/sosedoff/pgweb/archive/v${version}.tar.gz"
-checksum=6d9606ce5c609e774781f588e5802108abb6355f706b6245e26906521799d9e2
+checksum=1dc101abc31bc349a38b746b98835572498049d06b8be9938c795f89bbeac936
 
 post_install() {
 	vdoc README.md
diff --git a/srcpkgs/phonon-qt5/template b/srcpkgs/phonon-qt5/template
index a5ac0c1842c..04a71cee352 100644
--- a/srcpkgs/phonon-qt5/template
+++ b/srcpkgs/phonon-qt5/template
@@ -1,18 +1,18 @@
 # Template file for 'phonon-qt5'
 pkgname=phonon-qt5
-version=4.10.2
+version=4.11.1
 revision=1
 wrksrc="${pkgname%-*}-${version}"
 build_style=cmake
 configure_args="-DPHONON_BUILD_PHONON4QT5=ON -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON"
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-devel"
-makedepends="glib-devel qt5-devel pulseaudio-devel"
+makedepends="glib-devel qt5-devel qt5-tools-devel pulseaudio-devel"
 short_desc="Multimedia framework for KDE"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://phonon.kde.org/"
 distfiles="${KDE_SITE}/${pkgname%-*}/${version}/${pkgname%-*}-${version}.tar.xz"
-checksum=34edb1985778575eb7004e4e45151cd7bc995f61ddd6ce3b050b97b7bd778809
+checksum=b4431ea2600df8137a717741ad9ebc7f7ec1649fa3e138541d8f42597144de2d
 
 phonon-qt5-devel_package() {
 	depends="qt5-devel ${sourcepkg}-${version}_${revision}"
@@ -22,5 +22,6 @@ phonon-qt5-devel_package() {
 		vmove usr/lib/cmake
 		vmove usr/lib/pkgconfig
 		vmove usr/share/phonon4qt5
+		vmove usr/lib/qt5/plugins/designer/phononwidgets.so
 	}
 }
diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index 47751218efb..feafa466a76 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,7 +1,7 @@
 # Template file for 'php'
 pkgname=php
-version=7.3.7
-revision=2
+version=7.3.10
+revision=1
 hostmakedepends="bison pkg-config"
 makedepends="apache-devel enchant-devel freetds-devel freetype-devel gdbm-devel
  gmp-devel libcurl-devel libjpeg-turbo-devel libmysqlclient-devel
@@ -12,7 +12,7 @@ maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="PHP-3.01"
 homepage="https://www.php.net"
 distfiles="http://www.php.net/distributions/php-${version}.tar.xz"
-checksum=ba067200ba649956b3a92ec8b71a6ed8ce8a099921212443c1bcf3260a29274c
+checksum=42f00a15419e05771734b7159c8d39d639b8a5a6770413adfa2615f6f923d906
 
 conf_files="/etc/php/php.ini"
 
diff --git a/srcpkgs/picard/template b/srcpkgs/picard/template
index fccccfc190d..1bae142434a 100644
--- a/srcpkgs/picard/template
+++ b/srcpkgs/picard/template
@@ -1,6 +1,6 @@
 # Template file for 'picard'
 pkgname=picard
-version=2.1.3
+version=2.2.2
 revision=1
 archs=noarch
 wrksrc="${pkgname}-release-${version}"
@@ -17,4 +17,4 @@ license="GPL-2.0-or-later"
 homepage="https://picard.musicbrainz.org/"
 changelog="https://picard.musicbrainz.org/changelog/"
 distfiles="http://ftp.musicbrainz.org/pub/musicbrainz/${pkgname}/${pkgname}-${version%.0}.tar.gz"
-checksum=8e044fe68c44d345c19f98952c3c7f20c72da74dbac9ce7c7b0621e2d69885a7
+checksum=00066def8e83eec5236977d2d3bc22cd72bba9c2bf1608c0fff1e3298e71e6e1
diff --git a/srcpkgs/pidgin-sipe/template b/srcpkgs/pidgin-sipe/template
index 50846cdc755..28676a038de 100644
--- a/srcpkgs/pidgin-sipe/template
+++ b/srcpkgs/pidgin-sipe/template
@@ -1,7 +1,7 @@
 # Template file for 'pidgin-sipe'
 pkgname=pidgin-sipe
-version=1.24.0
-revision=3
+version=1.25.0
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="pidgin-devel libressl-devel libxml2-devel dbus-glib-devel
@@ -12,4 +12,4 @@ maintainer="Renato Aguiar <renato@renag.me>"
 license="GPL-2.0-or-later"
 homepage="http://sipe.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/sipe/sipe/${pkgname}-${version}.tar.xz"
-checksum=958803722b23d869131f76bd90df9da19116d4ca5a873e5253371479b7390f43
+checksum=738b121b11f2b3f1744150c00cb381222eb6cf67161a7742797eb4f03e64a2ba
diff --git a/srcpkgs/pijul/patches/bindgen.patch b/srcpkgs/pijul/patches/bindgen.patch
index dd124b79c2f..c90bb9dba2b 100644
--- a/srcpkgs/pijul/patches/bindgen.patch
+++ b/srcpkgs/pijul/patches/bindgen.patch
@@ -1,10 +1,9 @@
-patch bindgen to use BINDGEN_EXTRA_CLANG_ARGS variable to set sysroot for cross builds
-https://github.com/jnbr/rust-bindgen/tree/0.43.2-clang_args
-
---- Cargo.toml.orig	2019-06-15 02:33:02.105715462 +0200
-+++ Cargo.toml	2019-06-15 02:36:33.905701785 +0200
-@@ -6,3 +6,4 @@
- "libpijul:0.12.0" = { path = "libpijul" }
- "line:0.1.15" = { path = "line" }
- "diffs:0.3.0" = { path = "diffs" }
-+"bindgen:0.43.2" = {git = 'https://github.com/jnbr/rust-bindgen', rev = "1467ac97c669c1ddda8117ccf1d398609b0e6fa9"}
+--- Cargo.toml.orig
++++ Cargo.toml
+@@ -133,3 +133,6 @@
+ version = "2.0"
+ [target."cfg(unix)".dependencies.tokio-uds]
+ version = "0.2"
++
++[replace]
++"bindgen:0.47.3" = {git = 'https://github.com/Duncaen/rust-bindgen', rev = "e70d9568887ffb6c2a7d7d165a71aed311a29129"}
diff --git a/srcpkgs/pijul/template b/srcpkgs/pijul/template
index b76bd1d3f4c..d46ca14e242 100644
--- a/srcpkgs/pijul/template
+++ b/srcpkgs/pijul/template
@@ -1,7 +1,7 @@
 # Template file for 'pijul'
 pkgname=pijul
-version=0.12.0
-revision=2
+version=0.12.2
+revision=1
 build_style=cargo
 hostmakedepends="pkg-config clang"
 makedepends="libsodium-devel libressl-devel nettle-devel"
@@ -9,8 +9,8 @@ short_desc="Distributed version control system based on patches"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://pijul.org/"
-distfiles="https://pijul.org/releases/pijul-${version}.tar.gz"
-checksum=987820fa2a6fe92a9f516f5e9b41ad59a597973e72cb0c7a44ca0f38e741a7e6
+distfiles="https://crates.io/api/v1/crates/pijul/${version}/download>pijul-${version}.tar.gz"
+checksum=f92a3f4063e780ca45c161ceb0f42baf34dfeddf3359ebf6c2e0442d9abb5889
 
 if [ "$CROSS_BUILD" ]; then
 	export HOST_CC="$BUILD_CC"
@@ -18,11 +18,6 @@ if [ "$CROSS_BUILD" ]; then
 	export BINDGEN_EXTRA_CLANG_ARGS="--sysroot=$XBPS_CROSS_BASE"
 fi
 
-pre_build() {
-	cargo update --package openssl-sys --precise 0.9.46
-	cargo update --package openssl --precise 0.10.22
-}
-
 # We only want to install the binary, so don't run cargo install
 do_install() {
 	vbin target/${RUST_TARGET}/release/pijul
diff --git a/srcpkgs/pim-data-exporter/template b/srcpkgs/pim-data-exporter/template
index 30f30811950..9694f5b2da9 100644
--- a/srcpkgs/pim-data-exporter/template
+++ b/srcpkgs/pim-data-exporter/template
@@ -1,7 +1,7 @@
 # Template file for 'pim-data-exporter'
 pkgname=pim-data-exporter
-version=19.08.0
-revision=1
+version=19.08.2
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools qt5-host-tools qt5-qmake
  kcoreaddons kconfig"
@@ -12,4 +12,4 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=f5ff68dcbad1df7ea132b409b70b9b4269badb26e28b4b7cd50239172507f7d8
+checksum=e4703d7a10935814738394a38c5ad54f9923c58e43c397e2e78a4b1b1176f4c2
diff --git a/srcpkgs/pimcommon/template b/srcpkgs/pimcommon/template
index 06b3bc9362e..e39987b8b2f 100644
--- a/srcpkgs/pimcommon/template
+++ b/srcpkgs/pimcommon/template
@@ -1,7 +1,7 @@
 # Template file for 'pimcommon'
 pkgname=pimcommon
-version=19.08.0
-revision=1
+version=19.08.2
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python libxslt
  kconfig kgendesignerplugin"
@@ -13,7 +13,7 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/applications/${version}/src/pimcommon-${version}.tar.xz"
-checksum=23be57010127831c3ad9b9475e467e8078ff92410c80609660498c5dc6fbaf9a
+checksum=ccdf2624a055a9db31b0b8109c791776d111ae91438f41ed50dcb9faca287e4c
 
 pimcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/pinentry-dmenu/template b/srcpkgs/pinentry-dmenu/template
index 78443a70ddc..8ca511bed34 100644
--- a/srcpkgs/pinentry-dmenu/template
+++ b/srcpkgs/pinentry-dmenu/template
@@ -7,7 +7,7 @@ makedepends="libXft-devel freetype-devel libconfig-devel
  libXinerama-devel libgpg-error-devel libassuan-devel
  gpgme-devel"
 short_desc="Pinentry program based on dmenu"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/ritze/pinentry-dmenu"
 distfiles="https://github.com/ritze/pinentry-dmenu/archive/${version}.tar.gz"
diff --git a/srcpkgs/pioneer/template b/srcpkgs/pioneer/template
index 571dfc3833e..3fa2cecd63e 100644
--- a/srcpkgs/pioneer/template
+++ b/srcpkgs/pioneer/template
@@ -1,7 +1,8 @@
 # Template file for 'pioneer'
 pkgname=pioneer
+reverts="20191009_1"
 version=20190203
-revision=1
+revision=3
 build_style=cmake
 configure_args="-DPIONEER_DATA_DIR=/usr/share/pioneer
  -DUSE_SYSTEM_LIBLUA=ON -DUSE_SYSTEM_LIBGLEW=ON"
@@ -15,6 +16,7 @@ license="GPL-3.0-or-later"
 homepage="https://pioneerspacesim.net"
 distfiles="https://github.com/pioneerspacesim/pioneer/archive/${version}.tar.gz"
 checksum=e526f1659ae321f45b997c0245acecbf9c4cf2122b025ab8db1090f1b9804f5e
+disable_parallel_build=yes
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" pioneer-modelcompiler"
diff --git a/srcpkgs/pioneer/update b/srcpkgs/pioneer/update
new file mode 100644
index 00000000000..829d61ff9f3
--- /dev/null
+++ b/srcpkgs/pioneer/update
@@ -0,0 +1 @@
+ignore="20191009"
diff --git a/srcpkgs/piper/template b/srcpkgs/piper/template
index 2ce36796f9e..af8cc854991 100644
--- a/srcpkgs/piper/template
+++ b/srcpkgs/piper/template
@@ -8,7 +8,7 @@ hostmakedepends="libratbag pkg-config glib-devel"
 makedepends="python3-devel python3-gobject-devel"
 depends="python3 python3-gobject libratbag python3-lxml"
 short_desc="GTK application to configure gaming mice"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/libratbag/piper"
 distfiles="https://github.com/libratbag/piper/archive/${version}.tar.gz"
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index 1fa113b8935..44e86ae8d26 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,19 +1,20 @@
 # Template file for 'pipewire'
 pkgname=pipewire
 version=0.2.6
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dman=true -Dgstreamer=enabled -Ddocs=true -Dsystemd=false"
 hostmakedepends="doxygen graphviz pkg-config xmltoman"
 makedepends="SDL2-devel ffmpeg-devel gst-plugins-base1-devel jack-devel
  sbc-devel v4l-utils-devel libva-devel"
 short_desc="Server and user space API to deal with multimedia pipelines"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://pipewire.org/"
 changelog="https://raw.githubusercontent.com/PipeWire/pipewire/master/NEWS"
 distfiles="https://github.com/PipeWire/pipewire/archive/${version}.tar.gz"
 checksum=8592bcc2a83b078fee6cfb8560397cf2747346f28e88689197e780069b19cb17
+conf_files="/etc/pipewire/pipewire.conf"
 
 libpipewire_package() {
 	short_desc+=" - pipewire library"
diff --git a/srcpkgs/pithos/template b/srcpkgs/pithos/template
index 6be69afe50b..470967f188b 100644
--- a/srcpkgs/pithos/template
+++ b/srcpkgs/pithos/template
@@ -1,14 +1,14 @@
 # Template file for 'pithos'
 pkgname=pithos
-version=1.4.1
+version=1.5.0
 revision=1
 build_style=meson
 pycompile_module="pithos"
-makedepends="intltool pkg-config python3 glib-devel"
+hostmakedepends="pkg-config intltool python3 glib-devel"
 depends="gtk+3 python3-gobject libsecret gst-plugins-good1 gst-libav gnome-keyring"
 short_desc="Native Pandora Radio client"
 maintainer="osn64 <dave@techthrones.com>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="https://pithos.github.io/"
 distfiles="https://github.com/pithos/pithos/releases/download/${version}/pithos-${version}.tar.xz"
-checksum=ebc30213ae85716d5a57e30b912f083b2fdb374a793d5adfec00a064fdfc165c
+checksum=61e2a778252358519979ea53ab9fb9dd10a9554d24f3e249560bc4971f386133
diff --git a/srcpkgs/pixman/template b/srcpkgs/pixman/template
index 704749f6bc0..eb4a6da3b03 100644
--- a/srcpkgs/pixman/template
+++ b/srcpkgs/pixman/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="--disable-gtk" # do not require gtk+!
 hostmakedepends="pkg-config perl"
 short_desc="Library of low-level pixel manipulation routines"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://wiki.freedesktop.org/xorg/"
 distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
diff --git a/srcpkgs/pkgtop/template b/srcpkgs/pkgtop/template
new file mode 100644
index 00000000000..31a769917d6
--- /dev/null
+++ b/srcpkgs/pkgtop/template
@@ -0,0 +1,18 @@
+# Template file for 'pkgtop'
+pkgname=pkgtop
+version=2.0
+revision=1
+build_style=go
+go_import_path="github.com/orhun/pkgtop"
+go_package="${go_import_path}/src"
+hostmakedepends="git"
+short_desc="Interactive package manager and resource monitor"
+maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/orhun/pkgtop"
+distfiles="https://github.com/orhun/pkgtop/archive/${version}.tar.gz"
+checksum=0356155cea97e9a325a4c1fe99a1f6989bc2d7bf6ab1a9d34763bb832123f880
+
+post_install() {
+	mv ${DESTDIR}/usr/bin/{src,pkgtop}
+}
diff --git a/srcpkgs/plantuml/template b/srcpkgs/plantuml/template
index 85bf75bb642..fc7bf73d9c0 100644
--- a/srcpkgs/plantuml/template
+++ b/srcpkgs/plantuml/template
@@ -1,7 +1,7 @@
 # Template file for 'plantuml'
 pkgname=plantuml
 reverts="8047_1 8053_1 8059_1"
-version=1.2019.7
+version=1.2019.11
 revision=1
 archs=noarch
 create_wrksrc=yes
@@ -12,7 +12,7 @@ maintainer="Julien Dehos <dehos@lisic.univ-littoral.fr>"
 license="GPL-2.0-or-later"
 homepage="http://plantuml.com/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-jar-gplv2-${version}.zip"
-checksum=6474df87daec7fd5228cdcc3b98fe4acf978fb308221f2f320fff2a6b04c0e45
+checksum=62d99aec44065b2f526e1628712f846661a0bcaeee8277e7c123f0cdf1056afe
 
 do_build() {
 	mv ${pkgname}.jar ${pkgname}-${version}.jar
@@ -25,4 +25,3 @@ do_install() {
 	vbin plantuml
 	vinstall ${pkgname}-${version}.jar 644 usr/share/java ${pkgname}-${version}.jar
 }
-
diff --git a/srcpkgs/plasma-browser-integration/template b/srcpkgs/plasma-browser-integration/template
index 7c9b37b01f2..da6776693b7 100644
--- a/srcpkgs/plasma-browser-integration/template
+++ b/srcpkgs/plasma-browser-integration/template
@@ -1,18 +1,19 @@
 # Template file for 'plasma-browser-integration'
 pkgname=plasma-browser-integration
-version=5.16.4
+version=5.17.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules pkg-config kcoreaddons qt5-host-tools
  qt5-qmake"
-makedepends="qt5-devel kio-devel ki18n-devel krunner-devel kactivities5-devel"
+makedepends="qt5-devel kio-devel ki18n-devel krunner-devel kactivities5-devel
+ purpose-devel kfilemetadata5-devel"
 short_desc="Integration of web browsers with the KDE Plasma 5 desktop"
 maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://projects.kde.org/projects/plasma/plasma-browser-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=a097b90dd47cdd01f6b7207cb9439c7f6e0ce68555272172f8b3b8e2086199ef
+checksum=2b91669492f30fa7fcc082e31499f99e93a21365e27ebae3a14ead7ddeaa28d4
 
 if [ "${CROSS_BUILD}" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/plasma-desktop/template b/srcpkgs/plasma-desktop/template
index 4b8c99f325a..e35366b6164 100644
--- a/srcpkgs/plasma-desktop/template
+++ b/srcpkgs/plasma-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-desktop'
 pkgname=plasma-desktop
-version=5.16.4
+version=5.17.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -15,7 +15,7 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2"
 homepage="https://projects.kde.org/projects/plasma/plasma-desktop"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=990e93eed2753053ac732ce5d1d45e7c9a52daa660b41b0d48955428e4834344
+checksum=f4a913a60fee4597a7a6c98a263f9a7a40f7663f3903b4042a7f90a686dc8aa0
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kconfig-devel kcoreaddons-devel kded
diff --git a/srcpkgs/plasma-framework/template b/srcpkgs/plasma-framework/template
index 1180757056f..266e6e0f9a7 100644
--- a/srcpkgs/plasma-framework/template
+++ b/srcpkgs/plasma-framework/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-framework'
 pkgname=plasma-framework
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/frameworks/plasma-framework"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=873d604aadbe21ba38cdb12b778d3baf121a54e6155596f0ebee1840138060fe
+checksum=914194ca699d4772dc3f3767ef1a536d87e8d31d325ad052e9745270388e1f5c
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/plasma-integration/template b/srcpkgs/plasma-integration/template
index 9b23a2645b6..761875619e3 100644
--- a/srcpkgs/plasma-integration/template
+++ b/srcpkgs/plasma-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-integration'
 pkgname=plasma-integration
-version=5.16.4
+version=5.17.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/plasma/plasma-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d4c5022ea91f9727cfebab821cb6b8e7b52671a6508cd7450e05bf51e248452d
+checksum=d6011bd9a94e6c8e96f9b0fbbf7f17d8170be93a24edb1e7b0ff6ac6e28429ff
diff --git a/srcpkgs/plasma-nm/template b/srcpkgs/plasma-nm/template
index 32c717c0b88..6d7222aee84 100644
--- a/srcpkgs/plasma-nm/template
+++ b/srcpkgs/plasma-nm/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-nm'
 pkgname=plasma-nm
-version=5.16.4
+version=5.17.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -15,7 +15,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/plasma/plasma-nm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=2da834873d4fa471ad87ee8ce18a871dfb2acdf0bdc0b764789e8e26ebc2ca09
+checksum=322516acabb5a49c613f951c5049f6a15edf2b54340f08bca3c86a5b1bd6e56b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/plasma-pa/template b/srcpkgs/plasma-pa/template
index 51658bf8538..642fe5b9f40 100644
--- a/srcpkgs/plasma-pa/template
+++ b/srcpkgs/plasma-pa/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-pa'
 pkgname=plasma-pa
-version=5.16.4
+version=5.17.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/plasma/plasma-pa"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=9b166e11f7115576181c17f0ced51b9a7ec689334d4b15ebb55d4e6e7ff6cbd4
+checksum=da660d75ea0a4589ee3730a2697665c791e6525f35813cbf90c48408607b1ee6
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"
diff --git a/srcpkgs/plasma-sdk/template b/srcpkgs/plasma-sdk/template
index 411ec865944..083c6fa9015 100644
--- a/srcpkgs/plasma-sdk/template
+++ b/srcpkgs/plasma-sdk/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-sdk'
 pkgname=plasma-sdk
-version=5.16.4
+version=5.17.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/plasma/plasma-sdk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=ce8152ad6044e2cf430834bf97bb4542e69e168a4b7350e313d148a9bd3b9403
+checksum=a8ff60bf62f0cab10ccc7a04e79a08e2124d78ec3d92a35a0bc78e469d8c199f
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/plasma-thunderbolt/template b/srcpkgs/plasma-thunderbolt/template
new file mode 100644
index 00000000000..58e299f6c08
--- /dev/null
+++ b/srcpkgs/plasma-thunderbolt/template
@@ -0,0 +1,19 @@
+# Template file for 'plasma-thunderbolt'
+pkgname=plasma-thunderbolt
+version=5.17.0
+revision=1
+build_style=cmake
+hostmakedepends="extra-cmake-modules kcoreaddons kcmutils
+ qt5-host-tools qt5-qmake"
+makedepends="kcmutils-devel"
+depends="bolt"
+short_desc="Plasma integration for controlling Thunderbolt devices"
+maintainer="John <johnz@posteo.net>"
+license="GPL-3.0-or-later"
+homepage="https://cgit.kde.org/plasma-thunderbolt.git"
+distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
+checksum=8e244a2f6e872451166deaf454a057110761acec054655986d55576af38a23e1
+
+do_check() {
+	: # Requires running dbus and bolt services
+}
diff --git a/srcpkgs/plasma-vault/template b/srcpkgs/plasma-vault/template
index 8cd4f83f963..af8c12cf4a6 100644
--- a/srcpkgs/plasma-vault/template
+++ b/srcpkgs/plasma-vault/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-vault'
 pkgname=plasma-vault
-version=5.16.4
+version=5.17.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools"
@@ -10,7 +10,7 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/KDE/plasma-vault"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=8d01b80079477fd7ea48a4cc3ff59728ae7dac3a5f6e552092dd5e67d72148f6
+checksum=d63cba4e3a89a10571f120d75405a837964c0176351ce78bed04f58b37f58fd6
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/plasma-workspace-wallpapers/template b/srcpkgs/plasma-workspace-wallpapers/template
index e5a21b8b387..1303e0e3e69 100644
--- a/srcpkgs/plasma-workspace-wallpapers/template
+++ b/srcpkgs/plasma-workspace-wallpapers/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-workspace-wallpapers'
 pkgname=plasma-workspace-wallpapers
-version=5.16.4
+version=5.17.0
 revision=1
 archs=noarch
 build_style=cmake
@@ -11,4 +11,4 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/plasma/plasma-workspace-wallpapers"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=052f6d978b1230706821f67574a7d053fadfb25de65227ffc8389a8570ac6003
+checksum=67d3e69d9ad6292cf6b70ab7f35fe0a88d2a626efd0a1c4fa70b5c0049d1c973
diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template
index bfcff35909a..2ea88567655 100644
--- a/srcpkgs/plasma-workspace/template
+++ b/srcpkgs/plasma-workspace/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-workspace'
 pkgname=plasma-workspace
-version=5.16.4
+version=5.17.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -9,14 +9,15 @@ makedepends="qt5-devel qt5-declarative-devel qt5-script-devel plasma-framework-d
  krunner-devel kjsembed-devel knotifyconfig-devel kdesu-devel knewstuff-devel
  kcmutils-devel kidletime-devel kdelibs4support-devel libksysguard-devel
  baloo5-devel ktexteditor-devel kwin-devel libxcb-devel libXtst-devel
- libqalculate-devel prison-devel kholidays-devel ksolid-devel"
+ libqalculate-devel prison-devel kholidays-devel ksolid-devel kpeople-devel
+ libkscreen-devel kactivities5-stats-devel"
 depends="kactivitymanagerd kwin iso-codes milou plasma-integration libxcb-devel"
 short_desc="KDE Window manager"
 maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later,GFDL-2.1, LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/plasma/plasma-workspace"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=5cd9366ef3d0b68159d9dee2f14886d1f81d1ccf7aedceed1ae5cf8e32d243f1
+checksum=4480ccf0b9168bdd10d4a5fa3ee40e5e77f10c12713f9de55c5d19e23fe993f0
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/plata-theme/INSTALL.msg b/srcpkgs/plata-theme/INSTALL.msg
new file mode 100644
index 00000000000..5bffe2a5766
--- /dev/null
+++ b/srcpkgs/plata-theme/INSTALL.msg
@@ -0,0 +1,3 @@
+Plata-theme upstream recommends the Roboto font.
+You can obtain it by installing fonts-roboto-ttf or 
+google-fonts-ttf.
diff --git a/srcpkgs/plata-theme/template b/srcpkgs/plata-theme/template
index 6a97664d55f..18daea2b078 100644
--- a/srcpkgs/plata-theme/template
+++ b/srcpkgs/plata-theme/template
@@ -1,6 +1,6 @@
 # Template file for 'plata-theme'
 pkgname=plata-theme
-version=0.8.0
+version=0.9.0
 revision=1
 archs=noarch
 build_style=gnu-configure
@@ -8,14 +8,13 @@ configure_args="--enable-parallel --enable-telegram"
 hostmakedepends="automake libtool pkg-config glib-devel libxml2 sassc inkscape
  parallel procps-ng zip"
 makedepends="libglib-devel gdk-pixbuf-devel gtk+-devel gtk+3-devel
- gtk2-engines gtk-engine-murrine"
-depends="fonts-roboto-ttf"
+ gtk2-engines gtk-engine-murrine libmarco-devel"
 short_desc="Gtk theme based on Material Design Refresh"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="mobinmob <mobinmob@disroot.org>"
 license="CC-BY-SA-4.0, GPL-2.0-or-later"
 homepage="https://gitlab.com/tista500/plata-theme"
 distfiles="https://gitlab.com/tista500/plata-theme/-/archive/${version}/plata-theme-${version}.tar.gz"
-checksum=1ee6e49716fdf4ddafae61e5fafb4f9b2c66ee02abab200f9872556c037157f8
+checksum=1e690fc208b71592b969e86d7bbbae78475a35bb8570cde391db44cde0450852
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/pluma/template b/srcpkgs/pluma/template
index e4faa8a8390..f59858cf248 100644
--- a/srcpkgs/pluma/template
+++ b/srcpkgs/pluma/template
@@ -1,6 +1,6 @@
 # Template file for 'pluma'
 pkgname=pluma
-version=1.22.1
+version=1.23.2
 revision=1
 build_style=gnu-configure
 pycompile_dirs="usr/lib/pluma/plugins"
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://mate-desktop.org"
 distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=af8d19927f1571d6b63462b8e51fed9ac851326b6ff800535ea785f15c61a591
+checksum=824bd32ca335d3bb16ad076fffdecd4414add80e445df523ed01b2dfd0c4e009
 nocross="gobject-introspection from libpeas"
 
 pre_configure() {
diff --git a/srcpkgs/pmbootstrap/template b/srcpkgs/pmbootstrap/template
index fef73e1e790..1bfa8183a84 100644
--- a/srcpkgs/pmbootstrap/template
+++ b/srcpkgs/pmbootstrap/template
@@ -1,19 +1,19 @@
 # Template file for 'pmbootstrap'
 pkgname=pmbootstrap
-version=1.7.0
+version=1.9.0
 revision=1
 archs=noarch
 build_style=python3-module
 pycompile_module="pmb"
 hostmakedepends="python3-setuptools"
-depends="python3 coreutils procps-ng libressl"
+depends="python3-setuptools coreutils procps-ng libressl"
 checkdepends="python3-pytest"
 short_desc="PostmarketOS's chroot, build and flash tool"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="bra1nwave <brainwave@openmailbox.org>"
 license="GPL-3.0-or-later"
 homepage="https://postmarketos.org"
 distfiles="https://gitlab.com/postmarketOS/pmbootstrap/-/archive/${version}/pmbootstrap-${version}.tar.gz"
-checksum=8779a3302fb0841977b08557670f079893ad674035177e8da7d7f63a9d8b300a
+checksum=f5b6034e02e6d29b0a8cbcee80fe6beeabd33beaed1a589befcd31892768a3cf
 
 do_check() {
 	python3 -m pytest
diff --git a/srcpkgs/png++/patches/musl-error.patch b/srcpkgs/png++/patches/musl-error.patch
deleted file mode 100644
index f1123d938ee..00000000000
--- a/srcpkgs/png++/patches/musl-error.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- error.hpp	2015-10-25 20:42:45.000000000 +0100
-+++ -	2018-11-07 12:49:36.093450988 +0100
-@@ -100,7 +100,7 @@
-             strerror_s(buf, ERRBUF_SIZE, errnum);
-             return std::string(buf);
- #else
--#if (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !_GNU_SOURCE
-+#if ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !_GNU_SOURCE) || !defined(__GLIBC__)
-             strerror_r(errnum, buf, ERRBUF_SIZE);
-             return std::string(buf);
- #else
diff --git a/srcpkgs/png++/template b/srcpkgs/png++/template
index 99de7397893..b156d606308 100644
--- a/srcpkgs/png++/template
+++ b/srcpkgs/png++/template
@@ -1,6 +1,6 @@
 # Template file for 'png++'
 pkgname=png++
-version=0.2.9
+version=0.2.10
 revision=1
 build_style=gnu-makefile
 make_build_target="docs"
@@ -12,7 +12,7 @@ maintainer="Alex Childs <misuchiru03+void@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.nongnu.org/pngpp"
 distfiles="${NONGNU_SITE}/pngpp/${pkgname}-${version}.tar.gz"
-checksum=abbc6a0565122b6c402d61743451830b4faee6ece454601c5711e1c1b4238791
+checksum=998af216ab16ebb88543fbaa2dbb9175855e944775b66f2996fc945c8444eee1
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/poco/template b/srcpkgs/poco/template
index e902b2a6223..5e9920b2748 100644
--- a/srcpkgs/poco/template
+++ b/srcpkgs/poco/template
@@ -1,7 +1,7 @@
 # Template file for 'poco'
 pkgname=poco
-version=1.9.0
-revision=3
+version=1.9.4
+revision=1
 wrksrc="${pkgname}-${version}-all"
 build_style=cmake
 configure_args="-DPOCO_UNBUNDLED=ON"
@@ -11,7 +11,7 @@ maintainer="Julien Dehos <dehos@univ-littoral.fr>"
 license="BSL-1.0"
 homepage="https://pocoproject.org"
 distfiles="https://pocoproject.org/releases/${pkgname}-${version}/${pkgname}-${version}-all.tar.gz"
-checksum=0387bf0f9d313e2311742e1ad0b64e07f2f3e76039eed20e3b9aa9951b88e187
+checksum=eb34f257b11240a711ee505f1d80c754a80a990aeb48d8d93407884df288fd77
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template
index 99bb01d86a6..8423a153b45 100644
--- a/srcpkgs/podman/template
+++ b/srcpkgs/podman/template
@@ -1,6 +1,6 @@
 # Template file for 'podman'
 pkgname=podman
-version=1.5.0
+version=1.5.1
 revision=1
 wrksrc="libpod-${version}"
 build_style=go
@@ -16,7 +16,7 @@ maintainer="Cameron Nemo <camerontnorman@gmail.com>"
 license="Apache-2.0"
 homepage="https://podman.io/"
 distfiles="https://github.com/containers/libpod/archive/v${version}.tar.gz"
-checksum=12f479044c5bfe23f695914c8f61d6f21247ffb877fc855c3737da289b8ec68b
+checksum=5651102e8d8f15b3dfddc80702dc93149b94de330502d6de6fafa7afddbbf709
 
 if [ "$CROSS_BUILD" ]; then
 	go_build_tags+=" containers_image_openpgp exclude_graphdriver_overlay"
diff --git a/srcpkgs/poedit/patches/LearnMoreLink.patch b/srcpkgs/poedit/patches/LearnMoreLink.patch
deleted file mode 100644
index e558c78ec6e..00000000000
--- a/srcpkgs/poedit/patches/LearnMoreLink.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 3d3d0091f0ab1433f272de9c1aa6b17b745cade7 Mon Sep 17 00:00:00 2001
-From: Thomas Klausner <tk@giga.or.at>
-Date: Tue, 21 May 2019 19:37:43 +0200
-Subject: [PATCH] Add header for LearnMoreLink.
-
----
- src/welcomescreen.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/welcomescreen.cpp b/src/welcomescreen.cpp
-index 65eb7d0d92..a24b4d7d23 100644
---- src/welcomescreen.cpp
-+++ b/src/welcomescreen.cpp
-@@ -26,6 +26,7 @@
- #include "welcomescreen.h"
- 
- #include "colorscheme.h"
-+#include "customcontrols.h"
- #include "crowdin_gui.h"
- #include "edapp.h"
- #include "edframe.h"
diff --git a/srcpkgs/poedit/template b/srcpkgs/poedit/template
index 87beeb9dbb0..c3a83887e89 100644
--- a/srcpkgs/poedit/template
+++ b/srcpkgs/poedit/template
@@ -1,7 +1,7 @@
 # Template file for 'poedit'
 pkgname=poedit
-version=2.2.3
-revision=2
+version=2.2.4
+revision=1
 build_style=gnu-configure
 configure_args="--with-wx-config=wx-config-gtk3"
 hostmakedepends="pkg-config"
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://www.poedit.net/"
 distfiles="https://github.com/vslavik/poedit/releases/download/v${version}-oss/poedit-${version}.tar.gz"
-checksum=47d52895b836a8505742a4f9bf94da5936b244877fac2ff9ab0bb94464548688
+checksum=c18ee55fbc03d0a25d8260298a9cc489774140e79fe33ad80fcbc34a97df744a
 
 CPPFLAGS="-DUCHAR_TYPE=uint16_t"
 
diff --git a/srcpkgs/poezio/template b/srcpkgs/poezio/template
index 0e46c871203..56f8138bb5e 100644
--- a/srcpkgs/poezio/template
+++ b/srcpkgs/poezio/template
@@ -1,7 +1,7 @@
 # Template file for 'poezio'
 pkgname=poezio
-version=0.12
-revision=2
+version=0.12.1
+revision=1
 build_style=python3-module
 pycompile_module="poezio poezio_plugins poezio_themes"
 hostmakedepends="python3-setuptools pkg-config"
@@ -12,7 +12,7 @@ maintainer="Franklin Delehelle <franklin.delehelle@odena.eu>"
 license="Zlib"
 homepage="https://poez.io/"
 distfiles="${PYPI_SITE}/p/poezio/poezio-${version}.tar.gz"
-checksum=4d4aacfda98454719e017e56e7012d283de12b8f7400b51c1fe0d1dc841f231e
+checksum=d59dedf80d074074dd4f6798559a257853fa6ab064d992d7a203f11c8b2a9bd7
 
 pre_configure() {
 	sed -i "s|os.environ.get('CC', 'cc')|'${CC}'|" setup.py
diff --git a/srcpkgs/poezio/update b/srcpkgs/poezio/update
new file mode 100644
index 00000000000..b53afef2735
--- /dev/null
+++ b/srcpkgs/poezio/update
@@ -0,0 +1 @@
+pattern='poezio-\K[\d.]+(?=\.tar)'
diff --git a/srcpkgs/polkit-kde-agent/template b/srcpkgs/polkit-kde-agent/template
index e10715cd5af..cb759f6b550 100644
--- a/srcpkgs/polkit-kde-agent/template
+++ b/srcpkgs/polkit-kde-agent/template
@@ -1,6 +1,6 @@
 # Template file for 'polkit-kde-agent'
 pkgname=polkit-kde-agent
-version=5.16.4
+version=5.17.0
 revision=1
 wrksrc="${pkgname}-1-${version}"
 build_style=cmake
@@ -13,4 +13,4 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/plasma/polkit-kde-agent"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-1-${version}.tar.xz"
-checksum=917b31f194fcf5d56d465bd4a3a1cc8d0a30e302be63b9048b1b85b6746b46a0
+checksum=9bbe7faa06a25768ba5dcdb3a084afeb8d9d3e284388d0c6138bd4cd51a418f0
diff --git a/srcpkgs/polygen/template b/srcpkgs/polygen/template
index 7c5df93839c..0781c4b78ec 100644
--- a/srcpkgs/polygen/template
+++ b/srcpkgs/polygen/template
@@ -1,7 +1,7 @@
 # Template file for 'polygen'
 pkgname=polygen
 version=1.0.6.ds2
-revision=4
+revision=5
 build_style=gnu-makefile
 build_wrksrc="src"
 hostmakedepends="ocaml unzip"
diff --git a/srcpkgs/ponyc/template b/srcpkgs/ponyc/template
index 734e131b4bf..c2bdcf8864b 100644
--- a/srcpkgs/ponyc/template
+++ b/srcpkgs/ponyc/template
@@ -1,6 +1,6 @@
 # Template file for 'ponyc'
 pkgname=ponyc
-version=0.29.0
+version=0.32.0
 revision=1
 archs="x86_64"
 build_style=gnu-makefile
@@ -12,7 +12,7 @@ maintainer="Brian Mitchell <brian@strmpnk.co>"
 license="BSD-2-Clause"
 homepage="https://ponylang.org/"
 distfiles="https://github.com/ponylang/ponyc/archive/${version}.tar.gz"
-checksum=9e20afeaf46343633fc93f995a15a62acd01b42943050c7c282381e4a0144241
+checksum=e8e070164ca0e4e41e606bde617ccab9cc64aa3dca8c79293635a6fdbcabf454
 
 do_build() {
 	vsed -e 's/-Werror //' -i Makefile
diff --git a/srcpkgs/poppler-qt5/template b/srcpkgs/poppler-qt5/template
index b16294fed2e..40bf9240e0a 100644
--- a/srcpkgs/poppler-qt5/template
+++ b/srcpkgs/poppler-qt5/template
@@ -4,7 +4,7 @@
 # A CYCLIC DEPENDENCY: qt5 -> cups -> poppler -> qt5.
 #
 pkgname=poppler-qt5
-version=0.79.0
+version=0.80.0
 revision=1
 wrksrc="poppler-${version}"
 build_style=cmake
@@ -18,7 +18,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
 homepage="http://poppler.freedesktop.org"
 distfiles="${homepage}/poppler-${version}.tar.xz"
-checksum=f985a4608fe592d2546d9d37d4182e502ff6b4c42f8db4be0a021a1c369528c8
+checksum=4d3ca6b79bc13b8e24092e34f83ef5f387f3bb0bbd7359a6c078e09c696d104f
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DTHREADS_PTHREAD_ARG=2"
diff --git a/srcpkgs/poppler/template b/srcpkgs/poppler/template
index a2efd828c21..3670cc19bc9 100644
--- a/srcpkgs/poppler/template
+++ b/srcpkgs/poppler/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/poppler-qt5".
 #
 pkgname=poppler
-version=0.79.0
+version=0.80.0
 revision=1
 build_style=cmake
 build_helper="gir"
@@ -18,7 +18,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
 homepage="http://poppler.freedesktop.org"
 distfiles="${homepage}/${pkgname}-${version}.tar.xz"
-checksum=f985a4608fe592d2546d9d37d4182e502ff6b4c42f8db4be0a021a1c369528c8
+checksum=4d3ca6b79bc13b8e24092e34f83ef5f387f3bb0bbd7359a6c078e09c696d104f
 
 # Package build options
 build_options="gir"
diff --git a/srcpkgs/portage/template b/srcpkgs/portage/template
index 4891e9ffbf2..b0f34731035 100644
--- a/srcpkgs/portage/template
+++ b/srcpkgs/portage/template
@@ -1,6 +1,6 @@
 # Template file for 'portage'
 pkgname=portage
-version=2.3.71
+version=2.3.77
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-only"
 homepage="https://wiki.gentoo.org/wiki/Portage"
 distfiles="https://github.com/gentoo/${pkgname}/archive/${pkgname}-${version}.tar.gz"
-checksum=9378503cd087ff37aca4add4771f42d5b0e6506438613b42530a4abf27ceb439
+checksum=03a8f595bbca31497678810934286bb5a3a71378c124fc935444ca0165f3a6fc
 
 conf_files="
 	/etc/dispatch-conf.conf
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 4a6e8011120..11052cfa141 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,16 +1,16 @@
 # Template file for 'postfix'
 pkgname=postfix
-version=3.4.6
+version=3.4.7
 revision=1
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmysqlclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"
 short_desc="High-performance mail transport agent"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="IPL-1.0, EPL-2.0"
 homepage="http://www.postfix.org/"
 distfiles="ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${version}.tar.gz"
-checksum=d674a9b40602ee30420ee7ff93c3600e8913eeb2ea9bfb0ac1d140dac5dbe326
+checksum=fe3253121d3ba8836a23774225518560b35e40497951ad5bec154afa8205f967
 
 system_accounts="postfix"
 postfix_homedir="/var/spool/postfix"
diff --git a/srcpkgs/postgis/patches/postgis-2.5.3-PROTOCC_VERSION.patch b/srcpkgs/postgis/patches/postgis-2.5.3-PROTOCC_VERSION.patch
new file mode 100644
index 00000000000..b1105fe58e2
--- /dev/null
+++ b/srcpkgs/postgis/patches/postgis-2.5.3-PROTOCC_VERSION.patch
@@ -0,0 +1,13 @@
+PROTOCC_VERSION is not defined as variable in this Makefile
+
+--- postgis/Makefile.in.ORIG	2019-08-11 07:59:31.000000000 +0200
++++ postgis/Makefile.in	2019-09-03 06:11:57.430733390 +0200
+@@ -206,7 +206,7 @@
+ ifeq (@HAVE_PROTOBUF@,yes)
+ lwgeom_out_mvt.o: vector_tile.pb-c.h
+ mvt.o: vector_tile.pb-c.h
+-ifeq ($(shell expr $(PROTOCC_VERSION) ">=" 10100),1)
++ifeq ($(shell expr @PROTOCC_VERSION@ ">=" 10100),1)
+ lwgeom_out_geobuf.o: geobuf.pb-c.h
+ geobuf.o: geobuf.pb-c.h
+ endif
diff --git a/srcpkgs/postgis/template b/srcpkgs/postgis/template
index 2dd7858ffc7..741f34323c8 100644
--- a/srcpkgs/postgis/template
+++ b/srcpkgs/postgis/template
@@ -1,7 +1,7 @@
 # Template file for 'postgis'
 pkgname=postgis
-version=2.5.2
-revision=3
+version=2.5.3
+revision=1
 build_style=gnu-configure
 configure_args="--with-projdir=${XBPS_CROSS_BASE}/usr
  --with-projdir=${XBPS_CROSS_BASE}/usr
@@ -16,7 +16,7 @@ license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=b6cb286c5016029d984f8c440947bf9178da72e1f6f840ed639270e1c451db5e
+checksum=72e8269d40f981e22fb2b78d3ff292338e69a4f5166e481a77b015e1d34e559a
 nocross="FIXME: Cannot run test program to determine PROJ version"
 
 pre_configure() {
diff --git a/srcpkgs/postgis/update b/srcpkgs/postgis/update
new file mode 100644
index 00000000000..70f8b7290d7
--- /dev/null
+++ b/srcpkgs/postgis/update
@@ -0,0 +1 @@
+ignore="*alpha*"
diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index f1890649320..fabcf3826a3 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql'
 pkgname=postgresql
 version=9.6.15
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target=world
 configure_args="--with-openssl --with-python
diff --git a/srcpkgs/potrace/template b/srcpkgs/potrace/template
index d1dd4cfc7cb..1f7f8268622 100644
--- a/srcpkgs/potrace/template
+++ b/srcpkgs/potrace/template
@@ -1,6 +1,6 @@
 # Template file for 'potrace'
 pkgname=potrace
-version=1.15
+version=1.16
 revision=1
 build_style=gnu-configure
 makedepends="zlib-devel"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2"
 homepage="http://potrace.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
-checksum=a9b33904ace328340c850a01458199e0064e03ccaaa731bc869a842b1b8d529d
+checksum=be8248a17dedd6ccbaab2fcc45835bb0502d062e40fbded3bc56028ce5eb7acc
 
 libpotrace_package() {
 	short_desc+=" - runtime library"
diff --git a/srcpkgs/powerdevil/template b/srcpkgs/powerdevil/template
index 881508d479c..531d96cd74e 100644
--- a/srcpkgs/powerdevil/template
+++ b/srcpkgs/powerdevil/template
@@ -1,6 +1,6 @@
 # Template file for 'powerdevil'
 pkgname=powerdevil
-version=5.16.4
+version=5.17.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/plasma/powerdevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=40885869890366f7ea92946ed0f8d251546fb14228eddd2ad128e3be8f88d2ed
+checksum=ea0ebd64c9f315f890421ae2ff0d7d756b61071331868ff9a63e47a9cba59fe5
diff --git a/srcpkgs/powertop/template b/srcpkgs/powertop/template
index a4628a5d1f4..83ebe8ecf21 100644
--- a/srcpkgs/powertop/template
+++ b/srcpkgs/powertop/template
@@ -1,14 +1,15 @@
 # Template file for 'powertop'
 pkgname=powertop
-version=2.10
+version=2.11
 revision=1
-wrksrc="$pkgname-v${version}"
+_githash=g7ef7f79
+wrksrc="${pkgname}-v${version}-1-${_githash}"
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="ncurses-devel pciutils-devel libnl3-devel"
-short_desc="Linux tool to find out what is using power on computer"
+short_desc="Tool to diagnose issues with power consumption and power management"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="GPL-2.0-only"
 homepage="https://01.org/powertop/"
-distfiles="https://01.org/sites/default/files/downloads/powertop-v${version}.tar.gz"
-checksum=d3b7459eaba7d01c8841dd33a3b4d369416c01e9bd8951b0d88234cf18fe4a75
+distfiles="https://01.org/sites/default/files/downloads/powertop-v${version}-1-${_githash}.tar.gz"
+checksum=ae68c913784f78b497076e0b1d588f59854a66c074690d545dae7956e4f5d64f
diff --git a/srcpkgs/ppsspp/template b/srcpkgs/ppsspp/template
index 17081ce1583..b9b6fbfdffd 100644
--- a/srcpkgs/ppsspp/template
+++ b/srcpkgs/ppsspp/template
@@ -1,13 +1,13 @@
 # Template file for 'ppsspp'
 pkgname=ppsspp
-version=1.8.0
+version=1.9.3
 revision=1
 create_wrksrc=yes
 build_wrksrc="ppsspp-${version}"
 build_style=cmake
 configure_args="-DHEADLESS=1 -DUSE_SYSTEM_FFMPEG=1 -DUNITTEST=ON
  -DUSING_QT_UI=$(vopt_if qt ON OFF)"
-hostmakedepends="pkg-config $(vopt_if qt qt5-host-tools)"
+hostmakedepends="pkg-config python3 $(vopt_if qt qt5-host-tools)"
 makedepends="zlib-devel glew-devel ffmpeg-devel libzip-devel
  snappy-devel rapidjson
  $(vopt_if sdl2 SDL2-devel) $(vopt_if wayland wayland-devel)
@@ -19,15 +19,15 @@ license="GPL-2.0-or-later"
 homepage="https://www.ppsspp.org/"
 distfiles="
  https://github.com/hrydgard/ppsspp/archive/v${version}.tar.gz
- https://github.com/hrydgard/ppsspp-lang/archive/18e0d46.tar.gz
- https://github.com/hrydgard/glslang/archive/9983f99.tar.gz
- https://github.com/KhronosGroup/SPIRV-Cross/archive/be7425e.tar.gz
+ https://github.com/hrydgard/ppsspp-lang/archive/bfc3a51.tar.gz
+ https://github.com/hrydgard/glslang/archive/f9d08a2.tar.gz
+ https://github.com/KhronosGroup/SPIRV-Cross/archive/a1f7c8d.tar.gz
  https://github.com/Kingcom/armips/archive/7885552.tar.gz
  https://github.com/discordapp/discord-rpc/archive/3d3ae7129d17643bc706da0a2eea85aafd10ab3a.tar.gz"
-checksum="a7011feb0480a352d60e6a3c939d88d4d2e3a2e76620886b183aa2cb36f910de
- 3d313170bb387d466e2bf267b23dd5689174355537f728b42a99f9ea77af0d37
- ea5c3ca101b9635508052e0f52966303e8fc94edf564ecfd0fda147b74625c9a
- 21afa0e32dd2d75ee51c4f5c0d16330a9d80d435d6ac9900d0c13bffdfd7b682
+checksum="f38e6a17977da1da2f55041fe33e8b216f6f3beb19bfe95d05d3915e174f5d26
+ c0cc57b54aa376a9dca6de9c6b162a613d54111f7a8587fcfc243e836568ac0c
+ 1e4284387cc586acb7ce0eefba712fe15e11a87c45c102063c11d0fa60f66dce
+ 456b1e2a75a8e82985ce22f4707570c7aa1fc50d4119cba1a641e8b233ecde26
  f8a03906135fb6f2932b80b7ef5991f39ccac46b36ec3690776fb38c69775c3d
  20fe5dbd7a64f7a8fdbaeb81f8dd485df61121c5054e0f7f917c6193f209ff2e"
 
diff --git a/srcpkgs/praat/template b/srcpkgs/praat/template
index 9a3fc7cdb1f..ab144b74e8a 100644
--- a/srcpkgs/praat/template
+++ b/srcpkgs/praat/template
@@ -1,6 +1,6 @@
 # Template file for 'praat'
 pkgname=praat
-version=6.1.01
+version=6.1.04
 revision=1
 create_wrksrc=yes
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.praat.org/"
 changelog="http://www.fon.hum.uva.nl/praat/manual/What_s_new_.html"
 distfiles="https://github.com/praat/praat/archive/v${version}.tar.gz"
-checksum=555c76773bb0a43b4eb25a99fca65db9e195342cafe58ada03dc7cdc53352877
+checksum=616e70e2265d8cab9fe45526dab1d665e5079bf4ea7e8ed9b6c06fe2d4c46bce
 
 build_options="pulseaudio"
 build_options_default="pulseaudio"
diff --git a/srcpkgs/prelink-cross/template b/srcpkgs/prelink-cross/template
index d6afca4c8fe..163666e8006 100644
--- a/srcpkgs/prelink-cross/template
+++ b/srcpkgs/prelink-cross/template
@@ -11,7 +11,7 @@ case $XBPS_TARGET_MACHINE in
 	*-musl) makedepends+=" argp-standalone"; LDFLAGS+=" -largp" ;;
 esac
 short_desc="Prelink from the yocto project"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://git.yoctoproject.org/cgit.cgi/prelink-cross"
 distfiles="https://github.com/Gottox/prelink-cross/archive/$_githash.tar.gz"
diff --git a/srcpkgs/print-manager/template b/srcpkgs/print-manager/template
index 867fb932e4f..7a11a70ef80 100644
--- a/srcpkgs/print-manager/template
+++ b/srcpkgs/print-manager/template
@@ -1,6 +1,6 @@
 # Template file for 'print-manager'
 pkgname=print-manager
-version=19.04.3
+version=19.08.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/KDE/print-manager"
 distfiles="${KDE_SITE}/applications/${version}/src/print-manager-${version}.tar.xz"
-checksum=5ab32527d6916c1063bf175a1515a0cebb0dfb93844881c4339b2ee690697907
+checksum=c0702208b6f485e2e44337aaf203b9e391adda22d6526bf0dd34b31230e0fb05
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DKF5_HOST_TOOLING=/usr/lib/cmake"
diff --git a/srcpkgs/prison/template b/srcpkgs/prison/template
index b10fd7763c4..1129087f5f9 100644
--- a/srcpkgs/prison/template
+++ b/srcpkgs/prison/template
@@ -1,6 +1,6 @@
 # Template file for 'prison'
 pkgname=prison
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-tools"
@@ -10,16 +10,12 @@ maintainer="John <johnz@posteo.net>"
 license="MIT"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/prison-${version}.tar.xz"
-checksum=9ebab1755e9d7cb01b2aa6e8b63640eb112d8557073423abdb94faecb42d87ab
+checksum=85ffbf88aa02bbecadd88572f035c72c932d3329a0aedcc91994572c64a9f36a
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"
 fi
 
-case "$XBPS_TARGET_MACHINE" in
-	armv6l-musl) broken="https://build.voidlinux.org/builders/armv6l-musl_builder/builds/20920/steps/shell_3/logs/stdio";;
-esac
-
 post_install() {
 	vlicense LICENSE
 }
diff --git a/srcpkgs/profanity/template b/srcpkgs/profanity/template
index 4cd3406322d..8522560242f 100644
--- a/srcpkgs/profanity/template
+++ b/srcpkgs/profanity/template
@@ -1,6 +1,6 @@
 # Template file for 'profanity'
 pkgname=profanity
-version=0.7.0
+version=0.7.1
 revision=1
 build_style=gnu-configure
 configure_args="$(vopt_enable notify notifications) $(vopt_enable otr)
@@ -13,11 +13,11 @@ makedepends="libcurl-devel libglib-devel libstrophe-devel readline-devel
  $(vopt_if xscreensaver libXScrnSaver-devel) $(vopt_if omemo 'libsignal-protocol-c libgcrypt-devel')"
 checkdepends="cmocka-devel"
 short_desc="Console based XMPP client"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="GPL-3.0-or-later"
 homepage="http://www.profanity.im/"
 distfiles="https://github.com/boothj5/profanity/releases/download/${version}/profanity-${version}.tar.gz"
-checksum=f1eb99be01683d41b891b0f997f4c873c9bb87b0b6b8400b7fccb8e553d514bb
+checksum=3fe442948ff2ee258681c3812e878d39179dcf92e1c67bc8fe0ef8896440b05b
 
 export LIBS="-lm"
 
diff --git a/srcpkgs/prometheus/template b/srcpkgs/prometheus/template
index 9c9fddae118..f2ed81efe2d 100644
--- a/srcpkgs/prometheus/template
+++ b/srcpkgs/prometheus/template
@@ -1,6 +1,6 @@
 # Template file for 'prometheus'
 pkgname=prometheus
-version=2.10.0
+version=2.12.0
 revision=1
 build_style=go
 go_import_path="github.com/prometheus/prometheus"
@@ -15,7 +15,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://prometheus.io/"
 distfiles="https://github.com/prometheus/prometheus/archive/v${version}.tar.gz"
-checksum=0362f4aa2fb44cc2c572df140da742bdf99fe9f338157a83f6634694fd693000
+checksum=9bd9ae6df02777a9ba3f6f544338865861decabd02054aa64975449bd6009e5a
 
 system_accounts="_prometheus"
 
diff --git a/srcpkgs/proot/patches/disable-seccomp-based-tracing.patch b/srcpkgs/proot/patches/disable-seccomp-based-tracing.patch
new file mode 100644
index 00000000000..1f178a86f79
--- /dev/null
+++ b/srcpkgs/proot/patches/disable-seccomp-based-tracing.patch
@@ -0,0 +1,28 @@
+# reason: https://github.com/proot-me/proot/issues/106
+# src: Debian10
+
+From: Simon McVittie <smcv@debian.org>
+Date: Sat, 14 Jan 2017 15:52:13 +0000
+X-Dgit-Generated: 5.1.0-1.2 dcc5f0999759be03aed5b62a8683e0b965d0219d
+Subject: Disable seccomp-based tracing performance improvement
+
+It is faster (according to upstream documentation), but on current
+(4.8.4+) kernels it just segfaults. Software that works slowly seems
+better than software that doesn't work at all.
+
+Bug: https://github.com/proot-me/PRoot/issues/106
+
+---
+
+--- src/GNUmakefile
++++ src/GNUmakefile
+@@ -105,7 +105,7 @@ CHECK_VERSION = VERSION=$$($(GIT) descri
+ 		then /bin/echo -e "\#undef VERSION\n\#define VERSION \"$${VERSION}\""; \
+ 		fi;
+ 
+-CHECK_FEATURES = process_vm seccomp_filter
++CHECK_FEATURES = process_vm
+ CHECK_PROGRAMS = $(foreach feature,$(CHECK_FEATURES),.check_$(feature))
+ CHECK_OBJECTS  = $(foreach feature,$(CHECK_FEATURES),.check_$(feature).o)
+ CHECK_RESULTS  = $(foreach feature,$(CHECK_FEATURES),.check_$(feature).res)
+
diff --git a/srcpkgs/proot/patches/makefile-fix-vars.patch b/srcpkgs/proot/patches/makefile-fix-vars.patch
new file mode 100644
index 00000000000..d866121719d
--- /dev/null
+++ b/srcpkgs/proot/patches/makefile-fix-vars.patch
@@ -0,0 +1,35 @@
+--- src/GNUmakefile
++++ src/GNUmakefile
+@@ -10,9 +10,9 @@
+ INSTALL  = install
+ CC       = $(CROSS_COMPILE)gcc
+ LD       = $(CC)
+-STRIP    = $(CROSS_COMPILE)strip
+-OBJCOPY  = $(CROSS_COMPILE)objcopy
+-OBJDUMP  = $(CROSS_COMPILE)objdump
++STRIP    = :
++OBJCOPY  ?= $(CROSS_COMPILE)objcopy
++OBJDUMP  ?= $(CROSS_COMPILE)objdump
+ 
+ CPPFLAGS += -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -I. -I$(VPATH)
+ CFLAGS   += -Wall -Wextra -O2
+@@ -86,7 +86,7 @@
+ quiet_LD  = @echo "  LD	$@"; $(LD)
+ quiet_INSTALL = @echo "  INSTALL	$?"; $(INSTALL)
+ 
+-V = 0
++V = 1
+ ifeq ($(V), 0)
+     quiet = quiet_
+     Q     = @
+@@ -140,8 +140,8 @@
+ 
+ OBJIFY = $($(quiet)GEN)									\
+ 	$(OBJCOPY)									\
+-		--input binary								\
+-		--output `env LANG=C $(OBJDUMP) -f cli/cli.o |				\
++		--input-target binary \
++		--output-target `env LANG=C $(OBJDUMP) -f cli/cli.o | \
+ 			grep 'file format' | awk '{print $$4}'`				\
+ 		--binary-architecture `env LANG=C $(OBJDUMP) -f cli/cli.o |		\
+ 				grep architecture | cut -f 1 -d , | awk '{print $$2}'`	\
diff --git a/srcpkgs/proot/template b/srcpkgs/proot/template
index c73a76b242b..5ee9809c01e 100644
--- a/srcpkgs/proot/template
+++ b/srcpkgs/proot/template
@@ -1,30 +1,24 @@
 # Template file for 'proot'
 pkgname=proot
 version=5.1.0
-revision=5
-wrksrc="PRoot-${version}"
+revision=6
+build_wrksrc=src
+build_style=gnu-makefile
+make_use_env=yes
 makedepends="libarchive-devel talloc-devel"
 short_desc="User-space implementation of chroot, mount --bind, and binfmt_misc"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+maintainer="Piraty <piraty1@inbox.ru>"
+license="GPL-2.0-or-later"
 homepage="https://proot-me.github.io"
 distfiles="https://github.com/proot-me/PRoot/archive/v${version}.tar.gz"
-checksum=50fcb882662b2de3e64e603b68d1af75e920d480191a49e11c0cb63d50040386
+checksum=ce0a3baca8312613bd10f65bb436a3aaa28e1034f498a22c35ad0693600e01dd
 
 pre_build() {
-	sed -i "s,strip,:,g" src/GNUmakefile
-	sed -i "s,objcopy,${OBJCOPY},g" src/GNUmakefile
-	sed -i "s,objdump,${OBJDUMP},g" src/GNUmakefile
-	sed -i "s,--input ,--input-target ,g" src/GNUmakefile
-	sed -i "s,--output ,--output-target ,g" src/GNUmakefile
 	# Fix glibc ptrace.h specific constants for musl libc
-	cp ${FILESDIR}/ptrace_compat.h ${wrksrc}/src
-}
-do_build() {
-	cd src
-	make CC=$CC CFLAGS="$CFLAGS" ${makejobs}
+	cp ${FILESDIR}/ptrace_compat.h .
 }
+
 do_install() {
-	vbin src/proot
-	vman doc/proot/man.1 proot.1
+	vbin proot
+	vman ../doc/proot/man.1 proot.1
 }
diff --git a/srcpkgs/protontricks/template b/srcpkgs/protontricks/template
new file mode 100644
index 00000000000..a32f51c4845
--- /dev/null
+++ b/srcpkgs/protontricks/template
@@ -0,0 +1,14 @@
+# Template file for 'protontricks'
+pkgname=protontricks
+version=1.2.5
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-setuptools"
+depends="python3-vdf winetricks"
+short_desc="Simple wrapper that does winetricks things for Proton enabled games"
+maintainer="Caleb JA <skywise@tutanota.de>"
+license="GPL-3.0-only"
+homepage="https://github.com/Matoking/protontricks"
+distfiles="${homepage}/archive/${version}.tar.gz"
+checksum=a37c8f6b57c6cad6daf726fbf6e90d8b110d0924ef948e1885aed73a2732f8fb
diff --git a/srcpkgs/pscircle/template b/srcpkgs/pscircle/template
index 5b3ef5e5d29..432609725e8 100644
--- a/srcpkgs/pscircle/template
+++ b/srcpkgs/pscircle/template
@@ -1,6 +1,6 @@
 # Template file for 'pscircle'
 pkgname=pscircle
-version=1.3.0
+version=1.3.1
 revision=1
 wrksrc="pscircle-v${version}"
 build_style=meson
@@ -10,5 +10,5 @@ short_desc="Radial tree process visualisation"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://gitlab.com/mildlyparallel/pscircle"
-distfiles="${homepage}/-/archive/v${version}/pscircle-v${version}.tar.gz"
-checksum=960e85219f42b633a4e663d3910082a8a2c27e80e02c7a525665910b6b210a81
+distfiles="https://gitlab.com/mildlyparallel/pscircle/-/archive/v${version}/pscircle-v${version}.tar.gz"
+checksum=29e278e34816be06b3355394b15a8db6b5818ddb305181be7dd408f4cdc43f43
diff --git a/srcpkgs/pulseaudio-module-sndio/template b/srcpkgs/pulseaudio-module-sndio/template
index dabc88743d8..c10553df930 100644
--- a/srcpkgs/pulseaudio-module-sndio/template
+++ b/srcpkgs/pulseaudio-module-sndio/template
@@ -1,18 +1,18 @@
 # Template file for 'pulseaudio-module-sndio'
 pkgname=pulseaudio-module-sndio
 version=12.0
-revision=4
+revision=5
 build_style=gnu-makefile
 make_use_env=yes
 hostmakedepends="pulseaudio pkg-config"
 makedepends="sndio-devel pulseaudio-devel libltdl-devel libpulseaudio"
-nocross="Can't link -lpulseco{re,mmon}-12.0."
 short_desc="Module for PulseAudio to support playing to sndio servers"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="LGPL-2.1-or-later, ISC"
 homepage="https://github.com/t6/pulseaudio-module-sndio"
 distfiles="https://github.com/t6/pulseaudio-module-sndio/releases/download/${version}/${pkgname}-${version}.tar.gz"
 checksum=785baffed274241eb8e1642d0d6e66a411f7f6bf0d0257f46dcd51a809feb835
+nocross="Can't link -lpulseco{re,mmon}-13.0."
 
 post_install() {
 	[ -f LICENSE ] && exit 1
diff --git a/srcpkgs/pulseaudio/patches/fix-alsa-module.patch b/srcpkgs/pulseaudio/patches/fix-alsa-module.patch
deleted file mode 100644
index ddc4236ee8f..00000000000
--- a/srcpkgs/pulseaudio/patches/fix-alsa-module.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From b89d33bb182c42db5ad3987b0e91b7bf62f421e8 Mon Sep 17 00:00:00 2001
-From: Takashi Iwai <tiwai@suse.de>
-Date: Sun, 21 Apr 2019 11:59:30 +0200
-Subject: [PATCH] alsa: Fix inclusion of use-case.h
-
-The recent change in ALSA upstream stripped -I$include/alsa path from
-pkgconfig.  We already fixed for this change in some places but still
-the code for UCM was overlooked, and this resulted in the unresolved
-symbols in alsa card module. Fix them as well.
-
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
----
- configure.ac                | 2 +-
- src/modules/alsa/alsa-ucm.h | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index c004bd70d..b44ed1595 100644
---- configure.ac
-+++ configure.ac
-@@ -826,7 +826,7 @@ AS_IF([test "x$enable_alsa" = "xyes" && test "x$HAVE_ALSA" = "x0"],
- AS_IF([test "x$HAVE_ALSA" = "x1"],
-     [
-         save_CPPFLAGS="$CPPFLAGS"; CPPFLAGS="$CPPFLAGS $ASOUNDLIB_CFLAGS"
--        AC_CHECK_HEADERS([use-case.h], HAVE_ALSA_UCM=1, HAVE_ALSA_UCM=0)
-+        AC_CHECK_HEADERS([alsa/use-case.h], HAVE_ALSA_UCM=1, HAVE_ALSA_UCM=0)
-         CPPFLAGS="$save_CPPFLAGS"
-     ],
-     HAVE_ALSA_UCM=0)
-diff --git a/src/modules/alsa/alsa-ucm.h b/src/modules/alsa/alsa-ucm.h
-index 53abf3f90..c926f3cc3 100644
---- src/modules/alsa/alsa-ucm.h
-+++ src/modules/alsa/alsa-ucm.h
-@@ -23,7 +23,7 @@
- ***/
- 
- #ifdef HAVE_ALSA_UCM
--#include <use-case.h>
-+#include <alsa/use-case.h>
- #else
- typedef void snd_use_case_mgr_t;
- #endif
diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template
index 208c5317e9a..6dbebc9694f 100644
--- a/srcpkgs/pulseaudio/template
+++ b/srcpkgs/pulseaudio/template
@@ -1,22 +1,21 @@
 # Template file for 'pulseaudio'
 pkgname=pulseaudio
-version=12.2
-revision=6
+version=13.0
+revision=1
 build_style=gnu-configure
 configure_args="--disable-oss-output --disable-oss-wrapper --disable-tcpwrap
  --enable-jack --disable-lirc --disable-hal-compat --disable-gconf --enable-orc
- --with-database=tdb --with-udev-rules-dir=/usr/lib/udev/rules.d --disable-bluez4
- --disable-esound --disable-gtk3 --enable-bluez5 --disable-bluez5-ofono-headset
- --disable-systemd-login --disable-systemd-daemon --disable-systemd-journal
- --enable-webrtc-aec --with-bash-completion-dir=/usr/share/bash-completion/completions
+ --with-database=tdb --with-udev-rules-dir=/usr/lib/udev/rules.d --disable-esound
+ --disable-gtk3 --enable-bluez5 --disable-bluez5-ofono-headset --disable-systemd-login
+ --disable-systemd-daemon --disable-systemd-journal --enable-webrtc-aec
+ --with-bash-completion-dir=/usr/share/bash-completion/completions
  --enable-bluez5-native-headset"
-hostmakedepends="automake autoconf gettext-devel glib-devel intltool libtool
- orc-devel pkg-config"
+hostmakedepends="automake gettext-devel libtool orc-devel perl-XML-Parser pkg-config"
 makedepends="avahi-libs-devel eudev-libudev-devel fftw-devel jack-devel
  libSM-devel libXtst-devel libasyncns-devel libbluetooth-devel
  libcap-devel libcap-progs libglib-devel libltdl-devel libressl-devel
  libsndfile-devel libsoxr-devel orc-devel sbc-devel speex-devel tdb-devel
-webrtc-audio-processing-devel xcb-util-devel"
+ webrtc-audio-processing-devel xcb-util-devel"
 depends="rtkit"
 conf_files="/etc/pulse/*"
 short_desc="Featureful, general-purpose sound server"
@@ -24,7 +23,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.freedesktop.org/wiki/Software/PulseAudio"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/releases/${pkgname}-${version}.tar.xz"
-checksum=809668ffc296043779c984f53461c2b3987a45b7a25eb2f0a1d11d9f23ba4055
+checksum=961b23ca1acfd28f2bc87414c27bb40e12436efcf2158d29721b1e89f3f28057
 system_groups="pulse-access"
 system_accounts="pulse"
 pulse_groups="audio"
@@ -39,10 +38,6 @@ case "$XBPS_TARGET_MACHINE" in
 	arm*) configure_args+=" --disable-neon-opt" ;;
 esac
 
-pre_configure() {
-	NOCONFIGURE=1 ./bootstrap.sh
-}
-
 post_install() {
 	rm -f ${DESTDIR}/etc/dbus-1/system.d/pulseaudio-system.conf
 	vsv pulseaudio
diff --git a/srcpkgs/puppet/template b/srcpkgs/puppet/template
index 6aa0656ea60..201cfc5dd45 100644
--- a/srcpkgs/puppet/template
+++ b/srcpkgs/puppet/template
@@ -1,6 +1,6 @@
 # Template file for 'puppet'
 pkgname=puppet
-version=6.2.0
+version=6.9.0
 revision=1
 archs=noarch
 build_style=ruby-module
@@ -12,8 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://puppetlabs.com/facter"
 distfiles="https://downloads.puppetlabs.com/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=d891970ecd4c47b93d952b02463107c09cc44094ffc58e5c81b6f4a9e8c8798b
-
+checksum=c6d359bb842857aa6a77f07150163c9f811139434c965e5fddf2342cb19b07d0
 system_accounts="puppet"
 puppet_homedir="/var/lib/puppet"
 conf_files="
@@ -22,7 +21,6 @@ conf_files="
 make_dirs="/var/lib/puppet 0755 puppet puppet"
 
 post_install() {
-	vlicense LICENSE
 	vsv puppet
 	vsv puppetmaster
 }
diff --git a/srcpkgs/purpose/template b/srcpkgs/purpose/template
index 50648c3503e..a98e8bf56ba 100644
--- a/srcpkgs/purpose/template
+++ b/srcpkgs/purpose/template
@@ -1,6 +1,6 @@
 # Template file for 'purpose'
 pkgname=purpose
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules python"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/frameworks/purpose"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=810a660d0a4d6de41e1b4d00fcb039d3b099ceae65ec96261ca8dd1fba458d08
+checksum=0e59f96272a81340914345599f231af839a23d311f770a2536aaa51f46f885d5
 
 purpose-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/putty/template b/srcpkgs/putty/template
index 2b974f88a82..97bd2a446c1 100644
--- a/srcpkgs/putty/template
+++ b/srcpkgs/putty/template
@@ -1,6 +1,6 @@
 # Template file for 'putty'
 pkgname=putty
-version=0.72
+version=0.73
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://www.chiark.greenend.org.uk/~sgtatham/putty/"
 distfiles="http://the.earth.li/~sgtatham/putty/latest/putty-${version}.tar.gz"
-checksum=f236b5a26b0905809b3cd190158e8b95d81f86ad34fdd97a4312c1877f2cec5f
+checksum=3db0b5403fb41aecd3aa506611366650d927650b6eb3d839ad4dcc782519df1c
 
 CFLAGS="-Wno-error"
 
diff --git a/srcpkgs/py3status/template b/srcpkgs/py3status/template
index 6f8fe639f30..b7a263270e4 100644
--- a/srcpkgs/py3status/template
+++ b/srcpkgs/py3status/template
@@ -1,6 +1,6 @@
 # Template file for 'py3status'
 pkgname=py3status
-version=3.20
+version=3.21
 revision=1
 archs=noarch
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="BSD-3-Clause"
 homepage="https://github.com/ultrabug/py3status"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=136d3033f6945b522d02f43754b265d7f451694fa57577d923071de1831101f1
+checksum=81a5e9a2cae77e148fd3ef1647426136e9b001c1fb8d8e9c7ade9fb5e6a0ae1b
 
 do_check() {
 	python3 -m pytest
diff --git a/srcpkgs/pycharm-community/template b/srcpkgs/pycharm-community/template
index 7546f04e581..cdd7d83a113 100644
--- a/srcpkgs/pycharm-community/template
+++ b/srcpkgs/pycharm-community/template
@@ -1,6 +1,6 @@
 # Template file for 'pycharm-community'
 pkgname=pycharm-community
-version=2019.2
+version=2019.2.3
 revision=1
 archs="i686 x86_64"
 depends="virtual?java-environment giflib libXtst"
@@ -9,7 +9,7 @@ maintainer="Felix Van der Jeugt <felix.vanderjeugt@gmail.com>"
 license="Apache-2.0"
 homepage="https://www.jetbrains.org/pycharm/"
 distfiles="https://download-cf.jetbrains.com/python/${pkgname}-${version}.tar.gz"
-checksum=632015cc40d6e4a874ab5cbab0430ec1962cd3c4a7ff5f083ce88242180f784b
+checksum=205cf868b64bce3099c65a4e600d01e416a7ba81eff117df8a2b525222b7de09
 repository=nonfree
 nopie=yes
 
diff --git a/srcpkgs/pylint/template b/srcpkgs/pylint/template
index 6119b9191c3..b6ca91fd84c 100644
--- a/srcpkgs/pylint/template
+++ b/srcpkgs/pylint/template
@@ -1,10 +1,11 @@
 # Template file for 'pylint'
 pkgname=pylint
-version=1.9.4
+reverts="2.3.1_1"
+version=1.9.5
 revision=1
 archs=noarch
 wrksrc="pylint-${version}"
-build_style=python-module
+build_style=python2-module
 pycompile_module="pylint"
 hostmakedepends="python-setuptools python3-setuptools"
 depends="python-setuptools python-astroid python-six python-isort python-mccabe
@@ -15,7 +16,7 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
 homepage="http://www.pylint.org/"
 license="GPL-2.0-or-later"
 distfiles="${PYPI_SITE}/p/pylint/pylint-${version}.tar.gz"
-checksum=ee1e85575587c5b58ddafa25e1c1b01691ef172e139fc25585e5d3f02451da93
+checksum=97a42df23d436c70132971d1dcb9efad2fe5c0c6add55b90161e773caf729300
 
 alternatives="
  pylint:epylint:/usr/bin/epylint2
@@ -37,7 +38,7 @@ post_install() {
 	# create versioned man pages
 	for f in epylint pylint pyreverse symilar; do
 		vman man/${f}.1 ${f}2.1
-		vman man/${f}.1 ${f}3.1
+		mv ${DESTDIR}/usr/bin/${f} ${DESTDIR}/usr/bin/${f}2
 	done
 
 	# install example config and emacs files
@@ -46,28 +47,3 @@ post_install() {
 	vsconf elisp/pylint.el
 	vsconf elisp/pylint-flymake.el
 }
-
-python3-pylint_package() {
-	alternatives="
-	 pylint:epylint:/usr/bin/epylint3
-	 pylint:pylint:/usr/bin/pylint3
-	 pylint:pyreverse:/usr/bin/pyreverse3
-	 pylint:symilar:/usr/bin/symilar3
-	 pylint:epylint.1:/usr/share/man/man1/epylint3.1
-	 pylint:pylint.1:/usr/share/man/man1/pylint3.1
-	 pylint:pyreverse.1:/usr/share/man/man1/pyreverse3.1
-	 pylint:symilar.1:/usr/share/man/man1/symilar3.1"
-	archs=noarch
-	pycompile_module="pylint"
-	depends="python3-setuptools python3-astroid python3-six python3-isort python3-mccabe"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/bin/*3
-		vmove usr/lib/python3*
-		vmove usr/share/man/man1/*3.1
-		vsconf examples/pylintrc
-		vsconf examples/pylintrc_camelcase
-		vsconf elisp/pylint.el
-		vsconf elisp/pylint-flymake.el
-	}
-}
diff --git a/srcpkgs/pyradio/INSTALL.msg b/srcpkgs/pyradio/INSTALL.msg
new file mode 100644
index 00000000000..f3ae4fba849
--- /dev/null
+++ b/srcpkgs/pyradio/INSTALL.msg
@@ -0,0 +1,5 @@
+To make pyradio work one of these must be installed:
+
+	- mpv & socat
+	- mplayer
+	- vlc
diff --git a/srcpkgs/pyradio/template b/srcpkgs/pyradio/template
new file mode 100644
index 00000000000..10d7d8c6fbb
--- /dev/null
+++ b/srcpkgs/pyradio/template
@@ -0,0 +1,21 @@
+# Template file for 'pyradio'
+pkgname=pyradio
+version=0.8.0
+revision=1
+archs=noarch
+build_style=python3-module
+pycompile_module="pyradio"
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Curses based internet radio player"
+maintainer="Lugubris <lugubris@disroot.org>"
+license="MIT"
+homepage="http://www.coderholic.com/pyradio/"
+changelog="https://raw.githubusercontent.com/coderholic/pyradio/master/ChangeLog"
+distfiles="https://github.com/coderholic/pyradio/archive/${version}.tar.gz"
+checksum=2b1e0c4552580a5df5b464243f7b141bfabbb1ccfe4d1a72418b161d60c1ffc1
+
+post_install() {
+	vman pyradio.1
+	vlicense LICENCE
+}
diff --git a/srcpkgs/python-Arrow/template b/srcpkgs/python-Arrow/template
index 78b6dbca9ad..456e3776188 100644
--- a/srcpkgs/python-Arrow/template
+++ b/srcpkgs/python-Arrow/template
@@ -1,7 +1,7 @@
 # Template file for 'python-Arrow'
 pkgname=python-Arrow
 reverts=0.13.1_1
-version=0.13.0
+version=0.15.2
 revision=1
 archs=noarch
 wrksrc="arrow-${version}"
@@ -14,7 +14,7 @@ maintainer="Andrea Brancaleoni <miwaxe@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/crsmithdev/arrow"
 distfiles="${PYPI_SITE}/a/arrow/arrow-${version}.tar.gz"
-checksum=9cb4a910256ed536751cd5728673bfb53e6f0026e240466f90c2a92c0b79c895
+checksum=10257c5daba1a88db34afa284823382f4963feca7733b9107956bed041aff24f
 
 python3-Arrow_package() {
 	archs=noarch
diff --git a/srcpkgs/python-Babel/template b/srcpkgs/python-Babel/template
index fcd1b7daf25..34d7a7728ce 100644
--- a/srcpkgs/python-Babel/template
+++ b/srcpkgs/python-Babel/template
@@ -1,6 +1,6 @@
 # Template file for 'python-Babel'
 pkgname=python-Babel
-version=2.6.0
+version=2.7.0
 revision=1
 archs=noarch
 wrksrc="${pkgname#*-}-${version}"
@@ -10,10 +10,10 @@ hostmakedepends="python-setuptools python3-setuptools"
 depends="python-setuptools python-pytz"
 short_desc="Tools for internationalizing Python applications (Python2)"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="http://babel.pocoo.org/"
 license="BSD-3-Clause"
+homepage="http://babel.pocoo.org/"
 distfiles="${PYPI_SITE}/B/Babel/Babel-${version}.tar.gz"
-checksum=8cba50f48c529ca3fa18cf81fa9403be176d374ac4d60738b839122dfaaa3d23
+checksum=e86135ae101e31e2c8ec20a4e0c5220f4eed12487d5cf3f78be7e98d3a57fc28
 alternatives="babel:pybabel:/usr/bin/pybabel2"
 
 post_install() {
diff --git a/srcpkgs/python-BeautifulSoup4/template b/srcpkgs/python-BeautifulSoup4/template
index 5e68904603d..70e4f8a58da 100644
--- a/srcpkgs/python-BeautifulSoup4/template
+++ b/srcpkgs/python-BeautifulSoup4/template
@@ -1,7 +1,7 @@
 # Template file for 'python-BeautifulSoup4'
 pkgname=python-BeautifulSoup4
-version=4.7.1
-revision=2
+version=4.8.0
+revision=1
 archs=noarch
 wrksrc="beautifulsoup4-${version}"
 build_style=python-module
@@ -13,7 +13,7 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="MIT"
 homepage="https://www.crummy.com/software/BeautifulSoup"
 distfiles="${PYPI_SITE}/b/beautifulsoup4/beautifulsoup4-${version}.tar.gz"
-checksum=945065979fb8529dd2f37dbb58f00b661bdbcbebf954f93b32fdf5263ef35348
+checksum=25288c9e176f354bf277c0a10aa96c782a6a18a17122dba2e8cec4a97e03343b
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python-Cheroot/template b/srcpkgs/python-Cheroot/template
index f63f8871e54..fcfdf76e69d 100644
--- a/srcpkgs/python-Cheroot/template
+++ b/srcpkgs/python-Cheroot/template
@@ -1,6 +1,6 @@
 # Template file for 'python-Cheroot'
 pkgname=python-Cheroot
-version=6.5.4
+version=8.2.0
 revision=1
 archs=noarch
 wrksrc="cheroot-${version}"
@@ -10,20 +10,18 @@ hostmakedepends="python-setuptools python3-setuptools"
 depends="python-setuptools python-six python-more-itertools
  python-backports.functools_lru_cache"
 short_desc="High-performance, pure-Python HTTP server (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="bra1nwave <brainwave@openmailbox.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/cherrypy/cheroot"
 changelog="https://github.com/cherrypy/cheroot/blob/master/CHANGES.rst"
 distfiles="${PYPI_SITE}/c/cheroot/cheroot-${version}.tar.gz"
-checksum=beb8eb9eeff5746059607e81b72efd6f4ca099111dc13f8961ae9e4f63f7786b
+checksum=42fa3e1f44d92b4784fd76621711b98f96aab66d504c383359a827286e896708
 alternatives="cheroot:cheroot:/usr/bin/cheroot2"
 
 pre_build() {
-	sed -i setup.cfg \
+	vsed -i setup.cfg \
 		-e '/setuptools_scm/d' \
-		-e '/setuptools_scm_git_archive/d' \
 		-e '/use_scm_version/d' \
-		-e '/backports.*/s/$/;python_version<"3.4"/' \
 		-e "/name = /a\
 		version = ${version}"
 }
@@ -39,8 +37,8 @@ python3-Cheroot_package() {
 	alternatives="cheroot:cheroot:/usr/bin/cheroot3"
 	short_desc="${short_desc/Python2/Python3}"
 	pkg_install() {
-		vmove usr/bin/*3
-		vmove usr/lib/python3*
+		vmove "usr/bin/*3"
+		vmove "usr/lib/python3*"
 		vlicense LICENSE.md
 	}
 }
diff --git a/srcpkgs/python-ConfigArgParse/template b/srcpkgs/python-ConfigArgParse/template
index 5a834639082..c9a00a04508 100644
--- a/srcpkgs/python-ConfigArgParse/template
+++ b/srcpkgs/python-ConfigArgParse/template
@@ -1,6 +1,6 @@
 # Template file for 'python-ConfigArgParse'
 pkgname=python-ConfigArgParse
-version=0.14.0
+version=0.15.1
 revision=1
 archs=noarch
 wrksrc="ConfigArgParse-${version}"
@@ -13,7 +13,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="MIT"
 homepage="https://github.com/bw2/ConfigArgParse"
 distfiles="${PYPI_SITE}/C/ConfigArgParse/ConfigArgParse-${version}.tar.gz"
-checksum=2e2efe2be3f90577aca9415e32cb629aa2ecd92078adbe27b53a03e53ff12e91
+checksum=baaf0fd2c1c108d007f402dab5481ac5f12d77d034825bf5a27f8224757bd0ac
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python-Cython/template b/srcpkgs/python-Cython/template
index d2230744d8c..dc39d54e9c2 100644
--- a/srcpkgs/python-Cython/template
+++ b/srcpkgs/python-Cython/template
@@ -1,6 +1,6 @@
 # Template file for 'python-Cython'
 pkgname=python-Cython
-version=0.29.11
+version=0.29.13
 revision=1
 wrksrc="Cython-${version}"
 build_style=python-module
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="https://cython.org/"
 changelog="https://raw.githubusercontent.com/cython/cython/master/CHANGES.rst"
 distfiles="${PYPI_SITE}/C/Cython/Cython-${version}.tar.gz"
-checksum=763a522cc5d1673ba7a4092c0914790f11704b1d4c41e2671e50d0f702a8c6a0
+checksum=c29d069a4a30f472482343c866f7486731ad638ef9af92bfe5fca9c7323d638e
 
 alternatives="
  cython:cygdb:/usr/bin/cygdb2
diff --git a/srcpkgs/python-Django/template b/srcpkgs/python-Django/template
index 44148cdd6cf..21aa405fba1 100644
--- a/srcpkgs/python-Django/template
+++ b/srcpkgs/python-Django/template
@@ -1,6 +1,6 @@
 # Template file for 'python-Django'
 pkgname=python-Django
-version=1.11.21
+version=1.11.25
 revision=1
 archs=noarch
 wrksrc="Django-${version}"
@@ -13,7 +13,7 @@ maintainer="Eivind Uggedal <eivind@uggedal.com>"
 license="BSD-3-Clause"
 homepage="https://www.djangoproject.com/"
 distfiles="${PYPI_SITE}/D/Django/Django-${version}.tar.gz"
-checksum=ba723e524facffa2a9d8c2e9116db871e16b9207e648e1d3e4af8aae1167b029
+checksum=5314e8586285d532b7aa5c6d763b0248d9a977a37efec86d30f0212b82e8ef66
 alternatives="django:django-admin:/usr/bin/django-admin2"
 
 post_install() {
diff --git a/srcpkgs/python-Mako/template b/srcpkgs/python-Mako/template
index ff7fd541479..e5c3c76170c 100644
--- a/srcpkgs/python-Mako/template
+++ b/srcpkgs/python-Mako/template
@@ -1,6 +1,6 @@
 # Template file for 'python-Mako'
 pkgname=python-Mako
-version=1.0.13
+version=1.1.0
 revision=1
 archs=noarch
 wrksrc="Mako-${version}"
@@ -13,7 +13,7 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="MIT"
 homepage="https://www.makotemplates.org/"
 distfiles="${PYPI_SITE}/M/Mako/Mako-${version}.tar.gz"
-checksum=95ee720cc3453063788515d55bd7ce4a2a77b7b209e4ac70ec5c86091eb02541
+checksum=a36919599a9b7dc5d86a7a8988f23a9a3a3d083070023bab23d64f7f1d1e0a4b
 alternatives="mako:mako-render:/usr/bin/mako-render2"
 
 post_install() {
diff --git a/srcpkgs/python-Markdown/template b/srcpkgs/python-Markdown/template
index a495fa53cf5..935dcc12bca 100644
--- a/srcpkgs/python-Markdown/template
+++ b/srcpkgs/python-Markdown/template
@@ -1,6 +1,6 @@
 # Template file for 'python-Markdown'
 pkgname=python-Markdown
-version=2.6.11
+version=3.1.1
 revision=1
 archs=noarch
 wrksrc="Markdown-${version}"
@@ -9,11 +9,11 @@ hostmakedepends="python-setuptools python3-setuptools"
 depends="python-setuptools"
 pycompile_module="markdown"
 short_desc="Python2 implementation of John Gruber's Markdown"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Peter Bui <pbui@github.bx612.space>"
 homepage="https://github.com/waylan/Python-Markdown"
 license="3-clause-BSD"
 distfiles="${PYPI_SITE}/M/Markdown/Markdown-${version}.tar.gz"
-checksum=a856869c7ff079ad84a3e19cd87a64998350c2b94e9e08e44270faef33400f81
+checksum=2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a
 alternatives="markdown:markdown_py:/usr/bin/markdown_py2"
 
 post_install() {
diff --git a/srcpkgs/python-MiniMock/template b/srcpkgs/python-MiniMock/template
index c9d26f43245..38c0723f374 100644
--- a/srcpkgs/python-MiniMock/template
+++ b/srcpkgs/python-MiniMock/template
@@ -9,7 +9,7 @@ pycompile_module="minimock.py"
 hostmakedepends="python-setuptools python3-setuptools"
 depends="python"
 short_desc="The simplest possible mock library in Python2"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://pypi.org/project/MiniMock/"
 distfiles="${PYPI_SITE}/M/MiniMock/MiniMock-${version}.tar.gz"
diff --git a/srcpkgs/python-Pillow/template b/srcpkgs/python-Pillow/template
index 59f4915113a..e43d22b8f62 100644
--- a/srcpkgs/python-Pillow/template
+++ b/srcpkgs/python-Pillow/template
@@ -1,6 +1,6 @@
 # Template file for 'python-Pillow'
 pkgname=python-Pillow
-version=6.0.0
+version=6.2.0
 revision=1
 wrksrc="Pillow-${version}"
 build_style=python-module
@@ -10,11 +10,11 @@ makedepends="python-devel python3-devel libjpeg-turbo-devel libopenjpeg2-devel
  tiff-devel freetype-devel lcms2-devel libwebp-devel libimagequant-devel"
 short_desc="Python Imaging Library (PIL) fork (Python2)"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="custom: PIL"
+license="custom:PIL"
 homepage="https://python-pillow.org/"
 changelog="https://raw.githubusercontent.com/python-pillow/Pillow/master/CHANGES.rst"
 distfiles="${PYPI_SITE}/P/Pillow/Pillow-${version}.tar.gz"
-checksum=809c0a2ce9032cbcd7b5313f71af4bdc5c8c771cb86eb7559afd954cab82ebb5
+checksum=4548236844327a718ce3bb182ab32a16fa2050c61e334e959f554cac052fb0df
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python-PyQt5-webengine/template b/srcpkgs/python-PyQt5-webengine/template
index fb13fcf6667..996ef6b00e2 100644
--- a/srcpkgs/python-PyQt5-webengine/template
+++ b/srcpkgs/python-PyQt5-webengine/template
@@ -19,6 +19,8 @@ checksum=bb6cabcc454ed1394aedfb42eb35dbee3ca324cf582e8c0ca5e8c8af0b00e325
 lib32disabled=yes
 
 case "$XBPS_TARGET_MACHINE" in
+	ppc64*) ;;
+	ppc*) broken="no webengine for 32-bit ppc";;
 	arm*) broken="depends on qt5-webengine";;
 	aarch64*) broken="https://build.voidlinux.org/builders/aarch64_builder/builds/20955/steps/shell_3/logs/stdio";;
 esac
diff --git a/srcpkgs/python-SQLAlchemy/template b/srcpkgs/python-SQLAlchemy/template
index 2a64302f58c..7b529ade621 100644
--- a/srcpkgs/python-SQLAlchemy/template
+++ b/srcpkgs/python-SQLAlchemy/template
@@ -1,6 +1,6 @@
 # Template file for 'python-SQLAlchemy'
 pkgname=python-SQLAlchemy
-version=1.3.5
+version=1.3.8
 revision=1
 wrksrc="SQLAlchemy-${version}"
 build_style=python-module
@@ -12,7 +12,7 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="MIT"
 homepage="https://www.sqlalchemy.org"
 distfiles="${PYPI_SITE}/S/SQLAlchemy/SQLAlchemy-${version}.tar.gz"
-checksum=c30925d60af95443458ebd7525daf791f55762b106049ae71e18f8dd58084c2f
+checksum=2f8ff566a4d3a92246d367f2e9cd6ed3edeef670dcd6dda6dfdc9efed88bcd80
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python-Unidecode/template b/srcpkgs/python-Unidecode/template
index 47f1882ae26..035c5d846be 100644
--- a/srcpkgs/python-Unidecode/template
+++ b/srcpkgs/python-Unidecode/template
@@ -1,6 +1,6 @@
 # Template file for 'python-Unidecode'
 pkgname=python-Unidecode
-version=1.0.23
+version=1.1.1
 revision=1
 archs=noarch
 wrksrc="Unidecode-${version}"
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://pypi.org/project/Unidecode/"
 distfiles="${PYPI_SITE}/U/Unidecode/Unidecode-${version}.tar.gz"
-checksum=8b85354be8fd0c0e10adbf0675f6dc2310e56fda43fa8fe049123b6c475e52fb
+checksum=2b6aab710c2a1647e928e36d69c21e76b453cd455f4e2621000e54b2a9b8cce8
 alternatives="unidecode:unidecode:/usr/bin/unidecode2"
 
 do_check() {
diff --git a/srcpkgs/python-aalib/template b/srcpkgs/python-aalib/template
index 1531914937f..349b8407343 100644
--- a/srcpkgs/python-aalib/template
+++ b/srcpkgs/python-aalib/template
@@ -7,7 +7,7 @@ pycompile_module="aalib.py"
 hostmakedepends="python-setuptools python3-setuptools"
 depends="aalib python"
 short_desc="Python2 interface to AAlib, an ASCII art library"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://jwilk.net/software/python-aalib"
 distfiles="${PYPI_SITE}/p/python-aalib/python-aalib-${version}.tar.gz"
diff --git a/srcpkgs/python-alembic/template b/srcpkgs/python-alembic/template
index 3c16c235123..4011b33c0fa 100644
--- a/srcpkgs/python-alembic/template
+++ b/srcpkgs/python-alembic/template
@@ -1,6 +1,6 @@
 # Template file for 'python-alembic'
 pkgname=python-alembic
-version=1.0.11
+version=1.2.1
 revision=1
 archs=noarch
 wrksrc="alembic-${version}"
@@ -8,13 +8,18 @@ build_style=python-module
 pycompile_module="alembic"
 hostmakedepends="python-setuptools python3-setuptools"
 depends="python-Mako python-SQLAlchemy python-dateutil python-editor"
-checkdepends="${depends} ${depends//python-/python3-} python-pytest python3-pytest python-mock"
+checkdepends="${depends} ${depends//python-/python3-}
+ python-pytest python3-pytest python-mock tox"
 short_desc="Database migration tool for SQLAlchemy (Python2)"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="MIT"
 homepage="https://bitbucket.org/zzzeek/alembic"
 distfiles="${PYPI_SITE}/a/alembic/alembic-${version}.tar.gz"
-checksum=cdb7d98bd5cbf65acd38d70b1c05573c432e6473a82f955cdea541b5c153b0cc
+checksum=9f907d7e8b286a1cfb22db9084f9ce4fde7ad7956bb496dc7c952e10ac90e36a
+
+do_check() {
+	tox -e py27,py${py3_ver/./}
+}
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python-appdirs/template b/srcpkgs/python-appdirs/template
index 02186f525cc..fdae1fe184b 100644
--- a/srcpkgs/python-appdirs/template
+++ b/srcpkgs/python-appdirs/template
@@ -9,7 +9,7 @@ pycompile_module="appdirs.py"
 hostmakedepends="python-setuptools python3-setuptools"
 depends="python"
 short_desc="Python2 module for determining appropriate platform-specific dirs"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/ActiveState/appdirs/"
 distfiles="${PYPI_SITE}/a/appdirs/appdirs-${version}.tar.gz"
diff --git a/srcpkgs/python-apsw/template b/srcpkgs/python-apsw/template
index 722c5b91558..ed47b4a7803 100644
--- a/srcpkgs/python-apsw/template
+++ b/srcpkgs/python-apsw/template
@@ -1,6 +1,6 @@
 # Template file for 'python-apsw'
 pkgname=python-apsw
-_distver=3.28.0
+_distver=3.29.0
 _patchver=r1
 version=${_distver}${_patchver}
 revision=1
@@ -12,8 +12,9 @@ short_desc="Another Python SQLite Wrapper (Python2)"
 maintainer="bra1nwave <brainwave@openmailbox.org>"
 license="Zlib"
 homepage="https://github.com/rogerbinns/apsw"
+changelog="https://raw.githubusercontent.com/rogerbinns/apsw/master/doc/changes.rst"
 distfiles="${homepage}/archive/${_distver}-${_patchver}.tar.gz"
-checksum=0347dd778f40e6d97ceeb3c469a5a06a64b1c69bb17d4a6e2c00db7ec38e2845
+checksum=a5715b4ff614d6bc3b19dcd73e54d5ba0c5340cdae6141ef6dd1e09b289bf7f7
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python-astroid/template b/srcpkgs/python-astroid/template
index 62dd495c995..9da6aebae87 100644
--- a/srcpkgs/python-astroid/template
+++ b/srcpkgs/python-astroid/template
@@ -1,12 +1,12 @@
 # Template file for 'python-astroid'
 pkgname=python-astroid
 version=1.6.6
-revision=1
+revision=2
 archs=noarch
 wrksrc="astroid-${version}"
-build_style=python-module
+build_style=python2-module
 pycompile_module="astroid"
-hostmakedepends="python-setuptools python3-setuptools"
+hostmakedepends="python-setuptools"
 depends="python-six python-lazy-object-proxy python-wrapt
  python-backports.functools_lru_cache python-enum34 python-singledispatch"
 short_desc="Abstract syntax tree for Python2"
@@ -20,13 +20,3 @@ post_install() {
 	# no tests
 	rm -rf ${DESTDIR}/usr/lib/python*/site-packages/astroid/tests
 }
-
-python3-astroid_package() {
-	archs=noarch
-	pycompile_module="astroid"
-	depends="python3-six python3-lazy-object-proxy python3-wrapt"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python-attrs/template b/srcpkgs/python-attrs/template
index 459200061d0..aaddb13f5be 100644
--- a/srcpkgs/python-attrs/template
+++ b/srcpkgs/python-attrs/template
@@ -1,6 +1,6 @@
 # Template file for 'python-attrs'
 pkgname=python-attrs
-version=18.2.0
+version=19.3.0
 revision=1
 archs=noarch
 wrksrc="attrs-${version}"
@@ -8,12 +8,19 @@ build_style=python-module
 pycompile_module="attr"
 hostmakedepends="python-setuptools python3-setuptools"
 depends="python"
+checkdepends="python-hypothesis python3-hypothesis python-pytest python3-pytest
+ python-zope.interface python3-zope.interface"
 short_desc="Attributes without boilerplate (Python2)"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="MIT"
 homepage="https://attrs.readthedocs.io/"
 distfiles="${PYPI_SITE}/a/attrs/attrs-${version}.tar.gz"
-checksum=10cbf6e27dbce8c30807caf056c8eb50917e0eaafe86347671b57254006c3e69
+checksum=f7b7ce16570fe9965acd6d30101a28f62fb4a7f9e926b3bbc9b61f8b04247e72
+
+pre_check() {
+	# those are python3 only
+	rm tests/test_annotations.py tests/test_init_subclass.py
+}
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python-audioread/template b/srcpkgs/python-audioread/template
index 84e6ccc6473..fc788a2778c 100644
--- a/srcpkgs/python-audioread/template
+++ b/srcpkgs/python-audioread/template
@@ -1,6 +1,6 @@
 # Template file for 'python-audioread'
 pkgname=python-audioread
-version=2.1.6
+version=2.1.8
 revision=1
 archs=noarch
 wrksrc="audioread-${version}"
@@ -10,10 +10,10 @@ hostmakedepends="python-setuptools python3-setuptools"
 depends="python"
 short_desc="Multi-library, cross-platform audio decoding (Python2)"
 maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="https://github.com/sampsyo/audioread/"
 license="MIT"
+homepage="https://github.com/sampsyo/audioread/"
 distfiles="${PYPI_SITE}/a/audioread/audioread-${version}.tar.gz"
-checksum=b0b9270c20833a75ce0d167fb2fdad52ddcd8e8f300be8afad3ac9715850bc50
+checksum=073904fabc842881e07bd3e4a5776623535562f70b1655b635d22886168dd168
 
 post_install() {
 	sed -n '2,13p' decode.py > LICENSE
diff --git a/srcpkgs/python-b2sdk/template b/srcpkgs/python-b2sdk/template
index 21e272fc06d..2a96e335fb5 100644
--- a/srcpkgs/python-b2sdk/template
+++ b/srcpkgs/python-b2sdk/template
@@ -1,6 +1,6 @@
 # Template file for 'python-b2sdk'
 pkgname=python-b2sdk
-version=0.1.8
+version=1.0.0
 revision=1
 archs=noarch
 build_style=python2-module
@@ -14,4 +14,4 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 homepage="https://pypi.org/project/b2sdk"
 distfiles="${PYPI_SITE}/b/b2sdk/b2sdk-${version}.tar.gz"
-checksum=91bcf09a05f5e822f7494824bf2fd75a81ff0035d2670f443a6f89454d18ab31
\ No newline at end of file
+checksum=cc4a30c5082864aa67a77ecb7ecece1ff18bea11fc718a63bdb23eb4b78a7ff1
\ No newline at end of file
diff --git a/srcpkgs/python-bitarray/template b/srcpkgs/python-bitarray/template
index c1e9f6b0f9d..4f2b4ee392c 100644
--- a/srcpkgs/python-bitarray/template
+++ b/srcpkgs/python-bitarray/template
@@ -1,7 +1,7 @@
 # Template file for 'python-bitarray'
 pkgname=python-bitarray
-version=0.8.3
-revision=2
+version=1.0.1
+revision=1
 wrksrc="bitarray-${version}"
 build_style=python-module
 pycompile_module="bitarray"
@@ -12,7 +12,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="Python-2.0"
 homepage="https://github.com/ilanschnell/bitarray"
 distfiles="https://github.com/ilanschnell/bitarray/archive/${version}.tar.gz"
-checksum=14fa725b4225c4c87579218e65d716651aaaf0da5686ff0cc217948c5d178563
+checksum=bc5be12525ba67c6dd1fffc28b4a035aa52139a4be0aa94df1b544074284113e
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python-botocore/template b/srcpkgs/python-botocore/template
index 77f92b00af0..ae1a4c17964 100644
--- a/srcpkgs/python-botocore/template
+++ b/srcpkgs/python-botocore/template
@@ -1,6 +1,6 @@
 # Template file for 'python-botocore'
 pkgname=python-botocore
-version=1.12.148
+version=1.12.243
 revision=1
 archs=noarch
 wrksrc="botocore-${version}"
@@ -13,11 +13,7 @@ maintainer="Robert Lowry <bobertlo@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/boto/botocore"
 distfiles="https://github.com/boto/botocore/archive/${version}.tar.gz"
-checksum=0b439e0ebf65d25b175665141dffd7235c73b923e834f506cb114b436dbd191c
-
-post_install() {
-	vlicense LICENSE.txt
-}
+checksum=d93f06e1a37f87bd3452cdc520a8455a19a57220d8b06bae64677775ca11a72d
 
 python3-botocore_package() {
 	archs=noarch
@@ -26,6 +22,5 @@ python3-botocore_package() {
 	short_desc="${short_desc/Python2/Python3}"
 	pkg_install() {
 		vmove "usr/lib/python3*"
-		vlicense LICENSE.txt
 	}
 }
diff --git a/srcpkgs/python-coverage/template b/srcpkgs/python-coverage/template
index 2d8680e1fd6..df6064b9879 100644
--- a/srcpkgs/python-coverage/template
+++ b/srcpkgs/python-coverage/template
@@ -1,6 +1,6 @@
 # Template file for 'python-coverage'
 pkgname=python-coverage
-version=4.5.3
+version=4.5.4
 revision=1
 wrksrc="${pkgname/python-//}-${version}"
 build_style=python-module
@@ -9,11 +9,11 @@ hostmakedepends="python-setuptools python3-setuptools"
 makedepends="python-devel python3-devel"
 depends="python-setuptools"
 short_desc="Code coverage testing for Python2"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://bitbucket.org/ned/coveragepy"
 distfiles="${PYPI_SITE}/c/coverage/coverage-${version}.tar.gz"
-checksum=9de60893fb447d1e797f6bf08fdf0dbcda0c1e34c1b06c92bd3a363c0ea8c609
+checksum=e07d9f1a23e9e93ab5c62902833bf3e4b1f65502927379148b6622686223125c
 alternatives="coverage:coverage:/usr/bin/coverage2"
 
 python3-coverage_package() {
diff --git a/srcpkgs/python-cram/template b/srcpkgs/python-cram/template
index cd629ba08bc..f1fce32149f 100644
--- a/srcpkgs/python-cram/template
+++ b/srcpkgs/python-cram/template
@@ -9,7 +9,7 @@ pycompile_module="cram"
 hostmakedepends="python-setuptools python3-setuptools"
 depends="python"
 short_desc="Simple testing framework for commandline applications (Python2)"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2"
 homepage="https://bitheap.org/cram/"
 distfiles="${PYPI_SITE}/c/cram/cram-${version}.tar.gz"
diff --git a/srcpkgs/python-cryptography/patches/libressl.patch b/srcpkgs/python-cryptography/patches/libressl.patch
deleted file mode 100644
index 38ee9bce61d..00000000000
--- a/srcpkgs/python-cryptography/patches/libressl.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-$OpenBSD: patch-src__cffi_src_openssl_ssl_py,v 1.2 2019/04/19 10:18:16 sthen Exp $
-
-Index: src/_cffi_src/openssl/ssl.py
---- src/_cffi_src/openssl/ssl.py.orig
-+++ src/_cffi_src/openssl/ssl.py
-@@ -721,9 +721,11 @@ static const long TLS_ST_OK = 0;
- 
- #if CRYPTOGRAPHY_OPENSSL_LESS_THAN_102
- static const long Cryptography_HAS_GENERIC_DTLS_METHOD = 0;
-+#if !CRYPTOGRAPHY_IS_LIBRESSL
- const SSL_METHOD *(*DTLS_method)(void) = NULL;
- const SSL_METHOD *(*DTLS_server_method)(void) = NULL;
- const SSL_METHOD *(*DTLS_client_method)(void) = NULL;
-+#endif
- static const long SSL_OP_NO_DTLSv1 = 0;
- static const long SSL_OP_NO_DTLSv1_2 = 0;
- long (*DTLS_set_link_mtu)(SSL *, long) = NULL;
-
diff --git a/srcpkgs/python-cryptography/template b/srcpkgs/python-cryptography/template
index a7838a514d3..ce3184715dd 100644
--- a/srcpkgs/python-cryptography/template
+++ b/srcpkgs/python-cryptography/template
@@ -1,25 +1,31 @@
 # Template file for 'python-cryptography'
 pkgname=python-cryptography
-version=2.4.2
-revision=2
+version=2.7
+revision=1
 wrksrc="cryptography-${version}"
 build_style=python-module
+pycompile_module="cryptography"
 hostmakedepends="python-setuptools python3-setuptools libressl-devel
  python-enum34 python-ipaddress python-six python3-six python-asn1crypto
  python3-asn1crypto python-cffi python3-cffi python-idna python3-idna"
 makedepends="libressl-devel python-devel python3-devel"
 depends="python-cffi python-asn1crypto python-six python-enum34
  python-idna python-ipaddress"
-pycompile_module="cryptography"
+checkdepends="python-cryptography_vectors python-hypothesis
+ python-iso-8601 python-pretend python-pytest python-pytz
+ python3-cryptography_vectors python3-hypothesis
+ python3-iso-8601 python3-pretend python3-pytest python3-pytz
+ ${depends}"
 short_desc="Python2 library that provides cryptographic recipes and primitives"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/pyca/cryptography"
 license="BSD-3-Clause, Apache-2.0"
+homepage="https://github.com/pyca/cryptography"
 distfiles="${PYPI_SITE}/c/cryptography/cryptography-${version}.tar.gz"
-checksum=05a6052c6a9f17ff78ba78f8e6eb1d777d25db3b763343a1ae89a7a8670386dd
+checksum=e6347742ac8f35ded4a46ff835c60e68c22a536a8ae5c4422966d06946b6d4c6
 
 post_install() {
 	vlicense LICENSE
+	vlicense LICENSE.BSD
 }
 
 python3-cryptography_package() {
@@ -29,5 +35,6 @@ python3-cryptography_package() {
 	pkg_install() {
 		vmove usr/lib/python3*
 		vlicense LICENSE
+		vlicense LICENSE.BSD
 	}
 }
diff --git a/srcpkgs/python-cryptography_vectors/template b/srcpkgs/python-cryptography_vectors/template
new file mode 100644
index 00000000000..d52e5f5e47c
--- /dev/null
+++ b/srcpkgs/python-cryptography_vectors/template
@@ -0,0 +1,30 @@
+# Template file for 'python-cryptography_vectors'
+pkgname=python-cryptography_vectors
+version=2.7
+revision=1
+archs=noarch
+wrksrc="cryptography_vectors-${version}"
+build_style=python-module
+pycompile_module="cryptography_vectors"
+hostmakedepends="python-setuptools python3-setuptools"
+short_desc="Test vectors for python-cryptography"
+maintainer="Piotr Wójcik <chocimier@tlen.pl>"
+license="BSD-3-Clause, Apache-2.0"
+homepage="https://github.com/pyca/cryptography"
+distfiles="${PYPI_SITE}/c/cryptography_vectors/cryptography_vectors-${version}.tar.gz"
+checksum=f12dfb9bd669a68004074cb5b26df6e93ed1a95ebd1a999dff0a840212ff68bc
+
+post_install() {
+	vlicense LICENSE
+	vlicense LICENSE.BSD
+}
+
+python3-cryptography_vectors_package() {
+	pycompile_module="cryptography_vectors"
+	short_desc="${short_desc/python/python3}"
+	pkg_install() {
+		vmove usr/lib/python3*
+		vlicense LICENSE
+		vlicense LICENSE.BSD
+	}
+}
diff --git a/srcpkgs/python-cssselect/template b/srcpkgs/python-cssselect/template
index 43595d806c2..d7dbcebc0ea 100644
--- a/srcpkgs/python-cssselect/template
+++ b/srcpkgs/python-cssselect/template
@@ -1,19 +1,19 @@
 # Template file for 'python-cssselect'
 pkgname=python-cssselect
-version=1.0.3
+version=1.1.0
 revision=1
 archs=noarch
 wrksrc="${pkgname#*-}-${version}"
 build_style=python-module
+pycompile_module="cssselect"
 hostmakedepends="python-setuptools python3-setuptools"
 depends="python"
-pycompile_module="cssselect"
 short_desc="CSS selectors for Python2"
 maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-3-Clause"
 homepage="https://cssselect.readthedocs.io/"
-license="3-clause-BSD"
 distfiles="${PYPI_SITE}/c/${pkgname#*-}/${pkgname#*-}-${version}.tar.gz"
-checksum=066d8bc5229af09617e24b3ca4d52f1f9092d9e061931f4184cd572885c23204
+checksum=f95f8dedd925fd8f54edb3d2dfb44c190d9d18512377d3c1e2388d16126879bc
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python-curl/template b/srcpkgs/python-curl/template
index e96da8d1a18..f1f9051d53a 100644
--- a/srcpkgs/python-curl/template
+++ b/srcpkgs/python-curl/template
@@ -1,6 +1,6 @@
 # Template file for 'python-curl'
 pkgname=python-curl
-version=7.43.0.2
+version=7.43.0.3
 revision=4
 wrksrc="pycurl-${version}"
 build_style=python-module
@@ -8,20 +8,25 @@ pycompile_module="curl"
 hostmakedepends="python-devel python3-devel"
 makedepends="libressl-devel libcurl-devel ${hostmakedepends}"
 short_desc="Python2 interface to cURL library"
-homepage="http://pycurl.io/"
-license="LGPL-2.1, MIT"
 maintainer="Orphaned <orphan@voidlinux.org>"
+license="LGPL-2.1-or-later, MIT"
+homepage="http://pycurl.io/"
 distfiles="${PYPI_SITE}/p/pycurl/pycurl-${version}.tar.gz"
-checksum=0f0cdfc7a92d4f2a5c44226162434e34f7d6967d3af416a6f1448649c09a25a4
+checksum=6f08330c5cf79fa8ef68b9912b9901db7ffd34b63e225dce74db56bb21deda8e
 
 pre_build() {
 	sed -i "/setup_args\['data_files'\] = /d" setup.py
 }
 
+post_install() {
+	vlicense COPYING-MIT
+}
+
 python3-curl_package() {
 	pycompile_module="curl"
 	short_desc="${short_desc/Python2/Python3}"
 	pkg_install() {
 		vmove usr/lib/python3*
+		vlicense COPYING-MIT
 	}
 }
diff --git a/srcpkgs/python-dbus/template b/srcpkgs/python-dbus/template
index c9faed27569..869c10b2969 100644
--- a/srcpkgs/python-dbus/template
+++ b/srcpkgs/python-dbus/template
@@ -1,20 +1,20 @@
 # Template file for 'python-dbus'
 pkgname=python-dbus
-version=1.2.8
+version=1.2.12
 revision=1
-lib32disabled=yes
 wrksrc="dbus-python-${version}"
 build_style=gnu-configure
+pycompile_module="dbus"
 hostmakedepends="pkg-config python-devel python3-devel"
 makedepends="libglib-devel ${hostmakedepends/pkg-config/}"
 depends="python dbus"
-pycompile_module="dbus"
 short_desc="D-Bus Python2 bindings"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://www.freedesktop.org/wiki/Software/DBusBindings"
 distfiles="https://dbus.freedesktop.org/releases/dbus-python/dbus-python-${version}.tar.gz"
-checksum=abf12bbb765e300bf8e2a1b2f32f85949eab06998dbda127952c31cb63957b6f
+checksum=cdd4de2c4f5e58f287b12013ed7b41dee81d503c8d0d2397c5bd2fb01badf260
+lib32disabled=yes
 
 pre_configure() {
 	mkdir -p dbus-${py2_ver}
diff --git a/srcpkgs/python-docutils/template b/srcpkgs/python-docutils/template
index c504eeece0a..62f080f416a 100644
--- a/srcpkgs/python-docutils/template
+++ b/srcpkgs/python-docutils/template
@@ -1,19 +1,19 @@
 # Template file for 'python-docutils'
 pkgname=python-docutils
-version=0.14
+version=0.15.2
 revision=1
 archs=noarch
 wrksrc="docutils-${version}"
 build_style=python-module
+pycompile_module="docutils"
 hostmakedepends="python-setuptools python3-setuptools"
 depends="python"
-pycompile_module="docutils"
 short_desc="Python2 documentation utilities"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="custom:Public Domain, BSD-2-Clause, GPL-3.0-or-later, Python-2.0"
 homepage="http://docutils.sourceforge.net"
-license="Public Domain, 2-clause-BSD, GPL-3, PSF"
 distfiles="${PYPI_SITE}/d/docutils/docutils-${version}.tar.gz"
-checksum=51e64ef2ebfb29cae1faa133b3710143496eca21c530f3f71424d77687764274
+checksum=a2aeea129088da402665e92e0b25b04b073c04b2dce4ab65caaa38b7ce2e1a99
 
 alternatives="
  docutils:rst2html:/usr/bin/rst2html.py2
diff --git a/srcpkgs/python-dogpile.cache/template b/srcpkgs/python-dogpile.cache/template
index a2e4a436f2f..f6e106fb4e8 100644
--- a/srcpkgs/python-dogpile.cache/template
+++ b/srcpkgs/python-dogpile.cache/template
@@ -1,19 +1,19 @@
 # Template file for 'python-dogpile.cache'
 pkgname=python-dogpile.cache
-version=0.7.1
-revision=2
+version=0.8.0
+revision=1
 archs=noarch
 wrksrc="dogpile.cache-${version}"
 build_style=python-module
 pycompile_module="dogpile"
 hostmakedepends="python-setuptools python3-setuptools"
 depends="python python-decorator"
-short_desc="A caching front-end based on the Dogpile lock (Python2)"
+short_desc="Caching front-end based on the Dogpile lock (Python2)"
 maintainer="Daniel Santana <daniel@santana.tech>"
 license="BSD-3-Clause"
 homepage="https://github.com/sqlalchemy/dogpile.cache"
 distfiles="${PYPI_SITE}/d/dogpile.cache/dogpile.cache-${version}.tar.gz"
-checksum=691b7f199561c4bd6e7e96f164a43cc3781b0c87bea29b7d59d859f873fd4a31
+checksum=70f5eae4aec908f76188a2c287e07105f60c05d879bb9a4efcc5ba44563d8de6
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python-dulwich/template b/srcpkgs/python-dulwich/template
index 6f75ae317f4..0bddda65069 100644
--- a/srcpkgs/python-dulwich/template
+++ b/srcpkgs/python-dulwich/template
@@ -1,6 +1,6 @@
 # Template file for 'python-dulwich'
 pkgname=python-dulwich
-version=0.19.11
+version=0.19.13
 revision=1
 wrksrc="dulwich-${version}"
 build_style=python-module
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, Apache-2.0"
 homepage="https://www.dulwich.io/"
 distfiles="${PYPI_SITE}/d/dulwich/dulwich-${version}.tar.gz"
-checksum=afbe070f6899357e33f63f3f3696e601731fef66c64a489dea1bc9f539f4a725
+checksum=aa628449c5f594a9a282f4d9e5993fef65481ef5e3b9b6c52ff31200f8f5dc95
 
 alternatives="
  dulwich:dul-receive-pack:/usr/bin/dul-receive-pack2
diff --git a/srcpkgs/python-ecdsa/template b/srcpkgs/python-ecdsa/template
index a598fe26136..5e0b217fa73 100644
--- a/srcpkgs/python-ecdsa/template
+++ b/srcpkgs/python-ecdsa/template
@@ -1,19 +1,19 @@
 # Template file for 'python-ecdsa'
 pkgname=python-ecdsa
-version=0.13
-revision=3
+version=0.13.2
+revision=1
 archs=noarch
 wrksrc="${pkgname/python-/}-${version}"
 build_style=python-module
+pycompile_module="ecdsa"
 hostmakedepends="python-setuptools python3-setuptools"
 depends="python-six"
-pycompile_module="ecdsa"
 short_desc="Implementation of ECDSA in Python2"
 maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="https://github.com/warner/python-ecdsa/"
 license="MIT"
+homepage="https://github.com/warner/python-ecdsa/"
 distfiles="${PYPI_SITE}/e/ecdsa/ecdsa-${version}.tar.gz"
-checksum=64cf1ee26d1cde3c73c6d7d107f835fed7c6a2904aef9eac223d57ad800c43fa
+checksum=5c034ffa23413ac923541ceb3ac14ec15a0d2530690413bff58c12b80e56d884
 
 pre_build() {
 	# use system six
diff --git a/srcpkgs/python-envdir/template b/srcpkgs/python-envdir/template
index 2ad0366eec9..622fcee6b34 100644
--- a/srcpkgs/python-envdir/template
+++ b/srcpkgs/python-envdir/template
@@ -9,7 +9,7 @@ pycompile_module="envdir"
 hostmakedepends="python-setuptools python3-setuptools"
 depends="python-setuptools"
 short_desc="Python2 port of daemontools' envdir"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/jezdez/envdir"
 distfiles="https://github.com/jezdez/envdir/archive/${version}.tar.gz"
diff --git a/srcpkgs/python-ewmh/template b/srcpkgs/python-ewmh/template
index ad1ea573a10..be6d04316b0 100644
--- a/srcpkgs/python-ewmh/template
+++ b/srcpkgs/python-ewmh/template
@@ -9,7 +9,7 @@ pycompile_module="ewmh"
 hostmakedepends="python-setuptools python3-setuptools"
 depends="python-xlib"
 short_desc="Python2 implementation of EWMH (Extended Window Manager Hints)"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/parkouss/pyewmh"
 distfiles="${PYPI_SITE}/e/ewmh/ewmh-${version}.tar.gz"
diff --git a/srcpkgs/python-flaky/template b/srcpkgs/python-flaky/template
index a2aa653629e..d5211c9cb60 100644
--- a/srcpkgs/python-flaky/template
+++ b/srcpkgs/python-flaky/template
@@ -1,6 +1,6 @@
 # Template file for 'python-flaky'
 pkgname=python-flaky
-version=3.5.3
+version=3.6.1
 revision=1
 archs=noarch
 wrksrc="${pkgname/python-//}-${version}"
@@ -9,11 +9,11 @@ pycompile_module="flaky"
 hostmakedepends="python-setuptools python3-setuptools"
 depends="python"
 short_desc="Plugin for nose/py.test that automatically reruns flaky tests (Python2)"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/box/flaky"
 distfiles="${PYPI_SITE}/f/flaky/flaky-${version}.tar.gz"
-checksum=12bd5e41f372b2190e8d754b6e5829c2f11dbc764e10b30f57e59f829c9ca1da
+checksum=8cd5455bb00c677f787da424eaf8c4a58a922d0e97126d3085db5b279a98b698
 
 python3-flaky_package() {
 	archs=noarch
diff --git a/srcpkgs/python-fonttools/template b/srcpkgs/python-fonttools/template
index 05c31aa35c1..6a222e87482 100644
--- a/srcpkgs/python-fonttools/template
+++ b/srcpkgs/python-fonttools/template
@@ -1,31 +1,31 @@
 # Template file for 'python-fonttools'
 pkgname=python-fonttools
-version=3.43.1
-revision=1
+version=3.44.0
+revision=4
 wrksrc="${pkgname#python-}-${version}"
-build_style=python-module
+build_style=python2-module
 pycompile_module="fonttools"
-hostmakedepends="python-devel python3-devel python-setuptools python3-setuptools"
+hostmakedepends="python-devel python-setuptools"
 makedepends="${hostmakedepends}"
 short_desc="Library to manipulate font files from Python2"
 maintainer="svenper <svenper@tuta.io>"
 license="MIT, OFL-1.1, BSD-3-Clause"
 homepage="https://github.com/fonttools/fonttools"
 distfiles="https://github.com/fonttools/fonttools/archive/${version}.tar.gz"
-checksum=12b05c56ac60fe15b2fce6958df1408e054a403270ddfc05d3a096afe73d9419
+checksum=9dadbca88a5a841d821f6892fa9f4715ec03afd53980aaf4d61bd4be345b24ed
+alternatives="
+	fonttools:fonttools:/usr/bin/fonttools2
+	fonttools:pyftmerge:/usr/bin/pyftmerge2
+	fonttools:pyftsubset:/usr/bin/pyftsubset2
+	fonttools:ttx:/usr/bin/ttx2
+	fonttools:ttx.1:/usr/share/man/man1/ttx2.1"
 
 post_install() {
+	mv ${DESTDIR}/usr/bin/fonttools{,2}
+	mv ${DESTDIR}/usr/bin/pyftmerge{,2}
+	mv ${DESTDIR}/usr/bin/pyftsubset{,2}
+	mv ${DESTDIR}/usr/bin/ttx{,2}
+	mv ${DESTDIR}/usr/share/man/man1/ttx{,2}.1
 	vlicense LICENSE
 	vlicense LICENSE.external
 }
-
-python3-fonttools_package() {
-	pycompile_module="fonttools"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove "usr/lib/python3*"
-		vmove "usr/bin/*3"
-		vlicense LICENSE
-		vlicense LICENSE.external
-	}
-}
diff --git a/srcpkgs/python-fonttools/update b/srcpkgs/python-fonttools/update
new file mode 100644
index 00000000000..2927cb964bf
--- /dev/null
+++ b/srcpkgs/python-fonttools/update
@@ -0,0 +1,3 @@
+# "The v4.x version series only supports Python 3.6 or greater.
+# You can keep using fonttools 3.x if you need support for Python 2."
+ignore="[4-9].* [1-9][0-9]*.*"
diff --git a/srcpkgs/python-gitlab/template b/srcpkgs/python-gitlab/template
index b5840cc04b6..7db583b54c4 100644
--- a/srcpkgs/python-gitlab/template
+++ b/srcpkgs/python-gitlab/template
@@ -1,6 +1,6 @@
 # Template file for 'python-gitlab'
 pkgname=python-gitlab
-version=1.8.0
+version=1.12.1
 revision=1
 archs=noarch
 build_style=python-module
@@ -14,7 +14,7 @@ license="LGPL-3.0-or-later"
 homepage="https://github.com/gpocentek/python-gitlab"
 changelog="https://raw.githubusercontent.com/python-gitlab/python-gitlab/master/ChangeLog.rst"
 distfiles="${PYPI_SITE}/p/python-gitlab/python-gitlab-${version}.tar.gz"
-checksum=a6b03bc53f6e2e22b88d5ff9772b1bb360570ec82752f1def3d6eb60cda093e7
+checksum=984e110c1f76fd939652c30ce3101267a7064e34417cbfc4687e6106d4db54ec
 alternatives="python-gitlab:gitlab:/usr/bin/gitlab2"
 
 do_check() {
diff --git a/srcpkgs/python-google-api-python-client/template b/srcpkgs/python-google-api-python-client/template
index b0fd526e63a..273cd0722b8 100644
--- a/srcpkgs/python-google-api-python-client/template
+++ b/srcpkgs/python-google-api-python-client/template
@@ -1,6 +1,6 @@
 # Template file for 'python-google-api-python-client'
 pkgname=python-google-api-python-client
-version=1.7.10
+version=1.7.11
 revision=1
 archs=noarch
 wrksrc="${pkgname#*-}-${version}"
@@ -14,7 +14,7 @@ maintainer="Peter Bui <pbui@github.bx612.space>"
 license="Apache-2.0"
 homepage="https://github.com/google/google-api-python-client/"
 distfiles="${PYPI_SITE}/g/google-api-python-client/google-api-python-client-${version}.tar.gz"
-checksum=2e55a5c7b56233c68945b6804c73e253445933f4d485d4e69e321b38772b9dd6
+checksum=a8a88174f66d92aed7ebbd73744c2c319b4b1ce828e565f9ec721352d2e2fb8c
 
 python3-google-api-python-client_package() {
 	archs=noarch
diff --git a/srcpkgs/python-grako/template b/srcpkgs/python-grako/template
index 49e01f05815..cc02973b31e 100644
--- a/srcpkgs/python-grako/template
+++ b/srcpkgs/python-grako/template
@@ -9,7 +9,7 @@ hostmakedepends="python-setuptools python3-setuptools python-Cython python3-Cyth
 makedepends="python-devel python3-devel"
 depends="python-setuptools"
 short_desc="Grammar compiler, EBNF input, PEG/Packrat parser output (Python2)"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://bitbucket.org/neogeny/grako"
 distfiles="https://bitbucket.org/neogeny/grako/get/${version}.tar.bz2"
diff --git a/srcpkgs/python-graphviz/template b/srcpkgs/python-graphviz/template
index 772c828335c..521f2e81213 100644
--- a/srcpkgs/python-graphviz/template
+++ b/srcpkgs/python-graphviz/template
@@ -9,7 +9,7 @@ pycompile_module="graphviz"
 hostmakedepends="python-setuptools python3-setuptools"
 depends="graphviz python"
 short_desc="Simple Python2 interface for Graphviz"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/xflr6/graphviz"
 changelog="https://github.com/xflr6/graphviz/blob/master/CHANGES.txt"
diff --git a/srcpkgs/python-guessit/template b/srcpkgs/python-guessit/template
index 62054da1880..5029048a041 100644
--- a/srcpkgs/python-guessit/template
+++ b/srcpkgs/python-guessit/template
@@ -1,6 +1,6 @@
 # Template file for 'python-guessit'
 pkgname=python-guessit
-version=3.0.4
+version=3.1.0
 revision=1
 archs=noarch
 wrksrc="guessit-${version}"
@@ -13,13 +13,9 @@ maintainer="Daniel Santana <daniel@santana.tech>"
 license="LGPL-3.0-only"
 homepage="https://guessit.readthedocs.io/en/latest/"
 distfiles="${PYPI_SITE}/g/guessit/guessit-${version}.tar.gz"
-checksum=37803ec0d7f20f2e1425dfe3bb978dc3b9c65872aa3760c664b31a9115232ec1
+checksum=2dcd3f2acaf6c1a864f903f084ddd6a6b753f3107ae864355d7c8c1e9cb205b2
 alternatives="guessit:guessit:/usr/bin/guessit2"
 
-post_install() {
-	vlicense LICENSE
-}
-
 python3-guessit_package() {
 	archs=noarch
 	pycompile_module="guessit"
@@ -29,6 +25,5 @@ python3-guessit_package() {
 	pkg_install() {
 		vmove usr/bin/guessit3
 		vmove usr/lib/python3*
-		vlicense LICENSE
 	}
 }
diff --git a/srcpkgs/python-html2text/template b/srcpkgs/python-html2text/template
deleted file mode 100644
index bcba0f69e49..00000000000
--- a/srcpkgs/python-html2text/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'python-html2text'
-pkgname=python-html2text
-version=2019.8.11
-revision=1
-archs=noarch
-wrksrc="${pkgname#*-}-${version}"
-build_style=python-module
-pycompile_module="html2text"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="HTML to Markdown-formatted text converter (Python2)"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-3.0-only"
-homepage="https://github.com/Alir3z4/html2text/"
-distfiles="${PYPI_SITE}/h/html2text/html2text-${version}.tar.gz"
-checksum=f516b9c10284174e2a974d86f91cab02b3cf983a17752075da751af0e895ef5e
-alternatives="html2text:html2text:/usr/bin/html2text2"
-
-python3-html2text_package() {
-	archs=noarch
-	depends="python3"
-	pycompile_module="html2text"
-	short_desc="${short_desc/Python2/Python3}"
-	alternatives="html2text:html2text:/usr/bin/html2text3"
-	pkg_install() {
-		vmove usr/bin/html2text3
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python-httmock/template b/srcpkgs/python-httmock/template
index 3f9bc69e1e5..61a60126936 100644
--- a/srcpkgs/python-httmock/template
+++ b/srcpkgs/python-httmock/template
@@ -10,7 +10,7 @@ hostmakedepends="python3-setuptools python-setuptools"
 depends="python-requests"
 checkdepends="python3-requests"
 short_desc="Mocking library for requests (Python2)"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/patrys/httmock"
 distfiles="https://github.com/patrys/httmock/archive/${version}.tar.gz"
diff --git a/srcpkgs/python-httplib2/template b/srcpkgs/python-httplib2/template
index f422b2ca2b2..edcb6abf0c1 100644
--- a/srcpkgs/python-httplib2/template
+++ b/srcpkgs/python-httplib2/template
@@ -1,6 +1,6 @@
 # Template file for 'python-httplib2'
 pkgname=python-httplib2
-version=0.13.0
+version=0.13.1
 revision=1
 archs=noarch
 wrksrc="httplib2-${version}"
@@ -15,7 +15,7 @@ homepage="https://github.com/httplib2/httplib2"
 changelog="https://raw.githubusercontent.com/httplib2/httplib2/master/CHANGELOG"
 distfiles="${PYPI_SITE}/h/httplib2/httplib2-${version}.tar.gz
  https://raw.githubusercontent.com/httplib2/httplib2/master/LICENSE>LICENSE.txt"
-checksum="d1146939d270f1f1eb8cbf8f5aa72ff37d897faccca448582bb1e180aeb4c6b2
+checksum="6901c8c0ffcf721f9ce270ad86da37bc2b4d32b8802d4a9cec38274898a64044
  589eec38f72df2be203711d3b8cbece9b908c5e7ff00bc3cab7f63bae9e366b4"
 
 post_install() {
diff --git a/srcpkgs/python-hypothesis/template b/srcpkgs/python-hypothesis/template
index 3b57658f872..f3eb931e410 100644
--- a/srcpkgs/python-hypothesis/template
+++ b/srcpkgs/python-hypothesis/template
@@ -1,6 +1,6 @@
 # Template file for 'python-hypothesis'
 pkgname=python-hypothesis
-version=4.24.2
+version=4.38.2
 revision=1
 archs=noarch
 wrksrc="hypothesis-hypothesis-python-${version}"
@@ -17,7 +17,7 @@ license="MPL-2.0"
 homepage="https://hypothesis.works/"
 changelog="https://github.com/HypothesisWorks/hypothesis/raw/master/hypothesis-python/docs/changes.rst"
 distfiles="https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-${version}.tar.gz"
-checksum=127f590504b10a7558b51e3e258e5f77c1a97f5708abd1296209132bc6c30e01
+checksum=c53b652ed15350b0116bc1dd28516a71988437da772e25903309aa526f9c719e
 
 do_check() {
 	# In python3 mock is actually unittest.mock
diff --git a/srcpkgs/python-iso-8601/template b/srcpkgs/python-iso-8601/template
new file mode 100644
index 00000000000..a483e55b0bd
--- /dev/null
+++ b/srcpkgs/python-iso-8601/template
@@ -0,0 +1,30 @@
+# Template file for 'python-iso-8601'
+pkgname=python-iso-8601
+version=0.3.0
+revision=1
+archs=noarch
+wrksrc="iso-8601-${version}"
+build_style=python-module
+pycompile_module="iso8601"
+hostmakedepends="python-setuptools python3-setuptools"
+depends="python"
+short_desc="Python2 library that provides cryptographic recipes and primitives"
+maintainer="Piotr Wójcik <chocimier@tlen.pl>"
+license="BSD-2-Clause"
+homepage="https://pypi.org/project/iso-8601/"
+distfiles="${PYPI_SITE}/i/iso-8601/iso-8601-${version}.tar.gz"
+checksum=1b9f74df591812732b69a1cfba5196e176138bf5b0b49a920af5804924cc27e0
+
+post_install() {
+	vlicense PKG-INFO
+}
+
+python3-iso-8601_package() {
+	depends="python3"
+	pycompile_module="iso8601"
+	short_desc="${short_desc/Python2/Python3}"
+	pkg_install() {
+		vmove usr/lib/python3*
+		vlicense PKG-INFO
+	}
+}
diff --git a/srcpkgs/python-iwlib/template b/srcpkgs/python-iwlib/template
index 4498bcf156c..2c58d4c8d29 100644
--- a/srcpkgs/python-iwlib/template
+++ b/srcpkgs/python-iwlib/template
@@ -1,6 +1,6 @@
 # Template file for 'python-iwlib'
 pkgname=python-iwlib
-version=1.6.1
+version=1.6.2
 revision=1
 wrksrc="${pkgname/python-//}-${version}"
 build_style=python-module
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/nathan-hoad/python-iwlib"
 distfiles="${PYPI_SITE}/i/iwlib/iwlib-${version}.tar.gz"
-checksum=fad120e7e36de1c84df6921333035cdaccd28b20e25ba180e9902e810e8dee21
+checksum=7496bcc3f7abb9b23071f83a86b4386fab41852d7ecc7aee05b6e42b832606f3
 nocross=https://build.voidlinux.org/builders/aarch64-musl_builder/builds/11458/steps/shell_3/logs/stdio
 
 do_check() {
diff --git a/srcpkgs/python-jedi/template b/srcpkgs/python-jedi/template
index 48ab3acabf5..136e6adbea4 100644
--- a/srcpkgs/python-jedi/template
+++ b/srcpkgs/python-jedi/template
@@ -1,21 +1,21 @@
 # Template file for 'python-jedi'
 pkgname=python-jedi
-version=0.14.0
+version=0.15.1
 revision=1
 archs=noarch
-_parsover=0.3.0
+_parsover=0.5.0
 wrksrc="jedi-${version}"
 build_style=python-module
 pycompile_module="jedi"
 hostmakedepends="python-setuptools python3-setuptools"
 depends="python-parso>=${_parsover}"
-checkdepends="python3-parso python3-pytest"
+checkdepends="python-parso python3-parso python-pytest python3-pytest"
 short_desc="Autocompletion/static analysis library for Python2"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="MIT"
 homepage="https://jedi.readthedocs.io/"
 distfiles="${PYPI_SITE}/j/jedi/jedi-${version}.tar.gz"
-checksum=49ccb782651bb6f7009810d17a3316f8867dde31654c750506970742e18b553d
+checksum=ba859c74fa3c966a22f2aeebe1b74ee27e2a462f56d3f5f7ca4a59af61bfe42e
 
 post_install() {
 	vlicense LICENSE.txt
diff --git a/srcpkgs/python-jsonschema/template b/srcpkgs/python-jsonschema/template
index 7c00f690fd3..63c30ce6863 100644
--- a/srcpkgs/python-jsonschema/template
+++ b/srcpkgs/python-jsonschema/template
@@ -1,7 +1,8 @@
 # Template file for 'python-jsonschema'
 pkgname=python-jsonschema
+reverts="3.0.2_1"
 version=2.6.0
-revision=2
+revision=3
 archs=noarch
 wrksrc="jsonschema-${version}"
 build_style=python-module
@@ -17,7 +18,7 @@ checksum=6ff5f3180870836cae40f06fa10419f557208175f13ad7bc26caa77beb1f6e02
 alternatives="jsonschema:jsonschema:/usr/bin/jsonschema2"
 
 pre_build() {
-	sed -i setup.py \
+	vsed -i setup.py \
 		-e '/setup_requires/d' \
 		-e '/vcversioner/d' \
 		-e "/name=/a\
diff --git a/srcpkgs/python-kaptan/template b/srcpkgs/python-kaptan/template
index d28a7dbad90..649eeec8568 100644
--- a/srcpkgs/python-kaptan/template
+++ b/srcpkgs/python-kaptan/template
@@ -1,6 +1,6 @@
 # Template file for 'python-kaptan'
 pkgname=python-kaptan
-version=0.5.11
+version=0.5.12
 revision=1
 archs=noarch
 wrksrc="kaptan-${version}"
@@ -13,7 +13,7 @@ maintainer="Alexander Egorenkov <egorenar-dev@posteo.net>"
 license="BSD-3-Clause"
 homepage="https://github.com/emre/kaptan"
 distfiles="${PYPI_SITE}/k/kaptan/kaptan-${version}.tar.gz"
-checksum=8403d6e48200c3f49cb6d6b3dcb5898aa5ab9d820831655bf9a2403e00cd4207
+checksum=@b0714c3c0c58006ca6d9fc5528d103685773ed22496d5dd582fbd7efe6a67c7a
 alternatives="kaptan:kaptan:/usr/bin/kaptan2"
 
 post_install() {
diff --git a/srcpkgs/python-lxml/template b/srcpkgs/python-lxml/template
index af3d5edbce4..c3aeabfbf1b 100644
--- a/srcpkgs/python-lxml/template
+++ b/srcpkgs/python-lxml/template
@@ -1,6 +1,6 @@
 # Template file for 'python-lxml'
 pkgname=python-lxml
-version=4.3.4
+version=4.4.1
 revision=1
 wrksrc="lxml-lxml-${version}"
 build_style=python-module
@@ -10,10 +10,10 @@ makedepends="libxslt-devel python-devel python3-devel"
 checkdepends="python3-cssselect python3-BeautifulSoup4 python3-html5lib"
 short_desc="Python2 binding for the libxml2 and libxslt libraries"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="BSD-3-Clause, ElementTree"
+license="BSD-3-Clause, custom:ElementTree"
 homepage="https://lxml.de/"
 distfiles="https://github.com/lxml/lxml/archive/lxml-${version}.tar.gz"
-checksum=d85812f0630af6c1f916253535fc315ff20c0b9879a15edff3ee750287f283aa
+checksum=a735879b25331bb0c8c115e8aff6250469241fbce98bba192142cd767ff23408
 
 do_check() {
 	cp -f build-3.*/lib.linux-*/lxml/*.so src/lxml
diff --git a/srcpkgs/python-magic/template b/srcpkgs/python-magic/template
index e38b77999a6..98e3c0802ab 100644
--- a/srcpkgs/python-magic/template
+++ b/srcpkgs/python-magic/template
@@ -8,7 +8,7 @@ pycompile_module="magic.py"
 hostmakedepends="python-setuptools python3-setuptools"
 makedepends="python libmagic"
 short_desc="File type identification using libmagic (Python2)"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/ahupp/python-magic"
 distfiles="https://github.com/ahupp/python-magic/archive/${version}.tar.gz"
diff --git a/srcpkgs/python-mechanize/template b/srcpkgs/python-mechanize/template
index 07dedb91df0..c5b2b5789a7 100644
--- a/srcpkgs/python-mechanize/template
+++ b/srcpkgs/python-mechanize/template
@@ -1,20 +1,31 @@
 # Template file for 'python-mechanize'
 pkgname=python-mechanize
-version=0.4.2
-revision=1
+version=0.4.3
+revision=2
 archs=noarch
 wrksrc="mechanize-${version}"
-build_style=python2-module
+build_style=python-module
 pycompile_module="mechanize"
-hostmakedepends="python-setuptools"
+hostmakedepends="python-setuptools python3-setuptools"
 depends="python python-html5lib"
-short_desc="Stateful programmatic web browsing in Python"
+short_desc="Stateful programmatic web browsing (Python2)"
 maintainer="Farhad Shahbazi <grauwolf@geekosphere.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/python-mechanize/mechanize"
 distfiles="https://github.com/python-mechanize/mechanize/archive/v${version}.tar.gz"
-checksum=c14a7899f34b2d8ecc0c5ec8ff26559dc39eba56668697f2e2b008e1cb82e183
+checksum=7c452a3eed7f83a13674027a58a4afe57ca67630d252a789ac1c15dcd55d310c
 
 post_install() {
 	vlicense LICENSE
 }
+
+python3-mechanize_package() {
+	archs=noarch
+	depends="python3 python3-html5lib"
+	pycompile_module="mechanize"
+	short_desc="${short_desc/Python2/Python3}"
+	pkg_install() {
+	vmove usr/lib/python3*
+	vlicense LICENSE
+	}
+}
diff --git a/srcpkgs/python-mock/template b/srcpkgs/python-mock/template
index 6c03a2134b2..95196de39df 100644
--- a/srcpkgs/python-mock/template
+++ b/srcpkgs/python-mock/template
@@ -1,7 +1,7 @@
 # Template file for 'python-mock'
 pkgname=python-mock
-version=2.0.0
-revision=3
+version=3.0.5
+revision=1
 archs=noarch
 wrksrc="${pkgname#*-}-${version}"
 build_style=python2-module
@@ -10,10 +10,10 @@ hostmakedepends="python-pbr python-setuptools"
 depends="python-funcsigs python-pbr python-setuptools python-six"
 short_desc="Rolling backport of unittest.mock for Python2"
 maintainer="Toyam Cox <Vaelatern@gmail.com>"
-homepage="https://github.com/testing-cabal/mock"
 license="BSD-2-Clause"
+homepage="https://github.com/testing-cabal/mock"
 distfiles="${PYPI_SITE}/m/mock/mock-${version}.tar.gz"
-checksum=b158b6df76edd239b8208d481dc46b6afd45a846b7812ff0ce58971cf5bc8bba
+checksum=83657d894c90d5681d62155c82bda9c1187827525880eda8ff5df4ec813437c3
 
 post_install() {
 	vlicense LICENSE.txt LICENSE
diff --git a/srcpkgs/python-nose/template b/srcpkgs/python-nose/template
index 874998f3c40..c9fbe9d28d3 100644
--- a/srcpkgs/python-nose/template
+++ b/srcpkgs/python-nose/template
@@ -9,7 +9,7 @@ pycompile_module="nose"
 hostmakedepends="python-setuptools python3-setuptools"
 depends="python-setuptools"
 short_desc="The nicer testing for Python2"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/nose-devs/nose"
 #changelog="https://raw.githubusercontent.com/nose-devs/nose/master/CHANGELOG"
diff --git a/srcpkgs/python-npyscreen/template b/srcpkgs/python-npyscreen/template
index b1c01d39f7b..0457fa1aaed 100644
--- a/srcpkgs/python-npyscreen/template
+++ b/srcpkgs/python-npyscreen/template
@@ -8,7 +8,7 @@ hostmakedepends="python-setuptools python3-setuptools"
 pycompile_module="npyscreen"
 depends="python"
 short_desc="Python2 widget library and application framework for TUIs"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/bad-day/npyscreen"
 distfiles="https://github.com/bad-day/npyscreen/archive/${version}.tar.gz"
diff --git a/srcpkgs/python-numexpr/template b/srcpkgs/python-numexpr/template
index d506e88ce7a..1db40092411 100644
--- a/srcpkgs/python-numexpr/template
+++ b/srcpkgs/python-numexpr/template
@@ -1,7 +1,7 @@
 # Template file for 'python-numexpr'
 pkgname=python-numexpr
-version=2.6.9
-revision=2
+version=2.7.0
+revision=1
 wrksrc="numexpr-${version}"
 build_style=python-module
 pycompile_module="numexpr"
@@ -10,10 +10,10 @@ makedepends="python-devel python3-devel python-numpy python3-numpy"
 depends="python-numpy"
 short_desc="Fast numerical expression evaluator for NumPy (Python2)"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/pydata/numexpr"
 license="MIT"
+homepage="https://github.com/pydata/numexpr"
 distfiles="${PYPI_SITE}/n/numexpr/numexpr-${version}.tar.gz"
-checksum=fc218b777cdbb14fa8cff8f28175ee631bacabbdd41ca34e061325b6c44a6fa6
+checksum=37324b5981b8962102bdc8640c4f05f5589da5d1df2702418783085cb78ca217
 
 post_install() {
 	vlicense LICENSE.txt
diff --git a/srcpkgs/python-numpy/template b/srcpkgs/python-numpy/template
index 05c348ba915..52308fd2aa6 100644
--- a/srcpkgs/python-numpy/template
+++ b/srcpkgs/python-numpy/template
@@ -1,6 +1,6 @@
 # Template file for 'python-numpy'
 pkgname=python-numpy
-version=1.16.4
+version=1.16.5
 revision=1
 wrksrc="numpy-${version}"
 build_style=python2-module
@@ -12,11 +12,9 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.numpy.org/"
 distfiles="https://github.com/numpy/numpy/archive/v${version}.tar.gz"
-checksum=3bdabda4a2ac4f1986b4bc55f865cd0b68b71edc9420b03e911e0ee52743e9c4
+checksum=3c82a9b8616e3096a79a2af9c288d8ed4013a10fc7baf3eaf54655309734dadd
 alternatives="numpy:f2py:/usr/bin/f2py2"
 
-nocross="https://build.voidlinux.org/builders/armv7l_builder/builds/1408/steps/shell_3/logs/stdio"
-
 post_install() {
 	# create compat symlinks for .h files
 	vmkdir ${py2_inc}
diff --git a/srcpkgs/python-oauthlib/template b/srcpkgs/python-oauthlib/template
index b010053b7ec..5bbaa7df29b 100644
--- a/srcpkgs/python-oauthlib/template
+++ b/srcpkgs/python-oauthlib/template
@@ -1,6 +1,6 @@
 # Template file for 'python-oauthlib'
 pkgname=python-oauthlib
-version=2.1.0
+version=3.1.0
 revision=1
 archs=noarch
 wrksrc="${pkgname#*-}-${version}"
@@ -8,12 +8,12 @@ build_style=python-module
 pycompile_module="oauthlib"
 hostmakedepends="python-setuptools python3-setuptools"
 depends="python"
-short_desc="Python2 implementation of the OAuth request-signing logic"
-maintainer="Eivind Uggedal <eivind@uggedal.com>"
+short_desc="Implementation of the OAuth request-signing logic (Python2)"
+maintainer="bra1nwave <brainwave@openmailbox.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/oauthlib/oauthlib"
 distfiles="${PYPI_SITE}/o/oauthlib/oauthlib-${version}.tar.gz"
-checksum=ac35665a61c1685c56336bda97d5eefa246f1202618a1d6f34fccb1bdd404162
+checksum=bee41cc35fcca6e988463cacc3bcb8a96224f470ca547e697b604cc697b2f889
 
 post_install() {
 	vlicense LICENSE
@@ -25,7 +25,7 @@ python3-oauthlib_package() {
 	pycompile_module="oauthlib"
 	short_desc="${short_desc/Python2/Python3}"
 	pkg_install() {
-		vmove usr/lib/python3*
+		vmove "usr/lib/python3*"
 		vlicense LICENSE
 	}
 }
diff --git a/srcpkgs/python-packaging/template b/srcpkgs/python-packaging/template
index ea71b02dc9b..505631bb29c 100644
--- a/srcpkgs/python-packaging/template
+++ b/srcpkgs/python-packaging/template
@@ -1,19 +1,19 @@
 # Template file for 'python-packaging'
 pkgname=python-packaging
-version=19.0
-revision=1
+version=19.1
+revision=2
 archs=noarch
 wrksrc="packaging-${version}"
 build_style=python-module
 pycompile_module="packaging"
 hostmakedepends="python-setuptools python3-setuptools"
-depends="python-parsing python-six"
+depends="python-attrs python-parsing python-six"
 short_desc="Core utilities for Python packages (Python2)"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="Apache-2.0, BSD-2-Clause"
 homepage="https://github.com/pypa/packaging"
 distfiles="${PYPI_SITE}/p/packaging/packaging-${version}.tar.gz"
-checksum=0c98a5d0be38ed775798ece1b9727178c4469d9c3b4ada66e8e6b7849f8732af
+checksum=c491ca87294da7cc01902edbe30a5bc6c4c28172b5138ab4e4aa1b9d7bfaeafe
 
 post_install() {
 	vlicense LICENSE
@@ -22,7 +22,7 @@ post_install() {
 python3-packaging_package() {
 	archs=noarch
 	pycompile_module="packaging"
-	depends="python3-parsing python3-six"
+	depends="python3-attrs python3-parsing python3-six"
 	short_desc="${short_desc/Python2/Python3}"
 	pkg_install() {
 		vmove usr/lib/python3*
diff --git a/srcpkgs/python-pafy b/srcpkgs/python-pafy
new file mode 120000
index 00000000000..4b7ea2937ae
--- /dev/null
+++ b/srcpkgs/python-pafy
@@ -0,0 +1 @@
+python3-pafy
\ No newline at end of file
diff --git a/srcpkgs/python-pafy/template b/srcpkgs/python-pafy/template
deleted file mode 100644
index 9e18d66c7e4..00000000000
--- a/srcpkgs/python-pafy/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'python-pafy'
-pkgname=python-pafy
-version=0.5.4
-revision=1
-archs=noarch
-wrksrc="pafy-${version}"
-build_style=python-module
-pycompile_module="pafy"
-hostmakedepends="python-setuptools python3-setuptools youtube-dl python3-youtube-dl"
-depends="youtube-dl"
-short_desc="Python2 library to download YouTube content and retrieve metadata"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-3"
-homepage="https://github.com/mps-youtube/pafy"
-distfiles="https://github.com/mps-youtube/pafy/archive/v${version}.tar.gz"
-checksum=a2f9fe7c6175264993190081e1558516b2f2b5987f13a581a55cd9d838df973b
-alternatives="pafy:ytdl:/usr/bin/ytdl2"
-
-python3-pafy_package() {
-	archs=noarch
-	pycompile_module="pafy"
-	depends="python3-youtube-dl"
-	short_desc="${short_desc/2/3/}"
-	alternatives="pafy:ytdl:/usr/bin/ytdl3"
-	pkg_install() {
-		vmove usr/bin/ytdl3
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python-pandas/template b/srcpkgs/python-pandas/template
index c9c68b6cb20..2150461ae59 100644
--- a/srcpkgs/python-pandas/template
+++ b/srcpkgs/python-pandas/template
@@ -1,13 +1,12 @@
 # Template file for 'python-pandas'
 pkgname=python-pandas
 version=0.24.2
-revision=1
+revision=2
 wrksrc="pandas-${version}"
-build_style=python-module
+build_style=python2-module
 pycompile_module="pandas"
-hostmakedepends="python-setuptools python3-setuptools python-Cython python3-Cython"
-makedepends="python-devel python3-devel python-numpy python3-numpy
- python-dateutil python3-dateutil python-pytz python3-pytz"
+hostmakedepends="python-setuptools python-Cython"
+makedepends="python-devel python-numpy python-dateutil python-pytz"
 depends="python-numpy python-dateutil python-pytz"
 short_desc="Python2 data analysis library"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
@@ -19,13 +18,3 @@ checksum=286787f06ac1b7bd322d04f9cf20e14ec3e0bd6b0ec9951456d8c53375545aa1
 post_install() {
 	vlicense LICENSE
 }
-
-python3-pandas_package() {
-	pycompile_module="pandas"
-	depends="python3-numpy python3-dateutil python3-pytz"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python-parsing/template b/srcpkgs/python-parsing/template
index 28160652c41..0cc744eaf79 100644
--- a/srcpkgs/python-parsing/template
+++ b/srcpkgs/python-parsing/template
@@ -1,6 +1,6 @@
 # Template file for 'python-parsing'
 pkgname=python-parsing
-version=2.3.1
+version=2.4.2
 revision=1
 archs=noarch
 wrksrc="pyparsing-pyparsing_${version}"
@@ -14,12 +14,7 @@ license="MIT"
 homepage="https://github.com/pyparsing/pyparsing"
 changelog="https://github.com/pyparsing/pyparsing/raw/master/CHANGES"
 distfiles="https://github.com/pyparsing/pyparsing/archive/pyparsing_${version}.tar.gz"
-checksum=6b4146fb3eb6c4f5798b9f1d67b9609efa106276ac875c534695e55a34409f07
-
-do_check() {
-	python2 unitTests.py
-	python3 unitTests.py
-}
+checksum=fc079f975968ae21f82223ae2340a39e7182ea993631812ddb5978619ed5c456
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python-parso/template b/srcpkgs/python-parso/template
index bb9ea981e32..20e5fe306c0 100644
--- a/srcpkgs/python-parso/template
+++ b/srcpkgs/python-parso/template
@@ -1,6 +1,6 @@
 # Template file for 'python-parso'
 pkgname=python-parso
-version=0.5.0
+version=0.5.1
 revision=1
 archs=noarch
 wrksrc="parso-${version}"
@@ -13,7 +13,7 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="MIT"
 homepage="https://github.com/davidhalter/parso"
 distfiles="${PYPI_SITE}/p/parso/parso-${version}.tar.gz"
-checksum=db5881df1643bf3e66c097bfd8935cf03eae73f4cb61ae4433c9ea4fb6613446
+checksum=666b0ee4a7a1220f65d367617f2cd3ffddff3e205f3f16a0284df30e774c2a9c
 
 post_install() {
 	vlicense LICENSE.txt
diff --git a/srcpkgs/python-pbr/template b/srcpkgs/python-pbr/template
index 5ea2d5e5b24..7ab0b39539f 100644
--- a/srcpkgs/python-pbr/template
+++ b/srcpkgs/python-pbr/template
@@ -1,6 +1,6 @@
 # Template file for 'python-pbr'
 pkgname=python-pbr
-version=5.1.3
+version=5.4.3
 revision=1
 archs=noarch
 wrksrc="pbr-${version}"
@@ -13,7 +13,7 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="Apache-2.0"
 homepage="https://docs.openstack.org/developer/pbr/"
 distfiles="${PYPI_SITE}/p/pbr/pbr-${version}.tar.gz"
-checksum=8c361cc353d988e4f5b998555c88098b9d5964c2e11acf7b0d21925a66bb5824
+checksum=2c8e420cd4ed4cec4e7999ee47409e876af575d4c35a45840d59e8b5f3155ab8
 alternatives="pbr:pbr:/usr/bin/pbr2"
 
 python3-pbr_package() {
diff --git a/srcpkgs/python-pdfrw/template b/srcpkgs/python-pdfrw/template
index 2aaababfc53..ddb43b928fc 100644
--- a/srcpkgs/python-pdfrw/template
+++ b/srcpkgs/python-pdfrw/template
@@ -10,7 +10,7 @@ pycompile_module="pdfrw"
 hostmakedepends="python-setuptools python3-setuptools"
 depends="python"
 short_desc="Pure Python2 library that reads and writes PDFs"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT, BSD-3-Clause"
 homepage="https://github.com/pmaupin/pdfrw"
 distfiles="${PYPI_SITE}/p/pdfrw/pdfrw-${version}.tar.gz"
diff --git a/srcpkgs/python-peewee/template b/srcpkgs/python-peewee/template
index 25a6a8befd0..9b07ed413b9 100644
--- a/srcpkgs/python-peewee/template
+++ b/srcpkgs/python-peewee/template
@@ -1,6 +1,6 @@
 # Template file for 'python-peewee'
 pkgname=python-peewee
-version=3.10.0
+version=3.11.2
 revision=1
 wrksrc="peewee-${version}"
 build_style=python-module
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://github.com/coleifer/peewee"
 changelog="https://raw.githubusercontent.com/coleifer/peewee/master/CHANGELOG.md"
 distfiles="https://github.com/coleifer/peewee/archive/${version}.tar.gz"
-checksum=d296cd2e8509b210a11e5b2a7e28b8ba52516fe22dc78f7062a8d2225c817bfd
+checksum=81e4297ab2482f356a21c5e4bc7a2cc8684f43cd9731b468f386a48d653a043e
 alternatives="peewee:pwiz:/usr/bin/pwiz.py2"
 
 post_install() {
diff --git a/srcpkgs/python-pex/template b/srcpkgs/python-pex/template
index 91b96f7bd36..4beafcf7b4b 100644
--- a/srcpkgs/python-pex/template
+++ b/srcpkgs/python-pex/template
@@ -1,6 +1,6 @@
 # Template file for 'python-pex'
 pkgname=python-pex
-version=1.6.8
+version=1.6.11
 revision=1
 archs=noarch
 wrksrc="pex-${version}"
@@ -13,7 +13,7 @@ maintainer="Daniel Santana <daniel@santana.tech>"
 license="Apache-2.0"
 homepage="https://github.com/pantsbuild/pex"
 distfiles="${PYPI_SITE}/p/pex/pex-${version}.tar.gz"
-checksum=727e8d3910037f5abc15d2846784fe8fbe4485fdeec6385732733772009b2bfe
+checksum=7379ae45179bec744063299305ad3e2e8cca98bd5928a8dcc440400c3838810c
 alternatives="
  pex:pex:/usr/bin/pex2
  pex:pex.1:/usr/share/man/man1/pex2.1"
diff --git a/srcpkgs/python-pexpect/template b/srcpkgs/python-pexpect/template
index 1b729da7274..8d03a1945f3 100644
--- a/srcpkgs/python-pexpect/template
+++ b/srcpkgs/python-pexpect/template
@@ -1,20 +1,20 @@
 # Template file for 'python-pexpect'
 pkgname=python-pexpect
-version=4.6.0
+version=4.7.0
 revision=1
 archs=noarch
-wrksrc="${pkgname/python-}-${version}"
+wrksrc="pexpect-${version}"
 build_style=python-module
+pycompile_module="pexpect"
 hostmakedepends="python-setuptools python3-setuptools"
 depends="python-ptyprocess"
 checkdepends="python3-pytest python3-ptyprocess mdocml"
-pycompile_module="pexpect"
 short_desc="Python2 module for spawning child applications and controlling them"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://pexpect.readthedocs.io/"
 license="ISC"
+homepage="https://pexpect.readthedocs.io/"
 distfiles="${PYPI_SITE}/p/pexpect/pexpect-${version}.tar.gz"
-checksum=2a8e88259839571d1251d278476f3eec5db26deb73a70be5ed5dc5435e418aba
+checksum=9e2c1fd0e6ee3a49b28f95d4b33bc389c89b20af6a1255906e90ff1262ce62eb
 
 do_check() {
 	# the mdcocml is for test
diff --git a/srcpkgs/python-pip/template b/srcpkgs/python-pip/template
index d9343158552..75f11561816 100644
--- a/srcpkgs/python-pip/template
+++ b/srcpkgs/python-pip/template
@@ -1,6 +1,6 @@
 # Template file for 'python-pip'
 pkgname=python-pip
-version=18.1
+version=19.2.3
 revision=1
 archs=noarch
 wrksrc="pip-${version}"
@@ -8,12 +8,12 @@ build_style=python-module
 pycompile_module="pip"
 hostmakedepends="python-setuptools python3-setuptools"
 depends="python-setuptools"
-short_desc="The PyPA recommended tool for installing PyPI packages (Python2)"
+short_desc="PyPA recommended tool for installing PyPI packages (Python2)"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://pip.pypa.io/"
 license="MIT"
+homepage="https://pip.pypa.io/"
 distfiles="${PYPI_SITE}/p/pip/pip-${version}.tar.gz"
-checksum=c0a292bd977ef590379a3f05d7b7f65135487b67470f6281289a94e015650ea1
+checksum=e7a31f147974362e6c82d84b91c7f2bdf57e4d3163d3d454e6c3e71944d67135
 alternatives="pip:pip:/usr/bin/pip2"
 
 post_install() {
diff --git a/srcpkgs/python-prctl/template b/srcpkgs/python-prctl/template
index 60f8a6e5f20..2b420d655cf 100644
--- a/srcpkgs/python-prctl/template
+++ b/srcpkgs/python-prctl/template
@@ -7,7 +7,7 @@ pycompile_module="prctl.py"
 hostmakedepends="python-setuptools python3-setuptools libcap-devel"
 makedepends="libcap-devel python-devel python3-devel"
 short_desc="Python2 interface for the Linux prctl syscall"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/seveas/python-prctl"
 distfiles="https://github.com/seveas/python-prctl/archive/v${version}.tar.gz"
diff --git a/srcpkgs/python-pretend/template b/srcpkgs/python-pretend/template
new file mode 100644
index 00000000000..9a647271b57
--- /dev/null
+++ b/srcpkgs/python-pretend/template
@@ -0,0 +1,32 @@
+# Template file for 'python-pretend'
+pkgname=python-pretend
+version=1.0.9
+revision=1
+archs=noarch
+wrksrc="pretend-${version}"
+build_style=python-module
+pycompile_module="pretend"
+hostmakedepends="python-setuptools python3-setuptools"
+depends="python"
+short_desc="Make stubbing with Python2 easier"
+maintainer="Piotr Wójcik <chocimier@tlen.pl>"
+license="BSD-3-Clause"
+homepage="https://github.com/alex/pretend"
+distfiles="${PYPI_SITE}/p/pretend/pretend-${version}.tar.gz"
+checksum=c90eb810cde8ebb06dafcb8796f9a95228ce796531bc806e794c2f4649aa1b10
+
+post_install() {
+	vdoc README.rst
+	vlicense LICENSE.rst
+}
+
+python3-pretend_package() {
+	depends="python3"
+	pycompile_module="pretend"
+	short_desc="${short_desc/Python2/Python3}"
+	pkg_install() {
+		vmove usr/lib/python3*
+		vdoc README.rst
+		vlicense LICENSE.rst
+	}
+}
diff --git a/srcpkgs/python-prometheus_client/template b/srcpkgs/python-prometheus_client/template
index 699b253e253..46df561f7d4 100644
--- a/srcpkgs/python-prometheus_client/template
+++ b/srcpkgs/python-prometheus_client/template
@@ -1,6 +1,6 @@
 # Template file for 'python-prometheus_client'
 pkgname=python-prometheus_client
-version=0.6.0
+version=0.7.1
 revision=1
 archs=noarch
 wrksrc="prometheus_client-${version}"
@@ -13,7 +13,7 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/prometheus/client_python"
 distfiles="${PYPI_SITE}/p/prometheus_client/prometheus_client-${version}.tar.gz"
-checksum=1b38b958750f66f208bcd9ab92a633c0c994d8859c831f7abc1f46724fcee490
+checksum=71cd24a2b3eb335cb800c7159f423df1bd4dcd5171b234be15e3f31ec9f622da
 
 python3-prometheus_client_package() {
 	archs=noarch
diff --git a/srcpkgs/python-psycopg2/template b/srcpkgs/python-psycopg2/template
index c34c75df913..f41de2880e6 100644
--- a/srcpkgs/python-psycopg2/template
+++ b/srcpkgs/python-psycopg2/template
@@ -1,6 +1,6 @@
 # Template file for 'python-psycopg2'
 pkgname=python-psycopg2
-version=2.8.2
+version=2.8.3
 revision=1
 wrksrc="psycopg2-${version}"
 build_style=python-module
@@ -14,7 +14,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="LGPL-3.0-or-later"
 homepage="http://initd.org/psycopg"
 distfiles="${PYPI_SITE}/p/psycopg2/psycopg2-${version}.tar.gz"
-checksum=5cacf21b6f813c239f100ef78a4132056f93a5940219ec25d2ef833cbeb05588
+checksum=897a6e838319b4bf648a574afb6cabcb17d0488f8c7195100d48d872419f4457
 
 python3-psycopg2_package() {
 	pycompile_module="psycopg2"
diff --git a/srcpkgs/python-pycryptodome/template b/srcpkgs/python-pycryptodome/template
index 0cfabd650a7..f01b5731c45 100644
--- a/srcpkgs/python-pycryptodome/template
+++ b/srcpkgs/python-pycryptodome/template
@@ -1,6 +1,6 @@
 # Template file for 'python-pycryptodome'
 pkgname=python-pycryptodome
-version=3.8.2
+version=3.9.0
 revision=1
 wrksrc="pycryptodome-${version}"
 build_style=python-module
@@ -12,7 +12,7 @@ maintainer="Wietse Kuipers <wietse@kuiprs.nl>"
 license="Public Domain, BSD-2-Clause"
 homepage="https://www.pycryptodome.org/"
 distfiles="${PYPI_SITE}/p/pycryptodome/pycryptodome-${version}.tar.gz"
-checksum=5bc40f8aa7ba8ca7f833ad2477b9d84e1bfd2630b22a46d9bbd221982f8c3ac0
+checksum=dbeb08ad850056747aa7d5f33273b7ce0b9a77910604a1be7b7a6f2ef076213f
 
 provides="python-crypto-${version}_1"
 replaces="python-crypto>=0"
diff --git a/srcpkgs/python-pyglet/template b/srcpkgs/python-pyglet/template
index ee1606d9ba0..f8315bdf616 100644
--- a/srcpkgs/python-pyglet/template
+++ b/srcpkgs/python-pyglet/template
@@ -1,19 +1,19 @@
 # Template file for 'python-pyglet'
 pkgname=python-pyglet
-version=1.3.2
+version=1.4.4
 revision=1
 archs=noarch
 wrksrc="pyglet-${version}"
 build_style=python-module
 pycompile_module="pyglet"
-hostmakedepends="python-setuptools python3-setuptools"
+hostmakedepends="python-setuptools python3-setuptools unzip"
 depends="python"
 short_desc="Cross-platform windowing and multimedia library for Python2"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.pyglet.org"
-distfiles="${PYPI_SITE}/p/pyglet/pyglet-${version}.tar.gz"
-checksum=b00570e7cdf6971af8953b6ece50d83d13272afa5d1f1197c58c0f478dd17743
+distfiles="${PYPI_SITE}/p/pyglet/pyglet-${version}.zip"
+checksum=08353c549b7f26d5815cc2e9360a85e4e0d80e6a67962e18df0255b00cb529ab
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python-pyotp/template b/srcpkgs/python-pyotp/template
index d20586a94b8..54714ee2ebb 100644
--- a/srcpkgs/python-pyotp/template
+++ b/srcpkgs/python-pyotp/template
@@ -1,6 +1,6 @@
 # Template file for 'python-pyotp'
 pkgname=python-pyotp
-version=2.2.7
+version=2.3.0
 revision=1
 archs=noarch
 wrksrc="pyotp-${version}"
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/pyotp/pyotp"
 distfiles="${PYPI_SITE}/p/pyotp/pyotp-${version}.tar.gz"
-checksum=be0ffeabddaa5ee53e7204e7740da842d070cf69168247a3d0c08541b84de602
+checksum=fc537e8acd985c5cbf51e11b7d53c42276fee017a73aec7c07380695671ca1a1
 
 do_check() {
 	python2 -B setup.py test
diff --git a/srcpkgs/python-pytz/template b/srcpkgs/python-pytz/template
index d0e90b5c9d0..d6becf829a7 100644
--- a/srcpkgs/python-pytz/template
+++ b/srcpkgs/python-pytz/template
@@ -1,6 +1,6 @@
 # Template file for 'python-pytz'
 pkgname=python-pytz
-version=2019.1
+version=2019.3
 revision=1
 archs=noarch
 wrksrc="pytz-${version}"
@@ -13,7 +13,7 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="MIT"
 homepage="https://pythonhosted.org/pytz/"
 distfiles="${PYPI_SITE}/p/pytz/pytz-${version}.tar.gz"
-checksum=d747dd3d23d77ef44c6a3526e274af6efeb0a6f1afd5a69ba4d5be4098c8e141
+checksum=b02c06db6cf09c12dd25137e563b31700d3b80fcc4ad23abb7a315f2789819be
 
 post_install() {
 	# use system tz database
diff --git a/srcpkgs/python-rarfile/template b/srcpkgs/python-rarfile/template
index 7505d303395..e0c597c1fb1 100644
--- a/srcpkgs/python-rarfile/template
+++ b/srcpkgs/python-rarfile/template
@@ -1,6 +1,6 @@
 # Template file for 'python-rarfile'
 pkgname=python-rarfile
-version=3.0
+version=3.1
 revision=1
 archs=noarch
 wrksrc="rarfile-${version}"
@@ -13,7 +13,7 @@ maintainer="Daniel Santana <daniel@santana.tech>"
 license="ISC"
 homepage="https://github.com/markokr/rarfile"
 distfiles="${PYPI_SITE}/r/rarfile/rarfile-${version}.tar.gz"
-checksum=e816409e3b36794507cbe0b678bed3e4703d7412c5f7f9201a510ed6fdc66c35
+checksum=dc1062176c529f417522af7da1291a35b85c8017464e665aabce048cfe2659b6
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python-rebulk/template b/srcpkgs/python-rebulk/template
index 51cfd5ff952..1cf6cf623c8 100644
--- a/srcpkgs/python-rebulk/template
+++ b/srcpkgs/python-rebulk/template
@@ -1,6 +1,6 @@
 # Template file for 'python-rebulk'
 pkgname=python-rebulk
-version=1.0.0
+version=2.0.0
 revision=1
 archs=noarch
 wrksrc="rebulk-${version}"
@@ -13,7 +13,7 @@ maintainer="Daniel Santana <daniel@santana.tech>"
 license="MIT"
 homepage="https://github.com/Toilal/rebulk"
 distfiles="${PYPI_SITE}/r/rebulk/rebulk-${version}.tar.gz"
-checksum=1d49e4f7ef6fb874e60efccacbbe661092fabdb7770cdf7f7de4516d50535998
+checksum=1b0d526859ef3e8647f37c606d7ae7c32259e370b3f1519e4219a3ba72740aec
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python-regex/template b/srcpkgs/python-regex/template
index 7036a927150..33e99b0127b 100644
--- a/srcpkgs/python-regex/template
+++ b/srcpkgs/python-regex/template
@@ -1,15 +1,35 @@
 # Template file for 'python-regex'
 pkgname=python-regex
-version=2019.04.14
+version=2019.08.19
 revision=1
 wrksrc="regex-${version}"
-build_style=python2-module
+build_style=python-module
 pycompile_module="_regex_core.py regex.py test_regex.py"
 hostmakedepends="python-devel python3-devel"
 makedepends="python-devel python3-devel"
 short_desc="Alternative regular expression module (Python2)"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="PSF"
+license="Python-2.0"
 homepage="https://pypi.org/project/regex/"
 distfiles="${PYPI_SITE}/r/regex/regex-${version}.tar.gz"
-checksum=d56ce4c7b1a189094b9bee3b81c4aeb3f1ba3e375e91627ec8561b6ab483d0a8
+checksum=587b62d48ca359d2d4f02d486f1f0aa9a20fbaf23a9d4198c4bed72ab2f6c849
+
+post_install() {
+	local i
+	for i in docs/*.* ; do
+		vdoc $i
+	done
+}
+
+python3-regex_package() {
+	depends="python3"
+	pycompile_module="_regex_core.py regex.py test_regex.py"
+	short_desc="${short_desc/Python2/Python3}"
+	pkg_install() {
+	vmove usr/lib/python3*
+	local i
+	for i in docs/*.* ; do
+		vdoc $i
+	done
+	}
+}
diff --git a/srcpkgs/python-requests-oauthlib/template b/srcpkgs/python-requests-oauthlib/template
index 6b12e84f152..b011ea17a36 100644
--- a/srcpkgs/python-requests-oauthlib/template
+++ b/srcpkgs/python-requests-oauthlib/template
@@ -1,6 +1,6 @@
 # Template file for 'python-requests-oauthlib'
 pkgname=python-requests-oauthlib
-version=1.1.0
+version=1.2.0
 revision=1
 archs=noarch
 wrksrc="${pkgname#*-}-${version}"
@@ -9,11 +9,11 @@ pycompile_module="requests_oauthlib"
 hostmakedepends="python-setuptools python3-setuptools"
 depends="python-requests python-oauthlib"
 short_desc="OAuthlib authentication support for Requests (Python2)"
-maintainer="Eivind Uggedal <eivind@uggedal.com>"
+maintainer="bra1nwave <brainwave@openmailbox.org>"
 license="ISC"
 homepage="https://github.com/requests/requests-oauthlib"
 distfiles="${PYPI_SITE}/r/requests-oauthlib/requests-oauthlib-${version}.tar.gz"
-checksum=eabd8eb700ebed81ba080c6ead96d39d6bdc39996094bd23000204f6965786b0
+checksum=bd6533330e8748e94bf0b214775fed487d309b8b8fe823dc45641ebcd9a32f57
 
 post_install() {
 	vlicense LICENSE
@@ -25,7 +25,7 @@ python3-requests-oauthlib_package() {
 	pycompile_module="requests_oauthlib"
 	short_desc="${short_desc/Python2/Python3}"
 	pkg_install() {
-		vmove usr/lib/python3*
+		vmove "usr/lib/python3*"
 		vlicense LICENSE
 	}
 }
diff --git a/srcpkgs/python-requests/template b/srcpkgs/python-requests/template
index c3446cdd356..fc806b611e9 100644
--- a/srcpkgs/python-requests/template
+++ b/srcpkgs/python-requests/template
@@ -1,6 +1,6 @@
 # Template file for 'python-requests'
 pkgname=python-requests
-version=2.21.0
+version=2.22.0
 revision=1
 archs=noarch
 wrksrc="requests-${version}"
@@ -10,13 +10,13 @@ hostmakedepends="python-setuptools python3-setuptools"
 depends="ca-certificates python-chardet python-urllib3 python-idna"
 short_desc="Python2 HTTP library for human beings"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="http://python-requests.org/"
 license="Apache-2.0"
+homepage="http://python-requests.org/"
 distfiles="${PYPI_SITE}/r/requests/requests-${version}.tar.gz"
-checksum=502a824f31acdacb3a35b6690b5fbf0bc41d63a24a45c4004352b0242707598e
+checksum=11e007a8a2aa0323f5a921e9e6a2d7e4e67d9877e85773fba9ba6419025cbeb4
 
 pre_build() {
-	sed -i '/certifi/d' setup.py
+	vsed -i '/certifi/d' setup.py
 }
 
 python3-requests_package() {
diff --git a/srcpkgs/python-rfc6555/template b/srcpkgs/python-rfc6555/template
new file mode 100644
index 00000000000..c3babc25b93
--- /dev/null
+++ b/srcpkgs/python-rfc6555/template
@@ -0,0 +1,25 @@
+# Template file for 'python-rfc6555'
+pkgname=python-rfc6555
+version=0.0.0
+revision=1
+archs=noarch
+wrksrc="rfc6555-${version}"
+build_style=python-module
+pycompile_module="rfc6555"
+hostmakedepends="python-setuptools python3-setuptools"
+depends="python-selectors2"
+short_desc="Python2 implementation of the Happy Eyeballs Algorithm"
+maintainer="Peter Bui <pbui@github.bx612.space>"
+license="Apache-2.0"
+homepage="https://github.com/sethmlarson/rfc6555"
+distfiles="${PYPI_SITE}/r/rfc6555/rfc6555-${version}.tar.gz"
+checksum=191cbba0315b53654155321e56a93466f42cd0a474b4f341df4d03264dcb5217
+
+python3-rfc6555_package() {
+	archs=noarch
+	pycompile_module="rfc6555"
+	short_desc="${short_desc/Python2/Python3}"
+	pkg_install() {
+		vmove usr/lib/python3*
+	}
+}
diff --git a/srcpkgs/python-s3transfer/template b/srcpkgs/python-s3transfer/template
index 0072389ca26..e306c3c3b1a 100644
--- a/srcpkgs/python-s3transfer/template
+++ b/srcpkgs/python-s3transfer/template
@@ -1,6 +1,6 @@
 # Template file for 'python-s3transfer'
 pkgname=python-s3transfer
-version=0.2.0
+version=0.2.1
 revision=1
 archs=noarch
 wrksrc="s3transfer-${version}"
@@ -13,11 +13,7 @@ maintainer="Robert Lowry <bobertlo@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/boto/s3transfer"
 distfiles="https://github.com/boto/s3transfer/archive/${version}.tar.gz"
-checksum=fe96e25f89f405e22a0283df8eefe1b0d2c998eab01c6c8f39923e16faf78522
-
-post_install() {
-	vlicense LICENSE.txt
-}
+checksum=4181e0cf31d1ff1c8233ddda7cc7efa5dd0cf9a1e47143b951a3389ff6812660
 
 python3-s3transfer_package() {
 	archs=noarch
@@ -26,6 +22,5 @@ python3-s3transfer_package() {
 	short_desc="${short_desc/Python2/Python3}"
 	pkg_install() {
 		vmove "usr/lib/python3*"
-		vlicense LICENSE.txt
 	}
 }
diff --git a/srcpkgs/python-scikit-learn/template b/srcpkgs/python-scikit-learn/template
deleted file mode 100644
index 88d794612d7..00000000000
--- a/srcpkgs/python-scikit-learn/template
+++ /dev/null
@@ -1,30 +0,0 @@
-# Template file for 'python-scikit-learn'
-pkgname=python-scikit-learn
-version=0.20.2
-revision=2
-wrksrc="scikit-learn-${version}"
-build_style=python-module
-pycompile_module="sklearn"
-hostmakedepends="python-setuptools python3-setuptools python-Cython python3-Cython"
-makedepends="python-devel python3-devel python-scipy python3-scipy"
-depends="python-scipy"
-short_desc="Python2 modules for machine learning and data mining"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://scikit-learn.org/"
-license="BSD-3-Clause"
-distfiles="https://github.com/scikit-learn/scikit-learn/archive/${version}.tar.gz"
-checksum=a5df291430f7b2d4e1b0d95680d49f170f28e37cf6594c0b7fc5e4f17330d0b0
-
-post_install() {
-	vlicense COPYING
-}
-
-python3-scikit-learn_package() {
-	depends="python3-scipy"
-	pycompile_module="sklearn"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense COPYING
-	}
-}
diff --git a/srcpkgs/python-scipy/template b/srcpkgs/python-scipy/template
deleted file mode 100644
index adbc6de4d52..00000000000
--- a/srcpkgs/python-scipy/template
+++ /dev/null
@@ -1,33 +0,0 @@
-# Template file for 'python-scipy'
-pkgname=python-scipy
-version=1.2.2
-revision=1
-wrksrc="scipy-${version}"
-build_style=python-module
-pycompile_module="scipy"
-hostmakedepends="python-setuptools python3-setuptools
- python-Cython python3-Cython gcc-fortran"
-makedepends="python-devel python3-devel python-numpy python3-numpy lapack-devel"
-depends="python-numpy"
-short_desc="Scientific library for Python2"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://scipy.org/scipylib/"
-license="BSD-3-Clause"
-distfiles="https://github.com/scipy/scipy/archive/v${version}.tar.gz"
-checksum=bc8c1364b365e741a9ba5ed67496eacc8565c67d1e0b82be0f203384f05d8026
-
-LDFLAGS="-shared"
-
-post_install() {
-	vlicense LICENSE.txt
-}
-
-python3-scipy_package() {
-	pycompile_module="scipy"
-	depends="python3-numpy"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE.txt
-	}
-}
diff --git a/srcpkgs/python-setuptools/template b/srcpkgs/python-setuptools/template
index 59f10e20c64..382a9b45bcd 100644
--- a/srcpkgs/python-setuptools/template
+++ b/srcpkgs/python-setuptools/template
@@ -1,22 +1,22 @@
 # Template file for 'python-setuptools'
 pkgname=python-setuptools
-version=40.6.3
+version=41.2.0
 revision=2
 archs=noarch
 wrksrc="setuptools-${version}"
 build_style=python-module
+pycompile_module="pkg_resources setuptools easy_install.py"
 hostmakedepends="unzip python-devel python3-devel"
 depends="python"
-pycompile_module="pkg_resources setuptools easy_install.py"
-provides="python-distribute-${version}_1"
-replaces="python-distribute>=0"
 short_desc="Easily build and distribute Python2 packages"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/pypa/setuptools"
 license="MIT"
+homepage="https://github.com/pypa/setuptools"
 distfiles="${PYPI_SITE}/s/setuptools/setuptools-${version}.zip"
-checksum=3b474dad69c49f0d2d86696b68105f3a6f195f7ab655af12ef9a9c326d2b08f8
+checksum=66b86bbae7cc7ac2e867f52dc08a6bd064d938bac59dfec71b9b565dd36d6012
 alternatives="setuptools:easy_install:/usr/bin/easy_install2"
+provides="python-distribute-${version}_1"
+replaces="python-distribute>=0"
 
 export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0
 export SETUPTOOLS_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
diff --git a/srcpkgs/python-snappy/template b/srcpkgs/python-snappy/template
index 7a27e7e4bb0..ac386f64fae 100644
--- a/srcpkgs/python-snappy/template
+++ b/srcpkgs/python-snappy/template
@@ -7,7 +7,7 @@ pycompile_module="snappy"
 hostmakedepends="python-setuptools python3-setuptools"
 makedepends="python-devel python3-devel snappy-devel"
 short_desc="Python2 bindings for the snappy compression library from Google"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/andrix/python-snappy"
 distfiles="${PYPI_SITE}/p/${pkgname}/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/python-soupsieve/template b/srcpkgs/python-soupsieve/template
index cc1e5eea884..586553ca759 100644
--- a/srcpkgs/python-soupsieve/template
+++ b/srcpkgs/python-soupsieve/template
@@ -1,6 +1,6 @@
 # Template file for 'python-soupsieve'
 pkgname=python-soupsieve
-version=1.9.3
+version=1.9.4
 revision=1
 archs=noarch
 wrksrc="soupsieve-${version}"
@@ -15,7 +15,7 @@ maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"
 license="MIT"
 homepage="https://facelessuser.github.io/soupsieve/"
 distfiles="${PYPI_SITE}/s/soupsieve/soupsieve-${version}.tar.gz"
-checksum=8662843366b8d8779dec4e2f921bebec9afd856a5ff2e82cd419acc5054a1a92
+checksum=605f89ad5fdbfefe30cdc293303665eff2d188865d4dbe4eb510bba1edfbfce3
 
 do_check() {
 	PY2PATH="${PWD}/build-2.7/lib"
diff --git a/srcpkgs/python-tmuxp/template b/srcpkgs/python-tmuxp/template
index 671d243a749..00c86730cbe 100644
--- a/srcpkgs/python-tmuxp/template
+++ b/srcpkgs/python-tmuxp/template
@@ -1,6 +1,6 @@
 # Template file for 'python-tmuxp'
 pkgname=python-tmuxp
-version=1.5.1
+version=1.5.3
 revision=1
 archs=noarch
 wrksrc="tmuxp-${version}"
@@ -13,7 +13,7 @@ maintainer="Alexander Egorenkov <egorenar-dev@posteo.net>"
 license="MIT"
 homepage="https://github.com/tmux-python/tmuxp/"
 distfiles="${PYPI_SITE}/t/tmuxp/tmuxp-${version}.tar.gz"
-checksum=0a8bb0d65d9a816f0f4ac9617904596f65865093fd13118e2b5a856f48ac52e8
+checksum=c1092d55d946e9635f19e4e46050cbe0785b7012545102eddf4d0c3872c1b66f
 alternatives="tmuxp:tmuxp:/usr/bin/tmuxp2"
 
 pre_configure() {
diff --git a/srcpkgs/python-tornado/template b/srcpkgs/python-tornado/template
index e4c8c9e0b5d..7e5700177f5 100644
--- a/srcpkgs/python-tornado/template
+++ b/srcpkgs/python-tornado/template
@@ -1,7 +1,7 @@
 # Template file for 'python-tornado'
 pkgname=python-tornado
-version=4.5.3
-revision=2
+version=5.1.1
+revision=1
 wrksrc="tornado-${version}"
 build_style=python-module
 pycompile_module="tornado"
@@ -10,10 +10,10 @@ makedepends="python-devel python3-devel"
 depends="ca-certificates python-singledispatch python-backports_abc"
 short_desc="Python2 web framework and asynchronous networking library"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="http://www.tornadoweb.org/"
 license="Apache-2.0"
+homepage="http://www.tornadoweb.org/"
 distfiles="${PYPI_SITE}/t/tornado/tornado-${version}.tar.gz"
-checksum=6d14e47eab0e15799cf3cdcc86b0b98279da68522caace2bd7ce644287685f0a
+checksum=4e5158d97583502a7e2739951553cbd88a72076f152b4b11b64b9a10c4c49409
 
 pre_build() {
 	# use system ca-certificates
diff --git a/srcpkgs/python-tqdm/template b/srcpkgs/python-tqdm/template
index b7e39daf2b5..69369bfd6b9 100644
--- a/srcpkgs/python-tqdm/template
+++ b/srcpkgs/python-tqdm/template
@@ -1,6 +1,6 @@
 # Template file for 'python-tqdm'
 pkgname=python-tqdm
-version=4.33.0
+version=4.36.1
 revision=1
 archs=noarch
 wrksrc="tqdm-${version}"
@@ -13,7 +13,7 @@ maintainer="bra1nwave <brainwave@openmailbox.org>"
 license="MPL-2.0, MIT"
 homepage="https://tqdm.github.io/"
 distfiles="https://github.com/tqdm/tqdm/archive/v${version}.tar.gz"
-checksum=d496966b62045c8ec0461acb69a63280fc22dfb155ec39deb21f0ed19b77297c
+checksum=b34944a6c554932527dfe58473cd143f1672e3e5592274948ec035b31f437018
 alternatives="
  tqdm:tqdm:/usr/bin/tqdm2
  tqdm:tqdm.1:/usr/share/man/man1/tqdm2.1"
diff --git a/srcpkgs/python-traitlets/template b/srcpkgs/python-traitlets/template
index f9c7a42ed7a..d2d1b85edb6 100644
--- a/srcpkgs/python-traitlets/template
+++ b/srcpkgs/python-traitlets/template
@@ -1,19 +1,19 @@
 # Template file for 'python-traitlets'
 pkgname=python-traitlets
-version=4.3.2
-revision=2
+version=4.3.3
+revision=1
 archs=noarch
 wrksrc="traitlets-${version}"
 build_style=python-module
+pycompile_module="traitlets"
 hostmakedepends="python-setuptools python3-setuptools"
 depends="python-decorator python-ipython_genutils python-six python-enum34"
-pycompile_module="traitlets"
 short_desc="Configuration system for Python2 applications"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="BSD-3-Clause"
 homepage="https://github.com/ipython/traitlets"
-license="3-clause-BSD"
 distfiles="${PYPI_SITE}/t/traitlets/traitlets-${version}.tar.gz"
-checksum=9c4bd2d267b7153df9152698efb1050a5d84982d3384a37b2c1f7723ba3e7835
+checksum=d023ee369ddd2763310e4c3eae1ff649689440d4ae59d7485eb4cfbbe3e359f7
 
 post_install() {
 	vlicense COPYING.md LICENSE
diff --git a/srcpkgs/python-tweepy/template b/srcpkgs/python-tweepy/template
index a819ecb2d6f..ef61039dac5 100644
--- a/srcpkgs/python-tweepy/template
+++ b/srcpkgs/python-tweepy/template
@@ -9,7 +9,7 @@ pycompile_module="tweepy"
 hostmakedepends="python-setuptools python3-setuptools"
 depends="python-requests-oauthlib python-six python-pysocks"
 short_desc="Twitter library for Python2"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/tweepy/tweepy"
 distfiles="${PYPI_SITE}/t/tweepy/tweepy-${version}.tar.gz
diff --git a/srcpkgs/python-urllib3/template b/srcpkgs/python-urllib3/template
index ef3e3e30e2a..8056518c9c1 100644
--- a/srcpkgs/python-urllib3/template
+++ b/srcpkgs/python-urllib3/template
@@ -1,6 +1,6 @@
 # Template file for 'python-urllib3'
 pkgname=python-urllib3
-version=1.24.3
+version=1.25.3
 revision=1
 archs=noarch
 wrksrc="urllib3-${version}"
@@ -13,7 +13,7 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="MIT"
 homepage="https://urllib3.readthedocs.io/"
 distfiles="${PYPI_SITE}/u/urllib3/urllib3-${version}.tar.gz"
-checksum=2393a695cd12afedd0dcb26fe5d50d0cf248e5a66f75dbd89a3d4eb333a61af4
+checksum=dbe59173209418ae49d485b87d1681aefa36252ee85884c31346debd19463232
 
 post_install() {
 	# replace bundled copy of six
diff --git a/srcpkgs/python-virtualenv/template b/srcpkgs/python-virtualenv/template
index c0257df5d89..1f9166e79a2 100644
--- a/srcpkgs/python-virtualenv/template
+++ b/srcpkgs/python-virtualenv/template
@@ -1,6 +1,6 @@
 # Template file for 'python-virtualenv'
 pkgname=python-virtualenv
-version=16.1.0
+version=16.7.5
 revision=1
 archs=noarch
 wrksrc="virtualenv-${version}"
@@ -10,10 +10,10 @@ hostmakedepends="python-setuptools python3-setuptools"
 depends="python-setuptools"
 short_desc="Virtual Python2 environment builder"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://virtualenv.pypa.io/"
 license="MIT"
+homepage="https://virtualenv.pypa.io/"
 distfiles="${PYPI_SITE}/v/virtualenv/virtualenv-${version}.tar.gz"
-checksum=f899fafcd92e1150f40c8215328be38ff24b519cd95357fa6e78e006c7638208
+checksum=f78d81b62d3147396ac33fc9d77579ddc42cc2a98dd9ea38886f616b33bc7fb2
 alternatives="virtualenv:virtualenv:/usr/bin/virtualenv2"
 
 post_install() {
diff --git a/srcpkgs/python-vispy/template b/srcpkgs/python-vispy/template
index 19ecb746f03..b757e5a271f 100644
--- a/srcpkgs/python-vispy/template
+++ b/srcpkgs/python-vispy/template
@@ -1,19 +1,19 @@
 # Template file for 'python-vispy'
 pkgname=python-vispy
-version=0.5.3
+version=0.6.1
 revision=1
-archs=noarch
-pycompile_module="vispy"
-build_style=python-module
 wrksrc="vispy-${version}"
+build_style=python-module
+pycompile_module="vispy"
 hostmakedepends="python-setuptools python3-setuptools"
+makedepends="python3-numpy python-numpy python-Cython python3-Cython python-devel python3-devel"
 depends="python-numpy"
 short_desc="Python2 library for interactive scientific visualization"
 maintainer="johannes <johannes.brechtmann@gmail.com>"
 license="BSD-3-Clause"
 homepage="http://vispy.org"
 distfiles="${PYPI_SITE}/v/vispy/vispy-${version}.tar.gz"
-checksum=f6c36408df851b91322c928aadb2c8aaf3b31150e11f723784cc81b6280fdcc0
+checksum=8f4cf863a1c6142338d06cf3f824e75373dd45a4ce9a9a133e1c36b662f49aa1
 
 post_install() {
 	vlicense LICENSE.txt
diff --git a/srcpkgs/python-xmltodict/template b/srcpkgs/python-xmltodict/template
index 5be3122a765..a48e6d46aa6 100644
--- a/srcpkgs/python-xmltodict/template
+++ b/srcpkgs/python-xmltodict/template
@@ -10,7 +10,7 @@ hostmakedepends="python-setuptools python3-setuptools"
 depends="python"
 checkdepends="python3-nose"
 short_desc="Python2 module that makes working with XML feel like working JSON"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/martinblech/xmltodict"
 distfiles="${PYPI_SITE}/x/xmltodict/xmltodict-${version}.tar.gz"
diff --git a/srcpkgs/python-yaml/template b/srcpkgs/python-yaml/template
index 2f776a6f800..8a7caf1d99e 100644
--- a/srcpkgs/python-yaml/template
+++ b/srcpkgs/python-yaml/template
@@ -1,18 +1,18 @@
 # Template file for 'python-yaml'
 pkgname=python-yaml
-version=3.13
-revision=2
+version=5.1.2
+revision=1
 wrksrc="PyYAML-${version}"
 build_style=python-module
 pycompile_module="yaml"
 hostmakedepends="python-setuptools python3-setuptools"
 makedepends="libyaml-devel python-devel python3-devel"
 short_desc="YAML parser and emitter for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Peter Bui <pbui@github.bx612.space>"
 license="MIT"
 homepage="http://pyyaml.org/wiki/PyYAML"
 distfiles="${PYPI_SITE}/P/PyYAML/PyYAML-${version}.tar.gz"
-checksum=3ef3092145e9b70e3ddd2c7ad59bdd0252a94dfe3949721633e41344de00a6bf
+checksum=01adf0b6c6f61bd11af6e10ca52b7d4057dd0be0343eb9283c878cf3af56aee4
 
 do_check() {
 	python3 setup.py test
diff --git a/srcpkgs/python-zeroconf/template b/srcpkgs/python-zeroconf/template
deleted file mode 100644
index 8c0034d2917..00000000000
--- a/srcpkgs/python-zeroconf/template
+++ /dev/null
@@ -1,21 +0,0 @@
-# Template file for 'python-zeroconf'
-pkgname=python-zeroconf
-version=0.19.1
-revision=3
-archs=noarch
-build_style=python2-module
-pycompile_module="zeroconf.py"
-hostmakedepends="python-setuptools"
-depends="python-netifaces python-six python-enum34"
-short_desc="Pure Python2 implementation of multicast DNS service discovery"
-maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
-license="LGPL-2.1-or-later"
-homepage="https://github.com/jstasiak/python-zeroconf/"
-distfiles="https://github.com/jstasiak/python-zeroconf/archive/${version}.tar.gz"
-checksum="ca8952a3eb04818dcb566e1344f2f15b5dd6d487770384651cdfae777d5eb848"
-
-pre_build() {
-	# Remove enum-compat from install_requires, it's a virtual package.
-	# Also, no need for enum-compat on Python 3.4+.
-	sed -i '/enum-compat/d' setup.py
-}
diff --git a/srcpkgs/python-zeroconf/update b/srcpkgs/python-zeroconf/update
deleted file mode 100644
index 80e286a5a0e..00000000000
--- a/srcpkgs/python-zeroconf/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="0.2*"
diff --git a/srcpkgs/python3-CherryPy/template b/srcpkgs/python3-CherryPy/template
index af8be4ee59e..b78c01eba2c 100644
--- a/srcpkgs/python3-CherryPy/template
+++ b/srcpkgs/python3-CherryPy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-CherryPy'
 pkgname=python3-CherryPy
-version=18.1.2
+version=18.3.0
 revision=1
 archs=noarch
 wrksrc="CherryPy-${version}"
@@ -12,8 +12,9 @@ short_desc="Object-oriented HTTP framework (Python3)"
 maintainer="bra1nwave <brainwave@openmailbox.org>"
 license="BSD-3-Clause"
 homepage="https://cherrypy.org/"
+changelog="https://raw.githubusercontent.com/cherrypy/cherrypy/master/CHANGES.rst"
 distfiles="${PYPI_SITE}/C/CherryPy/CherryPy-${version}.tar.gz"
-checksum=48de31ba3db04c5354a0fcf8acf21a9c5190380013afca746d50237c9ebe70f0
+checksum=683e687e7c7b1ba31ef86a113b1eafd0407269fed175bf488d3c839d37d1cc60
 alternatives="cherrypy:cherryd:/usr/bin/cherryd3"
 
 pre_build() {
@@ -23,6 +24,6 @@ pre_build() {
 }
 
 post_install() {
-	mv ${DESTDIR}/usr/bin/cherryd ${DESTDIR}/usr/bin/cherryd3
+	mv ${DESTDIR}/usr/bin/cherryd{,3}
 	vlicense LICENSE.md
 }
diff --git a/srcpkgs/python3-Flask-HTTPAuth/template b/srcpkgs/python3-Flask-HTTPAuth/template
new file mode 100644
index 00000000000..2584e2b8822
--- /dev/null
+++ b/srcpkgs/python3-Flask-HTTPAuth/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-Flask-HTTPAuth'
+pkgname=python3-Flask-HTTPAuth
+version=3.3.0
+revision=1
+wrksrc=Flask-HTTPAuth-${version}
+build_style=python3-module
+pycompile_module="flask_httpauth.py"
+hostmakedepends="python3-setuptools"
+depends="python3-Flask"
+short_desc="Basic, Digest and Token HTTP authentication for Flask routes"
+maintainer="mobinmob <mobinmob@disroot.org>"
+license="MIT"
+homepage="https://github.com/miguelgrinberg/Flask-HTTPAuth"
+distfiles="${PYPI_SITE}/f/flask-httpauth/Flask-HTTPAuth-${version}.tar.gz"
+checksum=6ef8b761332e780f9ff74d5f9056c2616f52babc1998b01d9f361a1e439e61b9
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/python3-MechanicalSoup/template b/srcpkgs/python3-MechanicalSoup/template
index 44687c89bae..b1bbfa4184c 100644
--- a/srcpkgs/python3-MechanicalSoup/template
+++ b/srcpkgs/python3-MechanicalSoup/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-MechanicalSoup'
 pkgname=python3-MechanicalSoup
-version=0.11.0
+version=0.12.0
 revision=1
 archs=noarch
 wrksrc=MechanicalSoup-${version}
@@ -14,7 +14,7 @@ maintainer="Alex Childs <misuchiru03+void@gmail.com>"
 license="MIT"
 homepage="https://mechanicalsoup.readthedocs.io/en/stable/index.html"
 distfiles="${PYPI_SITE}/M/MechanicalSoup/MechanicalSoup-${version}.tar.gz"
-checksum=2712ec0f3087cbc719c6c3dfb317a05800ff14fcdbfa67a2f9f6e07226e7a94c
+checksum=39a60627a97981869251837b8bd082485f2f681df8a3315836ffaa74663627bd
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-PyBrowserID/template b/srcpkgs/python3-PyBrowserID/template
index d622c24a003..abec9dac54e 100644
--- a/srcpkgs/python3-PyBrowserID/template
+++ b/srcpkgs/python3-PyBrowserID/template
@@ -10,7 +10,7 @@ hostmakedepends="python3-setuptools"
 depends="python3-requests"
 checkdepends="python3-requests python3-M2Crypto"
 short_desc="Python3 library for the BrowserID Protocol"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://github.com/mozilla/PyBrowserID"
 distfiles="${PYPI_SITE}/P/PyBrowserID/PyBrowserID-${version}.tar.gz"
diff --git a/srcpkgs/python3-PyFxA/template b/srcpkgs/python3-PyFxA/template
index 1d83e377c0d..31175c92435 100644
--- a/srcpkgs/python3-PyFxA/template
+++ b/srcpkgs/python3-PyFxA/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-PyFxA'
 pkgname=python3-PyFxA
-version=0.7.1
+version=0.7.3
 revision=1
 archs=noarch
 wrksrc="PyFxA-${version}"
@@ -12,11 +12,11 @@ depends="python3-setuptools python3-cryptography python3-six python3-requests
 # Missing package: responses
 checkdepends="$depends python3-pyotp"
 short_desc="Python3 library for interacting with Firefox Accounts"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://github.com/mozilla/PyFxA"
 distfiles="${PYPI_SITE}/P/PyFxA/PyFxA-${version}.tar.gz"
-checksum=616689486d8d63956aa40836cffafde6e7590cdeb200badabaaf3c17d5b26cce
+checksum=f47f4285629fa6c033c79adc3fb90926c0818a42cfddb04d32818547362f1627
 
 do_check() {
 	# gevent/grequests test is limited to Python 2 by upstream
diff --git a/srcpkgs/python3-PyJWT/template b/srcpkgs/python3-PyJWT/template
new file mode 100644
index 00000000000..6f0830125c1
--- /dev/null
+++ b/srcpkgs/python3-PyJWT/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-PyJWT'
+pkgname=python3-PyJWT
+version=1.7.1
+revision=1
+wrksrc="PyJWT-${version}"
+build_style=python3-module
+pycompile_module="PyJWT.py"
+hostmakedepends="python3-setuptools"
+short_desc="Platform independent file lock"
+maintainer="fosslinux <fosslinux@aussies.space>"
+license="Unlicense"
+homepage="https://filelock.readthedocs.io/en/latest/"
+distfiles="${PYPI_SITE}/P/PyJWT/PyJWT-${version}.tar.gz"
+checksum=8d59a976fb773f3e6a39c85636357c4f0e242707394cadadd9814f5cbaa20e96
diff --git a/srcpkgs/python3-SoCo/template b/srcpkgs/python3-SoCo/template
index e6a9856e297..f0ac9825f57 100644
--- a/srcpkgs/python3-SoCo/template
+++ b/srcpkgs/python3-SoCo/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-SoCo'
 pkgname=python3-SoCo
-version=0.16
+version=0.18
 revision=1
 archs=noarch
 wrksrc="SoCo-${version}"
@@ -9,11 +9,11 @@ pycompile_module="soco"
 hostmakedepends="python3-setuptools"
 depends="python3-xmltodict python3-requests"
 short_desc="Python3 bindings for programmatic control of Sonos speakers"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://python-soco.com"
 distfiles="https://github.com/SoCo/SoCo/archive/v${version}.tar.gz"
-checksum=6db315b785c9b373a36647ef454c3a5cea07f33f9fe34c1d6f9d22ed444550e3
+checksum=b289877267d0a5707f2c6c9a66e7b5062c232d62f8bd8633150deabbe0bee3b4
 
 post_install() {
 	vlicense LICENSE.rst
diff --git a/srcpkgs/python3-Telethon/template b/srcpkgs/python3-Telethon/template
index 4ffcb075262..b0786559591 100644
--- a/srcpkgs/python3-Telethon/template
+++ b/srcpkgs/python3-Telethon/template
@@ -1,19 +1,19 @@
 # Template file for 'python3-Telethon'
 pkgname=python3-Telethon
-version=1.9.0
+version=1.10.6
 revision=1
 archs=noarch
 wrksrc="Telethon-${version}"
 build_style=python3-module
 pycompile_module="telethon telethon_generator"
 hostmakedepends="python3-setuptools"
-depends="python3-pyaes python3-rsa python3-async_generator"
+depends="python3-pyaes python3-rsa"
 short_desc="Pure Python3 Telegram client library"
 maintainer="Peter Bui <pbui@github.bx612.space>"
 license="MIT"
 homepage="https://lonamiwebs.github.io/Telethon"
 distfiles="https://github.com/LonamiWebs/Telethon/archive/v${version}.tar.gz"
-checksum=3c0a37d6520234c731e6ee60546dd58730768c8ed7a08c78796ce07cede799bc
+checksum=fdb86ae0eb5ffcab4e41fded937010a2f0e64a42082a476c7797958413d01ea6
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-TxSNI/template b/srcpkgs/python3-TxSNI/template
index 86835c713af..403010da5be 100644
--- a/srcpkgs/python3-TxSNI/template
+++ b/srcpkgs/python3-TxSNI/template
@@ -9,7 +9,7 @@ pycompile_module="txsni"
 hostmakedepends="python3-setuptools"
 depends="python3-Twisted python3-openssl"
 short_desc="Easy-to-use SNI endpoint for twisted"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/glyph/txsni"
 distfiles="${PYPI_SITE}/T/TxSNI/TxSNI-${version}.tar.gz
diff --git a/srcpkgs/python3-WebOb/template b/srcpkgs/python3-WebOb/template
index 063a969a063..c360542a1f2 100644
--- a/srcpkgs/python3-WebOb/template
+++ b/srcpkgs/python3-WebOb/template
@@ -9,7 +9,7 @@ pycompile_module="webob"
 hostmakedepends="python3-setuptools"
 depends="python3"
 short_desc="WSGI request and response object"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://webob.org"
 distfiles="${PYPI_SITE}/W/WebOb/WebOb-${version}.tar.gz"
diff --git a/srcpkgs/python3-acme/template b/srcpkgs/python3-acme/template
index 902cbb7eb57..d7ef20f2301 100644
--- a/srcpkgs/python3-acme/template
+++ b/srcpkgs/python3-acme/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-acme'
 pkgname=python3-acme
-version=0.33.1
+version=0.39.0
 revision=1
 archs=noarch
 wrksrc="acme-${version}"
@@ -11,8 +11,8 @@ depends="python3-cryptography python3-openssl python3-pyrfc3339
  python3-pytz python3-requests python3-requests-toolbelt python3-setuptools
  python3-six python3-josepy"
 short_desc="ACME protocol implementation in Python"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/certbot/certbot"
 distfiles="${PYPI_SITE}/a/acme/acme-${version}.tar.gz"
-checksum=b38cdb71d0071efe1f1190a744f8f95f3c698b76ac0f5d919bbfe3522e277a82
+checksum=a2fcb75d16de6804f4b4d773a457ee2f6434ebaf8fd1aa60862a91d4e8f73608
diff --git a/srcpkgs/python3-altgraph/template b/srcpkgs/python3-altgraph/template
index 7f97364983a..eff10f7aef4 100644
--- a/srcpkgs/python3-altgraph/template
+++ b/srcpkgs/python3-altgraph/template
@@ -9,7 +9,7 @@ pycompile_module="altgraph"
 hostmakedepends="python3-setuptools"
 depends="python3"
 short_desc="Fork of graphlib for building network graphs"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://altgraph.readthedocs.io/en/latest/"
 distfiles="${PYPI_SITE}/a/altgraph/altgraph-${version}.tar.gz"
diff --git a/srcpkgs/python3-aniso8601/template b/srcpkgs/python3-aniso8601/template
index 02979efd643..26540bc8c3f 100644
--- a/srcpkgs/python3-aniso8601/template
+++ b/srcpkgs/python3-aniso8601/template
@@ -1,9 +1,9 @@
 # Template file for 'python3-aniso8601'
 pkgname=python3-aniso8601
-version=7.0.0
+version=8.0.0
 revision=1
 archs=noarch
-_gitver=20c1f00a38f8
+_gitver=0ec13b9d81c9
 wrksrc="nielsenb-aniso8601-${_gitver}"
 build_style=python3-module
 pycompile_module="aniso8601"
@@ -14,7 +14,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://bitbucket.org/nielsenb/aniso8601"
 distfiles="${homepage}/get/v${version}.tar.gz"
-checksum=65ee237d9cb5d63f153ef6de355ad501ce36543107d590cf2d2e83e3d01dd511
+checksum=4947491026822bfc5711f3f51f9b4399996c6fe7b635e38e3e260c1f6cd81bd2
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-astroid b/srcpkgs/python3-astroid
deleted file mode 120000
index 8ab3dd7a4e8..00000000000
--- a/srcpkgs/python3-astroid
+++ /dev/null
@@ -1 +0,0 @@
-python-astroid
\ No newline at end of file
diff --git a/srcpkgs/python3-astroid/template b/srcpkgs/python3-astroid/template
new file mode 100644
index 00000000000..28f01bd4445
--- /dev/null
+++ b/srcpkgs/python3-astroid/template
@@ -0,0 +1,22 @@
+# Template file for 'python3-astroid'
+pkgname=python3-astroid
+version=2.2.5
+revision=2
+archs=noarch
+wrksrc="astroid-${version}"
+build_style=python3-module
+pycompile_module="astroid"
+hostmakedepends="python3-setuptools"
+depends="python3-six python3-lazy-object-proxy python3-wrapt
+ python3-typed-ast"
+short_desc="Abstract syntax tree for Python3"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+homepage="https://github.com/PyCQA/astroid"
+license="GPL-2.0-or-later, LGPL-2.1-or-later"
+distfiles="${PYPI_SITE}/a/astroid/astroid-${version}.tar.gz"
+checksum=6560e1e1749f68c64a4b5dee4e091fce798d2f0d84ebe638cf0e0585a343acf4
+
+post_install() {
+	# no tests
+	rm -rf ${DESTDIR}/usr/lib/python*/site-packages/astroid/tests
+}
diff --git a/srcpkgs/python3-async_generator/template b/srcpkgs/python3-async_generator/template
index c749400fc80..c2053d7bf1f 100644
--- a/srcpkgs/python3-async_generator/template
+++ b/srcpkgs/python3-async_generator/template
@@ -9,7 +9,7 @@ pycompile_module="async_generator"
 hostmakedepends="python3-setuptools"
 depends="python3"
 short_desc="Async generators and context managers for Python3.5+"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0, MIT"
 homepage="https://github.com/python-trio/async_generator"
 changelog="https://raw.githubusercontent.com/python-trio/async_generator/master/docs/source/history.rst"
diff --git a/srcpkgs/python3-autobahn/template b/srcpkgs/python3-autobahn/template
new file mode 100644
index 00000000000..053e45608e5
--- /dev/null
+++ b/srcpkgs/python3-autobahn/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-autobahn'
+pkgname=python3-autobahn
+version=19.10.1
+revision=1
+archs=noarch
+wrksrc="autobahn-${version}"
+build_style=python3-module
+pycompile_module="autobahn twisted"
+hostmakedepends="python3 python3-setuptools"
+depends="python3-cffi python3-Twisted python3-six python3-cryptography python3-txaio"
+short_desc="Real-time framework for Web, Mobile & Internet of Things"
+maintainer="travankor <travankor@tuta.io>"
+license="MIT"
+homepage="https://crossbar.io/autobahn"
+distfiles="${PYPI_SITE}/a/autobahn/autobahn-${version}.tar.gz"
+checksum=734385b00547448b3f30a752cbfd2900d15924d77dc4a1699b8bce1ea8899f39
+
+post-install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/python-bcc b/srcpkgs/python3-bcc
similarity index 100%
rename from srcpkgs/python-bcc
rename to srcpkgs/python3-bcc
diff --git a/srcpkgs/python3-blessed/template b/srcpkgs/python3-blessed/template
index 00f3ec8bd9b..4d494883f9a 100644
--- a/srcpkgs/python3-blessed/template
+++ b/srcpkgs/python3-blessed/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-blessed'
 pkgname=python3-blessed
-version=1.15.0
+version=1.15.1
 revision=1
 archs=noarch
 wrksrc="blessed-${version}"
@@ -12,8 +12,8 @@ short_desc="Wrapper around terminal coloring, styling, and positioning"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/jquast/blessed"
-distfiles="${PYPI_SITE}/b/blessed/blessed-${version}.tar.gz"
-checksum=777b0b6b5ce51f3832e498c22bc6a093b6b5f99148c7cbf866d26e2dec51ef21
+distfiles="${homepage}/archive/${version}.tar.gz"
+checksum=9bd5be8b9a8bf66165911e03ba9849ac5eddcad8e1cf4a9549820e5867f98b3b
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-boltons/template b/srcpkgs/python3-boltons/template
index 13e22e79f38..84a991feef4 100644
--- a/srcpkgs/python3-boltons/template
+++ b/srcpkgs/python3-boltons/template
@@ -9,7 +9,7 @@ pycompile_module="boltons"
 hostmakedepends="python3-setuptools"
 depends="python3"
 short_desc="Collection of functionality to be bolted on the standard lib"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/mahmoud/boltons"
 distfiles="${PYPI_SITE}/b/boltons/boltons-${version}.tar.gz"
diff --git a/srcpkgs/python3-canonicaljson/template b/srcpkgs/python3-canonicaljson/template
index caa054a821e..abc8e95820d 100644
--- a/srcpkgs/python3-canonicaljson/template
+++ b/srcpkgs/python3-canonicaljson/template
@@ -9,7 +9,7 @@ pycompile_module="canonicaljson.py"
 hostmakedepends="python3-setuptools"
 depends="python3-simplejson>=3.6.5 python3-frozendict>=1.0 python3-six"
 short_desc="Canonical JSON"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/matrix-org/python-canonicaljson"
 distfiles="${PYPI_SITE}/c/canonicaljson/canonicaljson-${version}.tar.gz"
diff --git a/srcpkgs/python3-casttube/template b/srcpkgs/python3-casttube/template
index 723325dfe97..ccd95f3f31c 100644
--- a/srcpkgs/python3-casttube/template
+++ b/srcpkgs/python3-casttube/template
@@ -9,7 +9,7 @@ pycompile_module="casttube"
 hostmakedepends="python3-setuptools"
 depends="python3-requests"
 short_desc="Python3 library to interface with the YouTube Chromecast API"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/ur1katz/casttube"
 distfiles="https://github.com/ur1katz/casttube/archive/${version}.tar.gz"
diff --git a/srcpkgs/python3-changelogs/template b/srcpkgs/python3-changelogs/template
index bec46d427b5..5c2a4889959 100644
--- a/srcpkgs/python3-changelogs/template
+++ b/srcpkgs/python3-changelogs/template
@@ -10,7 +10,7 @@ hostmakedepends="python3-setuptools"
 depends="python3-requests python3-lxml python3-packaging python3-validators
  python3-gitchangelog"
 short_desc="Changelog finder and parser for vendors like PyPi and npm"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/pyupio/changelogs"
 changelog="https://raw.githubusercontent.com/pyupio/changelogs/master/HISTORY.rst"
diff --git a/srcpkgs/python3-cheetah3/template b/srcpkgs/python3-cheetah3/template
index 2d03415d6eb..40dfee6e322 100644
--- a/srcpkgs/python3-cheetah3/template
+++ b/srcpkgs/python3-cheetah3/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-cheetah3'
 pkgname=python3-cheetah3
-version=3.2.3
+version=3.2.4
 revision=1
 wrksrc="Cheetah3-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="MIT"
 homepage="http://www.cheetahtemplate.org/"
 distfiles="${PYPI_SITE}/C/Cheetah3/Cheetah3-${version}.tar.gz"
-checksum=7c450bce04a82d34cf6d48992c736c2048246cbc00f7b4903a39cf9a8ea3990c
+checksum=caabb9c22961a3413ac85cd1e5525ec9ca80daeba6555f4f60802b6c256e252b
 alternatives="python-cheetah:cheetah:/usr/bin/cheetah3
  python-cheetah:cheetah-analyze:/usr/bin/cheetah-analyze3
  python-cheetah:cheetah-compile:/usr/bin/cheetah-compile3"
diff --git a/srcpkgs/python3-chromecast/template b/srcpkgs/python3-chromecast/template
index ba3cfd7bb80..16df7502633 100644
--- a/srcpkgs/python3-chromecast/template
+++ b/srcpkgs/python3-chromecast/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-chromecast'
 pkgname=python3-chromecast
-version=3.2.0
+version=4.0.1
 revision=1
 archs=noarch
 wrksrc="pychromecast-${version}"
@@ -9,11 +9,11 @@ pycompile_module="pychromecast"
 hostmakedepends="python3-setuptools"
 depends="python3-requests python3-protobuf python3-zeroconf python3-casttube"
 short_desc="Python3 library to communicate with Google Chromecast"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/balloob/pychromecast"
 distfiles="https://github.com/balloob/pychromecast/archive/${version}.tar.gz"
-checksum=163a39e751ddc7bf361360c5610a99951a115e41d6656768c1bf70237a6cc74e
+checksum=dd994c74989292070d43bb70dba5ec06d191e759e3daf0feb7551fce50582b3b
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-cryptography_vectors b/srcpkgs/python3-cryptography_vectors
new file mode 120000
index 00000000000..321bb702bd9
--- /dev/null
+++ b/srcpkgs/python3-cryptography_vectors
@@ -0,0 +1 @@
+python-cryptography_vectors
\ No newline at end of file
diff --git a/srcpkgs/python3-dbusmock/template b/srcpkgs/python3-dbusmock/template
index 45819984f40..67e0ed68078 100644
--- a/srcpkgs/python3-dbusmock/template
+++ b/srcpkgs/python3-dbusmock/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-dbusmock'
 pkgname=python3-dbusmock
-version=0.18.2
+version=0.18.3
 revision=1
 archs=noarch
 wrksrc="python-dbusmock-${version}"
@@ -11,8 +11,8 @@ depends="python3-dbus python3-gobject"
 checkdepends="python3-nose python3-dbus python3-gobject upower bluez
  NetworkManager"
 short_desc="Python3 library to mock D-Bus objects for testing"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/martinpitt/python-dbusmock"
 distfiles="https://github.com/martinpitt/python-dbusmock/releases/download/${version}/python-dbusmock-${version}.tar.gz"
-checksum=37201c223165a9e0e82fc01015c8affbed3375eed697b4011763bccceb69db7b
+checksum=994a178268b6d74aeb158c0f155cd141e9a0cfae14226a764cd022c4949fe242
diff --git a/srcpkgs/python3-distro/template b/srcpkgs/python3-distro/template
new file mode 100644
index 00000000000..86e94572ed7
--- /dev/null
+++ b/srcpkgs/python3-distro/template
@@ -0,0 +1,16 @@
+# Template file for 'python3-distro'
+pkgname=python3-distro
+version=1.4.0
+revision=1
+wrksrc=distro-${version}
+build_style=python3-module
+pycompile_module="distro"
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+depends="python3"
+short_desc="OS platform information API"
+maintainer="mobinmob <mobinmob@disroot.org>"
+license="Apache-2.0"
+homepage="https://github.com/nir0s/distro"
+distfiles="${PYPI_SITE}/d/distro/distro-${version}.tar.gz"
+checksum=362dde65d846d23baee4b5c058c8586f219b5a54be1cf5fc6ff55c4578392f57
diff --git a/srcpkgs/python3-eliot/template b/srcpkgs/python3-eliot/template
index bbeefc2e9a2..15b05dd7331 100644
--- a/srcpkgs/python3-eliot/template
+++ b/srcpkgs/python3-eliot/template
@@ -10,7 +10,7 @@ hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-six python3-zope.interface python3-rsistent
  python3-boltons"
 short_desc="Logging library that tells you why it happened"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/itamarst/eliot/"
 distfiles="${PYPI_SITE}/e/eliot/eliot-${version}.tar.gz"
diff --git a/srcpkgs/python3-fido2/template b/srcpkgs/python3-fido2/template
new file mode 100644
index 00000000000..fafb4d61d56
--- /dev/null
+++ b/srcpkgs/python3-fido2/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-fido2'
+pkgname=python3-fido2
+_pkgname=fido2
+version=0.7.1
+revision=1
+archs=noarch
+wrksrc="${_pkgname}-${version}"
+build_style=python3-module
+pycompile_module=${_pkgname}
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Library for FIDO2 functionality"
+maintainer="Doan Tran Cong Danh <congdanhqx@gmail.com>"
+license="BSD-2-Clause"
+homepage="https://github.com/Yubico/python-fido2"
+distfiles="${PYPI_SITE}/f/${_pkgname}/${_pkgname}-${version}.tar.gz"
+checksum=4483b48ab3da0a3f3cc8e2f11d833160dfa2e6d12148e938982df4acd10b2682
+
+post_install() {
+	vlicense COPYING
+}
diff --git a/srcpkgs/python3-fishnet/template b/srcpkgs/python3-fishnet/template
index 06ddaf7ed84..9dde60cbb6c 100644
--- a/srcpkgs/python3-fishnet/template
+++ b/srcpkgs/python3-fishnet/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-fishnet'
 pkgname=python3-fishnet
-version=1.15.16
+version=1.15.18
 revision=1
 archs=noarch
 wrksrc="fishnet-${version}"
@@ -9,9 +9,9 @@ pycompile_module="fishnet.py"
 hostmakedepends="python3-setuptools"
 depends="python3-requests"
 checkdepends="python3-requests"
-short_desc="Distributed Stockfish analysis for lichess.org (Python2)"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+short_desc="Distributed Stockfish analysis for lichess.org"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/niklasf/fishnet"
 distfiles="https://github.com/niklasf/fishnet/archive/v${version}.tar.gz"
-checksum=f0d229640173b767d1d343c2d71f20eb45a4a180a43d12bf12a1060fa58e01c6
+checksum=1854ec228fddd71ecae21abb5d2b5a523fc3781d08cea1f2f757c53936db0daf
diff --git a/srcpkgs/python3-flexmock/template b/srcpkgs/python3-flexmock/template
index 3bf417f241d..0663ed5122d 100644
--- a/srcpkgs/python3-flexmock/template
+++ b/srcpkgs/python3-flexmock/template
@@ -10,7 +10,7 @@ hostmakedepends="python3-setuptools"
 depends="python3"
 checkdepends="python3-pytest"
 short_desc="Testing library for Python3 inspired by Ruby's flexmock"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://flexmock.readthedocs.io/en/latest/"
 distfiles="${PYPI_SITE}/f/flexmock/flexmock-${version}.tar.gz"
diff --git a/srcpkgs/python3-fonttools b/srcpkgs/python3-fonttools
deleted file mode 120000
index 8b2310cea88..00000000000
--- a/srcpkgs/python3-fonttools
+++ /dev/null
@@ -1 +0,0 @@
-python-fonttools
\ No newline at end of file
diff --git a/srcpkgs/python3-fonttools/template b/srcpkgs/python3-fonttools/template
new file mode 100644
index 00000000000..15cf36585fb
--- /dev/null
+++ b/srcpkgs/python3-fonttools/template
@@ -0,0 +1,31 @@
+# Template file for 'python3-fonttools'
+pkgname=python3-fonttools
+version=4.0.2
+revision=1
+wrksrc="${pkgname#python3-}-${version}"
+build_style=python3-module
+pycompile_module="fonttools"
+hostmakedepends="python3-devel python3-setuptools"
+makedepends="${hostmakedepends}"
+short_desc="Library to manipulate font files from Python3"
+maintainer="svenper <svenper@tuta.io>"
+license="MIT, OFL-1.1, BSD-3-Clause"
+homepage="https://github.com/fonttools/fonttools"
+distfiles="https://github.com/fonttools/fonttools/archive/${version}.tar.gz"
+checksum=0c92b058ccbcd44f71fe094c06bba105c989ae552852486411cd19a3763eed2c
+alternatives="
+	fonttools:fonttools:/usr/bin/fonttools3
+	fonttools:pyftmerge:/usr/bin/pyftmerge3
+	fonttools:pyftsubset:/usr/bin/pyftsubset3
+	fonttools:ttx:/usr/bin/ttx3
+	fonttools:ttx.1:/usr/share/man/man1/ttx3.1"
+
+post_install() {
+	mv ${DESTDIR}/usr/bin/fonttools{,3}
+	mv ${DESTDIR}/usr/bin/pyftmerge{,3}
+	mv ${DESTDIR}/usr/bin/pyftsubset{,3}
+	mv ${DESTDIR}/usr/bin/ttx{,3}
+	mv ${DESTDIR}/usr/share/man/man1/ttx{,3}.1
+	vlicense LICENSE
+	vlicense LICENSE.external
+}
diff --git a/srcpkgs/python3-frozendict/template b/srcpkgs/python3-frozendict/template
index fe99788da9a..d3b4dc91602 100644
--- a/srcpkgs/python3-frozendict/template
+++ b/srcpkgs/python3-frozendict/template
@@ -9,7 +9,7 @@ pycompile_module="frozendict"
 hostmakedepends="python3-setuptools"
 depends="python3"
 short_desc="Immutable mapping for Python3"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/slezica/python-frozendict"
 distfiles="${PYPI_SITE}/f/frozendict/frozendict-${version}.tar.gz"
diff --git a/srcpkgs/python3-geojson/template b/srcpkgs/python3-geojson/template
index fc9fdb49996..6bcd0c3092e 100644
--- a/srcpkgs/python3-geojson/template
+++ b/srcpkgs/python3-geojson/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-geojson'
 pkgname=python3-geojson
-version=2.4.1
+version=2.5.0
 revision=1
 archs=noarch
 wrksrc="geojson-${version}"
@@ -9,11 +9,11 @@ pycompile_module="geojson"
 hostmakedepends="python3-setuptools"
 depends="python3"
 short_desc="Bindings and utilities for GeoJSON (Python3)"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/frewsxcv/python-geojson"
 distfiles="${PYPI_SITE}/g/geojson/geojson-${version}.tar.gz"
-checksum=b175e00a76d923d6e7409de0784c147adcdd6e04b311b1d405895a4db3612c9d
+checksum=6e4bb7ace4226a45d9c8c8b1348b3fc43540658359f93c3f7e03efa9f15f658a
 
 do_check() {
 	python3 setup.py test
diff --git a/srcpkgs/python3-gitchangelog/template b/srcpkgs/python3-gitchangelog/template
index e8ea46c4f17..ed381e07d78 100644
--- a/srcpkgs/python3-gitchangelog/template
+++ b/srcpkgs/python3-gitchangelog/template
@@ -9,7 +9,7 @@ pycompile_module="gitchangelog"
 hostmakedepends="python3-setuptools git"
 depends="python3-pystache python3-Mako"
 short_desc="Creates a changelog from git log history"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/vaab/gitchangelog"
 distfiles="${PYPI_SITE}/g/gitchangelog/gitchangelog-${version}.tar.gz"
diff --git a/srcpkgs/python3-hawkauthlib/template b/srcpkgs/python3-hawkauthlib/template
index f0bbb913bce..fd7f1405790 100644
--- a/srcpkgs/python3-hawkauthlib/template
+++ b/srcpkgs/python3-hawkauthlib/template
@@ -10,7 +10,7 @@ hostmakedepends="python3-setuptools"
 depends="python3-WebOb"
 checkdepends="python3-WebOb python3-requests"
 short_desc="Low-level library for implementing Hawk Access Authentication"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://github.com/mozilla-services/hawkauthlib"
 distfiles="${PYPI_SITE}/h/hawkauthlib/hawkauthlib-${version}.tar.gz"
diff --git a/srcpkgs/python3-hkdf/template b/srcpkgs/python3-hkdf/template
new file mode 100644
index 00000000000..fabc91ee974
--- /dev/null
+++ b/srcpkgs/python3-hkdf/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-hkdf'
+pkgname=python3-hkdf
+version=0.0.3
+revision=1
+archs=noarch
+wrksrc="hkdf-${version}"
+build_style=python3-module
+pycompile_module="hkdf.py"
+hostmakedepends="python3 python3-setuptools"
+short_desc="HMAC Key Derivation module"
+maintainer="travankor <travankor@tuta.io>"
+license="BSD-2-Clause"
+homepage="https://pypi.org/project/hkdf/"
+distfiles="${PYPI_SITE}/h/hkdf/hkdf-${version}.tar.gz"
+checksum=622a31c634bc185581530a4b44ffb731ed208acf4614f9c795bdd70e77991dca
+
+post-install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/python3-html2text b/srcpkgs/python3-html2text
deleted file mode 120000
index 9176db1c683..00000000000
--- a/srcpkgs/python3-html2text
+++ /dev/null
@@ -1 +0,0 @@
-python-html2text
\ No newline at end of file
diff --git a/srcpkgs/python3-html2text/template b/srcpkgs/python3-html2text/template
new file mode 100644
index 00000000000..006f2a127ad
--- /dev/null
+++ b/srcpkgs/python3-html2text/template
@@ -0,0 +1,16 @@
+# Template file for 'python3-html2text'
+pkgname=python3-html2text
+version=2019.9.26
+revision=1
+archs=noarch
+wrksrc="${pkgname#*-}-${version}"
+build_style=python3-module
+pycompile_module="html2text"
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="HTML to Markdown-formatted text converter"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="GPL-3.0-only"
+homepage="https://github.com/Alir3z4/html2text/"
+distfiles="${PYPI_SITE}/h/html2text/html2text-${version}.tar.gz"
+checksum=6f56057c5c2993b5cc5b347cb099bdf6d095828fef1b53ef4e2a2bf2a1be9b4f
diff --git a/srcpkgs/python3-importlib_metadata/template b/srcpkgs/python3-importlib_metadata/template
index 71b94f7e6a1..9acbe968e10 100644
--- a/srcpkgs/python3-importlib_metadata/template
+++ b/srcpkgs/python3-importlib_metadata/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-importlib_metadata'
 pkgname=python3-importlib_metadata
-version=0.19
+version=0.23
 revision=1
 archs=noarch
 wrksrc="importlib_metadata-${version}"
@@ -15,4 +15,4 @@ license="Apache-2.0"
 homepage="https://importlib-metadata.readthedocs.io/en/latest/"
 changelog="https://importlib-metadata.readthedocs.io/en/latest/changelog%20(links).html"
 distfiles="${PYPI_SITE}/i/importlib_metadata/importlib_metadata-${version}.tar.gz"
-checksum=23d3d873e008a513952355379d93cbcab874c58f4f034ff657c7a87422fa64e8
+checksum=aa18d7378b00b40847790e7c27e11673d7fed219354109d0e7b9e5b25dc3ad26
diff --git a/srcpkgs/python3-ipython/template b/srcpkgs/python3-ipython/template
index 7bc45ad005e..63242f382db 100644
--- a/srcpkgs/python3-ipython/template
+++ b/srcpkgs/python3-ipython/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ipython'
 pkgname=python3-ipython
-version=7.5.0
+version=7.8.0
 revision=1
 archs=noarch
 wrksrc="ipython-${version}"
@@ -15,7 +15,7 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://ipython.org/"
 distfiles="${PYPI_SITE}/i/ipython/ipython-${version}.tar.gz"
-checksum=e840810029224b56cd0d9e7719dc3b39cf84d577f8ac686547c8ba7a06eeab26
+checksum=dd76831f065f17bddd7eaa5c781f5ea32de5ef217592cf019e34043b56895aa1
 
 alternatives="
  ipython:ipython:/usr/bin/ipython3
diff --git a/srcpkgs/python3-iso-8601 b/srcpkgs/python3-iso-8601
new file mode 120000
index 00000000000..e44531aa04c
--- /dev/null
+++ b/srcpkgs/python3-iso-8601
@@ -0,0 +1 @@
+python-iso-8601
\ No newline at end of file
diff --git a/srcpkgs/python3-jellyfish/template b/srcpkgs/python3-jellyfish/template
index caf01f0c0c4..dec74539e3f 100644
--- a/srcpkgs/python3-jellyfish/template
+++ b/srcpkgs/python3-jellyfish/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-jellyfish'
 pkgname=python3-jellyfish
-version=0.7.1
+version=0.7.2
 revision=1
 wrksrc="jellyfish-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/sunlightlabs/jellyfish"
 distfiles="${PYPI_SITE}/j/jellyfish/jellyfish-${version}.tar.gz"
-checksum=79a5640bb47120596c91b9030ed3164cc5a3d0bb6b15779bb82c3c21f8efa1c1
+checksum=cb09c50d7e2bb7b926fc7654762bc81f9c629e0c92ae7137bf22b34f39515286
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-josepy/template b/srcpkgs/python3-josepy/template
index f1ae7e7b5df..6d6e4547d38 100644
--- a/srcpkgs/python3-josepy/template
+++ b/srcpkgs/python3-josepy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-josepy'
 pkgname=python3-josepy
-version=1.1.0
+version=1.2.0
 revision=1
 archs=noarch
 wrksrc="josepy-${version}"
@@ -9,8 +9,8 @@ pycompile_module="josepy"
 hostmakedepends="python3-setuptools"
 depends="python3-cryptography python3-openssl python3-setuptools python3-six"
 short_desc="JOSE protocol implementation in Python3"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/certbot/josepy"
 distfiles="${PYPI_SITE}/j/josepy/josepy-${version}.tar.gz"
-checksum=fb5c62c77d26e04df29cb5ecd01b9ce69b6fcc9e521eb1ca193b7faa2afa7086
+checksum=9cec9a839fe9520f0420e4f38e7219525daccce4813296627436fe444cd002d3
diff --git a/srcpkgs/python3-libevdev/template b/srcpkgs/python3-libevdev/template
new file mode 100644
index 00000000000..0a79893726c
--- /dev/null
+++ b/srcpkgs/python3-libevdev/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-libevdev'
+pkgname=python3-libevdev
+version=0.8
+revision=1
+_githash=1827bebcf789adee8492cbfcc7cf8d56059a42a4
+wrksrc="python-libevdev-${version}-${_githash}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3 libevdev"
+short_desc="Python3 wrapper around the libevdev C library"
+maintainer="bra1nwave <brainwave@openmailbox.org>"
+license="MIT"
+homepage="https://gitlab.freedesktop.org/libevdev/python-libevdev"
+distfiles="${homepage}/-/archive/${version}/${version}.tar.gz"
+checksum=eff61d4bfa30f3748bf2369b71d2f7d329fdede1c56bc8cf770d2b5fdf327f55
+
+post_install() {
+	vlicense COPYING
+}
diff --git a/srcpkgs/python3-macaroons/template b/srcpkgs/python3-macaroons/template
index 1a50f82914a..d44100c20f2 100644
--- a/srcpkgs/python3-macaroons/template
+++ b/srcpkgs/python3-macaroons/template
@@ -9,7 +9,7 @@ pycompile_module="pymacaroons"
 hostmakedepends="python3-setuptools"
 depends="python3-six>=1.8.0 python3-nacl>=1.1.2 python3-nacl<2.0"
 short_desc="Python3 Macaroon library"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/ecordell/pymacaroons"
 distfiles="${PYPI_SITE}/p/pymacaroons/pymacaroons-${version}.tar.gz"
diff --git a/srcpkgs/python3-macholib/template b/srcpkgs/python3-macholib/template
index d0db22e2d84..a2738f57eb0 100644
--- a/srcpkgs/python3-macholib/template
+++ b/srcpkgs/python3-macholib/template
@@ -9,7 +9,7 @@ pycompile_module="macholib"
 hostmakedepends="python3-setuptools"
 depends="python3-altgraph python3-setuptools"
 short_desc="Python3 module for Mach-O header analysis and editing"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/erocarrera/pefile"
 distfiles="${PYPI_SITE}/m/macholib/macholib-${version}.tar.gz"
diff --git a/srcpkgs/python3-matplotlib/template b/srcpkgs/python3-matplotlib/template
index bb0abb22844..857ba17cacf 100644
--- a/srcpkgs/python3-matplotlib/template
+++ b/srcpkgs/python3-matplotlib/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-matplotlib'
 pkgname=python3-matplotlib
-version=3.0.3
+version=3.1.1
 revision=1
 wrksrc="matplotlib-${version}"
 build_style=python3-module
@@ -12,10 +12,10 @@ depends="python3-matplotlib-data>=${version}_${revision} python3-numpy
  python3-dateutil python3-parsing python3-cycler python3-kiwisolver"
 short_desc="Python3 2D/3D plotting library"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="matplotlib, BSD-3-Clause, MIT"
+license="custom:matplotlib, BSD-3-Clause, MIT"
 homepage="https://matplotlib.org/"
 distfiles="https://github.com/matplotlib/matplotlib/archive/v${version}.tar.gz"
-checksum=d384a58409c1c23b8760b6f3d84ebed2c936df7dcb82797e983faaf30ae4d69d
+checksum=29d1a239bb7d1095d98d8831bb661519ab0d23e30d38ed47729f554f15e8cd3e
 
 pre_build() {
 	# adjust qhull path
diff --git a/srcpkgs/python3-mechanize b/srcpkgs/python3-mechanize
new file mode 120000
index 00000000000..e96661e4701
--- /dev/null
+++ b/srcpkgs/python3-mechanize
@@ -0,0 +1 @@
+python-mechanize
\ No newline at end of file
diff --git a/srcpkgs/python3-more-itertools/template b/srcpkgs/python3-more-itertools/template
index 338f153a80c..b089992f84e 100644
--- a/srcpkgs/python3-more-itertools/template
+++ b/srcpkgs/python3-more-itertools/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-more-itertools'
 pkgname=python3-more-itertools
-version=7.0.0
+version=7.2.0
 revision=1
 archs=noarch
 wrksrc="more-itertools-${version}"
@@ -9,11 +9,11 @@ pycompile_module="more_itertools"
 hostmakedepends="python3-setuptools"
 depends="python3"
 short_desc="More Python3 routines for operating on itertables"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/erikrose/more-itertools"
-distfiles="https://github.com/erikrose/more-itertools/archive/${version}.tar.gz"
-checksum=3a4be24ce0cc357e227e216cf16309bac255fa984b1e26e47f88d12cb857334d
+distfiles="${PYPI_SITE}/m/more-itertools/more-itertools-${version}.tar.gz"
+checksum=409cd48d4db7052af495b09dec721011634af3753ae1ef92d2b32f73a745f832
 
 do_check() {
 	python3 setup.py test
diff --git a/srcpkgs/python3-mpi4py/template b/srcpkgs/python3-mpi4py/template
new file mode 100644
index 00000000000..94a83b688f2
--- /dev/null
+++ b/srcpkgs/python3-mpi4py/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-mpi4py'
+pkgname=python3-mpi4py
+version=3.0.2
+revision=1
+wrksrc="mpi4py-${version}"
+build_style=python3-module
+pycompile_module="mpi4py"
+hostmakedepends="python3-setuptools python3-Cython gcc-fortran openmpi"
+makedepends="python3-devel openmpi-devel"
+depends="openmpi"
+short_desc="Python bindings for the Message Passing Interface (MPI) standard"
+maintainer="Anders Damsgaard <anders@adamsgaard.dk>"
+license="BSD-2-Clause"
+homepage="https://bitbucket.org/mpi4py/mpi4py"
+distfiles="$PYPI_SITE/m/mpi4py/mpi4py-${version}.tar.gz"
+checksum=f8d629d1e3e3b7b89cb99d0e3bc5505e76cc42089829807950d5c56606ed48e0
+
+post_install() {
+	vlicense LICENSE.rst
+}
diff --git a/srcpkgs/python3-mpv/template b/srcpkgs/python3-mpv/template
index c8ea0a3b2d5..2780c02610b 100644
--- a/srcpkgs/python3-mpv/template
+++ b/srcpkgs/python3-mpv/template
@@ -9,7 +9,7 @@ pycompile_module="mpv.py"
 hostmakedepends="python3-setuptools"
 depends="python3 mpv"
 short_desc="Python3 interface to the MPV media player"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-or-later"
 homepage="https://github.com/jaseg/python-mpv"
 distfiles="https://github.com/jaseg/python-mpv/archive/v${version}.tar.gz"
diff --git a/srcpkgs/python3-mypy/template b/srcpkgs/python3-mypy/template
index da2f7fcddd5..37ecd732c06 100644
--- a/srcpkgs/python3-mypy/template
+++ b/srcpkgs/python3-mypy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-mypy'
 pkgname=python3-mypy
-version=0.701
+version=0.730
 revision=1
 archs=noarch
 wrksrc="mypy-${version}"
@@ -9,11 +9,11 @@ pycompile_module="mypy"
 hostmakedepends="python3-setuptools"
 depends="python3-mypy_extensions python3-typed-ast"
 short_desc="Optional static typing for Python3"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/python/mypy"
 distfiles="${PYPI_SITE}/m/mypy/mypy-${version}.tar.gz"
-checksum=5764f10d27b2e93c84f70af5778941b8f4aa1379b2430f85c827e0f5464e8714
+checksum=42a78944e80770f21609f504ca6c8173f7768043205b5ac51c9144e057dcf879
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-mypy_extensions/template b/srcpkgs/python3-mypy_extensions/template
index d3efb12f17a..2761924248e 100644
--- a/srcpkgs/python3-mypy_extensions/template
+++ b/srcpkgs/python3-mypy_extensions/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-mypy_extensions'
 pkgname=python3-mypy_extensions
-version=0.4.1
+version=0.4.2
 revision=1
 archs=noarch
 wrksrc="mypy_extensions-${version}"
@@ -9,11 +9,11 @@ pycompile_module="mypy_extensions.py"
 hostmakedepends="python3-setuptools"
 depends="python3"
 short_desc="Extensions to the typing module use by mypy"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://www.mypy-lang.org/"
 distfiles="${PYPI_SITE}/m/mypy_extensions/mypy_extensions-${version}.tar.gz"
-checksum=37e0e956f41369209a3d5f34580150bcacfabaa57b33a15c0b25f4b5725e0812
+checksum=a161e3b917053de87dbe469987e173e49fb454eca10ef28b48b384538cc11458
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-nacl/template b/srcpkgs/python3-nacl/template
index 621be4193dc..5dd6a71ad6a 100644
--- a/srcpkgs/python3-nacl/template
+++ b/srcpkgs/python3-nacl/template
@@ -9,7 +9,7 @@ hostmakedepends="python3-setuptools python3-pycparser python3-cffi"
 makedepends="libsodium-devel python3-devel libffi-devel"
 depends="python3-six python3-cffi"
 short_desc="Python3 bindings for the NaCl library"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/pyca/pynacl/"
 distfiles="${PYPI_SITE}/P/PyNaCl/PyNaCl-${version}.tar.gz"
diff --git a/srcpkgs/python3-numpy/template b/srcpkgs/python3-numpy/template
index 6cf4bb72608..c4c1936cc0d 100644
--- a/srcpkgs/python3-numpy/template
+++ b/srcpkgs/python3-numpy/template
@@ -1,22 +1,27 @@
 # Template file for 'python3-numpy'
 pkgname=python3-numpy
-version=1.17.0
+version=1.17.2
 revision=1
 wrksrc="numpy-${version}"
 build_style=python3-module
 pycompile_module="numpy"
 hostmakedepends="python3-setuptools python3-Cython gcc-fortran"
 makedepends="python3-devel lapack-devel cblas-devel"
+checkdepends="python3-pytest"
 short_desc="Fast and sophisticated array facility to Python3"
 maintainer="bra1nwave <brainwave@openmailbox.org>"
 license="BSD-3-Clause"
 homepage="https://www.numpy.org/"
 distfiles="https://github.com/numpy/numpy/archive/v${version}.tar.gz"
-checksum=56b53127c1d9dbb91fe1493646d71d8d95feea8320a1fa9808c9d983d1dc4a87
+checksum=689d9852d162dc7cda4aa563cdd1f5af166b6878493aeb98d584b5edefcea4b2
 alternatives="numpy:f2py:/usr/bin/f2py3"
 
 nocross="https://build.voidlinux.org/builders/armv7l_builder/builds/1408/steps/shell_3/logs/stdio"
 
+do_check() {
+	./runtests.py
+}
+
 post_install() {
 	# create compat symlinks for .h files
 	vmkdir ${py3_inc}
diff --git a/srcpkgs/python3-pafy b/srcpkgs/python3-pafy
deleted file mode 120000
index 81da0afb146..00000000000
--- a/srcpkgs/python3-pafy
+++ /dev/null
@@ -1 +0,0 @@
-python-pafy
\ No newline at end of file
diff --git a/srcpkgs/python3-pafy/template b/srcpkgs/python3-pafy/template
new file mode 100644
index 00000000000..ce26f770c69
--- /dev/null
+++ b/srcpkgs/python3-pafy/template
@@ -0,0 +1,22 @@
+# Template file for 'python3-pafy'
+pkgname=python3-pafy
+version=0.5.4
+revision=2
+archs=noarch
+wrksrc="pafy-${version}"
+build_style=python3-module
+pycompile_module="pafy"
+hostmakedepends="python3-setuptools youtube-dl"
+depends="youtube-dl"
+short_desc="Python3 library to download YouTube content and retrieve metadata"
+maintainer="q66 <daniel@octaforge.org>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/mps-youtube/pafy"
+distfiles="https://github.com/mps-youtube/pafy/archive/v${version}.tar.gz"
+checksum=a2f9fe7c6175264993190081e1558516b2f2b5987f13a581a55cd9d838df973b
+
+python-pafy_package() {
+	depends="python3-pafy"
+	short_desc+=" - transitional dummy package"
+	build_style=meta
+}
diff --git a/srcpkgs/python3-pandas b/srcpkgs/python3-pandas
deleted file mode 120000
index c34bebd91ab..00000000000
--- a/srcpkgs/python3-pandas
+++ /dev/null
@@ -1 +0,0 @@
-python-pandas
\ No newline at end of file
diff --git a/srcpkgs/python-pandas/python3-pandas.INSTALL.msg b/srcpkgs/python3-pandas/INSTALL.msg
similarity index 100%
rename from srcpkgs/python-pandas/python3-pandas.INSTALL.msg
rename to srcpkgs/python3-pandas/INSTALL.msg
diff --git a/srcpkgs/python3-pandas/template b/srcpkgs/python3-pandas/template
new file mode 100644
index 00000000000..ad282b4d5d4
--- /dev/null
+++ b/srcpkgs/python3-pandas/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-pandas'
+pkgname=python3-pandas
+version=0.25.1
+revision=1
+wrksrc="pandas-${version}"
+build_style=python3-module
+pycompile_module="pandas"
+hostmakedepends="python3-setuptools python3-Cython"
+makedepends="python3-devel python3-numpy python3-dateutil python3-pytz"
+depends="python3-numpy python3-dateutil python3-pytz"
+short_desc="Python3 data analysis library"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://pandas.pydata.org/"
+distfiles="https://github.com/pandas-dev/pandas/archive/v${version}.tar.gz"
+checksum=94e2fccca4f758b5dc20e80466516bd6dc2ee24dd62fc8bf41866b8902d3d2eb
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/python3-pandas/update b/srcpkgs/python3-pandas/update
new file mode 100644
index 00000000000..e299d00ea67
--- /dev/null
+++ b/srcpkgs/python3-pandas/update
@@ -0,0 +1 @@
+ignore="*rc*"
diff --git a/srcpkgs/python3-pefile/template b/srcpkgs/python3-pefile/template
index 189e8dbd9fb..305d64e0758 100644
--- a/srcpkgs/python3-pefile/template
+++ b/srcpkgs/python3-pefile/template
@@ -9,7 +9,7 @@ pycompile_module="pefile.py peutils.py ordlookup"
 hostmakedepends="python3-setuptools"
 depends="python3-future"
 short_desc="Read and work with Portable Executable (PE) files"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://altgraph.readthedocs.io/en/latest/"
 distfiles="${PYPI_SITE}/p/pefile/pefile-${version}.tar.gz"
diff --git a/srcpkgs/python3-pem/template b/srcpkgs/python3-pem/template
index 6fc101974d2..3517c80b66a 100644
--- a/srcpkgs/python3-pem/template
+++ b/srcpkgs/python3-pem/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pem'
 pkgname=python3-pem
-version=19.1.0
+version=19.2.0
 revision=1
 archs=noarch
 wrksrc="pem-${version}"
@@ -9,11 +9,11 @@ pycompile_module="pem"
 hostmakedepends="python3-setuptools"
 depends="python3"
 short_desc="Easy PEM file parsing in Python3"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://pem.readthedocs.io/en/stable/"
 distfiles="${PYPI_SITE}/p/pem/pem-${version}.tar.gz"
-checksum=0f0428fbe22cafa3eb973619a1c329aa886a24bbdafe138d3a46a084059dc0b1
+checksum=a6f42d89cc43d62b5ed4c0fe9f87e8ab86af909ce4d4bb2b9098d79d84353a98
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-perf/template b/srcpkgs/python3-perf/template
index 3ea2ad0ccc3..a03251f97e8 100644
--- a/srcpkgs/python3-perf/template
+++ b/srcpkgs/python3-perf/template
@@ -1,20 +1,20 @@
 # Template file for 'python3-perf'
 pkgname=python3-perf
-version=1.6.0
+version=1.6.1
 revision=1
 archs=noarch
-wrksrc="perf-${version}"
+wrksrc="pyperf-${version}"
 build_style=python3-module
-pycompile_module="perf"
+pycompile_module="pyperf"
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-six"
 short_desc="Toolkit to run Python benchmarks"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
-homepage="https://github.com/vstinner/perf"
-#changelog="https://raw.githubusercontent.com/vstinner/perf/master/doc/changelog.rst"
-distfiles="https://github.com/vstinner/perf/archive/${version}.tar.gz"
-checksum=c1f6f0262be85e7e14daa0875c7d226d6a87b2cf9eebbfb91f6e7c34ef223df0
+homepage="https://pyperf.readthedocs.io"
+changelog="https://raw.githubusercontent.com/vstinner/pyperf/master/doc/changelog.rst"
+distfiles="https://github.com/vstinner/pyperf/archive/${version}.tar.gz"
+checksum=fbe793f6f2e036ab4dcca105b5c5aa34fd331dd881e7a3e158e5e218c63cfc32
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/python3-pgspecial/template b/srcpkgs/python3-pgspecial/template
index 748e4b2f99a..dc52d12c214 100644
--- a/srcpkgs/python3-pgspecial/template
+++ b/srcpkgs/python3-pgspecial/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pgspecial'
 pkgname=python3-pgspecial
-version=1.11.5
+version=1.11.7
 revision=1
 archs=noarch
 wrksrc="pgspecial-${version}"
@@ -8,12 +8,13 @@ build_style=python3-module
 pycompile_module="pgspecial"
 hostmakedepends="python3-setuptools"
 depends="python3-click python3-sqlparse python3-psycopg2"
+checkdepends="${depends} python3-pytest"
 short_desc="Meta-commands handler for PostgreSQL"
 maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"
 license="BSD-3-Clause"
 homepage="https://www.dbcli.com"
 distfiles="${PYPI_SITE}/p/pgspecial/pgspecial-${version}.tar.gz"
-checksum=f44dd48db53fd93dc78d61ebac0ca2cc3c58203f94b30edc730b02bfd3ee747b
+checksum=f7501681e276b07cb260e665ce578ff5c64bcd1bc58bde27a01b78425afdc173
 
 do_check() {
 	# pgspecial tests require a PostgreSQL server; skip them.
diff --git a/srcpkgs/python3-phonenumbers/template b/srcpkgs/python3-phonenumbers/template
index 7c91c19a1f1..ebf33f226e4 100644
--- a/srcpkgs/python3-phonenumbers/template
+++ b/srcpkgs/python3-phonenumbers/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-phonenumbers'
 pkgname=python3-phonenumbers
-version=8.10.10
+version=8.10.20
 revision=1
 archs=noarch
 wrksrc="phonenumbers-${version}"
@@ -9,8 +9,8 @@ pycompile_module="phonenumbers"
 hostmakedepends="python3-setuptools"
 depends="python3"
 short_desc="Library for dealing with international phone numbers"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/daviddrysdale/python-phonenumbers"
 distfiles="${PYPI_SITE}/p/phonenumbers/phonenumbers-${version}.tar.gz"
-checksum=dabc8cfcff96446b0787ea337739ea286ec3949ec27a4790a9b4587817da5c5f
+checksum=f743940907118dacb552da39caf1839632a5cc510157fc468a1f497f36562e1c
diff --git a/srcpkgs/python3-pivy/template b/srcpkgs/python3-pivy/template
index 9daf33025d3..4a733e805e3 100644
--- a/srcpkgs/python3-pivy/template
+++ b/srcpkgs/python3-pivy/template
@@ -15,6 +15,11 @@ distfiles="https://bitbucket.org/Coin3D/pivy/get/${version}.tar.gz"
 checksum=2ee684dbf0f52c05b491c5423013fd82e679614bffee23641485248c8a790c4e
 nocross="require coin-config script"
 
+case "$XBPS_TARGET_MACHINE" in
+	ppc64*);;
+	ppc*) broken="{standard input}:3376761: Error: operand out of range";;
+esac
+
 post_extract() (
 	# use setup_old.py until have Coin with cmake support
 	mv -f setup_old.py setup.py
diff --git a/srcpkgs/python3-pluggy/template b/srcpkgs/python3-pluggy/template
index 42b31ff8af5..37ebc2dae40 100644
--- a/srcpkgs/python3-pluggy/template
+++ b/srcpkgs/python3-pluggy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pluggy'
 pkgname=python3-pluggy
-version=0.12.0
+version=0.13.0
 revision=1
 archs=noarch
 wrksrc="pluggy-${version}"
@@ -14,7 +14,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="MIT"
 homepage="https://github.com/pytest-dev/pluggy"
 distfiles="${PYPI_SITE}/p/pluggy/pluggy-${version}.tar.gz"
-checksum=0825a152ac059776623854c1543d65a4ad408eb3d33ee114dff91e57ec6ae6fc
+checksum=fa5fa1622fa6dd5c030e9cad086fa19ef6a0cf6d7a2d12318e10cb49d6d68f34
 
 do_check() {
 	python3 -m pytest
diff --git a/srcpkgs/python3-precis-i18n/template b/srcpkgs/python3-precis-i18n/template
index 6187f3b9ef9..19612bc818b 100644
--- a/srcpkgs/python3-precis-i18n/template
+++ b/srcpkgs/python3-precis-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-precis-i18n'
 pkgname=python3-precis-i18n
-version=1.0.0
+version=1.0.1
 revision=1
 archs=noarch
 wrksrc="precis_i18n-${version}"
@@ -9,11 +9,11 @@ pycompile_module="precis_i18n"
 hostmakedepends="python3-setuptools"
 depends="python3"
 short_desc="Internationalized usernames and passwords"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/byllyfish/precis_i18n"
 distfiles="${PYPI_SITE}/p/precis_i18n/precis_i18n-${version}.tar.gz"
-checksum=227ac196b8a31b1209030bfbe90616dd375be946e0a9403349dd45851adf503e
+checksum=5abd7c06e5247fb519089c7649c9b775f934f0d1cc0a680b44fbeb2d5403aed8
 
 do_check() {
 	python3 setup.py test
diff --git a/srcpkgs/python3-pretend b/srcpkgs/python3-pretend
new file mode 120000
index 00000000000..50477566bea
--- /dev/null
+++ b/srcpkgs/python3-pretend
@@ -0,0 +1 @@
+python-pretend
\ No newline at end of file
diff --git a/srcpkgs/python3-pulsectl/template b/srcpkgs/python3-pulsectl/template
index 4e4a9efdaa5..429dd1abe45 100644
--- a/srcpkgs/python3-pulsectl/template
+++ b/srcpkgs/python3-pulsectl/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pulsectl'
 pkgname=python3-pulsectl
-version=18.12.5
+version=19.9.5
 revision=1
 archs=noarch
 wrksrc="pulsectl-${version}"
@@ -9,12 +9,12 @@ pycompile_module="pulsectl"
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools"
 short_desc="Python3 high-level interfaces and ctypes bindings for libpulse"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/mk-fg/python-pulse-control"
 changelog="https://github.com/mk-fg/python-pulse-control/raw/master/CHANGES.rst"
 distfiles="${PYPI_SITE}/p/pulsectl/pulsectl-${version}.tar.gz"
-checksum=41db4dd19e7cd28e2609baf2b551f34991f1890024be119b6075a286abfb65d3
+checksum=c4a739f2f4750c2e6be879fe085935f81033da71dd8b13c56a42f379f1bafe5d
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/python3-pyfiglet/template b/srcpkgs/python3-pyfiglet/template
new file mode 100644
index 00000000000..d00b4fda62a
--- /dev/null
+++ b/srcpkgs/python3-pyfiglet/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-pyfiglet'
+pkgname=python3-pyfiglet
+version=0.8.0
+revision=1
+archs=noarch
+wrksrc="pyfiglet-${version}"
+build_style="python3-module"
+pycompile_module="pyfiglet"
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Implementation of figlet written in Python"
+maintainer="Illia Shestakov <ishestakov@airmail.cc>"
+license="MIT"
+homepage="https://github.com/pwaller/pyfiglet"
+distfiles="https://github.com/pwaller/pyfiglet/archive/v${version}.tar.gz"
+checksum=0331d8cd949b0def033fce08c9b1f62006b8d1e1dce578dd28fdb02ae0f827f1
+
+post_install() {
+	vlicense LICENSE
+	vdoc README
+}
diff --git a/srcpkgs/python3-pylint b/srcpkgs/python3-pylint
deleted file mode 120000
index 54b18e249c1..00000000000
--- a/srcpkgs/python3-pylint
+++ /dev/null
@@ -1 +0,0 @@
-pylint
\ No newline at end of file
diff --git a/srcpkgs/python3-pylint/template b/srcpkgs/python3-pylint/template
new file mode 100644
index 00000000000..6c8800069f0
--- /dev/null
+++ b/srcpkgs/python3-pylint/template
@@ -0,0 +1,47 @@
+# Template file for 'python3-pylint'
+pkgname=python3-pylint
+version=2.3.1
+revision=2
+archs=noarch
+wrksrc="pylint-${version}"
+build_style=python3-module
+pycompile_module="pylint"
+hostmakedepends="python3-setuptools"
+depends="python3-setuptools python3-astroid python3-six python3-isort
+ python3-mccabe"
+short_desc="Python3 code static checker"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+homepage="http://www.pylint.org/"
+license="GPL-2.0-or-later"
+distfiles="${PYPI_SITE}/p/pylint/pylint-${version}.tar.gz"
+checksum=723e3db49555abaf9bf79dc474c6b9e2935ad82230b10c1138a71ea41ac0fff1
+
+alternatives="
+ pylint:epylint:/usr/bin/epylint3
+ pylint:pylint:/usr/bin/pylint3
+ pylint:pyreverse:/usr/bin/pyreverse3
+ pylint:symilar:/usr/bin/symilar3
+ pylint:epylint.1:/usr/share/man/man1/epylint3.1
+ pylint:pylint.1:/usr/share/man/man1/pylint3.1
+ pylint:pyreverse.1:/usr/share/man/man1/pyreverse3.1
+ pylint:symilar.1:/usr/share/man/man1/symilar3.1"
+
+pre_build() {
+	sed -i '/setup_requires=/d' setup.py
+}
+post_install() {
+	# no tests
+	rm -rf ${DESTDIR}/usr/lib/python*/site-packages/pylint/test
+
+	# create versioned man pages
+	for f in epylint pylint pyreverse symilar; do
+		vman man/${f}.1 ${f}3.1
+		mv ${DESTDIR}/usr/bin/${f} ${DESTDIR}/usr/bin/${f}3
+	done
+
+	# install example config and emacs files
+	vsconf examples/pylintrc
+	vsconf examples/pylintrc_camelcase
+	vsconf elisp/pylint.el
+	vsconf elisp/pylint-flymake.el
+}
diff --git a/srcpkgs/python3-pysol_cards/template b/srcpkgs/python3-pysol_cards/template
index fd85e444508..e03d92fe077 100644
--- a/srcpkgs/python3-pysol_cards/template
+++ b/srcpkgs/python3-pysol_cards/template
@@ -1,20 +1,23 @@
 # Template file for 'python3-pysol_cards'
 pkgname=python3-pysol_cards
-version=0.8.4
+version=0.8.6
 revision=1
 wrksrc="pysol_cards-${version}"
 build_style=python3-module
 pycompile_module="pysol_cards"
 hostmakedepends="python3-setuptools"
-depends="python3-pbr"
-checkdepends="python3-random2 python3-six python3-pyperclip python3-colorama
- python3-cffi python3-appdirs python3-decorator python3-netifaces"
+depends="python3-pbr python3-six"
+checkdepends="python3-appdirs python3-attrs python3-colorama python3-coverage
+ python3-cryptography python3-dogpile.cache python3-future python3-jmespath
+ python3-jsonpointer python3-netifaces python3-pyperclip python3-random2
+ python3-requests python3-stevedore python3-voluptuous python3-wcwidth
+ python3-wrapt python3-yaml"
 short_desc="Deal PySol FC Cards"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="MIT"
 homepage="https://fc-solve.shlomifish.org/"
 distfiles="${PYPI_SITE}/p/pysol_cards/pysol_cards-${version}.tar.gz"
-checksum=24c6d1dd8e6ee3a1d009e6b786e2973377d43e6008fc712fff5d05901936ec78
+checksum=6e536a60fad9a59d5ecc197b0a22718fa8b16de42ede37caa8f7b87b8e256148
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pytest-asyncio/template b/srcpkgs/python3-pytest-asyncio/template
index ad557035c11..bd104f99e2c 100644
--- a/srcpkgs/python3-pytest-asyncio/template
+++ b/srcpkgs/python3-pytest-asyncio/template
@@ -9,7 +9,7 @@ pycompile_module="pytest_asyncio"
 hostmakedepends="python3-setuptools"
 depends="python3-pytest"
 short_desc="Pytest support for asyncio"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/pytest-dev/pytest-asyncio"
 distfiles="${PYPI_SITE}/p/pytest-asyncio/pytest-asyncio-${version}.tar.gz"
diff --git a/srcpkgs/python3-regex b/srcpkgs/python3-regex
new file mode 120000
index 00000000000..172b6e9673d
--- /dev/null
+++ b/srcpkgs/python3-regex
@@ -0,0 +1 @@
+python-regex
\ No newline at end of file
diff --git a/srcpkgs/python3-rfc6555 b/srcpkgs/python3-rfc6555
new file mode 120000
index 00000000000..7275c04c1a4
--- /dev/null
+++ b/srcpkgs/python3-rfc6555
@@ -0,0 +1 @@
+python-rfc6555
\ No newline at end of file
diff --git a/srcpkgs/python3-rsistent/template b/srcpkgs/python3-rsistent/template
index 64c141eab37..13019f472cd 100644
--- a/srcpkgs/python3-rsistent/template
+++ b/srcpkgs/python3-rsistent/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-rsistent'
 pkgname=python3-rsistent
-version=0.14.11
-revision=2
+version=0.15.4
+revision=1
 wrksrc="pyrsistent-${version}"
 build_style=python3-module
 pycompile_module="pyrsistent"
@@ -9,11 +9,11 @@ hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
 depends="python3-six"
 short_desc="Persistent/Functional/Immutable data structures"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/tobgu/pyrsistent/"
 distfiles="${PYPI_SITE}/p/pyrsistent/pyrsistent-${version}.tar.gz"
-checksum=3ca82748918eb65e2d89f222b702277099aca77e34843c5eb9d52451173970e2
+checksum=34b47fa169d6006b32e99d4b3c4031f155e6e68ebcc107d6454852e8e0ee6533
 
 post_intsall() {
 	vlicense LICENSE.mit
diff --git a/srcpkgs/python3-rss2email/template b/srcpkgs/python3-rss2email/template
new file mode 100644
index 00000000000..d07984d33d8
--- /dev/null
+++ b/srcpkgs/python3-rss2email/template
@@ -0,0 +1,16 @@
+# Template file for 'python3-rss2email'
+pkgname=python3-rss2email
+version=3.10
+revision=1
+archs=noarch
+wrksrc="rss2email-${version}"
+build_style=python3-module
+pycompile_module="rss2email"
+hostmakedepends="python3-setuptools"
+depends="python3-feedparser python3-html2text"
+short_desc="Forward RSS feeds to email (community edition)"
+maintainer="Anders Damsgaard <anders@adamsgaard.dk>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/rss2email/rss2email"
+distfiles="https://github.com/rss2email/rss2email/archive/v${version}.tar.gz"
+checksum=922b33f5bc3bce20568b977bff84dfdef3f1f7117fc70cc0b1bee7daa0e0acac
diff --git a/srcpkgs/python3-saml2/template b/srcpkgs/python3-saml2/template
index 6eac12fbaad..e94602a82ea 100644
--- a/srcpkgs/python3-saml2/template
+++ b/srcpkgs/python3-saml2/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-saml2'
 pkgname=python3-saml2
-version=4.7.0
+version=4.8.0
 revision=1
 archs=noarch
 wrksrc="pysaml2-${version}"
@@ -10,8 +10,8 @@ hostmakedepends="python3-setuptools"
 depends="python3-cryptography python3-openssl python3-dateutil python3-pytz
  python3-requests python3-six python3-defusedxml"
 short_desc="Python3 implementation of SAML Version 2 Standard"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/IdentityPython/pysaml2"
 distfiles="${PYPI_SITE}/p/pysaml2/pysaml2-${version}.tar.gz"
-checksum=b4efc61bd882a6afac18d333cb9ebf2ff4c80f99cf92ceaffd7d060e0b691613
+checksum=4115b3acf0cc58c8bf265b120c48c38c5346147748643bb7757462ca47059329
diff --git a/srcpkgs/python3-scard/template b/srcpkgs/python3-scard/template
new file mode 100644
index 00000000000..793f144a74b
--- /dev/null
+++ b/srcpkgs/python3-scard/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-scard'
+pkgname=python3-scard
+_pkgname=pyscard
+version=1.9.8
+revision=1
+wrksrc="${_pkgname}-${version}"
+build_style=python3-module
+pycompile_module=smartcard
+hostmakedepends="python3-setuptools swig"
+makedepends="python3-devel pcsclite-devel"
+depends="python3 pcsclite"
+short_desc="Python library for smartcard"
+maintainer="Doan Tran Cong Danh <congdanhqx@gmail.com>"
+license="LGPL-2.1-or-later"
+homepage="https://pyscard.sourceforge.io/index.html"
+distfiles="${PYPI_SITE}/p/${_pkgname}/${_pkgname}-${version}.tar.gz"
+checksum=f59dc7ee467b210094e64c923e1c7f5e8e9501a672fc0c8f2cd958153e00d095
+
+CPPFLAGS="-I${XBPS_CROSS_BASE}/usr/include/PCSC"
diff --git a/srcpkgs/python3-scikit-learn b/srcpkgs/python3-scikit-learn
deleted file mode 120000
index b21d4d2c2b2..00000000000
--- a/srcpkgs/python3-scikit-learn
+++ /dev/null
@@ -1 +0,0 @@
-python-scikit-learn
\ No newline at end of file
diff --git a/srcpkgs/python3-scikit-learn/template b/srcpkgs/python3-scikit-learn/template
new file mode 100644
index 00000000000..73799b9f420
--- /dev/null
+++ b/srcpkgs/python3-scikit-learn/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-scikit-learn'
+pkgname=python3-scikit-learn
+version=0.20.4
+revision=1
+wrksrc="scikit-learn-${version}"
+build_style=python3-module
+pycompile_module="sklearn"
+hostmakedepends="python3-setuptools python3-Cython"
+makedepends="python3-devel python3-numpy python3-scipy"
+depends="python3-numpy python3-scipy"
+short_desc="Python3 modules for machine learning and data mining"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://scikit-learn.org/"
+distfiles="https://github.com/scikit-learn/scikit-learn/archive/${version}.tar.gz"
+checksum=1ec7a8dbf45fec730afaf6c783a797f9863fefc1225735ac4ce4706cc5857415
+
+post_install() {
+	vlicense COPYING
+}
diff --git a/srcpkgs/python3-scipy b/srcpkgs/python3-scipy
deleted file mode 120000
index 5107676dd24..00000000000
--- a/srcpkgs/python3-scipy
+++ /dev/null
@@ -1 +0,0 @@
-python-scipy
\ No newline at end of file
diff --git a/srcpkgs/python3-scipy/template b/srcpkgs/python3-scipy/template
new file mode 100644
index 00000000000..291ac3734f1
--- /dev/null
+++ b/srcpkgs/python3-scipy/template
@@ -0,0 +1,23 @@
+# Template file for 'python3-scipy'
+pkgname=python3-scipy
+version=1.3.1
+revision=1
+wrksrc="scipy-${version}"
+build_style=python3-module
+pycompile_module="scipy"
+hostmakedepends="python3-setuptools
+ python3-Cython gcc-fortran"
+makedepends="python3-devel python3-numpy lapack-devel"
+depends="python-numpy"
+short_desc="Scientific library for Python3"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://scipy.org/scipylib/"
+distfiles="https://github.com/scipy/scipy/releases/download/v${version}/scipy-${version}.tar.xz"
+checksum=326ffdad79f113659ed0bca80f5d0ed5e28b2e967b438bb1f647d0738073a92e
+
+LDFLAGS="-shared"
+
+post_install() {
+	vlicense LICENSE.txt
+}
diff --git a/srcpkgs/python-scipy/update b/srcpkgs/python3-scipy/update
similarity index 100%
rename from srcpkgs/python-scipy/update
rename to srcpkgs/python3-scipy/update
diff --git a/srcpkgs/python3-scruffy/template b/srcpkgs/python3-scruffy/template
index 86156b901fd..e797b110f42 100644
--- a/srcpkgs/python3-scruffy/template
+++ b/srcpkgs/python3-scruffy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-scruffy'
 pkgname=python3-scruffy
-version=0.3.8
+version=0.3.8.1
 revision=1
 archs=noarch
 wrksrc="scruffy-${version}"
@@ -13,7 +13,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/snare/scruffy"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=6cb1b46010947b0ec3b9247abcb533d74f036122db2f2b2c0c3e5e76966f191f
+checksum=9a4f208ee723d5ee40614b09166ad52a319eb7fa6e4fcfe18ee6cabde3f8d1a6
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-shodan/template b/srcpkgs/python3-shodan/template
index 99fff569849..858a0b921f8 100644
--- a/srcpkgs/python3-shodan/template
+++ b/srcpkgs/python3-shodan/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-shodan'
 pkgname=python3-shodan
-version=1.12.1
+version=1.19.0
 revision=1
 archs=noarch
 wrksrc="shodan-python-${version}"
@@ -14,7 +14,7 @@ maintainer="Alex Childs <misuchiru03+void@gmail.com>"
 license="MIT"
 homepage="https://developer.shodan.io"
 distfiles="https://github.com/achillean/shodan-python/archive/${version}.tar.gz"
-checksum=c8e935fe4262d4267127aa9ec1f1924197853fdf5f26b477c6c8add1ad11a758
+checksum=e27cf7d0168bd3d0e79cf024950e9980f2f539209175bf7badb839a438455fe1
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-signedjson/template b/srcpkgs/python3-signedjson/template
index 4b6b82aab35..6f6fb339fd2 100644
--- a/srcpkgs/python3-signedjson/template
+++ b/srcpkgs/python3-signedjson/template
@@ -10,7 +10,7 @@ hostmakedepends="python3-setuptools"
 depends="python3-canonicaljson>=1.0.0 python3-unpaddedbase64>=1.0.1
  python3-nacl>=0.3.0"
 short_desc="Sign JSON with Ed25519 signatures"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/matrix-org/python-signedjson"
 distfiles="https://github.com/matrix-org/python-signedjson/archive/v${version}.tar.gz"
diff --git a/srcpkgs/python3-sortedcontainers/template b/srcpkgs/python3-sortedcontainers/template
index 3f836afa2b7..2b531ded9b6 100644
--- a/srcpkgs/python3-sortedcontainers/template
+++ b/srcpkgs/python3-sortedcontainers/template
@@ -8,7 +8,7 @@ build_style=python3-module
 pycompile_module="sortedcontainers"
 hostmakedepends="python3-setuptools"
 short_desc="Sorted List, Sorted Dict, Sorted Set"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="http://www.grantjenks.com/docs/sortedcontainers/"
 distfiles="${PYPI_SITE}/s/sortedcontainers/sortedcontainers-${version}.tar.gz"
diff --git a/srcpkgs/python3-spake2/template b/srcpkgs/python3-spake2/template
new file mode 100644
index 00000000000..ff83afed1d6
--- /dev/null
+++ b/srcpkgs/python3-spake2/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-spake2'
+pkgname=python3-spake2
+version=0.8
+revision=1
+archs=noarch
+wrksrc="python-spake2-${version}"
+build_style=python3-module
+pycompile_module="spake2"
+hostmakedepends="python3 python3-setuptools"
+depends="python3-hkdf"
+short_desc="SPAKE2 Password-Authenticated Key Exchange"
+maintainer="travankor <travankor@tuta.io>"
+license="MIT"
+homepage="https://github.com/warner/python-spake2"
+distfiles="https://github.com/warner/python-spake2/archive/v${version}.tar.gz"
+checksum=c96c1d9438ca7f738959690b0860473b5bf8f8b95884f78fd5af11d2e6db662f
+
+post-install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/python3-tabulate/template b/srcpkgs/python3-tabulate/template
index e7685583ff2..19b61edd88c 100644
--- a/srcpkgs/python3-tabulate/template
+++ b/srcpkgs/python3-tabulate/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-tabulate'
 pkgname=python3-tabulate
-version=0.8.3
+version=0.8.4
 revision=1
 archs=noarch
 wrksrc="tabulate-${version}"
@@ -9,11 +9,11 @@ pycompile_module="tabulate.py"
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-wcwidth"
 short_desc="Pretty-print tabular data (Python3)"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://bitbucket.org/astanin/python-tabulate"
 distfiles="${PYPI_SITE}/t/tabulate/tabulate-${version}.tar.gz"
-checksum=8af07a39377cee1103a5c8b3330a421c2d99b9141e9cc5ddd2e3263fea416943
+checksum=dde537a1c44e6d9d635b2489923513bef89fadb181819998cccdf2a99e652464
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-tinycss/template b/srcpkgs/python3-tinycss/template
new file mode 100644
index 00000000000..91fda6f808d
--- /dev/null
+++ b/srcpkgs/python3-tinycss/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-tinycss'
+pkgname=python3-tinycss
+version=0.4
+revision=1
+archs=noarch
+wrksrc=tinycss-${version}
+build_style=python3-module
+pycompile_module="tinycss"
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+depends="python3"
+short_desc="Complete yet simple CSS parser for Python"
+maintainer="mobinmob <mobinmob@disroot.org>"
+license="BSD-3-Clause"
+homepage="https://tinycss.readthedocs.io/en/latest/"
+distfiles="${PYPI_SITE}/t/tinycss/tinycss-${version}.tar.gz"
+checksum=12306fb50e5e9e7eaeef84b802ed877488ba80e35c672867f548c0924a76716e
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/python3-treq/template b/srcpkgs/python3-treq/template
index 78031e04e12..8f210d13489 100644
--- a/srcpkgs/python3-treq/template
+++ b/srcpkgs/python3-treq/template
@@ -10,7 +10,7 @@ hostmakedepends="python3-setuptools"
 depends="python3-incremental python3-requests>=2.1.0 python3-six
  python3-Twisted python3-attrs"
 short_desc="Requests-like API built on top of twisted.web's Agent"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/twisted/treq"
 distfiles="${PYPI_SITE}/t/treq/treq-${version}.tar.gz"
diff --git a/srcpkgs/python3-txacme/template b/srcpkgs/python3-txacme/template
index 999bcdf029d..e6becf593e7 100644
--- a/srcpkgs/python3-txacme/template
+++ b/srcpkgs/python3-txacme/template
@@ -10,7 +10,7 @@ hostmakedepends="python3-setuptools"
 depends="python3-attrs python3-acme python3-josepy python3-treq python3-Twisted
  python3-openssl python3-eliot python3-TxSNI python3-pem"
 short_desc="ACME protocol implementation for Twisted"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/twisted/txacme"
 distfiles="${PYPI_SITE}/t/txacme/txacme-${version}.tar.gz"
diff --git a/srcpkgs/python3-txaio/template b/srcpkgs/python3-txaio/template
new file mode 100644
index 00000000000..fa13338cd30
--- /dev/null
+++ b/srcpkgs/python3-txaio/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-txaio'
+pkgname=python3-txaio
+version=18.8.1
+revision=1
+archs=noarch
+wrksrc="txaio-${version}"
+build_style=python3-module
+pycompile_module="txaio"
+hostmakedepends="python3 python3-setuptools"
+short_desc="Utilities to support code that runs unmodified on Twisted and asyncio"
+maintainer="travankor <travankor@tuta.io>"
+license="MIT"
+homepage="https://github.com/crossbario/txaio"
+distfiles="https://github.com/crossbario/txaio/archive/v${version}.tar.gz"
+checksum=5b468ba8f8cee26e5a6de9e69169fddd9223b418bad9a6e9d3597906a013de97
+
+post-install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/python3-txtorcon/template b/srcpkgs/python3-txtorcon/template
new file mode 100644
index 00000000000..3018a65e457
--- /dev/null
+++ b/srcpkgs/python3-txtorcon/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-txtorcon'
+pkgname=python3-txtorcon
+version=19.1.0
+revision=1
+archs=noarch
+wrksrc="txtorcon-${version}"
+build_style=python3-module
+pycompile_module="twisted txtorcon"
+hostmakedepends="python3 python3-setuptools"
+depends="python3-automat python3-Twisted"
+short_desc="Twisted-based asynchronous Tor control protocol implementation"
+maintainer="travankor <travankor@tuta.io>"
+license="MIT"
+homepage="https://txtorcon.readthedocs.io/en/latest/"
+distfiles="https://github.com/meejah/txtorcon/archive/v${version}.tar.gz"
+checksum=c72d7474ff4385cd60b5c2c52a50ece3f19a6f00259bf0ff0c38b264036e1c2d
+
+post-install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/python3-unpaddedbase64/template b/srcpkgs/python3-unpaddedbase64/template
index 9321e73ae13..37df2c1d642 100644
--- a/srcpkgs/python3-unpaddedbase64/template
+++ b/srcpkgs/python3-unpaddedbase64/template
@@ -9,7 +9,7 @@ pycompile_module="unpaddedbase64.py"
 hostmakedepends="python3-setuptools"
 depends="python3"
 short_desc="Encode and decode Base64 without '=' padding"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://pypi.org/project/unpaddedbase64/"
 distfiles="https://github.com/matrix-org/python-unpaddedbase64/archive/v${version}.tar.gz"
diff --git a/srcpkgs/python3-usb/template b/srcpkgs/python3-usb/template
new file mode 100644
index 00000000000..a081ee5ba76
--- /dev/null
+++ b/srcpkgs/python3-usb/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-usb'
+pkgname=python3-usb
+_pkgname=pyusb
+version=1.0.2
+revision=1
+archs=noarch
+wrksrc="${_pkgname}-${version}"
+build_style=python3-module
+pycompile_module=usb
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python library for USB communication"
+maintainer="Doan Tran Cong Danh <congdanhqx@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://github.com/pyusb/pyusb"
+distfiles="${PYPI_SITE}/p/${_pkgname}/${_pkgname}-${version}.tar.gz"
+checksum=4e9b72cc4a4205ca64fbf1f3fff39a335512166c151ad103e55c8223ac147362
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/python3-validators/template b/srcpkgs/python3-validators/template
index 600d6f4731c..29b9fc74c30 100644
--- a/srcpkgs/python3-validators/template
+++ b/srcpkgs/python3-validators/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-validators'
 pkgname=python3-validators
-version=0.12.5
+version=0.14.0
 revision=1
 archs=noarch
 wrksrc="validators-${version}"
@@ -9,12 +9,12 @@ pycompile_module="validators"
 hostmakedepends="python3-setuptools"
 depends="python3-decorator python3-six"
 short_desc="Python3 Data Validation tools"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/kvesteri/validators"
 changelog="https://raw.githubusercontent.com/kvesteri/validators/master/CHANGES.rst"
 distfiles="${PYPI_SITE}/v/validators/validators-${version}.tar.gz"
-checksum=df3dda070965519283bae72249a36927ee3ea9c206f9ee6f234a71cf19b36136
+checksum=f0ac832212e3ee2e9b10e156f19b106888cf1429c291fbc5297aae87685014ae
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-vdf/template b/srcpkgs/python3-vdf/template
new file mode 100644
index 00000000000..44c635ecdd6
--- /dev/null
+++ b/srcpkgs/python3-vdf/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-vdf'
+pkgname=python3-vdf
+version=3.2
+revision=1
+wrksrc=vdf-${version}
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-setuptools"
+short_desc="Python library for working with Valve's VDF text format"
+maintainer="Caleb JA <skywise@tutanota.de>"
+license="MIT"
+homepage="https://github.com/ValvePython/vdf"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=ad790a34a20d9c5f36b8bd9e93658f85a9e90be7c84bb3a24f893b531a94e3ca
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/python3-virustotal-api/template b/srcpkgs/python3-virustotal-api/template
index fe38c1dc819..2bc6592c91f 100644
--- a/srcpkgs/python3-virustotal-api/template
+++ b/srcpkgs/python3-virustotal-api/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-virustotal-api'
 pkgname=python3-virustotal-api
-version=1.1.10
+version=1.1.11
 revision=1
 archs=noarch
 wrksrc="virustotal-api-${version}"
@@ -13,7 +13,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/blacktop/virustotal-api"
 distfiles="${PYPI_SITE}/v/virustotal-api/virustotal-api-${version}.tar.gz"
-checksum=7705881533852e3d22f45a3e8f266c14f153aee79a6768cec36ff88dd5b625f8
+checksum=9f1d783a848e928a78aa168372645c6899cbbd6b888951e1d6335e5b87de1c3d
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-yara/template b/srcpkgs/python3-yara/template
index f7065a9d994..4a6c56dd083 100644
--- a/srcpkgs/python3-yara/template
+++ b/srcpkgs/python3-yara/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-yara'
 pkgname=python3-yara
-version=3.10.0
+version=3.11.0
 revision=1
 wrksrc="yara-python-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="http://virustotal.github.io/yara/"
 distfiles="https://github.com/VirusTotal/yara-python/archive/v${version}.tar.gz"
-checksum=14ae284b3963eaaea280895647cce9860e3c97d747edb5b9269c78710ee21c2b
+checksum=1280cfa4844902e9d5848c84ecc87da3fc05fbacbd74371bb738d1f4fbba2850
diff --git a/srcpkgs/python3-zipp/template b/srcpkgs/python3-zipp/template
index ad4e3a01713..8445c10825c 100644
--- a/srcpkgs/python3-zipp/template
+++ b/srcpkgs/python3-zipp/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-zipp'
 pkgname=python3-zipp
-version=0.5.2
+version=0.6.0
 revision=1
 archs=noarch
 wrksrc="zipp-${version}"
@@ -14,7 +14,7 @@ license="MIT"
 homepage="https://github.com/jaraco/zipp"
 changelog="https://raw.githubusercontent.com/jaraco/zipp/master/CHANGES.rst"
 distfiles="${PYPI_SITE}/z/zipp/zipp-${version}.tar.gz"
-checksum=4970c3758f4e89a7857a973b1e2a5d75bcdc47794442f2e2dd4fe8e0466e809a
+checksum=3718b1cbcd963c7d4c5511a8240812904164b7f381b647143a89d3b98f9bcd8e
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/qalculate-gtk/template b/srcpkgs/qalculate-gtk/template
index bd303b3470b..065d1005309 100644
--- a/srcpkgs/qalculate-gtk/template
+++ b/srcpkgs/qalculate-gtk/template
@@ -1,6 +1,6 @@
 # Template file for 'qalculate-gtk'
 pkgname=qalculate-gtk
-version=3.3.0
+version=3.4.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config"
@@ -11,4 +11,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
 distfiles="https://github.com/Qalculate/qalculate-gtk/releases/download/v${version}/qalculate-gtk-${version}.tar.gz"
-checksum=45b2ef84dc3c1cc77fff9b78b9a81d7b6e29f7ac6d2c4ed8cdde37a58de77da7
+checksum=6ff0c1e9dd02fc4239569ca78bd3f5b8502676c9a08473e62975da22af97c271
diff --git a/srcpkgs/qalculate/template b/srcpkgs/qalculate/template
index a18d8e94ecd..b00c0d0c6c0 100644
--- a/srcpkgs/qalculate/template
+++ b/srcpkgs/qalculate/template
@@ -1,7 +1,7 @@
 # Template file for 'qalculate'
 pkgname=qalculate
-version=3.3.0
-revision=2
+version=3.4.0
+revision=1
 wrksrc="lib${pkgname}-${version}"
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config"
@@ -12,7 +12,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
 distfiles="https://github.com/Qalculate/libqalculate/releases/download/v${version}/libqalculate-${version}.tar.gz"
-checksum=708f1d461a7856fb94b12c400d6b07b001bbe853d7ac4aa8df43a8fe2a1c8547
+checksum=752d975c3e2cd3ff5827fde5f6d4554a2e5c436826ba8af9cb0623f82615dc60
 
 libqalculate-data_package() {
 	archs=noarch
diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template
index 32a1cadaf56..3dbf7b34ee9 100644
--- a/srcpkgs/qbittorrent/template
+++ b/srcpkgs/qbittorrent/template
@@ -1,6 +1,6 @@
 # Template file for 'qbittorrent'
 pkgname=qbittorrent
-version=4.1.7
+version=4.1.8
 revision=1
 create_wrksrc=yes
 build_style=qmake
@@ -12,7 +12,7 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"
 homepage="http://www.qbittorrent.org/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=1eef2cf930e167e7e1d2d338bf1efc0a4a38cba1211f909bc9741a7b5ff2b330
+checksum=3feea2ea401d933c492630e4406141658f17b5dc0c8cf9267f849ff2078fb0bb
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-svg-devel"
diff --git a/srcpkgs/qemu-user-static/template b/srcpkgs/qemu-user-static/template
index 6f3ecdf1b22..31031fc06cd 100644
--- a/srcpkgs/qemu-user-static/template
+++ b/srcpkgs/qemu-user-static/template
@@ -1,16 +1,16 @@
 # Template file for 'qemu-user-static'
 pkgname=qemu-user-static
-version=4.0.0
-revision=2
+version=4.1.0
+revision=1
 wrksrc="qemu-${version}"
 hostmakedepends="pkg-config automake python"
 makedepends="dtc-devel libglib-static pixman-devel libuuid-devel"
 short_desc="QEMU User-mode emulators (statically compiled)"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.qemu.org"
 distfiles="https://wiki.qemu.org/download/qemu-${version}.tar.bz2"
-checksum=6d7f713f7400c8a636c770118957b13d6a7f72b0d2da4a925d10455d8e33af20
+checksum=49f0de77410d4d0f7d0321ff2c2888b281381f06e1e2dac9ec4d061e3934f4ae
 
 _fmts="aarch64 alpha arm armeb cris i386 m68k microblaze mips mipsel mips64 mips64el ppc ppc64 ppc64abi32 ppc64le s390x sh4 sh4eb sparc sparc32plus sparc64 x86_64"
 
diff --git a/srcpkgs/qemu/patches/0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch b/srcpkgs/qemu/patches/0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch
index 848522715ef..4acb8e070ce 100644
--- a/srcpkgs/qemu/patches/0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch
+++ b/srcpkgs/qemu/patches/0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch
@@ -1,8 +1,8 @@
 Updated version of 0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch for qemu-3.0.0
 from alpine, original author Natanael Copa.
---- linux-user/signal.c	2018-09-04 10:23:03.244301111 +0200
-+++ linux-user/signal.c	2018-09-04 10:29:52.333828797 +0200
-@@ -26,6 +26,13 @@
+--- linux-user/signal.c	2019-08-22 19:46:40.369463327 +0200
++++ linux-user/signal.c	2019-08-22 19:47:25.176898649 +0200
+@@ -25,6 +25,13 @@
  #include "trace.h"
  #include "signal-common.h"
  
@@ -13,6 +13,6 @@ from alpine, original author Natanael Copa.
 +#define __SIGRTMAX (NSIG-1)
 +#endif
 +
- struct target_sigaltstack target_sigaltstack_used = {
-     .ss_sp = 0,
-     .ss_size = 0,
+ static struct target_sigaction sigact_table[TARGET_NSIG];
+ 
+ static void host_signal_handler(int host_signum, siginfo_t *info,
diff --git a/srcpkgs/qemu/patches/musl-ppc.patch b/srcpkgs/qemu/patches/musl-ppc.patch
index 86c21df4f1f..6f066c0b30e 100644
--- a/srcpkgs/qemu/patches/musl-ppc.patch
+++ b/srcpkgs/qemu/patches/musl-ppc.patch
@@ -58,3 +58,16 @@
  
      if (*pcreg > (uintptr_t)safe_syscall_start
          && *pcreg < (uintptr_t)safe_syscall_end) {
+--- util/mmap-alloc.c
++++ util/mmap-alloc.c
+@@ -25,6 +25,10 @@
+ 
+ #ifdef CONFIG_LINUX
+ #include <sys/vfs.h>
++/* musl undefs this on ppc and mips */
++#ifndef MAP_SYNC
++#define MAP_SYNC 0x80000
++#endif
+ #endif
+ 
+ size_t qemu_fd_getpagesize(int fd)
diff --git a/srcpkgs/qemu/template b/srcpkgs/qemu/template
index 630bbd5b206..c78d6ce0352 100644
--- a/srcpkgs/qemu/template
+++ b/srcpkgs/qemu/template
@@ -1,14 +1,13 @@
 # Template file for 'qemu'
 pkgname=qemu
-version=4.0.0
-revision=4
+version=4.1.0
+revision=3
 short_desc="Open Source Processor Emulator"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.qemu.org"
 distfiles="https://wiki.qemu.org/download/qemu-${version}.tar.bz2"
-checksum=6d7f713f7400c8a636c770118957b13d6a7f72b0d2da4a925d10455d8e33af20
-nocross=https://api.travis-ci.org/jobs/210268003/log.txt
+checksum=49f0de77410d4d0f7d0321ff2c2888b281381f06e1e2dac9ec4d061e3934f4ae
 
 nostrip=yes
 hostmakedepends="pkg-config perl python3 automake libtool flex python3-Sphinx"
@@ -31,7 +30,7 @@ desc_option_smartcard="Enable smartcard support"
 desc_option_numa="Enable support for host NUMA"
 
 case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*|ppc64*) build_options_default+=" spice";;
+	i686*|x86_64*|ppc64le*) build_options_default+=" spice";;
 	aarch64-musl) CFLAGS+=" -D_LINUX_SYSINFO_H";;
 esac
 
@@ -62,7 +61,7 @@ do_configure() {
 		--disable-xen --enable-tpm \
 		--enable-vhost-net --enable-vnc-png --enable-virtfs \
 		--enable-libusb --disable-glusterfs --enable-snappy --enable-usb-redir \
-		--enable-pie --localstatedir=/var --datadir=/usr/lib \
+		--enable-pie --localstatedir=/var --datadir=/usr/lib --enable-docs \
 		$(vopt_enable virgl virglrenderer) $(vopt_enable opengl) $(vopt_enable spice) \
 		${want_sdl} \
 		$(vopt_enable smartcard) \
@@ -72,13 +71,6 @@ do_build() {
 	# Remove our strip(1) wrapper... E2BIG.
 	rm -f ${XBPS_WRAPPERDIR}/strip
 
-	if [ "$CROSS_BUILD" ]; then
-		# XXX libtool execs cc and ar.
-		mkdir -p ${wrksrc}/cross
-		ln -sf /usr/bin/${XBPS_CROSS_TRIPLET}-gcc ${wrksrc}/cross/cc
-		ln -sf /usr/bin/${XBPS_CROSS_TRIPLET}-ar ${wrksrc}/cross/ar
-		export PATH=${wrksrc}/cross:$PATH
-	fi
 	make ${makejobs}
 }
 do_install() {
diff --git a/srcpkgs/qgit/template b/srcpkgs/qgit/template
index 7b9de0759c9..e4dcd3e5585 100644
--- a/srcpkgs/qgit/template
+++ b/srcpkgs/qgit/template
@@ -1,9 +1,9 @@
 # Template file for 'qgit'
 pkgname=qgit
-version=2.8
-revision=2
-build_style=cmake
+version=2.9
+revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
+build_style=cmake
 makedepends="qt5-devel"
 depends="git"
 short_desc="Qt-based Git GUI"
@@ -11,7 +11,7 @@ maintainer="Matthias von Faber <mvf@gmx.eu>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/tibirna/qgit"
 distfiles="${homepage}/archive/${pkgname}-${version}.tar.gz"
-checksum=a6751181bde2ff9f3a097694e5c42db689633028b178595f66909d6585cad514
+checksum=69788efda7d434d1bc094bb414bd92c269dc7894326320634500b05d63c008e8
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/qimgv/template b/srcpkgs/qimgv/template
index 6933f900e87..3ead6dbdc2b 100644
--- a/srcpkgs/qimgv/template
+++ b/srcpkgs/qimgv/template
@@ -1,17 +1,18 @@
 # Template file for 'qimgv'
 pkgname=qimgv
-version=0.7.3
+version=0.8.5
 revision=1
 build_style=cmake
 configure_args="$(vopt_if video -DVIDEO_SUPPORT=ON)"
-makedepends="qt5-devel $(vopt_if video mpv-devel)"
+makedepends="exiv2-devel qt5-devel $(vopt_if video mpv-devel)"
 depends="hicolor-icon-theme"
 short_desc="Cross-platform image viewer with webm support"
 maintainer="travankor <travankor@tuta.io>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/easymodo/qimgv"
 distfiles="https://github.com/easymodo/qimgv/archive/v${version}.tar.gz"
-checksum=f5c9e4dfdc0e9842c6cec5d2d546e6f77b2c33312f5cb416eaf50a29a0dc65a1
+checksum=857919b6f0432965fa26e5c72fa293299d797f0253848e18b86218c1b387d562
+
 build_options="video"
 build_options_default="video"
 desc_option_video="Enable video support"
diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template
index 572968cf4eb..38d597225ff 100644
--- a/srcpkgs/qmmp/template
+++ b/srcpkgs/qmmp/template
@@ -1,7 +1,7 @@
 # Template file for 'qmmp'
 pkgname=qmmp
-version=1.3.3
-revision=2
+version=1.3.4
+revision=1
 build_style=cmake
 configure_args="-DUSE_HAL:BOOL=FALSE -DQMMP_DEFAULT_UI:STRING=simple"
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -20,7 +20,7 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-3.0-or-newer"
 homepage="http://qmmp.ylsoftware.com"
 distfiles="http://qmmp.ylsoftware.com/files/${pkgname}-${version}.tar.bz2"
-checksum=471c93cdd15f635893c00db72865e5d475eaf85b0f00cf15c550cfb51f9ee79c
+checksum=e07d9026e5d0c53bf1a057974088363929a06f4e3785447956879b204c7d3b49
 
 qmmp-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/qpdf/template b/srcpkgs/qpdf/template
index 6135ccb9ac3..a84fc8bd777 100644
--- a/srcpkgs/qpdf/template
+++ b/srcpkgs/qpdf/template
@@ -1,6 +1,6 @@
 # Template file for 'qpdf'
 pkgname=qpdf
-version=8.4.2
+version=9.0.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl"
@@ -11,7 +11,7 @@ license="Apache-2.0"
 homepage="http://qpdf.sourceforge.net"
 changelog="https://raw.githubusercontent.com/qpdf/qpdf/master/ChangeLog"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=69a30a65ef9398e6dbf151f1f6a31321cbc0f49b6cc0689ce10ea958bfd13ec3
+checksum=d02451d906068947f45e5216032f0f29ae53313c70c4deedcf3c3e173584d22c
 
 libqpdf_package() {
 	short_desc+=" - shared library"
diff --git a/srcpkgs/qqc2-desktop-style/template b/srcpkgs/qqc2-desktop-style/template
index 1e8a4f8cde8..09a1fa2ba2e 100644
--- a/srcpkgs/qqc2-desktop-style/template
+++ b/srcpkgs/qqc2-desktop-style/template
@@ -1,6 +1,6 @@
 # Template file for 'qqc2-desktop-style'
 pkgname=qqc2-desktop-style
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-or-later, LGPL-3.0-only, GPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/framework/qqc2-desktop-style"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=26042c4f939b94caa559cba3ef171ef7bb1490f57c9907f5e4b30a701659abb4
+checksum=859a2cdc4e5e357e0d8024b68170fcb30a5e9df0e0ecb2fc2dc614ebca38e2eb
 
 qqc2-desktop-style-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/qt/patches/gcc9-qforeach.patch b/srcpkgs/qt/patches/gcc9-qforeach.patch
new file mode 100644
index 00000000000..a5397c9e4fc
--- /dev/null
+++ b/srcpkgs/qt/patches/gcc9-qforeach.patch
@@ -0,0 +1,67 @@
+# reason: FTBFS with gcc9
+# src: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=925811
+
+From c35a3f519007af44c3b364b9af86f6a336f6411b Mon Sep 17 00:00:00 2001
+From: Thiago Macieira <thiago.macieira@intel.com>
+Date: Tue, 11 Feb 2014 16:17:46 -0800
+Subject: [PATCH] Redo the Q_FOREACH loop control without GCC statement
+ expressions
+
+It's possible to do without them, which probably makes the number of
+supported compilers a lot bigger: they just need to support decltype()
+or __typeof__.
+
+That includes the Intel compiler. The old code was also apparently
+working, but no one had realized the old workaround for some old version
+was still in place.
+
+The loop overhead is more or less the same. I have not done benchmarks,
+but inspection of the generated assembly shows more or less the same
+number of instructions.
+
+Change-Id: I32d499c84a6ddd19d994b49f17a469acb5c3a3f1
+Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
+Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
+
+Backported to Qt 4
+
+--- a/src/corelib/global/qglobal.h
++++ b/src/corelib/global/qglobal.h
+@@ -2482,22 +2482,32 @@ typedef uint Flags;
+ 
+ #endif /* Q_NO_TYPESAFE_FLAGS */
+ 
+-#if defined(Q_CC_GNU) && !defined(Q_CC_INTEL) && !defined(Q_CC_RVCT)
++#if (defined(Q_CC_GNU) && !defined(Q_CC_RVCT))
+ /* make use of typeof-extension */
+ template <typename T>
+ class QForeachContainer {
+ public:
+-    inline QForeachContainer(const T& t) : c(t), brk(0), i(c.begin()), e(c.end()) { }
++    inline QForeachContainer(const T& t) : c(t), i(c.begin()), e(c.end()), control(1) { }
+     const T c;
+     int brk;
+     typename T::const_iterator i, e;
++    int control;
+ };
+ 
++// Explanation of the control word:
++//  - it's initialized to 1
++//  - that means both the inner and outer loops start
++//  - if there were no breaks, at the end of the inner loop, it's set to 0, which
++//    causes it to exit (the inner loop is run exactly once)
++//  - at the end of the outer loop, it's inverted, so it becomes 1 again, allowing
++//    the outer loop to continue executing
++//  - if there was a break inside the inner loop, it will exit with control still
++//    set to 1; in that case, the outer loop will invert it to 0 and will exit too
+ #define Q_FOREACH(variable, container)                                \
+ for (QForeachContainer<__typeof__(container)> _container_(container); \
+-     !_container_.brk && _container_.i != _container_.e;              \
+-     __extension__  ({ ++_container_.brk; ++_container_.i; }))                       \
+-    for (variable = *_container_.i;; __extension__ ({--_container_.brk; break;}))
++     _container_.control && _container_.i != _container_.e;         \
++     ++_container_.i, _container_.control ^= 1)                     \
++    for (variable = *_container_.i; _container_.control; _container_.control = 0)
+ 
+ #else
+ 
diff --git a/srcpkgs/qt5-styleplugins/template b/srcpkgs/qt5-styleplugins/template
index 745bcb8f7a5..d136d665c9a 100644
--- a/srcpkgs/qt5-styleplugins/template
+++ b/srcpkgs/qt5-styleplugins/template
@@ -1,19 +1,19 @@
 # Template file for 'qt5-styleplugins'
 pkgname=qt5-styleplugins
 version=5.0.0
-revision=8
-_gitrev=600c296f4d429ffeb8203feb54efeacc2bbea0f7
+revision=10
+_gitrev=335dbece103e2cbf6c7cf819ab6672c2956b17b3
 wrksrc="qtstyleplugins-${_gitrev}"
 build_style=qmake
 hostmakedepends="pkg-config qt5-host-tools qt5-devel"
 makedepends="libxcb-devel libxkbcommon-devel libinput-devel tslib-devel gtk+-devel qt5-devel"
-depends="qt5>=5.13.0<5.13.1"
+depends="qt5>=5.13.1<5.13.2"
 short_desc="Additional style plugins for Qt5"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="LGPL-2.1-only, LGPL-3.0-only"
 homepage="https://github.com/qt/qtstyleplugins"
 distfiles="https://github.com/qt/qtstyleplugins/archive/${_gitrev}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=dbe1c03f00c6eadebc0ed9d5ec1eeb9129e8132c8574545dfa788f505c2dd9a3
+checksum=29ec24fa8df64be161ad06d0e5af3ba1a20bfe265004f5fe4ab9f5f3abf9a5ba
 
 # Cross builds fail with -fuse-ld=gold
 LDFLAGS="-Wl,-fuse-ld=bfd"
diff --git a/srcpkgs/qt5-webkit/patches/musl-ppc.patch b/srcpkgs/qt5-webkit/patches/musl-ppc.patch
new file mode 100644
index 00000000000..21d3017397e
--- /dev/null
+++ b/srcpkgs/qt5-webkit/patches/musl-ppc.patch
@@ -0,0 +1,14 @@
+--- Source/JavaScriptCore/heap/MachineStackMarker.cpp
++++ Source/JavaScriptCore/heap/MachineStackMarker.cpp
+@@ -87,7 +87,11 @@ static void pthreadSignalHandlerSuspendResume(int, siginfo_t*, void* ucontext)
+ 
+     ucontext_t* userContext = static_cast<ucontext_t*>(ucontext);
+ #if CPU(PPC)
++# if defined(__GLIBC__)
+     thread->suspendedMachineContext = *userContext->uc_mcontext.uc_regs;
++# else
++    thread->suspendedMachineContext = *userContext->uc_regs;
++# endif
+ #else
+     thread->suspendedMachineContext = userContext->uc_mcontext;
+ #endif
diff --git a/srcpkgs/qt5-webkit/patches/ppc-llint.patch b/srcpkgs/qt5-webkit/patches/ppc-llint.patch
new file mode 100644
index 00000000000..2fc5a46e523
--- /dev/null
+++ b/srcpkgs/qt5-webkit/patches/ppc-llint.patch
@@ -0,0 +1,32 @@
+This fixes JavaScriptCore on big endian systems (mainly ppc).
+
+Without the patch, attempting to run any JS results in
+a crash as the generated code was endian specific.
+
+--- Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
++++ Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
+@@ -1500,13 +1500,13 @@ _llint_op_put_by_id:
+     loadp StructureChain::m_vector[t3], t3
+     assert(macro (ok) btpnz t3, ok end)
+ 
+-    loadp Structure::m_prototype[t2], t2
++    loadp Structure::m_prototype + PayloadOffset[t2], t2
+     btpz t2, .opPutByIdTransitionChainDone
+ .opPutByIdTransitionChainLoop:
+     loadp [t3], t1
+     bpneq t1, JSCell::m_structureID[t2], .opPutByIdSlow
+     addp 4, t3
+-    loadp Structure::m_prototype[t1], t2
++    loadp Structure::m_prototype + PayloadOffset[t1], t2
+     btpnz t2, .opPutByIdTransitionChainLoop
+ 
+ .opPutByIdTransitionChainDone:
+@@ -1984,7 +1984,7 @@ _llint_throw_from_slow_path_trampoline:
+     # When throwing from the interpreter (i.e. throwing from LLIntSlowPaths), so
+     # the throw target is not necessarily interpreted code, we come to here.
+     # This essentially emulates the JIT's throwing protocol.
+-    loadp Callee[cfr], t1
++    loadp Callee + PayloadOffset[cfr], t1
+     andp MarkedBlockMask, t1
+     loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t1], t1
+     copyCalleeSavesToVMCalleeSavesBuffer(t1, t2)
diff --git a/srcpkgs/qt5-webkit/patches/reduce-exports.patch b/srcpkgs/qt5-webkit/patches/reduce-exports.patch
new file mode 100644
index 00000000000..7addb0f7c16
--- /dev/null
+++ b/srcpkgs/qt5-webkit/patches/reduce-exports.patch
@@ -0,0 +1,27 @@
+Description: reduce the number of exported symbols in libQt5WebKit.so.5
+Author: Dmitry Shachnev <mitya57@debian.org>
+Forwarded: not-needed
+Last-Update: 2017-08-27
+
+--- Source/WTF/wtf/ExportMacros.h
++++ Source/WTF/wtf/ExportMacros.h
+@@ -56,7 +56,7 @@
+ 
+ #elif defined(__GNUC__) && !defined(__CC_ARM) && !defined(__ARMCC__)
+ 
+-#define WTF_EXPORT_DECLARATION __attribute__((visibility("default")))
++#define WTF_EXPORT_DECLARATION
+ #define WTF_IMPORT_DECLARATION WTF_EXPORT_DECLARATION
+ #define WTF_HIDDEN_DECLARATION __attribute__((visibility("hidden")))
+ 
+--- Source/cmake/OptionsQt.cmake
++++ Source/cmake/OptionsQt.cmake
+@@ -658,6 +658,7 @@ if (COMPILER_IS_GCC_OR_CLANG AND UNIX)
+     if (NOT SHARED_CORE)
+         set(CMAKE_C_FLAGS "-fvisibility=hidden ${CMAKE_C_FLAGS}")
+         set(CMAKE_CXX_FLAGS "-fvisibility=hidden -fvisibility-inlines-hidden ${CMAKE_CXX_FLAGS}")
++        add_definitions(-DJS_NO_EXPORT)
+     endif ()
+ endif ()
+ 
+
diff --git a/srcpkgs/qt5-webkit/template b/srcpkgs/qt5-webkit/template
index fefc8261ade..c7c09c1376e 100644
--- a/srcpkgs/qt5-webkit/template
+++ b/srcpkgs/qt5-webkit/template
@@ -1,23 +1,30 @@
 # Template file for 'qt5-webkit'
 pkgname=qt5-webkit
 version=5.212.0
-revision=5
-_snap=1561566461
+revision=6
+_snap=1565895469
 _v=${version%.*}
 wrksrc="qtwebkit-everywhere-src-${_v}"
 build_style=cmake
-configure_args="-DPORT=Qt -DUSE_LD_GOLD=OFF"
+# some nasty stuff to prevent cmake from inducing buggy -O3 and default -g
+configure_args="-DPORT=Qt -DUSE_LD_GOLD=OFF
+ -DCMAKE_CXX_FLAGS_RELEASE=-DNDEBUG
+ -DCMAKE_CXX_FLAGS_DEBUG=-DNDEBUG
+ -DCMAKE_CXX_FLAGS_RELWITHDEBINFO=-DNDEBUG
+ -DCMAKE_C_FLAGS_RELEASE=-DNDEBUG
+ -DCMAKE_C_FLAGS_DEBUG=-DNDEBUG
+ -DCMAKE_C_FLAGS_RELWITHDEBINFO=-DNDEBUG"
 hostmakedepends="flex gperf perl pkg-config python qt5-qmake ruby"
 makedepends="libwebp-devel libxslt-devel libXcomposite-devel sqlite-devel
  libjpeg-turbo-devel gst-plugins-base1-devel qt5-declarative-devel
  qt5-location-devel qt5-sensors-devel qt5-webchannel-devel hyphen-devel
  ruby-devel"
 short_desc="Cross-platform application and UI framework (Qt5) - WebKit2 component"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="q66 <daniel@octaforge.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.qt.io/"
 distfiles="https://download.qt.io/snapshots/ci/qtwebkit/${_v}/${_snap}/src/submodules/qtwebkit-everywhere-src-${_v}.tar.xz"
-checksum=68eae85e7a12077b8004d7a039af065d68112e8e9ab95013f4e01527759fab9f
+checksum=607f0a13e05bbf831d86904d12ae464e7d46a15f0ceed2465487b53512948824
 
 CPPFLAGS="-I${XBPS_CROSS_BASE}/usr/include"
 CXXFLAGS="-fpermissive -Wno-class-memaccess"
@@ -27,25 +34,45 @@ if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DRUBY_CONFIG_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include/ruby-*"
 fi
 
+# only a few platform support JIT
 case "$XBPS_TARGET_MACHINE" in
-	armv6*)	# Need libatomic for __atomic_fetch_add_8 etc.
-		makedepends+=" libatomic-devel"
-		LIBS+=" -latomic"
-		;;
-	ppc64*)	# no JIT on ppc64 and other build workarounds
-		configure_args+=" -DENABLE_JIT=OFF -DUSE_SYSTEM_MALLOC=ON"
-		;;
-	i686*)  # try to reduce memory footprint when linking
-		nodebug=1
-		;;
-	ppc*)   # no JIT on ppc and need libatomic
-		configure_args+=" -DENABLE_JIT=OFF -DUSE_SYSTEM_MALLOC=ON"
+	armv[67]*|aarch64*|i686*|x86_64*|mips*) ;;
+	*) configure_args+=" -DENABLE_JIT=OFF" ;;
+esac
+
+# some platforms need libatomic
+case "$XBPS_TARGET_MACHINE" in
+	ppc64*) ;;
+	armv6*|ppc*)
 		makedepends+=" libatomic-devel"
 		LIBS+=" -latomic"
 		;;
+	*) ;;
+esac
+
+# use system malloc on ppc64le (potential 64k page kernel)
+case "$XBPS_TARGET_MACHINE" in
+	ppc64le*) configure_args+=" -DUSE_SYSTEM_MALLOC=ON" ;;
+	*) ;;
 esac
 
 pre_configure() {
+	# work around large debug symbols on 32-bit hosts
+	if [ "$XBPS_WORDSIZE" = "32" ]; then
+		export CFLAGS="${CFLAGS/-g/-g1}"
+		export CXXFLAGS="${CXXFLAGS/-g/-g1}"
+		export LDFLAGS+=" -Wl,--no-keep-memory"
+	fi
+
+	# the above is not enough for 32-bit ppc and debug
+	case "$XBPS_TARGET_MACHINE" in
+		ppc64*) ;;
+		ppc*)
+			export CFLAGS="${CFLAGS/-O2/-Os}"
+			export CXXFLAGS="${CXXFLAGS/-O2/-Os}"
+			;;
+	esac
+
 	if [ "$CROSS_BUILD" ]; then
 		# XXX: disable failing check for private headers and assume they are available
 		sed -i Source/cmake/OptionsQt.cmake \
diff --git a/srcpkgs/qt5/patches/0027-remove-glibc-check.patch b/srcpkgs/qt5/patches/0027-remove-glibc-check.patch
new file mode 100644
index 00000000000..fd0ab849c01
--- /dev/null
+++ b/srcpkgs/qt5/patches/0027-remove-glibc-check.patch
@@ -0,0 +1,13 @@
+--- qtwebengine/config.tests/glibc/glibc.cpp
++++ qtwebengine/config.tests/glibc/glibc.cpp
+@@ -28,10 +28,6 @@
+ 
+ #include <features.h>
+ 
+-#if __GLIBC__ < 2 || __GLIBC_MINOR__ < 17
+-#error glibc versions below 2.17 are not supported
+-#endif
+-
+ int main(int , char **) {
+   return 0;
+ }
diff --git a/srcpkgs/qt5/patches/0048-qtbug-76742.patch b/srcpkgs/qt5/patches/0048-qtbug-76742.patch
deleted file mode 100644
index 311ad55e4d4..00000000000
--- a/srcpkgs/qt5/patches/0048-qtbug-76742.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Source: https://codereview.qt-project.org/c/qt/qtbase/+/267242
-Upstream: yes
-Reason: fix focus stealing in applications (e.g. VirtualBox)
-
---- qtbase/src/plugins/platforms/xcb/qxcbconnection.cpp	2019-06-13 06:18:18.000000000 +0200
-+++ qtbase/src/plugins/platforms/xcb/qxcbconnection.cpp	2019-07-21 11:56:22.250127747 +0200
-@@ -133,6 +133,7 @@
-         qunsetenv("DESKTOP_STARTUP_ID");
- 
-     m_focusInTimer.setSingleShot(true);
-+    m_focusInTimer.setInterval(100);
-     m_focusInTimer.callOnTimeout([]() {
-         // No FocusIn events for us, proceed with FocusOut normally.
-         QWindowSystemInterface::handleWindowActivated(nullptr, Qt::ActiveWindowFocusReason);
---- qtbase/src/plugins/platforms/xcb/qxcbwindow.cpp	2019-06-13 06:18:18.000000000 +0200
-+++ qtbase/src/plugins/platforms/xcb/qxcbwindow.cpp	2019-07-21 11:58:00.255122346 +0200
-@@ -848,7 +848,7 @@
-     connection()->setFocusWindow(nullptr);
-     relayFocusToModalWindow();
-     // Do not set the active window to nullptr if there is a FocusIn coming.
--    connection()->focusInTimer().start(400);
-+    connection()->focusInTimer().start();
- }
- 
- struct QtMotifWmHints {
diff --git a/srcpkgs/qt5/patches/0049-big-endian-scroll.patch b/srcpkgs/qt5/patches/0049-big-endian-scroll.patch
new file mode 100644
index 00000000000..013fa6a1ab4
--- /dev/null
+++ b/srcpkgs/qt5/patches/0049-big-endian-scroll.patch
@@ -0,0 +1,54 @@
+--- qtbase/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
++++ qtbase/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
+@@ -43,6 +43,7 @@
+ #include "qxcbwindow.h"
+ #include "qtouchdevice.h"
+ #include "QtCore/qmetaobject.h"
++#include "QtCore/qendian.h"
+ #include <qpa/qwindowsysteminterface_p.h>
+ #include <QDebug>
+ #include <cmath>
+@@ -66,6 +67,7 @@
+     xiEventMask.mask = XCB_INPUT_XI_EVENT_MASK_HIERARCHY;
+     xiEventMask.mask |= XCB_INPUT_XI_EVENT_MASK_DEVICE_CHANGED;
+     xiEventMask.mask |= XCB_INPUT_XI_EVENT_MASK_PROPERTY;
++    xiEventMask.mask = qToLittleEndian(xiEventMask.mask);
+     xcb_input_xi_select_events(xcb_connection(), rootWindow(), 1, &xiEventMask.header);
+ }
+ 
+@@ -90,7 +92,7 @@
+     qt_xcb_input_event_mask_t mask;
+     mask.header.deviceid = XCB_INPUT_DEVICE_ALL_MASTER;
+     mask.header.mask_len = 1;
+-    mask.mask = bitMask;
++    mask.mask = qToLittleEndian(bitMask);
+     xcb_void_cookie_t cookie =
+             xcb_input_xi_select_events_checked(xcb_connection(), window, 1, &mask.header);
+     xcb_generic_error_t *error = xcb_request_check(xcb_connection(), cookie);
+@@ -359,7 +361,7 @@
+         qt_xcb_input_event_mask_t xiMask;
+         xiMask.header.deviceid = XCB_INPUT_DEVICE_ALL_MASTER;
+         xiMask.header.mask_len = 1;
+-        xiMask.mask = mask;
++        xiMask.mask = qToLittleEndian(mask);
+ 
+         xcb_void_cookie_t cookie =
+                 xcb_input_xi_select_events_checked(xcb_connection(), window, 1, &xiMask.header);
+@@ -386,7 +388,7 @@
+             tabletDevices.insert(deviceId);
+             xiEventMask[i].header.deviceid = deviceId;
+             xiEventMask[i].header.mask_len = 1;
+-            xiEventMask[i].mask = mask;
++            xiEventMask[i].mask = qToLittleEndian(mask);
+         }
+         xcb_input_xi_select_events(xcb_connection(), window, nrTablets, &(xiEventMask.data()->header));
+     }
+@@ -402,7 +404,7 @@
+ #endif
+             xiEventMask[i].header.deviceid = scrollingDevice.deviceId;
+             xiEventMask[i].header.mask_len = 1;
+-            xiEventMask[i].mask = mask;
++            xiEventMask[i].mask = qToLittleEndian(mask);
+             i++;
+         }
+         xcb_input_xi_select_events(xcb_connection(), window, i, &(xiEventMask.data()->header));
diff --git a/srcpkgs/qt5/patches/0050-pulse-stubs.patch b/srcpkgs/qt5/patches/0050-pulse-stubs.patch
new file mode 100644
index 00000000000..c4f0fae86ee
--- /dev/null
+++ b/srcpkgs/qt5/patches/0050-pulse-stubs.patch
@@ -0,0 +1,49 @@
+Pulse changed API in a recent update and these need to be fixed
+in order to avoid build errors.
+
+--- qtwebengine/src/3rdparty/chromium/media/audio/pulse/pulse.sigs
++++ qtwebengine/src/3rdparty/chromium/media/audio/pulse/pulse.sigs
+@@ -24,11 +24,11 @@ pa_operation* pa_context_get_source_info_by_index(pa_context* c, uint32_t idx, p
+ pa_operation* pa_context_get_source_info_by_name(pa_context* c, const char* name, pa_source_info_cb_t cb, void *userdata);
+ pa_operation* pa_context_get_source_info_list(pa_context* c, pa_source_info_cb_t cb, void* userdata);
+ pa_operation* pa_context_get_sink_info_list(pa_context* c, pa_sink_info_cb_t cb, void* userdata);
+-pa_context_state_t pa_context_get_state(pa_context* c);
++pa_context_state_t pa_context_get_state(const pa_context* c);
+ pa_context* pa_context_new(pa_mainloop_api* mainloop, const char* name);
+ pa_operation* pa_context_set_source_volume_by_index(pa_context* c, uint32_t idx, const pa_cvolume* volume, pa_context_success_cb_t cb, void* userdata);
+ void pa_context_set_state_callback(pa_context* c, pa_context_notify_cb_t cb, void* userdata);
+-pa_operation_state_t pa_operation_get_state(pa_operation* o);
++pa_operation_state_t pa_operation_get_state(const pa_operation* o);
+ void pa_context_unref(pa_context* c);
+ void pa_operation_unref(pa_operation* o);
+ int pa_stream_begin_write(pa_stream* p, void** data, size_t* nbytes);
+@@ -38,23 +38,23 @@ pa_operation* pa_stream_cork(pa_stream* s, int b, pa_stream_success_cb_t cb, voi
+ int pa_stream_disconnect(pa_stream* s);
+ int pa_stream_drop(pa_stream *p);
+ pa_operation* pa_stream_flush(pa_stream* s, pa_stream_success_cb_t cb, void* userdata);
+-uint32_t pa_stream_get_device_index(pa_stream* s);
++uint32_t pa_stream_get_device_index(const pa_stream* s);
+ int pa_stream_get_latency(pa_stream* s, pa_usec_t* r_usec, int* negative);
+-pa_stream_state_t pa_stream_get_state(pa_stream* p);
++pa_stream_state_t pa_stream_get_state(const pa_stream* p);
+ pa_stream* pa_stream_new(pa_context*  c, const char*  name, const pa_sample_spec*  ss, const pa_channel_map *  map);
+ pa_stream* pa_stream_new_with_proplist(pa_context* c, const char* name, const pa_sample_spec* ss, const pa_channel_map* map, pa_proplist* p);
+ pa_proplist* pa_proplist_new(void);
+-int pa_proplist_contains(pa_proplist* p, const char* key);
++int pa_proplist_contains(const pa_proplist* p, const char* key);
+ void pa_proplist_free(pa_proplist* p);
+-const char* pa_proplist_gets(pa_proplist* p, const char* key);
++const char* pa_proplist_gets(const pa_proplist* p, const char* key);
+ int pa_proplist_sets(pa_proplist* p, const char* key, const char* value);
+-size_t pa_stream_readable_size(pa_stream *p);
++size_t pa_stream_readable_size(const pa_stream *p);
+ int pa_stream_peek(pa_stream* p, const void** data, size_t* nbytes);
+ void pa_stream_set_read_callback(pa_stream* p, pa_stream_request_cb_t cb, void* userdata);
+ void pa_stream_set_state_callback(pa_stream* s, pa_stream_notify_cb_t cb, void* userdata);
+ int pa_stream_write(pa_stream* p, const void* data, size_t nbytes, pa_free_cb_t free_cb, int64_t offset, pa_seek_mode_t seek);
+ void pa_stream_set_write_callback(pa_stream *p, pa_stream_request_cb_t cb, void *userdata);
+ void pa_stream_unref(pa_stream* s);
+-int pa_context_errno(pa_context *c);
++int pa_context_errno(const pa_context *c);
+ const char* pa_strerror(int error);
+ pa_cvolume* pa_cvolume_set(pa_cvolume* a, unsigned  channels, pa_volume_t v);
diff --git a/srcpkgs/qt5/patches/0100-qtbug-77364.patch b/srcpkgs/qt5/patches/0100-qtbug-77364.patch
new file mode 100644
index 00000000000..5a3629bf0b7
--- /dev/null
+++ b/srcpkgs/qt5/patches/0100-qtbug-77364.patch
@@ -0,0 +1,26 @@
+From c09cf578bd7267b867326101cd2d0f39e7c814fe Mon Sep 17 00:00:00 2001
+From: David Faure <david.faure@kdab.com>
+Date: Mon, 09 Sep 2019 18:12:26 +0200
+Subject: [PATCH] QWidget::setFocusProxy: adjust focus widget properly
+
+My commit 3e7463411e adjusted the focus widget by setting
+QApplicationPrivate::focus_widget directly, while there is a method for
+doing this properly, including setFocus_sys() and emitting signals.
+
+Fixes: QTBUG-77364
+Change-Id: I218acf7a9de39173d282ced46def4f65594f80b4
+---
+
+diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
+index cf5a81c..6889c2e 100644
+--- qtbase/src/widgets/kernel/qwidget.cpp
++++ qtbase/src/widgets/kernel/qwidget.cpp
+@@ -6204,7 +6204,7 @@
+ 
+     if (changingAppFocusWidget) {
+         QWidget *newDeepestFocusProxy = d_func()->deepestFocusProxy();
+-        QApplicationPrivate::focus_widget = newDeepestFocusProxy ? newDeepestFocusProxy : this;
++        QApplicationPrivate::setFocusWidget(newDeepestFocusProxy ? newDeepestFocusProxy : this, Qt::NoFocusReason);
+     }
+ }
+ 
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index b74455ff653..0b74add5101 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5'
 pkgname=qt5
-version=5.13.0
-revision=4
+version=5.13.1
+revision=1
 wrksrc="qt-everywhere-src-${version}"
 build_style=gnu-configure
 hostmakedepends="cmake clang flex git glib-devel gperf ninja pkg-config
@@ -21,7 +21,7 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-3.0-or-later, LGPL-3.0-or-later"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/single/qt-everywhere-src-${version}.tar.xz"
-checksum=2cba31e410e169bd5cdae159f839640e672532a4687ea0f265f686421e0e86d6
+checksum=adf00266dc38352a166a9739f1a24a1e36f1be9c04bf72e16e142a256436974e
 replaces="qt5-doc<5.6.0 qt5-quick1<5.6.0 qt5-quick1-devel<5.6.0 qt5-webkit<5.6.0 qt5-webkit-devel<5.6.0
  qt5-enginio<5.7.1 qt5-enginio-devel<5.7.1 qt5-plugin-gtk<5.7.1 qt5-canvas3d<5.13.0"
 
@@ -75,7 +75,7 @@ if [ "$build_option_webengine" ]; then
 	subpackages+=" qt5-webengine qt5-webengine-devel"
 fi
 
-if [ "${XBPS_MACHINE%%-musl}" = i686 ]; then
+if [ "$XBPS_WORDSIZE" -eq 32 ]; then
 	nodebug=yes  # prevent OOM
 fi
 
@@ -412,6 +412,7 @@ do_configure() {
 }
 
 do_build() {
+	export NINJAJOBS=${makejobs}
 	# Run make twice because sometimes a file "chrome/grit/generated_resources.h"
 	# is not yet ready when it is to be included. Repeating make works around that
 	# problem without having to resort to disable_parallel_build=yes
diff --git a/srcpkgs/qt5dxcb-plugin/template b/srcpkgs/qt5dxcb-plugin/template
index 5013fc8751e..1dbb3a8f99c 100644
--- a/srcpkgs/qt5dxcb-plugin/template
+++ b/srcpkgs/qt5dxcb-plugin/template
@@ -1,14 +1,14 @@
 # Template file for 'qt5dxcb-plugin'
 pkgname=qt5dxcb-plugin
 version=5.0.1
-revision=1
+revision=2
 build_style=qmake
 make_build_args="VERSION=${version}"
 hostmakedepends="pkg-config qt5-qmake"
 makedepends="cairo-devel libSM-devel libXi-devel libxkbcommon-devel
  qt5-x11extras-devel xcb-util-image-devel xcb-util-keysyms-devel
  xcb-util-renderutil-devel xcb-util-wm-devel"
-depends="qt5>=5.13.0<5.13.1"
+depends="qt5>=5.13.1<5.13.2"
 short_desc="Qt platform plugins for DDE"
 maintainer="John <johnz@posteo.net>"
 license="GPL-3.0-or-later"
@@ -29,6 +29,11 @@ pre_configure() {
 		msg_red "${_qt5_version%_*} does not match ${_qt5_dep_ver}\\n"
 		exit 1
 	fi
+
+	# no headers for 5.13.1 yet; 5.13.0 headers are the same for this
+	# remove on next version upgrade (after upstream has added them)
+	ln -s ${wrksrc}/platformplugin/libqt5xcbqpa-dev/5.13.0 \
+		${wrksrc}/platformplugin/libqt5xcbqpa-dev/5.13.1
 }
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/qt5integration/template b/srcpkgs/qt5integration/template
index 5fcb13ba952..5b948a83f4e 100644
--- a/srcpkgs/qt5integration/template
+++ b/srcpkgs/qt5integration/template
@@ -1,12 +1,12 @@
 # Template file for 'qt5integration'
 pkgname=qt5integration
 version=5.0.0
-revision=1
+revision=2
 build_style=qmake
 hostmakedepends="qt5-qmake pkg-config"
 makedepends="libqtxdg-devel dtkwm-devel dtkwidget-devel mtdev-devel
  qt5-svg-devel qt5-x11extras-devel qt5-multimedia-devel"
-depends="qt5dxcb-plugin qt5-styleplugins qt5>=5.13.0<5.13.1"
+depends="qt5dxcb-plugin qt5-styleplugins qt5>=5.13.1<5.13.2"
 short_desc="Qt platform theme integration plugins for Deepin Desktop Environment"
 maintainer="John <johnz@posteo.net>"
 license="GPL-3.0-or-later"
diff --git a/srcpkgs/qt5pas/template b/srcpkgs/qt5pas/template
index f47b4eec5d7..0d8c75b9240 100644
--- a/srcpkgs/qt5pas/template
+++ b/srcpkgs/qt5pas/template
@@ -7,7 +7,7 @@ build_style=qmake
 hostmakedepends="qt5-qmake"
 makedepends="qt5-devel qt5-x11extras-devel"
 short_desc="Qt5 interface bindings for Pascal"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-3.0-or-later"
 homepage="https://svn.freepascal.org/svn/lazarus/trunk/lcl/interfaces/qt5/cbindings"
 distfiles="${DEBIAN_SITE}/main/libq/libqtpas/libqtpas_${version}.orig.tar.xz"
diff --git a/srcpkgs/qtcreator/patches/clang9.patch b/srcpkgs/qtcreator/patches/clang9.patch
new file mode 100644
index 00000000000..25a1a861746
--- /dev/null
+++ b/srcpkgs/qtcreator/patches/clang9.patch
@@ -0,0 +1,11 @@
+--- src/plugins/clangformat/clangformatutils.cpp
++++ src/plugins/clangformat/clangformatutils.cpp
+@@ -60,7 +60,7 @@ static clang::format::FormatStyle qtcStyle()
+     style.AllowShortBlocksOnASingleLine = false;
+     style.AllowShortCaseLabelsOnASingleLine = false;
+     style.AllowShortFunctionsOnASingleLine = FormatStyle::SFS_Inline;
+-    style.AllowShortIfStatementsOnASingleLine = false;
++    style.AllowShortIfStatementsOnASingleLine = FormatStyle::SIS_Never;
+     style.AllowShortLoopsOnASingleLine = false;
+     style.AlwaysBreakAfterReturnType = FormatStyle::RTBS_None;
+     style.AlwaysBreakBeforeMultilineStrings = false;
diff --git a/srcpkgs/qtcreator/template b/srcpkgs/qtcreator/template
index 40615534e8f..e52abce9d49 100644
--- a/srcpkgs/qtcreator/template
+++ b/srcpkgs/qtcreator/template
@@ -1,7 +1,7 @@
 # Template file for 'qtcreator'
 pkgname=qtcreator
-version=4.9.2
-revision=3
+version=4.10.1
+revision=1
 wrksrc="qt-creator-opensource-src-${version}"
 build_style=qmake
 make_install_args="INSTALL_ROOT=\${DESTDIR}/usr"
@@ -14,13 +14,11 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-3.0-only,QtCompany-GPL-Exception-1.0"
 homepage="https://wiki.qt.io/Category:Tools::QtCreator"
 distfiles="https://download.qt.io/official_releases/qtcreator/${version%.*}/${version}/${wrksrc}.tar.xz"
-checksum=b7e0c797e7704c6c22eb35351946c0a758502fd082f6beaee043166e1739d3d7
-
-nocross="clang in makedepends: at-spi2-atk-2.30.0_1: broken, unresolvable shlib 'ld-linux-armhf.so.3'"
+checksum=5098d87027bec3296bd93a7e112588759ccb0511fbfdc5558c1a1e83dff8d2a9
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-declarative-devel qt5-host-tools qt5-script-devel qt5-tools-devel"
-	makedepends+=" clang"
+	makedepends+=" clang llvm"
 fi
 
 pre_configure() {
@@ -42,11 +40,14 @@ qtcreator-full_package() {
  qt5-quickcontrols2-devel qt5-remoteobjects-devel qt5-script-devel qt5-scxml-devel
  qt5-sensors-devel qt5-serialbus-devel qt5-serialport-devel qt5-speech-devel qt5-svg-devel
  qt5-tools-devel qt5-virtualkeyboard-devel qt5-wayland-devel qt5-webchannel-devel
- qt5-webengine-devel qt5-webglplugin-devel qt5-websockets-devel qt5-webview-devel
+ qt5-webglplugin-devel qt5-webkit-devel qt5-websockets-devel qt5-webview-devel
  qt5-x11extras-devel qt5-xmlpatterns-devel qt5-tools-devel qt5-host-tools
  qt5-examples qt5-imageformats qt5-graphicaleffects qt5-translations
- qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds
- qt5-webkit-devel"
+ qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds"
+	case "$XBPS_TARGET_MACHINE" in
+		ppc|ppc-musl) ;;
+		*) depends+=" qt5-webengine-devel" ;;
+	esac
 	build_style=meta
 	pkg_install() {
 		echo "Just the dependencies"
diff --git a/srcpkgs/qtcurve/patches/gtkprops_constexpr.patch b/srcpkgs/qtcurve/patches/gtkprops_constexpr.patch
new file mode 100644
index 00000000000..c0e80d1e316
--- /dev/null
+++ b/srcpkgs/qtcurve/patches/gtkprops_constexpr.patch
@@ -0,0 +1,29 @@
+From ee2228ea2f18ac5da9b434ee6089381df815aa94 Mon Sep 17 00:00:00 2001
+From: Yichao Yu <yyc1992@gmail.com>
+Date: Wed, 5 Jun 2019 09:03:40 -0400
+Subject: [utils/gtkprops] Remove unnecessary constexpr, this is not allowed in
+ C++14
+
+BUG: 408286
+---
+ lib/utils/gtkprops.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+(limited to 'lib/utils/gtkprops.h')
+
+diff --git a/lib/utils/gtkprops.h b/lib/utils/gtkprops.h
+index abc0675..e248255 100644
+--- lib/utils/gtkprops.h
++++ lib/utils/gtkprops.h
+@@ -74,7 +74,7 @@ class GtkWidgetProps {
+         };
+ #define DEF_WIDGET_SIG_CONN_PROPS(name)                                 \
+         struct _SigConn_##name##_ObjGetter {                            \
+-            constexpr inline GObject*                                   \
++            inline GObject*                                             \
+             operator()(SigConn<_SigConn_##name##_ObjGetter> *p) const   \
+             {                                                           \
+                 return (GObject*)qtcContainerOf(p, Props, name)->m_w;   \
+-- 
+cgit v1.1
+
diff --git a/srcpkgs/qtcurve/template b/srcpkgs/qtcurve/template
index 3ced623a5a0..9f1011e9a53 100644
--- a/srcpkgs/qtcurve/template
+++ b/srcpkgs/qtcurve/template
@@ -1,16 +1,18 @@
 # Template file for 'qtcurve'
 pkgname=qtcurve
 version=1.9.1
-revision=1
+revision=3
 build_style=cmake
-hostmakedepends="pkg-config extra-cmake-modules automoc4 perl qt-qmake"
-makedepends="libxcb-devel libX11-devel qt-devel qt5-devel gtk+-devel
- phonon-devel qt5-svg-devel qt5-x11extras-devel frameworkintegration-devel
+configure_args="-DENABLE_QT4=OFF"
+hostmakedepends="pkg-config extra-cmake-modules perl qt5-qmake qt5-host-tools
+ kcoreaddons gdk-pixbuf-devel"
+makedepends="libxcb-devel libX11-devel qt5-devel gtk+-devel
+ qt5-svg-devel qt5-x11extras-devel frameworkintegration-devel
  ki18n-devel kdelibs4support-devel"
-homepage="https://quickgit.kde.org/?p=qtcurve.git"
-short_desc="A configurable set of widget styles for KDE and Gtk"
+short_desc="Configurable set of widget styles for KDE and Gtk"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
-license="LGPL-2.1"
-configure_args="-DQT_QMAKE_EXECUTABLE=/usr/bin/qmake-qt4 -DQTC_QT4_ENABLE_KDE=false"
+license="LGPL-2.1-or-later"
+homepage="https://quickgit.kde.org/?p=qtcurve.git"
 distfiles="https://github.com/KDE/qtcurve/archive/${version}.tar.gz"
 checksum=fbfdafdac90d4c540dd55a4accfecfc3a17c1f532c5241e28003348beafaca15
+nocross="tries to execute a helper binary compiled for target on the host"
diff --git a/srcpkgs/qtfm/template b/srcpkgs/qtfm/template
index 149e4afd901..f7d177a9339 100644
--- a/srcpkgs/qtfm/template
+++ b/srcpkgs/qtfm/template
@@ -1,18 +1,18 @@
 # Template file for 'qtfm'
 pkgname=qtfm
-version=6.1.8
+version=6.2.0
 revision=1
 build_style=qmake
 configure_args="CONFIG+=release"
 makedepends="qt5-devel"
 depends="hicolor-icon-theme"
 short_desc="Lightweight file manager for Linux desktops based on pure Qt"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Frank Steinborn <steinex@nognu.de>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/rodlie/qtfm"
 changelog="https://raw.githubusercontent.com/rodlie/qtfm/master/ChangeLog"
 distfiles="https://github.com/rodlie/qtfm/archive/${version}.tar.gz"
-checksum=dddeaebcd05b91fb0124f26c3076a71872060aeba1995f35fc6773ac6c10de46
+checksum=58c6af502b606e63f96e8aec96b65ca9125be18ecdd5e4680ccaf50e9c40b064
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel"
diff --git a/srcpkgs/qtpass/patches/qmake-qt5.13.patch b/srcpkgs/qtpass/patches/qmake-qt5.13.patch
index 45bacf75a4a..cc20f357b02 100644
--- a/srcpkgs/qtpass/patches/qmake-qt5.13.patch
+++ b/srcpkgs/qtpass/patches/qmake-qt5.13.patch
@@ -1,10 +1,11 @@
 --- src/src.pro	2018-06-04 11:43:53.000000000 +0200
 +++ -	2019-07-10 02:36:51.536590804 +0200
-@@ -7,6 +7,31 @@
+@@ -7,6 +7,32 @@
  CONFIG += c++11 staticlib
  CONFIG(release, debug|release):DEFINES += QT_NO_DEBUG_OUTPUT
  
 +TRANSLATIONS    +=  ../localization/localization_nl_NL.ts \
++                    ../localization/localization_nl.ts \
 +                    ../localization/localization_ca.ts \
 +                    ../localization/localization_de_DE.ts \
 +                    ../localization/localization_es_ES.ts \
diff --git a/srcpkgs/qtpass/template b/srcpkgs/qtpass/template
index 80b6bc6c712..cce56db1986 100644
--- a/srcpkgs/qtpass/template
+++ b/srcpkgs/qtpass/template
@@ -1,6 +1,6 @@
 # Template file for 'qtpass'
 pkgname=qtpass
-version=1.2.3
+version=1.3.2
 revision=1
 wrksrc="QtPass-${version}"
 build_style=qmake
@@ -13,8 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://qtpass.org/"
 changelog="https://raw.githubusercontent.com/IJHack/QtPass/master/CHANGELOG.md"
 distfiles="https://github.com/IJHack/${pkgname}/archive/v${version}.tar.gz"
-checksum=658b632bb06e9ad63d5076aace5fe0e57a0f7f20e0aafdfb64f86a25bdadbb07
-
+checksum=7a68e1afe68462c878c212a79c40ade5ba14b72710c5e62450cf54c7b5621254
 
 do_install() {
 	vbin main/qtpass
diff --git a/srcpkgs/quadrapassel/template b/srcpkgs/quadrapassel/template
index 903e65aab66..46d3bbb1feb 100644
--- a/srcpkgs/quadrapassel/template
+++ b/srcpkgs/quadrapassel/template
@@ -1,14 +1,14 @@
 # Template file for 'quadrapassel'
 pkgname=quadrapassel
-version=3.32.0
+version=3.34.1
 revision=1
 build_style=meson
 hostmakedepends="glib-devel itstool pkg-config vala"
-makedepends="gtk+3-devel libglib-devel libcanberra-devel
+makedepends="gsound-devel gtk+3-devel libglib-devel libcanberra-devel
  clutter-gtk-devel librsvg-devel libmanette-devel"
 short_desc="GNOME classic falling-block game (Tetris)"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Quadrapassel"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fe6ee9f45f262317606b1ea40259d363e45a126cc2e686526de9db794a0a11fe
+checksum=b39acdd4754580dfcdf5a48f22945826926f3b324c92e417144f610a528706e2
diff --git a/srcpkgs/qutebrowser/template b/srcpkgs/qutebrowser/template
index ce0987fdda7..11b74e4445d 100644
--- a/srcpkgs/qutebrowser/template
+++ b/srcpkgs/qutebrowser/template
@@ -1,6 +1,6 @@
 # Template file for 'qutebrowser'
 pkgname=qutebrowser
-version=1.7.0
+version=1.8.1
 revision=1
 archs=noarch
 build_style=python3-module
@@ -15,7 +15,7 @@ license="GPL-3.0-or-later"
 homepage="https://qutebrowser.org/"
 changelog="https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/changelog.asciidoc"
 distfiles="https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz"
-checksum=f1f01b33669a9b08071997bb2642d46a1e5be9e293bdeb817d83db8dc5aad273
+checksum=dcf6eb63fc2430ac28ee40e2a236391adb7cdbe7debf4cbe53e0d12ff8726e32
 
 pre_build() {
 	a2x -f manpage doc/qutebrowser.1.asciidoc
diff --git a/srcpkgs/racket/template b/srcpkgs/racket/template
index 520ae7a8177..0f6f48ab79e 100644
--- a/srcpkgs/racket/template
+++ b/srcpkgs/racket/template
@@ -1,6 +1,6 @@
 # Template file for 'racket'
 pkgname=racket
-version=7.3
+version=7.4
 revision=1
 build_style=gnu-configure
 build_wrksrc=src
@@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="LGPL-3"
 homepage="http://racket-lang.org/"
 distfiles="http://mirror.racket-lang.org/installers/${version}/${pkgname}-${version}-src.tgz"
-checksum=d49b11de4aa8f62d23d096134d4246f6cbd7a1da326645fecc072d28ad38c040
+checksum=118495f3b5d530096066fa820f1fa41f84cc84a6a39197ec03546b3e95462e1f
 nostrip=yes
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/radare2/template b/srcpkgs/radare2/template
index 4dbd803fa0c..a1210480750 100644
--- a/srcpkgs/radare2/template
+++ b/srcpkgs/radare2/template
@@ -1,15 +1,15 @@
 # Template file for 'radare2'
 # cutter needs to be bumped when radare2 is updated
 pkgname=radare2
-version=3.7.1
+version=3.9.0
 revision=1
 build_style=gnu-configure
 configure_args="--with-syscapstone"
 hostmakedepends="pkg-config"
 makedepends="capstone-devel"
 short_desc="Advanced command line debugger and hexadecimal editor"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="LGPL-3.0-only"
 homepage="http://www.radare.org"
 distfiles="https://github.com/radare/radare2/archive/${version}.tar.gz"
-checksum=89c605c307e7d29458aa816dfa556077a63474474838b9a5f45d2691b32ba0d5
+checksum=270cf67d0dee8dab4ed21dfaab57671b479ec82f0fc8d1c988e121c48b51addc
diff --git a/srcpkgs/radeon-profile/template b/srcpkgs/radeon-profile/template
index 9050aee2d76..732d462b322 100644
--- a/srcpkgs/radeon-profile/template
+++ b/srcpkgs/radeon-profile/template
@@ -1,6 +1,6 @@
 # Template file for 'radeon-profile'
 pkgname=radeon-profile
-version=20190603
+version=20190903
 revision=1
 build_wrksrc=radeon-profile
 build_style=qmake
@@ -10,7 +10,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/marazmista/radeon-profile"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=f027d2dcc3278a8ce684778359310ee02ee7c79fa5c4ecc56e636a4020bdeeed
+checksum=932fb27bbd491216a6eb0267b9d834ec79fd606a8b1492d4b72a5599f85d3b47
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-qmake qt5-charts-devel"
diff --git a/srcpkgs/rakudo/patches/fix-perl6-home-dir.patch b/srcpkgs/rakudo/patches/fix-perl6-home-dir.patch
new file mode 100644
index 00000000000..3bd5046a4e8
--- /dev/null
+++ b/srcpkgs/rakudo/patches/fix-perl6-home-dir.patch
@@ -0,0 +1,26 @@
+diff --git src/main.nqp src/main.nqp
+index b53302759..bd9aeb5d5 100644
+--- src/main.nqp
++++ src/main.nqp
+@@ -33,7 +33,7 @@ my $install-dir := $execname eq ''
+ 
+ my $perl6-home := $comp.config<static_perl6_home>
+     // nqp::getenvhash()<PERL6_HOME>
+-    // $install-dir ~ '/share/perl6';
++    // $comp.config<libdir> ~ '/perl6';
+ if nqp::substr($perl6-home, nqp::chars($perl6-home) - 1) eq $sep {
+     $perl6-home := nqp::substr($perl6-home, 0, nqp::chars($perl6-home) - 1);
+ }
+diff --git tools/lib/NQP/Config/Rakudo.pm tools/lib/NQP/Config/Rakudo.pm
+index 90839c229..2819b60b6 100644
+--- tools/lib/NQP/Config/Rakudo.pm
++++ tools/lib/NQP/Config/Rakudo.pm
+@@ -347,7 +347,7 @@ sub configure_moar_backend {
+           );
+         $config->{static_perl6_home} =
+           File::Spec->rel2abs(
+-            File::Spec->catdir( $config->{prefix}, 'share', 'perl6' ) );
++            File::Spec->catdir( $config->{libdir}, 'perl6' ) );
+         $config->{static_nqp_home_define} =
+           '-DSTATIC_NQP_HOME='
+           . $self->c_escape_string( $config->{static_nqp_home} );
diff --git a/srcpkgs/rakudo/template b/srcpkgs/rakudo/template
index 01cbe144520..ff5d757cd71 100644
--- a/srcpkgs/rakudo/template
+++ b/srcpkgs/rakudo/template
@@ -1,7 +1,7 @@
 # Template file for 'rakudo'
 pkgname=rakudo
 version=2019.07.1
-revision=1
+revision=2
 build_style=configure
 make_check_target=test
 make_install_args="RAKUDO_LOG_PRECOMP=1 RAKUDO_RERESOLVE_DEPENDENCIES=0"
@@ -27,7 +27,7 @@ make_dirs="
  /usr/lib/perl6/vendor/sources 0755 root root"
 hostmakedepends="perl"
 makedepends="libatomic_ops-devel libffi-devel libtommath-devel libuv-devel nqp"
-depends="nqp-${version}_${revision}"
+depends="nqp>=${version}_1"
 short_desc="Production-ready, stable implementation of the Perl 6 language"
 maintainer="Ruslan <axetwe@gmail.com>"
 license="Artistic-2.0"
diff --git a/srcpkgs/range-v3/patches/fix-is_trivial.patch b/srcpkgs/range-v3/patches/fix-is_trivial.patch
deleted file mode 100644
index 8e7e80546f7..00000000000
--- a/srcpkgs/range-v3/patches/fix-is_trivial.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-diff --git include/meta/meta_fwd.hpp include/meta/meta_fwd.hpp
-index edfb9068..ac041999 100644
---- include/meta/meta_fwd.hpp
-+++ include/meta/meta_fwd.hpp
-@@ -152,6 +152,13 @@
- #define META_TYPE_CONSTRAINT(...) typename
- #endif
- 
-+#if (defined(__cpp_lib_type_trait_variable_templates) && \
-+     __cpp_lib_type_trait_variable_templates > 0)
-+#define META_CXX_TRAIT_VARIABLE_TEMPLATES 1
-+#else
-+#define META_CXX_TRAIT_VARIABLE_TEMPLATES 0
-+#endif
-+
- namespace meta
- {
- #if META_CXX_INTEGER_SEQUENCE
-@@ -208,8 +215,10 @@ namespace meta
-         META_CONCEPT_BARRIER(__is_same(T, U));
- #elif defined(__GNUC__) && __GNUC__ >= 6
-         META_CONCEPT_BARRIER(__is_same_as(T, U));
--#else
-+#elif defined(META_CXX_TRAIT_VARIABLE_TEMPLATES)
-         META_CONCEPT_BARRIER(std::is_same_v<T, U>);
-+#else
-+        META_CONCEPT_BARRIER(std::is_same<T, U>::value);
- #endif
- 
-     template <template <typename...> class C, typename... Ts>
-@@ -248,7 +257,11 @@ namespace meta
-         typename T::type::value_type;
-     }
-     && Same<typename T::value_type, typename T::type::value_type>
-+#if META_CXX_TRAIT_VARIABLE_TEMPLATES
-     && std::is_integral_v<typename T::value_type>
-+#else
-+    && std::is_integral<typename T::value_type>::value
-+#endif
-     && requires
-     {
-         // { T::value } -> Same<const typename T::value_type&>;
-diff --git include/range/v3/range_fwd.hpp include/range/v3/range_fwd.hpp
-index 0378a0bd..2fabf26c 100644
---- include/range/v3/range_fwd.hpp
-+++ include/range/v3/range_fwd.hpp
-@@ -247,6 +247,16 @@ namespace ranges
-             struct priority_tag<0>
-             {};
- 
-+        template<typename T>
-+        using is_trivial = meta::bool_<
-+#if META_CXX_TRAIT_VARIABLE_TEMPLATES
-+            std::is_trivially_copyable_v<T> &&
-+            std::is_trivially_default_constructible_v<T>>;
-+#else
-+            std::is_trivially_copyable<T>::value &&
-+            std::is_trivially_default_constructible<T>::value>;
-+#endif
-+
-         #if defined(__clang__) && !defined(_LIBCPP_VERSION)
-             template<typename T, typename... Args>
-             using is_trivially_constructible =
-@@ -272,19 +282,6 @@ namespace ranges
-             template<typename T>
-             using is_trivially_copyable =
-                 meta::bool_<__is_trivially_copyable(T)>;
--        #elif defined(__GNUC__) && !defined(__clang__) && __GNUC__ < 5
--            template<typename T>
--            using is_trivially_default_constructible = std::is_trivial<T>;
--            template<typename T>
--            using is_trivially_copy_constructible = std::is_trivial<T>;
--            template<typename T>
--            using is_trivially_move_constructible = std::is_trivial<T>;
--            template<typename T>
--            using is_trivially_copy_assignable = std::is_trivial<T>;
--            template<typename T>
--            using is_trivially_move_assignable = std::is_trivial<T>;
--            template<typename T>
--            using is_trivially_copyable = std::is_trivial<T>;
-         #else
-             template<typename T>
-             using is_trivially_default_constructible =
-diff --git include/range/v3/utility/box.hpp include/range/v3/utility/box.hpp
-index 5e8b90dd..33d674df 100644
---- include/range/v3/utility/box.hpp
-+++ include/range/v3/utility/box.hpp
-@@ -128,7 +128,7 @@ namespace ranges
-             // MSVC pukes passing non-constant-expression objects to constexpr
-             // functions, so do not coalesce.
-             template<typename T, typename = meta::if_<
--                meta::strict_and<std::is_empty<T>, std::is_trivial<T>>>>
-+                meta::strict_and<std::is_empty<T>, detail::is_trivial<T>>>>
-             constexpr box_compress box_compression_(int)
-             {
-                 return box_compress::coalesce;
diff --git a/srcpkgs/range-v3/template b/srcpkgs/range-v3/template
index a134ed5d549..e04b8965cc2 100644
--- a/srcpkgs/range-v3/template
+++ b/srcpkgs/range-v3/template
@@ -1,7 +1,7 @@
 # Template file for 'range-v3'
 pkgname=range-v3
-version=0.5.0
-revision=2
+version=0.9.1
+revision=1
 build_style=cmake
 configure_args="-DRANGE_V3_EXAMPLES=OFF -DRANGES_BUILD_CALENDAR_EXAMPLE=OFF
  -DRANGES_NATIVE=OFF"
@@ -10,7 +10,7 @@ maintainer="John <johnz@posteo.net>"
 license="BSL-1.0"
 homepage="https://github.com/ericniebler/range-v3"
 distfiles="https://github.com/ericniebler/range-v3/archive/${version}.tar.gz"
-checksum=32e30b3be042246030f31d40394115b751431d9d2b4e0f6d58834b2fd5594280
+checksum=2b5b442d572b5978ea51c650adfaf0796f39f326404d09b83d846e04f571876b
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DRANGE_V3_HEADER_CHECKS=ON -DRANGE_V3_TESTS=ON
diff --git a/srcpkgs/ranger/template b/srcpkgs/ranger/template
index 5efbcb6bff7..a387eac4ed7 100644
--- a/srcpkgs/ranger/template
+++ b/srcpkgs/ranger/template
@@ -10,7 +10,7 @@ makedepends="python3-devel"
 depends="python3"
 checkdepends="python-pytest pylint flake8 ncurses-term"
 short_desc="File manager with an ncurses frontend written in Python"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
 homepage="https://ranger.github.io"
 distfiles="${homepage}/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/rawtherapee/template b/srcpkgs/rawtherapee/template
index 348548bc59f..a715d836ee3 100644
--- a/srcpkgs/rawtherapee/template
+++ b/srcpkgs/rawtherapee/template
@@ -1,6 +1,6 @@
 # Template file for 'rawtherapee'
 pkgname=rawtherapee
-version=5.6
+version=5.7
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://rawtherapee.com/"
 distfiles="http://rawtherapee.com/shared/source/rawtherapee-${version}.tar.xz"
-checksum=f9ea4b159580bd99aa7eaba9487c07e9dc7c095405f310f243400e67ae630d74
+checksum=dbd7c7cf7488fb97c520821eee2c745291637644b391e3ec0ed3a29701f1a9c7
diff --git a/srcpkgs/rclone/template b/srcpkgs/rclone/template
index 8cf9220ac33..cc6be1978ef 100644
--- a/srcpkgs/rclone/template
+++ b/srcpkgs/rclone/template
@@ -1,17 +1,17 @@
 # Template file for 'rclone'
 pkgname=rclone
-version=1.48.0
+version=1.49.5
 revision=1
 wrksrc="rclone-v${version}"
 build_style=go
-go_import_path=github.com/ncw/rclone
+go_import_path=github.com/rclone/rclone
 hostmakedepends="git"
 short_desc="Rsync for cloud storage"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="MIT"
-homepage="https://rclone.org/downloads/"
-distfiles="https://github.com/ncw/rclone/releases/download/v${version}/rclone-v${version}.tar.gz"
-checksum=8cfed0b0e0c341c74d466d3ecc84e35e32666391d075445d50fe623035cd03e4
+homepage="https://rclone.org/"
+distfiles="https://github.com/rclone/rclone/releases/download/v${version}/rclone-v${version}.tar.gz"
+checksum=abd2c83d71c63a4b0a30b1980b942868e707d05e14ae76ad39abf5cc5a5fde63
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/rcm/template b/srcpkgs/rcm/template
index 6ba4fd11d84..2f84ba88ad3 100644
--- a/srcpkgs/rcm/template
+++ b/srcpkgs/rcm/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 checkdepends="python3-cram"
 depends="perl"
 short_desc="Management suite for dotfiles"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/thoughtbot/rcm"
 distfiles="https://thoughtbot.github.io/rcm/dist/rcm-${version}.tar.gz"
diff --git a/srcpkgs/rdfind/template b/srcpkgs/rdfind/template
index 7edac19eedd..510e46839ba 100644
--- a/srcpkgs/rdfind/template
+++ b/srcpkgs/rdfind/template
@@ -1,7 +1,7 @@
 # Template file for 'rdfind'
 pkgname=rdfind
 version=1.4.1
-revision=1
+revision=2
 build_style=gnu-configure
 makedepends="nettle-devel"
 short_desc="A program that finds duplicate files"
diff --git a/srcpkgs/rdup/template b/srcpkgs/rdup/template
index 87f7f34b1c5..868d8f004d2 100644
--- a/srcpkgs/rdup/template
+++ b/srcpkgs/rdup/template
@@ -1,7 +1,7 @@
 # Template file for 'rdup'
 pkgname=rdup
 version=1.1.15
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake pkg-config"
 makedepends="glib-devel libarchive-devel nettle-devel"
@@ -13,5 +13,6 @@ distfiles="https://github.com/miekg/rdup/archive/${version}.tar.gz"
 checksum=787b8c37e88be810a710210a9d9f6966b544b1389a738aadba3903c71e0c29cb
 
 pre_configure() {
+	vsed -e 's/-Werror/-Werror -Wno-deprecated-declarations/' -i GNUmakefile.in
 	autoreconf -fi
 }
diff --git a/srcpkgs/re/template b/srcpkgs/re/template
index b4872995a36..45659f4a129 100644
--- a/srcpkgs/re/template
+++ b/srcpkgs/re/template
@@ -1,7 +1,7 @@
 # Template file for 're'
 pkgname=re
-version=0.6.0
-revision=2
+version=0.6.1
+revision=1
 build_style=gnu-makefile
 make_build_args="RELEASE=1 EXTRA_CFLAGS=$CFLAGS
  EXTRA_LFLAGS=$LDFLAGS USE_OPENSSL=yes USE_DTLS=yes USE_DTLS_SRTP=yes"
@@ -13,7 +13,7 @@ maintainer="JohnZ <johnz@posteo.net>"
 license="BSD-3-Clause"
 homepage="http://www.creytiv.com/"
 distfiles="http://www.creytiv.com/pub/re-${version}.tar.gz"
-checksum=0e97bcb5cc8f84d6920aa78de24c7d4bf271c5ddefbb650848e0db50afe98131
+checksum=cd5bfc79640411803b200c7531e4ba8a230da3806746d3bd2de970da2060fe43
 shlib_provides="libre.so"
 
 case $XBPS_TARGET_MACHINE in
diff --git a/srcpkgs/re2/template b/srcpkgs/re2/template
index 3392eb66e2f..a173a971039 100644
--- a/srcpkgs/re2/template
+++ b/srcpkgs/re2/template
@@ -1,6 +1,6 @@
 # Template file for 're2'
 pkgname=re2
-version=2019.08.01
+version=2019.09.01
 revision=1
 wrksrc="${pkgname}-${version//./-}"
 build_style=gnu-makefile
@@ -10,7 +10,7 @@ maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/google/re2"
 distfiles="${homepage}/archive/${version//./-}.tar.gz"
-checksum=38bc0426ee15b5ed67957017fd18201965df0721327be13f60496f2b356e3e01
+checksum=b0382aa7369f373a0148218f2df5a6afd6bfa884ce4da2dfb576b979989e615e
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/reap/template b/srcpkgs/reap/template
new file mode 100644
index 00000000000..dc216f03165
--- /dev/null
+++ b/srcpkgs/reap/template
@@ -0,0 +1,11 @@
+# Template file for 'reap'
+pkgname=reap
+version=0.1
+revision=1
+build_style=gnu-makefile
+short_desc="Unix command line queue utility"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="CC0-1.0"
+homepage="https://github.com/leahneukirchen/reap"
+distfiles="https://github.com/leahneukirchen/${pkgname}/archive/v${version}.tar.gz"
+checksum=fbf1f2f85e6cefeef8aa4778ec5db83773514f1c58ca01b107fb6823165d09d8
diff --git a/srcpkgs/rebar3/template b/srcpkgs/rebar3/template
index 5559a9ccf72..07e29cc5ed0 100644
--- a/srcpkgs/rebar3/template
+++ b/srcpkgs/rebar3/template
@@ -1,6 +1,6 @@
 # Template file for 'rebar3'
 pkgname=rebar3
-version=3.11.1
+version=3.12.0
 revision=1
 archs=noarch
 hostmakedepends=erlang
@@ -10,7 +10,7 @@ maintainer="Noel Cower <ncower@gmail.com>"
 license="Apache-2.0"
 homepage="https://www.rebar3.org/"
 distfiles="https://github.com/erlang/rebar3/archive/${version}.tar.gz"
-checksum=a1822db5210b96b5f8ef10e433b22df19c5fc54dfd847bcaab86c65151ce4171
+checksum=8ac45498f03e293bc6342ec431888f9a81a4fb9e1177a69965238d127c00a79e
 
 do_build() {
 	./bootstrap
diff --git a/srcpkgs/recutils/template b/srcpkgs/recutils/template
index 55dbe617763..3e71312c4e2 100644
--- a/srcpkgs/recutils/template
+++ b/srcpkgs/recutils/template
@@ -7,7 +7,7 @@ configure_args="--with-bash-headers --disable-rpath"
 hostmakedepends="pkg-config"
 makedepends="acl-devel libgcrypt-devel libuuid-devel libcurl-devel"
 short_desc="Utilities to deal with recfiles"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/recutils/"
 distfiles="${GNU_SITE}/recutils/recutils-${version}.tar.gz"
diff --git a/srcpkgs/redis/template b/srcpkgs/redis/template
index 2cb07edbb19..5807af0b36f 100644
--- a/srcpkgs/redis/template
+++ b/srcpkgs/redis/template
@@ -1,16 +1,16 @@
 # Template file for 'redis'
 pkgname=redis
-version=5.0.5
+version=5.0.6
 revision=1
 makedepends="jemalloc-devel libatomic-devel"
-checkdepends="tcl-devel"
+checkdepends="tcl-devel procps-ng"
 short_desc="Advanced key-value store"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://redis.io"
 changelog="https://raw.githubusercontent.com/antirez/redis/5.0/00-RELEASENOTES"
 distfiles="http://download.redis.io/releases/${pkgname}-${version}.tar.gz"
-checksum=2139009799d21d8ff94fc40b7f36ac46699b9e1254086299f8d3b223ca54a375
+checksum=6624841267e142c5d5d5be292d705f8fb6070677687c5aad1645421a936d22b3
 
 system_accounts="redis"
 redis_homedir="/var/lib/redis"
diff --git a/srcpkgs/remmina/template b/srcpkgs/remmina/template
index 6dac179b523..c8bac8ad0f3 100644
--- a/srcpkgs/remmina/template
+++ b/srcpkgs/remmina/template
@@ -1,6 +1,6 @@
 # Template file for 'remmina'
 pkgname=remmina
-version=1.3.5
+version=1.3.6
 revision=1
 wrksrc="Remmina-${version}"
 build_style=cmake
@@ -20,7 +20,7 @@ license="GPL-2.0-or-later"
 homepage="https://remmina.org"
 changelog="https://raw.githubusercontent.com/FreeRDP/Remmina/master/CHANGELOG.md"
 distfiles="https://github.com/FreeRDP/Remmina/archive/v${version}.tar.gz"
-checksum=babb477f5acd1cb7056cf47ba50dc56ef1c850f9c00a9ec012573553b03ca5a4
+checksum=c9a2327d02285cec78ef6eab8154d88d78d2d6a874e17681fcc6cb1aff20c40d
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) makedepends+=" libexecinfo-devel" ;;
diff --git a/srcpkgs/resvg/template b/srcpkgs/resvg/template
index 02506182ef8..c48e52ae2f2 100644
--- a/srcpkgs/resvg/template
+++ b/srcpkgs/resvg/template
@@ -6,7 +6,7 @@ build_helper="rust"
 hostmakedepends="cargo qt5-host-tools pkg-config"
 makedepends="pango-devel cairo-devel gdk-pixbuf-devel rust-std qt5-devel"
 short_desc="SVG rendering library written in Rust"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://github.com/RazrFalcon/resvg"
 distfiles="https://github.com/RazrFalcon/resvg/releases/download/v${version}/resvg-${version}.tar.xz"
diff --git a/srcpkgs/retro-gtk/template b/srcpkgs/retro-gtk/template
index 850488c584d..da0aeccd243 100644
--- a/srcpkgs/retro-gtk/template
+++ b/srcpkgs/retro-gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'retro-gtk'
 pkgname=retro-gtk
-version=0.16.1
-revision=2
+version=0.18.0
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="$(vopt_bool gir introspection)"
@@ -12,7 +12,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/retro-gtk"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f3c65e52da19f96dedc33e20ea899bf94e914cc8f85ad12e9957d09421bed8c8
+checksum=cedb881174c42e88954eecb5dfac78954a1981aaeebdc8918c8861c6c08a4512
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index be8b36ade21..d6ce272c9ee 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,6 +1,6 @@
 # Template file for 'retroarch'
 pkgname=retroarch
-version=1.7.7
+version=1.7.9
 revision=1
 wrksrc="RetroArch-$version"
 build_style=configure
@@ -22,7 +22,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.libretro.com/"
 distfiles="https://github.com/libretro/RetroArch/archive/v$version.tar.gz"
-checksum=84cdf88b7dfbbe229521c32489820040eeee7736ef8fb43f1f345235b34e9732
+checksum=00d45a468023fbab8c023a81d4f26bca91bacb24ab24a7162079c26ff042c367
 build_options="ffmpeg opengl jack pulseaudio sdl2 x11 vulkan"
 
 build_options_default="ffmpeg"
diff --git a/srcpkgs/rinse/template b/srcpkgs/rinse/template
index 2249c4aac08..2294afc2605 100644
--- a/srcpkgs/rinse/template
+++ b/srcpkgs/rinse/template
@@ -9,7 +9,7 @@ makedepends="perl"
 depends="perl-LWP rpm wget"
 checkdepends="perl-LWP perl-Test-Pod rpm wget"
 short_desc="Bootstrap a rpm based distribution like debootstrap"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://salsa.debian.org/debian/rinse"
 #changelog="https://salsa.debian.org/debian/rinse/raw/master/debian/changelog"
diff --git a/srcpkgs/riot-desktop/patches/electron5.patch b/srcpkgs/riot-desktop/patches/electron5.patch
deleted file mode 100644
index c90db20fb75..00000000000
--- a/srcpkgs/riot-desktop/patches/electron5.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-from https://gist.github.com/dbkr/e898624be6d53590ebf494521d868fec
-
-diff --git a/electron_app/src/electron-main.js b/electron_app/src/electron-main.js
-index 99ddfbd1..c3aa4f5d 100644
---- electron_app/src/electron-main.js
-+++ electron_app/src/electron-main.js
-@@ -206,7 +206,10 @@ const launcher = new AutoLaunch({
- // work.
- // Also mark it as secure (ie. accessing resources from this
- // protocol and HTTPS won't trigger mixed content warnings).
--protocol.registerStandardSchemes(['vector'], {secure: true});
-+//protocol.registerStandardSchemes(['vector'], {secure: true});
-+protocol.registerSchemesAsPrivileged([{
-+    scheme: 'vector', privileges: {standard: true, secure: true, supportFetchAPI: true},
-+}]);
- 
- app.on('ready', () => {
-     if (argv['devtools']) {
-diff --git a/electron_app/src/preload.js b/electron_app/src/preload.js
-index 3a4f7c9a..f63e19d4 100644
---- electron_app/src/preload.js
-+++ electron_app/src/preload.js
-@@ -23,7 +23,7 @@ window.ipcRenderer = ipcRenderer;
- // protocol: this is necessary to load olm.wasm.
- // (Also mark it a secure although we've already
- // done this in the main process).
--webFrame.registerURLSchemeAsPrivileged('vector', {
-+/*webFrame.registerURLSchemeAsPrivileged('vector', {
-     secure: true,
-     supportFetchAPI: true,
--});
-+});*/
diff --git a/srcpkgs/riot-desktop/template b/srcpkgs/riot-desktop/template
index 1bc9ed54a54..c54b84d88a2 100644
--- a/srcpkgs/riot-desktop/template
+++ b/srcpkgs/riot-desktop/template
@@ -1,18 +1,18 @@
 # Template file for 'riot-desktop'
 pkgname=riot-desktop
-version=1.2.1
-revision=2
+version=1.4.2
+revision=1
 archs="i686 x86_64"
 wrksrc="riot-web-${version}"
 conf_files="/etc/${pkgname}/config.json"
 hostmakedepends="git nodejs yarn"
 depends="c-ares ffmpeg gtk+3 http-parser libevent libxslt minizip nss re2 snappy"
 short_desc="Glossy Matrix collaboration client, desktop version"
-maintainer="zethra <jediben97@gmail.com>"
+maintainer="Bendodroid <bendodroid@icloud.com>"
 license="Apache-2.0"
 homepage="https://riot.im"
 distfiles="https://github.com/vector-im/riot-web/archive/v${version}.tar.gz"
-checksum=7519083fcf579bf79bd5e0e5665bad43b89432a215f677fa00d8a115a34fdf08
+checksum=0d8ce20912ea8c6961ff04a3e3231da1f77ec18cfdc5000a1f01d19eec9ad51c
 nocross=yes
 nostrip=yes
 shlib_provides="libGLVESv2.so"
diff --git a/srcpkgs/rlottie/template b/srcpkgs/rlottie/template
index 3f84d208d37..aa6ef4322ef 100644
--- a/srcpkgs/rlottie/template
+++ b/srcpkgs/rlottie/template
@@ -1,7 +1,7 @@
 # Template file for 'rlottie'
 pkgname=rlottie
-_commit=33d4fca732943eb393c23b143e5783b463847193
-version=0.0.20190809
+_commit=71dfd5c3ba206cad9d73e3c249dd7d22f4f65b98
+version=0.0.20191002
 revision=2
 wrksrc="rlottie-${_commit}"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later, FTL, MIT, JSON, BSD-3-Clause"
 homepage="https://github.com/Samsung/rlottie"
 distfiles="https://github.com/Samsung/rlottie/archive/${_commit}.tar.gz"
-checksum=1cf21762b983e5edf71ca4b487a1af4a9e6e127c1c7c1bec95b886022c96ff7f
+checksum=df064c381ade4fce143e5d7ee27771bbf7bc2218ac7a32afe3f49036ddcba422
 
 post_patch() {
 	vsed -e 's/c++14/c++17/g' -i CMakeLists.txt
diff --git a/srcpkgs/rmlint/template b/srcpkgs/rmlint/template
index faca4260b17..dc8d904d0c2 100644
--- a/srcpkgs/rmlint/template
+++ b/srcpkgs/rmlint/template
@@ -1,7 +1,7 @@
 # Template file for 'rmlint'
 pkgname=rmlint
-version=2.8.0
-revision=2
+version=2.9.0
+revision=1
 build_style=scons
 hostmakedepends="pkg-config python3-Sphinx glib-devel"
 makedepends="libblkid-devel elfutils-devel json-glib-devel"
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-3.0-or-later"
 homepage="http://rmlint.rtfd.org/"
 distfiles="https://github.com/sahib/${pkgname}/archive/v${version}.tar.gz"
-checksum=196bb595ac4d3d1a76ed62542b7895bda1cea47f0f77483286b2dfc8fc797253
+checksum=a2d26863e0018efad60f0b1123e7cffd8ef764c8fb574a7987a49260e4e51c8f
 
 do_install() {
 	scons install --prefix=${DESTDIR}/usr
diff --git a/srcpkgs/roswell/template b/srcpkgs/roswell/template
index 0e83bffe40e..7a1c340444c 100644
--- a/srcpkgs/roswell/template
+++ b/srcpkgs/roswell/template
@@ -1,6 +1,6 @@
 # Template file for 'roswell'
 pkgname=roswell
-version=19.4.10.98
+version=19.09.12.102
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://github.com/roswell/roswell"
 changelog="https://raw.githubusercontent.com/roswell/roswell/master/ChangeLog"
 distfiles="https://github.com/roswell/roswell/releases/download/v${version}/roswell_${version}.orig.tar.gz"
-checksum=5783431ef096840dd5696b448c76e66e8805e53bd7ac6fb572734e3ffd969649
+checksum=99aa1535761e2cdd45ad447256a985d311dffb6826f50d9a61c77a6f737a82bf
 
 pre_configure() {
 	./bootstrap
diff --git a/srcpkgs/roxterm/template b/srcpkgs/roxterm/template
index 35404d97263..299487d3009 100644
--- a/srcpkgs/roxterm/template
+++ b/srcpkgs/roxterm/template
@@ -1,19 +1,16 @@
 # Template file for 'roxterm'
 pkgname=roxterm
-version=3.7.3
+version=3.8.2
 revision=1
 build_style=cmake
-hostmakedepends="ImageMagick itstool librsvg-utils libtool pkg-config po4a xmlto"
+hostmakedepends="ImageMagick glib-devel itstool librsvg-utils libtool
+ pkg-config po4a xmlto"
 makedepends="dbus-glib-devel libSM-devel vte3-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Highly configurable terminal emulator"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Frank Steinborn <steinex@nognu.de>"
 license="GPL-2.0-or-later, LGPL-3.0-only"
 homepage="https://github.com/realh/roxterm"
 changelog="https://raw.githubusercontent.com/realh/roxterm/master/debian/changelog"
 distfiles="https://github.com/realh/roxterm/archive/${version}.tar.gz"
-checksum=59b1ab781477a712b4509dac812931bff3c2bb7a9a82435f43430bede5cdca13
-
-pre_configure() {
-	echo -n ${version} > version
-}
+checksum=289a5e87030ad7b24677ecda81c6e99d33fbef995b73d7a81bc91f4bbaba62cf
diff --git a/srcpkgs/rpi-firmware/template b/srcpkgs/rpi-firmware/template
index 3fba1022f78..7386619bfdc 100644
--- a/srcpkgs/rpi-firmware/template
+++ b/srcpkgs/rpi-firmware/template
@@ -1,18 +1,18 @@
 # Template file for 'rpi-firmware'
-_githash="3822340923e5cddc772492386d82ba00f4275d62"
+_githash="18bf532d97f73acd4b476429518e89f0e3d7007c"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi-firmware
-version=20190801
-revision=1
+version=20190828
+revision=2
 archs=noarch
 wrksrc="firmware-${_githash}"
 short_desc="Firmware files for the Raspberry Pi (git ${_gitshort})"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
+maintainer="Peter Bui <pbui@github.bx612.space>"
+license="BSD-3-Clause, custom:Cypress"
 homepage="https://github.com/raspberrypi/firmware"
 distfiles="https://github.com/raspberrypi/firmware/archive/${_githash}.tar.gz"
-checksum=35a5b0a30cdc68aeeda355a506dc967bc5de5cf7fc94e90367d979bff0a0f0bb
+checksum=7e988a93c27cc59c89fa5270455196a71516b4aa9668152f8e87d6b1448ea914
 
 conf_files="/boot/cmdline.txt /boot/config.txt"
 
@@ -32,23 +32,26 @@ do_install() {
 	vinstall ${FILESDIR}/cmdline.txt 644 boot
 	vinstall ${FILESDIR}/config.txt 644 boot
 
+	$XBPS_FETCH_CMD https://github.com/RPi-Distro/firmware-nonfree/raw/master/LICENCE.cypress
+	vlicense LICENCE.cypress
+
 	# Firmware for rpi3 b and zero wifi chip
 	for f in bin txt; do
-		$XBPS_FETCH_CMD https://archlinuxarm.org/builder/src/bcm43430/7.45.98.38/brcmfmac43430-sdio.${f}
+		$XBPS_FETCH_CMD https://github.com/RPi-Distro/firmware-nonfree/raw/master/brcm/brcmfmac43430-sdio.${f}
 		vinstall brcmfmac43430-sdio.${f} 0644 usr/lib/firmware/brcm
 	done
 
 	# Firmware for rpi3 b and zero bluetooth chip
-	$XBPS_FETCH_CMD https://archlinuxarm.org/builder/src/bcm43430/BCM43430A1.hcd
+	$XBPS_FETCH_CMD https://github.com/RPi-Distro/bluez-firmware/raw/master/broadcom/BCM43430A1.hcd
 	vinstall BCM43430A1.hcd 0644 usr/lib/firmware/brcm
 
 	# Firmware for rpi3 b+ wifi chip
 	for f in bin txt clm_blob; do
-		$XBPS_FETCH_CMD https://archlinuxarm.org/builder/src/bcm43455/7.45.154/brcmfmac43455-sdio.${f}
+		$XBPS_FETCH_CMD https://github.com/RPi-Distro/firmware-nonfree/raw/master/brcm/brcmfmac43455-sdio.${f}
 		vinstall brcmfmac43455-sdio.${f} 0644 usr/lib/firmware/brcm
 	done
 
 	# Firmware for rpi3 b+ bluetooth chip
-	$XBPS_FETCH_CMD https://archlinuxarm.org/builder/src/bcm43455/BCM4345C0.hcd
+	$XBPS_FETCH_CMD https://github.com/RPi-Distro/bluez-firmware/raw/master/broadcom/BCM4345C0.hcd
 	vinstall BCM4345C0.hcd 0644 usr/lib/firmware/brcm
 }
diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index 87f024de529..ce4a492499c 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -5,19 +5,19 @@
 #
 #   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=224931
 
-_githash="fc5826fb999e0b32900d1f487e90c27a92010214"
+_githash="047589b6dcd5dfd9673a995c5d36ec4073e578b5"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi-kernel
-version=4.19.66
+version=4.19.79
 revision=1
 wrksrc="linux-${_githash}"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Peter Bui <pbui@github.bx612.space>"
 homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="The Linux kernel for Raspberry Pi (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=cd8076d65788ad6e1719f29f3023ea6141c1727a330e1bbc947e3106b320bc2d
+checksum=f617730cd3a3ca35351259cc58105d95a4d106b8a2971386c81dab073c0fbd15
 
 _kernver="${version}_${revision}"
 
@@ -41,76 +41,67 @@ mutable_files="
 	/usr/lib/modules/${_kernver}/modules.alias.bin
 	/usr/lib/modules/${_kernver}/modules.devname"
 
+_arch=
+case "$XBPS_TARGET_MACHINE" in
+	arm*) _arch=arm ;;
+	aarch64*) _arch=arm64 ;;
+esac
+_cross=
+if [ "$CROSS_BUILD" ]; then
+	_cross="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
+fi
+
 pre_configure() {
 	# Remove .git directory, otherwise scripts/setkernelversion.sh
 	# modifies KERNELRELEASE and appends + to it.
 	rm -rf .git
 }
 do_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
-	fi
+	local target defconfig
 
-	# Use upstream default configuration, no need to maintain ours.
+	# Use upstream's default configuration, no need to maintain ours.
 	case "$XBPS_TARGET_MACHINE" in
-	aarch64*)
-		echo "CONFIG_CONNECTOR=y" >> arch/arm64/configs/bcmrpi3_defconfig
-		echo "CONFIG_PROC_EVENTS=y" >> arch/arm64/configs/bcmrpi3_defconfig
-		echo "CONFIG_F2FS_FS_SECURITY=y" >> arch/arm64/configs/bcmrpi3_defconfig
-		echo "CONFIG_CGROUP_PIDS=y" >> arch/arm64/configs/bcmrpi3_defconfig
-		make ${makejobs} ${_args} ARCH=arm64 bcmrpi3_defconfig
-		;;
-	armv7l*)
-		echo "CONFIG_USER_NS=y" >> arch/arm/configs/bcm2709_defconfig
-		echo "CONFIG_CONNECTOR=y" >> arch/arm/configs/bcm2709_defconfig
-		echo "CONFIG_PROC_EVENTS=y" >> arch/arm/configs/bcm2709_defconfig
-		echo "CONFIG_F2FS_FS_SECURITY=y" >> arch/arm/configs/bcm2709_defconfig
-		echo "CONFIG_CGROUP_PIDS=y" >> arch/arm/configs/bcm2709_defconfig
-		make ${makejobs} ${_args} ARCH=arm bcm2709_defconfig
-		;;
-	armv6l*)
-		echo "CONFIG_USER_NS=y" >> arch/arm/configs/bcmrpi_defconfig
-		echo "CONFIG_CONNECTOR=y" >> arch/arm/configs/bcmrpi_defconfig
-		echo "CONFIG_PROC_EVENTS=y" >> arch/arm/configs/bcmrpi_defconfig
-		echo "CONFIG_F2FS_FS_SECURITY=y" >> arch/arm/configs/bcmrpi_defconfig
-		echo "CONFIG_CGROUP_PIDS=y" >> arch/arm/configs/bcmrpi_defconfig
-		make ${makejobs} ${_args} ARCH=arm bcmrpi_defconfig
-		;;
+		# RPi3
+		aarch64*)
+			target=bcmrpi3_defconfig
+			;;
+		# RPi2 / RPi3
+		armv7l*)
+			target=bcm2709_defconfig
+			;;
+		# RPi1
+		armv6l*)
+			target=bcmrpi_defconfig
+			;;
 	esac
 
+	defconfig="arch/${_arch}/configs/${target}"
+	echo "CONFIG_CONNECTOR=y" >> "$defconfig"
+	echo "CONFIG_PROC_EVENTS=y" >> "$defconfig"
+	echo "CONFIG_F2FS_FS_SECURITY=y" >> "$defconfig"
+	echo "CONFIG_CGROUP_PIDS=y" >> "$defconfig"
+
+	make ${makejobs} ${_cross} ARCH=${_arch} ${target}
+
 	# Always use our revision to CONFIG_LOCALVERSION to match our pkg version.
-	sed -i -e "s|^\(CONFIG_LOCALVERSION=\).*|\1\"_${revision}\"|" .config
+	vsed -i -e "s|^\(CONFIG_LOCALVERSION=\).*|\1\"_${revision}\"|" .config
 }
 do_build() {
-	if [ "$CROSS_BUILD" ]; then
-		_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
-	fi
+	local target
 
 	case "$XBPS_TARGET_MACHINE" in
-	arm*)
-		_arch=arm
-		_targets="zImage modules dtbs"
-		;;
-	aarch64*)
-		unset LDFLAGS
-		_arch=arm64
-		_targets="Image modules dtbs"
-		;;
+		arm*)
+			target="zImage modules dtbs"
+			;;
+		aarch64*)
+			target="Image modules dtbs"
+			;;
 	esac
 
-	make ${makejobs} ${_args} ARCH=${_arch} prepare
-	make ${makejobs} ${_args} ARCH=${_arch} ${_targets}
+	make ${makejobs} ${_cross} ARCH=${_arch} prepare
+	make ${makejobs} ${_cross} ARCH=${_arch} ${target}
 }
 do_install() {
-	case "$XBPS_TARGET_MACHINE" in
-	arm*)
-		_arch="arm"
-	;;
-	aarch64*)
-		_arch="arm64"
-	;;
-	esac
-
 	local hdrdest
 
 	# Run depmod after compressing modules.
@@ -158,31 +149,50 @@ do_install() {
 	install -Dm644 Makefile ${hdrdest}/Makefile
 	install -Dm644 kernel/Makefile ${hdrdest}/kernel/Makefile
 	install -Dm644 .config ${hdrdest}/.config
+	for file in $(find . -name Kconfig\*); do
+		mkdir -p ${hdrdest}/$(dirname $file)
+		install -Dm644 $file ${hdrdest}/${file}
+	done
+	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+		mkdir -p ${hdrdest}/$(dirname $file)
+		install -Dm644 $file ${hdrdest}/${file}
+	done
 	mkdir -p ${hdrdest}/include
 
 	# Remove firmware stuff provided by the "linux-firmware" pkg.
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
-	for i in acpi asm-generic config crypto drm generated linux math-emu \
-		media net pcmcia scsi sound trace uapi video xen; do
+	for i in acpi asm-generic clocksource config crypto drm generated linux \
+		math-emu media net pcmcia scsi sound trace uapi video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
 	cd ${wrksrc}
+	# Remove helper binaries built for host,
+	# if generated files from the scripts/ directory need to be included,
+	# they need to be copied to ${hdrdest} before this step
+	if [ "$CROSS_BUILD" ]; then
+		make ${makejobs} ARCH=${_arch} _mrproper_scripts
+	fi
+
 	# Copy files necessary for later builds.
 	cp Module.symvers ${hdrdest}
 	cp -a scripts ${hdrdest}
-
-	# fix permissions on scripts dir
-	chmod og-w -R ${hdrdest}/scripts
+	mkdir -p ${hdrdest}/security/selinux
+	cp -a security/selinux/include ${hdrdest}/security/selinux
+	mkdir -p ${hdrdest}/tools/include
+	cp -a tools/include/tools ${hdrdest}/tools/include
 
 	# copy arch includes for external modules
 	mkdir -p ${hdrdest}/arch/${_arch}
 	cp -a arch/${_arch}/include ${hdrdest}/arch/${_arch}
 
-	mkdir -p ${hdrdest}/arch/${arch}/kernel
+	mkdir -p ${hdrdest}/arch/${_arch}/kernel
 	cp arch/${_arch}/Makefile ${hdrdest}/arch/${_arch}
 	cp arch/${_arch}/kernel/asm-offsets.s ${hdrdest}/arch/${_arch}/kernel
+	if [ "$_arch" = "arm64" ] ; then
+		cp -a arch/${_arch}/kernel/vdso ${hdrdest}/arch/${_arch}/kernel/
+	fi
 
 	# Add md headers
 	mkdir -p ${hdrdest}/drivers/md
@@ -200,17 +210,15 @@ do_install() {
 	mkdir -p ${hdrdest}/include/config/dvb/
 	cp include/config/dvb/*.h ${hdrdest}/include/config/dvb/
 
-	# Copy in Kconfig files
-	for i in $(find . -name "Kconfig*"); do
-		mkdir -p ${hdrdest}/$(echo $i | sed 's|/Kconfig.*||')
-		cp $i ${hdrdest}/$i
-	done
-
 	# Remove unneeded architectures
-	for arch in alpha arc avr32 blackfin c6x cris frv h8300 \
-		hexagon ia64 m* n* p* s* um v850 x86 xtensa; do
-		rm -rf ${hdrdest}/arch/${arch}
-	done
+	# (save the correct one + Kconfig and delete all others)
+	mkdir -p arch-backup
+	cp -r ${hdrdest}/arch/${_arch} ${hdrdest}/arch/Kconfig arch-backup/
+	rm -rf ${hdrdest}/arch
+	mv arch-backup ${hdrdest}/arch
+	# Keep arch/x86/ras/Kconfig as it is needed by drivers/ras/Kconfig
+	mkdir -p ${hdrdest}/arch/x86/ras
+	cp -a arch/x86/ras/Kconfig ${hdrdest}/arch/x86/ras/Kconfig
 
 	# Compress all modules with xz to save a few MBs.
 	msg_normal "$pkgver: compressing kernel modules with gzip, please wait...\n"
diff --git a/srcpkgs/rpm/template b/srcpkgs/rpm/template
index ab4cd7624c7..98e35930c4c 100644
--- a/srcpkgs/rpm/template
+++ b/srcpkgs/rpm/template
@@ -1,24 +1,24 @@
 # Template file for 'rpm'
 pkgname=rpm
-version=4.14.2.1
-revision=2
+version=4.15.0
+revision=1
 build_style=gnu-configure
 configure_args="--with-lua --with-cap --with-acl --with-external-db
  --enable-python PYTHON=python3"
 hostmakedepends="automake gettext-devel libtool nss-devel pkg-config
  python3-setuptools"
 makedepends="binutils-devel db-devel elfutils-devel file-devel libarchive-devel
- libcap-devel lua52-devel nss-devel popt-devel python3-devel"
+ libcap-devel lua52-devel nss-devel popt-devel python3-devel libgomp-devel"
 short_desc="Red Hat Package Management Utils"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://rpm.org"
 changelog="https://rpm.org/wiki/Releases/${version}.html"
-distfiles="http://ftp.rpm.org/releases/rpm-${version%.*.*}.x/rpm-${version}.tar.bz2"
-checksum=1139c24b7372f89c0a697096bf9809be70ba55e006c23ff47305c1849d98acda
+distfiles="http://ftp.rpm.org/releases/rpm-4.15.x/rpm-${version}.tar.bz2"
+checksum=1e06723b13591e57c99ebe2006fb8daddc4cf72efb366a64a34673ba5f61c201
 conflicts="rpmextract>=0" # Both provide rpm2cpio
 
-CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/python2.7"
+CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/python3.6"
 CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/nss"
 CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/nspr"
 
diff --git a/srcpkgs/rrdtool/template b/srcpkgs/rrdtool/template
index 05714e60f8b..b858a42f99c 100644
--- a/srcpkgs/rrdtool/template
+++ b/srcpkgs/rrdtool/template
@@ -1,7 +1,7 @@
 # Template file for 'rrdtool'
 pkgname=rrdtool
 version=1.7.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-perl --enable-perl-site-install
  --with-perl-options=INSTALLDIRS=vendor --enable-ruby
@@ -27,7 +27,7 @@ python-rrdtool_package() {
 
 perl-rrdtool_package() {
 	short_desc+=" - perl bindings"
-	shlib_requires="libperl.so.5.28"
+	shlib_requires="libperl.so.5.30"
 	pkg_install() {
 		vmove usr/lib/perl5
 		vmove usr/share/perl5
diff --git a/srcpkgs/rsClock/template b/srcpkgs/rsClock/template
new file mode 100644
index 00000000000..3da575801f0
--- /dev/null
+++ b/srcpkgs/rsClock/template
@@ -0,0 +1,16 @@
+# Template file for 'rsClock'
+pkgname=rsClock
+version=0.1.4
+revision=1
+wrksrc="${pkgname}-${version}"
+build_style=cargo
+short_desc="Simple terminal clock written in Rust"
+maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"
+license="MIT"
+homepage="https://github.com/valebes/rsClock"
+distfiles="https://github.com/valebes/rsClock/archive/v${version}.tar.gz"
+checksum=3e1c903a944325a9fabebfed34029830c94b4cd2463354bc02be01eb18401d04
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/rsyslog/template b/srcpkgs/rsyslog/template
index 02a9571b54b..dcad3e56e99 100644
--- a/srcpkgs/rsyslog/template
+++ b/srcpkgs/rsyslog/template
@@ -1,6 +1,6 @@
 # Template file for 'rsyslog'
 pkgname=rsyslog
-version=8.1904.0
+version=8.1910.0
 revision=1
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --enable-gnutls --enable-mysql
@@ -10,7 +10,7 @@ configure_args="--sbindir=/usr/bin --enable-gnutls --enable-mysql
  --enable-pmaixforwardedfrom --enable-omuxsock --disable-generate-man-pages
  --enable-testbench"
 hostmakedepends="pkg-config postgresql-libs-devel"
-makedepends="gnutls-devel libcurl-devel libee-devel libfastjson-devel
+makedepends="gnutls-devel libcurl-devel libestr-devel libfastjson-devel
  liblogging-devel libmysqlclient-devel mit-krb5-devel postgresql-libs-devel"
 short_desc="Enhanced multi-threaded syslog daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -18,7 +18,7 @@ license="GPL-3.0-or-later, Apache-2.0"
 homepage="https://www.rsyslog.com"
 changelog="https://raw.githubusercontent.com/rsyslog/rsyslog/master/ChangeLog"
 distfiles="${homepage}/files/download/rsyslog/${pkgname}-${version}.tar.gz"
-checksum=7098b459dfc3f8bfc35d5b114c56e7945614ba76efa4e513b1db9c38b0ff9c3d
+checksum=0219ee692f31a39743acb62aaf4196b644ce94edf386df4605fd6a11a4fe0c93
 conf_files="/etc/rsyslog.conf"
 make_dirs="/etc/rsyslog.d 0755 root root"
 lib32disabled=yes
diff --git a/srcpkgs/rtags/template b/srcpkgs/rtags/template
index 3ac8ac10ec8..d55cef3e284 100644
--- a/srcpkgs/rtags/template
+++ b/srcpkgs/rtags/template
@@ -1,7 +1,7 @@
 # Template file for 'rtags'
 pkgname=rtags
 version=2.22
-revision=2
+revision=3
 build_style=cmake
 # Don't run tests in do_install, please.
 configure_args="-DSKIP_CTEST=TRUE"
diff --git a/srcpkgs/rtaudio/template b/srcpkgs/rtaudio/template
index c471ec910d0..b036e1cae78 100644
--- a/srcpkgs/rtaudio/template
+++ b/srcpkgs/rtaudio/template
@@ -7,7 +7,7 @@ configure_args="--with-alsa --with-jack --with-pulse"
 hostmakedepends="pkg-config"
 makedepends="alsa-lib-devel pulseaudio-devel jack-devel"
 short_desc="C++ classes for common Linux, MacOS and Windows realtime audio APIs"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://www.music.mcgill.ca/~gary/rtaudio/"
 distfiles="http://www.music.mcgill.ca/~gary/rtaudio/release/rtaudio-${version}.tar.gz"
diff --git a/srcpkgs/rtl8822bu-dkms/template b/srcpkgs/rtl8822bu-dkms/template
index a7217ba5a1d..3a0da5a87dc 100644
--- a/srcpkgs/rtl8822bu-dkms/template
+++ b/srcpkgs/rtl8822bu-dkms/template
@@ -1,8 +1,8 @@
 # Template file for 'rtl8822bu-dkms'
 pkgname=rtl8822bu-dkms
-version=20190427
+version=20190713
 revision=1
-_gitrev=dbbf4f7c3527f1bff38054349f01a4a8438db0f4
+_gitrev=dea3bb8e631191ded1839c53fb266d80ef7e8ad3
 archs=noarch
 wrksrc="rtl8822bu-${_gitrev}"
 depends="dkms"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://www.tp-link.com"
 distfiles="https://github.com/EntropicEffect/rtl8822bu/archive/${_gitrev}.tar.gz"
-checksum=96bd6dcf9a285fb7ebac7575bc1e8a28577c200dc1c7ec2abae4005181ef0de5
+checksum=34474838558a8502edc9bcd1091c8911ec128d50aeda2f83173b36c1a592250c
 dkms_modules="88x2bu ${version}"
 
 do_install() {
diff --git a/srcpkgs/rtl_433/template b/srcpkgs/rtl_433/template
index 1b9bcf4da30..d63e4c452db 100644
--- a/srcpkgs/rtl_433/template
+++ b/srcpkgs/rtl_433/template
@@ -1,16 +1,17 @@
 # Template file for 'rtl_433'
 pkgname=rtl_433
-version=18.12
+version=19.08
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="librtlsdr-devel SoapySDR-devel"
+makedepends="librtlsdr-devel SoapySDR-devel libusb-devel"
 short_desc="RTLSDR based 433MHz generic data receiver"
 maintainer="bra1nwave <brainwave@openmailbox.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/merbanan/rtl_433"
+changelog="https://raw.githubusercontent.com/merbanan/rtl_433/master/CHANGELOG.md"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=8d9a0d57155430b03d299effd48b43b7e072f49868485f0fc79294a28402d654
+checksum=6d7975e8e08e724a30fe0c8658e156fe0e67299a9fddfa14daed5f62c625731f
 
 post_install() {
 	vmkdir usr/share/examples
diff --git a/srcpkgs/ruby-addressable/template b/srcpkgs/ruby-addressable/template
index 7397ff4888a..c2674f6e8b6 100644
--- a/srcpkgs/ruby-addressable/template
+++ b/srcpkgs/ruby-addressable/template
@@ -1,12 +1,12 @@
 # Template file for 'ruby-addressable'
 pkgname=ruby-addressable
-version=2.6.0
+version=2.7.0
 revision=1
 archs=noarch
 build_style=gem
 depends="ruby-public_suffix>=2.0.2 ruby-public_suffix<4.0"
 short_desc="Replacement for Ruby's standard library URI implementation"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/sporkmonger/addressable"
-checksum=d490ad06dfc421503e659a12597d6bb0273b5cd7ff2789a1ec27210b1914952d
+checksum=5e9b62fe1239091ea9b2893cd00ffe1bcbdd9371f4e1d35fac595c98c5856cbb
diff --git a/srcpkgs/ruby-asciidoctor/template b/srcpkgs/ruby-asciidoctor/template
index 169365c6f3c..c1cfa5066b2 100644
--- a/srcpkgs/ruby-asciidoctor/template
+++ b/srcpkgs/ruby-asciidoctor/template
@@ -1,14 +1,14 @@
 # Template file for 'ruby-asciidoctor'
 pkgname=ruby-asciidoctor
-version=2.0.7
+version=2.0.10
 revision=1
 archs=noarch
 build_style=gem
 short_desc="Ruby implementation of AsciiDoc"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://asciidoctor.org"
-checksum=9027efd3ba6084c84e9d1eb645b23b4b0a1c5df7516fd7c7ebd1055009b4ec1b
+checksum=7f3df92816f75344d36bb15e49a6fbc07ac0999a1cd2938fd0802ea587964aac
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/ruby-backports/template b/srcpkgs/ruby-backports/template
index 3c79095f178..e7bd1b921a5 100644
--- a/srcpkgs/ruby-backports/template
+++ b/srcpkgs/ruby-backports/template
@@ -1,13 +1,13 @@
 # Template file for 'ruby-backports'
 pkgname=ruby-backports
-version=3.13.0
+version=3.15.0
 revision=1
 build_style=gem
 short_desc="Essential backports that enable many of the nice features of Ruby"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/marcandre/backports"
-checksum=31372dff80d100d95900de82fcb7209ca7c44d458d93c76b610ac14d13e29cfc
+checksum=c23ad4b8b3637992f34c41256b46d49dc49a3725f1df78de42469deb43749f31
 
 post_install() {
 	vlicense LICENSE.txt
diff --git a/srcpkgs/ruby-connection_pool/template b/srcpkgs/ruby-connection_pool/template
index bceae6b8f5c..428ddf6c2ee 100644
--- a/srcpkgs/ruby-connection_pool/template
+++ b/srcpkgs/ruby-connection_pool/template
@@ -5,7 +5,7 @@ revision=2
 archs=noarch
 build_style=gem
 short_desc="Generic connection pool for Ruby"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/mperham/connection_pool"
 checksum=c8cc9446bcc51034103c1259ad70b91dc9f5297d13460b2c0cce7e5a93e8d451
diff --git a/srcpkgs/ruby-erubis/template b/srcpkgs/ruby-erubis/template
index c14abedd5c1..18e85dbceab 100644
--- a/srcpkgs/ruby-erubis/template
+++ b/srcpkgs/ruby-erubis/template
@@ -4,7 +4,7 @@ version=2.7.0
 revision=2
 build_style=gem
 short_desc="Erubis is an implementation of eRuby"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://www.kuwata-lab.com/erubis/"
 checksum=63653f5174a7997f6f1d6f465fbe1494dcc4bdab1fb8e635f6216989fb1148ba
diff --git a/srcpkgs/ruby-ethon/template b/srcpkgs/ruby-ethon/template
index 2c91435f3f7..70e9b201df6 100644
--- a/srcpkgs/ruby-ethon/template
+++ b/srcpkgs/ruby-ethon/template
@@ -6,7 +6,7 @@ archs=noarch
 build_style=gem
 depends="ruby-ffi>=1.3.0"
 short_desc="Lightweight wrapper around libcurl"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/typhoeus/ethon"
 checksum=e99d3095e89f82c5a7e63d9261ddf4a21f28ae5d12a9d3abaa6920cce6cbef3d
diff --git a/srcpkgs/ruby-faraday/template b/srcpkgs/ruby-faraday/template
index 11e42a7214b..2ba74734289 100644
--- a/srcpkgs/ruby-faraday/template
+++ b/srcpkgs/ruby-faraday/template
@@ -1,15 +1,15 @@
 # Template file for 'ruby-faraday'
 pkgname=ruby-faraday
-version=0.15.4
-revision=2
+version=0.17.0
+revision=1
 archs=noarch
 build_style=gem
 depends="ruby-multipart-post>=1.2 ruby-multipart-post<3"
 short_desc="HTTP/REST API client library"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/lostisland/faraday"
-checksum=00e6ffd6f1bccd9dc9e3b993a0004e69680559422206ce4cbb81fd2d0ba8e268
+checksum=5f19b5c6d22eca82564fe26e4963f58cf0ba34059b8e9399c0b19a4eb25a624a
 
 post_install() {
 	vlicense LICENSE.md
diff --git a/srcpkgs/ruby-faraday_middleware/template b/srcpkgs/ruby-faraday_middleware/template
index 1907d5000e6..0bff1baaf25 100644
--- a/srcpkgs/ruby-faraday_middleware/template
+++ b/srcpkgs/ruby-faraday_middleware/template
@@ -6,7 +6,7 @@ archs=noarch
 build_style=gem
 depends="ruby-faraday>=0.7.4 ruby-faraday<1.0"
 short_desc="Various middleware for Faraday"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/lostisland/faraday_middleware"
 checksum=b94e3e7845f78db0eacdfc7e0185f0310765ccd70a46b6ce6478aa858ace23a9
diff --git a/srcpkgs/ruby-ffi/template b/srcpkgs/ruby-ffi/template
index 382669aad69..f2a0fccd2d3 100644
--- a/srcpkgs/ruby-ffi/template
+++ b/srcpkgs/ruby-ffi/template
@@ -1,17 +1,17 @@
 # Template file for 'ruby-ffi'
 pkgname=ruby-ffi
-version=1.10.0
+version=1.11.1
 revision=3
 wrksrc="ffi-${version}"
 build_style=gemspec
 hostmakedepends="libffi-devel"
 makedepends="libffi-devel"
 short_desc="Ruby FFI library"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/ffi/ffi/wiki"
 distfiles="https://rubygems.org/downloads/ffi-${version}.gem"
-checksum=17001940b28a961c94251a39f0ae00b32c2d0850479b5978c971759591fc1749
+checksum=90ae2a7fe7ac4c0af30650fba8b75d93ff3611803c4937248118797ae5edbb1a
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/ruby-gh/template b/srcpkgs/ruby-gh/template
index 4c60a77babd..5d6421b9fbe 100644
--- a/srcpkgs/ruby-gh/template
+++ b/srcpkgs/ruby-gh/template
@@ -7,7 +7,7 @@ build_style=gem
 depends="ruby-addressable>=2.4.0 ruby-backports ruby-faraday>=0.8
  ruby-multi_json>=1.0 ruby-net-http-persistent>=2.9 ruby-net-http-pipeline"
 short_desc="Multi-layer client for the GitHub v3 API"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/travis-ci/gh"
 checksum=ef733f81c17846f217f5ad9616105e9adc337775d41de1cc330133ad25708d3c
diff --git a/srcpkgs/ruby-highline/template b/srcpkgs/ruby-highline/template
index 70727b74128..f0d8ecc7179 100644
--- a/srcpkgs/ruby-highline/template
+++ b/srcpkgs/ruby-highline/template
@@ -1,11 +1,11 @@
 # Template file for 'ruby-highline'
 pkgname=ruby-highline
-version=2.0.2
+version=2.0.3
 revision=1
 archs=noarch
 build_style=gem
 short_desc="High-level IO library for comamndline interfaces"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Ruby"
 homepage="https://github.com/JEG2/highline"
-checksum=999780b892b3bb835cdaafbd0933f65ff85b72ccd1326890629b23e9a8ba1fbc
+checksum=2ddd5c127d4692721486f91737307236fe005352d12a4202e26c48614f719479
diff --git a/srcpkgs/ruby-hpricot/template b/srcpkgs/ruby-hpricot/template
index 4055113bc60..d23de17adf3 100644
--- a/srcpkgs/ruby-hpricot/template
+++ b/srcpkgs/ruby-hpricot/template
@@ -6,7 +6,7 @@ wrksrc="${pkgname#ruby-}-${version}"
 build_style=gemspec
 makedepends="ruby-devel"
 short_desc="Swift, liberal HTML parser"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://code.whytheluckystiff.net/hpricot/"
 distfiles="https://github.com/hpricot/hpricot/archive/${version}.tar.gz"
diff --git a/srcpkgs/ruby-httparty/template b/srcpkgs/ruby-httparty/template
index 41dc8c7bfc7..dfb51dc862f 100644
--- a/srcpkgs/ruby-httparty/template
+++ b/srcpkgs/ruby-httparty/template
@@ -1,15 +1,15 @@
 # Template file for 'ruby-httparty'
 pkgname=ruby-httparty
-version=0.17.0
+version=0.17.1
 revision=1
 archs=noarch
 build_style=gem
 depends="ruby-mime-types>=3.0 ruby-multi_xml>=0.5.2"
 short_desc="Makes http fun! Also, makes consuming restful web services dead easy"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/jnunemaker/httparty"
-checksum=76f359eb0f06873fc64315bb71be33e44100c0865fbf36570811c8a5e9d5151f
+checksum=972f9bff3f94511cf6601ba356ab569897e2b229904a86507057b3844f9439ea
 
 post_install() {
 	vlicense MIT-LICENSE
diff --git a/srcpkgs/ruby-launchy/template b/srcpkgs/ruby-launchy/template
index d8691a7c1bb..aab45c852f5 100644
--- a/srcpkgs/ruby-launchy/template
+++ b/srcpkgs/ruby-launchy/template
@@ -6,7 +6,7 @@ archs=noarch
 build_style=gem
 depends="ruby-addressable>=2.3 ruby-addressable<3.0"
 short_desc="Helper class for launching cross-platform applications"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="ISC"
 homepage="https://github.com/copiousfreetime/launchy"
 checksum=42f52ce12c6fe079bac8a804c66522a0eefe176b845a62df829defe0e37214a4
diff --git a/srcpkgs/ruby-mime-types-data/template b/srcpkgs/ruby-mime-types-data/template
index 0da1e9dc2a1..5b2c2e8ae74 100644
--- a/srcpkgs/ruby-mime-types-data/template
+++ b/srcpkgs/ruby-mime-types-data/template
@@ -1,14 +1,14 @@
 # Template file for 'ruby-mime-types-data'
 pkgname=ruby-mime-types-data
-version=3.2019.0331
+version=3.2019.1009
 revision=1
 archs=noarch
 build_style=gem
 short_desc="Registry for MIME media type definitions"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/mime-types/mime-types-data/"
-checksum=8a70976e9e3268e01df23bd8fdb503d80b285548f4754671b0875496c2bb00d4
+checksum=b09bb0076f4d209d21de5f81569edffdb6e53d43f891e30edfa12433980ba6a3
 
 post_install() {
 	vlicense Licence.md
diff --git a/srcpkgs/ruby-mime-types/template b/srcpkgs/ruby-mime-types/template
index cacfdbe70b8..cf778f045fd 100644
--- a/srcpkgs/ruby-mime-types/template
+++ b/srcpkgs/ruby-mime-types/template
@@ -1,15 +1,15 @@
 # Template file for 'ruby-mime-types'
 pkgname=ruby-mime-types
-version=3.2.2
-revision=2
+version=3.3
+revision=1
 archs=noarch
 build_style=gem
 depends="ruby-mime-types-data>=3.2015"
 short_desc="Library for registry and information about MIME types"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/mime-types/ruby-mime-types/"
-checksum=93f308f0b6754b0ca50dd1982b817f65b8946f6a34bd3db6bd3d8a5265f05d3a
+checksum=933ef7ba38c3e4d5561cbff4aaf92d9d76b97df77b7ab1083e3f2df9220af43c
 
 post_install() {
 	vlicense Licence.md
diff --git a/srcpkgs/ruby-mini_portile2/template b/srcpkgs/ruby-mini_portile2/template
index 03bbcddb42f..7a5be2a2784 100644
--- a/srcpkgs/ruby-mini_portile2/template
+++ b/srcpkgs/ruby-mini_portile2/template
@@ -4,7 +4,7 @@ version=2.4.0
 revision=1
 build_style=gem
 short_desc="Simplistic port-like solution for developers"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://github.com/flavorjones/mini_portile"
 checksum=7e178a397ad62bb8a96977986130dc81f1b13201c6dd95a48bd8cec1dda5f797
diff --git a/srcpkgs/ruby-multi_json/template b/srcpkgs/ruby-multi_json/template
index aade5767780..ea054b27805 100644
--- a/srcpkgs/ruby-multi_json/template
+++ b/srcpkgs/ruby-multi_json/template
@@ -1,14 +1,14 @@
 # Template file for 'ruby-multi_json'
 pkgname=ruby-multi_json
-version=1.13.1
-revision=2
+version=1.14.1
+revision=1
 archs=noarch
 build_style=gem
 short_desc="Common interface for multiple JSON parsing libraries"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/intridea/multi_json"
-checksum=db8613c039b9501e6b2fb85efe4feabb02f55c3365bae52bba35381b89c780e6
+checksum=d971296c0eacea289d31e4a7ab7ac5eda97262c62bbc8c110de4f5e36425c577
 
 post_install() {
 	vlicense LICENSE.md
diff --git a/srcpkgs/ruby-multi_xml/template b/srcpkgs/ruby-multi_xml/template
index b2c924f22ee..6279a2e499c 100644
--- a/srcpkgs/ruby-multi_xml/template
+++ b/srcpkgs/ruby-multi_xml/template
@@ -5,7 +5,7 @@ revision=2
 archs=noarch
 build_style=gem
 short_desc="Swappable XML backends utilizing LibXML, Nokogiri, Ox, or REXML"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/sferik/multi_xml"
 checksum=d24393cf958adb226db884b976b007914a89c53ad88718e25679d7008823ad52
diff --git a/srcpkgs/ruby-multipart-post/template b/srcpkgs/ruby-multipart-post/template
index 40c94357b02..9c657d8e190 100644
--- a/srcpkgs/ruby-multipart-post/template
+++ b/srcpkgs/ruby-multipart-post/template
@@ -1,14 +1,14 @@
 # Template file for 'ruby-multipart-post'
 pkgname=ruby-multipart-post
-version=2.0.0
-revision=2
+version=2.1.1
+revision=1
 archs=noarch
 build_style=gem
 short_desc="Use with Net::HTTP to do multipart form posts"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/nicksieger/multipart-post"
-checksum=3dc44e50d3df3d42da2b86272c568fd7b75c928d8af3cc5f9834e2e5d9586026
+checksum=d2dd7aa957650e0d99e0513cd388401b069f09528441b87d884609c8e94ffcfd
 
 post_install() {
 	sed -n '58,77p' README.md > LICENSE
diff --git a/srcpkgs/ruby-mustache/template b/srcpkgs/ruby-mustache/template
index dd7ce924024..049eef94945 100644
--- a/srcpkgs/ruby-mustache/template
+++ b/srcpkgs/ruby-mustache/template
@@ -5,7 +5,7 @@ revision=2
 archs=noarch
 build_style=gem
 short_desc="Framework-agnostic way to render logic-free views"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/mustache/mustache"
 checksum=7365441281b93b9a3e7299c432af1b971435155168ef12631a72bbdaf9ed2899
diff --git a/srcpkgs/ruby-net-http-persistent/template b/srcpkgs/ruby-net-http-persistent/template
index 3381362b27b..6552be19a18 100644
--- a/srcpkgs/ruby-net-http-persistent/template
+++ b/srcpkgs/ruby-net-http-persistent/template
@@ -1,15 +1,15 @@
 # Template file for 'ruby-net-http-persistent'
 pkgname=ruby-net-http-persistent
-version=3.0.0
-revision=2
+version=3.1.0
+revision=1
 archs=noarch
 build_style=gem
 depends="ruby-connection_pool>=2.2 ruby-connection_pool<3.0"
 short_desc="Manages persistent connections using Net::HTTP"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://docs.seattlerb.org/net-http-persistent"
-checksum=285cbf0bc3eb6312a86f883e0f5148e764aed76127075f3836dff5b74adad994
+checksum=eab637fcee31d2f2c119c24b5ae36d73cd8c08ccd9a45567829f24059e9836ae
 
 post_install() {
 	sed -n '63,82p' README.rdoc > LICENSE
diff --git a/srcpkgs/ruby-net-http-pipeline/template b/srcpkgs/ruby-net-http-pipeline/template
index c8ddf3f7800..25304d334fc 100644
--- a/srcpkgs/ruby-net-http-pipeline/template
+++ b/srcpkgs/ruby-net-http-pipeline/template
@@ -5,7 +5,7 @@ revision=2
 archs=noarch
 build_style=gem
 short_desc="HTTP/1.1 pipelining implementation atop Net::HTTP"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://docs.seattlerb.org/net-http-pipeline"
 checksum=6923ce2f28bfde589a9f385e999395eead48ccfe4376d4a85d9a77e8c7f0b22f
diff --git a/srcpkgs/ruby-pkg-config/template b/srcpkgs/ruby-pkg-config/template
index fdf98c041cd..196611e7e57 100644
--- a/srcpkgs/ruby-pkg-config/template
+++ b/srcpkgs/ruby-pkg-config/template
@@ -1,10 +1,10 @@
 # Template file for 'ruby-pkg-config'
 pkgname=ruby-pkg-config
-version=1.3.7
+version=1.3.9
 revision=1
 build_style=gem
 short_desc="Properly detect need libraries for compiling Ruby native extensions"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://github.com/ruby-gnome2/pkg-config"
-checksum=216fdf7ecd753dcc258cf516e1843f8e354c155b0aef2428f36e60c840f5a6e8
+checksum=fed18718d618565505af031c0df4054c4edc713ec6f37717253b82c9c98472dc
diff --git a/srcpkgs/ruby-public_suffix/template b/srcpkgs/ruby-public_suffix/template
index e0e0a58d364..250f8bb518e 100644
--- a/srcpkgs/ruby-public_suffix/template
+++ b/srcpkgs/ruby-public_suffix/template
@@ -1,14 +1,14 @@
 # Template file for 'ruby-public_suffix'
 pkgname=ruby-public_suffix
-version=3.0.3
-revision=2
+version=4.0.1
+revision=1
 archs=noarch
 build_style=gem
 short_desc="Parse domain names into top level domain, domain and subdomains"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://simonecarletti.com/code/publicsuffix-ruby"
-checksum=d4f4addffbd1ad3e7b5bb2e258a761ccef5670c23c29b0476b2299bcca220623
+checksum=6035585fe67676a195ba53fa5860625a70e057cf2226ecc5bbede125a4d8ce76
 
 post_install() {
 	vlicense LICENSE.txt
diff --git a/srcpkgs/ruby-pusher-client/template b/srcpkgs/ruby-pusher-client/template
index 699f90e1ada..dc9308e99f8 100644
--- a/srcpkgs/ruby-pusher-client/template
+++ b/srcpkgs/ruby-pusher-client/template
@@ -6,7 +6,7 @@ archs=noarch
 build_style=gem
 depends="ruby-websocket>=1.0 ruby-websocket<2.0"
 short_desc="Client for consuming WebSockets from http://pusher.com"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/pusher/pusher-ruby-client"
 checksum=c405c931090e126c056d99f6b69a01b1bcb6cbfdde02389c93e7d547c6efd5a3
diff --git a/srcpkgs/ruby-rb-readline/template b/srcpkgs/ruby-rb-readline/template
index 4ec255476fe..f7ff697fc6e 100644
--- a/srcpkgs/ruby-rb-readline/template
+++ b/srcpkgs/ruby-rb-readline/template
@@ -6,7 +6,7 @@ archs=noarch
 build_style=gem
 depends="ruby"
 short_desc="Pure Ruby implementation of GNU readline library"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/ConnorAtherton/rb-readline"
 checksum=9e9bd7e198bdef0822c46902f6c592b882c1f9777894a4c3dcf5b320824a8793
diff --git a/srcpkgs/ruby-rdiscount/template b/srcpkgs/ruby-rdiscount/template
index e502c4c90ee..abf271f6ac2 100644
--- a/srcpkgs/ruby-rdiscount/template
+++ b/srcpkgs/ruby-rdiscount/template
@@ -6,7 +6,7 @@ wrksrc="${pkgname#ruby-}-${version}"
 build_style=gemspec
 makedepends="ruby-devel"
 short_desc="Fast implementation of Gruber's Markdown in C"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://dafoster.net/projects/rdiscount/"
 distfiles="https://github.com/davidfstr/rdiscount/archive/${version}.tar.gz"
diff --git a/srcpkgs/ruby-ronn/template b/srcpkgs/ruby-ronn/template
index 5b9751cede4..a7e498329ba 100644
--- a/srcpkgs/ruby-ronn/template
+++ b/srcpkgs/ruby-ronn/template
@@ -6,7 +6,7 @@ archs=noarch
 build_style=gem
 depends="ruby-hpricot ruby-mustache ruby-rdiscount groff"
 short_desc="Strick markdown-like format for manpages"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://rtomayko.github.com/ronn"
 checksum=82df6fd4a3aa91734866710d2811a6387e50a7513fc528ce6c7d95ee7ad7f41e
diff --git a/srcpkgs/ruby-thor/template b/srcpkgs/ruby-thor/template
index 30a13e09d48..dc324c08a63 100644
--- a/srcpkgs/ruby-thor/template
+++ b/srcpkgs/ruby-thor/template
@@ -4,7 +4,7 @@ version=0.20.3
 revision=2
 build_style=gem
 short_desc="Toolkit for building powerful command-line interfaces"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://whatisthor.com/"
 checksum=49bc217fe28f6af34c6e60b003e3405c27595a55689077d82e9e61d4d3b519fa
diff --git a/srcpkgs/ruby-travis/template b/srcpkgs/ruby-travis/template
index 17ce179207e..b7f1382b039 100644
--- a/srcpkgs/ruby-travis/template
+++ b/srcpkgs/ruby-travis/template
@@ -8,7 +8,7 @@ depends="ruby-backports ruby-faraday>=0.9 ruby-faraday_middleware>=0.9.1
  ruby-gh>=0.13 ruby-highline>=1.6 ruby-launchy>=2.1 ruby-pusher-client>=0.4
  ruby-typhoeus>=0.6.8"
 short_desc="CLI and Ruby library client for Travis CI"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/travis-ci/travis.rb"
 checksum=533752268510d061ab4c6b77d462eae0ec54afe38412f4803e74da7da39eed3d
diff --git a/srcpkgs/ruby-typhoeus/template b/srcpkgs/ruby-typhoeus/template
index b134040cd9d..7b08216c4ba 100644
--- a/srcpkgs/ruby-typhoeus/template
+++ b/srcpkgs/ruby-typhoeus/template
@@ -6,7 +6,7 @@ archs=noarch
 build_style=gem
 depends="ruby-ethon>=0.9.0"
 short_desc="Parallel HTTP requests runner"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/typhoeus/typhoeus"
 checksum=257e7163d50bed15e52c3c25bde890ea3ad854f3bd2e3fd16ce0b216c342d132
diff --git a/srcpkgs/ruby-websocket/template b/srcpkgs/ruby-websocket/template
index 1709e81df11..5d221fa67d6 100644
--- a/srcpkgs/ruby-websocket/template
+++ b/srcpkgs/ruby-websocket/template
@@ -5,7 +5,7 @@ revision=2
 archs=noarch
 build_style=gem
 short_desc="Universal Ruby library to handle WebSocket protocol"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/imanel/websocket-ruby"
 checksum=1d8155c1cdaab8e8e72587a60e08423c9dd84ee44e4e827358ce3d4c2ccb2138
diff --git a/srcpkgs/ruby-xdg/template b/srcpkgs/ruby-xdg/template
index 6859faeac31..9923e24baea 100644
--- a/srcpkgs/ruby-xdg/template
+++ b/srcpkgs/ruby-xdg/template
@@ -1,14 +1,14 @@
 # Template file for 'ruby-xdg'
 pkgname=ruby-xdg
-version=2.2.3
-revision=2
+version=3.1.0
+revision=1
 build_style=gem
 short_desc="Module for supporting the XDG Base Directory Standard"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="http://rubyworks.github.com/xdg"
-checksum=b87e4ad02eaa1557d09ae620dac134a3f20ac588063dc7e46e0b77be9a3bc4ae
+checksum=ab7e4d69cf241d4eb616fa2918007a2961e86e97daefec9e1c21645e2c72eaf9
 
 post_install() {
-	vlicense LICENSE.txt
+	vlicense LICENSE.md
 }
diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index ffe8e187ccd..d5db49edef4 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -2,8 +2,8 @@
 _ruby_abiver=2.6.0
 
 pkgname=ruby
-version=2.6.3
-revision=2
+version=2.6.5
+revision=1
 build_style=gnu-configure
 configure_args="--enable-shared --disable-rpath
  DOXYGEN=/usr/bin/doxygen DOT=/usr/bin/dot PKG_CONFIG=/usr/bin/pkg-config"
@@ -17,7 +17,7 @@ homepage="http://www.ruby-lang.org/en/"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Ruby, BSD-2-Clause"
 distfiles="https://cache.ruby-lang.org/pub/ruby/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=dd638bf42059182c1d04af0d5577131d4ce70b79105231c4cc0a60de77b14f2e
+checksum=97ddf1b922f83c1f5c50e75bf54e27bba768d75fea7cda903b886c6745e60f0a
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Broken on the builders but successfully built locally
diff --git a/srcpkgs/run-parts/template b/srcpkgs/run-parts/template
index c3917512df9..665d03ad902 100644
--- a/srcpkgs/run-parts/template
+++ b/srcpkgs/run-parts/template
@@ -1,18 +1,18 @@
 # Template file for 'run-parts'
 pkgname=run-parts
-version=4.8.6.3
+version=4.9
 revision=1
 bootstrap=yes
 wrksrc="debianutils-${version}"
 build_style=gnu-configure
 make_build_target=run-parts
 short_desc="Run scripts or programs in a directory"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Peter Bui <pbui@github.bx612.space>"
 license="GPL-2.0-or-later"
 homepage="https://tracker.debian.org/pkg/debianutils"
 changelog="http://metadata.ftp-master.debian.org/changelogs/main/d/debianutils/debianutils_${version}_changelog"
 distfiles="${DEBIAN_SITE}/main/d/debianutils/debianutils_${version}.tar.xz"
-checksum=2cc7de3afc6df1cf6d00af9938efac7ee8f739228e548e512ddc186b6a7be221
+checksum=20975c5cb8cb305f28c2ac35dd99fd9f594f25b6140b5d478a0a364e9fa8073f
 
 do_install() {
 	vbin run-parts
diff --git a/srcpkgs/runc/template b/srcpkgs/runc/template
index cb6708140c2..8097bd39d2d 100644
--- a/srcpkgs/runc/template
+++ b/srcpkgs/runc/template
@@ -1,8 +1,8 @@
 # Template file for 'runc'
 pkgname=runc
 version=1.0.0
-revision=10
-_subver="rc8"
+revision=11
+_subver="rc9"
 _ver="$version-$_subver"
 wrksrc="$pkgname-$_ver"
 build_style=go
@@ -15,7 +15,7 @@ maintainer="Paul Knopf <pauldotknopf@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/opencontainers/runc"
 distfiles="https://github.com/opencontainers/runc/releases/download/v${_ver}/runc.tar.xz"
-checksum=5d46f01bca203ae226f107f8e3351211f492d43038af19b8337acffab6c4f576
+checksum=2f1c7ebac67c779affe2bb4370bba44b08ed280144ba58c86219186e303832ba
 
 post_build() {
 	make man
diff --git a/srcpkgs/runit-void/template b/srcpkgs/runit-void/template
index 14f605fdc92..52199f0f912 100644
--- a/srcpkgs/runit-void/template
+++ b/srcpkgs/runit-void/template
@@ -1,7 +1,7 @@
 # Template file for 'runit-void'
 pkgname=runit-void
-version=20180623
-revision=2
+version=20190906
+revision=1
 wrksrc="void-runit-${version}"
 build_style=gnu-makefile
 homepage="https://github.com/void-linux/void-runit"
@@ -9,7 +9,7 @@ short_desc="Void Linux runit scripts"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Public Domain"
 distfiles="https://github.com/void-linux/void-runit/archive/${version}.tar.gz"
-checksum=f71a070ac5e5af39fdaa0ffbd7404b607e503c2226cb49e98ac19e042283ff2c
+checksum=9e1027c07124ff4efad63bef74b9f1ae0659e43f9d4e7cfde996be271706570c
 
 depends="virtual?awk procps-ng runit"
 conf_files="
diff --git a/srcpkgs/rust-cargo-audit/template b/srcpkgs/rust-cargo-audit/template
index a4eda925e0a..f0daae87024 100644
--- a/srcpkgs/rust-cargo-audit/template
+++ b/srcpkgs/rust-cargo-audit/template
@@ -1,6 +1,6 @@
 # Template file for 'rust-cargo-audit'
 pkgname=rust-cargo-audit
-version=0.7.0
+version=0.9.3
 revision=1
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0, MIT"
 homepage="https://rustsec.org"
 distfiles="https://static.crates.io/crates/cargo-audit/cargo-audit-${version}.crate"
-checksum=c246d7f8c9e42f3f4afac539feed3abe42042585c8e808c0836eb65ad86513ad
+checksum=7693507d43e5713dbdf2ad708b12fdc02e8efcb907e74f313c8e34c47d9b8821
 
 post_install() {
 	vlicense LICENSE-APACHE
diff --git a/srcpkgs/rust-cargo-bloat/template b/srcpkgs/rust-cargo-bloat/template
index 909a98c287b..654451a27fa 100644
--- a/srcpkgs/rust-cargo-bloat/template
+++ b/srcpkgs/rust-cargo-bloat/template
@@ -1,6 +1,6 @@
 # Template file for 'rust-cargo-bloat'
 pkgname=rust-cargo-bloat
-version=0.6.4
+version=0.9.0
 revision=1
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
@@ -9,7 +9,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://crates.io/crates/cargo-bloat"
 distfiles="https://static.crates.io/crates/cargo-bloat/cargo-bloat-${version}.crate"
-checksum=a62b35cd133892e7531cdcb24d9ec1a26d97087d0b1e77ffae922d2af0d6b42d
+checksum=780dce4cdcd0dd4de468a90f712086c23fefc1d028b709873d4075ff200f5eaf
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/rust-sccache/template b/srcpkgs/rust-sccache/template
index dc21c37a84a..e7ec7cb03a9 100644
--- a/srcpkgs/rust-sccache/template
+++ b/srcpkgs/rust-sccache/template
@@ -1,7 +1,7 @@
 # Template file for 'rust-sccache'
 pkgname=rust-sccache
-version=0.2.8
-revision=2
+version=0.2.12
+revision=1
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
@@ -11,8 +11,13 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://crates.io/crates/sccache"
 distfiles="https://static.crates.io/crates/sccache/sccache-${version}.crate"
-checksum=c1e914cab6496ac4ea3ef9e52b2a14661edd313ae3ecad8ce52f3a254aafcc1a
+checksum=dfbf49fad5edeb3a1ead50a41eea2d115ce591342f5d8f6b60b00dd76bec3c49
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc*) broken="ftbfs in ring" ;;
 esac
+
+pre_build() {
+	cargo update --package openssl-sys --precise 0.9.49
+	cargo update --package openssl:0.10.15 --precise 0.10.24
+}
diff --git a/srcpkgs/rust/patches/0002-Fix-LLVM-build.patch b/srcpkgs/rust/patches/0002-Fix-LLVM-build.patch
index 95e261df034..83091f46bf6 100644
--- a/srcpkgs/rust/patches/0002-Fix-LLVM-build.patch
+++ b/srcpkgs/rust/patches/0002-Fix-LLVM-build.patch
@@ -1,17 +1,17 @@
-From 59faa3f7b9b07d986bcd810d750daad956bd612b Mon Sep 17 00:00:00 2001
+From 0a19456e2445def4cfe99dd02cf8292c1db5d4d4 Mon Sep 17 00:00:00 2001
 From: Samuel Holland <samuel@sholland.org>
 Date: Fri, 8 Sep 2017 00:04:29 -0500
-Subject: [PATCH 02/12] Fix LLVM build
+Subject: [PATCH 02/16] Fix LLVM build
 
 ---
  src/bootstrap/lib.rs | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs
-index ca4489655..7618a6e6d 100644
+index 4d297fa918a..867df81d972 100644
 --- a/src/bootstrap/lib.rs
 +++ b/src/bootstrap/lib.rs
-@@ -774,7 +774,8 @@ impl Build {
+@@ -769,7 +769,8 @@ impl Build {
          // cc-rs because the build scripts will determine that for themselves.
          let mut base = self.cc[&target].args().iter()
                             .map(|s| s.to_string_lossy().into_owned())
@@ -22,5 +22,5 @@ index ca4489655..7618a6e6d 100644
  
          // If we're compiling on macOS then we add a few unconditional flags
 -- 
-2.22.0
+2.21.0
 
diff --git a/srcpkgs/rust/patches/0003-Allow-rustdoc-to-work-when-cross-compiling-on-musl.patch b/srcpkgs/rust/patches/0003-Allow-rustdoc-to-work-when-cross-compiling-on-musl.patch
index 55c4ab799ee..cf07c76d281 100644
--- a/srcpkgs/rust/patches/0003-Allow-rustdoc-to-work-when-cross-compiling-on-musl.patch
+++ b/srcpkgs/rust/patches/0003-Allow-rustdoc-to-work-when-cross-compiling-on-musl.patch
@@ -1,7 +1,7 @@
-From 681f46ea92719a419c3dadbe3376062cc5bde8b8 Mon Sep 17 00:00:00 2001
+From 2200debf48b6ef4c87e258cf8a968a89903f8723 Mon Sep 17 00:00:00 2001
 From: Samuel Holland <samuel@sholland.org>
 Date: Sat, 2 Dec 2017 17:25:44 -0600
-Subject: [PATCH 03/12] Allow rustdoc to work when cross-compiling on musl
+Subject: [PATCH 03/16] Allow rustdoc to work when cross-compiling on musl
 
 musl can't handle foreign-architecture libraries in LD_LIBRARY_PATH.
 ---
@@ -9,7 +9,7 @@ musl can't handle foreign-architecture libraries in LD_LIBRARY_PATH.
  1 file changed, 2 insertions(+), 5 deletions(-)
 
 diff --git a/src/bootstrap/bin/rustdoc.rs b/src/bootstrap/bin/rustdoc.rs
-index 1c9f6e1ab..7e90be8d8 100644
+index 1c9f6e1ab28..7e90be8d8cc 100644
 --- a/src/bootstrap/bin/rustdoc.rs
 +++ b/src/bootstrap/bin/rustdoc.rs
 @@ -23,9 +23,6 @@ fn main() {
@@ -41,5 +41,5 @@ index 1c9f6e1ab..7e90be8d8 100644
          );
          eprintln!("sysroot: {:?}", sysroot);
 -- 
-2.22.0
+2.21.0
 
diff --git a/srcpkgs/rust/patches/0004-Require-static-native-libraries-when-linking-static-.patch b/srcpkgs/rust/patches/0004-Require-static-native-libraries-when-linking-static-.patch
index 58aa482d6fb..854cd61e68e 100644
--- a/srcpkgs/rust/patches/0004-Require-static-native-libraries-when-linking-static-.patch
+++ b/srcpkgs/rust/patches/0004-Require-static-native-libraries-when-linking-static-.patch
@@ -1,7 +1,7 @@
-From b0de26f4cef75c63a7901990ed92fe0616a971fc Mon Sep 17 00:00:00 2001
+From 10bd267ac2621267e1f537a5a7df34cb87354cd3 Mon Sep 17 00:00:00 2001
 From: Samuel Holland <samuel@sholland.org>
 Date: Fri, 8 Sep 2017 00:05:18 -0500
-Subject: [PATCH 04/12] Require static native libraries when linking static
+Subject: [PATCH 04/16] Require static native libraries when linking static
  executables
 
 On ELF targets like Linux, gcc/ld will create a dynamically-linked
@@ -16,10 +16,10 @@ Fixes #54243
  1 file changed, 14 insertions(+), 4 deletions(-)
 
 diff --git a/src/librustc_codegen_ssa/back/link.rs b/src/librustc_codegen_ssa/back/link.rs
-index d5a56f6a0..bb06d80d8 100644
+index e3d297e7862..974e8c0239b 100644
 --- a/src/librustc_codegen_ssa/back/link.rs
 +++ b/src/librustc_codegen_ssa/back/link.rs
-@@ -1548,9 +1548,7 @@ fn add_upstream_rust_crates<'a, B: ArchiveBuilder<'a>>(cmd: &mut dyn Linker,
+@@ -1571,9 +1571,7 @@ fn add_upstream_rust_crates<'a, B: ArchiveBuilder<'a>>(cmd: &mut dyn Linker,
      }
  }
  
@@ -30,7 +30,7 @@ index d5a56f6a0..bb06d80d8 100644
  //
  // 1. The upstream crate is an rlib. In this case we *must* link in the
  // native dependency because the rlib is just an archive.
-@@ -1593,7 +1591,19 @@ pub fn add_upstream_native_libraries(cmd: &mut dyn Linker,
+@@ -1616,7 +1614,19 @@ pub fn add_upstream_native_libraries(cmd: &mut dyn Linker,
                  continue
              }
              match lib.kind {
@@ -52,5 +52,5 @@ index d5a56f6a0..bb06d80d8 100644
                  NativeLibraryKind::NativeStaticNobundle => {
                      // Link "static-nobundle" native libs only if the crate they originate from
 -- 
-2.22.0
+2.21.0
 
diff --git a/srcpkgs/rust/patches/0005-Remove-nostdlib-and-musl_root-from-musl-targets.patch b/srcpkgs/rust/patches/0005-Remove-nostdlib-and-musl_root-from-musl-targets.patch
index 7f524b1eabf..88e05b3887d 100644
--- a/srcpkgs/rust/patches/0005-Remove-nostdlib-and-musl_root-from-musl-targets.patch
+++ b/srcpkgs/rust/patches/0005-Remove-nostdlib-and-musl_root-from-musl-targets.patch
@@ -1,7 +1,7 @@
-From 9e646efacc9459f05bcefe9ad6d8e65dd06ba2d7 Mon Sep 17 00:00:00 2001
+From e8ef432c23ea9fb70b28bea07042b33f1050569b Mon Sep 17 00:00:00 2001
 From: Samuel Holland <samuel@sholland.org>
 Date: Fri, 8 Sep 2017 22:11:14 -0500
-Subject: [PATCH 05/12] Remove -nostdlib and musl_root from musl targets
+Subject: [PATCH 05/16] Remove -nostdlib and musl_root from musl targets
 
 ---
  config.toml.example                           |  6 ----
@@ -20,10 +20,10 @@ Subject: [PATCH 05/12] Remove -nostdlib and musl_root from musl targets
  13 files changed, 4 insertions(+), 152 deletions(-)
 
 diff --git a/config.toml.example b/config.toml.example
-index 556625b53..3c6f18728 100644
+index c14adf8ce33..8ec8d2bbbb7 100644
 --- a/config.toml.example
 +++ b/config.toml.example
-@@ -474,12 +474,6 @@
+@@ -479,12 +479,6 @@
  # only use static libraries. If unset, the target's default linkage is used.
  #crt-static = false
  
@@ -37,10 +37,10 @@ index 556625b53..3c6f18728 100644
  #wasi-root = "..."
  
 diff --git a/src/bootstrap/bin/rustc.rs b/src/bootstrap/bin/rustc.rs
-index 821c37dc2..906af787f 100644
+index 595deb07ec8..c077dc1581e 100644
 --- a/src/bootstrap/bin/rustc.rs
 +++ b/src/bootstrap/bin/rustc.rs
-@@ -122,16 +122,6 @@ fn main() {
+@@ -145,16 +145,6 @@ fn main() {
              cmd.arg("-Cprefer-dynamic");
          }
  
@@ -58,7 +58,7 @@ index 821c37dc2..906af787f 100644
              let mut root = OsString::from("native=");
              root.push(&s);
 diff --git a/src/bootstrap/cc_detect.rs b/src/bootstrap/cc_detect.rs
-index dfc243b70..848d1d4b2 100644
+index 400375cd201..0394ab7a8a7 100644
 --- a/src/bootstrap/cc_detect.rs
 +++ b/src/bootstrap/cc_detect.rs
 @@ -84,7 +84,7 @@ pub fn find(build: &mut Build) {
@@ -70,16 +70,16 @@ index dfc243b70..848d1d4b2 100644
          }
  
          let compiler = cfg.get_compiler();
-@@ -113,7 +113,7 @@ pub fn find(build: &mut Build) {
-         if let Some(cxx) = config.and_then(|c| c.cxx.as_ref()) {
+@@ -107,7 +107,7 @@ pub fn find(build: &mut Build) {
              cfg.compiler(cxx);
+             true
+         } else if build.hosts.contains(&target) || build.build == target {
+-            set_compiler(&mut cfg, Language::CPlusPlus, target, config, build);
++            set_compiler(&mut cfg, Language::CPlusPlus, target, config);
+             true
          } else {
--            set_compiler(&mut cfg, Language::CPlusPlus, host, config, build);
-+            set_compiler(&mut cfg, Language::CPlusPlus, host, config);
-         }
-         let compiler = cfg.get_compiler();
-         build.verbose(&format!("CXX_{} = {:?}", host, compiler.path()));
-@@ -124,8 +124,7 @@ pub fn find(build: &mut Build) {
+             false
+@@ -134,8 +134,7 @@ pub fn find(build: &mut Build) {
  fn set_compiler(cfg: &mut cc::Build,
                  compiler: Language,
                  target: Interned<String>,
@@ -89,7 +89,7 @@ index dfc243b70..848d1d4b2 100644
      match &*target {
          // When compiling for android we may have the NDK configured in the
          // config.toml in which case we look there. Otherwise the default
-@@ -165,26 +164,6 @@ fn set_compiler(cfg: &mut cc::Build,
+@@ -175,26 +174,6 @@ fn set_compiler(cfg: &mut cc::Build,
              }
          }
  
@@ -117,10 +117,10 @@ index dfc243b70..848d1d4b2 100644
      }
  }
 diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs
-index e1cdd226f..05442c6c6 100644
+index 576267e6948..8e5de3907f6 100644
 --- a/src/bootstrap/compile.rs
 +++ b/src/bootstrap/compile.rs
-@@ -115,20 +115,7 @@ impl Step for Std {
+@@ -116,20 +116,7 @@ impl Step for Std {
  fn copy_third_party_objects(builder: &Builder<'_>, compiler: &Compiler, target: Interned<String>) {
      let libdir = builder.sysroot_libdir(*compiler, target);
  
@@ -142,7 +142,7 @@ index e1cdd226f..05442c6c6 100644
          for &obj in &["crt1.o"] {
              builder.copy(
                  &builder.wasi_root(target).unwrap().join("lib/wasm32-wasi").join(obj),
-@@ -191,12 +178,6 @@ pub fn std_cargo(builder: &Builder<'_>,
+@@ -219,12 +206,6 @@ pub fn std_cargo(builder: &Builder<'_>,
              .arg("--manifest-path")
              .arg(builder.src.join("src/libstd/Cargo.toml"));
  
@@ -156,10 +156,10 @@ index e1cdd226f..05442c6c6 100644
              if let Some(p) = builder.wasi_root(target) {
                  cargo.env("WASI_ROOT", p);
 diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs
-index b1d009a67..cc567839f 100644
+index 66f504ea924..5bb211501b1 100644
 --- a/src/bootstrap/config.rs
 +++ b/src/bootstrap/config.rs
-@@ -135,8 +135,6 @@ pub struct Config {
+@@ -133,8 +133,6 @@ pub struct Config {
      pub print_step_timings: bool,
      pub missing_tools: bool,
  
@@ -168,7 +168,7 @@ index b1d009a67..cc567839f 100644
      pub prefix: Option<PathBuf>,
      pub sysconfdir: Option<PathBuf>,
      pub datadir: Option<PathBuf>,
-@@ -171,7 +169,6 @@ pub struct Target {
+@@ -169,7 +167,6 @@ pub struct Target {
      pub linker: Option<PathBuf>,
      pub ndk: Option<PathBuf>,
      pub crt_static: Option<bool>,
@@ -176,15 +176,15 @@ index b1d009a67..cc567839f 100644
      pub wasi_root: Option<PathBuf>,
      pub qemu_rootfs: Option<PathBuf>,
      pub no_std: bool,
-@@ -308,7 +305,6 @@ struct Rust {
+@@ -307,7 +304,6 @@ struct Rust {
      backtrace: Option<bool>,
      default_linker: Option<String>,
      channel: Option<String>,
 -    musl_root: Option<String>,
      rpath: Option<bool>,
      optimize_tests: Option<bool>,
-     debuginfo_tests: Option<bool>,
-@@ -348,7 +344,6 @@ struct TomlTarget {
+     codegen_tests: Option<bool>,
+@@ -346,7 +342,6 @@ struct TomlTarget {
      linker: Option<String>,
      android_ndk: Option<String>,
      crt_static: Option<bool>,
@@ -192,7 +192,7 @@ index b1d009a67..cc567839f 100644
      wasi_root: Option<String>,
      qemu_rootfs: Option<String>,
  }
-@@ -568,7 +563,6 @@ impl Config {
+@@ -569,7 +564,6 @@ impl Config {
              set(&mut config.llvm_tools_enabled, rust.llvm_tools);
              config.rustc_parallel = rust.parallel_compiler.unwrap_or(false);
              config.rustc_default_linker = rust.default_linker.clone();
@@ -200,7 +200,7 @@ index b1d009a67..cc567839f 100644
              config.save_toolstates = rust.save_toolstates.clone().map(PathBuf::from);
              set(&mut config.deny_warnings, rust.deny_warnings.or(flags.warnings));
              set(&mut config.backtrace_on_ice, rust.backtrace_on_ice);
-@@ -611,7 +605,6 @@ impl Config {
+@@ -607,7 +601,6 @@ impl Config {
                  target.ranlib = cfg.ranlib.clone().map(PathBuf::from);
                  target.linker = cfg.linker.clone().map(PathBuf::from);
                  target.crt_static = cfg.crt_static.clone();
@@ -209,10 +209,10 @@ index b1d009a67..cc567839f 100644
                  target.qemu_rootfs = cfg.qemu_rootfs.clone().map(PathBuf::from);
  
 diff --git a/src/bootstrap/configure.py b/src/bootstrap/configure.py
-index ade8afee7..f9ccf7aed 100755
+index 907983d43ad..e91f6fcbe4b 100755
 --- a/src/bootstrap/configure.py
 +++ b/src/bootstrap/configure.py
-@@ -111,28 +111,6 @@ v("aarch64-linux-android-ndk", "target.aarch64-linux-android.android-ndk",
+@@ -110,30 +110,6 @@ v("aarch64-linux-android-ndk", "target.aarch64-linux-android.android-ndk",
    "aarch64-linux-android NDK standalone path")
  v("x86_64-linux-android-ndk", "target.x86_64-linux-android.android-ndk",
    "x86_64-linux-android NDK standalone path")
@@ -230,7 +230,9 @@ index ade8afee7..f9ccf7aed 100755
 -  "arm-unknown-linux-musleabihf install directory")
 -v("musl-root-armv5te", "target.armv5te-unknown-linux-musleabi.musl-root",
 -  "armv5te-unknown-linux-musleabi install directory")
--v("musl-root-armv7", "target.armv7-unknown-linux-musleabihf.musl-root",
+-v("musl-root-armv7", "target.armv7-unknown-linux-musleabi.musl-root",
+-  "armv7-unknown-linux-musleabi install directory")
+-v("musl-root-armv7hf", "target.armv7-unknown-linux-musleabihf.musl-root",
 -  "armv7-unknown-linux-musleabihf install directory")
 -v("musl-root-aarch64", "target.aarch64-unknown-linux-musl.musl-root",
 -  "aarch64-unknown-linux-musl install directory")
@@ -242,10 +244,10 @@ index ade8afee7..f9ccf7aed 100755
    "rootfs in qemu testing, you probably don't want to use this")
  v("qemu-aarch64-rootfs", "target.aarch64-unknown-linux-gnu.qemu-rootfs",
 diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs
-index 7618a6e6d..49cdb526e 100644
+index 867df81d972..4fb57aa6db6 100644
 --- a/src/bootstrap/lib.rs
 +++ b/src/bootstrap/lib.rs
-@@ -852,14 +852,6 @@ impl Build {
+@@ -847,14 +847,6 @@ impl Build {
          }
      }
  
@@ -261,7 +263,7 @@ index 7618a6e6d..49cdb526e 100644
      fn wasi_root(&self, target: Interned<String>) -> Option<&Path> {
          self.config.target_config.get(&target)
 diff --git a/src/bootstrap/sanity.rs b/src/bootstrap/sanity.rs
-index dc65fb9b7..060ba6d9e 100644
+index dc65fb9b797..060ba6d9e42 100644
 --- a/src/bootstrap/sanity.rs
 +++ b/src/bootstrap/sanity.rs
 @@ -176,34 +176,6 @@ pub fn check(build: &mut Build) {
@@ -299,63 +301,8 @@ index dc65fb9b7..060ba6d9e 100644
          if target.contains("msvc") {
              // There are three builds of cmake on windows: MSVC, MinGW, and
              // Cygwin. The Cygwin build does not have generators for Visual
-diff --git a/src/ci/docker/dist-i586-gnu-i586-i686-musl/Dockerfile b/src/ci/docker/dist-i586-gnu-i586-i686-musl/Dockerfile
-index ba2d32a92..412c37fdd 100644
---- a/src/ci/docker/dist-i586-gnu-i586-i686-musl/Dockerfile
-+++ b/src/ci/docker/dist-i586-gnu-i586-i686-musl/Dockerfile
-@@ -30,8 +30,6 @@ COPY scripts/sccache.sh /scripts/
- RUN sh /scripts/sccache.sh
- 
- ENV RUST_CONFIGURE_ARGS \
--      --musl-root-i586=/musl-i586 \
--      --musl-root-i686=/musl-i686 \
-       --enable-extended \
-       --disable-docs
- 
-diff --git a/src/ci/docker/dist-various-1/Dockerfile b/src/ci/docker/dist-various-1/Dockerfile
-index a722a4183..44e6728de 100644
---- a/src/ci/docker/dist-various-1/Dockerfile
-+++ b/src/ci/docker/dist-various-1/Dockerfile
-@@ -132,13 +132,6 @@ ENV CC_mipsel_unknown_linux_musl=mipsel-openwrt-linux-gcc \
-     CXX_thumbv7neon_unknown_linux_gnueabihf=arm-linux-gnueabihf-g++
-     
- ENV RUST_CONFIGURE_ARGS \
--      --musl-root-armv5te=/musl-armv5te \
--      --musl-root-arm=/musl-arm \
--      --musl-root-armhf=/musl-armhf \
--      --musl-root-armv7=/musl-armv7 \
--      --musl-root-aarch64=/musl-aarch64 \
--      --musl-root-mips=/musl-mips \
--      --musl-root-mipsel=/musl-mipsel \
-       --enable-emscripten \
-       --disable-docs
- 
-diff --git a/src/ci/docker/dist-x86_64-musl/Dockerfile b/src/ci/docker/dist-x86_64-musl/Dockerfile
-index 385eefde8..81d4f7737 100644
---- a/src/ci/docker/dist-x86_64-musl/Dockerfile
-+++ b/src/ci/docker/dist-x86_64-musl/Dockerfile
-@@ -31,7 +31,6 @@ RUN sh /scripts/sccache.sh
- ENV HOSTS=x86_64-unknown-linux-musl
- 
- ENV RUST_CONFIGURE_ARGS \
--      --musl-root-x86_64=/usr/local/x86_64-linux-musl \
-       --enable-extended \
-       --disable-docs \
-       --set target.x86_64-unknown-linux-musl.crt-static=false \
-diff --git a/src/ci/docker/test-various/Dockerfile b/src/ci/docker/test-various/Dockerfile
-index 611a24a69..99c2b866b 100644
---- a/src/ci/docker/test-various/Dockerfile
-+++ b/src/ci/docker/test-various/Dockerfile
-@@ -31,7 +31,6 @@ COPY scripts/sccache.sh /scripts/
- RUN sh /scripts/sccache.sh
- 
- ENV RUST_CONFIGURE_ARGS \
--  --musl-root-x86_64=/usr/local/x86_64-linux-musl \
-   --set build.nodejs=/node-v9.2.0-linux-x64/bin/node \
-   --set rust.lld
- 
 diff --git a/src/librustc_target/spec/linux_musl_base.rs b/src/librustc_target/spec/linux_musl_base.rs
-index e294e6398..58ae91a96 100644
+index e294e63982d..58ae91a96aa 100644
 --- a/src/librustc_target/spec/linux_musl_base.rs
 +++ b/src/librustc_target/spec/linux_musl_base.rs
 @@ -3,28 +3,12 @@ use crate::spec::{LinkerFlavor, TargetOptions};
@@ -388,5 +335,5 @@ index e294e6398..58ae91a96 100644
      base.crt_static_default = true;
      // These targets allow the user to choose between static and dynamic linking.
 -- 
-2.22.0
+2.21.0
 
diff --git a/srcpkgs/rust/patches/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch b/srcpkgs/rust/patches/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch
index 4a06be304f1..2f109444886 100644
--- a/srcpkgs/rust/patches/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch
+++ b/srcpkgs/rust/patches/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch
@@ -1,17 +1,17 @@
-From b8815ecb4ec9ecf7c2469703005bede91c0f6f82 Mon Sep 17 00:00:00 2001
+From 1eb558f246269606c6d8d73824ef6b44fa10764e Mon Sep 17 00:00:00 2001
 From: Samuel Holland <samuel@sholland.org>
 Date: Sat, 9 Sep 2017 00:14:16 -0500
-Subject: [PATCH 06/12] Prefer libgcc_eh over libunwind for musl
+Subject: [PATCH 06/16] Prefer libgcc_eh over libunwind for musl
 
 ---
  src/libunwind/lib.rs | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/libunwind/lib.rs b/src/libunwind/lib.rs
-index 0ccffea31..935175dd8 100644
+index 9182e349b19..0377fbb58fc 100644
 --- a/src/libunwind/lib.rs
 +++ b/src/libunwind/lib.rs
-@@ -26,6 +26,6 @@ cfg_if! {
+@@ -23,6 +23,6 @@ cfg_if::cfg_if! {
  }
  
  #[cfg(target_env = "musl")]
@@ -20,5 +20,5 @@ index 0ccffea31..935175dd8 100644
  #[link(name = "gcc_s", cfg(not(target_feature = "crt-static")))]
  extern {}
 -- 
-2.22.0
+2.21.0
 
diff --git a/srcpkgs/rust/patches/0007-Fix-C-aggregate-passing-ABI-on-powerpc.patch b/srcpkgs/rust/patches/0007-Fix-C-aggregate-passing-ABI-on-powerpc.patch
new file mode 100644
index 00000000000..05b91456f77
--- /dev/null
+++ b/srcpkgs/rust/patches/0007-Fix-C-aggregate-passing-ABI-on-powerpc.patch
@@ -0,0 +1,93 @@
+From c9a914f48652de22832a40ef9639ff8d57c57f31 Mon Sep 17 00:00:00 2001
+From: Samuel Holland <samuel@sholland.org>
+Date: Wed, 4 Sep 2019 20:40:18 -0500
+Subject: [PATCH 07/16] Fix C aggregate-passing ABI on powerpc
+
+The existing code (which looks like it was copied from MIPS) passes
+aggregates by value in registers. This is wrong. According to the SVR4
+powerpc psABI, all aggregates are passed indirectly.
+---
+ src/librustc_target/abi/call/mod.rs     |  2 +-
+ src/librustc_target/abi/call/powerpc.rs | 41 ++++++-------------------
+ 2 files changed, 11 insertions(+), 32 deletions(-)
+
+diff --git a/src/librustc_target/abi/call/mod.rs b/src/librustc_target/abi/call/mod.rs
+index fbbd120f934..f4d98177072 100644
+--- a/src/librustc_target/abi/call/mod.rs
++++ b/src/librustc_target/abi/call/mod.rs
+@@ -562,7 +562,7 @@ impl<'a, Ty> FnType<'a, Ty> {
+             "arm" => arm::compute_abi_info(cx, self),
+             "mips" => mips::compute_abi_info(cx, self),
+             "mips64" => mips64::compute_abi_info(cx, self),
+-            "powerpc" => powerpc::compute_abi_info(cx, self),
++            "powerpc" => powerpc::compute_abi_info(self),
+             "powerpc64" => powerpc64::compute_abi_info(cx, self),
+             "s390x" => s390x::compute_abi_info(cx, self),
+             "asmjs" => asmjs::compute_abi_info(cx, self),
+diff --git a/src/librustc_target/abi/call/powerpc.rs b/src/librustc_target/abi/call/powerpc.rs
+index d496abf8e8b..f20defd6f5b 100644
+--- a/src/librustc_target/abi/call/powerpc.rs
++++ b/src/librustc_target/abi/call/powerpc.rs
+@@ -1,49 +1,28 @@
+-use crate::abi::call::{ArgType, FnType, Reg, Uniform};
+-use crate::abi::{HasDataLayout, LayoutOf, Size, TyLayoutMethods};
++use crate::abi::call::{ArgType, FnType};
+ 
+-fn classify_ret_ty<'a, Ty, C>(cx: &C, ret: &mut ArgType<'_, Ty>, offset: &mut Size)
+-    where Ty: TyLayoutMethods<'a, C>, C: LayoutOf<Ty = Ty> + HasDataLayout
+-{
+-    if !ret.layout.is_aggregate() {
+-        ret.extend_integer_width_to(32);
+-    } else {
++fn classify_ret_ty<Ty>(ret: &mut ArgType<'_, Ty>) {
++    if ret.layout.is_aggregate() {
+         ret.make_indirect();
+-        *offset += cx.data_layout().pointer_size;
++    } else {
++        ret.extend_integer_width_to(32);
+     }
+ }
+ 
+-fn classify_arg_ty<'a, Ty, C>(cx: &C, arg: &mut ArgType<'_, Ty>, offset: &mut Size)
+-    where Ty: TyLayoutMethods<'a, C>, C: LayoutOf<Ty = Ty> + HasDataLayout
+-{
+-    let dl = cx.data_layout();
+-    let size = arg.layout.size;
+-    let align = arg.layout.align.max(dl.i32_align).min(dl.i64_align).abi;
+-
++fn classify_arg_ty<Ty>(arg: &mut ArgType<'_, Ty>) {
+     if arg.layout.is_aggregate() {
+-        arg.cast_to(Uniform {
+-            unit: Reg::i32(),
+-            total: size
+-        });
+-        if !offset.is_aligned(align) {
+-            arg.pad_with(Reg::i32());
+-        }
++        arg.make_indirect();
+     } else {
+         arg.extend_integer_width_to(32);
+     }
+-
+-    *offset = offset.align_to(align) + size.align_to(align);
+ }
+ 
+-pub fn compute_abi_info<'a, Ty, C>(cx: &C, fty: &mut FnType<'_, Ty>)
+-    where Ty: TyLayoutMethods<'a, C>, C: LayoutOf<Ty = Ty> + HasDataLayout
+-{
+-    let mut offset = Size::ZERO;
++pub fn compute_abi_info<Ty>(fty: &mut FnType<'_, Ty>) {
+     if !fty.ret.is_ignore() {
+-        classify_ret_ty(cx, &mut fty.ret, &mut offset);
++        classify_ret_ty(&mut fty.ret);
+     }
+ 
+     for arg in &mut fty.args {
+         if arg.is_ignore() { continue; }
+-        classify_arg_ty(cx, arg, &mut offset);
++        classify_arg_ty(arg);
+     }
+ }
+-- 
+2.21.0
+
diff --git a/srcpkgs/rust/patches/0007-runtest-Fix-proc-macro-tests-on-musl-hosts.patch b/srcpkgs/rust/patches/0007-runtest-Fix-proc-macro-tests-on-musl-hosts.patch
deleted file mode 100644
index c04cb295d65..00000000000
--- a/srcpkgs/rust/patches/0007-runtest-Fix-proc-macro-tests-on-musl-hosts.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 0401335b6e3724d4868c9c4b556f586c7fcf60b8 Mon Sep 17 00:00:00 2001
-From: Samuel Holland <samuel@sholland.org>
-Date: Sat, 6 Jul 2019 17:49:18 +0200
-Subject: [PATCH 07/12] runtest: Fix proc-macro tests on musl hosts
-
----
- src/tools/compiletest/src/runtest.rs | 9 ++-------
- 1 file changed, 2 insertions(+), 7 deletions(-)
-
-diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
-index 2082de7cb..03c7a4c58 100644
---- a/src/tools/compiletest/src/runtest.rs
-+++ b/src/tools/compiletest/src/runtest.rs
-@@ -1649,9 +1649,6 @@ impl<'test> TestCx<'test> {
-                 (true, None)
-             } else if self.config.target.contains("cloudabi")
-                 || self.config.target.contains("emscripten")
--                || (self.config.target.contains("musl")
--                    && !aux_props.force_host
--                    && !self.config.host.contains("musl"))
-                 || self.config.target.contains("wasm32")
-                 || self.config.target.contains("nvptx")
-             {
-@@ -1660,10 +1657,8 @@ impl<'test> TestCx<'test> {
-                 // for the test suite (otherwise including libstd statically in all
-                 // executables takes up quite a bit of space).
-                 //
--                // For targets like MUSL or Emscripten, however, there is no support for
--                // dynamic libraries so we just go back to building a normal library. Note,
--                // however, that for MUSL if the library is built with `force_host` then
--                // it's ok to be a dylib as the host should always support dylibs.
-+                // For targets like Emscripten, however, there is no support for
-+                // dynamic libraries so we just go back to building a normal library.
-                 (false, Some("lib"))
-             } else {
-                 (true, Some("dylib"))
--- 
-2.22.0
-
diff --git a/srcpkgs/rust/patches/0008-Fix-zero-sized-aggregate-ABI-on-powerpc.patch b/srcpkgs/rust/patches/0008-Fix-zero-sized-aggregate-ABI-on-powerpc.patch
new file mode 100644
index 00000000000..c3da394a757
--- /dev/null
+++ b/srcpkgs/rust/patches/0008-Fix-zero-sized-aggregate-ABI-on-powerpc.patch
@@ -0,0 +1,62 @@
+From f67f0ab40f1328e04916512b9af858ca1b7faa24 Mon Sep 17 00:00:00 2001
+From: Samuel Holland <samuel@sholland.org>
+Date: Wed, 4 Sep 2019 20:44:30 -0500
+Subject: [PATCH 08/16] Fix zero-sized aggregate ABI on powerpc
+
+For targets that pass zero-sized aggregates indirectly (generally
+those that pass all aggregates indirectly), we must allocate a register
+for passing the address of the ZST. Clean up the existing cases and add
+powerpc, which requires this as well.
+
+While there are not currently musl targets for s390x or sparc64, they
+would have the same ABI as gnu targets, so remove the env == "gnu" check
+in the Linux case.
+
+Ideally, since it is a property of the C ABI, the `!rust_abi` case would
+be handled entirely in `adjust_c_abi`. However, that would require
+updating each implementation of `compute_abi_info` to handle ZSTs.
+---
+ src/librustc/ty/layout.rs | 20 +++++++++-----------
+ 1 file changed, 9 insertions(+), 11 deletions(-)
+
+diff --git a/src/librustc/ty/layout.rs b/src/librustc/ty/layout.rs
+index 4af26e19b37..163db9778e5 100644
+--- a/src/librustc/ty/layout.rs
++++ b/src/librustc/ty/layout.rs
+@@ -2667,12 +2667,11 @@ where
+         };
+ 
+         let target = &cx.tcx().sess.target.target;
+-        let win_x64_gnu =
+-            target.target_os == "windows" && target.arch == "x86_64" && target.target_env == "gnu";
+-        let linux_s390x =
+-            target.target_os == "linux" && target.arch == "s390x" && target.target_env == "gnu";
+-        let linux_sparc64 =
+-            target.target_os == "linux" && target.arch == "sparc64" && target.target_env == "gnu";
++        let indirect_zst = match target.arch.as_ref() {
++            "powerpc" | "s390x" | "sparc64" => true,
++            "x86_64" => target.target_os == "windows" && target.target_env == "gnu",
++            _ => false,
++        };
+         let rust_abi = match sig.abi {
+             RustIntrinsic | PlatformIntrinsic | Rust | RustCall => true,
+             _ => false,
+@@ -2742,11 +2741,10 @@ where
+             let is_return = arg_idx.is_none();
+             let mut arg = mk_arg_type(ty, arg_idx);
+             if arg.layout.is_zst() {
+-                // For some forsaken reason, x86_64-pc-windows-gnu
+-                // doesn't ignore zero-sized struct arguments.
+-                // The same is true for s390x-unknown-linux-gnu
+-                // and sparc64-unknown-linux-gnu.
+-                if is_return || rust_abi || (!win_x64_gnu && !linux_s390x && !linux_sparc64) {
++                // FIXME: The C ABI case should be handled in adjust_for_cabi.
++                // Zero-sized struct arguments cannot be ignored in the C ABI
++                // if they are passed indirectly.
++                if is_return || rust_abi || !indirect_zst {
+                     arg.mode = PassMode::Ignore(IgnoreMode::Zst);
+                 }
+             }
+-- 
+2.21.0
+
diff --git a/srcpkgs/rust/patches/0009-compiletest-Match-suffixed-environments.patch b/srcpkgs/rust/patches/0009-compiletest-Match-suffixed-environments.patch
new file mode 100644
index 00000000000..9ca4d99000c
--- /dev/null
+++ b/srcpkgs/rust/patches/0009-compiletest-Match-suffixed-environments.patch
@@ -0,0 +1,48 @@
+From 0b28aa018f3f64913101495ce9806d356230856e Mon Sep 17 00:00:00 2001
+From: Samuel Holland <samuel@sholland.org>
+Date: Mon, 2 Sep 2019 22:10:10 -0500
+Subject: [PATCH 09/16] compiletest: Match suffixed environments
+
+---
+ src/tools/compiletest/src/header.rs | 2 +-
+ src/tools/compiletest/src/util.rs   | 8 ++++++--
+ 2 files changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/src/tools/compiletest/src/header.rs b/src/tools/compiletest/src/header.rs
+index 52f777db2da..4bf3c1a8527 100644
+--- a/src/tools/compiletest/src/header.rs
++++ b/src/tools/compiletest/src/header.rs
+@@ -820,10 +820,10 @@ impl Config {
+ 
+             if name == "test" ||
+                 util::matches_os(&self.target, name) ||             // target
++                util::matches_env(&self.target, name) ||            // env
+                 name == util::get_arch(&self.target) ||             // architecture
+                 name == util::get_pointer_width(&self.target) ||    // pointer width
+                 name == self.stage_id.split('-').next().unwrap() || // stage
+-                Some(name) == util::get_env(&self.target) ||        // env
+                 (self.target != self.host && name == "cross-compile") ||
+                 match self.compare_mode {
+                     Some(CompareMode::Nll) => name == "compare-mode-nll",
+diff --git a/src/tools/compiletest/src/util.rs b/src/tools/compiletest/src/util.rs
+index 8caf5ca00f5..d23f4edc55d 100644
+--- a/src/tools/compiletest/src/util.rs
++++ b/src/tools/compiletest/src/util.rs
+@@ -101,8 +101,12 @@ pub fn get_arch(triple: &str) -> &'static str {
+     panic!("Cannot determine Architecture from triple");
+ }
+ 
+-pub fn get_env(triple: &str) -> Option<&str> {
+-    triple.split('-').nth(3)
++pub fn matches_env(triple: &str, name: &str) -> bool {
++    if let Some(env) = triple.split('-').nth(3) {
++        env.starts_with(name)
++    } else {
++        false
++    }
+ }
+ 
+ pub fn get_pointer_width(triple: &str) -> &'static str {
+-- 
+2.21.0
+
diff --git a/srcpkgs/rust/patches/0010-test-c-variadic-Fix-patterns-on-powerpc64.patch b/srcpkgs/rust/patches/0010-test-c-variadic-Fix-patterns-on-powerpc64.patch
new file mode 100644
index 00000000000..2e2111edbbc
--- /dev/null
+++ b/srcpkgs/rust/patches/0010-test-c-variadic-Fix-patterns-on-powerpc64.patch
@@ -0,0 +1,73 @@
+From e6a01c436377109808cac2d49ec30968a02b561d Mon Sep 17 00:00:00 2001
+From: Samuel Holland <samuel@sholland.org>
+Date: Mon, 2 Sep 2019 22:09:15 -0500
+Subject: [PATCH 10/16] test/c-variadic: Fix patterns on powerpc64
+
+---
+ src/test/codegen/c-variadic.rs | 22 +++++++++++-----------
+ 1 file changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/src/test/codegen/c-variadic.rs b/src/test/codegen/c-variadic.rs
+index bb90a9653f5..6ef77ca483f 100644
+--- a/src/test/codegen/c-variadic.rs
++++ b/src/test/codegen/c-variadic.rs
+@@ -14,13 +14,13 @@ extern "C" {
+ #[unwind(aborts)] // FIXME(#58794)
+ pub unsafe extern "C" fn use_foreign_c_variadic_0() {
+     // Ensure that we correctly call foreign C-variadic functions.
+-    // CHECK: invoke void (i32, ...) @foreign_c_variadic_0(i32 0)
++    // CHECK: invoke void (i32, ...) @foreign_c_variadic_0([[PARAM:i32( signext)?]] 0)
+     foreign_c_variadic_0(0);
+-    // CHECK: invoke void (i32, ...) @foreign_c_variadic_0(i32 0, i32 42)
++    // CHECK: invoke void (i32, ...) @foreign_c_variadic_0([[PARAM]] 0, [[PARAM]] 42)
+     foreign_c_variadic_0(0, 42i32);
+-    // CHECK: invoke void (i32, ...) @foreign_c_variadic_0(i32 0, i32 42, i32 1024)
++    // CHECK: invoke void (i32, ...) @foreign_c_variadic_0([[PARAM]] 0, [[PARAM]] 42, [[PARAM]] 1024)
+     foreign_c_variadic_0(0, 42i32, 1024i32);
+-    // CHECK: invoke void (i32, ...) @foreign_c_variadic_0(i32 0, i32 42, i32 1024, i32 0)
++    // CHECK: invoke void (i32, ...) @foreign_c_variadic_0([[PARAM]] 0, [[PARAM]] 42, [[PARAM]] 1024, [[PARAM]] 0)
+     foreign_c_variadic_0(0, 42i32, 1024i32, 0i32);
+ }
+ 
+@@ -34,18 +34,18 @@ pub unsafe extern "C" fn use_foreign_c_variadic_1_0(ap: VaList) {
+ 
+ #[unwind(aborts)] // FIXME(#58794)
+ pub unsafe extern "C" fn use_foreign_c_variadic_1_1(ap: VaList) {
+-    // CHECK: invoke void ({{.*}}*, ...) @foreign_c_variadic_1({{.*}} %ap, i32 42)
++    // CHECK: invoke void ({{.*}}*, ...) @foreign_c_variadic_1({{.*}} %ap, [[PARAM]] 42)
+     foreign_c_variadic_1(ap, 42i32);
+ }
+ #[unwind(aborts)] // FIXME(#58794)
+ pub unsafe extern "C" fn use_foreign_c_variadic_1_2(ap: VaList) {
+-    // CHECK: invoke void ({{.*}}*, ...) @foreign_c_variadic_1({{.*}} %ap, i32 2, i32 42)
++    // CHECK: invoke void ({{.*}}*, ...) @foreign_c_variadic_1({{.*}} %ap, [[PARAM]] 2, [[PARAM]] 42)
+     foreign_c_variadic_1(ap, 2i32, 42i32);
+ }
+ 
+ #[unwind(aborts)] // FIXME(#58794)
+ pub unsafe extern "C" fn use_foreign_c_variadic_1_3(ap: VaList) {
+-    // CHECK: invoke void ({{.*}}*, ...) @foreign_c_variadic_1({{.*}} %ap, i32 2, i32 42, i32 0)
++    // CHECK: invoke void ({{.*}}*, ...) @foreign_c_variadic_1({{.*}} %ap, [[PARAM]] 2, [[PARAM]] 42, [[PARAM]] 0)
+     foreign_c_variadic_1(ap, 2i32, 42i32, 0i32);
+ }
+ 
+@@ -64,12 +64,12 @@ pub unsafe extern "C" fn c_variadic(n: i32, mut ap: ...) -> i32 {
+ // Ensure that we generate the correct `call` signature when calling a Rust
+ // defined C-variadic.
+ pub unsafe fn test_c_variadic_call() {
+-    // CHECK: call i32 (i32, ...) @c_variadic(i32 0)
++    // CHECK: call [[RET:(signext )?i32]] (i32, ...) @c_variadic([[PARAM]] 0)
+     c_variadic(0);
+-    // CHECK: call i32 (i32, ...) @c_variadic(i32 0, i32 42)
++    // CHECK: call [[RET]] (i32, ...) @c_variadic([[PARAM]] 0, [[PARAM]] 42)
+     c_variadic(0, 42i32);
+-    // CHECK: call i32 (i32, ...) @c_variadic(i32 0, i32 42, i32 1024)
++    // CHECK: call [[RET]] (i32, ...) @c_variadic([[PARAM]] 0, [[PARAM]] 42, [[PARAM]] 1024)
+     c_variadic(0, 42i32, 1024i32);
+-    // CHECK: call i32 (i32, ...) @c_variadic(i32 0, i32 42, i32 1024, i32 0)
++    // CHECK: call [[RET]] (i32, ...) @c_variadic([[PARAM]] 0, [[PARAM]] 42, [[PARAM]] 1024, [[PARAM]] 0)
+     c_variadic(0, 42i32, 1024i32, 0i32);
+ }
+-- 
+2.21.0
+
diff --git a/srcpkgs/rust/patches/0008-test-use-extern-for-plugins-Don-t-assume-multilib.patch b/srcpkgs/rust/patches/0011-test-use-extern-for-plugins-Don-t-assume-multilib.patch
similarity index 79%
rename from srcpkgs/rust/patches/0008-test-use-extern-for-plugins-Don-t-assume-multilib.patch
rename to srcpkgs/rust/patches/0011-test-use-extern-for-plugins-Don-t-assume-multilib.patch
index ab6a75d5c43..002d84024e9 100644
--- a/srcpkgs/rust/patches/0008-test-use-extern-for-plugins-Don-t-assume-multilib.patch
+++ b/srcpkgs/rust/patches/0011-test-use-extern-for-plugins-Don-t-assume-multilib.patch
@@ -1,14 +1,14 @@
-From a10b846716f923b3c5c28fc86e9b07103600ed52 Mon Sep 17 00:00:00 2001
+From f0fce1130ffe6b5a7666979aedd956becc4d7c25 Mon Sep 17 00:00:00 2001
 From: Samuel Holland <samuel@sholland.org>
-Date: Sat, 6 Jul 2019 17:50:54 +0200
-Subject: [PATCH 08/12] test/use-extern-for-plugins: Don't assume multilib
+Date: Sat, 6 Oct 2018 04:01:48 +0000
+Subject: [PATCH 11/16] test/use-extern-for-plugins: Don't assume multilib
 
 ---
  src/test/run-make-fulldeps/use-extern-for-plugins/Makefile | 7 +------
  1 file changed, 1 insertion(+), 6 deletions(-)
 
 diff --git a/src/test/run-make-fulldeps/use-extern-for-plugins/Makefile b/src/test/run-make-fulldeps/use-extern-for-plugins/Makefile
-index 838b1a271..94fa9f6d0 100644
+index 838b1a2719b..94fa9f6d067 100644
 --- a/src/test/run-make-fulldeps/use-extern-for-plugins/Makefile
 +++ b/src/test/run-make-fulldeps/use-extern-for-plugins/Makefile
 @@ -4,12 +4,7 @@
@@ -26,5 +26,5 @@ index 838b1a271..94fa9f6d0 100644
  all:
  	$(RUSTC) foo.rs -C extra-filename=-host
 -- 
-2.22.0
+2.21.0
 
diff --git a/srcpkgs/rust/patches/0009-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch b/srcpkgs/rust/patches/0012-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch
similarity index 80%
rename from srcpkgs/rust/patches/0009-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch
rename to srcpkgs/rust/patches/0012-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch
index 442571fdd45..6123af8379f 100644
--- a/srcpkgs/rust/patches/0009-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch
+++ b/srcpkgs/rust/patches/0012-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch
@@ -1,7 +1,7 @@
-From 9f457d208f0e916a5fb61401f6558e1302b97fd5 Mon Sep 17 00:00:00 2001
+From 93835653d45142c17adcf3087d2a8e512053bccf Mon Sep 17 00:00:00 2001
 From: Samuel Holland <samuel@sholland.org>
 Date: Mon, 17 Sep 2018 01:32:20 +0000
-Subject: [PATCH 09/12] test/sysroot-crates-are-unstable: Fix test when rpath
+Subject: [PATCH 12/16] test/sysroot-crates-are-unstable: Fix test when rpath
  is disabled
 
 Without this environment var, the test can't run rustc to find
@@ -11,7 +11,7 @@ the sysroot path.
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile b/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile
-index a35174b3c..9e7707068 100644
+index a35174b3c2a..9e770706857 100644
 --- a/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile
 +++ b/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile
 @@ -1,2 +1,4 @@
@@ -21,5 +21,5 @@ index a35174b3c..9e7707068 100644
 -	python2.7 test.py
 +	env '$(HOST_RPATH_ENV)' python2.7 test.py
 -- 
-2.22.0
+2.21.0
 
diff --git a/srcpkgs/rust/patches/0010-Ignore-broken-and-non-applicable-tests.patch b/srcpkgs/rust/patches/0013-Ignore-broken-and-non-applicable-tests.patch
similarity index 71%
rename from srcpkgs/rust/patches/0010-Ignore-broken-and-non-applicable-tests.patch
rename to srcpkgs/rust/patches/0013-Ignore-broken-and-non-applicable-tests.patch
index f0c8df9f2b5..d0501d49005 100644
--- a/srcpkgs/rust/patches/0010-Ignore-broken-and-non-applicable-tests.patch
+++ b/srcpkgs/rust/patches/0013-Ignore-broken-and-non-applicable-tests.patch
@@ -1,7 +1,7 @@
-From 8c4cc90bccacf5ebbb837e5c72de47ab862238f4 Mon Sep 17 00:00:00 2001
+From 8eb87a7b794e649003bc8f4bed6c6d6739f65e43 Mon Sep 17 00:00:00 2001
 From: Samuel Holland <samuel@sholland.org>
 Date: Sun, 16 Sep 2018 16:38:48 +0000
-Subject: [PATCH 10/12] Ignore broken and non-applicable tests
+Subject: [PATCH 13/16] Ignore broken and non-applicable tests
 
 c-link-to-rust-va-list-fn: unstable feature, broken on aarch64, #56475
 env-funky-keys: can't handle LD_PRELOAD (e.g. sandbox)
@@ -13,15 +13,16 @@ sysroot-crates-are-unstable: can't run rustc without RPATH
 ---
  src/test/codegen/sparc-struct-abi.rs                            | 1 +
  src/test/run-make-fulldeps/c-link-to-rust-va-list-fn/Makefile   | 2 ++
+ src/test/run-make-fulldeps/linker-output-non-utf8/Makefile      | 2 ++
  src/test/run-make-fulldeps/long-linker-command-lines/Makefile   | 2 ++
  src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile | 2 ++
  src/test/run-pass/env-funky-keys.rs                             | 1 +
  src/test/run-pass/simd/simd-intrinsic-generic-bitmask.rs        | 2 ++
  src/test/run-pass/simd/simd-intrinsic-generic-select.rs         | 2 ++
- 7 files changed, 12 insertions(+)
+ 8 files changed, 14 insertions(+)
 
 diff --git a/src/test/codegen/sparc-struct-abi.rs b/src/test/codegen/sparc-struct-abi.rs
-index 78e5b14a2..6f93e9328 100644
+index 78e5b14a212..6f93e93286b 100644
 --- a/src/test/codegen/sparc-struct-abi.rs
 +++ b/src/test/codegen/sparc-struct-abi.rs
 @@ -4,6 +4,7 @@
@@ -33,7 +34,7 @@ index 78e5b14a2..6f93e9328 100644
  #![no_core]
  
 diff --git a/src/test/run-make-fulldeps/c-link-to-rust-va-list-fn/Makefile b/src/test/run-make-fulldeps/c-link-to-rust-va-list-fn/Makefile
-index f124ca2ab..363b18f09 100644
+index f124ca2ab61..363b18f0985 100644
 --- a/src/test/run-make-fulldeps/c-link-to-rust-va-list-fn/Makefile
 +++ b/src/test/run-make-fulldeps/c-link-to-rust-va-list-fn/Makefile
 @@ -1,3 +1,5 @@
@@ -42,8 +43,21 @@ index f124ca2ab..363b18f09 100644
  -include ../tools.mk
  
  all:
+diff --git a/src/test/run-make-fulldeps/linker-output-non-utf8/Makefile b/src/test/run-make-fulldeps/linker-output-non-utf8/Makefile
+index b47ce17ec8b..59c44fcf438 100644
+--- a/src/test/run-make-fulldeps/linker-output-non-utf8/Makefile
++++ b/src/test/run-make-fulldeps/linker-output-non-utf8/Makefile
+@@ -13,6 +13,8 @@
+ # This also does not work on Apple APFS due to the filesystem requiring
+ # valid UTF-8 paths.
+ 
++# ignore-musl
++
+ # The zzz it to allow humans to tab complete or glob this thing.
+ bad_dir := $(TMPDIR)/zzz$$'\xff'
+ 
 diff --git a/src/test/run-make-fulldeps/long-linker-command-lines/Makefile b/src/test/run-make-fulldeps/long-linker-command-lines/Makefile
-index 5876fbc94..5f167ece1 100644
+index 5876fbc94bc..5f167ece1a2 100644
 --- a/src/test/run-make-fulldeps/long-linker-command-lines/Makefile
 +++ b/src/test/run-make-fulldeps/long-linker-command-lines/Makefile
 @@ -1,3 +1,5 @@
@@ -53,7 +67,7 @@ index 5876fbc94..5f167ece1 100644
  
  all:
 diff --git a/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile b/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile
-index 9e7707068..6d92ec5ce 100644
+index 9e770706857..6d92ec5cec8 100644
 --- a/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile
 +++ b/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile
 @@ -1,3 +1,5 @@
@@ -63,9 +77,9 @@ index 9e7707068..6d92ec5ce 100644
  
  all:
 diff --git a/src/test/run-pass/env-funky-keys.rs b/src/test/run-pass/env-funky-keys.rs
-index 3b236e2b3..7284d25de 100644
---- a/src/test/run-pass/env-funky-keys.rs
-+++ b/src/test/run-pass/env-funky-keys.rs
+index 3b236e2b3af..7284d25de48 100644
+--- a/src/test/ui/env-funky-keys.rs
++++ b/src/test/ui/env-funky-keys.rs
 @@ -1,5 +1,6 @@
  // Ignore this test on Android, because it segfaults there.
  
@@ -74,9 +88,9 @@ index 3b236e2b3..7284d25de 100644
  // ignore-windows
  // ignore-cloudabi no execve
 diff --git a/src/test/run-pass/simd/simd-intrinsic-generic-bitmask.rs b/src/test/run-pass/simd/simd-intrinsic-generic-bitmask.rs
-index b28f742a9..3ee4ccce7 100644
---- a/src/test/run-pass/simd/simd-intrinsic-generic-bitmask.rs
-+++ b/src/test/run-pass/simd/simd-intrinsic-generic-bitmask.rs
+index b28f742a92e..3ee4ccce731 100644
+--- a/src/test/ui/simd/simd-intrinsic-generic-bitmask.rs
++++ b/src/test/ui/simd/simd-intrinsic-generic-bitmask.rs
 @@ -2,6 +2,8 @@
  #![allow(non_camel_case_types)]
  
@@ -86,19 +100,6 @@ index b28f742a9..3ee4ccce7 100644
  
  // Test that the simd_bitmask intrinsic produces correct results.
  
-diff --git a/src/test/run-pass/simd/simd-intrinsic-generic-select.rs b/src/test/run-pass/simd/simd-intrinsic-generic-select.rs
-index f79b14049..39080c8c9 100644
---- a/src/test/run-pass/simd/simd-intrinsic-generic-select.rs
-+++ b/src/test/run-pass/simd/simd-intrinsic-generic-select.rs
-@@ -2,6 +2,8 @@
- #![allow(non_camel_case_types)]
- 
- // ignore-emscripten
-+// ignore-powerpc
-+// ignore-powerpc64
- 
- // Test that the simd_select intrinsics produces correct results.
- 
 -- 
-2.22.0
+2.21.0
 
diff --git a/srcpkgs/rust/patches/0011-Link-stage-2-tools-dynamically-to-libstd.patch b/srcpkgs/rust/patches/0014-Link-stage-2-tools-dynamically-to-libstd.patch
similarity index 75%
rename from srcpkgs/rust/patches/0011-Link-stage-2-tools-dynamically-to-libstd.patch
rename to srcpkgs/rust/patches/0014-Link-stage-2-tools-dynamically-to-libstd.patch
index 47696bcf24f..47e9173a907 100644
--- a/srcpkgs/rust/patches/0011-Link-stage-2-tools-dynamically-to-libstd.patch
+++ b/srcpkgs/rust/patches/0014-Link-stage-2-tools-dynamically-to-libstd.patch
@@ -1,17 +1,17 @@
-From 7171338ff6f967b6f2c30bdb8804c8f49670a0de Mon Sep 17 00:00:00 2001
+From 8e160daedd1a8c928024db648c2f851cddbbd000 Mon Sep 17 00:00:00 2001
 From: Samuel Holland <samuel@sholland.org>
 Date: Mon, 24 Sep 2018 23:42:23 +0000
-Subject: [PATCH 11/12] Link stage 2 tools dynamically to libstd
+Subject: [PATCH 14/16] Link stage 2 tools dynamically to libstd
 
 ---
  src/bootstrap/tool.rs | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs
-index edcd68d01..b5acf43bb 100644
+index bd77f7a91d9..70477b44032 100644
 --- a/src/bootstrap/tool.rs
 +++ b/src/bootstrap/tool.rs
-@@ -209,7 +209,9 @@ pub fn prepare_tool_cargo(
+@@ -210,7 +210,9 @@ pub fn prepare_tool_cargo(
  
      // We don't want to build tools dynamically as they'll be running across
      // stages and such and it's just easier if they're not dynamically linked.
@@ -23,5 +23,5 @@ index edcd68d01..b5acf43bb 100644
      if source_type == SourceType::Submodule {
          cargo.env("RUSTC_EXTERNAL_TOOL", "1");
 -- 
-2.22.0
+2.21.0
 
diff --git a/srcpkgs/rust/patches/0012-Move-debugger-scripts-to-usr-share-rust.patch b/srcpkgs/rust/patches/0015-Move-debugger-scripts-to-usr-share-rust.patch
similarity index 85%
rename from srcpkgs/rust/patches/0012-Move-debugger-scripts-to-usr-share-rust.patch
rename to srcpkgs/rust/patches/0015-Move-debugger-scripts-to-usr-share-rust.patch
index 7060a1cb894..ed30dfd151b 100644
--- a/srcpkgs/rust/patches/0012-Move-debugger-scripts-to-usr-share-rust.patch
+++ b/srcpkgs/rust/patches/0015-Move-debugger-scripts-to-usr-share-rust.patch
@@ -1,7 +1,7 @@
-From 6b0dc5093cc23c74dcf1d3bf3a0772b08426785a Mon Sep 17 00:00:00 2001
+From 1d81148c7b7c048cb1c586ece96bd326ae0f72ec Mon Sep 17 00:00:00 2001
 From: Samuel Holland <samuel@sholland.org>
 Date: Mon, 17 Sep 2018 02:09:10 +0000
-Subject: [PATCH 12/12] Move debugger scripts to /usr/share/rust
+Subject: [PATCH 15/16] Move debugger scripts to /usr/share/rust
 
 ---
  src/bootstrap/dist.rs | 2 +-
@@ -10,10 +10,10 @@ Subject: [PATCH 12/12] Move debugger scripts to /usr/share/rust
  3 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
-index b0616ff66..7a1225a93 100644
+index 45bc77ec97d..9e82352ef65 100644
 --- a/src/bootstrap/dist.rs
 +++ b/src/bootstrap/dist.rs
-@@ -597,7 +597,7 @@ impl Step for DebuggerScripts {
+@@ -593,7 +593,7 @@ impl Step for DebuggerScripts {
      fn run(self, builder: &Builder<'_>) {
          let host = self.host;
          let sysroot = self.sysroot;
@@ -23,7 +23,7 @@ index b0616ff66..7a1225a93 100644
          let cp_debugger_script = |file: &str| {
              builder.install(&builder.src.join("src/etc/").join(file), &dst, 0o644);
 diff --git a/src/etc/rust-gdb b/src/etc/rust-gdb
-index 23ba93da8..dc51b16c5 100755
+index 23ba93da8e5..dc51b16c572 100755
 --- a/src/etc/rust-gdb
 +++ b/src/etc/rust-gdb
 @@ -4,7 +4,7 @@ set -e
@@ -36,7 +36,7 @@ index 23ba93da8..dc51b16c5 100755
  # Run GDB with the additional arguments that load the pretty printers
  # Set the environment variable `RUST_GDB` to overwrite the call to a
 diff --git a/src/etc/rust-lldb b/src/etc/rust-lldb
-index 424302d49..460e11921 100755
+index 0eb99423df5..f069300dafe 100755
 --- a/src/etc/rust-lldb
 +++ b/src/etc/rust-lldb
 @@ -26,7 +26,7 @@ display the contents of local variables!"
@@ -49,5 +49,5 @@ index 424302d49..460e11921 100755
  category_enable="type category enable Rust"
  
 -- 
-2.22.0
+2.21.0
 
diff --git a/srcpkgs/rust/patches/0030-libc-linkage.patch b/srcpkgs/rust/patches/0030-libc-linkage.patch
index 3d3ed67a309..5ba322cb4bf 100644
--- a/srcpkgs/rust/patches/0030-libc-linkage.patch
+++ b/srcpkgs/rust/patches/0030-libc-linkage.patch
@@ -1,16 +1,16 @@
---- rustc-1.36.0-src/vendor/libc/src/lib.rs
-+++ rustc-1.36.0-src/vendor/libc/src/lib.rs
-@@ -26,6 +26,7 @@
+--- rustc-1.38.0-src/vendor/libc/src/lib.rs
++++ rustc-1.38.0-src/vendor/libc/src/lib.rs
+@@ -27,6 +27,7 @@
  #![deny(missing_copy_implementations, safe_packed_borrows)]
  #![no_std]
  #![cfg_attr(feature = "rustc-dep-of-std", no_core)]
 +#![cfg_attr(feature = "rustc-dep-of-std", feature(static_nobundle))]
+ #![cfg_attr(target_os = "redox", feature(static_nobundle))]
  
  #[macro_use]
- mod macros;
---- rustc-1.36.0-src/vendor/libc/src/unix/mod.rs
-+++ rustc-1.36.0-src/vendor/libc/src/unix/mod.rs
-@@ -307,11 +307,11 @@ cfg_if! {
+--- rustc-1.38.0-src/vendor/libc/src/unix/mod.rs
++++ rustc-1.38.0-src/vendor/libc/src/unix/mod.rs
+@@ -297,11 +297,11 @@ cfg_if! {
          // cargo build, don't pull in anything extra as the libstd dep
          // already pulls in all libs.
      } else if #[cfg(target_env = "musl")] {
diff --git a/srcpkgs/rust/patches/0091-bootstrap.patch b/srcpkgs/rust/patches/0091-bootstrap.patch
new file mode 100644
index 00000000000..cd8c33e3f34
--- /dev/null
+++ b/srcpkgs/rust/patches/0091-bootstrap.patch
@@ -0,0 +1,71 @@
+Rust 1.38 can't bootstrap itself. It has some ridiculous warnings enabled
+by default which break this (even though the compiler obviously needs to
+be able to compile itself just fine, that's what stage1 is all about).
+
+diff --git a/src/bootstrap/bin/main.rs b/src/bootstrap/bin/main.rs
+index bd1a87c..138b7f4 100644
+--- a/src/bootstrap/bin/main.rs
++++ b/src/bootstrap/bin/main.rs
+@@ -5,9 +5,6 @@
+ //! parent directory, and otherwise documentation can be found throughout the `build`
+ //! directory in each respective module.
+ 
+-// NO-RUSTC-WRAPPER
+-#![deny(warnings, rust_2018_idioms, unused_lifetimes)]
+-
+ use std::env;
+ 
+ use bootstrap::{Config, Build};
+diff --git a/src/bootstrap/bin/rustc.rs b/src/bootstrap/bin/rustc.rs
+index 81e7e46..d3d84ca 100644
+--- a/src/bootstrap/bin/rustc.rs
++++ b/src/bootstrap/bin/rustc.rs
+@@ -15,9 +15,6 @@
+ //! switching compilers for the bootstrap and for build scripts will probably
+ //! never get replaced.
+ 
+-// NO-RUSTC-WRAPPER
+-#![deny(warnings, rust_2018_idioms, unused_lifetimes)]
+-
+ use std::env;
+ use std::ffi::OsString;
+ use std::io;
+diff --git a/src/bootstrap/bin/rustdoc.rs b/src/bootstrap/bin/rustdoc.rs
+index 184c9b1..2a8397a 100644
+--- a/src/bootstrap/bin/rustdoc.rs
++++ b/src/bootstrap/bin/rustdoc.rs
+@@ -2,9 +2,6 @@
+ //!
+ //! See comments in `src/bootstrap/rustc.rs` for more information.
+ 
+-// NO-RUSTC-WRAPPER
+-#![deny(warnings, rust_2018_idioms, unused_lifetimes)]
+-
+ use std::env;
+ use std::process::Command;
+ use std::path::PathBuf;
+diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs
+index 76cc0dd..5eeed7c 100644
+--- a/src/bootstrap/lib.rs
++++ b/src/bootstrap/lib.rs
+@@ -103,9 +103,6 @@
+ //! More documentation can be found in each respective module below, and you can
+ //! also check out the `src/bootstrap/README.md` file for more information.
+ 
+-// NO-RUSTC-WRAPPER
+-#![deny(warnings, rust_2018_idioms, unused_lifetimes)]
+-
+ #![feature(core_intrinsics)]
+ #![feature(drain_filter)]
+ 
+diff --git a/src/build_helper/lib.rs b/src/build_helper/lib.rs
+index a1aa189..f3f5913 100644
+--- a/src/build_helper/lib.rs
++++ b/src/build_helper/lib.rs
+@@ -1,6 +1,3 @@
+-// NO-RUSTC-WRAPPER
+-#![deny(warnings, rust_2018_idioms, unused_lifetimes)]
+-
+ use std::fs::File;
+ use std::path::{Path, PathBuf};
+ use std::process::{Command, Stdio};
diff --git a/srcpkgs/rust/patches/0091-lzma-sys-cross-ldflags.patch b/srcpkgs/rust/patches/0091-lzma-sys-cross-ldflags.patch
deleted file mode 100644
index cc2ead3d414..00000000000
--- a/srcpkgs/rust/patches/0091-lzma-sys-cross-ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-This allows lzma-sys to build in a cross-compiling environment.
---- rustc-1.36.0-src/vendor/lzma-sys/build.rs
-+++ rustc-1.36.0-src/vendor/lzma-sys/build.rs
-@@ -101,6 +101,7 @@ fn main() {
-         }
-         cmd.env("CC", compiler.path())
-            .env("CFLAGS", cflags)
-+           .env("LDFLAGS", "")
-            .current_dir(&dst.join("build"))
-            .arg(sanitize_sh(&src.join("configure")));
-         cmd.arg(format!("--prefix={}", sanitize_sh(&dst)));
diff --git a/srcpkgs/rust/template b/srcpkgs/rust/template
index 45ad7d98411..2f5e5def714 100644
--- a/srcpkgs/rust/template
+++ b/srcpkgs/rust/template
@@ -1,22 +1,23 @@
 # Template file for 'rust'
 # partially adapted from Alpine/Adélie's Rust APKBUILD
 pkgname=rust
-version=1.36.0
+version=1.38.0
 revision=1
-_rust_dist_version=1.36.0
-_cargo_dist_version=0.37.0
+_rust_dist_version=1.38.0
+_cargo_dist_version=0.39.0
 # Always make sure custom distfiles used for bootstrap are
 # uploaded to https://alpha.de.repo.voidlinux.org/distfiles/
 wrksrc="rustc-${version}-src"
 hostmakedepends="cmake curl pkg-config python3"
-makedepends="libffi-devel ncurses-devel libxml2-devel zlib-devel llvm"
+# using llvm9 results in broken executables for some targets
+makedepends="libffi-devel ncurses-devel libxml2-devel zlib-devel llvm8"
 depends="rust-std"
 short_desc="Safe, concurrent, practical systems language"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT, Apache-2.0"
 homepage="https://www.rust-lang.org/"
 distfiles="https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz"
-checksum=04c4e4d7213d036d6aaed392841496d272146312c0290f728b7400fccd15bb1b
+checksum=644263ca7c7106f8ee8fcde6bb16910d246b30668a74be20b8c7e0e9f4a52d80
 lib32disabled=yes
 patch_args="-Np1"
 
@@ -25,14 +26,15 @@ build_options="static_llvm"
 _bootstrap_dir="stage0-bootstrap"
 
 if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" cargo llvm"
+	hostmakedepends+=" cargo llvm8"
 	# These are required for building the buildhost's stage0/1
 	hostmakedepends+=" libffi-devel libxml2-devel ncurses-devel zlib-devel"
 else
 	_bootstrap_url="https://static.rust-lang.org/dist"
 
+	# 32-bit ppc needs custom bootstrap for now because of patches
 	case "$XBPS_MACHINE" in
-		x86_64*|i686|ppc64le|ppc) ;;
+		x86_64*|i686|ppc64le) ;;
 		ppc*) _bootstrap_url="https://alpha.de.repo.voidlinux.org/distfiles" ;;
 		*) broken="unsupported host: ${XBPS_MACHINE}" ;;
 	esac
@@ -46,57 +48,57 @@ else
 	case "$XBPS_MACHINE" in
 		i686)
 			checksum+="
-			 ad86a75cc8a02a0129df480ccb28082985215f4b5558a42881777691ae1d3ff3
-			 a78f7bdbce0a960f3334c6c639cbe96f05b9b74df26cda9a5161834098119217
-			 6835a73e2ce17e11eda5393133dd7c78bc41bae5a09784e5327648f14340fd48"
+			 183dca6a4d746b833804e658267c1a60cdb446a36d4e4f8d29b04cfd29d886d5
+			 a3248cf8cf7e33afb0a2508c7c204ffe5db2e515c3d3d31ffd9a2146ffa3bad3
+			 2996b0fb41506e87d9b07851f40b41fed94725cf53c3d251e4e1c78eea08df4c"
 			;;
 		x86_64)
 			checksum+="
-			 fff0158da6f5af2a89936dc3e0c361077c06c2983eb310615e02f81ebbde1416
-			 ce8e12684b568a8a4f7d346a743383429849cf3f028f5712ad3d3e31590c8db3
-			 d20fa121951339d5492cf8862f8a7af59efc99d18f3c27b95ab6d4658b6a7d67"
+			 0fedde3406cf3367ceb00f493698e6bfc3264bd7f7253c85de7a042b45f873fa
+			 51b334337804baeff7524e5496d396f254894d7529860d236975e9ed8fcca371
+			 80bcb1368ce98d13cb371df89cbbed9007fb98843f34d07f2abd2c03b8f2747a"
 			;;
 		x86_64-musl)
 			checksum+="
-			 04c15e34bdfd17136b924baa4f93cfbfe64739964b57f5a13ada8e91f9239076
-			 70d0cc38cc829603c81812c59435ef85456a93962bea20deb12f0634e87fbaf7
-			 53975d91e11569f2255d8e30176f05f6976cd810725197a527b0e7ad547ca70c"
+			 9bc0b51bdfca3ed7b298021e2ec768bd28ea3af138d9dc1854a70e3866f06c0d
+			 efcc1779f9815c1d99010ef9eb66a2439f3993bc4d5accd7566e669d1b182373
+			 1d7d881a5af73fb7c3f632278d47a7d174f8347673e2263c4cd6a2f7d0278733"
 			;;
 		ppc64le)
 			checksum+="
-			 702818334ed9f01f60a433aa424784ec9b3785826cdaf03b0f69d03aded98df6
-			 db7a9a06b8b1b84d6fe10bc1e2e136234e31bfaa77499b9df36e2d441ef1b856
-			 4cda7686160f6981e936229703e8e2e756c74f390245f2ad9e356bbbed28a2c9"
+			 d7c011dae42ba4498493488385d3ab00d793124866baa8310cc6414b66c9d2d2
+			 937d2ece46539ba149cdce307718dadbc4b038a3c751bd75749430bd421a6249
+			 456d019511cfe015152a7a4c1c2f518fdeb10e0c610c9bc3ef44d73861ca967e"
 			;;
 		ppc64le-musl)
 			checksum+="
-			 e04239f9c0f230249412ca814f2f954e269c9724fe5741d87f6dc76ddaa15251
-			 98e8b4e6335bdb8cd387c8681686e20d9aa230bcf16ba0ea7cf3c1818d964425
-			 d2690135522db9fdc6efa2f432e5719b8b70abc94e91db278b84be834a75bf72"
+			 37420069fc877a430c32b8b5a533483fdb7cc1a28d0d9e0c1f0579a111aec888
+			 f4b6f37b1f914a2ca086a7e806d7552275a20982b139670ecb2bc1be2d33df2f
+			 5725c42c8356443db15f378d88f2ccb67e363ebf4beacc96ae1eac9ba36f8fe7"
 			;;
 		ppc64)
 			checksum+="
-			 4328cd52d37df39b78c6223a7a6d07129ef9861efa67dbdadbcfe6c991e0febf
-			 800f27805adef749219f9507497dbadebdac2d5c50f951ca1426d4d447e7f318
-			 8b2f7d5da611a21dd7e0b4238b9aca6ee32f1e49d8fe831435301f11a29b12de"
+			 7821de7c49e6c26606f2248f8cd126bef92661e149f0a67cc87f08e359685d4e
+			 b4d2a800fef9ca53208d16c5d5e215b01849d2f34eb476fa9d05457adf1b67ae
+			 73a4f13b8edda6b4c9c1818341c5d936f7b11a04f892358039d072b80ccd41dc"
 			;;
 		ppc64-musl)
 			checksum+="
-			 7cef3f67652607e4f6ed09ff6eb54ee0a7485ae5491a2c015ef9357aadc40295
-			 6f2dc455113a12b2f5fcefbda6e225ad568e750b8f900de5d326cf2c05e45ec9
-			 131db0127366665b2ae55327155c171e99c2eddfb4bcdd7e5cd2663ada109bd5"
+			 a607da72ea9ae81149d563e5e07c03bfc9fcf819ad079f5193f86fcab376315c
+			 4f3b8f8d3e07b27096224131816668c7f34a2d80b5f2c0353905dcd878c50f12
+			 ac18707b8df5d1f64b7e15dabd73eb7a3b0f9ef5976ef7c6ceb462b5d3feb9cd"
 			;;
 		ppc)
 			checksum+="
-			 6c47ae44afc4567fd5584ff8f23c6d0ee1680e66b2ce91cc891571e973097a99
-			 b22c7104c1bea83aef920140a25be974c3e08dd600431901346908916be46f43
-			 856fcb63f6ebeab67038fe3fc96ee0911353b1ee19cabcb0496c7d419de0d531"
+			 e4f088461db79b75c55210a1c70fd3127675287138196322a8416d078045468d
+			 94a2a2fc17adec46daf913e0c71280f03c12048f5224e39c7a77c533a4582f08
+			 02c07b741062e75556f5993a05eefe6dace70fee4a45542f1c6997fa69624d7e"
 			;;
 		ppc-musl)
 			checksum+="
-			 181c81346bc75d6316d08efa242f49c3d3e70fa0c480e673c9bc7209c63ca6e6
-			 4449b886359efe7fb39d75a086fc25520730f96932588e120abbf04387ac8aad
-			 119dba3538f6c1d1164b720b238acac598e1924d943ebbdf3c7113ec3cbd8a2a"
+			 80428db030216eea9117d131acdb1293404e78b71d26746dceeed3bb30629d32
+			 ca6253605d6eafafa9c2fbf27504b3c5d3f8efcaab69852a22ae080c265f03a9
+			 b06306fc164bffa73afd2d21d96381a28d38446e58cf01a0d1585e92b4656a23"
 			;;
 	esac
 fi
@@ -132,13 +134,12 @@ post_patch() {
 
 	# clear out all the checksum nonsense of patched vendor crates
 	_clear_vendor_checksums libc
-	_clear_vendor_checksums lzma-sys
 	_clear_vendor_checksums typenum
 	_clear_vendor_checksums backtrace-sys
 }
 
 do_configure() {
-	local _rust_root _local_rebuild _use_debug _use_rpath
+	local _rust_root _local_rebuild _use_debug _use_debug_rustc _use_rpath
 
 	if [ "$CROSS_BUILD" ]; then
 		_rust_root="/usr"
@@ -148,12 +149,18 @@ do_configure() {
 		_local_rebuild="false"
 	fi
 
-	# emit debug info, enabled when generating debug packages
+	# disable rustc debug info as it bloats up rust-std significantly
+	# set to 1 or 2 if you wish to have debug info for rustc, it won't
+	# link on 32-bit platforms though (too big)
+	_use_debug_rustc="0"
+
+	# use stdlib debug level 2 for all platforms when generating debug
 	if [ -n "$XBPS_DEBUG_PKGS" ]; then
-		_use_debug="true"
+		_use_debug="2"
 	else
-		_use_debug="false"
+		_use_debug="0"
 	fi
+
 	# if true, the binaries will be built with rpath, so the binaries will be
 	# usable directly from the build directory, this is not desirable for
 	# packaging but is useful when building bootstrap binaries
@@ -179,15 +186,23 @@ do_configure() {
 		prefix = "/usr"
 		[rust]
 		codegen-units = 1
-		debuginfo = ${_use_debug}
-		debuginfo-lines = ${_use_debug}
-		debuginfo-only-std = ${_use_debug}
-		debuginfo-tools = ${_use_debug}
+		codegen-units-std = 1
+		debug-assertions = false
+		debuginfo-level = ${_use_debug}
+		debuginfo-level-rustc = ${_use_debug_rustc}
+		debuginfo-level-tests = 0
 		backtrace = true
+		incremental = false
+		parallel-compiler = false
 		channel = "stable"
 		rpath = ${_use_rpath}
+		verbose-tests = true
+		dist-src = false
 		jemalloc = false
+		llvm-libunwind = false
 		codegen-tests = false
+		[dist]
+		src-tarball = false
 		[target.${RUST_BUILD}]
 		llvm-config = "/usr/bin/llvm-config"
 		crt-static = false
diff --git a/srcpkgs/rxvt-unicode/template b/srcpkgs/rxvt-unicode/template
index 196c89c4129..43fc6e9ec92 100644
--- a/srcpkgs/rxvt-unicode/template
+++ b/srcpkgs/rxvt-unicode/template
@@ -1,7 +1,7 @@
 # Template file for 'rxvt-unicode'
 pkgname=rxvt-unicode
 version=9.22
-revision=10
+revision=11
 build_style=gnu-configure
 configure_args="
  --with-terminfo=/usr/share/terminfo --enable-256-color
diff --git a/srcpkgs/s/template b/srcpkgs/s/template
index 7b49e278e78..f7669a2c7e6 100644
--- a/srcpkgs/s/template
+++ b/srcpkgs/s/template
@@ -1,12 +1,12 @@
 # Template file for 's'
 pkgname=s
 version=0.5.14
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/zquestz/s
 hostmakedepends="git"
 short_desc="Web search from the terminal"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="MIT"
 homepage="https://github.com/zquestz/s"
 distfiles="https://github.com/zquestz/s/archive/v${version}.tar.gz"
@@ -14,4 +14,5 @@ checksum=c32eedf6a4080cbe221c902cf7f63b1668b3927edfc448d963d69ed66c8ec2fb
 
 post_install() {
 	vlicense LICENSE
+	vinstall autocomplete/s.fish 644 usr/share/fish/completions
 }
diff --git a/srcpkgs/s6-dns/template b/srcpkgs/s6-dns/template
index e351982a9b9..6b778516cc6 100644
--- a/srcpkgs/s6-dns/template
+++ b/srcpkgs/s6-dns/template
@@ -1,7 +1,7 @@
 # Template file for 's6-dns'
 pkgname=s6-dns
-version=2.3.0.2
-revision=2
+version=2.3.1.0
+revision=1
 build_style=configure
 configure_args="--prefix=/usr --libdir=/usr/lib
  --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
@@ -12,7 +12,7 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="ISC"
 homepage="https://skarnet.org/software/${pkgname}/"
 distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=4806c8b1dadb582029c92986f0b09763090e03b38e565a70174be385fa862bf9
+checksum=b11ce255668b683d785a1ef8ba89551a9586481b8888bc1a66d4b997e68892ca
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/s6-linux-utils/template b/srcpkgs/s6-linux-utils/template
index 443a27491e3..7c9e44c930f 100644
--- a/srcpkgs/s6-linux-utils/template
+++ b/srcpkgs/s6-linux-utils/template
@@ -1,6 +1,6 @@
 # Template file for 's6-linux-utils'
 pkgname=s6-linux-utils
-version=2.5.0.1
+version=2.5.1.0
 revision=1
 build_style=configure
 makedepends="skalibs-devel"
@@ -13,7 +13,7 @@ license="ISC"
 homepage="https://skarnet.org/software/${pkgname}/"
 changelog="https://skarnet.org/software/s6-linux-utils/upgrade.html"
 distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=a177f9ae546fb95f5e47e783d7bdd471bbdaf9c959cd350288e4af3ca052ec2e
+checksum=58d6cbbaabf5c03739716e208f1690f7e7241480583cc9f5396093b428941bba
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) makedepends+=" nsss-devel" configure_args+=" --enable-nsss" ;;
diff --git a/srcpkgs/s6-networking/template b/srcpkgs/s6-networking/template
index 59c9c4a7a91..6841e25170a 100644
--- a/srcpkgs/s6-networking/template
+++ b/srcpkgs/s6-networking/template
@@ -1,7 +1,7 @@
 # Template file for 's6-networking'
 pkgname=s6-networking
-version=2.3.0.4
-revision=2
+version=2.3.1.0
+revision=1
 build_style=configure
 makedepends="execline-devel libressl-devel skalibs-devel s6-devel s6-dns-devel"
 configure_args="--libdir=/usr/lib --enable-ssl=libressl
@@ -13,7 +13,7 @@ license="ISC"
 homepage="https://skarnet.org/software/${pkgname}/"
 changelog="https://skarnet.org/software/s6-networking/upgrade.html"
 distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=0ae36a4adcf0000324d0cdb48767d7aa2b185a4e69105d3e7087a1cb2ab87802
+checksum=814fa3b70718d2423c742e920d31f64088272f7987c2cf7bebc86a63a75596b8
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) makedepends+=" nsss-devel" configure_args+=" --enable-nsss" ;;
diff --git a/srcpkgs/s6-portable-utils/template b/srcpkgs/s6-portable-utils/template
index 3926ec79807..88c093cfa0a 100644
--- a/srcpkgs/s6-portable-utils/template
+++ b/srcpkgs/s6-portable-utils/template
@@ -1,7 +1,7 @@
 # Template file for 's6-portable-utils'
 pkgname=s6-portable-utils
-version=2.2.1.3
-revision=2
+version=2.2.2.0
+revision=1
 build_style=configure
 configure_args="--prefix=/usr --libdir=/usr/lib --includedir=/usr/include
  --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="ISC"
 homepage="https://skarnet.org/software/${pkgname}/"
 distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=62ef131cccaaac76f47807f1684071012cf465a63fc744e5b9e179aa83b672c5
+checksum=0503841a2aee1cd79122c9ecf49dbefad5c5d21be7114e83e71c210e106abf0a
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/s6-rc/template b/srcpkgs/s6-rc/template
index 692bd2aca56..14da7d602fb 100644
--- a/srcpkgs/s6-rc/template
+++ b/srcpkgs/s6-rc/template
@@ -1,19 +1,20 @@
 # Template file for 's6-rc'
 pkgname=s6-rc
-version=0.5.0.0
-revision=6
+version=0.5.1.0
+revision=1
 build_style=configure
 configure_args="--prefix=/usr --libdir=/usr/lib --includedir=/usr/include
  --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
  --with-lib=${XBPS_CROSS_BASE}/usr/lib"
 makedepends="execline-devel skalibs-devel s6-devel"
-depends="s6>=2.8.0.0_1 execline>=2.5.1.0_1"
+depends="s6>=2.9.0.0_1 execline>=2.5.2.0_1"
 short_desc="Service manager of the s6 init system"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="ISC"
-homepage="https://skarnet.org/software/${pkgname}/"
+homepage="https://skarnet.org/software/s6-rc/"
+changelog="https://skarnet.org/software/s6-rc/upgrade.html"
 distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=cb7f033965a6c1b6f500cbb7a2f3ecdf2310fbb18f79e7a2a384541413b9275d
+checksum=93c02d0b505c036c332e13769154d82c9e31e4dd99f3ba80aa97d377ca9ac11c
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/s6/template b/srcpkgs/s6/template
index 0a086d9a3f2..c4d8b66a281 100644
--- a/srcpkgs/s6/template
+++ b/srcpkgs/s6/template
@@ -1,6 +1,6 @@
 # Template file for 's6'
 pkgname=s6
-version=2.8.0.1
+version=2.9.0.0
 revision=1
 build_style=configure
 makedepends="execline-devel skalibs-devel"
@@ -9,12 +9,12 @@ configure_args="--libdir=/usr/lib --bindir=/usr/bin
  --with-lib=${XBPS_CROSS_BASE}/usr/lib
  --exec-prefix=/usr"
 short_desc="Small suite of programs for UNIX, designed to allow process supervision"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Duncaen <duncaen@voidlinux.org>"
 license="ISC"
 homepage="http://skarnet.org/software/s6/"
 changelog="https://skarnet.org/software/s6/upgrade.html"
 distfiles="http://skarnet.org/software/s6/s6-${version}.tar.gz"
-checksum=dbe08f5b76c15fa32a090779b88fb2de9a9a107c3ac8ce488931dd39aa1c31d8
+checksum=1cac59bf9ff7c011b189ae2def3c76b147c2c431b0a901029fcaf957a6d9a343
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) makedepends+=" nsss-devel" configure_args+=" --enable-nsss" ;;
diff --git a/srcpkgs/sabnzbd/template b/srcpkgs/sabnzbd/template
index 3b850501ac9..38bd8db0731 100644
--- a/srcpkgs/sabnzbd/template
+++ b/srcpkgs/sabnzbd/template
@@ -1,6 +1,6 @@
 # Template file for 'sabnzbd'
 pkgname=sabnzbd
-version=2.3.8
+version=2.3.9
 revision=1
 archs=noarch
 wrksrc="SABnzbd-${version}"
@@ -10,9 +10,10 @@ depends="par2cmdline python-cheetah python-configobj python-feedparser
 short_desc="Open Source Binary Newsreader written in Python"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
+changelog="https://github.com/sabnzbd/sabnzbd/releases"
 homepage="https://sabnzbd.org/"
 distfiles="https://github.com/sabnzbd/sabnzbd/releases/download/${version}/SABnzbd-${version}-src.tar.gz"
-checksum=0685e867250106c0cab6cc9ffb5241caa9b1e2cdd43faec67ea41021d4997b72
+checksum=f3ab6dffba914e6ddf88f1a755ec3ebaa95f0bdbec6f04b7bf0f90822249bb0c
 
 post_extract() {
 	rm -rf gntp sabnzbd/utils/{feedparser,configobj}.py
diff --git a/srcpkgs/sakura/patches/0002-Fixed-crash-with-vte-0.54-Bug-1790317.patch b/srcpkgs/sakura/patches/0002-Fixed-crash-with-vte-0.54-Bug-1790317.patch
deleted file mode 100644
index edc5f39b25b..00000000000
--- a/srcpkgs/sakura/patches/0002-Fixed-crash-with-vte-0.54-Bug-1790317.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From: Egmont Kobingler <egmont@gmail.com>
-Date: Thu, 27 Sep 2018 16:21:28 +0200
-Subject: * Bug #1790317 fixed: Crash with vte 0.54
-
----
- src/sakura.c | 29 +++--------------------------
- 1 file changed, 3 insertions(+), 26 deletions(-)
-
-diff --git a/src/sakura.c b/src/sakura.c
-index e72a9aa..5eab95a 100644
---- a/src/sakura.c
-+++ b/src/sakura.c
-@@ -339,6 +339,7 @@ struct terminal {
- 	bool label_set_byuser;
- 	GtkBorder padding;   /* inner-property data */
- 	int colorset;
-+	gulong exit_handler_id;
- };
- 
- 
-@@ -984,31 +985,6 @@ sakura_eof (GtkWidget *widget, void *data)
- 	if (npages==1) {
- 		sakura_config_done();
- 	}
--
--	/* Workaround for libvte strange behaviour. There is not child-exited signal for
--	   the last terminal, so we need to kill it here.  Check with libvte authors about
--	   child-exited/eof signals */
--	if (gtk_notebook_get_current_page(GTK_NOTEBOOK(sakura.notebook))==0) {
--
--		term = sakura_get_page_term(sakura, 0);
--
--		if (option_hold==TRUE) {
--			SAY("hold option has been activated");
--			return;
--		}
--
--        //SAY("waiting for terminal pid (in eof) %d", term->pid);
--        //waitpid(term->pid, &status, WNOHANG);
--	/* TODO: check wait return */
--		/* Child should be automatically reaped because we don't use G_SPAWN_DO_NOT_REAP_CHILD flag */
--		g_spawn_close_pid(term->pid);
--
--		sakura_del_tab(0);
--
--		npages = gtk_notebook_get_n_pages(GTK_NOTEBOOK(sakura.notebook));
--		if (npages==0)
--			sakura_destroy();
--	}	
- }
- 
- /* This handler is called when window title changes, and is used to change window and notebook pages titles */
-@@ -3167,7 +3143,7 @@ sakura_add_tab()
- 	g_signal_connect(G_OBJECT(term->vte), "bell", G_CALLBACK(sakura_beep), NULL);
- 	g_signal_connect(G_OBJECT(term->vte), "increase-font-size", G_CALLBACK(sakura_increase_font), NULL);
- 	g_signal_connect(G_OBJECT(term->vte), "decrease-font-size", G_CALLBACK(sakura_decrease_font), NULL);
--	g_signal_connect(G_OBJECT(term->vte), "child-exited", G_CALLBACK(sakura_child_exited), NULL);
-+	term->exit_handler_id = g_signal_connect(G_OBJECT(term->vte), "child-exited", G_CALLBACK(sakura_child_exited), NULL);
- 	g_signal_connect(G_OBJECT(term->vte), "eof", G_CALLBACK(sakura_eof), NULL);
- 	g_signal_connect(G_OBJECT(term->vte), "window-title-changed", G_CALLBACK(sakura_title_changed), NULL);
- 	g_signal_connect_swapped(G_OBJECT(term->vte), "button-press-event", G_CALLBACK(sakura_button_press), sakura.menu);
-@@ -3366,6 +3342,7 @@ sakura_del_tab(gint page)
- 	}
- 
- 	gtk_widget_hide(term->hbox);
-+	g_signal_handler_disconnect (term->vte, term->exit_handler_id);
- 	gtk_notebook_remove_page(GTK_NOTEBOOK(sakura.notebook), page);
- 
- 	/* Find the next page, if it exists, and grab focus */
diff --git a/srcpkgs/sakura/template b/srcpkgs/sakura/template
index 7f1474aaca0..2b3d106f95e 100644
--- a/srcpkgs/sakura/template
+++ b/srcpkgs/sakura/template
@@ -1,15 +1,15 @@
 # Template file for 'sakura'
 pkgname=sakura
-version=3.6.0
-revision=2
-patch_args="-Np1"
+version=3.7.0
+revision=1
 build_style=cmake
 hostmakedepends="perl pkg-config"
 makedepends="vte3-devel"
 depends="desktop-file-utils"
 short_desc="Simple but powerful libvte based terminal emulator"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="travankor <travankor@tuta.io>"
 license="GPL-2.0-only"
 homepage="https://launchpad.net/sakura"
-distfiles="https://launchpad.net/sakura/trunk/${version}/+download/sakura-${version}.tar.bz2"
-checksum=a1161f3cedde20a7e1bc5981b3e6ab3b91d2cd3a5ffe35c792a7fa402a1e86e0
+distfiles="https://launchpad.net/sakura/trunk/${version}/+download/sakura-${version}.tar.gz"
+checksum=b554dd21dc14d11ce14bb3110ca9fc567437cb3883e84b241b1a97ed8b9cfa95
+patch_args="-Np1"
diff --git a/srcpkgs/saml2aws/template b/srcpkgs/saml2aws/template
new file mode 100644
index 00000000000..2f308b8e3a2
--- /dev/null
+++ b/srcpkgs/saml2aws/template
@@ -0,0 +1,25 @@
+# Template file for 'saml2aws'
+pkgname=saml2aws
+version=2.17.0
+revision=1
+build_style=go
+go_import_path=github.com/Versent/saml2aws
+go_package="$go_import_path/cmd/saml2aws"
+hostmakedepends="git dep"
+depends="aws-cli"
+short_desc="Get AWS temporary credentials from SAML provider"
+maintainer="Mate GABRI <iam@theguy.io>"
+license="MIT"
+homepage="https://github.com/Versent/saml2aws"
+distfiles="https://github.com/Versent/saml2aws/archive/v${version}.tar.gz"
+checksum=fd7a1eeff96af1c78b68bcd1473965016cc078b4e50963d39fd69ad4311e7094
+
+pre_build() {
+	cd $GOSRCPATH
+	dep ensure
+	cd $wrksrc
+}
+
+post_install() {
+	vlicense LICENSE.md
+}
diff --git a/srcpkgs/sampler/template b/srcpkgs/sampler/template
index c8007f4784d..70b7e23ec66 100644
--- a/srcpkgs/sampler/template
+++ b/srcpkgs/sampler/template
@@ -1,6 +1,6 @@
 # Template file for 'sampler'
 pkgname=sampler
-version=1.0.2
+version=1.0.3
 revision=1
 build_style=go
 go_import_path="github.com/sqshq/sampler"
@@ -11,7 +11,7 @@ maintainer="Renato Aguiar <renato@renag.me>"
 license="GPL-3.0-only"
 homepage="https://sampler.dev/"
 distfiles="https://github.com/sqshq/sampler/archive/v${version}.tar.gz"
-checksum=3b5240322ed0f48529af94cecee55900ae05ab776531a2e75337bf99fe8b1ff2
+checksum=03aa155c04e02fa40097841515de4fbf57904142defe5433490e28792868842d
 
 post_install() {
 	vinstall example.yml 644 usr/share/examples/sampler
diff --git a/srcpkgs/sane/patches/sane-desc-cross.patch b/srcpkgs/sane/patches/sane-desc-cross.patch
index 168a768f966..5999809da9c 100644
--- a/srcpkgs/sane/patches/sane-desc-cross.patch
+++ b/srcpkgs/sane/patches/sane-desc-cross.patch
@@ -5,7 +5,7 @@
  sane-desc$(EXEEXT): $(sane_desc_OBJECTS) $(sane_desc_DEPENDENCIES) $(EXTRA_sane_desc_DEPENDENCIES) 
  	@rm -f sane-desc$(EXEEXT)
 -	$(AM_V_CCLD)$(LINK) $(sane_desc_OBJECTS) $(sane_desc_LDADD) $(LIBS)
-+	cc -I. sane-desc.c -I../include ../sanei/sanei_config.c ../sanei/sanei_init_debug.c ../sanei/sanei_constrain_value.c ../lib/isfdtype.c -o $@
++	cc -I. sane-desc.c -I../include ../sanei/sanei_config.c ../sanei/sanei_init_debug.c ../sanei/sanei_constrain_value.c -o $@
  
  sane-find-scanner$(EXEEXT): $(sane_find_scanner_OBJECTS) $(sane_find_scanner_DEPENDENCIES) $(EXTRA_sane_find_scanner_DEPENDENCIES) 
  	@rm -f sane-find-scanner$(EXEEXT)
diff --git a/srcpkgs/sane/template b/srcpkgs/sane/template
index 1c2fe80b21c..77fa2eccdff 100644
--- a/srcpkgs/sane/template
+++ b/srcpkgs/sane/template
@@ -1,10 +1,10 @@
 # Template file for 'sane'
 pkgname=sane
-version=1.0.27
-revision=2
+_gitlab_release_hash=9e718daff347826f4cfe21126c8d5091
+version=1.0.28
+revision=1
 wrksrc="sane-backends-${version}"
 build_style=gnu-configure
-build_options="snmp"
 configure_args="--disable-locking --enable-avahi --enable-ipv6 --enable-pthread
  --with-usb --docdir=/usr/share/doc/sane ac_cv_func_mmap_fixed_mapped=yes
  $(vopt_with snmp)"
@@ -14,35 +14,40 @@ makedepends="avahi-libs-devel libjpeg-turbo-devel tiff-devel libgphoto2-devel
 depends="$(vopt_if snmp net-snmp)"
 conf_files="/etc/sane.d/*.conf"
 short_desc="Scanner Access Now Easy"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Piraty <piraty1@inbox.ru>"
+license="GPL-2.0-or-later, SANE-exception"
 homepage="http://www.sane-project.org/"
-license="GPL-2"
-distfiles="https://fossies.org/linux/misc/sane-backends-${version}.tar.xz"
-checksum=9483e6789dae8117371059c95caaeda3e67dc25130f1d69ebfe926c5422e67b9
-
-post_install() {
-	# fix hp officejets
-	echo "#hpaio" >> ${DESTDIR}/etc/sane.d/dll.conf
+distfiles="https://gitlab.com/sane-project/backends/uploads/${_gitlab_release_hash}/sane-backends-${version}.tar.gz"
+checksum=31260f3f72d82ac1661c62c5a4468410b89fb2b4a811dabbfcc0350c1346de03
 
-	vinstall ${FILESDIR}/saned.xinetd 644 etc/xinetd.d saned.conf
-	vinstall ${wrksrc}/tools/sane-backends.pc 644 usr/lib/pkgconfig
+build_options="snmp"
 
+post_build() {
 	# generate udev file
 	cd tools
 	mkdir -p udev
 	make udev/libsane.rules
+}
+
+post_install() {
+	vinstall ${FILESDIR}/saned.xinetd 644 etc/xinetd.d saned.conf
+	vinstall ${wrksrc}/tools/sane-backends.pc 644 usr/lib/pkgconfig
+
 	# install udev file
-	vinstall udev/libsane.rules 644 usr/lib/udev/rules.d 49-sane.rules
-	# fix udev rules
-	sed -i 's|NAME="%k", ||g' ${DESTDIR}/usr/lib/udev/rules.d/49-sane.rules
+	vinstall tools/udev/libsane.rules 644 usr/lib/udev/rules.d 49-sane.rules
+
+	vlicense LICENSE # License clarification
+	vlicense COPYING # GPL-2.0
+	sed -n "1,43 p" "${wrksrc}/backend/dll.c" > "${DESTDIR}/usr/share/licenses/sane/SANE-EXCEPTION"
 }
 
 libsane_package() {
 	short_desc+=" - runtime shared library"
 	pkg_install() {
-		vmove usr/lib/libsane.so.*
+		vmove "usr/lib/libsane.so.*"
 	}
 }
+
 sane-devel_package() {
 	depends="libsane>=${version}_${revision}"
 	short_desc+=" - development files"
@@ -51,6 +56,6 @@ sane-devel_package() {
 		vmove usr/bin/sane-config
 		vmove usr/share/man/man1/sane-config.1
 		vmove usr/lib/pkgconfig
-		vmove usr/lib/*.so
+		vmove "usr/lib/*.so"
 	}
 }
diff --git a/srcpkgs/sanoid/template b/srcpkgs/sanoid/template
index 94bd9574400..9ec3715aea8 100644
--- a/srcpkgs/sanoid/template
+++ b/srcpkgs/sanoid/template
@@ -1,18 +1,17 @@
 # Template file for 'sanoid'
 pkgname=sanoid
-version=2.0.1
+version=2.0.2
 revision=1
-depends="perl perl-Config-IniFiles"
+depends="perl perl-Config-IniFiles perl-Capture-Tiny"
 short_desc="Policy-driven snapshot management tool for ZFS filesystems"
 maintainer="Benjamin Slade <slade@jnanam.net>"
 license="GPL-3.0-or-later"
 homepage="http://www.openoid.net/products/"
 distfiles="https://github.com/jimsalterjrs/sanoid/archive/v$version.tar.gz"
 conf_files="/etc/sanoid/sanoid.conf /etc/sanoid/sanoid.defaults.conf"
-checksum=e28bd2ee372d777cd58e3a2ddd9c5c04210d07323b648c6c21030d0f7a22a464
+checksum=8937f1b3ef984e1b4d09603b005dcbf6a0315efd65d001aacbeaf56b67558605
 
 do_install() {
-	     vlicense LICENSE
 	     vdoc README.md
 	     vinstall sanoid.conf 644 etc/sanoid/
 	     vinstall sanoid.defaults.conf 644 etc/sanoid/
diff --git a/srcpkgs/sassc/template b/srcpkgs/sassc/template
index 6f3d4249533..91054ca2595 100644
--- a/srcpkgs/sassc/template
+++ b/srcpkgs/sassc/template
@@ -1,7 +1,7 @@
 # Template file for 'sassc'
 pkgname=sassc
 version=3.6.1
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool"
 makedepends="libsass-devel"
diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template
index 5f1fdb67f2a..2cecabfdbee 100644
--- a/srcpkgs/sbcl/template
+++ b/srcpkgs/sbcl/template
@@ -1,6 +1,6 @@
 # Template file for 'sbcl'
 pkgname=sbcl
-version=1.5.5
+version=1.5.7
 revision=1
 archs="i686 x86_64* armv7l aarch64"
 
@@ -13,7 +13,7 @@ license="custom"
 homepage="http://www.sbcl.org/"
 changelog="http://www.sbcl.org/news.html"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.tar.bz2"
-checksum=cb47fae6a86f0c5c57431604fb4e5f11c8a823f94ce128d568b8770fc5bcaae2
+checksum=54742fb5e2f3f350fbafd72bc73662fca21382b5553ed6a146098950d2409485
 nocross=yes
 nopie=yes
 
@@ -21,7 +21,7 @@ _bootstrap_lisp="bash ../sbcl-*-linux/run-sbcl.sh --no-sysinit --no-userinit --d
 case "$XBPS_TARGET_MACHINE" in
 x86_64)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-x86-64-linux-binary.tar.bz2"
-	checksum+=" 76ed2d873379cc9c898323a252bbd5ad8f91fb143f70549e32490e13b185bff9"
+	checksum+=" 7f41c480076ce5917c604219ad0e6e28af477dc446b002b3c4d299644097af32"
 	;;
 i686)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.4.3-x86-linux-binary.tar.bz2"
diff --git a/srcpkgs/sblg/template b/srcpkgs/sblg/template
index 8caf2ba6306..25ee7964b7c 100644
--- a/srcpkgs/sblg/template
+++ b/srcpkgs/sblg/template
@@ -1,6 +1,6 @@
 # Template file for 'sblg'
 pkgname=sblg
-version=0.5.4
+version=0.5.7
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -11,7 +11,7 @@ license="ISC"
 homepage="https://kristaps.bsd.lv/sblg/"
 changelog="https://kristaps.bsd.lv/sblg/archive.html"
 distfiles="https://kristaps.bsd.lv/sblg/snapshots/${pkgname}-${version}.tar.gz"
-checksum=b133254b2268a2f7784086e016cf8b8ffc5cdd06484c778a935e6341722222bb
+checksum=c8fe402b9086f0359d48fdf5ede6124a284718e20303160f210892a4b7d9c458
 
 pre_configure() {
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/scapy/template b/srcpkgs/scapy/template
index 322fbb87d3d..65242f332a8 100644
--- a/srcpkgs/scapy/template
+++ b/srcpkgs/scapy/template
@@ -1,6 +1,6 @@
 # Template file for 'scapy'
 pkgname=scapy
-version=2.4.2
+version=2.4.3
 revision=1
 archs=noarch
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="cipr3s <cipr3s@gmx.com>"
 license="GPL-2.0-only"
 homepage="https://scapy.net/"
 distfiles="${PYPI_SITE}/s/scapy/scapy-${version}.tar.gz"
-checksum=1baa048936207ceb1a4281a0e1e3b4317667c754872a0bb4734c5213c468e86a
+checksum=e2f8d11f6a941c14a789ae8b236b27bd634681f1b29b5e893861e284d234f6b0
diff --git a/srcpkgs/scc/template b/srcpkgs/scc/template
new file mode 100644
index 00000000000..665dbc0f358
--- /dev/null
+++ b/srcpkgs/scc/template
@@ -0,0 +1,17 @@
+# Template file for 'scc'
+pkgname=scc
+version=2.8.0
+revision=1
+build_style=go
+go_import_path="github.com/boyter/scc"
+hostmakedepends="git"
+short_desc="Fast cloc replacement written in pure Go"
+maintainer="Sami Pitkänen <bilebucket@airmail.cc>"
+license="MIT"
+homepage="https://github.com/boyter/scc"
+distfiles="https://github.com/boyter/scc/archive/v${version}.tar.gz"
+checksum=1a4a08d4c39b1168f6626dff59a821a09bfd1922d9b7732506ebf124408f4361
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/scdoc/template b/srcpkgs/scdoc/template
index 17fd5c99d05..a97d72c6aa2 100644
--- a/srcpkgs/scdoc/template
+++ b/srcpkgs/scdoc/template
@@ -1,6 +1,6 @@
 # Template file for 'scdoc'
 pkgname=scdoc
-version=1.9.6
+version=1.10.0
 revision=1
 build_style=gnu-makefile
 make_build_args="PREFIX=/usr"
@@ -9,7 +9,7 @@ maintainer="Julio Galvan <juliogalvan@protonmail.com>"
 license="MIT"
 homepage="https://git.sr.ht/~sircmpwn/scdoc"
 distfiles="https://git.sr.ht/~sircmpwn/scdoc/archive/${version}.tar.gz"
-checksum=89a5f2294b4b72ee1d20b8a478d16bee1f96b6202bfeedb6df76c27881ed5928
+checksum=3482e08b994cc4a528caf3d20dd70efda2d2ec86b30f66af75a1d192fee56852
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" scdoc"
diff --git a/srcpkgs/scons/template b/srcpkgs/scons/template
index a31d541d2ea..e130e12ee7b 100644
--- a/srcpkgs/scons/template
+++ b/srcpkgs/scons/template
@@ -1,6 +1,6 @@
 # Template file for 'scons'
 pkgname=scons
-version=3.0.5
+version=3.1.1
 revision=1
 build_style=python2-module
 make_install_args="--standard-lib --install-data=/usr/share"
@@ -13,8 +13,8 @@ license="MIT"
 homepage="https://www.scons.org/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz
  https://raw.githubusercontent.com/SCons/scons/master/LICENSE>LICENSE.txt"
-checksum="df676f23dc6d4bfa384fc389d95dcd21ab907e6349d4c848958ba4befb73c73e
- 159d5c59118f24519f12d39a129ee0dba4a601f8a41b8de324d399005aba6eb6"
+checksum="4cea417fdd7499a36f407923d03b4b7000b0f9e8fd7b31b316b9ce7eba9143a5
+ 72ed889165fb28378cadac14552be4a959f1ebab6b148abb5dd2b49712c3c6f6"
 
 
 post_install() {
diff --git a/srcpkgs/screen/template b/srcpkgs/screen/template
index dd221da239c..3419228d3fc 100644
--- a/srcpkgs/screen/template
+++ b/srcpkgs/screen/template
@@ -1,6 +1,6 @@
 # Template file for 'screen'
 pkgname=screen
-version=4.6.2
+version=4.7.0
 revision=1
 build_style=gnu-configure
 configure_args="--with-sys-screenrc=/etc/screenrc --enable-pam
@@ -10,10 +10,10 @@ makedepends="pam-devel ncurses-devel"
 conf_files="/etc/screenrc /etc/skel/.screenrc"
 short_desc="GNU screen manager with VT100/ANSI terminal emulation"
 maintainer="Frank Steinborn <steinex@nognu.de>"
+license="GPL-3.0-only"
 homepage="http://www.gnu.org/s/screen/"
-license="GPL-3"
 distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.gz"
-checksum=1b6922520e6a0ce5e28768d620b0f640a6631397f95ccb043b70b91bb503fa3a
+checksum=da775328fa783bd2a787d722014dbd99c6093effc11f337827604c2efc5d20c1
 
 post_install() {
 	vinstall etc/etcscreenrc 0644 etc screenrc
diff --git a/srcpkgs/scrot/template b/srcpkgs/scrot/template
index c44b143f365..2f12be320ee 100644
--- a/srcpkgs/scrot/template
+++ b/srcpkgs/scrot/template
@@ -1,17 +1,17 @@
 # Template file for 'scrot'
 pkgname=scrot
-version=1.1.1
+version=1.2
 revision=1
 build_style=gnu-configure
 make_install_args="docsdir=/usr/share/doc/scrot"
 hostmakedepends="automake autoconf-archive"
 makedepends="libX11-devel libXcursor-devel giblib-devel imlib2-devel"
 short_desc="Simple command-line screenshot utility for X"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Frank Steinborn <steinex@nognu.de>"
 license="MIT"
 homepage="https://github.com/resurrecting-open-source-projects/scrot"
 distfiles="https://github.com/resurrecting-open-source-projects/scrot/archive/${version}.tar.gz"
-checksum=63bc645d5dfff51e441541dc999379b34722c6428a4cd642e20005e6901383ba
+checksum=e9b41d4cb9b5ab3747d6718c4eb51d5aaf35b6cac23c9ff68af15fc1c9ce187c
 
 pre_configure() {
 	./autogen.sh
diff --git a/srcpkgs/scrypt/template b/srcpkgs/scrypt/template
index fbff8b0fb30..b807c55bf65 100644
--- a/srcpkgs/scrypt/template
+++ b/srcpkgs/scrypt/template
@@ -1,15 +1,15 @@
 # Template file for 'scrypt'
 pkgname=scrypt
-version=1.2.1
-revision=7
+version=1.3.0
+revision=1
 build_style=gnu-configure
 makedepends="libressl-devel"
-short_desc="The scrypt key derivation function"
+short_desc="Scrypt key derivation function"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://www.tarsnap.com/scrypt.html"
 distfiles="https://www.tarsnap.com/scrypt/scrypt-${version}.tgz"
-checksum=4621f5e7da2f802e20850436219370092e9fcda93bd598f6d4236cce33f4c577
+checksum=263034edd4d1e117d4051d9a9260c74dedb0efaf4491c5152b738978b3f32748
 
 post_install() {
 	vlicense COPYRIGHT
diff --git a/srcpkgs/scummvm/template b/srcpkgs/scummvm/template
index c24ae51929e..70e5a912720 100644
--- a/srcpkgs/scummvm/template
+++ b/srcpkgs/scummvm/template
@@ -1,36 +1,31 @@
 # Template file for 'scummvm'
 pkgname=scummvm
-version=2.0.0
+version=2.1.0
 revision=1
 build_style=configure
-configure_args="--prefix=/usr --enable-plugins --enable-all-engines"
+configure_args="--prefix=/usr --enable-release-mode
+ --with-sdl-prefix=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="pkg-config nasm"
-makedepends="zlib-devel libpng-devel SDL-devel libmad-devel faad2-devel
+makedepends="zlib-devel libpng-devel SDL2-devel libmad-devel faad2-devel
  fluidsynth-devel libvorbis-devel libtheora-devel libflac-devel
- freetype-devel libjpeg-turbo-devel"
+ freetype-devel libjpeg-turbo-devel libcurl-devel SDL2_net-devel
+ libmpeg2-devel liba52-devel"
 short_desc="Free implementation of LucasArts' SCUMM interpreter"
-maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://www.scummvm.org/"
-license="GPL-2"
-distfiles="http://www.scummvm.org/frs/${pkgname}/${version}/${pkgname}-${version}.tar.xz"
-checksum=9784418d555ba75822d229514a05cf226b8ce1a751eec425432e6b7e128fca60
+maintainer="John <johnz@posteo.net>"
+license="GPL-2.0-or-later"
+homepage="https://www.scummvm.org/"
+distfiles="https://www.scummvm.org/frs/${pkgname}/${version}/${pkgname}-${version}.tar.xz"
+checksum=6b50c6596a1536b52865f556dc05ded20f86b6ffabe4bccbd746b5587b15f727
 
-if [ "$CROSS_BUILD" ]; then
-	configure_args+=" --host=${XBPS_CROSS_TRIPLET} --disable-nasm"
-	CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/SDL"
+case "$XBPS_TARGET_MACHINE" in
+	i686*|x86_64*);;
+	*) configure_args+=" --disable-nasm";;
+esac
 
-	pre_configure() {
-		sed -i -e "s|_ranlib=ranlib|_ranlib=${XBPS_CROSS_TRIPLET}-ranlib|" \
-		-e "s|_strip=strip|_strip=${XBPS_CROSS_TRIPLET}-strip|" \
-		-e "s|_ar=\"ar cru\"|_ar=\"${XBPS_CROSS_TRIPLET}-ar cru\"|" \
-		-e "s|_as=\"as\"|_as=\"${XBPS_CROSS_TRIPLET}-as\"|" configure
-	}
+if [ "$CROSS_BUILD" ]; then
+	configure_args+=" --host=${XBPS_CROSS_TRIPLET}"
 fi
 
-do_install() {
-	vbin scummvm
-	vman dists/scummvm.6
-	vinstall dists/scummvm.desktop 644 usr/share/applications
-	vinstall icons/scummvm.xpm 644 usr/share/pixmaps
-	vinstall gui/themes/scummmodern.zip 644 usr/share/scummvm
+do_check() {
+	make test
 }
diff --git a/srcpkgs/sddm-kcm/template b/srcpkgs/sddm-kcm/template
index 49beeae6c95..e482a971c93 100644
--- a/srcpkgs/sddm-kcm/template
+++ b/srcpkgs/sddm-kcm/template
@@ -1,6 +1,6 @@
 # Template file for 'sddm-kcm'
 pkgname=sddm-kcm
-version=5.16.4
+version=5.17.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/plasma/sddm-kcm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=340034c5475d751c19c96a75445fa50877fad1c4de3422bc02f4b95e8f14bd68
+checksum=3ab6da7692df4b35c088f45657dfe2430797021c7c7fd6091747d7fd9ca594d7
diff --git a/srcpkgs/seafile-client-qt/template b/srcpkgs/seafile-client-qt/template
index d3fa18450b9..573a81460fa 100644
--- a/srcpkgs/seafile-client-qt/template
+++ b/srcpkgs/seafile-client-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'seafile-client-qt'
 pkgname=seafile-client-qt
-version=6.2.11
+version=7.0.2
 revision=1
 _sourcename="seafile-client"
 wrksrc="${_sourcename}-${version}"
@@ -14,16 +14,19 @@ maintainer="yopito <pierre.bourgin@free.fr>"
 license="Apache-2.0"
 homepage="https://github.com/haiwen/${_sourcename}"
 distfiles="https://github.com/haiwen/${_sourcename}/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=a862b3bf6dda9bd6d73270643dac9dad21296cc0bcd7aefa200b778c7675bb12
+checksum=338cc25dcb7307ac22c4dafc3d3434011368892752869ce6b7d281b991a6fca1
 
 build_options="shibboleth"
 desc_option_shibboleth="Build with Shibboleth support"
-build_options_default="shibboleth"
 
+# no arm by default (webengine does not crosscompile from 64-bit to 32-bit)
 case "$XBPS_TARGET_MACHINE" in
-	*-musl)	# Add musl-fts implementation
-		makedepends+=" musl-fts-devel"
-		;;
+	x86_64*|i686*|ppc64*|aarch64*) build_options_default="shibboleth" ;;
+esac
+
+case "$XBPS_TARGET_MACHINE" in
+	*-musl)	# need fts implementation
+		makedepends+=" musl-fts-devel" ;;
 esac
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/seafile-libclient/template b/srcpkgs/seafile-libclient/template
index fa9cd7b7d3f..47c49d5ceb2 100644
--- a/srcpkgs/seafile-libclient/template
+++ b/srcpkgs/seafile-libclient/template
@@ -1,7 +1,7 @@
 # Template file for 'seafile-libclient'
 pkgname=seafile-libclient
-version=6.2.11
-revision=2
+version=7.0.2
+revision=1
 _distname="${pkgname/-libclient/}"
 wrksrc="${_distname}-${version}"
 build_style=gnu-configure
@@ -14,7 +14,7 @@ maintainer="yopito <pierre.bourgin@free.fr>"
 license="GPL-2.0-or-later" # Has openssl exception not yet present on SPDX
 homepage="https://github.com/haiwen/seafile"
 distfiles="${homepage}/archive/v${version}.tar.gz>${_distname}-${version}.tar.gz"
-checksum=58c751d0d5f7afa674718a08ed828e9f94d00173d721018bbf61dd6b032f5a57
+checksum=2424b303fa826321affad0f23341ac46ca085c895f3d6e1345e9b43dc13c2ab3
 
 pre_configure() {
 	./autogen.sh
diff --git a/srcpkgs/seahorse/template b/srcpkgs/seahorse/template
index bfb7ec2a1c1..fd3e5a1a5f5 100644
--- a/srcpkgs/seahorse/template
+++ b/srcpkgs/seahorse/template
@@ -1,6 +1,6 @@
 # Template file for 'seahorse'
 pkgname=seahorse
-version=3.32.0
+version=3.32.2
 revision=1
 wrksrc="$pkgname-${version%.*}"
 build_style=meson
diff --git a/srcpkgs/sequeler/template b/srcpkgs/sequeler/template
index fbaeb8c1a84..7d39e69977f 100644
--- a/srcpkgs/sequeler/template
+++ b/srcpkgs/sequeler/template
@@ -1,6 +1,6 @@
 # Template file for 'sequeler'
 pkgname=sequeler
-version=0.7.2
+version=0.7.3
 revision=1
 build_style=meson
 hostmakedepends="pkg-config glib-devel vala"
@@ -11,4 +11,4 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Alecaddd/sequeler"
 distfiles="https://github.com/Alecaddd/sequeler/archive/v${version}.tar.gz"
-checksum=5134fd93324b1c96e614e05d94b1e0176e329c90c45811b785b2f54c1a50de91
+checksum=c25f540a4c95be50edd5e8495f6f436ba955d806481a0248fb03edfb10356217
diff --git a/srcpkgs/sfeed/template b/srcpkgs/sfeed/template
index cac8bcc40fe..54be7e421b3 100644
--- a/srcpkgs/sfeed/template
+++ b/srcpkgs/sfeed/template
@@ -1,6 +1,6 @@
 # Template file for 'sfeed'
 pkgname=sfeed
-version=0.9.12
+version=0.9.13
 revision=1
 build_style=gnu-makefile
 make_install_args="MANPREFIX=/usr/share/man"
@@ -10,7 +10,7 @@ maintainer="Rubén Santos <kojicomics@cocaine.ninja>"
 license="ISC"
 homepage="https://git.codemadness.org/sfeed"
 distfiles="https://codemadness.org/releases/sfeed/sfeed-${version}.tar.gz"
-checksum=ba512f734cdca5a10171ba7a051b0b614a7d93fdc29ea296eb464a57ce314ffd
+checksum=5e78fd75fa4949733b48640cd8205d0977b200f1cb403dcad33d1d7ea7032cee
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/shaderc/template b/srcpkgs/shaderc/template
index 51fd7bb23db..06768ed8a2b 100644
--- a/srcpkgs/shaderc/template
+++ b/srcpkgs/shaderc/template
@@ -8,7 +8,7 @@ configure_args="-DSHADERC_SKIP_TESTS=ON"
 hostmakedepends="python3"
 makedepends="SPIRV-Tools-devel glslang-devel"
 short_desc="Collection of tools, libraries and tests for shader compilation"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/google/shaderc"
 distfiles="https://github.com/google/shaderc/archive/v${version}.tar.gz"
diff --git a/srcpkgs/shared-mime-info/template b/srcpkgs/shared-mime-info/template
index 32cb30ed6b5..c46de16f454 100644
--- a/srcpkgs/shared-mime-info/template
+++ b/srcpkgs/shared-mime-info/template
@@ -1,15 +1,21 @@
 # Template file for 'shared-mime-info'
 pkgname=shared-mime-info
-version=1.12
+version=1.14
 revision=1
+_tarver=1-14
+wrksrc=${pkgname}-Release-${_tarver}
 build_style=gnu-configure
 configure_args="--disable-update-mimedb"
-hostmakedepends="pkg-config intltool"
+hostmakedepends="pkg-config intltool autoconf automake itstool gettext-devel"
 makedepends="libglib-devel libxml2-devel"
 short_desc="Core database of common types"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://freedesktop.org/Software/shared-mime-info"
-distfiles="https://gitlab.freedesktop.org/xdg/shared-mime-info/uploads/80c7f1afbcad2769f38aeb9ba6317a51/shared-mime-info-${version}.tar.xz"
-checksum=18b2f0fe07ed0d6f81951a5fd5ece44de9c8aeb4dc5bb20d4f595f6cc6bd403e
+distfiles="https://gitlab.freedesktop.org/xdg/shared-mime-info/-/archive/Release-1-14/shared-mime-info-Release-${_tarver}.tar.bz2"
+checksum=f6dec545944e3334a57cee04fb50da8c9005b9eff81514e8357cb17ed522ac8e
 disable_parallel_build=yes
+
+pre_configure() {
+	NOCONFIGURE=1 ./autogen.sh
+}
diff --git a/srcpkgs/shfmt/template b/srcpkgs/shfmt/template
index b2992235cdb..027fbe0de20 100644
--- a/srcpkgs/shfmt/template
+++ b/srcpkgs/shfmt/template
@@ -7,7 +7,7 @@ build_style=go
 go_import_path=mvdan.cc/sh
 go_package="${go_import_path}/cmd/shfmt"
 short_desc="Shell parser and formatter"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/mvdan/sh"
 distfiles="https://github.com/mvdan/sh/archive/v${version}.tar.gz"
diff --git a/srcpkgs/shiboken2/patches/qstringlist.patch b/srcpkgs/shiboken2/patches/qstringlist.patch
new file mode 100644
index 00000000000..2dc1e3d0885
--- /dev/null
+++ b/srcpkgs/shiboken2/patches/qstringlist.patch
@@ -0,0 +1,12 @@
+Fixes build with Qt 5.13.
+
+--- sources/shiboken2/ApiExtractor/clangparser/clangutils.h
++++ sources/shiboken2/ApiExtractor/clangparser/clangutils.h
+@@ -33,6 +33,7 @@
+ #include <QtCore/QPair>
+ #include <QtCore/QString>
+ #include <QtCore/QVector>
++#include <QtCore/QStringList>
+ 
+ QT_FORWARD_DECLARE_CLASS(QDebug)
+ 
diff --git a/srcpkgs/shiboken2/template b/srcpkgs/shiboken2/template
index 437833aed3f..394d9ba4f94 100644
--- a/srcpkgs/shiboken2/template
+++ b/srcpkgs/shiboken2/template
@@ -1,7 +1,7 @@
 # Template file for 'shiboken2'
 pkgname=shiboken2
 version=5.11.2
-revision=1
+revision=2
 _pkgname="pyside-setup-everywhere-src-${version}"
 wrksrc="$_pkgname"
 configure_args="-DUSE_PYTHON_VERSION=3 -DCMAKE_INSTALL_PREFIX=/usr
diff --git a/srcpkgs/shotcut/template b/srcpkgs/shotcut/template
index 28bff11f5c0..c4bd0a94c76 100644
--- a/srcpkgs/shotcut/template
+++ b/srcpkgs/shotcut/template
@@ -1,6 +1,6 @@
 # Template file for 'shotcut'
 pkgname=shotcut
-version=19.08.16
+version=19.09.14
 revision=1
 build_style=qmake
 configure_args="SHOTCUT_VERSION=VOID-$version DEFINES+=SHOTCUT_NOUPGRADE"
@@ -15,7 +15,7 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-3.0-or-later"
 homepage="https://www.shotcut.org"
 distfiles="https://github.com/mltframework/shotcut/archive/v${version}.tar.gz"
-checksum=03c0938eb69a239c442c0b73e547abcf626c6053e6bd189166c3391262b106bf
+checksum=b8e2dfa95928a8b08d4427a379a56efea79301ba82aee63f0f2f883a8269eb51
 
 CXXFLAGS="-DHAVE_LOCALE_H=1"
 
diff --git a/srcpkgs/shotwell/template b/srcpkgs/shotwell/template
index 641138f9fb9..a931bbd126e 100644
--- a/srcpkgs/shotwell/template
+++ b/srcpkgs/shotwell/template
@@ -1,6 +1,6 @@
 # Template file for 'shotwell'
 pkgname=shotwell
-version=0.30.5
+version=0.30.7
 revision=1
 build_style=meson
 hostmakedepends="gcr-devel glib-devel gnome-doc-utils itstool libgee08-devel
@@ -14,6 +14,6 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later, CC-BY-SA-3.0"
 homepage="https://wiki.gnome.org/Apps/Shotwell"
 distfiles="${GNOME_SITE}/shotwell/${version%.*}/shotwell-${version}.tar.xz"
-checksum=af8be0396509c7a0ad435c9562d8ed29a496b97aa6fba5fc472c390a08fca4a5
+checksum=345d4205760d26f54033d44cf1b778ed9d3fc964de71293bfd5034ff484631d5
 lib32disabled=yes
 nocross="https://build.voidlinux.org/builders/armv7l-musl_builder/builds/20405/steps/shell_3/logs/stdio"
diff --git a/srcpkgs/shunit2/template b/srcpkgs/shunit2/template
index 4b0b90ae1d4..e5be2806828 100644
--- a/srcpkgs/shunit2/template
+++ b/srcpkgs/shunit2/template
@@ -5,7 +5,7 @@ revision=1
 checkdepends="bash zsh ksh"
 depends="bash"
 short_desc="Unit testing framework for Unix shell scripts based on xUnit"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1"
 homepage="https://github.com/kward/shunit2"
 distfiles="https://github.com/kward/shunit2/archive/v${version}.tar.gz"
diff --git a/srcpkgs/signon-kwallet-extension/template b/srcpkgs/signon-kwallet-extension/template
index 47be51fd105..161e51d2e62 100644
--- a/srcpkgs/signon-kwallet-extension/template
+++ b/srcpkgs/signon-kwallet-extension/template
@@ -1,6 +1,6 @@
 # Template file for 'signon-kwallet-extension'
 pkgname=signon-kwallet-extension
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://cgit.kde.org/signon-kwallet-extension.git/"
 distfiles="${KDE_SITE}/applications/${version}/src/signon-kwallet-extension-${version}.tar.xz"
-checksum=f8cd646365f82c82de6c9f2dda8250579a2e469504e4358a334786f8f8e8b61f
+checksum=2521cd2c4f25717f5caf9915474f75614be7dec7053f1e94c1429fac7045cc29
diff --git a/srcpkgs/sk1/template b/srcpkgs/sk1/template
index 2e197a4d71a..1332211e175 100644
--- a/srcpkgs/sk1/template
+++ b/srcpkgs/sk1/template
@@ -1,8 +1,7 @@
 # Template file for 'sk1'
 pkgname=sk1
-reverts="2.0rc3.20180316_1 2.0rc3.20180329_1"
-version=2.0rc3
-revision=5
+version=2.0rc4
+revision=1
 build_style=python2-module
 pycompile_dirs="/usr/lib/sk1-wx-${version}"
 hostmakedepends="pkg-config python"
@@ -11,10 +10,10 @@ depends="desktop-file-utils hicolor-icon-theme python-cairo python-Pillow
  python-reportlab wxPython"
 short_desc="Open source multiplatform vector graphics editor"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="https://sk1project.net"
 distfiles="https://downloads.sk1project.net/sk1/${version}/sk1-${version}.tar.gz"
-checksum=d3b94131794d42d7c80c678e11a28a8e6a50401af4a35e42ed534d02b14abdff
+checksum=65ef0856389d3972e758d55eea33357a4bccec8b97d95eb8dc6be186a7956063
 
 pre_configure() {
 	# python2: can't open file 'setup.py': [Errno 2] No such file or directory
@@ -25,4 +24,3 @@ do_install() {
 	# must supply either prefix/exec-prefix/home or install-base/install-platbase -- not both
 	python2 setup.py install --root=${DESTDIR}
 }
-
diff --git a/srcpkgs/sk1/update b/srcpkgs/sk1/update
index 4d0b2efb096..0545d0dbcec 100644
--- a/srcpkgs/sk1/update
+++ b/srcpkgs/sk1/update
@@ -1 +1,2 @@
 ignore="*pkgbuild*"
+vdsuffix=rc.
diff --git a/srcpkgs/skaffold/template b/srcpkgs/skaffold/template
index 258a02e8062..7e87975557f 100644
--- a/srcpkgs/skaffold/template
+++ b/srcpkgs/skaffold/template
@@ -1,6 +1,6 @@
 # Template file for 'skaffold'
 pkgname=skaffold
-version=0.36.0
+version=0.40.0
 revision=1
 build_style=go
 go_import_path=github.com/GoogleContainerTools/skaffold
@@ -10,5 +10,6 @@ short_desc="Easy and repeatable Kubernetes development"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="https://skaffold.dev/"
+changelog="https://github.com/GoogleContainerTools/skaffold/releases"
 distfiles="https://github.com/GoogleContainerTools/skaffold/archive/v${version}.tar.gz"
-checksum=3b4d1b305feee16f3c44951e56a5105de00166384cef3265dd0f724081afcf41
+checksum=a89f8b75077193918efc8051d6b58b74408dc76467edbb0115d0765f60d13ed4
diff --git a/srcpkgs/skalibs/template b/srcpkgs/skalibs/template
index 559b40d1512..807b927f3fa 100644
--- a/srcpkgs/skalibs/template
+++ b/srcpkgs/skalibs/template
@@ -1,31 +1,21 @@
 # Template file for 'skalibs'
 pkgname=skalibs
-version=2.8.1.0
+version=2.9.0.0
 revision=1
 _sysdepspkg=skaware-void-sysdeps
 build_style=configure
-configure_args="--libdir=/usr/lib --enable-static --enable-shared --enable-clock
- --enable-monotonic --enable-force-devr --datadir=/usr/share/$pkgname --libdir=/usr/lib
- --bindir=/usr/bin --dynlibdir=/usr/lib"
+configure_args="--libdir=/usr/lib --enable-static --enable-shared
+ --enable-clock --enable-monotonic --enable-force-devr
+ --datadir=/usr/share/$pkgname --libdir=/usr/lib
+ --bindir=/usr/bin --dynlibdir=/usr/lib
+ --with-sysdep-devurandom=yes"
 short_desc="General purpose libraries for building software from skarnet.org"
 maintainer="bougyman <bougyman@voidlinux.org>"
 license="ISC"
 homepage="https://skarnet.org/software/skalibs/"
+changelog="https://skarnet.org/software/skalibs/upgrade.html"
 distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=431c6507b4a0f539b6463b4381b9b9153c86ad75fa3c6bfc9dc4722f00b166ba
-
-CFLAGS="-D_DEFAULT_SOURCE"
-
-if [ "$CROSS_BUILD" ]; then
-	distfiles+=" https://github.com/CMB/${_sysdepspkg}/archive/${version}.tar.gz"
-	checksum+=" b5a56d24caeb731f9a8468fa61ab0e9ae139370609ef4acb36888e69bbe8d98d"
-	configure_args+=" --with-sysdeps=../${_sysdepspkg}-${version}/${XBPS_CROSS_TRIPLET}"
-
-	case "$XBPS_TARGET_MACHINE" in
-		aarch64*|armv6*|armv7l*|i686|x86_64*|ppc*) ;;
-		*) nocross="Missing cross sysdeps" ;;
-	esac
-fi
+checksum=f5604f9e5ebb436d3a8efa16a2c4133f7bd424d9f22aa88fe7a372f0153396fb
 
 post_install() {
 	vlicense COPYING LICENSE
@@ -40,6 +30,7 @@ skalibs-doc_package() {
 		vcopy "doc/*" usr/share/doc/skalibs
 	}
 }
+
 skalibs-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/skim/template b/srcpkgs/skim/template
index deb8158a246..7e6b6a6f5fb 100644
--- a/srcpkgs/skim/template
+++ b/srcpkgs/skim/template
@@ -4,7 +4,7 @@ version=0.6.8
 revision=1
 build_style=cargo
 short_desc="Fuzzy Finder in rust"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/lotabout/skim"
 distfiles="https://github.com/lotabout/skim/archive/v${version}.tar.gz"
diff --git a/srcpkgs/skype/template b/srcpkgs/skype/template
index 123d56c8252..d7f3ac127f7 100644
--- a/srcpkgs/skype/template
+++ b/srcpkgs/skype/template
@@ -1,19 +1,19 @@
 # Template file for 'skype'
 # This just repackages the debian package.
 pkgname=skype
-version=8.50.0.38
+version=8.53.0.85
 revision=1
 archs="x86_64"
-repository="nonfree"
 build_style="fetch"
-nostrip="yes"
 depends="elogind"
 short_desc="Skype for Linux"
 maintainer="Lon Willett <xgit@lonw.net>"
 license="skype"
 homepage="https://www.skype.com"
 distfiles="https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"
-checksum=c64e27057a91cc006476d174f101a758eb917d4146078e0218f73f4c2e530abc
+checksum=fbb31b857bcb0b406cb1dd42336948c2f0a04caa229b9e4b6ff6e6bc5a8a836b
+repository="nonfree"
+nostrip="yes"
 
 do_extract() {
 	ar p ${XBPS_SRCDISTDIR}/${pkgname}-${version}/skypeforlinux_${version}_amd64.deb data.tar.xz | tar xJpf - ./usr
diff --git a/srcpkgs/slack-desktop/template b/srcpkgs/slack-desktop/template
index 1c0eb43b69f..e6ad447fcaf 100644
--- a/srcpkgs/slack-desktop/template
+++ b/srcpkgs/slack-desktop/template
@@ -1,14 +1,14 @@
 # Template file for 'slack-desktop'
 pkgname=slack-desktop
-version=4.0.0
+version=4.1.1
 revision=1
 archs="x86_64"
 short_desc="Messaging app for teams"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
-license="Proprietary"
+license="custom:Proprietary"
 homepage="https://slack.com/"
 distfiles="https://slack-ssb-updates.global.ssl.fastly.net/linux_releases/${pkgname}-${version}-amd64.deb"
-checksum=911a4c05fb4f85181df13f013e82440b0d171862c9cb137dc19b6381d47bd57e
+checksum=2e84af28a9179faf1a6c64e36e6316792531de1d4530fcd2909e5eae77d1ced9
 restricted=yes
 repository="nonfree"
 nopie=yes
diff --git a/srcpkgs/sleuthkit/template b/srcpkgs/sleuthkit/template
index d33aa6aec29..b17362edc70 100644
--- a/srcpkgs/sleuthkit/template
+++ b/srcpkgs/sleuthkit/template
@@ -1,6 +1,6 @@
 # Template file for 'sleuthkit'
 pkgname=sleuthkit
-version=4.6.7
+version=4.7.0
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only, IPL-1.0, CPL-1.0"
 homepage="https://www.sleuthkit.org/"
 distfiles="https://github.com/sleuthkit/${pkgname}/archive/${pkgname}-${version}.tar.gz"
-checksum=7f6305160109d681dd6fe00b7a19f1c43af35d2eb265d3abbdc2749611707687
+checksum=bc56f342442ef02f981a7c461e23ff407e1b9e68b16d2f28150b6300c4435996
 
 post_extract() {
 	sed -i 's/daddr_t/uint32_t/g' tools/srchtools/sigfind.cpp
diff --git a/srcpkgs/slirp4netns/template b/srcpkgs/slirp4netns/template
index 37d3ed2e5ed..50ac856075a 100644
--- a/srcpkgs/slirp4netns/template
+++ b/srcpkgs/slirp4netns/template
@@ -1,16 +1,16 @@
 # Template file for 'slirp4netns'
 pkgname=slirp4netns
-version=0.3.2
+version=0.4.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="autoconf automake pkg-config"
-makedepends="glib-devel"
+makedepends="glib-devel libseccomp-devel libcap-devel"
 short_desc="User-mode networking for unprivileged network namespaces"
-maintainer="Cameron Nemo <camerontnorman@gmail.com>"
+maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="GPL-2.0-only"
 homepage="https://github.com/rootless-containers/slirp4netns"
 distfiles="https://github.com/rootless-containers/slirp4netns/archive/v${version}.tar.gz"
-checksum=fe400337e857cee668a0c9161e2997af9c5c8cbaf4cbec12b32b458064eec380
+checksum=75d2a7411cc2b3e341d8530228750bb1db06077b349d10fbdddbb582c27f8cfc
 
 pre_configure() {
 	./autogen.sh
diff --git a/srcpkgs/smenu/template b/srcpkgs/smenu/template
index 3c900b6a8b9..1d295cb5e85 100644
--- a/srcpkgs/smenu/template
+++ b/srcpkgs/smenu/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-configure
 makedepends="ncurses-devel"
 short_desc="Create selection menus with words from stdin"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/p-gen/smenu"
 distfiles="https://github.com/p-gen/smenu/archive/v${version}.tar.gz"
diff --git a/srcpkgs/socat/template b/srcpkgs/socat/template
index a3072a292f2..57b99020a92 100644
--- a/srcpkgs/socat/template
+++ b/srcpkgs/socat/template
@@ -1,15 +1,13 @@
 # Template file for 'socat'
 pkgname=socat
 version=1.7.3.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-libwrap --enable-fips
- ac_cv_have_z_modifier=yes sc_cv_sys_crdly_shift=9
- sc_cv_sys_tabdly_shift=11 sc_cv_sys_csize_shift=4
- ac_cv_ispeed_offset=13"
+ ac_cv_have_z_modifier=yes"
 makedepends="readline-devel libressl-devel"
 short_desc="Relay for bidirectional data transfer between two independent channels"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="q66 <daniel@octaforge.org>"
 license="GPL-2.0-only"
 homepage="http://www.dest-unreach.org/socat/"
 distfiles="http://www.dest-unreach.org/socat/download/socat-${version}.tar.bz2"
@@ -18,3 +16,20 @@ checksum=0dd63ffe498168a4aac41d307594c5076ff307aa0ac04b141f8f1cec6594d04a
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) CFLAGS="-D_LINUX_IF_ETHER_H";;
 esac
+
+case "$XBPS_TARGET_MACHINE" in
+	ppc*)
+		configure_args+="
+		 sc_cv_sys_crdly_shift=12
+		 sc_cv_sys_tabdly_shift=10
+		 sc_cv_sys_csize_shift=8"
+		;;
+	*)
+		configure_args+="
+		 sc_cv_sys_crdly_shift=9
+		 sc_cv_sys_tabdly_shift=11
+		 sc_cv_sys_csize_shift=4"
+		;;
+esac
+
+configure_args+=" ac_cv_ispeed_offset=13"
diff --git a/srcpkgs/solarus-quest-editor/template b/srcpkgs/solarus-quest-editor/template
index 1268a562e68..de2aa962355 100644
--- a/srcpkgs/solarus-quest-editor/template
+++ b/srcpkgs/solarus-quest-editor/template
@@ -1,6 +1,6 @@
 # Template file for 'solarus-quest-editor'
 pkgname=solarus-quest-editor
-version=1.6.0
+version=1.6.2
 revision=1
 wrksrc="${pkgname}-v${version}"
 build_style=cmake
@@ -13,4 +13,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="http://www.solarus-games.org"
 distfiles="https://gitlab.com/solarus-games/${pkgname}/-/archive/v${version}/${pkgname}-v${version}.tar.bz2"
-checksum=79f5ae343b6340ba07702333d96e26dfa2d5b1f43a3f2bf90e168d42b08a769b
+checksum=278e0c2856bd1eb4862253f1ece50480d936a7ebc7d694664a791b2fd1a750e5
diff --git a/srcpkgs/solarus/template b/srcpkgs/solarus/template
index 94085e2b470..1611a1190cd 100644
--- a/srcpkgs/solarus/template
+++ b/srcpkgs/solarus/template
@@ -1,6 +1,6 @@
 # Template file for 'solarus'
 pkgname=solarus
-version=1.6.0
+version=1.6.2
 revision=1
 wrksrc="${pkgname}-v${version}"
 build_style=cmake
@@ -12,13 +12,13 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="http://www.solarus-games.org/"
 distfiles="https://gitlab.com/solarus-games/solarus/-/archive/v${version}/solarus-v${version}.tar.bz2"
-checksum=7a7a3e8f85ed44c1ee84bfee0b6f63f5d351cde6c10a1b7c5f2072b66068692d
+checksum=c14cd97bad6e12310b938d90abd4e8ebdd0abb403cdcc015d5add82dfc5a085b
 
 solarus-devel_package() {
 	short_desc+=" - development files"
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
-		vmove usr/lib/libsolarus.so
+		vmove "usr/lib/*.so"
 	}
 }
diff --git a/srcpkgs/sonnet/template b/srcpkgs/sonnet/template
index 394fb8c5191..fcdd5583c1f 100644
--- a/srcpkgs/sonnet/template
+++ b/srcpkgs/sonnet/template
@@ -1,6 +1,6 @@
 # Template file for 'sonnet'
 pkgname=sonnet
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/frameworks/sonnet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4c8818897ea5dac25e0120acfd4e15c44adf2ee76749870b8f70178f1a3d8b29
+checksum=2f26251d7008de895dd5962a7ba09fbb82beaabbe88b8e5cd259585ebbaf1d3f
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-tools-devel sonnet"
diff --git a/srcpkgs/sops/template b/srcpkgs/sops/template
new file mode 100644
index 00000000000..47365ff9b26
--- /dev/null
+++ b/srcpkgs/sops/template
@@ -0,0 +1,13 @@
+# Template file for 'sops'
+pkgname=sops
+version=3.4.0
+revision=1
+build_style=go
+go_import_path="go.mozilla.org/sops/cmd/sops"
+hostmakedepends="git"
+short_desc="Simple and flexible tool for managing secrets"
+maintainer="Noel Cower <ncower@gmail.com>"
+license="MPL-2.0"
+homepage="https://github.com/mozilla/sops"
+distfiles="${homepage}/archive/${version}.tar.gz"
+checksum=65f680ada424094dcdb80b44e3c11c86235618ef1ab10f5f632fcda954a06363
diff --git a/srcpkgs/source-sans-pro/template b/srcpkgs/source-sans-pro/template
index 68dfd56264e..510f5a74e91 100644
--- a/srcpkgs/source-sans-pro/template
+++ b/srcpkgs/source-sans-pro/template
@@ -1,8 +1,8 @@
 # Template file for 'source-sans-pro'
 pkgname=source-sans-pro
-version=2.045
+version=3.006
 revision=1
-_relver="2.045R-ro/1.095R-it"
+_relver="3.006R"
 archs=noarch
 wrksrc="source-sans-pro-${_relver/\//-}"
 depends="font-util"
@@ -11,7 +11,7 @@ maintainer="WantToHelp <ghostinthecsh@gmail.com>"
 license="OFL-1.1"
 homepage="https://adobe-fonts.github.io/source-sans-pro/"
 distfiles="https://github.com/adobe-fonts/source-sans-pro/archive/${_relver}.tar.gz"
-checksum=01e78d7ff451545ff1eec6cf14b28f62135e430a7ba80d74a90efd5334fef7eb
+checksum=a384e8c3246490bb5eaf79eb9eb9e41d7f2d167bb7d36280156ec77ae8ddfda1
 font_dirs="/usr/share/fonts/OTF /usr/share/fonts/TTF"
 
 do_install() {
diff --git a/srcpkgs/sparse/template b/srcpkgs/sparse/template
index 3ea4849b2e8..206ccedeab1 100644
--- a/srcpkgs/sparse/template
+++ b/srcpkgs/sparse/template
@@ -1,6 +1,6 @@
 # Template file for 'sparse'
 pkgname=sparse
-version=0.6.0
+version=0.6.1
 revision=1
 build_style=gnu-makefile
 make_use_env=yes
@@ -9,7 +9,7 @@ maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="MIT"
 homepage="https://git.kernel.org/pub/scm/devel/sparse/sparse.git"
 distfiles="${homepage}/snapshot/${pkgname}-${version}.tar.gz"
-checksum=08676b6188ac09a12035ecebf9353d786762c74dd7f036595c53bcc03bbc9932
+checksum=b0502efa4c4d60d718b089af5659c40e1f972c1e246d59de1150a5e828d703ea
 
 pre_build() {
 	make_build_args="CC=$CC LD=$CC AR=$AR"
diff --git a/srcpkgs/spdx-licenses-list/template b/srcpkgs/spdx-licenses-list/template
index b91e8c55fcf..948cd4f767b 100644
--- a/srcpkgs/spdx-licenses-list/template
+++ b/srcpkgs/spdx-licenses-list/template
@@ -5,7 +5,7 @@ revision=1
 archs=noarch
 wrksrc="license-list-data-${version}"
 short_desc="SPDX License List"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://spdx.org"
 distfiles="https://github.com/spdx/license-list-data/archive/v${version}.tar.gz"
diff --git a/srcpkgs/spectacle/template b/srcpkgs/spectacle/template
index f2ea6f3edbe..42c573403dc 100644
--- a/srcpkgs/spectacle/template
+++ b/srcpkgs/spectacle/template
@@ -1,17 +1,17 @@
 # Template file for 'spectacle'
 pkgname=spectacle
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules kdoctools python qt5-host-tools qt5-qmake
  kcoreaddons"
 makedepends="kdeclarative-devel libkipi5-devel xcb-util-image-devel xcb-util-cursor-devel
- purpose-devel knewstuff-devel"
+ kwayland-devel purpose-devel knewstuff-devel"
 depends="qt5-tools"
 short_desc="KDE screenshot capture utility"
 maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/kde/kdegraphics/spectacle"
 distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=8ada4f765f81ee496f9fd00b74764690df9c479e343a035e363f7159f93c35a4
+checksum=4cf2f0903cec2787a03a8bbdbd219acc29ac412f352a4ff94ef50ae9a6eb459e
diff --git a/srcpkgs/speedtest-cli/template b/srcpkgs/speedtest-cli/template
index e5d2b4bd33e..6746ea3a35e 100644
--- a/srcpkgs/speedtest-cli/template
+++ b/srcpkgs/speedtest-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'speedtest-cli'
 pkgname=speedtest-cli
-version=2.1.1
+version=2.1.2
 revision=1
 archs=noarch
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Aaron Marcher <info@nulltime.net>"
 license="Apache-2.0"
 homepage="https://github.com/sivel/speedtest-cli"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=433675c19bd40c059da5d98c512874742405e8185afed47f8aa11a02ac61aa06
+checksum=a877142eec0ee8dda86519c36fe789480ed6fa603b016b620affd77fbf79b0d9
diff --git a/srcpkgs/spice-gtk/template b/srcpkgs/spice-gtk/template
index c6ac4a44595..0c042971ee2 100644
--- a/srcpkgs/spice-gtk/template
+++ b/srcpkgs/spice-gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'spice-gtk'
 pkgname=spice-gtk
 version=0.37
-revision=3
+revision=4
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
@@ -36,7 +36,8 @@ spice-gtk-devel_package() {
 	depends="gtk+3-devel pixman-devel libressl-devel opus-devel
 	 libva-devel libsasl-devel liblz4-devel usbredir-devel phodav-devel
 	 json-glib-devel gstreamer1-devel gst-plugins-base1-devel
-	 $(vopt_if gir libgirepository-devel) ${sourcepkg}-${version}_${revision}"
+	 spice-protocol $(vopt_if gir libgirepository-devel)
+	 ${sourcepkg}-${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
diff --git a/srcpkgs/spice/template b/srcpkgs/spice/template
index 296b96de6ce..e272e8ffced 100644
--- a/srcpkgs/spice/template
+++ b/srcpkgs/spice/template
@@ -17,6 +17,10 @@ homepage="http://www.spice-space.org"
 distfiles="http://www.spice-space.org/download/releases/spice-${version}.tar.bz2"
 checksum=b203b3882e06f4c7249a3150d90c84e1a90490d41ead255a3d2cede46f4a29a7
 
+if [ "$XBPS_TARGET_ENDIAN" != "le" ]; then
+	broken="SPICE server only works on little endian architectures"
+fi
+
 post_extract() {
 	sed -i 's/armv6hl/arm/g' configure	# "detects" cpu from triplet.
 }
diff --git a/srcpkgs/spigot/template b/srcpkgs/spigot/template
index 06f1a4ada43..e11ec242391 100644
--- a/srcpkgs/spigot/template
+++ b/srcpkgs/spigot/template
@@ -1,6 +1,6 @@
 # Template file for 'spigot'
 pkgname=spigot
-version=20190809.34f87c2
+version=20190901.1791406
 revision=1
 build_style=gnu-configure
 make_check_target="test"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://www.chiark.greenend.org.uk/~sgtatham/spigot/"
 distfiles="https://www.chiark.greenend.org.uk/~sgtatham/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=05763ecb046ac6215bf8edb40f29d3f6ccaf940514384c31f0ecbec373d6f491
+checksum=e6116e9cbe461a9da08b25d897efc41d159ea6366a0500b9905d791c0d2be129
 
 post_install() {
 	vlicense LICENCE
diff --git a/srcpkgs/spotify-adblock-linux/files/spotify-adblock.desktop b/srcpkgs/spotify-adblock-linux/files/spotify-adblock.desktop
new file mode 100644
index 00000000000..074ba5775a5
--- /dev/null
+++ b/srcpkgs/spotify-adblock-linux/files/spotify-adblock.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Type=Application
+Name=Spotify (adblock)
+GenericName=Music Player
+Icon=spotify-client
+TryExec=spotify
+Exec=env LD_PRELOAD=/usr/lib/spotify-adblock.so spotify %U
+Terminal=false
+MimeType=x-scheme-handler/spotify;
+Categories=Audio;Music;Player;AudioVideo;
+StartupWMClass=spotify
diff --git a/srcpkgs/spotify-adblock-linux/template b/srcpkgs/spotify-adblock-linux/template
new file mode 100644
index 00000000000..fc61feb19c3
--- /dev/null
+++ b/srcpkgs/spotify-adblock-linux/template
@@ -0,0 +1,20 @@
+# Template file for 'spotify-adblock-linux'
+pkgname=spotify-adblock-linux
+version=1.0
+revision=1
+build_style=gnu-makefile
+makedepends="libcurl-devel"
+short_desc="Spotify adblocker for Linux"
+maintainer="linarcx <linarcx@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/abba23/spotify-adblock-linux"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=811358fd2da2ca83e76e3a0dd5ce03ddab39fc19ae9831dd0ccaf4b74abd0804
+
+CFLAGS+=" -shared -fPIC"
+
+do_install() {
+	vmkdir usr/lib
+	vcopy "*.so" usr/lib
+	vinstall ${FILESDIR}/spotify-adblock.desktop 644 usr/share/applications/
+}
diff --git a/srcpkgs/spotify-tui/template b/srcpkgs/spotify-tui/template
new file mode 100644
index 00000000000..900440a90df
--- /dev/null
+++ b/srcpkgs/spotify-tui/template
@@ -0,0 +1,17 @@
+# Template file for 'spotify-tui'
+pkgname=spotify-tui
+version=0.6.2
+revision=1
+build_style=cargo
+hostmakedepends="pkg-config"
+makedepends="libressl-devel"
+short_desc="Spotify for the terminal"
+maintainer="Andrew Benson <abenson+void@gmail.com>"
+license="MIT"
+homepage="https://github.com/Rigellute/spotify-tui"
+distfiles="https://github.com/Rigellute/spotify-tui/archive/v${version}.tar.gz"
+checksum=fb741a0f1e69d547015efa5b0edde0600d2d0a02d4b056b31012e6d9058b94f6
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/sqlite-replication/template b/srcpkgs/sqlite-replication/template
index b5b1063d8ca..cd6cf735da9 100644
--- a/srcpkgs/sqlite-replication/template
+++ b/srcpkgs/sqlite-replication/template
@@ -1,10 +1,10 @@
 # Template file for 'sqlite-replication'
 pkgname=sqlite-replication
-version=3.28.0
-revision=1
+version=3.29.0
+revision=2
 wrksrc="sqlite-version-${version}-replication3"
 build_style=gnu-configure
-configure_args="--enable-wal-replication --enable-threadsafe --enable-dynamic-extensions --enable-fts5"
+configure_args="--enable-replication --enable-threadsafe --enable-dynamic-extensions --enable-fts5"
 hostmakedepends="tcl"
 makedepends="libedit-devel"
 short_desc="Replication Enabled SQL Database Engine in a C Library"
@@ -12,7 +12,7 @@ maintainer="Cameron Nemo <camerontnorman@gmail.com>"
 license="Public Domain"
 homepage="https://github.com/CanonicalLtd/sqlite"
 distfiles="${homepage}/archive/version-${version}+replication3.tar.gz"
-checksum=3e52fb92ef8f66ba640145941f05aabbffb4f422a0b9a42a97b6806e2c3c6812
+checksum=516ae04b7bef44b6de71fed99f41f1f11afc781495145c7bccf3c1e1073c37be
 replaces="sqlite>=3.8.11.1_3"
 provides="sqlite-${version}_${revision}"
 shlib_provides="libsqlite3.so"
@@ -26,9 +26,6 @@ CFLAGS+=" -DHAVE_FDATASYNC"
 disable_parallel_build=yes
 
 pre_configure() {
-	printf -- "D 2019-03-09T15:45:46\n" > manifest
-	printf -- "8250984a368079bb1838d48d99f8c1a6282e00bc" > manifest.uuid
-
 	sed -i -e 's/ -ltinfo//g' configure
 }
 
diff --git a/srcpkgs/sqlite/template b/srcpkgs/sqlite/template
index 137f3d6c8ff..204ff038c81 100644
--- a/srcpkgs/sqlite/template
+++ b/srcpkgs/sqlite/template
@@ -1,6 +1,6 @@
 # Template file for 'sqlite'
 pkgname=sqlite
-version=3.29.0
+version=3.30.1
 revision=1
 _amalgamationver=$(printf "%d%02d%02d00\n" ${version//./ })
 wrksrc="sqlite-autoconf-${_amalgamationver}"
@@ -8,12 +8,12 @@ build_style=gnu-configure
 configure_args="--enable-threadsafe --enable-dynamic-extensions --enable-fts5"
 makedepends="libedit-devel zlib-devel"
 short_desc="SQL Database Engine in a C Library"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="Public Domain"
 homepage="https://sqlite.org/"
 changelog="https://www.sqlite.org/releaselog/${version//./_}.html"
 distfiles="${homepage}/2019/sqlite-autoconf-${_amalgamationver}.tar.gz"
-checksum=8e7c1e2950b5b04c5944a981cb31fffbf9d2ddda939d536838ebc854481afd5b
+checksum=8c5a50db089bd2a1b08dbc5b00d2027602ca7ff238ba7658fabca454d4298e60
 
 CFLAGS="-DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_COLUMN_METADATA \
  -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE -DSQLITE_ENABLE_JSON1 \
diff --git a/srcpkgs/sqlmap/template b/srcpkgs/sqlmap/template
new file mode 100644
index 00000000000..be9d774e94d
--- /dev/null
+++ b/srcpkgs/sqlmap/template
@@ -0,0 +1,27 @@
+# Template file for 'sqlmap'
+pkgname=sqlmap
+version=1.3.9
+revision=1
+archs=noarch
+pycompile_dirs="usr/share/sqlmap"
+depends="python3"
+short_desc="Automatic SQL injection and database takeover tool"
+maintainer="Andrew Benson <abenson+void@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="http://sqlmap.org"
+distfiles="https://github.com/sqlmapproject/sqlmap/archive/${version}.tar.gz"
+checksum=44669d0ca2568d7595877d80ab1a36fe6f683a4382a1779459c7db5a7accd14a
+pycompile_version="$py3_ver"
+
+do_install() {
+	vmkdir usr/share/${pkgname}
+	for dir in data extra lib plugins tamper thirdparty sqlmap.py sqlmapapi.py; do
+		vcopy $dir usr/share/${pkgname}
+	done
+
+	vmkdir usr/bin
+	ln -sf /usr/share/${pkgname}/sqlmap.py ${DESTDIR}/usr/bin/
+	ln -sf /usr/share/${pkgname}/sqlmapapi.py ${DESTDIR}/usr/bin/
+
+	vsconf sqlmap.conf
+}
diff --git a/srcpkgs/squashfs-tools/patches/CVE-2015-4645.patch b/srcpkgs/squashfs-tools/patches/CVE-2015-4645.patch
deleted file mode 100644
index bb0f85e0577..00000000000
--- a/srcpkgs/squashfs-tools/patches/CVE-2015-4645.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- squashfs-tools/unsquash-4.c
-+++ squashfs-tools/unsquash-4.c
-@@ -31,9 +31,9 @@ static unsigned int *id_table;
- int read_fragment_table_4(long long *directory_table_end)
- {
- 	int res, i;
--	int bytes = SQUASHFS_FRAGMENT_BYTES(sBlk.s.fragments);
--	int  indexes = SQUASHFS_FRAGMENT_INDEXES(sBlk.s.fragments);
--	long long fragment_table_index[indexes];
-+	size_t bytes = SQUASHFS_FRAGMENT_BYTES(sBlk.s.fragments);
-+	size_t indexes = SQUASHFS_FRAGMENT_INDEXES(sBlk.s.fragments);
-+	long long *fragment_table_index;
- 
- 	TRACE("read_fragment_table: %d fragments, reading %d fragment indexes "
- 		"from 0x%llx\n", sBlk.s.fragments, indexes,
-@@ -44,6 +44,11 @@ int read_fragment_table_4(long long *directory_table_end)
- 		return TRUE;
- 	}
- 
-+	fragment_table_index = malloc(indexes*sizeof(long long));
-+	if(fragment_table_index == NULL)
-+		EXIT_UNSQUASH("read_fragment_table: failed to allocate "
-+			"fragment table index\n");
-+
- 	fragment_table = malloc(bytes);
- 	if(fragment_table == NULL)
- 		EXIT_UNSQUASH("read_fragment_table: failed to allocate "
diff --git a/srcpkgs/squashfs-tools/patches/fix-compat.patch b/srcpkgs/squashfs-tools/patches/fix-compat.patch
deleted file mode 100644
index 91ebfd97af3..00000000000
--- a/srcpkgs/squashfs-tools/patches/fix-compat.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- squashfs-tools/action.c
-+++ squashfs-tools/action.c
-@@ -1905,6 +1905,9 @@
- 	return 1;
- }
- 
-+#ifndef FNM_EXTMATCH
-+#define FNM_EXTMATCH 0
-+#endif
- 
- TEST_FN(name, ACTION_ALL_LNK, \
- 	return fnmatch(atom->argv[0], action_data->name,
---- squashfs-tools/mksquashfs.c
-+++ squashfs-tools/mksquashfs.c
-@@ -4391,6 +4391,9 @@
- 	return paths;
- }
- 
-+#ifndef FNM_EXTMATCH
-+#define FNM_EXTMATCH 0
-+#endif
- 
- int excluded_match(char *name, struct pathname *path, struct pathnames **new)
- {
---- squashfs-tools/pseudo.c
-+++ squashfs-tools/pseudo.c
-@@ -32,6 +32,7 @@
- #include <stdlib.h>
- #include <sys/types.h>
- #include <sys/wait.h>
-+#include <sys/stat.h>
- #include <ctype.h>
- 
- #include "pseudo.h"
---- squashfs-tools/unsquashfs.c
-+++ squashfs-tools/unsquashfs.c
-@@ -1410,6 +1410,9 @@
- 	free(paths);
- }
- 
-+#ifndef FNM_EXTMATCH
-+#define FNM_EXTMATCH 0
-+#endif
- 
- int matches(struct pathnames *paths, char *name, struct pathnames **new)
- {
diff --git a/srcpkgs/squashfs-tools/patches/vla-overlow.patch b/srcpkgs/squashfs-tools/patches/vla-overlow.patch
deleted file mode 100644
index a9840fe01f0..00000000000
--- a/srcpkgs/squashfs-tools/patches/vla-overlow.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- ./squashfs-tools/unsquashfs.c.orig
-+++ ./squashfs-tools/unsquashfs.c
-@@ -2099,7 +2099,9 @@
-  */
- void *inflator(void *arg)
- {
--	char tmp[block_size];
-+	char *tmp = malloc(block_size);
-+	if(tmp == NULL)
-+		EXIT_UNSQUASH("Out of memory allocating block buffer\n");
- 
- 	while(1) {
- 		struct cache_entry *entry = queue_get(to_inflate);
-@@ -2122,6 +2124,7 @@
-  		 */ 
- 		cache_block_ready(entry, res == -1);
- 	}
-+	free(tmp);
- }
- 
- 
diff --git a/srcpkgs/squashfs-tools/template b/srcpkgs/squashfs-tools/template
index 86cab25984e..28697ad93ad 100644
--- a/srcpkgs/squashfs-tools/template
+++ b/srcpkgs/squashfs-tools/template
@@ -1,20 +1,23 @@
 # Template file for 'squashfs-tools'
 pkgname=squashfs-tools
-version=4.3
-revision=6
+version=4.4
+revision=1
 wrksrc="squashfs${version}"
+build_wrksrc="squashfs-tools"
+build_style=gnu-makefile
 makedepends="zlib-devel lzo-devel liblzma-devel liblz4-devel"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://squashfs.sf.net/"
 short_desc="Tool to create and append to squashfs filesystems"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Duncaen <duncaen@voidlinux.org>"
 distfiles="${SOURCEFORGE_SITE}/squashfs/squashfs${version}.tar.gz"
-checksum=0d605512437b1eb800b4736791559295ee5f60177e102e4d4ccd0ee241a5f3f6
+checksum=a981b3f3f2054b5a2e658851a3c06a2460ad04a9a8a645e0afe063a63fdbb07e
 
 do_build() {
-	make -C ${pkgname} ${makejobs} XZ_SUPPORT=1 LZO_SUPPORT=1 LZMA_XZ_SUPPORT=1 LZ4_SUPPORT=1
+	make ${makejobs} XZ_SUPPORT=1 LZO_SUPPORT=1 LZMA_XZ_SUPPORT=1 LZ4_SUPPORT=1
 }
+
 do_install() {
-	vbin ${pkgname}/mksquashfs
-	vbin ${pkgname}/unsquashfs
+	vbin mksquashfs
+	vbin unsquashfs
 }
diff --git a/srcpkgs/stagit/patches/libgit2-0.28.patch b/srcpkgs/stagit/patches/libgit2-0.28.patch
deleted file mode 100644
index 84481bce0de..00000000000
--- a/srcpkgs/stagit/patches/libgit2-0.28.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/stagit-index.c b/stagit-index.c
-index e019793..6b25969 100644
---- stagit-index.c
-+++ stagit-index.c
-@@ -174,7 +174,7 @@ main(int argc, char *argv[])
- 
- 		if (git_repository_open_ext(&repo, repodir,
- 		    GIT_REPOSITORY_OPEN_NO_SEARCH, NULL)) {
--			e = giterr_last();
-+			e = git_error_last();
- 			fprintf(stderr, "%s: %s\n", argv[0], e->message);
- 			ret = 1;
- 			continue;
-diff --git a/stagit.c b/stagit.c
-index 093cdab..25be042 100644
---- stagit.c
-+++ stagit.c
-@@ -1101,7 +1101,7 @@ main(int argc, char *argv[])
- 
- 	if (git_repository_open_ext(&repo, repodir,
- 		GIT_REPOSITORY_OPEN_NO_SEARCH, NULL) < 0) {
--		e = giterr_last();
-+		e = git_error_last();
- 		fprintf(stderr, "%s: %s\n", argv[0], e->message);
- 		return 1;
- 	}
-
diff --git a/srcpkgs/stagit/template b/srcpkgs/stagit/template
index eab367ae840..c087227f26c 100644
--- a/srcpkgs/stagit/template
+++ b/srcpkgs/stagit/template
@@ -1,16 +1,16 @@
 # Template file for 'stagit'
 pkgname=stagit
-version=0.9
-revision=2
+version=0.9.2
+revision=1
 build_style=gnu-makefile
 make_install_args="MANPREFIX=/usr/share/man"
 makedepends="libgit2-devel"
 short_desc="Static git page generator"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="MIT"
-homepage="http://git.2f30.org/stagit"
-distfiles="http://dl.2f30.org/releases/${pkgname}-${version}.tar.gz"
-checksum=09e585c5908bee0208c9b2d457a716d2679d89ca7485da42ca8a06bd78bc2293
+homepage="https://codemadness.org/git/stagit/log.html"
+distfiles="https://codemadness.org/releases/stagit/${pkgname}-${version}.tar.gz"
+checksum=721cd7cfac479008e803eff5afd0c95ff9dbc640450afa5b844be82d8dfe0cba
 LDFLAGS="-lgit2"
 
 post_install() {
diff --git a/srcpkgs/starship/template b/srcpkgs/starship/template
new file mode 100644
index 00000000000..8f91dc73221
--- /dev/null
+++ b/srcpkgs/starship/template
@@ -0,0 +1,18 @@
+# Template file for 'starship'
+pkgname=starship
+version=0.24.0
+revision=1
+build_style=cargo
+build_helper="rust"
+hostmakedepends="pkg-config"
+makedepends="libgit2-devel"
+short_desc="Minimal, fast and customizable cross-shell prompt"
+maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"
+license="ISC"
+homepage="https://starship.rs"
+distfiles="https://github.com/starship/starship/archive/v${version}.tar.gz"
+checksum=f8cd71d7cf9b9a1ff57acd81f22960994bdaea58cfae813bd8e42146de431c0b
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/stow/template b/srcpkgs/stow/template
index 0f4b383f36c..4fc87c43888 100644
--- a/srcpkgs/stow/template
+++ b/srcpkgs/stow/template
@@ -1,7 +1,7 @@
 # Template file for 'stow'
 pkgname=stow
-version=2.2.2
-revision=2
+version=2.3.1
+revision=1
 archs=noarch
 build_style=gnu-configure
 make_check_target="test"
@@ -11,7 +11,7 @@ depends="${makedepends}"
 checkdepends="perl-Test-Output perl-IO-stringy"
 short_desc="GNU Stow is a symlink manager"
 maintainer="Martin Harrigan <martinharrigan@gmail.com>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/stow/"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=e2f77649301b215b9adbc2f074523bedebad366812690b9dc94457af5cf273df
+checksum=09d5d99671b78537fd9b2c0b39a5e9761a7a0e979f6fdb7eabfa58ee45f03d4b
diff --git a/srcpkgs/strace/template b/srcpkgs/strace/template
index 0962a81cdd1..618966e28e4 100644
--- a/srcpkgs/strace/template
+++ b/srcpkgs/strace/template
@@ -1,16 +1,16 @@
 # Template file for 'strace'
 pkgname=strace
-version=5.2
+version=5.3
 revision=1
 build_style=gnu-configure
 configure_args="--with-libunwind"
 makedepends="libunwind-devel"
 short_desc="System Call Tracer"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="LGPL-2.1-or-later"
 homepage="https://strace.io/"
 distfiles="https://github.com/strace/strace/releases/download/v${version}/strace-${version}.tar.xz"
-checksum=d513bc085609a9afd64faf2ce71deb95b96faf46cd7bc86048bc655e4e4c24d2
+checksum=6c131198749656401fe3efd6b4b16a07ea867e8f530867ceae8930bbc937a047
 
 case "$XBPS_TARGET_MACHINE" in
 	aarch64-musl) configure_args=; makedepends= ;;
@@ -27,6 +27,3 @@ pre_configure() {
 		*-musl) export CFLAGS+=" -Dsigcontext_struct=sigcontext";;
 	esac
 }
-post_install() {
-	vlicense COPYING
-}
diff --git a/srcpkgs/streamlink/template b/srcpkgs/streamlink/template
index cb680ac51ed..abcdc12c4ac 100644
--- a/srcpkgs/streamlink/template
+++ b/srcpkgs/streamlink/template
@@ -1,6 +1,6 @@
 # Template file for 'streamlink'
 pkgname=streamlink
-version=1.1.1
+version=1.2.0
 revision=1
 archs=noarch
 build_style=python3-module
@@ -16,7 +16,7 @@ license="BSD-2-Clause"
 homepage="https://streamlink.github.io/"
 changelog="https://raw.githubusercontent.com/streamlink/streamlink/master/CHANGELOG.md"
 distfiles="https://github.com/streamlink/streamlink/releases/download/${version}/streamlink-${version}.tar.gz"
-checksum=496c81804bbe534b47f6cf4d77aa6fae95347ebaab495277f9d2526543cbafa6
+checksum=7aa6e02d914e29fe2e344afd185760b11e46a6a31f9d99f7f9dc87b808812992
 
 export STREAMLINK_USE_PYCOUNTRY=1
 
diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template
index cef6d48f232..6cd7c898b54 100644
--- a/srcpkgs/stremio-shell/template
+++ b/srcpkgs/stremio-shell/template
@@ -1,7 +1,7 @@
 # Template file for 'stremio-shell'
 pkgname=stremio-shell
-version=4.4.25
-revision=2
+version=4.4.77
+revision=1
 _singleapplication_hash=6fbf6bffc848821d41a09ccd9fc0ede83bbbcdce
 build_style=qmake
 hostmakedepends="qt5-host-tools qt5-qmake"
@@ -10,14 +10,14 @@ makedepends="mpv-devel qt5-webview-devel qt5-webengine-devel
  qt5-quickcontrols2-devel qt5-quickcontrols chromaprint-devel"
 depends="qt5-quickcontrols qt5-quickcontrols2 virtual?nodejs-runtime"
 short_desc="Hub for video content aggregation"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.stremio.com"
 distfiles="https://github.com/Stremio/stremio-shell/archive/${version}.tar.gz
  https://github.com/itay-grudev/SingleApplication/archive/${_singleapplication_hash}.tar.gz
  https://dl.strem.io/four/v4.4.10/server.js
  https://dl.strem.io/four/v4.4.10/stremio.asar"
-checksum="f2f4f0432a9c84e6f4fc2039ee27cb3635ea4a9341f3f6c823fa7dc96a0a2f6b
+checksum="9e6643f41b454527f69317f03394d9f1cca31215c14d702edfec3a76f2519339
  11840ed3dc80a909980908e310dc370bca2f7f61c45101fdea00187f620a1ff1
  52e453dc24e291b863582b250f5633d45d9634cafe24ac68165854b17b31114e
  8abe09aa0c577b9be05a7343438f9a37718689f74b9d7a124590f5ba3bb2764f"
diff --git a/srcpkgs/stress-ng/template b/srcpkgs/stress-ng/template
index 62427dba3a5..6d987ee9341 100644
--- a/srcpkgs/stress-ng/template
+++ b/srcpkgs/stress-ng/template
@@ -1,6 +1,6 @@
 # Template file for 'stress-ng'
 pkgname=stress-ng
-version=0.10.01
+version=0.10.07
 revision=1
 build_style=gnu-makefile
 make_use_env=1
@@ -9,4 +9,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://kernel.ubuntu.com/~cking/stress-ng/"
 distfiles="http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${pkgname}-${version}.tar.xz"
-checksum=4a74f2a60b248dc7ff20e950facb4a7d010f46bf8c0cfcbed6fecf7c4daa8f3d
+checksum=85ae86587f605225cc736e1ddba6cc5fd129dfbba0f7d94df755e2e6ac5230e6
diff --git a/srcpkgs/strongswan/template b/srcpkgs/strongswan/template
index 542a3ff80bc..22b5eece3ce 100644
--- a/srcpkgs/strongswan/template
+++ b/srcpkgs/strongswan/template
@@ -1,6 +1,6 @@
 # Template file for 'strongswan'
 pkgname=strongswan
-version=5.8.0
+version=5.8.1
 revision=1
 build_style=gnu-configure
 # tpm support waits on libtss2
@@ -18,7 +18,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.strongswan.org/"
 changelog="https://wiki.strongswan.org/projects/strongswan/wiki/Changelog"
 distfiles="https://download.strongswan.org/${pkgname}-${version}.tar.bz2"
-checksum=15b1e10c7dd6253ab5d791fe9b9cb84624e24c118aecd9b90251b4e60daa0933
+checksum=d9af70acea5c054952ad1584916c1bf231b064eb6c8a9791dcb6ae90a769990c
 make_dirs="/etc/ipsec.d/ 0755 root root
  /etc/ipsec.d/aacerts 0755 root root
  /etc/ipsec.d/acerts 0755 root root
diff --git a/srcpkgs/sublime-merge/template b/srcpkgs/sublime-merge/template
index f82965570bc..363c82a52b2 100644
--- a/srcpkgs/sublime-merge/template
+++ b/srcpkgs/sublime-merge/template
@@ -1,6 +1,6 @@
 # Template file for 'sublime-merge'
 pkgname=sublime-merge
-version=1107
+version=1119
 revision=1
 archs="x86_64"
 wrksrc=sublime_merge
@@ -10,7 +10,7 @@ maintainer="Adelmo Junior <noblehelm@gmail.com>"
 license="Proprietary"
 homepage="https://www.sublimemerge.com"
 distfiles="https://download.sublimetext.com/sublime_merge_build_${version}_x64.tar.xz"
-checksum=70edbb16529d638ea41a694dbc5b1408c76fcc3a7d663ef0e48b4e89e1f19c71
+checksum=64b06320c0300923ade0901493cfd78e7f28598324f99d4c3609b3c85c5f1cea
 nopie=yes
 repository=nonfree
 
diff --git a/srcpkgs/sublime-text3/template b/srcpkgs/sublime-text3/template
index 778605a8510..e87de887ad0 100644
--- a/srcpkgs/sublime-text3/template
+++ b/srcpkgs/sublime-text3/template
@@ -1,6 +1,6 @@
 # Template file for 'sublime-text3'
 pkgname=sublime-text3
-version=3207
+version=3211
 revision=1
 depends="libpng gtk+ hicolor-icon-theme desktop-file-utils"
 short_desc="Sophisticated text editor for code, markup and prose"
@@ -10,10 +10,10 @@ homepage="http://www.sublimetext.com/3dev"
 
 if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
 	distfiles="https://download.sublimetext.com/sublime_text_3_build_${version}_x64.tar.bz2"
-	checksum=acb64f1de024a0f004888096afa101051e48d96c7a3e7fe96e11312d524938c4
+	checksum=0b3c8ca5e6df376c3c24a4b9ac2e3b391333f73b229bc6e87d0b4a5f636d74ee
 else
 	distfiles="https://download.sublimetext.com/sublime_text_3_build_${version}_x32.tar.bz2"
-	checksum=743dbb313fe8b5754c64972c59a6162e0519a9c375ffeedaf5f7558f15e1e212
+	checksum=480609962bbbd12128b5332c7831372b8851c13e160512730d1b0a6a835a3071
 fi
 
 repository="nonfree"
diff --git a/srcpkgs/sudo/template b/srcpkgs/sudo/template
index 9047ac6167a..7119eba3208 100644
--- a/srcpkgs/sudo/template
+++ b/srcpkgs/sudo/template
@@ -1,6 +1,6 @@
 # Template file for 'sudo'
 pkgname=sudo
-version=1.8.27
+version=1.8.28p1
 revision=1
 build_style=gnu-configure
 configure_args="--with-ignore-dot --with-insults=disabled --with-all-insults --with-env-editor
@@ -15,7 +15,7 @@ license="ISC"
 homepage="https://www.sudo.ws/"
 changelog="https://www.sudo.ws/repos/sudo/raw-file/tip/NEWS"
 distfiles="https://www.sudo.ws/dist/sudo-${version}.tar.gz"
-checksum=7beb68b94471ef56d8a1036dbcdc09a7b58a949a68ffce48b83f837dd33e2ec0
+checksum=23ba5a84af31e3b5ded58d4be6d3f6939a495a55561fba92c6941b79a6e8b027
 conf_files="/etc/pam.d/sudo /etc/sudoers"
 lib32disabled=yes
 
diff --git a/srcpkgs/supercollider/patches/bbcd068659ced596402dedc78f49fabfab6470bd.patch b/srcpkgs/supercollider/patches/bbcd068659ced596402dedc78f49fabfab6470bd.patch
deleted file mode 100644
index 319b8da6a53..00000000000
--- a/srcpkgs/supercollider/patches/bbcd068659ced596402dedc78f49fabfab6470bd.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From bbcd068659ced596402dedc78f49fabfab6470bd Mon Sep 17 00:00:00 2001
-From: David Runge <dave@sleepmap.de>
-Date: Sat, 29 Sep 2018 17:14:18 +0200
-Subject: [PATCH] server/supernova/utilities/time_tag.hpp: Adding static_cast
- to long for time_duration offset in microseconds to satisfy boost >= 1.67.0.
-
----
- server/supernova/utilities/time_tag.hpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git server/supernova/utilities/time_tag.hpp server/supernova/utilities/time_tag.hpp
-index 33b1effd80..3d0f21dba9 100644
---- server/supernova/utilities/time_tag.hpp
-+++ server/supernova/utilities/time_tag.hpp
-@@ -229,7 +229,7 @@ class time_tag
- #ifdef BOOST_DATE_TIME_POSIX_TIME_STD_CONFIG
-         time_duration offset = seconds(get_secs() - ntp_offset) + nanoseconds(get_nanoseconds());
- #else
--        time_duration offset = seconds(get_secs() - ntp_offset) + microseconds(get_nanoseconds()/1000);
-+        time_duration offset = seconds(get_secs() - ntp_offset) + microseconds(static_cast<long>(get_nanoseconds()/1000));
- #endif
-         return ptime(base, offset);
-     }
diff --git a/srcpkgs/supercollider/template b/srcpkgs/supercollider/template
index 985c52947ce..2101a22a160 100644
--- a/srcpkgs/supercollider/template
+++ b/srcpkgs/supercollider/template
@@ -1,6 +1,6 @@
 # Template file for 'supercollider'
 pkgname=supercollider
-version=3.10.2
+version=3.10.3
 revision=1
 wrksrc=SuperCollider-Source
 build_style=cmake
@@ -16,7 +16,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/supercollider/supercollider"
 distfiles="${homepage}/releases/download/Version-${version}/SuperCollider-${version}-Source-linux.tar.bz2"
-checksum=389a9b3ecad7907c31f97566a48a8b2c5c53b73a8ad8004f81a5e9cb9a0fdf7a
+checksum=e1ffc4720590aa67bdd435cd1345b78cb709fdf5c4cbc948cbb3c5af1637356b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel"
@@ -28,6 +28,7 @@ esac
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*);;
+	arm*) broken="depends on qt5-webengine";;
 	*) configure_args+=" -DSSE=OFF -DSSE2=OFF";;
 esac
 
diff --git a/srcpkgs/supermin/template b/srcpkgs/supermin/template
index 07fe80f46b3..126ee0d8ccd 100644
--- a/srcpkgs/supermin/template
+++ b/srcpkgs/supermin/template
@@ -1,7 +1,7 @@
 # Template file for 'supermin'
 pkgname=supermin
 version=5.1.20
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="ocaml ocaml-findlib pkg-config e2fsprogs cpio perl"
 makedepends="e2fsprogs-devel"
diff --git a/srcpkgs/svctl/template b/srcpkgs/svctl/template
index 006c398759f..b6dbc562b06 100644
--- a/srcpkgs/svctl/template
+++ b/srcpkgs/svctl/template
@@ -7,7 +7,7 @@ go_import_path="github.com/KenjiTakahashi/svctl"
 go_ldflags="-X main.Version=v${version}"
 short_desc="Interactive controller for runit"
 hostmakedepends="git"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/KenjiTakahashi/svctl"
 distfiles="https://github.com/KenjiTakahashi/svctl/archive/${version}.tar.gz"
diff --git a/srcpkgs/svgpart/template b/srcpkgs/svgpart/template
index 37aacd8ab9b..2142771093e 100644
--- a/srcpkgs/svgpart/template
+++ b/srcpkgs/svgpart/template
@@ -1,6 +1,6 @@
 # Template file for 'svgpart'
 pkgname=svgpart
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-host-tools qt5-qmake"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/svgpart.git"
 distfiles="${KDE_SITE}/applications/${version}/src/svgpart-${version}.tar.xz"
-checksum=7e1f4b3f8807e996b2acb496971bd7ebcb1e456ac090e269e42d15fce629858d
+checksum=6c6510b604bba3aebbeca136ec9534c416bc0ba55125227bdd0af2a86052855c
diff --git a/srcpkgs/swaks/template b/srcpkgs/swaks/template
index 1d706f35494..e9394bf0b20 100644
--- a/srcpkgs/swaks/template
+++ b/srcpkgs/swaks/template
@@ -1,6 +1,6 @@
 # Template file for 'swaks'
 pkgname=swaks
-version=20181104.0
+version=20190914.0
 revision=1
 archs=noarch
 hostmakedepends="perl"
@@ -10,7 +10,7 @@ maintainer="allan <mail@may.mooo.com>"
 license="GPL-2.0-only"
 homepage="http://www.jetmore.org/john/code/swaks/"
 distfiles="http://www.jetmore.org/john/code/${pkgname}/files/${pkgname}-${version}.tar.gz"
-checksum=023f7f8818ebcd638618327809cf1939c5ffcaf6c3d2572ef56179d68f683e58
+checksum=5733a51a5c3f74f62274c17dc825f177c22ed52703c97c3b23a5354d7ec15c89
 
 do_install() {
 	vbin swaks
diff --git a/srcpkgs/sway/template b/srcpkgs/sway/template
index 574ff5f90cd..a650b8c559c 100644
--- a/srcpkgs/sway/template
+++ b/srcpkgs/sway/template
@@ -1,6 +1,6 @@
 # Template file for 'sway'
 pkgname=sway
-version=1.1.1
+version=1.2
 revision=1
 build_style=meson
 conf_files="/etc/sway/config"
@@ -13,11 +13,15 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://swaywm.org"
 distfiles="https://github.com/swaywm/${pkgname}/archive/${version}.tar.gz"
-checksum=740bf97556c54da83937a255113d715aaa05e05b44d61fbe85e01b53ff1f9922
+checksum=9f79382577ee132111c290b4d1a1a3e114ef485595c30cf5f181a11575bda846
 
 build_options="elogind"
 desc_option_elogind="Uses elogind instead of setuid for privilege escalation"
 
+post_patch() {
+	vsed -e 's/werror=true/werror=false/g' -i meson.build
+}
+
 post_install() {
 	vlicense LICENSE
 	if [ -z "$build_option_elogind" ]; then
diff --git a/srcpkgs/swell-foop/patches/pivot_point.patch b/srcpkgs/swell-foop/patches/pivot_point.patch
new file mode 100644
index 00000000000..9ff27d5f40c
--- /dev/null
+++ b/srcpkgs/swell-foop/patches/pivot_point.patch
@@ -0,0 +1,32 @@
+--- src/game-view.vala	2019-09-09 21:09:07.000000000 +0200
++++ src/game-view.vala	2019-10-13 20:40:46.515571474 +0200
+@@ -398,8 +398,7 @@
+ 
+         set_content_gravity (Clutter.ContentGravity.CENTER);
+ 
+-        pivot_point.x = 0.5f;
+-        pivot_point.y = 0.5f;
++	set_pivot_point (0.5f, 0.5f);
+     }
+ 
+     /* Destroy the tile */
+@@ -438,8 +437,7 @@
+ 
+         set_content_gravity (Clutter.ContentGravity.CENTER);
+ 
+-        pivot_point.x = 0.5f;
+-        pivot_point.y = 0.5f;
++	set_pivot_point (0.5f, 0.5f);
+     }
+ }
+ 
+@@ -460,8 +458,7 @@
+ 
+         add_child (label);
+ 
+-        pivot_point.x = 0.5f;
+-        pivot_point.y = 0.5f;
++	set_pivot_point (0.5f, 0.5f);
+ 
+         this.scene_width = (float) width;
+         this.scene_height = (float) height;
diff --git a/srcpkgs/swell-foop/template b/srcpkgs/swell-foop/template
index d6f96dc37e3..1ff5ae68311 100644
--- a/srcpkgs/swell-foop/template
+++ b/srcpkgs/swell-foop/template
@@ -1,7 +1,7 @@
 # Template file for 'swell-foop'
 pkgname=swell-foop
-version=3.32.0
-revision=1
+version=3.34.0
+revision=2
 build_style=meson
 hostmakedepends="glib-devel itstool pkg-config vala"
 makedepends="clutter-gtk-devel"
@@ -10,4 +10,4 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Swell%20Foop"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=91ddc86b6d003e5755004004c74584531b1328cb604883b0deeb7b1ed888ec4a
+checksum=65a713e7702595a3f42a45dd2b3ab7ce6407cd1660427e564e5a5826c3a26ced
diff --git a/srcpkgs/sx/template b/srcpkgs/sx/template
index e95dc88cae7..d39555258a0 100644
--- a/srcpkgs/sx/template
+++ b/srcpkgs/sx/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-makefile
 depends="xorg-server xauth"
 short_desc="Posix script to start an xserver instance"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/Earnestly/sx"
 distfiles="https://github.com/Earnestly/sx/archive/${version}.tar.gz"
diff --git a/srcpkgs/synapse/patches/bump-python-dependencies.patch b/srcpkgs/synapse/patches/bump-python-dependencies.patch
deleted file mode 100644
index 06321a9e8d4..00000000000
--- a/srcpkgs/synapse/patches/bump-python-dependencies.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From c1a7db468d4dbb3958f5b480fcde760566962ba4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Johannes=20L=C3=B6thberg?= <johannes@kyriasis.com>
-Date: Tue, 8 Jan 2019 20:09:50 +0100
-Subject: [PATCH] Bump python_dependencies
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
----
- synapse/python_dependencies.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py
-index f71e21ff4..b49873781 100644
---- synapse/python_dependencies.py
-+++ synapse/python_dependencies.py
-@@ -62,7 +62,7 @@ REQUIREMENTS = [
-     "six>=1.10",
-     # prometheus_client 0.4.0 changed the format of counter metrics
-     # (cf https://github.com/matrix-org/synapse/issues/4001)
--    "prometheus_client>=0.0.18,<0.4.0",
-+    "prometheus_client>=0.0.18,<0.7.0",
- 
-     # we use attr.s(slots), which arrived in 16.0.0
-     # Twisted 18.7.0 requires attrs>=17.4.0
--- 
-2.21.0
-
-
diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index 616dae0c4ee..daae80e5792 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,6 +1,6 @@
 # Template file for 'synapse'
 pkgname=synapse
-version=0.99.3
+version=1.3.1
 revision=1
 archs=noarch
 build_style=python3-module
@@ -14,11 +14,11 @@ depends="python3-jsonschema python3-frozendict python3-canonicaljson
  python3-Jinja2 python3-psycopg2 python3-lxml python3-saml2 python3-treq
  python3-txacme python3-macaroons python3-sortedcontainers"
 short_desc="Matrix reference homeserver"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Pete <pete@port22.co.uk>"
 license="Apache-2.0"
 homepage="https://github.com/matrix-org/synapse"
 distfiles="https://github.com/matrix-org/synapse/archive/v${version}.tar.gz"
-checksum=60a2b4caaed3e23a8fe9b43406dbee695d60271650f332cf3df3fce675a68274
+checksum=7fd0a15b7b5970e5afd2faad296c95f0707fc51865861dda45e983ace151cee0
 
 conf_files="/etc/synapse/log_config.yaml"
 
diff --git a/srcpkgs/syncthing-gtk/template b/srcpkgs/syncthing-gtk/template
index 13c99b942cc..38ff8064cbf 100644
--- a/srcpkgs/syncthing-gtk/template
+++ b/srcpkgs/syncthing-gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'syncthing-gtk'
 pkgname=syncthing-gtk
 reverts="0.14.36_1"
-version=0.9.4.3
+version=0.9.4.4
 revision=1
 archs=noarch
 build_style=python2-module
@@ -9,9 +9,9 @@ hostmakedepends="python-setuptools"
 depends="syncthing python-dateutil libnotify librsvg python-bcrypt
  python-cairo gtk+3 python-gobject"
 short_desc="GTK3 and python based GUI for Syncthing"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Frank Steinborn <steinex@nognu.de>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/syncthing/syncthing-gtk"
 distfiles="https://github.com/syncthing/syncthing-gtk/archive/v${version}.tar.gz"
-checksum=058e13a8dd65c0024c92074dc5445b27278d71379d1843b7cbc84ee5c87afa12
+checksum=896ddaaba4ad0b8f090c5a381a28b3da759932314562cdd50ca288543b03ddcc
 nocross="gobject-introspection"
diff --git a/srcpkgs/syncthing-inotify/template b/srcpkgs/syncthing-inotify/template
index ed4c71c2f65..061c91aba27 100644
--- a/srcpkgs/syncthing-inotify/template
+++ b/srcpkgs/syncthing-inotify/template
@@ -6,7 +6,7 @@ build_style=go
 go_import_path="github.com/syncthing/syncthing-inotify"
 go_ldflags="-X main.Version=v${version}"
 short_desc="Inotify file watcher for Syncthing"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPLv2"
 homepage="https://github.com/syncthing/syncthing-inotify"
 distfiles="https://github.com/syncthing/syncthing-inotify/archive/v${version}.tar.gz"
diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index 1ee1faf8e2d..f7291fe36be 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,6 +1,6 @@
 # Template file for 'syncthing'
 pkgname=syncthing
-version=1.2.1
+version=1.3.0
 revision=1
 build_style=go
 go_import_path="github.com/syncthing/syncthing"
@@ -14,13 +14,14 @@ license="MPL-2.0"
 changelog="https://github.com/syncthing/syncthing/releases"
 homepage="http://syncthing.net/"
 distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz"
-checksum=4274126059f854fa166d4610d6797116ee56be8b804abc1f4c6b02f650b78f52
+checksum=c6bb52c108a30a610afcc1023949674ca66f24127cbd569ab64789f0071d72e7
 
 pre_build() {
 	GOARCH= go run script/genassets.go gui > ./lib/auto/gui.files.go
 }
 
 post_install() {
+	vinstall etc/firewall-ufw/syncthing 644 etc/ufw/applications.d
 	vlicense LICENSE
 	vdoc README.md
 }
diff --git a/srcpkgs/syndication/template b/srcpkgs/syndication/template
index b4c86e93ea0..883b6bd3fe6 100644
--- a/srcpkgs/syndication/template
+++ b/srcpkgs/syndication/template
@@ -1,7 +1,7 @@
 # Template file for 'syndication'
 pkgname=syndication
 reverts="18.08.0_1 18.08.0_2 18.08.1_1"
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/syndication-${version}.tar.xz"
-checksum=2803b2960dd23492ad002e0f23563c9f06500ddc144dd0be2e3e0ef2f6c1f576
+checksum=e609c7f36559d6081d4ffe5c3cf995d96c620f18550f14f274d4c717423713b4
 
 syndication-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/syntax-highlighting/template b/srcpkgs/syntax-highlighting/template
index d3ba5310378..1b0354af681 100644
--- a/srcpkgs/syntax-highlighting/template
+++ b/srcpkgs/syntax-highlighting/template
@@ -1,6 +1,6 @@
 # Template file for 'syntax-highlighting'
 pkgname=syntax-highlighting
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/frameworks/syntax-highlighting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=475392c03534d7b5301ff2e02461444e463ad4def985da81ad4b315660416721
+checksum=9a29d8311ab41d74edcea71795658193f5221517870ff5e8ee4b07cc38a9c023
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools syntax-highlighting qt5-devel qt5-tools-devel"
diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template
index 53afafc1e9c..636d3e54525 100644
--- a/srcpkgs/sysdig/template
+++ b/srcpkgs/sysdig/template
@@ -1,7 +1,7 @@
 # Template file for 'sysdig'
 pkgname=sysdig
-version=0.26.2
-revision=1
+version=0.26.4
+revision=2
 archs="i686 x86_64 ppc64le"
 build_style=cmake
 configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
@@ -19,17 +19,11 @@ license="Apache-2.0, MIT, GPL-2.0-only"
 homepage="http://www.sysdig.org/"
 changelog="https://github.com/draios/sysdig/releases"
 distfiles="https://github.com/draios/${pkgname}/archive/${version}.tar.gz"
-checksum=6f4f5b7b187c3774b6c374c1728b3f905ac18a945bde15151dcfb24c79abb441
+checksum=7c15ee25abf6cca850eaf6f4e42e25a1d9ad2b775ae794028f94afbd1ce9d271
 disable_parallel_build=yes
 dkms_modules="sysdig ${version}"
 nocross=yes
 
-case "$XBPS_TARGET_MACHINE" in
-        i686) 
-	broken="https://build.voidlinux.org/builders/i686_builder/builds/19262/steps/shell_3/logs/stdio"
-	;;
-esac
-
 post_extract() {
 	sed -i 's,"${DIR_ETC}/bash_completion.d",share/bash-completion/completions,g' scripts/CMakeLists.txt
 	sed -i '1i#include <sys/select.h>' userspace/libsinsp/mesos_collector.h
diff --git a/srcpkgs/sysexxer-ng/template b/srcpkgs/sysexxer-ng/template
new file mode 100644
index 00000000000..3b7cea47138
--- /dev/null
+++ b/srcpkgs/sysexxer-ng/template
@@ -0,0 +1,17 @@
+# Template file for 'sysexxer-ng'
+pkgname=sysexxer-ng
+version=1.0
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config"
+makedepends="boost-devel fltk-devel jack-devel libev-devel ncurses-devel rtmidi-devel"
+short_desc="Universal tool to exchange MIDI system-exclusive data"
+maintainer="bra1nwave <brainwave@openmailbox.org>"
+license="BSL-1.0"
+homepage="https://github.com/linuxmao-org/sysexxer-ng"
+distfiles="${homepage}/releases/download/v${version}/sysexxer-ng-${version}.tar.gz"
+checksum=66e2eb66b7ab34b8287bba3230009a311b7db1870c47911049666c523fced5a9
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/sysprof/template b/srcpkgs/sysprof/template
index 1e279c22d54..8703271a34d 100644
--- a/srcpkgs/sysprof/template
+++ b/srcpkgs/sysprof/template
@@ -1,17 +1,17 @@
 # Template file for 'sysprof'
 pkgname=sysprof
-version=3.32.0
-revision=2
+version=3.34.1
+revision=1
 build_style=meson
 configure_args="-Denable_gtk=true -Dsystemdunitdir=deleteme"
 hostmakedepends="pkg-config itstool glib-devel"
-makedepends="gtk+3-devel polkit-devel glib-devel elogind-devel"
+makedepends="gtk+3-devel libdazzle-devel polkit-devel glib-devel elogind-devel"
 short_desc="System-wide profiler for Linux"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
 homepage="http://sysprof.com/"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fc22a69e468701c5ec9036e960c6273afa1ed6a89df1f889fed49417add5554d
+checksum=844bbb8d8b65071b3bca96f8e921319ceef81f2d2c51fcc9da63a4b355c893d0
 
 # for ITS rules
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/sysstat/template b/srcpkgs/sysstat/template
index 8cced9ea327..b7d06501460 100644
--- a/srcpkgs/sysstat/template
+++ b/srcpkgs/sysstat/template
@@ -1,11 +1,10 @@
 # Template file for 'sysstat'
 pkgname=sysstat
-version=12.0.6
+version=12.1.7
 revision=1
 build_style=gnu-configure
 configure_args="--enable-copy-only --disable-file-attr
  --with-systemdsystemunitdir= --enable-install-cron"
-make_dirs="/var/log/sa 0755 root root"
 conf_files="/etc/default/sysstat /etc/default/sysstat.ioconf"
 hostmakedepends="pkg-config"
 depends="lm_sensors"
@@ -14,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://pagesperso-orange.fr/sebastien.godard/"
 distfiles="http://pagesperso-orange.fr/sebastien.godard/${pkgname}-${version}.tar.xz"
-checksum=dd141d82a0b2f6c6924676524b0ad8ae60a6410461869f959dc484e8c5096912
+checksum=e711110fdde0885d5edb54d38feb134e20de3e50b8be1f05922fd03c09f118c4
 
 post_extract() {
 	sed -i 's/lib64/lib/' configure
diff --git a/srcpkgs/systemsettings/template b/srcpkgs/systemsettings/template
index c3c6805eb26..a7f2c5633e9 100644
--- a/srcpkgs/systemsettings/template
+++ b/srcpkgs/systemsettings/template
@@ -1,6 +1,6 @@
 # Template file for 'systemsettings'
 pkgname=systemsettings
-version=5.16.4
+version=5.17.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later, GFDL-1.2"
 homepage="https://projects.kde.org/projects/plasma/systemsettings"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=73b78c3c5177aa3ba0ffe970a83cb8bea1ba8ac54420a6c8379d6e86cabda31e
+checksum=7b3d93bd3cd4c33b878aabff4bd9c8134ca7395a0290e59260464cf5d69f17f3
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" python qt5-qmake qt5-host-tools kconfig
diff --git a/srcpkgs/systemtap/template b/srcpkgs/systemtap/template
index 7a093786645..95069a7b977 100644
--- a/srcpkgs/systemtap/template
+++ b/srcpkgs/systemtap/template
@@ -1,6 +1,6 @@
 # Template file for 'systemtap'
 pkgname=systemtap
-version=4.0
+version=4.1
 revision=1
 archs="i686 x86_64 armv6l armv7l aarch64 ppc64le"
 build_style=gnu-configure
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://sourceware.org/systemtap/"
 distfiles="https://sourceware.org/systemtap/ftp/releases/systemtap-${version}.tar.gz"
-checksum=008cc22e8da8f7d16ce3bcc10d36fdd2024b79489c4da3d983e589555ca7c8d5
+checksum=8efa1ee2b34f1c6b2f33a25313287d59c8ed1b00265e900aea874da8baca1e1d
 
 systemtap-devel_package() {
 	depends="systemtap-${version}_${revision}"
diff --git a/srcpkgs/tab/template b/srcpkgs/tab/template
index 5329594a9d5..2044ed808f6 100644
--- a/srcpkgs/tab/template
+++ b/srcpkgs/tab/template
@@ -1,14 +1,14 @@
 # Template file for 'tab'
 pkgname=tab
-version=7.1
+version=7.2
 revision=1
-wrksrc="tkatchev-tab-0b0349843e91"
+wrksrc="tkatchev-tab-f2e160ebddf8"
 short_desc="Shell language for text/number manipulation"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSL-1.0"
 homepage="http://tkatchev.bitbucket.io/tab/"
 distfiles="https://bitbucket.org/tkatchev/${pkgname}/get/${version}.tar.bz2"
-checksum=4a9071f180927fa861c5b4914d56dd84c0008ec755082628da834ba679185932
+checksum=446703528a7e51601371240a8fb74665aa98b02b2c89034ed61705bb3ff488b4
 
 do_build() {
 	${CXX} ${CXXFLAGS} -std=c++11 -Wall -Iaxe *.cc -o tab ${LDFLAGS} -pthread -lm
diff --git a/srcpkgs/taisei/template b/srcpkgs/taisei/template
index 83e79f58c58..8919e75a452 100644
--- a/srcpkgs/taisei/template
+++ b/srcpkgs/taisei/template
@@ -1,18 +1,22 @@
 # Template file for 'taisei'
 pkgname=taisei
-version=1.3
+version=1.3.1
 revision=1
 wrksrc="taisei-v${version}"
 build_style=meson
 hostmakedepends="pkg-config python3-docutils"
-makedepends="SDL2_mixer-devel freetype-devel libwebp-devel libzip-devel"
+makedepends="SDL2_mixer-devel freetype-devel libwebp-devel libzip-devel opusfile-devel"
 depends="${pkgname}-data"
 short_desc="Free and open-source Touhou Project clone and fangame"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
-license="GPL-3.0-or-later"
+license="MIT"
 homepage="https://taisei-project.org"
 distfiles="https://github.com/taisei-project/taisei/releases/download/v${version}/taisei-v${version}.tar.xz"
-checksum=4d6ede1e8a512eedec76cc9105022b0f5a361d23841ec1607d06a22c170b843a
+checksum=86583a3a710093e63014a5ae6b68251a069cb25ada06c6f8d734f85f31adc985
+
+post_install() {
+	vlicense COPYING
+}
 
 taisei-data_package() {
 	short_desc+=" - data files"
diff --git a/srcpkgs/tarpaulin/template b/srcpkgs/tarpaulin/template
new file mode 100644
index 00000000000..d9791af1506
--- /dev/null
+++ b/srcpkgs/tarpaulin/template
@@ -0,0 +1,19 @@
+# Template file for 'tarpaulin'
+pkgname=tarpaulin
+version=0.9.0
+revision=1
+archs="x86_64*"
+build_style=cargo
+hostmakedepends="pkg-config cmake"
+makedepends="libressl-devel zlib-devel"
+short_desc="Code coverage tool for Rust/Cargo projects"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="MIT, Apache-2.0"
+homepage="https://github.com/xd009642/tarpaulin"
+distfiles="https://github.com/xd009642/tarpaulin/archive/${version}.tar.gz"
+checksum=e1812627338c3e4c272f280105f6d250ecc2d389b775bf6f24de13940758343b
+
+post_install() {
+	vlicense LICENSE-MIT
+	vlicense LICENSE-APACHE
+}
diff --git a/srcpkgs/tau/template b/srcpkgs/tau/template
new file mode 100644
index 00000000000..f93b3975ff9
--- /dev/null
+++ b/srcpkgs/tau/template
@@ -0,0 +1,29 @@
+# Template file for 'tau'
+pkgname=tau
+version=0.9.3
+revision=1
+build_style=meson
+build_helper=rust
+hostmakedepends="cargo pkg-config rust glib-devel"
+makedepends="gtk+3-devel rust-std"
+checkdepends="appstream-glib desktop-file-utils"
+short_desc="GTK frontend for the Xi text editor, written in Rust"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="MIT"
+homepage="https://gitlab.gnome.org/World/Tau"
+distfiles="https://gitlab.gnome.org/World/Tau/uploads/375ce054c0bc98e0c1a3e95fdcd4e46c/tau-${version}.tar.xz"
+checksum=e58b400e86fb7dd1a6610427732a6a360355e8f3b03712d518fb5438b6daae0b
+
+case $XBPS_MACHINE in
+	*-musl) broken="crashes rustc" ;;
+esac
+
+post_install() {
+	vlicense LICENSE
+}
+
+gxi_package() {
+	depends="tau>=${version}_${revision}"
+	build_style=meta
+	short_desc+=" (transitional dummy package)"
+}
diff --git a/srcpkgs/tbb/template b/srcpkgs/tbb/template
index 1cfffa8ef02..8705875175f 100644
--- a/srcpkgs/tbb/template
+++ b/srcpkgs/tbb/template
@@ -1,8 +1,8 @@
 # Template file for 'tbb'
 pkgname=tbb
-version=2019.U8
+version=2019.U9
 revision=1
-archs="i686* x86_64* armv7l* aarch64* ppc64le* ppc64"
+archs="i686* x86_64* armv7l* aarch64* ppc*"
 # version rewrite: 2017_U7 (upstream) => 2017.7 (xbps)
 _ver=${version/./_}
 wrksrc="${pkgname}-${_ver}"
@@ -13,7 +13,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://www.threadingbuildingblocks.org"
 distfiles="https://github.com/intel/tbb/archive/${_ver}.tar.gz"
-checksum=7b1fd8caea14be72ae4175896510bf99c809cd7031306a1917565e6de7382fba
+checksum=15652f5328cf00c576f065e5cd3eaf3317422fe82afb67a9bcec0dc065bd2abe
 
 case "$XBPS_TARGET_MACHINE" in
 	armv7l*)
diff --git a/srcpkgs/tcpdump/template b/srcpkgs/tcpdump/template
index f0743609837..0b4b94eea61 100644
--- a/srcpkgs/tcpdump/template
+++ b/srcpkgs/tcpdump/template
@@ -1,7 +1,7 @@
 # Template file for 'tcpdump'
 pkgname=tcpdump
-version=4.9.2
-revision=5
+version=4.9.3
+revision=1
 build_style=gnu-configure
 configure_args="td_cv_buggygetaddrinfo=no"
 makedepends="libpcap-devel libressl-devel"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://www.tcpdump.org"
 distfiles="https://www.tcpdump.org/release/${pkgname}-${version}.tar.gz"
-checksum=798b3536a29832ce0cbb07fafb1ce5097c95e308a6f592d14052e1ef1505fe79
+checksum=2cd47cb3d460b6ff75f4a9940f594317ad456cfbf2bd2c8e5151e16559db6410
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/teamspeak3/template b/srcpkgs/teamspeak3/template
index 5e7b3fdd488..4be6a87dd5e 100644
--- a/srcpkgs/teamspeak3/template
+++ b/srcpkgs/teamspeak3/template
@@ -1,6 +1,6 @@
 # Template file for 'teamspeak3'
 pkgname=teamspeak3
-version=3.3.0
+version=3.3.2
 revision=1
 archs="i686 x86_64"
 wrksrc=teamspeak3
@@ -18,11 +18,11 @@ noverifyrdeps=yes
 if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
 	_pkg="TeamSpeak3-Client-linux_amd64-${version}"
 	distfiles="https://files.teamspeak-services.com/releases/client/${version}/${_pkg}.run"
-	checksum=0a8d31e59bb140fd3c9221286c75fb9a68fbf97530f88ab6f311932b5733488c
+	checksum=f1c2c399b4277bb7ffd5ffdf82260949c02ebe4df517f6dc2ab2b763743321d9
 elif [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
 	_pkg="TeamSpeak3-Client-linux_x86-${version}"
 	distfiles="https://files.teamspeak-services.com/releases/client/${version}/${_pkg}.run"
-	checksum=2506871bc4382a16086df41c469fd7a4445e644927d9eaca1e876f7b30659c12
+	checksum=c2fa7272a7542eb7f15170b386b8b2597e34aca8c5afcdff429b2c46672f5433
 else
 	broken="No known upstream client for this architecture"
 fi
diff --git a/srcpkgs/telegram-desktop/files/Telegram.cmake b/srcpkgs/telegram-desktop/files/Telegram.cmake
index 456d2eed261..218facfc506 100644
--- a/srcpkgs/telegram-desktop/files/Telegram.cmake
+++ b/srcpkgs/telegram-desktop/files/Telegram.cmake
@@ -73,12 +73,14 @@ include(TelegramCodegen)
 set_property(SOURCE ${TELEGRAM_GENERATED_SOURCES} PROPERTY SKIP_AUTOMOC ON)
 
 set(QRC_FILES
-	Resources/qrc/telegram.qrc
-	Resources/qrc/telegram_emoji_1.qrc
-	Resources/qrc/telegram_emoji_2.qrc
-	Resources/qrc/telegram_emoji_3.qrc
-	Resources/qrc/telegram_emoji_4.qrc
-	Resources/qrc/telegram_emoji_5.qrc
+	Resources/qrc/telegram/sounds.qrc
+	Resources/qrc/telegram/telegram.qrc
+	Resources/qrc/emoji_1.qrc
+	Resources/qrc/emoji_2.qrc
+	Resources/qrc/emoji_3.qrc
+	Resources/qrc/emoji_4.qrc
+	Resources/qrc/emoji_5.qrc
+	Resources/qrc/emoji_preview.qrc
 
 	# This only disables system plugin search path
 	# We do not want this behavior for system build
@@ -139,6 +141,8 @@ file(GLOB SUBDIRS_EXTRA_FILES
 	SourceFiles/info/feed/*.cpp
 	SourceFiles/info/channels/*.cpp
 	SourceFiles/history/feed/*.cpp
+	SourceFiles/ui/platform/mac/*.cpp
+	SourceFiles/ui/platform/win/*.cpp
 )
 list(REMOVE_ITEM SUBDIRS_SOURCE_FILES ${SUBDIRS_EXTRA_FILES})
 
diff --git a/srcpkgs/telegram-desktop/files/TelegramCodegenTools.cmake b/srcpkgs/telegram-desktop/files/TelegramCodegenTools.cmake
index 2021cb9a648..22a52583f9c 100644
--- a/srcpkgs/telegram-desktop/files/TelegramCodegenTools.cmake
+++ b/srcpkgs/telegram-desktop/files/TelegramCodegenTools.cmake
@@ -13,6 +13,8 @@ include_directories(${TELEGRAM_SOURCES_DIR})
 file(GLOB CODEGEN_COMMON_SOURCES
 	${TELEGRAM_SOURCES_DIR}/codegen/common/*.h
 	${TELEGRAM_SOURCES_DIR}/codegen/common/*.cpp
+	${TELEGRAM_SOURCES_DIR}/base/crc32hash.cpp
+	${TELEGRAM_SOURCES_DIR}/base/crc32hash.h
 )
 
 add_library(codegen_common OBJECT ${CODEGEN_COMMON_SOURCES})
diff --git a/srcpkgs/telegram-desktop/patches/stdafx.h.patch b/srcpkgs/telegram-desktop/patches/stdafx.h.patch
new file mode 100644
index 00000000000..1202a268f6d
--- /dev/null
+++ b/srcpkgs/telegram-desktop/patches/stdafx.h.patch
@@ -0,0 +1,19 @@
+--- Telegram/SourceFiles/stdafx.h	2019-09-10 17:30:47.000000000 +0200
++++ -	2019-09-18 14:03:45.704797349 +0200
+@@ -60,6 +60,8 @@
+ #include <QtCore/QString>
+ #include <QtCore/QStringList>
+ #include <QtCore/QVector>
++#include <QtNetwork/QNetworkProxy>
++#include <QtNetwork/QTcpSocket>
+ 
+ #include <QtGui/QIcon>
+ #include <QtGui/QImage>
+@@ -119,6 +121,7 @@
+ 
+ #include "base/basic_types.h"
+ #include "logs.h"
++#include "scheme.h"
+ #include "core/utils.h"
+ #include "config.h"
+ 
diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index ccd9b9a9e93..be11cde6cfb 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
-version=1.8.2
+version=1.8.15
 revision=1
 _libtgvoip_commit=d4a0f719ffd8d29e88474f67abc9fc862661c3b9
 _GSL_commit=d846fe50a3f0bb7767c7e087a05f4be95f4da0ec
@@ -17,8 +17,8 @@ hostmakedepends="pkg-config qt5-qmake qt5-host-tools python"
 makedepends="alsa-lib-devel ffmpeg-devel gtk+3-devel libappindicator-devel
  libdbusmenu-glib-devel libopenal-devel minizip-devel opus-devel xxHash-devel
  $(vopt_if pulseaudio 'pulseaudio-devel') qt5-devel range-v3 libva-devel
- rapidjson liblz4-devel rlottie-devel"
-depends="qt5-imageformats qt5>=5.13.0<5.13.1"
+ rapidjson liblz4-devel rlottie-devel MesaLib-devel"
+depends="qt5-imageformats qt5>=5.13.1<5.13.2"
 short_desc="Telegram Desktop messaging app"
 maintainer="John <johnz@posteo.net>"
 license="GPL-3.0-or-later WITH OpenSSL"
@@ -30,7 +30,7 @@ distfiles="https://github.com/telegramdesktop/tdesktop/archive/v${version}.tar.g
  https://github.com/mapbox/variant/archive/${_variant_commit}.tar.gz
  https://github.com/telegramdesktop/crl/archive/${_crl_commit}.tar.gz
  https://github.com/catchorg/Catch2/archive/${_Catch_commit}.tar.gz"
-checksum="bbacd3aa6ae5f78321346e9bff0b202e8aa64fccafcb06e5e2777c2f0cd908c6
+checksum="68bb6c3d007fe21847286815f22c2532a7cf9c247dc2781d749ebeb40f02ed99
  bb75188b900907a5b00594ad3ddb78195c8d1fdc144e5a458b314dd666eba996
  be81db4ab1b57102a0fa1cd0c4a6469294eb9daf24294347592245b754f65ff6
  aa794dfefe0a90501587e36d977b958d0df888503117a8d9aa43dc14f8526d9d
@@ -45,7 +45,8 @@ case $XBPS_TARGET_MACHINE in
 	mips*)
 		broken="unsupported"
 		;;
-	armv[56]*)
+	ppc64*) ;;
+	armv[56]*|ppc*)
 		makedepends+=" libatomic-devel"
 		configure_args+=" -DUSE_LIBATOMIC=ON"
 		;;
diff --git a/srcpkgs/telepresence/template b/srcpkgs/telepresence/template
index fbf48bb2e44..17300f3b548 100644
--- a/srcpkgs/telepresence/template
+++ b/srcpkgs/telepresence/template
@@ -1,6 +1,6 @@
 # Template file for 'telepresence'
 pkgname=telepresence
-version=0.101
+version=0.102
 revision=1
 archs=noarch
 build_style=python3-module
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://www.telepresence.io"
 changelog="https://raw.githubusercontent.com/telepresenceio/telepresence/master/docs/reference/changelog.md"
 distfiles="https://github.com/datawire/telepresence/archive/${version}.tar.gz"
-checksum=5aa120fbc13ef6f9404f2809e534f13378a741559bdf9a318ca89a7d7225e4d1
+checksum=f5b5a7da8504dbfdcee9c25baaad3c9c06671a483918245391400e2ed20885e0
 
 post_build() {
 	packaging/build-sshuttle.py
@@ -21,5 +21,4 @@ post_build() {
 
 post_install() {
 	vbin dist/sshuttle-telepresence
-	vlicense LICENSE
 }
diff --git a/srcpkgs/termdown/template b/srcpkgs/termdown/template
new file mode 100644
index 00000000000..90a4a894d42
--- /dev/null
+++ b/srcpkgs/termdown/template
@@ -0,0 +1,15 @@
+# Template file for 'termdown'
+pkgname=termdown
+version=1.16.0
+revision=1
+archs=noarch
+build_style=python3-module
+pycompile_module="termdown.py"
+hostmakedepends="python3-setuptools"
+depends="python3-setuptools python3-dateutil python3-click python3-pyfiglet"
+short_desc="Countdown timer and stopwatch in your terminal"
+maintainer="Illia Shestakov <ishestakov@airmail.cc>"
+license="GPL-3.0-only"
+homepage="https://github.com/trehn/termdown"
+distfiles="https://github.com/trehn/termdown/archive/${version}.tar.gz"
+checksum=bab26e830a6e3f7758e1daccb2580aec094a257f5631546aa0f66bc35c3a37bc
diff --git a/srcpkgs/terraform/template b/srcpkgs/terraform/template
index d7f3544691d..625f18da658 100644
--- a/srcpkgs/terraform/template
+++ b/srcpkgs/terraform/template
@@ -1,6 +1,6 @@
 # Template file for 'terraform'
 pkgname=terraform
-version=0.12.6
+version=0.12.10
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/$pkgname"
@@ -9,4 +9,4 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MPL-2.0"
 homepage="https://www.terraform.io/"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=df108a45f5ba2658eed844c3a6647117324c99770e06cbd549b26dd7c20ee623
+checksum=289d5287fda0bb870c1fb1ed504523bf24885ccf763b9547d91f8225310dc4f5
diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index fdb0f81f130..8b34e50f2f1 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -1,6 +1,6 @@
 # Template file for 'terragrunt'
 pkgname=terragrunt
-version=0.19.12
+version=0.20.4
 revision=1
 build_style=go
 go_import_path="github.com/gruntwork-io/$pkgname"
@@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 homepage="https://github.com/gruntwork-io/terragrunt"
 distfiles="$homepage/archive/v$version.tar.gz"
-checksum=53b885321feb091ddd82800eaf202aef7b1176a35be3fcf0a77f2e1c46c307f0
+checksum=48105e1a8127c5fffd81d64d1d2915aa9459f3fd9cc20504e805ca77e735539f
 
 pre_build() {
 	git config --global http.https://gopkg.in.followRedirects true
diff --git a/srcpkgs/texlive-bin/template b/srcpkgs/texlive-bin/template
index da83344e453..ecf0cebc83e 100644
--- a/srcpkgs/texlive-bin/template
+++ b/srcpkgs/texlive-bin/template
@@ -9,16 +9,17 @@ license="GPL-2"
 homepage="http://tug.org/texlive/"
 provides="texlive-${version}_${revision}"
 
+case "$XBPS_TARGET_MACHINE" in
+	i686) _tlarch=i386-linux;;
+	x86_64) _tlarch=x86_64-linux;;
+	x86_64-musl) _tlarch=x86_64-linuxmusl;;
+	arm*) _tlarch=armhf-linux;;
+	aarch64) _tlarch=aarch64-linux;;
+	*) broken="$XBPS_TARGET_MACHINE is not supported";;
+esac
+
 do_install() {
 	vmkdir etc/profile.d
-	case "$XBPS_TARGET_MACHINE" in
-		i686) tlarch=i386-linux;;
-		x86_64) tlarch=x86_64-linux;;
-		x86_64-musl) tlarch=x86_64-linuxmusl;;
-		arm*) tlarch=armhf-linux;;
-		aarch64) tlarch=aarch64-linux;;
-		*) broken="$XBPS_TARGET_MACHINE is not supported";;
-	esac
-	sed -e "s/@@ARCH@@/${tlarch}/; s/@@VERSION@@/${version}/" \
+	sed -e "s/@@ARCH@@/${_tlarch}/; s/@@VERSION@@/${version}/" \
 		${FILESDIR}/texlive.sh >${DESTDIR}/etc/profile.d/texlive.sh
 }
diff --git a/srcpkgs/thermald/template b/srcpkgs/thermald/template
index ba6786c6d99..daa5d9eb5b7 100644
--- a/srcpkgs/thermald/template
+++ b/srcpkgs/thermald/template
@@ -1,6 +1,6 @@
 # Template file for 'thermald'
 pkgname=thermald
-version=1.8
+version=1.9
 revision=1
 _pkgname=thermal_daemon
 wrksrc="${_pkgname}-${version}"
@@ -13,7 +13,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2"
 homepage="https://github.com/01org/${_pkgname}"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=662456eff5b7ee5a42e54b8a667d002d3a4dec5cacbddc5e1ab5ec94dab218c6
+checksum=d8f40bce80fb8303a0c103d2531d0e4cc1caad0a8d027cd26a1b5b10cdaae4e3
 conf_files='/etc/thermald/*'
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/thingylaunch/template b/srcpkgs/thingylaunch/template
index 0b9bfded2fd..5e862376125 100644
--- a/srcpkgs/thingylaunch/template
+++ b/srcpkgs/thingylaunch/template
@@ -7,7 +7,7 @@ configure_args="-DUSE_XCB=ON"
 hostmakedepends="pkg-config"
 makedepends="xcb-util-wm-devel xcb-util-keysyms-devel"
 short_desc="X11 application launcher with tab-completion, history, and bookmarks"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD"
 homepage="https://gahr.ch/thingylaunch/"
 distfiles="https://github.com/gahr/${pkgname}/archive/${version}.tar.gz"
diff --git a/srcpkgs/threadweaver/template b/srcpkgs/threadweaver/template
index 3257d177460..a677fa9b3ff 100644
--- a/srcpkgs/threadweaver/template
+++ b/srcpkgs/threadweaver/template
@@ -1,6 +1,6 @@
 # Template file for 'threadweaver'
 pkgname=threadweaver
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/frameworks/threadweaver"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e7a0cecfaa60c7a8e4bdd4dfe842fb54a344d331a6c62316c147d8dc2a5e5843
+checksum=4fb56509b42cf02750c063531c981d5a663210e628dd280b7a6c5755ad01497c
 
 threadweaver-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/thunderbird-i18n/template b/srcpkgs/thunderbird-i18n/template
index 64f51e0df9e..75f5a6808f8 100644
--- a/srcpkgs/thunderbird-i18n/template
+++ b/srcpkgs/thunderbird-i18n/template
@@ -1,12 +1,12 @@
 # Template file for 'thunderbird-i18n'
 pkgname=thunderbird-i18n
-version=60.8.0
-revision=1
+version=68.1.0
+revision=2
 build_style=meta
-homepage="https://www.thunderbird.net/"
 short_desc="Thunderbird language packs"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MPL-2.0"
+homepage="https://www.thunderbird.net/"
 
 create_wrksrc=yes
 
@@ -96,58 +96,58 @@ _pkgtmpl() {
 	}
 }
 
-checksum="3a82402cb19f5750448596246cca7d00569b54a2fd79e2e69be29a477fa0c66d
- 424f45a8e2a7adbfce468fcb42a6e079baa5620f358ae8a0296e913d77c269ab
- 90e30da3ae53c1ff00053ce24437f35903d684ca321ccfba63b8dc27cbdd1570
- 08d0626bf8aceff1b06486be9bce40718a992d72c23bd8e4d5e02facd57b06a7
- ad978b3a02f884b3606c8daead800a1062ffaf6caa304eac56a081e97cb027f5
- 154a489330a5e56fa975e56411fd51f5ea3e76e83580f0b242c2801397526efb
- 19cd65ec1f212681c0cb35e59d2a2fbf6c513a9f9c5fa88775993725ff3b4107
- 761f555123211c36e4fd919d3131f66b5ff9ccd5b8c7fbed3d49b3637d2d727c
- 48a106e1c88feb79ab6ce1e6e60eaaa179e711193753997591ccfe963b2bacf5
- 52af378833f2ed12b29c3d65114f20174e0ae2ac9b33d278f564fdd8dce8fb44
- 2015ff789f559b223d6cae477b072ff7cbaa884d8440b482f82486ed9d580a1d
- 3d633f451764beec8fee9232c5ed6db58ac76c687f5c5b16e3d41727103c5e1d
- d0317fc45ece1c79ca4db28cd7f54d967cb58039116ea1b3167fe905bb220471
- 15ac96008cb1bd14565ad4263d54acebb6ac41ea8cb88a140800b21592ad008e
- ba70eceddeeb10dd9303437e0f51fd52d1c95fd3bc7cbc3cccc846a9784c2304
- 5685cede9c0f12b1ab12652315b82f7c778a16b75da74e645669a3ebef4536c8
- 6c206ca642f9211ff88e3070cb49f42967ea3a945bc12f1ab057ff0cbc42e17d
- 44e82253413a3700f3001c0053121ee80d2a3146b97c3ccaf8ed676d6d063a2c
- f8a2f7d6fbebc04f38bb8598da1685a57344a974dbedfc144f11567726cd48f4
- 01c055021d4d7a84b002a0d21b60c4a5ac7e242f27e9cf88fc0323c3fb7a325a
- 8660fd33e60943664adaa0ec317e428baef5bb764ce1e64b575cbbe9bf078993
- f4e64e98e5c55e716752ebf055ed2596b65038dae1a1891c557aac1409e803d4
- 1d94d187026f65d58a884c6a2a26c5eec906e2b4248be2e307f07bffaf215d78
- 3d95017f9e31d3c85988d4be05acf8d65da6b8cfb1cd337ccacdf5bf0ef52011
- 13d62c97b8004635814ab83afdf69535a1adacc4967089c2a00e2a9c8fad7c7a
- 25f2505a409abf77d773ffe3e858f6916b9c11a27c9c064c883343ee5d07c0e8
- 71e6ea1ed225dca3b8e40003b8422b1a9b94d83ff76c68550cd00a3dec77c9c9
- ad1777b07ea9f3c0f69348511b2647dd262c516b6f6a4339a823777d67f04a7e
- 84c4c1fbca7f8a4d8bbf58b0e674976c71b5bc2d992f57fbf56ba7d7eaf6469f
- ee485bf384d62c5fbe9380174d12e81242b17776e421a61b2600ab4833a0af97
- df9ab4b9162829cd01b405167a074c79ee326ceb7b5be4b77b545637b8235bfc
- 304471f154f4b9b347cc24f151d7da244df7789663eaaeb2fef4c2864c7be364
- eebe9383c8d78c1f861f8bc11d5d707ff8b7d3b03dc7c4a41e6f6041aabc3d5a
- 2c2ad8521b2ba99cfa458dab960e8cf4470e74681f527864df5553c82677efad
- 835e2fc54b2d38751859251e05e14141682edf47d6df5897f820716aa1b60a1a
- a1aa783ef7eb3180ea5638d3aef83deccbd9857d8d6208381a75085abfee4833
- 3457079f767f17b1a5ec0c60f9acb0546c3634d26faaf126fc43884585953081
- ed01b08d542b6d3a3eaa26894cdd8bda59d1459ffc7a87c705ee8aa40539e089
- 1ad125f6c2f79ed9a7acd576e724b72bd7075ec7f31ffc5d917239d09562fc32
- 2137096acb589bd68b7ffe566acf61eb35982e185491bc72ca2eac2c052aec9d
- 1a4863812d27e352b9695ca8e389c523fb48c40a8d7f5c3d283ce57ac34653e0
- f9702a01f64d65edf737e8fb3125b866c5aebd8d4c448ae5500690ea8abb2fab
- f73f27ff403203fc745b527a67bf8e07027b4266dcd2a44c4b613298503a70da
- 888a6d43c3ada7e08086877e4e0b81946ac6e887c39cc4ddf3da60bdeecace4e
- 7382cfb3792a86c2ba647ba116673862bb532841b8f2435e60c502fbdd316ccf
- 5fbfd5ca4672f9f5e12e3e30735aac59c6aaba3035af8fe060d8785d43ee4aae
- f3b848247997509b21d075f48c1b57993e1795c78aa990e26ef2e416781ab541
- f1c6eb5df36fff653fadc3375f7b952154f0f76cccfbe5a1187242b431e5a69f
- 1e44a272833d00825015db35e3d5438ad4af1c83ec2b5406430bbf7645660330
- fccd9a9e53ab4ef287a9c02062befcf62c02899bb04bb8488ecab009d9b3b84b
- d418bb9b7e057fa25901a29bc07d740ddce4eb134c8cd8a757de97b0cc6e81e6
- ed7586c033b1190c3e239c56c4051750495a1593c1f66e6cdbc711f6d338b2ac
- 83534ec01cbca94d35e492048d3f9c123c8db01556107925cea069b318b0a3be
- 034c60b4c86ad7df2d51fe9e14a20376ebcd582d599aca9600ea35a244c64544
- 857cfd43c0de9afe2bb7054c3f2a30100e887ef368b81055ffdf07f6c11e7a93"
+checksum="299c3cd104a772caddb3f9846d9f5a9ed4fe458107d20fbc572c6f64ff8dd803
+ 4b2fd0ccedaa53d563109c49285ab94fb3253574bac47e9f15e08f9292822f0b
+ c9c3ef83e168053ea643634bb68be3bf535f5fa034baf510037b039caae2be3b
+ 0ab37e7610d867ccee8cbd60225e3411a1903bb66cf122ea0a76b8a3143240d6
+ 2ed1f39b05d7c796e72991b295dd7ed0a379a82d9e04eb71a02988d31bb50c9c
+ 5b8f52004ebb534bf56b7f50a777cfd75b9a9afe1e56599d140bacb6070a9e2d
+ 8fe713b8e40ef6dbcaf0c9b25a746c6357ca9f8199b4f260d70fa52df32b2e8f
+ 1de5dcb10200cc0f4c18460818e8f4eaa7d6935798823ac7b940bdb23bd71105
+ 507a951afd321672aa3afdf3929dcdd115a0467b6c9a44fbd1a8f0da6834766c
+ 96acf1fb337ecc7cedbed1f5645174ec097b13d4f991626ac82aea1dfd51263e
+ 90e33e95e38df7f5062dcc75651b32ac2b8a33c52488ea4d14f6aa599ab0c326
+ d5d722c13d330a4a7cbff2194a0dcee38adc4a9c991b190cfa6fd34d6386e204
+ ebd469af94e084b5444e199a9fb0d9d78b9883f7344f17e3d40d4accb408937a
+ c5a620c0bedda19473f016f974d5c0f2d3059dcb50378c4508499d291939ed03
+ 5080942902184e756853be14d638230e303cf759a9d2624675aeb10bdec6af63
+ c8cd9bb150d378a4b31fb39e7c599ed2846f236bc3e9055096fd6dbe47884e3b
+ 9b3d4eee8044dd8aa700d4516624abeccf5a07df6eea85c8c190a3f1d8c7dc38
+ b6b890964b13a96db89ef0df67875c57f312128fd65c3d2bf74fde69b7e50538
+ 4f1583824df5c2cf1226b0ac4e273a84527c2918cc7693764ed9ca29d70c2ec1
+ b2232b56e8fb57e6b7afb5fe2fc3d0b0310b859c57007757f8728a265aea2168
+ 3b33c15a67f085ea3ba09592aa6838d7fc92c15d896970ce6c14f00b995c9fb3
+ 1ef54e007d31be97a4cbae13502102fbe4a96c5aa10f88cf5d8668d81002ea96
+ d8343c9929471be60a630c02813f22dfda92053ebd7e015293c074416e9303a1
+ 7648f75c750bc2217dbbe2cedffecd8adac822e5ff47c8ba90852f710da50fb6
+ 68b87c15541da22030209a9e778a3f6630a28585a676eb66c83c27438bf0b502
+ 43883f25a5900491b9cc580d3a915ae9a2f0e079365ca7ce270d896e80c89516
+ 941bf45eabf44913061df016c4075f83774bea40fb8eac30d0694857b4b794fa
+ b1fba58a22c5f5ee287bd6ca318e86af92f1fc36dce450ffb8d762a2acb5d4fb
+ 5e2b2d25586bde17f91674f9f06bd32cc8e49d3e3f20666d5592f33de67c9ef5
+ 1d6213971b700be7de8e074e2b5a78dc89bc75cdbcd3020b9c36d423d01fbfac
+ fbc4a8a47adcc79394e12108c5187e274cafb5857f36843a40bb4dfecba3fd13
+ 4701efa9204bccb8e37f0be35487908ce21b3bc7a654a230b5c925ff778a815a
+ 3609d9cadfbf377ae5bc115c5badbad6000352c800272bba75663b9eb51dd7ca
+ a54b54f2e07e9127a0cb73bfd6cf19d766603be12ba9b4e159cc848a70fa93cb
+ 923ef8755962cbe7871636d5dae60a4821ff9dd6a61cb5c610fe5290511cccee
+ baf929ad8c96da4f90920d3a00e585da7e400fef9a48dab283ee1c27eca86914
+ c5af8270516f87b7ba3b48914bed4d55a7d2dbb27d847c6d408c9e71e4065fbd
+ 7128daa26fc5eab437a4a71ee76f4678376c4fee1d43eda1fb5d081e1f213a55
+ 949646dba79b8caca43953360887cf1eec4b71c2fa695f4842c6e7fd5503cec6
+ 30f621990e2f54c4c9e9a57e1efe2603088158593d6315bf8d333faa8c774680
+ cacbea21c271f54657fdf12ee50e6b4e9e1c6cbd99f4848609b888748a85e4ae
+ dddccfe6dc39514598b59186fd26e59287cfce4e16e23e68d7f3a0eac2a78b1c
+ 24c14480fd5fd93c8f327464ef77e619e043bbe0af682ad8791039b2f54cf693
+ 6c97b56c97a0e51dfd5ba11f2a4c6988580f172217d70ea99d7b0f1cfa01d6b4
+ d5f294c8e7b0471be3cc501e419aaa62e5948c8d5b916bfd6d13ffd82b794610
+ 0bfab08dca7ca8d32f36c8daf02c9bab7d88f44a87027339e2418f2a6dcdf134
+ dd3e7ae3b7f6fe0de56e2cbc67d4fa65d4d5816aad93508afa60ff8c62246823
+ abd21a9560b8be091e1961a4f350d161f2fabfdaa05ae86cbc0334feb20bdee6
+ 95ba0af507f9f665631845a76a2a494d25442c939f4e5db9dd96f1bf0938aae9
+ 9a8fb53132614122c7cffa6a642bdce84d02c78205656c2382c49bf4aa5dc2b7
+ 26901add0592a4b29cc54940b73dde0b3e3231af3d4d0c34be056f12c1aa950f
+ 64ab10bf053df33d19f6145a51edc22643d95f6e0a4e3a4049dd2a14bef32317
+ 534af1dd87667c451f55b00f9dd2f8192160d3902f8976666b3be85c4fe0f353
+ bad55df7f823c15ccb492a4468dc3507194ccd1900c9771139509cc17dc7742a
+ 47aee2cf1c4a55e432ddf7ef99099e1ef5a77d6fffe0945cc889b583048b2432"
diff --git a/srcpkgs/thunderbird/files/mozconfig b/srcpkgs/thunderbird/files/mozconfig
index 4d1267b2351..334846e9a64 100644
--- a/srcpkgs/thunderbird/files/mozconfig
+++ b/srcpkgs/thunderbird/files/mozconfig
@@ -12,7 +12,6 @@ ac_add_options --with-system-icu
 # XXX: the system's libpng doesn't have APNG support
 ac_add_options --without-system-png
 ac_add_options --enable-system-pixman
-ac_add_options --enable-system-hunspell
 ac_add_options --enable-system-sqlite
 ac_add_options --enable-system-ffi
 
@@ -34,8 +33,8 @@ ac_add_options --disable-updater
 ac_add_options --disable-install-strip
 ac_add_options --disable-strip
 ac_add_options --disable-profiling
+ac_add_options --disable-gold
 ac_add_options --enable-optimize="$CFLAGS"
-ac_add_options --enable-pie
 
 ac_add_options --enable-official-branding
 ac_add_options --enable-calendar
diff --git a/srcpkgs/thunderbird/patches/disable-hunspell_hooks.patch b/srcpkgs/thunderbird/patches/disable-hunspell_hooks.patch
deleted file mode 100644
index a5f7c29f2bd..00000000000
--- a/srcpkgs/thunderbird/patches/disable-hunspell_hooks.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mozilla-config.h.in	2016-07-06 15:16:06.621880293 +0200
-+++ mozilla-config.h.in	2016-07-06 15:16:42.958428126 +0200
-@@ -54,7 +54,7 @@
-  * HUNSPELL_STATIC is defined in extensions/spellcheck/hunspell/src/Makefile.in,
-  * unless --enable-system-hunspell is defined.
-  */
--#if defined(HUNSPELL_STATIC)
-+#if 0
- #include "hunspell_alloc_hooks.h"
- #include "hunspell_fopen_hooks.h"
- #endif
diff --git a/srcpkgs/thunderbird/patches/disable-image-format-warning.patch b/srcpkgs/thunderbird/patches/disable-image-format-warning.patch
new file mode 100644
index 00000000000..bd56e6bc37c
--- /dev/null
+++ b/srcpkgs/thunderbird/patches/disable-image-format-warning.patch
@@ -0,0 +1,15 @@
+Imported from Adélie. Firefox is prone to this warning on BE and
+it leads to huge .xsession-errors, and the warning is not very
+important or meaningful, so just disable it.
+
+--- gfx/2d/HelpersCairo.h
++++ gfx/2d/HelpersCairo.h
+@@ -147,7 +147,7 @@
+     case SurfaceFormat::R5G6B5_UINT16:
+       return CAIRO_FORMAT_RGB16_565;
+     default:
+-      gfxCriticalError() << "Unknown image format " << (int)format;
++      //gfxCriticalError() << "Unknown image format " << (int)format;
+       return CAIRO_FORMAT_ARGB32;
+   }
+ }
diff --git a/srcpkgs/thunderbird/patches/fix-arm-opus-include.patch b/srcpkgs/thunderbird/patches/fix-arm-opus-include.patch
new file mode 100644
index 00000000000..6e0c5875da3
--- /dev/null
+++ b/srcpkgs/thunderbird/patches/fix-arm-opus-include.patch
@@ -0,0 +1,11 @@
+--- media/libopus/silk/arm/arm_silk_map.c.orig	2019-03-19 20:55:01.249609964 +0100
++++ media/libopus/silk/arm/arm_silk_map.c	2019-03-19 20:55:25.769400255 +0100
+@@ -28,7 +28,7 @@
+ # include "config.h"
+ #endif
+
+-#include "main_FIX.h"
++#include "../fixed/main_FIX.h"
+ #include "NSQ.h"
+ #include "SigProc_FIX.h"
+
diff --git a/srcpkgs/thunderbird/patches/fix-i686-ppc-musl.patch b/srcpkgs/thunderbird/patches/fix-i686-ppc-musl.patch
new file mode 100644
index 00000000000..40aab43ae86
--- /dev/null
+++ b/srcpkgs/thunderbird/patches/fix-i686-ppc-musl.patch
@@ -0,0 +1,11 @@
+--- mozglue/misc/StackWalk.cpp	2017-04-11 04:13:21.000000000 +0200
++++ mozglue/misc/StackWalk.cpp	2017-11-29 15:23:07.218649970 +0100
+@@ -33,7 +33,7 @@ using namespace mozilla;
+ #  define MOZ_STACKWALK_SUPPORTS_MACOSX 0
+ #endif
+ 
+-#if (defined(linux) &&                                            \
++#if defined(__GLIBC__) && (defined(linux) && \
+      ((defined(__GNUC__) && (defined(__i386) || defined(PPC))) || \
+       defined(HAVE__UNWIND_BACKTRACE)))
+ #  define MOZ_STACKWALK_SUPPORTS_LINUX 1
diff --git a/srcpkgs/thunderbird/patches/fix-musl.patch b/srcpkgs/thunderbird/patches/fix-musl.patch
index c32921d39e1..c1cb99bf651 100644
--- a/srcpkgs/thunderbird/patches/fix-musl.patch
+++ b/srcpkgs/thunderbird/patches/fix-musl.patch
@@ -1,11 +1,11 @@
---- tools/profiler/core/platform.h.orig
-+++ tools/profiler/core/platform.h
-@@ -56,7 +56,7 @@
-
- // We need a definition of gettid(), but glibc doesn't provide a
- // wrapper for it.
+--- tools/profiler/core/platform-linux-android.cpp.orig	2019-07-09 22:58:30.039475686 +0200
++++ tools/profiler/core/platform-linux-android.cpp	2019-07-09 22:58:39.331437677 +0200
+@@ -73,7 +73,7 @@
+ 
+ int profiler_current_thread_id() {
+   // glibc doesn't provide a wrapper for gettid().
 -#if defined(__GLIBC__)
 +#if defined(__linux__)
- #include <unistd.h>
- #include <sys/syscall.h>
- static inline pid_t gettid()
+   return static_cast<int>(static_cast<pid_t>(syscall(SYS_gettid)));
+ #else
+   return static_cast<int>(gettid());
diff --git a/srcpkgs/thunderbird/patches/fix-rust-1.29.patch b/srcpkgs/thunderbird/patches/fix-rust-1.29.patch
deleted file mode 100644
index e48c93a9dce..00000000000
--- a/srcpkgs/thunderbird/patches/fix-rust-1.29.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- build/moz.configure/rust.configure.orig	2018-10-26 15:02:30.276600157 +0200
-+++ build/moz.configure/rust.configure	2018-10-26 15:02:14.081581242 +0200
-@@ -119,7 +119,10 @@ def rust_supported_targets(rustc):
-     ambiguous = set()
-     per_raw_os = {}
-     for t in out:
--        t = split_triplet(t, allow_unknown=True)
-+        try:
-+            t = split_triplet(t, allow_unknown=True)
-+        except:
-+            continue
-         key = (t.cpu, t.endianness, t.os)
-         if key in per_os:
-             previous = per_os[key]
diff --git a/srcpkgs/thunderbird/patches/fix-sandbox-membarrier.patch b/srcpkgs/thunderbird/patches/fix-sandbox-membarrier.patch
new file mode 100644
index 00000000000..caffd83cf67
--- /dev/null
+++ b/srcpkgs/thunderbird/patches/fix-sandbox-membarrier.patch
@@ -0,0 +1,52 @@
+allow usage of SYS_membarrier, needed since musl-1.1.22
+
+--- security/sandbox/linux/SandboxFilter.cpp
++++ security/sandbox/linux/SandboxFilter.cpp
+@@ -283,6 +283,8 @@
+       case __NR_set_tid_address:
+         return Allow();
+ #endif
++      case __NR_membarrier:
++        return Allow();
+ 
+         // prctl
+       case __NR_prctl: {
+
+--- security/sandbox/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
++++ security/sandbox/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
+@@ -1385,6 +1385,10 @@
+ #define __NR_memfd_create (__NR_SYSCALL_BASE+385)
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier (__NR_SYSCALL_BASE+389)
++#endif
++
+ // ARM private syscalls.
+ #if !defined(__ARM_NR_BASE)
+ #define __ARM_NR_BASE (__NR_SYSCALL_BASE + 0xF0000)
+
+--- security/sandbox/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h
++++ security/sandbox/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h
+@@ -1290,5 +1290,9 @@
+ #define __NR_memfd_create 319
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier 324
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_X86_64_LINUX_SYSCALLS_H_
+ 
+--- security/sandbox/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
++++ security/sandbox/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
+@@ -1490,5 +1490,9 @@
+ #define __NR_shutdown 373
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier 375
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_X86_32_LINUX_SYSCALLS_H_
+ 
diff --git a/srcpkgs/thunderbird/patches/fix-toolkit.patch b/srcpkgs/thunderbird/patches/fix-toolkit.patch
index 120ea8561e9..86e8ef47855 100644
--- a/srcpkgs/thunderbird/patches/fix-toolkit.patch
+++ b/srcpkgs/thunderbird/patches/fix-toolkit.patch
@@ -47,17 +47,28 @@
  #include <a.out.h>
  #endif
 
+--- toolkit.orig/mozapps/update/common/updatedefines.h	2019-01-29 11:34:36.416804577 +0100
++++ toolkit/mozapps/update/common/updatedefines.h	2019-01-29 11:34:59.193583777 +0100
+@@ -102,7 +102,7 @@
+
+ #  ifdef SOLARIS
+ #    include <sys/stat.h>
+-#  else
++#  elif !(defined(__linux__)) || defined(__GLIBC__)
+ #    include <fts.h>
+ #  endif
+ #  include <dirent.h>
 --- toolkit.orig/mozapps/update/updater/updater.cpp	2014-03-15 05:19:37.000000000 +0000
 +++ toolkit/mozapps/update/updater/updater.cpp	2014-04-17 10:24:33.796765327 +0000
-@@ -3432,6 +3432,7 @@
- int add_dir_entries(const NS_tchar *dirpath, ActionList *list)
- {
+@@ -3978,6 +3978,7 @@
+ 
+ int add_dir_entries(const NS_tchar* dirpath, ActionList* list) {
    int rv = OK;
 +#if !defined(__linux__) || defined(__GLIBC__)
-   FTS *ftsdir;
-   FTSENT *ftsdirEntry;
-   NS_tchar searchpath[MAXPATHLEN];
-@@ -3534,6 +3535,7 @@
+   FTS* ftsdir;
+   FTSENT* ftsdirEntry;
+   mozilla::UniquePtr<NS_tchar[]> searchpath(get_full_path(dirpath));
+@@ -4085,6 +4086,7 @@
    }
  
    fts_close(ftsdir);
@@ -65,14 +76,3 @@
  
    return rv;
  }
---- toolkit/mozapps/update/common/updatedefines.h	2019-02-03 14:48:50.526625890 +0100
-+++ toolkit/mozapps/update/common/updatedefines.h	2019-02-03 14:49:51.466743641 +0100
-@@ -100,7 +100,7 @@
- 
- #ifdef SOLARIS
- #include <sys/stat.h>
--#else
-+#elif !defined(__linux__) || defined(__GLIBC__)
- #include <fts.h>
- #endif
- #include <dirent.h>
diff --git a/srcpkgs/thunderbird/patches/fix-tools.patch b/srcpkgs/thunderbird/patches/fix-tools.patch
index 97e77307cea..0ed043fb5b5 100644
--- a/srcpkgs/thunderbird/patches/fix-tools.patch
+++ b/srcpkgs/thunderbird/patches/fix-tools.patch
@@ -1,17 +1,6 @@
---- tools/profiler/core/platform.h
-+++ tools/profiler/core/platform.h
-@@ -29,6 +29,8 @@
- #ifndef TOOLS_PLATFORM_H_
- #define TOOLS_PLATFORM_H_
-
-+#include <sys/types.h>
-+
- #include <stdint.h>
- #include <math.h>
- #include "MainThreadUtils.h"
---- tools/profiler/lul/LulElf.cpp	2019-02-03 14:54:15.727928668 +0100
-+++ tools/profiler/lul/LulElf.cpp	2019-02-03 14:55:54.342546975 +0100
-@@ -459,10 +459,10 @@
+--- tools/profiler/lul/LulElf.cpp.orig	2019-01-29 12:05:34.223834130 +0100
++++ tools/profiler/lul/LulElf.cpp	2019-01-29 12:08:02.480400845 +0100
+@@ -469,10 +469,10 @@
  // Return the non-directory portion of FILENAME: the portion after the
  // last slash, or the whole filename if there are no slashes.
  string BaseFileName(const string& filename) {
@@ -26,9 +15,21 @@
    return base;
  }
  
---- tools/profiler/core/platform-linux-android.cpp	2019-02-03 14:56:23.607139579 +0100
-+++ tools/profiler/core/platform-linux-android.cpp	2019-02-03 14:57:03.198587558 +0100
-@@ -497,8 +497,10 @@
+--- tools/profiler/core/platform-linux-android.cpp.orig	2019-01-29 12:09:40.980448579 +0100
++++ tools/profiler/core/platform-linux-android.cpp	2019-01-29 12:11:09.689590967 +0100
+@@ -253,7 +253,11 @@
+ 
+   // Request profiling signals.
+   struct sigaction sa;
++#if defined(GP_ARCH_arm)
++  sa.sa_sigaction = SigprofHandler;
++#else
+   sa.sa_sigaction = MOZ_SIGNAL_TRAMPOLINE(SigprofHandler);
++#endif
+   sigemptyset(&sa.sa_mask);
+   sa.sa_flags = SA_RESTART | SA_SIGINFO;
+   if (sigaction(SIGPROF, &sa, &mOldSigprofHandler) != 0) {
+@@ -497,8 +501,10 @@
  ucontext_t sSyncUContext;
  
  void Registers::SyncPopulate() {
diff --git a/srcpkgs/thunderbird/patches/fix-wasm-arm.patch b/srcpkgs/thunderbird/patches/fix-wasm-arm.patch
new file mode 100644
index 00000000000..e6ad61c9f44
--- /dev/null
+++ b/srcpkgs/thunderbird/patches/fix-wasm-arm.patch
@@ -0,0 +1,15 @@
+--- js/src/wasm/WasmSignalHandlers.cpp
++++ js/src/wasm/WasmSignalHandlers.cpp
+@@ -243,9 +243,9 @@
+ // If you run into compile problems on a tier-3 platform, you can disable the
+ // emulation here.
+ 
+-#if defined(__linux__) && defined(__arm__)
+-#  define WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS
+-#endif
++// #if defined(__linux__) && defined(__arm__)
++// #  define WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS
++// #endif
+ 
+ #ifdef WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS
+ #  include <sys/user.h>
diff --git a/srcpkgs/thunderbird/patches/fix-webrtc-glibcisms.patch b/srcpkgs/thunderbird/patches/fix-webrtc-glibcisms.patch
index 0a9304430b2..cf895dd8448 100644
--- a/srcpkgs/thunderbird/patches/fix-webrtc-glibcisms.patch
+++ b/srcpkgs/thunderbird/patches/fix-webrtc-glibcisms.patch
@@ -1,13 +1,20 @@
---- media/webrtc/trunk/webrtc/system_wrappers/source/cpu_features_linux.c.orig	2018-05-09 23:48:44.677389171 +0200
-+++ media/webrtc/trunk/webrtc/system_wrappers/source/cpu_features_linux.c	2018-05-09 23:48:56.254373557 +0200
-@@ -11,7 +11,9 @@
- #include <stdlib.h>
- #include <string.h>
- #include <features.h>
+--- media/webrtc/trunk/webrtc/system_wrappers/source/cpu_features_linux.c.orig	2019-01-29 11:20:52.298793223 +0100
++++ media/webrtc/trunk/webrtc/system_wrappers/source/cpu_features_linux.c	2019-01-29 11:21:48.250250850 +0100
+@@ -14,7 +14,7 @@
+ #ifndef __GLIBC_PREREQ
+ #define __GLIBC_PREREQ(a, b) 0
+ #endif
 -#if __GLIBC_PREREQ(2, 16)
-+#if !__GLIBC__
-+#include <sys/auxv.h>
-+#elif __GLIBC_PREREQ(2, 16)
++#if !__GLIBC__ || __GLIBC_PREREQ(2, 16)
  #include <sys/auxv.h>
  #else
  #include <fcntl.h>
+@@ -32,7 +32,7 @@
+   int architecture = 0;
+   unsigned long hwcap = 0;
+   const char* platform = NULL;
+-#if __GLIBC_PREREQ(2, 16)
++#if !__GLIBC__ || __GLIBC_PREREQ(2, 16)
+   hwcap = getauxval(AT_HWCAP);
+   platform = (const char*)getauxval(AT_PLATFORM);
+ #else
diff --git a/srcpkgs/thunderbird/patches/fix-xpcom.patch b/srcpkgs/thunderbird/patches/fix-xpcom.patch
deleted file mode 100644
index 38dd582d96b..00000000000
--- a/srcpkgs/thunderbird/patches/fix-xpcom.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xpcom/base/nsMemoryReporterManager.cpp.orig	2015-12-16 11:53:14.211144456 +0100
-+++ xpcom/base/nsMemoryReporterManager.cpp	2015-12-16 11:55:26.859476381 +0100
-@@ -46,7 +46,7 @@ using namespace mozilla;
- #  include "mozmemory.h"
- #endif  // MOZ_MEMORY
- 
--#if defined(XP_LINUX)
-+#if defined(XP_LINUX) && defined(__GLIBC__)
- 
- #include <malloc.h>
- #include <string.h>
diff --git a/srcpkgs/thunderbird/patches/mallinfo.patch b/srcpkgs/thunderbird/patches/mallinfo.patch
index c9a38d45bdf..afea86c0a2c 100644
--- a/srcpkgs/thunderbird/patches/mallinfo.patch
+++ b/srcpkgs/thunderbird/patches/mallinfo.patch
@@ -1,18 +1,34 @@
---- xpcom/base/nsMemoryReporterManager.cpp
-+++ xpcom/base/nsMemoryReporterManager.cpp
-@@ -153,6 +153,7 @@ ResidentUniqueDistinguishedAmount(int64_t* aN)
+--- xpcom/base/nsMemoryReporterManager.cpp.orig	2019-03-19 17:12:20.844810044 +0100
++++ xpcom/base/nsMemoryReporterManager.cpp	2019-03-19 17:13:32.505133615 +0100
+@@ -123,6 +123,7 @@
    return GetProcSelfSmapsPrivate(aN);
  }
  
 +#ifdef __GLIBC__
- #define HAVE_SYSTEM_HEAP_REPORTER 1
- nsresult
- SystemHeapSize(int64_t* aSizeOut)
-@@ -172,6 +173,7 @@ SystemHeapSize(int64_t* aSizeOut)
-     *aSizeOut = size_t(info.hblkhd) + size_t(info.uordblks);
-     return NS_OK;
+ #  ifdef HAVE_MALLINFO
+ #    define HAVE_SYSTEM_HEAP_REPORTER 1
+ static MOZ_MUST_USE nsresult SystemHeapSize(int64_t* aSizeOut) {
+@@ -142,6 +143,7 @@
+   return NS_OK;
  }
-+#endif
+ #  endif
++#endif // __GLIBC__
  
- #elif defined(__DragonFly__) || defined(__FreeBSD__) \
-     || defined(__NetBSD__) || defined(__OpenBSD__) \
+ #elif defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || \
+     defined(__OpenBSD__) || defined(__FreeBSD_kernel__)
+@@ -642,6 +644,7 @@
+   return NS_OK;
+ }
+ 
++#ifdef __GLIBC__
+ #  define HAVE_SYSTEM_HEAP_REPORTER 1
+ // Windows can have multiple separate heaps. During testing there were multiple
+ // heaps present but the non-default ones had sizes no more than a few 10s of
+@@ -698,6 +701,7 @@
+   *aSizeOut = heapsSize;
+   return NS_OK;
+ }
++#endif // __GLIBC__
+ 
+ struct SegmentKind {
+   DWORD mState;
diff --git a/srcpkgs/thunderbird/patches/ppc32-skia-portable.patch b/srcpkgs/thunderbird/patches/ppc32-skia-portable.patch
new file mode 100644
index 00000000000..93c625a861e
--- /dev/null
+++ b/srcpkgs/thunderbird/patches/ppc32-skia-portable.patch
@@ -0,0 +1,14 @@
+--- gfx/skia/skia/third_party/skcms/skcms.cc
++++ gfx/skia/skia/third_party/skcms/skcms.cc
+@@ -1806,6 +1806,11 @@ typedef enum {
+     Op_store_ffff,
+ } Op;
+ 
++// work around ICE on 32-bit ppc
++#if defined(__powerpc__) && !defined(__powerpc64__)
++#  define SKCMS_PORTABLE
++#endif
++
+ #if defined(__clang__)
+     template <int N, typename T> using Vec = T __attribute__((ext_vector_type(N)));
+ #elif defined(__GNUC__)
diff --git a/srcpkgs/thunderbird/patches/rust-configure.patch b/srcpkgs/thunderbird/patches/rust-configure.patch
new file mode 100644
index 00000000000..84077f4fc88
--- /dev/null
+++ b/srcpkgs/thunderbird/patches/rust-configure.patch
@@ -0,0 +1,42 @@
+Mozilla rustc check does not support crossbuild: let's remove it
+Remove calls to unwrap_rustup, they fail if rustup isn't present
+
+--- build/moz.configure/rust.configure	2019-07-06 03:48:30.000000000 +0200
++++ build/moz.configure/rust.configure	2019-07-09 22:35:23.326851798 +0200
+@@ -79,9 +79,6 @@
+ 
+     return unwrap
+ 
+-rustc = unwrap_rustup(rustc, 'rustc')
+-cargo = unwrap_rustup(cargo, 'cargo')
+-
+ 
+ set_config('CARGO', cargo)
+ set_config('RUSTC', rustc)
+@@ -294,26 +291,6 @@
+ 
+             os.write(in_fd, source)
+             os.close(in_fd)
+-
+-            cmd = [
+-                rustc,
+-                '--crate-type', 'staticlib',
+-                target_arg,
+-                '-o', out_path,
+-                in_path,
+-            ]
+-
+-            def failed():
+-                die(dedent('''\
+-                Cannot compile for {} with {}
+-                The target may be unsupported, or you may not have
+-                a rust std library for that target installed. Try:
+-
+-                  rustup target add {}
+-                '''.format(host_or_target.alias, rustc, rustc_target.alias)))
+-            check_cmd_output(*cmd, onerror=failed)
+-            if not os.path.exists(out_path) or os.path.getsize(out_path) == 0:
+-                failed()
+         finally:
+             os.remove(in_path)
+             os.remove(out_path)
diff --git a/srcpkgs/thunderbird/patches/rust-cssparser.patch b/srcpkgs/thunderbird/patches/rust-cssparser.patch
new file mode 100644
index 00000000000..1ebef87c014
--- /dev/null
+++ b/srcpkgs/thunderbird/patches/rust-cssparser.patch
@@ -0,0 +1,90 @@
+backport of:
+
+From 3c98d22c5de3b696bf1fde2b6c90069812312aa6 Mon Sep 17 00:00:00 2001
+From: Simon Sapin <simon.sapin@exyr.org>
+Date: Tue, 23 Apr 2019 13:47:25 +0200
+Subject: [PATCH] Fix a future-compat warning
+
+```
+warning[E0506]: cannot assign to `self.input.cached_token` because it is borrowed
+   --> src/parser.rs:591:17
+    |
+566 |     pub fn next_including_whitespace_and_comments(&mut self) -> Result<&Token<'i>, BasicParseError<'i>> {
+    |                                                   - let's call the lifetime of this reference `'1`
+...
+579 |             Some(ref cached_token)
+    |                  ---------------- borrow of `self.input.cached_token` occurs here
+...
+591 |                 self.input.cached_token = Some(CachedToken {
+    |                 ^^^^^^^^^^^^^^^^^^^^^^^ assignment to borrowed `self.input.cached_token` occurs here
+...
+603 |         Ok(token)
+    |         --------- returning this value requires that `self.input.cached_token.0` is borrowed for `'1`
+    |
+    = warning: this error has been downgraded to a warning for backwards compatibility with previous releases
+    = warning: this represents potential undefined behavior in your code and this warning will become a hard error in the future
+```
+---
+ src/parser.rs | 50 +++++++++++++++++++++++++++-----------------------
+ 1 file changed, 27 insertions(+), 23 deletions(-)
+
+diff --git a/src/parser.rs b/src/parser.rs
+index 51f441e4..7cef117c 100644
+--- third_party/rust/cssparser/src/parser.rs
++++ third_party/rust/cssparser/src/parser.rs
+@@ -555,28 +555,34 @@
+         }
+ 
+         let token_start_position = self.input.tokenizer.position();
+-        let token;
+-        match self.input.cached_token {
+-            Some(ref cached_token)
+-            if cached_token.start_position == token_start_position => {
+-                self.input.tokenizer.reset(&cached_token.end_state);
+-                match cached_token.token {
+-                    Token::Function(ref name) => self.input.tokenizer.see_function(name),
+-                    _ => {}
+-                }
+-                token = &cached_token.token
++        let using_cached_token = self
++            .input
++            .cached_token
++            .as_ref()
++            .map_or(false, |cached_token| {
++                cached_token.start_position == token_start_position
++            });
++        let token = if using_cached_token {
++            let cached_token = self.input.cached_token.as_ref().unwrap();
++            self.input.tokenizer.reset(&cached_token.end_state);
++            match cached_token.token {
++                Token::Function(ref name) => self.input.tokenizer.see_function(name),
++                _ => {}
+             }
+-            _ => {
+-                let new_token = self.input.tokenizer.next()
+-                    .map_err(|()| self.new_basic_error(BasicParseErrorKind::EndOfInput))?;
+-                self.input.cached_token = Some(CachedToken {
+-                    token: new_token,
+-                    start_position: token_start_position,
+-                    end_state: self.input.tokenizer.state(),
+-                });
+-                token = self.input.cached_token_ref()
+-            }
+-        }
++            &cached_token.token
++        } else {
++            let new_token = self
++                .input
++                .tokenizer
++                .next()
++                .map_err(|()| self.new_basic_error(BasicParseErrorKind::EndOfInput))?;
++            self.input.cached_token = Some(CachedToken {
++                token: new_token,
++                start_position: token_start_position,
++                end_state: self.input.tokenizer.state(),
++            });
++            self.input.cached_token_ref()
++        };
+ 
+         if let Some(block_type) = BlockType::opening(token) {
+             self.at_start_of = Some(block_type);
diff --git a/srcpkgs/thunderbird/patches/rust-unitialized-field.patch b/srcpkgs/thunderbird/patches/rust-unitialized-field.patch
deleted file mode 100644
index 67ef3a02ab8..00000000000
--- a/srcpkgs/thunderbird/patches/rust-unitialized-field.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- ./media/audioipc/audioipc/src/cmsg.rs.orig	2018-05-09 22:19:14.748631939 +0200
-+++ ./media/audioipc/audioipc/src/cmsg.rs	2018-05-09 22:19:22.961620862 +0200
-@@ -106,11 +106,11 @@ impl ControlMsgBuilder {
-                 return Err(Error::NoSpace);
-             }
- 
--            let cmsghdr = cmsghdr {
--                cmsg_len: cmsg_len as _,
--                cmsg_level: level,
--                cmsg_type: kind,
--            };
-+            use std::mem;
-+            let mut cmsghdr: cmsghdr =  unsafe { mem::zeroed() };
-+            cmsghdr.cmsg_len = cmsg_len as _;
-+            cmsghdr.cmsg_level = level;
-+            cmsghdr.cmsg_type = kind;
- 
-             let cmsghdr = unsafe {
-                 slice::from_raw_parts(&cmsghdr as *const _ as *const _, mem::size_of::<cmsghdr>())
diff --git a/srcpkgs/thunderbird/patches/rust133.patch b/srcpkgs/thunderbird/patches/rust133.patch
deleted file mode 100644
index ebdcac7e3a3..00000000000
--- a/srcpkgs/thunderbird/patches/rust133.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-This fixes build errors under recent Rust.
-
---- servo/components/style_traits/lib.rs
-+++ servo/components/style_traits/lib.rs
-@@ -9,7 +9,7 @@
- #![crate_name = "style_traits"]
- #![crate_type = "rlib"]
- 
--#![deny(unsafe_code, missing_docs)]
-+#![deny(unsafe_code)]
- 
- extern crate app_units;
- #[macro_use] extern crate bitflags;
---- servo/components/style/lib.rs
-+++ servo/components/style/lib.rs
-@@ -23,8 +23,6 @@
- //! [cssparser]: ../cssparser/index.html
- //! [selectors]: ../selectors/index.html
- 
--#![deny(missing_docs)]
--
- extern crate app_units;
- extern crate arrayvec;
- extern crate atomic_refcell;
diff --git a/srcpkgs/thunderbird/patches/sndio.patch b/srcpkgs/thunderbird/patches/sndio.patch
index 097b313e90b..6c72284c19b 100644
--- a/srcpkgs/thunderbird/patches/sndio.patch
+++ b/srcpkgs/thunderbird/patches/sndio.patch
@@ -51,14 +51,14 @@
      ]
 --- build/moz.configure/old.configure.orig
 +++ build/moz.configure/old.configure
-@@ -159,6 +159,7 @@
-     '--enable-accessibility',
-     '--enable-address-sanitizer',
-     '--enable-alsa',
+@@ -169,6 +169,7 @@
+ @old_configure_options(
+     '--cache-file',
+     '--datadir',
 +    '--enable-sndio',
-     '--enable-bundled-fonts',
-     '--enable-clang-plugin',
      '--enable-content-sandbox',
+     '--enable-cookies',
+     '--enable-cpp-rtti',
 --- security/sandbox/linux/broker/SandboxBrokerPolicyFactory.cpp.orig
 +++ security/sandbox/linux/broker/SandboxBrokerPolicyFactory.cpp
 @@ -349,6 +349,21 @@
diff --git a/srcpkgs/thunderbird/patches/yuv-be.patch b/srcpkgs/thunderbird/patches/yuv-be.patch
new file mode 100644
index 00000000000..1c26f2ecced
--- /dev/null
+++ b/srcpkgs/thunderbird/patches/yuv-be.patch
@@ -0,0 +1,48 @@
+# HG changeset patch
+# User A. Wilcox <AWilcox@Wilcox-Tech.com>
+# Date 1543674229 0
+#      Sat Dec 01 14:23:49 2018 +0000
+# Node ID 0309ff19e46b126c527e633518d7de8570442114
+# Parent  53107afbc21ec78e7ac46d37af212505f2032d5d
+Bug 1511604 - Swizzle YCbCr->RGB data on big-endian machines
+
+diff -r 53107afbc21e -r 0309ff19e46b gfx/ycbcr/YCbCrUtils.cpp
+--- gfx/ycbcr/YCbCrUtils.cpp	Wed Nov 07 04:50:21 2018 +0000
++++ gfx/ycbcr/YCbCrUtils.cpp	Sat Dec 01 14:23:49 2018 +0000
+@@ -3,7 +3,9 @@
+  * License, v. 2.0. If a copy of the MPL was not distributed with this
+  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+ 
++#include "mozilla/EndianUtils.h"
+ #include "gfx2DGlue.h"
++#include "mozilla/gfx/Swizzle.h"
+ 
+ #include "YCbCrUtils.h"
+ #include "yuv_convert.h"
+@@ -236,6 +238,13 @@
+                           yuvtype,
+                           srcData.mYUVColorSpace);
+   }
++#if MOZ_BIG_ENDIAN
++  // libyuv makes endian-correct result, which needs to be swapped to BGRX
++  if (aDestFormat != SurfaceFormat::R5G6B5_UINT16)
++    gfx::SwizzleData(aDestBuffer, aStride, gfx::SurfaceFormat::X8R8G8B8,
++                     aDestBuffer, aStride, gfx::SurfaceFormat::B8G8R8X8,
++                     srcData.mPicSize);
++#endif
+ }
+ 
+ void
+@@ -257,6 +266,12 @@
+                         aSrcStrideYA,
+                         aSrcStrideUV,
+                         aDstStrideARGB);
++#if MOZ_BIG_ENDIAN
++  // libyuv makes endian-correct result, which needs to be swapped to BGRA
++  gfx::SwizzleData(aDstARGB, aDstStrideARGB, gfx::SurfaceFormat::A8R8G8B8,
++                   aDstARGB, aDstStrideARGB, gfx::SurfaceFormat::B8G8R8A8,
++                   IntSize(aWidth, aHeight));
++#endif
+ }
+ 
+ } // namespace gfx
diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index 0048d50de61..7aacf91d0af 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -3,24 +3,24 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/thunderbird-i18n".
 #
 pkgname=thunderbird
-version=60.8.0
-revision=2
+version=68.1.0
+revision=1
+build_helper="rust"
 short_desc="Standalone Mail/News reader"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-homepage="https://www.thunderbird.net/"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
+homepage="https://www.thunderbird.net/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=1e7a13e64b63476d2235aaac6823fdab949af45cfcd5a25ee710cbae08c2f5d1
+checksum=de0e5c7d1d5576f451e386e4779f155b7af97621a4e22caac0c6dee3c9d76eef
 
-archs="i686* x86_64* ppc64*"
 lib32disabled=yes
 
-hostmakedepends="autoconf213 unzip zip pkg-config perl python yasm rust cargo
- llvm clang"
+hostmakedepends="autoconf213 unzip zip pkg-config perl python3 yasm rust cargo
+ llvm clang nodejs cbindgen nasm python"
 makedepends="nss-devel libjpeg-turbo-devel gtk+-devel gtk+3-devel icu-devel
  pixman-devel sqlite-devel libevent-devel libnotify-devel libvpx5-devel
- libXrender-devel libXcomposite-devel libSM-devel libXt-devel
- libXdamage-devel hunspell-devel $(vopt_if alsa alsa-lib-devel)
+ libXrender-devel libXcomposite-devel libSM-devel libXt-devel rust-std
+ libXdamage-devel freetype-devel $(vopt_if alsa alsa-lib-devel)
  $(vopt_if dbus dbus-glib-devel) $(vopt_if pulseaudio pulseaudio-devel)
  $(vopt_if startup_notification startup-notification-devel)
  $(vopt_if xscreensaver libXScrnSaver-devel)
@@ -30,15 +30,28 @@ depends="nss>=3.37.3 desktop-file-utils hicolor-icon-theme"
 build_options="alsa dbus pulseaudio startup_notification xscreensaver sndio wayland"
 build_options_default="alsa dbus pulseaudio startup_notification xscreensaver sndio wayland"
 
-if [ "$XBPS_WORDSIZE" -eq 32 ]; then
-	nodebug=yes
-fi
-
 case $XBPS_TARGET_MACHINE in
 	ppc64*) ;;
 	ppc*) broken="ftbfs in several places" ;;
 esac
 
+case $XBPS_TARGET_MACHINE in
+	armv6*)
+		broken="required NEON extensions are not supported on armv6"
+		;;
+	ppc64*) ;;
+	ppc*)
+		makedepends+=" libatomic-devel"
+		;;
+esac
+
+# we need this because cargo verifies checksums of all files in vendor
+# crates when it builds and gives us no way to override or update the
+# file sanely... so just clear out the file list
+_clear_vendor_checksums() {
+	sed -i 's/\("files":{\)[^}]*/\1/' third_party/rust/$1/.cargo-checksum.json
+}
+
 post_extract() {
 	case "$XBPS_TARGET_MACHINE" in
 	*-musl)
@@ -54,13 +67,17 @@ post_extract() {
 	# Note: This is for Void Linux use ONLY.
 	echo -n "cd894504-7a2a-4263-abff-ff73ee89ffca" > mozilla-api-key
 }
+
+post_patch() {
+	_clear_vendor_checksums cssparser
+}
+
 do_build() {
 	cp "${FILESDIR}/mozconfig" "${wrksrc}/.mozconfig"
 
 	case "$XBPS_TARGET_MACHINE" in
 	*-musl)
 		echo "ac_add_options --disable-jemalloc" >>.mozconfig
-		echo "ac_add_options --disable-gold" >>.mozconfig
 		echo "ac_add_options --enable-release" >>.mozconfig
 		;;
 	esac
@@ -71,6 +88,16 @@ do_build() {
 		;;
 	esac
 
+	# webrtc currently fails to build on 32-bit ppc...
+	# also need explicit libatomic
+	case "$XBPS_TARGET_MACHINE" in
+	ppc64*) ;;
+	ppc*)
+		echo "ac_add_options --disable-webrtc" >>.mozconfig
+		export LDFLAGS+=" -latomic"
+		;;
+	esac
+
 	case "$XBPS_TARGET_MACHINE" in
 	x86_64-musl|i686-musl)
 		echo "ac_add_options --host=${XBPS_TRIPLET}" >>.mozconfig
@@ -79,6 +106,14 @@ do_build() {
 	esac
 
 	if [ "$CROSS_BUILD" ]; then
+		BINDGEN_INCLUDE_FLAGS=$( $CPP -x c++ -v /dev/null -o /dev/null 2>&1 | \
+			sed -n '/#include <...> search starts here:/,/End of search list./p' | \
+			sed '1,1d;$d' | sed  's/^ /-I/' | paste -s )
+
+		export BINDGEN_CFLAGS="--target=$XBPS_CROSS_TRIPLET \
+			--sysroot=${XBPS_CROSS_BASE} ${BINDGEN_INCLUDE_FLAGS}"
+		export HOST_CC=cc
+		export TARGET_CC="${CC}"
 		export HOST_CFLAGS="${XBPS_CFLAGS}"
 		export HOST_CXXFLAGS="${XBPS_CXXFLAGS}"
 		export ac_cv_sqlite_secure_delete=yes \
@@ -87,18 +122,37 @@ do_build() {
 			ac_cv_sqlite_dbstat_vtab=yes \
 			ac_cv_sqlite_enable_unlock_notify=yes \
 			ac_cv_prog_hostcxx_works=1
+
 		echo "ac_add_options --target=$XBPS_CROSS_TRIPLET" >>.mozconfig
+		echo "ac_add_options --host=$XBPS_TRIPLET" >>.mozconfig
+	else
+		echo "ac_add_options --target=$XBPS_TRIPLET" >>.mozconfig
+		echo "ac_add_options --host=$XBPS_TRIPLET" >>.mozconfig
 	fi
 
+	mkdir -p third_party/rust/libloading/.deps
+
 	case "$XBPS_TARGET_MACHINE" in
 	i686*)
 		export CFLAGS+=" -D_FILE_OFFSET_BITS=64"
 		export CXXFLAGS+=" -D_FILE_OFFSET_BITS=64"
-		# ENOMEM
-                echo "ac_add_options --disable-debug-symbols" >>.mozconfig
+		;;
+	armv7*)
+		export CFLAGS+=" -mfpu=neon -Wno-psabi"
+		export CXXFLAGS+=" -mfpu=neon -Wno-psabi"
 		;;
 	esac
 
+	# work around large debug symbols on 32-bit hosts
+	if [ "$XBPS_WORDSIZE" = "32" ]; then
+		export CFLAGS="${CFLAGS/-g/-g1}"
+		export CXXFLAGS="${CXXFLAGS/-g/-g1}"
+		export LDFLAGS+=" -Wl,--no-keep-memory"
+		# patch the rust debug level, this is hardcoded
+		sed -i "s/debug_info = '2'/debug_info = '1'/" \
+		 build/moz.configure/toolchain.configure
+	fi
+
 	export LDFLAGS+=" -Wl,-rpath=/usr/lib/thunderbird"
 
 	if [ "$SOURCE_DATE_EPOCH" ]; then
@@ -106,6 +160,10 @@ do_build() {
 	fi
 
 	export MOZ_MAKE_FLAGS="${makejobs}"
+	export MOZ_NOSPAM=1
+	export MOZBUILD_STATE_PATH="${wrksrc}/mozbuild"
+	# avoid error: /usr/bin/as: invalid option -- 'N'
+	unset AS
 
 	cat <<! >>.mozconfig
 ac_add_options --with-google-location-service-api-keyfile="${wrksrc}/google-api-key"
diff --git a/srcpkgs/tig/template b/srcpkgs/tig/template
index 75bcf1c5dfc..f35ff9556ef 100644
--- a/srcpkgs/tig/template
+++ b/srcpkgs/tig/template
@@ -10,8 +10,8 @@ makedepends="ncurses-devel"
 depends="git"
 conf_files="/etc/tigrc"
 short_desc="Text-mode interface for Git"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+maintainer="Lugubris <lugubris@disroot.org>"
+license="GPL-2.0-only"
 homepage="https://jonas.github.io/tig/"
 distfiles="https://github.com/jonas/tig/archive/tig-${version}.tar.gz"
 checksum=833c81b04082ed318ae5fd5342193f086781e74372cf418c2f82a1313b84cedd
diff --git a/srcpkgs/tigervnc/template b/srcpkgs/tigervnc/template
index 26ce524de7e..2e8658830d3 100644
--- a/srcpkgs/tigervnc/template
+++ b/srcpkgs/tigervnc/template
@@ -1,7 +1,7 @@
 # Template file for 'tigervnc'
 pkgname=tigervnc
 version=1.9.0
-revision=1
+revision=2
 _xorg_version=1.20.0
 build_style=cmake
 short_desc="VNC client forked from TightVNC"
diff --git a/srcpkgs/timeshift/template b/srcpkgs/timeshift/template
index 572f5b93ee8..d93e3363d43 100644
--- a/srcpkgs/timeshift/template
+++ b/srcpkgs/timeshift/template
@@ -1,6 +1,6 @@
 # Template file for 'timeshift'
 pkgname=timeshift
-version=19.01
+version=19.08.1
 revision=1
 build_style=gnu-makefile
 conf_files="/etc/default/timeshift.json"
@@ -12,7 +12,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="http://www.teejeetech.in/p/timeshift.html"
 distfiles="https://github.com/teejee2008/timeshift/archive/v${version}.tar.gz"
-checksum=557223cf0b9ab0c4848455e1cc4d9068c607b9f5492a2de4935a2f40393e3c5f
+checksum=ab56331f97c1616b889e69adccedeca06f0150e964eea631b52c9bd399f77604
 
 # Remove hard-dep on crontab, leave up to user to decide
 post_extract() {
diff --git a/srcpkgs/tinc/template b/srcpkgs/tinc/template
index b9cd2097547..5c8c1b48ef9 100644
--- a/srcpkgs/tinc/template
+++ b/srcpkgs/tinc/template
@@ -1,7 +1,7 @@
 # Template file for 'tinc'
 pkgname=tinc
-version=1.0.35
-revision=3
+version=1.0.36
+revision=1
 build_style=gnu-configure
 makedepends="zlib-devel lzo-devel libressl-devel"
 short_desc="VPN (Virtual Private Network) daemon"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.tinc-vpn.org"
 distfiles="${homepage}/packages/${pkgname}-${version}.tar.gz"
-checksum=18c83b147cc3e2133a7ac2543eeb014d52070de01c7474287d3ccecc9b16895e
+checksum=40f73bb3facc480effe0e771442a706ff0488edea7a5f2505d4ccb2aa8163108
 
 post_install() {
 	vsv tincd
diff --git a/srcpkgs/tintin/template b/srcpkgs/tintin/template
index f277a20e188..95297ce7cb5 100644
--- a/srcpkgs/tintin/template
+++ b/srcpkgs/tintin/template
@@ -1,6 +1,6 @@
 # Template file for 'tintin'
 pkgname=tintin
-version=2.01.7
+version=2.01.90
 revision=1
 wrksrc=tt
 build_wrksrc=src
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://tintin.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/tintin/${pkgname}-${version}.tar.gz"
-checksum=fb7c8970855aa57f23bff7859ced0a63f0644f220037d2deb083d6ee2f41760c
+checksum=6b3eef2a993250d7094c5fcd4aa6ea3e2356228b006c70062f5757577c86936c
 
 post_install() {
 	for i in FAQ SCRIPTS README; do
diff --git a/srcpkgs/tinyxml2/template b/srcpkgs/tinyxml2/template
index 4a33042a4e2..73aaf563664 100644
--- a/srcpkgs/tinyxml2/template
+++ b/srcpkgs/tinyxml2/template
@@ -1,14 +1,14 @@
 # Template file for 'tinyxml2'
 pkgname=tinyxml2
-version=7.0.1
+version=7.1.0
 revision=1
 build_style=cmake
 short_desc="Simple, small and efficient C++ XML parser"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Zlib"
 homepage="http://www.grinninglizard.com/tinyxml2/index.html"
 distfiles="https://github.com/leethomason/tinyxml2/archive/${version}.tar.gz"
-checksum=a381729e32b6c2916a23544c04f342682d38b3f6e6c0cad3c25e900c3a7ef1a6
+checksum=68ebd396a4220d5a9b5a621c6e9c66349c5cfdf5efaea3f16e3bb92e45f4e2a3
 
 tinyxml2-devel_package() {
 	depends="tinyxml2-${version}_${revision}"
diff --git a/srcpkgs/tlp/template b/srcpkgs/tlp/template
index c7ba1bc4e74..841ee405a64 100644
--- a/srcpkgs/tlp/template
+++ b/srcpkgs/tlp/template
@@ -6,7 +6,7 @@ archs=noarch
 wrksrc="TLP-${version}"
 depends="hdparm bash iw util-linux ethtool perl"
 short_desc="Advanced power management tool for Linux"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://linrunner.de/en/tlp/docs/tlp-linux-advanced-power-management.html"
 #changelog="https://github.com/linrunner/TLP/blob/master/changelog"
diff --git a/srcpkgs/tmux/template b/srcpkgs/tmux/template
index 0050e3f5a22..3f11d2031cf 100644
--- a/srcpkgs/tmux/template
+++ b/srcpkgs/tmux/template
@@ -1,11 +1,11 @@
 # Template file for 'tmux'
 pkgname=tmux
 version=2.9a
-revision=1
+revision=2
 build_style=gnu-configure
 makedepends="libevent-devel ncurses-devel"
 short_desc="Terminal Multiplexer"
-maintainer="Nathan <ndowens@yahoo.com>"
+maintainer="Nathan <ndowens@gmail.com>"
 license="ISC"
 homepage="https://tmux.github.io"
 changelog="https://raw.githubusercontent.com/tmux/tmux/master/CHANGES"
diff --git a/srcpkgs/tomahawk/template b/srcpkgs/tomahawk/template
index 9dd3b936fb6..073e1b262ac 100644
--- a/srcpkgs/tomahawk/template
+++ b/srcpkgs/tomahawk/template
@@ -1,7 +1,7 @@
 # Template file for 'tomahawk'
 pkgname=tomahawk
 version=0.8.4
-revision=18
+revision=19
 wrksrc=${pkgname}-${_commit}
 _commit=00f602e10203b76fc28b4615868c567e6bd4ced4
 build_style=cmake
@@ -22,7 +22,7 @@ makedepends="Lucene++-devel attica-qt5-devel boost-devel gnutls-devel
  libechonest-qt5-devel liblastfm-qt5-devel phonon-qt5-devel qca-qt5-devel
  qt5-svg-devel qt5-tools-devel qt5-webkit-devel qtkeychain-qt5-devel
  quazip-devel sparsehash taglib-devel vlc-devel libsecret-devel
- $(vopt_if hatchet websocketpp) $(vopt_if xmpp jreen-qt5-devel)
+ $(vopt_if hatchet websocketpp) $(vopt_if xmpp jreen-devel)
  $(vopt_if kde telepathy-qt5-devel)"
 depends="virtual?phonon-qt5-backend qt5-plugin-sqlite $(vopt_if xmpp qca-qt5-ossl)"
 short_desc="Multi-source social music player"
@@ -36,6 +36,10 @@ if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
 fi
 
+case "$XBPS_TARGET_MACHINE" in
+	armv6*) makedepends+=" libatomic-devel"
+esac
+
 tomahawk-devel_package() {
 	depends="tomahawk>=${version}_${revision}"
 	short_desc+=" - development files"
diff --git a/srcpkgs/tomb/template b/srcpkgs/tomb/template
index 96ab14ea876..8c67f338b2b 100644
--- a/srcpkgs/tomb/template
+++ b/srcpkgs/tomb/template
@@ -1,18 +1,18 @@
 # Template file for 'tomb'
 pkgname=tomb
-version=2.6
+version=2.7
 revision=1
 wrksrc=Tomb-${version}
 build_style=gnu-makefile
 hostmakedepends="pkg-config"
 makedepends="libnotify-devel gtk+-devel"
 depends="sudo gnupg cryptsetup pinentry zsh"
-short_desc="A minimalistic commandline tool to manage encrypted volumes"
+short_desc="Minimalistic commandline tool to manage encrypted volumes"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.dyne.org/software/tomb/"
 distfiles="https://files.dyne.org/tomb/releases/Tomb-${version}.tar.gz"
-checksum=02b650a37c4638458f55c84db5fcfdbd57f565685581d691f59155932c9323eb
+checksum=960107427e42cf0ac10b876cdec0e9f898c10a32d078e3370b7d9b7404a06a74
 
 pre_build() {
 	sed -i extras/gtk-tray/Makefile \
@@ -35,4 +35,3 @@ do_install() {
 	make
 	vbin tomb-gtk-tray
 }
-
diff --git a/srcpkgs/toot/template b/srcpkgs/toot/template
index 1a84b430a5d..b6dcdc9ede6 100644
--- a/srcpkgs/toot/template
+++ b/srcpkgs/toot/template
@@ -1,15 +1,16 @@
 # Template file for 'toot'
 pkgname=toot
-version=0.22.0
+version=0.24.0
 revision=1
 archs=noarch
 build_style=python3-module
 pycompile_module="toot"
 hostmakedepends="python3-setuptools"
-depends="python3-BeautifulSoup4 python3-requests python3-setuptools python3-wcwidth"
+depends="python3-BeautifulSoup4 python3-requests python3-setuptools python3-wcwidth
+ python3-urwid"
 short_desc="Mastodon CLI client"
 maintainer="Nathan Owens <ndowens04@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/ihabunek/toot"
 distfiles="https://github.com/ihabunek/toot/archive/${version}.tar.gz"
-checksum=1d1a7596689ed21562cf4fd8514d76d5f19e98e02bd3ada10c44ad0cf0edd3c5
+checksum=645db4d1284cde8d29de1e6852efcb84284e66b55a1847c71b7f32a6ebe658ee
diff --git a/srcpkgs/topgrade/template b/srcpkgs/topgrade/template
index 0eb80b00365..a03c3cff609 100644
--- a/srcpkgs/topgrade/template
+++ b/srcpkgs/topgrade/template
@@ -1,6 +1,6 @@
 # Template file for 'topgrade'
 pkgname=topgrade
-version=2.8.0
+version=3.1.0
 revision=1
 build_style=cargo
 short_desc="Meta upgrade tool for pip, flatpak, your distro and everything else"
@@ -8,4 +8,4 @@ maintainer="jcgruenhage <jan.christian@gruenhage.xyz>"
 license="GPL-3.0-only"
 homepage="https://github.com/r-darwish/topgrade"
 distfiles="https://github.com/r-darwish/topgrade/archive/v${version}.tar.gz"
-checksum=a1c125ddf5f43ecb1c53a7a4b8853f6b31cdf193cf4d4f64070ee224089c8ed2
+checksum=801bec18bf3b9fd3dfa9f8343864e10dd47edae8a1d86a186d9c33a77af2608c
diff --git a/srcpkgs/tor/patches/ppc.patch b/srcpkgs/tor/patches/ppc.patch
new file mode 100644
index 00000000000..c72cdf6ad78
--- /dev/null
+++ b/srcpkgs/tor/patches/ppc.patch
@@ -0,0 +1,35 @@
+--- src/lib/sandbox/sandbox.c
++++ src/lib/sandbox/sandbox.c
+@@ -115,6 +115,16 @@
+ #define REG_SYSCALL 8
+ #define M_SYSCALL regs[REG_SYSCALL]
+ 
++#elif defined(__powerpc64__)
++
++#define REG_SYSCALL 0
++#define M_SYSCALL gp_regs[REG_SYSCALL]
++
++#elif defined(__powerpc__)
++
++#define REG_SYSCALL 0
++#define M_SYSCALL gregs[REG_SYSCALL]
++
+ #endif /* defined(__i386__) || ... */
+ 
+ /**Determines if at least one sandbox is active.*/
+@@ -1613,7 +1623,15 @@ sigsys_debugging(int nr, siginfo_t *info, void *void_context)
+   if (!ctx)
+     return;
+ 
++#if defined(__powerpc__) && !defined(__powerpc64__)
++#if defined(__GLIBC__)
++  syscall = (int) ctx->uc_mcontext.uc_regs->M_SYSCALL;
++#else
++  syscall = (int) ctx->uc_regs->M_SYSCALL;
++#endif
++#else
+   syscall = (int) ctx->uc_mcontext.M_SYSCALL;
++#endif
+ 
+ #ifdef USE_BACKTRACE
+   depth = backtrace(syscall_cb_buf, MAX_DEPTH);
diff --git a/srcpkgs/tor/patches/ppc64.patch b/srcpkgs/tor/patches/ppc64.patch
deleted file mode 100644
index aef2ba51f90..00000000000
--- a/srcpkgs/tor/patches/ppc64.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/lib/sandbox/sandbox.c	2018-12-20 17:33:15.815307612 +0100
-+++ src/lib/sandbox/sandbox.c	2018-12-20 17:36:59.795797024 +0100
-@@ -111,6 +111,11 @@
- #define REG_SYSCALL 8
- #define M_SYSCALL regs[REG_SYSCALL]
- 
-+#elif defined(__powerpc64__)
-+
-+#define REG_SYSCALL 0
-+#define M_SYSCALL gp_regs[REG_SYSCALL]
-+
- #endif /* defined(__i386__) || ... */
- 
- /**Determines if at least one sandbox is active.*/
diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index 14d51fd0dc4..f7f6fba4dfd 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,17 +1,17 @@
 # Template file for 'tor'
 pkgname=tor
-version=0.4.0.5
-revision=2
+version=0.4.1.6
+revision=1
 build_style=gnu-configure
 makedepends="libevent-devel libseccomp-devel zlib-devel"
 depends="ca-certificates torsocks"
-short_desc="Anonymity Online"
-maintainer="Orphaned <orphan@voidlinux.org>"
+short_desc="Anonymizing overlay network"
+maintainer="Daniel Eyßer <daniel.eysser@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.torproject.org/"
-changelog="https://blog.torproject.org/new-release-tor-0405"
-distfiles="https://www.torproject.org/dist/tor-${version}.tar.gz"
-checksum=b5a2cbf0dcd3f1df2675dbd5ec10bbe6f8ae995c41b68cebe2bc95bffc90696e
+changelog="https://blog.torproject.org/new-release-tor-0416"
+distfiles="https://dist.torproject.org/tor-${version}.tar.gz"
+checksum=2a88524ce426079fb9b828bc1b789f2c8ade3ed53c130851102debc3518bed71
 
 conf_files="/etc/tor/torrc"
 system_accounts="tor"
diff --git a/srcpkgs/torbrowser-launcher/template b/srcpkgs/torbrowser-launcher/template
new file mode 100644
index 00000000000..a4aa707495c
--- /dev/null
+++ b/srcpkgs/torbrowser-launcher/template
@@ -0,0 +1,21 @@
+# Template file for 'torbrowser-launcher'
+pkgname=torbrowser-launcher
+version=0.3.2
+revision=1
+archs="i686 x86_64" # limited by Tor Browser itself
+build_style=python3-module
+pycompile_module="torbrowser_launcher"
+hostmakedepends="python3-setuptools"
+depends="python3-PyQt5 python3-gpg python3-requests python3-pysocks gnupg2 tor"
+short_desc="Securely download, verify and run Tor Browser"
+maintainer="Daniel Eyßer <daniel.eysser@gmail.com>"
+license="MIT"
+homepage="https://github.com/micahflee/torbrowser-launcher"
+changelog="https://raw.githubusercontent.com/micahflee/torbrowser-launcher/master/CHANGELOG.md"
+distfiles="https://github.com/micahflee/torbrowser-launcher/archive/v${version}.tar.gz"
+checksum=25ad4b0c70579628bf18f4cdcd18ac303fe4f7f1c590cc48df2a87651c92991c
+
+post_install() {
+	vlicense LICENSE
+	rm ${DESTDIR}/usr/share/locale/torbrowser-launcher.mo # installed twice
+}
diff --git a/srcpkgs/totem/template b/srcpkgs/totem/template
index 8db4a834beb..81522b31488 100644
--- a/srcpkgs/totem/template
+++ b/srcpkgs/totem/template
@@ -1,6 +1,6 @@
 # Template file for 'totem'
 pkgname=totem
-version=3.32.1
+version=3.34.1
 revision=1
 build_style=meson
 build_helper="gir"
@@ -21,7 +21,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Videos"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7b646865083b40b6ba4fd1e846448f9c345433cc0ccdd08ee3b7eac3ae422a7b
+checksum=6bf89ab096dfc564f260976e484165f09bd886434d184410d2f944bfba611a09
 
 # XXX xulrunner plugin.
 # XXX reenable python plugin if pylint pkg exists.
diff --git a/srcpkgs/tox/template b/srcpkgs/tox/template
index c735c42c37c..8c6b63a3cb1 100644
--- a/srcpkgs/tox/template
+++ b/srcpkgs/tox/template
@@ -1,6 +1,6 @@
 # Template file for 'tox'
 pkgname=tox
-version=3.13.2
+version=3.14.0
 revision=1
 build_style=python3-module
 pycompile_module="tox"
@@ -13,7 +13,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="MIT"
 homepage="https://tox.readthedocs.io/en/latest/"
 distfiles="${PYPI_SITE}/t/tox/tox-${version}.tar.gz"
-checksum=ee35ffce74933a6c6ac10c9a0182e41763140a5a5070e21b114feca56eaccdcd
+checksum=c4f6b319c20ba4913dbfe71ebfd14ff95d1853c4231493608182f66e566ecfe1
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/translate-shell/template b/srcpkgs/translate-shell/template
index 9119ba47479..99475738ac3 100644
--- a/srcpkgs/translate-shell/template
+++ b/srcpkgs/translate-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'translate-shell'
 pkgname=translate-shell
-version=0.9.6.10
+version=0.9.6.11
 revision=1
 build_style=gnu-makefile
 make_build_args="$(vopt_if zsh TARGET=zsh)"
@@ -12,7 +12,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="Unlicense"
 homepage="https://www.soimort.org/translate-shell"
 distfiles="https://github.com/soimort/translate-shell/archive/v${version}.tar.gz"
-checksum=18c23af071ab5ae8653a5d0d1c50784b32c4a51efd9e05da07f888a6a6428958
+checksum=589505248212726dff2b3e8828514036491f019fcee8657c0d94bb1a5dac6c5b
 
 build_options="zsh"
 desc_option_zsh="Use zsh compatible wrapper"
diff --git a/srcpkgs/tty-clock/template b/srcpkgs/tty-clock/template
index b3871ee98e0..8d2b8e1282b 100644
--- a/srcpkgs/tty-clock/template
+++ b/srcpkgs/tty-clock/template
@@ -1,15 +1,18 @@
 # Template file for 'tty-clock'
 pkgname=tty-clock
 version=2.3
-revision=1
-replaces="tty-clock-git>=0"
+revision=2
 makedepends="ncurses-devel"
 short_desc="Digital clock in ncurses"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3"
+maintainer="Lugubris <lugubris@disroot.org>"
+license="BSD-3-Clause"
 homepage="https://github.com/xorg62/tty-clock"
-distfiles="https://github.com/xorg62/tty-clock/archive/v${version}.tar.gz"
-checksum=343e119858db7d5622a545e15a3bbfde65c107440700b62f9df0926db8f57984
+distfiles="https://github.com/xorg62/tty-clock/archive/v${version}.tar.gz
+ https://raw.githubusercontent.com/xorg62/tty-clock/master/LICENSE"
+checksum="343e119858db7d5622a545e15a3bbfde65c107440700b62f9df0926db8f57984
+ 19b60b629c724d426ce56bfd8effefa03555c4bafd757e66063722c9178cc971"
+replaces="tty-clock-git>=0"
+skip_extraction="LICENSE"
 
 do_build() {
 	make CC="$CC" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS -lncursesw"
@@ -19,3 +22,7 @@ do_install() {
 	vbin tty-clock
 	vman tty-clock.1
 }
+
+post_install() {
+	vlicense  ${XBPS_SRCDISTDIR}/${pkgname}-${version}/LICENSE
+}
diff --git a/srcpkgs/ttyd/template b/srcpkgs/ttyd/template
index 3fb224a0e08..0190f1c9943 100644
--- a/srcpkgs/ttyd/template
+++ b/srcpkgs/ttyd/template
@@ -1,6 +1,6 @@
 # Template file for 'ttyd'
 pkgname=ttyd
-version=1.5.1
+version=1.5.2
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config xxd"
@@ -10,7 +10,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="MIT"
 homepage="https://tsl0922.github.io/ttyd/"
 distfiles="https://github.com/tsl0922/ttyd/archive/${version}.tar.gz"
-checksum=817d33d59834f9a76af99f689339722fc1ec9f3c46c9a324665b91cb44d79ee8
+checksum=b5b62ec2ce08add0173e6d1dfdd879e55f02f9490043e89f389981a62e87d376
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/tudu/template b/srcpkgs/tudu/template
index f1dc6a0edd1..0786cb1d095 100644
--- a/srcpkgs/tudu/template
+++ b/srcpkgs/tudu/template
@@ -1,13 +1,13 @@
 # Template file for 'tudu'
 pkgname=tudu
-version=0.10.2
+version=0.10.3
 revision=1
 build_style=gnu-configure
 conf_files="/etc/tudurc"
 makedepends="ncurses-devel"
-short_desc="A command line interface to manage hierarchical todos"
+short_desc="Ncurses-based tool to manage hierarchical todos"
 maintainer="Eivind Uggedal <eivind@uggedal.com>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="http://code.meskio.net/tudu/"
 distfiles="http://code.meskio.net/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=d5e32ce04033470d2315d97cb8d44d88f19c93bfba16f61bf0681b16da6656f7
+checksum=5e58b48aa182a4bc881e0f548451920781351af42825cdb52fa0b15308bf8004
diff --git a/srcpkgs/tuir/template b/srcpkgs/tuir/template
index 2f1ba471b5b..dfc0b15c535 100644
--- a/srcpkgs/tuir/template
+++ b/srcpkgs/tuir/template
@@ -1,6 +1,6 @@
 # Template file for 'tuir'
 pkgname=tuir
-version=1.28.2
+version=1.28.3
 revision=1
 archs=noarch
 wrksrc="$pkgname-v$version"
@@ -14,7 +14,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://gitlab.com/ajak/tuir"
 distfiles="${homepage}/-/archive/v${version}/tuir-v${version}.tar.bz2"
-checksum=ad9c7af1958ee72c405a96baa4f8c3814a852574b65411e60ab0ef8778901df4
+checksum=115c209b6ded5342407c673f5cd7699c686b469f5574ac784221cc7419f664ba
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/turses/template b/srcpkgs/turses/template
index f06efd1ed9f..e5d2e11c97a 100644
--- a/srcpkgs/turses/template
+++ b/srcpkgs/turses/template
@@ -4,7 +4,7 @@ version=0.3.1
 revision=1
 build_style=python2-module
 short_desc="A Twitter client for the console"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 hostmakedepends="python-setuptools"
 depends="python-urwid python-future python-tweepy python-backports.configparser"
 license="GPL-3"
diff --git a/srcpkgs/txr/template b/srcpkgs/txr/template
index ddc98a055f7..141593d986e 100644
--- a/srcpkgs/txr/template
+++ b/srcpkgs/txr/template
@@ -1,6 +1,6 @@
 # Template file for 'txr'
 pkgname=txr
-version=223
+version=225
 revision=1
 build_style=configure
 make_check_target=tests
@@ -10,7 +10,7 @@ maintainer="Oliver Kiddle <okiddle@yahoo.co.uk>"
 license="BSD-2-Clause"
 homepage="http://www.nongnu.org/txr/"
 distfiles="http://www.kylheku.com/cgit/txr/snapshot/${pkgname}-${version}.tar.bz2"
-checksum=9bb9100c11ea958b42ed6c5e8b4c9cb95dc758a9b7a1d2e750eb3ddc22c20904
+checksum=d277c77369637afce7f43f9ff05a22a8896bafb8f70e5a428e5a64b96b06701f
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" txr"
diff --git a/srcpkgs/txtw/template b/srcpkgs/txtw/template
index 638eb000a26..59e57d5542c 100644
--- a/srcpkgs/txtw/template
+++ b/srcpkgs/txtw/template
@@ -6,7 +6,7 @@ build_style=gnu-makefile
 make_use_env=compliant
 makedepends="cairo-devel"
 short_desc="Return the pixel width of the given strings for a given font"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Unlicense"
 homepage="https://github.com/baskerville/txtw"
 distfiles="https://github.com/baskerville/txtw/archive/${version}.tar.gz"
diff --git a/srcpkgs/tzdata/template b/srcpkgs/tzdata/template
index 058aa5ec430..aafa8cfd072 100644
--- a/srcpkgs/tzdata/template
+++ b/srcpkgs/tzdata/template
@@ -1,6 +1,6 @@
 # Template file for 'tzdata'
 pkgname=tzdata
-version=2019b
+version=2019c
 revision=1
 archs=noarch
 wrksrc=tzdata
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Public Domain"
 homepage="http://www.iana.org/time-zones"
 distfiles="http://www.iana.org/time-zones/repository/releases/tzdata${version}.tar.gz"
-checksum=05d9092c90dcf9ec4f3ccfdea80c7dcea5e882b3b105c3422da172aaa9a50c64
+checksum=79c7806dab09072308da0e3d22c37d3b245015a591891ea147d3b133b60ffc7c
 
 do_install() {
 	local timezones="africa antarctica asia australasia europe northamerica \
diff --git a/srcpkgs/tzutils/template b/srcpkgs/tzutils/template
index 3d82ca54358..76e5cd69dbc 100644
--- a/srcpkgs/tzutils/template
+++ b/srcpkgs/tzutils/template
@@ -1,14 +1,14 @@
 # Template file for 'tzutils'
 pkgname=tzutils
-version=2019b
+version=2019c
 revision=1
 wrksrc="tz-${version}"
 short_desc="Time zone and daylight-saving time utilities"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Public Domain"
+maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
+license="Public Domain, BSD-3-Clause"
 homepage="https://www.iana.org/time-zones"
 distfiles="https://github.com/eggert/tz/archive/${version}.tar.gz"
-checksum=e51485f59c96a2a31170ac0700d0b76c8627ca00fa4040987352ca44cdd0887b
+checksum=38b1f7c7a050daa14fb07f6b72cdde1fc895fece40758d4d55736847041ad9e2
 
 do_build() {
 	make TZDIR=/usr/share/zoneinfo CC=$CC CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
@@ -22,3 +22,7 @@ do_install() {
 	vman zdump.8
 	vman tzselect.8
 }
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/ucspi-ssl/template b/srcpkgs/ucspi-ssl/template
index 6f490c0adab..a0b154efcf8 100644
--- a/srcpkgs/ucspi-ssl/template
+++ b/srcpkgs/ucspi-ssl/template
@@ -1,7 +1,7 @@
 # Template file for 'ucspi-ssl'
 pkgname=ucspi-ssl
 version=0.99e
-revision=2
+revision=3
 create_wrksrc=yes
 build_wrksrc="host/superscript.com/net/${pkgname}-${version}/src"
 build_style=gnu-makefile
diff --git a/srcpkgs/ufetch/template b/srcpkgs/ufetch/template
index 989dcb76523..a8b5f8cb6cf 100644
--- a/srcpkgs/ufetch/template
+++ b/srcpkgs/ufetch/template
@@ -6,7 +6,7 @@ archs=noarch
 wrksrc="ufetch-v${version}"
 depends="xbps coreutils ncurses"
 short_desc="Tiny system info for Void"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="ISC"
 homepage="https://gitlab.com/jschx/ufetch"
 distfiles="https://gitlab.com/jschx/ufetch/-/archive/v${version}/ufetch-v${version}.tar.gz"
diff --git a/srcpkgs/uget/template b/srcpkgs/uget/template
index d6d9e6d832f..a6ec77d74ef 100644
--- a/srcpkgs/uget/template
+++ b/srcpkgs/uget/template
@@ -1,7 +1,7 @@
 # Template file for 'uget'
 pkgname=uget
-version=2.2.1
-revision=4
+version=2.2.2
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="libnotify-devel gtk+3-devel libcurl-devel gstreamer1-devel"
@@ -10,4 +10,4 @@ maintainer="Alexander Mamay <alexander@mamay.su>"
 license="LGPL-2.1-or-later"
 homepage="http://ugetdm.com/"
 distfiles="${SOURCEFORGE_SITE}/urlget/${pkgname}-${version}.tar.gz"
-checksum=445cf58799a9a06e08cd4180b172f4b0a8a8c2ee82da732bdfe2dd502d949936
+checksum=5cf7f311ef59bd02b71e0ce750dd37a0299ef15f9f6c6e7e60ffd175409abfc2
diff --git a/srcpkgs/umbrello/template b/srcpkgs/umbrello/template
index 05fd6e29408..e662e17b3b2 100644
--- a/srcpkgs/umbrello/template
+++ b/srcpkgs/umbrello/template
@@ -1,17 +1,17 @@
 # Template file for 'umbrello'
 pkgname=umbrello
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
-hostmakedepends="extra-cmake-modules kcoreaddons kconfig kdoctools python qt5-host-tools qt5-qmake"
+hostmakedepends="extra-cmake-modules kcoreaddons kconfig kdoctools qt5-host-tools qt5-qmake"
 makedepends="kdelibs4support-devel ktexteditor-devel qt5-webkit-devel"
 short_desc="UML modelling tool and code generator"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://umbrello.kde.org/"
 distfiles="${KDE_SITE}/applications/${version}/src/umbrello-${version}.tar.xz"
-checksum=8df6e0394670ee3f91f449a3110312a37876d3aa047442ed8439d8b876a6b0e2
+checksum=69a721d27ecedbe694d232e04469002dcf2319dd320982aacc2a02e32430c382
 
 pre_configure() {
 	vsed -i CMakeLists.txt -e 's/# set default umbrello version/set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-suggest-override")/'
diff --git a/srcpkgs/unbound/template b/srcpkgs/unbound/template
index 6614f77681f..c4deafd3af1 100644
--- a/srcpkgs/unbound/template
+++ b/srcpkgs/unbound/template
@@ -1,6 +1,6 @@
 # Template file for 'unbound'
 pkgname=unbound
-version=1.9.2
+version=1.9.4
 revision=1
 build_style=gnu-configure
 configure_args="--with-libevent --with-conf-file=/etc/unbound/unbound.conf
@@ -16,7 +16,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://unbound.net/"
 distfiles="https://unbound.net/downloads/${pkgname}-${version}.tar.gz"
-checksum=6f7acec5cf451277fcda31729886ae7dd62537c4f506855603e3aa153fcb6b95
+checksum=3d3e25fb224025f0e732c7970e5676f53fd1764c16d6a01be073a13e42954bb0
 system_accounts="_unbound"
 
 post_install() {
@@ -37,4 +37,3 @@ unbound-devel_package() {
 		vmove usr/share/man/man3
 	}
 }
-
diff --git a/srcpkgs/unison/template b/srcpkgs/unison/template
index abdf9a02831..0f561b50bc5 100644
--- a/srcpkgs/unison/template
+++ b/srcpkgs/unison/template
@@ -1,7 +1,7 @@
 # Template file for 'unison'
 pkgname="unison"
 version=2.51.2
-revision=3
+revision=4
 hostmakedepends="ocaml"
 short_desc="A file-synchronization tool"
 maintainer="allan <mail@may.mooo.com>"
diff --git a/srcpkgs/unrar/template b/srcpkgs/unrar/template
index ea6121dd852..da0b5935eac 100644
--- a/srcpkgs/unrar/template
+++ b/srcpkgs/unrar/template
@@ -1,14 +1,14 @@
 # Template file for 'unrar'
 pkgname=unrar
-version=5.7.5
+version=5.8.2
 revision=1
 wrksrc=unrar
 short_desc="Unarchiver for .rar files (non-free version)"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="freeware"
+license="custom:freeware"
 homepage="https://www.rarlab.com/rar_add.htm"
 distfiles="https://www.rarlab.com/rar/unrarsrc-${version}.tar.gz"
-checksum=e1c2fddaa87a88b1535bfc10ca484f3c5af4e5a55fbb933f8819e26203bbe2ee
+checksum=33386623fd3fb153b56292df4a6a69b457e69e1803b6d07b614e5fd22fb33dda
 repository=nonfree
 
 do_build() {
diff --git a/srcpkgs/urh/template b/srcpkgs/urh/template
index aaa9ec03e39..2cec83082fd 100644
--- a/srcpkgs/urh/template
+++ b/srcpkgs/urh/template
@@ -1,6 +1,6 @@
 # Template file for 'urh'
 pkgname=urh
-version=2.7.3
+version=2.7.5
 revision=1
 build_style=python3-module
 pycompile_module="urh"
@@ -13,7 +13,7 @@ maintainer="bra1nwave <brainwave@openmailbox.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/jopohl/urh"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=2f82f5854dbefd2b7a11d6444b66204107ab6634ed1f90bf676b727725b18554
+checksum=fa3bba4447130a2aa0e9d0e1ff7a90ac87a5c76e8401f27a95721a8fdb11d5f2
 
 post_install() {
 	vinstall data/urh.desktop 644 usr/share/applications
diff --git a/srcpkgs/urlscan/template b/srcpkgs/urlscan/template
index 340cd9a6b78..f6f0d1db07b 100644
--- a/srcpkgs/urlscan/template
+++ b/srcpkgs/urlscan/template
@@ -1,6 +1,6 @@
 # Template file for 'urlscan'
 pkgname=urlscan
-version=0.9.3
+version=0.9.4
 revision=1
 archs=noarch
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Crestwave <crest.wave@yahoo.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/firecat53/urlscan"
 distfiles="https://github.com/firecat53/urlscan/archive/${version}.tar.gz"
-checksum=d3eaef486df70da85614b51a383fa5d570b6253c147349da29df04cd36ed7955
+checksum=fc76c3c8a852f1fbdde69faa336184b7f060b33e8e4573d6ffa8790ed6f429b6
diff --git a/srcpkgs/usbguard/files/usbguard/run b/srcpkgs/usbguard/files/usbguard/run
new file mode 100644
index 00000000000..9c33365a71e
--- /dev/null
+++ b/srcpkgs/usbguard/files/usbguard/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec usbguard-daemon
diff --git a/srcpkgs/usbguard/patches/musl.patch b/srcpkgs/usbguard/patches/musl.patch
new file mode 100644
index 00000000000..066c70c8e86
--- /dev/null
+++ b/srcpkgs/usbguard/patches/musl.patch
@@ -0,0 +1,84 @@
+--- src/CLI/usbguard.cpp.orig	2019-06-13 11:51:53.787863657 +0000
++++ src/CLI/usbguard.cpp	2019-08-23 01:52:34.233056882 +0000
+@@ -26,10 +26,8 @@
+ #include <map>
+ #include <iostream>
+ 
+-#ifndef _GNU_SOURCE
+-  #define _GNU_SOURCE
+-#endif
+-#include <cstring> /* GNU version of basename(3) */
++#include <cstring>
++#include <libgen.h>
+ 
+ #include "usbguard.hpp"
+ #include "usbguard-get-parameter.hpp"
+@@ -99,7 +97,7 @@
+ 
+   static int usbguard_cli(int argc, char* argv[])
+   {
+-    usbguard_arg0 = ::basename(argv[0]);
++    usbguard_arg0 = ::basename(strdup(argv[0]));
+ 
+     if (argc == 1) {
+       showTopLevelHelp();
+--- src/CLI/usbguard-rule-parser.cpp.orig	2019-06-13 11:51:53.783863704 +0000
++++ src/CLI/usbguard-rule-parser.cpp	2019-08-23 01:52:34.234056870 +0000
+@@ -24,10 +24,8 @@
+ #include "RuleParser.hpp"
+ 
+ #include <iostream>
+-#ifndef _GNU_SOURCE
+-  #define _GNU_SOURCE
+-#endif
+ #include <cstring>
++#include <libgen.h>
+ #include <fstream>
+ 
+ #include <getopt.h>
+@@ -43,8 +41,10 @@
+ 
+ static void showHelp(std::ostream& stream, const char* usbguard_arg0)
+ {
+-  stream << " Usage: " << ::basename(usbguard_arg0) << " [OPTIONS] <rule_spec>" << std::endl;
+-  stream << " Usage: " << ::basename(usbguard_arg0) << " [OPTIONS] -f <file>" << std::endl;
++  char *usbguard_arg0_copy = strdup(usbguard_arg0);
++  stream << " Usage: " << ::basename(usbguard_arg0_copy) << " [OPTIONS] <rule_spec>" << std::endl;
++  stream << " Usage: " << ::basename(usbguard_arg0_copy) << " [OPTIONS] -f <file>" << std::endl;
++  free(usbguard_arg0_copy);
+   stream << std::endl;
+   stream << " Options:" << std::endl;
+   stream << "  -f, --file       Interpret the argument as a path to a file that should be parsed." << std::endl;
+--- src/DBus/gdbus-server.cpp.orig	2019-06-28 08:45:27.616687137 +0000
++++ src/DBus/gdbus-server.cpp	2019-08-23 01:52:34.274056367 +0000
+@@ -23,6 +23,7 @@
+ #include <stdlib.h>
+ #include <iostream>
+ #include <getopt.h>
++#include <libgen.h>
+ #include "DBusBridge.hpp"
+ 
+ static usbguard::DBusBridge* dbus_bridge = nullptr;
+@@ -208,7 +209,9 @@
+ 
+ static void showHelp(std::ostream& stream)
+ {
+-  stream << " Usage: " << ::basename(usbguard_arg0) << " [OPTIONS]" << std::endl;
++  char *usbguard_arg0_copy = strdup(usbguard_arg0);
++  stream << " Usage: " << ::basename(usbguard_arg0_copy) << " [OPTIONS]" << std::endl;
++  free(usbguard_arg0_copy);
+   stream << std::endl;
+   stream << " Options:" << std::endl;
+   stream << "  -s, --system   Listen on the system bus." << std::endl;
+--- src/Library/public/usbguard/Exception.hpp.orig	2019-06-28 08:45:27.620687089 +0000
++++ src/Library/public/usbguard/Exception.hpp	2019-08-23 01:52:34.323055751 +0000
+@@ -116,7 +116,8 @@
+     static std::string reasonFromErrno(const int errno_value)
+     {
+       char buffer[1024];
+-      return std::string(strerror_r(errno_value, buffer, sizeof buffer));
++      strerror_r(errno_value, buffer, sizeof buffer);
++      return std::string(buffer);
+     }
+   };
+ 
diff --git a/srcpkgs/usbguard/template b/srcpkgs/usbguard/template
new file mode 100644
index 00000000000..f4de1be507d
--- /dev/null
+++ b/srcpkgs/usbguard/template
@@ -0,0 +1,20 @@
+# Template file for 'usbguard'
+pkgname=usbguard
+version=0.7.5
+revision=1
+build_style=gnu-configure
+configure_args="--with-crypto-library=sodium --with-bundled-catch --with-bundled-pegtl"
+conf_files="/etc/usbguard/*"
+make_dirs="/var/log/usbguard 0755 root root"
+hostmakedepends="automake libtool pkg-config asciidoc glib-devel protobuf"
+makedepends="libqb-devel libsodium-devel protobuf-devel dbus-glib-devel polkit-devel libcap-ng-devel libseccomp-devel"
+short_desc="Tool for whitelisting and blacklisting USB devices"
+maintainer="Philoponus Bindle <philoponus-bindle@protonmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://usbguard.github.io"
+distfiles="https://github.com/USBGuard/usbguard/releases/download/usbguard-$version/usbguard-$version.tar.gz"
+checksum=ab98091969bf4ea68d7a950997cd7af98ddac84558aa6dfe733e8fa0a936454a
+
+post_install() {
+	vsv usbguard
+}
diff --git a/srcpkgs/user-manager/template b/srcpkgs/user-manager/template
index 9becb44c393..b2c54cea4be 100644
--- a/srcpkgs/user-manager/template
+++ b/srcpkgs/user-manager/template
@@ -1,6 +1,6 @@
 # Template file for 'user-manager'
 pkgname=user-manager
-version=5.16.4
+version=5.17.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/plasma/user-manager"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3dd29a6abf8c15014ed87a448b13190516e16d8dc3a67d56f05f62d1f2e1b745
+checksum=659fab189915140e136c426d6a22852f9685ab85f1fec07a44faaa7a663c8d3d
diff --git a/srcpkgs/usql/template b/srcpkgs/usql/template
index f9ed514eba7..7f340cbebc8 100644
--- a/srcpkgs/usql/template
+++ b/srcpkgs/usql/template
@@ -1,16 +1,16 @@
 # Template file for 'usql'
 pkgname=usql
-version=0.7.4
+version=0.7.5
 revision=1
 build_style=go
 go_import_path=github.com/xo/usql
 hostmakedepends="git"
 short_desc="Universal command-line interface for SQL databases"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/xo/usql"
 distfiles="https://github.com/xo/usql/archive/v${version}.tar.gz"
-checksum=fbb1c48c49ce20c30042c9c5498d021ac8980b796287f2cbd5277178f7f8b683
+checksum=5f0478611ecaa8f069796462fdf81386fe8f53ec52aa2ec90db6e066010b597f
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/util-linux/patches/chsh.patch b/srcpkgs/util-linux/patches/chsh.patch
new file mode 100644
index 00000000000..d2cbd0d8ddf
--- /dev/null
+++ b/srcpkgs/util-linux/patches/chsh.patch
@@ -0,0 +1,89 @@
+Patch by Quentin Rameau <quinq@fifth.space>:
+use getpwuid_r since chsh uses readline (which does tilde expansion)
+can overwrite the getpwuid buffer on musl in the meantime.
+
+https://inbox.vuxu.org/voidlinux/20190922131237.93849-1-quinq@fifth.space/
+https://lore.kernel.org/util-linux/20190921185021.10568-1-quinq@fifth.space/
+
+--- include/pwdutils.h
++++ include/pwdutils.h
+@@ -5,6 +5,7 @@
+ #include <pwd.h>
+ 
+ extern struct passwd *xgetpwnam(const char *username, char **pwdbuf);
++extern struct passwd *xgetpwuid(uid_t uid, char **pwdbuf);
+ extern char *xgetlogin(void);
+ 
+ #endif /* UTIL_LINUX_PWDUTILS_H */
+--- lib/pwdutils.c
++++ lib/pwdutils.c
+@@ -36,6 +36,34 @@ failed:
+ 	return NULL;
+ }
+ 
++struct passwd *xgetpwuid(uid_t uid, char **pwdbuf)
++{
++	struct passwd *pwd = NULL, *res = NULL;
++	int rc;
++
++	if (!pwdbuf)
++		return NULL;
++
++	*pwdbuf = xmalloc(UL_GETPW_BUFSIZ);
++	pwd = xcalloc(1, sizeof(struct passwd));
++
++	errno = 0;
++	rc = getpwuid_r(uid, pwd, *pwdbuf, UL_GETPW_BUFSIZ, &res);
++	if (rc != 0) {
++		errno = rc;
++		goto failed;
++	}
++	if (!res) {
++		errno = EINVAL;
++		goto failed;
++	}
++	return pwd;
++failed:
++	free(pwd);
++	free(*pwdbuf);
++	return NULL;
++}
++
+ char *xgetlogin(void)
+ {
+ 	struct passwd *pw = NULL;
+--- login-utils/chsh.c
++++ login-utils/chsh.c
+@@ -38,6 +38,7 @@
+ #include "islocal.h"
+ #include "nls.h"
+ #include "pathnames.h"
++#include "pwdutils.h"
+ #include "setpwnam.h"
+ #include "strutils.h"
+ #include "xalloc.h"
+@@ -253,7 +254,7 @@ static void check_shell(const char *shell)
+ 
+ int main(int argc, char **argv)
+ {
+-	char *oldshell;
++	char *oldshell, *pwbuf;
+ 	int nullshell = 0;
+ 	const uid_t uid = getuid();
+ 	struct sinfo info = { NULL };
+@@ -267,12 +268,12 @@ int main(int argc, char **argv)
+ 
+ 	parse_argv(argc, argv, &info);
+ 	if (!info.username) {
+-		pw = getpwuid(uid);
++		pw = xgetpwuid(uid, &pwbuf);
+ 		if (!pw)
+ 			errx(EXIT_FAILURE, _("you (user %d) don't exist."),
+ 			     uid);
+ 	} else {
+-		pw = getpwnam(info.username);
++		pw = xgetpwnam(info.username, &pwbuf);
+ 		if (!pw)
+ 			errx(EXIT_FAILURE, _("user \"%s\" does not exist."),
+ 			     info.username);
+
diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template
index 8a06c8f1e3c..9f912097d85 100644
--- a/srcpkgs/util-linux/template
+++ b/srcpkgs/util-linux/template
@@ -1,7 +1,7 @@
 # Template file for 'util-linux'
 pkgname=util-linux
 version=2.34
-revision=1
+revision=2
 hostmakedepends="automake bison gettext-devel libtool pkg-config"
 makedepends="libcap-ng-devel pam-devel readline-devel zlib-devel"
 checkdepends="ncurses" # Some tests require terminfo-entries
diff --git a/srcpkgs/utox/template b/srcpkgs/utox/template
index 50c6972e63d..d04cc5c5748 100644
--- a/srcpkgs/utox/template
+++ b/srcpkgs/utox/template
@@ -1,7 +1,7 @@
 # Template file for 'utox'
 pkgname=utox
-version=0.17.0
-revision=3
+version=0.17.1
+revision=1
 wrksrc=uTox
 build_style=cmake
 configure_args="-DENABLE_ASAN=OFF"
@@ -9,12 +9,12 @@ hostmakedepends="pkg-config"
 makedepends="check-devel dbus-devel filter_audio-devel fontconfig-devel
  libXrender-devel libopenal-devel libsodium-devel libvpx-devel opus-devel
  toxcore-devel v4l-utils-devel"
-short_desc="Lightweight TOX instant messenger client written in C"
+short_desc="Lightweight Tox instant messenger client written in C"
 maintainer="Spencer Hill <spencernh77@gmail.com>"
 license="MIT"
 homepage="http://utox.io/"
 distfiles="https://github.com/uTox/uTox/releases/download/v${version}/uTox-${version}-full.tar.gz"
-checksum=219ae83e9139d3a421c7bb6d03cc3f8953dd36fb8e8b67100d47d92d413e9d46
+checksum=6a6d399827f31593f840274b08ed80039c99d5abf0bd6634faf22cc064930460
 nocross=yes
 
 post_install() {
diff --git a/srcpkgs/vagrant/template b/srcpkgs/vagrant/template
index 644ad031360..c3466215595 100644
--- a/srcpkgs/vagrant/template
+++ b/srcpkgs/vagrant/template
@@ -1,7 +1,7 @@
 # Template file for 'vagrant'
 pkgname=vagrant
-version=2.2.5
-revision=2
+version=2.2.6
+revision=1
 archs="i686 x86_64"
 hostmakedepends="ruby"
 makedepends="ruby-devel zlib-devel"
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 homepage="https://www.vagrantup.com/"
 distfiles="https://github.com/mitchellh/${pkgname}/archive/v${version}.tar.gz"
-checksum=0a228f5185b24b72efcc5a3924f86fa9fabab6f7562c3c63c1d9d239aa72a7b1
+checksum=1bdafbce594cb17b9b4a7d85ba3dc35093d6693b1717280e062ec64ca2c05a5b
 nocross=yes
 
 post_extract() {
diff --git a/srcpkgs/vala-panel-appmenu/template b/srcpkgs/vala-panel-appmenu/template
index fa197105c43..0913a270047 100644
--- a/srcpkgs/vala-panel-appmenu/template
+++ b/srcpkgs/vala-panel-appmenu/template
@@ -1,7 +1,7 @@
 # Template file for 'vala-panel-appmenu'
 pkgname=vala-panel-appmenu
 version=0.7.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_XFCE=ON -DENABLE_VALAPANEL=ON
  -DENABLE_MATE=ON -DENABLE_JAYATANA=OFF -DENABLE_APPMENU_GTK_MODULE=ON"
@@ -31,7 +31,7 @@ post_install() {
 appmenu-gtk-module-devel_package() {
 	short_desc="GTK module for exposing menus - development files"
 	depends="appmenu-gtk-module-${version}_${revision}
-	 appmenu-gkt3-module-${version}_${revision}"
+	 appmenu-gtk3-module-${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
diff --git a/srcpkgs/vala/template b/srcpkgs/vala/template
index f0ac1f6007b..a3001e75b98 100644
--- a/srcpkgs/vala/template
+++ b/srcpkgs/vala/template
@@ -1,7 +1,7 @@
 # Template file for 'vala'
 pkgname=vala
 # Should be kept in sync with 'valadoc' (shared distfiles)
-version=0.44.6
+version=0.46.3
 revision=1
 build_style=gnu-configure
 configure_args="--disable-valadoc"
@@ -14,7 +14,7 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
 changelog="https://gitlab.gnome.org/GNOME/vala/raw/0.42/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=ab9f1756af7460aa1e39c9a7388f5492a4252a3cd9c76b02f2033f1dedcd793a
+checksum=e29c2b1f108dc22c91bb501975a77c938aef079ca7875e1fbf41191e22cc57e3
 shlib_provides="libvalaccodegen.so"
 
 post_install() {
@@ -22,8 +22,8 @@ post_install() {
 	# so the package that use it fall into our wrapper.
 	# keep the binary versioned, we don't know the potential
 	# fallout from using the unversioned one
-	vsed -e 's|^vapigen=.*|vapigen=vapigen-0.44|g' \
-		 -i ${DESTDIR}/usr/lib/pkgconfig/vapigen-0.44.pc
+	vsed -e 's|^vapigen=.*|vapigen=vapigen-0.46|g' \
+		 -i ${DESTDIR}/usr/lib/pkgconfig/vapigen-0.46.pc
 }
 
 libvala_package() {
diff --git a/srcpkgs/valabind/template b/srcpkgs/valabind/template
index 71c2af1a2c2..10ebb16fb3f 100644
--- a/srcpkgs/valabind/template
+++ b/srcpkgs/valabind/template
@@ -1,7 +1,7 @@
 # Template file for 'valabind'
 pkgname=valabind
 version=1.7.1
-revision=3
+revision=4
 build_style=meson
 hostmakedepends="pkg-config vala-devel git"
 makedepends="vala-devel glib-devel"
diff --git a/srcpkgs/valadoc/template b/srcpkgs/valadoc/template
index 43ac247ea63..e90e31a15be 100644
--- a/srcpkgs/valadoc/template
+++ b/srcpkgs/valadoc/template
@@ -1,7 +1,7 @@
 # Template file for 'valadoc'
 pkgname=valadoc
 # Should be kept in sync with 'vala' (shared distfiles)
-version=0.44.3
+version=0.46.3
 revision=1
 wrksrc="vala-${version}"
 build_style=gnu-configure
@@ -15,7 +15,7 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
 changelog="https://gitlab.gnome.org/GNOME/vala/raw/0.42/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=8553b422484af88be1685d8b47f7b0df36ae4477c3e77e89ab22276ffed1eae9
+checksum=e29c2b1f108dc22c91bb501975a77c938aef079ca7875e1fbf41191e22cc57e3
 
 pre_configure() {
 	autoreconf -if
@@ -33,8 +33,8 @@ libvaladoc_package() {
 	short_desc+=" - shared library"
 	pkg_install() {
 		vmove "usr/lib/libvaladoc-*.so.*"
-		vmove usr/lib/valadoc
-		vmove usr/share/valadoc
+		vmove "usr/lib/valadoc-${version%.*}"
+		vmove "usr/share/valadoc-${version%.*}"
 	}
 }
 
diff --git a/srcpkgs/vamp-plugin-sdk/template b/srcpkgs/vamp-plugin-sdk/template
index 25898b714d4..97105ef69a7 100644
--- a/srcpkgs/vamp-plugin-sdk/template
+++ b/srcpkgs/vamp-plugin-sdk/template
@@ -1,16 +1,16 @@
 # Template file for 'vamp-plugin-sdk'
 pkgname=vamp-plugin-sdk
-version=2.7.1
-revision=2
+version=2.8.0
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libsndfile-devel"
-short_desc="The Vamp audio analysis plugin system"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD"
-homepage="http://www.vamp-plugins.org/"
-distfiles="https://code.soundsoftware.ac.uk/attachments/download/2206/${pkgname}-${version}.tar.gz"
-checksum=c6fef3ff79d2bf9575ce4ce4f200cbf219cbe0a21cfbad5750e86ff8ae53cb0b
+short_desc="Vamp audio analysis plugin system"
+maintainer="John <johnz@posteo.net>"
+license="MIT"
+homepage="https://www.vamp-plugins.org/"
+distfiles="https://code.soundsoftware.ac.uk/attachments/download/2450/${pkgname}-${version}.tar.gz"
+checksum=dcc96ae894795822398789f251c2c7effa602fc60e9dd6c7a5c5d2e7a513526c
 
 post_extract() {
 	# don't run test target by default, fixes cross build.
diff --git a/srcpkgs/vapoursynth/template b/srcpkgs/vapoursynth/template
index 1d021599090..dd85e8b39dc 100644
--- a/srcpkgs/vapoursynth/template
+++ b/srcpkgs/vapoursynth/template
@@ -1,6 +1,6 @@
 # Template file for 'vapoursynth'
 pkgname=vapoursynth
-version=R47.1
+version=R47.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake pkg-config libtool nasm python3-Cython"
@@ -12,7 +12,7 @@ license="LGPL-2.1-or-later, OFL-1.1"
 homepage="http://www.vapoursynth.com"
 changelog="https://raw.githubusercontent.com/vapoursynth/vapoursynth/master/ChangeLog"
 distfiles="https://github.com/vapoursynth/vapoursynth/archive/$version.tar.gz"
-checksum=095509b088ed1c3ba452ee0fed4a5f134719ac817ffc594f79557f499ad9fa6b
+checksum=8ce4553f9fc5e5bbfb26ec9c0c5bf94be307530f947424c713ef67bc8a6d22b2
 
 case $XBPS_TARGET_MACHINE in
 	aarch64*)
diff --git a/srcpkgs/varnish/INSTALL.msg b/srcpkgs/varnish/INSTALL.msg
deleted file mode 100644
index 3b1bebb7afb..00000000000
--- a/srcpkgs/varnish/INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-varnish is no longer provided by Void Linux, and will be fully removed from the repos on 2019/04/25
diff --git a/srcpkgs/varnish/files/varnishd/log/run b/srcpkgs/varnish/files/varnishd/log/run
new file mode 100755
index 00000000000..280d955ac11
--- /dev/null
+++ b/srcpkgs/varnish/files/varnishd/log/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec logger -t varnishd -p daemon.info
diff --git a/srcpkgs/varnish/files/varnishd/run b/srcpkgs/varnish/files/varnishd/run
new file mode 100755
index 00000000000..1f480573394
--- /dev/null
+++ b/srcpkgs/varnish/files/varnishd/run
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+# Default options
+VARNISH_ADDR=0.0.0.0:80
+VARNISH_MGMT_ADDR=localhost:6082
+VARNISH_CONFIG=/etc/varnish/default.vcl
+VARNISH_STORAGE=malloc,64M
+VARNISH_JAIL=unix,user=_varnish,workuser=_vcache
+VARNISH_OPTIONS=
+
+[ -r ./conf ] && . ./conf
+
+exec varnishd \
+  -F \
+  ${VARNISH_ADDR:+-a "$VARNISH_ADDR"} \
+  ${VARNISH_CONFIG:+-f "$VARNISH_CONFIG"} \
+  ${VARNISH_ADDR:+-T "$VARNISH_MGMT_ADDR"} \
+  ${VARNISH_STORAGE:+-s "$VARNISH_STORAGE"} \
+  ${VARNISH_JAIL:+-j "$VARNISH_JAIL"} \
+  ${VARNISH_OPTIONS}
diff --git a/srcpkgs/varnish/patches/musl.patch b/srcpkgs/varnish/patches/musl.patch
new file mode 100644
index 00000000000..a417c319043
--- /dev/null
+++ b/srcpkgs/varnish/patches/musl.patch
@@ -0,0 +1,22 @@
+--- include/vpf.h	2016-03-03 14:40:01.000000000 +0100
++++ include/vpf.h	2018-01-11 11:45:26.521900821 +0100
+@@ -30,6 +30,8 @@
+ #ifndef VPF_H_INCLUDED
+ #define VPF_H_INCLUDED
+ 
++#include <sys/types.h>
++
+ struct vpf_fh;
+ 
+ struct vpf_fh *VPF_Open(const char *path, mode_t mode, pid_t *pidptr);
+--- include/vsb.h	2017-11-14 14:39:22.000000000 +0100
++++ include/vsb.h	2018-01-11 11:48:15.505912873 +0100
+@@ -31,6 +31,8 @@
+ #ifndef VSB_H_INCLUDED
+ #define VSB_H_INCLUDED
+ 
++#include <sys/types.h>
++
+ /*
+  * Structure definition
+  */
diff --git a/srcpkgs/varnish/template b/srcpkgs/varnish/template
index 0dc852ece20..cdbec495da8 100644
--- a/srcpkgs/varnish/template
+++ b/srcpkgs/varnish/template
@@ -1,9 +1,66 @@
 # Template file for 'varnish'
 pkgname=varnish
-version=6.1.1
-revision=3
-archs=noarch
-build_style=meta
-short_desc="A fast caching HTTP reverse proxy (removed package)"
-license="metapackage"
+version=6.3.0
+revision=1
+build_style=gnu-configure
+configure_args="--cache-file=config.void --disable-static $(vopt_enable pcrejit pcre-jit)"
+hostmakedepends="pkg-config python3 python3-docutils python3-Sphinx"
+makedepends="pcre-devel readline-devel"
+short_desc="Fast caching HTTP reverse proxy"
+maintainer="Noel Cower <ncower@gmail.com>"
+license="BSD-2-Clause"
 homepage="https://varnish-cache.org/"
+distfiles="https://varnish-cache.org/_downloads/${pkgname}-${version}.tgz"
+checksum=95ccdec5f1dcba8b41d24e685b3f2379fbc6b9701d106cc78011d4d09a73947f
+lib32disabled=yes
+
+build_options="pcrejit"
+
+conf_files="/etc/varnish/default.vcl"
+make_dirs="/var/lib/varnish 0750 _varnish _varnish
+ /var/log/varnish 0750 _varnish _varnish"
+
+system_accounts="_varnish _vcache"
+_varnish_homedir="/var/lib/varnish"
+_vcache_pgroup="_varnish"
+
+if [ yes = "$(vopt_if pcrejit yes)" ]; then
+	# Don't permit cross builds if pcrejit is set.
+	nocross="Cannot run test program when cross compiling (PCRE_JIT)"
+elif [ "${XBPS_MACHINE%-musl}" != "${XBPS_TARGET_MACHINE%-musl}" ]; then
+	# Mark builds with different architectures as nocross.
+	nocross="Host and target architectures must be the same to run the program during build"
+fi
+
+case "$XBPS_TARGET_MACHINE" in
+	*-musl)
+		configure_args+=" --without-jemalloc"
+		makedepends+=" libexecinfo-devel"
+		;;
+	*)
+		makedepends+=" jemalloc-devel"
+		;;
+esac
+
+post_install() {
+	vinstall etc/example.vcl 644 etc/varnish default.vcl
+	vsv varnishd
+	vlicense LICENSE
+}
+
+libvarnishapi_package() {
+	short_desc+=" - API runtime library"
+	pkg_install() {
+		vmove "usr/lib/*.so.*"
+	}
+}
+libvarnishapi-devel_package() {
+	depends="libvarnishapi>=${version}_${revision}"
+	short_desc+=" - API development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+		vmove usr/share/man/man3
+	}
+}
diff --git a/srcpkgs/varnish/update b/srcpkgs/varnish/update
new file mode 100644
index 00000000000..30fbc3a065b
--- /dev/null
+++ b/srcpkgs/varnish/update
@@ -0,0 +1 @@
+site="https://varnish-cache.org/releases/index.html"
diff --git a/srcpkgs/vault/template b/srcpkgs/vault/template
index c7d6e7cbaf6..a2ed23b8215 100644
--- a/srcpkgs/vault/template
+++ b/srcpkgs/vault/template
@@ -1,19 +1,29 @@
 # Template file for 'vault'
 pkgname=vault
-version=1.2.0
+version=1.2.3
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/${pkgname}"
+go_build_tags="ui release"
+_git_commit=e16495da552c996068e05574cddf69875199f949
+go_ldflags="-X ${go_import_path}/sdk/version.GitCommit=${_git_commit}"
 conf_files="/etc/vault.hcl"
 make_dirs="/var/lib/vault 0700 _vault _vault"
+hostmakedepends="git nodejs-lts python yarn"
 short_desc="Tool for securely accessing secrets"
 maintainer="iaroki <iaroki@protonmail.com>"
 license="MPL-2.0"
 homepage="https://www.vaultproject.io/"
 distfiles="https://github.com/hashicorp/${pkgname}/archive/v${version}.tar.gz"
-checksum=9ec2b23d7f6fd16909dd409a15e0da52235ac4f0c7e1903e6cfb5de9308cab4d
+checksum=b9f909b613d53ae591a5b91a4862c750aaf59e87592b1a74b4c4651c0b5790e3
 system_accounts="_vault"
 
+pre_build() {
+	vsed -i Makefile -e "s@(find \. -name '\*\.go' | grep -v pb\.go | grep -v vendor)@(find . -name '*.go' | grep -v pb.go | grep -v vendor | grep -v ./_build-)@"
+	local depbin="${wrksrc}/_build-depbin"
+	GOOS= GOARCH= CGO_ENABLED=0 PATH="$depbin:$PATH" GOBIN="$depbin" make bootstrap ember-dist static-assets
+}
+
 post_install() {
 	vinstall ${FILESDIR}/vault.hcl 644 etc/
 	vlicense LICENSE
diff --git a/srcpkgs/vba-m/template b/srcpkgs/vba-m/template
index 94f7c6dd367..007c24f2ebd 100644
--- a/srcpkgs/vba-m/template
+++ b/srcpkgs/vba-m/template
@@ -1,8 +1,8 @@
 # Template file for 'vba-m'
 pkgname=vba-m
 reverts=1292_2
-version=2.1.3
-revision=1
+version=2.1.4
+revision=2
 wrksrc="visualboyadvance-m-${version}"
 build_style=cmake
 configure_args="-DENABLE_GTK=TRUE -DENABLE_FFMPEG=TRUE -DENABLE_LINK=TRUE"
@@ -15,4 +15,5 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/visualboyadvance-m/visualboyadvance-m/"
 distfiles="https://github.com/visualboyadvance-m/visualboyadvance-m/archive/v${version}.tar.gz"
-checksum=c64a8b400e9af862e0be74148760a7c73f98d08dcbb7d01eca81e6dc5ad376fd
+checksum=8342e017212842de66b0d86bc7610c82349af2d4e59951d969a33fff956c39ba
+nocross=y
diff --git a/srcpkgs/vhba-module-dkms/template b/srcpkgs/vhba-module-dkms/template
index 5b720d3e143..78fc526b2d2 100644
--- a/srcpkgs/vhba-module-dkms/template
+++ b/srcpkgs/vhba-module-dkms/template
@@ -1,6 +1,6 @@
 # Template file for 'vhba-module-dkms'
 pkgname=vhba-module-dkms
-version=20190410
+version=20190831
 revision=1
 wrksrc=vhba-module-${version}
 conf_files="/usr/lib/udev/rules.d/40-vhba.rules"
@@ -9,7 +9,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://cdemu.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/cdemu/vhba-module-${version}.tar.bz2"
-checksum=0c18954a8c2c7e208b20afdf785501b23be9382345e6577eba5d653002862394
+checksum=9a83772cf8bec15723f7a8105a0aae3faa057edbd5595e6c081e5803a8996bf9
 
 dkms_modules="vhba-module ${version}"
 depends="dkms"
diff --git a/srcpkgs/viewres/template b/srcpkgs/viewres/template
index 2e391ee631b..80d51af8138 100644
--- a/srcpkgs/viewres/template
+++ b/srcpkgs/viewres/template
@@ -1,6 +1,6 @@
 # Template build file for 'viewres'.
 pkgname=viewres
-version=1.0.5
+version=1.0.6
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ homepage="http://xorg.freedesktop.org"
 license="MIT"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=5ed818e84c39bcf26dadc885c9860432b85843caad3621e26d99edea660ae3d7
+checksum=11c15db02066c1d5fc3febf9b185d16c1112f87e37c4b101a484dcefffb80934
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/vifm/template b/srcpkgs/vifm/template
index 064cccf7a34..1967c6c719e 100644
--- a/srcpkgs/vifm/template
+++ b/srcpkgs/vifm/template
@@ -1,6 +1,6 @@
 # Template file for 'vifm'
 pkgname=vifm
-version=0.10
+version=0.10.1
 revision=1
 build_style=gnu-configure
 configure_args="--without-gtk"
@@ -12,11 +12,12 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://vifm.info/"
 distfiles="${SOURCEFORGE_SITE}/vifm/vifm-${version}.tar.bz2"
-checksum=e05a699f58279f69467d75d8cd3d6c8d2f62806c467fd558eda45ae9590768b8
+checksum=99006f56db05e1bdfb7983e8d5c31c9ac93bf2ac9e0409a577c8ca660fecd03b
 
 post_install() {
 	vsconf data/vifmrc
 	rm -f ${DESTDIR}/usr/share/vifm/vifmrc
 	rm -f ${DESTDIR}/usr/share/vifm/vifmrc-osx
+	rm -f ${DESTDIR}/usr/share/vifm/vifm-media-osx
 	rm -f ${DESTDIR}/usr/share/doc/vifm/COPYING
 }
diff --git a/srcpkgs/viking/template b/srcpkgs/viking/template
index 4a81b582834..c860fe5eecc 100644
--- a/srcpkgs/viking/template
+++ b/srcpkgs/viking/template
@@ -1,7 +1,7 @@
 # Template file for 'viking'
 pkgname=viking
 version=1.7
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-realtime-gps-tracking --disable-bluemarble
  --disable-bing --disable-terraserver --disable-spotmaps
diff --git a/srcpkgs/vim/template b/srcpkgs/vim/template
index 12b5ff95fdb..8f543069d19 100644
--- a/srcpkgs/vim/template
+++ b/srcpkgs/vim/template
@@ -1,7 +1,7 @@
 # Template file for 'vim'
 pkgname=vim
-version=8.1.1764
-revision=1
+version=8.1.2021
+revision=3
 hostmakedepends="glib-devel pkg-config"
 makedepends="acl-devel gtk+3-devel libXt-devel lua-devel ncurses-devel
  perl python-devel python3-devel ruby-devel"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Vim"
 homepage="https://www.vim.org"
 distfiles="https://github.com/vim/vim/archive/v${version}.tar.gz"
-checksum=c74441b7b971cb93aab12b8cd814089a2d47e18e91ca4d7e7851f3f6bafa6d7a
+checksum=b56a9cc7f950dc98fef925acfed35824979c2fa34b4607155117204891adfed8
 
 subpackages="xxd vim-common vim-x11 gvim"
 # XXX vim-huge cannot be cross compiled for now.
diff --git a/srcpkgs/vinagre/template b/srcpkgs/vinagre/template
index 2843775c7c3..05c0c384d41 100644
--- a/srcpkgs/vinagre/template
+++ b/srcpkgs/vinagre/template
@@ -1,13 +1,13 @@
 # Template file for 'vinagre'
 pkgname=vinagre
 version=3.22.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-schemas-compile --enable-compile-warnings=no"
 hostmakedepends="pkg-config intltool itstool glib gnome-doc-utils"
 makedepends="libxml2-devel libsecret-devel avahi-ui-libs-devel
- spice-devel avahi-glib-libs-devel telepathy-glib-devel vte3-devel
- gtk-vnc-devel openssh"
+ avahi-glib-libs-devel telepathy-glib-devel vte3-devel
+ spice-gtk-devel gtk-vnc-devel openssh"
 depends="openssh desktop-file-utils hicolor-icon-theme"
 short_desc="VNC client for the GNOME desktop"
 maintainer="Orphaned <orphan@voidlinux.org>"
diff --git a/srcpkgs/virt-viewer/template b/srcpkgs/virt-viewer/template
index 30342407274..530f42d4452 100644
--- a/srcpkgs/virt-viewer/template
+++ b/srcpkgs/virt-viewer/template
@@ -1,12 +1,11 @@
 # Template file for 'virt-viewer'
 pkgname=virt-viewer
 version=8.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-update-mimedb"
 hostmakedepends="glib-devel intltool pkg-config"
-makedepends="gtk-vnc-devel libvirt-glib-devel spice-devel spice-gtk-devel
- vte3-devel"
+makedepends="gtk-vnc-devel libvirt-glib-devel spice-gtk-devel vte3-devel"
 short_desc="Tool for displaying the graphical console of a virtual machine"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"
diff --git a/srcpkgs/virt-what/template b/srcpkgs/virt-what/template
index d32a392a566..ee3ad8b04b0 100644
--- a/srcpkgs/virt-what/template
+++ b/srcpkgs/virt-what/template
@@ -1,6 +1,6 @@
 # Template file for 'virt-what'
 pkgname=virt-what
-version=1.19
+version=1.20
 revision=1
 build_style=gnu-configure
 short_desc="Detect when running in a virtual machine"
@@ -8,4 +8,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="https://people.redhat.com/~rjones/virt-what/"
 distfiles="https://people.redhat.com/~rjones/${pkgname}/files/${pkgname}-${version}.tar.gz"
-checksum=936793fe396f4cfe8b8ffcb609f470503b8a2e166c7896b647fa025c3ce5d002
+checksum=f913dcd29add5121e3ffc0f2d0f17e19ff3183e8ab8ca417a5b6be43787910e8
diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index 06f85a2decd..4fdfd1d01a1 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -1,6 +1,6 @@
 # Template file for 'virtualbox-ose'
 pkgname=virtualbox-ose
-version=6.0.10
+version=6.0.12
 revision=1
 wrksrc="VirtualBox-${version%*a}"
 short_desc="General-purpose full virtualizer for x86 hardware"
@@ -9,7 +9,7 @@ license="GPL-2.0-only, CDDL-1.0"
 homepage="https://www.virtualbox.org"
 changelog="https://www.virtualbox.org/wiki/Changelog"
 distfiles="http://download.virtualbox.org/virtualbox/${version%*a}/VirtualBox-$version.tar.bz2"
-checksum=5236148a93267478fb6d306f6343aa9587d3f90f437f54c7b3485bd9d538d2f8
+checksum=c8878d1ad867461e6adfb82c22f15bf5d284e214e75f7b2c6bcd81854edeabc3
 
 nopie=yes
 lib32disabled=yes
diff --git a/srcpkgs/vivaldi/template b/srcpkgs/vivaldi/template
index caac7fc1004..4b89cc5ab17 100644
--- a/srcpkgs/vivaldi/template
+++ b/srcpkgs/vivaldi/template
@@ -1,12 +1,14 @@
 # Template file for 'vivaldi'
 pkgname=vivaldi
-version=2.6.1566.49
+version=2.8.1664.40
 revision=1
 _release=1
 archs="i686 x86_64"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Advanced browser made with the power user in mind"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
+# EULA: https://vivaldi.com/privacy/vivaldi-end-user-license-agreement/
+# Privacy Policy: https://vivaldi.com/privacy/browser/
 license="Proprietary"
 homepage="https://vivaldi.com"
 repository=nonfree
@@ -15,10 +17,10 @@ nostrip=yes
 
 if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
 	_debarch=amd64
-	checksum=2d3155a0df6dc7023679b7134c39aee82260a7115db1a6cf9bb39a38305687c2
+	checksum=5d17bda4ca21aeaa24b7cbf6a137cba60979016a5f45c86737a6309ff2b8671f
 else
 	_debarch=i386
-	checksum=21b85a22429cc8a2831806fd9a452f44f91d74b343f18707f9c36d2d17a3bc0c
+	checksum=4c84a069eefb86802192a064e252b5eb239581040a0ac28db1f1bd0a49ebe3c5
 fi
 
 distfiles="https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-${_release}_${_debarch}.deb"
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 518c232ca9b..7f343d922be 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,6 +1,6 @@
 # Template file for 'vlc'
 pkgname=vlc
-version=3.0.7.1
+version=3.0.8
 revision=2
 build_style=gnu-configure
 configure_args="--disable-gme --disable-libtar --enable-jack
@@ -8,19 +8,21 @@ configure_args="--disable-gme --disable-libtar --enable-jack
  --enable-flac --enable-merge-ffmpeg
  $(vopt_enable notify) $(vopt_enable qt) $(vopt_enable x265)
  $(vopt_enable svg) $(vopt_enable v4l2) $(vopt_enable smb smbclient)
- $(vopt_enable lua) $(vopt_enable vaapi libva) $(vopt_enable vdpau)"
+ $(vopt_enable lua) $(vopt_enable vaapi libva) $(vopt_enable vdpau)
+ $(vopt_enable chromecast microdns) $(vopt_enable chromecast)
+ $(vopt_enable chromecast sout)"
 short_desc="Cross-platform multimedia player"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only, LGPL-2.1-only"
 homepage="https://www.videolan.org/vlc/"
 changelog="https://www.videolan.org/developers/vlc-branch/NEWS"
 distfiles="https://download.videolan.org/pub/videolan/vlc/${version}/vlc-${version}.tar.xz"
-checksum=0655804371096772f06104b75c21cde8a76e3b6c8a2fdadc97914f082c6264f5
+checksum=e0149ef4a20a19b9ecd87309c2d27787ee3f47dfd47c6639644bc1f6fd95bdf6
 
 lib32disabled=yes
 
 # XXX Add missing deps: gme, telepathy, libtar (for skins2).
-hostmakedepends="automake libtool pkg-config flex bison libgcrypt-devel live555-devel $(vopt_if lua lua52)"
+hostmakedepends="automake libtool pkg-config flex bison libgcrypt-devel live555-devel $(vopt_if lua lua52) $(vopt_if chromecast protobuf)"
 makedepends="
  avahi-libs-devel dbus-glib-devel faad2-devel ffmpeg-devel freefont-ttf
  gnutls-devel jack-devel liba52-devel libass-devel libbluray-devel
@@ -36,12 +38,13 @@ makedepends="
  $(vopt_if v4l2 v4l-utils-devel) $(vopt_if smb samba-devel)
  $(vopt_if lua lua52-devel) $(vopt_if vaapi libva-devel)
  $(vopt_if vdpau libvdpau-devel) $(vopt_if x265 x265-devel)
- $(vopt_if svg librsvg-devel) $(vopt_if sndio sndio-devel)"
+ $(vopt_if svg librsvg-devel) $(vopt_if sndio sndio-devel)
+ $(vopt_if chromecast protobuf-devel) $(vopt_if chromecast libmicrodns-devel)"
 depends="freefont-ttf hicolor-icon-theme desktop-file-utils"
 
 # Package build options
-build_options="lua notify opengl qt smb svg v4l2 vaapi vdpau x265 sndio"
-build_options_default="lua smb v4l2 x265 sndio"
+build_options="lua notify opengl qt smb svg v4l2 vaapi vdpau x265 sndio chromecast"
+build_options_default="lua smb v4l2 x265 sndio chromecast"
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*|ppc64*)
diff --git a/srcpkgs/vmpk/template b/srcpkgs/vmpk/template
new file mode 100644
index 00000000000..18061b69d05
--- /dev/null
+++ b/srcpkgs/vmpk/template
@@ -0,0 +1,23 @@
+# Template file for 'vmpk'
+pkgname=vmpk
+version=0.7.1
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config libxslt docbook-xsl"
+makedepends="qt5-x11extras-devel qt5-tools-devel drumstick-devel"
+short_desc="MIDI events generator and receiver"
+maintainer="Mohammad Amin Sameti <mamins1376@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="http://vmpk.sourceforge.net"
+distfiles="${SOURCEFORGE_SITE}/vmpk/${version}/vmpk-${version}.tar.bz2"
+checksum=06d78872b8c23976cd1ed4e66ac6a3bfce93af28ce8db96c2c015cf185ce651b
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt5-qmake qt5-host-tools"
+fi
+
+post_install() {
+	for doc in NEWS ChangeLog README AUTHORS; do
+		vdoc $doc
+	done
+}
diff --git a/srcpkgs/vnstat/template b/srcpkgs/vnstat/template
index 38f4cedc944..705a0d6817b 100644
--- a/srcpkgs/vnstat/template
+++ b/srcpkgs/vnstat/template
@@ -1,6 +1,6 @@
 # Template file for 'vnstat'
 pkgname=vnstat
-version=2.3
+version=2.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
@@ -11,7 +11,7 @@ maintainer="Eivind Uggedal <eivind@uggedal.com>"
 license="GPL-2.0-only"
 homepage="https://humdi.net/vnstat/"
 distfiles="https://humdi.net/vnstat/vnstat-${version}.tar.gz"
-checksum=280af973a7c54b84ef254c69808a9ef2ff894d80ac0b2d584fa5e68e5b3a1a8d
+checksum=a0955999abd56d5463d257ffdccc9b1e9ad9ea504de81e64ba4c197f1245abaa
 
 conf_files="/etc/vnstat.conf"
 make_dirs="/var/lib/vnstat 0755 root root"
diff --git a/srcpkgs/vpnc-scripts/patches/fix-ipv6.patch b/srcpkgs/vpnc-scripts/patches/fix-ipv6.patch
deleted file mode 100644
index cd6bc126e39..00000000000
--- a/srcpkgs/vpnc-scripts/patches/fix-ipv6.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- vpnc-script	2018-02-26 15:22:35.000000000 +0000
-+++ vpnc-script	2018-08-06 12:02:25.418113014 +0100
-@@ -881,10 +881,10 @@ do_connect() {
- 		while [ $i -lt $CISCO_IPV6_SPLIT_INC ] ; do
- 			eval NETWORK="\${CISCO_IPV6_SPLIT_INC_${i}_ADDR}"
- 			eval NETMASKLEN="\${CISCO_IPV6_SPLIT_INC_${i}_MASKLEN}"
--			if [ $NETMASKLEN -lt 128 ]; then
--				set_ipv6_network_route "$NETWORK" "$NETMASKLEN" "$TUNDEV"
--			else
-+			if [ $NETMASKLEN -eq 0 ]; then
- 				set_ipv6_default_route
-+			else
-+				set_ipv6_network_route "$NETWORK" "$NETMASKLEN" "$TUNDEV"
- 			fi
- 			i=`expr $i + 1`
- 		done
diff --git a/srcpkgs/vpnc-scripts/template b/srcpkgs/vpnc-scripts/template
index 47bc5f70b07..c912bdec848 100644
--- a/srcpkgs/vpnc-scripts/template
+++ b/srcpkgs/vpnc-scripts/template
@@ -1,6 +1,6 @@
 # Template file for 'vpnc-scripts'
 pkgname=vpnc-scripts
-version=20190425
+version=20190611
 revision=1
 archs=noarch
 short_desc="Network configuration scripts for VPNC and OpenConnect"
@@ -8,7 +8,7 @@ maintainer="Eivind Uggedal <eivind@uggedal.com>"
 license="GPL-2.0-or-later"
 homepage="http://www.infradead.org/openconnect/vpnc-script.html"
 distfiles="ftp://ftp.infradead.org/pub/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=91c57042f10588487e8e49c76d8570f68e773987f66be44a064f386464878d47
+checksum=e0953af7aa336fa9f50d4db6325239024f0d6e5a95ea4ad260918c791ca96473
 
 do_install() {
 	vinstall vpnc-script 755 usr/libexec/vpnc-scripts
diff --git a/srcpkgs/vscode/patches/fix_dir.patch b/srcpkgs/vscode/patches/fix_dir.patch
index b2edcc729ca..685e04f71d0 100644
--- a/srcpkgs/vscode/patches/fix_dir.patch
+++ b/srcpkgs/vscode/patches/fix_dir.patch
@@ -1,8 +1,8 @@
 diff --git a/resources/linux/bin/code.sh b/resources/linux/bin/code.sh
-index 55f50b6f1c14..16b73343e6ea 100755
+index 564f13ef95..0aa2b48fab 100755
 --- a/resources/linux/bin/code.sh
 +++ b/resources/linux/bin/code.sh
-@@ -26,7 +26,7 @@ else
+@@ -35,7 +35,7 @@ else
  		VSCODE_PATH="$(dirname $(readlink -f $0))/.."
  	else
  		# else use the standard install location
@@ -12,14 +12,14 @@ index 55f50b6f1c14..16b73343e6ea 100755
  fi
  
 diff --git a/resources/linux/code.desktop b/resources/linux/code.desktop
-index dbc7818cecf3..eefe01f43397 100644
+index 1273bb2db7..eefe01f433 100644
 --- a/resources/linux/code.desktop
 +++ b/resources/linux/code.desktop
 @@ -2,7 +2,7 @@
  Name=@@NAME_LONG@@
  Comment=Code Editing. Redefined.
  GenericName=Text Editor
--Exec=/usr/share/@@NAME@@/@@NAME@@ --unity-launch %F
+-Exec=@@EXEC@@ --unity-launch %F
 +Exec=/usr/lib/@@NAME@@/@@NAME@@ --unity-launch %F
  Icon=@@ICON@@
  Type=Application
@@ -28,6 +28,6 @@ index dbc7818cecf3..eefe01f43397 100644
  
  [Desktop Action new-empty-window]
  Name=New Empty Window
--Exec=/usr/share/@@NAME@@/@@NAME@@ --new-window %F
+-Exec=@@EXEC@@ --new-window %F
 +Exec=/usr/lib/@@NAME@@/@@NAME@@ --new-window %F
  Icon=@@ICON@@
diff --git a/srcpkgs/vscode/patches/gulp.patch b/srcpkgs/vscode/patches/gulp.patch
index 0a1f1c8e09d..cb1e22fc2e5 100644
--- a/srcpkgs/vscode/patches/gulp.patch
+++ b/srcpkgs/vscode/patches/gulp.patch
@@ -13,7 +13,7 @@ index 090db00ffebb..0c54098d2601 100644
 +				.pipe(replace('@@NAME_LONG@@', product.nameLong))
 +				.pipe(replace('@@NAME_SHORT@@', product.nameShort))
 +				.pipe(replace('@@NAME@@', product.applicationName))
-+				.pipe(replace('@@ICON@@', `/usr/share/pixmaps/${product.applicationName}.png`));
++				.pipe(replace('@@ICON@@', `code-oss`));
 +
 +			all = es.merge(all, icon, desktop);
 		} else if (platform === 'darwin') {
diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index 2ca4af6035a..a428c44986a 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.36.1
+version=1.39.0
 revision=1
 hostmakedepends="pkg-config python nodejs-lts yarn"
 makedepends="libxkbfile-devel libsecret-devel"
@@ -10,7 +10,7 @@ maintainer="shizonic <realtiaz@gmail.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
 distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
-checksum=24b9f4046bd8ef7edb663429a58bf7dbe3acc22487a2946a4e5ead216415c065
+checksum=a2e3a718e3b10af4b4022315e35e6e144beea37b03deb3874054acbc9f86b514
 patch_args="-Np1"
 
 # Due to electron
@@ -35,11 +35,6 @@ pre_build() {
 
 do_build() {
 	export NODE_OPTIONS="${_mem_limit}"
-	# Remove once nodejs-lts >= 10; see node-gyp issue 1457 and
-	# electron/node issue 64.
-	export npm_config_build_v8_with_gn="false"
-	export npm_config_enable_lto="false"
-
 	yarn install --ignore-engines --arch=${_ARCH}
 	yarn run gulp vscode-linux-${_ARCH}-min
 }
diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index 7fe00d03692..b449f998e4a 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -1,22 +1,22 @@
 # Template file for 'vte3'
 pkgname=vte3
-version=0.56.3
+version=0.58.2
 revision=1
 wrksrc="vte-${version}"
-build_style=gnu-configure
+build_style=meson
 build_helper="gir"
-configure_args="--disable-static $(vopt_enable gir introspection)
- $(vopt_enable vala)"
+configure_args="-Db_ndebug=false -Dgir=$(vopt_if gir true false)
+ -Dvapi=$(vopt_if vala true false)"
 hostmakedepends="glib-devel gnome-doc-utils gperf intltool pkg-config
  $(vopt_if vala vala)"
-makedepends="gnutls-devel gtk+3-devel pcre2-devel $(vopt_if vala vala)"
+makedepends="gnutls-devel gtk+3-devel pcre2-devel $(vopt_if vala vala-devel)"
 depends="vte"
 short_desc="Terminal widget with improved accessibility and I18N support"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later, LGPL-2.1-or-later, LGPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Terminal/VTE"
 distfiles="${GNOME_SITE}/vte/${version%.*}/vte-${version}.tar.xz"
-checksum=17a1d4bc8848f1d2acfa4c20aaa24b9bac49f057b8909c56d3dafec2e2332648
+checksum=33c966d2b1f2c3b0f9416dbca883fd746159b5bd040350e3b78f8104b2a42bc0
 
 # Suppress warnings as errors for NULL format strings (musl libc)
 CXXFLAGS="-Wno-error=format="
@@ -42,6 +42,5 @@ vte3-devel_package() {
 		if [ "$build_option_vala" ]; then
 			vmove usr/share/vala
 		fi
-		vmove usr/share/gtk-doc
 	}
 }
diff --git a/srcpkgs/vulkan-loader/template b/srcpkgs/vulkan-loader/template
index 8b3d7653bb5..6fddbd89c20 100644
--- a/srcpkgs/vulkan-loader/template
+++ b/srcpkgs/vulkan-loader/template
@@ -1,7 +1,7 @@
 # Template file for 'vulkan-loader'
 pkgname=vulkan-loader
 _pkgname=Vulkan-Loader
-version=1.1.115
+version=1.1.123
 revision=1
 wrksrc="${_pkgname}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="Arvin Ignaci <arvin.ignaci@gmail.com>"
 license="Apache-2.0"
 homepage="https://www.khronos.org/vulkan/"
 distfiles="https://github.com/KhronosGroup/${_pkgname}/archive/v${version}.tar.gz"
-checksum=25ae51a41f5df0b15d521188a3a963e7b1c4221762613852595622eafefcb600
+checksum=9d3ddb84c21c41b259bbd59e649732f0c06b7bb9c42b27311851680bace0ddde
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DVULKAN_HEADERS_INSTALL_DIR=${XBPS_CROSS_BASE}/usr"
diff --git a/srcpkgs/w3m/template b/srcpkgs/w3m/template
index 4d632ba2e2d..ae432a48ce3 100644
--- a/srcpkgs/w3m/template
+++ b/srcpkgs/w3m/template
@@ -9,7 +9,7 @@ configure_args="--libexecdir=/usr/lib --enable-image=x11,fb
 hostmakedepends="pkg-config gc-devel perl"
 makedepends="zlib-devel ncurses-devel gc-devel libressl-devel imlib2-devel libX11-devel"
 short_desc="Text-based Web browser and pager (with Debian patches)"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://tracker.debian.org/pkg/w3m"
 changelog="https://raw.githubusercontent.com/tats/w3m/master/NEWS"
diff --git a/srcpkgs/warzone2100/template b/srcpkgs/warzone2100/template
index 4614a079ff2..9f19f6e3b71 100644
--- a/srcpkgs/warzone2100/template
+++ b/srcpkgs/warzone2100/template
@@ -1,21 +1,26 @@
 # Template file for 'warzone2100'
 pkgname=warzone2100
-version=3.2.3
-revision=6
+version=3.3.0
+revision=1
+wrksrc="warzone2100"
 build_style=gnu-configure
 configure_args="--with-distributor=void"
-hostmakedepends="zip unzip asciidoc pkg-config perl"
+hostmakedepends="zip unzip asciidoc pkg-config perl autoconf automake"
 makedepends="libpng-devel fribidi-devel fontconfig-devel SDL2-devel libvorbis-devel
- libtheora-devel libopenal-devel glew-devel physfs-devel qt5-script-devel harfbuzz-devel"
+ libtheora-devel libopenal-devel glew-devel physfs-devel harfbuzz-devel
+ qt5-script-devel"
 depends="desktop-file-utils ${pkgname}-data"
 short_desc="3D realtime strategy game on a future Earth"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="http://wz2100.net/"
-distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.xz"
-checksum=fcab9e860203e7dacda6ee60384da490a9d44aeafc07aa31ff25f9c548be7582
+maintainer="Helmut Pozimski <helmut@pozimski.eu>"
+license="GPL-2.0-or-later"
+homepage="http://wz2100.net"
+distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}_src.tar.xz"
+checksum=cc48c8128d17a499e833996470d843855389d9fc985c71f05be08901f33116e8
+nocross="cannot run test program while cross compiling"
 
-nocross="yes" # cannot run test program while cross compiling
+pre_configure() {
+	NOCONFIGURE=1 ./autogen.sh
+}
 
 warzone2100-data_package() {
 	archs=noarch
diff --git a/srcpkgs/way-cooler/template b/srcpkgs/way-cooler/template
index 1b89eda5bc5..7abf1a94ef2 100644
--- a/srcpkgs/way-cooler/template
+++ b/srcpkgs/way-cooler/template
@@ -7,7 +7,7 @@ hostmakedepends="pkg-config git python3 glib-devel"
 makedepends="dbus-devel libglib-devel cairo-devel wayland-devel wlc-devel
  libxcb-devel gdk-pixbuf-devel lua-devel"
 short_desc="Customizable Wayland compositor written in Rust with Lua API"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/way-cooler/way-cooler"
 distfiles="https://github.com/way-cooler/way-cooler/archive/v${version}.tar.gz"
diff --git a/srcpkgs/wayfire/template b/srcpkgs/wayfire/template
index 2ee4bd17ae9..c5e31d12414 100644
--- a/srcpkgs/wayfire/template
+++ b/srcpkgs/wayfire/template
@@ -1,16 +1,16 @@
 # Template file for 'wayfire'
 pkgname=wayfire
-version=0.2
+version=0.3.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config wayland-devel"
-makedepends="wlroots-devel glm cairo-devel wf-config"
+makedepends="wlroots-devel glm cairo-devel wf-config-devel"
 short_desc="3D wayland compositor"
 maintainer="Young Jin Park <youngjinpark20@gmail.com>"
 license="MIT"
 homepage="https://wayfire.org"
-distfiles="https://github.com/WayfireWM/wayfire/archive/v${version}.tar.gz"
-checksum=94fe93bb2b86048fd1c7601f97b167767e19618bb6b6226e21c22fbd052540bf
+distfiles="https://github.com/WayfireWM/wayfire/archive/${version}.tar.gz"
+checksum=c686bf5abb7f0db829196785bba4136c85d7b52d701212e21636dad75e1da0aa
 
 case $XBPS_TARGET_MACHINE in
 	*-musl) makedepends+=" libexecinfo-devel"
diff --git a/srcpkgs/wayland-protocols/template b/srcpkgs/wayland-protocols/template
index 2e30a2468a9..4a6f5ff5ddb 100644
--- a/srcpkgs/wayland-protocols/template
+++ b/srcpkgs/wayland-protocols/template
@@ -1,16 +1,16 @@
 # Template file for 'wayland-protocols'
 pkgname=wayland-protocols
-version=1.17
+version=1.18
 revision=1
 archs=noarch
 build_style=gnu-configure
 hostmakedepends="pkg-config wayland-devel automake"
 short_desc="Protocols and extensions complementing the Wayland core protocol"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://wayland.freedesktop.org"
 distfiles="https://github.com/wayland-project/wayland-protocols/archive/${version}.tar.gz"
-checksum=f35e2e3e2b0fa71a7371e8330dcbcdedf933a9da631a326459298b4f4ba54035
+checksum=eccbd485a3e657a745c46ac84cef924e9279285ae21c1289657df9a715b1ac83
 
 pre_configure() {
 	export wayland_scanner=wayland-scanner
diff --git a/srcpkgs/wayland/template b/srcpkgs/wayland/template
index 7c57799e4f8..0cbc4661752 100644
--- a/srcpkgs/wayland/template
+++ b/srcpkgs/wayland/template
@@ -7,7 +7,7 @@ configure_args="--disable-documentation --disable-static"
 hostmakedepends="flex pkg-config"
 makedepends="expat-devel libffi-devel libfl-devel libxml2-devel"
 short_desc="Wayland protocol compositor"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://wayland.freedesktop.org/"
 distfiles="https://wayland.freedesktop.org/releases/wayland-${version}.tar.xz"
diff --git a/srcpkgs/webkit2gtk/patches/fix-fast-memory-disabled.patch b/srcpkgs/webkit2gtk/patches/fix-fast-memory-disabled.patch
deleted file mode 100644
index 4b5e507274a..00000000000
--- a/srcpkgs/webkit2gtk/patches/fix-fast-memory-disabled.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- Source/JavaScriptCore/wasm/WasmFaultSignalHandler.cpp.orig	2017-09-14 10:03:40.908890971 +0200
-+++ Source/JavaScriptCore/wasm/WasmFaultSignalHandler.cpp	2017-09-14 10:04:17.084859537 +0200
-@@ -112,7 +112,11 @@ void unregisterCode(void* start, void* e
- 
- bool fastMemoryEnabled()
- {
-+#if ENABLE(WEBASSEMBLY_FAST_MEMORY)
-     return fastHandlerInstalled;
-+#else
-+    return false;
-+#endif // ENABLE(WEBASSEMBLY_FAST_MEMORY)
- }
- 
- void enableFastMemory()
diff --git a/srcpkgs/webkit2gtk/patches/fix-musl-javascriptcore.patch b/srcpkgs/webkit2gtk/patches/fix-musl-javascriptcore.patch
index c9b4de24493..129ea037849 100644
--- a/srcpkgs/webkit2gtk/patches/fix-musl-javascriptcore.patch
+++ b/srcpkgs/webkit2gtk/patches/fix-musl-javascriptcore.patch
@@ -1,10 +1,12 @@
-Source: @pullmoll
-Upstream: Alpine Linux
+Source: @q66, @pullmoll
+Original upstream: Alpine Linux
 Reason: fixing machine context access for musl libc; reduce stack/heap usage for jsc; fix some overly restrictive __GLIBC__ checks
 
---- Source/JavaScriptCore/runtime/MachineContext..orig	2018-08-10 08:48:05.000000000 +0200
-+++ Source/JavaScriptCore/runtime/MachineContext.h	2018-09-17 12:16:41.030618109 +0200
-@@ -188,7 +188,7 @@
+Updated for latest webkit2gtk.
+
+--- Source/JavaScriptCore/runtime/MachineContext.h
++++ Source/JavaScriptCore/runtime/MachineContext.h
+@@ -188,7 +188,7 @@ static inline void*& stackPointerImpl(mcontext_t& machineContext)
  #error Unknown Architecture
  #endif
  
@@ -13,7 +15,7 @@ Reason: fixing machine context access for musl libc; reduce stack/heap usage for
  
  #if CPU(X86)
      return reinterpret_cast<void*&>((uintptr_t&) machineContext.gregs[REG_ESP]);
-@@ -335,7 +335,7 @@
+@@ -335,7 +335,7 @@ static inline void*& framePointerImpl(mcontext_t& machineContext)
  #error Unknown Architecture
  #endif
  
@@ -22,7 +24,7 @@ Reason: fixing machine context access for musl libc; reduce stack/heap usage for
  
  // The following sequence depends on glibc's sys/ucontext.h.
  #if CPU(X86)
-@@ -482,7 +482,7 @@
+@@ -482,7 +482,7 @@ static inline void*& instructionPointerImpl(mcontext_t& machineContext)
  #error Unknown Architecture
  #endif
  
@@ -31,7 +33,7 @@ Reason: fixing machine context access for musl libc; reduce stack/heap usage for
  
  // The following sequence depends on glibc's sys/ucontext.h.
  #if CPU(X86)
-@@ -639,7 +639,7 @@
+@@ -639,7 +639,7 @@ inline void*& argumentPointer<1>(mcontext_t& machineContext)
  #error Unknown Architecture
  #endif
  
@@ -40,7 +42,7 @@ Reason: fixing machine context access for musl libc; reduce stack/heap usage for
  
  // The following sequence depends on glibc's sys/ucontext.h.
  #if CPU(X86)
-@@ -756,7 +756,7 @@
+@@ -756,7 +756,7 @@ inline void*& llintInstructionPointer(mcontext_t& machineContext)
  #error Unknown Architecture
  #endif
  
@@ -49,447 +51,71 @@ Reason: fixing machine context access for musl libc; reduce stack/heap usage for
  
  // The following sequence depends on glibc's sys/ucontext.h.
  #if CPU(X86)
---- Source/JavaScriptCore/runtime/Options.h.orig	2018-08-22 10:15:13.000000000 +0200
-+++ Source/JavaScriptCore/runtime/Options.h	2018-09-17 15:22:16.044174123 +0200
-@@ -130,6 +130,7 @@
+--- Source/JavaScriptCore/runtime/Options.h
++++ Source/JavaScriptCore/runtime/Options.h
+@@ -112,6 +112,16 @@ constexpr bool enableWebAssemblyStreamingApi = true;
  constexpr bool enableWebAssemblyStreamingApi = false;
  #endif
  
 +#if defined(__GLIBC__)
++constexpr unsigned jscMaxPerThreadStack = 4 * MB;
++constexpr unsigned jscSoftReservedZoneSize = 128 * KB;
++constexpr unsigned jscReservedZoneSize = 64 * KB;
++#else
++constexpr unsigned jscMaxPerThreadStack = 80 * KB;
++constexpr unsigned jscSoftReservedZoneSize = 32 * KB;
++constexpr unsigned jscReservedZoneSize = 16 * KB;
++#endif
++
  #define JSC_OPTIONS(v) \
      v(bool, validateOptions, false, Normal, "crashes if mis-typed JSC options were passed to the VM") \
      v(unsigned, dumpOptions, 0, Normal, "dumps JSC options (0 = None, 1 = Overridden only, 2 = All, 3 = Verbose)") \
-@@ -516,6 +517,397 @@
-     v(bool, traceLLIntExecution, false, Configurable, nullptr) \
-     v(bool, traceLLIntSlowPath, false, Configurable, nullptr) \
- 
-+#else	/* defined(__GLIBC__) */
-+
-+#define JSC_OPTIONS(v) \
-+    v(bool, validateOptions, false, Normal, "crashes if mis-typed JSC options were passed to the VM") \
-+    v(unsigned, dumpOptions, 0, Normal, "dumps JSC options (0 = None, 1 = Overridden only, 2 = All, 3 = Verbose)") \
-+    v(optionString, configFile, nullptr, Normal, "file to configure JSC options and logging location") \
-+    \
-+    v(bool, useLLInt,  true, Normal, "allows the LLINT to be used if true") \
-+    v(bool, useJIT,    jitEnabledByDefault(), Normal, "allows the executable pages to be allocated for JIT and thunks if true") \
-+    v(bool, useBaselineJIT, true, Normal, "allows the baseline JIT to be used if true") \
-+    v(bool, useDFGJIT, true, Normal, "allows the DFG JIT to be used if true") \
-+    v(bool, useRegExpJIT, jitEnabledByDefault(), Normal, "allows the RegExp JIT to be used if true") \
-+    v(bool, useDOMJIT, is64Bit(), Normal, "allows the DOMJIT to be used if true") \
-+    \
-+    v(bool, reportMustSucceedExecutableAllocations, false, Normal, nullptr) \
-+    \
-+    v(unsigned, maxPerThreadStackUsage, 80 * KB, Normal, "Max allowed stack usage by the VM") \
-+    v(unsigned, softReservedZoneSize, 32 * KB, Normal, "A buffer greater than reservedZoneSize that reserves space for stringifying exceptions.") \
-+    v(unsigned, reservedZoneSize, 16 * KB, Normal, "The amount of stack space we guarantee to our clients (and to interal VM code that does not call out to clients).") \
-+    \
-+    v(bool, crashIfCantAllocateJITMemory, false, Normal, nullptr) \
-+    v(unsigned, jitMemoryReservationSize, 0, Normal, "Set this number to change the executable allocation size in ExecutableAllocatorFixedVMPool. (In bytes.)") \
-+    v(bool, useSeparatedWXHeap, false, Normal, nullptr) \
-+    \
-+    v(bool, forceCodeBlockLiveness, false, Normal, nullptr) \
-+    v(bool, forceICFailure, false, Normal, nullptr) \
-+    \
-+    v(unsigned, repatchCountForCoolDown, 8, Normal, nullptr) \
-+    v(unsigned, initialCoolDownCount, 20, Normal, nullptr) \
-+    v(unsigned, repatchBufferingCountdown, 8, Normal, nullptr) \
-+    \
-+    v(bool, dumpGeneratedBytecodes, false, Normal, nullptr) \
-+    v(bool, dumpBytecodeLivenessResults, false, Normal, nullptr) \
-+    v(bool, validateBytecode, false, Normal, nullptr) \
-+    v(bool, forceDebuggerBytecodeGeneration, false, Normal, nullptr) \
-+    v(bool, dumpBytecodesBeforeGeneratorification, false, Normal, nullptr) \
-+    \
-+    v(bool, useFunctionDotArguments, true, Normal, nullptr) \
-+    v(bool, useTailCalls, true, Normal, nullptr) \
-+    v(bool, optimizeRecursiveTailCalls, true, Normal, nullptr) \
-+    v(bool, alwaysUseShadowChicken, false, Normal, nullptr) \
-+    v(unsigned, shadowChickenLogSize, 1000, Normal, nullptr) \
-+    v(unsigned, shadowChickenMaxTailDeletedFramesSize, 128, Normal, nullptr) \
-+    \
-+    /* dumpDisassembly implies dumpDFGDisassembly. */ \
-+    v(bool, dumpDisassembly, false, Normal, "dumps disassembly of all JIT compiled code upon compilation") \
-+    v(bool, asyncDisassembly, false, Normal, nullptr) \
-+    v(bool, dumpDFGDisassembly, false, Normal, "dumps disassembly of DFG function upon compilation") \
-+    v(bool, dumpFTLDisassembly, false, Normal, "dumps disassembly of FTL function upon compilation") \
-+    v(bool, dumpRegExpDisassembly, false, Normal, "dumps disassembly of RegExp upon compilation") \
-+    v(bool, dumpAllDFGNodes, false, Normal, nullptr) \
-+    v(bool, logJITCodeForPerf, false, Configurable, nullptr) \
-+    v(optionRange, bytecodeRangeToJITCompile, 0, Normal, "bytecode size range to allow compilation on, e.g. 1:100") \
-+    v(optionRange, bytecodeRangeToDFGCompile, 0, Normal, "bytecode size range to allow DFG compilation on, e.g. 1:100") \
-+    v(optionRange, bytecodeRangeToFTLCompile, 0, Normal, "bytecode size range to allow FTL compilation on, e.g. 1:100") \
-+    v(optionString, jitWhitelist, nullptr, Normal, "file with list of function signatures to allow compilation on") \
-+    v(optionString, dfgWhitelist, nullptr, Normal, "file with list of function signatures to allow DFG compilation on") \
-+    v(optionString, ftlWhitelist, nullptr, Normal, "file with list of function signatures to allow FTL compilation on") \
-+    v(bool, dumpSourceAtDFGTime, false, Normal, "dumps source code of JS function being DFG compiled") \
-+    v(bool, dumpBytecodeAtDFGTime, false, Normal, "dumps bytecode of JS function being DFG compiled") \
-+    v(bool, dumpGraphAfterParsing, false, Normal, nullptr) \
-+    v(bool, dumpGraphAtEachPhase, false, Normal, nullptr) \
-+    v(bool, dumpDFGGraphAtEachPhase, false, Normal, "dumps the DFG graph at each phase of DFG compilation (note this excludes DFG graphs during FTL compilation)") \
-+    v(bool, dumpDFGFTLGraphAtEachPhase, false, Normal, "dumps the DFG graph at each phase of DFG compilation when compiling FTL code") \
-+    v(bool, dumpB3GraphAtEachPhase, false, Normal, "dumps the B3 graph at each phase of compilation") \
-+    v(bool, dumpAirGraphAtEachPhase, false, Normal, "dumps the Air graph at each phase of compilation") \
-+    v(bool, verboseDFGBytecodeParsing, false, Normal, nullptr) \
-+    v(bool, safepointBeforeEachPhase, true, Normal, nullptr) \
-+    v(bool, verboseCompilation, false, Normal, nullptr) \
-+    v(bool, verboseFTLCompilation, false, Normal, nullptr) \
-+    v(bool, logCompilationChanges, false, Normal, nullptr) \
-+    v(bool, useProbeOSRExit, false, Normal, nullptr) \
-+    v(bool, printEachOSRExit, false, Normal, nullptr) \
-+    v(bool, validateGraph, false, Normal, nullptr) \
-+    v(bool, validateGraphAtEachPhase, false, Normal, nullptr) \
-+    v(bool, verboseValidationFailure, false, Normal, nullptr) \
-+    v(bool, verboseOSR, false, Normal, nullptr) \
-+    v(bool, verboseDFGOSRExit, false, Normal, nullptr) \
-+    v(bool, verboseFTLOSRExit, false, Normal, nullptr) \
-+    v(bool, verboseCallLink, false, Normal, nullptr) \
-+    v(bool, verboseCompilationQueue, false, Normal, nullptr) \
-+    v(bool, reportCompileTimes, false, Normal, "dumps JS function signature and the time it took to compile in all tiers") \
-+    v(bool, reportBaselineCompileTimes, false, Normal, "dumps JS function signature and the time it took to BaselineJIT compile") \
-+    v(bool, reportDFGCompileTimes, false, Normal, "dumps JS function signature and the time it took to DFG and FTL compile") \
-+    v(bool, reportFTLCompileTimes, false, Normal, "dumps JS function signature and the time it took to FTL compile") \
-+    v(bool, reportTotalCompileTimes, false, Normal, nullptr) \
-+    v(bool, reportParseTimes, false, Normal, "dumps JS function signature and the time it took to parse") \
-+    v(bool, reportBytecodeCompileTimes, false, Normal, "dumps JS function signature and the time it took to bytecode compile") \
-+    v(bool, verboseExitProfile, false, Normal, nullptr) \
-+    v(bool, verboseCFA, false, Normal, nullptr) \
-+    v(bool, verboseDFGFailure, false, Normal, nullptr) \
-+    v(bool, verboseFTLToJSThunk, false, Normal, nullptr) \
-+    v(bool, verboseFTLFailure, false, Normal, nullptr) \
-+    v(bool, alwaysComputeHash, false, Normal, nullptr) \
-+    v(bool, testTheFTL, false, Normal, nullptr) \
-+    v(bool, verboseSanitizeStack, false, Normal, nullptr) \
-+    v(bool, useGenerationalGC, true, Normal, nullptr) \
-+    v(bool, useConcurrentBarriers, true, Normal, nullptr) \
-+    v(bool, useConcurrentGC, true, Normal, nullptr) \
-+    v(bool, collectContinuously, false, Normal, nullptr) \
-+    v(double, collectContinuouslyPeriodMS, 1, Normal, nullptr) \
-+    v(bool, forceFencedBarrier, false, Normal, nullptr) \
-+    v(bool, verboseVisitRace, false, Normal, nullptr) \
-+    v(bool, optimizeParallelSlotVisitorsForStoppedMutator, false, Normal, nullptr) \
-+    v(unsigned, largeHeapSize, 32 * 1024 * 1024, Normal, nullptr) \
-+    v(unsigned, smallHeapSize, 1 * 1024 * 1024, Normal, nullptr) \
-+    v(double, smallHeapRAMFraction, 0.25, Normal, nullptr) \
-+    v(double, smallHeapGrowthFactor, 2, Normal, nullptr) \
-+    v(double, mediumHeapRAMFraction, 0.5, Normal, nullptr) \
-+    v(double, mediumHeapGrowthFactor, 1.5, Normal, nullptr) \
-+    v(double, largeHeapGrowthFactor, 1.24, Normal, nullptr) \
-+    v(double, miniVMHeapGrowthFactor, 1.27, Normal, nullptr) \
-+    v(double, criticalGCMemoryThreshold, 0.80, Normal, "percent memory in use the GC considers critical.  The collector is much more aggressive above this threshold") \
-+    v(double, minimumMutatorUtilization, 0, Normal, nullptr) \
-+    v(double, maximumMutatorUtilization, 0.7, Normal, nullptr) \
-+    v(double, epsilonMutatorUtilization, 0.01, Normal, nullptr) \
-+    v(double, concurrentGCMaxHeadroom, 1.5, Normal, nullptr) \
-+    v(double, concurrentGCPeriodMS, 2, Normal, nullptr) \
-+    v(bool, useStochasticMutatorScheduler, true, Normal, nullptr) \
-+    v(double, minimumGCPauseMS, 0.3, Normal, nullptr) \
-+    v(double, gcPauseScale, 0.3, Normal, nullptr) \
-+    v(double, gcIncrementBytes, 10000, Normal, nullptr) \
-+    v(double, gcIncrementMaxBytes, 100000, Normal, nullptr) \
-+    v(double, gcIncrementScale, 0, Normal, nullptr) \
-+    v(bool, scribbleFreeCells, false, Normal, nullptr) \
-+    v(double, sizeClassProgression, 1.4, Normal, nullptr) \
-+    v(unsigned, largeAllocationCutoff, 100000, Normal, nullptr) \
-+    v(bool, dumpSizeClasses, false, Normal, nullptr) \
-+    v(bool, useBumpAllocator, true, Normal, nullptr) \
-+    v(bool, stealEmptyBlocksFromOtherAllocators, true, Normal, nullptr) \
-+    v(bool, tradeDestructorBlocks, true, Normal, nullptr) \
-+    v(bool, eagerlyUpdateTopCallFrame, false, Normal, nullptr) \
-+    \
-+    v(bool, useOSREntryToDFG, true, Normal, nullptr) \
-+    v(bool, useOSREntryToFTL, true, Normal, nullptr) \
-+    \
-+    v(bool, useFTLJIT, true, Normal, "allows the FTL JIT to be used if true") \
-+    v(bool, useFTLTBAA, true, Normal, nullptr) \
-+    v(bool, validateFTLOSRExitLiveness, false, Normal, nullptr) \
-+    v(unsigned, defaultB3OptLevel, 2, Normal, nullptr) \
-+    v(bool, b3AlwaysFailsBeforeCompile, false, Normal, nullptr) \
-+    v(bool, b3AlwaysFailsBeforeLink, false, Normal, nullptr) \
-+    v(bool, ftlCrashes, false, Normal, nullptr) /* fool-proof way of checking that you ended up in the FTL. ;-) */\
-+    v(bool, clobberAllRegsInFTLICSlowPath, !ASSERT_DISABLED, Normal, nullptr) \
-+    v(bool, enableJITDebugAssertions, !ASSERT_DISABLED, Normal, nullptr) \
-+    v(bool, useAccessInlining, true, Normal, nullptr) \
-+    v(unsigned, maxAccessVariantListSize, 8, Normal, nullptr) \
-+    v(bool, usePolyvariantDevirtualization, true, Normal, nullptr) \
-+    v(bool, usePolymorphicAccessInlining, true, Normal, nullptr) \
-+    v(unsigned, maxPolymorphicAccessInliningListSize, 8, Normal, nullptr) \
-+    v(bool, usePolymorphicCallInlining, true, Normal, nullptr) \
-+    v(bool, usePolymorphicCallInliningForNonStubStatus, false, Normal, nullptr) \
-+    v(unsigned, maxPolymorphicCallVariantListSize, 15, Normal, nullptr) \
-+    v(unsigned, maxPolymorphicCallVariantListSizeForTopTier, 5, Normal, nullptr) \
-+    v(unsigned, maxPolymorphicCallVariantListSizeForWebAssemblyToJS, 5, Normal, nullptr) \
-+    v(unsigned, maxPolymorphicCallVariantsForInlining, 5, Normal, nullptr) \
-+    v(unsigned, frequentCallThreshold, 2, Normal, nullptr) \
-+    v(double, minimumCallToKnownRate, 0.51, Normal, nullptr) \
-+    v(bool, createPreHeaders, true, Normal, nullptr) \
-+    v(bool, useMovHintRemoval, true, Normal, nullptr) \
-+    v(bool, usePutStackSinking, true, Normal, nullptr) \
-+    v(bool, useObjectAllocationSinking, true, Normal, nullptr) \
-+    v(bool, useArityFixupInlining, true, Normal, nullptr) \
-+    v(bool, logExecutableAllocation, false, Normal, nullptr) \
-+    \
-+    v(bool, useConcurrentJIT, true, Normal, "allows the DFG / FTL compilation in threads other than the executing JS thread") \
-+    v(unsigned, numberOfDFGCompilerThreads, computeNumberOfWorkerThreads(3, 2) - 1, Normal, nullptr) \
-+    v(unsigned, numberOfFTLCompilerThreads, computeNumberOfWorkerThreads(MAXIMUM_NUMBER_OF_FTL_COMPILER_THREADS, 2) - 1, Normal, nullptr) \
-+    v(int32, priorityDeltaOfDFGCompilerThreads, computePriorityDeltaOfWorkerThreads(-1, 0), Normal, nullptr) \
-+    v(int32, priorityDeltaOfFTLCompilerThreads, computePriorityDeltaOfWorkerThreads(-2, 0), Normal, nullptr) \
-+    v(int32, priorityDeltaOfWasmCompilerThreads, computePriorityDeltaOfWorkerThreads(-1, 0), Normal, nullptr) \
-+    \
-+    v(bool, useProfiler, false, Normal, nullptr) \
-+    v(bool, disassembleBaselineForProfiler, true, Normal, nullptr) \
-+    \
-+    v(bool, useArchitectureSpecificOptimizations, true, Normal, nullptr) \
-+    \
-+    v(bool, breakOnThrow, false, Normal, nullptr) \
-+    \
-+    v(unsigned, maximumOptimizationCandidateInstructionCount, 100000, Normal, nullptr) \
-+    \
-+    v(unsigned, maximumFunctionForCallInlineCandidateInstructionCount, 190, Normal, nullptr) \
-+    v(unsigned, maximumFunctionForClosureCallInlineCandidateInstructionCount, 100, Normal, nullptr) \
-+    v(unsigned, maximumFunctionForConstructInlineCandidateInstructionCount, 100, Normal, nullptr) \
-+    \
-+    v(unsigned, maximumFTLCandidateInstructionCount, 20000, Normal, nullptr) \
-+    \
-+    /* Depth of inline stack, so 1 = no inlining, 2 = one level, etc. */ \
-+    v(unsigned, maximumInliningDepth, 5, Normal, "maximum allowed inlining depth.  Depth of 1 means no inlining") \
-+    v(unsigned, maximumInliningRecursion, 2, Normal, nullptr) \
-+    \
-+    /* Maximum size of a caller for enabling inlining. This is purely to protect us */\
-+    /* from super long compiles that take a lot of memory. */\
-+    v(unsigned, maximumInliningCallerSize, 10000, Normal, nullptr) \
-+    \
-+    v(unsigned, maximumVarargsForInlining, 100, Normal, nullptr) \
-+    \
-+    v(bool, useMaximalFlushInsertionPhase, false, Normal, "Setting to true allows the DFG's MaximalFlushInsertionPhase to run.") \
-+    \
-+    v(unsigned, maximumBinaryStringSwitchCaseLength, 50, Normal, nullptr) \
-+    v(unsigned, maximumBinaryStringSwitchTotalLength, 2000, Normal, nullptr) \
-+    \
-+    v(double, jitPolicyScale, 1.0, Normal, "scale JIT thresholds to this specified ratio between 0.0 (compile ASAP) and 1.0 (compile like normal).") \
-+    v(bool, forceEagerCompilation, false, Normal, nullptr) \
-+    v(int32, thresholdForJITAfterWarmUp, 500, Normal, nullptr) \
-+    v(int32, thresholdForJITSoon, 100, Normal, nullptr) \
-+    \
-+    v(int32, thresholdForOptimizeAfterWarmUp, 1000, Normal, nullptr) \
-+    v(int32, thresholdForOptimizeAfterLongWarmUp, 1000, Normal, nullptr) \
-+    v(int32, thresholdForOptimizeSoon, 1000, Normal, nullptr) \
-+    v(int32, executionCounterIncrementForLoop, 1, Normal, nullptr) \
-+    v(int32, executionCounterIncrementForEntry, 15, Normal, nullptr) \
-+    \
-+    v(int32, thresholdForFTLOptimizeAfterWarmUp, 100000, Normal, nullptr) \
-+    v(int32, thresholdForFTLOptimizeSoon, 1000, Normal, nullptr) \
-+    v(int32, ftlTierUpCounterIncrementForLoop, 1, Normal, nullptr) \
-+    v(int32, ftlTierUpCounterIncrementForReturn, 15, Normal, nullptr) \
-+    v(unsigned, ftlOSREntryFailureCountForReoptimization, 15, Normal, nullptr) \
-+    v(unsigned, ftlOSREntryRetryThreshold, 100, Normal, nullptr) \
-+    \
-+    v(int32, evalThresholdMultiplier, 10, Normal, nullptr) \
-+    v(unsigned, maximumEvalCacheableSourceLength, 256, Normal, nullptr) \
-+    \
-+    v(bool, randomizeExecutionCountsBetweenCheckpoints, false, Normal, nullptr) \
-+    v(int32, maximumExecutionCountsBetweenCheckpointsForBaseline, 1000, Normal, nullptr) \
-+    v(int32, maximumExecutionCountsBetweenCheckpointsForUpperTiers, 50000, Normal, nullptr) \
-+    \
-+    v(unsigned, likelyToTakeSlowCaseMinimumCount, 20, Normal, nullptr) \
-+    v(unsigned, couldTakeSlowCaseMinimumCount, 10, Normal, nullptr) \
-+    \
-+    v(unsigned, osrExitCountForReoptimization, 100, Normal, nullptr) \
-+    v(unsigned, osrExitCountForReoptimizationFromLoop, 5, Normal, nullptr) \
-+    \
-+    v(unsigned, reoptimizationRetryCounterMax, 0, Normal, nullptr)  \
-+    \
-+    v(unsigned, minimumOptimizationDelay, 1, Normal, nullptr) \
-+    v(unsigned, maximumOptimizationDelay, 5, Normal, nullptr) \
-+    v(double, desiredProfileLivenessRate, 0.75, Normal, nullptr) \
-+    v(double, desiredProfileFullnessRate, 0.35, Normal, nullptr) \
-+    \
-+    v(double, doubleVoteRatioForDoubleFormat, 2, Normal, nullptr) \
-+    v(double, structureCheckVoteRatioForHoisting, 1, Normal, nullptr) \
-+    v(double, checkArrayVoteRatioForHoisting, 1, Normal, nullptr) \
-+    \
-+    v(unsigned, maximumDirectCallStackSize, 200, Normal, nullptr) \
-+    \
-+    v(unsigned, minimumNumberOfScansBetweenRebalance, 100, Normal, nullptr) \
-+    v(unsigned, numberOfGCMarkers, computeNumberOfGCMarkers(8), Normal, nullptr) \
-+    v(bool, useParallelMarkingConstraintSolver, true, Normal, nullptr) \
-+    v(unsigned, opaqueRootMergeThreshold, 1000, Normal, nullptr) \
-+    v(double, minHeapUtilization, 0.8, Normal, nullptr) \
-+    v(double, minMarkedBlockUtilization, 0.9, Normal, nullptr) \
-+    v(unsigned, slowPathAllocsBetweenGCs, 0, Normal, "force a GC on every Nth slow path alloc, where N is specified by this option") \
-+    \
-+    v(double, percentCPUPerMBForFullTimer, 0.0003125, Normal, nullptr) \
-+    v(double, percentCPUPerMBForEdenTimer, 0.0025, Normal, nullptr) \
-+    v(double, collectionTimerMaxPercentCPU, 0.05, Normal, nullptr) \
-+    \
-+    v(bool, forceWeakRandomSeed, false, Normal, nullptr) \
-+    v(unsigned, forcedWeakRandomSeed, 0, Normal, nullptr) \
-+    \
-+    v(bool, useZombieMode, false, Normal, "debugging option to scribble over dead objects with 0xbadbeef0") \
-+    v(bool, useImmortalObjects, false, Normal, "debugging option to keep all objects alive forever") \
-+    v(bool, sweepSynchronously, false, Normal, "debugging option to sweep all dead objects synchronously at GC end before resuming mutator") \
-+    v(unsigned, maxSingleAllocationSize, 0, Configurable, "debugging option to limit individual allocations to a max size (0 = limit not set, N = limit size in bytes)") \
-+    \
-+    v(gcLogLevel, logGC, GCLogging::None, Normal, "debugging option to log GC activity (0 = None, 1 = Basic, 2 = Verbose)") \
-+    v(bool, useGC, true, Normal, nullptr) \
-+    v(bool, gcAtEnd, false, Normal, "If true, the jsc CLI will do a GC before exiting") \
-+    v(bool, forceGCSlowPaths, false, Normal, "If true, we will force all JIT fast allocations down their slow paths.") \
-+    v(unsigned, gcMaxHeapSize, 0, Normal, nullptr) \
-+    v(unsigned, forceRAMSize, 0, Normal, nullptr) \
-+    v(bool, recordGCPauseTimes, false, Normal, nullptr) \
-+    v(bool, logHeapStatisticsAtExit, false, Normal, nullptr) \
-+    v(bool, forceCodeBlockToJettisonDueToOldAge, false, Normal, "If true, this means that anytime we can jettison a CodeBlock due to old age, we do.") \
-+    v(bool, useEagerCodeBlockJettisonTiming, false, Normal, "If true, the time slices for jettisoning a CodeBlock due to old age are shrunk significantly.") \
-+    \
-+    v(bool, useTypeProfiler, false, Normal, nullptr) \
-+    v(bool, useControlFlowProfiler, false, Normal, nullptr) \
-+    \
-+    v(bool, useSamplingProfiler, false, Normal, nullptr) \
-+    v(unsigned, sampleInterval, 1000, Normal, "Time between stack traces in microseconds.") \
-+    v(bool, collectSamplingProfilerDataForJSCShell, false, Normal, "This corresponds to the JSC shell's --sample option.") \
-+    v(unsigned, samplingProfilerTopFunctionsCount, 12, Normal, "Number of top functions to report when using the command line interface.") \
-+    v(unsigned, samplingProfilerTopBytecodesCount, 40, Normal, "Number of top bytecodes to report when using the command line interface.") \
-+    v(optionString, samplingProfilerPath, nullptr, Normal, "The path to the directory to write sampiling profiler output to. This probably will not work with WK2 unless the path is in the whitelist.") \
-+    v(bool, sampleCCode, false, Normal, "Causes the sampling profiler to record profiling data for C frames.") \
-+    \
-+    v(bool, alwaysGeneratePCToCodeOriginMap, false, Normal, "This will make sure we always generate a PCToCodeOriginMap for JITed code.") \
-+    \
-+    v(bool, verifyHeap, false, Normal, nullptr) \
-+    v(unsigned, numberOfGCCyclesToRecordForVerification, 3, Normal, nullptr) \
-+    \
-+    v(unsigned, exceptionStackTraceLimit, 100, Normal, "Stack trace limit for internal Exception object") \
-+    v(unsigned, defaultErrorStackTraceLimit, 100, Normal, "The default value for Error.stackTraceLimit") \
-+    v(bool, useExceptionFuzz, false, Normal, nullptr) \
-+    v(unsigned, fireExceptionFuzzAt, 0, Normal, nullptr) \
-+    v(bool, validateDFGExceptionHandling, false, Normal, "Causes the DFG to emit code validating exception handling for each node that can exit") /* This is true by default on Debug builds */\
-+    v(bool, dumpSimulatedThrows, false, Normal, "Dumps the call stack of the last simulated throw if exception scope verification fails") \
-+    v(bool, validateExceptionChecks, false, Normal, "Verifies that needed exception checks are performed.") \
-+    v(unsigned, unexpectedExceptionStackTraceLimit, 100, Normal, "Stack trace limit for debugging unexpected exceptions observed in the VM") \
-+    \
-+    v(bool, useExecutableAllocationFuzz, false, Normal, nullptr) \
-+    v(unsigned, fireExecutableAllocationFuzzAt, 0, Normal, nullptr) \
-+    v(unsigned, fireExecutableAllocationFuzzAtOrAfter, 0, Normal, nullptr) \
-+    v(bool, verboseExecutableAllocationFuzz, false, Normal, nullptr) \
-+    \
-+    v(bool, useOSRExitFuzz, false, Normal, nullptr) \
-+    v(unsigned, fireOSRExitFuzzAtStatic, 0, Normal, nullptr) \
-+    v(unsigned, fireOSRExitFuzzAt, 0, Normal, nullptr) \
-+    v(unsigned, fireOSRExitFuzzAtOrAfter, 0, Normal, nullptr) \
-+    \
-+    v(bool, logPhaseTimes, false, Normal, nullptr) \
-+    v(double, rareBlockPenalty, 0.001, Normal, nullptr) \
-+    v(bool, airLinearScanVerbose, false, Normal, nullptr) \
-+    v(bool, airLinearScanSpillsEverything, false, Normal, nullptr) \
-+    v(bool, airForceBriggsAllocator, false, Normal, nullptr) \
-+    v(bool, airForceIRCAllocator, false, Normal, nullptr) \
-+    v(bool, airRandomizeRegs, false, Normal, nullptr) \
-+    v(bool, coalesceSpillSlots, true, Normal, nullptr) \
-+    v(bool, logAirRegisterPressure, false, Normal, nullptr) \
-+    v(bool, useB3TailDup, true, Normal, nullptr) \
-+    v(unsigned, maxB3TailDupBlockSize, 3, Normal, nullptr) \
-+    v(unsigned, maxB3TailDupBlockSuccessors, 3, Normal, nullptr) \
-+    \
-+    v(bool, useDollarVM, false, Restricted, "installs the $vm debugging tool in global objects") \
-+    v(optionString, functionOverrides, nullptr, Restricted, "file with debugging overrides for function bodies") \
-+    v(bool, useSigillCrashAnalyzer, false, Configurable, "logs data about SIGILL crashes") \
-+    \
-+    v(unsigned, watchdog, 0, Normal, "watchdog timeout (0 = Disabled, N = a timeout period of N milliseconds)") \
-+    v(bool, usePollingTraps, false, Normal, "use polling (instead of signalling) VM traps") \
-+    \
-+    v(bool, useMachForExceptions, true, Normal, "Use mach exceptions rather than signals to handle faults and pass thread messages. (This does nothing on platforms without mach)") \
-+    \
-+    v(bool, useICStats, false, Normal, nullptr) \
-+    \
-+    v(unsigned, prototypeHitCountForLLIntCaching, 2, Normal, "Number of prototype property hits before caching a prototype in the LLInt. A count of 0 means never cache.") \
-+    \
-+    v(bool, dumpCompiledRegExpPatterns, false, Normal, nullptr) \
-+    \
-+    v(bool, dumpModuleRecord, false, Normal, nullptr) \
-+    v(bool, dumpModuleLoadingState, false, Normal, nullptr) \
-+    v(bool, exposeInternalModuleLoader, false, Normal, "expose the internal module loader object to the global space for debugging") \
-+    \
-+    v(bool, useSuperSampler, false, Normal, nullptr) \
-+    \
-+    v(bool, useSourceProviderCache, true, Normal, "If false, the parser will not use the source provider cache. It's good to verify everything works when this is false. Because the cache is so successful, it can mask bugs.") \
-+    v(bool, useCodeCache, true, Normal, "If false, the unlinked byte code cache will not be used.") \
-+    \
-+    v(bool, useWebAssembly, true, Normal, "Expose the WebAssembly global object.") \
-+    \
-+    v(bool, enableSpectreMitigations, true, Restricted, "Enable Spectre mitigations.") \
-+    v(bool, enableSpectreGadgets, false, Restricted, "enable gadgets to test Spectre mitigations.") \
-+    v(bool, zeroStackFrame, false, Normal, "Zero stack frame on entry to a function.") \
-+    \
-+    v(bool, failToCompileWebAssemblyCode, false, Normal, "If true, no Wasm::Plan will sucessfully compile a function.") \
-+    v(size, webAssemblyPartialCompileLimit, 5000, Normal, "Limit on the number of bytes a Wasm::Plan::compile should attempt before checking for other work.") \
-+    v(unsigned, webAssemblyBBQOptimizationLevel, 0, Normal, "B3 Optimization level for BBQ Web Assembly module compilations.") \
-+    v(unsigned, webAssemblyOMGOptimizationLevel, Options::defaultB3OptLevel(), Normal, "B3 Optimization level for OMG Web Assembly module compilations.") \
-+    \
-+    v(bool, useBBQTierUpChecks, true, Normal, "Enables tier up checks for our BBQ code.") \
-+    v(unsigned, webAssemblyOMGTierUpCount, 5000, Normal, "The countdown before we tier up a function to OMG.") \
-+    v(unsigned, webAssemblyLoopDecrement, 15, Normal, "The amount the tier up countdown is decremented on each loop backedge.") \
-+    v(unsigned, webAssemblyFunctionEntryDecrement, 1, Normal, "The amount the tier up countdown is decremented on each function entry.") \
-+    \
-+    /* FIXME: enable fast memories on iOS and pre-allocate them. https://bugs.webkit.org/show_bug.cgi?id=170774 */ \
-+    v(bool, useWebAssemblyFastMemory, !isIOS(), Normal, "If true, we will try to use a 32-bit address space with a signal handler to bounds check wasm memory.") \
-+    v(bool, logWebAssemblyMemory, false, Normal, nullptr) \
-+    v(unsigned, webAssemblyFastMemoryRedzonePages, 128, Normal, "WebAssembly fast memories use 4GiB virtual allocations, plus a redzone (counted as multiple of 64KiB WebAssembly pages) at the end to catch reg+imm accesses which exceed 32-bit, anything beyond the redzone is explicitly bounds-checked") \
-+    v(bool, crashIfWebAssemblyCantFastMemory, false, Normal, "If true, we will crash if we can't obtain fast memory for wasm.") \
-+    v(unsigned, maxNumWebAssemblyFastMemories, 4, Normal, nullptr) \
-+    v(bool, useFastTLSForWasmContext, true, Normal, "If true, we will store context in fast TLS. If false, we will pin it to a register.") \
-+    v(bool, wasmBBQUsesAir, true, Normal, nullptr) \
-+    v(bool, useWebAssemblyStreamingApi, enableWebAssemblyStreamingApi, Normal, "Allow to run WebAssembly's Streaming API") \
-+    v(bool, useCallICsForWebAssemblyToJSCalls, true, Normal, "If true, we will use CallLinkInfo to inline cache Wasm to JS calls.") \
-+    v(bool, useEagerWebAssemblyModuleHashing, false, Normal, "Unnamed WebAssembly modules are identified in backtraces through their hash, if available.") \
-+    v(bool, useBigInt, false, Normal, "If true, we will enable BigInt support.") \
-+    v(bool, useIntlNumberFormatToParts, enableIntlNumberFormatToParts, Normal, "If true, we will enable Intl.NumberFormat.prototype.formatToParts") \
-+    v(bool, useIntlPluralRules, enableIntlPluralRules, Normal, "If true, we will enable Intl.PluralRules.") \
-+    v(bool, useArrayAllocationProfiling, true, Normal, "If true, we will use our normal array allocation profiling. If false, the allocation profile will always claim to be undecided.") \
-+    v(bool, forcePolyProto, false, Normal, "If true, create_this will always create an object with a poly proto structure.") \
-+    v(bool, forceMiniVMMode, false, Normal, "If true, it will force mini VM mode on.") \
-+    v(bool, useTracePoints, false, Normal, nullptr) \
-+    v(bool, traceLLIntExecution, false, Configurable, nullptr) \
-+    v(bool, traceLLIntSlowPath, false, Configurable, nullptr) \
-+    v(bool, traceBaselineJITExecution, false, Normal, nullptr) \
-+    v(unsigned, thresholdForGlobalLexicalBindingEpoch, UINT_MAX, Normal, "Threshold for global lexical binding epoch. If the epoch reaches to this value, CodeBlock metadata for scope operations will be revised globally. It needs to be greater than 1.") \
-+    v(optionString, diskCachePath, nullptr, Restricted, nullptr) \
-+    v(bool, forceDiskCache, false, Restricted, nullptr) \
-+
-+#endif	/* !defined(__GLIBC__) */
- 
- enum OptionEquivalence {
-     SameOption,
---- Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.cpp.orig	2018-04-18 08:26:39.000000000 +0200
-+++ Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.cpp	2018-09-17 15:42:30.694125692 +0200
-@@ -836,7 +836,7 @@
+@@ -126,9 +136,9 @@ constexpr bool enableWebAssemblyStreamingApi = false;
+     \
+     v(bool, reportMustSucceedExecutableAllocations, false, Normal, nullptr) \
+     \
+-    v(unsigned, maxPerThreadStackUsage, 4 * MB, Normal, "Max allowed stack usage by the VM") \
+-    v(unsigned, softReservedZoneSize, 128 * KB, Normal, "A buffer greater than reservedZoneSize that reserves space for stringifying exceptions.") \
+-    v(unsigned, reservedZoneSize, 64 * KB, Normal, "The amount of stack space we guarantee to our clients (and to interal VM code that does not call out to clients).") \
++    v(unsigned, maxPerThreadStackUsage, jscMaxPerThreadStack, Normal, "Max allowed stack usage by the VM") \
++    v(unsigned, softReservedZoneSize, jscSoftReservedZoneSize, Normal, "A buffer greater than reservedZoneSize that reserves space for stringifying exceptions.") \
++    v(unsigned, reservedZoneSize, jscReservedZoneSize, Normal, "The amount of stack space we guarantee to our clients (and to interal VM code that does not call out to clients).") \
+     \
+     v(bool, crashIfCantAllocateJITMemory, false, Normal, nullptr) \
+     v(unsigned, jitMemoryReservationSize, 0, Normal, "Set this number to change the executable allocation size in ExecutableAllocatorFixedVMPool. (In bytes.)") \
+--- Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.cpp
++++ Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.cpp
+@@ -728,7 +728,7 @@ int yydebug;
  #if YYERROR_VERBOSE
  
- # ifndef yystrlen
--#  if defined __GLIBC__ && defined _STRING_H
-+#  if defined __linux__ && defined _STRING_H
- #   define yystrlen strlen
- #  else
+ #    ifndef yystrlen
+-#        if defined __GLIBC__ && defined _STRING_H
++#        if defined __linux__ && defined _STRING_H
+ #            define yystrlen strlen
+ #        else
  /* Return the length of YYSTR.  */
-@@ -852,7 +852,7 @@
- # endif
- 
- # ifndef yystpcpy
--#  if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
-+#  if defined __linux__ && defined _STRING_H && defined _GNU_SOURCE
- #   define yystpcpy stpcpy
- #  else
+@@ -743,7 +743,7 @@ static YYSIZE_T yystrlen(const char *yystr)
+ #    endif
+ 
+ #    ifndef yystpcpy
+-#        if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
++#        if defined __linux__ && defined _STRING_H && defined _GNU_SOURCE
+ #            define yystpcpy stpcpy
+ #        else
  /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
---- Source/WTF/wtf/Platform.h.orig	2018-09-03 09:39:47.000000000 +0200
-+++ Source/WTF/wtf/Platform.h	2018-09-17 15:45:20.959118903 +0200
-@@ -697,7 +697,7 @@
- #define HAVE_CFNETWORK_STORAGE_PARTITIONING 1
- #endif
+--- Source/WTF/wtf/Platform.h
++++ Source/WTF/wtf/Platform.h
+@@ -707,7 +707,7 @@
+ 
+ #endif /* OS(DARWIN) */
  
 -#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || defined(__GLIBC__) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
 +#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || defined(__linux__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
  #define HAVE_MACHINE_CONTEXT 1
  #endif
  
---- Source/WebCore/xml/XPathGrammar.cpp.orig	2018-04-18 08:26:41.000000000 +0200
-+++ Source/WebCore/xml/XPathGrammar.cpp	2018-09-17 15:46:36.742115881 +0200
+--- Source/WebCore/xml/XPathGrammar.cpp
++++ Source/WebCore/xml/XPathGrammar.cpp
 @@ -966,7 +966,7 @@
  #if YYERROR_VERBOSE
  
diff --git a/srcpkgs/webkit2gtk/patches/ppc-llint.patch b/srcpkgs/webkit2gtk/patches/ppc-llint.patch
new file mode 100644
index 00000000000..f42708d5acb
--- /dev/null
+++ b/srcpkgs/webkit2gtk/patches/ppc-llint.patch
@@ -0,0 +1,41 @@
+This fixes JavaScriptCore on big endian systems (mainly ppc).
+
+Without the patch, attempting to run any JS results in
+a crash as the generated code was endian specific.
+
+--- Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
++++ Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
+@@ -1435,13 +1435,13 @@ llintOpWithMetadata(op_put_by_id, OpPutById, macro (size, get, dispatch, metadat
+     loadp StructureChain::m_vector[t3], t3
+     assert(macro (ok) btpnz t3, ok end)
+ 
+-    loadp Structure::m_prototype[t2], t2
++    loadp Structure::m_prototype + PayloadOffset[t2], t2
+     btpz t2, .opPutByIdTransitionChainDone
+ .opPutByIdTransitionChainLoop:
+     loadp [t3], t1
+     bineq t1, JSCell::m_structureID[t2], .opPutByIdSlow
+     addp 4, t3
+-    loadp Structure::m_prototype[t1], t2
++    loadp Structure::m_prototype + PayloadOffset[t1], t2
+     btpnz t2, .opPutByIdTransitionChainLoop
+ 
+ .opPutByIdTransitionChainDone:
+@@ -1952,7 +1952,7 @@ end)
+ 
+ 
+ op(llint_throw_from_slow_path_trampoline, macro()
+-    loadp Callee[cfr], t1
++    loadp Callee + PayloadOffset[cfr], t1
+     andp MarkedBlockMask, t1
+     loadp MarkedBlockFooterOffset + MarkedBlock::Footer::m_vm[t1], t1
+     copyCalleeSavesToVMEntryFrameCalleeSavesBuffer(t1, t2)
+@@ -1962,7 +1962,7 @@ op(llint_throw_from_slow_path_trampoline, macro()
+     # When throwing from the interpreter (i.e. throwing from LLIntSlowPaths), so
+     # the throw target is not necessarily interpreted code, we come to here.
+     # This essentially emulates the JIT's throwing protocol.
+-    loadp Callee[cfr], t1
++    loadp Callee + PayloadOffset[cfr], t1
+     andp MarkedBlockMask, t1
+     loadp MarkedBlockFooterOffset + MarkedBlock::Footer::m_vm[t1], t1
+     jmp VM::targetMachinePCForThrow[t1]
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index a603525306b..1c4f93ccae0 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -1,17 +1,28 @@
 # Template file for 'webkit2gtk'
 pkgname=webkit2gtk
-version=2.24.3
-revision=2
+version=2.26.0
+revision=1
 wrksrc="webkitgtk-${version}"
 build_style=cmake
 build_helper="gir"
-configure_args="-DPORT=GTK -DENABLE_GTKDOC=OFF -DCMAKE_LINKER=${XBPS_CROSS_TRIPLET}-gcc
- -DUSE_GSTREAMER_GL=OFF -DRUBY_VERSION=2.6 -DENABLE_C_LOOP=$(vopt_if jit OFF ON)
+configure_args="-DPORT=GTK -DUSE_LD_GOLD=OFF
+ -DCMAKE_CXX_FLAGS_RELEASE=-DNDEBUG
+ -DCMAKE_CXX_FLAGS_DEBUG=-DNDEBUG
+ -DCMAKE_CXX_FLAGS_RELWITHDEBINFO=-DNDEBUG
+ -DCMAKE_C_FLAGS_RELEASE=-DNDEBUG
+ -DCMAKE_C_FLAGS_DEBUG=-DNDEBUG
+ -DCMAKE_C_FLAGS_RELWITHDEBINFO=-DNDEBUG
+ -DCMAKE_LINKER=${XBPS_CROSS_TRIPLET}-gcc
+ -DRUBY_VERSION=2.6
  -DRUBY_CONFIG_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include/ruby-2.6.0
+ -DENABLE_GTKDOC=OFF -DUSE_GSTREAMER_GL=OFF -DUSE_WPE_RENDERER=OFF
+ -DENABLE_JIT=$(vopt_if jit ON OFF)
+ -DENABLE_C_LOOP=$(vopt_if jit OFF ON)
  -DENABLE_INTROSPECTION=$(vopt_if gir ON OFF)
  -DENABLE_WAYLAND_TARGET=$(vopt_if wayland ON OFF)
- -DENABLE_X11_TARGET=$(vopt_if x11 ON OFF) -DENABLE_JIT=$(vopt_if jit ON OFF)
- -DENABLE_SAMPLING_PROFILER=$(vopt_if sampling_profiler ON OFF)"
+ -DENABLE_X11_TARGET=$(vopt_if x11 ON OFF)
+ -DENABLE_SAMPLING_PROFILER=$(vopt_if sampling_profiler ON OFF)
+ -DENABLE_BUBBLEWRAP_SANDBOX=$(vopt_if bubblewrap ON OFF)"
 hostmakedepends="perl python pkg-config gperf flex ruby glib-devel geoclue2
  $(vopt_if wayland wayland-devel)"
 makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
@@ -19,47 +30,74 @@ makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
  libsoup-devel libxslt-devel gnutls-devel icu-devel enchant-devel
  dbus-glib-devel libwebp-devel gtk+-devel gtk+3-devel libgudev-devel
  libsecret-devel ruby-devel geoclue2-devel libnotify-devel hyphen-devel
- woff2-devel freetype-devel libopenjpeg2-devel
- $(vopt_if x11 libXt-devel) $(vopt_if jit '' libatomic-devel)
+ woff2-devel freetype-devel libopenjpeg2-devel libatomic-devel
+ qt5-devel $(vopt_if x11 libXt-devel)
  $(vopt_if wayland 'MesaLib-devel libxkbcommon-devel wayland-devel wayland-protocols')"
 short_desc="GTK+3 port of the WebKit2 browser engine"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later, BSD-2-Clause"
 homepage="https://webkitgtk.org/"
 distfiles="${homepage}/releases/webkitgtk-${version}.tar.xz"
-checksum=940d746d7e82c357222feb5b3f44c4b201e81df7d81ddca5ca2bf3ae0acf6c51
+checksum=d210c0ecd1a89a22c9f8f1f450334f3489c5c50159b3a5e14dd93d5f349dcced
 
-makedepends+=" qt5-devel"
+build_options="gir wayland x11 bubblewrap jit sampling_profiler"
+build_options_default="gir wayland x11 bubblewrap"
 
-# ETOOHUGE
-nodebug=1
+desc_option_bubblewrap="Enable bubblewrap sandbox"
+desc_option_jit="JavaScript JIT (Only some architectures)"
+desc_option_sampling_profiler="Sampling profiler support (JIT + glibc only)"
 
-CXXFLAGS="-Wno-expansion-to-defined -Wno-redundant-move -Wno-deprecated-copy"
-
-# Package build options
-build_options="gir wayland x11 jit sampling_profiler"
-build_options_default="gir wayland x11"
-
-desc_option_jit="Enable JustInTime JS support"
-desc_option_sampling_profiler="Toggle sampling profiler support (disabled on musl)"
+# detection + runtime
+if [ "$build_option_bubblewrap" ]; then
+	hostmakedepends+=" bubblewrap xdg-dbus-proxy"
+	makedepends+=" libseccomp-devel"
+	depends+=" bubblewrap xdg-dbus-proxy"
+fi
 
+# only a few platform support JIT
 case "$XBPS_TARGET_MACHINE" in
-	aarch64*|arm*|ppc|ppc-musl) configure_args+=" -DUSE_LD_GOLD=0";;
+	aarch64*|x86_64*|mips*)
+		build_options_default+=" jit"
+		if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
+			build_options_default+=" sampling_profiler"
+		elif [ "$build_option_sampling_profiler" ]; then
+			broken="sampling_profiler is only supported on glibc"
+		fi
+		;;
+	i686*)
+		# JIT requires SSE2 so disabled by default
+		# it's also currently broken
+		if [ "$build_option_jit" ]; then
+			broken="OffsetExtractor: No magic values found."
+		fi
+		;;
+	*)
+		if [ "$build_option_jit" ]; then
+			broken="JIT is not supported on ${XBPS_TARGET_MACHINE}"
+		fi
+		;;
 esac
 
-# JIT conflicts with sampling_profiler
-case "$XBPS_TARGET_MACHINE" in
-	i686*|ppc*|mips*|arm*) ;;
-	*-musl) build_options_default+=" jit" ;;
-	*) build_options_default+=" jit sampling_profiler" ;;
-esac
+# extra validation
+if [ "$build_option_sampling_profiler" -a -z "$build_option_jit" ]; then
+	broken="sampling_profiler requires JIT"
+fi
 
 pre_configure() {
+	# work around large debug symbols on 32-bit hosts
+	if [ "$XBPS_WORDSIZE" = "32" ]; then
+		export CFLAGS="${CFLAGS/-g/-g1}"
+		export CXXFLAGS="${CXXFLAGS/-g/-g1}"
+		export LDFLAGS+=" -Wl,--no-keep-memory"
+	fi
+
+	# the above is not enough for 32-bit ppc and debug
 	case "$XBPS_TARGET_MACHINE" in
-	armv[56]*|ppc|ppc-musl) # Add -latomic to the targets
-		find -name "CMakeLists.txt" -exec sed -i "{}" \
-		-e "/target_link_libraries/s/)/ atomic)/" \;
-		;;
+		ppc64*) ;;
+		ppc*)
+			export CFLAGS="${CFLAGS/-O2/-Os}"
+			export CXXFLAGS="${CXXFLAGS/-O2/-Os}"
+			;;
 	esac
 }
 
diff --git a/srcpkgs/weechat/template b/srcpkgs/weechat/template
index 3cf06599c6a..19f8af4fd8f 100644
--- a/srcpkgs/weechat/template
+++ b/srcpkgs/weechat/template
@@ -1,23 +1,23 @@
 # Template file for 'weechat'
 pkgname=weechat
-version=2.5
-revision=1
+version=2.6
+revision=2
 build_style=cmake
 configure_args="-DENABLE_MAN=ON -DENABLE_ENCHANT=ON -DENABLE_PERL=ON
  -DENABLE_LUA=ON -DENABLE_RUBY=ON -DENABLE_SPELL=ON
- -DPYTHON_EXECUTABLE=/usr/bin/python2.7
- -DPYTHON_LIBRARY=${XBPS_CROSS_BASE}/usr/lib/libpython2.7.so"
-hostmakedepends="ruby-asciidoctor libgcrypt-devel pkg-config python tcl-devel"
-makedepends="enchant-devel gnutls-devel libcurl-devel lua-devel python-devel
+ -DPYTHON_EXECUTABLE=/usr/bin/python3
+ -DPYTHON_LIBRARY=${XBPS_CROSS_BASE}/usr/lib/libpython3.so"
+hostmakedepends="ruby-asciidoctor libgcrypt-devel pkg-config python3 tcl-devel"
+makedepends="enchant-devel gnutls-devel libcurl-devel lua-devel python3-devel
  ruby-devel tcl-devel perl"
 depends="ca-certificates"
 short_desc="Fast, light and extensible IRC client"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.weechat.org"
 changelog="https://raw.githubusercontent.com/weechat/weechat/master/ChangeLog.adoc"
 distfiles="https://www.weechat.org/files/src/weechat-${version}.tar.xz"
-checksum=52c87775c3ff9714a62cfa5b7e13e2fa59bf32829fe083781c1d9c7f1c2d4c27
+checksum=fa9e3130e7afdfb6eff1b7892caac3efdd38a442f9989ca8c061eced2c755148
 lib32disabled=yes
 
 subpackages="weechat-aspell weechat-devel weechat-ruby weechat-python weechat-tcl weechat-lua weechat-perl"
diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template
index d9e1af044ed..183a6b266de 100644
--- a/srcpkgs/wesnoth/template
+++ b/srcpkgs/wesnoth/template
@@ -1,7 +1,7 @@
 # Template file for 'wesnoth'
 pkgname=wesnoth
-version=1.14.7
-revision=2
+version=1.14.9
+revision=1
 build_style=cmake
 configure_args="-DENABLE_OMP=1"
 hostmakedepends="pkg-config"
@@ -14,7 +14,7 @@ maintainer="Philipp Hirsch <itself@hanspolo.net>"
 license="GPL-2.0-or-later"
 homepage="https://wesnoth.org"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=475e6ce3720edf76cfc3a9b9ac015067d473a46d164dcc4406b3c8f7d8dc5e48
+checksum=ea8d51f474861c3954efdbfce3980e8c7ee58edeab714a8ab3d3f74e1dcd0dd6
 
 post_install() {
 	# runit service
diff --git a/srcpkgs/wf-config-devel b/srcpkgs/wf-config-devel
new file mode 120000
index 00000000000..fb3df2e900c
--- /dev/null
+++ b/srcpkgs/wf-config-devel
@@ -0,0 +1 @@
+wf-config/
\ No newline at end of file
diff --git a/srcpkgs/wf-config/patches/fix-musl.patch b/srcpkgs/wf-config/patches/fix-musl.patch
deleted file mode 100644
index b87797ba555..00000000000
--- a/srcpkgs/wf-config/patches/fix-musl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/config.cpp b/src/config.cpp
-index f586ab5..811ce29 100644
---- src/config.cpp
-+++ src/config.cpp
-@@ -4,6 +4,7 @@
- #include <sstream>
- #include <fstream>
- #include <algorithm>
-+#include <fcntl.h>
- 
- std::ofstream out;
- 
-
diff --git a/srcpkgs/wf-config/template b/srcpkgs/wf-config/template
index 98eee65d39e..adee709a060 100644
--- a/srcpkgs/wf-config/template
+++ b/srcpkgs/wf-config/template
@@ -1,6 +1,6 @@
 # Template file for 'wf-config'
 pkgname=wf-config
-version=0.1
+version=0.3
 revision=1
 build_style=meson
 hostmakedepends="pkg-config"
@@ -9,11 +9,19 @@ short_desc="Wayfire library for managing configuration files"
 maintainer="Young Jin Park <youngjinpark20@gmail.com>"
 license="MIT"
 homepage="https://wayfire.org"
-distfiles="https://github.com/WayfireWM/wf-config/archive/v${version}.tar.gz
- https://raw.githubusercontent.com/WayfireWM/wf-config/master/LICENSE>LICENSE.txt"
-checksum="0dac4683013d5a0b143f0e211288c7f2f621740b9ac664359297ff530a7dcdc5
- 7053b1aa75aaccfe2a2bfacd400c0a8694858797ff9c7d584664e2941fb3016e"
+distfiles="https://github.com/WayfireWM/wf-config/archive/${version}.tar.gz"
+checksum=5d1a5038b11a177174b392f3b383d787f568265ce483a5be9178698f548f7c66
 
 post_install() {
-	vlicense ../LICENSE.txt
+	vlicense LICENSE
+}
+
+wf-config-devel_package() {
+	depends="libevdev-devel wlroots-devel wf-config>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
 }
diff --git a/srcpkgs/wf-shell/template b/srcpkgs/wf-shell/template
index ccfd8c574a0..8e47f341bb6 100644
--- a/srcpkgs/wf-shell/template
+++ b/srcpkgs/wf-shell/template
@@ -1,16 +1,34 @@
 # Template file for 'wf-shell'
 pkgname=wf-shell
-version=0.1
+version=0.3
 revision=1
+_gtklayershell_hash="d1f9d94be32f8cc61c0a53af7558146570f0fa9f"
+_gvc_hash="468022b708fc1a56154f3b0cc5af3b938fb3e9fb"
+create_wrksrc=yes
+build_wrksrc=${pkgname}-${version}
 build_style=meson
-hostmakedepends="pkg-config wayland-devel"
-makedepends="gtkmm-devel libevdev-devel wlroots-devel wf-config"
+build_helper="gir"
+hostmakedepends="gobject-introspection pkg-config wayland-devel"
+makedepends="alsa-lib-devel pulseaudio-devel gtkmm-devel
+ gtk+3-devel libevdev-devel wlroots-devel wf-config-devel"
 short_desc="Wayfire shell with GTK-based panel and background client"
 maintainer="Young Jin Park <youngjinpark20@gmail.com>"
 license="MIT"
 homepage="https://wayfire.org"
-distfiles="https://github.com/WayfireWM/wf-shell/archive/${version}.tar.gz"
-checksum=625637fddf58a6a1825980e68d156ddb377cf4aae9bf5d844fb15aefee4c6f4f
+distfiles="https://github.com/WayfireWM/wf-shell/archive/${version}.tar.gz
+ https://github.com/wmww/gtk-layer-shell/archive/${_gtklayershell_hash}.tar.gz
+ https://github.com/GNOME/libgnome-volume-control/archive/${_gvc_hash}.tar.gz"
+checksum="326c732415a10215997c0915741fd561a306412327fae123eab67f1af9ee41de
+ 0b66a943375e3c8f597ca293f8e0ca0cfa585163ed5a7dfb7956c02147c40c17
+ 3ab63b0073bf21cab80b3974c9f6aa969ff1a4c4911aae6a09681c7d1b2b785f"
+
+post_extract() {
+	_gtklayershell_dir="${build_wrksrc}/subprojects/gtk-layer-shell"
+	_gvc_dir="${build_wrksrc}/subprojects/gvc"
+	rmdir ${_gtklayershell_dir} ${_gvc_dir}
+	mv gtk-layer-shell-${_gtklayershell_hash} ${_gtklayershell_dir}
+	mv libgnome-volume-control-${_gvc_hash} ${_gvc_dir}
+}
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/whois/template b/srcpkgs/whois/template
index 2093546e41d..e27f1382778 100644
--- a/srcpkgs/whois/template
+++ b/srcpkgs/whois/template
@@ -1,15 +1,16 @@
 # Template file for 'whois'
 pkgname=whois
-version=5.4.3
+version=5.5.2
 revision=1
+wrksrc=whois
 hostmakedepends="perl pkg-config"
 makedepends="libidn2-devel"
 short_desc="Improved whois client"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.linux.it/~md/software"
 distfiles="${DEBIAN_SITE}/main/w/${pkgname}/${pkgname}_${version}.tar.xz"
-checksum=fefa84029f70985db19743e51c4a8b318a169426babeaa824a27110c26090fc3
+checksum=c0594d3bc81c12958118ffa5c1bc04db105b853e7f748021588913c986fea5c0
 
 alternatives="
  whois:whois:/usr/bin/gwhois
@@ -24,3 +25,13 @@ do_install() {
 	mv ${DESTDIR}/usr/bin/{whois,gwhois}
 	mv ${DESTDIR}/usr/share/man/man1/{whois,gwhois}.1
 }
+
+mkpasswd_package() {
+	short_desc="Feature-rich front end to crypt(3) password encryption"
+	alternatives="mkpasswd:mkpasswd:/usr/bin/gmkpasswd
+	 mkpasswd:mkpasswd.1:/usr/share/man/man1/gmkpasswd.1"
+	pkg_install() {
+		vbin mkpasswd gmkpasswd
+		vman mkpasswd.1 gmkpasswd.1
+	}
+}
diff --git a/srcpkgs/wine-mono/template b/srcpkgs/wine-mono/template
index e3103a92b5a..36fdcab1d14 100644
--- a/srcpkgs/wine-mono/template
+++ b/srcpkgs/wine-mono/template
@@ -1,6 +1,6 @@
 # Template file for 'wine-mono'
 pkgname=wine-mono
-version=4.9.0
+version=4.9.3
 revision=1
 archs=noarch
 build_style=fetch
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT, GPL-3.0-or-later, LGPL-2.0-or-later"
 homepage="https://wiki.winehq.org/Mono"
 distfiles="http://dl.winehq.org/wine/wine-mono/${version}/${pkgname}-${version}.msi"
-checksum=8e2ec7ce6f10faa24e7b1b4bcab99a946dfe975c21327c8420c7abc74ee1c713
+checksum=7cf6b7674697f9de9cd1630ceb1de4c56adebb617fcca4d179a22cb7e1b2476d
 
 do_install() {
 	# The actual installation within WINE occurs at runtime in whatever
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 534b2f1ea1d..1df42b4f481 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=4.13
+version=4.17
 revision=1
 build_style=gnu-configure
 configure_args="--without-gstreamer"
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="LGPL-2.1-or-later"
 homepage="http://www.winehq.org/"
 distfiles="https://dl.winehq.org/wine/source/${version%%.*}.x/wine-${version}.tar.xz"
-checksum=79174151cbc403250d4727dc9c55df8d6a60a2fe28343642c2452a92c6431d67
+checksum=7480a1436687486996ba6cf91fef71b70e6dafffbf2c55ea2430094c1025b2ae
 
 nopie_files="/usr/bin/wine"
 
diff --git a/srcpkgs/winetricks/template b/srcpkgs/winetricks/template
index 14b578dbe56..4083fb68c1b 100644
--- a/srcpkgs/winetricks/template
+++ b/srcpkgs/winetricks/template
@@ -1,6 +1,6 @@
 # Template file for 'winetricks'
 pkgname=winetricks
-version=20190615
+version=20190912
 revision=1
 archs=noarch
 build_style=gnu-makefile
@@ -10,4 +10,4 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="LGPL-3.0-or-later"
 homepage="http://wiki.winehq.org/winetricks"
 distfiles="https://github.com/Winetricks/winetricks/archive/$version.tar.gz"
-checksum=2a5ebbd95e0ed0041f903148af19ba28d5b7e29a62db4501771dfffb7368fc42
+checksum=acedd8aebe9a7fef4548ff8a47cc8ab7e6d13f6051c1b79d51cd4105e0f7fb9f
diff --git a/srcpkgs/wireguard/template b/srcpkgs/wireguard/template
index 847c9b797b6..7d38a9bca97 100644
--- a/srcpkgs/wireguard/template
+++ b/srcpkgs/wireguard/template
@@ -1,6 +1,6 @@
 # Template file for 'wireguard'
 pkgname=wireguard
-version=0.0.20190702
+version=0.0.20191012
 revision=1
 wrksrc="WireGuard-${version}"
 build_wrksrc="src/tools"
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://www.wireguard.com/"
 distfiles="https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"
-checksum=1a1311bc71abd47a72c47d918be3bacc486b3de90734661858af75cc990dbaac
+checksum=93573193c9c1c22fde31eb1729ad428ca39da77a603a3d81561a9816ccecfa8e
 
 dkms_modules="wireguard ${version}"
 
@@ -28,6 +28,7 @@ post_install() {
 wireguard-tools_package() {
 	short_desc+=" - tools"
 	depends="openresolv"
+	make_dirs="/etc/wireguard 0700 root root"
 	pkg_install() {
 		vmove usr/bin/wg
 		vmove usr/bin/wg-quick
diff --git a/srcpkgs/wireshark/template b/srcpkgs/wireshark/template
index ce21774b8b3..10a99e65bcb 100644
--- a/srcpkgs/wireshark/template
+++ b/srcpkgs/wireshark/template
@@ -1,6 +1,6 @@
 # Template file for 'wireshark'
 pkgname=wireshark
-version=3.0.3
+version=3.0.5
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config flex perl python3-devel mit-krb5-devel qt5-tools
@@ -15,7 +15,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.wireshark.org"
 distfiles="https://www.wireshark.org/download/src/${pkgname}-${version}.tar.xz"
-checksum=af92729c781d870110885c31ebcbe4c4224ed51bb580d00c896fe9746994211c
+checksum=c551fce475c49cea317ccbf9d22404bc827dde9cee0ccdf6648bfed3ecd9f820
 system_groups="wireshark"
 
 CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/lua5.2"
diff --git a/srcpkgs/wl-clipboard/template b/srcpkgs/wl-clipboard/template
index ba7b5413ca5..3aea91fa02e 100644
--- a/srcpkgs/wl-clipboard/template
+++ b/srcpkgs/wl-clipboard/template
@@ -1,13 +1,13 @@
 # Template file for 'wl-clipboard'
 pkgname=wl-clipboard
-version=1.0.0
+version=2.0.0
 revision=1
 build_style=meson
 hostmakedepends="wayland-devel pkg-config"
 makedepends="wayland-protocols wayland-devel"
 short_desc="Wayland clipboard utilities"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/bugaevc/wl-clipboard"
 distfiles="https://github.com/bugaevc/wl-clipboard/archive/v${version}.tar.gz"
-checksum=9b5c1f5f67c40672324194ec11c1fcbeccc72c0cd5b6712d6c7257be252387e3
+checksum=2c42f182432adabe56da0f1144d5fcc40b7aae3d8e14d2bc4dc4c3f91b51808d
diff --git a/srcpkgs/wlroots/template b/srcpkgs/wlroots/template
index 9a57e9b99d2..75ddb338a15 100644
--- a/srcpkgs/wlroots/template
+++ b/srcpkgs/wlroots/template
@@ -1,23 +1,23 @@
 # Template file for 'wlroots'
 pkgname=wlroots
-version=0.6.0
-revision=2
+version=0.8.1
+revision=1
 build_style=meson
 configure_args="-Dlibcap=enabled -Dlogind=enabled -Dlogind-provider=elogind
  -Dxcb-errors=enabled -Dxcb-icccm=enabled -Dxwayland=enabled
- -Dx11-backend=enabled -Dexamples=false -Drootston=false"
+ -Dx11-backend=enabled -Dexamples=false"
 hostmakedepends="pkg-config wayland-devel"
 makedepends="elogind-devel libcap-devel wayland-devel wayland-protocols
  MesaLib-devel libinput-devel libxkbcommon-devel libdrm-devel pixman-devel
  libxcb-devel xcb-util-cursor-devel xcb-util-devel xcb-util-image-devel
  xcb-util-keysyms-devel xcb-util-renderutil-devel xcb-util-wm-devel
  xcb-util-errors-devel xcb-util-xrm-devel freerdp-devel"
-short_desc="Module Wayland compositor library"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+short_desc="Modular Wayland compositor library"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/swaywm/wlroots"
 distfiles="https://github.com/swaywm/wlroots/archive/${version}.tar.gz"
-checksum=9cf3716f3683d800df8b150f256ff66dad65faf13a9d67c284f67a9444d28c70
+checksum=202b86e0e21699b6660bbda56afc2e3358db7252f83ff69c89f01926b4900d98
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/woff2/template b/srcpkgs/woff2/template
index ecf52247c43..9af0c9f8428 100644
--- a/srcpkgs/woff2/template
+++ b/srcpkgs/woff2/template
@@ -6,7 +6,7 @@ build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="brotli-devel"
 short_desc="Web Open Font Format 2 reference implementaton"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/google/woff2"
 distfiles="https://github.com/google/woff2/archive/v${version}.tar.gz"
diff --git a/srcpkgs/workrave/template b/srcpkgs/workrave/template
index 7ef66057e60..f34f232ef22 100644
--- a/srcpkgs/workrave/template
+++ b/srcpkgs/workrave/template
@@ -19,13 +19,12 @@ homepage="http://www.workrave.org/"
 distfiles="https://github.com/rcaelers/${pkgname}/archive/v${_realversion}.tar.gz"
 checksum=969fb8a6cb14aed08b2294bd01dbb2c2485a4c9bf6936fa8a513867aed759f63
 
-case "$XBPS_TARGET_MACHINE" in
-	x86_64-musl) ;;
-	*-musl) broken="gobject introspection" ;;
-esac
-
 build_options="pulseaudio"
 
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	nocross="Locale.cc: undefined reference to '_nl_msg_cat_cntr'"
+fi
+
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh
 }
diff --git a/srcpkgs/wpa-cute/template b/srcpkgs/wpa-cute/template
new file mode 100644
index 00000000000..bc09dfff743
--- /dev/null
+++ b/srcpkgs/wpa-cute/template
@@ -0,0 +1,23 @@
+# Template file for 'wpa-cute'
+pkgname=wpa-cute
+version=0.8.1
+revision=1
+build_wrksrc="src"
+build_style=qmake
+hostmakedepends="qt5-host-tools qt5-qmake"
+makedepends="qt5-devel"
+depends="wpa_supplicant"
+short_desc="Graphical wpa_supplicant front end"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/loh-tar/wpa-cute"
+distfiles="https://github.com/loh-tar/wpa-cute/archive/v${version}.tar.gz"
+checksum=42e79dbfd4b190c7679e0df9b7d8365682c9e9a513312833599f5705004e79b7
+
+do_install() {
+	vbin wpa-cute
+	vman "${wrksrc}/doc/wpa-cute.8"
+	vinstall icons/wpa_gui.svg 644 /usr/share/pixmaps
+	vinstall wpa-cute.desktop 644 /usr/share/applications
+	vlicense "${wrksrc}/COPYING"
+}
diff --git a/srcpkgs/wxMaxima/template b/srcpkgs/wxMaxima/template
index e44601de941..30d41414d75 100644
--- a/srcpkgs/wxMaxima/template
+++ b/srcpkgs/wxMaxima/template
@@ -1,6 +1,6 @@
 # Template file for 'wxMaxima'
 pkgname=wxMaxima
-version=19.07.0
+version=19.10.0
 revision=1
 wrksrc="wxmaxima-Version-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Martin Riese <grauehaare@gmx.de>"
 license="GPL-2.0-or-later"
 homepage="https://wxmaxima-developers.github.io/wxmaxima/"
 distfiles="https://github.com/wxMaxima-developers/wxmaxima/archive/Version-${version}.tar.gz"
-checksum=16237f22cf76ecb9159e536bbb121e89ac5ad043843a5f32aaac74f0b409c658
+checksum=5ec0a912ebe2688b0fbe10999463cb8365ce5e87d8a47eb04f95bd63880dc2f0
 nocross="clisp is nocross"
 
 post_install() {
diff --git a/srcpkgs/wxPython4/patches/0001-Switch-to-wx-config-gtk3.0-to-avoid-conflict-with-wx.patch b/srcpkgs/wxPython4/patches/0001-Switch-to-wx-config-gtk3.0-to-avoid-conflict-with-wx.patch
index 47606caa474..f741a968864 100644
--- a/srcpkgs/wxPython4/patches/0001-Switch-to-wx-config-gtk3.0-to-avoid-conflict-with-wx.patch
+++ b/srcpkgs/wxPython4/patches/0001-Switch-to-wx-config-gtk3.0-to-avoid-conflict-with-wx.patch
@@ -1,7 +1,7 @@
 From cddbe3b3b237b8e63abd8921fdb20314c20c2c08 Mon Sep 17 00:00:00 2001
 From: Jasper Chan <jasperchan515@gmail.com>
 Date: Sat, 22 Sep 2018 20:59:29 -0700
-Subject: [PATCH] Switch to wx-config-gtk3.0 to avoid conflict with
+Subject: [PATCH] Switch to wx-config-gtk3 to avoid conflict with
  wxWidgets-gtk2
 
 ---
@@ -17,7 +17,7 @@ index 3cd5b828..57dbd384 100755
  
          ("use_syswx",      (False, "Try to use an installed wx rather than building the "
 -                                   "one in this source tree.  The wx-config in {prefix}/bin "
-+                                   "one in this source tree.  The wx-config-gtk3.0 in {prefix}/bin "
++                                   "one in this source tree.  The wx-config-gtk3 in {prefix}/bin "
                                     "or the first found on the PATH determines which wx is "
                                     "used.  Implies --no_magic.")),
          ("force_config",   (False, "Run configure when building even if the script "
@@ -26,7 +26,7 @@ index 3cd5b828..57dbd384 100755
                               os.path.join(wxDir(), 'setup.h.in'),
                               os.path.join(wxDir(), 'version-script.in'),
 -                             os.path.join(wxDir(), 'wx-config.in'),
-+                             os.path.join(wxDir(), 'wx-config-gtk3.0.in'),
++                             os.path.join(wxDir(), 'wx-config-gtk3.in'),
                               ]
              for dep in dependencies:
                  if newer(dep, os.path.join(BUILD_DIR, "Makefile")):
@@ -35,15 +35,15 @@ index 3cd5b828..57dbd384 100755
  
      if not isWindows:
 -        WX_CONFIG = posixjoin(BUILD_DIR, 'wx-config')
-+        WX_CONFIG = posixjoin(BUILD_DIR, 'wx-config-gtk3.0')
++        WX_CONFIG = posixjoin(BUILD_DIR, 'wx-config-gtk3')
          if options.use_syswx:
 -            wxcfg = posixjoin(options.prefix, 'bin', 'wx-config')
-+            wxcfg = posixjoin(options.prefix, 'bin', 'wx-config-gtk3.0')
++            wxcfg = posixjoin(options.prefix, 'bin', 'wx-config-gtk3')
              if options.prefix and os.path.exists(wxcfg):
                  WX_CONFIG = wxcfg
              else:
 -                WX_CONFIG = 'wx-config' # hope it is on the PATH
-+                WX_CONFIG = 'wx-config-gtk3.0' # hope it is on the PATH
++                WX_CONFIG = 'wx-config-gtk3' # hope it is on the PATH
  
  
      wafBuildBase = wafBuildDir = getWafBuildBase()
diff --git a/srcpkgs/wxPython4/template b/srcpkgs/wxPython4/template
index e0609856dea..2aa7117d5e0 100644
--- a/srcpkgs/wxPython4/template
+++ b/srcpkgs/wxPython4/template
@@ -1,29 +1,29 @@
 # Template file for 'wxPython4'
 pkgname=wxPython4
-version=4.0.4
-revision=1
+version=4.0.6
+revision=2
 wrksrc="wxPython-${version}"
 build_style=python3-module
 pycompile_module="wx"
 make_build_args="--skip-build"
 make_install_args="--skip-build"
-hostmakedepends="pkg-config python3-setuptools"
+hostmakedepends="pkg-config python3-setuptools python3-pathlib2"
 makedepends="python3-devel wxWidgets-gtk3-devel SDL2-devel webkit2gtk-devel
  gst-plugins-base1-devel"
 depends="python3"
 short_desc="WxWidgets GUI toolkit library (Python3 Bindings)"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
-license="wxWindows"
+license="custom:wxWindows"
 homepage="http://www.wxpython.org/"
 distfiles="${PYPI_SITE}/w/wxPython/wxPython-${version}.tar.gz"
-checksum=0d9ef4260cb2f3e23ed9dcf6baa905ba585ac7d631613cddc299c4c83463ae29
+checksum=35cc8ae9dd5246e2c9861bb796026bbcb9fb083e4d49650f776622171ecdab37
 
 if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" python3"
 	CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/python${py3_ver}"
 fi
 
 pre_build() {
+	chmod -R go+rX $wrksrc
 	if [ "$CROSS_BUILD" ]; then
 		PYPREFIX="$XBPS_CROSS_BASE"
 		CFLAGS+=" -I${XBPS_CROSS_BASE}/${py3_inc} -I${XBPS_CROSS_BASE}/usr/include"
@@ -32,9 +32,10 @@ pre_build() {
 		LDSHARED="${CC} -shared $LDFLAGS"
 		env CC="$CC" LDSHARED="$LDSHARED" \
 			PYPREFIX="$PYPREFIX" CFLAGS="$CFLAGS" \
-			LDFLAGS="$LDFLAGS" python3 build.py --use_syswx
+			PYTHON_CONFIG="${XBPS_CROSS_BASE}/bin/python3-config" \
+			LDFLAGS="$LDFLAGS" python3 build.py build_py --use_syswx
 	else
-		python3 build.py --use_syswx
+		python3 build.py build_py --use_syswx
 	fi
 }
 
diff --git a/srcpkgs/x264/template b/srcpkgs/x264/template
index 7409444bc9c..53a148c1f6f 100644
--- a/srcpkgs/x264/template
+++ b/srcpkgs/x264/template
@@ -1,17 +1,17 @@
 # Template file for 'x264'
 pkgname=x264
-_snap_date=20190712
+_snap_date=20190911
 _snap_rev=2245
 version="${_snap_date}.${_snap_rev}"
 revision=1
 wrksrc="x264-snapshot-${_snap_date}-${_snap_rev}-stable"
 hostmakedepends="nasm perl"
 short_desc="Free library for encoding H264/AVC video streams"
-maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://www.videolan.org/developers/x264.html"
+maintainer="DirectorX <void.directorx@protonmail.com>"
 license="GPL-2.0-or-later"
-distfiles="http://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${_snap_date}-${_snap_rev}-stable.tar.bz2"
-checksum=233231456a83077ec5658f537d18688a419b08f52f9c7d3524e09328d78639ed
+homepage="https://www.videolan.org/developers/x264.html"
+distfiles="https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${_snap_date}-${_snap_rev}-stable.tar.bz2"
+checksum=a11065258559feb53b532f039b9df90fd616c6a3042c1bcd36cee29c6cc2b5c1
 
 do_configure() {
 	local args
diff --git a/srcpkgs/x42-plugins/template b/srcpkgs/x42-plugins/template
index af61d613391..c31b98c5f1d 100644
--- a/srcpkgs/x42-plugins/template
+++ b/srcpkgs/x42-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'x42-plugins'
 pkgname=x42-plugins
-version=20190507
+version=20190820
 revision=1
 build_style=gnu-makefile
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ maintainer="bluntphenomena <gregwyd@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/x42/x42-plugins"
 distfiles="http://gareus.org/misc/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=a728ac8ed5564072b09f95b69c1c9f3993285d7830cb7002dfee857de2993d2c
+checksum=70935871c8113ed07bf557fbdfacaca26b22298d1189992428dd8eda7d511a37
 
 pre_build() {
 	export OPTIMIZATIONS="-fomit-frame-pointer -O3 -fno-finite-math-only -DNDEBUG"
diff --git a/srcpkgs/xapian-core/template b/srcpkgs/xapian-core/template
index 8cd4edfd0bc..db7bbdd3a39 100644
--- a/srcpkgs/xapian-core/template
+++ b/srcpkgs/xapian-core/template
@@ -1,7 +1,7 @@
 # Template file for 'xapian-core'
 pkgname=xapian-core
-version=1.4.11
-revision=2
+version=1.4.12
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
 makedepends="zlib-devel libuuid-devel"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.xapian.org/"
 distfiles="https://oligarchy.co.uk/xapian/${version}/${pkgname}-${version}.tar.xz"
-checksum=9f16b2f3e2351a24034d7636f73566ab74c3f0729e9e0492934e956b25c5bc07
+checksum=4f8a36da831712db41d38a039fefb5251869761a58be28ba802994bb930fac7c
 
 # xapian-config needs the .la
 keep_libtool_archives=yes
diff --git a/srcpkgs/xapps/template b/srcpkgs/xapps/template
index 955199a35be..80bc0bd7cbf 100644
--- a/srcpkgs/xapps/template
+++ b/srcpkgs/xapps/template
@@ -1,6 +1,6 @@
 # Template file for 'xapps'
 pkgname=xapps
-version=1.4.8
+version=1.4.9
 revision=1
 build_style=meson
 build_helper="gir"
@@ -14,7 +14,7 @@ license="GPL-3.0-or-later, LGPL-3.0-or-later"
 homepage="https://github.com/linuxmint/xapps"
 changelog="https://raw.githubusercontent.com/linuxmint/xapps/master/debian/changelog"
 distfiles="https://github.com/linuxmint/xapps/archive/${version}.tar.gz"
-checksum=6f6c37c568e58ea1644fecc3513708877d358eb3911ff138a992c5078e4b0c73
+checksum=c2122c8c0616b07aca0654c86810549545363733ad36ec6f27451345083c80ca
 
 xapps-devel_package() {
 	short_desc+=" - development files"
@@ -24,5 +24,7 @@ xapps-devel_package() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
+		vmove usr/share/gir-1.0
+		vmove usr/share/vala
 	}
 }
diff --git a/srcpkgs/xbps-triggers/files/dkms b/srcpkgs/xbps-triggers/files/dkms
index 0f1fbb9ec0a..2208af9e745 100755
--- a/srcpkgs/xbps-triggers/files/dkms
+++ b/srcpkgs/xbps-triggers/files/dkms
@@ -72,7 +72,7 @@ add_modules() {
 		fi
 		if [ ! -f ${f}/build/scripts/basic/fixdep ] ; then
 			echo -n "Building scripts for kernel-${_kver}... "
-			make -C ${f}/build scripts &> ${f}/build/make.log
+			yes "" | make -j$(nproc) -C ${f}/build scripts > ${f}/build/make.log 2>&1
 			if [ $? -eq 0 ]; then
 				echo "done."
 			else
diff --git a/srcpkgs/xbps-triggers/template b/srcpkgs/xbps-triggers/template
index 4247352939c..e4b1dd25f41 100644
--- a/srcpkgs/xbps-triggers/template
+++ b/srcpkgs/xbps-triggers/template
@@ -1,7 +1,7 @@
 # Template file for 'xbps-triggers'
 pkgname=xbps-triggers
 version=0.113
-revision=1
+revision=3
 archs=noarch
 bootstrap=yes
 short_desc="The XBPS triggers for Void Linux"
diff --git a/srcpkgs/xcb-util-xrm/template b/srcpkgs/xcb-util-xrm/template
index b6fec86d146..a1339585a50 100644
--- a/srcpkgs/xcb-util-xrm/template
+++ b/srcpkgs/xcb-util-xrm/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config xorg-util-macros"
 makedepends="libX11-devel xcb-util-devel"
 short_desc="XCB utility functions for the X resource manager"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/Airblader/xcb-util-xrm"
 distfiles="https://github.com/Airblader/xcb-util-xrm/archive/v${version}.tar.gz"
diff --git a/srcpkgs/xdg-dbus-proxy/patches/musl.patch b/srcpkgs/xdg-dbus-proxy/patches/musl.patch
new file mode 100644
index 00000000000..b0c01f4dc0d
--- /dev/null
+++ b/srcpkgs/xdg-dbus-proxy/patches/musl.patch
@@ -0,0 +1,19 @@
+--- dbus-proxy.c	2019-01-15 18:02:01.000000000 +0000
++++ -	2019-08-25 19:41:33.423715619 +0000
+@@ -31,6 +31,16 @@
+ 
+ #include "flatpak-proxy.h"
+ 
++// Taken from glibc unistd.h
++#ifndef TEMP_FAILURE_RETRY
++# define TEMP_FAILURE_RETRY(expression) \
++  (__extension__                                                              \
++    ({ long int __result;                                                     \
++       do __result = (long int) (expression);                                 \
++       while (__result == -1L && errno == EINTR);                             \
++       __result; }))
++#endif
++
+ static const char *argv0;
+ static GList *proxies;
+ static int sync_fd = -1;
diff --git a/srcpkgs/xdg-dbus-proxy/template b/srcpkgs/xdg-dbus-proxy/template
index 7d489f6e382..3d01f5e60b1 100644
--- a/srcpkgs/xdg-dbus-proxy/template
+++ b/srcpkgs/xdg-dbus-proxy/template
@@ -1,14 +1,14 @@
 # Template file for 'xdg-dbus-proxy'
 pkgname=xdg-dbus-proxy
-version=0.1.1
+version=0.1.2
 revision=1
 build_style=gnu-configure
 configure_args="--enable-man"
 hostmakedepends="libxslt pkg-config docbook-xsl"
 makedepends="libglib-devel"
 short_desc="Filtering proxy for D-Bus connections"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/flatpak/xdg-dbus-proxy"
 distfiles="${homepage}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=10b71573009d0e474d246576714742389eb65bba529276524b59ff5064791ef1
+checksum=1749d6f9f46dcc9edc87725641cf56cf91dcad1b01707891ea0850c1000c520f
diff --git a/srcpkgs/xdg-desktop-portal-kde/template b/srcpkgs/xdg-desktop-portal-kde/template
index e2885a3f146..c39d625283d 100644
--- a/srcpkgs/xdg-desktop-portal-kde/template
+++ b/srcpkgs/xdg-desktop-portal-kde/template
@@ -1,6 +1,6 @@
 # Template file for 'xdg-desktop-portal-kde'
 pkgname=xdg-desktop-portal-kde
-version=5.16.4
+version=5.17.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kcoreaddons"
@@ -10,4 +10,4 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-3.0-or-later"
 homepage="https://phabricator.kde.org/source/xdg-desktop-portal-kde"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3b8aa78451cfc97ef316f1632f6a255ccebbe383ec8389ffc74d44540fc05052
+checksum=5d6a54e764cc77c4d14cbae6ca76a4908fe93dcc7e36f641a1df1ce38b43da35
diff --git a/srcpkgs/xdgmenumaker/files/1.5/xdgmenumaker.1 b/srcpkgs/xdgmenumaker/files/1.5/xdgmenumaker.1
new file mode 100644
index 00000000000..062696370a8
--- /dev/null
+++ b/srcpkgs/xdgmenumaker/files/1.5/xdgmenumaker.1
@@ -0,0 +1,464 @@
+.TH "xdgmenumaker" 1 "09/16/2018" "George Vlahavas"
+
+.SH NAME
+.P
+xdgmenumaker \- generate XDG menus
+.SH SYNOPSIS
+.P
+\fBxdgmenumaker\fR [\fIOPTIONS\fR]
+.SH DESCRIPTION
+.P
+\fBxdgmenumaker\fR is a command line tool, written in python, that
+generates application menus using XDG information, by scanning
+*.desktop files in all \fI$XDG_DATA_DIRS/applications\fR directories. All
+applications are sorted according to the main categories as specified
+by
+freedesktop.org (http://standards.freedesktop.org/menu\-spec/latest/apa.html)
+.P
+The menu entries that are generated by \fBxdgmenumaker\fR are localised
+according to the running user locale settings.
+.P
+\fBxdgmenumaker\fR currently supports generating menus for:
+
+.RS
+.IP \(bu 3
+amiwm
+.IP \(bu 3
+blackbox
+.IP \(bu 3
+compizboxmenu
+.IP \(bu 3
+fluxbox
+.IP \(bu 3
+fvwm
+.IP \(bu 3
+icewm
+.IP \(bu 3
+jwm
+.IP \(bu 3
+pekwm
+.IP \(bu 3
+twm and compatible derivatives such as ctwm and vtwm
+.IP \(bu 3
+windowmaker
+.RE
+.IP
+
+.P
+\fBxdgmenumaker\fR requires \fIPython 2.7\fR or \fI3.x\fR, \fIpygtk\fR
+(for Python 2.7) or \fIpygobject\fR and \fIgobject\-instrospection\fR
+(for Python 3.x), as well as \fIpyxdg\fR. \fIPillow\fR is an optional
+dependency (used by the \fB\-\-max\-icon\-size\fR option).
+.SH OPTIONS
+
+.TP
+\fB\-f, \-\-format\fR
+specify the output format to use. Valid options are \fIamiwm\fR, \fIblackbox\fR,
+\fIcompizboxmenu\fR, \fIfluxbox\fR, \fIfvwm\fR, \fIicewm\fR, \fIjwm\fR, \fIpekwm\fR,
+\fItwm\fR and \fIwindowmaker\fR.
+Specifying the output format is mandatory.
+
+.TP
+\fB\-i, \-\-icons\fR
+enable support for icons in the menus. This option does not have any
+effect for \fIamiwm\fR, \fIblackbox\fR or \fIwindowmaker\fR menus.
+
+.TP
+\fB\-s, \-\-size\fR
+set the preferred icon size in pixels. The default size is 16. You can
+set this to any number, but it generally makes sense to use standard
+icons sizes, like 16, 22, 24, 32 etc. Obviously this has an effect only
+if the \fI\-\-icons\fR option is used. You have to be careful with the sizes
+you use; some window managers don't support large icons in the menu.
+
+.TP
+\fB\-n, \-\-no\-submenu\fR
+do not create a submenu. Instead, place the application categories menus
+in the window manager's main menu. This option does not have any effect
+for \fIwindowmaker\fR menus.
+
+.TP
+\fB\-\-max\-icon\-size\fR
+restrict the maximum size for icons to the one specified with the
+\fI\-\-size\fR option. Any icons that are larger than the specified size
+will get discarded and will not be used.
+
+.TP
+\fB\-\-no\-svg\fR
+do not use SVG icons even for the WMs that support it. Right now that
+is only JWM.
+
+.TP
+\fB\-\-pekwm\-dynamic\fR
+create dynamic menus for pekwm. If you want to have dynamically
+generated menus for pekwm you have to use this option. Do not use it if
+you want to generate static menus for pekwm. Only works with \fIpekwm\fR
+of course.
+
+.TP
+\fB\-\-twm\-titles\fR
+display menu titles in TWM menus. Naturally, only has an effect when
+used with \fItwm\fR.
+
+.SH GENERAL OPTIONS
+
+.TP
+\fB\-h\fR
+Prints a usage message briefly summarizing all command\-line options
+and exits.
+
+.SH CONFIGURATION
+.P
+The terminal emulator to be used for menu entries that state that an
+application must be launched inside a terminal, can be specified in a
+\fI~/.config/xdgmenumaker.cfg\fR configuration file. Here's an example
+specifying \fBrxvt\fR as the default terminal emulator:
+
+.nf
+[Terminal]
+terminal = rxvt
+.fi
+
+
+.P
+If no such file is present, or if no terminal is set within the file,
+xdgmenumaker will default to the one specified in the debian
+alternatives system on debian and debian\-like systems and to xterm in
+any other case.
+.P
+Setting the path to a terminal emulator in an \fIXDGMENUMAKERTERM\fR
+environment variable will override any other setting.
+.SH USAGE
+
+.TP
+\fBAmiWM\fR
+
+You can generate a menu for AmiWM, running xdgmenumaker like this:
+
+$ xdgmenumaker \-f amiwm > ~/.amiwm\-xdgmenu
+
+As AmiWM does not support including other files in its settings file,
+you'll have to copy the contents of the created file in your
+\fI~/.amiwmrc\fR. It should be possible to create a script that would
+generate the main \fI~/.amiwmrc\fR file from different "source" files, but
+I'll leave that as an exercise to the user.
+
+.TP
+\fBBlackbox\fR
+
+To generate an application menu for Blackbox, you can run
+\fBxdgmenumaker\fR like this:
+
+$ xdgmenumaker \-f blackbox > ~/.blackbox/xdg_menu
+
+and then change your main Blackbox menu to include this file as a
+submenu. For example, add this somewhere in your \fI~/.blackbox/menu\fR file:
+
+[include] (~/.blackbox/xdg_menu)
+
+You can add the \fBxdgmenumaker\fR command as another item in your menu,
+if you want to update it, without having to run the command manually
+again:
+
+[exec] (Update Blackbox Menu) {xdgmenumaker \-f blackbox > ~/.blackbox/xdg_menu}
+
+.TP
+\fBCompiz Boxmenu\fR
+
+There are two ways to have an xdg menu in compiz\-boxmenu. The first one,
+auto\-updates the menu, every time the menu is called. The second one,
+updates the menu only when the user wants to.
+
+\fBDynamic Menus\fR
+
+Edit your \fI~/.config/compiz/boxmenu/menu.xml\fR file with your favorite text
+editor and add a block of code like this inside the root \fI<menu>\fR element:
+
+.nf
+<item type="launcher">
+  <command mode2="pipe">xdgmenumaker -nif compizboxmenu</command>
+  <icon>applications-other</icon>
+  <name>Applications</name>
+</item>
+.fi
+
+
+
+Alternatively, you can also run \fBcompiz\-boxmenu\-editor\fR and click the
+dropdown for new menu files or menu items. Select launcher to create a
+new launcher. Set the name of the launcher to whatever you want. This will
+be the display name for the pipe menu. Then enter in:
+
+xdgmenumaker \-nif compizboxmenu
+
+for the command entry. Click the combobox
+next to the command text box and switch that to "Pipe".
+
+\fBStatic Menus\fR
+
+Edit your \fI~/.config/compiz/boxmenu/menu.xml\fR file with your favorite text
+editor and paste the output of:
+
+$ xdgmenumaker \-if compizboxmenu
+
+into \fI~/.config/compiz/boxmenu/menu.xml\fR.
+
+Alternatively, you can also run \fBcompiz\-boxmenu\-editor\fR and click the
+button that says \fIGenerate menu entries from a pipemenu script\fR. In the dialog
+box that pops up, type in:
+
+xdgmenumaker \-if compizboxmenu
+
+to append the statically generated menu to any menu file you want.
+
+.TP
+\fBFluxbox\fR
+
+To generate an application menu for Fluxbox, you can run
+\fBxdgmenumaker\fR like this:
+
+$ xdgmenumaker \-f fluxbox > ~/.fluxbox/xdg_menu
+
+and then change your main Fluxbox menu to include this file as a
+submenu. For example, add this somewhere in your \fI~/.fluxbox/menu\fR file:
+
+[include] (~/.fluxbox/xdg_menu)
+
+You can add the \fBxdgmenumaker\fR command as another item in your menu,
+if you want to update it, without having to run the command manually
+again:
+
+[exec] (Update Fluxbox Menu) {xdgmenumaker \-f fluxbox > ~/.fluxbox/xdg_menu}
+
+.TP
+\fBFvwm\fR
+
+To generate an application menu for Fvwm, you can run \fBxdgmenumaker\fR
+like this:
+
+$ xdgmenumaker \-f fvwm > ~/.fvwm/xdgmenu
+
+and then edit your main Fvwm configuration file and add a line to read
+that file:
+
+read xdgmenu
+
+and also include it somewhere in your main menu, for example:
+
+.nf
+AddToMenu MenuFvwmRoot  "Root Menu"             Title
++                       "Applications"          Popup xdgmenu
+.fi
+
+
+You could also put the menus for individual categories in your main menu
+if you want. Just look in the ~/.fvwm/xdgmenu file for the category
+names.
+
+You can add the \fBxdgmenumaker\fR command as another item in your menu,
+if you want to update it:
+
++ "Update Fvwm Menu" Exec xdgmenumaker \-f fvwm > ~/.fvwm/xdgmenu
+
+and restart Fvwm to apply the changes.
+
+\fINOTE:\fR If you're going to use the \fI\-\-icons\fR option to include icons
+in your menus, you might consider using the \fI\-\-max\-icon\-size\fR
+option too. Fvwm does not resize icons in its menu and having entries
+with icons that are too big makes for funny looking menus.
+
+.TP
+\fBIceWM\fR
+
+To generate an application menu for IceWM, run \fBxdgmenumaker\fR like this:
+
+$ xdgmenumaker \-f icewm > ~/.icewm/appmenu
+
+or if you want icons in your menu:
+
+$ xdgmenumaker \-i \-f icewm > ~/.icewm/appmenu
+
+and you can then edit your \fI~/.icewm/menu\fR file and add this line
+somewhere:
+
+include appmenu
+
+You can add the \fBxdgmenumaker\fR command as another item in your menu, if
+you want to update it, without having to run the command manually again:
+
+prog "Update Menu" _none_ xdgmenumaker \-i \-f icewm > ~/.icewm/appmenu
+
+\fINOTE:\fR If you don't request icons in the menu, or if an icon is not found
+for a certain app, the icon name in the menu for that app is set to
+"_none_". This doesn't actually set the icon for that app to none.
+IceWM menu entries should always include an icon . So, by pointing it
+to a non existing icon, you essentially set it to use no icon. If you
+actually have an icewm icon named "_none_", that one will be used instead.
+
+.TP
+\fBJWM\fR
+
+You can edit your \fI~/.jwmrc\fR file and add a line that generates the
+applications menu, like this:
+
+<Include>exec: xdgmenumaker \-n \-i \-f jwm</Include>
+
+You need to put that line somewhere in the \fIRootMenu\fR section of the
+\fI~/.jwmrc\fR file.
+
+You can update the menu with:
+
+$ jwm \-reload
+
+Or you can restart JWM and the updated menu should appear. The menu will be
+recreated every time JWM is started, restarted, or when the menu is
+reloaded with the above command. You can even add a menu item that will
+refresh the menu, like this:
+
+<Program label="Refresh Menu">jwm \-reload</Program>
+
+.TP
+\fBpekwm\fR
+
+There are two ways to have an XDG menu in pekwm. The first one,
+auto\-updates the menu, every time the menu is called. The second one,
+updates the menu only when the user wants to.
+
+\fBDynamic Menus\fR
+
+Edit your \fI~/.pekwm/menu\fR file with your favourite text editor and add
+a line like the following one in the location that you want the
+dynamically generated menu to appear:
+
+.nf
+Entry = "" { Actions = "Dynamic /usr/bin/xdgmenumaker -n -i -f pekwm --pekwm-dynamic" }
+.fi
+
+
+
+Restart pekwm and the generated menu should appear. The menu will be
+automatically generated every time you access it, so it will always be
+up to date. But since xdgmenumaker will run every time you access the
+menu, the menu might not appear instantly, especially if you are using
+an older PC.
+
+\fBStatic Menus\fR
+
+Run:
+
+$ xdgmenumaker \-n \-i \-f pekwm > ~/.pekwm/appsmenu
+
+to create a file with the menu contents. Then edit your
+\fI~/.pekwm/menu\fR file to include that menu, by adding a line like the
+following, in the location that you want the menu to appear:
+
+INCLUDE = "/home/your_user_name/.pekwm/appsmenu"
+
+Restart pekwm and the generated menu should appear. The menu is static
+and if you add/remove any applications, you will have to run the
+xdgmenumaker command and restart pekwm all over again to update it. The
+advantage is that there will be no delay in displaying the menu.
+
+.TP
+\fBTWM and Derivatives\fR
+
+You can create a menu for TWM running \fBxdgmenumaker\fR like this:
+
+$ xdgmenumaker \-f twm > ~/.twm\-xdgmenu
+
+If you're using the standard TWM, then unfortunately you'll have to
+manually copy/paste the contents of the generated \fI~/.twm\-xdgmenu\fR file
+into your \fI~/.twmrc\fR manually. You could then add something like this
+to your main menu definition:
+
+.nf
+"Applications" f.menu "xdgmenu"
+.fi
+
+
+
+It could be possible to create a script that updates the menus inside
+the main \fI~/.twmrc\fR settings file, but I'll leave that as an exercise
+for the user.
+
+If you're using CTWM or VTWM, instead of manually copy/pasting the menu
+contents into your settings file, you could just add an include line
+like this:
+
+.nf
+sinclude(`/home/george/.twm-xdgmenu')
+.fi
+
+
+
+\fINote:\fR In order for this to work with VTWM, \fBvtwm\fR has to be called
+with the \fI\-m\fR switch.
+
+.TP
+\fBWindowMaker\fR
+
+There are two ways to have an XDG menu in WindowMaker. The first one,
+auto\-updates the menu, every time the menu is called. The second one,
+updates the menu only when the user wants to.
+
+\fBxdgmenumaker\fR uses utf8 encoding and localised strings by default
+and has been tested only with wmaker\-crm>=0.95.1. No idea if utf8 works
+properly with older WindowMaker versions.
+
+\fBDynamic Menus\fR
+
+Open the WindowMaker preferences tool. In the \fIApplication Menu Definition\fR
+section, add a \fIGenerated Submenu\fR in your menu, by dragging it
+in. Click on the menu item you just dragged in and in the preferences
+window, in \fICommand\fR, add:
+
+xdgmenumaker \-f windowmaker
+
+Save and close the preferences window.
+
+That command will be run every time you access that submenu, so the
+application list in there will be always up to date. The downside is
+that with running this command every time, especially if
+you are on a very old PC, it might slow things down a bit. Even then it
+is probably not anything considerable.
+
+\fBStatic Menus\fR
+
+Run:
+
+$ xdgmenumaker \-f windowmaker > ~/GNUstep/Defaults/xdg_menu
+
+Then open the WindowMaker preferences tool and in the
+\fIApplication Menu Definition\fR section, add an
+\fIExternal Submenu\fR by dragging it in your menu.
+Click on the menu item you just dragged in and in the preferences
+window, in \fIPath for Menu\fR, add the location of the menu file you just
+created:
+
+~/GNUstep/Defaults/xdg_menu
+
+You can add the above mentioned \fBxdgmenumaker\fR command as another
+item in your menu, if you want to update it, without having to run the
+command manually again.
+In the \fIApplication Menu Definition\fR section in the WindowMaker
+preferences window, add a \fIRun Program\fR item in your menu by dragging it
+your menu. Click on the menu item you just dragged in and in the
+preferences window, in \fIProgram to Run\fR, add the \fBxdgmenumaker\fR command as
+mentioned above.
+
+The downside of this method, is that the menu contents will not be
+updated when you install a new application or remove one. You will need
+to run the xdgmenumaker command every time you want the menu to be
+updated. The upside is that the menu will not be generated every time
+you access the menu. This might be a better choice for (really) older
+hardware.
+
+.SH WEBSITE
+.P
+https://github.com/gapan/xdgmenumaker
+.SH AUTHORS
+.P
+\fBxdgmenumaker\fR was written by George Vlahavas <vlahavas~at~gmail~dot~com>
+
+.\" man code generated by txt2tags 2.6. (http://txt2tags.org)
+.\" cmdline: txt2tags /home/mobinmob/projects/void-packages/masterdir/builddir/xdgmenumaker-1.5/man/xdgmenumaker.t2t
diff --git a/srcpkgs/xdgmenumaker/template b/srcpkgs/xdgmenumaker/template
index 453c1584565..c9ee447c743 100644
--- a/srcpkgs/xdgmenumaker/template
+++ b/srcpkgs/xdgmenumaker/template
@@ -1,21 +1,22 @@
 # Template file for 'xdgmenumaker'
 pkgname=xdgmenumaker
 version=1.5
-revision=1
-hostmakedepends="make"
-depends="python3 python3-xdg pygtk python-gobject gobject-introspection"
+revision=2
+archs=noarch
+build_style=gnu-makefile
+depends="python3-xdg python3-gobject gobject-introspection python3-Pillow"
 short_desc="Automatic menu generator for WMs, such as, fluxbox, icewm, jwm, pekwm"
 maintainer="reback00 <reback00@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/gapan/xdgmenumaker"
 distfiles="https://github.com/gapan/${pkgname}/archive/${version}.tar.gz"
 checksum=a8319db5998ea1c49e52f6d04aad40334daea8047840c6762b4e7f02082b0573
+python_version=3
 patch_args="-Np1"
 
-do_build() {
-	make
-}
-
-do_install() {
-	make DESTDIR="${DESTDIR}" install
+pre_install() {
+	# Install pre-generated man page
+	vman ${FILESDIR}/${version}/xdgmenumaker.1
+	# Install README.md as documentation
+	vdoc README.md
 }
diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template
index 89ab96178c2..64507ab4715 100644
--- a/srcpkgs/xen/template
+++ b/srcpkgs/xen/template
@@ -1,7 +1,7 @@
 # Template file for 'xen'
 pkgname=xen
 version=4.10.4
-revision=1
+revision=2
 # grep -R IPXE_GIT_TAG src/xen-*/tools/firmware/etherboot
 _git_tag_ipxe=356f6c1b64d7a97746d1816cef8ca22bdd8d0b5d
 archs="x86_64*"
diff --git a/srcpkgs/xev/template b/srcpkgs/xev/template
index f7fbb8d56c0..e256b708c98 100644
--- a/srcpkgs/xev/template
+++ b/srcpkgs/xev/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libXrandr-devel"
 short_desc="Display X events"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2"
diff --git a/srcpkgs/xf86-input-libinput/template b/srcpkgs/xf86-input-libinput/template
index 08ee7c12486..c6a5d45b05a 100644
--- a/srcpkgs/xf86-input-libinput/template
+++ b/srcpkgs/xf86-input-libinput/template
@@ -7,7 +7,7 @@ hostmakedepends="pkg-config"
 makedepends="libinput-devel xorg-server-devel"
 depends="virtual?xserver-abi-input-24_1"
 short_desc="Generic input driver for the X.Org server based on libinput"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://xorg.freedesktop.org/"
 distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2"
diff --git a/srcpkgs/xf86-video-amdgpu/template b/srcpkgs/xf86-video-amdgpu/template
index 7ab3e1f5d92..8488f26a931 100644
--- a/srcpkgs/xf86-video-amdgpu/template
+++ b/srcpkgs/xf86-video-amdgpu/template
@@ -1,6 +1,6 @@
 # Template file for 'xf86-video-amdgpu'
 pkgname=xf86-video-amdgpu
-version=19.0.1
+version=19.1.0
 revision=1
 archs="i686* x86_64* ppc64* ppc ppc-musl"
 build_style=gnu-configure
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://wiki.freedesktop.org/xorg"
 distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2"
-checksum=aaa197196aadcb12e93e10a2aa03c9aedc9ba7b27c2643a8ef620d41e2d1c6d5
+checksum=4f0ea4e0ae61995ac2b7c72433d31deab63b60c78763020aaa1b28696124fe5d
 
 lib32disabled=yes
 LDFLAGS="-Wl,-z,lazy"
diff --git a/srcpkgs/xfce4-battery-plugin/template b/srcpkgs/xfce4-battery-plugin/template
index 8a524e6bbbf..053abe5a7a1 100644
--- a/srcpkgs/xfce4-battery-plugin/template
+++ b/srcpkgs/xfce4-battery-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-battery-plugin'
 pkgname=xfce4-battery-plugin
 version=1.1.3
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
diff --git a/srcpkgs/xfce4-clipman-plugin/template b/srcpkgs/xfce4-clipman-plugin/template
index 987a68f7d5f..ef082d98644 100644
--- a/srcpkgs/xfce4-clipman-plugin/template
+++ b/srcpkgs/xfce4-clipman-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-clipman-plugin'
 pkgname=xfce4-clipman-plugin
 version=1.4.3
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config"
 makedepends="xfce4-panel-devel libXtst-devel qrencode-devel"
diff --git a/srcpkgs/xfce4-cpufreq-plugin/template b/srcpkgs/xfce4-cpufreq-plugin/template
index 0b7321081f6..62192b09bf8 100644
--- a/srcpkgs/xfce4-cpufreq-plugin/template
+++ b/srcpkgs/xfce4-cpufreq-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-cpufreq-plugin'
 pkgname=xfce4-cpufreq-plugin
 version=1.2.1
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config"
 makedepends="xfce4-panel-devel"
diff --git a/srcpkgs/xfce4-cpugraph-plugin/template b/srcpkgs/xfce4-cpugraph-plugin/template
index d1ff3abd659..3ece809d5ab 100644
--- a/srcpkgs/xfce4-cpugraph-plugin/template
+++ b/srcpkgs/xfce4-cpugraph-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-cpugraph-plugin'
 pkgname=xfce4-cpugraph-plugin
 version=1.1.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
diff --git a/srcpkgs/xfce4-dict/template b/srcpkgs/xfce4-dict/template
index 0ae2951c552..8af24128912 100644
--- a/srcpkgs/xfce4-dict/template
+++ b/srcpkgs/xfce4-dict/template
@@ -1,13 +1,13 @@
 # Template file for 'xfce4-dict'
 pkgname=xfce4-dict
-version=0.8.2
-revision=1
+version=0.8.3
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
-short_desc="A dictionary plugin for the Xfce panel"
+short_desc="Dictionary plugin for the Xfce panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/applications/xfce4-dict"
 distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=324d56128bfc2f06ad8df59a832565981ec9b360710319300185517d98b7db0a
+checksum=7cf4ce77f9e95ca04894b8eaa385ca52c080e28ec1e1846355b1b67a800dc279
diff --git a/srcpkgs/xfce4-diskperf-plugin/template b/srcpkgs/xfce4-diskperf-plugin/template
index 225c41c10bf..623556cc608 100644
--- a/srcpkgs/xfce4-diskperf-plugin/template
+++ b/srcpkgs/xfce4-diskperf-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-diskperf-plugin'
 pkgname=xfce4-diskperf-plugin
 version=2.6.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
diff --git a/srcpkgs/xfce4-fsguard-plugin/template b/srcpkgs/xfce4-fsguard-plugin/template
index 71a23868c08..60feab6e6ec 100644
--- a/srcpkgs/xfce4-fsguard-plugin/template
+++ b/srcpkgs/xfce4-fsguard-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-fsguard-plugin'
 pkgname=xfce4-fsguard-plugin
 version=1.1.1
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
diff --git a/srcpkgs/xfce4-genmon-plugin/template b/srcpkgs/xfce4-genmon-plugin/template
index 555f626fa8c..00e8f521f9e 100644
--- a/srcpkgs/xfce4-genmon-plugin/template
+++ b/srcpkgs/xfce4-genmon-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-genmon-plugin'
 pkgname=xfce4-genmon-plugin
 version=4.0.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config"
 makedepends="xfce4-panel-devel"
diff --git a/srcpkgs/xfce4-hardware-monitor-plugin/template b/srcpkgs/xfce4-hardware-monitor-plugin/template
index 0a5e5521b92..b69c1cbf3fd 100644
--- a/srcpkgs/xfce4-hardware-monitor-plugin/template
+++ b/srcpkgs/xfce4-hardware-monitor-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-hardware-monitor-plugin'
 pkgname=xfce4-hardware-monitor-plugin
 version=1.6.0
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="autoconf automake libtool intltool pkg-config glib-devel gettext-devel"
 makedepends="xfce4-panel-devel libgtop-devel libgnomecanvasmm-devel gtkmm2-devel libsensors-devel"
diff --git a/srcpkgs/xfce4-kbdleds-plugin/template b/srcpkgs/xfce4-kbdleds-plugin/template
index bdf9a7e6261..cdec548a2bc 100644
--- a/srcpkgs/xfce4-kbdleds-plugin/template
+++ b/srcpkgs/xfce4-kbdleds-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-kbdleds-plugin'
 pkgname=xfce4-kbdleds-plugin
 version=0.0.6
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config"
 makedepends="libX11-devel gtk+-devel libxfce4ui-devel xfce4-panel-devel"
diff --git a/srcpkgs/xfce4-mailwatch-plugin/template b/srcpkgs/xfce4-mailwatch-plugin/template
index 44c4ee1f707..ac2511c8c49 100644
--- a/srcpkgs/xfce4-mailwatch-plugin/template
+++ b/srcpkgs/xfce4-mailwatch-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-mailwatch-plugin'
 pkgname=xfce4-mailwatch-plugin
 version=1.2.0
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="libglib-devel exo-devel libxfce4ui-devel libxfce4util-devel
diff --git a/srcpkgs/xfce4-mpc-plugin/template b/srcpkgs/xfce4-mpc-plugin/template
index 50c2f0f9a3e..05b9e282c5e 100644
--- a/srcpkgs/xfce4-mpc-plugin/template
+++ b/srcpkgs/xfce4-mpc-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-mpc-plugin'
 pkgname=xfce4-mpc-plugin
 version=0.5.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
diff --git a/srcpkgs/xfce4-netload-plugin/template b/srcpkgs/xfce4-netload-plugin/template
index d08ee101f2b..6cb3967727b 100644
--- a/srcpkgs/xfce4-netload-plugin/template
+++ b/srcpkgs/xfce4-netload-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-netload-plugin'
 pkgname=xfce4-netload-plugin
 version=1.3.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
diff --git a/srcpkgs/xfce4-notes-plugin/template b/srcpkgs/xfce4-notes-plugin/template
index 1509c90fc24..ed3e310a952 100644
--- a/srcpkgs/xfce4-notes-plugin/template
+++ b/srcpkgs/xfce4-notes-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-notes-plugin'
 pkgname=xfce4-notes-plugin
 version=1.8.1
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel libunique1-devel"
diff --git a/srcpkgs/xfce4-notifyd/template b/srcpkgs/xfce4-notifyd/template
index 66a0331ec6c..7120eaa6d71 100644
--- a/srcpkgs/xfce4-notifyd/template
+++ b/srcpkgs/xfce4-notifyd/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-notifyd'
 pkgname=xfce4-notifyd
 version=0.4.4
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool glib-devel dbus-glib-devel"
 makedepends="libnotify-devel xfce4-panel-devel"
diff --git a/srcpkgs/xfce4-panel/template b/srcpkgs/xfce4-panel/template
index d14422a9736..719d78fda2a 100644
--- a/srcpkgs/xfce4-panel/template
+++ b/srcpkgs/xfce4-panel/template
@@ -1,25 +1,25 @@
 # Template file for 'xfce4-panel'
 pkgname=xfce4-panel
-version=4.14.0
-revision=3
+version=4.14.1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-static --enable-gio-unix --enable-gtk3"
 hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel glib-devel"
 makedepends="libwnck-devel libxfce4ui-devel xfconf-devel garcon-devel exo-devel"
 short_desc="Next generation panel for the XFCE desktop environment"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+maintainer="Peter Bui <pbui@github.bx612.space>"
+license="GPL-2.0-or-later"
 homepage="https://xfce.org/"
 distfiles="https://archive.xfce.org/src/xfce/$pkgname/${version%.*}/$pkgname-$version.tar.bz2"
-checksum=d5f8f3bd7e142139987e5e62cda26135a424baabb5e47aa0c23b4169d0a66ef4
+checksum=9c3c78b49ddfac7d42a804e6a6ad9d22ad64ec60bbe17d8724bc52d3e3f6d114
 
 # Package build options
 build_options="gir"
 build_options_default="gir"
 
 xfce4-panel-devel_package() {
-	depends="libxfce4ui-devel ${sourcepkg}>=${version}_${revision}"
+	depends="libxfce4ui-devel libxfce4panel>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
@@ -31,3 +31,10 @@ xfce4-panel-devel_package() {
 		fi
 	}
 }
+
+libxfce4panel_package() {
+	short_desc+=" - runtime library"
+	pkg_install() {
+		vmove "usr/lib/*.so.*"
+	}
+}
diff --git a/srcpkgs/xfce4-places-plugin/template b/srcpkgs/xfce4-places-plugin/template
index 599a7bbc0ff..41ca9afa44f 100644
--- a/srcpkgs/xfce4-places-plugin/template
+++ b/srcpkgs/xfce4-places-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-places-plugin'
 pkgname=xfce4-places-plugin
 version=1.8.1
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config"
 makedepends="exo-devel xfce4-panel-devel"
diff --git a/srcpkgs/xfce4-power-manager/template b/srcpkgs/xfce4-power-manager/template
index c10d65e0901..6ba86715b24 100644
--- a/srcpkgs/xfce4-power-manager/template
+++ b/srcpkgs/xfce4-power-manager/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-power-manager'
 pkgname=xfce4-power-manager
 version=1.6.5
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool"
diff --git a/srcpkgs/xfce4-pulseaudio-plugin/template b/srcpkgs/xfce4-pulseaudio-plugin/template
index 307b54639ce..3238c63a40a 100644
--- a/srcpkgs/xfce4-pulseaudio-plugin/template
+++ b/srcpkgs/xfce4-pulseaudio-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-pulseaudio-plugin'
 pkgname=xfce4-pulseaudio-plugin
 version=0.4.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="gettext-devel xfce4-dev-tools"
 makedepends="libkeybinder3-devel libnotify-devel pulseaudio-devel xfce4-panel-devel"
diff --git a/srcpkgs/xfce4-screensaver/template b/srcpkgs/xfce4-screensaver/template
index 8d0ae5fbb97..08a7a2bb0d9 100644
--- a/srcpkgs/xfce4-screensaver/template
+++ b/srcpkgs/xfce4-screensaver/template
@@ -10,7 +10,7 @@ makedepends="gtk+3-devel libglib-devel libxklavier-devel libwnck-devel
  xfconf-devel garcon-devel libXScrnSaver-devel libXrandr-devel
  pam-devel elogind-devel"
 short_desc="Screensaver for XFCE4"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://git.xfce.org/apps/xfce4-screensaver"
 distfiles="https://archive.xfce.org/src/apps/xfce4-screensaver/${version%.*}/xfce4-screensaver-${version}.tar.bz2"
diff --git a/srcpkgs/xfce4-screenshooter/template b/srcpkgs/xfce4-screenshooter/template
index c57ab96d559..72f4fa65d72 100644
--- a/srcpkgs/xfce4-screenshooter/template
+++ b/srcpkgs/xfce4-screenshooter/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-screenshooter'
 pkgname=xfce4-screenshooter
-version=1.9.5
-revision=1
+version=1.9.6
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="libxfce4ui-devel xfce4-panel-devel exo-devel libsoup-devel"
@@ -11,4 +11,4 @@ maintainer="Frank Steinborn <steinex@nognu.de>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/applications/xfce4-screenshooter"
 distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=bf35b5432cb920987c6d7ff193600e5dd4d73422b6aa02b4ec5288744053b38c
+checksum=88c174ce687d1f7ba5470d6ab5784d33dc215f8f220211e892e268189dbea658
diff --git a/srcpkgs/xfce4-sensors-plugin/template b/srcpkgs/xfce4-sensors-plugin/template
index fab70ac843a..e64ec44d95a 100644
--- a/srcpkgs/xfce4-sensors-plugin/template
+++ b/srcpkgs/xfce4-sensors-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-sensors-plugin'
 pkgname=xfce4-sensors-plugin
 version=1.3.92
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool"
diff --git a/srcpkgs/xfce4-settings/template b/srcpkgs/xfce4-settings/template
index 52df7238b84..a7e471d686d 100644
--- a/srcpkgs/xfce4-settings/template
+++ b/srcpkgs/xfce4-settings/template
@@ -1,6 +1,6 @@
 # Template file for 'xfce4-settings'
 pkgname=xfce4-settings
-version=4.14.0
+version=4.14.1
 revision=1
 build_style=gnu-configure
 configure_args="--enable-sound-settings --enable-pluggable-dialogs"
@@ -13,6 +13,6 @@ short_desc="Xfce settings manager"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://xfce.org/"
-changelog="https://raw.githubusercontent.com/xfce-mirror/xfce4-settings/master/NEWS"
+changelog="https://raw.githubusercontent.com/xfce-mirror/xfce4-settings/xfce-4.14/NEWS"
 distfiles="https://archive.xfce.org/src/xfce/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=e03040d623abda0222ad04f226582277a1936507ddfa927ec8e87927debc113c
+checksum=e873e9f6b8e801fd9304ee100c4c76ed9987446c38429d02477c086431c0bf7a
diff --git a/srcpkgs/xfce4-systemload-plugin/template b/srcpkgs/xfce4-systemload-plugin/template
index 4eaa0d9ed16..c19a75e226f 100644
--- a/srcpkgs/xfce4-systemload-plugin/template
+++ b/srcpkgs/xfce4-systemload-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-systemload-plugin'
 pkgname=xfce4-systemload-plugin
 version=1.2.3
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
diff --git a/srcpkgs/xfce4-taskmanager/template b/srcpkgs/xfce4-taskmanager/template
index 0b94ada0e64..8b6aa65dc86 100644
--- a/srcpkgs/xfce4-taskmanager/template
+++ b/srcpkgs/xfce4-taskmanager/template
@@ -5,8 +5,7 @@ revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool"
-makedepends="libxfce4ui-devel xfce4-panel-devel libwnck2-devel libXmu-devel
- gtk+3-devel"
+makedepends="libxfce4ui-devel libwnck2-devel libXmu-devel gtk+3-devel"
 depends="hicolor-icon-theme desktop-file-utils"
 short_desc="XFCE task manager plugin"
 maintainer="Orphaned <orphan@voidlinux.org>"
diff --git a/srcpkgs/xfce4-time-out-plugin/template b/srcpkgs/xfce4-time-out-plugin/template
index 3d0fea97d23..5561643e2a1 100644
--- a/srcpkgs/xfce4-time-out-plugin/template
+++ b/srcpkgs/xfce4-time-out-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-time-out-plugin'
 pkgname=xfce4-time-out-plugin
 version=1.0.3
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
diff --git a/srcpkgs/xfce4-timer-plugin/template b/srcpkgs/xfce4-timer-plugin/template
index 1b8d7ce7ffb..0d827c5e04a 100644
--- a/srcpkgs/xfce4-timer-plugin/template
+++ b/srcpkgs/xfce4-timer-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-timer-plugin'
 pkgname=xfce4-timer-plugin
 version=1.7.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
diff --git a/srcpkgs/xfce4-verve-plugin/template b/srcpkgs/xfce4-verve-plugin/template
index f8550835345..0ee22148eb0 100644
--- a/srcpkgs/xfce4-verve-plugin/template
+++ b/srcpkgs/xfce4-verve-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-verve-plugin'
 pkgname=xfce4-verve-plugin
 version=2.0.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config"
 makedepends="xfce4-panel-devel"
diff --git a/srcpkgs/xfce4-wavelan-plugin/template b/srcpkgs/xfce4-wavelan-plugin/template
index 7c48dc3934f..ba1609d2693 100644
--- a/srcpkgs/xfce4-wavelan-plugin/template
+++ b/srcpkgs/xfce4-wavelan-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-wavelan-plugin'
 pkgname=xfce4-wavelan-plugin
 version=0.6.1
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
diff --git a/srcpkgs/xfce4-weather-plugin/template b/srcpkgs/xfce4-weather-plugin/template
index c87292db6ee..97dfd26af99 100644
--- a/srcpkgs/xfce4-weather-plugin/template
+++ b/srcpkgs/xfce4-weather-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-weather-plugin'
 pkgname=xfce4-weather-plugin
 version=0.10.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="libxfce4ui-devel xfce4-panel-devel libxml2-devel libsoup-devel upower-devel"
diff --git a/srcpkgs/xfce4-whiskermenu-plugin/template b/srcpkgs/xfce4-whiskermenu-plugin/template
index a9650a0f7b5..64cdfbe4daa 100644
--- a/srcpkgs/xfce4-whiskermenu-plugin/template
+++ b/srcpkgs/xfce4-whiskermenu-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-whiskermenu-plugin'
 pkgname=xfce4-whiskermenu-plugin
 version=2.3.3
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="exo-devel garcon-devel xfce4-panel-devel"
diff --git a/srcpkgs/xfce4-windowck-plugin/template b/srcpkgs/xfce4-windowck-plugin/template
index e5cc89e85e5..b5e035bcb05 100644
--- a/srcpkgs/xfce4-windowck-plugin/template
+++ b/srcpkgs/xfce4-windowck-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-windowck-plugin'
 pkgname=xfce4-windowck-plugin
 version=0.4.6
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="intltool xfce4-dev-tools exo-devel python3-devel glib-devel gettext-devel ImageMagick"
 makedepends="libwnck2-devel xfce4-panel-devel xorg-server-devel"
diff --git a/srcpkgs/xfce4-xkb-plugin/template b/srcpkgs/xfce4-xkb-plugin/template
index b669b9a1283..eee39e63402 100644
--- a/srcpkgs/xfce4-xkb-plugin/template
+++ b/srcpkgs/xfce4-xkb-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-xkb-plugin'
 pkgname=xfce4-xkb-plugin
 version=0.8.1
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="garcon-devel xfce4-panel-devel libxklavier-devel librsvg-devel libwnck-devel"
diff --git a/srcpkgs/xfsdump/template b/srcpkgs/xfsdump/template
index adcf5263132..ac8afcccb88 100644
--- a/srcpkgs/xfsdump/template
+++ b/srcpkgs/xfsdump/template
@@ -1,18 +1,19 @@
 # Template file for 'xfsdump'
 pkgname=xfsdump
 version=3.1.8
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin"
 makedepends="libuuid-devel ncurses-devel xfsprogs-devel attr-devel"
 short_desc="XFS filesystem incremental dump/restore utility"
-maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
-license="LGPL-2.1"
-homepage="http://oss.sgi.com/projects/xfs/"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="GPL-2.0-or-later"
+homepage="https://git.kernel.org/pub/scm/fs/xfs/xfsdump-dev.git/"
 distfiles="${KERNEL_SITE}/utils/fs/xfs/xfsdump/xfsdump-${version}.tar.xz"
 checksum=ed14e67ae5b273c2698e767b43a46f033d361e540fe13feaaf9b110ee0edc585
 
 post_extract() {
+	sed -i 's/xfs_fsop_geom_v1_t/struct xfs_fsop_geom_v1/g' common/fs.c
 	case "$XBPS_TARGET_MACHINE" in
 	*-musl)
 		sed -i -e 's/SIGCLD/SIGCHLD/g' \
diff --git a/srcpkgs/xfsprogs/template b/srcpkgs/xfsprogs/template
index dcf86402078..8fff3e8d7a4 100644
--- a/srcpkgs/xfsprogs/template
+++ b/srcpkgs/xfsprogs/template
@@ -1,6 +1,6 @@
 # Template file for 'xfsprogs'
 pkgname=xfsprogs
-version=5.2.0
+version=5.2.1
 revision=1
 build_style=gnu-configure
 configure_args="--enable-readline=yes --enable-lib64=no"
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="http://xfs.org/index.php/Main_Page"
 distfiles="${KERNEL_SITE}/utils/fs/xfs/xfsprogs/xfsprogs-${version}.tar.xz"
-checksum=e41cdaa43d92b38c8a12ce9cb612ab911ba0e019c2e0762c494a8a601f533fd6
+checksum=7b500e148cebd08f99e37cf744c7843817b37e7be2a32c4dc57d6ea16e3019ae
 
 do_install() {
 	make install install-dev DIST_ROOT=${DESTDIR} \
diff --git a/srcpkgs/xhost/template b/srcpkgs/xhost/template
index 4c560a6c47b..681ceed6b56 100644
--- a/srcpkgs/xhost/template
+++ b/srcpkgs/xhost/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libXmu-devel"
 short_desc="Server access control program for X"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2"
diff --git a/srcpkgs/xi-editor/template b/srcpkgs/xi-editor/template
index 56dc3b70293..d1f8173097b 100644
--- a/srcpkgs/xi-editor/template
+++ b/srcpkgs/xi-editor/template
@@ -5,7 +5,7 @@ revision=1
 build_wrksrc=rust
 build_style=cargo
 short_desc="Modern editor with a Rust backend"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/xi-editor/xi-editor"
 distfiles="https://github.com/xi-editor/xi-editor/archive/v${version}.tar.gz"
diff --git a/srcpkgs/xkb-switch/template b/srcpkgs/xkb-switch/template
index 2ed2ae13731..3e85baf4b8d 100644
--- a/srcpkgs/xkb-switch/template
+++ b/srcpkgs/xkb-switch/template
@@ -1,16 +1,16 @@
 # Template file for 'xkb-switch'
 pkgname=xkb-switch
-version=1.5.0
+version=1.6.0
 revision=1
 build_style=cmake
 hostmakedepends="cmake"
 makedepends="libX11-devel libxkbfile-devel"
 short_desc="Query and change the XKB layout state"
 maintainer="Andrey Raugas <kainonergon@gmail.com>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="https://github.com/ierton/xkb-switch"
 distfiles="https://github.com/ierton/${pkgname}/archive/${version}.tar.gz"
-checksum=3e100ac15670eda2109fb0d3159ad08e85e3b33de4cb1b3369dce5da7d83e954
+checksum=17ddd00a09945f634654ddf98d55023b0727755f828706747fd5227e2651633d
 
 post_install() {
 	vman man/xkb-switch.1
diff --git a/srcpkgs/xkcdpass/template b/srcpkgs/xkcdpass/template
index ba2bad454b4..46b4a9635f9 100644
--- a/srcpkgs/xkcdpass/template
+++ b/srcpkgs/xkcdpass/template
@@ -10,7 +10,7 @@ hostmakedepends="python3-setuptools"
 depends="python3-setuptools"
 checkdepends="python3-pytest"
 short_desc="Generate secure multiword passwords/passphrases, inspired by XKCD"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Lugubris <lugubris@disroot.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/redacted/XKCD-password-generator"
 distfiles="https://github.com/redacted/XKCD-password-generator/archive/xkcdpass-${version}.tar.gz"
diff --git a/srcpkgs/xl2tpd/template b/srcpkgs/xl2tpd/template
index 45ad8668192..7214468587a 100644
--- a/srcpkgs/xl2tpd/template
+++ b/srcpkgs/xl2tpd/template
@@ -1,6 +1,6 @@
 # Template file for 'xl2tpd'
 pkgname=xl2tpd
-version=1.3.14
+version=1.3.15
 revision=1
 build_style=gnu-makefile
 make_use_env=yes
@@ -11,9 +11,9 @@ short_desc="Open source implementation of the Layer 2 Tunnelling Protocol"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.xelerance.com/services/software/xl2tpd/"
-#changelog="https://github.com/xelerance/xl2tpd/blob/master/CHANGES"
+changelog="https://github.com/xelerance/xl2tpd/blob/master/CHANGES"
 distfiles="https://github.com/xelerance/xl2tpd/archive/v${version}.tar.gz"
-checksum=ff5a0806fecc58c7b9cbc625117a4521c0546522a5f5951ffb6eebdab998610f
+checksum=0d149bf9d2f7d838806e6a36fd7a676d03bf246d2b7869e16c945330e13b922e
 
 conf_files="
  /etc/xl2tpd/xl2tpd.conf
diff --git a/srcpkgs/xlockmore/template b/srcpkgs/xlockmore/template
index a0bcb39a5c2..3e8d34711fa 100644
--- a/srcpkgs/xlockmore/template
+++ b/srcpkgs/xlockmore/template
@@ -1,17 +1,17 @@
 # Template file for 'xlockmore'
 pkgname=xlockmore
-version=5.57
+version=5.59
 revision=1
 build_style=gnu-configure
 configure_args="--with-xinerama"
 hostmakedepends="pkg-config"
 makedepends="freetype-devel libXt-devel libXext-devel libXinerama-devel"
 short_desc="Provides the 'xlock' X screen locker"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD"
+maintainer="Andrew Benson <abenson+void@gmail.com>"
+license="MIT"
 homepage="http://sillycycle.com/xlockmore.html"
 distfiles="http://sillycycle.com/xlock/xlockmore-${version}.tar.xz"
-checksum=f9acf99befd798ac93909b2d7d6578a256d2dac283ddc562acc9b6ef10cc28a3
+checksum=2d2a6855ecdeee4856ace76acf615d3b2e48303951bb5fd31a234e4a54615251
 CFLAGS="-D_DEFAULT_SOURCE"
 
 pre_configure() {
diff --git a/srcpkgs/xlsatoms/template b/srcpkgs/xlsatoms/template
index 3d7594a0e4a..42570e6b125 100644
--- a/srcpkgs/xlsatoms/template
+++ b/srcpkgs/xlsatoms/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libxcb-devel"
 short_desc="List interned atoms defined on the X server"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2"
diff --git a/srcpkgs/xmltoman/template b/srcpkgs/xmltoman/template
index f948b2c8551..2f74978bea7 100644
--- a/srcpkgs/xmltoman/template
+++ b/srcpkgs/xmltoman/template
@@ -6,7 +6,7 @@ build_style=gnu-makefile
 hostmakedepends="perl perl-XML-Parser"
 depends="perl-XML-Parser"
 short_desc="Convert XML to man pages in groff format or html"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3"
 homepage="https://sourceforge.net/projects/xmltoman"
 distfiles="https://github.com/Distrotech/xmltoman/archive/${version}.tar.gz"
diff --git a/srcpkgs/xmodmap/template b/srcpkgs/xmodmap/template
index baf58f240ef..2f8678807d6 100644
--- a/srcpkgs/xmodmap/template
+++ b/srcpkgs/xmodmap/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libX11-devel"
 short_desc="X modmap program to modify keymaps and pointer button mappings"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2"
diff --git a/srcpkgs/xob/template b/srcpkgs/xob/template
index 4618280ffa5..04bedef94c0 100644
--- a/srcpkgs/xob/template
+++ b/srcpkgs/xob/template
@@ -8,7 +8,7 @@ make_use_env=yes
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libconfig-devel"
 short_desc="Lightweight overlay bar for the X Window System"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/florentc/xob"
 distfiles="https://github.com/florentc/xob/archive/v${version}.tar.gz"
diff --git a/srcpkgs/xonsh/template b/srcpkgs/xonsh/template
index bb8563500eb..768ebf36022 100644
--- a/srcpkgs/xonsh/template
+++ b/srcpkgs/xonsh/template
@@ -1,6 +1,6 @@
 # Template file for 'xonsh'
 pkgname=xonsh
-version=0.9.8
+version=0.9.12
 revision=1
 archs=noarch
 build_style=python3-module
@@ -12,5 +12,5 @@ license="GPL-3.0-or-later"
 homepage="https://xon.sh/"
 changelog="https://raw.githubusercontent.com/xonsh/xonsh/${version}/CHANGELOG.rst"
 distfiles="https://github.com/xonsh/xonsh/archive/${version}.tar.gz"
-checksum=f9185bac74241c7503f4d0805348e64453576daa282aa4238f526c0bfbae55d8
+checksum=e7cf4e98ebfb9a35b197e681e426f58e8c0c4ce5aee5e1ec9d1d25a37eb92eda
 register_shell="/bin/xonsh"
diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 178cd37b34f..06ddfb3eac1 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,7 +1,7 @@
 # Template file for 'xorg-server'
 pkgname=xorg-server
 version=1.20.5
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
  -Dxvfb=true -Dhal=false -Dudev=true -Dxkb_dir=/usr/share/X11/xkb
diff --git a/srcpkgs/xorgproto/template b/srcpkgs/xorgproto/template
index 20afccaf68d..460d74fc855 100644
--- a/srcpkgs/xorgproto/template
+++ b/srcpkgs/xorgproto/template
@@ -1,12 +1,12 @@
 # Template file for 'xorgproto'
 pkgname=xorgproto
 version=2019.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-legacy"
 hostmakedepends="xorg-util-macros"
 short_desc="Combined X.Org X11 Protocol headers"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/proto/xorgproto-${version}.tar.gz"
@@ -52,4 +52,7 @@ post_install() {
 	rm -f ${DESTDIR}/usr/include/X11/extensions/{apple,windows}*
 	rm -f ${DESTDIR}/usr/share/licenses/${pkgname}/COPYING-{apple,windows}wmproto
 	rm -f ${DESTDIR}/usr/share/pkgconfig/{apple,windows}wmproto.pc
+
+	# provided by libX11-devel
+	rm -f ${DESTDIR}/usr/include/X11/extensions/XKBgeom.h
 }
diff --git a/srcpkgs/xpdf/template b/srcpkgs/xpdf/template
index a5c3fba24b0..fa3a213db45 100644
--- a/srcpkgs/xpdf/template
+++ b/srcpkgs/xpdf/template
@@ -1,6 +1,6 @@
 # Template file for 'xpdf'
 pkgname=xpdf
-version=4.01.01
+version=4.02
 revision=1
 build_style=cmake
 configure_args="-DSYSTEM_XPDFRC=/etc/xpdfrc"
@@ -11,9 +11,9 @@ depends="gsfonts"
 short_desc="Viewer for Portable Document Format (PDF) files"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
-homepage="http://www.foolabs.com/xpdf/"
+homepage="http://www.xpdfreader.com/"
 distfiles="https://xpdfreader-dl.s3.amazonaws.com/xpdf-$version.tar.gz"
-checksum=ba550c7d3e4f73b1833cfcdcd9dbe39849dd0cd459b6774c4ecdfeca993204a4
+checksum=52d51dc943b9614b8da66e8662b3031a3c82dc25bfc792eac6b438aa36d549a4
 patch_args="-Np1"
 
 post_extract() {
diff --git a/srcpkgs/xpdf/update b/srcpkgs/xpdf/update
new file mode 100644
index 00000000000..e03f3354958
--- /dev/null
+++ b/srcpkgs/xpdf/update
@@ -0,0 +1 @@
+site='http://www.xpdfreader.com/download.html'
diff --git a/srcpkgs/xpra/template b/srcpkgs/xpra/template
index b9efd4f1583..4180b3a1f22 100644
--- a/srcpkgs/xpra/template
+++ b/srcpkgs/xpra/template
@@ -10,7 +10,7 @@ makedepends="ffmpeg-devel libXcomposite-devel libXrandr-devel libXtst-devel
 depends="cups pygtk python-Pillow python-cups python-dbus python-lz4
  python-paramiko python-rencode xauth xf86-video-dummy xorg-server-xvfb"
 short_desc="Like screen(1) for X"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://xpra.org/"
 changelog="https://xpra.org/svn/Xpra/trunk/debian/changelog"
diff --git a/srcpkgs/xprintidle/template b/srcpkgs/xprintidle/template
index 597e28350b0..a6d77d4077e 100644
--- a/srcpkgs/xprintidle/template
+++ b/srcpkgs/xprintidle/template
@@ -5,7 +5,7 @@ revision=2
 build_style=gnu-configure
 makedepends="libXScrnSaver-devel"
 short_desc="Query X server for user's idle time and print it in milliseconds"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2"
 homepage="https://github.com/g0hl1n/xprintidle"
 distfiles="https://github.com/g0hl1n/xprintidle/archive/${version}.tar.gz"
diff --git a/srcpkgs/xrdb/template b/srcpkgs/xrdb/template
index e30fadc2009..6d849ba0571 100644
--- a/srcpkgs/xrdb/template
+++ b/srcpkgs/xrdb/template
@@ -8,7 +8,7 @@ hostmakedepends="pkg-config"
 makedepends="libX11-devel libXmu-devel"
 depends="mcpp"
 short_desc="X server resource database utility"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2"
diff --git a/srcpkgs/xsecurelock/template b/srcpkgs/xsecurelock/template
index 0e8d0a56a29..d0c4503d11d 100644
--- a/srcpkgs/xsecurelock/template
+++ b/srcpkgs/xsecurelock/template
@@ -1,6 +1,6 @@
 # Template file for 'xsecurelock'
 pkgname=xsecurelock
-version=1.4.0
+version=1.5.1
 revision=1
 build_style=gnu-configure
 configure_args="--with-pam-service-name=system-local-login"
@@ -13,7 +13,7 @@ maintainer="Sean R. Lang <srlang@ncsu.edu>"
 license="Apache-2.0"
 homepage="https://github.com/google/xsecurelock"
 distfiles="https://github.com/google/xsecurelock/archive/v${version}.tar.gz"
-checksum=68a09a03ddb2180ad84a1c52da849912d584ec2bdb4f22ccdd40802907ab504f
+checksum=069a71994d39fee48c7c010194506466318c2b8b8bd8977d6ebbcd278d15e0b2
 
 pre_configure() {
 	sh autogen.sh
diff --git a/srcpkgs/xst/template b/srcpkgs/xst/template
index 56801dc4f75..fb998050583 100644
--- a/srcpkgs/xst/template
+++ b/srcpkgs/xst/template
@@ -1,7 +1,7 @@
 # Template file for 'xst'
 pkgname=xst
 version=0.7.2
-revision=2
+revision=3
 build_style=gnu-makefile
 make_use_env=compliant
 hostmakedepends="pkg-config"
@@ -21,6 +21,7 @@ do_install() {
 	vinstall doc/xst.info 644 usr/share/terminfo/x xst.terminfo
 	vdoc README.md README
 	vdoc doc/FAQ
+	vsed -i 's/st-256color/xst-256color/' doc/Xresources
 	vdoc doc/Xresources
 	vlicense doc/LICENSE
 }
diff --git a/srcpkgs/xterm/template b/srcpkgs/xterm/template
index 4cede25fd96..f67ce908c43 100644
--- a/srcpkgs/xterm/template
+++ b/srcpkgs/xterm/template
@@ -1,7 +1,7 @@
 # Template file for 'xterm'
 pkgname=xterm
-version=347
-revision=2
+version=349
+revision=1
 build_style=gnu-configure
 configure_args="--enable-wide-chars --enable-88-color --enable-broken-osc
  --enable-256-color --enable-luit --enable-paste64 --enable-ansi-color
@@ -15,12 +15,12 @@ hostmakedepends="pkg-config"
 makedepends="libXaw-devel libXft-devel libutempter-devel libxkbfile-devel
  ncurses-devel"
 short_desc="X Terminal Emulator"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Frank Steinborn <steinex@nognu.de>"
 license="MIT"
 homepage="http://invisible-island.net/xterm/"
 changelog="http://invisible-island.net/xterm/xterm.log.html"
 distfiles="https://invisible-mirror.net/archives/xterm/xterm-${version}.tgz"
-checksum=400f73e1277ef96dfcb3885388525e6a13a3657a4032b83c1203e812b710b908
+checksum=39a6a3d3724f9a0a068f8cc353ab0c82831f0a43abb24470d933af299658475f
 
 post_install() {
 	for f in {u,}xterm.desktop; do
diff --git a/srcpkgs/xtitle/template b/srcpkgs/xtitle/template
index 12b64ded09b..a6a0dc80d3d 100644
--- a/srcpkgs/xtitle/template
+++ b/srcpkgs/xtitle/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-makefile
 makedepends="libxcb-devel xcb-util-devel xcb-util-wm-devel"
 short_desc="Outputs X window titles"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Public Domain"
 homepage="https://github.com/baskerville/xtitle"
 distfiles="${homepage}/archive/${version}.tar.gz"
diff --git a/srcpkgs/xurls/template b/srcpkgs/xurls/template
index 7324801344e..c1d66b933ba 100644
--- a/srcpkgs/xurls/template
+++ b/srcpkgs/xurls/template
@@ -1,6 +1,6 @@
 # Template file for 'xurls'
 pkgname=xurls
-version=2.0.0
+version=2.1.0
 revision=1
 build_style=go
 go_import_path="github.com/mvdan/${pkgname}"
@@ -11,7 +11,7 @@ maintainer="dleeram <dleeram@protonmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.github.com/mvdan/xurls"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=515f05122890daab367bdff142f9c605475e81e3089d9aff080bc31bf0ddaf7b
+checksum=b6559d06ab8f59cc8ed0ac2de6018fe663587c803f981d25058e840c42ec76b0
 
 do_check() {
 	go test -v
diff --git a/srcpkgs/xvinfo/template b/srcpkgs/xvinfo/template
index cafc195447c..21be07874f8 100644
--- a/srcpkgs/xvinfo/template
+++ b/srcpkgs/xvinfo/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libXv-devel"
 short_desc="Query X-Video capabilities"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2"
diff --git a/srcpkgs/xvkbd/template b/srcpkgs/xvkbd/template
index 0e2fea8b9de..72bf1390a50 100644
--- a/srcpkgs/xvkbd/template
+++ b/srcpkgs/xvkbd/template
@@ -1,6 +1,6 @@
 # Template file for 'xvkbd'
 pkgname=xvkbd
-version=3.9
+version=4.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="imake xorg-cf-files gccmakedep"
@@ -10,11 +10,16 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2"
 homepage="http://t-sato.in.coocan.jp/xvkbd/"
 distfiles="http://t-sato.in.coocan.jp/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=b81c37ddfb7b78993dad15d304f8fd78e540d57c0a72f7e3316fd45fba919a9d
+checksum=eb54e440badc40299ba9a8f27fcea740cd3501310e8955651af7ade517a3ac82
 nocross=yes  # xmkmf broken
 
+case "$XBPS_TARGET_MACHINE" in
+	x86_64-musl) broken="cannot retrieve distfiles (Forbidden)" ;;
+esac
+
 do_configure() {
 	xmkmf
+	sed -i 's/\$(DESTDIR) \$(SHAREDIR)/$(DESTDIR)$(SHAREDIR)/' Makefile
 }
 pre_build() {
 	export MODULE_CFLAGS="$CFLAGS"
diff --git a/srcpkgs/xxHash/template b/srcpkgs/xxHash/template
index c085dfc296d..4835415747c 100644
--- a/srcpkgs/xxHash/template
+++ b/srcpkgs/xxHash/template
@@ -1,6 +1,6 @@
 # Template file for 'xxHash'
 pkgname=xxHash
-version=0.7.1
+version=0.7.2
 revision=1
 build_style=gnu-makefile
 make_use_env=yes
@@ -10,7 +10,7 @@ maintainer="John <johnz@posteo.net>"
 license="BSD-2-Clause, GPL-2.0-or-later"
 homepage="https://cyan4973.github.io/xxHash/"
 distfiles="https://github.com/Cyan4973/${pkgname}/archive/v${version}.tar.gz>xxhash-${version}.tar.gz"
-checksum=afa29766cfc0448ff4a1fd9f2c47e02c48d50be5b79749925d15d545008c3f81
+checksum=7e93d28e81c3e95ff07674a400001d0cdf23b7842d49b211e5582d00d8e3ac3e
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/yabasic/template b/srcpkgs/yabasic/template
index d7bf6a43010..c7f86dfacbb 100644
--- a/srcpkgs/yabasic/template
+++ b/srcpkgs/yabasic/template
@@ -1,16 +1,16 @@
 # Template file for 'yabasic'
 pkgname=yabasic
 reverts="2.769_1"
-version=2.84.0
+version=2.84.2
 revision=1
 build_style=gnu-configure
-makedepends="libXt-devel ncurses-devel"
+makedepends="libXt-devel ncurses-devel libffi-devel"
 short_desc="Yet another Basic"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3.0-or-later"
-homepage="http://2484.de/yabasic/"
-distfiles="http://2484.de/yabasic/download/yabasic-${version}.tar.gz"
-checksum=103fd4a2a8edc61a2bd7f56d721775a5c56c19026566f74e16cdabc1816389d2
+homepage="https://2484.de/yabasic/"
+distfiles="https://2484.de/yabasic/download/yabasic-${version}.tar.gz"
+checksum=98064a2631428ad938b4f515f78688f366ea2f2bebe80c31eebc2747f5b46fa6
 
 do_install() {
 	vbin yabasic
diff --git a/srcpkgs/yad/template b/srcpkgs/yad/template
index 105fd7310ba..b67c4b9e564 100644
--- a/srcpkgs/yad/template
+++ b/srcpkgs/yad/template
@@ -1,17 +1,17 @@
 # Template file for 'yad'
 pkgname=yad
-version=2.0
+version=4.1
 revision=1
 build_style=gnu-configure
 configure_args="--enable-icon-browser"
 hostmakedepends="automake gettext-devel glib-devel intltool pkg-config"
-makedepends="gtk+3-devel"
+makedepends="gtk+3-devel webkit2gtk-devel gtksourceview-devel gspell-devel"
 short_desc="Yet Another Dialog"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/v1cont/yad"
 distfiles="https://github.com/v1cont/yad/archive/${version}.tar.gz"
-checksum=acdbd59ee2e3ad67a61da965b2ea88e3b07bcee438382f4614e8f6f1f1ee7871
+checksum=668987b2452ab5c82b14e993c680fcf2abed8fdd37bda3d54580860a9a09aabf
 
 pre_configure() {
 	autoreconf -ivf
diff --git a/srcpkgs/yakuake/template b/srcpkgs/yakuake/template
index e2ecce48f30..9e67e48e457 100644
--- a/srcpkgs/yakuake/template
+++ b/srcpkgs/yakuake/template
@@ -1,17 +1,13 @@
 # Template file for 'yakuake'
 pkgname=yakuake
-version=3.0.5
-revision=2
+version=19.08.2
+revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules"
+hostmakedepends="extra-cmake-modules kconfig kcoreaddons qt5-host-tools qt5-qmake"
 makedepends="knewstuff-devel knotifyconfig-devel kparts-devel"
-short_desc="A drop-down terminal emulator based on KDE konsole technology"
+short_desc="Drop-down terminal emulator based on KDE konsole technology"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="http://yakuake.kde.org/"
-distfiles="${KDE_SITE}/${pkgname}/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=08e23bd3ed58732bec44bf1b6797990bbdc58fad0725da7215db39f86c4d2a08
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" kconfig python qt5-host-tools qt5-qmake"
-fi
+distfiles="${KDE_SITE}/applications/${version}/src/yakuake-${version}.tar.xz"
+checksum=3ebf477069c85a8705302b6b51902a74af7bb92349fab41000f71484a4de5aee
diff --git a/srcpkgs/yandex-disk/template b/srcpkgs/yandex-disk/template
index 9f5eac00752..4a40b02aed0 100644
--- a/srcpkgs/yandex-disk/template
+++ b/srcpkgs/yandex-disk/template
@@ -1,6 +1,6 @@
 # Template file for 'yandex-disk'
 pkgname=yandex-disk
-version=0.1.5.1010
+version=0.1.5.1039
 revision=1
 archs="i686 x86_64"
 short_desc="Console client for Yandex.Disk"
@@ -14,11 +14,11 @@ nostrip_files=yandex-disk
 if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
 	debpkgid="${pkgname}_${version}_amd64.deb"
 	distfiles="http://repo.yandex.ru/yandex-disk/deb/pool/main/y/${pkgname}/${debpkgid}"
-	checksum=901756adb89ee46dab4838795bd62c74ee272e64946bb1670dd0b7b246fae3cc
+	checksum=1a6b8c6200a09bd8d2f8aacb3ebb18208b89d5b055be9bab5c3ed1a0336ac1d6
 else
 	debpkgid="${pkgname}_${version}_i386.deb"
 	distfiles="http://repo.yandex.ru/yandex-disk/deb/pool/main/y/${pkgname}/${debpkgid}"
-	checksum=685f6f62a637ae0ffa5a93382024d2fd95853096d7e91c49bb3d280c2980eb7b
+	checksum=da195f7ddc3dcd8bf4fa08ff042860beea0759f39af74b8459be333e2b81393e
 fi
 
 do_extract() {
@@ -36,4 +36,3 @@ do_install() {
 		${DESTDIR}/usr/share/bash-completion/completions/yandex-disk
 	sed -e "s/^\(have.*\)/\#\1/" -i ${DESTDIR}/usr/share/bash-completion/completions/yandex-disk
 }
-
diff --git a/srcpkgs/yank/template b/srcpkgs/yank/template
index d4f764f9978..b062506a72b 100644
--- a/srcpkgs/yank/template
+++ b/srcpkgs/yank/template
@@ -1,9 +1,9 @@
 # Template file for 'yank'
 pkgname=yank
-version=1.1.0
+version=1.2.0
 revision=1
-make_use_env=yes
 build_style=gnu-makefile
+make_use_env=yes
 depends="xsel"
 short_desc="Yank terminal output to clipboard"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://github.com/mptre/yank"
 changelog="https://raw.githubusercontent.com/mptre/yank/master/CHANGELOG.md"
 distfiles="https://github.com/mptre/yank/releases/download/v${version}/yank-${version}.tar.gz"
-checksum=f197107cd604c41ef3c2390175bd34e5ad3c7cf1feafedefe357ba75149f1c59
+checksum=b500d1a71378e69a2a348032107e6d8db728b8f6af280a9bb4cb446c1d26e43a
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/yarn-bin/template b/srcpkgs/yarn-bin/template
index 6c375401272..cc1180caaf7 100644
--- a/srcpkgs/yarn-bin/template
+++ b/srcpkgs/yarn-bin/template
@@ -1,14 +1,14 @@
 # Template file for 'yarn-bin'
 pkgname=yarn-bin
-version=1.17.3
+version=1.19.0
 revision=1
 depends="virtual?nodejs-runtime"
 short_desc="Fast, reliable, and secure dependency management - precompiled binaries"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
-license="2-cause-BSD"
+license="BSD-2-Clause"
 homepage="https://yarnpkg.com/"
 distfiles="https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz"
-checksum=e3835194409f1b3afa1c62ca82f561f1c29d26580c9e220c36866317e043c6f3
+checksum=6bbdaab9c31eedbe7b53cbcde2be06b8c926f139bd0f7c00fccad406016e8934
 conflicts="yarn>=0"
 
 do_extract() {
diff --git a/srcpkgs/yaru/template b/srcpkgs/yaru/template
index 79f6e207389..17fd11f3a8e 100644
--- a/srcpkgs/yaru/template
+++ b/srcpkgs/yaru/template
@@ -1,6 +1,6 @@
 # Template file for 'yaru'
 pkgname=yaru
-version=19.10.1
+version=19.10.4
 revision=1
 archs=noarch
 build_style=meson
@@ -11,4 +11,4 @@ maintainer="Dawid Potocki <dpot@disroot.org>"
 license="GPL-3.0-or-later, CC-BY-SA-4.0"
 homepage="https://github.com/ubuntu/yaru"
 distfiles="https://github.com/ubuntu/yaru/archive/$version.tar.gz"
-checksum=1c66fca466591af3265cf2d004258e2d9cd431bd22456be18fc8bb8b5e18f137
+checksum=bff882ded3e9951d9c657eb60c34fe2d4cf5b9b98751f63fb062c64a98d08fd1
diff --git a/srcpkgs/yash/template b/srcpkgs/yash/template
index 712c7c8dcb7..1383d50ad33 100644
--- a/srcpkgs/yash/template
+++ b/srcpkgs/yash/template
@@ -1,22 +1,23 @@
 # Template file for 'yash'
 pkgname=yash
-version=2.48
+version=2.49
 revision=1
 build_style=configure
 configure_args="--prefix=/usr"
+make_build_args="LDLIBS=-lm LDLIBS+=${XBPS_CROSS_BASE}/usr/lib/libncursesw.a"
 makedepends="ncurses-devel"
+checkdepends="ed"
 short_desc="Yet another shell (POSIX-compliant)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://yash.osdn.jp/"
-#changelog="https://github.com/magicant/yash/releases"
+changelog="https://github.com/magicant/yash/releases"
 distfiles="https://github.com/magicant/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=f46294d77c5a646405db20a6dc3d16bc1ed109b061b2a508081ce483153c1e8d
-make_build_args="LDLIBS=-lm LDLIBS+=${XBPS_CROSS_BASE}/usr/lib/libncursesw.a"
-register_shell="/bin/yash"
+checksum=66eaf11d6c749165a7503801691759ae151e4eae00785875e121db2e9c219c72
 alternatives="
  sh:sh:/usr/bin/yash
  sh:sh.1:/usr/share/man/man1/yash.1"
+register_shell="/bin/yash"
 
 post_extract() {
 	sed -i '40i#undef iswdigit' arith.c  # macro in musl
diff --git a/srcpkgs/yelp-xsl/template b/srcpkgs/yelp-xsl/template
index b7e337e2f2c..153edd0f5c9 100644
--- a/srcpkgs/yelp-xsl/template
+++ b/srcpkgs/yelp-xsl/template
@@ -1,6 +1,6 @@
 # Template file for 'yelp-xsl'
 pkgname=yelp-xsl
-version=3.32.1
+version=3.34.0
 revision=1
 archs=noarch
 build_style=gnu-configure
@@ -11,4 +11,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Yelp/Xsl"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=cac31bc150545d6aa0de15dce04560cbf591008d17a783a1d1d9cdd47b147f04
+checksum=e8063aee67d1df634f3d062f1c28130b2dabb3c0c66396b1af90388f34e14ee2
diff --git a/srcpkgs/yelp/template b/srcpkgs/yelp/template
index a0195be2fa2..1288d697159 100644
--- a/srcpkgs/yelp/template
+++ b/srcpkgs/yelp/template
@@ -1,6 +1,6 @@
 # Template file for 'yelp'
 pkgname=yelp
-version=3.32.2
+version=3.34.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-schemas-compile --disable-static"
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Yelp"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=eef4dfa77d31a0005b4b39bf5f193263e1f4fe4ba1d0aecfdb3dd7caa249347b
+checksum=e3d6527c5963d73206891b32f1f23363164be57de248555513bd0be77a7bd045
 
 yelp-devel_package() {
 	depends="yelp-${version}_${revision}"
diff --git a/srcpkgs/yggdrasil/template b/srcpkgs/yggdrasil/template
index b0b43d94b92..2c8c5b909ff 100644
--- a/srcpkgs/yggdrasil/template
+++ b/srcpkgs/yggdrasil/template
@@ -1,7 +1,7 @@
 # Template file for 'yggdrasil'
 pkgname=yggdrasil
-version=0.3.7
-revision=2
+version=0.3.10
+revision=1
 wrksrc="yggdrasil-go-${version}"
 build_style=go
 go_import_path=github.com/yggdrasil-network/yggdrasil-go
@@ -11,7 +11,7 @@ maintainer="Jan Christian Gruenhage <jan.christian@gruenhage.xyz>"
 license="LGPL-3.0-only"
 homepage="https://yggdrasil-network.github.io/"
 distfiles="https://github.com/yggdrasil-network/yggdrasil-go/archive/v${version}.tar.gz"
-checksum=a0fc98f7d479fb44943fe85f223fbd9c5de529baa6f66887e37e904117e18a6a
+checksum=c6abe1757b044e80ff28a4003a03ddb192181c9dcb4aaf9de5749394861b733e
 
 do_build() {
 	PKGNAME=${pkgname} PKGVER=${version} ./build
diff --git a/srcpkgs/ykpivmgr/patches/libressl.patch b/srcpkgs/ykpivmgr/patches/libressl.patch
deleted file mode 100644
index 4c48300e932..00000000000
--- a/srcpkgs/ykpivmgr/patches/libressl.patch
+++ /dev/null
@@ -1,158 +0,0 @@
---- tool/openssl-compat.c
-+++ tool/openssl-compat.c
-@@ -71,6 +71,10 @@
-         *iqmp = r->iqmp;
- }
- 
-+#endif /* OPENSSL_VERSION_NUMBER */
-+
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+
- void X509_SIG_getm(X509_SIG *sig, X509_ALGOR **palg,
-                    ASN1_OCTET_STRING **pdigest)
- {
-@@ -80,4 +84,4 @@
-         *pdigest = sig->digest;
- }
- 
--#endif /* OPENSSL_VERSION_NUMBER */
-+#endif /* OPENSSL_VERSION_NUMBER || defined(LIBRESSL_VERSION_NUMBER) */
-
---- tool/openssl-compat.h
-+++ tool/openssl-compat.h
-@@ -20,7 +20,6 @@
- #include <openssl/ecdsa.h>
- #include <openssl/dh.h>
- #include <openssl/evp.h>
--#include <openssl/x509.h>
- 
- int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d);
- void RSA_get0_key(const RSA *r,
-@@ -29,9 +28,15 @@
- void RSA_get0_crt_params(const RSA *r,
-                          const BIGNUM **dmp1, const BIGNUM **dmq1,
-                          const BIGNUM **iqmp);
-+#endif /* OPENSSL_VERSION_NUMBER */
-+
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+
-+#include <openssl/x509.h>
-+
- void X509_SIG_getm(X509_SIG *sig, X509_ALGOR **palg,
-                    ASN1_OCTET_STRING **pdigest);
- 
-+#endif /* OPENSSL_VERSION_NUMBER || defined(LIBRESSL_VERSION_NUMBER) */
- #endif /* _WINDOWS */
--#endif /* OPENSSL_VERSION_NUMBER */
- #endif /* LIBCRYPTO_COMPAT_H */
-
---- tool/yubico-piv-tool.c
-+++ tool/yubico-piv-tool.c
-@@ -124,7 +124,7 @@
-   return false;
- }
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if !((OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER))
- static int ec_key_ex_data_idx = -1;
- 
- struct internal_key {
-@@ -688,7 +688,7 @@
-     goto request_out;
-   }
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
-   memcpy(digest, oid, oid_len);
-   /* XXX: this should probably use X509_REQ_digest() but that's buggy */
-   if(!ASN1_item_digest(ASN1_ITEM_rptr(X509_REQ_INFO), md, req->req_info,
-@@ -721,7 +721,7 @@
-       fprintf(stderr, "Failed signing request.\n");
-       goto request_out;
-     }
--    M_ASN1_BIT_STRING_set(req->signature, signature, sig_len);
-+    ASN1_BIT_STRING_set(req->signature, signature, sig_len);
-     /* mark that all bits should be used. */
-     req->signature->flags = ASN1_STRING_FLAG_BITS_LEFT;
-   }
-@@ -751,7 +751,7 @@
-     EVP_PKEY_free(public_key);
-   }
-   if(req) {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
-     if(req->sig_alg->parameter) {
-       req->sig_alg->parameter = NULL;
-     }
-@@ -884,7 +884,7 @@
-   if(nid == 0) {
-     goto selfsign_out;
-   }
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
-   if(YKPIV_IS_RSA(algorithm)) {
-     signinput = digest;
-     len = oid_len + md_len;
-@@ -912,7 +912,7 @@
-       fprintf(stderr, "Failed signing certificate.\n");
-       goto selfsign_out;
-     }
--    M_ASN1_BIT_STRING_set(x509->signature, signature, sig_len);
-+    ASN1_BIT_STRING_set(x509->signature, signature, sig_len);
-     /* setting flags to ASN1_STRING_FLAG_BITS_LEFT here marks that no bits
-      * should be subtracted from the bit string, thus making sure that the
-      * certificate can be validated. */
-@@ -941,7 +941,7 @@
-     fclose(output_file);
-   }
-   if(x509) {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
-     if(x509->sig_alg->parameter) {
-       x509->sig_alg->parameter = NULL;
-       x509->cert_info->signature->parameter = NULL;
-
-diff --git ykcs11/openssl_utils.c ykcs11/openssl_utils.c
-index 68fb29a..5a7f85d 100644
---- ykcs11/openssl_utils.c
-+++ ykcs11/openssl_utils.c
-@@ -165,7 +165,7 @@ CK_RV do_create_empty_cert(CK_BYTE_PTR in, CK_ULONG in_len, CK_BBOOL is_rsa,
-   X509_set_notBefore(cert, tm);
-   X509_set_notAfter(cert, tm);
- 
--#if OPENSSL_VERSION_NUMBER < 10100000L
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
-   // Manually set the signature algorithms.
-   // OpenSSL 1.0.1i complains about empty DER fields
-   // 8 => md5WithRsaEncryption
-diff --git ykcs11/tests/ykcs11_tests.c ykcs11/tests/ykcs11_tests.c
-index 9fb51da..257c938 100644
---- ykcs11/tests/ykcs11_tests.c
-+++ ykcs11/tests/ykcs11_tests.c
-@@ -274,7 +274,7 @@ static void test_login() {
- 
- }
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if !((OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER))
- static int bogus_sign(int dtype, const unsigned char *m, unsigned int m_length,
-                unsigned char *sigret, unsigned int *siglen, const RSA *rsa) {
-   sigret = malloc(1);
-@@ -385,7 +385,7 @@ static void test_import_and_sign_all_10() {
-   X509_set_notBefore(cert, tm);
-   X509_set_notAfter(cert, tm);
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
-   cert->sig_alg->algorithm = OBJ_nid2obj(8);
-   cert->cert_info->signature->algorithm = OBJ_nid2obj(8);
- 
-@@ -583,7 +583,7 @@ static void test_import_and_sign_all_10_RSA() {
-   X509_set_notBefore(cert, tm);
-   X509_set_notAfter(cert, tm);
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
-   /* putting bogus data to signature to make some checks happy */
-   cert->sig_alg->algorithm = OBJ_nid2obj(8);
-   cert->cert_info->signature->algorithm = OBJ_nid2obj(8);
diff --git a/srcpkgs/ykpivmgr/patches/ssl_obsolete.patch b/srcpkgs/ykpivmgr/patches/ssl_obsolete.patch
new file mode 100644
index 00000000000..e842806e821
--- /dev/null
+++ b/srcpkgs/ykpivmgr/patches/ssl_obsolete.patch
@@ -0,0 +1,22 @@
+diff --git a/tool/yubico-piv-tool.c b/tool/yubico-piv-tool.c
+index d7e11d5..7cd15e3 100644
+--- a/tool/yubico-piv-tool.c
++++ b/tool/yubico-piv-tool.c
+@@ -751,7 +751,7 @@ static bool request_certificate(ykpiv_state *state, enum enum_key_format key_for
+       fprintf(stderr, "Failed signing request.\n");
+       goto request_out;
+     }
+-    M_ASN1_BIT_STRING_set(req->signature, signature, sig_len);
++    ASN1_STRING_set(req->signature, signature, sig_len);
+     /* mark that all bits should be used. */
+     req->signature->flags = ASN1_STRING_FLAG_BITS_LEFT;
+   }
+@@ -1007,7 +1007,7 @@ static bool selfsign_certificate(ykpiv_state *state, enum enum_key_format key_fo
+       fprintf(stderr, "Failed signing certificate.\n");
+       goto selfsign_out;
+     }
+-    M_ASN1_BIT_STRING_set(x509->signature, signature, sig_len);
++    ASN1_STRING_set(x509->signature, signature, sig_len);
+     /* setting flags to ASN1_STRING_FLAG_BITS_LEFT here marks that no bits
+      * should be subtracted from the bit string, thus making sure that the
+      * certificate can be validated. */
diff --git a/srcpkgs/ykpivmgr/template b/srcpkgs/ykpivmgr/template
index 7e72bcc15f5..1e4a78e0e4a 100644
--- a/srcpkgs/ykpivmgr/template
+++ b/srcpkgs/ykpivmgr/template
@@ -6,8 +6,8 @@ _libykcs_name="libykcs11"
 _libykcs_desc="Yubikey PIV pkcs11 library"
 
 pkgname=ykpivmgr
-version=1.5.0
-revision=5
+version=1.7.0
+revision=1
 wrksrc="${_real_name}-${version}"
 build_style=gnu-configure
 configure_args="--enable-doxygen-man --program-transform-name='s/^yubico-piv-tool$/ykpivmgr/'"
@@ -15,10 +15,11 @@ hostmakedepends="automake libtool gengetopt pkg-config doxygen perl"
 makedepends="libressl-devel check-devel pcsclite-devel"
 short_desc="Yubikey PIV management tool"
 maintainer="Aloz1 <kno0001@gmail.com>"
-license="BSD"
+license="BSD-2-Clause"
 homepage="https://developers.yubico.com/${_real_name}"
 distfiles="https://developers.yubico.com/${_real_name}/Releases/${_real_name}-${version}.tar.gz"
-checksum=c18375179ba25bf9d61365b3903f033f112897bbd54ca63c62fa153f2d05aaab
+checksum=b428527e4031453a637128077983e782e9fea25df98e95e0fc27819b2e82fd7f
+patch_args="-Np1"
 
 post_extract() {
 	sed -i '/^yubico-piv-tool.1/,$d' tool/Makefile.am
diff --git a/srcpkgs/yoshimi/template b/srcpkgs/yoshimi/template
index d34d8fe03ea..9196f3e25a3 100644
--- a/srcpkgs/yoshimi/template
+++ b/srcpkgs/yoshimi/template
@@ -1,6 +1,6 @@
 # Template file for 'yoshimi'
 pkgname=yoshimi
-version=1.5.11.4
+version=1.6.0.1
 revision=1
 build_wrksrc=src
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="https://yoshimi.github.io/"
 distfiles="https://github.com/Yoshimi/$pkgname/archive/$version.tar.gz"
-checksum=36e0b1ff3b513646387612cbe420ddf444ca91842994d01b7a8890696d6a63dc
+checksum=92c4570391721f8faff1059063cf36f6e9018e52be6b18bce9d3d263087afcfb
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) makedepends+=" argp-standalone";;
diff --git a/srcpkgs/yosys/template b/srcpkgs/yosys/template
index 4516a7e4c88..b35f42713b7 100644
--- a/srcpkgs/yosys/template
+++ b/srcpkgs/yosys/template
@@ -1,11 +1,11 @@
 # Template file for 'yosys'
 pkgname=yosys
-version=0.8
+version=0.9
 revision=1
 wrksrc=${pkgname}-${pkgname}-${version}
 build_style=gnu-makefile
 make_use_env=yes
-hostmakedepends="python3 bison flex pkg-config clang git tcl"
+hostmakedepends="python3 bison flex pkg-config clang git tcl readline"
 makedepends="tcl-devel readline-devel libffi-devel"
 depends="graphviz xdot"
 short_desc="Verilog RTL Synthesis Suite"
@@ -13,7 +13,7 @@ maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="http://www.clifford.at/yosys/about.html"
 distfiles="https://github.com/cliffordwolf/yosys/archive/yosys-${version}.tar.gz"
-checksum=07760fe732003585b26d97f9e02bcddf242ff7fc33dbd415446ac7c70e85c66f
+checksum=f2e31371f9cf1b36cb4f57b23fd6eb849adc7d935dcf49f3c905aa5136382c2f
 
 pre_build() {
 	vsed -e "s,CXX = gcc,CXX = ${CC}," -e "s,LD = gcc, LD = ${CC}," -i Makefile
diff --git a/srcpkgs/youtube-dl/template b/srcpkgs/youtube-dl/template
index 2dc6f2cf94b..d6596b80bd3 100644
--- a/srcpkgs/youtube-dl/template
+++ b/srcpkgs/youtube-dl/template
@@ -1,9 +1,9 @@
 # Template file for 'youtube-dl'
 pkgname=youtube-dl
-version=2019.08.13
+version=2019.10.16
 revision=1
 archs=noarch
-wrksrc="$pkgname"
+wrksrc=youtube-dl
 build_style=python3-module
 pycompile_module="youtube_dl"
 hostmakedepends="python3"
@@ -11,16 +11,16 @@ depends="python3"
 short_desc="CLI program to download videos from YouTube and other sites"
 maintainer="Daniel Eyßer <daniel.eysser@gmail.com>"
 license="Unlicense"
-homepage="https://rg3.github.io/youtube-dl/"
-changelog="https://raw.githubusercontent.com/rg3/youtube-dl/master/ChangeLog"
-distfiles="https://yt-dl.org/downloads/${version}/${pkgname}-${version}.tar.gz"
-checksum=b23d59df96f9dccf34d9c48b65e7bc93532f1ebc4bf71b9285f228bc6086242d
+homepage="https://ytdl-org.github.io/youtube-dl/"
+changelog="https://raw.githubusercontent.com/ytdl-org/youtube-dl/master/ChangeLog"
+distfiles="https://yt-dl.org/downloads/${version}/youtube-dl-${version}.tar.gz"
+checksum=f2acb43ae419ee6c33e94989cada162b4566755dc1d5e0935368952290a92b21
 
 post_install() {
 	rm -rf ${DESTDIR}/usr/etc
-	vinstall ${pkgname}.bash-completion 644 usr/share/bash-completion/completions ${pkgname}
-	vinstall ${pkgname}.zsh 644 usr/share/zsh/site-functions _${pkgname}
-	vinstall ${pkgname}.fish 644 usr/share/fish/completions ${pkgname}.fish
+	vinstall youtube-dl.bash-completion 644 usr/share/bash-completion/completions youtube-dl
+	vinstall youtube-dl.zsh 644 usr/share/zsh/site-functions _youtube-dl
+	vinstall youtube-dl.fish 644 usr/share/fish/completions youtube-dl.fish
 }
 
 python3-youtube-dl_package() {
diff --git a/srcpkgs/youtube-viewer/template b/srcpkgs/youtube-viewer/template
index da4595922ed..454b7fa625b 100644
--- a/srcpkgs/youtube-viewer/template
+++ b/srcpkgs/youtube-viewer/template
@@ -1,6 +1,6 @@
 # Template file for 'youtube-viewer'
 pkgname=youtube-viewer
-version=3.5.6
+version=3.5.8
 revision=1
 archs=noarch
 build_style=perl-ModuleBuild
@@ -14,7 +14,7 @@ license="Artistic-2.0"
 homepage="https://github.com/trizen/youtube-viewer"
 changelog="https://github.com/trizen/youtube-viewer/releases"
 distfiles="https://github.com/trizen/youtube-viewer/archive/${version}.tar.gz"
-checksum=b4d2d17e3ff8aba5f3c358db170867d89ca5e35f3340312c81b9af7c70f3c826
+checksum=afe061263917a84cd297919c1ac79157ed3952f549825552eb6bb821e38fae0c
 
 gtk-youtube-viewer_package() {
 	depends="${sourcepkg}-${version}_${revision} perl-Gtk2 perl-File-ShareDir"
diff --git a/srcpkgs/yq-go/template b/srcpkgs/yq-go/template
index f9d15a53692..32efacef040 100644
--- a/srcpkgs/yq-go/template
+++ b/srcpkgs/yq-go/template
@@ -7,7 +7,7 @@ build_style=go
 go_import_path=github.com/mikefarah/yq
 hostmakedepends="git"
 short_desc="Lightweight and portable command-line YAML processor written in go"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/mikefarah/yq"
 distfiles="https://github.com/mikefarah/yq/archive/${version}.tar.gz"
diff --git a/srcpkgs/yq/template b/srcpkgs/yq/template
index dfc2acac734..7c3af7f43c2 100644
--- a/srcpkgs/yq/template
+++ b/srcpkgs/yq/template
@@ -10,7 +10,7 @@ depends="python3-setuptools"
 depends="jq python3-xmltodict python3-yaml python3-toml"
 checkdepends="jq python3-xmltodict python3-toml"
 short_desc="Command-line YAML processor written in Python that wraps around jq"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/kislyuk/yq"
 distfiles="${PYPI_SITE}/y/yq/yq-${version}.tar.gz"
diff --git a/srcpkgs/yubikey-manager/template b/srcpkgs/yubikey-manager/template
new file mode 100644
index 00000000000..af0330e8e15
--- /dev/null
+++ b/srcpkgs/yubikey-manager/template
@@ -0,0 +1,19 @@
+# Template file for 'yubikey-manager'
+pkgname=yubikey-manager
+version=3.1.0
+revision=1
+archs=noarch
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="libu2f-host python3-fido2 python3-openssl python3-usb python3-scard
+python3-click python3-cryptography python3-six pcsc-ccid"
+short_desc="Library and CLI tools to configure YubiKey"
+maintainer="Doan Tran Cong Danh <congdanhqx@gmail.com>"
+license="BSD-2-Clause"
+homepage="https://developers.yubico.com/yubikey-manager/"
+distfiles="https://developers.yubico.com/${pkgname}/Releases/${pkgname}-${version}.tar.gz"
+checksum=0137acd30cffa60421dde8277b3bb0c5d5e2179d36df0d190de6faf7eec76359
+
+post_install() {
+	vlicense COPYING
+}
diff --git a/srcpkgs/z3/template b/srcpkgs/z3/template
index 3173c97b918..d632a285019 100644
--- a/srcpkgs/z3/template
+++ b/srcpkgs/z3/template
@@ -1,8 +1,8 @@
 # Template file for 'z3'
 pkgname=z3
-version=4.8.5
-revision=3
-wrksrc="${pkgname}-Z3-${version}"
+version=4.8.6
+revision=2
+wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=configure
 configure_args="--prefix=/usr -g --python $(vopt_if ocaml --ml)"
 make_build_args="-C build all examples"
@@ -15,8 +15,8 @@ short_desc="Z3 theorem prover and SMT solver (command line + Python3 module)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/Z3Prover/z3"
-distfiles="https://github.com/Z3Prover/z3/archive/Z3-${version}.tar.gz"
-checksum=4e8e232887ddfa643adb6a30dcd3743cb2fa6591735fbd302b49f7028cdc0363
+distfiles="https://github.com/Z3Prover/z3/archive/z3-${version}.tar.gz"
+checksum=37922fa5085170cad6504498d9758fb63c61d5cb5b68689c11a6c5e84f0311b3
 
 build_options="ocaml"
 desc_option_ocaml="Enable support for OCaml bindings"
diff --git a/srcpkgs/zabbix/template b/srcpkgs/zabbix/template
index 9f6f0094773..02b90b235a2 100644
--- a/srcpkgs/zabbix/template
+++ b/srcpkgs/zabbix/template
@@ -11,7 +11,7 @@ makedepends="gnutls-devel libcurl-devel libevent-devel libmysqlclient-devel
  libxml2-devel net-snmp-devel pcre-devel"
 depends="fping mysql"
 short_desc="IT Infrastructure components availability and performance monitoring"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.zabbix.com"
 changelog="https://www.zabbix.com/rn/rn${version}"
diff --git a/srcpkgs/zaproxy/template b/srcpkgs/zaproxy/template
deleted file mode 100644
index aad6edcd11f..00000000000
--- a/srcpkgs/zaproxy/template
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for 'zaproxy'
-pkgname=zaproxy
-version=2.7.0
-revision=1
-hostmakedepends="openjdk apache-ant"
-depends="virtual?java-runtime"
-short_desc="Web application vulnerability scanner"
-maintainer="Michael Aldridge <maldridge@voidlinux.org>"
-license="Apache-2.0"
-homepage="https://www.owasp.org/index.php/ZAP"
-distfiles="https://github.com/zaproxy/zaproxy/archive/${version}.tar.gz"
-checksum=325bd7cf78775a302287daee01872a8224297c3bb261eedd8d91809c91ca0ccb
-
-do_configure() {
-	# Set version for ant
-	sed -i "s/Dev Build/${version}/" build/version.txt
-}
-
-do_build() {
-	ant -f build/build.xml dist
-}
-
-post_build() {
-	rm build/zap/zap.bat
-	chmod +x build/zap/zap.sh
-}
-
-do_install() {
-	vmkdir usr/share/${pkgname}
-	vcopy "build/zap/*" usr/share/${pkgname}
-	vinstall build/zap/zap.sh 755 usr/share/${pkgname}
-	vmkdir usr/bin
-	ln -rs ${DESTDIR}/usr/share/${pkgname}/zap.sh ${DESTDIR}/usr/bin/zaproxy
-}
diff --git a/srcpkgs/zaproxy/update b/srcpkgs/zaproxy/update
deleted file mode 100644
index 918c4f312d0..00000000000
--- a/srcpkgs/zaproxy/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://raw.githubusercontent.com/zaproxy/zap-admin/master/ZapVersions.xml"
-pattern="<version>\K[\d\.]+(?=</version>)"
diff --git a/srcpkgs/zathura/template b/srcpkgs/zathura/template
index 762d990e295..fbd4f024f4b 100644
--- a/srcpkgs/zathura/template
+++ b/srcpkgs/zathura/template
@@ -1,25 +1,22 @@
 # Template file for 'zathura'
 pkgname=zathura
-version=0.4.3
-revision=2
+version=0.4.4
+revision=1
 build_style=meson
 configure_args="-Dsynctex=disabled -Dtests=disabled"
 hostmakedepends="pkg-config intltool python3-Sphinx desktop-file-utils
  appstream-glib glib-devel librsvg-utils"
 makedepends="girara-devel sqlite-devel file-devel zlib-devel libseccomp-devel
  libglib-devel"
-short_desc="A highly customizable and functional document viewer"
+short_desc="Highly customizable and functional document viewer"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
 homepage="https://pwmt.org/projects/zathura/installation/"
 changelog="https://pwmt.org/projects/zathura/changelog/${version}"
-distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz"
-checksum=7e12194426d709670e0f4b0b107c80dd21322881b57d4a0bf9a09998402ffd41
+distfiles="https://git.pwmt.org/pwmt/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
+checksum=ebc98478fd8ec412b8f87c6b75067cf52d89d200731c1848ec3a2700f2a3b36c
 
 post_install() {
-	vmkdir usr/share/zsh/site-functions
-	mv ${DESTDIR}/usr/share/zsh/{vendor-completions,site-functions}/_zathura
-
 	vlicense LICENSE
 }
 
diff --git a/srcpkgs/zchunk/template b/srcpkgs/zchunk/template
index c0a02770aca..5230573fd58 100644
--- a/srcpkgs/zchunk/template
+++ b/srcpkgs/zchunk/template
@@ -1,16 +1,16 @@
 # Template file for 'zchunk'
 pkgname=zchunk
-version=1.1.2
-revision=2
+version=1.1.3
+revision=1
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="libcurl-devel libzstd-devel"
 short_desc="Easy-to-delta, compressed file format"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/zchunk/zchunk"
 distfiles="https://github.com/zchunk/zchunk/archive/${version}.tar.gz"
-checksum=dcd7389ab9f947a53c83e32e842ba6ef69f931836bba585617a2bb7ec3cf900f
+checksum=4972d488f2e035b7b6ebe2484ac5123a49ce616c2a4bcca8112841c5ed94b8b7
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) makedepends+=" argp-standalone"
diff --git a/srcpkgs/zfs/template b/srcpkgs/zfs/template
index 8947eeff7d8..ce124ff12bb 100644
--- a/srcpkgs/zfs/template
+++ b/srcpkgs/zfs/template
@@ -1,6 +1,6 @@
 # Template file for 'zfs'
 pkgname=zfs
-version=0.8.1
+version=0.8.2
 revision=1
 build_style=gnu-configure
 configure_args="--with-config=user --with-mounthelperdir=/usr/bin
@@ -14,7 +14,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="CDDL-1.0"
 homepage="https://zfsonlinux.org/"
 distfiles="https://github.com/zfsonlinux/zfs/releases/download/zfs-${version}/zfs-${version}.tar.gz"
-checksum=0af79fde44b7b8ecb94d5166ce2e4fff7409c20ed874c2d759db92909e6c2799
+checksum=47608e257c8ecebb918014ef1da6172c3a45d990885891af18e80f5cc28beab8
 
 replaces="spl<=0.7.13_1" # Because SPL was merged into zfs in 0.8.0
 
diff --git a/srcpkgs/zim-tools/template b/srcpkgs/zim-tools/template
index a73fc304ef9..66d1150ba0b 100644
--- a/srcpkgs/zim-tools/template
+++ b/srcpkgs/zim-tools/template
@@ -1,13 +1,13 @@
 # Template file for 'zim-tools'
 pkgname=zim-tools
-version=1.0.4
+version=1.0.5
 revision=1
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="libzim-devel xapian-core-devel icu-devel"
 short_desc="Various ZIM command line tools"
-maintainer="John Zimmermann <johnz@posteo.net>"
+maintainer="John <johnz@posteo.net>"
 license="GPL-3.0-or-later"
 homepage="http://www.openzim.org"
 distfiles="https://github.com/openzim/zim-tools/archive/${version}.tar.gz"
-checksum=9ef17a6cdbf7f3d7f6564c757a09e0b7b2c0f722d12a05afec43de80b2635b5e
+checksum=e2f2eac965d895f7cb619fd7e95ff48b1cb0599d329d96ba2a8835c85da160b9
diff --git a/srcpkgs/zimwriterfs/template b/srcpkgs/zimwriterfs/template
index 9616b0e47a7..e8b9c7899e0 100644
--- a/srcpkgs/zimwriterfs/template
+++ b/srcpkgs/zimwriterfs/template
@@ -1,6 +1,6 @@
 # Template file for 'zimwriterfs'
 pkgname=zimwriterfs
-version=1.3.3
+version=1.3.7
 revision=1
 build_style=meson
 hostmakedepends="pkg-config"
@@ -11,4 +11,4 @@ maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/openzim/zimwriterfs"
 distfiles="https://github.com/openzim/zimwriterfs/archive/${version}.tar.gz"
-checksum=3080085bc7bda6587330ffafb2aaa5ef611fae9105997d065e4e011b62d52a73
+checksum=d55e13194e29100bf88bb201c5661ab7d2600a9e45c6caeb2a21647cdbf6cb4e
diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template
index 5c6844a9ec4..8af8f23a145 100644
--- a/srcpkgs/znc/template
+++ b/srcpkgs/znc/template
@@ -1,7 +1,7 @@
 # Template file for 'znc'
 pkgname=znc
-version=1.7.4
-revision=2
+version=1.7.5
+revision=1
 build_style=gnu-configure
 configure_args="
  --enable-python
@@ -15,10 +15,10 @@ makedepends="libressl-devel python3-devel tcl-devel libsasl-devel
 short_desc="An advanced IRC Bouncer"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="Apache-2.0"
-#changelog="https://github.com/znc/znc/raw/master/ChangeLog.md"
+changelog="https://github.com/znc/znc/raw/master/ChangeLog.md"
 homepage="https://znc.in/"
 distfiles="https://znc.in/releases/${pkgname}-${version}.tar.gz"
-checksum=b1a32921a8e6d79ee6c5900c8d07293026966db7c05aaac48984231befc49b71
+checksum=a8941e1385c8654287a4428018d93459482e9d5eeedf86bef7b020ddc5f24721
 
 system_accounts="znc"
 znc_homedir="/var/lib/znc"
diff --git a/srcpkgs/zola/template b/srcpkgs/zola/template
index 49ccaeabe15..d6f035d3ed9 100644
--- a/srcpkgs/zola/template
+++ b/srcpkgs/zola/template
@@ -1,22 +1,27 @@
 # Template file for 'zola'
 pkgname=zola
-version=0.8.0
+version=0.9.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libsass-devel"
+makedepends="libressl-devel libsass-devel oniguruma-devel"
 short_desc="Fast opinionated static site generator written in rust"
 maintainer="Carson Page <pagem.carson@gmail.com>"
 license="MIT"
 homepage="https://github.com/getzola/zola"
 changelog="https://github.com/getzola/zola/raw/master/CHANGELOG.md"
 distfiles="https://github.com/getzola/zola/archive/v${version}.tar.gz"
-checksum=c16909fc20ad3e2f922beb270b2350928669149ba2e958de72558f96620a9624
+checksum=8d226ec764f2bc06de8e49e2e22ccf37811bc478bbcaa83c2c841b222ef4fc4e
 
 case $XBPS_TARGET_MACHINE in
-	armv6l-musl) broken="triggers segfailt in rustc" ;;
+	armv6l-musl) broken="triggers segfault in rustc" ;;
 esac
 
+pre_build() {
+	export PKG_CONFIG_ALL_DYNAMIC=1
+	export RUSTONIG_SYSTEM_LIBONIG=1
+}
+
 post_install() {
 	vlicense LICENSE
 
diff --git a/srcpkgs/zoom/template b/srcpkgs/zoom/template
index 246de5c0ec9..2cf25bd27a2 100644
--- a/srcpkgs/zoom/template
+++ b/srcpkgs/zoom/template
@@ -1,20 +1,21 @@
 # Template file for 'zoom'
 pkgname=zoom
-version=2.9.265650.0716
+version=3.0.303290.1010
 revision=1
 archs="x86_64"
 wrksrc=zoom
 create_wrksrc=yes
 short_desc="Video Conferencing and Web Conferencing Service"
 maintainer="Daniel Santana <daniel@santana.tech>"
-license="Proprietary"
+license="custom:Proprietary"
 homepage="https://zoom.us/"
 distfiles="https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz"
-checksum=f9014967875c6e5f90968c11ed08846a24001f48191f6f860e5c95bbf58512e2
+checksum=4f5aea98a0a819ac9e0891080ddfa5f63344fa762c28309513010c64946b12da
 repository=nonfree
 restricted=yes
 nopie=yes
 
+
 do_install() {
 	vcopy opt .
 	vcopy usr .
diff --git a/srcpkgs/zou/template b/srcpkgs/zou/template
index ce39e39ec31..1badb2d8bcf 100644
--- a/srcpkgs/zou/template
+++ b/srcpkgs/zou/template
@@ -6,7 +6,7 @@ build_style=cargo
 hostmakedepends="pkg-config"
 makedepends="libressl-devel"
 short_desc="Simple and fast download accelerator, written in Rust"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/k0pernicus/zou"
 distfiles="https://github.com/k0pernicus/zou/archive/v${version}.tar.gz"
diff --git a/srcpkgs/zsh-completions/template b/srcpkgs/zsh-completions/template
index e7f30d81bed..24123f79690 100644
--- a/srcpkgs/zsh-completions/template
+++ b/srcpkgs/zsh-completions/template
@@ -1,6 +1,6 @@
 # Template file for 'zsh-completions'
 pkgname=zsh-completions
-version=0.30.0
+version=0.31.0
 revision=1
 archs=noarch
 depends="zsh"
@@ -9,7 +9,7 @@ maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="BSD-3-Clause, Apache-2.0, MIT"
 homepage="https://github.com/zsh-users/zsh-completions"
 distfiles="${homepage}/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=981c386fa01f9bcb0c8a66b0db16af794ab10169d12e2242f83715967b737621
+checksum=6c1cccf6fd8c7d875145e357e3a46680b74013b6fc7b98724801126c072fc024
 
 do_install() {
 	vmkdir usr/share/zsh/site-functions/
diff --git a/srcpkgs/zstd/template b/srcpkgs/zstd/template
index 9635ec76322..73af2d9b763 100644
--- a/srcpkgs/zstd/template
+++ b/srcpkgs/zstd/template
@@ -1,16 +1,16 @@
 # Template file for 'zstd'
 pkgname=zstd
-version=1.4.2
+version=1.4.3
 revision=1
 bootstrap=yes
 makedepends="zlib-devel liblzma-devel liblz4-devel"
 checkdepends="gtest-devel"
 short_desc="Fast real-time compression algorithm - CLI tool"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause, GPL-2.0-or-later"
 homepage="http://www.zstd.net"
 distfiles="https://github.com/facebook/zstd/archive/v${version}.tar.gz"
-checksum=7a6e1dad34054b35e2e847eb3289be8820a5d378228802239852f913c6dcf6a7
+checksum=5eda3502ecc285c3c92ee0cc8cd002234dee39d539b3f692997a0e80de1d33de
 
 do_build() {
 	make ${makejobs}
@@ -21,7 +21,6 @@ do_check() {
 	# using the test target is too expensive
 	make ${makejobs} shortest
 	make ${makejobs} -C contrib/pzstd tests check
-
 }
 
 do_install() {
diff --git a/srcpkgs/zulucrypt/template b/srcpkgs/zulucrypt/template
index 5143ab6c913..05f92cf4bc6 100644
--- a/srcpkgs/zulucrypt/template
+++ b/srcpkgs/zulucrypt/template
@@ -1,7 +1,7 @@
 # Template file for 'zulucrypt'
 pkgname=zulucrypt
-version=5.5.0
-revision=2
+version=5.7.0
+revision=1
 wrksrc="zuluCrypt-${version}"
 build_style=cmake
 configure_args="-DINTERNAL_ZULUPLAY=false -DQT5=true
@@ -18,8 +18,9 @@ short_desc="Frontend to cryptsetup and Veracrypt for harddrive and file encrypti
 maintainer="Piraty <piraty1@inbox.ru>"
 license="GPL-2.0-or-later"
 homepage="https://mhogomchungu.github.io/zuluCrypt"
+changelog="https://github.com/mhogomchungu/zuluCrypt/blob/master/changelog"
 distfiles="https://github.com/mhogomchungu/zuluCrypt/archive/${version}.tar.gz"
-checksum=5f061202c3ac1264a8fba10cccc7e3f7a623f108ff618e02ebcb54870f3d2822
+checksum=53c1a450a7c5c18f7b6a8cf46bd4f051174f9d98c77f79a20c733e96b463f2d5
 
 #https://github.com/mhogomchungu/zuluCrypt/blob/e138cc4459545b2e0f729814791a045c31b63014/BUILD_INSTRUCTIONS
 build_options="udev kde gnome pwquality polkit homemount"

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PR PATCH] [Updated] libnotify: update to 0.7.8
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-13708@inbox.vuxu.org>
                   ` (2 preceding siblings ...)
  2019-10-19 10:22 ` voidlinux-github
@ 2019-10-19 10:22 ` voidlinux-github
  3 siblings, 0 replies; 4+ messages in thread
From: voidlinux-github @ 2019-10-19 10:22 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 518 bytes --]

There is an updated pull request by biopsin against master on the void-packages repository

https://github.com/biopsin/void-packages patch-1
https://github.com/void-linux/void-packages/pull/13708

libnotify: update to 0.7.8
switch to meson, added build options for docs..

noticed this warning while build:
/usr/include/features.h:382:4: warning: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Wcpp]


A patch file from https://github.com/void-linux/void-packages/pull/13708.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-patch-1-13708.patch --]
[-- Type: text/x-diff, Size: 10553357 bytes --]

From 66cbe34a1cd4c226829d228283436b70b6f0a3ac Mon Sep 17 00:00:00 2001
From: biopsin <biopsin@yahoo.no>
Date: Fri, 16 Aug 2019 09:12:49 +0200
Subject: [PATCH 1/5] libnotify: update to 0.7.8

switch to meson, added build options for docs..

noticed this warning while build:
/usr/include/features.h:382:4: warning: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Wcpp]
---
 srcpkgs/libnotify/template | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/libnotify/template b/srcpkgs/libnotify/template
index ca699bda40a..bda47d17c18 100644
--- a/srcpkgs/libnotify/template
+++ b/srcpkgs/libnotify/template
@@ -1,21 +1,24 @@
 # Template file for 'libnotify'
 pkgname=libnotify
-version=0.7.7
-revision=3
-build_style=gnu-configure
+version=0.7.8
+revision=1
+build_style=meson
 build_helper="gir"
-configure_args="--disable-static $(vopt_enable gir introspection)"
+configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
+ -Dgtk_doc=$(vopt_if gtk_doc true false)
+ -Ddocbook_docs=$(vopt_if docbook enabled disabled)"
 hostmakedepends="pkg-config glib-devel"
-makedepends="libglib-devel libpng-devel gdk-pixbuf-devel gtk+3-devel"
+makedepends="libglib-devel libpng-devel gdk-pixbuf-devel gtk+3-devel
+ $(vopt_if gtk_doc gtk-doc) $(vopt_if docbook 'xmlto docbook-xsl')"
 short_desc="Desktop notification library"
 maintainer="Juan RP <xtraeme@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="http://library.gnome.org/devel/notification-spec/"
 distfiles="${GNOME_SITE}/${pkgname}/0.7/${pkgname}-${version}.tar.xz"
-checksum=9cb4ce315b2655860c524d46b56010874214ec27e854086c1a1d0260137efc04
+checksum=69209e0b663776a00c7b6c0e560302a8dbf66b2551d55616304f240bba66e18c
 
 # Package build options
-build_options="gir"
+build_options="gir gtk_doc docbook"
 build_options_default="gir"
 
 libnotify-devel_package() {

From bf76a08bd3c448da1e67e1a54640d31bcdc65fd8 Mon Sep 17 00:00:00 2001
From: biopsin <biopsin@yahoo.no>
Date: Mon, 19 Aug 2019 08:55:11 +0200
Subject: [PATCH 2/5] Update template

---
 srcpkgs/libnotify/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libnotify/template b/srcpkgs/libnotify/template
index bda47d17c18..2243a2eef72 100644
--- a/srcpkgs/libnotify/template
+++ b/srcpkgs/libnotify/template
@@ -11,7 +11,7 @@ hostmakedepends="pkg-config glib-devel"
 makedepends="libglib-devel libpng-devel gdk-pixbuf-devel gtk+3-devel
  $(vopt_if gtk_doc gtk-doc) $(vopt_if docbook 'xmlto docbook-xsl')"
 short_desc="Desktop notification library"
-maintainer="Juan RP <xtraeme@voidlinux.org>"
+maintainer="biopsin <biopsin@yahoo.no>"
 license="LGPL-2.1-or-later"
 homepage="http://library.gnome.org/devel/notification-spec/"
 distfiles="${GNOME_SITE}/${pkgname}/0.7/${pkgname}-${version}.tar.xz"

From 05ca14c65ca07f012b37597aa4ff7e5592b11e94 Mon Sep 17 00:00:00 2001
From: biopsin <biopsin@yahoo.no>
Date: Wed, 21 Aug 2019 09:28:17 +0200
Subject: [PATCH 3/5] Update template

---
 srcpkgs/libnotify/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libnotify/template b/srcpkgs/libnotify/template
index 2243a2eef72..5390f45af82 100644
--- a/srcpkgs/libnotify/template
+++ b/srcpkgs/libnotify/template
@@ -4,7 +4,7 @@ version=0.7.8
 revision=1
 build_style=meson
 build_helper="gir"
-configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
+configure_args="-Dc_args=-O2 -Dintrospection=$(vopt_if gir enabled disabled)
  -Dgtk_doc=$(vopt_if gtk_doc true false)
  -Ddocbook_docs=$(vopt_if docbook enabled disabled)"
 hostmakedepends="pkg-config glib-devel"

From 9d660c090b19caedf4c5bbf39dbbed940bd66619 Mon Sep 17 00:00:00 2001
From: biopsin <biopsin@yahoo.no>
Date: Tue, 3 Sep 2019 11:36:05 +0200
Subject: [PATCH 4/5] libnotify: update to 0.7.8

trying to resolve my stupidity
---
 srcpkgs/libnotify/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libnotify/template b/srcpkgs/libnotify/template
index 5390f45af82..99ba36df8a0 100644
--- a/srcpkgs/libnotify/template
+++ b/srcpkgs/libnotify/template
@@ -5,8 +5,7 @@ revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Dc_args=-O2 -Dintrospection=$(vopt_if gir enabled disabled)
- -Dgtk_doc=$(vopt_if gtk_doc true false)
- -Ddocbook_docs=$(vopt_if docbook enabled disabled)"
+ -Dgtk_doc=false -Ddocbook_docs=$(vopt_if docbook enabled disabled)"
 hostmakedepends="pkg-config glib-devel"
 makedepends="libglib-devel libpng-devel gdk-pixbuf-devel gtk+3-devel
  $(vopt_if gtk_doc gtk-doc) $(vopt_if docbook 'xmlto docbook-xsl')"
@@ -18,7 +17,7 @@ distfiles="${GNOME_SITE}/${pkgname}/0.7/${pkgname}-${version}.tar.xz"
 checksum=69209e0b663776a00c7b6c0e560302a8dbf66b2551d55616304f240bba66e18c
 
 # Package build options
-build_options="gir gtk_doc docbook"
+build_options="gir docbook"
 build_options_default="gir"
 
 libnotify-devel_package() {

From dff300c93a3c5469382cd1e3e70ad34d5f940ab5 Mon Sep 17 00:00:00 2001
From: biopsin <biopsin@yahoo.no>
Date: Sat, 19 Oct 2019 12:22:14 +0200
Subject: [PATCH 5/5] test (#11)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* python3-pulsectl: update to 19.9.5.

* python3-precis-i18n: update to 1.0.1.

* python3-rsistent: update to 0.15.4.

* python3-saml2: update to 4.8.0.

* python3-tabulate: update to 0.8.4.

* perl-Proc-Govern: update to 0.208.

* python3-PyFxA: update to 0.7.3.

* python3-SoCo: update to 0.18.

* python3-pem: update to 19.2.0.

* python3-mypy: update to 0.730.

* python3-mypy_extensions: update to 0.4.2.

* python3-josepy: update to 1.2.0.

* python3-dbusmock: update to 0.18.3.

* python3-chromecast: update to 4.0.1.

* python3-acme: update to 0.39.0.

* python3-fido2: update to 0.7.1.

* yubikey-manager: update to 3.1.0.

* libGL: update to 19.2.1

* jack: update to 1.9.13, adopt package

* wxPython4: actually build core library

* bluedevil: update to 5.17.0

[ci skip]

* breeze-gtk: update to 5.17.0

[ci skip]

* breeze: update to 5.17.0

[ci skip]

* kactivitymanagerd: update to 5.17.0

[ci skip]

* kde-cli-tools: update to 5.17.0

[ci skip]

* kde-gtk-config5: update to 5.17.0

[ci skip]

* kdecoration: update to 5.17.0

[ci skip]

* kdeplasma-addons5: update to 5.17.0

[ci skip]

* kgamma5: update to 5.17.0

[ci skip]

* khotkeys: update to 5.17.0

[ci skip]

* kinfocenter: update to 5.17.0

[ci skip]

* kmenuedit: update to 5.17.0

[ci skip]

* kscreen: update to 5.17.0

[ci skip]

* kscreenlocker: update to 5.17.0

[ci skip]

* ksshaskpass: update to 5.17.0

[ci skip]

* ksysguard: update to 5.17.0

[ci skip]

* kwallet-pam: update to 5.17.0

[ci skip]

* kwayland-integration: update to 5.17.0

[ci skip]

* kwin: update to 5.17.0

[ci skip]

* kwrited: update to 5.17.0

[ci skip]

* libkscreen: update to 5.17.0

[ci skip]

* libksysguard: update to 5.17.0

[ci skip]

* milou: update to 5.17.0

[ci skip]

* oxygen: update to 5.17.0

[ci skip]

* plasma-browser-integration: update to 5.17.0

[ci skip]

* plasma-desktop: update to 5.17.0

[ci skip]

* plasma-integration: update to 5.17.0

[ci skip]

* plasma-nm: update to 5.17.0

[ci skip]

* plasma-pa: update to 5.17.0

[ci skip]

* plasma-sdk: update to 5.17.0

[ci skip]

* plasma-vault: update to 5.17.0

[ci skip]

* plasma-workspace-wallpapers: update to 5.17.0

[ci skip]

* plasma-workspace: update to 5.17.0

[ci skip]

* polkit-kde-agent: update to 5.17.0

[ci skip]

* powerdevil: update to 5.17.0

[ci skip]

* sddm-kcm: update to 5.17.0

[ci skip]

* systemsettings: update to 5.17.0

[ci skip]

* user-manager: update to 5.17.0

[ci skip]

* xdg-desktop-portal-kde: update to 5.17.0

[ci skip]

* kde5: update to 5.17

* New package: plasma-thunderbolt-5.17.0

* Revert "libsass: update to 3.6.2."

This reverts commit e3b836224babe33f5c0748cabfc82cf82adba400.

this update broke sassc, at least for breeze-gtk

[ci skip]

* libdazzle: update to 3.34.1

Signed-off-by: Jürgen Buchmüller <pullmoll@t-online.de>

* libgweather: update to 3.34.0

Signed-off-by: Jürgen Buchmüller <pullmoll@t-online.de>

* evolution-data-server: revbump for libgweather-3.34.0

Signed-off-by: Jürgen Buchmüller <pullmoll@t-online.de>

* evolution: revbump for libgweather-3.34.0

Signed-off-by: Jürgen Buchmüller <pullmoll@t-online.de>

* gnome-calendar: update to 3.34.1

Signed-off-by: Jürgen Buchmüller <pullmoll@t-online.de>

* gnome-clocks: update to 3.34.0

Signed-off-by: Jürgen Buchmüller <pullmoll@t-online.de>

* gnome-initial-setup: update to 3.34.1

Signed-off-by: Jürgen Buchmüller <pullmoll@t-online.de>

* gnome-panel: update to 3.34.1

Signed-off-by: Jürgen Buchmüller <pullmoll@t-online.de>

* gnome-settings-daemon: update to 3.34.1

Signed-off-by: Jürgen Buchmüller <pullmoll@t-online.de>

* bijiben: update to 3.34.1

Signed-off-by: Jürgen Buchmüller <pullmoll@t-online.de>

* kubecfg: update to 0.13.1.

* gjs: update to 1.58.1

Signed-off-by: Jürgen Buchmüller <pullmoll@t-online.de>

* meson: backport a regression fix to unbreak various builds

Without this wlroots fails to build and possibly others too.

[ci skip]

* youtube-dl: update to 2019.10.16.

* mutter: update to 3.34.1. [skip ci]

requires void-linux/void-packages/pull/15506

closes #15530

* gnome-shell: update to 3.34.1. [skip ci]

gnome-shell requires void-linux/void-packages/pull/15446 before merge.

closes #15531

* sysprof: update to 3.34.1.

closes #15506

* gnome-builder: update to 3.34.1.

* gnome-todo: rebuild

* Revert "meson: update to 0.52.0."

This reverts commit 6b8bf86f64e2154765424f394283193093fe5a64.

0.52.0 did break gnome-builder https://gitlab.gnome.org/GNOME/gnome-builder/issues/1057

* gnome-todo: actually add patch

* flatbuffers: update to 1.11.0

* linux4.14: update to 4.14.149.

* s: install fish completion

* nvme-cli: fix build and handling of generated files

* pithos: update to 1.5.0.

* mpd: update to 0.21.16.

* totem: update to 3.34.1.

* gnome-session: update to 3.34.1.

* gnome-screensaver: rebuild against libgnome-desktop-3.so.18

* gnome-settings-daemon: rebuild against libgnome-desktop-3.so.18

* gnome-panel: rebuild against libgnome-desktop-3.so.18

* gnome-initial-setup: rebuild against libgnome-desktop-3.so.18

* gnome-font-viewer: update to 3.34.0.

* gnome-flashback: update to 3.34.1.

* gnome-control-center: update to 3.34.1.

* gnome-documents: rebuild against libgnome-desktop-3.so.18

* gnome-contacts: rebuild against libgnome-desktop-3.so.18

* gnome-clocks: rebuild against libgnome-desktop-3.so.18

* gnome-books: update to 3.34.0.

* evince: update to 3.34.1.

* eog: update to 3.34.1.

* cheese: update to 3.34.0.

* gnome-desktop: update to 3.34.1.

* adwaita-icon-theme: update to 3.34.0.

* file-roller: update to 3.32.2.

* gnome-backgrounds: update to 3.34.0.

* gnome-bluetooth: update to 3.34.0.

* gnome-user-docs: update to 3.34.0.

* gnome-shell-extensions: update to 3.34.1.

* gnome-online-miners: update to 3.34.0.

* yelp: update to 3.34.0.

* gnome-online-accounts: update to 3.34.1.

* mutter: rebuild against libgnome-desktop-3.so.18

* evolution: rebuild against libgnome-desktop-3.so.18

* nautilus: update to 3.34.1.

* sassc: increase rev to make sure that libcsass is build first

* gnome-tweaks: update to 3.34.0.

* yelp-xsl: update to 3.34.0.

* libreoffice: require libatomic on ppc32

It fails to link otherwise.

[ci skip]

* sparse: update to 0.6.1.

* exiftool: update to 11.70.

* aspell: update to 0.60.8.

* bogofilter: update to 1.2.5.

* mariadb: simplify handling of atomics/libatomic, fix ppc32 build

Platforms such as ppc32 and mips do not have the __sync builtins
in gcc, which breaks compilation. However, that code is not even
necessary, as proper implementations of the higher level atomic
primitives are available as builtins in any modern toolchain
(and definitely ours) and mariadb in fact already uses those
when available.

So basically ditch all this effectively dead code to fix build
on those platforms. While at it, remove the wrong checks in
cmake and fix properly linking against libatomic only when
needed (this also affects ARMv5/6) and simplify the template.

These changes have already been done upstream, but we're
sticking with an older version for now because of libmysqlclient
ABI compat, so fix this downstream until we can upgrade.

Also add another patch for ppc/ppc64+musl to use a gcc builtin
instead of a glibc extension.

[ci skip]

* firebird3: fix build on ppc*-musl

[ci skip]

* mariadb: mark as broken for armv6l-musl

* wf-shell: fix cross

* build_style/meson.sh: add support for using qemu as exe_wrapper

* gnome-todo: fix cross

* cheese: fix cross

* io.elementary.calendar: temporarily use git tag for compat with libecal-1.2

* mariadb: unbreak

* gnome-tweaks: add missing dependency

* kcontacts: update to 5.63.0.

* akonadi-calendar: rebuild for new kcontacts version number from KDE frameworks

* akonadi-contacts: rebuild for new kcontacts version number from KDE frameworks

* akonadi-import-wizard: rebuild for new kcontacts version number from KDE frameworks

* akonadi-search: rebuild for new kcontacts version number from KDE frameworks

* calligra-plan: rebuild for new kcontacts version number from KDE frameworks

* digikam: rebuild for new kcontacts version number from KDE frameworks

* eventviews: rebuild for new kcontacts version number from KDE frameworks

* incidenceeditor: rebuild for new kcontacts version number from KDE frameworks

* kaddressbook: rebuild for new kcontacts version number from KDE frameworks

* kalarm: rebuild for new kcontacts version number from KDE frameworks

* kdepim-apps-libs: rebuild for new kcontacts version number from KDE frameworks

* kdepim-runtime: rebuild for new kcontacts version number from KDE frameworks

* kgpg: rebuild for new kcontacts version number from KDE frameworks

* kmail: rebuild for new kcontacts version number from KDE frameworks

* kmymoney: rebuild for new kcontacts version number from KDE frameworks

* knotes: rebuild for new kcontacts version number from KDE frameworks

* korganizer: rebuild for new kcontacts version number from KDE frameworks

* ktnef: rebuild for new kcontacts version number from KDE frameworks

* libkdepim: rebuild for new kcontacts version number from KDE frameworks

* libkgapi: rebuild for new kcontacts version number from KDE frameworks

* mailcommon: rebuild for new kcontacts version number from KDE frameworks

* messagelib: rebuild for new kcontacts version number from KDE frameworks

* pim-data-exporter: rebuild for new kcontacts version number from KDE frameworks

* pimcommon: rebuild for new kcontacts version number from KDE frameworks

[skip ci]

* qpdf: update to 9.0.2.

* cups-filters: revbump for new qpdf release

* perl-Term-Table: update to 0.014.

* ruby-multi_json: update to 1.14.1.

* rpm: update to 4.15.0.

* occt: update to 7.4.0.

ship an env file in /etc/profile.d to make sure the Draw command works
(stolen from arch linux)

* freecad: rebuild for occt-7.4.0

along, fix build with gcc9

Closes #15102

* portage: update to 2.3.77

* jmol: update to 14.29.54.

* papirus-icon-theme: update to 20191009.

* kvantum: update to 0.12.1.

* google-cloud-sdk: update to 267.0.0.

* cmus: add elogind option to interface with MPRIS

Note: I couldn't adopt this package

* azote: update to 1.5.1

* libGL: add wayland build_option

* kgpg: update to 19.08.2.

* kdegraphics-mobipocket: update to 19.08.2.

* kdialog: update to 19.08.2.

* python3-pafy: drop broken py2 version

* go-jira: update to 1.0.21.

* onionshare: update to 2.2.

* New package: python3-Flask-HTTPAuth-3.3.0

* kio-extras: update to 19.08.2.

* print-manager: update to 19.08.2.

* dragon-player: update to 19.08.2.

* kcharselect: update to 19.08.2.

* ffmpegthumbs: update to 19.08.2.

* kcalc: update to 19.08.2.

* libksane: update to 19.08.2.

* kcolorchooser: update to 19.08.2.

* konquest: update to 19.08.2.

* kdenlive: update to 19.08.2.

* libkdegames: update to 19.08.2.

* juk: update to 19.08.2.

* ktouch: update to 19.08.2.

* k3b: update to 19.08.2.

* binwalk: update to 2.2.0.

* xl2tpd: update to 1.3.15.

* linux5.3: update to 5.3.7.

[skip ci]

* linux4.19: update to 4.19.80.

* open-vm-tools: update to 11.0.0.

adopt package

Closes #14922

* xfce4-panel: split lib

* xfce4-taskmanager: remove obsolete build dependency (xfce4-panel)

* Thunar: rebuild for libxfce4panel

* orage: rebuild for libxfce4panel

* xfce4-battery-plugin: rebuild for libxfce4panel

* xfce4-clipman-plugin: rebuild for libxfce4panel

* xfce4-cpufreq-plugin: rebuild for libxfce4panel

* xfce4-cpugraph-plugin: rebuild for libxfce4panel

* xfce4-dict: rebuild for libxfce4panel

* xfce4-diskperf-plugin: rebuild for libxfce4panel

* xfce4-fsguard-plugin: rebuild for libxfce4panel

* xfce4-genmon-plugin: rebuild for libxfce4panel

* xfce4-hardware-monitor-plugin: rebuild for libxfce4panel

* xfce4-kbdleds-plugin: rebuild for libxfce4panel

* xfce4-mailwatch-plugin: rebuild for libxfce4panel

* xfce4-mpc-plugin: rebuild for libxfce4panel

* xfce4-netload-plugin: rebuild for libxfce4panel

* xfce4-notes-plugin: rebuild for libxfce4panel

* xfce4-notifyd: rebuild for libxfce4panel

* xfce4-places-plugin: rebuild for libxfce4panel

* xfce4-power-manager: rebuild for libxfce4panel

* xfce4-pulseaudio-plugin: rebuild for libxfce4panel

* xfce4-screenshooter: rebuild for libxfce4panel

* xfce4-sensors-plugin: rebuild for libxfce4panel

* xfce4-systemload-plugin: rebuild for libxfce4panel

* xfce4-time-out-plugin: rebuild for libxfce4panel

* xfce4-timer-plugin: rebuild for libxfce4panel

* xfce4-verve-plugin: rebuild for libxfce4panel

* xfce4-wavelan-plugin: rebuild for libxfce4panel

* xfce4-weather-plugin: rebuild for libxfce4panel

* xfce4-whiskermenu-plugin: rebuild for libxfce4panel

* xfce4-windowck-plugin: rebuild for libxfce4panel

* xfce4-xkb-plugin: rebuild for libxfce4panel

Closes #13979

Fixes #15288

[ci skip]

* sudo: update to 1.8.28p1.

* gitlab-runner: update to 12.3.0

* tor: update sandbox patch for ppc32

[ci skip]

* delta: update to 0.0.13.

* exiftool: update to 11.71.

* python3-yara: update to 3.11.0.

* spotify-tui: update to 0.6.2.

* tau: update to 0.9.3

* New package: sqlmap-1.3.9

* python3-perf: update to 1.6.1.

* botan: update to 2.12.1

Signed-off-by: Jürgen Buchmüller <pullmoll@t-online.de>

* sqlite: update to 3.30.1.

* yaru: update to 19.10.4.

* Revert "libnotify"
---
 .travis.yml                                   |     1 +
 common/build-style/cargo.sh                   |     2 +-
 common/build-style/meson.sh                   |     7 +
 common/shlibs                                 |   225 +-
 common/xbps-src/shutils/build_dependencies.sh |     2 +-
 common/xbps-src/shutils/common.sh             |     2 +-
 common/xbps-src/shutils/cross.sh              |     2 +-
 srcpkgs/2bwm/template                         |     4 +-
 srcpkgs/3proxy/template                       |     8 +-
 srcpkgs/66-tools/template                     |    33 +
 srcpkgs/66/template                           |     6 +-
 srcpkgs/Amass/template                        |    12 +
 srcpkgs/AppStream/template                    |     2 +-
 srcpkgs/Bear/template                         |     8 +-
 srcpkgs/CImg/template                         |     5 +-
 srcpkgs/CLion/template                        |    12 +-
 srcpkgs/Clight/template                       |     2 +-
 srcpkgs/Clightd/template                      |     2 +-
 srcpkgs/ClusterSSH/template                   |     9 +-
 srcpkgs/ClusterSSH/update                     |     1 -
 srcpkgs/CopyQ/template                        |     4 +-
 srcpkgs/Electron-Cash/template                |    25 +
 srcpkgs/EternalTerminal/template              |     6 +-
 srcpkgs/FeatherPad/template                   |     6 +-
 srcpkgs/FeedReader/template                   |     4 +-
 srcpkgs/GoLand/template                       |    12 +-
 srcpkgs/GraphicsMagick/template               |     4 +-
 srcpkgs/ImageMagick/template                  |     6 +-
 srcpkgs/ImageMagick6/template                 |     4 +-
 .../patches/ppc/musl-ppc-secureplt.patch      |    93 +
 .../patches/ppc64}/add-ppc64-support.patch    |     0
 .../patches/ppc64}/fix-vm-jit-ppc64.patch     |     0
 srcpkgs/LuaJIT/template                       |    17 +
 srcpkgs/MEGAcmd/patches/include.am.patch      |    16 +-
 srcpkgs/MEGAcmd/patches/megacmd-sdk36.diff    |   381 +
 srcpkgs/MEGAcmd/patches/musl.patch            |    13 -
 srcpkgs/MEGAcmd/template                      |     9 +-
 srcpkgs/MEGAsdk/template                      |     6 +-
 srcpkgs/MEGAsync/patches/breakpad.patch       |    16 +
 srcpkgs/MEGAsync/template                     |    12 +-
 srcpkgs/Minder/template                       |     4 +-
 srcpkgs/ModemManager/template                 |     4 +-
 srcpkgs/MultiMC/template                      |    16 +-
 srcpkgs/NetAuth/template                      |     4 +-
 srcpkgs/NetKeys/template                      |     4 +-
 srcpkgs/NetworkManager/template               |     7 +-
 srcpkgs/OTPClient/template                    |     6 +-
 srcpkgs/PackageKit/template                   |     2 +-
 srcpkgs/PopCorn/template                      |    14 +-
 srcpkgs/QMPlay2/template                      |     8 +-
 srcpkgs/R/template                            |     6 +-
 srcpkgs/RubyMine/template                     |    12 +-
 srcpkgs/SDL2_mixer/template                   |     6 +-
 srcpkgs/SLADE/template                        |     5 +-
 srcpkgs/SPIRV-Headers/template                |     2 +-
 srcpkgs/SPIRV-Tools/template                  |     2 +-
 .../patches/build-from-tarball.patch          |     7 +-
 srcpkgs/Signal-Desktop/template               |    12 +-
 srcpkgs/Solaar/template                       |    15 +
 srcpkgs/SweetHome3D/template                  |     4 +-
 srcpkgs/The-Powder-Toy/template               |    28 +
 srcpkgs/Thunar/template                       |     2 +-
 srcpkgs/UEFITool/template                     |    27 +
 .../Uranium/patches/fix-crash-in-cura.patch   |   132 -
 srcpkgs/Uranium/template                      |     6 +-
 srcpkgs/VirtualGL/template                    |     8 +-
 srcpkgs/Vulkan-Headers/template               |     4 +-
 srcpkgs/Vulkan-Tools/template                 |     4 +-
 srcpkgs/Waybar/template                       |     4 +-
 srcpkgs/WebStorm/template                     |    16 +-
 srcpkgs/YACReader/template                    |     6 +-
 srcpkgs/abi-compliance-checker/template       |     2 +-
 srcpkgs/abireport/template                    |     8 +-
 srcpkgs/ack/template                          |     4 +-
 srcpkgs/acpica-utils/template                 |     6 +-
 srcpkgs/acpid/template                        |     6 +-
 srcpkgs/adobe-flash-plugin/template           |    12 +-
 srcpkgs/adriconf/template                     |     9 +-
 srcpkgs/adwaita-icon-theme/template           |     4 +-
 srcpkgs/afl/template                          |    15 +-
 srcpkgs/aisleriot/template                    |     4 +-
 srcpkgs/akonadi-calendar/template             |     6 +-
 srcpkgs/akonadi-contacts/template             |     6 +-
 srcpkgs/akonadi-import-wizard/template        |     8 +-
 srcpkgs/akonadi-mime/template                 |     4 +-
 srcpkgs/akonadi-notes/template                |     4 +-
 srcpkgs/akonadi-search/template               |     6 +-
 srcpkgs/akonadi5/template                     |     4 +-
 srcpkgs/akregator/template                    |     4 +-
 srcpkgs/alert-after/template                  |     6 +-
 srcpkgs/alertmanager/template                 |     4 +-
 srcpkgs/alkimia/template                      |     4 +-
 srcpkgs/alpine/patches/418e8bc5.patch         |    22 +
 srcpkgs/alpine/template                       |     2 +-
 srcpkgs/amdvlk/patches/musl.patch             |    33 -
 srcpkgs/amdvlk/template                       |    36 +-
 srcpkgs/amiri-font/template                   |     6 +-
 srcpkgs/amp/template                          |    10 +-
 srcpkgs/amtk/template                         |     8 +-
 srcpkgs/android-studio/template               |    43 +-
 srcpkgs/android-tools/files/generate_build.rb |   405 -
 srcpkgs/android-tools/patches/gcc-fixes.patch |    30 -
 .../patches/include-sys-sysmacros.patch       |    10 -
 .../android-tools/patches/musl-fixes.patch    |   199 -
 .../patches/undef__USE_GNU.patch              |    24 -
 srcpkgs/android-tools/template                |    89 +-
 srcpkgs/android-tools/update                  |     2 +-
 srcpkgs/angband/template                      |     8 +-
 srcpkgs/anki/template                         |     4 +-
 srcpkgs/ansi/template                         |     2 +-
 srcpkgs/anydesk/template                      |     9 +-
 srcpkgs/apache-directory-studio               |     1 +
 .../files/ApacheDirectoryStudio.desktop       |     0
 .../template                                  |    21 +-
 .../update                                    |     0
 srcpkgs/apache-jmeter/update                  |     1 +
 srcpkgs/apache-maven/template                 |     6 +-
 srcpkgs/apache-tomcat/template                |     4 +-
 srcpkgs/apache/template                       |     7 +-
 srcpkgs/api-sanity-checker/template           |     2 +-
 srcpkgs/apparmor/template                     |     7 +-
 srcpkgs/apt/template                          |     4 +-
 srcpkgs/aptly/template                        |     4 +-
 srcpkgs/aqbanking/template                    |     7 +-
 srcpkgs/aquatone/template                     |     4 +-
 srcpkgs/arc-theme/template                    |    10 +-
 srcpkgs/archiver/template                     |     6 +-
 srcpkgs/arduino/patches/astyle_fix.patch      |    34 +
 .../patches/disable-dependency-build.patch    |     4 +-
 srcpkgs/arduino/template                      |     6 +-
 .../patches/patch-src_libssl_compat_h.patch   |    16 -
 srcpkgs/aria2/template                        |     6 +-
 srcpkgs/aribas/update                         |     1 +
 srcpkgs/ark/template                          |     4 +-
 srcpkgs/armadillo/template                    |     8 +-
 srcpkgs/asio/template                         |    10 +-
 srcpkgs/aspell-en/template                    |     6 +-
 srcpkgs/aspell/template                       |     6 +-
 .../patches/0001-glext_h_conflict.patch       |    14 -
 srcpkgs/assimp/patches/musl.patch             |    11 +
 srcpkgs/assimp/template                       |    15 +-
 srcpkgs/assimp_qt_viewer/template             |    24 +
 srcpkgs/asunder/template                      |     6 +-
 srcpkgs/at-spi2-atk/template                  |     4 +-
 srcpkgs/at-spi2-core/template                 |     6 +-
 srcpkgs/atk/patches/fix-cross-gir.patch       |    14 -
 srcpkgs/atk/template                          |     6 +-
 srcpkgs/atlantis/template                     |     4 +-
 srcpkgs/atomix/template                       |     4 +-
 srcpkgs/atril/template                        |     6 +-
 srcpkgs/attica/template                       |     4 +-
 srcpkgs/audacious-plugins/template            |    13 +-
 srcpkgs/audacious/template                    |    16 +-
 srcpkgs/autofs/template                       |     8 +-
 srcpkgs/avidemux/template                     |     6 +-
 srcpkgs/avr-gcc/template                      |    12 +-
 srcpkgs/aws-cli/template                      |     5 +-
 srcpkgs/axel/template                         |     4 +-
 srcpkgs/azote/template                        |     6 +-
 srcpkgs/azpainter/template                    |     6 +-
 srcpkgs/babeld/patches/45.patch               |    71 +
 srcpkgs/babeld/template                       |    11 +-
 srcpkgs/backblaze-b2/template                 |     6 +-
 srcpkgs/backintime-qt/template                |    19 +
 srcpkgs/backintime/template                   |    15 +-
 srcpkgs/baloo-widgets5/template               |     4 +-
 srcpkgs/baloo5/template                       |     5 +-
 srcpkgs/baresip/template                      |     4 +-
 srcpkgs/barrier/template                      |     4 +-
 srcpkgs/base-files/files/66-kvm.rules         |     2 +-
 srcpkgs/base-files/files/vkpurge.8            |     6 +-
 srcpkgs/base-files/template                   |     4 +-
 srcpkgs/bash/files/bash50-008                 |    68 +
 srcpkgs/bash/files/bash50-009                 |    42 +
 srcpkgs/bash/files/bash50-010                 |   172 +
 srcpkgs/bash/files/bash50-011                 |    59 +
 srcpkgs/bash/template                         |     4 +-
 srcpkgs/bat/template                          |    11 +-
 srcpkgs/bc-gh/template                        |     4 +-
 srcpkgs/bcal/patches/non-null.patch           |    11 +
 srcpkgs/bcal/template                         |    11 +-
 srcpkgs/bcc/patches/musl.patch                |    12 -
 srcpkgs/bcc/template                          |    19 +-
 srcpkgs/bctoolbox/template                    |     2 +-
 srcpkgs/beancount/template                    |     6 +-
 srcpkgs/bearssl/template                      |    17 +-
 srcpkgs/beignet/patches/llvm8.patch           |    56 +
 srcpkgs/beignet/patches/llvm9.patch           |   111 +
 srcpkgs/beignet/template                      |     3 +-
 srcpkgs/berry/patches/fix-cross.patch         |    22 +-
 srcpkgs/berry/template                        |     6 +-
 srcpkgs/bettercap/template                    |     4 +-
 srcpkgs/bfs/template                          |     6 +-
 srcpkgs/bijiben/template                      |     4 +-
 srcpkgs/bind/template                         |     4 +-
 srcpkgs/binutils/template                     |     6 +-
 srcpkgs/binwalk/template                      |    19 +-
 srcpkgs/bird/template                         |     4 +-
 srcpkgs/bison/template                        |     4 +-
 srcpkgs/bitcoin/template                      |     6 +-
 srcpkgs/bitlbee-facebook/template             |     3 +-
 srcpkgs/blackbox_exporter/template            |     4 +-
 srcpkgs/blender/patches/altivec-all.patch     |    32 +
 srcpkgs/blender/patches/gcc9-elbeem.patch     |    31 +
 srcpkgs/bluedevil/template                    |     4 +-
 srcpkgs/blueman/template                      |     6 +-
 srcpkgs/bluez-qt5/template                    |     4 +-
 srcpkgs/bluez/files/bluetooth-meshd/run       |     3 +
 ...-without-systemd-in-the-user-session.patch |    59 -
 .../0001-enable-dbus-without-systemd.patch    |    34 +
 ...02-allow-obexd-on-non-systemd-system.patch |    54 +
 .../0002-bluetoothd-dbus-service.patch        |    20 -
 ...003-allow-mesh-on-non-systemd-system.patch |    29 +
 .../0003-bluetooth-group-can-use-bluez.patch  |    13 -
 ...04-include-sys-time.h-for-musl-build.patch |   129 +
 ...0005-include-limits.h-for-musl-build.patch |    66 +
 .../{musl.patch => 0006-musl-fix.patch}       |    21 +-
 .../bluez/patches/0007-include-string.h.patch |    25 +
 ...-grant-permission-to-bluetooth-group.patch |    27 +
 ...fresh-adv_manager-for-non-LE-devices.patch |    51 +
 srcpkgs/bluez/template                        |    28 +-
 srcpkgs/bogofilter/template                   |    14 +-
 srcpkgs/boinc/template                        |     6 +-
 srcpkgs/borgmatic/template                    |     4 +-
 srcpkgs/botan/template                        |    26 +-
 srcpkgs/bpftrace/template                     |     2 +-
 srcpkgs/breeze-gtk/template                   |     4 +-
 srcpkgs/breeze-icons/template                 |     4 +-
 srcpkgs/breeze/template                       |     4 +-
 srcpkgs/brig/template                         |     2 +-
 ...052df45c1fa439f6af0a2c8e9795087b9444.patch |   185 -
 srcpkgs/brisk-menu/template                   |     8 +-
 srcpkgs/bro/template                          |     4 +-
 srcpkgs/broot/template                        |     4 +-
 srcpkgs/brother-brlaser/template              |     4 +-
 srcpkgs/bs1770gain/template                   |     6 +-
 srcpkgs/bsdunzip/template                     |     2 +-
 srcpkgs/bspwm/template                        |     4 +-
 srcpkgs/btfs/template                         |    12 +-
 srcpkgs/btrfs-progs/template                  |     4 +-
 srcpkgs/buildah/template                      |     4 +-
 srcpkgs/buildbot/template                     |     3 +-
 srcpkgs/bum/template                          |     2 +-
 srcpkgs/bvi/template                          |     8 +-
 srcpkgs/cJSON/template                        |     2 +-
 srcpkgs/caddy/template                        |     4 +-
 srcpkgs/cage/template                         |    18 +
 srcpkgs/caja-extensions/template              |     4 +-
 srcpkgs/caja/template                         |     4 +-
 .../patches/DST-fix-date-change.patch         |    34 +
 srcpkgs/calcurse/template                     |     2 +-
 srcpkgs/calendarsupport/template              |     4 +-
 srcpkgs/calibre/template                      |    23 +-
 .../patches/missing-includes.patch            |    22 +
 srcpkgs/calligra-plan/template                |     2 +-
 srcpkgs/calligra/patches/qt5.13.patch         |    21 +
 srcpkgs/calligra/template                     |     2 +-
 srcpkgs/camlp4/patches/version-hack.patch     |    11 +
 srcpkgs/camlp4/template                       |     2 +-
 srcpkgs/camlp5/template                       |     6 +-
 .../patches/revert-libgit2-sys-api.patch      |    32 +
 srcpkgs/cargo/template                        |    45 +-
 srcpkgs/catch2/template                       |     4 +-
 srcpkgs/catfish/template                      |     4 +-
 srcpkgs/cbindgen/template                     |     4 +-
 srcpkgs/ccache/template                       |     4 +-
 srcpkgs/ccls/template                         |     8 +-
 srcpkgs/cdemu-client/template                 |     4 +-
 srcpkgs/cdemu-daemon/template                 |     4 +-
 srcpkgs/cdetect/template                      |     6 +-
 srcpkgs/celluloid/template                    |    19 +
 srcpkgs/cgrps/template                        |     8 +-
 srcpkgs/chafa/template                        |     4 +-
 srcpkgs/chatty/template                       |    10 +-
 srcpkgs/cheat/template                        |    26 +
 srcpkgs/cheese/template                       |    26 +-
 srcpkgs/cherry-font/template                  |     4 +-
 srcpkgs/cherrytree/template                   |     4 +-
 srcpkgs/chocolate-doom/template               |     2 +-
 srcpkgs/chroma/template                       |     6 +-
 srcpkgs/chromium-widevine/template            |     4 +-
 .../files/musl-patches/no-mallinfo.patch      |    12 +
 .../patches/chromium-enable-vaapi.patch       |   760 +-
 .../chromium/patches/harfbuzz-subset.patch    |    49 +
 .../chromium/patches/linked-hash-set.patch    |   130 +
 .../chromium/patches/one_euro_filter.patch    |    11 +
 .../patches/sandbox-sched_getparam.patch      |    20 +
 srcpkgs/chromium/template                     |     6 +-
 srcpkgs/chronograf/template                   |     4 +-
 srcpkgs/cinnamon-control-center/template      |     6 +-
 srcpkgs/cinnamon-desktop/template             |     6 +-
 srcpkgs/cinnamon-menus/template               |    10 +-
 srcpkgs/cinnamon-screensaver/template         |     6 +-
 srcpkgs/cinnamon-session/template             |     8 +-
 srcpkgs/cinnamon-settings-daemon/template     |     6 +-
 srcpkgs/cinnamon-translations/template        |     4 +-
 ...78cf57b80b977401460a147602832157b303.patch |    64 -
 srcpkgs/cinnamon/patches/default-theme.patch  |    25 -
 srcpkgs/cinnamon/patches/set_wheel.patch      |    17 -
 srcpkgs/cinnamon/template                     |     9 +-
 srcpkgs/cjs/template                          |    10 +-
 srcpkgs/ckb-next/template                     |     8 +-
 srcpkgs/ckbcomp/template                      |     6 +-
 srcpkgs/clamav/template                       |     9 +-
 srcpkgs/clang                                 |     2 +-
 srcpkgs/clang-analyzer                        |     2 +-
 srcpkgs/clang-tools-extra                     |     2 +-
 srcpkgs/claws-mail/template                   |     2 +-
 srcpkgs/clazy/template                        |     6 +-
 srcpkgs/clearine/template                     |    32 +-
 ...add-missing-functional-includes-5630.patch |    51 -
 .../patches/clementine-chromaprint-1.4.patch  |    41 -
 .../patches/clementine-moodbar_flags.patch    |    14 -
 .../patches/clementine-sqlite-3.12.patch      |    19 -
 srcpkgs/clementine/patches/protobuf-370.patch |    82 -
 srcpkgs/clementine/patches/sentinel.patch     |    42 -
 srcpkgs/clementine/template                   |    22 +-
 srcpkgs/clipgrab/template                     |     8 +-
 srcpkgs/clipman/template                      |    14 +
 srcpkgs/cloc/template                         |     4 +-
 srcpkgs/cloudfuse/template                    |     2 +-
 srcpkgs/clyrics/template                      |     4 +-
 srcpkgs/cmake-gui/template                    |     4 +-
 srcpkgs/cmake/template                        |     6 +-
 srcpkgs/cmixer/patches/linux.patch            |    34 +
 srcpkgs/cmixer/template                       |    20 +
 srcpkgs/cmocka/template                       |     2 +-
 srcpkgs/cmus/template                         |    19 +-
 srcpkgs/cni-plugins/template                  |     4 +-
 srcpkgs/cnping/INSTALL                        |     5 +
 srcpkgs/cnping/template                       |    19 +
 srcpkgs/codecrypt/template                    |     6 +-
 srcpkgs/codelite/template                     |     2 +-
 srcpkgs/collectd/template                     |     2 +-
 srcpkgs/composer/template                     |     9 +-
 srcpkgs/compton/template                      |     8 +-
 srcpkgs/conky-cli/template                    |     4 +-
 srcpkgs/conky/template                        |     5 +-
 srcpkgs/conmon/template                       |     4 +-
 srcpkgs/connman/files/connmand/run            |     3 +-
 srcpkgs/connman/files/musl/freeaddrinfo.patch |    17 +
 srcpkgs/connman/template                      |     2 +-
 srcpkgs/consul-template/template              |    13 +
 srcpkgs/consul/template                       |     6 +-
 srcpkgs/coq/template                          |     9 +-
 srcpkgs/coreboot-utils/template               |     6 +-
 srcpkgs/coyim/template                        |    19 +
 srcpkgs/cozy/template                         |     4 +-
 srcpkgs/cppcheck/template                     |    29 +-
 srcpkgs/cpufrequtils/template                 |     2 +-
 srcpkgs/crash/template                        |     4 +-
 srcpkgs/cri-tools/template                    |    10 +-
 srcpkgs/croc/template                         |     4 +-
 srcpkgs/cropgui/template                      |     2 +-
 .../files/non-nullness.patch                  |     1 -
 srcpkgs/cross-aarch64-linux-gnu/template      |    21 +-
 .../files/gccgo-musl.patch                    |     1 +
 .../files/non-nullness.patch                  |     1 -
 srcpkgs/cross-aarch64-linux-musl/template     |    43 +-
 .../files/non-nullness.patch                  |     1 -
 srcpkgs/cross-arm-linux-gnueabi/template      |    21 +-
 .../files/non-nullness.patch                  |     1 -
 srcpkgs/cross-arm-linux-gnueabihf/template    |    21 +-
 .../files/gccgo-musl.patch                    |     1 +
 .../files/non-nullness.patch                  |     1 -
 srcpkgs/cross-arm-linux-musleabi/template     |    43 +-
 .../files/gccgo-musl.patch                    |     1 +
 .../files/non-nullness.patch                  |     1 -
 srcpkgs/cross-arm-linux-musleabihf/template   |    43 +-
 .../files/non-nullness.patch                  |     1 -
 srcpkgs/cross-armv7l-linux-gnueabihf/template |    21 +-
 .../files/gccgo-musl.patch                    |     1 +
 .../files/non-nullness.patch                  |     1 -
 .../cross-armv7l-linux-musleabihf/template    |    43 +-
 .../files/bug90756.patch                      |     1 -
 .../files/gccgo-musl.patch                    |     1 +
 .../files/non-nullness.patch                  |     1 -
 srcpkgs/cross-i686-linux-musl/template        |    47 +-
 .../files/bug90756.patch                      |     1 -
 .../files/non-nullness.patch                  |     1 -
 srcpkgs/cross-i686-pc-linux-gnu/template      |    24 +-
 .../files/non-nullness.patch                  |     1 -
 srcpkgs/cross-mips-linux-musl/template        |    14 +-
 .../files/non-nullness.patch                  |     1 -
 srcpkgs/cross-mips-linux-muslhf/template      |    14 +-
 .../files/non-nullness.patch                  |     1 -
 srcpkgs/cross-mipsel-linux-musl/template      |    14 +-
 .../files/non-nullness.patch                  |     1 -
 srcpkgs/cross-mipsel-linux-muslhf/template    |    14 +-
 .../files/non-nullness.patch                  |     1 -
 srcpkgs/cross-powerpc-linux-gnu/template      |    40 +-
 .../files/gccgo-musl.patch                    |     1 +
 .../files/non-nullness.patch                  |     1 -
 srcpkgs/cross-powerpc-linux-musl/template     |    63 +-
 .../files/darn.patch                          |     1 +
 .../files/non-nullness.patch                  |     1 -
 srcpkgs/cross-powerpc64-linux-gnu/template    |    21 +-
 .../files/darn.patch                          |     1 +
 .../files/gccgo-musl.patch                    |     1 +
 .../files/non-nullness.patch                  |     1 -
 srcpkgs/cross-powerpc64-linux-musl/template   |    44 +-
 .../files/darn.patch                          |     1 +
 .../files/non-nullness.patch                  |     1 -
 srcpkgs/cross-powerpc64le-linux-gnu/template  |    21 +-
 .../files/darn.patch                          |     1 +
 .../files/gccgo-musl.patch                    |     1 +
 .../files/non-nullness.patch                  |     1 -
 srcpkgs/cross-powerpc64le-linux-musl/template |    44 +-
 srcpkgs/cross-vpkg-dummy/template             |    24 +-
 .../files/gccgo-musl.patch                    |     1 +
 .../files/non-nullness.patch                  |     1 -
 srcpkgs/cross-x86_64-linux-musl/template      |    43 +-
 srcpkgs/cross-x86_64-w64-mingw32/template     |     6 +-
 srcpkgs/crypto++/patches/arm-native.patch     |    26 -
 .../crypto++/patches/musl-soname-links.patch  |    10 -
 srcpkgs/crypto++/template                     |    16 +-
 srcpkgs/cryptsetup/template                   |    14 +-
 srcpkgs/crystal/template                      |    10 +-
 srcpkgs/cups-filters/template                 |     6 +-
 srcpkgs/cups/patches/cups-no-gzip-man.patch   |    17 -
 srcpkgs/cups/template                         |     4 +-
 ...ult-none-so-that-it-compiles-in-gcc9.patch |    57 -
 srcpkgs/cura-engine/template                  |     4 +-
 srcpkgs/cura-fdm-materials/template           |     5 +-
 srcpkgs/cura/template                         |     4 +-
 srcpkgs/curl/template                         |    10 +-
 srcpkgs/cutter/template                       |     6 +-
 srcpkgs/datamash/template                     |     4 +-
 srcpkgs/dav1d/template                        |     2 +-
 srcpkgs/dbeaver/template                      |     4 +-
 srcpkgs/dconf-editor/template                 |     4 +-
 srcpkgs/ddcutil/template                      |     4 +-
 srcpkgs/ddgr/template                         |     6 +-
 srcpkgs/debootstrap/template                  |    10 +-
 srcpkgs/dejagnu/template                      |     2 +-
 srcpkgs/delta/template                        |    15 +
 srcpkgs/deluge/files/deluge-web/run           |     2 +-
 srcpkgs/deluge/template                       |     2 +-
 srcpkgs/delve/template                        |    18 +-
 srcpkgs/deutex/template                       |     8 +-
 srcpkgs/devedeng/template                     |     6 +-
 srcpkgs/dhcpcd/template                       |     5 +-
 srcpkgs/dialog/template                       |     2 +-
 srcpkgs/diffr/template                        |    18 +
 srcpkgs/digikam/template                      |     6 +-
 srcpkgs/diskus/template                       |     6 +-
 srcpkgs/dispcalGUI/template                   |     4 +-
 srcpkgs/dive/template                         |     4 +-
 srcpkgs/dkms/files/kernel.d/dkms.postinst     |     2 +
 srcpkgs/dkms/template                         |     2 +-
 srcpkgs/dma/patches/musl_sys_param_h.patch    |    12 -
 srcpkgs/dma/template                          |     9 +-
 srcpkgs/dmd/template                          |    16 +-
 srcpkgs/dmenu-wayland/template                |     5 +-
 srcpkgs/dmenu/template                        |     2 +-
 srcpkgs/dnscrypt-proxy/template               |     6 +-
 srcpkgs/dnsmasq/patches/nettle35.patch        |    42 +
 .../patches/pyyaml_version.patch              |    13 +
 srcpkgs/docker-compose/template               |     8 +-
 srcpkgs/docker/template                       |     4 +-
 srcpkgs/dolphin/template                      |     4 +-
 srcpkgs/doomretro/template                    |     4 +-
 srcpkgs/dos2unix/template                     |     8 +-
 srcpkgs/dosbox/template                       |     4 -
 srcpkgs/dovecot-plugin-pigeonhole/template    |     6 +-
 srcpkgs/dovecot/template                      |     6 +-
 srcpkgs/dracut/patches/ppc-mac-thermal.patch  |   144 +
 srcpkgs/dracut/template                       |     4 +-
 srcpkgs/dragon-player/template                |     4 +-
 srcpkgs/drone-cli/template                    |     6 +-
 srcpkgs/drumstick-devel                       |     1 +
 srcpkgs/drumstick/template                    |    33 +
 srcpkgs/dssi/template                         |     8 +-
 srcpkgs/dtc/template                          |     4 +-
 srcpkgs/dte/template                          |     4 +-
 srcpkgs/duktape/template                      |     4 +-
 srcpkgs/duplicity/template                    |     2 +-
 srcpkgs/dutree/template                       |     4 +-
 srcpkgs/e2fsprogs/template                    |     4 +-
 srcpkgs/eclipse/template                      |     6 +-
 srcpkgs/edbrowse/patches/curl-7.62.patch      |    27 -
 srcpkgs/edbrowse/template                     |     6 +-
 srcpkgs/editline/template                     |     2 +-
 srcpkgs/eggdrop/template                      |    44 +
 srcpkgs/elfinfo/template                      |     6 +-
 srcpkgs/elfutils/template                     |     2 +-
 srcpkgs/elixir/template                       |     4 +-
 srcpkgs/ell/template                          |     6 +-
 srcpkgs/elogind/template                      |     6 +-
 srcpkgs/emacs/template                        |     4 +-
 srcpkgs/enchant2/template                     |     6 +-
 srcpkgs/encodings/template                    |    13 +-
 srcpkgs/endless-sky/template                  |     4 +-
 srcpkgs/engrampa/template                     |     4 +-
 srcpkgs/entr/template                         |     7 +-
 srcpkgs/eog/template                          |     4 +-
 srcpkgs/eom/template                          |     5 -
 srcpkgs/epiphany/template                     |     2 +-
 srcpkgs/eqonomize/template                    |     4 +-
 srcpkgs/erlang/template                       |     4 +-
 srcpkgs/eselect/template                      |     6 +-
 srcpkgs/etcd/template                         |     4 +-
 srcpkgs/etcetera/template                     |    10 +-
 srcpkgs/ethtool/template                      |     4 +-
 srcpkgs/eventviews/template                   |     6 +-
 srcpkgs/evince/template                       |     6 +-
 srcpkgs/evolution-data-server/template        |     8 +-
 srcpkgs/evolution-ews/template                |     4 +-
 srcpkgs/evolution/template                    |     8 +-
 .../0001-Add-missing-limits.h-include.patch   |    37 +
 srcpkgs/evtest/template                       |     6 +-
 srcpkgs/exa/template                          |     2 +-
 srcpkgs/exec-on-git-staged/template           |    16 +
 srcpkgs/execline/template                     |     4 +-
 srcpkgs/exiftool/template                     |     4 +-
 srcpkgs/exiv2/patches/musl.patch              |    23 -
 srcpkgs/exiv2/template                        |    13 +-
 srcpkgs/expat/template                        |     6 +-
 srcpkgs/expect/template                       |    10 +-
 srcpkgs/extra-cmake-modules/template          |     4 +-
 srcpkgs/extrace/template                      |     3 +-
 srcpkgs/extractpdfmark/template               |     2 +-
 srcpkgs/f2fs-tools/template                   |     6 +-
 srcpkgs/faketime/template                     |    10 +-
 srcpkgs/fastmod/template                      |     4 +-
 srcpkgs/fatrace/template                      |     9 +-
 srcpkgs/fava/template                         |    10 +-
 srcpkgs/fd/template                           |     4 +-
 srcpkgs/fdk-aac/template                      |     4 +-
 srcpkgs/fetchmail/patches/patch-socket_c.diff |    21 -
 srcpkgs/fetchmail/template                    |    10 +-
 srcpkgs/ffcall/template                       |     4 +-
 srcpkgs/ffmpeg/template                       |    14 +-
 srcpkgs/ffmpegthumbnailer/template            |    15 +-
 srcpkgs/ffmpegthumbs/template                 |     4 +-
 srcpkgs/ffsend/template                       |     4 +-
 srcpkgs/ffuf/template                         |    16 +
 srcpkgs/fierce/template                       |    15 +
 srcpkgs/figurine/template                     |     6 +-
 srcpkgs/file-roller/template                  |     4 +-
 srcpkgs/filelight/template                    |    11 +-
 srcpkgs/filezilla/template                    |     4 +-
 .../findutils/patches/gnulib-freadahead.patch |    11 -
 srcpkgs/findutils/patches/gnulib-fseeko.patch |    21 -
 .../findutils/patches/gnulib-mountlist.patch  |    15 -
 .../findutils/patches/gnulib-stdio-impl.patch |    14 -
 srcpkgs/findutils/template                    |    12 +-
 srcpkgs/fio/template                          |     4 +-
 srcpkgs/firebird3/template                    |     7 +
 ...irefox-esr-i18n-as => firefox-esr-i18n-bn} |     0
 ...-esr-i18n-bn-BD => firefox-esr-i18n-en-CA} |     0
 ...fox-esr-i18n-bn-IN => firefox-esr-i18n-ia} |     0
 ...-esr-i18n-en-ZA => firefox-esr-i18n-ne-NP} |     0
 ...refox-esr-i18n-mai => firefox-esr-i18n-oc} |     0
 srcpkgs/firefox-esr-i18n-or                   |     1 -
 ...irefox-esr-i18n-ml => firefox-esr-i18n-ur} |     0
 .../firefox-esr-i18n/files/update-lang-list   |     1 +
 srcpkgs/firefox-esr-i18n/template             |   202 +-
 srcpkgs/firefox-esr/files/mozconfig           |     6 -
 .../disable-image-format-warning.patch        |    15 +
 .../patches/fix-arm-opus-include.patch        |    11 +
 .../firefox-esr/patches/fix-i686-musl.patch   |     9 -
 srcpkgs/firefox-esr/patches/fix-toolkit.patch |    35 +-
 srcpkgs/firefox-esr/patches/fix-tools.patch   |    31 +-
 .../firefox-esr/patches/fix-wasm-arm.patch    |    15 +
 .../firefox-esr/patches/fix-webrtc-arm.patch  |    11 -
 .../patches/fix-webrtc-glibcisms.patch        |    17 +-
 srcpkgs/firefox-esr/patches/fix-xpcom.patch   |    11 -
 .../patches/gettid-musl.patch}                |     0
 srcpkgs/firefox-esr/patches/mallinfo.patch    |    40 +-
 .../patches/ppc-no-static-sizes.patch         |    19 -
 .../patches/remove-rustc-check.patch          |    18 +-
 .../firefox-esr/patches/rust-cssparser.patch  |    90 +
 .../patches/rust-unitialized-field.patch      |    19 -
 srcpkgs/firefox-esr/patches/rust133.patch     |    24 -
 ...nd-restore-non-volatile-x28-on-arm64.patch |    64 -
 ...-clobbering-it-in-the-regex-compiler.patch |    97 -
 srcpkgs/firefox-esr/patches/sndio.patch       |    12 +-
 srcpkgs/firefox-esr/patches/yuv-be.patch      |    48 +
 srcpkgs/firefox-esr/template                  |    33 +-
 srcpkgs/firefox-i18n-bn                       |     1 +
 srcpkgs/firefox-i18n-en-CA                    |     1 +
 srcpkgs/firefox-i18n-ia                       |     1 +
 srcpkgs/firefox-i18n-ne-NP                    |     1 +
 srcpkgs/firefox-i18n-oc                       |     1 +
 srcpkgs/firefox-i18n-ur                       |     1 +
 srcpkgs/firefox-i18n/files/update-lang-list   |    81 +
 srcpkgs/firefox-i18n/template                 |   188 +-
 srcpkgs/firefox/files/firefox-wayland         |     5 +-
 .../patches/initialize_sched_param.patch      |    22 +
 .../firefox/patches/ppc64le-bug-1512162.patch |    50 -
 srcpkgs/firefox/template                      |    36 +-
 srcpkgs/fish-shell/template                   |     2 +-
 srcpkgs/flac/template                         |     5 +-
 srcpkgs/flacon/template                       |     4 +-
 srcpkgs/flake8/template                       |     6 +-
 srcpkgs/flatbuffers/patches/install.patch     |    20 -
 srcpkgs/flatbuffers/template                  |    12 +-
 srcpkgs/flatpak-builder/template              |     4 +-
 srcpkgs/flatpak/template                      |     6 +-
 srcpkgs/fldigi/template                       |     4 +-
 .../patches/00-add-bin-directories.patch      |    10 +-
 srcpkgs/flowblade/template                    |     8 +-
 srcpkgs/fmt/template                          |     2 +-
 srcpkgs/fmtools/template                      |    11 +
 srcpkgs/focuswriter/template                  |     4 +-
 srcpkgs/foliate/template                      |     6 +-
 srcpkgs/folks/template                        |     8 +-
 srcpkgs/font-FixedMisc/template               |     4 +-
 srcpkgs/font-Hasklig/template                 |     2 +-
 srcpkgs/font-awesome5/template                |     6 +-
 srcpkgs/font-firacode/template                |     4 +-
 srcpkgs/font-ibm-plex-ttf/template            |     4 +-
 srcpkgs/font-ionicons-ttf/template            |     4 +-
 srcpkgs/font-iosevka/template                 |     4 +-
 .../font-material-design-icons-ttf/template   |     2 +-
 srcpkgs/font-mplus-ttf/template               |     6 +-
 srcpkgs/font-sarasa-gothic/template           |     4 +-
 srcpkgs/font-spleen/template                  |     8 +-
 srcpkgs/font-unifont-bdf/template             |     4 +-
 srcpkgs/font-util/template                    |     8 +-
 srcpkgs/font-vazir/template                   |     4 +-
 srcpkgs/forkstat/template                     |     4 +-
 srcpkgs/fossil/template                       |     7 +-
 srcpkgs/fotoxx/template                       |     5 +-
 srcpkgs/four-in-a-row/template                |     8 +-
 srcpkgs/fpc-src/template                      |     2 +-
 srcpkgs/frameworkintegration/template         |     4 +-
 .../patches/020-namespace-missing-std.patch   |   127 +
 srcpkgs/freecad/template                      |     2 +-
 srcpkgs/freecell-solver/template              |     8 +-
 srcpkgs/freeipmi/template                     |     4 +-
 srcpkgs/fribidi/template                      |     6 +-
 srcpkgs/frp/template                          |     4 +-
 srcpkgs/fselect/template                      |     4 +-
 srcpkgs/fuse-mp3fs/template                   |    14 +
 srcpkgs/fuse-overlayfs/template               |     6 +-
 srcpkgs/fuse-zip/template                     |     4 +-
 srcpkgs/fuse3/template                        |     4 +-
 srcpkgs/fvwm/template                         |     6 +-
 srcpkgs/fwup/template                         |     8 +-
 srcpkgs/fwupd/template                        |     6 +-
 srcpkgs/fwupdate/template                     |     2 +-
 srcpkgs/g810-led/template                     |     4 +-
 srcpkgs/gallery-dl/template                   |    14 +-
 srcpkgs/gc/template                           |     2 +-
 srcpkgs/gcc/files/gccgo-musl.patch            |   200 +
 srcpkgs/gcc/patches/bug90756.patch            |    23 -
 srcpkgs/gcc/patches/darn.patch                |   504 +
 srcpkgs/gcc/patches/libffi_gnulinux.patch     |    11 +
 srcpkgs/gcc/patches/non-nullness.patch        |    88 -
 srcpkgs/gcc/template                          |    56 +-
 srcpkgs/gcdemu/template                       |     4 +-
 srcpkgs/gcompris-qt/template                  |     4 +-
 srcpkgs/gdb/template                          |     8 +-
 srcpkgs/gdm/template                          |     6 +-
 srcpkgs/geany-plugins/template                |     7 +-
 srcpkgs/geany/template                        |     6 +-
 srcpkgs/geary/template                        |    10 +-
 srcpkgs/geckodriver/template                  |     4 +-
 srcpkgs/geda/patches/snarf_cpp_opts.patch     |    17 +
 srcpkgs/geda/template                         |    23 +-
 srcpkgs/gerbera/template                      |     4 +-
 srcpkgs/getmail/template                      |     6 +-
 srcpkgs/gfuzz/template                        |    14 +
 srcpkgs/giflib/template                       |     2 +-
 srcpkgs/gifski/template                       |     8 +-
 srcpkgs/gip/template                          |     9 +-
 srcpkgs/girara/template                       |     8 +-
 srcpkgs/git-cola/template                     |     4 +-
 srcpkgs/git-mediate/template                  |    14 +
 srcpkgs/git-revise/template                   |     7 +-
 srcpkgs/github-opml/template                  |     2 +-
 srcpkgs/gitlab-runner/template                |     4 +-
 srcpkgs/gjs/template                          |     4 +-
 srcpkgs/glances/template                      |     6 +-
 srcpkgs/glib-networking/template              |     4 +-
 srcpkgs/glib/template                         |     4 +-
 srcpkgs/glibmm/template                       |     4 +-
 srcpkgs/glslViewer/template                   |     2 +-
 srcpkgs/glslang/template                      |     2 +-
 srcpkgs/glusterfs/template                    |     4 +-
 srcpkgs/gmic/template                         |     4 +-
 srcpkgs/gmime3/template                       |     6 +-
 srcpkgs/gnome-backgrounds/template            |     4 +-
 srcpkgs/gnome-bluetooth/template              |     6 +-
 srcpkgs/gnome-books/template                  |     4 +-
 .../patches/dont-require-FNM_EXTMATCH.patch   |    25 -
 srcpkgs/gnome-builder/template                |     8 +-
 srcpkgs/gnome-calendar/template               |     4 +-
 srcpkgs/gnome-chess/template                  |     4 +-
 srcpkgs/gnome-clocks/template                 |     6 +-
 .../gnome-contacts/patches/ambiguous.patch    |    14 -
 srcpkgs/gnome-contacts/template               |     6 +-
 srcpkgs/gnome-control-center/template         |     4 +-
 srcpkgs/gnome-desktop/template                |     4 +-
 srcpkgs/gnome-documents/template              |     2 +-
 srcpkgs/gnome-flashback/template              |     6 +-
 srcpkgs/gnome-font-viewer/template            |     4 +-
 srcpkgs/gnome-games/template                  |     7 +-
 srcpkgs/gnome-getting-started-docs/template   |     4 +-
 srcpkgs/gnome-initial-setup/template          |     8 +-
 srcpkgs/gnome-klotski/template                |     6 +-
 srcpkgs/gnome-mahjongg/template               |     6 +-
 srcpkgs/gnome-mines/template                  |     4 +-
 srcpkgs/gnome-mpv                             |     1 +
 srcpkgs/gnome-mpv/template                    |    13 -
 srcpkgs/gnome-nibbles/template                |    12 +-
 srcpkgs/gnome-online-accounts/template        |     6 +-
 srcpkgs/gnome-online-miners/template          |     4 +-
 srcpkgs/gnome-panel/template                  |     6 +-
 srcpkgs/gnome-passwordsafe/template           |     5 +-
 srcpkgs/gnome-robots/template                 |     6 +-
 srcpkgs/gnome-screensaver/template            |     2 +-
 srcpkgs/gnome-session/template                |     6 +-
 srcpkgs/gnome-settings-daemon/template        |    11 +-
 srcpkgs/gnome-shell-extensions/template       |     4 +-
 srcpkgs/gnome-shell/template                  |     8 +-
 srcpkgs/gnome-ssh-askpass/template            |     4 +-
 srcpkgs/gnome-sudoku/template                 |     4 +-
 srcpkgs/gnome-tetravex/template               |     4 +-
 ...bc4dd0c6c804a093b94c269461ce376fed4f.patch |    30 -
 .../patches/gnome-todo-eds-libecal-2.0.patch  |   567 +
 srcpkgs/gnome-todo/template                   |     8 +-
 srcpkgs/gnome-tweaks/template                 |     8 +-
 srcpkgs/gnome-user-docs/template              |     4 +-
 srcpkgs/gnu-efi-libs/template                 |     8 +-
 srcpkgs/gnucash/template                      |     6 +-
 srcpkgs/gnumeric/template                     |     2 +-
 .../patches/use-versioned-pcsclite.patch      |    11 +
 srcpkgs/gnupg2/template                       |     9 +-
 srcpkgs/gnutls/template                       |     7 +-
 srcpkgs/go-for-it/template                    |     4 +-
 srcpkgs/go-jira/template                      |    24 +-
 srcpkgs/go-md2man/template                    |     2 +-
 srcpkgs/go-review/template                    |    18 +
 .../go/patches/gohostarch-bootstrap-fix.patch |    28 +
 srcpkgs/go/template                           |     4 +-
 srcpkgs/gocryptfs/template                    |     6 +-
 srcpkgs/godot/template                        |     6 +-
 srcpkgs/golangci-lint/template                |     4 +-
 srcpkgs/golly/template                        |     6 +-
 srcpkgs/gomatrix/template                     |    17 +
 srcpkgs/goodvibes/template                    |     4 +-
 srcpkgs/google-chrome/template                |     6 +-
 srcpkgs/google-cloud-sdk/template             |     5 +-
 srcpkgs/googler/template                      |     2 +-
 srcpkgs/gopls/template                        |    20 +
 srcpkgs/goversion/template                    |     2 +-
 .../patches/elf-mem-image-musl.patch          |    13 +
 srcpkgs/gperftools/patches/ppc-musl.patch     |    76 +
 srcpkgs/gperftools/template                   |    22 +-
 srcpkgs/gpgme/template                        |    14 +-
 srcpkgs/gpodder/template                      |     5 +-
 srcpkgs/gpsim/template                        |     8 +-
 srcpkgs/gradle/template                       |     8 +-
 srcpkgs/grafana/template                      |     4 +-
 srcpkgs/gramps/template                       |     6 +-
 srcpkgs/granite/template                      |    10 +-
 srcpkgs/grantleetheme/template                |     4 +-
 srcpkgs/graphene/template                     |     9 +-
 srcpkgs/grpc/template                         |    15 +-
 srcpkgs/grub/files/kernel.d/grub.post         |     2 +
 srcpkgs/grub/template                         |     2 +-
 srcpkgs/gscan2pdf/template                    |     4 +-
 srcpkgs/gsettings-desktop-schemas/template    |     6 +-
 srcpkgs/gsl/patches/ppc-musl.patch            |    36 +
 srcpkgs/gst-libav/template                    |     4 +-
 srcpkgs/gst-omx/template                      |     4 +-
 srcpkgs/gst-plugins-bad1/template             |     6 +-
 srcpkgs/gst-plugins-base1/template            |     4 +-
 srcpkgs/gst-plugins-good1/template            |     6 +-
 srcpkgs/gst-plugins-ugly1/template            |     4 +-
 srcpkgs/gst1-editing-services/template        |     4 +-
 srcpkgs/gst1-python/template                  |     4 +-
 srcpkgs/gst1-python3/template                 |     4 +-
 srcpkgs/gstreamer-vaapi/template              |     4 +-
 srcpkgs/gstreamer1/template                   |     4 +-
 srcpkgs/gtk+3/template                        |     4 +-
 srcpkgs/gtk3-nocsd/template                   |    12 +-
 srcpkgs/gtk4/template                         |    10 +-
 srcpkgs/gtkwave/template                      |     4 +-
 srcpkgs/gucci/template                        |    17 +
 srcpkgs/guitarix2/patches/musl.patch          |    15 -
 srcpkgs/guitarix2/template                    |    13 +-
 srcpkgs/gummiboot/template                    |     2 +-
 srcpkgs/gutenprint/patches/musl.patch         |    19 -
 srcpkgs/gutenprint/template                   |     4 +-
 srcpkgs/gvfs/template                         |     8 +-
 srcpkgs/gwenview/template                     |     4 +-
 srcpkgs/gxi                                   |     1 +
 srcpkgs/gxi/template                          |    23 -
 srcpkgs/h2o/template                          |     9 +-
 srcpkgs/harfbuzz/template                     |     6 +-
 srcpkgs/haveged/template                      |     8 +-
 srcpkgs/help2man/template                     |     6 +-
 srcpkgs/hexchat/template                      |     2 +-
 srcpkgs/hexyl/template                        |     6 +-
 srcpkgs/hiawatha/template                     |     4 +-
 srcpkgs/hitori/template                       |     6 +-
 srcpkgs/homebank/template                     |     6 +-
 srcpkgs/hopper/template                       |     4 +-
 srcpkgs/hplip/template                        |     4 +-
 srcpkgs/httpie/template                       |     6 +-
 srcpkgs/hub/template                          |     4 +-
 srcpkgs/hugo/template                         |     4 +-
 srcpkgs/hunspell-en_AU/template               |     4 +-
 srcpkgs/hunspell-en_GB-ize/template           |    12 +-
 srcpkgs/hunspell-en_US/template               |    10 +-
 srcpkgs/hunspell-es_ES/template               |     4 +-
 srcpkgs/hunspell-pl_PL/template               |     4 +-
 srcpkgs/hwids/template                        |     6 +-
 srcpkgs/hydroxide/template                    |     5 +-
 srcpkgs/hyperfine/template                    |     6 +-
 srcpkgs/i2pd/template                         |     4 +-
 srcpkgs/i3-gaps/template                      |     4 +-
 srcpkgs/i3/template                           |     4 +-
 srcpkgs/i3lock-color/template                 |     6 +-
 srcpkgs/i3lock-fancy/template                 |     2 +-
 srcpkgs/i3status-rust/patches/fix-32bit.patch |    16 +-
 srcpkgs/i3status-rust/template                |    10 +-
 .../patches/pulseaudio-optional.patch         |    95 +
 srcpkgs/i3status/template                     |    41 +-
 srcpkgs/iagno/template                        |     8 +-
 srcpkgs/ibus-bamboo/template                  |     4 +-
 srcpkgs/ibus-m17n/INSTALL.msg                 |     2 +
 srcpkgs/ibus-m17n/template                    |    19 +
 srcpkgs/icdiff/template                       |     6 +-
 srcpkgs/ice-ssb/template                      |     4 +-
 .../patches/fix-gettid.patch}                 |     5 +-
 srcpkgs/icecat/patches/fix-musl.patch         |    11 -
 srcpkgs/icecat/patches/rust-cssparser.patch   |    90 +
 srcpkgs/icecat/template                       |    12 +
 srcpkgs/icewm/patches/use-NULL.patch          |    45 -
 srcpkgs/icewm/template                        |    22 +-
 srcpkgs/iio-sensor-proxy/template             |     4 +-
 srcpkgs/imgp/template                         |     2 +-
 srcpkgs/immortal/template                     |     2 +-
 srcpkgs/imv/template                          |    11 +-
 srcpkgs/incidenceeditor/template              |     6 +-
 srcpkgs/include-what-you-use/template         |     2 +-
 srcpkgs/influxdb/template                     |     4 +-
 srcpkgs/inkscape/template                     |     2 +-
 srcpkgs/innoextract/template                  |    10 +-
 srcpkgs/intel-ucode/template                  |     4 +-
 .../intellij-idea-community-edition/template  |    15 +-
 srcpkgs/inxi/template                         |     6 +-
 srcpkgs/io.elementary.calendar/template       |     9 +-
 srcpkgs/io.elementary.code/template           |     2 +-
 srcpkgs/io.elementary.files/template          |     8 +-
 srcpkgs/ipe/template                          |    11 +-
 srcpkgs/iperf/template                        |     2 +-
 srcpkgs/iperf3/template                       |     2 +-
 srcpkgs/iproute2/template                     |     4 +-
 srcpkgs/ipv6calc/template                     |     4 +-
 srcpkgs/ipvsadm/template                      |     8 +-
 srcpkgs/irssi/template                        |     6 +-
 srcpkgs/iso-codes/template                    |     4 +-
 srcpkgs/ispc/template                         |     8 +-
 srcpkgs/iverilog/template                     |     6 +-
 srcpkgs/iwd/template                          |    10 +-
 srcpkgs/jack/template                         |    38 +-
 srcpkgs/jansson/template                      |     2 +-
 .../jbig2dec/patches/2002_abi_compat.patch    |    24 +
 srcpkgs/jbig2dec/template                     |     6 +-
 srcpkgs/jdupes/template                       |     4 +-
 srcpkgs/jemalloc/template                     |     4 +-
 srcpkgs/jenkins/files/jenkins/run             |     2 +-
 srcpkgs/jenkins/template                      |     6 +-
 srcpkgs/jgmenu/template                       |     4 +-
 srcpkgs/jmol/template                         |     4 +-
 srcpkgs/jreen-qt5                             |     1 +
 srcpkgs/jreen-qt5-devel                       |     2 +-
 srcpkgs/jreen-qt5/template                    |    28 -
 srcpkgs/jreen/template                        |    37 +-
 srcpkgs/json-glib/template                    |     2 +-
 srcpkgs/jsonnet/template                      |     5 +-
 srcpkgs/juCi++/patches/libgit2-0.28.patch     |    23 -
 srcpkgs/juCi++/template                       |    14 +-
 srcpkgs/juk/template                          |     4 +-
 srcpkgs/julia/template                        |    10 +-
 srcpkgs/jwm-settings-manager/template         |     2 +-
 srcpkgs/k3b/template                          |     4 +-
 srcpkgs/k3s/files/k3s-agent/log/run           |     2 +
 srcpkgs/k3s/files/k3s-agent/run               |    10 +
 srcpkgs/k3s/files/k3s-server/log/run          |     2 +
 srcpkgs/k3s/files/k3s-server/run              |     5 +
 srcpkgs/k3s/template                          |    65 +
 srcpkgs/kColorPicker-devel                    |     1 +
 srcpkgs/kColorPicker/template                 |    28 +
 srcpkgs/kImageAnnotator-devel                 |     1 +
 srcpkgs/kImageAnnotator/template              |    28 +
 srcpkgs/kaccounts-integration/template        |     4 +-
 srcpkgs/kaccounts-providers/template          |     4 +-
 srcpkgs/kactivities5-stats/template           |     5 +-
 srcpkgs/kactivities5/template                 |     5 +-
 srcpkgs/kactivitymanagerd/template            |     4 +-
 srcpkgs/kaddressbook/template                 |     6 +-
 srcpkgs/kak-lsp/template                      |     4 +-
 srcpkgs/kalarm/template                       |     6 +-
 srcpkgs/kalarmcal/template                    |     4 +-
 srcpkgs/kapidox/template                      |     4 +-
 srcpkgs/karchive/template                     |     4 +-
 srcpkgs/kate5/template                        |     4 +-
 srcpkgs/kauth/template                        |     4 +-
 srcpkgs/kbfs                                  |     1 +
 srcpkgs/kbfs/template                         |    23 -
 srcpkgs/kbookmarks/template                   |     4 +-
 srcpkgs/kcachegrind/template                  |     8 +-
 srcpkgs/kcalc/template                        |     6 +-
 srcpkgs/kcalcore/template                     |     4 +-
 srcpkgs/kcalutils/template                    |     4 +-
 srcpkgs/kcharselect/template                  |     4 +-
 srcpkgs/kcmutils/template                     |     4 +-
 srcpkgs/kcodecs/template                      |     4 +-
 srcpkgs/kcolorchooser/template                |     4 +-
 srcpkgs/kcompletion/template                  |     5 +-
 srcpkgs/kconfig/template                      |     4 +-
 srcpkgs/kconfigwidgets/template               |     5 +-
 srcpkgs/kcontacts/template                    |     9 +-
 srcpkgs/kcoreaddons/template                  |     4 +-
 srcpkgs/kcrash/template                       |     4 +-
 srcpkgs/kcron/template                        |     8 +-
 srcpkgs/kdav/template                         |     4 +-
 srcpkgs/kdbusaddons/template                  |     4 +-
 srcpkgs/kde-cli-tools/template                |     4 +-
 srcpkgs/kde-gtk-config5/template              |     6 +-
 srcpkgs/kde5-baseapps/template                |     2 +-
 srcpkgs/kde5/template                         |    53 +-
 srcpkgs/kdeclarative/template                 |     4 +-
 srcpkgs/kdecoration/template                  |     4 +-
 srcpkgs/kded/template                         |     4 +-
 srcpkgs/kdegraphics-mobipocket/template       |     4 +-
 srcpkgs/kdegraphics-thumbnailers/template     |     4 +-
 srcpkgs/kdelibs4support/template              |     5 +-
 srcpkgs/kdenlive/template                     |     4 +-
 srcpkgs/kdepim-apps-libs/template             |     6 +-
 srcpkgs/kdepim-runtime/template               |     6 +-
 srcpkgs/kdeplasma-addons5/template            |     4 +-
 srcpkgs/kdesignerplugin/template              |     6 +-
 srcpkgs/kdesu/template                        |     4 +-
 srcpkgs/kdevelop-php/template                 |     4 +-
 srcpkgs/kdevelop-python/template              |     8 +-
 srcpkgs/kdevelop/patches/use-std-c99.patch    |     9 +-
 srcpkgs/kdevelop/template                     |     6 +-
 srcpkgs/kdewebkit/template                    |     4 +-
 srcpkgs/kdialog/template                      |     4 +-
 srcpkgs/kdnssd/template                       |     4 +-
 srcpkgs/kdoctools/template                    |     4 +-
 srcpkgs/kea/patches/fix-musl-getopt.patch     |    10 -
 srcpkgs/kea/template                          |     9 +-
 srcpkgs/keditbookmarks/template               |     9 +-
 srcpkgs/keepalived/template                   |     6 +-
 srcpkgs/kemoticons/template                   |     4 +-
 srcpkgs/keybase-desktop/template              |     6 +-
 .../{kbfs/INSTALL => keybase/kbfs.INSTALL}    |     0
 srcpkgs/keybase/template                      |    25 +-
 srcpkgs/keyutils/template                     |     9 +-
 srcpkgs/kfilemetadata5/template               |     5 +-
 srcpkgs/kfind/template                        |     6 +-
 srcpkgs/kgamma5/template                      |     4 +-
 srcpkgs/kget/template                         |     4 +-
 srcpkgs/kglobalaccel/template                 |     4 +-
 srcpkgs/kgpg/template                         |    22 +
 srcpkgs/kguiaddons/template                   |     4 +-
 srcpkgs/khelpcenter/template                  |     4 +-
 srcpkgs/kholidays/template                    |     4 +-
 srcpkgs/khotkeys/template                     |     4 +-
 srcpkgs/khtml/template                        |     4 +-
 srcpkgs/ki18n/template                        |     4 +-
 srcpkgs/kiconthemes/template                  |     5 +-
 srcpkgs/kidentitymanagement/template          |     4 +-
 srcpkgs/kidletime/template                    |     4 +-
 srcpkgs/kig/template                          |    11 +-
 srcpkgs/kimageformats/template                |     4 +-
 srcpkgs/kimap/template                        |     4 +-
 srcpkgs/kinfocenter/template                  |     4 +-
 srcpkgs/kinit/template                        |     4 +-
 srcpkgs/kio-extras/template                   |     4 +-
 srcpkgs/kio-gdrive/template                   |     4 +-
 srcpkgs/kio/template                          |     5 +-
 srcpkgs/kirigami2/template                    |     5 +-
 srcpkgs/kismet/template                       |     4 +-
 srcpkgs/kitemmodels/template                  |     4 +-
 srcpkgs/kitemviews/template                   |     5 +-
 srcpkgs/kitty/patches/musl.patch              |    37 -
 srcpkgs/kitty/template                        |     4 +-
 srcpkgs/kiwix-lib/template                    |     4 +-
 srcpkgs/kiwix-tools/template                  |     6 +-
 srcpkgs/kjobwidgets/template                  |     4 +-
 srcpkgs/kjs/template                          |     4 +-
 srcpkgs/kjsembed/template                     |     8 +-
 srcpkgs/kldap/template                        |     4 +-
 srcpkgs/kmag/template                         |     6 +-
 srcpkgs/kmail-account-wizard/template         |     4 +-
 srcpkgs/kmail/template                        |     6 +-
 srcpkgs/kmailtransport/template               |     4 +-
 srcpkgs/kmbox/template                        |     4 +-
 srcpkgs/kmediaplayer/template                 |     4 +-
 srcpkgs/kmenuedit/template                    |     4 +-
 srcpkgs/kmime/template                        |     4 +-
 srcpkgs/kmix/template                         |     6 +-
 srcpkgs/kmymoney/template                     |     2 +-
 srcpkgs/knewstuff/template                    |     4 +-
 srcpkgs/knights/template                      |     4 +-
 srcpkgs/knot-resolver/files/kresd/run         |     2 +-
 srcpkgs/knot-resolver/template                |     6 +-
 srcpkgs/knot/template                         |     4 +-
 srcpkgs/knotes/template                       |     6 +-
 srcpkgs/knotifications/template               |     4 +-
 srcpkgs/knotifyconfig/template                |     4 +-
 .../kodi-addon-inputstream-adaptive/template  |     4 +-
 srcpkgs/kodi-addon-pvr-iptvsimple/template    |     4 +-
 srcpkgs/kodi-rpi/files/swig.nojava-18.3       |     1 -
 srcpkgs/kodi-rpi/files/swig.nojava-18.4       |     1 +
 srcpkgs/kodi-rpi/files/xbmc-standalone/run    |     1 +
 srcpkgs/kodi-rpi/template                     |     6 +-
 .../AddonModuleXbmc.i.cpp                     |     2 +-
 .../AddonModuleXbmc.i.xml                     | 12232 ++---
 .../AddonModuleXbmcaddon.i.cpp                |     2 +-
 .../AddonModuleXbmcaddon.i.xml                |  1518 +-
 .../AddonModuleXbmcdrm.i.cpp                  |     2 +-
 .../AddonModuleXbmcdrm.i.xml                  |  1492 +-
 .../AddonModuleXbmcgui.i.cpp                  |     2 +-
 .../AddonModuleXbmcgui.i.xml                  | 40730 ++++++++--------
 .../AddonModuleXbmcplugin.i.cpp               |     2 +-
 .../AddonModuleXbmcplugin.i.xml               |  2724 +-
 .../AddonModuleXbmcvfs.i.cpp                  |     2 +-
 .../AddonModuleXbmcvfs.i.xml                  |  2314 +-
 .../AddonModuleXbmcwsgi.i.cpp                 |     2 +-
 .../AddonModuleXbmcwsgi.i.xml                 |  2884 +-
 srcpkgs/kodi/template                         |     4 +-
 srcpkgs/kolourpaint/template                  |    10 +-
 srcpkgs/kompare/template                      |     6 +-
 srcpkgs/konqueror/template                    |     7 +-
 srcpkgs/konquest/template                     |     4 +-
 srcpkgs/konsole/template                      |     4 +-
 srcpkgs/kontact/template                      |     4 +-
 srcpkgs/kontactinterface/template             |     4 +-
 srcpkgs/korganizer/template                   |     6 +-
 srcpkgs/kpackage/template                     |     4 +-
 srcpkgs/kparts/template                       |     4 +-
 srcpkgs/kpartx/template                       |     6 +-
 srcpkgs/kpat/template                         |     8 +-
 srcpkgs/kpeople/template                      |     4 +-
 srcpkgs/kpimtextedit/template                 |     4 +-
 srcpkgs/kplotting/template                    |     7 +-
 srcpkgs/kpty/template                         |     4 +-
 srcpkgs/kqtquickcharts/template               |     4 +-
 srcpkgs/krdc/template                         |     7 +-
 srcpkgs/krfb/template                         |     6 +-
 srcpkgs/krita/patches/musl.patch              |    11 +
 srcpkgs/krita/template                        |     5 +-
 srcpkgs/kross/template                        |     8 +-
 srcpkgs/kruler/template                       |    11 +-
 srcpkgs/krunner/template                      |     4 +-
 srcpkgs/krusader/template                     |     6 +-
 srcpkgs/kscreen/template                      |    10 +-
 srcpkgs/kscreenlocker/template                |     4 +-
 srcpkgs/kservice/template                     |     4 +-
 srcpkgs/ksh/files/LICENSE                     |   229 -
 srcpkgs/ksh/template                          |    27 +-
 srcpkgs/ksmtp/template                        |     4 +-
 srcpkgs/ksnip/patches/useGNUInstallDirs.patch |    10 +
 srcpkgs/ksnip/template                        |    14 +
 srcpkgs/ksolid/template                       |     4 +-
 srcpkgs/ksshaskpass/template                  |     4 +-
 srcpkgs/ksysguard/template                    |     4 +-
 srcpkgs/ksystemlog/template                   |    15 +-
 srcpkgs/kteatime/template                     |    11 +-
 srcpkgs/ktexteditor/template                  |     4 +-
 srcpkgs/ktextwidgets/template                 |     4 +-
 srcpkgs/ktnef/template                        |     6 +-
 srcpkgs/ktouch/template                       |     4 +-
 srcpkgs/ktuberling/template                   |     4 +-
 srcpkgs/kturtle/template                      |     6 +-
 srcpkgs/kubecfg/template                      |     4 +-
 srcpkgs/kubernetes/template                   |     4 +-
 srcpkgs/kunitconversion/template              |     4 +-
 srcpkgs/kvantum/template                      |     4 +-
 srcpkgs/kvirc/template                        |     2 +-
 srcpkgs/kwallet-pam/template                  |     4 +-
 srcpkgs/kwallet/template                      |     4 +-
 srcpkgs/kwalletmanager/template               |    11 +-
 srcpkgs/kwayland-integration/template         |     6 +-
 srcpkgs/kwayland/template                     |     4 +-
 srcpkgs/kwidgetsaddons/template               |     4 +-
 srcpkgs/kwin/template                         |     8 +-
 srcpkgs/kwindowsystem/template                |     4 +-
 srcpkgs/kwrited/template                      |     4 +-
 srcpkgs/kxmlgui/template                      |     4 +-
 srcpkgs/kxmlrpcclient/template                |     4 +-
 srcpkgs/latte-dock/template                   |     4 +-
 srcpkgs/lazarus/template                      |     2 +-
 srcpkgs/lazydocker/template                   |     4 +-
 srcpkgs/lazygit/template                      |     6 +-
 srcpkgs/lbreakouthd/template                  |     4 +-
 srcpkgs/lego/template                         |     7 +-
 srcpkgs/lesspipe/template                     |     8 +-
 srcpkgs/libArcus/template                     |     4 +-
 srcpkgs/libGL/patches/add-glx-use-tls.patch   |    47 -
 srcpkgs/libGL/patches/add-use-elf-tls.patch   |    28 +
 srcpkgs/libGL/patches/musl.patch              |    40 +-
 srcpkgs/libGL/patches/ppc-auxval.patch        |    55 +
 srcpkgs/libGL/template                        |    38 +-
 srcpkgs/libICE/template                       |     7 +-
 srcpkgs/libSM/template                        |     2 +-
 srcpkgs/libSavitar/template                   |     6 +-
 srcpkgs/libX11/template                       |     4 +-
 srcpkgs/libXau/template                       |     2 +-
 srcpkgs/libXcomposite/template                |     2 +-
 srcpkgs/libXcursor/template                   |     2 +-
 srcpkgs/libXdamage/template                   |     2 +-
 srcpkgs/libXext/template                      |     2 +-
 srcpkgs/libXfont2/template                    |     6 +-
 srcpkgs/libXft/template                       |     2 +-
 srcpkgs/libXmu/template                       |     2 +-
 srcpkgs/libXpresent/template                  |     2 +-
 srcpkgs/libXrandr/template                    |     2 +-
 srcpkgs/libXvMC/template                      |     2 +-
 srcpkgs/libXxf86dga/template                  |     2 +-
 srcpkgs/libaacs/template                      |     2 +-
 srcpkgs/libabw/template                       |     6 +-
 srcpkgs/libaom/template                       |     2 +-
 srcpkgs/libappindicator/template              |     4 +-
 srcpkgs/libassuan/template                    |     2 +-
 srcpkgs/libbaseencode/template                |     2 +-
 srcpkgs/libblockdev/template                  |     2 +-
 srcpkgs/libbsd/template                       |    11 +-
 srcpkgs/libbytesize/template                  |     2 +-
 srcpkgs/libcacard/template                    |     2 +-
 srcpkgs/libcap-ng/template                    |     8 +-
 srcpkgs/libclc-git/template                   |     2 +-
 srcpkgs/libcloudproviders/template            |     2 +-
 ...no-include-cxx-headers-from-extern-c.patch |    19 +
 srcpkgs/libcmis/template                      |     2 +-
 srcpkgs/libcotp/template                      |     2 +-
 srcpkgs/libcxx/patches/ppc.patch              |    22 +
 srcpkgs/libcxx/template                       |    25 +-
 srcpkgs/libcxxabi/template                    |    22 +-
 srcpkgs/libdazzle/template                    |     4 +-
 srcpkgs/libdrm/template                       |     2 +-
 srcpkgs/libdwarf/template                     |     4 +-
 srcpkgs/libebml/template                      |     2 +-
 srcpkgs/libfakekey/template                   |     2 +-
 srcpkgs/libfilezilla/template                 |     4 +-
 srcpkgs/libfontenc/template                   |     2 +-
 srcpkgs/libgcrypt/template                    |     7 +-
 srcpkgs/libgdiplus/template                   |     9 +-
 srcpkgs/libgit2-0.27/template                 |    28 -
 srcpkgs/libgit2-0.27/update                   |     3 -
 srcpkgs/libgnome-games-support/template       |     4 +-
 srcpkgs/libgravatar/template                  |     4 +-
 srcpkgs/libgta/template                       |     5 +-
 srcpkgs/libgusb/template                      |     2 +-
 .../patches/conditionalize-gir.patch          |   130 -
 srcpkgs/libgweather/template                  |     4 +-
 srcpkgs/libheif/template                      |     4 +-
 srcpkgs/libhtp/template                       |     2 +-
 srcpkgs/libical/template                      |    22 +-
 srcpkgs/libinput/template                     |     6 +-
 srcpkgs/libite/template                       |     6 +-
 srcpkgs/libjpeg-turbo/template                |     4 +-
 srcpkgs/libkcddb/template                     |    11 +-
 srcpkgs/libkdcraw5/template                   |     4 +-
 srcpkgs/libkdegames/template                  |     4 +-
 srcpkgs/libkdepim/template                    |     6 +-
 srcpkgs/libkexiv25/template                   |     4 +-
 srcpkgs/libkgapi/template                     |     6 +-
 srcpkgs/libkipi5/template                     |     4 +-
 srcpkgs/libkleo/template                      |     4 +-
 srcpkgs/libknet1-devel                        |     1 +
 srcpkgs/libknet1/patches/01_musl_fix.diff     |   210 +
 srcpkgs/libknet1/template                     |    58 +
 srcpkgs/libkomparediff2/template              |    10 +-
 srcpkgs/libksane/template                     |     4 +-
 srcpkgs/libkscreen/template                   |     4 +-
 srcpkgs/libksieve/template                    |     4 +-
 srcpkgs/libksysguard/template                 |     4 +-
 srcpkgs/liblastfm-qt5/template                |     6 +-
 srcpkgs/libllvm9                              |     1 +
 srcpkgs/libluv-devel                          |     1 +
 srcpkgs/libluv/template                       |    37 +
 srcpkgs/libmatroska/template                  |     2 +-
 srcpkgs/libmediainfo/template                 |     4 +-
 srcpkgs/libmicrodns/template                  |     4 +-
 srcpkgs/libmirage/template                    |     6 +-
 srcpkgs/libmpack/template                     |     2 +-
 srcpkgs/libnftnl/template                     |     4 +-
 srcpkgs/libnl3/patches/musl.patch             |    12 -
 srcpkgs/libnl3/template                       |     9 +-
 srcpkgs/libnotify/template                    |    18 +-
 srcpkgs/libnozzle1                            |     1 +
 srcpkgs/libnozzle1-devel                      |     1 +
 srcpkgs/libogg/template                       |    16 +-
 srcpkgs/liboping/template                     |     4 +-
 srcpkgs/libopusenc/template                   |     2 +-
 srcpkgs/libosinfo/template                    |     8 +-
 srcpkgs/libpcap/patches/fix-musl.patch        |    10 -
 srcpkgs/libpcap/template                      |     6 +-
 srcpkgs/libpipeline/template                  |     4 +-
 srcpkgs/libplacebo/template                   |     2 +-
 srcpkgs/libpsl/template                       |     5 +-
 srcpkgs/libpwquality-python3                  |     1 +
 srcpkgs/libpwquality/template                 |    29 +-
 srcpkgs/libqmatrixclient/template             |    11 +-
 srcpkgs/libqtxdg/template                     |     2 +-
 srcpkgs/libratbag/template                    |     8 +-
 srcpkgs/libraw/template                       |     4 +-
 srcpkgs/librdkafka/template                   |     4 +-
 srcpkgs/libreoffice/template                  |     5 +
 srcpkgs/librime/template                      |     4 +-
 srcpkgs/libsass/template                      |     3 +-
 srcpkgs/libsidplayfp/template                 |     4 +-
 srcpkgs/libsigsegv/patches/ppc-musl.patch     |    16 +
 srcpkgs/libsmbios/template                    |     2 +-
 srcpkgs/libtickit/template                    |     2 +-
 srcpkgs/libu2f-host/template                  |    10 +-
 srcpkgs/liburcu/template                      |     4 +-
 srcpkgs/liburing-devel                        |     1 +
 srcpkgs/liburing/template                     |    25 +
 srcpkgs/libuv/template                        |     4 +-
 srcpkgs/libva/template                        |    13 +-
 srcpkgs/libvarnishapi                         |     1 +
 srcpkgs/libvarnishapi-devel                   |     1 +
 srcpkgs/libversion/template                   |     6 +-
 srcpkgs/libvirt-python/template               |     6 +-
 srcpkgs/libvirt/template                      |    19 +-
 srcpkgs/libvoikko/template                    |     2 +-
 srcpkgs/libvpx5/template                      |     6 +
 srcpkgs/libvterm/template                     |    10 +-
 srcpkgs/libwaylandpp/template                 |     2 +-
 srcpkgs/libwebp/template                      |     2 +-
 srcpkgs/libxcb/template                       |     2 +-
 srcpkgs/libxfce4panel                         |     1 +
 srcpkgs/libxkbcommon/template                 |     2 +-
 srcpkgs/libxmlb/template                      |     2 +-
 srcpkgs/libxo/template                        |     2 +-
 srcpkgs/libyaml/template                      |     2 +-
 srcpkgs/libzim/template                       |     4 +-
 srcpkgs/libzip/template                       |     2 +-
 srcpkgs/licensechecker/template               |     2 +-
 srcpkgs/licensor/template                     |    15 +
 srcpkgs/lightsoff/template                    |     6 +-
 srcpkgs/lightzone/template                    |     2 +-
 srcpkgs/links-x11/template                    |     6 +-
 srcpkgs/links/template                        |     6 +-
 srcpkgs/linux-driver-management/template      |     2 +-
 srcpkgs/linux-firmware/template               |     7 +-
 srcpkgs/linux-tools/patches/musl.patch        |     3 +-
 srcpkgs/linux-tools/patches/turbostat.patch   |    20 -
 srcpkgs/linux-tools/template                  |     6 +-
 srcpkgs/linux/template                        |     6 +-
 srcpkgs/linux3.16/template                    |     4 +-
 srcpkgs/linux4.14/template                    |     4 +-
 srcpkgs/linux4.19/template                    |     4 +-
 srcpkgs/linux4.4/files/i386-dotconfig         |     3 +-
 srcpkgs/linux4.4/files/x86_64-dotconfig       |     3 +-
 srcpkgs/linux4.4/patches/gcc9.patch           |    18 -
 srcpkgs/linux4.4/template                     |     4 +-
 srcpkgs/linux4.9/files/arm64-dotconfig        |     3 +-
 srcpkgs/linux4.9/template                     |     4 +-
 srcpkgs/linux5.1-dbg                          |     1 -
 srcpkgs/linux5.1-headers                      |     1 -
 srcpkgs/linux5.2/files/x86_64-dotconfig       |     2 +-
 srcpkgs/linux5.2/template                     |     4 +-
 srcpkgs/linux5.3-dbg                          |     1 +
 srcpkgs/linux5.3-headers                      |     1 +
 .../files/DocBook/Makefile                    |     0
 .../files/arm-dotconfig                       |   749 +-
 .../files/arm64-dotconfig                     |   899 +-
 .../files/i386-dotconfig                      |   811 +-
 srcpkgs/{linux5.1 => linux5.3}/files/mv-debug |     0
 .../files/ppc-dotconfig                       |   620 +-
 .../files/ppc64-dotconfig                     |   765 +-
 .../files/ppc64le-dotconfig                   |   753 +-
 .../files/x86_64-dotconfig                    |   845 +-
 .../patches/ppc64-be-elfv2.patch              |     0
 .../patches/smsc95xx-mac.patch                |     0
 srcpkgs/{linux5.1 => linux5.3}/template       |    19 +-
 srcpkgs/lld                                   |     2 +-
 srcpkgs/lld-devel                             |     2 +-
 srcpkgs/lldb                                  |     2 +-
 srcpkgs/lldb-devel                            |     2 +-
 srcpkgs/llvm-libunwind/patches/ppc32.patch    |    63 +
 srcpkgs/llvm-libunwind/template               |     8 +-
 srcpkgs/llvm/template                         |     7 +-
 .../patches/llvm/llvm-003-secureplt.patch     |   164 +-
 srcpkgs/llvm8/template                        |   174 +-
 srcpkgs/llvm9/files/llvm-Config-config.h      |     9 +
 srcpkgs/llvm9/files/llvm-Config-llvm-config.h |     9 +
 .../cfe-001-fix-unwind-chain-inclusion.patch  |    44 +
 .../cfe/cfe-002-add-musl-triples.patch        |    91 +
 .../cfe-003-ppc64-dynamic-linker-path.patch   |    18 +
 .../cfe/cfe-004-ppc64-musl-elfv2.patch        |    27 +
 .../files/patches/cfe/cfe-005-gcc9.patch      |    40 +
 srcpkgs/llvm9/files/patches/lldb/musl.patch   |    31 +
 .../files/patches/llvm/llvm-001-musl.patch    |    58 +
 .../llvm/llvm-002-musl-ppc64-elfv2.patch      |    31 +
 .../patches/llvm/llvm-003-secureplt.patch     |   130 +
 .../patches/llvm/llvm-004-override-opt.patch  |    18 +
 srcpkgs/llvm9/template                        |   283 +
 srcpkgs/llvm9/update                          |     2 +
 srcpkgs/logrotate/template                    |     5 +-
 srcpkgs/lok/template                          |     2 +-
 srcpkgs/lollypop/template                     |     6 +-
 srcpkgs/lowdown/patches/stdint_h.patch        |    30 -
 srcpkgs/lowdown/template                      |     4 +-
 srcpkgs/lprng/files/lprng/run                 |     4 +
 srcpkgs/lprng/template                        |    24 +
 srcpkgs/lsd/template                          |    12 +
 srcpkgs/lsyncd/files/lsyncd/log/run           |     2 +
 srcpkgs/lsyncd/files/lsyncd/run               |     3 +-
 srcpkgs/lsyncd/template                       |     4 +-
 srcpkgs/lttng-modules-dkms/template           |     6 +-
 srcpkgs/lttng-tools/template                  |     4 +-
 srcpkgs/lttng-ust/template                    |     4 +-
 srcpkgs/luaposix/template                     |    10 +-
 srcpkgs/luasec/template                       |     4 +-
 srcpkgs/lutris/template                       |     4 +-
 srcpkgs/lxqt-themes/template                  |     2 +-
 srcpkgs/lyx/template                          |     8 +-
 srcpkgs/lz4/template                          |     4 +-
 srcpkgs/magic-wormhole/template               |    21 +
 srcpkgs/mailcommon/template                   |     8 +-
 srcpkgs/mailimporter/template                 |     4 +-
 srcpkgs/maim/template                         |     2 +-
 srcpkgs/makedepend/template                   |     2 +-
 srcpkgs/mame/template                         |     4 +-
 srcpkgs/man-db/template                       |    20 +-
 srcpkgs/man-pages/template                    |     4 +-
 srcpkgs/manuskript/template                   |     4 +-
 srcpkgs/marble5/template                      |     9 +-
 srcpkgs/marco/template                        |     8 +-
 .../mariadb/patches/force-c11-atomics.patch   |   294 +
 srcpkgs/mariadb/patches/libatomic.patch       |   103 +
 srcpkgs/mariadb/patches/musl-ppc.patch        |    27 +
 srcpkgs/mariadb/template                      |    19 +-
 srcpkgs/mate-control-center/template          |     2 +-
 srcpkgs/mate-menus/template                   |    20 +-
 srcpkgs/mate-panel/template                   |     6 +-
 srcpkgs/mate-screensaver/template             |    10 +-
 srcpkgs/mate-tweak/template                   |     7 +-
 srcpkgs/mathcomp/template                     |     2 +-
 srcpkgs/mathjax/template                      |     8 +-
 srcpkgs/maxima/template                       |    13 +-
 srcpkgs/mc/template                           |     2 +-
 srcpkgs/mdevd/template                        |     6 +-
 srcpkgs/mediainfo/template                    |     4 +-
 srcpkgs/megazeux/template                     |     4 +-
 srcpkgs/menumaker/template                    |    10 +-
 srcpkgs/menutray/template                     |     6 +-
 srcpkgs/mercurial/template                    |     4 +-
 srcpkgs/meson/template                        |     9 +-
 srcpkgs/messagelib/template                   |     6 +-
 srcpkgs/mftrace/patches/gf2pbm.1.patch        |    11 +
 srcpkgs/mftrace/template                      |     8 +-
 srcpkgs/mgba/template                         |     4 +-
 srcpkgs/miller/template                       |     8 +-
 srcpkgs/milou/template                        |     6 +-
 srcpkgs/miniflux/template                     |     4 +-
 srcpkgs/minify/template                       |     4 +-
 srcpkgs/minijail/template                     |    23 +
 srcpkgs/minikube/template                     |     2 +-
 srcpkgs/minio/template                        |     7 +-
 srcpkgs/minitalk/template                     |    14 +-
 srcpkgs/mkchromecast/template                 |     2 +-
 srcpkgs/mkfontscale/template                  |     2 +-
 srcpkgs/mkinitcpio/template                   |     6 +-
 srcpkgs/mkpasswd                              |     1 +
 srcpkgs/mkvtoolnix/template                   |     4 +-
 srcpkgs/mmark/template                        |     4 +-
 srcpkgs/modemmanager-qt5/template             |     4 +-
 srcpkgs/modsecurity/template                  |     2 +-
 srcpkgs/mongoose/template                     |     6 +-
 srcpkgs/mono/patches/fix-heapviz-import.patch |    11 +
 srcpkgs/mono/patches/musl.patch               |    11 +
 srcpkgs/mono/template                         |     9 +-
 srcpkgs/monolith/template                     |    22 +
 srcpkgs/moserial/template                     |    14 +
 srcpkgs/mozo/template                         |     8 +-
 srcpkgs/mpDris2/files/mpDris2/run             |     2 +
 srcpkgs/mpDris2/template                      |    25 +
 srcpkgs/mpc/template                          |     2 +-
 srcpkgs/mpd/template                          |    11 +-
 srcpkgs/mpdcron/template                      |     2 +-
 srcpkgs/mpg123/template                       |     4 +-
 srcpkgs/mplayer/template                      |     2 +
 srcpkgs/mpop/template                         |     4 +-
 srcpkgs/msbuild-bin/template                  |     6 +-
 srcpkgs/msgpack/template                      |     6 +-
 srcpkgs/msmtp/template                        |     6 +-
 srcpkgs/mtm/template                          |    23 +
 srcpkgs/muffin/template                       |     4 +-
 .../patches/link-overlay-against-libGL.patch  |    22 +-
 srcpkgs/mumble/patches/musl-dlsym.patch       |    30 -
 srcpkgs/mumble/patches/protobuf-370.patch     |   758 -
 .../mumble/patches/speech-dispatcher.patch    |    11 -
 srcpkgs/mumble/patches/std-float.patch        |    11 -
 srcpkgs/mumble/template                       |    50 +-
 srcpkgs/musikcube/template                    |     4 +-
 srcpkgs/mutt/template                         |     8 +-
 .../mutter/patches/meta-renderer-x11.patch    |    17 -
 srcpkgs/mutter/template                       |    14 +-
 srcpkgs/mymcplus/template                     |    15 +
 srcpkgs/mysql++/template                      |    10 +-
 srcpkgs/namecoin/template                     |     6 +-
 srcpkgs/nano/template                         |     7 +-
 srcpkgs/nasa-wallpaper/template               |     4 +-
 srcpkgs/nautilus/template                     |     4 +-
 srcpkgs/nbd/template                          |     4 +-
 srcpkgs/ncdc/template                         |     6 +-
 srcpkgs/ncmpc/template                        |     4 +-
 srcpkgs/ndctl/template                        |     6 +-
 srcpkgs/neatvi/template                       |     6 +-
 srcpkgs/nemo-fileroller/template              |     6 +-
 srcpkgs/nemo/template                         |     8 +-
 srcpkgs/neofetch/template                     |     4 +-
 srcpkgs/neovim-remote/template                |     4 +-
 srcpkgs/neovim/template                       |     9 +-
 srcpkgs/nerd-fonts/template                   |     2 +-
 srcpkgs/netcdf/template                       |     4 +-
 .../netpbm/files/netpbm-security-code.patch   |    69 -
 srcpkgs/netpbm/template                       |    10 +-
 srcpkgs/nettle/template                       |     6 +-
 srcpkgs/networkmanager-qt5/template           |     4 +-
 srcpkgs/newsboat/template                     |     8 +-
 srcpkgs/next/template                         |    21 +
 srcpkgs/nftables/template                     |     9 +-
 srcpkgs/ngspice/template                      |     6 +-
 srcpkgs/nilfs-utils/patches/max-input.patch   |    12 -
 srcpkgs/nilfs-utils/patches/rpc-types.patch   |    11 -
 srcpkgs/nilfs-utils/template                  |     8 +-
 srcpkgs/nim/template                          |    28 +-
 srcpkgs/ninja/template                        |     2 +-
 srcpkgs/nix/template                          |     2 +-
 srcpkgs/nnn/template                          |     4 +-
 srcpkgs/nodejs-lts/patches/ppc32.patch        |    25 +
 srcpkgs/nodejs-lts/template                   |     6 +
 srcpkgs/nodejs/patches/ppc32.patch            |     8 +-
 srcpkgs/nodejs/template                       |     9 +-
 srcpkgs/nomad/template                        |     6 +-
 srcpkgs/nootka/template                       |     6 +-
 srcpkgs/notify-send.sh/template               |     2 +-
 srcpkgs/nsd/template                          |     4 +-
 srcpkgs/nsjail/template                       |    10 +-
 srcpkgs/nspr/template                         |     4 +-
 srcpkgs/nss/template                          |     6 +-
 srcpkgs/nsss/template                         |     6 +-
 srcpkgs/numactl/template                      |     6 +-
 srcpkgs/nvidia/template                       |     8 +-
 srcpkgs/nvidia340/files/kernel-5.0.patch      |    44 +
 srcpkgs/nvidia340/template                    |     4 +-
 .../nvidia390/files/kernel-5.1-x86_64.patch   |    29 -
 srcpkgs/nvidia390/files/kernel-5.1.patch      |   102 -
 .../nvidia390/files/kernel-5.2-x86_64.patch   |    18 -
 srcpkgs/nvidia390/template                    |    26 +-
 srcpkgs/nvme-cli/INSTALL                      |    12 +
 srcpkgs/nvme-cli/REMOVE                       |     8 +
 srcpkgs/nvme-cli/template                     |    18 +-
 srcpkgs/oblibs/template                       |     6 +-
 srcpkgs/obs/template                          |     4 +-
 srcpkgs/ocaml-findlib/template                |    10 +-
 srcpkgs/ocaml-lablgtk2/template               |     2 +-
 srcpkgs/ocaml-num/template                    |     2 +-
 srcpkgs/ocaml/template                        |     4 +-
 srcpkgs/ocamlbuild/template                   |     2 +-
 srcpkgs/occt/files/opencascade.sh             |    24 +
 srcpkgs/occt/patches/musl-fenv.patch          |    55 +-
 srcpkgs/occt/template                         |     9 +-
 srcpkgs/offlineimap/template                  |    10 +-
 srcpkgs/ofono/template                        |     8 +-
 srcpkgs/ok.sh/template                        |     2 +-
 srcpkgs/okular/template                       |     4 +-
 srcpkgs/olive/template                        |     4 +-
 srcpkgs/olm-python/template                   |     4 +-
 srcpkgs/olm/template                          |     4 +-
 srcpkgs/onionshare/template                   |     9 +-
 srcpkgs/opam/template                         |     2 +-
 srcpkgs/open-iscsi/patches/ether.patch        |    10 -
 srcpkgs/open-iscsi/patches/fix-musl-2.patch   |    10 -
 srcpkgs/open-iscsi/template                   |    20 +-
 srcpkgs/open-vm-tools/patches/gcc9.patch      |   103 -
 srcpkgs/open-vm-tools/template                |    20 +-
 srcpkgs/openbsd-netcat/template               |     8 +-
 srcpkgs/openconnect/template                  |     4 +-
 srcpkgs/opendkim/files/opendkim/run           |     3 +
 srcpkgs/opendkim/template                     |     7 +-
 srcpkgs/openldap/template                     |     3 +-
 srcpkgs/openmw/template                       |     5 +-
 srcpkgs/openresolv/template                   |     4 +-
 srcpkgs/openssh/patches/setproctitle.patch    |    10 -
 srcpkgs/openssh/template                      |     7 +-
 srcpkgs/opentmpfiles/template                 |     2 +-
 srcpkgs/openttd/template                      |     6 +-
 srcpkgs/opera/template                        |     4 +-
 srcpkgs/opus/template                         |     2 +-
 srcpkgs/orage/template                        |     2 +-
 srcpkgs/orca/template                         |     6 +-
 srcpkgs/ortp/template                         |     2 +-
 srcpkgs/osg/template                          |     2 +-
 srcpkgs/osinfo-db-tools/template              |     8 +-
 srcpkgs/osinfo-db/template                    |     6 +-
 srcpkgs/oxipng/template                       |     4 +-
 srcpkgs/oxygen-icons5/template                |     4 +-
 srcpkgs/oxygen/template                       |     4 +-
 srcpkgs/p11-kit/template                      |     4 +-
 srcpkgs/packer/template                       |     6 +-
 srcpkgs/palapeli/template                     |     4 +-
 srcpkgs/pam_rundir/patches/fix.patch          |    40 +
 srcpkgs/pam_rundir/template                   |     4 +-
 srcpkgs/pam_ssh/template                      |     6 +-
 srcpkgs/papi/patches/gnu_source.patch         |    12 +
 srcpkgs/papi/template                         |     7 +-
 srcpkgs/papirus-icon-theme/template           |     4 +-
 srcpkgs/parallel/template                     |     4 +-
 srcpkgs/paraview/template                     |    63 +
 srcpkgs/parted/patches/fix-glibc-2.27.patch   |    42 -
 srcpkgs/parted/patches/fix-includes.patch     |    10 -
 srcpkgs/parted/template                       |     6 +-
 srcpkgs/passphrase2pgp/template               |    13 +
 srcpkgs/pastel/template                       |    15 +
 srcpkgs/patchelf/template                     |     2 +-
 srcpkgs/pax/template                          |     4 +-
 srcpkgs/pcmanfm-qt/template                   |     3 +-
 srcpkgs/pd/patches/fix-musl.patch             |    15 +
 srcpkgs/pd/template                           |    10 +-
 srcpkgs/pdd/template                          |     2 +-
 srcpkgs/pdfcrack/template                     |     4 +-
 srcpkgs/pdsh/patches/fix_configure_ac.patch   |    18 +
 srcpkgs/pdsh/template                         |    40 +
 srcpkgs/peaclock/template                     |     8 +-
 srcpkgs/peek/template                         |    11 +-
 srcpkgs/pelican/template                      |     6 +-
 srcpkgs/perl-ACL-Lite/template                |     2 +-
 srcpkgs/perl-Alien-Build/template             |     6 +-
 srcpkgs/perl-Archive-Zip/template             |     8 +-
 srcpkgs/perl-Barcode-ZBar/template            |     4 +-
 srcpkgs/perl-Bit-Vector/template              |     2 +-
 srcpkgs/perl-CPAN-Meta-Check/template         |     2 +-
 srcpkgs/perl-Cairo-GObject/template           |     6 +-
 srcpkgs/perl-Cairo/template                   |    10 +-
 srcpkgs/perl-Carp-Clan/template               |     4 +-
 srcpkgs/perl-Class-Method-Modifiers/template  |     8 +-
 srcpkgs/perl-Class-XSAccessor/template        |     4 +-
 srcpkgs/perl-Clone-Choose/template            |     2 +-
 srcpkgs/perl-Clone-PP/template                |     2 +-
 srcpkgs/perl-Clone/template                   |     2 +-
 srcpkgs/perl-Config-Simple/template           |     2 +-
 srcpkgs/perl-Crypt-Blowfish/template          |     2 +-
 srcpkgs/perl-Crypt-CAST5/template             |     2 +-
 srcpkgs/perl-Crypt-DES/template               |     2 +-
 srcpkgs/perl-Crypt-IDEA/template              |     2 +-
 srcpkgs/perl-Crypt-OpenSSL-Bignum/template    |     2 +-
 srcpkgs/perl-Crypt-OpenSSL-Guess/template     |     2 +-
 srcpkgs/perl-Crypt-OpenSSL-RSA/template       |     2 +-
 srcpkgs/perl-Crypt-OpenSSL-Random/template    |     2 +-
 srcpkgs/perl-Crypt-Rijndael/template          |     8 +-
 srcpkgs/perl-CryptX/template                  |     2 +-
 srcpkgs/perl-Curses-UI/template               |    15 +
 srcpkgs/perl-Curses/template                  |     4 +-
 srcpkgs/perl-DBD-Pg/template                  |    12 +-
 srcpkgs/perl-DBD-SQLite/template              |     2 +-
 srcpkgs/perl-DBD-mysql/template               |     2 +-
 srcpkgs/perl-DBI/template                     |     2 +-
 srcpkgs/perl-Danga-Socket/template            |     2 +-
 srcpkgs/perl-Data-MessagePack/template        |     4 +-
 srcpkgs/perl-Data-Section-Simple/template     |     2 +-
 srcpkgs/perl-Data-UUID/template               |     2 +-
 srcpkgs/perl-Date-Manip/template              |     4 +-
 srcpkgs/perl-DateTime-TimeZone/template       |     4 +-
 srcpkgs/perl-DateTime/template                |     8 +-
 srcpkgs/perl-Devel-Caller/template            |     2 +-
 srcpkgs/perl-Devel-LexAlias/template          |     4 +-
 srcpkgs/perl-Digest-SHA1/template             |     2 +-
 srcpkgs/perl-Email-Address-XS/template        |     4 +-
 srcpkgs/perl-Email-Date-Format/template       |     2 +-
 srcpkgs/perl-Email-MIME-ContentType/template  |     2 +-
 srcpkgs/perl-Email-MIME-Encodings/template    |     2 +-
 srcpkgs/perl-Email-MIME/template              |     2 +-
 srcpkgs/perl-Email-MessageID/template         |     2 +-
 srcpkgs/perl-Email-Simple/template            |     2 +-
 srcpkgs/perl-FFI-CheckLib/template            |     6 +-
 srcpkgs/perl-File-BaseDir/template            |     2 +-
 srcpkgs/perl-File-Copy-Recursive/template     |     6 +-
 srcpkgs/perl-File-Find-Rule/template          |     2 +-
 srcpkgs/perl-File-Flock-Retry/template        |     2 +-
 srcpkgs/perl-File-Slurp/template              |     6 +-
 srcpkgs/perl-File-Slurper/template            |     2 +-
 srcpkgs/perl-File-Write-Rotate/template       |     8 +-
 srcpkgs/perl-File-chdir/template              |     2 +-
 srcpkgs/perl-File-pushd/template              |     2 +-
 srcpkgs/perl-Filesys-Df/template              |     2 +-
 srcpkgs/perl-Filesys-Notify-Simple/template   |     2 +-
 srcpkgs/perl-Fuse/template                    |     2 +-
 srcpkgs/perl-Getopt-Compact/template          |     2 +-
 .../perl-Glib-Object-Introspection/template   |     2 +-
 srcpkgs/perl-Glib/template                    |     4 +-
 srcpkgs/perl-Goo-Canvas/template              |     2 +-
 srcpkgs/perl-Gtk2-ImageView/template          |     2 +-
 srcpkgs/perl-Gtk2-Notify/template             |     2 +-
 srcpkgs/perl-Gtk2/template                    |     8 +-
 srcpkgs/perl-Gtk3/template                    |     4 +-
 srcpkgs/perl-HTML-Form/template               |     4 +-
 srcpkgs/perl-HTML-Parser/template             |     2 +-
 srcpkgs/perl-HTML-Tree/template               |     2 +-
 srcpkgs/perl-HTTP-Daemon/template             |     4 +-
 srcpkgs/perl-IO-HTML/template                 |     2 +-
 srcpkgs/perl-IO-SessionData/template          |     2 +-
 srcpkgs/perl-IO-Tty/template                  |     2 +-
 srcpkgs/perl-IPC-System-Simple/template       |     2 +-
 srcpkgs/perl-Image-Sane/template              |     6 +-
 srcpkgs/perl-Importer/template                |     2 +-
 srcpkgs/perl-Inline-C/template                |     6 +-
 srcpkgs/perl-Inline/template                  |     6 +-
 srcpkgs/perl-JSON-XS/template                 |     2 +-
 srcpkgs/perl-LWP-MediaTypes/template          |     2 +-
 srcpkgs/perl-Lchown/template                  |     4 +-
 srcpkgs/perl-Linux-Inotify2/template          |     2 +-
 srcpkgs/perl-List-MoreUtils-XS/template       |     2 +-
 srcpkgs/perl-Locale-gettext/template          |     2 +-
 srcpkgs/perl-MP3-Tag/template                 |    10 +-
 srcpkgs/perl-Mail-Box/template                |     4 +-
 srcpkgs/perl-Mail-DKIM/template               |     4 +-
 srcpkgs/perl-Mail-Message/template            |     2 +-
 srcpkgs/perl-Mail-POP3Client/template         |     2 +-
 srcpkgs/perl-Mail-Sendmail/template           |     2 +-
 srcpkgs/perl-Mail-Transport/template          |     6 +-
 srcpkgs/perl-Math-BigInt-GMP/template         |     6 +-
 srcpkgs/perl-Math-FFT/template                |    15 +
 srcpkgs/perl-Math-Prime-Util-GMP/template     |     2 +-
 srcpkgs/perl-Math-Prime-Util/template         |     2 +-
 srcpkgs/perl-Module-Pluggable/template        |     2 +-
 srcpkgs/perl-Mojolicious/template             |     5 +-
 srcpkgs/perl-Monkey-Patch-Action/template     |     2 +-
 srcpkgs/perl-Moo/template                     |     2 +-
 srcpkgs/perl-MusicBrainz-DiscID/template      |     2 +-
 srcpkgs/perl-Net-DBus/template                |     2 +-
 srcpkgs/perl-Net-DNS-Resolver-Mock/template   |     2 +-
 srcpkgs/perl-Net-IMAP-Client/template         |     2 +-
 srcpkgs/perl-Net-IMAP-Simple/template         |     2 +-
 srcpkgs/perl-Net-MPD/template                 |     2 +-
 srcpkgs/perl-Net-SSH2/template                |     2 +-
 srcpkgs/perl-Net-SSLeay/template              |     2 +-
 srcpkgs/perl-NetAddr-IP/template              |     2 +-
 srcpkgs/perl-Number-Compare/template          |     2 +-
 srcpkgs/perl-Object-MultiType/template        |     2 +-
 srcpkgs/perl-OpenGL/template                  |     2 +-
 srcpkgs/perl-PDF-API2/template                |     4 +-
 srcpkgs/perl-Package-Stash-XS/template        |     2 +-
 srcpkgs/perl-PadWalker/template               |     2 +-
 srcpkgs/perl-Pango/template                   |     2 +-
 srcpkgs/perl-Params-Util/template             |     2 +-
 srcpkgs/perl-Parse-RecDescent/template        |     2 +-
 srcpkgs/perl-PatchReader/template             |     2 +-
 srcpkgs/perl-Pegex/template                   |     2 +-
 srcpkgs/perl-Pod-Simple-Text-Termcap/template |     2 +-
 srcpkgs/perl-Proc-Daemontools/template        |     2 +-
 srcpkgs/perl-Proc-Govern/template             |     8 +-
 srcpkgs/perl-Proc-PID-File/template           |     2 +-
 srcpkgs/perl-Proc-ProcessTable/template       |     2 +-
 srcpkgs/perl-Ref-Util-XS/template             |     2 +-
 srcpkgs/perl-Regexp-Grammars/template         |     6 +-
 srcpkgs/perl-Role-Tiny/template               |     4 +-
 srcpkgs/perl-SUPER/template                   |     8 +-
 srcpkgs/perl-Scope-Guard/template             |     2 +-
 srcpkgs/perl-Search-Xapian/template           |     2 +-
 srcpkgs/perl-Socket-MsgHdr/template           |     4 +-
 srcpkgs/perl-Socket6/template                 |     2 +-
 srcpkgs/perl-Spiffy/template                  |     2 +-
 srcpkgs/perl-Sub-Delete/template              |     2 +-
 srcpkgs/perl-Sub-Identify/template            |     2 +-
 srcpkgs/perl-Sub-Info/template                |     2 +-
 srcpkgs/perl-Sub-Name/template                |    10 +-
 srcpkgs/perl-Sub-Quote/template               |     6 +-
 srcpkgs/perl-Svsh/template                    |     2 +-
 srcpkgs/perl-Sys-Syscall/template             |     2 +-
 srcpkgs/perl-Taint-Runtime/template           |     4 +-
 srcpkgs/perl-Template-Toolkit/template        |     2 +-
 srcpkgs/perl-Term-ExtendedColor/template      |     6 +-
 srcpkgs/perl-Term-ReadKey/template            |     2 +-
 srcpkgs/perl-Term-ReadLine-Gnu/template       |     2 +-
 srcpkgs/perl-Term-Table/template              |     6 +-
 srcpkgs/perl-Test-Base/template               |     2 +-
 srcpkgs/perl-Test-CPAN-Meta/template          |     2 +-
 srcpkgs/perl-Test-Class/template              |     2 +-
 srcpkgs/perl-Test-Cmd/template                |     2 +-
 srcpkgs/perl-Test-Command/template            |     2 +-
 srcpkgs/perl-Test-Deep/template               |     2 +-
 srcpkgs/perl-Test-FailWarnings/template       |     2 +-
 srcpkgs/perl-Test-File-ShareDir/template      |     2 +-
 srcpkgs/perl-Test-File/template               |     2 +-
 srcpkgs/perl-Test-HTTP-Server-Simple/template |     2 +-
 srcpkgs/perl-Test-Inter/template              |     2 +-
 srcpkgs/perl-Test-LeakTrace/template          |     4 +-
 srcpkgs/perl-Test-MockModule/template         |     2 +-
 srcpkgs/perl-Test-Most/template               |     2 +-
 srcpkgs/perl-Test-Needs/template              |     2 +-
 srcpkgs/perl-Test-Output/template             |     2 +-
 srcpkgs/perl-Test-Requires/template           |     2 +-
 srcpkgs/perl-Test-RequiresInternet/template   |     2 +-
 srcpkgs/perl-Test-SharedFork/template         |     2 +-
 srcpkgs/perl-Test-Simple/template             |     6 +-
 srcpkgs/perl-Test-Subroutines/template        |     2 +-
 srcpkgs/perl-Test-TCP/template                |     4 +-
 srcpkgs/perl-Test-Warn/template               |     2 +-
 srcpkgs/perl-Test-Warnings/template           |    10 +-
 srcpkgs/perl-Test-Weaken/template             |     2 +-
 srcpkgs/perl-Test-Without-Module/template     |     2 +-
 srcpkgs/perl-Test-YAML/template               |     2 +-
 srcpkgs/perl-Test-utf8/template               |     2 +-
 srcpkgs/perl-Test2-Plugin-NoWarnings/template |     8 +-
 srcpkgs/perl-Test2-Suite/template             |     6 +-
 srcpkgs/perl-Text-Aligner/template            |     2 +-
 srcpkgs/perl-Text-Bidi/template               |     2 +-
 srcpkgs/perl-Text-CharWidth/template          |     2 +-
 srcpkgs/perl-Text-Markdown/template           |     2 +-
 srcpkgs/perl-Text-Table/template              |     2 +-
 srcpkgs/perl-Text-XLogfile/template           |     2 +-
 srcpkgs/perl-Time-modules/template            |     2 +-
 srcpkgs/perl-Tk/template                      |     2 +-
 srcpkgs/perl-Unicode-LineBreak/template       |     2 +-
 srcpkgs/perl-Unicode-String/template          |     2 +-
 srcpkgs/perl-Unix-Mknod/template              |     4 +-
 srcpkgs/perl-Unix-Uptime/template             |     2 +-
 srcpkgs/perl-Variable-Magic/template          |     2 +-
 srcpkgs/perl-WL/template                      |     2 +-
 .../perl-WWW-Curl/patches/CURL_STRICTER.patch |    32 -
 .../perl-WWW-Curl/patches/curl-7.50.2.patch   |    24 +
 srcpkgs/perl-WWW-Curl/template                |     2 +-
 srcpkgs/perl-WWW-Mechanize/template           |     6 +-
 srcpkgs/perl-XML-LibXML/template              |     2 +-
 srcpkgs/perl-XML-Parser-Lite/template         |     2 +-
 srcpkgs/perl-XML-Parser/template              |    10 +-
 srcpkgs/perl-XML-Smart/template               |     2 +-
 srcpkgs/perl-YAML-LibYAML/template            |     8 +-
 srcpkgs/perl-namespace-autoclean/template     |    10 +-
 srcpkgs/perl-pcsc/template                    |     2 +-
 srcpkgs/perl-strictures/template              |     9 +-
 srcpkgs/perl-tainting/template                |     2 +-
 srcpkgs/perl/patches/cleanup-paths.diff       |    20 +-
 srcpkgs/perl/template                         |   100 +-
 srcpkgs/peru/template                         |    20 +
 srcpkgs/pfetch/template                       |    16 +
 srcpkgs/pgbackrest/template                   |     2 +-
 srcpkgs/pgbouncer/template                    |     4 +-
 srcpkgs/pgweb/template                        |     4 +-
 srcpkgs/phonon-qt5/template                   |     9 +-
 srcpkgs/php/template                          |     6 +-
 srcpkgs/picard/template                       |     4 +-
 srcpkgs/pidgin-sipe/template                  |     6 +-
 srcpkgs/pijul/patches/bindgen.patch           |    19 +-
 srcpkgs/pijul/template                        |    13 +-
 srcpkgs/pim-data-exporter/template            |     6 +-
 srcpkgs/pimcommon/template                    |     6 +-
 srcpkgs/pinentry-dmenu/template               |     2 +-
 srcpkgs/pioneer/template                      |     4 +-
 srcpkgs/pioneer/update                        |     1 +
 srcpkgs/piper/template                        |     2 +-
 srcpkgs/pipewire/template                     |     5 +-
 srcpkgs/pithos/template                       |     8 +-
 srcpkgs/pixman/template                       |     2 +-
 srcpkgs/pkgtop/template                       |    18 +
 srcpkgs/plantuml/template                     |     5 +-
 srcpkgs/plasma-browser-integration/template   |     7 +-
 srcpkgs/plasma-desktop/template               |     4 +-
 srcpkgs/plasma-framework/template             |     4 +-
 srcpkgs/plasma-integration/template           |     4 +-
 srcpkgs/plasma-nm/template                    |     4 +-
 srcpkgs/plasma-pa/template                    |     4 +-
 srcpkgs/plasma-sdk/template                   |     4 +-
 srcpkgs/plasma-thunderbolt/template           |    19 +
 srcpkgs/plasma-vault/template                 |     4 +-
 srcpkgs/plasma-workspace-wallpapers/template  |     4 +-
 srcpkgs/plasma-workspace/template             |     7 +-
 srcpkgs/plata-theme/INSTALL.msg               |     3 +
 srcpkgs/plata-theme/template                  |     9 +-
 srcpkgs/pluma/template                        |     4 +-
 srcpkgs/pmbootstrap/template                  |     8 +-
 srcpkgs/png++/patches/musl-error.patch        |    11 -
 srcpkgs/png++/template                        |     4 +-
 srcpkgs/poco/template                         |     6 +-
 srcpkgs/podman/template                       |     4 +-
 srcpkgs/poedit/patches/LearnMoreLink.patch    |    21 -
 srcpkgs/poedit/template                       |     6 +-
 srcpkgs/poezio/template                       |     6 +-
 srcpkgs/poezio/update                         |     1 +
 srcpkgs/polkit-kde-agent/template             |     4 +-
 srcpkgs/polygen/template                      |     2 +-
 srcpkgs/ponyc/template                        |     4 +-
 srcpkgs/poppler-qt5/template                  |     4 +-
 srcpkgs/poppler/template                      |     4 +-
 srcpkgs/portage/template                      |     4 +-
 srcpkgs/postfix/template                      |     6 +-
 .../postgis-2.5.3-PROTOCC_VERSION.patch       |    13 +
 srcpkgs/postgis/template                      |     6 +-
 srcpkgs/postgis/update                        |     1 +
 srcpkgs/postgresql/template                   |     2 +-
 srcpkgs/potrace/template                      |     4 +-
 srcpkgs/powerdevil/template                   |     4 +-
 srcpkgs/powertop/template                     |    11 +-
 srcpkgs/ppsspp/template                       |    18 +-
 srcpkgs/praat/template                        |     4 +-
 srcpkgs/prelink-cross/template                |     2 +-
 srcpkgs/print-manager/template                |     4 +-
 srcpkgs/prison/template                       |     8 +-
 srcpkgs/profanity/template                    |     6 +-
 srcpkgs/prometheus/template                   |     4 +-
 .../disable-seccomp-based-tracing.patch       |    28 +
 srcpkgs/proot/patches/makefile-fix-vars.patch |    35 +
 srcpkgs/proot/template                        |    28 +-
 srcpkgs/protontricks/template                 |    14 +
 srcpkgs/pscircle/template                     |     6 +-
 srcpkgs/pulseaudio-module-sndio/template      |     4 +-
 .../pulseaudio/patches/fix-alsa-module.patch  |    42 -
 srcpkgs/pulseaudio/template                   |    23 +-
 srcpkgs/puppet/template                       |     6 +-
 srcpkgs/purpose/template                      |     4 +-
 srcpkgs/putty/template                        |     4 +-
 srcpkgs/py3status/template                    |     4 +-
 srcpkgs/pycharm-community/template            |     4 +-
 srcpkgs/pylint/template                       |    34 +-
 srcpkgs/pyradio/INSTALL.msg                   |     5 +
 srcpkgs/pyradio/template                      |    21 +
 srcpkgs/python-Arrow/template                 |     4 +-
 srcpkgs/python-Babel/template                 |     6 +-
 srcpkgs/python-BeautifulSoup4/template        |     6 +-
 srcpkgs/python-Cheroot/template               |    14 +-
 srcpkgs/python-ConfigArgParse/template        |     4 +-
 srcpkgs/python-Cython/template                |     4 +-
 srcpkgs/python-Django/template                |     4 +-
 srcpkgs/python-Mako/template                  |     4 +-
 srcpkgs/python-Markdown/template              |     6 +-
 srcpkgs/python-MiniMock/template              |     2 +-
 srcpkgs/python-Pillow/template                |     6 +-
 srcpkgs/python-PyQt5-webengine/template       |     2 +
 srcpkgs/python-SQLAlchemy/template            |     4 +-
 srcpkgs/python-Unidecode/template             |     4 +-
 srcpkgs/python-aalib/template                 |     2 +-
 srcpkgs/python-alembic/template               |    11 +-
 srcpkgs/python-appdirs/template               |     2 +-
 srcpkgs/python-apsw/template                  |     5 +-
 srcpkgs/python-astroid/template               |    16 +-
 srcpkgs/python-attrs/template                 |    11 +-
 srcpkgs/python-audioread/template             |     6 +-
 srcpkgs/python-b2sdk/template                 |     4 +-
 srcpkgs/python-bitarray/template              |     6 +-
 srcpkgs/python-botocore/template              |     9 +-
 srcpkgs/python-coverage/template              |     6 +-
 srcpkgs/python-cram/template                  |     2 +-
 .../patches/libressl.patch                    |    18 -
 srcpkgs/python-cryptography/template          |    17 +-
 srcpkgs/python-cryptography_vectors/template  |    30 +
 srcpkgs/python-cssselect/template             |     8 +-
 srcpkgs/python-curl/template                  |    13 +-
 srcpkgs/python-dbus/template                  |     8 +-
 srcpkgs/python-docutils/template              |     8 +-
 srcpkgs/python-dogpile.cache/template         |     8 +-
 srcpkgs/python-dulwich/template               |     4 +-
 srcpkgs/python-ecdsa/template                 |    10 +-
 srcpkgs/python-envdir/template                |     2 +-
 srcpkgs/python-ewmh/template                  |     2 +-
 srcpkgs/python-flaky/template                 |     6 +-
 srcpkgs/python-fonttools/template             |    32 +-
 srcpkgs/python-fonttools/update               |     3 +
 srcpkgs/python-gitlab/template                |     4 +-
 .../python-google-api-python-client/template  |     4 +-
 srcpkgs/python-grako/template                 |     2 +-
 srcpkgs/python-graphviz/template              |     2 +-
 srcpkgs/python-guessit/template               |     9 +-
 srcpkgs/python-html2text/template             |    29 -
 srcpkgs/python-httmock/template               |     2 +-
 srcpkgs/python-httplib2/template              |     4 +-
 srcpkgs/python-hypothesis/template            |     4 +-
 srcpkgs/python-iso-8601/template              |    30 +
 srcpkgs/python-iwlib/template                 |     4 +-
 srcpkgs/python-jedi/template                  |     8 +-
 srcpkgs/python-jsonschema/template            |     5 +-
 srcpkgs/python-kaptan/template                |     4 +-
 srcpkgs/python-lxml/template                  |     6 +-
 srcpkgs/python-magic/template                 |     2 +-
 srcpkgs/python-mechanize/template             |    23 +-
 srcpkgs/python-mock/template                  |     8 +-
 srcpkgs/python-nose/template                  |     2 +-
 srcpkgs/python-npyscreen/template             |     2 +-
 srcpkgs/python-numexpr/template               |     8 +-
 srcpkgs/python-numpy/template                 |     6 +-
 srcpkgs/python-oauthlib/template              |    10 +-
 srcpkgs/python-packaging/template             |    10 +-
 srcpkgs/python-pafy                           |     1 +
 srcpkgs/python-pafy/template                  |    29 -
 srcpkgs/python-pandas/template                |    19 +-
 srcpkgs/python-parsing/template               |     9 +-
 srcpkgs/python-parso/template                 |     4 +-
 srcpkgs/python-pbr/template                   |     4 +-
 srcpkgs/python-pdfrw/template                 |     2 +-
 srcpkgs/python-peewee/template                |     4 +-
 srcpkgs/python-pex/template                   |     4 +-
 srcpkgs/python-pexpect/template               |    10 +-
 srcpkgs/python-pip/template                   |     8 +-
 srcpkgs/python-prctl/template                 |     2 +-
 srcpkgs/python-pretend/template               |    32 +
 srcpkgs/python-prometheus_client/template     |     4 +-
 srcpkgs/python-psycopg2/template              |     4 +-
 srcpkgs/python-pycryptodome/template          |     4 +-
 srcpkgs/python-pyglet/template                |     8 +-
 srcpkgs/python-pyotp/template                 |     4 +-
 srcpkgs/python-pytz/template                  |     4 +-
 srcpkgs/python-rarfile/template               |     4 +-
 srcpkgs/python-rebulk/template                |     4 +-
 srcpkgs/python-regex/template                 |    28 +-
 srcpkgs/python-requests-oauthlib/template     |     8 +-
 srcpkgs/python-requests/template              |     8 +-
 srcpkgs/python-rfc6555/template               |    25 +
 srcpkgs/python-s3transfer/template            |     9 +-
 srcpkgs/python-scikit-learn/template          |    30 -
 srcpkgs/python-scipy/template                 |    33 -
 srcpkgs/python-setuptools/template            |    12 +-
 srcpkgs/python-snappy/template                |     2 +-
 srcpkgs/python-soupsieve/template             |     4 +-
 srcpkgs/python-tmuxp/template                 |     4 +-
 srcpkgs/python-tornado/template               |     8 +-
 srcpkgs/python-tqdm/template                  |     4 +-
 srcpkgs/python-traitlets/template             |    10 +-
 srcpkgs/python-tweepy/template                |     2 +-
 srcpkgs/python-urllib3/template               |     4 +-
 srcpkgs/python-virtualenv/template            |     6 +-
 srcpkgs/python-vispy/template                 |    10 +-
 srcpkgs/python-xmltodict/template             |     2 +-
 srcpkgs/python-yaml/template                  |     8 +-
 srcpkgs/python-zeroconf/template              |    21 -
 srcpkgs/python-zeroconf/update                |     1 -
 srcpkgs/python3-CherryPy/template             |     7 +-
 srcpkgs/python3-Flask-HTTPAuth/template       |    19 +
 srcpkgs/python3-MechanicalSoup/template       |     4 +-
 srcpkgs/python3-PyBrowserID/template          |     2 +-
 srcpkgs/python3-PyFxA/template                |     6 +-
 srcpkgs/python3-PyJWT/template                |    14 +
 srcpkgs/python3-SoCo/template                 |     6 +-
 srcpkgs/python3-Telethon/template             |     6 +-
 srcpkgs/python3-TxSNI/template                |     2 +-
 srcpkgs/python3-WebOb/template                |     2 +-
 srcpkgs/python3-acme/template                 |     6 +-
 srcpkgs/python3-altgraph/template             |     2 +-
 srcpkgs/python3-aniso8601/template            |     6 +-
 srcpkgs/python3-astroid                       |     1 -
 srcpkgs/python3-astroid/template              |    22 +
 srcpkgs/python3-async_generator/template      |     2 +-
 srcpkgs/python3-autobahn/template             |    20 +
 srcpkgs/{python-bcc => python3-bcc}           |     0
 srcpkgs/python3-blessed/template              |     6 +-
 srcpkgs/python3-boltons/template              |     2 +-
 srcpkgs/python3-canonicaljson/template        |     2 +-
 srcpkgs/python3-casttube/template             |     2 +-
 srcpkgs/python3-changelogs/template           |     2 +-
 srcpkgs/python3-cheetah3/template             |     4 +-
 srcpkgs/python3-chromecast/template           |     6 +-
 srcpkgs/python3-cryptography_vectors          |     1 +
 srcpkgs/python3-dbusmock/template             |     6 +-
 srcpkgs/python3-distro/template               |    16 +
 srcpkgs/python3-eliot/template                |     2 +-
 srcpkgs/python3-fido2/template                |    21 +
 srcpkgs/python3-fishnet/template              |     8 +-
 srcpkgs/python3-flexmock/template             |     2 +-
 srcpkgs/python3-fonttools                     |     1 -
 srcpkgs/python3-fonttools/template            |    31 +
 srcpkgs/python3-frozendict/template           |     2 +-
 srcpkgs/python3-geojson/template              |     6 +-
 srcpkgs/python3-gitchangelog/template         |     2 +-
 srcpkgs/python3-hawkauthlib/template          |     2 +-
 srcpkgs/python3-hkdf/template                 |    19 +
 srcpkgs/python3-html2text                     |     1 -
 srcpkgs/python3-html2text/template            |    16 +
 srcpkgs/python3-importlib_metadata/template   |     4 +-
 srcpkgs/python3-ipython/template              |     4 +-
 srcpkgs/python3-iso-8601                      |     1 +
 srcpkgs/python3-jellyfish/template            |     4 +-
 srcpkgs/python3-josepy/template               |     6 +-
 srcpkgs/python3-libevdev/template             |    19 +
 srcpkgs/python3-macaroons/template            |     2 +-
 srcpkgs/python3-macholib/template             |     2 +-
 srcpkgs/python3-matplotlib/template           |     6 +-
 srcpkgs/python3-mechanize                     |     1 +
 srcpkgs/python3-more-itertools/template       |     8 +-
 srcpkgs/python3-mpi4py/template               |    20 +
 srcpkgs/python3-mpv/template                  |     2 +-
 srcpkgs/python3-mypy/template                 |     6 +-
 srcpkgs/python3-mypy_extensions/template      |     6 +-
 srcpkgs/python3-nacl/template                 |     2 +-
 srcpkgs/python3-numpy/template                |     9 +-
 srcpkgs/python3-pafy                          |     1 -
 srcpkgs/python3-pafy/template                 |    22 +
 srcpkgs/python3-pandas                        |     1 -
 .../INSTALL.msg}                              |     0
 srcpkgs/python3-pandas/template               |    20 +
 srcpkgs/python3-pandas/update                 |     1 +
 srcpkgs/python3-pefile/template               |     2 +-
 srcpkgs/python3-pem/template                  |     6 +-
 srcpkgs/python3-perf/template                 |    16 +-
 srcpkgs/python3-pgspecial/template            |     5 +-
 srcpkgs/python3-phonenumbers/template         |     6 +-
 srcpkgs/python3-pivy/template                 |     5 +
 srcpkgs/python3-pluggy/template               |     4 +-
 srcpkgs/python3-precis-i18n/template          |     6 +-
 srcpkgs/python3-pretend                       |     1 +
 srcpkgs/python3-pulsectl/template             |     6 +-
 srcpkgs/python3-pyfiglet/template             |    21 +
 srcpkgs/python3-pylint                        |     1 -
 srcpkgs/python3-pylint/template               |    47 +
 srcpkgs/python3-pysol_cards/template          |    13 +-
 srcpkgs/python3-pytest-asyncio/template       |     2 +-
 srcpkgs/python3-regex                         |     1 +
 srcpkgs/python3-rfc6555                       |     1 +
 srcpkgs/python3-rsistent/template             |     8 +-
 srcpkgs/python3-rss2email/template            |    16 +
 srcpkgs/python3-saml2/template                |     6 +-
 srcpkgs/python3-scard/template                |    19 +
 srcpkgs/python3-scikit-learn                  |     1 -
 srcpkgs/python3-scikit-learn/template         |    20 +
 srcpkgs/python3-scipy                         |     1 -
 srcpkgs/python3-scipy/template                |    23 +
 .../{python-scipy => python3-scipy}/update    |     0
 srcpkgs/python3-scruffy/template              |     4 +-
 srcpkgs/python3-shodan/template               |     4 +-
 srcpkgs/python3-signedjson/template           |     2 +-
 srcpkgs/python3-sortedcontainers/template     |     2 +-
 srcpkgs/python3-spake2/template               |    20 +
 srcpkgs/python3-tabulate/template             |     6 +-
 srcpkgs/python3-tinycss/template              |    21 +
 srcpkgs/python3-treq/template                 |     2 +-
 srcpkgs/python3-txacme/template               |     2 +-
 srcpkgs/python3-txaio/template                |    19 +
 srcpkgs/python3-txtorcon/template             |    20 +
 srcpkgs/python3-unpaddedbase64/template       |     2 +-
 srcpkgs/python3-usb/template                  |    21 +
 srcpkgs/python3-validators/template           |     6 +-
 srcpkgs/python3-vdf/template                  |    18 +
 srcpkgs/python3-virustotal-api/template       |     4 +-
 srcpkgs/python3-yara/template                 |     4 +-
 srcpkgs/python3-zipp/template                 |     4 +-
 srcpkgs/qalculate-gtk/template                |     4 +-
 srcpkgs/qalculate/template                    |     6 +-
 srcpkgs/qbittorrent/template                  |     4 +-
 srcpkgs/qemu-user-static/template             |     8 +-
 ...l.c-define-__SIGRTMIN-MAX-for-non-GN.patch |    12 +-
 srcpkgs/qemu/patches/musl-ppc.patch           |    13 +
 srcpkgs/qemu/template                         |    20 +-
 srcpkgs/qgit/template                         |     8 +-
 srcpkgs/qimgv/template                        |     7 +-
 srcpkgs/qmmp/template                         |     6 +-
 srcpkgs/qpdf/template                         |     4 +-
 srcpkgs/qqc2-desktop-style/template           |     4 +-
 srcpkgs/qt/patches/gcc9-qforeach.patch        |    67 +
 srcpkgs/qt5-styleplugins/template             |     8 +-
 srcpkgs/qt5-webkit/patches/musl-ppc.patch     |    14 +
 srcpkgs/qt5-webkit/patches/ppc-llint.patch    |    32 +
 .../qt5-webkit/patches/reduce-exports.patch   |    27 +
 srcpkgs/qt5-webkit/template                   |    61 +-
 .../qt5/patches/0027-remove-glibc-check.patch |    13 +
 srcpkgs/qt5/patches/0048-qtbug-76742.patch    |    25 -
 .../qt5/patches/0049-big-endian-scroll.patch  |    54 +
 srcpkgs/qt5/patches/0050-pulse-stubs.patch    |    49 +
 srcpkgs/qt5/patches/0100-qtbug-77364.patch    |    26 +
 srcpkgs/qt5/template                          |     9 +-
 srcpkgs/qt5dxcb-plugin/template               |     9 +-
 srcpkgs/qt5integration/template               |     4 +-
 srcpkgs/qt5pas/template                       |     2 +-
 srcpkgs/qtcreator/patches/clang9.patch        |    11 +
 srcpkgs/qtcreator/template                    |    19 +-
 .../qtcurve/patches/gtkprops_constexpr.patch  |    29 +
 srcpkgs/qtcurve/template                      |    18 +-
 srcpkgs/qtfm/template                         |     6 +-
 srcpkgs/qtpass/patches/qmake-qt5.13.patch     |     3 +-
 srcpkgs/qtpass/template                       |     5 +-
 srcpkgs/quadrapassel/template                 |     6 +-
 srcpkgs/qutebrowser/template                  |     4 +-
 srcpkgs/racket/template                       |     4 +-
 srcpkgs/radare2/template                      |     6 +-
 srcpkgs/radeon-profile/template               |     4 +-
 .../rakudo/patches/fix-perl6-home-dir.patch   |    26 +
 srcpkgs/rakudo/template                       |     4 +-
 srcpkgs/range-v3/patches/fix-is_trivial.patch |    96 -
 srcpkgs/range-v3/template                     |     6 +-
 srcpkgs/ranger/template                       |     2 +-
 srcpkgs/rawtherapee/template                  |     4 +-
 srcpkgs/rclone/template                       |    10 +-
 srcpkgs/rcm/template                          |     2 +-
 srcpkgs/rdfind/template                       |     2 +-
 srcpkgs/rdup/template                         |     3 +-
 srcpkgs/re/template                           |     6 +-
 srcpkgs/re2/template                          |     4 +-
 srcpkgs/reap/template                         |    11 +
 srcpkgs/rebar3/template                       |     4 +-
 srcpkgs/recutils/template                     |     2 +-
 srcpkgs/redis/template                        |     6 +-
 srcpkgs/remmina/template                      |     4 +-
 srcpkgs/resvg/template                        |     2 +-
 srcpkgs/retro-gtk/template                    |     6 +-
 srcpkgs/retroarch/template                    |     4 +-
 srcpkgs/rinse/template                        |     2 +-
 srcpkgs/riot-desktop/patches/electron5.patch  |    32 -
 srcpkgs/riot-desktop/template                 |     8 +-
 srcpkgs/rlottie/template                      |     6 +-
 srcpkgs/rmlint/template                       |     6 +-
 srcpkgs/roswell/template                      |     4 +-
 srcpkgs/roxterm/template                      |    13 +-
 srcpkgs/rpi-firmware/template                 |    23 +-
 srcpkgs/rpi-kernel/template                   |   150 +-
 srcpkgs/rpm/template                          |    14 +-
 srcpkgs/rrdtool/template                      |     4 +-
 srcpkgs/rsClock/template                      |    16 +
 srcpkgs/rsyslog/template                      |     6 +-
 srcpkgs/rtags/template                        |     2 +-
 srcpkgs/rtaudio/template                      |     2 +-
 srcpkgs/rtl8822bu-dkms/template               |     6 +-
 srcpkgs/rtl_433/template                      |     7 +-
 srcpkgs/ruby-addressable/template             |     6 +-
 srcpkgs/ruby-asciidoctor/template             |     6 +-
 srcpkgs/ruby-backports/template               |     6 +-
 srcpkgs/ruby-connection_pool/template         |     2 +-
 srcpkgs/ruby-erubis/template                  |     2 +-
 srcpkgs/ruby-ethon/template                   |     2 +-
 srcpkgs/ruby-faraday/template                 |     8 +-
 srcpkgs/ruby-faraday_middleware/template      |     2 +-
 srcpkgs/ruby-ffi/template                     |     6 +-
 srcpkgs/ruby-gh/template                      |     2 +-
 srcpkgs/ruby-highline/template                |     6 +-
 srcpkgs/ruby-hpricot/template                 |     2 +-
 srcpkgs/ruby-httparty/template                |     6 +-
 srcpkgs/ruby-launchy/template                 |     2 +-
 srcpkgs/ruby-mime-types-data/template         |     6 +-
 srcpkgs/ruby-mime-types/template              |     8 +-
 srcpkgs/ruby-mini_portile2/template           |     2 +-
 srcpkgs/ruby-multi_json/template              |     8 +-
 srcpkgs/ruby-multi_xml/template               |     2 +-
 srcpkgs/ruby-multipart-post/template          |     8 +-
 srcpkgs/ruby-mustache/template                |     2 +-
 srcpkgs/ruby-net-http-persistent/template     |     8 +-
 srcpkgs/ruby-net-http-pipeline/template       |     2 +-
 srcpkgs/ruby-pkg-config/template              |     6 +-
 srcpkgs/ruby-public_suffix/template           |     8 +-
 srcpkgs/ruby-pusher-client/template           |     2 +-
 srcpkgs/ruby-rb-readline/template             |     2 +-
 srcpkgs/ruby-rdiscount/template               |     2 +-
 srcpkgs/ruby-ronn/template                    |     2 +-
 srcpkgs/ruby-thor/template                    |     2 +-
 srcpkgs/ruby-travis/template                  |     2 +-
 srcpkgs/ruby-typhoeus/template                |     2 +-
 srcpkgs/ruby-websocket/template               |     2 +-
 srcpkgs/ruby-xdg/template                     |    10 +-
 srcpkgs/ruby/template                         |     6 +-
 srcpkgs/run-parts/template                    |     6 +-
 srcpkgs/runc/template                         |     6 +-
 srcpkgs/runit-void/template                   |     6 +-
 srcpkgs/rust-cargo-audit/template             |     4 +-
 srcpkgs/rust-cargo-bloat/template             |     4 +-
 srcpkgs/rust-sccache/template                 |    11 +-
 .../rust/patches/0002-Fix-LLVM-build.patch    |    10 +-
 ...to-work-when-cross-compiling-on-musl.patch |     8 +-
 ...ative-libraries-when-linking-static-.patch |    12 +-
 ...dlib-and-musl_root-from-musl-targets.patch |   127 +-
 ...er-libgcc_eh-over-libunwind-for-musl.patch |    10 +-
 ...x-C-aggregate-passing-ABI-on-powerpc.patch |    93 +
 ...t-Fix-proc-macro-tests-on-musl-hosts.patch |    39 -
 ...-zero-sized-aggregate-ABI-on-powerpc.patch |    62 +
 ...piletest-Match-suffixed-environments.patch |    48 +
 ...c-variadic-Fix-patterns-on-powerpc64.patch |    73 +
 ...n-for-plugins-Don-t-assume-multilib.patch} |    10 +-
 ...es-are-unstable-Fix-test-when-rpath.patch} |     8 +-
 ...ore-broken-and-non-applicable-tests.patch} |    55 +-
 ...stage-2-tools-dynamically-to-libstd.patch} |    10 +-
 ...-debugger-scripts-to-usr-share-rust.patch} |    14 +-
 srcpkgs/rust/patches/0030-libc-linkage.patch  |    14 +-
 srcpkgs/rust/patches/0091-bootstrap.patch     |    71 +
 .../patches/0091-lzma-sys-cross-ldflags.patch |    11 -
 srcpkgs/rust/template                         |   101 +-
 srcpkgs/rxvt-unicode/template                 |     2 +-
 srcpkgs/s/template                            |     5 +-
 srcpkgs/s6-dns/template                       |     6 +-
 srcpkgs/s6-linux-utils/template               |     4 +-
 srcpkgs/s6-networking/template                |     6 +-
 srcpkgs/s6-portable-utils/template            |     6 +-
 srcpkgs/s6-rc/template                        |    11 +-
 srcpkgs/s6/template                           |     6 +-
 srcpkgs/sabnzbd/template                      |     5 +-
 ...ixed-crash-with-vte-0.54-Bug-1790317.patch |    69 -
 srcpkgs/sakura/template                       |    12 +-
 srcpkgs/saml2aws/template                     |    25 +
 srcpkgs/sampler/template                      |     4 +-
 srcpkgs/sane/patches/sane-desc-cross.patch    |     2 +-
 srcpkgs/sane/template                         |    41 +-
 srcpkgs/sanoid/template                       |     7 +-
 srcpkgs/sassc/template                        |     2 +-
 srcpkgs/sbcl/template                         |     6 +-
 srcpkgs/sblg/template                         |     4 +-
 srcpkgs/scapy/template                        |     4 +-
 srcpkgs/scc/template                          |    17 +
 srcpkgs/scdoc/template                        |     4 +-
 srcpkgs/scons/template                        |     6 +-
 srcpkgs/screen/template                       |     6 +-
 srcpkgs/scrot/template                        |     6 +-
 srcpkgs/scrypt/template                       |     8 +-
 srcpkgs/scummvm/template                      |    43 +-
 srcpkgs/sddm-kcm/template                     |     4 +-
 srcpkgs/seafile-client-qt/template            |    15 +-
 srcpkgs/seafile-libclient/template            |     6 +-
 srcpkgs/seahorse/template                     |     2 +-
 srcpkgs/sequeler/template                     |     4 +-
 srcpkgs/sfeed/template                        |     4 +-
 srcpkgs/shaderc/template                      |     2 +-
 srcpkgs/shared-mime-info/template             |    14 +-
 srcpkgs/shfmt/template                        |     2 +-
 srcpkgs/shiboken2/patches/qstringlist.patch   |    12 +
 srcpkgs/shiboken2/template                    |     2 +-
 srcpkgs/shotcut/template                      |     4 +-
 srcpkgs/shotwell/template                     |     4 +-
 srcpkgs/shunit2/template                      |     2 +-
 srcpkgs/signon-kwallet-extension/template     |     4 +-
 srcpkgs/sk1/template                          |    10 +-
 srcpkgs/sk1/update                            |     1 +
 srcpkgs/skaffold/template                     |     5 +-
 srcpkgs/skalibs/template                      |    27 +-
 srcpkgs/skim/template                         |     2 +-
 srcpkgs/skype/template                        |     8 +-
 srcpkgs/slack-desktop/template                |     6 +-
 srcpkgs/sleuthkit/template                    |     4 +-
 srcpkgs/slirp4netns/template                  |     8 +-
 srcpkgs/smenu/template                        |     2 +-
 srcpkgs/socat/template                        |    25 +-
 srcpkgs/solarus-quest-editor/template         |     4 +-
 srcpkgs/solarus/template                      |     6 +-
 srcpkgs/sonnet/template                       |     4 +-
 srcpkgs/sops/template                         |    13 +
 srcpkgs/source-sans-pro/template              |     6 +-
 srcpkgs/sparse/template                       |     4 +-
 srcpkgs/spdx-licenses-list/template           |     2 +-
 srcpkgs/spectacle/template                    |     6 +-
 srcpkgs/speedtest-cli/template                |     4 +-
 srcpkgs/spice-gtk/template                    |     5 +-
 srcpkgs/spice/template                        |     4 +
 srcpkgs/spigot/template                       |     4 +-
 .../files/spotify-adblock.desktop             |    11 +
 srcpkgs/spotify-adblock-linux/template        |    20 +
 srcpkgs/spotify-tui/template                  |    17 +
 srcpkgs/sqlite-replication/template           |    11 +-
 srcpkgs/sqlite/template                       |     6 +-
 srcpkgs/sqlmap/template                       |    27 +
 .../patches/CVE-2015-4645.patch               |    27 -
 .../squashfs-tools/patches/fix-compat.patch   |    46 -
 .../squashfs-tools/patches/vla-overlow.patch  |    21 -
 srcpkgs/squashfs-tools/template               |    19 +-
 srcpkgs/stagit/patches/libgit2-0.28.patch     |    27 -
 srcpkgs/stagit/template                       |    10 +-
 srcpkgs/starship/template                     |    18 +
 srcpkgs/stow/template                         |     8 +-
 srcpkgs/strace/template                       |     9 +-
 srcpkgs/streamlink/template                   |     4 +-
 srcpkgs/stremio-shell/template                |     8 +-
 srcpkgs/stress-ng/template                    |     4 +-
 srcpkgs/strongswan/template                   |     4 +-
 srcpkgs/sublime-merge/template                |     4 +-
 srcpkgs/sublime-text3/template                |     6 +-
 srcpkgs/sudo/template                         |     4 +-
 ...068659ced596402dedc78f49fabfab6470bd.patch |    23 -
 srcpkgs/supercollider/template                |     5 +-
 srcpkgs/supermin/template                     |     2 +-
 srcpkgs/svctl/template                        |     2 +-
 srcpkgs/svgpart/template                      |     4 +-
 srcpkgs/swaks/template                        |     4 +-
 srcpkgs/sway/template                         |     8 +-
 srcpkgs/swell-foop/patches/pivot_point.patch  |    32 +
 srcpkgs/swell-foop/template                   |     6 +-
 srcpkgs/sx/template                           |     2 +-
 .../patches/bump-python-dependencies.patch    |    30 -
 srcpkgs/synapse/template                      |     6 +-
 srcpkgs/syncthing-gtk/template                |     6 +-
 srcpkgs/syncthing-inotify/template            |     2 +-
 srcpkgs/syncthing/template                    |     5 +-
 srcpkgs/syndication/template                  |     4 +-
 srcpkgs/syntax-highlighting/template          |     4 +-
 srcpkgs/sysdig/template                       |    12 +-
 srcpkgs/sysexxer-ng/template                  |    17 +
 srcpkgs/sysprof/template                      |     8 +-
 srcpkgs/sysstat/template                      |     5 +-
 srcpkgs/systemsettings/template               |     4 +-
 srcpkgs/systemtap/template                    |     4 +-
 srcpkgs/tab/template                          |     6 +-
 srcpkgs/taisei/template                       |    12 +-
 srcpkgs/tarpaulin/template                    |    19 +
 srcpkgs/tau/template                          |    29 +
 srcpkgs/tbb/template                          |     6 +-
 srcpkgs/tcpdump/template                      |     6 +-
 srcpkgs/teamspeak3/template                   |     6 +-
 srcpkgs/telegram-desktop/files/Telegram.cmake |    16 +-
 .../files/TelegramCodegenTools.cmake          |     2 +
 .../telegram-desktop/patches/stdafx.h.patch   |    19 +
 srcpkgs/telegram-desktop/template             |    11 +-
 srcpkgs/telepresence/template                 |     5 +-
 srcpkgs/termdown/template                     |    15 +
 srcpkgs/terraform/template                    |     4 +-
 srcpkgs/terragrunt/template                   |     4 +-
 srcpkgs/texlive-bin/template                  |    19 +-
 srcpkgs/thermald/template                     |     4 +-
 srcpkgs/thingylaunch/template                 |     2 +-
 srcpkgs/threadweaver/template                 |     4 +-
 srcpkgs/thunderbird-i18n/template             |   116 +-
 srcpkgs/thunderbird/files/mozconfig           |     3 +-
 .../patches/disable-hunspell_hooks.patch      |    11 -
 .../disable-image-format-warning.patch        |    15 +
 .../patches/fix-arm-opus-include.patch        |    11 +
 .../patches/fix-i686-ppc-musl.patch           |    11 +
 srcpkgs/thunderbird/patches/fix-musl.patch    |    18 +-
 .../thunderbird/patches/fix-rust-1.29.patch   |    14 -
 .../patches/fix-sandbox-membarrier.patch      |    52 +
 srcpkgs/thunderbird/patches/fix-toolkit.patch |    36 +-
 srcpkgs/thunderbird/patches/fix-tools.patch   |    35 +-
 .../thunderbird/patches/fix-wasm-arm.patch    |    15 +
 .../patches/fix-webrtc-glibcisms.patch        |    25 +-
 srcpkgs/thunderbird/patches/fix-xpcom.patch   |    11 -
 srcpkgs/thunderbird/patches/mallinfo.patch    |    40 +-
 .../patches/ppc32-skia-portable.patch         |    14 +
 .../thunderbird/patches/rust-configure.patch  |    42 +
 .../thunderbird/patches/rust-cssparser.patch  |    90 +
 .../patches/rust-unitialized-field.patch      |    19 -
 srcpkgs/thunderbird/patches/rust133.patch     |    24 -
 srcpkgs/thunderbird/patches/sndio.patch       |    12 +-
 srcpkgs/thunderbird/patches/yuv-be.patch      |    48 +
 srcpkgs/thunderbird/template                  |    90 +-
 srcpkgs/tig/template                          |     4 +-
 srcpkgs/tigervnc/template                     |     2 +-
 srcpkgs/timeshift/template                    |     4 +-
 srcpkgs/tinc/template                         |     6 +-
 srcpkgs/tintin/template                       |     4 +-
 srcpkgs/tinyxml2/template                     |     6 +-
 srcpkgs/tlp/template                          |     2 +-
 srcpkgs/tmux/template                         |     4 +-
 srcpkgs/tomahawk/template                     |     8 +-
 srcpkgs/tomb/template                         |     7 +-
 srcpkgs/toot/template                         |     7 +-
 srcpkgs/topgrade/template                     |     4 +-
 srcpkgs/tor/patches/ppc.patch                 |    35 +
 srcpkgs/tor/patches/ppc64.patch               |    14 -
 srcpkgs/tor/template                          |    14 +-
 srcpkgs/torbrowser-launcher/template          |    21 +
 srcpkgs/totem/template                        |     4 +-
 srcpkgs/tox/template                          |     4 +-
 srcpkgs/translate-shell/template              |     4 +-
 srcpkgs/tty-clock/template                    |    19 +-
 srcpkgs/ttyd/template                         |     4 +-
 srcpkgs/tudu/template                         |     8 +-
 srcpkgs/tuir/template                         |     4 +-
 srcpkgs/turses/template                       |     2 +-
 srcpkgs/txr/template                          |     4 +-
 srcpkgs/txtw/template                         |     2 +-
 srcpkgs/tzdata/template                       |     4 +-
 srcpkgs/tzutils/template                      |    12 +-
 srcpkgs/ucspi-ssl/template                    |     2 +-
 srcpkgs/ufetch/template                       |     2 +-
 srcpkgs/uget/template                         |     6 +-
 srcpkgs/umbrello/template                     |     6 +-
 srcpkgs/unbound/template                      |     5 +-
 srcpkgs/unison/template                       |     2 +-
 srcpkgs/unrar/template                        |     6 +-
 srcpkgs/urh/template                          |     4 +-
 srcpkgs/urlscan/template                      |     4 +-
 srcpkgs/usbguard/files/usbguard/run           |     2 +
 srcpkgs/usbguard/patches/musl.patch           |    84 +
 srcpkgs/usbguard/template                     |    20 +
 srcpkgs/user-manager/template                 |     4 +-
 srcpkgs/usql/template                         |     6 +-
 srcpkgs/util-linux/patches/chsh.patch         |    89 +
 srcpkgs/util-linux/template                   |     2 +-
 srcpkgs/utox/template                         |     8 +-
 srcpkgs/vagrant/template                      |     6 +-
 srcpkgs/vala-panel-appmenu/template           |     4 +-
 srcpkgs/vala/template                         |     8 +-
 srcpkgs/valabind/template                     |     2 +-
 srcpkgs/valadoc/template                      |     8 +-
 srcpkgs/vamp-plugin-sdk/template              |    16 +-
 srcpkgs/vapoursynth/template                  |     4 +-
 srcpkgs/varnish/INSTALL.msg                   |     1 -
 srcpkgs/varnish/files/varnishd/log/run        |     2 +
 srcpkgs/varnish/files/varnishd/run            |    20 +
 srcpkgs/varnish/patches/musl.patch            |    22 +
 srcpkgs/varnish/template                      |    69 +-
 srcpkgs/varnish/update                        |     1 +
 srcpkgs/vault/template                        |    14 +-
 srcpkgs/vba-m/template                        |     7 +-
 srcpkgs/vhba-module-dkms/template             |     4 +-
 srcpkgs/viewres/template                      |     4 +-
 srcpkgs/vifm/template                         |     5 +-
 srcpkgs/viking/template                       |     2 +-
 srcpkgs/vim/template                          |     6 +-
 srcpkgs/vinagre/template                      |     6 +-
 srcpkgs/virt-viewer/template                  |     5 +-
 srcpkgs/virt-what/template                    |     4 +-
 srcpkgs/virtualbox-ose/template               |     4 +-
 srcpkgs/vivaldi/template                      |     8 +-
 srcpkgs/vlc/template                          |    19 +-
 srcpkgs/vmpk/template                         |    23 +
 srcpkgs/vnstat/template                       |     4 +-
 srcpkgs/vpnc-scripts/patches/fix-ipv6.patch   |    16 -
 srcpkgs/vpnc-scripts/template                 |     4 +-
 srcpkgs/vscode/patches/fix_dir.patch          |    10 +-
 srcpkgs/vscode/patches/gulp.patch             |     2 +-
 srcpkgs/vscode/template                       |     9 +-
 srcpkgs/vte3/template                         |    13 +-
 srcpkgs/vulkan-loader/template                |     4 +-
 srcpkgs/w3m/template                          |     2 +-
 srcpkgs/warzone2100/template                  |    25 +-
 srcpkgs/way-cooler/template                   |     2 +-
 srcpkgs/wayfire/template                      |     8 +-
 srcpkgs/wayland-protocols/template            |     6 +-
 srcpkgs/wayland/template                      |     2 +-
 .../patches/fix-fast-memory-disabled.patch    |    14 -
 .../patches/fix-musl-javascriptcore.patch     |   492 +-
 srcpkgs/webkit2gtk/patches/ppc-llint.patch    |    41 +
 srcpkgs/webkit2gtk/template                   |   100 +-
 srcpkgs/weechat/template                      |    16 +-
 srcpkgs/wesnoth/template                      |     6 +-
 srcpkgs/wf-config-devel                       |     1 +
 srcpkgs/wf-config/patches/fix-musl.patch      |    13 -
 srcpkgs/wf-config/template                    |    20 +-
 srcpkgs/wf-shell/template                     |    28 +-
 srcpkgs/whois/template                        |    17 +-
 srcpkgs/wine-mono/template                    |     4 +-
 srcpkgs/wine/template                         |     4 +-
 srcpkgs/winetricks/template                   |     4 +-
 srcpkgs/wireguard/template                    |     5 +-
 srcpkgs/wireshark/template                    |     4 +-
 srcpkgs/wl-clipboard/template                 |     6 +-
 srcpkgs/wlroots/template                      |    12 +-
 srcpkgs/woff2/template                        |     2 +-
 srcpkgs/workrave/template                     |     9 +-
 srcpkgs/wpa-cute/template                     |    23 +
 srcpkgs/wxMaxima/template                     |     4 +-
 ...fig-gtk3.0-to-avoid-conflict-with-wx.patch |    12 +-
 srcpkgs/wxPython4/template                    |    17 +-
 srcpkgs/x264/template                         |    10 +-
 srcpkgs/x42-plugins/template                  |     4 +-
 srcpkgs/xapian-core/template                  |     6 +-
 srcpkgs/xapps/template                        |     6 +-
 srcpkgs/xbps-triggers/files/dkms              |     2 +-
 srcpkgs/xbps-triggers/template                |     2 +-
 srcpkgs/xcb-util-xrm/template                 |     2 +-
 srcpkgs/xdg-dbus-proxy/patches/musl.patch     |    19 +
 srcpkgs/xdg-dbus-proxy/template               |     6 +-
 srcpkgs/xdg-desktop-portal-kde/template       |     4 +-
 srcpkgs/xdgmenumaker/files/1.5/xdgmenumaker.1 |   464 +
 srcpkgs/xdgmenumaker/template                 |    19 +-
 srcpkgs/xen/template                          |     2 +-
 srcpkgs/xev/template                          |     2 +-
 srcpkgs/xf86-input-libinput/template          |     2 +-
 srcpkgs/xf86-video-amdgpu/template            |     4 +-
 srcpkgs/xfce4-battery-plugin/template         |     2 +-
 srcpkgs/xfce4-clipman-plugin/template         |     2 +-
 srcpkgs/xfce4-cpufreq-plugin/template         |     2 +-
 srcpkgs/xfce4-cpugraph-plugin/template        |     2 +-
 srcpkgs/xfce4-dict/template                   |     8 +-
 srcpkgs/xfce4-diskperf-plugin/template        |     2 +-
 srcpkgs/xfce4-fsguard-plugin/template         |     2 +-
 srcpkgs/xfce4-genmon-plugin/template          |     2 +-
 .../xfce4-hardware-monitor-plugin/template    |     2 +-
 srcpkgs/xfce4-kbdleds-plugin/template         |     2 +-
 srcpkgs/xfce4-mailwatch-plugin/template       |     2 +-
 srcpkgs/xfce4-mpc-plugin/template             |     2 +-
 srcpkgs/xfce4-netload-plugin/template         |     2 +-
 srcpkgs/xfce4-notes-plugin/template           |     2 +-
 srcpkgs/xfce4-notifyd/template                |     2 +-
 srcpkgs/xfce4-panel/template                  |    19 +-
 srcpkgs/xfce4-places-plugin/template          |     2 +-
 srcpkgs/xfce4-power-manager/template          |     2 +-
 srcpkgs/xfce4-pulseaudio-plugin/template      |     2 +-
 srcpkgs/xfce4-screensaver/template            |     2 +-
 srcpkgs/xfce4-screenshooter/template          |     6 +-
 srcpkgs/xfce4-sensors-plugin/template         |     2 +-
 srcpkgs/xfce4-settings/template               |     6 +-
 srcpkgs/xfce4-systemload-plugin/template      |     2 +-
 srcpkgs/xfce4-taskmanager/template            |     3 +-
 srcpkgs/xfce4-time-out-plugin/template        |     2 +-
 srcpkgs/xfce4-timer-plugin/template           |     2 +-
 srcpkgs/xfce4-verve-plugin/template           |     2 +-
 srcpkgs/xfce4-wavelan-plugin/template         |     2 +-
 srcpkgs/xfce4-weather-plugin/template         |     2 +-
 srcpkgs/xfce4-whiskermenu-plugin/template     |     2 +-
 srcpkgs/xfce4-windowck-plugin/template        |     2 +-
 srcpkgs/xfce4-xkb-plugin/template             |     2 +-
 srcpkgs/xfsdump/template                      |     9 +-
 srcpkgs/xfsprogs/template                     |     4 +-
 srcpkgs/xhost/template                        |     2 +-
 srcpkgs/xi-editor/template                    |     2 +-
 srcpkgs/xkb-switch/template                   |     6 +-
 srcpkgs/xkcdpass/template                     |     2 +-
 srcpkgs/xl2tpd/template                       |     6 +-
 srcpkgs/xlockmore/template                    |     8 +-
 srcpkgs/xlsatoms/template                     |     2 +-
 srcpkgs/xmltoman/template                     |     2 +-
 srcpkgs/xmodmap/template                      |     2 +-
 srcpkgs/xob/template                          |     2 +-
 srcpkgs/xonsh/template                        |     4 +-
 srcpkgs/xorg-server/template                  |     2 +-
 srcpkgs/xorgproto/template                    |     7 +-
 srcpkgs/xpdf/template                         |     6 +-
 srcpkgs/xpdf/update                           |     1 +
 srcpkgs/xpra/template                         |     2 +-
 srcpkgs/xprintidle/template                   |     2 +-
 srcpkgs/xrdb/template                         |     2 +-
 srcpkgs/xsecurelock/template                  |     4 +-
 srcpkgs/xst/template                          |     3 +-
 srcpkgs/xterm/template                        |     8 +-
 srcpkgs/xtitle/template                       |     2 +-
 srcpkgs/xurls/template                        |     4 +-
 srcpkgs/xvinfo/template                       |     2 +-
 srcpkgs/xvkbd/template                        |     9 +-
 srcpkgs/xxHash/template                       |     4 +-
 srcpkgs/yabasic/template                      |    10 +-
 srcpkgs/yad/template                          |     6 +-
 srcpkgs/yakuake/template                      |    16 +-
 srcpkgs/yandex-disk/template                  |     7 +-
 srcpkgs/yank/template                         |     6 +-
 srcpkgs/yarn-bin/template                     |     6 +-
 srcpkgs/yaru/template                         |     4 +-
 srcpkgs/yash/template                         |    11 +-
 srcpkgs/yelp-xsl/template                     |     4 +-
 srcpkgs/yelp/template                         |     4 +-
 srcpkgs/yggdrasil/template                    |     6 +-
 srcpkgs/ykpivmgr/patches/libressl.patch       |   158 -
 srcpkgs/ykpivmgr/patches/ssl_obsolete.patch   |    22 +
 srcpkgs/ykpivmgr/template                     |     9 +-
 srcpkgs/yoshimi/template                      |     4 +-
 srcpkgs/yosys/template                        |     6 +-
 srcpkgs/youtube-dl/template                   |    18 +-
 srcpkgs/youtube-viewer/template               |     4 +-
 srcpkgs/yq-go/template                        |     2 +-
 srcpkgs/yq/template                           |     2 +-
 srcpkgs/yubikey-manager/template              |    19 +
 srcpkgs/z3/template                           |    10 +-
 srcpkgs/zabbix/template                       |     2 +-
 srcpkgs/zaproxy/template                      |    34 -
 srcpkgs/zaproxy/update                        |     2 -
 srcpkgs/zathura/template                      |    13 +-
 srcpkgs/zchunk/template                       |     8 +-
 srcpkgs/zfs/template                          |     4 +-
 srcpkgs/zim-tools/template                    |     6 +-
 srcpkgs/zimwriterfs/template                  |     4 +-
 srcpkgs/znc/template                          |     8 +-
 srcpkgs/zola/template                         |    13 +-
 srcpkgs/zoom/template                         |     7 +-
 srcpkgs/zou/template                          |     2 +-
 srcpkgs/zsh-completions/template              |     4 +-
 srcpkgs/zstd/template                         |     7 +-
 srcpkgs/zulucrypt/template                    |     7 +-
 2552 files changed, 55414 insertions(+), 45921 deletions(-)
 create mode 100644 srcpkgs/66-tools/template
 create mode 100644 srcpkgs/Amass/template
 delete mode 100644 srcpkgs/ClusterSSH/update
 create mode 100644 srcpkgs/Electron-Cash/template
 create mode 100644 srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
 rename srcpkgs/LuaJIT/{patches => files/patches/ppc64}/add-ppc64-support.patch (100%)
 rename srcpkgs/LuaJIT/{patches => files/patches/ppc64}/fix-vm-jit-ppc64.patch (100%)
 create mode 100644 srcpkgs/MEGAcmd/patches/megacmd-sdk36.diff
 delete mode 100644 srcpkgs/MEGAcmd/patches/musl.patch
 create mode 100644 srcpkgs/MEGAsync/patches/breakpad.patch
 create mode 100644 srcpkgs/Solaar/template
 create mode 100644 srcpkgs/The-Powder-Toy/template
 create mode 100644 srcpkgs/UEFITool/template
 delete mode 100644 srcpkgs/Uranium/patches/fix-crash-in-cura.patch
 create mode 100644 srcpkgs/alpine/patches/418e8bc5.patch
 delete mode 100755 srcpkgs/android-tools/files/generate_build.rb
 delete mode 100644 srcpkgs/android-tools/patches/gcc-fixes.patch
 delete mode 100644 srcpkgs/android-tools/patches/include-sys-sysmacros.patch
 delete mode 100644 srcpkgs/android-tools/patches/musl-fixes.patch
 delete mode 100644 srcpkgs/android-tools/patches/undef__USE_GNU.patch
 create mode 120000 srcpkgs/apache-directory-studio
 rename srcpkgs/{apache-directory-studio => apache-directory-studio-bin}/files/ApacheDirectoryStudio.desktop (100%)
 rename srcpkgs/{apache-directory-studio => apache-directory-studio-bin}/template (56%)
 rename srcpkgs/{apache-directory-studio => apache-directory-studio-bin}/update (100%)
 create mode 100644 srcpkgs/apache-jmeter/update
 create mode 100644 srcpkgs/arduino/patches/astyle_fix.patch
 delete mode 100644 srcpkgs/aria2/patches/patch-src_libssl_compat_h.patch
 create mode 100644 srcpkgs/aribas/update
 delete mode 100644 srcpkgs/assimp/patches/0001-glext_h_conflict.patch
 create mode 100644 srcpkgs/assimp/patches/musl.patch
 create mode 100644 srcpkgs/assimp_qt_viewer/template
 delete mode 100644 srcpkgs/atk/patches/fix-cross-gir.patch
 create mode 100644 srcpkgs/babeld/patches/45.patch
 create mode 100644 srcpkgs/backintime-qt/template
 create mode 100644 srcpkgs/bash/files/bash50-008
 create mode 100644 srcpkgs/bash/files/bash50-009
 create mode 100644 srcpkgs/bash/files/bash50-010
 create mode 100644 srcpkgs/bash/files/bash50-011
 create mode 100644 srcpkgs/bcal/patches/non-null.patch
 create mode 100644 srcpkgs/beignet/patches/llvm8.patch
 create mode 100644 srcpkgs/beignet/patches/llvm9.patch
 create mode 100644 srcpkgs/blender/patches/altivec-all.patch
 create mode 100644 srcpkgs/blender/patches/gcc9-elbeem.patch
 create mode 100755 srcpkgs/bluez/files/bluetooth-meshd/run
 delete mode 100644 srcpkgs/bluez/patches/0001-Allow-using-obexd-without-systemd-in-the-user-session.patch
 create mode 100644 srcpkgs/bluez/patches/0001-enable-dbus-without-systemd.patch
 create mode 100644 srcpkgs/bluez/patches/0002-allow-obexd-on-non-systemd-system.patch
 delete mode 100644 srcpkgs/bluez/patches/0002-bluetoothd-dbus-service.patch
 create mode 100644 srcpkgs/bluez/patches/0003-allow-mesh-on-non-systemd-system.patch
 delete mode 100644 srcpkgs/bluez/patches/0003-bluetooth-group-can-use-bluez.patch
 create mode 100644 srcpkgs/bluez/patches/0004-include-sys-time.h-for-musl-build.patch
 create mode 100644 srcpkgs/bluez/patches/0005-include-limits.h-for-musl-build.patch
 rename srcpkgs/bluez/patches/{musl.patch => 0006-musl-fix.patch} (52%)
 create mode 100644 srcpkgs/bluez/patches/0007-include-string.h.patch
 create mode 100644 srcpkgs/bluez/patches/0008-grant-permission-to-bluetooth-group.patch
 create mode 100644 srcpkgs/bluez/patches/0009-adapter-Don-t-refresh-adv_manager-for-non-LE-devices.patch
 delete mode 100644 srcpkgs/brisk-menu/patches/69fa052df45c1fa439f6af0a2c8e9795087b9444.patch
 create mode 100644 srcpkgs/cage/template
 create mode 100644 srcpkgs/calcurse/patches/DST-fix-date-change.patch
 create mode 100644 srcpkgs/calligra/patches/qt5.13.patch
 create mode 100644 srcpkgs/camlp4/patches/version-hack.patch
 create mode 100644 srcpkgs/cargo/patches/revert-libgit2-sys-api.patch
 create mode 100644 srcpkgs/celluloid/template
 create mode 100644 srcpkgs/cheat/template
 create mode 100644 srcpkgs/chromium/patches/harfbuzz-subset.patch
 create mode 100644 srcpkgs/chromium/patches/linked-hash-set.patch
 create mode 100644 srcpkgs/chromium/patches/one_euro_filter.patch
 create mode 100644 srcpkgs/chromium/patches/sandbox-sched_getparam.patch
 delete mode 100644 srcpkgs/cinnamon/patches/595178cf57b80b977401460a147602832157b303.patch
 delete mode 100644 srcpkgs/cinnamon/patches/default-theme.patch
 delete mode 100644 srcpkgs/cinnamon/patches/set_wheel.patch
 delete mode 100644 srcpkgs/clementine/patches/add-missing-functional-includes-5630.patch
 delete mode 100644 srcpkgs/clementine/patches/clementine-chromaprint-1.4.patch
 delete mode 100644 srcpkgs/clementine/patches/clementine-moodbar_flags.patch
 delete mode 100644 srcpkgs/clementine/patches/clementine-sqlite-3.12.patch
 delete mode 100644 srcpkgs/clementine/patches/protobuf-370.patch
 delete mode 100644 srcpkgs/clementine/patches/sentinel.patch
 create mode 100644 srcpkgs/clipman/template
 create mode 100644 srcpkgs/cmixer/patches/linux.patch
 create mode 100644 srcpkgs/cmixer/template
 create mode 100644 srcpkgs/cnping/INSTALL
 create mode 100644 srcpkgs/cnping/template
 create mode 100644 srcpkgs/connman/files/musl/freeaddrinfo.patch
 create mode 100644 srcpkgs/consul-template/template
 create mode 100644 srcpkgs/coyim/template
 delete mode 120000 srcpkgs/cross-aarch64-linux-gnu/files/non-nullness.patch
 create mode 120000 srcpkgs/cross-aarch64-linux-musl/files/gccgo-musl.patch
 delete mode 120000 srcpkgs/cross-aarch64-linux-musl/files/non-nullness.patch
 delete mode 120000 srcpkgs/cross-arm-linux-gnueabi/files/non-nullness.patch
 delete mode 120000 srcpkgs/cross-arm-linux-gnueabihf/files/non-nullness.patch
 create mode 120000 srcpkgs/cross-arm-linux-musleabi/files/gccgo-musl.patch
 delete mode 120000 srcpkgs/cross-arm-linux-musleabi/files/non-nullness.patch
 create mode 120000 srcpkgs/cross-arm-linux-musleabihf/files/gccgo-musl.patch
 delete mode 120000 srcpkgs/cross-arm-linux-musleabihf/files/non-nullness.patch
 delete mode 120000 srcpkgs/cross-armv7l-linux-gnueabihf/files/non-nullness.patch
 create mode 120000 srcpkgs/cross-armv7l-linux-musleabihf/files/gccgo-musl.patch
 delete mode 120000 srcpkgs/cross-armv7l-linux-musleabihf/files/non-nullness.patch
 delete mode 120000 srcpkgs/cross-i686-linux-musl/files/bug90756.patch
 create mode 120000 srcpkgs/cross-i686-linux-musl/files/gccgo-musl.patch
 delete mode 120000 srcpkgs/cross-i686-linux-musl/files/non-nullness.patch
 delete mode 120000 srcpkgs/cross-i686-pc-linux-gnu/files/bug90756.patch
 delete mode 120000 srcpkgs/cross-i686-pc-linux-gnu/files/non-nullness.patch
 delete mode 120000 srcpkgs/cross-mips-linux-musl/files/non-nullness.patch
 delete mode 120000 srcpkgs/cross-mips-linux-muslhf/files/non-nullness.patch
 delete mode 120000 srcpkgs/cross-mipsel-linux-musl/files/non-nullness.patch
 delete mode 120000 srcpkgs/cross-mipsel-linux-muslhf/files/non-nullness.patch
 delete mode 120000 srcpkgs/cross-powerpc-linux-gnu/files/non-nullness.patch
 create mode 120000 srcpkgs/cross-powerpc-linux-musl/files/gccgo-musl.patch
 delete mode 120000 srcpkgs/cross-powerpc-linux-musl/files/non-nullness.patch
 create mode 120000 srcpkgs/cross-powerpc64-linux-gnu/files/darn.patch
 delete mode 120000 srcpkgs/cross-powerpc64-linux-gnu/files/non-nullness.patch
 create mode 120000 srcpkgs/cross-powerpc64-linux-musl/files/darn.patch
 create mode 120000 srcpkgs/cross-powerpc64-linux-musl/files/gccgo-musl.patch
 delete mode 120000 srcpkgs/cross-powerpc64-linux-musl/files/non-nullness.patch
 create mode 120000 srcpkgs/cross-powerpc64le-linux-gnu/files/darn.patch
 delete mode 120000 srcpkgs/cross-powerpc64le-linux-gnu/files/non-nullness.patch
 create mode 120000 srcpkgs/cross-powerpc64le-linux-musl/files/darn.patch
 create mode 120000 srcpkgs/cross-powerpc64le-linux-musl/files/gccgo-musl.patch
 delete mode 120000 srcpkgs/cross-powerpc64le-linux-musl/files/non-nullness.patch
 create mode 120000 srcpkgs/cross-x86_64-linux-musl/files/gccgo-musl.patch
 delete mode 120000 srcpkgs/cross-x86_64-linux-musl/files/non-nullness.patch
 delete mode 100644 srcpkgs/crypto++/patches/arm-native.patch
 delete mode 100644 srcpkgs/crypto++/patches/musl-soname-links.patch
 delete mode 100644 srcpkgs/cups/patches/cups-no-gzip-man.patch
 delete mode 100644 srcpkgs/cura-engine/patches/0001-Remove-default-none-so-that-it-compiles-in-gcc9.patch
 create mode 100644 srcpkgs/delta/template
 create mode 100644 srcpkgs/diffr/template
 delete mode 100644 srcpkgs/dma/patches/musl_sys_param_h.patch
 create mode 100644 srcpkgs/dnsmasq/patches/nettle35.patch
 create mode 100644 srcpkgs/docker-compose/patches/pyyaml_version.patch
 create mode 100644 srcpkgs/dracut/patches/ppc-mac-thermal.patch
 create mode 120000 srcpkgs/drumstick-devel
 create mode 100644 srcpkgs/drumstick/template
 delete mode 100644 srcpkgs/edbrowse/patches/curl-7.62.patch
 create mode 100644 srcpkgs/eggdrop/template
 create mode 100644 srcpkgs/evtest/patches/0001-Add-missing-limits.h-include.patch
 create mode 100644 srcpkgs/exec-on-git-staged/template
 delete mode 100644 srcpkgs/exiv2/patches/musl.patch
 delete mode 100644 srcpkgs/fetchmail/patches/patch-socket_c.diff
 create mode 100644 srcpkgs/ffuf/template
 create mode 100644 srcpkgs/fierce/template
 delete mode 100644 srcpkgs/findutils/patches/gnulib-freadahead.patch
 delete mode 100644 srcpkgs/findutils/patches/gnulib-fseeko.patch
 delete mode 100644 srcpkgs/findutils/patches/gnulib-mountlist.patch
 delete mode 100644 srcpkgs/findutils/patches/gnulib-stdio-impl.patch
 rename srcpkgs/{firefox-esr-i18n-as => firefox-esr-i18n-bn} (100%)
 rename srcpkgs/{firefox-esr-i18n-bn-BD => firefox-esr-i18n-en-CA} (100%)
 rename srcpkgs/{firefox-esr-i18n-bn-IN => firefox-esr-i18n-ia} (100%)
 rename srcpkgs/{firefox-esr-i18n-en-ZA => firefox-esr-i18n-ne-NP} (100%)
 rename srcpkgs/{firefox-esr-i18n-mai => firefox-esr-i18n-oc} (100%)
 delete mode 120000 srcpkgs/firefox-esr-i18n-or
 rename srcpkgs/{firefox-esr-i18n-ml => firefox-esr-i18n-ur} (100%)
 create mode 120000 srcpkgs/firefox-esr-i18n/files/update-lang-list
 create mode 100644 srcpkgs/firefox-esr/patches/disable-image-format-warning.patch
 create mode 100644 srcpkgs/firefox-esr/patches/fix-arm-opus-include.patch
 create mode 100644 srcpkgs/firefox-esr/patches/fix-wasm-arm.patch
 delete mode 100644 srcpkgs/firefox-esr/patches/fix-webrtc-arm.patch
 delete mode 100644 srcpkgs/firefox-esr/patches/fix-xpcom.patch
 rename srcpkgs/{firefox/patches/fix-musl.patch => firefox-esr/patches/gettid-musl.patch} (100%)
 delete mode 100644 srcpkgs/firefox-esr/patches/ppc-no-static-sizes.patch
 create mode 100644 srcpkgs/firefox-esr/patches/rust-cssparser.patch
 delete mode 100644 srcpkgs/firefox-esr/patches/rust-unitialized-field.patch
 delete mode 100644 srcpkgs/firefox-esr/patches/rust133.patch
 delete mode 100644 srcpkgs/firefox-esr/patches/save-and-restore-non-volatile-x28-on-arm64.patch
 delete mode 100644 srcpkgs/firefox-esr/patches/save-x28-before-clobbering-it-in-the-regex-compiler.patch
 create mode 100644 srcpkgs/firefox-esr/patches/yuv-be.patch
 create mode 120000 srcpkgs/firefox-i18n-bn
 create mode 120000 srcpkgs/firefox-i18n-en-CA
 create mode 120000 srcpkgs/firefox-i18n-ia
 create mode 120000 srcpkgs/firefox-i18n-ne-NP
 create mode 120000 srcpkgs/firefox-i18n-oc
 create mode 120000 srcpkgs/firefox-i18n-ur
 create mode 100755 srcpkgs/firefox-i18n/files/update-lang-list
 create mode 100644 srcpkgs/firefox/patches/initialize_sched_param.patch
 delete mode 100644 srcpkgs/firefox/patches/ppc64le-bug-1512162.patch
 delete mode 100644 srcpkgs/flatbuffers/patches/install.patch
 create mode 100644 srcpkgs/fmtools/template
 create mode 100644 srcpkgs/freecad/patches/020-namespace-missing-std.patch
 create mode 100644 srcpkgs/fuse-mp3fs/template
 create mode 100644 srcpkgs/gcc/files/gccgo-musl.patch
 delete mode 100644 srcpkgs/gcc/patches/bug90756.patch
 create mode 100644 srcpkgs/gcc/patches/darn.patch
 create mode 100644 srcpkgs/gcc/patches/libffi_gnulinux.patch
 delete mode 100644 srcpkgs/gcc/patches/non-nullness.patch
 create mode 100644 srcpkgs/geda/patches/snarf_cpp_opts.patch
 create mode 100644 srcpkgs/gfuzz/template
 create mode 100644 srcpkgs/git-mediate/template
 delete mode 100644 srcpkgs/gnome-builder/patches/dont-require-FNM_EXTMATCH.patch
 delete mode 100644 srcpkgs/gnome-contacts/patches/ambiguous.patch
 create mode 120000 srcpkgs/gnome-mpv
 delete mode 100644 srcpkgs/gnome-mpv/template
 delete mode 100644 srcpkgs/gnome-todo/patches/6cdabc4dd0c6c804a093b94c269461ce376fed4f.patch
 create mode 100644 srcpkgs/gnome-todo/patches/gnome-todo-eds-libecal-2.0.patch
 create mode 100644 srcpkgs/gnupg2/patches/use-versioned-pcsclite.patch
 create mode 100644 srcpkgs/go-review/template
 create mode 100644 srcpkgs/go/patches/gohostarch-bootstrap-fix.patch
 create mode 100644 srcpkgs/gomatrix/template
 create mode 100644 srcpkgs/gopls/template
 create mode 100644 srcpkgs/gperftools/patches/elf-mem-image-musl.patch
 create mode 100644 srcpkgs/gperftools/patches/ppc-musl.patch
 create mode 100644 srcpkgs/gsl/patches/ppc-musl.patch
 create mode 100644 srcpkgs/gucci/template
 delete mode 100644 srcpkgs/guitarix2/patches/musl.patch
 delete mode 100644 srcpkgs/gutenprint/patches/musl.patch
 create mode 120000 srcpkgs/gxi
 delete mode 100644 srcpkgs/gxi/template
 create mode 100644 srcpkgs/i3status/patches/pulseaudio-optional.patch
 create mode 100644 srcpkgs/ibus-m17n/INSTALL.msg
 create mode 100644 srcpkgs/ibus-m17n/template
 rename srcpkgs/{firefox-esr/patches/fix-musl.patch => icecat/patches/fix-gettid.patch} (61%)
 delete mode 100644 srcpkgs/icecat/patches/fix-musl.patch
 create mode 100644 srcpkgs/icecat/patches/rust-cssparser.patch
 delete mode 100644 srcpkgs/icewm/patches/use-NULL.patch
 create mode 100644 srcpkgs/jbig2dec/patches/2002_abi_compat.patch
 create mode 120000 srcpkgs/jreen-qt5
 delete mode 100644 srcpkgs/jreen-qt5/template
 delete mode 100644 srcpkgs/juCi++/patches/libgit2-0.28.patch
 create mode 100755 srcpkgs/k3s/files/k3s-agent/log/run
 create mode 100755 srcpkgs/k3s/files/k3s-agent/run
 create mode 100755 srcpkgs/k3s/files/k3s-server/log/run
 create mode 100755 srcpkgs/k3s/files/k3s-server/run
 create mode 100644 srcpkgs/k3s/template
 create mode 120000 srcpkgs/kColorPicker-devel
 create mode 100644 srcpkgs/kColorPicker/template
 create mode 120000 srcpkgs/kImageAnnotator-devel
 create mode 100644 srcpkgs/kImageAnnotator/template
 create mode 120000 srcpkgs/kbfs
 delete mode 100644 srcpkgs/kbfs/template
 delete mode 100644 srcpkgs/kea/patches/fix-musl-getopt.patch
 rename srcpkgs/{kbfs/INSTALL => keybase/kbfs.INSTALL} (100%)
 create mode 100644 srcpkgs/kgpg/template
 delete mode 100644 srcpkgs/kitty/patches/musl.patch
 delete mode 120000 srcpkgs/kodi-rpi/files/swig.nojava-18.3
 create mode 120000 srcpkgs/kodi-rpi/files/swig.nojava-18.4
 rename srcpkgs/kodi/files/{swig.nojava-18.3 => swig.nojava-18.4}/AddonModuleXbmc.i.cpp (99%)
 rename srcpkgs/kodi/files/{swig.nojava-18.3 => swig.nojava-18.4}/AddonModuleXbmc.i.xml (61%)
 rename srcpkgs/kodi/files/{swig.nojava-18.3 => swig.nojava-18.4}/AddonModuleXbmcaddon.i.cpp (99%)
 rename srcpkgs/kodi/files/{swig.nojava-18.3 => swig.nojava-18.4}/AddonModuleXbmcaddon.i.xml (58%)
 rename srcpkgs/kodi/files/{swig.nojava-18.3 => swig.nojava-18.4}/AddonModuleXbmcdrm.i.cpp (99%)
 rename srcpkgs/kodi/files/{swig.nojava-18.3 => swig.nojava-18.4}/AddonModuleXbmcdrm.i.xml (59%)
 rename srcpkgs/kodi/files/{swig.nojava-18.3 => swig.nojava-18.4}/AddonModuleXbmcgui.i.cpp (99%)
 rename srcpkgs/kodi/files/{swig.nojava-18.3 => swig.nojava-18.4}/AddonModuleXbmcgui.i.xml (67%)
 rename srcpkgs/kodi/files/{swig.nojava-18.3 => swig.nojava-18.4}/AddonModuleXbmcplugin.i.cpp (99%)
 rename srcpkgs/kodi/files/{swig.nojava-18.3 => swig.nojava-18.4}/AddonModuleXbmcplugin.i.xml (59%)
 rename srcpkgs/kodi/files/{swig.nojava-18.3 => swig.nojava-18.4}/AddonModuleXbmcvfs.i.cpp (99%)
 rename srcpkgs/kodi/files/{swig.nojava-18.3 => swig.nojava-18.4}/AddonModuleXbmcvfs.i.xml (59%)
 rename srcpkgs/kodi/files/{swig.nojava-18.3 => swig.nojava-18.4}/AddonModuleXbmcwsgi.i.cpp (99%)
 rename srcpkgs/kodi/files/{swig.nojava-18.3 => swig.nojava-18.4}/AddonModuleXbmcwsgi.i.xml (61%)
 create mode 100644 srcpkgs/krita/patches/musl.patch
 delete mode 100644 srcpkgs/ksh/files/LICENSE
 create mode 100644 srcpkgs/ksnip/patches/useGNUInstallDirs.patch
 create mode 100644 srcpkgs/ksnip/template
 delete mode 100644 srcpkgs/libGL/patches/add-glx-use-tls.patch
 create mode 100644 srcpkgs/libGL/patches/add-use-elf-tls.patch
 create mode 100644 srcpkgs/libGL/patches/ppc-auxval.patch
 create mode 100644 srcpkgs/libcmis/patches/no-include-cxx-headers-from-extern-c.patch
 create mode 100644 srcpkgs/libcxx/patches/ppc.patch
 delete mode 100644 srcpkgs/libgit2-0.27/template
 delete mode 100644 srcpkgs/libgit2-0.27/update
 delete mode 100644 srcpkgs/libgweather/patches/conditionalize-gir.patch
 create mode 120000 srcpkgs/libknet1-devel
 create mode 100644 srcpkgs/libknet1/patches/01_musl_fix.diff
 create mode 100644 srcpkgs/libknet1/template
 create mode 120000 srcpkgs/libllvm9
 create mode 120000 srcpkgs/libluv-devel
 create mode 100644 srcpkgs/libluv/template
 delete mode 100644 srcpkgs/libnl3/patches/musl.patch
 create mode 120000 srcpkgs/libnozzle1
 create mode 120000 srcpkgs/libnozzle1-devel
 delete mode 100644 srcpkgs/libpcap/patches/fix-musl.patch
 create mode 120000 srcpkgs/libpwquality-python3
 create mode 100644 srcpkgs/libsigsegv/patches/ppc-musl.patch
 create mode 120000 srcpkgs/liburing-devel
 create mode 100644 srcpkgs/liburing/template
 create mode 120000 srcpkgs/libvarnishapi
 create mode 120000 srcpkgs/libvarnishapi-devel
 create mode 120000 srcpkgs/libxfce4panel
 create mode 100644 srcpkgs/licensor/template
 delete mode 100644 srcpkgs/linux-tools/patches/turbostat.patch
 delete mode 100644 srcpkgs/linux4.4/patches/gcc9.patch
 delete mode 120000 srcpkgs/linux5.1-dbg
 delete mode 120000 srcpkgs/linux5.1-headers
 create mode 120000 srcpkgs/linux5.3-dbg
 create mode 120000 srcpkgs/linux5.3-headers
 rename srcpkgs/{linux5.1 => linux5.3}/files/DocBook/Makefile (100%)
 rename srcpkgs/{linux5.1 => linux5.3}/files/arm-dotconfig (91%)
 rename srcpkgs/{linux5.1 => linux5.3}/files/arm64-dotconfig (91%)
 rename srcpkgs/{linux5.1 => linux5.3}/files/i386-dotconfig (92%)
 rename srcpkgs/{linux5.1 => linux5.3}/files/mv-debug (100%)
 rename srcpkgs/{linux5.1 => linux5.3}/files/ppc-dotconfig (93%)
 rename srcpkgs/{linux5.1 => linux5.3}/files/ppc64-dotconfig (92%)
 rename srcpkgs/{linux5.1 => linux5.3}/files/ppc64le-dotconfig (92%)
 rename srcpkgs/{linux5.1 => linux5.3}/files/x86_64-dotconfig (92%)
 rename srcpkgs/{linux5.1 => linux5.3}/patches/ppc64-be-elfv2.patch (100%)
 rename srcpkgs/{linux5.1 => linux5.3}/patches/smsc95xx-mac.patch (100%)
 rename srcpkgs/{linux5.1 => linux5.3}/template (96%)
 create mode 100644 srcpkgs/llvm-libunwind/patches/ppc32.patch
 create mode 100644 srcpkgs/llvm9/files/llvm-Config-config.h
 create mode 100644 srcpkgs/llvm9/files/llvm-Config-llvm-config.h
 create mode 100644 srcpkgs/llvm9/files/patches/cfe/cfe-001-fix-unwind-chain-inclusion.patch
 create mode 100644 srcpkgs/llvm9/files/patches/cfe/cfe-002-add-musl-triples.patch
 create mode 100644 srcpkgs/llvm9/files/patches/cfe/cfe-003-ppc64-dynamic-linker-path.patch
 create mode 100644 srcpkgs/llvm9/files/patches/cfe/cfe-004-ppc64-musl-elfv2.patch
 create mode 100644 srcpkgs/llvm9/files/patches/cfe/cfe-005-gcc9.patch
 create mode 100644 srcpkgs/llvm9/files/patches/lldb/musl.patch
 create mode 100644 srcpkgs/llvm9/files/patches/llvm/llvm-001-musl.patch
 create mode 100644 srcpkgs/llvm9/files/patches/llvm/llvm-002-musl-ppc64-elfv2.patch
 create mode 100644 srcpkgs/llvm9/files/patches/llvm/llvm-003-secureplt.patch
 create mode 100644 srcpkgs/llvm9/files/patches/llvm/llvm-004-override-opt.patch
 create mode 100644 srcpkgs/llvm9/template
 create mode 100644 srcpkgs/llvm9/update
 create mode 100755 srcpkgs/lprng/files/lprng/run
 create mode 100644 srcpkgs/lprng/template
 create mode 100644 srcpkgs/lsd/template
 create mode 100755 srcpkgs/lsyncd/files/lsyncd/log/run
 create mode 100644 srcpkgs/magic-wormhole/template
 create mode 100644 srcpkgs/mariadb/patches/force-c11-atomics.patch
 create mode 100644 srcpkgs/mariadb/patches/libatomic.patch
 create mode 100644 srcpkgs/mariadb/patches/musl-ppc.patch
 create mode 100644 srcpkgs/mftrace/patches/gf2pbm.1.patch
 create mode 100644 srcpkgs/minijail/template
 create mode 120000 srcpkgs/mkpasswd
 create mode 100644 srcpkgs/mono/patches/fix-heapviz-import.patch
 create mode 100644 srcpkgs/mono/patches/musl.patch
 create mode 100644 srcpkgs/monolith/template
 create mode 100644 srcpkgs/moserial/template
 create mode 100644 srcpkgs/mpDris2/files/mpDris2/run
 create mode 100644 srcpkgs/mpDris2/template
 create mode 100644 srcpkgs/mtm/template
 delete mode 100644 srcpkgs/mumble/patches/musl-dlsym.patch
 delete mode 100644 srcpkgs/mumble/patches/protobuf-370.patch
 delete mode 100644 srcpkgs/mumble/patches/speech-dispatcher.patch
 delete mode 100644 srcpkgs/mumble/patches/std-float.patch
 delete mode 100644 srcpkgs/mutter/patches/meta-renderer-x11.patch
 create mode 100644 srcpkgs/mymcplus/template
 create mode 100644 srcpkgs/next/template
 delete mode 100644 srcpkgs/nilfs-utils/patches/max-input.patch
 delete mode 100644 srcpkgs/nilfs-utils/patches/rpc-types.patch
 delete mode 100644 srcpkgs/nvidia390/files/kernel-5.1-x86_64.patch
 delete mode 100644 srcpkgs/nvidia390/files/kernel-5.1.patch
 delete mode 100644 srcpkgs/nvidia390/files/kernel-5.2-x86_64.patch
 create mode 100644 srcpkgs/nvme-cli/INSTALL
 create mode 100644 srcpkgs/nvme-cli/REMOVE
 create mode 100644 srcpkgs/occt/files/opencascade.sh
 delete mode 100644 srcpkgs/open-iscsi/patches/ether.patch
 delete mode 100644 srcpkgs/open-iscsi/patches/fix-musl-2.patch
 delete mode 100644 srcpkgs/open-vm-tools/patches/gcc9.patch
 create mode 100644 srcpkgs/opendkim/files/opendkim/run
 delete mode 100644 srcpkgs/openssh/patches/setproctitle.patch
 create mode 100644 srcpkgs/pam_rundir/patches/fix.patch
 create mode 100644 srcpkgs/papi/patches/gnu_source.patch
 create mode 100644 srcpkgs/paraview/template
 delete mode 100644 srcpkgs/parted/patches/fix-glibc-2.27.patch
 delete mode 100644 srcpkgs/parted/patches/fix-includes.patch
 create mode 100644 srcpkgs/passphrase2pgp/template
 create mode 100644 srcpkgs/pastel/template
 create mode 100644 srcpkgs/pd/patches/fix-musl.patch
 create mode 100644 srcpkgs/pdsh/patches/fix_configure_ac.patch
 create mode 100644 srcpkgs/pdsh/template
 create mode 100644 srcpkgs/perl-Curses-UI/template
 create mode 100644 srcpkgs/perl-Math-FFT/template
 delete mode 100644 srcpkgs/perl-WWW-Curl/patches/CURL_STRICTER.patch
 create mode 100644 srcpkgs/perl-WWW-Curl/patches/curl-7.50.2.patch
 create mode 100644 srcpkgs/peru/template
 create mode 100644 srcpkgs/pfetch/template
 create mode 100644 srcpkgs/pioneer/update
 create mode 100644 srcpkgs/pkgtop/template
 create mode 100644 srcpkgs/plasma-thunderbolt/template
 create mode 100644 srcpkgs/plata-theme/INSTALL.msg
 delete mode 100644 srcpkgs/png++/patches/musl-error.patch
 delete mode 100644 srcpkgs/poedit/patches/LearnMoreLink.patch
 create mode 100644 srcpkgs/poezio/update
 create mode 100644 srcpkgs/postgis/patches/postgis-2.5.3-PROTOCC_VERSION.patch
 create mode 100644 srcpkgs/postgis/update
 create mode 100644 srcpkgs/proot/patches/disable-seccomp-based-tracing.patch
 create mode 100644 srcpkgs/proot/patches/makefile-fix-vars.patch
 create mode 100644 srcpkgs/protontricks/template
 delete mode 100644 srcpkgs/pulseaudio/patches/fix-alsa-module.patch
 create mode 100644 srcpkgs/pyradio/INSTALL.msg
 create mode 100644 srcpkgs/pyradio/template
 delete mode 100644 srcpkgs/python-cryptography/patches/libressl.patch
 create mode 100644 srcpkgs/python-cryptography_vectors/template
 create mode 100644 srcpkgs/python-fonttools/update
 delete mode 100644 srcpkgs/python-html2text/template
 create mode 100644 srcpkgs/python-iso-8601/template
 create mode 120000 srcpkgs/python-pafy
 delete mode 100644 srcpkgs/python-pafy/template
 create mode 100644 srcpkgs/python-pretend/template
 create mode 100644 srcpkgs/python-rfc6555/template
 delete mode 100644 srcpkgs/python-scikit-learn/template
 delete mode 100644 srcpkgs/python-scipy/template
 delete mode 100644 srcpkgs/python-zeroconf/template
 delete mode 100644 srcpkgs/python-zeroconf/update
 create mode 100644 srcpkgs/python3-Flask-HTTPAuth/template
 create mode 100644 srcpkgs/python3-PyJWT/template
 delete mode 120000 srcpkgs/python3-astroid
 create mode 100644 srcpkgs/python3-astroid/template
 create mode 100644 srcpkgs/python3-autobahn/template
 rename srcpkgs/{python-bcc => python3-bcc} (100%)
 create mode 120000 srcpkgs/python3-cryptography_vectors
 create mode 100644 srcpkgs/python3-distro/template
 create mode 100644 srcpkgs/python3-fido2/template
 delete mode 120000 srcpkgs/python3-fonttools
 create mode 100644 srcpkgs/python3-fonttools/template
 create mode 100644 srcpkgs/python3-hkdf/template
 delete mode 120000 srcpkgs/python3-html2text
 create mode 100644 srcpkgs/python3-html2text/template
 create mode 120000 srcpkgs/python3-iso-8601
 create mode 100644 srcpkgs/python3-libevdev/template
 create mode 120000 srcpkgs/python3-mechanize
 create mode 100644 srcpkgs/python3-mpi4py/template
 delete mode 120000 srcpkgs/python3-pafy
 create mode 100644 srcpkgs/python3-pafy/template
 delete mode 120000 srcpkgs/python3-pandas
 rename srcpkgs/{python-pandas/python3-pandas.INSTALL.msg => python3-pandas/INSTALL.msg} (100%)
 create mode 100644 srcpkgs/python3-pandas/template
 create mode 100644 srcpkgs/python3-pandas/update
 create mode 120000 srcpkgs/python3-pretend
 create mode 100644 srcpkgs/python3-pyfiglet/template
 delete mode 120000 srcpkgs/python3-pylint
 create mode 100644 srcpkgs/python3-pylint/template
 create mode 120000 srcpkgs/python3-regex
 create mode 120000 srcpkgs/python3-rfc6555
 create mode 100644 srcpkgs/python3-rss2email/template
 create mode 100644 srcpkgs/python3-scard/template
 delete mode 120000 srcpkgs/python3-scikit-learn
 create mode 100644 srcpkgs/python3-scikit-learn/template
 delete mode 120000 srcpkgs/python3-scipy
 create mode 100644 srcpkgs/python3-scipy/template
 rename srcpkgs/{python-scipy => python3-scipy}/update (100%)
 create mode 100644 srcpkgs/python3-spake2/template
 create mode 100644 srcpkgs/python3-tinycss/template
 create mode 100644 srcpkgs/python3-txaio/template
 create mode 100644 srcpkgs/python3-txtorcon/template
 create mode 100644 srcpkgs/python3-usb/template
 create mode 100644 srcpkgs/python3-vdf/template
 create mode 100644 srcpkgs/qt/patches/gcc9-qforeach.patch
 create mode 100644 srcpkgs/qt5-webkit/patches/musl-ppc.patch
 create mode 100644 srcpkgs/qt5-webkit/patches/ppc-llint.patch
 create mode 100644 srcpkgs/qt5-webkit/patches/reduce-exports.patch
 create mode 100644 srcpkgs/qt5/patches/0027-remove-glibc-check.patch
 delete mode 100644 srcpkgs/qt5/patches/0048-qtbug-76742.patch
 create mode 100644 srcpkgs/qt5/patches/0049-big-endian-scroll.patch
 create mode 100644 srcpkgs/qt5/patches/0050-pulse-stubs.patch
 create mode 100644 srcpkgs/qt5/patches/0100-qtbug-77364.patch
 create mode 100644 srcpkgs/qtcreator/patches/clang9.patch
 create mode 100644 srcpkgs/qtcurve/patches/gtkprops_constexpr.patch
 create mode 100644 srcpkgs/rakudo/patches/fix-perl6-home-dir.patch
 delete mode 100644 srcpkgs/range-v3/patches/fix-is_trivial.patch
 create mode 100644 srcpkgs/reap/template
 delete mode 100644 srcpkgs/riot-desktop/patches/electron5.patch
 create mode 100644 srcpkgs/rsClock/template
 create mode 100644 srcpkgs/rust/patches/0007-Fix-C-aggregate-passing-ABI-on-powerpc.patch
 delete mode 100644 srcpkgs/rust/patches/0007-runtest-Fix-proc-macro-tests-on-musl-hosts.patch
 create mode 100644 srcpkgs/rust/patches/0008-Fix-zero-sized-aggregate-ABI-on-powerpc.patch
 create mode 100644 srcpkgs/rust/patches/0009-compiletest-Match-suffixed-environments.patch
 create mode 100644 srcpkgs/rust/patches/0010-test-c-variadic-Fix-patterns-on-powerpc64.patch
 rename srcpkgs/rust/patches/{0008-test-use-extern-for-plugins-Don-t-assume-multilib.patch => 0011-test-use-extern-for-plugins-Don-t-assume-multilib.patch} (79%)
 rename srcpkgs/rust/patches/{0009-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch => 0012-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch} (80%)
 rename srcpkgs/rust/patches/{0010-Ignore-broken-and-non-applicable-tests.patch => 0013-Ignore-broken-and-non-applicable-tests.patch} (71%)
 rename srcpkgs/rust/patches/{0011-Link-stage-2-tools-dynamically-to-libstd.patch => 0014-Link-stage-2-tools-dynamically-to-libstd.patch} (75%)
 rename srcpkgs/rust/patches/{0012-Move-debugger-scripts-to-usr-share-rust.patch => 0015-Move-debugger-scripts-to-usr-share-rust.patch} (85%)
 create mode 100644 srcpkgs/rust/patches/0091-bootstrap.patch
 delete mode 100644 srcpkgs/rust/patches/0091-lzma-sys-cross-ldflags.patch
 delete mode 100644 srcpkgs/sakura/patches/0002-Fixed-crash-with-vte-0.54-Bug-1790317.patch
 create mode 100644 srcpkgs/saml2aws/template
 create mode 100644 srcpkgs/scc/template
 create mode 100644 srcpkgs/shiboken2/patches/qstringlist.patch
 create mode 100644 srcpkgs/sops/template
 create mode 100644 srcpkgs/spotify-adblock-linux/files/spotify-adblock.desktop
 create mode 100644 srcpkgs/spotify-adblock-linux/template
 create mode 100644 srcpkgs/spotify-tui/template
 create mode 100644 srcpkgs/sqlmap/template
 delete mode 100644 srcpkgs/squashfs-tools/patches/CVE-2015-4645.patch
 delete mode 100644 srcpkgs/squashfs-tools/patches/fix-compat.patch
 delete mode 100644 srcpkgs/squashfs-tools/patches/vla-overlow.patch
 delete mode 100644 srcpkgs/stagit/patches/libgit2-0.28.patch
 create mode 100644 srcpkgs/starship/template
 delete mode 100644 srcpkgs/supercollider/patches/bbcd068659ced596402dedc78f49fabfab6470bd.patch
 create mode 100644 srcpkgs/swell-foop/patches/pivot_point.patch
 delete mode 100644 srcpkgs/synapse/patches/bump-python-dependencies.patch
 create mode 100644 srcpkgs/sysexxer-ng/template
 create mode 100644 srcpkgs/tarpaulin/template
 create mode 100644 srcpkgs/tau/template
 create mode 100644 srcpkgs/telegram-desktop/patches/stdafx.h.patch
 create mode 100644 srcpkgs/termdown/template
 delete mode 100644 srcpkgs/thunderbird/patches/disable-hunspell_hooks.patch
 create mode 100644 srcpkgs/thunderbird/patches/disable-image-format-warning.patch
 create mode 100644 srcpkgs/thunderbird/patches/fix-arm-opus-include.patch
 create mode 100644 srcpkgs/thunderbird/patches/fix-i686-ppc-musl.patch
 delete mode 100644 srcpkgs/thunderbird/patches/fix-rust-1.29.patch
 create mode 100644 srcpkgs/thunderbird/patches/fix-sandbox-membarrier.patch
 create mode 100644 srcpkgs/thunderbird/patches/fix-wasm-arm.patch
 delete mode 100644 srcpkgs/thunderbird/patches/fix-xpcom.patch
 create mode 100644 srcpkgs/thunderbird/patches/ppc32-skia-portable.patch
 create mode 100644 srcpkgs/thunderbird/patches/rust-configure.patch
 create mode 100644 srcpkgs/thunderbird/patches/rust-cssparser.patch
 delete mode 100644 srcpkgs/thunderbird/patches/rust-unitialized-field.patch
 delete mode 100644 srcpkgs/thunderbird/patches/rust133.patch
 create mode 100644 srcpkgs/thunderbird/patches/yuv-be.patch
 create mode 100644 srcpkgs/tor/patches/ppc.patch
 delete mode 100644 srcpkgs/tor/patches/ppc64.patch
 create mode 100644 srcpkgs/torbrowser-launcher/template
 create mode 100644 srcpkgs/usbguard/files/usbguard/run
 create mode 100644 srcpkgs/usbguard/patches/musl.patch
 create mode 100644 srcpkgs/usbguard/template
 create mode 100644 srcpkgs/util-linux/patches/chsh.patch
 delete mode 100644 srcpkgs/varnish/INSTALL.msg
 create mode 100755 srcpkgs/varnish/files/varnishd/log/run
 create mode 100755 srcpkgs/varnish/files/varnishd/run
 create mode 100644 srcpkgs/varnish/patches/musl.patch
 create mode 100644 srcpkgs/varnish/update
 create mode 100644 srcpkgs/vmpk/template
 delete mode 100644 srcpkgs/vpnc-scripts/patches/fix-ipv6.patch
 delete mode 100644 srcpkgs/webkit2gtk/patches/fix-fast-memory-disabled.patch
 create mode 100644 srcpkgs/webkit2gtk/patches/ppc-llint.patch
 create mode 120000 srcpkgs/wf-config-devel
 delete mode 100644 srcpkgs/wf-config/patches/fix-musl.patch
 create mode 100644 srcpkgs/wpa-cute/template
 create mode 100644 srcpkgs/xdg-dbus-proxy/patches/musl.patch
 create mode 100644 srcpkgs/xdgmenumaker/files/1.5/xdgmenumaker.1
 create mode 100644 srcpkgs/xpdf/update
 delete mode 100644 srcpkgs/ykpivmgr/patches/libressl.patch
 create mode 100644 srcpkgs/ykpivmgr/patches/ssl_obsolete.patch
 create mode 100644 srcpkgs/yubikey-manager/template
 delete mode 100644 srcpkgs/zaproxy/template
 delete mode 100644 srcpkgs/zaproxy/update

diff --git a/.travis.yml b/.travis.yml
index c6e23258590..d0ffe216573 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,5 @@
 language: bash
+dist: bionic
 
 git:
     depth: 200
diff --git a/common/build-style/cargo.sh b/common/build-style/cargo.sh
index a2a0dfe3744..cff16bee082 100644
--- a/common/build-style/cargo.sh
+++ b/common/build-style/cargo.sh
@@ -18,6 +18,6 @@ do_install() {
 	: ${make_cmd:=cargo}
 
 	${make_cmd} install --path . --target ${RUST_TARGET} --root="${DESTDIR}/usr" \
-		${make_install_args}
+		 --locked ${make_install_args}
 	rm "${DESTDIR}"/usr/.crates.toml
 }
diff --git a/common/build-style/meson.sh b/common/build-style/meson.sh
index 160dc16b417..d318978ea59 100644
--- a/common/build-style/meson.sh
+++ b/common/build-style/meson.sh
@@ -69,6 +69,10 @@ cpu_family = '${_MESON_CPU_FAMILY}'
 cpu = '${_MESON_TARGET_CPU}'
 endian = '${_MESON_TARGET_ENDIAN}'
 EOF
+		if [ "${hostmakedepends}" != "${hostmakedepends/qemu-user-static/}" ]; then
+			sed -e "/\[binaries\]/ a exe_wrapper = '/usr/bin/qemu-${XBPS_TARGET_QEMU_MACHINE}-static'" \
+				-i ${meson_crossfile}
+		fi
 
 		unset _MESON_CPU_FAMILY _MESON_TARGET_CPU _MESON_TARGET_ENDIAN
 	fi
@@ -78,6 +82,7 @@ do_configure() {
 	: ${meson_cmd:=meson}
 	: ${meson_builddir:=build}
 	: ${meson_crossfile:=xbps_meson.cross}
+	export QEMU_LD_PREFIX=${XBPS_CROSS_BASE}
 
 	if [ "$CROSS_BUILD" ]; then
 		configure_args+=" --cross-file=${meson_crossfile}"
@@ -130,6 +135,7 @@ do_build() {
 	: ${make_cmd:=ninja}
 	: ${make_build_target:=all}
 	: ${meson_builddir:=build}
+	export QEMU_LD_PREFIX=${XBPS_CROSS_BASE}
 
 	${make_cmd} -C ${meson_builddir} ${makejobs} ${make_build_args} ${make_build_target}
 }
@@ -146,6 +152,7 @@ do_install() {
 	: ${make_cmd:=ninja}
 	: ${make_install_target:=install}
 	: ${meson_builddir:=build}
+	export QEMU_LD_PREFIX=${XBPS_CROSS_BASE}
 
 	DESTDIR=${DESTDIR} ${make_cmd} -C ${meson_builddir} ${make_install_args} ${make_install_target}
 }
diff --git a/common/shlibs b/common/shlibs
index c95b078e0bf..cc3fd8383d8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -60,7 +60,7 @@ libgcc_s.so.1 libgcc-4.4.0_1
 libgo.so.14 libgo-9.1.0_1
 libmpx.so.2 libmpx-6.2.1_1
 libmpxwrappers.so.2 libmpx-6.2.1_1
-libperl.so.5.28 perl-5.28.0_1
+libperl.so.5.30 perl-5.30.0_1
 libgmp.so.10 gmp-5.0.1_1
 libgmpxx.so.4 gmpxx-6.0.0_2
 libmpfr.so.6 mpfr-4.0.0_1
@@ -146,8 +146,8 @@ libnvidia-gtk3.so.346.47 nvidia-gtklibs-346.47_1 ignore
 libnvidia-glcore.so.346.47 nvidia340-libs-340.46_1 ignore
 libnvidia-glcore.so.390.87 nvidia390-libs-390.87_1 ignore
 libnvidia-glsi.so.346.72 nvidia-libs-346.72_1 ignore
-libnvidia-fatbinaryloader.so.390.116 nvidia390-libs-390.116_1 ignore
-libnvidia-fatbinaryloader.so.430.14 nvidia-libs-430.14_1 ignore
+libnvidia-fatbinaryloader.so.390.129 nvidia390-libs-390.129_1 ignore
+libnvidia-fatbinaryloader.so.430.40 nvidia-libs-430.40_1 ignore
 libglapi.so.0 libglapi-7.11_1
 libgbm.so.1 libgbm-9.0_1
 librsvg-2.so.2 librsvg-2.26.0_1
@@ -182,8 +182,8 @@ libreadline.so.8 libreadline8-8.0_1
 libhistory.so.8 libhistory8-8.0_1
 libxfconf-0.so.3 xfconf-4.13.7_1
 libxfce4util.so.7 libxfce4util-4.12.1_1
-libxfce4panel-1.0.so.4 xfce4-panel-4.9.2_1
-libxfce4panel-2.0.so.4 xfce4-panel-4.12.0_1
+libxfce4panel-1.0.so.4 libxfce4panel-4.9.2_1
+libxfce4panel-2.0.so.4 libxfce4panel-4.12.0_1
 libgdbm.so.6 gdbm-1.16_1
 libgdbm_compat.so.4 gdbm-1.10_1_1
 libintl.so.8 gettext-libs-0.19.2_1
@@ -354,7 +354,7 @@ libMagickCore-6.Q16.so.6 libmagick6-6.9.10.11_1
 libMagickWand-6.Q16.so.6 libmagick6-6.9.10.11_1
 libMagick++-6.Q16.so.8 libmagick6-6.9.10.11_1
 libltdl.so.7 libltdl-2.2.6_1
-libpoppler.so.89 libpoppler89-0.78.0_1
+libpoppler.so.90 libpoppler89-0.80.0_1
 libpoppler-glib.so.8 poppler-glib-0.18.2_1
 libpoppler-cpp.so.0 poppler-cpp-0.18.2_1
 libpoppler-qt5.so.1 poppler-qt5-0.31.0_1
@@ -541,6 +541,8 @@ libkdexoauth2.so.3 kdepim-runtime-17.12.3_1
 libakonadi-filestore.so.5 kdepim-runtime-17.12.3_1
 libmaildir.so.5 kdepim-runtime-17.12.3_1
 libfolderarchivesettings.so.5 kdepim-runtime-17.12.3_1
+libkColorPicker.so.0.1.0 kColorPicker-0.1.0_1
+libkImageAnnotator.so.0.1.0 kImageAnnotator-0.1.0_1
 libbabl-0.1.so.0 babl-0.1.16_1
 libbamf3.so.2 bamf-0.5.1_1
 libicuio.so.64 icu-libs-64.1_1
@@ -624,16 +626,16 @@ libcamel-1.2.so.62 evolution-data-server-3.30.0_1
 libedataserver-1.2.so.24 evolution-data-server-3.32.0_1
 libebackend-1.2.so.10 evolution-data-server-3.17.90_1
 libedataserverui-1.2.so.2 evolution-data-server-3.28.0_1
-libebook-contacts-1.2.so.2 evolution-data-server-3.17.90_1
-libedata-book-1.2.so.25 evolution-data-server-3.8.0_1
-libebook-1.2.so.19 evolution-data-server-3.24.0_1
-libecal-1.2.so.19 evolution-data-server-3.18.0_1
+libebook-contacts-1.2.so.3 evolution-data-server-3.34.0_1
+libedata-book-1.2.so.26 evolution-data-server-3.34.0_1
+libebook-1.2.so.20 evolution-data-server-3.34.0_1
+libecal-2.0.so.1 evolution-data-server-3.34.0_1
 libevolution-calendar.so evolution-3.28.0_1
 libevolution-util.so evolution-3.28.0_1
 libemail-engine.so evolution-3.28.0_1
 libevolution-mail.so evolution-3.28.0_1
 libevolution-shell.so evolution-3.28.0_1
-libedata-cal-1.2.so.29 evolution-data-server-3.30.0_1
+libedata-cal-2.0.so.1 evolution-data-server-3.34.0_1
 libgdata.so.22 libgdata-0.17.9_1
 libpcap.so.1 libpcap-1.1.1_1
 libiptc.so.0 iptables-1.4.7_1
@@ -758,8 +760,8 @@ libasyncns.so.0 libasyncns-0.8_1
 libpulse.so.0 libpulseaudio-1.0_1
 libpulse-mainloop-glib.so.0 libpulseaudio-1.0_1
 libpulse-simple.so.0 libpulseaudio-1.0_1
-libpulsecommon-12.2.so libpulseaudio-12.2_1
-libpulsecore-12.2.so libpulseaudio-12.2_1
+libpulsecommon-13.0.so libpulseaudio-13.0_1
+libpulsecore-13.0.so libpulseaudio-13.0_1
 liborc-0.4.so.0 orc-0.4.11_1
 liborc-test-0.4.so.0 orc-0.4.11_1
 libgmime-2.6.so.0 gmime-2.6.4_1
@@ -1019,13 +1021,13 @@ libuchardet.so.0 uchardet-0.0.6_1
 libgtksourceviewmm-3.0.so.0 gtksourceviewmm-3.2.0_1
 libyajl.so.2 yajl-2.0.1_1
 libconfuse.so.2 confuse-3.2.1_1
-liblldb.so.8 lldb-8.0.0_1
-libclang.so.8 clang-8.0.0_1
+liblldb.so.9 lldb-9.0.0_1
+libclang.so.9 clang-9.0.0_1
+libclang-cpp.so.9 clang-9.0.0_1
 libLLVM-6.0.so libllvm6.0-6.0.0_1
 libLLVM-7.so libllvm7-7.0.0_1
 libLLVM-8.so libllvm8-8.0.0_1
-libOptRemarks.so.8 libllvm8-8.0.0_1
-libLTO.so.8 libllvm8-8.0.0_1
+libLLVM-9.so libllvm9-9.0.0_1
 libisofs.so.6 libisofs-0.6.24_1
 libmpack.so.0 libmpack-1.0.5_1
 libGeoIP.so.1 libgeoip-1.4.8_1
@@ -1046,7 +1048,7 @@ libtirpc.so.3 libtirpc-1.0.2_1
 librpcsecgss.so.3 librpcsecgss-0.19_1
 libnfsidmap.so.0 libnfsidmap-0.24_1
 libbind9.so.161 bind-libs-9.11.5_1
-libdns.so.1106 bind-libs-9.11.7_1
+libdns.so.1107 bind-libs-9.11.10_1
 libirs.so.161 bind-libs-9.11.5_1
 libisc.so.1100 bind-libs-9.11.5_1
 libisccc.so.161 bind-libs-9.11.5_1
@@ -1129,7 +1131,7 @@ libsbc.so.1 sbc-1.0_1
 libecryptfs.so.1 libecryptfs-104_1
 libnuma.so.1 libnuma-2.0.7_1
 libxar.so.1 xar-1.5.2_1
-libqpdf.so.21 libqpdf-8.0.0_1
+libqpdf.so.26 libqpdf-9.0.2_1
 libmikmod.so.3 libmikmod-3.1.12_1
 libSDL_sound-1.0.so.1 SDL_sound-1.0.3_1
 libgtksourceview-2.0.so.0 gtksourceview2-2.10.5_1
@@ -1149,6 +1151,7 @@ libguess.so.1 libguess-1.1_1
 libaudcore.so.5 audacious-3.9_1
 libaudgui.so.5 audacious-3.9_1
 libaudtag.so.3 audacious-3.8_1
+libaudqt.so.2 audacious-3.10.1_2
 libgstreamer-1.0.so.0 gstreamer1-1.0.0_1
 libgstbase-1.0.so.0 gstreamer1-1.0.0_1
 libgstcontroller-1.0.so.0 gstreamer1-1.0.0_1
@@ -1172,9 +1175,9 @@ libgstbasecamerabinsrc-1.0.so.0 gst-plugins-bad1-1.0.0_1
 libgstcodecparsers-1.0.so.0 gst-plugins-bad1-1.0.0_1
 libgstplayer-1.0.so.0 gst-plugins-bad1-1.0.0_1
 libgstgl-1.0.so.0 gst-plugins-base1-1.14.0_1
-libgnome-desktop-3.so.17 gnome-desktop-3.28.0_1
+libgnome-desktop-3.so.18 gnome-desktop-3.34.0_1
 libsecret-1.so.0 libsecret-0.10_1
-libgweather-3.so.15 libgweather-3.28.0_1
+libgweather-3.so.16 libgweather-3.34.0_1
 libgnomekbd.so.8 libgnomekbd-3.6.0_1
 libgnomekbdui.so.8 libgnomekbd-3.6.0_1
 libibus-1.0.so.5 ibus-1.4.99.20120917_1
@@ -1217,8 +1220,8 @@ libHX.so.28 libHX-3.14_1
 libxkbcommon.so.0 libxkbcommon-0.2.0_1
 libxkbcommon-x11.so.0 libxkbcommon-x11-0.4.2_1
 libgee-0.8.so.2 libgee08-0.8.2_1
-libnettle.so.6 nettle-3.2_1
-libhogweed.so.4 nettle-3.2_1
+libnettle.so.7 nettle-3.5.1_1
+libhogweed.so.5 nettle-3.5.1_1
 libgtkspell.so.0 gtkspell-2.0.16_1
 libgtkspell3-3.so.0 gtkspell3-3.0.9_1
 libpurple.so.0 libpurple-2.10.6_1
@@ -1298,6 +1301,7 @@ libunwind-aarch64.so.8 libunwind-1.2rc1_1
 libunwind-ppc32.so.8 libunwind-1.2.1_1
 libunwind-ppc64.so.8 libunwind-1.2.1_1
 libmicrohttpd.so.12 libmicrohttpd-0.9.48_1
+libmicrodns.so.0 libmicrodns-0.1.0_1
 libgit2.so.28 libgit2-0.28.0_1
 libgit2-glib-1.0.so.0 libgit2-glib-0.23.4_1
 libagg.so.2 agg-2.5_1
@@ -1309,7 +1313,7 @@ libkworkspace5.so.5 kworkspace-5.14.5_2
 libdb-5.3.so libdb-5.3.21_1
 libdb_cxx-5.3.so libdb-cxx-5.3.21_1
 libcares.so.2 c-ares-1.10.0_1
-libcryptopp.so.5.6 crypto++-565_1
+libcryptopp.so.8 crypto++-820_1
 libphonon.so.4 phonon-4.6.0_1
 libphononexperimental.so.4 phonon-4.6.0_1
 libdbusmenu-glib.so.4 libdbusmenu-glib-12.10.2_1
@@ -1326,8 +1330,8 @@ libodbcinst.so.2 libodbc-2.3.1_1
 libodbc.so.2 libodbc-2.3.1_1
 libiodbc.so.2 libiodbc-3.52.8_1
 libiodbcinst.so.2 libiodbc-3.52.8_1
-libsolarus.so.1 solarus-1.5.3_1
-libsolarus-gui.so solarus-1.5.3_1
+libsolarus.so.1 solarus-1.6.2_1
+libsolarus-gui.so.1 solarus-1.6.2_1
 libplank.so.1 plank-0.11.0_1
 libssh.so.4 libssh-0.5.4_1
 libqjson.so.0 qjson-0.8.1_1
@@ -1756,7 +1760,7 @@ libcblas.so.3 cblas-3.6.0_1
 liblapack.so.3 lapack-3.5.0_1
 libcinnamon-menu-3.so.0 cinnamon-menus-2.2.0_1
 libmate-desktop-2.so.17 mate-desktop-1.8.0_1
-libmarco-private.so.1 libmarco-1.14.0_1
+libmarco-private.so.2 libmarco-1.22.2_1
 libmate-menu.so.2 mate-menus-1.8.0_1
 libcaja-extension.so.1 libcaja-1.8.1_1
 libmatekbd.so.4 libmatekbd-1.8.0_1
@@ -1994,7 +1998,6 @@ libasignify.so.1 asignify-1.0_1
 libvte2_90.so.9 vte290-0.36.3_1
 libd0_blind_id.so.0 xonotic-0.8.0_1
 libechonest.so.2.3 libechonest-2.3.1_1
-libjreen.so.1 jreen-1.2.1_1
 libuecc.so.0 libuecc-5_1
 libKF5WindowSystem.so.5 kwindowsystem-5.6.0_1
 libKF5GuiAddons.so.5 kguiaddons-5.6.0_1
@@ -2063,6 +2066,7 @@ libsfml-graphics.so.2.5 SFML-2.5.0_1
 libclamav.so.9 clamav-0.101.0_1
 libclamunrar.so.9 clamav-0.101.0_1
 libclamunrar_iface.so.9 clamav-0.101.0_1
+libfreshclam.so.2 clamav-0.102.0_1
 libqca-qt5.so.2 qca-qt5-2.1.3_1
 libqt5keychain.so.1 qtkeychain-qt5-0.7.0_1
 libphonon4qt5.so.4 phonon-qt5-4.8.3_1
@@ -2075,7 +2079,7 @@ libechonest5.so.2.3 libechonest-qt5-2.3.0_1
 liblastfm_fingerprint5.so.1 liblastfm-qt5-1.0.9_1
 liblastfm5.so.1 liblastfm-qt5-1.0.9_1
 libquazip5.so.1 quazip-0.7.3_2
-libjreen-qt5.so.1 jreen-qt5-1.2.0_1
+libjreen-qt5.so.1 jreen-1.3.0_1
 libzen.so.0 libzen-0.4.31_1
 libmediainfo.so.0 libmediainfo-0.7.75_1
 libnghttp2.so.14 nghttp2-1.0.2_1
@@ -2104,7 +2108,7 @@ libtesseract.so.4 tesseract-ocr-4.0.0_1
 libffmpegthumbnailer.so.4 ffmpegthumbnailer-2.0.10_1
 libopenraw.so.7 libopenraw-0.1.0_1
 libopenrawgnome.so.7 libopenraw-0.1.0_1
-libgeda.so.42 geda-1.8.2_1
+libgeda.so.46 geda-1.10.0_1
 libclutter-gst-3.0.so.0 clutter-gst3-3.0.4_1
 libgsound.so.0 gsound-1.0.1_1
 libgegl-0.3.so.0 gegl3-0.3.0_1
@@ -2114,7 +2118,7 @@ libprocps.so.7 procps-ng-3.3.15_1
 libgegl-0.4.so.0 gegl-0.4.16_1
 libgegl-npd-0.4.so gegl-0.4.16_1
 libgegl-sc-0.4.so gegl-0.4.16_1
-libskarnet.so.2.8 skalibs-2.8.0.0_1
+libskarnet.so.2.9 skalibs-2.9.0.0_1
 libKF5BalooWidgets.so.5 baloo-widgets5-17.04.3_1
 libtidy.so.5 libtidy5-5.1.25_1
 libSDL2_gfx-1.0.so.0 SDL2_gfx-1.0.1_1
@@ -2254,7 +2258,7 @@ libhidapi-libusb.so.0 hidapi-0.8.0rc1_1
 libu2f-host.so.0 libu2f-host-1.0.0_1
 libu2f-server.so.0 libu2f-server-1.0.1_2
 libsqlcipher.so.0 sqlcipher-3.3.1_1
-libgta.so.0 libgta-1.0.7_1
+libgta.so.1 libgta-1.2.0_1
 libgdal.so.26 libgdal-3.0.0_1
 libosgViewer.so.131 osg-3.4.1_1
 libosgShadow.so.131 osg-3.4.1_1
@@ -2412,20 +2416,20 @@ libxdo.so.3 xdotool-3.20150503.1_1
 libabigail.so.0 libabigail-1.0.rc3_1
 libgnome-games-support-1.so.3 libgnome-games-support-1.4.0_1
 libwlc.so.0 wlc-0.0.2_1
-libKDevClangPrivate.so.31 kdevelop-5.3.0_1
-libKDevPlatformDebugger.so.53 kdevelop-5.3.0_1
-libKDevPlatformDocumentation.so.53 kdevelop-5.3.0_1
-libKDevPlatformInterfaces.so.53 kdevelop-5.3.0_1
-libKDevPlatformLanguage.so.53 kdevelop-5.3.0_1
-libKDevPlatformOutputView.so.53 kdevelop-5.3.0_1
-libKDevPlatformProject.so.53 kdevelop-5.3.0_1
-libKDevPlatformSerialization.so.53 kdevelop-5.3.0_1
-libKDevPlatformShell.so.53 kdevelop-5.3.0_1
-libKDevPlatformSublime.so.53 kdevelop-5.3.0_1
-libKDevPlatformTests.so.53 kdevelop-5.3.0_1
-libKDevPlatformUtil.so.53 kdevelop-5.3.0_1
-libKDevPlatformVcs.so.53 kdevelop-5.3.0_1
-libkdevcmakecommon.so kdevelop-5.3.0_1
+libKDevClangPrivate.so.32 kdevelop-5.4.1_1
+libKDevPlatformDebugger.so.54 kdevelop-5.4.1_1
+libKDevPlatformDocumentation.so.54 kdevelop-5.4.1_1
+libKDevPlatformInterfaces.so.54 kdevelop-5.4.1_1
+libKDevPlatformLanguage.so.54 kdevelop-5.4.1_1
+libKDevPlatformOutputView.so.54 kdevelop-5.4.1_1
+libKDevPlatformProject.so.54 kdevelop-5.4.1_1
+libKDevPlatformSerialization.so.54 kdevelop-5.4.1_1
+libKDevPlatformShell.so.54 kdevelop-5.4.1_1
+libKDevPlatformSublime.so.54 kdevelop-5.4.1_1
+libKDevPlatformTests.so.54 kdevelop-5.4.1_1
+libKDevPlatformUtil.so.54 kdevelop-5.4.1_1
+libKDevPlatformVcs.so.54 kdevelop-5.4.1_1
+libkdevcmakecommon.so kdevelop-5.4.1_1
 libts.so.0 tslib-1.6_1
 libobs.so.0 obs-0.14.1_2
 libobsglad.so.0 obs-0.14.1_2
@@ -2699,7 +2703,7 @@ libKDb3.so.4 kdb-3.1.0_1
 libKPropertyWidgets3.so.4 kproperty-3.1.0_1
 libKPropertyCore3.so.4 kproperty-3.1.0_1
 libKReport3.so.4 kreport-3.1.0_1
-libbotan-2.so.10 botan-2.10.0_1
+libbotan-2.so.12 botan-2.12.0_1
 libswipl.so.8 swi-prolog-8.0.0_1
 libpcre2-16.so.0 libpcre2-10.22_1
 libpcre2-32.so.0 libpcre2-10.22_1
@@ -2723,27 +2727,27 @@ libkj-http-0.7.0.so capnproto-0.7.0_1
 libkj-async-0.7.0.so capnproto-0.7.0_1
 libkj-test-0.7.0.so capnproto-0.7.0_1
 libkj-0.7.0.so capnproto-0.7.0_1
-libkea-asiodns.so.0 libkea-1.1.0_1
+libkea-asiodns.so.1 libkea-1.7.0_1
 libkea-asiolink.so.7 libkea-1.5.0_1
-libkea-cc.so.7 libkea-1.5.0_1
-libkea-cfgclient.so.6 libkea-1.5.0_1
-libkea-cryptolink.so.4 libkea-1.5.0_1
-libkea-database.so.1 libkea-1.5.0_1
-libkea-dhcp++.so.11 libkea-1.5.0_1
-libkea-dhcp_ddns.so.1 libkea-1.1.0_1
-libkea-dhcpsrv.so.14 libkea-1.5.0_1
+libkea-cc.so.8 libkea-1.6.0_1
+libkea-cfgclient.so.8 libkea-1.7.0_1
+libkea-cryptolink.so.5 libkea-1.7.0_1
+libkea-database.so.5 libkea-1.7.0_1
+libkea-dhcp++.so.14 libkea-1.7.0_1
+libkea-dhcp_ddns.so.2 libkea-1.7.0_1
+libkea-dhcpsrv.so.17 libkea-1.7.0_1
 libkea-dns++.so.3 libkea-1.5.0_1
-libkea-eval.so.10 libkea-1.5.0_1
+libkea-eval.so.12 libkea-1.7.0_1
 libkea-exceptions.so.0 libkea-1.1.0_1
-libkea-hooks.so.7 libkea-1.4.0_1
-libkea-http.so.4 libkea-1.5.0_1
-libkea-log.so.3 libkea-1.2.0_1
-libkea-pgsql.so.0 libkea-1.5.0_1
-libkea-process.so.3 libkea-1.5.0_1
-libkea-stats.so.2 libkea-1.3.0_1
-libkea-threads.so.2 libkea-1.5.0_1
+libkea-hooks.so.8 libkea-1.7.0_1
+libkea-http.so.7 libkea-1.7.0_1
+libkea-log.so.5 libkea-1.7.0_1
+libkea-pgsql.so.1 libkea-1.7.0_1
+libkea-process.so.4 libkea-1.6.0_1
+libkea-stats.so.3 libkea-1.6.0_1
+libkea-threads.so.3 libkea-1.7.0_1
 libkea-util-io.so.0 libkea-1.1.0_1
-libkea-util.so.5 libkea-1.5.0_1
+libkea-util.so.8 libkea-1.7.0_1
 libytnef.so.0 ytnef-1.8_1
 libpisock.so.9 pilot-link-0.12.5_1
 libpisync.so.1 pilot-link-0.12.5_1
@@ -2777,11 +2781,11 @@ libdecoration.so.0 compiz-core-0.8.14_1
 libcompizconfig.so.0 libcompizconfig-0.8.14_1
 libemeraldengine.so.0 emerald-0.8.14_1
 libhangul.so.1 libhangul-0.1.0_1
-libmutter-4.so.0 mutter-3.32.0_1
-libmutter-clutter-4.so.0 mutter-3.32.0_1
-libmutter-cogl-path-4.so mutter-3.32.0_1
-libmutter-cogl-4.so.0 mutter-3.32.0_1
-libmutter-cogl-pango-4.so.0 mutter-3.32.0_1
+libmutter-5.so.0 mutter-3.34.1_1
+libmutter-clutter-5.so.0 mutter-3.34.1_1
+libmutter-cogl-path-5.so mutter-3.34.1_1
+libmutter-cogl-5.so.0 mutter-3.34.1_1
+libmutter-cogl-pango-5.so.0 mutter-3.34.1_1
 libgeoclue-2.so.0 geoclue2-2.4.4_1
 libgepub.so.0 libgepub-0.4_1
 libslopy.so.7.4 slop-7.4_1
@@ -2798,7 +2802,7 @@ libomxvideosched.so.0 libomxil-bellagio-0.9.3_1
 libnss_libvirt_guest.so.2 libvirt-3.1.0_1
 libvirt-admin.so.0 libvirt-3.1.0_1
 libnss_libvirt.so.2 libvirt-3.1.0_1
-libassimp.so.4 libassimp-4.0.0_1
+libassimp.so.5 libassimp-5.0.0_1
 libdouble-conversion.so.1 double-conversion-2.0.1_1
 libspectrum.so.8 libspectrum-1.2.2_1
 libbearssl.so.0 bearssl-0.3_1
@@ -2812,16 +2816,19 @@ libsigrok.so.4 libsigrok-0.5.0_1
 libsigrokcxx.so.4 libsigrok-0.5.0_1
 libsigrokdecode.so.4 libsigrokdecode-0.5.0_2
 libglyr.so.1 glyr-1.0.8_1
-libPocoJSON.so.60 poco-1.9.0_1
-libPocoMongoDB.so.60 poco-1.9.0_1
-libPocoZip.so.60 poco-1.9.0_1
-libPocoData.so.60 poco-1.9.0_1
-libPocoNet.so.60 poco-1.9.0_1
-libPocoDataSQLite.so.60 poco-1.9.0_1
-libPocoFoundation.so.60 poco-1.9.0_1
-libPocoXML.so.60 poco-1.9.0_1
-libPocoUtil.so.60 poco-1.9.0_1
-libPocoRedis.so.60 poco-1.9.0_1
+libPocoJSON.so.64 poco-1.9.4_1
+libPocoMongoDB.so.64 poco-1.9.4_1
+libPocoZip.so.64 poco-1.9.4_1
+libPocoData.so.64 poco-1.9.4_1
+libPocoNet.so.64 poco-1.9.4_1
+libPocoDataSQLite.so.64 poco-1.9.4_1
+libPocoFoundation.so.64 poco-1.9.4_1
+libPocoXML.so.64 poco-1.9.4_1
+libPocoUtil.so.64 poco-1.9.4_1
+libPocoRedis.so.64 poco-1.9.4_1
+libPocoEncodings.so.64 poco-1.9.4_1
+libPocoNetSSL.so.64 poco-1.9.4_1
+libPocoCrypto.so.64 poco-1.9.4_1
 libopenblas.so.0 openblas-0.2.19_1
 librtmidi.so.4 rtmidi-3.0.0_1
 libbiblesync.so.2.0.1 biblesync-2.0.1_1
@@ -2880,7 +2887,7 @@ libbrotlienc.so.1 brotli-1.0.2_1
 libfilteraudio.so filter_audio-0.0.1_1
 libgstreamermm-1.0.so.1 gstreamermm-1.8.0_1
 libmovit.so.8 movit-1.6.0_1
-libduktape.so.203 duktape-2.3.0_1
+libduktape.so.204 duktape-2.4.0_1
 libccgnu2-1.8.so.0 commoncpp2-1.8.1_1
 libccext2-1.8.so.0 commoncpp2-1.8.1_1
 libucommon.so.8 ucommon-7.0.0_1
@@ -2916,7 +2923,7 @@ libtracker-sparql-2.0.so.0 libtracker-2.0.0_1
 libdockapp.so.3 libdockapp-0.7.2_1
 libkrdccore.so.5 krdc-17.04.3_1
 libArcus.so.3 libArcus-3.1.0_1
-libgutenprint.so.8 gutenprint-5.3.1_1
+libgutenprint.so.9 gutenprint-5.3.3_1
 libunbound.so.8 unbound-1.8.0_1
 libmirage.so.11 libmirage-3.1.0_1
 libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
@@ -2924,19 +2931,19 @@ libixml.so.10 libupnp1.8-1.8.2_1
 libupnp.so.13 libupnp1.8-1.8.4_1
 libevent_extra-2.1.so.6 libevent-2.1.8_3
 libevent_openssl-2.1.so.6 libevent-2.1.8_3
-libsysprof-2.so sysprof-3.24.1_1
-libsysprof-ui-2.so sysprof-3.24.1_1
+libsysprof-3.so sysprof-3.34.0_1
+libsysprof-ui-3.so sysprof-3.34.0_1
 libmozjs-52.so mozjs52-52.3.0_1
 libmozjs-52.so.0 mozjs52-52.3.0_1
-libvala-0.44.so.0 libvala-0.44.0_1
-libvaladoc-0.44.so.0 libvaladoc-0.44.2_1
+libvala-0.46.so.0 libvala-0.46.0_1
+libvaladoc-0.46.so.0 libvaladoc-0.46.0_1
 libvalaccodegen.so libvala-0.44.0_1
 libphodav-2.0.so.0 phodav-2.2_1
 libgfshare.so.2 libgfshare-2.0.0_1
 libtracker-miner-2.0.so.0 libtracker-2.0.1_1
 libtacacs.so.1 tacacs-4.0.4.28_1
 libffms2.so.4 libffms2-2.23.1_1
-libddcutil.so.0 ddcutil-0.8.5_1
+libddcutil.so.1 ddcutil-0.9.7_1
 liblsmash.so.2 liblsmash-2.9.1_1
 libgiac.so.0 libgiac-1.4.9r17_1
 libgnustep-base.so.1.26 gnustep-base-1.26.0_1
@@ -2950,7 +2957,7 @@ libvted-3.so.0 libvted-3.7.0_2
 libpeasd-3.so.0 libpeasd-3.7.0_2
 libgstreamerd-3.so.0 libgstreamerd-3.7.0_2
 libgtkdgl-3.so.0 libgtkdgl-3.7.0_2
-libmega.so.30504 MEGAsdk-3.5.4_1
+libmega.so.30602 MEGAsdk-3.6.2a_1
 libopenglrecorder.so.0 libopenglrecorder-0.1.0_1
 libgpod.so.4 libgpod-0.8.3_1
 libi2c.so.0 i2c-tools-4.0_1
@@ -2963,13 +2970,13 @@ libKF5Kipi.so.32.0.0 libkipi5-17.04.3_1
 libhackrf.so.0 libhackrf-2017.02.1_1
 libtecla.so.1 libtecla-1.6.3_1
 libtecla_r.so.1 libtecla-1.6.3_1
-libzim.so.5 libzim-5.0.0_1
-libkiwix.so.6 kiwix-lib-6.0.0_1
+libzim.so.6 libzim-6.0.1_1
+libkiwix.so.8 kiwix-lib-8.0.1_1
 libaria2.so.0 libaria2-1.33.1_3
-librpm.so.8 librpm-4.14.1_1
-librpmsign.so.8 librpmsign-4.14.1_1
-librpmbuild.so.8 librpmbuild-4.14.1_1
-librpmio.so.8 librpmio-4.14.1_1
+librpm.so.9 librpm-4.15.0_1
+librpmsign.so.9 librpmsign-4.15.0_1
+librpmbuild.so.9 librpmbuild-4.15.0_1
+librpmio.so.9 librpmio-4.15.0_1
 libsquirrel.so.0 squirrel-libs-3.1_1
 libsqstdlib.so.0 squirrel-libs-3.1_1
 libexecinfo.so.1 libexecinfo-1.1_1
@@ -3017,7 +3024,7 @@ libembb_mtapi_network_c.so embb-devel-1.0.0_1
 libembb_base_cpp.so embb-devel-1.0.0_1
 libembb_base_c.so embb-devel-1.0.0_1
 libhpdf.so Haru-devel-2.3.0_1
-libKF5Contacts.so.5 kcontacts-17.12.0_1
+libKF5Contacts.so.5 kcontacts-5.63.0_1
 libKF5AkonadiPrivate.so.5 akonadi5-17.12.0_1
 libKF5AkonadiCore.so.5 akonadi5-17.12.0_1
 libKF5AkonadiAgentBase.so.5 akonadi5-17.12.0_1
@@ -3232,6 +3239,7 @@ libTKOffset.so.7 occt-7.2.0p1_1
 libTKXDESTEP.so.7 occt-7.2.0p1_1
 libTKQADraw.so.7 occt-7.2.0p1_1
 libTKXmlL.so.7 occt-7.2.0p1_1
+libTKRWMesh.so.7 occt-7.4.0_1
 libargon2.so.1 libargon2-20171227_1
 libdazzle-1.0.so.0 libdazzle-3.28.0_1
 libjsonrpc-glib-1.0.so.1 jsonrpc-glib-3.28.0_1
@@ -3291,7 +3299,7 @@ libshaderc_shared.so.1 shaderc-2018.0_1
 libglslang.so glslang-6.2.2596_1
 libSPIRV.so glslang-6.2.2596_1
 libmaxminddb.so.0 libmaxminddb-1.3.2_1
-libmysqlpp.so mysql++-3.2.4_1
+libmysqlpp.so.3 mysql++-3.2.5_1
 libKF5Syndication.so.5 syndication-5.50.0_1
 liblqr-1.so.0 liblqr-0.4.2_1
 libmozjs-60.so.0 mozjs60-60.0.2_1
@@ -3404,7 +3412,7 @@ libsnore-qt5.so.0.7 snorenotify-0.7.0_1
 libsnoresettings-qt5.so.0.7 snorenotify-0.7.0_1
 libTECkit.so.0 libteckit-2.5.8_1
 libTECkit_Compiler.so.0 libteckit-2.5.8_1
-libwf-config.so wf-config-0.1_1
+libwf-config.so.0 wf-config-0.3_1
 libQt5Pas.so.1 qt5pas-2.6~beta_1
 libClp.so.1 libClp-1.16.11_1
 libCoinUtils.so.3 libClp-1.16.11_1
@@ -3457,16 +3465,16 @@ liboblibs.so.0.0 oblibs-0.0.1.1_1
 libaal-1.0.so.7 libaal-1.0.7_1
 libaal-minimal.so.0 libaal-1.0.7_1
 libcli.so.1.9 libcli-1.9.8.4_1
-libaddress_sorting.so.7 grpc-1.19.1_1
-libgpr.so.7 grpc-1.19.1_1
+libaddress_sorting.so.8 grpc-1.24.1_1
+libgpr.so.8 grpc-1.24.1_1
 libgrpc++.so.1 grpc-1.19.1_1
 libgrpc++_cronet.so.1 grpc-1.19.1_1
 libgrpc++_error_details.so.1 grpc-1.19.1_1
 libgrpc++_reflection.so.1 grpc-1.19.1_1
 libgrpc++_unsecure.so.1 grpc-1.19.1_1
-libgrpc.so.7 grpc-1.19.1_1
-libgrpc_cronet.so.7 grpc-1.19.1_1
-libgrpc_unsecure.so.7 grpc-1.19.1_1
+libgrpc.so.8 grpc-1.24.1_1
+libgrpc_cronet.so.8 grpc-1.24.1_1
+libgrpc_unsecure.so.8 grpc-1.24.1_1
 libgrpcpp_channelz.so.1 grpc-1.19.1_1
 libircclient.so.1 libircclient-1.10_1
 libFAudio.so.0 FAudio-19.05_1
@@ -3485,7 +3493,7 @@ libmhash.so.2 mhash-0.9.9.9_1
 librlottie.so.0 rlottie-0.0.20160709_1
 libfstrm.so.0 fstrm-0.5.0_1
 libfreecell-solver.so.0 libfreecell-solver-5.10.0_1
-libknot.so.9 libknot-2.8.2_1
+libknot.so.10 libknot-2.9.0_1
 libdnssec.so.7 libknot-2.8.2_1
 libzscanner.so.3 libknot-2.8.2_1
 libkres.so.9 knot-resolver-4.0.0_1
@@ -3499,3 +3507,14 @@ libgambit.so.4 gambit-4.9.3_1
 liblog4cpp.so.5 log4cpp-1.1.3_1
 libnuspell.so.2 libnuspell-2.3.0_1
 liblog4c.so.3 log4c-1.2.4_1
+libqb.so.0 libqb-1.0.5_1
+libusbguard.so.0 usbguard-0.7.5_1
+libknet.so.1 libknet1-1.11_1
+libdrumstick-file.so.1 drumstick-1.1.2_1
+libdrumstick-alsa.so.1 drumstick-1.1.2_1
+libdrumstick-rt.so.1 drumstick-1.1.2_1
+libnozzle.so.1 libnozzle1-1.11_2
+libmygpo-qt5.so.1 libmygpo-qt-1.1.0_1
+libluv.so.1 libluv-1.30.1.0_1
+libarmadillo.so.9 armadillo-9.700.2_1
+libvarnishapi.so.2 libvarnishapi-6.3.0_1
diff --git a/common/xbps-src/shutils/build_dependencies.sh b/common/xbps-src/shutils/build_dependencies.sh
index 6d9d727e0d3..26e24232ad8 100644
--- a/common/xbps-src/shutils/build_dependencies.sh
+++ b/common/xbps-src/shutils/build_dependencies.sh
@@ -169,7 +169,7 @@ install_pkg_deps() {
                         break
                     fi
                 done
-                if [[ $found -eq 1 ]]; then
+                if [[ $found -eq 1 ]] && [[ -z "$cross" ]]; then
                     echo "   [host] ${_vpkg}: not found (subpkg, ignored)"
                 else
                     echo "   [host] ${_vpkg}: not found"
diff --git a/common/xbps-src/shutils/common.sh b/common/xbps-src/shutils/common.sh
index d258509d878..d0e455471ea 100644
--- a/common/xbps-src/shutils/common.sh
+++ b/common/xbps-src/shutils/common.sh
@@ -237,7 +237,7 @@ run_pkg_hooks() {
 unset_package_funcs() {
     local f
 
-    for f in "$(typeset -F)"; do
+    for f in $(typeset -F); do
         case "$f" in
         *_package)
             unset -f "$f"
diff --git a/common/xbps-src/shutils/cross.sh b/common/xbps-src/shutils/cross.sh
index a699885e801..0a4fa3028db 100644
--- a/common/xbps-src/shutils/cross.sh
+++ b/common/xbps-src/shutils/cross.sh
@@ -29,7 +29,7 @@ prepare_cross_sysroot() {
     [ -z "$cross" -o "$cross" = "" -o -f $statefile ] && return 0
 
     # Check for cross-vpkg-dummy available for the target arch, otherwise build it.
-    pkg_available 'cross-vpkg-dummy>=0.31_1' $cross
+    pkg_available 'cross-vpkg-dummy>=0.33_1' $cross
     if [ $? -eq 0 ]; then
         $XBPS_LIBEXECDIR/build.sh cross-vpkg-dummy cross-vpkg-dummy pkg $cross init || return $?
     fi
diff --git a/srcpkgs/2bwm/template b/srcpkgs/2bwm/template
index a0ca799c977..be62e8594f7 100644
--- a/srcpkgs/2bwm/template
+++ b/srcpkgs/2bwm/template
@@ -1,6 +1,6 @@
 # Template file for '2bwm'
 pkgname=2bwm
-version=0.2
+version=0.3
 revision=1
 build_style=gnu-makefile
 makedepends="libxcb-devel xcb-util-keysyms-devel xcb-util-wm-devel xcb-util-xrm-devel"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="ISC"
 homepage="https://github.com/venam/2bwm"
 distfiles="https://github.com/venam/${pkgname}/archive/v${version}.tar.gz"
-checksum=5d071bdbe6d3b4b79b5462cc1b36afe357030fb70c7e64f88d9c7d541d648439
+checksum=a4889ea4b01b1a3d4a508daa034b9d86676913cbbca1f977858df692a6e2af95
 
 pre_build() {
 	sed -i 's|-Os ||g' Makefile
diff --git a/srcpkgs/3proxy/template b/srcpkgs/3proxy/template
index 6e0aad41627..6063c616007 100644
--- a/srcpkgs/3proxy/template
+++ b/srcpkgs/3proxy/template
@@ -1,13 +1,13 @@
 # Template file for '3proxy'
 pkgname=3proxy
-version=0.8.12
-revision=2
+version=0.8.13
+revision=1
 short_desc="3proxy tiny proxy server"
 maintainer="iaroki <iaroki@protonmail.com>"
 license="BSD-3-Clause"
 homepage="https://3proxy.ru"
-distfiles="https://github.com/z3APA3A/3proxy/archive/$version.tar.gz"
-checksum=c2ad3798b4f0df06cfcc7b49f658304e451d60e4834e2705ef83ddb85a03f849
+distfiles="https://github.com/z3APA3A/3proxy/archive/${version}.tar.gz"
+checksum=a6d3cf9dd264315fa6ec848f6fe6c9057db005ce4ca8ed1deb00f6e1c3900f88
 
 do_build() {
 	make -f Makefile.Linux CC=$CC LN=$CC
diff --git a/srcpkgs/66-tools/template b/srcpkgs/66-tools/template
new file mode 100644
index 00000000000..9c954860c2b
--- /dev/null
+++ b/srcpkgs/66-tools/template
@@ -0,0 +1,33 @@
+# Template file for '66-tools'
+pkgname=66-tools
+version=0.0.1.0
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=configure
+configure_args="--prefix=/usr
+ --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
+ --with-lib=${XBPS_CROSS_BASE}/usr/lib"
+hostmakedepends="pkg-config scdoc"
+makedepends="oblibs-devel execline-devel skalibs-devel"
+short_desc="Small tools and helpers for service scripts execution"
+maintainer="mobinmob <mobinmob@disroot.org>"
+license="ISC"
+homepage="http://web.obarun.org/software/index.html"
+distfiles="https://framagit.org/Obarun/66-tools/-/archive/v${version}/66-tools-v${version}.tar.gz"
+checksum=e3ce0a1de81196ca7e6ab0bee720022b98dabaa7dd01d9c4c1cc98a90cb3a2a7
+
+pre_build() {
+	make man
+}
+
+post_install() {
+	local i
+	vlicense COPYING
+	for i in doc/html/*.html ; do
+		vdoc $i
+	done
+	vdoc README
+	for i in doc/man/*.{1,5} ; do
+		vman $i
+	done
+}
diff --git a/srcpkgs/66/template b/srcpkgs/66/template
index ee21cc063cf..adb86308a14 100644
--- a/srcpkgs/66/template
+++ b/srcpkgs/66/template
@@ -1,6 +1,6 @@
 # Template file for '66'
 pkgname=66
-version=0.2.0.4
+version=0.2.1.2
 revision=1
 wrksrc="66-v${version}"
 build_style=configure
@@ -11,13 +11,13 @@ hostmakedepends="pkg-config scdoc"
 makedepends="oblibs-devel skalibs-devel execline-devel s6-devel
 s6-rc-devel procps-ng-devel"
 depends="s6-portable-utils"
-short_desc="Helpers tools around s6-rc"
+short_desc="Small tools built around s6 and s6-rc programs"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="ISC"
 homepage="http://web.obarun.org/software/"
 changelog="https://framagit.org/Obarun/66/raw/master/NEWS"
 distfiles="https://framagit.org/Obarun/66/-/archive/v${version}/66-v${version}.tar.bz2"
-checksum=fc6ca90cc12f16d35c8a7a1a181df8d690c72e04a9ecf586f588160528df7ce6
+checksum=9c3430ab291ec83e74faa05634614e1d851e2bc18fe173963d8fe5313c2dd337
 
 conf_files="/etc/66/init /etc/66/init.conf"
 make_dirs="
diff --git a/srcpkgs/Amass/template b/srcpkgs/Amass/template
new file mode 100644
index 00000000000..c959b006334
--- /dev/null
+++ b/srcpkgs/Amass/template
@@ -0,0 +1,12 @@
+# Template file for 'Amass'
+pkgname=Amass
+version=3.1.10
+revision=1
+build_style=go
+go_import_path="github.com/OWASP/Amass/..."
+short_desc="In-depth Attack Surface Mapping and Asset Discovery"
+maintainer="Andrew Benson <abenson+void@gmail.com>"
+license="Apache-2.0"
+homepage="https://www.owasp.org/index.php/OWASP_Amass_Project"
+distfiles="https://github.com/OWASP/Amass/archive/v${version}.tar.gz"
+checksum=018a910c18df4510a6b73137177c05e98e9e01a0828ccd07285b83884fc24456
diff --git a/srcpkgs/AppStream/template b/srcpkgs/AppStream/template
index f93ff78e3a0..3df0d5fa923 100644
--- a/srcpkgs/AppStream/template
+++ b/srcpkgs/AppStream/template
@@ -9,7 +9,7 @@ hostmakedepends="docbook-xsl glib-devel gperf libxslt pkg-config
  qt5-host-tools"
 makedepends="libglib-devel libxml2-devel libyaml-devel qt5-devel"
 short_desc="Tools and libraries to work with AppStream metadata"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/ximion/appstream"
 changelog="https://raw.githubusercontent.com/ximion/appstream/master/NEWS"
diff --git a/srcpkgs/Bear/template b/srcpkgs/Bear/template
index 9a36eb6b1fe..69a36bfeeb1 100644
--- a/srcpkgs/Bear/template
+++ b/srcpkgs/Bear/template
@@ -1,14 +1,14 @@
 # Template file for 'Bear'
 pkgname=Bear
-version=2.4.1
+version=2.4.2
 revision=1
 build_style=cmake
-makedepends="bash-completion"
-depends="python"
+hostmakedepends="python3"
+depends="python3"
 short_desc="Tool that generates a compilation database for clang tooling"
 maintainer="Alain Kalker <a.c.kalker@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/rizsotto/Bear"
 changelog="https://raw.githubusercontent.com/rizsotto/Bear/master/ChangeLog.md"
 distfiles="https://github.com/rizsotto/Bear/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=41e118471f11d91147490561b3bc52228a9ffc2a293e8e03717d674a0e312a9c
+checksum=e80c0d622a8192a1ec0c0efa139e5767c6c4b1defe1c75fc99cf680c6d1816c0
diff --git a/srcpkgs/CImg/template b/srcpkgs/CImg/template
index b8c994a9b52..12b0b65c0b7 100644
--- a/srcpkgs/CImg/template
+++ b/srcpkgs/CImg/template
@@ -1,6 +1,6 @@
 # Template file for 'CImg'
 pkgname=CImg
-version=2.6.6
+version=2.7.4
 revision=1
 archs=noarch
 wrksrc="CImg-v.${version}"
@@ -10,7 +10,7 @@ maintainer="Robert Lowry <bobertlo@gmail.com>"
 license="CECILL-2.0, CECILL-C"
 homepage="http://cimg.eu"
 distfiles="https://framagit.org/dtschump/CImg/-/archive/v.${version}/CImg-v.${version}.tar.bz2"
-checksum=45c22113418bf53a6c3b3b990a4283aff9eb96bd36895622ad27b367b632430d
+checksum=f2897f26b20095a1f826c7f4baa9224a9a13727d4de93acd8f3fbe559214307a
 
 do_install() {
 	vlicense Licence_CeCILL_V2-en.txt
@@ -19,4 +19,3 @@ do_install() {
 	vmkdir usr/include/CImg
 	vcopy "plugins/*.h" usr/include/CImg
 }
-
diff --git a/srcpkgs/CLion/template b/srcpkgs/CLion/template
index 686b7a88a70..aa34774c3bc 100644
--- a/srcpkgs/CLion/template
+++ b/srcpkgs/CLion/template
@@ -1,6 +1,6 @@
 # Template file for 'CLion'
 pkgname=CLion
-version=2019.2
+version=2019.2.4
 revision=1
 archs="i686 x86_64"
 wrksrc="clion-${version}"
@@ -10,7 +10,7 @@ maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/clion"
 distfiles="https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"
-checksum=e2d453264c2fb6dcc58e976fd5660157afd62ba5c0ee64f829407c772f7e1dcf
+checksum=2d3b1820eef6d60aab4b9a12c7357280de6606f72cdc1c72d6449e3676f23030
 repository=nonfree
 restricted=yes
 nopie=yes
@@ -44,14 +44,14 @@ post_extract() {
 
 do_install() {
 	TARGET_PATH="usr/lib/${pkgname}"
-	LICENSE_PATH="usr/share/licenses/${pkgname}"
 
 	vmkdir usr/bin
 	vmkdir ${TARGET_PATH}
-	vmkdir ${LICENSE_PATH}
 
-	# Ideally vlicense should be called here, but vcopy is more terse.
-	vcopy license/* ${LICENSE_PATH}
+	local i
+	for i in license/* ; do
+		vlicense $i
+	done
 
 	vcopy bin ${TARGET_PATH}
 	vcopy help ${TARGET_PATH}
diff --git a/srcpkgs/Clight/template b/srcpkgs/Clight/template
index 84d98307755..9919d510abb 100644
--- a/srcpkgs/Clight/template
+++ b/srcpkgs/Clight/template
@@ -1,7 +1,7 @@
 # Template file for 'Clight'
 pkgname=Clight
 version=3.1
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="popt-devel gsl-devel libconfig-devel elogind-devel bash-completion dbus-devel"
diff --git a/srcpkgs/Clightd/template b/srcpkgs/Clightd/template
index 241cf60cd05..6779220bfcb 100644
--- a/srcpkgs/Clightd/template
+++ b/srcpkgs/Clightd/template
@@ -1,7 +1,7 @@
 # Template file for 'Clightd'
 pkgname=Clightd
 version=3.4
-revision=1
+revision=2
 build_style=cmake
 cmake_builddir=build
 configure_args="-DENABLE_DDC=1 -DENABLE_GAMMA=1 -DENABLE_DPMS=1"
diff --git a/srcpkgs/ClusterSSH/template b/srcpkgs/ClusterSSH/template
index a56c72440a5..ade9b7fefa0 100644
--- a/srcpkgs/ClusterSSH/template
+++ b/srcpkgs/ClusterSSH/template
@@ -1,10 +1,9 @@
 # Template file for 'ClusterSSH'
 pkgname=ClusterSSH
-version=4.13.2.02
+version=4.14
 revision=1
-_distver="${version%.*}_${version##*.}"
 archs=noarch
-wrksrc="clusterssh-${_distver}"
+wrksrc="clusterssh-${version}"
 build_style=perl-ModuleBuild
 hostmakedepends="xterm openssh
  perl-CPAN-Changes perl-Module-Build perl-Try-Tiny perl-Tk
@@ -18,8 +17,8 @@ maintainer="Enguerrand de Rochefort <voidlinux@rochefort.de>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://github.com/duncs/clusterssh"
 changelog="https://raw.githubusercontent.com/duncs/clusterssh/master/Changes"
-distfiles="https://github.com/duncs/clusterssh/archive/v${_distver}.tar.gz"
-checksum=5c03b706267ddf0b84cf1f1cd6756344859a90a20e3dcc3018820fe142146780
+distfiles="https://github.com/duncs/clusterssh/archive/v${version}.tar.gz"
+checksum=179ac8a7c27ec9674d2aa3f65ebb097b4945646c71f83f52fe2b8b24c21cd629
 
 pre_check() {
 	touch README
diff --git a/srcpkgs/ClusterSSH/update b/srcpkgs/ClusterSSH/update
deleted file mode 100644
index 45c768a1027..00000000000
--- a/srcpkgs/ClusterSSH/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="clusterssh/archive/[-_a-z]+\K[-_.\d]+(?=\.tar\.gz)"
diff --git a/srcpkgs/CopyQ/template b/srcpkgs/CopyQ/template
index 58743ca47b1..7eef67931e3 100644
--- a/srcpkgs/CopyQ/template
+++ b/srcpkgs/CopyQ/template
@@ -1,6 +1,6 @@
 # Template file for 'CopyQ'
 pkgname=CopyQ
-version=3.9.0
+version=3.9.2
 revision=1
 build_style=cmake
 hostmakedepends="qt5-tools-devel"
@@ -12,4 +12,4 @@ license="GPL-3.0-or-later"
 homepage="https://hluk.github.io/CopyQ/"
 changelog="https://raw.githubusercontent.com/hluk/CopyQ/master/CHANGES"
 distfiles="https://github.com/hluk/CopyQ/archive/v${version}.tar.gz"
-checksum=de2e64451464dd5af661fd56bb8d5c6a9cdbbd2f66249ae0404e61c1c7d9916e
+checksum=8d526c7b0ab7a2e5ae91ef68df104277217c6679b15a0f100ae2de50247c993b
diff --git a/srcpkgs/Electron-Cash/template b/srcpkgs/Electron-Cash/template
new file mode 100644
index 00000000000..2db05c94832
--- /dev/null
+++ b/srcpkgs/Electron-Cash/template
@@ -0,0 +1,25 @@
+# Template file for 'Electron-Cash'
+pkgname=Electron-Cash
+version=4.0.10
+revision=1
+archs=noarch
+build_style=python3-module
+pycompile_module="electroncash electroncash_gui electroncash_plugins"
+hostmakedepends="python3-setuptools python3-PyQt5-devel-tools"
+depends="python3-PyQt5 python3-PyQt5-svg
+ python3-jsonrpclib python3-protobuf
+ python3-pyaes python3-pycryptodome libbitcoin-secp256k1 libzbar
+ python3-dnspython python3-requests python3-qrcode python3-pysocks"
+short_desc="Lightweight Bitcoin Cash client"
+maintainer="Cameron Nemo <cnemo@tutanota.com>"
+license="MIT"
+homepage="https://electroncash.org"
+distfiles="https://electroncash.org/downloads/${version}/win-linux/Electron-Cash-${version}.tar.gz"
+checksum=48270e12956a2f4ef4d2b0cb60611e47f136b734a3741dab176542a32ae59ee5
+
+post_install() {
+	for lib in zbar secp256k1; do
+		rm -f -- "${DESTDIR}/usr/lib/python${py3_ver}/site-packages/electroncash/lib${lib}.so.0"
+	done
+	vlicense LICENCE
+}
diff --git a/srcpkgs/EternalTerminal/template b/srcpkgs/EternalTerminal/template
index 8957865792d..875537de451 100644
--- a/srcpkgs/EternalTerminal/template
+++ b/srcpkgs/EternalTerminal/template
@@ -1,7 +1,7 @@
 # Template file for 'EternalTerminal'
 pkgname=EternalTerminal
-version=5.1.9
-revision=2
+version=5.1.10
+revision=1
 wrksrc="${pkgname}-et-v${version}"
 build_style=cmake
 hostmakedepends="protobuf"
@@ -12,7 +12,7 @@ maintainer="Nathan Owens <ndowens04@gmail.com>"
 license="Apache-2.0"
 homepage="https://mistertea.github.io/EternalTerminal"
 distfiles="https://github.com/MisterTea/EternalTerminal/archive/et-v${version}.tar.gz"
-checksum=37b9bd33ed3edc88cedf2c4168246e23818ccd4e08731d0698d8d133dd3b1147
+checksum=cfe368b3b79d5d07d59ee0437d6a7b838e6162ae85ffc71ca7988b37b46a477b
 
 system_accounts="_eternal"
 
diff --git a/srcpkgs/FeatherPad/template b/srcpkgs/FeatherPad/template
index 9ac45729814..ddfc89c6300 100644
--- a/srcpkgs/FeatherPad/template
+++ b/srcpkgs/FeatherPad/template
@@ -1,16 +1,16 @@
 # Template file for 'FeatherPad'
 pkgname=FeatherPad
-version=0.9.4
+version=0.11.1
 revision=1
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-tools-devel"
-makedepends="libX11-devel libXext-devel qt5-x11extras-devel qt5-svg-devel"
+makedepends="libX11-devel libXext-devel qt5-x11extras-devel qt5-svg-devel hunspell-devel"
 short_desc="Lightweight Qt5 plain-text editor for Linux"
 maintainer="Young Jin Park <youngjinpark20@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/tsujan/FeatherPad"
 distfiles="https://github.com/tsujan/FeatherPad/archive/V${version}.tar.gz"
-checksum=6833ebc541550c0cac4c5e47f0870eb0209f0d779dfeef7273b6287896d46ef6
+checksum=a9cb943587bb0065c7cd7e42b5b396d633d4bab6c531621b4f85b050e0ccd9db
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-x11extras-devel qt5-svg-devel"
diff --git a/srcpkgs/FeedReader/template b/srcpkgs/FeedReader/template
index 134f2a39144..55d74e6a51d 100644
--- a/srcpkgs/FeedReader/template
+++ b/srcpkgs/FeedReader/template
@@ -1,6 +1,6 @@
 # Template file for 'FeedReader'
 pkgname=FeedReader
-version=2.8.2
+version=2.10.0
 revision=1
 build_style=meson
 hostmakedepends="glib-devel intltool itstool pkg-config vala"
@@ -12,7 +12,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-only"
 homepage="https://jangernert.github.io/FeedReader/"
 distfiles="https://github.com/jangernert/${pkgname}/archive/v${version}.tar.gz"
-checksum=40ec53a5bdb745909b486092fb0c91686b2f1a76fce5416514f62c3f3617f612
+checksum=fd10d2d2dc9c20c259d672634e5e100d10f0fb730e0687e1b3c2423224901a2c
 nocross="SQLite.vala:131.12-131.36: error: The name copy does not exist in the context of Sqlite.Value"
 
 case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/GoLand/template b/srcpkgs/GoLand/template
index cebfb255168..70a9d20c60e 100644
--- a/srcpkgs/GoLand/template
+++ b/srcpkgs/GoLand/template
@@ -1,6 +1,6 @@
 # Template file for 'GoLand'
 pkgname=GoLand
-version=2019.1.3
+version=2019.2.3
 revision=1
 archs="i686 x86_64"
 depends="virtual?java-environment"
@@ -9,7 +9,7 @@ maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/go"
 distfiles="https://download.jetbrains.com/go/goland-${version}.tar.gz"
-checksum=b0e22be860ead904c88595f005d5fe2b0fea310c15a1d8551372b5c336d1895b
+checksum=d65d5fc57798652be47d6a540c41da3cf344c0ebabc357c0807c6999acff2b7d
 repository=nonfree
 restricted=yes
 nopie=yes
@@ -37,14 +37,14 @@ post_extract() {
 
 do_install() {
 	TARGET_PATH="usr/lib/${pkgname}"
-	LICENSE_PATH="usr/share/licenses/${pkgname}"
 
 	vmkdir usr/bin
 	vmkdir ${TARGET_PATH}
-	vmkdir ${LICENSE_PATH}
 
-	# Ideally vlicense should be called here, but vcopy is more terse.
-	vcopy license/* ${LICENSE_PATH}
+	local i
+	for i in license/* ; do
+		vlicense $i
+	done
 
 	vcopy bin ${TARGET_PATH}
 	vcopy help ${TARGET_PATH}
diff --git a/srcpkgs/GraphicsMagick/template b/srcpkgs/GraphicsMagick/template
index 5bdcedd320d..20df5e5c42a 100644
--- a/srcpkgs/GraphicsMagick/template
+++ b/srcpkgs/GraphicsMagick/template
@@ -1,6 +1,6 @@
 # Template file for 'GraphicsMagick'
 pkgname=GraphicsMagick
-version=1.3.32
+version=1.3.33
 revision=1
 build_style=gnu-configure
 configure_args="--with-quantum-depth=16 --with-gs-font-dir=/usr/share/fonts/Type1
@@ -17,7 +17,7 @@ license="MIT"
 homepage="http://www.graphicsmagick.org/"
 changelog="http://www.graphicsmagick.org/NEWS.html"
 distfiles="${SOURCEFORGE_SITE}/graphicsmagick/graphicsmagick/${version}/${pkgname}-${version}.tar.gz"
-checksum=03919288e14927d8cace1e2e95578bef171a3c2cdd88ac563f25c3d57f14ff2e
+checksum=00ea0df7c78c903cce325f402429bcd3924168cf39277f743a0641d47c411ee8
 keep_libtool_archives=yes
 
 post_install() {
diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index bd15d7fd519..5951e1e5a69 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -1,7 +1,7 @@
 # Template file for 'ImageMagick'
 pkgname=ImageMagick
 _majorver=7.0.8
-_patchver=59
+_patchver=68
 version="${_majorver}.${_patchver}"
 revision=1
 wrksrc="${pkgname}-${_majorver}-${_patchver}"
@@ -16,12 +16,12 @@ makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel
  libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel libwmf-devel
  ocl-icd-devel pango-devel"
 short_desc="Package for display and interactive manipulation of images"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="ImageMagick"
 homepage="https://www.imagemagick.org/"
 changelog="https://imagemagick.org/script/changelog.php"
 distfiles="https://github.com/ImageMagick/ImageMagick/archive/${_majorver}-${_patchver}.tar.gz"
-checksum=238ee17196fcb80bb58485910aaefc12d48f99e4043c2a28f06ff9588161c4e3
+checksum=c3aa886789b36d3fe1f6f99fc1a32bbbf26d4ce51f485b32c3a4b85e176a53c9
 
 subpackages="libmagick libmagick-devel"
 
diff --git a/srcpkgs/ImageMagick6/template b/srcpkgs/ImageMagick6/template
index 67747ba52db..75d65b49fb1 100644
--- a/srcpkgs/ImageMagick6/template
+++ b/srcpkgs/ImageMagick6/template
@@ -1,7 +1,7 @@
 # Template file for 'ImageMagick6'
 pkgname=ImageMagick6
 _majorver=6.9.10
-_patchver=59
+_patchver=68
 version="${_majorver}.${_patchver}"
 revision=1
 wrksrc="${pkgname}-${_majorver}-${_patchver}"
@@ -20,7 +20,7 @@ maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="ImageMagick"
 homepage="https://www.imagemagick.org/"
 distfiles="https://github.com/ImageMagick/ImageMagick6/archive/${_majorver}-${_patchver}.tar.gz"
-checksum=eb4e312e2d576c61f0bf4b43eea9cc77820e0ecacb8a0264e5eb708dfa101493
+checksum=2caa3d8d1f65e733de30d1f537e57991ff3adb3edb5b60afa9cd0f6e0a20945f
 
 keep_libtool_archives=yes
 conf_files="/etc/ImageMagick-${_majorver%%.*}/*.xml"
diff --git a/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch b/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
new file mode 100644
index 00000000000..b7304474f77
--- /dev/null
+++ b/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
@@ -0,0 +1,93 @@
+Imported from https://github.com/LuaJIT/LuaJIT/pull/486.
+
+This fixes crashes on ppc-musl, as musl only supports secureplt.
+
+--- src/lj_dispatch.c
++++ src/lj_dispatch.c
+@@ -56,6 +56,18 @@ static const ASMFunction dispatch_got[] = {
+ #undef GOTFUNC
+ #endif
+ 
++#if LJ_TARGET_PPC && (LJ_ARCH_BITS == 32)
++#include <math.h>
++LJ_FUNCA_NORET void LJ_FASTCALL lj_ffh_coroutine_wrap_err(lua_State *L,
++							  lua_State *co);
++
++#define GOTFUNC(name)	(ASMFunction)name,
++static const ASMFunction dispatch_got[] = {
++  GOTDEF(GOTFUNC)
++};
++#undef GOTFUNC
++#endif
++
+ /* Initialize instruction dispatch table and hot counters. */
+ void lj_dispatch_init(GG_State *GG)
+ {
+@@ -77,6 +89,9 @@ void lj_dispatch_init(GG_State *GG)
+ #if LJ_TARGET_MIPS
+   memcpy(GG->got, dispatch_got, LJ_GOT__MAX*sizeof(ASMFunction *));
+ #endif
++#if LJ_TARGET_PPC && (LJ_ARCH_BITS == 32)
++  memcpy(GG->got, dispatch_got, LJ_GOT__MAX*4);
++#endif
+ }
+ 
+ #if LJ_HASJIT
+--- src/lj_dispatch.h
++++ src/lj_dispatch.h
+@@ -66,6 +66,21 @@ GOTDEF(GOTENUM)
+ };
+ #endif
+ 
++#if LJ_TARGET_PPC && (LJ_ARCH_BITS == 32)
++/* Need our own global offset table for the dreaded MIPS calling conventions. */
++#define GOTDEF(_) \
++  _(floor) _(ceil) _(trunc) _(log) _(log10) _(exp) _(sin) _(cos) _(tan) \
++  _(asin) _(acos) _(atan) _(sinh) _(cosh) _(tanh) _(frexp) _(modf) _(atan2) \
++  _(pow) _(fmod) _(ldexp) _(sqrt)
++
++enum {
++#define GOTENUM(name) LJ_GOT_##name,
++GOTDEF(GOTENUM)
++#undef GOTENUM
++  LJ_GOT__MAX
++};
++#endif
++
+ /* Type of hot counter. Must match the code in the assembler VM. */
+ /* 16 bits are sufficient. Only 0.0015% overhead with maximum slot penalty. */
+ typedef uint16_t HotCount;
+@@ -89,7 +104,7 @@ typedef uint16_t HotCount;
+ typedef struct GG_State {
+   lua_State L;				/* Main thread. */
+   global_State g;			/* Global state. */
+-#if LJ_TARGET_MIPS
++#if LJ_TARGET_MIPS || (LJ_TARGET_PPC && (LJ_ARCH_BITS == 32))
+   ASMFunction got[LJ_GOT__MAX];		/* Global offset table. */
+ #endif
+ #if LJ_HASJIT
+--- src/vm_ppc.dasc
++++ src/vm_ppc.dasc
+@@ -59,7 +59,12 @@
+ |.define ENV_OFS,	8
+ |.endif
+ |.else  // No TOC.
+-|.macro blex, target; bl extern target@plt; .endmacro
++|.macro blex, target
++|  lwz TMP0, DISPATCH_GOT(target)(DISPATCH)
++|  mtctr TMP0
++|  bctrl
++|  //bl extern target@plt
++|.endmacro
+ |.macro .toc, a, b; .endmacro
+ |.endif
+ |.macro .tocenv, a, b; .if TOCENV; a, b; .endif; .endmacro
+@@ -448,6 +453,8 @@
+ |// Assumes DISPATCH is relative to GL.
+ #define DISPATCH_GL(field)	(GG_DISP2G + (int)offsetof(global_State, field))
+ #define DISPATCH_J(field)	(GG_DISP2J + (int)offsetof(jit_State, field))
++#define GG_DISP2GOT		(GG_OFS(got) - GG_OFS(dispatch))
++#define DISPATCH_GOT(name)	(GG_DISP2GOT + 4*LJ_GOT_##name)
+ |
+ #define PC2PROTO(field)  ((int)offsetof(GCproto, field)-(int)sizeof(GCproto))
+ |
diff --git a/srcpkgs/LuaJIT/patches/add-ppc64-support.patch b/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
similarity index 100%
rename from srcpkgs/LuaJIT/patches/add-ppc64-support.patch
rename to srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
diff --git a/srcpkgs/LuaJIT/patches/fix-vm-jit-ppc64.patch b/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
similarity index 100%
rename from srcpkgs/LuaJIT/patches/fix-vm-jit-ppc64.patch
rename to srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
diff --git a/srcpkgs/LuaJIT/template b/srcpkgs/LuaJIT/template
index b204c21811f..313404defe1 100644
--- a/srcpkgs/LuaJIT/template
+++ b/srcpkgs/LuaJIT/template
@@ -47,6 +47,23 @@ if [ "$CROSS_BUILD" ]; then
 	esac
 fi
 
+# the ppc64 patchset subtly breaks ppc, needs investigation; for
+# now apply patches conditionally, separately for ppc64 and ppc
+post_patch() {
+	local patchdir
+
+	case "$XBPS_TARGET_MACHINE" in
+		ppc64*) patchdir="ppc64";;
+		ppc*) patchdir="ppc";;
+		*) return;;
+	esac
+
+	for i in ${FILESDIR}/patches/${patchdir}/*.patch; do
+		msg_normal "patching: $i\n"
+		patch -sNp0 -i ${i}
+	done
+}
+
 do_build() {
 	local _cflags=$CFLAGS
 	local _ldflags=$LDFLAGS
diff --git a/srcpkgs/MEGAcmd/patches/include.am.patch b/srcpkgs/MEGAcmd/patches/include.am.patch
index 45e1a9fcdd5..66a0d7287d4 100644
--- a/srcpkgs/MEGAcmd/patches/include.am.patch
+++ b/srcpkgs/MEGAcmd/patches/include.am.patch
@@ -1,20 +1,12 @@
---- src/include.am.orig	2017-12-01 23:56:36.199044786 +0100
-+++ src/include.am	2017-12-01 23:56:54.073045467 +0100
-@@ -7,7 +7,7 @@
+--- src/include.am	2019-09-15 11:19:21.139430520 +0300
++++ -	2019-09-15 11:20:24.234994345 +0300
+@@ -7,9 +7,9 @@
  
  MEGACMD = mega-cmd mega-exec mega-cmd-server
  bin_PROGRAMS += $(MEGACMD)
 -$(MEGACMD): $(MEGA_LIBS)
 +$(MEGACMD):
- noinst_HEADERS += src/comunicationsmanager.h src/configurationmanager.h src/megacmd.h src/megacmdlogger.h src/megacmdsandbox.h src/megacmdutils.h src/listeners.h src/megacmdexecuter.h src/megacmdversion.h src/megacmdplatform.h src/comunicationsmanagerportsockets.h
- megacmdcompletiondir = $(sysconfdir)/bash_completion.d/
- megacmdcompletion_DATA = src/client/megacmd_completion.sh
---- src/include.am	2018-12-06 14:42:18.308589868 +0100
-+++ -	2018-12-06 14:45:15.075785487 +0100
-@@ -9,7 +9,7 @@
- bin_PROGRAMS += $(MEGACMD)
- $(MEGACMD):
- noinst_HEADERS += src/comunicationsmanager.h src/configurationmanager.h src/megacmd.h src/megacmdlogger.h src/megacmdsandbox.h src/megacmdutils.h src/listeners.h src/megacmdexecuter.h src/megacmdversion.h src/megacmdplatform.h src/comunicationsmanagerportsockets.h
+ noinst_HEADERS += src/comunicationsmanager.h src/configurationmanager.h src/megacmd.h src/megacmdlogger.h src/megacmdsandbox.h src/megacmdutils.h src/megacmdcommonutils.h src/listeners.h src/megacmdexecuter.h src/megacmdversion.h src/megacmdplatform.h src/comunicationsmanagerportsockets.h
 -megacmdcompletiondir = $(sysconfdir)/bash_completion.d/
 +megacmdcompletiondir = $(datarootdir)/bash-completion/completions
  megacmdcompletion_DATA = src/client/megacmd_completion.sh
diff --git a/srcpkgs/MEGAcmd/patches/megacmd-sdk36.diff b/srcpkgs/MEGAcmd/patches/megacmd-sdk36.diff
new file mode 100644
index 00000000000..a30a142156e
--- /dev/null
+++ b/srcpkgs/MEGAcmd/patches/megacmd-sdk36.diff
@@ -0,0 +1,381 @@
+--- src/comunicationsmanagerfilesockets.cpp
++++ src/comunicationsmanagerfilesockets.cpp
+@@ -134,14 +134,13 @@ int ComunicationsManagerFileSockets::create_new_socket(int *sockId)
+ ComunicationsManagerFileSockets::ComunicationsManagerFileSockets()
+ {
+     count = 0;
+-    mtx = new MegaMutex();
+-    informerMutex = new MegaMutex(false);
++    mtx = new std::recursive_mutex();
++    informerMutex = new std::recursive_mutex();
+     initialize();
+ }
+ 
+ int ComunicationsManagerFileSockets::initialize()
+ {
+-    mtx->init(false);
+ 
+     MegaFileSystemAccess *fsAccess = new MegaFileSystemAccess();
+     char csocketsFolder[34]; // enough to hold all numbers up to 64-bits
+@@ -394,7 +393,7 @@ void ComunicationsManagerFileSockets::sendPartialOutput(CmdPetition *inf, OUTSTR
+ 
+ int ComunicationsManagerFileSockets::informStateListener(CmdPetition *inf, string &s)
+ {
+-    MutexGuard g(*informerMutex);
++    std::lock_guard<std::recursive_mutex> g(*informerMutex);
+     LOG_verbose << "Inform State Listener: Output to write in socket " << ((CmdPetitionPosixSockets *)inf)->outSocket << ": <<" << s << ">>";
+ 
+     sockaddr_in cliAddr;
+--- src/comunicationsmanagerfilesockets.h
++++ src/comunicationsmanagerfilesockets.h
+@@ -58,8 +58,8 @@ private:
+ 
+     // to get next socket id
+     int count;
+-    mega::MegaMutex *mtx;
+-    mega::MegaMutex *informerMutex;
++    std::recursive_mutex *mtx;
++    std::recursive_mutex *informerMutex;
+ 
+     /**
+      * @brief create_new_socket
+--- src/comunicationsmanagerportsockets.cpp
++++ src/comunicationsmanagerportsockets.cpp
+@@ -161,13 +161,12 @@ SOCKET ComunicationsManagerPortSockets::create_new_socket(int *sockId)
+ ComunicationsManagerPortSockets::ComunicationsManagerPortSockets()
+ {
+     count = 0;
+-    mtx = new MegaMutex();
++    mtx = new std::recursive_mutex();
+     initialize();
+ }
+ 
+ int ComunicationsManagerPortSockets::initialize()
+ {
+-    mtx->init(false);
+ #if _WIN32
+     WORD wVersionRequested;
+     WSADATA wsaData;
+--- src/comunicationsmanagerportsockets.h
++++ src/comunicationsmanagerportsockets.h
+@@ -69,7 +69,7 @@ private:
+ 
+     // to get next socket id
+     int count;
+-    mega::MegaMutex *mtx;
++    std::recursive_mutex *mtx;
+ 
+     /**
+      * @brief create_new_socket
+--- src/listeners.cpp
++++ src/listeners.cpp
+@@ -902,7 +902,6 @@ MegaCmdGlobalTransferListener::MegaCmdGlobalTransferListener(MegaApi *megaApi, M
+     this->megaApi = megaApi;
+     this->sandboxCMD = sandboxCMD;
+     this->listener = parent;
+-    completedTransfersMutex.init(false);
+ };
+ 
+ void MegaCmdGlobalTransferListener::onTransferFinish(MegaApi* api, MegaTransfer *transfer, MegaError* error)
+--- src/listeners.h
++++ src/listeners.h
+@@ -178,7 +178,7 @@ private:
+     static const int MAXCOMPLETEDTRANSFERSBUFFER;
+ 
+ public:
+-    mega::MegaMutex completedTransfersMutex;
++    std::recursive_mutex completedTransfersMutex;
+     std::deque<mega::MegaTransfer *> completedTransfers;
+     std::map<mega::MegaHandle,std::string> completedPathsByHandle;
+ public:
+--- src/megacmd.cpp
++++ src/megacmd.cpp
+@@ -103,11 +103,11 @@ MegaApi *api;
+ std::queue<MegaApi *> apiFolders;
+ std::vector<MegaApi *> occupiedapiFolders;
+ MegaSemaphore semaphoreapiFolders;
+-MegaMutex mutexapiFolders;
++std::recursive_mutex mutexapiFolders;
+ 
+ MegaCMDLogger *loggerCMD;
+ 
+-MegaMutex mutexEndedPetitionThreads;
++std::recursive_mutex mutexEndedPetitionThreads;
+ std::vector<MegaThread *> petitionThreads;
+ std::vector<MegaThread *> endedPetitionThreads;
+ MegaThread *threadRetryConnections;
+@@ -194,7 +194,7 @@ static prompttype prompt = COMMAND;
+ // local console
+ Console* console;
+ 
+-MegaMutex mutexHistory;
++std::recursive_mutex mutexHistory;
+ 
+ map<unsigned long long, string> threadline;
+ 
+@@ -4411,9 +4411,7 @@ int main(int argc, char* argv[])
+         loggerCMD->setCmdLoggerLevel(MegaApi::LOG_LEVEL_MAX);
+     }
+ 
+-    mutexHistory.init(false);
+ 
+-    mutexEndedPetitionThreads.init(false);
+ 
+     ConfigurationManager::loadConfiguration(( argc > 1 ) && debug);
+     if (!ConfigurationManager::lockExecution() && !skiplockcheck)
+@@ -4476,7 +4474,6 @@ int main(int argc, char* argv[])
+         semaphoreClients.release();
+     }
+ 
+-    mutexapiFolders.init(false);
+ 
+     LOG_debug << "Language set to: " << localecode;
+ 
+--- src/megacmdexecuter.cpp
++++ src/megacmdexecuter.cpp
+@@ -124,12 +124,6 @@ MegaCmdExecuter::MegaCmdExecuter(MegaApi *api, MegaCMDLogger *loggerCMD, MegaCmd
+     api->addTransferListener(globalTransferListener);
+     cwd = UNDEF;
+     fsAccessCMD = new MegaFileSystemAccess();
+-    mtxSyncMap.init(false);
+-    mtxWebDavLocations.init(false);
+-    mtxFtpLocations.init(false);
+-#ifdef ENABLE_BACKUPS
+-    mtxBackupsMap.init(true);
+-#endif
+     session = NULL;
+ }
+ 
+--- src/megacmdexecuter.h
++++ src/megacmdexecuter.h
+@@ -33,12 +33,12 @@ private:
+     MegaCMDLogger *loggerCMD;
+     MegaCmdSandbox *sandboxCMD;
+     MegaCmdGlobalTransferListener *globalTransferListener;
+-    mega::MegaMutex mtxSyncMap;
+-    mega::MegaMutex mtxWebDavLocations; //TODO: destroy these two
+-    mega::MegaMutex mtxFtpLocations;
++    std::recursive_mutex mtxSyncMap;
++    std::recursive_mutex mtxWebDavLocations; //TODO: destroy these two
++    std::recursive_mutex mtxFtpLocations;
+ 
+ #ifdef ENABLE_BACKUPS
+-    mega::MegaMutex mtxBackupsMap;
++    std::recursive_mutex mtxBackupsMap;
+ #endif
+ 
+     // login/signup e-mail address
+--- src/megacmdlogger.cpp
++++ src/megacmdlogger.cpp
+@@ -38,7 +38,7 @@ using namespace std;
+ using namespace mega;
+ 
+ // different outstreams for every thread. to gather all the output data
+-MUTEX_CLASS threadLookups(false);
++std::mutex threadLookups;
+ map<uint64_t, LoggedStream *> outstreams;
+ map<uint64_t, int> threadLogLevel;
+ map<uint64_t, int> threadoutCode;
+@@ -50,7 +50,7 @@ LoggedStream LCOUT(&COUT);
+ 
+ LoggedStream &getCurrentOut()
+ {
+-    MutexGuard g(threadLookups);
++    std::lock_guard<std::mutex> g(threadLookups);
+     uint64_t currentThread = MegaThread::currentThreadId();
+     if (outstreams.find(currentThread) == outstreams.end())
+     {
+@@ -71,7 +71,7 @@ bool interactiveThread()
+ 
+     unsigned long long currentThread = MegaThread::currentThreadId();
+ 
+-    MutexGuard g(threadLookups);
++    std::lock_guard<std::mutex> g(threadLookups);
+     if (outstreams.find(currentThread) == outstreams.end())
+     {
+         return true;
+@@ -86,7 +86,7 @@ int getCurrentOutCode()
+ {
+     unsigned long long currentThread = MegaThread::currentThreadId();
+ 
+-    MutexGuard g(threadLookups);
++    std::lock_guard<std::mutex> g(threadLookups);
+     if (threadoutCode.find(currentThread) == threadoutCode.end())
+     {
+         return 0; //default OK
+@@ -102,7 +102,7 @@ CmdPetition * getCurrentPetition()
+ {
+     unsigned long long currentThread = MegaThread::currentThreadId();
+ 
+-    MutexGuard g(threadLookups);
++    std::lock_guard<std::mutex> g(threadLookups);
+     if (threadpetition.find(currentThread) == threadpetition.end())
+     {
+         return NULL;
+@@ -117,7 +117,7 @@ int getCurrentThreadLogLevel()
+ {
+     unsigned long long currentThread = MegaThread::currentThreadId();
+ 
+-    MutexGuard g(threadLookups);
++    std::lock_guard<std::mutex> g(threadLookups);
+     if (threadLogLevel.find(currentThread) == threadLogLevel.end())
+     {
+         return -1;
+@@ -132,7 +132,7 @@ bool getCurrentThreadIsCmdShell()
+ {
+     unsigned long long currentThread = MegaThread::currentThreadId();
+ 
+-    MutexGuard g(threadLookups);
++    std::lock_guard<std::mutex> g(threadLookups);
+     if (threadIsCmdShell.find(currentThread) == threadIsCmdShell.end())
+     {
+         return false; //default not
+@@ -146,31 +146,31 @@ bool getCurrentThreadIsCmdShell()
+ 
+ void setCurrentThreadLogLevel(int level)
+ {
+-    MutexGuard g(threadLookups);
++    std::lock_guard<std::mutex> g(threadLookups);
+     threadLogLevel[MegaThread::currentThreadId()] = level;
+ }
+ 
+ void setCurrentThreadOutStream(LoggedStream *s)
+ {
+-    MutexGuard g(threadLookups);
++    std::lock_guard<std::mutex> g(threadLookups);
+     outstreams[MegaThread::currentThreadId()] = s;
+ }
+ 
+ void setCurrentThreadIsCmdShell(bool isit)
+ {
+-    MutexGuard g(threadLookups);
++    std::lock_guard<std::mutex> g(threadLookups);
+     threadIsCmdShell[MegaThread::currentThreadId()] = isit;
+ }
+ 
+ void setCurrentOutCode(int outCode)
+ {
+-    MutexGuard g(threadLookups);
++    std::lock_guard<std::mutex> g(threadLookups);
+     threadoutCode[MegaThread::currentThreadId()] = outCode;
+ }
+ 
+ void setCurrentPetition(CmdPetition *petition)
+ {
+-    MutexGuard g(threadLookups);
++    std::lock_guard<std::mutex> g(threadLookups);
+     threadpetition[MegaThread::currentThreadId()] = petition;
+ }
+ 
+@@ -179,7 +179,7 @@ MegaCMDLogger::MegaCMDLogger()
+ {
+     this->output = &LCOUT;
+     this->apiLoggerLevel = MegaApi::LOG_LEVEL_ERROR;
+-    this->outputmutex = new MegaMutex(false);
++    this->outputmutex = new std::recursive_mutex;
+ }
+ 
+ MegaCMDLogger::~MegaCMDLogger()
+@@ -199,7 +199,7 @@ void MegaCMDLogger::log(const char *time, int loglevel, const char *source, cons
+         if (loglevel <= cmdLoggerLevel)
+         {
+ #ifdef _WIN32
+-            MutexGuard g(*outputmutex);
++            std::lock_guard<std::mutex> g(*outputmutex);
+             int oldmode;
+             oldmode = _setmode(_fileno(stdout), _O_U8TEXT);
+             *output << "[" << SimpleLogger::toStr(LogLevel(loglevel)) << ": " << time << "] " << message << endl;
+@@ -233,7 +233,7 @@ void MegaCMDLogger::log(const char *time, int loglevel, const char *source, cons
+                 return;
+             }
+ #ifdef _WIN32
+-            MutexGuard g(*outputmutex);
++            std::lock_guard<std::mutex> g(*outputmutex);
+             int oldmode;
+             oldmode = _setmode(_fileno(stdout), _O_U8TEXT);
+             *output << "[API:" << SimpleLogger::toStr(LogLevel(loglevel)) << ": " << time << "] " << message << endl;
+--- src/megacmdlogger.h
++++ src/megacmdlogger.h
+@@ -112,7 +112,7 @@ private:
+     int apiLoggerLevel;
+     int cmdLoggerLevel;
+     LoggedStream * output;
+-    mega::MegaMutex *outputmutex;
++    std::recursive_mutex *outputmutex;
+ 
+ public:
+     MegaCMDLogger();
+--- src/megacmdshell/megacmdshell.cpp
++++ src/megacmdshell/megacmdshell.cpp
+@@ -199,7 +199,7 @@ bool confirmingcancellink = false;
+ // communications with megacmdserver:
+ MegaCmdShellCommunications *comms;
+ 
+-MUTEX_CLASS mutexPrompt(false);
++std::mutex mutexPrompt;
+ 
+ void printWelcomeMsg(unsigned int width = 0);
+ 
+@@ -627,7 +627,7 @@ void install_rl_handler(const char *theprompt)
+ 
+ void changeprompt(const char *newprompt, bool redisplay)
+ {
+-    MutexGuard g(mutexPrompt);
++    std::lock_guard<std::mutex> g(mutexPrompt);
+ 
+     if (*dynamicprompt)
+     {
+--- src/megacmdshell/megacmdshellcommunications.cpp
++++ src/megacmdshell/megacmdshellcommunications.cpp
+@@ -80,7 +80,7 @@ bool MegaCmdShellCommunications::stopListener;
+ bool MegaCmdShellCommunications::updating;
+ ::mega::Thread *MegaCmdShellCommunications::listenerThread;
+ SOCKET MegaCmdShellCommunications::newsockfd = INVALID_SOCKET;
+-MegaMutex MegaCmdShellCommunications::megaCmdStdoutputing;
++std::recursive_mutex MegaCmdShellCommunications::megaCmdStdoutputing;
+ 
+ bool MegaCmdShellCommunications::socketValid(SOCKET socket)
+ {
+@@ -483,7 +483,6 @@ MegaCmdShellCommunications::MegaCmdShellCommunications()
+     stopListener = false;
+     updating = false;
+     listenerThread = NULL;
+-    MegaCmdShellCommunications::megaCmdStdoutputing.init(false);
+ }
+ 
+ 
+--- src/megacmdshell/megacmdshellcommunications.h
++++ src/megacmdshell/megacmdshellcommunications.h
+@@ -26,6 +26,7 @@
+ 
+ #include <string>
+ #include <iostream>
++#include <mutex>
+ 
+ #ifdef _WIN32
+ #include <WinSock2.h>
+@@ -40,15 +41,12 @@
+ 
+ #if defined(_WIN32) && !defined(WINDOWS_PHONE) && !defined(USE_CPPTHREAD)
+ #include "mega/thread/win32thread.h"
+-class MegaMutex : public ::mega::Win32Mutex {};
+ class MegaThread : public ::mega::Win32Thread {};
+ #elif defined(USE_CPPTHREAD)
+ #include "mega/thread/cppthread.h"
+-class MegaMutex : public ::mega::CppMutex {};
+ class MegaThread : public ::mega::CppThread {};
+ #else
+ #include "mega/thread/posixthread.h"
+-class MegaMutex : public ::mega::PosixMutex {};
+ class MegaThread : public ::mega::PosixThread {};
+ #endif
+ 
+@@ -118,7 +116,7 @@ public:
+     MegaCmdShellCommunications();
+     virtual ~MegaCmdShellCommunications();
+ 
+-    static MegaMutex megaCmdStdoutputing;
++    static std::recursive_mutex megaCmdStdoutputing;
+     virtual int executeCommand(std::string command, std::string (*readresponse)(const char *) = NULL, OUTSTREAMTYPE &output = COUT, bool interactiveshell = true, std::wstring = L"");
+     virtual int executeCommandW(std::wstring command, std::string (*readresponse)(const char *) = NULL, OUTSTREAMTYPE &output = COUT, bool interactiveshell = true);
+ 
diff --git a/srcpkgs/MEGAcmd/patches/musl.patch b/srcpkgs/MEGAcmd/patches/musl.patch
deleted file mode 100644
index 3e0a395fb19..00000000000
--- a/srcpkgs/MEGAcmd/patches/musl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/configurationmanager.h	2018-10-03 16:27:51.311763612 +0200
-+++ -	2018-10-03 16:29:44.035272722 +0200
-@@ -23,6 +23,10 @@
- #include <map>
- #include <set>
- 
-+#ifndef _WIN32
-+#include <sys/file.h> // LOCK_EX and LOCK_NB
-+#endif
-+
- #define CONFIGURATIONSTOREDBYVERSION -2
- class ConfigurationManager
- {
diff --git a/srcpkgs/MEGAcmd/template b/srcpkgs/MEGAcmd/template
index 2345b3972b8..63e7c4f6986 100644
--- a/srcpkgs/MEGAcmd/template
+++ b/srcpkgs/MEGAcmd/template
@@ -1,7 +1,8 @@
 # Template file for 'MEGAcmd'
 pkgname=MEGAcmd
-version=1.0.0
-revision=11
+version=1.1.0
+revision=1
+wrksrc="${pkgname}-${version}_Linux"
 build_style=gnu-configure
 make_build_args='LIBTOOLFLAGS="--tag=CXX"'
 hostmakedepends="autoconf-archive autogen gettext automake libtool pkg-config"
@@ -10,8 +11,8 @@ short_desc="Command Line Interactive and Scriptable Application to access MEGA"
 maintainer="John <johnz@posteo.net>"
 license="BSD-2-Clause, GPL-3.0-or-later"
 homepage="https://github.com/meganz/MEGAcmd"
-distfiles="https://github.com/meganz/MEGAcmd/archive/${version}.tar.gz"
-checksum=1200363bee2f387a2287e286b38d15b1a01079967e20b8c489815cc7c8d9ff63
+distfiles="https://github.com/meganz/MEGAcmd/archive/${version}_Linux.tar.gz"
+checksum=8064a21b1d1436537ab9ccc98f1f411f9496aace000584bea87d95f8e7b3a550
 replaces="megacmd>=0"
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/MEGAsdk/template b/srcpkgs/MEGAsdk/template
index a7a9977393e..52aa7573279 100644
--- a/srcpkgs/MEGAsdk/template
+++ b/srcpkgs/MEGAsdk/template
@@ -1,7 +1,7 @@
 # Template file for 'MEGAsdk'
 pkgname=MEGAsdk
-version=3.5.4
-revision=1
+version=3.6.2a
+revision=2
 wrksrc="sdk-${version}"
 build_style=gnu-configure
 configure_args="--enable-chat --disable-examples $(vopt_with libuv)"
@@ -16,7 +16,7 @@ maintainer="John <johnz@posteo.net>"
 license="BSD-2-Clause"
 homepage="https://mega.nz"
 distfiles="https://github.com/meganz/sdk/archive/v${version}.tar.gz"
-checksum=7fc81a64a77829bbc8dd316aac2159890a556dfdeade527a1386482e6dee26ee
+checksum=22d910bcd799f30a499fe748cc2b3917e9e213558b1d5fba07b3f3908a833897
 replaces="libmega>=0"
 
 build_options="libuv mediainfo"
diff --git a/srcpkgs/MEGAsync/patches/breakpad.patch b/srcpkgs/MEGAsync/patches/breakpad.patch
new file mode 100644
index 00000000000..79f258f71a5
--- /dev/null
+++ b/srcpkgs/MEGAsync/patches/breakpad.patch
@@ -0,0 +1,16 @@
+--- src/MEGASync/google_breakpad/client/linux/handler/exception_handler.cc	2019-09-13 22:27:23.351723073 +0300
++++ -	2019-09-13 22:33:08.244312688 +0300
+@@ -104,11 +104,13 @@
+ #define PR_SET_PTRACER 0x59616d61
+ #endif
+ 
++#if defined(__GLIBC__) && !__GLIBC_PREREQ(2, 30)
+ // A wrapper for the tgkill syscall: send a signal to a specific thread.
+ static int tgkill(pid_t tgid, pid_t tid, int sig) {
+   return syscall(__NR_tgkill, tgid, tid, sig);
+   return 0;
+ }
++#endif
+ 
+ namespace google_breakpad {
+ 
diff --git a/srcpkgs/MEGAsync/template b/srcpkgs/MEGAsync/template
index 913e8fe7dee..4b66868b06e 100644
--- a/srcpkgs/MEGAsync/template
+++ b/srcpkgs/MEGAsync/template
@@ -1,20 +1,20 @@
 # Template file for 'MEGAsync'
 pkgname=MEGAsync
-version=4.1.1.0
+version=4.2.4.0
 revision=1
-wrksrc="${pkgname}-${version}_Linux"
+wrksrc="${pkgname}-${version}_Win"
 build_wrksrc=src
 build_style=qmake
-configure_args='"CONFIG-=with_tools"'
+configure_args='"CONFIG+=FULLREQUIREMENTS"'
 hostmakedepends="libtool qt5-qmake qt5-host-tools"
 makedepends="qt5-tools-devel qt5-devel qt5-svg-devel MEGAsdk-devel MEGAsdk-qt
  libraw-devel libgomp-devel"
 short_desc="Automated syncing with MEGA Cloud Drive"
 maintainer="John <johnz@posteo.net>"
-license="custom"
+license="custom: Proprietary"
 homepage="https://mega.co.nz"
-distfiles="https://github.com/meganz/MEGAsync/archive/v${version}_Linux.tar.gz"
-checksum=5f43a3f402c10519e2f59c8c2a70c55affd3eb1a323767127929fb5f4baa429c
+distfiles="https://github.com/meganz/MEGAsync/archive/v${version}_Win.tar.gz"
+checksum=5fd90c93677085a2f73faa6a5a3548fcd29fc9f3203f6ddbcac7f170b580f239
 restricted=yes
 nocross=yes
 
diff --git a/srcpkgs/Minder/template b/srcpkgs/Minder/template
index ffe8b188f28..47d62e32ed2 100644
--- a/srcpkgs/Minder/template
+++ b/srcpkgs/Minder/template
@@ -1,6 +1,6 @@
 # Template file for 'Minder'
 pkgname=Minder
-version=1.4.1
+version=1.5.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config glib-devel vala"
@@ -11,4 +11,4 @@ maintainer="Cameron Nemo <camerontnorman@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/phase1geo/Minder"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=e1e5343fb83612bfc4f1943cbc53411649da4ce9bd078061b0623e7c9db95621
+checksum=e313b5305242959434d551d3ec78bbed6faceb5494c1832b98b0b63a95b2e3f0
diff --git a/srcpkgs/ModemManager/template b/srcpkgs/ModemManager/template
index 085a1c6de39..276f13dba4b 100644
--- a/srcpkgs/ModemManager/template
+++ b/srcpkgs/ModemManager/template
@@ -1,6 +1,6 @@
 # Template file for 'ModemManager'
 pkgname=ModemManager
-version=1.10.4
+version=1.10.6
 revision=1
 build_style=gnu-configure
 build_helper="gir"
@@ -18,7 +18,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.freedesktop.org/wiki/Software/ModemManager/"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=fa556bb4ba1f1478e709b71151b4de8f7d136d80e51c64e887fc1fd8926cdc70
+checksum=3c2ca73782215664141042422759899ca9846440fc26d6223c7cf7ea4dd3c996
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/MultiMC/template b/srcpkgs/MultiMC/template
index 297ffe08850..b38ba6ca597 100644
--- a/srcpkgs/MultiMC/template
+++ b/srcpkgs/MultiMC/template
@@ -1,14 +1,14 @@
 # Template file for 'MultiMC'
 pkgname=MultiMC
-version=0.6.5
-revision=4
+version=0.6.7
+revision=2
 wrksrc="${pkgname}5-${version}"
 _commithashnbt="4b305bbd2ac0e7a26987baf7949a484a87b474d4"
-_nbtversion="multimc-0.5.0"
-_quazipversion="multimc-2"
+_nbtversion="multimc-0.6.1"
+_quazipversion="multimc-3"
 build_style=cmake
 configure_args='-DMultiMC_BUILD_PLATFORM=Void -DMultiMC_LAYOUT=lin-system'
-hostmakedepends="openjdk xxd git-all"
+hostmakedepends="openjdk xxd git"
 makedepends="qt5-devel qt5-x11extras-devel qt5-svg-devel gtk+-devel"
 depends="virtual?java-environment"
 short_desc="Instanced Minecraft client"
@@ -18,9 +18,9 @@ homepage="http://multimc.org"
 distfiles="https://github.com/${pkgname}/${pkgname}5/archive/${version}.tar.gz
 	https://github.com/${pkgname}/libnbtplusplus/archive/${_nbtversion}.tar.gz
 	https://github.com/${pkgname}/quazip/archive/${_quazipversion}.tar.gz"
-checksum="98e8db7c0fda5e5a1917dc3f7cdbfd4b337c45aa47d1e7dbd45c380576bd7716
-	bcefbdd905f10a04605cf9e8f768d0f60c972e9e219c800512a5fd9c5f7a8498
-	25e1b74f0edef5e09647f7b5344c08fad4eaebbc386b1f288b59286ecdfe07fa"
+checksum="3ec38a5f622048ba3926f0e20fb296d646c7848f8313143062b3e2bd273149ae
+ 36c816e6b1ef8ece52c57dfa9bfda3a23808d0c6c3288b25d8bcf49c7cdb5b07
+ ffa60368b1c196859691b637c740f4c60597b2ac47217995082ae8b2a3a9ac18"
 skip_extraction="${_nbtversion}.tar.gz ${_quazipversion}.tar.gz"
 
 pre_configure() {
diff --git a/srcpkgs/NetAuth/template b/srcpkgs/NetAuth/template
index caa6078d3d0..ef64bcac909 100644
--- a/srcpkgs/NetAuth/template
+++ b/srcpkgs/NetAuth/template
@@ -1,6 +1,6 @@
 # Template file for 'NetAuth'
 pkgname=NetAuth
-version=0.1.0
+version=0.2.1
 revision=1
 build_style="go"
 go_import_path="github.com/NetAuth/NetAuth"
@@ -12,7 +12,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MIT"
 homepage="https://netauth.org"
 distfiles="https://github.com/NetAuth/NetAuth/archive/v$version.tar.gz"
-checksum=3521516de7e342199ebc564614f0b5f93119b2fcbf603c186cd2c7f20cb18874
+checksum=f2065b58c6e6c1015ea5cfcf7a61a91e90b597e76ecabd0c6ec60016ebdb0766
 
 do_check() {
 	go test -v ./...
diff --git a/srcpkgs/NetKeys/template b/srcpkgs/NetKeys/template
index 1afaa01f939..ef5fedfe8e5 100644
--- a/srcpkgs/NetKeys/template
+++ b/srcpkgs/NetKeys/template
@@ -1,6 +1,6 @@
 # Template file for 'NetKeys'
 pkgname=NetKeys
-version=0.3
+version=0.4
 revision=1
 build_style=go
 go_import_path="github.com/NetAuth/NetKeys"
@@ -11,7 +11,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MIT"
 homepage="https://netauth.org"
 distfiles="https://github.com/NetAuth/NetKeys/archive/v$version.tar.gz"
-checksum=f6daf0390020c31ba33c4231df9190ce9d3b6a8373492debc98a797a31380679
+checksum=f70a457f7e840425618c32ef3f5a540b6b9a027e3199e5355ffb7995b5de0d3f
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index bc2c5a4db7d..e9a615193c9 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -1,7 +1,7 @@
 # Template file for 'NetworkManager'
 pkgname=NetworkManager
 version=1.18.2
-revision=2
+revision=4
 build_style=meson
 build_helper="gir"
 configure_args="-Dpolkit_agent=true -Dsystemd_journal=false
@@ -12,10 +12,11 @@ configure_args="-Dpolkit_agent=true -Dsystemd_journal=false
  -Dpppd_plugin_dir=/usr/lib/pppd/2.4.7 -Dresolvconf=/usr/bin/resolvconf
  -Ddhclient=/usr/bin/dhclient -Dkernel_firmware_dir=/usr/lib/firmware
  -Ddnsmasq=/usr/bin/dnsmasq -Ddbus_conf_dir=/etc/dbus-1/system.d
+ -Diwd=true
  -Dudev_dir=/usr/lib/udev -Dintrospection=$(vopt_if gir true false)
  -Dvapi=$(vopt_if vala true false)
  -Dsession_tracking=$(vopt_if elogind elogind no)
- -Dsuspend_resume=$(vopt_if elogind elogind no)
+ -Dsuspend_resume=$(vopt_if elogind elogind upower)
  -Dconfig_dhcp_default=internal"
 hostmakedepends="gettext-devel glib-devel libxslt-devel pkg-config
  intltool dbus-glib-devel jansson-devel $(vopt_if vala vala)
@@ -52,7 +53,7 @@ esac
 
 # Package build options
 build_options="gir vala elogind"
-build_options_default="gir vala"
+build_options_default="gir vala elogind"
 
 pre_configure() {
 	if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/OTPClient/template b/srcpkgs/OTPClient/template
index 3effc7e017c..668300b7192 100644
--- a/srcpkgs/OTPClient/template
+++ b/srcpkgs/OTPClient/template
@@ -1,14 +1,14 @@
 # Template file for 'OTPClient'
 pkgname=OTPClient
-version=1.4.1
+version=1.5.1
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="gtk+3-devel libglib-devel libgcrypt-devel libpng-devel
  libzip-devel libcotp-devel libzbar-devel jansson-devel"
 short_desc="Highly secure and easy to use GTK+ OTP client"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/paolostivanin/OTPClient"
 distfiles="https://github.com/paolostivanin/OTPClient/archive/v${version}.tar.gz"
-checksum=67ffd03e866a2184896b99d385a95c181e2e84d371276723297d136683a0fa93
+checksum=c8794a45b691613326f15a95b9fe7f16511b0c16b6b6e1cedc11dc5344c2cc27
diff --git a/srcpkgs/PackageKit/template b/srcpkgs/PackageKit/template
index b9590d1e5ba..046602547cd 100644
--- a/srcpkgs/PackageKit/template
+++ b/srcpkgs/PackageKit/template
@@ -15,7 +15,7 @@ hostmakedepends="automake glib-devel pkg-config libtool gtk-doc
 makedepends="libglib-devel sqlite-devel polkit-devel bash-completion
  $(vopt_if gir gobject-introspection) $(vopt_if vala 'vala-devel')"
 short_desc="D-BUS abstraction layer to package management API"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/hughsie/PackageKit"
 distfiles="https://github.com/hughsie/PackageKit/archive/PACKAGEKIT_${version//./_}.tar.gz"
diff --git a/srcpkgs/PopCorn/template b/srcpkgs/PopCorn/template
index 06da3633994..86b03287d71 100644
--- a/srcpkgs/PopCorn/template
+++ b/srcpkgs/PopCorn/template
@@ -1,21 +1,21 @@
 # Template file for 'PopCorn'
 pkgname=PopCorn
-version=0.3
-revision=4
+version=0.4
+revision=1
 build_style=go
 go_import_path=github.com/the-maldridge/popcorn
 go_package="${go_import_path}/cmd/popcorn
  ${go_import_path}/cmd/popcornctl
  ${go_import_path}/cmd/statrepo
  ${go_import_path}/cmd/pqueryd"
-hostmakedepends="dep"
+hostmakedepends="git"
 depends="snooze"
 short_desc="Package statistics system"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/the-maldridge/PopCorn"
 distfiles="https://github.com/the-maldridge/PopCorn/archive/v${version}.tar.gz"
-checksum=5e61970c3ba5fd83f6b5b86c30264213461f4a5af8aacd2ba1757333ece05260
+checksum=b25589802c5e1c277d2e9536add44704a012359b02d7fb4be1b4b0f11eb10d93
 
 system_accounts="_popcorn"
 _popcorn_homedir="/var/lib/popcorn"
@@ -23,12 +23,6 @@ make_dirs="
  /var/lib/popcorn 0755 _popcorn _popcorn
  /etc/popcorn 0755 _popcorn _popcorn"
 
-pre_build() {
-	cd $GOSRCPATH
-	dep ensure
-	cd $wrksrc
-}
-
 post_install() {
 	vlicense LICENSE
 	vsv popcorn
diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 23d299bce49..9070ba6cd11 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,21 +1,21 @@
 # Template file for 'QMPlay2'
 pkgname=QMPlay2
-version=18.12.26
-revision=3
+version=19.09.03
+revision=1
 wrksrc="${pkgname}-src-${version}"
 build_style=cmake
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
 makedepends="alsa-lib-devel ffmpeg-devel libass-devel libcdio-devel libgme-devel
  libsidplayfp-devel libva-glx-devel libXv-devel pulseaudio-devel
  qt5-svg-devel qt5-tools-devel qt5-x11extras-devel taglib-devel
- libcdio-paranoia-devel"
+ libcdio-paranoia-devel qt5-declarative-devel"
 short_desc="Video and audio player which can play most formats and codecs"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="LGPL-3.0-only"
 homepage="http://zaps166.sourceforge.net/?app=QMPlay2"
 changelog="https://raw.githubusercontent.com/zaps166/QMPlay2/master/ChangeLog"
 distfiles="https://github.com/zaps166/QMPlay2/releases/download/${version}/QMPlay2-src-${version}.tar.xz"
-checksum=11922ea44512736de223f502f32ed075f2010c37a752065945fcadaf6af5e53d
+checksum=8481124d0cdec6c2256a748dc529b4c6080b6f6700a26e11e3738d9d2a577882
 
 QMPlay2-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/R/template b/srcpkgs/R/template
index 427735181d9..1e62b4cd784 100644
--- a/srcpkgs/R/template
+++ b/srcpkgs/R/template
@@ -1,7 +1,7 @@
 # Template file for 'R'
 pkgname=R
-version=3.5.3
-revision=2
+version=3.6.1
+revision=1
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/R rdocdir=/usr/share/doc/R
  --with-lapack --with-blas --enable-R-shlib --with-tcltk
@@ -18,7 +18,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.r-project.org/"
 changelog="https://cran.r-project.org/doc/manuals/r-release/NEWS.html"
 distfiles="https://cran.r-project.org/src/base/R-3/${pkgname}-${version}.tar.gz"
-checksum=2bfa37b7bd709f003d6b8a172ddfb6d03ddd2d672d6096439523039f7a8e678c
+checksum=5baa9ebd3e71acecdcc3da31d9042fb174d55a42829f8315f2457080978b1389
 nocross=yes
 shlib_provides="libR.so"
 
diff --git a/srcpkgs/RubyMine/template b/srcpkgs/RubyMine/template
index 7b674991b74..db8144b63a0 100644
--- a/srcpkgs/RubyMine/template
+++ b/srcpkgs/RubyMine/template
@@ -1,6 +1,6 @@
 # Template file for 'RubyMine'
 pkgname=RubyMine
-version=2019.1.2
+version=2019.2.3
 revision=1
 archs="i686 x86_64"
 depends="virtual?java-environment"
@@ -9,7 +9,7 @@ maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/ruby"
 distfiles="https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"
-checksum=db60a07098d3fec4e72bcbd5e5c48638983e20817e41c3f83266733f2d8a0cfe
+checksum=6ac522b2a68d2e32855999d73a900e08144a812f1e54562d4714d99eb0ee1e3d
 repository=nonfree
 restricted=yes
 nopie=yes
@@ -37,14 +37,14 @@ post_extract() {
 
 do_install() {
 	TARGET_PATH="usr/lib/${pkgname}"
-	LICENSE_PATH="usr/share/licenses/${pkgname}"
 
 	vmkdir usr/bin
 	vmkdir ${TARGET_PATH}
-	vmkdir ${LICENSE_PATH}
 
-	# Ideally vlicense should be called here, but vcopy is more terse.
-	vcopy license/* ${LICENSE_PATH}
+	local i
+	for i in license/* ; do
+		vlicense $i
+	done
 
 	vcopy bin ${TARGET_PATH}
 	vcopy help ${TARGET_PATH}
diff --git a/srcpkgs/SDL2_mixer/template b/srcpkgs/SDL2_mixer/template
index 69197b64791..80d654951b9 100644
--- a/srcpkgs/SDL2_mixer/template
+++ b/srcpkgs/SDL2_mixer/template
@@ -1,13 +1,13 @@
 # Template file for 'SDL2_mixer'
 pkgname=SDL2_mixer
 version=2.0.4
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="SDL2-devel libvorbis-devel libmikmod-devel libflac-devel
- libmodplug-devel mpg123-devel smpeg2-devel fluidsynth-devel"
+ libmodplug-devel mpg123-devel smpeg2-devel fluidsynth-devel opusfile-devel"
 # The following deps are dlopen(3)ed at runtime.
-depends="libvorbis libmikmod libmpg123 libmodplug libflac smpeg2"
+depends="libvorbis libmikmod libmpg123 libmodplug libflac smpeg2 opusfile"
 short_desc="Multi-channel audio mixer library (SDL 2.x)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
diff --git a/srcpkgs/SLADE/template b/srcpkgs/SLADE/template
index 0015cd93633..9123399f560 100644
--- a/srcpkgs/SLADE/template
+++ b/srcpkgs/SLADE/template
@@ -1,8 +1,9 @@
 # Template file for 'SLADE'
 pkgname=SLADE
-version=3.1.5
+version=3.1.7
 revision=1
 build_style=cmake
+configure_args="-DCL_WX_CONFIG=wx-config-gtk3"
 hostmakedepends="pkg-config p7zip"
 makedepends="SFML-devel fluidsynth-devel freeimage-devel ftgl-devel glew-devel
  gtk+3-devel libcurl-devel wxWidgets-gtk3-devel"
@@ -12,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/sirjuddington/SLADE"
 changelog="https://github.com/sirjuddington/SLADE/releases/tag/${version}"
 distfiles="https://github.com/sirjuddington/SLADE/archive/${version}.tar.gz"
-checksum=ddab2c5bde9939dd74505fa4f021995e35f00ead0124ce19cbf72f908445aec4
+checksum=abea38ff173b5494ddb50fa7996b6f1818f08c6992b119cb137bdacc63af3789
 
 if [ -z "$CROSS_BUILD" ]; then
 	configure_args+=" -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-gtk3"
diff --git a/srcpkgs/SPIRV-Headers/template b/srcpkgs/SPIRV-Headers/template
index 3c0374f53bd..55f54b64dfa 100644
--- a/srcpkgs/SPIRV-Headers/template
+++ b/srcpkgs/SPIRV-Headers/template
@@ -5,7 +5,7 @@ revision=1
 archs=noarch
 build_style=cmake
 short_desc="Machine-readable files for the SPIR-V Registry"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/KhronosGroup/SPIRV-Headers"
 distfiles="https://github.com/KhronosGroup/SPIRV-Headers/archive/${version}.tar.gz"
diff --git a/srcpkgs/SPIRV-Tools/template b/srcpkgs/SPIRV-Tools/template
index 5d6b76342c2..2c077be3c55 100644
--- a/srcpkgs/SPIRV-Tools/template
+++ b/srcpkgs/SPIRV-Tools/template
@@ -9,7 +9,7 @@ configure_args="-DSPIRV_SKIP_TESTS=ON -DSPIRV_WERROR=OFF
 hostmakedepends="python3"
 makedepends="SPIRV-Headers"
 short_desc="API and commands for processing SPIR-V modules"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/KhronosGroup/SPIRV-Tools"
 distfiles="https://github.com/KhronosGroup/SPIRV-Tools/archive/v${version}.tar.gz"
diff --git a/srcpkgs/Signal-Desktop/patches/build-from-tarball.patch b/srcpkgs/Signal-Desktop/patches/build-from-tarball.patch
index 11f75722a5a..9bb227005f0 100644
--- a/srcpkgs/Signal-Desktop/patches/build-from-tarball.patch
+++ b/srcpkgs/Signal-Desktop/patches/build-from-tarball.patch
@@ -1,7 +1,6 @@
-Kludge to work around https://github.com/signalapp/Signal-Desktop/issues/2376.
---- Gruntfile.js.orig	2018-05-15 01:57:11.000000000 +0200
-+++ Gruntfile.js	2018-05-20 19:15:45.054357251 +0200
-@@ -511,6 +511,5 @@
+--- Gruntfile.js.orig	2019-09-05 13:47:47.906325029 +0200
++++ Gruntfile.js	2019-09-05 13:48:40.869808351 +0200
+@@ -436,6 +436,5 @@
      'concat',
      'copy:deps',
      'sass',
diff --git a/srcpkgs/Signal-Desktop/template b/srcpkgs/Signal-Desktop/template
index 73fe0184272..7013d4d8a2a 100644
--- a/srcpkgs/Signal-Desktop/template
+++ b/srcpkgs/Signal-Desktop/template
@@ -1,20 +1,24 @@
 # Template file for 'Signal-Desktop'
 pkgname=Signal-Desktop
-version=1.23.2
-revision=2
+version=1.27.1
+revision=1
 # Due to electron
 # 32-bit is not supported https://github.com/signalapp/Signal-Desktop/issues/1661
 archs="x86_64"
-hostmakedepends="git python nodejs-lts yarn"
+hostmakedepends="git python nodejs yarn"
 depends="libnotify libappindicator"
 short_desc="Signal Private Messenger for Linux"
 maintainer="Julio Galvan <juliogalvan@protonmail.com>"
 license="GPL-3.0-only"
 homepage="https://github.com/signalapp/Signal-Desktop"
 distfiles="https://github.com/signalapp/Signal-Desktop/archive/v${version}.tar.gz"
-checksum=344842c7a7eac1772a507c8170eef6cf000051eab688609e158669cda51f56a6
+checksum=18c5c9f1a3684b4d0d49a9bb490c7e56417e464b29a06bf4cef36e2e5c523652
 nostrip_files="signal-desktop"
 
+pre_build() {
+	vsed -e 's/"node": "/&>=/' -i package.json
+}
+
 do_build() {
 	yarn install --ignore-engines
 	yarn grunt
diff --git a/srcpkgs/Solaar/template b/srcpkgs/Solaar/template
new file mode 100644
index 00000000000..2e8f4112e0e
--- /dev/null
+++ b/srcpkgs/Solaar/template
@@ -0,0 +1,15 @@
+# Template file for 'Solaar'
+pkgname=Solaar
+version=1.0.1
+revision=1
+archs=noarch
+build_style=python3-module
+pycompile_module="hidapi logitech_receiver solaar"
+hostmakedepends="python3-setuptools"
+depends="python3-pyudev"
+short_desc="Linux device manager for a wide range of Logitech devices"
+maintainer="Young Jin Park <youngjinpark20@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://pwr-solaar.github.io/Solaar/"
+distfiles="https://github.com/pwr-Solaar/Solaar/archive/${version}.tar.gz"
+checksum=20f7c29610cc1d0a964052b6698c3e01f1703d08d621cbe7f9e45a9892632f13
diff --git a/srcpkgs/SweetHome3D/template b/srcpkgs/SweetHome3D/template
index 0cac3ce8c48..40617e123f3 100644
--- a/srcpkgs/SweetHome3D/template
+++ b/srcpkgs/SweetHome3D/template
@@ -1,6 +1,6 @@
 # Template file for 'SweetHome3D'
 pkgname=SweetHome3D
-version=6.1.2
+version=6.2
 revision=1
 archs="i686 x86_64"
 wrksrc="SweetHome3D-${version}-src"
@@ -12,7 +12,7 @@ maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="www.sweethome3d.com"
 distfiles="${SOURCEFORGE_SITE}/sweethome3d/SweetHome3D-${version}-src.zip"
-checksum=43645e34c94bf5b514974428c4a0eefae403fcaf52258cbb9c6fe07d4da8f7db
+checksum=285cb97aee9254de66a195469e494fb28bb77dc1f14b0a92802e7896bd7870ad
 
 do_build() {
 	ant application textures furniture examples help java3dLibraries
diff --git a/srcpkgs/The-Powder-Toy/template b/srcpkgs/The-Powder-Toy/template
new file mode 100644
index 00000000000..778c0f8f211
--- /dev/null
+++ b/srcpkgs/The-Powder-Toy/template
@@ -0,0 +1,28 @@
+# Template file for 'The-Powder-Toy'
+pkgname=The-Powder-Toy
+version=94.1
+revision=1
+build_style=scons
+make_build_args="--output=powder"
+makedepends="SDL2-devel lua51-devel fftw-devel bzip2-devel zlib-devel"
+short_desc="Falling sand physics sandbox, simulates air pressure, velocity & heat"
+maintainer="Illia Shestakov <ishestakov@airmail.cc>"
+license="GPL-3.0-or-later"
+homepage="https://powdertoy.co.uk/"
+distfiles="https://github.com/The-Powder-Toy/${pkgname}/archive/v${version}.tar.gz"
+checksum=9770c0732c97e4e89a1e53330c969e9675595f78e6673c519c3724d6df591e72
+CPPDEFINES=IGNORE_UPDATES
+
+case "$XBPS_TARGET_MACHINE"
+	in x86_64*|i686*)
+		;;
+	*)
+		make_build_args+=" --no-sse";;
+esac
+
+do_install() {
+	vbin build/powder
+	vdoc README.md
+	vinstall resources/powder.desktop 664 /usr/share/applications/
+	vinstall resources/icon/powder-256.png 644 /usr/share/pixmaps/ powder.png
+}
diff --git a/srcpkgs/Thunar/template b/srcpkgs/Thunar/template
index 26160c44da0..6cf46ccd0ff 100644
--- a/srcpkgs/Thunar/template
+++ b/srcpkgs/Thunar/template
@@ -1,7 +1,7 @@
 # Template file for 'Thunar'
 pkgname=Thunar
 version=1.8.9
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--enable-gio-unix --enable-gudev
diff --git a/srcpkgs/UEFITool/template b/srcpkgs/UEFITool/template
new file mode 100644
index 00000000000..6d9602fd636
--- /dev/null
+++ b/srcpkgs/UEFITool/template
@@ -0,0 +1,27 @@
+# Template file for 'UEFITool'
+pkgname=UEFITool
+version=A55
+revision=1
+build_wrksrc="UEFITool"
+build_style=qmake
+hostmakedepends="qt5-qmake qt5-devel"
+makedepends="qt5-declarative-devel"
+short_desc="UEFI firmware image viewer and editor"
+maintainer="Kacper Słomiński <kacper.slominski72@gmail.com>"
+license="BSD-2-Clause"
+homepage="https://github.com/LongSoft/UEFITool/"
+distfiles="${homepage}/archive/${version}.tar.gz"
+checksum=2b8f7643585aee80497789430b18196e8480c0d0af8632dec8bc06492fbc16d9
+
+do_install() {
+	vbin UEFITool uefitool
+	vmkdir usr/share/applications
+	vinstall uefitool.desktop 644 usr/share/applications
+	local size
+	for size in 16 32 48 64 128 256 512; do
+		vinstall icons/uefitool_${size}x${size}.png \
+			644 usr/share/icons/hicolor${size}x${size}/apps uefitool.png
+	done
+	vinstall icons/uefitool_128x128.png 644 usr/share/pixmaps uefitool.png
+	vlicense ../LICENSE.md
+}
diff --git a/srcpkgs/Uranium/patches/fix-crash-in-cura.patch b/srcpkgs/Uranium/patches/fix-crash-in-cura.patch
deleted file mode 100644
index 3d51f4e66d8..00000000000
--- a/srcpkgs/Uranium/patches/fix-crash-in-cura.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-From 9de2827a6ea5eb6ce7d8f845c4b4fc388b01da40 Mon Sep 17 00:00:00 2001
-From: Mark Burton <markb@smartavionics.com>
-Date: Mon, 22 Jul 2019 16:00:15 +0100
-Subject: [PATCH] Set border_node's geometry and material before appending it
- to paint_node.
-
----
- UM/Qt/Bindings/PointingRectangle.py | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/UM/Qt/Bindings/PointingRectangle.py b/UM/Qt/Bindings/PointingRectangle.py
-index ddb8520db..a0a79c6a1 100644
---- UM/Qt/Bindings/PointingRectangle.py
-+++ UM/Qt/Bindings/PointingRectangle.py
-@@ -162,8 +162,9 @@ def updatePaintNode(self, paint_node, update_data):
- 
-         if self._border_width > 0:
-             if paint_node.childCount() == 0:
--                paint_node.appendChildNode(QSGGeometryNode())
--            border_node = paint_node.firstChild()
-+                border_node = QSGGeometryNode()
-+            else:
-+                border_node = paint_node.firstChild()
- 
-             border_vertices = []
-             border_vertices.append((0, 0))
-@@ -204,6 +205,9 @@ def updatePaintNode(self, paint_node, update_data):
-             border_material.setColor(self._border_color)
- 
-             border_node.setMaterial(border_material)
-+
-+            if paint_node.childCount() == 0:
-+                paint_node.appendChildNode(border_node)
-         else:
-             border_node = None
-             border_geometry = None
-
-From c0fcf8e290b88fa276af7df8694e95d55aa912b9 Mon Sep 17 00:00:00 2001
-From: Mark Burton <markb@smartavionics.com>
-Date: Mon, 22 Jul 2019 19:47:15 +0100
-Subject: [PATCH] ShaderEffect crashes on Linux with Qt 5.13 so replace with
- ColorOverlay.
-
----
- UM/Qt/qml/UM/RecolorImage.qml | 60 ++++-------------------------------
- 1 file changed, 6 insertions(+), 54 deletions(-)
-
-diff --git a/UM/Qt/qml/UM/RecolorImage.qml b/UM/Qt/qml/UM/RecolorImage.qml
-index c4f209154..5bd73a6b5 100644
---- UM/Qt/qml/UM/RecolorImage.qml
-+++ UM/Qt/qml/UM/RecolorImage.qml
-@@ -2,6 +2,7 @@
- // Uranium is released under the terms of the LGPLv3 or higher.
- 
- import QtQuick 2.1
-+import QtGraphicalEffects 1.0
- import UM 1.3 as UM
- 
- Item
-@@ -9,7 +10,7 @@ Item
-     id: base;
- 
-     property alias source: img.source
--    property alias color: shader.color
-+    property alias color: overlay.color
-     property alias sourceSize: img.sourceSize
- 
-     Image
-@@ -21,59 +22,10 @@ Item
-         sourceSize.height: parent.height
-     }
- 
--    ShaderEffect
--    {
--        id: shader
-+    ColorOverlay {
-+        id: overlay
-         anchors.fill: parent
--
--        property variant src: img
--        property color color: "#fff"
--
--        vertexShader: UM.OpenGLContextProxy.isLegacyOpenGL ?
--            "
--            uniform highp mat4 qt_Matrix;
--            attribute highp vec4 qt_Vertex;
--            attribute highp vec2 qt_MultiTexCoord0;
--            varying highp vec2 coord;
--            void main() {
--                coord = qt_MultiTexCoord0;
--                gl_Position = qt_Matrix * qt_Vertex;
--            }
--            " : "
--            #version 410
--            uniform highp mat4 qt_Matrix;
--            in highp vec4 qt_Vertex;
--            in highp vec2 qt_MultiTexCoord0;
--            out highp vec2 coord;
--            void main() {
--                coord = qt_MultiTexCoord0;
--                gl_Position = qt_Matrix * qt_Vertex;
--            }
--            "
--
--        fragmentShader: UM.OpenGLContextProxy.isLegacyOpenGL ?
--            "
--            varying highp vec2 coord;
--            uniform sampler2D src;
--            uniform lowp vec4 color;
--            uniform lowp float qt_Opacity;
--            void main() {
--                lowp vec4 tex = texture2D(src, coord);
--                lowp float alpha = tex.a  * qt_Opacity;
--                gl_FragColor = vec4(color.r * alpha, color.g * alpha, color.b * alpha, alpha);
--            }
--            " : "
--            #version 410
--            in highp vec2 coord;
--            uniform sampler2D src;
--            uniform lowp vec4 color;
--            uniform lowp float qt_Opacity;
--            out vec4 frag_color;
--            void main() {
--                lowp vec4 tex = texture(src, coord);
--                lowp float alpha = tex.a  * qt_Opacity;
--                frag_color = vec4(color.r * alpha, color.g * alpha, color.b * alpha, alpha);
--            }
--            "
-+        source: img
-+        color: "#fff"
-     }
- }
diff --git a/srcpkgs/Uranium/template b/srcpkgs/Uranium/template
index cf3fb0bb38c..193d5e211df 100644
--- a/srcpkgs/Uranium/template
+++ b/srcpkgs/Uranium/template
@@ -1,7 +1,7 @@
 # Template file for 'Uranium'
 pkgname=Uranium
-version=4.2.0
-revision=2
+version=4.3.0
+revision=1
 archs=noarch
 build_style=cmake
 pycompile_module="UM"
@@ -15,4 +15,4 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/Ultimaker/Uranium"
 distfiles="https://github.com/Ultimaker/Uranium/archive/${version}.tar.gz"
-checksum=af394fb133e6a3ce92c245428bcf458956b2ca26c33122a35c464b9f5aaddd2e
+checksum=9f871877cf46e8b9e58346f33fdb6eed07c08f242fe292d0c993f224005dfc38
diff --git a/srcpkgs/VirtualGL/template b/srcpkgs/VirtualGL/template
index 98bc90b7a1c..c142305613b 100644
--- a/srcpkgs/VirtualGL/template
+++ b/srcpkgs/VirtualGL/template
@@ -1,7 +1,7 @@
 # Template file for 'VirtualGL'
 pkgname=VirtualGL
-version=2.6.1
-revision=2
+version=2.6.2
+revision=1
 build_style=cmake
 configure_args="-DTJPEG_INCLUDE_DIR=/usr/include -DVGL_SYSTEMGLX=ON
  -DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DCMAKE_INSTALL_LIBDIR=/usr/lib
@@ -10,10 +10,10 @@ makedepends="libXv-devel glu-devel libjpeg-turbo-devel MesaLib-devel
  libXtst-devel fltk-devel libressl-devel"
 short_desc="Run remote OpenGL applications with full acceleration"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
+license="LGPL-2.1-or-later"
 homepage="http://www.virtualgl.org/"
 distfiles="${SOURCEFORGE_SITE}/virtualgl/${version}/${pkgname}-${version}.tar.gz"
-checksum=8802989a565b077036007848a845943971f670d72dc89f502601dfd36d401f83
+checksum=79dff857862890215794509ac65826005625925d03bf0874a486d695aae6f859
 
 archs="i686* x86_64*"
 
diff --git a/srcpkgs/Vulkan-Headers/template b/srcpkgs/Vulkan-Headers/template
index 7993668de4b..addd0c9847a 100644
--- a/srcpkgs/Vulkan-Headers/template
+++ b/srcpkgs/Vulkan-Headers/template
@@ -1,6 +1,6 @@
 # Template file for 'Vulkan-Headers'
 pkgname=Vulkan-Headers
-version=1.1.115
+version=1.1.123
 revision=1
 archs=noarch
 wrksrc="${pkgname}-${version}"
@@ -10,4 +10,4 @@ maintainer="Arvin Ignaci <arvin.ignaci@gmail.com>"
 license="Apache-2.0"
 homepage="https://www.khronos.org/vulkan/"
 distfiles="https://github.com/KhronosGroup/Vulkan-Headers/archive/v${version}.tar.gz"
-checksum=9298c9a591ecbfbe399b659eac2ae0ee8845601235859a741f38ced1a8144fe3
+checksum=aa58ddcf972f05d26bdfa50ac689022b77baf101317258ac146393ef47741581
diff --git a/srcpkgs/Vulkan-Tools/template b/srcpkgs/Vulkan-Tools/template
index 6a78090e775..cb1dfc9b446 100644
--- a/srcpkgs/Vulkan-Tools/template
+++ b/srcpkgs/Vulkan-Tools/template
@@ -1,6 +1,6 @@
 # Template file for 'Vulkan-Tools'
 pkgname=Vulkan-Tools
-version=1.1.108
+version=1.1.123
 revision=1
 wrksrc="${pkgname}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="Arvin Ignaci <arvin.ignaci@gmail.com>"
 license="Apache-2.0"
 homepage="https://www.khronos.org/vulkan/"
 distfiles="https://github.com/KhronosGroup/${pkgname}/archive/v${version}.tar.gz"
-checksum=6db41f252e32a5255342cfeb0e3eceff2ea729025a655727ac681f3c5ab46512
+checksum=a458ee9b3c6dcbdef0dbb69b6a6afbd7ac72f9355977636d34a89c2fadecc7c8
 
 build_options="cube"
 desc_option_cube="Build cube vulkan demo"
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index 88141db5e04..bc62ee11bb9 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,6 +1,6 @@
 # Template file for 'Waybar'
 pkgname=Waybar
-version=0.7.0
+version=0.8.0
 revision=1
 build_style=meson
 configure_args="-Dlibnl=$(vopt_if libnl enabled disabled)
@@ -18,7 +18,7 @@ license="MIT"
 homepage="https://github.com/Alexays/Waybar"
 changelog="https://github.com/Alexays/Waybar/releases"
 distfiles="https://github.com/Alexays/Waybar/archive/${version}.tar.gz"
-checksum=413bff4691c8c8b9d9cb98219063cf0c7c9cb05c946313984c8969009f172659
+checksum=2de2f0cec243da0d9ff2255ceb9dac9d95e8be06d6ea13926fae460d72e4b8aa
 
 build_options="libnl pulseaudio dbusmenugtk mpd"
 build_options_default="pulseaudio mpd"
diff --git a/srcpkgs/WebStorm/template b/srcpkgs/WebStorm/template
index 6602c930613..5bf8427f95e 100644
--- a/srcpkgs/WebStorm/template
+++ b/srcpkgs/WebStorm/template
@@ -1,16 +1,16 @@
 # Template file for 'WebStorm'
 pkgname=WebStorm
-version=2019.1.3
+version=2019.2.3
 revision=1
 archs="i686 x86_64"
-wrksrc="WebStorm-191.7479.14"
+wrksrc="WebStorm-192.6817.13"
 depends="virtual?java-environment"
 short_desc="Smartest JavaScript IDE"
 maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/webstorm"
 distfiles="https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"
-checksum=c3ef27051f6de608ee679035957a8a4329897c910b046cb2dbbf840cc8151dae
+checksum=af94c66c80508fe221d9ba2b294d3852d68db8bc293dd240e2638dd2c21a6c50
 repository=nonfree
 restricted=yes
 nopie=yes
@@ -23,12 +23,14 @@ post_extract() {
 	case "$XBPS_TARGET_MACHINE" in
 		x86_64)
 			rm -rf bin/fsnotifier
+			rm -rf bin/fsnotifier-arm
 			rm -rf bin/webstorm.vmoptions
 			rm -rf bin/libyjpagent-linux.so
 			rm -rf lib/pty4j-native/linux/x86
 			;;
 		i686)
 			rm -rf bin/fsnotifier64
+			rm -rf bin/fsnotifier-arm
 			rm -rf bin/webstorm64.vmoptions
 			rm -rf bin/libyjpagent-linux64.so
 			rm -rf lib/pty4j-native/linux/x86_64
@@ -40,14 +42,14 @@ post_extract() {
 
 do_install() {
 	TARGET_PATH="usr/lib/${pkgname}"
-	LICENSE_PATH="usr/share/licenses/${pkgname}"
 
 	vmkdir usr/bin
 	vmkdir ${TARGET_PATH}
-	vmkdir ${LICENSE_PATH}
 
-	# Ideally vlicense should be called here, but vcopy is more terse.
-	vcopy license/* ${LICENSE_PATH}
+	local i
+	for i in license/* ; do
+		vlicense $i
+	done
 
 	vcopy bin ${TARGET_PATH}
 	vcopy help ${TARGET_PATH}
diff --git a/srcpkgs/YACReader/template b/srcpkgs/YACReader/template
index 3d60b425267..8223256ef3a 100644
--- a/srcpkgs/YACReader/template
+++ b/srcpkgs/YACReader/template
@@ -1,6 +1,6 @@
 # Template file for 'YACReader'
 pkgname=YACReader
-version=9.5.0
+version=9.6.2
 revision=1
 wrksrc=yacreader-${version}
 build_style=qmake
@@ -13,7 +13,7 @@ makedepends="qt5-script-devel qt5-declarative-devel qt5-quickcontrols
 short_desc="Cross-platform reader and manager for your digital comic library"
 maintainer="Crestwave <crest.wave@yahoo.com>"
 license="GPL-3.0-or-later"
-changelog="https://raw.githubusercontent.com/YACReader/yacreader/master/CHANGELOG.md"
 homepage="http://yacreader.com/"
+changelog="https://raw.githubusercontent.com/YACReader/yacreader/master/CHANGELOG.md"
 distfiles="https://github.com/YACReader/yacreader/archive/${version}.tar.gz"
-checksum=1104ffa78835b21a3cf611d42e52944ca413bf7feb38f7620fc07950e5f5ad40
+checksum=e58cd10071180c759f53d74ac7049105b8608e63661bd1b68bcbd8fc8a534a80
diff --git a/srcpkgs/abi-compliance-checker/template b/srcpkgs/abi-compliance-checker/template
index cc8c7d58cc9..644acae70e6 100644
--- a/srcpkgs/abi-compliance-checker/template
+++ b/srcpkgs/abi-compliance-checker/template
@@ -7,7 +7,7 @@ hostmakedepends="perl"
 depends="binutils ctags perl"
 checkdepends="binutils ctags"
 short_desc="A tool for checking backward API/ABI compat of a C/C++ library"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/lvc/abi-compliance-checker"
 distfiles="https://github.com/lvc/abi-compliance-checker/archive/${version}.tar.gz"
diff --git a/srcpkgs/abireport/template b/srcpkgs/abireport/template
index 4054e55d5c4..b23ea4d8565 100644
--- a/srcpkgs/abireport/template
+++ b/srcpkgs/abireport/template
@@ -1,16 +1,16 @@
 # Template file for 'abireport'
 pkgname=abireport
-version=1.0.6
-revision=2
+version=1.0.7
+revision=1
 build_style=go
 go_import_path=github.com/clearlinux/abireport
 go_package="${go_import_path}/src/abireport"
 short_desc="Tool to create ABI reports from ELF binaries"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/clearlinux/abireport"
 distfiles="https://github.com/clearlinux/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.gz"
-checksum=60beb805335302f999c32bda62f56afd6971f27499580fece84fe4d6bb9cb653
+checksum=c46c46bff3dc873cb84a66c639c38b2df14f095d95a4bb77e3b96904b8219399
 
 post_install() {
 	vman man/abireport.1
diff --git a/srcpkgs/ack/template b/srcpkgs/ack/template
index 9c406b8f107..7a32670d18f 100644
--- a/srcpkgs/ack/template
+++ b/srcpkgs/ack/template
@@ -1,6 +1,6 @@
 # Template file for 'ack'
 pkgname=ack
-version=3.0.2
+version=3.1.1
 revision=1
 archs=noarch
 wrksrc="$pkgname-v$version"
@@ -13,4 +13,4 @@ maintainer="Jan S. <jan.schreib@gmail.com>"
 license="Artistic-2.0"
 homepage="https://beyondgrep.com/"
 distfiles="${CPAN_SITE}/App/ack-v${version}.tar.gz"
-checksum=63b4b3bdbdb919f231780b2ce09e73c64b0c407633b36433aa9b574b59cc9528
+checksum=f4778d6d7ef829a7cfd1c7a25f5ae191c4233d002535f3718cc357301008fb92
diff --git a/srcpkgs/acpica-utils/template b/srcpkgs/acpica-utils/template
index 01de433f6c1..ea21904a2bb 100644
--- a/srcpkgs/acpica-utils/template
+++ b/srcpkgs/acpica-utils/template
@@ -1,16 +1,16 @@
 # Template file for 'acpica-utils'
 pkgname=acpica-utils
-version=20190509
+version=20190816
 revision=1
 archs="i686* x86_64*"
 wrksrc="acpica-unix-${version}"
 hostmakedepends="flex"
 short_desc="Intel ACPI CA Unix utilities"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="GPL-2.0-only, BSD-3-Clause"
 homepage="https://www.acpica.org/"
 distfiles="https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz"
-checksum=f124ab6e99110a192864b23dc6911d180968dd15b49f95f7adc37d69dd14621a
+checksum=7aec4dc88a3ba148eecd898e59fb5378573eb6a94585e5538e0b396840d0fc5c
 
 do_build() {
 	vsed -e 's/-Werror//g' \
diff --git a/srcpkgs/acpid/template b/srcpkgs/acpid/template
index 0bb77771db5..8312d0e4e15 100644
--- a/srcpkgs/acpid/template
+++ b/srcpkgs/acpid/template
@@ -1,14 +1,14 @@
 # Template file for 'acpid'
 pkgname=acpid
-version=2.0.31
-revision=2
+version=2.0.32
+revision=1
 build_style=gnu-configure
 short_desc="The ACPI Daemon (acpid) With Netlink Support"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://sourceforge.net/projects/acpid2/"
 distfiles="${SOURCEFORGE_SITE}/acpid2/acpid-${version}.tar.xz"
-checksum=fc9dc669ed85d9a1739aa76915e0667c6697c5431160f8dfb253046c6a072cc3
+checksum=f2d2d30b3edc3234bd82f6f7186699a6aa3c85c8d20bc4e30e9b3c68a1ed157e
 conf_files="/etc/acpi/events/anything /etc/acpi/handler.sh"
 
 post_install() {
diff --git a/srcpkgs/adobe-flash-plugin/template b/srcpkgs/adobe-flash-plugin/template
index cd6526df1b7..cab18ca659c 100644
--- a/srcpkgs/adobe-flash-plugin/template
+++ b/srcpkgs/adobe-flash-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'adobe-flash-plugin'
 pkgname=adobe-flash-plugin
-version=32.0.0.238
-revision=2
+version=32.0.0.270
+revision=1
 depends="curl hicolor-icon-theme desktop-file-utils"
 short_desc="Adobe Flash Player plugin for Netscape compatible browsers"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -23,15 +23,15 @@ if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
 	 ${_url}/flash_player_npapi_linux.x86_64.tar.gz
 	 ${_url}/flash_player_ppapi_linux.x86_64.tar.gz"
 	checksum="
-	 3a711c50396819ead949598b0c0bb960ac923172f9d9b6e3db7790dfa4d6fb15
-	 0268ebab5dbce2be8941c64f3402edd8c34a245206cf2e5e15ba13bf9e246277"
+	 bccd1207ad080caf942305a5739cf690ae19e0fc2490c3e04ee44191d77c9d9a
+	 7176857cf2b3198ea5c725a007f12db1e570091675ecbe8648576cd8dd9d56c5"
 else
 	distfiles="
 	 ${_url}/flash_player_npapi_linux.i386.tar.gz
 	 ${_url}/flash_player_ppapi_linux.i386.tar.gz"
 	checksum="
-	 e08807dcf17b68721658e5d91de781626acc5efb00946508efdde5021ffc871a
-	 cc33e22aab65ee73b1d375cc6456cbba023e6fcfbd5c1ce7c52a585d97f2e16d"
+	 72cf38a1e6b9c3d4063ef2765f606b1ed77a249c3b937ab818581d7e51fd2d4b
+	 81eeee21e1e0337747a7668e01a5a89f9379b3ec3ba7d017ba1e38c13720f997"
 fi
 distfiles+=" ${_eula}"
 checksum+=" ${_eulacksum}"
diff --git a/srcpkgs/adriconf/template b/srcpkgs/adriconf/template
index 5f03859b73d..4055418c83c 100644
--- a/srcpkgs/adriconf/template
+++ b/srcpkgs/adriconf/template
@@ -1,8 +1,9 @@
 # Template file for 'adriconf'
 pkgname=adriconf
-version=1.4
+version=1.5.1
 revision=1
 build_style=cmake
+configure_args="-DENABLE_UNIT_TESTS=false"
 hostmakedepends="pkg-config glib-devel"
 makedepends="MesaLib-devel gtkmm-devel boost-devel libxml++3.0-devel pciutils-devel gtest-devel"
 short_desc="Advanced DRI Configurator"
@@ -10,8 +11,4 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/jlHertel/adriconf"
 distfiles="https://github.com/jlHertel/adriconf/archive/v${version}.tar.gz"
-checksum=058e7ed2ab2450167de1399898db4a53829b433157f43a1e14e50e7fae01f18c
-
-post_install() {
-	vbin build/adriconf
-}
+checksum=70c676e79302e00838ef0d297230fe03548f50fb2892cbe9318423d7aa1ef3ab
diff --git a/srcpkgs/adwaita-icon-theme/template b/srcpkgs/adwaita-icon-theme/template
index b1260b3ec2e..85a5d237ba5 100644
--- a/srcpkgs/adwaita-icon-theme/template
+++ b/srcpkgs/adwaita-icon-theme/template
@@ -1,6 +1,6 @@
 # Template file for 'adwaita-icon-theme'
 pkgname=adwaita-icon-theme
-version=3.32.0
+version=3.34.0
 revision=1
 archs=noarch
 build_style=gnu-configure
@@ -12,4 +12,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-3.0-or-later, CC-BY-SA-3.0"
 homepage="https://gitlab.gnome.org/GNOME/adwaita-icon-theme"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=698db6e407bb987baec736c6a30216dfc0317e3ca2403c7adf3a5aa46c193286
+checksum=40b7e91f8263552b64d0f9beff33150291b086618ce498c71bf10035e48c7c7f
diff --git a/srcpkgs/afl/template b/srcpkgs/afl/template
index 9842510d59f..3cd3b8fcc17 100644
--- a/srcpkgs/afl/template
+++ b/srcpkgs/afl/template
@@ -1,25 +1,26 @@
 # Template file for 'afl'
 pkgname=afl
-version=2.52b
+version=2.56b
 revision=1
-build_style=gnu-makefile
 # x86 only currently
 archs="i686* x86_64*"
+wrksrc="AFL-${version}"
+build_style=gnu-makefile
 hostmakedepends="llvm clang"
 short_desc="American fuzzy lop - a brute-force fuzzer"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
-homepage="http://lcamtuf.coredump.cx/afl/"
-distfiles="http://lcamtuf.coredump.cx/afl/releases/afl-${version}.tgz"
-checksum=43614b4b91c014d39ef086c5cc84ff5f068010c264c2c05bf199df60898ce045
+homepage="https://github.com/google/AFL/"
+distfiles="https://github.com/google/AFL/archive/v${version}.tar.gz"
+checksum=1d4a372e49af02fbcef0dc3ac436d03adff577afc2b6245c783744609d9cdd22
 
 nostrip_files="small_archive.a small_exec.elf"
 
 do_build() {
 	make PREFIX=/usr
 
-	CFLAGS="${CFLAGS} -fPIC" \
-	CXXFLAGS="${CXXFLAGS} -fPIC" \
+	CFLAGS="${CFLAGS//-fstack-clash-protection} -fPIC" \
+	CXXFLAGS="${CXXFLAGS//-fstack-clash-protection} -fPIC" \
 	LDFLAGS="${LDFLAGS} -pie" \
 	make PREFIX=/usr CC=clang CXX=clang++ -C llvm_mode
 }
diff --git a/srcpkgs/aisleriot/template b/srcpkgs/aisleriot/template
index cf364d25f06..40d46895aa4 100644
--- a/srcpkgs/aisleriot/template
+++ b/srcpkgs/aisleriot/template
@@ -1,6 +1,6 @@
 # Template file for 'aisleriot'
 pkgname=aisleriot
-version=3.22.8
+version=3.22.9
 revision=1
 _pysol_cardsets=PySolFC-Cardsets
 _pysol_ver=2.0
@@ -17,7 +17,7 @@ license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Aisleriot"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz
  http://distfiles.voidlinux.de/${_pysol_cardsets}-${_pysol_ver}/${_pysol_cardsets}-${_pysol_ver}.tar.bz2"
-checksum="252094ec220691cacbf54cabbdf81fe593cf3cdcb62c7d409cbdfa744c1af596
+checksum="51f2ffe4dd4f23349b033fd87aab7bf433641285719503dd7e52b2c25982ed7b
  c388d6360191b3b7e463d84e5a64260c4e3ed36e791a85227d7e8923f3f47ca7"
 
 aisleriot-data_package() {
diff --git a/srcpkgs/akonadi-calendar/template b/srcpkgs/akonadi-calendar/template
index 582ba28e1ac..cbda74ac5cf 100644
--- a/srcpkgs/akonadi-calendar/template
+++ b/srcpkgs/akonadi-calendar/template
@@ -1,7 +1,7 @@
 # Template file for 'akonadi-calendar'
 pkgname=akonadi-calendar
-version=19.08.0
-revision=1
+version=19.08.2
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
  kcoreaddons kconfig"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/applications/${version}/src/akonadi-calendar-${version}.tar.xz"
-checksum=74743ff7822ce75f0e0170f154e4596644855a5fe9322a09b76e01bd1d078e3b
+checksum=5beba24af485c8dae96944e4b5bd570460eb2868ba069580c2e5d784be38a3c8
 
 akonadi-calendar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/akonadi-contacts/template b/srcpkgs/akonadi-contacts/template
index c5ef95cc0d0..90191703a9d 100644
--- a/srcpkgs/akonadi-contacts/template
+++ b/srcpkgs/akonadi-contacts/template
@@ -1,7 +1,7 @@
 # Template file for 'akonadi-contacts'
 pkgname=akonadi-contacts
-version=19.08.0
-revision=1
+version=19.08.2
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons"
 makedepends="kio-devel kcontacts-devel kmime-devel akonadi-mime-devel prison-devel"
@@ -10,7 +10,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/applications/${version}/src/akonadi-contacts-${version}.tar.xz"
-checksum=912a657a11d1bd1e680a71b43d69a5a871136ed83f171b11c52f1974d7381ce4
+checksum=eafeb550faea91a56109821864eedfbd619dc7850887746d31c1724ea7561920
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools python3 kconfig"
diff --git a/srcpkgs/akonadi-import-wizard/template b/srcpkgs/akonadi-import-wizard/template
index ee192f5226a..f7280d0b44a 100644
--- a/srcpkgs/akonadi-import-wizard/template
+++ b/srcpkgs/akonadi-import-wizard/template
@@ -1,16 +1,16 @@
 # Template file for 'akonadi-import-wizard'
 pkgname=akonadi-import-wizard
-version=19.08.0
-revision=1
+version=19.08.2
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools qt5-host-tools qt5-qmake"
-makedepends="mailcommon-devel mailimporter-devel messagelib-devel"
+makedepends="kcontacts-devel mailcommon-devel mailimporter-devel messagelib-devel"
 short_desc="Import data from other mail clients to KMail"
 maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=e21454b8ac346c4b8d35e5979dc11346b96e3520df22f44270dc668d5abcd915
+checksum=038713e7d30686eb1b8e49c595ec853ffa52d335e435a5b0bdf2f2a2448cae45
 
 akonadi-import-wizard-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/akonadi-mime/template b/srcpkgs/akonadi-mime/template
index e4af94adf44..9d2af13bc19 100644
--- a/srcpkgs/akonadi-mime/template
+++ b/srcpkgs/akonadi-mime/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-mime'
 pkgname=akonadi-mime
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3"
@@ -10,7 +10,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/applications/${version}/src/akonadi-mime-${version}.tar.xz"
-checksum=32dcee53d8bd79a4ad85dfa453aa762d69194493ad6622aea4fd7cd05bde3ec4
+checksum=16f8034d7990828c50a85474fe16641dfa46e22d00f49d8045d3483c61815264
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools kconfig"
diff --git a/srcpkgs/akonadi-notes/template b/srcpkgs/akonadi-notes/template
index e97662c08ee..f54c93cf64b 100644
--- a/srcpkgs/akonadi-notes/template
+++ b/srcpkgs/akonadi-notes/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-notes'
 pkgname=akonadi-notes
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later, BSD-2-Clause"
 homepage="https://kontact.kde.org"
 distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=26000875958b3a0ff68c5ad871fd697623c8408b88fc46679c8a13ad308c33d3
+checksum=64684c50d06664d8ccda098f8bfa536e861e4938c8f27688ef97653f7788fdde
 
 post_install() {
 	vlicense COPYING.BSD COPYING.BSD
diff --git a/srcpkgs/akonadi-search/template b/srcpkgs/akonadi-search/template
index 2fafd789f0e..be659b8d39f 100644
--- a/srcpkgs/akonadi-search/template
+++ b/srcpkgs/akonadi-search/template
@@ -1,7 +1,7 @@
 # Template file for 'akonadi-search'
 pkgname=akonadi-search
-version=19.08.0
-revision=1
+version=19.08.2
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python AppStream
  kcoreaddons"
@@ -12,7 +12,7 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/applications/${version}/src/akonadi-search-${version}.tar.xz"
-checksum=fadc158343eb7c124454ca3e22ade14230772f1d1a89e04a0059c924ed3959d0
+checksum=75c9713b84a03c60a68ff36652decbf57f4f56a0fb39579f53e7ed80a5ee8525
 
 akonadi-search-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/akonadi5/template b/srcpkgs/akonadi5/template
index a560368b260..68a23cde127 100644
--- a/srcpkgs/akonadi5/template
+++ b/srcpkgs/akonadi5/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi5'
 pkgname=akonadi5
-version=19.08.0
+version=19.08.2
 revision=1
 wrksrc="akonadi-${version}"
 build_style=cmake
@@ -16,7 +16,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/applications/${version}/src/akonadi-${version}.tar.xz"
-checksum=ff53f078b024f2674a8b2990515f5cbafe2bc965390d74a464b2a044aee32831
+checksum=f67f0fac07d480739b2d6715862ee47a93fd38f057ac7ef888ed8ddfdc99934f
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-tools-devel qt5-devel kconfig kcoreaddons"
diff --git a/srcpkgs/akregator/template b/srcpkgs/akregator/template
index 0f0b31406bb..ceaa405b82b 100644
--- a/srcpkgs/akregator/template
+++ b/srcpkgs/akregator/template
@@ -1,6 +1,6 @@
 # Template file for 'akregator'
 pkgname=akregator
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 configure_args=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,4 +13,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/internet/akregator"
 distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=d3cb8b97a3d2c9eeb805e1b7fc26cb637ad21589675d837b545580e6be764820
+checksum=cefc0785f40508a80fbf4534eef4d1164e349cfd50455483cef044945d1888c4
diff --git a/srcpkgs/alert-after/template b/srcpkgs/alert-after/template
index 191286c6aa5..27dcd62231e 100644
--- a/srcpkgs/alert-after/template
+++ b/srcpkgs/alert-after/template
@@ -1,7 +1,7 @@
 # Template file for 'alert-after'
 pkgname=alert-after
-version=1.4.3
-revision=2
+version=1.5.1
+revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
 makedepends="dbus-devel"
@@ -10,4 +10,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://crates.io/crates/alert-after"
 distfiles="https://github.com/frewsxcv/alert-after/archive/${version}.tar.gz"
-checksum=e0d80e1b4c9cb78f4759a78495f197fa3865eacf9658653ec14ddb010e117b3d
+checksum=f40dd43f667735741be95f753e52d3ec36731fcb3c3217084ad07e70dbac7a2a
diff --git a/srcpkgs/alertmanager/template b/srcpkgs/alertmanager/template
index 530e93fe081..f7f5533a569 100644
--- a/srcpkgs/alertmanager/template
+++ b/srcpkgs/alertmanager/template
@@ -1,6 +1,6 @@
 # Template file for 'alertmanager'
 pkgname=alertmanager
-version=0.17.0
+version=0.19.0
 revision=1
 build_style=go
 go_import_path="github.com/prometheus/alertmanager"
@@ -15,7 +15,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/prometheus/alertmanager"
 distfiles="https://github.com/prometheus/alertmanager/archive/v${version}.tar.gz"
-checksum=8254591e058338b31a023f0eb3ab69de9d1547e0a446d28cab4664609793e4a2
+checksum=4730664f746173f89804df43b3f608cac030e79baae165d6d99df472eb52d36a
 
 system_accounts="_alertmanager"
 make_dirs="/var/lib/alertmanager 700 _alertmanager _alertmanager"
diff --git a/srcpkgs/alkimia/template b/srcpkgs/alkimia/template
index 679c0c1c499..342011f742a 100644
--- a/srcpkgs/alkimia/template
+++ b/srcpkgs/alkimia/template
@@ -1,6 +1,6 @@
 # Template file for 'alkimia'
 pkgname=alkimia
-version=8.0.1
+version=8.0.2
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson -DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://www.linux-apps.com/content/show.php/libalkimia?content=137323"
 distfiles="${KDE_SITE}/alkimia/${version}/alkimia-${version}.tar.xz"
-checksum=f5601780f6ed95b5e14dd3a243ecd1afbdbdb522f0e32dec2fb86933ec363115
+checksum=616f7736fde8ce8acec4575f14e856fabfefb0961d932198d42fbd9a639a852a
 
 libalkimia-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/alpine/patches/418e8bc5.patch b/srcpkgs/alpine/patches/418e8bc5.patch
new file mode 100644
index 00000000000..7cc8dc7a8c8
--- /dev/null
+++ b/srcpkgs/alpine/patches/418e8bc5.patch
@@ -0,0 +1,22 @@
+From 418e8bc5789d9ef223f043848619b6a648748dcc Mon Sep 17 00:00:00 2001
+From: Eduardo Chappa <chappa@washington.edu>
+Date: Thu, 22 Aug 2019 19:11:53 -0600
+Subject: [PATCH 1/1]   * Ignore extra text in challenge from smtp server
+ during authentication.
+
+---
+ imap/src/c-client/smtp.c | 1 +
+ pith/pine.hlp            | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+--- imap/src/c-client/smtp.c
++++ imap/src/c-client/smtp.c
+@@ -363,6 +363,7 @@ void *smtp_challenge (void *s,unsigned long *len)
+     sprintf (tmp,"SMTP SERVER BUG (invalid challenge, continuing): %.80s",stream->reply+4);
+     mm_log (tmp,ERROR);
+     ret = cpystr("");	/* This is silly: fake a reply, it will be ignored */
++    *len = 0L;
+   }
+   return ret;
+ }
+
diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 9c8a0f8bb4e..6557a6debc6 100644
--- a/srcpkgs/alpine/template
+++ b/srcpkgs/alpine/template
@@ -1,7 +1,7 @@
 # Template file for 'alpine'
 pkgname=alpine
 version=2.21.99999
-revision=1
+revision=2
 _githash=abeb2c25935ef8c75f1e5deef0f81276754dc975
 _gitshort="${_githash:0:7}"
 wrksrc="${pkgname}-${_gitshort}"
diff --git a/srcpkgs/amdvlk/patches/musl.patch b/srcpkgs/amdvlk/patches/musl.patch
index 9cf3d74915f..5e4e1e9f18d 100644
--- a/srcpkgs/amdvlk/patches/musl.patch
+++ b/srcpkgs/amdvlk/patches/musl.patch
@@ -1,23 +1,3 @@
-From a9dc984a35f0f522e3a1ec0d310facb3246a5d0f Mon Sep 17 00:00:00 2001
-From: John Zimmermann <johnz@posteo.net>
-Date: Fri, 25 Jan 2019 13:47:21 +0000
-Subject: [PATCH] Fix Compilation against Musl libc
-
-diff --git pal/shared/gpuopen/inc/posix/ddPosixPlatform.h pal/shared/gpuopen/inc/posix/ddPosixPlatform.h
-index df54bfe..55d707c 100644
---- pal/shared/gpuopen/inc/posix/ddPosixPlatform.h
-+++ pal/shared/gpuopen/inc/posix/ddPosixPlatform.h
-@@ -72,6 +72,9 @@ static_assert(false, "Unknown platform detected")
- #else
- #define DD_AXIOMATICALLY_CANNOT_HAPPEN(expr) ((expr) ? DD_UNUSED(0) : __builtin_unreachable())
- #endif
-+#if defined(__linux__) && !defined(__GLIBC__)
-+#include "rand48_r.h"
-+#endif
- 
- namespace DevDriver
- {
-
 --- pal/shared/gpuopen/src/posix/ddPosixSocket.cpp	2019-03-01 15:31:04.000000000 +0100
 +++ -	2019-03-04 15:42:00.789284605 +0100
 @@ -34,12 +34,12 @@
@@ -35,16 +15,3 @@ index df54bfe..55d707c 100644
  #include <stdio.h>
  #include <stdlib.h>
  
---- pal/shared/gpuopen/CMakeLists.txt	2019-06-06 14:52:37.000000000 +0200
-+++ -	2019-06-10 19:23:05.932195923 +0200
-@@ -72,6 +72,10 @@
-     set(THREADS_PREFER_PTHREAD_FLAG ON)
-     find_package(Threads REQUIRED)
-     target_link_libraries(${GPUOPEN_LIB_NAME} Threads::Threads)
-+    check_symbol_exists(seed48_r stdlib.h HAVE_RAND48)
-+    if(NOT HAVE_RAND48)
-+        target_link_libraries(${GPUOPEN_LIB_NAME} rand48_r)
-+    endif()
- endif()
- 
- ### Build Defines ######################################################################################################
diff --git a/srcpkgs/amdvlk/template b/srcpkgs/amdvlk/template
index 58b7b030dc0..ef74969d1a3 100644
--- a/srcpkgs/amdvlk/template
+++ b/srcpkgs/amdvlk/template
@@ -1,17 +1,21 @@
 # Template file for 'amdvlk'
 pkgname=amdvlk
-version=2019.Q3.4
+version=2019.Q3.6
 revision=1
-_llpc_commit=0da6ca8e09f41639636a106f9b9ca74df50321ce
-_xgl_commit=9b632ef4f132bddc94769702ed8b49efbc39d89c
-_pal_commit=66e78b997748d03d77e1d706c10f1f17e18e5654
+_llpc_commit=4fa48ef1cf0f81eafdb56df91c2f2180d4865101
+_xgl_commit=331558e93794068a786bf699d3fe23bb11bac021
+_pal_commit=68b57dba33a4d922e8f1ef1b3781c2f659ffbd1c
 _llvm_commit=9bc5dd4450a6361faf5c5661056a7ee494fad830
 _spvgen_commit=2f31d1170e8a12a66168b23235638c4bbc43ecdc
+_MetroHash_commit=2b6fee002db6cc92345b02aeee963ebaaf4c0e2f
+_CWPack_commit=b601c88aeca7a7b08becb3d32709de383c8ee428
 archs="i686* x86_64*"
 create_wrksrc=yes
 build_wrksrc="xgl"
 build_style=cmake
-configure_args="-DBUILD_WAYLAND_SUPPORT=ON"
+configure_args="-DBUILD_WAYLAND_SUPPORT=ON
+ -DXGL_METROHASH_PATH=../../metrohash
+ -DXGL_CWPACK_PATH=../../cwpack"
 hostmakedepends="pkg-config python3 perl"
 makedepends="libxml2-devel xorg-server-devel libXrandr-devel"
 depends="vulkan-loader"
@@ -24,20 +28,20 @@ distfiles="https://github.com/GPUOpen-Drivers/AMDVLK/archive/v-${version}.tar.gz
  https://github.com/GPUOpen-Drivers/xgl/archive/${_xgl_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/pal/archive/${_pal_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/llvm/archive/${_llvm_commit}.tar.gz
- https://github.com/GPUOpen-Drivers/spvgen/archive/${_spvgen_commit}.tar.gz"
-checksum="01777c1cfe4df7dce4feb91e75658fbc865dd5c755ff79451191a0cf8de1c7a4
- 00bf10ff483ba5f6420fb3bfe34f7ce77c6d33515840df64ed1e2858e0eeb831
- 6baede0581d63bdf88cc72c8c496b0cef534ee244dd4f74bcb39a9e0e0beeacd
- e8a29b20a166cb7139157a40e88b8087ed33097871dcaee1bfda61b6a417886f
+ https://github.com/GPUOpen-Drivers/spvgen/archive/${_spvgen_commit}.tar.gz
+ https://github.com/GPUOpen-Drivers/MetroHash/archive/${_MetroHash_commit}.tar.gz
+ https://github.com/GPUOpen-Drivers/CWPack/archive/${_CWPack_commit}.tar.gz"
+checksum="9afb90b56c3c1213c97ef3364b1d31d0e85a81469c861b43dc389af5672c6331
+ abe541ef6cd4fa3ca1eaab52412caa29e2adedec0fab40894aef88d33deee584
+ 939a2cf69d840e01da8b3e69f5ffe1f852f9d2919cdbc8aa4ade7cff7ac56906
+ 7648ca7761b588b6025f8fe16fcf4216bf7e1fe53c6568377f5cca98feca9627
  efbde2752044ec74d522c160899491105dbc77bb8a08ff64c274d2b94a6916d1
- cc946ad2835e502aca904c5f87802a2004eaed4729cb5c1dc29a5258d1c1e401"
+ cc946ad2835e502aca904c5f87802a2004eaed4729cb5c1dc29a5258d1c1e401
+ e8ecf026584dd953e39c3abba2eb04d28b28ed4577482ee70265f0d421fef398
+ 58ca397f33d62bcfecaecd89eb4ad466a6c33e1c619e5cf742822074f1f7d664"
 nocross=yes
 lib32files="/usr/share/vulkan/icd.d/amd_icd32.json"
 
-case $XBPS_TARGET_MACHINE in
-	*-musl) makedepends+=" rand48_r-devel"
-esac
-
 post_extract() {
 	mv ${wrksrc}/AMDVLK-v-${version} ${wrksrc}/AMDVLK
 	mv ${wrksrc}/xgl-${_xgl_commit} ${wrksrc}/xgl
@@ -45,6 +49,8 @@ post_extract() {
 	mv ${wrksrc}/llpc-${_llpc_commit} ${wrksrc}/llpc
 	mv ${wrksrc}/llvm-${_llvm_commit} ${wrksrc}/llvm
 	mv ${wrksrc}/spvgen-${_spvgen_commit} ${wrksrc}/spvgen
+	mv ${wrksrc}/MetroHash-${_MetroHash_commit} ${wrksrc}/metrohash
+	mv ${wrksrc}/CWPack-${_CWPack_commit} ${wrksrc}/cwpack
 }
 
 pre_configure() {
diff --git a/srcpkgs/amiri-font/template b/srcpkgs/amiri-font/template
index c20ce968b52..a9b07e456c4 100644
--- a/srcpkgs/amiri-font/template
+++ b/srcpkgs/amiri-font/template
@@ -1,7 +1,7 @@
 # Template file for 'amiri-font'
 pkgname=amiri-font
-version=0.111
-revision=2
+version=0.112
+revision=1
 archs=noarch
 wrksrc="Amiri-${version}"
 hostmakedepends="unzip"
@@ -12,7 +12,7 @@ license="OFL-1.1"
 homepage="https://github.com/alif-type/amiri/"
 changelog="https://github.com/alif-type/amiri/blob/master/NEWS.md"
 distfiles="https://github.com/alif-type/amiri/releases/download/${version}/Amiri-${version}.zip"
-checksum=1fbfccced6348b5db2c1c21d5b319cd488e14d055702fa817a0f6cb83d882166
+checksum=b9da1916f5e1028ea5d8404f7ac7b3722576d794b1053b6be11f1a02651ddf3c
 font_dirs="/usr/share/fonts/TTF"
 
 do_install() {
diff --git a/srcpkgs/amp/template b/srcpkgs/amp/template
index ad20f0cb8eb..dcb603b52f6 100644
--- a/srcpkgs/amp/template
+++ b/srcpkgs/amp/template
@@ -1,20 +1,20 @@
 # Template file for 'amp'
 pkgname=amp
-version=0.5.2
-revision=3
+version=0.6.0
+revision=1
 build_style=cargo
 hostmakedepends="cmake git perl pkg-config python3"
 makedepends="libcurl-devel libgit2-devel libxcb-devel"
-short_desc="A complete text editor for your terminal"
+short_desc="Complete text editor for your terminal"
 maintainer="Wilson Birney <wpb@360scada.com>"
 license="GPL-3.0-or-later"
 homepage="https://amp.rs"
 changelog="https://raw.githubusercontent.com/jmacdonald/amp/master/CHANGELOG.md"
 distfiles="https://github.com/jmacdonald/amp/archive/${version}.tar.gz"
-checksum=e1f22a829205cf44f8c3fcf5660dbdb9a3c5a1f64b92c67dcdb75a30ad7e5a60
+checksum=3529e9aa51df80ff3bd9db340423bf0975b58473fc0a307ea6eee799089ee2e2
 
 export LIBGIT2_SYS_USE_PKG_CONFIG=1
 
 pre_build() {
-	cargo update --package openssl-sys --precise 0.9.46
+	cargo update --package openssl-sys --precise 0.9.49
 }
diff --git a/srcpkgs/amtk/template b/srcpkgs/amtk/template
index 9381324e983..e642fe7b5d3 100644
--- a/srcpkgs/amtk/template
+++ b/srcpkgs/amtk/template
@@ -1,18 +1,18 @@
 # Template file for 'amtk'
 pkgname=amtk
-version=5.0.0
-revision=3
+version=5.0.1
+revision=1
 build_style=gnu-configure
 build_helper="gir"
 configure_args="$(vopt_enable gir introspection)"
 hostmakedepends="pkg-config glib-devel"
 makedepends="gtk+3-devel libglib-devel"
 short_desc="Actions, Menus and Toolbars Kit for GTK+ applications"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Amtk"
 distfiles="${GNOME_SITE}/amtk/${version%.*}/amtk-${version}.tar.xz"
-checksum=12a996978a30b7b69a810ac0c5656d5cf2f58d9787b98a0c028ff1b64e8f31ff
+checksum=2d1cf4a4468655f93c90a2dde2e08b1ea0b3960c0aee04eb206c201d7849de27
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/android-studio/template b/srcpkgs/android-studio/template
index 4ccbb3e2221..5838e3f29ed 100644
--- a/srcpkgs/android-studio/template
+++ b/srcpkgs/android-studio/template
@@ -1,23 +1,21 @@
 # Template file for 'android-studio'
 pkgname=android-studio
-version=3.3.2
+version=3.4.2
 revision=1
 # _studio_build and _studio_rev are for downloading the zip from dl.google.com
 # https://developer.android.com/studio/#resources as of 2018-07-12
-_studio_build=182.5314842
+_studio_build=183.5692245
 _studio_rev=0
 archs="x86_64 i686"
 create_wrksrc=yes
-build_style=fetch
-hostmakedepends="unzip"
 depends="gtk+ libGL"
 short_desc="Official Android IDE"
 maintainer="Jordyn Carattini <onlinecloud1@gmail.com>"
 license="Apache-2.0"
 homepage="http://tools.android.com/"
 # changelog="https://developer.android.com/studio/releases/index.html"
-distfiles="https://dl.google.com/dl/android/studio/ide-zips/${version}.${_studio_rev}/android-studio-ide-${_studio_build}-linux.zip"
-checksum=8257d3eab61c3da088e26689888a13e53e210c109a4e775ed71158b4471bb06a
+distfiles="https://dl.google.com/dl/android/studio/ide-zips/${version}.${_studio_rev}/android-studio-ide-${_studio_build}-linux.tar.gz"
+checksum=35eb8c74837d1aab59229101fc91568a607ac04854a40209f7a0ba7ac0601924
 repository=nonfree
 nopie=yes
 nostrip=yes
@@ -32,18 +30,37 @@ skiprdeps="/opt/android-studio/plugins/android/resources/installer/arm64-v8a/ins
  /opt/android-studio/plugins/android/resources/perfa/x86_64/libperfa.so
  /opt/android-studio/plugins/android/resources/perfd/arm64-v8a/perfd
  /opt/android-studio/plugins/android/resources/perfd/armeabi-v7a/perfd
- /opt/android-studio/plugins/android/resources/perfd/x86/perfd"
+ /opt/android-studio/plugins/android/resources/perfd/x86/perfd
+ /opt/android-studio/plugins/android/resources/simpleperf/arm64-v8a/simpleperf
+ /opt/android-studio/plugins/android/resources/simpleperf/armeabi-v7a/simpleperf
+ /opt/android-studio/plugins/android/resources/simpleperf/x86/simpleperf
+ /opt/android-studio/plugins/android/resources/simpleperf/x86_64/simpleperf"
+
+do_extract() {
+	tar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}-ide-${_studio_build}-linux.tar.gz --strip-components=1 -C ${wrksrc}
+}
 
 do_install() {
-	unzip android-studio-ide-${_studio_build}-linux.zip
 	vmkdir opt/${pkgname}
-	vcopy android-studio/bin opt/${pkgname}/
-	vcopy android-studio/gradle opt/${pkgname}/
-	vcopy android-studio/lib opt/${pkgname}/
-	vcopy android-studio/jre opt/${pkgname}/
-	vcopy android-studio/plugins opt/${pkgname}/
+	vcopy bin opt/${pkgname}/
+	vcopy gradle opt/${pkgname}/
+	vcopy lib opt/${pkgname}/
+	vcopy jre opt/${pkgname}/
+	vcopy plugins opt/${pkgname}/
+	vcopy build.txt opt/${pkgname}/ # read as IDE version information
+	vcopy product-info.json opt/${pkgname}/
 	vmkdir usr/bin
 	ln -s /opt/android-studio/bin/studio.sh ${DESTDIR}/usr/bin/android-studio
+
+	# The version of host-side simpleperf bundled with Android Studio (as of 3.4.2) requires
+	# libncurses.so.5, which is not provided by Void Linux. However, as host-side simpleperf
+	# parsing is a fairly recent addition, we can just disable it...
+
+	rm -r ${DESTDIR}/opt/android-studio/plugins/android/resources/simpleperf/linux-x86
+	rm -r ${DESTDIR}/opt/android-studio/plugins/android/resources/simpleperf/linux-x86_64
+	echo "-Dprofiler.cpu.simpleperf.host=false" >> ${DESTDIR}/opt/android-studio/bin/studio.vmoptions
+	echo "-Dprofiler.cpu.simpleperf.host=false" >> ${DESTDIR}/opt/android-studio/bin/studio64.vmoptions
+
 	vinstall "${FILESDIR}/android-studio.desktop" 644 usr/share/applications/
 	chmod -R ugo+rX ${DESTDIR}/opt
 }
diff --git a/srcpkgs/android-tools/files/generate_build.rb b/srcpkgs/android-tools/files/generate_build.rb
deleted file mode 100755
index c7674446998..00000000000
--- a/srcpkgs/android-tools/files/generate_build.rb
+++ /dev/null
@@ -1,405 +0,0 @@
-#!/usr/bin/ruby
-# This ruby script has been copied from Arch Linux.
-
-# Android build system is complicated and does not allow to build
-# separate parts easily.
-# This script tries to mimic Android build rules.
-
-def expand(dir, files)
-  files.map{|f| File.join(dir,f)}
-end
-
-# Compiles sources to *.o files.
-# Returns array of output *.o filenames
-def compile(sources, cflags)
-  outputs = []
-  for s in sources
-    ext = File.extname(s)
-
-    case ext
-    when '.c'
-      cc = 'cc'
-      lang_flags = '-std=gnu11 $CFLAGS $CPPFLAGS'
-    when '.cpp', '.cc'
-      cc = 'cxx'
-      lang_flags = '-std=gnu++17 $CXXFLAGS $CPPFLAGS'
-    else
-        raise "Unknown extension #{ext}"
-    end
-
-    output = s + '.o'
-    outputs << output
-    puts "build #{output}: #{cc} #{s}\n    cflags = #{lang_flags} #{cflags}"
-  end
-
-  return outputs
-end
-
-# dir - directory where ninja file is located
-# lib - static library path relative to dir
-def subninja(dir, lib)
-  puts "subninja #{dir}build.ninja"
-  return lib.each{|l| dir + l}
-end
-
-# Links object files
-def link(output, objects, ldflags)
-  puts "build #{output}: link #{objects.join(' ')}\n    ldflags = #{ldflags} $LDFLAGS"
-end
-
-puts "# This set of commands generated by generate_build.rb script\n\n"
-puts "CC = #{ENV['CC'] || 'clang'}"
-puts "CXX = #{ENV['CXX'] || 'clang++'}\n\n"
-puts "CFLAGS = #{ENV['CFLAGS']}"
-puts "CXXFLAGS = #{ENV['CXXFLAGS']}"
-puts "LDFLAGS = #{ENV['LDFLAGS']}"
-puts "PKGVER = #{ENV['PKGVER']}\n\n"
-
-
-puts """
-rule cc
-  command = $CC $cflags -c $in -o $out
-
-rule cxx
-  command = $CXX $cflags -c $in -o $out
-
-rule link
-  command = $CXX $ldflags $LDFLAGS $in -o $out
-
-
-"""
-
-adbdfiles = %w(
-  adb.cpp
-  adb_io.cpp
-  adb_listeners.cpp
-  adb_trace.cpp
-  adb_utils.cpp
-  bugreport.cpp
-  line_printer.cpp
-  sockets.cpp
-  transport.cpp
-  transport_local.cpp
-  transport_usb.cpp
-  transport_mdns_unsupported.cpp
-  fdevent.cpp
-  adb_auth_host.cpp
-  shell_service_protocol.cpp
-)
-libadbd = compile(expand('core/adb', adbdfiles), '-DADB_VERSION="\"$PKGVER\"" -DADB_HOST=1 -Icore/include -Icore/base/include -Icore/adb -Icore/libcrypto_utils/include -Iboringssl/include')
-
-adbfiles = %w(
-  console.cpp
-  socket_spec.cpp
-  commandline.cpp
-  adb_client.cpp
-  services.cpp
-  file_sync_client.cpp
-  sysdeps_unix.cpp
-  sysdeps/errno.cpp
-  client/main.cpp
-  client/usb_dispatch.cpp
-  client/usb_linux.cpp
-  client/usb_libusb.cpp
-  sysdeps/posix/network.cpp
-)
-libadb = compile(expand('core/adb', adbfiles), '-D_GNU_SOURCE -DADB_HOST=1 -Icore/include -Icore/base/include -Icore/adb')
-
-basefiles = %w(
-  file.cpp
-  logging.cpp
-  parsenetaddress.cpp
-  stringprintf.cpp
-  strings.cpp
-  errors_unix.cpp
-  test_utils.cpp
-)
-libbase = compile(expand('core/base', basefiles), '-DADB_HOST=1 -Icore/base/include -Icore/include')
-
-logfiles = %w(
-  log_event_write.c
-  fake_log_device.c
-  log_event_list.c
-  logger_write.c
-  config_write.c
-  config_read.c
-  logger_lock.c
-  local_logger.c
-  fake_writer.c
-  logger_name.c
-  stderr_write.c
-  logprint.c
-)
-liblog = compile(expand('core/liblog', logfiles), '-DLIBLOG_LOG_TAG=1006 -D_XOPEN_SOURCE=700 -DFAKE_LOG_DEVICE=1 -Icore/log/include -Icore/include')
-
-cutilsfiles = %w(
-  load_file.cpp
-  socket_local_client_unix.cpp
-  socket_network_client_unix.cpp
-  socket_local_server_unix.cpp
-  sockets_unix.cpp
-  socket_inaddr_any_server_unix.cpp
-  sockets.cpp
-  android_get_control_file.cpp
-  threads.cpp
-  fs_config.cpp
-  canned_fs_config.cpp
-)
-libcutils = compile(expand('core/libcutils', cutilsfiles), '-D_GNU_SOURCE -Icore/libcutils/include -Icore/include')
-
-diagnoseusbfiles = %w(
-  diagnose_usb.cpp
-)
-libdiagnoseusb = compile(expand('core/adb', diagnoseusbfiles), '-Icore/include -Icore/base/include')
-
-libcryptofiles = %w(
-  android_pubkey.c
-)
-libcrypto = compile(expand('core/libcrypto_utils', libcryptofiles), '-Icore/libcrypto_utils/include -Iboringssl/include')
-
-# TODO: make subninja working
-#boringssl = subninja('boringssl/build/', ['crypto/libcrypto.a'])
-boringssl = ['boringssl/build/crypto/libcrypto.a']
-
-link('adb', libbase + liblog + libcutils + libadbd + libadb + libdiagnoseusb + libcrypto + boringssl, '-lpthread -lusb-1.0')
-
-
-fastbootfiles = %w(
-  protocol.cpp
-  engine.cpp
-  bootimg_utils.cpp
-  fastboot.cpp
-  util.cpp
-  fs.cpp
-  usb_linux.cpp
-  socket.cpp
-  tcp.cpp
-  udp.cpp
-)
-libfastboot = compile(expand("core/fastboot", fastbootfiles), '-DFASTBOOT_VERSION="\"$PKGVER\"" -D_GNU_SOURCE -D_XOPEN_SOURCE=700 -DUSE_F2FS -Icore/base/include -Icore/include -Icore/adb -Icore/libsparse/include -Icore/mkbootimg -Iextras/ext4_utils/include -Iextras/f2fs_utils -Icore/libziparchive/include -Icore/mkbootimg/include/bootimg')
-	
-sparsefiles = %w(
-  backed_block.c
-  output_file.c
-  sparse.c
-  sparse_crc32.c
-  sparse_err.c
-  sparse_read.cpp
-)
-libsparse = compile(expand('core/libsparse', sparsefiles), '-Icore/libsparse/include -Icore/base/include')
-
-f2fsfiles = %w(
-)
-f2fs = compile(expand("extras/f2fs_utils", f2fsfiles), "-DHAVE_LINUX_TYPES_H -If2fs-tools/include -Icore/liblog/include")
-
-zipfiles = %w(
-  zip_archive.cc
-)
-libzip = compile(expand('core/libziparchive', zipfiles), '-Icore/base/include -Icore/include -Icore/libziparchive/include')
-
-utilfiles = %w(
-  FileMap.cpp
-)
-libutil = compile(expand('core/libutils', utilfiles), '-Icore/include')
-
-ext4files = %w(
-  ext4_utils.c
-  wipe.c
-  ext4_sb.c
-)
-libext4 = compile(expand('extras/ext4_utils', ext4files), '-D_GNU_SOURCE -Icore/libsparse/include -Icore/include -Iselinux/libselinux/include -Iextras/ext4_utils/include')
-
-selinuxfiles = %w(
-  callbacks.c
-  check_context.c
-  freecon.c
-  init.c
-  label.c
-  label_file.c
-  label_support.c
-  setrans_client.c
-  regex.c
-  matchpathcon.c
-  selinux_config.c
-  label_backends_android.c
-  canonicalize_context.c
-  lsetfilecon.c
-  policyvers.c
-  lgetfilecon.c
-  load_policy.c
-  seusers.c
-  sha1.c
-  booleans.c
-  disable.c
-  enabled.c
-  getenforce.c
-  setenforce.c
-)
-libselinux = compile(expand('selinux/libselinux/src', selinuxfiles), '-DAUDITD_LOG_TAG=1003 -D_GNU_SOURCE -DHOST -DUSE_PCRE2 -DNO_PERSISTENTLY_STORED_PATTERNS -DDISABLE_SETRANS -DDISABLE_BOOL -DNO_MEDIA_BACKEND -DNO_X_BACKEND -DNO_DB_BACKEND -DPCRE2_CODE_UNIT_WIDTH=8 -Iselinux/libselinux/include -Iselinux/libsepol/include')
-
-libsepolfiles = %w(
-  policydb_public.c
-  genbools.c
-  debug.c
-  policydb.c
-  conditional.c
-  services.c
-  ebitmap.c
-  util.c
-  assertion.c
-  avtab.c
-  hashtab.c
-  sidtab.c
-  context.c
-  genusers.c
-  context_record.c
-  mls.c
-  avrule_block.c
-  symtab.c
-  policydb_convert.c
-  write.c
-  constraint.c
-  expand.c
-  hierarchy.c
-)
-libsepol = compile(expand('selinux/libsepol/src', libsepolfiles), '-Iselinux/libsepol/include')
-
-link('fastboot', libsparse + libzip + libcutils + liblog + libutil + libbase + libext4 + f2fs + libselinux + libsepol + libfastboot + libdiagnoseusb, '-lz -lpcre2-8 -lpthread -ldl')
-
-
-# mke2fs.android - a ustom version of mke2fs that supports --android_sparse (FS#56955)
-libext2fsfiles = %w(
-  lib/blkid/cache.c
-  lib/blkid/dev.c
-  lib/blkid/devname.c
-  lib/blkid/devno.c
-  lib/blkid/getsize.c
-  lib/blkid/llseek.c
-  lib/blkid/probe.c
-  lib/blkid/read.c
-  lib/blkid/resolve.c
-  lib/blkid/save.c
-  lib/blkid/tag.c
-  lib/e2p/feature.c
-  lib/e2p/hashstr.c
-  lib/e2p/mntopts.c
-  lib/e2p/ostype.c
-  lib/e2p/parse_num.c
-  lib/e2p/uuid.c
-  lib/et/com_err.c
-  lib/et/error_message.c
-  lib/et/et_name.c
-  lib/ext2fs/alloc.c
-  lib/ext2fs/alloc_sb.c
-  lib/ext2fs/alloc_stats.c
-  lib/ext2fs/alloc_tables.c
-  lib/ext2fs/atexit.c
-  lib/ext2fs/badblocks.c
-  lib/ext2fs/bb_inode.c
-  lib/ext2fs/bitmaps.c
-  lib/ext2fs/bitops.c
-  lib/ext2fs/blkmap64_ba.c
-  lib/ext2fs/blkmap64_rb.c
-  lib/ext2fs/blknum.c
-  lib/ext2fs/block.c
-  lib/ext2fs/bmap.c
-  lib/ext2fs/closefs.c
-  lib/ext2fs/crc16.c
-  lib/ext2fs/crc32c.c
-  lib/ext2fs/csum.c
-  lib/ext2fs/dirblock.c
-  lib/ext2fs/dir_iterate.c
-  lib/ext2fs/expanddir.c
-  lib/ext2fs/ext2_err.c
-  lib/ext2fs/ext_attr.c
-  lib/ext2fs/extent.c
-  lib/ext2fs/fallocate.c
-  lib/ext2fs/fileio.c
-  lib/ext2fs/freefs.c
-  lib/ext2fs/gen_bitmap64.c
-  lib/ext2fs/gen_bitmap.c
-  lib/ext2fs/get_num_dirs.c
-  lib/ext2fs/getsectsize.c
-  lib/ext2fs/getsize.c
-  lib/ext2fs/hashmap.c
-  lib/ext2fs/i_block.c
-  lib/ext2fs/ind_block.c
-  lib/ext2fs/initialize.c
-  lib/ext2fs/inline.c
-  lib/ext2fs/inline_data.c
-  lib/ext2fs/inode.c
-  lib/ext2fs/io_manager.c
-  lib/ext2fs/ismounted.c
-  lib/ext2fs/link.c
-  lib/ext2fs/llseek.c
-  lib/ext2fs/lookup.c
-  lib/ext2fs/mkdir.c
-  lib/ext2fs/mkjournal.c
-  lib/ext2fs/mmp.c
-  lib/ext2fs/namei.c
-  lib/ext2fs/newdir.c
-  lib/ext2fs/openfs.c
-  lib/ext2fs/progress.c
-  lib/ext2fs/punch.c
-  lib/ext2fs/rbtree.c
-  lib/ext2fs/read_bb.c
-  lib/ext2fs/read_bb_file.c
-  lib/ext2fs/res_gdt.c
-  lib/ext2fs/rw_bitmaps.c
-  lib/ext2fs/sha512.c
-  lib/ext2fs/sparse_io.c
-  lib/ext2fs/symlink.c
-  lib/ext2fs/undo_io.c
-  lib/ext2fs/unix_io.c
-  lib/ext2fs/valid_blk.c
-  lib/support/dict.c
-  lib/support/mkquota.c
-  lib/support/parse_qtype.c
-  lib/support/plausible.c
-  lib/support/prof_err.c
-  lib/support/profile.c
-  lib/support/quotaio.c
-  lib/support/quotaio_tree.c
-  lib/support/quotaio_v2.c
-  lib/uuid/gen_uuid.c
-  lib/uuid/isnull.c
-  lib/uuid/pack.c
-  lib/uuid/parse.c
-  lib/uuid/unpack.c
-  lib/uuid/unparse.c
-  misc/create_inode.c
-)
-libext2fs = compile(expand("e2fsprogs", libext2fsfiles), "-Ie2fsprogs/lib -Ie2fsprogs/lib/ext2fs -Icore/libsparse/include")
-
-
-mke2fsfiles = %w(
-  misc/default_profile.c
-  misc/mke2fs.c
-  misc/mk_hugefiles.c
-  misc/util.c
-)
-mke2fs = compile(expand('e2fsprogs', mke2fsfiles), '-Ie2fsprogs/lib')
-
-link('mke2fs.android', mke2fs + libext2fs + libsparse + libbase + libzip + liblog + libutil, '-lpthread -lz')
-
-
-e2fsdroidfiles = %w(
-  contrib/android/e2fsdroid.c
-  contrib/android/basefs_allocator.c
-  contrib/android/block_range.c
-  contrib/android/base_fs.c
-  contrib/android/fsmap.c
-  contrib/android/block_list.c
-  contrib/android/perms.c
-)
-e2fsdroid = compile(expand("e2fsprogs", e2fsdroidfiles), "-Ie2fsprogs/lib -Ie2fsprogs/lib/ext2fs -Iselinux/libselinux/include -Icore/libcutils/include -Ie2fsprogs/misc")
-
-link('e2fsdroid', e2fsdroid + libext2fs + libsparse + libbase + libzip + liblog + libutil + libselinux + libsepol + libcutils, '-lz -lpthread -lpcre2-8')
-
-
-ext2simgfiles = %w(
-  contrib/android/ext2simg.c
-)
-ext2simg = compile(expand('e2fsprogs', ext2simgfiles), '-Ie2fsprogs/lib -Icore/libsparse/include')
-
-link('ext2simg', ext2simg + libext2fs + libsparse + libbase + libzip + liblog + libutil, '-lz -lpthread')
diff --git a/srcpkgs/android-tools/patches/gcc-fixes.patch b/srcpkgs/android-tools/patches/gcc-fixes.patch
deleted file mode 100644
index fc0e60fa06e..00000000000
--- a/srcpkgs/android-tools/patches/gcc-fixes.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- core/adb/sysdeps.h
-+++ core/adb/sysdeps.h
-@@ -66,6 +66,11 @@
- #endif
- #endif
- 
-+#ifndef __clang__
-+#define _Nonnull
-+#define _Nullable
-+#endif
-+
- #ifdef _WIN32
- 
- // Clang-only nullability specifiers
---- core/libcutils/include/cutils/trace.h
-+++ core/libcutils/include/cutils/trace.h
-@@ -18,7 +18,13 @@
- #define _LIBS_CUTILS_TRACE_H
- 
- #include <inttypes.h>
-+// https://gcc.gnu.org/PR60932
-+#ifdef __cplusplus
-+#include <atomic>
-+using namespace std;
-+#else
- #include <stdatomic.h>
-+#endif
- #include <stdbool.h>
- #include <stdint.h>
- #include <stdio.h>
diff --git a/srcpkgs/android-tools/patches/include-sys-sysmacros.patch b/srcpkgs/android-tools/patches/include-sys-sysmacros.patch
deleted file mode 100644
index 592473ac93f..00000000000
--- a/srcpkgs/android-tools/patches/include-sys-sysmacros.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- core/adb/client/usb_linux.cpp	2019-01-02 20:03:26.218600891 +0100
-+++ -	2019-01-02 20:03:57.806149467 +0100
-@@ -28,6 +28,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <sys/sysmacros.h>
- #include <sys/ioctl.h>
- #include <sys/time.h>
- #include <sys/types.h>
diff --git a/srcpkgs/android-tools/patches/musl-fixes.patch b/srcpkgs/android-tools/patches/musl-fixes.patch
deleted file mode 100644
index 235ef68854e..00000000000
--- a/srcpkgs/android-tools/patches/musl-fixes.patch
+++ /dev/null
@@ -1,199 +0,0 @@
-Patch has been taken from Arch Linux with some minor modifications for
-needed to build android-tools with musl libc.
-
-diff -upr core.orig/adb/client/usb_libusb.cpp core/adb/client/usb_libusb.cpp
---- core.orig/adb/client/usb_libusb.cpp	2017-11-29 19:11:44.000000000 +0100
-+++ core/adb/client/usb_libusb.cpp	2018-02-25 10:35:06.661418453 +0100
-@@ -21,6 +21,7 @@
- #include <stdint.h>
- 
- #include <atomic>
-+#include <condition_variable>
- #include <chrono>
- #include <memory>
- #include <mutex>
-@@ -28,7 +29,7 @@
- #include <thread>
- #include <unordered_map>
- 
--#include <libusb/libusb.h>
-+#include <libusb-1.0/libusb.h>
- 
- #include <android-base/file.h>
- #include <android-base/logging.h>
-diff -upr core.orig/adb/diagnose_usb.cpp core/adb/diagnose_usb.cpp
---- core.orig/adb/diagnose_usb.cpp	2017-11-29 19:11:44.000000000 +0100
-+++ core/adb/diagnose_usb.cpp	2018-02-25 10:35:06.658085109 +0100
-@@ -45,9 +45,7 @@ static std::string GetUdevProblem() {
-         return "";
-     }
- 
--    // getgroups(2) indicates that the GNU group_member(3) may not check the egid so we check it
--    // additionally just to be sure.
--    if (group_member(plugdev_group->gr_gid) || getegid() == plugdev_group->gr_gid) {
-+    if (getegid() == plugdev_group->gr_gid) {
-         // The user is in plugdev so the problem is likely with the udev rules.
-         return "user in plugdev group; are your udev rules wrong?";
-     }
-diff -upr core.orig/adb/sysdeps/posix/network.cpp core/adb/sysdeps/posix/network.cpp
---- core.orig/adb/sysdeps/posix/network.cpp	2017-11-29 19:11:44.000000000 +0100
-+++ core/adb/sysdeps/posix/network.cpp	2018-02-25 10:35:06.661418453 +0100
-@@ -21,6 +21,7 @@
- #include <sys/socket.h>
- 
- #include <string>
-+#include <string.h>
- 
- #include "adb_unique_fd.h"
- 
-diff -upr core.orig/base/errors_unix.cpp core/base/errors_unix.cpp
---- core.orig/base/errors_unix.cpp	2017-11-29 19:11:44.000000000 +0100
-+++ core/base/errors_unix.cpp	2018-02-25 10:35:06.654751766 +0100
-@@ -17,6 +17,7 @@
- #include "android-base/errors.h"
- 
- #include <errno.h>
-+#include <string.h>
- 
- namespace android {
- namespace base {
-diff -upr core.orig/base/file.cpp core/base/file.cpp
---- core.orig/base/file.cpp	2017-11-29 19:11:44.000000000 +0100
-+++ core/base/file.cpp	2018-02-25 10:35:06.654751766 +0100
-@@ -22,6 +22,7 @@
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <unistd.h>
-+#include <string.h>
- 
- #include <memory>
- #include <mutex>
-diff -upr core.orig/base/logging.cpp core/base/logging.cpp
---- core.orig/base/logging.cpp	2017-11-29 19:11:44.000000000 +0100
-+++ core/base/logging.cpp	2018-02-25 10:35:06.654751766 +0100
-@@ -23,6 +23,7 @@
- #include <fcntl.h>
- #include <libgen.h>
- #include <time.h>
-+#include <string.h>
- 
- // For getprogname(3) or program_invocation_short_name.
- #if defined(__ANDROID__) || defined(__APPLE__)
-@@ -89,7 +90,7 @@ static thread_id GetThreadId() {
- }
- 
- namespace {
--#if defined(__GLIBC__)
-+#if defined(__linux__)
- const char* getprogname() {
-   return program_invocation_short_name;
- }
-diff -upr core.orig/fastboot/fs.cpp core/fastboot/fs.cpp
---- core.orig/fastboot/fs.cpp	2017-11-29 19:11:44.000000000 +0100
-+++ core/fastboot/fs.cpp	2018-02-25 10:35:06.651418422 +0100
-@@ -108,7 +108,7 @@ static int generate_ext4_image(const cha
-     static constexpr int block_size = 4096;
-     const std::string exec_dir = android::base::GetExecutableDirectory();
- 
--    const std::string mke2fs_path = exec_dir + "/mke2fs";
-+    const std::string mke2fs_path = exec_dir + "/mke2fs.android";
-     std::vector<const char*> mke2fs_args = {mke2fs_path.c_str(), "-t", "ext4", "-b"};
- 
-     std::string block_size_str = std::to_string(block_size);
-diff -upr core.orig/fastboot/socket.cpp core/fastboot/socket.cpp
---- core.orig/fastboot/socket.cpp	2017-11-29 19:11:44.000000000 +0100
-+++ core/fastboot/socket.cpp	2018-02-25 10:35:06.651418422 +0100
-@@ -28,6 +28,8 @@
- 
- #include "socket.h"
- 
-+#include <sys/select.h>
-+
- #include <android-base/errors.h>
- #include <android-base/stringprintf.h>
- 
-diff -upr core.orig/libsparse/sparse_read.cpp core/libsparse/sparse_read.cpp
---- core.orig/libsparse/sparse_read.cpp	2017-11-29 19:11:44.000000000 +0100
-+++ core/libsparse/sparse_read.cpp	2018-02-25 10:35:06.621418331 +0100
-@@ -26,6 +26,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string>
-+#include <string.h>
- #include <unistd.h>
- 
- #include <sparse/sparse.h>
-diff -upr selinux.orig/libsepol/src/private.h selinux/libsepol/src/private.h
---- selinux.orig/libsepol/src/private.h	2017-08-13 09:34:17.000000000 +0200
-+++ selinux/libsepol/src/private.h	2018-02-25 10:36:31.765008355 +0100
-@@ -14,7 +14,7 @@
- #endif
- 
- #include <errno.h>
--#include <dso.h>
-+#include "dso.h"
- 
- #ifdef __APPLE__
- #define __BYTE_ORDER  BYTE_ORDER
-diff -upr selinux.orig/libsepol/src/util.c selinux/libsepol/src/util.c
---- selinux.orig/libsepol/src/util.c	2017-08-13 09:34:17.000000000 +0200
-+++ selinux/libsepol/src/util.c	2018-02-25 10:36:31.765008355 +0100
-@@ -27,7 +27,7 @@
- #include <sepol/policydb/flask_types.h>
- #include <sepol/policydb/policydb.h>
- #include <sepol/policydb/util.h>
--#include <dso.h>
-+#include "dso.h"
- 
- struct val_to_name {
- 	unsigned int val;
-diff -upr e2fsprogs.orig/contrib/android/perms.c e2fsprogs/contrib/android/perms.c
---- e2fsprogs.orig/contrib/android/perms.c	2017-11-29 00:28:33.000000000 +0100
-+++ e2fsprogs/contrib/android/perms.c	2018-02-25 10:37:13.048466147 +0100
-@@ -5,6 +5,7 @@
- #include "support/nls-enable.h"
- #include <time.h>
- #include <sys/stat.h>
-+#include "private/android_filesystem_capability.h"
- 
- #ifndef XATTR_SELINUX_SUFFIX
- # define XATTR_SELINUX_SUFFIX  "selinux"
-diff -upr e2fsprogs.orig/lib/ext2fs/bitops.h e2fsprogs/lib/ext2fs/bitops.h
---- e2fsprogs.orig/lib/ext2fs/bitops.h	2017-11-29 00:28:33.000000000 +0100
-+++ e2fsprogs/lib/ext2fs/bitops.h	2018-02-25 10:37:13.028466087 +0100
-@@ -233,11 +233,11 @@ extern errcode_t ext2fs_find_first_set_g
- #if (__STDC_VERSION__ >= 199901L)
- #define _INLINE_ extern inline
- #else
--#define _INLINE_ inline
-+#define _INLINE_ static inline
- #endif
- #else /* !INCLUDE_INLINE FUNCS */
- #if (__STDC_VERSION__ >= 199901L)
--#define _INLINE_ inline
-+#define _INLINE_ static inline
- #else /* not C99 */
- #ifdef __GNUC__
- #define _INLINE_ extern __inline__
-diff -upr e2fsprogs.orig/lib/ext2fs/ext2fs.h e2fsprogs/lib/ext2fs/ext2fs.h
---- e2fsprogs.orig/lib/ext2fs/ext2fs.h	2017-11-29 00:28:33.000000000 +0100
-+++ e2fsprogs/lib/ext2fs/ext2fs.h	2018-02-25 10:37:13.028466087 +0100
-@@ -53,9 +53,7 @@ extern "C" {
-  */
- #define EXT2_LIB_CURRENT_REV	EXT2_DYNAMIC_REV
- 
--#ifdef HAVE_SYS_TYPES_H
- #include <sys/types.h>
--#endif
- 
- #include <stdio.h>
- #include <stdlib.h>
-@@ -1736,7 +1734,7 @@ extern const struct ext2_inode *ext2fs_c
- #define _INLINE_ extern
- #else
- #if (__STDC_VERSION__ >= 199901L)
--#define _INLINE_ inline
-+#define _INLINE_ static inline
- #else
- #ifdef __GNUC__
- #define _INLINE_ extern __inline__
diff --git a/srcpkgs/android-tools/patches/undef__USE_GNU.patch b/srcpkgs/android-tools/patches/undef__USE_GNU.patch
deleted file mode 100644
index 03fb129c1c1..00000000000
--- a/srcpkgs/android-tools/patches/undef__USE_GNU.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Source: John
-Upstream: No
-Reason: Conflicting declaration of copy_file_range on GLIBC
-
-FAILED: e2fsprogs/misc/create_inode.c.o 
-cc -std=gnu11 -D_FORTIFY_SOURCE=2 -mtune=generic -O2 -pipe     -Ie2fsprogs/lib -Ie2fsprogs/lib/ext2fs -Icore/libsparse/include -c e2fsprogs/misc/create_inode.c -o e2fsprogs/misc/create_inode.c.o
-e2fsprogs/misc/create_inode.c:406:18: error: conflicting types for 'copy_file_range'
- static errcode_t copy_file_range(ext2_filsys fs, int fd, ext2_file_t e2_file,
-                  ^~~~~~~~~~~~~~~
-In file included from e2fsprogs/misc/create_inode.c:20:
-/usr/include/unistd.h:1107:9: note: previous declaration of 'copy_file_range' was here
- ssize_t copy_file_range (int __infd, __off64_t *__pinoff,
-         ^~~~~~~~~~~~~~~
-
---- e2fsprogs/misc/create_inode.c	2019-01-02 20:07:51.685424116 +0100
-+++ -	2019-01-02 20:08:17.379127932 +0100
-@@ -17,6 +17,7 @@
- #include <time.h>
- #include <sys/stat.h>
- #include <sys/types.h>
-+#undef __USE_GNU
- #include <unistd.h>
- #include <limits.h> /* for PATH_MAX */
- #ifdef HAVE_ATTR_XATTR_H
diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index 12806884ec0..cbf06abc647 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -1,56 +1,24 @@
 # Template file for 'android-tools'
 pkgname=android-tools
-# NOTE: not all upstream updates has code changes for the parts
-#       of android used by android-tools. Check for diff with:
-#         curl -L http://git.io/vvC0Z | sh -s 5.0.2_r1 5.1.0_r1
-version=9.0.0r45
-revision=2
-archs="x86_64* i686*"
-_distver=${version/r/_r}
-#See https://android.googlesource.com/platform/development/+/refs/tags/android-${_distver}/sdk/plat_tools_source.prop_template
-_apiver="28.0.0 rc1"
-create_wrksrc=yes
-hostmakedepends="ruby cmake ninja perl go"
+version=29.0.4
+revision=1
+archs="armv* aarch64* x86_64* i686*"
+build_style=cmake
+hostmakedepends="perl go"
 makedepends="gtest-devel zlib-devel libressl-devel libusb-devel pcre2-devel"
 short_desc="Android platform tools (adb and fastboot)"
 maintainer="John <johnz@posteo.net>"
 license="Apache-2.0, ISC, GPL-2.0-only, MIT"
 homepage="http://developer.android.com/tools/help/adb.html"
-_baseurl=https://android.googlesource.com/platform
-distfiles="
- ${_baseurl}/system/core/+archive/android-${_distver}.tar.gz>core.tar.gz
- ${_baseurl}/system/extras/+archive/android-${_distver}.tar.gz>extras.tar.gz
- ${_baseurl}/external/selinux/+archive/android-${_distver}.tar.gz>selinux.tar.gz
- ${_baseurl}/external/f2fs-tools/+archive/android-${_distver}.tar.gz>f2fs-tools.tar.gz
- ${_baseurl}/external/e2fsprogs/+archive/android-${_distver}.tar.gz>e2fsprogs.tar.gz
- ${_baseurl}/external/avb/+archive/android-${_distver}.tar.gz>avb.tar.gz
- https://boringssl.googlesource.com/boringssl/+archive/3538.tar.gz>boringssl.tar.gz"
-# Contents checksums because the tarballs change with every download
-checksum="@dfaea8c40be4a8bbd1df513ab3516ff88e92430ee0fde399dd7e7e09ec21cd29
- @0a43d228088faabe8b7150fa752c8b0c002503c0d830d8470ecea351f195bbb3
- @9f2b5e379eca4c56e2d422598831bfd7bdf2b7b3c3d011ce513c7603aa46b574
- @f1efc86a1e78521f4754d184d682c1f6660c04f74496913f37cae9e2670db0e8
- @e98509632e865e792dc4b344b0a1ada0662dda7571534fa7c5d1a8902dcfb0f4
- @5c2fcb88154f9b6ffed8d24a069e4bad0a7aea1936be2ce18af972ad8762e09a
- @452e29d95f8da494896e3335931e928d9b7c94500a5793101bb19629cd7dea8c"
+distfiles="https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz"
+checksum=5428e16a2baba79665cac0b11be81aa0cfa6920dc20da039711cc3d3b96a333b
 
-do_extract() {
-	local tarball p
-	for p in ${distfiles}; do
-		tarball=${p##*>}
-		mkdir -p ${wrksrc}/${tarball/.*}
-		tar -x --no-same-permissions --no-same-owner -f \
-			${XBPS_SRCDISTDIR}/${pkgname}-${version}/${tarball} \
-			-C ${wrksrc}/${tarball/.*}
-	done
-}
+case "$XBPS_TARGET_MACHINE" in
+	armv[56]*) makedepends+=" libatomic-devel"
+		;;
+esac
 
 pre_configure() {
-	PKGVER="${_apiver}-void-${version}_${revision}" ${FILESDIR}/generate_build.rb > build.ninja
-
-	mkdir -p boringssl/build
-	cd boringssl/build
-
 	# Don't check for CROSS_COMPILING, since i686 container/chroot inside
 	# x86_64 host will failed to build this.
 	if [ "${XBPS_TARGET_MACHINE}" = i686 ] && [ "$(uname -m)" = "x86_64" ]; then
@@ -62,34 +30,19 @@ pre_configure() {
 		SET(CMAKE_CXX_COMPILER ${CXX})
 		SET(CMAKE_SYSTEM_PROCESSOR x86)
 		_EOF
+		configure_args+=" ${boring_ssl_cmake_args}"
 	fi
 
-	cmake -GNinja \
-		-DBUILD_SHARED_LIBS=FALSE \
-		-DCMAKE_BUILD_TYPE=RELEASE \
-		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-		-DCMAKE_C_FLAGS="$CFLAGS" \
-		$boring_ssl_cmake_args \
-		..
-	ninja
+	case "${XBPS_TARGET_MACHINE}" in
+		armv[56]*) sed -i vendor/CMakeLists.adb.txt \
+			-e "/target_link_libraries/s;$; atomic;"
+			;;
+	esac
 }
 
-do_build() {
-	ninja
-}
-
-do_install() {
-	for i in adb fastboot mke2fs.android e2fsdroid ext2simg \
-		core/mkbootimg/mkbootimg avb/avbtool ;do
-		vbin $i
-	done
-	vlicense boringssl/LICENSE boringssl.LICENSE
-	vlicense boringssl/third_party/fiat/LICENSE fiat.LICENSE
-	vlicense boringssl/third_party/googletest/LICENSE gtest.LICENSE
-	vlicense boringssl/third_party/android-cmake/LICENSE android-cmake.LICENSE
+post_install() {
+	vlicense vendor/boringssl/LICENSE boringssl.LICENSE
+	vlicense vendor/boringssl/third_party/fiat/LICENSE fiat.LICENSE
+	vlicense vendor/boringssl/third_party/googletest/LICENSE gtest.LICENSE
 	vsv adb
 }
-
-# REMARKS:
-# If there is any reason at all that fastboot may not be a position independent
-# executable, please document it here.
diff --git a/srcpkgs/android-tools/update b/srcpkgs/android-tools/update
index e5c3658d328..49895605477 100644
--- a/srcpkgs/android-tools/update
+++ b/srcpkgs/android-tools/update
@@ -1,2 +1,2 @@
 site="https://android.googlesource.com/platform/system/core"
-pattern='android-\K[\d._r]+'
+pattern='platform-tools-\K[\d._r]+'
diff --git a/srcpkgs/angband/template b/srcpkgs/angband/template
index 9b118cc9489..c9a1c5e0db2 100644
--- a/srcpkgs/angband/template
+++ b/srcpkgs/angband/template
@@ -1,18 +1,18 @@
 # Template file for 'angband'
 pkgname=angband
-version=4.1.3
+version=4.2.0
 revision=1
 build_style=gnu-configure
 configure_args="--enable-sdl --enable-sdl-mixer"
 hostmakedepends="automake"
 makedepends="SDL_image-devel SDL_mixer-devel SDL_ttf-devel"
-short_desc="A free, single-player dungeon exploration game"
+short_desc="Free, single-player dungeon exploration game"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-2.0-or-later"
 homepage="http://rephial.org/"
 changelog="http://rephial.org/release/"
-distfiles="http://rephial.org/downloads/4.1/angband-${version}.tar.gz"
-checksum=9402c4f8da691edbd4567a948c5663e1066bee3fcb4a62fbcf86b5454918406f
+distfiles="http://rephial.org/downloads/4.2/angband-${version}.tar.gz"
+checksum=d3e1495c7cc2a4ee66de7b4e612d3b133048072e37504bd2e58a2351ab0fb56d
 
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh
diff --git a/srcpkgs/anki/template b/srcpkgs/anki/template
index 78d8089b5a7..c7248395618 100644
--- a/srcpkgs/anki/template
+++ b/srcpkgs/anki/template
@@ -1,6 +1,6 @@
 # Template file for 'anki'
 pkgname=anki
-version=2.1.13
+version=2.1.15
 revision=2
 archs=noarch
 build_style=gnu-makefile
@@ -14,7 +14,7 @@ license="AGPL-3.0-or-later"
 homepage="https://apps.ankiweb.net"
 changelog="https://apps.ankiweb.net/docs/changes.html"
 distfiles="https://apps.ankiweb.net/downloads/current/anki-${version}-source.tgz"
-checksum=8166eebc54575aa55eeff0886ffec3228b3c377885abf9cc18561b7a01cb8edb
+checksum=5a53760164c77d619f55107a13099cffe620566a7f610b61b6c4b52487f3bb89
 
 pycompile_version="$py3_ver"
 
diff --git a/srcpkgs/ansi/template b/srcpkgs/ansi/template
index c40ac829b2f..7c877d9c823 100644
--- a/srcpkgs/ansi/template
+++ b/srcpkgs/ansi/template
@@ -5,7 +5,7 @@ revision=1
 archs=noarch
 depends="bash"
 short_desc="ANSI escape codes in pure Bash"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/fidian/ansi"
 changelog="https://raw.githubusercontent.com/fidian/ansi/master/CHANGELOG.md"
diff --git a/srcpkgs/anydesk/template b/srcpkgs/anydesk/template
index 4f760bc124d..6de2c0969bc 100644
--- a/srcpkgs/anydesk/template
+++ b/srcpkgs/anydesk/template
@@ -1,6 +1,6 @@
 # Template file for 'anydesk'
 pkgname=anydesk
-version=5.1.1
+version=5.1.2
 revision=1
 archs="i686 x86_64"
 wrksrc=${pkgname}-${version}
@@ -14,10 +14,10 @@ restricted=yes
 
 if [ "${XBPS_TARGET_MACHINE}" = "x86_64" ] ; then
 	distfiles="https://download.anydesk.com/linux/anydesk-${version}-amd64.tar.gz"
-	checksum=cb72b79ac1476bfb295f3e27d2127d4868107e324f6473b089b448c7f3df55a4
+	checksum=02d98ca58dfa053d5dc59fb198992a3066ebd66b9faff8948421d233b5e03d56
 elif [ "${XBPS_TARGET_MACHINE}" = "i686" ]; then
-	distfiles="https://download.anydesk.com/linux/anydesk-${version}-i686.tar.gz"
-	checksum=87d9a4ccfa6e46c7174e943453fc97418c73b6b8255631f36e9def3bc3fe6b82
+	distfiles="https://download.anydesk.com/linux/anydesk-${version}-i386.tar.gz"
+	checksum=6ca826ead232e9bd54fb445524ab5efee5df7edd84fc90cd30567b54376950bf
 fi
 
 do_install() {
@@ -29,4 +29,3 @@ do_install() {
 	vbin anydesk
 	vlicense copyright
 }
-
diff --git a/srcpkgs/apache-directory-studio b/srcpkgs/apache-directory-studio
new file mode 120000
index 00000000000..da11f0190a6
--- /dev/null
+++ b/srcpkgs/apache-directory-studio
@@ -0,0 +1 @@
+apache-directory-studio-bin
\ No newline at end of file
diff --git a/srcpkgs/apache-directory-studio/files/ApacheDirectoryStudio.desktop b/srcpkgs/apache-directory-studio-bin/files/ApacheDirectoryStudio.desktop
similarity index 100%
rename from srcpkgs/apache-directory-studio/files/ApacheDirectoryStudio.desktop
rename to srcpkgs/apache-directory-studio-bin/files/ApacheDirectoryStudio.desktop
diff --git a/srcpkgs/apache-directory-studio/template b/srcpkgs/apache-directory-studio-bin/template
similarity index 56%
rename from srcpkgs/apache-directory-studio/template
rename to srcpkgs/apache-directory-studio-bin/template
index 61392aa39d0..0353d15dcdd 100644
--- a/srcpkgs/apache-directory-studio/template
+++ b/srcpkgs/apache-directory-studio-bin/template
@@ -1,25 +1,26 @@
 # Template file for 'apache-directory-studio'
-pkgname=apache-directory-studio
+pkgname=apache-directory-studio-bin
 _pkgname=ApacheDirectoryStudio
-version=2.0.0.v20170904
+version=2.0.0.v20180908
 revision=1
+_versionprefix=M14
 depends="virtual?java-runtime gtk+ desktop-file-utils"
 short_desc="LDAP browser and directory client"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Frank Steinborn <steinex@nognu.de>"
 license="Apache-2.0"
-homepage="http://directory.apache.org/studio/"
 archs="i686 x86_64"
+homepage="http://directory.apache.org/studio/"
 nopie=yes
 
 if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
 	_arch="x86_64"
-	checksum=581d55f3496827710301dec613466d829cf9a3ed3d4308460e63ca08aaa9d6c9
+	checksum=faae04c6d37bfd1e1ac6cd997399d5d314de7ba9b7279fd7b9c9e052cea0044f
 elif [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
 	_arch="x86"
-	checksum=96281c2af3b1ea04e423b41b465a93b21607ce41b3dc3771861e0b52557eb5af
+	checksum=38c0ca414961852e6b1d3960124fb12f45ccfcd03779537291afe02725f20d0d
 fi
 
-distfiles="http://apache.mindstudios.com/directory/studio/${version}-M13/${_pkgname}-${version}-M13-linux.gtk.${_arch}.tar.gz"
+distfiles="https://www-eu.apache.org/dist/directory/studio/${version}-${_versionprefix}/${_pkgname}-${version}-${_versionprefix}-linux.gtk.${_arch}.tar.gz"
 wrksrc="${_pkgname}"
 
 do_install() {
@@ -31,3 +32,9 @@ do_install() {
 	ln -sf /opt/${_pkgname}/${_pkgname} ${DESTDIR}/usr/bin/${_pkgname}
 	ln -sf /opt/${_pkgname}/${_pkgname} ${DESTDIR}/usr/bin/${pkgname//-/}
 }
+
+apache-directory-studio_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	build_style=meta
+	short_desc+=" (transitional dummy package)"
+}
diff --git a/srcpkgs/apache-directory-studio/update b/srcpkgs/apache-directory-studio-bin/update
similarity index 100%
rename from srcpkgs/apache-directory-studio/update
rename to srcpkgs/apache-directory-studio-bin/update
diff --git a/srcpkgs/apache-jmeter/update b/srcpkgs/apache-jmeter/update
new file mode 100644
index 00000000000..cb43837f485
--- /dev/null
+++ b/srcpkgs/apache-jmeter/update
@@ -0,0 +1 @@
+site=https://jmeter.apache.org/download_jmeter.cgi
diff --git a/srcpkgs/apache-maven/template b/srcpkgs/apache-maven/template
index e5cb31b40c5..573423ccb43 100644
--- a/srcpkgs/apache-maven/template
+++ b/srcpkgs/apache-maven/template
@@ -1,6 +1,6 @@
 # Template file for 'apache-maven'
 pkgname=apache-maven
-version=3.6.1
+version=3.6.2
 revision=1
 archs=noarch
 hostmakedepends="openjdk"
@@ -11,8 +11,8 @@ license="Apache-2.0"
 homepage="https://maven.apache.org/"
 distfiles="https://www-us.apache.org/dist/maven/maven-3/${version}/source/${pkgname}-${version}-src.tar.gz
  https://www-us.apache.org/dist/maven/maven-3/${version}/binaries/apache-maven-${version}-bin.tar.gz"
-checksum="025921fff6ba827a25413ffc08fb1933565eb1f07ee2d3f228911913ee4f3c3f
- 2528c35a99c30f8940cc599ba15d34359d58bec57af58c1075519b8cd33b69e7"
+checksum="7ed94655b4098729de292a13c96765bb90a407bb6feb64f201a9444aebde69d1
+ 3fbc92d1961482d6fbd57fbf3dd6d27a4de70778528ee3fb44aa7d27eb32dfdc"
 
 do_build() {
 	./bin/mvn package -DskipTests -Drat.skip=true -Dmaven.repo.local=repo -DdistributionTargetDir=${DESTDIR}/usr/share/${pkgname}/
diff --git a/srcpkgs/apache-tomcat/template b/srcpkgs/apache-tomcat/template
index 49a82f9b526..64a981fd38b 100644
--- a/srcpkgs/apache-tomcat/template
+++ b/srcpkgs/apache-tomcat/template
@@ -1,6 +1,6 @@
 # Template file for 'apache-tomcat'
 pkgname=apache-tomcat
-version=9.0.22
+version=9.0.26
 revision=1
 wrksrc="${pkgname}-${version}-src"
 hostmakedepends="openjdk apache-ant"
@@ -10,7 +10,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://tomcat.apache.org"
 distfiles="http://mirrors.gigenet.com/apache/tomcat/tomcat-9/v${version}/src/${pkgname}-${version}-src.tar.gz"
-checksum=3058585ddea3f5133b2883b750536b4693950152c399b99a99e0ecc0b4e0caa4
+checksum=d061aa50bcc51e28c40f5a2d5a06999d9a49ddcae5410f3bac99c8d5ded61935
 
 system_accounts="tomcat"
 make_dirs="/usr/share/${pkgname}/webapps 0755 tomcat tomcat
diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index c83d4ba5f51..b62093f0358 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
 # Template file for 'apache'
 pkgname=apache
-version=2.4.39
-revision=2
+version=2.4.41
+revision=1
 wrksrc="httpd-${version}"
 build_style=gnu-configure
 configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
@@ -37,7 +37,8 @@ license="Apache-2.0"
 homepage="http://httpd.apache.org/"
 changelog="http://www.apache.org/dist/httpd/CHANGES_2.4"
 distfiles="https://archive.apache.org/dist/httpd/httpd-${version}.tar.bz2"
-checksum=b4ca9d05773aa59b54d66cd8f4744b945289f084d3be17d7981d1783a5decfa2
+checksum=133d48298fe5315ae9366a0ec66282fa4040efa5d566174481077ade7d18ea40
+nocross="https://build.voidlinux.org/builders/armv7l_builder/builds/20326/steps/shell_3/logs/stdio"
 
 system_accounts="_${pkgname}"
 _apache_homedir="/srv/www/$pkgname"
diff --git a/srcpkgs/api-sanity-checker/template b/srcpkgs/api-sanity-checker/template
index 96ad3b7879a..765c5c3fc63 100644
--- a/srcpkgs/api-sanity-checker/template
+++ b/srcpkgs/api-sanity-checker/template
@@ -6,7 +6,7 @@ build_style=gnu-makefile
 hostmakedepends="perl abi-compliance-checker"
 depends="abi-compliance-checker perl binutils ctags"
 short_desc="An automatic generator of basic C/C++ library unit tests"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://lvc.github.io/api-sanity-checker/"
 distfiles="https://github.com/lvc/api-sanity-checker/archive/${version}.tar.gz"
diff --git a/srcpkgs/apparmor/template b/srcpkgs/apparmor/template
index a51f79c409d..c0ef28bae03 100644
--- a/srcpkgs/apparmor/template
+++ b/srcpkgs/apparmor/template
@@ -1,7 +1,7 @@
 # Template file for 'apparmor'
 pkgname=apparmor
-version=2.13.2
-revision=7
+version=2.13.3
+revision=1
 wrksrc="${pkgname}-v${version}"
 build_wrksrc=libraries/libapparmor
 build_style=gnu-configure
@@ -16,7 +16,7 @@ maintainer="Olivier Mauras <olivier@mauras.ch>"
 license="GPL-2.0-only, LGPL-2.1-only"
 homepage="https://gitlab.com/apparmor/apparmor"
 distfiles="https://gitlab.com/apparmor/apparmor/-/archive/v${version}/apparmor-v${version}.tar.gz"
-checksum=83edb98c729dc5388407aea23ea7aedb62c00db70131853f1eae15a27d71ca1d
+checksum=2e32413a83108c3213d60f439ec2865432eb839a577425ee92489c45ac8ce7e4
 patch_args="-Np1"
 
 if [ -z "$CROSS_BUILD" ]; then
@@ -95,4 +95,3 @@ libapparmor-devel_package() {
 		vmove usr/lib/pkgconfig
 	}
 }
-
diff --git a/srcpkgs/apt/template b/srcpkgs/apt/template
index cbb652c1e91..49a8e087855 100644
--- a/srcpkgs/apt/template
+++ b/srcpkgs/apt/template
@@ -1,6 +1,6 @@
 # Template file for 'apt'
 pkgname=apt
-version=1.8.2
+version=1.8.4
 revision=1
 build_style=cmake
 configure_args="-DDPKG_DATADIR=/usr/share/dpkg -DCURRENT_VENDOR=debian
@@ -13,7 +13,7 @@ maintainer="Elie ROUDNINSKI <xademax@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://salsa.debian.org/apt-team/apt"
 distfiles="https://github.com/Debian/apt/archive/${version}.tar.gz"
-checksum=6ff2ede3ffc707ae51c80e5026199816ce7baab038e55aa96aa7eabe0e910bb6
+checksum=41fcd2f1825405c6f0333b5e47eadf13bd9b3ca20d3b7abc26680683198d8ec8
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) broken="error: void value not ignored as it ought to be" ;;
diff --git a/srcpkgs/aptly/template b/srcpkgs/aptly/template
index 7113619a063..4098ebc02d8 100644
--- a/srcpkgs/aptly/template
+++ b/srcpkgs/aptly/template
@@ -1,6 +1,6 @@
 # Template file for 'aptly'
 pkgname=aptly
-version=1.3.0
+version=1.4.0
 revision=1
 build_style=go
 go_import_path=github.com/aptly-dev/aptly
@@ -9,7 +9,7 @@ maintainer="Tassilo Schweyer <dev@welterde.de>"
 license="MIT"
 homepage="https://www.aptly.info/"
 distfiles="https://github.com/aptly-dev/aptly/archive/v$version.tar.gz"
-checksum=4d993dd790345e54dd963467a475ae160a7133bae7ee42844f15d5e82c1fb36e
+checksum=4172d54613139f6c34d5a17396adc9675d7ed002e517db8381731d105351fbe5
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/aqbanking/template b/srcpkgs/aqbanking/template
index 7f547ad9444..ed906ea0645 100644
--- a/srcpkgs/aqbanking/template
+++ b/srcpkgs/aqbanking/template
@@ -1,7 +1,6 @@
 # Template file for 'aqbanking'
 pkgname=aqbanking
-_dnrel=217
-version=5.7.8
+version=5.8.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config gwenhywfar"
@@ -10,8 +9,8 @@ short_desc="Library for online banking and financial applications"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only, GPL-3.0-only"
 homepage="http://www.aquamaniac.de/aqbanking"
-distfiles="http://www.aquamaniac.de/sites/download/download.php?package=03&release=${_dnrel}&file=02&dummy=aqbanking-$version.tar.gz"
-checksum=16f86e4cc49a9eaaa8dfe3206607e627873208bce45a70030c3caea9b5afc768
+distfiles="https://www.aquamaniac.de/rdm/attachments/download/107/aqbanking-${version}.tar.gz"
+checksum=93ca523fe175e72042db75f8c3fc6255ab058cf82caf52796e15f030809fb15e
 disable_parallel_build=yes
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/aquatone/template b/srcpkgs/aquatone/template
index 02e2b239665..f6215fe4ee6 100644
--- a/srcpkgs/aquatone/template
+++ b/srcpkgs/aquatone/template
@@ -1,6 +1,6 @@
 # Template file for 'aquatone'
 pkgname=aquatone
-version=1.4.3
+version=1.7.0
 revision=1
 build_style=go
 go_import_path=github.com/michenriksen/aquatone
@@ -10,7 +10,7 @@ maintainer="Alex Childs <misuchiru03+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/michenriksen/aquatone"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=8a54c597814a246b5b61cb1b5c1bc267fdbf47a83dbc55d5e7800c90b25a2cbb
+checksum=7849dce3241df663ea6edd9a9433d5ecc20fb768d0192ccbfb28d61d67ebcc97
 
 post_install() {
 	vlicense LICENSE.txt
diff --git a/srcpkgs/arc-theme/template b/srcpkgs/arc-theme/template
index a40cf0e0ede..627fa1bad00 100644
--- a/srcpkgs/arc-theme/template
+++ b/srcpkgs/arc-theme/template
@@ -1,16 +1,16 @@
 # Template file for 'arc-theme'
 pkgname=arc-theme
-version=20190330
+version=20190917
 revision=1
 archs=noarch
 build_style=gnu-configure
 configure_script="./autogen.sh"
 hostmakedepends="automake glib-devel gnome-shell pkg-config sassc optipng inkscape"
 makedepends="gtk+3-devel"
-depends="gnome-themes-standard gtk-engine-murrine"
+depends="gnome-themes-extra gtk-engine-murrine"
 short_desc="Flat theme with transparent elements for GTK 3, GTK 2 and GNOME Shell"
 maintainer="jtalowell <jtalowell@protonmail.com>"
 license="GPL-3.0-or-later"
-homepage="https://github.com/NicoHood/arc-theme"
-distfiles="https://github.com/NicoHood/arc-theme/archive/${version}.tar.gz"
-checksum=9e420be8ae3d71ca67882db7f44c5d8c199170751f7470865bf77e8762aa1d5f
+homepage="https://github.com/arc-design/arc-theme"
+distfiles="https://github.com/arc-design/arc-theme/archive/${version}.tar.gz"
+checksum=7ec7ee60fe7c4de0dfbb407b02fde92f1acc87a07e5ed59d6af3d3c822b0ca59
diff --git a/srcpkgs/archiver/template b/srcpkgs/archiver/template
index 942228d1767..e1c510df2b0 100644
--- a/srcpkgs/archiver/template
+++ b/srcpkgs/archiver/template
@@ -1,7 +1,7 @@
 # Template file for 'archiver'
 pkgname=archiver
-version=3.1.1
-revision=2
+version=3.2.0
+revision=1
 build_style=go
 go_import_path=github.com/mholt/archiver
 go_package="${go_import_path}/cmd/arc"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/mholt/archiver"
 distfiles="https://github.com/mholt/archiver/archive/v${version}.tar.gz"
-checksum=41ec54a7e0165c9bf1a567589a453c243394efff41dc446532f2028d98b476ac
+checksum=919182c8a2ae8095b12f059a1b2826107629bd13bdba6a429cb3d97eac6ae065
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/arduino/patches/astyle_fix.patch b/srcpkgs/arduino/patches/astyle_fix.patch
new file mode 100644
index 00000000000..7b07f574420
--- /dev/null
+++ b/srcpkgs/arduino/patches/astyle_fix.patch
@@ -0,0 +1,34 @@
+--- astyle/src/astyle_main.cpp	2017-05-30 20:26:37.000000000 -0400
++++ astyle/src/astyle_main.cpp	2019-09-11 20:38:02.155936887 -0400
+@@ -3749,7 +3749,7 @@
+ // called by a java program to get the version number
+ // the function name is constructed from method names in the calling java program
+ extern "C"  EXPORT
+-jstring STDCALL Java_AStyleInterface_AStyleGetVersion(JNIEnv* env, jclass)
++jstring STDCALL Java_cc_arduino_packages_formatter_AStyleInterface_AStyleGetVersion(JNIEnv* env, jclass)
+ {
+ 	return env->NewStringUTF(g_version);
+ }
+@@ -3757,7 +3757,7 @@
+ // called by a java program to format the source code
+ // the function name is constructed from method names in the calling java program
+ extern "C"  EXPORT
+-jstring STDCALL Java_AStyleInterface_AStyleMain(JNIEnv* env,
++jstring STDCALL Java_cc_arduino_packages_formatter_AStyleInterface_AStyleMain(JNIEnv* env,
+                                                 jobject obj,
+                                                 jstring textInJava,
+                                                 jstring optionsJava)
+--- astyle/src/astyle_main.h	2017-05-30 20:26:37.000000000 -0400
++++ astyle/src/astyle_main.h	2019-09-11 20:39:15.953536523 -0400
+@@ -406,9 +406,9 @@
+ char* STDCALL javaMemoryAlloc(unsigned long memoryNeeded);
+ // the following function names are constructed from method names in the calling java program
+ extern "C" EXPORT
+-jstring STDCALL Java_AStyleInterface_AStyleGetVersion(JNIEnv* env, jclass);
++jstring STDCALL Java_cc_arduino_packages_formatter_AStyleInterface_AStyleGetVersion(JNIEnv* env, jclass);
+ extern "C" EXPORT
+-jstring STDCALL Java_AStyleInterface_AStyleMain(JNIEnv* env,
++jstring STDCALL Java_cc_arduino_packages_formatter_AStyleInterface_AStyleMain(JNIEnv* env,
+                                                 jobject obj,
+                                                 jstring textInJava,
+                                                 jstring optionsJava);
diff --git a/srcpkgs/arduino/patches/disable-dependency-build.patch b/srcpkgs/arduino/patches/disable-dependency-build.patch
index ac27de7601e..970decc78e1 100644
--- a/srcpkgs/arduino/patches/disable-dependency-build.patch
+++ b/srcpkgs/arduino/patches/disable-dependency-build.patch
@@ -1,5 +1,5 @@
---- build/build.xml.orig	2019-02-26 02:16:33.845398910 +0100
-+++ build/build.xml	2019-02-26 02:22:56.667235290 +0100
+--- Arduino-1.8.9/build/build.xml.orig	2019-02-26 02:16:33.845398910 +0100
++++ Arduino-1.8.9/build/build.xml	2019-02-26 02:22:56.667235290 +0100
 @@ -649,15 +649,6 @@
    </target>
  
diff --git a/srcpkgs/arduino/template b/srcpkgs/arduino/template
index ed5954c9195..d877176f70c 100644
--- a/srcpkgs/arduino/template
+++ b/srcpkgs/arduino/template
@@ -1,9 +1,11 @@
 # Template file for 'arduino'
 pkgname=arduino
 version=1.8.9
-revision=1
+revision=2
 archs="x86_64* i686* aarch64* arm*"
-wrksrc=Arduino-$version
+wrksrc=$pkgname-$version
+create_wrksrc=yes
+build_wrksrc=Arduino-$version
 hostmakedepends="apache-ant unzip ImageMagick openjdk"
 depends="virtual?java-runtime avr-binutils avr-gcc avr-libc avrdude"
 short_desc="IDE for the arduino open-source electronics prototyping platform"
diff --git a/srcpkgs/aria2/patches/patch-src_libssl_compat_h.patch b/srcpkgs/aria2/patches/patch-src_libssl_compat_h.patch
deleted file mode 100644
index aedaa65199a..00000000000
--- a/srcpkgs/aria2/patches/patch-src_libssl_compat_h.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-$OpenBSD: patch-src_libssl_compat_h,v 1.1 2018/02/18 11:12:22 sthen Exp $
-
-Index: src/libssl_compat.h
---- src/libssl_compat.h.orig
-+++ src/libssl_compat.h
-@@ -43,7 +43,9 @@
- #define LIBRESSL_IN_USE 0
- #endif // !defined(LIBRESSL_VERSION_NUMBER)
- 
-+/* XXX really OPENSSL_110_API... */
- #define OPENSSL_101_API                                                        \
--  (!LIBRESSL_IN_USE && OPENSSL_VERSION_NUMBER >= 0x1010000fL)
-+  OPENSSL_VERSION_NUMBER >= 0x1010000fL ||                                     \
-+  (LIBRESSL_IN_USE && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
- 
- #endif // LIBSSL_COMPAT_H
diff --git a/srcpkgs/aria2/template b/srcpkgs/aria2/template
index 22dc750b8d5..4e0fdf6fa1c 100644
--- a/srcpkgs/aria2/template
+++ b/srcpkgs/aria2/template
@@ -1,7 +1,7 @@
 # Template file for 'aria2'
 pkgname=aria2
-version=1.34.0
-revision=5
+version=1.35.0
+revision=1
 build_style=gnu-configure
 configure_args="--with-openssl --with-libexpat --without-gnutls
  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
@@ -18,7 +18,7 @@ license="GPL-2.0-or-later"
 homepage="https://aria2.github.io/"
 changelog="https://raw.githubusercontent.com/aria2/aria2/master/NEWS"
 distfiles="https://github.com/aria2/aria2/releases/download/release-${version}/aria2-${version}.tar.xz"
-checksum=3a44a802631606e138a9e172a3e9f5bcbaac43ce2895c1d8e2b46f30487e77a3
+checksum=1e2b7fd08d6af228856e51c07173cfcf987528f1ac97e04c5af4a47642617dfd
 
 libaria2_package() {
 	short_desc="Multi-Protocol/multi-source download library"
diff --git a/srcpkgs/aribas/update b/srcpkgs/aribas/update
new file mode 100644
index 00000000000..fdee11819e4
--- /dev/null
+++ b/srcpkgs/aribas/update
@@ -0,0 +1 @@
+ignore="164"
diff --git a/srcpkgs/ark/template b/srcpkgs/ark/template
index c676d14d6c8..12103a51375 100644
--- a/srcpkgs/ark/template
+++ b/srcpkgs/ark/template
@@ -1,6 +1,6 @@
 # Template file for 'ark'
 pkgname=ark
-version=19.04.3
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-devel qt5-qmake kdoctools kconfig"
@@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/utilities/ark"
 distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=a06cc2937aa4ed41bab0a38344164f367b993a80bcd74011e4ab72643bfee8ee
+checksum=63fcec0a32d806cfc82fb1c136b5e037bfe75459b148ac08c00be7e45ac70c50
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" python kcoreaddons kparts"
diff --git a/srcpkgs/armadillo/template b/srcpkgs/armadillo/template
index e72d11d50ec..66cb6816785 100644
--- a/srcpkgs/armadillo/template
+++ b/srcpkgs/armadillo/template
@@ -1,6 +1,6 @@
 # Template file for 'armadillo'
 pkgname=armadillo
-version=9.500.2
+version=9.700.2
 revision=1
 build_style=cmake
 configure_args="-DDETECT_HDF5=$(vopt_if hdf5 ON OFF)"
@@ -11,7 +11,7 @@ maintainer="Julien Dehos <dehos@lisic.univ-littoral.fr>"
 license="Apache-2.0"
 homepage="http://arma.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/arma/${pkgname}-${version}.tar.xz"
-checksum=0b1a3e07a6ae4d98c69dd3a6a84262574c88e491c9215147236ee5bf957fd79e
+checksum=923f2b48974f707c9da3176aab8d370e8003de23277c17ca0e49fdf97fac08bd
 
 build_options="hdf5"
 desc_option_hdf5="HDF5 support"
@@ -19,10 +19,6 @@ if [ -z "$CROSS_BUILD" ]; then
 	build_options_default="hdf5"
 fi
 
-post_install() {
-	vlicense LICENSE.txt
-}
-
 armadillo-devel_package() {
 	depends="${makedepends}"
 	short_desc+=" - development files"
diff --git a/srcpkgs/asio/template b/srcpkgs/asio/template
index e5d25452725..98c37cd7cb1 100644
--- a/srcpkgs/asio/template
+++ b/srcpkgs/asio/template
@@ -1,7 +1,7 @@
 # Template file for 'asio'
 pkgname=asio
-version=1.13.0
-revision=2
+version=1.14.0
+revision=1
 build_style=gnu-configure
 makedepends="boost-devel"
 depends="boost-devel"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSL-1.0"
 homepage="http://think-async.com/Asio/"
 distfiles="${SOURCEFORGE_SITE}/asio/asio-${version}.tar.bz2"
-checksum=1efa97afbf4191eb3d0bb96026ac35ff2eb4a842866dfe8648fbd4829a9f7e39
+checksum=2e1be1a518a568525f79b5734d13731b6b4e4399ec576a0961db6e2d86112973
 
 pre_configure() {
 	case "$XBPS_TARGET_MACHINE" in
@@ -19,3 +19,7 @@ pre_configure() {
 				-i ${wrksrc}/include/asio/impl/error_code.ipp
 	esac
 }
+
+post_install() {
+	vlicense LICENSE_1_0.txt
+}
diff --git a/srcpkgs/aspell-en/template b/srcpkgs/aspell-en/template
index 100c26721a6..09a1c2279d3 100644
--- a/srcpkgs/aspell-en/template
+++ b/srcpkgs/aspell-en/template
@@ -1,7 +1,8 @@
 # Template file for 'aspell-en'
 pkgname=aspell-en
-version=2018.04.16
+version=2019.10.06
 revision=1
+archs=noarch
 wrksrc="aspell6-en-${version}-0"
 build_style=configure
 hostmakedepends="aspell-devel"
@@ -10,8 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="http://aspell.net/"
 distfiles="${GNU_SITE}/aspell/dict/en/aspell6-en-${version}-0.tar.bz2"
-checksum=f11071e74b0c0753f4afabf024941a5c3a96bafe3879211ebd47bc34e76fbd2f
-archs=noarch
+checksum=24334b4daac6890a679084f4089e1ce7edbe33c442ace776fa693d8e334f51fd
 
 words-en_package() {
 	short_desc="English dictionary word list"
diff --git a/srcpkgs/aspell/template b/srcpkgs/aspell/template
index d1b6ca497bc..b3ccbeeaef8 100644
--- a/srcpkgs/aspell/template
+++ b/srcpkgs/aspell/template
@@ -1,6 +1,6 @@
 # Template file for 'aspell'
 pkgname=aspell
-version=0.60.7
+version=0.60.8
 revision=1
 build_style=gnu-configure
 configure_args="--enable-compile-in-filters"
@@ -9,11 +9,11 @@ makedepends="ncurses-devel"
 depends="perl"
 short_desc="Spell checker with good multi-language support"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
+license="LGPL-2.1-only"
 homepage="http://aspell.net/"
 changelog="http://aspell.net/man-html/ChangeLog.html"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=5ca8fc8cb0370cc6c9eb5b64c6d1bc5d57b3750dbf17887726c3407d833b70e4
+checksum=f9b77e515334a751b2e60daab5db23499e26c9209f5e7b7443b05235ad0226f2
 
 pre_configure() {
 	# XXX workaround ctor/dtor ordering with musl
diff --git a/srcpkgs/assimp/patches/0001-glext_h_conflict.patch b/srcpkgs/assimp/patches/0001-glext_h_conflict.patch
deleted file mode 100644
index 06c69d59d20..00000000000
--- a/srcpkgs/assimp/patches/0001-glext_h_conflict.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- tools/assimp_qt_viewer/glview.cpp	2017-07-28 22:33:41.000000000 +0200
-+++ tools/assimp_qt_viewer/glview.cpp	2017-08-05 09:47:00.697027943 +0200
-@@ -3,6 +3,11 @@
- /// \author smal.root@gmail.com
- /// \date   2016
-
-+#if defined(__arm__)
-+// Avoid conflict for types GLsizeiptr and GLintptr
-+#define GL_VERSION_1_5
-+
-+#endif
- #include "glview.hpp"
- 
- // Header files, OpenGL.
diff --git a/srcpkgs/assimp/patches/musl.patch b/srcpkgs/assimp/patches/musl.patch
new file mode 100644
index 00000000000..f2cf5b1a5e9
--- /dev/null
+++ b/srcpkgs/assimp/patches/musl.patch
@@ -0,0 +1,11 @@
+--- contrib/zip/src/zip.h	2019-09-24 19:28:59.000000000 +0200
++++ -	2019-09-29 00:15:02.408202128 +0200
+@@ -20,7 +20,7 @@
+ #endif
+ 
+ #if !defined(_SSIZE_T_DEFINED) && !defined(_SSIZE_T_DEFINED_) &&               \
+-    !defined(_SSIZE_T) && !defined(_SSIZE_T_) && !defined(__ssize_t_defined)
++    !defined(_SSIZE_T) && !defined(_SSIZE_T_) && !defined(__ssize_t_defined) && !defined(__DEFINED_ssize_t)
+ #define _SSIZE_T
+ // 64-bit Windows is the only mainstream platform
+ // where sizeof(long) != sizeof(void*)
diff --git a/srcpkgs/assimp/template b/srcpkgs/assimp/template
index 1b41014d735..ec6a61c9bcd 100644
--- a/srcpkgs/assimp/template
+++ b/srcpkgs/assimp/template
@@ -1,23 +1,24 @@
 # Template file for 'assimp'
 pkgname=assimp
-version=4.1.0
-revision=1
+version=5.0.0
+revision=2
 build_style=cmake
 configure_args="-DASSIMP_BUILD_SAMPLES=OFF"
-hostmakedepends="cmake pkg-config qt5-qmake qt5-host-tools qt5-devel"
-makedepends="boost-devel libgomp-devel devil-devel qt5-devel minizip-devel zziplib-devel"
+hostmakedepends="pkg-config"
+makedepends="boost-devel libgomp-devel devil-devel minizip-devel zziplib-devel"
 short_desc="Import library for various well-known 3D model formats"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="3-clause-BSD"
 homepage="http://assimp.sourceforge.net/"
 distfiles="https://github.com/assimp/assimp/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=3520b1e9793b93a2ca3b797199e16f40d61762617e072f2d525fad70f9678a71
+checksum=b0110a91650d6bb4000e3d5c2185bf77b0ff0a2e7a284bc2c4af81b33988b63c
 depends="libassimp>=${version}_${revision}"
 
 post_install() {
-	# Install assimp_qt_viewer
-	vbin build/tools/assimp_qt_viewer/assimp_qt_viewer
 	vlicense LICENSE
+	# Copy contrib/stb_image header file (required for assimp_qt_viewer)
+	vmkdir usr/include/assimp/contrib/stb_image
+	vcopy contrib/stb_image/stb_image.h usr/include/assimp/contrib/stb_image
 
 	# Create command documentation
 	cd doc
diff --git a/srcpkgs/assimp_qt_viewer/template b/srcpkgs/assimp_qt_viewer/template
new file mode 100644
index 00000000000..11838e028ae
--- /dev/null
+++ b/srcpkgs/assimp_qt_viewer/template
@@ -0,0 +1,24 @@
+# Template file for 'assimp_qt_viewer'
+pkgname=assimp_qt_viewer
+version=5.0.0
+revision=1
+_gitrev=b2b86036a860297b86b096dba009aebeaf5a2503
+wrksrc="${pkgname}-${_gitrev}"
+build_style=cmake
+build_wrksrc="${pkgname}"
+hostmakedepends="qt5-host-tools qt5-devel"
+makedepends="qt5-devel libassimp-devel"
+short_desc="Qt-Widget-based viewer for assimp"
+maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+license="MIT"
+homepage="https://github.com/assimp/assimp_qt_viewer"
+distfiles="https://github.com/assimp/${pkgname}/archive/${_gitrev}.tar.gz>${pkgname}-${version}.tar.gz"
+checksum=6c65e214f0a49c446a479b98b1a4795c1b79103410403ad38e28c4846eb76996
+
+pre_build() {
+	ln -fsv ${XBPS_CROSS_BASE}/usr/include/assimp/contrib contrib
+}
+
+post_install() {
+	vlicense ${wrksrc}/LICENSE
+}
diff --git a/srcpkgs/asunder/template b/srcpkgs/asunder/template
index 79b9ae35b57..cfed1debf04 100644
--- a/srcpkgs/asunder/template
+++ b/srcpkgs/asunder/template
@@ -1,6 +1,6 @@
 # Template file for 'asunder'
 pkgname=asunder
-version=2.9.3
+version=2.9.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config"
@@ -9,11 +9,11 @@ makedepends="gtk+-devel libcddb-devel"
 # bin/mpcenc (Musepack)
 depends="cdparanoia flac lame opus vorbis-tools wavpack"
 short_desc="Graphical Audio CD ripper and encoder"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://littlesvr.ca/asunder/"
 distfiles="http://littlesvr.ca/asunder/releases/asunder-${version}.tar.bz2"
-checksum=8533c634802a6e830c887015eb169f4807de6539ae3d373620c81be05a886098
+checksum=6070646e53d0cd59d1d20fc0e551306c45b3b57846477e9ac473b840d34e8caf
 
 pre_build() {
 	sed -i 's:cd syslogng && $(MAKE) install:true:' Makefile.in
diff --git a/srcpkgs/at-spi2-atk/template b/srcpkgs/at-spi2-atk/template
index 37bc305f58f..9d675e3752b 100644
--- a/srcpkgs/at-spi2-atk/template
+++ b/srcpkgs/at-spi2-atk/template
@@ -1,6 +1,6 @@
 # Template file for 'at-spi2-atk'
 pkgname=at-spi2-atk
-version=2.32.0
+version=2.34.0
 revision=1
 build_style=meson
 hostmakedepends="libtool pkg-config intltool glib-devel"
@@ -10,7 +10,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0b51e6d339fa2bcca3a3e3159ccea574c67b107f1ac8b00047fa60e34ce7a45c
+checksum=3a9a7e96a1eb549529e60a42201dd78ccce413d9c1706e16351cc5288e064500
 
 at-spi2-atk-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/at-spi2-core/template b/srcpkgs/at-spi2-core/template
index 9de5050734d..b383fe99bed 100644
--- a/srcpkgs/at-spi2-core/template
+++ b/srcpkgs/at-spi2-core/template
@@ -1,7 +1,7 @@
 # Template file for 'at-spi2-core'
 pkgname=at-spi2-core
-version=2.32.1
-revision=2
+version=2.34.0
+revision=1
 build_style=meson
 build_helper="gir"
 hostmakedepends="pkg-config dbus glib-devel"
@@ -12,7 +12,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/at-spi2-core"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3c2aa937ebfaca2c86569bce9b16a34fbe20d69ef0c58846313b1c42f53b0d53
+checksum=d629cdbd674e539f8912028512af583990938c7b49e25184c126b00121ef11c6
 
 # Package build options
 build_options="gir"
diff --git a/srcpkgs/atk/patches/fix-cross-gir.patch b/srcpkgs/atk/patches/fix-cross-gir.patch
deleted file mode 100644
index c249c72c542..00000000000
--- a/srcpkgs/atk/patches/fix-cross-gir.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/atk/meson.build b/atk/meson.build
-index 616a3e6..941ded8 100644
---- atk/meson.build
-+++ atk/meson.build
-@@ -137,7 +137,7 @@ libatk_dep = declare_dependency(link_with: libatk,
-                                 dependencies: gobject_dep,
-                                 sources: atk_enum_h)
- 
--if not meson.is_cross_build() and get_option('introspection')
-+if get_option('introspection')
-   gnome.generate_gir(libatk,
-                      sources: atk_sources + atk_headers + [ atk_enum_h ] + [ atk_version_h ],
-                      namespace: 'Atk',
-
diff --git a/srcpkgs/atk/template b/srcpkgs/atk/template
index 6d5d2399df7..7c14b116598 100644
--- a/srcpkgs/atk/template
+++ b/srcpkgs/atk/template
@@ -1,7 +1,7 @@
 # Template file for 'atk'
 pkgname=atk
-version=2.32.0
-revision=2
+version=2.34.1
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir true false)"
@@ -12,7 +12,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://developer.gnome.org/atk/"
 distfiles="${GNOME_SITE}/atk/${version%.*}/atk-${version}.tar.xz"
-checksum=cb41feda7fe4ef0daa024471438ea0219592baf7c291347e5a858bb64e4091cc
+checksum=d4f0e3b3d21265fcf2bc371e117da51c42ede1a71f6db1c834e6976bb20997cb
 
 # Package build options
 build_options="gir"
diff --git a/srcpkgs/atlantis/template b/srcpkgs/atlantis/template
index 5801c6a8711..3c56b32df97 100644
--- a/srcpkgs/atlantis/template
+++ b/srcpkgs/atlantis/template
@@ -1,6 +1,6 @@
 # Template file for 'atlantis'
 pkgname=atlantis
-version=0.8.3
+version=0.9.0
 revision=1
 build_style=go
 go_import_path=github.com/runatlantis/atlantis
@@ -11,7 +11,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://runatlantis.io"
 distfiles="https://github.com/runatlantis/atlantis/archive/v${version}.tar.gz"
-checksum=26304b0510544ec883f0bb08f7c60794062b4930e6cbaa3396f6d0e66aa813e0
+checksum=ff3b8b38c59c54ff9ff2dfd0c53c69af5308a6c6f64f92d1c4ece87a7d35f1c6
 
 pre_build() {
 	cd $GOSRCPATH
diff --git a/srcpkgs/atomix/template b/srcpkgs/atomix/template
index 18b09fa3650..78c47f01303 100644
--- a/srcpkgs/atomix/template
+++ b/srcpkgs/atomix/template
@@ -1,6 +1,6 @@
 # Template file for 'atomix'
 pkgname=atomix
-version=3.32.1
+version=3.34.0
 revision=1
 build_style=meson
 hostmakedepends="glib-devel itstool pkg-config"
@@ -10,4 +10,4 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Atomix"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=74caa733e86c3410398ae79df536f33119d5c7c373821cbe34fd6463eba997a7
+checksum=0054c3b3830f1fe4383e17d716e6034b608859f4352a102130c13156894a2041
diff --git a/srcpkgs/atril/template b/srcpkgs/atril/template
index a99680cd2c9..84be1535d7d 100644
--- a/srcpkgs/atril/template
+++ b/srcpkgs/atril/template
@@ -1,7 +1,7 @@
 # Template file for 'atril'
 pkgname=atril
-version=1.22.1
-revision=2
+version=1.22.2
+revision=1
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-schemas-compile --enable-djvu
@@ -18,7 +18,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://mate-desktop.org"
 distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=208544f6cce4bb5c0bf423a0d618929e35527d1c5ed120a5aa19f2a7a77e5c44
+checksum=dc692b9c2a2b8bdd7c36631a9f50fb19335f9ce36156464e967a7fdde7478786
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/attica/template b/srcpkgs/attica/template
index 522b54b72fc..4b045707063 100644
--- a/srcpkgs/attica/template
+++ b/srcpkgs/attica/template
@@ -1,6 +1,6 @@
 # Template file for 'attica'
 pkgname=attica
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/kdesupport/attica"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9d3ad34c17223333b5a77144cc5a9d941cbb7baa01ab4a2ffe34ae9398c90dde
+checksum=c064af18478386da6a8eee16a9af626e300a4f0d1755b1598c910e2628977a37
 
 attica-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/audacious-plugins/template b/srcpkgs/audacious-plugins/template
index d97bf72f30e..a50d65e7819 100644
--- a/srcpkgs/audacious-plugins/template
+++ b/srcpkgs/audacious-plugins/template
@@ -1,14 +1,16 @@
 # Template file for 'audacious-plugins'
 pkgname=audacious-plugins
 version=3.10.1
-revision=3
+revision=4
 build_style=gnu-configure
+configure_args="$(vopt_enable gtk) $(vopt_enable qt)"
 hostmakedepends="pkg-config"
 makedepends="audacious-devel alsa-lib-devel pulseaudio-devel jack-devel
  lame-devel libvorbis-devel libflac-devel mpg123-devel faad2-devel ffmpeg-devel
  libmodplug-devel fluidsynth-devel libcdio-paranoia-devel wavpack-devel libnotify-devel
- libcurl-devel libmtp-devel neon-devel libmms-devel gtk+-devel libxml2-devel
- libbs2b-devel libsoxr-devel libsidplayfp-devel"
+ libcurl-devel libmtp-devel neon-devel libmms-devel libxml2-devel
+ libbs2b-devel libsoxr-devel libsidplayfp-devel libcue-devel
+ $(vopt_if gtk gtk+-devel) $(vopt_if qt 'qt5-devel qt5-multimedia-devel')"
 short_desc="Plugins for the Audacious media player"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
@@ -16,6 +18,11 @@ homepage="https://audacious-media-player.org/"
 distfiles="https://distfiles.audacious-media-player.org/${pkgname}-${version}.tar.bz2"
 checksum=eec3177631f99729bf0e94223b627406cc648c70e6646e35613c7b55040a2642
 
+build_options="gtk qt"
+build_options_default="gtk"
+desc_option_gtk="Enable support for the GTK+2 GUI toolkit"
+vopt_conflict gtk qt
+
 post_install() {
 	vlicense COPYING
 }
diff --git a/srcpkgs/audacious/template b/srcpkgs/audacious/template
index 69528553607..e925bb3683f 100644
--- a/srcpkgs/audacious/template
+++ b/srcpkgs/audacious/template
@@ -1,11 +1,12 @@
 # Template file for 'audacious'
 pkgname=audacious
 version=3.10.1
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--enable-thunar"
-hostmakedepends="pkg-config glib-devel"
-makedepends="libSM-devel gtk+-devel dbus-glib-devel libguess-devel"
+configure_args="$(vopt_enable gtk) $(vopt_enable qt)"
+hostmakedepends="pkg-config glib-devel $(vopt_if qt qt5-host-tools)"
+makedepends="libSM-devel dbus-glib-devel libguess-devel $(vopt_if gtk gtk+-devel)
+ $(vopt_if qt qt5-devel)"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Lightweight, advanced audio player focused on audio quality"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -14,6 +15,11 @@ homepage="https://audacious-media-player.org/"
 distfiles="https://distfiles.${pkgname}-media-player.org/${pkgname}-${version}.tar.bz2"
 checksum=8366e840bb3c9448c2cf0cf9a0800155b0bd7cc212a28ba44990c3d2289c6b93
 
+build_options="gtk qt"
+build_options_default="gtk"
+desc_option_gtk="Enable support for the GTK+2 GUI toolkit"
+vopt_conflict gtk qt
+
 post_install() {
 	vlicense COPYING
 }
@@ -24,6 +30,6 @@ audacious-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		vmove usr/lib/*.so
+		vmove "usr/lib/*.so"
 	}
 }
diff --git a/srcpkgs/autofs/template b/srcpkgs/autofs/template
index 6b9a6477107..67f298b2dc4 100644
--- a/srcpkgs/autofs/template
+++ b/srcpkgs/autofs/template
@@ -1,7 +1,7 @@
 # Template file for 'autofs'
 pkgname=autofs
-version=5.1.5
-revision=4
+version=5.1.6
+revision=1
 build_style=gnu-configure
 make_build_args="DONTSTRIP=1"
 configure_args="--with-libtirpc --with-mapdir=/etc/autofs --sbindir=/usr/bin"
@@ -11,9 +11,9 @@ makedepends="libtirpc-devel libxml2-devel"
 short_desc="Kernel-based automounter for Linux"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
-homepage="${KERNEL_SITE}/daemons/autofs"
+homepage="https://www.kernel.org/pub/linux/daemons/autofs"
 distfiles="${KERNEL_SITE}/daemons/autofs/v5/autofs-${version}.tar.xz"
-checksum=23afdad9e2fd6d41b1900be8cfecfd5aae0ad174c7708ff685ec27e280f9c0da
+checksum=dddee3d9b7388ce6cb7432832dfade25b07ef68ad48dcce01cf247b26a10caef
 
 CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/gssglue -I${XBPS_CROSS_BASE}/usr/include/tirpc"
 
diff --git a/srcpkgs/avidemux/template b/srcpkgs/avidemux/template
index 7cf9d1d49d2..84fc747185c 100644
--- a/srcpkgs/avidemux/template
+++ b/srcpkgs/avidemux/template
@@ -1,7 +1,7 @@
 # Template file for 'avidemux'
 pkgname=avidemux
-version=2.7.3
-revision=3
+version=2.7.4
+revision=1
 wrksrc="${pkgname}_${version}"
 # Can't be compiled for aarch64, arm* or mips*
 archs="x86_64* i686*"
@@ -18,7 +18,7 @@ license="GPL-2.0-or-later"
 homepage="http://avidemux.sourceforge.net/"
 changelog="http://avidemux.sourceforge.net/news.html"
 distfiles="${SOURCEFORGE_SITE}/avidemux/avidemux/${version}/${pkgname}_${version}.tar.gz"
-checksum=8d768e09cb646e4aa954d3332417fc565261590fb4944bccb917c192adada29f
+checksum=7db0ac01c8255279a2c360ecb2725c27ea8a2c5bd1f38aeafabfed33ea588da9
 
 do_build() {
 	MAKEFLAGS=${makejobs} \
diff --git a/srcpkgs/avr-gcc/template b/srcpkgs/avr-gcc/template
index 1f415c4a4af..c23673f9689 100644
--- a/srcpkgs/avr-gcc/template
+++ b/srcpkgs/avr-gcc/template
@@ -1,14 +1,14 @@
-# Template build file for 'avr-gcc'
+# Template file for 'avr-gcc'
 pkgname=avr-gcc
-version=8.2.0
+version=9.2.0
 revision=1
-short_desc="The GNU C Compiler for AVR"
+wrksrc="gcc-$version"
+short_desc="GNU C Compiler for AVR"
 maintainer="allan <mail@may.mooo.com>"
-homepage="http://gcc.gnu.org"
 license="GFDL-1.2, GPL-3, LGPL-2.1"
+homepage="http://gcc.gnu.org"
 distfiles="${GNU_SITE}/gcc/gcc-${version}/gcc-${version}.tar.xz"
-checksum=196c3c04ba2613f893283977e6011b2345d1cd1af9abeac58e916b1aab3e0080
-wrksrc="gcc-$version"
+checksum=ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
 
 hostmakedepends="flex avr-binutils"
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/aws-cli/template b/srcpkgs/aws-cli/template
index 125e1c9c79a..4e5e200e3f9 100644
--- a/srcpkgs/aws-cli/template
+++ b/srcpkgs/aws-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'aws-cli'
 pkgname=aws-cli
-version=1.16.169
+version=1.16.253
 revision=1
 archs=noarch
 wrksrc="aws-cli-${version}"
@@ -14,10 +14,9 @@ maintainer="Robert Lowry <bobertlo@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/aws/aws-cli"
 distfiles="https://github.com/aws/aws-cli/archive/${version}.tar.gz"
-checksum=eaec519dbb638d9aeaf9a9d451d011e64e0657cd71bf961a2c2544f175d00d2e
+checksum=aacd3c0faa3b8ce6fda3c58fac6e5d29c7136fe67d56408ee39a64b63ed9485b
 
 post_install() {
-	vlicense LICENSE.txt
 	vinstall bin/aws_bash_completer 644 usr/share/bash-completion/completions aws
 	vinstall bin/aws_zsh_completer.sh 644 usr/share/zsh/site-functions _aws
 	rm "${DESTDIR}/usr/bin/aws_bash_completer"
diff --git a/srcpkgs/axel/template b/srcpkgs/axel/template
index 44f1c979acd..4e5f8ccd348 100644
--- a/srcpkgs/axel/template
+++ b/srcpkgs/axel/template
@@ -1,6 +1,6 @@
 # Template file for 'axel'
 pkgname=axel
-version=2.17.5
+version=2.17.6
 revision=1
 build_style=gnu-configure
 conf_files="/etc/axelrc"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/axel-download-accelerator/axel"
 changelog="https://raw.githubusercontent.com/axel-download-accelerator/axel/master/ChangeLog"
 distfiles="https://github.com/axel-download-accelerator/axel/releases/download/v${version}/axel-${version}.tar.xz"
-checksum=5c5c682617d498071ff9083029fcecc2c2fdeeedc366c35d2bdf8663355616cc
+checksum=24ab549021bdfca01ad5e8e95b706869dd30fe9ab1043da4cbb9dff89edc267d
 
 post_install() {
 	vconf doc/axelrc.example axelrc
diff --git a/srcpkgs/azote/template b/srcpkgs/azote/template
index 0d5daa6bdd4..0a23c209551 100644
--- a/srcpkgs/azote/template
+++ b/srcpkgs/azote/template
@@ -1,18 +1,18 @@
 # Template file for 'azote'
 pkgname=azote
-version=1.3.0
+version=1.5.1
 revision=1
 archs=noarch
 build_style=python3-module
 pycompile_module="azote"
 hostmakedepends="python3-setuptools"
-depends="python3>=3.5 python3-setuptools python3-gobject python3-Pillow gtk+3 feh xrandr wmctrl"
+depends="python3>=3.5 python3-setuptools python3-gobject python3-Pillow python3-send2trash gtk+3 feh xrandr wmctrl"
 short_desc="Wallpaper manager for Sway, i3 and some other WMs"
 maintainer="Piotr Miller <nwg.piotr@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/nwg-piotr/azote"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=fb66f06b8a53fbb9bb64b0a0260a187dc4f5b2a313f90e3f349bd5440e021334
+checksum=1da35263cef47e7dd656de4b3f422a277db8c6b0d4d9b1256767a2446722cdb2
 
 post_install() {
 	vmkdir usr/bin
diff --git a/srcpkgs/azpainter/template b/srcpkgs/azpainter/template
index 4e3bd5dc449..27651577200 100644
--- a/srcpkgs/azpainter/template
+++ b/srcpkgs/azpainter/template
@@ -1,6 +1,6 @@
 # Template file for 'azpainter'
 pkgname=azpainter
-version=2.1.3
+version=2.1.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake"
@@ -10,8 +10,8 @@ short_desc="Full-color painting software for illustration drawing"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-3.0-or-later"
 homepage="https://osdn.net/projects/azpainter/"
-distfiles="https://acc.dl.osdn.jp/azpainter/70132/${pkgname}-${version}.tar.xz"
-checksum=8716a47f3695ba3c6e230415c0d19f082bc2d900213ff1271bfd81496e02e300
+distfiles="https://osdn.net/frs/redir.php?m=rwthaachen&f=azpainter%2F71051%2Fazpainter-${version}.tar.xz"
+checksum=200dba9b443888054172fd13c8d9045d1556210834a46edaa0267bc80a2bad30
 
 CPPFLAGS="-I${XBPS_CROSS_BASE}/usr/include/freetype2"
 
diff --git a/srcpkgs/babeld/patches/45.patch b/srcpkgs/babeld/patches/45.patch
new file mode 100644
index 00000000000..089e35f8d54
--- /dev/null
+++ b/srcpkgs/babeld/patches/45.patch
@@ -0,0 +1,71 @@
+From 36121c1e67fb5a60a35fed0faa37297cd97c9ffc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fabian=20Bl=C3=A4se?= <fabian@blaese.de>
+Date: Thu, 19 Sep 2019 01:16:46 +0200
+Subject: [PATCH] Remove src_plen assignments which break v4mapped encoding
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+These assignments were introduced in f8bce04, probably
+to ensure that src_plen doesn't contain any leftovers from
+earlier revisions when source specific wasn't done via sub-TLVs.
+
+This however breaks v4mapped encoding as a prefix length of 0
+for IPv4 routes is represented as src_plen = 96. This offset is
+already added outside of the affected functions and therefore
+gets overwritten by this assignment.
+
+Both functions contain an additional check if the message contains
+ipv4 addresses, but as this check is only executed if the message has
+a source-specific sub-TLV, the offset isn't added for non source-specific
+routes.
+
+Because the offset is already added outside of the subtlv parsing
+functions, this additional check is also removed, as it would otherwise
+break IPv4 source specifics by adding the IPv4 offset two times.
+
+Signed-off-by: Fabian Bläse <fabian@blaese.de>
+---
+ message.c | 8 --------
+ 1 file changed, 8 deletions(-)
+
+diff --git a/message.c b/message.c
+index 0f6ca19d..78f9aa93 100644
+--- a/message.c
++++ b/message.c
+@@ -137,8 +137,6 @@ parse_update_subtlv(struct interface *ifp, int metric, int ae,
+         }
+     }
+ 
+-    *src_plen = 0;
+-
+     while(i < alen) {
+         type = a[i];
+         if(type == SUBTLV_PAD1) {
+@@ -170,8 +168,6 @@ parse_update_subtlv(struct interface *ifp, int metric, int ae,
+                                 len - 1, src_prefix);
+             if(rc < 0)
+                 goto fail;
+-            if(ae == 1)
+-                (*src_plen) += 96;
+         } else {
+             debugf("Received unknown%s Update sub-TLV %d.\n",
+                    (type & 0x80) != 0 ? " mandatory" : "", type);
+@@ -305,8 +301,6 @@ parse_request_subtlv(int ae, const unsigned char *a, int alen,
+ {
+     int type, len, i = 0;
+ 
+-    *src_plen = 0;
+-
+     while(i < alen) {
+         type = a[0];
+         if(type == SUBTLV_PAD1) {
+@@ -336,8 +330,6 @@ parse_request_subtlv(int ae, const unsigned char *a, int alen,
+                                 len - 1, src_prefix);
+             if(rc < 0)
+                 goto fail;
+-            if(ae == 1)
+-                (*src_plen) += 96;
+         } else {
+             debugf("Received unknown%s Route Request sub-TLV %d.\n",
+                    ((type & 0x80) != 0) ? " mandatory" : "", type);
diff --git a/srcpkgs/babeld/template b/srcpkgs/babeld/template
index a810d6a6522..7707dda1712 100644
--- a/srcpkgs/babeld/template
+++ b/srcpkgs/babeld/template
@@ -1,7 +1,7 @@
 # Template file for 'babeld'
 pkgname=babeld
-version=1.8.5
-revision=1
+version=1.9.1
+revision=3
 wrksrc=babeld-babeld-${version}
 build_style=gnu-makefile
 short_desc="Babel loop-avoiding distance-vector routing daemon"
@@ -9,7 +9,12 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="MIT"
 homepage="https://www.irif.fr/~jch/software/babel/"
 distfiles="https://github.com/jech/babeld/archive/babeld-${version}.tar.gz"
-checksum=91192a7d6f7e99ad6a68d696c2e7b174f8e1413c693d4dc31c77d04e24b64f3c
+checksum=16e18dbd9f8442feaa68487f5919a8ff8f7d95c62a9c7a3c42b7adf31bd4a9b3
+patch_args="-Np1"
+
+pre_build() {
+	echo ${version}-${revision} > version
+}
 
 do_install() {
 	vbin babeld
diff --git a/srcpkgs/backblaze-b2/template b/srcpkgs/backblaze-b2/template
index d1136a5f750..48d5a95a5f7 100644
--- a/srcpkgs/backblaze-b2/template
+++ b/srcpkgs/backblaze-b2/template
@@ -1,7 +1,7 @@
 # Template file for 'backblaze-b2'
 pkgname=backblaze-b2
-version=1.4.0
-revision=3
+version=1.4.2
+revision=1
 archs=noarch
 wrksrc="B2_Command_Line_Tool-${version}"
 build_style=python2-module
@@ -14,7 +14,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 homepage="https://github.com/Backblaze/B2_Command_Line_Tool"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=813bf3334b8986fc5592cff8e4e79faca46c957204d31ef4ba520080c5d315eb
+checksum=2d6382b94af59dcaa44dd546252807e0364d1b61f169584829ebbf82458e7078
 
 post_install() {
 	# Remove test directory polluting site-packages
diff --git a/srcpkgs/backintime-qt/template b/srcpkgs/backintime-qt/template
new file mode 100644
index 00000000000..82f39c652f8
--- /dev/null
+++ b/srcpkgs/backintime-qt/template
@@ -0,0 +1,19 @@
+# Template file for 'backintime-qt'
+pkgname=backintime-qt
+version=1.2.1
+revision=1
+archs=noarch
+wrksrc=backintime-${version}
+build_wrksrc="qt"
+build_style=configure
+configure_args="--python3"
+pycompile_dirs="/usr/share/backintime"
+hostmakedepends="python3"
+depends="backintime python3-PyQt5 python3-PyQt5-dbus libnotify xdpyinfo"
+short_desc="Qt Gui for backintime"
+maintainer="Alpicoid <alpicoid@tuta.io>"
+license="GPL-2.0-only"
+homepage="https://github.com/bit-team/backintime"
+distfiles="https://github.com/bit-team/backintime/releases/download/v${version}/backintime-${version}.tar.gz"
+checksum=eef2aa4f43ac23fb0d45239a4bb2f7e5025afdca2ae4e6d6d9d6e722e8b17644
+pycompile_version="$py3_ver"
diff --git a/srcpkgs/backintime/template b/srcpkgs/backintime/template
index c66dd8521a5..1be1c42e32a 100644
--- a/srcpkgs/backintime/template
+++ b/srcpkgs/backintime/template
@@ -1,17 +1,18 @@
 # Template file for 'backintime'
 pkgname=backintime
-version=1.1.24
+version=1.2.1
 revision=1
 archs=noarch
 build_wrksrc="common"
 build_style=configure
 configure_args="--python3"
-hostmakedepends="python3"
-depends="python3 rsync python3-dbus"
 pycompile_dirs="/usr/share/backintime"
-short_desc="A simple backup tool for Linux"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+hostmakedepends="python3"
+depends="python3 rsync python3-dbus python3-keyring"
+short_desc="Simple backup tool for Linux"
+maintainer="Alpicoid <alpicoid@tuta.io>"
+license="GPL-2.0-only"
 homepage="https://github.com/bit-team/backintime"
 distfiles="https://github.com/bit-team/backintime/releases/download/v${version}/backintime-${version}.tar.gz"
-checksum=72b9324314c70cc55bac04e5db8ca300ae98bf24f63334d3d9cd297a6b988308
+checksum=eef2aa4f43ac23fb0d45239a4bb2f7e5025afdca2ae4e6d6d9d6e722e8b17644
+pycompile_version="$py3_ver"
diff --git a/srcpkgs/baloo-widgets5/template b/srcpkgs/baloo-widgets5/template
index 03aa917a695..41196ccc6d1 100644
--- a/srcpkgs/baloo-widgets5/template
+++ b/srcpkgs/baloo-widgets5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo-widgets5'
 pkgname=baloo-widgets5
-version=19.08.0
+version=19.08.2
 revision=1
 wrksrc="baloo-widgets-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://cgit.kde.org/baloo-widgets.git/"
 distfiles="${KDE_SITE}/applications/${version}/src/baloo-widgets-${version}.tar.xz"
-checksum=3ef81f74ce6fccd6eaf60e0dfd18fe660ac357e75c4715801da9bb3a203a6008
+checksum=529f3b587098eb9b7d1aaa8b311f98c58d16ed88384fa0900f9fb9f8e242c070
 
 baloo-widgets5-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/baloo5/template b/srcpkgs/baloo5/template
index 38a78d381d2..da35cc5ece3 100644
--- a/srcpkgs/baloo5/template
+++ b/srcpkgs/baloo5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo5'
 pkgname=baloo5
-version=5.61.0
+version=5.63.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/Baloo"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=dd559e06237843f51d68eb5001b835037d4b2f6d62b7dc4d040961f9863632f1
+checksum=90ad2f2e13a33b74030fb4b26e46aa699525009efe30cf0c09283dfa52d818e2
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kcoreaddons"
@@ -26,6 +26,7 @@ baloo5-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/qt5/mkspecs
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
 	}
diff --git a/srcpkgs/baresip/template b/srcpkgs/baresip/template
index a2e45356dad..606eb5a9119 100644
--- a/srcpkgs/baresip/template
+++ b/srcpkgs/baresip/template
@@ -1,6 +1,6 @@
 # Template file for 'baresip'
 pkgname=baresip
-version=0.6.3
+version=0.6.4
 revision=1
 build_style=gnu-makefile
 make_build_args="LIBRE_MK=${XBPS_CROSS_BASE}/usr/share/re/re.mk
@@ -25,7 +25,7 @@ maintainer="JohnZ <johnz@posteo.net>"
 license="BSD-3-Clause"
 homepage="http://www.creytiv.com/baresip.html"
 distfiles="http://www.creytiv.com/pub/baresip-${version}.tar.gz"
-checksum=c8005466b4947e28bc48ceb3d99608c782109970c2653b9d0eb0900d4695300c
+checksum=61710bd1bec406ae1faf167c5743bad8eef9ced5152a3943b94d7e1cf9597581
 
 # Package build options
 build_options="gtk video"
diff --git a/srcpkgs/barrier/template b/srcpkgs/barrier/template
index f636aa30b07..6d2072c98a7 100644
--- a/srcpkgs/barrier/template
+++ b/srcpkgs/barrier/template
@@ -1,6 +1,6 @@
 # Template file for 'barrier'
 pkgname=barrier
-version=2.3.1
+version=2.3.2
 revision=1
 build_style=cmake
 configure_args="-DBARRIER_REVISION=00000000 -DBARRIER_VERSION_STAGE=RELEASE"
@@ -12,7 +12,7 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-only"
 homepage="https://github.com/debauchee/barrier"
 distfiles="https://github.com/debauchee/barrier/archive/v${version}.tar.gz"
-checksum=adf6df33a4a07e05784e825a2549ff22fe288aa184f1caee2c2ffddb2cbcf249
+checksum=6b92a70c5f4d625065842d133386982ec2ad1db2a809af47e46ab8ce2acd39b5
 
 do_install() {
 	vbin build/bin/barrier
diff --git a/srcpkgs/base-files/files/66-kvm.rules b/srcpkgs/base-files/files/66-kvm.rules
index c2f7317aacc..582fc57ede4 100644
--- a/srcpkgs/base-files/files/66-kvm.rules
+++ b/srcpkgs/base-files/files/66-kvm.rules
@@ -1 +1 @@
-KERNEL=="kvm", GROUP="kvm", MODE="0660"
+KERNEL=="kvm", GROUP="kvm", MODE="0660", OPTIONS+="static_node=kvm"
diff --git a/srcpkgs/base-files/files/vkpurge.8 b/srcpkgs/base-files/files/vkpurge.8
index a4a1814a427..7974f4d0eb2 100644
--- a/srcpkgs/base-files/files/vkpurge.8
+++ b/srcpkgs/base-files/files/vkpurge.8
@@ -16,7 +16,7 @@
 .Sh DESCRIPTION
 The
 .Nm
-utility lists and removes removable kernel versions leaved
+utility lists and removes removable kernel versions left
 behind by
 .Xr xbps-install 1
 and
@@ -68,5 +68,5 @@ The following command will delete the kernel versions matching the pattern and a
 .Xr xbps-install 1 ,
 .Xr xbps-remove 1
 .Sh BUGS
-There is no support as of yet for all kernels, specific series like rpi-kernel
-are not supported
+There is no support for all kernels. Specific series, like rpi-kernel, are not
+supported yet.
diff --git a/srcpkgs/base-files/template b/srcpkgs/base-files/template
index 672855e8671..a049c59681d 100644
--- a/srcpkgs/base-files/template
+++ b/srcpkgs/base-files/template
@@ -1,12 +1,12 @@
 # Template file for 'base-files'
 pkgname=base-files
 version=0.140
-revision=6
+revision=8
 bootstrap=yes
 depends="xbps-triggers"
 short_desc="Void Linux base system files"
 maintainer="Enno Boland <orphan@voidlinux.org>"
-license="Public domain"
+license="custom:Public domain"
 homepage="https://www.voidlinux.org"
 conf_files="
 	/etc/inputrc
diff --git a/srcpkgs/bash/files/bash50-008 b/srcpkgs/bash/files/bash50-008
new file mode 100644
index 00000000000..b09d6b33ac7
--- /dev/null
+++ b/srcpkgs/bash/files/bash50-008
@@ -0,0 +1,68 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	5.0
+Patch-ID:	bash50-008
+
+Bug-Reported-by:	Michael Albinus <michael.albinus@gmx.de>
+Bug-Reference-ID:	<87bm36k3kz.fsf@gmx.de>
+Bug-Reference-URL:	https://lists.gnu.org/archive/html/bug-bash/2019-02/msg00111.html
+
+Bug-Description:
+
+When HISTSIZE is set to 0, history expansion can leave the history length
+set to an incorrect value, leading to subsequent attempts to access invalid
+memory.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-5.0-patched/bashhist.c	2018-07-05 22:41:14.000000000 -0400
+--- bashhist.c	2019-02-20 16:20:04.000000000 -0500
+***************
+*** 561,573 ****
+    if (!history_expansion_inhibited && history_expansion && history_expansion_p (line))
+      {
+        /* If we are expanding the second or later line of a multi-line
+  	 command, decrease history_length so references to history expansions
+  	 in these lines refer to the previous history entry and not the
+  	 current command. */
+        if (history_length > 0 && command_oriented_history && current_command_first_line_saved && current_command_line_count > 1)
+          history_length--;
+        expanded = history_expand (line, &history_value);
+        if (history_length >= 0 && command_oriented_history && current_command_first_line_saved && current_command_line_count > 1)
+!         history_length++;
+  
+        if (expanded)
+--- 561,576 ----
+    if (!history_expansion_inhibited && history_expansion && history_expansion_p (line))
+      {
++       int old_len;
++ 
+        /* If we are expanding the second or later line of a multi-line
+  	 command, decrease history_length so references to history expansions
+  	 in these lines refer to the previous history entry and not the
+  	 current command. */
++       old_len = history_length;
+        if (history_length > 0 && command_oriented_history && current_command_first_line_saved && current_command_line_count > 1)
+          history_length--;
+        expanded = history_expand (line, &history_value);
+        if (history_length >= 0 && command_oriented_history && current_command_first_line_saved && current_command_line_count > 1)
+!         history_length = old_len;
+  
+        if (expanded)
+
+*** ../bash-5.0/patchlevel.h	2016-06-22 14:51:03.000000000 -0400
+--- patchlevel.h	2016-10-01 11:01:28.000000000 -0400
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 7
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 8
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/srcpkgs/bash/files/bash50-009 b/srcpkgs/bash/files/bash50-009
new file mode 100644
index 00000000000..aef4ce7b5ad
--- /dev/null
+++ b/srcpkgs/bash/files/bash50-009
@@ -0,0 +1,42 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	5.0
+Patch-ID:	bash50-009
+
+Bug-Reported-by:	chet.ramey@case.edu
+Bug-Reference-ID:
+Bug-Reference-URL:
+
+Bug-Description:
+
+The history file reading code doesn't close the file descriptor open to
+the history file when it encounters a zero-length file.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-5.0-patched/lib/readline/histfile.c	2018-06-11 09:14:52.000000000 -0400
+--- lib/readline/histfile.c	2019-05-16 15:55:57.000000000 -0400
+***************
+*** 306,309 ****
+--- 312,316 ----
+      {
+        free (input);
++       close (file);
+        return 0;	/* don't waste time if we don't have to */
+      }
+*** ../bash-5.0/patchlevel.h	2016-06-22 14:51:03.000000000 -0400
+--- patchlevel.h	2016-10-01 11:01:28.000000000 -0400
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 8
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 9
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/srcpkgs/bash/files/bash50-010 b/srcpkgs/bash/files/bash50-010
new file mode 100644
index 00000000000..bac7aa92515
--- /dev/null
+++ b/srcpkgs/bash/files/bash50-010
@@ -0,0 +1,172 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	5.0
+Patch-ID:	bash50-010
+
+Bug-Reported-by:	Thorsten Glaser <tg@mirbsd.de>
+Bug-Reference-ID:	<156622962831.19438.16374961114836556294.reportbug@tglase.lan.tarent.de>
+Bug-Reference-URL:	https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=935115
+
+Bug-Description:
+
+Bash-5.0 changed the way assignment statements preceding special builtins
+and shell functions were handled in posix mode. They automatically created
+or modified global variables instead of modifying existing local variables
+as in bash-4.4.
+
+The bash-4.4 posix-mode semantics were buggy, and resulted in creating
+local variables where they were not intended and modifying global variables
+and local variables simultaneously.
+
+The bash-5.0 changes were intended to fix this issue, but did not preserve
+enough backwards compatibility. The posix standard also changed what it
+required in these cases, so bash-5.0 is not bound by the strict conformance
+requirements that existed in previous issues of the standard.
+
+This patch modifies the bash-5.0 posix mode behavior in an effort to restore
+some backwards compatibility and rationalize the behavior in the presence of
+local variables. It
+
+1. Changes the assignment semantics to be more similar to standalone assignment
+   statements: assignments preceding a function call or special builtin while
+   executing in a shell function will modify the value of a local variable
+   with the same name for the duration of the function's execution;
+
+2. Changes assignments preceding shell function calls or special builtins
+   from within a shell function to no longer create or modify global variables
+   in the presence of a local variable with the same name;
+
+3. Assignment statements preceding a shell function call or special builtin
+   at the global scope continue to modify the (global) calling environment,
+   but are unaffected by assignments preceding function calls or special
+   builtins within a function, as described in item 2. This is also similar
+   to the behavior of a standalone assignment statement.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-5.0-patched/variables.c	2018-12-18 11:07:21.000000000 -0500
+--- variables.c	2019-08-22 10:53:44.000000000 -0400
+***************
+*** 4461,4467 ****
+  
+  /* Take a variable from an assignment statement preceding a posix special
+!    builtin (including `return') and create a global variable from it. This
+!    is called from merge_temporary_env, which is only called when in posix
+!    mode. */
+  static void
+  push_posix_temp_var (data)
+--- 4461,4467 ----
+  
+  /* Take a variable from an assignment statement preceding a posix special
+!    builtin (including `return') and create a variable from it as if a
+!    standalone assignment statement had been performed. This is called from
+!    merge_temporary_env, which is only called when in posix mode. */
+  static void
+  push_posix_temp_var (data)
+***************
+*** 4473,4486 ****
+    var = (SHELL_VAR *)data;
+  
+!   binding_table = global_variables->table;
+!   if (binding_table == 0)
+!     binding_table = global_variables->table = hash_create (VARIABLES_HASH_BUCKETS);
+! 
+!   v = bind_variable_internal (var->name, value_cell (var), binding_table, 0, ASS_FORCE|ASS_NOLONGJMP);
+  
+    /* global variables are no longer temporary and don't need propagating. */
+!   var->attributes &= ~(att_tempvar|att_propagate);
+    if (v)
+!     v->attributes |= var->attributes;
+  
+    if (find_special_var (var->name) >= 0)
+--- 4473,4497 ----
+    var = (SHELL_VAR *)data;
+  
+!   /* Just like do_assignment_internal(). This makes assignments preceding
+!      special builtins act like standalone assignment statements when in
+!      posix mode, satisfying the posix requirement that this affect the
+!      "current execution environment." */
+!   v = bind_variable (var->name, value_cell (var), ASS_FORCE|ASS_NOLONGJMP);
+! 
+!   /* If this modifies an existing local variable, v->context will be non-zero.
+!      If it comes back with v->context == 0, we bound at the global context.
+!      Set binding_table appropriately. It doesn't matter whether it's correct
+!      if the variable is local, only that it's not global_variables->table */
+!   binding_table = v->context ? shell_variables->table : global_variables->table;
+  
+    /* global variables are no longer temporary and don't need propagating. */
+!   if (binding_table == global_variables->table)
+!     var->attributes &= ~(att_tempvar|att_propagate);
+! 
+    if (v)
+!     {
+!       v->attributes |= var->attributes;
+!       v->attributes &= ~att_tempvar;	/* not a temp var now */
+!     }
+  
+    if (find_special_var (var->name) >= 0)
+***************
+*** 4576,4587 ****
+  {
+    int i;
+  
+    tempvar_list = strvec_create (HASH_ENTRIES (temporary_env) + 1);
+    tempvar_list[tvlist_ind = 0] = 0;
+!     
+!   hash_flush (temporary_env, pushf);
+!   hash_dispose (temporary_env);
+    temporary_env = (HASH_TABLE *)NULL;
+  
+    tempvar_list[tvlist_ind] = 0;
+  
+--- 4587,4601 ----
+  {
+    int i;
++   HASH_TABLE *disposer;
+  
+    tempvar_list = strvec_create (HASH_ENTRIES (temporary_env) + 1);
+    tempvar_list[tvlist_ind = 0] = 0;
+! 
+!   disposer = temporary_env;
+    temporary_env = (HASH_TABLE *)NULL;
+  
++   hash_flush (disposer, pushf);
++   hash_dispose (disposer);
++ 
+    tempvar_list[tvlist_ind] = 0;
+  
+*** ../bash-5.0-patched/tests/varenv.right	2018-12-17 15:39:48.000000000 -0500
+--- tests/varenv.right	2019-08-22 16:05:25.000000000 -0400
+***************
+*** 147,153 ****
+  outside: declare -- var="one"
+  inside: declare -x var="value"
+! outside: declare -x var="value"
+! inside: declare -- var="local"
+! outside: declare -x var="global"
+  foo=<unset> environment foo=
+  foo=foo environment foo=foo
+--- 147,153 ----
+  outside: declare -- var="one"
+  inside: declare -x var="value"
+! outside: declare -- var="outside"
+! inside: declare -x var="global"
+! outside: declare -- var="outside"
+  foo=<unset> environment foo=
+  foo=foo environment foo=foo
+*** ../bash-5.0/patchlevel.h	2016-06-22 14:51:03.000000000 -0400
+--- patchlevel.h	2016-10-01 11:01:28.000000000 -0400
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 9
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 10
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/srcpkgs/bash/files/bash50-011 b/srcpkgs/bash/files/bash50-011
new file mode 100644
index 00000000000..a9ae690e004
--- /dev/null
+++ b/srcpkgs/bash/files/bash50-011
@@ -0,0 +1,59 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	5.0
+Patch-ID:	bash50-011
+
+Bug-Reported-by:	Matt Whitlock
+Bug-Reference-ID:	
+Bug-Reference-URL:	https://savannah.gnu.org/support/?109671
+
+Bug-Description:
+
+The conditional command did not perform appropriate quoted null character
+removal on its arguments, causing syntax errors and attempts to stat
+invalid pathnames.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-5.0-patched/subst.c	2018-12-22 17:43:37.000000000 -0500
+--- subst.c	2019-04-14 13:25:41.000000000 -0400
+***************
+*** 3626,3630 ****
+     SPECIAL is 2, this is an rhs argument for the =~ operator, and should
+     be quoted appropriately for regcomp/regexec.  The caller is responsible
+!    for removing the backslashes if the unquoted word is needed later. */   
+  char *
+  cond_expand_word (w, special)
+--- 3642,3648 ----
+     SPECIAL is 2, this is an rhs argument for the =~ operator, and should
+     be quoted appropriately for regcomp/regexec.  The caller is responsible
+!    for removing the backslashes if the unquoted word is needed later. In
+!    any case, since we don't perform word splitting, we need to do quoted
+!    null character removal. */
+  char *
+  cond_expand_word (w, special)
+***************
+*** 3647,3650 ****
+--- 3665,3670 ----
+        if (special == 0)			/* LHS */
+  	{
++ 	  if (l->word)
++ 	    word_list_remove_quoted_nulls (l);
+  	  dequote_list (l);
+  	  r = string_list (l);
+*** ../bash-5.0/patchlevel.h	2016-06-22 14:51:03.000000000 -0400
+--- patchlevel.h	2016-10-01 11:01:28.000000000 -0400
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 10
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 11
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/srcpkgs/bash/template b/srcpkgs/bash/template
index 84176143b72..1fd2f591cdb 100644
--- a/srcpkgs/bash/template
+++ b/srcpkgs/bash/template
@@ -1,9 +1,9 @@
 # Template file for 'bash'
 pkgname=bash
 _bash_distver=5.0
-_bash_patchlevel=007
+_bash_patchlevel=011
 version="${_bash_distver}.${_bash_patchlevel}"
-revision=2
+revision=1
 wrksrc="${pkgname}-${_bash_distver}"
 build_style=gnu-configure
 configure_args="--without-bash-malloc --with-curses --without-installed-readline"
diff --git a/srcpkgs/bat/template b/srcpkgs/bat/template
index db577d886ae..1a06119cd32 100644
--- a/srcpkgs/bat/template
+++ b/srcpkgs/bat/template
@@ -1,16 +1,21 @@
 # Template file for 'bat'
 pkgname=bat
-version=0.11.0
+version=0.12.1
 revision=1
 build_style=cargo
-hostmakedepends="cmake"
+hostmakedepends="cmake llvm"
 makedepends="libcurl-devel libssh2-devel oniguruma-devel"
 short_desc="Cat(1) clone with syntax highlighting and Git integration"
 maintainer="John <johnz@posteo.net>"
 license="Apache-2.0, MIT"
 homepage="https://github.com/sharkdp/bat"
 distfiles="https://github.com/sharkdp/bat/archive/v${version}.tar.gz"
-checksum=bb4e39efadfab71c0c929a92b82dac58deacfe2a4eb527d4256ac0634e042ed2
+checksum=1dd184ddc9e5228ba94d19afc0b8b440bfc1819fef8133fe331e2c0ec9e3f8e2
+
+pre_build() {
+	export CFLAGS_${RUST_BUILD//-/_}="${CFLAGS_host}"
+	export CC_${RUST_BUILD//-/_}="${BUILD_CC}"
+}
 
 post_install() {
 	vlicense LICENSE-MIT
diff --git a/srcpkgs/bc-gh/template b/srcpkgs/bc-gh/template
index 0a8a7ee8293..ac863f30d77 100644
--- a/srcpkgs/bc-gh/template
+++ b/srcpkgs/bc-gh/template
@@ -1,6 +1,6 @@
 # Template file for 'bc-gh'
 pkgname=bc-gh
-version=2.1.0
+version=2.1.3
 revision=1
 wrksrc="bc-${version}"
 short_desc="Implementation of POSIX bc with GNU extensions"
@@ -8,7 +8,7 @@ maintainer="Gavin D. Howard <yzena.tech@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://github.com/gavinhoward/bc"
 distfiles="${homepage}/releases/download/${version}/bc-${version}.tar.xz"
-checksum=b6b25a44323e42959b2ba4885f54fcc6d889070dbb53c7d0f8db9f56a4faafc8
+checksum=cf24e19a5573e7cc8e4cbefea382de57e982212c33e8e15d7064ccc989cae17b
 alternatives="
  bc:bc:/usr/bin/bc-gh
  dc:dc:/usr/bin/dc-gh"
diff --git a/srcpkgs/bcal/patches/non-null.patch b/srcpkgs/bcal/patches/non-null.patch
new file mode 100644
index 00000000000..132fc086784
--- /dev/null
+++ b/srcpkgs/bcal/patches/non-null.patch
@@ -0,0 +1,11 @@
+--- src/bcal.c	2018-12-11 16:12:41.000000000 +0100
++++ src/bcal.c	2019-09-24 22:34:39.475836973 +0200
+@@ -1923,7 +1923,7 @@
+ 	char *expr = fixexpr(exp, &ret);  /* Make parsing compatible */
+ 	char *ptr;
+ 
+-	log(DEBUG, "expr: %s\n", expr);
++	log(DEBUG, "expr: %s\n", expr ? expr : "<null>");
+ 
+ 	if (expr == NULL) {
+ 		if (ret)
diff --git a/srcpkgs/bcal/template b/srcpkgs/bcal/template
index 8aedd08e322..905e22fccd5 100644
--- a/srcpkgs/bcal/template
+++ b/srcpkgs/bcal/template
@@ -1,18 +1,17 @@
 # Template file for 'bcal'
 pkgname=bcal
 version=2.1
-revision=2
+revision=3
 build_style=gnu-makefile
 makedepends="readline-devel"
 depends="bc"
 short_desc="Byte CALculator for storage conversions and calculations"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/jarun/bcal"
 distfiles="https://github.com/jarun/bcal/archive/v${version}.tar.gz"
 checksum=c0b6cb911a773abdd555e6a9e0eb8a25934ceca038156e6250e117fa451beaa6
-nocross=yes
 
-case "$XBPS_TARGET_MACHINE" in
-	i686*) broken="https://build.voidlinux.org/builders/i686_builder/builds/6760/steps/shell_3/logs/stdio";;
-esac
+if [ "$XBPS_TARGET_WORDSIZE" -ne 64 ]; then
+	broken="Can only be built for 64 bit targets which define __uint128_t."
+fi
diff --git a/srcpkgs/bcc/patches/musl.patch b/srcpkgs/bcc/patches/musl.patch
index 20def02c588..bc7ac1e7726 100644
--- a/srcpkgs/bcc/patches/musl.patch
+++ b/srcpkgs/bcc/patches/musl.patch
@@ -48,15 +48,3 @@
  #include <arpa/inet.h>
  #include <errno.h>
  #include <fcntl.h>
---- src/cc/libbpf/src/hashmap.h.orig	2019-05-29 19:27:27.000000000 +0200
-+++ src/cc/libbpf/src/hashmap.h	2019-06-01 23:57:31.458324372 +0200
-@@ -10,6 +10,9 @@
- 
- #include <stdbool.h>
- #include <stddef.h>
-+#if !defined(__GLIBC__)
-+#include <bits/reg.h>	/* for __WORDSIZE */
-+#endif
- #include "libbpf_internal.h"
- 
- static inline size_t hash_bits(size_t h, int bits)
diff --git a/srcpkgs/bcc/template b/srcpkgs/bcc/template
index 807f1425c1d..a4d32bce7a4 100644
--- a/srcpkgs/bcc/template
+++ b/srcpkgs/bcc/template
@@ -1,20 +1,21 @@
 # Template file for 'bcc'
 pkgname=bcc
-version=0.10.0
+version=0.11.0
 revision=1
 build_style=cmake
 configure_args="-DREVISION=${version}"
 hostmakedepends="flex"
 makedepends="clang elfutils-devel lld-devel llvm ncurses-devel
- python-devel zlib-devel"
+ python3-devel zlib-devel"
+python_version="3"
 short_desc="BPF-based Linux IO analysis, networking, monitoring, and more"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://github.com/iovisor/bcc"
 distfiles="https://github.com/iovisor/${pkgname}/archive/v${version}.tar.gz
- https://github.com/libbpf/libbpf/archive/75db50f4a09d9dbac49b1ace9e4b6a722bdf0519.tar.gz"
-checksum="b02a75bc469a33e6781c915361a49a97d4ec7b45d74cfeffb22693247438d4b0
- 22a7ba2343df699a0332015aa54d4a8aeba1756f58308fed120b60a8900e9d55"
+ https://github.com/libbpf/libbpf/archive/1a26b51b1ca0c33ded075e7563ab40fba686ea0f.tar.gz"
+checksum="18ba73ab285d96b806e59764abba5e6a5fa0c39f5571150b31cf651df3a71b48
+ 3c2e5dc538b338353b05f1ed5d5f2aceee394bbd9b69fec2a7b586a4f9c0274d"
 nocross=yes # https://github.com/voidlinux/void-packages/issues/4738
 
 post_extract() {
@@ -25,7 +26,7 @@ post_extract() {
 }
 bcc-tools_package() {
 	short_desc+=" - tools"
-	depends="python-bcc>=${version}_${revision} linux-headers"
+	depends="python3-bcc>=${version}_${revision} linux-headers"
 	pkg_install() {
 		vmove usr/share/bcc/man/man8
 		mv ${PKGDESTDIR}/usr/share/bcc/man ${PKGDESTDIR}/usr/share/man
@@ -55,10 +56,10 @@ bcc-devel_package() {
 		vmove usr/share/bcc/examples
 	}
 }
-python-bcc_package() {
+python3-bcc_package() {
 	lib32disabled=yes
-	depends="python"
-	short_desc+=" - Python 2.7 module"
+	depends="python3"
+	short_desc+=" - Python 3 module"
 	depends="${sourcepkg}>=${version}_${revision}"
 	pycompile_module="bcc"
 	pkg_install() {
diff --git a/srcpkgs/bctoolbox/template b/srcpkgs/bctoolbox/template
index 1fdcea06dc7..b339759beac 100644
--- a/srcpkgs/bctoolbox/template
+++ b/srcpkgs/bctoolbox/template
@@ -6,7 +6,7 @@ build_style=cmake
 configure_args="-DENABLE_TESTS_COMPONENT=OFF"
 makedepends="mbedtls-devel"
 short_desc="Library to create and run audio and video streams"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/BelledonneCommunications/bctoolbox"
 distfiles="https://github.com/BelledonneCommunications/bctoolbox/archive/${version}.tar.gz"
diff --git a/srcpkgs/beancount/template b/srcpkgs/beancount/template
index c29e4b8836c..b1e2a121668 100644
--- a/srcpkgs/beancount/template
+++ b/srcpkgs/beancount/template
@@ -1,6 +1,6 @@
 # Template file for 'beancount'
 pkgname=beancount
-version=2.2.1
+version=2.2.3
 revision=1
 build_style=python3-module
 pycompile_module="beancount"
@@ -8,10 +8,10 @@ hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
 depends="python3-pytest python3-dateutil python3-ply python3-bottle python3-lxml
  python3-magic python3-BeautifulSoup4 python3-requests python3-chardet
- python3-google-api-python-client"
+ python3-google-api-python-client python3-oauth2client"
 short_desc="Double-entry accounting system based on plain text files"
 maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"
 license="GPL-2.0-only"
 homepage="http://furius.ca/beancount/"
 distfiles="${PYPI_SITE}/b/beancount/beancount-${version}.tar.gz"
-checksum=ebcb59bd7c0e18a858c55d6c30eacee3fa949ee5d2c452a7aa80690e36ae2f77
+checksum=1554adfd773d12cb88fd7f4da67fcb608665a9bdedc7e44834e059d1b3a08e5d
diff --git a/srcpkgs/bearssl/template b/srcpkgs/bearssl/template
index 777cec324d3..ec393735acf 100644
--- a/srcpkgs/bearssl/template
+++ b/srcpkgs/bearssl/template
@@ -1,23 +1,24 @@
 # Template file for 'bearssl'
 pkgname=bearssl
 version=0.6
-revision=1
+revision=2
 build_style=gnu-makefile
+make_build_args="D=.so.${version} LD=\$(CC) LDDLL=\$(CC) LDDLLFLAGS=-shared LDDLLFLAGS+=-Wl,-soname,lib${pkgname}.so.${version%%.*}"
 short_desc="Implementation of the SSL/TLS protocol in C"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
-homepage="https://www.bearssl.org/"
-_changelog="https://www.bearssl.org/changelog.html"
-distfiles="https://www.bearssl.org/${pkgname}-${version}.tar.gz"
+homepage="https://bearssl.org"
+changelog="${homepage}/changelog.html"
+distfiles="${homepage}/${pkgname}-${version}.tar.gz"
 checksum=6705bba1714961b41a728dfc5debbe348d2966c117649392f8c8139efc83ff14
 CFLAGS="-fPIC"
-make_build_args="D=.so.${version} LDDLL=\$(CC) LD=\$(CC) LDDLLFLAGS=-shared LDDLLFLAGS+=-Wl,-soname,libbearssl.so.0"
 
 do_install() {
 	vbin build/brssl
-	vinstall build/libbearssl.a 0644 usr/lib
-	vinstall build/libbearssl.so.${version} 0644 usr/lib
-	ln -s libbearssl.so.${version} ${DESTDIR}/usr/lib/libbearssl.so
+	vinstall "build/lib${pkgname}.a"             0644 usr/lib
+	vinstall "build/lib${pkgname}.so.${version}" 0644 usr/lib
+	ln -s "lib${pkgname}.so.${version}"     "${DESTDIR}/usr/lib/lib${pkgname}.so.${version%%.*}"
+	ln -s "lib${pkgname}.so.${version%%.*}" "${DESTDIR}/usr/lib/lib${pkgname}.so"
 	vcopy inc usr/include
 	vlicense LICENSE.txt LICENSE
 }
diff --git a/srcpkgs/beignet/patches/llvm8.patch b/srcpkgs/beignet/patches/llvm8.patch
new file mode 100644
index 00000000000..15128d1a115
--- /dev/null
+++ b/srcpkgs/beignet/patches/llvm8.patch
@@ -0,0 +1,56 @@
+From 75c152599a7c1739e6dadcdb9b377acf7e44d9cf Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Wed, 30 Jan 2019 12:42:34 +0000
+Subject: [PATCH] lang/beignet: unbreak with llvm80
+
+Regressed by https://github.com/llvm/llvm-project/commit/721d95713a9e
+
+unable to load /usr/local/lib/beignet//libgbeinterp.so which is part of the driver, please check!
+ld-elf.so.1: /usr/local/lib/beignet//libgbeinterp.so: Undefined symbol "_ZN4llvm24DisableABIBreakingChecksE"
+
+Regressed by https://github.com/llvm/llvm-project/commit/4a2d58e16acc
+
+backend/src/llvm/llvm_gen_backend.cpp:3076:5: error:
+      unknown type name 'TerminatorInst'
+    TerminatorInst *term = bb->getTerminator();
+    ^
+backend/src/llvm/llvm_gen_backend.cpp:3083:5: error:
+      unknown type name 'TerminatorInst'
+    TerminatorInst *term = bb->getTerminator();
+    ^
+
+--- backend/src/CMakeLists.txt.orig	2017-09-22 08:05:22 UTC
++++ backend/src/CMakeLists.txt
+@@ -168,6 +168,7 @@ add_dependencies(gbe beignet_bitcode)
+ endif (NOT (USE_STANDALONE_GBE_COMPILER STREQUAL "true"))
+ 
+ add_library(gbeinterp SHARED gbe_bin_interpreter.cpp)
++target_link_libraries(gbeinterp ${LLVM_MODULE_LIBS})
+ 
+ if (LLVM_VERSION_NODOT VERSION_EQUAL 34)
+   find_library(TERMINFO NAMES tinfo ncurses)
+--- backend/src/llvm/llvm_gen_backend.cpp.orig	2017-10-24 06:04:48 UTC
++++ backend/src/llvm/llvm_gen_backend.cpp
+@@ -3073,14 +3073,22 @@ namespace gbe
+ 
+ 
+   static unsigned getChildNo(BasicBlock *bb) {
++#if LLVM_VERSION_MAJOR < 8
+     TerminatorInst *term = bb->getTerminator();
++#else
++    Instruction *term = bb->getTerminator();
++#endif
+     return term->getNumSuccessors();
+   }
+ 
+   // return NULL if index out-range of children number
+   static BasicBlock *getChildPossible(BasicBlock *bb, unsigned index) {
+ 
++#if LLVM_VERSION_MAJOR < 8
+     TerminatorInst *term = bb->getTerminator();
++#else
++    Instruction *term = bb->getTerminator();
++#endif
+     unsigned childNo = term->getNumSuccessors();
+     BasicBlock *child = NULL;
+     if(index < childNo) {
diff --git a/srcpkgs/beignet/patches/llvm9.patch b/srcpkgs/beignet/patches/llvm9.patch
new file mode 100644
index 00000000000..bff503800b0
--- /dev/null
+++ b/srcpkgs/beignet/patches/llvm9.patch
@@ -0,0 +1,111 @@
+Source: FreeBSD + q66
+
+Mostly FreeBSD other than FindLLVM.cmake changes.
+Linking against clang-cpp does not work for us.
+
+--- CMake/FindLLVM.cmake
++++ CMake/FindLLVM.cmake
+@@ -140,6 +140,7 @@ add_one_lib("clangStaticAnalyzerCore")
+ add_one_lib("clangAnalysis")
+ add_one_lib("clangEdit")
+ add_one_lib("clangAST")
++add_one_lib("clangASTMatchers")
+ add_one_lib("clangParse")
+ add_one_lib("clangSema")
+ add_one_lib("clangLex")
+--- backend/src/llvm/llvm_intrinsic_lowering.cpp.orig	2017-10-24 06:04:48 UTC
++++ backend/src/llvm/llvm_intrinsic_lowering.cpp
+@@ -77,7 +77,11 @@ namespace gbe {
+         std::vector<Type *> ParamTys;
+         for (Value** I = ArgBegin; I != ArgEnd; ++I)
+           ParamTys.push_back((*I)->getType());
++#if LLVM_VERSION_MAJOR * 10 + LLVM_VERSION_MINOR >= 90
++        FunctionCallee FCache = M->getOrInsertFunction(NewFn,
++#else
+         Constant* FCache = M->getOrInsertFunction(NewFn,
++#endif
+                                         FunctionType::get(RetTy, ParamTys, false));
+ 
+         IRBuilder<> Builder(CI->getParent(), BasicBlock::iterator(CI));
+--- backend/src/llvm/llvm_sampler_fix.cpp.orig	2017-10-24 06:04:48 UTC
++++ backend/src/llvm/llvm_sampler_fix.cpp
+@@ -82,7 +82,11 @@ namespace gbe {
+ #if LLVM_VERSION_MAJOR * 10 + LLVM_VERSION_MINOR >= 40
+           Module *M = I->getParent()->getParent()->getParent();
+ #if LLVM_VERSION_MAJOR * 10 + LLVM_VERSION_MINOR >= 50
++#if LLVM_VERSION_MAJOR * 10 + LLVM_VERSION_MINOR >= 90
++          FunctionCallee samplerCvt = M->getOrInsertFunction("__gen_ocl_sampler_to_int", i32Ty, I->getOperand(0)->getType());
++#else
+           Value* samplerCvt = M->getOrInsertFunction("__gen_ocl_sampler_to_int", i32Ty, I->getOperand(0)->getType());
++#endif
+ #else
+           Value* samplerCvt = M->getOrInsertFunction("__gen_ocl_sampler_to_int", i32Ty, I->getOperand(0)->getType(), nullptr);
+ #endif
+@@ -124,7 +128,11 @@ namespace gbe {
+ #if LLVM_VERSION_MAJOR * 10 + LLVM_VERSION_MINOR >= 40
+           Module *M = I->getParent()->getParent()->getParent();
+ #if LLVM_VERSION_MAJOR * 10 + LLVM_VERSION_MINOR >= 50
++#if LLVM_VERSION_MAJOR * 10 + LLVM_VERSION_MINOR >= 90
++          FunctionCallee samplerCvt = M->getOrInsertFunction("__gen_ocl_sampler_to_int", i32Ty, I->getOperand(0)->getType());
++#else
+           Value* samplerCvt = M->getOrInsertFunction("__gen_ocl_sampler_to_int", i32Ty, I->getOperand(0)->getType());
++#endif
+ #else
+           Value* samplerCvt = M->getOrInsertFunction("__gen_ocl_sampler_to_int", i32Ty, I->getOperand(0)->getType(), nullptr);
+ #endif
+--- backend/src/llvm/llvm_profiling.cpp.orig	2017-10-24 06:04:48 UTC
++++ backend/src/llvm/llvm_profiling.cpp
+@@ -163,10 +163,18 @@ namespace gbe
+       // __gen_ocl_store_timestamp(int nth, int type);
+       Value *Args[2] = {ConstantInt::get(intTy, pointNum++), ConstantInt::get(intTy, profilingType)};
+ #if LLVM_VERSION_MAJOR * 10 + LLVM_VERSION_MINOR >= 50
++#if LLVM_VERSION_MAJOR * 10 + LLVM_VERSION_MINOR >= 90
++      builder->CreateCall(module->getOrInsertFunction(
++#else
+       builder->CreateCall(cast<llvm::Function>(module->getOrInsertFunction(
++#endif
+               "__gen_ocl_calc_timestamp", Type::getVoidTy(module->getContext()),
+               IntegerType::getInt32Ty(module->getContext()),
++#if LLVM_VERSION_MAJOR * 10 + LLVM_VERSION_MINOR >= 90
++              IntegerType::getInt32Ty(module->getContext())),
++#else
+               IntegerType::getInt32Ty(module->getContext()))),
++#endif
+               ArrayRef<Value*>(Args));
+ #else
+       builder->CreateCall(cast<llvm::Function>(module->getOrInsertFunction(
+@@ -185,10 +193,18 @@ namespace gbe
+     Value *Args2[2] = {profilingBuf, ConstantInt::get(intTy, profilingType)};
+ 
+ #if LLVM_VERSION_MAJOR * 10 + LLVM_VERSION_MINOR >= 50
++#if LLVM_VERSION_MAJOR * 10 + LLVM_VERSION_MINOR >= 90
++    builder->CreateCall(module->getOrInsertFunction(
++#else
+     builder->CreateCall(cast<llvm::Function>(module->getOrInsertFunction(
++#endif
+             "__gen_ocl_store_profiling", Type::getVoidTy(module->getContext()),
+             ptrTy,
++#if LLVM_VERSION_MAJOR * 10 + LLVM_VERSION_MINOR >= 90
++            IntegerType::getInt32Ty(module->getContext())),
++#else
+             IntegerType::getInt32Ty(module->getContext()))),
++#endif
+             ArrayRef<Value*>(Args2));
+ #else
+     builder->CreateCall(cast<llvm::Function>(module->getOrInsertFunction(
+--- backend/src/llvm/llvm_device_enqueue.cpp.orig	2017-10-24 06:04:48 UTC
++++ backend/src/llvm/llvm_device_enqueue.cpp
+@@ -398,8 +398,13 @@ namespace gbe {
+               std::vector<Type *> ParamTys;
+               for (Value** iter = args.begin(); iter != args.end(); ++iter)
+                 ParamTys.push_back((*iter)->getType());
++#if LLVM_VERSION_MAJOR * 10 + LLVM_VERSION_MINOR >= 90
++              CallInst* newCI = builder.CreateCall(mod->getOrInsertFunction(
++                              "__gen_enqueue_kernel_slm", FunctionType::get(intTy, ParamTys, false)), args);
++#else
+               CallInst* newCI = builder.CreateCall(cast<llvm::Function>(mod->getOrInsertFunction(
+                               "__gen_enqueue_kernel_slm", FunctionType::get(intTy, ParamTys, false))), args);
++#endif
+               CI->replaceAllUsesWith(newCI);
+               deadInsnSet.insert(CI);
+             }
diff --git a/srcpkgs/beignet/template b/srcpkgs/beignet/template
index f56b3d1a0ae..eedb7aef1a7 100644
--- a/srcpkgs/beignet/template
+++ b/srcpkgs/beignet/template
@@ -1,7 +1,7 @@
 # Template file for 'beignet'
 pkgname=beignet
 version=1.3.2
-revision=4
+revision=5
 archs="i686* x86_64*"
 wrksrc="Beignet-${version}-Source"
 build_style=cmake
@@ -14,7 +14,6 @@ license="LGPL-2.1-or-later"
 homepage="http://www.freedesktop.org/wiki/Software/Beignet/"
 distfiles="https://01.org/sites/default/files/${pkgname}-${version}-source.tar.gz"
 checksum=c555edba149de23243965a703f39f79fa06f15bcff5a3762b5544b0925010b43
-broken="Doesn't build against libLLVM8; can't be built against libclang 8 and libLLVM7"
 
 post_install() {
 	# remove CL headers, we do use opencl-headers instead.
diff --git a/srcpkgs/berry/patches/fix-cross.patch b/srcpkgs/berry/patches/fix-cross.patch
index a19b36dbc0a..0841ad893af 100644
--- a/srcpkgs/berry/patches/fix-cross.patch
+++ b/srcpkgs/berry/patches/fix-cross.patch
@@ -1,12 +1,3 @@
---- config.mk.orig
-+++ config.mk
-@@ -39,5 +39,5 @@
- 
- CPPFLAGS += $(NAME_DEFINES) -DSRVR_$$HOSTNAME $(DEBUG_CPPFLAGS)
- CFLAGS += -Wall -O3 $(DEBUG_CFLAGS)
--CFLAGS += -Icore -Iinclude -I/usr/include/freetype2
-+CFLAGS += -Icore -Iinclude -I$(XBPS_CROSS_BASE)/usr/include/freetype2
- LDFLAGS += -lX11 -lXrandr -lXft
 --- Makefile.orig
 +++ Makefile
 @@ -5,12 +5,12 @@
@@ -18,10 +9,19 @@
  CFLAGS?=-Os -pedantic -Wall $(NAME_DEFINES)
  
  all:
--	$(CC) $(CFLAGS) -I$(PREFIX)/include src/utils.c src/wm.c -L$(PREFIX)/lib -lX11 -lm -lXinerama -lXft -o berry
+-	$(CC) $(CFLAGS) -I$(PREFIX)/include src/utils.c src/wm.c -L$(PREFIX)/lib -lX11 -lm -lXinerama -lXft -lXext -o berry
 -	$(CC) $(CFLAGS) -I$(PREFIX)/include src/client.c -L$(PREFIX)/lib -lX11 -o berryc
-+	$(CC) $(CFLAGS) -I$(XBPS_CROSS_BASE)/$(PREFIX)/include src/utils.c src/wm.c -L$(XBPS_CROSS_BASE)/$(PREFIX)/lib -lX11 -lm -lXinerama -lXft -o berry
++	$(CC) $(CFLAGS) -I$(XBPS_CROSS_BASE)/$(PREFIX)/include src/utils.c src/wm.c -L$(XBPS_CROSS_BASE)/$(PREFIX)/lib -lX11 -lm -lXinerama -lXft -lXext -o berry
 +	$(CC) $(CFLAGS) -I$(XBPS_CROSS_BASE)/$(PREFIX)/include src/client.c -L$(XBPS_CROSS_BASE)/$(PREFIX)/lib -lX11 -o berryc
  
  install:
  	mkdir -p "$(DESTDIR)$(PREFIX)/bin"
+--- config.mk.orig
++++ config.mk
+@@ -39,5 +39,5 @@
+
+ CPPFLAGS += $(NAME_DEFINES) -DSRVR_$$HOSTNAME $(DEBUG_CPPFLAGS)
+ CFLAGS += -Wall -O3 $(DEBUG_CFLAGS)
+-CFLAGS += -Icore -Iinclude -I/usr/include/freetype2
++CFLAGS += -Icore -Iinclude -I$(XBPS_CROSS_BASE)/usr/include/freetype2
+ LDFLAGS += -lX11 -lXrandr -lXft
diff --git a/srcpkgs/berry/template b/srcpkgs/berry/template
index 49cdc814ef8..72de22c1c5d 100644
--- a/srcpkgs/berry/template
+++ b/srcpkgs/berry/template
@@ -1,16 +1,16 @@
 # Template file for 'berry'
 pkgname=berry
-version=0.1.0
+version=0.1.3
 revision=1
 build_style=gnu-makefile
 make_use_env=yes
 makedepends="libX11-devel libXinerama-devel libXft-devel freetype-devel"
 short_desc="Healthy, bite-sized window manager"
-maintainer="Andrew Benson <abenson@gmail.com>"
+maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/JLErvin/berry"
 distfiles="https://github.com/JLErvin/berry/archive/${version}.tar.gz"
-checksum=62a9e279c2029f52fb80acee3169c02de3cda8e53cf1243e6deeeca7437d1efb
+checksum=05a3b9b001ca515ded4310e358cfcd1d4b544954509f61fe40062951b57c0b87
 
 do_install() {
 	vbin berry
diff --git a/srcpkgs/bettercap/template b/srcpkgs/bettercap/template
index 55f649a982f..ce85b29756f 100644
--- a/srcpkgs/bettercap/template
+++ b/srcpkgs/bettercap/template
@@ -1,6 +1,6 @@
 # Template file for 'bettercap'
 pkgname=bettercap
-version=2.24.1
+version=2.25
 revision=1
 build_style=go
 go_import_path=github.com/bettercap/bettercap
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-3.0-only"
 homepage="https://github.com/bettercap/bettercap"
 distfiles="https://github.com/bettercap/bettercap/archive/v${version}.tar.gz"
-checksum=590cef2b2b24fd9f67c57c8cb19ab8ff08b11d43bfc23b468013ddad907bb8b8
+checksum=955b29946774bb12a757006d5518bc20e7174092c5a37f771ab1cb8d21223b6a
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64-musl) broken="fails to build" ;;
diff --git a/srcpkgs/bfs/template b/srcpkgs/bfs/template
index b900832fe8a..b1d0c7ce076 100644
--- a/srcpkgs/bfs/template
+++ b/srcpkgs/bfs/template
@@ -1,16 +1,16 @@
 # Template file for 'bfs'
 pkgname=bfs
-version=1.5
+version=1.5.1
 revision=1
 build_style=gnu-makefile
 makedepends="acl-devel libcap-devel"
 checkdepends="acl-progs"
 short_desc="Breadth-first version of the UNIX find command"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="0BSD"
 homepage="https://github.com/tavianator/bfs"
 distfiles="https://github.com/tavianator/bfs/archive/${version}.tar.gz"
-checksum=c3e595e05e014acda10487efaf74d37ef0d6459d74b3c5b976cd425b277c79c9
+checksum=28defd5f66043c5bfda8b715e9e3eac92a0a1f59b3ec39c78d527a2fb5e0735b
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/bijiben/template b/srcpkgs/bijiben/template
index b60a004ec63..43e698466ef 100644
--- a/srcpkgs/bijiben/template
+++ b/srcpkgs/bijiben/template
@@ -1,6 +1,6 @@
 # Template file for 'bijiben'
 pkgname=bijiben
-version=3.32.2
+version=3.34.1
 revision=1
 build_helper="gir"
 build_style=meson
@@ -14,5 +14,5 @@ license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Notes"
 changelog="https://raw.githubusercontent.com/GNOME/bijiben/gnome-${version%.*}/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c23bc5af5e83a85cb4fdc6873ad800c2afb48dbcadfdce7c1dfdb2a3a7131532
+checksum=fbc3c8f050aed8174358e56dcbf06857db45180ee1e1481e20110b6b25d3c279
 nocross="evolution-data-server cross"
diff --git a/srcpkgs/bind/template b/srcpkgs/bind/template
index 2a59fe39135..d9dbd327368 100644
--- a/srcpkgs/bind/template
+++ b/srcpkgs/bind/template
@@ -1,7 +1,7 @@
 # Template file for 'bind'
 pkgname=bind
 reverts="9.13.6_1"
-version=9.11.9
+version=9.11.11
 revision=1
 _fullver="${version}${_patchver:+-${_patchver}}"
 wrksrc="${pkgname}-${_fullver}"
@@ -21,7 +21,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="ISC"
 homepage="https://www.isc.org/downloads/bind/"
 distfiles="https://ftp.isc.org/isc/bind9/${_fullver}/bind-${_fullver}.tar.gz"
-checksum=963bf048354795b85b8f3dbe3ff5ba524d3f5b14b86a4cc733fcf971b43ac50e
+checksum=615230336645e494d0125a3e92cf1c0f956b7408378aca66667b44eaa9de8a6b
 
 conf_files="/etc/named/named.conf"
 system_accounts="named"
diff --git a/srcpkgs/binutils/template b/srcpkgs/binutils/template
index b6780fcd5d7..03ea951f7d1 100644
--- a/srcpkgs/binutils/template
+++ b/srcpkgs/binutils/template
@@ -1,14 +1,14 @@
 # Template file for 'binutils'
 pkgname=binutils
-version=2.32
-revision=3
+version=2.33.1
+revision=1
 bootstrap=yes
 short_desc="GNU binary utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.gnu.org/software/binutils/"
 distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.xz"
-checksum=0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
+checksum=ab66fc2d1c3ec0359b8e08843c9f33b63e8707efdff5e4cc5c200eae24722cbf
 
 if [ "$CHROOT_READY" ]; then
 	hostmakedepends="flex perl"
diff --git a/srcpkgs/binwalk/template b/srcpkgs/binwalk/template
index d7a2fbc72f7..461ea4b547a 100644
--- a/srcpkgs/binwalk/template
+++ b/srcpkgs/binwalk/template
@@ -1,18 +1,27 @@
-# Template build file for 'binwalk'.
+# Template file for 'binwalk'
 pkgname=binwalk
-version=2.1.1
-revision=4
+version=2.2.0
+revision=1
 archs=noarch
 build_style=python3-module
 pycompile_module="binwalk"
 hostmakedepends="python3"
 depends="python3"
+checkdepends="python3-nose"
 short_desc="Easy tool for analyzing/reversing/extracting firmware images"
 maintainer="Duncaen <duncaen@voidlinux.org>"
-homepage="http://www.binwalk.org"
 license="MIT"
+homepage="https://github.com/ReFirmLabs/binwalk"
 distfiles="https://github.com/ReFirmLabs/binwalk/archive/v${version}.tar.gz"
-checksum=1b70a5b03489d29f60fef18008a2164974234874faab48a4f47ec53d461d284a
+checksum=f5495f0e4c5575023d593f7c087c367675df6aeb7f4d9a2966e49763924daa27
+
+post_extract() {
+	vsed -i -e 's;/etc/bash_completion.d/%s;%s.bash;' setup.py
+}
+
+do_check() {
+	PYTHONPATH="${wrksrc}/src" python3 setup.py test
+}
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/bird/template b/srcpkgs/bird/template
index 718a927acf6..ac4a7c0bf27 100644
--- a/srcpkgs/bird/template
+++ b/srcpkgs/bird/template
@@ -1,6 +1,6 @@
 # Template file for 'bird'
 pkgname=bird
-version=2.0.5
+version=2.0.6
 revision=1
 build_style=gnu-configure
 hostmakedepends="flex autoconf"
@@ -10,7 +10,7 @@ maintainer="Philipp Hirsch <itself@hanspolo.net>"
 license="GPL-2.0-or-later"
 homepage="https://bird.network.cz"
 distfiles="ftp://bird.network.cz/pub/bird/bird-${version}.tar.gz"
-checksum=4e4b736fd26579823a728be6a7746b3f525206e3c9a4a21fccb302cffd3029d3
+checksum=90934cce6ae90039ab1e58ade223935f9221a7e5eac05df6fb53045b77bfd3aa
 
 conf_files="/etc/bird.conf"
 system_accounts="_bird"
diff --git a/srcpkgs/bison/template b/srcpkgs/bison/template
index 005c9f270c8..2f8067783c4 100644
--- a/srcpkgs/bison/template
+++ b/srcpkgs/bison/template
@@ -1,6 +1,6 @@
 # Template file for 'bison'
 pkgname=bison
-version=3.4.1
+version=3.4.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="help2man perl m4"
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.gnu.org/software/bison/bison.html"
 distfiles="${GNU_SITE}/bison/bison-${version}.tar.xz"
-checksum=27159ac5ebf736dffd5636fd2cd625767c9e437de65baa63cb0de83570bd820d
+checksum=27d05534699735dc69e86add5b808d6cb35900ad3fd63fa82e3eb644336abfa0
 alternatives="
  yacc:yacc:/usr/bin/bison-yacc
  yacc:yacc.1:/usr/share/man/man1/bison-yacc.1"
diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index 9312239a209..b91af62be02 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,7 +1,7 @@
 # Template file for 'bitcoin'
 pkgname=bitcoin
-version=0.18.0
-revision=2
+version=0.18.1
+revision=1
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --disable-ccache --disable-static
  --enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr"
@@ -15,7 +15,7 @@ homepage="https://bitcoin.org/"
 distfiles="https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz
  https://raw.github.com/bitcoin-core/packaging/master/debian/bitcoin-qt.desktop
  https://raw.github.com/bitcoin/bitcoin/v${version}/share/pixmaps/bitcoin128.png"
-checksum="5e4e6890e07b620a93fdb24605dae2bb53e8435b2a93d37558e1db1913df405f
+checksum="5c7d93f15579e37aa2d1dc79e8f5ac675f59045fceddf604ae0f1550eb03bf96
  0a46bbadda140599e807be38999e6848c89f9c3523d26fede02d34d62d50f632
  ad880c8459ecfdb96abe6a4689af06bdd27906e0edcd39d0915482f2da91e722"
 conflicts="litecoin>=0" # Both provide libbitcoinconsensus.so.0
diff --git a/srcpkgs/bitlbee-facebook/template b/srcpkgs/bitlbee-facebook/template
index 4eae30b1c51..052a896f72c 100644
--- a/srcpkgs/bitlbee-facebook/template
+++ b/srcpkgs/bitlbee-facebook/template
@@ -1,10 +1,11 @@
 # Template file for 'bitlbee-facebook'
 pkgname=bitlbee-facebook
 version=1.2.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="libtool automake pkg-config glib-devel"
 makedepends="bitlbee-devel json-glib-devel"
+depends="bitlbee"
 short_desc="Facebook protocol plugin for BitlBee"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
diff --git a/srcpkgs/blackbox_exporter/template b/srcpkgs/blackbox_exporter/template
index a827ce5c2f2..2915315437b 100644
--- a/srcpkgs/blackbox_exporter/template
+++ b/srcpkgs/blackbox_exporter/template
@@ -1,6 +1,6 @@
 # Template file for 'blackbox_exporter'
 pkgname=blackbox_exporter
-version=0.14.0
+version=0.15.1
 revision=1
 build_style=go
 go_import_path="github.com/prometheus/blackbox_exporter"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="https://prometheus.io"
 changelog="https://github.com/prometheus/blackbox_exporter/releases"
 distfiles="https://github.com/prometheus/blackbox_exporter/archive/v${version}.tar.gz"
-checksum=25528cfd51ed95ff70e41f44670193f045b6107e803c1c2d30fc71aae5a8c711
+checksum=5873b6fef45f3fca67036f837a8b6191eace3cb722ad301919bfa8a4d120e24f
 
 system_accounts="_bbox_exporter"
 
diff --git a/srcpkgs/blender/patches/altivec-all.patch b/srcpkgs/blender/patches/altivec-all.patch
new file mode 100644
index 00000000000..115e1ea6fd0
--- /dev/null
+++ b/srcpkgs/blender/patches/altivec-all.patch
@@ -0,0 +1,32 @@
+This applies a better workaround for C++ type conflicts
+in AltiVec/C++, allowing it to build on BE ppc(64).
+
+--- a/extern/clew/include/clew.h
++++ b/extern/clew/include/clew.h
+@@ -370,15 +370,18 @@ typedef unsigned int cl_GLenum;
+ 
+ /* Define basic vector types */
+ /* Workaround for ppc64el platform: conflicts with bool from C++. */
+-#if defined( __VEC__ ) && !(defined(__PPC64__) && defined(__LITTLE_ENDIAN__))
++#if defined(__VEC__)
+    #include <altivec.h>   /* may be omitted depending on compiler. AltiVec spec provides no way to detect whether the header is required. */
+-   typedef vector unsigned char     __cl_uchar16;
+-   typedef vector signed char       __cl_char16;
+-   typedef vector unsigned short    __cl_ushort8;
+-   typedef vector signed short      __cl_short8;
+-   typedef vector unsigned int      __cl_uint4;
+-   typedef vector signed int        __cl_int4;
+-   typedef vector float             __cl_float4;
++   #undef vector
++   #undef bool
++   #undef pixel
++   typedef __vector unsigned char     __cl_uchar16;
++   typedef __vector signed char       __cl_char16;
++   typedef __vector unsigned short    __cl_ushort8;
++   typedef __vector signed short      __cl_short8;
++   typedef __vector unsigned int      __cl_uint4;
++   typedef __vector signed int        __cl_int4;
++   typedef __vector float             __cl_float4;
+    #define  __CL_UCHAR16__  1
+    #define  __CL_CHAR16__   1
+    #define  __CL_USHORT8__  1
diff --git a/srcpkgs/blender/patches/gcc9-elbeem.patch b/srcpkgs/blender/patches/gcc9-elbeem.patch
new file mode 100644
index 00000000000..26c58e7d988
--- /dev/null
+++ b/srcpkgs/blender/patches/gcc9-elbeem.patch
@@ -0,0 +1,31 @@
+https://bugs.gentoo.org/685922
+
+--- a/intern/elbeem/intern/solver_main.cpp
++++ b/intern/elbeem/intern/solver_main.cpp
+@@ -381,7 +381,7 @@ LbmFsgrSolver::mainLoop(const int lev)
+ 	GRID_REGION_INIT();
+ #if PARALLEL==1
+ 	const int gDebugLevel = ::gDebugLevel;
+-#pragma omp parallel default(none) num_threads(mNumOMPThreads) \
++#pragma omp parallel default(none) firstprivate(gDebugLevel,iend,lev,cutConst) num_threads(mNumOMPThreads) \
+   reduction(+: \
+ 	  calcCurrentMass,calcCurrentVolume, \
+ 		calcCellsFilled,calcCellsEmptied, \
+@@ -1126,7 +1126,7 @@ LbmFsgrSolver::preinitGrids()
+ 		GRID_REGION_INIT();
+ #if PARALLEL==1
+ 	const int gDebugLevel = ::gDebugLevel;
+-#pragma omp parallel default(none) num_threads(mNumOMPThreads) \
++#pragma omp parallel default(none) firstprivate(gDebugLevel,iend,lev) num_threads(mNumOMPThreads) \
+   reduction(+: \
+ 	  calcCurrentMass,calcCurrentVolume, \
+ 		calcCellsFilled,calcCellsEmptied, \
+@@ -1164,7 +1164,7 @@ LbmFsgrSolver::standingFluidPreinit()
+ 	GRID_REGION_INIT();
+ #if PARALLEL==1
+ 	const int gDebugLevel = ::gDebugLevel;
+-#pragma omp parallel default(none) num_threads(mNumOMPThreads) \
++#pragma omp parallel default(none) firstprivate(gDebugLevel,iend,lev) num_threads(mNumOMPThreads) \
+   reduction(+: \
+ 	  calcCurrentMass,calcCurrentVolume, \
+ 		calcCellsFilled,calcCellsEmptied, \
diff --git a/srcpkgs/bluedevil/template b/srcpkgs/bluedevil/template
index abb64eb503f..612d4da35bf 100644
--- a/srcpkgs/bluedevil/template
+++ b/srcpkgs/bluedevil/template
@@ -1,6 +1,6 @@
 # Template file for 'bluedevil'
 pkgname=bluedevil
-version=5.16.4
+version=5.17.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/plasma/bluedevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=36eaff3da49104fb4ca8de32c2cd42657af7cde94f54c95bacf5abd6c1d39521
+checksum=c4576b72dead133483e8faab787ea5daf96217216b324df529ca5381a5aac929
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"
diff --git a/srcpkgs/blueman/template b/srcpkgs/blueman/template
index f59d3ccb980..83f9b899583 100644
--- a/srcpkgs/blueman/template
+++ b/srcpkgs/blueman/template
@@ -1,7 +1,7 @@
 # Template file for 'blueman'
 pkgname=blueman
 version=2.1.1
-revision=1
+revision=2
 build_style=gnu-configure
 pycompile_module="blueman"
 configure_args="--disable-static"
@@ -20,3 +20,7 @@ conf_files="/etc/dbus-1/system.d/org.blueman.Mechanism.conf"
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" glib-devel python3-devel"
 fi
+
+post_install() {
+	rm -rf ${DESTDIR}/usr/lib/systemd
+}
diff --git a/srcpkgs/bluez-qt5/template b/srcpkgs/bluez-qt5/template
index d739ac2f454..53d3b214cb6 100644
--- a/srcpkgs/bluez-qt5/template
+++ b/srcpkgs/bluez-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'bluez-qt5'
 pkgname=bluez-qt5
-version=5.61.0
+version=5.63.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://cgit.kde.org/bluez-qt.git"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=0ea647de61fcc18a85c660fa8e05fe93072a713a8d00a018ba8e99ea790e5d27
+checksum=b0114b2f0605973b67cdc89ab2037a78d088abecab28597364352df859aa2a9d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/bluez/files/bluetooth-meshd/run b/srcpkgs/bluez/files/bluetooth-meshd/run
new file mode 100755
index 00000000000..752dbcc37bf
--- /dev/null
+++ b/srcpkgs/bluez/files/bluetooth-meshd/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+sv check dbus >/dev/null || exit 1
+exec /usr/libexec/bluetooth/bluetooth-meshd --nodetach >/dev/null
diff --git a/srcpkgs/bluez/patches/0001-Allow-using-obexd-without-systemd-in-the-user-session.patch b/srcpkgs/bluez/patches/0001-Allow-using-obexd-without-systemd-in-the-user-session.patch
deleted file mode 100644
index 15da2636673..00000000000
--- a/srcpkgs/bluez/patches/0001-Allow-using-obexd-without-systemd-in-the-user-session.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 3027cb7141fb65cf3eeda69c688db8c4045e2d3f Mon Sep 17 00:00:00 2001
-From: Giovanni Campagna <gcampagna-cNUdlRotFMnNLxjTenLetw@public.gmane.org>
-Date: Sat, 12 Oct 2013 17:45:25 +0200
-Subject: [PATCH] Allow using obexd without systemd in the user session
-
-Not all sessions run systemd --user (actually, the majority
-doesn't), so the dbus daemon must be able to spawn obexd
-directly, and to do so it needs the full path of the daemon.
----
- Makefile.obexd                      | 4 ++--
- obexd/src/org.bluez.obex.service    | 4 ----
- obexd/src/org.bluez.obex.service.in | 4 ++++
- 3 files changed, 6 insertions(+), 6 deletions(-)
- delete mode 100644 obexd/src/org.bluez.obex.service
- create mode 100644 obexd/src/org.bluez.obex.service.in
-
-diff --git a/Makefile.obexd b/Makefile.obexd
-index 3760867..142e7c3 100644
---- Makefile.obexd
-+++ Makefile.obexd
-@@ -2,12 +2,12 @@
- if SYSTEMD
- systemduserunitdir = @SYSTEMD_USERUNITDIR@
- systemduserunit_DATA = obexd/src/obex.service
-+endif
- 
- dbussessionbusdir = @DBUS_SESSIONBUSDIR@
- dbussessionbus_DATA = obexd/src/org.bluez.obex.service
--endif
- 
--EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service
-+EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service.in
- 
- obex_plugindir = $(libdir)/obex/plugins
- 
-diff --git a/obexd/src/org.bluez.obex.service b/obexd/src/org.bluez.obex.service
-deleted file mode 100644
-index a538088..0000000
---- obexd/src/org.bluez.obex.service
-+++ /dev/null
-@@ -1,4 +0,0 @@
--[D-BUS Service]
--Name=org.bluez.obex
--Exec=/bin/false
--SystemdService=dbus-org.bluez.obex.service
-diff --git a/obexd/src/org.bluez.obex.service.in b/obexd/src/org.bluez.obex.service.in
-new file mode 100644
-index 0000000..9c815f2
---- /dev/null
-+++ obexd/src/org.bluez.obex.service.in
-@@ -0,0 +1,4 @@
-+[D-BUS Service]
-+Name=org.bluez.obex
-+Exec=@libexecdir@/obexd
-+SystemdService=dbus-org.bluez.obex.service
--- 
-1.8.3.1
-
-
diff --git a/srcpkgs/bluez/patches/0001-enable-dbus-without-systemd.patch b/srcpkgs/bluez/patches/0001-enable-dbus-without-systemd.patch
new file mode 100644
index 00000000000..5b9c7dc708c
--- /dev/null
+++ b/srcpkgs/bluez/patches/0001-enable-dbus-without-systemd.patch
@@ -0,0 +1,34 @@
+From 2625ab38ae27754205d060f09e3a18f7648d5167 Mon Sep 17 00:00:00 2001
+From: Doan Tran Cong Danh <congdanhqx@gmail.com>
+Date: Thu, 3 Oct 2019 12:57:09 +0700
+Subject: [PATCH 1/9] enable dbus without systemd
+
+---
+ Makefile.am | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 404e6a460..0884156fa 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -40,14 +40,14 @@ conf_DATA =
+ 
+ statedir = $(localstatedir)/lib/bluetooth
+ state_DATA =
++
++dbussystembusdir = $(DBUS_SYSTEMBUSDIR)
++dbussystembus_DATA = src/org.bluez.service
+ endif
+ 
+ if SYSTEMD
+ systemdsystemunitdir = $(SYSTEMD_SYSTEMUNITDIR)
+ systemdsystemunit_DATA = src/bluetooth.service
+-
+-dbussystembusdir = $(DBUS_SYSTEMBUSDIR)
+-dbussystembus_DATA = src/org.bluez.service
+ endif
+ 
+ EXTRA_DIST += src/bluetooth.service.in src/org.bluez.service
+-- 
+2.23.0
+
diff --git a/srcpkgs/bluez/patches/0002-allow-obexd-on-non-systemd-system.patch b/srcpkgs/bluez/patches/0002-allow-obexd-on-non-systemd-system.patch
new file mode 100644
index 00000000000..4ea752cd685
--- /dev/null
+++ b/srcpkgs/bluez/patches/0002-allow-obexd-on-non-systemd-system.patch
@@ -0,0 +1,54 @@
+From 82099f711ecd8281cebad23b53aadb8c875bc235 Mon Sep 17 00:00:00 2001
+From: Doan Tran Cong Danh <congdanhqx@gmail.com>
+Date: Thu, 3 Oct 2019 12:57:55 +0700
+Subject: [PATCH 2/9] allow obexd on non-systemd system
+
+---
+ Makefile.obexd                                              | 6 +++---
+ .../{org.bluez.obex.service => org.bluez.obex.service.in}   | 2 +-
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+ rename obexd/src/{org.bluez.obex.service => org.bluez.obex.service.in} (74%)
+
+diff --git a/Makefile.obexd b/Makefile.obexd
+index d36874770..c9996288c 100644
+--- a/Makefile.obexd
++++ b/Makefile.obexd
+@@ -1,12 +1,12 @@
+ if SYSTEMD
+ systemduserunitdir = $(SYSTEMD_USERUNITDIR)
+ systemduserunit_DATA = obexd/src/obex.service
++endif
+ 
+ dbussessionbusdir = $(DBUS_SESSIONBUSDIR)
+ dbussessionbus_DATA = obexd/src/org.bluez.obex.service
+-endif
+ 
+-EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service
++EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service.in
+ 
+ if OBEX
+ 
+@@ -106,6 +106,6 @@ obexd/src/plugin.$(OBJEXT): obexd/src/builtin.h
+ obexd/src/builtin.h: obexd/src/genbuiltin $(obexd_builtin_sources)
+ 	$(AM_V_GEN)$(srcdir)/obexd/src/genbuiltin $(obexd_builtin_modules) > $@
+ 
+-CLEANFILES += obexd/src/builtin.h $(builtin_files) obexd/src/obex.service
++CLEANFILES += obexd/src/builtin.h $(builtin_files) obexd/src/obex.service obexd/src/org.bluez.obex.service
+ 
+ EXTRA_DIST += obexd/src/genbuiltin
+diff --git a/obexd/src/org.bluez.obex.service b/obexd/src/org.bluez.obex.service.in
+similarity index 74%
+rename from obexd/src/org.bluez.obex.service
+rename to obexd/src/org.bluez.obex.service.in
+index a53808884..543d7bc07 100644
+--- a/obexd/src/org.bluez.obex.service
++++ b/obexd/src/org.bluez.obex.service.in
+@@ -1,4 +1,4 @@
+ [D-BUS Service]
+ Name=org.bluez.obex
+-Exec=/bin/false
++Exec=@pkglibexecdir@/obexd
+ SystemdService=dbus-org.bluez.obex.service
+-- 
+2.23.0
+
diff --git a/srcpkgs/bluez/patches/0002-bluetoothd-dbus-service.patch b/srcpkgs/bluez/patches/0002-bluetoothd-dbus-service.patch
deleted file mode 100644
index b7856185dff..00000000000
--- a/srcpkgs/bluez/patches/0002-bluetoothd-dbus-service.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- Makefile.am.orig	2014-07-30 12:30:56.483179384 +0200
-+++ Makefile.am	2014-07-30 12:31:30.858387791 +0200
-@@ -39,14 +39,14 @@ conf_DATA =
- 
- statedir = $(localstatedir)/lib/bluetooth
- state_DATA =
-+
-+dbussystembusdir = @DBUS_SYSTEMBUSDIR@
-+dbussystembus_DATA = src/org.bluez.service
- endif
- 
- if SYSTEMD
- systemdsystemunitdir = @SYSTEMD_SYSTEMUNITDIR@
- systemdsystemunit_DATA = src/bluetooth.service
--
--dbussystembusdir = @DBUS_SYSTEMBUSDIR@
--dbussystembus_DATA = src/org.bluez.service
- endif
- 
- EXTRA_DIST += src/bluetooth.service.in src/org.bluez.service
diff --git a/srcpkgs/bluez/patches/0003-allow-mesh-on-non-systemd-system.patch b/srcpkgs/bluez/patches/0003-allow-mesh-on-non-systemd-system.patch
new file mode 100644
index 00000000000..2cf6f73442d
--- /dev/null
+++ b/srcpkgs/bluez/patches/0003-allow-mesh-on-non-systemd-system.patch
@@ -0,0 +1,29 @@
+From 32a425c3f9b42a55824c044a6b486c9c12e65a65 Mon Sep 17 00:00:00 2001
+From: Doan Tran Cong Danh <congdanhqx@gmail.com>
+Date: Thu, 3 Oct 2019 12:58:18 +0700
+Subject: [PATCH 3/9] allow mesh on non-systemd system
+
+---
+ Makefile.mesh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.mesh b/Makefile.mesh
+index 90979cbc0..9e6e2c2ca 100644
+--- a/Makefile.mesh
++++ b/Makefile.mesh
+@@ -2,11 +2,11 @@ if MESH
+ 
+ if DATAFILES
+ dbus_DATA += mesh/bluetooth-mesh.conf
++dbussystembus_DATA += mesh/org.bluez.mesh.service
+ endif
+ 
+ if SYSTEMD
+ systemdsystemunit_DATA += mesh/bluetooth-mesh.service
+-dbussystembus_DATA += mesh/org.bluez.mesh.service
+ endif
+ 
+ mesh_sources = mesh/mesh.h mesh/mesh.c \
+-- 
+2.23.0
+
diff --git a/srcpkgs/bluez/patches/0003-bluetooth-group-can-use-bluez.patch b/srcpkgs/bluez/patches/0003-bluetooth-group-can-use-bluez.patch
deleted file mode 100644
index 7a72e60944e..00000000000
--- a/srcpkgs/bluez/patches/0003-bluetooth-group-can-use-bluez.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/bluetooth.conf
-+++ src/bluetooth.conf
-@@ -28,6 +28,10 @@
-     <allow send_destination="org.bluez"/>
-   </policy>
- 
-+  <policy group="bluetooth">
-+    <allow send_destination="org.bluez"/>
-+  </policy>
-+
-   <!-- allow users of lp group (printing subsystem) to 
-        communicate with bluetoothd -->
-   <policy group="lp">
diff --git a/srcpkgs/bluez/patches/0004-include-sys-time.h-for-musl-build.patch b/srcpkgs/bluez/patches/0004-include-sys-time.h-for-musl-build.patch
new file mode 100644
index 00000000000..1cd573cc039
--- /dev/null
+++ b/srcpkgs/bluez/patches/0004-include-sys-time.h-for-musl-build.patch
@@ -0,0 +1,129 @@
+From 2a2eb634d481ab4eed0a444321dc12338de96d6a Mon Sep 17 00:00:00 2001
+From: Doan Tran Cong Danh <congdanhqx@gmail.com>
+Date: Thu, 3 Oct 2019 12:59:56 +0700
+Subject: [PATCH 4/9] include sys/time.h for musl build
+
+---
+ mesh/appkey.c         | 1 +
+ mesh/crypto.c         | 1 +
+ mesh/friend.c         | 1 +
+ mesh/manager.c        | 1 +
+ mesh/mesh.c           | 1 +
+ mesh/net.c            | 2 +-
+ mesh/pb-adv.c         | 1 +
+ mesh/prov-acceptor.c  | 1 +
+ mesh/prov-initiator.c | 1 +
+ 9 files changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/mesh/appkey.c b/mesh/appkey.c
+index 6c65454c1..a455c83b6 100644
+--- a/mesh/appkey.c
++++ b/mesh/appkey.c
+@@ -22,6 +22,7 @@
+ #endif
+ 
+ #define _GNU_SOURCE
++#include <sys/time.h>
+ #include <ell/ell.h>
+ 
+ #include "mesh/mesh-defs.h"
+diff --git a/mesh/crypto.c b/mesh/crypto.c
+index cebdffe45..e1689c6d7 100644
+--- a/mesh/crypto.c
++++ b/mesh/crypto.c
+@@ -24,6 +24,7 @@
+ #define _GNU_SOURCE
+ #include <unistd.h>
+ #include <sys/socket.h>
++#include <sys/time.h>
+ #include <ell/ell.h>
+ 
+ #include <linux/if_alg.h>
+diff --git a/mesh/friend.c b/mesh/friend.c
+index da2772870..ee48a3cc7 100644
+--- a/mesh/friend.c
++++ b/mesh/friend.c
+@@ -21,6 +21,7 @@
+ #include <config.h>
+ #endif
+ 
++#include <sys/time.h>
+ #include <ell/ell.h>
+ 
+ #include "mesh/mesh-defs.h"
+diff --git a/mesh/manager.c b/mesh/manager.c
+index 501ec10fe..6b6219c56 100644
+--- a/mesh/manager.c
++++ b/mesh/manager.c
+@@ -22,6 +22,7 @@
+ #endif
+ 
+ #define _GNU_SOURCE
++#include <sys/time.h>
+ #include <ell/ell.h>
+ 
+ #include "mesh/mesh-defs.h"
+diff --git a/mesh/mesh.c b/mesh/mesh.c
+index b660a7ef2..3ea8b2cb4 100644
+--- a/mesh/mesh.c
++++ b/mesh/mesh.c
+@@ -22,6 +22,7 @@
+ #endif
+ 
+ #define _GNU_SOURCE
++#include <sys/time.h>
+ #include <ell/ell.h>
+ 
+ #include "mesh/mesh-io.h"
+diff --git a/mesh/net.c b/mesh/net.c
+index 2785039db..740e3c3af 100644
+--- a/mesh/net.c
++++ b/mesh/net.c
+@@ -22,7 +22,7 @@
+ #endif
+ 
+ #define _GNU_SOURCE
+-
++#include <sys/time.h>
+ #include <ell/ell.h>
+ 
+ #include "mesh/mesh-defs.h"
+diff --git a/mesh/pb-adv.c b/mesh/pb-adv.c
+index 6b4a70052..481f4ac8d 100644
+--- a/mesh/pb-adv.c
++++ b/mesh/pb-adv.c
+@@ -21,6 +21,7 @@
+ #include <config.h>
+ #endif
+ 
++#include <sys/time.h>
+ #include <ell/ell.h>
+ 
+ #include "mesh/mesh-defs.h"
+diff --git a/mesh/prov-acceptor.c b/mesh/prov-acceptor.c
+index 57eb1e750..50989b217 100644
+--- a/mesh/prov-acceptor.c
++++ b/mesh/prov-acceptor.c
+@@ -21,6 +21,7 @@
+ #include <config.h>
+ #endif
+ 
++#include <sys/time.h>
+ #include <ell/ell.h>
+ 
+ #include "src/shared/ecc.h"
+diff --git a/mesh/prov-initiator.c b/mesh/prov-initiator.c
+index eb59f53f1..65cf194e6 100644
+--- a/mesh/prov-initiator.c
++++ b/mesh/prov-initiator.c
+@@ -21,6 +21,7 @@
+ #include <config.h>
+ #endif
+ 
++#include <sys/time.h>
+ #include <ell/ell.h>
+ 
+ #include "src/shared/ecc.h"
+-- 
+2.23.0
+
diff --git a/srcpkgs/bluez/patches/0005-include-limits.h-for-musl-build.patch b/srcpkgs/bluez/patches/0005-include-limits.h-for-musl-build.patch
new file mode 100644
index 00000000000..0de1d253c1f
--- /dev/null
+++ b/srcpkgs/bluez/patches/0005-include-limits.h-for-musl-build.patch
@@ -0,0 +1,66 @@
+From 9ac712db3c9913d6e00635e120d77541dcc51b6b Mon Sep 17 00:00:00 2001
+From: Doan Tran Cong Danh <congdanhqx@gmail.com>
+Date: Thu, 3 Oct 2019 13:00:13 +0700
+Subject: [PATCH 5/9] include limits.h for musl build
+
+---
+ mesh/keyring.c          | 2 +-
+ mesh/mesh-config-json.c | 1 +
+ mesh/node.c             | 1 +
+ mesh/util.c             | 1 +
+ 4 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/mesh/keyring.c b/mesh/keyring.c
+index 3a7f92f9f..d5765983c 100644
+--- a/mesh/keyring.c
++++ b/mesh/keyring.c
+@@ -24,9 +24,9 @@
+ #define _GNU_SOURCE
+ #include <fcntl.h>
+ #include <dirent.h>
++#include <limits.h>
+ #include <stdio.h>
+ #include <unistd.h>
+-#include <dirent.h>
+ 
+ #include <sys/stat.h>
+ 
+diff --git a/mesh/mesh-config-json.c b/mesh/mesh-config-json.c
+index cafa2fdd7..74ca49590 100644
+--- a/mesh/mesh-config-json.c
++++ b/mesh/mesh-config-json.c
+@@ -27,6 +27,7 @@
+ #include <fcntl.h>
+ #include <ftw.h>
+ #include <libgen.h>
++#include <limits.h>
+ #include <stdio.h>
+ #include <string.h>
+ #include <unistd.h>
+diff --git a/mesh/node.c b/mesh/node.c
+index b6824f505..15dcb977f 100644
+--- a/mesh/node.c
++++ b/mesh/node.c
+@@ -23,6 +23,7 @@
+ 
+ #define _GNU_SOURCE
+ #include <dirent.h>
++#include <limits.h>
+ #include <stdio.h>
+ #include <sys/time.h>
+ 
+diff --git a/mesh/util.c b/mesh/util.c
+index 1455bdec3..e441a2ed8 100644
+--- a/mesh/util.c
++++ b/mesh/util.c
+@@ -24,6 +24,7 @@
+ #define _GNU_SOURCE
+ #include <dirent.h>
+ #include <ftw.h>
++#include <limits.h>
+ #include <stdio.h>
+ #include <time.h>
+ #include <sys/time.h>
+-- 
+2.23.0
+
diff --git a/srcpkgs/bluez/patches/musl.patch b/srcpkgs/bluez/patches/0006-musl-fix.patch
similarity index 52%
rename from srcpkgs/bluez/patches/musl.patch
rename to srcpkgs/bluez/patches/0006-musl-fix.patch
index 033a1165fd5..ab0a588137e 100644
--- a/srcpkgs/bluez/patches/musl.patch
+++ b/srcpkgs/bluez/patches/0006-musl-fix.patch
@@ -1,10 +1,20 @@
+From d1d8408c9a7c7b5ffa30371f246cc18085e11313 Mon Sep 17 00:00:00 2001
+From: Doan Tran Cong Danh <congdanhqx@gmail.com>
+Date: Thu, 3 Oct 2019 13:00:27 +0700
+Subject: [PATCH 6/9] musl fix
+
 Including <linux/if_bridge.h> causes the inclusion of <linux/in6.h>,
 which defines 'struct in6_addr', already defined in <netinet/in.h>.
 Remove <linux/if_bridge.h> to fix musl build.
+---
+ tools/bneptest.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
 
---- tools/bneptest.c.orig	2015-07-30 21:17:18.000000000 +0200
-+++ tools/bneptest.c	2017-03-01 19:27:43.579458817 +0100
-@@ -36,7 +36,6 @@
+diff --git a/tools/bneptest.c b/tools/bneptest.c
+index 8bc7596b6..6b3956cfa 100644
+--- a/tools/bneptest.c
++++ b/tools/bneptest.c
+@@ -37,7 +37,6 @@
  #include <net/if.h>
  #include <linux/sockios.h>
  #include <netinet/in.h>
@@ -12,7 +22,7 @@ Remove <linux/if_bridge.h> to fix musl build.
  
  #include <glib.h>
  
-@@ -50,6 +49,9 @@
+@@ -51,6 +50,9 @@
  #include "lib/bnep.h"
  #include "profiles/network/bnep.h"
  
@@ -22,3 +32,6 @@ Remove <linux/if_bridge.h> to fix musl build.
  enum {
  	MODE_LISTEN,
  	MODE_CONNECT,
+-- 
+2.23.0
+
diff --git a/srcpkgs/bluez/patches/0007-include-string.h.patch b/srcpkgs/bluez/patches/0007-include-string.h.patch
new file mode 100644
index 00000000000..e1cff41df49
--- /dev/null
+++ b/srcpkgs/bluez/patches/0007-include-string.h.patch
@@ -0,0 +1,25 @@
+From fe1a76a03b9cbc28621d53680eb9ff4a2bd31778 Mon Sep 17 00:00:00 2001
+From: Doan Tran Cong Danh <congdanhqx@gmail.com>
+Date: Thu, 3 Oct 2019 16:31:01 +0700
+Subject: [PATCH 7/9] include string.h
+
+---
+ android/client/if-hf-client.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/android/client/if-hf-client.c b/android/client/if-hf-client.c
+index f701a814c..b44eb4291 100644
+--- a/android/client/if-hf-client.c
++++ b/android/client/if-hf-client.c
+@@ -16,6 +16,8 @@
+  */
+ 
+ #define _GNU_SOURCE
++#include <string.h>
++
+ #include "if-main.h"
+ #include "../hal-utils.h"
+ 
+-- 
+2.23.0
+
diff --git a/srcpkgs/bluez/patches/0008-grant-permission-to-bluetooth-group.patch b/srcpkgs/bluez/patches/0008-grant-permission-to-bluetooth-group.patch
new file mode 100644
index 00000000000..ec8a1f554af
--- /dev/null
+++ b/srcpkgs/bluez/patches/0008-grant-permission-to-bluetooth-group.patch
@@ -0,0 +1,27 @@
+From 05853e46e66868228468fc73d86f221b12edaef1 Mon Sep 17 00:00:00 2001
+From: Doan Tran Cong Danh <congdanhqx@gmail.com>
+Date: Fri, 4 Oct 2019 11:36:47 +0700
+Subject: [PATCH 8/9] grant permission to bluetooth group
+
+---
+ src/bluetooth.conf | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/bluetooth.conf b/src/bluetooth.conf
+index 8a1e25801..75dd7d670 100644
+--- a/src/bluetooth.conf
++++ b/src/bluetooth.conf
+@@ -22,6 +22,10 @@
+     <allow send_interface="org.mpris.MediaPlayer2.Player"/>
+   </policy>
+ 
++  <policy group="bluetooth">
++    <allow send_destination="org.bluez"/>
++  </policy>
++
+   <policy context="default">
+     <allow send_destination="org.bluez"/>
+   </policy>
+-- 
+2.23.0
+
diff --git a/srcpkgs/bluez/patches/0009-adapter-Don-t-refresh-adv_manager-for-non-LE-devices.patch b/srcpkgs/bluez/patches/0009-adapter-Don-t-refresh-adv_manager-for-non-LE-devices.patch
new file mode 100644
index 00000000000..b78dd879800
--- /dev/null
+++ b/srcpkgs/bluez/patches/0009-adapter-Don-t-refresh-adv_manager-for-non-LE-devices.patch
@@ -0,0 +1,51 @@
+From 3b357802d24ae4f918a1b001b6930280909ef87e Mon Sep 17 00:00:00 2001
+From: "antoine.belvire@laposte.net" <antoine.belvire@laposte.net>
+Date: Tue, 27 Mar 2018 20:30:26 +0200
+Subject: [PATCH 9/9] adapter: Don't refresh adv_manager for non-LE devices
+
+btd_adv_manager_refresh is called upon MGMT_SETTING_DISCOVERABLE setting change
+but as only LE adapters have an adv_manager, this leads to segmentation fault
+for non-LE devices:
+
+0  btd_adv_manager_refresh (manager=0x0) at src/advertising.c:1176
+1  0x0000556fe45fcb02 in settings_changed (settings=<optimized out>,
+    adapter=0x556fe53f7c70) at src/adapter.c:543
+2  new_settings_callback (index=<optimized out>, length=<optimized out>,
+    param=<optimized out>, user_data=0x556fe53f7c70) at src/adapter.c:573
+3  0x0000556fe462c278 in request_complete (mgmt=mgmt@entry=0x556fe53f20c0,
+    status=<optimized out>, opcode=opcode@entry=7, index=index@entry=0,
+    length=length@entry=4, param=0x556fe53eb5f9) at src/shared/mgmt.c:261
+4  0x0000556fe462cd9d in can_read_data (io=<optimized out>,
+    user_data=0x556fe53f20c0) at src/shared/mgmt.c:353
+5  0x0000556fe46396e3 in watch_callback (channel=<optimized out>,
+    cond=<optimized out>, user_data=<optimized out>)
+    at src/shared/io-glib.c:170
+6  0x00007fe351c980e5 in g_main_context_dispatch ()
+   from /usr/lib64/libglib-2.0.so.0
+7  0x00007fe351c984b0 in ?? () from /usr/lib64/libglib-2.0.so.0
+8  0x00007fe351c987c2 in g_main_loop_run () from /usr/lib64/libglib-2.0.so.0
+9  0x0000556fe45abc75 in main (argc=<optimized out>, argv=<optimized out>)
+    at src/main.c:770
+
+This commit prevents the call to btd_adv_manager_refresh for non-LE devices.
+---
+ src/adapter.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/adapter.c b/src/adapter.c
+index cef25616f..17018ecac 100644
+--- a/src/adapter.c
++++ b/src/adapter.c
+@@ -546,7 +546,8 @@ static void settings_changed(struct btd_adapter *adapter, uint32_t settings)
+ 		g_dbus_emit_property_changed(dbus_conn, adapter->path,
+ 					ADAPTER_INTERFACE, "Discoverable");
+ 		store_adapter_info(adapter);
+-		btd_adv_manager_refresh(adapter->adv_manager);
++		if (adapter->supported_settings & MGMT_SETTING_LE)
++			btd_adv_manager_refresh(adapter->adv_manager);
+ 	}
+ 
+ 	if (changed_mask & MGMT_SETTING_BONDABLE) {
+-- 
+2.23.0
+
diff --git a/srcpkgs/bluez/template b/srcpkgs/bluez/template
index c096e8386f7..9286b93a542 100644
--- a/srcpkgs/bluez/template
+++ b/srcpkgs/bluez/template
@@ -1,21 +1,33 @@
 # Template file for 'bluez'
 pkgname=bluez
-version=5.50
-revision=5
+version=5.51
+revision=1
 build_style=gnu-configure
 configure_args="--with-udevdir=/usr/lib/udev --disable-systemd
- --enable-sixaxis --enable-threads --enable-library --enable-deprecated"
+ --enable-sixaxis --enable-threads --enable-library --enable-deprecated
+ $(vopt_enable mesh) $(vopt_enable nfc)"
 hostmakedepends="automake flex libtool pkg-config"
 makedepends="cups-devel eudev-libudev-devel libglib-devel libical-devel
- readline-devel"
+ readline-devel $(vopt_if mesh json-c-devel)"
 short_desc="Bluetooth tools and daemons"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Doan Tran Cong Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://www.bluez.org/"
 distfiles="${KERNEL_SITE}/bluetooth/$pkgname-$version.tar.xz"
-checksum=5ffcaae18bbb6155f1591be8c24898dc12f062075a40b538b745bfd477481911
+checksum=ebedfb359f62957940822f1d0b39fcee30422380e435608dad06bb3913d5ebba
 conf_files="/etc/bluetooth/main.conf"
 system_groups="bluetooth"
+build_options="mesh nfc"
+patch_args="-Np1"
+
+post_patch() {
+	find android -name '*.h' -exec \
+		sed -i\
+			-e 's/__BEGIN_DECLS/#ifdef __cplusplus\nextern "C" {\n#endif/' \
+			-e 's/__END_DECLS/#ifdef __cplusplus\n}\n#endif/' \
+			-e '/#include .sys\/cdefs.h/d' \
+			{} +
+}
 
 pre_configure() {
 	autoreconf -fi
@@ -24,6 +36,9 @@ pre_configure() {
 post_install() {
 	vinstall ${wrksrc}/src/main.conf 644 etc/bluetooth
 	vsv bluetoothd
+	if [ $build_option_mesh ]; then
+		vsv bluetooth-meshd
+	fi
 }
 
 libbluetooth_package() {
@@ -68,4 +83,3 @@ bluez-deprecated_package() {
 		vmove usr/share/man/man1/sdptool.1
 	}
 }
-
diff --git a/srcpkgs/bogofilter/template b/srcpkgs/bogofilter/template
index ffa878f9cc8..6a804e5c649 100644
--- a/srcpkgs/bogofilter/template
+++ b/srcpkgs/bogofilter/template
@@ -1,18 +1,18 @@
 # Template file for 'bogofilter'
 pkgname=bogofilter
-version=1.2.4
-revision=4
+version=1.2.5
+revision=1
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/${pkgname} --with-database=sqlite"
 hostmakedepends="perl"
-depends="perl"
 makedepends="gsl-devel sqlite-devel"
-short_desc="A fast Bayesian spam filtering tool"
+depends="perl"
+short_desc="Fast Bayesian spam filtering tool"
 maintainer="Gour <gour@atmarama.net>"
-license="GPL-3"
+license="GPL-3.0-only"
 homepage="http://bogofilter.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=d2f2598d1300307209b7b1905cc0637d2d053c0a4701a8d44383867299578471
+distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
+checksum=3248a1373bff552c500834adbea4b6caee04224516ae581fb25a4c6a6dee89ea
 
 conf_files="/etc/bogofilter/bogofilter.cf"
 
diff --git a/srcpkgs/boinc/template b/srcpkgs/boinc/template
index 85315678f0e..ad3ac3a55f5 100644
--- a/srcpkgs/boinc/template
+++ b/srcpkgs/boinc/template
@@ -1,7 +1,7 @@
 # Template file for 'boinc'
 pkgname=boinc
-version=7.14.2
-revision=3
+version=7.16.3
+revision=1
 _majorver=${version%.*}
 wrksrc=boinc-client_release-${_majorver}-${version}
 build_style=gnu-configure
@@ -19,7 +19,7 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="LGPL-3.0-or-later"
 homepage="https://boinc.berkeley.edu/"
 distfiles="https://github.com/BOINC/boinc/archive/client_release/${_majorver}/${version}.tar.gz>boinc-${version}.tar.gz"
-checksum=970aedb9e25afa20be67f125ab05435df8eb2e66a3ac30ad316c54085e397c88
+checksum=622ce3335a01ef30add4813c0cc7b65cffcaa5500a7f58f77748d0dbc80e6b06
 conflicts="boinc-nox>=0"
 
 CXXFLAGS="-Wno-redundant-decls"
diff --git a/srcpkgs/borgmatic/template b/srcpkgs/borgmatic/template
index 6ddb713e591..8ef7c0568a6 100644
--- a/srcpkgs/borgmatic/template
+++ b/srcpkgs/borgmatic/template
@@ -1,6 +1,6 @@
 # Template file for 'borgmatic'
 pkgname=borgmatic
-version=1.3.14
+version=1.3.24
 revision=1
 archs=noarch
 build_style=python3-module
@@ -15,7 +15,7 @@ maintainer="Renato Aguiar <renato@renag.me>"
 license="GPL-3.0-only"
 homepage="https://torsion.org/borgmatic/"
 distfiles="${PYPI_SITE}/b/borgmatic/borgmatic-${version}.tar.gz"
-checksum=4fbb7a0f3a32ee0ebdd6f6a982f7ced00ec92205176cbe1cfeaa780466716bdc
+checksum=ca49f15e0eab8650550ce031a9c71a547acaaff15abd3448a6a2e55ca09e83ca
 
 do_check() {
 	# The tests use the NEWS file to get version and checks against
diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template
index 0d2f0021391..2e8da6f872a 100644
--- a/srcpkgs/botan/template
+++ b/srcpkgs/botan/template
@@ -1,7 +1,7 @@
 # Template file for 'botan'
 pkgname=botan
-version=2.10.0
-revision=2
+version=2.12.1
+revision=1
 wrksrc="${pkgname^}-${version}"
 build_style=gnu-makefile
 pycompile_module="botan.py"
@@ -11,8 +11,8 @@ short_desc="Crypto library written in C++"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="BSD-2-Clause"
 homepage="https://botan.randombit.net/"
-distfiles="https://botan.randombit.net/releases/Botan-${version}.tgz"
-checksum=88481997578c27924724fea76610d43d9f59c99edfe561d41803bbc98871ad31
+distfiles="https://botan.randombit.net/releases/Botan-${version}.tar.xz"
+checksum=7e035f142a51fca1359705792627a282456d49749bf62a37a8e48375d41baaa9
 
 python_version=2
 
@@ -20,7 +20,7 @@ LDFLAGS="-pthread"
 CXXFLAGS="-O3"
 
 do_configure() {
-	local _args _arch _cpu
+	local _args _cpu
 
 	_args="--prefix=/usr"
 	_args+=" --os=linux"
@@ -36,48 +36,44 @@ do_configure() {
 	case "$XBPS_TARGET_MACHINE" in
 	i686*)
 		_cpu="i686"
-		_arch="x86"
 		;;
 	x86_64*)
 		_cpu="x86_64"
-		_arch="x86"
 		;;
 	armv5*)
 		_cpu="arm"
-		_arch="armv5te"
 		_args+=" --disable-modules=simd"
 		;;
 	armv6*)
 		_cpu="arm"
-		_arch="armv6"
 		_args+=" --disable-modules=simd"
 		;;
 	armv7*)
 		_cpu="armv7-a"
-		_arch="armv7"
 		_args+=" --disable-modules=simd"
 		;;
 	aarch64*)
 		_cpu="armv8-a"
-		_arch="arm64"
 		;;
 	mips*)
 		_cpu="mips32"
-		_arch="mips"
 		;;
 	ppc64le*)
 		_cpu="ppc64le"
-		_arch="ppc64le"
 		;;
 	ppc64*)
 		_cpu="ppc64"
-		_arch="ppc64"
+		;;
+	ppc*)
+		_cpu="ppc"
+		;;
+	*)
+		_cpu="${XBPS_TARGET_MACHINE%-musl}"
 		;;
 	esac
 
 	python2 configure.py \
 		--distribution-info="Void Linux botan-${version}_${revision}" \
-		--cc-abi-flags="-std=c++14" \
 		--cpu=${_cpu} \
 		${_args}
 }
diff --git a/srcpkgs/bpftrace/template b/srcpkgs/bpftrace/template
index cac5b779664..56d673d38e5 100644
--- a/srcpkgs/bpftrace/template
+++ b/srcpkgs/bpftrace/template
@@ -1,7 +1,7 @@
 # Template file for 'bpftrace'
 pkgname=bpftrace
 version=0.9.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"  # needs root to run
 hostmakedepends="pkg-config flex"
diff --git a/srcpkgs/breeze-gtk/template b/srcpkgs/breeze-gtk/template
index 9911b616943..e114ade1943 100644
--- a/srcpkgs/breeze-gtk/template
+++ b/srcpkgs/breeze-gtk/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-gtk'
 pkgname=breeze-gtk
-version=5.16.4
+version=5.17.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules sassc python3 python3-cairo"
@@ -10,7 +10,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/plasma/breeze-gtk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=8c954a8754bc75b2d8edff70a7b322c559da6e23dc75e1ed616ac926fbe186eb
+checksum=bba00e94bad2b6f9baae19b1edba076785f45a94b591dd4b34f7b9104348cc3a
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel"
diff --git a/srcpkgs/breeze-icons/template b/srcpkgs/breeze-icons/template
index 512daf7ad2c..884d465a884 100644
--- a/srcpkgs/breeze-icons/template
+++ b/srcpkgs/breeze-icons/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-icons'
 pkgname=breeze-icons
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel libxml2"
@@ -10,7 +10,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-3.0-or-later"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1d260a01a2617f5f755d2eb38423af19bf4a1a2ccfa9339b441b4f6be6381c30
+checksum=25a5b55e5be0fc3df837e0dd8f6721bfcbb30ed94be6ac92c88523485ba2719e
 
 if [ -z "$CROSS_BUILD" ]; then
 	configure_args="-DBINARY_ICONS_RESOURCE=ON"
diff --git a/srcpkgs/breeze/template b/srcpkgs/breeze/template
index 41d10059cd7..7bdb56fa3ef 100644
--- a/srcpkgs/breeze/template
+++ b/srcpkgs/breeze/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze'
 pkgname=breeze
-version=5.16.4
+version=5.17.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/plasma/breeze"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=84fea0c31a41521983698ad2aed603b5e2c6e4f6e8723e2c64c66c37eb2a5395
+checksum=9d32ceffe33b776fcb7ec92d99088503a97c49e4b6216153438d5f7b93af8345
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/brig/template b/srcpkgs/brig/template
index 72f627b5127..59dcd0ceba6 100644
--- a/srcpkgs/brig/template
+++ b/srcpkgs/brig/template
@@ -5,7 +5,7 @@ revision=1
 build_style=go
 go_import_path=github.com/sahib/brig
 short_desc="File synchronization on top of IPFS with git-like interface and WebUI"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-or-later"
 homepage="https://brig.readthedocs.io/en/master/"
 distfiles="https://github.com/sahib/brig/archive/v${version}.tar.gz"
diff --git a/srcpkgs/brisk-menu/patches/69fa052df45c1fa439f6af0a2c8e9795087b9444.patch b/srcpkgs/brisk-menu/patches/69fa052df45c1fa439f6af0a2c8e9795087b9444.patch
deleted file mode 100644
index 4b2bd478c8a..00000000000
--- a/srcpkgs/brisk-menu/patches/69fa052df45c1fa439f6af0a2c8e9795087b9444.patch
+++ /dev/null
@@ -1,185 +0,0 @@
-From 3cab9d1fc7b2ca500c7d3276e17b256f395e0126 Mon Sep 17 00:00:00 2001
-From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-Date: Fri, 19 Jan 2018 22:57:26 +0100
-Subject: [PATCH 1/2] Reliably fix parallel builds of brisk-menu.
-
-  - Move brisk-glue .xml files to data/ and ...
-  - process them in an earlier stage of the build
-
- Fixes solus-project/brisk-menu#73.
----
- data/meson.build                              | 16 ++++++++
- .../org.gnome.SessionManager.xml              |  0
- .../session => data}/org.mate.ScreenSaver.xml |  0
- src/frontend/meson.build                      |  1 +
- src/meson.build                               | 28 +++++++++++--
- src/session/meson.build                       | 40 -------------------
- 6 files changed, 42 insertions(+), 43 deletions(-)
- rename {src/session => data}/org.gnome.SessionManager.xml (100%)
- rename {src/session => data}/org.mate.ScreenSaver.xml (100%)
- delete mode 100644 src/session/meson.build
-
-diff --git data/meson.build data/meson.build
-index 609ff27..aa450e8 100644
---- data/meson.build
-+++ data/meson.build
-@@ -12,6 +12,22 @@ brisk_resources = gnome.compile_resources(
-     ],
- )
- 
-+# libsaver_glue provides dbus code for the MATE screensaver
-+libsaver_glue = gnome.gdbus_codegen(
-+    'libsaver-glue',
-+    'org.mate.ScreenSaver.xml',
-+    interface_prefix : 'org.mate.',
-+    namespace : 'Mate',
-+)
-+
-+# libsession_glue provides dbus code for the MATE/GNOME session
-+libsession_glue = gnome.gdbus_codegen(
-+    'libsession-glue',
-+    'org.gnome.SessionManager.xml',
-+    interface_prefix : 'org.gnome.',
-+    namespace : 'Gnome',
-+)
-+
- icons = [
-     'brisk_system-log-out-symbolic.svg',
- ]
-diff --git src/session/org.gnome.SessionManager.xml data/org.gnome.SessionManager.xml
-similarity index 100%
-rename from src/session/org.gnome.SessionManager.xml
-rename to data/org.gnome.SessionManager.xml
-diff --git src/session/org.mate.ScreenSaver.xml data/org.mate.ScreenSaver.xml
-similarity index 100%
-rename from src/session/org.mate.ScreenSaver.xml
-rename to data/org.mate.ScreenSaver.xml
-diff --git src/frontend/meson.build src/frontend/meson.build
-index 624b590..31e2f17 100644
---- src/frontend/meson.build
-+++ src/frontend/meson.build
-@@ -30,6 +30,7 @@ libfrontend_dependencies = [
- 
- libfrontend_includes = [
-     include_directories('.'),
-+    include_directories('../../data'),
- ]
- 
- # Contains the main Brisk UI (Windowed)
-diff --git src/meson.build src/meson.build
-index 7c26b57..0f29a58 100644
---- src/meson.build
-+++ src/meson.build
-@@ -18,15 +18,37 @@ link_libresources = declare_dependency(
-     ],
- )
- 
-+# Build the Cs into a simple static library and control compiler noise
-+libsession_stub = static_library(
-+    'brisk-glue',
-+    sources: [
-+        libsaver_glue,
-+        libsession_glue,
-+    ],
-+    c_args: [
-+        '-Wno-unused-parameter',
-+    ],
-+    dependencies: dep_gio_unix,
-+    install: false,
-+)
-+
-+# Allow linking to the stub
-+link_libsession_stub = declare_dependency(
-+    link_with: libsession_stub,
-+    dependencies: [
-+        dep_gio_unix,
-+    ],
-+    include_directories: [
-+        include_directories('.'),
-+    ],
-+)
-+
- # Build common library (currently just keybinder really.)
- subdir('lib')
- 
- # Build the backend component
- subdir('backend')
- 
--# Build session glue to help the frontend out
--subdir('session')
--
- # Now build our main UI
- subdir('frontend')
- 
-diff --git src/session/meson.build src/session/meson.build
-deleted file mode 100644
-index 5b38bdc..0000000
---- src/session/meson.build
-+++ /dev/null
-@@ -1,40 +0,0 @@
--# libsaver_glue provides dbus code for the MATE screensaver
--libsaver_glue = gnome.gdbus_codegen(
--    'libsaver-glue',
--    'org.mate.ScreenSaver.xml',
--    interface_prefix : 'org.mate.',
--    namespace : 'Mate',
--)
--
--# libsession_glue provides dbus code for the MATE/GNOME session
--libsession_glue = gnome.gdbus_codegen(
--    'libsession-glue',
--    'org.gnome.SessionManager.xml',
--    interface_prefix : 'org.gnome.',
--    namespace : 'Gnome',
--)
--
--# Build the Cs into a simple static library and control compiler noise
--libsession_stub = static_library(
--    'brisk-glue',
--    sources: [
--        libsaver_glue,
--        libsession_glue,
--    ],
--    c_args: [
--        '-Wno-unused-parameter',
--    ],
--    dependencies: dep_gio_unix,
--    install: false,
--)
--
--# Allow linking to the stub
--link_libsession_stub = declare_dependency(
--    link_with: libsession_stub,
--    dependencies: [
--        dep_gio_unix,
--    ],
--    include_directories: [
--        include_directories('.'),
--    ],
--)
-
-From 2309dab7ee5cce419c02038092a075096a89ff88 Mon Sep 17 00:00:00 2001
-From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-Date: Fri, 19 Jan 2018 23:01:46 +0100
-Subject: [PATCH 2/2] src/mesa.build: Fix build against GLib << 2.51.3.
-
-  - This patch is not hurting builds against newer GLib versions.
-  - For details, see https://github.com/mesonbuild/meson/issues/1387
----
- src/meson.build | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git src/meson.build src/meson.build
-index 0f29a58..7d8ca3f 100644
---- src/meson.build
-+++ src/meson.build
-@@ -30,6 +30,9 @@ libsession_stub = static_library(
-     ],
-     dependencies: dep_gio_unix,
-     install: false,
-+    include_directories: [
-+        include_directories('..'),
-+    ],
- )
- 
- # Allow linking to the stub
diff --git a/srcpkgs/brisk-menu/template b/srcpkgs/brisk-menu/template
index 67c0d1fa881..f440391e26e 100644
--- a/srcpkgs/brisk-menu/template
+++ b/srcpkgs/brisk-menu/template
@@ -1,6 +1,6 @@
 # Template file for 'brisk-menu'
 pkgname=brisk-menu
-version=0.5.0
+version=0.6.1
 revision=1
 wrksrc="${pkgname}-v${version}"
 build_style=meson
@@ -9,10 +9,10 @@ makedepends="gtk+3-devel mate-menus-devel libmate-panel-devel libnotify-devel"
 depends="mate-panel"
 short_desc="Modern, efficient menu for the MATE DE"
 maintainer="Jasu Koponen <jasu.koponen@hotmail.com>"
-license="GPL-2, CC-BY-SA-4.0"
-homepage="https://github.com/solus-project/brisk-menu"
+license="GPL-2.0-only, CC-BY-SA-4.0"
+homepage="https://github.com/getsolus/brisk-menu"
 distfiles="${homepage}/releases/download/v${version}/${pkgname}-v${version}.tar.xz"
-checksum=1377ffbb784e576c290bb4d11a2dd376bc0ad017bb9f56a080bccdbc4fbe88ce
+checksum=9cf9ae307a780afe5b808b8233ac85ecf948f846efbcfb60a6adcc8fd77017aa
 
 post_install() {
 	vlicense LICENSE.CC-BY-SA-4.0
diff --git a/srcpkgs/bro/template b/srcpkgs/bro/template
index 95552592e28..0d65960711e 100644
--- a/srcpkgs/bro/template
+++ b/srcpkgs/bro/template
@@ -1,6 +1,6 @@
 # Template file for 'bro'
 pkgname=bro
-version=2.6.3
+version=2.6.4
 revision=1
 build_style=cmake
 hostmakedepends="flex pkg-config python3"
@@ -10,7 +10,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.bro.org"
 distfiles="https://www.bro.org/downloads/bro-${version}.tar.gz"
-checksum=469dd7456af388ba65d8722fbfdd5b9182f14def16149aa5ebceb1cfd881697f
+checksum=a47a9cdcef0ea14d5f70c390ab266f0333063ff96f3869a5f1609581a1d1ceb7
 nocross="Needs to build part of itself to run, can't be built separately yet."
 
 case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/broot/template b/srcpkgs/broot/template
index b4da3bf687a..b18675c1743 100644
--- a/srcpkgs/broot/template
+++ b/srcpkgs/broot/template
@@ -1,6 +1,6 @@
 # Template file for 'broot'
 pkgname=broot
-version=0.9.3
+version=0.9.6
 revision=1
 build_style=cargo
 short_desc="Interactive directory tree view, fuzzy search, balanced BFS descent"
@@ -8,7 +8,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://dystroy.org/broot/"
 distfiles="https://github.com/Canop/broot/archive/v${version}.tar.gz"
-checksum=@6d681c9336277dd8d13ba2238809b5ed2c0004a45c9574b50cbc4c7f2ce59c21
+checksum=af8b36d5d4242ec1bd86925f0f664a610e7e94309686ef0874df6bc0867a0c3e
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/brother-brlaser/template b/srcpkgs/brother-brlaser/template
index e2b22b19b23..9e67aa9d44c 100644
--- a/srcpkgs/brother-brlaser/template
+++ b/srcpkgs/brother-brlaser/template
@@ -1,6 +1,6 @@
 # Template file for 'brother-brlaser'
 pkgname=brother-brlaser
-version=5
+version=6
 revision=1
 wrksrc="brlaser-${version}"
 build_style=cmake
@@ -11,4 +11,4 @@ maintainer="Jaredy <jaredycalves@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/pdewacht/brlaser"
 distfiles="https://github.com/pdewacht/brlaser/archive/v${version}.tar.gz"
-checksum=0848513c03a789a450b9115419a24a43c92bcc2eb41203a7c5ea3c0a76ac52d2
+checksum=fe7c117eb7e837b6a1751f61a813c218f68a5d8fc40f3403f6a4b1cf5a4758dd
diff --git a/srcpkgs/bs1770gain/template b/srcpkgs/bs1770gain/template
index 772f2c33212..60efd328e4a 100644
--- a/srcpkgs/bs1770gain/template
+++ b/srcpkgs/bs1770gain/template
@@ -1,7 +1,9 @@
 # Template file for 'bs1770gain'
 pkgname=bs1770gain
-version=0.5.2
+version=0.6.4
 revision=1
+# bgx.c:29:10: fatal error: gnu/libc-version.h: No such file or directory
+archs="~*-musl"
 build_style=gnu-configure
 makedepends="ffmpeg-devel sox-devel"
 short_desc="Loudness scanner compliant with ITU-R BS.1770"
@@ -9,4 +11,4 @@ maintainer="Michal Koutenský <koutak.m@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://bs1770gain.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=73e5738786b57afb89582333ed18206fd2c6d5245717d3b24ace7f7670f9dedc
+checksum=24cf866748c78bc103a5f53c1af958531357b55bd945ee9e26f8c86445163515
diff --git a/srcpkgs/bsdunzip/template b/srcpkgs/bsdunzip/template
index 450efc1e69e..dd02386b3e0 100644
--- a/srcpkgs/bsdunzip/template
+++ b/srcpkgs/bsdunzip/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-makefile
 makedepends="libarchive-devel"
 short_desc="Libarchive(3)-utilizing unzip implementation from FreeBSD"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD, ISC"
 homepage="https://github.com/somasis/bsdunzip"
 distfiles="https://github.com/somasis/bsdunzip/archive/${version}.tar.gz"
diff --git a/srcpkgs/bspwm/template b/srcpkgs/bspwm/template
index c8b7e959ab3..df8fdee1f5f 100644
--- a/srcpkgs/bspwm/template
+++ b/srcpkgs/bspwm/template
@@ -1,6 +1,6 @@
 # Template file for 'bspwm'
 pkgname=bspwm
-version=0.9.8
+version=0.9.9
 revision=1
 makedepends="xcb-util-wm-devel xcb-util-keysyms-devel"
 short_desc="Tiling window manager based on binary space partitioning"
@@ -8,7 +8,7 @@ maintainer="Nathan Owens <ndowens04@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://github.com/baskerville/bspwm"
 distfiles="https://github.com/baskerville/bspwm/archive/${version}.tar.gz"
-checksum=8bf670227b3e3c91b94df0834daf2b3da36bbac196c5bcc65353b3eb5983afa6
+checksum=b1438c3cad13b6101edb31ce8d00ba4ed2f972754e85b90f763e04fa5143c6fc
 
 do_build() {
 	make CC=$CC
diff --git a/srcpkgs/btfs/template b/srcpkgs/btfs/template
index 7419009970f..cac840fda33 100644
--- a/srcpkgs/btfs/template
+++ b/srcpkgs/btfs/template
@@ -1,19 +1,17 @@
 # Template file for 'btfs'
 pkgname=btfs
-version=2.19
+version=2.20
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake pkg-config"
-makedepends="boost-devel libcurl-devel libtorrent-rasterbar-devel fuse-devel"
-depends="python"
+makedepends="boost-devel fuse-devel libcurl-devel libtorrent-rasterbar-devel"
+depends="python3"
 short_desc="Bittorrent filesystem based on FUSE"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Daniel Eyßer <daniel.eysser@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/johang/btfs"
 distfiles="https://github.com/johang/btfs/archive/v${version}.tar.gz"
-checksum=678831788e3b5e24f674adf87618353bea935fb418d512f17aabe3244f06b7e1
-
-CXXFLAGS="-std=c++11"
+checksum=ab85d10407d210c367dc5a0db6aa9e8620ebbb819c58da783ca343dfa8577441
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/btrfs-progs/template b/srcpkgs/btrfs-progs/template
index 729425bafcd..8a525ea0af0 100644
--- a/srcpkgs/btrfs-progs/template
+++ b/srcpkgs/btrfs-progs/template
@@ -1,6 +1,6 @@
 # Template file for 'btrfs-progs'
 pkgname=btrfs-progs
-version=5.2.1
+version=5.2.2
 revision=1
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
@@ -15,7 +15,7 @@ license="GPL-2.0-only, LGPL-3.0-or-later"
 homepage="https://btrfs.wiki.kernel.org/index.php/Main_Page"
 changelog="https://raw.githubusercontent.com/kdave/btrfs-progs/master/CHANGES"
 distfiles="${KERNEL_SITE}/kernel/people/kdave/${pkgname}/${pkgname}-v${version}.tar.xz"
-checksum=36ac4a0198ffff79d5800c537ea4b19769a8fd3ad870f75413d25b20e2d83233
+checksum=821321dbf17087e1172023fa35656ce52d342fbfe210fb8ea01fc57b65dfb1c6
 
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh
diff --git a/srcpkgs/buildah/template b/srcpkgs/buildah/template
index d852dccf93f..2145d41023d 100644
--- a/srcpkgs/buildah/template
+++ b/srcpkgs/buildah/template
@@ -1,6 +1,6 @@
 # Template file for 'buildah'
 pkgname=buildah
-version=1.10.1
+version=1.11.3
 revision=1
 build_style=go
 go_import_path=github.com/containers/buildah
@@ -15,7 +15,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://github.com/containers/buildah"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=02dc74649a2341d355281911ee5a8e4801165192e4419627513698ab129c9e78
+checksum=a3df3f87aa06e322f8fb5f61337cffa2c57ad4fca6b49ed9431b3275b52131a5
 
 post_build() {
 	make -C docs GOMD2MAN=go-md2man
diff --git a/srcpkgs/buildbot/template b/srcpkgs/buildbot/template
index c753cd7c502..9bee50ec737 100644
--- a/srcpkgs/buildbot/template
+++ b/srcpkgs/buildbot/template
@@ -1,7 +1,8 @@
 # Template file for 'buildbot'
 pkgname=buildbot
+reverts="2.4.1_1"
 version=0.8.14
-revision=3
+revision=4
 archs=noarch
 build_style=python2-module
 pycompile_module="buildbot"
diff --git a/srcpkgs/bum/template b/srcpkgs/bum/template
index 7bf9c33f47e..58d0bb2b7f7 100644
--- a/srcpkgs/bum/template
+++ b/srcpkgs/bum/template
@@ -8,7 +8,7 @@ pycompile_module="bum"
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-mpd2 python3-musicbrainzngs python3-mpv"
 short_desc="Daemon that downloads and displays album arts via MPD events"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/dylanaraps/bum"
 distfiles="https://github.com/dylanaraps/bum/archive/${version}.tar.gz"
diff --git a/srcpkgs/bvi/template b/srcpkgs/bvi/template
index 476935bd33e..b31f4fc737e 100644
--- a/srcpkgs/bvi/template
+++ b/srcpkgs/bvi/template
@@ -1,12 +1,12 @@
 # Template file for 'bvi'
 pkgname=bvi
-version=1.4.0
+version=1.4.1
 revision=1
 build_style=gnu-configure
 makedepends="ncurses-devel"
-short_desc="A display-oriented editor for binary files"
+short_desc="Display-oriented editor for binary files"
 maintainer="oliver <ohemming@gmail.com>"
-license="GPL-2"
+license="GPL-3.0-or-later"
 homepage="http://bvi.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.src.tar.gz"
-checksum=015a3c2832c7c097d98a5527deef882119546287ba8f2a70c736227d764ef802
+checksum=3035255ca79e0464567d255baa5544f7794e2b7eb791dcc60cc339cf1aa01e28
diff --git a/srcpkgs/cJSON/template b/srcpkgs/cJSON/template
index e15f0252e7f..98595580c23 100644
--- a/srcpkgs/cJSON/template
+++ b/srcpkgs/cJSON/template
@@ -4,7 +4,7 @@ version=1.7.12
 revision=1
 build_style=cmake
 short_desc="Ultralightweight JSON parser in ANSI C"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/DaveGamble/cJSON"
 distfiles="https://github.com/DaveGamble/cJSON/archive/v${version}.tar.gz"
diff --git a/srcpkgs/caddy/template b/srcpkgs/caddy/template
index 5a647aca447..e863de20f2f 100644
--- a/srcpkgs/caddy/template
+++ b/srcpkgs/caddy/template
@@ -1,6 +1,6 @@
 # Template file for 'caddy'
 pkgname=caddy
-version=1.0.1
+version=1.0.3
 revision=1
 build_style=go
 go_import_path=github.com/caddyserver/caddy
@@ -11,7 +11,7 @@ maintainer="Dominic Monroe <monroef4@googlemail.com>"
 license="Apache-2.0"
 homepage="https://caddyserver.com"
 distfiles="https://github.com/caddyserver/caddy/archive/v${version}.tar.gz"
-checksum=7cbd80c798a0db4195381f730f5409680c6e1239fbc06295b90b34f666a05692
+checksum=c1c7b337a5008d28c1956fd4f057104a78d0e24b74c30867cea988369b61fed3
 
 system_accounts="caddy"
 make_dirs="
diff --git a/srcpkgs/cage/template b/srcpkgs/cage/template
new file mode 100644
index 00000000000..eca84c1dacc
--- /dev/null
+++ b/srcpkgs/cage/template
@@ -0,0 +1,18 @@
+# Template file for 'cage'
+pkgname=cage
+version=0.1.1
+revision=1
+build_style=meson
+hostmakedepends="pkg-config wayland-devel"
+makedepends="libxkbcommon-devel pixman-devel wayland-devel wlroots-devel"
+short_desc="Kiosk compositor for Wayland"
+maintainer="Illia Shestakov <ishestakov@airmail.cc>"
+license="MIT"
+homepage="https://www.hjdskes.nl/projects/cage/"
+distfiles="https://github.com/Hjdskes/cage/archive/v${version}.tar.gz"
+checksum=63efbe96cf307381f2bedf9b80153343e255970a70d612515da7dc325dd49478
+
+post_install() {
+	vlicense LICENSE
+	vdoc README.md
+}
diff --git a/srcpkgs/caja-extensions/template b/srcpkgs/caja-extensions/template
index dd5d680d6f3..cb7f942eb7b 100644
--- a/srcpkgs/caja-extensions/template
+++ b/srcpkgs/caja-extensions/template
@@ -1,6 +1,6 @@
 # Template file for 'caja-extensions'
 pkgname=caja-extensions
-version=1.22.0
+version=1.22.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-gksu"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://mate-desktop.org"
 distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=779c237f7e922c877f7884a0201cb54da9c8f30c414a7ee297178fd6aa3406c1
+checksum=d0845b6f2921ee7b7c951d4490a4fd7166f90b85f60a22aef77c75b53fbcf077
 
 caja-image-converter_package() {
 	short_desc="Caja extension for simple image conversions"
diff --git a/srcpkgs/caja/template b/srcpkgs/caja/template
index b190ff7fad1..71f867920a0 100644
--- a/srcpkgs/caja/template
+++ b/srcpkgs/caja/template
@@ -1,6 +1,6 @@
 # Template file for 'caja'
 pkgname=caja
-version=1.22.1
+version=1.22.2
 revision=1
 build_style=gnu-configure
 build_helper="gir"
@@ -17,7 +17,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://mate-desktop.org"
 distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3b26efd276c68a579db443ea1f85a270cd33c59284667d5db8d5d355a3f46781
+checksum=b09cfd068da3789fddd564afb7117ed874472e97c9d2f3ceb7a7fd8b16c9beb0
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/calcurse/patches/DST-fix-date-change.patch b/srcpkgs/calcurse/patches/DST-fix-date-change.patch
new file mode 100644
index 00000000000..6ecadfd49bc
--- /dev/null
+++ b/srcpkgs/calcurse/patches/DST-fix-date-change.patch
@@ -0,0 +1,34 @@
+From d6fd07785fe8072e6bbadc173e9d6a2e73efdcdd Mon Sep 17 00:00:00 2001
+From: Lars Henriksen <LarsHenriksen@get2net.dk>
+Date: Thu, 1 Aug 2019 07:19:14 +0200
+Subject: DST: fix date_change() thoroughly
+
+Explicit setting of Daylight Saving Time should be avoided before as well as
+after the mktime() call.
+
+Signed-off-by: Lars Henriksen <LarsHenriksen@get2net.dk>
+Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
+---
+ src/utils.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/utils.c b/src/utils.c
+index 8a8de75..a9a9e68 100644
+--- src/utils.c
++++ src/utils.c
+@@ -525,10 +525,11 @@ int date_change(struct tm *date, int delta_month, int delta_day)
+ 	t = *date;
+ 	t.tm_mon += delta_month;
+ 	t.tm_mday += delta_day;
+-
++	t.tm_isdst = -1;
+ 	if (mktime(&t) == -1) {
+ 		return 1;
+ 	} else {
++		t.tm_isdst = -1;
+ 		*date = t;
+ 		return 0;
+ 	}
+-- 
+cgit v1.2.1
+
diff --git a/srcpkgs/calcurse/template b/srcpkgs/calcurse/template
index b1c5e29ba2c..4508aba0a1f 100644
--- a/srcpkgs/calcurse/template
+++ b/srcpkgs/calcurse/template
@@ -1,7 +1,7 @@
 # Template file for 'calcurse'
 pkgname=calcurse
 version=4.5.0
-revision=1
+revision=2
 build_style=gnu-configure
 makedepends="ncurses-devel"
 depends="python3-httplib2"
diff --git a/srcpkgs/calendarsupport/template b/srcpkgs/calendarsupport/template
index 50c165c8161..ab5e828cacb 100644
--- a/srcpkgs/calendarsupport/template
+++ b/srcpkgs/calendarsupport/template
@@ -1,6 +1,6 @@
 # Template file for 'calendarsupport'
 pkgname=calendarsupport
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig python3 qt5-host-tools qt5-qmake
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/applications/${version}/src/calendarsupport-${version}.tar.xz"
-checksum=af590cf5443c1205a8bd59d00c430bbdf65a185a36ed36e92e6ef78bba8551e4
+checksum=9ae448463ca60e075f1ea9a22489f0acf6ea672c00f9bd7b49027e548e82c2af
 
 calendarsupport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index 43ff96d668b..dce942cf36f 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,29 +1,30 @@
 # Template file for 'calibre'
 pkgname=calibre
-version=3.46.0
+version=4.1.0
 revision=1
 build_style=python2-module
 pycompile_dirs="/usr/lib/calibre/"
 make_build_args="gui"
 hostmakedepends="pkg-config python-BeautifulSoup4 python-Pillow python-PyQt5-svg
- python-PyQt5-webkit python-apsw python-css-parser python-dateutil
+ python-PyQt5-webengine python-apsw python-css-parser python-dateutil
  python-devel python-html5-parser python-msgpack python-regex qt5-qmake
  xdg-utils"
 makedepends="glib-devel libchmlib-devel libinput-devel libmagick-devel libmtp-devel
  libpodofo-devel libwmf-devel libxkbcommon-devel python-PyQt5-devel
- qt5-devel sqlite-devel tslib-devel qt5-webkit-devel"
+ qt5-devel sqlite-devel tslib-devel hunspell-devel"
 depends="desktop-file-utils optipng poppler-utils python-BeautifulSoup4
  python-CherryPy python-Markdown python-Pillow python-PyQt5-svg
- python-PyQt5-webkit python-Pygments python-apsw python-css-parser
- python-cssselect python-dateutil python-dbus python-dnspython
- python-feedparser python-html5-parser python-mechanize python-msgpack
- python-netifaces python-psutil python-regex"
+ python-PyQt5-webengine python-PyQt5-webchannel python-Pygments python-apsw
+ python-css-parser python-cssselect python-dateutil python-dbus
+ python-dnspython python-feedparser python-html5-parser python-mechanize
+ python-msgpack python-netifaces python-psutil python-regex qt5-webengine"
 short_desc="Ebook management application"
 maintainer="bra1nwave <brainwave@openmailbox.org>"
 license="GPL-3.0-only"
 homepage="https://calibre-ebook.com"
+changelog="https://raw.githubusercontent.com/kovidgoyal/calibre/master/Changelog.yaml"
 distfiles="https://download.calibre-ebook.com/${version}/calibre-${version}.tar.xz"
-checksum=e947b9854f9db344ee07e5495feaad759c96936d89a128d3a3587c3503d09ab6
+checksum=363f89b4c26ba8f8bba1eb40da09df85b8b3fedf9a0256285a0abae1ff65987c
 nocross=yes
 
 do_configure() {
@@ -38,6 +39,12 @@ do_configure() {
 }
 
 do_install() {
+	vmkdir usr/share/zsh/site-functions
+
 	python2 setup.py \
 		install --prefix=/usr --staging-root=${DESTDIR}/usr
+
+	for m in man-pages/man1/*.1; do
+		vman "${m}"
+	done
 }
diff --git a/srcpkgs/calligra-plan/patches/missing-includes.patch b/srcpkgs/calligra-plan/patches/missing-includes.patch
index c02c5a82326..efb4183edfe 100644
--- a/srcpkgs/calligra-plan/patches/missing-includes.patch
+++ b/srcpkgs/calligra-plan/patches/missing-includes.patch
@@ -79,3 +79,25 @@
  
  class KoUnit;
  
+From fe36bf6f0dc1f0c1e927850dd78093cfe3b7aae2 Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Sun, 28 Jul 2019 00:07:33 +0200
+Subject: [PATCH] Fix compile on CI
+
+src/workpackage/view.h:148:31: error: field m_scheduleActions has incomplete type QMap<QAction*, KPlato::Schedule*>
+---
+ src/workpackage/view.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/workpackage/view.h b/src/workpackage/view.h
+index 6cae32b7..cd2fc4ea 100644
+--- src/workpackage/view.h
++++ src/workpackage/view.h
+@@ -24,6 +24,7 @@
+ 
+ #include <KoView.h>
+ 
++#include <QMap>
+ #include <QStackedWidget>
+ 
+ class QPrinter;
diff --git a/srcpkgs/calligra-plan/template b/srcpkgs/calligra-plan/template
index 321312114b5..a39e482f1b6 100644
--- a/srcpkgs/calligra-plan/template
+++ b/srcpkgs/calligra-plan/template
@@ -1,7 +1,7 @@
 # Template file for 'calligra-plan'
 pkgname=calligra-plan
 version=3.1.0
-revision=3
+revision=4
 wrksrc="${pkgname/-/}-${version}"
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools"
diff --git a/srcpkgs/calligra/patches/qt5.13.patch b/srcpkgs/calligra/patches/qt5.13.patch
new file mode 100644
index 00000000000..ec19e0a0929
--- /dev/null
+++ b/srcpkgs/calligra/patches/qt5.13.patch
@@ -0,0 +1,21 @@
+From 0c5430697bdcf41a45046107b28014e40c49a11a Mon Sep 17 00:00:00 2001
+From: David Faure <faure@kde.org>
+Date: Tue, 23 Jul 2019 13:02:34 +0200
+Subject: [PATCH] Fix compilation with Qt 5.13 (missing include)
+
+---
+ sheets/plugins/calendar/CalendarToolWidget.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/sheets/plugins/calendar/CalendarToolWidget.cpp b/sheets/plugins/calendar/CalendarToolWidget.cpp
+index b10b23022a2..0c5eeb68cf3 100644
+--- sheets/plugins/calendar/CalendarToolWidget.cpp
++++ sheets/plugins/calendar/CalendarToolWidget.cpp
+@@ -30,6 +30,7 @@
+ #include <kdatepicker.h>
+ 
+ #include <QPushButton>
++#include <QDate>
+ 
+ namespace Calligra
+ {
diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index 8e8142184c7..a9ca78804fa 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
 # Template file for 'calligra'
 pkgname=calligra
 version=3.1.0
-revision=21
+revision=22
 build_style=cmake
 configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
  -DBUILD_TESTING=OFF"
diff --git a/srcpkgs/camlp4/patches/version-hack.patch b/srcpkgs/camlp4/patches/version-hack.patch
new file mode 100644
index 00000000000..34f7f48ff8c
--- /dev/null
+++ b/srcpkgs/camlp4/patches/version-hack.patch
@@ -0,0 +1,11 @@
+--- configure.orig
++++ configure
+@@ -39,7 +39,7 @@
+     echo "The standalone Camlp4 requires OCaml >= 4.02."
+     echo "For previous versions of OCaml use the Camlp4 distributed with OCaml."
+     exit 2
+-elif [ $major -ne 4 -o $minor -ne 8 ]; then
++elif [ $major -ne 4 -o $minor -ne 9 ]; then
+     echo "This version of Camlp4 is for OCaml 4.07 but you are using OCaml $ocaml_version."
+     if [ -d .git ] ; then
+       if [ $PINNED -eq 1 ] ; then
diff --git a/srcpkgs/camlp4/template b/srcpkgs/camlp4/template
index 6d84e7e5093..64c324cb1a5 100644
--- a/srcpkgs/camlp4/template
+++ b/srcpkgs/camlp4/template
@@ -1,7 +1,7 @@
 # Template file for 'camlp4'
 pkgname=camlp4
 version=4.08+1
-revision=1
+revision=2
 wrksrc="camlp4-${version/+/-}"
 build_style=configure
 hostmakedepends="ocaml ocamlbuild"
diff --git a/srcpkgs/camlp5/template b/srcpkgs/camlp5/template
index 28fff2aea9a..09e214a685c 100644
--- a/srcpkgs/camlp5/template
+++ b/srcpkgs/camlp5/template
@@ -1,7 +1,7 @@
 # Template file for 'camlp5'
 pkgname=camlp5
-version=7.08
-revision=1
+version=7.10
+revision=2
 build_style=configure
 configure_args="-mandir /usr/share/man"
 hostmakedepends="ocaml"
@@ -13,7 +13,7 @@ distfiles="https://github.com/${pkgname}/${pkgname}/archive/rel${version//./}.ta
 wrksrc="camlp5-rel${version//./}"
 nocross=yes
 nopie=yes
-checksum=46e67d8e36e5e4558c414f0b569532a33d3a12d7120ffdc474a6b3da1bfff163
+checksum=83dff83d33ee9b70cd1b9d8d365db63a118201e5feb6aab49d9d3b1d62621784
 
 post_install() {
 	vinstall etc/META 0644 usr/lib/ocaml/camlp5
diff --git a/srcpkgs/cargo/patches/revert-libgit2-sys-api.patch b/srcpkgs/cargo/patches/revert-libgit2-sys-api.patch
new file mode 100644
index 00000000000..b2f819286ba
--- /dev/null
+++ b/srcpkgs/cargo/patches/revert-libgit2-sys-api.patch
@@ -0,0 +1,32 @@
+Source: FreeBSD
+
+Revert to libgit2 0.28 API per https://github.com/rust-lang/git2-rs/issues/458
+
+--- libgit2-sys/lib.rs
++++ libgit2-sys/lib.rs
+@@ -331,7 +331,6 @@ pub struct git_remote_callbacks {
+     pub push_negotiation: Option<git_push_negotiation>,
+     pub transport: Option<git_transport_cb>,
+     pub payload: *mut c_void,
+-    pub resolve_url: Option<git_url_resolve_cb>,
+ }
+ 
+ #[repr(C)]
+@@ -385,8 +384,6 @@ pub type git_push_negotiation =
+ 
+ pub type git_push_update_reference_cb =
+     extern "C" fn(*const c_char, *const c_char, *mut c_void) -> c_int;
+-pub type git_url_resolve_cb =
+-    extern "C" fn(*mut git_buf, *const c_char, c_int, *mut c_void) -> c_int;
+ 
+ #[repr(C)]
+ pub struct git_push_update {
+@@ -2233,7 +2230,7 @@ extern "C" {
+         source: *const git_tree,
+     ) -> c_int;
+     pub fn git_treebuilder_clear(bld: *mut git_treebuilder);
+-    pub fn git_treebuilder_entrycount(bld: *mut git_treebuilder) -> size_t;
++    pub fn git_treebuilder_entrycount(bld: *mut git_treebuilder) -> c_uint;
+     pub fn git_treebuilder_free(bld: *mut git_treebuilder);
+     pub fn git_treebuilder_get(
+         bld: *mut git_treebuilder,
diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index a0bca421f61..584ca07efe2 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,8 @@
 # Template file for 'cargo'
 pkgname=cargo
-version=0.37.0
+version=0.39.0
 revision=1
+wrksrc="cargo-${version}"
 build_helper=rust
 hostmakedepends="rust python curl cmake pkg-config"
 makedepends="libcurl-devel libgit2-devel"
@@ -10,9 +11,11 @@ short_desc="Rust package manager"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT, Apache-2.0"
 homepage="https://crates.io/"
-distfiles="https://github.com/rust-lang/cargo/archive/${version}.tar.gz"
-checksum=377e1090e9ce21206270576193746499a26e8ffbd8b89ccd5f8eb1085ca00e3b
-_cargo_dist_version=0.37.0
+distfiles="https://github.com/rust-lang/cargo/archive/${version}.tar.gz
+ https://github.com/rust-lang/git2-rs/archive/libgit2-sys-0.8.2.tar.gz"
+checksum="1fade63d5c09eab6fa234a1fdf64693ccf1b63398a316ad27edeb1f76ee4a57e
+ c6597bcdc2be7a2fd70c1bb8fdc75883ca5df6aea33f0354c5a8124eacc0938b"
+_cargo_dist_version=0.39.0
 build_options="static"
 
 if [ "$CROSS_BUILD" ]; then
@@ -33,39 +36,39 @@ else
 	case "$XBPS_MACHINE" in
 		i686)
 			checksum+="
-			 6835a73e2ce17e11eda5393133dd7c78bc41bae5a09784e5327648f14340fd48"
+			 2996b0fb41506e87d9b07851f40b41fed94725cf53c3d251e4e1c78eea08df4c"
 			;;
 		x86_64)
 			checksum+="
-			 d20fa121951339d5492cf8862f8a7af59efc99d18f3c27b95ab6d4658b6a7d67"
+			 80bcb1368ce98d13cb371df89cbbed9007fb98843f34d07f2abd2c03b8f2747a"
 			;;
 		x86_64-musl)
 			checksum+="
-			 53975d91e11569f2255d8e30176f05f6976cd810725197a527b0e7ad547ca70c"
+			 1d7d881a5af73fb7c3f632278d47a7d174f8347673e2263c4cd6a2f7d0278733"
 			;;
 		ppc64le)
 			checksum+="
-			 4cda7686160f6981e936229703e8e2e756c74f390245f2ad9e356bbbed28a2c9"
+			 456d019511cfe015152a7a4c1c2f518fdeb10e0c610c9bc3ef44d73861ca967e"
 			;;
 		ppc64le-musl)
 			checksum+="
-			 d2690135522db9fdc6efa2f432e5719b8b70abc94e91db278b84be834a75bf72"
+			 5725c42c8356443db15f378d88f2ccb67e363ebf4beacc96ae1eac9ba36f8fe7"
 			;;
 		ppc64)
 			checksum+="
-			 8b2f7d5da611a21dd7e0b4238b9aca6ee32f1e49d8fe831435301f11a29b12de"
+			 73a4f13b8edda6b4c9c1818341c5d936f7b11a04f892358039d072b80ccd41dc"
 			;;
 		ppc64-musl)
 			checksum+="
-			 131db0127366665b2ae55327155c171e99c2eddfb4bcdd7e5cd2663ada109bd5"
+			 ac18707b8df5d1f64b7e15dabd73eb7a3b0f9ef5976ef7c6ceb462b5d3feb9cd"
 			;;
 		ppc)
 			checksum+="
-			 856fcb63f6ebeab67038fe3fc96ee0911353b1ee19cabcb0496c7d419de0d531"
+			 02c07b741062e75556f5993a05eefe6dace70fee4a45542f1c6997fa69624d7e"
 			;;
 		ppc-musl)
 			checksum+="
-			 119dba3538f6c1d1164b720b238acac598e1924d943ebbdf3c7113ec3cbd8a2a"
+			 b06306fc164bffa73afd2d21d96381a28d38446e58cf01a0d1585e92b4656a23"
 			;;
 	esac
 fi
@@ -75,6 +78,20 @@ post_extract() {
 		mkdir -p target/snapshot
 		cp ../cargo-${_cargo_dist_version}-${RUST_TARGET}/cargo/bin/cargo cargo
 	fi
+
+	# need this for the patch to work
+	cp -R ${XBPS_BUILDDIR}/git2-rs-libgit2-sys-0.8.2/libgit2-sys .
+}
+
+post_patch() {
+	# but only use the patched libgit2 when not static; when static, bundled
+	# libgit2 is used and this would not work (libgit2 sources are not there)
+	if [ ! "$build_option_static" ]; then
+		cat >> Cargo.toml <<- EOF
+			[patch.crates-io]
+			libgit2-sys = { path = './libgit2-sys' }
+		EOF
+	fi
 }
 
 do_build() {
@@ -93,8 +110,6 @@ do_build() {
 		cargo="./cargo"
 	fi
 
-	$cargo update
-	$cargo update --package libc --precise 0.2.55
 	$cargo build --release $(vopt_if static --features="all-static")
 }
 
diff --git a/srcpkgs/catch2/template b/srcpkgs/catch2/template
index 8d46f584f6f..2f9db0dd4c1 100644
--- a/srcpkgs/catch2/template
+++ b/srcpkgs/catch2/template
@@ -1,6 +1,6 @@
 # Template file for 'catch2'
 pkgname=catch2
-version=2.7.1
+version=2.9.2
 revision=1
 archs=noarch
 wrksrc="Catch2-${version}"
@@ -15,7 +15,7 @@ maintainer="Louis Dupré Bertoni <contact@louisdb.xyz>"
 license="BSL-1.0"
 homepage="https://github.com/catchorg/Catch2"
 distfiles="https://github.com/catchorg/Catch2/archive/v${version}/${pkgname}-v${version}.tar.gz"
-checksum=04b303517284572c277597004a33c3f8c02a4d12ba73d5a4cb73b4a369dfef0b
+checksum=54bea6d80a388a80f895cd0e2343fca72b0d9093a776af40904aefce49c13bda
 
 post_install() {
 	vlicense LICENSE.txt
diff --git a/srcpkgs/catfish/template b/srcpkgs/catfish/template
index 39c73a8a7ba..1b28ffcafff 100644
--- a/srcpkgs/catfish/template
+++ b/srcpkgs/catfish/template
@@ -1,6 +1,6 @@
 # Template file for 'catfish'
 pkgname=catfish
-version=1.4.9
+version=1.4.10
 revision=1
 archs=noarch
 build_style=python3-module
@@ -12,5 +12,5 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.twotoasts.de/index.php/catfish/"
 distfiles="http://archive.xfce.org/src/apps/catfish/${version%.*}/catfish-${version}.tar.bz2"
-checksum=29a39b85804336e4819dceff203693a5904b7e11d7e024b49b5aab2649ed944e
+checksum=2573a004105031f871c92fed22a0c4b15bb96f2dff6e36c4f2959f56b62e343d
 nocross="gobject-introspection"
diff --git a/srcpkgs/cbindgen/template b/srcpkgs/cbindgen/template
index 778bc45666c..0fb0c8a7c0d 100644
--- a/srcpkgs/cbindgen/template
+++ b/srcpkgs/cbindgen/template
@@ -1,6 +1,6 @@
 # Template file for 'cbindgen'
 pkgname=cbindgen
-version=0.9.0
+version=0.9.1
 revision=1
 build_style=cargo
 short_desc="Tool to generate C bindings for Rust code"
@@ -8,4 +8,4 @@ maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MPL-2.0"
 homepage="https://github.com/eqrion/cbindgen"
 distfiles="https://github.com/eqrion/cbindgen/archive/v${version}.tar.gz"
-checksum=28ea5a0f99d0c4a8a6bd8a75a017031b0271bec2716ac0e9029d2a65451aacd0
+checksum=bb1b9b55bfed3ccd774d3c0e83bc549f2ac5418c7d80b63052b0dd1034478ec7
diff --git a/srcpkgs/ccache/template b/srcpkgs/ccache/template
index 774f62915cb..efd4464d4df 100644
--- a/srcpkgs/ccache/template
+++ b/srcpkgs/ccache/template
@@ -1,6 +1,6 @@
 # Template file for 'ccache'
 pkgname=ccache
-version=3.7.3
+version=3.7.4
 revision=1
 bootstrap=yes
 build_style=gnu-configure
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://ccache.samba.org/"
 changelog="https://ccache.samba.org/news.html"
 distfiles="https://github.com/ccache/ccache/releases/download/v${version}/${pkgname}-${version}.tar.xz"
-checksum=73d2ec69fcf4fd3b956304036974a779b443d88882b69c5d81b62b5dc8630e04
+checksum=04c0af414b8cf89e541daed59735547fbfd323b1aaa983da0216f6b6731e6836
 
 post_install() {
 	vmkdir usr/lib/ccache/bin
diff --git a/srcpkgs/ccls/template b/srcpkgs/ccls/template
index 6c6ab601a78..e04cf8107ed 100644
--- a/srcpkgs/ccls/template
+++ b/srcpkgs/ccls/template
@@ -1,7 +1,7 @@
 # Template file for 'ccls'
 pkgname=ccls
-version=0.20190314
-revision=1
+version=0.20190823
+revision=2
 build_style=cmake
 hostmakedepends="clang-tools-extra"
 makedepends="clang llvm ncurses-devel rapidjson zlib-devel"
@@ -9,6 +9,6 @@ short_desc="C/C++/ObjC language server"
 maintainer="Nathan Owens <ndowens04@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/MaskRay/ccls"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=aaefa603a76325bb94e5222d144e19c432771346990c8b84165832bf37d15bb3
+distfiles="https://github.com/MaskRay/ccls/archive/${version}.tar.gz"
+checksum=0176a10b2fa567862e5a93ac16a5bb92940f7bab7c3759b35be1a256cd2f1a66
 nocross="Clang cannot be installed as makedep"
diff --git a/srcpkgs/cdemu-client/template b/srcpkgs/cdemu-client/template
index 5522981eaeb..d0b4b4bf7ba 100644
--- a/srcpkgs/cdemu-client/template
+++ b/srcpkgs/cdemu-client/template
@@ -1,6 +1,6 @@
 # Template file for 'cdemu-client'
 pkgname=cdemu-client
-version=3.2.1
+version=3.2.3
 revision=1
 archs=noarch
 build_style=cmake
@@ -12,4 +12,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://cdemu.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/cdemu/cdemu-client-${version}.tar.bz2"
-checksum=e54d2f5686d27bd49e65b84542fb2446ef349c27fa17ee14675d98bd311115b5
+checksum=f883800db99d39a91f41b94ede7c799c12318f15f4c138eeca0374374c156caf
diff --git a/srcpkgs/cdemu-daemon/template b/srcpkgs/cdemu-daemon/template
index 25f88bd4ec0..61631d510e8 100644
--- a/srcpkgs/cdemu-daemon/template
+++ b/srcpkgs/cdemu-daemon/template
@@ -1,6 +1,6 @@
 # Template file for 'cdemu-daemon'
 pkgname=cdemu-daemon
-version=3.2.2
+version=3.2.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config intltool"
@@ -11,4 +11,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://cdemu.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/cdemu/cdemu-daemon-${version}.tar.bz2"
-checksum=2b8934ad09d5a1c844202d5e2020193dd5bb00112732559c23594b0761f63542
+checksum=b94bd9f343b82a292ea542c6454762ae4d5987a78387d36a5a5c335bf9fb5d08
diff --git a/srcpkgs/cdetect/template b/srcpkgs/cdetect/template
index 0081cf0513e..b02df3a496e 100644
--- a/srcpkgs/cdetect/template
+++ b/srcpkgs/cdetect/template
@@ -1,7 +1,7 @@
 # Template file for 'cdetect'
 pkgname=cdetect
-version=0.5.3
-revision=2
+version=0.5.4
+revision=1
 build_style=go
 go_import_path=github.com/xyproto/cdetect
 hostmakedepends="git"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/xyproto/cdetect"
 distfiles="https://github.com/xyproto/cdetect/archive/${version}.tar.gz"
-checksum=8f9e68366c619706ae48dc3c2188ee15dca97e01a922d1b7eda87ad746e14c32
+checksum=5df583e1b016d61cbc723fc0d222308c4327e108f91316707235148c06095b49
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/celluloid/template b/srcpkgs/celluloid/template
new file mode 100644
index 00000000000..e022f1175f4
--- /dev/null
+++ b/srcpkgs/celluloid/template
@@ -0,0 +1,19 @@
+# Template file for 'celluloid'
+pkgname=celluloid
+version=0.17
+revision=1
+build_style=meson
+hostmakedepends="glib-devel pkg-config"
+makedepends="gtk+3-devel libepoxy-devel libglib-devel mpv-devel"
+short_desc="Simple GTK+ frontend for mpv"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-3.0-or-later"
+homepage="https://celluloid-player.github.io/"
+distfiles="https://github.com/${pkgname}-player/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.xz"
+checksum=0016078c02c1c8629a0658bd6eeb02be50d94a670983f53cbdb23f34f4866b28
+
+gnome-mpv_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	build_style=meta
+	short_desc+=" (transitional dummy package)"
+}
diff --git a/srcpkgs/cgrps/template b/srcpkgs/cgrps/template
index 9239c458de3..94d1c447138 100644
--- a/srcpkgs/cgrps/template
+++ b/srcpkgs/cgrps/template
@@ -1,15 +1,15 @@
 # Template file for 'cgrps'
 pkgname=cgrps
-version=0.7.0
-revision=3
+version=0.8.0
+revision=1
 build_style=go
 go_import_path=github.com/k1LoW/cgrps
 short_desc="Set of commands for checking cgroups"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/k1LoW/cgrps"
 distfiles="https://github.com/k1LoW/cgrps/archive/v${version}.tar.gz"
-checksum=728d95bdcf6a4d2805b7b4262af26440d66408dceea92873d443fc059bb22613
+checksum=1be01ebc65c7b86ccc88597934781a61321566e1be32a4ea4d3df34a4a2a1e43
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/chafa/template b/srcpkgs/chafa/template
index f7ef49009b6..c748a65494e 100644
--- a/srcpkgs/chafa/template
+++ b/srcpkgs/chafa/template
@@ -1,6 +1,6 @@
 # Template file for 'chafa'
 pkgname=chafa
-version=1.0.1
+version=1.2.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Christian Buschau <christian.buschau@mailbox.org>"
 license="LGPL-3.0-or-later"
 homepage="https://hpjansson.org/chafa/"
 distfiles="https://hpjansson.org/chafa/releases/chafa-${version}.tar.xz"
-checksum=49d491a566a22daf56c51c043259f1373a1b1125d5c1c1fe321f7c25ca178e01
+checksum=3f37a28bfb9ab716efb32d2652bc2c17856711ed7808e74481c8afcf7cdb44c2
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*) ;;
diff --git a/srcpkgs/chatty/template b/srcpkgs/chatty/template
index 57249d473b2..7612f7bd929 100644
--- a/srcpkgs/chatty/template
+++ b/srcpkgs/chatty/template
@@ -1,16 +1,16 @@
 # Template file for 'chatty'
 pkgname=chatty
-version=0.9.7
-revision=2
+version=0.10
+revision=1
 archs=noarch
 hostmakedepends="openjdk gradle"
 depends="virtual?java-runtime"
 short_desc="Twitch Chat Client for Desktop"
 maintainer="Frank Steinborn <steinex@nognu.de>"
-license="GPL-3"
+license="GPL-3.0-only"
 homepage="http://chatty.github.io/"
 distfiles="https://github.com/chatty/chatty/archive/v${version}.tar.gz"
-checksum="e5c2eb006db593ce0fc6fb71e602ad641dc3ff970b770dce73155c67d87afbea"
+checksum=9b50246620f179be675e883c9a5766218fc50a8f0b4ee139dc40a9dfed5d54d2
 
 do_build() {
 	gradle shadowJar
@@ -33,6 +33,4 @@ do_install() {
 
 	vinstall src/${pkgname}/gui/app_main_64.png 644 usr/share/pixmaps chatty.png
 	vinstall ${FILESDIR}/chatty.desktop 644 usr/share/applications
-
-	vlicense assets/LICENSE
 }
diff --git a/srcpkgs/cheat/template b/srcpkgs/cheat/template
new file mode 100644
index 00000000000..b60b4ba53b2
--- /dev/null
+++ b/srcpkgs/cheat/template
@@ -0,0 +1,26 @@
+# Template file for 'cheat'
+pkgname=cheat
+version=2.5.1
+revision=1
+build_style=python3-module
+pycompile_module="cheat"
+conf_files="/etc/cheat"
+hostmakedepends="python3"
+depends="python3-docopt python3-termcolor python3-Pygments"
+short_desc="Create and view interactive cheatsheets on the command-line"
+maintainer="bra1nwave <brainwave@openmailbox.org>"
+license="GPL-3.0-or-later, MIT"
+homepage="https://github.com/cheat/cheat"
+distfiles="${homepage}/archive/${version}.tar.gz"
+checksum=9ae44cfc79478a7ba604871f3253e176f2bf3e1a4e698c9466e58a39d279effd
+
+post_install() {
+	vinstall cheat/autocompletion/cheat.bash 644 \
+		usr/share/bash-completion/completions cheat
+	vinstall cheat/autocompletion/cheat.zsh 644 \
+		usr/share/zsh/site-functions _cheat
+	vinstall cheat/autocompletion/cheat.fish 644 \
+		usr/share/fish/completions
+	vman man1/cheat.1.gz
+	vlicense licenses/mit.txt LICENSE
+}
diff --git a/srcpkgs/cheese/template b/srcpkgs/cheese/template
index 1e870bd7613..e6d1e05dbc1 100644
--- a/srcpkgs/cheese/template
+++ b/srcpkgs/cheese/template
@@ -1,12 +1,13 @@
 # Template file for 'cheese'
 pkgname=cheese
-version=3.32.1
-revision=2
-build_style=gnu-configure
+version=3.34.0
+revision=1
+build_style=meson
+configure_args="-Dgtk_doc=$(vopt_if gtk_doc 'true' 'false')
+ -Dman=$(vopt_if gtk_doc 'true' 'false')"
 build_helper="gir"
-configure_args="--disable-static --disable-schemas-compile"
-hostmakedepends="gdk-pixbuf glib-devel gtk-doc intltool itstool pkg-config
- $(vopt_if gir 'gobject-introspection') vala"
+hostmakedepends="gdk-pixbuf glib-devel itstool pkg-config vala librsvg
+ $(vopt_if gtk_doc 'gtk-doc') $(vopt_if gir 'gobject-introspection')"
 makedepends="clutter-gst3-devel clutter-gtk-devel gnome-desktop-devel
  gst-plugins-good1 libXtst-devel libcanberra-devel libgee08-devel librsvg-devel"
 depends="clutter-gst clutter-gtk desktop-file-utils gnome-video-effects
@@ -16,12 +17,15 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Cheese"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7b9ad1da8bb475a9e71ae69a5832786a75e860f0af927637540574fd49d595f6
-nocross="https://build.voidlinux.org/builders/armv7l_builder/builds/18665/steps/shell_3/logs/stdio"
+checksum=d1865600ac88012e136b1ec3db72a4634f57bc2035895277be792bb078627e73
 
-build_options="gir"
+build_options="gir gtk_doc"
 build_options_default="gir"
 
+if [ -z "$CROSS_BUILD" ]; then
+	build_options_default+=" gtk_doc"
+fi
+
 libcheese_package() {
 	short_desc+=" - shared libraries"
 	pkg_install() {
@@ -46,6 +50,8 @@ cheese-devel_package() {
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
 		fi
-		vmove usr/share/gtk-doc
+		if [ "$build_option_gtk_doc" ]; then
+			vmove usr/share/gtk-doc
+		fi
 	}
 }
diff --git a/srcpkgs/cherry-font/template b/srcpkgs/cherry-font/template
index 544778ab2b6..496d45988d1 100644
--- a/srcpkgs/cherry-font/template
+++ b/srcpkgs/cherry-font/template
@@ -1,6 +1,6 @@
 # Template file for 'cherry-font'
 pkgname=cherry-font
-version=1.3
+version=1.4
 revision=1
 archs=noarch
 wrksrc="cherry-${version}"
@@ -11,7 +11,7 @@ maintainer="Chinmay Pai <chinmaydpai@gmail.com>"
 license="MIT"
 homepage="https://github.com/turquoise-hexagon/cherry"
 distfiles="https://github.com/turquoise-hexagon/cherry/archive/${version}.tar.gz"
-checksum=3fd95e66f9baa8c71f3a513fb807ff72a44605e30938b2be6157a68a1d5ed57e
+checksum=984191a0b305832b95bd3036cd8b7ab07cac8a0dd05ba440d6be9ffbdd8434df
 
 font_dirs="/usr/share/fonts/X11/misc"
 
diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index a6b59335c2a..2f8878707ec 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,6 +1,6 @@
 # Template file for 'cherrytree'
 pkgname=cherrytree
-version=0.38.8
+version=0.38.9
 revision=1
 archs=noarch
 build_style=python2-module
@@ -12,7 +12,7 @@ maintainer="Logen K <logen@sudotask.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.giuspen.com/cherrytree/"
 distfiles="https://www.giuspen.com/software/${pkgname}-${version}.tar.xz"
-checksum=af21e540fddb3c5a92cdad9b4bbfc6ccd3ce3ab87076a2a01d2e3f2d683f48db
+checksum=fc16669e81e7f981f1b51671171a55035febf2ea80e801c0dd7ff52763025475
 
 post_install() {
 	# don’t install useless egg
diff --git a/srcpkgs/chocolate-doom/template b/srcpkgs/chocolate-doom/template
index c20db393a43..963ba91c585 100644
--- a/srcpkgs/chocolate-doom/template
+++ b/srcpkgs/chocolate-doom/template
@@ -1,4 +1,4 @@
-# Template file for 'chocolate-doom'
+# Template file for 'chocolate-doom'.
 pkgname=chocolate-doom
 version=3.0.0
 revision=1
diff --git a/srcpkgs/chroma/template b/srcpkgs/chroma/template
index 7a7867cc8c9..e8b786f9671 100644
--- a/srcpkgs/chroma/template
+++ b/srcpkgs/chroma/template
@@ -1,6 +1,6 @@
 # Template file for 'chroma'
 pkgname=chroma
-version=0.6.6
+version=0.6.7
 revision=1
 build_style=go
 go_import_path="github.com/alecthomas/${pkgname}"
@@ -10,8 +10,8 @@ short_desc="General purpose syntax highlighter"
 maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="MIT"
 homepage="https://github.com/alecthomas/chroma"
-distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
-checksum=87c64941500c9433ef481f2c54155f892ac8bd3c18b3247fc9d9785a8d4f5c10
+distfiles="https://github.com/alecthomas/chroma/archive/v${version}.tar.gz"
+checksum=ac23e6b649929d093f2ad163629bc5f30b293ddf4d48d20824f97a512186dcb1
 
 do_check() {
 	go test -v
diff --git a/srcpkgs/chromium-widevine/template b/srcpkgs/chromium-widevine/template
index a8e074fd168..d777e5ffa2e 100644
--- a/srcpkgs/chromium-widevine/template
+++ b/srcpkgs/chromium-widevine/template
@@ -6,7 +6,7 @@ _chromeVersion="current"
 _channel="stable"
 
 pkgname=chromium-widevine
-version=75.0.3770.142
+version=77.0.3865.120
 revision=1
 archs="x86_64"
 create_wrksrc=yes
@@ -17,7 +17,7 @@ depends="chromium binutils xz"
 homepage="https://www.google.com/chrome"
 repository=nonfree
 distfiles="https://dl.google.com/linux/direct/google-chrome-${_channel}_${_chromeVersion}_amd64.deb"
-checksum=8a39e922d9d0f12b79949efc46c22021f89a8207670fa9493a366ad8231b343f
+checksum=07abdccd7c15f5abe68765c1162f2ab666b6478a4d578aa6351d5667cd983a48
 
 do_extract() {
 	:
diff --git a/srcpkgs/chromium/files/musl-patches/no-mallinfo.patch b/srcpkgs/chromium/files/musl-patches/no-mallinfo.patch
index 461c90cb0af..288f8670c06 100644
--- a/srcpkgs/chromium/files/musl-patches/no-mallinfo.patch
+++ b/srcpkgs/chromium/files/musl-patches/no-mallinfo.patch
@@ -42,3 +42,15 @@ index 0eb5c1f..8af7799 100644
    mi = ::mallinfo();
    return mi.uordblks;
 
+--- third_party/swiftshader/third_party/llvm-7.0/configs/linux/include/llvm/Config/config.h.orig	2019-09-30 13:03:42.556880537 -0400
++++ third_party/swiftshader/third_party/llvm-7.0/configs/linux/include/llvm/Config/config.h	2019-09-30 13:07:27.989821227 -0400
+@@ -122,7 +122,9 @@
+ /* #undef HAVE_MALLCTL */
+ 
+ /* Define to 1 if you have the `mallinfo' function. */
++#if defined(__GLIBC__)
+ #define HAVE_MALLINFO 1
++#endif
+ 
+ /* Define to 1 if you have the <malloc.h> header file. */
+ #define HAVE_MALLOC_H 1
diff --git a/srcpkgs/chromium/patches/chromium-enable-vaapi.patch b/srcpkgs/chromium/patches/chromium-enable-vaapi.patch
index d1cb7b4be59..01c253de5ff 100644
--- a/srcpkgs/chromium/patches/chromium-enable-vaapi.patch
+++ b/srcpkgs/chromium/patches/chromium-enable-vaapi.patch
@@ -1,165 +1,107 @@
---- chrome/browser/about_flags.cc.orig	2019-07-29 16:35:46.000000000 -0400
-+++ chrome/browser/about_flags.cc	2019-07-31 13:54:18.350186083 -0400
-@@ -1119,12 +1119,14 @@
-     {"ui-disable-partial-swap", flag_descriptions::kUiPartialSwapName,
-      flag_descriptions::kUiPartialSwapDescription, kOsAll,
-      SINGLE_DISABLE_VALUE_TYPE(switches::kUIDisablePartialSwap)},
-+#if defined(OS_CHROMEOS) || defined(OS_ANDROID)
-     {"disable-webrtc-hw-decoding", flag_descriptions::kWebrtcHwDecodingName,
-      flag_descriptions::kWebrtcHwDecodingDescription, kOsAndroid | kOsCrOS,
-      SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebRtcHWDecoding)},
-     {"disable-webrtc-hw-encoding", flag_descriptions::kWebrtcHwEncodingName,
-      flag_descriptions::kWebrtcHwEncodingDescription, kOsAndroid | kOsCrOS,
-      SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebRtcHWEncoding)},
-+#endif
- #if !defined(OS_ANDROID)
-     {"enable-reader-mode", flag_descriptions::kEnableReaderModeName,
-      flag_descriptions::kEnableReaderModeDescription, kOsDesktop,
-@@ -1446,6 +1448,13 @@
-      flag_descriptions::kEnableVirtualDesksDescription, kOsCrOS,
-      FEATURE_VALUE_TYPE(ash::features::kVirtualDesks)},
- #endif  // OS_CHROMEOS
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+    {
-+        "enable-accelerated-video", flag_descriptions::kAcceleratedVideoName,
-+        flag_descriptions::kAcceleratedVideoDescription, kOsLinux,
-+        SINGLE_VALUE_TYPE(switches::kEnableAcceleratedVideo),
-+    },
-+#else
-     {
+From 53b93dfe87fd10cced5d2a2a63072dfc7a2af6e4 Mon Sep 17 00:00:00 2001
+From: Daniel Charles <daniel.charles@intel.com>
+Date: Fri, 28 Jul 2017 16:31:47 -0700
+Subject: [PATCH] Enable VAVDA, VAVEA and VAJDA on linux with VAAPI only
+
+This patch contains all the changes necessary to use VA-API along with
+vaapi-driver to run all media use cases supported with hardware acceleration.
+
+It is intended to remain as experimental accessible from chrome://flags on linux.
+It requires libva/intel-vaapi-driver to be installed on the system path where
+chrome is executed.  Other drivers could be tested if available. Flags are
+kept independent for linux, where this feature has to be enabled before
+actually using it.  This should not change how other OSes use the flags
+already, the new flags will show at the buttom on the section of unavailable
+experiments
+
+The changes cover a range of compiler pre-processor flags to enable the stack.
+It moves the presandbox operations to the vaapi_wrapper class as the hook function
+is available there. vaInit will open driver on the correct installed folder.
+
+chrome flags consolidtation into only two flags for linux.  Mjpeg and accelerated
+video are used.  The other flags are kept for ChromeOS and other OSes.
+
+Developer testing was made on skylake hardware, ChromeOS and Ubuntu.
+
+BUG=NONE
+TEST="subjective testing with VAVDA,VAVEA and VAJDA, autotest for encoder"
+TEST="and decoder hardware accelerated"
+TEST="have libva/intel-vaapi-driver installed and not installed in the system"
+TEST="repeat on different hardware families"
+R=posciak@chromium.org
+R=kcwu@chromium.org
+
+Cq-Include-Trybots: master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel
+Change-Id: Ifbbf5c9e5221a8b5733fc6d4d0cf984a1f103171
+Signed-off-by: Daniel Charles <daniel.charles@intel.com>
+---
+
+Index: dev/chrome/browser/about_flags.cc
+===================================================================
+--- chrome/browser/about_flags.cc
++++ chrome/browser/about_flags.cc
+@@ -1527,7 +1527,7 @@ const FeatureEntry kFeatureEntries[] = {
          "disable-accelerated-video-decode",
          flag_descriptions::kAcceleratedVideoDecodeName,
-@@ -1453,6 +1462,7 @@
-         kOsMac | kOsWin | kOsCrOS | kOsAndroid,
+         flag_descriptions::kAcceleratedVideoDecodeDescription,
+-        kOsMac | kOsWin | kOsCrOS | kOsAndroid,
++        kOsAll,
          SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode),
      },
-+#endif
-     {"enable-history-favicons-google-server-query",
-      flag_descriptions::kEnableHistoryFaviconsGoogleServerQueryName,
-      flag_descriptions::kEnableHistoryFaviconsGoogleServerQueryDescription,
-@@ -1883,7 +1892,12 @@
+     {
+@@ -1993,10 +1993,10 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(service_manager::features::kXRSandbox)},
- #endif  // ENABLE_ISOLATED_XR_SERVICE
+ #endif  // !defined(OS_ANDROID)
  #endif  // ENABLE_VR
 -#if defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+    {"enable-accelerated-mjpeg-decode",
-+     flag_descriptions::kAcceleratedMjpegDecodeName,
-+     flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsLinux,
-+     SINGLE_VALUE_TYPE(switches::kEnableAcceleratedMjpegDecode)},
-+#elif defined(OS_CHROMEOS)
++#if defined(OS_LINUX) && !defined(OS_ANDROID)
      {"disable-accelerated-mjpeg-decode",
       flag_descriptions::kAcceleratedMjpegDecodeName,
-      flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsCrOS,
---- chrome/browser/chromeos/login/chrome_restart_request.cc.orig	2019-07-29 16:35:47.000000000 -0400
-+++ chrome/browser/chromeos/login/chrome_restart_request.cc	2019-07-31 13:58:47.201085960 -0400
-@@ -20,6 +20,7 @@
- #include "base/system/sys_info.h"
- #include "base/timer/timer.h"
- #include "base/values.h"
-+#include "build/build_config.h"
- #include "cc/base/switches.h"
- #include "chrome/browser/browser_process.h"
- #include "chrome/browser/chromeos/boot_times_recorder.h"
-@@ -84,9 +85,14 @@
-     ::switches::kBlinkSettings,
-     ::switches::kDisable2dCanvasImageChromium,
-     ::switches::kDisableAccelerated2dCanvas,
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+    ::switches::kEnableAcceleratedMjpegDecode,
-+    ::switches::kEnableAcceleratedVideo,
-+#else
-     ::switches::kDisableAcceleratedMjpegDecode,
-     ::switches::kDisableAcceleratedVideoDecode,
-     ::switches::kDisableAcceleratedVideoEncode,
-+#endif
-     ::switches::kDisableBlinkFeatures,
-     ::switches::kDisableGpu,
-     ::switches::kDisableGpuMemoryBufferVideoFrames,
-@@ -158,8 +164,10 @@
-     ::switches::kEnableWebGLImageChromium,
-     ::switches::kEnableWebVR,
-     ::switches::kEnableUnsafeWebGPU,
-+#if (defined(OS_CHROMEOS) || defined(OS_ANDROID))
-     ::switches::kDisableWebRtcHWDecoding,
-     ::switches::kDisableWebRtcHWEncoding,
-+#endif
-     ::switches::kOzonePlatform,
-     ash::switches::kAshEnableTabletMode,
-     ash::switches::kAshEnableWaylandServer,
-diff -ur chrome/browser/flag_descriptions.cc chromium-69.0.3497.92/chrome/browser/flag_descriptions.cc
---- chrome/browser/flag_descriptions.cc.orig	2019-06-18 11:47:50.000000000 -0400
-+++ chrome/browser/flag_descriptions.cc	2019-07-02 12:27:47.137866754 -0400
-@@ -14,6 +14,13 @@
-     "Enables the use of the GPU to perform 2d canvas rendering instead of "
-     "using software rendering.";
- 
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+const char kAcceleratedVideoName[] = "Hardware-accelerated video";
-+const char kAcceleratedVideoDescription[] =
-+    "Hardware-accelerated video where VA-API driver is installed on the"
-+    "system.";
-+#endif
-+
- const char kAcceleratedVideoDecodeName[] = "Hardware-accelerated video decode";
- const char kAcceleratedVideoDecodeDescription[] =
-     "Hardware-accelerated video decode where available.";
-@@ -2081,6 +2088,7 @@
- const char kWebrtcHybridAgcDescription[] =
-     "WebRTC Agc2 digital adaptation with Agc1 analog adaptation.";
- 
-+#if defined(OS_CHROMEOS) || defined(OS_ANDROID)
- const char kWebrtcHwDecodingName[] = "WebRTC hardware video decoding";
- const char kWebrtcHwDecodingDescription[] =
-     "Support in WebRTC for decoding video streams using platform hardware.";
-@@ -2088,6 +2096,7 @@
- const char kWebrtcHwEncodingName[] = "WebRTC hardware video encoding";
- const char kWebrtcHwEncodingDescription[] =
-     "Support in WebRTC for encoding video streams using platform hardware.";
-+#endif
- 
- const char kWebrtcHwH264EncodingName[] = "WebRTC hardware h264 video encoding";
- const char kWebrtcHwH264EncodingDescription[] =
-@@ -2943,14 +2952,16 @@
+-     flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsCrOS,
++     flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsCrOS | kOsLinux,
+      SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedMjpegDecode)},
+ #endif  // OS_CHROMEOS
+     {"system-keyboard-lock", flag_descriptions::kSystemKeyboardLockName,
+Index: dev/chrome/browser/flag_descriptions.cc
+===================================================================
+--- chrome/browser/flag_descriptions.cc
++++ chrome/browser/flag_descriptions.cc
+@@ -2880,9 +2880,7 @@ const char kMacSystemMediaPermissionsInf
  
- // Chrome OS -------------------------------------------------------------------
+ #endif
  
+-// Chrome OS -------------------------------------------------------------------
+-
 -#if defined(OS_CHROMEOS)
-+#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID))
++#if defined(OS_LINUX) && !defined(OS_ANDROID)
  
  const char kAcceleratedMjpegDecodeName[] =
      "Hardware-accelerated mjpeg decode for captured frame";
- const char kAcceleratedMjpegDecodeDescription[] =
+@@ -2890,6 +2888,12 @@ const char kAcceleratedMjpegDecodeDescri
      "Enable hardware-accelerated mjpeg decode for captured frame where "
      "available.";
-+#endif
  
++#endif
++
++// Chrome OS -------------------------------------------------------------------
++
 +#if defined(OS_CHROMEOS)
++
  const char kAppServiceAshName[] = "App Service Ash";
  const char kAppServiceAshDescription[] =
      "Use the App Service to provide data to the Ash UI, such as the shelf and "
-diff -ur chrome/browser/flag_descriptions.h chromium-69.0.3497.92/chrome/browser/flag_descriptions.h
---- chrome/browser/flag_descriptions.h.orig	2019-06-18 11:47:50.000000000 -0400
-+++ chrome/browser/flag_descriptions.h	2019-07-02 12:29:46.200214795 -0400
-@@ -43,6 +43,10 @@
- extern const char kAccelerated2dCanvasName[];
- extern const char kAccelerated2dCanvasDescription[];
- 
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+extern const char kAcceleratedVideoName[];
-+extern const char kAcceleratedVideoDescription[];
-+#endif
- extern const char kAcceleratedVideoDecodeName[];
- extern const char kAcceleratedVideoDecodeDescription[];
- 
-@@ -1765,13 +1769,17 @@
+Index: dev/chrome/browser/flag_descriptions.h
+===================================================================
+--- chrome/browser/flag_descriptions.h
++++ chrome/browser/flag_descriptions.h
+@@ -1715,13 +1715,17 @@ extern const char kPermissionPromptPersi
  
  #endif  // defined(OS_MACOSX)
  
 -// Chrome OS ------------------------------------------------------------------
 -
 -#if defined(OS_CHROMEOS)
-+#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID))
++#if defined(OS_LINUX) && !defined(OS_ANDROID)
  
  extern const char kAcceleratedMjpegDecodeName[];
  extern const char kAcceleratedMjpegDecodeDescription[];
@@ -173,234 +115,32 @@ diff -ur chrome/browser/flag_descriptions.h chromium-69.0.3497.92/chrome/browser
  extern const char kAppServiceAshName[];
  extern const char kAppServiceAshDescription[];
  
-diff -ur content/browser/gpu/compositor_util.cc chromium-69.0.3497.92/content/browser/gpu/compositor_util.cc
---- content/browser/gpu/compositor_util.cc	2018-09-12 00:39:41.000000000 +0530
-+++ content/browser/gpu/compositor_util.cc	2018-09-13 22:10:34.072012092 +0530
-@@ -149,7 +149,11 @@
-       {"video_decode",
-        SafeGetFeatureStatus(gpu_feature_info,
-                             gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE),
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+       !command_line.HasSwitch(switches::kEnableAcceleratedVideo),
-+#else
-        command_line.HasSwitch(switches::kDisableAcceleratedVideoDecode),
-+#endif
-        "Accelerated video decode has been disabled, either via blacklist, "
-        "about:flags or the command line.",
-        true, true},
---- content/browser/gpu/gpu_process_host.cc.orig	2019-07-31 14:16:52.304849119 -0400
-+++ content/browser/gpu/gpu_process_host.cc	2019-07-31 14:19:22.567480008 -0400
-@@ -208,7 +208,9 @@
-     switches::kDisableLogging,
-     switches::kDisableShaderNameHashing,
-     switches::kDisableSkiaRuntimeOpts,
-+#if !defined(OS_LINUX)
-     switches::kDisableWebRtcHWEncoding,
-+#endif
-     switches::kEnableGpuRasterization,
-     switches::kEnableLogging,
-     switches::kEnableVizDevTools,
-diff -ur content/browser/renderer_host/media/video_capture_browsertest.cc chromium-69.0.3497.92/content/browser/renderer_host/media/video_capture_browsertest.cc
---- content/browser/renderer_host/media/video_capture_browsertest.cc	2018-09-12 00:39:41.000000000 +0530
-+++ content/browser/renderer_host/media/video_capture_browsertest.cc	2018-09-13 22:10:34.124010499 +0530
-@@ -165,8 +165,13 @@
-       base::CommandLine::ForCurrentProcess()->AppendSwitch(
-           switches::kUseFakeJpegDecodeAccelerator);
-     } else {
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+      base::CommandLine::ForCurrentProcess()->AppendSwitch(
-+          switches::kEnableAcceleratedMjpegDecode);
-+#else
-       base::CommandLine::ForCurrentProcess()->AppendSwitch(
-           switches::kDisableAcceleratedMjpegDecode);
-+#endif
-     }
-   }
- 
---- content/browser/renderer_host/render_process_host_impl.cc.orig	2019-07-29 16:36:09.000000000 -0400
-+++ content/browser/renderer_host/render_process_host_impl.cc	2019-07-31 14:04:18.859680348 -0400
-@@ -2937,7 +2937,11 @@
-     switches::kDefaultTileHeight,
-     switches::kDisable2dCanvasImageChromium,
-     switches::kDisableYUVImageDecoding,
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+    switches::kEnableAcceleratedVideo,
-+#else
-     switches::kDisableAcceleratedVideoDecode,
-+#endif
-     switches::kDisableBackgroundTimerThrottling,
-     switches::kDisableBestEffortTasks,
-     switches::kDisableBreakpad,
-@@ -3077,8 +3081,10 @@
- #if BUILDFLAG(ENABLE_PLUGINS)
-     switches::kEnablePepperTesting,
- #endif
-+#if !defined(OS_LINUX) || defined(OS_CHROMEOS)
-     switches::kDisableWebRtcHWDecoding,
-     switches::kDisableWebRtcHWEncoding,
-+#endif
-     switches::kEnableWebRtcSrtpAesGcm,
-     switches::kEnableWebRtcSrtpEncryptedHeaders,
-     switches::kEnableWebRtcStunOrigin,
-diff -ur content/browser/utility_process_host.cc chromium-69.0.3497.92/content/browser/utility_process_host.cc
---- content/browser/utility_process_host.cc	2018-09-12 00:39:41.000000000 +0530
-+++ content/browser/utility_process_host.cc	2018-09-13 22:10:34.296005227 +0530
-@@ -296,7 +296,11 @@
-       switches::kOverrideUseSoftwareGLForTests,
-       switches::kOverrideEnabledCdmInterfaceVersion,
-       switches::kProxyServer,
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+      switches::kEnableAcceleratedMjpegDecode,
-+#else
-       switches::kDisableAcceleratedMjpegDecode,
-+#endif
-       switches::kUseFakeDeviceForMediaStream,
-       switches::kUseFakeJpegDecodeAccelerator,
-       switches::kUseFileForFakeVideoCapture,
-diff -ur content/browser/webrtc/webrtc_media_recorder_browsertest.cc chromium-69.0.3497.92/content/browser/webrtc/webrtc_media_recorder_browsertest.cc
---- content/browser/webrtc/webrtc_media_recorder_browsertest.cc	2018-09-12 00:39:41.000000000 +0530
-+++ content/browser/webrtc/webrtc_media_recorder_browsertest.cc	2018-09-13 22:10:34.143009916 +0530
-@@ -66,7 +66,12 @@
-       return;
-     // This flag is also used for encoding, https://crbug.com/616640.
-     base::CommandLine::ForCurrentProcess()->AppendSwitch(
--        switches::kDisableAcceleratedVideoDecode);
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+        switches::kEnableAcceleratedVideo
-+#else
-+        switches::kDisableAcceleratedVideoDecode
-+#endif
-+        );
-   }
- 
-  private:
-diff -ur content/gpu/BUILD.gn chromium-69.0.3497.92/content/gpu/BUILD.gn
---- content/gpu/BUILD.gn	2018-09-12 00:39:41.000000000 +0530
-+++ content/gpu/BUILD.gn	2018-09-13 22:10:34.148009763 +0530
-@@ -133,4 +133,8 @@
+Index: dev/content/gpu/BUILD.gn
+===================================================================
+--- content/gpu/BUILD.gn
++++ content/gpu/BUILD.gn
+@@ -6,6 +6,7 @@ import("//build/config/jumbo.gni")
+ import("//build/config/ui.gni")
+ import("//gpu/vulkan/features.gni")
+ import("//media/media_options.gni")
++import("//media/gpu/args.gni")
+ import("//ui/ozone/ozone.gni")
+ 
+ # See //content/BUILD.gn for how this works.
+@@ -128,4 +129,8 @@ target(link_target_type, "gpu_sources")
        (!is_chromecast || is_cast_desktop_build)) {
      configs += [ "//build/config/linux/dri" ]
    }
 +
-+  if (is_desktop_linux) {
-+    public_configs = [ "//media/gpu:libva_config" ]
++  if (is_desktop_linux && use_vaapi) {
++    public_configs = [ "//build/config/linux/libva" ]
 +  }
  }
-diff -ur content/gpu/gpu_main.cc chromium-69.0.3497.92/content/gpu/gpu_main.cc
---- content/gpu/gpu_main.cc	2019-07-02 09:50:13.403486804 -0400
-+++ content/gpu/gpu_main.cc	2019-07-02 09:55:07.256818723 -0400
-@@ -288,7 +288,7 @@
- 
-   base::PlatformThread::SetName("CrGpuMain");
- 
--#if defined(OS_ANDROID) || defined(OS_CHROMEOS) || defined(USE_OZONE)
-+#if defined(OS_LINUX)
-   // Set thread priority before sandbox initialization.
-   base::PlatformThread::SetCurrentThreadPriority(base::ThreadPriority::DISPLAY);
- #endif
-@@ -321,7 +321,7 @@
-   GetContentClient()->SetGpuInfo(gpu_init->gpu_info());
- 
-   base::ThreadPriority io_thread_priority = base::ThreadPriority::NORMAL;
--#if defined(OS_ANDROID) || defined(OS_CHROMEOS) || defined(USE_OZONE)
-+#if defined(OS_LINUX)
-   io_thread_priority = base::ThreadPriority::DISPLAY;
- #endif
- 
-diff -ur content/public/browser/gpu_utils.cc chromium-69.0.3497.92/content/public/browser/gpu_utils.cc
---- content/public/browser/gpu_utils.cc	2018-09-12 00:39:42.000000000 +0530
-+++ content/public/browser/gpu_utils.cc	2018-09-13 22:10:34.164009273 +0530
-@@ -57,9 +57,17 @@
-   gpu_preferences.in_process_gpu =
-       command_line->HasSwitch(switches::kInProcessGPU);
-   gpu_preferences.disable_accelerated_video_decode =
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+      !command_line->HasSwitch(switches::kEnableAcceleratedVideo);
-+#else
-       command_line->HasSwitch(switches::kDisableAcceleratedVideoDecode);
-+#endif
-   gpu_preferences.disable_accelerated_video_encode =
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+      !command_line->HasSwitch(switches::kEnableAcceleratedVideo);
-+#else
-       command_line->HasSwitch(switches::kDisableAcceleratedVideoEncode);
-+#endif
- #if defined(OS_WIN)
-   uint32_t enable_accelerated_vpx_decode_val =
-       gpu::GpuPreferences::VPX_VENDOR_MICROSOFT;
-diff -ur content/public/common/content_switches.cc chromium-69.0.3497.92/content/public/common/content_switches.cc
---- content/public/common/content_switches.cc	2018-09-12 00:39:42.000000000 +0530
-+++ content/public/common/content_switches.cc	2018-09-13 22:10:34.172009028 +0530
-@@ -79,6 +79,11 @@
- // Disable gpu-accelerated 2d canvas.
- const char kDisableAccelerated2dCanvas[]    = "disable-accelerated-2d-canvas";
- 
-+#if defined(OS_LINUX)
-+// Enables hardware acceleration of video for Linux only. VA-API driver
-+// is required to be present on the system installation.
-+const char kEnableAcceleratedVideo[] = "enable-accelerated-video";
-+#endif
- // Disables hardware acceleration of video decode, where available.
- const char kDisableAcceleratedVideoDecode[] =
-     "disable-accelerated-video-decode";
-@@ -868,11 +873,13 @@
- // ignores this switch on its stable and beta channels.
- const char kDisableWebRtcEncryption[]      = "disable-webrtc-encryption";
- 
-+#if defined(OS_CHROMEOS)
- // Disables HW decode acceleration for WebRTC.
- const char kDisableWebRtcHWDecoding[]       = "disable-webrtc-hw-decoding";
- 
- // Disables HW encode acceleration for WebRTC.
- const char kDisableWebRtcHWEncoding[] = "disable-webrtc-hw-encoding";
-+#endif
- 
- // Enables negotiation of GCM cipher suites from RFC 7714 for SRTP in WebRTC.
- // See https://tools.ietf.org/html/rfc7714 for further information.
-diff -ur content/public/common/content_switches.h chromium-69.0.3497.92/content/public/common/content_switches.h
---- content/public/common/content_switches.h	2018-09-12 00:39:42.000000000 +0530
-+++ content/public/common/content_switches.h	2018-09-13 22:10:34.172009028 +0530
-@@ -104,6 +104,9 @@
- CONTENT_EXPORT extern const char kDomAutomationController[];
- extern const char kDisable2dCanvasClipAntialiasing[];
- CONTENT_EXPORT extern const char kDumpBlinkRuntimeCallStats[];
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+CONTENT_EXPORT extern const char kEnableAcceleratedVideo[];
-+#endif
- CONTENT_EXPORT extern const char kEnableAccessibilityObjectModel[];
- CONTENT_EXPORT extern const char kEnableAggressiveDOMStorageFlushing[];
- CONTENT_EXPORT extern const char kEnableAutomation[];
-@@ -241,8 +244,10 @@
- CONTENT_EXPORT extern const char kWaitForDebuggerChildren[];
- 
- CONTENT_EXPORT extern const char kDisableWebRtcEncryption[];
-+#if defined(OS_CHROMEOS)
- CONTENT_EXPORT extern const char kDisableWebRtcHWDecoding[];
- CONTENT_EXPORT extern const char kDisableWebRtcHWEncoding[];
-+#endif
- CONTENT_EXPORT extern const char kEnableWebRtcSrtpAesGcm[];
- CONTENT_EXPORT extern const char kEnableWebRtcSrtpEncryptedHeaders[];
- CONTENT_EXPORT extern const char kEnableWebRtcStunOrigin[];
-diff -ur content/renderer/render_thread_impl.cc chromium-69.0.3497.92/content/renderer/render_thread_impl.cc
---- content/renderer/render_thread_impl.cc	2018-09-12 00:39:42.000000000 +0530
-+++ content/renderer/render_thread_impl.cc	2018-09-13 22:10:34.192008415 +0530
-@@ -1441,7 +1441,11 @@
-           kGpuStreamPriorityMedia);
- 
-   const bool enable_video_accelerator =
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+      cmd_line->HasSwitch(switches::kEnableAcceleratedVideo) &&
-+#else
-       !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode) &&
-+#endif
-       (gpu_channel_host->gpu_feature_info()
-            .status_values[gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE] ==
-        gpu::kGpuFeatureStatusEnabled);
-Only in content/renderer: render_thread_impl.cc.orig
-diff -ur gpu/config/software_rendering_list.json chromium-69.0.3497.92/gpu/config/software_rendering_list.json
---- gpu/config/software_rendering_list.json	2018-09-12 00:39:44.000000000 +0530
-+++ gpu/config/software_rendering_list.json	2018-09-13 22:10:34.193008384 +0530
-@@ -377,17 +377,6 @@
+Index: dev/gpu/config/software_rendering_list.json
+===================================================================
+--- gpu/config/software_rendering_list.json
++++ gpu/config/software_rendering_list.json
+@@ -369,17 +369,6 @@
        ]
      },
      {
@@ -418,119 +158,241 @@ diff -ur gpu/config/software_rendering_list.json chromium-69.0.3497.92/gpu/confi
        "id": 50,
        "description": "Disable VMware software renderer on older Mesa",
        "cr_bugs": [145531, 332596, 571899, 629434],
-diff -ur media/base/media_switches.cc chromium-69.0.3497.92/media/base/media_switches.cc
---- media/base/media_switches.cc.orig	2019-06-18 11:48:14.000000000 -0400
-+++ media/base/media_switches.cc	2019-07-02 12:32:22.370983036 -0400
-@@ -103,10 +103,15 @@
- const char kUseFakeMjpegDecodeAccelerator[] =
-     "use-fake-mjpeg-decode-accelerator";
- 
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+// Enable hardware accelerated mjpeg decode on linux
-+const char kEnableAcceleratedMjpegDecode[] = "enable-accelerated-mjpeg-decode";
-+#else
- // Disable hardware acceleration of mjpeg decode for captured frame, where
- // available.
- const char kDisableAcceleratedMjpegDecode[] =
-     "disable-accelerated-mjpeg-decode";
-+#endif
- 
- // When running tests on a system without the required hardware or libraries,
- // this flag will cause the tests to fail. Otherwise, they silently succeed.
-@@ -503,15 +508,21 @@
- };
- 
- bool IsVideoCaptureAcceleratedJpegDecodingEnabled() {
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+  if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
-+  	  switches::kEnableAcceleratedMjpegDecode)
-+#else
-   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
--          switches::kDisableAcceleratedMjpegDecode)) {
-+          switches::kDisableAcceleratedMjpegDecode)
-+#endif
-+          ) {
-     return false;
-   }
-   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+Index: dev/media/base/media_switches.cc
+===================================================================
+--- media/base/media_switches.cc
++++ media/base/media_switches.cc
+@@ -544,7 +544,7 @@ bool IsVideoCaptureAcceleratedJpegDecodi
            switches::kUseFakeMjpegDecodeAccelerator)) {
      return true;
    }
 -#if defined(OS_CHROMEOS)
-+#if !defined(OS_ANDROID) && defined(OS_LINUX)
++#if defined(OS_LINUX) && !defined(OS_ANDROID)
    return true;
  #endif
    return false;
-diff -ur media/base/media_switches.h chromium-69.0.3497.92/media/base/media_switches.h
---- media/base/media_switches.h.orig	2019-07-02 12:20:39.902984488 -0400
-+++ media/base/media_switches.h	2019-07-02 12:33:45.441923602 -0400
-@@ -60,7 +60,11 @@
- MEDIA_EXPORT extern const char kUseFileForFakeVideoCapture[];
- MEDIA_EXPORT extern const char kUseFileForFakeAudioCapture[];
- MEDIA_EXPORT extern const char kUseFakeMjpegDecodeAccelerator[];
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+MEDIA_EXPORT extern const char kEnableAcceleratedMjpegDecode[];
-+#else
- MEDIA_EXPORT extern const char kDisableAcceleratedMjpegDecode[];
-+#endif
- 
- MEDIA_EXPORT extern const char kRequireAudioHardwareForTesting[];
- MEDIA_EXPORT extern const char kMuteAudio[];
---- media/gpu/BUILD.gn.orig	2019-07-29 16:36:19.000000000 -0400
-+++ media/gpu/BUILD.gn	2019-07-31 14:09:28.093032826 -0400
-@@ -495,6 +495,14 @@
+Index: dev/media/filters/BUILD.gn
+===================================================================
+--- media/filters/BUILD.gn
++++ media/filters/BUILD.gn
+@@ -5,6 +5,7 @@
+ import("//build/config/jumbo.gni")
+ import("//media/media_options.gni")
+ import("//third_party/libaom/options.gni")
++import("//media/gpu/args.gni")
+ 
+ jumbo_source_set("filters") {
+   # Do not expand the visibility here without double-checking with OWNERS, this
+@@ -196,7 +197,7 @@ jumbo_source_set("filters") {
+     deps += [ "//media/base/android" ]
    }
- }
  
-+if (is_desktop_linux && use_vaapi) {
-+  import("//build/config/linux/pkg_config.gni")
-+
-+  pkg_config("libva_config") {
-+    packages = [ "libva" ]
-+  }
-+}
-+
- if (use_v4l2_codec || use_vaapi || is_mac || is_win) {
-   test("video_encode_accelerator_unittest") {
-     deps = [
-@@ -525,6 +533,10 @@
+-  if (current_cpu != "arm" && is_linux) {
++  if (use_vaapi) {
+     sources += [
+       "h264_bitstream_buffer.cc",
+       "h264_bitstream_buffer.h",
+Index: dev/media/gpu/BUILD.gn
+===================================================================
+--- media/gpu/BUILD.gn
++++ media/gpu/BUILD.gn
+@@ -531,6 +531,7 @@ if (use_v4l2_codec || use_vaapi || is_ma
      if (use_ozone) {
        deps += [ "//ui/ozone" ]
      }
-+
-+    if (is_desktop_linux) {
-+      public_configs = [ ":libva_config" ]
-+    }
++    public_configs = [ "//build/config/linux/libva" ]
    }
  }
  
---- content/renderer/media/webrtc/video_codec_factory.cc.orig	2019-07-02 16:39:57.973241977 -0400
-+++ content/renderer/media/webrtc/video_codec_factory.cc	2019-07-02 17:00:00.656342711 -0400
-@@ -187,8 +187,11 @@
-   std::unique_ptr<webrtc::VideoEncoderFactory> encoder_factory;
+Index: dev/media/gpu/gpu_video_decode_accelerator_factory.cc
+===================================================================
+--- media/gpu/gpu_video_decode_accelerator_factory.cc
++++ media/gpu/gpu_video_decode_accelerator_factory.cc
+@@ -171,6 +171,8 @@ GpuVideoDecodeAcceleratorFactory::Create
+     vda = (this->*create_vda_function)(workarounds, gpu_preferences, media_log);
+     if (vda && vda->Initialize(config, client))
+       return vda;
++    else
++      LOG(ERROR) << "Initialization of one or more VDAs failed.";
+   }
  
-   const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
--  if (gpu_factories && gpu_factories->IsGpuVideoAcceleratorEnabled() &&
--      !cmd_line->HasSwitch(switches::kDisableWebRtcHWEncoding)) {
-+  if (gpu_factories && gpu_factories->IsGpuVideoAcceleratorEnabled()
-+#if defined(OS_CHROMEOS)
-+      && !cmd_line->HasSwitch(switches::kDisableWebRtcHWEncoding)
+   return nullptr;
+@@ -229,6 +231,7 @@ GpuVideoDecodeAcceleratorFactory::Create
+     const gpu::GpuDriverBugWorkarounds& workarounds,
+     const gpu::GpuPreferences& gpu_preferences,
+     MediaLog* media_log) const {
++  LOG(WARNING) << "Initializing VAAPI VDA.";
+   std::unique_ptr<VideoDecodeAccelerator> decoder;
+   decoder.reset(new VaapiVideoDecodeAccelerator(make_context_current_cb_,
+                                                 bind_image_cb_));
+Index: dev/media/gpu/ipc/service/gpu_video_decode_accelerator.cc
+===================================================================
+--- media/gpu/ipc/service/gpu_video_decode_accelerator.cc
++++ media/gpu/ipc/service/gpu_video_decode_accelerator.cc
+@@ -380,6 +380,7 @@ bool GpuVideoDecodeAccelerator::Initiali
+     LOG(ERROR) << "Failed creating the VDA factory";
+     return false;
+   }
++  LOG(WARNING) << "Created the VDA factory";
+ 
+   const gpu::GpuDriverBugWorkarounds& gpu_workarounds =
+       stub_->channel()->gpu_channel_manager()->gpu_driver_bug_workarounds();
+@@ -393,6 +394,7 @@ bool GpuVideoDecodeAccelerator::Initiali
+                << (config.is_encrypted() ? " with encryption" : "");
+     return false;
+   }
++  LOG(WARNING) << "Created VDA";
+ 
+   // Attempt to set up performing decoding tasks on IO thread, if supported by
+   // the VDA.
+Index: dev/media/gpu/vaapi/vaapi_video_decode_accelerator.cc
+===================================================================
+--- media/gpu/vaapi/vaapi_video_decode_accelerator.cc
++++ media/gpu/vaapi/vaapi_video_decode_accelerator.cc
+@@ -64,6 +64,7 @@ void ReportToUMA(VAVDADecoderFailure fai
+                             VAVDA_DECODER_FAILURES_MAX + 1);
+ }
+ 
++#if defined(OS_ANDROID) || defined(OS_CHROMEOS)
+ // Returns true if the CPU is an Intel Gemini Lake or later (including Kaby
+ // Lake) Cpu platform id's are referenced from the following file in kernel
+ // source arch/x86/include/asm/intel-family.h
+@@ -76,6 +77,7 @@ bool IsGeminiLakeOrLater() {
+       cpuid.model() >= kGeminiLakeModelId;
+   return is_geminilake_or_later;
+ }
 +#endif
-+      ) {
-     encoder_factory.reset(new RTCVideoEncoderFactory(gpu_factories));
+ 
+ }  // namespace
+ 
+@@ -632,6 +634,10 @@ void VaapiVideoDecodeAccelerator::Assign
+   va_surface_format_ = GetVaFormatForVideoCodecProfile(profile_);
+   std::vector<VASurfaceID> va_surface_ids;
+ 
++  // Nvidia doesn't support VAProfileNone, so don't try to create a temporary
++  // copy buffer there. It's not needed anyways for hardware video decoding
++  // to work.
++#if defined(OS_ANDROID) || defined(OS_CHROMEOS)
+   // If we aren't in BufferAllocationMode::kNone, we have to allocate a
+   // |vpp_vaapi_wrapper_| for VaapiPicture to DownloadFromSurface() the VA's
+   // internal decoded frame.
+@@ -645,15 +651,20 @@ void VaapiVideoDecodeAccelerator::Assign
+       NotifyError(PLATFORM_FAILURE);
+     }
    }
++#endif
  
-@@ -205,8 +208,11 @@
-   std::unique_ptr<webrtc::VideoDecoderFactory> decoder_factory;
+   for (size_t i = 0; i < buffers.size(); ++i) {
+     // If we aren't in BufferAllocationMode::kNone, this |picture| is
+     // only used as a copy destination. Therefore, the VaapiWrapper used and
+     // owned by |picture| is |vpp_vaapi_wrapper_|.
+     std::unique_ptr<VaapiPicture> picture = vaapi_picture_factory_->Create(
++#if defined(OS_LINUX) && !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
++            vaapi_wrapper_,
++#else
+         (buffer_allocation_mode_ == BufferAllocationMode::kNone)
+             ? vaapi_wrapper_
+             : vpp_vaapi_wrapper_,
++#endif
+         make_context_current_cb_, bind_image_cb_, buffers[i]);
+     RETURN_AND_NOTIFY_ON_FAILURE(picture, "Failed creating a VaapiPicture",
+                                  PLATFORM_FAILURE, );
+@@ -1078,6 +1089,9 @@ VaapiVideoDecodeAccelerator::GetSupporte
+ 
+ VaapiVideoDecodeAccelerator::BufferAllocationMode
+ VaapiVideoDecodeAccelerator::DecideBufferAllocationMode() {
++#if defined(OS_LINUX) && !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
++  return BufferAllocationMode::kNormal;
++#else
+   // TODO(crbug.com/912295): Enable a better BufferAllocationMode for IMPORT
+   // |output_mode_| as well.
+   if (output_mode_ == VideoDecodeAccelerator::Config::OutputMode::IMPORT)
+@@ -1113,6 +1127,7 @@ VaapiVideoDecodeAccelerator::DecideBuffe
+     return BufferAllocationMode::kReduced;
  
-   const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
--  if (gpu_factories && gpu_factories->IsGpuVideoAcceleratorEnabled() &&
--      !cmd_line->HasSwitch(switches::kDisableWebRtcHWDecoding)) {
-+  if (gpu_factories && gpu_factories->IsGpuVideoAcceleratorEnabled() 
-+#if defined(OS_CHROMEOS)
-+      && !cmd_line->HasSwitch(switches::kDisableWebRtcHWDecoding)
+   return BufferAllocationMode::kSuperReduced;
 +#endif
-+      ) {
-     decoder_factory.reset(new RTCVideoDecoderFactory(gpu_factories));
+ }
+ 
+ bool VaapiVideoDecodeAccelerator::IsBufferAllocationModeReducedOrSuperReduced()
+Index: dev/media/gpu/vaapi/vaapi_wrapper.cc
+===================================================================
+--- media/gpu/vaapi/vaapi_wrapper.cc
++++ media/gpu/vaapi/vaapi_wrapper.cc
+@@ -324,6 +324,11 @@ void VADisplayState::PreSandboxInitializ
+       base::File::FLAG_OPEN | base::File::FLAG_READ | base::File::FLAG_WRITE);
+   if (drm_file.IsValid())
+     VADisplayState::Get()->SetDrmFd(drm_file.GetPlatformFile());
++
++  const char kNvidiaPath[] = "/dev/dri/nvidiactl";
++  base::File nvidia_file = base::File(
++      base::FilePath::FromUTF8Unsafe(kNvidiaPath),
++      base::File::FLAG_OPEN | base::File::FLAG_READ | base::File::FLAG_WRITE);
+ }
+ 
+ VADisplayState::VADisplayState()
+@@ -351,10 +356,6 @@ bool VADisplayState::Initialize() {
+ }
+ 
+ bool VADisplayState::InitializeOnce() {
+-  static_assert(
+-      VA_MAJOR_VERSION >= 2 || (VA_MAJOR_VERSION == 1 && VA_MINOR_VERSION >= 1),
+-      "Requires VA-API >= 1.1.0");
+-
+   switch (gl::GetGLImplementation()) {
+     case gl::kGLImplementationEGLGLES2:
+       va_display_ = vaGetDisplayDRM(drm_fd_.get());
+@@ -362,10 +363,10 @@ bool VADisplayState::InitializeOnce() {
+     case gl::kGLImplementationDesktopGL:
+ #if defined(USE_X11)
+       va_display_ = vaGetDisplay(gfx::GetXDisplay());
+-#else
+-      LOG(WARNING) << "VAAPI video acceleration not available without "
+-                      "DesktopGL (GLX).";
++      if (vaDisplayIsValid(va_display_))
++        break;
+ #endif  // USE_X11
++      va_display_ = vaGetDisplayDRM(drm_fd_.get());
+       break;
+     // Cannot infer platform from GL, try all available displays
+     case gl::kGLImplementationNone:
+@@ -398,8 +399,19 @@ bool VADisplayState::InitializeOnce() {
+   int major_version, minor_version;
+   VAStatus va_res = vaInitialize(va_display_, &major_version, &minor_version);
+   if (va_res != VA_STATUS_SUCCESS) {
+-    LOG(ERROR) << "vaInitialize failed: " << vaErrorStr(va_res);
+-    return false;
++    LOG(ERROR) << "vaInitialize failed (ignore if using Wayland desktop environment): " << vaErrorStr(va_res);
++    va_display_ = vaGetDisplayDRM(drm_fd_.get());
++    if (!vaDisplayIsValid(va_display_)) {
++      LOG(ERROR) << "Could not get a valid DRM VA display";
++      return false;
++    }
++    va_res = vaInitialize(va_display_, &major_version, &minor_version);
++    if (va_res != VA_STATUS_SUCCESS) {
++      LOG(ERROR) << "vaInitialize failed using DRM: " << vaErrorStr(va_res);
++      return false;
++    } else {
++      LOG(WARNING) << "vaInitialize succeeded for DRM";
++    }
    }
  
+   va_initialized_ = true;
+@@ -407,7 +419,7 @@ bool VADisplayState::InitializeOnce() {
+   va_vendor_string_ = vaQueryVendorString(va_display_);
+   DLOG_IF(WARNING, va_vendor_string_.empty())
+       << "Vendor string empty or error reading.";
+-  DVLOG(1) << "VAAPI version: " << major_version << "." << minor_version << " "
++  VLOG(1) << "VAAPI version: " << major_version << "." << minor_version << " "
+            << va_vendor_string_;
+ 
+   // The VAAPI version is determined from what is loaded on the system by
+@@ -742,7 +754,7 @@ bool VASupportedProfiles::AreAttribsSupp
+     if (attribs[i].type != required_attribs[i].type ||
+         (attribs[i].value & required_attribs[i].value) !=
+             required_attribs[i].value) {
+-      DVLOG(1) << "Unsupported value " << required_attribs[i].value
++      VLOG(1) << "Unsupported value " << required_attribs[i].value
+                << " for attribute type " << required_attribs[i].type;
+       return false;
+     }
diff --git a/srcpkgs/chromium/patches/harfbuzz-subset.patch b/srcpkgs/chromium/patches/harfbuzz-subset.patch
new file mode 100644
index 00000000000..6f228b774d4
--- /dev/null
+++ b/srcpkgs/chromium/patches/harfbuzz-subset.patch
@@ -0,0 +1,49 @@
+From 27e25336b8316ff3ec4e464058682ed85801fd06 Mon Sep 17 00:00:00 2001
+From: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
+Date: Mon, 29 Jul 2019 10:54:28 +0000
+Subject: [PATCH] Also link against libharfbuzz-subset when use_system_harfbuzz is true
+
+When building HarfBuzz as part of Chromium, there is a single source set
+with all the files we need in the build.
+
+Upstream HarfBuzz, on the other hand, produces a few different libraries:
+harfbuzz, harfbuzz-icu and harfbuzz-subset.  When |use_system_harfbuzz| is
+true, we were only looking for (and using) harfbuzz.pc with pkg-config even
+though we also use symbols from libharfbuzz-subset.so. This resulted in
+errors when linking:
+
+    ld: obj/skia/skia/SkPDFSubsetFont.o: in function `SkPDFSubsetFont(sk_sp<SkData>, SkPDFGlyphUse const&, SkPDF::Metadata::Subsetter, char const*, int)':
+    SkPDFSubsetFont.cpp:(.text._Z15SkPDFSubsetFont5sk_spI6SkDataERK13SkPDFGlyphUseN5SkPDF8Metadata9SubsetterEPKci+0x48a): undefined reference to `hb_subset_input_create_or_fail'
+    ld: SkPDFSubsetFont.cpp:(.text._Z15SkPDFSubsetFont5sk_spI6SkDataERK13SkPDFGlyphUseN5SkPDF8Metadata9SubsetterEPKci+0x4af): undefined reference to `hb_subset_input_glyph_set'
+    ld: SkPDFSubsetFont.cpp:(.text._Z15SkPDFSubsetFont5sk_spI6SkDataERK13SkPDFGlyphUseN5SkPDF8Metadata9SubsetterEPKci+0x5d7): undefined reference to `hb_subset_input_set_retain_gids'
+    ld: SkPDFSubsetFont.cpp:(.text._Z15SkPDFSubsetFont5sk_spI6SkDataERK13SkPDFGlyphUseN5SkPDF8Metadata9SubsetterEPKci+0x5e4): undefined reference to `hb_subset_input_set_drop_hints'
+    ld: SkPDFSubsetFont.cpp:(.text._Z15SkPDFSubsetFont5sk_spI6SkDataERK13SkPDFGlyphUseN5SkPDF8Metadata9SubsetterEPKci+0x5f3): undefined reference to `hb_subset'
+    ld: SkPDFSubsetFont.cpp:(.text._Z15SkPDFSubsetFont5sk_spI6SkDataERK13SkPDFGlyphUseN5SkPDF8Metadata9SubsetterEPKci+0x66f): undefined reference to `hb_subset_input_destroy'
+
+as reported in
+https://groups.google.com/a/chromium.org/d/msg/chromium-packagers/UyJsVJ5QqWo/jSv5z7-rEQAJ
+
+Change-Id: I997af075c7b7263cd7cc71a63db5b0f93bd1ab59
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1715288
+Auto-Submit: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
+Commit-Queue: Dominik Röttsches <drott@chromium.org>
+Reviewed-by: Dominik Röttsches <drott@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#681760}
+---
+
+diff --git a/third_party/harfbuzz-ng/BUILD.gn b/third_party/harfbuzz-ng/BUILD.gn
+index 37d8e33..72013eb1d 100644
+--- third_party/harfbuzz-ng/BUILD.gn
++++ third_party/harfbuzz-ng/BUILD.gn
+@@ -16,7 +16,10 @@
+       "//third_party:freetype_harfbuzz",
+       "//third_party/freetype:freetype_source",
+     ]
+-    packages = [ "harfbuzz" ]
++    packages = [
++      "harfbuzz",
++      "harfbuzz-subset",
++    ]
+   }
+ } else {
+   config("harfbuzz_config") {
diff --git a/srcpkgs/chromium/patches/linked-hash-set.patch b/srcpkgs/chromium/patches/linked-hash-set.patch
new file mode 100644
index 00000000000..24b13d8a5c0
--- /dev/null
+++ b/srcpkgs/chromium/patches/linked-hash-set.patch
@@ -0,0 +1,130 @@
+From 74138b9febd37eac0fc26b8efb110014a83a52c6 Mon Sep 17 00:00:00 2001
+From: Jeremy Roman <jbroman@chromium.org>
+Date: Wed, 07 Aug 2019 13:26:48 +0000
+Subject: [PATCH] WTF: Make LinkedHashSet understand values for which memset initialization would be bad.
+
+Includes a unit test which fails before, and uses this to fix FontCacheKeyTraits.
+
+Bug: 980025
+Change-Id: If41f97444c7fd37b9b95d6dadaf3da5689079e9e
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1739948
+Reviewed-by: Kentaro Hara <haraken@chromium.org>
+Reviewed-by: Yutaka Hirano <yhirano@chromium.org>
+Commit-Queue: Jeremy Roman <jbroman@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#684731}
+---
+
+diff --git a/third_party/blink/renderer/platform/fonts/font_cache_key.h b/third_party/blink/renderer/platform/fonts/font_cache_key.h
+index 0efc8fb..90063cb 100644
+--- third_party/blink/renderer/platform/fonts/font_cache_key.h
++++ third_party/blink/renderer/platform/fonts/font_cache_key.h
+@@ -133,6 +133,10 @@
+ 
+ struct FontCacheKeyTraits : WTF::SimpleClassHashTraits<FontCacheKey> {
+   STATIC_ONLY(FontCacheKeyTraits);
++
++  // std::string's empty state need not be zero in all implementations,
++  // and it is held within FontFaceCreationParams.
++  static const bool kEmptyValueIsZero = false;
+ };
+ 
+ }  // namespace blink
+diff --git a/third_party/blink/renderer/platform/wtf/linked_hash_set.h b/third_party/blink/renderer/platform/wtf/linked_hash_set.h
+index b35b6e9..77e524c 100644
+--- third_party/blink/renderer/platform/wtf/linked_hash_set.h
++++ third_party/blink/renderer/platform/wtf/linked_hash_set.h
+@@ -146,6 +146,11 @@
+                     LinkedHashSetNodeBase* next)
+       : LinkedHashSetNodeBase(prev, next), value_(value) {}
+ 
++  LinkedHashSetNode(ValueArg&& value,
++                    LinkedHashSetNodeBase* prev,
++                    LinkedHashSetNodeBase* next)
++      : LinkedHashSetNodeBase(prev, next), value_(std::move(value)) {}
++
+   LinkedHashSetNode(LinkedHashSetNode&& other)
+       : LinkedHashSetNodeBase(std::move(other)),
+         value_(std::move(other.value_)) {}
+@@ -445,10 +450,13 @@
+ 
+   // The slot is empty when the next_ field is zero so it's safe to zero
+   // the backing.
+-  static const bool kEmptyValueIsZero = true;
++  static const bool kEmptyValueIsZero = ValueTraits::kEmptyValueIsZero;
+ 
+   static const bool kHasIsEmptyValueFunction = true;
+   static bool IsEmptyValue(const Node& node) { return !node.next_; }
++  static Node EmptyValue() {
++    return Node(ValueTraits::EmptyValue(), nullptr, nullptr);
++  }
+ 
+   static const int kDeletedValue = -1;
+ 
+diff --git a/third_party/blink/renderer/platform/wtf/list_hash_set_test.cc b/third_party/blink/renderer/platform/wtf/list_hash_set_test.cc
+index 4c3f899..cd1be00 100644
+--- third_party/blink/renderer/platform/wtf/list_hash_set_test.cc
++++ third_party/blink/renderer/platform/wtf/list_hash_set_test.cc
+@@ -487,6 +487,7 @@
+ };
+ 
+ struct Complicated {
++  Complicated() : Complicated(0) {}
+   Complicated(int value) : simple_(value) { objects_constructed_++; }
+ 
+   Complicated(const Complicated& other) : simple_(other.simple_) {
+@@ -495,9 +496,6 @@
+ 
+   Simple simple_;
+   static int objects_constructed_;
+-
+- private:
+-  Complicated() = delete;
+ };
+ 
+ int Complicated::objects_constructed_ = 0;
+@@ -731,4 +729,45 @@
+ 
+ }  // anonymous namespace
+ 
++// A unit type which objects to its state being initialized wrong.
++struct InvalidZeroValue {
++  InvalidZeroValue() = default;
++  InvalidZeroValue(WTF::HashTableDeletedValueType) : deleted_(true) {}
++  ~InvalidZeroValue() { CHECK(ok_); }
++  bool IsHashTableDeletedValue() const { return deleted_; }
++
++  bool ok_ = true;
++  bool deleted_ = false;
++};
++
++template <>
++struct HashTraits<InvalidZeroValue> : SimpleClassHashTraits<InvalidZeroValue> {
++  static const bool kEmptyValueIsZero = false;
++};
++
++template <>
++struct DefaultHash<InvalidZeroValue> {
++  struct Hash {
++    static unsigned GetHash(const InvalidZeroValue&) { return 0; }
++    static bool Equal(const InvalidZeroValue&, const InvalidZeroValue&) {
++      return true;
++    }
++  };
++};
++
++template <typename Set>
++class ListOrLinkedHashSetInvalidZeroTest : public testing::Test {};
++
++using InvalidZeroValueSetTypes =
++    testing::Types<ListHashSet<InvalidZeroValue>,
++                   ListHashSet<InvalidZeroValue, 1>,
++                   LinkedHashSet<InvalidZeroValue>>;
++TYPED_TEST_SUITE(ListOrLinkedHashSetInvalidZeroTest, InvalidZeroValueSetTypes);
++
++TYPED_TEST(ListOrLinkedHashSetInvalidZeroTest, InvalidZeroValue) {
++  using Set = TypeParam;
++  Set set;
++  set.insert(InvalidZeroValue());
++}
++
+ }  // namespace WTF
diff --git a/srcpkgs/chromium/patches/one_euro_filter.patch b/srcpkgs/chromium/patches/one_euro_filter.patch
new file mode 100644
index 00000000000..357babf1668
--- /dev/null
+++ b/srcpkgs/chromium/patches/one_euro_filter.patch
@@ -0,0 +1,11 @@
+--- third_party/one_euro_filter/src/one_euro_filter.h.orig	2019-09-29 21:21:03.958633609 -0400
++++ third_party/one_euro_filter/src/one_euro_filter.h	2019-09-29 21:21:54.128270940 -0400
+@@ -3,6 +3,8 @@
+ 
+ #include "low_pass_filter.h"
+ 
++#include <memory>
++
+ namespace one_euro_filter {
+ namespace test {
+ class OneEuroFilterTest;
diff --git a/srcpkgs/chromium/patches/sandbox-sched_getparam.patch b/srcpkgs/chromium/patches/sandbox-sched_getparam.patch
new file mode 100644
index 00000000000..aa2d9aa1846
--- /dev/null
+++ b/srcpkgs/chromium/patches/sandbox-sched_getparam.patch
@@ -0,0 +1,20 @@
+Allow SYS_sched_getparam and SYS_sched_getscheduler
+musl uses them for pthread_getschedparam()
+
+source: https://git.alpinelinux.org/aports/commit/community/chromium?id=54af9f8ac24f52d382c5758e2445bf0206eff40e
+
+--- services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc.orig	2019-10-08 21:03:18.253080425 +0200
++++ services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc	2019-10-08 21:04:19.648549718 +0200
+@@ -88,10 +88,10 @@
+     case __NR_sysinfo:
+     case __NR_times:
+     case __NR_uname:
+-      return Allow();
+-    case __NR_sched_getaffinity:
+     case __NR_sched_getparam:
+     case __NR_sched_getscheduler:
++      return Allow();
++    case __NR_sched_getaffinity:
+     case __NR_sched_setscheduler:
+       return sandbox::RestrictSchedTarget(GetPolicyPid(), sysno);
+     case __NR_prlimit64:
diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index c407841598b..45893b5f8e1 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -1,7 +1,7 @@
 # Template file for 'chromium'
 pkgname=chromium
 # See http://www.chromium.org/developers/calendar for the latest version
-version=76.0.3809.87
+version=77.0.3865.120
 revision=1
 archs="i686 x86_64*"
 short_desc="Google's attempt at creating a safer, faster, and more stable browser"
@@ -9,7 +9,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://www.chromium.org/"
 distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz"
-checksum=215ca6acee7b4fd3c95fe796260af4dc5454dbba3b701aa43afeb98a06dc4194
+checksum=d792f9b09b1dcfd64e68f47a611c540dd1383dd9abd78ca1e06b2a7e2ff06af8
 
 lib32disabled=yes
 nodebug=yes
@@ -246,7 +246,7 @@ do_install() {
 
 	vinstall out/Release/icudtl.dat 0644 usr/lib/chromium
 
-	for size in 22 24 48 64 128 256; do
+	for size in 24 48 64 128 256; do
 		install -Dm644 "chrome/app/theme/chromium/product_logo_${size}.png" \
 		${DESTDIR}/usr/share/icons/hicolor/${size}x${size}/apps/chromium.png
 	done
diff --git a/srcpkgs/chronograf/template b/srcpkgs/chronograf/template
index c21c7a90a00..b23d2ef09a3 100644
--- a/srcpkgs/chronograf/template
+++ b/srcpkgs/chronograf/template
@@ -1,6 +1,6 @@
 # Template file for 'chronograf'
 pkgname=chronograf
-version=1.7.12
+version=1.7.14
 revision=1
 build_style=go
 go_import_path="github.com/influxdata/${pkgname}"
@@ -12,7 +12,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="AGPL-3.0"
 homepage="https://www.influxdata.com/time-series-platform/chronograf/"
 distfiles="https://github.com/influxdata/${pkgname}/archive/${version}.tar.gz"
-checksum=b98b63577a039d3d505bcf953b3067fe180d09a91688ec162f9c8f00ee816dd3
+checksum=245479b691e2ad484717778562ce9e0c21b1d769e7d748335d1c5f41cd677d4c
 
 system_accounts="_chronograf"
 _chronograf_homedir="/var/lib/${pkgname}"
diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template
index 63027ef5197..5e6a1ab71d5 100644
--- a/srcpkgs/cinnamon-control-center/template
+++ b/srcpkgs/cinnamon-control-center/template
@@ -1,6 +1,6 @@
 # Template file for 'cinnamon-control-center'
 pkgname=cinnamon-control-center
-version=4.0.1
+version=4.2.2
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-update-mimedb --disable-systemd"
@@ -13,12 +13,12 @@ makedepends="ModemManager-devel cinnamon-desktop-devel cinnamon-menus-devel
  pulseaudio-devel tzdata upower-devel"
 depends="libcinnamon-control-center>=${version}_${revision} cinnamon-settings-daemon>=2.4
  cinnamon-translations>=2.4 desktop-file-utils hicolor-icon-theme"
-short_desc="The Cinnamon Control Center"
+short_desc="Cinnamon Control Center"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html"
 distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=130663817d55a6f37f6f5a51b2aa71b7b2ec7c684ef358f16b5a47e1b133ff76
+checksum=0cd334e9fc36165664362d2bef7953879ec1f1d1becdbce21ef0557ea34618d7
 nocross="gobject-introspection"
 
 do_check() {
diff --git a/srcpkgs/cinnamon-desktop/template b/srcpkgs/cinnamon-desktop/template
index 10cf9698c70..926e292256d 100644
--- a/srcpkgs/cinnamon-desktop/template
+++ b/srcpkgs/cinnamon-desktop/template
@@ -1,7 +1,7 @@
 # Template file for 'cinnamon-desktop'
 pkgname=cinnamon-desktop
-version=4.0.1
-revision=4
+version=4.2.0
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Dalsa=true"
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://developer.linuxmint.com/projects/cinnamon-projects.html"
 distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=72d4a8c78e42cf9d000f553551f3f3645df77c3c23973c989d7d269acd659100
+checksum=e7e6e9aa6e5c5c04a8320cb97ef545700826d04fc34e0f50d140d2efa41941a1
 
 case "$XBPS_TARGET_MACHINE" in
 	aarch64-musl) broken="Expat.c: loadable library and perl binaries are mismatched (got handshake key 0xce00080, needed 0xc800080)" ;;
diff --git a/srcpkgs/cinnamon-menus/template b/srcpkgs/cinnamon-menus/template
index affa413fa12..eedb8cbf29f 100644
--- a/srcpkgs/cinnamon-menus/template
+++ b/srcpkgs/cinnamon-menus/template
@@ -1,9 +1,8 @@
 # Template file for 'cinnamon-menus'
 pkgname=cinnamon-menus
-version=4.0.0
+version=4.2.0
 revision=1
-build_style=gnu-configure
-configure_args=" --disable-static"
+build_style=meson
 hostmakedepends="glib-devel gnome-common gobject-introspection intltool libtool
  pkg-config"
 makedepends="libglib-devel gobject-introspection"
@@ -12,12 +11,9 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
 distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=e42c642a6fcb3b8e53d6b8f389cca617c8988baaa6e85ac236b61edc38efc3a5
+checksum=331bd599d7a863fa92329483637de159c25c57467305691f9768e675cd63f7c2
 nocross="gobject-introspection"
 
-pre_configure() {
-	NOCONFIGURE=1 ./autogen.sh
-}
 
 cinnamon-menus-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/cinnamon-screensaver/template b/srcpkgs/cinnamon-screensaver/template
index 71f8a8ee026..9d39f32709a 100644
--- a/srcpkgs/cinnamon-screensaver/template
+++ b/srcpkgs/cinnamon-screensaver/template
@@ -1,6 +1,6 @@
 # Template file for 'cinnamon-screensaver'
 pkgname=cinnamon-screensaver
-version=4.0.3
+version=4.2.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
@@ -11,12 +11,12 @@ makedepends="cinnamon-desktop-devel dbus-glib-devel libXxf86misc-devel
 depends="cinnamon-translations hicolor-icon-theme python3-gobject
  python3-setproctitle python3-xapp xapps"
 conf_files="/etc/pam.d/${pkgname}"
-short_desc="The Cinnamon screensaver"
+short_desc="Cinnamon screensaver"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://developer.linuxmint.com/projects/cinnamon-projects.html/"
 distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=0835111cf01b25447076177944a977cebfe995b5ce3dcfe0fba841141ebbdaca
+checksum=8dee253e12cbd2f30f2c5112a8e5fba62b651733cb56aa327ede939506adf6a0
 
 nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/28904/steps/shell_3/logs/stdio
 pycompile_version="$py3_ver"
diff --git a/srcpkgs/cinnamon-session/template b/srcpkgs/cinnamon-session/template
index 04b89cbbab2..58b88acc618 100644
--- a/srcpkgs/cinnamon-session/template
+++ b/srcpkgs/cinnamon-session/template
@@ -1,6 +1,6 @@
 # Template file for 'cinnamon-session'
 pkgname=cinnamon-session
-version=4.0.0
+version=4.2.1
 revision=1
 build_style=meson
 configure_args="-Dwith-gconf=false"
@@ -8,12 +8,12 @@ hostmakedepends="pkg-config gobject-introspection
  gettext-devel dbus-glib-devel glib-devel intltool xmlto"
 makedepends="gtk+3-devel dbus-devel json-glib-devel libSM-devel
  pangox-compat-devel cinnamon-desktop-devel libcanberra-devel upower-devel
- elogind-devel libXtst-devel xapps-devel"
+ elogind-devel libXtst-devel xapps-devel GConf-devel"
 depends="cinnamon-desktop desktop-file-utils hicolor-icon-theme elogind"
-short_desc="The Cinnamon session handler"
+short_desc="Cinnamon session handler"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html"
 distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=cfd6d71ff4000f463b36ffa97ab415557d627776eefbe2720d8d954319a5bdc5
+checksum=bff38239942dc990ccb57c35bde43c19ebc8708284410de53c100e12c7005663
 nocross="gobject-introspection from cinnamon-desktop-devel"
diff --git a/srcpkgs/cinnamon-settings-daemon/template b/srcpkgs/cinnamon-settings-daemon/template
index 854aa640076..3641a1df2f0 100644
--- a/srcpkgs/cinnamon-settings-daemon/template
+++ b/srcpkgs/cinnamon-settings-daemon/template
@@ -1,6 +1,6 @@
 # Template file for 'cinnamon-settings-daemon'
 pkgname=cinnamon-settings-daemon
-version=4.0.3
+version=4.2.2
 revision=1
 build_style=gnu-configure
 configure_args=" --disable-static --disable-schemas-compile"
@@ -10,13 +10,13 @@ makedepends="cinnamon-desktop-devel elogind-devel ibus-devel json-glib-devel
  libSM-devel libcanberra-devel libgnomekbd-devel libgudev-devel libnotify-devel
  nss-devel polkit-devel pulseaudio-devel upower-devel"
 depends="desktop-file-utils hicolor-icon-theme"
-short_desc="The Cinnamon Settings Daemon"
+short_desc="Cinnamon Settings Daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
 changelog="https://raw.githubusercontent.com/linuxmint/cinnamon-settings-daemon/${version}/debian/changelog"
 distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=2b2530c089cf4d1f52510d00b38abc8f037776f61cb02942f3a3bbf242239c4f
+checksum=d5b1ff8b5777174a45ebf2906eb1690e79a241c1adeb56cd70f9f273674901f9
 nocross="gobject-introspection"
 
 pre_configure() {
diff --git a/srcpkgs/cinnamon-translations/template b/srcpkgs/cinnamon-translations/template
index 2eb1ad70d50..69e35cdf682 100644
--- a/srcpkgs/cinnamon-translations/template
+++ b/srcpkgs/cinnamon-translations/template
@@ -1,6 +1,6 @@
 # Template file for 'cinnamon-translations'
 pkgname=cinnamon-translations
-version=4.0.2
+version=4.2.2
 revision=1
 archs=noarch
 build_style=gnu-makefile
@@ -10,7 +10,7 @@ license="GPL-2.0-or-later"
 homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
 changelog="https://raw.githubusercontent.com/linuxmint/cinnamon-translations/${version}/debian/changelog"
 distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=07efa3d387aa91813dcc480e81237ae1daf1c8f817178ef7cbb2377ce8fba37d
+checksum=0bfcca02894dcff4644a77560515ea33d4beed1365210cf17ea66b04bf52ee1d
 
 do_install() {
 	vmkdir /usr/share/locale
diff --git a/srcpkgs/cinnamon/patches/595178cf57b80b977401460a147602832157b303.patch b/srcpkgs/cinnamon/patches/595178cf57b80b977401460a147602832157b303.patch
deleted file mode 100644
index 0e2bf8c54ba..00000000000
--- a/srcpkgs/cinnamon/patches/595178cf57b80b977401460a147602832157b303.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 595178cf57b80b977401460a147602832157b303 Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz93@gmail.com>
-Date: Fri, 5 Apr 2019 11:28:45 -0400
-Subject: [PATCH] PIL: remove unnnecessary version check and code fork (#8496)
-
-The Image.VERSION variable was deprecated some time ago and is now gone
-entirely. But its only use was to determine whether we were using at
-least the latest version of PIL, or any version of its fork, Pillow. And
-PIL was last developed in 2009 and does not support python3 at all, so
-we are guaranteed to be using Pillow.
-
-Moreover, the check does not really matter, as Pillow is guaranteed to
-load any image it opens, without the user doing so manually.
-
-Fixes #8495
----
- .../cinnamon/cinnamon-settings/bin/imtools.py | 27 +------------------
- 1 file changed, 1 insertion(+), 26 deletions(-)
-
-diff --git a/files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py b/files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py
-index 05605001f7..c386fe3847 100644
---- files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py
-+++ files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py
-@@ -620,31 +620,6 @@ def has_transparency(image):
-         has_alpha(image)
- 
- 
--if Image.VERSION == '1.1.7':
--
--    def split(image):
--        """Work around for bug in Pil 1.1.7
--
--        :param image: input image
--        :type image: PIL image object
--        :returns: the different color bands of the image (eg R, G, B)
--        :rtype: tuple
--        """
--        image.load()
--        return image.split()
--else:
--
--    def split(image):
--        """Work around for bug in Pil 1.1.7
--
--        :param image: input image
--        :type image: PIL image object
--        :returns: the different color bands of the image (eg R, G, B)
--        :rtype: tuple
--        """
--        return image.split()
--
--
- def get_alpha(image):
-     """Gets the image alpha band. Can handles P mode images with transpareny.
-     Returns a band with all values set to 255 if no alpha band exists.
-@@ -655,7 +630,7 @@ def get_alpha(image):
-     :rtype: single band image object
-     """
-     if has_alpha(image):
--        return split(image)[-1]
-+        return image.split()[-1]
-     if image.mode == 'P' and 'transparency' in image.info:
-         return image.convert('RGBA').split()[-1]
-     # No alpha layer, create one.
diff --git a/srcpkgs/cinnamon/patches/default-theme.patch b/srcpkgs/cinnamon/patches/default-theme.patch
deleted file mode 100644
index f18623acb57..00000000000
--- a/srcpkgs/cinnamon/patches/default-theme.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 36af45f699daa886a3c3fc3187e0b24b193294ad Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
-Date: Sat, 22 Nov 2014 22:39:39 +0100
-Subject: [PATCH] Set default theme to 'cinnamon'
-
----
- data/org.cinnamon.gschema.xml.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/data/org.cinnamon.gschema.xml.in b/data/org.cinnamon.gschema.xml.in
-index 91fa171..9f56e4c 100644
---- data/org.cinnamon.gschema.xml.in
-+++ data/org.cinnamon.gschema.xml.in
-@@ -581,7 +581,7 @@
-   <schema id="org.cinnamon.theme" path="/org/cinnamon/theme/"
-         gettext-domain="@GETTEXT_PACKAGE@">
-     <key name="name" type="s">
--      <default>""</default>
-+      <default>"cinnamon"</default>
-       <_summary>Theme name</_summary>
-       <_description>
-        The name of the theme
--- 
-2.1.3
-
diff --git a/srcpkgs/cinnamon/patches/set_wheel.patch b/srcpkgs/cinnamon/patches/set_wheel.patch
deleted file mode 100644
index 86228d1895d..00000000000
--- a/srcpkgs/cinnamon/patches/set_wheel.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py.orig	2017-12-18 13:53:18.000000000 +0100
-+++ files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py	2017-12-21 22:15:03.058109278 +0100
-@@ -839,11 +833,11 @@
-             pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size("/usr/share/cinnamon/faces/user-generic.png", 48, 48)
-             description = "<b>%s</b>\n%s" % (fullname, username)
-             piter = self.users.append(None, [new_user, pixbuf, description])
--            # Add the user to his/her own group and sudo if Administrator was selected
-+            # Add the user to his/her own group and wheel if Administrator was selected
-             if dialog.account_type_combo.get_active() == 1:
--                subprocess.call(["usermod", username, "-G", "%s,sudo,nopasswdlogin" % username])
-+                subprocess.call(["usermod", username, "-G", "%s,wheel,nopasswdlogin" % username]) 
-             else:
--                subprocess.call(["usermod", username, "-G", "%s,nopasswdlogin" % username])
-+                subprocess.call(["usermod", username, "-G", "%s" % username])
-             self.load_groups()
-         dialog.destroy()
- 
diff --git a/srcpkgs/cinnamon/template b/srcpkgs/cinnamon/template
index bdf374cea82..60b9e8be68b 100644
--- a/srcpkgs/cinnamon/template
+++ b/srcpkgs/cinnamon/template
@@ -1,7 +1,7 @@
 # Template file for 'cinnamon'
 pkgname=cinnamon
-version=4.0.10
-revision=2
+version=4.2.4
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-schemas-compile
  --enable-compile-warnings=no --disable-gtk-doc"
@@ -18,14 +18,15 @@ depends=" accountsservice caribou cinnamon-settings-daemon>=${version%.*}
  cinnamon-translations>=${version%.*} nemo>=${version%.*}
  gnome-themes-standard gnome-themes-standard-metacity gnome-backgrounds
  network-manager-applet polkit-gnome upower>=0.99.7 libkeybinder3 python3-dbus
- python3-gobject python3-pam python3-pexpect python3-Pillow python3-inotify"
+ python3-gobject python3-pam python3-pexpect python3-Pillow python3-inotify
+ python3-tinycss"
 short_desc="GNOME3 fork of Linux Mint with GNOME2 aspect"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
 changelog="https://raw.githubusercontent.com/linuxmint/Cinnamon/${version}/debian/changelog"
 distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=50e07fa014eeecb380e840a3be0f09c8af0ad368c64c6b8ce6c30b1f78a2bf66
+checksum=4329b03e08a82316b6890b761174132c18a349508387f005748c32436f6364fd
 nocross="gobject-introspection"
 
 pycompile_version="$py3_ver"
diff --git a/srcpkgs/cjs/template b/srcpkgs/cjs/template
index a6584d1923b..5db9aa80efc 100644
--- a/srcpkgs/cjs/template
+++ b/srcpkgs/cjs/template
@@ -1,11 +1,11 @@
 # Template file for 'cjs'
 pkgname=cjs
-version=4.0.0
-revision=2
+version=4.2.0
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-profiler"
 hostmakedepends="automake autoconf-archive libtool gnome-common pkg-config
- gobject-introspection glib-devel"
+ gobject-introspection glib-devel dbus"
 makedepends="mozjs52-devel dbus-glib-devel readline-devel gobject-introspection
  gtk+3-devel"
 short_desc="Javascript for Cinnamon"
@@ -13,7 +13,9 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
 distfiles="https://github.com/linuxmint/cjs/archive/${version}.tar.gz"
-checksum=acd520a503399753ecb0bfa71aa3d932d22ac6a72162043085ea48519a59d3f5
+checksum=77d1b9f0290135939ad03b60ac64ac637f05e886ba5b777b97f6742ee75af260
+nocross="yes" # https://api.travis-ci.org/v3/job/590340360/log.txt
+
 
 pre_configure() {
 	cp ${FILESDIR}/ax_code_coverage.m4 m4/
diff --git a/srcpkgs/ckb-next/template b/srcpkgs/ckb-next/template
index f3beb2d0a08..c6925c6691d 100644
--- a/srcpkgs/ckb-next/template
+++ b/srcpkgs/ckb-next/template
@@ -1,9 +1,9 @@
 # Template file for 'ckb-next'
 pkgname=ckb-next
-version=0.4.0
-revision=2
+version=0.4.2
+revision=1
 build_style=cmake
-configure_args="-DDISABLE_UPDATER=1"
+configure_args="-DDISABLE_UPDATER=1 -DUDEV_RULE_DIRECTORY=/usr/lib/udev/rules.d"
 hostmakedepends="qt5-devel"
 makedepends="qt5-devel quazip-qt5-devel eudev-libudev-devel $(vopt_if pulseaudio pulseaudio-devel)"
 short_desc="Corsair RGB Driver for Linux"
@@ -11,7 +11,7 @@ maintainer="Frank Steinborn <steinex@nognu.de>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/ckb-next/ckb-next"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=5521c5a94e87ba035c6d9340e37785fa6f29710215f3e3201bb6949c88de8bd1
+checksum=75b6908d5590c293dee8258a83d4ebe206306d3df9f867596e953ef7c6a86440
 build_options="pulseaudio"
 desc_option_pulseaudio="Enable support for music visualizer animation"
 
diff --git a/srcpkgs/ckbcomp/template b/srcpkgs/ckbcomp/template
index 00885ff6c2f..b6a0e1bc5d0 100644
--- a/srcpkgs/ckbcomp/template
+++ b/srcpkgs/ckbcomp/template
@@ -1,16 +1,16 @@
 # Template file for 'ckbcomp'
 pkgname=ckbcomp
-version=1.192
+version=1.193
 revision=1
 archs=noarch
-wrksrc="console-setup"
+wrksrc="console-setup-${version}"
 depends="perl"
 short_desc="Compile a XKB keyboard description to a keymap suitable for loadkeys"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://anonscm.debian.org/cgit/d-i/console-setup.git"
 distfiles="${DEBIAN_SITE}/main/c/console-setup/console-setup_${version}.tar.xz"
-checksum=4dbe2c9559ff68a61315efe4de2cb932396ede8c4a1df4b46b6fb0846cc59d5b
+checksum=d29c5d49cf4e0d8c1149bacbac38d9400d16f25a9fe3b8ad121737b0cc828977
 
 do_install() {
 	vbin Keyboard/ckbcomp
diff --git a/srcpkgs/clamav/template b/srcpkgs/clamav/template
index b74d1f6836b..e25a56e0a18 100644
--- a/srcpkgs/clamav/template
+++ b/srcpkgs/clamav/template
@@ -1,14 +1,15 @@
 # Template file for 'clamav'
 pkgname=clamav
-version=0.101.3
-revision=1
+version=0.102.0
+revision=2
 build_style=gnu-configure
 # XXX: system llvm is too new (< 3.7 required)
 # Shipped llvm does not build with gcc6
 configure_args="--sbindir=/usr/bin --libdir=/usr/lib
  --with-openssl=${XBPS_CROSS_BASE}/usr --with-pcre=${XBPS_CROSS_BASE}/usr
  --with-zlib=${XBPS_CROSS_BASE}/usr --with-libbz2-prefix=${XBPS_CROSS_BASE}/usr
- --with-system-libmspack=${XBPS_CROSS_BASE}/usr --with-user=_clamav --with-group=_clamav"
+ --with-system-libmspack=${XBPS_CROSS_BASE}/usr --with-libcurl=${XBPS_CROSS_BASE}/usr
+ --enable-ipv6 --with-user=_clamav --with-group=_clamav"
 conf_files="/etc/clamd.conf /etc/freshclam.conf"
 hostmakedepends="flex pkg-config zip"
 makedepends="json-c-devel libcurl-devel libmspack-devel libxml2-devel
@@ -18,7 +19,7 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-only"
 homepage="http://www.clamav.net/"
 distfiles="http://www.clamav.net/downloads/production/${pkgname}-${version}.tar.gz"
-checksum=68d42aac4a9cbde293288533a9a3c3d55863de38f2b8707c1ef2d987b1260338
+checksum=48fe188c46c793c2d0cb5c81c106e4690251aff6dc8aa6575dc688343291bee1
 _clamav_homedir="/var/lib/_${pkgname}"
 _clamav_descr="ClamAV user"
 system_accounts="_clamav"
diff --git a/srcpkgs/clang b/srcpkgs/clang
index 8ec3476f9c1..14540d7bad2 120000
--- a/srcpkgs/clang
+++ b/srcpkgs/clang
@@ -1 +1 @@
-llvm8
\ No newline at end of file
+llvm9
\ No newline at end of file
diff --git a/srcpkgs/clang-analyzer b/srcpkgs/clang-analyzer
index 8ec3476f9c1..14540d7bad2 120000
--- a/srcpkgs/clang-analyzer
+++ b/srcpkgs/clang-analyzer
@@ -1 +1 @@
-llvm8
\ No newline at end of file
+llvm9
\ No newline at end of file
diff --git a/srcpkgs/clang-tools-extra b/srcpkgs/clang-tools-extra
index 8ec3476f9c1..14540d7bad2 120000
--- a/srcpkgs/clang-tools-extra
+++ b/srcpkgs/clang-tools-extra
@@ -1 +1 @@
-llvm8
\ No newline at end of file
+llvm9
\ No newline at end of file
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index b7445b94b68..37ed2552729 100644
--- a/srcpkgs/claws-mail/template
+++ b/srcpkgs/claws-mail/template
@@ -1,7 +1,7 @@
 # Template file for 'claws-mail'
 pkgname=claws-mail
 version=3.17.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static --disable-python-plugin --disable-perl-plugin
  --enable-enchant --enable-gnutls"
diff --git a/srcpkgs/clazy/template b/srcpkgs/clazy/template
index 81f3176a363..f7f790395e6 100644
--- a/srcpkgs/clazy/template
+++ b/srcpkgs/clazy/template
@@ -1,7 +1,7 @@
 # Template file for 'clazy'
 pkgname=clazy
-version=1.5
-revision=2
+version=1.6
+revision=1
 build_style=cmake
 hostmakedepends="python"
 makedepends="clang llvm"
@@ -10,5 +10,5 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-or-later"
 homepage="https://cgit.kde.org/clazy.git/about/"
 distfiles="${KDE_SITE}/clazy/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=87e37aace395e31359d4258452bbf7d1bdb5eae39e21e0dc0d80a75db8b8b779
+checksum=806d1befaddba82316f4ea34f1cba38bcc7545d0981007e3527c1ff1576dd0de
 nocross="Clang cannot be installed as makedep"
diff --git a/srcpkgs/clearine/template b/srcpkgs/clearine/template
index 64919e918aa..419bb3c4550 100644
--- a/srcpkgs/clearine/template
+++ b/srcpkgs/clearine/template
@@ -1,32 +1,26 @@
 # Template file for 'clearine'
 pkgname=clearine
-version=0.5
+version=0.7
 revision=1
-archs=noarch
-build_style=gnu-makefile
-depends="gtk+3 python3-gobject"
+build_style=python3-module
+pycompile_module="Clearine"
+hostmakedepends="python3-setuptools"
+depends="python3-gobject python3-cairo"
 short_desc="GTK3-based logout-window overlay for independent windowmanager"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Frank Steinborn <steinex@nognu.de>"
 license="MIT"
 homepage="https://github.com/yuune/clearine"
 distfiles="https://github.com/yuune/clearine/archive/${version}.tar.gz"
-checksum=029d5ece64a0471d1978daa620f5f06c5757245f3fec240aade38c514b3a5145
+checksum=18a1a6b8b726c430e848a6688c97cd095fc01d7b15907fac28a267155b69588d
 conf_files="/etc/clearine.conf"
 
-do_build() {
-	sed -i data/clearine.conf \
-		-e "s;^\(restart =\) .*;\1 reboot;" \
-		-e "s;^\(shutdown =\) .*;\1 poweroff;"
+pre_build() {
+	sed -i src/data/clearine.conf \
+		-e "s;\(restart =\) .*;\1 reboot;" \
+		-e "s;\(shutdown =\) .*;\1 poweroff;"
 }
 
-do_install() {
-	local f
-
-	vmkdir usr/share/themes/Clearine-Fallback/clearine
-	vconf data/clearine.conf
-	for f in data/*.svg; do
-		vinstall $f 644 usr/share/themes/Clearine-Fallback/clearine
-	done
-	vbin clearine
+post_install() {
+	vconf src/data/clearine.conf
 	vlicense LICENSE
 }
diff --git a/srcpkgs/clementine/patches/add-missing-functional-includes-5630.patch b/srcpkgs/clementine/patches/add-missing-functional-includes-5630.patch
deleted file mode 100644
index 0355eefca7c..00000000000
--- a/srcpkgs/clementine/patches/add-missing-functional-includes-5630.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 8a6cc8b5069265e1e92e22def985e22c5955e503 Mon Sep 17 00:00:00 2001
-From: Morris Hafner <mmha@users.noreply.github.com>
-Date: Mon, 13 Feb 2017 17:46:46 +0100
-Subject: [PATCH] Add missing <functional> includes (#5630)
-
----
- src/core/mergedproxymodel.cpp | 1 +
- src/devices/giolister.cpp     | 1 +
- src/library/groupbydialog.cpp | 2 ++
- 3 files changed, 4 insertions(+)
-
-diff --git a/src/core/mergedproxymodel.cpp b/src/core/mergedproxymodel.cpp
-index 56217f6fd..8c210d391 100644
---- a/src/core/mergedproxymodel.cpp
-+++ b/src/core/mergedproxymodel.cpp
-@@ -23,6 +23,7 @@
- 
- #include <QStringList>
- 
-+#include <functional>
- #include <limits>
- 
- // boost::multi_index still relies on these being in the global namespace.
-diff --git a/src/devices/giolister.cpp b/src/devices/giolister.cpp
-index aa3bddb34..5f63ef248 100644
---- a/src/devices/giolister.cpp
-+++ b/src/devices/giolister.cpp
-@@ -17,6 +17,7 @@
- 
- #include "config.h"
- 
-+#include <functional>
- #include <memory>
- 
- #include <QFile>
-diff --git a/src/library/groupbydialog.cpp b/src/library/groupbydialog.cpp
-index 5efdc9f36..e5f711b34 100644
---- a/src/library/groupbydialog.cpp
-+++ b/src/library/groupbydialog.cpp
-@@ -20,6 +20,8 @@
- 
- #include <QPushButton>
- 
-+#include <functional>
-+
- // boost::multi_index still relies on these being in the global namespace.
- using std::placeholders::_1;
- using std::placeholders::_2;
--- 
-2.13.4
-
diff --git a/srcpkgs/clementine/patches/clementine-chromaprint-1.4.patch b/srcpkgs/clementine/patches/clementine-chromaprint-1.4.patch
deleted file mode 100644
index bfdc49265aa..00000000000
--- a/srcpkgs/clementine/patches/clementine-chromaprint-1.4.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From ded312685735fc266d4154d355286eeb86db3bcd Mon Sep 17 00:00:00 2001
-From: Chocobozzz <florian.bigard@gmail.com>
-Date: Thu, 8 Dec 2016 23:12:17 +0100
-Subject: [PATCH] Add compatibility with chromaprint >= 1.4
-
----
- src/musicbrainz/chromaprinter.cpp | 14 +++++++++++---
- 1 file changed, 11 insertions(+), 3 deletions(-)
-
-diff --git a/src/musicbrainz/chromaprinter.cpp b/src/musicbrainz/chromaprinter.cpp
-index 9579b62..c7ad99e 100644
---- a/src/musicbrainz/chromaprinter.cpp
-+++ b/src/musicbrainz/chromaprinter.cpp
-@@ -143,16 +143,24 @@ QString Chromaprinter::CreateFingerprint() {
-   ChromaprintContext* chromaprint =
-       chromaprint_new(CHROMAPRINT_ALGORITHM_DEFAULT);
-   chromaprint_start(chromaprint, kDecodeRate, kDecodeChannels);
--  chromaprint_feed(chromaprint, reinterpret_cast<void*>(data.data()),
-+  chromaprint_feed(chromaprint, reinterpret_cast<int16_t *>(data.data()),
-                    data.size() / 2);
-   chromaprint_finish(chromaprint);
- 
--  void* fprint = nullptr;
-   int size = 0;
-+
-+#if CHROMAPRINT_VERSION_MAJOR >= 1 && CHROMAPRINT_VERSION_MINOR >= 4
-+  u_int32_t *fprint = nullptr;
-+  char *encoded = nullptr;
-+#else
-+  void *fprint = nullptr;
-+  void *encoded = nullptr;
-+#endif
-+
-   int ret = chromaprint_get_raw_fingerprint(chromaprint, &fprint, &size);
-+
-   QByteArray fingerprint;
-   if (ret == 1) {
--    void* encoded = nullptr;
-     int encoded_size = 0;
-     chromaprint_encode_fingerprint(fprint, size, CHROMAPRINT_ALGORITHM_DEFAULT,
-                                    &encoded, &encoded_size, 1);
diff --git a/srcpkgs/clementine/patches/clementine-moodbar_flags.patch b/srcpkgs/clementine/patches/clementine-moodbar_flags.patch
deleted file mode 100644
index 5eadfec4c46..00000000000
--- a/srcpkgs/clementine/patches/clementine-moodbar_flags.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/gst/moodbar/CMakeLists.txt b/gst/moodbar/CMakeLists.txt
-index 44c1362..7ed5047 100644
---- a/gst/moodbar/CMakeLists.txt
-+++ b/gst/moodbar/CMakeLists.txt
-@@ -1,7 +1,7 @@
- cmake_minimum_required(VERSION 2.6)
- 
--set(CMAKE_C_FLAGS "-Wall")
--set(CMAKE_CXX_FLAGS "-Woverloaded-virtual -Wall --std=c++0x")
-+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
-+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual -Wall --std=c++0x")
- 
- include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
- 
diff --git a/srcpkgs/clementine/patches/clementine-sqlite-3.12.patch b/srcpkgs/clementine/patches/clementine-sqlite-3.12.patch
deleted file mode 100644
index 5c6a15227c7..00000000000
--- a/srcpkgs/clementine/patches/clementine-sqlite-3.12.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/src/core/database.cpp
-+++ b/src/core/database.cpp
-@@ -265,6 +265,16 @@
-   StaticInit();
-
-   {
-+#ifdef SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER
-+    QVariant v = db.driver()->handle();
-+    if (v.isValid() && qstrcmp(v.typeName(), "sqlite3*") == 0) {
-+      sqlite3* handle = *static_cast<sqlite3**>(v.data());
-+      if (handle) {
-+        sqlite3_db_config(handle, SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER, 1, NULL);
-+      }
-+    }
-+#endif
-+
-     QSqlQuery set_fts_tokenizer("SELECT fts3_tokenizer(:name, :pointer)", db);
-     set_fts_tokenizer.bindValue(":name", "unicode");
-     set_fts_tokenizer.bindValue(
diff --git a/srcpkgs/clementine/patches/protobuf-370.patch b/srcpkgs/clementine/patches/protobuf-370.patch
deleted file mode 100644
index 00617da94cd..00000000000
--- a/srcpkgs/clementine/patches/protobuf-370.patch
+++ /dev/null
@@ -1,82 +0,0 @@
---- a/src/internet/lastfm/lastfmcompat.cpp
-+++ b/src/internet/lastfm/lastfmcompat.cpp
-@@ -68,13 +68,13 @@ bool ParseQuery(const QByteArray& data, XmlQuery* query,
-       return false;
-     }
- #endif  // Q_OS_WIN32
--  } catch (lastfm::ws::ParseError e) {
-+  } catch (lastfm::ws::ParseError &e) {
-     qLog(Error) << "Last.fm parse error: " << e.enumValue();
-     if (connection_problems) {
-       *connection_problems = e.enumValue() == lastfm::ws::MalformedResponse;
-     }
-     return false;
--  } catch (std::runtime_error& e) {
-+  }  (std::runtime_error& e) {
-     qLog(Error) << e.what();
-     return false;
-   }
---- a/src/internet/spotify/spotifyblobdownloader.cpp
-+++ b/src/internet/spotify/spotifyblobdownloader.cpp
-@@ -216,7 +216,7 @@ bool SpotifyBlobDownloader::CheckSignature(
-         return false;
-       }
-     }
--  } catch (std::exception e) {
-+  } catch (std::exception &e) {
-     // This should only happen if we fail to parse our own key.
-     qLog(Debug) << "Verifying spotify blob signature failed:" << e.what();
-     return false;
---- a/src/songinfo/echonestbiographies.cpp
-+++ b/src/songinfo/echonestbiographies.cpp
-@@ -66,7 +66,7 @@ void EchoNestBiographies::RequestFinished() {
-   try {
-     request->artist_->parseProfile(reply);
-   }
--  catch (Echonest::ParseError e) {
-+  catch (Echonest::ParseError &e) {
-     qLog(Warning) << "Error parsing echonest reply:" << e.errorType()
-                   << e.what();
-   }
---- a/src/songinfo/echonestimages.cpp
-+++ b/src/songinfo/echonestimages.cpp
-@@ -68,7 +68,7 @@ void EchoNestImages::RequestFinished(QNetworkReply* reply, int id,
-   reply->deleteLater();
-   try {
-     artist.parseProfile(reply);
--  } catch (Echonest::ParseError e) {
-+  } catch (Echonest::ParseError &e) {
-     qLog(Warning) << "Error parsing echonest reply:" << e.errorType()
-                   << e.what();
-   }
-@@ -94,7 +94,7 @@ void EchoNestImages::IdsFound(QNetworkReply* reply, int request_id) {
-         DoSpotifyImageRequest(id.foreign_id, request_id);
-       }
-     }
--  } catch (Echonest::ParseError e) {
-+  } catch (Echonest::ParseError &e) {
-     qLog(Warning) << "Error parsing echonest reply:" << e.errorType()
-                   << e.what();
-   }
---- a/src/songinfo/echonestsimilarartists.cpp
-+++ b/src/songinfo/echonestsimilarartists.cpp
-@@ -47,7 +47,7 @@ void EchoNestSimilarArtists::RequestFinished() {
-   try {
-     artists = Echonest::Artist::parseSimilar(reply);
-   }
--  catch (Echonest::ParseError e) {
-+  catch (Echonest::ParseError &e) {
-     qLog(Warning) << "Error parsing echonest reply:" << e.errorType()
-                   << e.what();
-   }
---- a/src/songinfo/echonesttags.cpp
-+++ b/src/songinfo/echonesttags.cpp
-@@ -51,7 +51,7 @@ void EchoNestTags::RequestFinished() {
-   try {
-     request->artist_->parseProfile(reply);
-   }
--  catch (Echonest::ParseError e) {
-+  catch (Echonest::ParseError &e) {
-     qLog(Warning) << "Error parsing echonest reply:" << e.errorType()
-                   << e.what();
-   }
diff --git a/srcpkgs/clementine/patches/sentinel.patch b/srcpkgs/clementine/patches/sentinel.patch
deleted file mode 100644
index d2aeb7d27ac..00000000000
--- a/srcpkgs/clementine/patches/sentinel.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/gstenginepipeline.cpp	2017-09-22 23:13:31.520359890 +0200
-+++ b/src/engines/gstenginepipeline.cpp	2017-09-22 23:14:31.837362189 +0200
-@@ -375,7 +375,7 @@
-   // Link the elements with special caps
-   // The scope path through the tee gets 16-bit ints.
-   GstCaps* caps16 = gst_caps_new_simple("audio/x-raw", "format", G_TYPE_STRING,
--                                        "S16LE", NULL);
-+                                        "S16LE", (char*)0);
-   gst_element_link_filtered(probe_converter, probe_sink, caps16);
-   gst_caps_unref(caps16);
- 
---- a/chromaprinter.cpp	2017-09-22 23:18:59.324372383 +0200
-+++ b/src/musicbrainz/chromaprinter.cpp	2017-09-22 23:19:35.520373762 +0200
-@@ -78,7 +78,7 @@
-   // Chromaprint expects mono 16-bit ints at a sample rate of 11025Hz.
-   GstCaps* caps = gst_caps_new_simple(
-       "audio/x-raw", "format", G_TYPE_STRING, "S16LE", "channels", G_TYPE_INT,
--      kDecodeChannels, "rate", G_TYPE_INT, kDecodeRate, NULL);
-+      kDecodeChannels, "rate", G_TYPE_INT, kDecodeRate, (char*)0);
-   gst_element_link_filtered(resample, sink, caps);
-   gst_caps_unref(caps);
- 
---- a/cddasongloader.cpp	2017-09-22 23:25:22.975387004 +0200
-+++ b/src/devices/cddasongloader.cpp	2017-09-22 23:25:59.774388406 +0200
-@@ -62,7 +62,7 @@
-                  nullptr);
-   }
-   if (g_object_class_find_property (G_OBJECT_GET_CLASS (cdda_), "paranoia-mode")) {
--    g_object_set (cdda_, "paranoia-mode", 0, NULL);
-+    g_object_set (cdda_, "paranoia-mode", 0, (char*)0);
-   }
- 
-   // Change the element's state to ready and paused, to be able to query it
-@@ -106,7 +106,7 @@
- 
-   GstElement* pipeline = gst_pipeline_new("pipeline");
-   GstElement* sink = gst_element_factory_make ("fakesink", NULL);
--  gst_bin_add_many (GST_BIN (pipeline), cdda_, sink, NULL);
-+  gst_bin_add_many (GST_BIN (pipeline), cdda_, sink, (char*)0);
-   gst_element_link (cdda_, sink);
-   gst_element_set_state(pipeline, GST_STATE_READY);
-   gst_element_set_state(pipeline, GST_STATE_PAUSED);
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index 6e99f249328..cda941a6369 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,22 +1,26 @@
 # Template file for 'clementine'
 pkgname=clementine
 version=1.3.1
-revision=18
-wrksrc="Clementine-${version}"
+revision=21
+_commit=75f18dab23f0842713a4200a7e362efd51b12e31
+wrksrc="Clementine-${_commit}"
 build_style=cmake
-hostmakedepends="sparsehash pkg-config qt-host-tools qt-devel protobuf"
+configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF"
+hostmakedepends="sparsehash pkg-config qt5-qmake qt5-host-tools protobuf"
 makedepends="chromaprint-devel boost-devel gst-plugins-base1-devel liblastfm-devel
- qt-webkit-devel glew-devel qjson-devel sqlite-devel protobuf-devel libplist-devel
- libusbmuxd-devel libmtp-devel libcdio-devel qca-devel pulseaudio-devel glu-devel
+ qt5-devel glew-devel sqlite-devel protobuf-devel libplist-devel
+ libusbmuxd-devel libmtp-devel libcdio-devel pulseaudio-devel glu-devel
  taglib-devel crypto++-devel $(vopt_if spotify libspotify-devel) libechonest-devel
- libgpod-devel"
+ libgpod-devel libmygpo-qt-devel qt5-x11extras-devel qt5-plugin-mysql
+ qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds qt5-plugin-odbc
+ qt5-tools-devel"
 depends="desktop-file-utils"
 short_desc="Modern music player and library organizer"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="https://www.clementine-player.org/"
-distfiles="https://github.com/clementine-player/Clementine/archive/${version}.tar.gz"
-checksum=f885931a9ab7c88607d07b50c64fcce46fc05f13dd2c0a04188c94eff938f37c
+distfiles="https://github.com/clementine-player/Clementine/archive/${_commit}.tar.gz"
+checksum=0c29e596cb5acc6970754e3c20616c5474859b7d2e6f05f5cda5c539581e2c8a
 
 patch_args="-Np1"
 build_options="spotify"
diff --git a/srcpkgs/clipgrab/template b/srcpkgs/clipgrab/template
index 943cfaabde3..d437d592958 100644
--- a/srcpkgs/clipgrab/template
+++ b/srcpkgs/clipgrab/template
@@ -1,6 +1,6 @@
 # Template file for 'clipgrab'
 pkgname=clipgrab
-version=3.8.3
+version=3.8.5
 revision=1
 build_style=qmake
 configure_args=clipgrab.pro
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://clipgrab.org"
 distfiles="https://download.clipgrab.org/clipgrab-${version}.tar.gz"
-checksum=ee03fe7fbac15c8ed7f8e6fd577c8d9372472ac0317dc5bf7fc363f930dd1bed
+checksum=69c3264bedc72a6c98006b43f05413bce8724a3beec0081aa5d693bff9b7d249
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-location-devel qt5-quickcontrols2-devel
@@ -22,6 +22,10 @@ if [ "$CROSS_BUILD" ]; then
 	 qt5-host-tools"
 fi
 
+case "$XBPS_TARGET_MACHINE" in
+	arm*) broken="qt-webkit not available on arm"
+esac
+
 do_install() {
 	vbin clipgrab
 	vinstall icon.png 644 usr/share/pixmaps clipgrab.png
diff --git a/srcpkgs/clipman/template b/srcpkgs/clipman/template
new file mode 100644
index 00000000000..87303fff362
--- /dev/null
+++ b/srcpkgs/clipman/template
@@ -0,0 +1,14 @@
+# Template file for 'clipman'
+pkgname=clipman
+version=1.0.2
+revision=1
+build_style=go
+go_import_path=github.com/yory8/clipman
+hostmakedepends="git"
+depends="wl-clipboard"
+short_desc="Simple clipboard manager for Wayland"
+maintainer="travankor <travankor@tuta.io>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/yory8/clipman"
+distfiles="https://github.com/yory8/clipman/archive/v${version}.tar.gz"
+checksum=9ee2a03891d06594323777fad2e34b3787f41c5168f2354c52776bc8ad2868d3
diff --git a/srcpkgs/cloc/template b/srcpkgs/cloc/template
index b9fb0a9ae45..9fa379def29 100644
--- a/srcpkgs/cloc/template
+++ b/srcpkgs/cloc/template
@@ -1,6 +1,6 @@
 # Template file for 'cloc'
 pkgname=cloc
-version=1.82
+version=1.84
 revision=1
 archs=noarch
 hostmakedepends="perl"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/AlDanial/cloc"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=7ab390f3a4888d9b78df420bff586326b53e3f7fc0e0c9ff9b160d076ca85a17
+checksum=b88a3adc669c15a9a32975095090708ba4eee5a73b8498369fae14be5b8a37d4
 
 do_build() {
 	make -C Unix man
diff --git a/srcpkgs/cloudfuse/template b/srcpkgs/cloudfuse/template
index c5d930f1c02..5240fd0c6b7 100644
--- a/srcpkgs/cloudfuse/template
+++ b/srcpkgs/cloudfuse/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libxml2-devel libcurl-devel fuse-devel"
 short_desc="FUSE for Mosso's Cloud Files"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://redbo.github.io/cloudfuse"
 distfiles="https://github.com/redbo/cloudfuse/archive/${version}.tar.gz"
diff --git a/srcpkgs/clyrics/template b/srcpkgs/clyrics/template
index 3e4c42d3988..5a0144c5b30 100644
--- a/srcpkgs/clyrics/template
+++ b/srcpkgs/clyrics/template
@@ -1,6 +1,6 @@
 # Template file for 'clyrics'
 pkgname=clyrics
-version=0.11
+version=0.12
 revision=1
 archs=noarch
 depends="perl-LWP-Protocol-https perl-WWW-Mechanize"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
 homepage="https://trizenx.blogspot.fr/2013/02/mocp-lyrics.html"
 distfiles="https://github.com/trizen/clyrics/archive/${version}.tar.gz"
-checksum=221d746c9c60249c56d2637f10890609bb14a97316016d98ebdf0db57acf22e8
+checksum=3110a177618fee02b5b17539b1a7c2fe877238ee922ac2967e828c3db5efc799
 
 do_install() {
 	local f
diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template
index f7fbf78964c..4614373f36c 100644
--- a/srcpkgs/cmake-gui/template
+++ b/srcpkgs/cmake-gui/template
@@ -1,6 +1,6 @@
 # Template file for 'cmake-gui'
 pkgname=cmake-gui
-version=3.15.2
+version=3.15.4
 revision=1
 wrksrc="cmake-${version}"
 build_style=configure
@@ -15,7 +15,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later, BSD-3-Clause"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz"
-checksum=539088cb29a68e6d6a8fba5c00951e5e5b1a92c68fa38a83e1ed2f355933f768
+checksum=8a211589ea21374e49b25fc1fc170e2d5c7462b795f1b29c84dd0e984301ed7a
 nocross=yes
 
 do_install() {
diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template
index 0790260af45..c0b11d76885 100644
--- a/srcpkgs/cmake/template
+++ b/srcpkgs/cmake/template
@@ -1,7 +1,7 @@
 # Template file for 'cmake'
 pkgname=cmake
-version=3.15.2
-revision=2
+version=3.15.4
+revision=1
 build_style=configure
 make_check_target=test
 makedepends="expat-devel libarchive-devel libcurl-devel libuv-devel
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later, BSD-3-Clause"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz"
-checksum=539088cb29a68e6d6a8fba5c00951e5e5b1a92c68fa38a83e1ed2f355933f768
+checksum=8a211589ea21374e49b25fc1fc170e2d5c7462b795f1b29c84dd0e984301ed7a
 
 if [ "$CROSS_BUILD" ]; then
 	# XXX ugly :-)
diff --git a/srcpkgs/cmixer/patches/linux.patch b/srcpkgs/cmixer/patches/linux.patch
new file mode 100644
index 00000000000..653488322b4
--- /dev/null
+++ b/srcpkgs/cmixer/patches/linux.patch
@@ -0,0 +1,34 @@
+--- cmixer.pl.orig
++++ cmixer.pl
+@@ -34,23 +34,6 @@
+ 
+ sub read_mixerctl {
+ 	my $self = shift;
+-	foreach (`mixerctl 2>&1`) {
+-		#mixerctl: /dev/mixer: Device not configured
+-		die "No mixer device found" if (/^mixerctl: \/dev\/mixer.: Device not configured$/);
+-		#outputs.master=255,255 volume
+-		if (/^(outputs|inputs|record)\.([^\.]*)=(\d+),(\d+)\s+/) {
+-			$self->{mixer}{$1}{$2}{volume}{left} = $3;
+-			$self->{mixer}{$1}{$2}{volume}{right} = $4;
+-		# outputs.mono=255 volume
+-		} elsif (/^(outputs|inputs|record)\.([^\.]*)=(\d+)\s+/) {
+-			$self->{mixer}{$1}{$2}{volume}{center} = $3;
+-		# outputs.master.mute=off  [ off on ]
+-		} elsif (/^(outputs|inputs|record)\.(.*)\.mute=(on|off)\s+/) {
+-			$self->{mixer}{$1}{$2}{mute} = $3;
+-		}
+-		#todo: record.source=mic  [ mic cd video aux line mixerout mixeroutmono phone ]
+-		#inputs.mix_source=mic,beep,hp  { mic mic2 beep hp }
+-	}
+ 	foreach (`aucatctl 2>&1`) {
+ 		die "Failed to connect to sndiod" if (/couldn't open MIDI device$/);
+ 		#mplayer0=127
+@@ -59,7 +42,6 @@
+ 			$self->{mixer}{sndio}{$1}{volume}{center} = 2 * $2;
+ 		}
+ 	}
+-	die "No outputs found" unless (exists $self->{mixer}{outputs});
+ }
+ 
+ sub update_view {
diff --git a/srcpkgs/cmixer/template b/srcpkgs/cmixer/template
new file mode 100644
index 00000000000..1fefb2b529b
--- /dev/null
+++ b/srcpkgs/cmixer/template
@@ -0,0 +1,20 @@
+# Template file for 'cmixer'
+pkgname=cmixer
+version=0.2
+revision=1
+depends="aucatctl perl-Curses-UI"
+short_desc="Curses sndio mixer"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="ISC"
+homepage="https://rhaalovely.net/"
+distfiles="https://rhaalovely.net/stuff/cmixer-${version}.tar.gz"
+checksum=1ee4489a73f15b0a4a1c5698ac4476295b53c054c08a98ae94087f0f14104007
+
+post_extract() {
+	sed -n '3,15p' cmixer.pl >LICENSE
+}
+
+do_install() {
+	vbin cmixer.pl cmixer
+	vlicense LICENSE
+}
diff --git a/srcpkgs/cmocka/template b/srcpkgs/cmocka/template
index f9c71a870e6..ea0384420a3 100644
--- a/srcpkgs/cmocka/template
+++ b/srcpkgs/cmocka/template
@@ -8,7 +8,7 @@ configure_args="-DUNIT_TESTING=ON"
 # It contains a filename "\makeindex"
 # hostmakedepends="doxygen graphviz"
 short_desc="Unit testing framework in C"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://cmocka.org/"
 distfiles="https://cmocka.org/files/${version%.*}/cmocka-${version}.tar.xz"
diff --git a/srcpkgs/cmus/template b/srcpkgs/cmus/template
index 811a16d7a82..cbc752370cf 100644
--- a/srcpkgs/cmus/template
+++ b/srcpkgs/cmus/template
@@ -1,18 +1,23 @@
 # Template file for 'cmus'
 pkgname=cmus
 version=2.8.0
-revision=1
+revision=2
+build_style=configure
+configure_args="prefix=/usr LD=$CC"
 hostmakedepends="pkg-config"
 makedepends="ncurses-devel faad2-devel libflac-devel libao-devel libmad-devel
  libmodplug-devel libmp4v2-devel libmpcdec-devel pulseaudio-devel
  opusfile-devel wavpack-devel alsa-lib-devel libvorbis-devel ffmpeg-devel
- sndio-devel"
+ sndio-devel $(vopt_if elogind elogind-devel)"
 short_desc="Small, fast and powerful console music player"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://cmus.github.io"
 distfiles="https://github.com/cmus/cmus/archive/v${version}.tar.gz"
 checksum=756ce2c6241b2104dc19097488225de559ac1802a175be0233cfb6fbc02f3bd2
+build_options="elogind"
+build_options_default="elogind"
+desc_option_elogind="Support MPRIS interface via elogind"
 
 case $XBPS_TARGET_MACHINE in
 	armv6*)
@@ -22,16 +27,6 @@ case $XBPS_TARGET_MACHINE in
 		;;
 esac
 
-do_configure() {
-	./configure prefix=/usr
-}
-do_build() {
-	make GCC=$CC CC=$CC LD=$CC LDFLAGS="$LDFLAGS" ${makejobs}
-}
-do_install() {
-	make DESTDIR=${DESTDIR} install
-}
-
 cmus-libao_package() {
 	short_desc+=" - libao output plugin"
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/cni-plugins/template b/srcpkgs/cni-plugins/template
index ee57fb191ab..3c649fd8f74 100644
--- a/srcpkgs/cni-plugins/template
+++ b/srcpkgs/cni-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'cni-plugins'
 pkgname=cni-plugins
-version=0.8.1
+version=0.8.2
 revision=1
 wrksrc="plugins-${version}"
 build_style=go
@@ -10,7 +10,7 @@ maintainer="Cameron Nemo <camerontnorman@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/containernetworking/plugins"
 distfiles="https://github.com/containernetworking/plugins/archive/v${version}.tar.gz"
-checksum=1b6f66835b52eb382f625cb98b70ddfaa02bbaf016ef4d9eb5faa21d0648e519
+checksum=91994d305a86a2c5a70e9dd7add9e277074065678b605bf12983e6e43fdcd4d8
 
 do_build() {
 	./build_linux.sh
diff --git a/srcpkgs/cnping/INSTALL b/srcpkgs/cnping/INSTALL
new file mode 100644
index 00000000000..6c7a28b1aa5
--- /dev/null
+++ b/srcpkgs/cnping/INSTALL
@@ -0,0 +1,5 @@
+case "${ACTION}" in
+post)
+	setcap cap_net_raw+ep usr/bin/cnping
+	;;
+esac
diff --git a/srcpkgs/cnping/template b/srcpkgs/cnping/template
new file mode 100644
index 00000000000..cfbbe6b4029
--- /dev/null
+++ b/srcpkgs/cnping/template
@@ -0,0 +1,19 @@
+# Template file for 'cnping'
+pkgname=cnping
+version=1.0.0
+revision=1
+build_style=gnu-makefile
+makedepends="libXinerama-devel libX11-devel"
+depends="libcap-progs"
+short_desc="Minimal Graphical IPV4 Ping Tool"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="MIT, BSD-3-Clause"
+homepage="https://github.com/cnlohr/cnping"
+distfiles="https://github.com/cnlohr/cnping/archive/${version}.tar.gz"
+checksum=43e4737e27a2ab5bd8f90c73efa0ce998c2cc1d767e4948f50ded0d29e683e2d
+
+do_install() {
+	vbin cnping
+	vlicense LICENSE.MIT
+	vlicense LICENSE.BSD-3-Clause
+}
diff --git a/srcpkgs/codecrypt/template b/srcpkgs/codecrypt/template
index 697c9672d6a..13c8b79abd7 100644
--- a/srcpkgs/codecrypt/template
+++ b/srcpkgs/codecrypt/template
@@ -1,14 +1,14 @@
 # Template file for 'codecrypt'
 pkgname=codecrypt
 version=1.8
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="crypto++-devel fftw-devel gmp-devel"
-maintainer="Orphaned <orphan@voidlinux.org>"
 short_desc="Post-quantum cryptography tool"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="LGPL-3.0-or-later"
 homepage="https://e-x-a.org/codecrypt"
-license="LGPL-3"
 distfiles="https://github.com/exaexa/codecrypt/archive/v${version}.tar.gz"
 checksum=25f11bc361b4f8aca7245698334b5715b7d594d708a75e8cdb2aa732dc46eb96
 
diff --git a/srcpkgs/codelite/template b/srcpkgs/codelite/template
index cb2ef04fca4..9ca8123dafe 100644
--- a/srcpkgs/codelite/template
+++ b/srcpkgs/codelite/template
@@ -1,7 +1,7 @@
 # Template file for 'codelite'
 pkgname=codelite
 version=13.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DWITH_PCH=0
  $(vopt_if sftp -DENABLE_SFTP=1)
diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index a6957f46b40..328e5aaa360 100644
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -1,7 +1,7 @@
 # Template file for 'collectd'
 pkgname=collectd
 version=5.9.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable notify notify_desktop) --with-libiptc --enable-virt
diff --git a/srcpkgs/composer/template b/srcpkgs/composer/template
index 5ef0064c24a..0171dc5e520 100644
--- a/srcpkgs/composer/template
+++ b/srcpkgs/composer/template
@@ -1,6 +1,6 @@
 # Template file for 'composer'
 pkgname=composer
-version=1.8.5
+version=1.9.0
 revision=1
 archs=noarch
 build_style=fetch
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://getcomposer.org/"
 distfiles="https://github.com/composer/composer/releases/download/${version}/composer.phar
  https://raw.githubusercontent.com/composer/composer/master/LICENSE"
-checksum="6faf282db067f0f7625a5a1d80f4ecd3228ccc9a0388aec1599824c610d5d4e3
+checksum="1126fd7501ae6ff1dc9f91f0a3eca7430b1ea060d018d21521dc5e2d1ba01606
  7855ac293067aebe7e51afdd23b9dea54b8be24187dbecc9b9142581c37f596c"
 
 do_install() {
@@ -19,7 +19,6 @@ do_install() {
 	vlicense LICENSE
 
 	vmkdir /etc/php/conf.d
-	echo "extension=phar" > ${DESTDIR}/etc/php/conf.d/composer.ini
-	echo "extension=zip" >> ${DESTDIR}/etc/php/conf.d/composer.ini
-	echo "extension=openssl" >> ${DESTDIR}/etc/php/conf.d/composer.ini
+	printf 'extension=%s\n' phar iconv openssl zip \
+		>${DESTDIR}/etc/php/conf.d/composer.ini
 }
diff --git a/srcpkgs/compton/template b/srcpkgs/compton/template
index 61c3dcfa02f..a7f8f6d170f 100644
--- a/srcpkgs/compton/template
+++ b/srcpkgs/compton/template
@@ -1,20 +1,20 @@
 # Template file for 'compton'
 pkgname=compton
-version=6.2
+version=7.4
 revision=1
 build_style=meson
 configure_args="-Dbuild_docs=true"
 hostmakedepends="pkg-config asciidoc"
 makedepends="MesaLib-devel dbus-devel libconfig-devel libev-devel pcre-devel
  pixman-devel xcb-util-image-devel xcb-util-renderutil-devel
- libxdg-basedir-devel"
+ libxdg-basedir-devel uthash"
 depends="desktop-file-utils"
 short_desc="Compositor for X11 (fork of xcompmgr-dana)"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Frank Steinborn <steinex@nognu.de>"
 license="MIT, MPL-2.0"
 homepage="https://github.com/yshui/compton/"
 distfiles="https://github.com/yshui/compton/archive/v${version}.tar.gz"
-checksum=1333133ca9dfea768256c3fff8362d12a98b4d129e6ab1e56b1e630353f269bb
+checksum=1911aebb49f765586f655933ee016828e126bc7b2bb016b13c9a34a4865a8fd3
 
 pre_build() {
 	export COMPTON_VERSION="v${version}"
diff --git a/srcpkgs/conky-cli/template b/srcpkgs/conky-cli/template
index 74a564b96b9..cbb7cb7c4e7 100644
--- a/srcpkgs/conky-cli/template
+++ b/srcpkgs/conky-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'conky-cli'
 pkgname=conky-cli
-version=1.11.3
+version=1.11.5
 revision=1
 wrksrc="${pkgname/-cli/}-${version}"
 build_style=cmake
@@ -16,7 +16,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause, GPL-3.0-or-later"
 homepage="https://github.com/brndnmtthws/conky"
 distfiles="https://github.com/brndnmtthws/conky/archive/v${version}.tar.gz"
-checksum=0140e749537d4d05bf33fbac436e54756faa26021e16f2bca418e9eeea724eb4
+checksum=4cefdd92219a90934c28297e4ac7448a3f69d6aeec5d48c5763b23f6b214ef13
 
 provides="conky-${version}_${revision}"
 conflicts="conky>=0"
diff --git a/srcpkgs/conky/template b/srcpkgs/conky/template
index f1853949ba7..67d2397c19e 100644
--- a/srcpkgs/conky/template
+++ b/srcpkgs/conky/template
@@ -1,6 +1,6 @@
 # Template file for 'conky'
 pkgname=conky
-version=1.11.4
+version=1.11.5
 revision=1
 build_style=cmake
 conf_files="/etc/conky/conky.conf /etc/conky/conky_no_x11.conf"
@@ -18,7 +18,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause, GPL-3.0-or-later"
 homepage="https://github.com/brndnmtthws/conky"
 distfiles="https://github.com/brndnmtthws/conky/archive/v${version}.tar.gz"
-checksum=344637646c15c4cb7cf0afdde4651ee3100f7812e7bb8434ca757eba5c621a48
+checksum=4cefdd92219a90934c28297e4ac7448a3f69d6aeec5d48c5763b23f6b214ef13
 
 do_install() {
 	make -C build DESTDIR=${DESTDIR} install
@@ -29,4 +29,3 @@ do_install() {
 
 	vlicense COPYING
 }
-
diff --git a/srcpkgs/conmon/template b/srcpkgs/conmon/template
index c92bf445e2e..1b88fb61e50 100644
--- a/srcpkgs/conmon/template
+++ b/srcpkgs/conmon/template
@@ -1,6 +1,6 @@
 # Template file for 'conmon'
 pkgname=conmon
-version=2.0.0
+version=2.0.1
 revision=1
 build_style=gnu-makefile
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://github.com/containers/conmon"
 distfiles="https://github.com/containers/conmon/archive/v${version}.tar.gz"
-checksum=841ee6c8085f4d1092a330481b2d56ddaceedee9e78aa6698765bf2a693e06e7
+checksum=809508bd6f76599516f5a5a8f509e1257c2bdbcdc623c11b49e99287bba3d293
 
 do_install() {
 	vbin bin/conmon
diff --git a/srcpkgs/connman/files/connmand/run b/srcpkgs/connman/files/connmand/run
index accfc763830..e90eed5ba4a 100755
--- a/srcpkgs/connman/files/connmand/run
+++ b/srcpkgs/connman/files/connmand/run
@@ -1,2 +1,3 @@
 #!/bin/sh
-exec connmand -n
+[ -r conf ] && . ./conf
+exec connmand -n ${OPTS}
diff --git a/srcpkgs/connman/files/musl/freeaddrinfo.patch b/srcpkgs/connman/files/musl/freeaddrinfo.patch
new file mode 100644
index 00000000000..b5c1aca390d
--- /dev/null
+++ b/srcpkgs/connman/files/musl/freeaddrinfo.patch
@@ -0,0 +1,17 @@
+musl > 1.1.21 segfaults on null pointers to freeaddrinfo
+
+diff --git a/gweb/gweb.c b/gweb/gweb.c
+index 393afe0a..12fcb1d8 100644
+--- a/gweb/gweb.c
++++ b/gweb/gweb.c
+@@ -1274,7 +1274,8 @@ static bool is_ip_address(const char *host)
+ 	addr = NULL;
+ 
+ 	result = getaddrinfo(host, NULL, &hints, &addr);
+-	freeaddrinfo(addr);
++	if(!result)
++		freeaddrinfo(addr);
+ 
+ 	return result == 0;
+ }
+
diff --git a/srcpkgs/connman/template b/srcpkgs/connman/template
index f9cb3085a4d..fdc7f434a1e 100644
--- a/srcpkgs/connman/template
+++ b/srcpkgs/connman/template
@@ -1,7 +1,7 @@
 # Template file for 'connman'
 pkgname=connman
 version=1.37
-revision=1
+revision=3
 build_style=gnu-configure
 configure_args="--enable-polkit --enable-client --enable-pie --enable-ethernet
  --enable-wifi --enable-bluetooth --enable-loopback --enable-nmcompat
diff --git a/srcpkgs/consul-template/template b/srcpkgs/consul-template/template
new file mode 100644
index 00000000000..a121a52f453
--- /dev/null
+++ b/srcpkgs/consul-template/template
@@ -0,0 +1,13 @@
+# Template file for 'consul-template'
+pkgname=consul-template
+version=0.22.0
+revision=1
+build_style=go
+go_import_path="github.com/hashicorp/$pkgname"
+hostmakedepends="git"
+short_desc="Template rendering, notifier, and supervisor for Consul and Vault data"
+maintainer="Noel Cower <ncower@gmail.com>"
+license="MPL-2.0"
+homepage="https://$go_import_path"
+distfiles="$homepage/archive/v$version.tar.gz"
+checksum=81f81ab5bcd91184eba1955f2729382fe800ef8e23b059f4f65a6a64dd4d6039
diff --git a/srcpkgs/consul/template b/srcpkgs/consul/template
index 9bd68c23f73..9680d40e176 100644
--- a/srcpkgs/consul/template
+++ b/srcpkgs/consul/template
@@ -1,10 +1,10 @@
 # Template file for 'consul'
 pkgname=consul
-version=1.5.3
+version=1.6.1
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/${pkgname}"
-_git_commit=34eff659dcc5503b6eb117733c9f7def63f01bad
+_git_commit=a42ded477cf4e5ac1a850b42ec5d25672cd2545d
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit} -X ${go_import_path}/version.GitDescribe=v${version}"
 # consul has a vendor directory, but relies on replace statements in go.mod, so
 # force default non-vendor behavior.
@@ -15,7 +15,7 @@ maintainer="iaroki <iaroki@protonmail.com>"
 license="MPL-2.0"
 homepage="https://www.consul.io/"
 distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
-checksum=9a29ee11e12d75980016db0685ce7eb81a36a97c90d6bd23529a310f4e2dc02a
+checksum=e31ee84ee95efe3c27ebac46ba9f7973f1f7017589b7aece22715e304fccd464
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/coq/template b/srcpkgs/coq/template
index d69848b9254..9b7ba6bd9b9 100644
--- a/srcpkgs/coq/template
+++ b/srcpkgs/coq/template
@@ -1,13 +1,14 @@
+# Template file for 'coq'
 pkgname=coq
-version=8.9.1
-revision=2
+version=8.10.0
+revision=1
 hostmakedepends="ocaml ocaml-findlib ocaml-num camlp5"
 short_desc="Proof assistant written in OCaml"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="LGPL-2.1"
+license="LGPL-2.1-only"
 homepage="https://coq.inria.fr"
 distfiles="https://github.com/coq/coq/archive/V${version}.tar.gz"
-checksum=87251327e8a1e25c6b08b5c0ae8e7cdf3a91a5f30832bbe74ccc4f0bde9618ea
+checksum=292c64162620c4c4825c323c1c71762d764ebc9ce39bd8eee900851eaca655f5
 nopie=yes
 nocross=yes
 
diff --git a/srcpkgs/coreboot-utils/template b/srcpkgs/coreboot-utils/template
index 8083de45bf2..f16f14113b9 100644
--- a/srcpkgs/coreboot-utils/template
+++ b/srcpkgs/coreboot-utils/template
@@ -1,10 +1,10 @@
 # Template file for 'coreboot-utils'
 pkgname=coreboot-utils
-version=4.9
+version=4.10
 revision=1
+archs="i686* x86_64*"
 wrksrc="coreboot-${version}"
 build_wrksrc="util"
-archs="i686* x86_64*"
 build_style=gnu-makefile
 makedepends="pciutils-devel zlib-devel"
 short_desc="Coreboot firmware utilities"
@@ -12,7 +12,7 @@ maintainer="m3tav3rse <n6maa10816@tuta.io>"
 license="GPL-2.0-only"
 homepage="https://coreboot.org"
 distfiles="https://coreboot.org/releases/coreboot-${version}.tar.xz"
-checksum=32368d8b3d87a79376e30efd4ed279e90ace9a3d752ea6f98e2efdd18a896a76
+checksum=ca7136cd67309971b1f006bdc7e3c9fbf00234a29a9a2dc3c35444a74ef851cb
 
 do_build() {
 	for util in cbfstool cbmem ectool ifdtool inteltool intelmetool \
diff --git a/srcpkgs/coyim/template b/srcpkgs/coyim/template
new file mode 100644
index 00000000000..7597c891823
--- /dev/null
+++ b/srcpkgs/coyim/template
@@ -0,0 +1,19 @@
+# Template file for 'coyim'
+pkgname=coyim
+version=0.3.11
+revision=1
+build_style=go
+go_import_path=github.com/coyim/$pkgname
+hostmakedepends="pkg-config"
+makedepends="gtk+3-devel"
+short_desc="Safe and secure XMPP chat client"
+maintainer="Illia Shestakov <ishestakov@airmail.cc>"
+license="GPL-3.0-only"
+homepage="https://coy.im"
+distfiles="https://github.com/coyim/coyim/archive/v${version}.tar.gz"
+checksum=4717901462f027578369358c8772eb5b14e22f053fc30e4c9dbcc2b053374a41
+
+post_install() {
+	vlicense LICENSE
+	vdoc README.md
+}
diff --git a/srcpkgs/cozy/template b/srcpkgs/cozy/template
index da15249275f..a35aff61f37 100644
--- a/srcpkgs/cozy/template
+++ b/srcpkgs/cozy/template
@@ -1,6 +1,6 @@
 # Template file for 'cozy'
 pkgname=cozy
-version=0.6.7
+version=0.6.8
 revision=1
 archs=noarch
 build_style=meson
@@ -13,5 +13,5 @@ maintainer="johannes <johannes.brechtmann@gmail.com>"
 license="GPL-3.0-only, LGPL-3.0-only"
 homepage="https://github.com/geigi/cozy"
 distfiles="https://github.com/geigi/cozy/archive/${version}.tar.gz"
-checksum=d007bc1aa5aa08e1aca06af1b5504323b53be4597ab3998c7abf24efc6673722
+checksum=fce7e9a46dc6b7a56c243727310fdef2eb948ce4c44974104e03918e936bedda
 nocross="requires python3-gobject"
diff --git a/srcpkgs/cppcheck/template b/srcpkgs/cppcheck/template
index a6d26d33f10..fc12ca4663a 100644
--- a/srcpkgs/cppcheck/template
+++ b/srcpkgs/cppcheck/template
@@ -1,24 +1,25 @@
 # Template file for 'cppcheck'
 pkgname=cppcheck
-version=1.87
+version=1.89
 revision=1
-hostmakedepends="libxslt docbook-xsl"
-depends="python"
+build_style=gnu-makefile
+make_build_args="
+ FILESDIR=/usr/share/cppcheck
+ MATCHCOMPILER=yes
+ DB2MAN=/usr/share/xsl/docbook/manpages/docbook.xsl"
+make_install_args="
+ FILESDIR=/usr/share/cppcheck"
+make_build_target="cppcheck man"
+python_version="3"
+hostmakedepends="libxslt docbook-xsl python3"
+depends="python3"
 short_desc="Static analysis of C/C++ code"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://cppcheck.sourceforge.net"
 distfiles="https://github.com/danmar/cppcheck/archive/${version}.tar.gz"
-checksum=ea7ac1cd2f5c00ecffd596fd0f7281cba44308e565a634fae02b77ecd927c153
+checksum=37452d378825c7bd78116b4d7073df795fa732207d371ad5348287f811755783
 
-do_build() {
-	make ${makejobs} CFGDIR=/usr/share/cppcheck/cfg
-	make ${makejobs} DB2MAN=/usr/share/xsl/docbook/manpages/docbook.xsl all man
-}
-
-do_install() {
-	make DESTDIR=${DESTDIR} CFGDIR=/usr/share/cppcheck/cfg install
+post_install() {
 	vman cppcheck.1
-	vmkdir usr/share/${pkgname}
-	vcopy cfg/ usr/share/${pkgname}/cfg
 }
diff --git a/srcpkgs/cpufrequtils/template b/srcpkgs/cpufrequtils/template
index 62f700490ee..bbb798db7d6 100644
--- a/srcpkgs/cpufrequtils/template
+++ b/srcpkgs/cpufrequtils/template
@@ -14,7 +14,7 @@ homepage="https://git.kernel.org/pub/scm/linux/kernel/git/brodo/cpufrequtils.git
 distfiles="${homepage}/snapshot/${pkgname}-${_commit}.tar.gz"
 checksum=53b0fd1092e2053d31f4707ae0485f0d09b7faafcfac0e53da06c28ecfe23c95
 
-archs="i686* x86_64* ppc64-musl ppc64le*"
+archs="i686* x86_64* ppc*"
 
 post_extract() {
 	sed -i "s|/usr/bin/install|install|g" Makefile
diff --git a/srcpkgs/crash/template b/srcpkgs/crash/template
index 077e3619c38..e1b71f0c4d8 100644
--- a/srcpkgs/crash/template
+++ b/srcpkgs/crash/template
@@ -1,6 +1,6 @@
 # Template file for 'crash'
 pkgname=crash
-version=7.2.6
+version=7.2.7
 revision=1
 archs="i686 x86_64"  # broken on musl
 build_style=gnu-makefile
@@ -12,7 +12,7 @@ license="GPL-3.0-or-later"
 homepage="http://people.redhat.com/anderson/"
 changelog="https://people.redhat.com/anderson/crash.changelog.html"
 distfiles="http://people.redhat.com/anderson/${pkgname}-${version}.tar.gz"
-checksum=c8bc0892061e7cec838e641a8e61319d656f33de5f211502296d1c9a23058ec2
+checksum=16b96b350f56ea0f73f04003b8ca7604e8bdb3809c2e9e8cf89799da5b9b2dad
 nocross=yes
 LDFLAGS=-llzo2
 
diff --git a/srcpkgs/cri-tools/template b/srcpkgs/cri-tools/template
index 9dca672cfae..66a936fcd1b 100644
--- a/srcpkgs/cri-tools/template
+++ b/srcpkgs/cri-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'cri-tools'
 pkgname=cri-tools
-version=1.15.0
+version=1.16.0
 revision=1
 build_style=go
 go_import_path=github.com/kubernetes-sigs/cri-tools
@@ -9,8 +9,14 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="Apache-2.0"
 homepage="https://github.com/kubernetes-sigs/cri-tools"
 distfiles="https://github.com/kubernetes-sigs/cri-tools/archive/v${version}.tar.gz"
-checksum=7827777ffb085918ef454210ce158a464f1b7326eb339deb348cc8cd3aee2931
+checksum=4c382c3929f1536c36f3a6c8593ce49dd5b7831d3c0f9e41cd4f48163ec05b90
 
 do_build() {
 	make ${makejobs}
 }
+
+do_install() {
+	for bin in _output/*; do
+		vbin $bin
+	done
+}
diff --git a/srcpkgs/croc/template b/srcpkgs/croc/template
index 7aab8b8d324..3be23a0a2d4 100644
--- a/srcpkgs/croc/template
+++ b/srcpkgs/croc/template
@@ -1,6 +1,6 @@
 # Template file for 'croc'
 pkgname=croc
-version=6.1.1
+version=6.1.4
 revision=1
 build_style=go
 go_import_path=github.com/schollz/croc/v6
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/schollz/croc"
 distfiles="https://github.com/schollz/croc/archive/v${version}.tar.gz"
-checksum=4636edd8c76e8a2a52b7b156332f8a5414e8124305cd94633bcff92998dcf166
+checksum=3eb8f7a1c3ca45270841b374ea0ccaf1423de38492dbb4c8696678bae271c701
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/cropgui/template b/srcpkgs/cropgui/template
index 96f2a549694..82042037f30 100644
--- a/srcpkgs/cropgui/template
+++ b/srcpkgs/cropgui/template
@@ -7,7 +7,7 @@ makedepends="python"
 depends="python python-Pillow python-gobject2 pygtk libjpeg-turbo-tools
 ImageMagick exiftool"
 short_desc="Gtk frontend for lossless cropping of jpeg images"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2"
 homepage="https://github.com/jepler/cropgui"
 distfiles="https://github.com/jepler/cropgui/archive/v${version}.tar.gz"
diff --git a/srcpkgs/cross-aarch64-linux-gnu/files/non-nullness.patch b/srcpkgs/cross-aarch64-linux-gnu/files/non-nullness.patch
deleted file mode 120000
index c8b653748fe..00000000000
--- a/srcpkgs/cross-aarch64-linux-gnu/files/non-nullness.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/non-nullness.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-aarch64-linux-gnu/template b/srcpkgs/cross-aarch64-linux-gnu/template
index e4f1544040e..cecc02ec7b8 100644
--- a/srcpkgs/cross-aarch64-linux-gnu/template
+++ b/srcpkgs/cross-aarch64-linux-gnu/template
@@ -1,8 +1,8 @@
 # Template build file for 'cross-aarch64-linux-gnu'
 #
 _binutils_version=2.32
-_gcc_version=9.1.0
-_glibc_version=2.29
+_gcc_version=9.2.0
+_glibc_version=2.30
 _linux_version=4.19
 
 _triplet=aarch64-linux-gnu
@@ -10,7 +10,7 @@ _archflags="-march=armv8-a"
 _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
-version=0.31
+version=0.32
 revision=1
 short_desc="GNU Cross toolchain for the ${_triplet} LE target (binutils/gcc/glibc)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -22,15 +22,15 @@ distfiles="
  ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz
  ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
 checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0
- f3eeb8d57e25ca9fc13c2af3dae97754f9f643bc69229546828e3a240e2af04b
+ ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
+ e2c4114e569afbe7edbc29131a43be833850ab9a459d81beb2588016d2bbb8af
  0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
 
 lib32disabled=yes
 nocross=yes
 nopie=yes
 create_wrksrc=yes
-hostmakedepends="flex perl python3"
+hostmakedepends="gcc-objc gcc-go flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a
@@ -94,7 +94,6 @@ _gcc_bootstrap() {
 
 	cd ${wrksrc}/gcc-${_gcc_version}
 	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
-	_apply_patch -p0 ${FILESDIR}/non-nullness.patch
 
 	msg_normal "Building cross gcc bootstrap\n"
 
@@ -234,7 +233,7 @@ _gcc_build() {
 	_args+=" --libdir=/usr/lib"
 	_args+=" --target=${_triplet}"
 	_args+=" --with-sysroot=${_sysroot}"
-	_args+=" --enable-languages=c,ada,c++,fortran,lto"
+	_args+=" --enable-languages=c,ada,c++,objc,obj-c++,go,fortran,lto"
 	_args+=" --with-gnu-as"
 	_args+=" --with-gnu-ld"
 	_args+=" --disable-multilib"
@@ -250,7 +249,6 @@ _gcc_build() {
 	_args+=" --enable-default-pie"
 	_args+=" --enable-default-ssp"
 	_args+=" --disable-libquadmath"
-	_args+=" --disable-libatomic"
 	_args+=" --disable-libssp"
 	_args+=" --disable-libmudflap"
 	_args+=" --disable-libsanitizer"
@@ -334,6 +332,11 @@ do_install() {
 	ln -svf libgnat-${_majorver}.so libgnat.so
 	rm -vf ${DESTDIR}/${_adalib}/libgna{rl,t}.so
 
+	# We need to build libatomic in target gcc as gccgo needs it to
+	# build... but it's not needed at runtime, so remove it from the
+	# destdir so it doesn't conflict with the libatomic package
+	rm -f ${DESTDIR}/${_sysroot}/usr/lib/libatomic.*
+
 	# Remove unnecessary stuff
 	rm -f ${DESTDIR}/usr/lib*/libiberty.a
 	rm -rf ${DESTDIR}/usr/share
diff --git a/srcpkgs/cross-aarch64-linux-musl/files/gccgo-musl.patch b/srcpkgs/cross-aarch64-linux-musl/files/gccgo-musl.patch
new file mode 120000
index 00000000000..a093af85773
--- /dev/null
+++ b/srcpkgs/cross-aarch64-linux-musl/files/gccgo-musl.patch
@@ -0,0 +1 @@
+../../gcc/files/gccgo-musl.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-aarch64-linux-musl/files/non-nullness.patch b/srcpkgs/cross-aarch64-linux-musl/files/non-nullness.patch
deleted file mode 120000
index c8b653748fe..00000000000
--- a/srcpkgs/cross-aarch64-linux-musl/files/non-nullness.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/non-nullness.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-aarch64-linux-musl/template b/srcpkgs/cross-aarch64-linux-musl/template
index a40e53f532e..7fc76c3d726 100644
--- a/srcpkgs/cross-aarch64-linux-musl/template
+++ b/srcpkgs/cross-aarch64-linux-musl/template
@@ -1,17 +1,18 @@
 # Template build file for 'cross-aarch64-linux-musl'
 #
 _binutils_version=2.32
-_gcc_version=9.1.0
+_gcc_version=9.2.0
 _musl_version=1.1.23
 _linux_version=4.19
+_libucontext_version=0.9.0
 
 _triplet=aarch64-linux-musl
 _archflags="-march=armv8-a"
 _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
-version=0.31
-revision=3
+version=0.32
+revision=1
 short_desc="Cross toolchain for ARM64 LE target (musl)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 homepage="https://www.voidlinux.org/"
@@ -20,11 +21,13 @@ distfiles="
  ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
  ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz
  http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz
- ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
+ ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz
+ https://distfiles.adelielinux.org/source/libucontext/libucontext-${_libucontext_version}.tar.xz"
 checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0
+ ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
  8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa
- 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
+ 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1
+ 0d53a415a307ef175153bbe60a572c940a922cb736ce13530b666e7ec2795d68"
 
 lib32disabled=yes
 nocross=yes
@@ -33,7 +36,7 @@ nodebug=yes
 create_wrksrc=yes
 
 archs="x86_64* ppc64le"
-hostmakedepends="flex perl python3"
+hostmakedepends="gcc-objc gcc-go flex perl python3"
 makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel isl15-devel"
 nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a
  libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a"
@@ -81,10 +84,10 @@ _gcc_bootstrap() {
 
 	cd ${wrksrc}/gcc-${_gcc_version}
 	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
-	_apply_patch -p0 ${FILESDIR}/non-nullness.patch
 	_apply_patch -p0 ${FILESDIR}/musl-ada.patch
 	_apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch
 	_apply_patch -p0 ${FILESDIR}/invalid_tls_model.patch
+	_apply_patch -p0 ${FILESDIR}/gccgo-musl.patch
 
 	msg_normal "Building cross gcc bootstrap\n"
 
@@ -153,6 +156,22 @@ _musl_build() {
 	touch ${wrksrc}/.musl_build_done
 }
 
+_libucontext_build() {
+	[ -f ${wrksrc}/.libucontext_build_done ] && return 0
+
+	cd ${wrksrc}/libucontext-${_libucontext_version}
+	msg_normal "Building cross libucontext\n"
+
+	# it's ok if we're static only here
+	CC="${_triplet}-gcc" AR="${_triplet}-ar" AS="${_triplet}-as" \
+		CFLAGS="-Os -pipe ${_archflags}" \
+		make ARCH=aarch64 libucontext.a
+
+	cp libucontext.a ${_sysroot}/usr/lib
+
+	touch ${wrksrc}/.libucontext_build_done
+}
+
 _gcc_build() {
 	local _args
 
@@ -168,7 +187,7 @@ _gcc_build() {
 	_args+=" --libexecdir=/usr/lib"
 	_args+=" --target=${_triplet}"
 	_args+=" --with-sysroot=${_sysroot}"
-	_args+=" --enable-languages=c,ada,c++,fortran,lto"
+	_args+=" --enable-languages=c,ada,c++,objc,obj-c++,go,fortran,lto"
 	_args+=" --enable-libada"
 	_args+=" --enable-lto"
 	_args+=" --enable-default-pie"
@@ -208,6 +227,7 @@ do_build() {
 	_gcc_bootstrap
 	_linux_headers
 	_musl_build
+	_libucontext_build
 	_gcc_build
 }
 
@@ -263,6 +283,11 @@ do_install() {
 	ln -svf libgnat-${_majorver}.so libgnat.so
 	rm -vf ${DESTDIR}/${_adalib}/libgna{rl,t}.so
 
+	# We need to build libatomic in target gcc as gccgo needs it to
+	# build... but it's not needed at runtime, so remove it from the
+	# destdir so it doesn't conflict with the libatomic package
+	rm -f ${DESTDIR}/${_sysroot}/usr/lib/libatomic.*
+
 	# Remove unnecessary stuff
 	rm -f ${DESTDIR}/usr/lib*/libiberty.a
 	rm -rf ${DESTDIR}/usr/share
diff --git a/srcpkgs/cross-arm-linux-gnueabi/files/non-nullness.patch b/srcpkgs/cross-arm-linux-gnueabi/files/non-nullness.patch
deleted file mode 120000
index c8b653748fe..00000000000
--- a/srcpkgs/cross-arm-linux-gnueabi/files/non-nullness.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/non-nullness.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-arm-linux-gnueabi/template b/srcpkgs/cross-arm-linux-gnueabi/template
index 53b16264218..99b23a88538 100644
--- a/srcpkgs/cross-arm-linux-gnueabi/template
+++ b/srcpkgs/cross-arm-linux-gnueabi/template
@@ -1,8 +1,8 @@
 # Template build file for 'cross-arm-linux-gnueabi'
 #
 _binutils_version=2.32
-_gcc_version=9.1.0
-_glibc_version=2.29
+_gcc_version=9.2.0
+_glibc_version=2.30
 _linux_version=4.19
 
 _triplet=arm-linux-gnueabi
@@ -11,7 +11,7 @@ _archflags="-march=armv5te -msoft-float -mfloat-abi=soft"
 _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
-version=0.31
+version=0.32
 revision=1
 short_desc="GNU Cross toolchain for the ${_triplet} LE target (binutils/gcc/glibc)"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -23,8 +23,8 @@ distfiles="
  ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz
  ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
 checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0
- f3eeb8d57e25ca9fc13c2af3dae97754f9f643bc69229546828e3a240e2af04b
+ ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
+ e2c4114e569afbe7edbc29131a43be833850ab9a459d81beb2588016d2bbb8af
  0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
 
 lib32disabled=yes
@@ -33,7 +33,7 @@ nopie=yes
 nodebug=yes
 create_wrksrc=yes
 
-hostmakedepends="flex perl python3"
+hostmakedepends="gcc-objc gcc-go flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a
@@ -97,7 +97,6 @@ _gcc_bootstrap() {
 
 	cd ${wrksrc}/gcc-${_gcc_version}
 	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
-	_apply_patch -p0 ${FILESDIR}/non-nullness.patch
 
 	msg_normal "Building cross gcc bootstrap\n"
 
@@ -238,7 +237,7 @@ _gcc_build() {
 	_args+=" --libexecdir=/usr/lib"
 	_args+=" --target=${_triplet}"
 	_args+=" --with-sysroot=${_sysroot}"
-	_args+=" --enable-languages=c,ada,c++,fortran,lto"
+	_args+=" --enable-languages=c,ada,c++,objc,obj-c++,go,fortran,lto"
 	_args+=" --with-gnu-as"
 	_args+=" --with-gnu-ld"
 	_args+=" --disable-multilib"
@@ -255,7 +254,6 @@ _gcc_build() {
 	_args+=" --enable-default-pie"
 	_args+=" --enable-default-ssp"
 	_args+=" --disable-libquadmath"
-	_args+=" --disable-libatomic"
 	_args+=" --disable-libssp"
 	_args+=" --disable-libmpx"
 	_args+=" --disable-libmudflap"
@@ -337,6 +335,11 @@ do_install() {
 	ln -svf libgnat-${_majorver}.so libgnat.so
 	rm -vf ${DESTDIR}/${_adalib}/libgna{rl,t}.so
 
+	# We need to build libatomic in target gcc as gccgo needs it to
+	# build... but it's not needed at runtime, so remove it from the
+	# destdir so it doesn't conflict with the libatomic package
+	rm -f ${DESTDIR}/${_sysroot}/usr/lib/libatomic.*
+
 	# Remove unnecessary stuff
 	rm -f ${DESTDIR}/usr/lib*/libiberty.a
 	rm -rf ${DESTDIR}/usr/share
diff --git a/srcpkgs/cross-arm-linux-gnueabihf/files/non-nullness.patch b/srcpkgs/cross-arm-linux-gnueabihf/files/non-nullness.patch
deleted file mode 120000
index c8b653748fe..00000000000
--- a/srcpkgs/cross-arm-linux-gnueabihf/files/non-nullness.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/non-nullness.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-arm-linux-gnueabihf/template b/srcpkgs/cross-arm-linux-gnueabihf/template
index 32006480282..85a724d3c87 100644
--- a/srcpkgs/cross-arm-linux-gnueabihf/template
+++ b/srcpkgs/cross-arm-linux-gnueabihf/template
@@ -1,8 +1,8 @@
 # Template build file for 'cross-arm-linux-gnueabihf'
 #
 _binutils_version=2.32
-_gcc_version=9.1.0
-_glibc_version=2.29
+_gcc_version=9.2.0
+_glibc_version=2.30
 _linux_version=4.19
 
 _triplet=arm-linux-gnueabihf
@@ -11,7 +11,7 @@ _archflags="-march=armv6 -mfpu=vfp -mfloat-abi=hard"
 _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
-version=0.31
+version=0.32
 revision=1
 short_desc="GNU Cross toolchain for the ${_triplet} LE target (binutils/gcc/glibc)"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -23,8 +23,8 @@ distfiles="
  ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz
  ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
 checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0
- f3eeb8d57e25ca9fc13c2af3dae97754f9f643bc69229546828e3a240e2af04b
+ ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
+ e2c4114e569afbe7edbc29131a43be833850ab9a459d81beb2588016d2bbb8af
  0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
 
 lib32disabled=yes
@@ -33,7 +33,7 @@ nopie=yes
 nodebug=yes
 create_wrksrc=yes
 
-hostmakedepends="flex perl python3"
+hostmakedepends="gcc-objc gcc-go flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a
@@ -98,7 +98,6 @@ _gcc_bootstrap() {
 
 	cd ${wrksrc}/gcc-${_gcc_version}
 	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
-	_apply_patch -p0 ${FILESDIR}/non-nullness.patch
 
 	msg_normal "Building cross gcc bootstrap\n"
 
@@ -238,7 +237,7 @@ _gcc_build() {
 	_args+=" --libexecdir=/usr/lib"
 	_args+=" --target=${_triplet}"
 	_args+=" --with-sysroot=${_sysroot}"
-	_args+=" --enable-languages=c,ada,c++,fortran,lto"
+	_args+=" --enable-languages=c,ada,c++,objc,obj-c++,go,fortran,lto"
 	_args+=" --with-gnu-as"
 	_args+=" --with-gnu-ld"
 	_args+=" --disable-multilib"
@@ -255,7 +254,6 @@ _gcc_build() {
 	_args+=" --enable-default-pie"
 	_args+=" --enable-default-ssp"
 	_args+=" --disable-libquadmath"
-	_args+=" --disable-libatomic"
 	_args+=" --disable-libssp"
 	_args+=" --disable-libmpx"
 	_args+=" --disable-libmudflap"
@@ -337,6 +335,11 @@ do_install() {
 	ln -svf libgnat-${_majorver}.so libgnat.so
 	rm -vf ${DESTDIR}/${_adalib}/libgna{rl,t}.so
 
+	# We need to build libatomic in target gcc as gccgo needs it to
+	# build... but it's not needed at runtime, so remove it from the
+	# destdir so it doesn't conflict with the libatomic package
+	rm -f ${DESTDIR}/${_sysroot}/usr/lib/libatomic.*
+
 	# Remove unnecessary stuff
 	rm -f ${DESTDIR}/usr/lib*/libiberty.a
 	rm -rf ${DESTDIR}/usr/share
diff --git a/srcpkgs/cross-arm-linux-musleabi/files/gccgo-musl.patch b/srcpkgs/cross-arm-linux-musleabi/files/gccgo-musl.patch
new file mode 120000
index 00000000000..a093af85773
--- /dev/null
+++ b/srcpkgs/cross-arm-linux-musleabi/files/gccgo-musl.patch
@@ -0,0 +1 @@
+../../gcc/files/gccgo-musl.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-arm-linux-musleabi/files/non-nullness.patch b/srcpkgs/cross-arm-linux-musleabi/files/non-nullness.patch
deleted file mode 120000
index c8b653748fe..00000000000
--- a/srcpkgs/cross-arm-linux-musleabi/files/non-nullness.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/non-nullness.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-arm-linux-musleabi/template b/srcpkgs/cross-arm-linux-musleabi/template
index f1434fe9b26..985af935aac 100644
--- a/srcpkgs/cross-arm-linux-musleabi/template
+++ b/srcpkgs/cross-arm-linux-musleabi/template
@@ -1,9 +1,10 @@
 # Template build file for 'cross-arm-linux-musleabi'
 #
 _binutils_version=2.32
-_gcc_version=9.1.0
+_gcc_version=9.2.0
 _musl_version=1.1.23
 _linux_version=4.19
+_libucontext_version=0.9.0
 
 _triplet=arm-linux-musleabi
 _fpuflags="--with-arch=armv5te --without-fp --with-float=soft"
@@ -11,8 +12,8 @@ _archflags="-march=armv5te -msoft-float -mfloat-abi=soft"
 _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
-version=0.31
-revision=3
+version=0.32
+revision=1
 short_desc="Cross toolchain for ARMv5 TE target (musl)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 homepage="https://www.voidlinux.org/"
@@ -21,11 +22,13 @@ distfiles="
  ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
  ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz
  http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz
- ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
+ ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz
+ https://distfiles.adelielinux.org/source/libucontext/libucontext-${_libucontext_version}.tar.xz"
 checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0
+ ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
  8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa
- 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
+ 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1
+ 0d53a415a307ef175153bbe60a572c940a922cb736ce13530b666e7ec2795d68"
 
 lib32disabled=yes
 nocross=yes
@@ -33,7 +36,7 @@ nopie=yes
 nodebug=yes
 create_wrksrc=yes
 
-hostmakedepends="flex perl python3"
+hostmakedepends="gcc-objc gcc-go flex perl python3"
 makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel isl15-devel"
 nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a
  libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a"
@@ -84,10 +87,10 @@ _gcc_bootstrap() {
 
 	cd ${wrksrc}/gcc-${_gcc_version}
 	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
-	_apply_patch -p0 ${FILESDIR}/non-nullness.patch
 	_apply_patch -p0 ${FILESDIR}/musl-ada.patch
 	_apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch
 	_apply_patch -p0 ${FILESDIR}/invalid_tls_model.patch
+	_apply_patch -p0 ${FILESDIR}/gccgo-musl.patch
 
 	msg_normal "Building cross gcc bootstrap\n"
 
@@ -155,6 +158,22 @@ _musl_build() {
 	touch ${wrksrc}/.musl_build_done
 }
 
+_libucontext_build() {
+	[ -f ${wrksrc}/.libucontext_build_done ] && return 0
+
+	cd ${wrksrc}/libucontext-${_libucontext_version}
+	msg_normal "Building cross libucontext\n"
+
+	# it's ok if we're static only here
+	CC="${_triplet}-gcc" AR="${_triplet}-ar" AS="${_triplet}-as" \
+		CFLAGS="-Os -pipe ${_archflags}" \
+		make ARCH=arm libucontext.a
+
+	cp libucontext.a ${_sysroot}/usr/lib
+
+	touch ${wrksrc}/.libucontext_build_done
+}
+
 _gcc_build() {
 	local _args
 
@@ -169,7 +188,7 @@ _gcc_build() {
 	_args="--prefix=/usr"
 	_args+=" --target=${_triplet}"
 	_args+=" --with-sysroot=${_sysroot}"
-	_args+=" --enable-languages=c,ada,c++,fortran,lto"
+	_args+=" --enable-languages=c,ada,c++,objc,obj-c++,go,fortran,lto"
 	_args+=" --enable-libada"
 	_args+=" --enable-lto"
 	_args+=" --enable-default-pie"
@@ -211,6 +230,7 @@ do_build() {
 	_gcc_bootstrap
 	_linux_headers
 	_musl_build
+	_libucontext_build
 	_gcc_build
 }
 
@@ -261,6 +281,11 @@ do_install() {
 	ln -svf libgnat-${_majorver}.so libgnat.so
 	rm -vf ${DESTDIR}/${_adalib}/libgna{rl,t}.so
 
+	# We need to build libatomic in target gcc as gccgo needs it to
+	# build... but it's not needed at runtime, so remove it from the
+	# destdir so it doesn't conflict with the libatomic package
+	rm -f ${DESTDIR}/${_sysroot}/usr/lib/libatomic.*
+
 	# Remove unnecessary stuff
 	rm -f ${DESTDIR}/usr/lib*/libiberty.a
 	rm -rf ${DESTDIR}/usr/share
diff --git a/srcpkgs/cross-arm-linux-musleabihf/files/gccgo-musl.patch b/srcpkgs/cross-arm-linux-musleabihf/files/gccgo-musl.patch
new file mode 120000
index 00000000000..a093af85773
--- /dev/null
+++ b/srcpkgs/cross-arm-linux-musleabihf/files/gccgo-musl.patch
@@ -0,0 +1 @@
+../../gcc/files/gccgo-musl.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-arm-linux-musleabihf/files/non-nullness.patch b/srcpkgs/cross-arm-linux-musleabihf/files/non-nullness.patch
deleted file mode 120000
index c8b653748fe..00000000000
--- a/srcpkgs/cross-arm-linux-musleabihf/files/non-nullness.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/non-nullness.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-arm-linux-musleabihf/template b/srcpkgs/cross-arm-linux-musleabihf/template
index 6b9194ebc65..a5b5fc028c7 100644
--- a/srcpkgs/cross-arm-linux-musleabihf/template
+++ b/srcpkgs/cross-arm-linux-musleabihf/template
@@ -1,9 +1,10 @@
 # Template build file for 'cross-arm-linux-musleabihf'
 #
 _binutils_version=2.32
-_gcc_version=9.1.0
+_gcc_version=9.2.0
 _musl_version=1.1.23
 _linux_version=4.19
+_libucontext_version=0.9.0
 
 _triplet=arm-linux-musleabihf
 _fpuflags="--with-arch=armv6 --with-fpu=vfp --with-float=hard"
@@ -11,8 +12,8 @@ _archflags="-march=armv6 -mfpu=vfp -mfloat-abi=hard"
 _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
-version=0.31
-revision=3
+version=0.32
+revision=1
 short_desc="Cross toolchain for ARMv6 LE Hard Float target (musl)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 homepage="https://www.voidlinux.org/"
@@ -21,11 +22,13 @@ distfiles="
  ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
  ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz
  http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz
- ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
+ ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz
+ https://distfiles.adelielinux.org/source/libucontext/libucontext-${_libucontext_version}.tar.xz"
 checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0
+ ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
  8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa
- 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
+ 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1
+ 0d53a415a307ef175153bbe60a572c940a922cb736ce13530b666e7ec2795d68"
 
 lib32disabled=yes
 nocross=yes
@@ -33,7 +36,7 @@ nopie=yes
 nodebug=yes
 create_wrksrc=yes
 
-hostmakedepends="flex perl python3"
+hostmakedepends="gcc-objc gcc-go flex perl python3"
 makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel isl15-devel"
 nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a
  libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a"
@@ -84,10 +87,10 @@ _gcc_bootstrap() {
 
 	cd ${wrksrc}/gcc-${_gcc_version}
 	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
-	_apply_patch -p0 ${FILESDIR}/non-nullness.patch
 	_apply_patch -p0 ${FILESDIR}/musl-ada.patch
 	_apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch
 	_apply_patch -p0 ${FILESDIR}/invalid_tls_model.patch
+	_apply_patch -p0 ${FILESDIR}/gccgo-musl.patch
 
 	msg_normal "Building cross gcc bootstrap\n"
 
@@ -155,6 +158,22 @@ _musl_build() {
 	touch ${wrksrc}/.musl_build_done
 }
 
+_libucontext_build() {
+	[ -f ${wrksrc}/.libucontext_build_done ] && return 0
+
+	cd ${wrksrc}/libucontext-${_libucontext_version}
+	msg_normal "Building cross libucontext\n"
+
+	# it's ok if we're static only here
+	CC="${_triplet}-gcc" AR="${_triplet}-ar" AS="${_triplet}-as" \
+		CFLAGS="-Os -pipe ${_archflags}" \
+		make ARCH=arm libucontext.a
+
+	cp libucontext.a ${_sysroot}/usr/lib
+
+	touch ${wrksrc}/.libucontext_build_done
+}
+
 _gcc_build() {
 	local _args
 	[ -f ${wrksrc}/.gcc_build_done ] && return 0
@@ -168,7 +187,7 @@ _gcc_build() {
 	_args="--prefix=/usr"
 	_args+=" --target=${_triplet}"
 	_args+=" --with-sysroot=${_sysroot}"
-	_args+=" --enable-languages=c,ada,c++,fortran,lto"
+	_args+=" --enable-languages=c,ada,c++,objc,obj-c++,go,fortran,lto"
 	_args+=" --enable-libada"
 	_args+=" --enable-lto"
 	_args+=" --enable-default-pie"
@@ -210,6 +229,7 @@ do_build() {
 	_gcc_bootstrap
 	_linux_headers
 	_musl_build
+	_libucontext_build
 	_gcc_build
 }
 
@@ -260,6 +280,11 @@ do_install() {
 	ln -svf libgnat-${_majorver}.so libgnat.so
 	rm -vf ${DESTDIR}/${_adalib}/libgna{rl,t}.so
 
+	# We need to build libatomic in target gcc as gccgo needs it to
+	# build... but it's not needed at runtime, so remove it from the
+	# destdir so it doesn't conflict with the libatomic package
+	rm -f ${DESTDIR}/${_sysroot}/usr/lib/libatomic.*
+
 	# Remove unnecessary stuff
 	rm -f ${DESTDIR}/usr/lib*/libiberty.a
 	rm -rf ${DESTDIR}/usr/share
diff --git a/srcpkgs/cross-armv7l-linux-gnueabihf/files/non-nullness.patch b/srcpkgs/cross-armv7l-linux-gnueabihf/files/non-nullness.patch
deleted file mode 120000
index c8b653748fe..00000000000
--- a/srcpkgs/cross-armv7l-linux-gnueabihf/files/non-nullness.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/non-nullness.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-armv7l-linux-gnueabihf/template b/srcpkgs/cross-armv7l-linux-gnueabihf/template
index 23864834772..bb60304d610 100644
--- a/srcpkgs/cross-armv7l-linux-gnueabihf/template
+++ b/srcpkgs/cross-armv7l-linux-gnueabihf/template
@@ -1,8 +1,8 @@
 # Template build file for 'cross-armv7l-linux-gnueabihf'
 #
 _binutils_version=2.32
-_gcc_version=9.1.0
-_glibc_version=2.29
+_gcc_version=9.2.0
+_glibc_version=2.30
 _linux_version=4.19
 
 _triplet=armv7l-linux-gnueabihf
@@ -11,7 +11,7 @@ _archflags="-march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard"
 _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
-version=0.31
+version=0.32
 revision=1
 short_desc="GNU Cross toolchain for the ${_triplet} LE target (binutils/gcc/glibc)"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -23,8 +23,8 @@ distfiles="
  http://ftp.gnu.org/gnu/glibc/glibc-${_glibc_version}.tar.xz
  ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
 checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0
- f3eeb8d57e25ca9fc13c2af3dae97754f9f643bc69229546828e3a240e2af04b
+ ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
+ e2c4114e569afbe7edbc29131a43be833850ab9a459d81beb2588016d2bbb8af
  0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
 
 lib32disabled=yes
@@ -33,7 +33,7 @@ nopie=yes
 nodebug=yes
 create_wrksrc=yes
 
-hostmakedepends="flex perl python3"
+hostmakedepends="gcc-objc gcc-go flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a
@@ -98,7 +98,6 @@ _gcc_bootstrap() {
 
 	cd ${wrksrc}/gcc-${_gcc_version}
 	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
-	_apply_patch -p0 ${FILESDIR}/non-nullness.patch
 
 	msg_normal "Building cross gcc bootstrap\n"
 
@@ -239,7 +238,7 @@ _gcc_build() {
 	_args+=" --libexecdir=/usr/lib"
 	_args+=" --target=${_triplet}"
 	_args+=" --with-sysroot=${_sysroot}"
-	_args+=" --enable-languages=c,ada,c++,fortran,lto"
+	_args+=" --enable-languages=c,ada,c++,objc,obj-c++,go,fortran,lto"
 	_args+=" --with-gnu-as"
 	_args+=" --with-gnu-ld"
 	_args+=" --disable-multilib"
@@ -256,7 +255,6 @@ _gcc_build() {
 	_args+=" --enable-default-pie"
 	_args+=" --enable-default-ssp"
 	_args+=" --disable-libquadmath"
-	_args+=" --disable-libatomic"
 	_args+=" --disable-libssp"
 	_args+=" --disable-libmpx"
 	_args+=" --disable-libmudflap"
@@ -338,6 +336,11 @@ do_install() {
 	ln -svf libgnat-${_majorver}.so libgnat.so
 	rm -vf ${DESTDIR}/${_adalib}/libgna{rl,t}.so
 
+	# We need to build libatomic in target gcc as gccgo needs it to
+	# build... but it's not needed at runtime, so remove it from the
+	# destdir so it doesn't conflict with the libatomic package
+	rm -f ${DESTDIR}/${_sysroot}/usr/lib/libatomic.*
+
 	# Remove unnecessary stuff
 	rm -f ${DESTDIR}/usr/lib*/libiberty.a
 	rm -rf ${DESTDIR}/usr/share
diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/files/gccgo-musl.patch b/srcpkgs/cross-armv7l-linux-musleabihf/files/gccgo-musl.patch
new file mode 120000
index 00000000000..a093af85773
--- /dev/null
+++ b/srcpkgs/cross-armv7l-linux-musleabihf/files/gccgo-musl.patch
@@ -0,0 +1 @@
+../../gcc/files/gccgo-musl.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/files/non-nullness.patch b/srcpkgs/cross-armv7l-linux-musleabihf/files/non-nullness.patch
deleted file mode 120000
index c8b653748fe..00000000000
--- a/srcpkgs/cross-armv7l-linux-musleabihf/files/non-nullness.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/non-nullness.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/template b/srcpkgs/cross-armv7l-linux-musleabihf/template
index 37daba36ac9..5704eb067a9 100644
--- a/srcpkgs/cross-armv7l-linux-musleabihf/template
+++ b/srcpkgs/cross-armv7l-linux-musleabihf/template
@@ -1,9 +1,10 @@
 # Template build file for 'cross-armv7l-linux-musleabihf'
 #
 _binutils_version=2.32
-_gcc_version=9.1.0
+_gcc_version=9.2.0
 _musl_version=1.1.23
 _linux_version=4.19
+_libucontext_version=0.9.0
 
 _triplet=armv7l-linux-musleabihf
 _fpuflags="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard"
@@ -11,8 +12,8 @@ _archflags="-march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard"
 _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
-version=0.31
-revision=3
+version=0.32
+revision=1
 short_desc="Cross toolchain for ARMv7 LE Hard Float target (musl)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 homepage="https://www.voidlinux.org/"
@@ -21,11 +22,13 @@ distfiles="
  ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
  ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz
  http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz
- ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
+ ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz
+ https://distfiles.adelielinux.org/source/libucontext/libucontext-${_libucontext_version}.tar.xz"
 checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0
+ ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
  8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa
- 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
+ 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1
+ 0d53a415a307ef175153bbe60a572c940a922cb736ce13530b666e7ec2795d68"
 
 lib32disabled=yes
 nocross=yes
@@ -33,7 +36,7 @@ nopie=yes
 nodebug=yes
 create_wrksrc=yes
 
-hostmakedepends="flex perl python3"
+hostmakedepends="gcc-objc gcc-go flex perl python3"
 makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel isl15-devel"
 nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a
  libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a"
@@ -84,10 +87,10 @@ _gcc_bootstrap() {
 
 	cd ${wrksrc}/gcc-${_gcc_version}
 	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
-	_apply_patch -p0 ${FILESDIR}/non-nullness.patch
 	_apply_patch -p0 ${FILESDIR}/musl-ada.patch
 	_apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch
 	_apply_patch -p0 ${FILESDIR}/invalid_tls_model.patch
+	_apply_patch -p0 ${FILESDIR}/gccgo-musl.patch
 
 	msg_normal "Building cross gcc bootstrap\n"
 
@@ -156,6 +159,22 @@ _musl_build() {
 	touch ${wrksrc}/.musl_build_done
 }
 
+_libucontext_build() {
+	[ -f ${wrksrc}/.libucontext_build_done ] && return 0
+
+	cd ${wrksrc}/libucontext-${_libucontext_version}
+	msg_normal "Building cross libucontext\n"
+
+	# it's ok if we're static only here
+	CC="${_triplet}-gcc" AR="${_triplet}-ar" AS="${_triplet}-as" \
+		CFLAGS="-Os -pipe ${_archflags}" \
+		make ARCH=arm libucontext.a
+
+	cp libucontext.a ${_sysroot}/usr/lib
+
+	touch ${wrksrc}/.libucontext_build_done
+}
+
 _gcc_build() {
 	local _args
 
@@ -170,7 +189,7 @@ _gcc_build() {
 	_args="--prefix=/usr"
 	_args+=" --target=${_triplet}"
 	_args+=" --with-sysroot=${_sysroot}"
-	_args+=" --enable-languages=c,ada,c++,fortran,lto"
+	_args+=" --enable-languages=c,ada,c++,objc,obj-c++,go,fortran,lto"
 	_args+=" --enable-libada"
 	_args+=" --enable-lto"
 	_args+=" --enable-default-pie"
@@ -212,6 +231,7 @@ do_build() {
 	_gcc_bootstrap
 	_linux_headers
 	_musl_build
+	_libucontext_build
 	_gcc_build
 }
 
@@ -262,6 +282,11 @@ do_install() {
 	ln -svf libgnat-${_majorver}.so libgnat.so
 	rm -vf ${DESTDIR}/${_adalib}/libgna{rl,t}.so
 
+	# We need to build libatomic in target gcc as gccgo needs it to
+	# build... but it's not needed at runtime, so remove it from the
+	# destdir so it doesn't conflict with the libatomic package
+	rm -f ${DESTDIR}/${_sysroot}/usr/lib/libatomic.*
+
 	# Remove unnecessary stuff
 	rm -f ${DESTDIR}/usr/lib*/libiberty.a
 	rm -rf ${DESTDIR}/usr/share
diff --git a/srcpkgs/cross-i686-linux-musl/files/bug90756.patch b/srcpkgs/cross-i686-linux-musl/files/bug90756.patch
deleted file mode 120000
index 02ae43b18b4..00000000000
--- a/srcpkgs/cross-i686-linux-musl/files/bug90756.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/bug90756.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-i686-linux-musl/files/gccgo-musl.patch b/srcpkgs/cross-i686-linux-musl/files/gccgo-musl.patch
new file mode 120000
index 00000000000..a093af85773
--- /dev/null
+++ b/srcpkgs/cross-i686-linux-musl/files/gccgo-musl.patch
@@ -0,0 +1 @@
+../../gcc/files/gccgo-musl.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-i686-linux-musl/files/non-nullness.patch b/srcpkgs/cross-i686-linux-musl/files/non-nullness.patch
deleted file mode 120000
index c8b653748fe..00000000000
--- a/srcpkgs/cross-i686-linux-musl/files/non-nullness.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/non-nullness.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-i686-linux-musl/template b/srcpkgs/cross-i686-linux-musl/template
index 905bacb0e27..25d8042180a 100644
--- a/srcpkgs/cross-i686-linux-musl/template
+++ b/srcpkgs/cross-i686-linux-musl/template
@@ -1,17 +1,18 @@
 # Template build file for 'cross-i686-linux-musl'
 #
 _binutils_version=2.32
-_gcc_version=9.1.0
+_gcc_version=9.2.0
 _musl_version=1.1.23
 _linux_version=4.19
+_libucontext_version=0.9.0
 
 _triplet=i686-linux-musl
 _sysroot="/usr/${_triplet}"
 _archflags="-march=i686"
 
 pkgname=cross-${_triplet}
-version=0.31
-revision=4
+version=0.32
+revision=1
 short_desc="Cross toolchain for i686 target (musl)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 homepage="https://www.voidlinux.org/"
@@ -20,18 +21,20 @@ distfiles="
  ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
  ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz
  http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz
- ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
+ ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz
+ https://distfiles.adelielinux.org/source/libucontext/libucontext-${_libucontext_version}.tar.xz"
 checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0
+ ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
  8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa
- 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
+ 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1
+ 0d53a415a307ef175153bbe60a572c940a922cb736ce13530b666e7ec2795d68"
 
 lib32disabled=yes
 nocross=yes
 nopie=yes
 nodebug=yes
 create_wrksrc=yes
-hostmakedepends="flex perl python3"
+hostmakedepends="gcc-objc gcc-go flex perl python3"
 makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel isl15-devel"
 nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a
  libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a"
@@ -83,12 +86,11 @@ _gcc_bootstrap() {
 
 	cd ${wrksrc}/gcc-${_gcc_version}
 	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
-	_apply_patch -p0 ${FILESDIR}/non-nullness.patch
 	_apply_patch -p0 ${FILESDIR}/no-stack_chk_fail_local.patch
 	_apply_patch -p0 ${FILESDIR}/musl-ada.patch
 	_apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch
 	_apply_patch -p0 ${FILESDIR}/invalid_tls_model.patch
-	_apply_patch -p0 ${FILESDIR}/bug90756.patch
+	_apply_patch -p0 ${FILESDIR}/gccgo-musl.patch
 
 	msg_normal "Building cross gcc bootstrap\n"
 
@@ -155,6 +157,25 @@ _musl_build() {
 	touch ${wrksrc}/.musl_build_done
 }
 
+_libucontext_build() {
+	[ -f ${wrksrc}/.libucontext_build_done ] && return 0
+
+	cd ${wrksrc}/libucontext-${_libucontext_version}
+	msg_normal "Building cross libucontext\n"
+
+	sed -i arch/x86/startcontext.S -e \
+	 "s;__i686.get_pc_thunk.bx;i686_get_pc_thunk_bx;g"
+
+	# it's ok if we're static only here
+	CC="${_triplet}-gcc" AR="${_triplet}-ar" AS="${_triplet}-as" \
+		CFLAGS="-Os -pipe ${_archflags}" \
+		make ARCH=x86 libucontext.a
+
+	cp libucontext.a ${_sysroot}/usr/lib
+
+	touch ${wrksrc}/.libucontext_build_done
+}
+
 _gcc_build() {
 	local _args
 	[ -f ${wrksrc}/.gcc_build_done ] && return 0
@@ -168,7 +189,7 @@ _gcc_build() {
 	_args="--target=${_triplet}"
 	_args+=" --with-sysroot=${_sysroot}"
 	_args+=" --prefix=/usr"
-	_args+=" --enable-languages=c,ada,c++,fortran,lto"
+	_args+=" --enable-languages=c,ada,c++,objc,obj-c++,go,fortran,lto"
 	_args+=" --enable-lto"
 	_args+=" --enable-default-pie"
 	_args+=" --enable-default-ssp"
@@ -209,6 +230,7 @@ do_build() {
 	_gcc_bootstrap
 	_linux_headers
 	_musl_build
+	_libucontext_build
 	_gcc_build
 }
 
@@ -266,6 +288,11 @@ do_install() {
 	ln -svf libgnat-${_majorver}.so libgnat.so
 	rm -vf ${DESTDIR}/${_adalib}/libgna{rl,t}.so
 
+	# We need to build libatomic in target gcc as gccgo needs it to
+	# build... but it's not needed at runtime, so remove it from the
+	# destdir so it doesn't conflict with the libatomic package
+	rm -f ${DESTDIR}/${_sysroot}/usr/lib/libatomic.*
+
 	# Remove unnecessary stuff
 	rm -f ${DESTDIR}/usr/lib*/libiberty.a
 	rm -rf ${DESTDIR}/usr/share
diff --git a/srcpkgs/cross-i686-pc-linux-gnu/files/bug90756.patch b/srcpkgs/cross-i686-pc-linux-gnu/files/bug90756.patch
deleted file mode 120000
index 02ae43b18b4..00000000000
--- a/srcpkgs/cross-i686-pc-linux-gnu/files/bug90756.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/bug90756.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-i686-pc-linux-gnu/files/non-nullness.patch b/srcpkgs/cross-i686-pc-linux-gnu/files/non-nullness.patch
deleted file mode 120000
index c8b653748fe..00000000000
--- a/srcpkgs/cross-i686-pc-linux-gnu/files/non-nullness.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/non-nullness.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-i686-pc-linux-gnu/template b/srcpkgs/cross-i686-pc-linux-gnu/template
index 34dc2a3827e..c5b0e414cae 100644
--- a/srcpkgs/cross-i686-pc-linux-gnu/template
+++ b/srcpkgs/cross-i686-pc-linux-gnu/template
@@ -1,8 +1,8 @@
 # Template build file for 'cross-i686-pc-linux-gnu'
 #
 _binutils_version=2.32
-_gcc_version=9.1.0
-_glibc_version=2.29
+_gcc_version=9.2.0
+_glibc_version=2.30
 _linux_version=4.19
 
 _triplet=i686-pc-linux-gnu
@@ -10,8 +10,8 @@ _archflags="-march=i686 -mtune=generic"
 _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
-version=0.31
-revision=2
+version=0.32
+revision=1
 short_desc="GNU Cross toolchain for the ${_triplet} target (binutils/gcc/glibc)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 homepage="https://www.voidlinux.org/"
@@ -22,8 +22,8 @@ distfiles="
  ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz
  ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
 checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0
- f3eeb8d57e25ca9fc13c2af3dae97754f9f643bc69229546828e3a240e2af04b
+ ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
+ e2c4114e569afbe7edbc29131a43be833850ab9a459d81beb2588016d2bbb8af
  0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
 
 archs="armv6l armv7l x86_64"
@@ -32,7 +32,7 @@ nopie=yes
 nodebug=yes
 lib32disabled=yes
 create_wrksrc=yes
-hostmakedepends="flex perl python3"
+hostmakedepends="gcc-objc gcc-go flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a
@@ -81,9 +81,7 @@ _gcc_bootstrap() {
 
 	cd ${wrksrc}/gcc-${_gcc_version}
 	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
-	_apply_patch -p0 ${FILESDIR}/non-nullness.patch
 	_apply_patch -p0 ${FILESDIR}/no-stack_chk_fail_local.patch
-	_apply_patch -p0 ${FILESDIR}/bug90756.patch
 
 	msg_normal "Building cross gcc bootstrap\n"
 
@@ -235,7 +233,7 @@ _gcc_build() {
 	_args+=" --prefix=/usr"
 	_args+=" --libdir=/usr/lib"
 	_args+=" --with-sysroot=${_sysroot}"
-	_args+=" --enable-languages=c,ada,c++,fortran,lto"
+	_args+=" --enable-languages=c,ada,c++,objc,obj-c++,go,fortran,lto"
 	_args+=" --with-gnu-as"
 	_args+=" --with-gnu-ld"
 	_args+=" --disable-multilib"
@@ -252,7 +250,6 @@ _gcc_build() {
 	_args+=" --enable-default-ssp"
 	_args+=" --enable-gnu-indirect-function"
 	_args+=" --enable-libquadmath"
-	_args+=" --disable-libatomic"
 	_args+=" --disable-libssp"
 	_args+=" --disable-libmpx"
 	_args+=" --disable-libmudflap"
@@ -338,6 +335,11 @@ do_install() {
 	ln -svf libgnat-${_majorver}.so libgnat.so
 	rm -vf ${DESTDIR}/${_adalib}/libgna{rl,t}.so
 
+	# We need to build libatomic in target gcc as gccgo needs it to
+	# build... but it's not needed at runtime, so remove it from the
+	# destdir so it doesn't conflict with the libatomic package
+	rm -f ${DESTDIR}/${_sysroot}/usr/lib/libatomic.*
+
 	# Remove unnecessary stuff
 	rm -f ${DESTDIR}/usr/lib*/libiberty.a
 	rm -rf ${DESTDIR}/usr/share
diff --git a/srcpkgs/cross-mips-linux-musl/files/non-nullness.patch b/srcpkgs/cross-mips-linux-musl/files/non-nullness.patch
deleted file mode 120000
index c8b653748fe..00000000000
--- a/srcpkgs/cross-mips-linux-musl/files/non-nullness.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/non-nullness.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-mips-linux-musl/template b/srcpkgs/cross-mips-linux-musl/template
index a129e937dbf..213d288cafc 100644
--- a/srcpkgs/cross-mips-linux-musl/template
+++ b/srcpkgs/cross-mips-linux-musl/template
@@ -1,7 +1,7 @@
 # Template build file for 'cross-mips-linux-musl'
 #
 _binutils_version=2.32
-_gcc_version=9.1.0
+_gcc_version=9.2.0
 _musl_version=1.1.23
 _linux_version=4.19
 
@@ -11,8 +11,8 @@ _archflags="-march=mips32r2 -msoft-float"
 _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
-version=0.31
-revision=3
+version=0.32
+revision=1
 short_desc="Cross toolchain for MIPS32r2 BE softfloat target (musl)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 homepage="https://www.voidlinux.org/"
@@ -23,7 +23,7 @@ distfiles="
  http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz
  ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
 checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0
+ ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
  8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa
  0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
 
@@ -33,7 +33,7 @@ nopie=yes
 nodebug=yes
 create_wrksrc=yes
 
-hostmakedepends="flex perl python3"
+hostmakedepends="gcc-objc flex perl python3"
 makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel isl15-devel"
 nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a
  libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a"
@@ -84,7 +84,6 @@ _gcc_bootstrap() {
 
 	cd ${wrksrc}/gcc-${_gcc_version}
 	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
-	_apply_patch -p0 ${FILESDIR}/non-nullness.patch
 	_apply_patch -p0 ${FILESDIR}/musl-ada.patch
 	_apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch
 	_apply_patch -p0 ${FILESDIR}/invalid_tls_model.patch
@@ -169,7 +168,7 @@ _gcc_build() {
 	_args+=" --target=${_triplet}"
 	_args+=" --with-sysroot=${_sysroot}"
 	_args+=" --libexecdir=/usr/lib"
-	_args+=" --enable-languages=c,ada,c++,fortran,lto"
+	_args+=" --enable-languages=c,ada,c++,objc,obj-c++,fortran,lto"
 	_args+=" --enable-libada"
 	_args+=" --enable-lto"
 	_args+=" --enable-default-pie"
@@ -180,6 +179,7 @@ _gcc_build() {
 	_args+=" --disable-libquadmath"
 	_args+=" --disable-libmpx"
 	_args+=" --disable-libmudflap"
+	_args+=" --disable-libatomic"
 	_args+=" --enable-shared"
 	_args+=" ${_fpuflags}"
 
diff --git a/srcpkgs/cross-mips-linux-muslhf/files/non-nullness.patch b/srcpkgs/cross-mips-linux-muslhf/files/non-nullness.patch
deleted file mode 120000
index c8b653748fe..00000000000
--- a/srcpkgs/cross-mips-linux-muslhf/files/non-nullness.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/non-nullness.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-mips-linux-muslhf/template b/srcpkgs/cross-mips-linux-muslhf/template
index 5ad364ecf40..84892aa48ba 100644
--- a/srcpkgs/cross-mips-linux-muslhf/template
+++ b/srcpkgs/cross-mips-linux-muslhf/template
@@ -1,7 +1,7 @@
 # Template build file for 'cross-mips-linux-muslhf'
 #
 _binutils_version=2.32
-_gcc_version=9.1.0
+_gcc_version=9.2.0
 _musl_version=1.1.23
 _linux_version=4.19
 
@@ -11,8 +11,8 @@ _archflags="-march=mips32r2 -mhard-float"
 _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
-version=0.31
-revision=3
+version=0.32
+revision=1
 short_desc="Cross toolchain for MIPS32r2 BE hardfloat target (musl)"
 maintainer="hipperson0 <hipperson0@gmail.com>"
 homepage="https://www.voidlinux.org/"
@@ -23,7 +23,7 @@ distfiles="
  https://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz
  ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
 checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0
+ ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
  8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa
  0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
 
@@ -33,7 +33,7 @@ nopie=yes
 nodebug=yes
 create_wrksrc=yes
 
-hostmakedepends="flex perl python3"
+hostmakedepends="gcc-objc flex perl python3"
 makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel isl15-devel"
 nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a
  libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a"
@@ -84,7 +84,6 @@ _gcc_bootstrap() {
 
 	cd ${wrksrc}/gcc-${_gcc_version}
 	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
-	_apply_patch -p0 ${FILESDIR}/non-nullness.patch
 	_apply_patch -p0 ${FILESDIR}/musl-ada.patch
 	_apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch
 	_apply_patch -p0 ${FILESDIR}/invalid_tls_model.patch
@@ -169,7 +168,7 @@ _gcc_build() {
 	_args+=" --target=${_triplet}"
 	_args+=" --with-sysroot=${_sysroot}"
 	_args+=" --libexecdir=/usr/lib"
-	_args+=" --enable-languages=c,ada,c++,fortran,lto"
+	_args+=" --enable-languages=c,ada,c++,objc,obj-c++,fortran,lto"
 	_args+=" --enable-libada"
 	_args+=" --enable-lto"
 	_args+=" --enable-default-pie"
@@ -180,6 +179,7 @@ _gcc_build() {
 	_args+=" --disable-libquadmath"
 	_args+=" --disable-libmpx"
 	_args+=" --disable-libmudflap"
+	_args+=" --disable-libatomic"
 	_args+=" --enable-shared"
 	_args+=" ${_fpuflags}"
 
diff --git a/srcpkgs/cross-mipsel-linux-musl/files/non-nullness.patch b/srcpkgs/cross-mipsel-linux-musl/files/non-nullness.patch
deleted file mode 120000
index c8b653748fe..00000000000
--- a/srcpkgs/cross-mipsel-linux-musl/files/non-nullness.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/non-nullness.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-mipsel-linux-musl/template b/srcpkgs/cross-mipsel-linux-musl/template
index 1621d1005d5..20cbe0fed03 100644
--- a/srcpkgs/cross-mipsel-linux-musl/template
+++ b/srcpkgs/cross-mipsel-linux-musl/template
@@ -1,7 +1,7 @@
 # Template build file for 'cross-mipsel-linux-musl'
 #
 _binutils_version=2.32
-_gcc_version=9.1.0
+_gcc_version=9.2.0
 _musl_version=1.1.23
 _linux_version=4.19
 
@@ -11,8 +11,8 @@ _archflags="-march=mips32r2 -msoft-float"
 _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
-version=0.31
-revision=3
+version=0.32
+revision=1
 short_desc="Cross toolchain for MIPS32r2 LE softfloat target (musl)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 homepage="https://www.voidlinux.org/"
@@ -23,7 +23,7 @@ distfiles="
  http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz
  ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
 checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0
+ ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
  8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa
  0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
 
@@ -33,7 +33,7 @@ nopie=yes
 nodebug=yes
 create_wrksrc=yes
 
-hostmakedepends="flex perl python3"
+hostmakedepends="gcc-objc flex perl python3"
 makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel isl15-devel"
 nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a
  libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a"
@@ -84,7 +84,6 @@ _gcc_bootstrap() {
 
 	cd ${wrksrc}/gcc-${_gcc_version}
 	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
-	_apply_patch -p0 ${FILESDIR}/non-nullness.patch
 	_apply_patch -p0 ${FILESDIR}/musl-ada.patch
 	_apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch
 	_apply_patch -p0 ${FILESDIR}/invalid_tls_model.patch
@@ -169,7 +168,7 @@ _gcc_build() {
 	_args+=" --libexecdir=/usr/lib"
 	_args+=" --target=${_triplet}"
 	_args+=" --with-sysroot=${_sysroot}"
-	_args+=" --enable-languages=c,ada,c++,fortran,lto"
+	_args+=" --enable-languages=c,ada,c++,objc,obj-c++,fortran,lto"
 	_args+=" --enable-libada"
 	_args+=" --enable-lto"
 	_args+=" --enable-default-pie"
@@ -180,6 +179,7 @@ _gcc_build() {
 	_args+=" --disable-libquadmath"
 	_args+=" --disable-libmpx"
 	_args+=" --disable-libmudflap"
+	_args+=" --disable-libatomic"
 	_args+=" --enable-shared"
 	_args+=" ${_fpuflags}"
 
diff --git a/srcpkgs/cross-mipsel-linux-muslhf/files/non-nullness.patch b/srcpkgs/cross-mipsel-linux-muslhf/files/non-nullness.patch
deleted file mode 120000
index c8b653748fe..00000000000
--- a/srcpkgs/cross-mipsel-linux-muslhf/files/non-nullness.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/non-nullness.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-mipsel-linux-muslhf/template b/srcpkgs/cross-mipsel-linux-muslhf/template
index 3f02ba22d27..d2a692b48fe 100644
--- a/srcpkgs/cross-mipsel-linux-muslhf/template
+++ b/srcpkgs/cross-mipsel-linux-muslhf/template
@@ -1,7 +1,7 @@
 # Template build file for 'cross-mipsel-linux-muslhf'
 #
 _binutils_version=2.32
-_gcc_version=9.1.0
+_gcc_version=9.2.0
 _musl_version=1.1.23
 _linux_version=4.19
 
@@ -11,8 +11,8 @@ _archflags="-march=mips32r2 -mhard-float"
 _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
-version=0.31
-revision=3
+version=0.32
+revision=1
 short_desc="Cross toolchain for MIPS32r2 LE hardfloat target (musl)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 homepage="https://www.voidlinux.org/"
@@ -23,7 +23,7 @@ distfiles="
  http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz
  ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
 checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0
+ ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
  8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa
  0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
 
@@ -33,7 +33,7 @@ nopie=yes
 nodebug=yes
 create_wrksrc=yes
 
-hostmakedepends="flex perl python3"
+hostmakedepends="gcc-objc flex perl python3"
 makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel isl15-devel"
 nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a
  libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a"
@@ -84,7 +84,6 @@ _gcc_bootstrap() {
 
 	cd ${wrksrc}/gcc-${_gcc_version}
 	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
-	_apply_patch -p0 ${FILESDIR}/non-nullness.patch
 	_apply_patch -p0 ${FILESDIR}/musl-ada.patch
 	_apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch
 	_apply_patch -p0 ${FILESDIR}/invalid_tls_model.patch
@@ -169,7 +168,7 @@ _gcc_build() {
 	_args+=" --libexecdir=/usr/lib"
 	_args+=" --target=${_triplet}"
 	_args+=" --with-sysroot=${_sysroot}"
-	_args+=" --enable-languages=c,ada,c++,fortran,lto"
+	_args+=" --enable-languages=c,ada,c++,objc,obj-c++,fortran,lto"
 	_args+=" --enable-libada"
 	_args+=" --enable-lto"
 	_args+=" --enable-default-pie"
@@ -180,6 +179,7 @@ _gcc_build() {
 	_args+=" --disable-libquadmath"
 	_args+=" --disable-libmpx"
 	_args+=" --disable-libmudflap"
+	_args+=" --disable-libatomic"
 	_args+=" --enable-shared"
 	_args+=" ${_fpuflags}"
 
diff --git a/srcpkgs/cross-powerpc-linux-gnu/files/non-nullness.patch b/srcpkgs/cross-powerpc-linux-gnu/files/non-nullness.patch
deleted file mode 120000
index c8b653748fe..00000000000
--- a/srcpkgs/cross-powerpc-linux-gnu/files/non-nullness.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/non-nullness.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc-linux-gnu/template b/srcpkgs/cross-powerpc-linux-gnu/template
index d599721bad6..c36b8c1c307 100644
--- a/srcpkgs/cross-powerpc-linux-gnu/template
+++ b/srcpkgs/cross-powerpc-linux-gnu/template
@@ -1,8 +1,7 @@
-# Template build file for 'cross-powerpc-linux-gnu'
-#
+# Template file for 'cross-powerpc-linux-gnu'
 _binutils_version=2.32
-_gcc_version=9.1.0
-_glibc_version=2.29
+_gcc_version=9.2.0
+_glibc_version=2.30
 _linux_version=4.19
 
 _triplet=powerpc-linux-gnu
@@ -10,7 +9,7 @@ _archflags="-mcpu=powerpc -msecure-plt"
 _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
-version=0.31
+version=0.32
 revision=1
 short_desc="GNU Cross toolchain for the ${_triplet} target (binutils/gcc/glibc)"
 maintainer="Thomas Batten <stenstorpmc@gmail.com>"
@@ -22,15 +21,15 @@ distfiles="
  ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz
  ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
 checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0
- f3eeb8d57e25ca9fc13c2af3dae97754f9f643bc69229546828e3a240e2af04b
+ ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
+ e2c4114e569afbe7edbc29131a43be833850ab9a459d81beb2588016d2bbb8af
  0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
 
 lib32disabled=yes
 nocross=yes
 nopie=yes
 create_wrksrc=yes
-hostmakedepends="flex perl python3"
+hostmakedepends="gcc-objc gcc-go flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a
@@ -95,7 +94,6 @@ _gcc_bootstrap() {
 
 	cd ${wrksrc}/gcc-${_gcc_version}
 	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
-	_apply_patch -p0 ${FILESDIR}/non-nullness.patch
 
 	msg_normal "Building cross gcc bootstrap\n"
 
@@ -236,7 +234,7 @@ _gcc_build() {
 	_args+=" --libdir=/usr/lib"
 	_args+=" --target=${_triplet}"
 	_args+=" --with-sysroot=${_sysroot}"
-	_args+=" --enable-languages=c,ada,c++,fortran,lto"
+	_args+=" --enable-languages=c,ada,c++,objc,obj-c++,go,fortran,lto"
 	_args+=" --with-gnu-as"
 	_args+=" --with-gnu-ld"
 	_args+=" --disable-multilib"
@@ -252,7 +250,6 @@ _gcc_build() {
 	_args+=" --enable-default-pie"
 	_args+=" --enable-default-ssp"
 	_args+=" --disable-libquadmath"
-	_args+=" --disable-libatomic"
 	_args+=" --disable-libssp"
 	_args+=" --disable-libmudflap"
 	_args+=" --disable-libsanitizer"
@@ -328,14 +325,19 @@ do_install() {
 	cd ${wrksrc}/glibc-build
 	make install_root=${DESTDIR}/${_sysroot} install install-headers
 
-        # symlinks for gnarl and gnat shared libraries
-        _majorver=${_gcc_version%.*.*}
-        _adalib=usr/lib/gcc/${_triplet}/${_gcc_version}/adalib
-        mv -v ${DESTDIR}/${_adalib}/libgnarl-${_majorver}.so ${DESTDIR}/${_sysroot}/usr/lib
-        mv -v ${DESTDIR}/${_adalib}/libgnat-${_majorver}.so ${DESTDIR}/${_sysroot}/usr/lib
-        ln -svf libgnarl-${_majorver}.so libgnarl.so
-        ln -svf libgnat-${_majorver}.so libgnat.so
-        rm -vf ${DESTDIR}/${_adalib}/libgna{rl,t}.so
+	# symlinks for gnarl and gnat shared libraries
+	_majorver=${_gcc_version%.*.*}
+	_adalib=usr/lib/gcc/${_triplet}/${_gcc_version}/adalib
+	mv -v ${DESTDIR}/${_adalib}/libgnarl-${_majorver}.so ${DESTDIR}/${_sysroot}/usr/lib
+	mv -v ${DESTDIR}/${_adalib}/libgnat-${_majorver}.so ${DESTDIR}/${_sysroot}/usr/lib
+	ln -svf libgnarl-${_majorver}.so libgnarl.so
+	ln -svf libgnat-${_majorver}.so libgnat.so
+	rm -vf ${DESTDIR}/${_adalib}/libgna{rl,t}.so
+
+	# We need to build libatomic in target gcc as gccgo needs it to
+	# build... but it's not needed at runtime, so remove it from the
+	# destdir so it doesn't conflict with the libatomic package
+	rm -f ${DESTDIR}/${_sysroot}/usr/lib/libatomic.*
 
 	# Remove unnecessary stuff
 	rm -f ${DESTDIR}/usr/lib*/libiberty.a
diff --git a/srcpkgs/cross-powerpc-linux-musl/files/gccgo-musl.patch b/srcpkgs/cross-powerpc-linux-musl/files/gccgo-musl.patch
new file mode 120000
index 00000000000..a093af85773
--- /dev/null
+++ b/srcpkgs/cross-powerpc-linux-musl/files/gccgo-musl.patch
@@ -0,0 +1 @@
+../../gcc/files/gccgo-musl.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc-linux-musl/files/non-nullness.patch b/srcpkgs/cross-powerpc-linux-musl/files/non-nullness.patch
deleted file mode 120000
index c8b653748fe..00000000000
--- a/srcpkgs/cross-powerpc-linux-musl/files/non-nullness.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/non-nullness.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc-linux-musl/template b/srcpkgs/cross-powerpc-linux-musl/template
index 856e8fb0885..9d61d406ace 100644
--- a/srcpkgs/cross-powerpc-linux-musl/template
+++ b/srcpkgs/cross-powerpc-linux-musl/template
@@ -1,9 +1,9 @@
-# Template build file for 'cross-powerpc-linux-musl'
-#
+# Template file for 'cross-powerpc-linux-musl'
 _binutils_version=2.32
-_gcc_version=9.1.0
+_gcc_version=9.2.0
 _musl_version=1.1.23
 _linux_version=4.19
+_libucontext_version=0.9.0
 
 _triplet=powerpc-linux-musl
 _fpuflags=
@@ -11,8 +11,8 @@ _archflags="-mcpu=powerpc -msecure-plt"
 _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
-version=0.31
-revision=3
+version=0.32
+revision=1
 
 short_desc="Cross toolchain for PowerPC (musl)"
 maintainer="Thomas Batten <stenstorpmc@gmail.com>"
@@ -21,13 +21,14 @@ license="GPL-3.0-or-later, GPL-2.0-only, MIT"
 distfiles="
  ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
  ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz
+ http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz
  ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz
- http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz"
-checksum="
- 0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0
+ https://distfiles.adelielinux.org/source/libucontext/libucontext-${_libucontext_version}.tar.xz"
+checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
+ ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
+ 8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa
  0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1
- 8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa"
+ 0d53a415a307ef175153bbe60a572c940a922cb736ce13530b666e7ec2795d68"
 
 lib32disabled=yes
 nocross=yes
@@ -36,7 +37,7 @@ nodebug=yes
 create_wrksrc=yes
 
 archs="i686* x86_64* ppc64*"
-hostmakedepends="flex perl python3"
+hostmakedepends="gcc-objc gcc-go flex perl python3"
 makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel isl15-devel"
 nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a
  libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a"
@@ -86,13 +87,13 @@ _gcc_bootstrap() {
 
 	cd ${wrksrc}/gcc-${_gcc_version}
 	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
-	_apply_patch -p0 ${FILESDIR}/non-nullness.patch
 	_apply_patch -p0 ${FILESDIR}/musl-ada.patch
 	_apply_patch -p0 ${FILESDIR}/no-stack_chk_fail_local.patch
 	_apply_patch -p0 ${FILESDIR}/0010-ldbl128-config.patch
 	_apply_patch -p0 ${FILESDIR}/libgcc-musl-ldbl128-config.patch
 	_apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch
 	_apply_patch -p0 ${FILESDIR}/invalid_tls_model.patch
+	_apply_patch -p0 ${FILESDIR}/gccgo-musl.patch
 
 	msg_normal "Building cross gcc bootstrap\n"
 
@@ -166,6 +167,22 @@ _musl_build() {
 	touch ${wrksrc}/.musl_build_done
 }
 
+_libucontext_build() {
+	[ -f ${wrksrc}/.libucontext_build_done ] && return 0
+
+	cd ${wrksrc}/libucontext-${_libucontext_version}
+	msg_normal "Building cross libucontext\n"
+
+	# it's ok if we're static only here
+	CC="${_triplet}-gcc" AR="${_triplet}-ar" AS="${_triplet}-as" \
+		CFLAGS="-Os -pipe ${_archflags}" \
+		make ARCH=ppc libucontext.a
+
+	cp libucontext.a ${_sysroot}/usr/lib
+
+	touch ${wrksrc}/.libucontext_build_done
+}
+
 _gcc_build() {
 	local _args
 
@@ -181,7 +198,7 @@ _gcc_build() {
 	_args+=" --target=${_triplet}"
 	_args+=" --with-sysroot=${_sysroot}"
 	_args+=" --libexecdir=/usr/lib"
-	_args+=" --enable-languages=c,ada,c++,fortran,lto"
+	_args+=" --enable-languages=c,ada,c++,objc,obj-c++,go,fortran,lto"
 	_args+=" --enable-lto"
 	_args+=" --enable-libada"
 	_args+=" --enable-default-pie"
@@ -226,6 +243,7 @@ do_build() {
 	_gcc_bootstrap
 	_linux_headers
 	_musl_build
+	_libucontext_build
 	_gcc_build
 }
 
@@ -268,15 +286,20 @@ do_install() {
 	ln -sf libc.so ${DESTDIR}/${_sysroot}/usr/lib/ld-musl-powerpc.so.1
 	ln -sf libc.so ${DESTDIR}/${_sysroot}/usr/lib/ld-musl-powerpc-sf.so.1
 
-        # symlinks for gnarl and gnat shared libraries
-        _majorver=${_gcc_version%.*.*}
-        _adalib=usr/lib/gcc/${_triplet}/${_gcc_version}/adalib
-        mv -v ${DESTDIR}/${_adalib}/libgnarl-${_majorver}.so ${DESTDIR}/${_sysroot}/usr/lib
-        mv -v ${DESTDIR}/${_adalib}/libgnat-${_majorver}.so ${DESTDIR}/${_sysroot}/usr/lib
-        ln -svf libgnarl-${_majorver}.so libgnarl.so
-        ln -svf libgnat-${_majorver}.so libgnat.so
+	# symlinks for gnarl and gnat shared libraries
+	_majorver=${_gcc_version%.*.*}
+	_adalib=usr/lib/gcc/${_triplet}/${_gcc_version}/adalib
+	mv -v ${DESTDIR}/${_adalib}/libgnarl-${_majorver}.so ${DESTDIR}/${_sysroot}/usr/lib
+	mv -v ${DESTDIR}/${_adalib}/libgnat-${_majorver}.so ${DESTDIR}/${_sysroot}/usr/lib
+	ln -svf libgnarl-${_majorver}.so libgnarl.so
+	ln -svf libgnat-${_majorver}.so libgnat.so
 	rm -vf ${DESTDIR}/${_adalib}/libgna{rl,t}.so
 
+	# We need to build libatomic in target gcc as gccgo needs it to
+	# build... but it's not needed at runtime, so remove it from the
+	# destdir so it doesn't conflict with the libatomic package
+	rm -f ${DESTDIR}/${_sysroot}/usr/lib/libatomic.*
+
 	# Remove unnecessary stuff
 	rm -f ${DESTDIR}/usr/lib*/libiberty.a
 	rm -rf ${DESTDIR}/usr/share
diff --git a/srcpkgs/cross-powerpc64-linux-gnu/files/darn.patch b/srcpkgs/cross-powerpc64-linux-gnu/files/darn.patch
new file mode 120000
index 00000000000..dc81f1f9657
--- /dev/null
+++ b/srcpkgs/cross-powerpc64-linux-gnu/files/darn.patch
@@ -0,0 +1 @@
+../../gcc/patches/darn.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc64-linux-gnu/files/non-nullness.patch b/srcpkgs/cross-powerpc64-linux-gnu/files/non-nullness.patch
deleted file mode 120000
index c8b653748fe..00000000000
--- a/srcpkgs/cross-powerpc64-linux-gnu/files/non-nullness.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/non-nullness.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc64-linux-gnu/template b/srcpkgs/cross-powerpc64-linux-gnu/template
index 51973934ea6..9788de4ffc1 100644
--- a/srcpkgs/cross-powerpc64-linux-gnu/template
+++ b/srcpkgs/cross-powerpc64-linux-gnu/template
@@ -1,14 +1,14 @@
 # Template file for 'cross-powerpc64le-linux-gnu'
 _binutils_version=2.32
-_gcc_version=9.1.0
-_glibc_version=2.29
+_gcc_version=9.2.0
+_glibc_version=2.30
 _linux_version=4.19
 
 _triplet="powerpc64-linux-gnu"
 _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
-version=0.31
+version=0.32
 revision=1
 short_desc="GNU cross toolchain for the ${_triplet} targets (binutils/gcc/glibc)"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
@@ -20,8 +20,8 @@ distfiles="
  ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz
  ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
 checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0
- f3eeb8d57e25ca9fc13c2af3dae97754f9f643bc69229546828e3a240e2af04b
+ ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
+ e2c4114e569afbe7edbc29131a43be833850ab9a459d81beb2588016d2bbb8af
  0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
 
 lib32disabled=yes
@@ -29,7 +29,7 @@ nocross=yes
 nopie=yes
 nodebug=yes
 create_wrksrc=yes
-hostmakedepends="flex perl python3"
+hostmakedepends="gcc-objc gcc-go flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel"
 nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a
  libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a"
@@ -81,7 +81,7 @@ _gcc_bootstrap() {
 
 	cd ${wrksrc}/gcc-${_gcc_version}
 	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
-	_apply_patch -p0 ${FILESDIR}/non-nullness.patch
+	_apply_patch -p0 ${FILESDIR}/darn.patch
 	_apply_patch -p0 ${FILESDIR}/ppc64-pure64.patch
 
 	sed -i 's/lib64/lib/' gcc/config/rs6000/linux64.h
@@ -241,7 +241,7 @@ _gcc_build() {
 	_args+=" --target=${_triplet}"
 	_args+=" --with-sysroot=${_sysroot}"
 	_args+=" --with-abi=elfv2"
-	_args+=" --enable-languages=c,ada,c++,fortran,lto"
+	_args+=" --enable-languages=c,ada,c++,objc,obj-c++,go,fortran,lto"
 	_args+=" --enable-secureplt"
 	_args+=" --enable-targets=powerpcle-linux"
 	_args+=" --with-gnu-as"
@@ -338,6 +338,11 @@ do_install() {
 	ln -svf libgnat-${_majorver}.so libgnat.so
 	rm -vf ${DESTDIR}/${_adalib}/libgna{rl,t}.so
 
+	# We need to build libatomic in target gcc as gccgo needs it to
+	# build... but it's not needed at runtime, so remove it from the
+	# destdir so it doesn't conflict with the libatomic package
+	rm -f ${DESTDIR}/${_sysroot}/usr/lib/libatomic.*
+
 	# Remove unnecessary stuff
 	rm -f ${DESTDIR}/usr/lib*/libiberty.a
 	rm -rf ${DESTDIR}/usr/share
diff --git a/srcpkgs/cross-powerpc64-linux-musl/files/darn.patch b/srcpkgs/cross-powerpc64-linux-musl/files/darn.patch
new file mode 120000
index 00000000000..dc81f1f9657
--- /dev/null
+++ b/srcpkgs/cross-powerpc64-linux-musl/files/darn.patch
@@ -0,0 +1 @@
+../../gcc/patches/darn.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc64-linux-musl/files/gccgo-musl.patch b/srcpkgs/cross-powerpc64-linux-musl/files/gccgo-musl.patch
new file mode 120000
index 00000000000..a093af85773
--- /dev/null
+++ b/srcpkgs/cross-powerpc64-linux-musl/files/gccgo-musl.patch
@@ -0,0 +1 @@
+../../gcc/files/gccgo-musl.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc64-linux-musl/files/non-nullness.patch b/srcpkgs/cross-powerpc64-linux-musl/files/non-nullness.patch
deleted file mode 120000
index c8b653748fe..00000000000
--- a/srcpkgs/cross-powerpc64-linux-musl/files/non-nullness.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/non-nullness.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc64-linux-musl/template b/srcpkgs/cross-powerpc64-linux-musl/template
index d3a9a758fe9..ea2800df634 100644
--- a/srcpkgs/cross-powerpc64-linux-musl/template
+++ b/srcpkgs/cross-powerpc64-linux-musl/template
@@ -1,15 +1,16 @@
 # Template file for 'cross-powerpc64-linux-musl'
 _binutils_version=2.32
-_gcc_version=9.1.0
+_gcc_version=9.2.0
 _musl_version=1.1.23
 _linux_version=4.19
+_libucontext_version=0.9.0
 
 _triplet="powerpc64-linux-musl"
 _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
-version=0.31
-revision=3
+version=0.32
+revision=1
 short_desc="Cross toolchain for powerpc64 with musl"
 maintainer="q66 <daniel@octaforge.org>"
 homepage="https://www.voidlinux.org/"
@@ -18,18 +19,20 @@ distfiles="
  ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
  ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz
  http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz
- ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
+ ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz
+ https://distfiles.adelielinux.org/source/libucontext/libucontext-${_libucontext_version}.tar.xz"
 checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0
+ ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
  8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa
- 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
+ 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1
+ 0d53a415a307ef175153bbe60a572c940a922cb736ce13530b666e7ec2795d68"
 
 lib32disabled=yes
 nocross=yes
 nopie=yes
 nodebug=yes
 create_wrksrc=yes
-hostmakedepends="flex perl python3"
+hostmakedepends="gcc-objc gcc-go flex perl python3"
 makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel isl15-devel"
 nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a
  libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a"
@@ -81,13 +84,14 @@ _gcc_bootstrap() {
 
 	cd ${wrksrc}/gcc-${_gcc_version}
 	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
-	_apply_patch -p0 ${FILESDIR}/non-nullness.patch
 	_apply_patch -p0 ${FILESDIR}/0010-ldbl128-config.patch
 	_apply_patch -p0 ${FILESDIR}/ppc64-pure64.patch
 	_apply_patch -p0 ${FILESDIR}/libgcc-musl-ldbl128-config.patch
 	_apply_patch -p0 ${FILESDIR}/musl-ada.patch
+	_apply_patch -p0 ${FILESDIR}/darn.patch
 	_apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch
 	_apply_patch -p0 ${FILESDIR}/invalid_tls_model.patch
+	_apply_patch -p0 ${FILESDIR}/gccgo-musl.patch
 
 	sed -i 's/lib64/lib/' gcc/config/rs6000/linux64.h
 
@@ -161,6 +165,22 @@ _musl_build() {
 	touch ${wrksrc}/.musl_build_done
 }
 
+_libucontext_build() {
+	[ -f ${wrksrc}/.libucontext_build_done ] && return 0
+
+	cd ${wrksrc}/libucontext-${_libucontext_version}
+	msg_normal "Building cross libucontext\n"
+
+	# it's ok if we're static only here
+	CC="${_triplet}-gcc" AR="${_triplet}-ar" AS="${_triplet}-as" \
+		CFLAGS="-Os -pipe ${_archflags}" \
+		make ARCH=ppc64 libucontext.a
+
+	cp libucontext.a ${_sysroot}/usr/lib
+
+	touch ${wrksrc}/.libucontext_build_done
+}
+
 _gcc_build() {
 	local _args
 	[ -f ${wrksrc}/.gcc_build_done ] && return 0
@@ -176,7 +196,7 @@ _gcc_build() {
 	_args+=" --target=${_triplet}"
 	_args+=" --with-sysroot=${_sysroot}"
 	_args+=" --with-abi=elfv2"
-	_args+=" --enable-languages=c,ada,c++,fortran,lto"
+	_args+=" --enable-languages=c,ada,c++,objc,obj-c++,go,fortran,lto"
 	_args+=" --enable-decimal-float=no"
 	_args+=" --enable-secureplt"
 	_args+=" --enable-targets=powerpc-linux"
@@ -219,6 +239,7 @@ do_build() {
 	_gcc_bootstrap
 	_linux_headers
 	_musl_build
+	_libucontext_build
 	_gcc_build
 }
 
@@ -270,6 +291,11 @@ do_install() {
 	ln -svf libgnat-${_majorver}.so libgnat.so
 	rm -vf ${DESTDIR}/${_adalib}/libgna{rl,t}.so
 
+	# We need to build libatomic in target gcc as gccgo needs it to
+	# build... but it's not needed at runtime, so remove it from the
+	# destdir so it doesn't conflict with the libatomic package
+	rm -f ${DESTDIR}/${_sysroot}/usr/lib/libatomic.*
+
 	# Remove unnecessary stuff
 	rm -f ${DESTDIR}/usr/lib*/libiberty.a
 	rm -rf ${DESTDIR}/usr/share
diff --git a/srcpkgs/cross-powerpc64le-linux-gnu/files/darn.patch b/srcpkgs/cross-powerpc64le-linux-gnu/files/darn.patch
new file mode 120000
index 00000000000..dc81f1f9657
--- /dev/null
+++ b/srcpkgs/cross-powerpc64le-linux-gnu/files/darn.patch
@@ -0,0 +1 @@
+../../gcc/patches/darn.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc64le-linux-gnu/files/non-nullness.patch b/srcpkgs/cross-powerpc64le-linux-gnu/files/non-nullness.patch
deleted file mode 120000
index c8b653748fe..00000000000
--- a/srcpkgs/cross-powerpc64le-linux-gnu/files/non-nullness.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/non-nullness.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc64le-linux-gnu/template b/srcpkgs/cross-powerpc64le-linux-gnu/template
index 485f6bfe397..30bde74b769 100644
--- a/srcpkgs/cross-powerpc64le-linux-gnu/template
+++ b/srcpkgs/cross-powerpc64le-linux-gnu/template
@@ -1,14 +1,14 @@
 # Template file for 'cross-powerpc64le-linux-gnu'
 _binutils_version=2.32
-_gcc_version=9.1.0
-_glibc_version=2.29
+_gcc_version=9.2.0
+_glibc_version=2.30
 _linux_version=4.19
 
 _triplet="powerpc64le-linux-gnu"
 _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
-version=0.31
+version=0.32
 revision=1
 short_desc="GNU cross toolchain for the ${_triplet} targets (binutils/gcc/glibc)"
 maintainer="q66 <daniel@octaforge.org>"
@@ -20,8 +20,8 @@ distfiles="
  ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz
  ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
 checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0
- f3eeb8d57e25ca9fc13c2af3dae97754f9f643bc69229546828e3a240e2af04b
+ ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
+ e2c4114e569afbe7edbc29131a43be833850ab9a459d81beb2588016d2bbb8af
  0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
 
 lib32disabled=yes
@@ -29,7 +29,7 @@ nocross=yes
 nopie=yes
 nodebug=yes
 create_wrksrc=yes
-hostmakedepends="flex perl python3"
+hostmakedepends="gcc-objc gcc-go flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel"
 nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a
  libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a"
@@ -81,7 +81,7 @@ _gcc_bootstrap() {
 
 	cd ${wrksrc}/gcc-${_gcc_version}
 	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
-	_apply_patch -p0 ${FILESDIR}/non-nullness.patch
+	_apply_patch -p0 ${FILESDIR}/darn.patch
 	_apply_patch -p0 ${FILESDIR}/ppc64-pure64.patch
 
 	sed -i 's/lib64/lib/' gcc/config/rs6000/linux64.h
@@ -241,7 +241,7 @@ _gcc_build() {
 	_args+=" --target=${_triplet}"
 	_args+=" --with-sysroot=${_sysroot}"
 	_args+=" --with-abi=elfv2"
-	_args+=" --enable-languages=c,ada,c++,fortran,lto"
+	_args+=" --enable-languages=c,ada,c++,objc,obj-c++,go,fortran,lto"
 	_args+=" --enable-secureplt"
 	_args+=" --enable-targets=powerpcle-linux"
 	_args+=" --with-gnu-as"
@@ -338,6 +338,11 @@ do_install() {
 	ln -svf libgnat-${_majorver}.so libgnat.so
 	rm -vf ${DESTDIR}/${_adalib}/libgna{rl,t}.so
 
+	# We need to build libatomic in target gcc as gccgo needs it to
+	# build... but it's not needed at runtime, so remove it from the
+	# destdir so it doesn't conflict with the libatomic package
+	rm -f ${DESTDIR}/${_sysroot}/usr/lib/libatomic.*
+
 	# Remove unnecessary stuff
 	rm -f ${DESTDIR}/usr/lib*/libiberty.a
 	rm -rf ${DESTDIR}/usr/share
diff --git a/srcpkgs/cross-powerpc64le-linux-musl/files/darn.patch b/srcpkgs/cross-powerpc64le-linux-musl/files/darn.patch
new file mode 120000
index 00000000000..dc81f1f9657
--- /dev/null
+++ b/srcpkgs/cross-powerpc64le-linux-musl/files/darn.patch
@@ -0,0 +1 @@
+../../gcc/patches/darn.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc64le-linux-musl/files/gccgo-musl.patch b/srcpkgs/cross-powerpc64le-linux-musl/files/gccgo-musl.patch
new file mode 120000
index 00000000000..a093af85773
--- /dev/null
+++ b/srcpkgs/cross-powerpc64le-linux-musl/files/gccgo-musl.patch
@@ -0,0 +1 @@
+../../gcc/files/gccgo-musl.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc64le-linux-musl/files/non-nullness.patch b/srcpkgs/cross-powerpc64le-linux-musl/files/non-nullness.patch
deleted file mode 120000
index c8b653748fe..00000000000
--- a/srcpkgs/cross-powerpc64le-linux-musl/files/non-nullness.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/non-nullness.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc64le-linux-musl/template b/srcpkgs/cross-powerpc64le-linux-musl/template
index 7e75d7b1c5c..475f2f725ca 100644
--- a/srcpkgs/cross-powerpc64le-linux-musl/template
+++ b/srcpkgs/cross-powerpc64le-linux-musl/template
@@ -1,15 +1,16 @@
 # Template file for 'cross-powerpc64le-linux-musl'
 _binutils_version=2.32
-_gcc_version=9.1.0
+_gcc_version=9.2.0
 _musl_version=1.1.23
 _linux_version=4.19
+_libucontext_version=0.9.0
 
 _triplet="powerpc64le-linux-musl"
 _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
-version=0.31
-revision=3
+version=0.32
+revision=1
 short_desc="Cross toolchain for powerpc64le with musl"
 maintainer="q66 <daniel@octaforge.org>"
 homepage="https://www.voidlinux.org/"
@@ -18,18 +19,20 @@ distfiles="
  ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
  ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz
  http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz
- ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
+ ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz
+ https://distfiles.adelielinux.org/source/libucontext/libucontext-${_libucontext_version}.tar.xz"
 checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0
+ ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
  8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa
- 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
+ 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1
+ 0d53a415a307ef175153bbe60a572c940a922cb736ce13530b666e7ec2795d68"
 
 lib32disabled=yes
 nocross=yes
 nopie=yes
 nodebug=yes
 create_wrksrc=yes
-hostmakedepends="flex perl python3"
+hostmakedepends="gcc-objc gcc-go flex perl python3"
 makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel isl15-devel"
 nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a
  libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a"
@@ -81,13 +84,14 @@ _gcc_bootstrap() {
 
 	cd ${wrksrc}/gcc-${_gcc_version}
 	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
-	_apply_patch -p0 ${FILESDIR}/non-nullness.patch
 	_apply_patch -p0 ${FILESDIR}/0010-ldbl128-config.patch
 	_apply_patch -p0 ${FILESDIR}/ppc64-pure64.patch
 	_apply_patch -p0 ${FILESDIR}/libgcc-musl-ldbl128-config.patch
 	_apply_patch -p0 ${FILESDIR}/musl-ada.patch
+	_apply_patch -p0 ${FILESDIR}/darn.patch
 	_apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch
 	_apply_patch -p0 ${FILESDIR}/invalid_tls_model.patch
+	_apply_patch -p0 ${FILESDIR}/gccgo-musl.patch
 
 	sed -i 's/lib64/lib/' gcc/config/rs6000/linux64.h
 
@@ -161,6 +165,22 @@ _musl_build() {
 	touch ${wrksrc}/.musl_build_done
 }
 
+_libucontext_build() {
+	[ -f ${wrksrc}/.libucontext_build_done ] && return 0
+
+	cd ${wrksrc}/libucontext-${_libucontext_version}
+	msg_normal "Building cross libucontext\n"
+
+	# it's ok if we're static only here
+	CC="${_triplet}-gcc" AR="${_triplet}-ar" AS="${_triplet}-as" \
+		CFLAGS="-Os -pipe ${_archflags}" \
+		make ARCH=ppc64 libucontext.a
+
+	cp libucontext.a ${_sysroot}/usr/lib
+
+	touch ${wrksrc}/.libucontext_build_done
+}
+
 _gcc_build() {
 	local _args
 	[ -f ${wrksrc}/.gcc_build_done ] && return 0
@@ -176,7 +196,7 @@ _gcc_build() {
 	_args+=" --target=${_triplet}"
 	_args+=" --with-sysroot=${_sysroot}"
 	_args+=" --with-abi=elfv2"
-	_args+=" --enable-languages=c,ada,c++,fortran,lto"
+	_args+=" --enable-languages=c,ada,c++,objc,obj-c++,go,fortran,lto"
 	_args+=" --enable-decimal-float=no"
 	_args+=" --enable-secureplt"
 	_args+=" --enable-targets=powerpcle-linux"
@@ -219,6 +239,7 @@ do_build() {
 	_gcc_bootstrap
 	_linux_headers
 	_musl_build
+	_libucontext_build
 	_gcc_build
 }
 
@@ -270,6 +291,11 @@ do_install() {
 	ln -svf libgnat-${_majorver}.so libgnat.so
 	rm -vf ${DESTDIR}/${_adalib}/libgna{rl,t}.so
 
+	# We need to build libatomic in target gcc as gccgo needs it to
+	# build... but it's not needed at runtime, so remove it from the
+	# destdir so it doesn't conflict with the libatomic package
+	rm -f ${DESTDIR}/${_sysroot}/usr/lib/libatomic.*
+
 	# Remove unnecessary stuff
 	rm -f ${DESTDIR}/usr/lib*/libiberty.a
 	rm -rf ${DESTDIR}/usr/share
diff --git a/srcpkgs/cross-vpkg-dummy/template b/srcpkgs/cross-vpkg-dummy/template
index d763d7f14c4..60a5c4f63f1 100644
--- a/srcpkgs/cross-vpkg-dummy/template
+++ b/srcpkgs/cross-vpkg-dummy/template
@@ -1,7 +1,7 @@
 # Template file for 'cross-vpkg-dummy'
 pkgname=cross-vpkg-dummy
-version=0.31
-revision=2
+version=0.33
+revision=1
 build_style=meta
 short_desc="Dummy meta-pkg for cross building packages with xbps-src"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -16,26 +16,42 @@ provides="
 	libada-9999_1
 	libada-devel-9999_1
 	libgcc-9999_1
+	libgcc-devel-9999_1
 	libstdc++-9999_1
 	libstdc++-devel-9999_1
 	libgfortran-9999_1
 	libgfortran-devel-9999_1
+	libgo-9999_1
+	libgo-devel-9999_1
+	libobjc-9999_1
+	libobjc-devel-9999_1
 	gcc-9999_1
 	gcc-fortran-9999_1
-	gcc-ada-9999_1"
+	gcc-ada-9999_1
+	gcc-go-9999_1
+	gcc-objc-9999_1
+	gcc-objc++-9999_1"
 conflicts="
 	kernel-libc-headers>=0
 	binutils>=0
 	libada>=0
 	libada-devel>=0
 	libgcc>=0
+	libgcc-devel>=0
 	libstdc++>=0
 	libstdc++-devel>=0
 	libgfortran>=0
 	libgfortran-devel>=0
+	libgo>=0
+	libgo-devel>=0
+	libobjc>=0
+	libobjc-devel>=0
 	gcc>=0
 	gcc-fortran>=0
-	gcc-ada>=0"
+	gcc-ada>=0
+	gcc-go>=0
+	gcc-objc>=0
+	gcc-objc++>=0"
 shlib_provides="
 	libgcc_s.so.1
 	libgnat-9.so
diff --git a/srcpkgs/cross-x86_64-linux-musl/files/gccgo-musl.patch b/srcpkgs/cross-x86_64-linux-musl/files/gccgo-musl.patch
new file mode 120000
index 00000000000..a093af85773
--- /dev/null
+++ b/srcpkgs/cross-x86_64-linux-musl/files/gccgo-musl.patch
@@ -0,0 +1 @@
+../../gcc/files/gccgo-musl.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-x86_64-linux-musl/files/non-nullness.patch b/srcpkgs/cross-x86_64-linux-musl/files/non-nullness.patch
deleted file mode 120000
index c8b653748fe..00000000000
--- a/srcpkgs/cross-x86_64-linux-musl/files/non-nullness.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/non-nullness.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-x86_64-linux-musl/template b/srcpkgs/cross-x86_64-linux-musl/template
index 2f6a2a4241d..349eacf973c 100644
--- a/srcpkgs/cross-x86_64-linux-musl/template
+++ b/srcpkgs/cross-x86_64-linux-musl/template
@@ -1,16 +1,17 @@
 # Template file for 'cross-x86_64-linux-musl'
 #
 _binutils_version=2.32
-_gcc_version=9.1.0
+_gcc_version=9.2.0
 _musl_version=1.1.23
 _linux_version=4.19
+_libucontext_version=0.9.0
 
 _triplet=x86_64-linux-musl
 _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
-version=0.31
-revision=3
+version=0.32
+revision=1
 archs="i686* x86_64 ppc64le"
 short_desc="Cross toolchain for x86_64 with musl"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -20,18 +21,20 @@ distfiles="
  ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
  ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz
  http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz
- ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
+ ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz
+ https://distfiles.adelielinux.org/source/libucontext/libucontext-${_libucontext_version}.tar.xz"
 checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0
+ ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
  8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa
- 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
+ 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1
+ 0d53a415a307ef175153bbe60a572c940a922cb736ce13530b666e7ec2795d68"
 
 lib32disabled=yes
 nocross=yes
 nopie=yes
 nodebug=yes
 create_wrksrc=yes
-hostmakedepends="flex perl python3"
+hostmakedepends="gcc-objc gcc-go flex perl python3"
 makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel isl15-devel"
 nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a
  libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a"
@@ -83,10 +86,10 @@ _gcc_bootstrap() {
 
 	cd ${wrksrc}/gcc-${_gcc_version}
 	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
-	_apply_patch -p0 ${FILESDIR}/non-nullness.patch
 	_apply_patch -p0 ${FILESDIR}/musl-ada.patch
 	_apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch
 	_apply_patch -p0 ${FILESDIR}/invalid_tls_model.patch
+	_apply_patch -p0 ${FILESDIR}/gccgo-musl.patch
 
 	sed -i '/m64=/s/lib64/lib/' gcc/config/i386/t-linux64
 	sed -i 's/lib64/lib/' gcc/config/i386/linux64.h
@@ -158,6 +161,22 @@ _musl_build() {
 	touch ${wrksrc}/.musl_build_done
 }
 
+_libucontext_build() {
+	[ -f ${wrksrc}/.libucontext_build_done ] && return 0
+
+	cd ${wrksrc}/libucontext-${_libucontext_version}
+	msg_normal "Building cross libucontext\n"
+
+	# it's ok if we're static only here
+	CC="${_triplet}-gcc" AR="${_triplet}-ar" AS="${_triplet}-as" \
+		CFLAGS="-Os -pipe ${_archflags}" \
+		make ARCH=x86_64 libucontext.a
+
+	cp libucontext.a ${_sysroot}/usr/lib
+
+	touch ${wrksrc}/.libucontext_build_done
+}
+
 _gcc_build() {
 	local _args
 	[ -f ${wrksrc}/.gcc_build_done ] && return 0
@@ -171,7 +190,7 @@ _gcc_build() {
 	_args="--prefix=/usr"
 	_args+=" --target=${_triplet}"
 	_args+=" --with-sysroot=${_sysroot}"
-	_args+=" --enable-languages=c,ada,c++,fortran,lto"
+	_args+=" --enable-languages=c,ada,c++,objc,obj-c++,go,fortran,lto"
 	_args+=" --enable-libada"
 	_args+=" --enable-lto"
 	_args+=" --enable-default-pie"
@@ -213,6 +232,7 @@ do_build() {
 	_gcc_bootstrap
 	_linux_headers
 	_musl_build
+	_libucontext_build
 	_gcc_build
 }
 
@@ -264,6 +284,11 @@ do_install() {
 	ln -svf libgnat-${_majorver}.so libgnat.so
 	rm -vf ${DESTDIR}/${_adalib}/libgna{rl,t}.so
 
+	# We need to build libatomic in target gcc as gccgo needs it to
+	# build... but it's not needed at runtime, so remove it from the
+	# destdir so it doesn't conflict with the libatomic package
+	rm -f ${DESTDIR}/${_sysroot}/usr/lib/libatomic.*
+
 	# Remove unnecessary stuff
 	rm -f ${DESTDIR}/usr/lib*/libiberty.a
 	rm -rf ${DESTDIR}/usr/share
diff --git a/srcpkgs/cross-x86_64-w64-mingw32/template b/srcpkgs/cross-x86_64-w64-mingw32/template
index 2e5bc454ba8..ccc30402e15 100644
--- a/srcpkgs/cross-x86_64-w64-mingw32/template
+++ b/srcpkgs/cross-x86_64-w64-mingw32/template
@@ -1,5 +1,5 @@
 # Template file for 'cross-x86_64-w64-mingw32'
-_gcc_version=9.1.0
+_gcc_version=9.2.0
 _binutils_version=2.32
 _gmp_version=6.1.2
 _mpfr_version=4.0.1
@@ -9,7 +9,7 @@ _mingw_version=6.0.0
 
 pkgname=cross-x86_64-w64-mingw32
 version=$_mingw_version
-revision=2
+revision=3
 archs="x86_64* i686*"
 create_wrksrc=yes
 hostmakedepends="flex perl python3"
@@ -31,7 +31,7 @@ distfiles="
  http://isl.gforge.inria.fr/isl-${_isl_version}.tar.bz2
  ${SOURCEFORGE_SITE}/project/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${_mingw_version}.tar.bz2"
 checksum="de38b15c902eb2725eac6af21183a5f34ea4634cb0bcef19612b50e5ed31072d
- 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0
+ ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
  6985c538143c1208dcb1ac42cedad6ff52e267b47e5f970183a3e75125b43c2e
  87b565e89a9a684fe4ebeeddb8399dce2599f9c9049854ca8c0dfbdea0e21912
  67874a60826303ee2fb6affc6dc0ddd3e749e9bfcb4c8655e3953d0458a6e16e
diff --git a/srcpkgs/crypto++/patches/arm-native.patch b/srcpkgs/crypto++/patches/arm-native.patch
deleted file mode 100644
index ff7678735d3..00000000000
--- a/srcpkgs/crypto++/patches/arm-native.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- GNUmakefile.orig
-+++ GNUmakefile
-@@ -125,23 +125,6 @@
-  endif
- endif
- 
--# Guard use of -march=native
--ifeq ($(GCC42_OR_LATER)$(IS_NETBSD),10)
--   CXXFLAGS += -march=native
--else ifneq ($(CLANG_COMPILER)$(INTEL_COMPILER),00)
--   CXXFLAGS += -march=native
--else
--  # GCC 3.3 and "unknown option -march="
--  # Ubuntu GCC 4.1 compiler crash with -march=native
--  # NetBSD GCC 4.8 compiler and "bad value (native) for -march= switch"
--  # Sun compiler is handled below
--  ifeq ($(SUN_COMPILER)$(IS_X64),01)
--    CXXFLAGS += -m64
--  else ifeq ($(SUN_COMPILER)$(IS_X86),01)
--    CXXFLAGS += -m32
--  endif # X86/X32/X64
--endif
--
- # Aligned access required for -O3 and above due to vectorization
- UNALIGNED_ACCESS := $(shell $(EGREP) -c "^[[:space:]]*//[[:space:]]*\#[[:space:]]*define[[:space:]]*CRYPTOPP_NO_UNALIGNED_DATA_ACCESS" config.h)
- ifneq ($(UNALIGNED_ACCESS),0)
diff --git a/srcpkgs/crypto++/patches/musl-soname-links.patch b/srcpkgs/crypto++/patches/musl-soname-links.patch
deleted file mode 100644
index 34f3b4fbfe6..00000000000
--- a/srcpkgs/crypto++/patches/musl-soname-links.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- GNUmakefile.orig	2017-09-22 10:27:03.000000000 +0000
-+++ GNUmakefile	2017-09-22 10:34:42.897537258 +0000
-@@ -581,6 +581,7 @@
- 	-$(CHMOD) 0755 $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_VERSION_SUFFIX)
- ifeq ($(HAS_SOLIB_VERSION),1)
- 	-$(LN) -sf libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so
-+	-$(LN) -sf libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_COMPAT_SUFFIX)
- 	$(LDCONF) $(DESTDIR)$(LIBDIR)
- endif
- endif
diff --git a/srcpkgs/crypto++/template b/srcpkgs/crypto++/template
index bce3e38a963..9fc17a0d4fd 100644
--- a/srcpkgs/crypto++/template
+++ b/srcpkgs/crypto++/template
@@ -1,20 +1,24 @@
-# Template build file for 'crypto++'.
+# Template file for 'crypto++'
 pkgname=crypto++
-version=565
-revision=3
+version=820
+revision=1
 create_wrksrc=yes
 build_style=gnu-makefile
 make_build_target="libcryptopp.so libcryptopp.a"
 hostmakedepends="unzip"
-short_desc="A free C++ class library of cryptographic schemes"
+short_desc="Free C++ class library of cryptographic schemes"
 maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSL-1.0"
 homepage="http://www.cryptopp.com/"
-license="Boost Software License 1.0, Public domain"
 distfiles="http://www.cryptopp.com/cryptopp${version}.zip"
-checksum=a75ef486fe3128008bbb201efee3dcdcffbe791120952910883b26337ec32c34
+checksum=03f0e2242e11b9d19b28d0ec5a3fa8ed5cc7b27640e6bed365744f593e858058
 
 CXXFLAGS="-DNDEBUG -fPIC"
 
+if [ "$XBPS_CROSS" ]; then
+	make_build_args="-f GNUmakefile-cross"
+fi
+
 post_extract() {
 	sed -i -e 's/^CXXFLAGS/#CXXFLAGS/' GNUmakefile
 }
diff --git a/srcpkgs/cryptsetup/template b/srcpkgs/cryptsetup/template
index 725b5838e13..c2629720de0 100644
--- a/srcpkgs/cryptsetup/template
+++ b/srcpkgs/cryptsetup/template
@@ -1,7 +1,7 @@
 # Template file for 'cryptsetup'
 pkgname=cryptsetup
-version=2.1.0
-revision=2
+version=2.2.1
+revision=1
 build_style=gnu-configure
 configure_args="--with-crypto_backend=openssl $(vopt_enable pwquality)
  --enable-cryptsetup-reencrypt --enable-libargon2"
@@ -9,12 +9,12 @@ hostmakedepends="pkg-config"
 makedepends="device-mapper-devel json-c-devel libressl-devel popt-devel
  libargon2-devel $(vopt_if pwquality 'libpwquality-devel')"
 short_desc="Setup virtual encryption devices under Linux dm-crypt"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Daniel Eyßer <daniel.eysser@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://gitlab.com/cryptsetup/cryptsetup"
 changelog="https://gitlab.com/cryptsetup/cryptsetup/raw/master/docs/v${version}-ReleaseNotes"
 distfiles="${KERNEL_SITE}/utils/cryptsetup/v${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a3eeb2741f8f3376d16585191f3c60e067dd987e096c3c4b073fab7748b1c897
+checksum=94e79a31ed38bdb0acd9af7ccca1605a2ac62ca850ed640202876b1ee11c1c61
 subpackages="libcryptsetup cryptsetup-devel"
 
 build_options="pwquality"
@@ -22,9 +22,9 @@ desc_option_pwquality="Enable support for checking password quality via libpwqua
 
 case $XBPS_TARGET_MACHINE in
 	*-musl)
-	configure_args+=" --enable-static-cryptsetup"
-	subpackages+=" cryptsetup-static"
-	;;
+		configure_args+=" --enable-static-cryptsetup"
+		subpackages+=" cryptsetup-static"
+		;;
 esac
 
 cryptsetup-static_package() {
diff --git a/srcpkgs/crystal/template b/srcpkgs/crystal/template
index c0a23e87e63..2bb0db5dc81 100644
--- a/srcpkgs/crystal/template
+++ b/srcpkgs/crystal/template
@@ -1,10 +1,10 @@
 # Template file for 'crystal'
 pkgname=crystal
-version=0.30.0
+version=0.31.1
 revision=1
 archs="x86_64* i686* aarch64* arm*"
 _shardsversion=0.9.0
-_bootstrapversion=0.30.0
+_bootstrapversion=0.31.1
 _bootstraprevision=1
 hostmakedepends="git llvm8"
 makedepends="gc-devel libatomic_ops pcre-devel libevent-devel libyaml-devel
@@ -19,7 +19,7 @@ homepage="https://crystal-lang.org/"
 distfiles="
  https://github.com/crystal-lang/crystal/archive/${version}.tar.gz
  https://github.com/crystal-lang/shards/archive/v${_shardsversion}.tar.gz"
-checksum="fc884970089e382344540676a9c5aa4f369c9a0f45d1858e079b4ce26878164a
+checksum="b4a51164763b891572492e2445d3a69b462675184ea0ccf06fcc57a070f07b80
  90f230c87cc7b94ca845e6fe34f2523edcadb562d715daaf98603edfa2a94d65"
 nocross="FIXME: someone needs to sort out the llvm --cxxflags for cross building"
 _crystalflags="--release --no-debug --progress"
@@ -32,11 +32,11 @@ if [ "$build_option_binary_bootstrap" ]; then
 	case "$XBPS_MACHINE" in
 	x86_64)
 		distfiles+=" https://github.com/crystal-lang/crystal/releases/download/${_bootstrapversion}/crystal-${_bootstrapversion}-${_bootstraprevision}-linux-x86_64.tar.gz"
-		checksum+=" 1995420a5d9146fd21322c96fe8bf87ddf73d5e0273b3c24c3c71d0e6f54cba2"
+		checksum+=" 308a5891322287852ba492e6e0dcc1484af361c189525349b6b98b531c551a65"
 		;;
 	i686)
 		distfiles+=" https://github.com/crystal-lang/crystal/releases/download/${_bootstrapversion}/crystal-${_bootstrapversion}-${_bootstraprevision}-linux-i686.tar.gz"
-		checksum+=" 81282e2fdaba77a31aeb682deac7cde545a72dfd0ad5b6554002b8fd861e9d3e"
+		checksum+=" 394bfe422bd2e74b6c5a99d31dcd873ec3f25c3f06834e1dd779efa2a36d3143"
 		;;
 	*)
 		broken="cannot be built on $XBPS_MACHINE"
diff --git a/srcpkgs/cups-filters/template b/srcpkgs/cups-filters/template
index 8c232894061..df7daba3a5e 100644
--- a/srcpkgs/cups-filters/template
+++ b/srcpkgs/cups-filters/template
@@ -1,7 +1,7 @@
 # Template file for 'cups-filters'
 pkgname=cups-filters
-version=1.25.2
-revision=1
+version=1.25.10
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static --with-rcdir=no --enable-avahi
  --with-browseremoteprotocols=DNSSD,CUPS
@@ -18,7 +18,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, MIT"
 homepage="https://wiki.linuxfoundation.org/openprinting/cups-filters"
 distfiles="http://openprinting.org/download/cups-filters/${pkgname}-${version}.tar.xz"
-checksum=c1f172afdc060d105a80ef8e8123fd2c0d9f2fabf8c7c38f5abdace576d82e0e
+checksum=4338dc314558f796ab5169a99440cc4fc4d65df33878dddc1525f7fe5683a45b
 
 lib32disabled=yes
 
diff --git a/srcpkgs/cups/patches/cups-no-gzip-man.patch b/srcpkgs/cups/patches/cups-no-gzip-man.patch
deleted file mode 100644
index b96df8963a0..00000000000
--- a/srcpkgs/cups/patches/cups-no-gzip-man.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- config-scripts/cups-manpages.m4.orig	2016-09-17 23:43:25.901857459 +0200
-+++ config-scripts/cups-manpages.m4	2016-09-17 23:43:53.797006791 +0200
-@@ -53,10 +53,10 @@ case "$uname" in
- 		;;
- 	Linux* | GNU* | Darwin*)
- 		# Linux, GNU Hurd, and macOS
--		MAN1EXT=1.gz
--		MAN5EXT=5.gz
--		MAN7EXT=7.gz
--		MAN8EXT=8.gz
-+		MAN1EXT=1
-+		MAN5EXT=5
-+		MAN7EXT=7
-+		MAN8EXT=8
- 		MAN8DIR=8
- 		;;
- 	*)
diff --git a/srcpkgs/cups/template b/srcpkgs/cups/template
index 0f3bbb1e894..d8f045937a2 100644
--- a/srcpkgs/cups/template
+++ b/srcpkgs/cups/template
@@ -1,6 +1,6 @@
 # Template file for 'cups'
 pkgname=cups
-version=2.2.12
+version=2.3.0
 revision=1
 hostmakedepends="automake avahi-libs-devel gnutls-devel pkg-config
  poppler-utils"
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://www.cups.org/"
 distfiles="https://github.com/apple/cups/releases/download/v${version}/cups-${version}-source.tar.gz"
-checksum=0f61ab449e4748a24c6ab355b481ff7691247a140d327b2b7526fce34b7f9aa8
+checksum=acaf0229cf008ea8f06353ffd1bbd62d71dbe88990dd3330650ef87edb95a1a5
 
 conf_files="/etc/pam.d/cups /etc/cups/*.conf /etc/xinetd.d/cups-lpd"
 make_dirs="
diff --git a/srcpkgs/cura-engine/patches/0001-Remove-default-none-so-that-it-compiles-in-gcc9.patch b/srcpkgs/cura-engine/patches/0001-Remove-default-none-so-that-it-compiles-in-gcc9.patch
deleted file mode 100644
index ce7d6a2a41b..00000000000
--- a/srcpkgs/cura-engine/patches/0001-Remove-default-none-so-that-it-compiles-in-gcc9.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 45cab061494467165ba515055a828cdd39567c0e Mon Sep 17 00:00:00 2001
-From: Jasper Chan <jasperchan515@gmail.com>
-Date: Mon, 5 Aug 2019 23:37:35 -0700
-Subject: [PATCH] Remove default(none) so that it compiles in gcc9
-
----
- src/layerPart.cpp | 2 +-
- src/support.cpp   | 6 +++---
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git src/layerPart.cpp src/layerPart.cpp
-index ba3e7157..d36a31f6 100644
---- src/layerPart.cpp
-+++ src/layerPart.cpp
-@@ -52,7 +52,7 @@ void createLayerParts(SliceMeshStorage& mesh, Slicer* slicer)
- {
-     const auto total_layers = slicer->layers.size();
-     assert(mesh.layers.size() == total_layers);
--#pragma omp parallel for default(none) shared(mesh, slicer) schedule(dynamic)
-+#pragma omp parallel for shared(mesh, slicer) schedule(dynamic)
-     // Use a signed type for the loop counter so MSVC compiles (because it uses OpenMP 2.0, an old version).
-     for (int layer_nr = 0; layer_nr < static_cast<int>(total_layers); layer_nr++)
-     {
-diff --git src/support.cpp src/support.cpp
-index 9bd531a6..0a43de2f 100644
---- src/support.cpp
-+++ src/support.cpp
-@@ -816,7 +816,7 @@ void AreaSupport::generateOverhangAreasForMesh(SliceDataStorage& storage, SliceM
-     }
- 
-     //Generate the actual areas and store them in the mesh.
--    #pragma omp parallel for default(none) shared(storage, mesh) schedule(dynamic)
-+    #pragma omp parallel for shared(storage, mesh) schedule(dynamic)
-     // Use a signed type for the loop counter so MSVC compiles (because it uses OpenMP 2.0, an old version).
-     for (int layer_idx = 1; layer_idx < static_cast<int>(storage.print_layer_count); layer_idx++)
-     {
-@@ -875,7 +875,7 @@ void AreaSupport::generateSupportAreasForMesh(SliceDataStorage& storage, const S
-     constexpr bool no_prime_tower = false;
-     xy_disallowed_per_layer[0] = storage.getLayerOutlines(0, no_support, no_prime_tower).offset(xy_distance);
-     // for all other layers (of non support meshes) compute the overhang area and possibly use that when calculating the support disallowed area
--    #pragma omp parallel for default(none) shared(xy_disallowed_per_layer, storage, mesh) schedule(dynamic)
-+    #pragma omp parallel for shared(xy_disallowed_per_layer, storage, mesh) schedule(dynamic)
-     // Use a signed type for the loop counter so MSVC compiles (because it uses OpenMP 2.0, an old version).
-     for (int layer_idx = 1; layer_idx < static_cast<int>(layer_count); layer_idx++)
-     {
-@@ -1070,7 +1070,7 @@ void AreaSupport::generateSupportAreasForMesh(SliceDataStorage& storage, const S
-         const int max_checking_layer_idx = std::max(0,
-                                                     std::min(static_cast<int>(storage.support.supportLayers.size()),
-                                                              static_cast<int>(layer_count - (layer_z_distance_top - 1))));
--#pragma omp parallel for default(none) shared(support_areas, storage) schedule(dynamic)
-+#pragma omp parallel for shared(support_areas, storage) schedule(dynamic)
-         // Use a signed type for the loop counter so MSVC compiles (because it uses OpenMP 2.0, an old version).
-         for (int layer_idx = 0; layer_idx < max_checking_layer_idx; layer_idx++)
-         {
--- 
-2.22.0
-
diff --git a/srcpkgs/cura-engine/template b/srcpkgs/cura-engine/template
index 63b00cda8e7..04184076df0 100644
--- a/srcpkgs/cura-engine/template
+++ b/srcpkgs/cura-engine/template
@@ -1,6 +1,6 @@
 # Template file for 'cura-engine'
 pkgname=cura-engine
-version=4.2.0
+version=4.3.0
 revision=1
 wrksrc="CuraEngine-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="AGPL-3.0-or-later"
 homepage="https://github.com/Ultimaker/CuraEngine"
 distfiles="https://github.com/Ultimaker/CuraEngine/archive/${version}.tar.gz"
-checksum=9e66c2840c46ad5ba91da872d73cc8d8d03bf163fe8ce9a81ec5188a6d7b4593
+checksum=4922a21ae90f95daae918baf21b51d94e36b8aac8e160b73c8088b993dd78ccb
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/cura-fdm-materials/template b/srcpkgs/cura-fdm-materials/template
index 79542c83947..153ec525b1f 100644
--- a/srcpkgs/cura-fdm-materials/template
+++ b/srcpkgs/cura-fdm-materials/template
@@ -1,6 +1,7 @@
 # Template file for 'cura-fdm-materials'
 pkgname=cura-fdm-materials
-version=4.2.0
+reverts="2019.08.21_1"
+version=4.3.0
 revision=1
 archs=noarch
 wrksrc="fdm_materials-${version}"
@@ -10,7 +11,7 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="CC0-1.0"
 homepage="https://github.com/Ultimaker/fdm_materials"
 distfiles="https://github.com/Ultimaker/fdm_materials/archive/${version}.tar.gz"
-checksum=96b2946ced9dec98fa73d82644dcaf6ce5801d9d9edc23d3f42b73a76fda0ef3
+checksum=b31b997cae18a85f8c913b4d1f0fe0a5a009f94689d4cc26682f6614d0dc3f09
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/cura/template b/srcpkgs/cura/template
index f4ff4f24b0f..31318e5aecf 100644
--- a/srcpkgs/cura/template
+++ b/srcpkgs/cura/template
@@ -1,6 +1,6 @@
 # Template file for 'cura'
 pkgname=cura
-version=4.2.1
+version=4.3.0
 revision=1
 archs=noarch
 wrksrc="Cura-${version}"
@@ -17,4 +17,4 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/Ultimaker/Cura"
 distfiles="https://github.com/Ultimaker/Cura/archive/${version}.tar.gz"
-checksum=e3b54947a8722dbbdef4510beb724d43952f6dbd1e7c32b52e1a3c9358be3fa1
+checksum=a27f5671250452d685069d8fe8018438ec32c096cd5b2c0d54ada7022ded1ccf
diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index a3bc8dcf862..7dc0542bc5d 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -1,10 +1,10 @@
 # Template file for 'curl'
 pkgname=curl
-version=7.65.3
+version=7.66.0
 revision=1
 build_style=gnu-configure
 configure_args="ac_cv_sizeof_off_t=8 --enable-threaded-resolver --enable-ipv6
- $(vopt_with rtmp) $(vopt_with gssapi) $(vopt_enable ldap) $(vopt_with gnuts)
+ $(vopt_with rtmp) $(vopt_with gssapi) $(vopt_enable ldap) $(vopt_with gnutls)
  $(vopt_enable ldap ldaps) $(vopt_with ssh libssh2) $(vopt_with ssl)
  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt --without-libidn2"
 hostmakedepends="groff perl pkg-config"
@@ -13,14 +13,14 @@ makedepends="nghttp2-devel zlib-devel $(vopt_if gnutls 'gnutls-devel')
  $(vopt_if rtmp 'librtmp-devel') $(vopt_if ssh 'libssh2-devel')
  $(vopt_if ssl 'libressl-devel')"
 depends="ca-certificates"
-checkdepends="python"
+checkdepends="python3"
 short_desc="Client that groks URLs"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://curl.haxx.se"
 changelog="https://curl.haxx.se/changes.html#${version//./_}"
 distfiles="${homepage}/download/${pkgname}-${version}.tar.bz2"
-checksum=0a855e83be482d7bc9ea00e05bdb1551a44966076762f9650959179c89fce509
+checksum=6618234e0235c420a21f4cb4c2dd0badde76e6139668739085a70c4e2fe7a141
 build_options="gnutls gssapi ldap rtmp ssh ssl"
 build_options_default="ssh ssl"
 vopt_conflict ssl gnutls
@@ -40,7 +40,7 @@ libcurl_package() {
 	shlib_provides="libcurl-gnutls.so.4"
 	pkg_install() {
 		vmove "usr/lib/*.so.*"
-		ln -sf libcurl.so.4.5.0 ${PKGDESTDIR}/usr/lib/libcurl-gnutls.so.4
+		ln -sf libcurl.so.4.6.0 ${PKGDESTDIR}/usr/lib/libcurl-gnutls.so.4
 	}
 }
 
diff --git a/srcpkgs/cutter/template b/srcpkgs/cutter/template
index 917510733ed..aa4c57ef4ad 100644
--- a/srcpkgs/cutter/template
+++ b/srcpkgs/cutter/template
@@ -1,7 +1,7 @@
 # Template file for 'cutter'
 pkgname=cutter
-version=1.8.3
-revision=2
+version=1.9.0
+revision=3
 build_wrksrc=src
 build_style=qmake
 hostmakedepends="pkg-config qt5-declarative-devel qt5-location-devel
@@ -13,4 +13,4 @@ maintainer="johannes <johannes.brechtmann@gmail.com>"
 license="GPL-3.0-only"
 homepage="https://github.com/radareorg/cutter"
 distfiles="https://github.com/radareorg/${pkgname}/archive/v${version}.tar.gz"
-checksum=71014ec5a00f1255978c8298a3e1a84fa968ac327188333b5ea684b515e61fda
+checksum=798aa696970030dfef2a1ecf2a058982089ac58db9b2ce008de5757b7fc20d84
diff --git a/srcpkgs/datamash/template b/srcpkgs/datamash/template
index 90a4512b2e5..cecbef14f95 100644
--- a/srcpkgs/datamash/template
+++ b/srcpkgs/datamash/template
@@ -1,6 +1,6 @@
 # Template file for 'datamash'
 pkgname=datamash
-version=1.4
+version=1.5
 revision=1
 build_style=gnu-configure
 short_desc="Command-line program that performs simple calculations on input files"
@@ -8,4 +8,4 @@ maintainer="oliver JH <ohemming@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/datamash/"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=fa44dd2d5456bcb94ef49dfc6cfe62c83fd53ac435119a85d34e6812f6e6472a
+checksum=226249d5fe54024f96404798778f45963a3041714229d4225cd5d9acdaba21ad
diff --git a/srcpkgs/dav1d/template b/srcpkgs/dav1d/template
index 5288ecb9415..ba6673de755 100644
--- a/srcpkgs/dav1d/template
+++ b/srcpkgs/dav1d/template
@@ -7,7 +7,7 @@ configure_args="-Dbuild_tests=false -Dbuild_asm=true -Dbuild_tools=true
  -Dfuzzing_engine=none -Dtestdata_tests=false"
 hostmakedepends="nasm"
 short_desc="Small and fast AV1 Decoder"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://code.videolan.org/videolan/dav1d"
 distfiles="https://code.videolan.org/videolan/dav1d/-/archive//${version}/dav1d-${version}.tar.bz2"
diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index bbf30e1ccdf..3280e83a5f2 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,6 +1,6 @@
 # Template file for 'dbeaver'
 pkgname=dbeaver
-version=6.1.3
+version=6.2.1
 revision=1
 archs="x86_64"
 hostmakedepends="apache-maven-bin"
@@ -9,7 +9,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="Apache-2.0"
 homepage="https://dbeaver.io"
 distfiles="https://github.com/dbeaver/dbeaver/archive/${version}.tar.gz"
-checksum=b7e0c74a912b60b26f7ab74a0917435c61198393207abc3a4ca08f7b7428a16d
+checksum=1a049c3a5aea98d371a1833bca19b08dd34a8a857513787a3843885e7c9fc2c2
 nopie=true
 
 do_build() {
diff --git a/srcpkgs/dconf-editor/template b/srcpkgs/dconf-editor/template
index cbd5ccc5d67..3617e12dacf 100644
--- a/srcpkgs/dconf-editor/template
+++ b/srcpkgs/dconf-editor/template
@@ -1,6 +1,6 @@
 # Template file for 'dconf-editor'
 pkgname=dconf-editor
-version=3.32.0
+version=3.34.1
 revision=1
 build_style=meson
 hostmakedepends="docbook-xsl glib-devel libxslt pkg-config vala"
@@ -10,4 +10,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Projects/dconf"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f19d1332ac27e23ef3dc2ed07ba4e4646d9d7f05e2e78748aa525a1320adbaba
+checksum=32ad3e899840e0b17d36a1c4dab60bfb1eedfcf4e46f3ae428076132f37ff335
diff --git a/srcpkgs/ddcutil/template b/srcpkgs/ddcutil/template
index 060d65b9b24..9c0103ed481 100644
--- a/srcpkgs/ddcutil/template
+++ b/srcpkgs/ddcutil/template
@@ -1,6 +1,6 @@
 # Template file for 'ddcutil'
 pkgname=ddcutil
-version=0.9.5
+version=0.9.7
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
@@ -11,7 +11,7 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.ddcutil.com"
 distfiles="https://github.com/rockowitz/ddcutil/archive/v${version}.tar.gz"
-checksum=aab0284d27c9537f995e8b79904b42099050ec05557b81ee29ff2045909e0933
+checksum=56a520a68e00e519a3ea5562238b2a67c0b9c4133a9b61983fe82b24e7066222
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) makedepends+=" libexecinfo-devel"
diff --git a/srcpkgs/ddgr/template b/srcpkgs/ddgr/template
index ec714a808b2..79c49b1e2f2 100644
--- a/srcpkgs/ddgr/template
+++ b/srcpkgs/ddgr/template
@@ -1,13 +1,13 @@
 # Template file for 'ddgr'
 pkgname=ddgr
-version=1.6
+version=1.7
 revision=1
 archs=noarch
 build_style=gnu-makefile
 depends="python3-requests"
-maintainer="Orphaned <orphan@voidlinux.org>"
 short_desc="DuckDuckGo from the terminal"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/jarun/ddgr"
 distfiles="https://github.com/jarun/ddgr/archive/v${version}.tar.gz"
-checksum=eae7ff1ab44dfda168a8bbe46593e80ca4a26ab45a9efbab13e6f466349e0e5c
+checksum=1e3d01dc71337b2a59b96ab89ee422a7ef9e6ddcd42813ac08d57db194bc4fea
diff --git a/srcpkgs/debootstrap/template b/srcpkgs/debootstrap/template
index e4316aaa7ff..f3deb671ad9 100644
--- a/srcpkgs/debootstrap/template
+++ b/srcpkgs/debootstrap/template
@@ -1,6 +1,6 @@
 # Template file for 'debootstrap'
 pkgname=debootstrap
-version=1.0.115
+version=1.0.116
 revision=1
 build_style=fetch
 depends="binutils gnupg gzip tar wget xz"
@@ -9,13 +9,13 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="http://packages.qa.debian.org/d/debootstrap.html"
 distfiles="${DEBIAN_SITE}/main/d/${pkgname}/${pkgname}_${version}_all.deb
- ${DEBIAN_SITE}/main/d/debian-archive-keyring/debian-archive-keyring_2017.5_all.deb"
-checksum="d7955a6e88bec5f86a531429b1819d49c35b0d8cf49b9cf7bd901d86c6e41f89
- 6a38407c47fefad2d8459dc271d109f1841ee857f993ed3ce2884e33f7f0f734"
+ ${DEBIAN_SITE}/main/d/debian-archive-keyring/debian-archive-keyring_2019.1_all.deb"
+checksum="e5b060eb86c8955d91e7193d796b9928dd7d803bdd61f8df008f42a8fe2f8b69
+ 9cefd8917f3d97a999c136aa87f04a3024408b5bc1de470de7d6dfa5e4bd4361"
 
 do_install() {
 	ar p ${pkgname}_${version}_all.deb data.tar.gz | tar xvzf - -C ${DESTDIR}
-	ar p debian-archive-keyring_2017.5_all.deb data.tar.xz | tar xvJf - -C ${DESTDIR} ./usr/share/keyrings/debian-archive-keyring.gpg
+	ar p debian-archive-keyring_2019.1_all.deb data.tar.xz | tar xvJf - -C ${DESTDIR} ./usr/share/keyrings/debian-archive-keyring.gpg
 	mv ${DESTDIR}/usr/sbin ${DESTDIR}/usr/bin
 	sed -i 's|export PATH|export PATH="/usr/sbin:/sbin:/usr/bin:/bin"|' ${DESTDIR}/usr/bin/debootstrap
 	vlicense ${DESTDIR}/usr/share/doc/debootstrap/copyright LICENSE
diff --git a/srcpkgs/dejagnu/template b/srcpkgs/dejagnu/template
index e8025073628..5a2572644c1 100644
--- a/srcpkgs/dejagnu/template
+++ b/srcpkgs/dejagnu/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 makedepends="expect-devel"
 depends="expect"
 short_desc="Framework for running test suites on GNU tools"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/dejagnu/"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/delta/template b/srcpkgs/delta/template
new file mode 100644
index 00000000000..ca651c2dfc8
--- /dev/null
+++ b/srcpkgs/delta/template
@@ -0,0 +1,15 @@
+# Template file for 'delta'
+pkgname=delta
+version=0.0.13
+revision=1
+build_style=cargo
+short_desc="Syntax-highlighting pager for git"
+maintainer="Andrew Benson <abenson+void@gmail.com>"
+license="MIT"
+homepage="https://github.com/dandavison/delta"
+distfiles="${homepage}/archive/${version}.tar.gz"
+checksum=60e8d1dc7710d892c5e612c608baa29e357df4bd895efc4e01e453e2336a47d6
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/deluge/files/deluge-web/run b/srcpkgs/deluge/files/deluge-web/run
index 44c75c99053..b90477d7a45 100644
--- a/srcpkgs/deluge/files/deluge-web/run
+++ b/srcpkgs/deluge/files/deluge-web/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 sv check deluged >/dev/null || exit 1
-exec chpst -u deluge:deluge deluge-web 2>&1
+exec chpst -u deluge:deluge deluge-web -d 2>&1
diff --git a/srcpkgs/deluge/template b/srcpkgs/deluge/template
index dee8b8d96dd..6dc7f26184d 100644
--- a/srcpkgs/deluge/template
+++ b/srcpkgs/deluge/template
@@ -1,7 +1,7 @@
 # Template file for 'deluge'
 pkgname=deluge
 version=2.0.3
-revision=2
+revision=3
 archs=noarch
 build_style=python3-module
 pycompile_module="deluge"
diff --git a/srcpkgs/delve/template b/srcpkgs/delve/template
index fc5e2b03d12..089343cab3d 100644
--- a/srcpkgs/delve/template
+++ b/srcpkgs/delve/template
@@ -1,20 +1,30 @@
 # Template file for 'delve'
 pkgname=delve
-version=1.2.0
+version=1.3.0
 revision=1
+# Version bump to 1.3.0 has been done after the release tag, so using
+# specific commit for this version.
+_commit=dd3c2d63cc5b2aa84d7970eca0c91b45c71e9dd9
 build_style=go
-go_import_path=github.com/go-delve/delve/cmd/dlv
+go_import_path="github.com/go-delve/delve"
+go_package="${go_import_path}/cmd/dlv"
 short_desc="Debugger for the Go programming language"
 maintainer="Renato Aguiar <renato@renag.me>"
 license="MIT"
 homepage="https://github.com/go-delve/delve"
-distfiles="https://github.com/go-delve/delve/archive/v${version}.tar.gz"
-checksum=eebf6cd9647a2c3987fd38e8dd6e0e968ff41300cab20dc178a789a77b92627d
+distfiles="https://github.com/go-delve/delve/archive/${_commit}.tar.gz"
+checksum=1a3ac2e709dd5a373c0c4379f614b2e68c2e8fd848a725b9a97b8aaa25910319
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*|arm*|aarch64*|ppc*) broken=yes ;;
 esac
 
+post_extract() {
+	mv "${XBPS_BUILDDIR}/delve-${_commit}" "$wrksrc"
+}
+
 post_install() {
 	vlicense LICENSE
+	vmkdir "usr/share/doc/${pkgname}"
+	vcopy Documentation/* "usr/share/doc/${pkgname}"
 }
diff --git a/srcpkgs/deutex/template b/srcpkgs/deutex/template
index 7c232bbe83d..88846dd7f70 100644
--- a/srcpkgs/deutex/template
+++ b/srcpkgs/deutex/template
@@ -1,16 +1,16 @@
 # Template file for 'deutex'
 pkgname=deutex
-version=5.1.2
-revision=3
+version=5.2.1
+revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config asciidoc"
 makedepends="libpng-devel"
 short_desc="WAD composer for DOOM and others"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://github.com/Doom-Utils/deutex"
 distfiles="https://github.com/Doom-Utils/deutex/archive/v${version}.tar.gz"
-checksum=b91b1cd40098cc8f5e1e9a18ea4b5b785a4f54ff2ce5c6d9524f22ca84a83bd0
+checksum=5b4b2d5a0c85fcccb206a94685ecf5558a891ee6ce9e0cdbf96d4c4a129d5bcc
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/devedeng/template b/srcpkgs/devedeng/template
index 3a28ed5e49b..d971b2e207b 100644
--- a/srcpkgs/devedeng/template
+++ b/srcpkgs/devedeng/template
@@ -1,6 +1,6 @@
 # Template file for 'devedeng'
 pkgname=devedeng
-version=4.14.0
+version=4.16.0
 revision=1
 archs=noarch
 build_style=python3-module
@@ -9,8 +9,8 @@ hostmakedepends="python3"
 depends="cdrtools desktop-file-utils dvdauthor ffmpeg gtk+3
  hicolor-icon-theme python3-gobject python3-setuptools vcdimager"
 short_desc="Create video DVDs and CDs"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="http://www.rastersoft.com/programas/devede.html"
 distfiles="https://gitlab.com/rastersoft/devedeng/-/archive/${version}/${pkgname}-${version}.tar.bz2"
-checksum=9e443e66bcb515008584061ee52a8a8a7404343befeb747647725544adb8d973
+checksum=fe2715aa8f73133fc2d809d840fd662dcf9776fcedfb68169984af2e762b5164
diff --git a/srcpkgs/dhcpcd/template b/srcpkgs/dhcpcd/template
index b6214863908..35b108a355f 100644
--- a/srcpkgs/dhcpcd/template
+++ b/srcpkgs/dhcpcd/template
@@ -1,8 +1,9 @@
 # Template file for 'dhcpcd'
 pkgname=dhcpcd
-version=8.0.2
+version=8.0.6
 revision=1
 build_style=configure
+make_check_target=test
 configure_args="--prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc --rundir=/run"
 hostmakedepends="ntp pkg-config"
 makedepends="eudev-libudev-devel"
@@ -11,7 +12,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://roy.marples.name/projects/dhcpcd"
 distfiles="https://roy.marples.name/downloads/dhcpcd/dhcpcd-${version}.tar.xz"
-checksum=33a26ad561546cd2cfe1e6de6352a85df72b41c37def8c7eb00e90e57c627a5c
+checksum=66b50199ed83bf502af3fab9ac001b417f0fac7e69c92d97a9c41499cebabd4f
 lib32disabled=yes
 conf_files=/etc/dhcpcd.conf
 
diff --git a/srcpkgs/dialog/template b/srcpkgs/dialog/template
index 287735b3bf9..a257a5b4485 100644
--- a/srcpkgs/dialog/template
+++ b/srcpkgs/dialog/template
@@ -9,7 +9,7 @@ build_style=gnu-configure
 configure_args="--with-ncursesw --disable-nls"
 makedepends="ncurses-devel"
 short_desc="Tool to display dialog boxes from shell scripts"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only"
 homepage="https://invisible-island.net/dialog/"
 distfiles="https://invisible-mirror.net/archives/${pkgname}/${pkgname}-${_distver}-${_date}.tgz"
diff --git a/srcpkgs/diffr/template b/srcpkgs/diffr/template
new file mode 100644
index 00000000000..96d43f10ed0
--- /dev/null
+++ b/srcpkgs/diffr/template
@@ -0,0 +1,18 @@
+# Template file for 'diffr'
+pkgname=diffr
+version=0.1.2
+revision=1
+build_style=cargo
+short_desc="LCS based diff highlighting tool to ease code review from your terminal"
+maintainer="Andy Weidenbaum <archbaum@gmail.com>"
+license="MIT"
+homepage="https://github.com/mookid/diffr"
+changelog="https://github.com/mookid/diffr/raw/master/CHANGELOG.md"
+distfiles="https://github.com/mookid/diffr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
+checksum=76767fec7bcec1f86ed0c21c05ce4fee3ac41e00f2b88e91249102b02c0f7307
+
+do_install() {
+	vbin "target/${RUST_TARGET}/release/diffr"
+	vlicense LICENSE.txt
+	vdoc README.md
+}
diff --git a/srcpkgs/digikam/template b/srcpkgs/digikam/template
index 782d55424a2..b35d66bed0b 100644
--- a/srcpkgs/digikam/template
+++ b/srcpkgs/digikam/template
@@ -1,6 +1,6 @@
 # Template file for 'digikam'
 pkgname=digikam
-version=6.2.0
+version=6.3.0
 revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config bison flex"
@@ -18,4 +18,6 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.digikam.org"
 distfiles="${KDE_SITE}/digikam/${version}/digikam-${version}.tar.xz"
-checksum=28762ea0f03a82e3b2473c0682a358c9b83f5013aec827dd5ab6556a1f29baeb
+checksum=94dc05e3f9c08b83419010d1689c7b0398d4eced4fef42375249c974622874ba
+
+CXXFLAGS="-Wl,-lpthread"
diff --git a/srcpkgs/diskus/template b/srcpkgs/diskus/template
index b125ef984ec..c171cbacb56 100644
--- a/srcpkgs/diskus/template
+++ b/srcpkgs/diskus/template
@@ -1,14 +1,14 @@
 # Template file for 'diskus'
 pkgname=diskus
-version=0.5.0
+version=0.6.0
 revision=1
 build_style=cargo
-short_desc="A minimal, fast alternative to du -sh"
+short_desc="Minimal, fast alternative to du -sh"
 maintainer="travankor <travankor@tuta.io>"
 license="Apache-2.0, MIT"
 homepage="https://github.com/sharkdp/diskus"
 distfiles="https://github.com/sharkdp/diskus/archive/v${version}.tar.gz"
-checksum=90d785f3f24899a6adcc497846f29112812a887c8042d0657d6b258d5a5352bc
+checksum=661687edefa3218833677660a38ccd4e2a3c45c4a66055c5bfa4667358b97500
 
 post_install() {
 	vlicense LICENSE-MIT
diff --git a/srcpkgs/dispcalGUI/template b/srcpkgs/dispcalGUI/template
index d871b860cbe..42960daa3d8 100644
--- a/srcpkgs/dispcalGUI/template
+++ b/srcpkgs/dispcalGUI/template
@@ -1,6 +1,6 @@
 # Template file for 'dispcalGUI'
 pkgname=dispcalGUI
-version=3.8.5.0
+version=3.8.6.0
 revision=1
 _name="DisplayCAL"
 wrksrc="${_name}-${version}"
@@ -14,7 +14,7 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="GPL-3.0-or-later"
 homepage="https://displaycal.net/"
 distfiles="${SOURCEFORGE_SITE}/dispcalgui/${_name}-${version}.tar.gz"
-checksum=20b0db965f0e25f237000ba299b5ddf8035b05327dd1b2505792465d182bd440
+checksum=7be913f4a13f4461f5cdcea57395ba99ad4efaa6206e891ed1c69c78626305fb
 
 pre_configure() {
 	sed -i 's|MimeType=model/vrml;x-world/x-vrml;|MimeType=model/vrml;|' misc/displaycal-vrml-to-x3d-converter.desktop
diff --git a/srcpkgs/dive/template b/srcpkgs/dive/template
index b21319204e1..0307068e30c 100644
--- a/srcpkgs/dive/template
+++ b/srcpkgs/dive/template
@@ -1,6 +1,6 @@
 # Template file for 'dive'
 pkgname=dive
-version=0.7.2
+version=0.8.1
 revision=1
 build_style=go
 go_import_path="github.com/wagoodman/dive"
@@ -10,7 +10,7 @@ maintainer="Cameron Nemo <camerontnorman@gmail.com>"
 license="MIT"
 homepage="https://github.com/wagoodman/dive"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=2ec6d77b662e0d709f6fc4282dbd8f0d3f6509f78133451b6b17d9b8fb594cf1
+checksum=6663960b974a6aad1d1271fb04cdaa9c527adbffdb37b9ab62fa9ad323f0bcda
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/dkms/files/kernel.d/dkms.postinst b/srcpkgs/dkms/files/kernel.d/dkms.postinst
index 8c83c4723a0..314f2454bda 100644
--- a/srcpkgs/dkms/files/kernel.d/dkms.postinst
+++ b/srcpkgs/dkms/files/kernel.d/dkms.postinst
@@ -17,6 +17,8 @@ if [ ! -e /lib/modules/${VERSION}/build/include ] ; then
 	exit 0
 fi
 
+export IGNORE_CC_MISMATCH=1
+
 if [ ! -f /lib/modules/${VERSION}/build/scripts/basic/fixdep ] ; then
 	make -C /lib/modules/${VERSION}/build scripts
 fi
diff --git a/srcpkgs/dkms/template b/srcpkgs/dkms/template
index d7aa2ef86db..73749260055 100644
--- a/srcpkgs/dkms/template
+++ b/srcpkgs/dkms/template
@@ -1,7 +1,7 @@
 # Template file for 'dkms'
 pkgname=dkms
 version=2.7.1
-revision=1
+revision=2
 conf_files="/etc/dkms/framework.conf"
 depends="bash kmod gcc make coreutils linux-headers"
 short_desc="Dynamic Kernel Modules System"
diff --git a/srcpkgs/dma/patches/musl_sys_param_h.patch b/srcpkgs/dma/patches/musl_sys_param_h.patch
deleted file mode 100644
index 170b6895bdc..00000000000
--- a/srcpkgs/dma/patches/musl_sys_param_h.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Include <sys/param.h> for roundup() declaration with musl libc
-
---- dns.c	2013-06-03 16:03:15.000000000 +0200
-+++ dns.c	2015-08-07 14:53:01.499713464 +0200
-@@ -33,6 +33,7 @@
-  */
- 
- #include <sys/types.h>
-+#include <sys/param.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
- #include <arpa/nameser.h>
diff --git a/srcpkgs/dma/template b/srcpkgs/dma/template
index eeae971c688..d521dcfc0b7 100644
--- a/srcpkgs/dma/template
+++ b/srcpkgs/dma/template
@@ -1,17 +1,17 @@
 # Template file for 'dma'
 pkgname=dma
-version=0.11
-revision=10
+version=0.12
+revision=1
 conf_files="/etc/dma/*.conf"
 make_dirs="/var/spool/dma 2775 root mail"
 hostmakedepends="flex"
 makedepends="libressl-devel"
 short_desc="Small Mail Transport Agent (MTA), designed for home and office use"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="BSD"
+license="BSD-3-Clause"
 homepage="https://github.com/corecode/dma"
 distfiles="https://github.com/corecode/dma/archive/v${version}.tar.gz"
-checksum=288bd57f17aba696b6423b1fa0cd0f7d9b7228d32811f1cd7b821d5f020051b8
+checksum=054a40203d43bc1182dcadf2375ccf01944329dce472444acb42d56cf01de367
 system_accounts="mail"
 
 provides="smtp-server-0_1 smtp-forwarder-0_1"
@@ -20,6 +20,7 @@ replaces="smtp-server>=0 smtp-forwarder>=0"
 do_build() {
 	make PREFIX=/usr SBIN=/usr/bin CC=$CC LEX=flex ${makejobs}
 }
+
 do_install() {
 	vmkdir usr/bin
 	make PREFIX=/usr SBIN=/usr/bin DESTDIR=${DESTDIR} sendmail-link mailq-link install-etc install
diff --git a/srcpkgs/dmd/template b/srcpkgs/dmd/template
index 2cf833eb56e..e96f79cdf8a 100644
--- a/srcpkgs/dmd/template
+++ b/srcpkgs/dmd/template
@@ -1,12 +1,12 @@
 # Template file for 'dmd'
 pkgname=dmd
-version=2.085.0
+version=2.087.1
 revision=1
 create_wrksrc=yes
 makedepends="dmd2.081 git"
 depends="libphobos>=${version} gcc"
 short_desc="Digital Mars D compiler"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="streaks <assemblyislaw@gmail.com>"
 license="BSL-1.0"
 homepage="http://www.digitalmars.com/d/2.0/"
 distfiles="
@@ -14,10 +14,10 @@ distfiles="
  https://github.com/dlang/druntime/archive/v${version}.tar.gz>druntime-${version}.tar.gz
  https://github.com/dlang/phobos/archive/v${version}.tar.gz>phobos-${version}.tar.gz
  http://downloads.dlang.org/releases/2.x/${version}/dmd.${version}.linux.tar.xz"
-checksum="5e45e9ccf07fb0b500f63500b143f8b66dbaf3f4348d2a5250799fc2d22f8225
- b490b04afbd771a51188fd864497b5bf01b28d5a49fb06da420036fc8ea2f7d2
- c2018c8275cf83b542a9cc2c8dc99a770e9b8b89e638f8971dc9945bd0e5385e
- 25d53bb87ff337f99984fcf77d4216d0b9af53ce9dfaf1c3fadf9c3959338487"
+checksum="4239b8b6dc09acf3cdaa1c924f3a2b3cddd0fb532f817c4027b8966f1e96b3a8
+ 19b7f18e11934a582d67dcb39c3ea91d5c24444c3be311f93160e0016ccc58fa
+ 84c7120e972255b4c66c532ff771ecbbb615b87140d0ffcb214d04b0d418f28f
+ c3c6cc865f5aa66dce4244467797b596ed0ada2bde93031350dc36713733cfc1"
 conf_files="/etc/dmd.conf"
 provides="d-compiler-${version}_${revision}"
 conflicts="dmd-bootstrap dmd2.081"
@@ -74,7 +74,7 @@ do_install() {
 dmd-doc_package() {
 	short_desc="Documentation and sample code for D programming language"
 	replaces="dmd-docs>=0"
-	license="Boost License"
+	license="BSL-1.0"
 
 	pkg_install() {
 		cd dmd2
@@ -91,7 +91,7 @@ dmd-doc_package() {
 
 libphobos_package() {
 	short_desc+=" - standard library"
-	license="Boost License"
+	license="BSL-1.0"
 	conflicts="dmd-bootstrap"
 	pkg_install() {
 		vinstall ${wrksrc}/druntime/generated/linux/release/$_archbits/libdruntime.a 644 usr/lib libdruntime.a
diff --git a/srcpkgs/dmenu-wayland/template b/srcpkgs/dmenu-wayland/template
index baa380dca42..d36244bbbe7 100644
--- a/srcpkgs/dmenu-wayland/template
+++ b/srcpkgs/dmenu-wayland/template
@@ -1,9 +1,9 @@
 # Template file for 'dmenu-wayland'
 pkgname=dmenu-wayland
 version=0.1
-revision=1
+revision=2
 build_style=meson
-hostmakedepends="cmake pkg-config"
+hostmakedepends="cmake pkg-config wayland-devel"
 makedepends="cairo-devel glib-devel gobject-introspection libxkbcommon-devel
  pango-devel wayland-devel wayland-protocols"
 short_desc="Dmenu for wayland-compositors"
@@ -12,7 +12,6 @@ license="MIT"
 homepage="https://github.com/nyyManni/dmenu-wayland"
 distfiles="https://github.com/nyyManni/dmenu-wayland/archive/v${version}.tar.gz"
 checksum=dcbc70156e138b2bb8788aeebf75af14f75e188ed78865840e341b5375ed6614
-nocross=yes #wait for wayland to use meson https://gitlab.freedesktop.org/wayland/weston/merge_requests/157
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/dmenu/template b/srcpkgs/dmenu/template
index 8eaa67ef39c..045b64e1635 100644
--- a/srcpkgs/dmenu/template
+++ b/srcpkgs/dmenu/template
@@ -4,7 +4,7 @@ version=4.9
 revision=1
 makedepends="libXinerama-devel libXft-devel freetype-devel"
 short_desc="Generic menu for X"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Lugubris <lugubris@disroot.org>"
 license="MIT"
 homepage="https://tools.suckless.org/dmenu/"
 distfiles="https://dl.suckless.org/tools/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/dnscrypt-proxy/template b/srcpkgs/dnscrypt-proxy/template
index b89455ac3e1..1ff59848058 100644
--- a/srcpkgs/dnscrypt-proxy/template
+++ b/srcpkgs/dnscrypt-proxy/template
@@ -1,17 +1,17 @@
 # Template file for 'dnscrypt-proxy'
 pkgname=dnscrypt-proxy
-version=2.0.25
+version=2.0.27
 revision=1
 build_style=go
 go_import_path=github.com/jedisct1/dnscrypt-proxy
 go_package="${go_import_path}/dnscrypt-proxy"
 short_desc="DNS proxy that encrypts queries"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Lugubris <lugubris@disroot.org>"
 license="ISC"
 homepage="https://github.com/jedisct1/dnscrypt-proxy"
 changelog="https://raw.githubusercontent.com/jedisct1/dnscrypt-proxy/master/ChangeLog"
 distfiles="https://github.com/jedisct1/dnscrypt-proxy/archive/${version}.tar.gz"
-checksum=774696004c9e306e1723b4cbbe66a961128a335543d318d0786492ce69b906fa
+checksum=a501f44af39cb43e00489ef9e6678aa8adba2bc98f9042dd61ce60e9ad074d5a
 conf_files="/etc/dnscrypt-proxy.toml"
 system_accounts="dnscrypt_proxy"
 make_dirs="/var/log/dnscrypt-proxy 0750 dnscrypt_proxy dnscrypt_proxy"
diff --git a/srcpkgs/dnsmasq/patches/nettle35.patch b/srcpkgs/dnsmasq/patches/nettle35.patch
new file mode 100644
index 00000000000..90e83d2e00d
--- /dev/null
+++ b/srcpkgs/dnsmasq/patches/nettle35.patch
@@ -0,0 +1,42 @@
+From: Vladislav Grishenko <themiron@mail.ru>
+Date: Wed, 26 Jun 2019 15:27:11 +0000 (+0500)
+Subject: Fix build with libnettle 3.5
+X-Git-Url: http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commitdiff_plain;h=ab73a746a0d6fcac2e682c5548eeb87fb9c9c82e;hp=69bc94779c2f035a9fffdb5327a54c3aeca73ed5
+
+Fix build with libnettle 3.5
+---
+
+diff --git a/src/crypto.c b/src/crypto.c
+index ebb871e..fecc64a 100644
+--- src/crypto.c
++++ src/crypto.c
+@@ -275,6 +275,10 @@ static int dnsmasq_ecdsa_verify(struct blockdata *key_data, unsigned int key_len
+   static struct ecc_point *key_256 = NULL, *key_384 = NULL;
+   static mpz_t x, y;
+   static struct dsa_signature *sig_struct;
++#if NETTLE_VERSION_MAJOR == 3 && NETTLE_VERSION_MINOR < 4
++#define nettle_get_secp_256r1() (&nettle_secp_256r1)
++#define nettle_get_secp_384r1() (&nettle_secp_384r1)
++#endif
+
+   if (!sig_struct)
+     {
+@@ -294,7 +298,7 @@ static int dnsmasq_ecdsa_verify(struct blockdata *key_data, unsigned int key_len
+          if (!(key_256 = whine_malloc(sizeof(struct ecc_point))))
+            return 0;
+
+-         nettle_ecc_point_init(key_256, &nettle_secp_256r1);
++         nettle_ecc_point_init(key_256, nettle_get_secp_256r1());
+        }
+
+       key = key_256;
+@@ -307,7 +311,7 @@ static int dnsmasq_ecdsa_verify(struct blockdata *key_data, unsigned int key_len
+          if (!(key_384 = whine_malloc(sizeof(struct ecc_point))))
+            return 0;
+
+-         nettle_ecc_point_init(key_384, &nettle_secp_384r1);
++         nettle_ecc_point_init(key_384, nettle_get_secp_384r1());
+        }
+
+       key = key_384;
+
diff --git a/srcpkgs/docker-compose/patches/pyyaml_version.patch b/srcpkgs/docker-compose/patches/pyyaml_version.patch
new file mode 100644
index 00000000000..77c69fd89a5
--- /dev/null
+++ b/srcpkgs/docker-compose/patches/pyyaml_version.patch
@@ -0,0 +1,13 @@
+diff --git a/setup.py b/setup.py
+index 8371cc756ee0..5e27ab7c5d0e 100644
+--- a/setup.py
++++ b/setup.py
+@@ -32,7 +32,7 @@ def find_version(*file_paths):
+ install_requires = [
+     'cached-property >= 1.2.0, < 2',
+     'docopt >= 0.6.1, < 0.7',
+-    'PyYAML >= 3.10, < 4.3',
++    'PyYAML >= 3.10',
+     'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0, < 2.21',
+     'texttable >= 0.9.0, < 0.10',
+     'websocket-client >= 0.32.0, < 1.0',
diff --git a/srcpkgs/docker-compose/template b/srcpkgs/docker-compose/template
index eaa967790b6..c3383fdf1ad 100644
--- a/srcpkgs/docker-compose/template
+++ b/srcpkgs/docker-compose/template
@@ -1,7 +1,7 @@
 # Template file for 'docker-compose'
 pkgname=docker-compose
-version=1.24.0
-revision=1
+version=1.24.1
+revision=2
 archs=noarch
 wrksrc="compose-${version}"
 build_style=python3-module
@@ -16,7 +16,9 @@ maintainer="pancake <pancake@nopcode.org>"
 license="Apache-2.0"
 homepage="https://docs.docker.com/compose/"
 distfiles="https://github.com/docker/compose/archive/${version}.tar.gz"
-checksum=31933e401d295812617f23377f63fc2b8da13d8456b61a60cec0e02afcad5672
+checksum=63a0e0d3819ff77aebd3d5ea30f77b36475ed522c4dabed2eb10636e35aa9370
+patch_args="-Np1"
+
 
 pre_build() {
 	# relax texttable and requests upper bound
diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template
index f23caafc3f8..d9e389417c6 100644
--- a/srcpkgs/docker/template
+++ b/srcpkgs/docker/template
@@ -1,6 +1,6 @@
 # Template file for 'docker'
 pkgname=docker
-version=19.03.1
+version=19.03.3
 revision=1
 wrksrc="${pkgname}-ce-${version}"
 hostmakedepends="git go pkg-config curl cmake"
@@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="http://www.docker.io"
 distfiles="https://github.com/docker/docker-ce/archive/v${version}.tar.gz"
-checksum=dad9123e203751ce9981bc34773721593655231c32412e310e748b18f10f0053
+checksum=63b0d28608f32573b9c03fa46247c6f959e9c08133ddf30a71276919de0194c0
 
 # These are required at run-time.
 depends+=" iptables xz git"
diff --git a/srcpkgs/dolphin/template b/srcpkgs/dolphin/template
index 0d5f02f3788..ab48334e3de 100644
--- a/srcpkgs/dolphin/template
+++ b/srcpkgs/dolphin/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin'
 pkgname=dolphin
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://userbase.kde.org/Dolphin"
 distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=fd44714541ae7082d4615e441242afdba2d7810a373bfc8c3e64ff5c7db0a0f0
+checksum=0c56515737fc0f96020b3c157a93023095d1a1e23637e7670e068c6c286bbc3b
 
 if [ "$CROSS_BUILD" ]; then
 	LDFLAGS=" -Wl,-rpath-link,../bin"
diff --git a/srcpkgs/doomretro/template b/srcpkgs/doomretro/template
index a247a172b0c..400fe78615d 100644
--- a/srcpkgs/doomretro/template
+++ b/srcpkgs/doomretro/template
@@ -1,6 +1,6 @@
 # Template file for 'doomretro'
 pkgname=doomretro
-version=2.9.3
+version=3.0.4
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -10,4 +10,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.doomretro.com"
 distfiles="https://github.com/bradharding/doomretro/archive/v${version}.tar.gz"
-checksum=4e72f7b15a85be187c33e2e304c0d3306abfc4459e41d1e0e1f5413c336173e2
+checksum=60887a4edc3013cad5965ed2f39c5a3e114ef182c3dc83055caf3b682e2a638b
diff --git a/srcpkgs/dos2unix/template b/srcpkgs/dos2unix/template
index a354c26d2d2..862b49c8314 100644
--- a/srcpkgs/dos2unix/template
+++ b/srcpkgs/dos2unix/template
@@ -1,14 +1,14 @@
 # Template file for 'dos2unix'
 pkgname=dos2unix
-version=7.4.0
+version=7.4.1
 revision=1
 build_style=gnu-makefile
+short_desc="Text file format converter"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="2-clause-BSD"
+license="BSD-2-Clause"
 homepage="http://waterlan.home.xs4all.nl/dos2unix.html"
-short_desc="Text file format converter"
 distfiles="http://waterlan.home.xs4all.nl/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=bac765abdbd95cdd87a71989d4382c32cf3cbfeee2153f0086cb9cf18261048a
+checksum=1cd58a60b03ed28fa39046102a185c5e88c4f7665e1e0417c25de7f8b9f78623
 
 post_install() {
 	rm -rf ${DESTDIR}/usr/share/doc/${pkgname}-${version}
diff --git a/srcpkgs/dosbox/template b/srcpkgs/dosbox/template
index f9ecd89eefc..4518697790a 100644
--- a/srcpkgs/dosbox/template
+++ b/srcpkgs/dosbox/template
@@ -13,9 +13,6 @@ homepage="http://www.dosbox.com"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${wrksrc}.tar.gz"
 checksum=c0d13dd7ed2ed363b68de615475781e891cd582e8162b5c3669137502222260a
 
-pre_configure() {
-	sed -i 's/png_check_sig/png_sig_cmp/' configure
-}
 post_install() {
 	vdoc README
 	vdoc docs/README.video
@@ -23,4 +20,3 @@ post_install() {
 	vinstall ${FILESDIR}/${pkgname}.png 644 usr/share/pixmaps
 	vinstall ${FILESDIR}/${pkgname}.desktop 644 usr/share/applications
 }
-
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index a931292cbbd..908febe902c 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,6 +1,6 @@
 # Template file for 'dovecot-plugin-pigeonhole'
 pkgname=dovecot-plugin-pigeonhole
-version=0.5.7.1
+version=0.5.8
 revision=1
 wrksrc="dovecot-2.3-pigeonhole-${version}"
 build_style=gnu-configure
@@ -15,11 +15,11 @@ make_build_args="LIBDOVECOT_INCLUDE=-I${XBPS_CROSS_BASE}/usr/include/dovecot
 hostmakedepends="libldap-devel"
 makedepends="dovecot-devel libressl-devel libldap-devel"
 short_desc="Sieve implementation for Dovecot"
-maintainer="John Regan <john@jrjrtech.com>"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://pigeonhole.dovecot.org"
 distfiles="${homepage}/releases/2.3/${wrksrc}.tar.gz"
-checksum=3270b24c1f75a7c144f54d6d08ce994176e39c2cdb3ac4dd80ad5e64aaaa2028
+checksum=8fb860d50c1b1a09aea9e25f8ee89c22e34ecedfb0e11a1c48a7f67310759022
 
 dovecot-plugin-pigeonhole-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 78b1b26a7c9..4b195f2bf44 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -1,7 +1,7 @@
 # Template file for 'dovecot'
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
-version=2.3.7.1
+version=2.3.8
 revision=1
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
@@ -15,11 +15,11 @@ makedepends=" liblz4-devel zlib-devel bzip2-devel liblzma-devel libressl-devel
  clucene-devel libldap-devel libcap-devel pam-devel libcurl-devel expat-devel
  libsodium-devel"
 short_desc="IMAP and POP3 server written with security primarily in mind"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://dovecot.org"
 distfiles="${homepage}/releases/2.3/${pkgname}-${version}.tar.gz"
-checksum=c5a51d6f76e6e9c843df69e52a364a4c65c4c60e0c51d992eaa45f22f71803c3
+checksum=c5778d03bf26ab34a605854098035badec455d07adfab38d974f610c8f78b649
 keep_libtool_archives=yes
 
 
diff --git a/srcpkgs/dracut/patches/ppc-mac-thermal.patch b/srcpkgs/dracut/patches/ppc-mac-thermal.patch
new file mode 100644
index 00000000000..16ce4dbff1d
--- /dev/null
+++ b/srcpkgs/dracut/patches/ppc-mac-thermal.patch
@@ -0,0 +1,144 @@
+From 3b146ac6c0397f4a73c7b4ee498bff4e98479066 Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+Date: Mon, 22 Jul 2019 18:52:08 +0200
+Subject: [PATCH] modules.d: add a module for early fan control on PowerPC Macs
+
+The goal of this module is to enable automatic loading of the
+thermal/fan control modules on PowerPC based Macs, as on some
+modular kernel configurations this will not happen automatically
+which will result in the fans spinning up to 100% until they are
+manually loaded.
+
+This is especially a problem in live systems where it takes some
+time to boot up and the spin-up happens before the system even
+leaves initramfs.
+---
+ modules.d/90ppcmac/load-thermal.sh | 29 +++++++++++
+ modules.d/90ppcmac/module-setup.sh | 82 ++++++++++++++++++++++++++++++
+ 2 files changed, 111 insertions(+)
+ create mode 100644 modules.d/90ppcmac/load-thermal.sh
+ create mode 100644 modules.d/90ppcmac/module-setup.sh
+
+diff --git a/modules.d/90ppcmac/load-thermal.sh b/modules.d/90ppcmac/load-thermal.sh
+new file mode 100644
+index 000000000..1e548f052
+--- /dev/null
++++ modules.d/90ppcmac/load-thermal.sh
+@@ -0,0 +1,29 @@
++#!/bin/sh
++#
++# This hook attempts to load the appropriate thermal modules
++# for PowerPC Macs depending on the specific machine you have.
++
++[ -r /proc/cpuinfo ] || exit 0
++
++load_windfarm() {
++    local pm_model="$(sed -n '/model/p' /proc/cpuinfo)"
++    pm_model="${pm_model##*: }"
++
++    # load quietly and respect the blacklist
++    # this way if the modules are for some reason missing, it will
++    # still exit successfully and not affect the boot process
++    case "$pm_model" in
++        PowerMac3,6)             modprobe -b -q therm_windtunnel ;;
++        PowerMac7,2|PowerMac7,3) modprobe -b -q windfarm_pm72    ;;
++        PowerMac8,1|PowerMac8,2) modprobe -b -q windfarm_pm81    ;;
++        PowerMac9,1)             modprobe -b -q windfarm_pm91    ;;
++        PowerMac11,2)            modprobe -b -q windfarm_pm112   ;;
++        PowerMac12,1)            modprobe -b -q windfarm_pm121   ;;
++        RackMac3,1)              modprobe -b -q windfarm_rm31    ;;
++        *) ;;
++    esac
++
++    return 0
++}
++
++load_windfarm
+diff --git a/modules.d/90ppcmac/module-setup.sh b/modules.d/90ppcmac/module-setup.sh
+new file mode 100644
+index 000000000..59221ec4d
+--- /dev/null
++++ modules.d/90ppcmac/module-setup.sh
+@@ -0,0 +1,82 @@
++#!/bin/bash
++#
++# This module attempts to properly deal with thermal behavior on PowerPC
++# based Mac systems, by installing the model-appropriate (when hostonly)
++# or all (when not) fan control/thermal kernel modules and loading them
++# in a hook.
++#
++# While this is not strictly necessary for all kernels, particularly
++# modular kernels will not autoload those drivers, even once the full
++# system is up, which results in the fans spinning up to 100%; this is
++# particularly annoying on live systems, where the system takes a while
++# to load, so it's best to load the drivers early in initramfs stage.
++#
++# The behavior of this is inspired by the thermal hook in Debian's
++# initramfs-tools, but written for dracut specifically and updated
++# for modern kernels (2012+).
++
++# called by dracut
++check() {
++    local _arch="$(uname -m)"
++    # only for PowerPC Macs
++    [[ "$_arch" == ppc* && "$_arch" != ppc*le ]] || return 1
++    return 0
++}
++
++# called by dracut
++depends() {
++    return 0
++}
++
++# called by dracut
++installkernel() {
++    pmac_model() {
++        local pm_model="$(grep model /proc/cpuinfo)"
++        echo "${pm_model##*: }"
++    }
++
++    # only PowerMac3,6 has a module, special case
++    if [[ "$(uname -m)" == ppc ]]; then
++        if ! [[ $hostonly ]] || [[ "$(pmac_model)" == "PowerMac3,6" ]]; then
++            instmods therm_windtunnel
++        fi
++        return 0
++    fi
++
++    windfarm_modules() {
++        if ! [[ $hostonly ]]; then
++            # include all drivers when not hostonly
++            instmods \
++                windfarm_pm72 windfarm_pm81 windfarm_pm91 windfarm_pm112 \
++                windfarm_pm121 windfarm_rm31
++        else
++            # guess model specific module, then install the rest
++            case "$(pmac_model)" in
++                PowerMac7,2|PowerMac7,3) instmods windfarm_pm72  ;;
++                PowerMac8,1|PowerMac8,2) instmods windfarm_pm81  ;;
++                PowerMac9,1)             instmods windfarm_pm91  ;;
++                PowerMac11,2)            instmods windfarm_pm112 ;;
++                PowerMac12,1)            instmods windfarm_pm121 ;;
++                RackMac3,1)              instmods windfarm_rm31  ;;
++                # no match, so skip installation of the rest
++                *) return 1 ;;
++            esac
++        fi
++        return 0
++    }
++
++    # hostonly and didn't match a model; skip installing other modules
++    windfarm_modules || return 0
++    # these are all required by the assorted windfarm_pm*
++    instmods \
++        windfarm_core windfarm_cpufreq_clamp windfarm_pid \
++        windfarm_smu_controls windfarm_smu_sat windfarm_smu_sensors \
++        windfarm_fcu_controls windfarm_ad7417_sensor windfarm_max6690_sensor \
++        windfarm_lm75_sensor windfarm_lm87_sensor
++}
++
++# called by dracut
++install() {
++    # this will attempt to load the appropriate modules
++    inst_hook pre-udev 99 "$moddir/load-thermal.sh"
++}
diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template
index 6eb4125fb56..25614b2d3e2 100644
--- a/srcpkgs/dracut/template
+++ b/srcpkgs/dracut/template
@@ -1,7 +1,7 @@
 # Template file for 'dracut'
 pkgname=dracut
 version=049
-revision=1
+revision=2
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc"
 conf_files="/etc/dracut.conf"
@@ -9,7 +9,7 @@ hostmakedepends="asciidoc pkg-config"
 makedepends="libkmod-devel"
 depends="bash coreutils cpio psmisc"
 short_desc="Low-level tool for generating an initramfs/initrd image"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="q66 <daniel@octaforge.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="http://www.kernel.org/pub/linux/utils/boot/dracut/dracut.html"
 distfiles="https://github.com/dracutdevs/dracut/archive/${version}.tar.gz"
diff --git a/srcpkgs/dragon-player/template b/srcpkgs/dragon-player/template
index a2cea075394..826bc54fc8c 100644
--- a/srcpkgs/dragon-player/template
+++ b/srcpkgs/dragon-player/template
@@ -1,6 +1,6 @@
 # Template file for 'dragon-player'
 pkgname=dragon-player
-version=19.04.3
+version=19.08.2
 revision=1
 wrksrc="dragon-${version}"
 build_style=cmake
@@ -13,4 +13,4 @@ maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/multimedia/dragonplayer"
 distfiles="${KDE_SITE}/applications/${version}/src/dragon-${version}.tar.xz"
-checksum=498bbcf3441a32a588568981ee3ad563b6c4fd88b226d1673d83da09901f117a
+checksum=3924dba504f370415c0d68cb5079acfc941aa761e9d9d2df2ea48b302ef9ce61
diff --git a/srcpkgs/drone-cli/template b/srcpkgs/drone-cli/template
index 086015f3347..603c76fd72d 100644
--- a/srcpkgs/drone-cli/template
+++ b/srcpkgs/drone-cli/template
@@ -1,14 +1,14 @@
 # Template file for 'drone-cli'
 pkgname=drone-cli
-version=1.1.2
+version=1.2.0
 revision=1
 build_style=go
 go_import_path=github.com/drone/drone-cli
 go_package="${go_import_path}/drone"
 go_ldflags="-X main.version=${version}"
 short_desc="CLI for Drone continuous delivery platform"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/drone/drone-cli"
 distfiles="https://github.com/drone/drone-cli/archive/v${version}.tar.gz"
-checksum=ba315c38dd36af898900fd0149d5228775f9f96d491d40dcaa3daddafd03aac4
+checksum=2f7cfb0ab99c94a2406f057ab509ed4974bf715a743979e62f542d889bb7bcc7
diff --git a/srcpkgs/drumstick-devel b/srcpkgs/drumstick-devel
new file mode 120000
index 00000000000..e953fd56e31
--- /dev/null
+++ b/srcpkgs/drumstick-devel
@@ -0,0 +1 @@
+drumstick
\ No newline at end of file
diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
new file mode 100644
index 00000000000..bbc8f563897
--- /dev/null
+++ b/srcpkgs/drumstick/template
@@ -0,0 +1,33 @@
+# Template file for 'drumstick'
+pkgname=drumstick
+version=1.1.3
+revision=1
+build_style=cmake
+configure_args="-DLIB_SUFFIX="
+hostmakedepends="pkg-config doxygen libxslt docbook-xsl"
+makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel"
+short_desc="Set of MIDI libraries using C++/Qt5 idioms and style"
+maintainer="Mohammad Amin Sameti <mamins1376@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="http://drumstick.sourceforge.net"
+distfiles="${SOURCEFORGE_SITE}/drumstick/drumstick-${version}.tar.bz2"
+checksum=75aca4281da25fe0186b44c07772c5f0b4d1f2bba875c4667e7e6e9fcedb3cd9
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt5-qmake qt5-host-tools"
+fi
+
+post_install() {
+	for doc in TODO NEWS ChangeLog AUTHORS; do
+		vdoc $doc
+	done
+}
+
+drumstick-devel_package() {
+	short_desc+=" - development libraries"
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+	}
+}
diff --git a/srcpkgs/dssi/template b/srcpkgs/dssi/template
index 4478cb3ef37..fac019b9f57 100644
--- a/srcpkgs/dssi/template
+++ b/srcpkgs/dssi/template
@@ -1,12 +1,12 @@
 # Template file for 'dssi'
 pkgname=dssi
 version=1.1.1
-revision=7
+revision=8
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="
  liblo-devel libsndfile-devel libsamplerate-devel alsa-lib-devel jack-devel
- ladspa-sdk libSM-devel libX11-devel qt-devel"
+ ladspa-sdk libSM-devel libX11-devel"
 short_desc="API for audio processing plugins"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1"
@@ -14,10 +14,6 @@ homepage="http://dssi.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=f2c82b073a947c8255284249097667f9b14e660bf86186f3fcd3b3b3e087814e
 
-if [ -n "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt-host-tools qt-devel"
-fi
-
 dssi-devel_package() {
 	depends="dssi>=${version}"
 	short_desc+=" - development files"
diff --git a/srcpkgs/dtc/template b/srcpkgs/dtc/template
index 72bcd3d08ea..3c1e4c05628 100644
--- a/srcpkgs/dtc/template
+++ b/srcpkgs/dtc/template
@@ -1,6 +1,6 @@
 # Template file for 'dtc'
 pkgname=dtc
-version=1.5.0
+version=1.5.1
 revision=1
 build_style=gnu-makefile
 make_build_args="NO_PYTHON=1"
@@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-only"
 homepage="https://git.kernel.org/pub/scm/utils/dtc/dtc.git"
 distfiles="https://www.kernel.org/pub/software/utils/dtc/dtc-${version}.tar.xz"
-checksum=c672e443c9f7e39f5a7c8e602da6777f9ad55ad70de87de300a43828c8050172
+checksum=660b74039690fc37013660544d09191834efb58503c73c555c5513ba75ab031f
 
 CFLAGS="-fPIC"
 
diff --git a/srcpkgs/dte/template b/srcpkgs/dte/template
index 4836cb3d1f9..ea15247d6a2 100644
--- a/srcpkgs/dte/template
+++ b/srcpkgs/dte/template
@@ -1,6 +1,6 @@
 # Template file for 'dte'
 pkgname=dte
-version=1.8.2
+version=1.9.1
 revision=1
 build_style=gnu-makefile
 make_install_args="prefix=/usr"
@@ -10,4 +10,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/craigbarnes/dte"
 distfiles="https://github.com/craigbarnes/dte/archive/v${version}.tar.gz"
-checksum=778786c0b2588f0d9a651ebfde939885a5579745dae8f5d9adc480f4895d6c04
+checksum=80d2732269a308b5e1126ecc16c28cda032864f625a95184821a73c054f81a2d
diff --git a/srcpkgs/duktape/template b/srcpkgs/duktape/template
index a77c759199e..c7d5a957a18 100644
--- a/srcpkgs/duktape/template
+++ b/srcpkgs/duktape/template
@@ -1,6 +1,6 @@
 # Template file for 'duktape'
 pkgname=duktape
-version=2.3.0
+version=2.4.0
 revision=1
 build_style=gnu-makefile
 make_build_args="-f Makefile.sharedlibrary"
@@ -10,7 +10,7 @@ maintainer="Christopher Brannon <chris@the-brannons.com>"
 license="MIT"
 homepage="http://duktape.org"
 distfiles="https://github.com/svaarala/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.xz"
-checksum=ed6e2f3ab2061628a7aeee27ccff16538ba6a151480cccf2e846bd061e45afe8
+checksum=86a89307d1633b5cedb2c6e56dc86e92679fc34b05be551722d8cc69ab0771fc
 
 pre_build() {
 	sed -i 's|^CC.*||g' Makefile.sharedlibrary
diff --git a/srcpkgs/duplicity/template b/srcpkgs/duplicity/template
index cae0d5556d0..c5b03faa53c 100644
--- a/srcpkgs/duplicity/template
+++ b/srcpkgs/duplicity/template
@@ -9,7 +9,7 @@ makedepends="python-devel librsync-devel"
 depends="python-fasteners gnupg"
 checkdepends="python-pexpect python-mock python-fasteners gnupg par2cmdline"
 short_desc="Encrypted bandwidth-efficient backup using the rsync algorithm"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://duplicity.nongnu.org/"
 changelog="http://duplicity.nongnu.org/CHANGELOG"
diff --git a/srcpkgs/dutree/template b/srcpkgs/dutree/template
index c6873cf8a00..d2faee7ab31 100644
--- a/srcpkgs/dutree/template
+++ b/srcpkgs/dutree/template
@@ -1,6 +1,6 @@
 # Template file for 'dutree'
 pkgname=dutree
-version=0.2.9
+version=0.2.12
 revision=2
 build_style=cargo
 short_desc="Tool to analyze file system usage written in Rust"
@@ -8,4 +8,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/nachoparker/dutree"
 distfiles="https://github.com/nachoparker/dutree/archive/v${version}.tar.gz"
-checksum=38e621e813b6d3ee37bf765ac68b98e77bdf7fc58b8b788d54153bd929c1fda1
+checksum=6304eaf2ee0913bd0521a351fe5138b3ae44103927655ec43672cadeac559c08
diff --git a/srcpkgs/e2fsprogs/template b/srcpkgs/e2fsprogs/template
index 0fd0da5bce1..b9a2cbc85e1 100644
--- a/srcpkgs/e2fsprogs/template
+++ b/srcpkgs/e2fsprogs/template
@@ -1,6 +1,6 @@
 # Template file for 'e2fsprogs'
 pkgname=e2fsprogs
-version=1.45.3
+version=1.45.4
 revision=1
 build_style=gnu-configure
 configure_args="--enable-elf-shlibs --disable-fsck
@@ -17,7 +17,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://e2fsprogs.sourceforge.net/"
 distfiles="${KERNEL_SITE}/kernel/people/tytso/e2fsprogs/v${version}/e2fsprogs-${version}.tar.xz"
-checksum=90d10066b815e27b0b4875f0d5e396c663e0bf55aa3ca10868978d10c6ffe595
+checksum=65faf6b590ca1da97440d6446bd11de9e0914b42553740ba5d9d2a796fa0dc02
 conf_files="/etc/mke2fs.conf /etc/e2scrub.conf"
 
 do_check() {
diff --git a/srcpkgs/eclipse/template b/srcpkgs/eclipse/template
index c097b29e622..e81765c0264 100644
--- a/srcpkgs/eclipse/template
+++ b/srcpkgs/eclipse/template
@@ -1,9 +1,9 @@
 # Template file for 'eclipse'
 pkgname=eclipse
-version=4.12
+version=4.13
 revision=1
 #code name of version
-_release=2019-06
+_release=2019-09
 archs="x86_64"
 wrksrc="eclipse"
 depends="virtual?java-environment unzip gtk+3 webkit2gtk libXtst hicolor-icon-theme desktop-file-utils"
@@ -17,7 +17,7 @@ _patch=R
 _edition=java
 _mirror="http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse"
 distfiles="${_mirror}/technology/epp/downloads/release/${_release}/${_patch}/eclipse-${_edition}-${_release}-${_patch}-linux-gtk-x86_64.tar.gz"
-checksum=bafa1143704f0bba32ed933fdf0f620bb956221b2ebba8e2a822c43671d8acf4
+checksum=18f55219c86fa4fe52f8a1a51b17c4eb99af6c215d6af8702555ea82af83acaa
 
 do_install() {
 	vmkdir usr/lib/eclipse
diff --git a/srcpkgs/edbrowse/patches/curl-7.62.patch b/srcpkgs/edbrowse/patches/curl-7.62.patch
deleted file mode 100644
index ec9e85124e2..00000000000
--- a/srcpkgs/edbrowse/patches/curl-7.62.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 5d2b9e21fdf019f461ebe62738d615428d5db963 Mon Sep 17 00:00:00 2001
-From: Po-Chuan Hsieh <sunpoet@sunpoet.net>
-Date: Sat, 3 Nov 2018 18:11:14 +0800
-Subject: [PATCH] Fix build with curl 7.62.0
-
-from CHANGES:
-ssl: deprecate CURLE_SSL_CACERT in favour of a unified error code
-Long live CURLE_PEER_FAILED_VERIFICATION
----
- src/http.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/http.c b/src/http.c
-index 56eebab..ccafc8f 100644
---- src/http.c
-+++ src/http.c
-@@ -1557,7 +1557,9 @@ void ebcurl_setError(CURLcode curlret, const char *url, int action,
- 		break;
- 
- 	case CURLE_PEER_FAILED_VERIFICATION:
-+#if LIBCURL_VERSION_NUM < 0x073e00
- 	case CURLE_SSL_CACERT:
-+#endif
- 		(*fn) (MSG_NoCertify, host);
- 		break;
- 
-
diff --git a/srcpkgs/edbrowse/template b/srcpkgs/edbrowse/template
index 72671ae7797..b3e93dc9613 100644
--- a/srcpkgs/edbrowse/template
+++ b/srcpkgs/edbrowse/template
@@ -1,7 +1,7 @@
 # Template file for 'edbrowse'
 pkgname=edbrowse
-version=3.7.4
-revision=3
+version=3.7.5.1
+revision=1
 hostmakedepends="perl pkg-config"
 build_style=cmake
 makedepends="duktape-devel libcurl-devel libtidy5-devel pcre-devel
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="http://edbrowse.org/"
 distfiles="https://github.com/CMB/${pkgname}/archive/v${version}.tar.gz"
-checksum=b79e6417c1170c96ef68968c33d585725f0f2d27859e3fe807c980a9c33ea719
+checksum=096eb9051f9cde4cf71c833fa43f602fb3db40af056d1fab98a1711abf42caba
 
 do_install() {
 	vbin build/edbrowse
diff --git a/srcpkgs/editline/template b/srcpkgs/editline/template
index c97f4c2a196..50f10aab097 100644
--- a/srcpkgs/editline/template
+++ b/srcpkgs/editline/template
@@ -4,7 +4,7 @@ version=1.16.1
 revision=1
 build_style=gnu-configure
 short_desc="Minimal readline() replacement"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Spencer-94"
 homepage="http://troglobit.com/projects/editline/"
 distfiles="https://github.com/troglobit/editline/releases/download/${version}/editline-${version}.tar.xz"
diff --git a/srcpkgs/eggdrop/template b/srcpkgs/eggdrop/template
new file mode 100644
index 00000000000..dd274acdb61
--- /dev/null
+++ b/srcpkgs/eggdrop/template
@@ -0,0 +1,44 @@
+# Template file for 'eggdrop'
+pkgname=eggdrop
+version=1.8.4
+revision=1
+build_style=gnu-configure
+hostmakedepends="tcl-devel"
+makedepends="tcl-devel libressl-devel zlib-devel"
+short_desc="Internet relay chat (IRC) bot"
+maintainer="Andrew Benson <abenson+void@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://www.eggheads.org/"
+distfiles="https://ftp.eggheads.org/pub/eggdrop/source/${version%.*}/eggdrop-${version}.tar.gz"
+checksum=79644eb27a5568934422fa194ce3ec21cfb9a71f02069d39813e85d99cdebf9e
+
+pre_build() {
+	make config
+}
+
+do_install() {
+	_lib="usr/lib/eggdrop"
+	_share="usr/share/eggdrop"
+	_conf="etc/eggdrop"
+
+	make install DEST=ed_staging
+
+	vbin eggdrop
+
+	vmkdir "${_lib}"
+	vcopy "ed_staging/modules/*.so" "${_lib}"
+	vsed -e "s|modules/|/${_lib}/|" -i eggdrop.conf
+
+	for _asset in language scripts help; do
+		vmkdir "${_share}/${_asset}/"
+		vcopy "ed_staging/${_asset}/*" "${_share}/${_asset}"
+		vsed -e "s|${_asset}/|/${_share}/&|" -i eggdrop.conf
+	done
+
+	vmkdir "${_conf}/text"
+	vcopy "ed_staging/text/*" "${_conf}/text"
+	vsed -e "s|text/|/${_conf}/&|" -i eggdrop.conf
+
+	vsconf eggdrop.conf
+	vsconf eggdrop-basic.conf
+}
diff --git a/srcpkgs/elfinfo/template b/srcpkgs/elfinfo/template
index 17f8e262008..ecec045e604 100644
--- a/srcpkgs/elfinfo/template
+++ b/srcpkgs/elfinfo/template
@@ -1,7 +1,7 @@
 # Template file for 'elfinfo'
 pkgname=elfinfo
-version=0.7.5
-revision=2
+version=0.7.6
+revision=1
 build_style=go
 go_import_path=github.com/xyproto/elfinfo
 hostmakedepends="git"
@@ -10,7 +10,7 @@ maintainer="Alexander F. Rødseth <xyproto@archlinux.org>"
 license="MIT"
 homepage="https://elfinfo.roboticoverlords.org/"
 distfiles="https://github.com/xyproto/elfinfo/releases/download/${version}/elfinfo-${version}.tar.xz"
-checksum=430feccaeb102cb9bcef95a25d1fbf12cef2a693b7834446139eba1bc91c8af0
+checksum=194e782bf811ddb3f503af3621158bf9ff50aa6161ff51cbf899b6ebef5f2e7c
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/elfutils/template b/srcpkgs/elfutils/template
index 40cd4b44ef9..3a7671de6b1 100644
--- a/srcpkgs/elfutils/template
+++ b/srcpkgs/elfutils/template
@@ -13,7 +13,7 @@ homepage="https://sourceware.org/elfutils/"
 distfiles="https://sourceware.org/${pkgname}/ftp/${version}/${pkgname}-${version}.tar.bz2"
 checksum=eb5747c371b0af0f71e86215a5ebb88728533c3a104a43d4231963f308cd1023
 
-CFLAGS="-Wno-error"
+CFLAGS="-Wno-error -Wno-error=null-dereference"
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) makedepends+=" argp-standalone musl-fts-devel musl-obstack" ;;
diff --git a/srcpkgs/elixir/template b/srcpkgs/elixir/template
index 4b0ac69330d..2eece311b26 100644
--- a/srcpkgs/elixir/template
+++ b/srcpkgs/elixir/template
@@ -1,6 +1,6 @@
 # Template file for 'elixir'
 pkgname=elixir
-version=1.9.1
+version=1.9.2
 revision=1
 build_style=gnu-makefile
 make_check_target="test"
@@ -12,4 +12,4 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="Apache-2.0"
 homepage="http://elixir-lang.org/"
 distfiles="https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz"
-checksum=94daa716abbd4493405fb2032514195077ac7bc73dc2999922f13c7d8ea58777
+checksum=02aaa3ffd21f9cf51aceb3aa5a5bc2c1e2636b1611867e44f19693dcf856e25c
diff --git a/srcpkgs/ell/template b/srcpkgs/ell/template
index 83e3812da5f..8a2c91f4371 100644
--- a/srcpkgs/ell/template
+++ b/srcpkgs/ell/template
@@ -1,17 +1,17 @@
 # Template file for 'ell'
 pkgname=ell
-version=0.21
+version=0.24
 revision=1
 build_style=gnu-configure
 configure_args="--enable-glib"
 hostmakedepends="pkg-config"
 makedepends="libglib-devel"
 short_desc="Linux library for embedded development"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Peter Bui <pbui@github.bx612.space>"
 license="GPL-2.0-only"
 homepage="https://01.org/ell"
 distfiles="https://mirrors.edge.kernel.org/pub/linux/libs/ell/ell-${version}.tar.xz"
-checksum=a0db4e3057ba41035637354b6af2aa4c74f83509e0c3e563d682df9d72eaff17
+checksum=2f96de39c48cc7facf91015a4dbb123541a8f7818cffa7885db6f8837837cc15
 
 ell-devel_package() {
 	depends="ell-${version}_${revision}"
diff --git a/srcpkgs/elogind/template b/srcpkgs/elogind/template
index 7d03f4e5fc0..3573956c521 100644
--- a/srcpkgs/elogind/template
+++ b/srcpkgs/elogind/template
@@ -1,7 +1,7 @@
 # Template file for 'elogind'
 pkgname=elogind
 version=241.3
-revision=2
+revision=3
 build_style=meson
 configure_args="-Dcgroup-controller=elogind -Dhalt-path=/usr/bin/halt
  -Drootlibexecdir=/usr/libexec/elogind -Dreboot-path=/usr/bin/reboot
@@ -20,6 +20,10 @@ distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz"
 checksum=d6a465479c8a629d49ea9374f6199b0c60e7e42eade0fcd8265fc37085386365
 conf_files="/etc/elogind/logind.conf"
 
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	configure_args+=" -Dutmp=false"
+fi
+
 pre_check() {
 	# test-fs-util checks for /etc/machine-id/foo and expects ENOTDIR
 	# since /etc/machine-id is expected to be a file.
diff --git a/srcpkgs/emacs/template b/srcpkgs/emacs/template
index 8e4ddd6736c..be1dd6da5b0 100644
--- a/srcpkgs/emacs/template
+++ b/srcpkgs/emacs/template
@@ -1,6 +1,6 @@
 # Template file for 'emacs'
 pkgname=emacs
-version=26.2
+version=26.3
 revision=1
 build_style=gnu-configure
 configure_args="--with-file-notification=inotify --with-modules
@@ -21,7 +21,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.gnu.org/software/emacs/"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=151ce69dbe5b809d4492ffae4a4b153b2778459de6deb26f35691e1281a9c58e
+checksum=4d90e6751ad8967822c6e092db07466b9d383ef1653feb2f95c93e7de66d3485
 replaces="emacs>=0"
 nocross=yes
 nopie=yes
diff --git a/srcpkgs/enchant2/template b/srcpkgs/enchant2/template
index be08603478a..f0094c23526 100644
--- a/srcpkgs/enchant2/template
+++ b/srcpkgs/enchant2/template
@@ -1,6 +1,6 @@
 # Template file for 'enchant2'
 pkgname=enchant2
-version=2.2.5
+version=2.2.7
 revision=1
 wrksrc="enchant-${version}"
 build_style=gnu-configure
@@ -9,11 +9,11 @@ make_install_args="$make_build_args"
 hostmakedepends="pkg-config"
 makedepends="libglib-devel hunspell-devel aspell-devel libvoikko-devel"
 short_desc="Generic spell checking library"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://abiword.github.io/enchant/"
 distfiles="https://github.com/AbiWord/enchant/releases/download/v${version}/enchant-${version}.tar.gz"
-checksum=ffce4ea00dbda1478d91c3e1538cadfe5761d9d6c0ceb27bc3dba51882fe1c47
+checksum=1b22976135812b35cb5b8d21a53ad11d5e7c1426c93f51e7a314a2a42cab3a09
 
 enchant2-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/encodings/template b/srcpkgs/encodings/template
index fab5215d3df..eb2ef08e8e6 100644
--- a/srcpkgs/encodings/template
+++ b/srcpkgs/encodings/template
@@ -1,17 +1,17 @@
-# Template build file for 'encodings'.
+# Template file for 'encodings'
 pkgname=encodings
-version=1.0.4
-revision=6
+version=1.0.5
+revision=1
 archs=noarch
 build_style=gnu-configure
 hostmakedepends="pkg-config font-util"
 depends="font-util"
 short_desc="X11 Font Index Generator"
-homepage="http://xorg.freedesktop.org"
-license="Public domain"
 maintainer="Orphaned <orphan@voidlinux.org>"
+license="custom:Public domain"
+homepage="http://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
-checksum=ced6312988a45d23812c2ac708b4595f63fd7a49c4dcd9f66bdcd50d1057d539
+checksum=bd96e16143a044b19e87f217cf6a3763a70c561d1076aad6f6d862ec41774a31
 
 pre_build() {
 	sed -e 's|^\(encodings_DATA = $(DATA_FILES)\).*|\1|' -i Makefile
@@ -19,4 +19,5 @@ pre_build() {
 post_install() {
 	# encodings.dir are generated at pkg post-install time.
 	find ${DESTDIR} -name encodings.dir -delete
+	vlicense COPYING
 }
diff --git a/srcpkgs/endless-sky/template b/srcpkgs/endless-sky/template
index f3e4da66ece..57355b3ea1e 100644
--- a/srcpkgs/endless-sky/template
+++ b/srcpkgs/endless-sky/template
@@ -1,6 +1,6 @@
 # Template file for 'endless-sky'
 pkgname=endless-sky
-version=0.9.9
+version=0.9.10
 revision=1
 build_style=scons
 makedepends="SDL2-devel glew-devel libjpeg-turbo-devel libmad-devel
@@ -11,7 +11,7 @@ maintainer="CoolOhm <micvlas@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="http://endless-sky.github.io/"
 distfiles="https://github.com/endless-sky/endless-sky/archive/v${version}.tar.gz"
-checksum=8bb9a17fd28177b2c17cadb282edcf4ef9a8b3de146f177cc4ca37c6f0aed8a5
+checksum=58f2e405e171be8426004216df4df7bb3a2792a507a5d01f77a0f02346332f6f
 
 endless-sky-data_package() {
 	short_desc+=" - data files"
diff --git a/srcpkgs/engrampa/template b/srcpkgs/engrampa/template
index 573bcf722bb..9e7c329d19c 100644
--- a/srcpkgs/engrampa/template
+++ b/srcpkgs/engrampa/template
@@ -1,6 +1,6 @@
 # Template file for 'engrampa'
 pkgname=engrampa
-version=1.22.1
+version=1.22.2
 revision=1
 build_style=gnu-configure
 configure_args="--enable-magic --disable-schemas-compile --disable-packagekit"
@@ -13,4 +13,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://mate-desktop.org"
 distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=336b05cf891b82c55373454e5c03bed09d5296c39aed977366c595a0dd46e31b
+checksum=ed21d1ceafbbe31e35c9225f0dc6a451ae2f8aff454bacef60df5a31e6b3075e
diff --git a/srcpkgs/entr/template b/srcpkgs/entr/template
index f6f734af09e..cff7bf64a2d 100644
--- a/srcpkgs/entr/template
+++ b/srcpkgs/entr/template
@@ -1,17 +1,16 @@
 # Template file for 'entr'
 pkgname=entr
-version=4.2
+version=4.3
 revision=1
 build_style=gnu-makefile
-short_desc="A utility for running arbitrary commands when files change"
+short_desc="Utility for running arbitrary commands when files change"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="ISC"
 homepage="http://entrproject.org"
 distfiles="$homepage/code/$pkgname-$version.tar.gz"
-checksum=27300215df0aab8b773002da25c7bf60681d8c392f5d5702946c46798e9b5d70
+checksum=b081c1dbdac7723e91f6d528a0d736f90cb2fb1458888aa3b446699d9d26235a
 
 post_extract() {
-	mv ${XBPS_BUILDDIR}/eradman-entr-* $wrksrc
 	case "$XBPS_TARGET_MACHINE" in
 		*-musl) # No need for _LINUX_PORT compat.h and strlcpy.c
 			sed -i $wrksrc/Makefile.linux -e "s;-D_LINUX_PORT;;"
diff --git a/srcpkgs/eog/template b/srcpkgs/eog/template
index 672830a87d6..e0c978ad2fe 100644
--- a/srcpkgs/eog/template
+++ b/srcpkgs/eog/template
@@ -1,6 +1,6 @@
 # Template file for 'eog'
 pkgname=eog
-version=3.32.2
+version=3.34.1
 revision=1
 build_helper="gir"
 build_style=meson
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/EyeOfGnome"
 distfiles="${GNOME_SITE}/eog/${version%.*}/eog-${version}.tar.xz"
-checksum=be971985c9b997cd302e2be7303374425e588d81658de538f14c4cfa1fbe9dad
+checksum=fdb0739f8420af2ffb8e91c766a154afefdf20f721ad34b56cab27fd1569f42c
 shlib_provides="libeog.so"
 lib32disabled=yes
 nocross="Can not use target eog as a generator because it is cross-built"
diff --git a/srcpkgs/eom/template b/srcpkgs/eom/template
index 492bf5c32e7..a048c63c3f5 100644
--- a/srcpkgs/eom/template
+++ b/srcpkgs/eom/template
@@ -16,11 +16,6 @@ homepage="https://mate-desktop.org"
 distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=64d73069ba4db8515a6c2c90fadba87e1c5cac67dd1e102b271f62e537ee970e
 
-case "$XBPS_TARGET_MACHINE" in
-	i686-musl|x86_64-musl) ;;
-	*-musl) broken="gobject-introspection" ;;
-esac
-
 eom-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}-${version}_${revision}"
diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template
index bc0dedc6a1c..b5a3b890c75 100644
--- a/srcpkgs/epiphany/template
+++ b/srcpkgs/epiphany/template
@@ -1,7 +1,7 @@
 # Template file for 'epiphany'
 pkgname=epiphany
 version=3.32.4
-revision=1
+revision=2
 build_helper="gir"
 build_style=meson
 configure_args="-Ddistributor_name=VoidLinux -Dunit_tests=disabled"
diff --git a/srcpkgs/eqonomize/template b/srcpkgs/eqonomize/template
index 060d4878602..702247a68e4 100644
--- a/srcpkgs/eqonomize/template
+++ b/srcpkgs/eqonomize/template
@@ -1,6 +1,6 @@
 # Template file for 'eqonomize'
 pkgname=eqonomize
-version=1.4.1
+version=1.4.2
 revision=1
 build_style=qmake
 makedepends="qt5-charts-devel"
@@ -11,7 +11,7 @@ license="GPL-3.0-or-later"
 homepage="http://eqonomize.github.io"
 changelog="https://raw.githubusercontent.com/Eqonomize/Eqonomize/master/ChangeLog"
 distfiles="https://github.com/Eqonomize/Eqonomize/releases/download/v${version}/${pkgname}-${version}.tar.gz"
-checksum=b3856aa4ecd25618a26a101ed5cf80bdf0973e64fe681b7e2353dfc959256688
+checksum=1972efad7afad7c516cae8ef65894a4f205f722ab039748b132212cf7e1a6d8d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends="qt5-charts-devel"
diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index f031b19ebee..3afb2833920 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,6 +1,6 @@
 # Template file for 'erlang'
 pkgname=erlang
-version=22.0.7
+version=22.1.3
 revision=1
 create_wrksrc=yes
 build_wrksrc="otp-OTP-${version}"
@@ -15,7 +15,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="http://www.erlang.org/"
 distfiles="https://github.com/erlang/otp/archive/OTP-${version}.tar.gz"
-checksum=04c090b55ec4a01778e7e1a5b7fdf54012548ca72737965b7aa8c4d7878c92bc
+checksum=53a828c1199a41cb54bd3bc6c2c49af977a8834e702c030a5ea34013a3fcacdd
 
 build_options="x11"
 
diff --git a/srcpkgs/eselect/template b/srcpkgs/eselect/template
index 0c84234daf7..e65a82933b1 100644
--- a/srcpkgs/eselect/template
+++ b/srcpkgs/eselect/template
@@ -1,17 +1,17 @@
 # Template file for 'eselect'
 pkgname=eselect
-version=1.4.14
+version=1.4.15
 revision=1
 archs=noarch
 build_style=gnu-configure
 hostmakedepends="automake libtool"
 depends="bash"
 short_desc="Modular configuration framework for Gentoo systems"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://wiki.gentoo.org/wiki/Project:Eselect"
 distfiles="https://gitweb.gentoo.org/proj/eselect.git/snapshot/eselect-${version}.tar.gz"
-checksum=0e1799f9fd4c9dbc421930b33a7705bfd0171d39092fa4cb323bd5c5798af663
+checksum=77fc8449f6ebc0026512a06d6429a8848058516efbbb4fa1193508a9b43398a3
 
 pre_configure() {
 	./autogen.bash
diff --git a/srcpkgs/etcd/template b/srcpkgs/etcd/template
index f2cbe6e5978..a115313af74 100644
--- a/srcpkgs/etcd/template
+++ b/srcpkgs/etcd/template
@@ -1,6 +1,6 @@
 # Template file for 'etcd'
 pkgname=etcd
-version=3.3.13
+version=3.3.15
 revision=1
 build_style=go
 short_desc="Distributed reliable key-value store"
@@ -11,7 +11,7 @@ go_import_path="github.com/coreos/etcd"
 go_package="${go_import_path} ${go_import_path}/etcdctl"
 homepage="https://coreos.com/etcd/docs/latest/"
 distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
-checksum=02df2eb25d67dafc355d19a91791f686fcf59b04cea46110c3a11fcd5e365100
+checksum=3da9bba24d1d4c434d39b8f603c0f481d5888c2a9b7600d3d2cd0cc5d58804e2
 conf_files="/etc/sv/etcd/conf"
 system_accounts="etcd"
 make_dirs="/var/lib/etcd 0755 etcd etcd"
diff --git a/srcpkgs/etcetera/template b/srcpkgs/etcetera/template
index a45f194810b..cfcb25f5b92 100644
--- a/srcpkgs/etcetera/template
+++ b/srcpkgs/etcetera/template
@@ -1,17 +1,17 @@
 # Template file for 'etcetera'
 pkgname=etcetera
-version=0.92
-revision=2
+version=1.0
+revision=1
 archs=noarch
-pycompile_version="$py3_ver"
-pycompile_dirs="usr/lib/etcetera"
 depends="python3"
 short_desc="Config file management with a touch of wisdom"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.com/jeancf/etcetera"
+pycompile_dirs="usr/lib/etcetera"
 distfiles="https://gitlab.com/jeancf/etcetera/-/archive/${version}/etcetera-${version}.tar.gz"
-checksum=83e553454aaf56edb71e300c415523724c5e9df4e29adba3523502ed3d7bf6fe
+checksum=3e4b7ff9095f6d311b12e30d745cc5d6b5c777f5daca7d01f7f1c46d273760c1
+pycompile_version="$py3_ver"
 conf_files="/etc/etcetera.conf"
 
 do_install() {
diff --git a/srcpkgs/ethtool/template b/srcpkgs/ethtool/template
index e1bee9ee0e9..23702d81012 100644
--- a/srcpkgs/ethtool/template
+++ b/srcpkgs/ethtool/template
@@ -1,6 +1,6 @@
 # Template file for 'ethtool'
 pkgname=ethtool
-version=5.2
+version=5.3
 revision=1
 build_style=gnu-configure
 short_desc="Utility for controlling network drivers and hardware"
@@ -8,4 +8,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="http://www.kernel.org/pub/software/network/ethtool/"
 distfiles="http://www.kernel.org/pub/software/network/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=665fd70841860d6cb974387e3ab97e0dde7745f95cb3ef35b98ef9aace137805
+checksum=f3dac0dbce7066af05fbe92812cc33a042d03fb00a45bcf9959f20455efe24c4
diff --git a/srcpkgs/eventviews/template b/srcpkgs/eventviews/template
index cc34479c69c..9b6cbc02cb2 100644
--- a/srcpkgs/eventviews/template
+++ b/srcpkgs/eventviews/template
@@ -1,7 +1,7 @@
 # Template file for 'eventviews'
 pkgname=eventviews
-version=19.08.0
-revision=1
+version=19.08.2
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kcoreaddons kconfig"
 makedepends="calendarsupport-devel kdiagram-devel"
@@ -10,7 +10,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=2f7713173b3820800d7927aff64eb7bcc84c643d9da43adbe6560cb842081295
+checksum=48da7f85c86bcc7a64d475c5bbcbb531471e70cfc9f4bda76030280f0671132d
 
 eventviews-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/evince/template b/srcpkgs/evince/template
index 0196ddc36a8..6e4ec3ecb97 100644
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@@ -1,7 +1,7 @@
 # Template file for 'evince'
 pkgname=evince
-version=3.32.0
-revision=2
+version=3.34.1
+revision=1
 build_helper="gir"
 build_style=gnu-configure
 configure_args="$(vopt_enable gir introspection) --disable-schemas-compile
@@ -19,7 +19,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Evince"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f0d977216466ed2f5a6de64476ef7113dc7c7c9832336f1ff07f3c03c5324c40
+checksum=85e407cde396147b249120d816c7715fb6df191ca561cf65ff3554a5d67626df
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index d781766e49a..5f7abc2ba3b 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,13 +1,13 @@
 # Template file for 'evolution-data-server'
 pkgname=evolution-data-server
-version=3.32.4
-revision=1
+version=3.34.1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_UOA=OFF
  $(vopt_if gir '-DENABLE_INTROSPECTION=ON -DENABLE_VALA_BINDINGS=ON' '-DENABLE_WEATHER=OFF')"
 hostmakedepends="flex glib-devel gperf intltool pkg-config libglib-devel
  $(vopt_if gir 'gobject-introspection')"
-makedepends="libcanberra-devel libgdata-devel $(vopt_if gir libgweather-devel)
+makedepends="boost-devel libcanberra-devel libgdata-devel $(vopt_if gir libgweather-devel)
  libical-devel libsecret-devel mit-krb5-devel $(vopt_if gir 'vala-devel') webkit2gtk-devel"
 depends="$(vopt_if gir libgweather) libsoup-gnome"
 short_desc="Centralized access to appointments and contacts"
@@ -16,7 +16,7 @@ license="LGPL-2.1-only"
 homepage="https://wiki.gnome.org/Apps/Evolution"
 changelog="https://raw.githubusercontent.com/GNOME/evolution-data-server/gnome-3-30/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=83f67cb4b680e892b22b51bcde64c788b7ac63e92a99de401fb347e3794f4c7f
+checksum=6ff56ba04cb639e627fe9d6e0ada106a10cadd68a0d53b8ec72b4e285df53abe
 
 build_options="gir"
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template
index 8d187a40d75..d96c66b7c19 100644
--- a/srcpkgs/evolution-ews/template
+++ b/srcpkgs/evolution-ews/template
@@ -1,6 +1,6 @@
 # Template file for 'evolution-ews'
 pkgname=evolution-ews
-version=3.32.1
+version=3.34.1
 revision=1
 build_style=cmake
 configure_args="-DLIBEXEC_INSTALL_DIR=/usr/lib/evolution"
@@ -12,4 +12,4 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Apps/Evolution"
 changelog="https://raw.githubusercontent.com/GNOME/evolution-ews/gnome-3-30/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0a6cf6d682060ed4bc7065d8320bc63022caa1885c5503d06b8087ae9eb284b0
+checksum=b7479de9eca74dfb99ba0303da830c4b9e21cba89e904ea6f5d158eaea3d5316
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index c29be1fa0b8..fc93468dded 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,7 +1,7 @@
 # Template file for 'evolution'
 pkgname=evolution
-version=3.32.4
-revision=1
+version=3.34.1
+revision=4
 build_style=cmake
 configure_args="-DENABLE_AUTOAR=OFF -DENABLE_LIBCRYPTUI=OFF -DENABLE_GTKSPELL=OFF
  -DENABLE_TEXT_HIGHLIGHT=OFF -DENABLE_PST_IMPORT=OFF
@@ -9,7 +9,7 @@ configure_args="-DENABLE_AUTOAR=OFF -DENABLE_LIBCRYPTUI=OFF -DENABLE_GTKSPELL=OF
 hostmakedepends="gnome-doc-utils gobject-introspection intltool itstool
  pkg-config"
 makedepends="NetworkManager-devel clutter-gtk-devel enchant2-devel
- evolution-data-server-devel gtkhtml-devel libcanberra-devel
+ evolution-data-server-devel gspell-devel gtkhtml-devel libcanberra-devel
  $(vopt_if gir libgweather-devel) libnotify-devel webkit2gtk-devel ytnef-devel
  gnome-desktop-devel"
 depends="gnome-keyring"
@@ -19,7 +19,7 @@ license="LGPL-2.1-or-later, LGPL-3.0-or-later, GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Evolution"
 changelog="https://raw.githubusercontent.com/GNOME/evolution/gnome-3-28/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=10af2af919bc0b5e7f6acbd1231ad573f6101ff095469613ce485b07c9ab1502
+checksum=656a92dd7f3e1afb6eef4f824fd17ae307c0904a67587ca5bb14ab9bd6f8bd42
 shlib_provides="libevolution-calendar.so libevolution-util.so libemail-engine.so
  libevolution-mail.so libevolution-shell.so"
 
diff --git a/srcpkgs/evtest/patches/0001-Add-missing-limits.h-include.patch b/srcpkgs/evtest/patches/0001-Add-missing-limits.h-include.patch
new file mode 100644
index 00000000000..88ccfc13fdd
--- /dev/null
+++ b/srcpkgs/evtest/patches/0001-Add-missing-limits.h-include.patch
@@ -0,0 +1,37 @@
+From 5eb4ab1c139ea38ebe6bb4acba08b09ee7d77d3c Mon Sep 17 00:00:00 2001
+From: Baruch Siach <baruch@tkos.co.il>
+Date: Sun, 18 Aug 2019 10:01:06 +0300
+Subject: [PATCH] Add missing limits.h include
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fixes build with musl libc that does not include limits.h indirectly via
+other headers.
+
+evtest.c: In function ‘scan_devices’:
+evtest.c:886:14: error: ‘PATH_MAX’ undeclared (first use in this function); did you mean  INT8_MAX’?
+   char fname[PATH_MAX];
+              ^~~~~~~~
+
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+---
+ evtest.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git evtest.c evtest.c
+index 37d4f85..548c203 100644
+--- evtest.c
++++ evtest.c
+@@ -56,6 +56,7 @@
+ #include <getopt.h>
+ #include <ctype.h>
+ #include <signal.h>
++#include <limits.h>
+ #include <sys/time.h>
+ #include <sys/types.h>
+ #include <unistd.h>
+-- 
+2.23.0
+
diff --git a/srcpkgs/evtest/template b/srcpkgs/evtest/template
index b5e0c956c7f..1feed55a9d6 100644
--- a/srcpkgs/evtest/template
+++ b/srcpkgs/evtest/template
@@ -1,7 +1,7 @@
 # Template file for 'evtest'
 pkgname=evtest
-version=1.33
-revision=2
+version=1.34
+revision=1
 build_style=gnu-configure
 hostmakedepends="automake"
 short_desc="Command line tool for displaying device input information"
@@ -9,7 +9,7 @@ maintainer="sen <ethan.k.shackelford@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.freedesktop.org/evtest/"
 distfiles="https://cgit.freedesktop.org/evtest/snapshot/evtest-${version}.tar.xz"
-checksum=928f6e81c73bd71ce88be03f7fdad204087a04dccd0250462106af0c2d813532
+checksum=e49f1f160b30c8f7c2a4caef5ab655f1caf816483d19fdedd6db2d251d7ab80e
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/exa/template b/srcpkgs/exa/template
index 998e0ef1b77..2a2af04ee57 100644
--- a/srcpkgs/exa/template
+++ b/srcpkgs/exa/template
@@ -6,7 +6,7 @@ build_style=cargo
 hostmakedepends="cmake"
 makedepends="libgit2-devel"
 short_desc="Modern replacement for ls"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://the.exa.website/"
 distfiles="https://github.com/ogham/exa/archive/v${version}.tar.gz"
diff --git a/srcpkgs/exec-on-git-staged/template b/srcpkgs/exec-on-git-staged/template
new file mode 100644
index 00000000000..4f41115f8d9
--- /dev/null
+++ b/srcpkgs/exec-on-git-staged/template
@@ -0,0 +1,16 @@
+# Template file for 'exec-on-git-staged'
+pkgname=exec-on-git-staged
+version=1.1.0
+revision=1
+archs=noarch
+depends="git"
+short_desc="Execute commands on staged tree"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/jcgruenhage/exec-on-git-staged"
+distfiles="https://github.com/jcgruenhage/exec-on-git-staged/archive/v${version}.tar.gz"
+checksum=c163104e8d9539bec253275fd32a4241717db0f502bb43654a52d70ba71b745d
+
+do_install() {
+	vbin exec-on-git-staged
+}
diff --git a/srcpkgs/execline/template b/srcpkgs/execline/template
index 154cf56a200..887045b728d 100644
--- a/srcpkgs/execline/template
+++ b/srcpkgs/execline/template
@@ -1,6 +1,6 @@
 # Template file for 'execline'
 pkgname=execline
-version=2.5.1.0
+version=2.5.2.0
 revision=1
 build_style=configure
 makedepends="skalibs-devel"
@@ -13,7 +13,7 @@ license="ISC"
 homepage="https://skarnet.org/software/execline/"
 changelog="https://skarnet.org/software/execline/upgrade.html"
 distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=b1a756842947488404db8173bbae179d6e78b6ef551ec683acca540ecaf22677
+checksum=280bb633cbe96088193225729ad32d80493d68380a127e6bc1789aac64375e29
 
 CFLAGS="-fPIC"
 
diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template
index d22bf6a2f65..e76784b1b23 100644
--- a/srcpkgs/exiftool/template
+++ b/srcpkgs/exiftool/template
@@ -1,6 +1,6 @@
 # Template file for 'exiftool'
 pkgname=exiftool
-version=11.62
+version=11.71
 revision=1
 archs=noarch
 wrksrc="Image-ExifTool-${version}"
@@ -14,4 +14,4 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://www.sno.phy.queensu.ca/~phil/exiftool/"
 changelog="https://sno.phy.queensu.ca/~phil/exiftool/history.html"
 distfiles="https://www.sno.phy.queensu.ca/~phil/exiftool/Image-ExifTool-${version}.tar.gz"
-checksum=60c11ca7ab19d069582dd950da97e4e574fea83b4c14175a5a2418d8942c4731
+checksum=5258817bea57e0eb76d6783acb387f01bb5212ecb27e9db722f3e7f16cf0b5b5
diff --git a/srcpkgs/exiv2/patches/musl.patch b/srcpkgs/exiv2/patches/musl.patch
deleted file mode 100644
index 7baa5ba2b64..00000000000
--- a/srcpkgs/exiv2/patches/musl.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/src/futils.cpp b/src/futils.cpp
-index a30acd9..24250fa 100644
---- src/futils.cpp
-+++ src/futils.cpp
-@@ -54,7 +54,7 @@
- #include <stdexcept>
- 
- #ifdef EXV_HAVE_STRERROR_R
--#ifdef _GNU_SOURCE
-+#if defined(_GNU_SOURCE) && defined(__GLIBC__)
- extern char *strerror_r(int errnum, char *buf, size_t n);
- #else
- extern int strerror_r(int errnum, char *buf, size_t n);
-@@ -348,7 +348,7 @@ namespace Exiv2 {
-         std::ostringstream os;
- #ifdef EXV_HAVE_STRERROR_R
-         const size_t n = 1024;
--#ifdef _GNU_SOURCE
-+#if defined(_GNU_SOURCE) && defined(__GLIBC__)
-         char *buf = 0;
-         char buf2[n];
-         std::memset(buf2, 0x0, n);
-
diff --git a/srcpkgs/exiv2/template b/srcpkgs/exiv2/template
index 7bd2e2be5db..90696f471ca 100644
--- a/srcpkgs/exiv2/template
+++ b/srcpkgs/exiv2/template
@@ -1,6 +1,6 @@
 # Template file for 'exiv2'
 pkgname=exiv2
-version=0.27.0
+version=0.27.2
 revision=1
 wrksrc="exiv2-${version}-Source"
 build_style=cmake
@@ -9,17 +9,18 @@ makedepends="zlib-devel expat-devel"
 short_desc="Image metadata manipulation"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="http://www.exiv2.org"
-distfiles="http://www.exiv2.org/releases/exiv2-${version}-Source.tar.gz"
-checksum=ee88bc81539b73c65010651785d094fad0b39760a424b3c16c17e1856cfef2d7
+homepage="https://www.exiv2.org"
+distfiles="https://www.exiv2.org/builds/exiv2-${version}-Source.tar.gz"
+checksum=2652f56b912711327baff6dc0c90960818211cf7ab79bb5e1eb59320b78d153f
 
 exiv2-devel_package() {
 	depends="${makedepends} ${sourcepkg}-${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
+		vmove usr/lib/cmake
 		vmove usr/lib/pkgconfig
-		vmove usr/lib/*.a
-		vmove usr/lib/*.so
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
 	}
 }
diff --git a/srcpkgs/expat/template b/srcpkgs/expat/template
index fe72ec47a9b..b26e9ee9a93 100644
--- a/srcpkgs/expat/template
+++ b/srcpkgs/expat/template
@@ -1,14 +1,14 @@
 # Template file for 'expat'
 pkgname=expat
-version=2.2.7
+version=2.2.9
 revision=1
 build_style=gnu-configure
 short_desc="XML parser library written in C"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="http://expat.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/expat/${pkgname}-${version}.tar.bz2"
-checksum=cbc9102f4a31a8dafd42d642e9a3aa31e79a0aedaa1f6efd2795ebc83174ec18
+checksum=f1063084dc4302a427dabcca499c8312b3a32a29b7d2506653ecc8f950a9a237
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/expect/template b/srcpkgs/expect/template
index cc157437666..66936f261e7 100644
--- a/srcpkgs/expect/template
+++ b/srcpkgs/expect/template
@@ -1,9 +1,10 @@
 # Template file for 'expect'
 pkgname=expect
 version=5.45.4
-revision=1
+revision=2
 wrksrc=${pkgname}${version}
 build_style=gnu-configure
+make_check_target="test"
 makedepends="tcl-devel"
 short_desc="Programmed dialogue with interactive programs"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -11,13 +12,18 @@ license="Public Domain"
 homepage="http://www.nist.gov/el/msid/expect.cfm"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/Expect/${version}/${pkgname}${version}.tar.gz"
 checksum=49a7da83b0bdd9f46d04a04deec19c7767bb9a323e40c4781f89caf760b92c34
-make_check_target="test"
 nocross=yes
 
+alternatives="
+ mkpasswd:mkpasswd:/usr/bin/expect-mkpasswd
+ mkpasswd:mkpasswd.1:/usr/share/man/man1/expect-mkpasswd.1"
+
 LDFLAGS+=" -Wl,-rpath=/usr/lib:/usr/lib/${pkgname}${version}"
 
 post_install() {
 	rm ${DESTDIR}/usr/bin/weather
+	mv ${DESTDIR}/usr/bin/{,expect-}mkpasswd
+	mv ${DESTDIR}/usr/share/man/man1/{,expect-}mkpasswd.1
 }
 expect-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/extra-cmake-modules/template b/srcpkgs/extra-cmake-modules/template
index acbc140778a..dace69919fe 100644
--- a/srcpkgs/extra-cmake-modules/template
+++ b/srcpkgs/extra-cmake-modules/template
@@ -1,6 +1,6 @@
 # Template file for 'extra-cmake-modules'
 pkgname=extra-cmake-modules
-version=5.61.0
+version=5.63.0
 revision=1
 archs=noarch
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <johnz@posteo.net>"
 license="BSD-3-Clause"
 homepage="https://projects.kde.org/projects/kdesupport/extra-cmake-modules"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a86a3b12c8a540af822131a8d65586d985267b1d642c29b4815b6c7870bc126c
+checksum=79926a0a2c6f5aa760a5a63209a7cad641476591b9bf4e51819f4fb752280792
 
 post_install() {
 	vlicense COPYING-CMAKE-SCRIPTS
diff --git a/srcpkgs/extrace/template b/srcpkgs/extrace/template
index 9d1d5a286e2..da7cf1f1bfb 100644
--- a/srcpkgs/extrace/template
+++ b/srcpkgs/extrace/template
@@ -1,8 +1,9 @@
 # Template file for 'extrace'
 pkgname=extrace
 version=0.7
-revision=2
+revision=3
 build_style=gnu-makefile
+depends="libcap-progs"
 short_desc="Trace exec(2) calls system-wide"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later, BSD-2-Clause"
diff --git a/srcpkgs/extractpdfmark/template b/srcpkgs/extractpdfmark/template
index e52abb050ae..c42abd61a87 100644
--- a/srcpkgs/extractpdfmark/template
+++ b/srcpkgs/extractpdfmark/template
@@ -1,7 +1,7 @@
 # Template file for 'extractpdfmark'
 pkgname=extractpdfmark
 version=1.1.0
-revision=4
+revision=5
 build_wrksrc=build
 build_style=gnu-configure
 configure_script="../configure"
diff --git a/srcpkgs/f2fs-tools/template b/srcpkgs/f2fs-tools/template
index 77b37d14ee2..84c7744a71d 100644
--- a/srcpkgs/f2fs-tools/template
+++ b/srcpkgs/f2fs-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'f2fs-tools'
 pkgname=f2fs-tools
-version=1.12.0
-revision=2
+version=1.13.0
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static ac_cv_file__git=yes"
 hostmakedepends="automake libtool pkg-config git"
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git"
 distfiles="https://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/${pkgname}-${version}.tar.gz"
-checksum=e2124e4dffaba865d41495d817bcb924d096adaec67ff777b8c7da99aa13f696
+checksum=b39d3ae9224267aab0070b5f17d91d0c5143f6d960166a27f6b11c8c87072c7d
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) makedepends+=" musl-legacy-compat"
diff --git a/srcpkgs/faketime/template b/srcpkgs/faketime/template
index 614743b1a8a..ba9acf87766 100644
--- a/srcpkgs/faketime/template
+++ b/srcpkgs/faketime/template
@@ -1,14 +1,14 @@
 # Template file for 'faketime'
 pkgname=faketime
-version=0.9.7
+version=0.9.8
 revision=1
+wrksrc=lib$pkgname-$version
 build_style=gnu-makefile
-short_desc="modifies the system time for a single application"
+short_desc="Modifies the system time for a single application"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-3"
+license="GPL-2.0-only"
 homepage="https://github.com/wolfcw/libfaketime"
 distfiles="https://github.com/wolfcw/libfaketime/archive/v$version.tar.gz"
-checksum=4d65f368b2d53ee2f93a25d5e9541ce27357f2b95e5e5afff210e0805042811e
+checksum=06288237cd5890eca148489e5b904ed852ed0ffa8424bfb479342f4daa8442a3
 CFLAGS='-fPIC -DPREFIX=\"/usr\" -DLIBDIRNAME=\"/lib/faketime\"'
 LDFLAGS='-lpthread'
-wrksrc=lib$pkgname-$version
diff --git a/srcpkgs/fastmod/template b/srcpkgs/fastmod/template
index 8bc8629d07f..2297553303f 100644
--- a/srcpkgs/fastmod/template
+++ b/srcpkgs/fastmod/template
@@ -1,6 +1,6 @@
 # Template file for 'fastmod'
 pkgname=fastmod
-version=0.2.5
+version=0.2.6
 revision=1
 build_style=cargo
 short_desc="Tool for partially automating codebase refactors"
@@ -8,4 +8,4 @@ maintainer="Adam Beckmeyer <adam_gpg@thebeckmeyers.xyz>"
 license="Apache-2.0"
 homepage="https://github.com/facebookincubator/fastmod"
 distfiles="https://github.com/facebookincubator/fastmod/archive/v${version}.tar.gz"
-checksum=fe90fb206a0e1081328423a68b931f2c381205366fcce7daee3e84c59023d629
+checksum=b70f615e883cc6cc235b62ee15ec2ec7ef4b04618b42fb79d8ee807440f6cf3c
diff --git a/srcpkgs/fatrace/template b/srcpkgs/fatrace/template
index ab39e67c22f..dae605bdd22 100644
--- a/srcpkgs/fatrace/template
+++ b/srcpkgs/fatrace/template
@@ -1,16 +1,15 @@
 # Template file for 'fatrace'
 pkgname=fatrace
-version=0.13
+version=0.14
 revision=1
 build_style=gnu-makefile
 short_desc="Report system wide file access events"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="http://launchpad.net/fatrace"
-distfiles="http://launchpad.net/fatrace/trunk/${version}/+download/${pkgname}-${version}.tar.bz2"
-checksum=7d8b0670896b10600c89caedeec52c26237260d5a20fdea7049cd97f57213043
+distfiles="http://launchpad.net/fatrace/trunk/${version}/+download/${pkgname}-${version}.tar.xz"
+checksum=d876999a801398e981e1a4d09b2259b92249fc55f05b31e60010deb27557bb8c
 
 post_extract() {
 	sed -i 's/sbin/bin/g' Makefile
-	sed -i 's/KERNEL_O_LARGEFILE 00100000/KERNEL_O_LARGEFILE 0/g' fatrace.c
 }
diff --git a/srcpkgs/fava/template b/srcpkgs/fava/template
index 83d3632fc58..24e66cac45b 100644
--- a/srcpkgs/fava/template
+++ b/srcpkgs/fava/template
@@ -1,6 +1,6 @@
 # Template file for 'fava'
 pkgname=fava
-version=1.10
+version=1.11
 revision=1
 archs=noarch
 build_style=python3-module
@@ -9,12 +9,18 @@ hostmakedepends="python3-setuptools"
 depends="python3-Babel python3-Cheroot python3-Flask-Babel python3-Flask
  python3-Jinja2 beancount python3-click python3-markdown2 python3-ply
  python3-simplejson"
+checkdepends="$depends"
 short_desc="Web interface for Beancount"
 maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"
 license="MIT"
 homepage="https://beancount.github.io/fava/"
 distfiles="${PYPI_SITE}/f/fava/fava-${version}.tar.gz"
-checksum=5207d0ee49f86b5f7520ea7d556e769321853bb8eaa760acc606e4f76d49a990
+checksum=0cfeb20e2082a64aae1cda76538a9cca9f5027a19ad174ad742fa2ec2aeed93f
+
+do_check() {
+	# CLI test expects fava on $PATH.  Not sure why static_url fails.
+	python3 -m pytest tests -k 'not cli and not static_url'
+}
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/fd/template b/srcpkgs/fd/template
index bf7396a727d..2094d0dd5f0 100644
--- a/srcpkgs/fd/template
+++ b/srcpkgs/fd/template
@@ -1,6 +1,6 @@
 # Template file for 'fd'
 pkgname=fd
-version=7.3.0
+version=7.4.0
 revision=1
 build_style=cargo
 short_desc="Simple, fast and user-friendly alternative to find"
@@ -8,7 +8,7 @@ maintainer="Jerry Tegno <jerrytegno@gmail.com>"
 license="Apache-2.0, MIT"
 homepage="https://github.com/sharkdp/fd"
 distfiles="https://github.com/sharkdp/fd/archive/v${version}.tar.gz"
-checksum=fbd48cc83c90a0ab09fc3bbe865708a3a528876a99f8304a17d07af7fb378170
+checksum=33570ba65e7f8b438746cb92bb9bc4a6030b482a0d50db37c830c4e315877537
 
 case "$XBPS_TARGET_MACHINE" in
 	aarch64-musl) broken="MAP_32BIT; not found in libc" ;;
diff --git a/srcpkgs/fdk-aac/template b/srcpkgs/fdk-aac/template
index 43076213592..05db31c4647 100644
--- a/srcpkgs/fdk-aac/template
+++ b/srcpkgs/fdk-aac/template
@@ -1,6 +1,6 @@
 # Template file for 'fdk-aac'
 pkgname=fdk-aac
-version=2.0.0
+version=2.0.1
 revision=1
 build_style=gnu-configure
 short_desc="Fraunhofer FDK AAC codec library"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Fraunhofer FDK AAC Codec license"
 homepage="http://www.iis.fraunhofer.de/en/ff/amm/impl/fdkaaccodec.html"
 distfiles="${SOURCEFORGE_SITE}/opencore-amr/${pkgname}-${version}.tar.gz"
-checksum=f7d6e60f978ff1db952f7d5c3e96751816f5aef238ecf1d876972697b85fd96c
+checksum=840133aa9412153894af03b27b03dde1188772442c316a4ce2a24ed70093f271
 
 post_install() {
 	vlicense NOTICE LICENSE
diff --git a/srcpkgs/fetchmail/patches/patch-socket_c.diff b/srcpkgs/fetchmail/patches/patch-socket_c.diff
deleted file mode 100644
index 6f92aef0258..00000000000
--- a/srcpkgs/fetchmail/patches/patch-socket_c.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-$OpenBSD: patch-socket_c,v 1.9 2015/08/25 17:44:09 jca Exp $
-
-Fixed upstream
-
-  https://gitlab.com/fetchmail/fetchmail/commit/a2ae6f8d15d7caf815d7bdd13df833fd1b2af5cc
-
---- socket.c.orig	Fri Jul 17 22:01:09 2015
-+++ socket.c	Fri Jul 17 22:19:47 2015
-@@ -914,7 +914,12 @@ int SSLOpen(int sock, char *mycert, char *mykey, const
- 			return -1;
- #endif
- 		} else if(!strcasecmp("ssl3",myproto)) {
-+#if HAVE_DECL_SSLV3_CLIENT_METHOD + 0 > 0
- 			_ctx[sock] = SSL_CTX_new(SSLv3_client_method());
-+#else
-+			report(stderr, GT_("Your operating system does not support SSLv3.\n"));
-+			return -1;
-+#endif
- 		} else if(!strcasecmp("tls1",myproto)) {
- 			_ctx[sock] = SSL_CTX_new(TLSv1_client_method());
- 		} else if (!strcasecmp("ssl23",myproto)) {
diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template
index 45e8c1efa2a..706d3b4fa0e 100644
--- a/srcpkgs/fetchmail/template
+++ b/srcpkgs/fetchmail/template
@@ -1,15 +1,15 @@
 # Template file for 'fetchmail'
 pkgname=fetchmail
-version=6.3.26
-revision=15
+version=6.4.1
+revision=1
 build_style=gnu-configure
 configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="python-devel"
 makedepends="libressl-devel"
 depends="python"
-short_desc="A remote-mail retrieval utility"
+short_desc="Remote-mail retrieval utility"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="http://fetchmail.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=79b4c54cdbaf02c1a9a691d9948fcb1a77a1591a813e904283a8b614b757e850
+checksum=3f33f11dd08c3e8cc3e9d18eec686b1626d4818f4d5a72791507bbc4dce6a9a0
diff --git a/srcpkgs/ffcall/template b/srcpkgs/ffcall/template
index 62b9560e70d..874a2344a71 100644
--- a/srcpkgs/ffcall/template
+++ b/srcpkgs/ffcall/template
@@ -1,6 +1,6 @@
 # Template file for 'ffcall'
 pkgname=ffcall
-version=2.1
+version=2.2
 revision=1
 wrksrc="libffcall-${version}"
 build_style=gnu-configure
@@ -9,7 +9,7 @@ maintainer="Martin Riese <grauehaare@gmx.de>"
 license="GPL-2.0-or-later"
 homepage="https://www.gnu.org/software/libffcall"
 distfiles="${GNU_SITE}/libffcall/libffcall-${version}.tar.gz"
-checksum=a091fb8bbabf17c94a2dae2d41161b96a08ab92b5f75d3364157a2c34d538c47
+checksum=ebfa37f97b6c94fac24ecf3193f9fc829517cf81aee9ac2d191af993d73cb747
 
 # won't work with parallel_build so just turn it off (thanks to JuanRP for the Hint)
 disable_parallel_build=yes
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index f38a74a5e71..01287fc19a3 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -1,7 +1,7 @@
 # Template file for 'ffmpeg'
 # audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
 pkgname=ffmpeg
-version=4.2
+version=4.2.1
 revision=1
 short_desc="Decoding, encoding and streaming software"
 maintainer="Johannes <johannes.brechtmann@gmail.com>"
@@ -9,7 +9,7 @@ license="GPL-3.0-or-later"
 homepage="https://www.ffmpeg.org"
 changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog"
 distfiles="${homepage}/releases/ffmpeg-${version}.tar.xz"
-checksum=023f10831a97ad93d798f53a3640e55cd564abfeba807ecbe8524dac4fedecd5
+checksum=cec7c87e9b60d174509e263ac4011b522385fd0775292e1670ecc1180c9bb6d4
 
 hostmakedepends="pkg-config perl yasm"
 makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel
@@ -21,10 +21,11 @@ makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-deve
  $(vopt_if vdpau libvdpau-devel) $(vopt_if v4l2 v4l-utils-devel) libbs2b-devel
  libvidstab-devel $(vopt_if faac faac-devel) $(vopt_if fdk_aac fdk-aac-devel)
  $(vopt_if vpx libvpx-devel) $(vopt_if aom libaom-devel)
- $(vopt_if nvenc nv-codec-headers) $(vopt_if sndio sndio-devel)"
+ $(vopt_if nvenc nv-codec-headers) $(vopt_if sndio sndio-devel)
+ $(vopt_if dav1d libdav1d-devel)"
 
-build_options="x265 v4l2 vaapi vdpau vpx faac fdk_aac aom nvenc sndio pulseaudio"
-build_options_default="x265 v4l2 vpx sndio pulseaudio"
+build_options="x265 v4l2 vaapi vdpau vpx faac fdk_aac aom nvenc sndio pulseaudio dav1d"
+build_options_default="x265 v4l2 vpx sndio pulseaudio dav1d"
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*) build_options_default+=" vaapi vdpau nvenc";;
@@ -74,7 +75,8 @@ do_configure() {
 		$(vopt_if x265 '--enable-libx265' '--disable-libx265') \
 		$(vopt_if v4l2 '--enable-libv4l2' '--disable-libv4l2') \
 		$(vopt_enable aom libaom) $(vopt_enable vaapi) $(vopt_enable vdpau) \
-		--enable-libbs2b --enable-avresample --enable-libvidstab
+		--enable-libbs2b --enable-avresample --enable-libvidstab \
+		$(vopt_if dav1d '--enable-libdav1d')
 }
 do_build() {
 	rm ${XBPS_WRAPPERDIR}/strip
diff --git a/srcpkgs/ffmpegthumbnailer/template b/srcpkgs/ffmpegthumbnailer/template
index 9fd2f4ec011..ab627032c2e 100644
--- a/srcpkgs/ffmpegthumbnailer/template
+++ b/srcpkgs/ffmpegthumbnailer/template
@@ -1,7 +1,7 @@
 # Template file for 'ffmpegthumbnailer'
 pkgname=ffmpegthumbnailer
-version=2.2.0
-revision=4
+version=2.2.2
+revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="libpng-devel libjpeg-turbo-devel ffmpeg-devel"
@@ -11,15 +11,12 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/dirkvdb/${pkgname}"
 distfiles="${homepage}/releases/download/${version}/${pkgname}-${version}.tar.bz2"
-checksum=e5c31299d064968198cd378f7488e52cd5e738fac998eea780bc77d7f32238c2
+checksum=1cb24059c38223f657b300c84dd80491b7040d4b69471c4fea69be862bc99b5b
 
-CXXFLAGS="-D_GLIBCXX_USE_C99_STDIO=1 -D_GLIBCXX_USE_C99_STDLIB=1"
-
-post_configure() {
-	# Patch wrong man1 path
-	sed -e 's;DESTINATION "/usr/man/man1";DESTINATION "/usr/share/man/man1";' \
-		-i ${wrksrc}/build/cmake_install.cmake
+post_install() {
+	vinstall dist/ffmpegthumbnailer.thumbnailer 644 usr/share/thumbnailers
 }
+
 ffmpegthumbnailer-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
diff --git a/srcpkgs/ffmpegthumbs/template b/srcpkgs/ffmpegthumbs/template
index 870aca2b770..ed00015b1bc 100644
--- a/srcpkgs/ffmpegthumbs/template
+++ b/srcpkgs/ffmpegthumbs/template
@@ -1,6 +1,6 @@
 # Template file for 'ffmpegthumbs'
 pkgname=ffmpegthumbs
-version=19.04.3
+version=19.08.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,4 +12,4 @@ maintainer="Michael Straube <straubem@gmx.de>"
 license="GPL-2.0-or-later"
 homepage="${KDE_SITE}/applications"
 distfiles="${KDE_SITE}/applications/${version}/src/ffmpegthumbs-${version}.tar.xz"
-checksum=ddd6cb3388c1af96a14d611de9575f6f6c22c6acfe52e63e44b746709ac8024b
+checksum=deba57ff10525efdf404401f6b605c1be0f02ec0bfe00465e080b42dc379d570
diff --git a/srcpkgs/ffsend/template b/srcpkgs/ffsend/template
index c897b5f2e8d..3b9af5402a2 100644
--- a/srcpkgs/ffsend/template
+++ b/srcpkgs/ffsend/template
@@ -1,6 +1,6 @@
 # Template file for 'ffsend'
 pkgname=ffsend
-version=0.2.49
+version=0.2.52
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
@@ -10,4 +10,4 @@ maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/timvisee/ffsend"
 distfiles="https://github.com/timvisee/ffsend/archive/v${version}.tar.gz"
-checksum=3f39dd5f8be525904f4486228fcd51c7f3c0263e23eba096d6f6ceb71e6d73f5
+checksum=b5fd937604eeccd85d7b30d8510784d95497c2412da29c586430275db55043ef
diff --git a/srcpkgs/ffuf/template b/srcpkgs/ffuf/template
new file mode 100644
index 00000000000..9ba257e4a61
--- /dev/null
+++ b/srcpkgs/ffuf/template
@@ -0,0 +1,16 @@
+# Template file for 'ffuf'
+pkgname=ffuf
+version=0.10
+revision=1
+build_style=go
+go_import_path="github.com/ffuf/ffuf"
+short_desc="Fast web fuzzer"
+maintainer="Andrew Benson <abenson+void@gmail.com>"
+license="MIT"
+homepage="https://github.com/ffuf/ffuf"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=7efbedace2798dd970a801ed2ede6ef41ef48414140efda71f8018e7df23edf3
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/fierce/template b/srcpkgs/fierce/template
new file mode 100644
index 00000000000..86dedb39ad2
--- /dev/null
+++ b/srcpkgs/fierce/template
@@ -0,0 +1,15 @@
+# Template file for 'fierce'
+pkgname=fierce
+version=1.3.0
+revision=1
+archs=noarch
+build_style=python3-module
+pycompile_module="fierce"
+hostmakedepends="python3-setuptools"
+depends="python3-dnspython"
+short_desc="DNS reconnaissance tool"
+maintainer="Andrew Benson <abenson+void@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/mschwager/fierce"
+distfiles="${homepage}/archive/${version}.tar.gz"
+checksum=ca6938c6ecb2cb3ff0484ee3d90566e044bf35c30237e921d439310fa6cb788b
diff --git a/srcpkgs/figurine/template b/srcpkgs/figurine/template
index 522e604fe6f..bef430fa4ba 100644
--- a/srcpkgs/figurine/template
+++ b/srcpkgs/figurine/template
@@ -1,7 +1,7 @@
 # Template file for 'figurine'
 pkgname=figurine
-version=0.3.0
-revision=2
+version=1.0.1
+revision=1
 build_style=go
 go_import_path=github.com/arsham/figurine
 hostmakedepends="git"
@@ -10,4 +10,4 @@ maintainer="travankor <travankor@tuta.io>"
 license="Apache-2.0"
 homepage="https://github.com/arsham/figurine"
 distfiles="https://github.com/arsham/figurine/archive/v${version}.tar.gz"
-checksum=beea08f1bfcf2d5875dfaa948b43772304f552945a5a299910117b4208280488
+checksum=5af66e90009dae130b8e75678d038ba770b46b8488bff975f5f0f52c0e928bd6
diff --git a/srcpkgs/file-roller/template b/srcpkgs/file-roller/template
index 278635cab95..837fdb7a7af 100644
--- a/srcpkgs/file-roller/template
+++ b/srcpkgs/file-roller/template
@@ -1,6 +1,6 @@
 # Template file for 'file-roller'
 pkgname=file-roller
-version=3.32.1
+version=3.32.2
 revision=1
 build_style=meson
 hostmakedepends="glib-devel itstool pkg-config"
@@ -12,4 +12,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/FileRoller"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1cab0847845b3236725a99f81a638c504d06ac0576c7a947824208e498383547
+checksum=c60a79e0baf74cb1c09a1c8f5ffe0d6e311227ca14ecc5b1156beb3715341a71
diff --git a/srcpkgs/filelight/template b/srcpkgs/filelight/template
index 42571cfc632..23a704a1ed8 100644
--- a/srcpkgs/filelight/template
+++ b/srcpkgs/filelight/template
@@ -1,17 +1,14 @@
 # Template file for 'filelight'
 pkgname=filelight
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules kcoreaddons"
+hostmakedepends="extra-cmake-modules kcoreaddons kdoctools
+ qt5-host-tools qt5-qmake"
 makedepends="kparts-devel qt5-devel"
 short_desc="Interactive map that helps visualize disk usage on your computer"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://utils.kde.org/projects/filelight/"
 distfiles="${KDE_SITE}/applications/${version}/src/filelight-${version}.tar.xz"
-checksum=bdd3d32f6666b3d2fa4c614f5f058571c8849484e1ba17a97996680503f8e8e6
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" kconfig kdoctools python qt5-host-tools qt5-qmake"
-fi
+checksum=313ff23fceb427509b37efa012535e651618d42bde35c62cdc7732e463c346a6
diff --git a/srcpkgs/filezilla/template b/srcpkgs/filezilla/template
index aca479c816f..c6de4dde1c3 100644
--- a/srcpkgs/filezilla/template
+++ b/srcpkgs/filezilla/template
@@ -1,6 +1,6 @@
 # Template file for 'filezilla'
 pkgname=filezilla
-version=3.44.2
+version=3.45.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-manualupdatecheck --disable-autoupdatecheck
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later"
 homepage="https://filezilla-project.org"
 changelog="https://svn.filezilla-project.org/filezilla/FileZilla3/trunk/NEWS?view=co"
 distfiles="https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2"
-checksum=5d4d20105859cee72be3ac171e844080f58031f5f96ee483bf86d6bfbc09deb6
+checksum=889c08a7247f05507ca4bd76f4e2cd0e0504deb1815c7a2a28d8cfbdaa9d1ec2
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wxWidgets-gtk3-devel xdg-utils"
diff --git a/srcpkgs/findutils/patches/gnulib-freadahead.patch b/srcpkgs/findutils/patches/gnulib-freadahead.patch
deleted file mode 100644
index 5d8e5af28bf..00000000000
--- a/srcpkgs/findutils/patches/gnulib-freadahead.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gl/lib/freadahead.c
-+++ gl/lib/freadahead.c
-@@ -30,7 +30,7 @@ extern size_t __sreadahead (FILE *);
- size_t
- freadahead (FILE *fp)
- {
--#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-   if (fp->_IO_write_ptr > fp->_IO_write_base)
-     return 0;
-   return (fp->_IO_read_end - fp->_IO_read_ptr)
diff --git a/srcpkgs/findutils/patches/gnulib-fseeko.patch b/srcpkgs/findutils/patches/gnulib-fseeko.patch
deleted file mode 100644
index 6d4c75ac737..00000000000
--- a/srcpkgs/findutils/patches/gnulib-fseeko.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- gl/lib/fseeko.c
-+++ gl/lib/fseeko.c
-@@ -47,7 +47,7 @@ fseeko (FILE *fp, off_t offset, int whence)
- #endif
- 
-   /* These tests are based on fpurge.c.  */
--#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-   if (fp->_IO_read_end == fp->_IO_read_ptr
-       && fp->_IO_write_ptr == fp->_IO_write_base
-       && fp->_IO_save_base == NULL)
-@@ -123,7 +123,7 @@ fseeko (FILE *fp, off_t offset, int whence)
-           return -1;
-         }
- 
--#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-       fp->_flags &= ~_IO_EOF_SEEN;
-       fp->_offset = pos;
- #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
-
diff --git a/srcpkgs/findutils/patches/gnulib-mountlist.patch b/srcpkgs/findutils/patches/gnulib-mountlist.patch
deleted file mode 100644
index bb58385a69a..00000000000
--- a/srcpkgs/findutils/patches/gnulib-mountlist.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- gl/lib/mountlist.c
-+++ gl/lib/mountlist.c
-@@ -37,6 +37,12 @@
- # include <sys/param.h>
- #endif
- 
-+#if MAJOR_IN_MKDEV
-+# include <sys/mkdev.h>
-+#elif MAJOR_IN_SYSMACROS
-+# include <sys/sysmacros.h>
-+#endif
-+
- #if defined MOUNTED_GETFSSTAT   /* OSF_1 and Darwin1.3.x */
- # if HAVE_SYS_UCRED_H
- #  include <grp.h> /* needed on OSF V4.0 for definition of NGROUPS,
diff --git a/srcpkgs/findutils/patches/gnulib-stdio-impl.patch b/srcpkgs/findutils/patches/gnulib-stdio-impl.patch
deleted file mode 100644
index e054879d577..00000000000
--- a/srcpkgs/findutils/patches/gnulib-stdio-impl.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- gl/lib/stdio-impl.h
-+++ gl/lib/stdio-impl.h
-@@ -18,6 +18,12 @@
-    the same implementation of stdio extension API, except that some fields
-    have different naming conventions, or their access requires some casts.  */
- 
-+/* Glibc 2.28 made _IO_IN_BACKUP private.  For now, work around this
-+   problem by defining it ourselves.  FIXME: Do not rely on glibc
-+   internals.  */
-+#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN
-+# define _IO_IN_BACKUP 0x100
-+#endif
- 
- /* BSD stdio derived implementations.  */
diff --git a/srcpkgs/findutils/template b/srcpkgs/findutils/template
index d2e6737291f..2155bdd80bd 100644
--- a/srcpkgs/findutils/template
+++ b/srcpkgs/findutils/template
@@ -1,16 +1,16 @@
 # Template file for 'findutils'
 pkgname=findutils
-version=4.6.0
-revision=4
+version=4.7.0
+revision=1
 bootstrap=yes
 build_style=gnu-configure
 configure_args="--program-prefix=g"
-short_desc="The GNU Find Utilities"
+short_desc="GNU Find Utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="http://www.gnu.org/software/findutils"
-distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=ded4c9f73731cd48fec3b6bdaccce896473b6d8e337e9612e16cf1431bb1169d
+distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
+checksum=c5fefbdf9858f7e4feb86f036e1247a54c79fc2d8e4b7064d5aaa1f47dfa789a
 
 alternatives="
  xargs:xargs:/usr/bin/gxargs
diff --git a/srcpkgs/fio/template b/srcpkgs/fio/template
index 540c8d4584a..74f9a2b02c6 100644
--- a/srcpkgs/fio/template
+++ b/srcpkgs/fio/template
@@ -1,6 +1,6 @@
 # Template file for 'fio'
 pkgname=fio
-version=3.15
+version=3.16
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=configure
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/axboe/fio"
 distfiles="https://github.com/axboe/${pkgname}/archive/${pkgname}-${version}.tar.gz"
-checksum=c0c0e40e770abcd5ab013af4bd8b16dfa83645145871063939db2a14270e2545
+checksum=c7731a9e831581bab7104da9ea60c9f44e594438dbe95dff26726ca0285e7b93
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*|ppc64*) makedepends+=" libnuma-devel"
diff --git a/srcpkgs/firebird3/template b/srcpkgs/firebird3/template
index f163475c253..1adc010439f 100644
--- a/srcpkgs/firebird3/template
+++ b/srcpkgs/firebird3/template
@@ -42,6 +42,13 @@ CFLAGS="-fno-strict-aliasing"
 CXXFLAGS="-fno-delete-null-pointer-checks"
 
 pre_configure() {
+	# musl does not have gcrt1.o needed for -p
+	case "$XBPS_TARGET_MACHINE" in
+		ppc*-musl)
+			sed -i '/FLAGS=/s/ \-p / /g' builds/posix/prefix.linux_powerpc*
+			;;
+	esac
+
 	# Avoid errors telling we are not 'root' and
 	# do not change ownership to root:root and
 	# do not change permissions to read-only
diff --git a/srcpkgs/firefox-esr-i18n-as b/srcpkgs/firefox-esr-i18n-bn
similarity index 100%
rename from srcpkgs/firefox-esr-i18n-as
rename to srcpkgs/firefox-esr-i18n-bn
diff --git a/srcpkgs/firefox-esr-i18n-bn-BD b/srcpkgs/firefox-esr-i18n-en-CA
similarity index 100%
rename from srcpkgs/firefox-esr-i18n-bn-BD
rename to srcpkgs/firefox-esr-i18n-en-CA
diff --git a/srcpkgs/firefox-esr-i18n-bn-IN b/srcpkgs/firefox-esr-i18n-ia
similarity index 100%
rename from srcpkgs/firefox-esr-i18n-bn-IN
rename to srcpkgs/firefox-esr-i18n-ia
diff --git a/srcpkgs/firefox-esr-i18n-en-ZA b/srcpkgs/firefox-esr-i18n-ne-NP
similarity index 100%
rename from srcpkgs/firefox-esr-i18n-en-ZA
rename to srcpkgs/firefox-esr-i18n-ne-NP
diff --git a/srcpkgs/firefox-esr-i18n-mai b/srcpkgs/firefox-esr-i18n-oc
similarity index 100%
rename from srcpkgs/firefox-esr-i18n-mai
rename to srcpkgs/firefox-esr-i18n-oc
diff --git a/srcpkgs/firefox-esr-i18n-or b/srcpkgs/firefox-esr-i18n-or
deleted file mode 120000
index 0707c37f205..00000000000
--- a/srcpkgs/firefox-esr-i18n-or
+++ /dev/null
@@ -1 +0,0 @@
-firefox-esr-i18n
\ No newline at end of file
diff --git a/srcpkgs/firefox-esr-i18n-ml b/srcpkgs/firefox-esr-i18n-ur
similarity index 100%
rename from srcpkgs/firefox-esr-i18n-ml
rename to srcpkgs/firefox-esr-i18n-ur
diff --git a/srcpkgs/firefox-esr-i18n/files/update-lang-list b/srcpkgs/firefox-esr-i18n/files/update-lang-list
new file mode 120000
index 00000000000..d6e91286846
--- /dev/null
+++ b/srcpkgs/firefox-esr-i18n/files/update-lang-list
@@ -0,0 +1 @@
+../../firefox-i18n/files/update-lang-list
\ No newline at end of file
diff --git a/srcpkgs/firefox-esr-i18n/template b/srcpkgs/firefox-esr-i18n/template
index 8c43a8ace7c..b4e17fb16f0 100644
--- a/srcpkgs/firefox-esr-i18n/template
+++ b/srcpkgs/firefox-esr-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-esr-i18n'
 pkgname=firefox-esr-i18n
-version=60.8.0
+version=68.1.0
 revision=1
 build_style=meta
 homepage="https://www.mozilla.org/firefox/"
@@ -19,13 +19,11 @@ _languages=(
 	'af     "Afrikaans"'
 	'an     "Aragonese"'
 	'ar     "Arabic"'
-	'as     "Assamese"'
 	'ast    "Asturian"'
 	'az     "Azerbaijani"'
 	'be     "Belarusian"'
 	'bg     "Bulgarian"'
-	'bn-BD  "Bengali (Bangladesh)"'
-	'bn-IN  "Bengali (India)"'
+	'bn     "Bengali"'
 	'br     "Breton"'
 	'bs     "Bosnian"'
 	'ca     "Catalan"'
@@ -36,9 +34,9 @@ _languages=(
 	'de     "German"'
 	'dsb    "Lower Sorbian"'
 	'el     "Greek"'
+	'en-CA  "English (Canada)"'
 	'en-GB  "English (British)"'
 	'en-US  "English (US)"'
-	'en-ZA  "English (South African)"'
 	'eo     "Esperanto"'
 	'es-AR  "Spanish (Argentina)"'
 	'es-CL  "Spanish (Chile)"'
@@ -62,6 +60,7 @@ _languages=(
 	'hsb    "Upper Sorbian"'
 	'hu     "Hungarian"'
 	'hy-AM  "Armenian"'
+	'ia     "Interlingua"'
 	'id     "Indonesian"'
 	'is     "Icelandic"'
 	'it     "Italian"'
@@ -75,16 +74,15 @@ _languages=(
 	'lij    "Ligurian"'
 	'lt     "Lithuanian"'
 	'lv     "Latvian"'
-	'mai    "Maithili"'
 	'mk     "Macedonian"'
-	'ml     "Malayalam"'
 	'mr     "Marathi"'
 	'ms     "Malay"'
 	'my     "Burmese"'
 	'nb-NO  "Norwegian (Bokmål)"'
+	'ne-NP  "Nepali"'
 	'nl     "Dutch"'
 	'nn-NO  "Norwegian (Nynorsk)"'
-	'or     "Oriya"'
+	'oc     "Occitan"'
 	'pa-IN  "Punjabi"'
 	'pl     "Polish"'
 	'pt-BR  "Portuguese (Brazilian)"'
@@ -104,6 +102,7 @@ _languages=(
 	'th     "Thai"'
 	'tr     "Turkish"'
 	'uk     "Ukrainian"'
+	'ur     "Urdu"'
 	'uz     "Uzbek"'
 	'vi     "Vietnamese"'
 	'xh     "Xhosa"'
@@ -136,97 +135,96 @@ _pkgtmpl() {
 	}
 }
 
-checksum="ff8a0e5081e1bf6f1794ea47dab8f32f5b28580c423bccc149e16f4749e36c50
- eb86ab716a1d6a32bd102952f3ac13b7708ac9fdb947e72e0f66891f872c1cb0
- beb35664f371716cebd1a4a4c84b44129c381a1dc9a38dea19684fd5f15e407c
- 25e8cdd8d22a1073143e2c88e5d3c4d96b505edbe9c18bf29fb5fbf4c68db620
- 7a05659ee866abc198bd55169b189f8e1f4daa1259b28bef78918ee0e84ed669
- 610f0c658af4d93eb7d70a459317323845a641b229f1dd42c4ee66ee660067d9
- 021d5f86239831892335f8d4b434bff3e129b774588e8b49758b3ff97534b055
- b3d75d79148ef5000aaca5d6948e09dcc43673f9d51a91bd21c51eaee34a4bf0
- 6481896744f2a0e596f425de2590ab78e153463a8bd16fc9398bb0e6a2278f3c
- a03b62fe0dba6a9aaf080505299d632dec7eb98d2973c42b53330ec25695d9c7
- db332375bf0224ac90a0aec2475c70d0262f52a0f856ef5d244ba7ab8d89bb90
- ff234f75fe294bf4278d7976a7c44815f5aa9e981e9742fb322f19726a38dcbc
- 5f0d36853f12f5fc3d8a85874718bcef77103903cb732c370b4e301dffb38a51
- 6b336951b07e1dd63472027d7603439ee5384b3f6a814c7be34d0cdeac1bd4d0
- 21e196147819aab031a733a4ad78b4c67d77120cd8976e7aa0b364823a3beb01
- 4edbad866270ef310932149188d4e4b0d786abc22db3196430d9db9b9113e992
- 0acf0db94b5e56fd81c14a763e2b4dd32c10f21824464195e30adc7ed9e4c021
- 440ac13c8d241d537c7de382a10ca1da1716cc302dc200ac5039ac43efcfd8a6
- bb7fc4aeffeca0c89a2ba33a7c762f4764cd70334f74cfa5d4b51fc4449aabed
- feebf56ff307f191ebd2af9990840db9e3e447c0cfbdea3219320b108838202a
- 9ced74783c6e21ae934243b3558ba1ecbe2858b6cfe57a031389d4c91b4887dc
- 958ff950724abf9c593685991246325ff6d04f73ea9c518dcefe24e289770c9e
- d8f5ef61b8a2bbe021fef63d09cb8e83a848a8100331acecdd70c47cf0cf9d43
- db9f3432a6a364791e0c4c8e47516c60182a0640a8ef795e24b7fc2465c7a7b3
- 7558f05cc6319ef57cf54a176b41bb9ac6d4650de9099998d3d4ad83163d07cf
- 8f8ef308c6c5d06f20feae2e4f6b29aa0db271f1a91f1d3ad097aa7a51948384
- 987c9758f4a71bd3e7602cfd977a611fe28d58ae28f324ba1325382958735aa7
- 1ac4c54b7ed0bc407711c589328d192b1b49a4b23417d294bd3608bbc5f40581
- 71d5f764c000ad31f252fa36a94d6a178b552c1a9e4815ae883e7c490ed4d401
- 74441cfbfdbd111ab87318598dd4a3c8aaa4c4db2b86a12bc6cf41fa05881ea8
- 43bffe371b4cb25f21bf767f618631a96b24e72a658a72759f4bb6a06bc5bf32
- 50fa12cc74afb9faca4ebb8ae47d2e22756f4cae70e3c8169fbf0f568dc64fc8
- 85e3332ce6656d8df3a492ed837192df3991aab1314c1c5ef25a67bf61360cbf
- a3dadeaca0193cb249b087b165e1d6fbbd322cf06485a7cf1a35c090b4adeb31
- 55cbc207ea34d61519f48946c077cc9dfa17d24eed5310f58838af289ea0b60f
- 31c6f72f72743a4b085eb699627a3917e92531066388343a40ffc6412277027a
- 38f1b0d8091f864256464cec0e7f78f474020feb7c4748b84160c6e074088b60
- cf2c4efce1203eb8c8f8a984b90c61672cfe9a6d05da3cfecee52e12189301a0
- ca8e8da872f5053cfa15d8395d8f10a66794589833714538b0c67fd83c340466
- c15707031179223c545a4299306b3df107ded62b685363a5e3274e318b88f219
- c1699a128003f23ef5662919ed1b33c5d61caf914985e39853df29a1ba35828c
- 3fb4a2283723b2ef3709c88baeb99e77bbba33c9e835c2dfedf28c6b2ecad2fa
- 344b3b3149aa3b77f10f49b86a76c6ff0179043048093c541944058f620e8845
- b43880065a4a92aeff823e4913eabe953e88cafb9cd414b2f616475cd7af69af
- 94b414e2f89f030c131742de0d9ba48f13b16b40e06dd568c10cea417b57b5ba
- 177ca8c3883d9c5d7e4a84b79dbc7b64e430fabaa247b0cee78f9ef65e2b5aa0
- a2a071c6e3604287a99e78042b34d02d4d91b27d3b23b9ea90945da7d9456012
- ae57f94246c078f8e2d4b8c297b281115bb008a811bf2a783278deb916007da4
- a222763e7d2d5eda8a15869f85c19765111841a2ccf4d18993eb83f20bdf4933
- 7771989dad60a20756517a6f696d939039cf5f10aa47d271e2ff5c465bd7b4c0
- 389b3c1b09e744c8fe843e3784088ea72214571b975ea9d69aaeb7c4264a990b
- d5fea97921089f0b4a6a8667ddf19a430eca78223118818480a202e563088943
- 617b9daf4d828bc66fc8061601adc9c40b25f1338c5f527d9fbf83dfa3e8770b
- 87d2ec6cadb2a61909888af5cc80a4dacd64493d82d0282679ba3c597918fb07
- 1afe05f69af9bc0b0e37d1c6d0942073349b173433a41a83b3a732e6fa026511
- 68b80d99dc3ff2c2828622cdf7d21c32e6f00904a239eef3f5eedb8fb8476386
- 853ec1ad7ef319a60586902c5b3dec73e0800c7af2d94e44b549d4f03f114fd7
- d0c9e3dfd07994ebf26d4ad98ef997cb62c90c07f9d0e70c8b2f7771f39b1b95
- f5b14095e891af078ef256460a41b19e00fbcd81eba66e0331af8bc096288963
- bec28861d16cf418fa06d650765c3be8fbc02b69b41b079d3907bb01c3d8096a
- b042d80a54dbc7cd0fdf24ba3599404632d84635ae73204235dbf66ef7a35a26
- 7b791bfc3bd843a291d74d86f88c0a5a31af13d9da9f135841fd7859c442f733
- f12eb8be3a7ef93146c161f6ba02b9d9b892b792d0c190adb92398802f5365fe
- 49addce322b6020d69b65f72ee4e82a140cd0e712c647127f6fac5b66e6f51b5
- acdc9ae4ae7397ade4c4053dc3b1f22ef42cc844bf853e5e846d1f6b0c5d5cab
- 02ac07e226734f1f693283784816b3c96a48b4e592c676673901104c5dcc72b2
- b102cf97790415b804182743426e8eb1304675fb4bf360e64ae9055cce87b2f1
- f8988dfc783c4b39d8a3a44e1000c6376bc211ab6297a49eddf5194b71fdfbde
- 58cad897f3bd51b9a1fcb7d4e4d3fc6bac47e5b2d4c6c19096732556eaec1314
- 23af8e26632da7c5d791a8891295eb2a83cde54390d9cd17692525f6e32ff6ed
- 0d38ca007291146731793d1a2c7e07bad2d2ed82668dfbd5be14daacf7abdce7
- a5957711b3fd9665dd2fed5fdbbb0a2fcbce54ad43ccd6800ddf7ccf5be731e5
- fcc2580a8ab3e95d23af7ee373a9bfcdce52e2a5ce59bb59d1ba1dca75772239
- bc3a8480ff73c752cc1cbfa80c327b155b194553c3568534b9d20f7e2176df1e
- 196abc6109092f326b387f5cffad880e5b6a857203127cf1f76622ca5a823ad2
- 002109cec6f2e40fb4ffc07b04c72a8debd128357925e8d51e5a84614004a086
- 83be2c2c9f9c93c0c31c5d30c0e6fdef3df2381f7c62c64a8313066f64c98b0f
- c7c83b2c405c432c3de1c187cfc800025502b1931e07ff1108648e77279441ab
- 8156b74896fd7b69fc306f90f1fd5291316d3c9b4c5ab4df620cab8d782b466e
- 27ff153a51f800ea9620042acc47aad6b2392c3551a4be30e982652ef89fcdf2
- abbbd74fb4e2ce5cfb254837c8383c9cca637bbdfd05d403526a50b08806c050
- 0c6ada2d7bf26be43d4f3fa8f37581a1f1a3113c3399ebd328736802dbe7623f
- b8c50654545a923e7ad7ef43bb1f2ea56b845b3443ffa0410b9bb7a6be9b8b91
- 4e49460bd3cd763e9527c771c4030237700e2eb73a359fefce3bd2146db7d56e
- 82bab7b006ab019d2bf2d6b3ed9aa85796f8dc1f827ed7350b0286dbd19bbc78
- 9b6adcd828ed3c2bb4950df6a2634bc943768b3d852e2e258e52c7e2da7a5ca7
- ccd0aa23ba2662e766e2adcab201076dfdcfc5cf288e4c4bbeff6d0d3c451abb
- f3709e35f5d4d317733f943aec9e977fd83acc1eaa9a35cf149dbf05e345146c
- 282d60e14be013a29ba09611f7ebe37d1fa5fe6dd8e441a1f10270d4e10323d6
- 742960a8b13cab9901267237accfcbcded21018aff9b6fc1bfd0ab37b7c8b607
- 0ae68434908b9512c46f22a6f3149b0f611f77306887a7641527d5df55725517
- 432353f98d29dbec0bc0eb50f0316220f155dee755ea0b4cb45b0636a0fcffde
- 8c1bbca429dd81d9180639ed1e526892908d26c1784f5f9c37093577b82d25fe
- c9651a78d2d2395711d320f6fac1ffd37048d4bffc544a2f2e182cedd237d090"
+checksum="c3fafda87192d9b98dc9b2b99d62b7109dbd72f73e8d5de1ea2a418ed086317b
+ 93af0702aae30332eecdc0f407dc29080923660508018fca14fe1307fdf375a1
+ a40baf64e7376e4916fa96d7199bad099edc7e897d65b5ecc4a2dc9fdbba2e75
+ 1e915f6a0860f2f7f583a70a5668ec5033969fbba177c3d3da4e244d01ba5cb4
+ d6c45490cec27609f43fb9af406ba15e25fff544f10d038e650a5b25d2ba5a69
+ 2b5d84d3f7800d162b095d0ee77da8264af9eac3a98dfff7e14b26510c92be1e
+ f317a73af579bbb42bc6635900e5b529f5198daaf54c5a7f51756b7707747444
+ 6e65702a500ef4d2841eacbd9e16ca692d25a9aa3fcf38be2603657bfb03a80d
+ 7b056d739b64407e92a6738c8e3a5f6fe070380196c057d3f832be4015e7957c
+ 6bdd5ab6efd06bd384e227d78de6cffeac4c828ce6254d152e0137c70eb7b2e9
+ b60364c109f3fe94387bfb27258c65c09b7761248e309adb8f92eda0c6c1dddb
+ 3b91a27432306a6152f6cee7b19d684476c4282743259eb0e5f90db6483216e6
+ a17149908edf9a173b9d7ca3eac644cf45cd0e35ba40c565903ea9af9580e41e
+ b404f670ce1f3cc7fbdb170e9f0286e0a7608d779c5dae83ce5adee911876e6d
+ b41236a8ce2e96edf02165bd1ad91de967d8605ed7a9c77f079027ea0b13a7cf
+ 1f444a10561108bdfb98d43531c33d377a2565763d1299c96ef3c1f746b10555
+ f15e57588ccdf2a6be3b51fba066dc030e2808071b29957c3da844b272d1dd25
+ d51b8bdbc415fcdf5df587e364b8a3edb6296a988c38dbfb0fbec40b5dec856e
+ bcfbd612f55efff2dc98cdf9ff6ddf3d8e91274ead7d8d8bf1023cb28b815623
+ f711d9206635ac98b3eec788791089d1a64316dc55ad4be2f6043acca79317b8
+ a48efe9f0a885060fe2844ae056fb9de8932e45cfda399959ff8a4f54c99dc3f
+ c919c3557a66188ea7ab58210f6fe629f5e111bd73c0f94f298e4635c21b5f05
+ edf74a83a03f85dfb2172053cf1816736fdfb4c42fbacdf4626b128186fb15db
+ 76bc68c806add52aa205f9f6a55dd6c141ecfaa29ce5b63fe06cb8bf1ce0c567
+ af3763e63550893a001a651c5d89e4bb529004de98d58f2dc2a49336239171bf
+ 979725bd9b1b8aade54e0e24efdc2c716381130559615f45c007f0d68a0b0b69
+ db96fd8658bc75f4813ddaf457c888e3f0656dc407b12d7799dbdebb7cc1a9ae
+ ba5e81b435217c15e2d55a42d34e3313e9ad1302b34599a25b48a23846dfc920
+ fd3988b0ddcfa721fd702c126dd531f5b77f1f5af8ac61e8b23307c5b84e8e72
+ a58a245d30efb8ad6553166dd2469da504d6cf3c773e52da15c3677899f37c4e
+ 3fd377be34a8786a726a13c88d28b2b73155b1f527b2909e6841474631ce8226
+ 790af48c82bf520bcd8f915af77d1e0c8f156ae6c028b1fa0f39c3c991865d1c
+ 46b8071a1e23d8c5af1ced98cfbdb1a2258f679425434e092fbe1c42dfa26066
+ a4eefa1ff84e33059d055c984dbb47283d117cb63ad9e39d7cc4c4e61ea9c11a
+ 5a91be294ac35aac472c4ba8324221551abb2e8cb66f995806606c191dca0428
+ 9a4a582673dc466a684fd2beacbe77a152047e6023b1e247f5eda7b513e5e30d
+ 039af250c8b2dc6254b2f24975704095406c70090de9d21ecc73975d8d874675
+ 3c77fd2a4cfc49ff94994b46a9b80ea24e534299838dd64a11a5dc2ef110f901
+ feaeb14a016d732b3ec0be6266bd078fdf220c48c38683a4dd7315e076839b82
+ a4756471f45168ff28fdc0e87c65b33288ca1f7fd2eedb7e31a726ee4766fb3c
+ 4eb62cbed52d1cdad08551a38d1f7656c71ef986df49eee0381e9aec7b11c0ba
+ 8e967ef8ff1f1a2fc21ea537d629d40a38d6b8789ce344e79d7a3b3b78138968
+ e008e241c41900d6df1128d5dd55d41e1ed43d7c60d48329a321716968397b09
+ 7011776c661b07bc3fd7d24b62765aeee10ba2a72ea4112862989f759aceb466
+ 760c44d1512be5f10264d195785e45d47c46595ef57c24de81c070a81ba65456
+ 531ec7550a9ab4e2410e9c69495852eaa0e7df43e022ed7ec0f0c50e148a4506
+ c46413f7aa225147712fb634483f64c9368f43d03ba6f66405e4c9dc281421b4
+ 42debde9c9341fc910ff382e94fade233b3ad23e4f474d89426648c659a99a12
+ 50f1088649f77e0f83dffe3e81dd8ac993d1d8f06d8f231acdf98a69cda9147a
+ 2a4f6162bfbf5ea44c832c0d5896079b0ce69e590dc377e3bbd37a92f9780e6c
+ 60aa95eb50d59ddb2bf57d5cfacf860d4cc2c8b86a219f35ceaa30d82fd6e593
+ 73a416254d022b051bb38ebf085772c031ecba18ab4896634ba8599fcb396f7b
+ ae3aa802087754458465af30a4ddafc8baa08e101a4e177b144b4f606a78b941
+ 30c7498935e0d4529ccbe3a5c7671aec9505d0132cd6123f97c0680c80cbb917
+ 99b76ac0f7cf4c5d5ae8b66ae3e54e3932c6a6f101aba8b156cf8d78a67e3f0b
+ 1bcb69081c99b27781c81becce86baaf2f1da54ceba009904ad2a5a8614eaa68
+ bb3152472d5582b365722a83972b416d78b8bddfc6dbea40d1c778c37eb86623
+ 426115a07ce25b7d2ae89024bf81e8b5957df9d8709bd6e5c1da704633af3c85
+ 24918b9cd56f5fe12c7e02b0cedcdaf2abeeb7ec3cdb75a4aee3ca2d4aaaa961
+ 8497c47c4f151966538836b0dfa312a044d8496ffc4647fcf62c8ed19b2337d9
+ e160dd5b88f37562d7cbace3f46b8fd8edc5b9211f4240d8e38aec3dd81d915d
+ 298ab33911b8c425e6032eba867bc31925ea24b2457298bbf965bd6b194edc3f
+ 4c53367e4ddcff92733a95139baf9610390bf3eaf78ef5a5d10b4530c359e8eb
+ f340c62b77eaaa6bde0e61944c508b32785619ad4ca54b7dfbf281fcb986eac0
+ 99201be46e35f22312a27da2a2afc54f46043342a1c577fa64696ef365198329
+ 41e4d2d255435d2b50a8e0c4c59b13a0a0aafae925cd32e20bf9005cd066d11e
+ 266141c6c9a6729da904dfa040ae20d80a6b5c39efc31fcf2d039ed65e9c2b28
+ 33daee0ac659ec7d1fb1cb101798dae2ed0077653fc9170bcbb5bc554ee3e433
+ 23b74270aef1c6a4bff5194103a430e6854fe4c460e5c684769bd7c59d1afa0d
+ 9405687dbb0a81e8be8f842824f2fe65830b70a0dd0dcde84cc8a21d6637f841
+ 40a608e720136044f4b95728474fcb82764e61d649551be438e330b63753635f
+ 0ef710447a36e81a6c86b17ee28d2cf463242834936af2578074df6e11c2baea
+ 3f0d0d33abda068465d7747149cdf11a4b1dc819f7da7f1f7a3d9c2a45307231
+ 9d2c3438776531077e379e97a449e714882896c53dbb87052de7e7ac77ea3d67
+ de9b4ec945265f5539025fb73b713322924da2d1a51b5bd6ad1baba4584c76e1
+ 7b66c7d5e1b9eb6959295a76416271220e84ecc43a97a5f5f07ec99986579cb1
+ 4404f5fe56868f5c551208d72630b91a88c68f78d7463e8e1d221fd7406c0783
+ 3f55ec2730a870951759961c83d6654c7122a3114e136a6e2bce7c05d6062d89
+ 873819bc254911aa3a443d0a9db306b472f7f31af8d986d54c535bce67a4b1c0
+ 07326e95015601946706f50333c32b0919025376abcdf88dc225dae2c167b19a
+ bfdd58d9f0f0e809e6b801f65c722c61b4dbb5e6635cecd7390d1403f1dd6f42
+ 8c2d716291a28cc64f93078d2bdf8d756a6521e3b0107815788c48452eac95f0
+ 9b07735b4d8e8359e38d671ed054b373c4ed50a232013807d09ca4fae31e8223
+ 5592ee66611515f8583a48211d70764fdb28c54b1ad4de5b4b87a9d3b101a182
+ d36e2c9a894beb94b62855bd07d4b54e41fc96c0736b5e2e702422e75b3cf21e
+ caf7dd282fb6dc065eb6a0c124cd458716d877a500c094ff650c4d40302dd49e
+ 80bd3c70433f6b3aacdbd370b70d4fe0eab13547d1f6368b80eb5c28a759141a
+ 67b359947cbe15b2be1ad2567d74a36cfe5f27665a058b0fab19ed37ddd63a30
+ b3347d5cec7f9f6e3aa4b5ccdd49350fd0879c20938bfc22664782c377dd73a6
+ 79b512427977c359ec8f93e4880cd5397ccddb013676d2d39837f06433fe4041
+ 883d5daa5b041778b0984a7e86ecfc4892af1aed1ec09285ac031e335075524c
+ bc1981c7cb2e6d5aecec7fb0f370c1da52895f00d238c1afa2b4e31b93580eb6
+ 6278e5c054f50d3de62de9d070d21d2842d4d0ff9212d852af8eb672fad7ecea"
diff --git a/srcpkgs/firefox-esr/files/mozconfig b/srcpkgs/firefox-esr/files/mozconfig
index 5b3c6e46d6f..0798fdd40ef 100644
--- a/srcpkgs/firefox-esr/files/mozconfig
+++ b/srcpkgs/firefox-esr/files/mozconfig
@@ -1,11 +1,6 @@
 ac_add_options --prefix=/usr
 ac_add_options --libdir=/usr/lib
 
-ac_add_options --with-pthreads
-# XXX build without system cairo see:
-# - https://github.com/voidlinux/void-packages/issues/2308#issuecomment-135426813
-# - https://bugs.gentoo.org/show_bug.cgi?id=558150
-# ac_add_options --with-system-cairo
 ac_add_options --with-system-nspr
 ac_add_options --with-system-nss
 ac_add_options --with-system-bz2
@@ -39,7 +34,6 @@ ac_add_options --disable-install-strip
 ac_add_options --disable-strip
 ac_add_options --disable-profiling
 ac_add_options --enable-optimize="$CFLAGS"
-ac_add_options --enable-pie
 
 ac_add_options --enable-official-branding
 ac_add_options --enable-application=browser
diff --git a/srcpkgs/firefox-esr/patches/disable-image-format-warning.patch b/srcpkgs/firefox-esr/patches/disable-image-format-warning.patch
new file mode 100644
index 00000000000..bd56e6bc37c
--- /dev/null
+++ b/srcpkgs/firefox-esr/patches/disable-image-format-warning.patch
@@ -0,0 +1,15 @@
+Imported from Adélie. Firefox is prone to this warning on BE and
+it leads to huge .xsession-errors, and the warning is not very
+important or meaningful, so just disable it.
+
+--- gfx/2d/HelpersCairo.h
++++ gfx/2d/HelpersCairo.h
+@@ -147,7 +147,7 @@
+     case SurfaceFormat::R5G6B5_UINT16:
+       return CAIRO_FORMAT_RGB16_565;
+     default:
+-      gfxCriticalError() << "Unknown image format " << (int)format;
++      //gfxCriticalError() << "Unknown image format " << (int)format;
+       return CAIRO_FORMAT_ARGB32;
+   }
+ }
diff --git a/srcpkgs/firefox-esr/patches/fix-arm-opus-include.patch b/srcpkgs/firefox-esr/patches/fix-arm-opus-include.patch
new file mode 100644
index 00000000000..6e0c5875da3
--- /dev/null
+++ b/srcpkgs/firefox-esr/patches/fix-arm-opus-include.patch
@@ -0,0 +1,11 @@
+--- media/libopus/silk/arm/arm_silk_map.c.orig	2019-03-19 20:55:01.249609964 +0100
++++ media/libopus/silk/arm/arm_silk_map.c	2019-03-19 20:55:25.769400255 +0100
+@@ -28,7 +28,7 @@
+ # include "config.h"
+ #endif
+
+-#include "main_FIX.h"
++#include "../fixed/main_FIX.h"
+ #include "NSQ.h"
+ #include "SigProc_FIX.h"
+
diff --git a/srcpkgs/firefox-esr/patches/fix-i686-musl.patch b/srcpkgs/firefox-esr/patches/fix-i686-musl.patch
index 5345a3cd3df..6df609bbf16 100644
--- a/srcpkgs/firefox-esr/patches/fix-i686-musl.patch
+++ b/srcpkgs/firefox-esr/patches/fix-i686-musl.patch
@@ -9,12 +9,3 @@
       ((defined(__GNUC__) && (defined(__i386) || defined(PPC))) || \
        defined(HAVE__UNWIND_BACKTRACE)))
  #define MOZ_STACKWALK_SUPPORTS_LINUX 1
-@@ -911,7 +911,7 @@
- }
- 
- // {x86, ppc} x {Linux, Mac} stackwalking code.
--#if ((defined(__i386) || defined(PPC) || defined(__ppc__)) && \
-+#if defined(__GLIBC__) && ((defined(__i386) || defined(PPC) || defined(__ppc__)) && \
-      (MOZ_STACKWALK_SUPPORTS_MACOSX || MOZ_STACKWALK_SUPPORTS_LINUX))
- 
- MFBT_API bool
diff --git a/srcpkgs/firefox-esr/patches/fix-toolkit.patch b/srcpkgs/firefox-esr/patches/fix-toolkit.patch
index ce4d7d01f82..86e8ef47855 100644
--- a/srcpkgs/firefox-esr/patches/fix-toolkit.patch
+++ b/srcpkgs/firefox-esr/patches/fix-toolkit.patch
@@ -47,18 +47,28 @@
  #include <a.out.h>
  #endif
 
+--- toolkit.orig/mozapps/update/common/updatedefines.h	2019-01-29 11:34:36.416804577 +0100
++++ toolkit/mozapps/update/common/updatedefines.h	2019-01-29 11:34:59.193583777 +0100
+@@ -102,7 +102,7 @@
 
+ #  ifdef SOLARIS
+ #    include <sys/stat.h>
+-#  else
++#  elif !(defined(__linux__)) || defined(__GLIBC__)
+ #    include <fts.h>
+ #  endif
+ #  include <dirent.h>
 --- toolkit.orig/mozapps/update/updater/updater.cpp	2014-03-15 05:19:37.000000000 +0000
 +++ toolkit/mozapps/update/updater/updater.cpp	2014-04-17 10:24:33.796765327 +0000
-@@ -3432,6 +3432,7 @@
- int add_dir_entries(const NS_tchar *dirpath, ActionList *list)
- {
+@@ -3978,6 +3978,7 @@
+ 
+ int add_dir_entries(const NS_tchar* dirpath, ActionList* list) {
    int rv = OK;
 +#if !defined(__linux__) || defined(__GLIBC__)
-   FTS *ftsdir;
-   FTSENT *ftsdirEntry;
-   NS_tchar searchpath[MAXPATHLEN];
-@@ -3534,6 +3535,7 @@
+   FTS* ftsdir;
+   FTSENT* ftsdirEntry;
+   mozilla::UniquePtr<NS_tchar[]> searchpath(get_full_path(dirpath));
+@@ -4085,6 +4086,7 @@
    }
  
    fts_close(ftsdir);
@@ -66,14 +76,3 @@
  
    return rv;
  }
---- toolkit/mozapps/update/common/updatedefines.h	2019-01-24 18:31:42.000000000 +0100
-+++ -	2019-01-31 11:15:53.946747750 +0100
-@@ -100,7 +100,7 @@
- 
- #ifdef SOLARIS
- #include <sys/stat.h>
--#else
-+#elif !defined(__linux__) || defined(__GLIBC__)
- #include <fts.h>
- #endif
- #include <dirent.h>
diff --git a/srcpkgs/firefox-esr/patches/fix-tools.patch b/srcpkgs/firefox-esr/patches/fix-tools.patch
index 1e2fc4f7d39..0ed043fb5b5 100644
--- a/srcpkgs/firefox-esr/patches/fix-tools.patch
+++ b/srcpkgs/firefox-esr/patches/fix-tools.patch
@@ -1,33 +1,24 @@
---- tools/profiler/core/platform.h
-+++ tools/profiler/core/platform.h
-@@ -29,6 +29,8 @@
- #ifndef TOOLS_PLATFORM_H_
- #define TOOLS_PLATFORM_H_
-
-+#include <sys/types.h>
-+
- #include <stdint.h>
- #include <math.h>
- #include "MainThreadUtils.h"
---- tools/profiler/lul/LulElf.cpp	2019-01-24 18:31:42.000000000 +0100
-+++ -	2019-01-31 11:19:53.198257189 +0100
-@@ -460,9 +460,9 @@
+--- tools/profiler/lul/LulElf.cpp.orig	2019-01-29 12:05:34.223834130 +0100
++++ tools/profiler/lul/LulElf.cpp	2019-01-29 12:08:02.480400845 +0100
+@@ -469,10 +469,10 @@
+ // Return the non-directory portion of FILENAME: the portion after the
  // last slash, or the whole filename if there are no slashes.
  string BaseFileName(const string& filename) {
-   // Lots of copies!  basename's behavior is less than ideal.
+-  // Lots of copies!  basename's behavior is less than ideal.
 -  char* c_filename = strdup(filename.c_str());
 -  string base = basename(c_filename);
 -  free(c_filename);
-+  const char* c_filename = filename.c_str();
++  // basename's behavior is less than ideal so avoid it
++  const char *c_filename = filename.c_str();
 +  const char *p = strrchr(c_filename, '/');
 +  string base = p ? p+1 : c_filename;
    return base;
  }
  
---- tools/profiler/core/platform-linux-android.cpp	2019-01-24 18:31:43.000000000 +0100
-+++ -	2019-01-31 11:23:07.911772317 +0100
+--- tools/profiler/core/platform-linux-android.cpp.orig	2019-01-29 12:09:40.980448579 +0100
++++ tools/profiler/core/platform-linux-android.cpp	2019-01-29 12:11:09.689590967 +0100
 @@ -253,7 +253,11 @@
-
+ 
    // Request profiling signals.
    struct sigaction sa;
 +#if defined(GP_ARCH_arm)
@@ -38,7 +29,7 @@
    sigemptyset(&sa.sa_mask);
    sa.sa_flags = SA_RESTART | SA_SIGINFO;
    if (sigaction(SIGPROF, &sa, &mOldSigprofHandler) != 0) {
-@@ -497,8 +497,10 @@
+@@ -497,8 +501,10 @@
  ucontext_t sSyncUContext;
  
  void Registers::SyncPopulate() {
diff --git a/srcpkgs/firefox-esr/patches/fix-wasm-arm.patch b/srcpkgs/firefox-esr/patches/fix-wasm-arm.patch
new file mode 100644
index 00000000000..e6ad61c9f44
--- /dev/null
+++ b/srcpkgs/firefox-esr/patches/fix-wasm-arm.patch
@@ -0,0 +1,15 @@
+--- js/src/wasm/WasmSignalHandlers.cpp
++++ js/src/wasm/WasmSignalHandlers.cpp
+@@ -243,9 +243,9 @@
+ // If you run into compile problems on a tier-3 platform, you can disable the
+ // emulation here.
+ 
+-#if defined(__linux__) && defined(__arm__)
+-#  define WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS
+-#endif
++// #if defined(__linux__) && defined(__arm__)
++// #  define WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS
++// #endif
+ 
+ #ifdef WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS
+ #  include <sys/user.h>
diff --git a/srcpkgs/firefox-esr/patches/fix-webrtc-arm.patch b/srcpkgs/firefox-esr/patches/fix-webrtc-arm.patch
deleted file mode 100644
index 222be5f9e21..00000000000
--- a/srcpkgs/firefox-esr/patches/fix-webrtc-arm.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- media/webrtc/trunk/webrtc/system_wrappers/source/cpu_features.cc	2019-01-24 18:31:10.000000000 +0100
-+++ -	2019-02-01 00:13:35.690776711 +0100
-@@ -67,7 +67,7 @@
-   return 0;
- }
- 
--#if !defined(ANDROID)
-+#if !defined(ANDROID) && !defined(__linux__)
- #ifdef WEBRTC_ARCH_ARM_V7
- uint64_t WebRtc_GetCPUFeaturesARM(void) {
-   return kCPUFeatureARMv7
diff --git a/srcpkgs/firefox-esr/patches/fix-webrtc-glibcisms.patch b/srcpkgs/firefox-esr/patches/fix-webrtc-glibcisms.patch
index 3ff2570b12b..cf895dd8448 100644
--- a/srcpkgs/firefox-esr/patches/fix-webrtc-glibcisms.patch
+++ b/srcpkgs/firefox-esr/patches/fix-webrtc-glibcisms.patch
@@ -1,18 +1,15 @@
---- media/webrtc/trunk/webrtc/system_wrappers/source/cpu_features_linux.c	2019-02-01 00:49:18.472382771 +0100
-+++ -	2019-02-01 00:50:25.928007236 +0100
-@@ -11,7 +11,10 @@
- #include <stdlib.h>
- #include <string.h>
- #include <features.h>
+--- media/webrtc/trunk/webrtc/system_wrappers/source/cpu_features_linux.c.orig	2019-01-29 11:20:52.298793223 +0100
++++ media/webrtc/trunk/webrtc/system_wrappers/source/cpu_features_linux.c	2019-01-29 11:21:48.250250850 +0100
+@@ -14,7 +14,7 @@
+ #ifndef __GLIBC_PREREQ
+ #define __GLIBC_PREREQ(a, b) 0
+ #endif
 -#if __GLIBC_PREREQ(2, 16)
-+#ifndef __GLIBC_PREREQ
-+#define __GLIBC_PREREQ(a, b) 0
-+#endif
 +#if !__GLIBC__ || __GLIBC_PREREQ(2, 16)
  #include <sys/auxv.h>
  #else
  #include <fcntl.h>
-@@ -29,7 +32,7 @@
+@@ -32,7 +32,7 @@
    int architecture = 0;
    unsigned long hwcap = 0;
    const char* platform = NULL;
diff --git a/srcpkgs/firefox-esr/patches/fix-xpcom.patch b/srcpkgs/firefox-esr/patches/fix-xpcom.patch
deleted file mode 100644
index 38dd582d96b..00000000000
--- a/srcpkgs/firefox-esr/patches/fix-xpcom.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xpcom/base/nsMemoryReporterManager.cpp.orig	2015-12-16 11:53:14.211144456 +0100
-+++ xpcom/base/nsMemoryReporterManager.cpp	2015-12-16 11:55:26.859476381 +0100
-@@ -46,7 +46,7 @@ using namespace mozilla;
- #  include "mozmemory.h"
- #endif  // MOZ_MEMORY
- 
--#if defined(XP_LINUX)
-+#if defined(XP_LINUX) && defined(__GLIBC__)
- 
- #include <malloc.h>
- #include <string.h>
diff --git a/srcpkgs/firefox/patches/fix-musl.patch b/srcpkgs/firefox-esr/patches/gettid-musl.patch
similarity index 100%
rename from srcpkgs/firefox/patches/fix-musl.patch
rename to srcpkgs/firefox-esr/patches/gettid-musl.patch
diff --git a/srcpkgs/firefox-esr/patches/mallinfo.patch b/srcpkgs/firefox-esr/patches/mallinfo.patch
index c9a38d45bdf..afea86c0a2c 100644
--- a/srcpkgs/firefox-esr/patches/mallinfo.patch
+++ b/srcpkgs/firefox-esr/patches/mallinfo.patch
@@ -1,18 +1,34 @@
---- xpcom/base/nsMemoryReporterManager.cpp
-+++ xpcom/base/nsMemoryReporterManager.cpp
-@@ -153,6 +153,7 @@ ResidentUniqueDistinguishedAmount(int64_t* aN)
+--- xpcom/base/nsMemoryReporterManager.cpp.orig	2019-03-19 17:12:20.844810044 +0100
++++ xpcom/base/nsMemoryReporterManager.cpp	2019-03-19 17:13:32.505133615 +0100
+@@ -123,6 +123,7 @@
    return GetProcSelfSmapsPrivate(aN);
  }
  
 +#ifdef __GLIBC__
- #define HAVE_SYSTEM_HEAP_REPORTER 1
- nsresult
- SystemHeapSize(int64_t* aSizeOut)
-@@ -172,6 +173,7 @@ SystemHeapSize(int64_t* aSizeOut)
-     *aSizeOut = size_t(info.hblkhd) + size_t(info.uordblks);
-     return NS_OK;
+ #  ifdef HAVE_MALLINFO
+ #    define HAVE_SYSTEM_HEAP_REPORTER 1
+ static MOZ_MUST_USE nsresult SystemHeapSize(int64_t* aSizeOut) {
+@@ -142,6 +143,7 @@
+   return NS_OK;
  }
-+#endif
+ #  endif
++#endif // __GLIBC__
  
- #elif defined(__DragonFly__) || defined(__FreeBSD__) \
-     || defined(__NetBSD__) || defined(__OpenBSD__) \
+ #elif defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || \
+     defined(__OpenBSD__) || defined(__FreeBSD_kernel__)
+@@ -642,6 +644,7 @@
+   return NS_OK;
+ }
+ 
++#ifdef __GLIBC__
+ #  define HAVE_SYSTEM_HEAP_REPORTER 1
+ // Windows can have multiple separate heaps. During testing there were multiple
+ // heaps present but the non-default ones had sizes no more than a few 10s of
+@@ -698,6 +701,7 @@
+   *aSizeOut = heapsSize;
+   return NS_OK;
+ }
++#endif // __GLIBC__
+ 
+ struct SegmentKind {
+   DWORD mState;
diff --git a/srcpkgs/firefox-esr/patches/ppc-no-static-sizes.patch b/srcpkgs/firefox-esr/patches/ppc-no-static-sizes.patch
deleted file mode 100644
index 3f77023bb5f..00000000000
--- a/srcpkgs/firefox-esr/patches/ppc-no-static-sizes.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-# HG changeset patch
-# Parent b735e618c2a860972197942f6680c941e3c9a67f
-# User Gustavo Luiz Duarte <gustavold@linux.vnet.ibm.com>
-Bug 997353 - Do not use compile-time page size for PowerPC.
-
-The PowerPC architecture allows various memory page sizes, making it impossible
-to predict the runtime page size.
-
---- memory/build/mozjemalloc.cpp
-+++ memory/build/mozjemalloc.cpp
-@@ -369,7 +369,7 @@
- // Debug builds are opted out too, for test coverage.
- #ifndef MOZ_DEBUG
- #if !defined(__ia64__) && !defined(__sparc__) && !defined(__mips__) &&         \
--  !defined(__aarch64__)
-+  !defined(__aarch64__) && !defined(__powerpc__) && !defined(__powerpc64__)
- #define MALLOC_STATIC_PAGESIZE 1
- #endif
- #endif
diff --git a/srcpkgs/firefox-esr/patches/remove-rustc-check.patch b/srcpkgs/firefox-esr/patches/remove-rustc-check.patch
index f6bebc8aab1..84077f4fc88 100644
--- a/srcpkgs/firefox-esr/patches/remove-rustc-check.patch
+++ b/srcpkgs/firefox-esr/patches/remove-rustc-check.patch
@@ -1,8 +1,19 @@
 Mozilla rustc check does not support crossbuild: let's remove it
+Remove calls to unwrap_rustup, they fail if rustup isn't present
 
---- build/moz.configure/rust.configure	2018-10-01 16:28:31.000000000 +0200
-+++ build/moz.configure/rust.configure	2018-10-20 14:21:35.510000000 +0200
-@@ -204,26 +204,6 @@
+--- build/moz.configure/rust.configure	2019-07-06 03:48:30.000000000 +0200
++++ build/moz.configure/rust.configure	2019-07-09 22:35:23.326851798 +0200
+@@ -79,9 +79,6 @@
+ 
+     return unwrap
+ 
+-rustc = unwrap_rustup(rustc, 'rustc')
+-cargo = unwrap_rustup(cargo, 'cargo')
+-
+ 
+ set_config('CARGO', cargo)
+ set_config('RUSTC', rustc)
+@@ -294,26 +291,6 @@
  
              os.write(in_fd, source)
              os.close(in_fd)
@@ -29,4 +40,3 @@ Mozilla rustc check does not support crossbuild: let's remove it
          finally:
              os.remove(in_path)
              os.remove(out_path)
-
diff --git a/srcpkgs/firefox-esr/patches/rust-cssparser.patch b/srcpkgs/firefox-esr/patches/rust-cssparser.patch
new file mode 100644
index 00000000000..1ebef87c014
--- /dev/null
+++ b/srcpkgs/firefox-esr/patches/rust-cssparser.patch
@@ -0,0 +1,90 @@
+backport of:
+
+From 3c98d22c5de3b696bf1fde2b6c90069812312aa6 Mon Sep 17 00:00:00 2001
+From: Simon Sapin <simon.sapin@exyr.org>
+Date: Tue, 23 Apr 2019 13:47:25 +0200
+Subject: [PATCH] Fix a future-compat warning
+
+```
+warning[E0506]: cannot assign to `self.input.cached_token` because it is borrowed
+   --> src/parser.rs:591:17
+    |
+566 |     pub fn next_including_whitespace_and_comments(&mut self) -> Result<&Token<'i>, BasicParseError<'i>> {
+    |                                                   - let's call the lifetime of this reference `'1`
+...
+579 |             Some(ref cached_token)
+    |                  ---------------- borrow of `self.input.cached_token` occurs here
+...
+591 |                 self.input.cached_token = Some(CachedToken {
+    |                 ^^^^^^^^^^^^^^^^^^^^^^^ assignment to borrowed `self.input.cached_token` occurs here
+...
+603 |         Ok(token)
+    |         --------- returning this value requires that `self.input.cached_token.0` is borrowed for `'1`
+    |
+    = warning: this error has been downgraded to a warning for backwards compatibility with previous releases
+    = warning: this represents potential undefined behavior in your code and this warning will become a hard error in the future
+```
+---
+ src/parser.rs | 50 +++++++++++++++++++++++++++-----------------------
+ 1 file changed, 27 insertions(+), 23 deletions(-)
+
+diff --git a/src/parser.rs b/src/parser.rs
+index 51f441e4..7cef117c 100644
+--- third_party/rust/cssparser/src/parser.rs
++++ third_party/rust/cssparser/src/parser.rs
+@@ -555,28 +555,34 @@
+         }
+ 
+         let token_start_position = self.input.tokenizer.position();
+-        let token;
+-        match self.input.cached_token {
+-            Some(ref cached_token)
+-            if cached_token.start_position == token_start_position => {
+-                self.input.tokenizer.reset(&cached_token.end_state);
+-                match cached_token.token {
+-                    Token::Function(ref name) => self.input.tokenizer.see_function(name),
+-                    _ => {}
+-                }
+-                token = &cached_token.token
++        let using_cached_token = self
++            .input
++            .cached_token
++            .as_ref()
++            .map_or(false, |cached_token| {
++                cached_token.start_position == token_start_position
++            });
++        let token = if using_cached_token {
++            let cached_token = self.input.cached_token.as_ref().unwrap();
++            self.input.tokenizer.reset(&cached_token.end_state);
++            match cached_token.token {
++                Token::Function(ref name) => self.input.tokenizer.see_function(name),
++                _ => {}
+             }
+-            _ => {
+-                let new_token = self.input.tokenizer.next()
+-                    .map_err(|()| self.new_basic_error(BasicParseErrorKind::EndOfInput))?;
+-                self.input.cached_token = Some(CachedToken {
+-                    token: new_token,
+-                    start_position: token_start_position,
+-                    end_state: self.input.tokenizer.state(),
+-                });
+-                token = self.input.cached_token_ref()
+-            }
+-        }
++            &cached_token.token
++        } else {
++            let new_token = self
++                .input
++                .tokenizer
++                .next()
++                .map_err(|()| self.new_basic_error(BasicParseErrorKind::EndOfInput))?;
++            self.input.cached_token = Some(CachedToken {
++                token: new_token,
++                start_position: token_start_position,
++                end_state: self.input.tokenizer.state(),
++            });
++            self.input.cached_token_ref()
++        };
+ 
+         if let Some(block_type) = BlockType::opening(token) {
+             self.at_start_of = Some(block_type);
diff --git a/srcpkgs/firefox-esr/patches/rust-unitialized-field.patch b/srcpkgs/firefox-esr/patches/rust-unitialized-field.patch
deleted file mode 100644
index 67ef3a02ab8..00000000000
--- a/srcpkgs/firefox-esr/patches/rust-unitialized-field.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- ./media/audioipc/audioipc/src/cmsg.rs.orig	2018-05-09 22:19:14.748631939 +0200
-+++ ./media/audioipc/audioipc/src/cmsg.rs	2018-05-09 22:19:22.961620862 +0200
-@@ -106,11 +106,11 @@ impl ControlMsgBuilder {
-                 return Err(Error::NoSpace);
-             }
- 
--            let cmsghdr = cmsghdr {
--                cmsg_len: cmsg_len as _,
--                cmsg_level: level,
--                cmsg_type: kind,
--            };
-+            use std::mem;
-+            let mut cmsghdr: cmsghdr =  unsafe { mem::zeroed() };
-+            cmsghdr.cmsg_len = cmsg_len as _;
-+            cmsghdr.cmsg_level = level;
-+            cmsghdr.cmsg_type = kind;
- 
-             let cmsghdr = unsafe {
-                 slice::from_raw_parts(&cmsghdr as *const _ as *const _, mem::size_of::<cmsghdr>())
diff --git a/srcpkgs/firefox-esr/patches/rust133.patch b/srcpkgs/firefox-esr/patches/rust133.patch
deleted file mode 100644
index ebdcac7e3a3..00000000000
--- a/srcpkgs/firefox-esr/patches/rust133.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-This fixes build errors under recent Rust.
-
---- servo/components/style_traits/lib.rs
-+++ servo/components/style_traits/lib.rs
-@@ -9,7 +9,7 @@
- #![crate_name = "style_traits"]
- #![crate_type = "rlib"]
- 
--#![deny(unsafe_code, missing_docs)]
-+#![deny(unsafe_code)]
- 
- extern crate app_units;
- #[macro_use] extern crate bitflags;
---- servo/components/style/lib.rs
-+++ servo/components/style/lib.rs
-@@ -23,8 +23,6 @@
- //! [cssparser]: ../cssparser/index.html
- //! [selectors]: ../selectors/index.html
- 
--#![deny(missing_docs)]
--
- extern crate app_units;
- extern crate arrayvec;
- extern crate atomic_refcell;
diff --git a/srcpkgs/firefox-esr/patches/save-and-restore-non-volatile-x28-on-arm64.patch b/srcpkgs/firefox-esr/patches/save-and-restore-non-volatile-x28-on-arm64.patch
deleted file mode 100644
index fa303f6d1e9..00000000000
--- a/srcpkgs/firefox-esr/patches/save-and-restore-non-volatile-x28-on-arm64.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-# HG changeset patch
-# User Lars T Hansen <lhansen@mozilla.com>
-# Date 1519822672 -3600
-# Node ID 800abe66894d6b07b24bccecbf6a65e2261076f6
-# Parent  223c97459e96183eb616aed39147207bdb953ba8
-Bug 1375074 - Save and restore non-volatile x28 on ARM64 for generated unboxed object constructor.  r=sstangl
-
-Origin: upstream
-Applied-upstream: 61, commit: https://hg.mozilla.org/mozilla-central/rev/800abe66894d
----
- js/src/vm/UnboxedObject.cpp | 30 ++++++++++++++++++++++++++----
- 1 file changed, 26 insertions(+), 4 deletions(-)
-
-diff --git a/js/src/vm/UnboxedObject.cpp b/js/src/vm/UnboxedObject.cpp
-index 35ca20d7405f..1c20a1093d13 100644
---- js/src/vm/UnboxedObject.cpp
-+++ js/src/vm/UnboxedObject.cpp
-@@ -86,9 +86,16 @@ static const uintptr_t CLEAR_CONSTRUCTOR_CODE_TOKEN = 0x1;
- #endif
-
- #ifdef JS_CODEGEN_ARM64
--  // ARM64 communicates stack address via sp, but uses a pseudo-sp for
--  // addressing.
--  masm.initStackPtr();
-+    // ARM64 communicates stack address via sp, but uses a pseudo-sp (PSP) for
-+    // addressing.  The register we use for PSP may however also be used by
-+    // calling code, and it is nonvolatile, so save it.  Do this as a special
-+    // case first because the generic save/restore code needs the PSP to be
-+    // initialized already.
-+    MOZ_ASSERT(PseudoStackPointer64.Is(masm.GetStackPointer64()));
-+    masm.Str(PseudoStackPointer64, vixl::MemOperand(sp, -16, vixl::PreIndex));
-+
-+    // Initialize the PSP from the SP.
-+    masm.initStackPtr();
- #endif
-
-   MOZ_ASSERT(propertiesReg.volatile_());
-@@ -239,7 +246,22 @@ static const uintptr_t CLEAR_CONSTRUCTOR_CODE_TOKEN = 0x1;
-   if (ScratchDoubleReg.volatile_()) masm.pop(ScratchDoubleReg);
-   masm.PopRegsInMask(savedNonVolatileRegisters);
-
--  masm.abiret();
-+#ifdef JS_CODEGEN_ARM64
-+    // Now restore the value that was in the PSP register on entry, and return.
-+
-+    // Obtain the correct SP from the PSP.
-+    masm.Mov(sp, PseudoStackPointer64);
-+
-+    // Restore the saved value of the PSP register, this value is whatever the
-+    // caller had saved in it, not any actual SP value, and it must not be
-+    // overwritten subsequently.
-+    masm.Ldr(PseudoStackPointer64, vixl::MemOperand(sp, 16, vixl::PostIndex));
-+
-+    // Perform a plain Ret(), as abiret() will move SP <- PSP and that is wrong.
-+    masm.Ret(vixl::lr);
-+#else
-+    masm.abiret();
-+#endif
-
-   masm.bind(&failureStoreOther);
-
---
-2.21.0
-
diff --git a/srcpkgs/firefox-esr/patches/save-x28-before-clobbering-it-in-the-regex-compiler.patch b/srcpkgs/firefox-esr/patches/save-x28-before-clobbering-it-in-the-regex-compiler.patch
deleted file mode 100644
index aa2dcc6ba8d..00000000000
--- a/srcpkgs/firefox-esr/patches/save-x28-before-clobbering-it-in-the-regex-compiler.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-# HG changeset patch
-# User Lars T Hansen <lhansen@mozilla.com>
-# Date 1521449886 -3600
-# Node ID 903a79a1efff18fc7cc50db09a3fe5d768adc9a8
-# Parent  4d2955a9ca7e30ca4c3af9c214ccc77fb2fe7fb8
-Bug 1445907 - Save x28 before clobbering it in the regex compiler. r=sstangl
-
-Origin: upstream
-Applied-upstream: 61, commit: https://hg.mozilla.org/mozilla-central/rev/903a79a1efff
----
-diff --git a/js/src/irregexp/NativeRegExpMacroAssembler.cpp b/js/src/irregexp/NativeRegExpMacroAssembler.cpp
---- js/src/irregexp/NativeRegExpMacroAssembler.cpp
-+++ js/src/irregexp/NativeRegExpMacroAssembler.cpp
-@@ -118,17 +118,25 @@ NativeRegExpMacroAssembler::GenerateCode
-
-     Label return_temp0;
-
-     // Finalize code - write the entry point code now we know how many
-     // registers we need.
-     masm.bind(&entry_label_);
-
- #ifdef JS_CODEGEN_ARM64
--    // ARM64 communicates stack address via sp, but uses a pseudo-sp for addressing.
-+    // ARM64 communicates stack address via SP, but uses a pseudo-sp (PSP) for
-+    // addressing.  The register we use for PSP may however also be used by
-+    // calling code, and it is nonvolatile, so save it.  Do this as a special
-+    // case first because the generic save/restore code needs the PSP to be
-+    // initialized already.
-+    MOZ_ASSERT(PseudoStackPointer64.Is(masm.GetStackPointer64()));
-+    masm.Str(PseudoStackPointer64, vixl::MemOperand(sp, -16, vixl::PreIndex));
-+
-+    // Initialize the PSP from the SP.
-     masm.initStackPtr();
- #endif
-
-     // Push non-volatile registers which might be modified by jitcode.
-     size_t pushedNonVolatileRegisters = 0;
-     for (GeneralRegisterForwardIterator iter(savedNonVolatileRegisters); iter.more(); ++iter) {
-         masm.Push(*iter);
-         pushedNonVolatileRegisters++;
-@@ -416,17 +424,32 @@ NativeRegExpMacroAssembler::GenerateCode
-     masm.pop(temp0);
-     masm.movePtr(temp0, StackPointer);
- #endif
-
-     // Restore non-volatile registers which were saved on entry.
-     for (GeneralRegisterBackwardIterator iter(savedNonVolatileRegisters); iter.more(); ++iter)
-         masm.Pop(*iter);
-
-+#ifdef JS_CODEGEN_ARM64
-+    // Now restore the value that was in the PSP register on entry, and return.
-+
-+    // Obtain the correct SP from the PSP.
-+    masm.Mov(sp, PseudoStackPointer64);
-+
-+    // Restore the saved value of the PSP register, this value is whatever the
-+    // caller had saved in it, not any actual SP value, and it must not be
-+    // overwritten subsequently.
-+    masm.Ldr(PseudoStackPointer64, vixl::MemOperand(sp, 16, vixl::PostIndex));
-+
-+    // Perform a plain Ret(), as abiret() will move SP <- PSP and that is wrong.
-+    masm.Ret(vixl::lr);
-+#else
-     masm.abiret();
-+#endif
-
-     // Backtrack code (branch target for conditional backtracks).
-     if (backtrack_label_.used()) {
-         masm.bind(&backtrack_label_);
-         Backtrack();
-     }
-
-     // Backtrack stack overflow code.
-diff --git a/js/src/jit-test/tests/regexp/bug1445907.js b/js/src/jit-test/tests/regexp/bug1445907.js
-new file mode 100644
---- /dev/null
-+++ js/src/jit-test/tests/regexp/bug1445907.js
-@@ -0,0 +1,15 @@
-+// On ARM64, we failed to save x28 properly when generating code for the regexp
-+// matcher.
-+//
-+// There's wasm and Debugger code here because the combination forces the use of
-+// x28 and exposes the bug when running on the simulator.
-+
-+if (!wasmIsSupported())
-+    quit();
-+
-+var g = newGlobal('');
-+var dbg = new Debugger(g);
-+g.eval(`var m = new WebAssembly.Instance(new WebAssembly.Module(wasmTextToBinary('(module (func (export "test")))')))`);
-+var re = /./;
-+dbg.onEnterFrame = function(frame) { re.exec("x") };
-+result = g.eval("m.exports.test()");
-
---
-2.21.0
-
diff --git a/srcpkgs/firefox-esr/patches/sndio.patch b/srcpkgs/firefox-esr/patches/sndio.patch
index 097b313e90b..6c72284c19b 100644
--- a/srcpkgs/firefox-esr/patches/sndio.patch
+++ b/srcpkgs/firefox-esr/patches/sndio.patch
@@ -51,14 +51,14 @@
      ]
 --- build/moz.configure/old.configure.orig
 +++ build/moz.configure/old.configure
-@@ -159,6 +159,7 @@
-     '--enable-accessibility',
-     '--enable-address-sanitizer',
-     '--enable-alsa',
+@@ -169,6 +169,7 @@
+ @old_configure_options(
+     '--cache-file',
+     '--datadir',
 +    '--enable-sndio',
-     '--enable-bundled-fonts',
-     '--enable-clang-plugin',
      '--enable-content-sandbox',
+     '--enable-cookies',
+     '--enable-cpp-rtti',
 --- security/sandbox/linux/broker/SandboxBrokerPolicyFactory.cpp.orig
 +++ security/sandbox/linux/broker/SandboxBrokerPolicyFactory.cpp
 @@ -349,6 +349,21 @@
diff --git a/srcpkgs/firefox-esr/patches/yuv-be.patch b/srcpkgs/firefox-esr/patches/yuv-be.patch
new file mode 100644
index 00000000000..1c26f2ecced
--- /dev/null
+++ b/srcpkgs/firefox-esr/patches/yuv-be.patch
@@ -0,0 +1,48 @@
+# HG changeset patch
+# User A. Wilcox <AWilcox@Wilcox-Tech.com>
+# Date 1543674229 0
+#      Sat Dec 01 14:23:49 2018 +0000
+# Node ID 0309ff19e46b126c527e633518d7de8570442114
+# Parent  53107afbc21ec78e7ac46d37af212505f2032d5d
+Bug 1511604 - Swizzle YCbCr->RGB data on big-endian machines
+
+diff -r 53107afbc21e -r 0309ff19e46b gfx/ycbcr/YCbCrUtils.cpp
+--- gfx/ycbcr/YCbCrUtils.cpp	Wed Nov 07 04:50:21 2018 +0000
++++ gfx/ycbcr/YCbCrUtils.cpp	Sat Dec 01 14:23:49 2018 +0000
+@@ -3,7 +3,9 @@
+  * License, v. 2.0. If a copy of the MPL was not distributed with this
+  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+ 
++#include "mozilla/EndianUtils.h"
+ #include "gfx2DGlue.h"
++#include "mozilla/gfx/Swizzle.h"
+ 
+ #include "YCbCrUtils.h"
+ #include "yuv_convert.h"
+@@ -236,6 +238,13 @@
+                           yuvtype,
+                           srcData.mYUVColorSpace);
+   }
++#if MOZ_BIG_ENDIAN
++  // libyuv makes endian-correct result, which needs to be swapped to BGRX
++  if (aDestFormat != SurfaceFormat::R5G6B5_UINT16)
++    gfx::SwizzleData(aDestBuffer, aStride, gfx::SurfaceFormat::X8R8G8B8,
++                     aDestBuffer, aStride, gfx::SurfaceFormat::B8G8R8X8,
++                     srcData.mPicSize);
++#endif
+ }
+ 
+ void
+@@ -257,6 +266,12 @@
+                         aSrcStrideYA,
+                         aSrcStrideUV,
+                         aDstStrideARGB);
++#if MOZ_BIG_ENDIAN
++  // libyuv makes endian-correct result, which needs to be swapped to BGRA
++  gfx::SwizzleData(aDstARGB, aDstStrideARGB, gfx::SurfaceFormat::A8R8G8B8,
++                   aDstARGB, aDstStrideARGB, gfx::SurfaceFormat::B8G8R8A8,
++                   IntSize(aWidth, aHeight));
++#endif
+ }
+ 
+ } // namespace gfx
diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template
index 05a0a521341..8f1c983c8b4 100644
--- a/srcpkgs/firefox-esr/template
+++ b/srcpkgs/firefox-esr/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-esr-i18n".
 #
 pkgname=firefox-esr
-version=60.8.0
+version=68.1.0
 revision=2
 build_helper="rust"
 wrksrc="firefox-${version}"
@@ -12,11 +12,11 @@ maintainer="Eivind Uggedal <eivind@uggedal.com>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/organizations/"
 distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"
-checksum=c13387d944e635aebd5f1d2ce9ab77cb706a74043a240cbb7b70654519487fbe
+checksum=f56f5fa5a4744be0b9acf259cb991254d708a50b9a0a12d1d846ffa5a6c409ac
 
 lib32disabled=yes
 hostmakedepends="autoconf213 unzip zip pkg-config perl python yasm
- cargo llvm clang rust cbindgen"
+ python3 cargo llvm clang rust cbindgen nasm nodejs"
 makedepends="nss-devel libjpeg-turbo-devel gtk+-devel gtk+3-devel icu-devel
  pixman-devel sqlite-devel libevent-devel libnotify-devel libvpx5-devel
  libXrender-devel libXcomposite-devel libSM-devel libXt-devel rust-std
@@ -30,10 +30,6 @@ conflicts="firefox>=0"
 build_options="alsa dbus gtk3 pulseaudio startup_notification xscreensaver sndio"
 build_options_default="alsa dbus gtk3 pulseaudio startup_notification xscreensaver sndio"
 
-if [ "$XBPS_WORDSIZE" -eq 32 ]; then
-	nodebug=yes
-fi
-
 case $XBPS_TARGET_MACHINE in
 	armv6*)
 		broken="required NEON extensions are not supported on armv6"
@@ -42,6 +38,13 @@ case $XBPS_TARGET_MACHINE in
 	ppc*) broken="ftbfs in several places" ;;
 esac
 
+# we need this because cargo verifies checksums of all files in vendor
+# crates when it builds and gives us no way to override or update the
+# file sanely... so just clear out the file list
+_clear_vendor_checksums() {
+	sed -i 's/\("files":{\)[^}]*/\1/' third_party/rust/$1/.cargo-checksum.json
+}
+
 post_extract() {
 	case "$XBPS_TARGET_MACHINE" in
 	*-musl)
@@ -57,6 +60,11 @@ post_extract() {
 	# Note: This is for Void Linux use ONLY.
 	echo -n "cd894504-7a2a-4263-abff-ff73ee89ffca" > mozilla-api-key
 }
+
+post_patch() {
+	_clear_vendor_checksums cssparser
+}
+
 do_build() {
 	cp "${FILESDIR}/mozconfig" "${wrksrc}/.mozconfig"
 
@@ -112,9 +120,14 @@ do_build() {
 		;;
 	esac
 
-	if [ "$XBPS_WORDSIZE" -eq 32 ]; then
-		# ENOMEM
-		echo "ac_add_options --disable-debug-symbols" >>.mozconfig
+	# work around large debug symbols on 32-bit hosts
+	if [ "$XBPS_WORDSIZE" = "32" ]; then
+		export CFLAGS="${CFLAGS/-g/-g1}"
+		export CXXFLAGS="${CXXFLAGS/-g/-g1}"
+		export LDFLAGS+=" -Wl,--no-keep-memory"
+		# patch the rust debug level, this is hardcoded
+		sed -i "s/debug_info = '2'/debug_info = '1'/" \
+		build/moz.configure/toolchain.configure
 	fi
 
 	export LDFLAGS+=" -Wl,-rpath=/usr/lib/firefox"
diff --git a/srcpkgs/firefox-i18n-bn b/srcpkgs/firefox-i18n-bn
new file mode 120000
index 00000000000..6b9610b993c
--- /dev/null
+++ b/srcpkgs/firefox-i18n-bn
@@ -0,0 +1 @@
+firefox-i18n
\ No newline at end of file
diff --git a/srcpkgs/firefox-i18n-en-CA b/srcpkgs/firefox-i18n-en-CA
new file mode 120000
index 00000000000..6b9610b993c
--- /dev/null
+++ b/srcpkgs/firefox-i18n-en-CA
@@ -0,0 +1 @@
+firefox-i18n
\ No newline at end of file
diff --git a/srcpkgs/firefox-i18n-ia b/srcpkgs/firefox-i18n-ia
new file mode 120000
index 00000000000..6b9610b993c
--- /dev/null
+++ b/srcpkgs/firefox-i18n-ia
@@ -0,0 +1 @@
+firefox-i18n
\ No newline at end of file
diff --git a/srcpkgs/firefox-i18n-ne-NP b/srcpkgs/firefox-i18n-ne-NP
new file mode 120000
index 00000000000..6b9610b993c
--- /dev/null
+++ b/srcpkgs/firefox-i18n-ne-NP
@@ -0,0 +1 @@
+firefox-i18n
\ No newline at end of file
diff --git a/srcpkgs/firefox-i18n-oc b/srcpkgs/firefox-i18n-oc
new file mode 120000
index 00000000000..6b9610b993c
--- /dev/null
+++ b/srcpkgs/firefox-i18n-oc
@@ -0,0 +1 @@
+firefox-i18n
\ No newline at end of file
diff --git a/srcpkgs/firefox-i18n-ur b/srcpkgs/firefox-i18n-ur
new file mode 120000
index 00000000000..6b9610b993c
--- /dev/null
+++ b/srcpkgs/firefox-i18n-ur
@@ -0,0 +1 @@
+firefox-i18n
\ No newline at end of file
diff --git a/srcpkgs/firefox-i18n/files/update-lang-list b/srcpkgs/firefox-i18n/files/update-lang-list
new file mode 100755
index 00000000000..ff8042113bf
--- /dev/null
+++ b/srcpkgs/firefox-i18n/files/update-lang-list
@@ -0,0 +1,81 @@
+#!/bin/bash
+# Copyright (c) 2019 Danh Doan
+# All rights reserved.
+#
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+# OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
+
+version=$1
+
+esr=""
+[[ $version =~ esr$ ]] && esr="-esr"
+
+tmpldir="firefox${esr}-i18n"
+
+tmpoldfile="$(mktemp)"
+tmpnewfile="$(mktemp)"
+
+xoldlangexpr="^_languages="
+
+xlistold() {
+	source "${tmpldir}/template"
+	for _lang in "${_languages[@]}"; do
+		_locale="${_lang%%\"*}"
+		[ $_locale ] && echo "$_locale"
+	done
+}
+
+xlink () {
+	ln -sf "$tmpldir" "$tmpldir-$1"
+}
+
+xnewlang () {
+	lang=$1
+	padded=$(printf '%-7s' $lang)
+	xoldexpr=$xoldlangexpr
+	xoldlangexpr="'$lang \+\""
+	grep -q "'$lang \+\"" "$tmpldir/template" && return 0
+	sed -i "/$xoldexpr/a\\
+	'$padded\"Unknown\"'
+	/checksum=/a\\
+ badbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadb" \
+	"$tmpldir/template"
+}
+
+xprocessnew() {
+	while read lang; do
+		printf '%-7s\n' $lang >&3
+		xlink $lang
+		xnewlang $lang
+	done
+}
+
+xcleanlang() {
+	while read lang; do
+		padded=$(printf '%-7s' $lang)
+		sed -i "/'$padded\"/d" $tmpldir/template
+		unlink "$tmpldir-$lang" || true
+	done
+}
+
+cd $(xdistdir)/srcpkgs
+
+xlistold >| "$tmpoldfile"
+
+curl "https://ftp.mozilla.org/pub/firefox/releases/$1/linux-i686/xpi/" \
+	| grep -o 'xpi/[a-z]\+\(-[A-Z]\+\)\?' \
+	| cut -d/ -f2 \
+	| xprocessnew 3>$tmpnewfile
+
+grep -vF -f $tmpnewfile $tmpoldfile \
+	| xcleanlang
+
+rm -rf $tmpoldfile $tmpnewfile
diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template
index a18f552af2c..c901f5c9123 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-i18n'
 pkgname=firefox-i18n
-version=68.0.2
+version=69.0.2
 revision=1
 build_style=meta
 homepage="https://www.mozilla.org/firefox/"
@@ -23,6 +23,7 @@ _languages=(
 	'az     "Azerbaijani"'
 	'be     "Belarusian"'
 	'bg     "Bulgarian"'
+	'bn     "Bengali"'
 	'br     "Breton"'
 	'bs     "Bosnian"'
 	'ca     "Catalan"'
@@ -33,6 +34,7 @@ _languages=(
 	'de     "German"'
 	'dsb    "Lower Sorbian"'
 	'el     "Greek"'
+	'en-CA  "English (Canada)"'
 	'en-GB  "English (British)"'
 	'en-US  "English (US)"'
 	'eo     "Esperanto"'
@@ -58,6 +60,7 @@ _languages=(
 	'hsb    "Upper Sorbian"'
 	'hu     "Hungarian"'
 	'hy-AM  "Armenian"'
+	'ia     "Interlingua"'
 	'id     "Indonesian"'
 	'is     "Icelandic"'
 	'it     "Italian"'
@@ -76,8 +79,10 @@ _languages=(
 	'ms     "Malay"'
 	'my     "Burmese"'
 	'nb-NO  "Norwegian (Bokmål)"'
+	'ne-NP  "Nepali"'
 	'nl     "Dutch"'
 	'nn-NO  "Norwegian (Nynorsk)"'
+	'oc     "Occitan"'
 	'pa-IN  "Punjabi"'
 	'pl     "Polish"'
 	'pt-BR  "Portuguese (Brazilian)"'
@@ -97,6 +102,7 @@ _languages=(
 	'th     "Thai"'
 	'tr     "Turkish"'
 	'uk     "Ukrainian"'
+	'ur     "Urdu"'
 	'uz     "Uzbek"'
 	'vi     "Vietnamese"'
 	'xh     "Xhosa"'
@@ -129,90 +135,96 @@ _pkgtmpl() {
 	}
 }
 
-checksum="2ea325dae9dfd9725a533d7a4630b9326d408ab9a4b925b70468d28a2d45d2ba
- 7ac5d43f433ccd68bb96ac92cc7485755348a03c0bcb74d66e12925afd9463ae
- 88914e2a4d070d307ab4483538f3b863179dc4f1ba148bd3ae28cff4d87a390f
- 54627c8ba83781677dde0fc917eea5926a53906cad6283143cb917868e764b98
- 2f03fd4a024dc82920cbbec72140899d7fb1ab84c8913e01bdf2444de1faff95
- 129bfb200b92ff372be47d7b6482f509643448dfe620b725a3dc4932c1fecb83
- 841ad3f8ddae023fc2d426b83512f62d8ca0e6c96933166b3e53a144d08abf53
- 65326e4b1bf378e6971fb29f5532b5de81f355346e5310a63db093c6156255c3
- edd830c87ca09dc9764600b484f763322f9771c6557b960baa690872fcdfd3bb
- c686c3fd8a62b4fad79748f56c0306844545828aa8bf5a2f06a3710e21f64fa4
- 70ad36174d88e06f4ab068e55d3b737ffad7847014765b94bfc0de6bcdc52c5e
- 42381fad38549111e5ff2d57887318727159815b7b6ce19a8665fc049615f0e5
- ebef3a70259d887cb83ed61826dc4f4efb7e934a17a1315921232a0be0c78faa
- c3502cb60c44d1dbdec77046ca1d00b4d5b600f546a7964f4e27bfd52b42d193
- dfb94b9b6665284b1bedd6c9e13aa78f8ac43d64d5337825645c064e89bb5077
- 0c52ae1e1d8492193221f4ca71c77e3447521169202b615644b618ca09a02b92
- 1e01f718a7b5e4f7b1e7ba383c4a83c336658398bd8ed579511e099399eb7659
- 4a81323c5c564a903da4e58ed9e6ce968c96530bec924a143a83a153d2a3f712
- 870d58d9ea7615b9c4d7425970c1fad96ea7ec8864b55509fff5c501138eb724
- 595109a433b969231f5efb0b1de5585d2b3a82be0338166418ad84b7472fd6db
- b6ab79f793a7558e074d53f210721c9fb61b10ebd6ca219c47890c2066262ab8
- d059897607824b2cd3fe68b7a3bce3214ebd490d486517838a41ac21a9d66cd8
- 1db3f913dcadbdc63e38c8c41fe7f9d58b94bd372f2ed815ef98d7210376281d
- 9a0aa04d643dff8eed58b9167a8f8d373962c5df2b5c240dd280fc46add25cb2
- 5c2d1c6de35b41c534f98bbf53bf68dfcba7f81ee44fa41670852f0b7cb6034d
- 253d0275b7c3be1ad387f27901ed8f6a8e1c8f06c6052bd1ba4432cdf8987e40
- 282b17de74487d4af0b6471ebb86702635b51b658d4dc1040b2a1bc0173d75cd
- f0cdbc7b603345ce782efdda2cdd97cb3086a35ba8a8dc93316a408aa008ce4c
- 539a457d13deb4ac0e4149af5894f6a34348d00311212117d1ba5472b3eb7630
- d975fa37a38d88ecd2e539082200d7243ba00c1d0388ba3a79b32cbb237cb5be
- 1bb93ab89e1b29b13e88280817f22478f734f8b401e8a46e45842f80dd12dc91
- 7f92bb80877a94b06a9d21fd4c8773828b2ffb00d76fcada5fe6d63046f50e56
- 5cc79d40e9d9ac053f42a62ca6bf3fceeb734a7c4ae3c4dae730ce5326dcee53
- b991ad7abc56fe09f8784d82b5ce31490c54ccc0336f8df3735f39442eb408a8
- 914e3dd3902056311f0b31891dd5829e44c9b1d21e5527b5d5fc02a0a9163231
- d4a34da51853ce5ceeb44c717bff8e0e43e8a7a3573a5b8d37bfbc7535a7ab8c
- 2af29f4878ab8d2a68374ed5e548389defc08dd7ed4afc922a0ecdd469d323aa
- 3fbb71fcd7fbfdc7df8e992fad3cf4101b1d8864fe2a3adc4cce6c9260789892
- c2e8f0ceb5b585038189e7e29ab44ef847b302ff12769a576d9ed84f4c6b1733
- 808ecfcb890009a5a8aec761019f7365dee0472f56a66cab3dff5aab96f5092e
- e3b41849929b2b339aeb31187e5a8212645d4352b84c6da2d00427f4704701fa
- 61526c0ed945e0c4fa7e3c74a50b1c850640ad1127583b261d98d96e051ab8a7
- 27b8f857c0cd3a0cfc4b672dafd97b5058141c9c2611f3bc3dcdf0cbc7bbb0f6
- 87825f138676242e47e5feea13416b7f0b80d2abcd6d1e9e9c176cbf2b16fc4a
- 25adc223948abbf53e2485ef7e2ba7c6cd57035539a328bc1bed0ef5a2e98151
- 29117feb77725cb04612ecf4d5fc2cdd99cf83ec5a5443bc7ad70d5087f067e7
- a9313a9102e7076cdb2fb6d93c521c7125fc7bb238a1c10b7fe7aad83ed1a832
- 8ac5b14e77083a78ea452370c388216827a74a535238f46b68e54f583fb9d28e
- 8fbeaacb8eb49fcbdedfbad2ea8ddc6ef6c439ffeaf760ce8951399f130f2e70
- 7e90cebdc49ba304cbcacf1e2402e1d04a74915655e51736f77cbf06ef96b15b
- 6a05ca1dea4d1d1df7403909765469fd64f930687f10c4f12d6df47b316b01a0
- 7385224b6cb45a987ccf7a78e14e4d2962f7d8053226907db7d221871a1d9654
- 6cf181372cdbd6e71d391e3d301862df861d09294b21e60aca2439adaed90f1c
- e52b3fffda04b1a1b53f3de317e5e1c0632284ee49f99a1639a5e153f18eb7e1
- 79a2c8da2175659ec63d62414b6f6d39342f705f3e973f886a0e05979dbbb5e2
- 56d52734e4be44d91bfb993ad8ff71a8adb467781a562219d62f58f13a588ed7
- 96f4ec00964d3c9f0f5db9243ed2486ef4f705d822427de1303d25decb1d8091
- 97b6e1980fa99a5edac112f25a4873b88ebb1c28f010c7e7dc2197216740f916
- 1b14434f61257ce16bdeef681383b6371b0ad2004c0ca165d819b559f1db57e6
- 4908fe09e5da90f608d1abbcad948f4b4b6622ebb6bbbd22c61233736c402281
- 92967023816682d0991bdf50e08eb9a199a45c95b848b5aeceefc0906d267a1e
- 65e4a1bac6db7d51f67d3d522ffa5104031619fc5a427e446de90a959cf1b5ae
- 774d4102558b9744c141dbb6b89915beee1401c7997caafc5e84c3d3431505aa
- 2c8af1b518a1ab9470a2a8a6b2728a107ae92043dfe63a0bfbfb1423e11561b4
- 772c0e432e5e2a07ce0f7f150a0e999e291490e1c8b1d7a47085c231e1bfb551
- cb144fe7128393e757eb0e89fbfa1a64a98d75645563ef23538c81ea2395c54b
- b1fc0e8abe44a489728a5d35a7e30b2c189b3afee57ccf1ca3d457863bcaf613
- 3672383cd1054cbc082c7b2ea423461af6088f80784b72ab0c961f648dcb6046
- d13c1b0ffb1325352b0abd42dba05d3932814dcbbf01049d8e3e96c35ca4cecc
- 5197f27b5f1a6fda42dfdd23ab26e7852e6055d949b3421a604107f07d9ffab3
- a931a967980d2c85436a24035eb2da0de6996fcfcf2013b1b2c7481a5e3de81b
- bf136d69e10bb4300753e1bde4a4287837ab1576669c51f679bf37d8de4961e6
- c265e73b9bc51156e04f69073d10dd4ea82f70bdfbd4d1246648a4158f9887f9
- 840fc9402492c653f07709d04ffe8e33b96e6c7a8873fe14ec6d382f9650769c
- c0e795d692d62262a8e300e2ae573873b21538d79a9ad0bb3fd5c12486e12cef
- fa1ce8c4e3c8d0c25817766e9eb1897a055d032d4a6b69b9bf83a07d1d9234ac
- c3bbcd6f00dfe6e8c086489a03797366dcddca55326269d32239f5a1a5466836
- 638fa687bd1f367b88a983c66a3644cbef2d86608bb17cf8a71f1fa149156138
- 1098aeed113c1050e1ba6b42ae22fb547912a8fd864b56ba44e561a60ea19203
- 7dcb700b1bf6ae29a2c76362337bd5b34f8951b5fbcd5316e892c81e5434092d
- d4deb3fc82619bf21f5e30fa488724da3ac17d0b3002661f95345a4fdfa5342c
- 7121d04c37484902cd0c68a7fd2c68af25b43d5a71872cff65e408845029885c
- d02e0982655a560b547629a9635abb0e491163ea7eb443d454f9e09ff0a05904
- 0bfe3a70d2b393973eb5c097191a38ecfe57cdd61000dc5b1d01acc8ac700604
- b4824070be3c764c0e1be0baea8baf5cc4700732bdf4f7a5f946f81227caceea
- 3f8ec0fb6428fcf7eeba212165e4c5d4d61b865e3e26780e2a893704e1a169d8
- 093fe238df44efe1491c952454142222662c4c58ea953d558d7a3b344ead0799"
+checksum="2dedbef23c189a3ae79601848bda9494ac94a54b62912f27c475a76f0fd689fe
+ b7b58f8567304c7acdf15e68b22f26f44fa4aa26fb9ce51adc9ab8091e62df70
+ d65eacf7031f09d3f17da10c9043cf0db3b2a27acfc94ce1642d62986aabc9d4
+ 4da10714359d8433741ccba376c782e1b8774b85ce186f99927dc09add8bea0f
+ 0635d930e2ba2da6362f7838d98bf50f21d7d69bac8b67a69e34981d22bb450b
+ e8bb7f3b9443e6bd2efe7bfaaf4f7be169ceba14ee3c4acde169d454df613b4d
+ 0bbd6e920bb09d055f23813af147d8f532a7288e992f4dc72b301c40ba165153
+ 5023d7f804189f5a25a65a649fe3e2dafd723a4ecfa236db00eb51c2ae8b2c9f
+ ccdb7e5537debe2a97cb05ef20a63683e984770fbd4bf1315a9ca7d1b675e6e2
+ e6a449b1280d337b549bc5ae8fa6a81a5f20632dce4807e54cff313fa848b273
+ 885df228e7a5821d4a036a206bf1d8b39415a740a470eca581d1488ca68642b4
+ 72585b3125e0253fa9fb7cec59ad332e35bdc40865e6d30e85dd77426fb1b88c
+ e74e73bf2746608c9f6bea7b44cbf99699170d19f48c588b48bcb20673dde6ab
+ 81a1172ce4e0075cbbed9090b4e193ebef9fae0f01d1ea0b599e6ba2e5b9d676
+ 9e048a7648e4d9b32df68117a206e4d48d4a648c4e7fb0555c152b80a3fdb01a
+ afca69f4448ee277d6f0ec6fb564dbdcf52daeaa678ec792968a25a1b4089395
+ 1f1da038f72fc2d120e791711813883e782b6e5896248bad8a9bc637656c7c64
+ 2c0ef8f7f85e5ee2992c7ca972b0f379c69bce20e8891ceedc1249c7de6977e7
+ b61a3b03d7663aa7a9d4b41442bbc1c36a53917baa9ac6ea40586ddfc8b46fd6
+ be3993297bc3a2e5a5143948bf77bf68341602cad991e2ffb3440ea91684eee7
+ abbc3505714d14afab1ee31dddf1c740400849e91ae0940894608c439d14ca1b
+ cb9caf3791adeaaf028dc3ea49190a7261dbac1d819e773745da43bd5e20baf3
+ 310044e3dc20c8e5a6f93b8a1431e4e483a64ef7e85a363205c0f099d022c101
+ ada24eec9c0ee87bf91a1c7615d5626683cc5f71299682abd1d9623ed1c3ac4d
+ 45c56e1f272f7888c955be0012e10fdae24eaa966a092b390ba3fb3290331da7
+ 6ebc3c7478047bf4cab9c3a8c21750c11b735860118838dc88eafcb682520f83
+ 5e9443506779ba3ec0e6142b6933e21653a5e73df183c4f139ad5a03fdce808f
+ 802a8e645735dc796889854356943c68f93111f091189c8604c2bef31e3a887e
+ d71d2df409aab2dcfa1b01d0223b6ff2a89490e95b3be5606ad03de215c03dc5
+ e5f7c195566375f6bc042b2eef47ff32ca92ec5e199d3c8ce074abac4f17b141
+ f9afb0d6f77df96a9b7aef610b7da9162a87610d9f7567604f785dbe08ac78b7
+ b56b78228ddb7a323e2c45c155098663df00068011904febe69d29e9c7b3ede9
+ 791c498fb02559f77a8d6e7b3f206bc27de60e6447ca472d034678cf59636321
+ c2fcc7d13fe09910b4a615720c983d7ad23e69ecfa4615ff22ea9701e022f978
+ 2ac17793f016a00dec9c08795252f0b32b2820ece859b231334fa2b6ff34264f
+ 13801b073d6deece09b33ae445b1b10f01bb71d45a5378699c72d7bd8a914a78
+ 6d5add1a5b7d1a33aeb604b7ba9194932f86811b83efcc5752fcfe1775e08f23
+ 30117c68fcd691f3159a328c5a3c7948ca3e77ca4688a73a9d0c644b8a4246f9
+ f90f0f0fd894566dc0eaaf60919a09d1ccee9321524871e1331cff757fb7bfea
+ 7d96458df5f800936e4561fb185ecc9b581eca9578137296c9bdeceb44daf193
+ a7bb9478be3d6e013ad5f9e35d32eb71a62797a705404bff6cc2cae8487743b1
+ f08c737abd560cea089152758d792e5beaedc9ccede7983388dd807fe7d2a11f
+ 95e7475adabd240f0972757a7da25261bc47e83ac2c67944a8a6ac7992d9ec29
+ 099b50cd890420b3a2d62070e45ce7c0705ef39e7dd9c2300bd4aae69fda726c
+ bad88b58dfca9079037ce94f42f77374ef9f9a3bd638e87bf7287b47a5dc9ffb
+ 6efda86537326063b96b5e77131dc6412e75589d84131dac96a482c788c50a7b
+ 2a62edb917fc00d292ee020e9f8d134ebfe9c5673ce200da45cd19d5c2a8802f
+ 26aa9c6b1de4d536ec1c0aae8c226b151207f172aa4afb52152955f3d9419b36
+ d163cde2b231fbbf0e59e43ae7e9df9d90af63063f17e0422e693eec40a51521
+ 02f4e66ff8693498527505c3a32fd6ddf7a5039b7a7ccd6c2c747523a910754b
+ 892960fd4783c002e2474d16e9d7b70845e8bb93964ff681812a0cad6b763304
+ fa2f66fbd0dedf186650768547553aba45a15fa5ea2a1dcdfcd9ff157838ec54
+ ad143cf3848376f5391842ff8e5f8adbd1dde0f02cceef48e48d0903cd174578
+ 0707af0cf8a4074839844a6c21632746d2a5fd6f114805d3876d018de20aca88
+ fca407ec651962e21618c06cff83e68a8ed03e579cff9323336e8d78d13cee9e
+ b335c60db936421f1a2a77944aa9156821c3d350f8dba689d5a6fec6bbc88092
+ ef3a4d8335a856f3ce0aa7ba4c48265ca043edf90f4050922a134584fc9a0b9f
+ 2434ae11c76063aa7685d0445993cb09b2566ae5a5d50cf2080c977cb5af98fc
+ ad02956d6bc1b49925170ad1a172b5e830dae346986913ce6002f46c3d998dd0
+ e6b2562e083f74d82ff9665c182ffa61c4cf1a2e28777b6be8169f2b81d3e6a5
+ 4907238801a5db0c6736995c4cd907b4247274abcea7828684e61c0d07e6cfff
+ 6ba4938cd5bee47c97eb469a0d7d4a74dae140f6ec2c571e4bad7e7e0516503a
+ 5eb3c903dc6f77080bb7863bddac704ff9f54b01af8c85a18b6d09e2c421b30f
+ 0ad0c770e64b3269f99f0c675bfa3462e04375134db585b75e5948ad5aaaf8d8
+ 5414854b7f2125093a369e5b239f62822aca0b9109a0338a5f92bc3e66b61c92
+ 7e7e198016ca1a8d26f3818cee938f72b11e8c73a9321cf9daa1fb9b12781c6e
+ f0a7269039e2bc34e12d0fea551f658c05bf7f8867f723f557ac6da6ef9ef139
+ 2d24d04287306fe490f6d512d2589ba04dc146212b41e87997fe15fb825ea52d
+ 24b5910b9ff7bef6d3f6f3da15451374f1322c26a08cc8120f9c3f56657df3bb
+ 14bb80304f93b629e78d174cc11bf0e9291662d223a9e7d2cf28218026835426
+ 77383381d09a8bc6f3d119a831b7f143b28f1ca5ca0af328cc4085d83e9b2cd7
+ ab1f80d1df6096f608a7b3868b555f372f1d4453718dc7a193ffca551e1d8dc7
+ 89c5b8410c2b29dafd062f6fc2caad4ed70d582400882509919b56628aa917a5
+ f81e32bddb4d1c0bf8d6b969ce14f365cc604c51bfae3c757188ecac0d182415
+ f0b6652eb519c081a704cbed0aacca367eb13449b0643c2690aaef6cf4387539
+ e6fc7b8ea756fcb0ddc9830f804cd818c7e18db3fce9f070c9fa0a4aa837cb87
+ 1594712d37d0deea3d7b8483be8a17f6151cc05dab24f63fa0bedbea0744e798
+ 478930a36ca9bb22b56554099a569f351799b50f39b291ab18cde013fcf866b1
+ d28be7e2d566576c62183d745c2d19605312c5264988ede6b0feb6fd9e5a2567
+ 74de8c32bffa4c7442a187548c3cc0b878e2c2b2f34a4009fdb09fe1a5287f74
+ 00c1d6ba56aef0121bc48db84500d5b0fdb67b93ec0719da024f96b425817115
+ 783e5458dad544dcef3ba2bada77d9d74d1856729f81a9a703cd6bdcaab77eeb
+ c63b8ea8ad7449c99c87cba1c7db2351aef0d4ad5e44aa7e74420f2b29579b9c
+ 28b08801c0e429d3de1a72e3c54653220305dd64ddb791a6c75d8f22c18cf9f9
+ e4b70ed881bb5cfe718e16d16570bd85887e87c859de72e2699bd6935b41c5c6
+ 86f15fa6884f8513921c57c7884d57fb00ecfd08284a54522b1e7ea463029e8e
+ 72eba55bf5f37386ed1fd81bf246ed99ba37a77d099cb78d60f8c145eab55545
+ 96ee4b5ebd85508e5dfa4cb1e12c36e47006b3aaed3779950dcf681678c23380
+ b060a98122104f8b0f9b352b5406ba92182a91078588caadbdf30f56f2682415
+ 5d511cf3086366c319e5ac900f20afd12fca2e245cd54656282ea39c86eb8764
+ 569949c84e9db4a9057f60f3b30739c17e06ac7fb9efac760e5af66dc283f8d9
+ 3aade6bf9b7fa18750dc31faaf330d67f053f7fc48fab9bd2569ad9c1409e518
+ 80868aa4719be5bae403a5d962ddb0097a1566f900ef20ae947c15ed2f647f89"
diff --git a/srcpkgs/firefox/files/firefox-wayland b/srcpkgs/firefox/files/firefox-wayland
index bd7b93c7a92..495f901320c 100644
--- a/srcpkgs/firefox/files/firefox-wayland
+++ b/srcpkgs/firefox/files/firefox-wayland
@@ -1,5 +1,2 @@
 #!/bin/sh
-
-export GDK_BACKEND=wayland
-
-exec /usr/lib/firefox/firefox "$@"
+exec env MOZ_ENABLE_WAYLAND= /usr/lib/firefox/firefox "$@"
diff --git a/srcpkgs/firefox/patches/initialize_sched_param.patch b/srcpkgs/firefox/patches/initialize_sched_param.patch
new file mode 100644
index 00000000000..ee593c3c217
--- /dev/null
+++ b/srcpkgs/firefox/patches/initialize_sched_param.patch
@@ -0,0 +1,22 @@
+source: https://github.com/padenot/audio_thread_priority/commit/a1443a02667c649cb72873a45b98fffbd2eac5a8
+
+commit a1443a02667c649cb72873a45b98fffbd2eac5a8
+Author: Paul Adenot <paul@paul.cx>
+Date:   Mon Aug 19 15:00:39 2019 +0200
+
+    initialize sched_param using std::mem::zeroed to fix compilation against other libc than glibc
+
+diff --git a/src/rt_linux.rs b/src/rt_linux.rs
+index d8c0114..fbb4fde 100644
+--- third_party/rust/audio_thread_priority/src/rt_linux.rs.orig	2019-09-03 22:57:00.197152845 +0200
++++ third_party/rust/audio_thread_priority/src/rt_linux.rs	2019-09-03 23:05:42.219159018 +0200
+@@ -93,8 +93,8 @@ pub fn promote_current_thread_to_real_time_internal(audio_buffer_frames: u32,
+ {
+     let thread_id = unsafe { libc::syscall(libc::SYS_gettid) };
+     let pthread_id = unsafe { libc::pthread_self() };
++    let mut param = unsafe { std::mem::zeroed::<libc::sched_param>() };
+     let mut policy = 0;
+-    let mut param = libc::sched_param { sched_priority: 0 };
+ 
+     if unsafe { libc::pthread_getschedparam(pthread_id, &mut policy, &mut param) } < 0 {
+         error!("pthread_getschedparam error {}", pthread_id);
diff --git a/srcpkgs/firefox/patches/ppc64le-bug-1512162.patch b/srcpkgs/firefox/patches/ppc64le-bug-1512162.patch
deleted file mode 100644
index ec38f2262be..00000000000
--- a/srcpkgs/firefox/patches/ppc64le-bug-1512162.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-
-diff --git a/js/xpconnect/src/XPCWrappedNative.cpp b/js/xpconnect/src/XPCWrappedNative.cpp
---- js/xpconnect/src/XPCWrappedNative.cpp
-+++ js/xpconnect/src/XPCWrappedNative.cpp
-@@ -1152,16 +1152,20 @@ bool XPCWrappedNative::CallMethod(XPCCal
-   if (NS_FAILED(rv)) {
-     return Throw(rv, ccx);
-   }
- 
-   JS::Rooted<CallMethodHelper> helper(ccx, /* init = */ ccx);
-   return helper.get().Call();
- }
- 
-+#if (__GNUC__ && __linux__ && __PPC64__ && _LITTLE_ENDIAN)
-+// Work around a compiler bug on ppc64le (bug 1512162).
-+__attribute__ ((noinline,noclone))
-+#endif
- bool CallMethodHelper::Call() {
-   mCallContext.SetRetVal(JS::UndefinedValue());
- 
-   mCallContext.GetContext()->SetPendingException(nullptr);
- 
-   if (mVTableIndex == 0) {
-     return QueryInterfaceFastPath();
-   }
-@@ -1310,16 +1314,20 @@ bool CallMethodHelper::GetOutParamSource
-         return false;
-       }
-     }
-   }
- 
-   return true;
- }
- 
-+#if (__GNUC__ && __linux__ && __PPC64__ && _LITTLE_ENDIAN)
-+// Work around a compiler bug on ppc64le (bug 1512162).
-+__attribute__ ((noinline,noclone))
-+#endif
- bool CallMethodHelper::GatherAndConvertResults() {
-   // now we iterate through the native params to gather and convert results
-   uint8_t paramCount = mMethodInfo->GetParamCount();
-   for (uint8_t i = 0; i < paramCount; i++) {
-     const nsXPTParamInfo& paramInfo = mMethodInfo->GetParam(i);
-     if (!paramInfo.IsOut()) {
-       continue;
-     }
-
-
-
-
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 82d454d0f68..ec5516269f3 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n".
 #
 pkgname=firefox
-version=68.0.2
+version=69.0.2
 revision=1
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
@@ -11,7 +11,7 @@ maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=9b3e6d8f99819f9eda9ebba403b644a2b96d19450b42cae422bbf4386902a840
+checksum=2904ef954626d2a7f320670ccb7cb5d9060610f091c94190a6cbee14aa2cd82e
 
 lib32disabled=yes
 
@@ -31,11 +31,6 @@ conflicts="firefox-esr>=0"
 build_options="alsa dbus pulseaudio startup_notification xscreensaver sndio wayland"
 build_options_default="alsa dbus pulseaudio startup_notification xscreensaver sndio wayland"
 
-# 19:55.85 /usr/bin/ld: failed to set dynamic section sizes: memory exhausted
-if [ "$XBPS_WORDSIZE" -eq 32 ]; then
-	nodebug=yes
-fi
-
 case $XBPS_TARGET_MACHINE in
 	armv6*)
 		broken="required NEON extensions are not supported on armv6"
@@ -44,6 +39,13 @@ case $XBPS_TARGET_MACHINE in
 	ppc*) broken="ftbfs in several places" ;;
 esac
 
+# we need this because cargo verifies checksums of all files in vendor
+# crates when it builds and gives us no way to override or update the
+# file sanely... so just clear out the file list
+_clear_vendor_checksums() {
+	sed -i 's/\("files":{\)[^}]*/\1/' third_party/rust/$1/.cargo-checksum.json
+}
+
 post_extract() {
 	case "$XBPS_TARGET_MACHINE" in
 	*-musl)
@@ -59,6 +61,11 @@ post_extract() {
 	# Note: This is for Void Linux use ONLY.
 	echo -n "cd894504-7a2a-4263-abff-ff73ee89ffca" > mozilla-api-key
 }
+
+post_patch() {
+	_clear_vendor_checksums audio_thread_priority
+}
+
 do_build() {
 	cp "${FILESDIR}/mozconfig" "${wrksrc}/.mozconfig"
 
@@ -104,19 +111,20 @@ do_build() {
 	mkdir -p third_party/rust/libloading/.deps
 
 	case "$XBPS_TARGET_MACHINE" in
-	i686*)
-		export CFLAGS+=" -D_FILE_OFFSET_BITS=64"
-		export CXXFLAGS+=" -D_FILE_OFFSET_BITS=64"
-		;;
 	armv7*)
 		export CFLAGS+=" -mfpu=neon -Wno-psabi"
 		export CXXFLAGS+=" -mfpu=neon -Wno-psabi"
 		;;
 	esac
 
-	if [ "$XBPS_WORDSIZE" -eq 32 ]; then
-		# ENOMEM
-		echo "ac_add_options --disable-debug-symbols" >>.mozconfig
+	# work around large debug symbols on 32-bit hosts
+	if [ "$XBPS_WORDSIZE" = "32" ]; then
+		export CFLAGS="${CFLAGS/-g/-g1}"
+		export CXXFLAGS="${CXXFLAGS/-g/-g1}"
+		export LDFLAGS+=" -Wl,--no-keep-memory"
+		# patch the rust debug level, this is hardcoded
+		sed -i "s/debug_info = '2'/debug_info = '1'/" \
+		build/moz.configure/toolchain.configure
 	fi
 
 	export LDFLAGS+=" -Wl,-rpath=/usr/lib/firefox"
diff --git a/srcpkgs/fish-shell/template b/srcpkgs/fish-shell/template
index b48ac921bda..9a3930ad586 100644
--- a/srcpkgs/fish-shell/template
+++ b/srcpkgs/fish-shell/template
@@ -7,7 +7,7 @@ build_style=cmake
 makedepends="ncurses-devel pcre2-devel gettext-devel"
 depends="bc groff"
 short_desc="User friendly shell intended mostly for interactive use"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://fishshell.com/"
 distfiles="https://github.com/fish-shell/fish-shell/releases/download/${version}/fish-${version}.tar.gz"
diff --git a/srcpkgs/flac/template b/srcpkgs/flac/template
index aa1a8b3fa52..03c29f4f72a 100644
--- a/srcpkgs/flac/template
+++ b/srcpkgs/flac/template
@@ -15,8 +15,11 @@ license="BSD-3-Clause, GPL-2"
 distfiles="https://downloads.xiph.org/releases/flac/flac-${version}.tar.xz"
 checksum=213e82bd716c9de6db2f98bcadbc4c24c7e2efe8c75939a1a84e28539c4e1748
 
+# TODO: make into options
 case "$XBPS_TARGET_MACHINE" in
-	ppc64|ppc64-musl) configure_args+=" --disable-vsx";;
+	ppc64le*) configure_args+=" --enable-altivec --enable-vsx" ;;
+	ppc64*) configure_args+=" --enable-altivec --disable-vsx" ;;
+	ppc*) configure_args+=" --disable-altivec --disable-vsx" ;;
 esac
 
 post_install() {
diff --git a/srcpkgs/flacon/template b/srcpkgs/flacon/template
index 016e1732d7d..907355a6413 100644
--- a/srcpkgs/flacon/template
+++ b/srcpkgs/flacon/template
@@ -1,6 +1,6 @@
 # Template file for 'flacon'
 pkgname=flacon
-version=5.2.0
+version=5.5.1
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="LGPL-2.1-or-later"
 homepage="https://flacon.github.io/"
 changelog="https://flacon.github.io/changelog/"
 distfiles="https://github.com/Flacon/flacon/archive/v${version}.tar.gz"
-checksum=701fb0ebee98a697baa3060645ca4203771714994bb1fa8eeebfd2274e4704ac
+checksum=bdeac2268536c790ede8928156c7a35019dd05ed1b16f04238394a238950d287
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/flake8/template b/srcpkgs/flake8/template
index 6a885e01ccb..d8f2b095644 100644
--- a/srcpkgs/flake8/template
+++ b/srcpkgs/flake8/template
@@ -1,6 +1,6 @@
 # Template file for 'flake8'
 pkgname=flake8
-version=3.7.7
+version=3.7.8
 revision=1
 archs=noarch
 build_style=python3-module
@@ -14,10 +14,10 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="MIT"
 homepage="https://gitlab.com/pycqa/flake8"
 distfiles="${PYPI_SITE}/f/flake8/flake8-${version}.tar.gz"
-checksum=859996073f341f2670741b51ec1e67a01da142831aa1fdc6242dbf88dffbe661
+checksum=19241c1cbc971b9962473e4438a2ca19749a7dd002dd1a946eaba171b4114548
 
 pre_build() {
-	sed -i '/setup_requires/d' setup.py
+	vsed -i '/setup_requires/d' setup.py
 }
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/flatbuffers/patches/install.patch b/srcpkgs/flatbuffers/patches/install.patch
deleted file mode 100644
index 6669eaffaa8..00000000000
--- a/srcpkgs/flatbuffers/patches/install.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -320,7 +320,7 @@ if(FLATBUFFERS_INSTALL)
-     install(
-       TARGETS flatc EXPORT FlatcTargets
-       RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
--      CONFIGURATIONS Release
-+      CONFIGURATIONS Release RelWithDebInfo
-     )
- 
-     install(
-@@ -328,7 +328,7 @@ if(FLATBUFFERS_INSTALL)
-       FILE FlatcTargets.cmake
-       NAMESPACE flatbuffers::
-       DESTINATION ${FB_CMAKE_DIR}
--      CONFIGURATIONS Release
-+      CONFIGURATIONS Release RelWithDebInfo
-     )
-   endif()
- 
diff --git a/srcpkgs/flatbuffers/template b/srcpkgs/flatbuffers/template
index 2888235df1a..d437677c768 100644
--- a/srcpkgs/flatbuffers/template
+++ b/srcpkgs/flatbuffers/template
@@ -1,20 +1,24 @@
 # Template file for 'flatbuffers'
 pkgname=flatbuffers
-version=1.10.0
+version=1.11.0
 revision=1
 build_style=cmake
 short_desc="Memory Efficient Serialization Library"
 maintainer="Elie ROUDNINSKI <xademax@gmail.com>"
-license="GPL-3.0-or-later"
+license="Apache-2.0"
 homepage="https://google.github.io/flatbuffers/"
 distfiles="https://github.com/google/${pkgname}/archive/v${version}.tar.gz"
-checksum=3714e3db8c51e43028e10ad7adffb9a36fc4aa5b1a363c2d0c4303dd1be59a7c
+checksum=3f4a286642094f45b1b77228656fbd7ea123964f19502f9ecfd29933fd23a50b
 
 if [ "$CROSS_BUILD" ]; then
 	# Disable tests to prevent executing target binaries on host
-	configure_args="-DFLATBUFFERS_BUILD_TESTS=OFF"
+	configure_args+=" -DFLATBUFFERS_BUILD_TESTS=OFF"
 fi
 
+case "$XBPS_TARGET_MACHINE" in
+	*-musl) configure_args+=" -DFLATBUFFERS_LOCALE_INDEPENDENT=0";;
+esac
+
 flatbuffers-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/flatpak-builder/template b/srcpkgs/flatpak-builder/template
index 1cc55f9ba13..056d33ce5ca 100644
--- a/srcpkgs/flatpak-builder/template
+++ b/srcpkgs/flatpak-builder/template
@@ -1,6 +1,6 @@
 # Template file for 'flatpak-builder'
 pkgname=flatpak-builder
-version=1.0.6
+version=1.0.9
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config xmlto"
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/flatpak/flatpak-builder"
 distfiles="${homepage}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=3b572ad7b7cce9ca6a8632ca69a49a47b20e99066fe064b7b56e7896dca789bb
+checksum=d6ef390a1cd927db1cfb12b6d2e340227a69de3fd64308316a3e6a89c1390d03
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" flatpak-devel"
diff --git a/srcpkgs/flatpak/template b/srcpkgs/flatpak/template
index d4bab0c9a13..0a572fd11a1 100644
--- a/srcpkgs/flatpak/template
+++ b/srcpkgs/flatpak/template
@@ -1,7 +1,7 @@
 # Template file for 'flatpak'
 pkgname=flatpak
-version=1.4.2
-revision=3
+version=1.5.0
+revision=1
 build_style=gnu-configure
 build_helper="gir"
 configure_args="
@@ -20,7 +20,7 @@ license="LGPL-2.1-or-later"
 homepage="https://flatpak.org/"
 changelog="https://github.com/flatpak/flatpak/blob/master/NEWS"
 distfiles="https://github.com/flatpak/flatpak/releases/download/${version}/flatpak-${version}.tar.xz"
-checksum=f2799a6d973a052529b52943021108f148706d3e69725ac7dd60bf6ac4bdd522
+checksum=1a13f4c54c136e728e96406846f26b84d9d5986caf17868aa73917d7588c471e
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/fldigi/template b/srcpkgs/fldigi/template
index 8e86893ebb4..8b34b4c8027 100644
--- a/srcpkgs/fldigi/template
+++ b/srcpkgs/fldigi/template
@@ -1,6 +1,6 @@
 # Template file for 'fldigi'
 pkgname=fldigi
-version=4.1.07
+version=4.1.08
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -11,4 +11,4 @@ maintainer="Andy Cobaugh <andrew.cobaugh@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="http://www.w1hkj.com"
 distfiles="http://www.w1hkj.com/files/fldigi/fldigi-${version}.tar.gz"
-checksum=dc4864b6e63c688b9dd932587bdaf7becfa17558380f7deff1236eb6b66921f0
+checksum=004b54fa4ff03c85e088bf1706270db5f3976afcaaf1003b4d6d3b0ef8007349
diff --git a/srcpkgs/flowblade/patches/00-add-bin-directories.patch b/srcpkgs/flowblade/patches/00-add-bin-directories.patch
index b73fe73df61..91622e5cc53 100644
--- a/srcpkgs/flowblade/patches/00-add-bin-directories.patch
+++ b/srcpkgs/flowblade/patches/00-add-bin-directories.patch
@@ -1,11 +1,11 @@
---- flowblade-trunk/flowblade	2019-02-04 02:29:07.000000000 -0700
-+++ flowblade-trunk/flowblade	2019-07-06 17:48:47.295155396 -0600
-@@ -34,7 +34,7 @@ print "Launch script dir:", launch_dir
+--- flowblade-trunk/flowblade	2019-08-31 20:09:32.877338976 +0200
++++ flowblade-trunk/flowblade	2019-08-31 20:09:50.706337258 +0200
+@@ -34,7 +34,7 @@
  
  # Update sys.path to include modules
  # When running on distro
--if launch_dir == "/usr/bin":
-+if launch_dir in {"/usr/bin", "/bin", "/usr/local/bin"}:
+-if launch_dir in {"bin", "/usr/bin", "/usr/local/bin"}:
++if launch_dir in {"/bin", "/usr/bin", "/usr/local/bin"}:
      print "Running from installation..."
      modules_path = "/usr/share/flowblade/Flowblade"
      if not os.path.isdir(modules_path):
diff --git a/srcpkgs/flowblade/template b/srcpkgs/flowblade/template
index 4e8e509f9f9..765ac779be1 100644
--- a/srcpkgs/flowblade/template
+++ b/srcpkgs/flowblade/template
@@ -1,7 +1,7 @@
 # Template file for 'flowblade'
 pkgname=flowblade
-version=2.0
-revision=2
+version=2.2
+revision=1
 archs=noarch
 build_wrksrc=flowblade-trunk
 build_style=python2-module
@@ -11,8 +11,8 @@ hostmakedepends="python-setuptools"
 depends="frei0r-plugins gmic mlt-python python-Pillow python-dbus gtk+3
  python-gobject python-numpy swh-plugins"
 short_desc="Non-linear video editor for Linux"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://jliljebl.github.io/flowblade/"
 distfiles="https://github.com/jliljebl/flowblade/archive/v${version}.tar.gz"
-checksum=c8f21d76803d9ed44585e6d960b12ba1930661e58ee36456fc424d41e2945b33
+checksum=4c7bc61d2d38dbf91bbae9f835fbf82504a47d973983427264706a0596573e70
diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template
index 793aa081ea1..3a3ab9cfc57 100644
--- a/srcpkgs/fmt/template
+++ b/srcpkgs/fmt/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF"
 short_desc="Modern formatting library"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/fmtlib/fmt"
 distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz"
diff --git a/srcpkgs/fmtools/template b/srcpkgs/fmtools/template
new file mode 100644
index 00000000000..9ae54b6cf28
--- /dev/null
+++ b/srcpkgs/fmtools/template
@@ -0,0 +1,11 @@
+# Template file for 'fmtools'
+pkgname=fmtools
+version=2.0.7
+revision=1
+build_style=gnu-configure
+short_desc="Utility for adjusting the frequency and volume of FM radio cards"
+maintainer="Foxlet <foxlet@furcode.co>"
+license="GPL-2.0-only"
+homepage="https://benpfaff.org/fmtools/"
+distfiles="https://benpfaff.org/fmtools/fmtools-${version}.tar.gz"
+checksum=75174e07d8cde6d4a8a5d7bbaa3a3b0760a850e7f6840cb7c6246227b18f5a39
diff --git a/srcpkgs/focuswriter/template b/srcpkgs/focuswriter/template
index 0999b4b8cdd..ca42da753d1 100644
--- a/srcpkgs/focuswriter/template
+++ b/srcpkgs/focuswriter/template
@@ -1,6 +1,6 @@
 # Template file for 'focuswriter'
 pkgname=focuswriter
-version=1.7.2
+version=1.7.3
 revision=1
 build_style=qmake
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://gottcode.org/focuswriter/"
 distfiles="https://github.com/gottcode/focuswriter/archive/v${version}.tar.gz"
-checksum=0d6c2795445f2d124ba2e7e1a12db20a4a25731215935f228794ae79f0cc553c
+checksum=3fed103a3088e2f71ead38f19b46726aabd5d2b2f27ef6716ce1b05cb609fb3d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-multimedia-devel"
diff --git a/srcpkgs/foliate/template b/srcpkgs/foliate/template
index 25b0f0badce..95d3ba64672 100644
--- a/srcpkgs/foliate/template
+++ b/srcpkgs/foliate/template
@@ -1,14 +1,14 @@
 # Template file for 'foliate'
 pkgname=foliate
-version=1.4.0
+version=1.5.3
 revision=1
 archs=noarch
 build_style=meson
-hostmakedepends="pkg-config gjs glib-devel ninja"
+hostmakedepends="pkg-config gjs glib-devel ninja desktop-file-utils"
 depends="webkit2gtk gjs"
 short_desc="Simple and modern GTK eBook reader"
 maintainer="lorem <notloremipsum@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://johnfactotum.github.io/foliate/"
 distfiles="https://github.com/johnfactotum/foliate/archive/${version}.tar.gz"
-checksum=481d051299dcc26918f453e635730313ad00fac33cc8d61594e4289fff1159fd
+checksum=95f45c0511493a3c732f9a199ddc2b5851a220d74d93e6d14976f29f243ee2d7
diff --git a/srcpkgs/folks/template b/srcpkgs/folks/template
index 376f1522505..9a75a1f3c7b 100644
--- a/srcpkgs/folks/template
+++ b/srcpkgs/folks/template
@@ -1,7 +1,7 @@
 # Template file for 'folks'
 pkgname=folks
-version=0.12.1
-revision=2
+version=0.13.1
+revision=1
 build_style=meson
 configure_args="-Db_lto=false -Dlibsocialweb-backend=false $(vopt_bool vala vala)"
 hostmakedepends="pkg-config intltool glib-devel $(vopt_if vala vala)
@@ -11,10 +11,10 @@ makedepends="readline-devel telepathy-glib-devel zeitgeist-devel
 depends="zeitgeist"
 short_desc="GObject Library to aggregate people into metacontacts"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="LGPL-2.1.0-or-later"
+license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Folks"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3ca9f2d50fdf5a7a3d3f59c49bd54ceaf8d8181938762370e07535f86d36d475
+checksum=3df1c663b82fe211aead2b31cae1fc41d124e85436375762f6745c45ba46aa5d
 nocross="Needs Vala, which needs evolution-dataserver GIR"
 
 # NOTE: Vala build opt is broken because upstream doesn't package all necessary
diff --git a/srcpkgs/font-FixedMisc/template b/srcpkgs/font-FixedMisc/template
index d4ad7c471a5..dc11ffcd791 100644
--- a/srcpkgs/font-FixedMisc/template
+++ b/srcpkgs/font-FixedMisc/template
@@ -1,6 +1,6 @@
 # Template file for 'font-FixedMisc'
 pkgname=font-FixedMisc
-version=20190604
+version=20190911
 revision=1
 archs=noarch
 wrksrc=FixedMisc
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="https://www.mirbsd.org/cvs.cgi/contrib/fonts/fixed/"
 distfiles="https://www.mirbsd.org/MirOS/dist/mir/Foundry/FixedMisc-${version}.tgz"
-checksum=6b883d84036f79d6d148313ff0a3c5389e516bd00497e6b610eab97965340a48
+checksum=1aa35a3128b3e5ca452467fca8150ad394054f60f847eca7296480bd23039dd7
 
 font_dirs="/usr/share/fonts/X11/misc"
 
diff --git a/srcpkgs/font-Hasklig/template b/srcpkgs/font-Hasklig/template
index eea3082cf8d..656492ec093 100644
--- a/srcpkgs/font-Hasklig/template
+++ b/srcpkgs/font-Hasklig/template
@@ -7,7 +7,7 @@ create_wrksrc=yes
 hostmakedepends="unzip"
 depends="font-util xbps-triggers"
 short_desc="Monospaced font with ligatures"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="OFL-1.1"
 homepage="https://github.com/i-tu/Hasklig/"
 distfiles="https://github.com/i-tu/Hasklig/releases/download/${version}/Hasklig-${version}.zip"
diff --git a/srcpkgs/font-awesome5/template b/srcpkgs/font-awesome5/template
index 0a027800f19..bb4cfcb0b58 100644
--- a/srcpkgs/font-awesome5/template
+++ b/srcpkgs/font-awesome5/template
@@ -1,16 +1,16 @@
 # Template file for 'font-awesome5'
 pkgname=font-awesome5
-version=5.10.1
+version=5.11.2
 revision=1
 archs=noarch
 wrksrc="Font-Awesome-${version}"
 depends="font-util"
 short_desc="Iconic font (version 5)"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="mobinmob <mobinmob@disroot.org>"
 license="OFL-1.1"
 homepage="https://fontawesome.com"
 distfiles="https://github.com/FortAwesome/Font-Awesome/archive/${version}.tar.gz"
-checksum=8c58f94b774ad7e1b86b2a0ec4de8795acdf7ad2fc5339276fd245023e74913a
+checksum=f4e4622b944267cbd063cb75c6b606924eea1f801bd3585075695f681cebd723
 conflicts="font-awesome>=0"
 font_dirs="/usr/share/fonts/OTF"
 
diff --git a/srcpkgs/font-firacode/template b/srcpkgs/font-firacode/template
index 534b1e217f7..ef7704f3a3a 100644
--- a/srcpkgs/font-firacode/template
+++ b/srcpkgs/font-firacode/template
@@ -1,6 +1,6 @@
 # Template file for 'font-firacode'
 pkgname=font-firacode
-version=1.207
+version=2
 revision=1
 archs=noarch
 create_wrksrc=yes
@@ -11,7 +11,7 @@ license="OFL-1.1"
 homepage="https://github.com/tonsky/${pkgname#*-}"
 changelog="https://github.com/tonsky/FiraCode/raw/master/CHANGELOG.md"
 distfiles="${homepage}/releases/download/${version}/${pkgname#*-}_${version}.zip"
-checksum=ba8d1a9ff3ad1bce7decc48db7a1e95c6116959cc5b9b80dc307b615eec3dfee
+checksum=60d5b1106b708cc134c521aae4e503bb1d2ec3c9bf8ad978f2c659820505d492
 font_dirs="/usr/share/fonts/OTF"
 
 do_install() {
diff --git a/srcpkgs/font-ibm-plex-ttf/template b/srcpkgs/font-ibm-plex-ttf/template
index 2de952c018a..fed6cc4c85b 100644
--- a/srcpkgs/font-ibm-plex-ttf/template
+++ b/srcpkgs/font-ibm-plex-ttf/template
@@ -1,6 +1,6 @@
 # Template file for 'font-ibm-plex-ttf'
 pkgname=font-ibm-plex-ttf
-version=2.0.0
+version=3.0.0
 revision=1
 archs=noarch
 wrksrc="plex-${version}"
@@ -10,7 +10,7 @@ maintainer="Vintodrimmer <vintodrimmer@protonmail.ch>"
 license="OFL-1.1"
 homepage="https://github.com/IBM/plex"
 distfiles="https://github.com/IBM/plex/archive/v${version}.tar.gz"
-checksum=5f19741813ffdb4218253dbb0be26b56bf021b8919c42f8c6762d64e71109063
+checksum=3f17785a532507b855e9efe0166d3dedb24451a832a8739ff4c5c191fd64058b
 
 font_dirs="/usr/share/fonts/TTF"
 
diff --git a/srcpkgs/font-ionicons-ttf/template b/srcpkgs/font-ionicons-ttf/template
index bb1afd2ea89..5a1b9153095 100644
--- a/srcpkgs/font-ionicons-ttf/template
+++ b/srcpkgs/font-ionicons-ttf/template
@@ -1,6 +1,6 @@
 # Template file for 'font-ionicons-ttf'
 pkgname=font-ionicons-ttf
-version=4.6.2
+version=4.6.3
 revision=1
 archs=noarch
 wrksrc="ionicons-$version"
@@ -10,7 +10,7 @@ maintainer="Daniel Eyßer <daniel.eysser@gmail.com>"
 license="MIT"
 homepage="https://ionicons.com/"
 distfiles="https://github.com/ionic-team/ionicons/archive/v${version}.tar.gz"
-checksum=fae86345ddeda1449ecb016010e473f5e036c2f8c0ac6514d141998f8934ea05
+checksum=de8d4208a95f82ba5336e4ce3729bed5bc530332083c44de49790d1f0081d321
 
 font_dirs="/usr/share/fonts/TTF"
 
diff --git a/srcpkgs/font-iosevka/template b/srcpkgs/font-iosevka/template
index 5db390c3a30..2e1ad9abaa3 100644
--- a/srcpkgs/font-iosevka/template
+++ b/srcpkgs/font-iosevka/template
@@ -1,6 +1,6 @@
 # Template file for 'font-iosevka'
 pkgname=font-iosevka
-version=2.2.1
+version=2.3.2
 revision=1
 archs=noarch
 create_wrksrc=yes
@@ -13,7 +13,7 @@ homepage="https://be5invis.github.io/Iosevka/"
 distfiles="https://raw.githubusercontent.com/be5invis/Iosevka/v${version}/LICENSE.md>LICENSE.txt
  https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-iosevka-${version}.zip"
 checksum="ecfd74a1d6749bf509cee122870da0186bccfae446e3f6bc5faff253577ab000
- 65cec2bc3672f8aa3cc427effa62a8aa9e26386db983ce0ff4a876e85bf77e5f"
+ dbb8737eb147dcfcb3e3130fb07193fc1308c9af3dd70cc850d6d73184ffea1a"
 
 font_dirs="/usr/share/fonts/TTF"
 
diff --git a/srcpkgs/font-material-design-icons-ttf/template b/srcpkgs/font-material-design-icons-ttf/template
index 111cd2c44b7..70565c4255b 100644
--- a/srcpkgs/font-material-design-icons-ttf/template
+++ b/srcpkgs/font-material-design-icons-ttf/template
@@ -7,7 +7,7 @@ wrksrc="material-design-icons-${version}"
 hostmakedepends="unzip"
 depends="font-util xbps-triggers"
 short_desc="Material Design icons by Google"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/google/material-design-icons"
 distfiles="https://github.com/google/material-design-icons/releases/download/${version}/material-design-icons-${version}.zip"
diff --git a/srcpkgs/font-mplus-ttf/template b/srcpkgs/font-mplus-ttf/template
index 865d8fad9a9..102d839baac 100644
--- a/srcpkgs/font-mplus-ttf/template
+++ b/srcpkgs/font-mplus-ttf/template
@@ -1,16 +1,16 @@
 # Template file for 'font-mplus-ttf'
 pkgname=font-mplus-ttf
-version=063
+version=063a
 revision=1
 archs=noarch
 wrksrc="mplus-TESTFLIGHT-${version}"
 depends="fontconfig font-util"
 short_desc="M+ Japanese outline fonts"
 maintainer="Satoshi Amemiya <amemiya@protonmail.com>"
-license="custom"
+license="CC0-1.0"
 homepage="https://mplus-fonts.osdn.jp/"
 distfiles="http://jaist.dl.osdn.jp/mplus-fonts/62344/mplus-TESTFLIGHT-${version}.tar.xz"
-checksum=149a5c97c35624d79ffb3cbbdd56559319085229acaf72b49b56adc5ede0979c
+checksum=44eb973b4b6aff574de454db105ddc23e6749c2294734bd9cb1e0d734e4cdd79
 font_dirs="/usr/share/fonts/TTF"
 
 do_install() {
diff --git a/srcpkgs/font-sarasa-gothic/template b/srcpkgs/font-sarasa-gothic/template
index eb31ac8b75c..15ef1025e18 100644
--- a/srcpkgs/font-sarasa-gothic/template
+++ b/srcpkgs/font-sarasa-gothic/template
@@ -1,6 +1,6 @@
 # Template file for 'font-sarasa-gothic'
 pkgname=font-sarasa-gothic
-version=0.8.0
+version=0.9.1
 revision=1
 archs=noarch
 create_wrksrc=yes
@@ -11,7 +11,7 @@ maintainer="B. Wilson <x@wilsonb.com>"
 license="OFL-1.1"
 homepage="https://github.com/be5invis/Sarasa-Gothic"
 distfiles="https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z"
-checksum=6a78ce58fc5c572e2f6e17d6af84589b26dc97cccaf253851496c6773ae40f65
+checksum=d8d0b566b2ca7ff0964e00a2fca7737cc73f041c3e3d3badbc62a10e07e2a83b
 
 font_dirs="/usr/share/fonts/TTF"
 
diff --git a/srcpkgs/font-spleen/template b/srcpkgs/font-spleen/template
index 82a443e418d..0bf164819ee 100644
--- a/srcpkgs/font-spleen/template
+++ b/srcpkgs/font-spleen/template
@@ -1,10 +1,9 @@
 # Template file for 'font-spleen'
 pkgname=font-spleen
-version=1.0.5
+version=1.5.0
 revision=1
 archs=noarch
 wrksrc="spleen-${version}"
-font_dirs="/usr/share/fonts/X11/spleen"
 hostmakedepends="bdftopcf"
 depends="font-util"
 short_desc="Monospaced bitmap fonts"
@@ -12,7 +11,8 @@ maintainer="Renato Aguiar <renato@renag.me>"
 license="BSD-2-Clause"
 homepage="https://github.com/fcambus/spleen"
 distfiles="https://github.com/fcambus/spleen/releases/download/${version}/spleen-${version}.tar.gz"
-checksum=cf26c313da53857353e48a93540845cf6f773908fe19d2a509249f061776dfe0
+checksum=a346844625416ede531bcb720bc786924792a0538fe90c8f1215d619dcd0f6c2
+font_dirs="/usr/share/fonts/X11/spleen"
 
 do_install() {
 	vmkdir usr/share/fonts/X11/spleen
@@ -21,6 +21,6 @@ do_install() {
 		bdftopcf -t $f | gzip -n9 > $out
 		vinstall $out 644 usr/share/fonts/X11/spleen
 	done
-	vinstall fonts.alias-spleen 644 usr/share/fonts/X11/spleen fonts.alias
+	vinstall fonts.alias 644 usr/share/fonts/X11/spleen
 	vlicense LICENSE
 }
diff --git a/srcpkgs/font-unifont-bdf/template b/srcpkgs/font-unifont-bdf/template
index a607a113744..63908286b21 100644
--- a/srcpkgs/font-unifont-bdf/template
+++ b/srcpkgs/font-unifont-bdf/template
@@ -1,6 +1,6 @@
 # Template file for 'font-unifont-bdf'
 pkgname=font-unifont-bdf
-version=12.1.02
+version=12.1.03
 revision=1
 archs=noarch
 create_wrksrc=yes
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://unifoundry.com/unifont/index.html"
 distfiles="http://unifoundry.com/pub/unifont/unifont-${version}/font-builds/unifont-${version}.bdf.gz"
-checksum=04d652be1e28a6d464965c75c71ac84633085cd0960c2687466651c34c94bd89
+checksum=6067bda8daa1f3c49d8876107992e19fc9ab905ad54c01c3131b9649977c3746
 font_dirs=/usr/share/fonts/misc
 
 do_install() {
diff --git a/srcpkgs/font-util/template b/srcpkgs/font-util/template
index f71db68e265..5b9946003b5 100644
--- a/srcpkgs/font-util/template
+++ b/srcpkgs/font-util/template
@@ -1,7 +1,7 @@
 # Template file for 'font-util'
 pkgname=font-util
-version=1.3.1
-revision=4
+version=1.3.2
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config bdftopcf"
 #
@@ -10,11 +10,11 @@ hostmakedepends="pkg-config bdftopcf"
 #
 depends="font-alias expat freetype fontconfig mkfontscale"
 short_desc="Tools for truncating and subseting of ISO10646-1 BDF fonts"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
-checksum=aa7ebdb0715106dd255082f2310dbaa2cd7e225957c2a77d719720c7cc92b921
+checksum=3ad880444123ac06a7238546fa38a2a6ad7f7e0cc3614de7e103863616522282
 lib32disabled=yes
 
 post_install() {
diff --git a/srcpkgs/font-vazir/template b/srcpkgs/font-vazir/template
index faea8ba6438..61d1651ea35 100755
--- a/srcpkgs/font-vazir/template
+++ b/srcpkgs/font-vazir/template
@@ -1,6 +1,6 @@
 # Template file for 'font-vazir'
 pkgname=font-vazir
-version=20.1.0
+version=21.1.0
 revision=1
 archs=noarch
 create_wrksrc=yes
@@ -11,7 +11,7 @@ maintainer="linarcx <linarcx@gmail.com>"
 license="OFL-1.1"
 homepage="https://github.com/rastikerdar/vazir-font"
 distfiles="https://github.com/rastikerdar/vazir-font/releases/download/v${version}/vazir-font-v${version}.zip"
-checksum=843f6bfbc7c214ab339f3e7a555bfeb20c6ddebbe3885a33a2c3b4098cf64576
+checksum=5a4abd2e5a21c1659d1a89232559a0936717a9bfaa586da1a3390ee2a3dc63a2
 
 font_dirs="/usr/share/fonts/TTF"
 
diff --git a/srcpkgs/forkstat/template b/srcpkgs/forkstat/template
index f9928be8323..f301b41bdba 100644
--- a/srcpkgs/forkstat/template
+++ b/srcpkgs/forkstat/template
@@ -1,6 +1,6 @@
 # Template file for 'forkstat'
 pkgname=forkstat
-version=0.02.10
+version=0.02.11
 revision=1
 build_style=gnu-makefile
 short_desc="Program that logs process fork(), exec() and exit() activity"
@@ -8,5 +8,5 @@ maintainer="Wilson Birney <wpb@360scada.com>"
 license="GPL-3.0-or-later"
 homepage="https://kernel.ubuntu.com/~cking/forkstat/"
 distfiles="https://kernel.ubuntu.com/~cking/tarballs/forkstat/forkstat-${version}.tar.xz"
-checksum=af039bcd9f11ee76721d96c2c65d7e9c8d5df0a3f688bcbe0a5add2dd5dbb6da
+checksum=717ad3c2a22f5dc68d51ac25cc86deb69820dffbc8ea1101b9792040a843921a
 CFLAGS="-DVERSION=\'\"${version}\"\'"
diff --git a/srcpkgs/fossil/template b/srcpkgs/fossil/template
index cb6a810b6db..19c29ffe70a 100644
--- a/srcpkgs/fossil/template
+++ b/srcpkgs/fossil/template
@@ -1,6 +1,6 @@
 # Template file for 'fossil'
 pkgname=fossil
-version=2.9
+version=2.10
 revision=1
 build_style=configure
 configure_args="--disable-internal-sqlite --prefix=/usr"
@@ -11,8 +11,11 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://www.fossil-scm.org"
 distfiles="https://www.fossil-scm.org/index.html/uv/fossil-src-${version}.tar.gz"
-checksum=1cb2ada92d43e3e7e008fe77f5e743d301c7ea34d4c36c42f255f873e73d8b4f
+checksum=d8a3776d2ce77385ed5ff20a2776d13bb534fb2508e87351e14e94f91cd12b10
 
+post_extract() {
+	vsed -i 's/test_system_sqlite$/# &/' auto.def  # failing on cross
+}
 post_install() {
 	vman fossil.1
 	vlicense COPYRIGHT-BSD2.txt LICENSE
diff --git a/srcpkgs/fotoxx/template b/srcpkgs/fotoxx/template
index 877f4804cdd..db8f3461a70 100644
--- a/srcpkgs/fotoxx/template
+++ b/srcpkgs/fotoxx/template
@@ -1,6 +1,6 @@
 # Template file for 'fotoxx'
 pkgname=fotoxx
-version=19.12
+version=19.17
 revision=1
 wrksrc=fotoxx
 build_style=gnu-makefile
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.kornelix.net/fotoxx/fotoxx.html"
 distfiles="https://www.kornelix.net/downloads/downloads/fotoxx-${version}.tar.gz"
-checksum=a5fa5ab5d2a4289c49fb87b0ffa843953daec3439686643db1edbc69ee65407c
+checksum=0da39c534205b6a8124a8191b2004d6deb56f1862077449e84733fa3a307408c
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) broken="execinfo.h is a GNU specific header, and doesn’t exist under musl.";;
@@ -27,4 +27,3 @@ post_install() {
 	rm -v ${DESTDIR}/usr/share/doc/fotoxx/{changelog.gz,copyright,fotoxx.man}
 	rm -rv ${DESTDIR}/usr/share/appdata
 }
-
diff --git a/srcpkgs/four-in-a-row/template b/srcpkgs/four-in-a-row/template
index e11d20dff2a..db1aae3d87d 100644
--- a/srcpkgs/four-in-a-row/template
+++ b/srcpkgs/four-in-a-row/template
@@ -1,13 +1,13 @@
 # Template file for 'four-in-a-row'
 pkgname=four-in-a-row
-version=3.32.0
-revision=2
+version=3.34.1
+revision=1
 build_style=meson
 hostmakedepends="glib-devel itstool pkg-config vala"
-makedepends="gtk+3-devel libcanberra-devel librsvg-devel"
+makedepends="gsound-devel gtk+3-devel libcanberra-devel librsvg-devel"
 short_desc="GNOME four in a row game"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Four-in-a-row"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f4a74ee13b1fc846f5045817477c3416551386a2bbf6a5d37da39fdbe6aa9c40
+checksum=239ced156386c51528d5ccf4f7c9c3788bcbafccac2ca0c42a9e6f2f60f65784
diff --git a/srcpkgs/fpc-src/template b/srcpkgs/fpc-src/template
index fe2f75fdee9..477b62368b6 100644
--- a/srcpkgs/fpc-src/template
+++ b/srcpkgs/fpc-src/template
@@ -4,7 +4,7 @@ version=3.0.4
 revision=1
 wrksrc="fpcbuild-${version}"
 short_desc="Source code for FreePascal compiler"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://www.freepascal.org"
 distfiles="ftp://ftp.freepascal.org/pub/fpc/dist/${version}/source/fpcbuild-${version}.tar.gz"
diff --git a/srcpkgs/frameworkintegration/template b/srcpkgs/frameworkintegration/template
index 048644f2624..24431fccd29 100644
--- a/srcpkgs/frameworkintegration/template
+++ b/srcpkgs/frameworkintegration/template
@@ -1,6 +1,6 @@
 # Template file for 'frameworkintegration'
 pkgname=frameworkintegration
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/frameworks/frameworkintegration"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a1a2bbb15d287b67643750cb5414ceb10c6583861dd5c00118010d409f106efb
+checksum=a080657c5fae216b596dd04cca7d0b1eb4b959264b788c08c22272fd2d351659
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python"
diff --git a/srcpkgs/freecad/patches/020-namespace-missing-std.patch b/srcpkgs/freecad/patches/020-namespace-missing-std.patch
new file mode 100644
index 00000000000..82033cd5afb
--- /dev/null
+++ b/srcpkgs/freecad/patches/020-namespace-missing-std.patch
@@ -0,0 +1,127 @@
+# reason: fix build with gcc9
+# upstream: yes
+
+diff --git src/3rdParty/salomesmesh/inc/Rn.h src/3rdParty/salomesmesh/inc/Rn.h
+index 6ec871d93..e92d2275a 100644
+--- src/3rdParty/salomesmesh/inc/Rn.h
++++ src/3rdParty/salomesmesh/inc/Rn.h
+@@ -180,12 +180,12 @@ class R4: public R3
+ {
+   friend std::ostream& operator <<(std::ostream& f, const R4 & P )
+   { f << P.x << ' ' << P.y << ' ' << P.z << ' ' << P.omega; return f; }
+-  friend istream& operator >>(istream& f,  R4 & P)
++  friend std::istream& operator >>(std::istream& f,  R4 & P)
+   { f >> P.x >>  P.y >>  P.z >> P.omega ; return f; }
+ 
+   friend std::ostream& operator <<(std::ostream& f, const R4 * P )
+   { f << P->x << ' ' << P->y << ' ' << P->z << ' ' << P->omega; return f; }
+-  friend istream& operator >>(istream& f,  R4 * P)
++  friend std::istream& operator >>(std::istream& f,  R4 * P)
+   { f >> P->x >>  P->y >>  P->z >> P->omega ; return f; }
+ 
+ public:  
+
+
+diff --git src/Mod/Drawing/App/DrawingExport.cpp src/Mod/Drawing/App/DrawingExport.cpp
+index 0c3c23231..550b12c25 100644
+--- src/Mod/Drawing/App/DrawingExport.cpp
++++ src/Mod/Drawing/App/DrawingExport.cpp
+@@ -81,6 +81,7 @@
+ #include <Base/Vector3D.h>
+ 
+ using namespace Drawing;
++using namespace std;
+ 
+ TopoDS_Edge DrawingOutput::asCircle(const BRepAdaptor_Curve& c) const
+ {
+diff --git src/Mod/Part/App/Geometry2d.cpp src/Mod/Part/App/Geometry2d.cpp
+index fb1de909c..979465533 100644
+--- src/Mod/Part/App/Geometry2d.cpp
++++ src/Mod/Part/App/Geometry2d.cpp
+@@ -83,6 +83,7 @@
+ #include <Mod/Part/App/Geom2d/OffsetCurve2dPy.h>
+ 
+ using namespace Part;
++using namespace std;
+ 
+ extern const char* gce_ErrorStatusText(gce_ErrorType et);
+ 
+diff --git src/Mod/Raytracing/App/AppRaytracingPy.cpp src/Mod/Raytracing/App/AppRaytracingPy.cpp
+index d48c51c97..1bb2b1b01 100644
+--- src/Mod/Raytracing/App/AppRaytracingPy.cpp
++++ src/Mod/Raytracing/App/AppRaytracingPy.cpp
+@@ -40,6 +40,8 @@
+ #include <Mod/Part/App/TopoShapePy.h>
+ #include <App/Application.h>
+ 
++using namespace std;
++
+ 
+ namespace Raytracing {
+ class Module : public Py::ExtensionModule<Module>
+diff --git src/Mod/Raytracing/App/LuxFeature.cpp src/Mod/Raytracing/App/LuxFeature.cpp
+index 930fe12b7..d1e0a0089 100644
+--- src/Mod/Raytracing/App/LuxFeature.cpp
++++ src/Mod/Raytracing/App/LuxFeature.cpp
+@@ -38,6 +38,7 @@
+ 
+ 
+ using namespace Raytracing;
++using namespace std;
+ 
+ PROPERTY_SOURCE(Raytracing::LuxFeature, Raytracing::RaySegment)
+ 
+diff --git src/Mod/Raytracing/App/RayFeature.cpp src/Mod/Raytracing/App/RayFeature.cpp
+index cdd2cb6dc..235a98685 100644
+--- src/Mod/Raytracing/App/RayFeature.cpp
++++ src/Mod/Raytracing/App/RayFeature.cpp
+@@ -36,6 +36,7 @@
+ 
+ 
+ using namespace Raytracing;
++using namespace std;
+ 
+ PROPERTY_SOURCE(Raytracing::RayFeature, Raytracing::RaySegment)
+ 
+diff --git src/Mod/TechDraw/App/Geometry.cpp src/Mod/TechDraw/App/Geometry.cpp
+index c10b63177..d34eeb9bb 100644
+--- src/Mod/TechDraw/App/Geometry.cpp
++++ src/Mod/TechDraw/App/Geometry.cpp
+@@ -80,6 +80,7 @@
+ #include "Geometry.h"
+ 
+ using namespace TechDraw;
++using namespace std;
+ 
+ // Collection of Geometric Features
+ Wire::Wire()
+
+
+--- src/Mod/Part/App/PropertyTopoShape.cpp
++++ src/Mod/Part/App/PropertyTopoShape.cpp
+@@ -281,11 +281,11 @@
+ static Standard_Boolean  BRepTools_Write(const TopoDS_Shape& Sh, 
+                                    const Standard_CString File)
+ {
+-  ofstream os;
++  std::ofstream os;
+ #if OCC_VERSION_HEX >= 0x060800
+-  OSD_OpenStream(os, File, ios::out);
++  OSD_OpenStream(os, File, std::ios::out);
+ #else
+-  os.open(File, ios::out);
++  os.open(File, std::ios::out);
+ #endif
+   if (!os.rdbuf()->is_open()) return Standard_False;
+ 
+
+--- src/Mod/Part/App/Geometry.cpp
++++ src/Mod/Part/App/Geometry.cpp
+@@ -141,6 +141,7 @@
+ #include "Geometry.h"
+ 
+ using namespace Part;
++using namespace std;
+ 
+ 
+ const char* gce_ErrorStatusText(gce_ErrorType et)
diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index e641ed2a603..9e9375c4444 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
 # Template file for 'freecad'
 pkgname=freecad
 version=0.18.3
-revision=1
+revision=2
 wrksrc="FreeCAD-${version}"
 build_style=cmake
 
diff --git a/srcpkgs/freecell-solver/template b/srcpkgs/freecell-solver/template
index 57a6df76b18..0de23aae8df 100644
--- a/srcpkgs/freecell-solver/template
+++ b/srcpkgs/freecell-solver/template
@@ -1,17 +1,17 @@
 # Template file for 'freecell-solver'
 pkgname=freecell-solver
-version=5.10.0
+version=5.12.0
 revision=1
 build_style=cmake
+configure_args="-DFCS_WITH_TEST_SUITE=OFF"
 hostmakedepends="perl-Template-Toolkit gperf perl-Path-Tiny
  pysolfc python3-pysol_cards python3-random2 python3-six"
-configure_args="-DFCS_WITH_TEST_SUITE=OFF"
-short_desc="Automatically solves layouts of Freecell and similar variants of solitaire"
+short_desc="Automatically solves Freecell and similar variants of solitaire"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="MIT"
 homepage="https://fc-solve.shlomifish.org/"
 distfiles="https://fc-solve.shlomifish.org/downloads/fc-solve/freecell-solver-${version}.tar.xz"
-checksum=cc8671d315e69f6b16fc52ee9fe7515671dcc286ce871b2c13347e1afcfbdd39
+checksum=2579b89a1d4b42308f64e3d97511dede84ccc7137af8c674b094cbf4eaf1d6db
 
 post_install() {
 	vlicense COPYING.txt
diff --git a/srcpkgs/freeipmi/template b/srcpkgs/freeipmi/template
index adcd64037ce..c79faf11ffa 100644
--- a/srcpkgs/freeipmi/template
+++ b/srcpkgs/freeipmi/template
@@ -1,6 +1,6 @@
 # Template file for 'freeipmi'
 pkgname=freeipmi
-version=1.6.3
+version=1.6.4
 revision=1
 build_style=gnu-configure
 configure_args="--without-systemdsystemunitdir ac_cv_header_sys_stropts_h=no"
@@ -12,7 +12,7 @@ license="GPL-3.0-or-later"
 # Changelog: http://www.gnu.org/software/freeipmi/NEWS
 homepage="http://www.gnu.org/software/freeipmi/"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=aad4e735a7ac4a1f8ade20caadb35dfefc2a352fa2ef41d3f6e589179917e1e9
+checksum=65dfbb95a30438ba247f01a58498862a37d2e71c8c950bcfcee459d079241a3c
 
 conf_files="/etc/freeipmi/*.conf"
 make_dirs="/var/cache/ipmiseld 0755 root root"
diff --git a/srcpkgs/fribidi/template b/srcpkgs/fribidi/template
index e90ef057beb..1a05f24153c 100644
--- a/srcpkgs/fribidi/template
+++ b/srcpkgs/fribidi/template
@@ -1,16 +1,16 @@
 # Template file for 'fribidi'
 pkgname=fribidi
-version=1.0.5
+version=1.0.7
 revision=1
 build_style=gnu-configure
 configure_args="--disable-docs"
 hostmakedepends="automake libtool pkg-config"
 short_desc="Free Implementation of the Unicode Bidirectional Algorithm"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/fribidi/fribidi/"
 distfiles="https://github.com/fribidi/fribidi/archive/v${version}.tar.gz"
-checksum=aee3a93d081c293eaca9157700f17dc780a0b6674bc911decc5aaa43aec9abd7
+checksum=4352e95aa26bc0c4a45a224d606df0aba5f17f8cadcbcde36dd976e585a320e8
 disable_parallel_build=yes
 
 pre_configure() {
diff --git a/srcpkgs/frp/template b/srcpkgs/frp/template
index ea9573a42a1..02289ab2483 100644
--- a/srcpkgs/frp/template
+++ b/srcpkgs/frp/template
@@ -1,6 +1,6 @@
 # Template file for 'frp'
 pkgname=frp
-version=0.28.0
+version=0.29.0
 revision=1
 build_style=go
 go_import_path=github.com/fatedier/frp
@@ -10,7 +10,7 @@ maintainer="Anachron <gith@cron.world>"
 license="Apache-2.0"
 homepage="https://github.com/fatedier/frp"
 distfiles="https://github.com/fatedier/frp/archive/v${version}.tar.gz"
-checksum=61afbd0e84fc1ab92eacce5a642e2590d1b8c1a972a78f6499165c1778aa62cf
+checksum=5d7980b81cfd055e3e5bb7a120098f94342656f647cb906ea075912f63568816
 
 conf_files="/etc/frp/*.ini"
 
diff --git a/srcpkgs/fselect/template b/srcpkgs/fselect/template
index 6197dab708e..93775c99ce2 100644
--- a/srcpkgs/fselect/template
+++ b/srcpkgs/fselect/template
@@ -1,6 +1,6 @@
 # Template file for 'fselect'
 pkgname=fselect
-version=0.6.3
+version=0.6.5
 revision=1
 build_style=cargo
 short_desc="Find files with SQL-like queries"
@@ -8,7 +8,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="Apache-2.0, MIT"
 homepage="https://github.com/jhspetersson/fselect"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=cc0655057cc4a6ce771670ff72b52468adac27efc6bda1db08039a37866f2858
+checksum=6c50f0c7874045bee7721c8dcb687fa1ba2278f4eb86c4e638d4b1c8592129a3
 
 post_install() {
 	vlicense LICENSE-MIT
diff --git a/srcpkgs/fuse-mp3fs/template b/srcpkgs/fuse-mp3fs/template
new file mode 100644
index 00000000000..75b031ad9cf
--- /dev/null
+++ b/srcpkgs/fuse-mp3fs/template
@@ -0,0 +1,14 @@
+# Template file for 'fuse-mp3fs'
+pkgname=fuse-mp3fs
+version=0.91
+revision=1
+wrksrc="mp3fs-${version}"
+build_style=gnu-configure
+hostmakedepends="pkg-config"
+makedepends="fuse-devel libflac-devel libvorbis-devel libid3tag-devel lame-devel"
+short_desc="FUSE client to transcode FLAC to MP3"
+maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://khenriks.github.io/mp3fs/"
+distfiles="https://github.com/khenriks/mp3fs/releases/download/v${version}/mp3fs-${version}.tar.gz"
+checksum=a47b5e351b7660e6f535a3c5b489c5a8191209957f8c0b8d066a5c221e8ecf92
diff --git a/srcpkgs/fuse-overlayfs/template b/srcpkgs/fuse-overlayfs/template
index 9de2b442941..d90f41438a5 100644
--- a/srcpkgs/fuse-overlayfs/template
+++ b/srcpkgs/fuse-overlayfs/template
@@ -1,16 +1,16 @@
 # Template file for 'fuse-overlayfs'
 pkgname=fuse-overlayfs
-version=0.5.1
+version=0.6.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="autoconf automake pkg-config"
 makedepends="fuse3-devel"
 short_desc="FUSE implementation for overlayfs"
-maintainer="Cameron Nemo <camerontnorman@gmail.com>"
+maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/containers/fuse-overlayfs"
 distfiles="https://github.com/containers/fuse-overlayfs/archive/v${version}.tar.gz"
-checksum=2f65877839a8b4a857197035f26c33f391d2af44fdfcc6c39e34050873071355
+checksum=e95590ce77cfff07779b977f4e8445cf82c9927391d21c41d1cc28326ad0133a
 
 pre_configure() {
 	./autogen.sh
diff --git a/srcpkgs/fuse-zip/template b/srcpkgs/fuse-zip/template
index 948133ad053..02f71f082f7 100644
--- a/srcpkgs/fuse-zip/template
+++ b/srcpkgs/fuse-zip/template
@@ -1,6 +1,6 @@
 # Template file for 'fuse-zip'
 pkgname=fuse-zip
-version=0.6.0
+version=0.7.0
 revision=1
 build_style=gnu-makefile
 make_build_args="all doc"
@@ -12,7 +12,7 @@ maintainer="Matthias von Faber <mvf@gmx.eu>"
 license="GPL-3.0-or-later"
 homepage="https://bitbucket.org/agalanin/fuse-zip"
 distfiles="${homepage}/downloads/${pkgname}-${version}.tar.gz"
-checksum=21985c78ab9787033cff7afe4d9a29252383fd28ce83eb0d9cc2b963a1c5d656
+checksum=47306bab2b8b0db8ca6fac01833ccfb4394ddae1943ab2e7020b1bdbb210410b
 
 pre_build() {
 	vsed -i '/^CXXFLAGS=/d' Makefile lib/Makefile
diff --git a/srcpkgs/fuse3/template b/srcpkgs/fuse3/template
index d3bd632c203..87ca26bb94e 100644
--- a/srcpkgs/fuse3/template
+++ b/srcpkgs/fuse3/template
@@ -1,6 +1,6 @@
 # Template file for 'fuse3'
 pkgname=fuse3
-version=3.6.2
+version=3.7.0
 revision=1
 wrksrc="fuse-${version}"
 build_style=meson
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/libfuse/libfuse"
 distfiles="https://github.com/libfuse/libfuse/releases/download/fuse-${version}/fuse-${version}.tar.xz"
-checksum=f45869427575e1e59ab743a67deb57addbf2cb8f9ce431199dbd40ddab71f281
+checksum=3aea4766da5e2751aba82e8f77047d5d3c412bc3c298e4ec9532e59d7bd73a7a
 conf_files="/etc/fuse.conf"
 
 post_install() {
diff --git a/srcpkgs/fvwm/template b/srcpkgs/fvwm/template
index 5d84887898a..f5c988338a9 100644
--- a/srcpkgs/fvwm/template
+++ b/srcpkgs/fvwm/template
@@ -1,7 +1,7 @@
 # Template file for 'fvwm'
 pkgname=fvwm
-version=2.6.8
-revision=2
+version=2.6.9
+revision=1
 build_style=gnu-configure
 hostmakedepends="libxslt pkg-config python"
 makedepends="fribidi-devel libXcursor-devel libXft-devel libXinerama-devel
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later, MIT"
 homepage="http://fvwm.org/"
 distfiles="https://github.com/fvwmorg/fvwm/releases/download/${version}/fvwm-${version}.tar.gz"
-checksum=fb36c9235d157411efb7383d09d7d4d25a90fe02d0b2b4f752ca4acc7e9bf341
+checksum=1bc64cf3ccd0073008758168327a8265b8059def9b239b451d6b9fab2cc391ae
 nocross=yes
 
 post_install() {
diff --git a/srcpkgs/fwup/template b/srcpkgs/fwup/template
index 72210e7bd4b..713aac43d0e 100644
--- a/srcpkgs/fwup/template
+++ b/srcpkgs/fwup/template
@@ -1,6 +1,6 @@
 # Template file for 'fwup'
 pkgname=fwup
-version=1.3.1
+version=1.3.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
@@ -9,10 +9,10 @@ checkdepends="mtools unzip zip dosfstools"
 short_desc="Configurable embedded Linux firmware update creator and runner"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="Apache-2.0"
-#changelog="https://github.com/fhunleth/fwup/raw/master/CHANGELOG.md"
+changelog="https://github.com/fhunleth/fwup/raw/master/CHANGELOG.md"
 homepage="https://github.com/fhunleth/fwup"
 distfiles="https://github.com/fhunleth/fwup/archive/v${version}.tar.gz"
-checksum=8bf62b9fa1f791394ca94bb973f0f52b2054c67d93a6c8f65e19e8545be5002f
+checksum=897580814709aabe1575d47c8d7a264f01dd6e65a62fa13f42b24416d0944c2b
 
 if [ -z "$CROSS_BUILD" ]; then
 	hostmakedepends+=" help2man"
@@ -25,5 +25,5 @@ pre_configure() {
 pre_check() {
 	# mtools.conf requires manual configuration for usage, but not for out tests
 	# so we just remove the unrecognized keyword
-	sed -i '/SAMPLE FILE/d' /etc/mtools.conf
+	vsed -i '/SAMPLE FILE/d' /etc/mtools.conf
 }
diff --git a/srcpkgs/fwupd/template b/srcpkgs/fwupd/template
index bb1e714de03..06a68a00754 100644
--- a/srcpkgs/fwupd/template
+++ b/srcpkgs/fwupd/template
@@ -1,6 +1,6 @@
 # Template file for 'fwupd'
 pkgname=fwupd
-version=1.2.10
+version=1.2.11
 revision=1
 build_style=meson
 build_helper="gir"
@@ -18,11 +18,11 @@ makedepends="libxmlb-devel cairo-devel colord-devel libarchive-devel
  sqlite-devel libsoup-devel gcab-devel pango-devel python3-gobject
  python3-Pillow elogind-devel"
 short_desc="Daemon to allow session software to update firmware"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/hughsie/fwupd"
 distfiles="https://github.com/hughsie/fwupd/archive/${version}.tar.gz"
-checksum=d9cd36f633e98a1b40f6020fd5e066ed05bfb445be69b8357806b0dd6ae189db
+checksum=8f9238053689aaa29e80328122012ddb3fb8a6432d19af24904b3db62ec167ca
 
 conf_files="
  /etc/dbus-1/system.d/org.freedesktop.fwupd.conf
diff --git a/srcpkgs/fwupdate/template b/srcpkgs/fwupdate/template
index 231f714913f..e00c79225b9 100644
--- a/srcpkgs/fwupdate/template
+++ b/srcpkgs/fwupdate/template
@@ -10,7 +10,7 @@ hostmakedepends="pkg-config"
 makedepends="elfutils-devel gnu-efi-libs libefivar-devel popt-devel"
 checkdepends="libabigail-tools"
 short_desc="Tool for using the ESRT and UpdateCapsule() to apply firmware updates"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/rhboot/fwupdate"
 distfiles="https://github.com/rhboot/fwupdate/releases/download/${version}/fwupdate-${version}.tar.bz2"
diff --git a/srcpkgs/g810-led/template b/srcpkgs/g810-led/template
index d978c0c7665..9bb9b6a548e 100644
--- a/srcpkgs/g810-led/template
+++ b/srcpkgs/g810-led/template
@@ -1,6 +1,6 @@
 # Template file for 'g810-led'
 pkgname=g810-led
-version=0.3.5
+version=0.3.9
 revision=1
 build_style=gnu-makefile
 makedepends="hidapi-devel"
@@ -9,7 +9,7 @@ maintainer="Alex Childs <misuchiru03+void@gmail.com>"
 license="GPL-3.0-only"
 homepage="https://github.com/MatMoul/g810-led/"
 distfiles="https://github.com/MatMoul/g810-led/archive/v${version}.tar.gz"
-checksum=8a971be4b77111aa54b250a39b6fcead78188f46999b2aa9b8280c2506753e69
+checksum=e08c3f411711dbaa0659d7b9d1ec9ab7c93d2e5a23352161092a83c7c8628b89
 
 do_install() {
 	vbin bin/g810-led
diff --git a/srcpkgs/gallery-dl/template b/srcpkgs/gallery-dl/template
index 22d69108df2..a1e8c633fe3 100644
--- a/srcpkgs/gallery-dl/template
+++ b/srcpkgs/gallery-dl/template
@@ -1,6 +1,6 @@
 # Template file for 'gallery-dl'
 pkgname=gallery-dl
-version=1.10.1
+version=1.10.5
 revision=1
 archs=noarch
 build_style=python3-module
@@ -13,4 +13,14 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/mikf/gallery-dl"
 changelog="https://raw.githubusercontent.com/mikf/gallery-dl/master/CHANGELOG.md"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=8b6da4cde53c15dbd2204b822c50f9828f6141cee167051075d719d7f4a8fad6
+checksum=0ed5935a5b40aad339f680c194bfe66be073a4c852b994606fb84bede86d5942
+
+post_build() {
+	make man completion
+}
+
+post_install() {
+	vmkdir usr/share/bash-completion/completions
+	mv ${DESTDIR}/usr/etc/bash_completion.d/gallery-dl.bash_completion \
+		${DESTDIR}/usr/share/bash-completion/completions/gallery-dl
+}
diff --git a/srcpkgs/gc/template b/srcpkgs/gc/template
index 3ef3f1b7c74..f7ed0c10010 100644
--- a/srcpkgs/gc/template
+++ b/srcpkgs/gc/template
@@ -7,7 +7,7 @@ configure_args="--enable-static --enable-mmap"
 hostmakedepends="pkg-config"
 makedepends="libatomic_ops-devel"
 short_desc="Garbage collector for C and C++"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.hboehm.info/gc/"
 distfiles="https://github.com/ivmai/bdwgc/releases/download/v${version}/gc-${version}.tar.gz"
diff --git a/srcpkgs/gcc/files/gccgo-musl.patch b/srcpkgs/gcc/files/gccgo-musl.patch
new file mode 100644
index 00000000000..cc3ed7d17ae
--- /dev/null
+++ b/srcpkgs/gcc/files/gccgo-musl.patch
@@ -0,0 +1,200 @@
+This is not among the normal patches as these changes are musl specific and
+there is no way to easily conditionalize it in source for some of the changes.
+
+Souurce: Adélie Linux, q66
+URL: https://code.foxkit.us/adelie/packages/tree/master/system/gcc
+
+--- Makefile.in
++++ Makefile.in
+@@ -46325,7 +46325,7 @@ configure-target-libgo:
+ 	esac; \
+ 	module_srcdir=libgo; \
+ 	rm -f no-such-file || : ; \
+-	CONFIG_SITE=no-such-file $(SHELL) \
++	CONFIG_SITE=no-such-file LIBS="-lucontext $$LIBS" $(SHELL) \
+ 	  $$s/$$module_srcdir/configure \
+ 	  --srcdir=$${topdir}/$$module_srcdir \
+ 	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+--- libgo/mksysinfo.sh
++++ libgo/mksysinfo.sh
+@@ -379,11 +379,7 @@ fi
+ # Some basic types.
+ echo 'type Size_t _size_t' >> ${OUT}
+ echo "type Ssize_t _ssize_t" >> ${OUT}
+-if grep '^const _HAVE_OFF64_T = ' gen-sysinfo.go > /dev/null 2>&1; then
+-  echo "type Offset_t _off64_t" >> ${OUT}
+-else
+-  echo "type Offset_t _off_t" >> ${OUT}
+-fi
++echo "type Offset_t _off_t" >> ${OUT}
+ echo "type Mode_t _mode_t" >> ${OUT}
+ echo "type Pid_t _pid_t" >> ${OUT}
+ echo "type Uid_t _uid_t" >> ${OUT}
+--- libgo/go/runtime/mem_gccgo.go
++++ libgo/go/runtime/mem_gccgo.go
+@@ -16,7 +16,7 @@ import (
+ //go:linkname sysFree runtime.sysFree
+ 
+ //extern mmap
+-func sysMmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off uintptr) unsafe.Pointer
++func sysMmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off int64) unsafe.Pointer
+ 
+ //extern munmap
+ func munmap(addr unsafe.Pointer, length uintptr) int32
+@@ -38,7 +38,7 @@ func init() {
+ 	}
+ }
+ 
+-func mmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off uintptr) (unsafe.Pointer, int) {
++func mmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off int64) (unsafe.Pointer, int) {
+ 	p := sysMmap(addr, n, prot, flags, fd, off)
+ 	if uintptr(p) == _MAP_FAILED {
+ 		return nil, errno()
+--- libgo/go/runtime/signal_gccgo.go
++++ libgo/go/runtime/signal_gccgo.go
+@@ -111,7 +111,7 @@ func getsig(i uint32) uintptr {
+ 	if sigaction(i, nil, &sa) < 0 {
+ 		// On GNU/Linux glibc rejects attempts to call
+ 		// sigaction with signal 32 (SIGCANCEL) or 33 (SIGSETXID).
+-		if GOOS == "linux" && (i == 32 || i == 33) {
++		if GOOS == "linux" && (i == 32 || i == 33 || i == 34) {
+ 			return _SIG_DFL
+ 		}
+ 		throw("sigaction read failure")
+--- libgo/go/syscall/errstr.go
++++ libgo/go/syscall/errstr.go
+@@ -5,7 +5,6 @@
+ // license that can be found in the LICENSE file.
+ 
+ // +build !hurd
+-// +build !linux
+ 
+ package syscall
+ 
+--- libgo/go/syscall/errstr_glibc.go
++++ /dev/null
+@@ -1,33 +0,0 @@
+-// errstr_glibc.go -- GNU/Linux and GNU/Hurd specific error strings.
+-
+-// Copyright 2010 The Go Authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
+-
+-// We use this rather than errstr.go because on GNU/Linux sterror_r
+-// returns a pointer to the error message, and may not use buf at all.
+-
+-// +build hurd linux
+-
+-package syscall
+-
+-import "unsafe"
+-
+-//sysnb	strerror_r(errnum int, b []byte) (errstr *byte)
+-//strerror_r(errnum _C_int, b *byte, len Size_t) *byte
+-
+-func Errstr(errnum int) string {
+-	a := make([]byte, 128)
+-	p := strerror_r(errnum, a)
+-	b := (*[1000]byte)(unsafe.Pointer(p))
+-	i := 0
+-	for b[i] != 0 {
+-		i++
+-	}
+-	// Lowercase first letter: Bad -> bad, but STREAM -> STREAM.
+-	if i > 1 && 'A' <= b[0] && b[0] <= 'Z' && 'a' <= b[1] && b[1] <= 'z' {
+-		c := b[0] + 'a' - 'A'
+-		return string(c) + string(b[1:i])
+-	}
+-	return string(b[:i])
+-}
+--- libgo/go/syscall/libcall_linux.go
++++ libgo/go/syscall/libcall_linux.go
+@@ -206,19 +206,19 @@ func Gettid() (tid int) {
+ //sys	Setxattr(path string, attr string, data []byte, flags int) (err error)
+ //setxattr(path *byte, name *byte, value *byte, size Size_t, flags _C_int) _C_int
+ 
+-//sys	splice(rfd int, roff *_loff_t, wfd int, woff *_loff_t, len int, flags int) (n int64, err error)
+-//splice(rfd _C_int, roff *_loff_t, wfd _C_int, woff *_loff_t, len Size_t, flags _C_uint) Ssize_t
++//sys	splice(rfd int, roff *_off_t, wfd int, woff *_off_t, len int, flags int) (n int64, err error)
++//splice(rfd _C_int, roff *_off_t, wfd _C_int, woff *_off_t, len Size_t, flags _C_uint) Ssize_t
+ func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error) {
+-	var lroff _loff_t
+-	var plroff *_loff_t
++	var lroff _off_t
++	var plroff *_off_t
+ 	if roff != nil {
+-		lroff = _loff_t(*roff)
++		lroff = _off_t(*roff)
+ 		plroff = &lroff
+ 	}
+-	var lwoff _loff_t
+-	var plwoff *_loff_t
++	var lwoff _off_t
++	var plwoff *_off_t
+ 	if woff != nil {
+-		lwoff = _loff_t(*woff)
++		lwoff = _off_t(*woff)
+ 		plwoff = &lwoff
+ 	}
+ 	n, err = splice(rfd, plroff, wfd, plwoff, len, flags)
+--- libgo/mksigtab.sh
++++ libgo/mksigtab.sh
+@@ -82,7 +82,7 @@ checksig _SIGPWR     '{_SigNotify, "SIGPWR: power failure restart"}'
+ checksig _SIGEMT     '{_SigThrow, "SIGEMT: emulate instruction executed"}'
+ checksig _SIGINFO    '{_SigNotify, "SIGINFO: status request from keyboard"}'
+ checksig _SIGTHR     '{_SigNotify, "SIGTHR: reserved"}'
+-checksig _SIGPOLL    '{_SigNotify, "SIGPOLL: pollable event occurred"}'
++#checksig _SIGPOLL    '{_SigNotify, "SIGPOLL: pollable event occurred"}'
+ checksig _SIGWAITING '{_SigNotify, "SIGWAITING: reserved signal no longer used by"}'
+ checksig _SIGLWP     '{_SigNotify, "SIGLWP: reserved signal no longer used by"}'
+ checksig _SIGFREEZE  '{_SigNotify, "SIGFREEZE: special signal used by CPR"}'
+@@ -95,10 +95,12 @@ checksig _SIGLOST '   {_SigNotify, "SIGLOST: resource lost (Sun); server died (G
+ 
+ # Special handling of signals 32 and 33 on GNU/Linux systems,
+ # because they are special to glibc.
++# Signal 34 is additionally special to Linux systems with musl.
+ if test "${GOOS}" = "linux"; then
+-    SIGLIST=$SIGLIST"_32__33_"
++    SIGLIST=$SIGLIST"_32__33__34_"
+     echo '	32: {_SigSetStack + _SigUnblock, "signal 32"}, /* SIGCANCEL; see issue 6997 */'
+     echo '	33: {_SigSetStack + _SigUnblock, "signal 33"}, /* SIGSETXID; see issues 3871, 9400, 12498 */'
++    echo '	34: {_SigSetStack + _SigUnblock, "signal 34"}, /* see issue 30062 */'
+ fi
+ 
+ if test "${GOOS}" = "aix"; then
+--- libgo/runtime/go-signal.c
++++ libgo/runtime/go-signal.c
+@@ -222,7 +222,11 @@ getSiginfo(siginfo_t *info, void *context __attribute__((unused)))
+ #endif
+ #ifdef __PPC__
+   #ifdef __linux__
+-	ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.regs->nip;
++    #ifdef __PPC64__
++	ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.gp_regs[32];
++    #else
++	ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.gregs[32];
++    #endif
+   #endif
+   #ifdef _AIX
+ 	ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.jmp_context.iar;
+@@ -343,7 +343,7 @@ dumpregs(siginfo_t *info __attribute__((unused)), void *context __attribute__((u
+   #endif
+ #endif
+ 
+-#if defined(__PPC__) && defined(__LITTLE_ENDIAN__)
++#if defined(__PPC__) && defined(__LITTLE_ENDIAN__) && defined(__GLIBC__)
+   #ifdef __linux__
+ 	  {
+ 		mcontext_t *m = &((ucontext_t*)(context))->uc_mcontext;
+--- libgo/sysinfo.c
++++ libgo/sysinfo.c
+@@ -73,9 +73,6 @@
+ #include <sys/times.h>
+ #include <sys/wait.h>
+ #include <sys/un.h>
+-#if defined(HAVE_SYS_USER_H)
+-#include <sys/user.h>
+-#endif
+ #if defined(HAVE_SYS_UTSNAME_H)
+ #include <sys/utsname.h>
+ #endif
diff --git a/srcpkgs/gcc/patches/bug90756.patch b/srcpkgs/gcc/patches/bug90756.patch
deleted file mode 100644
index cf78dad9cce..00000000000
--- a/srcpkgs/gcc/patches/bug90756.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Bug 90756 - [7/8/9 Regression] g++ ICE in convert_move, at expr.c:218 on i686 and s390x 
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90756
-
---- gcc/explow.c	2019/07/04 02:39:58	273035
-+++ gcc/explow.c	2019/07/04 04:49:22	273036
-@@ -892,16 +892,7 @@
- 
-   tree type = TREE_TYPE (name);
-   int unsignedp = TYPE_UNSIGNED (type);
--  machine_mode mode = TYPE_MODE (type);
--
--  /* Bypass TYPE_MODE when it maps vector modes to BLKmode.  */
--  if (mode == BLKmode)
--    {
--      gcc_assert (VECTOR_TYPE_P (type));
--      mode = type->type_common.mode;
--    }
--
--  machine_mode pmode = promote_mode (type, mode, &unsignedp);
-+  machine_mode pmode = promote_mode (type, TYPE_MODE (type), &unsignedp);
-   if (punsignedp)
-     *punsignedp = unsignedp;
- 
diff --git a/srcpkgs/gcc/patches/darn.patch b/srcpkgs/gcc/patches/darn.patch
new file mode 100644
index 00000000000..97f7de3f438
--- /dev/null
+++ b/srcpkgs/gcc/patches/darn.patch
@@ -0,0 +1,504 @@
+Upstream: yes
+Reference: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=91481
+
+https://gcc.gnu.org/viewcvs/gcc?view=revision&revision=275170
+https://gcc.gnu.org/viewcvs/gcc?view=revision&revision=275181
+
+Fixes a security issue with the hardware random number generator
+when compiling for POWER9. Since Void compiles for POWER8 by
+default, it's not affected, but people building custom binaries
+might be.
+
+--- gcc/config/rs6000/altivec.md
++++ gcc/config/rs6000/altivec.md
+@@ -80,9 +80,6 @@
+    UNSPEC_VUPKHPX
+    UNSPEC_VUPKLPX
+    UNSPEC_CONVERT_4F32_8I16
+-   UNSPEC_DARN
+-   UNSPEC_DARN_32
+-   UNSPEC_DARN_RAW
+    UNSPEC_DST
+    UNSPEC_DSTT
+    UNSPEC_DSTST
+@@ -161,9 +158,6 @@
+    UNSPEC_BCDADD
+    UNSPEC_BCDSUB
+    UNSPEC_BCD_OVERFLOW
+-   UNSPEC_CMPRB
+-   UNSPEC_CMPRB2
+-   UNSPEC_CMPEQB
+    UNSPEC_VRLMI
+    UNSPEC_VRLNM
+ ])
+@@ -4101,223 +4095,6 @@
+   "bcd<bcd_add_sub>. %0,%1,%2,%3"
+   [(set_attr "type" "vecsimple")])
+ 
+-(define_insn "darn_32"
+-  [(set (match_operand:SI 0 "register_operand" "=r")
+-        (unspec:SI [(const_int 0)] UNSPEC_DARN_32))]
+-  "TARGET_P9_MISC"
+-  "darn %0,0"
+-  [(set_attr "type" "integer")])
+-
+-(define_insn "darn_raw"
+-  [(set (match_operand:DI 0 "register_operand" "=r")
+-        (unspec:DI [(const_int 0)] UNSPEC_DARN_RAW))]
+-  "TARGET_P9_MISC && TARGET_64BIT"
+-  "darn %0,2"
+-  [(set_attr "type" "integer")])
+-
+-(define_insn "darn"
+-  [(set (match_operand:DI 0 "register_operand" "=r")
+-        (unspec:DI [(const_int 0)] UNSPEC_DARN))]
+-  "TARGET_P9_MISC && TARGET_64BIT"
+-  "darn %0,1"
+-  [(set_attr "type" "integer")])
+-
+-;; Test byte within range.
+-;;
+-;; The bytes of operand 1 are organized as xx:xx:xx:vv, where xx
+-;; represents a byte whose value is ignored in this context and
+-;; vv, the least significant byte, holds the byte value that is to
+-;; be tested for membership within the range specified by operand 2.
+-;; The bytes of operand 2 are organized as xx:xx:hi:lo.
+-;;
+-;; Return in target register operand 0 a value of 1 if lo <= vv and
+-;; vv <= hi.  Otherwise, set register operand 0 to 0.
+-;;
+-;; Though the instructions to which this expansion maps operate on
+-;; 64-bit registers, the current implementation only operates on
+-;; SI-mode operands as the high-order bits provide no information
+-;; that is not already available in the low-order bits.  To avoid the
+-;; costs of data widening operations, future enhancements might allow
+-;; DI mode for operand 0 and/or might allow operand 1 to be QI mode.
+-(define_expand "cmprb"
+-  [(set (match_dup 3)
+-	(unspec:CC [(match_operand:SI 1 "gpc_reg_operand" "r")
+-		    (match_operand:SI 2 "gpc_reg_operand" "r")]
+-	 UNSPEC_CMPRB))
+-   (set (match_operand:SI 0 "gpc_reg_operand" "=r")
+-	(if_then_else:SI (lt (match_dup 3)
+-			     (const_int 0))
+-			 (const_int -1)
+-			 (if_then_else (gt (match_dup 3)
+-					   (const_int 0))
+-				       (const_int 1)
+-				       (const_int 0))))]
+-  "TARGET_P9_MISC"
+-{
+-  operands[3] = gen_reg_rtx (CCmode);
+-})
+-
+-;; The bytes of operand 1 are organized as xx:xx:xx:vv, where xx
+-;; represents a byte whose value is ignored in this context and
+-;; vv, the least significant byte, holds the byte value that is to
+-;; be tested for membership within the range specified by operand 2.
+-;; The bytes of operand 2 are organized as xx:xx:hi:lo.
+-;;
+-;; Set bit 1 (the GT bit, 0x4) of CR register operand 0 to 1 if
+-;; lo <= vv and vv <= hi.  Otherwise, set the GT bit to 0.  The other
+-;; 3 bits of the target CR register are all set to 0.
+-(define_insn "*cmprb_internal"
+-  [(set (match_operand:CC 0 "cc_reg_operand" "=y")
+-	(unspec:CC [(match_operand:SI 1 "gpc_reg_operand" "r")
+-		    (match_operand:SI 2 "gpc_reg_operand" "r")]
+-	 UNSPEC_CMPRB))]
+-  "TARGET_P9_MISC"
+-  "cmprb %0,0,%1,%2"
+-  [(set_attr "type" "logical")])
+-
+-;; Set operand 0 register to -1 if the LT bit (0x8) of condition
+-;; register operand 1 is on.  Otherwise, set operand 0 register to 1
+-;; if the GT bit (0x4) of condition register operand 1 is on.
+-;; Otherwise, set operand 0 to 0.  Note that the result stored into
+-;; register operand 0 is non-zero iff either the LT or GT bits are on
+-;; within condition register operand 1.
+-(define_insn "setb_signed"
+-   [(set (match_operand:SI 0 "gpc_reg_operand" "=r")
+-	 (if_then_else:SI (lt (match_operand:CC 1 "cc_reg_operand" "y")
+-			      (const_int 0))
+-			  (const_int -1)
+-			  (if_then_else (gt (match_dup 1)
+-					    (const_int 0))
+-					(const_int 1)
+-					(const_int 0))))]
+-  "TARGET_P9_MISC"
+-  "setb %0,%1"
+-  [(set_attr "type" "logical")])
+-
+-(define_insn "setb_unsigned"
+-   [(set (match_operand:SI 0 "gpc_reg_operand" "=r")
+-	 (if_then_else:SI (ltu (match_operand:CCUNS 1 "cc_reg_operand" "y")
+-			      (const_int 0))
+-			  (const_int -1)
+-			  (if_then_else (gtu (match_dup 1)
+-					    (const_int 0))
+-					(const_int 1)
+-					(const_int 0))))]
+-  "TARGET_P9_MISC"
+-  "setb %0,%1"
+-  [(set_attr "type" "logical")])
+-
+-;; Test byte within two ranges.
+-;;
+-;; The bytes of operand 1 are organized as xx:xx:xx:vv, where xx
+-;; represents a byte whose value is ignored in this context and
+-;; vv, the least significant byte, holds the byte value that is to
+-;; be tested for membership within the range specified by operand 2.
+-;; The bytes of operand 2 are organized as hi_1:lo_1:hi_2:lo_2.
+-;;
+-;; Return in target register operand 0 a value of 1 if (lo_1 <= vv and
+-;; vv <= hi_1) or if (lo_2 <= vv and vv <= hi_2).  Otherwise, set register
+-;; operand 0 to 0.
+-;;
+-;; Though the instructions to which this expansion maps operate on
+-;; 64-bit registers, the current implementation only operates on
+-;; SI-mode operands as the high-order bits provide no information
+-;; that is not already available in the low-order bits.  To avoid the
+-;; costs of data widening operations, future enhancements might allow
+-;; DI mode for operand 0 and/or might allow operand 1 to be QI mode.
+-(define_expand "cmprb2"
+-  [(set (match_dup 3)
+-	(unspec:CC [(match_operand:SI 1 "gpc_reg_operand" "r")
+-		    (match_operand:SI 2 "gpc_reg_operand" "r")]
+-	 UNSPEC_CMPRB2))
+-   (set (match_operand:SI 0 "gpc_reg_operand" "=r")
+-	(if_then_else:SI (lt (match_dup 3)
+-			     (const_int 0))
+-			 (const_int -1)
+-			 (if_then_else (gt (match_dup 3)
+-					   (const_int 0))
+-				       (const_int 1)
+-				       (const_int 0))))]
+-  "TARGET_P9_MISC"
+-{
+-  operands[3] = gen_reg_rtx (CCmode);
+-})
+-
+-;; The bytes of operand 1 are organized as xx:xx:xx:vv, where xx
+-;; represents a byte whose value is ignored in this context and
+-;; vv, the least significant byte, holds the byte value that is to
+-;; be tested for membership within the ranges specified by operand 2.
+-;; The bytes of operand 2 are organized as hi_1:lo_1:hi_2:lo_2.
+-;;
+-;; Set bit 1 (the GT bit, 0x4) of CR register operand 0 to 1 if
+-;; (lo_1 <= vv and vv <= hi_1) or if (lo_2 <= vv and vv <= hi_2).
+-;; Otherwise, set the GT bit to 0.  The other 3 bits of the target
+-;; CR register are all set to 0.
+-(define_insn "*cmprb2_internal"
+-  [(set (match_operand:CC 0 "cc_reg_operand" "=y")
+-	(unspec:CC [(match_operand:SI 1 "gpc_reg_operand" "r")
+-		    (match_operand:SI 2 "gpc_reg_operand" "r")]
+-	 UNSPEC_CMPRB2))]
+-  "TARGET_P9_MISC"
+-  "cmprb %0,1,%1,%2"
+-  [(set_attr "type" "logical")])
+-
+-;; Test byte membership within set of 8 bytes.
+-;;
+-;; The bytes of operand 1 are organized as xx:xx:xx:vv, where xx
+-;; represents a byte whose value is ignored in this context and
+-;; vv, the least significant byte, holds the byte value that is to
+-;; be tested for membership within the set specified by operand 2.
+-;; The bytes of operand 2 are organized as e0:e1:e2:e3:e4:e5:e6:e7.
+-;;
+-;; Return in target register operand 0 a value of 1 if vv equals one
+-;; of the values e0, e1, e2, e3, e4, e5, e6, or e7.  Otherwise, set
+-;; register operand 0 to 0.  Note that the 8 byte values held within
+-;; operand 2 need not be unique.
+-;;
+-;; Though the instructions to which this expansion maps operate on
+-;; 64-bit registers, the current implementation requires that operands
+-;; 0 and 1 have mode SI as the high-order bits provide no information
+-;; that is not already available in the low-order bits.  To avoid the
+-;; costs of data widening operations, future enhancements might allow
+-;; DI mode for operand 0 and/or might allow operand 1 to be QI mode.
+-(define_expand "cmpeqb"
+-  [(set (match_dup 3)
+-	(unspec:CC [(match_operand:SI 1 "gpc_reg_operand" "r")
+-		    (match_operand:DI 2 "gpc_reg_operand" "r")]
+-	 UNSPEC_CMPEQB))
+-   (set (match_operand:SI 0 "gpc_reg_operand" "=r")
+-	(if_then_else:SI (lt (match_dup 3)
+-			     (const_int 0))
+-			 (const_int -1)
+-			 (if_then_else (gt (match_dup 3)
+-					   (const_int 0))
+-				       (const_int 1)
+-				       (const_int 0))))]
+-  "TARGET_P9_MISC && TARGET_64BIT"
+-{
+-  operands[3] = gen_reg_rtx (CCmode);
+-})
+-
+-;; The bytes of operand 1 are organized as xx:xx:xx:vv, where xx
+-;; represents a byte whose value is ignored in this context and
+-;; vv, the least significant byte, holds the byte value that is to
+-;; be tested for membership within the set specified by operand 2.
+-;; The bytes of operand 2 are organized as e0:e1:e2:e3:e4:e5:e6:e7.
+-;;
+-;; Set bit 1 (the GT bit, 0x4) of CR register operand 0 to 1 if vv
+-;; equals one of the values e0, e1, e2, e3, e4, e5, e6, or e7.  Otherwise,
+-;; set the GT bit to zero.  The other 3 bits of the target CR register
+-;; are all set to 0.
+-(define_insn "*cmpeqb_internal"
+-  [(set (match_operand:CC 0 "cc_reg_operand" "=y")
+-	 (unspec:CC [(match_operand:SI 1 "gpc_reg_operand" "r")
+-		     (match_operand:DI 2 "gpc_reg_operand" "r")]
+-	  UNSPEC_CMPEQB))]
+-  "TARGET_P9_MISC && TARGET_64BIT"
+-  "cmpeqb %0,%1,%2"
+-  [(set_attr "type" "logical")])
+-
+ (define_expand "bcd<bcd_add_sub>_<code>"
+   [(parallel [(set (reg:CCFP CR6_REGNO)
+ 		   (compare:CCFP
+--- gcc/config/rs6000/rs6000.md
++++ gcc/config/rs6000/rs6000.md
+@@ -137,6 +137,9 @@
+    UNSPEC_LSQ
+    UNSPEC_FUSION_GPR
+    UNSPEC_STACK_CHECK
++   UNSPEC_CMPRB
++   UNSPEC_CMPRB2
++   UNSPEC_CMPEQB
+    UNSPEC_ADD_ROUND_TO_ODD
+    UNSPEC_SUB_ROUND_TO_ODD
+    UNSPEC_MUL_ROUND_TO_ODD
+@@ -164,6 +167,9 @@
+    UNSPECV_EH_RR		; eh_reg_restore
+    UNSPECV_ISYNC		; isync instruction
+    UNSPECV_MFTB			; move from time base
++   UNSPECV_DARN			; darn 1 (deliver a random number)
++   UNSPECV_DARN_32		; darn 2
++   UNSPECV_DARN_RAW		; darn 0
+    UNSPECV_NLGR			; non-local goto receiver
+    UNSPECV_MFFS			; Move from FPSCR
+    UNSPECV_MFFSL		; Move from FPSCR light instruction version
+@@ -13853,6 +13859,224 @@
+   [(set_attr "type" "vecmove")
+    (set_attr "size" "128")])
+ 
++;; Miscellaneous ISA 3.0 (power9) instructions
++
++(define_insn "darn_32"
++  [(set (match_operand:SI 0 "register_operand" "=r")
++        (unspec_volatile:SI [(const_int 0)] UNSPECV_DARN_32))]
++  "TARGET_P9_MISC"
++  "darn %0,0"
++  [(set_attr "type" "integer")])
++
++(define_insn "darn_raw"
++  [(set (match_operand:DI 0 "register_operand" "=r")
++        (unspec_volatile:DI [(const_int 0)] UNSPECV_DARN_RAW))]
++  "TARGET_P9_MISC && TARGET_64BIT"
++  "darn %0,2"
++  [(set_attr "type" "integer")])
++
++(define_insn "darn"
++  [(set (match_operand:DI 0 "register_operand" "=r")
++        (unspec_volatile:DI [(const_int 0)] UNSPECV_DARN))]
++  "TARGET_P9_MISC && TARGET_64BIT"
++  "darn %0,1"
++  [(set_attr "type" "integer")])
++
++;; Test byte within range.
++;;
++;; The bytes of operand 1 are organized as xx:xx:xx:vv, where xx
++;; represents a byte whose value is ignored in this context and
++;; vv, the least significant byte, holds the byte value that is to
++;; be tested for membership within the range specified by operand 2.
++;; The bytes of operand 2 are organized as xx:xx:hi:lo.
++;;
++;; Return in target register operand 0 a value of 1 if lo <= vv and
++;; vv <= hi.  Otherwise, set register operand 0 to 0.
++;;
++;; Though the instructions to which this expansion maps operate on
++;; 64-bit registers, the current implementation only operates on
++;; SI-mode operands as the high-order bits provide no information
++;; that is not already available in the low-order bits.  To avoid the
++;; costs of data widening operations, future enhancements might allow
++;; DI mode for operand 0 and/or might allow operand 1 to be QI mode.
++(define_expand "cmprb"
++  [(set (match_dup 3)
++	(unspec:CC [(match_operand:SI 1 "gpc_reg_operand" "r")
++		    (match_operand:SI 2 "gpc_reg_operand" "r")]
++	 UNSPEC_CMPRB))
++   (set (match_operand:SI 0 "gpc_reg_operand" "=r")
++	(if_then_else:SI (lt (match_dup 3)
++			     (const_int 0))
++			 (const_int -1)
++			 (if_then_else (gt (match_dup 3)
++					   (const_int 0))
++				       (const_int 1)
++				       (const_int 0))))]
++  "TARGET_P9_MISC"
++{
++  operands[3] = gen_reg_rtx (CCmode);
++})
++
++;; The bytes of operand 1 are organized as xx:xx:xx:vv, where xx
++;; represents a byte whose value is ignored in this context and
++;; vv, the least significant byte, holds the byte value that is to
++;; be tested for membership within the range specified by operand 2.
++;; The bytes of operand 2 are organized as xx:xx:hi:lo.
++;;
++;; Set bit 1 (the GT bit, 0x4) of CR register operand 0 to 1 if
++;; lo <= vv and vv <= hi.  Otherwise, set the GT bit to 0.  The other
++;; 3 bits of the target CR register are all set to 0.
++(define_insn "*cmprb_internal"
++  [(set (match_operand:CC 0 "cc_reg_operand" "=y")
++	(unspec:CC [(match_operand:SI 1 "gpc_reg_operand" "r")
++		    (match_operand:SI 2 "gpc_reg_operand" "r")]
++	 UNSPEC_CMPRB))]
++  "TARGET_P9_MISC"
++  "cmprb %0,0,%1,%2"
++  [(set_attr "type" "logical")])
++
++;; Set operand 0 register to -1 if the LT bit (0x8) of condition
++;; register operand 1 is on.  Otherwise, set operand 0 register to 1
++;; if the GT bit (0x4) of condition register operand 1 is on.
++;; Otherwise, set operand 0 to 0.  Note that the result stored into
++;; register operand 0 is non-zero iff either the LT or GT bits are on
++;; within condition register operand 1.
++(define_insn "setb_signed"
++   [(set (match_operand:SI 0 "gpc_reg_operand" "=r")
++	 (if_then_else:SI (lt (match_operand:CC 1 "cc_reg_operand" "y")
++			      (const_int 0))
++			  (const_int -1)
++			  (if_then_else (gt (match_dup 1)
++					    (const_int 0))
++					(const_int 1)
++					(const_int 0))))]
++  "TARGET_P9_MISC"
++  "setb %0,%1"
++  [(set_attr "type" "logical")])
++
++(define_insn "setb_unsigned"
++   [(set (match_operand:SI 0 "gpc_reg_operand" "=r")
++	 (if_then_else:SI (ltu (match_operand:CCUNS 1 "cc_reg_operand" "y")
++			      (const_int 0))
++			  (const_int -1)
++			  (if_then_else (gtu (match_dup 1)
++					    (const_int 0))
++					(const_int 1)
++					(const_int 0))))]
++  "TARGET_P9_MISC"
++  "setb %0,%1"
++  [(set_attr "type" "logical")])
++
++;; Test byte within two ranges.
++;;
++;; The bytes of operand 1 are organized as xx:xx:xx:vv, where xx
++;; represents a byte whose value is ignored in this context and
++;; vv, the least significant byte, holds the byte value that is to
++;; be tested for membership within the range specified by operand 2.
++;; The bytes of operand 2 are organized as hi_1:lo_1:hi_2:lo_2.
++;;
++;; Return in target register operand 0 a value of 1 if (lo_1 <= vv and
++;; vv <= hi_1) or if (lo_2 <= vv and vv <= hi_2).  Otherwise, set register
++;; operand 0 to 0.
++;;
++;; Though the instructions to which this expansion maps operate on
++;; 64-bit registers, the current implementation only operates on
++;; SI-mode operands as the high-order bits provide no information
++;; that is not already available in the low-order bits.  To avoid the
++;; costs of data widening operations, future enhancements might allow
++;; DI mode for operand 0 and/or might allow operand 1 to be QI mode.
++(define_expand "cmprb2"
++  [(set (match_dup 3)
++	(unspec:CC [(match_operand:SI 1 "gpc_reg_operand" "r")
++		    (match_operand:SI 2 "gpc_reg_operand" "r")]
++	 UNSPEC_CMPRB2))
++   (set (match_operand:SI 0 "gpc_reg_operand" "=r")
++	(if_then_else:SI (lt (match_dup 3)
++			     (const_int 0))
++			 (const_int -1)
++			 (if_then_else (gt (match_dup 3)
++					   (const_int 0))
++				       (const_int 1)
++				       (const_int 0))))]
++  "TARGET_P9_MISC"
++{
++  operands[3] = gen_reg_rtx (CCmode);
++})
++
++;; The bytes of operand 1 are organized as xx:xx:xx:vv, where xx
++;; represents a byte whose value is ignored in this context and
++;; vv, the least significant byte, holds the byte value that is to
++;; be tested for membership within the ranges specified by operand 2.
++;; The bytes of operand 2 are organized as hi_1:lo_1:hi_2:lo_2.
++;;
++;; Set bit 1 (the GT bit, 0x4) of CR register operand 0 to 1 if
++;; (lo_1 <= vv and vv <= hi_1) or if (lo_2 <= vv and vv <= hi_2).
++;; Otherwise, set the GT bit to 0.  The other 3 bits of the target
++;; CR register are all set to 0.
++(define_insn "*cmprb2_internal"
++  [(set (match_operand:CC 0 "cc_reg_operand" "=y")
++	(unspec:CC [(match_operand:SI 1 "gpc_reg_operand" "r")
++		    (match_operand:SI 2 "gpc_reg_operand" "r")]
++	 UNSPEC_CMPRB2))]
++  "TARGET_P9_MISC"
++  "cmprb %0,1,%1,%2"
++  [(set_attr "type" "logical")])
++
++;; Test byte membership within set of 8 bytes.
++;;
++;; The bytes of operand 1 are organized as xx:xx:xx:vv, where xx
++;; represents a byte whose value is ignored in this context and
++;; vv, the least significant byte, holds the byte value that is to
++;; be tested for membership within the set specified by operand 2.
++;; The bytes of operand 2 are organized as e0:e1:e2:e3:e4:e5:e6:e7.
++;;
++;; Return in target register operand 0 a value of 1 if vv equals one
++;; of the values e0, e1, e2, e3, e4, e5, e6, or e7.  Otherwise, set
++;; register operand 0 to 0.  Note that the 8 byte values held within
++;; operand 2 need not be unique.
++;;
++;; Though the instructions to which this expansion maps operate on
++;; 64-bit registers, the current implementation requires that operands
++;; 0 and 1 have mode SI as the high-order bits provide no information
++;; that is not already available in the low-order bits.  To avoid the
++;; costs of data widening operations, future enhancements might allow
++;; DI mode for operand 0 and/or might allow operand 1 to be QI mode.
++(define_expand "cmpeqb"
++  [(set (match_dup 3)
++	(unspec:CC [(match_operand:SI 1 "gpc_reg_operand" "r")
++		    (match_operand:DI 2 "gpc_reg_operand" "r")]
++	 UNSPEC_CMPEQB))
++   (set (match_operand:SI 0 "gpc_reg_operand" "=r")
++	(if_then_else:SI (lt (match_dup 3)
++			     (const_int 0))
++			 (const_int -1)
++			 (if_then_else (gt (match_dup 3)
++					   (const_int 0))
++				       (const_int 1)
++				       (const_int 0))))]
++  "TARGET_P9_MISC && TARGET_64BIT"
++{
++  operands[3] = gen_reg_rtx (CCmode);
++})
++
++;; The bytes of operand 1 are organized as xx:xx:xx:vv, where xx
++;; represents a byte whose value is ignored in this context and
++;; vv, the least significant byte, holds the byte value that is to
++;; be tested for membership within the set specified by operand 2.
++;; The bytes of operand 2 are organized as e0:e1:e2:e3:e4:e5:e6:e7.
++;;
++;; Set bit 1 (the GT bit, 0x4) of CR register operand 0 to 1 if vv
++;; equals one of the values e0, e1, e2, e3, e4, e5, e6, or e7.  Otherwise,
++;; set the GT bit to zero.  The other 3 bits of the target CR register
++;; are all set to 0.
++(define_insn "*cmpeqb_internal"
++  [(set (match_operand:CC 0 "cc_reg_operand" "=y")
++	 (unspec:CC [(match_operand:SI 1 "gpc_reg_operand" "r")
++		     (match_operand:DI 2 "gpc_reg_operand" "r")]
++	  UNSPEC_CMPEQB))]
++  "TARGET_P9_MISC && TARGET_64BIT"
++  "cmpeqb %0,%1,%2"
++  [(set_attr "type" "logical")])
+ 
+ (define_insn "*nabs<mode>2_hw"
+   [(set (match_operand:IEEE128 0 "altivec_register_operand" "=v")
diff --git a/srcpkgs/gcc/patches/libffi_gnulinux.patch b/srcpkgs/gcc/patches/libffi_gnulinux.patch
new file mode 100644
index 00000000000..413b4aef5af
--- /dev/null
+++ b/srcpkgs/gcc/patches/libffi_gnulinux.patch
@@ -0,0 +1,11 @@
+--- libffi/src/closures.c.orig
++++ libffi/src/closures.c
+@@ -34,7 +34,7 @@
+ #include <ffi_common.h>
+
+ #if !FFI_MMAP_EXEC_WRIT && !FFI_EXEC_TRAMPOLINE_TABLE
+-# if __gnu_linux__ && !defined(__ANDROID__)
++# if __linux__ && !defined(__ANDROID__)
+ /* This macro indicates it may be forbidden to map anonymous memory
+    with both write and execute permission.  Code compiled when this
+    option is defined will attempt to map such pages once, but if it
diff --git a/srcpkgs/gcc/patches/non-nullness.patch b/srcpkgs/gcc/patches/non-nullness.patch
deleted file mode 100644
index 7e0e4425ce4..00000000000
--- a/srcpkgs/gcc/patches/non-nullness.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-Source: 2019-06-21  Jeff Law  <law@redhat.com>
-Upstream: yes
-Reason: PR tree-optimization/90949
-* tree-ssa-copy.c (fini_copy_prop): Use reset_flow_sensitive_info.
-* tree-ssanames.c (reset_flow_sensitive_info): Reset non-null state.
-
---- gcc/tree-ssa-copy.c	2019-01-01 13:31:55.000000000 +0100
-+++ gcc/tree-ssa-copy.c	2019-06-26 18:50:01.030395471 +0200
-@@ -545,13 +545,12 @@
- 	      duplicate_ssa_name_ptr_info (copy_of[i].value,
- 					   SSA_NAME_PTR_INFO (var));
- 	      /* Points-to information is cfg insensitive,
--		 but alignment info might be cfg sensitive, if it
--		 e.g. is derived from VRP derived non-zero bits.
--		 So, do not copy alignment info if the two SSA_NAMEs
--		 aren't defined in the same basic block.  */
-+		 but [E]VRP might record context sensitive alignment
-+		 info, non-nullness, etc.  So reset context sensitive
-+		 info if the two SSA_NAMEs aren't defined in the same
-+		 basic block.  */
- 	      if (var_bb != copy_of_bb)
--		mark_ptr_info_alignment_unknown
--				(SSA_NAME_PTR_INFO (copy_of[i].value));
-+		reset_flow_sensitive_info (copy_of[i].value);
- 	    }
- 	  else if (!POINTER_TYPE_P (TREE_TYPE (var))
- 		   && SSA_NAME_RANGE_INFO (var)
---- gcc/tree-ssanames.c	2019-03-18 14:59:11.000000000 +0100
-+++ gcc/tree-ssanames.c	2019-06-26 18:50:11.282394906 +0200
-@@ -820,7 +820,12 @@
-     {
-       /* points-to info is not flow-sensitive.  */
-       if (SSA_NAME_PTR_INFO (name))
--	mark_ptr_info_alignment_unknown (SSA_NAME_PTR_INFO (name));
-+	{
-+	  /* [E]VRP can derive context sensitive alignment info and
-+	     non-nullness properties.  We must reset both.  */
-+	  mark_ptr_info_alignment_unknown (SSA_NAME_PTR_INFO (name));
-+	  SSA_NAME_PTR_INFO (name)->pt.null = 1;
-+	}
-     }
-   else
-     SSA_NAME_RANGE_INFO (name) = NULL;
---- /dev/null
-+++ gcc/testsuite/gcc.c-torture/pr90949.c	2019-06-26 18:53:16.870384679 +0200
-@@ -0,0 +1,42 @@
-+void __attribute__ ((noipa, noinline)) my_puts (const char *str) { }
-+
-+void __attribute__ ((noipa, noinline)) my_free (void *p) { }
-+
-+
-+struct Node
-+{
-+  struct Node *child;
-+};
-+
-+struct Node space[2] = { };
-+
-+struct Node * __attribute__ ((noipa, noinline)) my_malloc (int bytes)
-+{
-+  return &space[0];
-+}
-+
-+void
-+walk (struct Node *module, int cleanup)
-+{
-+  if (module == 0)
-+    {
-+      return;
-+    }
-+  if (!cleanup)
-+    {
-+      my_puts ("No cleanup");
-+    }
-+  walk (module->child, cleanup);
-+  if (cleanup)
-+    {
-+      my_free (module);
-+    }
-+}
-+
-+int
-+main ()
-+{
-+  struct Node *node = my_malloc (sizeof (struct Node));
-+  node->child = 0;
-+  walk (node, 1);
-+}
diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index bab33d798ae..6774b8a5826 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -1,14 +1,14 @@
 # Template file for 'gcc'
 _majorver=9
-_minorver=${_majorver}.1
+_minorver=${_majorver}.2
 _gmp_version=6.1.2
-_mpfr_version=4.0.1
+_mpfr_version=4.0.2
 _mpc_version=1.1.0
-_isl_version=0.19
+_isl_version=0.21
 
 pkgname=gcc
 version=${_minorver}.0
-revision=3
+revision=1
 short_desc="GNU Compiler Collection"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 homepage="http://gcc.gnu.org"
@@ -20,11 +20,11 @@ distfiles="
  https://www.mpfr.org/mpfr-${_mpfr_version}/mpfr-${_mpfr_version}.tar.xz
  ${GNU_SITE}/mpc/mpc-${_mpc_version}.tar.gz
  http://isl.gforge.inria.fr/isl-${_isl_version}.tar.bz2"
-checksum="79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0
+checksum="ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
  87b565e89a9a684fe4ebeeddb8399dce2599f9c9049854ca8c0dfbdea0e21912
- 67874a60826303ee2fb6affc6dc0ddd3e749e9bfcb4c8655e3953d0458a6e16e
+ 1d3be708604eae0e42d578ba93b390c2a145f17743a744d8f3f8c2ad5855a38a
  6985c538143c1208dcb1ac42cedad6ff52e267b47e5f970183a3e75125b43c2e
- d59726f34f7852a081fbd3defd1ab2136f174110fc2e0c8d10bb122173fa9ed8"
+ d18ca11f8ad1a39ab6d03d3dcb3365ab416720fcb65b42d69f34f51bf0a0e859"
 
 nopie=yes
 lib32disabled=yes
@@ -32,6 +32,13 @@ bootstrap=yes
 replaces="gcc-gcj<7.2.0 gcc-gcj-jdk-compat<7.2.0 libmpx>=0 libmpx-devel>=0"
 alternatives="cc:cc:/usr/bin/gcc"
 
+_have_gccgo=yes
+
+# MIPS does not have libucontext yet
+case "$XBPS_TARGET_MACHINE" in
+	mips*-musl) _have_gccgo=no ;;
+esac
+
 if [ "$CHROOT_READY" ]; then
 	hostmakedepends="perl flex"
 fi
@@ -67,14 +74,13 @@ fi
 
 if [ "$CHROOT_READY" ]; then
 	subpackages+=" gcc-fortran libgfortran-devel libgfortran"
-	if [ -z "$CROSS_BUILD" ]; then
-		subpackages+=" gcc-objc gcc-objc++ libobjc-devel libobjc"
-		case "$XBPS_TARGET_MACHINE" in
-		*-musl)	# Go won't link for musl libc
-			;;
-		*)	subpackages+=" gcc-go gcc-go-tools libgo-devel libgo"
-			;;
-		esac
+	subpackages+=" gcc-objc gcc-objc++ libobjc-devel libobjc"
+	if [ "$_have_gccgo" = "yes" ]; then
+		subpackages+=" gcc-go gcc-go-tools libgo-devel libgo"
+		# we need this for gcc-go on musl
+		if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+			makedepends+=" libucontext-devel"
+		fi
 	fi
 fi
 
@@ -129,7 +135,6 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" cross-${_triplet}"
-	export GFORTRAN_FOR_TARGET=" ${_triplet}-gfortran"
 	if [ "$build_option_ada" ]; then
 		hostmakedepends+=" gcc-ada libada-devel"
 	fi
@@ -162,7 +167,10 @@ pre_configure() {
 	# _FORTIFY_SOURCE needs an optimization level.
 	sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" {gcc,libiberty}/configure
 	case "$XBPS_TARGET_MACHINE" in
-		*-musl) patch -p1 -i ${FILESDIR}/libgnarl-musl.patch ;;
+		*-musl)
+			patch -p1 -i ${FILESDIR}/libgnarl-musl.patch
+			patch -p0 -i ${FILESDIR}/gccgo-musl.patch
+			;;
 	esac
 }
 do_configure() {
@@ -216,26 +224,26 @@ do_configure() {
 		export CC_FOR_TARGET="$CC"
 		export GCC_FOR_TARGET="$CC"
 		export CXX_FOR_TARGET="$CXX"
+		export GOC_FOR_TARGET="${_triplet}-gccgo"
+		export GFORTRAN_FOR_TARGET="${_triplet}-gfortran"
 
 		_args+=" --host=$XBPS_CROSS_TRIPLET"
 		_args+=" --with-build-sysroot=${XBPS_CROSS_BASE}"
 		_args+=" --enable-sjlj-exceptions=no"
-		_langs+=",fortran"
+		_langs+=",objc,obj-c++,fortran"
 	elif [ -z "$CHROOT_READY" ]; then
 		export LD_LIBRARY_PATH="${XBPS_MASTERDIR}/usr/lib"
 		_args+=" --build=${_triplet}"
 	else
 		_langs="c,c++,objc,obj-c++,fortran,lto"
-		case "$XBPS_TARGET_MACHINE" in
-			*-musl)	# Linking libgo.so is broken for musl libc
-				;;
-			*)	_langs+=",go"
-				;;
-		esac
 		_args+=" --build=${_triplet}"
 		_args+=" --enable-fast-character"
 	fi
 
+	if [ "$_have_gccgo" = "yes" ]; then
+		_langs+=",go"
+	fi
+
 	case "$XBPS_TARGET_MACHINE" in
 		*-musl) _args+=" --disable-libsanitizer";;
 	esac
diff --git a/srcpkgs/gcdemu/template b/srcpkgs/gcdemu/template
index 70841043db3..6dba7c01bb6 100644
--- a/srcpkgs/gcdemu/template
+++ b/srcpkgs/gcdemu/template
@@ -1,6 +1,6 @@
 # Template file for 'gcdemu'
 pkgname=gcdemu
-version=3.2.1
+version=3.2.3
 revision=1
 archs=noarch
 wrksrc="gcdemu-${version}"
@@ -12,4 +12,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://cdemu.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/cdemu/gcdemu-${version}.tar.bz2"
-checksum=aff033fb19b1e7f6c001780ccf7c54743de26113720c2526aa8c9fe216dcbe52
+checksum=e4794a36f932e1044cdb04eac506bdc3bb3c9cbad6a8a1a463472305b90a7ea7
diff --git a/srcpkgs/gcompris-qt/template b/srcpkgs/gcompris-qt/template
index 725c71638bf..2c7d2fed9f0 100644
--- a/srcpkgs/gcompris-qt/template
+++ b/srcpkgs/gcompris-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'gcompris-qt'
 pkgname=gcompris-qt
-version=0.96
+version=0.97
 revision=1
 build_style=cmake
 configure_args="-DQML_BOX2D_LIBRARY=/usr/lib/qt5/qml/Box2D.2.0"
@@ -15,7 +15,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://gcompris.net/index-en.html"
 distfiles="https://gcompris.net/download/qt/src/gcompris-qt-${version}.tar.xz"
-checksum=a2bc2ce6e2687120d7ff2dee036fd85cfed70a793a9cc385b786d054681c8818
+checksum=2b8911a9121fe1c754afae4084092552b0dd21aba1a36b2653f485b0f659c2ef
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/gdb/template b/srcpkgs/gdb/template
index 8d3c51745d4..9f84e4869e9 100644
--- a/srcpkgs/gdb/template
+++ b/srcpkgs/gdb/template
@@ -1,6 +1,6 @@
 # Template file for 'gdb'
 pkgname=gdb
-version=8.3
+version=8.3.1
 revision=1
 build_style=gnu-configure
 pycompile_dirs="/usr/share/gdb"
@@ -10,12 +10,12 @@ configure_args="--disable-werror --disable-nls --with-system-readline
  $(vopt_if python --with-python=/usr/bin/python3)"
 hostmakedepends="perl $(vopt_if python python3-devel)"
 makedepends="ncurses-devel zlib-devel readline-devel expat-devel $(vopt_if python 'python3-devel gettext-libs')"
-short_desc="The GNU Debugger"
-maintainer="Orphaned <orphan@voidlinux.org>"
+short_desc="GNU Debugger"
+maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/gdb/"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=802f7ee309dcc547d65a68d61ebd6526762d26c3051f52caebe2189ac1ffd72e
+checksum=1e55b4d7cdca7b34be12f4ceae651623aa73b2fd640152313f9f66a7149757c4
 patch_args="-Np1"
 
 if [ "${CROSS_BUILD}" ]; then
diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index ee3a71f2900..d9947d330ef 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,7 +1,7 @@
 # Template file for 'gdm'
 pkgname=gdm
-version=3.32.0
-revision=2
+version=3.34.1
+revision=1
 build_helper="gir"
 build_style=gnu-configure
 configure_args="$(vopt_enable gir introspection)
@@ -21,7 +21,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GDM"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=643db0c8c5089a96282b4c259b8823ca6dfad1ead6f2d0025d1c1211d36fd78b
+checksum=e85df657aa8d9361af4fb122014d8f123a93bfe45a7662fba2b373d839dbd8d3
 nocross="gnome-shell can't be crosscompiled yet"
 
 conf_files="
diff --git a/srcpkgs/geany-plugins/template b/srcpkgs/geany-plugins/template
index db0775ae22f..7047183241d 100644
--- a/srcpkgs/geany-plugins/template
+++ b/srcpkgs/geany-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'geany-plugins'
 pkgname=geany-plugins
-version=1.35.0
-revision=2
+version=1.36.0
+revision=1
 build_style=gnu-configure
 configure_args="PYTHON=/usr/bin/python2 --enable-all-plugins --disable-devhelp
  --disable-webhelper --disable-debugger --disable-geanypy --disable-multiterm"
@@ -15,7 +15,7 @@ maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://plugins.geany.org"
 distfiles="https://github.com/geany/${pkgname}/archive/${version}.tar.gz"
-checksum=8a46ed8ed79443ec891e0ac2da039ece666de1601178afe030dd50bcd6515fce
+checksum=39409e948502a7d6d88a290f201b7c6c678ce8ecaff7c73589ee0f6dcc059568
 
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh
@@ -52,4 +52,3 @@ geany-plugins-extra_package() {
 		vmove usr/lib/geany-plugins/geanylua
 	}
 }
-
diff --git a/srcpkgs/geany/template b/srcpkgs/geany/template
index 0cbd92aeafd..e99051eedb8 100644
--- a/srcpkgs/geany/template
+++ b/srcpkgs/geany/template
@@ -1,6 +1,6 @@
 # Template file for 'geany'
 pkgname=geany
-version=1.35
+version=1.36
 revision=1
 build_style=gnu-configure
 configure_args="--enable-vte --enable-gtk3"
@@ -9,11 +9,11 @@ hostmakedepends="automake gettext-devel glib-devel libtool pkg-config intltool
 makedepends="gtk+3-devel"
 depends="hicolor-icon-theme desktop-file-utils"
 short_desc="Fast and lightweight IDE"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://www.geany.org"
 distfiles="https://download.${pkgname}.org/${pkgname}-${version}.tar.bz2"
-checksum=35ee1d3ddfadca8bf1764e174ba3a5f348b1f1f430d32a36295b7706b7753d9d
+checksum=9184dd3dd40b7b84fca70083284bb9dbf2ee8022bf2be066bdc36592d909d53e
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/geary/template b/srcpkgs/geary/template
index 91d1f6cc8d5..94798e329a2 100644
--- a/srcpkgs/geary/template
+++ b/srcpkgs/geary/template
@@ -1,6 +1,6 @@
 # Template file for 'geary'
 pkgname=geary
-version=3.32.2
+version=3.34.1
 revision=1
 build_helper="gir"
 build_style=meson
@@ -8,14 +8,14 @@ configure_args="-Dcontractor=true"
 hostmakedepends="desktop-file-utils iso-codes pkg-config itstool
  gobject-introspection vala glib-devel"
 makedepends="enchant2-devel gcr-devel gmime-devel libsoup-devel libglib-devel
- libgee08-devel libnotify-devel libsecret-devel webkit2gtk-devel libxml2-devel
+ libgee08-devel libsecret-devel webkit2gtk-devel libxml2-devel
  gnome-online-accounts-devel json-glib-devel libunwind-devel libcanberra-devel
- folks-devel"
+ folks-devel appstream-glib-devel gspell-devel ytnef-devel libhandy-devel"
 depends="gir-freedesktop gnome-keyring"
 short_desc="Lightweight email program for the GNOME desktop"
-maintainer="Cameron Nemo <camerontnorman@gmail.com>"
+maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Apps/Geary"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/geary-${version}.tar.xz"
-checksum=f821632356f1c0f694e6fe7c301952fa393e3522a0151f718348ec80f01fe569
+checksum=7ba4948312f556d972a8e899ec62f677862714b3b4817403c4eca614d03ba5af
 nocross="folks GIR can't be crossbuilt"
diff --git a/srcpkgs/geckodriver/template b/srcpkgs/geckodriver/template
index 9c019745d1a..34e4b9d996f 100644
--- a/srcpkgs/geckodriver/template
+++ b/srcpkgs/geckodriver/template
@@ -1,6 +1,6 @@
 # Template file for 'geckodriver'
 pkgname=geckodriver
-version=0.24.0
+version=0.25.0
 revision=1
 build_style=cargo
 short_desc="WebDriver for Firefox"
@@ -8,7 +8,7 @@ maintainer="m3tav3rse <n6maa10816@tuta.io>"
 license="MPL-2.0"
 homepage="https://github.com/mozilla/geckodriver"
 distfiles="https://github.com/mozilla/geckodriver/archive/v${version}.tar.gz"
-checksum=e6f86b3b6411f078c0a762f978c00ee99926463036a68be01d111bd91f25340e
+checksum=9ba9b1be1a2e47ddd11216ce863903853975a4805e72b9ed5da8bcbcaebbcea9
 
 case $XBPS_TARGET_MACHINE in
 	armv6*)
diff --git a/srcpkgs/geda/patches/snarf_cpp_opts.patch b/srcpkgs/geda/patches/snarf_cpp_opts.patch
new file mode 100644
index 00000000000..1eec9b6f6db
--- /dev/null
+++ b/srcpkgs/geda/patches/snarf_cpp_opts.patch
@@ -0,0 +1,17 @@
+--- gschem/src/Makefile.orig	2019-10-08 20:33:14.000000000 +0200
++++ gschem/src/Makefile.in	2019-10-12 15:49:39.966600662 +0200
+@@ -2693,12 +2693,12 @@
+ 	$(AM_V_SNARF)CPP="$(CPP)" $(GUILE_SNARF) -o $@ $< $(snarf_cpp_opts)
+ 
+ actions.decl.x: actions.decl.h actions.c Makefile
+-	$(AM_V_GEN)$(CPP) -I$(srcdir) -c $< | \
++	$(AM_V_GEN)$(CPP) -I$(srcdir) $< | \
+ 	  sed -e '/^.*KEEP_LINE /!d' -e 's/^.*KEEP_LINE //' > $@.tmp && \
+ 	mv $@.tmp $@
+ 
+ actions.init.x: actions.init.c actions.c Makefile
+-	$(AM_V_GEN)$(CPP) -I$(srcdir) -c $< | \
++	$(AM_V_GEN)$(CPP) -I$(srcdir) $< | \
+ 	  sed -e '/^.*KEEP_LINE /!d' -e 's/^.*KEEP_LINE //' > $@.tmp && \
+ 	mv $@.tmp $@
+ 
diff --git a/srcpkgs/geda/template b/srcpkgs/geda/template
index 23d895d1381..db74437e903 100644
--- a/srcpkgs/geda/template
+++ b/srcpkgs/geda/template
@@ -1,12 +1,12 @@
 # Template file for 'geda'
 pkgname=geda
-version=1.8.2
-revision=7
+version=1.10.0
+revision=1
 wrksrc="${pkgname}-gaf-${version}"
 build_style=gnu-configure
-configure_args="--with-sysroot=/${XBPS_CROSS_BASE}"
-hostmakedepends="pkg-config guile desktop-file-utils shared-mime-info"
-makedepends="gc-devel gtk+-devel guile-devel"
+make_build_args="V=1"
+hostmakedepends="pkg-config guile python desktop-file-utils shared-mime-info"
+makedepends="gamin-devel gc-devel gtk+-devel guile-devel python-devel libatomic_ops-devel"
 depends="guile geda-data"
 checkdepends="perl"
 short_desc="Electronic Design Automation tool"
@@ -14,12 +14,19 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"
 homepage="http://www.geda-project.org/"
 distfiles="http://ftp.geda-project.org/geda-gaf/stable/v${version%.*}/${version}/geda-gaf-${version}.tar.gz"
-checksum=bbf4773aef1b5a51a8d6f4c3fa288c047340cc62dd6e14d7928fcc6e4051b721
+checksum=5eb7a619f9d9cbcfa895468d6eae888d7e1d519dfff717b9f8f22fbeb37a3b1a
 
-if [ "${XBPS_ARCH}" = "x86_64" ]; then
-	hostmakedepends+=" glibc-devel-32bit"
+if [ "$CROSS_BUILD" ]; then
+	if [ "$XBPS_WORDSIZE" != "$XBPS_TARGET_WORDSIZE" ]; then
+		broken="The host ($XBPS_WORDSIZE) and target ($XBPS_TARGET_WORDSIZE) word sizes need to be the same for cross building."
+	fi
 fi
 
+pre_configure() {
+	mkdir -p gnu
+	touch gnu/stubs-32.h
+}
+
 geda-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index e652eb37668..cdec13159fd 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
 # Template file for 'gerbera'
 pkgname=gerbera
 version=1.3.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
 makedepends="duktape-devel expat-devel ffmpeg-devel file-devel libcurl-devel
@@ -11,7 +11,7 @@ maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="GPL-2.0-only"
 homepage="http://gerbera.io/"
 distfiles="https://github.com/gerbera/gerbera/archive/v${version}.tar.gz"
-checksum=89bbcebcf6beebb50b9453329b13e6a20e3e505dee5655486e90e1f085591f4a
+checksum=9c4509189eab6bff0fe183e1dd54ea8cb17d7fb0bc6e21bb5b1a8ccaaf6c60d9
 
 # libupnp uses large file support, so users must do that, too
 CXXFLAGS="-D_FILE_OFFSET_BITS=64"
diff --git a/srcpkgs/getmail/template b/srcpkgs/getmail/template
index ede082939ab..51a5c4a109f 100644
--- a/srcpkgs/getmail/template
+++ b/srcpkgs/getmail/template
@@ -1,6 +1,6 @@
 # Template file for 'getmail'
 pkgname=getmail
-version=5.13
+version=5.14
 revision=1
 archs=noarch
 build_style=python2-module
@@ -8,8 +8,8 @@ pycompile_module="getmailcore"
 hostmakedepends="python-devel"
 depends="python"
 short_desc="POP3/IMAP mail retriever with reliable Maildir and command delivery"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Lugubris <lugubris@disroot.org>"
 license="GPL-2.0-only"
 homepage="http://pyropus.ca/software/getmail"
 distfiles="http://pyropus.ca/software/getmail/old-versions/${pkgname}-${version}.tar.gz"
-checksum=04d52f6475f09e9f99b4e3d2f1d2eb967a68b67f09af2a6a5151857f060b0a9d
+checksum=f3a99fe74564237d12ca8d4582e113c067c9205b5ab640f72b4e8447606a99c1
diff --git a/srcpkgs/gfuzz/template b/srcpkgs/gfuzz/template
new file mode 100644
index 00000000000..6df0db9c47e
--- /dev/null
+++ b/srcpkgs/gfuzz/template
@@ -0,0 +1,14 @@
+# Template file for 'gfuzz'
+pkgname=gfuzz
+version=0.1
+revision=1
+wrksrc="gfuzz-${version}"
+build_style=go
+go_import_path=github.com/braaaax/gfuzz
+hostmakedepends="git"
+short_desc="Web fuzzer like wfuzz written in Golang"
+maintainer="Alex Childs <misuchiru03+void@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/braaaax/gfuzz"
+distfiles="https://github.com/braaaax/gfuzz/archive/v${version}.tar.gz"
+checksum=9e5b371d4b571fa9970e7678090f010d9adf23eb4f0f3c90da9b64b452f99e63
diff --git a/srcpkgs/giflib/template b/srcpkgs/giflib/template
index 956bc731e84..4f01f28e079 100644
--- a/srcpkgs/giflib/template
+++ b/srcpkgs/giflib/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-makefile
 hostmakedepends="xmlto"
 short_desc="Library to handle, display and manipulate GIF images"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://sourceforge.net/projects/giflib/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/gifski/template b/srcpkgs/gifski/template
index 6d2040e9f19..8ecb5d725f7 100644
--- a/srcpkgs/gifski/template
+++ b/srcpkgs/gifski/template
@@ -1,16 +1,16 @@
 # Template file for 'gifski'
 pkgname=gifski
-version=0.8.7
+version=0.9.2
 revision=1
 build_style=cargo
 configure_args="--features=openmp"
-makedepends="libgomp-devel"
+makedepends="libgomp-devel libomp-devel"
 short_desc="Highest-quality GIF encoder based on pngquant"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="AGPL-3.0-only"
 homepage="https://gif.ski"
 distfiles="https://github.com/ImageOptim/gifski/archive/${version}.tar.gz"
-checksum=e8d8d2fdb816953315989b3ecf39ac88f33b8c49aa7c79a0df8f53b4032755ab
+checksum=e2f6a44e5422527f1a6c582f371b637fefa9f0420c25cbce5831b1c95a2c91c9
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/gip/template b/srcpkgs/gip/template
index 590b7a0d5d0..17b19df9814 100644
--- a/srcpkgs/gip/template
+++ b/srcpkgs/gip/template
@@ -1,7 +1,7 @@
 # Template file for 'gip'
 pkgname=gip
 version=0.6.0
-revision=1
+revision=2
 build_style=cargo
 short_desc="CLI tool to get global IP address"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
@@ -10,6 +10,13 @@ homepage="https://github.com/dalance/gip"
 distfiles="https://github.com/dalance/gip/archive/v${version}.tar.gz"
 checksum=b8f5ba15a554ba4cb85a32449a8f665db24ab9dde7c47e7e6e10724fc9a76422
 
+pre_build() {
+	# the defined version (0.2.39 at the time of writing) is buggy on
+	# ppc64*-musl, pin the oldest newer working version; on next update
+	# please check Cargo.lock to verify if this is still necessary
+	cargo update --package libc --precise 0.2.43
+}
+
 post_install() {
 	vlicense LICENSE-MIT
 }
diff --git a/srcpkgs/girara/template b/srcpkgs/girara/template
index 23657857b6b..8dcb84f51d5 100644
--- a/srcpkgs/girara/template
+++ b/srcpkgs/girara/template
@@ -1,17 +1,17 @@
 # Template file for 'girara'
 pkgname=girara
-version=0.3.2
+version=0.3.3
 revision=1
 build_style=meson
 configure_args="-Dnotify=auto -Dtests=disabled"
 hostmakedepends="pkg-config intltool doxygen glib-devel"
 makedepends="gtk+3-devel libnotify-devel libglib-devel json-c-devel"
-short_desc="A library implementing a user interface that focuses on minimalism"
+short_desc="Library implementing a user interface that focuses on minimalism"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
 homepage="https://pwmt.org/projects/girara/"
-distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz"
-checksum=1700353a101f3c520f9b22e79d71ea5b268a9ec324796cf9e64775d96bb086cd
+distfiles="https://git.pwmt.org/pwmt/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
+checksum=4456ddd6f0420fa6f1677a4a8f438f0401c38c2521585db3ee42e339a730798f
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/git-cola/template b/srcpkgs/git-cola/template
index 98978120b91..7eaba90f3be 100644
--- a/srcpkgs/git-cola/template
+++ b/srcpkgs/git-cola/template
@@ -1,6 +1,6 @@
 # Template file for 'git-cola'
 pkgname=git-cola
-version=3.4
+version=3.5
 revision=1
 archs=noarch
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2"
 homepage="https://git-cola.github.io/"
 distfiles="https://github.com/git-cola/git-cola/archive/v${version}.tar.gz"
-checksum=763e382d8b32427539585d17ec6fe92026c073f6d31a864a5816ebe22cf245bc
+checksum=7fdcfc4326b35e384b97bd4bb2189b4cb5cf258948352759c302e632b41bb2e2
diff --git a/srcpkgs/git-mediate/template b/srcpkgs/git-mediate/template
new file mode 100644
index 00000000000..07f93c2e42f
--- /dev/null
+++ b/srcpkgs/git-mediate/template
@@ -0,0 +1,14 @@
+# Template file for 'git-mediate'
+pkgname=git-mediate
+version=1.0.5
+revision=1
+build_style=haskell-stack
+depends="git"
+short_desc="Tool to help resolving git conflicts"
+maintainer="Peter Wang <novalazy@gmail.com>"
+license="GPL-2.0-only"
+homepage="https://github.com/Peaker/git-mediate"
+distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz"
+checksum=a3f01abc25e7f5a89833131b07ba1a69ab497b099972acf6f333ef43be31b8bc
+nocross=yes
+nopie_files="/usr/bin/git-mediate"
diff --git a/srcpkgs/git-revise/template b/srcpkgs/git-revise/template
index 0f3d478bc60..4179a52bddc 100644
--- a/srcpkgs/git-revise/template
+++ b/srcpkgs/git-revise/template
@@ -1,7 +1,8 @@
 # Template file for 'git-revise'
 pkgname=git-revise
-version=0.4.2
-revision=3
+version=0.5.0
+revision=1
+archs=noarch
 build_style=python3-module
 pycompile_module="gitrevise"
 hostmakedepends="python3 python3-setuptools"
@@ -11,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/mystor/git-revise"
 distfiles="https://github.com/mystor/git-revise/archive/${version}.tar.gz"
-checksum=217b1bb9a3b34d0c7e7544b516a9eed5bc061b9bafd3a97bc7edfd83ea54c0d6
+checksum=f2bd6ad51b2acdd6fb6acf51807ce4b951d92cd039fc9e5a7dbb1e182fdf38b4
 
 post_extract() {
 	vsed -e 's|"man/man1"|"share/man/man1"|g' -i setup.py
diff --git a/srcpkgs/github-opml/template b/srcpkgs/github-opml/template
index a7ab953b773..3d2f6f49a48 100644
--- a/srcpkgs/github-opml/template
+++ b/srcpkgs/github-opml/template
@@ -6,7 +6,7 @@ build_style=go
 go_import_path=github.com/jojomi/github-opml
 hostmakedepends="git"
 short_desc="Create opml file with references to all starred repos by a github user"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/jojomi/github-opml"
 distfiles="https://github.com/jojomi/github-opml/archive/v${version}.tar.gz"
diff --git a/srcpkgs/gitlab-runner/template b/srcpkgs/gitlab-runner/template
index 5f2bc003abd..a2aed99abb9 100644
--- a/srcpkgs/gitlab-runner/template
+++ b/srcpkgs/gitlab-runner/template
@@ -1,6 +1,6 @@
 # Template file for 'gitlab-runner'
 pkgname=gitlab-runner
-version=12.1.0
+version=12.3.0
 revision=1
 wrksrc="${pkgname}-v${version}"
 build_style=go
@@ -10,7 +10,7 @@ maintainer="Christian Poulwey <christian.poulwey@t-online.de>"
 license="MIT"
 homepage="https://docs.gitlab.com/runner/"
 distfiles="https://gitlab.com/gitlab-org/gitlab-runner/-/archive/v${version}/gitlab-runner-v${version}.tar.gz"
-checksum=e6e89a3dd7039ecd34403830eee70aa1de4e3831c61a8da5c6925942ae071c32
+checksum=@eae777591b276f44edb1ebc0b12608180347d779657397065d121a869b90f178
 
 post_install() {
 	vsv gitlab-runner
diff --git a/srcpkgs/gjs/template b/srcpkgs/gjs/template
index 99454afca87..f17eac8a1f2 100644
--- a/srcpkgs/gjs/template
+++ b/srcpkgs/gjs/template
@@ -1,6 +1,6 @@
 # Template file for 'gjs'
 pkgname=gjs
-version=1.56.2
+version=1.58.1
 revision=1
 build_style=gnu-configure
 build_helper="gir"
@@ -13,7 +13,7 @@ license="MIT, LGPL-2.0-or-later"
 homepage="https://wiki.gnome.org/action/show/Projects/Gjs"
 changelog="https://gitlab.gnome.org/GNOME/gjs/blob/gnome-3-30/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4c89818c3d0e2186fcc4cb5228e9bf2a1866dd7d6646a18f1b37219b6710a3ac
+checksum=b4df16ea87dc78c0df5412f9134efb14f7c510773aee117d5ad4cda75646c6f5
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) configure_args+=" --disable-profiler" # https://gitlab.gnome.org/GNOME/gjs/issues/132
diff --git a/srcpkgs/glances/template b/srcpkgs/glances/template
index 3f185b9e294..6d4766493c3 100644
--- a/srcpkgs/glances/template
+++ b/srcpkgs/glances/template
@@ -1,19 +1,19 @@
 # Template file for 'glances'
 pkgname=glances
-version=3.1.0
+version=3.1.2
 revision=1
 archs=noarch
 wrksrc="Glances-${version}"
 build_style=python3-module
 pycompile_module="glances"
 hostmakedepends="python3-setuptools"
-depends="${hostmakedepends} python3-psutil"
+depends="${hostmakedepends} python3-future python3-psutil"
 short_desc="Cross-platform curses-based monitoring tool"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/nicolargo/glances"
 distfiles="${PYPI_SITE}/G/Glances/Glances-${version}.tar.gz"
-checksum=904e3dbbebe261dd98d02f4f0a340e4934b12192e8b303b78473f617c0fcd6ca
+checksum=733a30ee580d062759640a3ce9d7f5798b80c24e6dbf8f96269227bed7256894
 
 post_install() {
 	vsconf conf/glances.conf
diff --git a/srcpkgs/glib-networking/template b/srcpkgs/glib-networking/template
index 601e05089f0..98520abb635 100644
--- a/srcpkgs/glib-networking/template
+++ b/srcpkgs/glib-networking/template
@@ -1,6 +1,6 @@
 # Template file for 'glib-networking'
 pkgname=glib-networking
-version=2.60.3
+version=2.62.1
 revision=1
 build_style=meson
 configure_args="-Dinstalled_tests=false -Dgnutls=enabled -Dlibproxy=enabled
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/glib-networking/"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d50183046a4ff955d8cc7e953067cdfc94f14dbfda3024bf377ff37a3121dcd5
+checksum=3c55ae6771ad7a79fa606a834f4686ed555c2774ed6e9ece6f3c0f6a3dab7110
 lib32disabled=yes
 
 post_install() {
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 48c20a0be6f..5fdfff1410d 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,6 +1,6 @@
 # Template file for 'glib'
 pkgname=glib
-version=2.60.6
+version=2.62.1
 revision=1
 build_style=meson
 configure_args="-Dfam=false -Dman=true -Dselinux=disabled
@@ -14,7 +14,7 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GLib"
 changelog="https://gitlab.gnome.org/GNOME/glib/raw/master/NEWS"
 distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=ff8fab8d8deaa4fd0536c90f90d9769a09071779c7e6183907f6855645bffb6c
+checksum=3dd9024e1d0872a6da7ac509937ccf997161b11d7d35be337c7e829cbae0f9df
 
 build_options="gtk_doc"
 
diff --git a/srcpkgs/glibmm/template b/srcpkgs/glibmm/template
index 141c8058787..23ef47c5994 100644
--- a/srcpkgs/glibmm/template
+++ b/srcpkgs/glibmm/template
@@ -1,6 +1,6 @@
 # Template file for 'glibmm'
 pkgname=glibmm
-version=2.60.0
+version=2.62.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="glib-devel perl pkg-config"
@@ -10,7 +10,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.gtkmm.org"
 distfiles="${GNOME_SITE}/glibmm/${version%.*}/glibmm-${version}.tar.xz"
-checksum=a3a1b1c9805479a16c0018acd84b3bfff23a122aee9e3c5013bb81231aeef2bc
+checksum=36659f13cc73282392d1305858f3bbca46fbd1ce2f078cc9db8b9f79b2e93cfe
 
 glibmm-doc_package() {
 	archs=noarch
diff --git a/srcpkgs/glslViewer/template b/srcpkgs/glslViewer/template
index 5f458d21f46..a94a2e84992 100644
--- a/srcpkgs/glslViewer/template
+++ b/srcpkgs/glslViewer/template
@@ -9,7 +9,7 @@ makedepends="glfw-devel glu-devel MesaLib-devel libX11-devel libXrandr-devel
  libXi-devel libXxf86vm-devel libXcursor-devel libXinerama-devel libXext-devel
  libXrender-devel libXdamage-devel"
 short_desc="Live GLSL coding render"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://patriciogonzalezvivo.com/2015/glslViewer/"
 distfiles="https://github.com/patriciogonzalezvivo/glslViewer/archive/${version}.tar.gz"
diff --git a/srcpkgs/glslang/template b/srcpkgs/glslang/template
index 59526f9966c..cde1162b93f 100644
--- a/srcpkgs/glslang/template
+++ b/srcpkgs/glslang/template
@@ -6,7 +6,7 @@ build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
 hostmakedepends="python bison"
 short_desc="Khronos reference front-end for GLSL, ESSL, and sample SPIR-V generator"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/KhronosGroup/glslang"
 distfiles="https://github.com/KhronosGroup/glslang/archive/${version}.tar.gz"
diff --git a/srcpkgs/glusterfs/template b/srcpkgs/glusterfs/template
index 81cd6b5a496..a1304e266fe 100644
--- a/srcpkgs/glusterfs/template
+++ b/srcpkgs/glusterfs/template
@@ -1,6 +1,6 @@
 # Template file for 'glusterfs'
 pkgname=glusterfs
-version=6.4
+version=6.5
 revision=1
 build_style=gnu-configure
 configure_args="--with-mountutildir=/usr/bin ac_cv_file__etc_debian_version=no
@@ -17,7 +17,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-3.0-only"
 homepage="https://www.gluster.org/"
 distfiles="https://download.gluster.org/pub/gluster/glusterfs/${version%.*}/${version}/${pkgname}-${version}.tar.gz"
-checksum=82ff052e58b7eccf3cc04ce21ec99479722a5b9bfb6f29a48de2622a571ed1bd
+checksum=83548320df35d9552c9053a7a6ceea6dd17971d9962275ed6dfedb06a308847b
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) broken="not yet supported";;
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index 1e8de636605..6c9af4917f1 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,6 +1,6 @@
 # Template file for 'gmic'
 pkgname=gmic
-version=2.6.7
+version=2.7.1
 revision=1
 build_wrksrc="src"
 build_style=gnu-makefile
@@ -13,7 +13,7 @@ maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
 license="CECILL-2.1"
 homepage="http://gmic.eu/"
 distfiles="http://gmic.eu/files/source/gmic_${version}.tar.gz"
-checksum="2e5535d1bae66254136e928428750aac8efcef6f4413fc352b6de9ce8ac8b0ff"
+checksum="c71e784abd2141252efad505b6a48b6974c388788db5530b3ca0dfb07baeafeb"
 disable_parallel_build="yes"
 nocross="https://build.voidlinux.org/builders/armv7l_builder/builds/8869/steps/shell_3/logs/stdio"
 
diff --git a/srcpkgs/gmime3/template b/srcpkgs/gmime3/template
index 63d319ef519..a6a34d2306b 100644
--- a/srcpkgs/gmime3/template
+++ b/srcpkgs/gmime3/template
@@ -1,7 +1,7 @@
 # Template file for 'gmime3'
 pkgname=gmime3
-version=3.2.3
-revision=6
+version=3.2.4
+revision=1
 wrksrc="gmime-${version}"
 build_style=gnu-configure
 build_helper="gir"
@@ -16,7 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/jstedfast/gmime"
 distfiles="${GNOME_SITE}/gmime/${version%.*}/gmime-${version}.tar.xz"
-checksum=6a0875eeb552ab447dd54853a68ced62217d863631048737dd97eaa2713e7311
+checksum=249ea7c0e080b067aa9669162c36b181b402f6cf6cebc4999d838c6f1e81d024
 
 # Package build options
 build_options="gir vala"
diff --git a/srcpkgs/gnome-backgrounds/template b/srcpkgs/gnome-backgrounds/template
index a5585c4b932..bf2d7679ac5 100644
--- a/srcpkgs/gnome-backgrounds/template
+++ b/srcpkgs/gnome-backgrounds/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-backgrounds'
 pkgname=gnome-backgrounds
-version=3.32.0
+version=3.34.0
 revision=1
 archs=noarch
 build_style=meson
@@ -9,4 +9,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, CC-BY-2.0, CC-BY-SA-2.0, CC-BY-SA-3.0"
 homepage="https://gitlab.gnome.org/GNOME/gnome-backgrounds"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3f53c31bc9ff31b27408159afe77d06875174bc554e4e7c225a4d5d16acbb3e8
+checksum=c2b7fb6db98c05e205053daaa7f58c7f06ff91b45c4006052af17c578ae7b47f
diff --git a/srcpkgs/gnome-bluetooth/template b/srcpkgs/gnome-bluetooth/template
index 26d33435dbe..988a7f19b6d 100644
--- a/srcpkgs/gnome-bluetooth/template
+++ b/srcpkgs/gnome-bluetooth/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-bluetooth'
 pkgname=gnome-bluetooth
-version=3.32.1
-revision=2
+version=3.34.0
+revision=1
 build_helper="gir"
 build_style=meson
 configure_args="-Dicon-update=false -Dgtk_doc=false
@@ -15,7 +15,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeBluetooth"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6441cafd313af94fba28b701698074f97d693b9023788a74e8e6f16f817ba1aa
+checksum=e867e67423e1dc78c56c2ea11dec066ce0254238d559e4777c80fa2935eb6baf
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/gnome-books/template b/srcpkgs/gnome-books/template
index 43bb31e4939..638d9140e43 100644
--- a/srcpkgs/gnome-books/template
+++ b/srcpkgs/gnome-books/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-books'
 pkgname=gnome-books
-version=3.32.0
+version=3.34.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -12,5 +12,5 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Books"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a49e2ff49f1ee96ca66836e48c80f6f0fc863f7b9682dc684df26bce19f76cf2
+checksum=ca5716a09e526ee43aa69dafffe5057b30edc648f56f554070c54a1db19d7b94
 nocross="Mozjs60 .pc file's Cflags don't honor the sysroot which leads to missing includes"
diff --git a/srcpkgs/gnome-builder/patches/dont-require-FNM_EXTMATCH.patch b/srcpkgs/gnome-builder/patches/dont-require-FNM_EXTMATCH.patch
deleted file mode 100644
index 46d327bd94b..00000000000
--- a/srcpkgs/gnome-builder/patches/dont-require-FNM_EXTMATCH.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-commit ec3f94cf7430b8c4120a9a2b352a238163696bec
-Author: Ting-Wei Lan <lantw@src.gnome.org>
-Date:   Mon Jul 29 23:24:27 2019 +0800
-
-    foundry: don't require FNM_EXTMATCH
-    
-    If the system doesn't support FNM_EXTMATCH, we just fallback to 0. It
-    seems to be safe because nothing depends on its extra features currently.
-
-diff --git src/libide/foundry/ide-simple-build-system-discovery.c src/libide/foundry/ide-simple-build-system-discovery.c
-index c62eeb155..57883996f 100644
---- src/libide/foundry/ide-simple-build-system-discovery.c
-+++ src/libide/foundry/ide-simple-build-system-discovery.c
-@@ -289,7 +289,11 @@ ide_simple_build_system_discovery_match (IdeSimpleBuildSystemDiscovery *self,
-   g_assert (IDE_IS_SIMPLE_BUILD_SYSTEM_DISCOVERY (self));
-   g_assert (name != NULL);
- 
-+#ifdef FNM_EXTMATCH
-   return fnmatch (priv->glob, name, FNM_EXTMATCH) == 0;
-+#else
-+  return fnmatch (priv->glob, name, 0) == 0;
-+#endif
- }
- 
- static gboolean
diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index ebed528508f..9ae9ff9d94c 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-builder'
 pkgname=gnome-builder
-version=3.32.4
-revision=2
+version=3.34.1
+revision=1
 build_style=meson
 configure_args="-Dwith_webkit=true -Dwith_sysprof=true -Dhelp=true"
 hostmakedepends="appdata-tools desktop-file-utils flex gobject-introspection
@@ -16,9 +16,9 @@ short_desc="IDE for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Builder"
-changelog="https://gitlab.gnome.org/GNOME/gnome-builder/raw/gnome-builder-3-32/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-builder/raw/gnome-builder-3-34/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=19a388402e429277751b54e6587f2ff9533f3df143818b84e2e81a202a2a3776
+checksum=0b6e461057ea8151e80524c0ea7ef1cb948e92afda9dc6bd33ae3392f04501a4
 nocross="Cannot build gresources on cross musl, unresolvable shlibs on glibc cross"
 
 case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/gnome-calendar/template b/srcpkgs/gnome-calendar/template
index ef2c96c3323..2b0a27b9f25 100644
--- a/srcpkgs/gnome-calendar/template
+++ b/srcpkgs/gnome-calendar/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-calendar'
 pkgname=gnome-calendar
-version=3.32.2
+version=3.34.1
 revision=1
 build_style=meson
 hostmakedepends="glib-devel pkg-config $(vopt_if gir 'gobject-introspection')"
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Calendar"
 changelog="https://gitlab.gnome.org/GNOME/gnome-calendar/raw/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f3500bedc257e3c7b82c5f4187b189dec99b76f445c96b01ca2d22f9371be71e
+checksum=fed47b23e3fe2c356092e25bc8d455e87ef0eeb39fa90bf3d0be925dfa3e90e2
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/gnome-chess/template b/srcpkgs/gnome-chess/template
index 6cc8597d570..9733e3937a6 100644
--- a/srcpkgs/gnome-chess/template
+++ b/srcpkgs/gnome-chess/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-chess'
 pkgname=gnome-chess
-version=3.32.0
+version=3.34.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config vala glib-devel itstool librsvg-devel"
@@ -11,4 +11,4 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Chess"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6998a9bc6cee1d7b6b203f9ec744f33c6f1983adb0b0a7b477c1bbca8936eb43
+checksum=6504054499e08801cb5e321b70a186f74d399699b3e29a5babf772d8cd933bd8
diff --git a/srcpkgs/gnome-clocks/template b/srcpkgs/gnome-clocks/template
index a62c3591576..3b6e5895080 100644
--- a/srcpkgs/gnome-clocks/template
+++ b/srcpkgs/gnome-clocks/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-clocks'
 pkgname=gnome-clocks
-version=3.32.0
-revision=1
+version=3.34.0
+revision=2
 build_helper="gir"
 build_style=meson
 hostmakedepends="pkg-config intltool itstool glib-devel vala"
@@ -15,4 +15,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Clocks"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6c8d90b0044f535f239bd94a7d0e46d0c9da32a6a141ff1233a78fa99a7cd4f0
+checksum=61195f357c63b65b75e209494e12a122a802c75333290e136813565dca94f03c
diff --git a/srcpkgs/gnome-contacts/patches/ambiguous.patch b/srcpkgs/gnome-contacts/patches/ambiguous.patch
deleted file mode 100644
index 3569e0e303f..00000000000
--- a/srcpkgs/gnome-contacts/patches/ambiguous.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/contacts-window.vala
-+++ src/contacts-window.vala
-@@ -35,9 +35,9 @@ public class Contacts.Window : Gtk.ApplicationWindow {
-   [GtkChild]
-   private TitleBar titlebar;
-   [GtkChild]
--  private HeaderBar left_header;
-+  private Gtk.HeaderBar left_header;
-   [GtkChild]
--  private HeaderBar right_header;
-+  private Gtk.HeaderBar right_header;
-   [GtkChild]
-   private Overlay notification_overlay;
-   [GtkChild]
diff --git a/srcpkgs/gnome-contacts/template b/srcpkgs/gnome-contacts/template
index 9b861442c14..5595ef8ce06 100644
--- a/srcpkgs/gnome-contacts/template
+++ b/srcpkgs/gnome-contacts/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-contacts'
 pkgname=gnome-contacts
-version=3.32.2
-revision=1
+version=3.34.0
+revision=2
 wrksrc="gnome-contacts-${version%.*}"
 build_style=meson
 hostmakedepends="docbook-xsl glib-devel libxslt pkg-config vala"
@@ -13,4 +13,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Contacts"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version%.*}.tar.xz"
-checksum=fc49f9821fe7a2491287bc25979bb428d39c6510d23c59bf031a4e555a39798b
+checksum=99602ec8d660c1f3c92cae6356f64f72fb6db58e55bce27a599330bf7b622f12
diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index b71bd9cbe42..0e2787898ae 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-control-center'
 pkgname=gnome-control-center
-version=3.32.2
+version=3.34.1
 revision=1
 build_style=meson
 build_helper="gir"
@@ -24,7 +24,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-control-center"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=faa5092d1eb12dfe85c54fe025e0fb29520654bb219cc5086f7326ea6005d70e
+checksum=5f82ecd5554136c462248ec5363b82d95358b39dfd6787006d8307b4504e515e
 
 build_options="cheese"
 desc_option_cheese="Add support for adding user account images with your webcam"
diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index e8cd6c94cbc..38baffaa5c8 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-desktop'
 pkgname=gnome-desktop
-version=3.32.2
+version=3.34.1
 revision=1
 build_style=meson
 build_helper="gir"
@@ -16,7 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-desktop"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=099f71b29310c999c28f2bf272c846bbd7efc8c6c438b37d15f374230ce92d2e
+checksum=c1dbeb5666dad27166c769e48e2ab41dd5ed74718ea35eb57c8488790662dc5a
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/gnome-documents/template b/srcpkgs/gnome-documents/template
index b33f4b1bd65..62d9bddbc1e 100644
--- a/srcpkgs/gnome-documents/template
+++ b/srcpkgs/gnome-documents/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-documents'
 pkgname=gnome-documents
 version=3.32.0
-revision=2
+revision=3
 build_helper="gir"
 build_style=meson
 hostmakedepends="docbook-xsl itstool pkg-config glib-devel libxslt gdk-pixbuf
diff --git a/srcpkgs/gnome-flashback/template b/srcpkgs/gnome-flashback/template
index 1201adbb01d..bc5ae868cb8 100644
--- a/srcpkgs/gnome-flashback/template
+++ b/srcpkgs/gnome-flashback/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-flashback'
 pkgname=gnome-flashback
-version=3.30.0
-revision=2
+version=3.34.1
+revision=1
 build_style=gnu-configure
 configure_args="--enable-compile-warnings=minimum"
 hostmakedepends="pkg-config automake glib-devel"
@@ -16,5 +16,5 @@ maintainer="shizonic <realtiaz@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeFlashback"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a7786f43760b63d3036aa92240c5efe897e83a2831dc9f6829019d7805c53ca3
+checksum=ddba0c9661ad93b58ccbde267f6ecbc02da2c15f9d38d87d5504f4670c2fbc77
 nocross="gobject-introspection"
diff --git a/srcpkgs/gnome-font-viewer/template b/srcpkgs/gnome-font-viewer/template
index 085b7d013bc..6d035366d44 100644
--- a/srcpkgs/gnome-font-viewer/template
+++ b/srcpkgs/gnome-font-viewer/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-font-viewer'
 pkgname=gnome-font-viewer
-version=3.32.0
+version=3.34.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config glib-devel"
@@ -12,4 +12,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-font-viewer"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=43e1b0e759882d3597e650eb043e3d89c64cff9c124ceb6889e1a4a134286181
+checksum=aa6f0583e5f93aec095e537f0638b29de3d02491f0131ef584a7c55d39d6b98b
diff --git a/srcpkgs/gnome-games/template b/srcpkgs/gnome-games/template
index d83f3dd9853..dd83b22de09 100644
--- a/srcpkgs/gnome-games/template
+++ b/srcpkgs/gnome-games/template
@@ -1,16 +1,15 @@
 # Template file for 'gnome-games'
 pkgname=gnome-games
-version=3.30.2
+version=3.34.0
 revision=1
 build_style=meson
 hostmakedepends="glib-devel pkg-config vala-devel"
 makedepends="libarchive-devel grilo-devel gtk+3-devel libglib-devel
  libmanette-devel librsvg-devel libsoup-devel libxml2-devel retro-gtk-devel
- sqlite-devel tracker-devel"
+ sqlite-devel tracker-devel libhandy-devel"
 short_desc="Browse and play your games"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Games"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5607c4071d3b07809ec1a88deb52bb289c29b2f5fb91374e244ebe7f8dee31a1
-nocross="depends on libmanette, which hard depends on gobject-introspection"
+checksum=0fd7246d61ce21c0fc121c5488051a5866c19de2c2835ad7fe4b18c06627dcba
diff --git a/srcpkgs/gnome-getting-started-docs/template b/srcpkgs/gnome-getting-started-docs/template
index 9801d25e75c..5bec93490ba 100644
--- a/srcpkgs/gnome-getting-started-docs/template
+++ b/srcpkgs/gnome-getting-started-docs/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-getting-started-docs'
 pkgname=gnome-getting-started-docs
-version=3.32.2
+version=3.34.0
 revision=1
 archs=noarch
 build_style=gnu-configure
@@ -11,4 +11,4 @@ license="CC-BY-SA-3.0"
 homepage="https://gitlab.gnome.org/GNOME/gnome-getting-started-docs"
 #changelog="https://gitlab.gnome.org/GNOME/gnome-getting-started-docs/raw/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=98af5c388808a81334806f3c69bacb3e520f6a5d46ffd61a7b307f5a8b2193ec
+checksum=f70ce2ca23ad786215f3c92ec85783e3aabed07e4f78700fa27f9b2cf76e03db
diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index cda29a3406a..aba5a094c28 100644
--- a/srcpkgs/gnome-initial-setup/template
+++ b/srcpkgs/gnome-initial-setup/template
@@ -1,9 +1,9 @@
 # Template file for 'gnome-initial-setup'
 pkgname=gnome-initial-setup
-version=3.32.1
-revision=1
+version=3.34.1
+revision=2
 build_style=meson
-configure_args="-Dsoftware-sources=disabled"
+configure_args="-Dsoftware-sources=disabled -Dsystemd=false"
 hostmakedepends="pkg-config glib-devel"
 makedepends="NetworkManager-devel accountsservice-devel libglib-devel
  gnome-desktop-devel cheese-devel libgweather-devel webkit2gtk-devel
@@ -17,4 +17,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Design/OS/InitialSetup"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3ea709826ee87e837518e316bc72334dc8dc6e65c6a82b96fe8879aadab990bf
+checksum=e71f10ef6b631cd92ffde774e4130b32b2494b4df5ef288375d8b1957eeabfa1
diff --git a/srcpkgs/gnome-klotski/template b/srcpkgs/gnome-klotski/template
index a1ba3965238..73929851e1d 100644
--- a/srcpkgs/gnome-klotski/template
+++ b/srcpkgs/gnome-klotski/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-klotski'
 pkgname=gnome-klotski
-version=3.32.0
-revision=2
+version=3.34.0
+revision=1
 build_style=meson
 hostmakedepends="glib itstool pkg-config vala glib-devel"
 makedepends="librsvg-devel libgnome-games-support-devel"
@@ -10,4 +10,4 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Klotski"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e2c4259f6b3199423336dbe4ceb63329f4ec45a73b7d217ad4ea19d95f099adc
+checksum=8e3442f5d7e08ce3de512557a468f0c97284ce7f67a32b1313908ae1ff027d69
diff --git a/srcpkgs/gnome-mahjongg/template b/srcpkgs/gnome-mahjongg/template
index 69fc096f1f3..20f4a0011fd 100644
--- a/srcpkgs/gnome-mahjongg/template
+++ b/srcpkgs/gnome-mahjongg/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-mahjongg'
 pkgname=gnome-mahjongg
-version=3.32.0
-revision=2
+version=3.34.0
+revision=1
 build_style=meson
 hostmakedepends="glib-devel itstool pkg-config vala"
 makedepends="librsvg-devel gtk+3-devel libglib-devel"
@@ -10,4 +10,4 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Mahjongg"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=52843745a17ef1e9e80820432b3317aa885ec7417ac1e9239946c0d56daf6a8a
+checksum=e5cfcf839cc86003708dfaa35c13a05aa4751618e316afb3f65284f0a61cd163
diff --git a/srcpkgs/gnome-mines/template b/srcpkgs/gnome-mines/template
index e534547cfd4..af283c58320 100644
--- a/srcpkgs/gnome-mines/template
+++ b/srcpkgs/gnome-mines/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-mines'
 pkgname=gnome-mines
-version=3.32.2
+version=3.34.0
 revision=1
 build_style=meson
 hostmakedepends="glib-devel itstool pkg-config vala"
@@ -10,4 +10,4 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Mines"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0f757f4cc8526ecbffedd3e68f156b0acbfb17e5cb9cd5d8ef388b3bb93169db
+checksum=a4f0189ef0fc45d5d5554197649f15014db82ff791ddad732e1af990b151fdea
diff --git a/srcpkgs/gnome-mpv b/srcpkgs/gnome-mpv
new file mode 120000
index 00000000000..ce77c85be34
--- /dev/null
+++ b/srcpkgs/gnome-mpv
@@ -0,0 +1 @@
+celluloid
\ No newline at end of file
diff --git a/srcpkgs/gnome-mpv/template b/srcpkgs/gnome-mpv/template
deleted file mode 100644
index 96e5a00911c..00000000000
--- a/srcpkgs/gnome-mpv/template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'gnome-mpv'
-pkgname=gnome-mpv
-version=0.16
-revision=1
-build_style=meson
-hostmakedepends="glib-devel pkg-config"
-makedepends="gtk+3-devel libepoxy-devel libglib-devel mpv-devel"
-short_desc="Simple GTK+ frontend for mpv"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-3.0-or-later"
-homepage="https://gnome-mpv.github.io/"
-distfiles="https://github.com/${pkgname}/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.xz"
-checksum=22cd8a9257ea57449f3120993e668d11e5e3be31444c6e63b8b25ccce0feed4b
diff --git a/srcpkgs/gnome-nibbles/template b/srcpkgs/gnome-nibbles/template
index 056876156ff..ec89cbca3f8 100644
--- a/srcpkgs/gnome-nibbles/template
+++ b/srcpkgs/gnome-nibbles/template
@@ -1,15 +1,15 @@
 # Template file for 'gnome-nibbles'
 pkgname=gnome-nibbles
-version=3.32.0
+version=3.34.1
 revision=1
-build_style=gnu-configure
-hostmakedepends="glib-devel intltool itstool pkg-config"
-makedepends="clutter-gtk-devel libcanberra-devel libgnome-games-support-devel
- librsvg-devel"
+build_style=meson
+hostmakedepends="glib-devel intltool itstool pkg-config vala"
+makedepends="clutter-gtk-devel gsound-devel libcanberra-devel
+ libgnome-games-support-devel librsvg-devel"
 short_desc="GNOME snake eats diamonds game"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-3.0-or-later"
 changelog="https://github.com/GNOME/gnome-nibbles/raw/gnome-3-24/NEWS"
 homepage="https://wiki.gnome.org/Apps/Nibbles"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=375143d127ecf9921f23dce78b6a9144274bd76b5111a8b3f0917bb7fe3dc23c
+checksum=77f0070af8294ac8795c07982fed4144d581f7336817eb6c6c377bdd370fde59
diff --git a/srcpkgs/gnome-online-accounts/template b/srcpkgs/gnome-online-accounts/template
index 1a74bb3a834..469ba370503 100644
--- a/srcpkgs/gnome-online-accounts/template
+++ b/srcpkgs/gnome-online-accounts/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-online-accounts'
 pkgname=gnome-online-accounts
-version=3.32.0
-revision=2
+version=3.34.1
+revision=1
 build_style=gnu-configure
 build_helper="gir"
 configure_args="$(vopt_enable gir introspection)
@@ -20,7 +20,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeOnlineAccounts"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1c19e65771c8d16fa0016ab70d9a1ee2b75a84aeeedd24527a4e41b132e8d4aa
+checksum=4832ca8e48d3a497fc676e7b6f146009ab4206995362977b9805aa39f164783a
 
 build_options="gir vala"
 build_options_default="gir vala"
diff --git a/srcpkgs/gnome-online-miners/template b/srcpkgs/gnome-online-miners/template
index b1a93746c94..43b21bf5b9c 100644
--- a/srcpkgs/gnome-online-miners/template
+++ b/srcpkgs/gnome-online-miners/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-online-miners'
 pkgname=gnome-online-miners
-version=3.30.0
+version=3.34.0
 revision=1
 lib32disabled=yes
 build_style=gnu-configure
@@ -15,7 +15,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeOnlineMiners"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2c29a9922b1d32aeb0e615db6717c8e060417d3b6568ed617c9817fb39af4a5e
+checksum=845c2260fb12f14315c800d04d60f37e076c7c7b4222587ae75f108562fa52d8
 
 build_options="gir"
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/gnome-panel/template b/srcpkgs/gnome-panel/template
index 60b50fc2192..18a2ea4ca94 100644
--- a/srcpkgs/gnome-panel/template
+++ b/srcpkgs/gnome-panel/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-panel'
 pkgname=gnome-panel
-version=3.32.0
-revision=1
+version=3.34.1
+revision=2
 build_style=gnu-configure
 hostmakedepends="gettext-devel glib-devel itstool pkg-config"
 makedepends="cairo-devel dconf-devel elogind-devel evolution-data-server-devel
@@ -13,5 +13,5 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.1-or-later, LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomePanel"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6a6079d3d22d480d53cf552bbe18e061276d2d0b458cce4dfb822cb064883f29
+checksum=a6bc0255252eeb4b964bcbe55fd7908b69f914c062c5ec8dff5ac0262d29b90d
 patch_args="-Np1"
diff --git a/srcpkgs/gnome-passwordsafe/template b/srcpkgs/gnome-passwordsafe/template
index cec9f84e238..f310ce03a08 100644
--- a/srcpkgs/gnome-passwordsafe/template
+++ b/srcpkgs/gnome-passwordsafe/template
@@ -1,14 +1,15 @@
 # Template file for 'gnome-passwordsafe'
 pkgname=gnome-passwordsafe
 version=3.32.0
-revision=1
+revision=2
 archs=noarch
 wrksrc="PasswordSafe-${version}"
 build_style=meson
 pycompile_module="passwordsafe"
 hostmakedepends="glib-devel pkg-config gobject-introspection python3-pykeepass"
 makedepends="gtk+3-devel libhandy-devel python3-pykeepass libpwquality-devel"
-depends="gtk+3 libnotify libhandy python3-gobject python3-pykeepass python3-construct"
+depends="gtk+3 libnotify libhandy python3-gobject python3-pykeepass python3-construct
+ libpwquality-python3"
 short_desc="Keepass compatible password manager for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
diff --git a/srcpkgs/gnome-robots/template b/srcpkgs/gnome-robots/template
index 572c6632bb7..3184fafe0fa 100644
--- a/srcpkgs/gnome-robots/template
+++ b/srcpkgs/gnome-robots/template
@@ -1,14 +1,14 @@
 # Template file for 'gnome-robots'
 pkgname=gnome-robots
-version=3.32.0
+version=3.34.0
 revision=1
 build_style=meson
 hostmakedepends="glib-devel itstool pkg-config"
-makedepends="gtk+3-devel libcanberra-devel librsvg-devel
+makedepends="gsound-devel gtk+3-devel libcanberra-devel librsvg-devel
  libglib-devel libgnome-games-support-devel"
 short_desc="GNOME classic robots game"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Robots"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d0db7879288e1a9e0d2bad5ae6ce24e7be2e1581af41b096adfccc4265d4e1f6
+checksum=ab82885194a536b8ad74512541a1dad6614d1d4caa127ea26075349340e976a3
diff --git a/srcpkgs/gnome-screensaver/template b/srcpkgs/gnome-screensaver/template
index 1381c5d9219..363fcf12e10 100644
--- a/srcpkgs/gnome-screensaver/template
+++ b/srcpkgs/gnome-screensaver/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-screensaver'
 pkgname=gnome-screensaver
 version=3.6.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-compile-warnings=minimum"
 hostmakedepends="pkg-config automake intltool glib-devel"
diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template
index 359c08d41f5..4444f162bf1 100644
--- a/srcpkgs/gnome-session/template
+++ b/srcpkgs/gnome-session/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-session'
 pkgname=gnome-session
-version=3.32.0
-revision=2
+version=3.34.1
+revision=1
 build_style=meson
 configure_args="-Dsystemd_journal=false"
 hostmakedepends="glib-devel intltool pkg-config xmlto"
@@ -15,4 +15,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-session"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bbd4c4ead32f0b805d0e372a63207e4e0c756dd16e1d456b2a211a40da9d3f7f
+checksum=d7801fe2d5a751b19cb58081771316a76aabd5c550cd58d4e4c6a5a4ed356660
diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template
index 7f179f2be4a..a70e28be5fa 100644
--- a/srcpkgs/gnome-settings-daemon/template
+++ b/srcpkgs/gnome-settings-daemon/template
@@ -1,10 +1,11 @@
 # Template file for 'gnome-settings-daemon'
 pkgname=gnome-settings-daemon
-version=3.32.1
-revision=1
+version=3.34.1
+revision=2
 build_style=meson
-hostmakedepends="docbook-xsl glib-devel libglib-devel libxslt perl pkg-config"
-makedepends="NetworkManager-devel alsa-lib-devel colord-devel cups-devel
+configure_args+="-Dsystemd=false"
+hostmakedepends="cmake docbook-xsl glib-devel libglib-devel libxslt perl pkg-config"
+makedepends="NetworkManager-devel alsa-lib-devel colord-devel cups-devel gcr-devel
  geoclue2-devel gnome-desktop-devel ibus-devel libcanberra-devel libgnomekbd-devel
  libgweather-devel libnotify-devel librsvg-devel libwacom-devel nss-devel
  polkit-devel pulseaudio-devel startup-notification-devel upower-devel
@@ -17,7 +18,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-settings-daemon"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7a36d14f5ca1aaa5b5d4cd0a8a743017819c12014e8f4cc88a0ed72a1ed0a009
+checksum=9981a20babf8da7744b7fbe175b9e36078bf08f3bf65fe5aedeb82cfe27ac11f
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" polkit"
diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index a66ab15c374..97168b40f66 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell-extensions'
 pkgname=gnome-shell-extensions
-version=3.32.1
+version=3.34.1
 revision=1
 archs=noarch
 build_style=meson
@@ -12,4 +12,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=02b2b2fb477fcd8277ee3ce34ec156d97724011f2660dd2e14c412f18d5b911e
+checksum=b0ad51143b1bf40def4a10f8fd0ab0ffb47218304800794e62cadd29d0acc75b
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 577c58e5c19..3968ffa805f 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,18 +1,18 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
-version=3.32.2
+version=3.34.1
 revision=1
 build_style=meson
 configure_args="-Dsystemd=false"
 hostmakedepends="gobject-introspection gtk-doc libxslt pkg-config python3 sassc
- perl"
+ asciidoc perl"
 makedepends="at-spi2-atk caribou-devel evolution-data-server-devel folks-devel
  gcr-devel gjs-devel gnome-bluetooth-devel gnome-control-center-devel gnome-desktop-devel
  gnome-menus-devel gsettings-desktop-schemas-devel gstreamer1-devel gtk+3-devel
  ibus-devel json-glib-devel libcanberra-devel libcroco-devel libglib-devel
  libsecret-devel libsoup-devel libX11-devel libxml2-devel mutter-devel
  network-manager-applet-devel polkit-devel pulseaudio-devel
- startup-notification-devel telepathy-logger-devel"
+ startup-notification-devel telepathy-logger-devel gnome-autoar-devel"
 depends="caribou elogind glxinfo gnome-control-center gsettings-desktop-schemas upower"
 short_desc="GNOME core user interface"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -20,5 +20,5 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell"
 changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/gnome-3-30/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e5561b0d5c1fb3b0b66e99f1ad7f2f9db918ee953897f4eac6ae5c8d6d9bd42a
+checksum=ccd86559b9c897c219d2d2ebfdb8413efa4c1bee846427c750cb8a301b3f6d1e
 nocross="Evolution-dataserver cross gir doesn't work yet."
diff --git a/srcpkgs/gnome-ssh-askpass/template b/srcpkgs/gnome-ssh-askpass/template
index 2192837714d..0843e73d44b 100644
--- a/srcpkgs/gnome-ssh-askpass/template
+++ b/srcpkgs/gnome-ssh-askpass/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-ssh-askpass'
 pkgname=gnome-ssh-askpass
-version=8.0p1
+version=8.1p1
 revision=1
 wrksrc="openssh-${version}"
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause, BSD-2-Clause"
 homepage="http://www.openssh.org"
 distfiles="https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${version}.tar.gz"
-checksum=bd943879e69498e8031eb6b7f44d08cdc37d59a7ab689aa0b437320c3481fd68
+checksum=02f5dbef3835d0753556f973cd57b4c19b6b1f6cd24c03445e23ac77ca1b93ff
 
 alternatives="
  ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/gnome-ssh-askpass
diff --git a/srcpkgs/gnome-sudoku/template b/srcpkgs/gnome-sudoku/template
index e7451d42579..ee321a337a6 100644
--- a/srcpkgs/gnome-sudoku/template
+++ b/srcpkgs/gnome-sudoku/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-sudoku'
 pkgname=gnome-sudoku
-version=3.32.0
+version=3.34.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -11,7 +11,7 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Sudoku"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=14388541ca7bbc01a45cb29a46cfc0794a2bcb7d0cef67361b7dd1c0a9938df3
+checksum=7e30b859a31e832738719808cede0c41e14daa059ed3f3a3619ab629094f9eaf
 
 case "$XBPS_TARGET_MACHINE" in
 	i686-musl|x86_64-musl) ;;
diff --git a/srcpkgs/gnome-tetravex/template b/srcpkgs/gnome-tetravex/template
index ff11bb618f4..d2e2be6ccf3 100644
--- a/srcpkgs/gnome-tetravex/template
+++ b/srcpkgs/gnome-tetravex/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-tetravex'
 pkgname=gnome-tetravex
-version=3.32.0
+version=3.34.1
 revision=1
 build_style=meson
 hostmakedepends="itstool pkg-config vala glib-devel"
@@ -10,4 +10,4 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Tetravex"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=544e702558d9d2a17e4f34b0db40ee728c1d83ad4761433bf7560a39c8edb9a1
+checksum=e06ddb08f810314553c7745c8476221a8b1425599f64388157ee4495baf12916
diff --git a/srcpkgs/gnome-todo/patches/6cdabc4dd0c6c804a093b94c269461ce376fed4f.patch b/srcpkgs/gnome-todo/patches/6cdabc4dd0c6c804a093b94c269461ce376fed4f.patch
deleted file mode 100644
index d7a5f123bb3..00000000000
--- a/srcpkgs/gnome-todo/patches/6cdabc4dd0c6c804a093b94c269461ce376fed4f.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Upstream: yes
-From 6cdabc4dd0c6c804a093b94c269461ce376fed4f Mon Sep 17 00:00:00 2001
-From: Emmanuele Bassi <ebassi@gnome.org>
-Date: Mon, 21 Jan 2019 10:47:09 +0000
-Subject: [PATCH] Drop the autoptr definition for ESource
-
-Evolution-data-server includes the autoptr definition for ESource.
-
-See: GNOME/evolution-data-server#73
-
-Without this change, GNOME Todo does not build on the Continuous CI
-infrastructure.
-
-Signed-off-by: Emmanuele Bassi <ebassi@gnome.org>
----
- plugins/eds/gtd-eds-autoptr.h | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/plugins/eds/gtd-eds-autoptr.h b/plugins/eds/gtd-eds-autoptr.h
-index eb9b011..42709ee 100644
---- plugins/eds/gtd-eds-autoptr.h
-+++ plugins/eds/gtd-eds-autoptr.h
-@@ -25,4 +25,3 @@
- G_DEFINE_AUTOPTR_CLEANUP_FUNC (ECalComponent, g_object_unref);
- G_DEFINE_AUTOPTR_CLEANUP_FUNC (ECalComponentId, e_cal_component_free_id);
- G_DEFINE_AUTOPTR_CLEANUP_FUNC (ECalClient, g_object_unref);
--G_DEFINE_AUTOPTR_CLEANUP_FUNC (ESource, g_object_unref);
--- 
-2.18.1
-
diff --git a/srcpkgs/gnome-todo/patches/gnome-todo-eds-libecal-2.0.patch b/srcpkgs/gnome-todo/patches/gnome-todo-eds-libecal-2.0.patch
new file mode 100644
index 00000000000..549c3ce9c4a
--- /dev/null
+++ b/srcpkgs/gnome-todo/patches/gnome-todo-eds-libecal-2.0.patch
@@ -0,0 +1,567 @@
+diff --git a/plugins/eds/gtd-eds-autoptr.h b/plugins/eds/gtd-eds-autoptr.h
+index eb9b011..78bd944 100644
+--- a/plugins/eds/gtd-eds-autoptr.h
++++ b/plugins/eds/gtd-eds-autoptr.h
+@@ -23,6 +23,5 @@
+ #include <libecal/libecal.h>
+ 
+ G_DEFINE_AUTOPTR_CLEANUP_FUNC (ECalComponent, g_object_unref);
+-G_DEFINE_AUTOPTR_CLEANUP_FUNC (ECalComponentId, e_cal_component_free_id);
++G_DEFINE_AUTOPTR_CLEANUP_FUNC (ECalComponentId, e_cal_component_id_free);
+ G_DEFINE_AUTOPTR_CLEANUP_FUNC (ECalClient, g_object_unref);
+-G_DEFINE_AUTOPTR_CLEANUP_FUNC (ESource, g_object_unref);
+diff --git a/plugins/eds/gtd-provider-eds.c b/plugins/eds/gtd-provider-eds.c
+index a403226..def4235 100644
+--- a/plugins/eds/gtd-provider-eds.c
++++ b/plugins/eds/gtd-provider-eds.c
+@@ -554,6 +554,7 @@ gtd_provider_eds_create_task (GtdProvider *provider,
+ 
+   e_cal_client_create_object (client,
+                               e_cal_component_get_icalcomponent (component),
++                              E_CAL_OPERATION_FLAG_NONE,
+                               NULL,
+                               (GAsyncReadyCallback) on_task_created_cb,
+                               new_task);
+@@ -587,6 +588,7 @@ gtd_provider_eds_update_task (GtdProvider *provider,
+   e_cal_client_modify_object (client,
+                               e_cal_component_get_icalcomponent (component),
+                               E_CAL_OBJ_MOD_THIS,
++                              E_CAL_OPERATION_FLAG_NONE,
+                               NULL,
+                               (GAsyncReadyCallback) on_task_modified_cb,
+                               task);
+@@ -616,9 +618,10 @@ gtd_provider_eds_remove_task (GtdProvider *provider,
+   gtd_object_push_loading (GTD_OBJECT (provider));
+ 
+   e_cal_client_remove_object (client,
+-                              id->uid,
+-                              id->rid,
++                              e_cal_component_id_get_uid (id),
++                              e_cal_component_id_get_rid (id),
+                               E_CAL_OBJ_MOD_THIS,
++                              E_CAL_OPERATION_FLAG_NONE,
+                               NULL,
+                               (GAsyncReadyCallback) on_task_removed_cb,
+                               provider);
+diff --git a/plugins/eds/gtd-task-eds.c b/plugins/eds/gtd-task-eds.c
+index 2c8cd8e..bd8f7ac 100644
+--- a/plugins/eds/gtd-task-eds.c
++++ b/plugins/eds/gtd-task-eds.c
+@@ -46,19 +46,19 @@ static GParamSpec *properties [N_PROPS];
+  */
+ 
+ static GDateTime*
+-convert_icaltime (const icaltimetype *date)
++convert_icaltime (const ICalTime *date)
+ {
+   GDateTime *dt;
+ 
+   if (!date)
+     return NULL;
+ 
+-  dt = g_date_time_new_utc (date->year,
+-                            date->month,
+-                            date->day,
+-                            date->is_date ? 0 : date->hour,
+-                            date->is_date ? 0 : date->minute,
+-                            date->is_date ? 0 : date->second);
++  dt = g_date_time_new_utc (i_cal_time_get_year (date),
++                            i_cal_time_get_month (date),
++                            i_cal_time_get_day (date),
++                            i_cal_time_is_date (date) ? 0 : i_cal_time_get_hour (date),
++                            i_cal_time_is_date (date) ? 0 : i_cal_time_get_minute (date),
++                            i_cal_time_is_date (date) ? 0 : i_cal_time_get_second (date));
+ 
+   return dt;
+ }
+@@ -67,19 +67,20 @@ static void
+ set_description (GtdTaskEds  *self,
+                  const gchar *description)
+ {
+-  ECalComponentText text;
++  ECalComponentText *text;
+   GSList note;
+ 
+-  text.value = description && *description ? description : "";
+-  text.altrep = NULL;
++  text = e_cal_component_text_new (description ? description : "", NULL);
+ 
+-  note.data = &text;
++  note.data = text;
+   note.next = NULL;
+ 
+   g_clear_pointer (&self->description, g_free);
+   self->description = g_strdup (description);
+ 
+-  e_cal_component_set_description_list (self->component, &note);
++  e_cal_component_set_descriptions (self->component, (description && *description) ? &note : NULL);
++
++  e_cal_component_text_free (text);
+ }
+ 
+ static void
+@@ -90,7 +91,7 @@ setup_description (GtdTaskEds *self)
+   GSList *l;
+ 
+   /* concatenates the multiple descriptions a task may have */
+-  e_cal_component_get_description_list (self->component, &text_list);
++  text_list = e_cal_component_get_descriptions (self->component);
+ 
+   for (l = text_list; l != NULL; l = l->next)
+     {
+@@ -105,21 +106,21 @@ setup_description (GtdTaskEds *self)
+             {
+               carrier = g_strconcat (desc,
+                                      "\n",
+-                                     text->value,
++                                     e_cal_component_text_get_value (text),
+                                      NULL);
+               g_free (desc);
+               desc = carrier;
+             }
+           else
+             {
+-              desc = g_strdup (text->value);
++              desc = g_strdup (e_cal_component_text_get_value (text));
+             }
+         }
+     }
+ 
+   set_description (self, desc);
+ 
+-  e_cal_component_free_text_list (text_list);
++  g_slist_free_full (text_list, e_cal_component_text_free);
+ }
+ 
+ 
+@@ -138,7 +139,7 @@ gtd_task_eds_get_uid (GtdObject *object)
+   self = GTD_TASK_EDS (object);
+ 
+   if (self->component)
+-    e_cal_component_get_uid (self->component, &uid);
++    uid = e_cal_component_get_uid (self->component);
+   else
+     uid = NULL;
+ 
+@@ -159,7 +160,7 @@ gtd_task_eds_set_uid (GtdObject   *object,
+   if (!self->component)
+     return;
+ 
+-  e_cal_component_get_uid (self->component, &current_uid);
++  current_uid = e_cal_component_get_uid (self->component);
+ 
+   if (g_strcmp0 (current_uid, uid) != 0)
+     {
+@@ -177,7 +178,7 @@ gtd_task_eds_set_uid (GtdObject   *object,
+ static gboolean
+ gtd_task_eds_get_complete (GtdTask *task)
+ {
+-  icalproperty_status status;
++  ICalPropertyStatus status;
+   GtdTaskEds *self;
+   gboolean completed;
+ 
+@@ -185,8 +186,8 @@ gtd_task_eds_get_complete (GtdTask *task)
+ 
+   self = GTD_TASK_EDS (task);
+ 
+-  e_cal_component_get_status (self->component, &status);
+-  completed = status == ICAL_STATUS_COMPLETED;
++  status = e_cal_component_get_status (self->component);
++  completed = status == I_CAL_STATUS_COMPLETED;
+ 
+   return completed;
+ }
+@@ -195,8 +196,8 @@ static void
+ gtd_task_eds_set_complete (GtdTask  *task,
+                            gboolean  complete)
+ {
+-  icalproperty_status status;
+-  icaltimetype *dt;
++  ICalPropertyStatus status;
++  ICalTime *dt;
+   GtdTaskEds *self;
+   gint percent;
+ 
+@@ -209,54 +210,54 @@ gtd_task_eds_set_complete (GtdTask  *task,
+       percent = 100;
+       status = ICAL_STATUS_COMPLETED;
+ 
+-      dt = g_new0 (icaltimetype, 1);
+-      dt->year = g_date_time_get_year (now);
+-      dt->month = g_date_time_get_month (now);
+-      dt->day = g_date_time_get_day_of_month (now);
+-      dt->hour = g_date_time_get_hour (now);
+-      dt->minute = g_date_time_get_minute (now);
+-      dt->second = g_date_time_get_seconds (now);
+-      dt->zone = icaltimezone_get_utc_timezone ();
++      dt = i_cal_time_new_null_time ();
++      i_cal_time_set_date (dt,
++                           g_date_time_get_year (now),
++                           g_date_time_get_month (now),
++                           g_date_time_get_day_of_month (now));
++      i_cal_time_set_time (dt,
++                           g_date_time_get_hour (now),
++                           g_date_time_get_minute (now),
++                           g_date_time_get_seconds (now));
++      i_cal_time_set_timezone (dt, i_cal_timezone_get_utc_timezone ());
+ 
+       /* convert timezone
+        *
+        * FIXME: This does not do anything until we have an ical
+        * timezone associated with the task
+        */
+-      icaltimezone_convert_time (dt, NULL, icaltimezone_get_utc_timezone ());
++      i_cal_time_convert_timezone (dt, NULL, i_cal_timezone_get_utc_timezone ());
+     }
+   else
+     {
+       dt = NULL;
+       percent = 0;
+-      status = ICAL_STATUS_NEEDSACTION;
++      status = I_CAL_STATUS_NEEDSACTION;
+     }
+ 
+-  e_cal_component_set_percent_as_int (self->component, percent);
++  e_cal_component_set_percent_complete (self->component, percent);
+   e_cal_component_set_status (self->component, status);
+   e_cal_component_set_completed (self->component, dt);
+ 
+-  if (dt)
+-    e_cal_component_free_icaltimetype (dt);
++  g_clear_object (&dt);
+ }
+ 
+ static GDateTime*
+ gtd_task_eds_get_creation_date (GtdTask *task)
+ {
+-  icaltimetype *idt;
++  ICalTime *idt;
+   GtdTaskEds *self;
+   GDateTime *dt;
+ 
+   self = GTD_TASK_EDS (task);
+-  idt = NULL;
+   dt = NULL;
+ 
+-  e_cal_component_get_created (self->component, &idt);
++  idt = e_cal_component_get_created (self->component);
+ 
+   if (idt)
+     dt = convert_icaltime (idt);
+ 
+-  g_clear_pointer (&idt, e_cal_component_free_icaltimetype);
++  g_clear_object (&idt);
+ 
+   return dt;
+ }
+@@ -286,7 +287,7 @@ gtd_task_eds_set_description (GtdTask     *task,
+ static GDateTime*
+ gtd_task_eds_get_due_date (GtdTask *task)
+ {
+-  ECalComponentDateTime comp_dt;
++  ECalComponentDateTime *comp_dt;
+   GtdTaskEds *self;
+   GDateTime *date;
+ 
+@@ -294,10 +295,12 @@ gtd_task_eds_get_due_date (GtdTask *task)
+ 
+   self = GTD_TASK_EDS (task);
+ 
+-  e_cal_component_get_due (self->component, &comp_dt);
++  comp_dt = e_cal_component_get_due (self->component);
++  if (!comp_dt)
++    return NULL;
+ 
+-  date = convert_icaltime (comp_dt.value);
+-  e_cal_component_free_datetime (&comp_dt);
++  date = convert_icaltime (e_cal_component_datetime_get_value (comp_dt));
++  e_cal_component_datetime_free (comp_dt);
+ 
+   return date;
+ }
+@@ -317,11 +320,10 @@ gtd_task_eds_set_due_date (GtdTask   *task,
+ 
+   if (dt != current_dt)
+     {
+-      ECalComponentDateTime comp_dt;
+-      icaltimetype *idt;
++      ECalComponentDateTime *comp_dt;
++      ICalTime *idt;
+ 
+-      comp_dt.value = NULL;
+-      comp_dt.tzid = NULL;
++      comp_dt = NULL;
+       idt = NULL;
+ 
+       if (!current_dt ||
+@@ -329,36 +331,34 @@ gtd_task_eds_set_due_date (GtdTask   *task,
+            dt &&
+            g_date_time_compare (current_dt, dt) != 0))
+         {
+-          idt = g_new0 (icaltimetype, 1);
++          idt = i_cal_time_new_null_time ();
+ 
+           g_date_time_ref (dt);
+ 
+           /* Copy the given dt */
+-          idt->year = g_date_time_get_year (dt);
+-          idt->month = g_date_time_get_month (dt);
+-          idt->day = g_date_time_get_day_of_month (dt);
+-          idt->hour = g_date_time_get_hour (dt);
+-          idt->minute = g_date_time_get_minute (dt);
+-          idt->second = g_date_time_get_seconds (dt);
+-          idt->is_date = (idt->hour == 0 &&
+-                          idt->minute == 0 &&
+-                          idt->second == 0);
+-
+-          comp_dt.tzid = g_strdup ("UTC");
++          i_cal_time_set_date (idt,
++                               g_date_time_get_year (dt),
++                               g_date_time_get_month (dt),
++                               g_date_time_get_day_of_month (dt));
++          i_cal_time_set_time (idt,
++                               g_date_time_get_hour (dt),
++                               g_date_time_get_minute (dt),
++                               g_date_time_get_seconds (dt));
++          i_cal_time_set_is_date (idt,
++                          i_cal_time_get_hour (idt) == 0 &&
++                          i_cal_time_get_minute (idt) == 0 &&
++                          i_cal_time_get_second (idt) == 0);
+ 
+-          comp_dt.value = idt;
++          comp_dt = e_cal_component_datetime_new_take (idt, g_strdup ("UTC"));
+ 
+-          e_cal_component_set_due (self->component, &comp_dt);
++          e_cal_component_set_due (self->component, comp_dt);
+ 
+-          e_cal_component_free_datetime (&comp_dt);
++          e_cal_component_datetime_free (comp_dt);
+ 
+           g_date_time_unref (dt);
+         }
+       else if (!dt)
+         {
+-          idt = NULL;
+-          comp_dt.tzid = NULL;
+-
+           e_cal_component_set_due (self->component, NULL);
+         }
+     }
+@@ -369,19 +369,13 @@ gtd_task_eds_set_due_date (GtdTask   *task,
+ static gint32
+ gtd_task_eds_get_priority (GtdTask *task)
+ {
+-  g_autofree gint *priority = NULL;
+   GtdTaskEds *self;
+ 
+   g_assert (GTD_IS_TASK_EDS (task));
+ 
+   self = GTD_TASK_EDS (task);
+ 
+-  e_cal_component_get_priority (self->component, &priority);
+-
+-  if (!priority)
+-    return -1;
+-
+-  return *priority;
++  return e_cal_component_get_priority (self->component);
+ }
+ 
+ static void
+@@ -394,29 +388,26 @@ gtd_task_eds_set_priority (GtdTask *task,
+ 
+   self = GTD_TASK_EDS (task);
+ 
+-  e_cal_component_set_priority (self->component, &priority);
++  e_cal_component_set_priority (self->component, priority);
+ }
+ 
+ static const gchar*
+ gtd_task_eds_get_title (GtdTask *task)
+ {
+-  ECalComponentText summary;
+   GtdTaskEds *self;
+ 
+   g_return_val_if_fail (GTD_IS_TASK_EDS (task), NULL);
+ 
+   self = GTD_TASK_EDS (task);
+ 
+-  e_cal_component_get_summary (self->component, &summary);
+-
+-  return summary.value;
++  return i_cal_component_get_summary (e_cal_component_get_icalcomponent (self->component));
+ }
+ 
+ static void
+ gtd_task_eds_set_title (GtdTask     *task,
+                         const gchar *title)
+ {
+-  ECalComponentText new_summary;
++  ECalComponentText *new_summary;
+   GtdTaskEds *self;
+ 
+   g_return_if_fail (GTD_IS_TASK_EDS (task));
+@@ -424,10 +415,11 @@ gtd_task_eds_set_title (GtdTask     *task,
+ 
+   self = GTD_TASK_EDS (task);
+ 
+-  new_summary.value = title;
+-  new_summary.altrep = NULL;
++  new_summary = e_cal_component_text_new (title, NULL);
+ 
+-  e_cal_component_set_summary (self->component, &new_summary);
++  e_cal_component_set_summary (self->component, new_summary);
++
++  e_cal_component_text_free (new_summary);
+ }
+ 
+ 
+@@ -436,10 +428,10 @@ gtd_task_eds_subtask_added (GtdTask *task,
+                             GtdTask *subtask)
+ {
+   g_autoptr (GList) subtasks = NULL;
+-  ECalComponentId *id;
++  const gchar *uid;
+   ECalComponent *comp;
+-  icalcomponent *ical_comp;
+-  icalproperty *property;
++  ICalComponent *ical_comp;
++  ICalProperty *property;
+   GtdTaskEds *subtask_self;
+   GtdTaskEds *self;
+ 
+@@ -450,17 +442,17 @@ gtd_task_eds_subtask_added (GtdTask *task,
+   /* Hook with parent's :subtask_added */
+   GTD_TASK_CLASS (gtd_task_eds_parent_class)->subtask_added (task, subtask);
+ 
+-  id = e_cal_component_get_id (self->component);
++  uid = e_cal_component_get_uid (self->component);
+   comp = subtask_self->component;
+   ical_comp = e_cal_component_get_icalcomponent (comp);
+-  property = icalcomponent_get_first_property (ical_comp, ICAL_RELATEDTO_PROPERTY);
++  property = i_cal_component_get_first_property (ical_comp, I_CAL_RELATEDTO_PROPERTY);
+ 
+   if (property)
+-    icalproperty_set_relatedto (property, id->uid);
++    i_cal_property_set_relatedto (property, uid);
+   else
+-    icalcomponent_add_property (ical_comp, icalproperty_new_relatedto (id->uid));
++    i_cal_component_take_property (ical_comp, i_cal_property_new_relatedto (uid));
+ 
+-  e_cal_component_free_id (id);
++  g_clear_object (&property);
+ }
+ 
+ static void
+@@ -468,8 +460,8 @@ gtd_task_eds_subtask_removed (GtdTask *task,
+                               GtdTask *subtask)
+ {
+   g_autoptr (GList) subtasks = NULL;
+-  icalcomponent *ical_comp;
+-  icalproperty *property;
++  ICalComponent *ical_comp;
++  ICalProperty *property;
+   GtdTaskEds *subtask_self;
+ 
+   subtask_self = GTD_TASK_EDS (subtask);
+@@ -480,12 +472,13 @@ gtd_task_eds_subtask_removed (GtdTask *task,
+ 
+   /* Remove the parent link from the subtask's component */
+   ical_comp = e_cal_component_get_icalcomponent (subtask_self->component);
+-  property = icalcomponent_get_first_property (ical_comp, ICAL_RELATEDTO_PROPERTY);
++  property = i_cal_component_get_first_property (ical_comp, I_CAL_RELATEDTO_PROPERTY);
+ 
+   if (!property)
+     return;
+ 
+-  icalcomponent_remove_property (ical_comp, property);
++  i_cal_component_remove_property (ical_comp, property);
++  g_object_unref (property);
+ }
+ 
+ 
+diff --git a/plugins/eds/gtd-task-list-eds.c b/plugins/eds/gtd-task-list-eds.c
+index eb48a73..5b71718 100644
+--- a/plugins/eds/gtd-task-list-eds.c
++++ b/plugins/eds/gtd-task-list-eds.c
+@@ -85,19 +85,19 @@ setup_parent_task (GtdTaskListEds *self,
+                    GtdTask        *task)
+ {
+   ECalComponent *component;
+-  icalcomponent *ical_comp;
+-  icalproperty *property;
++  ICalComponent *ical_comp;
++  ICalProperty *property;
+   GtdTask *parent_task;
+   const gchar *parent_uid;
+ 
+   component = gtd_task_eds_get_component (GTD_TASK_EDS (task));
+   ical_comp = e_cal_component_get_icalcomponent (component);
+-  property = icalcomponent_get_first_property (ical_comp, ICAL_RELATEDTO_PROPERTY);
++  property = i_cal_component_get_first_property (ical_comp, I_CAL_RELATEDTO_PROPERTY);
+ 
+   if (!property)
+     return;
+ 
+-  parent_uid = icalproperty_get_relatedto (property);
++  parent_uid = i_cal_property_get_relatedto (property);
+   parent_task = gtd_task_list_get_task_by_id (GTD_TASK_LIST (self), parent_uid);
+ 
+   if (parent_task)
+@@ -112,6 +112,8 @@ setup_parent_task (GtdTaskListEds *self,
+ 
+       g_ptr_array_add (self->pending_subtasks, data);
+     }
++
++  g_object_unref (property);
+ }
+ 
+ static void
+@@ -161,8 +163,8 @@ on_view_objects_added_cb (ECalClientView *view,
+       GtdTask *task;
+       const gchar *uid;
+ 
+-      component = e_cal_component_new_from_string (icalcomponent_as_ical_string (l->data));
+-      e_cal_component_get_uid (component, &uid);
++      component = e_cal_component_new_from_icalcomponent (i_cal_component_clone (l->data));
++      uid = e_cal_component_get_uid (component);
+ 
+       task = gtd_task_list_get_task_by_id (self, uid);
+ 
+@@ -211,8 +213,8 @@ on_view_objects_modified_cb (ECalClientView *view,
+       GtdTask *task;
+       const gchar *uid;
+ 
+-      component = e_cal_component_new_from_string (icalcomponent_as_ical_string (l->data));
+-      e_cal_component_get_uid (component, &uid);
++      component = e_cal_component_new_from_icalcomponent (i_cal_component_clone (l->data));
++      uid = e_cal_component_get_uid (component);
+ 
+       task = gtd_task_list_get_task_by_id (self, uid);
+ 
+@@ -244,7 +246,7 @@ on_view_objects_removed_cb (ECalClientView *view,
+       GtdTask *task;
+ 
+       id = l->data;
+-      task = gtd_task_list_get_task_by_id (self, id->uid);
++      task = gtd_task_list_get_task_by_id (self, e_cal_component_id_get_uid (id));
+ 
+       if (!task)
+         continue;
+diff --git a/plugins/eds/meson.build b/plugins/eds/meson.build
+index ea84426..b37f0c6 100644
+--- a/plugins/eds/meson.build
++++ b/plugins/eds/meson.build
+@@ -8,10 +8,9 @@ plugins_ldflags += ['-Wl,--undefined=gtd_plugin_eds_register_types']
+ ################
+ 
+ eds_plugin_deps = [
+-  dependency('libecal-1.2', version: '>= 3.13.90'),
++  dependency('libecal-2.0', version: '>= 3.33.1'),
+   dependency('libedataserver-1.2', version: '>= 3.17.1'),
+   dependency('libedataserverui-1.2', version: '>= 3.17.1'),
+-  dependency('libical', version: '>= 0.43'),
+ ]
+ 
+ eds_plugin_deps += gnome_todo_deps
diff --git a/srcpkgs/gnome-todo/template b/srcpkgs/gnome-todo/template
index 16cb152ff9c..1ab0a81432d 100644
--- a/srcpkgs/gnome-todo/template
+++ b/srcpkgs/gnome-todo/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-todo'
 pkgname=gnome-todo
 version=3.28.1
-revision=4
+revision=5
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir true false)"
@@ -14,7 +14,11 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Todo"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=c7571fc040d8901dd0e528282ef0655687f23f29d304057c72548ab3e2c2cf23
-nocross="https://build.voidlinux.org/builders/aarch64_builder/builds/19471/steps/shell_3/logs/stdio"
+patch_args="-Np1"
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qemu-user-static"
+fi
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/gnome-tweaks/template b/srcpkgs/gnome-tweaks/template
index ff9d1828c60..ac1f8bdb873 100644
--- a/srcpkgs/gnome-tweaks/template
+++ b/srcpkgs/gnome-tweaks/template
@@ -1,17 +1,17 @@
 # Template file for 'gnome-tweaks'
 pkgname=gnome-tweaks
-version=3.32.0
-revision=1
+version=3.34.0
+revision=2
 archs=noarch
 build_style=meson
 pycompile_module="gtweak"
-depends="gtk+3 dconf gnome-settings-daemon mutter libnotify python3-gobject"
+depends="gtk+3 dconf gnome-settings-daemon mutter libnotify python3-gobject libhandy"
 short_desc="GNOME3 tool to customize advanced options"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later, CC0-1.0"
 homepage="https://wiki.gnome.org/Apps/Tweaks"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a54061b2c9150567ff22874c0c3a9e36c04ab6b0093b738c662e92c15919f90c
+checksum=003326fab46e6faad9485924bca503f0c583e3b4553d6f673406eda396205250
 nocross=yes
 replaces="gnome-tweak-tool>=0"
 
diff --git a/srcpkgs/gnome-user-docs/template b/srcpkgs/gnome-user-docs/template
index 9d96116ae29..431c54f3934 100644
--- a/srcpkgs/gnome-user-docs/template
+++ b/srcpkgs/gnome-user-docs/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-user-docs'
 pkgname=gnome-user-docs
-version=3.32.3
+version=3.34.0
 revision=1
 archs=noarch
 build_style=gnu-configure
@@ -13,4 +13,4 @@ license="CC-BY-3.0"
 homepage="https://github.com/GNOME/gnome-user-docs"
 #changelog="https://raw.githubusercontent.com/GNOME/gnome-user-docs/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2fc2b50dcdb0ae49dd9a4f9d8bd993efe840ec0dbb910cb03f2ea3d728a07a37
+checksum=8f9907ff15fff97da75ece645cc86766703ac54d716d25563ba67ffed1af24ed
diff --git a/srcpkgs/gnu-efi-libs/template b/srcpkgs/gnu-efi-libs/template
index 80bed8b52f6..1d6e1e057e9 100644
--- a/srcpkgs/gnu-efi-libs/template
+++ b/srcpkgs/gnu-efi-libs/template
@@ -1,16 +1,16 @@
 # Template file for 'gnu-efi-libs'
 pkgname=gnu-efi-libs
 reverts="3.0w_1" # Not an actual revert, xbps considers 3.0w higher than 3.0.8
-version=3.0.9
-revision=2
+version=3.0.10
+revision=1
 wrksrc="gnu-efi-${version}"
 makedepends="pciutils-devel"
 short_desc="Library for building UEFI Applications using GNU toolchain"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://sourceforge.net/projects/gnu-efi/"
 distfiles="${SOURCEFORGE_SITE}/gnu-efi/gnu-efi-${version}.tar.bz2"
-checksum=6715ea7eae1c7e4fc5041034bd3f107ec2911962ed284a081e491646b12277f0
+checksum=f12082a3a5f0c3e38c67262a9f34245d139ac2cdfc0a0bdcf03c9b1f56fa4fed
 nostrip=yes
 
 # If we are cross-building we need to pass the cross-compilation triplet
diff --git a/srcpkgs/gnucash/template b/srcpkgs/gnucash/template
index cd02e38eb44..68bb811fc42 100644
--- a/srcpkgs/gnucash/template
+++ b/srcpkgs/gnucash/template
@@ -1,7 +1,7 @@
 # Template file for 'gnucash'
 pkgname=gnucash
-version=3.6
-revision=2
+version=3.7
+revision=1
 build_style=cmake
 configure_args="-DWITH_SQL=0 -DWITH_PYTHON=1"
 hostmakedepends="pkg-config guile python3 libxslt perl"
@@ -14,7 +14,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://www.gnucash.org"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=f1cb86de60bb0eb2cf5c2c3868e7dab7d889017e233230f944f158f84eb85f25
+checksum=6b8eb09f3980531509bcb3a589ab0334d827c32f860ce8a209aa2fe0ed8858b4
 
 pycompile_module="gnucash"
 pycompile_dirs="usr/share/gnucash/python"
diff --git a/srcpkgs/gnumeric/template b/srcpkgs/gnumeric/template
index ae54b7b997a..bd198be684a 100644
--- a/srcpkgs/gnumeric/template
+++ b/srcpkgs/gnumeric/template
@@ -1,7 +1,7 @@
 # Template file for 'gnumeric'
 pkgname=gnumeric
 version=1.12.45
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="bison gdk-pixbuf-devel glib-devel intltool itstool pkg-config "
 makedepends="goffice-devel librsvg-devel libxslt-devel"
diff --git a/srcpkgs/gnupg2/patches/use-versioned-pcsclite.patch b/srcpkgs/gnupg2/patches/use-versioned-pcsclite.patch
new file mode 100644
index 00000000000..0f12e5f446f
--- /dev/null
+++ b/srcpkgs/gnupg2/patches/use-versioned-pcsclite.patch
@@ -0,0 +1,11 @@
+--- scd/scdaemon.c.orig	2019-09-29 12:18:47.810111976 +0700
++++ scd/scdaemon.c	2019-09-29 12:20:38.079117234 +0700
+@@ -189,7 +189,7 @@
+ #define DEFAULT_PCSC_DRIVER "winscard.dll"
+ #elif defined(__APPLE__)
+ #define DEFAULT_PCSC_DRIVER "/System/Library/Frameworks/PCSC.framework/PCSC"
+-#elif defined(__GLIBC__)
++#elif defined(__linux__)
+ #define DEFAULT_PCSC_DRIVER "libpcsclite.so.1"
+ #else
+ #define DEFAULT_PCSC_DRIVER "libpcsclite.so"
diff --git a/srcpkgs/gnupg2/template b/srcpkgs/gnupg2/template
index 2d8b288a3e8..7b8037886bc 100644
--- a/srcpkgs/gnupg2/template
+++ b/srcpkgs/gnupg2/template
@@ -1,22 +1,25 @@
 # Template file for 'gnupg2'
 pkgname=gnupg2
 version=2.2.17
-revision=1
+revision=3
 wrksrc="gnupg-${version}"
 build_style=gnu-configure
 configure_args="--with-libgcrypt-prefix=${XBPS_CROSS_BASE}
  --with-ksba-prefix=${XBPS_CROSS_BASE} --with-npth-prefix=${XBPS_CROSS_BASE}
- --with-libassuan-prefix=${XBPS_CROSS_BASE} --enable-gpg-is-gpg2"
+ --with-libassuan-prefix=${XBPS_CROSS_BASE} --enable-gpg-is-gpg2
+ $(vopt_enable ldap)"
 hostmakedepends="pkg-config"
 makedepends="bzip2-devel gnutls-devel libassuan-devel libcurl-devel
  libksba-devel libldap-devel libusb-compat-devel npth-devel sqlite-devel"
 depends="pinentry"
 short_desc="GNU Privacy Guard (2.x)"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnupg.org/"
 distfiles="https://gnupg.org/ftp/gcrypt/gnupg/gnupg-${version}.tar.bz2"
 checksum=afa262868e39b651a2db4c071fba90415154243e83a830ca00516f9a807fd514
+build_options="ldap"
+build_options_default="ldap"
 
 pre_configure() {
 	vsed -i '/examples\/systemd-user/d' doc/Makefile.in
diff --git a/srcpkgs/gnutls/template b/srcpkgs/gnutls/template
index 88f0bb3e6df..d4b9123540b 100644
--- a/srcpkgs/gnutls/template
+++ b/srcpkgs/gnutls/template
@@ -1,10 +1,11 @@
 # Template file for 'gnutls'
 pkgname=gnutls
-version=3.6.9
+version=3.6.10
 revision=1
 build_style=gnu-configure
 configure_args="--with-zlib --disable-guile --disable-static
- --disable-valgrind-tests --disable-rpath"
+ --disable-valgrind-tests --disable-rpath
+ --with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt"
 hostmakedepends="gettext-devel pkg-config libtool"
 # add autogen when #6550 is solved
 makedepends="zlib-devel lzo-devel readline-devel libgpg-error-devel
@@ -15,7 +16,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only, LGPL-2.1-or-later"
 homepage="https://gnutls.org"
 distfiles="https://www.gnupg.org/ftp/gcrypt/gnutls/v${version%.*}/gnutls-${version}.tar.xz"
-checksum=4331fca55817ecdd74450b908a6c29b4f05bb24dd13144c6284aa34d872e1fcb
+checksum=b1f3ca67673b05b746a961acf2243eaae0ffe658b6a6494265c648e7c7812293
 
 gnutls-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/go-for-it/template b/srcpkgs/go-for-it/template
index 87e86aa98cc..daa46e150b2 100644
--- a/srcpkgs/go-for-it/template
+++ b/srcpkgs/go-for-it/template
@@ -1,6 +1,6 @@
 # Template file for 'go-for-it'
 pkgname=go-for-it
-version=1.7.2
+version=1.7.3
 revision=1
 wrksrc="Go-For-It-${version}"
 build_style=cmake
@@ -11,4 +11,4 @@ maintainer="Piraty <piraty1@inbox.ru>"
 license="GPL-3.0-only"
 homepage="https://github.com/JMoerman/Go-For-It"
 distfiles="https://github.com/JMoerman/Go-For-It/archive/${version}.tar.gz"
-checksum=446a461b148e7df2ed81f1340adba0181ba1f0f698c0b7b539223a2ee5aa54f6
+checksum=582ec27876dbfdab71c5fc681a74c3e4f5a4d0d73cd634a0c5db64e5c4c51ea7
diff --git a/srcpkgs/go-jira/template b/srcpkgs/go-jira/template
index 537d365eca8..fc3668fa323 100644
--- a/srcpkgs/go-jira/template
+++ b/srcpkgs/go-jira/template
@@ -1,25 +1,15 @@
 # Template file for 'go-jira'
 pkgname=go-jira
-version=1.0.20
-revision=2
+version=1.0.21
+revision=1
+wrksrc="jira-${version}"
 build_style=go
+go_import_path="github.com/go-jira/jira"
+go_package="$go_import_path/cmd/jira"
 hostmakedepends="dep"
 short_desc="Simple jira command line client in Go"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="Apache"
-go_import_path="github.com/Netflix-Skunkworks/go-jira"
-go_package="$go_import_path/cmd/jira"
+license="Apache-2.0"
 homepage="https://$go_import_path"
 distfiles="$homepage/archive/v$version.tar.gz"
-checksum=0adf6d68e4a0700578706d9707dab633db8ee336151ce4232de93c7332459c45
-
-pre_build() {
-	git config --global http.https://gopkg.in.followRedirects true
-
-	cd $GOSRCPATH
-	dep ensure
-}
-
-post_install() {
-	vlicense LICENSE
-}
+checksum=c76089423fc0d4b9dcdd39822d6d94452136f8f24b8c17ec75b0e702e40fbcc2
diff --git a/srcpkgs/go-md2man/template b/srcpkgs/go-md2man/template
index e2cbc9a0073..c19f0817804 100644
--- a/srcpkgs/go-md2man/template
+++ b/srcpkgs/go-md2man/template
@@ -6,7 +6,7 @@ build_style=go
 go_import_path=github.com/cpuguy83/go-md2man
 hostmakedepends="git"
 short_desc="Convert md to manpages"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://${go_import_path}"
 distfiles="https://github.com/cpuguy83/go-md2man/archive/v${version}.tar.gz"
diff --git a/srcpkgs/go-review/template b/srcpkgs/go-review/template
new file mode 100644
index 00000000000..01cd9d00848
--- /dev/null
+++ b/srcpkgs/go-review/template
@@ -0,0 +1,18 @@
+# Template file for 'go-review'
+pkgname=go-review
+version=0.3.1
+revision=1
+build_style=go
+go_import_path="github.com/heppu/go-review"
+go_package="${go_import_path}/cmd/${pkgname}"
+hostmakedepends="git"
+short_desc="Publish reports from different Go linters as gerrit reviews"
+maintainer="Renato Aguiar <renato@renag.me>"
+license="MIT"
+homepage="https://github.com/heppu/go-review"
+distfiles="https://github.com/heppu/go-review/archive/v${version}.tar.gz"
+checksum=284eea5ec9184f169454de1f15a64beafd774653852d3e952171d9850651a553
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/go/patches/gohostarch-bootstrap-fix.patch b/srcpkgs/go/patches/gohostarch-bootstrap-fix.patch
new file mode 100644
index 00000000000..7791b92abe7
--- /dev/null
+++ b/srcpkgs/go/patches/gohostarch-bootstrap-fix.patch
@@ -0,0 +1,28 @@
+From e1b1b7856f416ca6ff086adc00adc89fd900992c Mon Sep 17 00:00:00 2001
+From: Brad Fitzpatrick <bradfitz@golang.org>
+Date: Thu, 26 Sep 2019 19:04:00 +0000
+Subject: [PATCH] cmd/dist: fix bootstrap failure when GOHOSTARCH is set
+
+Fixes #33977
+
+Change-Id: I4b136788f08b08c53087af8d3cd56125e620b51b
+Reviewed-on: https://go-review.googlesource.com/c/go/+/197602
+Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
+TryBot-Result: Gobot Gobot <gobot@golang.org>
+Reviewed-by: Cherry Zhang <cherryyz@google.com>
+---
+
+diff --git a/src/cmd/dist/buildtool.go b/src/cmd/dist/buildtool.go
+index f293891..f27ea17 100644
+--- go/src/cmd/dist/buildtool.go
++++ go/src/cmd/dist/buildtool.go
+@@ -250,6 +250,9 @@
+ 	archCaps = fileArch
+ 	fileArch = strings.ToLower(fileArch)
+ 	fileArch = strings.TrimSuffix(fileArch, "splitload")
++	if fileArch == os.Getenv("GOHOSTARCH") {
++		return "", false
++	}
+ 	if fileArch == strings.TrimSuffix(runtime.GOARCH, "le") {
+ 		return "", false
+ 	}
diff --git a/srcpkgs/go/template b/srcpkgs/go/template
index 683e651aa7a..f74f4c9a0ce 100644
--- a/srcpkgs/go/template
+++ b/srcpkgs/go/template
@@ -1,6 +1,6 @@
 # Template file for 'go'
 pkgname=go
-version=1.12.8
+version=1.13.1
 revision=1
 create_wrksrc=yes
 build_wrksrc=go
@@ -10,7 +10,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://golang.org/"
 distfiles="https://golang.org/dl/go${version}.src.tar.gz"
-checksum=11ad2e2e31ff63fcf8a2bdffbe9bfa2e1845653358daed593c8c2d03453c9898
+checksum=81f154e69544b9fa92b1475ff5f11e64270260d46e7e36c34aafc8bc96209358
 
 nostrip=yes
 noverifyrdeps=yes
diff --git a/srcpkgs/gocryptfs/template b/srcpkgs/gocryptfs/template
index 98b28535695..65172c644aa 100644
--- a/srcpkgs/gocryptfs/template
+++ b/srcpkgs/gocryptfs/template
@@ -1,7 +1,7 @@
 # Template file for 'gocryptfs'
 pkgname=gocryptfs
-version=1.7
-revision=2
+version=1.7.1
+revision=1
 wrksrc="${pkgname}_v${version}_src-deps"
 build_style=go
 go_import_path="github.com/rfjakob/gocryptfs"
@@ -14,7 +14,7 @@ license="MIT"
 homepage="https://nuetzlich.net/gocryptfs"
 changelog="https://github.com/rfjakob/gocryptfs#changelog"
 distfiles="https://github.com/rfjakob/${pkgname}/releases/download/v${version}/${pkgname}_v${version}_src-deps.tar.gz"
-checksum=2d1a2cfd072d554a28ee6e6807474b00ac710fb1aaf7aa81f3d8e94e80f6a703
+checksum=d3fc2c87b869025cd51e4abea030e58e7383197a7458f26bf99a71b224402bda
 
 post_install() {
 	vlicense $GOSRCPATH/LICENSE
diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index 8eb582bfb7c..25c7e41ffc8 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -1,7 +1,7 @@
 # Template file for 'godot'
 pkgname=godot
-version=3.1
-revision=2
+version=3.1.1
+revision=1
 wrksrc="${pkgname}-${version}-stable"
 build_style=scons
 # Godot contains private copies of libraries
@@ -16,7 +16,7 @@ maintainer="Nick Hahn <nick.hahn@hotmail.de>"
 license="MIT"
 homepage="https://www.godotengine.org/"
 distfiles="https://github.com/godotengine/${pkgname}/archive/${version}-stable.tar.gz"
-checksum=cd66354b2397f28193ba3add8d8cc5c3562775f662887b56f16de82974f041e3
+checksum=3d952cda12a43d71c53c508bc64ca82cc165a3345976b6d128f869d5bd7a61d2
 nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/6342/steps/shell_3/logs/stdio
 
 CFLAGS+=" -fPIE -fPIC"
diff --git a/srcpkgs/golangci-lint/template b/srcpkgs/golangci-lint/template
index fd6dc0df15c..c493e5b6534 100644
--- a/srcpkgs/golangci-lint/template
+++ b/srcpkgs/golangci-lint/template
@@ -1,6 +1,6 @@
 # Template file for 'golangci-lint'
 pkgname=golangci-lint
-version=1.17.1
+version=1.20.0
 revision=1
 build_style=go
 go_import_path=github.com/golangci/golangci-lint/cmd/golangci-lint
@@ -9,7 +9,7 @@ maintainer="Renato Aguiar <renato@renag.me>"
 license="GPL-3.0-only"
 homepage="https://github.com/golangci/golangci-lint"
 distfiles="https://github.com/golangci/golangci-lint/archive/v${version}.tar.gz"
-checksum=7e76e57cdd24b48e4bacc55575dd61e955789c705173f31994bccae894da1625
+checksum=9ea46fc1db83e7242c0188afd5e201b6a83afef9650de4e96ea8a60fddd93973
 
 post_install() {
 	vdoc README.md
diff --git a/srcpkgs/golly/template b/srcpkgs/golly/template
index ce2e403c661..3512fd71b72 100644
--- a/srcpkgs/golly/template
+++ b/srcpkgs/golly/template
@@ -1,7 +1,7 @@
 # Template file for 'golly'
 pkgname=golly
-version=3.2
-revision=4
+version=3.3
+revision=1
 wrksrc="${pkgname}-${version}-src"
 build_style=gnu-configure
 configure_script="gui-wx/configure/configure"
@@ -14,7 +14,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://golly.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-src.tar.gz"
-checksum=4d02f78592b5ea211f1ceda2d5ba55eb10e013ecf95b8a61c7061357f9aae931
+checksum=88fd776b1afd763ef32ac6e6d95ddfcbc51b74f6ef6a1f3ba9aa659295d573c8
 
 post_extract() {
 	# POSIX name clash
diff --git a/srcpkgs/gomatrix/template b/srcpkgs/gomatrix/template
new file mode 100644
index 00000000000..fae7a4343ed
--- /dev/null
+++ b/srcpkgs/gomatrix/template
@@ -0,0 +1,17 @@
+# Template file for 'gomatrix'
+pkgname=gomatrix
+version=101.0.0
+revision=1
+build_style=go
+go_import_path=github.com/GeertJohan/gomatrix
+hostmakedepends="git"
+short_desc="Terminal Matrix display in golang"
+maintainer="Alex Childs <misuchiru03+void@gmail.com>"
+license="BSD-2-Clause"
+homepage="https://github.com/GeertJohan/gomatrix"
+distfiles="https://github.com/GeertJohan/gomatrix/archive/v${version}.tar.gz"
+checksum=4d71d2509ac84f2340537d5e6f0eb9810b4173706f13cd6fe5e5e8ee5a69a50c
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/goodvibes/template b/srcpkgs/goodvibes/template
index 2f38a88a1ca..730fc7a27be 100644
--- a/srcpkgs/goodvibes/template
+++ b/srcpkgs/goodvibes/template
@@ -1,6 +1,6 @@
 # Template file for 'goodvibes'
 pkgname=goodvibes
-version=0.4.2
+version=0.4.3
 revision=1
 wrksrc="goodvibes-v${version}"
 build_style=meson
@@ -14,4 +14,4 @@ license="GPL-3.0-or-later"
 homepage="https://gitlab.com/goodvibes/goodvibes"
 changelog="https://gitlab.com/goodvibes/goodvibes/raw/v${version}/NEWS"
 distfiles="https://gitlab.com/goodvibes/goodvibes/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
-checksum=aaa2650ee330e7b4cb97d9783ac8d2e5fbadd0af339a562638acebe674045fa1
+checksum=521a8b35380ddcb28795de9a749daea163fcd99486c866a276f776fa1fc683ae
diff --git a/srcpkgs/google-chrome/template b/srcpkgs/google-chrome/template
index ee5cdf60538..5f93d6c5e28 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,5 +1,5 @@
 # Template file for 'google-chrome'
-_chromeVersion=76.0.3809.100
+_chromeVersion=77.0.3865.90
 _chromeRevision=1
 _channel=stable
 
@@ -20,7 +20,7 @@ _filename="google-chrome-${_channel}_${_chromeVersion}-${_chromeRevision}_amd64.
 _chromeUrl="${_baseUrl}/${_filename}"
 
 distfiles="$_chromeUrl"
-checksum=1dbf606dfa051a927fbd9a241a9032148d25be0851b2f27849a26ca81fa6b9b0
+checksum=f443503c88164f018ddb88247d2824431efcb863935ae476f4ada6218f41fdda
 
 do_extract() {
 	mkdir -p ${DESTDIR}
@@ -31,7 +31,7 @@ do_install() {
 	tar xf data.tar.xz -C ${DESTDIR}
 
 	# Install the icons
-	for size in 16 22 24 32 48 64 128 256; do
+	for size in 16 24 32 48 64 128 256; do
 		# Create the google chrome xdg directory
 		mkdir -p ${DESTDIR}/usr/share/icons/hicolor/${size}x${size}/apps
 
diff --git a/srcpkgs/google-cloud-sdk/template b/srcpkgs/google-cloud-sdk/template
index abf4ab1ba45..646b701d0ed 100644
--- a/srcpkgs/google-cloud-sdk/template
+++ b/srcpkgs/google-cloud-sdk/template
@@ -1,6 +1,6 @@
 # Template file for 'google-cloud-sdk'
 pkgname=google-cloud-sdk
-version=256.0.0
+version=267.0.0
 revision=1
 archs=noarch
 wrksrc=$pkgname
@@ -10,7 +10,7 @@ maintainer="Daniel Santana <daniel@santana.tech>"
 license="Apache-2.0"
 homepage="https://cloud.google.com/sdk"
 distfiles="https://dl.google.com/dl/cloudsdk/release/downloads/for_packagers/linux/${pkgname}_${version}.orig.tar.gz"
-checksum=b53debf3c1a9a0d3f6e3df6f8dce6aa0d9d9010221b604ef5140c9453b28d140
+checksum=2a3ebea6294d9bb1e62fcfd3a84e0d2e9e760cce6dcf5542013590640ccc0204
 
 do_install() {
 	vmkdir usr/lib/$pkgname
@@ -40,5 +40,4 @@ do_install() {
 	vdoc README
 	vdoc VERSION
 	vdoc RELEASE_NOTES
-	vlicense LICENSE
 }
diff --git a/srcpkgs/googler/template b/srcpkgs/googler/template
index fff59844076..a22598c4058 100644
--- a/srcpkgs/googler/template
+++ b/srcpkgs/googler/template
@@ -6,7 +6,7 @@ build_style=gnu-makefile
 make_build_target=disable-self-upgrade
 depends="python3 xsel xclip"
 short_desc="Google Search, Site Search and News from the terminal"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/jarun/googler"
 distfiles="https://github.com/jarun/googler/archive/v${version}.tar.gz"
diff --git a/srcpkgs/gopls/template b/srcpkgs/gopls/template
new file mode 100644
index 00000000000..64243fe9908
--- /dev/null
+++ b/srcpkgs/gopls/template
@@ -0,0 +1,20 @@
+# Template file for 'gopls'
+pkgname=gopls
+version=0.1.7
+revision=1
+wrksrc=tools-gopls-v${version}
+build_style=go
+go_import_path=golang.org/x/tools/gopls
+hostmakedepends="git"
+short_desc="Official language server for the Go language"
+maintainer="Renato Aguiar <renato@renag.me>"
+license="MIT"
+homepage="https://github.com/golang/tools"
+distfiles="https://github.com/golang/tools/archive/gopls/v${version}.tar.gz"
+checksum=3081a1ec963228baf18063c914ec04916030d87f443126ec8ae56cbc114ef747
+
+post_install() {
+	vlicense LICENSE
+	vdoc gopls/README.md
+	vcopy gopls/doc usr/share/doc/${pkgname}
+}
diff --git a/srcpkgs/goversion/template b/srcpkgs/goversion/template
index 304044bc0c5..390551d2b42 100644
--- a/srcpkgs/goversion/template
+++ b/srcpkgs/goversion/template
@@ -6,7 +6,7 @@ build_style=go
 go_import_path=rsc.io/goversion
 hostmakedepends="git"
 short_desc="Print version used to build Go executables"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/rsc/goversion"
 distfiles="https://github.com/rsc/goversion/archive/v${version}.tar.gz"
diff --git a/srcpkgs/gperftools/patches/elf-mem-image-musl.patch b/srcpkgs/gperftools/patches/elf-mem-image-musl.patch
new file mode 100644
index 00000000000..541cde28b2b
--- /dev/null
+++ b/srcpkgs/gperftools/patches/elf-mem-image-musl.patch
@@ -0,0 +1,13 @@
+This relies on link.h, which is present in musl as well as glibc.
+
+--- src/base/elf_mem_image.h
++++ src/base/elf_mem_image.h
+@@ -43,7 +43,7 @@
+ 
+ // Maybe one day we can rewrite this file not to require the elf
+ // symbol extensions in glibc, but for right now we need them.
+-#if defined(__ELF__) && defined(__GLIBC__) && !defined(__native_client__)
++#if defined(__ELF__) && !defined(__native_client__)
+ 
+ #define HAVE_ELF_MEM_IMAGE 1
+ 
diff --git a/srcpkgs/gperftools/patches/ppc-musl.patch b/srcpkgs/gperftools/patches/ppc-musl.patch
new file mode 100644
index 00000000000..d7a3645d6d7
--- /dev/null
+++ b/srcpkgs/gperftools/patches/ppc-musl.patch
@@ -0,0 +1,76 @@
+Compatibility fixes for musl.
+
+--- m4/pc_from_ucontext.m4
++++ m4/pc_from_ucontext.m4
+@@ -31,6 +31,7 @@ AC_DEFUN([AC_PC_FROM_UCONTEXT],
+    pc_fields="$pc_fields uc_mcontext.gregs[[R15]]"     # Linux (arm old [untested])
+    pc_fields="$pc_fields uc_mcontext.arm_pc"           # Linux (arm arch 5)
+    pc_fields="$pc_fields uc_mcontext.gp_regs[[PT_NIP]]"  # Suse SLES 11 (ppc64)
++   pc_fields="$pc_fields uc_mcontext.gregs[[PT_NIP]]"
+    pc_fields="$pc_fields uc_mcontext.mc_eip"           # FreeBSD (i386)
+    pc_fields="$pc_fields uc_mcontext.mc_rip"           # FreeBSD (x86_64 [untested])
+    pc_fields="$pc_fields uc_mcontext.__gregs[[_REG_EIP]]"  # NetBSD (i386)
+@@ -55,7 +56,8 @@ AC_DEFUN([AC_PC_FROM_UCONTEXT],
+                         pc_field_found=true)
+        elif test "x$ac_cv_header_sys_ucontext_h" = xyes; then
+          AC_TRY_COMPILE([#define _GNU_SOURCE 1
+-                         #include <sys/ucontext.h>],
++                         #include <sys/ucontext.h>
++                         #include <asm/ptrace.h>],
+                         [ucontext_t u; return u.$pc_field == 0;],
+                         AC_DEFINE_UNQUOTED(PC_FROM_UCONTEXT, $pc_field,
+                                            How to access the PC from a struct ucontext)
+@@ -63,7 +65,8 @@ AC_DEFUN([AC_PC_FROM_UCONTEXT],
+                         pc_field_found=true)
+        elif test "x$ac_cv_header_ucontext_h" = xyes; then
+          AC_TRY_COMPILE([#define _GNU_SOURCE 1
+-                         #include <ucontext.h>],
++                         #include <ucontext.h>
++                         #include <asm/ptrace.h>],
+                         [ucontext_t u; return u.$pc_field == 0;],
+                         AC_DEFINE_UNQUOTED(PC_FROM_UCONTEXT, $pc_field,
+                                            How to access the PC from a struct ucontext)
+--- src/getpc.h
++++ src/getpc.h
+@@ -65,6 +65,9 @@
+ typedef ucontext ucontext_t;
+ #endif
+ 
++#if defined(__powerpc__) && !defined(PT_NIP)
++#define PT_NIP 32
++#endif
+ 
+ // Take the example where function Foo() calls function Bar().  For
+ // many architectures, Bar() is responsible for setting up and tearing
+--- src/stacktrace_powerpc-linux-inl.h
++++ src/stacktrace_powerpc-linux-inl.h
+@@ -186,7 +186,7 @@ static int GET_STACK_TRACE_OR_FRAMES {
+           ucontext_t uc;
+         // We don't care about the rest, since the IP value is at 'uc' field.
+         } *sigframe = reinterpret_cast<signal_frame_64*>(current);
+-        result[n] = (void*) sigframe->uc.uc_mcontext.gp_regs[PT_NIP];
++        result[n] = (void*) sigframe->uc.uc_mcontext.gp_regs[32];
+       }
+ #else
+       if (sigtramp32_vdso && (sigtramp32_vdso == current->return_addr)) {
+@@ -196,7 +196,7 @@ static int GET_STACK_TRACE_OR_FRAMES {
+           mcontext_t mctx;
+           // We don't care about the rest, since IP value is at 'mctx' field.
+         } *sigframe = reinterpret_cast<signal_frame_32*>(current);
+-        result[n] = (void*) sigframe->mctx.gregs[PT_NIP];
++        result[n] = (void*) sigframe->mctx.gregs[32];
+       } else if (sigtramp32_rt_vdso && (sigtramp32_rt_vdso == current->return_addr)) {
+         struct rt_signal_frame_32 {
+           char dummy[64 + 16];
+@@ -204,7 +204,11 @@ static int GET_STACK_TRACE_OR_FRAMES {
+           ucontext_t uc;
+           // We don't care about the rest, since IP value is at 'uc' field.A
+         } *sigframe = reinterpret_cast<rt_signal_frame_32*>(current);
++#if defined(__GLIBC__)
+         result[n] = (void*) sigframe->uc.uc_mcontext.uc_regs->gregs[PT_NIP];
++#else
++        result[n] = (void*) sigframe->uc.uc_mcontext.gregs[32];
++#endif
+       }
+ #endif
+ 
diff --git a/srcpkgs/gperftools/template b/srcpkgs/gperftools/template
index 0cb00c5fb97..bded7024477 100644
--- a/srcpkgs/gperftools/template
+++ b/srcpkgs/gperftools/template
@@ -1,8 +1,9 @@
 # Template file for 'gperftools'
 pkgname=gperftools
 version=2.7
-revision=2
+revision=3
 build_style=gnu-configure
+hostmakedepends="automake libtool"
 makedepends="libunwind-devel"
 checkdepends="perl"
 short_desc="Multi-threaded malloc() and performance analysis tools"
@@ -12,11 +13,22 @@ homepage="https://github.com/gperftools/gperftools"
 distfiles="https://github.com/${pkgname}/${pkgname}/releases/download/${pkgname}-${version}/${pkgname}-${version}.tar.gz"
 checksum=1ee8c8699a0eff6b6a203e59b43330536b22bbcbe6448f54c7091e5efb0763c9
 
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	# needed by some newly enabled code
+	CXXFLAGS+=" -D__WORDSIZE=$XBPS_TARGET_WORDSIZE"
+	# needed on musl other than x86_64
+	if [ "$XBPS_TARGET_MACHINE" != "x86_64-musl" ]; then
+		makedepends+=" libucontext-devel"
+		LDFLAGS+=" -lucontext"
+	fi
+fi
+
 case "$XBPS_TARGET_MACHINE" in
 	arm*-musl|aarch64-musl)
+		# having libunwind in makedepends still causes failures...
 		makedepends="libucontext-devel"
-		LDFLAGS=" -lucontext"
-		configure_args="--disable-libunwind"
+		configure_args+=" --disable-libunwind"
+		;;
 esac
 
 post_extract() {
@@ -24,6 +36,10 @@ post_extract() {
 		src/base/linux_syscall_support.h src/malloc_hook_mmap_linux.h
 }
 
+pre_configure() {
+	autoreconf -fi
+}
+
 post_install() {
 	vlicense COPYING
 	rm -rf ${DESTDIR}/usr/share/doc
diff --git a/srcpkgs/gpgme/template b/srcpkgs/gpgme/template
index 3492b8c29f6..cbc08afe773 100644
--- a/srcpkgs/gpgme/template
+++ b/srcpkgs/gpgme/template
@@ -16,13 +16,13 @@ homepage="https://www.gnupg.org/software/gpgme/index.html"
 distfiles="https://www.gnupg.org/ftp/gcrypt/gpgme/gpgme-${version}.tar.bz2"
 checksum=c4e30b227682374c23cddc7fdb9324a99694d907e79242a25a4deeedb393be46
 
-case "$XBPS_TARGET_MACHINE" in
-	*-musl) configure_args+=" ac_cv_sys_file_offset_bits=no";;
-	i686*|arm*)
-		CFLAGS="-D_FILE_OFFSET_BITS=64 -DLARGEFILE_SOURCE=1"
-		CXXFLAGS="${CFLAGS}"
-		;;
-esac
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	configure_args+=" ac_cv_sys_file_offset_bits=no"
+elif [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
+	CFLAGS="-D_FILE_OFFSET_BITS=64 -DLARGEFILE_SOURCE=1"
+	CXXFLAGS="${CFLAGS}"
+fi
+
 CXXFLAGS+=" -D_GLIBCXX_USE_C99_STDIO=1"
 
 post_extract() {
diff --git a/srcpkgs/gpodder/template b/srcpkgs/gpodder/template
index ae495f11f13..7c7414e19cd 100644
--- a/srcpkgs/gpodder/template
+++ b/srcpkgs/gpodder/template
@@ -1,6 +1,6 @@
 # Template file for 'gpodder'
 pkgname=gpodder
-version=3.10.9
+version=3.10.11
 revision=1
 archs=noarch
 wrksrc="gpodder-${version}"
@@ -16,8 +16,7 @@ maintainer="bra1nwave <brainwave@openmailbox.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/gpodder/gpodder"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=ab7eab4e9e63556c463a9efdcf0b26069f56c047d7cef7fd22931b71ba025dbf
-nocross="gobject-introspection"
+checksum=eaa5b0b74ba00699342dbf317d52f1c4e52d77b7313fc9144cd01eea68b314cc
 
 do_install() {
 	make install DESTDIR=${DESTDIR}
diff --git a/srcpkgs/gpsim/template b/srcpkgs/gpsim/template
index 18a284ae05d..1778e73658e 100644
--- a/srcpkgs/gpsim/template
+++ b/srcpkgs/gpsim/template
@@ -1,6 +1,6 @@
 # Template file for 'gpsim'
 pkgname=gpsim
-version=0.30.0
+version=0.31.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,7 +10,11 @@ maintainer="Robert Lowry <bobertlo@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://gpsim.sourceforge.net/"
 distfiles="https://sourceforge.net/projects/gpsim/files/gpsim/${version}/gpsim-${version}.tar.gz"
-checksum=e1927312c37119bc26d6abf2c250072a279a9c764c49ae9d71b4ccebb8154f86
+checksum=110ee6be3a5d02b32803a91e480cbfc9d423ef72e0830703fc0bc97b9569923f
+
+pre_configure() {
+	vsed -i -e 's/#include "error.h"//' src/modules.cc
+}
 
 gpsim-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/gradle/template b/srcpkgs/gradle/template
index e1dd49e3fe5..6cc8ee612f3 100644
--- a/srcpkgs/gradle/template
+++ b/srcpkgs/gradle/template
@@ -1,6 +1,6 @@
 # Template file for 'gradle'
 pkgname=gradle
-version=4.10.3
+version=5.6.2
 revision=1
 archs=noarch
 hostmakedepends="unzip"
@@ -11,15 +11,13 @@ license="Apache-2.0"
 homepage="https://gradle.org/"
 changelog="https://docs.gradle.org/${version}/release-notes.html"
 distfiles="https://services.gradle.org/distributions/gradle-${version}-bin.zip"
-checksum=8626cbf206b4e201ade7b87779090690447054bc93f052954c78480fa6ed186e
+checksum=32fce6628848f799b0ad3205ae8db67d0d828c10ffe62b748a7c0d9f4a5d9ee0
 nocross=yes
 
 do_install() {
 	vmkdir "usr/lib/gradle"
-	vmkdir "usr/share/doc/gradle"
 	sed ${FILESDIR}/gradle -e "s;@VERSION@;${version};" > gradle
 	vbin gradle
-
-	cp -v getting-started.html ${DESTDIR}/usr/share/doc/gradle
+	vdoc getting-started.html
 	mv lib ${DESTDIR}/usr/lib/gradle/
 }
diff --git a/srcpkgs/grafana/template b/srcpkgs/grafana/template
index 079b943a502..5a03e8944ba 100644
--- a/srcpkgs/grafana/template
+++ b/srcpkgs/grafana/template
@@ -1,6 +1,6 @@
 # Template file for 'grafana'
 pkgname=grafana
-version=6.3.2
+version=6.3.5
 revision=1
 build_style=go
 go_import_path=github.com/grafana/grafana
@@ -11,7 +11,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://grafana.com"
 distfiles="https://github.com/grafana/grafana/archive/v${version}.tar.gz"
-checksum=b6b6fa21969c3dc2e1241f2f00ca1dc5aa291a691cccefff21b0bf9606b8fdb4
+checksum=193974115bf868272dbff08e53fdc0c97af3a07a24758390178ce53e5c9e179b
 
 system_accounts="_grafana"
 _grafana_homedir="/var/lib/grafana"
diff --git a/srcpkgs/gramps/template b/srcpkgs/gramps/template
index 0b71cbced3a..9d1d1a4616a 100644
--- a/srcpkgs/gramps/template
+++ b/srcpkgs/gramps/template
@@ -1,6 +1,6 @@
 # Template file for 'gramps'
 pkgname=gramps
-version=5.0.1
+version=5.1.1
 revision=1
 archs=noarch
 build_style=python3-module
@@ -11,9 +11,9 @@ short_desc="Genealogy program"
 maintainer="7185 <7185@free.fr>"
 license="GPL-2.0-or-later"
 homepage="https://gramps-project.org"
-changelog="${homepage}/introduction-WP/2018/12/gramps-5-0-1-released"
+changelog="https://gramps-project.org/introduction-WP/2019/09/gramps-5-1-1-released/"
 distfiles="https://github.com/gramps-project/${pkgname}/archive/v${version}.tar.gz"
-checksum=3a81265764a314cca0540593ccd639c5b76199615b3b0aace0b2540fc186eba5
+checksum=7623c1e976a19e121f6fa799ca619def18672000ba7fd505abdaa9e782920eda
 
 post_install() {
 	echo -n '/usr/share' > ${DESTDIR}${py3_sitelib}/gramps/gen/utils/resource-path
diff --git a/srcpkgs/granite/template b/srcpkgs/granite/template
index f5af855b5ee..6aed37e4689 100644
--- a/srcpkgs/granite/template
+++ b/srcpkgs/granite/template
@@ -1,6 +1,6 @@
 # Template file for 'granite'
 pkgname=granite
-version=5.2.4
+version=5.2.5
 revision=1
 build_style=meson
 build_helper="gir"
@@ -12,13 +12,7 @@ maintainer="Cameron Nemo <camerontnorman@gmail.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/elementary/granite"
 distfiles="https://github.com/elementary/granite/archive/${version}.tar.gz"
-checksum=45349b24f3f5e9216354894f5598104e08d72992d81a41dadc373602853419fb
-
-case "$XBPS_TARGET_MACHINE" in
-	i686-musl|x86_64-musl) ;;
-	*-musl) broken="gobject introspection" ;;
-	*) ;;
-esac
+checksum=1c1cbe94b18a3ba2e3a099206906827d1ecf0c9572c349059fee23b6b0738966
 
 granite-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/grantleetheme/template b/srcpkgs/grantleetheme/template
index a6d80f86b0f..c457c93435c 100644
--- a/srcpkgs/grantleetheme/template
+++ b/srcpkgs/grantleetheme/template
@@ -1,6 +1,6 @@
 # Template file for 'grantleetheme'
 pkgname=grantleetheme
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 configure_args="KDE_INSTALL_USE_QT_SYS_PATHS=TRUE"
@@ -12,7 +12,7 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/applications/${version}/src/grantleetheme-${version}.tar.xz"
-checksum=c966ad7ef55a784c8cf97a69d4885b9b9d7956c84a4e323404e5cf88154cc543
+checksum=a9d4e70089debdfaffb4af881cf2064ba68a0ad3fe007985c8e5997f0cf0e836
 
 grantleetheme-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"
diff --git a/srcpkgs/graphene/template b/srcpkgs/graphene/template
index 1dab79df685..f2fe81a3f47 100644
--- a/srcpkgs/graphene/template
+++ b/srcpkgs/graphene/template
@@ -1,7 +1,7 @@
 # Template file for 'graphene'
 pkgname=graphene
 version=1.8.2
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Dtests=false -Dbenchmarks=false
@@ -16,12 +16,7 @@ distfiles="${GNOME_SITE}/graphene/${version%.*}/graphene-${version}.tar.xz"
 checksum=b3fcf20996e57b1f4df3941caac10f143bb29890a42f7a65407cd19271fc89f7
 
 build_options="gir"
-
-case "$XBPS_TARGET_MACHINE" in
-	i686-musl|x86_64-musl) build_options_default+=" gir" ;;
-	*-musl) ;;
-	*) build_options_default+=" gir" ;;
-esac
+build_options_default="gir"
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index 87571420750..be38ef148ac 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,23 +1,28 @@
 # Template file for 'grpc'
 pkgname=grpc
-version=1.22.0
+version=1.24.2
 revision=1
+_upbver=931bbecbd3230ae7f22efa5d203639facc47f719
 build_style=gnu-makefile
 make_build_args="prefix=\$(DESTDIR)/usr AROPTS=rc LD=\$(CC)"
 make_install_args="prefix=\$(DESTDIR)/usr"
 hostmakedepends="protobuf"
-makedepends="zlib-devel c-ares-devel libressl-devel libprotoc-devel protobuf-devel gperftools-devel"
-depends=""
+makedepends="zlib-devel c-ares-devel libressl-devel libprotoc-devel
+ protobuf-devel gperftools-devel"
 short_desc="High performance, open source, general RPC framework"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://github.com/grpc/grpc"
-distfiles="https://github.com/$pkgname/$pkgname/archive/v${version}/$pkgname-${version}.tar.gz"
-checksum=11ac793c562143d52fd440f6549588712badc79211cdc8c509b183cb69bddad8
+distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}/${pkgname}-${version}.tar.gz
+ https://github.com/protocolbuffers/upb/archive/${_upbver}/upb-${_upbver}.tar.gz"
+checksum="fd040f5238ff1e32b468d9d38e50f0d7f8da0828019948c9001e9a03093e1d8f
+ 95150db57b51b65f3422c38953956e0f786945d842d76f8ab685fbcd93ab5caa"
 nocross=yes
 
 post_extract() {
 	sed -r 's/-Werror//g;/ldconfig/d;s/ strip-(static|shared)_c(xx)? / /' -i Makefile
+	rm -rf third_party/upb
+	mv ../upb-${_upbver} third_party/upb
 }
 post_install() {
 	vlicense NOTICE.txt
diff --git a/srcpkgs/grub/files/kernel.d/grub.post b/srcpkgs/grub/files/kernel.d/grub.post
index f28257d999d..561d8b2f179 100644
--- a/srcpkgs/grub/files/kernel.d/grub.post
+++ b/srcpkgs/grub/files/kernel.d/grub.post
@@ -7,6 +7,8 @@
 PKGNAME="$1"
 VERSION="$2"
 
+export ZPOOL_VDEV_NAME_PATH=YES
+
 if command -v grub-mkconfig >/dev/null 2>&1; then
 	if [ -d $ROOTDIR/boot/grub ]; then
 		grub-mkconfig -o $ROOTDIR/boot/grub/grub.cfg
diff --git a/srcpkgs/grub/template b/srcpkgs/grub/template
index cd6b168036d..16f3f5eb01c 100644
--- a/srcpkgs/grub/template
+++ b/srcpkgs/grub/template
@@ -1,7 +1,7 @@
 # Template file for 'grub'
 pkgname=grub
 version=2.04
-revision=1
+revision=2
 hostmakedepends="python3 pkg-config flex freetype-devel font-unifont-bdf"
 makedepends="libusb-compat-devel ncurses-devel freetype-devel
  liblzma-devel device-mapper-devel fuse-devel"
diff --git a/srcpkgs/gscan2pdf/template b/srcpkgs/gscan2pdf/template
index c760df42221..31c1b7be9a0 100644
--- a/srcpkgs/gscan2pdf/template
+++ b/srcpkgs/gscan2pdf/template
@@ -1,6 +1,6 @@
 # Template file for 'gscan2pdf'
 pkgname=gscan2pdf
-version=2.5.5
+version=2.5.7
 revision=1
 archs=noarch
 build_style=perl-module
@@ -17,7 +17,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-3.0-or-later"
 homepage="http://gscan2pdf.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=68570af787b04f8425091a1cfe5a53f34dab0384b28a2907151d22737695d03d
+checksum=11a26c7070437359d1d7c3b6e3e9009317cd82a8ae96df737a555c8687630974
 nocross=yes
 
 do_check() {
diff --git a/srcpkgs/gsettings-desktop-schemas/template b/srcpkgs/gsettings-desktop-schemas/template
index f421fa43e3b..7c3e76e6b3d 100644
--- a/srcpkgs/gsettings-desktop-schemas/template
+++ b/srcpkgs/gsettings-desktop-schemas/template
@@ -1,7 +1,7 @@
 # Template file for 'gsettings-desktop-schemas'
 pkgname=gsettings-desktop-schemas
-version=3.32.0
-revision=2
+version=3.34.0
+revision=1
 build_helper="gir"
 build_style=meson
 configure_args="-Dintrospection=$(vopt_if gir true false)"
@@ -12,7 +12,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2d59b4b3a548859dfae46314ee4666787a00d5c82db382e97df7aa9d0e310a35
+checksum=288b04260f7040b0e004a8d59c773cfb4e32df4f1b4a0f9d705c51afccc95ead
 
 # Package build options
 build_options="gir"
diff --git a/srcpkgs/gsl/patches/ppc-musl.patch b/srcpkgs/gsl/patches/ppc-musl.patch
new file mode 100644
index 00000000000..807ae163675
--- /dev/null
+++ b/srcpkgs/gsl/patches/ppc-musl.patch
@@ -0,0 +1,36 @@
+fpu_control.h is glibc specific, but we only need some bits from it.
+
+--- ieee-utils/fp-gnuppc.c
++++ ieee-utils/fp-gnuppc.c
+@@ -18,7 +18,31 @@
+  */
+ 
+ #include <stdio.h>
++
++#if defined(__GLIBC__)
+ #include <fpu_control.h>
++#else
++/* copied from fpu_control.h, only stuff that is needed here */
++# define _FPU_RC_NEAREST 0x00
++# define _FPU_RC_DOWN    0x03
++# define _FPU_RC_UP      0x02
++# define _FPU_RC_ZERO    0x01
++
++# define _FPU_MASK_ZM  0x10
++# define _FPU_MASK_OM  0x40
++# define _FPU_MASK_UM  0x20
++# define _FPU_MASK_IM  0x80 
++
++# define _FPU_SETCW(cw)						\
++  { union { double __d; unsigned long long __ll; } __u;		\
++    register double __fr;					\
++    __u.__ll = 0xfff80000LL << 32; /* This is a QNaN.  */	\
++    __u.__ll |= (cw) & 0xffffffffLL;				\
++    __fr = __u.__d;						\
++    __asm__ __volatile__("mtfsf 255,%0" : : "f" (__fr));	\
++  }
++#endif
++
+ #include <gsl/gsl_errno.h>
+ #include <gsl/gsl_ieee_utils.h>
+ 
diff --git a/srcpkgs/gst-libav/template b/srcpkgs/gst-libav/template
index f8b2729621e..d0187de47eb 100644
--- a/srcpkgs/gst-libav/template
+++ b/srcpkgs/gst-libav/template
@@ -1,6 +1,6 @@
 # Template file for 'gst-libav'
 pkgname=gst-libav
-version=1.16.0
+version=1.16.1
 revision=1
 wrksrc="${pkgname}-${version}"
 build_style=meson
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://gstreamer.freedesktop.org"
 distfiles="${homepage}/src/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=dfac119043a9cfdcacd7acde77f674ab172cf2537b5812be52f49e9cddc53d9a
+checksum=e8a5748ae9a4a7be9696512182ea9ffa6efe0be9b7976916548e9d4381ca61c4
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) # Required by musl for M_SQRT1_2
diff --git a/srcpkgs/gst-omx/template b/srcpkgs/gst-omx/template
index 1f9c2550df0..9c5aae67430 100644
--- a/srcpkgs/gst-omx/template
+++ b/srcpkgs/gst-omx/template
@@ -1,6 +1,6 @@
 # Template file for 'gst-omx'
 pkgname=gst-omx
-version=1.16.0
+version=1.16.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-examples"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only"
 homepage="https://gstreamer.freedesktop.org"
 distfiles="${homepage}/src/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=fef77cddc02784608451c46b9def880b63230a246decf8900f2da2ed54a8af4a
+checksum=cbf54121a2cba575d460833e8132265781252ce32cf5b8f9fa8753e42ab24bb2
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*|aarch64*|ppc64*)
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 476d0c11bbc..4a293277495 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-bad1'
 pkgname=gst-plugins-bad1
-version=1.16.0
-revision=4
+version=1.16.1
+revision=1
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
 build_style=meson
@@ -35,7 +35,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://gstreamer.freedesktop.org"
 distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz"
-checksum=22139de35626ada6090bdfa3423b27b7fc15a0198331d25c95e6b12cb1072b05
+checksum=56481c95339b8985af13bac19b18bc8da7118c2a7d9440ed70e7dcd799c2adb5
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/gst-plugins-base1/template b/srcpkgs/gst-plugins-base1/template
index 06e984fbe45..3f33619ee90 100644
--- a/srcpkgs/gst-plugins-base1/template
+++ b/srcpkgs/gst-plugins-base1/template
@@ -1,6 +1,6 @@
 # Template file for 'gst-plugins-base1'
 pkgname=gst-plugins-base1
-version=1.16.0
+version=1.16.1
 revision=1
 wrksrc="${pkgname/1/}-${version}"
 build_style=meson
@@ -21,7 +21,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://gstreamer.freedesktop.org"
 distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz"
-checksum=4093aa7b51e28fb24dfd603893fead8d1b7782f088b05ed0f22a21ef176fb5ae
+checksum=5c3cc489933d0597087c9bc6ba251c93693d64554bcc563539a084fa2d5fcb2b
 
 # Package build options
 build_options="cdparanoia gir sndio"
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index c5902e3df78..d83d85fff42 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-good1'
 pkgname=gst-plugins-good1
-version=1.16.0
-revision=2
+version=1.16.1
+revision=1
 wrksrc="${pkgname/1/}-${version}"
 build_style=meson
 configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled
@@ -23,7 +23,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://gstreamer.freedesktop.org"
 distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz"
-checksum=654adef33380d604112f702c2927574cfc285e31307b79e584113858838bb0fd
+checksum=9fbabe69018fcec707df0b71150168776040cde6c1a26bb5a82a136755fa8f1f
 lib32disabled=yes
 
 build_options="gtk3 qt"
diff --git a/srcpkgs/gst-plugins-ugly1/template b/srcpkgs/gst-plugins-ugly1/template
index 81e821f677b..e7bd16be207 100644
--- a/srcpkgs/gst-plugins-ugly1/template
+++ b/srcpkgs/gst-plugins-ugly1/template
@@ -1,6 +1,6 @@
 # Template file for 'gst-plugins-ugly1'.
 pkgname=gst-plugins-ugly1
-version=1.16.0
+version=1.16.1
 revision=1
 lib32disabled=yes
 wrksrc="${pkgname/1/}-${version}"
@@ -17,4 +17,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://gstreamer.freedesktop.org"
 distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz"
-checksum=e30964c5f031c32289e0b25e176c3c95a5737f2052dfc81d0f7427ef0233a4c2
+checksum=4bf913b2ca5195ac3b53b5e3ade2dc7c45d2258507552ddc850c5fa425968a1d
diff --git a/srcpkgs/gst1-editing-services/template b/srcpkgs/gst1-editing-services/template
index 02666970553..ea4e9fb9262 100644
--- a/srcpkgs/gst1-editing-services/template
+++ b/srcpkgs/gst1-editing-services/template
@@ -1,6 +1,6 @@
 # Template file for 'gst1-editing-services'
 pkgname=gst1-editing-services
-version=1.16.0
+version=1.16.1
 revision=1
 wrksrc="${pkgname/gst1/gstreamer}-${version}"
 build_style=meson
@@ -13,7 +13,7 @@ maintainer="Toyam Cox <Vaelatern@gmail.com>"
 license="LGPL-2.0-or-later"
 homepage="https://gstreamer.freedesktop.org"
 distfiles="${homepage}/src/${pkgname/gst1/gst}/${pkgname/gst1/gstreamer}-${version}.tar.xz"
-checksum=82a3faefb2b0d91e134fd02cddeee718b7846a07cbf0127fed7aa03e25495ad1
+checksum=c884878f9e6ddac96e4f174654d12fe52e3d48eaaec27a80767c0d56cb2f6780
 
 gst1-editing-services-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/gst1-python/template b/srcpkgs/gst1-python/template
index ad5617b814e..40fba1f6536 100644
--- a/srcpkgs/gst1-python/template
+++ b/srcpkgs/gst1-python/template
@@ -1,6 +1,6 @@
 # Template file for 'gst1-python'.
 pkgname=gst1-python
-version=1.16.0
+version=1.16.1
 revision=1
 wrksrc="gst-python-${version}"
 build_style=gnu-configure
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://gstreamer.freedesktop.org"
 distfiles="${homepage}/src/gst-python/gst-python-${version}.tar.xz"
-checksum=55dc7aaed1855565f9b9ef842d93e93bfc5cb2b376faef6af5b463e1774e2d38
+checksum=b469c8955126f41b8ce0bf689b7029f182cd305f422b3a8df35b780bd8347489
 
 pre_configure() {
 	if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/gst1-python3/template b/srcpkgs/gst1-python3/template
index 7704de67c2a..6f02f19aca3 100644
--- a/srcpkgs/gst1-python3/template
+++ b/srcpkgs/gst1-python3/template
@@ -1,6 +1,6 @@
 # Template file for 'gst1-python3'
 pkgname=gst1-python3
-version=1.16.0
+version=1.16.1
 revision=1
 wrksrc="gst-python-${version}"
 build_style=meson
@@ -13,4 +13,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://gstreamer.freedesktop.org"
 distfiles="${homepage}/src/gst-python/gst-python-${version}.tar.xz"
-checksum=55dc7aaed1855565f9b9ef842d93e93bfc5cb2b376faef6af5b463e1774e2d38
+checksum=b469c8955126f41b8ce0bf689b7029f182cd305f422b3a8df35b780bd8347489
diff --git a/srcpkgs/gstreamer-vaapi/template b/srcpkgs/gstreamer-vaapi/template
index 4cdd701c673..e3d2c49f139 100644
--- a/srcpkgs/gstreamer-vaapi/template
+++ b/srcpkgs/gstreamer-vaapi/template
@@ -1,6 +1,6 @@
 # Template file for 'gstreamer-vaapi'
 pkgname=gstreamer-vaapi
-version=1.16.0
+version=1.16.1
 revision=1
 build_style=meson
 hostmakedepends="pkg-config"
@@ -11,4 +11,4 @@ license="LGPL-2.1-or-later"
 homepage="https://gstreamer.freedesktop.org"
 changelog="https://raw.githubusercontent.com/GStreamer/gstreamer-vaapi/master/ChangeLog"
 distfiles="${homepage}/src/gstreamer-vaapi/gstreamer-vaapi-${version}.tar.xz"
-checksum=4e7fce626ee0590dca74b5a8341d25bac76307945131a970b414fc5895f5171f
+checksum=cb570f6f1e78cb364fbe3c4fb8751824ee9db0c942ba61b62380b9b5abb7603a
diff --git a/srcpkgs/gstreamer1/template b/srcpkgs/gstreamer1/template
index 6db91b8cde5..29629189d62 100644
--- a/srcpkgs/gstreamer1/template
+++ b/srcpkgs/gstreamer1/template
@@ -1,6 +1,6 @@
 # Template file for 'gstreamer1'
 pkgname=gstreamer1
-version=1.16.0
+version=1.16.1
 revision=1
 wrksrc="gstreamer-${version}"
 build_style=meson
@@ -18,7 +18,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://gstreamer.freedesktop.org"
 distfiles="${homepage}/src/gstreamer/gstreamer-${version}.tar.xz"
-checksum=0e8e2f7118be437cba879353970cf83c2acced825ecb9275ba05d9186ef07c00
+checksum=02211c3447c4daa55919c5c0f43a82a6fbb51740d57fc3af0639d46f1cf4377d
 
 # Package build options
 build_options="gir gtk_doc"
diff --git a/srcpkgs/gtk+3/template b/srcpkgs/gtk+3/template
index 45115dd7cee..975925d33f3 100644
--- a/srcpkgs/gtk+3/template
+++ b/srcpkgs/gtk+3/template
@@ -1,6 +1,6 @@
 # Template file for 'gtk+3'
 pkgname=gtk+3
-version=3.24.10
+version=3.24.11
 revision=1
 wrksrc="gtk+-${version}"
 build_style=gnu-configure
@@ -26,7 +26,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.gtk.org/"
 distfiles="${GNOME_SITE}/gtk+/${version%.*}/gtk+-${version}.tar.xz"
-checksum=35a8f107e2b90fda217f014c0c15cb20a6a66678f6fd7e36556d469372c01b03
+checksum=dba7658d0a2e1bfad8260f5210ca02988f233d1d86edacb95eceed7eca982895
 
 # Package build options
 build_options="broadway colord cups gir cloudproviders wayland x11"
diff --git a/srcpkgs/gtk3-nocsd/template b/srcpkgs/gtk3-nocsd/template
index 36e60a61ebe..8c9af5a68f0 100644
--- a/srcpkgs/gtk3-nocsd/template
+++ b/srcpkgs/gtk3-nocsd/template
@@ -1,16 +1,16 @@
 # Template file for 'gtk3-nocsd'
 pkgname=gtk3-nocsd
-version=3
+version=3.0.1
 revision=1
 build_style=gnu-makefile
 hostmakedepends="pkg-config"
 makedepends="gtk+3-devel libgirepository-devel"
-short_desc="A hack to disable gtk+ 3 client side decoration"
+short_desc="Hack to disable gtk+ 3 client side decoration"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
-license="LGPL-2.1"
-homepage="https://github.com/PCMan/gtk3-nocsd"
-distfiles="https://github.com/PCMan/gtk3-nocsd/archive/v${version}.tar.gz"
-checksum=779c47d894ee3b6751ddb02b62a76757b77eb81232c4f9335564654817889570
+license="LGPL-2.1-or-later"
+homepage="https://github.com/ZaWertun/gtk3-nocsd"
+distfiles="https://github.com/ZaWertun/gtk3-nocsd/archive/v${version}.tar.gz"
+checksum=c4cc5e8fa49a145013430cdce7f0fddad648c0cf6d53a8085b4500612c37cbf7
 
 do_install() {
 	vbin gtk3-nocsd
diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index 783705b0729..58388b515c0 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,7 +1,7 @@
 # Template file for 'gtk4'
 pkgname=gtk4
 version=3.94.0
-revision=1
+revision=2
 wrksrc="gtk+-${version}"
 build_style=meson
 build_helper="gir"
@@ -35,13 +35,7 @@ build_options="broadway colord cups gir cloudproviders wayland x11"
 desc_option_broadway="Enable support for the HTML5 Broadway backend"
 desc_option_cloudproviders="Enable integration with cloudproviders, such as Nextcloud"
 
-build_options_default="colord cups broadway wayland x11 cloudproviders vulkan"
-
-case "$XBPS_TARGET_MACHINE" in
-	x86_64-musl) build_options_default+=" gir" ;;
-	*-musl) ;;
-	*) build_options_default+=" gir" ;;
-esac
+build_options_default="colord cups broadway wayland x11 cloudproviders vulkan gir"
 
 gtk4-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/gtkwave/template b/srcpkgs/gtkwave/template
index 16cf79a3d40..f60eba6fc8f 100644
--- a/srcpkgs/gtkwave/template
+++ b/srcpkgs/gtkwave/template
@@ -1,6 +1,6 @@
 # Template file for 'gtkwave'
 pkgname=gtkwave
-version=3.3.98
+version=3.3.102
 revision=1
 build_style=gnu-configure
 configure_args="--with-tcl=${XBPS_CROSS_BASE}/usr/lib --with-tk=${XBPS_CROSS_BASE}/usr/lib"
@@ -11,7 +11,7 @@ maintainer="allan <mail@may.mooo.com>"
 license="GPL-2.0-or-later, MIT"
 homepage="http://gtkwave.sourceforge.net/"
 distfiles="http://gtkwave.sourceforge.net/gtkwave-${version}.tar.gz"
-checksum=efa6bbbeb3bd54104425a69a2aa0d079bb5c3ecc1c420ba57dcaa1c97c5a22f6
+checksum=80bb7cb92db45872209f4ca48fc95a0460e0d89b0fe0c310c836d9b04c77fec7
 
 post_install() {
 	vlicense LICENSE.TXT
diff --git a/srcpkgs/gucci/template b/srcpkgs/gucci/template
new file mode 100644
index 00000000000..2383ae4c09f
--- /dev/null
+++ b/srcpkgs/gucci/template
@@ -0,0 +1,17 @@
+# Template file for 'gucci'
+pkgname=gucci
+version=1.2.2
+revision=1
+build_style=go
+go_import_path="github.com/noqcks/gucci"
+hostmakedepends="git"
+short_desc="Simple CLI templating tool written in Go"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="MIT"
+homepage="https://github.com/noqcks/gucci"
+distfiles="https://github.com/noqcks/gucci/archive/${version}.tar.gz"
+checksum=b31ebdb94d227331ac954262e43e39e3b9a1fb25bab96fd0cccb7ddfb997e383
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/guitarix2/patches/musl.patch b/srcpkgs/guitarix2/patches/musl.patch
deleted file mode 100644
index ee07fe904c4..00000000000
--- a/srcpkgs/guitarix2/patches/musl.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-There is no mallopt in musl.
-
---- src/gx_head/gui/machine.cpp.orig	2018-07-22 06:24:50.000000000 +0200
-+++ src/gx_head/gui/machine.cpp	2018-08-26 09:31:01.815078037 +0200
-@@ -44,8 +44,10 @@
-     long int total_size = 0;
-     if (mlockall(MCL_CURRENT | MCL_FUTURE))
-         gx_print_error("system init", "mlockall failed:");
-+#ifdef __GLIBC__
-     mallopt(M_TRIM_THRESHOLD, -1);
-     mallopt(M_MMAP_MAX, 0);
-+#endif
-     for (unsigned int i = 0; i < sizeof(regions)/sizeof(regions[0]); i++) {
-         total_size +=regions[i].len;
-         if (mlock(regions[i].start, regions[i].len) != 0) {
diff --git a/srcpkgs/guitarix2/template b/srcpkgs/guitarix2/template
index bd26f268bca..8b2e5ec85f4 100644
--- a/srcpkgs/guitarix2/template
+++ b/srcpkgs/guitarix2/template
@@ -1,15 +1,15 @@
 # Template file for 'guitarix2'
 pkgname=guitarix2
-version=0.37.3
-revision=4
+version=0.38.1
+revision=1
 wrksrc="guitarix-${version}"
 build_style=waf
-configure_args="--cxxflags-release=-DNDEBUG --ladspa --new-ladspa --no-faust --no-lv2
+configure_args="--cxxflags-release=-DNDEBUG --ladspa --new-ladspa --no-faust
  $(vopt_if avahi '' '--no-avahi') $(vopt_if bluez '' '--no-bluez')"
 make_build_args="--progress"
 hostmakedepends="gperf intltool pkg-config"
 makedepends="boost-devel eigen fftw-devel gtkmm2-devel jack-devel
- ladspa-sdk liblrdf-devel libsndfile-devel lilv-devel sratom-devel
+ ladspa-sdk liblrdf-devel libsndfile-devel lilv-devel lv2 sratom-devel
  zita-convolver-devel zita-resampler-devel
  $(vopt_if avahi avahi-glib-libs-devel) $(vopt_if bluez libbluetooth-devel)"
 depends="desktop-file-utils"
@@ -18,7 +18,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://guitarix.org"
 distfiles="${SOURCEFORGE_SITE}/guitarix/guitarix/guitarix2-${version}.tar.xz"
-checksum=4ca93bd4226cd175456f37612acd28b46e13133db61c0f235917dbcc3347d5f1
+checksum=00fda3e1ce1d5f1691665f9ff32bb3c9800381313d49b7c2e25618d0b3ed872f
 
 build_options="avahi bluez"
 desc_option_avahi="Build with avahi support"
@@ -34,7 +34,6 @@ esac
 if [ -n "$CROSS_BUILD" ]; then
 	post_extract() {
 		# don’t test load the ladspa plugin when cross compiling
-		sed -i "s/\(features='cxx cshlib\) test_loadable/\1/" src/ladspa/wscript
+		vsed -i "s/\(features='cxx cshlib\) test_loadable/\1/" src/ladspa/wscript
 	}
 fi
-
diff --git a/srcpkgs/gummiboot/template b/srcpkgs/gummiboot/template
index 77ab2f99fa5..d23620e6170 100644
--- a/srcpkgs/gummiboot/template
+++ b/srcpkgs/gummiboot/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 hostmakedepends="automake pkg-config libxslt docbook-xsl"
 makedepends="gnu-efi-libs liblzma-devel libblkid-devel"
 short_desc="Simple UEFI Boot Manager"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 # Homepage is long dead and the project has an unofficial release under Alpine
 # homepage="http://freedesktop.org/wiki/Software/gummiboot"
diff --git a/srcpkgs/gutenprint/patches/musl.patch b/srcpkgs/gutenprint/patches/musl.patch
deleted file mode 100644
index 52edda6269c..00000000000
--- a/srcpkgs/gutenprint/patches/musl.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 6b8ae64056133e2b4775a201eb527fdc143d669c
-Author: Cameron Nemo <camerontnorman@gmail.com>
-Date:   Sun Nov 25 10:09:21 2018 -0800
-
-    src/xml/printers: remove assignment to read-only variable
-
-diff --git src/xml/printers/check_duplicate_printers.test.c src/xml/printers/check_duplicate_printers.test.c
-index 52c46e65..d5d2771c 100644
---- src/xml/printers/check_duplicate_printers.c
-+++ src/xml/printers/check_duplicate_printers.c
-@@ -34,7 +34,7 @@ main(int argc, char **argv)
-       if (getenv("BUILD_VERBOSE"))
- 	dup2(2, 3);
-       (void) snprintf(path, PATH_MAX, "%scheck_duplicate_printers_%d.log", getenv("STP_TEST_LOG_PREFIX"), getpid());
--      stdout = freopen(path, "w", stdout);
-+      freopen(path, "w", stdout);
-       dup2(1, 2);
-     }
-   setenv("STP_CHECK_DUPLICATE_PRINTERS", "TRUE", 1);
diff --git a/srcpkgs/gutenprint/template b/srcpkgs/gutenprint/template
index 1ae82e5b37a..e94fa323629 100644
--- a/srcpkgs/gutenprint/template
+++ b/srcpkgs/gutenprint/template
@@ -1,6 +1,6 @@
 # Template file for 'gutenprint'
 pkgname=gutenprint
-version=5.3.1
+version=5.3.3
 revision=1
 build_style=gnu-configure
 configure_args="--disable-rpath --enable-samples --disable-static
@@ -13,7 +13,7 @@ maintainer="Anachron <Anachron14@gmx.de>"
 license="GPL-2.0-or-later"
 homepage="http://gimp-print.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/gimp-print/$pkgname-$version.tar.xz"
-checksum=d80d8f5272d15bca5710f6ef4a2bb95e76d34e1155c5bcd5e83cb9f0a111d0d4
+checksum=7279ecbc8e67d1858c53cb24e423ea1be98e214872006b79e6e03650dd54a072
 nocross="https://sourceforge.net/p/gimp-print/mailman/message/34782748/"
 
 post_install() {
diff --git a/srcpkgs/gvfs/template b/srcpkgs/gvfs/template
index 552062513bd..4eee8094057 100644
--- a/srcpkgs/gvfs/template
+++ b/srcpkgs/gvfs/template
@@ -1,25 +1,25 @@
 # Template file for 'gvfs'
 pkgname=gvfs
-version=1.40.2
+version=1.42.0
 revision=1
 build_style=meson
 configure_args="-Dsystemduserunitdir=no -Dtmpfilesdir=no -Dlogind=false
  -Dman=true"
 hostmakedepends="docbook-xsl glib-devel intltool libxslt openssh pkg-config
  polkit-devel"
-makedepends="avahi-glib-libs-devel dbus-glib-devel fuse-devel gcr-devel
+makedepends="avahi-glib-libs-devel dbus-glib-devel fuse3-devel gcr-devel
  libarchive-devel libbluetooth-devel libbluray-devel libcap-devel
  libcdio-paranoia-devel libgcrypt-devel libgdata-devel libglib-devel
  libgphoto2-devel libgudev-devel libimobiledevice-devel libmtp-devel
  libnfs-devel libsecret-devel libsoup-gnome-devel libxml2-devel polkit-devel
- samba-devel udisks2-devel"
+ samba-devel udisks2-devel gsettings-desktop-schemas-devel"
 short_desc="Userspace virtual filesystem"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/gvfs"
 changelog="https://gitlab.gnome.org/GNOME/gvfs/raw/gnome-3-32/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bdefe8fec6a1097f0c126fa2a4533667c98a86e237ac640518000e16b363971e
+checksum=d0958d9ceefb54bb8ddda74ef51e10fe03dff93f74634784bd309ea434066cf1
 
 # Manually declare shlibs used by the subpkgs.
 shlib_provides="libgvfscommon.so libgvfsdaemon.so"
diff --git a/srcpkgs/gwenview/template b/srcpkgs/gwenview/template
index 2a2399ddf16..a279261dc4b 100644
--- a/srcpkgs/gwenview/template
+++ b/srcpkgs/gwenview/template
@@ -1,6 +1,6 @@
 # Template file for 'gwenview'
 pkgname=gwenview
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
@@ -14,7 +14,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/gwenview"
 distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=1d1d4713bcebdd8c7c458c075b7101055c81cf94a802ac8b9b3528a3c3c961a3
+checksum=fa49352a208c9472c911d3579f7601fb915831ad42caf74a053ed749bf5bb1fb
 patch_args="-Np1"
 
 pre_configure() {
diff --git a/srcpkgs/gxi b/srcpkgs/gxi
new file mode 120000
index 00000000000..3008d527e75
--- /dev/null
+++ b/srcpkgs/gxi
@@ -0,0 +1 @@
+tau
\ No newline at end of file
diff --git a/srcpkgs/gxi/template b/srcpkgs/gxi/template
deleted file mode 100644
index 8fa53d00432..00000000000
--- a/srcpkgs/gxi/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'gxi'
-pkgname=gxi
-version=0.8.1
-revision=1
-build_style=meson
-build_helper=rust
-hostmakedepends="cargo pkg-config rust gettext glib-devel"
-makedepends="gtk+3-devel rust-std gettext-devel"
-checkdepends="appstream-glib desktop-file-utils"
-short_desc="GTK frontend for the xi text editor, written in Rust"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/Cogitri/gxi"
-distfiles="https://github.com/Cogitri/gxi/releases/download/v${version}/gxi-${version}.tar.xz"
-checksum=7f970239815cd688218c360fba7f00b8e1eb9ee9bafc9ce578e61018cca087a1
-
-case $XBPS_MACHINE in
-	*-musl) broken="crashes rustc" ;;
-esac
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/h2o/template b/srcpkgs/h2o/template
index 4446b84b03c..93b3281be50 100644
--- a/srcpkgs/h2o/template
+++ b/srcpkgs/h2o/template
@@ -1,7 +1,7 @@
 # Template file for 'h2o'
 pkgname=h2o
-version=2.2.5
-revision=4
+version=2.2.6
+revision=1
 build_style=cmake
 conf_files="/etc/h2o.conf"
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ maintainer="Eivind Uggedal <eivind@uggedal.com>"
 license="MIT"
 homepage="https://h2o.examp1e.net/"
 distfiles="https://github.com/h2o/h2o/archive/v${version}.tar.gz"
-checksum=eafb40aa2d93b3de1af472bb046c17b2335c3e5a894462310e1822e126c97d24
+checksum=f8cbc1b530d85ff098f6efc2c3fdbc5e29baffb30614caac59d5c710f7bda201
 
 system_accounts="h2o"
 
@@ -31,6 +31,7 @@ h2o-devel_package() {
 	depends="${makedepends}"
 	pkg_install() {
 		vmove usr/include
-		vmove usr/lib/*.a
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
 	}
 }
diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template
index 5d8f9346919..87c29a2baf9 100644
--- a/srcpkgs/harfbuzz/template
+++ b/srcpkgs/harfbuzz/template
@@ -1,18 +1,18 @@
 # Template file for 'harfbuzz'
 pkgname=harfbuzz
-version=2.6.0
+version=2.6.2
 revision=1
 build_style=gnu-configure
 configure_args="--with-glib --with-freetype --with-cairo --with-icu --with-graphite2"
 hostmakedepends="automake glib-devel libtool pkg-config"
 makedepends="cairo-devel graphite-devel icu-devel"
 short_desc="OpenType text shaping engine"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MIT"
 homepage="http://www.freedesktop.org/wiki/Software/HarfBuzz/"
 changelog="https://raw.githubusercontent.com/harfbuzz/harfbuzz/master/NEWS"
 distfiles="${FREEDESKTOP_SITE}/harfbuzz/release/${pkgname}-${version}.tar.xz"
-checksum=9cf7d117548265f95ca884e2f4c9fafaf4e17d45a67b11107147b79eed76c966
+checksum=3b4c6a72f7f2b05d54f6c3112b3ebee5131c199fe4de4cf9bbbf71a56666f624
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/haveged/template b/srcpkgs/haveged/template
index bfc2fc6229e..5707e4adb46 100644
--- a/srcpkgs/haveged/template
+++ b/srcpkgs/haveged/template
@@ -1,14 +1,14 @@
 # Template file for 'haveged'
 pkgname=haveged
-version=1.9.4
+version=1.9.8
 revision=1
 build_style=gnu-configure
 short_desc="Entropy harvesting daemon using CPU timings"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="GPL-3.0-or-later"
 homepage="http://www.issihosts.com/haveged"
-distfiles="https://github.com/jirka-h/haveged/archive/${version}.tar.gz"
-checksum=c4959d3cb1fa6391d16a3aa1ba4d82cd3a0d497206ae4b87d638088c0664e5aa
+distfiles="https://github.com/jirka-h/haveged/archive/v${version}.tar.gz"
+checksum=99aa1996c6e39ea2459cfc37addfb8b1eecc63f3a2b6da9db17b22e76b6851ae
 
 post_install() {
 	vsv $pkgname
diff --git a/srcpkgs/help2man/template b/srcpkgs/help2man/template
index 8a284973530..36d4b1b6684 100644
--- a/srcpkgs/help2man/template
+++ b/srcpkgs/help2man/template
@@ -1,14 +1,14 @@
 # Template file for 'help2man'
 pkgname=help2man
-version=1.47.10
+version=1.47.11
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl-Locale-gettext"
 depends="$hostmakedepends"
 short_desc="GNU conversion tool to create man files"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/help2man"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=f371cbfd63f879065422b58fa6b81e21870cd791ef6e11d4528608204aa4dcfb
+checksum=5985b257f86304c8791842c0c807a37541d0d6807ee973000cf8a3fe6ad47b88
 lib32disabled=yes
diff --git a/srcpkgs/hexchat/template b/srcpkgs/hexchat/template
index 1a46e08ae99..fbeaf28ae8a 100644
--- a/srcpkgs/hexchat/template
+++ b/srcpkgs/hexchat/template
@@ -1,7 +1,7 @@
 # Template file for 'hexchat'
 pkgname=hexchat
 version=2.14.2
-revision=5
+revision=6
 build_style=meson
 configure_args="-Dwith-dbus=true -Dwith-ssl=true -Dwith-text=false
  -Dwith-perl=/usr/bin/perl -Dwith-python=python3
diff --git a/srcpkgs/hexyl/template b/srcpkgs/hexyl/template
index 094dadfe87e..2054496993f 100644
--- a/srcpkgs/hexyl/template
+++ b/srcpkgs/hexyl/template
@@ -1,14 +1,14 @@
 # Template file for 'hexyl'
 pkgname=hexyl
-version=0.5.1
-revision=2
+version=0.6.0
+revision=1
 build_style=cargo
 short_desc="Command-line hex viewer"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="Apache-2.0, MIT"
 homepage="https://github.com/sharkdp/hexyl"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=9c12bc6377d1efedc4a1731547448f7eb6ed17ee1c267aad9a35995b42091163
+checksum=5031b20c13b3ccb27abbf119b54609cef16c4152aca2823ee5c53cd5f434b97e
 
 case "$XBPS_TARGET_MACHINE" in
 	aarch64-musl) broken="https://github.com/nix-rust/nix/issues/951"
diff --git a/srcpkgs/hiawatha/template b/srcpkgs/hiawatha/template
index 3ec6202b494..ce962ab6d35 100644
--- a/srcpkgs/hiawatha/template
+++ b/srcpkgs/hiawatha/template
@@ -1,6 +1,6 @@
 # Template file for 'hiawatha'
 pkgname=hiawatha
-version=10.9
+version=10.10
 revision=1
 build_style=cmake
 configure_args="-DLOG_DIR=/var/log/hiawatha -DPID_DIR=/run
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://hiawatha-webserver.org"
 distfiles="${homepage}/files/${pkgname}-${version}.tar.gz"
-checksum=74dd43812272c3ddbf067b6d4da1773cdeef2ffe71e8f164449fabf8431752b8
+checksum=b5e46f5757fa647e77d21d24f7eea912d59f26a75558cba780b45c1c3a33a4d9
 conf_files="/etc/${pkgname}/*.conf /etc/${pkgname}/*.xslt"
 make_dirs="/var/log/hiawatha 0755 root root"
 
diff --git a/srcpkgs/hitori/template b/srcpkgs/hitori/template
index dc367cdadd5..2144995be0d 100644
--- a/srcpkgs/hitori/template
+++ b/srcpkgs/hitori/template
@@ -1,8 +1,8 @@
 # Template file for 'hitori'
 pkgname=hitori
-version=3.22.4
+version=3.34.0
 revision=1
-build_style=gnu-configure
+build_style=meson
 hostmakedepends="glib-devel intltool itstool pkg-config"
 makedepends="gtk+3-devel"
 short_desc="GNOME eponymous puzzle game"
@@ -10,4 +10,4 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2"
 homepage="https://wiki.gnome.org/Apps/Hitori"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=dcac6909b6007857ee425ac8c65fed179f2c71da138d5e5300cd62c8b9ea15d3
+checksum=65d14068f83f4a59f1f9c83c9a813508a54fd19a2d91e4ef7dcf56d10c862298
diff --git a/srcpkgs/homebank/template b/srcpkgs/homebank/template
index 0d9a04b2434..8e5e87f341c 100644
--- a/srcpkgs/homebank/template
+++ b/srcpkgs/homebank/template
@@ -1,6 +1,6 @@
 # Template file for 'homebank'
 pkgname=homebank
-version=5.2.6
+version=5.2.8
 revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config"
@@ -10,5 +10,5 @@ short_desc="Free personal finance software"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://homebank.free.fr/"
-distfiles="http://homebank.free.fr/public/${pkgname}-${version}.tar.gz"
-checksum=9a14cbf7029080f208d76b27a2d8066964426685ddc86fd1abed30bd428c9881
+distfiles="http://homebank.free.fr/public/homebank-${version}.tar.gz"
+checksum=fe98a3585a23ed66695a96b9162dbf1872f4fd78c01471019b60786476bc558d
diff --git a/srcpkgs/hopper/template b/srcpkgs/hopper/template
index 1160a36b1a0..e68d8e1a804 100644
--- a/srcpkgs/hopper/template
+++ b/srcpkgs/hopper/template
@@ -1,6 +1,6 @@
 # Template file for 'hopper'
 pkgname=hopper
-version=4.5.13
+version=4.5.16
 revision=1
 _build=1
 create_wrksrc=yes
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="EULA"
 homepage="https://www.hopperapp.com"
 distfiles="https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-v4-${version}-Linux.pkg.tar.xz"
-checksum=aea44d9ee0eb61b65a39627a7c43b910ec0f4eedfd46eddb2e5b81b47568d88c
+checksum=04951a9a2fdde8f95f5e268c836fae4013308fca48ae45a621ddad68dcb1563e
 
 archs="x86_64"
 restricted=yes
diff --git a/srcpkgs/hplip/template b/srcpkgs/hplip/template
index 337189e7393..07a707569f6 100644
--- a/srcpkgs/hplip/template
+++ b/srcpkgs/hplip/template
@@ -1,6 +1,6 @@
 # Template file for 'hplip'
 pkgname=hplip
-version=3.19.6
+version=3.19.8
 revision=1
 build_style=gnu-configure
 pycompile_dirs="usr/share/hplip"
@@ -31,7 +31,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only, BSD-3-Clause, MIT"
 homepage="https://developers.hp.com/hp-linux-imaging-and-printing"
 distfiles="${SOURCEFORGE_SITE}/hplip/hplip/${version}/hplip-${version}.tar.gz"
-checksum=fcdaedee9ed17d2e70f3aff9558a452d99443d1b93d6623132faf3f3ae61d66d
+checksum=a385fea00241592d148ef1a20082799fa45b36031742157db181d5d94a84ba32
 conflicts="hplip-gui"
 
 CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/libusb-1.0 -I${XBPS_CROSS_BASE}/${py3_inc}"
diff --git a/srcpkgs/httpie/template b/srcpkgs/httpie/template
index 7e435e11fe2..387af8ebf05 100644
--- a/srcpkgs/httpie/template
+++ b/srcpkgs/httpie/template
@@ -1,6 +1,6 @@
 # Template file for 'httpie'
 pkgname=httpie
-version=1.0.2
+version=1.0.3
 revision=1
 archs=noarch
 build_style=python3-module
@@ -9,10 +9,10 @@ hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-requests python3-Pygments"
 short_desc="Human-friendly command line HTTP client"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://httpie.org/"
 license="BSD-3-Clause"
+homepage="https://httpie.org/"
 distfiles="https://github.com/jakubroztocil/httpie/archive/${version}.tar.gz"
-checksum=f11f5ecdbcc0571aa865fb29cd5db68ba6bce4f15a5aae3f27a32d19b0854dc9
+checksum=ecfb1ecdfd1468100bd9ffecebe1bea6d7d72c72149ea91f3d0112dc8ef03c7a
 
 post_install() {
 	vinstall extras/httpie-completion.bash 644 usr/share/bash-completion/completions http
diff --git a/srcpkgs/hub/template b/srcpkgs/hub/template
index dfad19b6565..47b26514f6b 100644
--- a/srcpkgs/hub/template
+++ b/srcpkgs/hub/template
@@ -1,6 +1,6 @@
 # Template file for 'hub'
 pkgname=hub
-version=2.12.3
+version=2.12.8
 revision=1
 build_style=go
 go_import_path=github.com/github/hub
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://hub.github.com/"
 changelog="https://github.com/github/hub/releases"
 distfiles="https://github.com/github/hub/archive/v${version}.tar.gz"
-checksum=197242fea670353688c541d2e4584b449f18c354a01d89bf1667ea33c0071ddc
+checksum=72d09397967c85b118fc1be25dc0fc54353f4dea09f804687a287949c7de7ebe
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" hub"
diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template
index c785474fcbc..c8b96e9f0eb 100644
--- a/srcpkgs/hugo/template
+++ b/srcpkgs/hugo/template
@@ -1,6 +1,6 @@
 # Template file for 'hugo'
 pkgname=hugo
-version=0.56.2
+version=0.58.3
 revision=1
 build_style=go
 go_import_path="github.com/gohugoio/${pkgname}"
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://gohugo.io"
 distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
-checksum=5fecdda6630ed585daa931d6087d95d8e05a24c30cfe7bdd2b29fba340d2650d
+checksum=4733f22fc447d745c88f7c688407d67e9ab67e7e276557f3a48edd8b37900718
 
 build_options="pygments"
 desc_option_pygments="Alternative syntax highlighter"
diff --git a/srcpkgs/hunspell-en_AU/template b/srcpkgs/hunspell-en_AU/template
index 6a748d6ccd5..f8f3b94e6ab 100644
--- a/srcpkgs/hunspell-en_AU/template
+++ b/srcpkgs/hunspell-en_AU/template
@@ -1,6 +1,6 @@
 # Template file for 'hunspell-en_AU'
 pkgname=hunspell-en_AU
-version=2018.04.16
+version=2019.10.06
 revision=1
 archs=noarch
 create_wrksrc=yes
@@ -10,7 +10,7 @@ maintainer="Alexis <flexibeast@gmail.com>"
 license="SCOWL" # not in SPDX
 homepage="http://wordlist.aspell.net/dicts"
 distfiles="${SOURCEFORGE_SITE}/wordlist/speller/${version}/${pkgname}-${version}.zip"
-checksum=c599f7d420ddac12785bf13eccbf007d04c6a3784c949c6a2da0cd40af35e0ce
+checksum=32dbd174c143acdd670f08c1757c7402a197e1e7d5fa634b61e68bb1a26cdcbc
 
 do_install() {
 	vinstall en_AU.aff 644 /usr/share/hunspell
diff --git a/srcpkgs/hunspell-en_GB-ize/template b/srcpkgs/hunspell-en_GB-ize/template
index 69588d7ace7..41001a413a8 100644
--- a/srcpkgs/hunspell-en_GB-ize/template
+++ b/srcpkgs/hunspell-en_GB-ize/template
@@ -2,20 +2,20 @@
 _vpkgname=hunspell-en_GB
 _variant="ize"
 pkgname=${_vpkgname}-${_variant}
-version=2018.04.16
+version=2019.10.06
 revision=1
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-homepage="http://wordlist.aspell.net/dicts"
-license="SCOWL"
 archs=noarch
+create_wrksrc=yes
 hostmakedepends="unzip"
 short_desc="English dictionary for hunspell ${_variant} variant"
-create_wrksrc=yes
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="SCOWL"
+homepage="http://wordlist.aspell.net/dicts"
 provides="${_vpkgname}-${version}_${revision}"
 replaces="${_vpkgname}>=0"
 
 distfiles="${SOURCEFORGE_SITE}/wordlist/speller/${version}/${pkgname}-${version}.zip"
-checksum=fa0a52131ec3a3b73cc2b41687c245026b129ef90a1527390380b4dab5f1bce6
+checksum=20990e242c78ae46e3179dcaf1885d0af2fa3fae67b19facda8dd0246f6fc2b5
 
 do_install() {
 	vinstall en_GB-${_variant}.aff 644 /usr/share/hunspell en_GB.aff
diff --git a/srcpkgs/hunspell-en_US/template b/srcpkgs/hunspell-en_US/template
index bac820aaa00..0d100851774 100644
--- a/srcpkgs/hunspell-en_US/template
+++ b/srcpkgs/hunspell-en_US/template
@@ -1,16 +1,16 @@
 # Template file for 'hunspell-en_US'
 pkgname=hunspell-en_US
-version=2018.04.16
+version=2019.10.06
 revision=1
+archs=noarch
+create_wrksrc=yes
 hostmakedepends="unzip"
+short_desc="American English en_US dictionary for hunspell"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="SCOWL" # not in SPDX
-short_desc="American English en_US dictionary for hunspell"
 homepage="http://wordlist.aspell.net/dicts"
 distfiles="${SOURCEFORGE_SITE}/wordlist/speller/${version}/${pkgname}-${version}.zip"
-checksum=4efdba6438b916a61c4a12933952f458564f2f2af3db9ab3c27f328b37b30ba2
-create_wrksrc=yes
-archs=noarch
+checksum=e0f9c8bbc20da9998ea9daaa8b221f4b1bbaba4211e116318a838354cc856ba5
 
 do_install() {
 	sed -i 's/SET UTF8/SET UTF-8/g' en_US.aff
diff --git a/srcpkgs/hunspell-es_ES/template b/srcpkgs/hunspell-es_ES/template
index a4b6f84c06c..f24f904620f 100644
--- a/srcpkgs/hunspell-es_ES/template
+++ b/srcpkgs/hunspell-es_ES/template
@@ -1,6 +1,6 @@
 # Template file for 'hunspell-es_ES'
 pkgname=hunspell-es_ES
-version=2.4
+version=2.5
 revision=1
 archs=noarch
 create_wrksrc=yes
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later, LGPL-3.0-or-later, MPL-1.1"
 homepage="https://github.com/sbosio/rla-es"
 distfiles="https://github.com/sbosio/rla-es/releases/download/v${version}/es_ES.oxt>dict-es.zip"
-checksum=c1b47643e694b1bb1002d964684b8669a9a4976ca3db48d4a20f5bc3f9d8d40e
+checksum=22a3b973f1667ddfd2d5c130623a16e22f9722a27437ba66d1de4fe569d32d0f
 
 do_install() {
 	vinstall es_ES.aff 644 /usr/share/hunspell
diff --git a/srcpkgs/hunspell-pl_PL/template b/srcpkgs/hunspell-pl_PL/template
index 11974615d5e..31158cc9bec 100644
--- a/srcpkgs/hunspell-pl_PL/template
+++ b/srcpkgs/hunspell-pl_PL/template
@@ -1,6 +1,6 @@
 # Template file for 'hunspell-pl_PL'
 pkgname=hunspell-pl_PL
-version=20190812
+version=20191005
 revision=1
 archs=noarch
 create_wrksrc=yes
@@ -10,7 +10,7 @@ maintainer="m-cz <emcze@ya.ru>"
 license="GPL-2.0-only, LGPL-2.1-only, CC-BY-4.0, MPL-1.1, Apache-2.0"
 homepage="https://sjp.pl/slownik/ort/"
 distfiles="https://sjp.pl/slownik/ort/sjp-myspell-pl-${version}.zip"
-checksum=60bf16820551816acec9d708dbc7982ecfe3d6caeb377021324124583030a1b7
+checksum=45035bb507849a203a835c211720e3e65ef401a3605c5f7f1951c7450242156f
 
 post_extract() {
 	unzip pl_PL.zip
diff --git a/srcpkgs/hwids/template b/srcpkgs/hwids/template
index e44c19a39ca..a7ee61a427d 100644
--- a/srcpkgs/hwids/template
+++ b/srcpkgs/hwids/template
@@ -1,15 +1,15 @@
 # Template file for 'hwids'
 pkgname=hwids
-version=20190316
+version=20190818
 revision=1
 archs=noarch
 wrksrc="hwids-hwids-${version}"
 short_desc="Hardware Identification Databases"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/gentoo/hwids"
 distfiles="https://github.com/gentoo/hwids/archive/hwids-${version}.tar.gz"
-checksum=e4498020b2c1a1ea5faf1e9d30bda0ae161aaf8e8fb17f40e1c6b8dc896c5d9e
+checksum=cee0947dd345fbd3aa2dc008c53d81d05358f7fbebc4eadd626b688a586e83fd
 
 do_install() {
 	vmkdir usr/share/hwdata
diff --git a/srcpkgs/hydroxide/template b/srcpkgs/hydroxide/template
index 6ea22f860f8..2181a2120ae 100644
--- a/srcpkgs/hydroxide/template
+++ b/srcpkgs/hydroxide/template
@@ -1,6 +1,6 @@
 # Template file for 'hydroxide'
 pkgname=hydroxide
-version=0.2.6
+version=0.2.9
 revision=1
 build_style=go
 go_import_path=github.com/emersion/hydroxide/cmd/hydroxide
@@ -10,9 +10,8 @@ maintainer="DirectorX <void.directorx@protonmail.com>"
 license="MIT"
 homepage="https://github.com/emersion/hydroxide"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=49b1cea513fd3c012dc1b09a60d19656fe7f12be647b4cbb25b36be580772b40
+checksum=dacf8720620855171bbb201bdcd757364701c53071e3b82a00646ae95e019829
 
 post_install() {
 	vlicense LICENSE
 }
-
diff --git a/srcpkgs/hyperfine/template b/srcpkgs/hyperfine/template
index 7743009e710..66d27d51a8f 100644
--- a/srcpkgs/hyperfine/template
+++ b/srcpkgs/hyperfine/template
@@ -1,15 +1,15 @@
 # Template file for 'hyperfine'
 pkgname=hyperfine
-version=1.5.0
+version=1.8.0
 revision=1
 build_style=cargo
 short_desc="Command-line benchmarking tool"
 maintainer="Wilson Birney <wpb@360scada.com>"
-license="MIT"
+license="MIT, Apache-2.0"
 homepage="https://github.com/sharkdp/hyperfine"
 changelog="https://github.com/sharkdp/hyperfine/releases"
 distfiles="https://github.com/sharkdp/hyperfine/archive/v${version}.tar.gz"
-checksum=d5183611348e696e579dda846cee92b7b78c8ef18c00bfb9b0a62d0a63034823
+checksum=14de63b44eb4c2c5d6a6f9354acbcff350c9a2ba50b2397de5798c152cc2a029
 
 post_install() {
 	vlicense LICENSE-MIT
diff --git a/srcpkgs/i2pd/template b/srcpkgs/i2pd/template
index f96adface6b..1ba8e910453 100644
--- a/srcpkgs/i2pd/template
+++ b/srcpkgs/i2pd/template
@@ -1,6 +1,6 @@
 # Template file for 'i2pd'
 pkgname=i2pd
-version=2.27.0
+version=2.28.0
 revision=1
 build_style=gnu-makefile
 make_build_args="USE_UPNP=yes"
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://i2pd.website/"
 changelog="https://raw.githubusercontent.com/PurpleI2P/i2pd/openssl/ChangeLog"
 distfiles="https://github.com/PurpleI2P/i2pd/archive/${version}.tar.gz"
-checksum=46aa20760c85e3c5bf79229cd86b75a4c7e163271d400d0f104913d64cb8e093
+checksum=181327edc7cf5b3c25ee51ecc518a4da90fa9e421eca2107996791038a514a21
 disable_parallel_build=yes
 
 conf_files="
diff --git a/srcpkgs/i3-gaps/template b/srcpkgs/i3-gaps/template
index 7e3e60ea9ea..1092e5fad4d 100644
--- a/srcpkgs/i3-gaps/template
+++ b/srcpkgs/i3-gaps/template
@@ -1,6 +1,6 @@
 # Template file for 'i3-gaps'
 pkgname=i3-gaps
-version=4.17
+version=4.17.1
 revision=1
 wrksrc="i3-${version}"
 build_style=gnu-configure
@@ -17,7 +17,7 @@ maintainer="ian c. <ian@airmail.cc>"
 license="BSD-3-Clause"
 homepage="https://github.com/Airblader/i3"
 distfiles="${homepage}/archive/${version}.tar.gz>${version}.tar.gz"
-checksum=4fbe0d80f8ef8814f266705318885e15e316774e98fb26f40199e51ed2eea2ed
+checksum=10d75b32786f54cc8854287478f83ff428e6996b73b3cd9b6ba86cee2adf570a
 
 provides="i3-${version}_${revision}"
 replaces="i3>=0"
diff --git a/srcpkgs/i3/template b/srcpkgs/i3/template
index f4f13d4c9cd..542b1fe701f 100644
--- a/srcpkgs/i3/template
+++ b/srcpkgs/i3/template
@@ -1,6 +1,6 @@
 # Template file for 'i3'
 pkgname=i3
-version=4.17
+version=4.17.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-builddir"
@@ -16,7 +16,7 @@ maintainer="Frank Steinborn <steinex@nognu.de>"
 license="BSD-3-Clause"
 homepage="https://i3wm.org/"
 distfiles="${homepage}/downloads/${pkgname}-${version}.tar.bz2"
-checksum=4ebe13e47d6b88fb31d0cb1492e9d968d96aafcd834b8d3cae18b684e7ac18fd
+checksum=1e8fe133a195c29a8e2aa3b1c56e5bc77e7f5534f2dd92e09faabe2ca2d85f45
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) makedepends+=" libglob-devel";;
diff --git a/srcpkgs/i3lock-color/template b/srcpkgs/i3lock-color/template
index 1ec44f0c738..07bd585c69d 100644
--- a/srcpkgs/i3lock-color/template
+++ b/srcpkgs/i3lock-color/template
@@ -1,7 +1,7 @@
 # Template file for 'i3lock-color'
 pkgname=i3lock-color
 version=2.12
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}.c"
 build_style=gnu-configure
 hostmakedepends="pkg-config automake"
@@ -20,6 +20,10 @@ pre_configure() {
 	autoreconf -i
 }
 
+pre_build() {
+	vsed -i 's:login:system-auth:' pam/i3lock
+}
+
 post_install() {
 	vlicense LICENSE
 }
diff --git a/srcpkgs/i3lock-fancy/template b/srcpkgs/i3lock-fancy/template
index fbbf22d0143..5bb3502b4ed 100644
--- a/srcpkgs/i3lock-fancy/template
+++ b/srcpkgs/i3lock-fancy/template
@@ -5,7 +5,7 @@ revision=1
 archs=noarch
 depends="util-linux bash ImageMagick i3lock wmctrl gawk"
 short_desc="Fancy lockscreen using i3lock"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/meskarune/i3lock-fancy"
 distfiles="https://github.com/meskarune/i3lock-fancy/archive/${version}.tar.gz"
diff --git a/srcpkgs/i3status-rust/patches/fix-32bit.patch b/srcpkgs/i3status-rust/patches/fix-32bit.patch
index d77308460ea..dc05dfa9eca 100644
--- a/srcpkgs/i3status-rust/patches/fix-32bit.patch
+++ b/srcpkgs/i3status-rust/patches/fix-32bit.patch
@@ -5,20 +5,20 @@ diff --git a/src/blocks/disk_space.rs b/src/blocks/disk_space.rs
          let mut result;
          let mut converted = 0.0f64;
          let mut converted_str = String::new();
--        let total = statvfs.blocks() * statvfs.fragment_size();
--        let used = (statvfs.blocks() - statvfs.blocks_free()) * statvfs.fragment_size();
-+        let total = (statvfs.blocks() as u64 * statvfs.fragment_size() as u64) as u64;
-+        let used = ((statvfs.blocks() as u64 - statvfs.blocks_free() as u64) * statvfs.fragment_size() as u64) as u64;
+-        let total = (statvfs.blocks() * statvfs.fragment_size()) as u64;
+-        let used = ((statvfs.blocks() - statvfs.blocks_free()) * statvfs.fragment_size()) as u64;
++        let total = (statvfs.blocks() as u64) * (statvfs.fragment_size() as u64);
++        let used = ((statvfs.blocks() as u64) - (statvfs.blocks_free() as u64)) * (statvfs.fragment_size() as u64);
  
          match self.info_type {
              InfoType::Available => {
--                result = statvfs.blocks_available() * statvfs.block_size();
-+                result = (statvfs.blocks_available() as u64 * statvfs.block_size() as u64) as u64;
+-                result = (statvfs.blocks_available() * statvfs.block_size()) as u64;
++                result = (statvfs.blocks_available() as u64) * (statvfs.block_size() as u64);
                  converted = Unit::bytes_in_unit(self.unit, result);
              }
              InfoType::Free => {
--                result = statvfs.blocks_free() * statvfs.block_size();
-+                result = (statvfs.blocks_free() as u64 * statvfs.block_size() as u64) as u64;
+-                result = (statvfs.blocks_free() * statvfs.block_size()) as u64;
++                result = (statvfs.blocks_free() as u64) * (statvfs.block_size() as u64);
                  converted = Unit::bytes_in_unit(self.unit, result);
              }
              InfoType::Total => {
diff --git a/srcpkgs/i3status-rust/template b/srcpkgs/i3status-rust/template
index 8e01ed53609..8d7775ee134 100644
--- a/srcpkgs/i3status-rust/template
+++ b/srcpkgs/i3status-rust/template
@@ -1,7 +1,7 @@
 # Template file for 'i3status-rust'
 pkgname=i3status-rust
-version=0.10.0
-revision=3
+version=0.11.0
+revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
 makedepends="dbus-devel pulseaudio-devel"
@@ -10,8 +10,4 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="GPL-3.0-only"
 homepage="https://github.com/greshake/i3status-rust"
 distfiles="https://github.com/greshake/i3status-rust/archive/v${version}.tar.gz"
-checksum=84a12a91419fda35109a0be3980671c1d58e13c5987e6dc999cbe786d05053d9
-
-case "$XBPS_TARGET_MACHINE" in
-	ppc*) broken="old broken version of nix (0.8.1) in dep tree" ;;
-esac
+checksum=2f749ba4646e2fc0af62d31c990ae8d59d454eb0e5fe947b39d64cfeabbb0a1c
diff --git a/srcpkgs/i3status/patches/pulseaudio-optional.patch b/srcpkgs/i3status/patches/pulseaudio-optional.patch
new file mode 100644
index 00000000000..895097d221c
--- /dev/null
+++ b/srcpkgs/i3status/patches/pulseaudio-optional.patch
@@ -0,0 +1,95 @@
+# reason: make pulseaudio optional
+# upstream: yes (>2.13)
+# ```
+# cd i3status
+# git diff --no-prefix 2.13..23da59920c -- configure.ac Makefile.am i3status.c src/print_volume.c
+# ```
+
+diff --git Makefile.am Makefile.am
+index bb251f0..c2c1c0a 100644
+--- Makefile.am
++++ Makefile.am
+@@ -68,8 +68,11 @@ i3status_SOURCES = \
+ 	src/print_volume.c \
+ 	src/print_wireless_info.c \
+ 	src/print_file_contents.c \
+-	src/process_runs.c \
+-	src/pulse.c
++	src/process_runs.c
++
++if PULSE
++i3status_SOURCES += src/pulse.c
++endif
+ 
+ dist_sysconf_DATA = \
+ 	i3status.conf
+diff --git configure.ac configure.ac
+index cf9e430..11caa33 100644
+--- configure.ac
++++ configure.ac
+@@ -80,11 +80,24 @@ AC_CANONICAL_HOST
+ PKG_CHECK_MODULES([CONFUSE], [libconfuse])
+ PKG_CHECK_MODULES([YAJL], [yajl])
+ 
++AC_ARG_ENABLE(pulseaudio,
++  AS_HELP_STRING(
++    [--disable-pulseaudio],
++    [build without pulseaudio support]),
++  [ax_pulse=$enableval],
++  [ax_pulse=yes])
++AM_CONDITIONAL([PULSE], [test x$ax_pulse = xyes])
++AS_IF([test x"$ax_pulse" = x"yes"],
++      [PKG_CHECK_MODULES([PULSE], [libpulse])])
++pulse_def=0
++AS_IF([test x"$ax_pulse" = x"yes"],
++      [pulse_def=1])
++AC_DEFINE_UNQUOTED([HAS_PULSEAUDIO], [$pulse_def], [Build with pulseaudio])
++
+ case $host_os in
+ 	linux*)
+ 	PKG_CHECK_MODULES([NLGENL], [libnl-genl-3.0])
+ 	PKG_CHECK_MODULES([ALSA], [alsa])
+-	PKG_CHECK_MODULES([PULSE], [libpulse])
+ 	;;
+ 	netbsd*)
+ 	AC_SEARCH_LIBS([prop_string_create], [prop])
+@@ -151,6 +164,7 @@ AS_HELP_STRING([is release version:], [${is_release}])
+ AS_HELP_STRING([enable debug flags:], [${ax_enable_debug}])
+ AS_HELP_STRING([code coverage:], [${CODE_COVERAGE_ENABLED}])
+ AS_HELP_STRING([enabled sanitizers:], [${ax_enabled_sanitizers}])
++AS_HELP_STRING([pulseaudio support:], [${ax_pulse}])
+ 
+ To compile, run:
+ 
+diff --git i3status.c i3status.c
+index 0898da3..1ab8400 100644
+--- i3status.c
++++ i3status.c
+@@ -565,7 +565,13 @@ int main(int argc, char *argv[]) {
+                 return 0;
+                 break;
+             case 'v':
+-                printf("i3status " VERSION " © 2008 Michael Stapelberg and contributors\n");
++                printf("i3status " VERSION " © 2008 Michael Stapelberg and contributors\n"
++#if HAS_PULSEAUDIO
++                       "Built with pulseaudio support\n"
++#else
++                       "Built without pulseaudio support\n"
++#endif
++                       );
+                 return 0;
+                 break;
+             case 0:
+diff --git src/print_volume.c src/print_volume.c
+index 91e8ce2..7364d47 100644
+--- src/print_volume.c
++++ src/print_volume.c
+@@ -86,7 +86,7 @@ void print_volume(yajl_gen json_gen, char *buffer, const char *fmt, const char *
+         free(instance);
+     }
+ 
+-#if !defined(__DragonFly__) && !defined(__OpenBSD__)
++#if HAS_PULSEAUDIO
+     /* Try PulseAudio first */
+ 
+     /* If the device name has the format "pulse[:N]" where N is the
diff --git a/srcpkgs/i3status/template b/srcpkgs/i3status/template
index 3bfa6a3481e..9474d13234b 100644
--- a/srcpkgs/i3status/template
+++ b/srcpkgs/i3status/template
@@ -1,39 +1,48 @@
 # Template file for 'i3status'
 pkgname=i3status
-version=2.12
+version=2.13
 revision=1
-hostmakedepends="asciidoc pkg-config"
+build_style=gnu-configure
+configure_args="--disable-builddir $(vopt_if pulseaudio '' --disable-pulseaudio)"
+hostmakedepends="automake asciidoc pkg-config xmlto"
 makedepends="alsa-lib-devel confuse-devel libcap-devel libnl3-devel
- pulseaudio-devel yajl-devel"
+ yajl-devel $(vopt_if pulseaudio pulseaudio-devel)"
 depends="libcap-progs"
 short_desc="Status bar generator for i3bar, dzen2, xmobar or similar programs"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Lugubris <lugubris@disroot.org>"
 license="BSD-3-Clause"
 homepage="https://www.i3wm.org/i3status/"
 #changelog="https://raw.githubusercontent.com/i3/i3status/master/CHANGELOG"
 distfiles="${homepage}/${pkgname}-${version}.tar.bz2"
-checksum=6fc6881536043391ab4bed369d956f99d1088965d8bcebed18d1932de3ba791a
+checksum=ce89c9ff8565f62e88299f1a611229afdfc356b4e97368a5f8c4f06ad2fa1466
 conf_files="/etc/i3status.conf"
 
+build_options="pulseaudio"
+build_options_default="pulseaudio"
+
 case "$XBPS_TARGET_MACHINE" in
-	*-musl) makedepends+=" libglob-devel";;
+	*-musl)
+		makedepends+=" libglob-devel"
+		export LIBS="${XBPS_CROSS_BASE}/usr/lib/libglob.a"
+		;;
 esac
 
-do_build() {
+post_patch() {
 	case "$XBPS_TARGET_MACHINE" in
 	*-musl)
-		sed -i '/include/s,glob.h,libglob/glob.h,g' src/process_runs.c src/print_cpu_temperature.c i3status.c
-		sed -i '/GLOB_TILDE/s/glob(/g_glob(/g' src/process_runs.c src/print_cpu_temperature.c i3status.c
-		sed -i 's/globfree(/g_globfree(/g' src/process_runs.c src/print_cpu_temperature.c i3status.c
-		export LIBS="$XBPS_CROSS_BASE/usr/lib/libglob.a"
+		vsed \
+		  -e '/include/s,glob.h,libglob/glob.h,g' \
+		  -e '/GLOB_TILDE/s/glob(/g_glob(/g' \
+		  -e 's/globfree(/g_globfree(/g' \
+		  -i src/process_runs.c src/print_cpu_temperature.c i3status.c
 		;;
 	esac
-	make CC=$CC ${makejobs}
 }
 
-do_install() {
-	make PREFIX=/usr DESTDIR=${DESTDIR} install
-	# detect dhcpcd.
-	sed -i -e "s#dhclient#dhcpcd#g" ${DESTDIR}/etc/i3status.conf
+pre_configure() {
+	autoreconf -vfi
+}
+
+post_install() {
 	vlicense LICENSE
 }
diff --git a/srcpkgs/iagno/template b/srcpkgs/iagno/template
index 42215135b1d..76fed345932 100644
--- a/srcpkgs/iagno/template
+++ b/srcpkgs/iagno/template
@@ -1,13 +1,13 @@
 # Template file for 'iagno'
 pkgname=iagno
-version=3.32.0
-revision=2
+version=3.34.2
+revision=1
 build_style=meson
 hostmakedepends="glib-devel itstool pkg-config vala"
-makedepends="libcanberra-devel librsvg-devel"
+makedepends="gsound-devel libcanberra-devel librsvg-devel"
 short_desc="GNOME Reversi (Othello) game"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Iagno"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ed040e8fc6a7e965f20dc267136cd693a497e75402137b10ef2654751f5998e5
+checksum=c9beb1788339965bafc1bb14ce0f9ede9c93db7d2445580a2bf6e18a96996164
diff --git a/srcpkgs/ibus-bamboo/template b/srcpkgs/ibus-bamboo/template
index 6db7c943552..0e14d425b64 100644
--- a/srcpkgs/ibus-bamboo/template
+++ b/srcpkgs/ibus-bamboo/template
@@ -1,6 +1,6 @@
 # Template file for 'ibus-bamboo'
 pkgname=ibus-bamboo
-version=0.5.3
+version=0.5.8
 revision=1
 hostmakedepends="go"
 makedepends="libXtst-devel libX11-devel"
@@ -10,7 +10,7 @@ maintainer="ndgnuh <ndgnuh99@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/BambooEngine/ibus-bamboo"
 distfiles="${homepage}/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum="8718418f5cb616808ca6827b0851ead83ee4660a981bcb9143edf0a5cf12e43a"
+checksum="e4fbf2df5d6bab75323bc8ad1dd6f2d1e847db41a49b63e69169acb1ba9e94e5"
 nocross="armv7l-linux-gnueabihf-gcc: error: unrecognized command line option '-m64'"
 _engine_dir="usr/share/ibus-bamboo/"
 _ibus_dir="usr/share/ibus"
diff --git a/srcpkgs/ibus-m17n/INSTALL.msg b/srcpkgs/ibus-m17n/INSTALL.msg
new file mode 100644
index 00000000000..fbc9da6e6d1
--- /dev/null
+++ b/srcpkgs/ibus-m17n/INSTALL.msg
@@ -0,0 +1,2 @@
+If the M17N languages don't appear in ibus-setup or GNOME Control Center
+run `ibus-daemon -xdr` or simply reboot.
diff --git a/srcpkgs/ibus-m17n/template b/srcpkgs/ibus-m17n/template
new file mode 100644
index 00000000000..db0ab6ea93a
--- /dev/null
+++ b/srcpkgs/ibus-m17n/template
@@ -0,0 +1,19 @@
+# Template file for 'ibus-m17n'
+pkgname=ibus-m17n
+version=1.4.1
+revision=1
+build_style=gnu-configure
+configure_args="--prefix=/usr --libexecdir=/usr/lib/ibus"
+hostmakedepends="ibus m17n-db m17n-lib gnome-common xz pkg-config automake libtool gettext-devel"
+makedepends="ibus-devel m17n-lib-devel"
+depends="ibus m17n-db"
+short_desc="M17N engine for IBus"
+maintainer="reback00 <reback00@protonmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/ibus/ibus-m17n"
+distfiles="https://github.com/ibus/ibus-m17n/releases/download/${version}/ibus-m17n-${version}.tar.gz"
+checksum=5207f0b99bd17cae05251f96649dd26ec09f2feedb47dbe92a5128c7eeea4762
+
+pre_configure() {
+	autoreconf -fi
+}
diff --git a/srcpkgs/icdiff/template b/srcpkgs/icdiff/template
index 8aba093e5d7..31cfc3e2354 100644
--- a/srcpkgs/icdiff/template
+++ b/srcpkgs/icdiff/template
@@ -1,7 +1,7 @@
 # Template file for 'icdiff'
 pkgname=icdiff
-version=1.9.4
-revision=2
+version=1.9.5
+revision=1
 wrksrc="${pkgname}-release-${version}"
 archs=noarch
 build_style=python-module
@@ -14,7 +14,7 @@ license="Python-2.0"
 homepage="http://www.jefftk.com/icdiff"
 changelog="https://github.com/jeffkaufman/icdiff/raw/master/ChangeLog"
 distfiles="https://github.com/jeffkaufman/icdiff/archive/release-${version}.tar.gz"
-checksum=dabceff1986d45f1e0e6a396ed71836586acfb99092a91303f14052b879ca59a
+checksum=f2e3df30e93df92224538ef3c62a73891af92de4caf94e8117582835e1040fc7
 
 alternatives="
  icdiff:icdiff:/usr/bin/icdiff2
diff --git a/srcpkgs/ice-ssb/template b/srcpkgs/ice-ssb/template
index 62315cc7211..e604b9bfbc3 100644
--- a/srcpkgs/ice-ssb/template
+++ b/srcpkgs/ice-ssb/template
@@ -1,6 +1,6 @@
 # Template file for 'ice-ssb'
 pkgname=ice-ssb
-version=6.0.5
+version=6.0.6
 revision=1
 archs=noarch
 wrksrc="ice-$version"
@@ -11,7 +11,7 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/peppermintos/ice/"
 changelog="https://github.com/peppermintos/ice/blob/${version}/debian/changelog"
 distfiles="https://github.com/peppermintos/ice/archive/v${version}.tar.gz"
-checksum=390bd16de7a6eff6a382a5efc2779bd60b74b65943234b628bf9a839fc1a1f80
+checksum=5422094e74cb9b77059631b5bc4ed6c74e7d3d48390aef142f638c8735a942cf
 
 post_extract() {
 	sed -i -e 's/chromium-browser/chromium/g' usr/bin/ice
diff --git a/srcpkgs/firefox-esr/patches/fix-musl.patch b/srcpkgs/icecat/patches/fix-gettid.patch
similarity index 61%
rename from srcpkgs/firefox-esr/patches/fix-musl.patch
rename to srcpkgs/icecat/patches/fix-gettid.patch
index c32921d39e1..6abd59b30c3 100644
--- a/srcpkgs/firefox-esr/patches/fix-musl.patch
+++ b/srcpkgs/icecat/patches/fix-gettid.patch
@@ -1,3 +1,6 @@
+originally, the gettid wrapper was needed on glibc and musl,
+glibc-2.30 added a gettid function, so now it is only needed on musl
+
 --- tools/profiler/core/platform.h.orig
 +++ tools/profiler/core/platform.h
 @@ -56,7 +56,7 @@
@@ -5,7 +8,7 @@
  // We need a definition of gettid(), but glibc doesn't provide a
  // wrapper for it.
 -#if defined(__GLIBC__)
-+#if defined(__linux__)
++#if defined(__linux__) && !defined(__GLIBC__)
  #include <unistd.h>
  #include <sys/syscall.h>
  static inline pid_t gettid()
diff --git a/srcpkgs/icecat/patches/fix-musl.patch b/srcpkgs/icecat/patches/fix-musl.patch
deleted file mode 100644
index c32921d39e1..00000000000
--- a/srcpkgs/icecat/patches/fix-musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- tools/profiler/core/platform.h.orig
-+++ tools/profiler/core/platform.h
-@@ -56,7 +56,7 @@
-
- // We need a definition of gettid(), but glibc doesn't provide a
- // wrapper for it.
--#if defined(__GLIBC__)
-+#if defined(__linux__)
- #include <unistd.h>
- #include <sys/syscall.h>
- static inline pid_t gettid()
diff --git a/srcpkgs/icecat/patches/rust-cssparser.patch b/srcpkgs/icecat/patches/rust-cssparser.patch
new file mode 100644
index 00000000000..1ebef87c014
--- /dev/null
+++ b/srcpkgs/icecat/patches/rust-cssparser.patch
@@ -0,0 +1,90 @@
+backport of:
+
+From 3c98d22c5de3b696bf1fde2b6c90069812312aa6 Mon Sep 17 00:00:00 2001
+From: Simon Sapin <simon.sapin@exyr.org>
+Date: Tue, 23 Apr 2019 13:47:25 +0200
+Subject: [PATCH] Fix a future-compat warning
+
+```
+warning[E0506]: cannot assign to `self.input.cached_token` because it is borrowed
+   --> src/parser.rs:591:17
+    |
+566 |     pub fn next_including_whitespace_and_comments(&mut self) -> Result<&Token<'i>, BasicParseError<'i>> {
+    |                                                   - let's call the lifetime of this reference `'1`
+...
+579 |             Some(ref cached_token)
+    |                  ---------------- borrow of `self.input.cached_token` occurs here
+...
+591 |                 self.input.cached_token = Some(CachedToken {
+    |                 ^^^^^^^^^^^^^^^^^^^^^^^ assignment to borrowed `self.input.cached_token` occurs here
+...
+603 |         Ok(token)
+    |         --------- returning this value requires that `self.input.cached_token.0` is borrowed for `'1`
+    |
+    = warning: this error has been downgraded to a warning for backwards compatibility with previous releases
+    = warning: this represents potential undefined behavior in your code and this warning will become a hard error in the future
+```
+---
+ src/parser.rs | 50 +++++++++++++++++++++++++++-----------------------
+ 1 file changed, 27 insertions(+), 23 deletions(-)
+
+diff --git a/src/parser.rs b/src/parser.rs
+index 51f441e4..7cef117c 100644
+--- third_party/rust/cssparser/src/parser.rs
++++ third_party/rust/cssparser/src/parser.rs
+@@ -555,28 +555,34 @@
+         }
+ 
+         let token_start_position = self.input.tokenizer.position();
+-        let token;
+-        match self.input.cached_token {
+-            Some(ref cached_token)
+-            if cached_token.start_position == token_start_position => {
+-                self.input.tokenizer.reset(&cached_token.end_state);
+-                match cached_token.token {
+-                    Token::Function(ref name) => self.input.tokenizer.see_function(name),
+-                    _ => {}
+-                }
+-                token = &cached_token.token
++        let using_cached_token = self
++            .input
++            .cached_token
++            .as_ref()
++            .map_or(false, |cached_token| {
++                cached_token.start_position == token_start_position
++            });
++        let token = if using_cached_token {
++            let cached_token = self.input.cached_token.as_ref().unwrap();
++            self.input.tokenizer.reset(&cached_token.end_state);
++            match cached_token.token {
++                Token::Function(ref name) => self.input.tokenizer.see_function(name),
++                _ => {}
+             }
+-            _ => {
+-                let new_token = self.input.tokenizer.next()
+-                    .map_err(|()| self.new_basic_error(BasicParseErrorKind::EndOfInput))?;
+-                self.input.cached_token = Some(CachedToken {
+-                    token: new_token,
+-                    start_position: token_start_position,
+-                    end_state: self.input.tokenizer.state(),
+-                });
+-                token = self.input.cached_token_ref()
+-            }
+-        }
++            &cached_token.token
++        } else {
++            let new_token = self
++                .input
++                .tokenizer
++                .next()
++                .map_err(|()| self.new_basic_error(BasicParseErrorKind::EndOfInput))?;
++            self.input.cached_token = Some(CachedToken {
++                token: new_token,
++                start_position: token_start_position,
++                end_state: self.input.tokenizer.state(),
++            });
++            self.input.cached_token_ref()
++        };
+ 
+         if let Some(block_type) = BlockType::opening(token) {
+             self.at_start_of = Some(block_type);
diff --git a/srcpkgs/icecat/template b/srcpkgs/icecat/template
index 64a466766d9..655d7cab66e 100644
--- a/srcpkgs/icecat/template
+++ b/srcpkgs/icecat/template
@@ -37,6 +37,13 @@ if [ "$XBPS_WORDSIZE" -eq 32 ]; then
 	nodebug=yes
 fi
 
+# we need this because cargo verifies checksums of all files in vendor
+# crates when it builds and gives us no way to override or update the
+# file sanely... so just clear out the file list
+_clear_vendor_checksums() {
+	sed -i 's/\("files":{\)[^}]*/\1/' third_party/rust/$1/.cargo-checksum.json
+}
+
 post_extract() {
 	case "$XBPS_TARGET_MACHINE" in
 	*-musl)
@@ -51,6 +58,11 @@ post_extract() {
 	# Note: This is for Void Linux use ONLY.
 	echo -n "cd894504-7a2a-4263-abff-ff73ee89ffca" > mozilla-api-key
 }
+
+post_patch() {
+	_clear_vendor_checksums cssparser
+}
+
 do_build() {
 	local triplet
 	cp ${FILESDIR}/mozconfig .mozconfig
diff --git a/srcpkgs/icewm/patches/use-NULL.patch b/srcpkgs/icewm/patches/use-NULL.patch
deleted file mode 100644
index 855c1a446c6..00000000000
--- a/srcpkgs/icewm/patches/use-NULL.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-For unknown reasons g++ complains about these usages
-of 'nullptr' being unknown and suggests to use 'fileptr'
-instead, which of course is wrong.
-Use the C way of describing a null pointer as NULL for now.
-
---- src/wmconfig.cc	2019-05-07 12:15:34.814033408 +0200
-+++ src/wmconfig.cc	2019-05-07 12:17:38.655028470 +0200
-@@ -50,7 +50,7 @@
-     if (!append) {
-         for (long i = 0; i < workspaceCount; i++) {
-             delete[] workspaceNames[i];
--            workspaceNames[i] = nullptr;
-+            workspaceNames[i] = NULL;
-         }
-         workspaceCount = 0;
-     }
---- src/icewmhint.cc	2019-04-23 22:12:00.000000000 +0200
-+++ src/icewmhint.cc	2019-05-07 12:19:35.440023813 +0200
-@@ -32,7 +32,7 @@
-     Hinter() :
-         display(XOpenDisplay(NULL))
-     {
--        if (display == nullptr)
-+        if (display == NULL)
-             die(1,  _("Can't open display: %s. "
-                       "X must be running and $DISPLAY set."),
-                     XDisplayName(NULL));
-@@ -52,7 +52,7 @@
-             size += 1 + strlen(args[i]);
- 
-         unsigned char *hint = new unsigned char [size];
--        if (hint == nullptr)
-+        if (hint == NULL)
-             die(1, _("Out of memory (len=%d)."), int(size));
- 
-         size_t copy = 0;
-@@ -79,7 +79,7 @@
- 
-     char** arg = &argv[1];
-     for (; arg < &argv[argc] && **arg == '-'; ++arg) {
--        char* value = nullptr;
-+        char* value = NULL;
-         if (GetArgument(value, "d", "display", arg, argv + argc)) {
-             setenv("DISPLAY", value, True);
-         }
diff --git a/srcpkgs/icewm/template b/srcpkgs/icewm/template
index 70a445f4874..a011b4a8d7d 100644
--- a/srcpkgs/icewm/template
+++ b/srcpkgs/icewm/template
@@ -1,19 +1,29 @@
 # Template file for 'icewm'
 pkgname=icewm
-version=1.5.4
-revision=3
+version=1.6.2
+revision=1
 build_style=cmake
 configure_args="-DENABLE_LTO=ON -DCONFIG_LIBRSVG=ON -DENABLE_ALSA=ON -DCFGDIR=/etc/icewm"
 hostmakedepends="asciidoc gettext-devel libtool mkfontdir perl pkg-config"
 makedepends="libSM-devel libXft-devel libXinerama-devel libXpm-devel
- libXrandr-devel libao-devel librsvg-devel libsndfile-devel"
+ libXrandr-devel libao-devel librsvg-devel libsndfile-devel libXcomposite-devel fribidi-devel"
 depends="shared-mime-info"
 short_desc="Window Manager designed for speed, usability, and consistency"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="https://github.com/bbidulock/icewm"
-distfiles="https://github.com/ice-wm/icewm/releases/download/${version}/icewm-${version}.tar.xz"
-checksum=895c81d6672a3eaa91c76a0807ea8fea6789b8a3c8626635f1c11d7c5ca059ea
+homepage="https://ice-wm.org/"
+distfiles="https://github.com/ice-wm/icewm/archive/${version}.tar.gz"
+checksum=1008c17caa7d69a0bd29e5122efee278c99f0082b4c02b1e2a45c188ea9396dc
 
 # No c++ warnings for 'One Defintion Rules' and make sure LTO goes ok
 CXXFLAGS="-Wno-odr -fno-strict-aliasing"
+
+
+if [ "$CROSS_BUILD" ]; then
+	makedepends+=" libXdamage-devel"
+fi
+
+
+pre_install() {
+	cp lib/IceWM.jpg build/lib/IceWM.jpg
+}
diff --git a/srcpkgs/iio-sensor-proxy/template b/srcpkgs/iio-sensor-proxy/template
index d87d043350b..b8bd7003535 100644
--- a/srcpkgs/iio-sensor-proxy/template
+++ b/srcpkgs/iio-sensor-proxy/template
@@ -1,6 +1,6 @@
 # Template file for 'iio-sensor-proxy'
 pkgname=iio-sensor-proxy
-version=2.7
+version=2.8
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake gtk-doc pkg-config git gnome-common autoconf-archive glib-devel libtool"
@@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-3"
 homepage="https://github.com/hadess/iio-sensor-proxy"
 distfiles="$homepage/archive/$version.tar.gz"
-checksum=14e8919e1ec913660230a88bb7dcd667d32b9199e7abf3c84b34e06a1c39e87c
+checksum=3129e89777ad308400685d3da16931b404ecc4d6b0a48fe217b405e3310a8373
 patch_args="-Np1"
 
 pre_configure() {
diff --git a/srcpkgs/imgp/template b/srcpkgs/imgp/template
index 764fe7b9426..2ddccac758c 100644
--- a/srcpkgs/imgp/template
+++ b/srcpkgs/imgp/template
@@ -6,7 +6,7 @@ archs=noarch
 build_style=gnu-makefile
 depends="python3-Pillow"
 short_desc="Multi-core batch image resizer and rotator"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/jarun/imgp"
 distfiles="https://github.com/jarun/imgp/archive/v${version}.tar.gz"
diff --git a/srcpkgs/immortal/template b/srcpkgs/immortal/template
index 518af7fde1d..6f7ad74ac7b 100644
--- a/srcpkgs/immortal/template
+++ b/srcpkgs/immortal/template
@@ -9,7 +9,7 @@ go_package="${go_import_path}/cmd/immortal ${go_import_path}/cmd/immortalctl
 go_ldflags="-X main.Version=v${version}"
 hostmakedepends="git"
 short_desc="*nix cross-platform (OS agnostic) supervisor"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/immortal/immortal"
 #changelog="https://raw.githubusercontent.com/immortal/immortal/master/CHANGELOG.md"
diff --git a/srcpkgs/imv/template b/srcpkgs/imv/template
index 540b1b6b017..42c3664cf63 100644
--- a/srcpkgs/imv/template
+++ b/srcpkgs/imv/template
@@ -1,19 +1,20 @@
 # Template file for 'imv'
 pkgname=imv
-version=3.1.2
+version=4.0.1
 revision=1
 build_style=gnu-makefile
 hostmakedepends="asciidoc pkg-config"
-makedepends="SDL2_ttf-devel cmocka-devel fontconfig-devel freeimage-devel
- librsvg-devel"
+makedepends="cmocka-devel freeimage-devel glu-devel librsvg-devel libxkbcommon-devel
+ pango-devel wayland-devel"
 depends="desktop-file-utils"
 conf_files="/etc/imv_config"
 short_desc="Image viewer for X11/Wayland"
-maintainer="Arvin Ignaci <arvin.ignaci@gmail.com>"
+maintainer="bra1nwave <brainwave@openmailbox.org>"
 license="GPL-2.0-or-later, MIT"
 homepage="https://github.com/eXeC64/imv"
+changelog="https://raw.githubusercontent.com/eXeC64/imv/master/CHANGELOG"
 distfiles="https://github.com/eXeC64/imv/archive/v${version}.tar.gz"
-checksum=4d98696ea5c16b4cb6f7b3c3e7da8ee9e1814e9fc78e66ee1a2015f5dfd0d450
+checksum=b2370c7ab88056b4c832fa24ac837ac645378d9fa028f4bb8828da6a832b2e27
 conflicts="renameutils>=0"
 
 post_install() {
diff --git a/srcpkgs/incidenceeditor/template b/srcpkgs/incidenceeditor/template
index 941ed1b4f43..5b4cfd69808 100644
--- a/srcpkgs/incidenceeditor/template
+++ b/srcpkgs/incidenceeditor/template
@@ -1,7 +1,7 @@
 # Template file for 'incidenceeditor'
 pkgname=incidenceeditor
-version=19.08.0
-revision=1
+version=19.08.2
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kcoreaddons kconfig"
 makedepends="calendarsupport-devel eventviews-devel kdiagram-devel"
@@ -10,7 +10,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=43915613a5db71847be425bc4434c0e04f5410b3575cea3141ffcd99b2cdb9ea
+checksum=f2f7bf3a12af21e6f9e4a5f2ba93346e06a6988366af7b452d6268ac9fb4fc3d
 
 incidenceeditor-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/include-what-you-use/template b/srcpkgs/include-what-you-use/template
index 5ebf9a70d2a..331c4441fa2 100644
--- a/srcpkgs/include-what-you-use/template
+++ b/srcpkgs/include-what-you-use/template
@@ -1,7 +1,7 @@
 # Template file for 'include-what-you-use'
 pkgname=include-what-you-use
 version=0.12
-revision=1
+revision=2
 wrksrc="${pkgname}"
 build_style=cmake
 configure_args="-DIWYU_LLVM_ROOT_PATH=${XBPS_CROSS_BASE}/usr "
diff --git a/srcpkgs/influxdb/template b/srcpkgs/influxdb/template
index 77d8b68e1d7..4814650dc0c 100644
--- a/srcpkgs/influxdb/template
+++ b/srcpkgs/influxdb/template
@@ -1,6 +1,6 @@
 # Template file for 'influxdb'
 pkgname=influxdb
-version=1.7.7
+version=1.7.8
 revision=1
 build_style=go
 go_import_path=github.com/influxdata/influxdb
@@ -17,7 +17,7 @@ license="MIT"
 homepage="https://influxdata.com/time-series-platform/influxdb/"
 changelog="https://raw.githubusercontent.com/influxdata/influxdb/master/CHANGELOG.md"
 distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
-checksum=2ac8d6edb7eb736ba1a7c2c3fc3d529c6685a27d0a0c11ef51b02f4561e44166
+checksum=ed52925bb71ca8912e4daecce66a4c32935f396cf3f021464aab99934b41db51
 
 system_accounts="_influxdb"
 _influxdb_homedir="/var/lib/influxdb"
diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index f25db667498..092c279b09e 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,7 +1,7 @@
 # Template file for 'inkscape'
 pkgname=inkscape
 version=0.92.4
-revision=6
+revision=7
 wrksrc="${pkgname}-INKSCAPE_${version//./_}"
 build_style=gnu-configure
 configure_args="--enable-lcms --enable-poppler-cairo
diff --git a/srcpkgs/innoextract/template b/srcpkgs/innoextract/template
index 5a6766d23dd..c578d7cd0d3 100644
--- a/srcpkgs/innoextract/template
+++ b/srcpkgs/innoextract/template
@@ -1,14 +1,14 @@
 # Template file for 'innoextract'
 pkgname=innoextract
-version=1.7
-revision=4
+version=1.8
+revision=1
 build_style=cmake
 configure_args="-DCMAKE_INSTALL_PREFIX=/usr"
-hostmakedepends="boost"
+hostmakedepends="boost extra-cmake-modules"
 makedepends="boost-devel liblzma-devel"
-short_desc="A tool to unpack installers created by Inno Setup"
+short_desc="Tool to unpack installers created by Inno Setup"
 maintainer="Antonio Malcolm <antonio@antoniomalcolm.com>"
 license="Zlib"
 homepage="http://constexpr.org/innoextract/"
 distfiles="${homepage}files/${pkgname}-${version}/${pkgname}-${version}.tar.gz"
-checksum=c1efb732f2bc3a80065c5f51a0d4ea6027aebf528c609d3f336aea2055d2f0a4
+checksum=5e78f6295119eeda08a54dcac75306a1a4a40d0cb812ff3cd405e9862c285269
diff --git a/srcpkgs/intel-ucode/template b/srcpkgs/intel-ucode/template
index 109edac179b..dfcd239f283 100644
--- a/srcpkgs/intel-ucode/template
+++ b/srcpkgs/intel-ucode/template
@@ -1,6 +1,6 @@
 # Template file for 'intel-ucode'
 pkgname=intel-ucode
-version=20190618
+version=20190918
 revision=1
 archs="i686* x86_64*"
 wrksrc="Intel-Linux-Processor-Microcode-Data-Files-microcode-${version}"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="custom: Proprietary"
 homepage="https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files"
 distfiles="https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/microcode-${version}.tar.gz"
-checksum=74ec7415988d40fa53686d994cf8cb27accdbd35c5373c4c3afc2e93372ebba5
+checksum=2b6b728d351764dfbf6a9763ac96ae7e04085f382a309fed3abc0118f094c943
 repository=nonfree
 
 do_install() {
diff --git a/srcpkgs/intellij-idea-community-edition/template b/srcpkgs/intellij-idea-community-edition/template
index 961c22781af..b079e18e35c 100644
--- a/srcpkgs/intellij-idea-community-edition/template
+++ b/srcpkgs/intellij-idea-community-edition/template
@@ -1,6 +1,6 @@
 # Template file for 'intellij-idea-community-edition'
 pkgname=intellij-idea-community-edition
-version=2019.1.3
+version=2019.2.3
 revision=1
 archs="i686 x86_64"
 depends="virtual?java-environment giflib libXtst"
@@ -9,7 +9,7 @@ maintainer="John <johnz@posteo.net>"
 license="Apache-2.0"
 homepage="https://www.jetbrains.org/"
 distfiles="https://download.jetbrains.com/idea/ideaIC-${version}-no-jbr.tar.gz"
-checksum=6fbb1f99b467a7c7a39d74b835414288b113a9a136f9ba22b25ea44f87952fff
+checksum=9742d4c65b8ce20c31e993f0e04d526b0f368d7703e34ad4d6a01713b886353a
 repository=nonfree
 nopie=yes
 
@@ -27,21 +27,28 @@ do_install() {
 	rm ${DESTDIR}/usr/lib/intellij-idea/bin/fsnotifier-arm
 	rm ${DESTDIR}/usr/lib/intellij-idea/plugins/android/lib/libwebp/win -rf
 	rm ${DESTDIR}/usr/lib/intellij-idea/plugins/android/lib/libwebp/mac -rf
+	rm ${DESTDIR}/usr/lib/intellij-idea/plugins/maven/lib/maven3/lib/jansi-native/windows32 -rf
+	rm ${DESTDIR}/usr/lib/intellij-idea/plugins/maven/lib/maven3/lib/jansi-native/windows64 -rf
+	rm ${DESTDIR}/usr/lib/intellij-idea/plugins/maven/lib/maven3/lib/jansi-native/osx -rf
+	rm ${DESTDIR}/usr/lib/intellij-idea/plugins/maven/lib/maven3/lib/jansi-native/freebsd32 -rf
+	rm ${DESTDIR}/usr/lib/intellij-idea/plugins/maven/lib/maven3/lib/jansi-native/freebsd64 -rf
 	case $XBPS_TARGET_MACHINE in
 		x86_64)
 		rm ${DESTDIR}/usr/lib/intellij-idea/bin/fsnotifier
 		rm ${DESTDIR}/usr/lib/intellij-idea/bin/idea.vmoptions
-		rm ${DESTDIR}/usr/lib/intellij-idea/plugins/android/lib/libwebp/linux/libwebp_jni.so
 		rm ${DESTDIR}/usr/lib/intellij-idea/lib/pty4j-native/linux/x86 -rf
 		rm ${DESTDIR}/usr/lib/intellij-idea/lib/pty4j-native/linux/ppc64le -rf
+		rm ${DESTDIR}/usr/lib/intellij-idea/plugins/android/lib/libwebp/linux/libwebp_jni.so
+		rm ${DESTDIR}/usr/lib/intellij-idea/plugins/maven/lib/maven3/lib/jansi-native/linux32 -rf
 		;;
 		i686)
 		rm ${DESTDIR}/usr/lib/intellij-idea/bin/fsnotifier64
 		rm ${DESTDIR}/usr/lib/intellij-idea/bin/idea64.vmoptions
-		rm ${DESTDIR}/usr/lib/intellij-idea/plugins/android/lib/libwebp/linux/libwebp_jni64.so
 		rm ${DESTDIR}/usr/lib/intellij-idea/bin/libdbm64.so
 		rm ${DESTDIR}/usr/lib/intellij-idea/lib/pty4j-native/linux/x86_64 -rf
 		rm ${DESTDIR}/usr/lib/intellij-idea/lib/pty4j-native/linux/ppc64le -rf
+		rm ${DESTDIR}/usr/lib/intellij-idea/plugins/android/lib/libwebp/linux/libwebp_jni64.so
+		rm ${DESTDIR}/usr/lib/intellij-idea/plugins/maven/lib/maven3/lib/jansi-native/linux64 -rf
 		;;
 	esac
 
diff --git a/srcpkgs/inxi/template b/srcpkgs/inxi/template
index bd2c820eb76..76afaf8b7f4 100644
--- a/srcpkgs/inxi/template
+++ b/srcpkgs/inxi/template
@@ -1,17 +1,17 @@
 # Template file for 'inxi'
 pkgname=inxi
-version=3.0.34
+version=3.0.36
 revision=1
 archs=noarch
 wrksrc="inxi-${version}-1"
 depends="dmidecode file glxinfo pciutils perl usbutils xdpyinfo xprop xrandr"
 short_desc="Full featured system information script"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="bra1nwave <brainwave@openmailbox.org>"
 license="GPL-3.0-or-later"
 homepage="https://smxi.org/docs/inxi.htm"
 changelog="https://raw.githubusercontent.com/smxi/inxi/master/inxi.changelog"
 distfiles="https://github.com/smxi/inxi/archive/${version}-1.tar.gz"
-checksum=db3c331706772f68de68191abcde8f9eedabef001fc39c1683dd71f54610c77e
+checksum=2826ee041f4ce2be91063be1ba92c47f6a2b7f1ee97ed236af4c71494d6a1bd0
 
 do_install() {
 	vbin inxi
diff --git a/srcpkgs/io.elementary.calendar/template b/srcpkgs/io.elementary.calendar/template
index 6e8ac639231..5e9ae316d95 100644
--- a/srcpkgs/io.elementary.calendar/template
+++ b/srcpkgs/io.elementary.calendar/template
@@ -1,8 +1,9 @@
 # Template file for 'io.elementary.calendar'
 pkgname=io.elementary.calendar
 version=5.0
-revision=2
-wrksrc="calendar-${version}"
+revision=3
+_git_commit=46346e48b53e9d3d59d9f567b622532338f50f32
+wrksrc="calendar-${_git_commit}"
 build_style=meson
 build_helper="gir"
 hostmakedepends="intltool pkg-config vala desktop-file-utils AppStream"
@@ -13,8 +14,8 @@ short_desc="Desktop calendar app designed for elementary OS"
 maintainer="Cameron Nemo <camerontnorman@gmail.com>"
 license="GPL-3.0-only"
 homepage="https://github.com/elementary/calendar"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=f47bae213163ec87c2e4f2c0563a40be8cf080cab70094a6a4f41936803fb3fa
+distfiles="${homepage}/archive/${_git_commit}.tar.gz"
+checksum=3be3851baeed67144e5cbed209b2c1b982fe9830db13372e3051423295dee345
 
 libio.elementary.calendar_package() {
 	short_desc+=" - library"
diff --git a/srcpkgs/io.elementary.code/template b/srcpkgs/io.elementary.code/template
index e597d61eff5..68018aabb00 100644
--- a/srcpkgs/io.elementary.code/template
+++ b/srcpkgs/io.elementary.code/template
@@ -1,7 +1,7 @@
 # Template file for 'io.elementary.code'
 pkgname=io.elementary.code
 version=3.1.1
-revision=2
+revision=3
 wrksrc="code-${version}"
 build_style=meson
 hostmakedepends="pkg-config vala intltool glib-devel"
diff --git a/srcpkgs/io.elementary.files/template b/srcpkgs/io.elementary.files/template
index 4c7c798bcc3..3eb6525b0b0 100644
--- a/srcpkgs/io.elementary.files/template
+++ b/srcpkgs/io.elementary.files/template
@@ -1,6 +1,6 @@
 # Template file for 'io.elementary.files'
 pkgname=io.elementary.files
-version=4.1.9
+version=4.2.0
 revision=1
 wrksrc="files-${version}"
 build_style=meson
@@ -8,13 +8,13 @@ configure_args="-Dwith-unity=false"
 hostmakedepends="vala glib-devel pkg-config"
 makedepends="gtk+3-devel libglib-devel libgee08-devel sqlite-devel plank-devel
  libcanberra-devel granite-devel pango-devel zeitgeist-devel dbus-glib-devel
- libnotify-devel"
+ libnotify-devel libcloudproviders-devel"
 short_desc="File browser designed for elementary OS"
-maintainer="Cameron Nemo <camerontnorman@gmail.com>"
+maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/elementary/files"
 distfiles="https://github.com/elementary/files/archive/${version}.tar.gz"
-checksum=9948e6476095095f922d723279e974be249dc7ea1d5b4b5f8ea19ac6314a4546
+checksum=6151db8279f38abd7a938ea63ea43371148b0e9d9a989351f77ac51c85a10325
 
 libio.elementary.files_package() {
 	short_desc+=" - library"
diff --git a/srcpkgs/ipe/template b/srcpkgs/ipe/template
index e79cc29ab00..ee84562db3d 100644
--- a/srcpkgs/ipe/template
+++ b/srcpkgs/ipe/template
@@ -1,7 +1,7 @@
 # Template file for 'ipe'
 pkgname=ipe
-version=7.2.12
-revision=2
+version=7.2.13
+revision=1
 _tools_commit=6a2b0fd899dad765c67d3ec5cf95790d5ba090a7
 hostmakedepends="pkg-config qt5-qmake qt5-tools qt5-host-tools"
 makedepends="qt5-devel lua52-devel libjpeg-turbo-devel cairo-devel poppler-devel"
@@ -11,18 +11,15 @@ license="GPL-3.0-or-later"
 homepage="http://ipe.otfried.org/"
 distfiles="https://dl.bintray.com/otfried/generic/ipe/${version%.*}/ipe-${version}-src.tar.gz
  https://github.com/otfried/ipe-tools/archive/${_tools_commit}.tar.gz"
-checksum="7c9a78b20e7d08be5850299240b9cd2b45982ff1299a903a999d8ff8796581e3
+checksum="af3ca3d713ae99d65cfeb9cddea56c9d1a3b1e52e2fc30cd0fe017793242caa8
  143c6c99de2e5548c1666717c5b9cbba1a360d322c8f934695c2bfe0ac5c3d2c"
 
-case "$XBPS_TARGET_MACHINE" in
-	*-musl) broken=yes ;;
-esac
-
 post_extract() {
 	mv $XBPS_BUILDDIR/ipe-tools* ipe-tools
 
 	sed -i 's/xlocale.h/locale.h/g' src/ipelib/ipeplatform.cpp
 	sed -i '/cstdio/i#include <sys/types.h>' src/include/ipebase.h
+	sed -i '/cstdio/i#include <limits.h>' src/include/ipebase.h
 }
 
 do_build() {
diff --git a/srcpkgs/iperf/template b/srcpkgs/iperf/template
index 126de357156..d992f0d3d67 100644
--- a/srcpkgs/iperf/template
+++ b/srcpkgs/iperf/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-multicast --enable-threads
  ac_cv_sizeof_bool=0"
 short_desc="Perform network throughput tests"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="NCSA"
 homepage="https://iperf.fr/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}2/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/iperf3/template b/srcpkgs/iperf3/template
index 06602de120e..75a980b17df 100644
--- a/srcpkgs/iperf3/template
+++ b/srcpkgs/iperf3/template
@@ -6,7 +6,7 @@ wrksrc="iperf-${version}"
 build_style=gnu-configure
 make_build_args="iperf3_profile_LDFLAGS= iperf3_profile_CFLAGS="
 short_desc="Active measurements of the maximum achievable bandwidth on IP networks"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://software.es.net/iperf/"
 changelog="https://raw.githubusercontent.com/esnet/iperf/master/RELEASE_NOTES"
diff --git a/srcpkgs/iproute2/template b/srcpkgs/iproute2/template
index 8ea63613526..1e918d98abf 100644
--- a/srcpkgs/iproute2/template
+++ b/srcpkgs/iproute2/template
@@ -1,6 +1,6 @@
 # Template file for 'iproute2'
 pkgname=iproute2
-version=5.2.0
+version=5.3.0
 revision=1
 build_style=configure
 make_install_args="SBINDIR=/usr/bin"
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://wiki.linuxfoundation.org/networking/iproute2"
 distfiles="${KERNEL_SITE}/utils/net/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=a5b95dec26353fc71dba9bb403e9343fad2a06bd69fb154a22a2aa2914f74da8
+checksum=cb1c1e45993a3bd2438543fd4332d70f1726a6e6ff97dc613a8258c993117b3f
 
 conf_files="
  /etc/iproute2/ematch_map
diff --git a/srcpkgs/ipv6calc/template b/srcpkgs/ipv6calc/template
index e4a811678a4..40701608f4b 100644
--- a/srcpkgs/ipv6calc/template
+++ b/srcpkgs/ipv6calc/template
@@ -1,6 +1,6 @@
 # Template file for 'ipv6calc'
 pkgname=ipv6calc
-version=2.1.0
+version=2.1.1
 revision=1
 build_style=gnu-configure
 configure_args="--enable-geoip"
@@ -11,4 +11,4 @@ maintainer="Lon Willett <xgit@lonw.net>"
 license="GPL-2.0-only"
 homepage="https://www.deepspace6.net/projects/ipv6calc.html"
 distfiles="https://github.com/pbiering/ipv6calc/archive/${version}.tar.gz"
-checksum=a0ec4a1ff197210162f8a644381dd08b2c552cf50c68041748ea7e067df70080
+checksum=964957e79505cbc71ebc706a0fc0b67c6e08c55ed53335470ed7f8309eb84405
diff --git a/srcpkgs/ipvsadm/template b/srcpkgs/ipvsadm/template
index 7df99d4c5f1..9f1db9abdf9 100644
--- a/srcpkgs/ipvsadm/template
+++ b/srcpkgs/ipvsadm/template
@@ -1,15 +1,15 @@
 # Template file for 'ipvsadm'
 pkgname=ipvsadm
-version=1.29
+version=1.30
 revision=1
 hostmakedepends="pkg-config"
 makedepends="libnl3-devel popt-devel"
-short_desc="The IP Virtual Server administration utility"
+short_desc="IP Virtual Server administration utility"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://www.linuxvirtualserver.org/software/ipvs.html"
 distfiles="${KERNEL_SITE}/utils/kernel/ipvsadm/$pkgname-$version.tar.xz"
-checksum=c3de4a21d90a02c621f0c72ee36a7aa27374b6f29fd4178f33fbf71b4c66c149
+checksum=95573d70df473c9f63fc4ac496c044c69e3a6de7ccac119922210c0b44cd7a0c
 
 CFLAGS="-Du_int16_t=uint16_t -Du_int32_t=uint32_t"
 
diff --git a/srcpkgs/irssi/template b/srcpkgs/irssi/template
index bbd6a19d527..bf029cbcb4c 100644
--- a/srcpkgs/irssi/template
+++ b/srcpkgs/irssi/template
@@ -1,7 +1,7 @@
 # Template file for 'irssi'
 pkgname=irssi
-version=1.2.1
-revision=1
+version=1.2.2
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static --with-proxy --enable-true-color --with-otr"
 hostmakedepends="pkg-config"
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.irssi.org"
 distfiles="https://github.com/irssi/irssi/releases/download/${version}/irssi-${version}.tar.gz"
-checksum=fd8b0ef2544fdb691211293dded3dcf6ed87f21781db19e7df62ead797f18a06
+checksum=53182861d4d2be6db35fa7e3f0524a64d2a54a374307574dab5f5362bfea563c
 
 LDFLAGS="-lncursesw"
 subpackages="irssi-devel irssi-otr"
diff --git a/srcpkgs/iso-codes/template b/srcpkgs/iso-codes/template
index c3434030ca7..548fc15aea7 100644
--- a/srcpkgs/iso-codes/template
+++ b/srcpkgs/iso-codes/template
@@ -1,6 +1,6 @@
 # Template file for 'iso-codes'
 pkgname=iso-codes
-version=4.3
+version=4.4
 revision=1
 archs=noarch
 build_style=gnu-configure
@@ -10,4 +10,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://salsa.debian.org/iso-codes-team/iso-codes"
 distfiles="${DEBIAN_SITE}/main/i/iso-codes/${pkgname}_${version}.orig.tar.xz"
-checksum=643eb83b2d714e8650ed7112706968d057bf5b101ba71c8ef219e20f1737b141
+checksum=5124ba64e5ce6e1a73c24d1a1cdc42f6a2d0db038791b28ac77aafeb07654e86
diff --git a/srcpkgs/ispc/template b/srcpkgs/ispc/template
index a27cc129f01..2386fc710d3 100644
--- a/srcpkgs/ispc/template
+++ b/srcpkgs/ispc/template
@@ -1,10 +1,10 @@
 # Template file for 'ispc'
 pkgname=ispc
-version=1.11.0
+version=1.12.0
 revision=1
 archs="i686 x86_64"
 build_style=cmake
-hostmakedepends="clang python m4 bison flex llvm"
+hostmakedepends="clang python3 m4 bison flex llvm"
 configure_args="-DISPC_NO_DUMPS=yes"
 makedepends="ncurses-devel zlib-devel"
 short_desc="A compiler for high-performance SIMD programming on the CPU"
@@ -13,9 +13,9 @@ license="BSD"
 homepage="https://ispc.github.io"
 distfiles="https://github.com/ispc/ispc/archive/v${version}.tar.gz"
 patch_args="-p1"
-checksum=f48ef6e8a1fe5ad4fca691583bf7419f4dce1596e7ed850ff99cc017f8711b2f
+checksum=9ebc29adcdf477659b45155d0f91e61120a12084e42113d0e9f4ce5cfdfbdcab
 nopie=yes
 
 pre_build() {
 	sed -i '/tinfo/d' CMakeLists.txt
-}
\ No newline at end of file
+}
diff --git a/srcpkgs/iverilog/template b/srcpkgs/iverilog/template
index 1eb6539c2b1..971cf2a8e12 100644
--- a/srcpkgs/iverilog/template
+++ b/srcpkgs/iverilog/template
@@ -1,7 +1,7 @@
 # Template file for 'iverilog'
 pkgname=iverilog
-version=10.2
-revision=3
+version=10.3
+revision=1
 wrksrc="${pkgname}-${version/./_}"
 build_style=gnu-configure
 hostmakedepends="automake flex gperf"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://iverilog.icarus.com/"
 distfiles="https://github.com/steveicarus/iverilog/archive/v${version/./_}.tar.gz"
-checksum=f54d91821223c71c70f4735a1fb2af39c62efbccdeb9b0060ea1cf9c67647ee3
+checksum=4b884261645a73b37467242d6ae69264fdde2e7c4c15b245d902531efaaeb234
 
 nocross="draw_tt.exe: cannot execute binary file: Exec format error"
 
diff --git a/srcpkgs/iwd/template b/srcpkgs/iwd/template
index eb57cb326d5..4ec4727d82b 100644
--- a/srcpkgs/iwd/template
+++ b/srcpkgs/iwd/template
@@ -1,20 +1,20 @@
 # Template file for 'iwd'
 pkgname=iwd
-version=0.19
+version=0.22
 revision=1
 build_style=gnu-configure
-configure_args="--disable-systemd-service --enable-docs --enable-pie
+configure_args="--disable-systemd-service --enable-pie
  --enable-external-ell --enable-dbus-policy --enable-wired"
-hostmakedepends="asciidoc pkg-config automake libtool"
+hostmakedepends="python3-docutils pkg-config automake libtool"
 makedepends="readline-devel dbus-devel ell-devel"
 depends="dbus"
 checkdepends="python3"
 short_desc="Internet Wireless Daemon by Intel that aims to replace wpa_supplicant"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Peter Bui <pbui@github.bx612.space>"
 license="LGPL-2.1-or-later"
 homepage="https://iwd.wiki.kernel.org/"
 distfiles="${KERNEL_SITE}/network/wireless/iwd-${version}.tar.xz"
-checksum=f041e21531b5d4a9b705e366dc95d99434c2c337b7508d72e295620b6182ccf4
+checksum=b50c778716a2a1f9da961de0cac4711ad43ab104a67405935248f33ea8a6559a
 make_dirs="/var/lib/iwd 0600 root root
  /etc/iwd 755 root root"
 
diff --git a/srcpkgs/jack/template b/srcpkgs/jack/template
index 3303ec5a9b7..4c60f0ede3b 100644
--- a/srcpkgs/jack/template
+++ b/srcpkgs/jack/template
@@ -1,33 +1,31 @@
 # Template file for 'jack'
 pkgname=jack
-version=1.9.12
-revision=12
+version=1.9.13
+revision=1
 wrksrc="jack2-${version}"
-# XXX libffado (firewire)
-hostmakedepends="pkg-config python"
-makedepends="opus-devel libsamplerate-devel readline-devel dbus-devel celt-devel"
-depends="python-dbus"
+build_style=waf3
+configure_args="--alsa --classic --dbus"
+hostmakedepends="pkg-config"
+makedepends="opus-devel libsamplerate-devel readline-devel dbus-devel celt-devel
+ $(vopt_if ffado libffado-devel)"
+depends="python3-dbus"
 short_desc="JACK Audio Connection Kit low-latency sound server (pro audio)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2, LGPL-2.1"
-homepage="http://jackaudio.org/"
+maintainer="Daniel Eyßer <daniel.eysser@gmail.com>"
+license="GPL-2.0-or-later, LGPL-2.1-or-later"
+homepage="https://jackaudio.org/"
 distfiles="https://github.com/jackaudio/jack2/archive/v${version}.tar.gz"
-checksum=deefe2f936dc32f59ad3cef7e37276c2035ef8a024ca92118f35c9a292272e33
+checksum=2a683eef63b608b292411d66482fd45aa7fa8dc004bed4184e06f9f9ca83c075
+python_version=3
+
+# Package build options
+build_options="ffado"
+desc_option_ffado="Enable support for FireWire audio devices"
 
 if [ -z "CROSS_BUILD" ]; then
 	makedepends+=" eigen"
 fi
 
-do_configure() {
-	python2 waf configure --prefix=/usr --alsa --classic --dbus
-}
-do_build() {
-	python2 waf build ${makejobs}
-}
-
-do_install() {
-	python2 waf install --destdir=${DESTDIR}
-
+post_install() {
 	# pam_limits(8) support
 	vinstall ${FILESDIR}/jack-limitsd.conf 644 etc/security/limits.d jack.conf
 	# audio group permissions for realtime
diff --git a/srcpkgs/jansson/template b/srcpkgs/jansson/template
index 318fb67c5b5..a3c2a171822 100644
--- a/srcpkgs/jansson/template
+++ b/srcpkgs/jansson/template
@@ -4,7 +4,7 @@ version=2.12
 revision=1
 build_style=gnu-configure
 short_desc="Library for encoding, decoding and manipulating JSON data"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://www.digip.org/jansson/"
 distfiles="http://www.digip.org/jansson/releases/jansson-${version}.tar.bz2"
diff --git a/srcpkgs/jbig2dec/patches/2002_abi_compat.patch b/srcpkgs/jbig2dec/patches/2002_abi_compat.patch
new file mode 100644
index 00000000000..bd4f4c4b72f
--- /dev/null
+++ b/srcpkgs/jbig2dec/patches/2002_abi_compat.patch
@@ -0,0 +1,24 @@
+Description: Restore ABI compatibility
+Author: Julien Cristau <jcristau@debian.org>
+Source: https://bugs.debian.org/cgi-bin/bugreport.cgi?att=1;bug=940605;filename=0001-Restore-ABI-compatibility-closes-940605.patch;msg=21
+Bug-Debian: https://bugs.debian.org/940605
+Forwarded: no
+Last-Update: 2019-09-19
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- jbig2.c
++++ jbig2.c
+@@ -99,6 +99,13 @@
+     return -1;
+ }
+
++#undef jbig2_ctx_new
++Jbig2Ctx *
++jbig2_ctx_new(Jbig2Allocator *allocator, Jbig2Options options, Jbig2GlobalCtx *global_ctx, Jbig2ErrorCallback error_callback, void *error_callback_data)
++{
++    return jbig2_ctx_new_imp((allocator), (options), (global_ctx), (error_callback), (error_callback_data), JBIG2_VERSION_MAJOR, JBIG2_VERSION_MINOR);
++}
++
+ Jbig2Ctx *
+ jbig2_ctx_new_imp(Jbig2Allocator *allocator, Jbig2Options options, Jbig2GlobalCtx *global_ctx, Jbig2ErrorCallback error_callback, void *error_callback_data, int jbig2_version_major, int jbig2_version_minor)
+ {
diff --git a/srcpkgs/jbig2dec/template b/srcpkgs/jbig2dec/template
index f08ea768410..41bc57bcb54 100644
--- a/srcpkgs/jbig2dec/template
+++ b/srcpkgs/jbig2dec/template
@@ -1,7 +1,7 @@
 # Template file for 'jbig2dec'
 pkgname=jbig2dec
-version=0.16
-revision=1
+version=0.17
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool"
 makedepends="libpng-devel"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-or-later"
 homepage="https://www.jbig2dec.com"
 distfiles="https://github.com/ArtifexSoftware/jbig2dec/archive/${version}.tar.gz"
-checksum=30f706a67604237ffffaece96ae20ee86b2cfebd6277a95f8b0f2ab0f8859850
+checksum=e14c0a978332e0cad011b1aeb9aab7555c73b55e9907f08cb1c74bb6d78a7c59
 
 pre_configure() {
 	sed -i '$ d' autogen.sh
diff --git a/srcpkgs/jdupes/template b/srcpkgs/jdupes/template
index c300803d985..c42464c566a 100644
--- a/srcpkgs/jdupes/template
+++ b/srcpkgs/jdupes/template
@@ -1,6 +1,6 @@
 # Template file for 'jdupes'
 pkgname=jdupes
-version=1.13.1
+version=1.13.2
 revision=1
 build_style=gnu-makefile
 make_build_args="ENABLE_BTRFS=1"
@@ -10,7 +10,7 @@ license="MIT"
 homepage="https://github.com/jbruchon/jdupes"
 changelog="https://raw.githubusercontent.com/jbruchon/jdupes/master/CHANGES"
 distfiles="https://github.com/jbruchon/jdupes/archive/v${version}.tar.gz"
-checksum=6b68ea30b0d8fceb31ccbc07187133dbff0cc84678752e89ad3270c89322710f
+checksum=41376ace274320a77e35ffed170ff0cbca2cd0cfd0ff1cea53d7464e97d4341f
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/jemalloc/template b/srcpkgs/jemalloc/template
index 1800fc5e15d..aba5e005696 100644
--- a/srcpkgs/jemalloc/template
+++ b/srcpkgs/jemalloc/template
@@ -1,6 +1,6 @@
 # Template file for 'jemalloc'
 pkgname=jemalloc
-version=5.2.0
+version=5.2.1
 revision=1
 build_style=gnu-configure
 configure_args="je_cv_static_page_shift=12"
@@ -10,7 +10,7 @@ license="BSD-2-Clause"
 homepage="http://jemalloc.net/"
 #changelog="https://raw.githubusercontent.com/jemalloc/jemalloc/master/ChangeLog"
 distfiles="https://github.com/jemalloc/jemalloc/releases/download/${version}/jemalloc-${version}.tar.bz2"
-checksum=74be9f44a60d2a99398e706baa921e4efde82bf8fd16e5c0643c375c5851e3b4
+checksum=34330e5ce276099e2e8950d9335db5a875689a4c6a56751ef3b1d8c537f887f6
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/jenkins/files/jenkins/run b/srcpkgs/jenkins/files/jenkins/run
index 5ccc479d35f..05d8a79c68d 100755
--- a/srcpkgs/jenkins/files/jenkins/run
+++ b/srcpkgs/jenkins/files/jenkins/run
@@ -8,4 +8,4 @@ export JENKINS_HOME=/var/lib/jenkins
 cd /
 unset OLDPWD
 
-exec chpst -u jenkins:jenkins java -Xmx512m -jar /opt/jenkins/jenkins.war $OPTS
+exec chpst -u jenkins:${JENKINS_GROUPS:=jenkins} java ${JAVAOPTS:=-Xmx512m} -jar /opt/jenkins/jenkins.war $OPTS
diff --git a/srcpkgs/jenkins/template b/srcpkgs/jenkins/template
index 37902fdcdcc..bc818a21b91 100644
--- a/srcpkgs/jenkins/template
+++ b/srcpkgs/jenkins/template
@@ -1,7 +1,7 @@
 # Template file for 'jenkins'
 pkgname=jenkins
-version=2.176.2
-revision=1
+version=2.190.1
+revision=2
 build_style=fetch
 make_dirs="/var/lib/jenkins 0755 jenkins jenkins"
 depends="virtual?java-runtime"
@@ -10,7 +10,7 @@ maintainer="Renato Aguiar <renato@renag.me>"
 license="MIT"
 homepage="https://jenkins.io/"
 distfiles="http://mirrors.jenkins.io/war-stable/${version}/jenkins.war"
-checksum=33a6c3161cf8de9c8729fd83914d781319fd1569acf487c7b1121681dba190a5
+checksum=46fb1d25d9423fc66aadd648dc74b9772863a7fbbd89bfc14c873cd0c3436f05
 # Create 'jenkins' user
 system_accounts="jenkins"
 jenkins_homedir="/var/lib/jenkins"
diff --git a/srcpkgs/jgmenu/template b/srcpkgs/jgmenu/template
index 1a0c5c0163b..9cc43358ca6 100644
--- a/srcpkgs/jgmenu/template
+++ b/srcpkgs/jgmenu/template
@@ -1,6 +1,6 @@
 # Template file for 'jgmenu'
 pkgname=jgmenu
-version=3.3
+version=3.4
 revision=1
 build_style=gnu-makefile
 make_use_env=yes
@@ -15,4 +15,4 @@ license="GPL-2.0-only"
 homepage="https://www.github.com/johanmalm/jgmenu"
 changelog="https://raw.githubusercontent.com/johanmalm/jgmenu/master/docs/relnotes/${version}.txt"
 distfiles="https://www.github.com/johanmalm/jgmenu/archive/v${version}.tar.gz"
-checksum=65ae338ab604e6deadfcfcfef02f6eb54d9c25eac6c477ecb11084af25b0a453
+checksum=973491a756296e66520874f35c590d8c2de5417afcfc4f5117c47e35841cb171
diff --git a/srcpkgs/jmol/template b/srcpkgs/jmol/template
index b0a7403c1a0..d0f06d14215 100644
--- a/srcpkgs/jmol/template
+++ b/srcpkgs/jmol/template
@@ -1,6 +1,6 @@
 # Template file for 'jmol'
 pkgname=jmol
-version=14.29.42
+version=14.29.54
 revision=1
 hostmakedepends="unzip"
 depends="virtual?java-environment"
@@ -10,7 +10,7 @@ license="LGPL-2.1-or-later"
 homepage="http://jmol.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/jmol/Jmol/Version%20${version%.*}/Jmol%20${version}/Jmol-${version}-binary.tar.gz
  http://jmol.sourceforge.net/images/Jmol_icon_128.png"
-checksum="d762553e4bb3bd80c5bf900898e8afbd36c69db46f055cc8af5f29c33a8bfa3a
+checksum="ebb630d11f9d2b46e5c2f6585fc9350f044615f095d44d5a0a0fa93533288a38
  d84e5e4b5c9b440b3b90432db87e0d4bd5c8237d7d2891c174fac71f0a5a2127"
 skip_extraction="Jmol_icon_128.png"
 nocross="openjdk is nocross"
diff --git a/srcpkgs/jreen-qt5 b/srcpkgs/jreen-qt5
new file mode 120000
index 00000000000..adda684e0c9
--- /dev/null
+++ b/srcpkgs/jreen-qt5
@@ -0,0 +1 @@
+jreen
\ No newline at end of file
diff --git a/srcpkgs/jreen-qt5-devel b/srcpkgs/jreen-qt5-devel
index 9aff5c71925..adda684e0c9 120000
--- a/srcpkgs/jreen-qt5-devel
+++ b/srcpkgs/jreen-qt5-devel
@@ -1 +1 @@
-jreen-qt5
\ No newline at end of file
+jreen
\ No newline at end of file
diff --git a/srcpkgs/jreen-qt5/template b/srcpkgs/jreen-qt5/template
deleted file mode 100644
index 92f3aa73b09..00000000000
--- a/srcpkgs/jreen-qt5/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'jreen'
-pkgname=jreen-qt5
-version=1.3.0
-revision=1
-wrksrc="${pkgname%-*}-${version}"
-build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="gsasl-devel speex-devel qt5-devel zlib-devel"
-short_desc="Qt5 Jabber/XMPP extensible library"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="LGPL-3"
-homepage="https://github.com/euroelessar/jreen"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=f93c3d338c011c0945dacb14eb9da3be9541028c9eaa6f2024e688eb8a49b07e
-
-if [ -n "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-host-tools qt5-devel"
-fi
-
-jreen-qt5-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/*.so
-		vmove usr/lib/pkgconfig
-	}
-}
diff --git a/srcpkgs/jreen/template b/srcpkgs/jreen/template
index 61fbb204312..f23ba291354 100644
--- a/srcpkgs/jreen/template
+++ b/srcpkgs/jreen/template
@@ -1,20 +1,23 @@
 # Template file for 'jreen'
 pkgname=jreen
-version=1.2.1
-revision=1
+version=1.3.0
+revision=2
 build_style=cmake
-configure_args="-DJREEN_FORCE_QT4=yes"
 hostmakedepends="pkg-config"
-makedepends="gsasl-devel speex-devel qt-devel zlib-devel"
-short_desc="Extensible XMPP library written in C++ using Qt"
-maintainer="Duncan Overbruck <mail@duncano.de>"
-license="GPL-2"
-homepage="http://qutim.org/jreen"
-distfiles="http://github.com/euroelessar/${pkgname}/archive/v${version}.tar.gz"
-checksum=be5de04b6f54e47bdec92707600441a39e46add958181ad2b5b2d1bf92693fbd
+makedepends="gsasl-devel speex-devel qt5-devel zlib-devel"
+short_desc="Qt5 Jabber/XMPP extensible library"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/euroelessar/jreen"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=f93c3d338c011c0945dacb14eb9da3be9541028c9eaa6f2024e688eb8a49b07e
+
+if [ -n "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt5-host-tools qt5-devel"
+fi
 
 jreen-devel_package() {
-	depends="jreen>=${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
@@ -22,3 +25,15 @@ jreen-devel_package() {
 		vmove usr/lib/pkgconfig
 	}
 }
+
+jreen-qt5_package() {
+	build_style=meta
+	short_desc+=" (transitional dummy package)"
+	depends="${sourcepkg}>=${version}_${revision}"
+}
+
+jreen-qt5-devel_package() {
+	build_style=meta
+	short_desc+=" (transitional dummy package)"
+	depends="jreen-devel>=${version}_${revision}"
+}
diff --git a/srcpkgs/json-glib/template b/srcpkgs/json-glib/template
index ac71f34e3b4..0fbdb69905c 100644
--- a/srcpkgs/json-glib/template
+++ b/srcpkgs/json-glib/template
@@ -8,7 +8,7 @@ configure_args="-Dintrospection=$(vopt_if gir true false)"
 hostmakedepends="pkg-config glib-devel"
 makedepends="libglib-devel"
 short_desc="JSON parser for GLib-based libraries and applications"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="http://live.gnome.org/JsonGlib"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/jsonnet/template b/srcpkgs/jsonnet/template
index e1e0ef2d07c..f6074776e92 100644
--- a/srcpkgs/jsonnet/template
+++ b/srcpkgs/jsonnet/template
@@ -1,14 +1,15 @@
 # Template file for 'jsonnet'
 pkgname=jsonnet
-version=0.13.0
+version=0.14.0
 revision=1
 build_style=gnu-makefile
+make_build_args="bins"
 short_desc="Data templating language"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://github.com/google/jsonnet"
 distfiles="https://github.com/google/jsonnet/archive/v${version}.tar.gz"
-checksum=f6f0c4ea333f3423f1a7237a8a107c589354c38be8a2a438198f9f7c69b77596
+checksum=7f41cdc4cb366cfc1de3aada926a2f7e640ef025887eb05cdaf8342d6e4e088b
 
 CXXFLAGS="-Iinclude -Ithird_party/md5 -Ithird_party/json"
 CFLAGS="-Iinclude"
diff --git a/srcpkgs/juCi++/patches/libgit2-0.28.patch b/srcpkgs/juCi++/patches/libgit2-0.28.patch
deleted file mode 100644
index 9eb910f4db3..00000000000
--- a/srcpkgs/juCi++/patches/libgit2-0.28.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/src/git.cc b/src/git.cc
-index 9da2d7b..45e9007 100644
---- src/git.cc
-+++ src/git.cc
-@@ -6,7 +6,7 @@ bool Git::initialized = false;
- std::mutex Git::mutex;
- 
- std::string Git::Error::message() noexcept {
--  const git_error *last_error = giterr_last();
-+  const git_error *last_error = git_error_last();
-   if(last_error == nullptr)
-     return std::string();
-   else
-@@ -244,7 +244,7 @@ boost::filesystem::path Git::Repository::get_root_path(const boost::filesystem::
-       throw std::runtime_error(error.message());
-   }
-   auto root_path = Git::path(root.ptr, root.size);
--  git_buf_free(&root);
-+  git_buf_dispose(&root);
-   return root_path;
- }
- 
-
diff --git a/srcpkgs/juCi++/template b/srcpkgs/juCi++/template
index c7c0e3f275a..dffd1d7119d 100644
--- a/srcpkgs/juCi++/template
+++ b/srcpkgs/juCi++/template
@@ -1,9 +1,9 @@
 # Template file for 'juCi++'
 pkgname=juCi++
-version=1.4.6
-revision=5
-_libclangmm_commit="2b2f2ead1f685a9efb28ee2c0ff3cbe452a724dd"
-_tiny_commit="54b95a21cf35f8467e21038f523fd3342a77de4c"
+version=1.5.0
+revision=2
+_libclangmm_commit="687b9c231d850504ec515acb9ccab73f26c34063"
+_tiny_commit="a6773276efdbc322f1abb0159301f5502647eb52"
 wrksrc="jucipp-v${version}"
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -16,9 +16,9 @@ homepage="https://gitlab.com/cppit/jucipp"
 distfiles="https://gitlab.com/cppit/jucipp/-/archive/v${version}/jucipp-v${version}.tar.gz
 https://gitlab.com/cppit/libclangmm/-/archive/${_libclangmm_commit}/libclangmm-${_libclangmm_commit}.tar.gz
 https://gitlab.com/eidheim/tiny-process-library/-/archive/${_tiny_commit}/tiny-process-library-${_tiny_commit}.tar.gz"
-checksum="e46863c272b1ff153f8e834ec8f3902b8c7de01b4f1ef4d980e27e1d6e7bd1e4
- 8d7f83a6f4544033cd6a790cc497475521bf15ed620fbcd0014597a2d5ae6481
- 9f5713440aa0c1d4dcd665a1e264a1d0c6bed75edf1a80996b1f6e2231184d1e"
+checksum="178f25db2105ee35db0a1b9a4a19205c737b416adda7d05d3b34a2b7cecd3c87
+ bdc4ecf59f5de2a3ade04fac1c298b87c1af59653eaa2993d45adc0fa7d8389d
+ 99e0c1a2ddc59bbb30f0e6cccd9669ddc79952d4aa54ae1d6c72f9d1cf297231"
 nocross=yes #clang cannot be installed as makedepends when cross compiling
 
 post_extract() {
diff --git a/srcpkgs/juk/template b/srcpkgs/juk/template
index 5116d95e6d1..3273989dd88 100644
--- a/srcpkgs/juk/template
+++ b/srcpkgs/juk/template
@@ -1,6 +1,6 @@
 # Template file for 'juk'
 pkgname=juk
-version=19.04.3
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
@@ -12,4 +12,4 @@ maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://juk.kde.org/"
 distfiles="${KDE_SITE}/applications/${version}/src/juk-${version}.tar.xz"
-checksum=f4a272aa677ac7b5eb8c3f30234dea129e41863c5c78d812b27d30dde0f5d750
+checksum=b3f0e006d6defa58e0724088a1c99c1c412bc5764f8d1bebadf31b5f331d51d3
diff --git a/srcpkgs/julia/template b/srcpkgs/julia/template
index 3f35d555d4b..a8f107f0eee 100644
--- a/srcpkgs/julia/template
+++ b/srcpkgs/julia/template
@@ -1,12 +1,12 @@
 # Template file for 'julia'
 pkgname=julia
-version=1.1.1
-revision=2
+version=1.2.0
+revision=1
 archs="i686* x86_64*"
 build_style=gnu-makefile
 make_build_args="prefix=/usr sysconfdir=/etc USE_SYSTEM_LLVM=0 USE_LLVM_SHLIB=1
  USE_SYSTEM_PCRE=1 USE_SYSTEM_BLAS=1 USE_SYSTEM_LAPACK=1 USE_SYSTEM_GMP=1
- USE_SYSTEM_MPFR=1 USE_SYSTEM_LIBUV=0 USE_SYSTEM_LIBGIT2=1
+ USE_SYSTEM_MPFR=1 USE_SYSTEM_LIBUV=0 USE_SYSTEM_LIBGIT2=1 USE_BINARYBUILDER=0
  LIBLAPACK=-lopenblas LIBLAPACKNAME=libopenblas
  LIBBLAS=-lopenblas LIBBLASNAME=libopenblas"
 make_install_args="$make_build_args"
@@ -22,10 +22,10 @@ maintainer="Adam Beckmeyer <adam_git@thebeckmeyers.xyz>"
 license="MIT"
 homepage="https://julialang.org"
 distfiles="https://github.com/JuliaLang/julia/releases/download/v${version}/julia-${version}-full.tar.gz"
-checksum=3c5395dd3419ebb82d57bcc49dc729df3b225b9094e74376f8c649ee35ed79c2
+checksum=2419b268fc5c3666dd9aeb554815fe7cf9e0e7265bc9b94a43957c31a68d9184
 nocross=yes
 # Falsely detects dependency on libllvm
-skiprdeps="/usr/lib/libjulia.so.1.1 /usr/lib/julia/libllvmcalltest.so"
+skiprdeps="/usr/lib/libjulia.so.1.2 /usr/lib/julia/libllvmcalltest.so"
 
 case "$XBPS_TARGET_MACHINE" in
 *-musl)
diff --git a/srcpkgs/jwm-settings-manager/template b/srcpkgs/jwm-settings-manager/template
index 5dbaf7e2488..fc09f90e26c 100644
--- a/srcpkgs/jwm-settings-manager/template
+++ b/srcpkgs/jwm-settings-manager/template
@@ -6,7 +6,7 @@ build_style=cmake
 hostmakedepends="pkg-config fltk"
 makedepends="fltk-devel libXpm-devel"
 short_desc="Full configuration manager for JWM"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Israel-D/jwm-settings-manager"
 distfiles="https://github.com/Israel-D/jwm-settings-manager/archive/${version}.tar.gz"
diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 83ec9c394a8..f6592f9b5e7 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,6 +1,6 @@
 # Template file for 'k3b'
 pkgname=k3b
-version=19.04.3
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake"
@@ -14,5 +14,5 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/multimedia/k3b/"
 distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=c92b7b811f47d31b107aa14fb1e21d01a8635c208c1503f4ddf183522501df61
+checksum=a16796a873018bc5fd9f562297fea56d3f6d32a1e903a3e145814ea7d9be5209
 
diff --git a/srcpkgs/k3s/files/k3s-agent/log/run b/srcpkgs/k3s/files/k3s-agent/log/run
new file mode 100755
index 00000000000..6a3f7aaa612
--- /dev/null
+++ b/srcpkgs/k3s/files/k3s-agent/log/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec logger -t k3s-agent
diff --git a/srcpkgs/k3s/files/k3s-agent/run b/srcpkgs/k3s/files/k3s-agent/run
new file mode 100755
index 00000000000..48244292cf9
--- /dev/null
+++ b/srcpkgs/k3s/files/k3s-agent/run
@@ -0,0 +1,10 @@
+#!/bin/sh
+set --
+[ -r /etc/k3s/config ] && . /etc/k3s/config
+[ -r conf ] && . ./conf
+if [ 0 = $# ]; then
+  set -- \
+    ${K3S_SERVER:+--server="${K3S_SERVER}"} \
+    ${K3S_TOKEN:+--token="${K3S_TOKEN}"}
+fi
+exec k3s agent ${K3S_OPTIONS} ${K3S_AGENT_OPTIONS} "$@"
diff --git a/srcpkgs/k3s/files/k3s-server/log/run b/srcpkgs/k3s/files/k3s-server/log/run
new file mode 100755
index 00000000000..e78f852bb29
--- /dev/null
+++ b/srcpkgs/k3s/files/k3s-server/log/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec logger -t k3s-server
diff --git a/srcpkgs/k3s/files/k3s-server/run b/srcpkgs/k3s/files/k3s-server/run
new file mode 100755
index 00000000000..03ada62d4a4
--- /dev/null
+++ b/srcpkgs/k3s/files/k3s-server/run
@@ -0,0 +1,5 @@
+#!/bin/sh
+set --
+[ -r /etc/k3s/config ] && . /etc/k3s/config
+[ -r ./conf ] && . ./conf
+exec k3s server ${K3S_OPTIONS} ${K3S_SERVER_OPTIONS} "$@"
diff --git a/srcpkgs/k3s/template b/srcpkgs/k3s/template
new file mode 100644
index 00000000000..1657a9b7823
--- /dev/null
+++ b/srcpkgs/k3s/template
@@ -0,0 +1,65 @@
+# Template file for 'k3s'
+pkgname=k3s
+version=0.9.1
+revision=2
+create_wrksrc=yes
+build_wrksrc="${pkgname}-${version}"
+build_style=go
+go_import_path="github.com/rancher/k3s"
+hostmakedepends="git pkg-config"
+makedepends="libseccomp-devel"
+short_desc="Lightweight Kubernetes"
+maintainer="Cameron Nemo <cnemo@tutanota.com>"
+license="Apache-2.0"
+homepage="https://k3s.io"
+# _traefik_* variables' values from scripts/download in source distfile
+_traefik_version="1.77.1"
+_traefik_file="traefik-${_traefik_version}.tgz"
+distfiles="https://${go_import_path}/archive/v${version}.tar.gz
+ https://kubernetes-charts.storage.googleapis.com/${_traefik_file}"
+checksum="dee3ddfcdb61f292bcfe778d7677e436309511e15c6bbdd326ebec42ea41bbac
+ 15dd78d136d7c9bae7144072052ef6cd12821ae081a7c085f145d834d96c5d5c"
+skip_extraction="${_traefik_file}"
+conflicts="kubernetes"
+
+_git_commit=755bd1c63bafe80f9b5fe8d4bba527f988625364
+
+pre_build() {
+	# Modify version.sh to use template variables' values.
+	vsed -i scripts/version.sh -e '
+		s@^COMMIT=.*@COMMIT='"${_git_commit}"'@;
+		s@^GIT_TAG=.*@GIT_TAG=v'"${version}"'@
+		'
+	# Remove -s (strip) and -w (no dwarf) linker arguments.
+	vsed -i scripts/build -e 's@-w -s@@'
+	# Remove BIN_SUFFIX, nullify GOARCH for go generate. The latter
+	# is needed because 'go run' will try to run binaries for the
+	# target given by GOOS/GOARCH. The -x prints what 'go generate'
+	# is executing. CGO_ENABLED is set to 0 because cross builds
+	# won't necessarily be able to handle 64-bit builds performed by
+	# 'go run'.
+	vsed -i scripts/package-cli -e '
+		s@BIN_SUFFIX="[^"]\+"@BIN_SUFFIX=""@;
+		s@^go generate$@CGO_ENABLED=0 GOARCH= & -x@;
+		s@-w -s@@g
+		'
+
+	# Recreate behavior of scripts/download minus downloading
+	# anything or having anything to do with busybox.
+	mkdir -p bin
+
+	mkdir -p build/static/charts
+	cp ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_traefik_file} build/static/charts/${_traefik_file}
+}
+
+do_build() {
+	scripts/build
+	scripts/package-cli
+}
+
+do_install() {
+	vbin dist/artifacts/k3s
+	vbin dist/artifacts/hyperkube
+	vsv k3s-server
+	vsv k3s-agent
+}
diff --git a/srcpkgs/kColorPicker-devel b/srcpkgs/kColorPicker-devel
new file mode 120000
index 00000000000..bc2cf83a861
--- /dev/null
+++ b/srcpkgs/kColorPicker-devel
@@ -0,0 +1 @@
+kColorPicker
\ No newline at end of file
diff --git a/srcpkgs/kColorPicker/template b/srcpkgs/kColorPicker/template
new file mode 100644
index 00000000000..954ae0e8a76
--- /dev/null
+++ b/srcpkgs/kColorPicker/template
@@ -0,0 +1,28 @@
+# Template file for 'kColorPicker'
+pkgname=kColorPicker
+version=0.1.0
+revision=1
+build_style=cmake
+configure_args="-DBUILD_TESTS=ON -DBUILD_EXAMPLE=OFF -DBUILD_SHARED_LIBS=ON"
+hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools"
+makedepends="qt5-devel"
+short_desc="Qt based Color Picker with popup menu"
+maintainer="John <johnz@posteo.net>"
+license="LGPL-2.0-or-later"
+homepage="https://github.com/DamirPorobic/kColorPicker"
+distfiles="https://github.com/DamirPorobic/kColorPicker/archive/v${version}.tar.gz"
+checksum=104a5c8c507786219c99ab62511189f4f7fb9435f88c11774e78ed628509ddb5
+
+pre_check() {
+	export QT_QPA_PLATFORM=offscreen
+}
+
+kColorPicker-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/kImageAnnotator-devel b/srcpkgs/kImageAnnotator-devel
new file mode 120000
index 00000000000..d26188257d4
--- /dev/null
+++ b/srcpkgs/kImageAnnotator-devel
@@ -0,0 +1 @@
+kImageAnnotator
\ No newline at end of file
diff --git a/srcpkgs/kImageAnnotator/template b/srcpkgs/kImageAnnotator/template
new file mode 100644
index 00000000000..90defcba517
--- /dev/null
+++ b/srcpkgs/kImageAnnotator/template
@@ -0,0 +1,28 @@
+# Template file for 'kImageAnnotator'
+pkgname=kImageAnnotator
+version=0.1.0
+revision=2
+build_style=cmake
+configure_args="-DBUILD_TESTS=ON -DBUILD_EXAMPLE=OFF -DBUILD_SHARED_LIBS=ON"
+hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools"
+makedepends="qt5-devel kColorPicker-devel"
+short_desc="Tool for annotating images"
+maintainer="John <johnz@posteo.net>"
+license="LGPL-2.0-or-later"
+homepage="https://github.com/DamirPorobic/kImageAnnotator"
+distfiles="https://github.com/DamirPorobic/kImageAnnotator/archive/v${version}.tar.gz"
+checksum=5172586c337d018fe988659ea728e023ca660becd5c2e10304438972aff1eced
+
+pre_check() {
+	export QT_QPA_PLATFORM=offscreen
+}
+
+kImageAnnotator-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/kaccounts-integration/template b/srcpkgs/kaccounts-integration/template
index 0bc23e4af89..9e31e95ecd5 100644
--- a/srcpkgs/kaccounts-integration/template
+++ b/srcpkgs/kaccounts-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-integration'
 pkgname=kaccounts-integration
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake"
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-integration.git/"
 distfiles="${KDE_SITE}/applications/${version}/src/kaccounts-integration-${version}.tar.xz"
-checksum=b6602a1270037c8c9dc366e3bf6ddf6d7dcd14ca66623e3ecc6641fd474c0d2a
+checksum=b422c23eb3eefc3a79c4ccb9360ae6269a86982575e981bb949c0782f1f813ce
 nocross="libaccounts-qt5 is nocross"
 
 kaccounts-integration-devel_package() {
diff --git a/srcpkgs/kaccounts-providers/template b/srcpkgs/kaccounts-providers/template
index f6724171147..178c10c4abe 100644
--- a/srcpkgs/kaccounts-providers/template
+++ b/srcpkgs/kaccounts-providers/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-providers'
 pkgname=kaccounts-providers
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool qt5-qmake qt5-host-tools pkg-config"
@@ -10,5 +10,5 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-providers.git/"
 distfiles="${KDE_SITE}/applications/${version}/src/kaccounts-providers-${version}.tar.xz"
-checksum=9fc235e2140e76e4b95589a8a5b1e98f7aac00f4c9ad8ba774be0d0d360df8c3
+checksum=d5ad6882ff151d2f0cff2b76a83e38cf37c72a0dbdf4a0aff64420903266a309
 nocross="kaccounts-integration is nocross"
diff --git a/srcpkgs/kactivities5-stats/template b/srcpkgs/kactivities5-stats/template
index a7812efec66..b73aa726d3e 100644
--- a/srcpkgs/kactivities5-stats/template
+++ b/srcpkgs/kactivities5-stats/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5-stats'
 pkgname=kactivities5-stats
-version=5.61.0
+version=5.63.0
 revision=1
 wrksrc="${pkgname/5/}-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://api.kde.org/frameworks/kactivities/html/index.html"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname/5/}-${version}.tar.xz"
-checksum=9062eb0f189f1b50674e65a7db9a4b821c628acd1ac650000cebbf1f7bdf0068
+checksum=85f817fd3380be1e4641cb280c1b56e697bd8eabf386784f1876da2b12f5eea0
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
@@ -23,6 +23,7 @@ kactivities5-stats-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt5/mkspecs
 		vmove usr/lib/cmake
 		vmove "usr/lib/*.so"
diff --git a/srcpkgs/kactivities5/template b/srcpkgs/kactivities5/template
index cf154f2302f..85578669aa0 100644
--- a/srcpkgs/kactivities5/template
+++ b/srcpkgs/kactivities5/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5'
 pkgname=kactivities5
-version=5.61.0
+version=5.63.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kactivities"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=0d7d7e5bd68541ad1dcf1f96c7205330cb7b075c6ff0d8b46774e781eff84af5
+checksum=fa08c5de949efc6ec972c0e0e2234d445ed88e0df30fa9b683891025fec9050e
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools"
@@ -26,6 +26,7 @@ kactivities5-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt5/mkspecs
 		vmove usr/lib/cmake
 		vmove "usr/lib/*.so"
diff --git a/srcpkgs/kactivitymanagerd/template b/srcpkgs/kactivitymanagerd/template
index db1c3bb19be..4120ce48dfd 100644
--- a/srcpkgs/kactivitymanagerd/template
+++ b/srcpkgs/kactivitymanagerd/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivitymanagerd'
 pkgname=kactivitymanagerd
-version=5.16.4
+version=5.17.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/plasma/kactivitymanagerd"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=a287fc9624390c8493a35a5440e2161d1bb67252b6986231acb6268440bb4770
+checksum=23ef9043a968d0f6920b1ca677673c09282c94482be1bfdf5fb38e7b2d09fe3f
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DRUN_RESULT_VAR=0"
diff --git a/srcpkgs/kaddressbook/template b/srcpkgs/kaddressbook/template
index cd2c5972eb8..54ee81f552f 100644
--- a/srcpkgs/kaddressbook/template
+++ b/srcpkgs/kaddressbook/template
@@ -1,7 +1,7 @@
 # Template file for 'kaddressbook'
 pkgname=kaddressbook
-version=19.08.0
-revision=1
+version=19.08.2
+revision=2
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kconfig
@@ -12,4 +12,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/office/kaddressbook"
 distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=9639047be5c5ea245844831e315fa0f0baca40d243f611a98bbab3503af127cf
+checksum=4d67480ebf8ee96fcde85e66f8ad32119b006e36c87f4e4ac20ecfa967599260
diff --git a/srcpkgs/kak-lsp/template b/srcpkgs/kak-lsp/template
index 99154ab54b0..e80a7ce5044 100644
--- a/srcpkgs/kak-lsp/template
+++ b/srcpkgs/kak-lsp/template
@@ -1,6 +1,6 @@
 # Template file for 'kak-lsp'
 pkgname=kak-lsp
-version=6.2.1
+version=7.0.0
 revision=1
 build_style=cargo
 short_desc="Language Server Protocol client for Kakoune"
@@ -8,7 +8,7 @@ maintainer="Emerson Ferreira <me@skrps.me>"
 license="Unlicense"
 homepage="https://github.com/ul/kak-lsp"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=00ca9f8b9a875790a24030fd1a7304c84cd94aa918be6846af5ef84898ef569b
+checksum=94af509062471a4e2dac760ac10704c05fb803983509cd85e20c6036240ef4c4
 
 post_install() {
 	vlicense UNLICENSE
diff --git a/srcpkgs/kalarm/template b/srcpkgs/kalarm/template
index 645193252f6..50501dd8e74 100644
--- a/srcpkgs/kalarm/template
+++ b/srcpkgs/kalarm/template
@@ -1,7 +1,7 @@
 # Template file for 'kalarm'
 pkgname=kalarm
-version=19.08.0
-revision=1
+version=19.08.2
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools libxslt kdoctools
  kauth kconfig"
@@ -11,4 +11,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kalarm"
 distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=e0ddabb2abfc2d593ec88864179c30eda219f7db4c25b7fc9951ac3b388eee84
+checksum=54d61b469042d27b8df903c5fc95dd68c1d108218f1402a733d974ab02576d24
diff --git a/srcpkgs/kalarmcal/template b/srcpkgs/kalarmcal/template
index aa9bd7830ad..25da48afe2b 100644
--- a/srcpkgs/kalarmcal/template
+++ b/srcpkgs/kalarmcal/template
@@ -1,6 +1,6 @@
 # Template file for 'kalarmcal'
 pkgname=kalarmcal
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=5f764d58716e7d271fac4cb3a4df6ab157014533782c47c38bacab59ca669419
+checksum=4dc6e1cd8a9cbf6e3f8e593e68ef6fa912819ece56efa64852ab33e3f582e6b7
 
 kalarmcal-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kapidox/template b/srcpkgs/kapidox/template
index 84f1082d08a..4e3cbb00ff0 100644
--- a/srcpkgs/kapidox/template
+++ b/srcpkgs/kapidox/template
@@ -1,6 +1,6 @@
 # Template file for 'kapidox'
 pkgname=kapidox
-version=5.61.0
+version=5.63.0
 revision=1
 archs=noarch
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <johnz@posteo.net>"
 license="BSD-2-Clause"
 homepage="https://projects.kde.org/projects/frameworks/kapidox"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3c948c87c7f7b16a3835f7df8387c110efe5fefecf8a7d6ffa1cae647be0669f
+checksum=29ccea641395a73a83c040a63aea25b14c7318352a6f9321c62b8cf32fcc9733
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/karchive/template b/srcpkgs/karchive/template
index cd42e95c827..29953fff154 100644
--- a/srcpkgs/karchive/template
+++ b/srcpkgs/karchive/template
@@ -1,6 +1,6 @@
 # Template file for 'karchive'
 pkgname=karchive
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/frameworks/karchive"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=457ed420449630625cb161fcc9bedc7c6a16527f48d6db4008aea76cdb948387
+checksum=fa733531ddc6059eb92d4eaceb5b84177ee832e9303afdf229bf25da979ffe7a
 
 karchive-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kate5/template b/srcpkgs/kate5/template
index a133a7af785..2fc5bdf1377 100644
--- a/srcpkgs/kate5/template
+++ b/srcpkgs/kate5/template
@@ -1,6 +1,6 @@
 # Template file for 'kate5'
 pkgname=kate5
-version=19.08.0
+version=19.08.2
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-3.0-or-later, LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/applications/kate"
 distfiles="${KDE_SITE}/applications/${version}/src/${pkgname%5}-${version}.tar.xz"
-checksum=6acc3172429191ab47722d788f324292ea5ee2f1e419d48c72200579b9b30878
+checksum=9897f652996e3ebca8a749562cc2d609d704c80b08ec4716622def38f5980b47
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DKF5_HOST_TOOLING=/usr/lib/cmake"
diff --git a/srcpkgs/kauth/template b/srcpkgs/kauth/template
index 8285e54ee4e..7c78e0fde61 100644
--- a/srcpkgs/kauth/template
+++ b/srcpkgs/kauth/template
@@ -1,6 +1,6 @@
 # Template file for 'kauth'
 pkgname=kauth
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kauth"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b04458f32046b2dd61b48118646180df63d2c843cb2d53560aaa15168df087f1
+checksum=2c4917f0bb49f09b232aeda9d3282eef0e235124fab1dab0deeae2ae7a7df321
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kcoreaddons qt5-host-tools qt5-qmake qt5-tools-devel polkit-qt5-devel"
diff --git a/srcpkgs/kbfs b/srcpkgs/kbfs
new file mode 120000
index 00000000000..c02e554306a
--- /dev/null
+++ b/srcpkgs/kbfs
@@ -0,0 +1 @@
+keybase
\ No newline at end of file
diff --git a/srcpkgs/kbfs/template b/srcpkgs/kbfs/template
deleted file mode 100644
index 5bd004bae82..00000000000
--- a/srcpkgs/kbfs/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'kbfs'
-pkgname=kbfs
-version=2.11.0
-revision=1
-build_style=go
-go_import_path="github.com/keybase/kbfs"
-go_package="${go_import_path}/kbfsfuse ${go_import_path}/kbfsgit/git-remote-keybase ${go_import_path}/kbfstool ${go_import_path}/redirector"
-go_build_tags="production"
-depends="keybase util-linux"
-short_desc="Keybase Filesystem"
-maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://keybase.io/docs/kbfs"
-distfiles="https://github.com/keybase/kbfs/archive/v${version}.tar.gz"
-checksum=0e97cab1c90592035ec6763e22c78c08a95dd3467419d15b9e45b3d0887b594d
-
-post_install() {
-	mv ${DESTDIR}/usr/bin/redirector ${DESTDIR}/usr/bin/keybase-redirector
-	# setuid
-	chmod 4755 ${DESTDIR}/usr/bin/keybase-redirector
-
-	vlicense LICENSE
-}
diff --git a/srcpkgs/kbookmarks/template b/srcpkgs/kbookmarks/template
index 9e7dff7a8c4..4ac73909960 100644
--- a/srcpkgs/kbookmarks/template
+++ b/srcpkgs/kbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'kbookmarks'
 pkgname=kbookmarks
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-only"
 homepage="https://projects.kde.org/projects/frameworks/kbookmarks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=24f87ff1acc5f0c257518f67af277b454566e607f82eb09e75b4a6ed02403377
+checksum=5be8d8640f7a4519c25c55e59ea7a640ea48a2646560a0ea2c9ff95374153904
 
 kbookmarks-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcachegrind/template b/srcpkgs/kcachegrind/template
index 1be4cb29aca..04600c9f09f 100644
--- a/srcpkgs/kcachegrind/template
+++ b/srcpkgs/kcachegrind/template
@@ -1,10 +1,10 @@
 # Template file for 'kcachegrind'
 pkgname=kcachegrind
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules kconfig kcoreaddons kdoctools
- pkg-config python qt5-host-tools qt5-qmake"
+hostmakedepends="extra-cmake-modules kcoreaddons kdoctools
+ pkg-config qt5-host-tools qt5-qmake"
 makedepends="kparts-devel qt5-devel"
 depends="python hicolor-icon-theme"
 short_desc="Visualization of Performance Profiling Data"
@@ -12,4 +12,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/development/kcachegrind/"
 distfiles="${KDE_SITE}/applications/${version}/src/kcachegrind-${version}.tar.xz"
-checksum=676dd522eb9976789da17eea1dc103c9c67b6df7bfa70d998e29c0e7dde0608b
+checksum=baf17a5c11f21deb7b019a7e3a9819348ec8d20af5c8c4a6108b96266e425b46
diff --git a/srcpkgs/kcalc/template b/srcpkgs/kcalc/template
index cbcacfc0bac..183963ce4f1 100644
--- a/srcpkgs/kcalc/template
+++ b/srcpkgs/kcalc/template
@@ -1,14 +1,14 @@
 # Template file for 'kcalc'
 pkgname=kcalc
-version=19.04.3
+version=19.08.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules kcoreaddons kconfig kdoctools python qt5-host-tools qt5-qmake"
-makedepends="gmp-devel kinit-devel kparts-devel qt5-devel"
+makedepends="gmp-devel kinit-devel kparts-devel qt5-devel mpfr-devel"
 short_desc="Simple and scientific calculator"
 maintainer="Norbert Vegh <vegh@norvegh.com>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kcalc/"
 distfiles="${KDE_SITE}/applications/${version}/src/kcalc-${version}.tar.xz"
-checksum=42da5439af4f59402d27f2c48d4ee9c68d4a84bfda8d16a5ab9d7ab6bdcc02d5
+checksum=94a6d004266813449b6b9efbe0e3b0da3e5368059134668277a344a720f65fd9
diff --git a/srcpkgs/kcalcore/template b/srcpkgs/kcalcore/template
index 35408d42a75..f8d6810fdd0 100644
--- a/srcpkgs/kcalcore/template
+++ b/srcpkgs/kcalcore/template
@@ -1,6 +1,6 @@
 # Template file for 'kcalcore'
 pkgname=kcalcore
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python bison"
@@ -10,7 +10,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/applications/${version}/src/kcalcore-${version}.tar.xz"
-checksum=7c7bbca70ada8c8317d6d3d91e0357b2b5886328189423e0b7fac1d326f8ed85
+checksum=f7d33ec65cf954a0460258694ecb2e14bf6c00cee5ea9fdc3e015e78947d896a
 
 case $XBPS_TARGET_MACHINE in
 	*-musl) CFLAGS="-D_GNU_SOURCE";;
diff --git a/srcpkgs/kcalutils/template b/srcpkgs/kcalutils/template
index bd17013d547..5c97991a0c2 100644
--- a/srcpkgs/kcalutils/template
+++ b/srcpkgs/kcalutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcalutils'
 pkgname=kcalutils
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/applications/${version}/src/kcalutils-${version}.tar.xz"
-checksum=ce0cb6633d7f85fdfa54085710c421f0465b286e9236f55c0297737abdfbaf7e
+checksum=3f789a18348152f9fc70965dbc2e9a8bd0ba872968c3d0631afacd0e78d3ce13
 
 kcalutils-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kcharselect/template b/srcpkgs/kcharselect/template
index 5a5afc15f60..368e9579a11 100644
--- a/srcpkgs/kcharselect/template
+++ b/srcpkgs/kcharselect/template
@@ -1,6 +1,6 @@
 # Template file for 'kcharselect'
 pkgname=kcharselect
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="travankor <travankor@tuta.io>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kcharselect/"
 distfiles="${KDE_SITE}/applications/${version}/src/kcharselect-${version}.tar.xz"
-checksum=31caf29e82327d7e31badff141dd7d5f179b87e9547c322b074f58bc07063020
+checksum=ff2a8c78fc4a12dd727e8ad8677216d5a480a8c82aff97269397ee8ae01e36df
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kdoctools python qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kcmutils/template b/srcpkgs/kcmutils/template
index ab43f153b67..9381f9f0727 100644
--- a/srcpkgs/kcmutils/template
+++ b/srcpkgs/kcmutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcmutils'
 pkgname=kcmutils
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-or-later, LGPL-2.0-only"
 homepage="https://projects.kde.org/projects/frameworks/kcmutils"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b8b79ef2f4513fbe5e4c61cf4726ed33b95efffabdd512fcc2dcff23c23cdfa7
+checksum=c8bc32268307656b73aaa9c5c28ba05c92bd5e8a85eaab1772a2e6e774b222e0
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python"
diff --git a/srcpkgs/kcodecs/template b/srcpkgs/kcodecs/template
index 86da1801e9f..96b04beb038 100644
--- a/srcpkgs/kcodecs/template
+++ b/srcpkgs/kcodecs/template
@@ -1,6 +1,6 @@
 # Template file for 'kcodecs'
 pkgname=kcodecs
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kcodecs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4604323e44c1be7547f25b43b71bd541048c3d036a7fc5ca74e5ece9792ff5ee
+checksum=30214dcc48ac4214c4f0b7bb0e36174fd8de13d4e9cd210e41d4ff86e919b870
 
 kcodecs-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kcolorchooser/template b/srcpkgs/kcolorchooser/template
index 9a113dc2d95..3fbf0f825e4 100644
--- a/srcpkgs/kcolorchooser/template
+++ b/srcpkgs/kcolorchooser/template
@@ -1,6 +1,6 @@
 # Template file for 'kcolorchooser'
 pkgname=kcolorchooser
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="travankor <travankor@tuta.io>"
 license="MIT"
 homepage="https://www.kde.org/applications/graphics/kcolorchooser"
 distfiles="${KDE_SITE}/applications/${version}/src/kcolorchooser-${version}.tar.xz"
-checksum=bd9fa8940218f686b0a2d8c6fbe38b996646508a1908dd53925c2513f6fd39eb
+checksum=4eb50f314b190f1980e73212a45fe86db39f278f789288cd76cb0763f3176edc
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel"
diff --git a/srcpkgs/kcompletion/template b/srcpkgs/kcompletion/template
index 650cbb6b61d..09435678b91 100644
--- a/srcpkgs/kcompletion/template
+++ b/srcpkgs/kcompletion/template
@@ -1,6 +1,6 @@
 # Template file for 'kcompletion'
 pkgname=kcompletion
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kcompletion"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=68697be65d6c9e0053fc3e504170d23c3162c05a0a9027249c575bc6dc8bd3ec
+checksum=4bc7458e44fe5fba0e18aa296236de4523acb47b51f73d5f0a8ca904def5ef81
 
 if [ "CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools-devel"
@@ -22,6 +22,7 @@ kcompletion-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/qt5/mkspecs
+		vmove usr/lib/qt5/plugins/designer
 		vmove usr/lib/cmake
 		vmove "usr/lib/*.so"
 	}
diff --git a/srcpkgs/kconfig/template b/srcpkgs/kconfig/template
index 7586fda6649..ab78d8832cb 100644
--- a/srcpkgs/kconfig/template
+++ b/srcpkgs/kconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfig'
 pkgname=kconfig
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=94c0e292a5d57e014aa745be6b59a989118ead1252d56c768f2719b5c6471372
+checksum=6165d493323562026a0341c0e2fbad6a603fa7bd92353f7951844797f37640f9
 
 kconfig-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kconfigwidgets/template b/srcpkgs/kconfigwidgets/template
index 7b5fcb2b959..9ff9e58631c 100644
--- a/srcpkgs/kconfigwidgets/template
+++ b/srcpkgs/kconfigwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfigwidgets'
 pkgname=kconfigwidgets
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kconfigwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4cc1e55c5f994abbec03b32bef73bdf54c2613199a446ad63f4ced6e3a0e2165
+checksum=e577c68523721cbdbe2f019098f382cdcd4db4c805fb68d86c2b7d6fb76b1d25
 
 kconfigwidgets-devel_package() {
 	short_desc+=" - development"
@@ -20,6 +20,7 @@ kconfigwidgets-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/qt5/mkspecs
+		vmove usr/lib/qt5/plugins/designer
 		vmove usr/lib/cmake
 		vmove "usr/lib/*.so"
 	}
diff --git a/srcpkgs/kcontacts/template b/srcpkgs/kcontacts/template
index db382cc59c2..cba2a980065 100644
--- a/srcpkgs/kcontacts/template
+++ b/srcpkgs/kcontacts/template
@@ -1,17 +1,18 @@
 # Template file for 'kcontacts'
 pkgname=kcontacts
-version=19.08.0
+reverts="19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1"
+version=5.63.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python
  kcoreaddons"
 makedepends="qt5-devel kcoreaddons-devel ki18n-devel kconfig-devel kcodecs-devel"
 short_desc="Address book API for KDE"
-maintainer="Helmut Pozimski <helmut@pozimski.eu>"
+maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/applications/kcontacts"
-distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=b245832fe6150a915d3bcbf1ec4c2c37b6aab541b2568f4955dcd76afa1c486e
+distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
+checksum=10f0bb2cbcab33332830763a0f9313c0c5919c0d5dc974908965b24d68614577
 
 kcontacts-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcoreaddons/template b/srcpkgs/kcoreaddons/template
index f156f339f63..84f70cd6acd 100644
--- a/srcpkgs/kcoreaddons/template
+++ b/srcpkgs/kcoreaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kcoreaddons'
 pkgname=kcoreaddons
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kcoreaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6a4ea2eca77944c24fe63d2f7111913db721533d5971497cb5bdd2cac896e813
+checksum=4d6e76e2a191b7a4c5f46b4cf8ed14edee25eb4357a82b1dc8f4753d1d47c5f0
 
 post_install() {
 	vsed -e 's;${_IMPORT_PREFIX};/usr;g' \
diff --git a/srcpkgs/kcrash/template b/srcpkgs/kcrash/template
index cec785ec607..22877acfd88 100644
--- a/srcpkgs/kcrash/template
+++ b/srcpkgs/kcrash/template
@@ -1,6 +1,6 @@
 # Template file for 'kcrash'
 pkgname=kcrash
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kcrash"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=83e6333ea0cd7d1ded3fa84f126e3c86a010d7bdb7fd183e7c5d42a8b8e74db8
+checksum=8c3baa5143eb6927c9ed0b90183ab76ea880df016fd0482f73ca41e6fa5f83f6
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools kwindowsystem-devel kcoreaddons"
diff --git a/srcpkgs/kcron/template b/srcpkgs/kcron/template
index b000a5759c4..3742daff90c 100644
--- a/srcpkgs/kcron/template
+++ b/srcpkgs/kcron/template
@@ -1,14 +1,14 @@
 # Template file for 'kcron'
 pkgname=kcron
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules kconfig kcoreaddons kdoctools
- pkg-config python qt5-host-tools qt5-qmake"
+hostmakedepends="extra-cmake-modules kcoreaddons kdoctools
+ pkg-config qt5-host-tools qt5-qmake"
 makedepends="kparts-devel qt5-devel"
 short_desc="KDE Configure and schedule tasks"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://userbase.kde.org/System_Settings/Task_Scheduler"
 distfiles="${KDE_SITE}/applications/${version}/src/kcron-${version}.tar.xz"
-checksum=1594aafc964d8e6c9ff31056d8f6f9ca6ee51ef9067b3ee1c991744baf54a88c
+checksum=270ee81cba5ef9d92158a3fc71cf8c50c658468018eb0415c9d3d0bc7abea5e5
diff --git a/srcpkgs/kdav/template b/srcpkgs/kdav/template
index 75e136b6286..fd84cb81c4a 100644
--- a/srcpkgs/kdav/template
+++ b/srcpkgs/kdav/template
@@ -1,6 +1,6 @@
 # Template file for 'kdav'
 pkgname=kdav
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=8bfd0657c0eaa74068c7601208baacb9d11bc6574cd353d4d346473c6c43b6f6
+checksum=8572a77ee3d0f8a7e09e4975fcf0420394c16e908c4a19aecc409415770595f9
 
 kdav-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kdbusaddons/template b/srcpkgs/kdbusaddons/template
index e6038bca1f2..c049cdb4788 100644
--- a/srcpkgs/kdbusaddons/template
+++ b/srcpkgs/kdbusaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kdbusaddons'
 pkgname=kdbusaddons
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kdbusaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f24fadc71670591bb679cde68147e53819f6c3d56126ecbafe59688fc47b347d
+checksum=1b0ba356dd285b6785d14b91f17eb1bcb9c5c84f23ff5c8608954cb013cafc87
 
 kdbusaddons-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kde-cli-tools/template b/srcpkgs/kde-cli-tools/template
index 63c730d8e47..8d69866f1ef 100644
--- a/srcpkgs/kde-cli-tools/template
+++ b/srcpkgs/kde-cli-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-cli-tools'
 pkgname=kde-cli-tools
-version=5.16.4
+version=5.17.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kde-cli-tools.git"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=56c7c2566217704a9d613757767c3b8ee8d1bc4601b9414a44acb50aaaaedc0d
+checksum=1d554bc8c68b9a7ec7e467bcd38b64ed706c5c6a6de566c4b205b536f5490744
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kdoctools kcoreaddons python qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kde-gtk-config5/template b/srcpkgs/kde-gtk-config5/template
index dfc301bb91a..3793a80c221 100644
--- a/srcpkgs/kde-gtk-config5/template
+++ b/srcpkgs/kde-gtk-config5/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-gtk-config5'
 pkgname=kde-gtk-config5
-version=5.16.4
+version=5.17.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -8,13 +8,13 @@ configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools"
 makedepends="kcmutils-devel knewstuff-devel gtk+-devel gtk+3-devel
  gsettings-desktop-schemas-devel"
-depends="kde-cli-tools"
+depends="kde-cli-tools gsettings-desktop-schemas"
 short_desc="GTK2 and GTK3 Configurator for KDE"
 maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/plasma/kde-gtk-config"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=c271b1caebac0837483af7ae11d2e4786a7770ff85753f1a3da4c8d28681111c
+checksum=a6eb212078877ef37cd103d92d2d342d6306c5c1f16778586dd271ecb75a3bd6
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kcoreaddons"
diff --git a/srcpkgs/kde5-baseapps/template b/srcpkgs/kde5-baseapps/template
index 70be2d94cb9..c7b66b346e5 100644
--- a/srcpkgs/kde5-baseapps/template
+++ b/srcpkgs/kde5-baseapps/template
@@ -1,6 +1,6 @@
 # Template file for 'kde5-baseapps'
 pkgname=kde5-baseapps
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=meta
 depends="
diff --git a/srcpkgs/kde5/template b/srcpkgs/kde5/template
index dcadced3bf3..3666ff0c305 100644
--- a/srcpkgs/kde5/template
+++ b/srcpkgs/kde5/template
@@ -1,32 +1,33 @@
 # Template file for 'kde5'
 pkgname=kde5
-version=5.15.0
+version=5.16.90
 revision=1
 build_style=meta
-depends="
-	bluedevil>=${version}
-	breeze-gtk>=${version}
-	kde-gtk-config5>=${version}
-	kdeplasma-addons5>=${version}
-	kgamma5>=${version}
-	kinfocenter>=${version}
-	kscreen>=${version}
-	ksshaskpass>=${version}
-	ksysguard>=${version}
-	kwallet-pam>=${version}
-	kwayland-integration>=${version}
-	kwrited>=${version}
-	oxygen>=${version}
-	plasma-desktop>=${version}
-	plasma-nm>=${version}
-	plasma-pa>=${version}
-	plasma-sdk>=${version}
-	plasma-workspace-wallpapers>=${version}
-	powerdevil>=${version}
-	sddm-kcm>=${version}
-	user-manager>=${version}
-	xdg-desktop-portal-kde>=${version}"
-short_desc="The kde 5 meta-package for Void Linux"
+depends="bluedevil>=${version}
+ breeze-gtk>=${version}
+ kde-gtk-config5>=${version}
+ kdeplasma-addons5>=${version}
+ kgamma5>=${version}
+ kinfocenter>=${version}
+ kscreen>=${version}
+ ksshaskpass>=${version}
+ ksysguard>=${version}
+ kwallet-pam>=${version}
+ kwayland-integration>=${version}
+ kwrited>=${version}
+ oxygen>=${version}
+ plasma-desktop>=${version}
+ plasma-nm>=${version}
+ plasma-pa>=${version}
+ plasma-sdk>=${version}
+ plasma-workspace-wallpapers>=${version}
+ powerdevil>=${version}
+ sddm-kcm>=${version}
+ user-manager>=${version}
+ xdg-desktop-portal-kde>=${version}
+ plasma-thunderbolt>=${version}
+ elogind"
+short_desc="The KDE Plasma Desktop meta-package for Void Linux"
 maintainer="John <johnz@posteo.net>"
 license="GPL-2, LGPL-2.1, FDL"
-homepage="http://www.kde.org"
+homepage="https://kde.org/plasma-desktop"
diff --git a/srcpkgs/kdeclarative/template b/srcpkgs/kdeclarative/template
index 9e27ec3c858..6d0d296d5c4 100644
--- a/srcpkgs/kdeclarative/template
+++ b/srcpkgs/kdeclarative/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeclarative'
 pkgname=kdeclarative
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kdeclarative"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=464a77f88cce72c1616654c371068c11d51e484e0de5c0c5e032126d71afedaa
+checksum=c873ab1076fce137090c341c9f2c1751b5aacf85eeb62b899bdda5936bb6fc08
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kconfig"
diff --git a/srcpkgs/kdecoration/template b/srcpkgs/kdecoration/template
index e5ed2420728..d8bf65a6428 100644
--- a/srcpkgs/kdecoration/template
+++ b/srcpkgs/kdecoration/template
@@ -1,6 +1,6 @@
 # Template file for 'kdecoration'
 pkgname=kdecoration
-version=5.16.4
+version=5.17.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/plasma/kdecoration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=aa77507dcf357243cca9002764f8c8d1c8404d7e5b7249ad0d0f900f0a47ace4
+checksum=d6d25e6894d941001af035497388aa998599d89df0ca2847c8aa6275b9bf9266
 
 kdecoration-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kded/template b/srcpkgs/kded/template
index c4b1b95eb9f..23ebe5b0bd2 100644
--- a/srcpkgs/kded/template
+++ b/srcpkgs/kded/template
@@ -1,6 +1,6 @@
 # Template file for 'kded'
 pkgname=kded
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kded"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ca970111cb2d0073305a226cc005e2085952c2a02703168a775f954d27d723bc
+checksum=055087306a3c7c970a13f8ba3fddaba433cc68fc67a5a88b56be9b179c33594e
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools"
diff --git a/srcpkgs/kdegraphics-mobipocket/template b/srcpkgs/kdegraphics-mobipocket/template
index d0cca875cc8..896f5d1667b 100644
--- a/srcpkgs/kdegraphics-mobipocket/template
+++ b/srcpkgs/kdegraphics-mobipocket/template
@@ -1,6 +1,6 @@
 # Template file for 'kdegraphics-mobipocket'
 pkgname=kdegraphics-mobipocket
-version=19.04.3
+version=19.08.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="Denis Revin <denis.revin@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/kde/kdegraphics-mobipocket"
 distfiles="${KDE_SITE}/applications/${version}/src/kdegraphics-mobipocket-${version}.tar.xz"
-checksum=c073730b7f3d468f4e710a67bdb90d794b69bf0f2c149f7fac705b44b912fa94
+checksum=9621b0b3564ce7fcd6890c15c48e11d00c1cf2d3b408b255ec590bd6d113439f
 
 libqmobipocket_package() {
 	short_desc+=" - runtime library"
diff --git a/srcpkgs/kdegraphics-thumbnailers/template b/srcpkgs/kdegraphics-thumbnailers/template
index 980248c0a89..79e79fd946f 100644
--- a/srcpkgs/kdegraphics-thumbnailers/template
+++ b/srcpkgs/kdegraphics-thumbnailers/template
@@ -1,6 +1,6 @@
 # Template file for 'kdegraphics-thumbnailers'
 pkgname=kdegraphics-thumbnailers
-version=19.04.3
+version=19.08.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kconfig-devel pkg-config"
@@ -11,4 +11,4 @@ maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/kde/kdegraphics-thumbnailers"
 distfiles="${KDE_SITE}/applications/${version}/src/kdegraphics-thumbnailers-${version}.tar.xz"
-checksum=1cca91081a97e851156d187794037bdcbffe996f607a1eed59a2ea00049a9f78
+checksum=86a81ff786168778cbe0ad7c185320dbf052b1df2e6269f14323df04b48ed2ff
diff --git a/srcpkgs/kdelibs4support/template b/srcpkgs/kdelibs4support/template
index c47237be96d..74c82becf02 100644
--- a/srcpkgs/kdelibs4support/template
+++ b/srcpkgs/kdelibs4support/template
@@ -1,6 +1,6 @@
 # Template file for 'kdelibs4support'
 pkgname=kdelibs4support
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kdelibs4support"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=ae6f7c10e1fe67ded687f38a8ab3c8d483ae06ae69344bd1e683af752cf40b5c
+checksum=8cd614941fc201bac296a0e8ab010f73791ffb5cd72bce6f6cdf87fb2ae3be9e
 
 if [ "$CROSS_BUILD" ]; then
 	makedepends+=" qt5-tools-devel"
@@ -31,6 +31,7 @@ kdelibs4support-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/qt5/plugins/designer
 		vmove usr/lib/*.so
 	}
 }
diff --git a/srcpkgs/kdenlive/template b/srcpkgs/kdenlive/template
index cf8eda2d1aa..69f53c77cf9 100644
--- a/srcpkgs/kdenlive/template
+++ b/srcpkgs/kdenlive/template
@@ -1,6 +1,6 @@
 # Template file for 'kdenlive'
 pkgname=kdenlive
-version=19.04.3
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="
@@ -17,7 +17,7 @@ maintainer="johannes <johannes.brechtmann@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://kdenlive.org"
 distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=c981954ce9759da2878b4c76d97b9bb7aa92fc1f073a9f759142870e287d2a1e
+checksum=5ca3b7a2457d2aa355309bc7471791f691edd8774af9a19cbfc8fac39ad53c78
 
 # needed for mlt to work on musl
 CXXFLAGS="-DHAVE_LOCALE_H=1"
diff --git a/srcpkgs/kdepim-apps-libs/template b/srcpkgs/kdepim-apps-libs/template
index 70db766ac79..f4e78b047d6 100644
--- a/srcpkgs/kdepim-apps-libs/template
+++ b/srcpkgs/kdepim-apps-libs/template
@@ -1,7 +1,7 @@
 # Template file for 'kdepim-apps-libs'
 pkgname=kdepim-apps-libs
-version=19.08.0
-revision=1
+version=19.08.2
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python
  kcoreaddons kconfig"
@@ -12,7 +12,7 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/applications/${version}/src/kdepim-apps-libs-${version}.tar.xz"
-checksum=2a19e9b0c3b6b2fecaeb4054bf101170056b8c9e831e45fb796b59666f103f2e
+checksum=d542b1d532d3ce3d9f1c63f4455175c7e855cd1e095a1addf1322074afc11923
 
 kdepim-apps-libs-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kdepim-runtime/template b/srcpkgs/kdepim-runtime/template
index 49f313d77b0..8928c20ccec 100644
--- a/srcpkgs/kdepim-runtime/template
+++ b/srcpkgs/kdepim-runtime/template
@@ -1,7 +1,7 @@
 # Template file for 'kdepim-runtime'
 pkgname=kdepim-runtime
-version=19.08.0
-revision=1
+version=19.08.2
+revision=2
 build_style=cmake
 # XXX KolabLibraries, Kolabxml
 hostmakedepends="extra-cmake-modules python3 kdoctools kdesignerplugin
@@ -14,7 +14,7 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later, AGPL-3.0-or-later"
 homepage="https://projects.kde.org/projects/kde/kdepimlibs"
 distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=634419978329902a1877810d87d4ddae8cb07adbabbfa4540b521689d8bc85ef
+checksum=9b98980003d2d107596e9acc9482dfc3ea26a2485c75a700bd82b53b9be72ebf
 
 post_install() {
 	vlicense COPYING.agpl3 COPYING.agpl3
diff --git a/srcpkgs/kdeplasma-addons5/template b/srcpkgs/kdeplasma-addons5/template
index a54452c8537..5048fdc9628 100644
--- a/srcpkgs/kdeplasma-addons5/template
+++ b/srcpkgs/kdeplasma-addons5/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeplasma-addons5'
 pkgname=kdeplasma-addons5
-version=5.16.4
+version=5.17.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/plasma/kdeplasma-addons"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=4c0884dcb8413fa836d7e390b1c12fc71127c0e5e6fa278a338c253d1539f4a1
+checksum=d4c6ab840f61dcdc52b925045614f9de4089dc2fdf89726fd7c8638c521eb42e
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/kdesignerplugin/template b/srcpkgs/kdesignerplugin/template
index aa47dd98f42..acad7c1faf2 100644
--- a/srcpkgs/kdesignerplugin/template
+++ b/srcpkgs/kdesignerplugin/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesignerplugin'
 pkgname=kdesignerplugin
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,8 +12,8 @@ short_desc="Integrating KDE frameworks widgets with Qt Designer"
 maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-only"
 homepage="https://projects.kde.org/projects/frameworks/kdesignerplugin"
-distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6b204dffbb4897f51143650d75383b5a3ddf4254455e5827d316c7b4ee7b3f33
+distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
+checksum=c9f63d672cbc04465e77eff07d62530e8f9a9129e0d6dfa7e13e0ad4bea6eff0
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools python kgendesignerplugin kdoctools"
diff --git a/srcpkgs/kdesu/template b/srcpkgs/kdesu/template
index e2c4f650afc..94a6cc8f9e0 100644
--- a/srcpkgs/kdesu/template
+++ b/srcpkgs/kdesu/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesu'
 pkgname=kdesu
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-only"
 homepage="https://projects.kde.org/projects/frameworks/kdesu"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=398e74bdfe695ec2d7b57ce78f9fce3e19bb447a8eb5924441718a8f7384f888
+checksum=bd5f8f7a8d9e097e95d5189d32601e231931f9794ea3f34605c56b7b9b06150d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python"
diff --git a/srcpkgs/kdevelop-php/template b/srcpkgs/kdevelop-php/template
index 959d1979099..ab2b462aa62 100644
--- a/srcpkgs/kdevelop-php/template
+++ b/srcpkgs/kdevelop-php/template
@@ -1,6 +1,6 @@
 # Template file for 'kdevelop-php'
 pkgname=kdevelop-php
-version=5.3.3
+version=5.4.2
 revision=1
 wrksrc="kdev-php-${version}"
 build_style=cmake
@@ -13,5 +13,5 @@ maintainer="yopito <pierre.bourgin@free.fr>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://www.kdevelop.org/"
 distfiles="${KDE_SITE}/kdevelop/${version}/src/kdev-php-${version}.tar.xz"
-checksum=8499c46f676a9cd37e56b5635f63dfcab1f2875875b2c65a9f66d84ed4f72972
+checksum=360444b7ac7c2f35144b4e13054a169b705b44e66219bd988ec1137e07994967
 nocross="kdevelop-devel is not available"
diff --git a/srcpkgs/kdevelop-python/template b/srcpkgs/kdevelop-python/template
index ba6a5e203b7..0265916a3d0 100644
--- a/srcpkgs/kdevelop-python/template
+++ b/srcpkgs/kdevelop-python/template
@@ -1,21 +1,21 @@
 # Template file for 'kdevelop-python'
 pkgname=kdevelop-python
-version=5.3.3
+version=5.4.2
 revision=1
 wrksrc="kdev-python-${version}"
 build_style=cmake
+pycompile_dirs="usr/share/kdevpythonsupport"
 hostmakedepends="extra-cmake-modules python3 qt5-qmake python3-devel"
 makedepends="python3-devel qt5-devel knewstuff-devel kitemmodels-devel
  threadweaver-devel ktexteditor-devel kcmutils-devel knotifyconfig-devel
  grantlee5-devel kdevelop-devel"
-pycompile_dirs="usr/share/kdevpythonsupport"
-pycompile_version="$py3_ver"
 short_desc="Python 3 language and Django project support for KDevelop"
 maintainer="yopito <pierre.bourgin@free.fr>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://www.kdevelop.org/"
 distfiles="${KDE_SITE}/kdevelop/${version}/src/kdev-python-${version}.tar.xz"
-checksum=80c4bab96aede589ebdb6d4b33d0339766ac645cc0e4fe10674df12008f37f04
+checksum=bb32205081d55723bc5948f93fe0cdb9baeadacf0d0eba74f131d58477679867
+pycompile_version="$py3_ver"
 nocross="kdevelop-devel is not available"
 
 post_install() {
diff --git a/srcpkgs/kdevelop/patches/use-std-c99.patch b/srcpkgs/kdevelop/patches/use-std-c99.patch
index da373e3ab2c..d766e446f69 100644
--- a/srcpkgs/kdevelop/patches/use-std-c99.patch
+++ b/srcpkgs/kdevelop/patches/use-std-c99.patch
@@ -4,13 +4,12 @@ Let's use C99 instead.
 
 --- CMakeLists.txt.ORIG
 +++ CMakeLists.txt
-@@ -21,6 +21,9 @@
- endif()
- 
+@@ -15,6 +15,8 @@
+ include(KDEInstallDirs)
+ include(KDECMakeSettings)
  include(KDECompilerSettings NO_POLICY_SCOPE) # needs to be first, as set policies influence following macros
 +string(REPLACE " -std=iso9899:1990" "" CMAKE_C_FLAGS " ${CMAKE_C_FLAGS} ")
 +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
-+
+ 
  include(ECMOptionalAddSubdirectory)
  include(ECMInstallIcons)
- include(ECMAddAppIcon)
diff --git a/srcpkgs/kdevelop/template b/srcpkgs/kdevelop/template
index 434820fe9d8..94900870527 100644
--- a/srcpkgs/kdevelop/template
+++ b/srcpkgs/kdevelop/template
@@ -1,6 +1,6 @@
 # Template file for 'kdevelop'
 pkgname=kdevelop
-version=5.3.3
+version=5.4.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -15,8 +15,8 @@ maintainer="yopito <pierre.bourgin@free.fr>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.kdevelop.org/"
 distfiles="${KDE_SITE}/${pkgname}/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=cedd1c7ba8e352a76ec021218cf2e35a6c060875ef3d27964246c48d0f2ae81c
-nocross="plasma-framework-devel is not available"
+checksum=52e253da4892428ef3059568a93263bf7f9dec5ddeb17b0e5d258726492dc6c4
+nocross="subversion-devel is not available"
 
 kdevelop-devel_package() {
 	depends="kdevelop>=${version}_${revision}"
diff --git a/srcpkgs/kdewebkit/template b/srcpkgs/kdewebkit/template
index 33c1bd2efba..14cc070c6bd 100644
--- a/srcpkgs/kdewebkit/template
+++ b/srcpkgs/kdewebkit/template
@@ -1,6 +1,6 @@
 # Template file for 'kdewebkit'
 pkgname=kdewebkit
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kdewebkit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=1ee2a00ee3d95df9270e8c3d434568cda8f42151e361bc07fe374bf0f7afe211
+checksum=db78cf8b167562a211c20a081e23540d0613d2e6feec67d461bb9fc982ad6be8
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python"
diff --git a/srcpkgs/kdialog/template b/srcpkgs/kdialog/template
index 732acbd084f..c4b0190f178 100644
--- a/srcpkgs/kdialog/template
+++ b/srcpkgs/kdialog/template
@@ -1,6 +1,6 @@
 # Template file for 'kdialog'
 pkgname=kdialog
-version=19.04.3
+version=19.08.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="Denis Revin <denis.revin@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/applications/kdialog"
 distfiles="${KDE_SITE}/applications/${version}/src/kdialog-${version}.tar.xz"
-checksum=647c5eac9d34f2cc8011f6214bc5a8ddc1eca8f0b381c66eaf20848eccdf9823
+checksum=7aef7b5a5f340cc0066e02572ec8cef8b227bc6c7f5b066677ef6422632db95a
diff --git a/srcpkgs/kdnssd/template b/srcpkgs/kdnssd/template
index 866387ff5a5..1182a2cd898 100644
--- a/srcpkgs/kdnssd/template
+++ b/srcpkgs/kdnssd/template
@@ -1,6 +1,6 @@
 # Template file for 'kdnssd'
 pkgname=kdnssd
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kdnssd"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=02d70e5ee18697867c1a12373c1dbe31e1efba1fcb1e26bba3c75472cd3b271d
+checksum=f58d8260b5cdbef3eb777990d53666ab1df5be3f978e880ed1d6d810a361c9ae
 
 kdnssd-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kdoctools/template b/srcpkgs/kdoctools/template
index bf5590ac34f..6e11282d67d 100644
--- a/srcpkgs/kdoctools/template
+++ b/srcpkgs/kdoctools/template
@@ -1,6 +1,6 @@
 # Template file for 'kdoctools'
 pkgname=kdoctools
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kdoctools"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e48d8f8f075171c6b83189999a10552c772c6a7e9a115a2643414f9ecec77c6f
+checksum=a46a10424d6cd4dcb3d8a59b9fbd1bf9fe4f409af42decf853298b18bf4ecafe
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools-devel"
diff --git a/srcpkgs/kea/patches/fix-musl-getopt.patch b/srcpkgs/kea/patches/fix-musl-getopt.patch
deleted file mode 100644
index 273e126c684..00000000000
--- a/srcpkgs/kea/patches/fix-musl-getopt.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/bin/perfdhcp/command_options.cc	2016-09-27 12:32:02.000000000 +0200
-+++ src/bin/perfdhcp/command_options.cc	2016-12-07 12:19:55.784883734 +0100
-@@ -7,6 +7,7 @@
- #include <config.h>
- 
- #include "command_options.h"
-+#include <getopt.h>
- #include <exceptions/exceptions.h>
- #include <dhcp/iface_mgr.h>
- #include <dhcp/duid.h>
diff --git a/srcpkgs/kea/template b/srcpkgs/kea/template
index c6a0a34f317..45709e4a108 100644
--- a/srcpkgs/kea/template
+++ b/srcpkgs/kea/template
@@ -1,13 +1,13 @@
 # Template file for 'kea'
 pkgname=kea
-version=1.5.0
-revision=6
+version=1.7.0
+revision=1
 build_style=gnu-configure
 configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr
  $(vopt_if mysql --with-dhcp-mysql)
  $(vopt_if pgsql --with-dhcp-pgsql=${XBPS_CROSS_BASE}/usr/bin/pg_config)"
 hostmakedepends="flex bison perl pkg-config
- doxygen elinks libxslt docbook-xsl"
+ doxygen elinks libxslt docbook-xsl python3-Sphinx python3-sphinx_rtd_theme"
 makedepends="boost-devel log4cplus-devel python3-devel
  $(vopt_if botan botan-devel libressl-devel)
  $(vopt_if mysql libmysqlclient-devel)
@@ -20,7 +20,7 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="MPL-2.0, Apache-2.0"
 homepage="https://kea.isc.org"
 distfiles="http://ftp.isc.org/isc/kea/${version/.P/-P}/kea-${version/.P/-P}.tar.gz"
-checksum=edce4fab68ca7af607cf7f5bc86596e04fe0ef4b8e88906e339cdefcf21daaec
+checksum=173c8e893690a611bc1d1c6fbe54a5c20fcd54429399a8dc3a0d7d2eb01bf8cc
 nocross="Tools required for messages are not built for the host arch"
 
 build_options="botan mysql pgsql"
@@ -67,6 +67,5 @@ libkea-devel_package() {
 		vmove usr/include
 		vmove usr/lib/*.a
 		vmove usr/lib/*.so
-		vmove usr/lib/pkgconfig
 	}
 }
diff --git a/srcpkgs/keditbookmarks/template b/srcpkgs/keditbookmarks/template
index 2638b8f2242..1de44014edc 100644
--- a/srcpkgs/keditbookmarks/template
+++ b/srcpkgs/keditbookmarks/template
@@ -1,9 +1,8 @@
 # Template file for 'keditbookmarks'
 pkgname=keditbookmarks
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
-configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules kcoreaddons kconfig kdoctools
  pkg-config qt5-host-tools qt5-qmake"
 makedepends="kparts-devel qt5-devel"
@@ -12,4 +11,8 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/"
 distfiles="${KDE_SITE}/applications/${version}/src/keditbookmarks-${version}.tar.xz"
-checksum=98c539e63a0e2bb62680003022d9ea5aececc4aa1c2d19a7b4c4aa3d8999e7ac
+checksum=6a22c3ccdd89d07ad13b34b89704afcc9bf3b5a177d4dc137dcb5eaf1580f6dd
+
+pre_check() {
+	export QT_QPA_PLATFORM=offscreen
+}
diff --git a/srcpkgs/keepalived/template b/srcpkgs/keepalived/template
index 1414e1a54d3..afaa82c31dd 100644
--- a/srcpkgs/keepalived/template
+++ b/srcpkgs/keepalived/template
@@ -1,7 +1,7 @@
 # Template file for 'keepalived'
 pkgname=keepalived
-version=2.0.16
-revision=2
+version=2.0.18
+revision=1
 build_style=gnu-configure
 configure_args="--enable-sha1"
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2-or-later"
 homepage="http://www.keepalived.org/"
 distfiles="http://www.keepalived.org/software/${pkgname}-${version}.tar.gz"
-checksum=f0c7dc86147a286913c1c2c918f557735016285d25779d4d2fce5732fcb888df
+checksum=1423a2b1b8e541211029b9e1e1452e683bbe5f4b0b287eddd609aaf5ff024fd0
 
 conf_files="/etc/keepalived/keepalived.conf"
 
diff --git a/srcpkgs/kemoticons/template b/srcpkgs/kemoticons/template
index d4a66b32f7e..a8d9d4e82f8 100644
--- a/srcpkgs/kemoticons/template
+++ b/srcpkgs/kemoticons/template
@@ -1,6 +1,6 @@
 # Template file for 'kemoticons'
 pkgname=kemoticons
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later, CC-BY-4.0"
 homepage="https://projects.kde.org/projects/frameworks/kemoticons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=cfc17de43320fbb353be30ae8d5b448b88da6f83bd23e29d678cd95a4bd7a380
+checksum=4d9b0608e9badcce1376032d75c650265108f2b4a38b65f0db9f513ccba72152
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/keybase-desktop/template b/srcpkgs/keybase-desktop/template
index 4296259c3d2..4892e48f464 100644
--- a/srcpkgs/keybase-desktop/template
+++ b/srcpkgs/keybase-desktop/template
@@ -1,16 +1,16 @@
 # Template file for 'keybase-desktop'
 pkgname=keybase-desktop
-version=4.3.2
+version=4.6.0
 revision=1
 wrksrc="client-${version}"
-hostmakedepends="git nodejs-lts yarn"
+hostmakedepends="git nodejs-lts yarn unzip"
 depends="keybase kbfs"
 short_desc="Keybase desktop client"
 maintainer="Dominic Monroe <monroef4@googlemail.com>"
 license="BSD-3-Clause"
 homepage="https://keybase.io"
 distfiles="https://github.com/keybase/client/archive/v${version}.tar.gz"
-checksum=95300e1729b74a8fddd13b5f2ab35a3bd6f2e53402568d723e671b5cfc5d3778
+checksum=ee97b78e27dc77f55e0533dfbf4ecde2563c14e0f8c708cdb6066361c56ff8f8
 nostrip_files="Keybase"
 
 case "${XBPS_TARGET_MACHINE}" in
diff --git a/srcpkgs/kbfs/INSTALL b/srcpkgs/keybase/kbfs.INSTALL
similarity index 100%
rename from srcpkgs/kbfs/INSTALL
rename to srcpkgs/keybase/kbfs.INSTALL
diff --git a/srcpkgs/keybase/template b/srcpkgs/keybase/template
index a505df25165..050920ee3eb 100644
--- a/srcpkgs/keybase/template
+++ b/srcpkgs/keybase/template
@@ -1,20 +1,39 @@
 # Template file for 'keybase'
 pkgname=keybase
-version=4.3.2
+version=4.6.0
 revision=1
 wrksrc="client-${version}"
 build_style=go
 go_import_path="github.com/keybase/client"
-go_package="${go_import_path}/go/keybase"
+go_package="${go_import_path}/go/keybase
+${go_import_path}/go/kbfs/kbfsfuse
+${go_import_path}/go/kbfs/kbfsgit/git-remote-keybase
+${go_import_path}/go/kbfs/kbfstool ${go_import_path}/go/kbfs/redirector"
 go_build_tags="production"
+hostmakedepends="git"
 depends="gnupg2"
 short_desc="Client for keybase.io"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://keybase.io/"
 distfiles="https://github.com/keybase/client/archive/v${version}.tar.gz"
-checksum=95300e1729b74a8fddd13b5f2ab35a3bd6f2e53402568d723e671b5cfc5d3778
+checksum=ee97b78e27dc77f55e0533dfbf4ecde2563c14e0f8c708cdb6066361c56ff8f8
 
 post_install() {
 	vlicense LICENSE
 }
+
+kbfs_package() {
+	depends="keybase fuse"
+	short_desc="Keybase Filesystem"
+
+	pkg_install() {
+		vmove usr/bin/redirector
+		mv ${PKGDESTDIR}/usr/bin/redirector ${PKGDESTDIR}/usr/bin/keybase-redirector
+		# setuid
+		chmod 4755 ${PKGDESTDIR}/usr/bin/keybase-redirector
+		vmove usr/bin/kbfsfuse
+		vmove usr/bin/kbfstool
+		vmove usr/bin/git-remote-keybase
+	}
+}
diff --git a/srcpkgs/keyutils/template b/srcpkgs/keyutils/template
index cade0250d73..9cb16a10485 100644
--- a/srcpkgs/keyutils/template
+++ b/srcpkgs/keyutils/template
@@ -1,14 +1,13 @@
 # Template file for 'keyutils'
 pkgname=keyutils
-version=1.6
+version=1.6.1
 revision=1
-makedepends="mit-krb5-devel"
 short_desc="Linux Key Management Utilities"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://www.kernel.org"
-distfiles="http://people.redhat.com/~dhowells/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=d3aef20cec0005c0fa6b4be40079885567473185b1a57b629b030e67942c7115
+distfiles="https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/snapshot/${pkgname}-${version}.tar.gz"
+checksum=3c71dcfc6900d07b02f4e061d8fb218a4ae6519c1d283d6a57b8e27718e2f557
 conf_files="/etc/request-key.conf"
 
 pre_build() {
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 479154afef1..8b3c4143a40 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,6 +1,6 @@
 # Template file for 'kfilemetadata5'
 pkgname=kfilemetadata5
-version=5.61.0
+version=5.63.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kfilemetadata"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=15f20af053c71c1e5ba6c6ade90b7cce27645b27ee30f1e6e73038e81a2c958e
+checksum=a000dbfa729306c07e631c1ec2bd306c572ac605aa0f1b7389be617b566b9b87
 
 kfilemetadata5-devel_package() {
 	short_desc+=" - development"
@@ -22,6 +22,7 @@ kfilemetadata5-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/qt5/mkspecs
 		vmove "usr/lib/*.so"
 	}
 }
diff --git a/srcpkgs/kfind/template b/srcpkgs/kfind/template
index 8e45a324975..f1e127072f4 100644
--- a/srcpkgs/kfind/template
+++ b/srcpkgs/kfind/template
@@ -1,9 +1,9 @@
 # Template file for 'kfind'
 pkgname=kfind
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules kcoreaddons qt5-host-tools qt5-qmake python
+hostmakedepends="extra-cmake-modules kcoreaddons qt5-host-tools qt5-qmake
  kdoctools"
 makedepends="kfilemetadata5-devel kparts-devel"
 short_desc="Find files and folders"
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kfind/"
 distfiles="${KDE_SITE}/applications/${version}/src/kfind-${version}.tar.xz"
-checksum=25b7b442600c4e109b0a6f7f09962a4d95d419673f6b64eebf226dcdae8cc6ff
+checksum=7ce5255fa4ef3e98db937eb23e8cdc89bd6b5e5429ccb5fea769e99da2bc424a
diff --git a/srcpkgs/kgamma5/template b/srcpkgs/kgamma5/template
index d065c905aa2..f7f19b38819 100644
--- a/srcpkgs/kgamma5/template
+++ b/srcpkgs/kgamma5/template
@@ -1,6 +1,6 @@
 # Template file for 'kgamma5'
 pkgname=kgamma5
-version=5.16.4
+version=5.17.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/plasma/kgamma5"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=18c01c6a9d73f2450da24ac7a52c00b9d355a1ba41bd346eb71fbe271de85f46
+checksum=5d4c7cfc63896746a994128db03037bff666132e8e35378de60ac91a3959493d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel kdoctools"
diff --git a/srcpkgs/kget/template b/srcpkgs/kget/template
index e2119f4e30b..9a4680bf335 100644
--- a/srcpkgs/kget/template
+++ b/srcpkgs/kget/template
@@ -1,6 +1,6 @@
 # Template file for 'kget'
 pkgname=kget
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -14,4 +14,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/applications/kpimtextedit"
 distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=4db589499c8e5fc3cbb5e398054b1292f68fa23ad1798f2bb2065ba56723d06b
+checksum=e93795eec8f51cac2719ab31cfa6f5f4f642b166ffbb3f876ab3c866a4cd7df1
diff --git a/srcpkgs/kglobalaccel/template b/srcpkgs/kglobalaccel/template
index 6f97844ccb8..470a124b80d 100644
--- a/srcpkgs/kglobalaccel/template
+++ b/srcpkgs/kglobalaccel/template
@@ -1,6 +1,6 @@
 # Template file for 'kglobalaccel'
 pkgname=kglobalaccel
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kglobalaccel"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ad6bd2648e39854369555dd8a0823b08d9631f3638472627eb80e01d9902150e
+checksum=e670675025657acecd6795c584a6adbfbf64c83ac30a10db983520992ddfeef6
 
 kglobalaccel-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kgpg/template b/srcpkgs/kgpg/template
new file mode 100644
index 00000000000..8fa3dd4e0ff
--- /dev/null
+++ b/srcpkgs/kgpg/template
@@ -0,0 +1,22 @@
+# Template file for 'kgpg'
+pkgname=kgpg
+version=19.08.2
+revision=1
+build_style=cmake
+configure_args="-DBUILD_TESTING=OFF"
+hostmakedepends="extra-cmake-modules"
+makedepends="kwindowsystem-devel kcrash-devel kdbusaddons-devel
+ kiconthemes-devel kjobwidgets-devel kio-devel
+ kservice-devel ktextwidgets-devel kxmlgui-devel
+ kwidgetsaddons-devel knotifications-devel kdoctools-devel
+ akonadi-contacts-devel kcontacts-devel boost-devel"
+short_desc="Simple interface for GnuPG, a powerful encryption utility"
+maintainer="k4leg <d0xi@inbox.ru>"
+license="GPL-2.0-only"
+homepage="https://kde.org/applications/utilities/kgpg/"
+distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz"
+checksum=90795c649cd32b65b6030ed965e0db5b0570719afa36abb5d4893268461aa841
+
+if [ "$CROSS_BUILD" ]; then
+ hostmakedepends+=" qt5-qmake kcoreaddons-devel kdoctools kconfig"
+fi
diff --git a/srcpkgs/kguiaddons/template b/srcpkgs/kguiaddons/template
index 42065ade21f..fce92161d27 100644
--- a/srcpkgs/kguiaddons/template
+++ b/srcpkgs/kguiaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kguiaddons'
 pkgname=kguiaddons
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kguiaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=40cefa421b5ad5cf211875a35408ba526a5fb34e5ba19ebbda718dbf6b742520
+checksum=b91ad511bbdacc60c1a41104011492d71a5116483dcccf1390c075fcb29a424c
 
 kguiaddons-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/khelpcenter/template b/srcpkgs/khelpcenter/template
index cd7839c9993..bcec6e8d411 100644
--- a/srcpkgs/khelpcenter/template
+++ b/srcpkgs/khelpcenter/template
@@ -1,6 +1,6 @@
 # Template file for 'khelpcenter'
 pkgname=khelpcenter
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/applications/khelpcenter"
 distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=36810c12ae5d163738101b0f5f13c03cda03ee4c157f641df0f73105a894644f
+checksum=22b9f5225dfb9e8ad85becb7c2986cbee2a1366f84257fcbf76d5d7292dccdd9
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kconfig kdoctools python qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kholidays/template b/srcpkgs/kholidays/template
index e31fdacf854..dd921f0e97b 100644
--- a/srcpkgs/kholidays/template
+++ b/srcpkgs/kholidays/template
@@ -1,7 +1,7 @@
 # Template file for 'kholidays'
 pkgname=kholidays
 reverts="17.12.3_1 17.12.1_1 17.12.0_1 17.04.3_1"
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/applications/kholidays"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ce3d879824a3e429b468008c1ccec5de44c07299d412ea32f9a2a814c27c08c1
+checksum=c728d03732c8570ec50359daf6166924847c9a0d17456d2fb91c1265019c6580
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/khotkeys/template b/srcpkgs/khotkeys/template
index cf72107331a..93dfac3c5c0 100644
--- a/srcpkgs/khotkeys/template
+++ b/srcpkgs/khotkeys/template
@@ -1,6 +1,6 @@
 # Template file for 'khotkeys'
 pkgname=khotkeys
-version=5.16.4
+version=5.17.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/plasma/khotkeys"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=a8646ab20cd067a515d4a9318c814760be0030f27856f155edf11920caeddd0d
+checksum=da7d2a1db9f49b34ea5b24ec9bd6450142cb4e708c9a8f478adc94eb7f190d69
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/khtml/template b/srcpkgs/khtml/template
index dfc5ac899e7..6a01b99c7f3 100644
--- a/srcpkgs/khtml/template
+++ b/srcpkgs/khtml/template
@@ -1,6 +1,6 @@
 # Template file for 'khtml'
 pkgname=khtml
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/frameworks/khtml"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=5d8612b584eecf96959d56bb75b1470b3b34ff7176cef7a0a15bc2531b21720b
+checksum=8d7ba064ffd5391e9b7a2b9d9784f815f2f1f1519cf6ddb7887bcede4c3ec795
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python perl kcoreaddons"
diff --git a/srcpkgs/ki18n/template b/srcpkgs/ki18n/template
index daaa5b95297..c3aeb88ae7f 100644
--- a/srcpkgs/ki18n/template
+++ b/srcpkgs/ki18n/template
@@ -1,6 +1,6 @@
 # Template file for 'ki18n'
 pkgname=ki18n
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/frameworks/ki18n"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d8c0594268b386ee42823360aa937c664cf04eedac8232bc18a653a9c52491d9
+checksum=491395d2d725e1f25acefeea542d1e12e51673636bbc657d5f1f2fbcdb02b7b9
 
 ki18n-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kiconthemes/template b/srcpkgs/kiconthemes/template
index 2d9ebd433f9..1d387aeba07 100644
--- a/srcpkgs/kiconthemes/template
+++ b/srcpkgs/kiconthemes/template
@@ -1,6 +1,6 @@
 # Template file for 'kiconthemes'
 pkgname=kiconthemes
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-only, GPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kiconthemes"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=341741abd0b8aeeec8a2a87fe781b4ec1ab593563b1c063cdfdccead3706cdd7
+checksum=dce004b5a210b7a96e78533909cb91ed2168534ae6303499f0777ac8c8b5e4a2
 
 kiconthemes-devel_package() {
 	short_desc+=" - development"
@@ -19,6 +19,7 @@ kiconthemes-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/qt5/mkspecs
+		vmove usr/lib/qt5/plugins/designer
 		vmove usr/lib/cmake
 		vmove "usr/lib/*.so"
 	}
diff --git a/srcpkgs/kidentitymanagement/template b/srcpkgs/kidentitymanagement/template
index 90dcdb1fa35..233f13e350a 100644
--- a/srcpkgs/kidentitymanagement/template
+++ b/srcpkgs/kidentitymanagement/template
@@ -1,6 +1,6 @@
 # Template file for 'kidentitymanagement'
 pkgname=kidentitymanagement
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python
@@ -12,7 +12,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/applications/kidentitymanagement"
 distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=9fe5c473af0d042b482f1d1dac499c1d8227b60a79f1b5678043f0f49f19013d
+checksum=8f93f9546d570c8f7b2602a3a171641d488595ec8da3c47b0a08ef4f5083e884
 
 kidentitymanagement-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kidletime/template b/srcpkgs/kidletime/template
index afad9254cf5..34275f7f297 100644
--- a/srcpkgs/kidletime/template
+++ b/srcpkgs/kidletime/template
@@ -1,6 +1,6 @@
 # Template file for 'kidletime'
 pkgname=kidletime
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kidletime"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8fb302dcc5b891ac2f06b5278bd6e08043772f3325bc209175c945280621fca2
+checksum=196cb99c7f30ea571f9a7e8c0b507ef95aa54731457f4bc9e4380ff1350da57d
 
 kidletime-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kig/template b/srcpkgs/kig/template
index 883bd006181..6150dcf8457 100644
--- a/srcpkgs/kig/template
+++ b/srcpkgs/kig/template
@@ -1,17 +1,14 @@
 # Template file for 'kig'
 pkgname=kig
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules kcoreaddons pkg-config python"
+hostmakedepends="extra-cmake-modules kcoreaddons kdoctools
+ pkg-config qt5-host-tools qt5-qmake"
 makedepends="boost-devel kparts-devel ktexteditor-devel python-devel"
 short_desc="KDE education tool for interactive geometry"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://www.kde.org/applications/education/kig/"
 distfiles="${KDE_SITE}/applications/${version}/src/kig-${version}.tar.xz"
-checksum=ec35f8e9c10e0a984ab7ff06fc810a26e0abc825ee5674af238bb04e83ce38ee
-
-if [ -n "$CROSS_BUILD" ]; then
-	hostmakedepends+=" kdoctools qt5-host-tools qt5-qmake"
-fi
+checksum=60bab2ccdf69df8ebaed672dc9201e468563d78761f191c43ee5673f9a54246a
diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index 0f7b304aaf5..f2509d882dd 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,6 +1,6 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kimageformats"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5a81359a043e201b29e205dd93559de077e0317d26712cb1c07e624d76aeb207
+checksum=4be4247672c21538afecc2f784cee8d0e963a31a7a8c855d5d7acbe3571ac397
diff --git a/srcpkgs/kimap/template b/srcpkgs/kimap/template
index ec5bc9de3cb..b1b020cba2b 100644
--- a/srcpkgs/kimap/template
+++ b/srcpkgs/kimap/template
@@ -1,6 +1,6 @@
 # Template file for 'kimap'
 pkgname=kimap
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/applications/${version}/src/kimap-${version}.tar.xz"
-checksum=d9e3af3e1bb03d929a08287b1a29540915d25dbb6a38d152560302c93e4c5060
+checksum=250479c78517610aab810f54184d8826fb981438ec9f0d5c423ad781a796ee00
 
 kimap-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kinfocenter/template b/srcpkgs/kinfocenter/template
index 1c841ebcfd6..198d1e4d416 100644
--- a/srcpkgs/kinfocenter/template
+++ b/srcpkgs/kinfocenter/template
@@ -1,6 +1,6 @@
 # Template file for 'kinfocenter'
 pkgname=kinfocenter
-version=5.16.4
+version=5.17.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2"
 homepage="https://projects.kde.org/projects/plasma/kinfocenter"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=30e4df2d641c4faa385a718c772d893900eca99591ffee5787d6563fe5130426
+checksum=f9866450a795b6c458011de457f27e51258803459d5d384b7366f13f9a1c8d7e
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel kdoctools-devel"
diff --git a/srcpkgs/kinit/template b/srcpkgs/kinit/template
index eb199f3bca9..94262d45761 100644
--- a/srcpkgs/kinit/template
+++ b/srcpkgs/kinit/template
@@ -1,6 +1,6 @@
 # Template file for 'kinit'
 pkgname=kinit
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-only"
 homepage="https://projects.kde.org/projects/frameworks/kinit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1806bba9cc3f4d9c5ed23f49eca30707e8f74a99d35f5022130a46a395f2858f
+checksum=9dcb8d59419066a11b11b64dc028f8cccf7713cd5230451ca8ea5b724c8ae01a
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index 079309d6aee..c121e472129 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
-version=19.04.3
+version=19.08.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -15,7 +15,7 @@ maintainer="Denis Revin <denis.revin@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://cgit.kde.org/kio-extras.git"
 distfiles="${KDE_SITE}/applications/${version}/src/kio-extras-${version}.tar.xz"
-checksum=b65cb37a5965782a9eaae80840fdd7e06505aece33cc6774510c65e1fea3f55b
+checksum=a0b8f08ab8f9d36cfdc950470f75726e90e9fba159bc2035931cfa6efbfe4394
 
 if [ -z "$CROSS_BUILD" ]; then
 	makedepends+=" libssh-devel"
diff --git a/srcpkgs/kio-gdrive/template b/srcpkgs/kio-gdrive/template
index baae49e3505..dc1da9d3f25 100644
--- a/srcpkgs/kio-gdrive/template
+++ b/srcpkgs/kio-gdrive/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-gdrive'
 pkgname=kio-gdrive
-version=1.2.6
+version=1.2.7
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool pkg-config qt5-qmake qt5-host-tools"
@@ -11,5 +11,5 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KIO_GDrive"
 distfiles="${KDE_SITE}/kio-gdrive/${version}/src/kio-gdrive-${version}.tar.xz"
-checksum=7a9169e1d464641eb0ae4013ca1732b46bdfd50a13b3e87810c19ba794527f7b
+checksum=1b59e4d9940deb290cc4d7441d4ae8762ccb1de8d14dbd0bdbd3bc9a5fc266a4
 nocross="kaccounts-integration is nocross"
diff --git a/srcpkgs/kio/template b/srcpkgs/kio/template
index 901df89ad41..a7fb31f8d2d 100644
--- a/srcpkgs/kio/template
+++ b/srcpkgs/kio/template
@@ -1,6 +1,6 @@
 # Template file for 'kio'
 pkgname=kio
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kio"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1fa35126f8167bdbe029e515d01c8d4b91a07556ce6d5c9418e0ea10d7c2e44e
+checksum=9478aa457b6059cba00a2263fefe01a678c3272012e5cb94fed6c486a4c10f11
 
 CXXFLAGS+=" -fpermissive"
 
@@ -28,6 +28,7 @@ kio-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/qt5/mkspecs
+		vmove usr/lib/qt5/plugins/designer
 		vmove usr/lib/cmake
 		vmove "usr/lib/*.so"
 	}
diff --git a/srcpkgs/kirigami2/template b/srcpkgs/kirigami2/template
index 027017ce238..d4879e795df 100644
--- a/srcpkgs/kirigami2/template
+++ b/srcpkgs/kirigami2/template
@@ -1,6 +1,6 @@
 # Template file for 'kirigami2'
 pkgname=kirigami2
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="Sir_Boops <admin@boops.me>"
 license="LGPL-2.0-or-later"
 homepage="https://techbase.kde.org/Kirigami"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kirigami2-${version}.tar.xz"
-checksum=afdbe922f0627330319f22834d6631af13edb0081c687422d36acb8697a88c30
+checksum=db03144ea410bf9c400589f05b52e51c06ddd5cfc613cc639f33c5fa7a68e6ec
 
 kirigami2-devel_package() {
 	short_desc+=" - development"
@@ -20,6 +20,7 @@ kirigami2-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/qt5/mkspecs
 		vmove "usr/lib/*.so"
 	}
 }
diff --git a/srcpkgs/kismet/template b/srcpkgs/kismet/template
index 942e19c11c0..46de3290e0e 100644
--- a/srcpkgs/kismet/template
+++ b/srcpkgs/kismet/template
@@ -1,6 +1,6 @@
 # Template file for 'kismet'
 pkgname=kismet
-version=2019.08.R1
+version=2019.09.R1
 revision=1
 _realver="${version//./-}"
 wrksrc="${pkgname}-${_realver}"
@@ -17,5 +17,5 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.kismetwireless.net/"
 distfiles="http://www.kismetwireless.net/code/${pkgname}-${_realver}.tar.xz"
-checksum=3a0bde964f34c5eceaa085b9f1dc4eb008a4ce3a38b68bec6d962d3404a0d96b
+checksum=c3f33ae4044ba9951f9f5f4f17c7980919b73afb3055a68a69f39cd3fd66ce6d
 system_groups="kismet"
diff --git a/srcpkgs/kitemmodels/template b/srcpkgs/kitemmodels/template
index d801687da30..4e6d12b40c0 100644
--- a/srcpkgs/kitemmodels/template
+++ b/srcpkgs/kitemmodels/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemmodels'
 pkgname=kitemmodels
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kitemmodels"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=47db271ba24904933629ed00f7a4f916a19969967dcfbfd59ae5e98f08f89d68
+checksum=2d978b4403c2b88f3b1c2795260c4a491d2c6278cf0ac02814afbdb41a787081
 
 kitemmodels-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kitemviews/template b/srcpkgs/kitemviews/template
index 7a5724876f4..af7adcceb4e 100644
--- a/srcpkgs/kitemviews/template
+++ b/srcpkgs/kitemviews/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemviews'
 pkgname=kitemviews
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kitemviews"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0447b361444a853409f65e2fb5650cc95eb799ca54a5d7e15cd6d8ca527002da
+checksum=dfe37a7baf4069d18834485e2b5ce0a5fb3b22194bbe4d7e9f24c9c74de00096
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-qmake qt5-host-tools qt5-tools-devel"
@@ -23,6 +23,7 @@ kitemviews-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/qt5/mkspecs
+		vmove usr/lib/qt5/plugins/designer
 		vmove usr/lib/cmake
 		vmove "usr/lib/*.so"
 	}
diff --git a/srcpkgs/kitty/patches/musl.patch b/srcpkgs/kitty/patches/musl.patch
deleted file mode 100644
index 99b86547a7b..00000000000
--- a/srcpkgs/kitty/patches/musl.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 9cbb726566f14454b24d05e6e94c640997fc77ff Mon Sep 17 00:00:00 2001
-From: Kovid Goyal <kovid@kovidgoyal.net>
-Date: Tue, 30 Jul 2019 06:20:54 +0530
-Subject: [PATCH] Fix #1865
-
----
- glfw/linux_joystick.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/glfw/linux_joystick.c b/glfw/linux_joystick.c
-index d40bf0233..70a86f6f3 100644
---- a/glfw/linux_joystick.c
-+++ b/glfw/linux_joystick.c
-@@ -144,10 +144,10 @@ static bool openJoystickDevice(const char* path)
-     char absBits[(ABS_CNT + 7) / 8] = {0};
-     struct input_id id;
- 
--    if (ioctl(linjs.fd, EVIOCGBIT(0, sizeof(evBits)), evBits) < 0 ||
--        ioctl(linjs.fd, EVIOCGBIT(EV_KEY, sizeof(keyBits)), keyBits) < 0 ||
--        ioctl(linjs.fd, EVIOCGBIT(EV_ABS, sizeof(absBits)), absBits) < 0 ||
--        ioctl(linjs.fd, EVIOCGID, &id) < 0)
-+    if (ioctl(linjs.fd, (int32_t)EVIOCGBIT(0, sizeof(evBits)), evBits) < 0 ||
-+        ioctl(linjs.fd, (int32_t)EVIOCGBIT(EV_KEY, sizeof(keyBits)), keyBits) < 0 ||
-+        ioctl(linjs.fd, (int32_t)EVIOCGBIT(EV_ABS, sizeof(absBits)), absBits) < 0 ||
-+        ioctl(linjs.fd, (int32_t)EVIOCGID, &id) < 0)
-     {
-         _glfwInputError(GLFW_PLATFORM_ERROR,
-                         "Linux: Failed to query input device: %s",
-@@ -165,7 +165,7 @@ static bool openJoystickDevice(const char* path)
- 
-     char name[256] = "";
- 
--    if (ioctl(linjs.fd, EVIOCGNAME(sizeof(name)), name) < 0)
-+    if (ioctl(linjs.fd, (int32_t)EVIOCGNAME(sizeof(name)), name) < 0)
-         strncpy(name, "Unknown", sizeof(name));
- 
-     char guid[33] = "";
diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template
index 7d06fcfaa3f..d79bcc4acce 100644
--- a/srcpkgs/kitty/template
+++ b/srcpkgs/kitty/template
@@ -1,6 +1,6 @@
 # Template file for 'kitty'
 pkgname=kitty
-version=0.14.3
+version=0.14.6
 revision=1
 pycompile_dirs="usr/lib/kitty"
 hostmakedepends="ncurses pkg-config python3 wayland-devel wayland-protocols"
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://sw.kovidgoyal.net/kitty/"
 changelog="https://sw.kovidgoyal.net/kitty/changelog.html"
 distfiles="https://github.com/kovidgoyal/kitty/releases/download/v${version}/kitty-${version}.tar.xz"
-checksum=f5e522a6e477acd8b4a9637261f20dc66d6f7b9e9229a4a957f10811708b8d8b
+checksum=f07e0b2398b21e546ead8bb7755b140ee2d9cd1be10b720263b2578a0396a9b8
 patch_args="-Np1"
 pycompile_version="$py3_ver"
 LDFLAGS+=" -Wl,-z,stack-size=2097152"
diff --git a/srcpkgs/kiwix-lib/template b/srcpkgs/kiwix-lib/template
index cb2f5253bfb..4db31bb4ca6 100644
--- a/srcpkgs/kiwix-lib/template
+++ b/srcpkgs/kiwix-lib/template
@@ -1,6 +1,6 @@
 # Template file for 'kiwix-lib'
 pkgname=kiwix-lib
-version=6.0.0
+version=8.1.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="GPL-3.0-or-later"
 homepage="https://www.kiwix.org/"
 changelog="https://github.com/kiwix/kiwix-lib/blob/${version}/ChangeLog"
 distfiles="https://github.com/kiwix/kiwix-lib/archive/${version}.tar.gz"
-checksum=00fcc067ae7abeb8043b0270f234d40f2ad1b1085da5df143e2ba23443a8a16c
+checksum=d5e498db7d24b2df3c77ff3521810949204de69793eecf8245b2366b93da27e0
 
 case "$XBPS_TARGET_MACHINE" in
 	armv6l*)
diff --git a/srcpkgs/kiwix-tools/template b/srcpkgs/kiwix-tools/template
index d10729c482d..0959d5bac62 100644
--- a/srcpkgs/kiwix-tools/template
+++ b/srcpkgs/kiwix-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'kiwix-tools'
 pkgname=kiwix-tools
-version=3.0.0
-revision=1
+version=3.0.1
+revision=3
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="kiwix-lib-devel zlib-devel libmicrohttpd-devel libuuid-devel"
@@ -11,7 +11,7 @@ license="GPL-3.0-or-later"
 homepage="https://kiwix.org"
 changelog="https://github.com/kiwix/kiwix-tools/blob/${version}/Changelog"
 distfiles="https://github.com/kiwix/kiwix-tools/archive/${version}.tar.gz"
-checksum=ee22a7f939bcf51999327736461c988bfa8c9e0c83562d335eb2a400c4df3758
+checksum=b4d2ff9dfb7d71bb06ee837392a714cf8934d21dba65d5d051c0caa0112e4974
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kiwix-lib-devel"
diff --git a/srcpkgs/kjobwidgets/template b/srcpkgs/kjobwidgets/template
index 757be66de11..626693590ff 100644
--- a/srcpkgs/kjobwidgets/template
+++ b/srcpkgs/kjobwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kjobwidgets'
 pkgname=kjobwidgets
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kjobwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5246c2a230e3b4e9d7ba87c5a6b13b5f96fef6af0d1262f27f91fa0c619cf378
+checksum=f68e9cfd949a2c981e048fdde2905419853bb40f7a00bb43f6c9d45b5529e05d
 
 kjobwidgets-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kjs/template b/srcpkgs/kjs/template
index 2454eb23906..921ee2f13dd 100644
--- a/srcpkgs/kjs/template
+++ b/srcpkgs/kjs/template
@@ -1,6 +1,6 @@
 # Template file for 'kjs'
 pkgname=kjs
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kjs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=968e1592c98ee260d80644bf4631bf09479512e48fa878887ee3b9d6d57d3d17
+checksum=37ab39659cec1ea141d244b3c59678f19d1609299e0c084e2d6a4dc49255fa9b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools kjs"
diff --git a/srcpkgs/kjsembed/template b/srcpkgs/kjsembed/template
index 643664aea7c..d3837119784 100644
--- a/srcpkgs/kjsembed/template
+++ b/srcpkgs/kjsembed/template
@@ -1,6 +1,6 @@
 # Template file for 'kjsembed'
 pkgname=kjsembed
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,12 +11,16 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kjsembed"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=d8e0afad638574c31c89d716d78456ce51ffe6dd03eae6787bc9b4f8b52d5b44
+checksum=eb444305618f04c0e804ea661956e217f57549b71c6fae94f1222a1b36355903
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"
 fi
 
+case "$XBPS_TARGET_MACHINE" in
+	armv6l-musl) makedepends+=" libatomic-devel";;
+esac
+
 kjsembed-devel_package() {
 	short_desc+=" - development"
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index d82891012ce..729074583df 100644
--- a/srcpkgs/kldap/template
+++ b/srcpkgs/kldap/template
@@ -1,6 +1,6 @@
 # Template file for 'kldap'
 pkgname=kldap
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/applications/${version}/src/kldap-${version}.tar.xz"
-checksum=4bee7b041aff8e1a76330bde12ab9368176181136be1136c4b0c0b733eb9bc16
+checksum=79c540693b85c138ae7bf4f72213dfad6dfa48dfc0ab414004d93f15d2ffac6e
 
 kldap-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kmag/template b/srcpkgs/kmag/template
index 17d86ceb798..bda8c831330 100644
--- a/srcpkgs/kmag/template
+++ b/srcpkgs/kmag/template
@@ -1,13 +1,13 @@
 # Template file for 'kmag'
 pkgname=kmag
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python qt5-host-tools qt5-qmake"
+hostmakedepends="extra-cmake-modules kcoreaddons kdoctools qt5-host-tools qt5-qmake"
 makedepends="kparts-devel libqaccessibilityclient-devel qt5-devel"
 short_desc="Screen Magnifier"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kmag/"
 distfiles="${KDE_SITE}/applications/${version}/src/kmag-${version}.tar.xz"
-checksum=7d42c254e62750899e429482c2b6ed3b4b1e8c5a66fbc371eec656421817d0a4
+checksum=6e8ecfab87dca12804a5a8d0a8adf1545e9e17039e0f9667b10a8f2832512e71
diff --git a/srcpkgs/kmail-account-wizard/template b/srcpkgs/kmail-account-wizard/template
index 3b261bed1b7..4a5639ce8a4 100644
--- a/srcpkgs/kmail-account-wizard/template
+++ b/srcpkgs/kmail-account-wizard/template
@@ -1,6 +1,6 @@
 # Template file for 'kmail-account-wizard'
 pkgname=kmail-account-wizard
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python"
@@ -11,4 +11,4 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/applications/${version}/src/kmail-account-wizard-${version}.tar.xz"
-checksum=5eddd4029047b3c37146c49e043d17c1f9086bc738726d5da2756cbe9ad28622
+checksum=769b151d0de47d49e41eaeca501526de41c174f9df99b46418e955163c38e9a8
diff --git a/srcpkgs/kmail/template b/srcpkgs/kmail/template
index d0b81f4ce3b..bb44f5f051d 100644
--- a/srcpkgs/kmail/template
+++ b/srcpkgs/kmail/template
@@ -1,7 +1,7 @@
 # Template file for 'kmail'
 pkgname=kmail
-version=19.08.0
-revision=1
+version=19.08.2
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules python qt5-host-tools qt5-qmake
  kdoctools kconfig kcoreaddons"
@@ -15,7 +15,7 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://userbase.kde.org/KMail"
 distfiles="${KDE_SITE}/applications/${version}/src/kmail-${version}.tar.xz"
-checksum=052d5b0da402024646673f5e57785b509c328bd5f5ac064f742f9c63e75f3b28
+checksum=0ad2a5439da7f255923eeb4c4cf267ece721619aa046a04439f56763aeabac85
 
 case $XBPS_TARGET_MACHINE in
 	*-musl) broken="segfaults on start";;
diff --git a/srcpkgs/kmailtransport/template b/srcpkgs/kmailtransport/template
index 4648ea3ab40..cdf51104c1b 100644
--- a/srcpkgs/kmailtransport/template
+++ b/srcpkgs/kmailtransport/template
@@ -1,6 +1,6 @@
 # Template file for 'kmailtransport'
 pkgname=kmailtransport
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/applications/${version}/src/kmailtransport-${version}.tar.xz"
-checksum=cc5f865f2059e8fd8d45d1597d8483bbfe0b743e472d91dd4e7cc3837c3fa2dd
+checksum=c545fb5546e82f7dfcea4c6e1a8b565ad04e34851c33876c9bf74c9fbc3165c7
 
 kmailtransport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kmbox/template b/srcpkgs/kmbox/template
index 40ca1239993..98f5daea1eb 100644
--- a/srcpkgs/kmbox/template
+++ b/srcpkgs/kmbox/template
@@ -1,6 +1,6 @@
 # Template file for 'kmbox'
 pkgname=kmbox
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python"
@@ -10,7 +10,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/applications/${version}/src/kmbox-${version}.tar.xz"
-checksum=6600033298b0d5ff84705dc66fa529156cb08aeda7503ba7890581b618f83228
+checksum=82e2f64b90a1386100e13f9b2afea5d71952a1cb9547f965ddcdb3b8c59c35b1
 
 kmbox-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kmediaplayer/template b/srcpkgs/kmediaplayer/template
index 7b872a211f0..85d38112930 100644
--- a/srcpkgs/kmediaplayer/template
+++ b/srcpkgs/kmediaplayer/template
@@ -1,6 +1,6 @@
 # Template file for 'kmediaplayer'
 pkgname=kmediaplayer
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="X11"
 homepage="https://projects.kde.org/projects/frameworks/kmediaplayer"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=ae15a4a39e6530b505d699fb1b1ab3fd5f0e64d87dd758db17702463e44ce181
+checksum=b54d4184ff04e5c02dec06259dd6002fa4a9d2b32d3325b3cf43fb49071c65a7
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python"
diff --git a/srcpkgs/kmenuedit/template b/srcpkgs/kmenuedit/template
index 1229a63c622..99d0438e348 100644
--- a/srcpkgs/kmenuedit/template
+++ b/srcpkgs/kmenuedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kmenuedit'
 pkgname=kmenuedit
-version=5.16.4
+version=5.17.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2"
 homepage="https://projects.kde.org/projects/plasma/kmenuedit"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=f749ca062d9c7bfd2033c4016e8a3dcc9f849f83f941dd9a60fd5b0232d023a2
+checksum=c8c433e8d4e3e13a5ace0ebc265756441aa01a07b1e68e45ce71387f128cc706
diff --git a/srcpkgs/kmime/template b/srcpkgs/kmime/template
index da7fc849579..1c3e5c12b1e 100644
--- a/srcpkgs/kmime/template
+++ b/srcpkgs/kmime/template
@@ -1,6 +1,6 @@
 # Template file for 'kmime'
 pkgname=kmime
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3"
@@ -10,7 +10,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/applications/${version}/src/kmime-${version}.tar.xz"
-checksum=1422e6235659b66b3ee5e91cdd732d8c3738d42f81435e69f3cbb18f04a0be75
+checksum=f153332bb71de9d4451b8d28135a914059f5156fc8dda33f6375671603477771
 
 if [ "CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"
diff --git a/srcpkgs/kmix/template b/srcpkgs/kmix/template
index ff00210781a..75fba0ba9e0 100644
--- a/srcpkgs/kmix/template
+++ b/srcpkgs/kmix/template
@@ -1,6 +1,6 @@
 # Template file for 'kmix'
 pkgname=kmix
-version=19.04.3
+version=19.08.2
 revision=1
 build_style=cmake
 configure_args="-DSYSCONF_INSTALL_DIR=/etc -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -9,8 +9,8 @@ hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
 makedepends="plasma-framework-devel kinit-devel alsa-lib-devel pulseaudio-devel
  libcanberra-devel ksolid-devel"
 short_desc="KDE's mixer application"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/multimedia/kmix/"
 distfiles="${KDE_SITE}/applications/${version}/src/kmix-${version}.tar.xz"
-checksum=d08a0d40fb9a7a3f032f8995dbd9260777119b249669323447fa2575e44e3bf9
+checksum=5d852df8b54d3abca98db4aa2b259973231fed0a597d511d54fb41c6389ce61a
diff --git a/srcpkgs/kmymoney/template b/srcpkgs/kmymoney/template
index c6a7242810f..5e99dc91cff 100644
--- a/srcpkgs/kmymoney/template
+++ b/srcpkgs/kmymoney/template
@@ -1,7 +1,7 @@
 # Template file for 'kmymoney'
 pkgname=kmymoney
 version=5.0.6
-revision=1
+revision=3
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson
  -DBUILD_TESTING=OFF"
diff --git a/srcpkgs/knewstuff/template b/srcpkgs/knewstuff/template
index d6da21e4d16..16aad91f138 100644
--- a/srcpkgs/knewstuff/template
+++ b/srcpkgs/knewstuff/template
@@ -1,6 +1,6 @@
 # Template file for 'knewstuff'
 pkgname=knewstuff
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/frameworks/knewstuff"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=87f8ec030223f5f0e4e39de8407fc0d28542e48e057c1752adb2466c55fe365b
+checksum=5b63a5f5ca144536ffd8748855947fce120af0a3dc490debf53db579153e755e
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python"
diff --git a/srcpkgs/knights/template b/srcpkgs/knights/template
index 68fba321c7b..cc8da33217c 100644
--- a/srcpkgs/knights/template
+++ b/srcpkgs/knights/template
@@ -1,6 +1,6 @@
 # Template file for 'knights'
 pkgname=knights
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,4 +11,4 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://www.kde.org/applications/games/knights/"
 distfiles="${KDE_SITE}/applications/${version}/src/knights-${version}.tar.xz"
-checksum=1e22413a23b8afeab8b5d46a4d6d81a5e00a891636676b99c5bd08806f97795c
+checksum=2b70338d1cb2b770157a5b061a797620d8dd7dd8c6da0bcb7e2a9db375e71a07
diff --git a/srcpkgs/knot-resolver/files/kresd/run b/srcpkgs/knot-resolver/files/kresd/run
index 7134f8c2c1b..2342892a135 100644
--- a/srcpkgs/knot-resolver/files/kresd/run
+++ b/srcpkgs/knot-resolver/files/kresd/run
@@ -1,4 +1,4 @@
 #!/bin/sh
 [ -r ./conf ] && . ./conf
-install -d -m0755 -o _knot-resolver -g _knot-resolver /run/knot-resolver
+install -d -m0755 -o _knot_resolver -g _knot_resolver /run/knot-resolver
 exec kresd ${OPTS:--f 1}
diff --git a/srcpkgs/knot-resolver/template b/srcpkgs/knot-resolver/template
index 58d884c04de..4179479a87a 100644
--- a/srcpkgs/knot-resolver/template
+++ b/srcpkgs/knot-resolver/template
@@ -1,7 +1,7 @@
 # Template file for 'knot-resolver'
 pkgname=knot-resolver
-version=4.2.0
-revision=1
+version=4.2.2
+revision=2
 build_style=meson
 configure_args="
  -Dclient=enabled
@@ -17,7 +17,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.knot-resolver.cz/"
 distfiles="https://secure.nic.cz/files/knot-resolver/knot-resolver-${version}.tar.xz"
-checksum=b37ff9ceefbaa4e4527d183fb1bbb63e641d34d9889ce92715128bc1423c7ef4
+checksum=03b68dff16429aed7a5b0cea7189276c8056e8ecd567b678c2595d48d9a51458
 
 system_accounts="_knot_resolver"
 _knot_resolver_homedir="/var/cache/knot-resolver"
diff --git a/srcpkgs/knot/template b/srcpkgs/knot/template
index e1d92e5f540..1f1f5c3c846 100644
--- a/srcpkgs/knot/template
+++ b/srcpkgs/knot/template
@@ -1,6 +1,6 @@
 # Template file for 'knot'
 pkgname=knot
-version=2.8.3
+version=2.9.0
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -18,7 +18,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.knot-dns.cz/"
 distfiles="https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"
-checksum=8a62d81e5cf3df938f469b60ed4e46d9161007c2b89fbf7ae07525fa68368bad
+checksum=df7434eaefbabbf7cca2d6cba5038be48a4668e508215ca197532bac7c9b21a2
 
 system_accounts="_knot"
 _knot_homedir="/var/lib/knot"
diff --git a/srcpkgs/knotes/template b/srcpkgs/knotes/template
index 513c5fa8702..7d88b28a288 100644
--- a/srcpkgs/knotes/template
+++ b/srcpkgs/knotes/template
@@ -1,7 +1,7 @@
 # Template file for 'knotes'
 pkgname=knotes
-version=19.08.0
-revision=1
+version=19.08.2
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools libxslt
  kcoreaddons kdoctools kconfig"
@@ -12,4 +12,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/utilities/knotes"
 distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=578afb9d879023db9fef4e58e326927d0e2e24edd1e1ac0d46eee968a0ab7030
+checksum=aa0aa4d215507750b055e9af91f552e723aee8163b36f65a3dd19786cf327cf3
diff --git a/srcpkgs/knotifications/template b/srcpkgs/knotifications/template
index 50d9d624179..eaf91a0c0cf 100644
--- a/srcpkgs/knotifications/template
+++ b/srcpkgs/knotifications/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifications'
 pkgname=knotifications
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/frameworks/knotifications"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f72ce6394465316a5324e38afb07f4f71d5f8e281d09b5cf340246c9905568ac
+checksum=886aa99e21deaf35ba626f38d60fcb4f6ce831b1e03dcade79d6e0098a7576e6
 
 knotifications-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/knotifyconfig/template b/srcpkgs/knotifyconfig/template
index c1e40bdc819..bb7d93156f2 100644
--- a/srcpkgs/knotifyconfig/template
+++ b/srcpkgs/knotifyconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifyconfig'
 pkgname=knotifyconfig
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/frameworks/knotifyconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bbd2260a98f70779415369ca1d99807bc3e57f618024b9663d2a462a74169bee
+checksum=24ffc43ec414f6dee675f630c275317c74ce5ba60ece159c69780edfad7e20b5
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python"
diff --git a/srcpkgs/kodi-addon-inputstream-adaptive/template b/srcpkgs/kodi-addon-inputstream-adaptive/template
index d16b4008479..7d923115e36 100644
--- a/srcpkgs/kodi-addon-inputstream-adaptive/template
+++ b/srcpkgs/kodi-addon-inputstream-adaptive/template
@@ -1,6 +1,6 @@
 # Template file for 'kodi-addon-inputstream-adaptive'
 pkgname=kodi-addon-inputstream-adaptive
-version=2.3.22
+version=2.4.2
 revision=1
 _kodi_release=Leia
 wrksrc="inputstream.adaptive-${version}-${_kodi_release}"
@@ -12,5 +12,5 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/peak3d/inputstream.adaptive"
 distfiles="https://github.com/peak3d/inputstream.adaptive/archive/${version}-${_kodi_release}.tar.gz"
-checksum=2c21abeead9dc172de297c47930f62050f382c449682cbdb6c70c7e19a2d561b
+checksum=e47263240ac9276546ead439ba14ee26c3f3b45f2882351a9081e5502e296329
 nocross="depends on kodi-platform"
diff --git a/srcpkgs/kodi-addon-pvr-iptvsimple/template b/srcpkgs/kodi-addon-pvr-iptvsimple/template
index d83b02a1f97..c288602b850 100644
--- a/srcpkgs/kodi-addon-pvr-iptvsimple/template
+++ b/srcpkgs/kodi-addon-pvr-iptvsimple/template
@@ -1,6 +1,6 @@
 # Template file for 'kodi-addon-pvr-iptvsimple'
 pkgname=kodi-addon-pvr-iptvsimple
-version=3.5.8
+version=3.8.3
 revision=1
 _kodi_release=Leia
 wrksrc="pvr.iptvsimple-${version}-${_kodi_release}"
@@ -13,5 +13,5 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/kodi-pvr/pvr.iptvsimple"
 distfiles="https://github.com/kodi-pvr/pvr.iptvsimple/archive/${version}-${_kodi_release}.tar.gz"
-checksum=84e985b5b31044352eaf54914c266a1775f6b7c32a6ce6a46001ddb7d1f9d7fa
+checksum=feac27e3bd97d115ad9f3920be6f43447972194246d0f33fa295d9a4f33e4c48
 nocross="depends on kodi-platform"
diff --git a/srcpkgs/kodi-rpi/files/swig.nojava-18.3 b/srcpkgs/kodi-rpi/files/swig.nojava-18.3
deleted file mode 120000
index 2dba4f75239..00000000000
--- a/srcpkgs/kodi-rpi/files/swig.nojava-18.3
+++ /dev/null
@@ -1 +0,0 @@
-../../kodi/files/swig.nojava-18.3
\ No newline at end of file
diff --git a/srcpkgs/kodi-rpi/files/swig.nojava-18.4 b/srcpkgs/kodi-rpi/files/swig.nojava-18.4
new file mode 120000
index 00000000000..849e63c3370
--- /dev/null
+++ b/srcpkgs/kodi-rpi/files/swig.nojava-18.4
@@ -0,0 +1 @@
+../../kodi/files/swig.nojava-18.4
\ No newline at end of file
diff --git a/srcpkgs/kodi-rpi/files/xbmc-standalone/run b/srcpkgs/kodi-rpi/files/xbmc-standalone/run
index 94ad9da1cd4..e4fc93b47ed 100755
--- a/srcpkgs/kodi-rpi/files/xbmc-standalone/run
+++ b/srcpkgs/kodi-rpi/files/xbmc-standalone/run
@@ -1,2 +1,3 @@
 #!/bin/sh
+PATH=$PATH:/opt/vc/bin
 exec chpst -P sudo LD_LIBRARY_PATH=/opt/vc/lib -u xbmc -- /usr/lib/kodi/kodi-rbpi --standalone
diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template
index d26e9462abb..05e92d9fab4 100644
--- a/srcpkgs/kodi-rpi/template
+++ b/srcpkgs/kodi-rpi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi-rpi'
 pkgname=kodi-rpi
-version=18.3
-revision=1
+version=18.4
+revision=2
 build_style=cmake
 _codename="Leia"
 wrksrc="xbmc-${version}-${_codename}"
@@ -10,7 +10,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 homepage="http://www.kodi.tv/"
 license="GPL-2.0-or-later"
 distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz"
-checksum=4f265901c00f582beb8d6ad96c9c303e5ab82611e828c7121ae822b07c0915cc
+checksum=bf2be186d8ae5b5377e43c06a538012bb9f51a0e98f8244b70a401006861d110
 LDFLAGS+=" -Wl,-z,stack-size=1048576"
 patch_args="-Np1"
 
diff --git a/srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmc.i.cpp b/srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmc.i.cpp
similarity index 99%
rename from srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmc.i.cpp
rename to srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmc.i.cpp
index ff397fb3686..42f767ab0f8 100644
--- a/srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmc.i.cpp
+++ b/srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmc.i.cpp
@@ -9714,7 +9714,7 @@ namespace PythonBindings
 
    // constants
    PyModule_AddStringConstant(module, "__author__", "Team Kodi <http://kodi.tv>");
-   PyModule_AddStringConstant(module, "__date__", "Wed Jun 19 18:36:55 GMT 2019");
+   PyModule_AddStringConstant(module, "__date__", "Sun Sep 01 10:47:01 GMT 2019");
    PyModule_AddStringConstant(module, "__version__", "2.26.0");
    PyModule_AddStringConstant(module, "__credits__", "Team Kodi");
    PyModule_AddStringConstant(module, "__platform__", "ALL");
diff --git a/srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmc.i.xml b/srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmc.i.xml
similarity index 61%
rename from srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmc.i.xml
rename to srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmc.i.xml
index 44a83fa491f..cd136323a35 100644
--- a/srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmc.i.xml
+++ b/srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmc.i.xml
@@ -1,146 +1,146 @@
 <?xml version="1.0" ?> 
-<top id="1" addr="0x7ff9f1f73b30" >
-    <attributelist id="2" addr="0x7ff9f1f73b30" >
-        <attribute name="outfile" value="AddonModuleXbmc.i.xml" id="3" addr="0x7ff9f1fba9d0" />
-        <attribute name="name" value="xbmc" id="4" addr="0x7ff9f1fba9d0" />
-        <attribute name="module" value="xbmc" id="5" addr="0x7ff9f1f89430" />
-        <attribute name="inputfile" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmc.i" id="6" addr="0x7ff9f1fba9d0" />
-        <attribute name="classes" value="0x7ff9f1f86950" id="7" addr="0x7ff9f1f86950" />
-        <attribute name="infile" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmc.i" id="8" addr="0x7ff9f1fba9d0" />
-        <attribute name="outfile_h" value="AddonModuleXbmc.i.h" id="9" addr="0x7ff9f1fba9d0" />
+<top id="1" addr="0x7fdf084cab30" >
+    <attributelist id="2" addr="0x7fdf084cab30" >
+        <attribute name="outfile" value="AddonModuleXbmc.i.xml" id="3" addr="0x7fdf085119d0" />
+        <attribute name="name" value="xbmc" id="4" addr="0x7fdf085119d0" />
+        <attribute name="module" value="xbmc" id="5" addr="0x7fdf084e0430" />
+        <attribute name="inputfile" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmc.i" id="6" addr="0x7fdf085119d0" />
+        <attribute name="classes" value="0x7fdf084dd950" id="7" addr="0x7fdf084dd950" />
+        <attribute name="infile" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmc.i" id="8" addr="0x7fdf085119d0" />
+        <attribute name="outfile_h" value="AddonModuleXbmc.i.h" id="9" addr="0x7fdf085119d0" />
     </attributelist >
 
-    <include id="10" addr="0x7ff9f1f83ed0" >
-        <attributelist id="11" addr="0x7ff9f1f83ed0" >
-            <attribute name="name" value="/usr/share/swig/3.0.12/swig.swg" id="12" addr="0x7ff9f1fba9d0" />
+    <include id="10" addr="0x7fdf084daed0" >
+        <attributelist id="11" addr="0x7fdf084daed0" >
+            <attribute name="name" value="/usr/share/swig/3.0.12/swig.swg" id="12" addr="0x7fdf085119d0" />
         </attributelist >
 
-        <include id="13" addr="0x7ff9f1f83f30" >
-            <attributelist id="14" addr="0x7ff9f1f83f30" >
-                <attribute name="name" value="/usr/share/swig/3.0.12/swigwarnings.swg" id="15" addr="0x7ff9f1fba9d0" />
+        <include id="13" addr="0x7fdf084daf30" >
+            <attributelist id="14" addr="0x7fdf084daf30" >
+                <attribute name="name" value="/usr/share/swig/3.0.12/swigwarnings.swg" id="15" addr="0x7fdf085119d0" />
             </attributelist >
 
-            <include id="16" addr="0x7ff9f1f847f0" >
-                <attributelist id="17" addr="0x7ff9f1f847f0" >
-                    <attribute name="name" value="/usr/share/swig/3.0.12/swigwarn.swg" id="18" addr="0x7ff9f1fba9d0" />
+            <include id="16" addr="0x7fdf084db7f0" >
+                <attributelist id="17" addr="0x7fdf084db7f0" >
+                    <attribute name="name" value="/usr/share/swig/3.0.12/swigwarn.swg" id="18" addr="0x7fdf085119d0" />
                 </attributelist >
              
             </include >
         </include >
-        <namespace id="19" addr="0x7ff9f1f86470" >
-            <attributelist id="20" addr="0x7ff9f1f86470" >
-                <attribute name="sym_name" value="std" id="21" addr="0x7ff9f1fba9d0" />
-                <attribute name="name" value="std" id="22" addr="0x7ff9f1fba9d0" />
-                <typescope id="23" addr="0x7ff9f1fb4910" >
-                    <attributelist id="24" addr="0x7ff9f1fb4910" >
-                        <attribute name="name" value="std" id="25" addr="0x7ff9f1fba9d0" />
-                        <typetab id="26" addr="0x7ff9f1fb4930" >
-                            <attributelist id="27" addr="0x7ff9f1fb4930" >
-                                <attribute name="initializer_list" value="initializer_list" id="28" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                            <typetabsitem id="29" addr="0x7ff9f1fb4a50" >
-                                <attributelist id="30" addr="0x7ff9f1fb4a50" >
+        <namespace id="19" addr="0x7fdf084dd470" >
+            <attributelist id="20" addr="0x7fdf084dd470" >
+                <attribute name="sym_name" value="std" id="21" addr="0x7fdf085119d0" />
+                <attribute name="name" value="std" id="22" addr="0x7fdf085119d0" />
+                <typescope id="23" addr="0x7fdf0850b910" >
+                    <attributelist id="24" addr="0x7fdf0850b910" >
+                        <attribute name="name" value="std" id="25" addr="0x7fdf085119d0" />
+                        <typetab id="26" addr="0x7fdf0850b930" >
+                            <attributelist id="27" addr="0x7fdf0850b930" >
+                                <attribute name="initializer_list" value="initializer_list" id="28" addr="0x7fdf085119d0" />
+                            </attributelist >
+                            <typetabsitem id="29" addr="0x7fdf0850ba50" >
+                                <attributelist id="30" addr="0x7fdf0850ba50" >
                                 </attributelist >
                             </typetabsitem >
                         </typetab >
-                        <attribute name="parent" value="0x7ff9f1f72a30" id="31" addr="0x7ff9f1f72a30" />
-                        <attribute name="qname" value="std" id="32" addr="0x7ff9f1fba9d0" />
-                        <attribute name="symtab" value="0x7ff9f1f863d0" id="33" addr="0x7ff9f1f863d0" />
+                        <attribute name="parent" value="0x7fdf084c9a30" id="31" addr="0x7fdf084c9a30" />
+                        <attribute name="qname" value="std" id="32" addr="0x7fdf085119d0" />
+                        <attribute name="symtab" value="0x7fdf084dd3d0" id="33" addr="0x7fdf084dd3d0" />
                     </attributelist >
-                    <typescopesitem id="34" addr="0x7ff9f1f86330" >
-                        <attributelist id="35" addr="0x7ff9f1f86330" >
+                    <typescopesitem id="34" addr="0x7fdf084dd330" >
+                        <attributelist id="35" addr="0x7fdf084dd330" >
                         </attributelist >
                     </typescopesitem >
-                    <typescopesitem id="36" addr="0x7ff9f1fb4930" >
-                        <attributelist id="37" addr="0x7ff9f1fb4930" >
-                            <attribute name="initializer_list" value="initializer_list" id="38" addr="0x7ff9f1fba9d0" />
+                    <typescopesitem id="36" addr="0x7fdf0850b930" >
+                        <attributelist id="37" addr="0x7fdf0850b930" >
+                            <attribute name="initializer_list" value="initializer_list" id="38" addr="0x7fdf085119d0" />
                         </attributelist >
                     </typescopesitem >
-                    <typescopesitem id="39" addr="0x7ff9f1f72a30" >
-                        <attributelist id="40" addr="0x7ff9f1f72a30" >
-                            <attribute name="name" value="" id="41" addr="0x7ff9f1fba9d0" />
-                            <typetab id="42" addr="0x7ff9f1f72a90" >
-                                <attributelist id="43" addr="0x7ff9f1f72a90" >
-                                    <attribute name="CGUIDialogKeyboardGeneric" value="CGUIDialogKeyboardGeneric" id="44" addr="0x7ff9f1fba9d0" />
+                    <typescopesitem id="39" addr="0x7fdf084c9a30" >
+                        <attributelist id="40" addr="0x7fdf084c9a30" >
+                            <attribute name="name" value="" id="41" addr="0x7fdf085119d0" />
+                            <typetab id="42" addr="0x7fdf084c9a90" >
+                                <attributelist id="43" addr="0x7fdf084c9a90" >
+                                    <attribute name="CGUIDialogKeyboardGeneric" value="CGUIDialogKeyboardGeneric" id="44" addr="0x7fdf085119d0" />
                                 </attributelist >
-                                <typetabsitem id="45" addr="0x7ff9f1fb7950" >
-                                    <attributelist id="46" addr="0x7ff9f1fb7950" >
+                                <typetabsitem id="45" addr="0x7fdf0850e950" >
+                                    <attributelist id="46" addr="0x7fdf0850e950" >
                                     </attributelist >
                                 </typetabsitem >
                             </typetab >
                         </attributelist >
                     </typescopesitem >
-                    <typescopesitem id="47" addr="0x7ff9f1fb4950" >
-                        <attributelist id="48" addr="0x7ff9f1fb4950" >
+                    <typescopesitem id="47" addr="0x7fdf0850b950" >
+                        <attributelist id="48" addr="0x7fdf0850b950" >
                         </attributelist >
                     </typescopesitem >
-                    <typescopesitem id="49" addr="0x7ff9f1f863d0" >
-                        <attributelist id="50" addr="0x7ff9f1f863d0" >
-                            <attribute name="name" value="std" id="51" addr="0x7ff9f1fba9d0" />
-                            <attribute name="csymtab" value="0x7ff9f1f86410" id="52" addr="0x7ff9f1f86410" />
-                            <attribute name="symtab" value="0x7ff9f1f863b0" id="53" addr="0x7ff9f1f863b0" />
+                    <typescopesitem id="49" addr="0x7fdf084dd3d0" >
+                        <attributelist id="50" addr="0x7fdf084dd3d0" >
+                            <attribute name="name" value="std" id="51" addr="0x7fdf085119d0" />
+                            <attribute name="csymtab" value="0x7fdf084dd410" id="52" addr="0x7fdf084dd410" />
+                            <attribute name="symtab" value="0x7fdf084dd3b0" id="53" addr="0x7fdf084dd3b0" />
                         </attributelist >
                     </typescopesitem >
                 </typescope >
-                <attribute name="symtab" value="0x7ff9f1f863d0" id="54" addr="0x7ff9f1f863d0" />
-                <attribute name="sym_symtab" value="0x7ff9f1f72950" id="55" addr="0x7ff9f1f72950" />
-                <attribute name="sym_overname" value="__SWIG_0" id="56" addr="0x7ff9f1fba9d0" />
+                <attribute name="symtab" value="0x7fdf084dd3d0" id="54" addr="0x7fdf084dd3d0" />
+                <attribute name="sym_symtab" value="0x7fdf084c9950" id="55" addr="0x7fdf084c9950" />
+                <attribute name="sym_overname" value="__SWIG_0" id="56" addr="0x7fdf085119d0" />
             </attributelist >
 
-            <template id="57" addr="0x7ff9f1f865f0" >
-                <attributelist id="58" addr="0x7ff9f1f865f0" >
-                    <attribute name="templatetype" value="class" id="59" addr="0x7ff9f1fba9d0" />
-                    <attribute name="sym_typename" value="1" id="60" addr="0x7ff9f1fba9d0" />
-                    <attribute name="name" value="initializer_list" id="61" addr="0x7ff9f1fba9d0" />
-                    <attribute name="sym_symtab" value="0x7ff9f1f863d0" id="62" addr="0x7ff9f1f863d0" />
-                    <attribute name="symtab" value="0x7ff9f1f86810" id="63" addr="0x7ff9f1f86810" />
-                    <attribute name="allows_typedef" value="1" id="64" addr="0x7ff9f1fba9d0" />
-                    <attribute name="kind" value="class" id="65" addr="0x7ff9f1fba9d0" />
-                    <attribute name="sym_name" value="initializer_list" id="66" addr="0x7ff9f1fba9d0" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="67" addr="0x7ff9f1fba9d0" />
-                    <templateparms id="68" addr="0x7ff9f1f86510" >
+            <template id="57" addr="0x7fdf084dd5f0" >
+                <attributelist id="58" addr="0x7fdf084dd5f0" >
+                    <attribute name="templatetype" value="class" id="59" addr="0x7fdf085119d0" />
+                    <attribute name="sym_typename" value="1" id="60" addr="0x7fdf085119d0" />
+                    <attribute name="name" value="initializer_list" id="61" addr="0x7fdf085119d0" />
+                    <attribute name="sym_symtab" value="0x7fdf084dd3d0" id="62" addr="0x7fdf084dd3d0" />
+                    <attribute name="symtab" value="0x7fdf084dd810" id="63" addr="0x7fdf084dd810" />
+                    <attribute name="allows_typedef" value="1" id="64" addr="0x7fdf085119d0" />
+                    <attribute name="kind" value="class" id="65" addr="0x7fdf085119d0" />
+                    <attribute name="sym_name" value="initializer_list" id="66" addr="0x7fdf085119d0" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="67" addr="0x7fdf085119d0" />
+                    <templateparms id="68" addr="0x7fdf084dd510" >
                         <parm id="69">
-                            <attributelist id="70" addr="0x7ff9f1f86510" >
-                                <attribute name="name" value="T" id="71" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="typename T" id="72" addr="0x7ff9f1fba9d0" />
+                            <attributelist id="70" addr="0x7fdf084dd510" >
+                                <attribute name="name" value="T" id="71" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="typename T" id="72" addr="0x7fdf085119d0" />
                             </attributelist >
                         </parm >
                     </templateparms >
                 </attributelist >
 
-                <access id="73" addr="0x7ff9f1f869d0" >
-                    <attributelist id="74" addr="0x7ff9f1f869d0" >
-                        <attribute name="kind" value="public" id="75" addr="0x7ff9f1fba9d0" />
+                <access id="73" addr="0x7fdf084dd9d0" >
+                    <attributelist id="74" addr="0x7fdf084dd9d0" >
+                        <attribute name="kind" value="public" id="75" addr="0x7fdf085119d0" />
                     </attributelist >
                  
                 </access >
             </template >
-            <typemap id="76" addr="0x7ff9f1f87030" >
-                <attributelist id="77" addr="0x7ff9f1f87030" >
-                    <kwargs id="78" addr="0x7ff9f1f86d30" >
-                        <attributelist id="79" addr="0x7ff9f1f86d30" >
-                            <attribute name="name" value="warning" id="80" addr="0x7ff9f1fba9d0" />
-                            <attribute name="value" value="476:Initialization using std::initializer_list." id="81" addr="0x7ff9f1fba9d0" />
+            <typemap id="76" addr="0x7fdf084de030" >
+                <attributelist id="77" addr="0x7fdf084de030" >
+                    <kwargs id="78" addr="0x7fdf084ddd30" >
+                        <attributelist id="79" addr="0x7fdf084ddd30" >
+                            <attribute name="name" value="warning" id="80" addr="0x7fdf085119d0" />
+                            <attribute name="value" value="476:Initialization using std::initializer_list." id="81" addr="0x7fdf085119d0" />
                         </attributelist >
-                        <kwargssitem id="82" addr="0x7ff9f1f86eb0" >
-                            <attributelist id="83" addr="0x7ff9f1f86eb0" >
+                        <kwargssitem id="82" addr="0x7fdf084ddeb0" >
+                            <attributelist id="83" addr="0x7fdf084ddeb0" >
                             </attributelist >
                         </kwargssitem >
-                        <kwargssitem id="84" addr="0x7ff9f1f86d10" >
-                            <attributelist id="85" addr="0x7ff9f1f86d10" >
+                        <kwargssitem id="84" addr="0x7fdf084ddd10" >
+                            <attributelist id="85" addr="0x7fdf084ddd10" >
                             </attributelist >
                         </kwargssitem >
                     </kwargs >
-                    <attribute name="code" value="" id="86" addr="0x7ff9f1fba9d0" />
-                    <attribute name="method" value="in" id="87" addr="0x7ff9f1fba9d0" />
+                    <attribute name="code" value="" id="86" addr="0x7fdf085119d0" />
+                    <attribute name="method" value="in" id="87" addr="0x7fdf085119d0" />
                 </attributelist >
 
-                <typemapitem id="88" addr="0x7ff9f1f86f50" >
-                    <attributelist id="89" addr="0x7ff9f1f86f50" >
-                        <parmlist id="90" addr="0x7ff9f1f86f90" >
+                <typemapitem id="88" addr="0x7fdf084ddf50" >
+                    <attributelist id="89" addr="0x7fdf084ddf50" >
+                        <parmlist id="90" addr="0x7fdf084ddf90" >
                             <parm id="91">
-                                <attributelist id="92" addr="0x7ff9f1f86f90" >
-                                    <attribute name="type" value="std::initializer_list&lt;(T)>" id="93" addr="0x7ff9f1fba9d0" />
+                                <attributelist id="92" addr="0x7fdf084ddf90" >
+                                    <attribute name="type" value="std::initializer_list&lt;(T)>" id="93" addr="0x7fdf085119d0" />
                                 </attributelist >
                             </parm >
                         </parmlist >
@@ -148,32 +148,32 @@
                  
                 </typemapitem >
             </typemap >
-            <typemap id="94" addr="0x7ff9f1f873b0" >
-                <attributelist id="95" addr="0x7ff9f1f873b0" >
-                    <kwargs id="96" addr="0x7ff9f1f87150" >
-                        <attributelist id="97" addr="0x7ff9f1f87150" >
-                            <attribute name="name" value="precedence" id="98" addr="0x7ff9f1fba9d0" />
-                            <attribute name="value" value="0" id="99" addr="0x7ff9f1fba9d0" />
+            <typemap id="94" addr="0x7fdf084de3b0" >
+                <attributelist id="95" addr="0x7fdf084de3b0" >
+                    <kwargs id="96" addr="0x7fdf084de150" >
+                        <attributelist id="97" addr="0x7fdf084de150" >
+                            <attribute name="name" value="precedence" id="98" addr="0x7fdf085119d0" />
+                            <attribute name="value" value="0" id="99" addr="0x7fdf085119d0" />
                         </attributelist >
-                        <kwargssitem id="100" addr="0x7ff9f1f87170" >
-                            <attributelist id="101" addr="0x7ff9f1f87170" >
+                        <kwargssitem id="100" addr="0x7fdf084de170" >
+                            <attributelist id="101" addr="0x7fdf084de170" >
                             </attributelist >
                         </kwargssitem >
-                        <kwargssitem id="102" addr="0x7ff9f1f87190" >
-                            <attributelist id="103" addr="0x7ff9f1f87190" >
+                        <kwargssitem id="102" addr="0x7fdf084de190" >
+                            <attributelist id="103" addr="0x7fdf084de190" >
                             </attributelist >
                         </kwargssitem >
                     </kwargs >
-                    <attribute name="code" value="" id="104" addr="0x7ff9f1fba9d0" />
-                    <attribute name="method" value="typecheck" id="105" addr="0x7ff9f1fba9d0" />
+                    <attribute name="code" value="" id="104" addr="0x7fdf085119d0" />
+                    <attribute name="method" value="typecheck" id="105" addr="0x7fdf085119d0" />
                 </attributelist >
 
-                <typemapitem id="106" addr="0x7ff9f1f872f0" >
-                    <attributelist id="107" addr="0x7ff9f1f872f0" >
-                        <parmlist id="108" addr="0x7ff9f1f87330" >
+                <typemapitem id="106" addr="0x7fdf084de2f0" >
+                    <attributelist id="107" addr="0x7fdf084de2f0" >
+                        <parmlist id="108" addr="0x7fdf084de330" >
                             <parm id="109">
-                                <attributelist id="110" addr="0x7ff9f1f87330" >
-                                    <attribute name="type" value="std::initializer_list&lt;(T)>" id="111" addr="0x7ff9f1fba9d0" />
+                                <attributelist id="110" addr="0x7fdf084de330" >
+                                    <attribute name="type" value="std::initializer_list&lt;(T)>" id="111" addr="0x7fdf085119d0" />
                                 </attributelist >
                             </parm >
                         </parmlist >
@@ -182,18 +182,18 @@
                 </typemapitem >
             </typemap >
         </namespace >
-        <typemap id="112" addr="0x7ff9f1f875d0" >
-            <attributelist id="113" addr="0x7ff9f1f875d0" >
-                <attribute name="code" value="delete [] $1;" id="114" addr="0x7ff9f1fba9d0" />
-                <attribute name="method" value="newfree" id="115" addr="0x7ff9f1fba9d0" />
+        <typemap id="112" addr="0x7fdf084de5d0" >
+            <attributelist id="113" addr="0x7fdf084de5d0" >
+                <attribute name="code" value="delete [] $1;" id="114" addr="0x7fdf085119d0" />
+                <attribute name="method" value="newfree" id="115" addr="0x7fdf085119d0" />
             </attributelist >
 
-            <typemapitem id="116" addr="0x7ff9f1f874f0" >
-                <attributelist id="117" addr="0x7ff9f1f874f0" >
-                    <parmlist id="118" addr="0x7ff9f1f87530" >
+            <typemapitem id="116" addr="0x7fdf084de4f0" >
+                <attributelist id="117" addr="0x7fdf084de4f0" >
+                    <parmlist id="118" addr="0x7fdf084de530" >
                         <parm id="119">
-                            <attributelist id="120" addr="0x7ff9f1f87530" >
-                                <attribute name="type" value="p.char" id="121" addr="0x7ff9f1fba9d0" />
+                            <attributelist id="120" addr="0x7fdf084de530" >
+                                <attribute name="type" value="p.char" id="121" addr="0x7fdf085119d0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -201,18 +201,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="122" addr="0x7ff9f1f877b0" >
-            <attributelist id="123" addr="0x7ff9f1f877b0" >
-                <attribute name="code" value="{&#10;  delete [] $1;&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="124" addr="0x7ff9f1fba9d0" />
-                <attribute name="method" value="memberin" id="125" addr="0x7ff9f1fba9d0" />
+        <typemap id="122" addr="0x7fdf084de7b0" >
+            <attributelist id="123" addr="0x7fdf084de7b0" >
+                <attribute name="code" value="{&#10;  delete [] $1;&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="124" addr="0x7fdf085119d0" />
+                <attribute name="method" value="memberin" id="125" addr="0x7fdf085119d0" />
             </attributelist >
 
-            <typemapitem id="126" addr="0x7ff9f1f876f0" >
-                <attributelist id="127" addr="0x7ff9f1f876f0" >
-                    <parmlist id="128" addr="0x7ff9f1f87730" >
+            <typemapitem id="126" addr="0x7fdf084de6f0" >
+                <attributelist id="127" addr="0x7fdf084de6f0" >
+                    <parmlist id="128" addr="0x7fdf084de730" >
                         <parm id="129">
-                            <attributelist id="130" addr="0x7ff9f1f87730" >
-                                <attribute name="type" value="p.char" id="131" addr="0x7ff9f1fba9d0" />
+                            <attributelist id="130" addr="0x7fdf084de730" >
+                                <attribute name="type" value="p.char" id="131" addr="0x7fdf085119d0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -220,32 +220,32 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="132" addr="0x7ff9f1f87a10" >
-            <attributelist id="133" addr="0x7ff9f1f87a10" >
-                <kwargs id="134" addr="0x7ff9f1f87850" >
-                    <attributelist id="135" addr="0x7ff9f1f87850" >
-                        <attribute name="name" value="warning" id="136" addr="0x7ff9f1fba9d0" />
-                        <attribute name="value" value="451:Setting a const char * variable may leak memory." id="137" addr="0x7ff9f1fba9d0" />
+        <typemap id="132" addr="0x7fdf084dea10" >
+            <attributelist id="133" addr="0x7fdf084dea10" >
+                <kwargs id="134" addr="0x7fdf084de850" >
+                    <attributelist id="135" addr="0x7fdf084de850" >
+                        <attribute name="name" value="warning" id="136" addr="0x7fdf085119d0" />
+                        <attribute name="value" value="451:Setting a const char * variable may leak memory." id="137" addr="0x7fdf085119d0" />
                     </attributelist >
-                    <kwargssitem id="138" addr="0x7ff9f1f87870" >
-                        <attributelist id="139" addr="0x7ff9f1f87870" >
+                    <kwargssitem id="138" addr="0x7fdf084de870" >
+                        <attributelist id="139" addr="0x7fdf084de870" >
                         </attributelist >
                     </kwargssitem >
-                    <kwargssitem id="140" addr="0x7ff9f1f87830" >
-                        <attributelist id="141" addr="0x7ff9f1f87830" >
+                    <kwargssitem id="140" addr="0x7fdf084de830" >
+                        <attributelist id="141" addr="0x7fdf084de830" >
                         </attributelist >
                     </kwargssitem >
                 </kwargs >
-                <attribute name="code" value="{&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="142" addr="0x7ff9f1fba9d0" />
-                <attribute name="method" value="memberin" id="143" addr="0x7ff9f1fba9d0" />
+                <attribute name="code" value="{&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="142" addr="0x7fdf085119d0" />
+                <attribute name="method" value="memberin" id="143" addr="0x7fdf085119d0" />
             </attributelist >
 
-            <typemapitem id="144" addr="0x7ff9f1f87950" >
-                <attributelist id="145" addr="0x7ff9f1f87950" >
-                    <parmlist id="146" addr="0x7ff9f1f87990" >
+            <typemapitem id="144" addr="0x7fdf084de950" >
+                <attributelist id="145" addr="0x7fdf084de950" >
+                    <parmlist id="146" addr="0x7fdf084de990" >
                         <parm id="147">
-                            <attributelist id="148" addr="0x7ff9f1f87990" >
-                                <attribute name="type" value="p.q(const).char" id="149" addr="0x7ff9f1fba9d0" />
+                            <attributelist id="148" addr="0x7fdf084de990" >
+                                <attribute name="type" value="p.q(const).char" id="149" addr="0x7fdf085119d0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -253,18 +253,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="150" addr="0x7ff9f1f87bf0" >
-            <attributelist id="151" addr="0x7ff9f1f87bf0" >
-                <attribute name="code" value="{&#10;  delete [] $1;&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="152" addr="0x7ff9f1fba9d0" />
-                <attribute name="method" value="globalin" id="153" addr="0x7ff9f1fba9d0" />
+        <typemap id="150" addr="0x7fdf084debf0" >
+            <attributelist id="151" addr="0x7fdf084debf0" >
+                <attribute name="code" value="{&#10;  delete [] $1;&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="152" addr="0x7fdf085119d0" />
+                <attribute name="method" value="globalin" id="153" addr="0x7fdf085119d0" />
             </attributelist >
 
-            <typemapitem id="154" addr="0x7ff9f1f87b30" >
-                <attributelist id="155" addr="0x7ff9f1f87b30" >
-                    <parmlist id="156" addr="0x7ff9f1f87b70" >
+            <typemapitem id="154" addr="0x7fdf084deb30" >
+                <attributelist id="155" addr="0x7fdf084deb30" >
+                    <parmlist id="156" addr="0x7fdf084deb70" >
                         <parm id="157">
-                            <attributelist id="158" addr="0x7ff9f1f87b70" >
-                                <attribute name="type" value="p.char" id="159" addr="0x7ff9f1fba9d0" />
+                            <attributelist id="158" addr="0x7fdf084deb70" >
+                                <attribute name="type" value="p.char" id="159" addr="0x7fdf085119d0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -272,32 +272,32 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="160" addr="0x7ff9f1f87e50" >
-            <attributelist id="161" addr="0x7ff9f1f87e50" >
-                <kwargs id="162" addr="0x7ff9f1f87c90" >
-                    <attributelist id="163" addr="0x7ff9f1f87c90" >
-                        <attribute name="name" value="warning" id="164" addr="0x7ff9f1fba9d0" />
-                        <attribute name="value" value="451:Setting a const char * variable may leak memory." id="165" addr="0x7ff9f1fba9d0" />
+        <typemap id="160" addr="0x7fdf084dee50" >
+            <attributelist id="161" addr="0x7fdf084dee50" >
+                <kwargs id="162" addr="0x7fdf084dec90" >
+                    <attributelist id="163" addr="0x7fdf084dec90" >
+                        <attribute name="name" value="warning" id="164" addr="0x7fdf085119d0" />
+                        <attribute name="value" value="451:Setting a const char * variable may leak memory." id="165" addr="0x7fdf085119d0" />
                     </attributelist >
-                    <kwargssitem id="166" addr="0x7ff9f1f87cb0" >
-                        <attributelist id="167" addr="0x7ff9f1f87cb0" >
+                    <kwargssitem id="166" addr="0x7fdf084decb0" >
+                        <attributelist id="167" addr="0x7fdf084decb0" >
                         </attributelist >
                     </kwargssitem >
-                    <kwargssitem id="168" addr="0x7ff9f1f87c70" >
-                        <attributelist id="169" addr="0x7ff9f1f87c70" >
+                    <kwargssitem id="168" addr="0x7fdf084dec70" >
+                        <attributelist id="169" addr="0x7fdf084dec70" >
                         </attributelist >
                     </kwargssitem >
                 </kwargs >
-                <attribute name="code" value="{&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="170" addr="0x7ff9f1fba9d0" />
-                <attribute name="method" value="globalin" id="171" addr="0x7ff9f1fba9d0" />
+                <attribute name="code" value="{&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="170" addr="0x7fdf085119d0" />
+                <attribute name="method" value="globalin" id="171" addr="0x7fdf085119d0" />
             </attributelist >
 
-            <typemapitem id="172" addr="0x7ff9f1f87d90" >
-                <attributelist id="173" addr="0x7ff9f1f87d90" >
-                    <parmlist id="174" addr="0x7ff9f1f87dd0" >
+            <typemapitem id="172" addr="0x7fdf084ded90" >
+                <attributelist id="173" addr="0x7fdf084ded90" >
+                    <parmlist id="174" addr="0x7fdf084dedd0" >
                         <parm id="175">
-                            <attributelist id="176" addr="0x7ff9f1f87dd0" >
-                                <attribute name="type" value="p.q(const).char" id="177" addr="0x7ff9f1fba9d0" />
+                            <attributelist id="176" addr="0x7fdf084dedd0" >
+                                <attribute name="type" value="p.q(const).char" id="177" addr="0x7fdf085119d0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -305,18 +305,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="178" addr="0x7ff9f1f88070" >
-            <attributelist id="179" addr="0x7ff9f1f88070" >
-                <attribute name="code" value="{&#10;  if($input) {&#10;    strncpy((char*)$1, (const char *)$input, $1_dim0-1);&#10;    $1[$1_dim0-1] = 0;&#10;  } else {&#10;    $1[0] = 0;&#10;  }&#10;}" id="180" addr="0x7ff9f1fba9d0" />
-                <attribute name="method" value="memberin" id="181" addr="0x7ff9f1fba9d0" />
+        <typemap id="178" addr="0x7fdf084df070" >
+            <attributelist id="179" addr="0x7fdf084df070" >
+                <attribute name="code" value="{&#10;  if($input) {&#10;    strncpy((char*)$1, (const char *)$input, $1_dim0-1);&#10;    $1[$1_dim0-1] = 0;&#10;  } else {&#10;    $1[0] = 0;&#10;  }&#10;}" id="180" addr="0x7fdf085119d0" />
+                <attribute name="method" value="memberin" id="181" addr="0x7fdf085119d0" />
             </attributelist >
 
-            <typemapitem id="182" addr="0x7ff9f1f87fb0" >
-                <attributelist id="183" addr="0x7ff9f1f87fb0" >
-                    <parmlist id="184" addr="0x7ff9f1f87ff0" >
+            <typemapitem id="182" addr="0x7fdf084defb0" >
+                <attributelist id="183" addr="0x7fdf084defb0" >
+                    <parmlist id="184" addr="0x7fdf084deff0" >
                         <parm id="185">
-                            <attributelist id="186" addr="0x7ff9f1f87ff0" >
-                                <attribute name="type" value="a(ANY).char" id="187" addr="0x7ff9f1fba9d0" />
+                            <attributelist id="186" addr="0x7fdf084deff0" >
+                                <attribute name="type" value="a(ANY).char" id="187" addr="0x7fdf085119d0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -324,18 +324,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="188" addr="0x7ff9f1f88290" >
-            <attributelist id="189" addr="0x7ff9f1f88290" >
-                <attribute name="code" value="{&#10;  if($input) {&#10;    strncpy((char*)$1, (const char *)$input, $1_dim0-1);&#10;    $1[$1_dim0-1] = 0;&#10;  } else {&#10;    $1[0] = 0;&#10;  }&#10;}" id="190" addr="0x7ff9f1fba9d0" />
-                <attribute name="method" value="globalin" id="191" addr="0x7ff9f1fba9d0" />
+        <typemap id="188" addr="0x7fdf084df290" >
+            <attributelist id="189" addr="0x7fdf084df290" >
+                <attribute name="code" value="{&#10;  if($input) {&#10;    strncpy((char*)$1, (const char *)$input, $1_dim0-1);&#10;    $1[$1_dim0-1] = 0;&#10;  } else {&#10;    $1[0] = 0;&#10;  }&#10;}" id="190" addr="0x7fdf085119d0" />
+                <attribute name="method" value="globalin" id="191" addr="0x7fdf085119d0" />
             </attributelist >
 
-            <typemapitem id="192" addr="0x7ff9f1f881d0" >
-                <attributelist id="193" addr="0x7ff9f1f881d0" >
-                    <parmlist id="194" addr="0x7ff9f1f88210" >
+            <typemapitem id="192" addr="0x7fdf084df1d0" >
+                <attributelist id="193" addr="0x7fdf084df1d0" >
+                    <parmlist id="194" addr="0x7fdf084df210" >
                         <parm id="195">
-                            <attributelist id="196" addr="0x7ff9f1f88210" >
-                                <attribute name="type" value="a(ANY).char" id="197" addr="0x7ff9f1fba9d0" />
+                            <attributelist id="196" addr="0x7fdf084df210" >
+                                <attribute name="type" value="a(ANY).char" id="197" addr="0x7fdf085119d0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -343,18 +343,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="198" addr="0x7ff9f1f88470" >
-            <attributelist id="199" addr="0x7ff9f1f88470" >
-                <attribute name="code" value="{&#10;  if ($input) strcpy((char *)$1, (const char *)$input);&#10;  else $1[0] = 0;&#10;}" id="200" addr="0x7ff9f1fba9d0" />
-                <attribute name="method" value="memberin" id="201" addr="0x7ff9f1fba9d0" />
+        <typemap id="198" addr="0x7fdf084df470" >
+            <attributelist id="199" addr="0x7fdf084df470" >
+                <attribute name="code" value="{&#10;  if ($input) strcpy((char *)$1, (const char *)$input);&#10;  else $1[0] = 0;&#10;}" id="200" addr="0x7fdf085119d0" />
+                <attribute name="method" value="memberin" id="201" addr="0x7fdf085119d0" />
             </attributelist >
 
-            <typemapitem id="202" addr="0x7ff9f1f883b0" >
-                <attributelist id="203" addr="0x7ff9f1f883b0" >
-                    <parmlist id="204" addr="0x7ff9f1f883f0" >
+            <typemapitem id="202" addr="0x7fdf084df3b0" >
+                <attributelist id="203" addr="0x7fdf084df3b0" >
+                    <parmlist id="204" addr="0x7fdf084df3f0" >
                         <parm id="205">
-                            <attributelist id="206" addr="0x7ff9f1f883f0" >
-                                <attribute name="type" value="a().char" id="207" addr="0x7ff9f1fba9d0" />
+                            <attributelist id="206" addr="0x7fdf084df3f0" >
+                                <attribute name="type" value="a().char" id="207" addr="0x7fdf085119d0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -362,18 +362,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="208" addr="0x7ff9f1f88650" >
-            <attributelist id="209" addr="0x7ff9f1f88650" >
-                <attribute name="code" value="{&#10;  if ($input) strcpy((char *)$1, (const char *)$input);&#10;  else $1[0] = 0;&#10;}" id="210" addr="0x7ff9f1fba9d0" />
-                <attribute name="method" value="globalin" id="211" addr="0x7ff9f1fba9d0" />
+        <typemap id="208" addr="0x7fdf084df650" >
+            <attributelist id="209" addr="0x7fdf084df650" >
+                <attribute name="code" value="{&#10;  if ($input) strcpy((char *)$1, (const char *)$input);&#10;  else $1[0] = 0;&#10;}" id="210" addr="0x7fdf085119d0" />
+                <attribute name="method" value="globalin" id="211" addr="0x7fdf085119d0" />
             </attributelist >
 
-            <typemapitem id="212" addr="0x7ff9f1f88590" >
-                <attributelist id="213" addr="0x7ff9f1f88590" >
-                    <parmlist id="214" addr="0x7ff9f1f885d0" >
+            <typemapitem id="212" addr="0x7fdf084df590" >
+                <attributelist id="213" addr="0x7fdf084df590" >
+                    <parmlist id="214" addr="0x7fdf084df5d0" >
                         <parm id="215">
-                            <attributelist id="216" addr="0x7ff9f1f885d0" >
-                                <attribute name="type" value="a().char" id="217" addr="0x7ff9f1fba9d0" />
+                            <attributelist id="216" addr="0x7fdf084df5d0" >
+                                <attribute name="type" value="a().char" id="217" addr="0x7fdf085119d0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -381,18 +381,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="218" addr="0x7ff9f1f88870" >
-            <attributelist id="219" addr="0x7ff9f1f88870" >
-                <attribute name="code" value="{&#10;  size_t ii;&#10;  $1_basetype *b = ($1_basetype *) $1;&#10;  for (ii = 0; ii &lt; (size_t)$1_size; ii++) b[ii] = *(($1_basetype *) $input + ii);&#10;}" id="220" addr="0x7ff9f1fba9d0" />
-                <attribute name="method" value="memberin" id="221" addr="0x7ff9f1fba9d0" />
+        <typemap id="218" addr="0x7fdf084df870" >
+            <attributelist id="219" addr="0x7fdf084df870" >
+                <attribute name="code" value="{&#10;  size_t ii;&#10;  $1_basetype *b = ($1_basetype *) $1;&#10;  for (ii = 0; ii &lt; (size_t)$1_size; ii++) b[ii] = *(($1_basetype *) $input + ii);&#10;}" id="220" addr="0x7fdf085119d0" />
+                <attribute name="method" value="memberin" id="221" addr="0x7fdf085119d0" />
             </attributelist >
 
-            <typemapitem id="222" addr="0x7ff9f1f887b0" >
-                <attributelist id="223" addr="0x7ff9f1f887b0" >
-                    <parmlist id="224" addr="0x7ff9f1f887f0" >
+            <typemapitem id="222" addr="0x7fdf084df7b0" >
+                <attributelist id="223" addr="0x7fdf084df7b0" >
+                    <parmlist id="224" addr="0x7fdf084df7f0" >
                         <parm id="225">
-                            <attributelist id="226" addr="0x7ff9f1f887f0" >
-                                <attribute name="type" value="a(ANY).SWIGTYPE" id="227" addr="0x7ff9f1fba9d0" />
+                            <attributelist id="226" addr="0x7fdf084df7f0" >
+                                <attribute name="type" value="a(ANY).SWIGTYPE" id="227" addr="0x7fdf085119d0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -400,18 +400,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="228" addr="0x7ff9f1f88a90" >
-            <attributelist id="229" addr="0x7ff9f1f88a90" >
-                <attribute name="code" value="{&#10;  size_t ii;&#10;  $1_basetype *b = ($1_basetype *) $1;&#10;  for (ii = 0; ii &lt; (size_t)$1_size; ii++) b[ii] = *(($1_basetype *) $input + ii);&#10;}" id="230" addr="0x7ff9f1fba9d0" />
-                <attribute name="method" value="globalin" id="231" addr="0x7ff9f1fba9d0" />
+        <typemap id="228" addr="0x7fdf084dfa90" >
+            <attributelist id="229" addr="0x7fdf084dfa90" >
+                <attribute name="code" value="{&#10;  size_t ii;&#10;  $1_basetype *b = ($1_basetype *) $1;&#10;  for (ii = 0; ii &lt; (size_t)$1_size; ii++) b[ii] = *(($1_basetype *) $input + ii);&#10;}" id="230" addr="0x7fdf085119d0" />
+                <attribute name="method" value="globalin" id="231" addr="0x7fdf085119d0" />
             </attributelist >
 
-            <typemapitem id="232" addr="0x7ff9f1f889d0" >
-                <attributelist id="233" addr="0x7ff9f1f889d0" >
-                    <parmlist id="234" addr="0x7ff9f1f88a10" >
+            <typemapitem id="232" addr="0x7fdf084df9d0" >
+                <attributelist id="233" addr="0x7fdf084df9d0" >
+                    <parmlist id="234" addr="0x7fdf084dfa10" >
                         <parm id="235">
-                            <attributelist id="236" addr="0x7ff9f1f88a10" >
-                                <attribute name="type" value="a(ANY).SWIGTYPE" id="237" addr="0x7ff9f1fba9d0" />
+                            <attributelist id="236" addr="0x7fdf084dfa10" >
+                                <attribute name="type" value="a(ANY).SWIGTYPE" id="237" addr="0x7fdf085119d0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -419,18 +419,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="238" addr="0x7ff9f1f88cf0" >
-            <attributelist id="239" addr="0x7ff9f1f88cf0" >
-                <attribute name="code" value="{&#10;  $basetype (*inp)[$1_dim1] = ($basetype (*)[$1_dim1])($input);&#10;  $basetype (*dest)[$1_dim1] = ($basetype (*)[$1_dim1])($1);&#10;  size_t ii = 0;&#10;  for (; ii &lt; $1_dim0; ++ii) {&#10;    $basetype *ip = inp[ii];&#10;    $basetype *dp = dest[ii];&#10;    size_t jj = 0;&#10;    for (; jj &lt; $1_dim1; ++jj) dp[jj] = ip[jj];&#10;  }&#10;}" id="240" addr="0x7ff9f1fba9d0" />
-                <attribute name="method" value="memberin" id="241" addr="0x7ff9f1fba9d0" />
+        <typemap id="238" addr="0x7fdf084dfcf0" >
+            <attributelist id="239" addr="0x7fdf084dfcf0" >
+                <attribute name="code" value="{&#10;  $basetype (*inp)[$1_dim1] = ($basetype (*)[$1_dim1])($input);&#10;  $basetype (*dest)[$1_dim1] = ($basetype (*)[$1_dim1])($1);&#10;  size_t ii = 0;&#10;  for (; ii &lt; $1_dim0; ++ii) {&#10;    $basetype *ip = inp[ii];&#10;    $basetype *dp = dest[ii];&#10;    size_t jj = 0;&#10;    for (; jj &lt; $1_dim1; ++jj) dp[jj] = ip[jj];&#10;  }&#10;}" id="240" addr="0x7fdf085119d0" />
+                <attribute name="method" value="memberin" id="241" addr="0x7fdf085119d0" />
             </attributelist >
 
-            <typemapitem id="242" addr="0x7ff9f1f88bd0" >
-                <attributelist id="243" addr="0x7ff9f1f88bd0" >
-                    <parmlist id="244" addr="0x7ff9f1f88c70" >
+            <typemapitem id="242" addr="0x7fdf084dfbd0" >
+                <attributelist id="243" addr="0x7fdf084dfbd0" >
+                    <parmlist id="244" addr="0x7fdf084dfc70" >
                         <parm id="245">
-                            <attributelist id="246" addr="0x7ff9f1f88c70" >
-                                <attribute name="type" value="a(ANY).a(ANY).SWIGTYPE" id="247" addr="0x7ff9f1fba9d0" />
+                            <attributelist id="246" addr="0x7fdf084dfc70" >
+                                <attribute name="type" value="a(ANY).a(ANY).SWIGTYPE" id="247" addr="0x7fdf085119d0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -438,18 +438,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="248" addr="0x7ff9f1f88f50" >
-            <attributelist id="249" addr="0x7ff9f1f88f50" >
-                <attribute name="code" value="{&#10;  $basetype (*inp)[$1_dim1] = ($basetype (*)[$1_dim1])($input);&#10;  $basetype (*dest)[$1_dim1] = ($basetype (*)[$1_dim1])($1);&#10;  size_t ii = 0;&#10;  for (; ii &lt; $1_dim0; ++ii) {&#10;    $basetype *ip = inp[ii];&#10;    $basetype *dp = dest[ii];&#10;    size_t jj = 0;&#10;    for (; jj &lt; $1_dim1; ++jj) dp[jj] = ip[jj];&#10;  }&#10;}" id="250" addr="0x7ff9f1fba9d0" />
-                <attribute name="method" value="globalin" id="251" addr="0x7ff9f1fba9d0" />
+        <typemap id="248" addr="0x7fdf084dff50" >
+            <attributelist id="249" addr="0x7fdf084dff50" >
+                <attribute name="code" value="{&#10;  $basetype (*inp)[$1_dim1] = ($basetype (*)[$1_dim1])($input);&#10;  $basetype (*dest)[$1_dim1] = ($basetype (*)[$1_dim1])($1);&#10;  size_t ii = 0;&#10;  for (; ii &lt; $1_dim0; ++ii) {&#10;    $basetype *ip = inp[ii];&#10;    $basetype *dp = dest[ii];&#10;    size_t jj = 0;&#10;    for (; jj &lt; $1_dim1; ++jj) dp[jj] = ip[jj];&#10;  }&#10;}" id="250" addr="0x7fdf085119d0" />
+                <attribute name="method" value="globalin" id="251" addr="0x7fdf085119d0" />
             </attributelist >
 
-            <typemapitem id="252" addr="0x7ff9f1f88e30" >
-                <attributelist id="253" addr="0x7ff9f1f88e30" >
-                    <parmlist id="254" addr="0x7ff9f1f88ed0" >
+            <typemapitem id="252" addr="0x7fdf084dfe30" >
+                <attributelist id="253" addr="0x7fdf084dfe30" >
+                    <parmlist id="254" addr="0x7fdf084dfed0" >
                         <parm id="255">
-                            <attributelist id="256" addr="0x7ff9f1f88ed0" >
-                                <attribute name="type" value="a(ANY).a(ANY).SWIGTYPE" id="257" addr="0x7ff9f1fba9d0" />
+                            <attributelist id="256" addr="0x7fdf084dfed0" >
+                                <attribute name="type" value="a(ANY).a(ANY).SWIGTYPE" id="257" addr="0x7fdf085119d0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -457,2984 +457,2984 @@
              
             </typemapitem >
         </typemap >
-        <insert id="258" addr="0x7ff9f1f89010" >
-            <attributelist id="259" addr="0x7ff9f1f89010" >
-                <attribute name="code" value="&#10;#ifdef __cplusplus&#10;/* SwigValueWrapper is described in swig.swg */&#10;template&lt;typename T> class SwigValueWrapper {&#10;  struct SwigMovePointer {&#10;    T *ptr;&#10;    SwigMovePointer(T *p) : ptr(p) { }&#10;    ~SwigMovePointer() { delete ptr; }&#10;    SwigMovePointer&amp; operator=(SwigMovePointer&amp; rhs) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = rhs.ptr; rhs.ptr = 0; return *this; }&#10;  } pointer;&#10;  SwigValueWrapper&amp; operator=(const SwigValueWrapper&lt;T>&amp; rhs);&#10;  SwigValueWrapper(const SwigValueWrapper&lt;T>&amp; rhs);&#10;public:&#10;  SwigValueWrapper() : pointer(0) { }&#10;  SwigValueWrapper&amp; operator=(const T&amp; t) { SwigMovePointer tmp(new T(t)); pointer = tmp; return *this; }&#10;  operator T&amp;() const { return *pointer.ptr; }&#10;  T *operator&amp;() { return pointer.ptr; }&#10;};" id="260" addr="0x7ff9f1fba9d0" />
-                <attribute name="section" value="runtime" id="261" addr="0x7ff9f1fba9d0" />
+        <insert id="258" addr="0x7fdf084e0010" >
+            <attributelist id="259" addr="0x7fdf084e0010" >
+                <attribute name="code" value="&#10;#ifdef __cplusplus&#10;/* SwigValueWrapper is described in swig.swg */&#10;template&lt;typename T> class SwigValueWrapper {&#10;  struct SwigMovePointer {&#10;    T *ptr;&#10;    SwigMovePointer(T *p) : ptr(p) { }&#10;    ~SwigMovePointer() { delete ptr; }&#10;    SwigMovePointer&amp; operator=(SwigMovePointer&amp; rhs) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = rhs.ptr; rhs.ptr = 0; return *this; }&#10;  } pointer;&#10;  SwigValueWrapper&amp; operator=(const SwigValueWrapper&lt;T>&amp; rhs);&#10;  SwigValueWrapper(const SwigValueWrapper&lt;T>&amp; rhs);&#10;public:&#10;  SwigValueWrapper() : pointer(0) { }&#10;  SwigValueWrapper&amp; operator=(const T&amp; t) { SwigMovePointer tmp(new T(t)); pointer = tmp; return *this; }&#10;  operator T&amp;() const { return *pointer.ptr; }&#10;  T *operator&amp;() { return pointer.ptr; }&#10;};" id="260" addr="0x7fdf085119d0" />
+                <attribute name="section" value="runtime" id="261" addr="0x7fdf085119d0" />
             </attributelist >
          
         </insert >
-        <insert id="262" addr="0x7ff9f1f890f0" >
-            <attributelist id="263" addr="0x7ff9f1f890f0" >
-                <attribute name="code" value="&#10;template &lt;typename T> T SwigValueInit() {&#10;  return T();&#10;}&#10;#endif&#10;" id="264" addr="0x7ff9f1fba9d0" />
-                <attribute name="section" value="runtime" id="265" addr="0x7ff9f1fba9d0" />
+        <insert id="262" addr="0x7fdf084e00f0" >
+            <attributelist id="263" addr="0x7fdf084e00f0" >
+                <attribute name="code" value="&#10;template &lt;typename T> T SwigValueInit() {&#10;  return T();&#10;}&#10;#endif&#10;" id="264" addr="0x7fdf085119d0" />
+                <attribute name="section" value="runtime" id="265" addr="0x7fdf085119d0" />
             </attributelist >
          
         </insert >
-        <insert id="266" addr="0x7ff9f1f891d0" >
-            <attributelist id="267" addr="0x7ff9f1f891d0" >
-                <attribute name="code" value="/* -----------------------------------------------------------------------------&#10; *  This section contains generic SWIG labels for method/variable&#10; *  declarations/attributes, and other compiler dependent labels.&#10; * ----------------------------------------------------------------------------- */&#10;&#10;/* template workaround for compilers that cannot correctly implement the C++ standard */&#10;#ifndef SWIGTEMPLATEDISAMBIGUATOR&#10;# if defined(__SUNPRO_CC) &amp;&amp; (__SUNPRO_CC &lt;= 0x560)&#10;#  define SWIGTEMPLATEDISAMBIGUATOR template&#10;# elif defined(__HP_aCC)&#10;/* Needed even with `aCC -AA' when `aCC -V' reports HP ANSI C++ B3910B A.03.55 */&#10;/* If we find a maximum version that requires this, the test would be __HP_aCC &lt;= 35500 for A.03.55 */&#10;#  define SWIGTEMPLATEDISAMBIGUATOR template&#10;# else&#10;#  define SWIGTEMPLATEDISAMBIGUATOR&#10;# endif&#10;#endif&#10;&#10;/* inline attribute */&#10;#ifndef SWIGINLINE&#10;# if defined(__cplusplus) || (defined(__GNUC__) &amp;&amp; !defined(__STRICT_ANSI__))&#10;#   define SWIGINLINE inline&#10;# else&#10;#   define SWIGINLINE&#10;# endif&#10;#endif&#10;&#10;/* attribute recognised by some compilers to avoid 'unused' warnings */&#10;#ifndef SWIGUNUSED&#10;# if defined(__GNUC__)&#10;#   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 &amp;&amp; __GNUC_MINOR__ >= 4))&#10;#     define SWIGUNUSED __attribute__ ((__unused__))&#10;#   else&#10;#     define SWIGUNUSED&#10;#   endif&#10;# elif defined(__ICC)&#10;#   define SWIGUNUSED __attribute__ ((__unused__))&#10;# else&#10;#   define SWIGUNUSED&#10;# endif&#10;#endif&#10;&#10;#ifndef SWIG_MSC_UNSUPPRESS_4505&#10;# if defined(_MSC_VER)&#10;#   pragma warning(disable : 4505) /* unreferenced local function has been removed */&#10;# endif&#10;#endif&#10;&#10;#ifndef SWIGUNUSEDPARM&#10;# ifdef __cplusplus&#10;#   define SWIGUNUSEDPARM(p)&#10;# else&#10;#   define SWIGUNUSEDPARM(p) p SWIGUNUSED&#10;# endif&#10;#endif&#10;&#10;/* internal SWIG method */&#10;#ifndef SWIGINTERN&#10;# define SWIGINTERN static SWIGUNUSED&#10;#endif&#10;&#10;/* internal inline SWIG method */&#10;#ifndef SWIGINTERNINLINE&#10;# define SWIGINTERNINLINE SWIGINTERN SWIGINLINE&#10;#endif&#10;&#10;/* exporting methods */&#10;#if defined(__GNUC__)&#10;#  if (__GNUC__ >= 4) || (__GNUC__ == 3 &amp;&amp; __GNUC_MINOR__ >= 4)&#10;#    ifndef GCC_HASCLASSVISIBILITY&#10;#      define GCC_HASCLASSVISIBILITY&#10;#    endif&#10;#  endif&#10;#endif&#10;&#10;#ifndef SWIGEXPORT&#10;# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)&#10;#   if defined(STATIC_LINKED)&#10;#     define SWIGEXPORT&#10;#   else&#10;#     define SWIGEXPORT __declspec(dllexport)&#10;#   endif&#10;# else&#10;#   if defined(__GNUC__) &amp;&amp; defined(GCC_HASCLASSVISIBILITY)&#10;#     define SWIGEXPORT __attribute__ ((visibility(&quot;default&quot;)))&#10;#   else&#10;#     define SWIGEXPORT&#10;#   endif&#10;# endif&#10;#endif&#10;&#10;/* calling conventions for Windows */&#10;#ifndef SWIGSTDCALL&#10;# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)&#10;#   define SWIGSTDCALL __stdcall&#10;# else&#10;#   define SWIGSTDCALL&#10;# endif&#10;#endif&#10;&#10;/* Deal with Microsoft's attempt at deprecating C standard runtime functions */&#10;#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) &amp;&amp; defined(_MSC_VER) &amp;&amp; !defined(_CRT_SECURE_NO_DEPRECATE)&#10;# define _CRT_SECURE_NO_DEPRECATE&#10;#endif&#10;&#10;/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */&#10;#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) &amp;&amp; defined(_MSC_VER) &amp;&amp; !defined(_SCL_SECURE_NO_DEPRECATE)&#10;# define _SCL_SECURE_NO_DEPRECATE&#10;#endif&#10;&#10;/* Deal with Apple's deprecated 'AssertMacros.h' from Carbon-framework */&#10;#if defined(__APPLE__) &amp;&amp; !defined(__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES)&#10;# define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0&#10;#endif&#10;&#10;/* Intel's compiler complains if a variable which was never initialised is&#10; * cast to void, which is a common idiom which we use to indicate that we&#10; * are aware a variable isn't used.  So we just silence that warning.&#10; * See: https://github.com/swig/swig/issues/192 for more discussion.&#10; */&#10;#ifdef __INTEL_COMPILER&#10;# pragma warning disable 592&#10;#endif&#10;" id="268" addr="0x7ff9f1fba9d0" />
-                <attribute name="section" value="runtime" id="269" addr="0x7ff9f1fba9d0" />
+        <insert id="266" addr="0x7fdf084e01d0" >
+            <attributelist id="267" addr="0x7fdf084e01d0" >
+                <attribute name="code" value="/* -----------------------------------------------------------------------------&#10; *  This section contains generic SWIG labels for method/variable&#10; *  declarations/attributes, and other compiler dependent labels.&#10; * ----------------------------------------------------------------------------- */&#10;&#10;/* template workaround for compilers that cannot correctly implement the C++ standard */&#10;#ifndef SWIGTEMPLATEDISAMBIGUATOR&#10;# if defined(__SUNPRO_CC) &amp;&amp; (__SUNPRO_CC &lt;= 0x560)&#10;#  define SWIGTEMPLATEDISAMBIGUATOR template&#10;# elif defined(__HP_aCC)&#10;/* Needed even with `aCC -AA' when `aCC -V' reports HP ANSI C++ B3910B A.03.55 */&#10;/* If we find a maximum version that requires this, the test would be __HP_aCC &lt;= 35500 for A.03.55 */&#10;#  define SWIGTEMPLATEDISAMBIGUATOR template&#10;# else&#10;#  define SWIGTEMPLATEDISAMBIGUATOR&#10;# endif&#10;#endif&#10;&#10;/* inline attribute */&#10;#ifndef SWIGINLINE&#10;# if defined(__cplusplus) || (defined(__GNUC__) &amp;&amp; !defined(__STRICT_ANSI__))&#10;#   define SWIGINLINE inline&#10;# else&#10;#   define SWIGINLINE&#10;# endif&#10;#endif&#10;&#10;/* attribute recognised by some compilers to avoid 'unused' warnings */&#10;#ifndef SWIGUNUSED&#10;# if defined(__GNUC__)&#10;#   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 &amp;&amp; __GNUC_MINOR__ >= 4))&#10;#     define SWIGUNUSED __attribute__ ((__unused__))&#10;#   else&#10;#     define SWIGUNUSED&#10;#   endif&#10;# elif defined(__ICC)&#10;#   define SWIGUNUSED __attribute__ ((__unused__))&#10;# else&#10;#   define SWIGUNUSED&#10;# endif&#10;#endif&#10;&#10;#ifndef SWIG_MSC_UNSUPPRESS_4505&#10;# if defined(_MSC_VER)&#10;#   pragma warning(disable : 4505) /* unreferenced local function has been removed */&#10;# endif&#10;#endif&#10;&#10;#ifndef SWIGUNUSEDPARM&#10;# ifdef __cplusplus&#10;#   define SWIGUNUSEDPARM(p)&#10;# else&#10;#   define SWIGUNUSEDPARM(p) p SWIGUNUSED&#10;# endif&#10;#endif&#10;&#10;/* internal SWIG method */&#10;#ifndef SWIGINTERN&#10;# define SWIGINTERN static SWIGUNUSED&#10;#endif&#10;&#10;/* internal inline SWIG method */&#10;#ifndef SWIGINTERNINLINE&#10;# define SWIGINTERNINLINE SWIGINTERN SWIGINLINE&#10;#endif&#10;&#10;/* exporting methods */&#10;#if defined(__GNUC__)&#10;#  if (__GNUC__ >= 4) || (__GNUC__ == 3 &amp;&amp; __GNUC_MINOR__ >= 4)&#10;#    ifndef GCC_HASCLASSVISIBILITY&#10;#      define GCC_HASCLASSVISIBILITY&#10;#    endif&#10;#  endif&#10;#endif&#10;&#10;#ifndef SWIGEXPORT&#10;# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)&#10;#   if defined(STATIC_LINKED)&#10;#     define SWIGEXPORT&#10;#   else&#10;#     define SWIGEXPORT __declspec(dllexport)&#10;#   endif&#10;# else&#10;#   if defined(__GNUC__) &amp;&amp; defined(GCC_HASCLASSVISIBILITY)&#10;#     define SWIGEXPORT __attribute__ ((visibility(&quot;default&quot;)))&#10;#   else&#10;#     define SWIGEXPORT&#10;#   endif&#10;# endif&#10;#endif&#10;&#10;/* calling conventions for Windows */&#10;#ifndef SWIGSTDCALL&#10;# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)&#10;#   define SWIGSTDCALL __stdcall&#10;# else&#10;#   define SWIGSTDCALL&#10;# endif&#10;#endif&#10;&#10;/* Deal with Microsoft's attempt at deprecating C standard runtime functions */&#10;#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) &amp;&amp; defined(_MSC_VER) &amp;&amp; !defined(_CRT_SECURE_NO_DEPRECATE)&#10;# define _CRT_SECURE_NO_DEPRECATE&#10;#endif&#10;&#10;/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */&#10;#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) &amp;&amp; defined(_MSC_VER) &amp;&amp; !defined(_SCL_SECURE_NO_DEPRECATE)&#10;# define _SCL_SECURE_NO_DEPRECATE&#10;#endif&#10;&#10;/* Deal with Apple's deprecated 'AssertMacros.h' from Carbon-framework */&#10;#if defined(__APPLE__) &amp;&amp; !defined(__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES)&#10;# define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0&#10;#endif&#10;&#10;/* Intel's compiler complains if a variable which was never initialised is&#10; * cast to void, which is a common idiom which we use to indicate that we&#10; * are aware a variable isn't used.  So we just silence that warning.&#10; * See: https://github.com/swig/swig/issues/192 for more discussion.&#10; */&#10;#ifdef __INTEL_COMPILER&#10;# pragma warning disable 592&#10;#endif&#10;" id="268" addr="0x7fdf085119d0" />
+                <attribute name="section" value="runtime" id="269" addr="0x7fdf085119d0" />
             </attributelist >
          
         </insert >
     </include >
-    <include id="270" addr="0x7ff9f1f89350" >
-        <attributelist id="271" addr="0x7ff9f1f89350" >
-            <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmc.i" id="272" addr="0x7ff9f1fba9d0" />
-            <attribute name="module" value="" id="273" addr="0x7ff9f1f89530" />
-            <attribute name="options" value="0x7ff9f1f892d0" id="274" addr="0x7ff9f1f892d0" />
+    <include id="270" addr="0x7fdf084e0350" >
+        <attributelist id="271" addr="0x7fdf084e0350" >
+            <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmc.i" id="272" addr="0x7fdf085119d0" />
+            <attribute name="module" value="" id="273" addr="0x7fdf084e0530" />
+            <attribute name="options" value="0x7fdf084e02d0" id="274" addr="0x7fdf084e02d0" />
         </attributelist >
 
-        <module id="275" addr="0x7ff9f1f89430" >
-            <attributelist id="276" addr="0x7ff9f1f89430" >
-                <attribute name="name" value="xbmc" id="277" addr="0x7ff9f1fba9d0" />
-                <attribute name="options" value="0x7ff9f1f89410" id="278" addr="0x7ff9f1f89410" />
+        <module id="275" addr="0x7fdf084e0430" >
+            <attributelist id="276" addr="0x7fdf084e0430" >
+                <attribute name="name" value="xbmc" id="277" addr="0x7fdf085119d0" />
+                <attribute name="options" value="0x7fdf084e0410" id="278" addr="0x7fdf084e0410" />
             </attributelist >
          
         </module >
-        <insert id="279" addr="0x7ff9f1f89570" >
-            <attributelist id="280" addr="0x7ff9f1f89570" >
-                <attribute name="code" value="&#10;#if defined(TARGET_WINDOWS)&#10;#  include &lt;windows.h>&#10;#endif&#10;&#10;#include &quot;interfaces/legacy/Player.h&quot;&#10;#include &quot;interfaces/legacy/RenderCapture.h&quot;&#10;#include &quot;interfaces/legacy/Keyboard.h&quot;&#10;#include &quot;interfaces/legacy/ModuleXbmc.h&quot;&#10;#include &quot;interfaces/legacy/Monitor.h&quot;&#10;&#10;using namespace XBMCAddon;&#10;using namespace xbmc;&#10;&#10;#if defined(__GNUG__)&#10;#pragma GCC diagnostic ignored &quot;-Wstrict-aliasing&quot;&#10;#endif&#10;" id="281" addr="0x7ff9f1fba9d0" />
+        <insert id="279" addr="0x7fdf084e0570" >
+            <attributelist id="280" addr="0x7fdf084e0570" >
+                <attribute name="code" value="&#10;#if defined(TARGET_WINDOWS)&#10;#  include &lt;windows.h>&#10;#endif&#10;&#10;#include &quot;interfaces/legacy/Player.h&quot;&#10;#include &quot;interfaces/legacy/RenderCapture.h&quot;&#10;#include &quot;interfaces/legacy/Keyboard.h&quot;&#10;#include &quot;interfaces/legacy/ModuleXbmc.h&quot;&#10;#include &quot;interfaces/legacy/Monitor.h&quot;&#10;&#10;using namespace XBMCAddon;&#10;using namespace xbmc;&#10;&#10;#if defined(__GNUG__)&#10;#pragma GCC diagnostic ignored &quot;-Wstrict-aliasing&quot;&#10;#endif&#10;" id="281" addr="0x7fdf085119d0" />
             </attributelist >
          
         </insert >
-        <include id="282" addr="0x7ff9f1f898d0" >
-            <attributelist id="283" addr="0x7ff9f1f898d0" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/swighelper.h" id="284" addr="0x7ff9f1fba9d0" />
+        <include id="282" addr="0x7fdf084e08d0" >
+            <attributelist id="283" addr="0x7fdf084e08d0" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/swighelper.h" id="284" addr="0x7fdf085119d0" />
             </attributelist >
          
         </include >
-        <include id="285" addr="0x7ff9f1f89b10" >
-            <attributelist id="286" addr="0x7ff9f1f89b10" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/AddonString.h" id="287" addr="0x7ff9f1fba9d0" />
+        <include id="285" addr="0x7fdf084e0b10" >
+            <attributelist id="286" addr="0x7fdf084e0b10" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/AddonString.h" id="287" addr="0x7fdf085119d0" />
             </attributelist >
 
-            <namespace id="288" addr="0x7ff9f1f89c50" >
-                <attributelist id="289" addr="0x7ff9f1f89c50" >
-                    <attribute name="sym_name" value="XBMCAddon" id="290" addr="0x7ff9f1fba9d0" />
-                    <attribute name="name" value="XBMCAddon" id="291" addr="0x7ff9f1fba9d0" />
-                    <attribute name="csym_nextSibling" value="0x7ff9f1f8a210" id="292" addr="0x7ff9f1f8a210" />
-                    <attribute name="sym_nextSibling" value="0x7ff9f1f8a210" id="293" addr="0x7ff9f1f8a210" />
-                    <typescope id="294" addr="0x7ff9f1fb4990" >
-                        <attributelist id="295" addr="0x7ff9f1fb4990" >
-                            <attribute name="name" value="XBMCAddon" id="296" addr="0x7ff9f1fba9d0" />
-                            <typetab id="297" addr="0x7ff9f1fb49d0" >
-                                <attributelist id="298" addr="0x7ff9f1fb49d0" >
-                                    <attribute name="String" value="std::string" id="299" addr="0x7ff9f1fba9d0" />
+            <namespace id="288" addr="0x7fdf084e0c50" >
+                <attributelist id="289" addr="0x7fdf084e0c50" >
+                    <attribute name="sym_name" value="XBMCAddon" id="290" addr="0x7fdf085119d0" />
+                    <attribute name="name" value="XBMCAddon" id="291" addr="0x7fdf085119d0" />
+                    <attribute name="csym_nextSibling" value="0x7fdf084e1210" id="292" addr="0x7fdf084e1210" />
+                    <attribute name="sym_nextSibling" value="0x7fdf084e1210" id="293" addr="0x7fdf084e1210" />
+                    <typescope id="294" addr="0x7fdf0850b990" >
+                        <attributelist id="295" addr="0x7fdf0850b990" >
+                            <attribute name="name" value="XBMCAddon" id="296" addr="0x7fdf085119d0" />
+                            <typetab id="297" addr="0x7fdf0850b9d0" >
+                                <attributelist id="298" addr="0x7fdf0850b9d0" >
+                                    <attribute name="String" value="std::string" id="299" addr="0x7fdf085119d0" />
                                 </attributelist >
-                                <typetabsitem id="300" addr="0x7ff9f1fb4bb0" >
-                                    <attributelist id="301" addr="0x7ff9f1fb4bb0" >
+                                <typetabsitem id="300" addr="0x7fdf0850bbb0" >
+                                    <attributelist id="301" addr="0x7fdf0850bbb0" >
                                     </attributelist >
                                 </typetabsitem >
                             </typetab >
-                            <attribute name="parent" value="0x7ff9f1f72a30" id="302" addr="0x7ff9f1f72a30" />
-                            <attribute name="qname" value="XBMCAddon" id="303" addr="0x7ff9f1fba9d0" />
-                            <attribute name="symtab" value="0x7ff9f1f89bb0" id="304" addr="0x7ff9f1f89bb0" />
+                            <attribute name="parent" value="0x7fdf084c9a30" id="302" addr="0x7fdf084c9a30" />
+                            <attribute name="qname" value="XBMCAddon" id="303" addr="0x7fdf085119d0" />
+                            <attribute name="symtab" value="0x7fdf084e0bb0" id="304" addr="0x7fdf084e0bb0" />
                         </attributelist >
-                        <typescopesitem id="305" addr="0x7ff9f1f89b70" >
-                            <attributelist id="306" addr="0x7ff9f1f89b70" >
+                        <typescopesitem id="305" addr="0x7fdf084e0b70" >
+                            <attributelist id="306" addr="0x7fdf084e0b70" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="307" addr="0x7ff9f1fb49d0" >
-                            <attributelist id="308" addr="0x7ff9f1fb49d0" >
-                                <attribute name="String" value="std::string" id="309" addr="0x7ff9f1fba9d0" />
+                        <typescopesitem id="307" addr="0x7fdf0850b9d0" >
+                            <attributelist id="308" addr="0x7fdf0850b9d0" >
+                                <attribute name="String" value="std::string" id="309" addr="0x7fdf085119d0" />
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="310" addr="0x7ff9f1f72a30" >
-                            <attributelist id="311" addr="0x7ff9f1f72a30" >
-                                <attribute name="name" value="" id="312" addr="0x7ff9f1fba9d0" />
-                                <typetab id="313" addr="0x7ff9f1f72a90" >
-                                    <attributelist id="314" addr="0x7ff9f1f72a90" >
-                                        <attribute name="CGUIDialogKeyboardGeneric" value="CGUIDialogKeyboardGeneric" id="315" addr="0x7ff9f1fba9d0" />
+                        <typescopesitem id="310" addr="0x7fdf084c9a30" >
+                            <attributelist id="311" addr="0x7fdf084c9a30" >
+                                <attribute name="name" value="" id="312" addr="0x7fdf085119d0" />
+                                <typetab id="313" addr="0x7fdf084c9a90" >
+                                    <attributelist id="314" addr="0x7fdf084c9a90" >
+                                        <attribute name="CGUIDialogKeyboardGeneric" value="CGUIDialogKeyboardGeneric" id="315" addr="0x7fdf085119d0" />
                                     </attributelist >
-                                    <typetabsitem id="316" addr="0x7ff9f1fb7950" >
-                                        <attributelist id="317" addr="0x7ff9f1fb7950" >
+                                    <typetabsitem id="316" addr="0x7fdf0850e950" >
+                                        <attributelist id="317" addr="0x7fdf0850e950" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="318" addr="0x7ff9f1fb4ad0" >
-                            <attributelist id="319" addr="0x7ff9f1fb4ad0" >
+                        <typescopesitem id="318" addr="0x7fdf0850bad0" >
+                            <attributelist id="319" addr="0x7fdf0850bad0" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="320" addr="0x7ff9f1f89bb0" >
-                            <attributelist id="321" addr="0x7ff9f1f89bb0" >
-                                <attribute name="name" value="XBMCAddon" id="322" addr="0x7ff9f1fba9d0" />
-                                <attribute name="csymtab" value="0x7ff9f1f89bf0" id="323" addr="0x7ff9f1f89bf0" />
-                                <attribute name="symtab" value="0x7ff9f1f89b90" id="324" addr="0x7ff9f1f89b90" />
+                        <typescopesitem id="320" addr="0x7fdf084e0bb0" >
+                            <attributelist id="321" addr="0x7fdf084e0bb0" >
+                                <attribute name="name" value="XBMCAddon" id="322" addr="0x7fdf085119d0" />
+                                <attribute name="csymtab" value="0x7fdf084e0bf0" id="323" addr="0x7fdf084e0bf0" />
+                                <attribute name="symtab" value="0x7fdf084e0b90" id="324" addr="0x7fdf084e0b90" />
                             </attributelist >
                         </typescopesitem >
                     </typescope >
-                    <attribute name="symtab" value="0x7ff9f1f89bb0" id="325" addr="0x7ff9f1f89bb0" />
-                    <attribute name="sym_symtab" value="0x7ff9f1f72950" id="326" addr="0x7ff9f1f72950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="327" addr="0x7ff9f1fba9d0" />
+                    <attribute name="symtab" value="0x7fdf084e0bb0" id="325" addr="0x7fdf084e0bb0" />
+                    <attribute name="sym_symtab" value="0x7fdf084c9950" id="326" addr="0x7fdf084c9950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="327" addr="0x7fdf085119d0" />
                 </attributelist >
 
-                <cdecl id="328" addr="0x7ff9f1f89d70" >
-                    <attributelist id="329" addr="0x7ff9f1f89d70" >
-                        <attribute name="sym_name" value="String" id="330" addr="0x7ff9f1fba9d0" />
-                        <attribute name="name" value="XBMCAddon::String" id="331" addr="0x7ff9f1fba9d0" />
-                        <attribute name="decl" value="" id="332" addr="0x7ff9f1fba9d0" />
-                        <attribute name="storage" value="typedef" id="333" addr="0x7ff9f1fba9d0" />
-                        <attribute name="kind" value="typedef" id="334" addr="0x7ff9f1fba9d0" />
-                        <attribute name="type" value="std::string" id="335" addr="0x7ff9f1fba9d0" />
-                        <attribute name="sym_symtab" value="0x7ff9f1f89bb0" id="336" addr="0x7ff9f1f89bb0" />
-                        <attribute name="sym_overname" value="__SWIG_0" id="337" addr="0x7ff9f1fba9d0" />
+                <cdecl id="328" addr="0x7fdf084e0d70" >
+                    <attributelist id="329" addr="0x7fdf084e0d70" >
+                        <attribute name="sym_name" value="String" id="330" addr="0x7fdf085119d0" />
+                        <attribute name="name" value="XBMCAddon::String" id="331" addr="0x7fdf085119d0" />
+                        <attribute name="decl" value="" id="332" addr="0x7fdf085119d0" />
+                        <attribute name="storage" value="typedef" id="333" addr="0x7fdf085119d0" />
+                        <attribute name="kind" value="typedef" id="334" addr="0x7fdf085119d0" />
+                        <attribute name="type" value="std::string" id="335" addr="0x7fdf085119d0" />
+                        <attribute name="sym_symtab" value="0x7fdf084e0bb0" id="336" addr="0x7fdf084e0bb0" />
+                        <attribute name="sym_overname" value="__SWIG_0" id="337" addr="0x7fdf085119d0" />
                     </attributelist >
                  
                 </cdecl >
-                <cdecl id="338" addr="0x7ff9f1f89f70" >
-                    <attributelist id="339" addr="0x7ff9f1f89f70" >
-                        <attribute name="sym_name" value="emptyString" id="340" addr="0x7ff9f1fba9d0" />
-                        <attribute name="name" value="XBMCAddon::emptyString" id="341" addr="0x7ff9f1fba9d0" />
-                        <attribute name="decl" value="" id="342" addr="0x7ff9f1fba9d0" />
-                        <attribute name="storage" value="extern" id="343" addr="0x7ff9f1fba9d0" />
-                        <attribute name="kind" value="variable" id="344" addr="0x7ff9f1fba9d0" />
-                        <attribute name="type" value="XBMCAddon::String" id="345" addr="0x7ff9f1fba9d0" />
-                        <attribute name="sym_symtab" value="0x7ff9f1f89bb0" id="346" addr="0x7ff9f1f89bb0" />
-                        <attribute name="sym_overname" value="__SWIG_0" id="347" addr="0x7ff9f1fba9d0" />
+                <cdecl id="338" addr="0x7fdf084e0f70" >
+                    <attributelist id="339" addr="0x7fdf084e0f70" >
+                        <attribute name="sym_name" value="emptyString" id="340" addr="0x7fdf085119d0" />
+                        <attribute name="name" value="XBMCAddon::emptyString" id="341" addr="0x7fdf085119d0" />
+                        <attribute name="decl" value="" id="342" addr="0x7fdf085119d0" />
+                        <attribute name="storage" value="extern" id="343" addr="0x7fdf085119d0" />
+                        <attribute name="kind" value="variable" id="344" addr="0x7fdf085119d0" />
+                        <attribute name="type" value="XBMCAddon::String" id="345" addr="0x7fdf085119d0" />
+                        <attribute name="sym_symtab" value="0x7fdf084e0bb0" id="346" addr="0x7fdf084e0bb0" />
+                        <attribute name="sym_overname" value="__SWIG_0" id="347" addr="0x7fdf085119d0" />
                     </attributelist >
                  
                 </cdecl >
             </namespace >
         </include >
-        <include id="348" addr="0x7ff9f1f8a150" >
-            <attributelist id="349" addr="0x7ff9f1f8a150" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/ModuleXbmc.h" id="350" addr="0x7ff9f1fba9d0" />
+        <include id="348" addr="0x7fdf084e1150" >
+            <attributelist id="349" addr="0x7fdf084e1150" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/ModuleXbmc.h" id="350" addr="0x7fdf085119d0" />
             </attributelist >
 
-            <namespace id="351" addr="0x7ff9f1f8a210" >
-                <attributelist id="352" addr="0x7ff9f1f8a210" >
-                    <attribute name="sym_name" value="XBMCAddon" id="353" addr="0x7ff9f1fba9d0" />
-                    <attribute name="name" value="XBMCAddon" id="354" addr="0x7ff9f1fba9d0" />
-                    <attribute name="sym_previousSibling" value="0x7ff9f1f89c50" id="355" addr="0x7ff9f1f89c50" />
-                    <attribute name="csym_nextSibling" value="0x7ff9f1f949b0" id="356" addr="0x7ff9f1f949b0" />
-                    <attribute name="sym_nextSibling" value="0x7ff9f1f949b0" id="357" addr="0x7ff9f1f949b0" />
-                    <typescope id="358" addr="0x7ff9f1fb4990" >
-                        <attributelist id="359" addr="0x7ff9f1fb4990" >
-                            <attribute name="name" value="XBMCAddon" id="360" addr="0x7ff9f1fba9d0" />
-                            <typetab id="361" addr="0x7ff9f1fb49d0" >
-                                <attributelist id="362" addr="0x7ff9f1fb49d0" >
-                                    <attribute name="String" value="std::string" id="363" addr="0x7ff9f1fba9d0" />
+            <namespace id="351" addr="0x7fdf084e1210" >
+                <attributelist id="352" addr="0x7fdf084e1210" >
+                    <attribute name="sym_name" value="XBMCAddon" id="353" addr="0x7fdf085119d0" />
+                    <attribute name="name" value="XBMCAddon" id="354" addr="0x7fdf085119d0" />
+                    <attribute name="sym_previousSibling" value="0x7fdf084e0c50" id="355" addr="0x7fdf084e0c50" />
+                    <attribute name="csym_nextSibling" value="0x7fdf084eb9b0" id="356" addr="0x7fdf084eb9b0" />
+                    <attribute name="sym_nextSibling" value="0x7fdf084eb9b0" id="357" addr="0x7fdf084eb9b0" />
+                    <typescope id="358" addr="0x7fdf0850b990" >
+                        <attributelist id="359" addr="0x7fdf0850b990" >
+                            <attribute name="name" value="XBMCAddon" id="360" addr="0x7fdf085119d0" />
+                            <typetab id="361" addr="0x7fdf0850b9d0" >
+                                <attributelist id="362" addr="0x7fdf0850b9d0" >
+                                    <attribute name="String" value="std::string" id="363" addr="0x7fdf085119d0" />
                                 </attributelist >
-                                <typetabsitem id="364" addr="0x7ff9f1fb4bb0" >
-                                    <attributelist id="365" addr="0x7ff9f1fb4bb0" >
+                                <typetabsitem id="364" addr="0x7fdf0850bbb0" >
+                                    <attributelist id="365" addr="0x7fdf0850bbb0" >
                                     </attributelist >
                                 </typetabsitem >
                             </typetab >
-                            <attribute name="parent" value="0x7ff9f1f72a30" id="366" addr="0x7ff9f1f72a30" />
-                            <attribute name="qname" value="XBMCAddon" id="367" addr="0x7ff9f1fba9d0" />
-                            <attribute name="symtab" value="0x7ff9f1f89bb0" id="368" addr="0x7ff9f1f89bb0" />
+                            <attribute name="parent" value="0x7fdf084c9a30" id="366" addr="0x7fdf084c9a30" />
+                            <attribute name="qname" value="XBMCAddon" id="367" addr="0x7fdf085119d0" />
+                            <attribute name="symtab" value="0x7fdf084e0bb0" id="368" addr="0x7fdf084e0bb0" />
                         </attributelist >
-                        <typescopesitem id="369" addr="0x7ff9f1f89b70" >
-                            <attributelist id="370" addr="0x7ff9f1f89b70" >
+                        <typescopesitem id="369" addr="0x7fdf084e0b70" >
+                            <attributelist id="370" addr="0x7fdf084e0b70" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="371" addr="0x7ff9f1fb49d0" >
-                            <attributelist id="372" addr="0x7ff9f1fb49d0" >
-                                <attribute name="String" value="std::string" id="373" addr="0x7ff9f1fba9d0" />
+                        <typescopesitem id="371" addr="0x7fdf0850b9d0" >
+                            <attributelist id="372" addr="0x7fdf0850b9d0" >
+                                <attribute name="String" value="std::string" id="373" addr="0x7fdf085119d0" />
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="374" addr="0x7ff9f1f72a30" >
-                            <attributelist id="375" addr="0x7ff9f1f72a30" >
-                                <attribute name="name" value="" id="376" addr="0x7ff9f1fba9d0" />
-                                <typetab id="377" addr="0x7ff9f1f72a90" >
-                                    <attributelist id="378" addr="0x7ff9f1f72a90" >
-                                        <attribute name="CGUIDialogKeyboardGeneric" value="CGUIDialogKeyboardGeneric" id="379" addr="0x7ff9f1fba9d0" />
+                        <typescopesitem id="374" addr="0x7fdf084c9a30" >
+                            <attributelist id="375" addr="0x7fdf084c9a30" >
+                                <attribute name="name" value="" id="376" addr="0x7fdf085119d0" />
+                                <typetab id="377" addr="0x7fdf084c9a90" >
+                                    <attributelist id="378" addr="0x7fdf084c9a90" >
+                                        <attribute name="CGUIDialogKeyboardGeneric" value="CGUIDialogKeyboardGeneric" id="379" addr="0x7fdf085119d0" />
                                     </attributelist >
-                                    <typetabsitem id="380" addr="0x7ff9f1fb7950" >
-                                        <attributelist id="381" addr="0x7ff9f1fb7950" >
+                                    <typetabsitem id="380" addr="0x7fdf0850e950" >
+                                        <attributelist id="381" addr="0x7fdf0850e950" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="382" addr="0x7ff9f1fb4ad0" >
-                            <attributelist id="383" addr="0x7ff9f1fb4ad0" >
+                        <typescopesitem id="382" addr="0x7fdf0850bad0" >
+                            <attributelist id="383" addr="0x7fdf0850bad0" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="384" addr="0x7ff9f1f89bb0" >
-                            <attributelist id="385" addr="0x7ff9f1f89bb0" >
-                                <attribute name="name" value="XBMCAddon" id="386" addr="0x7ff9f1fba9d0" />
-                                <attribute name="csymtab" value="0x7ff9f1f89bf0" id="387" addr="0x7ff9f1f89bf0" />
-                                <attribute name="symtab" value="0x7ff9f1f89b90" id="388" addr="0x7ff9f1f89b90" />
+                        <typescopesitem id="384" addr="0x7fdf084e0bb0" >
+                            <attributelist id="385" addr="0x7fdf084e0bb0" >
+                                <attribute name="name" value="XBMCAddon" id="386" addr="0x7fdf085119d0" />
+                                <attribute name="csymtab" value="0x7fdf084e0bf0" id="387" addr="0x7fdf084e0bf0" />
+                                <attribute name="symtab" value="0x7fdf084e0b90" id="388" addr="0x7fdf084e0b90" />
                             </attributelist >
                         </typescopesitem >
                     </typescope >
-                    <attribute name="symtab" value="0x7ff9f1f89bb0" id="389" addr="0x7ff9f1f89bb0" />
-                    <attribute name="sym_symtab" value="0x7ff9f1f72950" id="390" addr="0x7ff9f1f72950" />
+                    <attribute name="symtab" value="0x7fdf084e0bb0" id="389" addr="0x7fdf084e0bb0" />
+                    <attribute name="sym_symtab" value="0x7fdf084c9950" id="390" addr="0x7fdf084c9950" />
                 </attributelist >
 
-                <namespace id="391" addr="0x7ff9f1f8a330" >
-                    <attributelist id="392" addr="0x7ff9f1f8a330" >
-                        <attribute name="feature_knownbasetypes" value="AddonClass,IPlayerCallback,AddonCallback" id="393" addr="0x7ff9f1fba9d0" />
-                        <attribute name="name" value="xbmc" id="394" addr="0x7ff9f1fba9d0" />
-                        <attribute name="sym_symtab" value="0x7ff9f1f89bb0" id="395" addr="0x7ff9f1f89bb0" />
-                        <attribute name="symtab" value="0x7ff9f1f8a2b0" id="396" addr="0x7ff9f1f8a2b0" />
-                        <attribute name="sym_nextSibling" value="0x7ff9f1f94a30" id="397" addr="0x7ff9f1f94a30" />
-                        <attribute name="csym_nextSibling" value="0x7ff9f1f94a30" id="398" addr="0x7ff9f1f94a30" />
-                        <attribute name="feature_knownapitypes" value="XBMCAddon::xbmcgui::ListItem,XBMCAddon::xbmc::PlayListItem" id="399" addr="0x7ff9f1fba9d0" />
-                        <attribute name="sym_name" value="xbmc" id="400" addr="0x7ff9f1fba9d0" />
-                        <attribute name="sym_overname" value="__SWIG_0" id="401" addr="0x7ff9f1fba9d0" />
-                        <typescope id="402" addr="0x7ff9f1fb4d70" >
-                            <attributelist id="403" addr="0x7ff9f1fb4d70" >
-                                <attribute name="name" value="xbmc" id="404" addr="0x7ff9f1fba9d0" />
-                                <typetab id="405" addr="0x7ff9f1fb4d90" >
-                                    <attributelist id="406" addr="0x7ff9f1fb4d90" >
-                                        <attribute name="Monitor" value="Monitor" id="407" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="408" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="Keyboard" value="Keyboard" id="409" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="410" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="InfoTagVideo" value="InfoTagVideo" id="411" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="Player" value="Player" id="412" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="InfoTagMusic" value="InfoTagMusic" id="413" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="PlayList" value="PlayList" id="414" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="RenderCapture" value="RenderCapture" id="415" addr="0x7ff9f1fba9d0" />
+                <namespace id="391" addr="0x7fdf084e1330" >
+                    <attributelist id="392" addr="0x7fdf084e1330" >
+                        <attribute name="feature_knownbasetypes" value="AddonClass,IPlayerCallback,AddonCallback" id="393" addr="0x7fdf085119d0" />
+                        <attribute name="name" value="xbmc" id="394" addr="0x7fdf085119d0" />
+                        <attribute name="sym_symtab" value="0x7fdf084e0bb0" id="395" addr="0x7fdf084e0bb0" />
+                        <attribute name="symtab" value="0x7fdf084e12b0" id="396" addr="0x7fdf084e12b0" />
+                        <attribute name="sym_nextSibling" value="0x7fdf084eba30" id="397" addr="0x7fdf084eba30" />
+                        <attribute name="csym_nextSibling" value="0x7fdf084eba30" id="398" addr="0x7fdf084eba30" />
+                        <attribute name="feature_knownapitypes" value="XBMCAddon::xbmcgui::ListItem,XBMCAddon::xbmc::PlayListItem" id="399" addr="0x7fdf085119d0" />
+                        <attribute name="sym_name" value="xbmc" id="400" addr="0x7fdf085119d0" />
+                        <attribute name="sym_overname" value="__SWIG_0" id="401" addr="0x7fdf085119d0" />
+                        <typescope id="402" addr="0x7fdf0850bd70" >
+                            <attributelist id="403" addr="0x7fdf0850bd70" >
+                                <attribute name="name" value="xbmc" id="404" addr="0x7fdf085119d0" />
+                                <typetab id="405" addr="0x7fdf0850bd90" >
+                                    <attributelist id="406" addr="0x7fdf0850bd90" >
+                                        <attribute name="Monitor" value="Monitor" id="407" addr="0x7fdf085119d0" />
+                                        <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="408" addr="0x7fdf085119d0" />
+                                        <attribute name="Keyboard" value="Keyboard" id="409" addr="0x7fdf085119d0" />
+                                        <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="410" addr="0x7fdf085119d0" />
+                                        <attribute name="InfoTagVideo" value="InfoTagVideo" id="411" addr="0x7fdf085119d0" />
+                                        <attribute name="Player" value="Player" id="412" addr="0x7fdf085119d0" />
+                                        <attribute name="InfoTagMusic" value="InfoTagMusic" id="413" addr="0x7fdf085119d0" />
+                                        <attribute name="PlayList" value="PlayList" id="414" addr="0x7fdf085119d0" />
+                                        <attribute name="RenderCapture" value="RenderCapture" id="415" addr="0x7fdf085119d0" />
                                     </attributelist >
-                                    <typetabsitem id="416" addr="0x7ff9f1fb9b10" >
-                                        <attributelist id="417" addr="0x7ff9f1fb9b10" >
+                                    <typetabsitem id="416" addr="0x7fdf08510b10" >
+                                        <attributelist id="417" addr="0x7fdf08510b10" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="418" addr="0x7ff9f1fb7f30" >
-                                        <attributelist id="419" addr="0x7ff9f1fb7f30" >
+                                    <typetabsitem id="418" addr="0x7fdf0850ef30" >
+                                        <attributelist id="419" addr="0x7fdf0850ef30" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="420" addr="0x7ff9f1fb8990" >
-                                        <attributelist id="421" addr="0x7ff9f1fb8990" >
+                                    <typetabsitem id="420" addr="0x7fdf0850f990" >
+                                        <attributelist id="421" addr="0x7fdf0850f990" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="422" addr="0x7ff9f1fb5e90" >
-                                        <attributelist id="423" addr="0x7ff9f1fb5e90" >
+                                    <typetabsitem id="422" addr="0x7fdf0850ce90" >
+                                        <attributelist id="423" addr="0x7fdf0850ce90" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="424" addr="0x7ff9f1fb8310" >
-                                        <attributelist id="425" addr="0x7ff9f1fb8310" >
+                                    <typetabsitem id="424" addr="0x7fdf0850f310" >
+                                        <attributelist id="425" addr="0x7fdf0850f310" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="426" addr="0x7ff9f1fb6050" >
-                                        <attributelist id="427" addr="0x7ff9f1fb6050" >
+                                    <typetabsitem id="426" addr="0x7fdf0850d050" >
+                                        <attributelist id="427" addr="0x7fdf0850d050" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="428" addr="0x7ff9f1fb7b50" >
-                                        <attributelist id="429" addr="0x7ff9f1fb7b50" >
+                                    <typetabsitem id="428" addr="0x7fdf0850eb50" >
+                                        <attributelist id="429" addr="0x7fdf0850eb50" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="430" addr="0x7ff9f1fb91b0" >
-                                        <attributelist id="431" addr="0x7ff9f1fb91b0" >
+                                    <typetabsitem id="430" addr="0x7fdf085101b0" >
+                                        <attributelist id="431" addr="0x7fdf085101b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="432" addr="0x7ff9f1fb7490" >
-                                        <attributelist id="433" addr="0x7ff9f1fb7490" >
+                                    <typetabsitem id="432" addr="0x7fdf0850e490" >
+                                        <attributelist id="433" addr="0x7fdf0850e490" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
-                                <attribute name="parent" value="0x7ff9f1fb4990" id="434" addr="0x7ff9f1fb4990" />
-                                <attribute name="qname" value="XBMCAddon::xbmc" id="435" addr="0x7ff9f1fba9d0" />
-                                <attribute name="symtab" value="0x7ff9f1f8a2b0" id="436" addr="0x7ff9f1f8a2b0" />
+                                <attribute name="parent" value="0x7fdf0850b990" id="434" addr="0x7fdf0850b990" />
+                                <attribute name="qname" value="XBMCAddon::xbmc" id="435" addr="0x7fdf085119d0" />
+                                <attribute name="symtab" value="0x7fdf084e12b0" id="436" addr="0x7fdf084e12b0" />
                             </attributelist >
-                            <typescopesitem id="437" addr="0x7ff9f1f8a270" >
-                                <attributelist id="438" addr="0x7ff9f1f8a270" >
+                            <typescopesitem id="437" addr="0x7fdf084e1270" >
+                                <attributelist id="438" addr="0x7fdf084e1270" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="439" addr="0x7ff9f1fb4d90" >
-                                <attributelist id="440" addr="0x7ff9f1fb4d90" >
-                                    <attribute name="Monitor" value="Monitor" id="441" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="442" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="Keyboard" value="Keyboard" id="443" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="444" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="InfoTagVideo" value="InfoTagVideo" id="445" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="Player" value="Player" id="446" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="InfoTagMusic" value="InfoTagMusic" id="447" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="PlayList" value="PlayList" id="448" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="RenderCapture" value="RenderCapture" id="449" addr="0x7ff9f1fba9d0" />
+                            <typescopesitem id="439" addr="0x7fdf0850bd90" >
+                                <attributelist id="440" addr="0x7fdf0850bd90" >
+                                    <attribute name="Monitor" value="Monitor" id="441" addr="0x7fdf085119d0" />
+                                    <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="442" addr="0x7fdf085119d0" />
+                                    <attribute name="Keyboard" value="Keyboard" id="443" addr="0x7fdf085119d0" />
+                                    <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="444" addr="0x7fdf085119d0" />
+                                    <attribute name="InfoTagVideo" value="InfoTagVideo" id="445" addr="0x7fdf085119d0" />
+                                    <attribute name="Player" value="Player" id="446" addr="0x7fdf085119d0" />
+                                    <attribute name="InfoTagMusic" value="InfoTagMusic" id="447" addr="0x7fdf085119d0" />
+                                    <attribute name="PlayList" value="PlayList" id="448" addr="0x7fdf085119d0" />
+                                    <attribute name="RenderCapture" value="RenderCapture" id="449" addr="0x7fdf085119d0" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="450" addr="0x7ff9f1fb4990" >
-                                <attributelist id="451" addr="0x7ff9f1fb4990" >
-                                    <attribute name="name" value="XBMCAddon" id="452" addr="0x7ff9f1fba9d0" />
-                                    <typetab id="453" addr="0x7ff9f1fb49d0" >
-                                        <attributelist id="454" addr="0x7ff9f1fb49d0" >
-                                            <attribute name="String" value="std::string" id="455" addr="0x7ff9f1fba9d0" />
-                                        </attributelist >
-                                        <typetabsitem id="456" addr="0x7ff9f1fb4bb0" >
-                                            <attributelist id="457" addr="0x7ff9f1fb4bb0" >
+                            <typescopesitem id="450" addr="0x7fdf0850b990" >
+                                <attributelist id="451" addr="0x7fdf0850b990" >
+                                    <attribute name="name" value="XBMCAddon" id="452" addr="0x7fdf085119d0" />
+                                    <typetab id="453" addr="0x7fdf0850b9d0" >
+                                        <attributelist id="454" addr="0x7fdf0850b9d0" >
+                                            <attribute name="String" value="std::string" id="455" addr="0x7fdf085119d0" />
+                                        </attributelist >
+                                        <typetabsitem id="456" addr="0x7fdf0850bbb0" >
+                                            <attributelist id="457" addr="0x7fdf0850bbb0" >
                                             </attributelist >
                                         </typetabsitem >
                                     </typetab >
-                                    <attribute name="parent" value="0x7ff9f1f72a30" id="458" addr="0x7ff9f1f72a30" />
-                                    <attribute name="qname" value="XBMCAddon" id="459" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="symtab" value="0x7ff9f1f89bb0" id="460" addr="0x7ff9f1f89bb0" />
+                                    <attribute name="parent" value="0x7fdf084c9a30" id="458" addr="0x7fdf084c9a30" />
+                                    <attribute name="qname" value="XBMCAddon" id="459" addr="0x7fdf085119d0" />
+                                    <attribute name="symtab" value="0x7fdf084e0bb0" id="460" addr="0x7fdf084e0bb0" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="461" addr="0x7ff9f1fb4db0" >
-                                <attributelist id="462" addr="0x7ff9f1fb4db0" >
+                            <typescopesitem id="461" addr="0x7fdf0850bdb0" >
+                                <attributelist id="462" addr="0x7fdf0850bdb0" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="463" addr="0x7ff9f1f8a2b0" >
-                                <attributelist id="464" addr="0x7ff9f1f8a2b0" >
-                                    <attribute name="name" value="xbmc" id="465" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="csymtab" value="0x7ff9f1f8a2f0" id="466" addr="0x7ff9f1f8a2f0" />
-                                    <attribute name="symtab" value="0x7ff9f1f8a290" id="467" addr="0x7ff9f1f8a290" />
+                            <typescopesitem id="463" addr="0x7fdf084e12b0" >
+                                <attributelist id="464" addr="0x7fdf084e12b0" >
+                                    <attribute name="name" value="xbmc" id="465" addr="0x7fdf085119d0" />
+                                    <attribute name="csymtab" value="0x7fdf084e12f0" id="466" addr="0x7fdf084e12f0" />
+                                    <attribute name="symtab" value="0x7fdf084e1290" id="467" addr="0x7fdf084e1290" />
                                 </attributelist >
                             </typescopesitem >
                         </typescope >
                     </attributelist >
 
-                    <cdecl id="468" addr="0x7ff9f1f8a6f0" >
-                        <attributelist id="469" addr="0x7ff9f1f8a6f0" >
-                            <attribute name="name" value="XBMCAddon::xbmc::log" id="470" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="471" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_nextSibling" value="0x7ff9f1f8a850" id="472" addr="0x7ff9f1f8a850" />
-                            <attribute name="csym_nextSibling" value="0x7ff9f1f8a850" id="473" addr="0x7ff9f1f8a850" />
-                            <attribute name="kind" value="function" id="474" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_name" value="log" id="475" addr="0x7ff9f1fba9d0" />
-                            <attribute name="decl" value="f(p.q(const).char,int)." id="476" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_overloaded" value="0x7ff9f1f8a6f0" id="477" addr="0x7ff9f1f8a6f0" />
-                            <parmlist id="478" addr="0x7ff9f1f8a4b0" >
+                    <cdecl id="468" addr="0x7fdf084e16f0" >
+                        <attributelist id="469" addr="0x7fdf084e16f0" >
+                            <attribute name="name" value="XBMCAddon::xbmc::log" id="470" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="471" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_nextSibling" value="0x7fdf084e1850" id="472" addr="0x7fdf084e1850" />
+                            <attribute name="csym_nextSibling" value="0x7fdf084e1850" id="473" addr="0x7fdf084e1850" />
+                            <attribute name="kind" value="function" id="474" addr="0x7fdf085119d0" />
+                            <attribute name="sym_name" value="log" id="475" addr="0x7fdf085119d0" />
+                            <attribute name="decl" value="f(p.q(const).char,int)." id="476" addr="0x7fdf085119d0" />
+                            <attribute name="sym_overloaded" value="0x7fdf084e16f0" id="477" addr="0x7fdf084e16f0" />
+                            <parmlist id="478" addr="0x7fdf084e14b0" >
                                 <parm id="479">
-                                    <attributelist id="480" addr="0x7ff9f1f8a4b0" >
-                                        <attribute name="name" value="msg" id="481" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="p.q(const).char" id="482" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="480" addr="0x7fdf084e14b0" >
+                                        <attribute name="name" value="msg" id="481" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="p.q(const).char" id="482" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                                 <parm id="483">
-                                    <attributelist id="484" addr="0x7ff9f1f8a630" >
-                                        <attribute name="name" value="level" id="485" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="value" value="lLOGDEBUG" id="486" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="int" id="487" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="484" addr="0x7fdf084e1630" >
+                                        <attribute name="name" value="level" id="485" addr="0x7fdf085119d0" />
+                                        <attribute name="value" value="lLOGDEBUG" id="486" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="int" id="487" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="type" value="void" id="488" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="489" addr="0x7ff9f1fba9d0" />
+                            <attribute name="type" value="void" id="488" addr="0x7fdf085119d0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="489" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="490" addr="0x7ff9f1f8a850" >
-                        <attributelist id="491" addr="0x7ff9f1f8a850" >
-                            <attribute name="name" value="XBMCAddon::xbmc::log" id="492" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="493" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_previousSibling" value="0x7ff9f1f8a6f0" id="494" addr="0x7ff9f1f8a6f0" />
-                            <attribute name="kind" value="function" id="495" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_name" value="log" id="496" addr="0x7ff9f1fba9d0" />
-                            <attribute name="defaultargs" value="0x7ff9f1f8a6f0" id="497" addr="0x7ff9f1f8a6f0" />
-                            <attribute name="decl" value="f(p.q(const).char)." id="498" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_overloaded" value="0x7ff9f1f8a6f0" id="499" addr="0x7ff9f1f8a6f0" />
-                            <parmlist id="500" addr="0x7ff9f1f8a750" >
+                    <cdecl id="490" addr="0x7fdf084e1850" >
+                        <attributelist id="491" addr="0x7fdf084e1850" >
+                            <attribute name="name" value="XBMCAddon::xbmc::log" id="492" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="493" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_previousSibling" value="0x7fdf084e16f0" id="494" addr="0x7fdf084e16f0" />
+                            <attribute name="kind" value="function" id="495" addr="0x7fdf085119d0" />
+                            <attribute name="sym_name" value="log" id="496" addr="0x7fdf085119d0" />
+                            <attribute name="defaultargs" value="0x7fdf084e16f0" id="497" addr="0x7fdf084e16f0" />
+                            <attribute name="decl" value="f(p.q(const).char)." id="498" addr="0x7fdf085119d0" />
+                            <attribute name="sym_overloaded" value="0x7fdf084e16f0" id="499" addr="0x7fdf084e16f0" />
+                            <parmlist id="500" addr="0x7fdf084e1750" >
                                 <parm id="501">
-                                    <attributelist id="502" addr="0x7ff9f1f8a750" >
-                                        <attribute name="name" value="msg" id="503" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="p.q(const).char" id="504" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="502" addr="0x7fdf084e1750" >
+                                        <attribute name="name" value="msg" id="503" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="p.q(const).char" id="504" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="type" value="void" id="505" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_overname" value="__SWIG_1" id="506" addr="0x7ff9f1fba9d0" />
+                            <attribute name="type" value="void" id="505" addr="0x7fdf085119d0" />
+                            <attribute name="sym_overname" value="__SWIG_1" id="506" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="507" addr="0x7ff9f1f8aa70" >
-                        <attributelist id="508" addr="0x7ff9f1f8aa70" >
-                            <attribute name="sym_name" value="shutdown" id="509" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="XBMCAddon::xbmc::shutdown" id="510" addr="0x7ff9f1fba9d0" />
-                            <attribute name="decl" value="f()." id="511" addr="0x7ff9f1fba9d0" />
-                            <attribute name="kind" value="function" id="512" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="void" id="513" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="514" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="515" addr="0x7ff9f1fba9d0" />
+                    <cdecl id="507" addr="0x7fdf084e1a70" >
+                        <attributelist id="508" addr="0x7fdf084e1a70" >
+                            <attribute name="sym_name" value="shutdown" id="509" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="XBMCAddon::xbmc::shutdown" id="510" addr="0x7fdf085119d0" />
+                            <attribute name="decl" value="f()." id="511" addr="0x7fdf085119d0" />
+                            <attribute name="kind" value="function" id="512" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="void" id="513" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="514" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="515" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="516" addr="0x7ff9f1f8abf0" >
-                        <attributelist id="517" addr="0x7ff9f1f8abf0" >
-                            <attribute name="sym_name" value="restart" id="518" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="XBMCAddon::xbmc::restart" id="519" addr="0x7ff9f1fba9d0" />
-                            <attribute name="decl" value="f()." id="520" addr="0x7ff9f1fba9d0" />
-                            <attribute name="kind" value="function" id="521" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="void" id="522" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="523" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="524" addr="0x7ff9f1fba9d0" />
+                    <cdecl id="516" addr="0x7fdf084e1bf0" >
+                        <attributelist id="517" addr="0x7fdf084e1bf0" >
+                            <attribute name="sym_name" value="restart" id="518" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="XBMCAddon::xbmc::restart" id="519" addr="0x7fdf085119d0" />
+                            <attribute name="decl" value="f()." id="520" addr="0x7fdf085119d0" />
+                            <attribute name="kind" value="function" id="521" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="void" id="522" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="523" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="524" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="525" addr="0x7ff9f1f8aeb0" >
-                        <attributelist id="526" addr="0x7ff9f1f8aeb0" >
-                            <attribute name="sym_name" value="executescript" id="527" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="XBMCAddon::xbmc::executescript" id="528" addr="0x7ff9f1fba9d0" />
-                            <attribute name="decl" value="f(p.q(const).char)." id="529" addr="0x7ff9f1fba9d0" />
-                            <parmlist id="530" addr="0x7ff9f1f8adf0" >
+                    <cdecl id="525" addr="0x7fdf084e1eb0" >
+                        <attributelist id="526" addr="0x7fdf084e1eb0" >
+                            <attribute name="sym_name" value="executescript" id="527" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="XBMCAddon::xbmc::executescript" id="528" addr="0x7fdf085119d0" />
+                            <attribute name="decl" value="f(p.q(const).char)." id="529" addr="0x7fdf085119d0" />
+                            <parmlist id="530" addr="0x7fdf084e1df0" >
                                 <parm id="531">
-                                    <attributelist id="532" addr="0x7ff9f1f8adf0" >
-                                        <attribute name="name" value="script" id="533" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="p.q(const).char" id="534" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="532" addr="0x7fdf084e1df0" >
+                                        <attribute name="name" value="script" id="533" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="p.q(const).char" id="534" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="kind" value="function" id="535" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="void" id="536" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="537" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="538" addr="0x7ff9f1fba9d0" />
+                            <attribute name="kind" value="function" id="535" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="void" id="536" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="537" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="538" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="539" addr="0x7ff9f1f8b2b0" >
-                        <attributelist id="540" addr="0x7ff9f1f8b2b0" >
-                            <attribute name="name" value="XBMCAddon::xbmc::executebuiltin" id="541" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="542" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_nextSibling" value="0x7ff9f1f8b410" id="543" addr="0x7ff9f1f8b410" />
-                            <attribute name="csym_nextSibling" value="0x7ff9f1f8b410" id="544" addr="0x7ff9f1f8b410" />
-                            <attribute name="kind" value="function" id="545" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_name" value="executebuiltin" id="546" addr="0x7ff9f1fba9d0" />
-                            <attribute name="decl" value="f(p.q(const).char,bool)." id="547" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_overloaded" value="0x7ff9f1f8b2b0" id="548" addr="0x7ff9f1f8b2b0" />
-                            <parmlist id="549" addr="0x7ff9f1f8b0b0" >
+                    <cdecl id="539" addr="0x7fdf084e22b0" >
+                        <attributelist id="540" addr="0x7fdf084e22b0" >
+                            <attribute name="name" value="XBMCAddon::xbmc::executebuiltin" id="541" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="542" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_nextSibling" value="0x7fdf084e2410" id="543" addr="0x7fdf084e2410" />
+                            <attribute name="csym_nextSibling" value="0x7fdf084e2410" id="544" addr="0x7fdf084e2410" />
+                            <attribute name="kind" value="function" id="545" addr="0x7fdf085119d0" />
+                            <attribute name="sym_name" value="executebuiltin" id="546" addr="0x7fdf085119d0" />
+                            <attribute name="decl" value="f(p.q(const).char,bool)." id="547" addr="0x7fdf085119d0" />
+                            <attribute name="sym_overloaded" value="0x7fdf084e22b0" id="548" addr="0x7fdf084e22b0" />
+                            <parmlist id="549" addr="0x7fdf084e20b0" >
                                 <parm id="550">
-                                    <attributelist id="551" addr="0x7ff9f1f8b0b0" >
-                                        <attribute name="name" value="function" id="552" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="p.q(const).char" id="553" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="551" addr="0x7fdf084e20b0" >
+                                        <attribute name="name" value="function" id="552" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="p.q(const).char" id="553" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                                 <parm id="554">
-                                    <attributelist id="555" addr="0x7ff9f1f8b1f0" >
-                                        <attribute name="name" value="wait" id="556" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="value" value="false" id="557" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="bool" id="558" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="555" addr="0x7fdf084e21f0" >
+                                        <attribute name="name" value="wait" id="556" addr="0x7fdf085119d0" />
+                                        <attribute name="value" value="false" id="557" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="bool" id="558" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="type" value="void" id="559" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="560" addr="0x7ff9f1fba9d0" />
+                            <attribute name="type" value="void" id="559" addr="0x7fdf085119d0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="560" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="561" addr="0x7ff9f1f8b410" >
-                        <attributelist id="562" addr="0x7ff9f1f8b410" >
-                            <attribute name="name" value="XBMCAddon::xbmc::executebuiltin" id="563" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="564" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_previousSibling" value="0x7ff9f1f8b2b0" id="565" addr="0x7ff9f1f8b2b0" />
-                            <attribute name="kind" value="function" id="566" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_name" value="executebuiltin" id="567" addr="0x7ff9f1fba9d0" />
-                            <attribute name="defaultargs" value="0x7ff9f1f8b2b0" id="568" addr="0x7ff9f1f8b2b0" />
-                            <attribute name="decl" value="f(p.q(const).char)." id="569" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_overloaded" value="0x7ff9f1f8b2b0" id="570" addr="0x7ff9f1f8b2b0" />
-                            <parmlist id="571" addr="0x7ff9f1f8b310" >
+                    <cdecl id="561" addr="0x7fdf084e2410" >
+                        <attributelist id="562" addr="0x7fdf084e2410" >
+                            <attribute name="name" value="XBMCAddon::xbmc::executebuiltin" id="563" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="564" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_previousSibling" value="0x7fdf084e22b0" id="565" addr="0x7fdf084e22b0" />
+                            <attribute name="kind" value="function" id="566" addr="0x7fdf085119d0" />
+                            <attribute name="sym_name" value="executebuiltin" id="567" addr="0x7fdf085119d0" />
+                            <attribute name="defaultargs" value="0x7fdf084e22b0" id="568" addr="0x7fdf084e22b0" />
+                            <attribute name="decl" value="f(p.q(const).char)." id="569" addr="0x7fdf085119d0" />
+                            <attribute name="sym_overloaded" value="0x7fdf084e22b0" id="570" addr="0x7fdf084e22b0" />
+                            <parmlist id="571" addr="0x7fdf084e2310" >
                                 <parm id="572">
-                                    <attributelist id="573" addr="0x7ff9f1f8b310" >
-                                        <attribute name="name" value="function" id="574" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="p.q(const).char" id="575" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="573" addr="0x7fdf084e2310" >
+                                        <attribute name="name" value="function" id="574" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="p.q(const).char" id="575" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="type" value="void" id="576" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_overname" value="__SWIG_1" id="577" addr="0x7ff9f1fba9d0" />
+                            <attribute name="type" value="void" id="576" addr="0x7fdf085119d0" />
+                            <attribute name="sym_overname" value="__SWIG_1" id="577" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="578" addr="0x7ff9f1f8b6f0" >
-                        <attributelist id="579" addr="0x7ff9f1f8b6f0" >
-                            <attribute name="sym_name" value="executeJSONRPC" id="580" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="XBMCAddon::xbmc::executeJSONRPC" id="581" addr="0x7ff9f1fba9d0" />
-                            <attribute name="decl" value="f(p.q(const).char)." id="582" addr="0x7ff9f1fba9d0" />
-                            <parmlist id="583" addr="0x7ff9f1f8b630" >
+                    <cdecl id="578" addr="0x7fdf084e26f0" >
+                        <attributelist id="579" addr="0x7fdf084e26f0" >
+                            <attribute name="sym_name" value="executeJSONRPC" id="580" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="XBMCAddon::xbmc::executeJSONRPC" id="581" addr="0x7fdf085119d0" />
+                            <attribute name="decl" value="f(p.q(const).char)." id="582" addr="0x7fdf085119d0" />
+                            <parmlist id="583" addr="0x7fdf084e2630" >
                                 <parm id="584">
-                                    <attributelist id="585" addr="0x7ff9f1f8b630" >
-                                        <attribute name="name" value="jsonrpccommand" id="586" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="p.q(const).char" id="587" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="585" addr="0x7fdf084e2630" >
+                                        <attribute name="name" value="jsonrpccommand" id="586" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="p.q(const).char" id="587" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="kind" value="function" id="588" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="XBMCAddon::String" id="589" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="590" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="591" addr="0x7ff9f1fba9d0" />
+                            <attribute name="kind" value="function" id="588" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="XBMCAddon::String" id="589" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="590" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="591" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="592" addr="0x7ff9f1f8b990" >
-                        <attributelist id="593" addr="0x7ff9f1f8b990" >
-                            <attribute name="sym_name" value="sleep" id="594" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="XBMCAddon::xbmc::sleep" id="595" addr="0x7ff9f1fba9d0" />
-                            <attribute name="decl" value="f(long)." id="596" addr="0x7ff9f1fba9d0" />
-                            <parmlist id="597" addr="0x7ff9f1f8b8d0" >
+                    <cdecl id="592" addr="0x7fdf084e2990" >
+                        <attributelist id="593" addr="0x7fdf084e2990" >
+                            <attribute name="sym_name" value="sleep" id="594" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="XBMCAddon::xbmc::sleep" id="595" addr="0x7fdf085119d0" />
+                            <attribute name="decl" value="f(long)." id="596" addr="0x7fdf085119d0" />
+                            <parmlist id="597" addr="0x7fdf084e28d0" >
                                 <parm id="598">
-                                    <attributelist id="599" addr="0x7ff9f1f8b8d0" >
-                                        <attribute name="name" value="timemillis" id="600" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="long" id="601" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="599" addr="0x7fdf084e28d0" >
+                                        <attribute name="name" value="timemillis" id="600" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="long" id="601" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="kind" value="function" id="602" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="void" id="603" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="604" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="605" addr="0x7ff9f1fba9d0" />
+                            <attribute name="kind" value="function" id="602" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="void" id="603" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="604" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="605" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="606" addr="0x7ff9f1f8bc50" >
-                        <attributelist id="607" addr="0x7ff9f1f8bc50" >
-                            <attribute name="sym_name" value="getLocalizedString" id="608" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="XBMCAddon::xbmc::getLocalizedString" id="609" addr="0x7ff9f1fba9d0" />
-                            <attribute name="decl" value="f(int)." id="610" addr="0x7ff9f1fba9d0" />
-                            <parmlist id="611" addr="0x7ff9f1f8bb90" >
+                    <cdecl id="606" addr="0x7fdf084e2c50" >
+                        <attributelist id="607" addr="0x7fdf084e2c50" >
+                            <attribute name="sym_name" value="getLocalizedString" id="608" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="XBMCAddon::xbmc::getLocalizedString" id="609" addr="0x7fdf085119d0" />
+                            <attribute name="decl" value="f(int)." id="610" addr="0x7fdf085119d0" />
+                            <parmlist id="611" addr="0x7fdf084e2b90" >
                                 <parm id="612">
-                                    <attributelist id="613" addr="0x7ff9f1f8bb90" >
-                                        <attribute name="name" value="id" id="614" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="int" id="615" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="613" addr="0x7fdf084e2b90" >
+                                        <attribute name="name" value="id" id="614" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="int" id="615" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="kind" value="function" id="616" addr="0x7ff9f1fba9d0" />
-                            <attribute name="feature_python_coerceToUnicode" value="true" id="617" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="XBMCAddon::String" id="618" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="619" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="620" addr="0x7ff9f1fba9d0" />
+                            <attribute name="kind" value="function" id="616" addr="0x7fdf085119d0" />
+                            <attribute name="feature_python_coerceToUnicode" value="true" id="617" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="XBMCAddon::String" id="618" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="619" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="620" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="621" addr="0x7ff9f1f8be10" >
-                        <attributelist id="622" addr="0x7ff9f1f8be10" >
-                            <attribute name="sym_name" value="getSkinDir" id="623" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="XBMCAddon::xbmc::getSkinDir" id="624" addr="0x7ff9f1fba9d0" />
-                            <attribute name="decl" value="f()." id="625" addr="0x7ff9f1fba9d0" />
-                            <attribute name="kind" value="function" id="626" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="XBMCAddon::String" id="627" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="628" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="629" addr="0x7ff9f1fba9d0" />
+                    <cdecl id="621" addr="0x7fdf084e2e10" >
+                        <attributelist id="622" addr="0x7fdf084e2e10" >
+                            <attribute name="sym_name" value="getSkinDir" id="623" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="XBMCAddon::xbmc::getSkinDir" id="624" addr="0x7fdf085119d0" />
+                            <attribute name="decl" value="f()." id="625" addr="0x7fdf085119d0" />
+                            <attribute name="kind" value="function" id="626" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="XBMCAddon::String" id="627" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="628" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="629" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="630" addr="0x7ff9f1f8c290" >
-                        <attributelist id="631" addr="0x7ff9f1f8c290" >
-                            <attribute name="name" value="XBMCAddon::xbmc::getLanguage" id="632" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="633" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_nextSibling" value="0x7ff9f1f8c410" id="634" addr="0x7ff9f1f8c410" />
-                            <attribute name="csym_nextSibling" value="0x7ff9f1f8c410" id="635" addr="0x7ff9f1f8c410" />
-                            <attribute name="kind" value="function" id="636" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_name" value="getLanguage" id="637" addr="0x7ff9f1fba9d0" />
-                            <attribute name="decl" value="f(int,bool)." id="638" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_overloaded" value="0x7ff9f1f8c290" id="639" addr="0x7ff9f1f8c290" />
-                            <parmlist id="640" addr="0x7ff9f1f8c090" >
+                    <cdecl id="630" addr="0x7fdf084e3290" >
+                        <attributelist id="631" addr="0x7fdf084e3290" >
+                            <attribute name="name" value="XBMCAddon::xbmc::getLanguage" id="632" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="633" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_nextSibling" value="0x7fdf084e3410" id="634" addr="0x7fdf084e3410" />
+                            <attribute name="csym_nextSibling" value="0x7fdf084e3410" id="635" addr="0x7fdf084e3410" />
+                            <attribute name="kind" value="function" id="636" addr="0x7fdf085119d0" />
+                            <attribute name="sym_name" value="getLanguage" id="637" addr="0x7fdf085119d0" />
+                            <attribute name="decl" value="f(int,bool)." id="638" addr="0x7fdf085119d0" />
+                            <attribute name="sym_overloaded" value="0x7fdf084e3290" id="639" addr="0x7fdf084e3290" />
+                            <parmlist id="640" addr="0x7fdf084e3090" >
                                 <parm id="641">
-                                    <attributelist id="642" addr="0x7ff9f1f8c090" >
-                                        <attribute name="name" value="format" id="643" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="value" value="CLangCodeExpander::ENGLISH_NAME" id="644" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="int" id="645" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="642" addr="0x7fdf084e3090" >
+                                        <attribute name="name" value="format" id="643" addr="0x7fdf085119d0" />
+                                        <attribute name="value" value="CLangCodeExpander::ENGLISH_NAME" id="644" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="int" id="645" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                                 <parm id="646">
-                                    <attributelist id="647" addr="0x7ff9f1f8c1d0" >
-                                        <attribute name="name" value="region" id="648" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="value" value="false" id="649" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="bool" id="650" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="647" addr="0x7fdf084e31d0" >
+                                        <attribute name="name" value="region" id="648" addr="0x7fdf085119d0" />
+                                        <attribute name="value" value="false" id="649" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="bool" id="650" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="type" value="XBMCAddon::String" id="651" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="652" addr="0x7ff9f1fba9d0" />
+                            <attribute name="type" value="XBMCAddon::String" id="651" addr="0x7fdf085119d0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="652" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="653" addr="0x7ff9f1f8c410" >
-                        <attributelist id="654" addr="0x7ff9f1f8c410" >
-                            <attribute name="name" value="XBMCAddon::xbmc::getLanguage" id="655" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="656" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_nextSibling" value="0x7ff9f1f8c4d0" id="657" addr="0x7ff9f1f8c4d0" />
-                            <attribute name="csym_nextSibling" value="0x7ff9f1f8c4d0" id="658" addr="0x7ff9f1f8c4d0" />
-                            <attribute name="sym_previousSibling" value="0x7ff9f1f8c290" id="659" addr="0x7ff9f1f8c290" />
-                            <attribute name="kind" value="function" id="660" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_name" value="getLanguage" id="661" addr="0x7ff9f1fba9d0" />
-                            <attribute name="defaultargs" value="0x7ff9f1f8c290" id="662" addr="0x7ff9f1f8c290" />
-                            <attribute name="decl" value="f(int)." id="663" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_overloaded" value="0x7ff9f1f8c290" id="664" addr="0x7ff9f1f8c290" />
-                            <parmlist id="665" addr="0x7ff9f1f8c2f0" >
+                    <cdecl id="653" addr="0x7fdf084e3410" >
+                        <attributelist id="654" addr="0x7fdf084e3410" >
+                            <attribute name="name" value="XBMCAddon::xbmc::getLanguage" id="655" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="656" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_nextSibling" value="0x7fdf084e34d0" id="657" addr="0x7fdf084e34d0" />
+                            <attribute name="csym_nextSibling" value="0x7fdf084e34d0" id="658" addr="0x7fdf084e34d0" />
+                            <attribute name="sym_previousSibling" value="0x7fdf084e3290" id="659" addr="0x7fdf084e3290" />
+                            <attribute name="kind" value="function" id="660" addr="0x7fdf085119d0" />
+                            <attribute name="sym_name" value="getLanguage" id="661" addr="0x7fdf085119d0" />
+                            <attribute name="defaultargs" value="0x7fdf084e3290" id="662" addr="0x7fdf084e3290" />
+                            <attribute name="decl" value="f(int)." id="663" addr="0x7fdf085119d0" />
+                            <attribute name="sym_overloaded" value="0x7fdf084e3290" id="664" addr="0x7fdf084e3290" />
+                            <parmlist id="665" addr="0x7fdf084e32f0" >
                                 <parm id="666">
-                                    <attributelist id="667" addr="0x7ff9f1f8c2f0" >
-                                        <attribute name="name" value="format" id="668" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="value" value="CLangCodeExpander::ENGLISH_NAME" id="669" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="int" id="670" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="667" addr="0x7fdf084e32f0" >
+                                        <attribute name="name" value="format" id="668" addr="0x7fdf085119d0" />
+                                        <attribute name="value" value="CLangCodeExpander::ENGLISH_NAME" id="669" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="int" id="670" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="type" value="XBMCAddon::String" id="671" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_overname" value="__SWIG_1" id="672" addr="0x7ff9f1fba9d0" />
+                            <attribute name="type" value="XBMCAddon::String" id="671" addr="0x7fdf085119d0" />
+                            <attribute name="sym_overname" value="__SWIG_1" id="672" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="673" addr="0x7ff9f1f8c4d0" >
-                        <attributelist id="674" addr="0x7ff9f1f8c4d0" >
-                            <attribute name="sym_name" value="getLanguage" id="675" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="XBMCAddon::xbmc::getLanguage" id="676" addr="0x7ff9f1fba9d0" />
-                            <attribute name="decl" value="f()." id="677" addr="0x7ff9f1fba9d0" />
-                            <attribute name="kind" value="function" id="678" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_overloaded" value="0x7ff9f1f8c290" id="679" addr="0x7ff9f1f8c290" />
-                            <attribute name="defaultargs" value="0x7ff9f1f8c290" id="680" addr="0x7ff9f1f8c290" />
-                            <attribute name="type" value="XBMCAddon::String" id="681" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_previousSibling" value="0x7ff9f1f8c410" id="682" addr="0x7ff9f1f8c410" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="683" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_2" id="684" addr="0x7ff9f1fba9d0" />
+                    <cdecl id="673" addr="0x7fdf084e34d0" >
+                        <attributelist id="674" addr="0x7fdf084e34d0" >
+                            <attribute name="sym_name" value="getLanguage" id="675" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="XBMCAddon::xbmc::getLanguage" id="676" addr="0x7fdf085119d0" />
+                            <attribute name="decl" value="f()." id="677" addr="0x7fdf085119d0" />
+                            <attribute name="kind" value="function" id="678" addr="0x7fdf085119d0" />
+                            <attribute name="sym_overloaded" value="0x7fdf084e3290" id="679" addr="0x7fdf084e3290" />
+                            <attribute name="defaultargs" value="0x7fdf084e3290" id="680" addr="0x7fdf084e3290" />
+                            <attribute name="type" value="XBMCAddon::String" id="681" addr="0x7fdf085119d0" />
+                            <attribute name="sym_previousSibling" value="0x7fdf084e3410" id="682" addr="0x7fdf084e3410" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="683" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_2" id="684" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="685" addr="0x7ff9f1f8c690" >
-                        <attributelist id="686" addr="0x7ff9f1f8c690" >
-                            <attribute name="sym_name" value="getIPAddress" id="687" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="XBMCAddon::xbmc::getIPAddress" id="688" addr="0x7ff9f1fba9d0" />
-                            <attribute name="decl" value="f()." id="689" addr="0x7ff9f1fba9d0" />
-                            <attribute name="kind" value="function" id="690" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="XBMCAddon::String" id="691" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="692" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="693" addr="0x7ff9f1fba9d0" />
+                    <cdecl id="685" addr="0x7fdf084e3690" >
+                        <attributelist id="686" addr="0x7fdf084e3690" >
+                            <attribute name="sym_name" value="getIPAddress" id="687" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="XBMCAddon::xbmc::getIPAddress" id="688" addr="0x7fdf085119d0" />
+                            <attribute name="decl" value="f()." id="689" addr="0x7fdf085119d0" />
+                            <attribute name="kind" value="function" id="690" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="XBMCAddon::String" id="691" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="692" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="693" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="694" addr="0x7ff9f1f8c830" >
-                        <attributelist id="695" addr="0x7ff9f1f8c830" >
-                            <attribute name="sym_name" value="getDVDState" id="696" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="XBMCAddon::xbmc::getDVDState" id="697" addr="0x7ff9f1fba9d0" />
-                            <attribute name="decl" value="f()." id="698" addr="0x7ff9f1fba9d0" />
-                            <attribute name="kind" value="function" id="699" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="long" id="700" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="701" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="702" addr="0x7ff9f1fba9d0" />
+                    <cdecl id="694" addr="0x7fdf084e3830" >
+                        <attributelist id="695" addr="0x7fdf084e3830" >
+                            <attribute name="sym_name" value="getDVDState" id="696" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="XBMCAddon::xbmc::getDVDState" id="697" addr="0x7fdf085119d0" />
+                            <attribute name="decl" value="f()." id="698" addr="0x7fdf085119d0" />
+                            <attribute name="kind" value="function" id="699" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="long" id="700" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="701" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="702" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="703" addr="0x7ff9f1f8c9d0" >
-                        <attributelist id="704" addr="0x7ff9f1f8c9d0" >
-                            <attribute name="sym_name" value="getFreeMem" id="705" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="XBMCAddon::xbmc::getFreeMem" id="706" addr="0x7ff9f1fba9d0" />
-                            <attribute name="decl" value="f()." id="707" addr="0x7ff9f1fba9d0" />
-                            <attribute name="kind" value="function" id="708" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="long" id="709" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="710" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="711" addr="0x7ff9f1fba9d0" />
+                    <cdecl id="703" addr="0x7fdf084e39d0" >
+                        <attributelist id="704" addr="0x7fdf084e39d0" >
+                            <attribute name="sym_name" value="getFreeMem" id="705" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="XBMCAddon::xbmc::getFreeMem" id="706" addr="0x7fdf085119d0" />
+                            <attribute name="decl" value="f()." id="707" addr="0x7fdf085119d0" />
+                            <attribute name="kind" value="function" id="708" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="long" id="709" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="710" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="711" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="712" addr="0x7ff9f1f8ccb0" >
-                        <attributelist id="713" addr="0x7ff9f1f8ccb0" >
-                            <attribute name="sym_name" value="getInfoLabel" id="714" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="XBMCAddon::xbmc::getInfoLabel" id="715" addr="0x7ff9f1fba9d0" />
-                            <attribute name="decl" value="f(p.q(const).char)." id="716" addr="0x7ff9f1fba9d0" />
-                            <parmlist id="717" addr="0x7ff9f1f8cbf0" >
+                    <cdecl id="712" addr="0x7fdf084e3cb0" >
+                        <attributelist id="713" addr="0x7fdf084e3cb0" >
+                            <attribute name="sym_name" value="getInfoLabel" id="714" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="XBMCAddon::xbmc::getInfoLabel" id="715" addr="0x7fdf085119d0" />
+                            <attribute name="decl" value="f(p.q(const).char)." id="716" addr="0x7fdf085119d0" />
+                            <parmlist id="717" addr="0x7fdf084e3bf0" >
                                 <parm id="718">
-                                    <attributelist id="719" addr="0x7ff9f1f8cbf0" >
-                                        <attribute name="name" value="cLine" id="720" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="p.q(const).char" id="721" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="719" addr="0x7fdf084e3bf0" >
+                                        <attribute name="name" value="cLine" id="720" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="p.q(const).char" id="721" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="kind" value="function" id="722" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="XBMCAddon::String" id="723" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="724" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="725" addr="0x7ff9f1fba9d0" />
+                            <attribute name="kind" value="function" id="722" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="XBMCAddon::String" id="723" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="724" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="725" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="726" addr="0x7ff9f1f8cf90" >
-                        <attributelist id="727" addr="0x7ff9f1f8cf90" >
-                            <attribute name="sym_name" value="getInfoImage" id="728" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="XBMCAddon::xbmc::getInfoImage" id="729" addr="0x7ff9f1fba9d0" />
-                            <attribute name="decl" value="f(p.q(const).char)." id="730" addr="0x7ff9f1fba9d0" />
-                            <parmlist id="731" addr="0x7ff9f1f8ced0" >
+                    <cdecl id="726" addr="0x7fdf084e3f90" >
+                        <attributelist id="727" addr="0x7fdf084e3f90" >
+                            <attribute name="sym_name" value="getInfoImage" id="728" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="XBMCAddon::xbmc::getInfoImage" id="729" addr="0x7fdf085119d0" />
+                            <attribute name="decl" value="f(p.q(const).char)." id="730" addr="0x7fdf085119d0" />
+                            <parmlist id="731" addr="0x7fdf084e3ed0" >
                                 <parm id="732">
-                                    <attributelist id="733" addr="0x7ff9f1f8ced0" >
-                                        <attribute name="name" value="infotag" id="734" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="p.q(const).char" id="735" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="733" addr="0x7fdf084e3ed0" >
+                                        <attribute name="name" value="infotag" id="734" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="p.q(const).char" id="735" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="kind" value="function" id="736" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="XBMCAddon::String" id="737" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="738" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="739" addr="0x7ff9f1fba9d0" />
+                            <attribute name="kind" value="function" id="736" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="XBMCAddon::String" id="737" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="738" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="739" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="740" addr="0x7ff9f1f8d390" >
-                        <attributelist id="741" addr="0x7ff9f1f8d390" >
-                            <attribute name="name" value="XBMCAddon::xbmc::playSFX" id="742" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="743" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_nextSibling" value="0x7ff9f1f8d4f0" id="744" addr="0x7ff9f1f8d4f0" />
-                            <attribute name="csym_nextSibling" value="0x7ff9f1f8d4f0" id="745" addr="0x7ff9f1f8d4f0" />
-                            <attribute name="kind" value="function" id="746" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_name" value="playSFX" id="747" addr="0x7ff9f1fba9d0" />
-                            <attribute name="decl" value="f(p.q(const).char,bool)." id="748" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_overloaded" value="0x7ff9f1f8d390" id="749" addr="0x7ff9f1f8d390" />
-                            <parmlist id="750" addr="0x7ff9f1f8d190" >
+                    <cdecl id="740" addr="0x7fdf084e4390" >
+                        <attributelist id="741" addr="0x7fdf084e4390" >
+                            <attribute name="name" value="XBMCAddon::xbmc::playSFX" id="742" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="743" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_nextSibling" value="0x7fdf084e44f0" id="744" addr="0x7fdf084e44f0" />
+                            <attribute name="csym_nextSibling" value="0x7fdf084e44f0" id="745" addr="0x7fdf084e44f0" />
+                            <attribute name="kind" value="function" id="746" addr="0x7fdf085119d0" />
+                            <attribute name="sym_name" value="playSFX" id="747" addr="0x7fdf085119d0" />
+                            <attribute name="decl" value="f(p.q(const).char,bool)." id="748" addr="0x7fdf085119d0" />
+                            <attribute name="sym_overloaded" value="0x7fdf084e4390" id="749" addr="0x7fdf084e4390" />
+                            <parmlist id="750" addr="0x7fdf084e4190" >
                                 <parm id="751">
-                                    <attributelist id="752" addr="0x7ff9f1f8d190" >
-                                        <attribute name="name" value="filename" id="753" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="p.q(const).char" id="754" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="752" addr="0x7fdf084e4190" >
+                                        <attribute name="name" value="filename" id="753" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="p.q(const).char" id="754" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                                 <parm id="755">
-                                    <attributelist id="756" addr="0x7ff9f1f8d2d0" >
-                                        <attribute name="name" value="useCached" id="757" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="value" value="true" id="758" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="bool" id="759" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="756" addr="0x7fdf084e42d0" >
+                                        <attribute name="name" value="useCached" id="757" addr="0x7fdf085119d0" />
+                                        <attribute name="value" value="true" id="758" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="bool" id="759" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="type" value="void" id="760" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="761" addr="0x7ff9f1fba9d0" />
+                            <attribute name="type" value="void" id="760" addr="0x7fdf085119d0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="761" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="762" addr="0x7ff9f1f8d4f0" >
-                        <attributelist id="763" addr="0x7ff9f1f8d4f0" >
-                            <attribute name="name" value="XBMCAddon::xbmc::playSFX" id="764" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="765" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_previousSibling" value="0x7ff9f1f8d390" id="766" addr="0x7ff9f1f8d390" />
-                            <attribute name="kind" value="function" id="767" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_name" value="playSFX" id="768" addr="0x7ff9f1fba9d0" />
-                            <attribute name="defaultargs" value="0x7ff9f1f8d390" id="769" addr="0x7ff9f1f8d390" />
-                            <attribute name="decl" value="f(p.q(const).char)." id="770" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_overloaded" value="0x7ff9f1f8d390" id="771" addr="0x7ff9f1f8d390" />
-                            <parmlist id="772" addr="0x7ff9f1f8d3f0" >
+                    <cdecl id="762" addr="0x7fdf084e44f0" >
+                        <attributelist id="763" addr="0x7fdf084e44f0" >
+                            <attribute name="name" value="XBMCAddon::xbmc::playSFX" id="764" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="765" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_previousSibling" value="0x7fdf084e4390" id="766" addr="0x7fdf084e4390" />
+                            <attribute name="kind" value="function" id="767" addr="0x7fdf085119d0" />
+                            <attribute name="sym_name" value="playSFX" id="768" addr="0x7fdf085119d0" />
+                            <attribute name="defaultargs" value="0x7fdf084e4390" id="769" addr="0x7fdf084e4390" />
+                            <attribute name="decl" value="f(p.q(const).char)." id="770" addr="0x7fdf085119d0" />
+                            <attribute name="sym_overloaded" value="0x7fdf084e4390" id="771" addr="0x7fdf084e4390" />
+                            <parmlist id="772" addr="0x7fdf084e43f0" >
                                 <parm id="773">
-                                    <attributelist id="774" addr="0x7ff9f1f8d3f0" >
-                                        <attribute name="name" value="filename" id="775" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="p.q(const).char" id="776" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="774" addr="0x7fdf084e43f0" >
+                                        <attribute name="name" value="filename" id="775" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="p.q(const).char" id="776" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="type" value="void" id="777" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_overname" value="__SWIG_1" id="778" addr="0x7ff9f1fba9d0" />
+                            <attribute name="type" value="void" id="777" addr="0x7fdf085119d0" />
+                            <attribute name="sym_overname" value="__SWIG_1" id="778" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="779" addr="0x7ff9f1f8d670" >
-                        <attributelist id="780" addr="0x7ff9f1f8d670" >
-                            <attribute name="sym_name" value="stopSFX" id="781" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="XBMCAddon::xbmc::stopSFX" id="782" addr="0x7ff9f1fba9d0" />
-                            <attribute name="decl" value="f()." id="783" addr="0x7ff9f1fba9d0" />
-                            <attribute name="kind" value="function" id="784" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="void" id="785" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="786" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="787" addr="0x7ff9f1fba9d0" />
+                    <cdecl id="779" addr="0x7fdf084e4670" >
+                        <attributelist id="780" addr="0x7fdf084e4670" >
+                            <attribute name="sym_name" value="stopSFX" id="781" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="XBMCAddon::xbmc::stopSFX" id="782" addr="0x7fdf085119d0" />
+                            <attribute name="decl" value="f()." id="783" addr="0x7fdf085119d0" />
+                            <attribute name="kind" value="function" id="784" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="void" id="785" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="786" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="787" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="788" addr="0x7ff9f1f8d8f0" >
-                        <attributelist id="789" addr="0x7ff9f1f8d8f0" >
-                            <attribute name="sym_name" value="enableNavSounds" id="790" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="XBMCAddon::xbmc::enableNavSounds" id="791" addr="0x7ff9f1fba9d0" />
-                            <attribute name="decl" value="f(bool)." id="792" addr="0x7ff9f1fba9d0" />
-                            <parmlist id="793" addr="0x7ff9f1f8d830" >
+                    <cdecl id="788" addr="0x7fdf084e48f0" >
+                        <attributelist id="789" addr="0x7fdf084e48f0" >
+                            <attribute name="sym_name" value="enableNavSounds" id="790" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="XBMCAddon::xbmc::enableNavSounds" id="791" addr="0x7fdf085119d0" />
+                            <attribute name="decl" value="f(bool)." id="792" addr="0x7fdf085119d0" />
+                            <parmlist id="793" addr="0x7fdf084e4830" >
                                 <parm id="794">
-                                    <attributelist id="795" addr="0x7ff9f1f8d830" >
-                                        <attribute name="name" value="yesNo" id="796" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="bool" id="797" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="795" addr="0x7fdf084e4830" >
+                                        <attribute name="name" value="yesNo" id="796" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="bool" id="797" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="kind" value="function" id="798" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="void" id="799" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="800" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="801" addr="0x7ff9f1fba9d0" />
+                            <attribute name="kind" value="function" id="798" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="void" id="799" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="800" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="801" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="802" addr="0x7ff9f1f8dbb0" >
-                        <attributelist id="803" addr="0x7ff9f1f8dbb0" >
-                            <attribute name="sym_name" value="getCondVisibility" id="804" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="XBMCAddon::xbmc::getCondVisibility" id="805" addr="0x7ff9f1fba9d0" />
-                            <attribute name="decl" value="f(p.q(const).char)." id="806" addr="0x7ff9f1fba9d0" />
-                            <parmlist id="807" addr="0x7ff9f1f8daf0" >
+                    <cdecl id="802" addr="0x7fdf084e4bb0" >
+                        <attributelist id="803" addr="0x7fdf084e4bb0" >
+                            <attribute name="sym_name" value="getCondVisibility" id="804" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="XBMCAddon::xbmc::getCondVisibility" id="805" addr="0x7fdf085119d0" />
+                            <attribute name="decl" value="f(p.q(const).char)." id="806" addr="0x7fdf085119d0" />
+                            <parmlist id="807" addr="0x7fdf084e4af0" >
                                 <parm id="808">
-                                    <attributelist id="809" addr="0x7ff9f1f8daf0" >
-                                        <attribute name="name" value="condition" id="810" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="p.q(const).char" id="811" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="809" addr="0x7fdf084e4af0" >
+                                        <attribute name="name" value="condition" id="810" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="p.q(const).char" id="811" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="kind" value="function" id="812" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="bool" id="813" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="814" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="815" addr="0x7ff9f1fba9d0" />
+                            <attribute name="kind" value="function" id="812" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="bool" id="813" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="814" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="815" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="816" addr="0x7ff9f1f8dd50" >
-                        <attributelist id="817" addr="0x7ff9f1f8dd50" >
-                            <attribute name="sym_name" value="getGlobalIdleTime" id="818" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="XBMCAddon::xbmc::getGlobalIdleTime" id="819" addr="0x7ff9f1fba9d0" />
-                            <attribute name="decl" value="f()." id="820" addr="0x7ff9f1fba9d0" />
-                            <attribute name="kind" value="function" id="821" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="int" id="822" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="823" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="824" addr="0x7ff9f1fba9d0" />
+                    <cdecl id="816" addr="0x7fdf084e4d50" >
+                        <attributelist id="817" addr="0x7fdf084e4d50" >
+                            <attribute name="sym_name" value="getGlobalIdleTime" id="818" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="XBMCAddon::xbmc::getGlobalIdleTime" id="819" addr="0x7fdf085119d0" />
+                            <attribute name="decl" value="f()." id="820" addr="0x7fdf085119d0" />
+                            <attribute name="kind" value="function" id="821" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="int" id="822" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="823" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="824" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="825" addr="0x7ff9f1f8e030" >
-                        <attributelist id="826" addr="0x7ff9f1f8e030" >
-                            <attribute name="sym_name" value="getCacheThumbName" id="827" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="XBMCAddon::xbmc::getCacheThumbName" id="828" addr="0x7ff9f1fba9d0" />
-                            <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="829" addr="0x7ff9f1fba9d0" />
-                            <parmlist id="830" addr="0x7ff9f1f8df70" >
+                    <cdecl id="825" addr="0x7fdf084e5030" >
+                        <attributelist id="826" addr="0x7fdf084e5030" >
+                            <attribute name="sym_name" value="getCacheThumbName" id="827" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="XBMCAddon::xbmc::getCacheThumbName" id="828" addr="0x7fdf085119d0" />
+                            <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="829" addr="0x7fdf085119d0" />
+                            <parmlist id="830" addr="0x7fdf084e4f70" >
                                 <parm id="831">
-                                    <attributelist id="832" addr="0x7ff9f1f8df70" >
-                                        <attribute name="name" value="path" id="833" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="834" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="832" addr="0x7fdf084e4f70" >
+                                        <attribute name="name" value="path" id="833" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="834" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="kind" value="function" id="835" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="XBMCAddon::String" id="836" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="837" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="838" addr="0x7ff9f1fba9d0" />
+                            <attribute name="kind" value="function" id="835" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="XBMCAddon::String" id="836" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="837" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="838" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="839" addr="0x7ff9f1f8e450" >
-                        <attributelist id="840" addr="0x7ff9f1f8e450" >
-                            <attribute name="name" value="XBMCAddon::xbmc::makeLegalFilename" id="841" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="842" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_nextSibling" value="0x7ff9f1f8e5b0" id="843" addr="0x7ff9f1f8e5b0" />
-                            <attribute name="csym_nextSibling" value="0x7ff9f1f8e5b0" id="844" addr="0x7ff9f1f8e5b0" />
-                            <attribute name="kind" value="function" id="845" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_name" value="makeLegalFilename" id="846" addr="0x7ff9f1fba9d0" />
-                            <attribute name="decl" value="f(r.q(const).XBMCAddon::String,bool)." id="847" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_overloaded" value="0x7ff9f1f8e450" id="848" addr="0x7ff9f1f8e450" />
-                            <parmlist id="849" addr="0x7ff9f1f8e250" >
+                    <cdecl id="839" addr="0x7fdf084e5450" >
+                        <attributelist id="840" addr="0x7fdf084e5450" >
+                            <attribute name="name" value="XBMCAddon::xbmc::makeLegalFilename" id="841" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="842" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_nextSibling" value="0x7fdf084e55b0" id="843" addr="0x7fdf084e55b0" />
+                            <attribute name="csym_nextSibling" value="0x7fdf084e55b0" id="844" addr="0x7fdf084e55b0" />
+                            <attribute name="kind" value="function" id="845" addr="0x7fdf085119d0" />
+                            <attribute name="sym_name" value="makeLegalFilename" id="846" addr="0x7fdf085119d0" />
+                            <attribute name="decl" value="f(r.q(const).XBMCAddon::String,bool)." id="847" addr="0x7fdf085119d0" />
+                            <attribute name="sym_overloaded" value="0x7fdf084e5450" id="848" addr="0x7fdf084e5450" />
+                            <parmlist id="849" addr="0x7fdf084e5250" >
                                 <parm id="850">
-                                    <attributelist id="851" addr="0x7ff9f1f8e250" >
-                                        <attribute name="name" value="filename" id="852" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="853" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="851" addr="0x7fdf084e5250" >
+                                        <attribute name="name" value="filename" id="852" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="853" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                                 <parm id="854">
-                                    <attributelist id="855" addr="0x7ff9f1f8e390" >
-                                        <attribute name="name" value="fatX" id="856" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="value" value="true" id="857" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="bool" id="858" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="855" addr="0x7fdf084e5390" >
+                                        <attribute name="name" value="fatX" id="856" addr="0x7fdf085119d0" />
+                                        <attribute name="value" value="true" id="857" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="bool" id="858" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="type" value="XBMCAddon::String" id="859" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="860" addr="0x7ff9f1fba9d0" />
+                            <attribute name="type" value="XBMCAddon::String" id="859" addr="0x7fdf085119d0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="860" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="861" addr="0x7ff9f1f8e5b0" >
-                        <attributelist id="862" addr="0x7ff9f1f8e5b0" >
-                            <attribute name="name" value="XBMCAddon::xbmc::makeLegalFilename" id="863" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="864" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_previousSibling" value="0x7ff9f1f8e450" id="865" addr="0x7ff9f1f8e450" />
-                            <attribute name="kind" value="function" id="866" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_name" value="makeLegalFilename" id="867" addr="0x7ff9f1fba9d0" />
-                            <attribute name="defaultargs" value="0x7ff9f1f8e450" id="868" addr="0x7ff9f1f8e450" />
-                            <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="869" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_overloaded" value="0x7ff9f1f8e450" id="870" addr="0x7ff9f1f8e450" />
-                            <parmlist id="871" addr="0x7ff9f1f8e4b0" >
+                    <cdecl id="861" addr="0x7fdf084e55b0" >
+                        <attributelist id="862" addr="0x7fdf084e55b0" >
+                            <attribute name="name" value="XBMCAddon::xbmc::makeLegalFilename" id="863" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="864" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_previousSibling" value="0x7fdf084e5450" id="865" addr="0x7fdf084e5450" />
+                            <attribute name="kind" value="function" id="866" addr="0x7fdf085119d0" />
+                            <attribute name="sym_name" value="makeLegalFilename" id="867" addr="0x7fdf085119d0" />
+                            <attribute name="defaultargs" value="0x7fdf084e5450" id="868" addr="0x7fdf084e5450" />
+                            <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="869" addr="0x7fdf085119d0" />
+                            <attribute name="sym_overloaded" value="0x7fdf084e5450" id="870" addr="0x7fdf084e5450" />
+                            <parmlist id="871" addr="0x7fdf084e54b0" >
                                 <parm id="872">
-                                    <attributelist id="873" addr="0x7ff9f1f8e4b0" >
-                                        <attribute name="name" value="filename" id="874" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="875" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="873" addr="0x7fdf084e54b0" >
+                                        <attribute name="name" value="filename" id="874" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="875" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="type" value="XBMCAddon::String" id="876" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_overname" value="__SWIG_1" id="877" addr="0x7ff9f1fba9d0" />
+                            <attribute name="type" value="XBMCAddon::String" id="876" addr="0x7fdf085119d0" />
+                            <attribute name="sym_overname" value="__SWIG_1" id="877" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="878" addr="0x7ff9f1f8e890" >
-                        <attributelist id="879" addr="0x7ff9f1f8e890" >
-                            <attribute name="sym_name" value="translatePath" id="880" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="XBMCAddon::xbmc::translatePath" id="881" addr="0x7ff9f1fba9d0" />
-                            <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="882" addr="0x7ff9f1fba9d0" />
-                            <parmlist id="883" addr="0x7ff9f1f8e7d0" >
+                    <cdecl id="878" addr="0x7fdf084e5890" >
+                        <attributelist id="879" addr="0x7fdf084e5890" >
+                            <attribute name="sym_name" value="translatePath" id="880" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="XBMCAddon::xbmc::translatePath" id="881" addr="0x7fdf085119d0" />
+                            <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="882" addr="0x7fdf085119d0" />
+                            <parmlist id="883" addr="0x7fdf084e57d0" >
                                 <parm id="884">
-                                    <attributelist id="885" addr="0x7ff9f1f8e7d0" >
-                                        <attribute name="name" value="path" id="886" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="887" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="885" addr="0x7fdf084e57d0" >
+                                        <attribute name="name" value="path" id="886" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="887" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="kind" value="function" id="888" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="XBMCAddon::String" id="889" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="890" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="891" addr="0x7ff9f1fba9d0" />
+                            <attribute name="kind" value="function" id="888" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="XBMCAddon::String" id="889" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="890" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="891" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="892" addr="0x7ff9f1f8ee10" >
-                        <attributelist id="893" addr="0x7ff9f1f8ee10" >
-                            <attribute name="name" value="XBMCAddon::xbmc::getCleanMovieTitle" id="894" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="895" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_nextSibling" value="0x7ff9f1f8ef70" id="896" addr="0x7ff9f1f8ef70" />
-                            <attribute name="csym_nextSibling" value="0x7ff9f1f8ef70" id="897" addr="0x7ff9f1f8ef70" />
-                            <attribute name="kind" value="function" id="898" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_name" value="getCleanMovieTitle" id="899" addr="0x7ff9f1fba9d0" />
-                            <attribute name="decl" value="f(r.q(const).XBMCAddon::String,bool)." id="900" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_overloaded" value="0x7ff9f1f8ee10" id="901" addr="0x7ff9f1f8ee10" />
-                            <parmlist id="902" addr="0x7ff9f1f8ec10" >
+                    <cdecl id="892" addr="0x7fdf084e5e10" >
+                        <attributelist id="893" addr="0x7fdf084e5e10" >
+                            <attribute name="name" value="XBMCAddon::xbmc::getCleanMovieTitle" id="894" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="895" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_nextSibling" value="0x7fdf084e5f70" id="896" addr="0x7fdf084e5f70" />
+                            <attribute name="csym_nextSibling" value="0x7fdf084e5f70" id="897" addr="0x7fdf084e5f70" />
+                            <attribute name="kind" value="function" id="898" addr="0x7fdf085119d0" />
+                            <attribute name="sym_name" value="getCleanMovieTitle" id="899" addr="0x7fdf085119d0" />
+                            <attribute name="decl" value="f(r.q(const).XBMCAddon::String,bool)." id="900" addr="0x7fdf085119d0" />
+                            <attribute name="sym_overloaded" value="0x7fdf084e5e10" id="901" addr="0x7fdf084e5e10" />
+                            <parmlist id="902" addr="0x7fdf084e5c10" >
                                 <parm id="903">
-                                    <attributelist id="904" addr="0x7ff9f1f8ec10" >
-                                        <attribute name="name" value="path" id="905" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="906" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="904" addr="0x7fdf084e5c10" >
+                                        <attribute name="name" value="path" id="905" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="906" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                                 <parm id="907">
-                                    <attributelist id="908" addr="0x7ff9f1f8ed50" >
-                                        <attribute name="name" value="usefoldername" id="909" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="value" value="false" id="910" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="bool" id="911" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="908" addr="0x7fdf084e5d50" >
+                                        <attribute name="name" value="usefoldername" id="909" addr="0x7fdf085119d0" />
+                                        <attribute name="value" value="false" id="910" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="bool" id="911" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="type" value="Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>" id="912" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="913" addr="0x7ff9f1fba9d0" />
+                            <attribute name="type" value="Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>" id="912" addr="0x7fdf085119d0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="913" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="914" addr="0x7ff9f1f8ef70" >
-                        <attributelist id="915" addr="0x7ff9f1f8ef70" >
-                            <attribute name="name" value="XBMCAddon::xbmc::getCleanMovieTitle" id="916" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="917" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_previousSibling" value="0x7ff9f1f8ee10" id="918" addr="0x7ff9f1f8ee10" />
-                            <attribute name="kind" value="function" id="919" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_name" value="getCleanMovieTitle" id="920" addr="0x7ff9f1fba9d0" />
-                            <attribute name="defaultargs" value="0x7ff9f1f8ee10" id="921" addr="0x7ff9f1f8ee10" />
-                            <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="922" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_overloaded" value="0x7ff9f1f8ee10" id="923" addr="0x7ff9f1f8ee10" />
-                            <parmlist id="924" addr="0x7ff9f1f8ee70" >
+                    <cdecl id="914" addr="0x7fdf084e5f70" >
+                        <attributelist id="915" addr="0x7fdf084e5f70" >
+                            <attribute name="name" value="XBMCAddon::xbmc::getCleanMovieTitle" id="916" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="917" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_previousSibling" value="0x7fdf084e5e10" id="918" addr="0x7fdf084e5e10" />
+                            <attribute name="kind" value="function" id="919" addr="0x7fdf085119d0" />
+                            <attribute name="sym_name" value="getCleanMovieTitle" id="920" addr="0x7fdf085119d0" />
+                            <attribute name="defaultargs" value="0x7fdf084e5e10" id="921" addr="0x7fdf084e5e10" />
+                            <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="922" addr="0x7fdf085119d0" />
+                            <attribute name="sym_overloaded" value="0x7fdf084e5e10" id="923" addr="0x7fdf084e5e10" />
+                            <parmlist id="924" addr="0x7fdf084e5e70" >
                                 <parm id="925">
-                                    <attributelist id="926" addr="0x7ff9f1f8ee70" >
-                                        <attribute name="name" value="path" id="927" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="928" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="926" addr="0x7fdf084e5e70" >
+                                        <attribute name="name" value="path" id="927" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="928" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="type" value="Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>" id="929" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_overname" value="__SWIG_1" id="930" addr="0x7ff9f1fba9d0" />
+                            <attribute name="type" value="Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>" id="929" addr="0x7fdf085119d0" />
+                            <attribute name="sym_overname" value="__SWIG_1" id="930" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="931" addr="0x7ff9f1f8f250" >
-                        <attributelist id="932" addr="0x7ff9f1f8f250" >
-                            <attribute name="sym_name" value="validatePath" id="933" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="XBMCAddon::xbmc::validatePath" id="934" addr="0x7ff9f1fba9d0" />
-                            <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="935" addr="0x7ff9f1fba9d0" />
-                            <parmlist id="936" addr="0x7ff9f1f8f190" >
+                    <cdecl id="931" addr="0x7fdf084e6250" >
+                        <attributelist id="932" addr="0x7fdf084e6250" >
+                            <attribute name="sym_name" value="validatePath" id="933" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="XBMCAddon::xbmc::validatePath" id="934" addr="0x7fdf085119d0" />
+                            <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="935" addr="0x7fdf085119d0" />
+                            <parmlist id="936" addr="0x7fdf084e6190" >
                                 <parm id="937">
-                                    <attributelist id="938" addr="0x7ff9f1f8f190" >
-                                        <attribute name="name" value="path" id="939" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="940" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="938" addr="0x7fdf084e6190" >
+                                        <attribute name="name" value="path" id="939" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="940" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="kind" value="function" id="941" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="XBMCAddon::String" id="942" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="943" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="944" addr="0x7ff9f1fba9d0" />
+                            <attribute name="kind" value="function" id="941" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="XBMCAddon::String" id="942" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="943" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="944" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="945" addr="0x7ff9f1f8f530" >
-                        <attributelist id="946" addr="0x7ff9f1f8f530" >
-                            <attribute name="sym_name" value="getRegion" id="947" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="XBMCAddon::xbmc::getRegion" id="948" addr="0x7ff9f1fba9d0" />
-                            <attribute name="decl" value="f(p.q(const).char)." id="949" addr="0x7ff9f1fba9d0" />
-                            <parmlist id="950" addr="0x7ff9f1f8f470" >
+                    <cdecl id="945" addr="0x7fdf084e6530" >
+                        <attributelist id="946" addr="0x7fdf084e6530" >
+                            <attribute name="sym_name" value="getRegion" id="947" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="XBMCAddon::xbmc::getRegion" id="948" addr="0x7fdf085119d0" />
+                            <attribute name="decl" value="f(p.q(const).char)." id="949" addr="0x7fdf085119d0" />
+                            <parmlist id="950" addr="0x7fdf084e6470" >
                                 <parm id="951">
-                                    <attributelist id="952" addr="0x7ff9f1f8f470" >
-                                        <attribute name="name" value="id" id="953" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="p.q(const).char" id="954" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="952" addr="0x7fdf084e6470" >
+                                        <attribute name="name" value="id" id="953" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="p.q(const).char" id="954" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="kind" value="function" id="955" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="XBMCAddon::String" id="956" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="957" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="958" addr="0x7ff9f1fba9d0" />
+                            <attribute name="kind" value="function" id="955" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="XBMCAddon::String" id="956" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="957" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="958" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="959" addr="0x7ff9f1f8f810" >
-                        <attributelist id="960" addr="0x7ff9f1f8f810" >
-                            <attribute name="sym_name" value="getSupportedMedia" id="961" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="XBMCAddon::xbmc::getSupportedMedia" id="962" addr="0x7ff9f1fba9d0" />
-                            <attribute name="decl" value="f(p.q(const).char)." id="963" addr="0x7ff9f1fba9d0" />
-                            <parmlist id="964" addr="0x7ff9f1f8f750" >
+                    <cdecl id="959" addr="0x7fdf084e6810" >
+                        <attributelist id="960" addr="0x7fdf084e6810" >
+                            <attribute name="sym_name" value="getSupportedMedia" id="961" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="XBMCAddon::xbmc::getSupportedMedia" id="962" addr="0x7fdf085119d0" />
+                            <attribute name="decl" value="f(p.q(const).char)." id="963" addr="0x7fdf085119d0" />
+                            <parmlist id="964" addr="0x7fdf084e6750" >
                                 <parm id="965">
-                                    <attributelist id="966" addr="0x7ff9f1f8f750" >
-                                        <attribute name="name" value="mediaType" id="967" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="p.q(const).char" id="968" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="966" addr="0x7fdf084e6750" >
+                                        <attribute name="name" value="mediaType" id="967" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="p.q(const).char" id="968" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="kind" value="function" id="969" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="XBMCAddon::String" id="970" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="971" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="972" addr="0x7ff9f1fba9d0" />
+                            <attribute name="kind" value="function" id="969" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="XBMCAddon::String" id="970" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="971" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="972" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="973" addr="0x7ff9f1f8fad0" >
-                        <attributelist id="974" addr="0x7ff9f1f8fad0" >
-                            <attribute name="sym_name" value="skinHasImage" id="975" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="XBMCAddon::xbmc::skinHasImage" id="976" addr="0x7ff9f1fba9d0" />
-                            <attribute name="decl" value="f(p.q(const).char)." id="977" addr="0x7ff9f1fba9d0" />
-                            <parmlist id="978" addr="0x7ff9f1f8fa10" >
+                    <cdecl id="973" addr="0x7fdf084e6ad0" >
+                        <attributelist id="974" addr="0x7fdf084e6ad0" >
+                            <attribute name="sym_name" value="skinHasImage" id="975" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="XBMCAddon::xbmc::skinHasImage" id="976" addr="0x7fdf085119d0" />
+                            <attribute name="decl" value="f(p.q(const).char)." id="977" addr="0x7fdf085119d0" />
+                            <parmlist id="978" addr="0x7fdf084e6a10" >
                                 <parm id="979">
-                                    <attributelist id="980" addr="0x7ff9f1f8fa10" >
-                                        <attribute name="name" value="image" id="981" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="p.q(const).char" id="982" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="980" addr="0x7fdf084e6a10" >
+                                        <attribute name="name" value="image" id="981" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="p.q(const).char" id="982" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="kind" value="function" id="983" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="bool" id="984" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="985" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="986" addr="0x7ff9f1fba9d0" />
+                            <attribute name="kind" value="function" id="983" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="bool" id="984" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="985" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="986" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="987" addr="0x7ff9f1f8ffb0" >
-                        <attributelist id="988" addr="0x7ff9f1f8ffb0" >
-                            <attribute name="name" value="XBMCAddon::xbmc::startServer" id="989" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="990" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_nextSibling" value="0x7ff9f1f90190" id="991" addr="0x7ff9f1f90190" />
-                            <attribute name="csym_nextSibling" value="0x7ff9f1f90190" id="992" addr="0x7ff9f1f90190" />
-                            <attribute name="kind" value="function" id="993" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_name" value="startServer" id="994" addr="0x7ff9f1fba9d0" />
-                            <attribute name="decl" value="f(int,bool,bool)." id="995" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_overloaded" value="0x7ff9f1f8ffb0" id="996" addr="0x7ff9f1f8ffb0" />
-                            <parmlist id="997" addr="0x7ff9f1f8fcb0" >
+                    <cdecl id="987" addr="0x7fdf084e6fb0" >
+                        <attributelist id="988" addr="0x7fdf084e6fb0" >
+                            <attribute name="name" value="XBMCAddon::xbmc::startServer" id="989" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="990" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_nextSibling" value="0x7fdf084e7190" id="991" addr="0x7fdf084e7190" />
+                            <attribute name="csym_nextSibling" value="0x7fdf084e7190" id="992" addr="0x7fdf084e7190" />
+                            <attribute name="kind" value="function" id="993" addr="0x7fdf085119d0" />
+                            <attribute name="sym_name" value="startServer" id="994" addr="0x7fdf085119d0" />
+                            <attribute name="decl" value="f(int,bool,bool)." id="995" addr="0x7fdf085119d0" />
+                            <attribute name="sym_overloaded" value="0x7fdf084e6fb0" id="996" addr="0x7fdf084e6fb0" />
+                            <parmlist id="997" addr="0x7fdf084e6cb0" >
                                 <parm id="998">
-                                    <attributelist id="999" addr="0x7ff9f1f8fcb0" >
-                                        <attribute name="name" value="iTyp" id="1000" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="int" id="1001" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="999" addr="0x7fdf084e6cb0" >
+                                        <attribute name="name" value="iTyp" id="1000" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="int" id="1001" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                                 <parm id="1002">
-                                    <attributelist id="1003" addr="0x7ff9f1f8fdb0" >
-                                        <attribute name="name" value="bStart" id="1004" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="bool" id="1005" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="1003" addr="0x7fdf084e6db0" >
+                                        <attribute name="name" value="bStart" id="1004" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="bool" id="1005" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                                 <parm id="1006">
-                                    <attributelist id="1007" addr="0x7ff9f1f8fef0" >
-                                        <attribute name="name" value="bWait" id="1008" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="value" value="false" id="1009" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="bool" id="1010" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="1007" addr="0x7fdf084e6ef0" >
+                                        <attribute name="name" value="bWait" id="1008" addr="0x7fdf085119d0" />
+                                        <attribute name="value" value="false" id="1009" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="bool" id="1010" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="type" value="bool" id="1011" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1012" addr="0x7ff9f1fba9d0" />
+                            <attribute name="type" value="bool" id="1011" addr="0x7fdf085119d0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1012" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="1013" addr="0x7ff9f1f90190" >
-                        <attributelist id="1014" addr="0x7ff9f1f90190" >
-                            <attribute name="name" value="XBMCAddon::xbmc::startServer" id="1015" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="1016" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_previousSibling" value="0x7ff9f1f8ffb0" id="1017" addr="0x7ff9f1f8ffb0" />
-                            <attribute name="kind" value="function" id="1018" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_name" value="startServer" id="1019" addr="0x7ff9f1fba9d0" />
-                            <attribute name="defaultargs" value="0x7ff9f1f8ffb0" id="1020" addr="0x7ff9f1f8ffb0" />
-                            <attribute name="decl" value="f(int,bool)." id="1021" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_overloaded" value="0x7ff9f1f8ffb0" id="1022" addr="0x7ff9f1f8ffb0" />
-                            <parmlist id="1023" addr="0x7ff9f1f90010" >
+                    <cdecl id="1013" addr="0x7fdf084e7190" >
+                        <attributelist id="1014" addr="0x7fdf084e7190" >
+                            <attribute name="name" value="XBMCAddon::xbmc::startServer" id="1015" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="1016" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_previousSibling" value="0x7fdf084e6fb0" id="1017" addr="0x7fdf084e6fb0" />
+                            <attribute name="kind" value="function" id="1018" addr="0x7fdf085119d0" />
+                            <attribute name="sym_name" value="startServer" id="1019" addr="0x7fdf085119d0" />
+                            <attribute name="defaultargs" value="0x7fdf084e6fb0" id="1020" addr="0x7fdf084e6fb0" />
+                            <attribute name="decl" value="f(int,bool)." id="1021" addr="0x7fdf085119d0" />
+                            <attribute name="sym_overloaded" value="0x7fdf084e6fb0" id="1022" addr="0x7fdf084e6fb0" />
+                            <parmlist id="1023" addr="0x7fdf084e7010" >
                                 <parm id="1024">
-                                    <attributelist id="1025" addr="0x7ff9f1f90010" >
-                                        <attribute name="name" value="iTyp" id="1026" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="int" id="1027" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="1025" addr="0x7fdf084e7010" >
+                                        <attribute name="name" value="iTyp" id="1026" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="int" id="1027" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                                 <parm id="1028">
-                                    <attributelist id="1029" addr="0x7ff9f1f900f0" >
-                                        <attribute name="name" value="bStart" id="1030" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="bool" id="1031" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="1029" addr="0x7fdf084e70f0" >
+                                        <attribute name="name" value="bStart" id="1030" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="bool" id="1031" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="type" value="bool" id="1032" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_overname" value="__SWIG_1" id="1033" addr="0x7ff9f1fba9d0" />
+                            <attribute name="type" value="bool" id="1032" addr="0x7fdf085119d0" />
+                            <attribute name="sym_overname" value="__SWIG_1" id="1033" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="1034" addr="0x7ff9f1f90310" >
-                        <attributelist id="1035" addr="0x7ff9f1f90310" >
-                            <attribute name="sym_name" value="audioSuspend" id="1036" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="XBMCAddon::xbmc::audioSuspend" id="1037" addr="0x7ff9f1fba9d0" />
-                            <attribute name="decl" value="f()." id="1038" addr="0x7ff9f1fba9d0" />
-                            <attribute name="kind" value="function" id="1039" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="void" id="1040" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="1041" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1042" addr="0x7ff9f1fba9d0" />
+                    <cdecl id="1034" addr="0x7fdf084e7310" >
+                        <attributelist id="1035" addr="0x7fdf084e7310" >
+                            <attribute name="sym_name" value="audioSuspend" id="1036" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="XBMCAddon::xbmc::audioSuspend" id="1037" addr="0x7fdf085119d0" />
+                            <attribute name="decl" value="f()." id="1038" addr="0x7fdf085119d0" />
+                            <attribute name="kind" value="function" id="1039" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="void" id="1040" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="1041" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1042" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="1043" addr="0x7ff9f1f90490" >
-                        <attributelist id="1044" addr="0x7ff9f1f90490" >
-                            <attribute name="sym_name" value="audioResume" id="1045" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="XBMCAddon::xbmc::audioResume" id="1046" addr="0x7ff9f1fba9d0" />
-                            <attribute name="decl" value="f()." id="1047" addr="0x7ff9f1fba9d0" />
-                            <attribute name="kind" value="function" id="1048" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="void" id="1049" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="1050" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1051" addr="0x7ff9f1fba9d0" />
+                    <cdecl id="1043" addr="0x7fdf084e7490" >
+                        <attributelist id="1044" addr="0x7fdf084e7490" >
+                            <attribute name="sym_name" value="audioResume" id="1045" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="XBMCAddon::xbmc::audioResume" id="1046" addr="0x7fdf085119d0" />
+                            <attribute name="decl" value="f()." id="1047" addr="0x7fdf085119d0" />
+                            <attribute name="kind" value="function" id="1048" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="void" id="1049" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="1050" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1051" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="1052" addr="0x7ff9f1f90630" >
-                        <attributelist id="1053" addr="0x7ff9f1f90630" >
-                            <attribute name="sym_name" value="getUserAgent" id="1054" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="XBMCAddon::xbmc::getUserAgent" id="1055" addr="0x7ff9f1fba9d0" />
-                            <attribute name="decl" value="f()." id="1056" addr="0x7ff9f1fba9d0" />
-                            <attribute name="kind" value="function" id="1057" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="XBMCAddon::String" id="1058" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="1059" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1060" addr="0x7ff9f1fba9d0" />
+                    <cdecl id="1052" addr="0x7fdf084e7630" >
+                        <attributelist id="1053" addr="0x7fdf084e7630" >
+                            <attribute name="sym_name" value="getUserAgent" id="1054" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="XBMCAddon::xbmc::getUserAgent" id="1055" addr="0x7fdf085119d0" />
+                            <attribute name="decl" value="f()." id="1056" addr="0x7fdf085119d0" />
+                            <attribute name="kind" value="function" id="1057" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="XBMCAddon::String" id="1058" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="1059" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1060" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="1061" addr="0x7ff9f1f90a30" >
-                        <attributelist id="1062" addr="0x7ff9f1f90a30" >
-                            <attribute name="sym_name" value="convertLanguage" id="1063" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="XBMCAddon::xbmc::convertLanguage" id="1064" addr="0x7ff9f1fba9d0" />
-                            <attribute name="decl" value="f(p.q(const).char,int)." id="1065" addr="0x7ff9f1fba9d0" />
-                            <parmlist id="1066" addr="0x7ff9f1f90850" >
+                    <cdecl id="1061" addr="0x7fdf084e7a30" >
+                        <attributelist id="1062" addr="0x7fdf084e7a30" >
+                            <attribute name="sym_name" value="convertLanguage" id="1063" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="XBMCAddon::xbmc::convertLanguage" id="1064" addr="0x7fdf085119d0" />
+                            <attribute name="decl" value="f(p.q(const).char,int)." id="1065" addr="0x7fdf085119d0" />
+                            <parmlist id="1066" addr="0x7fdf084e7850" >
                                 <parm id="1067">
-                                    <attributelist id="1068" addr="0x7ff9f1f90850" >
-                                        <attribute name="name" value="language" id="1069" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="p.q(const).char" id="1070" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="1068" addr="0x7fdf084e7850" >
+                                        <attribute name="name" value="language" id="1069" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="p.q(const).char" id="1070" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                                 <parm id="1071">
-                                    <attributelist id="1072" addr="0x7ff9f1f90970" >
-                                        <attribute name="name" value="format" id="1073" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="type" value="int" id="1074" addr="0x7ff9f1fba9d0" />
+                                    <attributelist id="1072" addr="0x7fdf084e7970" >
+                                        <attribute name="name" value="format" id="1073" addr="0x7fdf085119d0" />
+                                        <attribute name="type" value="int" id="1074" addr="0x7fdf085119d0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="kind" value="function" id="1075" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="XBMCAddon::String" id="1076" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="1077" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1078" addr="0x7ff9f1fba9d0" />
+                            <attribute name="kind" value="function" id="1075" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="XBMCAddon::String" id="1076" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="1077" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1078" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <constant id="1079" addr="0x7ff9f1f90c50" >
-                        <attributelist id="1080" addr="0x7ff9f1f90c50" >
-                            <attribute name="sym_name" value="SERVER_WEBSERVER" id="1081" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="SERVER_WEBSERVER" id="1082" addr="0x7ff9f1fba9d0" />
-                            <attribute name="rawval" value="getSERVER_WEBSERVER()" id="1083" addr="0x7ff9f1fba9d0" />
-                            <attribute name="feature_immutable" value="1" id="1084" addr="0x7ff9f1fba9d0" />
-                            <attribute name="value" value="getSERVER_WEBSERVER()" id="1085" addr="0x7ff9f1fba9d0" />
-                            <attribute name="storage" value="%constant" id="1086" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="int" id="1087" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="1088" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1089" addr="0x7ff9f1fba9d0" />
+                    <constant id="1079" addr="0x7fdf084e7c50" >
+                        <attributelist id="1080" addr="0x7fdf084e7c50" >
+                            <attribute name="sym_name" value="SERVER_WEBSERVER" id="1081" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="SERVER_WEBSERVER" id="1082" addr="0x7fdf085119d0" />
+                            <attribute name="rawval" value="getSERVER_WEBSERVER()" id="1083" addr="0x7fdf085119d0" />
+                            <attribute name="feature_immutable" value="1" id="1084" addr="0x7fdf085119d0" />
+                            <attribute name="value" value="getSERVER_WEBSERVER()" id="1085" addr="0x7fdf085119d0" />
+                            <attribute name="storage" value="%constant" id="1086" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="int" id="1087" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="1088" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1089" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1090" addr="0x7ff9f1f90ed0" >
-                        <attributelist id="1091" addr="0x7ff9f1f90ed0" >
-                            <attribute name="sym_name" value="SERVER_AIRPLAYSERVER" id="1092" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="SERVER_AIRPLAYSERVER" id="1093" addr="0x7ff9f1fba9d0" />
-                            <attribute name="rawval" value="getSERVER_AIRPLAYSERVER()" id="1094" addr="0x7ff9f1fba9d0" />
-                            <attribute name="feature_immutable" value="1" id="1095" addr="0x7ff9f1fba9d0" />
-                            <attribute name="value" value="getSERVER_AIRPLAYSERVER()" id="1096" addr="0x7ff9f1fba9d0" />
-                            <attribute name="storage" value="%constant" id="1097" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="int" id="1098" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="1099" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1100" addr="0x7ff9f1fba9d0" />
+                    <constant id="1090" addr="0x7fdf084e7ed0" >
+                        <attributelist id="1091" addr="0x7fdf084e7ed0" >
+                            <attribute name="sym_name" value="SERVER_AIRPLAYSERVER" id="1092" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="SERVER_AIRPLAYSERVER" id="1093" addr="0x7fdf085119d0" />
+                            <attribute name="rawval" value="getSERVER_AIRPLAYSERVER()" id="1094" addr="0x7fdf085119d0" />
+                            <attribute name="feature_immutable" value="1" id="1095" addr="0x7fdf085119d0" />
+                            <attribute name="value" value="getSERVER_AIRPLAYSERVER()" id="1096" addr="0x7fdf085119d0" />
+                            <attribute name="storage" value="%constant" id="1097" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="int" id="1098" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="1099" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1100" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1101" addr="0x7ff9f1f91110" >
-                        <attributelist id="1102" addr="0x7ff9f1f91110" >
-                            <attribute name="sym_name" value="SERVER_UPNPSERVER" id="1103" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="SERVER_UPNPSERVER" id="1104" addr="0x7ff9f1fba9d0" />
-                            <attribute name="rawval" value="getSERVER_UPNPSERVER()" id="1105" addr="0x7ff9f1fba9d0" />
-                            <attribute name="feature_immutable" value="1" id="1106" addr="0x7ff9f1fba9d0" />
-                            <attribute name="value" value="getSERVER_UPNPSERVER()" id="1107" addr="0x7ff9f1fba9d0" />
-                            <attribute name="storage" value="%constant" id="1108" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="int" id="1109" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="1110" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1111" addr="0x7ff9f1fba9d0" />
+                    <constant id="1101" addr="0x7fdf084e8110" >
+                        <attributelist id="1102" addr="0x7fdf084e8110" >
+                            <attribute name="sym_name" value="SERVER_UPNPSERVER" id="1103" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="SERVER_UPNPSERVER" id="1104" addr="0x7fdf085119d0" />
+                            <attribute name="rawval" value="getSERVER_UPNPSERVER()" id="1105" addr="0x7fdf085119d0" />
+                            <attribute name="feature_immutable" value="1" id="1106" addr="0x7fdf085119d0" />
+                            <attribute name="value" value="getSERVER_UPNPSERVER()" id="1107" addr="0x7fdf085119d0" />
+                            <attribute name="storage" value="%constant" id="1108" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="int" id="1109" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="1110" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1111" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1112" addr="0x7ff9f1f91350" >
-                        <attributelist id="1113" addr="0x7ff9f1f91350" >
-                            <attribute name="sym_name" value="SERVER_UPNPRENDERER" id="1114" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="SERVER_UPNPRENDERER" id="1115" addr="0x7ff9f1fba9d0" />
-                            <attribute name="rawval" value="getSERVER_UPNPRENDERER()" id="1116" addr="0x7ff9f1fba9d0" />
-                            <attribute name="feature_immutable" value="1" id="1117" addr="0x7ff9f1fba9d0" />
-                            <attribute name="value" value="getSERVER_UPNPRENDERER()" id="1118" addr="0x7ff9f1fba9d0" />
-                            <attribute name="storage" value="%constant" id="1119" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="int" id="1120" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="1121" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1122" addr="0x7ff9f1fba9d0" />
+                    <constant id="1112" addr="0x7fdf084e8350" >
+                        <attributelist id="1113" addr="0x7fdf084e8350" >
+                            <attribute name="sym_name" value="SERVER_UPNPRENDERER" id="1114" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="SERVER_UPNPRENDERER" id="1115" addr="0x7fdf085119d0" />
+                            <attribute name="rawval" value="getSERVER_UPNPRENDERER()" id="1116" addr="0x7fdf085119d0" />
+                            <attribute name="feature_immutable" value="1" id="1117" addr="0x7fdf085119d0" />
+                            <attribute name="value" value="getSERVER_UPNPRENDERER()" id="1118" addr="0x7fdf085119d0" />
+                            <attribute name="storage" value="%constant" id="1119" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="int" id="1120" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="1121" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1122" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1123" addr="0x7ff9f1f91590" >
-                        <attributelist id="1124" addr="0x7ff9f1f91590" >
-                            <attribute name="sym_name" value="SERVER_EVENTSERVER" id="1125" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="SERVER_EVENTSERVER" id="1126" addr="0x7ff9f1fba9d0" />
-                            <attribute name="rawval" value="getSERVER_EVENTSERVER()" id="1127" addr="0x7ff9f1fba9d0" />
-                            <attribute name="feature_immutable" value="1" id="1128" addr="0x7ff9f1fba9d0" />
-                            <attribute name="value" value="getSERVER_EVENTSERVER()" id="1129" addr="0x7ff9f1fba9d0" />
-                            <attribute name="storage" value="%constant" id="1130" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="int" id="1131" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="1132" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1133" addr="0x7ff9f1fba9d0" />
+                    <constant id="1123" addr="0x7fdf084e8590" >
+                        <attributelist id="1124" addr="0x7fdf084e8590" >
+                            <attribute name="sym_name" value="SERVER_EVENTSERVER" id="1125" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="SERVER_EVENTSERVER" id="1126" addr="0x7fdf085119d0" />
+                            <attribute name="rawval" value="getSERVER_EVENTSERVER()" id="1127" addr="0x7fdf085119d0" />
+                            <attribute name="feature_immutable" value="1" id="1128" addr="0x7fdf085119d0" />
+                            <attribute name="value" value="getSERVER_EVENTSERVER()" id="1129" addr="0x7fdf085119d0" />
+                            <attribute name="storage" value="%constant" id="1130" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="int" id="1131" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="1132" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1133" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1134" addr="0x7ff9f1f917d0" >
-                        <attributelist id="1135" addr="0x7ff9f1f917d0" >
-                            <attribute name="sym_name" value="SERVER_JSONRPCSERVER" id="1136" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="SERVER_JSONRPCSERVER" id="1137" addr="0x7ff9f1fba9d0" />
-                            <attribute name="rawval" value="getSERVER_JSONRPCSERVER()" id="1138" addr="0x7ff9f1fba9d0" />
-                            <attribute name="feature_immutable" value="1" id="1139" addr="0x7ff9f1fba9d0" />
-                            <attribute name="value" value="getSERVER_JSONRPCSERVER()" id="1140" addr="0x7ff9f1fba9d0" />
-                            <attribute name="storage" value="%constant" id="1141" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="int" id="1142" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="1143" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1144" addr="0x7ff9f1fba9d0" />
+                    <constant id="1134" addr="0x7fdf084e87d0" >
+                        <attributelist id="1135" addr="0x7fdf084e87d0" >
+                            <attribute name="sym_name" value="SERVER_JSONRPCSERVER" id="1136" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="SERVER_JSONRPCSERVER" id="1137" addr="0x7fdf085119d0" />
+                            <attribute name="rawval" value="getSERVER_JSONRPCSERVER()" id="1138" addr="0x7fdf085119d0" />
+                            <attribute name="feature_immutable" value="1" id="1139" addr="0x7fdf085119d0" />
+                            <attribute name="value" value="getSERVER_JSONRPCSERVER()" id="1140" addr="0x7fdf085119d0" />
+                            <attribute name="storage" value="%constant" id="1141" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="int" id="1142" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="1143" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1144" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1145" addr="0x7ff9f1f91a10" >
-                        <attributelist id="1146" addr="0x7ff9f1f91a10" >
-                            <attribute name="sym_name" value="SERVER_ZEROCONF" id="1147" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="SERVER_ZEROCONF" id="1148" addr="0x7ff9f1fba9d0" />
-                            <attribute name="rawval" value="getSERVER_ZEROCONF()" id="1149" addr="0x7ff9f1fba9d0" />
-                            <attribute name="feature_immutable" value="1" id="1150" addr="0x7ff9f1fba9d0" />
-                            <attribute name="value" value="getSERVER_ZEROCONF()" id="1151" addr="0x7ff9f1fba9d0" />
-                            <attribute name="storage" value="%constant" id="1152" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="int" id="1153" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="1154" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1155" addr="0x7ff9f1fba9d0" />
+                    <constant id="1145" addr="0x7fdf084e8a10" >
+                        <attributelist id="1146" addr="0x7fdf084e8a10" >
+                            <attribute name="sym_name" value="SERVER_ZEROCONF" id="1147" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="SERVER_ZEROCONF" id="1148" addr="0x7fdf085119d0" />
+                            <attribute name="rawval" value="getSERVER_ZEROCONF()" id="1149" addr="0x7fdf085119d0" />
+                            <attribute name="feature_immutable" value="1" id="1150" addr="0x7fdf085119d0" />
+                            <attribute name="value" value="getSERVER_ZEROCONF()" id="1151" addr="0x7fdf085119d0" />
+                            <attribute name="storage" value="%constant" id="1152" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="int" id="1153" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="1154" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1155" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1156" addr="0x7ff9f1f91c50" >
-                        <attributelist id="1157" addr="0x7ff9f1f91c50" >
-                            <attribute name="sym_name" value="PLAYLIST_MUSIC" id="1158" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="PLAYLIST_MUSIC" id="1159" addr="0x7ff9f1fba9d0" />
-                            <attribute name="rawval" value="getPLAYLIST_MUSIC()" id="1160" addr="0x7ff9f1fba9d0" />
-                            <attribute name="feature_immutable" value="1" id="1161" addr="0x7ff9f1fba9d0" />
-                            <attribute name="value" value="getPLAYLIST_MUSIC()" id="1162" addr="0x7ff9f1fba9d0" />
-                            <attribute name="storage" value="%constant" id="1163" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="int" id="1164" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="1165" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1166" addr="0x7ff9f1fba9d0" />
+                    <constant id="1156" addr="0x7fdf084e8c50" >
+                        <attributelist id="1157" addr="0x7fdf084e8c50" >
+                            <attribute name="sym_name" value="PLAYLIST_MUSIC" id="1158" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="PLAYLIST_MUSIC" id="1159" addr="0x7fdf085119d0" />
+                            <attribute name="rawval" value="getPLAYLIST_MUSIC()" id="1160" addr="0x7fdf085119d0" />
+                            <attribute name="feature_immutable" value="1" id="1161" addr="0x7fdf085119d0" />
+                            <attribute name="value" value="getPLAYLIST_MUSIC()" id="1162" addr="0x7fdf085119d0" />
+                            <attribute name="storage" value="%constant" id="1163" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="int" id="1164" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="1165" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1166" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1167" addr="0x7ff9f1f91e90" >
-                        <attributelist id="1168" addr="0x7ff9f1f91e90" >
-                            <attribute name="sym_name" value="PLAYLIST_VIDEO" id="1169" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="PLAYLIST_VIDEO" id="1170" addr="0x7ff9f1fba9d0" />
-                            <attribute name="rawval" value="getPLAYLIST_VIDEO()" id="1171" addr="0x7ff9f1fba9d0" />
-                            <attribute name="feature_immutable" value="1" id="1172" addr="0x7ff9f1fba9d0" />
-                            <attribute name="value" value="getPLAYLIST_VIDEO()" id="1173" addr="0x7ff9f1fba9d0" />
-                            <attribute name="storage" value="%constant" id="1174" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="int" id="1175" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="1176" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1177" addr="0x7ff9f1fba9d0" />
+                    <constant id="1167" addr="0x7fdf084e8e90" >
+                        <attributelist id="1168" addr="0x7fdf084e8e90" >
+                            <attribute name="sym_name" value="PLAYLIST_VIDEO" id="1169" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="PLAYLIST_VIDEO" id="1170" addr="0x7fdf085119d0" />
+                            <attribute name="rawval" value="getPLAYLIST_VIDEO()" id="1171" addr="0x7fdf085119d0" />
+                            <attribute name="feature_immutable" value="1" id="1172" addr="0x7fdf085119d0" />
+                            <attribute name="value" value="getPLAYLIST_VIDEO()" id="1173" addr="0x7fdf085119d0" />
+                            <attribute name="storage" value="%constant" id="1174" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="int" id="1175" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="1176" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1177" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1178" addr="0x7ff9f1f920d0" >
-                        <attributelist id="1179" addr="0x7ff9f1f920d0" >
-                            <attribute name="sym_name" value="TRAY_OPEN" id="1180" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="TRAY_OPEN" id="1181" addr="0x7ff9f1fba9d0" />
-                            <attribute name="rawval" value="getTRAY_OPEN()" id="1182" addr="0x7ff9f1fba9d0" />
-                            <attribute name="feature_immutable" value="1" id="1183" addr="0x7ff9f1fba9d0" />
-                            <attribute name="value" value="getTRAY_OPEN()" id="1184" addr="0x7ff9f1fba9d0" />
-                            <attribute name="storage" value="%constant" id="1185" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="int" id="1186" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="1187" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1188" addr="0x7ff9f1fba9d0" />
+                    <constant id="1178" addr="0x7fdf084e90d0" >
+                        <attributelist id="1179" addr="0x7fdf084e90d0" >
+                            <attribute name="sym_name" value="TRAY_OPEN" id="1180" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="TRAY_OPEN" id="1181" addr="0x7fdf085119d0" />
+                            <attribute name="rawval" value="getTRAY_OPEN()" id="1182" addr="0x7fdf085119d0" />
+                            <attribute name="feature_immutable" value="1" id="1183" addr="0x7fdf085119d0" />
+                            <attribute name="value" value="getTRAY_OPEN()" id="1184" addr="0x7fdf085119d0" />
+                            <attribute name="storage" value="%constant" id="1185" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="int" id="1186" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="1187" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1188" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1189" addr="0x7ff9f1f92310" >
-                        <attributelist id="1190" addr="0x7ff9f1f92310" >
-                            <attribute name="sym_name" value="DRIVE_NOT_READY" id="1191" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="DRIVE_NOT_READY" id="1192" addr="0x7ff9f1fba9d0" />
-                            <attribute name="rawval" value="getDRIVE_NOT_READY()" id="1193" addr="0x7ff9f1fba9d0" />
-                            <attribute name="feature_immutable" value="1" id="1194" addr="0x7ff9f1fba9d0" />
-                            <attribute name="value" value="getDRIVE_NOT_READY()" id="1195" addr="0x7ff9f1fba9d0" />
-                            <attribute name="storage" value="%constant" id="1196" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="int" id="1197" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="1198" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1199" addr="0x7ff9f1fba9d0" />
+                    <constant id="1189" addr="0x7fdf084e9310" >
+                        <attributelist id="1190" addr="0x7fdf084e9310" >
+                            <attribute name="sym_name" value="DRIVE_NOT_READY" id="1191" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="DRIVE_NOT_READY" id="1192" addr="0x7fdf085119d0" />
+                            <attribute name="rawval" value="getDRIVE_NOT_READY()" id="1193" addr="0x7fdf085119d0" />
+                            <attribute name="feature_immutable" value="1" id="1194" addr="0x7fdf085119d0" />
+                            <attribute name="value" value="getDRIVE_NOT_READY()" id="1195" addr="0x7fdf085119d0" />
+                            <attribute name="storage" value="%constant" id="1196" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="int" id="1197" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="1198" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1199" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1200" addr="0x7ff9f1f92550" >
-                        <attributelist id="1201" addr="0x7ff9f1f92550" >
-                            <attribute name="sym_name" value="TRAY_CLOSED_NO_MEDIA" id="1202" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="TRAY_CLOSED_NO_MEDIA" id="1203" addr="0x7ff9f1fba9d0" />
-                            <attribute name="rawval" value="getTRAY_CLOSED_NO_MEDIA()" id="1204" addr="0x7ff9f1fba9d0" />
-                            <attribute name="feature_immutable" value="1" id="1205" addr="0x7ff9f1fba9d0" />
-                            <attribute name="value" value="getTRAY_CLOSED_NO_MEDIA()" id="1206" addr="0x7ff9f1fba9d0" />
-                            <attribute name="storage" value="%constant" id="1207" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="int" id="1208" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="1209" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1210" addr="0x7ff9f1fba9d0" />
+                    <constant id="1200" addr="0x7fdf084e9550" >
+                        <attributelist id="1201" addr="0x7fdf084e9550" >
+                            <attribute name="sym_name" value="TRAY_CLOSED_NO_MEDIA" id="1202" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="TRAY_CLOSED_NO_MEDIA" id="1203" addr="0x7fdf085119d0" />
+                            <attribute name="rawval" value="getTRAY_CLOSED_NO_MEDIA()" id="1204" addr="0x7fdf085119d0" />
+                            <attribute name="feature_immutable" value="1" id="1205" addr="0x7fdf085119d0" />
+                            <attribute name="value" value="getTRAY_CLOSED_NO_MEDIA()" id="1206" addr="0x7fdf085119d0" />
+                            <attribute name="storage" value="%constant" id="1207" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="int" id="1208" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="1209" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1210" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1211" addr="0x7ff9f1f92790" >
-                        <attributelist id="1212" addr="0x7ff9f1f92790" >
-                            <attribute name="sym_name" value="TRAY_CLOSED_MEDIA_PRESENT" id="1213" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="TRAY_CLOSED_MEDIA_PRESENT" id="1214" addr="0x7ff9f1fba9d0" />
-                            <attribute name="rawval" value="getTRAY_CLOSED_MEDIA_PRESENT()" id="1215" addr="0x7ff9f1fba9d0" />
-                            <attribute name="feature_immutable" value="1" id="1216" addr="0x7ff9f1fba9d0" />
-                            <attribute name="value" value="getTRAY_CLOSED_MEDIA_PRESENT()" id="1217" addr="0x7ff9f1fba9d0" />
-                            <attribute name="storage" value="%constant" id="1218" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="int" id="1219" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="1220" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1221" addr="0x7ff9f1fba9d0" />
+                    <constant id="1211" addr="0x7fdf084e9790" >
+                        <attributelist id="1212" addr="0x7fdf084e9790" >
+                            <attribute name="sym_name" value="TRAY_CLOSED_MEDIA_PRESENT" id="1213" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="TRAY_CLOSED_MEDIA_PRESENT" id="1214" addr="0x7fdf085119d0" />
+                            <attribute name="rawval" value="getTRAY_CLOSED_MEDIA_PRESENT()" id="1215" addr="0x7fdf085119d0" />
+                            <attribute name="feature_immutable" value="1" id="1216" addr="0x7fdf085119d0" />
+                            <attribute name="value" value="getTRAY_CLOSED_MEDIA_PRESENT()" id="1217" addr="0x7fdf085119d0" />
+                            <attribute name="storage" value="%constant" id="1218" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="int" id="1219" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="1220" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1221" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1222" addr="0x7ff9f1f929d0" >
-                        <attributelist id="1223" addr="0x7ff9f1f929d0" >
-                            <attribute name="sym_name" value="LOGDEBUG" id="1224" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="LOGDEBUG" id="1225" addr="0x7ff9f1fba9d0" />
-                            <attribute name="rawval" value="getLOGDEBUG()" id="1226" addr="0x7ff9f1fba9d0" />
-                            <attribute name="feature_immutable" value="1" id="1227" addr="0x7ff9f1fba9d0" />
-                            <attribute name="value" value="getLOGDEBUG()" id="1228" addr="0x7ff9f1fba9d0" />
-                            <attribute name="storage" value="%constant" id="1229" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="int" id="1230" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="1231" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1232" addr="0x7ff9f1fba9d0" />
+                    <constant id="1222" addr="0x7fdf084e99d0" >
+                        <attributelist id="1223" addr="0x7fdf084e99d0" >
+                            <attribute name="sym_name" value="LOGDEBUG" id="1224" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="LOGDEBUG" id="1225" addr="0x7fdf085119d0" />
+                            <attribute name="rawval" value="getLOGDEBUG()" id="1226" addr="0x7fdf085119d0" />
+                            <attribute name="feature_immutable" value="1" id="1227" addr="0x7fdf085119d0" />
+                            <attribute name="value" value="getLOGDEBUG()" id="1228" addr="0x7fdf085119d0" />
+                            <attribute name="storage" value="%constant" id="1229" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="int" id="1230" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="1231" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1232" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1233" addr="0x7ff9f1f92c10" >
-                        <attributelist id="1234" addr="0x7ff9f1f92c10" >
-                            <attribute name="sym_name" value="LOGINFO" id="1235" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="LOGINFO" id="1236" addr="0x7ff9f1fba9d0" />
-                            <attribute name="rawval" value="getLOGINFO()" id="1237" addr="0x7ff9f1fba9d0" />
-                            <attribute name="feature_immutable" value="1" id="1238" addr="0x7ff9f1fba9d0" />
-                            <attribute name="value" value="getLOGINFO()" id="1239" addr="0x7ff9f1fba9d0" />
-                            <attribute name="storage" value="%constant" id="1240" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="int" id="1241" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="1242" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1243" addr="0x7ff9f1fba9d0" />
+                    <constant id="1233" addr="0x7fdf084e9c10" >
+                        <attributelist id="1234" addr="0x7fdf084e9c10" >
+                            <attribute name="sym_name" value="LOGINFO" id="1235" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="LOGINFO" id="1236" addr="0x7fdf085119d0" />
+                            <attribute name="rawval" value="getLOGINFO()" id="1237" addr="0x7fdf085119d0" />
+                            <attribute name="feature_immutable" value="1" id="1238" addr="0x7fdf085119d0" />
+                            <attribute name="value" value="getLOGINFO()" id="1239" addr="0x7fdf085119d0" />
+                            <attribute name="storage" value="%constant" id="1240" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="int" id="1241" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="1242" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1243" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1244" addr="0x7ff9f1f92e50" >
-                        <attributelist id="1245" addr="0x7ff9f1f92e50" >
-                            <attribute name="sym_name" value="LOGNOTICE" id="1246" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="LOGNOTICE" id="1247" addr="0x7ff9f1fba9d0" />
-                            <attribute name="rawval" value="getLOGNOTICE()" id="1248" addr="0x7ff9f1fba9d0" />
-                            <attribute name="feature_immutable" value="1" id="1249" addr="0x7ff9f1fba9d0" />
-                            <attribute name="value" value="getLOGNOTICE()" id="1250" addr="0x7ff9f1fba9d0" />
-                            <attribute name="storage" value="%constant" id="1251" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="int" id="1252" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="1253" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1254" addr="0x7ff9f1fba9d0" />
+                    <constant id="1244" addr="0x7fdf084e9e50" >
+                        <attributelist id="1245" addr="0x7fdf084e9e50" >
+                            <attribute name="sym_name" value="LOGNOTICE" id="1246" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="LOGNOTICE" id="1247" addr="0x7fdf085119d0" />
+                            <attribute name="rawval" value="getLOGNOTICE()" id="1248" addr="0x7fdf085119d0" />
+                            <attribute name="feature_immutable" value="1" id="1249" addr="0x7fdf085119d0" />
+                            <attribute name="value" value="getLOGNOTICE()" id="1250" addr="0x7fdf085119d0" />
+                            <attribute name="storage" value="%constant" id="1251" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="int" id="1252" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="1253" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1254" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1255" addr="0x7ff9f1f93090" >
-                        <attributelist id="1256" addr="0x7ff9f1f93090" >
-                            <attribute name="sym_name" value="LOGWARNING" id="1257" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="LOGWARNING" id="1258" addr="0x7ff9f1fba9d0" />
-                            <attribute name="rawval" value="getLOGWARNING()" id="1259" addr="0x7ff9f1fba9d0" />
-                            <attribute name="feature_immutable" value="1" id="1260" addr="0x7ff9f1fba9d0" />
-                            <attribute name="value" value="getLOGWARNING()" id="1261" addr="0x7ff9f1fba9d0" />
-                            <attribute name="storage" value="%constant" id="1262" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="int" id="1263" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="1264" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1265" addr="0x7ff9f1fba9d0" />
+                    <constant id="1255" addr="0x7fdf084ea090" >
+                        <attributelist id="1256" addr="0x7fdf084ea090" >
+                            <attribute name="sym_name" value="LOGWARNING" id="1257" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="LOGWARNING" id="1258" addr="0x7fdf085119d0" />
+                            <attribute name="rawval" value="getLOGWARNING()" id="1259" addr="0x7fdf085119d0" />
+                            <attribute name="feature_immutable" value="1" id="1260" addr="0x7fdf085119d0" />
+                            <attribute name="value" value="getLOGWARNING()" id="1261" addr="0x7fdf085119d0" />
+                            <attribute name="storage" value="%constant" id="1262" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="int" id="1263" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="1264" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1265" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1266" addr="0x7ff9f1f932d0" >
-                        <attributelist id="1267" addr="0x7ff9f1f932d0" >
-                            <attribute name="sym_name" value="LOGERROR" id="1268" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="LOGERROR" id="1269" addr="0x7ff9f1fba9d0" />
-                            <attribute name="rawval" value="getLOGERROR()" id="1270" addr="0x7ff9f1fba9d0" />
-                            <attribute name="feature_immutable" value="1" id="1271" addr="0x7ff9f1fba9d0" />
-                            <attribute name="value" value="getLOGERROR()" id="1272" addr="0x7ff9f1fba9d0" />
-                            <attribute name="storage" value="%constant" id="1273" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="int" id="1274" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="1275" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1276" addr="0x7ff9f1fba9d0" />
+                    <constant id="1266" addr="0x7fdf084ea2d0" >
+                        <attributelist id="1267" addr="0x7fdf084ea2d0" >
+                            <attribute name="sym_name" value="LOGERROR" id="1268" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="LOGERROR" id="1269" addr="0x7fdf085119d0" />
+                            <attribute name="rawval" value="getLOGERROR()" id="1270" addr="0x7fdf085119d0" />
+                            <attribute name="feature_immutable" value="1" id="1271" addr="0x7fdf085119d0" />
+                            <attribute name="value" value="getLOGERROR()" id="1272" addr="0x7fdf085119d0" />
+                            <attribute name="storage" value="%constant" id="1273" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="int" id="1274" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="1275" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1276" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1277" addr="0x7ff9f1f93510" >
-                        <attributelist id="1278" addr="0x7ff9f1f93510" >
-                            <attribute name="sym_name" value="LOGSEVERE" id="1279" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="LOGSEVERE" id="1280" addr="0x7ff9f1fba9d0" />
-                            <attribute name="rawval" value="getLOGSEVERE()" id="1281" addr="0x7ff9f1fba9d0" />
-                            <attribute name="feature_immutable" value="1" id="1282" addr="0x7ff9f1fba9d0" />
-                            <attribute name="value" value="getLOGSEVERE()" id="1283" addr="0x7ff9f1fba9d0" />
-                            <attribute name="storage" value="%constant" id="1284" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="int" id="1285" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="1286" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1287" addr="0x7ff9f1fba9d0" />
+                    <constant id="1277" addr="0x7fdf084ea510" >
+                        <attributelist id="1278" addr="0x7fdf084ea510" >
+                            <attribute name="sym_name" value="LOGSEVERE" id="1279" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="LOGSEVERE" id="1280" addr="0x7fdf085119d0" />
+                            <attribute name="rawval" value="getLOGSEVERE()" id="1281" addr="0x7fdf085119d0" />
+                            <attribute name="feature_immutable" value="1" id="1282" addr="0x7fdf085119d0" />
+                            <attribute name="value" value="getLOGSEVERE()" id="1283" addr="0x7fdf085119d0" />
+                            <attribute name="storage" value="%constant" id="1284" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="int" id="1285" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="1286" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1287" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1288" addr="0x7ff9f1f93750" >
-                        <attributelist id="1289" addr="0x7ff9f1f93750" >
-                            <attribute name="sym_name" value="LOGFATAL" id="1290" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="LOGFATAL" id="1291" addr="0x7ff9f1fba9d0" />
-                            <attribute name="rawval" value="getLOGFATAL()" id="1292" addr="0x7ff9f1fba9d0" />
-                            <attribute name="feature_immutable" value="1" id="1293" addr="0x7ff9f1fba9d0" />
-                            <attribute name="value" value="getLOGFATAL()" id="1294" addr="0x7ff9f1fba9d0" />
-                            <attribute name="storage" value="%constant" id="1295" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="int" id="1296" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="1297" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1298" addr="0x7ff9f1fba9d0" />
+                    <constant id="1288" addr="0x7fdf084ea750" >
+                        <attributelist id="1289" addr="0x7fdf084ea750" >
+                            <attribute name="sym_name" value="LOGFATAL" id="1290" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="LOGFATAL" id="1291" addr="0x7fdf085119d0" />
+                            <attribute name="rawval" value="getLOGFATAL()" id="1292" addr="0x7fdf085119d0" />
+                            <attribute name="feature_immutable" value="1" id="1293" addr="0x7fdf085119d0" />
+                            <attribute name="value" value="getLOGFATAL()" id="1294" addr="0x7fdf085119d0" />
+                            <attribute name="storage" value="%constant" id="1295" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="int" id="1296" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="1297" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1298" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1299" addr="0x7ff9f1f93990" >
-                        <attributelist id="1300" addr="0x7ff9f1f93990" >
-                            <attribute name="sym_name" value="LOGNONE" id="1301" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="LOGNONE" id="1302" addr="0x7ff9f1fba9d0" />
-                            <attribute name="rawval" value="getLOGNONE()" id="1303" addr="0x7ff9f1fba9d0" />
-                            <attribute name="feature_immutable" value="1" id="1304" addr="0x7ff9f1fba9d0" />
-                            <attribute name="value" value="getLOGNONE()" id="1305" addr="0x7ff9f1fba9d0" />
-                            <attribute name="storage" value="%constant" id="1306" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="int" id="1307" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="1308" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1309" addr="0x7ff9f1fba9d0" />
+                    <constant id="1299" addr="0x7fdf084ea990" >
+                        <attributelist id="1300" addr="0x7fdf084ea990" >
+                            <attribute name="sym_name" value="LOGNONE" id="1301" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="LOGNONE" id="1302" addr="0x7fdf085119d0" />
+                            <attribute name="rawval" value="getLOGNONE()" id="1303" addr="0x7fdf085119d0" />
+                            <attribute name="feature_immutable" value="1" id="1304" addr="0x7fdf085119d0" />
+                            <attribute name="value" value="getLOGNONE()" id="1305" addr="0x7fdf085119d0" />
+                            <attribute name="storage" value="%constant" id="1306" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="int" id="1307" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="1308" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1309" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1310" addr="0x7ff9f1f93bd0" >
-                        <attributelist id="1311" addr="0x7ff9f1f93bd0" >
-                            <attribute name="sym_name" value="ISO_639_1" id="1312" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="ISO_639_1" id="1313" addr="0x7ff9f1fba9d0" />
-                            <attribute name="rawval" value="getISO_639_1()" id="1314" addr="0x7ff9f1fba9d0" />
-                            <attribute name="feature_immutable" value="1" id="1315" addr="0x7ff9f1fba9d0" />
-                            <attribute name="value" value="getISO_639_1()" id="1316" addr="0x7ff9f1fba9d0" />
-                            <attribute name="storage" value="%constant" id="1317" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="int" id="1318" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="1319" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1320" addr="0x7ff9f1fba9d0" />
+                    <constant id="1310" addr="0x7fdf084eabd0" >
+                        <attributelist id="1311" addr="0x7fdf084eabd0" >
+                            <attribute name="sym_name" value="ISO_639_1" id="1312" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="ISO_639_1" id="1313" addr="0x7fdf085119d0" />
+                            <attribute name="rawval" value="getISO_639_1()" id="1314" addr="0x7fdf085119d0" />
+                            <attribute name="feature_immutable" value="1" id="1315" addr="0x7fdf085119d0" />
+                            <attribute name="value" value="getISO_639_1()" id="1316" addr="0x7fdf085119d0" />
+                            <attribute name="storage" value="%constant" id="1317" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="int" id="1318" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="1319" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1320" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1321" addr="0x7ff9f1f93e10" >
-                        <attributelist id="1322" addr="0x7ff9f1f93e10" >
-                            <attribute name="sym_name" value="ISO_639_2" id="1323" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="ISO_639_2" id="1324" addr="0x7ff9f1fba9d0" />
-                            <attribute name="rawval" value="getISO_639_2()" id="1325" addr="0x7ff9f1fba9d0" />
-                            <attribute name="feature_immutable" value="1" id="1326" addr="0x7ff9f1fba9d0" />
-                            <attribute name="value" value="getISO_639_2()" id="1327" addr="0x7ff9f1fba9d0" />
-                            <attribute name="storage" value="%constant" id="1328" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="int" id="1329" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="1330" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1331" addr="0x7ff9f1fba9d0" />
+                    <constant id="1321" addr="0x7fdf084eae10" >
+                        <attributelist id="1322" addr="0x7fdf084eae10" >
+                            <attribute name="sym_name" value="ISO_639_2" id="1323" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="ISO_639_2" id="1324" addr="0x7fdf085119d0" />
+                            <attribute name="rawval" value="getISO_639_2()" id="1325" addr="0x7fdf085119d0" />
+                            <attribute name="feature_immutable" value="1" id="1326" addr="0x7fdf085119d0" />
+                            <attribute name="value" value="getISO_639_2()" id="1327" addr="0x7fdf085119d0" />
+                            <attribute name="storage" value="%constant" id="1328" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="int" id="1329" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="1330" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1331" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1332" addr="0x7ff9f1f94050" >
-                        <attributelist id="1333" addr="0x7ff9f1f94050" >
-                            <attribute name="sym_name" value="ENGLISH_NAME" id="1334" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="ENGLISH_NAME" id="1335" addr="0x7ff9f1fba9d0" />
-                            <attribute name="rawval" value="getENGLISH_NAME()" id="1336" addr="0x7ff9f1fba9d0" />
-                            <attribute name="feature_immutable" value="1" id="1337" addr="0x7ff9f1fba9d0" />
-                            <attribute name="value" value="getENGLISH_NAME()" id="1338" addr="0x7ff9f1fba9d0" />
-                            <attribute name="storage" value="%constant" id="1339" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="int" id="1340" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="1341" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1342" addr="0x7ff9f1fba9d0" />
+                    <constant id="1332" addr="0x7fdf084eb050" >
+                        <attributelist id="1333" addr="0x7fdf084eb050" >
+                            <attribute name="sym_name" value="ENGLISH_NAME" id="1334" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="ENGLISH_NAME" id="1335" addr="0x7fdf085119d0" />
+                            <attribute name="rawval" value="getENGLISH_NAME()" id="1336" addr="0x7fdf085119d0" />
+                            <attribute name="feature_immutable" value="1" id="1337" addr="0x7fdf085119d0" />
+                            <attribute name="value" value="getENGLISH_NAME()" id="1338" addr="0x7fdf085119d0" />
+                            <attribute name="storage" value="%constant" id="1339" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="int" id="1340" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="1341" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1342" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </constant >
                 </namespace >
             </namespace >
         </include >
-        <include id="1343" addr="0x7ff9f1f94910" >
-            <attributelist id="1344" addr="0x7ff9f1f94910" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/Player.h" id="1345" addr="0x7ff9f1fba9d0" />
+        <include id="1343" addr="0x7fdf084eb910" >
+            <attributelist id="1344" addr="0x7fdf084eb910" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/Player.h" id="1345" addr="0x7fdf085119d0" />
             </attributelist >
 
-            <namespace id="1346" addr="0x7ff9f1f949b0" >
-                <attributelist id="1347" addr="0x7ff9f1f949b0" >
-                    <attribute name="sym_name" value="XBMCAddon" id="1348" addr="0x7ff9f1fba9d0" />
-                    <attribute name="name" value="XBMCAddon" id="1349" addr="0x7ff9f1fba9d0" />
-                    <attribute name="sym_previousSibling" value="0x7ff9f1f8a210" id="1350" addr="0x7ff9f1f8a210" />
-                    <attribute name="csym_nextSibling" value="0x7ff9f1f9e2d0" id="1351" addr="0x7ff9f1f9e2d0" />
-                    <attribute name="sym_nextSibling" value="0x7ff9f1f9e2d0" id="1352" addr="0x7ff9f1f9e2d0" />
-                    <typescope id="1353" addr="0x7ff9f1fb4990" >
-                        <attributelist id="1354" addr="0x7ff9f1fb4990" >
-                            <attribute name="name" value="XBMCAddon" id="1355" addr="0x7ff9f1fba9d0" />
-                            <typetab id="1356" addr="0x7ff9f1fb49d0" >
-                                <attributelist id="1357" addr="0x7ff9f1fb49d0" >
-                                    <attribute name="String" value="std::string" id="1358" addr="0x7ff9f1fba9d0" />
+            <namespace id="1346" addr="0x7fdf084eb9b0" >
+                <attributelist id="1347" addr="0x7fdf084eb9b0" >
+                    <attribute name="sym_name" value="XBMCAddon" id="1348" addr="0x7fdf085119d0" />
+                    <attribute name="name" value="XBMCAddon" id="1349" addr="0x7fdf085119d0" />
+                    <attribute name="sym_previousSibling" value="0x7fdf084e1210" id="1350" addr="0x7fdf084e1210" />
+                    <attribute name="csym_nextSibling" value="0x7fdf084f52d0" id="1351" addr="0x7fdf084f52d0" />
+                    <attribute name="sym_nextSibling" value="0x7fdf084f52d0" id="1352" addr="0x7fdf084f52d0" />
+                    <typescope id="1353" addr="0x7fdf0850b990" >
+                        <attributelist id="1354" addr="0x7fdf0850b990" >
+                            <attribute name="name" value="XBMCAddon" id="1355" addr="0x7fdf085119d0" />
+                            <typetab id="1356" addr="0x7fdf0850b9d0" >
+                                <attributelist id="1357" addr="0x7fdf0850b9d0" >
+                                    <attribute name="String" value="std::string" id="1358" addr="0x7fdf085119d0" />
                                 </attributelist >
-                                <typetabsitem id="1359" addr="0x7ff9f1fb4bb0" >
-                                    <attributelist id="1360" addr="0x7ff9f1fb4bb0" >
+                                <typetabsitem id="1359" addr="0x7fdf0850bbb0" >
+                                    <attributelist id="1360" addr="0x7fdf0850bbb0" >
                                     </attributelist >
                                 </typetabsitem >
                             </typetab >
-                            <attribute name="parent" value="0x7ff9f1f72a30" id="1361" addr="0x7ff9f1f72a30" />
-                            <attribute name="qname" value="XBMCAddon" id="1362" addr="0x7ff9f1fba9d0" />
-                            <attribute name="symtab" value="0x7ff9f1f89bb0" id="1363" addr="0x7ff9f1f89bb0" />
+                            <attribute name="parent" value="0x7fdf084c9a30" id="1361" addr="0x7fdf084c9a30" />
+                            <attribute name="qname" value="XBMCAddon" id="1362" addr="0x7fdf085119d0" />
+                            <attribute name="symtab" value="0x7fdf084e0bb0" id="1363" addr="0x7fdf084e0bb0" />
                         </attributelist >
-                        <typescopesitem id="1364" addr="0x7ff9f1f89b70" >
-                            <attributelist id="1365" addr="0x7ff9f1f89b70" >
+                        <typescopesitem id="1364" addr="0x7fdf084e0b70" >
+                            <attributelist id="1365" addr="0x7fdf084e0b70" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="1366" addr="0x7ff9f1fb49d0" >
-                            <attributelist id="1367" addr="0x7ff9f1fb49d0" >
-                                <attribute name="String" value="std::string" id="1368" addr="0x7ff9f1fba9d0" />
+                        <typescopesitem id="1366" addr="0x7fdf0850b9d0" >
+                            <attributelist id="1367" addr="0x7fdf0850b9d0" >
+                                <attribute name="String" value="std::string" id="1368" addr="0x7fdf085119d0" />
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="1369" addr="0x7ff9f1f72a30" >
-                            <attributelist id="1370" addr="0x7ff9f1f72a30" >
-                                <attribute name="name" value="" id="1371" addr="0x7ff9f1fba9d0" />
-                                <typetab id="1372" addr="0x7ff9f1f72a90" >
-                                    <attributelist id="1373" addr="0x7ff9f1f72a90" >
-                                        <attribute name="CGUIDialogKeyboardGeneric" value="CGUIDialogKeyboardGeneric" id="1374" addr="0x7ff9f1fba9d0" />
+                        <typescopesitem id="1369" addr="0x7fdf084c9a30" >
+                            <attributelist id="1370" addr="0x7fdf084c9a30" >
+                                <attribute name="name" value="" id="1371" addr="0x7fdf085119d0" />
+                                <typetab id="1372" addr="0x7fdf084c9a90" >
+                                    <attributelist id="1373" addr="0x7fdf084c9a90" >
+                                        <attribute name="CGUIDialogKeyboardGeneric" value="CGUIDialogKeyboardGeneric" id="1374" addr="0x7fdf085119d0" />
                                     </attributelist >
-                                    <typetabsitem id="1375" addr="0x7ff9f1fb7950" >
-                                        <attributelist id="1376" addr="0x7ff9f1fb7950" >
+                                    <typetabsitem id="1375" addr="0x7fdf0850e950" >
+                                        <attributelist id="1376" addr="0x7fdf0850e950" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="1377" addr="0x7ff9f1fb4ad0" >
-                            <attributelist id="1378" addr="0x7ff9f1fb4ad0" >
+                        <typescopesitem id="1377" addr="0x7fdf0850bad0" >
+                            <attributelist id="1378" addr="0x7fdf0850bad0" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="1379" addr="0x7ff9f1f89bb0" >
-                            <attributelist id="1380" addr="0x7ff9f1f89bb0" >
-                                <attribute name="name" value="XBMCAddon" id="1381" addr="0x7ff9f1fba9d0" />
-                                <attribute name="csymtab" value="0x7ff9f1f89bf0" id="1382" addr="0x7ff9f1f89bf0" />
-                                <attribute name="symtab" value="0x7ff9f1f89b90" id="1383" addr="0x7ff9f1f89b90" />
+                        <typescopesitem id="1379" addr="0x7fdf084e0bb0" >
+                            <attributelist id="1380" addr="0x7fdf084e0bb0" >
+                                <attribute name="name" value="XBMCAddon" id="1381" addr="0x7fdf085119d0" />
+                                <attribute name="csymtab" value="0x7fdf084e0bf0" id="1382" addr="0x7fdf084e0bf0" />
+                                <attribute name="symtab" value="0x7fdf084e0b90" id="1383" addr="0x7fdf084e0b90" />
                             </attributelist >
                         </typescopesitem >
                     </typescope >
-                    <attribute name="symtab" value="0x7ff9f1f89bb0" id="1384" addr="0x7ff9f1f89bb0" />
-                    <attribute name="sym_symtab" value="0x7ff9f1f72950" id="1385" addr="0x7ff9f1f72950" />
+                    <attribute name="symtab" value="0x7fdf084e0bb0" id="1384" addr="0x7fdf084e0bb0" />
+                    <attribute name="sym_symtab" value="0x7fdf084c9950" id="1385" addr="0x7fdf084c9950" />
                 </attributelist >
 
-                <namespace id="1386" addr="0x7ff9f1f94a30" >
-                    <attributelist id="1387" addr="0x7ff9f1f94a30" >
-                        <attribute name="feature_knownbasetypes" value="AddonClass,IPlayerCallback,AddonCallback" id="1388" addr="0x7ff9f1fba9d0" />
-                        <attribute name="name" value="xbmc" id="1389" addr="0x7ff9f1fba9d0" />
-                        <attribute name="sym_symtab" value="0x7ff9f1f89bb0" id="1390" addr="0x7ff9f1f89bb0" />
-                        <attribute name="symtab" value="0x7ff9f1f8a2b0" id="1391" addr="0x7ff9f1f8a2b0" />
-                        <attribute name="sym_nextSibling" value="0x7ff9f1f9e350" id="1392" addr="0x7ff9f1f9e350" />
-                        <attribute name="csym_nextSibling" value="0x7ff9f1f9e350" id="1393" addr="0x7ff9f1f9e350" />
-                        <attribute name="sym_previousSibling" value="0x7ff9f1f8a330" id="1394" addr="0x7ff9f1f8a330" />
-                        <attribute name="feature_knownapitypes" value="XBMCAddon::xbmcgui::ListItem,XBMCAddon::xbmc::PlayListItem" id="1395" addr="0x7ff9f1fba9d0" />
-                        <attribute name="sym_name" value="xbmc" id="1396" addr="0x7ff9f1fba9d0" />
-                        <typescope id="1397" addr="0x7ff9f1fb4d70" >
-                            <attributelist id="1398" addr="0x7ff9f1fb4d70" >
-                                <attribute name="name" value="xbmc" id="1399" addr="0x7ff9f1fba9d0" />
-                                <typetab id="1400" addr="0x7ff9f1fb4d90" >
-                                    <attributelist id="1401" addr="0x7ff9f1fb4d90" >
-                                        <attribute name="Monitor" value="Monitor" id="1402" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="1403" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="Keyboard" value="Keyboard" id="1404" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="1405" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="InfoTagVideo" value="InfoTagVideo" id="1406" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="Player" value="Player" id="1407" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="InfoTagMusic" value="InfoTagMusic" id="1408" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="PlayList" value="PlayList" id="1409" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="RenderCapture" value="RenderCapture" id="1410" addr="0x7ff9f1fba9d0" />
+                <namespace id="1386" addr="0x7fdf084eba30" >
+                    <attributelist id="1387" addr="0x7fdf084eba30" >
+                        <attribute name="feature_knownbasetypes" value="AddonClass,IPlayerCallback,AddonCallback" id="1388" addr="0x7fdf085119d0" />
+                        <attribute name="name" value="xbmc" id="1389" addr="0x7fdf085119d0" />
+                        <attribute name="sym_symtab" value="0x7fdf084e0bb0" id="1390" addr="0x7fdf084e0bb0" />
+                        <attribute name="symtab" value="0x7fdf084e12b0" id="1391" addr="0x7fdf084e12b0" />
+                        <attribute name="sym_nextSibling" value="0x7fdf084f5350" id="1392" addr="0x7fdf084f5350" />
+                        <attribute name="csym_nextSibling" value="0x7fdf084f5350" id="1393" addr="0x7fdf084f5350" />
+                        <attribute name="sym_previousSibling" value="0x7fdf084e1330" id="1394" addr="0x7fdf084e1330" />
+                        <attribute name="feature_knownapitypes" value="XBMCAddon::xbmcgui::ListItem,XBMCAddon::xbmc::PlayListItem" id="1395" addr="0x7fdf085119d0" />
+                        <attribute name="sym_name" value="xbmc" id="1396" addr="0x7fdf085119d0" />
+                        <typescope id="1397" addr="0x7fdf0850bd70" >
+                            <attributelist id="1398" addr="0x7fdf0850bd70" >
+                                <attribute name="name" value="xbmc" id="1399" addr="0x7fdf085119d0" />
+                                <typetab id="1400" addr="0x7fdf0850bd90" >
+                                    <attributelist id="1401" addr="0x7fdf0850bd90" >
+                                        <attribute name="Monitor" value="Monitor" id="1402" addr="0x7fdf085119d0" />
+                                        <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="1403" addr="0x7fdf085119d0" />
+                                        <attribute name="Keyboard" value="Keyboard" id="1404" addr="0x7fdf085119d0" />
+                                        <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="1405" addr="0x7fdf085119d0" />
+                                        <attribute name="InfoTagVideo" value="InfoTagVideo" id="1406" addr="0x7fdf085119d0" />
+                                        <attribute name="Player" value="Player" id="1407" addr="0x7fdf085119d0" />
+                                        <attribute name="InfoTagMusic" value="InfoTagMusic" id="1408" addr="0x7fdf085119d0" />
+                                        <attribute name="PlayList" value="PlayList" id="1409" addr="0x7fdf085119d0" />
+                                        <attribute name="RenderCapture" value="RenderCapture" id="1410" addr="0x7fdf085119d0" />
                                     </attributelist >
-                                    <typetabsitem id="1411" addr="0x7ff9f1fb9b10" >
-                                        <attributelist id="1412" addr="0x7ff9f1fb9b10" >
+                                    <typetabsitem id="1411" addr="0x7fdf08510b10" >
+                                        <attributelist id="1412" addr="0x7fdf08510b10" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1413" addr="0x7ff9f1fb7f30" >
-                                        <attributelist id="1414" addr="0x7ff9f1fb7f30" >
+                                    <typetabsitem id="1413" addr="0x7fdf0850ef30" >
+                                        <attributelist id="1414" addr="0x7fdf0850ef30" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1415" addr="0x7ff9f1fb8990" >
-                                        <attributelist id="1416" addr="0x7ff9f1fb8990" >
+                                    <typetabsitem id="1415" addr="0x7fdf0850f990" >
+                                        <attributelist id="1416" addr="0x7fdf0850f990" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1417" addr="0x7ff9f1fb5e90" >
-                                        <attributelist id="1418" addr="0x7ff9f1fb5e90" >
+                                    <typetabsitem id="1417" addr="0x7fdf0850ce90" >
+                                        <attributelist id="1418" addr="0x7fdf0850ce90" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1419" addr="0x7ff9f1fb8310" >
-                                        <attributelist id="1420" addr="0x7ff9f1fb8310" >
+                                    <typetabsitem id="1419" addr="0x7fdf0850f310" >
+                                        <attributelist id="1420" addr="0x7fdf0850f310" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1421" addr="0x7ff9f1fb6050" >
-                                        <attributelist id="1422" addr="0x7ff9f1fb6050" >
+                                    <typetabsitem id="1421" addr="0x7fdf0850d050" >
+                                        <attributelist id="1422" addr="0x7fdf0850d050" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1423" addr="0x7ff9f1fb7b50" >
-                                        <attributelist id="1424" addr="0x7ff9f1fb7b50" >
+                                    <typetabsitem id="1423" addr="0x7fdf0850eb50" >
+                                        <attributelist id="1424" addr="0x7fdf0850eb50" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1425" addr="0x7ff9f1fb91b0" >
-                                        <attributelist id="1426" addr="0x7ff9f1fb91b0" >
+                                    <typetabsitem id="1425" addr="0x7fdf085101b0" >
+                                        <attributelist id="1426" addr="0x7fdf085101b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1427" addr="0x7ff9f1fb7490" >
-                                        <attributelist id="1428" addr="0x7ff9f1fb7490" >
+                                    <typetabsitem id="1427" addr="0x7fdf0850e490" >
+                                        <attributelist id="1428" addr="0x7fdf0850e490" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
-                                <attribute name="parent" value="0x7ff9f1fb4990" id="1429" addr="0x7ff9f1fb4990" />
-                                <attribute name="qname" value="XBMCAddon::xbmc" id="1430" addr="0x7ff9f1fba9d0" />
-                                <attribute name="symtab" value="0x7ff9f1f8a2b0" id="1431" addr="0x7ff9f1f8a2b0" />
+                                <attribute name="parent" value="0x7fdf0850b990" id="1429" addr="0x7fdf0850b990" />
+                                <attribute name="qname" value="XBMCAddon::xbmc" id="1430" addr="0x7fdf085119d0" />
+                                <attribute name="symtab" value="0x7fdf084e12b0" id="1431" addr="0x7fdf084e12b0" />
                             </attributelist >
-                            <typescopesitem id="1432" addr="0x7ff9f1f8a270" >
-                                <attributelist id="1433" addr="0x7ff9f1f8a270" >
+                            <typescopesitem id="1432" addr="0x7fdf084e1270" >
+                                <attributelist id="1433" addr="0x7fdf084e1270" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="1434" addr="0x7ff9f1fb4d90" >
-                                <attributelist id="1435" addr="0x7ff9f1fb4d90" >
-                                    <attribute name="Monitor" value="Monitor" id="1436" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="1437" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="Keyboard" value="Keyboard" id="1438" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="1439" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="InfoTagVideo" value="InfoTagVideo" id="1440" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="Player" value="Player" id="1441" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="InfoTagMusic" value="InfoTagMusic" id="1442" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="PlayList" value="PlayList" id="1443" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="RenderCapture" value="RenderCapture" id="1444" addr="0x7ff9f1fba9d0" />
+                            <typescopesitem id="1434" addr="0x7fdf0850bd90" >
+                                <attributelist id="1435" addr="0x7fdf0850bd90" >
+                                    <attribute name="Monitor" value="Monitor" id="1436" addr="0x7fdf085119d0" />
+                                    <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="1437" addr="0x7fdf085119d0" />
+                                    <attribute name="Keyboard" value="Keyboard" id="1438" addr="0x7fdf085119d0" />
+                                    <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="1439" addr="0x7fdf085119d0" />
+                                    <attribute name="InfoTagVideo" value="InfoTagVideo" id="1440" addr="0x7fdf085119d0" />
+                                    <attribute name="Player" value="Player" id="1441" addr="0x7fdf085119d0" />
+                                    <attribute name="InfoTagMusic" value="InfoTagMusic" id="1442" addr="0x7fdf085119d0" />
+                                    <attribute name="PlayList" value="PlayList" id="1443" addr="0x7fdf085119d0" />
+                                    <attribute name="RenderCapture" value="RenderCapture" id="1444" addr="0x7fdf085119d0" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="1445" addr="0x7ff9f1fb4990" >
-                                <attributelist id="1446" addr="0x7ff9f1fb4990" >
-                                    <attribute name="name" value="XBMCAddon" id="1447" addr="0x7ff9f1fba9d0" />
-                                    <typetab id="1448" addr="0x7ff9f1fb49d0" >
-                                        <attributelist id="1449" addr="0x7ff9f1fb49d0" >
-                                            <attribute name="String" value="std::string" id="1450" addr="0x7ff9f1fba9d0" />
-                                        </attributelist >
-                                        <typetabsitem id="1451" addr="0x7ff9f1fb4bb0" >
-                                            <attributelist id="1452" addr="0x7ff9f1fb4bb0" >
+                            <typescopesitem id="1445" addr="0x7fdf0850b990" >
+                                <attributelist id="1446" addr="0x7fdf0850b990" >
+                                    <attribute name="name" value="XBMCAddon" id="1447" addr="0x7fdf085119d0" />
+                                    <typetab id="1448" addr="0x7fdf0850b9d0" >
+                                        <attributelist id="1449" addr="0x7fdf0850b9d0" >
+                                            <attribute name="String" value="std::string" id="1450" addr="0x7fdf085119d0" />
+                                        </attributelist >
+                                        <typetabsitem id="1451" addr="0x7fdf0850bbb0" >
+                                            <attributelist id="1452" addr="0x7fdf0850bbb0" >
                                             </attributelist >
                                         </typetabsitem >
                                     </typetab >
-                                    <attribute name="parent" value="0x7ff9f1f72a30" id="1453" addr="0x7ff9f1f72a30" />
-                                    <attribute name="qname" value="XBMCAddon" id="1454" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="symtab" value="0x7ff9f1f89bb0" id="1455" addr="0x7ff9f1f89bb0" />
+                                    <attribute name="parent" value="0x7fdf084c9a30" id="1453" addr="0x7fdf084c9a30" />
+                                    <attribute name="qname" value="XBMCAddon" id="1454" addr="0x7fdf085119d0" />
+                                    <attribute name="symtab" value="0x7fdf084e0bb0" id="1455" addr="0x7fdf084e0bb0" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="1456" addr="0x7ff9f1fb4db0" >
-                                <attributelist id="1457" addr="0x7ff9f1fb4db0" >
+                            <typescopesitem id="1456" addr="0x7fdf0850bdb0" >
+                                <attributelist id="1457" addr="0x7fdf0850bdb0" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="1458" addr="0x7ff9f1f8a2b0" >
-                                <attributelist id="1459" addr="0x7ff9f1f8a2b0" >
-                                    <attribute name="name" value="xbmc" id="1460" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="csymtab" value="0x7ff9f1f8a2f0" id="1461" addr="0x7ff9f1f8a2f0" />
-                                    <attribute name="symtab" value="0x7ff9f1f8a290" id="1462" addr="0x7ff9f1f8a290" />
+                            <typescopesitem id="1458" addr="0x7fdf084e12b0" >
+                                <attributelist id="1459" addr="0x7fdf084e12b0" >
+                                    <attribute name="name" value="xbmc" id="1460" addr="0x7fdf085119d0" />
+                                    <attribute name="csymtab" value="0x7fdf084e12f0" id="1461" addr="0x7fdf084e12f0" />
+                                    <attribute name="symtab" value="0x7fdf084e1290" id="1462" addr="0x7fdf084e1290" />
                                 </attributelist >
                             </typescopesitem >
                         </typescope >
                     </attributelist >
 
-                    <cdecl id="1463" addr="0x7ff9f1f94b90" >
-                        <attributelist id="1464" addr="0x7ff9f1f94b90" >
-                            <attribute name="sym_name" value="PlayerException" id="1465" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="XBMCAddon::xbmc::PlayerException" id="1466" addr="0x7ff9f1fba9d0" />
-                            <attribute name="kind" value="variable" id="1467" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="XBMCCOMMONS_STANDARD_EXCEPTION" id="1468" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="1469" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1470" addr="0x7ff9f1fba9d0" />
+                    <cdecl id="1463" addr="0x7fdf084ebb90" >
+                        <attributelist id="1464" addr="0x7fdf084ebb90" >
+                            <attribute name="sym_name" value="PlayerException" id="1465" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="XBMCAddon::xbmc::PlayerException" id="1466" addr="0x7fdf085119d0" />
+                            <attribute name="kind" value="variable" id="1467" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="XBMCCOMMONS_STANDARD_EXCEPTION" id="1468" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="1469" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1470" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="1471" addr="0x7ff9f1f94ed0" >
-                        <attributelist id="1472" addr="0x7ff9f1f94ed0" >
-                            <attribute name="sym_name" value="PlayParameter" id="1473" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="XBMCAddon::xbmc::PlayParameter" id="1474" addr="0x7ff9f1fba9d0" />
-                            <attribute name="decl" value="" id="1475" addr="0x7ff9f1fba9d0" />
-                            <attribute name="storage" value="typedef" id="1476" addr="0x7ff9f1fba9d0" />
-                            <attribute name="kind" value="typedef" id="1477" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="1478" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="1479" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1480" addr="0x7ff9f1fba9d0" />
+                    <cdecl id="1471" addr="0x7fdf084ebed0" >
+                        <attributelist id="1472" addr="0x7fdf084ebed0" >
+                            <attribute name="sym_name" value="PlayParameter" id="1473" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="XBMCAddon::xbmc::PlayParameter" id="1474" addr="0x7fdf085119d0" />
+                            <attribute name="decl" value="" id="1475" addr="0x7fdf085119d0" />
+                            <attribute name="storage" value="typedef" id="1476" addr="0x7fdf085119d0" />
+                            <attribute name="kind" value="typedef" id="1477" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="1478" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="1479" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1480" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <class id="1481" addr="0x7ff9f1f95370" >
-                        <attributelist id="1482" addr="0x7ff9f1f95370" >
-                            <attribute name="name" value="XBMCAddon::xbmc::Player" id="1483" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="1484" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="symtab" value="0x7ff9f1f95550" id="1485" addr="0x7ff9f1f95550" />
-                            <attribute name="allows_typedef" value="1" id="1486" addr="0x7ff9f1fba9d0" />
-                            <attribute name="typepass_visit" value="1" id="1487" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_visit" value="1" id="1488" addr="0x7ff9f1fba9d0" />
-                            <attribute name="kind" value="class" id="1489" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_name" value="Player" id="1490" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_default_constructor" value="1" id="1491" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_has_constructor" value="1" id="1492" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_public_constructor" value="1" id="1493" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_has_destructor" value="1" id="1494" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_default_destructor" value="1" id="1495" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_copy_constructor" value="1" id="1496" addr="0x7ff9f1fba9d0" />
-                            <attribute name="privatebaselist" value="0x7ff9f1f950f0" id="1497" addr="0x7ff9f1f950f0" />
-                            <attribute name="protectedbaselist" value="0x7ff9f1f950d0" id="1498" addr="0x7ff9f1f950d0" />
-                            <baselist id="1499" addr="0x7ff9f1f950b0" >
-                                <base name="AddonCallback" id="1500" addr="0x7ff9f1f95070" />
-                                <base name="IPlayerCallback" id="1501" addr="0x7ff9f1f95210" />
+                    <class id="1481" addr="0x7fdf084ec370" >
+                        <attributelist id="1482" addr="0x7fdf084ec370" >
+                            <attribute name="name" value="XBMCAddon::xbmc::Player" id="1483" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="1484" addr="0x7fdf084e12b0" />
+                            <attribute name="symtab" value="0x7fdf084ec550" id="1485" addr="0x7fdf084ec550" />
+                            <attribute name="allows_typedef" value="1" id="1486" addr="0x7fdf085119d0" />
+                            <attribute name="typepass_visit" value="1" id="1487" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_visit" value="1" id="1488" addr="0x7fdf085119d0" />
+                            <attribute name="kind" value="class" id="1489" addr="0x7fdf085119d0" />
+                            <attribute name="sym_name" value="Player" id="1490" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_default_constructor" value="1" id="1491" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_has_constructor" value="1" id="1492" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_public_constructor" value="1" id="1493" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_has_destructor" value="1" id="1494" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_default_destructor" value="1" id="1495" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_copy_constructor" value="1" id="1496" addr="0x7fdf085119d0" />
+                            <attribute name="privatebaselist" value="0x7fdf084ec0f0" id="1497" addr="0x7fdf084ec0f0" />
+                            <attribute name="protectedbaselist" value="0x7fdf084ec0d0" id="1498" addr="0x7fdf084ec0d0" />
+                            <baselist id="1499" addr="0x7fdf084ec0b0" >
+                                <base name="AddonCallback" id="1500" addr="0x7fdf084ec070" />
+                                <base name="IPlayerCallback" id="1501" addr="0x7fdf084ec210" />
                             </baselist >
-                            <attribute name="module" value="xbmc" id="1502" addr="0x7ff9f1f89430" />
-                            <attribute name="feature_director" value="1" id="1503" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1504" addr="0x7ff9f1fba9d0" />
-                            <typescope id="1505" addr="0x7ff9f1fb6230" >
-                                <attributelist id="1506" addr="0x7ff9f1fb6230" >
-                                    <attribute name="name" value="Player" id="1507" addr="0x7ff9f1fba9d0" />
-                                    <typetab id="1508" addr="0x7ff9f1fb6250" >
-                                        <attributelist id="1509" addr="0x7ff9f1fb6250" >
+                            <attribute name="module" value="xbmc" id="1502" addr="0x7fdf084e0430" />
+                            <attribute name="feature_director" value="1" id="1503" addr="0x7fdf085119d0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1504" addr="0x7fdf085119d0" />
+                            <typescope id="1505" addr="0x7fdf0850d230" >
+                                <attributelist id="1506" addr="0x7fdf0850d230" >
+                                    <attribute name="name" value="Player" id="1507" addr="0x7fdf085119d0" />
+                                    <typetab id="1508" addr="0x7fdf0850d250" >
+                                        <attributelist id="1509" addr="0x7fdf0850d250" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7ff9f1fb4d70" id="1510" addr="0x7ff9f1fb4d70" />
-                                    <attribute name="qname" value="XBMCAddon::xbmc::Player" id="1511" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="symtab" value="0x7ff9f1f95550" id="1512" addr="0x7ff9f1f95550" />
+                                    <attribute name="parent" value="0x7fdf0850bd70" id="1510" addr="0x7fdf0850bd70" />
+                                    <attribute name="qname" value="XBMCAddon::xbmc::Player" id="1511" addr="0x7fdf085119d0" />
+                                    <attribute name="symtab" value="0x7fdf084ec550" id="1512" addr="0x7fdf084ec550" />
                                 </attributelist >
-                                <typescopesitem id="1513" addr="0x7ff9f1fb6150" >
-                                    <attributelist id="1514" addr="0x7ff9f1fb6150" >
+                                <typescopesitem id="1513" addr="0x7fdf0850d150" >
+                                    <attributelist id="1514" addr="0x7fdf0850d150" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="1515" addr="0x7ff9f1fb6250" >
-                                    <attributelist id="1516" addr="0x7ff9f1fb6250" >
+                                <typescopesitem id="1515" addr="0x7fdf0850d250" >
+                                    <attributelist id="1516" addr="0x7fdf0850d250" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="1517" addr="0x7ff9f1fb4d70" >
-                                    <attributelist id="1518" addr="0x7ff9f1fb4d70" >
-                                        <attribute name="name" value="xbmc" id="1519" addr="0x7ff9f1fba9d0" />
-                                        <typetab id="1520" addr="0x7ff9f1fb4d90" >
-                                            <attributelist id="1521" addr="0x7ff9f1fb4d90" >
-                                                <attribute name="Monitor" value="Monitor" id="1522" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="1523" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="Keyboard" value="Keyboard" id="1524" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="1525" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="InfoTagVideo" value="InfoTagVideo" id="1526" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="Player" value="Player" id="1527" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="InfoTagMusic" value="InfoTagMusic" id="1528" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="PlayList" value="PlayList" id="1529" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="RenderCapture" value="RenderCapture" id="1530" addr="0x7ff9f1fba9d0" />
+                                <typescopesitem id="1517" addr="0x7fdf0850bd70" >
+                                    <attributelist id="1518" addr="0x7fdf0850bd70" >
+                                        <attribute name="name" value="xbmc" id="1519" addr="0x7fdf085119d0" />
+                                        <typetab id="1520" addr="0x7fdf0850bd90" >
+                                            <attributelist id="1521" addr="0x7fdf0850bd90" >
+                                                <attribute name="Monitor" value="Monitor" id="1522" addr="0x7fdf085119d0" />
+                                                <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="1523" addr="0x7fdf085119d0" />
+                                                <attribute name="Keyboard" value="Keyboard" id="1524" addr="0x7fdf085119d0" />
+                                                <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="1525" addr="0x7fdf085119d0" />
+                                                <attribute name="InfoTagVideo" value="InfoTagVideo" id="1526" addr="0x7fdf085119d0" />
+                                                <attribute name="Player" value="Player" id="1527" addr="0x7fdf085119d0" />
+                                                <attribute name="InfoTagMusic" value="InfoTagMusic" id="1528" addr="0x7fdf085119d0" />
+                                                <attribute name="PlayList" value="PlayList" id="1529" addr="0x7fdf085119d0" />
+                                                <attribute name="RenderCapture" value="RenderCapture" id="1530" addr="0x7fdf085119d0" />
                                             </attributelist >
-                                            <typetabsitem id="1531" addr="0x7ff9f1fb9b10" >
-                                                <attributelist id="1532" addr="0x7ff9f1fb9b10" >
+                                            <typetabsitem id="1531" addr="0x7fdf08510b10" >
+                                                <attributelist id="1532" addr="0x7fdf08510b10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1533" addr="0x7ff9f1fb7f30" >
-                                                <attributelist id="1534" addr="0x7ff9f1fb7f30" >
+                                            <typetabsitem id="1533" addr="0x7fdf0850ef30" >
+                                                <attributelist id="1534" addr="0x7fdf0850ef30" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1535" addr="0x7ff9f1fb8990" >
-                                                <attributelist id="1536" addr="0x7ff9f1fb8990" >
+                                            <typetabsitem id="1535" addr="0x7fdf0850f990" >
+                                                <attributelist id="1536" addr="0x7fdf0850f990" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1537" addr="0x7ff9f1fb5e90" >
-                                                <attributelist id="1538" addr="0x7ff9f1fb5e90" >
+                                            <typetabsitem id="1537" addr="0x7fdf0850ce90" >
+                                                <attributelist id="1538" addr="0x7fdf0850ce90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1539" addr="0x7ff9f1fb8310" >
-                                                <attributelist id="1540" addr="0x7ff9f1fb8310" >
+                                            <typetabsitem id="1539" addr="0x7fdf0850f310" >
+                                                <attributelist id="1540" addr="0x7fdf0850f310" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1541" addr="0x7ff9f1fb6050" >
-                                                <attributelist id="1542" addr="0x7ff9f1fb6050" >
+                                            <typetabsitem id="1541" addr="0x7fdf0850d050" >
+                                                <attributelist id="1542" addr="0x7fdf0850d050" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1543" addr="0x7ff9f1fb7b50" >
-                                                <attributelist id="1544" addr="0x7ff9f1fb7b50" >
+                                            <typetabsitem id="1543" addr="0x7fdf0850eb50" >
+                                                <attributelist id="1544" addr="0x7fdf0850eb50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1545" addr="0x7ff9f1fb91b0" >
-                                                <attributelist id="1546" addr="0x7ff9f1fb91b0" >
+                                            <typetabsitem id="1545" addr="0x7fdf085101b0" >
+                                                <attributelist id="1546" addr="0x7fdf085101b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1547" addr="0x7ff9f1fb7490" >
-                                                <attributelist id="1548" addr="0x7ff9f1fb7490" >
+                                            <typetabsitem id="1547" addr="0x7fdf0850e490" >
+                                                <attributelist id="1548" addr="0x7fdf0850e490" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7ff9f1fb4990" id="1549" addr="0x7ff9f1fb4990" />
-                                        <attribute name="qname" value="XBMCAddon::xbmc" id="1550" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="symtab" value="0x7ff9f1f8a2b0" id="1551" addr="0x7ff9f1f8a2b0" />
+                                        <attribute name="parent" value="0x7fdf0850b990" id="1549" addr="0x7fdf0850b990" />
+                                        <attribute name="qname" value="XBMCAddon::xbmc" id="1550" addr="0x7fdf085119d0" />
+                                        <attribute name="symtab" value="0x7fdf084e12b0" id="1551" addr="0x7fdf084e12b0" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="1552" addr="0x7ff9f1fb6270" >
-                                    <attributelist id="1553" addr="0x7ff9f1fb6270" >
+                                <typescopesitem id="1552" addr="0x7fdf0850d270" >
+                                    <attributelist id="1553" addr="0x7fdf0850d270" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="1554" addr="0x7ff9f1f95550" >
-                                    <attributelist id="1555" addr="0x7ff9f1f95550" >
-                                        <attribute name="name" value="Player" id="1556" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="csymtab" value="0x7ff9f1f95570" id="1557" addr="0x7ff9f1f95570" />
-                                        <attribute name="symtab" value="0x7ff9f1f954f0" id="1558" addr="0x7ff9f1f954f0" />
+                                <typescopesitem id="1554" addr="0x7fdf084ec550" >
+                                    <attributelist id="1555" addr="0x7fdf084ec550" >
+                                        <attribute name="name" value="Player" id="1556" addr="0x7fdf085119d0" />
+                                        <attribute name="csymtab" value="0x7fdf084ec570" id="1557" addr="0x7fdf084ec570" />
+                                        <attribute name="symtab" value="0x7fdf084ec4f0" id="1558" addr="0x7fdf084ec4f0" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <access id="1559" addr="0x7ff9f1f954b0" >
-                            <attributelist id="1560" addr="0x7ff9f1f954b0" >
-                                <attribute name="kind" value="private" id="1561" addr="0x7ff9f1fba9d0" />
+                        <access id="1559" addr="0x7fdf084ec4b0" >
+                            <attributelist id="1560" addr="0x7fdf084ec4b0" >
+                                <attribute name="kind" value="private" id="1561" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </access >
-                        <cdecl id="1562" addr="0x7ff9f1f956b0" >
-                            <attributelist id="1563" addr="0x7ff9f1f956b0" >
-                                <attribute name="ismember" value="1" id="1564" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="iPlayList" id="1565" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="" id="1566" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="private" id="1567" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="variable" id="1568" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="int" id="1569" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="1570" addr="0x7ff9f1f95550" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="1571" addr="0x7ff9f1f95d90" >
-                            <attributelist id="1572" addr="0x7ff9f1f95d90" >
-                                <attribute name="ismember" value="1" id="1573" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="playStream" id="1574" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem,bool)." id="1575" addr="0x7ff9f1fba9d0" />
-                                <parmlist id="1576" addr="0x7ff9f1f959b0" >
+                        <cdecl id="1562" addr="0x7fdf084ec6b0" >
+                            <attributelist id="1563" addr="0x7fdf084ec6b0" >
+                                <attribute name="ismember" value="1" id="1564" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="iPlayList" id="1565" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="" id="1566" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="private" id="1567" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="variable" id="1568" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="int" id="1569" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="1570" addr="0x7fdf084ec550" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="1571" addr="0x7fdf084ecd90" >
+                            <attributelist id="1572" addr="0x7fdf084ecd90" >
+                                <attribute name="ismember" value="1" id="1573" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="playStream" id="1574" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem,bool)." id="1575" addr="0x7fdf085119d0" />
+                                <parmlist id="1576" addr="0x7fdf084ec9b0" >
                                     <parm id="1577">
-                                        <attributelist id="1578" addr="0x7ff9f1f959b0" >
-                                            <attribute name="name" value="item" id="1579" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="1580" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1581" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="1578" addr="0x7fdf084ec9b0" >
+                                            <attribute name="name" value="item" id="1579" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="1580" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1581" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1582">
-                                        <attributelist id="1583" addr="0x7ff9f1f95b90" >
-                                            <attribute name="name" value="listitem" id="1584" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="NULL" id="1585" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::ListItem" id="1586" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="1583" addr="0x7fdf084ecb90" >
+                                            <attribute name="name" value="listitem" id="1584" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="NULL" id="1585" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::ListItem" id="1586" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1587">
-                                        <attributelist id="1588" addr="0x7ff9f1f95cd0" >
-                                            <attribute name="name" value="windowed" id="1589" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="false" id="1590" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="bool" id="1591" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="1588" addr="0x7fdf084eccd0" >
+                                            <attribute name="name" value="windowed" id="1589" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="false" id="1590" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="bool" id="1591" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="access" value="private" id="1592" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="1593" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="void" id="1594" addr="0x7ff9f1fba9d0" />
-                                <attribute name="csym_nextSibling" value="0x7ff9f1f95fb0" id="1595" addr="0x7ff9f1f95fb0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="1596" addr="0x7ff9f1f95550" />
+                                <attribute name="access" value="private" id="1592" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="1593" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="void" id="1594" addr="0x7fdf085119d0" />
+                                <attribute name="csym_nextSibling" value="0x7fdf084ecfb0" id="1595" addr="0x7fdf084ecfb0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="1596" addr="0x7fdf084ec550" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="1597" addr="0x7ff9f1f95fb0" >
-                            <attributelist id="1598" addr="0x7ff9f1f95fb0" >
-                                <attribute name="ismember" value="1" id="1599" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="playStream" id="1600" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)." id="1601" addr="0x7ff9f1fba9d0" />
-                                <parmlist id="1602" addr="0x7ff9f1f95eb0" >
+                        <cdecl id="1597" addr="0x7fdf084ecfb0" >
+                            <attributelist id="1598" addr="0x7fdf084ecfb0" >
+                                <attribute name="ismember" value="1" id="1599" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="playStream" id="1600" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)." id="1601" addr="0x7fdf085119d0" />
+                                <parmlist id="1602" addr="0x7fdf084eceb0" >
                                     <parm id="1603">
-                                        <attributelist id="1604" addr="0x7ff9f1f95eb0" >
-                                            <attribute name="name" value="item" id="1605" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="1606" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1607" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="1604" addr="0x7fdf084eceb0" >
+                                            <attribute name="name" value="item" id="1605" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="1606" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1607" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1608">
-                                        <attributelist id="1609" addr="0x7ff9f1f95ef0" >
-                                            <attribute name="name" value="listitem" id="1610" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="NULL" id="1611" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::ListItem" id="1612" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="1609" addr="0x7fdf084ecef0" >
+                                            <attribute name="name" value="listitem" id="1610" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="NULL" id="1611" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::ListItem" id="1612" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="access" value="private" id="1613" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="1614" addr="0x7ff9f1fba9d0" />
-                                <attribute name="defaultargs" value="0x7ff9f1f95d90" id="1615" addr="0x7ff9f1f95d90" />
-                                <attribute name="type" value="void" id="1616" addr="0x7ff9f1fba9d0" />
-                                <attribute name="csym_nextSibling" value="0x7ff9f1f96130" id="1617" addr="0x7ff9f1f96130" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="1618" addr="0x7ff9f1f95550" />
+                                <attribute name="access" value="private" id="1613" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="1614" addr="0x7fdf085119d0" />
+                                <attribute name="defaultargs" value="0x7fdf084ecd90" id="1615" addr="0x7fdf084ecd90" />
+                                <attribute name="type" value="void" id="1616" addr="0x7fdf085119d0" />
+                                <attribute name="csym_nextSibling" value="0x7fdf084ed130" id="1617" addr="0x7fdf084ed130" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="1618" addr="0x7fdf084ec550" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="1619" addr="0x7ff9f1f96130" >
-                            <attributelist id="1620" addr="0x7ff9f1f96130" >
-                                <attribute name="ismember" value="1" id="1621" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="playStream" id="1622" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="1623" addr="0x7ff9f1fba9d0" />
-                                <parmlist id="1624" addr="0x7ff9f1f960d0" >
+                        <cdecl id="1619" addr="0x7fdf084ed130" >
+                            <attributelist id="1620" addr="0x7fdf084ed130" >
+                                <attribute name="ismember" value="1" id="1621" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="playStream" id="1622" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="1623" addr="0x7fdf085119d0" />
+                                <parmlist id="1624" addr="0x7fdf084ed0d0" >
                                     <parm id="1625">
-                                        <attributelist id="1626" addr="0x7ff9f1f960d0" >
-                                            <attribute name="name" value="item" id="1627" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="1628" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1629" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="1626" addr="0x7fdf084ed0d0" >
+                                            <attribute name="name" value="item" id="1627" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="1628" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1629" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="access" value="private" id="1630" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="1631" addr="0x7ff9f1fba9d0" />
-                                <attribute name="defaultargs" value="0x7ff9f1f95d90" id="1632" addr="0x7ff9f1f95d90" />
-                                <attribute name="type" value="void" id="1633" addr="0x7ff9f1fba9d0" />
-                                <attribute name="csym_nextSibling" value="0x7ff9f1f961f0" id="1634" addr="0x7ff9f1f961f0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="1635" addr="0x7ff9f1f95550" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="1636" addr="0x7ff9f1f961f0" >
-                            <attributelist id="1637" addr="0x7ff9f1f961f0" >
-                                <attribute name="ismember" value="1" id="1638" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="playStream" id="1639" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="1640" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="private" id="1641" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="1642" addr="0x7ff9f1fba9d0" />
-                                <attribute name="defaultargs" value="0x7ff9f1f95d90" id="1643" addr="0x7ff9f1f95d90" />
-                                <attribute name="type" value="void" id="1644" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="1645" addr="0x7ff9f1f95550" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="1646" addr="0x7ff9f1f967f0" >
-                            <attributelist id="1647" addr="0x7ff9f1f967f0" >
-                                <attribute name="ismember" value="1" id="1648" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="playPlaylist" id="1649" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(p.q(const).PlayList,bool,int)." id="1650" addr="0x7ff9f1fba9d0" />
-                                <parmlist id="1651" addr="0x7ff9f1f96470" >
+                                <attribute name="access" value="private" id="1630" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="1631" addr="0x7fdf085119d0" />
+                                <attribute name="defaultargs" value="0x7fdf084ecd90" id="1632" addr="0x7fdf084ecd90" />
+                                <attribute name="type" value="void" id="1633" addr="0x7fdf085119d0" />
+                                <attribute name="csym_nextSibling" value="0x7fdf084ed1f0" id="1634" addr="0x7fdf084ed1f0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="1635" addr="0x7fdf084ec550" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="1636" addr="0x7fdf084ed1f0" >
+                            <attributelist id="1637" addr="0x7fdf084ed1f0" >
+                                <attribute name="ismember" value="1" id="1638" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="playStream" id="1639" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="1640" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="private" id="1641" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="1642" addr="0x7fdf085119d0" />
+                                <attribute name="defaultargs" value="0x7fdf084ecd90" id="1643" addr="0x7fdf084ecd90" />
+                                <attribute name="type" value="void" id="1644" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="1645" addr="0x7fdf084ec550" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="1646" addr="0x7fdf084ed7f0" >
+                            <attributelist id="1647" addr="0x7fdf084ed7f0" >
+                                <attribute name="ismember" value="1" id="1648" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="playPlaylist" id="1649" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(p.q(const).PlayList,bool,int)." id="1650" addr="0x7fdf085119d0" />
+                                <parmlist id="1651" addr="0x7fdf084ed470" >
                                     <parm id="1652">
-                                        <attributelist id="1653" addr="0x7ff9f1f96470" >
-                                            <attribute name="name" value="playlist" id="1654" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="NULL" id="1655" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="p.q(const).PlayList" id="1656" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="1653" addr="0x7fdf084ed470" >
+                                            <attribute name="name" value="playlist" id="1654" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="NULL" id="1655" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="p.q(const).PlayList" id="1656" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1657">
-                                        <attributelist id="1658" addr="0x7ff9f1f965b0" >
-                                            <attribute name="name" value="windowed" id="1659" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="false" id="1660" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="bool" id="1661" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="1658" addr="0x7fdf084ed5b0" >
+                                            <attribute name="name" value="windowed" id="1659" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="false" id="1660" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="bool" id="1661" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1662">
-                                        <attributelist id="1663" addr="0x7ff9f1f96730" >
-                                            <attribute name="name" value="startpos" id="1664" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="-1" id="1665" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="int" id="1666" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="1663" addr="0x7fdf084ed730" >
+                                            <attribute name="name" value="startpos" id="1664" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="-1" id="1665" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="int" id="1666" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="access" value="private" id="1667" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="1668" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="void" id="1669" addr="0x7ff9f1fba9d0" />
-                                <attribute name="csym_nextSibling" value="0x7ff9f1f96a10" id="1670" addr="0x7ff9f1f96a10" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="1671" addr="0x7ff9f1f95550" />
+                                <attribute name="access" value="private" id="1667" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="1668" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="void" id="1669" addr="0x7fdf085119d0" />
+                                <attribute name="csym_nextSibling" value="0x7fdf084eda10" id="1670" addr="0x7fdf084eda10" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="1671" addr="0x7fdf084ec550" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="1672" addr="0x7ff9f1f96a10" >
-                            <attributelist id="1673" addr="0x7ff9f1f96a10" >
-                                <attribute name="ismember" value="1" id="1674" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="playPlaylist" id="1675" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(p.q(const).PlayList,bool)." id="1676" addr="0x7ff9f1fba9d0" />
-                                <parmlist id="1677" addr="0x7ff9f1f96910" >
+                        <cdecl id="1672" addr="0x7fdf084eda10" >
+                            <attributelist id="1673" addr="0x7fdf084eda10" >
+                                <attribute name="ismember" value="1" id="1674" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="playPlaylist" id="1675" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(p.q(const).PlayList,bool)." id="1676" addr="0x7fdf085119d0" />
+                                <parmlist id="1677" addr="0x7fdf084ed910" >
                                     <parm id="1678">
-                                        <attributelist id="1679" addr="0x7ff9f1f96910" >
-                                            <attribute name="name" value="playlist" id="1680" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="NULL" id="1681" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="p.q(const).PlayList" id="1682" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="1679" addr="0x7fdf084ed910" >
+                                            <attribute name="name" value="playlist" id="1680" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="NULL" id="1681" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="p.q(const).PlayList" id="1682" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1683">
-                                        <attributelist id="1684" addr="0x7ff9f1f96950" >
-                                            <attribute name="name" value="windowed" id="1685" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="false" id="1686" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="bool" id="1687" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="1684" addr="0x7fdf084ed950" >
+                                            <attribute name="name" value="windowed" id="1685" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="false" id="1686" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="bool" id="1687" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="access" value="private" id="1688" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="1689" addr="0x7ff9f1fba9d0" />
-                                <attribute name="defaultargs" value="0x7ff9f1f967f0" id="1690" addr="0x7ff9f1f967f0" />
-                                <attribute name="type" value="void" id="1691" addr="0x7ff9f1fba9d0" />
-                                <attribute name="csym_nextSibling" value="0x7ff9f1f96b90" id="1692" addr="0x7ff9f1f96b90" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="1693" addr="0x7ff9f1f95550" />
+                                <attribute name="access" value="private" id="1688" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="1689" addr="0x7fdf085119d0" />
+                                <attribute name="defaultargs" value="0x7fdf084ed7f0" id="1690" addr="0x7fdf084ed7f0" />
+                                <attribute name="type" value="void" id="1691" addr="0x7fdf085119d0" />
+                                <attribute name="csym_nextSibling" value="0x7fdf084edb90" id="1692" addr="0x7fdf084edb90" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="1693" addr="0x7fdf084ec550" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="1694" addr="0x7ff9f1f96b90" >
-                            <attributelist id="1695" addr="0x7ff9f1f96b90" >
-                                <attribute name="ismember" value="1" id="1696" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="playPlaylist" id="1697" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(p.q(const).PlayList)." id="1698" addr="0x7ff9f1fba9d0" />
-                                <parmlist id="1699" addr="0x7ff9f1f96b30" >
+                        <cdecl id="1694" addr="0x7fdf084edb90" >
+                            <attributelist id="1695" addr="0x7fdf084edb90" >
+                                <attribute name="ismember" value="1" id="1696" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="playPlaylist" id="1697" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(p.q(const).PlayList)." id="1698" addr="0x7fdf085119d0" />
+                                <parmlist id="1699" addr="0x7fdf084edb30" >
                                     <parm id="1700">
-                                        <attributelist id="1701" addr="0x7ff9f1f96b30" >
-                                            <attribute name="name" value="playlist" id="1702" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="NULL" id="1703" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="p.q(const).PlayList" id="1704" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="1701" addr="0x7fdf084edb30" >
+                                            <attribute name="name" value="playlist" id="1702" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="NULL" id="1703" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="p.q(const).PlayList" id="1704" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="access" value="private" id="1705" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="1706" addr="0x7ff9f1fba9d0" />
-                                <attribute name="defaultargs" value="0x7ff9f1f967f0" id="1707" addr="0x7ff9f1f967f0" />
-                                <attribute name="type" value="void" id="1708" addr="0x7ff9f1fba9d0" />
-                                <attribute name="csym_nextSibling" value="0x7ff9f1f96c70" id="1709" addr="0x7ff9f1f96c70" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="1710" addr="0x7ff9f1f95550" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="1711" addr="0x7ff9f1f96c70" >
-                            <attributelist id="1712" addr="0x7ff9f1f96c70" >
-                                <attribute name="ismember" value="1" id="1713" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="playPlaylist" id="1714" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="1715" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="private" id="1716" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="1717" addr="0x7ff9f1fba9d0" />
-                                <attribute name="defaultargs" value="0x7ff9f1f967f0" id="1718" addr="0x7ff9f1f967f0" />
-                                <attribute name="type" value="void" id="1719" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="1720" addr="0x7ff9f1f95550" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="1721" addr="0x7ff9f1f96f50" >
-                            <attributelist id="1722" addr="0x7ff9f1f96f50" >
-                                <attribute name="ismember" value="1" id="1723" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="playCurrent" id="1724" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(bool)." id="1725" addr="0x7ff9f1fba9d0" />
-                                <parmlist id="1726" addr="0x7ff9f1f96e90" >
+                                <attribute name="access" value="private" id="1705" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="1706" addr="0x7fdf085119d0" />
+                                <attribute name="defaultargs" value="0x7fdf084ed7f0" id="1707" addr="0x7fdf084ed7f0" />
+                                <attribute name="type" value="void" id="1708" addr="0x7fdf085119d0" />
+                                <attribute name="csym_nextSibling" value="0x7fdf084edc70" id="1709" addr="0x7fdf084edc70" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="1710" addr="0x7fdf084ec550" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="1711" addr="0x7fdf084edc70" >
+                            <attributelist id="1712" addr="0x7fdf084edc70" >
+                                <attribute name="ismember" value="1" id="1713" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="playPlaylist" id="1714" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="1715" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="private" id="1716" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="1717" addr="0x7fdf085119d0" />
+                                <attribute name="defaultargs" value="0x7fdf084ed7f0" id="1718" addr="0x7fdf084ed7f0" />
+                                <attribute name="type" value="void" id="1719" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="1720" addr="0x7fdf084ec550" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="1721" addr="0x7fdf084edf50" >
+                            <attributelist id="1722" addr="0x7fdf084edf50" >
+                                <attribute name="ismember" value="1" id="1723" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="playCurrent" id="1724" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(bool)." id="1725" addr="0x7fdf085119d0" />
+                                <parmlist id="1726" addr="0x7fdf084ede90" >
                                     <parm id="1727">
-                                        <attributelist id="1728" addr="0x7ff9f1f96e90" >
-                                            <attribute name="name" value="windowed" id="1729" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="false" id="1730" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="bool" id="1731" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="1728" addr="0x7fdf084ede90" >
+                                            <attribute name="name" value="windowed" id="1729" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="false" id="1730" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="bool" id="1731" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="access" value="private" id="1732" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="1733" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="void" id="1734" addr="0x7ff9f1fba9d0" />
-                                <attribute name="csym_nextSibling" value="0x7ff9f1f97010" id="1735" addr="0x7ff9f1f97010" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="1736" addr="0x7ff9f1f95550" />
+                                <attribute name="access" value="private" id="1732" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="1733" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="void" id="1734" addr="0x7fdf085119d0" />
+                                <attribute name="csym_nextSibling" value="0x7fdf084ee010" id="1735" addr="0x7fdf084ee010" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="1736" addr="0x7fdf084ec550" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="1737" addr="0x7ff9f1f97010" >
-                            <attributelist id="1738" addr="0x7ff9f1f97010" >
-                                <attribute name="ismember" value="1" id="1739" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="playCurrent" id="1740" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="1741" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="private" id="1742" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="1743" addr="0x7ff9f1fba9d0" />
-                                <attribute name="defaultargs" value="0x7ff9f1f96f50" id="1744" addr="0x7ff9f1f96f50" />
-                                <attribute name="type" value="void" id="1745" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="1746" addr="0x7ff9f1f95550" />
+                        <cdecl id="1737" addr="0x7fdf084ee010" >
+                            <attributelist id="1738" addr="0x7fdf084ee010" >
+                                <attribute name="ismember" value="1" id="1739" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="playCurrent" id="1740" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="1741" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="private" id="1742" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="1743" addr="0x7fdf085119d0" />
+                                <attribute name="defaultargs" value="0x7fdf084edf50" id="1744" addr="0x7fdf084edf50" />
+                                <attribute name="type" value="void" id="1745" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="1746" addr="0x7fdf084ec550" />
                             </attributelist >
                          
                         </cdecl >
-                        <access id="1747" addr="0x7ff9f1f97150" >
-                            <attributelist id="1748" addr="0x7ff9f1f97150" >
-                                <attribute name="kind" value="public" id="1749" addr="0x7ff9f1fba9d0" />
+                        <access id="1747" addr="0x7fdf084ee150" >
+                            <attributelist id="1748" addr="0x7fdf084ee150" >
+                                <attribute name="kind" value="public" id="1749" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="1750" addr="0x7ff9f1f97350" >
-                            <attributelist id="1751" addr="0x7ff9f1f97350" >
-                                <attribute name="name" value="Player" id="1752" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="1753" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="1754" addr="0x7ff9f1f95550" />
-                                <attribute name="csym_nextSibling" value="0x7ff9f1f97470" id="1755" addr="0x7ff9f1f97470" />
-                                <attribute name="sym_name" value="Player" id="1756" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_nextSibling" value="0x7ff9f1f97470" id="1757" addr="0x7ff9f1f97470" />
-                                <attribute name="decl" value="f(int)." id="1758" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="1759" addr="0x7ff9f1fba9d0" />
-                                <attribute name="feature_director" value="1" id="1760" addr="0x7ff9f1fba9d0" />
-                                <attribute name="feature_python_nokwds" value="true" id="1761" addr="0x7ff9f1fba9d0" />
-                                <parmlist id="1762" addr="0x7ff9f1f97290" >
+                        <constructor id="1750" addr="0x7fdf084ee350" >
+                            <attributelist id="1751" addr="0x7fdf084ee350" >
+                                <attribute name="name" value="Player" id="1752" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="1753" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="1754" addr="0x7fdf084ec550" />
+                                <attribute name="csym_nextSibling" value="0x7fdf084ee470" id="1755" addr="0x7fdf084ee470" />
+                                <attribute name="sym_name" value="Player" id="1756" addr="0x7fdf085119d0" />
+                                <attribute name="sym_nextSibling" value="0x7fdf084ee470" id="1757" addr="0x7fdf084ee470" />
+                                <attribute name="decl" value="f(int)." id="1758" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="1759" addr="0x7fdf085119d0" />
+                                <attribute name="feature_director" value="1" id="1760" addr="0x7fdf085119d0" />
+                                <attribute name="feature_python_nokwds" value="true" id="1761" addr="0x7fdf085119d0" />
+                                <parmlist id="1762" addr="0x7fdf084ee290" >
                                     <parm id="1763">
-                                        <attributelist id="1764" addr="0x7ff9f1f97290" >
-                                            <attribute name="name" value="playerCore" id="1765" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="0" id="1766" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="int" id="1767" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="1764" addr="0x7fdf084ee290" >
+                                            <attribute name="name" value="playerCore" id="1765" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="0" id="1766" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="int" id="1767" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overloaded" value="0x7ff9f1f97350" id="1768" addr="0x7ff9f1f97350" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="1769" addr="0x7ff9f1fba9d0" />
-                                <attribute name="storage" value="explicit" id="1770" addr="0x7ff9f1fba9d0" />
-                                <attribute name="feature_new" value="1" id="1771" addr="0x7ff9f1fba9d0" />
+                                <attribute name="sym_overloaded" value="0x7fdf084ee350" id="1768" addr="0x7fdf084ee350" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="1769" addr="0x7fdf085119d0" />
+                                <attribute name="storage" value="explicit" id="1770" addr="0x7fdf085119d0" />
+                                <attribute name="feature_new" value="1" id="1771" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="1772" addr="0x7ff9f1f97470" >
-                            <attributelist id="1773" addr="0x7ff9f1f97470" >
-                                <attribute name="name" value="Player" id="1774" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="1775" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="1776" addr="0x7ff9f1f95550" />
-                                <attribute name="sym_previousSibling" value="0x7ff9f1f97350" id="1777" addr="0x7ff9f1f97350" />
-                                <attribute name="sym_name" value="Player" id="1778" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="1779" addr="0x7ff9f1fba9d0" />
-                                <attribute name="defaultargs" value="0x7ff9f1f97350" id="1780" addr="0x7ff9f1f97350" />
-                                <attribute name="access" value="public" id="1781" addr="0x7ff9f1fba9d0" />
-                                <attribute name="feature_director" value="1" id="1782" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overloaded" value="0x7ff9f1f97350" id="1783" addr="0x7ff9f1f97350" />
-                                <attribute name="feature_python_nokwds" value="true" id="1784" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="1785" addr="0x7ff9f1fba9d0" />
-                                <attribute name="storage" value="explicit" id="1786" addr="0x7ff9f1fba9d0" />
-                                <attribute name="feature_new" value="1" id="1787" addr="0x7ff9f1fba9d0" />
+                        <constructor id="1772" addr="0x7fdf084ee470" >
+                            <attributelist id="1773" addr="0x7fdf084ee470" >
+                                <attribute name="name" value="Player" id="1774" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="1775" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="1776" addr="0x7fdf084ec550" />
+                                <attribute name="sym_previousSibling" value="0x7fdf084ee350" id="1777" addr="0x7fdf084ee350" />
+                                <attribute name="sym_name" value="Player" id="1778" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="1779" addr="0x7fdf085119d0" />
+                                <attribute name="defaultargs" value="0x7fdf084ee350" id="1780" addr="0x7fdf084ee350" />
+                                <attribute name="access" value="public" id="1781" addr="0x7fdf085119d0" />
+                                <attribute name="feature_director" value="1" id="1782" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overloaded" value="0x7fdf084ee350" id="1783" addr="0x7fdf084ee350" />
+                                <attribute name="feature_python_nokwds" value="true" id="1784" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="1785" addr="0x7fdf085119d0" />
+                                <attribute name="storage" value="explicit" id="1786" addr="0x7fdf085119d0" />
+                                <attribute name="feature_new" value="1" id="1787" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </constructor >
-                        <destructor id="1788" addr="0x7ff9f1f97730" >
-                            <attributelist id="1789" addr="0x7ff9f1f97730" >
-                                <attribute name="ismember" value="1" id="1790" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="~Player" id="1791" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="~Player" id="1792" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(void)." id="1793" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="1794" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="1795" addr="0x7ff9f1f95550" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="1796" addr="0x7ff9f1fba9d0" />
+                        <destructor id="1788" addr="0x7fdf084ee730" >
+                            <attributelist id="1789" addr="0x7fdf084ee730" >
+                                <attribute name="ismember" value="1" id="1790" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="~Player" id="1791" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="~Player" id="1792" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(void)." id="1793" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="1794" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="1795" addr="0x7fdf084ec550" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="1796" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </destructor >
-                        <cdecl id="1797" addr="0x7ff9f1f97f30" >
-                            <attributelist id="1798" addr="0x7ff9f1f97f30" >
-                                <attribute name="name" value="play" id="1799" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="1800" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="1801" addr="0x7ff9f1f95550" />
-                                <attribute name="sym_nextSibling" value="0x7ff9f1f98230" id="1802" addr="0x7ff9f1f98230" />
-                                <attribute name="csym_nextSibling" value="0x7ff9f1f98230" id="1803" addr="0x7ff9f1f98230" />
-                                <attribute name="kind" value="function" id="1804" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="play" id="1805" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::xbmc::PlayParameter,p.q(const).XBMCAddon::xbmcgui::ListItem,bool,int)." id="1806" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="1807" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overloaded" value="0x7ff9f1f97f30" id="1808" addr="0x7ff9f1f97f30" />
-                                <parmlist id="1809" addr="0x7ff9f1f979d0" >
+                        <cdecl id="1797" addr="0x7fdf084eef30" >
+                            <attributelist id="1798" addr="0x7fdf084eef30" >
+                                <attribute name="name" value="play" id="1799" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="1800" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="1801" addr="0x7fdf084ec550" />
+                                <attribute name="sym_nextSibling" value="0x7fdf084ef230" id="1802" addr="0x7fdf084ef230" />
+                                <attribute name="csym_nextSibling" value="0x7fdf084ef230" id="1803" addr="0x7fdf084ef230" />
+                                <attribute name="kind" value="function" id="1804" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="play" id="1805" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::xbmc::PlayParameter,p.q(const).XBMCAddon::xbmcgui::ListItem,bool,int)." id="1806" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="1807" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overloaded" value="0x7fdf084eef30" id="1808" addr="0x7fdf084eef30" />
+                                <parmlist id="1809" addr="0x7fdf084ee9d0" >
                                     <parm id="1810">
-                                        <attributelist id="1811" addr="0x7ff9f1f979d0" >
-                                            <attribute name="name" value="item" id="1812" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="Player::defaultPlayParameter" id="1813" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::xbmc::PlayParameter" id="1814" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="1811" addr="0x7fdf084ee9d0" >
+                                            <attribute name="name" value="item" id="1812" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="Player::defaultPlayParameter" id="1813" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::xbmc::PlayParameter" id="1814" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1815">
-                                        <attributelist id="1816" addr="0x7ff9f1f97bb0" >
-                                            <attribute name="name" value="listitem" id="1817" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="NULL" id="1818" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::ListItem" id="1819" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="1816" addr="0x7fdf084eebb0" >
+                                            <attribute name="name" value="listitem" id="1817" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="NULL" id="1818" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::ListItem" id="1819" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1820">
-                                        <attributelist id="1821" addr="0x7ff9f1f97cf0" >
-                                            <attribute name="name" value="windowed" id="1822" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="false" id="1823" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="bool" id="1824" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="1821" addr="0x7fdf084eecf0" >
+                                            <attribute name="name" value="windowed" id="1822" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="false" id="1823" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="bool" id="1824" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1825">
-                                        <attributelist id="1826" addr="0x7ff9f1f97e70" >
-                                            <attribute name="name" value="startpos" id="1827" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="-1" id="1828" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="int" id="1829" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="1826" addr="0x7fdf084eee70" >
+                                            <attribute name="name" value="startpos" id="1827" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="-1" id="1828" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="int" id="1829" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="1830" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="1831" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="1832" addr="0x7ff9f1f98230" >
-                            <attributelist id="1833" addr="0x7ff9f1f98230" >
-                                <attribute name="name" value="play" id="1834" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="1835" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="1836" addr="0x7ff9f1f95550" />
-                                <attribute name="sym_previousSibling" value="0x7ff9f1f97f30" id="1837" addr="0x7ff9f1f97f30" />
-                                <attribute name="kind" value="function" id="1838" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="play" id="1839" addr="0x7ff9f1fba9d0" />
-                                <attribute name="csym_nextSibling" value="0x7ff9f1f98490" id="1840" addr="0x7ff9f1f98490" />
-                                <attribute name="sym_nextSibling" value="0x7ff9f1f98490" id="1841" addr="0x7ff9f1f98490" />
-                                <attribute name="defaultargs" value="0x7ff9f1f97f30" id="1842" addr="0x7ff9f1f97f30" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::xbmc::PlayParameter,p.q(const).XBMCAddon::xbmcgui::ListItem,bool)." id="1843" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="1844" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overloaded" value="0x7ff9f1f97f30" id="1845" addr="0x7ff9f1f97f30" />
-                                <parmlist id="1846" addr="0x7ff9f1f97fd0" >
+                                <attribute name="type" value="void" id="1830" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="1831" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="1832" addr="0x7fdf084ef230" >
+                            <attributelist id="1833" addr="0x7fdf084ef230" >
+                                <attribute name="name" value="play" id="1834" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="1835" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="1836" addr="0x7fdf084ec550" />
+                                <attribute name="sym_previousSibling" value="0x7fdf084eef30" id="1837" addr="0x7fdf084eef30" />
+                                <attribute name="kind" value="function" id="1838" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="play" id="1839" addr="0x7fdf085119d0" />
+                                <attribute name="csym_nextSibling" value="0x7fdf084ef490" id="1840" addr="0x7fdf084ef490" />
+                                <attribute name="sym_nextSibling" value="0x7fdf084ef490" id="1841" addr="0x7fdf084ef490" />
+                                <attribute name="defaultargs" value="0x7fdf084eef30" id="1842" addr="0x7fdf084eef30" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::xbmc::PlayParameter,p.q(const).XBMCAddon::xbmcgui::ListItem,bool)." id="1843" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="1844" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overloaded" value="0x7fdf084eef30" id="1845" addr="0x7fdf084eef30" />
+                                <parmlist id="1846" addr="0x7fdf084eefd0" >
                                     <parm id="1847">
-                                        <attributelist id="1848" addr="0x7ff9f1f97fd0" >
-                                            <attribute name="name" value="item" id="1849" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="Player::defaultPlayParameter" id="1850" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::xbmc::PlayParameter" id="1851" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="1848" addr="0x7fdf084eefd0" >
+                                            <attribute name="name" value="item" id="1849" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="Player::defaultPlayParameter" id="1850" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::xbmc::PlayParameter" id="1851" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1852">
-                                        <attributelist id="1853" addr="0x7ff9f1f980d0" >
-                                            <attribute name="name" value="listitem" id="1854" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="NULL" id="1855" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::ListItem" id="1856" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="1853" addr="0x7fdf084ef0d0" >
+                                            <attribute name="name" value="listitem" id="1854" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="NULL" id="1855" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::ListItem" id="1856" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1857">
-                                        <attributelist id="1858" addr="0x7ff9f1f98170" >
-                                            <attribute name="name" value="windowed" id="1859" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="false" id="1860" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="bool" id="1861" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="1858" addr="0x7fdf084ef170" >
+                                            <attribute name="name" value="windowed" id="1859" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="false" id="1860" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="bool" id="1861" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="1862" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="1863" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="1864" addr="0x7ff9f1f98490" >
-                            <attributelist id="1865" addr="0x7ff9f1f98490" >
-                                <attribute name="name" value="play" id="1866" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="1867" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="1868" addr="0x7ff9f1f95550" />
-                                <attribute name="sym_previousSibling" value="0x7ff9f1f98230" id="1869" addr="0x7ff9f1f98230" />
-                                <attribute name="kind" value="function" id="1870" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="play" id="1871" addr="0x7ff9f1fba9d0" />
-                                <attribute name="csym_nextSibling" value="0x7ff9f1f98650" id="1872" addr="0x7ff9f1f98650" />
-                                <attribute name="sym_nextSibling" value="0x7ff9f1f98650" id="1873" addr="0x7ff9f1f98650" />
-                                <attribute name="defaultargs" value="0x7ff9f1f97f30" id="1874" addr="0x7ff9f1f97f30" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::xbmc::PlayParameter,p.q(const).XBMCAddon::xbmcgui::ListItem)." id="1875" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="1876" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overloaded" value="0x7ff9f1f97f30" id="1877" addr="0x7ff9f1f97f30" />
-                                <parmlist id="1878" addr="0x7ff9f1f982d0" >
+                                <attribute name="type" value="void" id="1862" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="1863" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="1864" addr="0x7fdf084ef490" >
+                            <attributelist id="1865" addr="0x7fdf084ef490" >
+                                <attribute name="name" value="play" id="1866" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="1867" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="1868" addr="0x7fdf084ec550" />
+                                <attribute name="sym_previousSibling" value="0x7fdf084ef230" id="1869" addr="0x7fdf084ef230" />
+                                <attribute name="kind" value="function" id="1870" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="play" id="1871" addr="0x7fdf085119d0" />
+                                <attribute name="csym_nextSibling" value="0x7fdf084ef650" id="1872" addr="0x7fdf084ef650" />
+                                <attribute name="sym_nextSibling" value="0x7fdf084ef650" id="1873" addr="0x7fdf084ef650" />
+                                <attribute name="defaultargs" value="0x7fdf084eef30" id="1874" addr="0x7fdf084eef30" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::xbmc::PlayParameter,p.q(const).XBMCAddon::xbmcgui::ListItem)." id="1875" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="1876" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overloaded" value="0x7fdf084eef30" id="1877" addr="0x7fdf084eef30" />
+                                <parmlist id="1878" addr="0x7fdf084ef2d0" >
                                     <parm id="1879">
-                                        <attributelist id="1880" addr="0x7ff9f1f982d0" >
-                                            <attribute name="name" value="item" id="1881" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="Player::defaultPlayParameter" id="1882" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::xbmc::PlayParameter" id="1883" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="1880" addr="0x7fdf084ef2d0" >
+                                            <attribute name="name" value="item" id="1881" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="Player::defaultPlayParameter" id="1882" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::xbmc::PlayParameter" id="1883" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1884">
-                                        <attributelist id="1885" addr="0x7ff9f1f983d0" >
-                                            <attribute name="name" value="listitem" id="1886" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="NULL" id="1887" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::ListItem" id="1888" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="1885" addr="0x7fdf084ef3d0" >
+                                            <attribute name="name" value="listitem" id="1886" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="NULL" id="1887" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::ListItem" id="1888" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="1889" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_2" id="1890" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="1891" addr="0x7ff9f1f98650" >
-                            <attributelist id="1892" addr="0x7ff9f1f98650" >
-                                <attribute name="name" value="play" id="1893" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="1894" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="1895" addr="0x7ff9f1f95550" />
-                                <attribute name="sym_previousSibling" value="0x7ff9f1f98490" id="1896" addr="0x7ff9f1f98490" />
-                                <attribute name="kind" value="function" id="1897" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="play" id="1898" addr="0x7ff9f1fba9d0" />
-                                <attribute name="csym_nextSibling" value="0x7ff9f1f98750" id="1899" addr="0x7ff9f1f98750" />
-                                <attribute name="sym_nextSibling" value="0x7ff9f1f98750" id="1900" addr="0x7ff9f1f98750" />
-                                <attribute name="defaultargs" value="0x7ff9f1f97f30" id="1901" addr="0x7ff9f1f97f30" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::xbmc::PlayParameter)." id="1902" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="1903" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overloaded" value="0x7ff9f1f97f30" id="1904" addr="0x7ff9f1f97f30" />
-                                <parmlist id="1905" addr="0x7ff9f1f98530" >
+                                <attribute name="type" value="void" id="1889" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_2" id="1890" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="1891" addr="0x7fdf084ef650" >
+                            <attributelist id="1892" addr="0x7fdf084ef650" >
+                                <attribute name="name" value="play" id="1893" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="1894" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="1895" addr="0x7fdf084ec550" />
+                                <attribute name="sym_previousSibling" value="0x7fdf084ef490" id="1896" addr="0x7fdf084ef490" />
+                                <attribute name="kind" value="function" id="1897" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="play" id="1898" addr="0x7fdf085119d0" />
+                                <attribute name="csym_nextSibling" value="0x7fdf084ef750" id="1899" addr="0x7fdf084ef750" />
+                                <attribute name="sym_nextSibling" value="0x7fdf084ef750" id="1900" addr="0x7fdf084ef750" />
+                                <attribute name="defaultargs" value="0x7fdf084eef30" id="1901" addr="0x7fdf084eef30" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::xbmc::PlayParameter)." id="1902" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="1903" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overloaded" value="0x7fdf084eef30" id="1904" addr="0x7fdf084eef30" />
+                                <parmlist id="1905" addr="0x7fdf084ef530" >
                                     <parm id="1906">
-                                        <attributelist id="1907" addr="0x7ff9f1f98530" >
-                                            <attribute name="name" value="item" id="1908" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="Player::defaultPlayParameter" id="1909" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::xbmc::PlayParameter" id="1910" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="1907" addr="0x7fdf084ef530" >
+                                            <attribute name="name" value="item" id="1908" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="Player::defaultPlayParameter" id="1909" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::xbmc::PlayParameter" id="1910" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="1911" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_3" id="1912" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="1913" addr="0x7ff9f1f98750" >
-                            <attributelist id="1914" addr="0x7ff9f1f98750" >
-                                <attribute name="name" value="play" id="1915" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="1916" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="1917" addr="0x7ff9f1f95550" />
-                                <attribute name="sym_previousSibling" value="0x7ff9f1f98650" id="1918" addr="0x7ff9f1f98650" />
-                                <attribute name="kind" value="function" id="1919" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="play" id="1920" addr="0x7ff9f1fba9d0" />
-                                <attribute name="defaultargs" value="0x7ff9f1f97f30" id="1921" addr="0x7ff9f1f97f30" />
-                                <attribute name="decl" value="f()." id="1922" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="1923" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overloaded" value="0x7ff9f1f97f30" id="1924" addr="0x7ff9f1f97f30" />
-                                <attribute name="type" value="void" id="1925" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_4" id="1926" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="1927" addr="0x7ff9f1f98930" >
-                            <attributelist id="1928" addr="0x7ff9f1f98930" >
-                                <attribute name="ismember" value="1" id="1929" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="stop" id="1930" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="stop" id="1931" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="1932" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="1933" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="1934" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="void" id="1935" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="1936" addr="0x7ff9f1f95550" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="1937" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="1938" addr="0x7ff9f1f98af0" >
-                            <attributelist id="1939" addr="0x7ff9f1f98af0" >
-                                <attribute name="ismember" value="1" id="1940" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="pause" id="1941" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="pause" id="1942" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="1943" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="1944" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="1945" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="void" id="1946" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="1947" addr="0x7ff9f1f95550" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="1948" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="1949" addr="0x7ff9f1f98cb0" >
-                            <attributelist id="1950" addr="0x7ff9f1f98cb0" >
-                                <attribute name="ismember" value="1" id="1951" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="playnext" id="1952" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="playnext" id="1953" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="1954" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="1955" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="1956" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="void" id="1957" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="1958" addr="0x7ff9f1f95550" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="1959" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="1960" addr="0x7ff9f1f98e70" >
-                            <attributelist id="1961" addr="0x7ff9f1f98e70" >
-                                <attribute name="ismember" value="1" id="1962" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="playprevious" id="1963" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="playprevious" id="1964" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="1965" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="1966" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="1967" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="void" id="1968" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="1969" addr="0x7ff9f1f95550" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="1970" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="1971" addr="0x7ff9f1f99150" >
-                            <attributelist id="1972" addr="0x7ff9f1f99150" >
-                                <attribute name="name" value="playselected" id="1973" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="1974" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="1975" addr="0x7ff9f1f95550" />
-                                <attribute name="kind" value="function" id="1976" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="playselected" id="1977" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(int)." id="1978" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="1979" addr="0x7ff9f1fba9d0" />
-                                <parmlist id="1980" addr="0x7ff9f1f99090" >
+                                <attribute name="type" value="void" id="1911" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_3" id="1912" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="1913" addr="0x7fdf084ef750" >
+                            <attributelist id="1914" addr="0x7fdf084ef750" >
+                                <attribute name="name" value="play" id="1915" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="1916" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="1917" addr="0x7fdf084ec550" />
+                                <attribute name="sym_previousSibling" value="0x7fdf084ef650" id="1918" addr="0x7fdf084ef650" />
+                                <attribute name="kind" value="function" id="1919" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="play" id="1920" addr="0x7fdf085119d0" />
+                                <attribute name="defaultargs" value="0x7fdf084eef30" id="1921" addr="0x7fdf084eef30" />
+                                <attribute name="decl" value="f()." id="1922" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="1923" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overloaded" value="0x7fdf084eef30" id="1924" addr="0x7fdf084eef30" />
+                                <attribute name="type" value="void" id="1925" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_4" id="1926" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="1927" addr="0x7fdf084ef930" >
+                            <attributelist id="1928" addr="0x7fdf084ef930" >
+                                <attribute name="ismember" value="1" id="1929" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="stop" id="1930" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="stop" id="1931" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="1932" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="1933" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="1934" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="void" id="1935" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="1936" addr="0x7fdf084ec550" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="1937" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="1938" addr="0x7fdf084efaf0" >
+                            <attributelist id="1939" addr="0x7fdf084efaf0" >
+                                <attribute name="ismember" value="1" id="1940" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="pause" id="1941" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="pause" id="1942" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="1943" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="1944" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="1945" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="void" id="1946" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="1947" addr="0x7fdf084ec550" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="1948" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="1949" addr="0x7fdf084efcb0" >
+                            <attributelist id="1950" addr="0x7fdf084efcb0" >
+                                <attribute name="ismember" value="1" id="1951" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="playnext" id="1952" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="playnext" id="1953" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="1954" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="1955" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="1956" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="void" id="1957" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="1958" addr="0x7fdf084ec550" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="1959" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="1960" addr="0x7fdf084efe70" >
+                            <attributelist id="1961" addr="0x7fdf084efe70" >
+                                <attribute name="ismember" value="1" id="1962" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="playprevious" id="1963" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="playprevious" id="1964" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="1965" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="1966" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="1967" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="void" id="1968" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="1969" addr="0x7fdf084ec550" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="1970" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="1971" addr="0x7fdf084f0150" >
+                            <attributelist id="1972" addr="0x7fdf084f0150" >
+                                <attribute name="name" value="playselected" id="1973" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="1974" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="1975" addr="0x7fdf084ec550" />
+                                <attribute name="kind" value="function" id="1976" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="playselected" id="1977" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(int)." id="1978" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="1979" addr="0x7fdf085119d0" />
+                                <parmlist id="1980" addr="0x7fdf084f0090" >
                                     <parm id="1981">
-                                        <attributelist id="1982" addr="0x7ff9f1f99090" >
-                                            <attribute name="name" value="selected" id="1983" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="int" id="1984" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="1982" addr="0x7fdf084f0090" >
+                                            <attribute name="name" value="selected" id="1983" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="int" id="1984" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="1985" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="1986" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="1987" addr="0x7ff9f1f99310" >
-                            <attributelist id="1988" addr="0x7ff9f1f99310" >
-                                <attribute name="name" value="onPlayBackStarted" id="1989" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="1990" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="1991" addr="0x7ff9f1f95550" />
-                                <attribute name="kind" value="function" id="1992" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="onPlayBackStarted" id="1993" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="1994" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="1995" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="void" id="1996" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="1997" addr="0x7ff9f1fba9d0" />
-                                <attribute name="storage" value="virtual" id="1998" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="1999" addr="0x7ff9f1f994f0" >
-                            <attributelist id="2000" addr="0x7ff9f1f994f0" >
-                                <attribute name="name" value="onAVStarted" id="2001" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="2002" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="2003" addr="0x7ff9f1f95550" />
-                                <attribute name="kind" value="function" id="2004" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="onAVStarted" id="2005" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="2006" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2007" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="void" id="2008" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2009" addr="0x7ff9f1fba9d0" />
-                                <attribute name="storage" value="virtual" id="2010" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="2011" addr="0x7ff9f1f996d0" >
-                            <attributelist id="2012" addr="0x7ff9f1f996d0" >
-                                <attribute name="name" value="onAVChange" id="2013" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="2014" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="2015" addr="0x7ff9f1f95550" />
-                                <attribute name="kind" value="function" id="2016" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="onAVChange" id="2017" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="2018" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2019" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="void" id="2020" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2021" addr="0x7ff9f1fba9d0" />
-                                <attribute name="storage" value="virtual" id="2022" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="2023" addr="0x7ff9f1f998b0" >
-                            <attributelist id="2024" addr="0x7ff9f1f998b0" >
-                                <attribute name="name" value="onPlayBackEnded" id="2025" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="2026" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="2027" addr="0x7ff9f1f95550" />
-                                <attribute name="kind" value="function" id="2028" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="onPlayBackEnded" id="2029" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="2030" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2031" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="void" id="2032" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2033" addr="0x7ff9f1fba9d0" />
-                                <attribute name="storage" value="virtual" id="2034" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="2035" addr="0x7ff9f1f99a90" >
-                            <attributelist id="2036" addr="0x7ff9f1f99a90" >
-                                <attribute name="name" value="onPlayBackStopped" id="2037" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="2038" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="2039" addr="0x7ff9f1f95550" />
-                                <attribute name="kind" value="function" id="2040" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="onPlayBackStopped" id="2041" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="2042" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2043" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="void" id="2044" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2045" addr="0x7ff9f1fba9d0" />
-                                <attribute name="storage" value="virtual" id="2046" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="2047" addr="0x7ff9f1f99c70" >
-                            <attributelist id="2048" addr="0x7ff9f1f99c70" >
-                                <attribute name="name" value="onPlayBackError" id="2049" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="2050" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="2051" addr="0x7ff9f1f95550" />
-                                <attribute name="kind" value="function" id="2052" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="onPlayBackError" id="2053" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="2054" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2055" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="void" id="2056" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2057" addr="0x7ff9f1fba9d0" />
-                                <attribute name="storage" value="virtual" id="2058" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="2059" addr="0x7ff9f1f99e50" >
-                            <attributelist id="2060" addr="0x7ff9f1f99e50" >
-                                <attribute name="name" value="onPlayBackPaused" id="2061" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="2062" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="2063" addr="0x7ff9f1f95550" />
-                                <attribute name="kind" value="function" id="2064" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="onPlayBackPaused" id="2065" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="2066" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2067" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="void" id="2068" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2069" addr="0x7ff9f1fba9d0" />
-                                <attribute name="storage" value="virtual" id="2070" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="2071" addr="0x7ff9f1f9a030" >
-                            <attributelist id="2072" addr="0x7ff9f1f9a030" >
-                                <attribute name="name" value="onPlayBackResumed" id="2073" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="2074" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="2075" addr="0x7ff9f1f95550" />
-                                <attribute name="kind" value="function" id="2076" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="onPlayBackResumed" id="2077" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="2078" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2079" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="void" id="2080" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2081" addr="0x7ff9f1fba9d0" />
-                                <attribute name="storage" value="virtual" id="2082" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="2083" addr="0x7ff9f1f9a210" >
-                            <attributelist id="2084" addr="0x7ff9f1f9a210" >
-                                <attribute name="name" value="onQueueNextItem" id="2085" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="2086" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="2087" addr="0x7ff9f1f95550" />
-                                <attribute name="kind" value="function" id="2088" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="onQueueNextItem" id="2089" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="2090" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2091" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="void" id="2092" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2093" addr="0x7ff9f1fba9d0" />
-                                <attribute name="storage" value="virtual" id="2094" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="2095" addr="0x7ff9f1f9a510" >
-                            <attributelist id="2096" addr="0x7ff9f1f9a510" >
-                                <attribute name="name" value="onPlayBackSpeedChanged" id="2097" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="2098" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="2099" addr="0x7ff9f1f95550" />
-                                <attribute name="kind" value="function" id="2100" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="onPlayBackSpeedChanged" id="2101" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(int)." id="2102" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2103" addr="0x7ff9f1fba9d0" />
-                                <parmlist id="2104" addr="0x7ff9f1f9a450" >
+                                <attribute name="type" value="void" id="1985" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="1986" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="1987" addr="0x7fdf084f0310" >
+                            <attributelist id="1988" addr="0x7fdf084f0310" >
+                                <attribute name="name" value="onPlayBackStarted" id="1989" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="1990" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="1991" addr="0x7fdf084ec550" />
+                                <attribute name="kind" value="function" id="1992" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="onPlayBackStarted" id="1993" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="1994" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="1995" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="void" id="1996" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="1997" addr="0x7fdf085119d0" />
+                                <attribute name="storage" value="virtual" id="1998" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="1999" addr="0x7fdf084f04f0" >
+                            <attributelist id="2000" addr="0x7fdf084f04f0" >
+                                <attribute name="name" value="onAVStarted" id="2001" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="2002" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="2003" addr="0x7fdf084ec550" />
+                                <attribute name="kind" value="function" id="2004" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="onAVStarted" id="2005" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="2006" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2007" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="void" id="2008" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2009" addr="0x7fdf085119d0" />
+                                <attribute name="storage" value="virtual" id="2010" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="2011" addr="0x7fdf084f06d0" >
+                            <attributelist id="2012" addr="0x7fdf084f06d0" >
+                                <attribute name="name" value="onAVChange" id="2013" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="2014" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="2015" addr="0x7fdf084ec550" />
+                                <attribute name="kind" value="function" id="2016" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="onAVChange" id="2017" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="2018" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2019" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="void" id="2020" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2021" addr="0x7fdf085119d0" />
+                                <attribute name="storage" value="virtual" id="2022" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="2023" addr="0x7fdf084f08b0" >
+                            <attributelist id="2024" addr="0x7fdf084f08b0" >
+                                <attribute name="name" value="onPlayBackEnded" id="2025" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="2026" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="2027" addr="0x7fdf084ec550" />
+                                <attribute name="kind" value="function" id="2028" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="onPlayBackEnded" id="2029" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="2030" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2031" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="void" id="2032" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2033" addr="0x7fdf085119d0" />
+                                <attribute name="storage" value="virtual" id="2034" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="2035" addr="0x7fdf084f0a90" >
+                            <attributelist id="2036" addr="0x7fdf084f0a90" >
+                                <attribute name="name" value="onPlayBackStopped" id="2037" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="2038" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="2039" addr="0x7fdf084ec550" />
+                                <attribute name="kind" value="function" id="2040" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="onPlayBackStopped" id="2041" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="2042" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2043" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="void" id="2044" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2045" addr="0x7fdf085119d0" />
+                                <attribute name="storage" value="virtual" id="2046" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="2047" addr="0x7fdf084f0c70" >
+                            <attributelist id="2048" addr="0x7fdf084f0c70" >
+                                <attribute name="name" value="onPlayBackError" id="2049" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="2050" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="2051" addr="0x7fdf084ec550" />
+                                <attribute name="kind" value="function" id="2052" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="onPlayBackError" id="2053" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="2054" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2055" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="void" id="2056" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2057" addr="0x7fdf085119d0" />
+                                <attribute name="storage" value="virtual" id="2058" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="2059" addr="0x7fdf084f0e50" >
+                            <attributelist id="2060" addr="0x7fdf084f0e50" >
+                                <attribute name="name" value="onPlayBackPaused" id="2061" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="2062" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="2063" addr="0x7fdf084ec550" />
+                                <attribute name="kind" value="function" id="2064" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="onPlayBackPaused" id="2065" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="2066" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2067" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="void" id="2068" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2069" addr="0x7fdf085119d0" />
+                                <attribute name="storage" value="virtual" id="2070" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="2071" addr="0x7fdf084f1030" >
+                            <attributelist id="2072" addr="0x7fdf084f1030" >
+                                <attribute name="name" value="onPlayBackResumed" id="2073" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="2074" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="2075" addr="0x7fdf084ec550" />
+                                <attribute name="kind" value="function" id="2076" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="onPlayBackResumed" id="2077" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="2078" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2079" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="void" id="2080" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2081" addr="0x7fdf085119d0" />
+                                <attribute name="storage" value="virtual" id="2082" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="2083" addr="0x7fdf084f1210" >
+                            <attributelist id="2084" addr="0x7fdf084f1210" >
+                                <attribute name="name" value="onQueueNextItem" id="2085" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="2086" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="2087" addr="0x7fdf084ec550" />
+                                <attribute name="kind" value="function" id="2088" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="onQueueNextItem" id="2089" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="2090" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2091" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="void" id="2092" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2093" addr="0x7fdf085119d0" />
+                                <attribute name="storage" value="virtual" id="2094" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="2095" addr="0x7fdf084f1510" >
+                            <attributelist id="2096" addr="0x7fdf084f1510" >
+                                <attribute name="name" value="onPlayBackSpeedChanged" id="2097" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="2098" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="2099" addr="0x7fdf084ec550" />
+                                <attribute name="kind" value="function" id="2100" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="onPlayBackSpeedChanged" id="2101" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(int)." id="2102" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2103" addr="0x7fdf085119d0" />
+                                <parmlist id="2104" addr="0x7fdf084f1450" >
                                     <parm id="2105">
-                                        <attributelist id="2106" addr="0x7ff9f1f9a450" >
-                                            <attribute name="name" value="speed" id="2107" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="int" id="2108" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="2106" addr="0x7fdf084f1450" >
+                                            <attribute name="name" value="speed" id="2107" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="int" id="2108" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="2109" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2110" addr="0x7ff9f1fba9d0" />
-                                <attribute name="storage" value="virtual" id="2111" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="2112" addr="0x7ff9f1f9a930" >
-                            <attributelist id="2113" addr="0x7ff9f1f9a930" >
-                                <attribute name="name" value="onPlayBackSeek" id="2114" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="2115" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="2116" addr="0x7ff9f1f95550" />
-                                <attribute name="kind" value="function" id="2117" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="onPlayBackSeek" id="2118" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(int,int)." id="2119" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2120" addr="0x7ff9f1fba9d0" />
-                                <parmlist id="2121" addr="0x7ff9f1f9a750" >
+                                <attribute name="type" value="void" id="2109" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2110" addr="0x7fdf085119d0" />
+                                <attribute name="storage" value="virtual" id="2111" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="2112" addr="0x7fdf084f1930" >
+                            <attributelist id="2113" addr="0x7fdf084f1930" >
+                                <attribute name="name" value="onPlayBackSeek" id="2114" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="2115" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="2116" addr="0x7fdf084ec550" />
+                                <attribute name="kind" value="function" id="2117" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="onPlayBackSeek" id="2118" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(int,int)." id="2119" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2120" addr="0x7fdf085119d0" />
+                                <parmlist id="2121" addr="0x7fdf084f1750" >
                                     <parm id="2122">
-                                        <attributelist id="2123" addr="0x7ff9f1f9a750" >
-                                            <attribute name="name" value="time" id="2124" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="int" id="2125" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="2123" addr="0x7fdf084f1750" >
+                                            <attribute name="name" value="time" id="2124" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="int" id="2125" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                     <parm id="2126">
-                                        <attributelist id="2127" addr="0x7ff9f1f9a870" >
-                                            <attribute name="name" value="seekOffset" id="2128" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="int" id="2129" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="2127" addr="0x7fdf084f1870" >
+                                            <attribute name="name" value="seekOffset" id="2128" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="int" id="2129" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="2130" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2131" addr="0x7ff9f1fba9d0" />
-                                <attribute name="storage" value="virtual" id="2132" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="2133" addr="0x7ff9f1f9ac30" >
-                            <attributelist id="2134" addr="0x7ff9f1f9ac30" >
-                                <attribute name="name" value="onPlayBackSeekChapter" id="2135" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="2136" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="2137" addr="0x7ff9f1f95550" />
-                                <attribute name="kind" value="function" id="2138" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="onPlayBackSeekChapter" id="2139" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(int)." id="2140" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2141" addr="0x7ff9f1fba9d0" />
-                                <parmlist id="2142" addr="0x7ff9f1f9ab70" >
+                                <attribute name="type" value="void" id="2130" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2131" addr="0x7fdf085119d0" />
+                                <attribute name="storage" value="virtual" id="2132" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="2133" addr="0x7fdf084f1c30" >
+                            <attributelist id="2134" addr="0x7fdf084f1c30" >
+                                <attribute name="name" value="onPlayBackSeekChapter" id="2135" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="2136" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="2137" addr="0x7fdf084ec550" />
+                                <attribute name="kind" value="function" id="2138" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="onPlayBackSeekChapter" id="2139" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(int)." id="2140" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2141" addr="0x7fdf085119d0" />
+                                <parmlist id="2142" addr="0x7fdf084f1b70" >
                                     <parm id="2143">
-                                        <attributelist id="2144" addr="0x7ff9f1f9ab70" >
-                                            <attribute name="name" value="chapter" id="2145" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="int" id="2146" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="2144" addr="0x7fdf084f1b70" >
+                                            <attribute name="name" value="chapter" id="2145" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="int" id="2146" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="2147" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2148" addr="0x7ff9f1fba9d0" />
-                                <attribute name="storage" value="virtual" id="2149" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="2150" addr="0x7ff9f1f9ae10" >
-                            <attributelist id="2151" addr="0x7ff9f1f9ae10" >
-                                <attribute name="ismember" value="1" id="2152" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="isPlaying" id="2153" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="isPlaying" id="2154" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="2155" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2156" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="2157" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="bool" id="2158" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="2159" addr="0x7ff9f1f95550" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2160" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="2161" addr="0x7ff9f1f9afd0" >
-                            <attributelist id="2162" addr="0x7ff9f1f9afd0" >
-                                <attribute name="ismember" value="1" id="2163" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="isPlayingAudio" id="2164" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="isPlayingAudio" id="2165" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="2166" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2167" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="2168" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="bool" id="2169" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="2170" addr="0x7ff9f1f95550" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2171" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="2172" addr="0x7ff9f1f9b190" >
-                            <attributelist id="2173" addr="0x7ff9f1f9b190" >
-                                <attribute name="ismember" value="1" id="2174" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="isPlayingVideo" id="2175" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="isPlayingVideo" id="2176" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="2177" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2178" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="2179" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="bool" id="2180" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="2181" addr="0x7ff9f1f95550" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2182" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="2183" addr="0x7ff9f1f9b350" >
-                            <attributelist id="2184" addr="0x7ff9f1f9b350" >
-                                <attribute name="ismember" value="1" id="2185" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="isPlayingRDS" id="2186" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="isPlayingRDS" id="2187" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="2188" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2189" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="2190" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="bool" id="2191" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="2192" addr="0x7ff9f1f95550" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2193" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="2194" addr="0x7ff9f1f9b510" >
-                            <attributelist id="2195" addr="0x7ff9f1f9b510" >
-                                <attribute name="ismember" value="1" id="2196" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="isExternalPlayer" id="2197" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="isExternalPlayer" id="2198" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="2199" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2200" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="2201" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="bool" id="2202" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="2203" addr="0x7ff9f1f95550" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2204" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="2205" addr="0x7ff9f1f9b6f0" >
-                            <attributelist id="2206" addr="0x7ff9f1f9b6f0" >
-                                <attribute name="ismember" value="1" id="2207" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getPlayingFile" id="2208" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getPlayingFile" id="2209" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="2210" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2211" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="2212" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="2213" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="2214" addr="0x7ff9f1f95550" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2215" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="2216" addr="0x7ff9f1f9b8d0" >
-                            <attributelist id="2217" addr="0x7ff9f1f9b8d0" >
-                                <attribute name="ismember" value="1" id="2218" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getTime" id="2219" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getTime" id="2220" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="2221" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2222" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="2223" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="double" id="2224" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="2225" addr="0x7ff9f1f95550" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2226" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="2227" addr="0x7ff9f1f9bbb0" >
-                            <attributelist id="2228" addr="0x7ff9f1f9bbb0" >
-                                <attribute name="name" value="seekTime" id="2229" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="2230" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="2231" addr="0x7ff9f1f95550" />
-                                <attribute name="kind" value="function" id="2232" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="seekTime" id="2233" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(double)." id="2234" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2235" addr="0x7ff9f1fba9d0" />
-                                <parmlist id="2236" addr="0x7ff9f1f9baf0" >
+                                <attribute name="type" value="void" id="2147" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2148" addr="0x7fdf085119d0" />
+                                <attribute name="storage" value="virtual" id="2149" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="2150" addr="0x7fdf084f1e10" >
+                            <attributelist id="2151" addr="0x7fdf084f1e10" >
+                                <attribute name="ismember" value="1" id="2152" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="isPlaying" id="2153" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="isPlaying" id="2154" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="2155" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2156" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="2157" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="bool" id="2158" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="2159" addr="0x7fdf084ec550" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2160" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="2161" addr="0x7fdf084f1fd0" >
+                            <attributelist id="2162" addr="0x7fdf084f1fd0" >
+                                <attribute name="ismember" value="1" id="2163" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="isPlayingAudio" id="2164" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="isPlayingAudio" id="2165" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="2166" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2167" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="2168" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="bool" id="2169" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="2170" addr="0x7fdf084ec550" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2171" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="2172" addr="0x7fdf084f2190" >
+                            <attributelist id="2173" addr="0x7fdf084f2190" >
+                                <attribute name="ismember" value="1" id="2174" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="isPlayingVideo" id="2175" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="isPlayingVideo" id="2176" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="2177" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2178" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="2179" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="bool" id="2180" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="2181" addr="0x7fdf084ec550" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2182" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="2183" addr="0x7fdf084f2350" >
+                            <attributelist id="2184" addr="0x7fdf084f2350" >
+                                <attribute name="ismember" value="1" id="2185" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="isPlayingRDS" id="2186" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="isPlayingRDS" id="2187" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="2188" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2189" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="2190" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="bool" id="2191" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="2192" addr="0x7fdf084ec550" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2193" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="2194" addr="0x7fdf084f2510" >
+                            <attributelist id="2195" addr="0x7fdf084f2510" >
+                                <attribute name="ismember" value="1" id="2196" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="isExternalPlayer" id="2197" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="isExternalPlayer" id="2198" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="2199" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2200" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="2201" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="bool" id="2202" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="2203" addr="0x7fdf084ec550" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2204" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="2205" addr="0x7fdf084f26f0" >
+                            <attributelist id="2206" addr="0x7fdf084f26f0" >
+                                <attribute name="ismember" value="1" id="2207" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getPlayingFile" id="2208" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getPlayingFile" id="2209" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="2210" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2211" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="2212" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="2213" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="2214" addr="0x7fdf084ec550" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2215" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="2216" addr="0x7fdf084f28d0" >
+                            <attributelist id="2217" addr="0x7fdf084f28d0" >
+                                <attribute name="ismember" value="1" id="2218" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getTime" id="2219" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getTime" id="2220" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="2221" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2222" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="2223" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="double" id="2224" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="2225" addr="0x7fdf084ec550" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2226" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="2227" addr="0x7fdf084f2bb0" >
+                            <attributelist id="2228" addr="0x7fdf084f2bb0" >
+                                <attribute name="name" value="seekTime" id="2229" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="2230" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="2231" addr="0x7fdf084ec550" />
+                                <attribute name="kind" value="function" id="2232" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="seekTime" id="2233" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(double)." id="2234" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2235" addr="0x7fdf085119d0" />
+                                <parmlist id="2236" addr="0x7fdf084f2af0" >
                                     <parm id="2237">
-                                        <attributelist id="2238" addr="0x7ff9f1f9baf0" >
-                                            <attribute name="name" value="seekTime" id="2239" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="double" id="2240" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="2238" addr="0x7fdf084f2af0" >
+                                            <attribute name="name" value="seekTime" id="2239" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="double" id="2240" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="2241" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2242" addr="0x7ff9f1fba9d0" />
+                                <attribute name="type" value="void" id="2241" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2242" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="2243" addr="0x7ff9f1f9beb0" >
-                            <attributelist id="2244" addr="0x7ff9f1f9beb0" >
-                                <attribute name="name" value="setSubtitles" id="2245" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="2246" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="2247" addr="0x7ff9f1f95550" />
-                                <attribute name="kind" value="function" id="2248" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="setSubtitles" id="2249" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(p.q(const).char)." id="2250" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2251" addr="0x7ff9f1fba9d0" />
-                                <parmlist id="2252" addr="0x7ff9f1f9bdf0" >
+                        <cdecl id="2243" addr="0x7fdf084f2eb0" >
+                            <attributelist id="2244" addr="0x7fdf084f2eb0" >
+                                <attribute name="name" value="setSubtitles" id="2245" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="2246" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="2247" addr="0x7fdf084ec550" />
+                                <attribute name="kind" value="function" id="2248" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="setSubtitles" id="2249" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(p.q(const).char)." id="2250" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2251" addr="0x7fdf085119d0" />
+                                <parmlist id="2252" addr="0x7fdf084f2df0" >
                                     <parm id="2253">
-                                        <attributelist id="2254" addr="0x7ff9f1f9bdf0" >
-                                            <attribute name="name" value="subtitleFile" id="2255" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="p.q(const).char" id="2256" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="2254" addr="0x7fdf084f2df0" >
+                                            <attribute name="name" value="subtitleFile" id="2255" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="p.q(const).char" id="2256" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="2257" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2258" addr="0x7ff9f1fba9d0" />
+                                <attribute name="type" value="void" id="2257" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2258" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="2259" addr="0x7ff9f1f9c170" >
-                            <attributelist id="2260" addr="0x7ff9f1f9c170" >
-                                <attribute name="name" value="showSubtitles" id="2261" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="2262" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="2263" addr="0x7ff9f1f95550" />
-                                <attribute name="kind" value="function" id="2264" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="showSubtitles" id="2265" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(bool)." id="2266" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2267" addr="0x7ff9f1fba9d0" />
-                                <parmlist id="2268" addr="0x7ff9f1f9c0b0" >
+                        <cdecl id="2259" addr="0x7fdf084f3170" >
+                            <attributelist id="2260" addr="0x7fdf084f3170" >
+                                <attribute name="name" value="showSubtitles" id="2261" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="2262" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="2263" addr="0x7fdf084ec550" />
+                                <attribute name="kind" value="function" id="2264" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="showSubtitles" id="2265" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(bool)." id="2266" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2267" addr="0x7fdf085119d0" />
+                                <parmlist id="2268" addr="0x7fdf084f30b0" >
                                     <parm id="2269">
-                                        <attributelist id="2270" addr="0x7ff9f1f9c0b0" >
-                                            <attribute name="name" value="bVisible" id="2271" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="bool" id="2272" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="2270" addr="0x7fdf084f30b0" >
+                                            <attribute name="name" value="bVisible" id="2271" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="bool" id="2272" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="2273" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2274" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="2275" addr="0x7ff9f1f9c350" >
-                            <attributelist id="2276" addr="0x7ff9f1f9c350" >
-                                <attribute name="ismember" value="1" id="2277" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getSubtitles" id="2278" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getSubtitles" id="2279" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="2280" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2281" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="2282" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="2283" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="2284" addr="0x7ff9f1f95550" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2285" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="2286" addr="0x7ff9f1f9c610" >
-                            <attributelist id="2287" addr="0x7ff9f1f9c610" >
-                                <attribute name="ismember" value="1" id="2288" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getAvailableSubtitleStreams" id="2289" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getAvailableSubtitleStreams" id="2290" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="2291" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2292" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="2293" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="std::vector&lt;(XBMCAddon::String)>" id="2294" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="2295" addr="0x7ff9f1f95550" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2296" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="2297" addr="0x7ff9f1f9c8f0" >
-                            <attributelist id="2298" addr="0x7ff9f1f9c8f0" >
-                                <attribute name="name" value="setSubtitleStream" id="2299" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="2300" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="2301" addr="0x7ff9f1f95550" />
-                                <attribute name="kind" value="function" id="2302" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="setSubtitleStream" id="2303" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(int)." id="2304" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2305" addr="0x7ff9f1fba9d0" />
-                                <parmlist id="2306" addr="0x7ff9f1f9c830" >
+                                <attribute name="type" value="void" id="2273" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2274" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="2275" addr="0x7fdf084f3350" >
+                            <attributelist id="2276" addr="0x7fdf084f3350" >
+                                <attribute name="ismember" value="1" id="2277" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getSubtitles" id="2278" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getSubtitles" id="2279" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="2280" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2281" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="2282" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="2283" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="2284" addr="0x7fdf084ec550" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2285" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="2286" addr="0x7fdf084f3610" >
+                            <attributelist id="2287" addr="0x7fdf084f3610" >
+                                <attribute name="ismember" value="1" id="2288" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getAvailableSubtitleStreams" id="2289" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getAvailableSubtitleStreams" id="2290" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="2291" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2292" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="2293" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="std::vector&lt;(XBMCAddon::String)>" id="2294" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="2295" addr="0x7fdf084ec550" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2296" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="2297" addr="0x7fdf084f38f0" >
+                            <attributelist id="2298" addr="0x7fdf084f38f0" >
+                                <attribute name="name" value="setSubtitleStream" id="2299" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="2300" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="2301" addr="0x7fdf084ec550" />
+                                <attribute name="kind" value="function" id="2302" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="setSubtitleStream" id="2303" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(int)." id="2304" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2305" addr="0x7fdf085119d0" />
+                                <parmlist id="2306" addr="0x7fdf084f3830" >
                                     <parm id="2307">
-                                        <attributelist id="2308" addr="0x7ff9f1f9c830" >
-                                            <attribute name="name" value="iStream" id="2309" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="int" id="2310" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="2308" addr="0x7fdf084f3830" >
+                                            <attribute name="name" value="iStream" id="2309" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="int" id="2310" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="2311" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2312" addr="0x7ff9f1fba9d0" />
+                                <attribute name="type" value="void" id="2311" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2312" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="2313" addr="0x7ff9f1f9cc30" >
-                            <attributelist id="2314" addr="0x7ff9f1f9cc30" >
-                                <attribute name="name" value="updateInfoTag" id="2315" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="2316" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="2317" addr="0x7ff9f1f95550" />
-                                <attribute name="kind" value="function" id="2318" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="updateInfoTag" id="2319" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(p.q(const).XBMCAddon::xbmcgui::ListItem)." id="2320" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2321" addr="0x7ff9f1fba9d0" />
-                                <parmlist id="2322" addr="0x7ff9f1f9cb70" >
+                        <cdecl id="2313" addr="0x7fdf084f3c30" >
+                            <attributelist id="2314" addr="0x7fdf084f3c30" >
+                                <attribute name="name" value="updateInfoTag" id="2315" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="2316" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="2317" addr="0x7fdf084ec550" />
+                                <attribute name="kind" value="function" id="2318" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="updateInfoTag" id="2319" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(p.q(const).XBMCAddon::xbmcgui::ListItem)." id="2320" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2321" addr="0x7fdf085119d0" />
+                                <parmlist id="2322" addr="0x7fdf084f3b70" >
                                     <parm id="2323">
-                                        <attributelist id="2324" addr="0x7ff9f1f9cb70" >
-                                            <attribute name="name" value="item" id="2325" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::ListItem" id="2326" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="2324" addr="0x7fdf084f3b70" >
+                                            <attribute name="name" value="item" id="2325" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::ListItem" id="2326" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="2327" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2328" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="2329" addr="0x7ff9f1f9ce50" >
-                            <attributelist id="2330" addr="0x7ff9f1f9ce50" >
-                                <attribute name="ismember" value="1" id="2331" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getVideoInfoTag" id="2332" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getVideoInfoTag" id="2333" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f().p." id="2334" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2335" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="2336" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="InfoTagVideo" id="2337" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="2338" addr="0x7ff9f1f95550" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2339" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="2340" addr="0x7ff9f1f9d030" >
-                            <attributelist id="2341" addr="0x7ff9f1f9d030" >
-                                <attribute name="ismember" value="1" id="2342" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getMusicInfoTag" id="2343" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getMusicInfoTag" id="2344" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f().p." id="2345" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2346" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="2347" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="InfoTagMusic" id="2348" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="2349" addr="0x7ff9f1f95550" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2350" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="2351" addr="0x7ff9f1f9d210" >
-                            <attributelist id="2352" addr="0x7ff9f1f9d210" >
-                                <attribute name="ismember" value="1" id="2353" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getRadioRDSInfoTag" id="2354" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getRadioRDSInfoTag" id="2355" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f().p." id="2356" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2357" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="2358" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="InfoTagRadioRDS" id="2359" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="2360" addr="0x7ff9f1f95550" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2361" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="2362" addr="0x7ff9f1f9d410" >
-                            <attributelist id="2363" addr="0x7ff9f1f9d410" >
-                                <attribute name="ismember" value="1" id="2364" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getTotalTime" id="2365" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getTotalTime" id="2366" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="2367" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2368" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="2369" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="double" id="2370" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="2371" addr="0x7ff9f1f95550" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2372" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="2373" addr="0x7ff9f1f9d6d0" >
-                            <attributelist id="2374" addr="0x7ff9f1f9d6d0" >
-                                <attribute name="ismember" value="1" id="2375" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getAvailableAudioStreams" id="2376" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getAvailableAudioStreams" id="2377" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="2378" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2379" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="2380" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="std::vector&lt;(XBMCAddon::String)>" id="2381" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="2382" addr="0x7ff9f1f95550" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2383" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="2384" addr="0x7ff9f1f9d9b0" >
-                            <attributelist id="2385" addr="0x7ff9f1f9d9b0" >
-                                <attribute name="name" value="setAudioStream" id="2386" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="2387" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="2388" addr="0x7ff9f1f95550" />
-                                <attribute name="kind" value="function" id="2389" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="setAudioStream" id="2390" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(int)." id="2391" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2392" addr="0x7ff9f1fba9d0" />
-                                <parmlist id="2393" addr="0x7ff9f1f9d8f0" >
+                                <attribute name="type" value="void" id="2327" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2328" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="2329" addr="0x7fdf084f3e50" >
+                            <attributelist id="2330" addr="0x7fdf084f3e50" >
+                                <attribute name="ismember" value="1" id="2331" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getVideoInfoTag" id="2332" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getVideoInfoTag" id="2333" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f().p." id="2334" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2335" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="2336" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="InfoTagVideo" id="2337" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="2338" addr="0x7fdf084ec550" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2339" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="2340" addr="0x7fdf084f4030" >
+                            <attributelist id="2341" addr="0x7fdf084f4030" >
+                                <attribute name="ismember" value="1" id="2342" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getMusicInfoTag" id="2343" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getMusicInfoTag" id="2344" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f().p." id="2345" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2346" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="2347" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="InfoTagMusic" id="2348" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="2349" addr="0x7fdf084ec550" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2350" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="2351" addr="0x7fdf084f4210" >
+                            <attributelist id="2352" addr="0x7fdf084f4210" >
+                                <attribute name="ismember" value="1" id="2353" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getRadioRDSInfoTag" id="2354" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getRadioRDSInfoTag" id="2355" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f().p." id="2356" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2357" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="2358" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="InfoTagRadioRDS" id="2359" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="2360" addr="0x7fdf084ec550" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2361" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="2362" addr="0x7fdf084f4410" >
+                            <attributelist id="2363" addr="0x7fdf084f4410" >
+                                <attribute name="ismember" value="1" id="2364" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getTotalTime" id="2365" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getTotalTime" id="2366" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="2367" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2368" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="2369" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="double" id="2370" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="2371" addr="0x7fdf084ec550" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2372" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="2373" addr="0x7fdf084f46d0" >
+                            <attributelist id="2374" addr="0x7fdf084f46d0" >
+                                <attribute name="ismember" value="1" id="2375" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getAvailableAudioStreams" id="2376" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getAvailableAudioStreams" id="2377" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="2378" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2379" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="2380" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="std::vector&lt;(XBMCAddon::String)>" id="2381" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="2382" addr="0x7fdf084ec550" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2383" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="2384" addr="0x7fdf084f49b0" >
+                            <attributelist id="2385" addr="0x7fdf084f49b0" >
+                                <attribute name="name" value="setAudioStream" id="2386" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="2387" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="2388" addr="0x7fdf084ec550" />
+                                <attribute name="kind" value="function" id="2389" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="setAudioStream" id="2390" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(int)." id="2391" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2392" addr="0x7fdf085119d0" />
+                                <parmlist id="2393" addr="0x7fdf084f48f0" >
                                     <parm id="2394">
-                                        <attributelist id="2395" addr="0x7ff9f1f9d8f0" >
-                                            <attribute name="name" value="iStream" id="2396" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="int" id="2397" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="2395" addr="0x7fdf084f48f0" >
+                                            <attribute name="name" value="iStream" id="2396" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="int" id="2397" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="2398" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2399" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="2400" addr="0x7ff9f1f9dc70" >
-                            <attributelist id="2401" addr="0x7ff9f1f9dc70" >
-                                <attribute name="ismember" value="1" id="2402" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getAvailableVideoStreams" id="2403" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getAvailableVideoStreams" id="2404" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="2405" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2406" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="2407" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="std::vector&lt;(XBMCAddon::String)>" id="2408" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="2409" addr="0x7ff9f1f95550" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2410" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="2411" addr="0x7ff9f1f9df50" >
-                            <attributelist id="2412" addr="0x7ff9f1f9df50" >
-                                <attribute name="name" value="setVideoStream" id="2413" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="2414" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f95550" id="2415" addr="0x7ff9f1f95550" />
-                                <attribute name="kind" value="function" id="2416" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="setVideoStream" id="2417" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(int)." id="2418" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2419" addr="0x7ff9f1fba9d0" />
-                                <parmlist id="2420" addr="0x7ff9f1f9de90" >
+                                <attribute name="type" value="void" id="2398" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2399" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="2400" addr="0x7fdf084f4c70" >
+                            <attributelist id="2401" addr="0x7fdf084f4c70" >
+                                <attribute name="ismember" value="1" id="2402" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getAvailableVideoStreams" id="2403" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getAvailableVideoStreams" id="2404" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="2405" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2406" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="2407" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="std::vector&lt;(XBMCAddon::String)>" id="2408" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="2409" addr="0x7fdf084ec550" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2410" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="2411" addr="0x7fdf084f4f50" >
+                            <attributelist id="2412" addr="0x7fdf084f4f50" >
+                                <attribute name="name" value="setVideoStream" id="2413" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="2414" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084ec550" id="2415" addr="0x7fdf084ec550" />
+                                <attribute name="kind" value="function" id="2416" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="setVideoStream" id="2417" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(int)." id="2418" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2419" addr="0x7fdf085119d0" />
+                                <parmlist id="2420" addr="0x7fdf084f4e90" >
                                     <parm id="2421">
-                                        <attributelist id="2422" addr="0x7ff9f1f9de90" >
-                                            <attribute name="name" value="iStream" id="2423" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="int" id="2424" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="2422" addr="0x7fdf084f4e90" >
+                                            <attribute name="name" value="iStream" id="2423" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="int" id="2424" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="2425" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2426" addr="0x7ff9f1fba9d0" />
+                                <attribute name="type" value="void" id="2425" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2426" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </cdecl >
-                        <access id="2427" addr="0x7ff9f1f9dff0" >
-                            <attributelist id="2428" addr="0x7ff9f1f9dff0" >
-                                <attribute name="kind" value="protected" id="2429" addr="0x7ff9f1fba9d0" />
+                        <access id="2427" addr="0x7fdf084f4ff0" >
+                            <attributelist id="2428" addr="0x7fdf084f4ff0" >
+                                <attribute name="kind" value="protected" id="2429" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </access >
-                        <access id="2430" addr="0x7ff9f1f9e110" >
-                            <attributelist id="2431" addr="0x7ff9f1f9e110" >
-                                <attribute name="kind" value="public" id="2432" addr="0x7ff9f1fba9d0" />
+                        <access id="2430" addr="0x7fdf084f5110" >
+                            <attributelist id="2431" addr="0x7fdf084f5110" >
+                                <attribute name="kind" value="public" id="2432" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </access >
@@ -3442,524 +3442,524 @@
                 </namespace >
             </namespace >
         </include >
-        <include id="2433" addr="0x7ff9f1f9e230" >
-            <attributelist id="2434" addr="0x7ff9f1f9e230" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/RenderCapture.h" id="2435" addr="0x7ff9f1fba9d0" />
+        <include id="2433" addr="0x7fdf084f5230" >
+            <attributelist id="2434" addr="0x7fdf084f5230" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/RenderCapture.h" id="2435" addr="0x7fdf085119d0" />
             </attributelist >
 
-            <namespace id="2436" addr="0x7ff9f1f9e2d0" >
-                <attributelist id="2437" addr="0x7ff9f1f9e2d0" >
-                    <attribute name="sym_name" value="XBMCAddon" id="2438" addr="0x7ff9f1fba9d0" />
-                    <attribute name="name" value="XBMCAddon" id="2439" addr="0x7ff9f1fba9d0" />
-                    <attribute name="sym_previousSibling" value="0x7ff9f1f949b0" id="2440" addr="0x7ff9f1f949b0" />
-                    <attribute name="csym_nextSibling" value="0x7ff9f1fa0450" id="2441" addr="0x7ff9f1fa0450" />
-                    <attribute name="sym_nextSibling" value="0x7ff9f1fa0450" id="2442" addr="0x7ff9f1fa0450" />
-                    <typescope id="2443" addr="0x7ff9f1fb4990" >
-                        <attributelist id="2444" addr="0x7ff9f1fb4990" >
-                            <attribute name="name" value="XBMCAddon" id="2445" addr="0x7ff9f1fba9d0" />
-                            <typetab id="2446" addr="0x7ff9f1fb49d0" >
-                                <attributelist id="2447" addr="0x7ff9f1fb49d0" >
-                                    <attribute name="String" value="std::string" id="2448" addr="0x7ff9f1fba9d0" />
+            <namespace id="2436" addr="0x7fdf084f52d0" >
+                <attributelist id="2437" addr="0x7fdf084f52d0" >
+                    <attribute name="sym_name" value="XBMCAddon" id="2438" addr="0x7fdf085119d0" />
+                    <attribute name="name" value="XBMCAddon" id="2439" addr="0x7fdf085119d0" />
+                    <attribute name="sym_previousSibling" value="0x7fdf084eb9b0" id="2440" addr="0x7fdf084eb9b0" />
+                    <attribute name="csym_nextSibling" value="0x7fdf084f7450" id="2441" addr="0x7fdf084f7450" />
+                    <attribute name="sym_nextSibling" value="0x7fdf084f7450" id="2442" addr="0x7fdf084f7450" />
+                    <typescope id="2443" addr="0x7fdf0850b990" >
+                        <attributelist id="2444" addr="0x7fdf0850b990" >
+                            <attribute name="name" value="XBMCAddon" id="2445" addr="0x7fdf085119d0" />
+                            <typetab id="2446" addr="0x7fdf0850b9d0" >
+                                <attributelist id="2447" addr="0x7fdf0850b9d0" >
+                                    <attribute name="String" value="std::string" id="2448" addr="0x7fdf085119d0" />
                                 </attributelist >
-                                <typetabsitem id="2449" addr="0x7ff9f1fb4bb0" >
-                                    <attributelist id="2450" addr="0x7ff9f1fb4bb0" >
+                                <typetabsitem id="2449" addr="0x7fdf0850bbb0" >
+                                    <attributelist id="2450" addr="0x7fdf0850bbb0" >
                                     </attributelist >
                                 </typetabsitem >
                             </typetab >
-                            <attribute name="parent" value="0x7ff9f1f72a30" id="2451" addr="0x7ff9f1f72a30" />
-                            <attribute name="qname" value="XBMCAddon" id="2452" addr="0x7ff9f1fba9d0" />
-                            <attribute name="symtab" value="0x7ff9f1f89bb0" id="2453" addr="0x7ff9f1f89bb0" />
+                            <attribute name="parent" value="0x7fdf084c9a30" id="2451" addr="0x7fdf084c9a30" />
+                            <attribute name="qname" value="XBMCAddon" id="2452" addr="0x7fdf085119d0" />
+                            <attribute name="symtab" value="0x7fdf084e0bb0" id="2453" addr="0x7fdf084e0bb0" />
                         </attributelist >
-                        <typescopesitem id="2454" addr="0x7ff9f1f89b70" >
-                            <attributelist id="2455" addr="0x7ff9f1f89b70" >
+                        <typescopesitem id="2454" addr="0x7fdf084e0b70" >
+                            <attributelist id="2455" addr="0x7fdf084e0b70" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="2456" addr="0x7ff9f1fb49d0" >
-                            <attributelist id="2457" addr="0x7ff9f1fb49d0" >
-                                <attribute name="String" value="std::string" id="2458" addr="0x7ff9f1fba9d0" />
+                        <typescopesitem id="2456" addr="0x7fdf0850b9d0" >
+                            <attributelist id="2457" addr="0x7fdf0850b9d0" >
+                                <attribute name="String" value="std::string" id="2458" addr="0x7fdf085119d0" />
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="2459" addr="0x7ff9f1f72a30" >
-                            <attributelist id="2460" addr="0x7ff9f1f72a30" >
-                                <attribute name="name" value="" id="2461" addr="0x7ff9f1fba9d0" />
-                                <typetab id="2462" addr="0x7ff9f1f72a90" >
-                                    <attributelist id="2463" addr="0x7ff9f1f72a90" >
-                                        <attribute name="CGUIDialogKeyboardGeneric" value="CGUIDialogKeyboardGeneric" id="2464" addr="0x7ff9f1fba9d0" />
+                        <typescopesitem id="2459" addr="0x7fdf084c9a30" >
+                            <attributelist id="2460" addr="0x7fdf084c9a30" >
+                                <attribute name="name" value="" id="2461" addr="0x7fdf085119d0" />
+                                <typetab id="2462" addr="0x7fdf084c9a90" >
+                                    <attributelist id="2463" addr="0x7fdf084c9a90" >
+                                        <attribute name="CGUIDialogKeyboardGeneric" value="CGUIDialogKeyboardGeneric" id="2464" addr="0x7fdf085119d0" />
                                     </attributelist >
-                                    <typetabsitem id="2465" addr="0x7ff9f1fb7950" >
-                                        <attributelist id="2466" addr="0x7ff9f1fb7950" >
+                                    <typetabsitem id="2465" addr="0x7fdf0850e950" >
+                                        <attributelist id="2466" addr="0x7fdf0850e950" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="2467" addr="0x7ff9f1fb4ad0" >
-                            <attributelist id="2468" addr="0x7ff9f1fb4ad0" >
+                        <typescopesitem id="2467" addr="0x7fdf0850bad0" >
+                            <attributelist id="2468" addr="0x7fdf0850bad0" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="2469" addr="0x7ff9f1f89bb0" >
-                            <attributelist id="2470" addr="0x7ff9f1f89bb0" >
-                                <attribute name="name" value="XBMCAddon" id="2471" addr="0x7ff9f1fba9d0" />
-                                <attribute name="csymtab" value="0x7ff9f1f89bf0" id="2472" addr="0x7ff9f1f89bf0" />
-                                <attribute name="symtab" value="0x7ff9f1f89b90" id="2473" addr="0x7ff9f1f89b90" />
+                        <typescopesitem id="2469" addr="0x7fdf084e0bb0" >
+                            <attributelist id="2470" addr="0x7fdf084e0bb0" >
+                                <attribute name="name" value="XBMCAddon" id="2471" addr="0x7fdf085119d0" />
+                                <attribute name="csymtab" value="0x7fdf084e0bf0" id="2472" addr="0x7fdf084e0bf0" />
+                                <attribute name="symtab" value="0x7fdf084e0b90" id="2473" addr="0x7fdf084e0b90" />
                             </attributelist >
                         </typescopesitem >
                     </typescope >
-                    <attribute name="symtab" value="0x7ff9f1f89bb0" id="2474" addr="0x7ff9f1f89bb0" />
-                    <attribute name="sym_symtab" value="0x7ff9f1f72950" id="2475" addr="0x7ff9f1f72950" />
+                    <attribute name="symtab" value="0x7fdf084e0bb0" id="2474" addr="0x7fdf084e0bb0" />
+                    <attribute name="sym_symtab" value="0x7fdf084c9950" id="2475" addr="0x7fdf084c9950" />
                 </attributelist >
 
-                <namespace id="2476" addr="0x7ff9f1f9e350" >
-                    <attributelist id="2477" addr="0x7ff9f1f9e350" >
-                        <attribute name="feature_knownbasetypes" value="AddonClass,IPlayerCallback,AddonCallback" id="2478" addr="0x7ff9f1fba9d0" />
-                        <attribute name="name" value="xbmc" id="2479" addr="0x7ff9f1fba9d0" />
-                        <attribute name="sym_symtab" value="0x7ff9f1f89bb0" id="2480" addr="0x7ff9f1f89bb0" />
-                        <attribute name="symtab" value="0x7ff9f1f8a2b0" id="2481" addr="0x7ff9f1f8a2b0" />
-                        <attribute name="sym_nextSibling" value="0x7ff9f1fa04d0" id="2482" addr="0x7ff9f1fa04d0" />
-                        <attribute name="csym_nextSibling" value="0x7ff9f1fa04d0" id="2483" addr="0x7ff9f1fa04d0" />
-                        <attribute name="sym_previousSibling" value="0x7ff9f1f94a30" id="2484" addr="0x7ff9f1f94a30" />
-                        <attribute name="feature_knownapitypes" value="XBMCAddon::xbmcgui::ListItem,XBMCAddon::xbmc::PlayListItem" id="2485" addr="0x7ff9f1fba9d0" />
-                        <attribute name="sym_name" value="xbmc" id="2486" addr="0x7ff9f1fba9d0" />
-                        <typescope id="2487" addr="0x7ff9f1fb4d70" >
-                            <attributelist id="2488" addr="0x7ff9f1fb4d70" >
-                                <attribute name="name" value="xbmc" id="2489" addr="0x7ff9f1fba9d0" />
-                                <typetab id="2490" addr="0x7ff9f1fb4d90" >
-                                    <attributelist id="2491" addr="0x7ff9f1fb4d90" >
-                                        <attribute name="Monitor" value="Monitor" id="2492" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="2493" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="Keyboard" value="Keyboard" id="2494" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="2495" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="InfoTagVideo" value="InfoTagVideo" id="2496" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="Player" value="Player" id="2497" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="InfoTagMusic" value="InfoTagMusic" id="2498" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="PlayList" value="PlayList" id="2499" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="RenderCapture" value="RenderCapture" id="2500" addr="0x7ff9f1fba9d0" />
+                <namespace id="2476" addr="0x7fdf084f5350" >
+                    <attributelist id="2477" addr="0x7fdf084f5350" >
+                        <attribute name="feature_knownbasetypes" value="AddonClass,IPlayerCallback,AddonCallback" id="2478" addr="0x7fdf085119d0" />
+                        <attribute name="name" value="xbmc" id="2479" addr="0x7fdf085119d0" />
+                        <attribute name="sym_symtab" value="0x7fdf084e0bb0" id="2480" addr="0x7fdf084e0bb0" />
+                        <attribute name="symtab" value="0x7fdf084e12b0" id="2481" addr="0x7fdf084e12b0" />
+                        <attribute name="sym_nextSibling" value="0x7fdf084f74d0" id="2482" addr="0x7fdf084f74d0" />
+                        <attribute name="csym_nextSibling" value="0x7fdf084f74d0" id="2483" addr="0x7fdf084f74d0" />
+                        <attribute name="sym_previousSibling" value="0x7fdf084eba30" id="2484" addr="0x7fdf084eba30" />
+                        <attribute name="feature_knownapitypes" value="XBMCAddon::xbmcgui::ListItem,XBMCAddon::xbmc::PlayListItem" id="2485" addr="0x7fdf085119d0" />
+                        <attribute name="sym_name" value="xbmc" id="2486" addr="0x7fdf085119d0" />
+                        <typescope id="2487" addr="0x7fdf0850bd70" >
+                            <attributelist id="2488" addr="0x7fdf0850bd70" >
+                                <attribute name="name" value="xbmc" id="2489" addr="0x7fdf085119d0" />
+                                <typetab id="2490" addr="0x7fdf0850bd90" >
+                                    <attributelist id="2491" addr="0x7fdf0850bd90" >
+                                        <attribute name="Monitor" value="Monitor" id="2492" addr="0x7fdf085119d0" />
+                                        <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="2493" addr="0x7fdf085119d0" />
+                                        <attribute name="Keyboard" value="Keyboard" id="2494" addr="0x7fdf085119d0" />
+                                        <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="2495" addr="0x7fdf085119d0" />
+                                        <attribute name="InfoTagVideo" value="InfoTagVideo" id="2496" addr="0x7fdf085119d0" />
+                                        <attribute name="Player" value="Player" id="2497" addr="0x7fdf085119d0" />
+                                        <attribute name="InfoTagMusic" value="InfoTagMusic" id="2498" addr="0x7fdf085119d0" />
+                                        <attribute name="PlayList" value="PlayList" id="2499" addr="0x7fdf085119d0" />
+                                        <attribute name="RenderCapture" value="RenderCapture" id="2500" addr="0x7fdf085119d0" />
                                     </attributelist >
-                                    <typetabsitem id="2501" addr="0x7ff9f1fb9b10" >
-                                        <attributelist id="2502" addr="0x7ff9f1fb9b10" >
+                                    <typetabsitem id="2501" addr="0x7fdf08510b10" >
+                                        <attributelist id="2502" addr="0x7fdf08510b10" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2503" addr="0x7ff9f1fb7f30" >
-                                        <attributelist id="2504" addr="0x7ff9f1fb7f30" >
+                                    <typetabsitem id="2503" addr="0x7fdf0850ef30" >
+                                        <attributelist id="2504" addr="0x7fdf0850ef30" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2505" addr="0x7ff9f1fb8990" >
-                                        <attributelist id="2506" addr="0x7ff9f1fb8990" >
+                                    <typetabsitem id="2505" addr="0x7fdf0850f990" >
+                                        <attributelist id="2506" addr="0x7fdf0850f990" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2507" addr="0x7ff9f1fb5e90" >
-                                        <attributelist id="2508" addr="0x7ff9f1fb5e90" >
+                                    <typetabsitem id="2507" addr="0x7fdf0850ce90" >
+                                        <attributelist id="2508" addr="0x7fdf0850ce90" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2509" addr="0x7ff9f1fb8310" >
-                                        <attributelist id="2510" addr="0x7ff9f1fb8310" >
+                                    <typetabsitem id="2509" addr="0x7fdf0850f310" >
+                                        <attributelist id="2510" addr="0x7fdf0850f310" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2511" addr="0x7ff9f1fb6050" >
-                                        <attributelist id="2512" addr="0x7ff9f1fb6050" >
+                                    <typetabsitem id="2511" addr="0x7fdf0850d050" >
+                                        <attributelist id="2512" addr="0x7fdf0850d050" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2513" addr="0x7ff9f1fb7b50" >
-                                        <attributelist id="2514" addr="0x7ff9f1fb7b50" >
+                                    <typetabsitem id="2513" addr="0x7fdf0850eb50" >
+                                        <attributelist id="2514" addr="0x7fdf0850eb50" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2515" addr="0x7ff9f1fb91b0" >
-                                        <attributelist id="2516" addr="0x7ff9f1fb91b0" >
+                                    <typetabsitem id="2515" addr="0x7fdf085101b0" >
+                                        <attributelist id="2516" addr="0x7fdf085101b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2517" addr="0x7ff9f1fb7490" >
-                                        <attributelist id="2518" addr="0x7ff9f1fb7490" >
+                                    <typetabsitem id="2517" addr="0x7fdf0850e490" >
+                                        <attributelist id="2518" addr="0x7fdf0850e490" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
-                                <attribute name="parent" value="0x7ff9f1fb4990" id="2519" addr="0x7ff9f1fb4990" />
-                                <attribute name="qname" value="XBMCAddon::xbmc" id="2520" addr="0x7ff9f1fba9d0" />
-                                <attribute name="symtab" value="0x7ff9f1f8a2b0" id="2521" addr="0x7ff9f1f8a2b0" />
+                                <attribute name="parent" value="0x7fdf0850b990" id="2519" addr="0x7fdf0850b990" />
+                                <attribute name="qname" value="XBMCAddon::xbmc" id="2520" addr="0x7fdf085119d0" />
+                                <attribute name="symtab" value="0x7fdf084e12b0" id="2521" addr="0x7fdf084e12b0" />
                             </attributelist >
-                            <typescopesitem id="2522" addr="0x7ff9f1f8a270" >
-                                <attributelist id="2523" addr="0x7ff9f1f8a270" >
+                            <typescopesitem id="2522" addr="0x7fdf084e1270" >
+                                <attributelist id="2523" addr="0x7fdf084e1270" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="2524" addr="0x7ff9f1fb4d90" >
-                                <attributelist id="2525" addr="0x7ff9f1fb4d90" >
-                                    <attribute name="Monitor" value="Monitor" id="2526" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="2527" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="Keyboard" value="Keyboard" id="2528" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="2529" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="InfoTagVideo" value="InfoTagVideo" id="2530" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="Player" value="Player" id="2531" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="InfoTagMusic" value="InfoTagMusic" id="2532" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="PlayList" value="PlayList" id="2533" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="RenderCapture" value="RenderCapture" id="2534" addr="0x7ff9f1fba9d0" />
+                            <typescopesitem id="2524" addr="0x7fdf0850bd90" >
+                                <attributelist id="2525" addr="0x7fdf0850bd90" >
+                                    <attribute name="Monitor" value="Monitor" id="2526" addr="0x7fdf085119d0" />
+                                    <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="2527" addr="0x7fdf085119d0" />
+                                    <attribute name="Keyboard" value="Keyboard" id="2528" addr="0x7fdf085119d0" />
+                                    <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="2529" addr="0x7fdf085119d0" />
+                                    <attribute name="InfoTagVideo" value="InfoTagVideo" id="2530" addr="0x7fdf085119d0" />
+                                    <attribute name="Player" value="Player" id="2531" addr="0x7fdf085119d0" />
+                                    <attribute name="InfoTagMusic" value="InfoTagMusic" id="2532" addr="0x7fdf085119d0" />
+                                    <attribute name="PlayList" value="PlayList" id="2533" addr="0x7fdf085119d0" />
+                                    <attribute name="RenderCapture" value="RenderCapture" id="2534" addr="0x7fdf085119d0" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="2535" addr="0x7ff9f1fb4990" >
-                                <attributelist id="2536" addr="0x7ff9f1fb4990" >
-                                    <attribute name="name" value="XBMCAddon" id="2537" addr="0x7ff9f1fba9d0" />
-                                    <typetab id="2538" addr="0x7ff9f1fb49d0" >
-                                        <attributelist id="2539" addr="0x7ff9f1fb49d0" >
-                                            <attribute name="String" value="std::string" id="2540" addr="0x7ff9f1fba9d0" />
-                                        </attributelist >
-                                        <typetabsitem id="2541" addr="0x7ff9f1fb4bb0" >
-                                            <attributelist id="2542" addr="0x7ff9f1fb4bb0" >
+                            <typescopesitem id="2535" addr="0x7fdf0850b990" >
+                                <attributelist id="2536" addr="0x7fdf0850b990" >
+                                    <attribute name="name" value="XBMCAddon" id="2537" addr="0x7fdf085119d0" />
+                                    <typetab id="2538" addr="0x7fdf0850b9d0" >
+                                        <attributelist id="2539" addr="0x7fdf0850b9d0" >
+                                            <attribute name="String" value="std::string" id="2540" addr="0x7fdf085119d0" />
+                                        </attributelist >
+                                        <typetabsitem id="2541" addr="0x7fdf0850bbb0" >
+                                            <attributelist id="2542" addr="0x7fdf0850bbb0" >
                                             </attributelist >
                                         </typetabsitem >
                                     </typetab >
-                                    <attribute name="parent" value="0x7ff9f1f72a30" id="2543" addr="0x7ff9f1f72a30" />
-                                    <attribute name="qname" value="XBMCAddon" id="2544" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="symtab" value="0x7ff9f1f89bb0" id="2545" addr="0x7ff9f1f89bb0" />
+                                    <attribute name="parent" value="0x7fdf084c9a30" id="2543" addr="0x7fdf084c9a30" />
+                                    <attribute name="qname" value="XBMCAddon" id="2544" addr="0x7fdf085119d0" />
+                                    <attribute name="symtab" value="0x7fdf084e0bb0" id="2545" addr="0x7fdf084e0bb0" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="2546" addr="0x7ff9f1fb4db0" >
-                                <attributelist id="2547" addr="0x7ff9f1fb4db0" >
+                            <typescopesitem id="2546" addr="0x7fdf0850bdb0" >
+                                <attributelist id="2547" addr="0x7fdf0850bdb0" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="2548" addr="0x7ff9f1f8a2b0" >
-                                <attributelist id="2549" addr="0x7ff9f1f8a2b0" >
-                                    <attribute name="name" value="xbmc" id="2550" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="csymtab" value="0x7ff9f1f8a2f0" id="2551" addr="0x7ff9f1f8a2f0" />
-                                    <attribute name="symtab" value="0x7ff9f1f8a290" id="2552" addr="0x7ff9f1f8a290" />
+                            <typescopesitem id="2548" addr="0x7fdf084e12b0" >
+                                <attributelist id="2549" addr="0x7fdf084e12b0" >
+                                    <attribute name="name" value="xbmc" id="2550" addr="0x7fdf085119d0" />
+                                    <attribute name="csymtab" value="0x7fdf084e12f0" id="2551" addr="0x7fdf084e12f0" />
+                                    <attribute name="symtab" value="0x7fdf084e1290" id="2552" addr="0x7fdf084e1290" />
                                 </attributelist >
                             </typescopesitem >
                         </typescope >
                     </attributelist >
 
-                    <cdecl id="2553" addr="0x7ff9f1f9e4b0" >
-                        <attributelist id="2554" addr="0x7ff9f1f9e4b0" >
-                            <attribute name="sym_name" value="RenderCaptureException" id="2555" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="XBMCAddon::xbmc::RenderCaptureException" id="2556" addr="0x7ff9f1fba9d0" />
-                            <attribute name="kind" value="variable" id="2557" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="XBMCCOMMONS_STANDARD_EXCEPTION" id="2558" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="2559" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="2560" addr="0x7ff9f1fba9d0" />
+                    <cdecl id="2553" addr="0x7fdf084f54b0" >
+                        <attributelist id="2554" addr="0x7fdf084f54b0" >
+                            <attribute name="sym_name" value="RenderCaptureException" id="2555" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="XBMCAddon::xbmc::RenderCaptureException" id="2556" addr="0x7fdf085119d0" />
+                            <attribute name="kind" value="variable" id="2557" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="XBMCCOMMONS_STANDARD_EXCEPTION" id="2558" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="2559" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="2560" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <class id="2561" addr="0x7ff9f1f9e690" >
-                        <attributelist id="2562" addr="0x7ff9f1f9e690" >
-                            <attribute name="name" value="XBMCAddon::xbmc::RenderCapture" id="2563" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="2564" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="symtab" value="0x7ff9f1f9e7d0" id="2565" addr="0x7ff9f1f9e7d0" />
-                            <attribute name="allows_typedef" value="1" id="2566" addr="0x7ff9f1fba9d0" />
-                            <attribute name="typepass_visit" value="1" id="2567" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_visit" value="1" id="2568" addr="0x7ff9f1fba9d0" />
-                            <attribute name="kind" value="class" id="2569" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_name" value="RenderCapture" id="2570" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_default_constructor" value="1" id="2571" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_has_constructor" value="1" id="2572" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_public_constructor" value="1" id="2573" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_has_destructor" value="1" id="2574" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_default_destructor" value="1" id="2575" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_copy_constructor" value="1" id="2576" addr="0x7ff9f1fba9d0" />
-                            <attribute name="privatebaselist" value="0x7ff9f1f9e670" id="2577" addr="0x7ff9f1f9e670" />
-                            <attribute name="protectedbaselist" value="0x7ff9f1f9e650" id="2578" addr="0x7ff9f1f9e650" />
-                            <baselist id="2579" addr="0x7ff9f1f9e630" >
-                                <base name="AddonClass" id="2580" addr="0x7ff9f1f9e5b0" />
+                    <class id="2561" addr="0x7fdf084f5690" >
+                        <attributelist id="2562" addr="0x7fdf084f5690" >
+                            <attribute name="name" value="XBMCAddon::xbmc::RenderCapture" id="2563" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="2564" addr="0x7fdf084e12b0" />
+                            <attribute name="symtab" value="0x7fdf084f57d0" id="2565" addr="0x7fdf084f57d0" />
+                            <attribute name="allows_typedef" value="1" id="2566" addr="0x7fdf085119d0" />
+                            <attribute name="typepass_visit" value="1" id="2567" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_visit" value="1" id="2568" addr="0x7fdf085119d0" />
+                            <attribute name="kind" value="class" id="2569" addr="0x7fdf085119d0" />
+                            <attribute name="sym_name" value="RenderCapture" id="2570" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_default_constructor" value="1" id="2571" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_has_constructor" value="1" id="2572" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_public_constructor" value="1" id="2573" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_has_destructor" value="1" id="2574" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_default_destructor" value="1" id="2575" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_copy_constructor" value="1" id="2576" addr="0x7fdf085119d0" />
+                            <attribute name="privatebaselist" value="0x7fdf084f5670" id="2577" addr="0x7fdf084f5670" />
+                            <attribute name="protectedbaselist" value="0x7fdf084f5650" id="2578" addr="0x7fdf084f5650" />
+                            <baselist id="2579" addr="0x7fdf084f5630" >
+                                <base name="AddonClass" id="2580" addr="0x7fdf084f55b0" />
                             </baselist >
-                            <attribute name="module" value="xbmc" id="2581" addr="0x7ff9f1f89430" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="2582" addr="0x7ff9f1fba9d0" />
-                            <typescope id="2583" addr="0x7ff9f1fb7550" >
-                                <attributelist id="2584" addr="0x7ff9f1fb7550" >
-                                    <attribute name="name" value="RenderCapture" id="2585" addr="0x7ff9f1fba9d0" />
-                                    <typetab id="2586" addr="0x7ff9f1fb7570" >
-                                        <attributelist id="2587" addr="0x7ff9f1fb7570" >
+                            <attribute name="module" value="xbmc" id="2581" addr="0x7fdf084e0430" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="2582" addr="0x7fdf085119d0" />
+                            <typescope id="2583" addr="0x7fdf0850e550" >
+                                <attributelist id="2584" addr="0x7fdf0850e550" >
+                                    <attribute name="name" value="RenderCapture" id="2585" addr="0x7fdf085119d0" />
+                                    <typetab id="2586" addr="0x7fdf0850e570" >
+                                        <attributelist id="2587" addr="0x7fdf0850e570" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7ff9f1fb4d70" id="2588" addr="0x7ff9f1fb4d70" />
-                                    <attribute name="qname" value="XBMCAddon::xbmc::RenderCapture" id="2589" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="symtab" value="0x7ff9f1f9e7d0" id="2590" addr="0x7ff9f1f9e7d0" />
+                                    <attribute name="parent" value="0x7fdf0850bd70" id="2588" addr="0x7fdf0850bd70" />
+                                    <attribute name="qname" value="XBMCAddon::xbmc::RenderCapture" id="2589" addr="0x7fdf085119d0" />
+                                    <attribute name="symtab" value="0x7fdf084f57d0" id="2590" addr="0x7fdf084f57d0" />
                                 </attributelist >
-                                <typescopesitem id="2591" addr="0x7ff9f1fb74f0" >
-                                    <attributelist id="2592" addr="0x7ff9f1fb74f0" >
+                                <typescopesitem id="2591" addr="0x7fdf0850e4f0" >
+                                    <attributelist id="2592" addr="0x7fdf0850e4f0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="2593" addr="0x7ff9f1fb7570" >
-                                    <attributelist id="2594" addr="0x7ff9f1fb7570" >
+                                <typescopesitem id="2593" addr="0x7fdf0850e570" >
+                                    <attributelist id="2594" addr="0x7fdf0850e570" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="2595" addr="0x7ff9f1fb4d70" >
-                                    <attributelist id="2596" addr="0x7ff9f1fb4d70" >
-                                        <attribute name="name" value="xbmc" id="2597" addr="0x7ff9f1fba9d0" />
-                                        <typetab id="2598" addr="0x7ff9f1fb4d90" >
-                                            <attributelist id="2599" addr="0x7ff9f1fb4d90" >
-                                                <attribute name="Monitor" value="Monitor" id="2600" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="2601" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="Keyboard" value="Keyboard" id="2602" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="2603" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="InfoTagVideo" value="InfoTagVideo" id="2604" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="Player" value="Player" id="2605" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="InfoTagMusic" value="InfoTagMusic" id="2606" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="PlayList" value="PlayList" id="2607" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="RenderCapture" value="RenderCapture" id="2608" addr="0x7ff9f1fba9d0" />
+                                <typescopesitem id="2595" addr="0x7fdf0850bd70" >
+                                    <attributelist id="2596" addr="0x7fdf0850bd70" >
+                                        <attribute name="name" value="xbmc" id="2597" addr="0x7fdf085119d0" />
+                                        <typetab id="2598" addr="0x7fdf0850bd90" >
+                                            <attributelist id="2599" addr="0x7fdf0850bd90" >
+                                                <attribute name="Monitor" value="Monitor" id="2600" addr="0x7fdf085119d0" />
+                                                <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="2601" addr="0x7fdf085119d0" />
+                                                <attribute name="Keyboard" value="Keyboard" id="2602" addr="0x7fdf085119d0" />
+                                                <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="2603" addr="0x7fdf085119d0" />
+                                                <attribute name="InfoTagVideo" value="InfoTagVideo" id="2604" addr="0x7fdf085119d0" />
+                                                <attribute name="Player" value="Player" id="2605" addr="0x7fdf085119d0" />
+                                                <attribute name="InfoTagMusic" value="InfoTagMusic" id="2606" addr="0x7fdf085119d0" />
+                                                <attribute name="PlayList" value="PlayList" id="2607" addr="0x7fdf085119d0" />
+                                                <attribute name="RenderCapture" value="RenderCapture" id="2608" addr="0x7fdf085119d0" />
                                             </attributelist >
-                                            <typetabsitem id="2609" addr="0x7ff9f1fb9b10" >
-                                                <attributelist id="2610" addr="0x7ff9f1fb9b10" >
+                                            <typetabsitem id="2609" addr="0x7fdf08510b10" >
+                                                <attributelist id="2610" addr="0x7fdf08510b10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2611" addr="0x7ff9f1fb7f30" >
-                                                <attributelist id="2612" addr="0x7ff9f1fb7f30" >
+                                            <typetabsitem id="2611" addr="0x7fdf0850ef30" >
+                                                <attributelist id="2612" addr="0x7fdf0850ef30" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2613" addr="0x7ff9f1fb8990" >
-                                                <attributelist id="2614" addr="0x7ff9f1fb8990" >
+                                            <typetabsitem id="2613" addr="0x7fdf0850f990" >
+                                                <attributelist id="2614" addr="0x7fdf0850f990" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2615" addr="0x7ff9f1fb5e90" >
-                                                <attributelist id="2616" addr="0x7ff9f1fb5e90" >
+                                            <typetabsitem id="2615" addr="0x7fdf0850ce90" >
+                                                <attributelist id="2616" addr="0x7fdf0850ce90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2617" addr="0x7ff9f1fb8310" >
-                                                <attributelist id="2618" addr="0x7ff9f1fb8310" >
+                                            <typetabsitem id="2617" addr="0x7fdf0850f310" >
+                                                <attributelist id="2618" addr="0x7fdf0850f310" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2619" addr="0x7ff9f1fb6050" >
-                                                <attributelist id="2620" addr="0x7ff9f1fb6050" >
+                                            <typetabsitem id="2619" addr="0x7fdf0850d050" >
+                                                <attributelist id="2620" addr="0x7fdf0850d050" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2621" addr="0x7ff9f1fb7b50" >
-                                                <attributelist id="2622" addr="0x7ff9f1fb7b50" >
+                                            <typetabsitem id="2621" addr="0x7fdf0850eb50" >
+                                                <attributelist id="2622" addr="0x7fdf0850eb50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2623" addr="0x7ff9f1fb91b0" >
-                                                <attributelist id="2624" addr="0x7ff9f1fb91b0" >
+                                            <typetabsitem id="2623" addr="0x7fdf085101b0" >
+                                                <attributelist id="2624" addr="0x7fdf085101b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2625" addr="0x7ff9f1fb7490" >
-                                                <attributelist id="2626" addr="0x7ff9f1fb7490" >
+                                            <typetabsitem id="2625" addr="0x7fdf0850e490" >
+                                                <attributelist id="2626" addr="0x7fdf0850e490" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7ff9f1fb4990" id="2627" addr="0x7ff9f1fb4990" />
-                                        <attribute name="qname" value="XBMCAddon::xbmc" id="2628" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="symtab" value="0x7ff9f1f8a2b0" id="2629" addr="0x7ff9f1f8a2b0" />
+                                        <attribute name="parent" value="0x7fdf0850b990" id="2627" addr="0x7fdf0850b990" />
+                                        <attribute name="qname" value="XBMCAddon::xbmc" id="2628" addr="0x7fdf085119d0" />
+                                        <attribute name="symtab" value="0x7fdf084e12b0" id="2629" addr="0x7fdf084e12b0" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="2630" addr="0x7ff9f1fb7590" >
-                                    <attributelist id="2631" addr="0x7ff9f1fb7590" >
+                                <typescopesitem id="2630" addr="0x7fdf0850e590" >
+                                    <attributelist id="2631" addr="0x7fdf0850e590" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="2632" addr="0x7ff9f1f9e7d0" >
-                                    <attributelist id="2633" addr="0x7ff9f1f9e7d0" >
-                                        <attribute name="name" value="RenderCapture" id="2634" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="csymtab" value="0x7ff9f1f9e7f0" id="2635" addr="0x7ff9f1f9e7f0" />
-                                        <attribute name="symtab" value="0x7ff9f1f9e790" id="2636" addr="0x7ff9f1f9e790" />
+                                <typescopesitem id="2632" addr="0x7fdf084f57d0" >
+                                    <attributelist id="2633" addr="0x7fdf084f57d0" >
+                                        <attribute name="name" value="RenderCapture" id="2634" addr="0x7fdf085119d0" />
+                                        <attribute name="csymtab" value="0x7fdf084f57f0" id="2635" addr="0x7fdf084f57f0" />
+                                        <attribute name="symtab" value="0x7fdf084f5790" id="2636" addr="0x7fdf084f5790" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <cdecl id="2637" addr="0x7ff9f1f9e8f0" >
-                            <attributelist id="2638" addr="0x7ff9f1f9e8f0" >
-                                <attribute name="ismember" value="1" id="2639" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="m_captureId" id="2640" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="" id="2641" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="private" id="2642" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="variable" id="2643" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="unsigned int" id="2644" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f9e7d0" id="2645" addr="0x7ff9f1f9e7d0" />
+                        <cdecl id="2637" addr="0x7fdf084f58f0" >
+                            <attributelist id="2638" addr="0x7fdf084f58f0" >
+                                <attribute name="ismember" value="1" id="2639" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="m_captureId" id="2640" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="" id="2641" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="private" id="2642" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="variable" id="2643" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="unsigned int" id="2644" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084f57d0" id="2645" addr="0x7fdf084f57d0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="2646" addr="0x7ff9f1f9ead0" >
-                            <attributelist id="2647" addr="0x7ff9f1f9ead0" >
-                                <attribute name="ismember" value="1" id="2648" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="m_width" id="2649" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="" id="2650" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="private" id="2651" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="variable" id="2652" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="unsigned int" id="2653" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f9e7d0" id="2654" addr="0x7ff9f1f9e7d0" />
+                        <cdecl id="2646" addr="0x7fdf084f5ad0" >
+                            <attributelist id="2647" addr="0x7fdf084f5ad0" >
+                                <attribute name="ismember" value="1" id="2648" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="m_width" id="2649" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="" id="2650" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="private" id="2651" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="variable" id="2652" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="unsigned int" id="2653" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084f57d0" id="2654" addr="0x7fdf084f57d0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="2655" addr="0x7ff9f1f9ec70" >
-                            <attributelist id="2656" addr="0x7ff9f1f9ec70" >
-                                <attribute name="ismember" value="1" id="2657" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="m_height" id="2658" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="" id="2659" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="private" id="2660" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="variable" id="2661" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="unsigned int" id="2662" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f9e7d0" id="2663" addr="0x7ff9f1f9e7d0" />
+                        <cdecl id="2655" addr="0x7fdf084f5c70" >
+                            <attributelist id="2656" addr="0x7fdf084f5c70" >
+                                <attribute name="ismember" value="1" id="2657" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="m_height" id="2658" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="" id="2659" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="private" id="2660" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="variable" id="2661" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="unsigned int" id="2662" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084f57d0" id="2663" addr="0x7fdf084f57d0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="2664" addr="0x7ff9f1f9edf0" >
-                            <attributelist id="2665" addr="0x7ff9f1f9edf0" >
-                                <attribute name="ismember" value="1" id="2666" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="m_buffer" id="2667" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="p." id="2668" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="private" id="2669" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="variable" id="2670" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="uint8_t" id="2671" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f9e7d0" id="2672" addr="0x7ff9f1f9e7d0" />
+                        <cdecl id="2664" addr="0x7fdf084f5df0" >
+                            <attributelist id="2665" addr="0x7fdf084f5df0" >
+                                <attribute name="ismember" value="1" id="2666" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="m_buffer" id="2667" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="p." id="2668" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="private" id="2669" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="variable" id="2670" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="uint8_t" id="2671" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084f57d0" id="2672" addr="0x7fdf084f57d0" />
                             </attributelist >
                          
                         </cdecl >
-                        <access id="2673" addr="0x7ff9f1f9eed0" >
-                            <attributelist id="2674" addr="0x7ff9f1f9eed0" >
-                                <attribute name="kind" value="public" id="2675" addr="0x7ff9f1fba9d0" />
+                        <access id="2673" addr="0x7fdf084f5ed0" >
+                            <attributelist id="2674" addr="0x7fdf084f5ed0" >
+                                <attribute name="kind" value="public" id="2675" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="2676" addr="0x7ff9f1f9efd0" >
-                            <attributelist id="2677" addr="0x7ff9f1f9efd0" >
-                                <attribute name="ismember" value="1" id="2678" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="RenderCapture" id="2679" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="RenderCapture" id="2680" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="2681" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2682" addr="0x7ff9f1fba9d0" />
-                                <attribute name="feature_new" value="1" id="2683" addr="0x7ff9f1fba9d0" />
-                                <attribute name="code" value="{&#10;        m_captureId = UINT_MAX;&#10;        m_buffer = nullptr;&#10;        m_width = 0;&#10;        m_height = 0;&#10;      }" id="2684" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f9e7d0" id="2685" addr="0x7ff9f1f9e7d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2686" addr="0x7ff9f1fba9d0" />
+                        <constructor id="2676" addr="0x7fdf084f5fd0" >
+                            <attributelist id="2677" addr="0x7fdf084f5fd0" >
+                                <attribute name="ismember" value="1" id="2678" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="RenderCapture" id="2679" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="RenderCapture" id="2680" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="2681" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2682" addr="0x7fdf085119d0" />
+                                <attribute name="feature_new" value="1" id="2683" addr="0x7fdf085119d0" />
+                                <attribute name="code" value="{&#10;        m_captureId = UINT_MAX;&#10;        m_buffer = nullptr;&#10;        m_width = 0;&#10;        m_height = 0;&#10;      }" id="2684" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084f57d0" id="2685" addr="0x7fdf084f57d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2686" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </constructor >
-                        <destructor id="2687" addr="0x7ff9f1f9f130" >
-                            <attributelist id="2688" addr="0x7ff9f1f9f130" >
-                                <attribute name="ismember" value="1" id="2689" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="~RenderCapture" id="2690" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="~RenderCapture" id="2691" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="2692" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2693" addr="0x7ff9f1fba9d0" />
-                                <attribute name="code" value="{&#10;        g_application.GetAppPlayer().RenderCaptureRelease(m_captureId);&#10;        delete [] m_buffer;&#10;      }" id="2694" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f9e7d0" id="2695" addr="0x7ff9f1f9e7d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2696" addr="0x7ff9f1fba9d0" />
+                        <destructor id="2687" addr="0x7fdf084f6130" >
+                            <attributelist id="2688" addr="0x7fdf084f6130" >
+                                <attribute name="ismember" value="1" id="2689" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="~RenderCapture" id="2690" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="~RenderCapture" id="2691" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="2692" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2693" addr="0x7fdf085119d0" />
+                                <attribute name="code" value="{&#10;        g_application.GetAppPlayer().RenderCaptureRelease(m_captureId);&#10;        delete [] m_buffer;&#10;      }" id="2694" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084f57d0" id="2695" addr="0x7fdf084f57d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2696" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </destructor >
-                        <cdecl id="2697" addr="0x7ff9f1f9f2f0" >
-                            <attributelist id="2698" addr="0x7ff9f1f9f2f0" >
-                                <attribute name="name" value="getWidth" id="2699" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="2700" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f9e7d0" id="2701" addr="0x7ff9f1f9e7d0" />
-                                <attribute name="kind" value="function" id="2702" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getWidth" id="2703" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="2704" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2705" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="int" id="2706" addr="0x7ff9f1fba9d0" />
-                                <attribute name="code" value="{ return m_width; }" id="2707" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2708" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="2709" addr="0x7ff9f1f9f4d0" >
-                            <attributelist id="2710" addr="0x7ff9f1f9f4d0" >
-                                <attribute name="name" value="getHeight" id="2711" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="2712" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f9e7d0" id="2713" addr="0x7ff9f1f9e7d0" />
-                                <attribute name="kind" value="function" id="2714" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getHeight" id="2715" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="2716" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2717" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="int" id="2718" addr="0x7ff9f1fba9d0" />
-                                <attribute name="code" value="{ return m_height; }" id="2719" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2720" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="2721" addr="0x7ff9f1f9f6b0" >
-                            <attributelist id="2722" addr="0x7ff9f1f9f6b0" >
-                                <attribute name="name" value="getAspectRatio" id="2723" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="2724" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f9e7d0" id="2725" addr="0x7ff9f1f9e7d0" />
-                                <attribute name="kind" value="function" id="2726" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getAspectRatio" id="2727" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="2728" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2729" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="float" id="2730" addr="0x7ff9f1fba9d0" />
-                                <attribute name="code" value="{ return g_application.GetAppPlayer().GetRenderAspectRatio(); }" id="2731" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2732" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="2733" addr="0x7ff9f1f9f8b0" >
-                            <attributelist id="2734" addr="0x7ff9f1f9f8b0" >
-                                <attribute name="name" value="getImageFormat" id="2735" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="2736" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f9e7d0" id="2737" addr="0x7ff9f1f9e7d0" />
-                                <attribute name="kind" value="function" id="2738" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getImageFormat" id="2739" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f().p." id="2740" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2741" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="q(const).char" id="2742" addr="0x7ff9f1fba9d0" />
-                                <attribute name="code" value="{&#10;        return &quot;BGRA&quot;;&#10;      }" id="2743" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2744" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="2745" addr="0x7ff9f1f9fc30" >
-                            <attributelist id="2746" addr="0x7ff9f1f9fc30" >
-                                <attribute name="name" value="getImage" id="2747" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="2748" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f9e7d0" id="2749" addr="0x7ff9f1f9e7d0" />
-                                <attribute name="sym_nextSibling" value="0x7ff9f1f9fd50" id="2750" addr="0x7ff9f1f9fd50" />
-                                <attribute name="csym_nextSibling" value="0x7ff9f1f9fd50" id="2751" addr="0x7ff9f1f9fd50" />
-                                <attribute name="kind" value="function" id="2752" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getImage" id="2753" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(unsigned int)." id="2754" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2755" addr="0x7ff9f1fba9d0" />
-                                <parmlist id="2756" addr="0x7ff9f1f9fb90" >
+                        <cdecl id="2697" addr="0x7fdf084f62f0" >
+                            <attributelist id="2698" addr="0x7fdf084f62f0" >
+                                <attribute name="name" value="getWidth" id="2699" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="2700" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084f57d0" id="2701" addr="0x7fdf084f57d0" />
+                                <attribute name="kind" value="function" id="2702" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getWidth" id="2703" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="2704" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2705" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="int" id="2706" addr="0x7fdf085119d0" />
+                                <attribute name="code" value="{ return m_width; }" id="2707" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2708" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="2709" addr="0x7fdf084f64d0" >
+                            <attributelist id="2710" addr="0x7fdf084f64d0" >
+                                <attribute name="name" value="getHeight" id="2711" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="2712" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084f57d0" id="2713" addr="0x7fdf084f57d0" />
+                                <attribute name="kind" value="function" id="2714" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getHeight" id="2715" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="2716" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2717" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="int" id="2718" addr="0x7fdf085119d0" />
+                                <attribute name="code" value="{ return m_height; }" id="2719" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2720" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="2721" addr="0x7fdf084f66b0" >
+                            <attributelist id="2722" addr="0x7fdf084f66b0" >
+                                <attribute name="name" value="getAspectRatio" id="2723" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="2724" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084f57d0" id="2725" addr="0x7fdf084f57d0" />
+                                <attribute name="kind" value="function" id="2726" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getAspectRatio" id="2727" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="2728" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2729" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="float" id="2730" addr="0x7fdf085119d0" />
+                                <attribute name="code" value="{ return g_application.GetAppPlayer().GetRenderAspectRatio(); }" id="2731" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2732" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="2733" addr="0x7fdf084f68b0" >
+                            <attributelist id="2734" addr="0x7fdf084f68b0" >
+                                <attribute name="name" value="getImageFormat" id="2735" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="2736" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084f57d0" id="2737" addr="0x7fdf084f57d0" />
+                                <attribute name="kind" value="function" id="2738" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getImageFormat" id="2739" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f().p." id="2740" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2741" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="q(const).char" id="2742" addr="0x7fdf085119d0" />
+                                <attribute name="code" value="{&#10;        return &quot;BGRA&quot;;&#10;      }" id="2743" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2744" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="2745" addr="0x7fdf084f6c30" >
+                            <attributelist id="2746" addr="0x7fdf084f6c30" >
+                                <attribute name="name" value="getImage" id="2747" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="2748" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084f57d0" id="2749" addr="0x7fdf084f57d0" />
+                                <attribute name="sym_nextSibling" value="0x7fdf084f6d50" id="2750" addr="0x7fdf084f6d50" />
+                                <attribute name="csym_nextSibling" value="0x7fdf084f6d50" id="2751" addr="0x7fdf084f6d50" />
+                                <attribute name="kind" value="function" id="2752" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getImage" id="2753" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(unsigned int)." id="2754" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2755" addr="0x7fdf085119d0" />
+                                <parmlist id="2756" addr="0x7fdf084f6b90" >
                                     <parm id="2757">
-                                        <attributelist id="2758" addr="0x7ff9f1f9fb90" >
-                                            <attribute name="name" value="msecs" id="2759" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="0" id="2760" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="unsigned int" id="2761" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="2758" addr="0x7fdf084f6b90" >
+                                            <attribute name="name" value="msecs" id="2759" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="0" id="2760" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="unsigned int" id="2761" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overloaded" value="0x7ff9f1f9fc30" id="2762" addr="0x7ff9f1f9fc30" />
-                                <attribute name="type" value="XbmcCommons::Buffer" id="2763" addr="0x7ff9f1fba9d0" />
-                                <attribute name="code" value="{&#10;        if (!GetPixels(msecs))&#10;          return XbmcCommons::Buffer(0);&#10;&#10;        size_t size = m_width * m_height * 4;&#10;        return XbmcCommons::Buffer(m_buffer, size);&#10;      }" id="2764" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2765" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="2766" addr="0x7ff9f1f9fd50" >
-                            <attributelist id="2767" addr="0x7ff9f1f9fd50" >
-                                <attribute name="name" value="getImage" id="2768" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="2769" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f9e7d0" id="2770" addr="0x7ff9f1f9e7d0" />
-                                <attribute name="sym_previousSibling" value="0x7ff9f1f9fc30" id="2771" addr="0x7ff9f1f9fc30" />
-                                <attribute name="kind" value="function" id="2772" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getImage" id="2773" addr="0x7ff9f1fba9d0" />
-                                <attribute name="defaultargs" value="0x7ff9f1f9fc30" id="2774" addr="0x7ff9f1f9fc30" />
-                                <attribute name="decl" value="f()." id="2775" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2776" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overloaded" value="0x7ff9f1f9fc30" id="2777" addr="0x7ff9f1f9fc30" />
-                                <attribute name="type" value="XbmcCommons::Buffer" id="2778" addr="0x7ff9f1fba9d0" />
-                                <attribute name="code" value="{&#10;        if (!GetPixels(msecs))&#10;          return XbmcCommons::Buffer(0);&#10;&#10;        size_t size = m_width * m_height * 4;&#10;        return XbmcCommons::Buffer(m_buffer, size);&#10;      }" id="2779" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="2780" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="2781" addr="0x7ff9f1fa0170" >
-                            <attributelist id="2782" addr="0x7ff9f1fa0170" >
-                                <attribute name="name" value="capture" id="2783" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="2784" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1f9e7d0" id="2785" addr="0x7ff9f1f9e7d0" />
-                                <attribute name="kind" value="function" id="2786" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="capture" id="2787" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(int,int)." id="2788" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="2789" addr="0x7ff9f1fba9d0" />
-                                <parmlist id="2790" addr="0x7ff9f1f9ffb0" >
+                                <attribute name="sym_overloaded" value="0x7fdf084f6c30" id="2762" addr="0x7fdf084f6c30" />
+                                <attribute name="type" value="XbmcCommons::Buffer" id="2763" addr="0x7fdf085119d0" />
+                                <attribute name="code" value="{&#10;        if (!GetPixels(msecs))&#10;          return XbmcCommons::Buffer(0);&#10;&#10;        size_t size = m_width * m_height * 4;&#10;        return XbmcCommons::Buffer(m_buffer, size);&#10;      }" id="2764" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2765" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="2766" addr="0x7fdf084f6d50" >
+                            <attributelist id="2767" addr="0x7fdf084f6d50" >
+                                <attribute name="name" value="getImage" id="2768" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="2769" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084f57d0" id="2770" addr="0x7fdf084f57d0" />
+                                <attribute name="sym_previousSibling" value="0x7fdf084f6c30" id="2771" addr="0x7fdf084f6c30" />
+                                <attribute name="kind" value="function" id="2772" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getImage" id="2773" addr="0x7fdf085119d0" />
+                                <attribute name="defaultargs" value="0x7fdf084f6c30" id="2774" addr="0x7fdf084f6c30" />
+                                <attribute name="decl" value="f()." id="2775" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2776" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overloaded" value="0x7fdf084f6c30" id="2777" addr="0x7fdf084f6c30" />
+                                <attribute name="type" value="XbmcCommons::Buffer" id="2778" addr="0x7fdf085119d0" />
+                                <attribute name="code" value="{&#10;        if (!GetPixels(msecs))&#10;          return XbmcCommons::Buffer(0);&#10;&#10;        size_t size = m_width * m_height * 4;&#10;        return XbmcCommons::Buffer(m_buffer, size);&#10;      }" id="2779" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="2780" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="2781" addr="0x7fdf084f7170" >
+                            <attributelist id="2782" addr="0x7fdf084f7170" >
+                                <attribute name="name" value="capture" id="2783" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="2784" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084f57d0" id="2785" addr="0x7fdf084f57d0" />
+                                <attribute name="kind" value="function" id="2786" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="capture" id="2787" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(int,int)." id="2788" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="2789" addr="0x7fdf085119d0" />
+                                <parmlist id="2790" addr="0x7fdf084f6fb0" >
                                     <parm id="2791">
-                                        <attributelist id="2792" addr="0x7ff9f1f9ffb0" >
-                                            <attribute name="name" value="width" id="2793" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="int" id="2794" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="2792" addr="0x7fdf084f6fb0" >
+                                            <attribute name="name" value="width" id="2793" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="int" id="2794" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                     <parm id="2795">
-                                        <attributelist id="2796" addr="0x7ff9f1fa00d0" >
-                                            <attribute name="name" value="height" id="2797" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="int" id="2798" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="2796" addr="0x7fdf084f70d0" >
+                                            <attribute name="name" value="height" id="2797" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="int" id="2798" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="2799" addr="0x7ff9f1fba9d0" />
-                                <attribute name="code" value="{&#10;        if (m_buffer)&#10;        {&#10;          g_application.GetAppPlayer().RenderCaptureRelease(m_captureId);&#10;          delete [] m_buffer;&#10;        }&#10;        m_captureId = g_application.GetAppPlayer().RenderCaptureAlloc();&#10;        m_width = width;&#10;        m_height = height;&#10;        m_buffer = new uint8_t[m_width*m_height*4];&#10;        g_application.GetAppPlayer().RenderCapture(m_captureId, m_width, m_height, CAPTUREFLAG_CONTINUOUS);&#10;      }" id="2800" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2801" addr="0x7ff9f1fba9d0" />
+                                <attribute name="type" value="void" id="2799" addr="0x7fdf085119d0" />
+                                <attribute name="code" value="{&#10;        if (m_buffer)&#10;        {&#10;          g_application.GetAppPlayer().RenderCaptureRelease(m_captureId);&#10;          delete [] m_buffer;&#10;        }&#10;        m_captureId = g_application.GetAppPlayer().RenderCaptureAlloc();&#10;        m_width = width;&#10;        m_height = height;&#10;        m_buffer = new uint8_t[m_width*m_height*4];&#10;        g_application.GetAppPlayer().RenderCapture(m_captureId, m_width, m_height, CAPTUREFLAG_CONTINUOUS);&#10;      }" id="2800" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2801" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </cdecl >
@@ -3967,613 +3967,613 @@
                 </namespace >
             </namespace >
         </include >
-        <include id="2802" addr="0x7ff9f1fa03b0" >
-            <attributelist id="2803" addr="0x7ff9f1fa03b0" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/InfoTagMusic.h" id="2804" addr="0x7ff9f1fba9d0" />
+        <include id="2802" addr="0x7fdf084f73b0" >
+            <attributelist id="2803" addr="0x7fdf084f73b0" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/InfoTagMusic.h" id="2804" addr="0x7fdf085119d0" />
             </attributelist >
 
-            <namespace id="2805" addr="0x7ff9f1fa0450" >
-                <attributelist id="2806" addr="0x7ff9f1fa0450" >
-                    <attribute name="sym_name" value="XBMCAddon" id="2807" addr="0x7ff9f1fba9d0" />
-                    <attribute name="name" value="XBMCAddon" id="2808" addr="0x7ff9f1fba9d0" />
-                    <attribute name="sym_previousSibling" value="0x7ff9f1f9e2d0" id="2809" addr="0x7ff9f1f9e2d0" />
-                    <attribute name="csym_nextSibling" value="0x7ff9f1fa32b0" id="2810" addr="0x7ff9f1fa32b0" />
-                    <attribute name="sym_nextSibling" value="0x7ff9f1fa32b0" id="2811" addr="0x7ff9f1fa32b0" />
-                    <typescope id="2812" addr="0x7ff9f1fb4990" >
-                        <attributelist id="2813" addr="0x7ff9f1fb4990" >
-                            <attribute name="name" value="XBMCAddon" id="2814" addr="0x7ff9f1fba9d0" />
-                            <typetab id="2815" addr="0x7ff9f1fb49d0" >
-                                <attributelist id="2816" addr="0x7ff9f1fb49d0" >
-                                    <attribute name="String" value="std::string" id="2817" addr="0x7ff9f1fba9d0" />
+            <namespace id="2805" addr="0x7fdf084f7450" >
+                <attributelist id="2806" addr="0x7fdf084f7450" >
+                    <attribute name="sym_name" value="XBMCAddon" id="2807" addr="0x7fdf085119d0" />
+                    <attribute name="name" value="XBMCAddon" id="2808" addr="0x7fdf085119d0" />
+                    <attribute name="sym_previousSibling" value="0x7fdf084f52d0" id="2809" addr="0x7fdf084f52d0" />
+                    <attribute name="csym_nextSibling" value="0x7fdf084fa2b0" id="2810" addr="0x7fdf084fa2b0" />
+                    <attribute name="sym_nextSibling" value="0x7fdf084fa2b0" id="2811" addr="0x7fdf084fa2b0" />
+                    <typescope id="2812" addr="0x7fdf0850b990" >
+                        <attributelist id="2813" addr="0x7fdf0850b990" >
+                            <attribute name="name" value="XBMCAddon" id="2814" addr="0x7fdf085119d0" />
+                            <typetab id="2815" addr="0x7fdf0850b9d0" >
+                                <attributelist id="2816" addr="0x7fdf0850b9d0" >
+                                    <attribute name="String" value="std::string" id="2817" addr="0x7fdf085119d0" />
                                 </attributelist >
-                                <typetabsitem id="2818" addr="0x7ff9f1fb4bb0" >
-                                    <attributelist id="2819" addr="0x7ff9f1fb4bb0" >
+                                <typetabsitem id="2818" addr="0x7fdf0850bbb0" >
+                                    <attributelist id="2819" addr="0x7fdf0850bbb0" >
                                     </attributelist >
                                 </typetabsitem >
                             </typetab >
-                            <attribute name="parent" value="0x7ff9f1f72a30" id="2820" addr="0x7ff9f1f72a30" />
-                            <attribute name="qname" value="XBMCAddon" id="2821" addr="0x7ff9f1fba9d0" />
-                            <attribute name="symtab" value="0x7ff9f1f89bb0" id="2822" addr="0x7ff9f1f89bb0" />
+                            <attribute name="parent" value="0x7fdf084c9a30" id="2820" addr="0x7fdf084c9a30" />
+                            <attribute name="qname" value="XBMCAddon" id="2821" addr="0x7fdf085119d0" />
+                            <attribute name="symtab" value="0x7fdf084e0bb0" id="2822" addr="0x7fdf084e0bb0" />
                         </attributelist >
-                        <typescopesitem id="2823" addr="0x7ff9f1f89b70" >
-                            <attributelist id="2824" addr="0x7ff9f1f89b70" >
+                        <typescopesitem id="2823" addr="0x7fdf084e0b70" >
+                            <attributelist id="2824" addr="0x7fdf084e0b70" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="2825" addr="0x7ff9f1fb49d0" >
-                            <attributelist id="2826" addr="0x7ff9f1fb49d0" >
-                                <attribute name="String" value="std::string" id="2827" addr="0x7ff9f1fba9d0" />
+                        <typescopesitem id="2825" addr="0x7fdf0850b9d0" >
+                            <attributelist id="2826" addr="0x7fdf0850b9d0" >
+                                <attribute name="String" value="std::string" id="2827" addr="0x7fdf085119d0" />
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="2828" addr="0x7ff9f1f72a30" >
-                            <attributelist id="2829" addr="0x7ff9f1f72a30" >
-                                <attribute name="name" value="" id="2830" addr="0x7ff9f1fba9d0" />
-                                <typetab id="2831" addr="0x7ff9f1f72a90" >
-                                    <attributelist id="2832" addr="0x7ff9f1f72a90" >
-                                        <attribute name="CGUIDialogKeyboardGeneric" value="CGUIDialogKeyboardGeneric" id="2833" addr="0x7ff9f1fba9d0" />
+                        <typescopesitem id="2828" addr="0x7fdf084c9a30" >
+                            <attributelist id="2829" addr="0x7fdf084c9a30" >
+                                <attribute name="name" value="" id="2830" addr="0x7fdf085119d0" />
+                                <typetab id="2831" addr="0x7fdf084c9a90" >
+                                    <attributelist id="2832" addr="0x7fdf084c9a90" >
+                                        <attribute name="CGUIDialogKeyboardGeneric" value="CGUIDialogKeyboardGeneric" id="2833" addr="0x7fdf085119d0" />
                                     </attributelist >
-                                    <typetabsitem id="2834" addr="0x7ff9f1fb7950" >
-                                        <attributelist id="2835" addr="0x7ff9f1fb7950" >
+                                    <typetabsitem id="2834" addr="0x7fdf0850e950" >
+                                        <attributelist id="2835" addr="0x7fdf0850e950" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="2836" addr="0x7ff9f1fb4ad0" >
-                            <attributelist id="2837" addr="0x7ff9f1fb4ad0" >
+                        <typescopesitem id="2836" addr="0x7fdf0850bad0" >
+                            <attributelist id="2837" addr="0x7fdf0850bad0" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="2838" addr="0x7ff9f1f89bb0" >
-                            <attributelist id="2839" addr="0x7ff9f1f89bb0" >
-                                <attribute name="name" value="XBMCAddon" id="2840" addr="0x7ff9f1fba9d0" />
-                                <attribute name="csymtab" value="0x7ff9f1f89bf0" id="2841" addr="0x7ff9f1f89bf0" />
-                                <attribute name="symtab" value="0x7ff9f1f89b90" id="2842" addr="0x7ff9f1f89b90" />
+                        <typescopesitem id="2838" addr="0x7fdf084e0bb0" >
+                            <attributelist id="2839" addr="0x7fdf084e0bb0" >
+                                <attribute name="name" value="XBMCAddon" id="2840" addr="0x7fdf085119d0" />
+                                <attribute name="csymtab" value="0x7fdf084e0bf0" id="2841" addr="0x7fdf084e0bf0" />
+                                <attribute name="symtab" value="0x7fdf084e0b90" id="2842" addr="0x7fdf084e0b90" />
                             </attributelist >
                         </typescopesitem >
                     </typescope >
-                    <attribute name="symtab" value="0x7ff9f1f89bb0" id="2843" addr="0x7ff9f1f89bb0" />
-                    <attribute name="sym_symtab" value="0x7ff9f1f72950" id="2844" addr="0x7ff9f1f72950" />
+                    <attribute name="symtab" value="0x7fdf084e0bb0" id="2843" addr="0x7fdf084e0bb0" />
+                    <attribute name="sym_symtab" value="0x7fdf084c9950" id="2844" addr="0x7fdf084c9950" />
                 </attributelist >
 
-                <namespace id="2845" addr="0x7ff9f1fa04d0" >
-                    <attributelist id="2846" addr="0x7ff9f1fa04d0" >
-                        <attribute name="feature_knownbasetypes" value="AddonClass,IPlayerCallback,AddonCallback" id="2847" addr="0x7ff9f1fba9d0" />
-                        <attribute name="name" value="xbmc" id="2848" addr="0x7ff9f1fba9d0" />
-                        <attribute name="sym_symtab" value="0x7ff9f1f89bb0" id="2849" addr="0x7ff9f1f89bb0" />
-                        <attribute name="symtab" value="0x7ff9f1f8a2b0" id="2850" addr="0x7ff9f1f8a2b0" />
-                        <attribute name="sym_nextSibling" value="0x7ff9f1fa3330" id="2851" addr="0x7ff9f1fa3330" />
-                        <attribute name="csym_nextSibling" value="0x7ff9f1fa3330" id="2852" addr="0x7ff9f1fa3330" />
-                        <attribute name="sym_previousSibling" value="0x7ff9f1f9e350" id="2853" addr="0x7ff9f1f9e350" />
-                        <attribute name="feature_knownapitypes" value="XBMCAddon::xbmcgui::ListItem,XBMCAddon::xbmc::PlayListItem" id="2854" addr="0x7ff9f1fba9d0" />
-                        <attribute name="sym_name" value="xbmc" id="2855" addr="0x7ff9f1fba9d0" />
-                        <typescope id="2856" addr="0x7ff9f1fb4d70" >
-                            <attributelist id="2857" addr="0x7ff9f1fb4d70" >
-                                <attribute name="name" value="xbmc" id="2858" addr="0x7ff9f1fba9d0" />
-                                <typetab id="2859" addr="0x7ff9f1fb4d90" >
-                                    <attributelist id="2860" addr="0x7ff9f1fb4d90" >
-                                        <attribute name="Monitor" value="Monitor" id="2861" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="2862" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="Keyboard" value="Keyboard" id="2863" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="2864" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="InfoTagVideo" value="InfoTagVideo" id="2865" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="Player" value="Player" id="2866" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="InfoTagMusic" value="InfoTagMusic" id="2867" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="PlayList" value="PlayList" id="2868" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="RenderCapture" value="RenderCapture" id="2869" addr="0x7ff9f1fba9d0" />
+                <namespace id="2845" addr="0x7fdf084f74d0" >
+                    <attributelist id="2846" addr="0x7fdf084f74d0" >
+                        <attribute name="feature_knownbasetypes" value="AddonClass,IPlayerCallback,AddonCallback" id="2847" addr="0x7fdf085119d0" />
+                        <attribute name="name" value="xbmc" id="2848" addr="0x7fdf085119d0" />
+                        <attribute name="sym_symtab" value="0x7fdf084e0bb0" id="2849" addr="0x7fdf084e0bb0" />
+                        <attribute name="symtab" value="0x7fdf084e12b0" id="2850" addr="0x7fdf084e12b0" />
+                        <attribute name="sym_nextSibling" value="0x7fdf084fa330" id="2851" addr="0x7fdf084fa330" />
+                        <attribute name="csym_nextSibling" value="0x7fdf084fa330" id="2852" addr="0x7fdf084fa330" />
+                        <attribute name="sym_previousSibling" value="0x7fdf084f5350" id="2853" addr="0x7fdf084f5350" />
+                        <attribute name="feature_knownapitypes" value="XBMCAddon::xbmcgui::ListItem,XBMCAddon::xbmc::PlayListItem" id="2854" addr="0x7fdf085119d0" />
+                        <attribute name="sym_name" value="xbmc" id="2855" addr="0x7fdf085119d0" />
+                        <typescope id="2856" addr="0x7fdf0850bd70" >
+                            <attributelist id="2857" addr="0x7fdf0850bd70" >
+                                <attribute name="name" value="xbmc" id="2858" addr="0x7fdf085119d0" />
+                                <typetab id="2859" addr="0x7fdf0850bd90" >
+                                    <attributelist id="2860" addr="0x7fdf0850bd90" >
+                                        <attribute name="Monitor" value="Monitor" id="2861" addr="0x7fdf085119d0" />
+                                        <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="2862" addr="0x7fdf085119d0" />
+                                        <attribute name="Keyboard" value="Keyboard" id="2863" addr="0x7fdf085119d0" />
+                                        <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="2864" addr="0x7fdf085119d0" />
+                                        <attribute name="InfoTagVideo" value="InfoTagVideo" id="2865" addr="0x7fdf085119d0" />
+                                        <attribute name="Player" value="Player" id="2866" addr="0x7fdf085119d0" />
+                                        <attribute name="InfoTagMusic" value="InfoTagMusic" id="2867" addr="0x7fdf085119d0" />
+                                        <attribute name="PlayList" value="PlayList" id="2868" addr="0x7fdf085119d0" />
+                                        <attribute name="RenderCapture" value="RenderCapture" id="2869" addr="0x7fdf085119d0" />
                                     </attributelist >
-                                    <typetabsitem id="2870" addr="0x7ff9f1fb9b10" >
-                                        <attributelist id="2871" addr="0x7ff9f1fb9b10" >
+                                    <typetabsitem id="2870" addr="0x7fdf08510b10" >
+                                        <attributelist id="2871" addr="0x7fdf08510b10" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2872" addr="0x7ff9f1fb7f30" >
-                                        <attributelist id="2873" addr="0x7ff9f1fb7f30" >
+                                    <typetabsitem id="2872" addr="0x7fdf0850ef30" >
+                                        <attributelist id="2873" addr="0x7fdf0850ef30" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2874" addr="0x7ff9f1fb8990" >
-                                        <attributelist id="2875" addr="0x7ff9f1fb8990" >
+                                    <typetabsitem id="2874" addr="0x7fdf0850f990" >
+                                        <attributelist id="2875" addr="0x7fdf0850f990" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2876" addr="0x7ff9f1fb5e90" >
-                                        <attributelist id="2877" addr="0x7ff9f1fb5e90" >
+                                    <typetabsitem id="2876" addr="0x7fdf0850ce90" >
+                                        <attributelist id="2877" addr="0x7fdf0850ce90" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2878" addr="0x7ff9f1fb8310" >
-                                        <attributelist id="2879" addr="0x7ff9f1fb8310" >
+                                    <typetabsitem id="2878" addr="0x7fdf0850f310" >
+                                        <attributelist id="2879" addr="0x7fdf0850f310" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2880" addr="0x7ff9f1fb6050" >
-                                        <attributelist id="2881" addr="0x7ff9f1fb6050" >
+                                    <typetabsitem id="2880" addr="0x7fdf0850d050" >
+                                        <attributelist id="2881" addr="0x7fdf0850d050" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2882" addr="0x7ff9f1fb7b50" >
-                                        <attributelist id="2883" addr="0x7ff9f1fb7b50" >
+                                    <typetabsitem id="2882" addr="0x7fdf0850eb50" >
+                                        <attributelist id="2883" addr="0x7fdf0850eb50" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2884" addr="0x7ff9f1fb91b0" >
-                                        <attributelist id="2885" addr="0x7ff9f1fb91b0" >
+                                    <typetabsitem id="2884" addr="0x7fdf085101b0" >
+                                        <attributelist id="2885" addr="0x7fdf085101b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2886" addr="0x7ff9f1fb7490" >
-                                        <attributelist id="2887" addr="0x7ff9f1fb7490" >
+                                    <typetabsitem id="2886" addr="0x7fdf0850e490" >
+                                        <attributelist id="2887" addr="0x7fdf0850e490" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
-                                <attribute name="parent" value="0x7ff9f1fb4990" id="2888" addr="0x7ff9f1fb4990" />
-                                <attribute name="qname" value="XBMCAddon::xbmc" id="2889" addr="0x7ff9f1fba9d0" />
-                                <attribute name="symtab" value="0x7ff9f1f8a2b0" id="2890" addr="0x7ff9f1f8a2b0" />
+                                <attribute name="parent" value="0x7fdf0850b990" id="2888" addr="0x7fdf0850b990" />
+                                <attribute name="qname" value="XBMCAddon::xbmc" id="2889" addr="0x7fdf085119d0" />
+                                <attribute name="symtab" value="0x7fdf084e12b0" id="2890" addr="0x7fdf084e12b0" />
                             </attributelist >
-                            <typescopesitem id="2891" addr="0x7ff9f1f8a270" >
-                                <attributelist id="2892" addr="0x7ff9f1f8a270" >
+                            <typescopesitem id="2891" addr="0x7fdf084e1270" >
+                                <attributelist id="2892" addr="0x7fdf084e1270" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="2893" addr="0x7ff9f1fb4d90" >
-                                <attributelist id="2894" addr="0x7ff9f1fb4d90" >
-                                    <attribute name="Monitor" value="Monitor" id="2895" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="2896" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="Keyboard" value="Keyboard" id="2897" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="2898" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="InfoTagVideo" value="InfoTagVideo" id="2899" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="Player" value="Player" id="2900" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="InfoTagMusic" value="InfoTagMusic" id="2901" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="PlayList" value="PlayList" id="2902" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="RenderCapture" value="RenderCapture" id="2903" addr="0x7ff9f1fba9d0" />
+                            <typescopesitem id="2893" addr="0x7fdf0850bd90" >
+                                <attributelist id="2894" addr="0x7fdf0850bd90" >
+                                    <attribute name="Monitor" value="Monitor" id="2895" addr="0x7fdf085119d0" />
+                                    <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="2896" addr="0x7fdf085119d0" />
+                                    <attribute name="Keyboard" value="Keyboard" id="2897" addr="0x7fdf085119d0" />
+                                    <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="2898" addr="0x7fdf085119d0" />
+                                    <attribute name="InfoTagVideo" value="InfoTagVideo" id="2899" addr="0x7fdf085119d0" />
+                                    <attribute name="Player" value="Player" id="2900" addr="0x7fdf085119d0" />
+                                    <attribute name="InfoTagMusic" value="InfoTagMusic" id="2901" addr="0x7fdf085119d0" />
+                                    <attribute name="PlayList" value="PlayList" id="2902" addr="0x7fdf085119d0" />
+                                    <attribute name="RenderCapture" value="RenderCapture" id="2903" addr="0x7fdf085119d0" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="2904" addr="0x7ff9f1fb4990" >
-                                <attributelist id="2905" addr="0x7ff9f1fb4990" >
-                                    <attribute name="name" value="XBMCAddon" id="2906" addr="0x7ff9f1fba9d0" />
-                                    <typetab id="2907" addr="0x7ff9f1fb49d0" >
-                                        <attributelist id="2908" addr="0x7ff9f1fb49d0" >
-                                            <attribute name="String" value="std::string" id="2909" addr="0x7ff9f1fba9d0" />
-                                        </attributelist >
-                                        <typetabsitem id="2910" addr="0x7ff9f1fb4bb0" >
-                                            <attributelist id="2911" addr="0x7ff9f1fb4bb0" >
+                            <typescopesitem id="2904" addr="0x7fdf0850b990" >
+                                <attributelist id="2905" addr="0x7fdf0850b990" >
+                                    <attribute name="name" value="XBMCAddon" id="2906" addr="0x7fdf085119d0" />
+                                    <typetab id="2907" addr="0x7fdf0850b9d0" >
+                                        <attributelist id="2908" addr="0x7fdf0850b9d0" >
+                                            <attribute name="String" value="std::string" id="2909" addr="0x7fdf085119d0" />
+                                        </attributelist >
+                                        <typetabsitem id="2910" addr="0x7fdf0850bbb0" >
+                                            <attributelist id="2911" addr="0x7fdf0850bbb0" >
                                             </attributelist >
                                         </typetabsitem >
                                     </typetab >
-                                    <attribute name="parent" value="0x7ff9f1f72a30" id="2912" addr="0x7ff9f1f72a30" />
-                                    <attribute name="qname" value="XBMCAddon" id="2913" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="symtab" value="0x7ff9f1f89bb0" id="2914" addr="0x7ff9f1f89bb0" />
+                                    <attribute name="parent" value="0x7fdf084c9a30" id="2912" addr="0x7fdf084c9a30" />
+                                    <attribute name="qname" value="XBMCAddon" id="2913" addr="0x7fdf085119d0" />
+                                    <attribute name="symtab" value="0x7fdf084e0bb0" id="2914" addr="0x7fdf084e0bb0" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="2915" addr="0x7ff9f1fb4db0" >
-                                <attributelist id="2916" addr="0x7ff9f1fb4db0" >
+                            <typescopesitem id="2915" addr="0x7fdf0850bdb0" >
+                                <attributelist id="2916" addr="0x7fdf0850bdb0" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="2917" addr="0x7ff9f1f8a2b0" >
-                                <attributelist id="2918" addr="0x7ff9f1f8a2b0" >
-                                    <attribute name="name" value="xbmc" id="2919" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="csymtab" value="0x7ff9f1f8a2f0" id="2920" addr="0x7ff9f1f8a2f0" />
-                                    <attribute name="symtab" value="0x7ff9f1f8a290" id="2921" addr="0x7ff9f1f8a290" />
+                            <typescopesitem id="2917" addr="0x7fdf084e12b0" >
+                                <attributelist id="2918" addr="0x7fdf084e12b0" >
+                                    <attribute name="name" value="xbmc" id="2919" addr="0x7fdf085119d0" />
+                                    <attribute name="csymtab" value="0x7fdf084e12f0" id="2920" addr="0x7fdf084e12f0" />
+                                    <attribute name="symtab" value="0x7fdf084e1290" id="2921" addr="0x7fdf084e1290" />
                                 </attributelist >
                             </typescopesitem >
                         </typescope >
                     </attributelist >
 
-                    <class id="2922" addr="0x7ff9f1fa0650" >
-                        <attributelist id="2923" addr="0x7ff9f1fa0650" >
-                            <attribute name="name" value="XBMCAddon::xbmc::InfoTagMusic" id="2924" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="2925" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="symtab" value="0x7ff9f1fa0790" id="2926" addr="0x7ff9f1fa0790" />
-                            <attribute name="allows_typedef" value="1" id="2927" addr="0x7ff9f1fba9d0" />
-                            <attribute name="typepass_visit" value="1" id="2928" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_visit" value="1" id="2929" addr="0x7ff9f1fba9d0" />
-                            <attribute name="kind" value="class" id="2930" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_name" value="InfoTagMusic" id="2931" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_default_constructor" value="1" id="2932" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_has_constructor" value="1" id="2933" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_public_constructor" value="1" id="2934" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_has_destructor" value="1" id="2935" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_default_destructor" value="1" id="2936" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_copy_constructor" value="1" id="2937" addr="0x7ff9f1fba9d0" />
-                            <attribute name="privatebaselist" value="0x7ff9f1fa0630" id="2938" addr="0x7ff9f1fa0630" />
-                            <attribute name="protectedbaselist" value="0x7ff9f1fa0610" id="2939" addr="0x7ff9f1fa0610" />
-                            <baselist id="2940" addr="0x7ff9f1fa05f0" >
-                                <base name="AddonClass" id="2941" addr="0x7ff9f1fa0570" />
+                    <class id="2922" addr="0x7fdf084f7650" >
+                        <attributelist id="2923" addr="0x7fdf084f7650" >
+                            <attribute name="name" value="XBMCAddon::xbmc::InfoTagMusic" id="2924" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="2925" addr="0x7fdf084e12b0" />
+                            <attribute name="symtab" value="0x7fdf084f7790" id="2926" addr="0x7fdf084f7790" />
+                            <attribute name="allows_typedef" value="1" id="2927" addr="0x7fdf085119d0" />
+                            <attribute name="typepass_visit" value="1" id="2928" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_visit" value="1" id="2929" addr="0x7fdf085119d0" />
+                            <attribute name="kind" value="class" id="2930" addr="0x7fdf085119d0" />
+                            <attribute name="sym_name" value="InfoTagMusic" id="2931" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_default_constructor" value="1" id="2932" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_has_constructor" value="1" id="2933" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_public_constructor" value="1" id="2934" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_has_destructor" value="1" id="2935" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_default_destructor" value="1" id="2936" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_copy_constructor" value="1" id="2937" addr="0x7fdf085119d0" />
+                            <attribute name="privatebaselist" value="0x7fdf084f7630" id="2938" addr="0x7fdf084f7630" />
+                            <attribute name="protectedbaselist" value="0x7fdf084f7610" id="2939" addr="0x7fdf084f7610" />
+                            <baselist id="2940" addr="0x7fdf084f75f0" >
+                                <base name="AddonClass" id="2941" addr="0x7fdf084f7570" />
                             </baselist >
-                            <attribute name="module" value="xbmc" id="2942" addr="0x7ff9f1f89430" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="2943" addr="0x7ff9f1fba9d0" />
-                            <typescope id="2944" addr="0x7ff9f1fb7c10" >
-                                <attributelist id="2945" addr="0x7ff9f1fb7c10" >
-                                    <attribute name="name" value="InfoTagMusic" id="2946" addr="0x7ff9f1fba9d0" />
-                                    <typetab id="2947" addr="0x7ff9f1fb7c30" >
-                                        <attributelist id="2948" addr="0x7ff9f1fb7c30" >
+                            <attribute name="module" value="xbmc" id="2942" addr="0x7fdf084e0430" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="2943" addr="0x7fdf085119d0" />
+                            <typescope id="2944" addr="0x7fdf0850ec10" >
+                                <attributelist id="2945" addr="0x7fdf0850ec10" >
+                                    <attribute name="name" value="InfoTagMusic" id="2946" addr="0x7fdf085119d0" />
+                                    <typetab id="2947" addr="0x7fdf0850ec30" >
+                                        <attributelist id="2948" addr="0x7fdf0850ec30" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7ff9f1fb4d70" id="2949" addr="0x7ff9f1fb4d70" />
-                                    <attribute name="qname" value="XBMCAddon::xbmc::InfoTagMusic" id="2950" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="symtab" value="0x7ff9f1fa0790" id="2951" addr="0x7ff9f1fa0790" />
+                                    <attribute name="parent" value="0x7fdf0850bd70" id="2949" addr="0x7fdf0850bd70" />
+                                    <attribute name="qname" value="XBMCAddon::xbmc::InfoTagMusic" id="2950" addr="0x7fdf085119d0" />
+                                    <attribute name="symtab" value="0x7fdf084f7790" id="2951" addr="0x7fdf084f7790" />
                                 </attributelist >
-                                <typescopesitem id="2952" addr="0x7ff9f1fb7bb0" >
-                                    <attributelist id="2953" addr="0x7ff9f1fb7bb0" >
+                                <typescopesitem id="2952" addr="0x7fdf0850ebb0" >
+                                    <attributelist id="2953" addr="0x7fdf0850ebb0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="2954" addr="0x7ff9f1fb7c30" >
-                                    <attributelist id="2955" addr="0x7ff9f1fb7c30" >
+                                <typescopesitem id="2954" addr="0x7fdf0850ec30" >
+                                    <attributelist id="2955" addr="0x7fdf0850ec30" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="2956" addr="0x7ff9f1fb4d70" >
-                                    <attributelist id="2957" addr="0x7ff9f1fb4d70" >
-                                        <attribute name="name" value="xbmc" id="2958" addr="0x7ff9f1fba9d0" />
-                                        <typetab id="2959" addr="0x7ff9f1fb4d90" >
-                                            <attributelist id="2960" addr="0x7ff9f1fb4d90" >
-                                                <attribute name="Monitor" value="Monitor" id="2961" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="2962" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="Keyboard" value="Keyboard" id="2963" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="2964" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="InfoTagVideo" value="InfoTagVideo" id="2965" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="Player" value="Player" id="2966" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="InfoTagMusic" value="InfoTagMusic" id="2967" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="PlayList" value="PlayList" id="2968" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="RenderCapture" value="RenderCapture" id="2969" addr="0x7ff9f1fba9d0" />
+                                <typescopesitem id="2956" addr="0x7fdf0850bd70" >
+                                    <attributelist id="2957" addr="0x7fdf0850bd70" >
+                                        <attribute name="name" value="xbmc" id="2958" addr="0x7fdf085119d0" />
+                                        <typetab id="2959" addr="0x7fdf0850bd90" >
+                                            <attributelist id="2960" addr="0x7fdf0850bd90" >
+                                                <attribute name="Monitor" value="Monitor" id="2961" addr="0x7fdf085119d0" />
+                                                <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="2962" addr="0x7fdf085119d0" />
+                                                <attribute name="Keyboard" value="Keyboard" id="2963" addr="0x7fdf085119d0" />
+                                                <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="2964" addr="0x7fdf085119d0" />
+                                                <attribute name="InfoTagVideo" value="InfoTagVideo" id="2965" addr="0x7fdf085119d0" />
+                                                <attribute name="Player" value="Player" id="2966" addr="0x7fdf085119d0" />
+                                                <attribute name="InfoTagMusic" value="InfoTagMusic" id="2967" addr="0x7fdf085119d0" />
+                                                <attribute name="PlayList" value="PlayList" id="2968" addr="0x7fdf085119d0" />
+                                                <attribute name="RenderCapture" value="RenderCapture" id="2969" addr="0x7fdf085119d0" />
                                             </attributelist >
-                                            <typetabsitem id="2970" addr="0x7ff9f1fb9b10" >
-                                                <attributelist id="2971" addr="0x7ff9f1fb9b10" >
+                                            <typetabsitem id="2970" addr="0x7fdf08510b10" >
+                                                <attributelist id="2971" addr="0x7fdf08510b10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2972" addr="0x7ff9f1fb7f30" >
-                                                <attributelist id="2973" addr="0x7ff9f1fb7f30" >
+                                            <typetabsitem id="2972" addr="0x7fdf0850ef30" >
+                                                <attributelist id="2973" addr="0x7fdf0850ef30" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2974" addr="0x7ff9f1fb8990" >
-                                                <attributelist id="2975" addr="0x7ff9f1fb8990" >
+                                            <typetabsitem id="2974" addr="0x7fdf0850f990" >
+                                                <attributelist id="2975" addr="0x7fdf0850f990" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2976" addr="0x7ff9f1fb5e90" >
-                                                <attributelist id="2977" addr="0x7ff9f1fb5e90" >
+                                            <typetabsitem id="2976" addr="0x7fdf0850ce90" >
+                                                <attributelist id="2977" addr="0x7fdf0850ce90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2978" addr="0x7ff9f1fb8310" >
-                                                <attributelist id="2979" addr="0x7ff9f1fb8310" >
+                                            <typetabsitem id="2978" addr="0x7fdf0850f310" >
+                                                <attributelist id="2979" addr="0x7fdf0850f310" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2980" addr="0x7ff9f1fb6050" >
-                                                <attributelist id="2981" addr="0x7ff9f1fb6050" >
+                                            <typetabsitem id="2980" addr="0x7fdf0850d050" >
+                                                <attributelist id="2981" addr="0x7fdf0850d050" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2982" addr="0x7ff9f1fb7b50" >
-                                                <attributelist id="2983" addr="0x7ff9f1fb7b50" >
+                                            <typetabsitem id="2982" addr="0x7fdf0850eb50" >
+                                                <attributelist id="2983" addr="0x7fdf0850eb50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2984" addr="0x7ff9f1fb91b0" >
-                                                <attributelist id="2985" addr="0x7ff9f1fb91b0" >
+                                            <typetabsitem id="2984" addr="0x7fdf085101b0" >
+                                                <attributelist id="2985" addr="0x7fdf085101b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2986" addr="0x7ff9f1fb7490" >
-                                                <attributelist id="2987" addr="0x7ff9f1fb7490" >
+                                            <typetabsitem id="2986" addr="0x7fdf0850e490" >
+                                                <attributelist id="2987" addr="0x7fdf0850e490" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7ff9f1fb4990" id="2988" addr="0x7ff9f1fb4990" />
-                                        <attribute name="qname" value="XBMCAddon::xbmc" id="2989" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="symtab" value="0x7ff9f1f8a2b0" id="2990" addr="0x7ff9f1f8a2b0" />
+                                        <attribute name="parent" value="0x7fdf0850b990" id="2988" addr="0x7fdf0850b990" />
+                                        <attribute name="qname" value="XBMCAddon::xbmc" id="2989" addr="0x7fdf085119d0" />
+                                        <attribute name="symtab" value="0x7fdf084e12b0" id="2990" addr="0x7fdf084e12b0" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="2991" addr="0x7ff9f1fb7c50" >
-                                    <attributelist id="2992" addr="0x7ff9f1fb7c50" >
+                                <typescopesitem id="2991" addr="0x7fdf0850ec50" >
+                                    <attributelist id="2992" addr="0x7fdf0850ec50" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="2993" addr="0x7ff9f1fa0790" >
-                                    <attributelist id="2994" addr="0x7ff9f1fa0790" >
-                                        <attribute name="name" value="InfoTagMusic" id="2995" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="csymtab" value="0x7ff9f1fa07b0" id="2996" addr="0x7ff9f1fa07b0" />
-                                        <attribute name="symtab" value="0x7ff9f1fa0750" id="2997" addr="0x7ff9f1fa0750" />
+                                <typescopesitem id="2993" addr="0x7fdf084f7790" >
+                                    <attributelist id="2994" addr="0x7fdf084f7790" >
+                                        <attribute name="name" value="InfoTagMusic" id="2995" addr="0x7fdf085119d0" />
+                                        <attribute name="csymtab" value="0x7fdf084f77b0" id="2996" addr="0x7fdf084f77b0" />
+                                        <attribute name="symtab" value="0x7fdf084f7750" id="2997" addr="0x7fdf084f7750" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <access id="2998" addr="0x7ff9f1fa0710" >
-                            <attributelist id="2999" addr="0x7ff9f1fa0710" >
-                                <attribute name="kind" value="private" id="3000" addr="0x7ff9f1fba9d0" />
+                        <access id="2998" addr="0x7fdf084f7710" >
+                            <attributelist id="2999" addr="0x7fdf084f7710" >
+                                <attribute name="kind" value="private" id="3000" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </access >
-                        <cdecl id="3001" addr="0x7ff9f1fa0910" >
-                            <attributelist id="3002" addr="0x7ff9f1fa0910" >
-                                <attribute name="ismember" value="1" id="3003" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="infoTag" id="3004" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="p." id="3005" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="private" id="3006" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="variable" id="3007" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="MUSIC_INFO::CMusicInfoTag" id="3008" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa0790" id="3009" addr="0x7ff9f1fa0790" />
+                        <cdecl id="3001" addr="0x7fdf084f7910" >
+                            <attributelist id="3002" addr="0x7fdf084f7910" >
+                                <attribute name="ismember" value="1" id="3003" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="infoTag" id="3004" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="p." id="3005" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="private" id="3006" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="variable" id="3007" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="MUSIC_INFO::CMusicInfoTag" id="3008" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084f7790" id="3009" addr="0x7fdf084f7790" />
                             </attributelist >
                          
                         </cdecl >
-                        <access id="3010" addr="0x7ff9f1fa09f0" >
-                            <attributelist id="3011" addr="0x7ff9f1fa09f0" >
-                                <attribute name="kind" value="public" id="3012" addr="0x7ff9f1fba9d0" />
+                        <access id="3010" addr="0x7fdf084f79f0" >
+                            <attributelist id="3011" addr="0x7fdf084f79f0" >
+                                <attribute name="kind" value="public" id="3012" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="3013" addr="0x7ff9f1fa0b10" >
-                            <attributelist id="3014" addr="0x7ff9f1fa0b10" >
-                                <attribute name="ismember" value="1" id="3015" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="InfoTagMusic" id="3016" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="InfoTagMusic" id="3017" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3018" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3019" addr="0x7ff9f1fba9d0" />
-                                <attribute name="feature_new" value="1" id="3020" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa0790" id="3021" addr="0x7ff9f1fa0790" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3022" addr="0x7ff9f1fba9d0" />
+                        <constructor id="3013" addr="0x7fdf084f7b10" >
+                            <attributelist id="3014" addr="0x7fdf084f7b10" >
+                                <attribute name="ismember" value="1" id="3015" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="InfoTagMusic" id="3016" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="InfoTagMusic" id="3017" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3018" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3019" addr="0x7fdf085119d0" />
+                                <attribute name="feature_new" value="1" id="3020" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084f7790" id="3021" addr="0x7fdf084f7790" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3022" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </constructor >
-                        <destructor id="3023" addr="0x7ff9f1fa0c70" >
-                            <attributelist id="3024" addr="0x7ff9f1fa0c70" >
-                                <attribute name="ismember" value="1" id="3025" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="~InfoTagMusic" id="3026" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="~InfoTagMusic" id="3027" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3028" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3029" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa0790" id="3030" addr="0x7ff9f1fa0790" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3031" addr="0x7ff9f1fba9d0" />
+                        <destructor id="3023" addr="0x7fdf084f7c70" >
+                            <attributelist id="3024" addr="0x7fdf084f7c70" >
+                                <attribute name="ismember" value="1" id="3025" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="~InfoTagMusic" id="3026" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="~InfoTagMusic" id="3027" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3028" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3029" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084f7790" id="3030" addr="0x7fdf084f7790" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3031" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </destructor >
-                        <cdecl id="3032" addr="0x7ff9f1fa0e30" >
-                            <attributelist id="3033" addr="0x7ff9f1fa0e30" >
-                                <attribute name="ismember" value="1" id="3034" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getDbId" id="3035" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getDbId" id="3036" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3037" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3038" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3039" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="int" id="3040" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa0790" id="3041" addr="0x7ff9f1fa0790" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3042" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3043" addr="0x7ff9f1fa1010" >
-                            <attributelist id="3044" addr="0x7ff9f1fa1010" >
-                                <attribute name="ismember" value="1" id="3045" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getURL" id="3046" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getURL" id="3047" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3048" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3049" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3050" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3051" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa0790" id="3052" addr="0x7ff9f1fa0790" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3053" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3054" addr="0x7ff9f1fa11f0" >
-                            <attributelist id="3055" addr="0x7ff9f1fa11f0" >
-                                <attribute name="ismember" value="1" id="3056" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getTitle" id="3057" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getTitle" id="3058" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3059" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3060" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3061" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3062" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa0790" id="3063" addr="0x7ff9f1fa0790" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3064" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3065" addr="0x7ff9f1fa13d0" >
-                            <attributelist id="3066" addr="0x7ff9f1fa13d0" >
-                                <attribute name="ismember" value="1" id="3067" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getMediaType" id="3068" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getMediaType" id="3069" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3070" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3071" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3072" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3073" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa0790" id="3074" addr="0x7ff9f1fa0790" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3075" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3076" addr="0x7ff9f1fa15b0" >
-                            <attributelist id="3077" addr="0x7ff9f1fa15b0" >
-                                <attribute name="ismember" value="1" id="3078" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getArtist" id="3079" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getArtist" id="3080" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3081" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3082" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3083" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3084" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa0790" id="3085" addr="0x7ff9f1fa0790" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3086" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3087" addr="0x7ff9f1fa1790" >
-                            <attributelist id="3088" addr="0x7ff9f1fa1790" >
-                                <attribute name="ismember" value="1" id="3089" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getAlbum" id="3090" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getAlbum" id="3091" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3092" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3093" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3094" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3095" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa0790" id="3096" addr="0x7ff9f1fa0790" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3097" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3098" addr="0x7ff9f1fa1970" >
-                            <attributelist id="3099" addr="0x7ff9f1fa1970" >
-                                <attribute name="ismember" value="1" id="3100" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getAlbumArtist" id="3101" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getAlbumArtist" id="3102" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3103" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3104" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3105" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3106" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa0790" id="3107" addr="0x7ff9f1fa0790" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3108" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3109" addr="0x7ff9f1fa1b50" >
-                            <attributelist id="3110" addr="0x7ff9f1fa1b50" >
-                                <attribute name="ismember" value="1" id="3111" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getGenre" id="3112" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getGenre" id="3113" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3114" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3115" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3116" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3117" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa0790" id="3118" addr="0x7ff9f1fa0790" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3119" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3120" addr="0x7ff9f1fa1d30" >
-                            <attributelist id="3121" addr="0x7ff9f1fa1d30" >
-                                <attribute name="ismember" value="1" id="3122" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getDuration" id="3123" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getDuration" id="3124" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3125" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3126" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3127" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="int" id="3128" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa0790" id="3129" addr="0x7ff9f1fa0790" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3130" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3131" addr="0x7ff9f1fa1f10" >
-                            <attributelist id="3132" addr="0x7ff9f1fa1f10" >
-                                <attribute name="ismember" value="1" id="3133" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getRating" id="3134" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getRating" id="3135" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3136" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3137" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3138" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="int" id="3139" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa0790" id="3140" addr="0x7ff9f1fa0790" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3141" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3142" addr="0x7ff9f1fa20f0" >
-                            <attributelist id="3143" addr="0x7ff9f1fa20f0" >
-                                <attribute name="ismember" value="1" id="3144" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getUserRating" id="3145" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getUserRating" id="3146" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3147" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3148" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3149" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="int" id="3150" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa0790" id="3151" addr="0x7ff9f1fa0790" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3152" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3153" addr="0x7ff9f1fa22d0" >
-                            <attributelist id="3154" addr="0x7ff9f1fa22d0" >
-                                <attribute name="ismember" value="1" id="3155" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getTrack" id="3156" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getTrack" id="3157" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3158" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3159" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3160" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="int" id="3161" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa0790" id="3162" addr="0x7ff9f1fa0790" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3163" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3164" addr="0x7ff9f1fa24b0" >
-                            <attributelist id="3165" addr="0x7ff9f1fa24b0" >
-                                <attribute name="ismember" value="1" id="3166" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getDisc" id="3167" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getDisc" id="3168" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3169" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3170" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3171" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="int" id="3172" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa0790" id="3173" addr="0x7ff9f1fa0790" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3174" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3175" addr="0x7ff9f1fa2690" >
-                            <attributelist id="3176" addr="0x7ff9f1fa2690" >
-                                <attribute name="ismember" value="1" id="3177" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getReleaseDate" id="3178" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getReleaseDate" id="3179" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3180" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3181" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3182" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3183" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa0790" id="3184" addr="0x7ff9f1fa0790" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3185" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3186" addr="0x7ff9f1fa2870" >
-                            <attributelist id="3187" addr="0x7ff9f1fa2870" >
-                                <attribute name="ismember" value="1" id="3188" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getListeners" id="3189" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getListeners" id="3190" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3191" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3192" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3193" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="int" id="3194" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa0790" id="3195" addr="0x7ff9f1fa0790" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3196" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3197" addr="0x7ff9f1fa2a50" >
-                            <attributelist id="3198" addr="0x7ff9f1fa2a50" >
-                                <attribute name="ismember" value="1" id="3199" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getPlayCount" id="3200" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getPlayCount" id="3201" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3202" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3203" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3204" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="int" id="3205" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa0790" id="3206" addr="0x7ff9f1fa0790" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3207" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3208" addr="0x7ff9f1fa2c30" >
-                            <attributelist id="3209" addr="0x7ff9f1fa2c30" >
-                                <attribute name="ismember" value="1" id="3210" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getLastPlayed" id="3211" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getLastPlayed" id="3212" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3213" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3214" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3215" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3216" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa0790" id="3217" addr="0x7ff9f1fa0790" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3218" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3219" addr="0x7ff9f1fa2e10" >
-                            <attributelist id="3220" addr="0x7ff9f1fa2e10" >
-                                <attribute name="ismember" value="1" id="3221" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getComment" id="3222" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getComment" id="3223" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3224" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3225" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3226" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3227" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa0790" id="3228" addr="0x7ff9f1fa0790" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3229" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3230" addr="0x7ff9f1fa2ff0" >
-                            <attributelist id="3231" addr="0x7ff9f1fa2ff0" >
-                                <attribute name="ismember" value="1" id="3232" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getLyrics" id="3233" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getLyrics" id="3234" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3235" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3236" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3237" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3238" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa0790" id="3239" addr="0x7ff9f1fa0790" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3240" addr="0x7ff9f1fba9d0" />
+                        <cdecl id="3032" addr="0x7fdf084f7e30" >
+                            <attributelist id="3033" addr="0x7fdf084f7e30" >
+                                <attribute name="ismember" value="1" id="3034" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getDbId" id="3035" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getDbId" id="3036" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3037" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3038" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3039" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="int" id="3040" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084f7790" id="3041" addr="0x7fdf084f7790" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3042" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3043" addr="0x7fdf084f8010" >
+                            <attributelist id="3044" addr="0x7fdf084f8010" >
+                                <attribute name="ismember" value="1" id="3045" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getURL" id="3046" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getURL" id="3047" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3048" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3049" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3050" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3051" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084f7790" id="3052" addr="0x7fdf084f7790" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3053" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3054" addr="0x7fdf084f81f0" >
+                            <attributelist id="3055" addr="0x7fdf084f81f0" >
+                                <attribute name="ismember" value="1" id="3056" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getTitle" id="3057" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getTitle" id="3058" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3059" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3060" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3061" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3062" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084f7790" id="3063" addr="0x7fdf084f7790" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3064" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3065" addr="0x7fdf084f83d0" >
+                            <attributelist id="3066" addr="0x7fdf084f83d0" >
+                                <attribute name="ismember" value="1" id="3067" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getMediaType" id="3068" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getMediaType" id="3069" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3070" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3071" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3072" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3073" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084f7790" id="3074" addr="0x7fdf084f7790" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3075" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3076" addr="0x7fdf084f85b0" >
+                            <attributelist id="3077" addr="0x7fdf084f85b0" >
+                                <attribute name="ismember" value="1" id="3078" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getArtist" id="3079" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getArtist" id="3080" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3081" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3082" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3083" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3084" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084f7790" id="3085" addr="0x7fdf084f7790" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3086" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3087" addr="0x7fdf084f8790" >
+                            <attributelist id="3088" addr="0x7fdf084f8790" >
+                                <attribute name="ismember" value="1" id="3089" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getAlbum" id="3090" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getAlbum" id="3091" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3092" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3093" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3094" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3095" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084f7790" id="3096" addr="0x7fdf084f7790" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3097" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3098" addr="0x7fdf084f8970" >
+                            <attributelist id="3099" addr="0x7fdf084f8970" >
+                                <attribute name="ismember" value="1" id="3100" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getAlbumArtist" id="3101" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getAlbumArtist" id="3102" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3103" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3104" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3105" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3106" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084f7790" id="3107" addr="0x7fdf084f7790" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3108" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3109" addr="0x7fdf084f8b50" >
+                            <attributelist id="3110" addr="0x7fdf084f8b50" >
+                                <attribute name="ismember" value="1" id="3111" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getGenre" id="3112" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getGenre" id="3113" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3114" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3115" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3116" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3117" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084f7790" id="3118" addr="0x7fdf084f7790" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3119" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3120" addr="0x7fdf084f8d30" >
+                            <attributelist id="3121" addr="0x7fdf084f8d30" >
+                                <attribute name="ismember" value="1" id="3122" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getDuration" id="3123" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getDuration" id="3124" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3125" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3126" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3127" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="int" id="3128" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084f7790" id="3129" addr="0x7fdf084f7790" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3130" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3131" addr="0x7fdf084f8f10" >
+                            <attributelist id="3132" addr="0x7fdf084f8f10" >
+                                <attribute name="ismember" value="1" id="3133" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getRating" id="3134" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getRating" id="3135" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3136" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3137" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3138" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="int" id="3139" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084f7790" id="3140" addr="0x7fdf084f7790" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3141" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3142" addr="0x7fdf084f90f0" >
+                            <attributelist id="3143" addr="0x7fdf084f90f0" >
+                                <attribute name="ismember" value="1" id="3144" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getUserRating" id="3145" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getUserRating" id="3146" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3147" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3148" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3149" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="int" id="3150" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084f7790" id="3151" addr="0x7fdf084f7790" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3152" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3153" addr="0x7fdf084f92d0" >
+                            <attributelist id="3154" addr="0x7fdf084f92d0" >
+                                <attribute name="ismember" value="1" id="3155" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getTrack" id="3156" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getTrack" id="3157" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3158" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3159" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3160" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="int" id="3161" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084f7790" id="3162" addr="0x7fdf084f7790" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3163" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3164" addr="0x7fdf084f94b0" >
+                            <attributelist id="3165" addr="0x7fdf084f94b0" >
+                                <attribute name="ismember" value="1" id="3166" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getDisc" id="3167" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getDisc" id="3168" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3169" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3170" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3171" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="int" id="3172" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084f7790" id="3173" addr="0x7fdf084f7790" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3174" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3175" addr="0x7fdf084f9690" >
+                            <attributelist id="3176" addr="0x7fdf084f9690" >
+                                <attribute name="ismember" value="1" id="3177" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getReleaseDate" id="3178" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getReleaseDate" id="3179" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3180" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3181" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3182" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3183" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084f7790" id="3184" addr="0x7fdf084f7790" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3185" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3186" addr="0x7fdf084f9870" >
+                            <attributelist id="3187" addr="0x7fdf084f9870" >
+                                <attribute name="ismember" value="1" id="3188" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getListeners" id="3189" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getListeners" id="3190" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3191" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3192" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3193" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="int" id="3194" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084f7790" id="3195" addr="0x7fdf084f7790" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3196" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3197" addr="0x7fdf084f9a50" >
+                            <attributelist id="3198" addr="0x7fdf084f9a50" >
+                                <attribute name="ismember" value="1" id="3199" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getPlayCount" id="3200" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getPlayCount" id="3201" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3202" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3203" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3204" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="int" id="3205" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084f7790" id="3206" addr="0x7fdf084f7790" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3207" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3208" addr="0x7fdf084f9c30" >
+                            <attributelist id="3209" addr="0x7fdf084f9c30" >
+                                <attribute name="ismember" value="1" id="3210" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getLastPlayed" id="3211" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getLastPlayed" id="3212" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3213" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3214" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3215" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3216" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084f7790" id="3217" addr="0x7fdf084f7790" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3218" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3219" addr="0x7fdf084f9e10" >
+                            <attributelist id="3220" addr="0x7fdf084f9e10" >
+                                <attribute name="ismember" value="1" id="3221" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getComment" id="3222" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getComment" id="3223" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3224" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3225" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3226" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3227" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084f7790" id="3228" addr="0x7fdf084f7790" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3229" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3230" addr="0x7fdf084f9ff0" >
+                            <attributelist id="3231" addr="0x7fdf084f9ff0" >
+                                <attribute name="ismember" value="1" id="3232" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getLyrics" id="3233" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getLyrics" id="3234" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3235" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3236" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3237" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3238" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084f7790" id="3239" addr="0x7fdf084f7790" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3240" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </cdecl >
@@ -4581,753 +4581,753 @@
                 </namespace >
             </namespace >
         </include >
-        <include id="3241" addr="0x7ff9f1fa3210" >
-            <attributelist id="3242" addr="0x7ff9f1fa3210" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/InfoTagRadioRDS.h" id="3243" addr="0x7ff9f1fba9d0" />
+        <include id="3241" addr="0x7fdf084fa210" >
+            <attributelist id="3242" addr="0x7fdf084fa210" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/InfoTagRadioRDS.h" id="3243" addr="0x7fdf085119d0" />
             </attributelist >
 
-            <namespace id="3244" addr="0x7ff9f1fa32b0" >
-                <attributelist id="3245" addr="0x7ff9f1fa32b0" >
-                    <attribute name="sym_name" value="XBMCAddon" id="3246" addr="0x7ff9f1fba9d0" />
-                    <attribute name="name" value="XBMCAddon" id="3247" addr="0x7ff9f1fba9d0" />
-                    <attribute name="sym_previousSibling" value="0x7ff9f1fa0450" id="3248" addr="0x7ff9f1fa0450" />
-                    <attribute name="csym_nextSibling" value="0x7ff9f1fa73d0" id="3249" addr="0x7ff9f1fa73d0" />
-                    <attribute name="sym_nextSibling" value="0x7ff9f1fa73d0" id="3250" addr="0x7ff9f1fa73d0" />
-                    <typescope id="3251" addr="0x7ff9f1fb4990" >
-                        <attributelist id="3252" addr="0x7ff9f1fb4990" >
-                            <attribute name="name" value="XBMCAddon" id="3253" addr="0x7ff9f1fba9d0" />
-                            <typetab id="3254" addr="0x7ff9f1fb49d0" >
-                                <attributelist id="3255" addr="0x7ff9f1fb49d0" >
-                                    <attribute name="String" value="std::string" id="3256" addr="0x7ff9f1fba9d0" />
+            <namespace id="3244" addr="0x7fdf084fa2b0" >
+                <attributelist id="3245" addr="0x7fdf084fa2b0" >
+                    <attribute name="sym_name" value="XBMCAddon" id="3246" addr="0x7fdf085119d0" />
+                    <attribute name="name" value="XBMCAddon" id="3247" addr="0x7fdf085119d0" />
+                    <attribute name="sym_previousSibling" value="0x7fdf084f7450" id="3248" addr="0x7fdf084f7450" />
+                    <attribute name="csym_nextSibling" value="0x7fdf084fe3d0" id="3249" addr="0x7fdf084fe3d0" />
+                    <attribute name="sym_nextSibling" value="0x7fdf084fe3d0" id="3250" addr="0x7fdf084fe3d0" />
+                    <typescope id="3251" addr="0x7fdf0850b990" >
+                        <attributelist id="3252" addr="0x7fdf0850b990" >
+                            <attribute name="name" value="XBMCAddon" id="3253" addr="0x7fdf085119d0" />
+                            <typetab id="3254" addr="0x7fdf0850b9d0" >
+                                <attributelist id="3255" addr="0x7fdf0850b9d0" >
+                                    <attribute name="String" value="std::string" id="3256" addr="0x7fdf085119d0" />
                                 </attributelist >
-                                <typetabsitem id="3257" addr="0x7ff9f1fb4bb0" >
-                                    <attributelist id="3258" addr="0x7ff9f1fb4bb0" >
+                                <typetabsitem id="3257" addr="0x7fdf0850bbb0" >
+                                    <attributelist id="3258" addr="0x7fdf0850bbb0" >
                                     </attributelist >
                                 </typetabsitem >
                             </typetab >
-                            <attribute name="parent" value="0x7ff9f1f72a30" id="3259" addr="0x7ff9f1f72a30" />
-                            <attribute name="qname" value="XBMCAddon" id="3260" addr="0x7ff9f1fba9d0" />
-                            <attribute name="symtab" value="0x7ff9f1f89bb0" id="3261" addr="0x7ff9f1f89bb0" />
+                            <attribute name="parent" value="0x7fdf084c9a30" id="3259" addr="0x7fdf084c9a30" />
+                            <attribute name="qname" value="XBMCAddon" id="3260" addr="0x7fdf085119d0" />
+                            <attribute name="symtab" value="0x7fdf084e0bb0" id="3261" addr="0x7fdf084e0bb0" />
                         </attributelist >
-                        <typescopesitem id="3262" addr="0x7ff9f1f89b70" >
-                            <attributelist id="3263" addr="0x7ff9f1f89b70" >
+                        <typescopesitem id="3262" addr="0x7fdf084e0b70" >
+                            <attributelist id="3263" addr="0x7fdf084e0b70" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="3264" addr="0x7ff9f1fb49d0" >
-                            <attributelist id="3265" addr="0x7ff9f1fb49d0" >
-                                <attribute name="String" value="std::string" id="3266" addr="0x7ff9f1fba9d0" />
+                        <typescopesitem id="3264" addr="0x7fdf0850b9d0" >
+                            <attributelist id="3265" addr="0x7fdf0850b9d0" >
+                                <attribute name="String" value="std::string" id="3266" addr="0x7fdf085119d0" />
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="3267" addr="0x7ff9f1f72a30" >
-                            <attributelist id="3268" addr="0x7ff9f1f72a30" >
-                                <attribute name="name" value="" id="3269" addr="0x7ff9f1fba9d0" />
-                                <typetab id="3270" addr="0x7ff9f1f72a90" >
-                                    <attributelist id="3271" addr="0x7ff9f1f72a90" >
-                                        <attribute name="CGUIDialogKeyboardGeneric" value="CGUIDialogKeyboardGeneric" id="3272" addr="0x7ff9f1fba9d0" />
+                        <typescopesitem id="3267" addr="0x7fdf084c9a30" >
+                            <attributelist id="3268" addr="0x7fdf084c9a30" >
+                                <attribute name="name" value="" id="3269" addr="0x7fdf085119d0" />
+                                <typetab id="3270" addr="0x7fdf084c9a90" >
+                                    <attributelist id="3271" addr="0x7fdf084c9a90" >
+                                        <attribute name="CGUIDialogKeyboardGeneric" value="CGUIDialogKeyboardGeneric" id="3272" addr="0x7fdf085119d0" />
                                     </attributelist >
-                                    <typetabsitem id="3273" addr="0x7ff9f1fb7950" >
-                                        <attributelist id="3274" addr="0x7ff9f1fb7950" >
+                                    <typetabsitem id="3273" addr="0x7fdf0850e950" >
+                                        <attributelist id="3274" addr="0x7fdf0850e950" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="3275" addr="0x7ff9f1fb4ad0" >
-                            <attributelist id="3276" addr="0x7ff9f1fb4ad0" >
+                        <typescopesitem id="3275" addr="0x7fdf0850bad0" >
+                            <attributelist id="3276" addr="0x7fdf0850bad0" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="3277" addr="0x7ff9f1f89bb0" >
-                            <attributelist id="3278" addr="0x7ff9f1f89bb0" >
-                                <attribute name="name" value="XBMCAddon" id="3279" addr="0x7ff9f1fba9d0" />
-                                <attribute name="csymtab" value="0x7ff9f1f89bf0" id="3280" addr="0x7ff9f1f89bf0" />
-                                <attribute name="symtab" value="0x7ff9f1f89b90" id="3281" addr="0x7ff9f1f89b90" />
+                        <typescopesitem id="3277" addr="0x7fdf084e0bb0" >
+                            <attributelist id="3278" addr="0x7fdf084e0bb0" >
+                                <attribute name="name" value="XBMCAddon" id="3279" addr="0x7fdf085119d0" />
+                                <attribute name="csymtab" value="0x7fdf084e0bf0" id="3280" addr="0x7fdf084e0bf0" />
+                                <attribute name="symtab" value="0x7fdf084e0b90" id="3281" addr="0x7fdf084e0b90" />
                             </attributelist >
                         </typescopesitem >
                     </typescope >
-                    <attribute name="symtab" value="0x7ff9f1f89bb0" id="3282" addr="0x7ff9f1f89bb0" />
-                    <attribute name="sym_symtab" value="0x7ff9f1f72950" id="3283" addr="0x7ff9f1f72950" />
+                    <attribute name="symtab" value="0x7fdf084e0bb0" id="3282" addr="0x7fdf084e0bb0" />
+                    <attribute name="sym_symtab" value="0x7fdf084c9950" id="3283" addr="0x7fdf084c9950" />
                 </attributelist >
 
-                <namespace id="3284" addr="0x7ff9f1fa3330" >
-                    <attributelist id="3285" addr="0x7ff9f1fa3330" >
-                        <attribute name="feature_knownbasetypes" value="AddonClass,IPlayerCallback,AddonCallback" id="3286" addr="0x7ff9f1fba9d0" />
-                        <attribute name="name" value="xbmc" id="3287" addr="0x7ff9f1fba9d0" />
-                        <attribute name="sym_symtab" value="0x7ff9f1f89bb0" id="3288" addr="0x7ff9f1f89bb0" />
-                        <attribute name="symtab" value="0x7ff9f1f8a2b0" id="3289" addr="0x7ff9f1f8a2b0" />
-                        <attribute name="sym_nextSibling" value="0x7ff9f1fa7450" id="3290" addr="0x7ff9f1fa7450" />
-                        <attribute name="csym_nextSibling" value="0x7ff9f1fa7450" id="3291" addr="0x7ff9f1fa7450" />
-                        <attribute name="sym_previousSibling" value="0x7ff9f1fa04d0" id="3292" addr="0x7ff9f1fa04d0" />
-                        <attribute name="feature_knownapitypes" value="XBMCAddon::xbmcgui::ListItem,XBMCAddon::xbmc::PlayListItem" id="3293" addr="0x7ff9f1fba9d0" />
-                        <attribute name="sym_name" value="xbmc" id="3294" addr="0x7ff9f1fba9d0" />
-                        <typescope id="3295" addr="0x7ff9f1fb4d70" >
-                            <attributelist id="3296" addr="0x7ff9f1fb4d70" >
-                                <attribute name="name" value="xbmc" id="3297" addr="0x7ff9f1fba9d0" />
-                                <typetab id="3298" addr="0x7ff9f1fb4d90" >
-                                    <attributelist id="3299" addr="0x7ff9f1fb4d90" >
-                                        <attribute name="Monitor" value="Monitor" id="3300" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="3301" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="Keyboard" value="Keyboard" id="3302" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="3303" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="InfoTagVideo" value="InfoTagVideo" id="3304" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="Player" value="Player" id="3305" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="InfoTagMusic" value="InfoTagMusic" id="3306" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="PlayList" value="PlayList" id="3307" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="RenderCapture" value="RenderCapture" id="3308" addr="0x7ff9f1fba9d0" />
+                <namespace id="3284" addr="0x7fdf084fa330" >
+                    <attributelist id="3285" addr="0x7fdf084fa330" >
+                        <attribute name="feature_knownbasetypes" value="AddonClass,IPlayerCallback,AddonCallback" id="3286" addr="0x7fdf085119d0" />
+                        <attribute name="name" value="xbmc" id="3287" addr="0x7fdf085119d0" />
+                        <attribute name="sym_symtab" value="0x7fdf084e0bb0" id="3288" addr="0x7fdf084e0bb0" />
+                        <attribute name="symtab" value="0x7fdf084e12b0" id="3289" addr="0x7fdf084e12b0" />
+                        <attribute name="sym_nextSibling" value="0x7fdf084fe450" id="3290" addr="0x7fdf084fe450" />
+                        <attribute name="csym_nextSibling" value="0x7fdf084fe450" id="3291" addr="0x7fdf084fe450" />
+                        <attribute name="sym_previousSibling" value="0x7fdf084f74d0" id="3292" addr="0x7fdf084f74d0" />
+                        <attribute name="feature_knownapitypes" value="XBMCAddon::xbmcgui::ListItem,XBMCAddon::xbmc::PlayListItem" id="3293" addr="0x7fdf085119d0" />
+                        <attribute name="sym_name" value="xbmc" id="3294" addr="0x7fdf085119d0" />
+                        <typescope id="3295" addr="0x7fdf0850bd70" >
+                            <attributelist id="3296" addr="0x7fdf0850bd70" >
+                                <attribute name="name" value="xbmc" id="3297" addr="0x7fdf085119d0" />
+                                <typetab id="3298" addr="0x7fdf0850bd90" >
+                                    <attributelist id="3299" addr="0x7fdf0850bd90" >
+                                        <attribute name="Monitor" value="Monitor" id="3300" addr="0x7fdf085119d0" />
+                                        <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="3301" addr="0x7fdf085119d0" />
+                                        <attribute name="Keyboard" value="Keyboard" id="3302" addr="0x7fdf085119d0" />
+                                        <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="3303" addr="0x7fdf085119d0" />
+                                        <attribute name="InfoTagVideo" value="InfoTagVideo" id="3304" addr="0x7fdf085119d0" />
+                                        <attribute name="Player" value="Player" id="3305" addr="0x7fdf085119d0" />
+                                        <attribute name="InfoTagMusic" value="InfoTagMusic" id="3306" addr="0x7fdf085119d0" />
+                                        <attribute name="PlayList" value="PlayList" id="3307" addr="0x7fdf085119d0" />
+                                        <attribute name="RenderCapture" value="RenderCapture" id="3308" addr="0x7fdf085119d0" />
                                     </attributelist >
-                                    <typetabsitem id="3309" addr="0x7ff9f1fb9b10" >
-                                        <attributelist id="3310" addr="0x7ff9f1fb9b10" >
+                                    <typetabsitem id="3309" addr="0x7fdf08510b10" >
+                                        <attributelist id="3310" addr="0x7fdf08510b10" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="3311" addr="0x7ff9f1fb7f30" >
-                                        <attributelist id="3312" addr="0x7ff9f1fb7f30" >
+                                    <typetabsitem id="3311" addr="0x7fdf0850ef30" >
+                                        <attributelist id="3312" addr="0x7fdf0850ef30" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="3313" addr="0x7ff9f1fb8990" >
-                                        <attributelist id="3314" addr="0x7ff9f1fb8990" >
+                                    <typetabsitem id="3313" addr="0x7fdf0850f990" >
+                                        <attributelist id="3314" addr="0x7fdf0850f990" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="3315" addr="0x7ff9f1fb5e90" >
-                                        <attributelist id="3316" addr="0x7ff9f1fb5e90" >
+                                    <typetabsitem id="3315" addr="0x7fdf0850ce90" >
+                                        <attributelist id="3316" addr="0x7fdf0850ce90" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="3317" addr="0x7ff9f1fb8310" >
-                                        <attributelist id="3318" addr="0x7ff9f1fb8310" >
+                                    <typetabsitem id="3317" addr="0x7fdf0850f310" >
+                                        <attributelist id="3318" addr="0x7fdf0850f310" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="3319" addr="0x7ff9f1fb6050" >
-                                        <attributelist id="3320" addr="0x7ff9f1fb6050" >
+                                    <typetabsitem id="3319" addr="0x7fdf0850d050" >
+                                        <attributelist id="3320" addr="0x7fdf0850d050" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="3321" addr="0x7ff9f1fb7b50" >
-                                        <attributelist id="3322" addr="0x7ff9f1fb7b50" >
+                                    <typetabsitem id="3321" addr="0x7fdf0850eb50" >
+                                        <attributelist id="3322" addr="0x7fdf0850eb50" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="3323" addr="0x7ff9f1fb91b0" >
-                                        <attributelist id="3324" addr="0x7ff9f1fb91b0" >
+                                    <typetabsitem id="3323" addr="0x7fdf085101b0" >
+                                        <attributelist id="3324" addr="0x7fdf085101b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="3325" addr="0x7ff9f1fb7490" >
-                                        <attributelist id="3326" addr="0x7ff9f1fb7490" >
+                                    <typetabsitem id="3325" addr="0x7fdf0850e490" >
+                                        <attributelist id="3326" addr="0x7fdf0850e490" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
-                                <attribute name="parent" value="0x7ff9f1fb4990" id="3327" addr="0x7ff9f1fb4990" />
-                                <attribute name="qname" value="XBMCAddon::xbmc" id="3328" addr="0x7ff9f1fba9d0" />
-                                <attribute name="symtab" value="0x7ff9f1f8a2b0" id="3329" addr="0x7ff9f1f8a2b0" />
+                                <attribute name="parent" value="0x7fdf0850b990" id="3327" addr="0x7fdf0850b990" />
+                                <attribute name="qname" value="XBMCAddon::xbmc" id="3328" addr="0x7fdf085119d0" />
+                                <attribute name="symtab" value="0x7fdf084e12b0" id="3329" addr="0x7fdf084e12b0" />
                             </attributelist >
-                            <typescopesitem id="3330" addr="0x7ff9f1f8a270" >
-                                <attributelist id="3331" addr="0x7ff9f1f8a270" >
+                            <typescopesitem id="3330" addr="0x7fdf084e1270" >
+                                <attributelist id="3331" addr="0x7fdf084e1270" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="3332" addr="0x7ff9f1fb4d90" >
-                                <attributelist id="3333" addr="0x7ff9f1fb4d90" >
-                                    <attribute name="Monitor" value="Monitor" id="3334" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="3335" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="Keyboard" value="Keyboard" id="3336" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="3337" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="InfoTagVideo" value="InfoTagVideo" id="3338" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="Player" value="Player" id="3339" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="InfoTagMusic" value="InfoTagMusic" id="3340" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="PlayList" value="PlayList" id="3341" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="RenderCapture" value="RenderCapture" id="3342" addr="0x7ff9f1fba9d0" />
+                            <typescopesitem id="3332" addr="0x7fdf0850bd90" >
+                                <attributelist id="3333" addr="0x7fdf0850bd90" >
+                                    <attribute name="Monitor" value="Monitor" id="3334" addr="0x7fdf085119d0" />
+                                    <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="3335" addr="0x7fdf085119d0" />
+                                    <attribute name="Keyboard" value="Keyboard" id="3336" addr="0x7fdf085119d0" />
+                                    <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="3337" addr="0x7fdf085119d0" />
+                                    <attribute name="InfoTagVideo" value="InfoTagVideo" id="3338" addr="0x7fdf085119d0" />
+                                    <attribute name="Player" value="Player" id="3339" addr="0x7fdf085119d0" />
+                                    <attribute name="InfoTagMusic" value="InfoTagMusic" id="3340" addr="0x7fdf085119d0" />
+                                    <attribute name="PlayList" value="PlayList" id="3341" addr="0x7fdf085119d0" />
+                                    <attribute name="RenderCapture" value="RenderCapture" id="3342" addr="0x7fdf085119d0" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="3343" addr="0x7ff9f1fb4990" >
-                                <attributelist id="3344" addr="0x7ff9f1fb4990" >
-                                    <attribute name="name" value="XBMCAddon" id="3345" addr="0x7ff9f1fba9d0" />
-                                    <typetab id="3346" addr="0x7ff9f1fb49d0" >
-                                        <attributelist id="3347" addr="0x7ff9f1fb49d0" >
-                                            <attribute name="String" value="std::string" id="3348" addr="0x7ff9f1fba9d0" />
-                                        </attributelist >
-                                        <typetabsitem id="3349" addr="0x7ff9f1fb4bb0" >
-                                            <attributelist id="3350" addr="0x7ff9f1fb4bb0" >
+                            <typescopesitem id="3343" addr="0x7fdf0850b990" >
+                                <attributelist id="3344" addr="0x7fdf0850b990" >
+                                    <attribute name="name" value="XBMCAddon" id="3345" addr="0x7fdf085119d0" />
+                                    <typetab id="3346" addr="0x7fdf0850b9d0" >
+                                        <attributelist id="3347" addr="0x7fdf0850b9d0" >
+                                            <attribute name="String" value="std::string" id="3348" addr="0x7fdf085119d0" />
+                                        </attributelist >
+                                        <typetabsitem id="3349" addr="0x7fdf0850bbb0" >
+                                            <attributelist id="3350" addr="0x7fdf0850bbb0" >
                                             </attributelist >
                                         </typetabsitem >
                                     </typetab >
-                                    <attribute name="parent" value="0x7ff9f1f72a30" id="3351" addr="0x7ff9f1f72a30" />
-                                    <attribute name="qname" value="XBMCAddon" id="3352" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="symtab" value="0x7ff9f1f89bb0" id="3353" addr="0x7ff9f1f89bb0" />
+                                    <attribute name="parent" value="0x7fdf084c9a30" id="3351" addr="0x7fdf084c9a30" />
+                                    <attribute name="qname" value="XBMCAddon" id="3352" addr="0x7fdf085119d0" />
+                                    <attribute name="symtab" value="0x7fdf084e0bb0" id="3353" addr="0x7fdf084e0bb0" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="3354" addr="0x7ff9f1fb4db0" >
-                                <attributelist id="3355" addr="0x7ff9f1fb4db0" >
+                            <typescopesitem id="3354" addr="0x7fdf0850bdb0" >
+                                <attributelist id="3355" addr="0x7fdf0850bdb0" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="3356" addr="0x7ff9f1f8a2b0" >
-                                <attributelist id="3357" addr="0x7ff9f1f8a2b0" >
-                                    <attribute name="name" value="xbmc" id="3358" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="csymtab" value="0x7ff9f1f8a2f0" id="3359" addr="0x7ff9f1f8a2f0" />
-                                    <attribute name="symtab" value="0x7ff9f1f8a290" id="3360" addr="0x7ff9f1f8a290" />
+                            <typescopesitem id="3356" addr="0x7fdf084e12b0" >
+                                <attributelist id="3357" addr="0x7fdf084e12b0" >
+                                    <attribute name="name" value="xbmc" id="3358" addr="0x7fdf085119d0" />
+                                    <attribute name="csymtab" value="0x7fdf084e12f0" id="3359" addr="0x7fdf084e12f0" />
+                                    <attribute name="symtab" value="0x7fdf084e1290" id="3360" addr="0x7fdf084e1290" />
                                 </attributelist >
                             </typescopesitem >
                         </typescope >
                     </attributelist >
 
-                    <class id="3361" addr="0x7ff9f1fa34b0" >
-                        <attributelist id="3362" addr="0x7ff9f1fa34b0" >
-                            <attribute name="name" value="XBMCAddon::xbmc::InfoTagRadioRDS" id="3363" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="3364" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="symtab" value="0x7ff9f1fa35f0" id="3365" addr="0x7ff9f1fa35f0" />
-                            <attribute name="allows_typedef" value="1" id="3366" addr="0x7ff9f1fba9d0" />
-                            <attribute name="typepass_visit" value="1" id="3367" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_visit" value="1" id="3368" addr="0x7ff9f1fba9d0" />
-                            <attribute name="kind" value="class" id="3369" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_name" value="InfoTagRadioRDS" id="3370" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_default_constructor" value="1" id="3371" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_has_constructor" value="1" id="3372" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_public_constructor" value="1" id="3373" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_has_destructor" value="1" id="3374" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_default_destructor" value="1" id="3375" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_copy_constructor" value="1" id="3376" addr="0x7ff9f1fba9d0" />
-                            <attribute name="privatebaselist" value="0x7ff9f1fa3490" id="3377" addr="0x7ff9f1fa3490" />
-                            <attribute name="protectedbaselist" value="0x7ff9f1fa3470" id="3378" addr="0x7ff9f1fa3470" />
-                            <baselist id="3379" addr="0x7ff9f1fa3450" >
-                                <base name="AddonClass" id="3380" addr="0x7ff9f1fa33d0" />
+                    <class id="3361" addr="0x7fdf084fa4b0" >
+                        <attributelist id="3362" addr="0x7fdf084fa4b0" >
+                            <attribute name="name" value="XBMCAddon::xbmc::InfoTagRadioRDS" id="3363" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="3364" addr="0x7fdf084e12b0" />
+                            <attribute name="symtab" value="0x7fdf084fa5f0" id="3365" addr="0x7fdf084fa5f0" />
+                            <attribute name="allows_typedef" value="1" id="3366" addr="0x7fdf085119d0" />
+                            <attribute name="typepass_visit" value="1" id="3367" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_visit" value="1" id="3368" addr="0x7fdf085119d0" />
+                            <attribute name="kind" value="class" id="3369" addr="0x7fdf085119d0" />
+                            <attribute name="sym_name" value="InfoTagRadioRDS" id="3370" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_default_constructor" value="1" id="3371" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_has_constructor" value="1" id="3372" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_public_constructor" value="1" id="3373" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_has_destructor" value="1" id="3374" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_default_destructor" value="1" id="3375" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_copy_constructor" value="1" id="3376" addr="0x7fdf085119d0" />
+                            <attribute name="privatebaselist" value="0x7fdf084fa490" id="3377" addr="0x7fdf084fa490" />
+                            <attribute name="protectedbaselist" value="0x7fdf084fa470" id="3378" addr="0x7fdf084fa470" />
+                            <baselist id="3379" addr="0x7fdf084fa450" >
+                                <base name="AddonClass" id="3380" addr="0x7fdf084fa3d0" />
                             </baselist >
-                            <attribute name="module" value="xbmc" id="3381" addr="0x7ff9f1f89430" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="3382" addr="0x7ff9f1fba9d0" />
-                            <typescope id="3383" addr="0x7ff9f1fb7ff0" >
-                                <attributelist id="3384" addr="0x7ff9f1fb7ff0" >
-                                    <attribute name="name" value="InfoTagRadioRDS" id="3385" addr="0x7ff9f1fba9d0" />
-                                    <typetab id="3386" addr="0x7ff9f1fb8010" >
-                                        <attributelist id="3387" addr="0x7ff9f1fb8010" >
+                            <attribute name="module" value="xbmc" id="3381" addr="0x7fdf084e0430" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="3382" addr="0x7fdf085119d0" />
+                            <typescope id="3383" addr="0x7fdf0850eff0" >
+                                <attributelist id="3384" addr="0x7fdf0850eff0" >
+                                    <attribute name="name" value="InfoTagRadioRDS" id="3385" addr="0x7fdf085119d0" />
+                                    <typetab id="3386" addr="0x7fdf0850f010" >
+                                        <attributelist id="3387" addr="0x7fdf0850f010" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7ff9f1fb4d70" id="3388" addr="0x7ff9f1fb4d70" />
-                                    <attribute name="qname" value="XBMCAddon::xbmc::InfoTagRadioRDS" id="3389" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="symtab" value="0x7ff9f1fa35f0" id="3390" addr="0x7ff9f1fa35f0" />
+                                    <attribute name="parent" value="0x7fdf0850bd70" id="3388" addr="0x7fdf0850bd70" />
+                                    <attribute name="qname" value="XBMCAddon::xbmc::InfoTagRadioRDS" id="3389" addr="0x7fdf085119d0" />
+                                    <attribute name="symtab" value="0x7fdf084fa5f0" id="3390" addr="0x7fdf084fa5f0" />
                                 </attributelist >
-                                <typescopesitem id="3391" addr="0x7ff9f1fb7f90" >
-                                    <attributelist id="3392" addr="0x7ff9f1fb7f90" >
+                                <typescopesitem id="3391" addr="0x7fdf0850ef90" >
+                                    <attributelist id="3392" addr="0x7fdf0850ef90" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="3393" addr="0x7ff9f1fb8010" >
-                                    <attributelist id="3394" addr="0x7ff9f1fb8010" >
+                                <typescopesitem id="3393" addr="0x7fdf0850f010" >
+                                    <attributelist id="3394" addr="0x7fdf0850f010" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="3395" addr="0x7ff9f1fb4d70" >
-                                    <attributelist id="3396" addr="0x7ff9f1fb4d70" >
-                                        <attribute name="name" value="xbmc" id="3397" addr="0x7ff9f1fba9d0" />
-                                        <typetab id="3398" addr="0x7ff9f1fb4d90" >
-                                            <attributelist id="3399" addr="0x7ff9f1fb4d90" >
-                                                <attribute name="Monitor" value="Monitor" id="3400" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="3401" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="Keyboard" value="Keyboard" id="3402" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="3403" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="InfoTagVideo" value="InfoTagVideo" id="3404" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="Player" value="Player" id="3405" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="InfoTagMusic" value="InfoTagMusic" id="3406" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="PlayList" value="PlayList" id="3407" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="RenderCapture" value="RenderCapture" id="3408" addr="0x7ff9f1fba9d0" />
+                                <typescopesitem id="3395" addr="0x7fdf0850bd70" >
+                                    <attributelist id="3396" addr="0x7fdf0850bd70" >
+                                        <attribute name="name" value="xbmc" id="3397" addr="0x7fdf085119d0" />
+                                        <typetab id="3398" addr="0x7fdf0850bd90" >
+                                            <attributelist id="3399" addr="0x7fdf0850bd90" >
+                                                <attribute name="Monitor" value="Monitor" id="3400" addr="0x7fdf085119d0" />
+                                                <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="3401" addr="0x7fdf085119d0" />
+                                                <attribute name="Keyboard" value="Keyboard" id="3402" addr="0x7fdf085119d0" />
+                                                <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="3403" addr="0x7fdf085119d0" />
+                                                <attribute name="InfoTagVideo" value="InfoTagVideo" id="3404" addr="0x7fdf085119d0" />
+                                                <attribute name="Player" value="Player" id="3405" addr="0x7fdf085119d0" />
+                                                <attribute name="InfoTagMusic" value="InfoTagMusic" id="3406" addr="0x7fdf085119d0" />
+                                                <attribute name="PlayList" value="PlayList" id="3407" addr="0x7fdf085119d0" />
+                                                <attribute name="RenderCapture" value="RenderCapture" id="3408" addr="0x7fdf085119d0" />
                                             </attributelist >
-                                            <typetabsitem id="3409" addr="0x7ff9f1fb9b10" >
-                                                <attributelist id="3410" addr="0x7ff9f1fb9b10" >
+                                            <typetabsitem id="3409" addr="0x7fdf08510b10" >
+                                                <attributelist id="3410" addr="0x7fdf08510b10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3411" addr="0x7ff9f1fb7f30" >
-                                                <attributelist id="3412" addr="0x7ff9f1fb7f30" >
+                                            <typetabsitem id="3411" addr="0x7fdf0850ef30" >
+                                                <attributelist id="3412" addr="0x7fdf0850ef30" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3413" addr="0x7ff9f1fb8990" >
-                                                <attributelist id="3414" addr="0x7ff9f1fb8990" >
+                                            <typetabsitem id="3413" addr="0x7fdf0850f990" >
+                                                <attributelist id="3414" addr="0x7fdf0850f990" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3415" addr="0x7ff9f1fb5e90" >
-                                                <attributelist id="3416" addr="0x7ff9f1fb5e90" >
+                                            <typetabsitem id="3415" addr="0x7fdf0850ce90" >
+                                                <attributelist id="3416" addr="0x7fdf0850ce90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3417" addr="0x7ff9f1fb8310" >
-                                                <attributelist id="3418" addr="0x7ff9f1fb8310" >
+                                            <typetabsitem id="3417" addr="0x7fdf0850f310" >
+                                                <attributelist id="3418" addr="0x7fdf0850f310" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3419" addr="0x7ff9f1fb6050" >
-                                                <attributelist id="3420" addr="0x7ff9f1fb6050" >
+                                            <typetabsitem id="3419" addr="0x7fdf0850d050" >
+                                                <attributelist id="3420" addr="0x7fdf0850d050" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3421" addr="0x7ff9f1fb7b50" >
-                                                <attributelist id="3422" addr="0x7ff9f1fb7b50" >
+                                            <typetabsitem id="3421" addr="0x7fdf0850eb50" >
+                                                <attributelist id="3422" addr="0x7fdf0850eb50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3423" addr="0x7ff9f1fb91b0" >
-                                                <attributelist id="3424" addr="0x7ff9f1fb91b0" >
+                                            <typetabsitem id="3423" addr="0x7fdf085101b0" >
+                                                <attributelist id="3424" addr="0x7fdf085101b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3425" addr="0x7ff9f1fb7490" >
-                                                <attributelist id="3426" addr="0x7ff9f1fb7490" >
+                                            <typetabsitem id="3425" addr="0x7fdf0850e490" >
+                                                <attributelist id="3426" addr="0x7fdf0850e490" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7ff9f1fb4990" id="3427" addr="0x7ff9f1fb4990" />
-                                        <attribute name="qname" value="XBMCAddon::xbmc" id="3428" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="symtab" value="0x7ff9f1f8a2b0" id="3429" addr="0x7ff9f1f8a2b0" />
+                                        <attribute name="parent" value="0x7fdf0850b990" id="3427" addr="0x7fdf0850b990" />
+                                        <attribute name="qname" value="XBMCAddon::xbmc" id="3428" addr="0x7fdf085119d0" />
+                                        <attribute name="symtab" value="0x7fdf084e12b0" id="3429" addr="0x7fdf084e12b0" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="3430" addr="0x7ff9f1fb8030" >
-                                    <attributelist id="3431" addr="0x7ff9f1fb8030" >
+                                <typescopesitem id="3430" addr="0x7fdf0850f030" >
+                                    <attributelist id="3431" addr="0x7fdf0850f030" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="3432" addr="0x7ff9f1fa35f0" >
-                                    <attributelist id="3433" addr="0x7ff9f1fa35f0" >
-                                        <attribute name="name" value="InfoTagRadioRDS" id="3434" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="csymtab" value="0x7ff9f1fa3610" id="3435" addr="0x7ff9f1fa3610" />
-                                        <attribute name="symtab" value="0x7ff9f1fa35b0" id="3436" addr="0x7ff9f1fa35b0" />
+                                <typescopesitem id="3432" addr="0x7fdf084fa5f0" >
+                                    <attributelist id="3433" addr="0x7fdf084fa5f0" >
+                                        <attribute name="name" value="InfoTagRadioRDS" id="3434" addr="0x7fdf085119d0" />
+                                        <attribute name="csymtab" value="0x7fdf084fa610" id="3435" addr="0x7fdf084fa610" />
+                                        <attribute name="symtab" value="0x7fdf084fa5b0" id="3436" addr="0x7fdf084fa5b0" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <access id="3437" addr="0x7ff9f1fa3570" >
-                            <attributelist id="3438" addr="0x7ff9f1fa3570" >
-                                <attribute name="kind" value="private" id="3439" addr="0x7ff9f1fba9d0" />
+                        <access id="3437" addr="0x7fdf084fa570" >
+                            <attributelist id="3438" addr="0x7fdf084fa570" >
+                                <attribute name="kind" value="private" id="3439" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </access >
-                        <cdecl id="3440" addr="0x7ff9f1fa3770" >
-                            <attributelist id="3441" addr="0x7ff9f1fa3770" >
-                                <attribute name="ismember" value="1" id="3442" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="infoTag" id="3443" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="" id="3444" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="private" id="3445" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="variable" id="3446" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="PVR::CPVRRadioRDSInfoTagPtr" id="3447" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa35f0" id="3448" addr="0x7ff9f1fa35f0" />
+                        <cdecl id="3440" addr="0x7fdf084fa770" >
+                            <attributelist id="3441" addr="0x7fdf084fa770" >
+                                <attribute name="ismember" value="1" id="3442" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="infoTag" id="3443" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="" id="3444" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="private" id="3445" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="variable" id="3446" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="PVR::CPVRRadioRDSInfoTagPtr" id="3447" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fa5f0" id="3448" addr="0x7fdf084fa5f0" />
                             </attributelist >
                          
                         </cdecl >
-                        <access id="3449" addr="0x7ff9f1fa3850" >
-                            <attributelist id="3450" addr="0x7ff9f1fa3850" >
-                                <attribute name="kind" value="public" id="3451" addr="0x7ff9f1fba9d0" />
+                        <access id="3449" addr="0x7fdf084fa850" >
+                            <attributelist id="3450" addr="0x7fdf084fa850" >
+                                <attribute name="kind" value="public" id="3451" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="3452" addr="0x7ff9f1fa3970" >
-                            <attributelist id="3453" addr="0x7ff9f1fa3970" >
-                                <attribute name="ismember" value="1" id="3454" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="InfoTagRadioRDS" id="3455" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="InfoTagRadioRDS" id="3456" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3457" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3458" addr="0x7ff9f1fba9d0" />
-                                <attribute name="feature_new" value="1" id="3459" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa35f0" id="3460" addr="0x7ff9f1fa35f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3461" addr="0x7ff9f1fba9d0" />
+                        <constructor id="3452" addr="0x7fdf084fa970" >
+                            <attributelist id="3453" addr="0x7fdf084fa970" >
+                                <attribute name="ismember" value="1" id="3454" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="InfoTagRadioRDS" id="3455" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="InfoTagRadioRDS" id="3456" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3457" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3458" addr="0x7fdf085119d0" />
+                                <attribute name="feature_new" value="1" id="3459" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fa5f0" id="3460" addr="0x7fdf084fa5f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3461" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </constructor >
-                        <destructor id="3462" addr="0x7ff9f1fa3ad0" >
-                            <attributelist id="3463" addr="0x7ff9f1fa3ad0" >
-                                <attribute name="ismember" value="1" id="3464" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="~InfoTagRadioRDS" id="3465" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="~InfoTagRadioRDS" id="3466" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3467" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3468" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa35f0" id="3469" addr="0x7ff9f1fa35f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3470" addr="0x7ff9f1fba9d0" />
+                        <destructor id="3462" addr="0x7fdf084faad0" >
+                            <attributelist id="3463" addr="0x7fdf084faad0" >
+                                <attribute name="ismember" value="1" id="3464" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="~InfoTagRadioRDS" id="3465" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="~InfoTagRadioRDS" id="3466" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3467" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3468" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fa5f0" id="3469" addr="0x7fdf084fa5f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3470" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </destructor >
-                        <cdecl id="3471" addr="0x7ff9f1fa3c90" >
-                            <attributelist id="3472" addr="0x7ff9f1fa3c90" >
-                                <attribute name="ismember" value="1" id="3473" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getTitle" id="3474" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getTitle" id="3475" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3476" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3477" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3478" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3479" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa35f0" id="3480" addr="0x7ff9f1fa35f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3481" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3482" addr="0x7ff9f1fa3e70" >
-                            <attributelist id="3483" addr="0x7ff9f1fa3e70" >
-                                <attribute name="ismember" value="1" id="3484" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getBand" id="3485" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getBand" id="3486" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3487" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3488" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3489" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3490" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa35f0" id="3491" addr="0x7ff9f1fa35f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3492" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3493" addr="0x7ff9f1fa4050" >
-                            <attributelist id="3494" addr="0x7ff9f1fa4050" >
-                                <attribute name="ismember" value="1" id="3495" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getArtist" id="3496" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getArtist" id="3497" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3498" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3499" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3500" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3501" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa35f0" id="3502" addr="0x7ff9f1fa35f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3503" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3504" addr="0x7ff9f1fa4230" >
-                            <attributelist id="3505" addr="0x7ff9f1fa4230" >
-                                <attribute name="ismember" value="1" id="3506" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getComposer" id="3507" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getComposer" id="3508" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3509" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3510" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3511" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3512" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa35f0" id="3513" addr="0x7ff9f1fa35f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3514" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3515" addr="0x7ff9f1fa4410" >
-                            <attributelist id="3516" addr="0x7ff9f1fa4410" >
-                                <attribute name="ismember" value="1" id="3517" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getConductor" id="3518" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getConductor" id="3519" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3520" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3521" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3522" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3523" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa35f0" id="3524" addr="0x7ff9f1fa35f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3525" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3526" addr="0x7ff9f1fa45f0" >
-                            <attributelist id="3527" addr="0x7ff9f1fa45f0" >
-                                <attribute name="ismember" value="1" id="3528" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getAlbum" id="3529" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getAlbum" id="3530" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3531" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3532" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3533" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3534" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa35f0" id="3535" addr="0x7ff9f1fa35f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3536" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3537" addr="0x7ff9f1fa47d0" >
-                            <attributelist id="3538" addr="0x7ff9f1fa47d0" >
-                                <attribute name="ismember" value="1" id="3539" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getComment" id="3540" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getComment" id="3541" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3542" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3543" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3544" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3545" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa35f0" id="3546" addr="0x7ff9f1fa35f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3547" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3548" addr="0x7ff9f1fa49b0" >
-                            <attributelist id="3549" addr="0x7ff9f1fa49b0" >
-                                <attribute name="ismember" value="1" id="3550" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getAlbumTrackNumber" id="3551" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getAlbumTrackNumber" id="3552" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3553" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3554" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3555" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="int" id="3556" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa35f0" id="3557" addr="0x7ff9f1fa35f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3558" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3559" addr="0x7ff9f1fa4b90" >
-                            <attributelist id="3560" addr="0x7ff9f1fa4b90" >
-                                <attribute name="ismember" value="1" id="3561" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getInfoNews" id="3562" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getInfoNews" id="3563" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3564" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3565" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3566" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3567" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa35f0" id="3568" addr="0x7ff9f1fa35f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3569" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3570" addr="0x7ff9f1fa4d70" >
-                            <attributelist id="3571" addr="0x7ff9f1fa4d70" >
-                                <attribute name="ismember" value="1" id="3572" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getInfoNewsLocal" id="3573" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getInfoNewsLocal" id="3574" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3575" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3576" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3577" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3578" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa35f0" id="3579" addr="0x7ff9f1fa35f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3580" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3581" addr="0x7ff9f1fa4f50" >
-                            <attributelist id="3582" addr="0x7ff9f1fa4f50" >
-                                <attribute name="ismember" value="1" id="3583" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getInfoSport" id="3584" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getInfoSport" id="3585" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3586" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3587" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3588" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3589" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa35f0" id="3590" addr="0x7ff9f1fa35f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3591" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3592" addr="0x7ff9f1fa5130" >
-                            <attributelist id="3593" addr="0x7ff9f1fa5130" >
-                                <attribute name="ismember" value="1" id="3594" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getInfoStock" id="3595" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getInfoStock" id="3596" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3597" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3598" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3599" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3600" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa35f0" id="3601" addr="0x7ff9f1fa35f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3602" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3603" addr="0x7ff9f1fa5310" >
-                            <attributelist id="3604" addr="0x7ff9f1fa5310" >
-                                <attribute name="ismember" value="1" id="3605" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getInfoWeather" id="3606" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getInfoWeather" id="3607" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3608" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3609" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3610" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3611" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa35f0" id="3612" addr="0x7ff9f1fa35f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3613" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3614" addr="0x7ff9f1fa54f0" >
-                            <attributelist id="3615" addr="0x7ff9f1fa54f0" >
-                                <attribute name="ismember" value="1" id="3616" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getInfoHoroscope" id="3617" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getInfoHoroscope" id="3618" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3619" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3620" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3621" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3622" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa35f0" id="3623" addr="0x7ff9f1fa35f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3624" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3625" addr="0x7ff9f1fa56d0" >
-                            <attributelist id="3626" addr="0x7ff9f1fa56d0" >
-                                <attribute name="ismember" value="1" id="3627" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getInfoCinema" id="3628" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getInfoCinema" id="3629" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3630" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3631" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3632" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3633" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa35f0" id="3634" addr="0x7ff9f1fa35f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3635" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3636" addr="0x7ff9f1fa58b0" >
-                            <attributelist id="3637" addr="0x7ff9f1fa58b0" >
-                                <attribute name="ismember" value="1" id="3638" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getInfoLottery" id="3639" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getInfoLottery" id="3640" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3641" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3642" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3643" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3644" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa35f0" id="3645" addr="0x7ff9f1fa35f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3646" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3647" addr="0x7ff9f1fa5a90" >
-                            <attributelist id="3648" addr="0x7ff9f1fa5a90" >
-                                <attribute name="ismember" value="1" id="3649" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getInfoOther" id="3650" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getInfoOther" id="3651" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3652" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3653" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3654" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3655" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa35f0" id="3656" addr="0x7ff9f1fa35f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3657" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3658" addr="0x7ff9f1fa5c70" >
-                            <attributelist id="3659" addr="0x7ff9f1fa5c70" >
-                                <attribute name="ismember" value="1" id="3660" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getEditorialStaff" id="3661" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getEditorialStaff" id="3662" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3663" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3664" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3665" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3666" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa35f0" id="3667" addr="0x7ff9f1fa35f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3668" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3669" addr="0x7ff9f1fa5e50" >
-                            <attributelist id="3670" addr="0x7ff9f1fa5e50" >
-                                <attribute name="ismember" value="1" id="3671" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getProgStation" id="3672" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getProgStation" id="3673" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3674" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3675" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3676" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3677" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa35f0" id="3678" addr="0x7ff9f1fa35f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3679" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3680" addr="0x7ff9f1fa6030" >
-                            <attributelist id="3681" addr="0x7ff9f1fa6030" >
-                                <attribute name="ismember" value="1" id="3682" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getProgStyle" id="3683" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getProgStyle" id="3684" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3685" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3686" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3687" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3688" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa35f0" id="3689" addr="0x7ff9f1fa35f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3690" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3691" addr="0x7ff9f1fa6210" >
-                            <attributelist id="3692" addr="0x7ff9f1fa6210" >
-                                <attribute name="ismember" value="1" id="3693" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getProgHost" id="3694" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getProgHost" id="3695" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3696" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3697" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3698" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3699" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa35f0" id="3700" addr="0x7ff9f1fa35f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3701" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3702" addr="0x7ff9f1fa63f0" >
-                            <attributelist id="3703" addr="0x7ff9f1fa63f0" >
-                                <attribute name="ismember" value="1" id="3704" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getProgWebsite" id="3705" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getProgWebsite" id="3706" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3707" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3708" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3709" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3710" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa35f0" id="3711" addr="0x7ff9f1fa35f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3712" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3713" addr="0x7ff9f1fa65d0" >
-                            <attributelist id="3714" addr="0x7ff9f1fa65d0" >
-                                <attribute name="ismember" value="1" id="3715" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getProgNow" id="3716" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getProgNow" id="3717" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3718" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3719" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3720" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3721" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa35f0" id="3722" addr="0x7ff9f1fa35f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3723" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3724" addr="0x7ff9f1fa67b0" >
-                            <attributelist id="3725" addr="0x7ff9f1fa67b0" >
-                                <attribute name="ismember" value="1" id="3726" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getProgNext" id="3727" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getProgNext" id="3728" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3729" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3730" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3731" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3732" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa35f0" id="3733" addr="0x7ff9f1fa35f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3734" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3735" addr="0x7ff9f1fa6990" >
-                            <attributelist id="3736" addr="0x7ff9f1fa6990" >
-                                <attribute name="ismember" value="1" id="3737" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getPhoneHotline" id="3738" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getPhoneHotline" id="3739" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3740" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3741" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3742" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3743" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa35f0" id="3744" addr="0x7ff9f1fa35f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3745" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3746" addr="0x7ff9f1fa6b70" >
-                            <attributelist id="3747" addr="0x7ff9f1fa6b70" >
-                                <attribute name="ismember" value="1" id="3748" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getEMailHotline" id="3749" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getEMailHotline" id="3750" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3751" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3752" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3753" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3754" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa35f0" id="3755" addr="0x7ff9f1fa35f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3756" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3757" addr="0x7ff9f1fa6d50" >
-                            <attributelist id="3758" addr="0x7ff9f1fa6d50" >
-                                <attribute name="ismember" value="1" id="3759" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getPhoneStudio" id="3760" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getPhoneStudio" id="3761" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3762" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3763" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3764" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3765" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa35f0" id="3766" addr="0x7ff9f1fa35f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3767" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3768" addr="0x7ff9f1fa6f30" >
-                            <attributelist id="3769" addr="0x7ff9f1fa6f30" >
-                                <attribute name="ismember" value="1" id="3770" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getEMailStudio" id="3771" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getEMailStudio" id="3772" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3773" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3774" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3775" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3776" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa35f0" id="3777" addr="0x7ff9f1fa35f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3778" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3779" addr="0x7ff9f1fa7110" >
-                            <attributelist id="3780" addr="0x7ff9f1fa7110" >
-                                <attribute name="ismember" value="1" id="3781" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getSMSStudio" id="3782" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getSMSStudio" id="3783" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="3784" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="3785" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="3786" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="3787" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa35f0" id="3788" addr="0x7ff9f1fa35f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3789" addr="0x7ff9f1fba9d0" />
+                        <cdecl id="3471" addr="0x7fdf084fac90" >
+                            <attributelist id="3472" addr="0x7fdf084fac90" >
+                                <attribute name="ismember" value="1" id="3473" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getTitle" id="3474" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getTitle" id="3475" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3476" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3477" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3478" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3479" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fa5f0" id="3480" addr="0x7fdf084fa5f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3481" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3482" addr="0x7fdf084fae70" >
+                            <attributelist id="3483" addr="0x7fdf084fae70" >
+                                <attribute name="ismember" value="1" id="3484" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getBand" id="3485" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getBand" id="3486" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3487" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3488" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3489" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3490" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fa5f0" id="3491" addr="0x7fdf084fa5f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3492" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3493" addr="0x7fdf084fb050" >
+                            <attributelist id="3494" addr="0x7fdf084fb050" >
+                                <attribute name="ismember" value="1" id="3495" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getArtist" id="3496" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getArtist" id="3497" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3498" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3499" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3500" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3501" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fa5f0" id="3502" addr="0x7fdf084fa5f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3503" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3504" addr="0x7fdf084fb230" >
+                            <attributelist id="3505" addr="0x7fdf084fb230" >
+                                <attribute name="ismember" value="1" id="3506" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getComposer" id="3507" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getComposer" id="3508" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3509" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3510" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3511" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3512" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fa5f0" id="3513" addr="0x7fdf084fa5f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3514" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3515" addr="0x7fdf084fb410" >
+                            <attributelist id="3516" addr="0x7fdf084fb410" >
+                                <attribute name="ismember" value="1" id="3517" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getConductor" id="3518" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getConductor" id="3519" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3520" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3521" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3522" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3523" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fa5f0" id="3524" addr="0x7fdf084fa5f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3525" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3526" addr="0x7fdf084fb5f0" >
+                            <attributelist id="3527" addr="0x7fdf084fb5f0" >
+                                <attribute name="ismember" value="1" id="3528" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getAlbum" id="3529" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getAlbum" id="3530" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3531" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3532" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3533" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3534" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fa5f0" id="3535" addr="0x7fdf084fa5f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3536" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3537" addr="0x7fdf084fb7d0" >
+                            <attributelist id="3538" addr="0x7fdf084fb7d0" >
+                                <attribute name="ismember" value="1" id="3539" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getComment" id="3540" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getComment" id="3541" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3542" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3543" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3544" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3545" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fa5f0" id="3546" addr="0x7fdf084fa5f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3547" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3548" addr="0x7fdf084fb9b0" >
+                            <attributelist id="3549" addr="0x7fdf084fb9b0" >
+                                <attribute name="ismember" value="1" id="3550" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getAlbumTrackNumber" id="3551" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getAlbumTrackNumber" id="3552" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3553" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3554" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3555" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="int" id="3556" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fa5f0" id="3557" addr="0x7fdf084fa5f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3558" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3559" addr="0x7fdf084fbb90" >
+                            <attributelist id="3560" addr="0x7fdf084fbb90" >
+                                <attribute name="ismember" value="1" id="3561" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getInfoNews" id="3562" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getInfoNews" id="3563" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3564" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3565" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3566" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3567" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fa5f0" id="3568" addr="0x7fdf084fa5f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3569" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3570" addr="0x7fdf084fbd70" >
+                            <attributelist id="3571" addr="0x7fdf084fbd70" >
+                                <attribute name="ismember" value="1" id="3572" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getInfoNewsLocal" id="3573" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getInfoNewsLocal" id="3574" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3575" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3576" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3577" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3578" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fa5f0" id="3579" addr="0x7fdf084fa5f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3580" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3581" addr="0x7fdf084fbf50" >
+                            <attributelist id="3582" addr="0x7fdf084fbf50" >
+                                <attribute name="ismember" value="1" id="3583" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getInfoSport" id="3584" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getInfoSport" id="3585" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3586" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3587" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3588" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3589" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fa5f0" id="3590" addr="0x7fdf084fa5f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3591" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3592" addr="0x7fdf084fc130" >
+                            <attributelist id="3593" addr="0x7fdf084fc130" >
+                                <attribute name="ismember" value="1" id="3594" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getInfoStock" id="3595" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getInfoStock" id="3596" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3597" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3598" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3599" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3600" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fa5f0" id="3601" addr="0x7fdf084fa5f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3602" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3603" addr="0x7fdf084fc310" >
+                            <attributelist id="3604" addr="0x7fdf084fc310" >
+                                <attribute name="ismember" value="1" id="3605" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getInfoWeather" id="3606" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getInfoWeather" id="3607" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3608" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3609" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3610" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3611" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fa5f0" id="3612" addr="0x7fdf084fa5f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3613" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3614" addr="0x7fdf084fc4f0" >
+                            <attributelist id="3615" addr="0x7fdf084fc4f0" >
+                                <attribute name="ismember" value="1" id="3616" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getInfoHoroscope" id="3617" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getInfoHoroscope" id="3618" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3619" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3620" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3621" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3622" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fa5f0" id="3623" addr="0x7fdf084fa5f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3624" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3625" addr="0x7fdf084fc6d0" >
+                            <attributelist id="3626" addr="0x7fdf084fc6d0" >
+                                <attribute name="ismember" value="1" id="3627" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getInfoCinema" id="3628" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getInfoCinema" id="3629" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3630" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3631" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3632" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3633" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fa5f0" id="3634" addr="0x7fdf084fa5f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3635" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3636" addr="0x7fdf084fc8b0" >
+                            <attributelist id="3637" addr="0x7fdf084fc8b0" >
+                                <attribute name="ismember" value="1" id="3638" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getInfoLottery" id="3639" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getInfoLottery" id="3640" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3641" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3642" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3643" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3644" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fa5f0" id="3645" addr="0x7fdf084fa5f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3646" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3647" addr="0x7fdf084fca90" >
+                            <attributelist id="3648" addr="0x7fdf084fca90" >
+                                <attribute name="ismember" value="1" id="3649" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getInfoOther" id="3650" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getInfoOther" id="3651" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3652" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3653" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3654" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3655" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fa5f0" id="3656" addr="0x7fdf084fa5f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3657" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3658" addr="0x7fdf084fcc70" >
+                            <attributelist id="3659" addr="0x7fdf084fcc70" >
+                                <attribute name="ismember" value="1" id="3660" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getEditorialStaff" id="3661" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getEditorialStaff" id="3662" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3663" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3664" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3665" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3666" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fa5f0" id="3667" addr="0x7fdf084fa5f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3668" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3669" addr="0x7fdf084fce50" >
+                            <attributelist id="3670" addr="0x7fdf084fce50" >
+                                <attribute name="ismember" value="1" id="3671" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getProgStation" id="3672" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getProgStation" id="3673" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3674" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3675" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3676" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3677" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fa5f0" id="3678" addr="0x7fdf084fa5f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3679" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3680" addr="0x7fdf084fd030" >
+                            <attributelist id="3681" addr="0x7fdf084fd030" >
+                                <attribute name="ismember" value="1" id="3682" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getProgStyle" id="3683" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getProgStyle" id="3684" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3685" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3686" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3687" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3688" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fa5f0" id="3689" addr="0x7fdf084fa5f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3690" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3691" addr="0x7fdf084fd210" >
+                            <attributelist id="3692" addr="0x7fdf084fd210" >
+                                <attribute name="ismember" value="1" id="3693" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getProgHost" id="3694" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getProgHost" id="3695" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3696" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3697" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3698" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3699" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fa5f0" id="3700" addr="0x7fdf084fa5f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3701" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3702" addr="0x7fdf084fd3f0" >
+                            <attributelist id="3703" addr="0x7fdf084fd3f0" >
+                                <attribute name="ismember" value="1" id="3704" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getProgWebsite" id="3705" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getProgWebsite" id="3706" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3707" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3708" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3709" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3710" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fa5f0" id="3711" addr="0x7fdf084fa5f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3712" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3713" addr="0x7fdf084fd5d0" >
+                            <attributelist id="3714" addr="0x7fdf084fd5d0" >
+                                <attribute name="ismember" value="1" id="3715" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getProgNow" id="3716" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getProgNow" id="3717" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3718" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3719" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3720" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3721" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fa5f0" id="3722" addr="0x7fdf084fa5f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3723" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3724" addr="0x7fdf084fd7b0" >
+                            <attributelist id="3725" addr="0x7fdf084fd7b0" >
+                                <attribute name="ismember" value="1" id="3726" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getProgNext" id="3727" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getProgNext" id="3728" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3729" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3730" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3731" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3732" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fa5f0" id="3733" addr="0x7fdf084fa5f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3734" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3735" addr="0x7fdf084fd990" >
+                            <attributelist id="3736" addr="0x7fdf084fd990" >
+                                <attribute name="ismember" value="1" id="3737" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getPhoneHotline" id="3738" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getPhoneHotline" id="3739" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3740" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3741" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3742" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3743" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fa5f0" id="3744" addr="0x7fdf084fa5f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3745" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3746" addr="0x7fdf084fdb70" >
+                            <attributelist id="3747" addr="0x7fdf084fdb70" >
+                                <attribute name="ismember" value="1" id="3748" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getEMailHotline" id="3749" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getEMailHotline" id="3750" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3751" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3752" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3753" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3754" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fa5f0" id="3755" addr="0x7fdf084fa5f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3756" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3757" addr="0x7fdf084fdd50" >
+                            <attributelist id="3758" addr="0x7fdf084fdd50" >
+                                <attribute name="ismember" value="1" id="3759" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getPhoneStudio" id="3760" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getPhoneStudio" id="3761" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3762" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3763" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3764" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3765" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fa5f0" id="3766" addr="0x7fdf084fa5f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3767" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3768" addr="0x7fdf084fdf30" >
+                            <attributelist id="3769" addr="0x7fdf084fdf30" >
+                                <attribute name="ismember" value="1" id="3770" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getEMailStudio" id="3771" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getEMailStudio" id="3772" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3773" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3774" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3775" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3776" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fa5f0" id="3777" addr="0x7fdf084fa5f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3778" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3779" addr="0x7fdf084fe110" >
+                            <attributelist id="3780" addr="0x7fdf084fe110" >
+                                <attribute name="ismember" value="1" id="3781" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getSMSStudio" id="3782" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getSMSStudio" id="3783" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="3784" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="3785" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="3786" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="3787" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fa5f0" id="3788" addr="0x7fdf084fa5f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3789" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </cdecl >
@@ -5335,781 +5335,781 @@
                 </namespace >
             </namespace >
         </include >
-        <include id="3790" addr="0x7ff9f1fa7330" >
-            <attributelist id="3791" addr="0x7ff9f1fa7330" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/InfoTagVideo.h" id="3792" addr="0x7ff9f1fba9d0" />
+        <include id="3790" addr="0x7fdf084fe330" >
+            <attributelist id="3791" addr="0x7fdf084fe330" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/InfoTagVideo.h" id="3792" addr="0x7fdf085119d0" />
             </attributelist >
 
-            <namespace id="3793" addr="0x7ff9f1fa73d0" >
-                <attributelist id="3794" addr="0x7ff9f1fa73d0" >
-                    <attribute name="sym_name" value="XBMCAddon" id="3795" addr="0x7ff9f1fba9d0" />
-                    <attribute name="name" value="XBMCAddon" id="3796" addr="0x7ff9f1fba9d0" />
-                    <attribute name="sym_previousSibling" value="0x7ff9f1fa32b0" id="3797" addr="0x7ff9f1fa32b0" />
-                    <attribute name="csym_nextSibling" value="0x7ff9f1fabad0" id="3798" addr="0x7ff9f1fabad0" />
-                    <attribute name="sym_nextSibling" value="0x7ff9f1fabad0" id="3799" addr="0x7ff9f1fabad0" />
-                    <typescope id="3800" addr="0x7ff9f1fb4990" >
-                        <attributelist id="3801" addr="0x7ff9f1fb4990" >
-                            <attribute name="name" value="XBMCAddon" id="3802" addr="0x7ff9f1fba9d0" />
-                            <typetab id="3803" addr="0x7ff9f1fb49d0" >
-                                <attributelist id="3804" addr="0x7ff9f1fb49d0" >
-                                    <attribute name="String" value="std::string" id="3805" addr="0x7ff9f1fba9d0" />
+            <namespace id="3793" addr="0x7fdf084fe3d0" >
+                <attributelist id="3794" addr="0x7fdf084fe3d0" >
+                    <attribute name="sym_name" value="XBMCAddon" id="3795" addr="0x7fdf085119d0" />
+                    <attribute name="name" value="XBMCAddon" id="3796" addr="0x7fdf085119d0" />
+                    <attribute name="sym_previousSibling" value="0x7fdf084fa2b0" id="3797" addr="0x7fdf084fa2b0" />
+                    <attribute name="csym_nextSibling" value="0x7fdf08502ad0" id="3798" addr="0x7fdf08502ad0" />
+                    <attribute name="sym_nextSibling" value="0x7fdf08502ad0" id="3799" addr="0x7fdf08502ad0" />
+                    <typescope id="3800" addr="0x7fdf0850b990" >
+                        <attributelist id="3801" addr="0x7fdf0850b990" >
+                            <attribute name="name" value="XBMCAddon" id="3802" addr="0x7fdf085119d0" />
+                            <typetab id="3803" addr="0x7fdf0850b9d0" >
+                                <attributelist id="3804" addr="0x7fdf0850b9d0" >
+                                    <attribute name="String" value="std::string" id="3805" addr="0x7fdf085119d0" />
                                 </attributelist >
-                                <typetabsitem id="3806" addr="0x7ff9f1fb4bb0" >
-                                    <attributelist id="3807" addr="0x7ff9f1fb4bb0" >
+                                <typetabsitem id="3806" addr="0x7fdf0850bbb0" >
+                                    <attributelist id="3807" addr="0x7fdf0850bbb0" >
                                     </attributelist >
                                 </typetabsitem >
                             </typetab >
-                            <attribute name="parent" value="0x7ff9f1f72a30" id="3808" addr="0x7ff9f1f72a30" />
-                            <attribute name="qname" value="XBMCAddon" id="3809" addr="0x7ff9f1fba9d0" />
-                            <attribute name="symtab" value="0x7ff9f1f89bb0" id="3810" addr="0x7ff9f1f89bb0" />
+                            <attribute name="parent" value="0x7fdf084c9a30" id="3808" addr="0x7fdf084c9a30" />
+                            <attribute name="qname" value="XBMCAddon" id="3809" addr="0x7fdf085119d0" />
+                            <attribute name="symtab" value="0x7fdf084e0bb0" id="3810" addr="0x7fdf084e0bb0" />
                         </attributelist >
-                        <typescopesitem id="3811" addr="0x7ff9f1f89b70" >
-                            <attributelist id="3812" addr="0x7ff9f1f89b70" >
+                        <typescopesitem id="3811" addr="0x7fdf084e0b70" >
+                            <attributelist id="3812" addr="0x7fdf084e0b70" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="3813" addr="0x7ff9f1fb49d0" >
-                            <attributelist id="3814" addr="0x7ff9f1fb49d0" >
-                                <attribute name="String" value="std::string" id="3815" addr="0x7ff9f1fba9d0" />
+                        <typescopesitem id="3813" addr="0x7fdf0850b9d0" >
+                            <attributelist id="3814" addr="0x7fdf0850b9d0" >
+                                <attribute name="String" value="std::string" id="3815" addr="0x7fdf085119d0" />
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="3816" addr="0x7ff9f1f72a30" >
-                            <attributelist id="3817" addr="0x7ff9f1f72a30" >
-                                <attribute name="name" value="" id="3818" addr="0x7ff9f1fba9d0" />
-                                <typetab id="3819" addr="0x7ff9f1f72a90" >
-                                    <attributelist id="3820" addr="0x7ff9f1f72a90" >
-                                        <attribute name="CGUIDialogKeyboardGeneric" value="CGUIDialogKeyboardGeneric" id="3821" addr="0x7ff9f1fba9d0" />
+                        <typescopesitem id="3816" addr="0x7fdf084c9a30" >
+                            <attributelist id="3817" addr="0x7fdf084c9a30" >
+                                <attribute name="name" value="" id="3818" addr="0x7fdf085119d0" />
+                                <typetab id="3819" addr="0x7fdf084c9a90" >
+                                    <attributelist id="3820" addr="0x7fdf084c9a90" >
+                                        <attribute name="CGUIDialogKeyboardGeneric" value="CGUIDialogKeyboardGeneric" id="3821" addr="0x7fdf085119d0" />
                                     </attributelist >
-                                    <typetabsitem id="3822" addr="0x7ff9f1fb7950" >
-                                        <attributelist id="3823" addr="0x7ff9f1fb7950" >
+                                    <typetabsitem id="3822" addr="0x7fdf0850e950" >
+                                        <attributelist id="3823" addr="0x7fdf0850e950" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="3824" addr="0x7ff9f1fb4ad0" >
-                            <attributelist id="3825" addr="0x7ff9f1fb4ad0" >
+                        <typescopesitem id="3824" addr="0x7fdf0850bad0" >
+                            <attributelist id="3825" addr="0x7fdf0850bad0" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="3826" addr="0x7ff9f1f89bb0" >
-                            <attributelist id="3827" addr="0x7ff9f1f89bb0" >
-                                <attribute name="name" value="XBMCAddon" id="3828" addr="0x7ff9f1fba9d0" />
-                                <attribute name="csymtab" value="0x7ff9f1f89bf0" id="3829" addr="0x7ff9f1f89bf0" />
-                                <attribute name="symtab" value="0x7ff9f1f89b90" id="3830" addr="0x7ff9f1f89b90" />
+                        <typescopesitem id="3826" addr="0x7fdf084e0bb0" >
+                            <attributelist id="3827" addr="0x7fdf084e0bb0" >
+                                <attribute name="name" value="XBMCAddon" id="3828" addr="0x7fdf085119d0" />
+                                <attribute name="csymtab" value="0x7fdf084e0bf0" id="3829" addr="0x7fdf084e0bf0" />
+                                <attribute name="symtab" value="0x7fdf084e0b90" id="3830" addr="0x7fdf084e0b90" />
                             </attributelist >
                         </typescopesitem >
                     </typescope >
-                    <attribute name="symtab" value="0x7ff9f1f89bb0" id="3831" addr="0x7ff9f1f89bb0" />
-                    <attribute name="sym_symtab" value="0x7ff9f1f72950" id="3832" addr="0x7ff9f1f72950" />
+                    <attribute name="symtab" value="0x7fdf084e0bb0" id="3831" addr="0x7fdf084e0bb0" />
+                    <attribute name="sym_symtab" value="0x7fdf084c9950" id="3832" addr="0x7fdf084c9950" />
                 </attributelist >
 
-                <namespace id="3833" addr="0x7ff9f1fa7450" >
-                    <attributelist id="3834" addr="0x7ff9f1fa7450" >
-                        <attribute name="feature_knownbasetypes" value="AddonClass,IPlayerCallback,AddonCallback" id="3835" addr="0x7ff9f1fba9d0" />
-                        <attribute name="name" value="xbmc" id="3836" addr="0x7ff9f1fba9d0" />
-                        <attribute name="sym_symtab" value="0x7ff9f1f89bb0" id="3837" addr="0x7ff9f1f89bb0" />
-                        <attribute name="symtab" value="0x7ff9f1f8a2b0" id="3838" addr="0x7ff9f1f8a2b0" />
-                        <attribute name="sym_nextSibling" value="0x7ff9f1fabb50" id="3839" addr="0x7ff9f1fabb50" />
-                        <attribute name="csym_nextSibling" value="0x7ff9f1fabb50" id="3840" addr="0x7ff9f1fabb50" />
-                        <attribute name="sym_previousSibling" value="0x7ff9f1fa3330" id="3841" addr="0x7ff9f1fa3330" />
-                        <attribute name="feature_knownapitypes" value="XBMCAddon::xbmcgui::ListItem,XBMCAddon::xbmc::PlayListItem" id="3842" addr="0x7ff9f1fba9d0" />
-                        <attribute name="sym_name" value="xbmc" id="3843" addr="0x7ff9f1fba9d0" />
-                        <typescope id="3844" addr="0x7ff9f1fb4d70" >
-                            <attributelist id="3845" addr="0x7ff9f1fb4d70" >
-                                <attribute name="name" value="xbmc" id="3846" addr="0x7ff9f1fba9d0" />
-                                <typetab id="3847" addr="0x7ff9f1fb4d90" >
-                                    <attributelist id="3848" addr="0x7ff9f1fb4d90" >
-                                        <attribute name="Monitor" value="Monitor" id="3849" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="3850" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="Keyboard" value="Keyboard" id="3851" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="3852" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="InfoTagVideo" value="InfoTagVideo" id="3853" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="Player" value="Player" id="3854" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="InfoTagMusic" value="InfoTagMusic" id="3855" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="PlayList" value="PlayList" id="3856" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="RenderCapture" value="RenderCapture" id="3857" addr="0x7ff9f1fba9d0" />
+                <namespace id="3833" addr="0x7fdf084fe450" >
+                    <attributelist id="3834" addr="0x7fdf084fe450" >
+                        <attribute name="feature_knownbasetypes" value="AddonClass,IPlayerCallback,AddonCallback" id="3835" addr="0x7fdf085119d0" />
+                        <attribute name="name" value="xbmc" id="3836" addr="0x7fdf085119d0" />
+                        <attribute name="sym_symtab" value="0x7fdf084e0bb0" id="3837" addr="0x7fdf084e0bb0" />
+                        <attribute name="symtab" value="0x7fdf084e12b0" id="3838" addr="0x7fdf084e12b0" />
+                        <attribute name="sym_nextSibling" value="0x7fdf08502b50" id="3839" addr="0x7fdf08502b50" />
+                        <attribute name="csym_nextSibling" value="0x7fdf08502b50" id="3840" addr="0x7fdf08502b50" />
+                        <attribute name="sym_previousSibling" value="0x7fdf084fa330" id="3841" addr="0x7fdf084fa330" />
+                        <attribute name="feature_knownapitypes" value="XBMCAddon::xbmcgui::ListItem,XBMCAddon::xbmc::PlayListItem" id="3842" addr="0x7fdf085119d0" />
+                        <attribute name="sym_name" value="xbmc" id="3843" addr="0x7fdf085119d0" />
+                        <typescope id="3844" addr="0x7fdf0850bd70" >
+                            <attributelist id="3845" addr="0x7fdf0850bd70" >
+                                <attribute name="name" value="xbmc" id="3846" addr="0x7fdf085119d0" />
+                                <typetab id="3847" addr="0x7fdf0850bd90" >
+                                    <attributelist id="3848" addr="0x7fdf0850bd90" >
+                                        <attribute name="Monitor" value="Monitor" id="3849" addr="0x7fdf085119d0" />
+                                        <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="3850" addr="0x7fdf085119d0" />
+                                        <attribute name="Keyboard" value="Keyboard" id="3851" addr="0x7fdf085119d0" />
+                                        <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="3852" addr="0x7fdf085119d0" />
+                                        <attribute name="InfoTagVideo" value="InfoTagVideo" id="3853" addr="0x7fdf085119d0" />
+                                        <attribute name="Player" value="Player" id="3854" addr="0x7fdf085119d0" />
+                                        <attribute name="InfoTagMusic" value="InfoTagMusic" id="3855" addr="0x7fdf085119d0" />
+                                        <attribute name="PlayList" value="PlayList" id="3856" addr="0x7fdf085119d0" />
+                                        <attribute name="RenderCapture" value="RenderCapture" id="3857" addr="0x7fdf085119d0" />
                                     </attributelist >
-                                    <typetabsitem id="3858" addr="0x7ff9f1fb9b10" >
-                                        <attributelist id="3859" addr="0x7ff9f1fb9b10" >
+                                    <typetabsitem id="3858" addr="0x7fdf08510b10" >
+                                        <attributelist id="3859" addr="0x7fdf08510b10" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="3860" addr="0x7ff9f1fb7f30" >
-                                        <attributelist id="3861" addr="0x7ff9f1fb7f30" >
+                                    <typetabsitem id="3860" addr="0x7fdf0850ef30" >
+                                        <attributelist id="3861" addr="0x7fdf0850ef30" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="3862" addr="0x7ff9f1fb8990" >
-                                        <attributelist id="3863" addr="0x7ff9f1fb8990" >
+                                    <typetabsitem id="3862" addr="0x7fdf0850f990" >
+                                        <attributelist id="3863" addr="0x7fdf0850f990" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="3864" addr="0x7ff9f1fb5e90" >
-                                        <attributelist id="3865" addr="0x7ff9f1fb5e90" >
+                                    <typetabsitem id="3864" addr="0x7fdf0850ce90" >
+                                        <attributelist id="3865" addr="0x7fdf0850ce90" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="3866" addr="0x7ff9f1fb8310" >
-                                        <attributelist id="3867" addr="0x7ff9f1fb8310" >
+                                    <typetabsitem id="3866" addr="0x7fdf0850f310" >
+                                        <attributelist id="3867" addr="0x7fdf0850f310" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="3868" addr="0x7ff9f1fb6050" >
-                                        <attributelist id="3869" addr="0x7ff9f1fb6050" >
+                                    <typetabsitem id="3868" addr="0x7fdf0850d050" >
+                                        <attributelist id="3869" addr="0x7fdf0850d050" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="3870" addr="0x7ff9f1fb7b50" >
-                                        <attributelist id="3871" addr="0x7ff9f1fb7b50" >
+                                    <typetabsitem id="3870" addr="0x7fdf0850eb50" >
+                                        <attributelist id="3871" addr="0x7fdf0850eb50" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="3872" addr="0x7ff9f1fb91b0" >
-                                        <attributelist id="3873" addr="0x7ff9f1fb91b0" >
+                                    <typetabsitem id="3872" addr="0x7fdf085101b0" >
+                                        <attributelist id="3873" addr="0x7fdf085101b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="3874" addr="0x7ff9f1fb7490" >
-                                        <attributelist id="3875" addr="0x7ff9f1fb7490" >
+                                    <typetabsitem id="3874" addr="0x7fdf0850e490" >
+                                        <attributelist id="3875" addr="0x7fdf0850e490" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
-                                <attribute name="parent" value="0x7ff9f1fb4990" id="3876" addr="0x7ff9f1fb4990" />
-                                <attribute name="qname" value="XBMCAddon::xbmc" id="3877" addr="0x7ff9f1fba9d0" />
-                                <attribute name="symtab" value="0x7ff9f1f8a2b0" id="3878" addr="0x7ff9f1f8a2b0" />
+                                <attribute name="parent" value="0x7fdf0850b990" id="3876" addr="0x7fdf0850b990" />
+                                <attribute name="qname" value="XBMCAddon::xbmc" id="3877" addr="0x7fdf085119d0" />
+                                <attribute name="symtab" value="0x7fdf084e12b0" id="3878" addr="0x7fdf084e12b0" />
                             </attributelist >
-                            <typescopesitem id="3879" addr="0x7ff9f1f8a270" >
-                                <attributelist id="3880" addr="0x7ff9f1f8a270" >
+                            <typescopesitem id="3879" addr="0x7fdf084e1270" >
+                                <attributelist id="3880" addr="0x7fdf084e1270" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="3881" addr="0x7ff9f1fb4d90" >
-                                <attributelist id="3882" addr="0x7ff9f1fb4d90" >
-                                    <attribute name="Monitor" value="Monitor" id="3883" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="3884" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="Keyboard" value="Keyboard" id="3885" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="3886" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="InfoTagVideo" value="InfoTagVideo" id="3887" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="Player" value="Player" id="3888" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="InfoTagMusic" value="InfoTagMusic" id="3889" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="PlayList" value="PlayList" id="3890" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="RenderCapture" value="RenderCapture" id="3891" addr="0x7ff9f1fba9d0" />
+                            <typescopesitem id="3881" addr="0x7fdf0850bd90" >
+                                <attributelist id="3882" addr="0x7fdf0850bd90" >
+                                    <attribute name="Monitor" value="Monitor" id="3883" addr="0x7fdf085119d0" />
+                                    <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="3884" addr="0x7fdf085119d0" />
+                                    <attribute name="Keyboard" value="Keyboard" id="3885" addr="0x7fdf085119d0" />
+                                    <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="3886" addr="0x7fdf085119d0" />
+                                    <attribute name="InfoTagVideo" value="InfoTagVideo" id="3887" addr="0x7fdf085119d0" />
+                                    <attribute name="Player" value="Player" id="3888" addr="0x7fdf085119d0" />
+                                    <attribute name="InfoTagMusic" value="InfoTagMusic" id="3889" addr="0x7fdf085119d0" />
+                                    <attribute name="PlayList" value="PlayList" id="3890" addr="0x7fdf085119d0" />
+                                    <attribute name="RenderCapture" value="RenderCapture" id="3891" addr="0x7fdf085119d0" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="3892" addr="0x7ff9f1fb4990" >
-                                <attributelist id="3893" addr="0x7ff9f1fb4990" >
-                                    <attribute name="name" value="XBMCAddon" id="3894" addr="0x7ff9f1fba9d0" />
-                                    <typetab id="3895" addr="0x7ff9f1fb49d0" >
-                                        <attributelist id="3896" addr="0x7ff9f1fb49d0" >
-                                            <attribute name="String" value="std::string" id="3897" addr="0x7ff9f1fba9d0" />
-                                        </attributelist >
-                                        <typetabsitem id="3898" addr="0x7ff9f1fb4bb0" >
-                                            <attributelist id="3899" addr="0x7ff9f1fb4bb0" >
+                            <typescopesitem id="3892" addr="0x7fdf0850b990" >
+                                <attributelist id="3893" addr="0x7fdf0850b990" >
+                                    <attribute name="name" value="XBMCAddon" id="3894" addr="0x7fdf085119d0" />
+                                    <typetab id="3895" addr="0x7fdf0850b9d0" >
+                                        <attributelist id="3896" addr="0x7fdf0850b9d0" >
+                                            <attribute name="String" value="std::string" id="3897" addr="0x7fdf085119d0" />
+                                        </attributelist >
+                                        <typetabsitem id="3898" addr="0x7fdf0850bbb0" >
+                                            <attributelist id="3899" addr="0x7fdf0850bbb0" >
                                             </attributelist >
                                         </typetabsitem >
                                     </typetab >
-                                    <attribute name="parent" value="0x7ff9f1f72a30" id="3900" addr="0x7ff9f1f72a30" />
-                                    <attribute name="qname" value="XBMCAddon" id="3901" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="symtab" value="0x7ff9f1f89bb0" id="3902" addr="0x7ff9f1f89bb0" />
+                                    <attribute name="parent" value="0x7fdf084c9a30" id="3900" addr="0x7fdf084c9a30" />
+                                    <attribute name="qname" value="XBMCAddon" id="3901" addr="0x7fdf085119d0" />
+                                    <attribute name="symtab" value="0x7fdf084e0bb0" id="3902" addr="0x7fdf084e0bb0" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="3903" addr="0x7ff9f1fb4db0" >
-                                <attributelist id="3904" addr="0x7ff9f1fb4db0" >
+                            <typescopesitem id="3903" addr="0x7fdf0850bdb0" >
+                                <attributelist id="3904" addr="0x7fdf0850bdb0" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="3905" addr="0x7ff9f1f8a2b0" >
-                                <attributelist id="3906" addr="0x7ff9f1f8a2b0" >
-                                    <attribute name="name" value="xbmc" id="3907" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="csymtab" value="0x7ff9f1f8a2f0" id="3908" addr="0x7ff9f1f8a2f0" />
-                                    <attribute name="symtab" value="0x7ff9f1f8a290" id="3909" addr="0x7ff9f1f8a290" />
+                            <typescopesitem id="3905" addr="0x7fdf084e12b0" >
+                                <attributelist id="3906" addr="0x7fdf084e12b0" >
+                                    <attribute name="name" value="xbmc" id="3907" addr="0x7fdf085119d0" />
+                                    <attribute name="csymtab" value="0x7fdf084e12f0" id="3908" addr="0x7fdf084e12f0" />
+                                    <attribute name="symtab" value="0x7fdf084e1290" id="3909" addr="0x7fdf084e1290" />
                                 </attributelist >
                             </typescopesitem >
                         </typescope >
                     </attributelist >
 
-                    <class id="3910" addr="0x7ff9f1fa75d0" >
-                        <attributelist id="3911" addr="0x7ff9f1fa75d0" >
-                            <attribute name="name" value="XBMCAddon::xbmc::InfoTagVideo" id="3912" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="3913" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="symtab" value="0x7ff9f1fa7710" id="3914" addr="0x7ff9f1fa7710" />
-                            <attribute name="allows_typedef" value="1" id="3915" addr="0x7ff9f1fba9d0" />
-                            <attribute name="typepass_visit" value="1" id="3916" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_visit" value="1" id="3917" addr="0x7ff9f1fba9d0" />
-                            <attribute name="kind" value="class" id="3918" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_name" value="InfoTagVideo" id="3919" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_default_constructor" value="1" id="3920" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_has_constructor" value="1" id="3921" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_public_constructor" value="1" id="3922" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_has_destructor" value="1" id="3923" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_default_destructor" value="1" id="3924" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_copy_constructor" value="1" id="3925" addr="0x7ff9f1fba9d0" />
-                            <attribute name="privatebaselist" value="0x7ff9f1fa75b0" id="3926" addr="0x7ff9f1fa75b0" />
-                            <attribute name="protectedbaselist" value="0x7ff9f1fa7590" id="3927" addr="0x7ff9f1fa7590" />
-                            <baselist id="3928" addr="0x7ff9f1fa7570" >
-                                <base name="AddonClass" id="3929" addr="0x7ff9f1fa74f0" />
+                    <class id="3910" addr="0x7fdf084fe5d0" >
+                        <attributelist id="3911" addr="0x7fdf084fe5d0" >
+                            <attribute name="name" value="XBMCAddon::xbmc::InfoTagVideo" id="3912" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="3913" addr="0x7fdf084e12b0" />
+                            <attribute name="symtab" value="0x7fdf084fe710" id="3914" addr="0x7fdf084fe710" />
+                            <attribute name="allows_typedef" value="1" id="3915" addr="0x7fdf085119d0" />
+                            <attribute name="typepass_visit" value="1" id="3916" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_visit" value="1" id="3917" addr="0x7fdf085119d0" />
+                            <attribute name="kind" value="class" id="3918" addr="0x7fdf085119d0" />
+                            <attribute name="sym_name" value="InfoTagVideo" id="3919" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_default_constructor" value="1" id="3920" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_has_constructor" value="1" id="3921" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_public_constructor" value="1" id="3922" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_has_destructor" value="1" id="3923" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_default_destructor" value="1" id="3924" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_copy_constructor" value="1" id="3925" addr="0x7fdf085119d0" />
+                            <attribute name="privatebaselist" value="0x7fdf084fe5b0" id="3926" addr="0x7fdf084fe5b0" />
+                            <attribute name="protectedbaselist" value="0x7fdf084fe590" id="3927" addr="0x7fdf084fe590" />
+                            <baselist id="3928" addr="0x7fdf084fe570" >
+                                <base name="AddonClass" id="3929" addr="0x7fdf084fe4f0" />
                             </baselist >
-                            <attribute name="module" value="xbmc" id="3930" addr="0x7ff9f1f89430" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="3931" addr="0x7ff9f1fba9d0" />
-                            <typescope id="3932" addr="0x7ff9f1fb83d0" >
-                                <attributelist id="3933" addr="0x7ff9f1fb83d0" >
-                                    <attribute name="name" value="InfoTagVideo" id="3934" addr="0x7ff9f1fba9d0" />
-                                    <typetab id="3935" addr="0x7ff9f1fb83f0" >
-                                        <attributelist id="3936" addr="0x7ff9f1fb83f0" >
+                            <attribute name="module" value="xbmc" id="3930" addr="0x7fdf084e0430" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="3931" addr="0x7fdf085119d0" />
+                            <typescope id="3932" addr="0x7fdf0850f3d0" >
+                                <attributelist id="3933" addr="0x7fdf0850f3d0" >
+                                    <attribute name="name" value="InfoTagVideo" id="3934" addr="0x7fdf085119d0" />
+                                    <typetab id="3935" addr="0x7fdf0850f3f0" >
+                                        <attributelist id="3936" addr="0x7fdf0850f3f0" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7ff9f1fb4d70" id="3937" addr="0x7ff9f1fb4d70" />
-                                    <attribute name="qname" value="XBMCAddon::xbmc::InfoTagVideo" id="3938" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="symtab" value="0x7ff9f1fa7710" id="3939" addr="0x7ff9f1fa7710" />
+                                    <attribute name="parent" value="0x7fdf0850bd70" id="3937" addr="0x7fdf0850bd70" />
+                                    <attribute name="qname" value="XBMCAddon::xbmc::InfoTagVideo" id="3938" addr="0x7fdf085119d0" />
+                                    <attribute name="symtab" value="0x7fdf084fe710" id="3939" addr="0x7fdf084fe710" />
                                 </attributelist >
-                                <typescopesitem id="3940" addr="0x7ff9f1fb8370" >
-                                    <attributelist id="3941" addr="0x7ff9f1fb8370" >
+                                <typescopesitem id="3940" addr="0x7fdf0850f370" >
+                                    <attributelist id="3941" addr="0x7fdf0850f370" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="3942" addr="0x7ff9f1fb83f0" >
-                                    <attributelist id="3943" addr="0x7ff9f1fb83f0" >
+                                <typescopesitem id="3942" addr="0x7fdf0850f3f0" >
+                                    <attributelist id="3943" addr="0x7fdf0850f3f0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="3944" addr="0x7ff9f1fb4d70" >
-                                    <attributelist id="3945" addr="0x7ff9f1fb4d70" >
-                                        <attribute name="name" value="xbmc" id="3946" addr="0x7ff9f1fba9d0" />
-                                        <typetab id="3947" addr="0x7ff9f1fb4d90" >
-                                            <attributelist id="3948" addr="0x7ff9f1fb4d90" >
-                                                <attribute name="Monitor" value="Monitor" id="3949" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="3950" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="Keyboard" value="Keyboard" id="3951" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="3952" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="InfoTagVideo" value="InfoTagVideo" id="3953" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="Player" value="Player" id="3954" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="InfoTagMusic" value="InfoTagMusic" id="3955" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="PlayList" value="PlayList" id="3956" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="RenderCapture" value="RenderCapture" id="3957" addr="0x7ff9f1fba9d0" />
+                                <typescopesitem id="3944" addr="0x7fdf0850bd70" >
+                                    <attributelist id="3945" addr="0x7fdf0850bd70" >
+                                        <attribute name="name" value="xbmc" id="3946" addr="0x7fdf085119d0" />
+                                        <typetab id="3947" addr="0x7fdf0850bd90" >
+                                            <attributelist id="3948" addr="0x7fdf0850bd90" >
+                                                <attribute name="Monitor" value="Monitor" id="3949" addr="0x7fdf085119d0" />
+                                                <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="3950" addr="0x7fdf085119d0" />
+                                                <attribute name="Keyboard" value="Keyboard" id="3951" addr="0x7fdf085119d0" />
+                                                <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="3952" addr="0x7fdf085119d0" />
+                                                <attribute name="InfoTagVideo" value="InfoTagVideo" id="3953" addr="0x7fdf085119d0" />
+                                                <attribute name="Player" value="Player" id="3954" addr="0x7fdf085119d0" />
+                                                <attribute name="InfoTagMusic" value="InfoTagMusic" id="3955" addr="0x7fdf085119d0" />
+                                                <attribute name="PlayList" value="PlayList" id="3956" addr="0x7fdf085119d0" />
+                                                <attribute name="RenderCapture" value="RenderCapture" id="3957" addr="0x7fdf085119d0" />
                                             </attributelist >
-                                            <typetabsitem id="3958" addr="0x7ff9f1fb9b10" >
-                                                <attributelist id="3959" addr="0x7ff9f1fb9b10" >
+                                            <typetabsitem id="3958" addr="0x7fdf08510b10" >
+                                                <attributelist id="3959" addr="0x7fdf08510b10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3960" addr="0x7ff9f1fb7f30" >
-                                                <attributelist id="3961" addr="0x7ff9f1fb7f30" >
+                                            <typetabsitem id="3960" addr="0x7fdf0850ef30" >
+                                                <attributelist id="3961" addr="0x7fdf0850ef30" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3962" addr="0x7ff9f1fb8990" >
-                                                <attributelist id="3963" addr="0x7ff9f1fb8990" >
+                                            <typetabsitem id="3962" addr="0x7fdf0850f990" >
+                                                <attributelist id="3963" addr="0x7fdf0850f990" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3964" addr="0x7ff9f1fb5e90" >
-                                                <attributelist id="3965" addr="0x7ff9f1fb5e90" >
+                                            <typetabsitem id="3964" addr="0x7fdf0850ce90" >
+                                                <attributelist id="3965" addr="0x7fdf0850ce90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3966" addr="0x7ff9f1fb8310" >
-                                                <attributelist id="3967" addr="0x7ff9f1fb8310" >
+                                            <typetabsitem id="3966" addr="0x7fdf0850f310" >
+                                                <attributelist id="3967" addr="0x7fdf0850f310" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3968" addr="0x7ff9f1fb6050" >
-                                                <attributelist id="3969" addr="0x7ff9f1fb6050" >
+                                            <typetabsitem id="3968" addr="0x7fdf0850d050" >
+                                                <attributelist id="3969" addr="0x7fdf0850d050" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3970" addr="0x7ff9f1fb7b50" >
-                                                <attributelist id="3971" addr="0x7ff9f1fb7b50" >
+                                            <typetabsitem id="3970" addr="0x7fdf0850eb50" >
+                                                <attributelist id="3971" addr="0x7fdf0850eb50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3972" addr="0x7ff9f1fb91b0" >
-                                                <attributelist id="3973" addr="0x7ff9f1fb91b0" >
+                                            <typetabsitem id="3972" addr="0x7fdf085101b0" >
+                                                <attributelist id="3973" addr="0x7fdf085101b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3974" addr="0x7ff9f1fb7490" >
-                                                <attributelist id="3975" addr="0x7ff9f1fb7490" >
+                                            <typetabsitem id="3974" addr="0x7fdf0850e490" >
+                                                <attributelist id="3975" addr="0x7fdf0850e490" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7ff9f1fb4990" id="3976" addr="0x7ff9f1fb4990" />
-                                        <attribute name="qname" value="XBMCAddon::xbmc" id="3977" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="symtab" value="0x7ff9f1f8a2b0" id="3978" addr="0x7ff9f1f8a2b0" />
+                                        <attribute name="parent" value="0x7fdf0850b990" id="3976" addr="0x7fdf0850b990" />
+                                        <attribute name="qname" value="XBMCAddon::xbmc" id="3977" addr="0x7fdf085119d0" />
+                                        <attribute name="symtab" value="0x7fdf084e12b0" id="3978" addr="0x7fdf084e12b0" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="3979" addr="0x7ff9f1fb8410" >
-                                    <attributelist id="3980" addr="0x7ff9f1fb8410" >
+                                <typescopesitem id="3979" addr="0x7fdf0850f410" >
+                                    <attributelist id="3980" addr="0x7fdf0850f410" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="3981" addr="0x7ff9f1fa7710" >
-                                    <attributelist id="3982" addr="0x7ff9f1fa7710" >
-                                        <attribute name="name" value="InfoTagVideo" id="3983" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="csymtab" value="0x7ff9f1fa7730" id="3984" addr="0x7ff9f1fa7730" />
-                                        <attribute name="symtab" value="0x7ff9f1fa76d0" id="3985" addr="0x7ff9f1fa76d0" />
+                                <typescopesitem id="3981" addr="0x7fdf084fe710" >
+                                    <attributelist id="3982" addr="0x7fdf084fe710" >
+                                        <attribute name="name" value="InfoTagVideo" id="3983" addr="0x7fdf085119d0" />
+                                        <attribute name="csymtab" value="0x7fdf084fe730" id="3984" addr="0x7fdf084fe730" />
+                                        <attribute name="symtab" value="0x7fdf084fe6d0" id="3985" addr="0x7fdf084fe6d0" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <access id="3986" addr="0x7ff9f1fa7690" >
-                            <attributelist id="3987" addr="0x7ff9f1fa7690" >
-                                <attribute name="kind" value="private" id="3988" addr="0x7ff9f1fba9d0" />
+                        <access id="3986" addr="0x7fdf084fe690" >
+                            <attributelist id="3987" addr="0x7fdf084fe690" >
+                                <attribute name="kind" value="private" id="3988" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </access >
-                        <cdecl id="3989" addr="0x7ff9f1fa7870" >
-                            <attributelist id="3990" addr="0x7ff9f1fa7870" >
-                                <attribute name="ismember" value="1" id="3991" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="infoTag" id="3992" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="p." id="3993" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="private" id="3994" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="variable" id="3995" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="CVideoInfoTag" id="3996" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa7710" id="3997" addr="0x7ff9f1fa7710" />
+                        <cdecl id="3989" addr="0x7fdf084fe870" >
+                            <attributelist id="3990" addr="0x7fdf084fe870" >
+                                <attribute name="ismember" value="1" id="3991" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="infoTag" id="3992" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="p." id="3993" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="private" id="3994" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="variable" id="3995" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="CVideoInfoTag" id="3996" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fe710" id="3997" addr="0x7fdf084fe710" />
                             </attributelist >
                          
                         </cdecl >
-                        <access id="3998" addr="0x7ff9f1fa7950" >
-                            <attributelist id="3999" addr="0x7ff9f1fa7950" >
-                                <attribute name="kind" value="public" id="4000" addr="0x7ff9f1fba9d0" />
+                        <access id="3998" addr="0x7fdf084fe950" >
+                            <attributelist id="3999" addr="0x7fdf084fe950" >
+                                <attribute name="kind" value="public" id="4000" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="4001" addr="0x7ff9f1fa7a70" >
-                            <attributelist id="4002" addr="0x7ff9f1fa7a70" >
-                                <attribute name="ismember" value="1" id="4003" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="InfoTagVideo" id="4004" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="InfoTagVideo" id="4005" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="4006" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4007" addr="0x7ff9f1fba9d0" />
-                                <attribute name="feature_new" value="1" id="4008" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa7710" id="4009" addr="0x7ff9f1fa7710" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4010" addr="0x7ff9f1fba9d0" />
+                        <constructor id="4001" addr="0x7fdf084fea70" >
+                            <attributelist id="4002" addr="0x7fdf084fea70" >
+                                <attribute name="ismember" value="1" id="4003" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="InfoTagVideo" id="4004" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="InfoTagVideo" id="4005" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="4006" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4007" addr="0x7fdf085119d0" />
+                                <attribute name="feature_new" value="1" id="4008" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fe710" id="4009" addr="0x7fdf084fe710" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4010" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </constructor >
-                        <destructor id="4011" addr="0x7ff9f1fa7bd0" >
-                            <attributelist id="4012" addr="0x7ff9f1fa7bd0" >
-                                <attribute name="ismember" value="1" id="4013" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="~InfoTagVideo" id="4014" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="~InfoTagVideo" id="4015" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="4016" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4017" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa7710" id="4018" addr="0x7ff9f1fa7710" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4019" addr="0x7ff9f1fba9d0" />
+                        <destructor id="4011" addr="0x7fdf084febd0" >
+                            <attributelist id="4012" addr="0x7fdf084febd0" >
+                                <attribute name="ismember" value="1" id="4013" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="~InfoTagVideo" id="4014" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="~InfoTagVideo" id="4015" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="4016" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4017" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fe710" id="4018" addr="0x7fdf084fe710" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4019" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </destructor >
-                        <cdecl id="4020" addr="0x7ff9f1fa7d90" >
-                            <attributelist id="4021" addr="0x7ff9f1fa7d90" >
-                                <attribute name="ismember" value="1" id="4022" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getDbId" id="4023" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getDbId" id="4024" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="4025" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4026" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="4027" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="int" id="4028" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa7710" id="4029" addr="0x7ff9f1fa7710" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4030" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4031" addr="0x7ff9f1fa7f70" >
-                            <attributelist id="4032" addr="0x7ff9f1fa7f70" >
-                                <attribute name="ismember" value="1" id="4033" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getDirector" id="4034" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getDirector" id="4035" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="4036" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4037" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="4038" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="4039" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa7710" id="4040" addr="0x7ff9f1fa7710" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4041" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4042" addr="0x7ff9f1fa8150" >
-                            <attributelist id="4043" addr="0x7ff9f1fa8150" >
-                                <attribute name="ismember" value="1" id="4044" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getWritingCredits" id="4045" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getWritingCredits" id="4046" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="4047" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4048" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="4049" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="4050" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa7710" id="4051" addr="0x7ff9f1fa7710" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4052" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4053" addr="0x7ff9f1fa8330" >
-                            <attributelist id="4054" addr="0x7ff9f1fa8330" >
-                                <attribute name="ismember" value="1" id="4055" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getGenre" id="4056" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getGenre" id="4057" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="4058" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4059" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="4060" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="4061" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa7710" id="4062" addr="0x7ff9f1fa7710" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4063" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4064" addr="0x7ff9f1fa8510" >
-                            <attributelist id="4065" addr="0x7ff9f1fa8510" >
-                                <attribute name="ismember" value="1" id="4066" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getTagLine" id="4067" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getTagLine" id="4068" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="4069" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4070" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="4071" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="4072" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa7710" id="4073" addr="0x7ff9f1fa7710" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4074" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4075" addr="0x7ff9f1fa86f0" >
-                            <attributelist id="4076" addr="0x7ff9f1fa86f0" >
-                                <attribute name="ismember" value="1" id="4077" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getPlotOutline" id="4078" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getPlotOutline" id="4079" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="4080" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4081" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="4082" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="4083" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa7710" id="4084" addr="0x7ff9f1fa7710" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4085" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4086" addr="0x7ff9f1fa88d0" >
-                            <attributelist id="4087" addr="0x7ff9f1fa88d0" >
-                                <attribute name="ismember" value="1" id="4088" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getPlot" id="4089" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getPlot" id="4090" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="4091" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4092" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="4093" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="4094" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa7710" id="4095" addr="0x7ff9f1fa7710" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4096" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4097" addr="0x7ff9f1fa8ab0" >
-                            <attributelist id="4098" addr="0x7ff9f1fa8ab0" >
-                                <attribute name="ismember" value="1" id="4099" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getPictureURL" id="4100" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getPictureURL" id="4101" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="4102" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4103" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="4104" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="4105" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa7710" id="4106" addr="0x7ff9f1fa7710" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4107" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4108" addr="0x7ff9f1fa8c90" >
-                            <attributelist id="4109" addr="0x7ff9f1fa8c90" >
-                                <attribute name="ismember" value="1" id="4110" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getTitle" id="4111" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getTitle" id="4112" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="4113" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4114" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="4115" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="4116" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa7710" id="4117" addr="0x7ff9f1fa7710" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4118" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4119" addr="0x7ff9f1fa8e70" >
-                            <attributelist id="4120" addr="0x7ff9f1fa8e70" >
-                                <attribute name="ismember" value="1" id="4121" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getTVShowTitle" id="4122" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getTVShowTitle" id="4123" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="4124" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4125" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="4126" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="4127" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa7710" id="4128" addr="0x7ff9f1fa7710" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4129" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4130" addr="0x7ff9f1fa9050" >
-                            <attributelist id="4131" addr="0x7ff9f1fa9050" >
-                                <attribute name="ismember" value="1" id="4132" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getMediaType" id="4133" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getMediaType" id="4134" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="4135" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4136" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="4137" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="4138" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa7710" id="4139" addr="0x7ff9f1fa7710" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4140" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4141" addr="0x7ff9f1fa9230" >
-                            <attributelist id="4142" addr="0x7ff9f1fa9230" >
-                                <attribute name="ismember" value="1" id="4143" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getVotes" id="4144" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getVotes" id="4145" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="4146" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4147" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="4148" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="4149" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa7710" id="4150" addr="0x7ff9f1fa7710" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4151" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4152" addr="0x7ff9f1fa9410" >
-                            <attributelist id="4153" addr="0x7ff9f1fa9410" >
-                                <attribute name="ismember" value="1" id="4154" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getCast" id="4155" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getCast" id="4156" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="4157" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4158" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="4159" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="4160" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa7710" id="4161" addr="0x7ff9f1fa7710" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4162" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4163" addr="0x7ff9f1fa95f0" >
-                            <attributelist id="4164" addr="0x7ff9f1fa95f0" >
-                                <attribute name="ismember" value="1" id="4165" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getFile" id="4166" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getFile" id="4167" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="4168" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4169" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="4170" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="4171" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa7710" id="4172" addr="0x7ff9f1fa7710" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4173" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4174" addr="0x7ff9f1fa97d0" >
-                            <attributelist id="4175" addr="0x7ff9f1fa97d0" >
-                                <attribute name="ismember" value="1" id="4176" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getPath" id="4177" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getPath" id="4178" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="4179" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4180" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="4181" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="4182" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa7710" id="4183" addr="0x7ff9f1fa7710" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4184" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4185" addr="0x7ff9f1fa99b0" >
-                            <attributelist id="4186" addr="0x7ff9f1fa99b0" >
-                                <attribute name="ismember" value="1" id="4187" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getIMDBNumber" id="4188" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getIMDBNumber" id="4189" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="4190" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4191" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="4192" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="4193" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa7710" id="4194" addr="0x7ff9f1fa7710" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4195" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4196" addr="0x7ff9f1fa9b90" >
-                            <attributelist id="4197" addr="0x7ff9f1fa9b90" >
-                                <attribute name="ismember" value="1" id="4198" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getSeason" id="4199" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getSeason" id="4200" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="4201" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4202" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="4203" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="int" id="4204" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa7710" id="4205" addr="0x7ff9f1fa7710" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4206" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4207" addr="0x7ff9f1fa9d70" >
-                            <attributelist id="4208" addr="0x7ff9f1fa9d70" >
-                                <attribute name="ismember" value="1" id="4209" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getEpisode" id="4210" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getEpisode" id="4211" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="4212" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4213" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="4214" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="int" id="4215" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa7710" id="4216" addr="0x7ff9f1fa7710" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4217" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4218" addr="0x7ff9f1fa9f50" >
-                            <attributelist id="4219" addr="0x7ff9f1fa9f50" >
-                                <attribute name="ismember" value="1" id="4220" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getYear" id="4221" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getYear" id="4222" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="4223" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4224" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="4225" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="int" id="4226" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa7710" id="4227" addr="0x7ff9f1fa7710" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4228" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4229" addr="0x7ff9f1faa130" >
-                            <attributelist id="4230" addr="0x7ff9f1faa130" >
-                                <attribute name="ismember" value="1" id="4231" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getRating" id="4232" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getRating" id="4233" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="4234" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4235" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="4236" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="double" id="4237" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa7710" id="4238" addr="0x7ff9f1fa7710" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4239" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4240" addr="0x7ff9f1faa310" >
-                            <attributelist id="4241" addr="0x7ff9f1faa310" >
-                                <attribute name="ismember" value="1" id="4242" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getUserRating" id="4243" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getUserRating" id="4244" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="4245" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4246" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="4247" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="int" id="4248" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa7710" id="4249" addr="0x7ff9f1fa7710" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4250" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4251" addr="0x7ff9f1faa4f0" >
-                            <attributelist id="4252" addr="0x7ff9f1faa4f0" >
-                                <attribute name="ismember" value="1" id="4253" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getPlayCount" id="4254" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getPlayCount" id="4255" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="4256" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4257" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="4258" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="int" id="4259" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa7710" id="4260" addr="0x7ff9f1fa7710" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4261" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4262" addr="0x7ff9f1faa6d0" >
-                            <attributelist id="4263" addr="0x7ff9f1faa6d0" >
-                                <attribute name="ismember" value="1" id="4264" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getLastPlayed" id="4265" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getLastPlayed" id="4266" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="4267" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4268" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="4269" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="4270" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa7710" id="4271" addr="0x7ff9f1fa7710" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4272" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4273" addr="0x7ff9f1faa8b0" >
-                            <attributelist id="4274" addr="0x7ff9f1faa8b0" >
-                                <attribute name="ismember" value="1" id="4275" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getOriginalTitle" id="4276" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getOriginalTitle" id="4277" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="4278" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4279" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="4280" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="4281" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa7710" id="4282" addr="0x7ff9f1fa7710" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4283" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4284" addr="0x7ff9f1faaa90" >
-                            <attributelist id="4285" addr="0x7ff9f1faaa90" >
-                                <attribute name="ismember" value="1" id="4286" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getPremiered" id="4287" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getPremiered" id="4288" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="4289" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4290" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="4291" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="4292" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa7710" id="4293" addr="0x7ff9f1fa7710" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4294" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4295" addr="0x7ff9f1faac70" >
-                            <attributelist id="4296" addr="0x7ff9f1faac70" >
-                                <attribute name="ismember" value="1" id="4297" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getFirstAired" id="4298" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getFirstAired" id="4299" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="4300" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4301" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="4302" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="4303" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa7710" id="4304" addr="0x7ff9f1fa7710" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4305" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4306" addr="0x7ff9f1faae50" >
-                            <attributelist id="4307" addr="0x7ff9f1faae50" >
-                                <attribute name="ismember" value="1" id="4308" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getTrailer" id="4309" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getTrailer" id="4310" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="4311" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4312" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="4313" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="4314" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa7710" id="4315" addr="0x7ff9f1fa7710" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4316" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4317" addr="0x7ff9f1fab130" >
-                            <attributelist id="4318" addr="0x7ff9f1fab130" >
-                                <attribute name="ismember" value="1" id="4319" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getArtist" id="4320" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getArtist" id="4321" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="4322" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4323" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="4324" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="std::vector&lt;(std::string)>" id="4325" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa7710" id="4326" addr="0x7ff9f1fa7710" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4327" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4328" addr="0x7ff9f1fab310" >
-                            <attributelist id="4329" addr="0x7ff9f1fab310" >
-                                <attribute name="ismember" value="1" id="4330" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getAlbum" id="4331" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getAlbum" id="4332" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="4333" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4334" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="4335" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="4336" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa7710" id="4337" addr="0x7ff9f1fa7710" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4338" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4339" addr="0x7ff9f1fab4f0" >
-                            <attributelist id="4340" addr="0x7ff9f1fab4f0" >
-                                <attribute name="ismember" value="1" id="4341" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getTrack" id="4342" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getTrack" id="4343" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="4344" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4345" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="4346" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="int" id="4347" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa7710" id="4348" addr="0x7ff9f1fa7710" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4349" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4350" addr="0x7ff9f1fab6f0" >
-                            <attributelist id="4351" addr="0x7ff9f1fab6f0" >
-                                <attribute name="ismember" value="1" id="4352" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getDuration" id="4353" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getDuration" id="4354" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="4355" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4356" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="4357" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="unsigned int" id="4358" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fa7710" id="4359" addr="0x7ff9f1fa7710" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4360" addr="0x7ff9f1fba9d0" />
+                        <cdecl id="4020" addr="0x7fdf084fed90" >
+                            <attributelist id="4021" addr="0x7fdf084fed90" >
+                                <attribute name="ismember" value="1" id="4022" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getDbId" id="4023" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getDbId" id="4024" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="4025" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4026" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="4027" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="int" id="4028" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fe710" id="4029" addr="0x7fdf084fe710" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4030" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4031" addr="0x7fdf084fef70" >
+                            <attributelist id="4032" addr="0x7fdf084fef70" >
+                                <attribute name="ismember" value="1" id="4033" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getDirector" id="4034" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getDirector" id="4035" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="4036" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4037" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="4038" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="4039" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fe710" id="4040" addr="0x7fdf084fe710" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4041" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4042" addr="0x7fdf084ff150" >
+                            <attributelist id="4043" addr="0x7fdf084ff150" >
+                                <attribute name="ismember" value="1" id="4044" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getWritingCredits" id="4045" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getWritingCredits" id="4046" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="4047" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4048" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="4049" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="4050" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fe710" id="4051" addr="0x7fdf084fe710" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4052" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4053" addr="0x7fdf084ff330" >
+                            <attributelist id="4054" addr="0x7fdf084ff330" >
+                                <attribute name="ismember" value="1" id="4055" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getGenre" id="4056" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getGenre" id="4057" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="4058" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4059" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="4060" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="4061" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fe710" id="4062" addr="0x7fdf084fe710" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4063" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4064" addr="0x7fdf084ff510" >
+                            <attributelist id="4065" addr="0x7fdf084ff510" >
+                                <attribute name="ismember" value="1" id="4066" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getTagLine" id="4067" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getTagLine" id="4068" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="4069" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4070" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="4071" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="4072" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fe710" id="4073" addr="0x7fdf084fe710" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4074" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4075" addr="0x7fdf084ff6f0" >
+                            <attributelist id="4076" addr="0x7fdf084ff6f0" >
+                                <attribute name="ismember" value="1" id="4077" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getPlotOutline" id="4078" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getPlotOutline" id="4079" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="4080" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4081" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="4082" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="4083" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fe710" id="4084" addr="0x7fdf084fe710" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4085" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4086" addr="0x7fdf084ff8d0" >
+                            <attributelist id="4087" addr="0x7fdf084ff8d0" >
+                                <attribute name="ismember" value="1" id="4088" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getPlot" id="4089" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getPlot" id="4090" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="4091" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4092" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="4093" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="4094" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fe710" id="4095" addr="0x7fdf084fe710" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4096" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4097" addr="0x7fdf084ffab0" >
+                            <attributelist id="4098" addr="0x7fdf084ffab0" >
+                                <attribute name="ismember" value="1" id="4099" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getPictureURL" id="4100" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getPictureURL" id="4101" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="4102" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4103" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="4104" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="4105" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fe710" id="4106" addr="0x7fdf084fe710" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4107" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4108" addr="0x7fdf084ffc90" >
+                            <attributelist id="4109" addr="0x7fdf084ffc90" >
+                                <attribute name="ismember" value="1" id="4110" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getTitle" id="4111" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getTitle" id="4112" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="4113" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4114" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="4115" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="4116" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fe710" id="4117" addr="0x7fdf084fe710" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4118" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4119" addr="0x7fdf084ffe70" >
+                            <attributelist id="4120" addr="0x7fdf084ffe70" >
+                                <attribute name="ismember" value="1" id="4121" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getTVShowTitle" id="4122" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getTVShowTitle" id="4123" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="4124" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4125" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="4126" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="4127" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fe710" id="4128" addr="0x7fdf084fe710" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4129" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4130" addr="0x7fdf08500050" >
+                            <attributelist id="4131" addr="0x7fdf08500050" >
+                                <attribute name="ismember" value="1" id="4132" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getMediaType" id="4133" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getMediaType" id="4134" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="4135" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4136" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="4137" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="4138" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fe710" id="4139" addr="0x7fdf084fe710" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4140" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4141" addr="0x7fdf08500230" >
+                            <attributelist id="4142" addr="0x7fdf08500230" >
+                                <attribute name="ismember" value="1" id="4143" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getVotes" id="4144" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getVotes" id="4145" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="4146" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4147" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="4148" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="4149" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fe710" id="4150" addr="0x7fdf084fe710" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4151" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4152" addr="0x7fdf08500410" >
+                            <attributelist id="4153" addr="0x7fdf08500410" >
+                                <attribute name="ismember" value="1" id="4154" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getCast" id="4155" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getCast" id="4156" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="4157" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4158" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="4159" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="4160" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fe710" id="4161" addr="0x7fdf084fe710" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4162" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4163" addr="0x7fdf085005f0" >
+                            <attributelist id="4164" addr="0x7fdf085005f0" >
+                                <attribute name="ismember" value="1" id="4165" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getFile" id="4166" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getFile" id="4167" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="4168" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4169" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="4170" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="4171" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fe710" id="4172" addr="0x7fdf084fe710" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4173" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4174" addr="0x7fdf085007d0" >
+                            <attributelist id="4175" addr="0x7fdf085007d0" >
+                                <attribute name="ismember" value="1" id="4176" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getPath" id="4177" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getPath" id="4178" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="4179" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4180" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="4181" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="4182" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fe710" id="4183" addr="0x7fdf084fe710" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4184" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4185" addr="0x7fdf085009b0" >
+                            <attributelist id="4186" addr="0x7fdf085009b0" >
+                                <attribute name="ismember" value="1" id="4187" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getIMDBNumber" id="4188" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getIMDBNumber" id="4189" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="4190" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4191" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="4192" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="4193" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fe710" id="4194" addr="0x7fdf084fe710" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4195" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4196" addr="0x7fdf08500b90" >
+                            <attributelist id="4197" addr="0x7fdf08500b90" >
+                                <attribute name="ismember" value="1" id="4198" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getSeason" id="4199" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getSeason" id="4200" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="4201" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4202" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="4203" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="int" id="4204" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fe710" id="4205" addr="0x7fdf084fe710" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4206" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4207" addr="0x7fdf08500d70" >
+                            <attributelist id="4208" addr="0x7fdf08500d70" >
+                                <attribute name="ismember" value="1" id="4209" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getEpisode" id="4210" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getEpisode" id="4211" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="4212" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4213" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="4214" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="int" id="4215" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fe710" id="4216" addr="0x7fdf084fe710" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4217" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4218" addr="0x7fdf08500f50" >
+                            <attributelist id="4219" addr="0x7fdf08500f50" >
+                                <attribute name="ismember" value="1" id="4220" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getYear" id="4221" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getYear" id="4222" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="4223" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4224" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="4225" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="int" id="4226" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fe710" id="4227" addr="0x7fdf084fe710" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4228" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4229" addr="0x7fdf08501130" >
+                            <attributelist id="4230" addr="0x7fdf08501130" >
+                                <attribute name="ismember" value="1" id="4231" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getRating" id="4232" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getRating" id="4233" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="4234" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4235" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="4236" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="double" id="4237" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fe710" id="4238" addr="0x7fdf084fe710" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4239" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4240" addr="0x7fdf08501310" >
+                            <attributelist id="4241" addr="0x7fdf08501310" >
+                                <attribute name="ismember" value="1" id="4242" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getUserRating" id="4243" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getUserRating" id="4244" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="4245" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4246" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="4247" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="int" id="4248" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fe710" id="4249" addr="0x7fdf084fe710" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4250" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4251" addr="0x7fdf085014f0" >
+                            <attributelist id="4252" addr="0x7fdf085014f0" >
+                                <attribute name="ismember" value="1" id="4253" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getPlayCount" id="4254" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getPlayCount" id="4255" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="4256" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4257" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="4258" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="int" id="4259" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fe710" id="4260" addr="0x7fdf084fe710" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4261" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4262" addr="0x7fdf085016d0" >
+                            <attributelist id="4263" addr="0x7fdf085016d0" >
+                                <attribute name="ismember" value="1" id="4264" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getLastPlayed" id="4265" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getLastPlayed" id="4266" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="4267" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4268" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="4269" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="4270" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fe710" id="4271" addr="0x7fdf084fe710" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4272" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4273" addr="0x7fdf085018b0" >
+                            <attributelist id="4274" addr="0x7fdf085018b0" >
+                                <attribute name="ismember" value="1" id="4275" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getOriginalTitle" id="4276" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getOriginalTitle" id="4277" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="4278" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4279" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="4280" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="4281" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fe710" id="4282" addr="0x7fdf084fe710" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4283" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4284" addr="0x7fdf08501a90" >
+                            <attributelist id="4285" addr="0x7fdf08501a90" >
+                                <attribute name="ismember" value="1" id="4286" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getPremiered" id="4287" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getPremiered" id="4288" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="4289" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4290" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="4291" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="4292" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fe710" id="4293" addr="0x7fdf084fe710" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4294" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4295" addr="0x7fdf08501c70" >
+                            <attributelist id="4296" addr="0x7fdf08501c70" >
+                                <attribute name="ismember" value="1" id="4297" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getFirstAired" id="4298" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getFirstAired" id="4299" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="4300" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4301" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="4302" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="4303" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fe710" id="4304" addr="0x7fdf084fe710" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4305" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4306" addr="0x7fdf08501e50" >
+                            <attributelist id="4307" addr="0x7fdf08501e50" >
+                                <attribute name="ismember" value="1" id="4308" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getTrailer" id="4309" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getTrailer" id="4310" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="4311" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4312" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="4313" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="4314" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fe710" id="4315" addr="0x7fdf084fe710" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4316" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4317" addr="0x7fdf08502130" >
+                            <attributelist id="4318" addr="0x7fdf08502130" >
+                                <attribute name="ismember" value="1" id="4319" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getArtist" id="4320" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getArtist" id="4321" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="4322" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4323" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="4324" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="std::vector&lt;(std::string)>" id="4325" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fe710" id="4326" addr="0x7fdf084fe710" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4327" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4328" addr="0x7fdf08502310" >
+                            <attributelist id="4329" addr="0x7fdf08502310" >
+                                <attribute name="ismember" value="1" id="4330" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getAlbum" id="4331" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getAlbum" id="4332" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="4333" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4334" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="4335" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="4336" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fe710" id="4337" addr="0x7fdf084fe710" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4338" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4339" addr="0x7fdf085024f0" >
+                            <attributelist id="4340" addr="0x7fdf085024f0" >
+                                <attribute name="ismember" value="1" id="4341" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getTrack" id="4342" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getTrack" id="4343" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="4344" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4345" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="4346" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="int" id="4347" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fe710" id="4348" addr="0x7fdf084fe710" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4349" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4350" addr="0x7fdf085026f0" >
+                            <attributelist id="4351" addr="0x7fdf085026f0" >
+                                <attribute name="ismember" value="1" id="4352" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getDuration" id="4353" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getDuration" id="4354" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="4355" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4356" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="4357" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="unsigned int" id="4358" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf084fe710" id="4359" addr="0x7fdf084fe710" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4360" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </cdecl >
@@ -6117,637 +6117,637 @@
                 </namespace >
             </namespace >
         </include >
-        <include id="4361" addr="0x7ff9f1fab910" >
-            <attributelist id="4362" addr="0x7ff9f1fab910" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/Keyboard.h" id="4363" addr="0x7ff9f1fba9d0" />
+        <include id="4361" addr="0x7fdf08502910" >
+            <attributelist id="4362" addr="0x7fdf08502910" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/Keyboard.h" id="4363" addr="0x7fdf085119d0" />
             </attributelist >
 
-            <classforward id="4364" addr="0x7ff9f1fab9b0" >
-                <attributelist id="4365" addr="0x7ff9f1fab9b0" >
-                    <attribute name="sym_name" value="CGUIDialogKeyboardGeneric" id="4366" addr="0x7ff9f1fba9d0" />
-                    <attribute name="name" value="CGUIDialogKeyboardGeneric" id="4367" addr="0x7ff9f1fba9d0" />
-                    <attribute name="kind" value="class" id="4368" addr="0x7ff9f1fba9d0" />
-                    <attribute name="sym_weak" value="1" id="4369" addr="0x7ff9f1fba9d0" />
-                    <attribute name="sym_symtab" value="0x7ff9f1f72950" id="4370" addr="0x7ff9f1f72950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="4371" addr="0x7ff9f1fba9d0" />
+            <classforward id="4364" addr="0x7fdf085029b0" >
+                <attributelist id="4365" addr="0x7fdf085029b0" >
+                    <attribute name="sym_name" value="CGUIDialogKeyboardGeneric" id="4366" addr="0x7fdf085119d0" />
+                    <attribute name="name" value="CGUIDialogKeyboardGeneric" id="4367" addr="0x7fdf085119d0" />
+                    <attribute name="kind" value="class" id="4368" addr="0x7fdf085119d0" />
+                    <attribute name="sym_weak" value="1" id="4369" addr="0x7fdf085119d0" />
+                    <attribute name="sym_symtab" value="0x7fdf084c9950" id="4370" addr="0x7fdf084c9950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="4371" addr="0x7fdf085119d0" />
                 </attributelist >
              
             </classforward >
-            <namespace id="4372" addr="0x7ff9f1fabad0" >
-                <attributelist id="4373" addr="0x7ff9f1fabad0" >
-                    <attribute name="sym_name" value="XBMCAddon" id="4374" addr="0x7ff9f1fba9d0" />
-                    <attribute name="name" value="XBMCAddon" id="4375" addr="0x7ff9f1fba9d0" />
-                    <attribute name="sym_previousSibling" value="0x7ff9f1fa73d0" id="4376" addr="0x7ff9f1fa73d0" />
-                    <attribute name="csym_nextSibling" value="0x7ff9f1fae270" id="4377" addr="0x7ff9f1fae270" />
-                    <attribute name="sym_nextSibling" value="0x7ff9f1fae270" id="4378" addr="0x7ff9f1fae270" />
-                    <typescope id="4379" addr="0x7ff9f1fb4990" >
-                        <attributelist id="4380" addr="0x7ff9f1fb4990" >
-                            <attribute name="name" value="XBMCAddon" id="4381" addr="0x7ff9f1fba9d0" />
-                            <typetab id="4382" addr="0x7ff9f1fb49d0" >
-                                <attributelist id="4383" addr="0x7ff9f1fb49d0" >
-                                    <attribute name="String" value="std::string" id="4384" addr="0x7ff9f1fba9d0" />
+            <namespace id="4372" addr="0x7fdf08502ad0" >
+                <attributelist id="4373" addr="0x7fdf08502ad0" >
+                    <attribute name="sym_name" value="XBMCAddon" id="4374" addr="0x7fdf085119d0" />
+                    <attribute name="name" value="XBMCAddon" id="4375" addr="0x7fdf085119d0" />
+                    <attribute name="sym_previousSibling" value="0x7fdf084fe3d0" id="4376" addr="0x7fdf084fe3d0" />
+                    <attribute name="csym_nextSibling" value="0x7fdf08505270" id="4377" addr="0x7fdf08505270" />
+                    <attribute name="sym_nextSibling" value="0x7fdf08505270" id="4378" addr="0x7fdf08505270" />
+                    <typescope id="4379" addr="0x7fdf0850b990" >
+                        <attributelist id="4380" addr="0x7fdf0850b990" >
+                            <attribute name="name" value="XBMCAddon" id="4381" addr="0x7fdf085119d0" />
+                            <typetab id="4382" addr="0x7fdf0850b9d0" >
+                                <attributelist id="4383" addr="0x7fdf0850b9d0" >
+                                    <attribute name="String" value="std::string" id="4384" addr="0x7fdf085119d0" />
                                 </attributelist >
-                                <typetabsitem id="4385" addr="0x7ff9f1fb4bb0" >
-                                    <attributelist id="4386" addr="0x7ff9f1fb4bb0" >
+                                <typetabsitem id="4385" addr="0x7fdf0850bbb0" >
+                                    <attributelist id="4386" addr="0x7fdf0850bbb0" >
                                     </attributelist >
                                 </typetabsitem >
                             </typetab >
-                            <attribute name="parent" value="0x7ff9f1f72a30" id="4387" addr="0x7ff9f1f72a30" />
-                            <attribute name="qname" value="XBMCAddon" id="4388" addr="0x7ff9f1fba9d0" />
-                            <attribute name="symtab" value="0x7ff9f1f89bb0" id="4389" addr="0x7ff9f1f89bb0" />
+                            <attribute name="parent" value="0x7fdf084c9a30" id="4387" addr="0x7fdf084c9a30" />
+                            <attribute name="qname" value="XBMCAddon" id="4388" addr="0x7fdf085119d0" />
+                            <attribute name="symtab" value="0x7fdf084e0bb0" id="4389" addr="0x7fdf084e0bb0" />
                         </attributelist >
-                        <typescopesitem id="4390" addr="0x7ff9f1f89b70" >
-                            <attributelist id="4391" addr="0x7ff9f1f89b70" >
+                        <typescopesitem id="4390" addr="0x7fdf084e0b70" >
+                            <attributelist id="4391" addr="0x7fdf084e0b70" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="4392" addr="0x7ff9f1fb49d0" >
-                            <attributelist id="4393" addr="0x7ff9f1fb49d0" >
-                                <attribute name="String" value="std::string" id="4394" addr="0x7ff9f1fba9d0" />
+                        <typescopesitem id="4392" addr="0x7fdf0850b9d0" >
+                            <attributelist id="4393" addr="0x7fdf0850b9d0" >
+                                <attribute name="String" value="std::string" id="4394" addr="0x7fdf085119d0" />
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="4395" addr="0x7ff9f1f72a30" >
-                            <attributelist id="4396" addr="0x7ff9f1f72a30" >
-                                <attribute name="name" value="" id="4397" addr="0x7ff9f1fba9d0" />
-                                <typetab id="4398" addr="0x7ff9f1f72a90" >
-                                    <attributelist id="4399" addr="0x7ff9f1f72a90" >
-                                        <attribute name="CGUIDialogKeyboardGeneric" value="CGUIDialogKeyboardGeneric" id="4400" addr="0x7ff9f1fba9d0" />
+                        <typescopesitem id="4395" addr="0x7fdf084c9a30" >
+                            <attributelist id="4396" addr="0x7fdf084c9a30" >
+                                <attribute name="name" value="" id="4397" addr="0x7fdf085119d0" />
+                                <typetab id="4398" addr="0x7fdf084c9a90" >
+                                    <attributelist id="4399" addr="0x7fdf084c9a90" >
+                                        <attribute name="CGUIDialogKeyboardGeneric" value="CGUIDialogKeyboardGeneric" id="4400" addr="0x7fdf085119d0" />
                                     </attributelist >
-                                    <typetabsitem id="4401" addr="0x7ff9f1fb7950" >
-                                        <attributelist id="4402" addr="0x7ff9f1fb7950" >
+                                    <typetabsitem id="4401" addr="0x7fdf0850e950" >
+                                        <attributelist id="4402" addr="0x7fdf0850e950" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="4403" addr="0x7ff9f1fb4ad0" >
-                            <attributelist id="4404" addr="0x7ff9f1fb4ad0" >
+                        <typescopesitem id="4403" addr="0x7fdf0850bad0" >
+                            <attributelist id="4404" addr="0x7fdf0850bad0" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="4405" addr="0x7ff9f1f89bb0" >
-                            <attributelist id="4406" addr="0x7ff9f1f89bb0" >
-                                <attribute name="name" value="XBMCAddon" id="4407" addr="0x7ff9f1fba9d0" />
-                                <attribute name="csymtab" value="0x7ff9f1f89bf0" id="4408" addr="0x7ff9f1f89bf0" />
-                                <attribute name="symtab" value="0x7ff9f1f89b90" id="4409" addr="0x7ff9f1f89b90" />
+                        <typescopesitem id="4405" addr="0x7fdf084e0bb0" >
+                            <attributelist id="4406" addr="0x7fdf084e0bb0" >
+                                <attribute name="name" value="XBMCAddon" id="4407" addr="0x7fdf085119d0" />
+                                <attribute name="csymtab" value="0x7fdf084e0bf0" id="4408" addr="0x7fdf084e0bf0" />
+                                <attribute name="symtab" value="0x7fdf084e0b90" id="4409" addr="0x7fdf084e0b90" />
                             </attributelist >
                         </typescopesitem >
                     </typescope >
-                    <attribute name="symtab" value="0x7ff9f1f89bb0" id="4410" addr="0x7ff9f1f89bb0" />
-                    <attribute name="sym_symtab" value="0x7ff9f1f72950" id="4411" addr="0x7ff9f1f72950" />
+                    <attribute name="symtab" value="0x7fdf084e0bb0" id="4410" addr="0x7fdf084e0bb0" />
+                    <attribute name="sym_symtab" value="0x7fdf084c9950" id="4411" addr="0x7fdf084c9950" />
                 </attributelist >
 
-                <namespace id="4412" addr="0x7ff9f1fabb50" >
-                    <attributelist id="4413" addr="0x7ff9f1fabb50" >
-                        <attribute name="feature_knownbasetypes" value="AddonClass,IPlayerCallback,AddonCallback" id="4414" addr="0x7ff9f1fba9d0" />
-                        <attribute name="name" value="xbmc" id="4415" addr="0x7ff9f1fba9d0" />
-                        <attribute name="sym_symtab" value="0x7ff9f1f89bb0" id="4416" addr="0x7ff9f1f89bb0" />
-                        <attribute name="symtab" value="0x7ff9f1f8a2b0" id="4417" addr="0x7ff9f1f8a2b0" />
-                        <attribute name="sym_nextSibling" value="0x7ff9f1fae2f0" id="4418" addr="0x7ff9f1fae2f0" />
-                        <attribute name="csym_nextSibling" value="0x7ff9f1fae2f0" id="4419" addr="0x7ff9f1fae2f0" />
-                        <attribute name="sym_previousSibling" value="0x7ff9f1fa7450" id="4420" addr="0x7ff9f1fa7450" />
-                        <attribute name="feature_knownapitypes" value="XBMCAddon::xbmcgui::ListItem,XBMCAddon::xbmc::PlayListItem" id="4421" addr="0x7ff9f1fba9d0" />
-                        <attribute name="sym_name" value="xbmc" id="4422" addr="0x7ff9f1fba9d0" />
-                        <typescope id="4423" addr="0x7ff9f1fb4d70" >
-                            <attributelist id="4424" addr="0x7ff9f1fb4d70" >
-                                <attribute name="name" value="xbmc" id="4425" addr="0x7ff9f1fba9d0" />
-                                <typetab id="4426" addr="0x7ff9f1fb4d90" >
-                                    <attributelist id="4427" addr="0x7ff9f1fb4d90" >
-                                        <attribute name="Monitor" value="Monitor" id="4428" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="4429" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="Keyboard" value="Keyboard" id="4430" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="4431" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="InfoTagVideo" value="InfoTagVideo" id="4432" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="Player" value="Player" id="4433" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="InfoTagMusic" value="InfoTagMusic" id="4434" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="PlayList" value="PlayList" id="4435" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="RenderCapture" value="RenderCapture" id="4436" addr="0x7ff9f1fba9d0" />
+                <namespace id="4412" addr="0x7fdf08502b50" >
+                    <attributelist id="4413" addr="0x7fdf08502b50" >
+                        <attribute name="feature_knownbasetypes" value="AddonClass,IPlayerCallback,AddonCallback" id="4414" addr="0x7fdf085119d0" />
+                        <attribute name="name" value="xbmc" id="4415" addr="0x7fdf085119d0" />
+                        <attribute name="sym_symtab" value="0x7fdf084e0bb0" id="4416" addr="0x7fdf084e0bb0" />
+                        <attribute name="symtab" value="0x7fdf084e12b0" id="4417" addr="0x7fdf084e12b0" />
+                        <attribute name="sym_nextSibling" value="0x7fdf085052f0" id="4418" addr="0x7fdf085052f0" />
+                        <attribute name="csym_nextSibling" value="0x7fdf085052f0" id="4419" addr="0x7fdf085052f0" />
+                        <attribute name="sym_previousSibling" value="0x7fdf084fe450" id="4420" addr="0x7fdf084fe450" />
+                        <attribute name="feature_knownapitypes" value="XBMCAddon::xbmcgui::ListItem,XBMCAddon::xbmc::PlayListItem" id="4421" addr="0x7fdf085119d0" />
+                        <attribute name="sym_name" value="xbmc" id="4422" addr="0x7fdf085119d0" />
+                        <typescope id="4423" addr="0x7fdf0850bd70" >
+                            <attributelist id="4424" addr="0x7fdf0850bd70" >
+                                <attribute name="name" value="xbmc" id="4425" addr="0x7fdf085119d0" />
+                                <typetab id="4426" addr="0x7fdf0850bd90" >
+                                    <attributelist id="4427" addr="0x7fdf0850bd90" >
+                                        <attribute name="Monitor" value="Monitor" id="4428" addr="0x7fdf085119d0" />
+                                        <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="4429" addr="0x7fdf085119d0" />
+                                        <attribute name="Keyboard" value="Keyboard" id="4430" addr="0x7fdf085119d0" />
+                                        <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="4431" addr="0x7fdf085119d0" />
+                                        <attribute name="InfoTagVideo" value="InfoTagVideo" id="4432" addr="0x7fdf085119d0" />
+                                        <attribute name="Player" value="Player" id="4433" addr="0x7fdf085119d0" />
+                                        <attribute name="InfoTagMusic" value="InfoTagMusic" id="4434" addr="0x7fdf085119d0" />
+                                        <attribute name="PlayList" value="PlayList" id="4435" addr="0x7fdf085119d0" />
+                                        <attribute name="RenderCapture" value="RenderCapture" id="4436" addr="0x7fdf085119d0" />
                                     </attributelist >
-                                    <typetabsitem id="4437" addr="0x7ff9f1fb9b10" >
-                                        <attributelist id="4438" addr="0x7ff9f1fb9b10" >
+                                    <typetabsitem id="4437" addr="0x7fdf08510b10" >
+                                        <attributelist id="4438" addr="0x7fdf08510b10" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="4439" addr="0x7ff9f1fb7f30" >
-                                        <attributelist id="4440" addr="0x7ff9f1fb7f30" >
+                                    <typetabsitem id="4439" addr="0x7fdf0850ef30" >
+                                        <attributelist id="4440" addr="0x7fdf0850ef30" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="4441" addr="0x7ff9f1fb8990" >
-                                        <attributelist id="4442" addr="0x7ff9f1fb8990" >
+                                    <typetabsitem id="4441" addr="0x7fdf0850f990" >
+                                        <attributelist id="4442" addr="0x7fdf0850f990" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="4443" addr="0x7ff9f1fb5e90" >
-                                        <attributelist id="4444" addr="0x7ff9f1fb5e90" >
+                                    <typetabsitem id="4443" addr="0x7fdf0850ce90" >
+                                        <attributelist id="4444" addr="0x7fdf0850ce90" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="4445" addr="0x7ff9f1fb8310" >
-                                        <attributelist id="4446" addr="0x7ff9f1fb8310" >
+                                    <typetabsitem id="4445" addr="0x7fdf0850f310" >
+                                        <attributelist id="4446" addr="0x7fdf0850f310" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="4447" addr="0x7ff9f1fb6050" >
-                                        <attributelist id="4448" addr="0x7ff9f1fb6050" >
+                                    <typetabsitem id="4447" addr="0x7fdf0850d050" >
+                                        <attributelist id="4448" addr="0x7fdf0850d050" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="4449" addr="0x7ff9f1fb7b50" >
-                                        <attributelist id="4450" addr="0x7ff9f1fb7b50" >
+                                    <typetabsitem id="4449" addr="0x7fdf0850eb50" >
+                                        <attributelist id="4450" addr="0x7fdf0850eb50" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="4451" addr="0x7ff9f1fb91b0" >
-                                        <attributelist id="4452" addr="0x7ff9f1fb91b0" >
+                                    <typetabsitem id="4451" addr="0x7fdf085101b0" >
+                                        <attributelist id="4452" addr="0x7fdf085101b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="4453" addr="0x7ff9f1fb7490" >
-                                        <attributelist id="4454" addr="0x7ff9f1fb7490" >
+                                    <typetabsitem id="4453" addr="0x7fdf0850e490" >
+                                        <attributelist id="4454" addr="0x7fdf0850e490" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
-                                <attribute name="parent" value="0x7ff9f1fb4990" id="4455" addr="0x7ff9f1fb4990" />
-                                <attribute name="qname" value="XBMCAddon::xbmc" id="4456" addr="0x7ff9f1fba9d0" />
-                                <attribute name="symtab" value="0x7ff9f1f8a2b0" id="4457" addr="0x7ff9f1f8a2b0" />
+                                <attribute name="parent" value="0x7fdf0850b990" id="4455" addr="0x7fdf0850b990" />
+                                <attribute name="qname" value="XBMCAddon::xbmc" id="4456" addr="0x7fdf085119d0" />
+                                <attribute name="symtab" value="0x7fdf084e12b0" id="4457" addr="0x7fdf084e12b0" />
                             </attributelist >
-                            <typescopesitem id="4458" addr="0x7ff9f1f8a270" >
-                                <attributelist id="4459" addr="0x7ff9f1f8a270" >
+                            <typescopesitem id="4458" addr="0x7fdf084e1270" >
+                                <attributelist id="4459" addr="0x7fdf084e1270" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="4460" addr="0x7ff9f1fb4d90" >
-                                <attributelist id="4461" addr="0x7ff9f1fb4d90" >
-                                    <attribute name="Monitor" value="Monitor" id="4462" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="4463" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="Keyboard" value="Keyboard" id="4464" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="4465" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="InfoTagVideo" value="InfoTagVideo" id="4466" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="Player" value="Player" id="4467" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="InfoTagMusic" value="InfoTagMusic" id="4468" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="PlayList" value="PlayList" id="4469" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="RenderCapture" value="RenderCapture" id="4470" addr="0x7ff9f1fba9d0" />
+                            <typescopesitem id="4460" addr="0x7fdf0850bd90" >
+                                <attributelist id="4461" addr="0x7fdf0850bd90" >
+                                    <attribute name="Monitor" value="Monitor" id="4462" addr="0x7fdf085119d0" />
+                                    <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="4463" addr="0x7fdf085119d0" />
+                                    <attribute name="Keyboard" value="Keyboard" id="4464" addr="0x7fdf085119d0" />
+                                    <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="4465" addr="0x7fdf085119d0" />
+                                    <attribute name="InfoTagVideo" value="InfoTagVideo" id="4466" addr="0x7fdf085119d0" />
+                                    <attribute name="Player" value="Player" id="4467" addr="0x7fdf085119d0" />
+                                    <attribute name="InfoTagMusic" value="InfoTagMusic" id="4468" addr="0x7fdf085119d0" />
+                                    <attribute name="PlayList" value="PlayList" id="4469" addr="0x7fdf085119d0" />
+                                    <attribute name="RenderCapture" value="RenderCapture" id="4470" addr="0x7fdf085119d0" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="4471" addr="0x7ff9f1fb4990" >
-                                <attributelist id="4472" addr="0x7ff9f1fb4990" >
-                                    <attribute name="name" value="XBMCAddon" id="4473" addr="0x7ff9f1fba9d0" />
-                                    <typetab id="4474" addr="0x7ff9f1fb49d0" >
-                                        <attributelist id="4475" addr="0x7ff9f1fb49d0" >
-                                            <attribute name="String" value="std::string" id="4476" addr="0x7ff9f1fba9d0" />
-                                        </attributelist >
-                                        <typetabsitem id="4477" addr="0x7ff9f1fb4bb0" >
-                                            <attributelist id="4478" addr="0x7ff9f1fb4bb0" >
+                            <typescopesitem id="4471" addr="0x7fdf0850b990" >
+                                <attributelist id="4472" addr="0x7fdf0850b990" >
+                                    <attribute name="name" value="XBMCAddon" id="4473" addr="0x7fdf085119d0" />
+                                    <typetab id="4474" addr="0x7fdf0850b9d0" >
+                                        <attributelist id="4475" addr="0x7fdf0850b9d0" >
+                                            <attribute name="String" value="std::string" id="4476" addr="0x7fdf085119d0" />
+                                        </attributelist >
+                                        <typetabsitem id="4477" addr="0x7fdf0850bbb0" >
+                                            <attributelist id="4478" addr="0x7fdf0850bbb0" >
                                             </attributelist >
                                         </typetabsitem >
                                     </typetab >
-                                    <attribute name="parent" value="0x7ff9f1f72a30" id="4479" addr="0x7ff9f1f72a30" />
-                                    <attribute name="qname" value="XBMCAddon" id="4480" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="symtab" value="0x7ff9f1f89bb0" id="4481" addr="0x7ff9f1f89bb0" />
+                                    <attribute name="parent" value="0x7fdf084c9a30" id="4479" addr="0x7fdf084c9a30" />
+                                    <attribute name="qname" value="XBMCAddon" id="4480" addr="0x7fdf085119d0" />
+                                    <attribute name="symtab" value="0x7fdf084e0bb0" id="4481" addr="0x7fdf084e0bb0" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="4482" addr="0x7ff9f1fb4db0" >
-                                <attributelist id="4483" addr="0x7ff9f1fb4db0" >
+                            <typescopesitem id="4482" addr="0x7fdf0850bdb0" >
+                                <attributelist id="4483" addr="0x7fdf0850bdb0" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="4484" addr="0x7ff9f1f8a2b0" >
-                                <attributelist id="4485" addr="0x7ff9f1f8a2b0" >
-                                    <attribute name="name" value="xbmc" id="4486" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="csymtab" value="0x7ff9f1f8a2f0" id="4487" addr="0x7ff9f1f8a2f0" />
-                                    <attribute name="symtab" value="0x7ff9f1f8a290" id="4488" addr="0x7ff9f1f8a290" />
+                            <typescopesitem id="4484" addr="0x7fdf084e12b0" >
+                                <attributelist id="4485" addr="0x7fdf084e12b0" >
+                                    <attribute name="name" value="xbmc" id="4486" addr="0x7fdf085119d0" />
+                                    <attribute name="csymtab" value="0x7fdf084e12f0" id="4487" addr="0x7fdf084e12f0" />
+                                    <attribute name="symtab" value="0x7fdf084e1290" id="4488" addr="0x7fdf084e1290" />
                                 </attributelist >
                             </typescopesitem >
                         </typescope >
                     </attributelist >
 
-                    <cdecl id="4489" addr="0x7ff9f1fabcb0" >
-                        <attributelist id="4490" addr="0x7ff9f1fabcb0" >
-                            <attribute name="sym_name" value="KeyboardException" id="4491" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="XBMCAddon::xbmc::KeyboardException" id="4492" addr="0x7ff9f1fba9d0" />
-                            <attribute name="kind" value="variable" id="4493" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="XBMCCOMMONS_STANDARD_EXCEPTION" id="4494" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="4495" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="4496" addr="0x7ff9f1fba9d0" />
+                    <cdecl id="4489" addr="0x7fdf08502cb0" >
+                        <attributelist id="4490" addr="0x7fdf08502cb0" >
+                            <attribute name="sym_name" value="KeyboardException" id="4491" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="XBMCAddon::xbmc::KeyboardException" id="4492" addr="0x7fdf085119d0" />
+                            <attribute name="kind" value="variable" id="4493" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="XBMCCOMMONS_STANDARD_EXCEPTION" id="4494" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="4495" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="4496" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <class id="4497" addr="0x7ff9f1fabe90" >
-                        <attributelist id="4498" addr="0x7ff9f1fabe90" >
-                            <attribute name="name" value="XBMCAddon::xbmc::Keyboard" id="4499" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="4500" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="symtab" value="0x7ff9f1fabfd0" id="4501" addr="0x7ff9f1fabfd0" />
-                            <attribute name="allows_typedef" value="1" id="4502" addr="0x7ff9f1fba9d0" />
-                            <attribute name="typepass_visit" value="1" id="4503" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_visit" value="1" id="4504" addr="0x7ff9f1fba9d0" />
-                            <attribute name="kind" value="class" id="4505" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_name" value="Keyboard" id="4506" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_default_constructor" value="1" id="4507" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_has_constructor" value="1" id="4508" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_public_constructor" value="1" id="4509" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_has_destructor" value="1" id="4510" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_default_destructor" value="1" id="4511" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_copy_constructor" value="1" id="4512" addr="0x7ff9f1fba9d0" />
-                            <attribute name="privatebaselist" value="0x7ff9f1fabe70" id="4513" addr="0x7ff9f1fabe70" />
-                            <attribute name="protectedbaselist" value="0x7ff9f1fabe50" id="4514" addr="0x7ff9f1fabe50" />
-                            <baselist id="4515" addr="0x7ff9f1fabe30" >
-                                <base name="AddonClass" id="4516" addr="0x7ff9f1fabdb0" />
+                    <class id="4497" addr="0x7fdf08502e90" >
+                        <attributelist id="4498" addr="0x7fdf08502e90" >
+                            <attribute name="name" value="XBMCAddon::xbmc::Keyboard" id="4499" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="4500" addr="0x7fdf084e12b0" />
+                            <attribute name="symtab" value="0x7fdf08502fd0" id="4501" addr="0x7fdf08502fd0" />
+                            <attribute name="allows_typedef" value="1" id="4502" addr="0x7fdf085119d0" />
+                            <attribute name="typepass_visit" value="1" id="4503" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_visit" value="1" id="4504" addr="0x7fdf085119d0" />
+                            <attribute name="kind" value="class" id="4505" addr="0x7fdf085119d0" />
+                            <attribute name="sym_name" value="Keyboard" id="4506" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_default_constructor" value="1" id="4507" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_has_constructor" value="1" id="4508" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_public_constructor" value="1" id="4509" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_has_destructor" value="1" id="4510" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_default_destructor" value="1" id="4511" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_copy_constructor" value="1" id="4512" addr="0x7fdf085119d0" />
+                            <attribute name="privatebaselist" value="0x7fdf08502e70" id="4513" addr="0x7fdf08502e70" />
+                            <attribute name="protectedbaselist" value="0x7fdf08502e50" id="4514" addr="0x7fdf08502e50" />
+                            <baselist id="4515" addr="0x7fdf08502e30" >
+                                <base name="AddonClass" id="4516" addr="0x7fdf08502db0" />
                             </baselist >
-                            <attribute name="module" value="xbmc" id="4517" addr="0x7ff9f1f89430" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="4518" addr="0x7ff9f1fba9d0" />
-                            <typescope id="4519" addr="0x7ff9f1fb8a50" >
-                                <attributelist id="4520" addr="0x7ff9f1fb8a50" >
-                                    <attribute name="name" value="Keyboard" id="4521" addr="0x7ff9f1fba9d0" />
-                                    <typetab id="4522" addr="0x7ff9f1fb8a70" >
-                                        <attributelist id="4523" addr="0x7ff9f1fb8a70" >
+                            <attribute name="module" value="xbmc" id="4517" addr="0x7fdf084e0430" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="4518" addr="0x7fdf085119d0" />
+                            <typescope id="4519" addr="0x7fdf0850fa50" >
+                                <attributelist id="4520" addr="0x7fdf0850fa50" >
+                                    <attribute name="name" value="Keyboard" id="4521" addr="0x7fdf085119d0" />
+                                    <typetab id="4522" addr="0x7fdf0850fa70" >
+                                        <attributelist id="4523" addr="0x7fdf0850fa70" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7ff9f1fb4d70" id="4524" addr="0x7ff9f1fb4d70" />
-                                    <attribute name="qname" value="XBMCAddon::xbmc::Keyboard" id="4525" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="symtab" value="0x7ff9f1fabfd0" id="4526" addr="0x7ff9f1fabfd0" />
+                                    <attribute name="parent" value="0x7fdf0850bd70" id="4524" addr="0x7fdf0850bd70" />
+                                    <attribute name="qname" value="XBMCAddon::xbmc::Keyboard" id="4525" addr="0x7fdf085119d0" />
+                                    <attribute name="symtab" value="0x7fdf08502fd0" id="4526" addr="0x7fdf08502fd0" />
                                 </attributelist >
-                                <typescopesitem id="4527" addr="0x7ff9f1fb89f0" >
-                                    <attributelist id="4528" addr="0x7ff9f1fb89f0" >
+                                <typescopesitem id="4527" addr="0x7fdf0850f9f0" >
+                                    <attributelist id="4528" addr="0x7fdf0850f9f0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="4529" addr="0x7ff9f1fb8a70" >
-                                    <attributelist id="4530" addr="0x7ff9f1fb8a70" >
+                                <typescopesitem id="4529" addr="0x7fdf0850fa70" >
+                                    <attributelist id="4530" addr="0x7fdf0850fa70" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="4531" addr="0x7ff9f1fb4d70" >
-                                    <attributelist id="4532" addr="0x7ff9f1fb4d70" >
-                                        <attribute name="name" value="xbmc" id="4533" addr="0x7ff9f1fba9d0" />
-                                        <typetab id="4534" addr="0x7ff9f1fb4d90" >
-                                            <attributelist id="4535" addr="0x7ff9f1fb4d90" >
-                                                <attribute name="Monitor" value="Monitor" id="4536" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="4537" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="Keyboard" value="Keyboard" id="4538" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="4539" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="InfoTagVideo" value="InfoTagVideo" id="4540" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="Player" value="Player" id="4541" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="InfoTagMusic" value="InfoTagMusic" id="4542" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="PlayList" value="PlayList" id="4543" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="RenderCapture" value="RenderCapture" id="4544" addr="0x7ff9f1fba9d0" />
+                                <typescopesitem id="4531" addr="0x7fdf0850bd70" >
+                                    <attributelist id="4532" addr="0x7fdf0850bd70" >
+                                        <attribute name="name" value="xbmc" id="4533" addr="0x7fdf085119d0" />
+                                        <typetab id="4534" addr="0x7fdf0850bd90" >
+                                            <attributelist id="4535" addr="0x7fdf0850bd90" >
+                                                <attribute name="Monitor" value="Monitor" id="4536" addr="0x7fdf085119d0" />
+                                                <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="4537" addr="0x7fdf085119d0" />
+                                                <attribute name="Keyboard" value="Keyboard" id="4538" addr="0x7fdf085119d0" />
+                                                <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="4539" addr="0x7fdf085119d0" />
+                                                <attribute name="InfoTagVideo" value="InfoTagVideo" id="4540" addr="0x7fdf085119d0" />
+                                                <attribute name="Player" value="Player" id="4541" addr="0x7fdf085119d0" />
+                                                <attribute name="InfoTagMusic" value="InfoTagMusic" id="4542" addr="0x7fdf085119d0" />
+                                                <attribute name="PlayList" value="PlayList" id="4543" addr="0x7fdf085119d0" />
+                                                <attribute name="RenderCapture" value="RenderCapture" id="4544" addr="0x7fdf085119d0" />
                                             </attributelist >
-                                            <typetabsitem id="4545" addr="0x7ff9f1fb9b10" >
-                                                <attributelist id="4546" addr="0x7ff9f1fb9b10" >
+                                            <typetabsitem id="4545" addr="0x7fdf08510b10" >
+                                                <attributelist id="4546" addr="0x7fdf08510b10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4547" addr="0x7ff9f1fb7f30" >
-                                                <attributelist id="4548" addr="0x7ff9f1fb7f30" >
+                                            <typetabsitem id="4547" addr="0x7fdf0850ef30" >
+                                                <attributelist id="4548" addr="0x7fdf0850ef30" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4549" addr="0x7ff9f1fb8990" >
-                                                <attributelist id="4550" addr="0x7ff9f1fb8990" >
+                                            <typetabsitem id="4549" addr="0x7fdf0850f990" >
+                                                <attributelist id="4550" addr="0x7fdf0850f990" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4551" addr="0x7ff9f1fb5e90" >
-                                                <attributelist id="4552" addr="0x7ff9f1fb5e90" >
+                                            <typetabsitem id="4551" addr="0x7fdf0850ce90" >
+                                                <attributelist id="4552" addr="0x7fdf0850ce90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4553" addr="0x7ff9f1fb8310" >
-                                                <attributelist id="4554" addr="0x7ff9f1fb8310" >
+                                            <typetabsitem id="4553" addr="0x7fdf0850f310" >
+                                                <attributelist id="4554" addr="0x7fdf0850f310" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4555" addr="0x7ff9f1fb6050" >
-                                                <attributelist id="4556" addr="0x7ff9f1fb6050" >
+                                            <typetabsitem id="4555" addr="0x7fdf0850d050" >
+                                                <attributelist id="4556" addr="0x7fdf0850d050" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4557" addr="0x7ff9f1fb7b50" >
-                                                <attributelist id="4558" addr="0x7ff9f1fb7b50" >
+                                            <typetabsitem id="4557" addr="0x7fdf0850eb50" >
+                                                <attributelist id="4558" addr="0x7fdf0850eb50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4559" addr="0x7ff9f1fb91b0" >
-                                                <attributelist id="4560" addr="0x7ff9f1fb91b0" >
+                                            <typetabsitem id="4559" addr="0x7fdf085101b0" >
+                                                <attributelist id="4560" addr="0x7fdf085101b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4561" addr="0x7ff9f1fb7490" >
-                                                <attributelist id="4562" addr="0x7ff9f1fb7490" >
+                                            <typetabsitem id="4561" addr="0x7fdf0850e490" >
+                                                <attributelist id="4562" addr="0x7fdf0850e490" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7ff9f1fb4990" id="4563" addr="0x7ff9f1fb4990" />
-                                        <attribute name="qname" value="XBMCAddon::xbmc" id="4564" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="symtab" value="0x7ff9f1f8a2b0" id="4565" addr="0x7ff9f1f8a2b0" />
+                                        <attribute name="parent" value="0x7fdf0850b990" id="4563" addr="0x7fdf0850b990" />
+                                        <attribute name="qname" value="XBMCAddon::xbmc" id="4564" addr="0x7fdf085119d0" />
+                                        <attribute name="symtab" value="0x7fdf084e12b0" id="4565" addr="0x7fdf084e12b0" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="4566" addr="0x7ff9f1fb8a90" >
-                                    <attributelist id="4567" addr="0x7ff9f1fb8a90" >
+                                <typescopesitem id="4566" addr="0x7fdf0850fa90" >
+                                    <attributelist id="4567" addr="0x7fdf0850fa90" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="4568" addr="0x7ff9f1fabfd0" >
-                                    <attributelist id="4569" addr="0x7ff9f1fabfd0" >
-                                        <attribute name="name" value="Keyboard" id="4570" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="csymtab" value="0x7ff9f1fabff0" id="4571" addr="0x7ff9f1fabff0" />
-                                        <attribute name="symtab" value="0x7ff9f1fabf90" id="4572" addr="0x7ff9f1fabf90" />
+                                <typescopesitem id="4568" addr="0x7fdf08502fd0" >
+                                    <attributelist id="4569" addr="0x7fdf08502fd0" >
+                                        <attribute name="name" value="Keyboard" id="4570" addr="0x7fdf085119d0" />
+                                        <attribute name="csymtab" value="0x7fdf08502ff0" id="4571" addr="0x7fdf08502ff0" />
+                                        <attribute name="symtab" value="0x7fdf08502f90" id="4572" addr="0x7fdf08502f90" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <access id="4573" addr="0x7ff9f1fabf50" >
-                            <attributelist id="4574" addr="0x7ff9f1fabf50" >
-                                <attribute name="kind" value="public" id="4575" addr="0x7ff9f1fba9d0" />
+                        <access id="4573" addr="0x7fdf08502f50" >
+                            <attributelist id="4574" addr="0x7fdf08502f50" >
+                                <attribute name="kind" value="public" id="4575" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="4576" addr="0x7ff9f1fac590" >
-                            <attributelist id="4577" addr="0x7ff9f1fac590" >
-                                <attribute name="name" value="Keyboard" id="4578" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="4579" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fabfd0" id="4580" addr="0x7ff9f1fabfd0" />
-                                <attribute name="sym_nextSibling" value="0x7ff9f1fac7f0" id="4581" addr="0x7ff9f1fac7f0" />
-                                <attribute name="csym_nextSibling" value="0x7ff9f1fac7f0" id="4582" addr="0x7ff9f1fac7f0" />
-                                <attribute name="sym_name" value="Keyboard" id="4583" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(r.q(const).String,r.q(const).String,bool)." id="4584" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4585" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overloaded" value="0x7ff9f1fac590" id="4586" addr="0x7ff9f1fac590" />
-                                <attribute name="feature_python_nokwds" value="true" id="4587" addr="0x7ff9f1fba9d0" />
-                                <parmlist id="4588" addr="0x7ff9f1fac1f0" >
+                        <constructor id="4576" addr="0x7fdf08503590" >
+                            <attributelist id="4577" addr="0x7fdf08503590" >
+                                <attribute name="name" value="Keyboard" id="4578" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="4579" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf08502fd0" id="4580" addr="0x7fdf08502fd0" />
+                                <attribute name="sym_nextSibling" value="0x7fdf085037f0" id="4581" addr="0x7fdf085037f0" />
+                                <attribute name="csym_nextSibling" value="0x7fdf085037f0" id="4582" addr="0x7fdf085037f0" />
+                                <attribute name="sym_name" value="Keyboard" id="4583" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(r.q(const).String,r.q(const).String,bool)." id="4584" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4585" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overloaded" value="0x7fdf08503590" id="4586" addr="0x7fdf08503590" />
+                                <attribute name="feature_python_nokwds" value="true" id="4587" addr="0x7fdf085119d0" />
+                                <parmlist id="4588" addr="0x7fdf085031f0" >
                                     <parm id="4589">
-                                        <attributelist id="4590" addr="0x7ff9f1fac1f0" >
-                                            <attribute name="name" value="line" id="4591" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="4592" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4593" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="4590" addr="0x7fdf085031f0" >
+                                            <attribute name="name" value="line" id="4591" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="4592" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4593" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4594">
-                                        <attributelist id="4595" addr="0x7ff9f1fac390" >
-                                            <attribute name="name" value="heading" id="4596" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="4597" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4598" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="4595" addr="0x7fdf08503390" >
+                                            <attribute name="name" value="heading" id="4596" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="4597" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4598" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4599">
-                                        <attributelist id="4600" addr="0x7ff9f1fac4d0" >
-                                            <attribute name="name" value="hidden" id="4601" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="false" id="4602" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="bool" id="4603" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="4600" addr="0x7fdf085034d0" >
+                                            <attribute name="name" value="hidden" id="4601" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="false" id="4602" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="bool" id="4603" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_0" id="4604" addr="0x7ff9f1fba9d0" />
-                                <attribute name="feature_new" value="1" id="4605" addr="0x7ff9f1fba9d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4604" addr="0x7fdf085119d0" />
+                                <attribute name="feature_new" value="1" id="4605" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="4606" addr="0x7ff9f1fac7f0" >
-                            <attributelist id="4607" addr="0x7ff9f1fac7f0" >
-                                <attribute name="name" value="Keyboard" id="4608" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="4609" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fabfd0" id="4610" addr="0x7ff9f1fabfd0" />
-                                <attribute name="sym_previousSibling" value="0x7ff9f1fac590" id="4611" addr="0x7ff9f1fac590" />
-                                <attribute name="sym_name" value="Keyboard" id="4612" addr="0x7ff9f1fba9d0" />
-                                <attribute name="csym_nextSibling" value="0x7ff9f1fac9b0" id="4613" addr="0x7ff9f1fac9b0" />
-                                <attribute name="sym_nextSibling" value="0x7ff9f1fac9b0" id="4614" addr="0x7ff9f1fac9b0" />
-                                <attribute name="defaultargs" value="0x7ff9f1fac590" id="4615" addr="0x7ff9f1fac590" />
-                                <attribute name="decl" value="f(r.q(const).String,r.q(const).String)." id="4616" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4617" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overloaded" value="0x7ff9f1fac590" id="4618" addr="0x7ff9f1fac590" />
-                                <attribute name="feature_python_nokwds" value="true" id="4619" addr="0x7ff9f1fba9d0" />
-                                <parmlist id="4620" addr="0x7ff9f1fac630" >
+                        <constructor id="4606" addr="0x7fdf085037f0" >
+                            <attributelist id="4607" addr="0x7fdf085037f0" >
+                                <attribute name="name" value="Keyboard" id="4608" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="4609" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf08502fd0" id="4610" addr="0x7fdf08502fd0" />
+                                <attribute name="sym_previousSibling" value="0x7fdf08503590" id="4611" addr="0x7fdf08503590" />
+                                <attribute name="sym_name" value="Keyboard" id="4612" addr="0x7fdf085119d0" />
+                                <attribute name="csym_nextSibling" value="0x7fdf085039b0" id="4613" addr="0x7fdf085039b0" />
+                                <attribute name="sym_nextSibling" value="0x7fdf085039b0" id="4614" addr="0x7fdf085039b0" />
+                                <attribute name="defaultargs" value="0x7fdf08503590" id="4615" addr="0x7fdf08503590" />
+                                <attribute name="decl" value="f(r.q(const).String,r.q(const).String)." id="4616" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4617" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overloaded" value="0x7fdf08503590" id="4618" addr="0x7fdf08503590" />
+                                <attribute name="feature_python_nokwds" value="true" id="4619" addr="0x7fdf085119d0" />
+                                <parmlist id="4620" addr="0x7fdf08503630" >
                                     <parm id="4621">
-                                        <attributelist id="4622" addr="0x7ff9f1fac630" >
-                                            <attribute name="name" value="line" id="4623" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="4624" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4625" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="4622" addr="0x7fdf08503630" >
+                                            <attribute name="name" value="line" id="4623" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="4624" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4625" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4626">
-                                        <attributelist id="4627" addr="0x7ff9f1fac730" >
-                                            <attribute name="name" value="heading" id="4628" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="4629" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4630" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="4627" addr="0x7fdf08503730" >
+                                            <attribute name="name" value="heading" id="4628" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="4629" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4630" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_1" id="4631" addr="0x7ff9f1fba9d0" />
-                                <attribute name="feature_new" value="1" id="4632" addr="0x7ff9f1fba9d0" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="4631" addr="0x7fdf085119d0" />
+                                <attribute name="feature_new" value="1" id="4632" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="4633" addr="0x7ff9f1fac9b0" >
-                            <attributelist id="4634" addr="0x7ff9f1fac9b0" >
-                                <attribute name="name" value="Keyboard" id="4635" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="4636" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fabfd0" id="4637" addr="0x7ff9f1fabfd0" />
-                                <attribute name="sym_previousSibling" value="0x7ff9f1fac7f0" id="4638" addr="0x7ff9f1fac7f0" />
-                                <attribute name="sym_name" value="Keyboard" id="4639" addr="0x7ff9f1fba9d0" />
-                                <attribute name="csym_nextSibling" value="0x7ff9f1faca90" id="4640" addr="0x7ff9f1faca90" />
-                                <attribute name="sym_nextSibling" value="0x7ff9f1faca90" id="4641" addr="0x7ff9f1faca90" />
-                                <attribute name="defaultargs" value="0x7ff9f1fac590" id="4642" addr="0x7ff9f1fac590" />
-                                <attribute name="decl" value="f(r.q(const).String)." id="4643" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4644" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overloaded" value="0x7ff9f1fac590" id="4645" addr="0x7ff9f1fac590" />
-                                <attribute name="feature_python_nokwds" value="true" id="4646" addr="0x7ff9f1fba9d0" />
-                                <parmlist id="4647" addr="0x7ff9f1fac890" >
+                        <constructor id="4633" addr="0x7fdf085039b0" >
+                            <attributelist id="4634" addr="0x7fdf085039b0" >
+                                <attribute name="name" value="Keyboard" id="4635" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="4636" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf08502fd0" id="4637" addr="0x7fdf08502fd0" />
+                                <attribute name="sym_previousSibling" value="0x7fdf085037f0" id="4638" addr="0x7fdf085037f0" />
+                                <attribute name="sym_name" value="Keyboard" id="4639" addr="0x7fdf085119d0" />
+                                <attribute name="csym_nextSibling" value="0x7fdf08503a90" id="4640" addr="0x7fdf08503a90" />
+                                <attribute name="sym_nextSibling" value="0x7fdf08503a90" id="4641" addr="0x7fdf08503a90" />
+                                <attribute name="defaultargs" value="0x7fdf08503590" id="4642" addr="0x7fdf08503590" />
+                                <attribute name="decl" value="f(r.q(const).String)." id="4643" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4644" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overloaded" value="0x7fdf08503590" id="4645" addr="0x7fdf08503590" />
+                                <attribute name="feature_python_nokwds" value="true" id="4646" addr="0x7fdf085119d0" />
+                                <parmlist id="4647" addr="0x7fdf08503890" >
                                     <parm id="4648">
-                                        <attributelist id="4649" addr="0x7ff9f1fac890" >
-                                            <attribute name="name" value="line" id="4650" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="4651" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4652" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="4649" addr="0x7fdf08503890" >
+                                            <attribute name="name" value="line" id="4650" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="4651" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4652" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_2" id="4653" addr="0x7ff9f1fba9d0" />
-                                <attribute name="feature_new" value="1" id="4654" addr="0x7ff9f1fba9d0" />
+                                <attribute name="sym_overname" value="__SWIG_2" id="4653" addr="0x7fdf085119d0" />
+                                <attribute name="feature_new" value="1" id="4654" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="4655" addr="0x7ff9f1faca90" >
-                            <attributelist id="4656" addr="0x7ff9f1faca90" >
-                                <attribute name="name" value="Keyboard" id="4657" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="4658" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fabfd0" id="4659" addr="0x7ff9f1fabfd0" />
-                                <attribute name="sym_previousSibling" value="0x7ff9f1fac9b0" id="4660" addr="0x7ff9f1fac9b0" />
-                                <attribute name="sym_name" value="Keyboard" id="4661" addr="0x7ff9f1fba9d0" />
-                                <attribute name="defaultargs" value="0x7ff9f1fac590" id="4662" addr="0x7ff9f1fac590" />
-                                <attribute name="decl" value="f()." id="4663" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4664" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overloaded" value="0x7ff9f1fac590" id="4665" addr="0x7ff9f1fac590" />
-                                <attribute name="feature_python_nokwds" value="true" id="4666" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_3" id="4667" addr="0x7ff9f1fba9d0" />
-                                <attribute name="feature_new" value="1" id="4668" addr="0x7ff9f1fba9d0" />
+                        <constructor id="4655" addr="0x7fdf08503a90" >
+                            <attributelist id="4656" addr="0x7fdf08503a90" >
+                                <attribute name="name" value="Keyboard" id="4657" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="4658" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf08502fd0" id="4659" addr="0x7fdf08502fd0" />
+                                <attribute name="sym_previousSibling" value="0x7fdf085039b0" id="4660" addr="0x7fdf085039b0" />
+                                <attribute name="sym_name" value="Keyboard" id="4661" addr="0x7fdf085119d0" />
+                                <attribute name="defaultargs" value="0x7fdf08503590" id="4662" addr="0x7fdf08503590" />
+                                <attribute name="decl" value="f()." id="4663" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4664" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overloaded" value="0x7fdf08503590" id="4665" addr="0x7fdf08503590" />
+                                <attribute name="feature_python_nokwds" value="true" id="4666" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_3" id="4667" addr="0x7fdf085119d0" />
+                                <attribute name="feature_new" value="1" id="4668" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </constructor >
-                        <destructor id="4669" addr="0x7ff9f1facc50" >
-                            <attributelist id="4670" addr="0x7ff9f1facc50" >
-                                <attribute name="ismember" value="1" id="4671" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="~Keyboard" id="4672" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="~Keyboard" id="4673" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="4674" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4675" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fabfd0" id="4676" addr="0x7ff9f1fabfd0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4677" addr="0x7ff9f1fba9d0" />
+                        <destructor id="4669" addr="0x7fdf08503c50" >
+                            <attributelist id="4670" addr="0x7fdf08503c50" >
+                                <attribute name="ismember" value="1" id="4671" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="~Keyboard" id="4672" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="~Keyboard" id="4673" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="4674" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4675" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf08502fd0" id="4676" addr="0x7fdf08502fd0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4677" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </destructor >
-                        <cdecl id="4678" addr="0x7ff9f1facf50" >
-                            <attributelist id="4679" addr="0x7ff9f1facf50" >
-                                <attribute name="name" value="doModal" id="4680" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="4681" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fabfd0" id="4682" addr="0x7ff9f1fabfd0" />
-                                <attribute name="sym_nextSibling" value="0x7ff9f1fad050" id="4683" addr="0x7ff9f1fad050" />
-                                <attribute name="csym_nextSibling" value="0x7ff9f1fad050" id="4684" addr="0x7ff9f1fad050" />
-                                <attribute name="kind" value="function" id="4685" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="doModal" id="4686" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(int)." id="4687" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4688" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overloaded" value="0x7ff9f1facf50" id="4689" addr="0x7ff9f1facf50" />
-                                <parmlist id="4690" addr="0x7ff9f1face90" >
+                        <cdecl id="4678" addr="0x7fdf08503f50" >
+                            <attributelist id="4679" addr="0x7fdf08503f50" >
+                                <attribute name="name" value="doModal" id="4680" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="4681" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf08502fd0" id="4682" addr="0x7fdf08502fd0" />
+                                <attribute name="sym_nextSibling" value="0x7fdf08504050" id="4683" addr="0x7fdf08504050" />
+                                <attribute name="csym_nextSibling" value="0x7fdf08504050" id="4684" addr="0x7fdf08504050" />
+                                <attribute name="kind" value="function" id="4685" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="doModal" id="4686" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(int)." id="4687" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4688" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overloaded" value="0x7fdf08503f50" id="4689" addr="0x7fdf08503f50" />
+                                <parmlist id="4690" addr="0x7fdf08503e90" >
                                     <parm id="4691">
-                                        <attributelist id="4692" addr="0x7ff9f1face90" >
-                                            <attribute name="name" value="autoclose" id="4693" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="0" id="4694" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="int" id="4695" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="4692" addr="0x7fdf08503e90" >
+                                            <attribute name="name" value="autoclose" id="4693" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="0" id="4694" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="int" id="4695" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="4696" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4697" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4698" addr="0x7ff9f1fad050" >
-                            <attributelist id="4699" addr="0x7ff9f1fad050" >
-                                <attribute name="name" value="doModal" id="4700" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="4701" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fabfd0" id="4702" addr="0x7ff9f1fabfd0" />
-                                <attribute name="sym_previousSibling" value="0x7ff9f1facf50" id="4703" addr="0x7ff9f1facf50" />
-                                <attribute name="kind" value="function" id="4704" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="doModal" id="4705" addr="0x7ff9f1fba9d0" />
-                                <attribute name="defaultargs" value="0x7ff9f1facf50" id="4706" addr="0x7ff9f1facf50" />
-                                <attribute name="decl" value="f()." id="4707" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4708" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overloaded" value="0x7ff9f1facf50" id="4709" addr="0x7ff9f1facf50" />
-                                <attribute name="type" value="void" id="4710" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="4711" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4712" addr="0x7ff9f1fad3d0" >
-                            <attributelist id="4713" addr="0x7ff9f1fad3d0" >
-                                <attribute name="name" value="setDefault" id="4714" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="4715" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fabfd0" id="4716" addr="0x7ff9f1fabfd0" />
-                                <attribute name="sym_nextSibling" value="0x7ff9f1fad4d0" id="4717" addr="0x7ff9f1fad4d0" />
-                                <attribute name="csym_nextSibling" value="0x7ff9f1fad4d0" id="4718" addr="0x7ff9f1fad4d0" />
-                                <attribute name="kind" value="function" id="4719" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="setDefault" id="4720" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="4721" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4722" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overloaded" value="0x7ff9f1fad3d0" id="4723" addr="0x7ff9f1fad3d0" />
-                                <parmlist id="4724" addr="0x7ff9f1fad310" >
+                                <attribute name="type" value="void" id="4696" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4697" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4698" addr="0x7fdf08504050" >
+                            <attributelist id="4699" addr="0x7fdf08504050" >
+                                <attribute name="name" value="doModal" id="4700" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="4701" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf08502fd0" id="4702" addr="0x7fdf08502fd0" />
+                                <attribute name="sym_previousSibling" value="0x7fdf08503f50" id="4703" addr="0x7fdf08503f50" />
+                                <attribute name="kind" value="function" id="4704" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="doModal" id="4705" addr="0x7fdf085119d0" />
+                                <attribute name="defaultargs" value="0x7fdf08503f50" id="4706" addr="0x7fdf08503f50" />
+                                <attribute name="decl" value="f()." id="4707" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4708" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overloaded" value="0x7fdf08503f50" id="4709" addr="0x7fdf08503f50" />
+                                <attribute name="type" value="void" id="4710" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="4711" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4712" addr="0x7fdf085043d0" >
+                            <attributelist id="4713" addr="0x7fdf085043d0" >
+                                <attribute name="name" value="setDefault" id="4714" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="4715" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf08502fd0" id="4716" addr="0x7fdf08502fd0" />
+                                <attribute name="sym_nextSibling" value="0x7fdf085044d0" id="4717" addr="0x7fdf085044d0" />
+                                <attribute name="csym_nextSibling" value="0x7fdf085044d0" id="4718" addr="0x7fdf085044d0" />
+                                <attribute name="kind" value="function" id="4719" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="setDefault" id="4720" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="4721" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4722" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overloaded" value="0x7fdf085043d0" id="4723" addr="0x7fdf085043d0" />
+                                <parmlist id="4724" addr="0x7fdf08504310" >
                                     <parm id="4725">
-                                        <attributelist id="4726" addr="0x7ff9f1fad310" >
-                                            <attribute name="name" value="line" id="4727" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="4728" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4729" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="4726" addr="0x7fdf08504310" >
+                                            <attribute name="name" value="line" id="4727" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="4728" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4729" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="4730" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4731" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4732" addr="0x7ff9f1fad4d0" >
-                            <attributelist id="4733" addr="0x7ff9f1fad4d0" >
-                                <attribute name="name" value="setDefault" id="4734" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="4735" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fabfd0" id="4736" addr="0x7ff9f1fabfd0" />
-                                <attribute name="sym_previousSibling" value="0x7ff9f1fad3d0" id="4737" addr="0x7ff9f1fad3d0" />
-                                <attribute name="kind" value="function" id="4738" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="setDefault" id="4739" addr="0x7ff9f1fba9d0" />
-                                <attribute name="defaultargs" value="0x7ff9f1fad3d0" id="4740" addr="0x7ff9f1fad3d0" />
-                                <attribute name="decl" value="f()." id="4741" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4742" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overloaded" value="0x7ff9f1fad3d0" id="4743" addr="0x7ff9f1fad3d0" />
-                                <attribute name="type" value="void" id="4744" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="4745" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4746" addr="0x7ff9f1fad7f0" >
-                            <attributelist id="4747" addr="0x7ff9f1fad7f0" >
-                                <attribute name="name" value="setHiddenInput" id="4748" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="4749" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fabfd0" id="4750" addr="0x7ff9f1fabfd0" />
-                                <attribute name="sym_nextSibling" value="0x7ff9f1fad8f0" id="4751" addr="0x7ff9f1fad8f0" />
-                                <attribute name="csym_nextSibling" value="0x7ff9f1fad8f0" id="4752" addr="0x7ff9f1fad8f0" />
-                                <attribute name="kind" value="function" id="4753" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="setHiddenInput" id="4754" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(bool)." id="4755" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4756" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overloaded" value="0x7ff9f1fad7f0" id="4757" addr="0x7ff9f1fad7f0" />
-                                <parmlist id="4758" addr="0x7ff9f1fad730" >
+                                <attribute name="type" value="void" id="4730" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4731" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4732" addr="0x7fdf085044d0" >
+                            <attributelist id="4733" addr="0x7fdf085044d0" >
+                                <attribute name="name" value="setDefault" id="4734" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="4735" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf08502fd0" id="4736" addr="0x7fdf08502fd0" />
+                                <attribute name="sym_previousSibling" value="0x7fdf085043d0" id="4737" addr="0x7fdf085043d0" />
+                                <attribute name="kind" value="function" id="4738" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="setDefault" id="4739" addr="0x7fdf085119d0" />
+                                <attribute name="defaultargs" value="0x7fdf085043d0" id="4740" addr="0x7fdf085043d0" />
+                                <attribute name="decl" value="f()." id="4741" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4742" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overloaded" value="0x7fdf085043d0" id="4743" addr="0x7fdf085043d0" />
+                                <attribute name="type" value="void" id="4744" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="4745" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4746" addr="0x7fdf085047f0" >
+                            <attributelist id="4747" addr="0x7fdf085047f0" >
+                                <attribute name="name" value="setHiddenInput" id="4748" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="4749" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf08502fd0" id="4750" addr="0x7fdf08502fd0" />
+                                <attribute name="sym_nextSibling" value="0x7fdf085048f0" id="4751" addr="0x7fdf085048f0" />
+                                <attribute name="csym_nextSibling" value="0x7fdf085048f0" id="4752" addr="0x7fdf085048f0" />
+                                <attribute name="kind" value="function" id="4753" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="setHiddenInput" id="4754" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(bool)." id="4755" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4756" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overloaded" value="0x7fdf085047f0" id="4757" addr="0x7fdf085047f0" />
+                                <parmlist id="4758" addr="0x7fdf08504730" >
                                     <parm id="4759">
-                                        <attributelist id="4760" addr="0x7ff9f1fad730" >
-                                            <attribute name="name" value="hidden" id="4761" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="false" id="4762" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="bool" id="4763" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="4760" addr="0x7fdf08504730" >
+                                            <attribute name="name" value="hidden" id="4761" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="false" id="4762" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="bool" id="4763" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="4764" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4765" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4766" addr="0x7ff9f1fad8f0" >
-                            <attributelist id="4767" addr="0x7ff9f1fad8f0" >
-                                <attribute name="name" value="setHiddenInput" id="4768" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="4769" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fabfd0" id="4770" addr="0x7ff9f1fabfd0" />
-                                <attribute name="sym_previousSibling" value="0x7ff9f1fad7f0" id="4771" addr="0x7ff9f1fad7f0" />
-                                <attribute name="kind" value="function" id="4772" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="setHiddenInput" id="4773" addr="0x7ff9f1fba9d0" />
-                                <attribute name="defaultargs" value="0x7ff9f1fad7f0" id="4774" addr="0x7ff9f1fad7f0" />
-                                <attribute name="decl" value="f()." id="4775" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4776" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overloaded" value="0x7ff9f1fad7f0" id="4777" addr="0x7ff9f1fad7f0" />
-                                <attribute name="type" value="void" id="4778" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="4779" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4780" addr="0x7ff9f1fadc10" >
-                            <attributelist id="4781" addr="0x7ff9f1fadc10" >
-                                <attribute name="name" value="setHeading" id="4782" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="4783" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fabfd0" id="4784" addr="0x7ff9f1fabfd0" />
-                                <attribute name="kind" value="function" id="4785" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="setHeading" id="4786" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="4787" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4788" addr="0x7ff9f1fba9d0" />
-                                <parmlist id="4789" addr="0x7ff9f1fadb50" >
+                                <attribute name="type" value="void" id="4764" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4765" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4766" addr="0x7fdf085048f0" >
+                            <attributelist id="4767" addr="0x7fdf085048f0" >
+                                <attribute name="name" value="setHiddenInput" id="4768" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="4769" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf08502fd0" id="4770" addr="0x7fdf08502fd0" />
+                                <attribute name="sym_previousSibling" value="0x7fdf085047f0" id="4771" addr="0x7fdf085047f0" />
+                                <attribute name="kind" value="function" id="4772" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="setHiddenInput" id="4773" addr="0x7fdf085119d0" />
+                                <attribute name="defaultargs" value="0x7fdf085047f0" id="4774" addr="0x7fdf085047f0" />
+                                <attribute name="decl" value="f()." id="4775" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4776" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overloaded" value="0x7fdf085047f0" id="4777" addr="0x7fdf085047f0" />
+                                <attribute name="type" value="void" id="4778" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="4779" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4780" addr="0x7fdf08504c10" >
+                            <attributelist id="4781" addr="0x7fdf08504c10" >
+                                <attribute name="name" value="setHeading" id="4782" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="4783" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf08502fd0" id="4784" addr="0x7fdf08502fd0" />
+                                <attribute name="kind" value="function" id="4785" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="setHeading" id="4786" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="4787" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4788" addr="0x7fdf085119d0" />
+                                <parmlist id="4789" addr="0x7fdf08504b50" >
                                     <parm id="4790">
-                                        <attributelist id="4791" addr="0x7ff9f1fadb50" >
-                                            <attribute name="name" value="heading" id="4792" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4793" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="4791" addr="0x7fdf08504b50" >
+                                            <attribute name="name" value="heading" id="4792" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4793" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="4794" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4795" addr="0x7ff9f1fba9d0" />
+                                <attribute name="type" value="void" id="4794" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4795" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="4796" addr="0x7ff9f1faddf0" >
-                            <attributelist id="4797" addr="0x7ff9f1faddf0" >
-                                <attribute name="ismember" value="1" id="4798" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getText" id="4799" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getText" id="4800" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="4801" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4802" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="4803" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="4804" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fabfd0" id="4805" addr="0x7ff9f1fabfd0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4806" addr="0x7ff9f1fba9d0" />
+                        <cdecl id="4796" addr="0x7fdf08504df0" >
+                            <attributelist id="4797" addr="0x7fdf08504df0" >
+                                <attribute name="ismember" value="1" id="4798" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getText" id="4799" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getText" id="4800" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="4801" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4802" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="4803" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="4804" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf08502fd0" id="4805" addr="0x7fdf08502fd0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4806" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="4807" addr="0x7ff9f1fadfb0" >
-                            <attributelist id="4808" addr="0x7ff9f1fadfb0" >
-                                <attribute name="ismember" value="1" id="4809" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="isConfirmed" id="4810" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="isConfirmed" id="4811" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="4812" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="4813" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="4814" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="bool" id="4815" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fabfd0" id="4816" addr="0x7ff9f1fabfd0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4817" addr="0x7ff9f1fba9d0" />
+                        <cdecl id="4807" addr="0x7fdf08504fb0" >
+                            <attributelist id="4808" addr="0x7fdf08504fb0" >
+                                <attribute name="ismember" value="1" id="4809" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="isConfirmed" id="4810" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="isConfirmed" id="4811" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="4812" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="4813" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="4814" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="bool" id="4815" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf08502fd0" id="4816" addr="0x7fdf08502fd0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4817" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </cdecl >
@@ -6755,622 +6755,622 @@
                 </namespace >
             </namespace >
         </include >
-        <include id="4818" addr="0x7ff9f1fae1d0" >
-            <attributelist id="4819" addr="0x7ff9f1fae1d0" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/PlayList.h" id="4820" addr="0x7ff9f1fba9d0" />
+        <include id="4818" addr="0x7fdf085051d0" >
+            <attributelist id="4819" addr="0x7fdf085051d0" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/PlayList.h" id="4820" addr="0x7fdf085119d0" />
             </attributelist >
 
-            <namespace id="4821" addr="0x7ff9f1fae270" >
-                <attributelist id="4822" addr="0x7ff9f1fae270" >
-                    <attribute name="sym_name" value="XBMCAddon" id="4823" addr="0x7ff9f1fba9d0" />
-                    <attribute name="name" value="XBMCAddon" id="4824" addr="0x7ff9f1fba9d0" />
-                    <attribute name="sym_previousSibling" value="0x7ff9f1fabad0" id="4825" addr="0x7ff9f1fabad0" />
-                    <attribute name="csym_nextSibling" value="0x7ff9f1fb1150" id="4826" addr="0x7ff9f1fb1150" />
-                    <attribute name="sym_nextSibling" value="0x7ff9f1fb1150" id="4827" addr="0x7ff9f1fb1150" />
-                    <typescope id="4828" addr="0x7ff9f1fb4990" >
-                        <attributelist id="4829" addr="0x7ff9f1fb4990" >
-                            <attribute name="name" value="XBMCAddon" id="4830" addr="0x7ff9f1fba9d0" />
-                            <typetab id="4831" addr="0x7ff9f1fb49d0" >
-                                <attributelist id="4832" addr="0x7ff9f1fb49d0" >
-                                    <attribute name="String" value="std::string" id="4833" addr="0x7ff9f1fba9d0" />
+            <namespace id="4821" addr="0x7fdf08505270" >
+                <attributelist id="4822" addr="0x7fdf08505270" >
+                    <attribute name="sym_name" value="XBMCAddon" id="4823" addr="0x7fdf085119d0" />
+                    <attribute name="name" value="XBMCAddon" id="4824" addr="0x7fdf085119d0" />
+                    <attribute name="sym_previousSibling" value="0x7fdf08502ad0" id="4825" addr="0x7fdf08502ad0" />
+                    <attribute name="csym_nextSibling" value="0x7fdf08508150" id="4826" addr="0x7fdf08508150" />
+                    <attribute name="sym_nextSibling" value="0x7fdf08508150" id="4827" addr="0x7fdf08508150" />
+                    <typescope id="4828" addr="0x7fdf0850b990" >
+                        <attributelist id="4829" addr="0x7fdf0850b990" >
+                            <attribute name="name" value="XBMCAddon" id="4830" addr="0x7fdf085119d0" />
+                            <typetab id="4831" addr="0x7fdf0850b9d0" >
+                                <attributelist id="4832" addr="0x7fdf0850b9d0" >
+                                    <attribute name="String" value="std::string" id="4833" addr="0x7fdf085119d0" />
                                 </attributelist >
-                                <typetabsitem id="4834" addr="0x7ff9f1fb4bb0" >
-                                    <attributelist id="4835" addr="0x7ff9f1fb4bb0" >
+                                <typetabsitem id="4834" addr="0x7fdf0850bbb0" >
+                                    <attributelist id="4835" addr="0x7fdf0850bbb0" >
                                     </attributelist >
                                 </typetabsitem >
                             </typetab >
-                            <attribute name="parent" value="0x7ff9f1f72a30" id="4836" addr="0x7ff9f1f72a30" />
-                            <attribute name="qname" value="XBMCAddon" id="4837" addr="0x7ff9f1fba9d0" />
-                            <attribute name="symtab" value="0x7ff9f1f89bb0" id="4838" addr="0x7ff9f1f89bb0" />
+                            <attribute name="parent" value="0x7fdf084c9a30" id="4836" addr="0x7fdf084c9a30" />
+                            <attribute name="qname" value="XBMCAddon" id="4837" addr="0x7fdf085119d0" />
+                            <attribute name="symtab" value="0x7fdf084e0bb0" id="4838" addr="0x7fdf084e0bb0" />
                         </attributelist >
-                        <typescopesitem id="4839" addr="0x7ff9f1f89b70" >
-                            <attributelist id="4840" addr="0x7ff9f1f89b70" >
+                        <typescopesitem id="4839" addr="0x7fdf084e0b70" >
+                            <attributelist id="4840" addr="0x7fdf084e0b70" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="4841" addr="0x7ff9f1fb49d0" >
-                            <attributelist id="4842" addr="0x7ff9f1fb49d0" >
-                                <attribute name="String" value="std::string" id="4843" addr="0x7ff9f1fba9d0" />
+                        <typescopesitem id="4841" addr="0x7fdf0850b9d0" >
+                            <attributelist id="4842" addr="0x7fdf0850b9d0" >
+                                <attribute name="String" value="std::string" id="4843" addr="0x7fdf085119d0" />
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="4844" addr="0x7ff9f1f72a30" >
-                            <attributelist id="4845" addr="0x7ff9f1f72a30" >
-                                <attribute name="name" value="" id="4846" addr="0x7ff9f1fba9d0" />
-                                <typetab id="4847" addr="0x7ff9f1f72a90" >
-                                    <attributelist id="4848" addr="0x7ff9f1f72a90" >
-                                        <attribute name="CGUIDialogKeyboardGeneric" value="CGUIDialogKeyboardGeneric" id="4849" addr="0x7ff9f1fba9d0" />
+                        <typescopesitem id="4844" addr="0x7fdf084c9a30" >
+                            <attributelist id="4845" addr="0x7fdf084c9a30" >
+                                <attribute name="name" value="" id="4846" addr="0x7fdf085119d0" />
+                                <typetab id="4847" addr="0x7fdf084c9a90" >
+                                    <attributelist id="4848" addr="0x7fdf084c9a90" >
+                                        <attribute name="CGUIDialogKeyboardGeneric" value="CGUIDialogKeyboardGeneric" id="4849" addr="0x7fdf085119d0" />
                                     </attributelist >
-                                    <typetabsitem id="4850" addr="0x7ff9f1fb7950" >
-                                        <attributelist id="4851" addr="0x7ff9f1fb7950" >
+                                    <typetabsitem id="4850" addr="0x7fdf0850e950" >
+                                        <attributelist id="4851" addr="0x7fdf0850e950" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="4852" addr="0x7ff9f1fb4ad0" >
-                            <attributelist id="4853" addr="0x7ff9f1fb4ad0" >
+                        <typescopesitem id="4852" addr="0x7fdf0850bad0" >
+                            <attributelist id="4853" addr="0x7fdf0850bad0" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="4854" addr="0x7ff9f1f89bb0" >
-                            <attributelist id="4855" addr="0x7ff9f1f89bb0" >
-                                <attribute name="name" value="XBMCAddon" id="4856" addr="0x7ff9f1fba9d0" />
-                                <attribute name="csymtab" value="0x7ff9f1f89bf0" id="4857" addr="0x7ff9f1f89bf0" />
-                                <attribute name="symtab" value="0x7ff9f1f89b90" id="4858" addr="0x7ff9f1f89b90" />
+                        <typescopesitem id="4854" addr="0x7fdf084e0bb0" >
+                            <attributelist id="4855" addr="0x7fdf084e0bb0" >
+                                <attribute name="name" value="XBMCAddon" id="4856" addr="0x7fdf085119d0" />
+                                <attribute name="csymtab" value="0x7fdf084e0bf0" id="4857" addr="0x7fdf084e0bf0" />
+                                <attribute name="symtab" value="0x7fdf084e0b90" id="4858" addr="0x7fdf084e0b90" />
                             </attributelist >
                         </typescopesitem >
                     </typescope >
-                    <attribute name="symtab" value="0x7ff9f1f89bb0" id="4859" addr="0x7ff9f1f89bb0" />
-                    <attribute name="sym_symtab" value="0x7ff9f1f72950" id="4860" addr="0x7ff9f1f72950" />
+                    <attribute name="symtab" value="0x7fdf084e0bb0" id="4859" addr="0x7fdf084e0bb0" />
+                    <attribute name="sym_symtab" value="0x7fdf084c9950" id="4860" addr="0x7fdf084c9950" />
                 </attributelist >
 
-                <namespace id="4861" addr="0x7ff9f1fae2f0" >
-                    <attributelist id="4862" addr="0x7ff9f1fae2f0" >
-                        <attribute name="feature_knownbasetypes" value="AddonClass,IPlayerCallback,AddonCallback" id="4863" addr="0x7ff9f1fba9d0" />
-                        <attribute name="name" value="xbmc" id="4864" addr="0x7ff9f1fba9d0" />
-                        <attribute name="sym_symtab" value="0x7ff9f1f89bb0" id="4865" addr="0x7ff9f1f89bb0" />
-                        <attribute name="symtab" value="0x7ff9f1f8a2b0" id="4866" addr="0x7ff9f1f8a2b0" />
-                        <attribute name="sym_nextSibling" value="0x7ff9f1fb11d0" id="4867" addr="0x7ff9f1fb11d0" />
-                        <attribute name="csym_nextSibling" value="0x7ff9f1fb11d0" id="4868" addr="0x7ff9f1fb11d0" />
-                        <attribute name="sym_previousSibling" value="0x7ff9f1fabb50" id="4869" addr="0x7ff9f1fabb50" />
-                        <attribute name="feature_knownapitypes" value="XBMCAddon::xbmcgui::ListItem,XBMCAddon::xbmc::PlayListItem" id="4870" addr="0x7ff9f1fba9d0" />
-                        <attribute name="sym_name" value="xbmc" id="4871" addr="0x7ff9f1fba9d0" />
-                        <typescope id="4872" addr="0x7ff9f1fb4d70" >
-                            <attributelist id="4873" addr="0x7ff9f1fb4d70" >
-                                <attribute name="name" value="xbmc" id="4874" addr="0x7ff9f1fba9d0" />
-                                <typetab id="4875" addr="0x7ff9f1fb4d90" >
-                                    <attributelist id="4876" addr="0x7ff9f1fb4d90" >
-                                        <attribute name="Monitor" value="Monitor" id="4877" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="4878" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="Keyboard" value="Keyboard" id="4879" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="4880" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="InfoTagVideo" value="InfoTagVideo" id="4881" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="Player" value="Player" id="4882" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="InfoTagMusic" value="InfoTagMusic" id="4883" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="PlayList" value="PlayList" id="4884" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="RenderCapture" value="RenderCapture" id="4885" addr="0x7ff9f1fba9d0" />
+                <namespace id="4861" addr="0x7fdf085052f0" >
+                    <attributelist id="4862" addr="0x7fdf085052f0" >
+                        <attribute name="feature_knownbasetypes" value="AddonClass,IPlayerCallback,AddonCallback" id="4863" addr="0x7fdf085119d0" />
+                        <attribute name="name" value="xbmc" id="4864" addr="0x7fdf085119d0" />
+                        <attribute name="sym_symtab" value="0x7fdf084e0bb0" id="4865" addr="0x7fdf084e0bb0" />
+                        <attribute name="symtab" value="0x7fdf084e12b0" id="4866" addr="0x7fdf084e12b0" />
+                        <attribute name="sym_nextSibling" value="0x7fdf085081d0" id="4867" addr="0x7fdf085081d0" />
+                        <attribute name="csym_nextSibling" value="0x7fdf085081d0" id="4868" addr="0x7fdf085081d0" />
+                        <attribute name="sym_previousSibling" value="0x7fdf08502b50" id="4869" addr="0x7fdf08502b50" />
+                        <attribute name="feature_knownapitypes" value="XBMCAddon::xbmcgui::ListItem,XBMCAddon::xbmc::PlayListItem" id="4870" addr="0x7fdf085119d0" />
+                        <attribute name="sym_name" value="xbmc" id="4871" addr="0x7fdf085119d0" />
+                        <typescope id="4872" addr="0x7fdf0850bd70" >
+                            <attributelist id="4873" addr="0x7fdf0850bd70" >
+                                <attribute name="name" value="xbmc" id="4874" addr="0x7fdf085119d0" />
+                                <typetab id="4875" addr="0x7fdf0850bd90" >
+                                    <attributelist id="4876" addr="0x7fdf0850bd90" >
+                                        <attribute name="Monitor" value="Monitor" id="4877" addr="0x7fdf085119d0" />
+                                        <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="4878" addr="0x7fdf085119d0" />
+                                        <attribute name="Keyboard" value="Keyboard" id="4879" addr="0x7fdf085119d0" />
+                                        <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="4880" addr="0x7fdf085119d0" />
+                                        <attribute name="InfoTagVideo" value="InfoTagVideo" id="4881" addr="0x7fdf085119d0" />
+                                        <attribute name="Player" value="Player" id="4882" addr="0x7fdf085119d0" />
+                                        <attribute name="InfoTagMusic" value="InfoTagMusic" id="4883" addr="0x7fdf085119d0" />
+                                        <attribute name="PlayList" value="PlayList" id="4884" addr="0x7fdf085119d0" />
+                                        <attribute name="RenderCapture" value="RenderCapture" id="4885" addr="0x7fdf085119d0" />
                                     </attributelist >
-                                    <typetabsitem id="4886" addr="0x7ff9f1fb9b10" >
-                                        <attributelist id="4887" addr="0x7ff9f1fb9b10" >
+                                    <typetabsitem id="4886" addr="0x7fdf08510b10" >
+                                        <attributelist id="4887" addr="0x7fdf08510b10" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="4888" addr="0x7ff9f1fb7f30" >
-                                        <attributelist id="4889" addr="0x7ff9f1fb7f30" >
+                                    <typetabsitem id="4888" addr="0x7fdf0850ef30" >
+                                        <attributelist id="4889" addr="0x7fdf0850ef30" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="4890" addr="0x7ff9f1fb8990" >
-                                        <attributelist id="4891" addr="0x7ff9f1fb8990" >
+                                    <typetabsitem id="4890" addr="0x7fdf0850f990" >
+                                        <attributelist id="4891" addr="0x7fdf0850f990" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="4892" addr="0x7ff9f1fb5e90" >
-                                        <attributelist id="4893" addr="0x7ff9f1fb5e90" >
+                                    <typetabsitem id="4892" addr="0x7fdf0850ce90" >
+                                        <attributelist id="4893" addr="0x7fdf0850ce90" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="4894" addr="0x7ff9f1fb8310" >
-                                        <attributelist id="4895" addr="0x7ff9f1fb8310" >
+                                    <typetabsitem id="4894" addr="0x7fdf0850f310" >
+                                        <attributelist id="4895" addr="0x7fdf0850f310" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="4896" addr="0x7ff9f1fb6050" >
-                                        <attributelist id="4897" addr="0x7ff9f1fb6050" >
+                                    <typetabsitem id="4896" addr="0x7fdf0850d050" >
+                                        <attributelist id="4897" addr="0x7fdf0850d050" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="4898" addr="0x7ff9f1fb7b50" >
-                                        <attributelist id="4899" addr="0x7ff9f1fb7b50" >
+                                    <typetabsitem id="4898" addr="0x7fdf0850eb50" >
+                                        <attributelist id="4899" addr="0x7fdf0850eb50" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="4900" addr="0x7ff9f1fb91b0" >
-                                        <attributelist id="4901" addr="0x7ff9f1fb91b0" >
+                                    <typetabsitem id="4900" addr="0x7fdf085101b0" >
+                                        <attributelist id="4901" addr="0x7fdf085101b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="4902" addr="0x7ff9f1fb7490" >
-                                        <attributelist id="4903" addr="0x7ff9f1fb7490" >
+                                    <typetabsitem id="4902" addr="0x7fdf0850e490" >
+                                        <attributelist id="4903" addr="0x7fdf0850e490" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
-                                <attribute name="parent" value="0x7ff9f1fb4990" id="4904" addr="0x7ff9f1fb4990" />
-                                <attribute name="qname" value="XBMCAddon::xbmc" id="4905" addr="0x7ff9f1fba9d0" />
-                                <attribute name="symtab" value="0x7ff9f1f8a2b0" id="4906" addr="0x7ff9f1f8a2b0" />
+                                <attribute name="parent" value="0x7fdf0850b990" id="4904" addr="0x7fdf0850b990" />
+                                <attribute name="qname" value="XBMCAddon::xbmc" id="4905" addr="0x7fdf085119d0" />
+                                <attribute name="symtab" value="0x7fdf084e12b0" id="4906" addr="0x7fdf084e12b0" />
                             </attributelist >
-                            <typescopesitem id="4907" addr="0x7ff9f1f8a270" >
-                                <attributelist id="4908" addr="0x7ff9f1f8a270" >
+                            <typescopesitem id="4907" addr="0x7fdf084e1270" >
+                                <attributelist id="4908" addr="0x7fdf084e1270" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="4909" addr="0x7ff9f1fb4d90" >
-                                <attributelist id="4910" addr="0x7ff9f1fb4d90" >
-                                    <attribute name="Monitor" value="Monitor" id="4911" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="4912" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="Keyboard" value="Keyboard" id="4913" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="4914" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="InfoTagVideo" value="InfoTagVideo" id="4915" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="Player" value="Player" id="4916" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="InfoTagMusic" value="InfoTagMusic" id="4917" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="PlayList" value="PlayList" id="4918" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="RenderCapture" value="RenderCapture" id="4919" addr="0x7ff9f1fba9d0" />
+                            <typescopesitem id="4909" addr="0x7fdf0850bd90" >
+                                <attributelist id="4910" addr="0x7fdf0850bd90" >
+                                    <attribute name="Monitor" value="Monitor" id="4911" addr="0x7fdf085119d0" />
+                                    <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="4912" addr="0x7fdf085119d0" />
+                                    <attribute name="Keyboard" value="Keyboard" id="4913" addr="0x7fdf085119d0" />
+                                    <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="4914" addr="0x7fdf085119d0" />
+                                    <attribute name="InfoTagVideo" value="InfoTagVideo" id="4915" addr="0x7fdf085119d0" />
+                                    <attribute name="Player" value="Player" id="4916" addr="0x7fdf085119d0" />
+                                    <attribute name="InfoTagMusic" value="InfoTagMusic" id="4917" addr="0x7fdf085119d0" />
+                                    <attribute name="PlayList" value="PlayList" id="4918" addr="0x7fdf085119d0" />
+                                    <attribute name="RenderCapture" value="RenderCapture" id="4919" addr="0x7fdf085119d0" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="4920" addr="0x7ff9f1fb4990" >
-                                <attributelist id="4921" addr="0x7ff9f1fb4990" >
-                                    <attribute name="name" value="XBMCAddon" id="4922" addr="0x7ff9f1fba9d0" />
-                                    <typetab id="4923" addr="0x7ff9f1fb49d0" >
-                                        <attributelist id="4924" addr="0x7ff9f1fb49d0" >
-                                            <attribute name="String" value="std::string" id="4925" addr="0x7ff9f1fba9d0" />
-                                        </attributelist >
-                                        <typetabsitem id="4926" addr="0x7ff9f1fb4bb0" >
-                                            <attributelist id="4927" addr="0x7ff9f1fb4bb0" >
+                            <typescopesitem id="4920" addr="0x7fdf0850b990" >
+                                <attributelist id="4921" addr="0x7fdf0850b990" >
+                                    <attribute name="name" value="XBMCAddon" id="4922" addr="0x7fdf085119d0" />
+                                    <typetab id="4923" addr="0x7fdf0850b9d0" >
+                                        <attributelist id="4924" addr="0x7fdf0850b9d0" >
+                                            <attribute name="String" value="std::string" id="4925" addr="0x7fdf085119d0" />
+                                        </attributelist >
+                                        <typetabsitem id="4926" addr="0x7fdf0850bbb0" >
+                                            <attributelist id="4927" addr="0x7fdf0850bbb0" >
                                             </attributelist >
                                         </typetabsitem >
                                     </typetab >
-                                    <attribute name="parent" value="0x7ff9f1f72a30" id="4928" addr="0x7ff9f1f72a30" />
-                                    <attribute name="qname" value="XBMCAddon" id="4929" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="symtab" value="0x7ff9f1f89bb0" id="4930" addr="0x7ff9f1f89bb0" />
+                                    <attribute name="parent" value="0x7fdf084c9a30" id="4928" addr="0x7fdf084c9a30" />
+                                    <attribute name="qname" value="XBMCAddon" id="4929" addr="0x7fdf085119d0" />
+                                    <attribute name="symtab" value="0x7fdf084e0bb0" id="4930" addr="0x7fdf084e0bb0" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="4931" addr="0x7ff9f1fb4db0" >
-                                <attributelist id="4932" addr="0x7ff9f1fb4db0" >
+                            <typescopesitem id="4931" addr="0x7fdf0850bdb0" >
+                                <attributelist id="4932" addr="0x7fdf0850bdb0" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="4933" addr="0x7ff9f1f8a2b0" >
-                                <attributelist id="4934" addr="0x7ff9f1f8a2b0" >
-                                    <attribute name="name" value="xbmc" id="4935" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="csymtab" value="0x7ff9f1f8a2f0" id="4936" addr="0x7ff9f1f8a2f0" />
-                                    <attribute name="symtab" value="0x7ff9f1f8a290" id="4937" addr="0x7ff9f1f8a290" />
+                            <typescopesitem id="4933" addr="0x7fdf084e12b0" >
+                                <attributelist id="4934" addr="0x7fdf084e12b0" >
+                                    <attribute name="name" value="xbmc" id="4935" addr="0x7fdf085119d0" />
+                                    <attribute name="csymtab" value="0x7fdf084e12f0" id="4936" addr="0x7fdf084e12f0" />
+                                    <attribute name="symtab" value="0x7fdf084e1290" id="4937" addr="0x7fdf084e1290" />
                                 </attributelist >
                             </typescopesitem >
                         </typescope >
                     </attributelist >
 
-                    <cdecl id="4938" addr="0x7ff9f1fae450" >
-                        <attributelist id="4939" addr="0x7ff9f1fae450" >
-                            <attribute name="sym_name" value="PlayListException" id="4940" addr="0x7ff9f1fba9d0" />
-                            <attribute name="name" value="XBMCAddon::xbmc::PlayListException" id="4941" addr="0x7ff9f1fba9d0" />
-                            <attribute name="kind" value="variable" id="4942" addr="0x7ff9f1fba9d0" />
-                            <attribute name="type" value="XBMCCOMMONS_STANDARD_EXCEPTION" id="4943" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="4944" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="4945" addr="0x7ff9f1fba9d0" />
+                    <cdecl id="4938" addr="0x7fdf08505450" >
+                        <attributelist id="4939" addr="0x7fdf08505450" >
+                            <attribute name="sym_name" value="PlayListException" id="4940" addr="0x7fdf085119d0" />
+                            <attribute name="name" value="XBMCAddon::xbmc::PlayListException" id="4941" addr="0x7fdf085119d0" />
+                            <attribute name="kind" value="variable" id="4942" addr="0x7fdf085119d0" />
+                            <attribute name="type" value="XBMCCOMMONS_STANDARD_EXCEPTION" id="4943" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="4944" addr="0x7fdf084e12b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="4945" addr="0x7fdf085119d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <class id="4946" addr="0x7ff9f1fae630" >
-                        <attributelist id="4947" addr="0x7ff9f1fae630" >
-                            <attribute name="name" value="XBMCAddon::xbmc::PlayList" id="4948" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="4949" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="symtab" value="0x7ff9f1fae770" id="4950" addr="0x7ff9f1fae770" />
-                            <attribute name="allows_typedef" value="1" id="4951" addr="0x7ff9f1fba9d0" />
-                            <attribute name="typepass_visit" value="1" id="4952" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_visit" value="1" id="4953" addr="0x7ff9f1fba9d0" />
-                            <attribute name="kind" value="class" id="4954" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_name" value="PlayList" id="4955" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_has_constructor" value="1" id="4956" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_public_constructor" value="1" id="4957" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_has_destructor" value="1" id="4958" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_default_destructor" value="1" id="4959" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_copy_constructor" value="1" id="4960" addr="0x7ff9f1fba9d0" />
-                            <attribute name="privatebaselist" value="0x7ff9f1fae610" id="4961" addr="0x7ff9f1fae610" />
-                            <attribute name="protectedbaselist" value="0x7ff9f1fae5f0" id="4962" addr="0x7ff9f1fae5f0" />
-                            <baselist id="4963" addr="0x7ff9f1fae5d0" >
-                                <base name="AddonClass" id="4964" addr="0x7ff9f1fae550" />
+                    <class id="4946" addr="0x7fdf08505630" >
+                        <attributelist id="4947" addr="0x7fdf08505630" >
+                            <attribute name="name" value="XBMCAddon::xbmc::PlayList" id="4948" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="4949" addr="0x7fdf084e12b0" />
+                            <attribute name="symtab" value="0x7fdf08505770" id="4950" addr="0x7fdf08505770" />
+                            <attribute name="allows_typedef" value="1" id="4951" addr="0x7fdf085119d0" />
+                            <attribute name="typepass_visit" value="1" id="4952" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_visit" value="1" id="4953" addr="0x7fdf085119d0" />
+                            <attribute name="kind" value="class" id="4954" addr="0x7fdf085119d0" />
+                            <attribute name="sym_name" value="PlayList" id="4955" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_has_constructor" value="1" id="4956" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_public_constructor" value="1" id="4957" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_has_destructor" value="1" id="4958" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_default_destructor" value="1" id="4959" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_copy_constructor" value="1" id="4960" addr="0x7fdf085119d0" />
+                            <attribute name="privatebaselist" value="0x7fdf08505610" id="4961" addr="0x7fdf08505610" />
+                            <attribute name="protectedbaselist" value="0x7fdf085055f0" id="4962" addr="0x7fdf085055f0" />
+                            <baselist id="4963" addr="0x7fdf085055d0" >
+                                <base name="AddonClass" id="4964" addr="0x7fdf08505550" />
                             </baselist >
-                            <attribute name="module" value="xbmc" id="4965" addr="0x7ff9f1f89430" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="4966" addr="0x7ff9f1fba9d0" />
-                            <typescope id="4967" addr="0x7ff9f1fb9270" >
-                                <attributelist id="4968" addr="0x7ff9f1fb9270" >
-                                    <attribute name="name" value="PlayList" id="4969" addr="0x7ff9f1fba9d0" />
-                                    <typetab id="4970" addr="0x7ff9f1fb9290" >
-                                        <attributelist id="4971" addr="0x7ff9f1fb9290" >
+                            <attribute name="module" value="xbmc" id="4965" addr="0x7fdf084e0430" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="4966" addr="0x7fdf085119d0" />
+                            <typescope id="4967" addr="0x7fdf08510270" >
+                                <attributelist id="4968" addr="0x7fdf08510270" >
+                                    <attribute name="name" value="PlayList" id="4969" addr="0x7fdf085119d0" />
+                                    <typetab id="4970" addr="0x7fdf08510290" >
+                                        <attributelist id="4971" addr="0x7fdf08510290" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7ff9f1fb4d70" id="4972" addr="0x7ff9f1fb4d70" />
-                                    <attribute name="qname" value="XBMCAddon::xbmc::PlayList" id="4973" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="symtab" value="0x7ff9f1fae770" id="4974" addr="0x7ff9f1fae770" />
+                                    <attribute name="parent" value="0x7fdf0850bd70" id="4972" addr="0x7fdf0850bd70" />
+                                    <attribute name="qname" value="XBMCAddon::xbmc::PlayList" id="4973" addr="0x7fdf085119d0" />
+                                    <attribute name="symtab" value="0x7fdf08505770" id="4974" addr="0x7fdf08505770" />
                                 </attributelist >
-                                <typescopesitem id="4975" addr="0x7ff9f1fb9210" >
-                                    <attributelist id="4976" addr="0x7ff9f1fb9210" >
+                                <typescopesitem id="4975" addr="0x7fdf08510210" >
+                                    <attributelist id="4976" addr="0x7fdf08510210" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="4977" addr="0x7ff9f1fb9290" >
-                                    <attributelist id="4978" addr="0x7ff9f1fb9290" >
+                                <typescopesitem id="4977" addr="0x7fdf08510290" >
+                                    <attributelist id="4978" addr="0x7fdf08510290" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="4979" addr="0x7ff9f1fb4d70" >
-                                    <attributelist id="4980" addr="0x7ff9f1fb4d70" >
-                                        <attribute name="name" value="xbmc" id="4981" addr="0x7ff9f1fba9d0" />
-                                        <typetab id="4982" addr="0x7ff9f1fb4d90" >
-                                            <attributelist id="4983" addr="0x7ff9f1fb4d90" >
-                                                <attribute name="Monitor" value="Monitor" id="4984" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="4985" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="Keyboard" value="Keyboard" id="4986" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="4987" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="InfoTagVideo" value="InfoTagVideo" id="4988" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="Player" value="Player" id="4989" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="InfoTagMusic" value="InfoTagMusic" id="4990" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="PlayList" value="PlayList" id="4991" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="RenderCapture" value="RenderCapture" id="4992" addr="0x7ff9f1fba9d0" />
+                                <typescopesitem id="4979" addr="0x7fdf0850bd70" >
+                                    <attributelist id="4980" addr="0x7fdf0850bd70" >
+                                        <attribute name="name" value="xbmc" id="4981" addr="0x7fdf085119d0" />
+                                        <typetab id="4982" addr="0x7fdf0850bd90" >
+                                            <attributelist id="4983" addr="0x7fdf0850bd90" >
+                                                <attribute name="Monitor" value="Monitor" id="4984" addr="0x7fdf085119d0" />
+                                                <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="4985" addr="0x7fdf085119d0" />
+                                                <attribute name="Keyboard" value="Keyboard" id="4986" addr="0x7fdf085119d0" />
+                                                <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="4987" addr="0x7fdf085119d0" />
+                                                <attribute name="InfoTagVideo" value="InfoTagVideo" id="4988" addr="0x7fdf085119d0" />
+                                                <attribute name="Player" value="Player" id="4989" addr="0x7fdf085119d0" />
+                                                <attribute name="InfoTagMusic" value="InfoTagMusic" id="4990" addr="0x7fdf085119d0" />
+                                                <attribute name="PlayList" value="PlayList" id="4991" addr="0x7fdf085119d0" />
+                                                <attribute name="RenderCapture" value="RenderCapture" id="4992" addr="0x7fdf085119d0" />
                                             </attributelist >
-                                            <typetabsitem id="4993" addr="0x7ff9f1fb9b10" >
-                                                <attributelist id="4994" addr="0x7ff9f1fb9b10" >
+                                            <typetabsitem id="4993" addr="0x7fdf08510b10" >
+                                                <attributelist id="4994" addr="0x7fdf08510b10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4995" addr="0x7ff9f1fb7f30" >
-                                                <attributelist id="4996" addr="0x7ff9f1fb7f30" >
+                                            <typetabsitem id="4995" addr="0x7fdf0850ef30" >
+                                                <attributelist id="4996" addr="0x7fdf0850ef30" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4997" addr="0x7ff9f1fb8990" >
-                                                <attributelist id="4998" addr="0x7ff9f1fb8990" >
+                                            <typetabsitem id="4997" addr="0x7fdf0850f990" >
+                                                <attributelist id="4998" addr="0x7fdf0850f990" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4999" addr="0x7ff9f1fb5e90" >
-                                                <attributelist id="5000" addr="0x7ff9f1fb5e90" >
+                                            <typetabsitem id="4999" addr="0x7fdf0850ce90" >
+                                                <attributelist id="5000" addr="0x7fdf0850ce90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5001" addr="0x7ff9f1fb8310" >
-                                                <attributelist id="5002" addr="0x7ff9f1fb8310" >
+                                            <typetabsitem id="5001" addr="0x7fdf0850f310" >
+                                                <attributelist id="5002" addr="0x7fdf0850f310" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5003" addr="0x7ff9f1fb6050" >
-                                                <attributelist id="5004" addr="0x7ff9f1fb6050" >
+                                            <typetabsitem id="5003" addr="0x7fdf0850d050" >
+                                                <attributelist id="5004" addr="0x7fdf0850d050" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5005" addr="0x7ff9f1fb7b50" >
-                                                <attributelist id="5006" addr="0x7ff9f1fb7b50" >
+                                            <typetabsitem id="5005" addr="0x7fdf0850eb50" >
+                                                <attributelist id="5006" addr="0x7fdf0850eb50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5007" addr="0x7ff9f1fb91b0" >
-                                                <attributelist id="5008" addr="0x7ff9f1fb91b0" >
+                                            <typetabsitem id="5007" addr="0x7fdf085101b0" >
+                                                <attributelist id="5008" addr="0x7fdf085101b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5009" addr="0x7ff9f1fb7490" >
-                                                <attributelist id="5010" addr="0x7ff9f1fb7490" >
+                                            <typetabsitem id="5009" addr="0x7fdf0850e490" >
+                                                <attributelist id="5010" addr="0x7fdf0850e490" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7ff9f1fb4990" id="5011" addr="0x7ff9f1fb4990" />
-                                        <attribute name="qname" value="XBMCAddon::xbmc" id="5012" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="symtab" value="0x7ff9f1f8a2b0" id="5013" addr="0x7ff9f1f8a2b0" />
+                                        <attribute name="parent" value="0x7fdf0850b990" id="5011" addr="0x7fdf0850b990" />
+                                        <attribute name="qname" value="XBMCAddon::xbmc" id="5012" addr="0x7fdf085119d0" />
+                                        <attribute name="symtab" value="0x7fdf084e12b0" id="5013" addr="0x7fdf084e12b0" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="5014" addr="0x7ff9f1fb92b0" >
-                                    <attributelist id="5015" addr="0x7ff9f1fb92b0" >
+                                <typescopesitem id="5014" addr="0x7fdf085102b0" >
+                                    <attributelist id="5015" addr="0x7fdf085102b0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="5016" addr="0x7ff9f1fae770" >
-                                    <attributelist id="5017" addr="0x7ff9f1fae770" >
-                                        <attribute name="name" value="PlayList" id="5018" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="csymtab" value="0x7ff9f1fae790" id="5019" addr="0x7ff9f1fae790" />
-                                        <attribute name="symtab" value="0x7ff9f1fae730" id="5020" addr="0x7ff9f1fae730" />
+                                <typescopesitem id="5016" addr="0x7fdf08505770" >
+                                    <attributelist id="5017" addr="0x7fdf08505770" >
+                                        <attribute name="name" value="PlayList" id="5018" addr="0x7fdf085119d0" />
+                                        <attribute name="csymtab" value="0x7fdf08505790" id="5019" addr="0x7fdf08505790" />
+                                        <attribute name="symtab" value="0x7fdf08505730" id="5020" addr="0x7fdf08505730" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <cdecl id="5021" addr="0x7ff9f1fae870" >
-                            <attributelist id="5022" addr="0x7ff9f1fae870" >
-                                <attribute name="ismember" value="1" id="5023" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="iPlayList" id="5024" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="" id="5025" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="private" id="5026" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="variable" id="5027" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="int" id="5028" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fae770" id="5029" addr="0x7ff9f1fae770" />
+                        <cdecl id="5021" addr="0x7fdf08505870" >
+                            <attributelist id="5022" addr="0x7fdf08505870" >
+                                <attribute name="ismember" value="1" id="5023" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="iPlayList" id="5024" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="" id="5025" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="private" id="5026" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="variable" id="5027" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="int" id="5028" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf08505770" id="5029" addr="0x7fdf08505770" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="5030" addr="0x7ff9f1faea10" >
-                            <attributelist id="5031" addr="0x7ff9f1faea10" >
-                                <attribute name="ismember" value="1" id="5032" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="pPlayList" id="5033" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="p." id="5034" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="private" id="5035" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="variable" id="5036" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="PLAYLIST::CPlayList" id="5037" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fae770" id="5038" addr="0x7ff9f1fae770" />
+                        <cdecl id="5030" addr="0x7fdf08505a10" >
+                            <attributelist id="5031" addr="0x7fdf08505a10" >
+                                <attribute name="ismember" value="1" id="5032" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="pPlayList" id="5033" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="p." id="5034" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="private" id="5035" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="variable" id="5036" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="PLAYLIST::CPlayList" id="5037" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf08505770" id="5038" addr="0x7fdf08505770" />
                             </attributelist >
                          
                         </cdecl >
-                        <access id="5039" addr="0x7ff9f1faeaf0" >
-                            <attributelist id="5040" addr="0x7ff9f1faeaf0" >
-                                <attribute name="kind" value="public" id="5041" addr="0x7ff9f1fba9d0" />
+                        <access id="5039" addr="0x7fdf08505af0" >
+                            <attributelist id="5040" addr="0x7fdf08505af0" >
+                                <attribute name="kind" value="public" id="5041" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="5042" addr="0x7ff9f1faed30" >
-                            <attributelist id="5043" addr="0x7ff9f1faed30" >
-                                <attribute name="name" value="PlayList" id="5044" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="5045" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fae770" id="5046" addr="0x7ff9f1fae770" />
-                                <attribute name="sym_name" value="PlayList" id="5047" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(int)." id="5048" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="5049" addr="0x7ff9f1fba9d0" />
-                                <attribute name="feature_python_nokwds" value="true" id="5050" addr="0x7ff9f1fba9d0" />
-                                <parmlist id="5051" addr="0x7ff9f1faec70" >
+                        <constructor id="5042" addr="0x7fdf08505d30" >
+                            <attributelist id="5043" addr="0x7fdf08505d30" >
+                                <attribute name="name" value="PlayList" id="5044" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="5045" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf08505770" id="5046" addr="0x7fdf08505770" />
+                                <attribute name="sym_name" value="PlayList" id="5047" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(int)." id="5048" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="5049" addr="0x7fdf085119d0" />
+                                <attribute name="feature_python_nokwds" value="true" id="5050" addr="0x7fdf085119d0" />
+                                <parmlist id="5051" addr="0x7fdf08505c70" >
                                     <parm id="5052">
-                                        <attributelist id="5053" addr="0x7ff9f1faec70" >
-                                            <attribute name="name" value="playList" id="5054" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="int" id="5055" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="5053" addr="0x7fdf08505c70" >
+                                            <attribute name="name" value="playList" id="5054" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="int" id="5055" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_0" id="5056" addr="0x7ff9f1fba9d0" />
-                                <attribute name="storage" value="explicit" id="5057" addr="0x7ff9f1fba9d0" />
-                                <attribute name="feature_new" value="1" id="5058" addr="0x7ff9f1fba9d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="5056" addr="0x7fdf085119d0" />
+                                <attribute name="storage" value="explicit" id="5057" addr="0x7fdf085119d0" />
+                                <attribute name="feature_new" value="1" id="5058" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </constructor >
-                        <destructor id="5059" addr="0x7ff9f1faeed0" >
-                            <attributelist id="5060" addr="0x7ff9f1faeed0" >
-                                <attribute name="ismember" value="1" id="5061" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="~PlayList" id="5062" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="~PlayList" id="5063" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="5064" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="5065" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fae770" id="5066" addr="0x7ff9f1fae770" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="5067" addr="0x7ff9f1fba9d0" />
+                        <destructor id="5059" addr="0x7fdf08505ed0" >
+                            <attributelist id="5060" addr="0x7fdf08505ed0" >
+                                <attribute name="ismember" value="1" id="5061" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="~PlayList" id="5062" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="~PlayList" id="5063" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="5064" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="5065" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf08505770" id="5066" addr="0x7fdf08505770" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="5067" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </destructor >
-                        <cdecl id="5068" addr="0x7ff9f1faf090" >
-                            <attributelist id="5069" addr="0x7ff9f1faf090" >
-                                <attribute name="name" value="getPlayListId" id="5070" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="5071" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fae770" id="5072" addr="0x7ff9f1fae770" />
-                                <attribute name="kind" value="function" id="5073" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getPlayListId" id="5074" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="q(const).f()." id="5075" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="5076" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="int" id="5077" addr="0x7ff9f1fba9d0" />
-                                <attribute name="code" value="{ return iPlayList; }" id="5078" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="5079" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="5080" addr="0x7ff9f1faf6f0" >
-                            <attributelist id="5081" addr="0x7ff9f1faf6f0" >
-                                <attribute name="name" value="add" id="5082" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="5083" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fae770" id="5084" addr="0x7ff9f1fae770" />
-                                <attribute name="sym_nextSibling" value="0x7ff9f1faf930" id="5085" addr="0x7ff9f1faf930" />
-                                <attribute name="csym_nextSibling" value="0x7ff9f1faf930" id="5086" addr="0x7ff9f1faf930" />
-                                <attribute name="kind" value="function" id="5087" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="add" id="5088" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.XBMCAddon::xbmcgui::ListItem,int)." id="5089" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="5090" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overloaded" value="0x7ff9f1faf6f0" id="5091" addr="0x7ff9f1faf6f0" />
-                                <parmlist id="5092" addr="0x7ff9f1faf2f0" >
+                        <cdecl id="5068" addr="0x7fdf08506090" >
+                            <attributelist id="5069" addr="0x7fdf08506090" >
+                                <attribute name="name" value="getPlayListId" id="5070" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="5071" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf08505770" id="5072" addr="0x7fdf08505770" />
+                                <attribute name="kind" value="function" id="5073" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getPlayListId" id="5074" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="q(const).f()." id="5075" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="5076" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="int" id="5077" addr="0x7fdf085119d0" />
+                                <attribute name="code" value="{ return iPlayList; }" id="5078" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="5079" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="5080" addr="0x7fdf085066f0" >
+                            <attributelist id="5081" addr="0x7fdf085066f0" >
+                                <attribute name="name" value="add" id="5082" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="5083" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf08505770" id="5084" addr="0x7fdf08505770" />
+                                <attribute name="sym_nextSibling" value="0x7fdf08506930" id="5085" addr="0x7fdf08506930" />
+                                <attribute name="csym_nextSibling" value="0x7fdf08506930" id="5086" addr="0x7fdf08506930" />
+                                <attribute name="kind" value="function" id="5087" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="add" id="5088" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.XBMCAddon::xbmcgui::ListItem,int)." id="5089" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="5090" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overloaded" value="0x7fdf085066f0" id="5091" addr="0x7fdf085066f0" />
+                                <parmlist id="5092" addr="0x7fdf085062f0" >
                                     <parm id="5093">
-                                        <attributelist id="5094" addr="0x7ff9f1faf2f0" >
-                                            <attribute name="name" value="url" id="5095" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="5096" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="5094" addr="0x7fdf085062f0" >
+                                            <attribute name="name" value="url" id="5095" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="5096" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5097">
-                                        <attributelist id="5098" addr="0x7ff9f1faf4b0" >
-                                            <attribute name="name" value="listitem" id="5099" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="NULL" id="5100" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="p.XBMCAddon::xbmcgui::ListItem" id="5101" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="5098" addr="0x7fdf085064b0" >
+                                            <attribute name="name" value="listitem" id="5099" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="NULL" id="5100" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="p.XBMCAddon::xbmcgui::ListItem" id="5101" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5102">
-                                        <attributelist id="5103" addr="0x7ff9f1faf630" >
-                                            <attribute name="name" value="index" id="5104" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="-1" id="5105" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="int" id="5106" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="5103" addr="0x7fdf08506630" >
+                                            <attribute name="name" value="index" id="5104" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="-1" id="5105" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="int" id="5106" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="5107" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="5108" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="5109" addr="0x7ff9f1faf930" >
-                            <attributelist id="5110" addr="0x7ff9f1faf930" >
-                                <attribute name="name" value="add" id="5111" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="5112" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fae770" id="5113" addr="0x7ff9f1fae770" />
-                                <attribute name="sym_previousSibling" value="0x7ff9f1faf6f0" id="5114" addr="0x7ff9f1faf6f0" />
-                                <attribute name="kind" value="function" id="5115" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="add" id="5116" addr="0x7ff9f1fba9d0" />
-                                <attribute name="csym_nextSibling" value="0x7ff9f1fafad0" id="5117" addr="0x7ff9f1fafad0" />
-                                <attribute name="sym_nextSibling" value="0x7ff9f1fafad0" id="5118" addr="0x7ff9f1fafad0" />
-                                <attribute name="defaultargs" value="0x7ff9f1faf6f0" id="5119" addr="0x7ff9f1faf6f0" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.XBMCAddon::xbmcgui::ListItem)." id="5120" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="5121" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overloaded" value="0x7ff9f1faf6f0" id="5122" addr="0x7ff9f1faf6f0" />
-                                <parmlist id="5123" addr="0x7ff9f1faf790" >
+                                <attribute name="type" value="void" id="5107" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="5108" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="5109" addr="0x7fdf08506930" >
+                            <attributelist id="5110" addr="0x7fdf08506930" >
+                                <attribute name="name" value="add" id="5111" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="5112" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf08505770" id="5113" addr="0x7fdf08505770" />
+                                <attribute name="sym_previousSibling" value="0x7fdf085066f0" id="5114" addr="0x7fdf085066f0" />
+                                <attribute name="kind" value="function" id="5115" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="add" id="5116" addr="0x7fdf085119d0" />
+                                <attribute name="csym_nextSibling" value="0x7fdf08506ad0" id="5117" addr="0x7fdf08506ad0" />
+                                <attribute name="sym_nextSibling" value="0x7fdf08506ad0" id="5118" addr="0x7fdf08506ad0" />
+                                <attribute name="defaultargs" value="0x7fdf085066f0" id="5119" addr="0x7fdf085066f0" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.XBMCAddon::xbmcgui::ListItem)." id="5120" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="5121" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overloaded" value="0x7fdf085066f0" id="5122" addr="0x7fdf085066f0" />
+                                <parmlist id="5123" addr="0x7fdf08506790" >
                                     <parm id="5124">
-                                        <attributelist id="5125" addr="0x7ff9f1faf790" >
-                                            <attribute name="name" value="url" id="5126" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="5127" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="5125" addr="0x7fdf08506790" >
+                                            <attribute name="name" value="url" id="5126" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="5127" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5128">
-                                        <attributelist id="5129" addr="0x7ff9f1faf870" >
-                                            <attribute name="name" value="listitem" id="5130" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="NULL" id="5131" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="p.XBMCAddon::xbmcgui::ListItem" id="5132" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="5129" addr="0x7fdf08506870" >
+                                            <attribute name="name" value="listitem" id="5130" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="NULL" id="5131" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="p.XBMCAddon::xbmcgui::ListItem" id="5132" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="5133" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="5134" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="5135" addr="0x7ff9f1fafad0" >
-                            <attributelist id="5136" addr="0x7ff9f1fafad0" >
-                                <attribute name="name" value="add" id="5137" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="5138" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fae770" id="5139" addr="0x7ff9f1fae770" />
-                                <attribute name="sym_previousSibling" value="0x7ff9f1faf930" id="5140" addr="0x7ff9f1faf930" />
-                                <attribute name="kind" value="function" id="5141" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="add" id="5142" addr="0x7ff9f1fba9d0" />
-                                <attribute name="defaultargs" value="0x7ff9f1faf6f0" id="5143" addr="0x7ff9f1faf6f0" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="5144" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="5145" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overloaded" value="0x7ff9f1faf6f0" id="5146" addr="0x7ff9f1faf6f0" />
-                                <parmlist id="5147" addr="0x7ff9f1faf9d0" >
+                                <attribute name="type" value="void" id="5133" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="5134" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="5135" addr="0x7fdf08506ad0" >
+                            <attributelist id="5136" addr="0x7fdf08506ad0" >
+                                <attribute name="name" value="add" id="5137" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="5138" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf08505770" id="5139" addr="0x7fdf08505770" />
+                                <attribute name="sym_previousSibling" value="0x7fdf08506930" id="5140" addr="0x7fdf08506930" />
+                                <attribute name="kind" value="function" id="5141" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="add" id="5142" addr="0x7fdf085119d0" />
+                                <attribute name="defaultargs" value="0x7fdf085066f0" id="5143" addr="0x7fdf085066f0" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="5144" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="5145" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overloaded" value="0x7fdf085066f0" id="5146" addr="0x7fdf085066f0" />
+                                <parmlist id="5147" addr="0x7fdf085069d0" >
                                     <parm id="5148">
-                                        <attributelist id="5149" addr="0x7ff9f1faf9d0" >
-                                            <attribute name="name" value="url" id="5150" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="5151" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="5149" addr="0x7fdf085069d0" >
+                                            <attribute name="name" value="url" id="5150" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="5151" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="5152" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_2" id="5153" addr="0x7ff9f1fba9d0" />
+                                <attribute name="type" value="void" id="5152" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_2" id="5153" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="5154" addr="0x7ff9f1fafdd0" >
-                            <attributelist id="5155" addr="0x7ff9f1fafdd0" >
-                                <attribute name="name" value="load" id="5156" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="5157" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fae770" id="5158" addr="0x7ff9f1fae770" />
-                                <attribute name="kind" value="function" id="5159" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="load" id="5160" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(p.q(const).char)." id="5161" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="5162" addr="0x7ff9f1fba9d0" />
-                                <parmlist id="5163" addr="0x7ff9f1fafd10" >
+                        <cdecl id="5154" addr="0x7fdf08506dd0" >
+                            <attributelist id="5155" addr="0x7fdf08506dd0" >
+                                <attribute name="name" value="load" id="5156" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="5157" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf08505770" id="5158" addr="0x7fdf08505770" />
+                                <attribute name="kind" value="function" id="5159" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="load" id="5160" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(p.q(const).char)." id="5161" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="5162" addr="0x7fdf085119d0" />
+                                <parmlist id="5163" addr="0x7fdf08506d10" >
                                     <parm id="5164">
-                                        <attributelist id="5165" addr="0x7ff9f1fafd10" >
-                                            <attribute name="name" value="filename" id="5166" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="p.q(const).char" id="5167" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="5165" addr="0x7fdf08506d10" >
+                                            <attribute name="name" value="filename" id="5166" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="p.q(const).char" id="5167" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="bool" id="5168" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="5169" addr="0x7ff9f1fba9d0" />
+                                <attribute name="type" value="bool" id="5168" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="5169" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="5170" addr="0x7ff9f1fb00d0" >
-                            <attributelist id="5171" addr="0x7ff9f1fb00d0" >
-                                <attribute name="name" value="remove" id="5172" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="5173" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fae770" id="5174" addr="0x7ff9f1fae770" />
-                                <attribute name="kind" value="function" id="5175" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="remove" id="5176" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(p.q(const).char)." id="5177" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="5178" addr="0x7ff9f1fba9d0" />
-                                <parmlist id="5179" addr="0x7ff9f1fb0010" >
+                        <cdecl id="5170" addr="0x7fdf085070d0" >
+                            <attributelist id="5171" addr="0x7fdf085070d0" >
+                                <attribute name="name" value="remove" id="5172" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="5173" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf08505770" id="5174" addr="0x7fdf08505770" />
+                                <attribute name="kind" value="function" id="5175" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="remove" id="5176" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(p.q(const).char)." id="5177" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="5178" addr="0x7fdf085119d0" />
+                                <parmlist id="5179" addr="0x7fdf08507010" >
                                     <parm id="5180">
-                                        <attributelist id="5181" addr="0x7ff9f1fb0010" >
-                                            <attribute name="name" value="filename" id="5182" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="p.q(const).char" id="5183" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="5181" addr="0x7fdf08507010" >
+                                            <attribute name="name" value="filename" id="5182" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="p.q(const).char" id="5183" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="5184" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="5185" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="5186" addr="0x7ff9f1fb0290" >
-                            <attributelist id="5187" addr="0x7ff9f1fb0290" >
-                                <attribute name="ismember" value="1" id="5188" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="clear" id="5189" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="clear" id="5190" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="5191" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="5192" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="5193" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="void" id="5194" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fae770" id="5195" addr="0x7ff9f1fae770" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="5196" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="5197" addr="0x7ff9f1fb0470" >
-                            <attributelist id="5198" addr="0x7ff9f1fb0470" >
-                                <attribute name="ismember" value="1" id="5199" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="size" id="5200" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="size" id="5201" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="5202" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="5203" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="5204" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="int" id="5205" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fae770" id="5206" addr="0x7ff9f1fae770" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="5207" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="5208" addr="0x7ff9f1fb0630" >
-                            <attributelist id="5209" addr="0x7ff9f1fb0630" >
-                                <attribute name="ismember" value="1" id="5210" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="shuffle" id="5211" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="shuffle" id="5212" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="5213" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="5214" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="5215" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="void" id="5216" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fae770" id="5217" addr="0x7ff9f1fae770" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="5218" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="5219" addr="0x7ff9f1fb07f0" >
-                            <attributelist id="5220" addr="0x7ff9f1fb07f0" >
-                                <attribute name="ismember" value="1" id="5221" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="unshuffle" id="5222" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="unshuffle" id="5223" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="5224" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="5225" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="5226" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="void" id="5227" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fae770" id="5228" addr="0x7ff9f1fae770" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="5229" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="5230" addr="0x7ff9f1fb09d0" >
-                            <attributelist id="5231" addr="0x7ff9f1fb09d0" >
-                                <attribute name="ismember" value="1" id="5232" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="getposition" id="5233" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="getposition" id="5234" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="5235" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="5236" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="5237" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="int" id="5238" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fae770" id="5239" addr="0x7ff9f1fae770" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="5240" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="5241" addr="0x7ff9f1fb0cf0" >
-                            <attributelist id="5242" addr="0x7ff9f1fb0cf0" >
-                                <attribute name="ismember" value="1" id="5243" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="operator []" id="5244" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="operator []" id="5245" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(long).p." id="5246" addr="0x7ff9f1fba9d0" />
-                                <parmlist id="5247" addr="0x7ff9f1fb0c70" >
+                                <attribute name="type" value="void" id="5184" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="5185" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="5186" addr="0x7fdf08507290" >
+                            <attributelist id="5187" addr="0x7fdf08507290" >
+                                <attribute name="ismember" value="1" id="5188" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="clear" id="5189" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="clear" id="5190" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="5191" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="5192" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="5193" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="void" id="5194" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf08505770" id="5195" addr="0x7fdf08505770" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="5196" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="5197" addr="0x7fdf08507470" >
+                            <attributelist id="5198" addr="0x7fdf08507470" >
+                                <attribute name="ismember" value="1" id="5199" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="size" id="5200" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="size" id="5201" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="5202" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="5203" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="5204" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="int" id="5205" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf08505770" id="5206" addr="0x7fdf08505770" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="5207" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="5208" addr="0x7fdf08507630" >
+                            <attributelist id="5209" addr="0x7fdf08507630" >
+                                <attribute name="ismember" value="1" id="5210" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="shuffle" id="5211" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="shuffle" id="5212" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="5213" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="5214" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="5215" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="void" id="5216" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf08505770" id="5217" addr="0x7fdf08505770" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="5218" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="5219" addr="0x7fdf085077f0" >
+                            <attributelist id="5220" addr="0x7fdf085077f0" >
+                                <attribute name="ismember" value="1" id="5221" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="unshuffle" id="5222" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="unshuffle" id="5223" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="5224" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="5225" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="5226" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="void" id="5227" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf08505770" id="5228" addr="0x7fdf08505770" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="5229" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="5230" addr="0x7fdf085079d0" >
+                            <attributelist id="5231" addr="0x7fdf085079d0" >
+                                <attribute name="ismember" value="1" id="5232" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="getposition" id="5233" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="getposition" id="5234" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="5235" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="5236" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="5237" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="int" id="5238" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf08505770" id="5239" addr="0x7fdf08505770" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="5240" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="5241" addr="0x7fdf08507cf0" >
+                            <attributelist id="5242" addr="0x7fdf08507cf0" >
+                                <attribute name="ismember" value="1" id="5243" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="operator []" id="5244" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="operator []" id="5245" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(long).p." id="5246" addr="0x7fdf085119d0" />
+                                <parmlist id="5247" addr="0x7fdf08507c70" >
                                     <parm id="5248">
-                                        <attributelist id="5249" addr="0x7ff9f1fb0c70" >
-                                            <attribute name="name" value="i" id="5250" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="long" id="5251" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="5249" addr="0x7fdf08507c70" >
+                                            <attribute name="name" value="i" id="5250" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="long" id="5251" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="access" value="public" id="5252" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="5253" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::xbmcgui::ListItem" id="5254" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fae770" id="5255" addr="0x7ff9f1fae770" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="5256" addr="0x7ff9f1fba9d0" />
+                                <attribute name="access" value="public" id="5252" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="5253" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::xbmcgui::ListItem" id="5254" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf08505770" id="5255" addr="0x7fdf08505770" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="5256" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </cdecl >
@@ -7378,696 +7378,696 @@
                 </namespace >
             </namespace >
         </include >
-        <include id="5257" addr="0x7ff9f1fb10b0" >
-            <attributelist id="5258" addr="0x7ff9f1fb10b0" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/Monitor.h" id="5259" addr="0x7ff9f1fba9d0" />
+        <include id="5257" addr="0x7fdf085080b0" >
+            <attributelist id="5258" addr="0x7fdf085080b0" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/Monitor.h" id="5259" addr="0x7fdf085119d0" />
             </attributelist >
 
-            <namespace id="5260" addr="0x7ff9f1fb1150" >
-                <attributelist id="5261" addr="0x7ff9f1fb1150" >
-                    <attribute name="sym_name" value="XBMCAddon" id="5262" addr="0x7ff9f1fba9d0" />
-                    <attribute name="name" value="XBMCAddon" id="5263" addr="0x7ff9f1fba9d0" />
-                    <attribute name="sym_previousSibling" value="0x7ff9f1fae270" id="5264" addr="0x7ff9f1fae270" />
-                    <typescope id="5265" addr="0x7ff9f1fb4990" >
-                        <attributelist id="5266" addr="0x7ff9f1fb4990" >
-                            <attribute name="name" value="XBMCAddon" id="5267" addr="0x7ff9f1fba9d0" />
-                            <typetab id="5268" addr="0x7ff9f1fb49d0" >
-                                <attributelist id="5269" addr="0x7ff9f1fb49d0" >
-                                    <attribute name="String" value="std::string" id="5270" addr="0x7ff9f1fba9d0" />
+            <namespace id="5260" addr="0x7fdf08508150" >
+                <attributelist id="5261" addr="0x7fdf08508150" >
+                    <attribute name="sym_name" value="XBMCAddon" id="5262" addr="0x7fdf085119d0" />
+                    <attribute name="name" value="XBMCAddon" id="5263" addr="0x7fdf085119d0" />
+                    <attribute name="sym_previousSibling" value="0x7fdf08505270" id="5264" addr="0x7fdf08505270" />
+                    <typescope id="5265" addr="0x7fdf0850b990" >
+                        <attributelist id="5266" addr="0x7fdf0850b990" >
+                            <attribute name="name" value="XBMCAddon" id="5267" addr="0x7fdf085119d0" />
+                            <typetab id="5268" addr="0x7fdf0850b9d0" >
+                                <attributelist id="5269" addr="0x7fdf0850b9d0" >
+                                    <attribute name="String" value="std::string" id="5270" addr="0x7fdf085119d0" />
                                 </attributelist >
-                                <typetabsitem id="5271" addr="0x7ff9f1fb4bb0" >
-                                    <attributelist id="5272" addr="0x7ff9f1fb4bb0" >
+                                <typetabsitem id="5271" addr="0x7fdf0850bbb0" >
+                                    <attributelist id="5272" addr="0x7fdf0850bbb0" >
                                     </attributelist >
                                 </typetabsitem >
                             </typetab >
-                            <attribute name="parent" value="0x7ff9f1f72a30" id="5273" addr="0x7ff9f1f72a30" />
-                            <attribute name="qname" value="XBMCAddon" id="5274" addr="0x7ff9f1fba9d0" />
-                            <attribute name="symtab" value="0x7ff9f1f89bb0" id="5275" addr="0x7ff9f1f89bb0" />
+                            <attribute name="parent" value="0x7fdf084c9a30" id="5273" addr="0x7fdf084c9a30" />
+                            <attribute name="qname" value="XBMCAddon" id="5274" addr="0x7fdf085119d0" />
+                            <attribute name="symtab" value="0x7fdf084e0bb0" id="5275" addr="0x7fdf084e0bb0" />
                         </attributelist >
-                        <typescopesitem id="5276" addr="0x7ff9f1f89b70" >
-                            <attributelist id="5277" addr="0x7ff9f1f89b70" >
+                        <typescopesitem id="5276" addr="0x7fdf084e0b70" >
+                            <attributelist id="5277" addr="0x7fdf084e0b70" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="5278" addr="0x7ff9f1fb49d0" >
-                            <attributelist id="5279" addr="0x7ff9f1fb49d0" >
-                                <attribute name="String" value="std::string" id="5280" addr="0x7ff9f1fba9d0" />
+                        <typescopesitem id="5278" addr="0x7fdf0850b9d0" >
+                            <attributelist id="5279" addr="0x7fdf0850b9d0" >
+                                <attribute name="String" value="std::string" id="5280" addr="0x7fdf085119d0" />
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="5281" addr="0x7ff9f1f72a30" >
-                            <attributelist id="5282" addr="0x7ff9f1f72a30" >
-                                <attribute name="name" value="" id="5283" addr="0x7ff9f1fba9d0" />
-                                <typetab id="5284" addr="0x7ff9f1f72a90" >
-                                    <attributelist id="5285" addr="0x7ff9f1f72a90" >
-                                        <attribute name="CGUIDialogKeyboardGeneric" value="CGUIDialogKeyboardGeneric" id="5286" addr="0x7ff9f1fba9d0" />
+                        <typescopesitem id="5281" addr="0x7fdf084c9a30" >
+                            <attributelist id="5282" addr="0x7fdf084c9a30" >
+                                <attribute name="name" value="" id="5283" addr="0x7fdf085119d0" />
+                                <typetab id="5284" addr="0x7fdf084c9a90" >
+                                    <attributelist id="5285" addr="0x7fdf084c9a90" >
+                                        <attribute name="CGUIDialogKeyboardGeneric" value="CGUIDialogKeyboardGeneric" id="5286" addr="0x7fdf085119d0" />
                                     </attributelist >
-                                    <typetabsitem id="5287" addr="0x7ff9f1fb7950" >
-                                        <attributelist id="5288" addr="0x7ff9f1fb7950" >
+                                    <typetabsitem id="5287" addr="0x7fdf0850e950" >
+                                        <attributelist id="5288" addr="0x7fdf0850e950" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="5289" addr="0x7ff9f1fb4ad0" >
-                            <attributelist id="5290" addr="0x7ff9f1fb4ad0" >
+                        <typescopesitem id="5289" addr="0x7fdf0850bad0" >
+                            <attributelist id="5290" addr="0x7fdf0850bad0" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="5291" addr="0x7ff9f1f89bb0" >
-                            <attributelist id="5292" addr="0x7ff9f1f89bb0" >
-                                <attribute name="name" value="XBMCAddon" id="5293" addr="0x7ff9f1fba9d0" />
-                                <attribute name="csymtab" value="0x7ff9f1f89bf0" id="5294" addr="0x7ff9f1f89bf0" />
-                                <attribute name="symtab" value="0x7ff9f1f89b90" id="5295" addr="0x7ff9f1f89b90" />
+                        <typescopesitem id="5291" addr="0x7fdf084e0bb0" >
+                            <attributelist id="5292" addr="0x7fdf084e0bb0" >
+                                <attribute name="name" value="XBMCAddon" id="5293" addr="0x7fdf085119d0" />
+                                <attribute name="csymtab" value="0x7fdf084e0bf0" id="5294" addr="0x7fdf084e0bf0" />
+                                <attribute name="symtab" value="0x7fdf084e0b90" id="5295" addr="0x7fdf084e0b90" />
                             </attributelist >
                         </typescopesitem >
                     </typescope >
-                    <attribute name="symtab" value="0x7ff9f1f89bb0" id="5296" addr="0x7ff9f1f89bb0" />
-                    <attribute name="sym_symtab" value="0x7ff9f1f72950" id="5297" addr="0x7ff9f1f72950" />
+                    <attribute name="symtab" value="0x7fdf084e0bb0" id="5296" addr="0x7fdf084e0bb0" />
+                    <attribute name="sym_symtab" value="0x7fdf084c9950" id="5297" addr="0x7fdf084c9950" />
                 </attributelist >
 
-                <namespace id="5298" addr="0x7ff9f1fb11d0" >
-                    <attributelist id="5299" addr="0x7ff9f1fb11d0" >
-                        <attribute name="sym_name" value="xbmc" id="5300" addr="0x7ff9f1fba9d0" />
-                        <attribute name="name" value="xbmc" id="5301" addr="0x7ff9f1fba9d0" />
-                        <attribute name="feature_knownbasetypes" value="AddonClass,IPlayerCallback,AddonCallback" id="5302" addr="0x7ff9f1fba9d0" />
-                        <attribute name="feature_knownapitypes" value="XBMCAddon::xbmcgui::ListItem,XBMCAddon::xbmc::PlayListItem" id="5303" addr="0x7ff9f1fba9d0" />
-                        <attribute name="sym_previousSibling" value="0x7ff9f1fae2f0" id="5304" addr="0x7ff9f1fae2f0" />
-                        <typescope id="5305" addr="0x7ff9f1fb4d70" >
-                            <attributelist id="5306" addr="0x7ff9f1fb4d70" >
-                                <attribute name="name" value="xbmc" id="5307" addr="0x7ff9f1fba9d0" />
-                                <typetab id="5308" addr="0x7ff9f1fb4d90" >
-                                    <attributelist id="5309" addr="0x7ff9f1fb4d90" >
-                                        <attribute name="Monitor" value="Monitor" id="5310" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="5311" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="Keyboard" value="Keyboard" id="5312" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="5313" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="InfoTagVideo" value="InfoTagVideo" id="5314" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="Player" value="Player" id="5315" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="InfoTagMusic" value="InfoTagMusic" id="5316" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="PlayList" value="PlayList" id="5317" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="RenderCapture" value="RenderCapture" id="5318" addr="0x7ff9f1fba9d0" />
+                <namespace id="5298" addr="0x7fdf085081d0" >
+                    <attributelist id="5299" addr="0x7fdf085081d0" >
+                        <attribute name="sym_name" value="xbmc" id="5300" addr="0x7fdf085119d0" />
+                        <attribute name="name" value="xbmc" id="5301" addr="0x7fdf085119d0" />
+                        <attribute name="feature_knownbasetypes" value="AddonClass,IPlayerCallback,AddonCallback" id="5302" addr="0x7fdf085119d0" />
+                        <attribute name="feature_knownapitypes" value="XBMCAddon::xbmcgui::ListItem,XBMCAddon::xbmc::PlayListItem" id="5303" addr="0x7fdf085119d0" />
+                        <attribute name="sym_previousSibling" value="0x7fdf085052f0" id="5304" addr="0x7fdf085052f0" />
+                        <typescope id="5305" addr="0x7fdf0850bd70" >
+                            <attributelist id="5306" addr="0x7fdf0850bd70" >
+                                <attribute name="name" value="xbmc" id="5307" addr="0x7fdf085119d0" />
+                                <typetab id="5308" addr="0x7fdf0850bd90" >
+                                    <attributelist id="5309" addr="0x7fdf0850bd90" >
+                                        <attribute name="Monitor" value="Monitor" id="5310" addr="0x7fdf085119d0" />
+                                        <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="5311" addr="0x7fdf085119d0" />
+                                        <attribute name="Keyboard" value="Keyboard" id="5312" addr="0x7fdf085119d0" />
+                                        <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="5313" addr="0x7fdf085119d0" />
+                                        <attribute name="InfoTagVideo" value="InfoTagVideo" id="5314" addr="0x7fdf085119d0" />
+                                        <attribute name="Player" value="Player" id="5315" addr="0x7fdf085119d0" />
+                                        <attribute name="InfoTagMusic" value="InfoTagMusic" id="5316" addr="0x7fdf085119d0" />
+                                        <attribute name="PlayList" value="PlayList" id="5317" addr="0x7fdf085119d0" />
+                                        <attribute name="RenderCapture" value="RenderCapture" id="5318" addr="0x7fdf085119d0" />
                                     </attributelist >
-                                    <typetabsitem id="5319" addr="0x7ff9f1fb9b10" >
-                                        <attributelist id="5320" addr="0x7ff9f1fb9b10" >
+                                    <typetabsitem id="5319" addr="0x7fdf08510b10" >
+                                        <attributelist id="5320" addr="0x7fdf08510b10" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="5321" addr="0x7ff9f1fb7f30" >
-                                        <attributelist id="5322" addr="0x7ff9f1fb7f30" >
+                                    <typetabsitem id="5321" addr="0x7fdf0850ef30" >
+                                        <attributelist id="5322" addr="0x7fdf0850ef30" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="5323" addr="0x7ff9f1fb8990" >
-                                        <attributelist id="5324" addr="0x7ff9f1fb8990" >
+                                    <typetabsitem id="5323" addr="0x7fdf0850f990" >
+                                        <attributelist id="5324" addr="0x7fdf0850f990" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="5325" addr="0x7ff9f1fb5e90" >
-                                        <attributelist id="5326" addr="0x7ff9f1fb5e90" >
+                                    <typetabsitem id="5325" addr="0x7fdf0850ce90" >
+                                        <attributelist id="5326" addr="0x7fdf0850ce90" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="5327" addr="0x7ff9f1fb8310" >
-                                        <attributelist id="5328" addr="0x7ff9f1fb8310" >
+                                    <typetabsitem id="5327" addr="0x7fdf0850f310" >
+                                        <attributelist id="5328" addr="0x7fdf0850f310" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="5329" addr="0x7ff9f1fb6050" >
-                                        <attributelist id="5330" addr="0x7ff9f1fb6050" >
+                                    <typetabsitem id="5329" addr="0x7fdf0850d050" >
+                                        <attributelist id="5330" addr="0x7fdf0850d050" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="5331" addr="0x7ff9f1fb7b50" >
-                                        <attributelist id="5332" addr="0x7ff9f1fb7b50" >
+                                    <typetabsitem id="5331" addr="0x7fdf0850eb50" >
+                                        <attributelist id="5332" addr="0x7fdf0850eb50" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="5333" addr="0x7ff9f1fb91b0" >
-                                        <attributelist id="5334" addr="0x7ff9f1fb91b0" >
+                                    <typetabsitem id="5333" addr="0x7fdf085101b0" >
+                                        <attributelist id="5334" addr="0x7fdf085101b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="5335" addr="0x7ff9f1fb7490" >
-                                        <attributelist id="5336" addr="0x7ff9f1fb7490" >
+                                    <typetabsitem id="5335" addr="0x7fdf0850e490" >
+                                        <attributelist id="5336" addr="0x7fdf0850e490" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
-                                <attribute name="parent" value="0x7ff9f1fb4990" id="5337" addr="0x7ff9f1fb4990" />
-                                <attribute name="qname" value="XBMCAddon::xbmc" id="5338" addr="0x7ff9f1fba9d0" />
-                                <attribute name="symtab" value="0x7ff9f1f8a2b0" id="5339" addr="0x7ff9f1f8a2b0" />
+                                <attribute name="parent" value="0x7fdf0850b990" id="5337" addr="0x7fdf0850b990" />
+                                <attribute name="qname" value="XBMCAddon::xbmc" id="5338" addr="0x7fdf085119d0" />
+                                <attribute name="symtab" value="0x7fdf084e12b0" id="5339" addr="0x7fdf084e12b0" />
                             </attributelist >
-                            <typescopesitem id="5340" addr="0x7ff9f1f8a270" >
-                                <attributelist id="5341" addr="0x7ff9f1f8a270" >
+                            <typescopesitem id="5340" addr="0x7fdf084e1270" >
+                                <attributelist id="5341" addr="0x7fdf084e1270" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="5342" addr="0x7ff9f1fb4d90" >
-                                <attributelist id="5343" addr="0x7ff9f1fb4d90" >
-                                    <attribute name="Monitor" value="Monitor" id="5344" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="5345" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="Keyboard" value="Keyboard" id="5346" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="5347" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="InfoTagVideo" value="InfoTagVideo" id="5348" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="Player" value="Player" id="5349" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="InfoTagMusic" value="InfoTagMusic" id="5350" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="PlayList" value="PlayList" id="5351" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="RenderCapture" value="RenderCapture" id="5352" addr="0x7ff9f1fba9d0" />
+                            <typescopesitem id="5342" addr="0x7fdf0850bd90" >
+                                <attributelist id="5343" addr="0x7fdf0850bd90" >
+                                    <attribute name="Monitor" value="Monitor" id="5344" addr="0x7fdf085119d0" />
+                                    <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="5345" addr="0x7fdf085119d0" />
+                                    <attribute name="Keyboard" value="Keyboard" id="5346" addr="0x7fdf085119d0" />
+                                    <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="5347" addr="0x7fdf085119d0" />
+                                    <attribute name="InfoTagVideo" value="InfoTagVideo" id="5348" addr="0x7fdf085119d0" />
+                                    <attribute name="Player" value="Player" id="5349" addr="0x7fdf085119d0" />
+                                    <attribute name="InfoTagMusic" value="InfoTagMusic" id="5350" addr="0x7fdf085119d0" />
+                                    <attribute name="PlayList" value="PlayList" id="5351" addr="0x7fdf085119d0" />
+                                    <attribute name="RenderCapture" value="RenderCapture" id="5352" addr="0x7fdf085119d0" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="5353" addr="0x7ff9f1fb4990" >
-                                <attributelist id="5354" addr="0x7ff9f1fb4990" >
-                                    <attribute name="name" value="XBMCAddon" id="5355" addr="0x7ff9f1fba9d0" />
-                                    <typetab id="5356" addr="0x7ff9f1fb49d0" >
-                                        <attributelist id="5357" addr="0x7ff9f1fb49d0" >
-                                            <attribute name="String" value="std::string" id="5358" addr="0x7ff9f1fba9d0" />
-                                        </attributelist >
-                                        <typetabsitem id="5359" addr="0x7ff9f1fb4bb0" >
-                                            <attributelist id="5360" addr="0x7ff9f1fb4bb0" >
+                            <typescopesitem id="5353" addr="0x7fdf0850b990" >
+                                <attributelist id="5354" addr="0x7fdf0850b990" >
+                                    <attribute name="name" value="XBMCAddon" id="5355" addr="0x7fdf085119d0" />
+                                    <typetab id="5356" addr="0x7fdf0850b9d0" >
+                                        <attributelist id="5357" addr="0x7fdf0850b9d0" >
+                                            <attribute name="String" value="std::string" id="5358" addr="0x7fdf085119d0" />
+                                        </attributelist >
+                                        <typetabsitem id="5359" addr="0x7fdf0850bbb0" >
+                                            <attributelist id="5360" addr="0x7fdf0850bbb0" >
                                             </attributelist >
                                         </typetabsitem >
                                     </typetab >
-                                    <attribute name="parent" value="0x7ff9f1f72a30" id="5361" addr="0x7ff9f1f72a30" />
-                                    <attribute name="qname" value="XBMCAddon" id="5362" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="symtab" value="0x7ff9f1f89bb0" id="5363" addr="0x7ff9f1f89bb0" />
+                                    <attribute name="parent" value="0x7fdf084c9a30" id="5361" addr="0x7fdf084c9a30" />
+                                    <attribute name="qname" value="XBMCAddon" id="5362" addr="0x7fdf085119d0" />
+                                    <attribute name="symtab" value="0x7fdf084e0bb0" id="5363" addr="0x7fdf084e0bb0" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="5364" addr="0x7ff9f1fb4db0" >
-                                <attributelist id="5365" addr="0x7ff9f1fb4db0" >
+                            <typescopesitem id="5364" addr="0x7fdf0850bdb0" >
+                                <attributelist id="5365" addr="0x7fdf0850bdb0" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="5366" addr="0x7ff9f1f8a2b0" >
-                                <attributelist id="5367" addr="0x7ff9f1f8a2b0" >
-                                    <attribute name="name" value="xbmc" id="5368" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="csymtab" value="0x7ff9f1f8a2f0" id="5369" addr="0x7ff9f1f8a2f0" />
-                                    <attribute name="symtab" value="0x7ff9f1f8a290" id="5370" addr="0x7ff9f1f8a290" />
+                            <typescopesitem id="5366" addr="0x7fdf084e12b0" >
+                                <attributelist id="5367" addr="0x7fdf084e12b0" >
+                                    <attribute name="name" value="xbmc" id="5368" addr="0x7fdf085119d0" />
+                                    <attribute name="csymtab" value="0x7fdf084e12f0" id="5369" addr="0x7fdf084e12f0" />
+                                    <attribute name="symtab" value="0x7fdf084e1290" id="5370" addr="0x7fdf084e1290" />
                                 </attributelist >
                             </typescopesitem >
                         </typescope >
-                        <attribute name="symtab" value="0x7ff9f1f8a2b0" id="5371" addr="0x7ff9f1f8a2b0" />
-                        <attribute name="sym_symtab" value="0x7ff9f1f89bb0" id="5372" addr="0x7ff9f1f89bb0" />
+                        <attribute name="symtab" value="0x7fdf084e12b0" id="5371" addr="0x7fdf084e12b0" />
+                        <attribute name="sym_symtab" value="0x7fdf084e0bb0" id="5372" addr="0x7fdf084e0bb0" />
                     </attributelist >
 
-                    <class id="5373" addr="0x7ff9f1fb1350" >
-                        <attributelist id="5374" addr="0x7ff9f1fb1350" >
-                            <attribute name="name" value="XBMCAddon::xbmc::Monitor" id="5375" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_symtab" value="0x7ff9f1f8a2b0" id="5376" addr="0x7ff9f1f8a2b0" />
-                            <attribute name="symtab" value="0x7ff9f1fb14b0" id="5377" addr="0x7ff9f1fb14b0" />
-                            <attribute name="allows_typedef" value="1" id="5378" addr="0x7ff9f1fba9d0" />
-                            <attribute name="typepass_visit" value="1" id="5379" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_visit" value="1" id="5380" addr="0x7ff9f1fba9d0" />
-                            <attribute name="kind" value="class" id="5381" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_name" value="Monitor" id="5382" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_default_constructor" value="1" id="5383" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_has_constructor" value="1" id="5384" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_public_constructor" value="1" id="5385" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_has_destructor" value="1" id="5386" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_default_destructor" value="1" id="5387" addr="0x7ff9f1fba9d0" />
-                            <attribute name="allocate_copy_constructor" value="1" id="5388" addr="0x7ff9f1fba9d0" />
-                            <attribute name="privatebaselist" value="0x7ff9f1fb1330" id="5389" addr="0x7ff9f1fb1330" />
-                            <attribute name="protectedbaselist" value="0x7ff9f1fb1310" id="5390" addr="0x7ff9f1fb1310" />
-                            <baselist id="5391" addr="0x7ff9f1fb12f0" >
-                                <base name="AddonCallback" id="5392" addr="0x7ff9f1fb1270" />
+                    <class id="5373" addr="0x7fdf08508350" >
+                        <attributelist id="5374" addr="0x7fdf08508350" >
+                            <attribute name="name" value="XBMCAddon::xbmc::Monitor" id="5375" addr="0x7fdf085119d0" />
+                            <attribute name="sym_symtab" value="0x7fdf084e12b0" id="5376" addr="0x7fdf084e12b0" />
+                            <attribute name="symtab" value="0x7fdf085084b0" id="5377" addr="0x7fdf085084b0" />
+                            <attribute name="allows_typedef" value="1" id="5378" addr="0x7fdf085119d0" />
+                            <attribute name="typepass_visit" value="1" id="5379" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_visit" value="1" id="5380" addr="0x7fdf085119d0" />
+                            <attribute name="kind" value="class" id="5381" addr="0x7fdf085119d0" />
+                            <attribute name="sym_name" value="Monitor" id="5382" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_default_constructor" value="1" id="5383" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_has_constructor" value="1" id="5384" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_public_constructor" value="1" id="5385" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_has_destructor" value="1" id="5386" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_default_destructor" value="1" id="5387" addr="0x7fdf085119d0" />
+                            <attribute name="allocate_copy_constructor" value="1" id="5388" addr="0x7fdf085119d0" />
+                            <attribute name="privatebaselist" value="0x7fdf08508330" id="5389" addr="0x7fdf08508330" />
+                            <attribute name="protectedbaselist" value="0x7fdf08508310" id="5390" addr="0x7fdf08508310" />
+                            <baselist id="5391" addr="0x7fdf085082f0" >
+                                <base name="AddonCallback" id="5392" addr="0x7fdf08508270" />
                             </baselist >
-                            <attribute name="module" value="xbmc" id="5393" addr="0x7ff9f1f89430" />
-                            <attribute name="feature_director" value="1" id="5394" addr="0x7ff9f1fba9d0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="5395" addr="0x7ff9f1fba9d0" />
-                            <typescope id="5396" addr="0x7ff9f1fb9c10" >
-                                <attributelist id="5397" addr="0x7ff9f1fb9c10" >
-                                    <attribute name="name" value="Monitor" id="5398" addr="0x7ff9f1fba9d0" />
-                                    <typetab id="5399" addr="0x7ff9f1fb9c30" >
-                                        <attributelist id="5400" addr="0x7ff9f1fb9c30" >
+                            <attribute name="module" value="xbmc" id="5393" addr="0x7fdf084e0430" />
+                            <attribute name="feature_director" value="1" id="5394" addr="0x7fdf085119d0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="5395" addr="0x7fdf085119d0" />
+                            <typescope id="5396" addr="0x7fdf08510c10" >
+                                <attributelist id="5397" addr="0x7fdf08510c10" >
+                                    <attribute name="name" value="Monitor" id="5398" addr="0x7fdf085119d0" />
+                                    <typetab id="5399" addr="0x7fdf08510c30" >
+                                        <attributelist id="5400" addr="0x7fdf08510c30" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7ff9f1fb4d70" id="5401" addr="0x7ff9f1fb4d70" />
-                                    <attribute name="qname" value="XBMCAddon::xbmc::Monitor" id="5402" addr="0x7ff9f1fba9d0" />
-                                    <attribute name="symtab" value="0x7ff9f1fb14b0" id="5403" addr="0x7ff9f1fb14b0" />
+                                    <attribute name="parent" value="0x7fdf0850bd70" id="5401" addr="0x7fdf0850bd70" />
+                                    <attribute name="qname" value="XBMCAddon::xbmc::Monitor" id="5402" addr="0x7fdf085119d0" />
+                                    <attribute name="symtab" value="0x7fdf085084b0" id="5403" addr="0x7fdf085084b0" />
                                 </attributelist >
-                                <typescopesitem id="5404" addr="0x7ff9f1fb9bb0" >
-                                    <attributelist id="5405" addr="0x7ff9f1fb9bb0" >
+                                <typescopesitem id="5404" addr="0x7fdf08510bb0" >
+                                    <attributelist id="5405" addr="0x7fdf08510bb0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="5406" addr="0x7ff9f1fb9c30" >
-                                    <attributelist id="5407" addr="0x7ff9f1fb9c30" >
+                                <typescopesitem id="5406" addr="0x7fdf08510c30" >
+                                    <attributelist id="5407" addr="0x7fdf08510c30" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="5408" addr="0x7ff9f1fb4d70" >
-                                    <attributelist id="5409" addr="0x7ff9f1fb4d70" >
-                                        <attribute name="name" value="xbmc" id="5410" addr="0x7ff9f1fba9d0" />
-                                        <typetab id="5411" addr="0x7ff9f1fb4d90" >
-                                            <attributelist id="5412" addr="0x7ff9f1fb4d90" >
-                                                <attribute name="Monitor" value="Monitor" id="5413" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="5414" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="Keyboard" value="Keyboard" id="5415" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="5416" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="InfoTagVideo" value="InfoTagVideo" id="5417" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="Player" value="Player" id="5418" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="InfoTagMusic" value="InfoTagMusic" id="5419" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="PlayList" value="PlayList" id="5420" addr="0x7ff9f1fba9d0" />
-                                                <attribute name="RenderCapture" value="RenderCapture" id="5421" addr="0x7ff9f1fba9d0" />
+                                <typescopesitem id="5408" addr="0x7fdf0850bd70" >
+                                    <attributelist id="5409" addr="0x7fdf0850bd70" >
+                                        <attribute name="name" value="xbmc" id="5410" addr="0x7fdf085119d0" />
+                                        <typetab id="5411" addr="0x7fdf0850bd90" >
+                                            <attributelist id="5412" addr="0x7fdf0850bd90" >
+                                                <attribute name="Monitor" value="Monitor" id="5413" addr="0x7fdf085119d0" />
+                                                <attribute name="InfoTagRadioRDS" value="InfoTagRadioRDS" id="5414" addr="0x7fdf085119d0" />
+                                                <attribute name="Keyboard" value="Keyboard" id="5415" addr="0x7fdf085119d0" />
+                                                <attribute name="PlayParameter" value="Alternative&lt;(XBMCAddon::String,p.q(const).PlayList)>" id="5416" addr="0x7fdf085119d0" />
+                                                <attribute name="InfoTagVideo" value="InfoTagVideo" id="5417" addr="0x7fdf085119d0" />
+                                                <attribute name="Player" value="Player" id="5418" addr="0x7fdf085119d0" />
+                                                <attribute name="InfoTagMusic" value="InfoTagMusic" id="5419" addr="0x7fdf085119d0" />
+                                                <attribute name="PlayList" value="PlayList" id="5420" addr="0x7fdf085119d0" />
+                                                <attribute name="RenderCapture" value="RenderCapture" id="5421" addr="0x7fdf085119d0" />
                                             </attributelist >
-                                            <typetabsitem id="5422" addr="0x7ff9f1fb9b10" >
-                                                <attributelist id="5423" addr="0x7ff9f1fb9b10" >
+                                            <typetabsitem id="5422" addr="0x7fdf08510b10" >
+                                                <attributelist id="5423" addr="0x7fdf08510b10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5424" addr="0x7ff9f1fb7f30" >
-                                                <attributelist id="5425" addr="0x7ff9f1fb7f30" >
+                                            <typetabsitem id="5424" addr="0x7fdf0850ef30" >
+                                                <attributelist id="5425" addr="0x7fdf0850ef30" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5426" addr="0x7ff9f1fb8990" >
-                                                <attributelist id="5427" addr="0x7ff9f1fb8990" >
+                                            <typetabsitem id="5426" addr="0x7fdf0850f990" >
+                                                <attributelist id="5427" addr="0x7fdf0850f990" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5428" addr="0x7ff9f1fb5e90" >
-                                                <attributelist id="5429" addr="0x7ff9f1fb5e90" >
+                                            <typetabsitem id="5428" addr="0x7fdf0850ce90" >
+                                                <attributelist id="5429" addr="0x7fdf0850ce90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5430" addr="0x7ff9f1fb8310" >
-                                                <attributelist id="5431" addr="0x7ff9f1fb8310" >
+                                            <typetabsitem id="5430" addr="0x7fdf0850f310" >
+                                                <attributelist id="5431" addr="0x7fdf0850f310" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5432" addr="0x7ff9f1fb6050" >
-                                                <attributelist id="5433" addr="0x7ff9f1fb6050" >
+                                            <typetabsitem id="5432" addr="0x7fdf0850d050" >
+                                                <attributelist id="5433" addr="0x7fdf0850d050" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5434" addr="0x7ff9f1fb7b50" >
-                                                <attributelist id="5435" addr="0x7ff9f1fb7b50" >
+                                            <typetabsitem id="5434" addr="0x7fdf0850eb50" >
+                                                <attributelist id="5435" addr="0x7fdf0850eb50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5436" addr="0x7ff9f1fb91b0" >
-                                                <attributelist id="5437" addr="0x7ff9f1fb91b0" >
+                                            <typetabsitem id="5436" addr="0x7fdf085101b0" >
+                                                <attributelist id="5437" addr="0x7fdf085101b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5438" addr="0x7ff9f1fb7490" >
-                                                <attributelist id="5439" addr="0x7ff9f1fb7490" >
+                                            <typetabsitem id="5438" addr="0x7fdf0850e490" >
+                                                <attributelist id="5439" addr="0x7fdf0850e490" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7ff9f1fb4990" id="5440" addr="0x7ff9f1fb4990" />
-                                        <attribute name="qname" value="XBMCAddon::xbmc" id="5441" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="symtab" value="0x7ff9f1f8a2b0" id="5442" addr="0x7ff9f1f8a2b0" />
+                                        <attribute name="parent" value="0x7fdf0850b990" id="5440" addr="0x7fdf0850b990" />
+                                        <attribute name="qname" value="XBMCAddon::xbmc" id="5441" addr="0x7fdf085119d0" />
+                                        <attribute name="symtab" value="0x7fdf084e12b0" id="5442" addr="0x7fdf084e12b0" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="5443" addr="0x7ff9f1fb9c50" >
-                                    <attributelist id="5444" addr="0x7ff9f1fb9c50" >
+                                <typescopesitem id="5443" addr="0x7fdf08510c50" >
+                                    <attributelist id="5444" addr="0x7fdf08510c50" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="5445" addr="0x7ff9f1fb14b0" >
-                                    <attributelist id="5446" addr="0x7ff9f1fb14b0" >
-                                        <attribute name="name" value="Monitor" id="5447" addr="0x7ff9f1fba9d0" />
-                                        <attribute name="csymtab" value="0x7ff9f1fb14d0" id="5448" addr="0x7ff9f1fb14d0" />
-                                        <attribute name="symtab" value="0x7ff9f1fb1470" id="5449" addr="0x7ff9f1fb1470" />
+                                <typescopesitem id="5445" addr="0x7fdf085084b0" >
+                                    <attributelist id="5446" addr="0x7fdf085084b0" >
+                                        <attribute name="name" value="Monitor" id="5447" addr="0x7fdf085119d0" />
+                                        <attribute name="csymtab" value="0x7fdf085084d0" id="5448" addr="0x7fdf085084d0" />
+                                        <attribute name="symtab" value="0x7fdf08508470" id="5449" addr="0x7fdf08508470" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <cdecl id="5450" addr="0x7ff9f1fb15b0" >
-                            <attributelist id="5451" addr="0x7ff9f1fb15b0" >
-                                <attribute name="ismember" value="1" id="5452" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="Id" id="5453" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="" id="5454" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="private" id="5455" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="variable" id="5456" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="XBMCAddon::String" id="5457" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fb14b0" id="5458" addr="0x7ff9f1fb14b0" />
+                        <cdecl id="5450" addr="0x7fdf085085b0" >
+                            <attributelist id="5451" addr="0x7fdf085085b0" >
+                                <attribute name="ismember" value="1" id="5452" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="Id" id="5453" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="" id="5454" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="private" id="5455" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="variable" id="5456" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="5457" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf085084b0" id="5458" addr="0x7fdf085084b0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="5459" addr="0x7ff9f1fb1730" >
-                            <attributelist id="5460" addr="0x7ff9f1fb1730" >
-                                <attribute name="ismember" value="1" id="5461" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="invokerId" id="5462" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="" id="5463" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="private" id="5464" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="variable" id="5465" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="long" id="5466" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fb14b0" id="5467" addr="0x7ff9f1fb14b0" />
+                        <cdecl id="5459" addr="0x7fdf08508730" >
+                            <attributelist id="5460" addr="0x7fdf08508730" >
+                                <attribute name="ismember" value="1" id="5461" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="invokerId" id="5462" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="" id="5463" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="private" id="5464" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="variable" id="5465" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="long" id="5466" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf085084b0" id="5467" addr="0x7fdf085084b0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="5468" addr="0x7ff9f1fb18f0" >
-                            <attributelist id="5469" addr="0x7ff9f1fb18f0" >
-                                <attribute name="ismember" value="1" id="5470" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="abortEvent" id="5471" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="" id="5472" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="private" id="5473" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="variable" id="5474" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="CEvent" id="5475" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fb14b0" id="5476" addr="0x7ff9f1fb14b0" />
+                        <cdecl id="5468" addr="0x7fdf085088f0" >
+                            <attributelist id="5469" addr="0x7fdf085088f0" >
+                                <attribute name="ismember" value="1" id="5470" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="abortEvent" id="5471" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="" id="5472" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="private" id="5473" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="variable" id="5474" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="CEvent" id="5475" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf085084b0" id="5476" addr="0x7fdf085084b0" />
                             </attributelist >
                          
                         </cdecl >
-                        <access id="5477" addr="0x7ff9f1fb19d0" >
-                            <attributelist id="5478" addr="0x7ff9f1fb19d0" >
-                                <attribute name="kind" value="public" id="5479" addr="0x7ff9f1fba9d0" />
+                        <access id="5477" addr="0x7fdf085089d0" >
+                            <attributelist id="5478" addr="0x7fdf085089d0" >
+                                <attribute name="kind" value="public" id="5479" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="5480" addr="0x7ff9f1fb1af0" >
-                            <attributelist id="5481" addr="0x7ff9f1fb1af0" >
-                                <attribute name="ismember" value="1" id="5482" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="Monitor" id="5483" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="Monitor" id="5484" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="5485" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="5486" addr="0x7ff9f1fba9d0" />
-                                <attribute name="feature_new" value="1" id="5487" addr="0x7ff9f1fba9d0" />
-                                <attribute name="feature_director" value="1" id="5488" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fb14b0" id="5489" addr="0x7ff9f1fb14b0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="5490" addr="0x7ff9f1fba9d0" />
+                        <constructor id="5480" addr="0x7fdf08508af0" >
+                            <attributelist id="5481" addr="0x7fdf08508af0" >
+                                <attribute name="ismember" value="1" id="5482" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="Monitor" id="5483" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="Monitor" id="5484" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="5485" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="5486" addr="0x7fdf085119d0" />
+                                <attribute name="feature_new" value="1" id="5487" addr="0x7fdf085119d0" />
+                                <attribute name="feature_director" value="1" id="5488" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf085084b0" id="5489" addr="0x7fdf085084b0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="5490" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </constructor >
-                        <cdecl id="5491" addr="0x7ff9f1fb1c90" >
-                            <attributelist id="5492" addr="0x7ff9f1fb1c90" >
-                                <attribute name="name" value="onSettingsChanged" id="5493" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="5494" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fb14b0" id="5495" addr="0x7ff9f1fb14b0" />
-                                <attribute name="kind" value="function" id="5496" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="onSettingsChanged" id="5497" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="5498" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="5499" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="void" id="5500" addr="0x7ff9f1fba9d0" />
-                                <attribute name="code" value="{ XBMC_TRACE; }" id="5501" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="5502" addr="0x7ff9f1fba9d0" />
-                                <attribute name="storage" value="virtual" id="5503" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="5504" addr="0x7ff9f1fb1e70" >
-                            <attributelist id="5505" addr="0x7ff9f1fb1e70" >
-                                <attribute name="name" value="onScreensaverActivated" id="5506" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="5507" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fb14b0" id="5508" addr="0x7ff9f1fb14b0" />
-                                <attribute name="kind" value="function" id="5509" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="onScreensaverActivated" id="5510" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="5511" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="5512" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="void" id="5513" addr="0x7ff9f1fba9d0" />
-                                <attribute name="code" value="{ XBMC_TRACE; }" id="5514" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="5515" addr="0x7ff9f1fba9d0" />
-                                <attribute name="storage" value="virtual" id="5516" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="5517" addr="0x7ff9f1fb2050" >
-                            <attributelist id="5518" addr="0x7ff9f1fb2050" >
-                                <attribute name="name" value="onScreensaverDeactivated" id="5519" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="5520" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fb14b0" id="5521" addr="0x7ff9f1fb14b0" />
-                                <attribute name="kind" value="function" id="5522" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="onScreensaverDeactivated" id="5523" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="5524" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="5525" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="void" id="5526" addr="0x7ff9f1fba9d0" />
-                                <attribute name="code" value="{ XBMC_TRACE; }" id="5527" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="5528" addr="0x7ff9f1fba9d0" />
-                                <attribute name="storage" value="virtual" id="5529" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="5530" addr="0x7ff9f1fb2230" >
-                            <attributelist id="5531" addr="0x7ff9f1fb2230" >
-                                <attribute name="name" value="onDPMSActivated" id="5532" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="5533" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fb14b0" id="5534" addr="0x7ff9f1fb14b0" />
-                                <attribute name="kind" value="function" id="5535" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="onDPMSActivated" id="5536" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="5537" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="5538" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="void" id="5539" addr="0x7ff9f1fba9d0" />
-                                <attribute name="code" value="{ XBMC_TRACE; }" id="5540" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="5541" addr="0x7ff9f1fba9d0" />
-                                <attribute name="storage" value="virtual" id="5542" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="5543" addr="0x7ff9f1fb2410" >
-                            <attributelist id="5544" addr="0x7ff9f1fb2410" >
-                                <attribute name="name" value="onDPMSDeactivated" id="5545" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="5546" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fb14b0" id="5547" addr="0x7ff9f1fb14b0" />
-                                <attribute name="kind" value="function" id="5548" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="onDPMSDeactivated" id="5549" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="5550" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="5551" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="void" id="5552" addr="0x7ff9f1fba9d0" />
-                                <attribute name="code" value="{ XBMC_TRACE; }" id="5553" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="5554" addr="0x7ff9f1fba9d0" />
-                                <attribute name="storage" value="virtual" id="5555" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="5556" addr="0x7ff9f1fb2730" >
-                            <attributelist id="5557" addr="0x7ff9f1fb2730" >
-                                <attribute name="name" value="onScanStarted" id="5558" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="5559" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fb14b0" id="5560" addr="0x7ff9f1fb14b0" />
-                                <attribute name="kind" value="function" id="5561" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="onScanStarted" id="5562" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(q(const).XBMCAddon::String)." id="5563" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="5564" addr="0x7ff9f1fba9d0" />
-                                <parmlist id="5565" addr="0x7ff9f1fb2690" >
+                        <cdecl id="5491" addr="0x7fdf08508c90" >
+                            <attributelist id="5492" addr="0x7fdf08508c90" >
+                                <attribute name="name" value="onSettingsChanged" id="5493" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="5494" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf085084b0" id="5495" addr="0x7fdf085084b0" />
+                                <attribute name="kind" value="function" id="5496" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="onSettingsChanged" id="5497" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="5498" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="5499" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="void" id="5500" addr="0x7fdf085119d0" />
+                                <attribute name="code" value="{ XBMC_TRACE; }" id="5501" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="5502" addr="0x7fdf085119d0" />
+                                <attribute name="storage" value="virtual" id="5503" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="5504" addr="0x7fdf08508e70" >
+                            <attributelist id="5505" addr="0x7fdf08508e70" >
+                                <attribute name="name" value="onScreensaverActivated" id="5506" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="5507" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf085084b0" id="5508" addr="0x7fdf085084b0" />
+                                <attribute name="kind" value="function" id="5509" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="onScreensaverActivated" id="5510" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="5511" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="5512" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="void" id="5513" addr="0x7fdf085119d0" />
+                                <attribute name="code" value="{ XBMC_TRACE; }" id="5514" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="5515" addr="0x7fdf085119d0" />
+                                <attribute name="storage" value="virtual" id="5516" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="5517" addr="0x7fdf08509050" >
+                            <attributelist id="5518" addr="0x7fdf08509050" >
+                                <attribute name="name" value="onScreensaverDeactivated" id="5519" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="5520" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf085084b0" id="5521" addr="0x7fdf085084b0" />
+                                <attribute name="kind" value="function" id="5522" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="onScreensaverDeactivated" id="5523" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="5524" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="5525" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="void" id="5526" addr="0x7fdf085119d0" />
+                                <attribute name="code" value="{ XBMC_TRACE; }" id="5527" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="5528" addr="0x7fdf085119d0" />
+                                <attribute name="storage" value="virtual" id="5529" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="5530" addr="0x7fdf08509230" >
+                            <attributelist id="5531" addr="0x7fdf08509230" >
+                                <attribute name="name" value="onDPMSActivated" id="5532" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="5533" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf085084b0" id="5534" addr="0x7fdf085084b0" />
+                                <attribute name="kind" value="function" id="5535" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="onDPMSActivated" id="5536" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="5537" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="5538" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="void" id="5539" addr="0x7fdf085119d0" />
+                                <attribute name="code" value="{ XBMC_TRACE; }" id="5540" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="5541" addr="0x7fdf085119d0" />
+                                <attribute name="storage" value="virtual" id="5542" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="5543" addr="0x7fdf08509410" >
+                            <attributelist id="5544" addr="0x7fdf08509410" >
+                                <attribute name="name" value="onDPMSDeactivated" id="5545" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="5546" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf085084b0" id="5547" addr="0x7fdf085084b0" />
+                                <attribute name="kind" value="function" id="5548" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="onDPMSDeactivated" id="5549" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="5550" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="5551" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="void" id="5552" addr="0x7fdf085119d0" />
+                                <attribute name="code" value="{ XBMC_TRACE; }" id="5553" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="5554" addr="0x7fdf085119d0" />
+                                <attribute name="storage" value="virtual" id="5555" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="5556" addr="0x7fdf08509730" >
+                            <attributelist id="5557" addr="0x7fdf08509730" >
+                                <attribute name="name" value="onScanStarted" id="5558" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="5559" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf085084b0" id="5560" addr="0x7fdf085084b0" />
+                                <attribute name="kind" value="function" id="5561" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="onScanStarted" id="5562" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(q(const).XBMCAddon::String)." id="5563" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="5564" addr="0x7fdf085119d0" />
+                                <parmlist id="5565" addr="0x7fdf08509690" >
                                     <parm id="5566">
-                                        <attributelist id="5567" addr="0x7ff9f1fb2690" >
-                                            <attribute name="name" value="library" id="5568" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="q(const).XBMCAddon::String" id="5569" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="5567" addr="0x7fdf08509690" >
+                                            <attribute name="name" value="library" id="5568" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="q(const).XBMCAddon::String" id="5569" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="5570" addr="0x7ff9f1fba9d0" />
-                                <attribute name="code" value="{ XBMC_TRACE; }" id="5571" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="5572" addr="0x7ff9f1fba9d0" />
-                                <attribute name="storage" value="virtual" id="5573" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="5574" addr="0x7ff9f1fb2a70" >
-                            <attributelist id="5575" addr="0x7ff9f1fb2a70" >
-                                <attribute name="name" value="onScanFinished" id="5576" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="5577" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fb14b0" id="5578" addr="0x7ff9f1fb14b0" />
-                                <attribute name="kind" value="function" id="5579" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="onScanFinished" id="5580" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(q(const).XBMCAddon::String)." id="5581" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="5582" addr="0x7ff9f1fba9d0" />
-                                <parmlist id="5583" addr="0x7ff9f1fb29d0" >
+                                <attribute name="type" value="void" id="5570" addr="0x7fdf085119d0" />
+                                <attribute name="code" value="{ XBMC_TRACE; }" id="5571" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="5572" addr="0x7fdf085119d0" />
+                                <attribute name="storage" value="virtual" id="5573" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="5574" addr="0x7fdf08509a70" >
+                            <attributelist id="5575" addr="0x7fdf08509a70" >
+                                <attribute name="name" value="onScanFinished" id="5576" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="5577" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf085084b0" id="5578" addr="0x7fdf085084b0" />
+                                <attribute name="kind" value="function" id="5579" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="onScanFinished" id="5580" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(q(const).XBMCAddon::String)." id="5581" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="5582" addr="0x7fdf085119d0" />
+                                <parmlist id="5583" addr="0x7fdf085099d0" >
                                     <parm id="5584">
-                                        <attributelist id="5585" addr="0x7ff9f1fb29d0" >
-                                            <attribute name="name" value="library" id="5586" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="q(const).XBMCAddon::String" id="5587" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="5585" addr="0x7fdf085099d0" >
+                                            <attribute name="name" value="library" id="5586" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="q(const).XBMCAddon::String" id="5587" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="5588" addr="0x7ff9f1fba9d0" />
-                                <attribute name="code" value="{ XBMC_TRACE; }" id="5589" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="5590" addr="0x7ff9f1fba9d0" />
-                                <attribute name="storage" value="virtual" id="5591" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="5592" addr="0x7ff9f1fb2d90" >
-                            <attributelist id="5593" addr="0x7ff9f1fb2d90" >
-                                <attribute name="name" value="onDatabaseScanStarted" id="5594" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="5595" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fb14b0" id="5596" addr="0x7ff9f1fb14b0" />
-                                <attribute name="kind" value="function" id="5597" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="onDatabaseScanStarted" id="5598" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(q(const).XBMCAddon::String)." id="5599" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="5600" addr="0x7ff9f1fba9d0" />
-                                <parmlist id="5601" addr="0x7ff9f1fb2cf0" >
+                                <attribute name="type" value="void" id="5588" addr="0x7fdf085119d0" />
+                                <attribute name="code" value="{ XBMC_TRACE; }" id="5589" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="5590" addr="0x7fdf085119d0" />
+                                <attribute name="storage" value="virtual" id="5591" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="5592" addr="0x7fdf08509d90" >
+                            <attributelist id="5593" addr="0x7fdf08509d90" >
+                                <attribute name="name" value="onDatabaseScanStarted" id="5594" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="5595" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf085084b0" id="5596" addr="0x7fdf085084b0" />
+                                <attribute name="kind" value="function" id="5597" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="onDatabaseScanStarted" id="5598" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(q(const).XBMCAddon::String)." id="5599" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="5600" addr="0x7fdf085119d0" />
+                                <parmlist id="5601" addr="0x7fdf08509cf0" >
                                     <parm id="5602">
-                                        <attributelist id="5603" addr="0x7ff9f1fb2cf0" >
-                                            <attribute name="name" value="database" id="5604" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="q(const).XBMCAddon::String" id="5605" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="5603" addr="0x7fdf08509cf0" >
+                                            <attribute name="name" value="database" id="5604" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="q(const).XBMCAddon::String" id="5605" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="5606" addr="0x7ff9f1fba9d0" />
-                                <attribute name="code" value="{ XBMC_TRACE; }" id="5607" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="5608" addr="0x7ff9f1fba9d0" />
-                                <attribute name="storage" value="virtual" id="5609" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="5610" addr="0x7ff9f1fb30b0" >
-                            <attributelist id="5611" addr="0x7ff9f1fb30b0" >
-                                <attribute name="name" value="onDatabaseUpdated" id="5612" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="5613" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fb14b0" id="5614" addr="0x7ff9f1fb14b0" />
-                                <attribute name="kind" value="function" id="5615" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="onDatabaseUpdated" id="5616" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(q(const).XBMCAddon::String)." id="5617" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="5618" addr="0x7ff9f1fba9d0" />
-                                <parmlist id="5619" addr="0x7ff9f1fb3010" >
+                                <attribute name="type" value="void" id="5606" addr="0x7fdf085119d0" />
+                                <attribute name="code" value="{ XBMC_TRACE; }" id="5607" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="5608" addr="0x7fdf085119d0" />
+                                <attribute name="storage" value="virtual" id="5609" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="5610" addr="0x7fdf0850a0b0" >
+                            <attributelist id="5611" addr="0x7fdf0850a0b0" >
+                                <attribute name="name" value="onDatabaseUpdated" id="5612" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="5613" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf085084b0" id="5614" addr="0x7fdf085084b0" />
+                                <attribute name="kind" value="function" id="5615" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="onDatabaseUpdated" id="5616" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(q(const).XBMCAddon::String)." id="5617" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="5618" addr="0x7fdf085119d0" />
+                                <parmlist id="5619" addr="0x7fdf0850a010" >
                                     <parm id="5620">
-                                        <attributelist id="5621" addr="0x7ff9f1fb3010" >
-                                            <attribute name="name" value="database" id="5622" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="q(const).XBMCAddon::String" id="5623" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="5621" addr="0x7fdf0850a010" >
+                                            <attribute name="name" value="database" id="5622" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="q(const).XBMCAddon::String" id="5623" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="5624" addr="0x7ff9f1fba9d0" />
-                                <attribute name="code" value="{ XBMC_TRACE; }" id="5625" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="5626" addr="0x7ff9f1fba9d0" />
-                                <attribute name="storage" value="virtual" id="5627" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="5628" addr="0x7ff9f1fb33d0" >
-                            <attributelist id="5629" addr="0x7ff9f1fb33d0" >
-                                <attribute name="name" value="onCleanStarted" id="5630" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="5631" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fb14b0" id="5632" addr="0x7ff9f1fb14b0" />
-                                <attribute name="kind" value="function" id="5633" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="onCleanStarted" id="5634" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(q(const).XBMCAddon::String)." id="5635" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="5636" addr="0x7ff9f1fba9d0" />
-                                <parmlist id="5637" addr="0x7ff9f1fb3330" >
+                                <attribute name="type" value="void" id="5624" addr="0x7fdf085119d0" />
+                                <attribute name="code" value="{ XBMC_TRACE; }" id="5625" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="5626" addr="0x7fdf085119d0" />
+                                <attribute name="storage" value="virtual" id="5627" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="5628" addr="0x7fdf0850a3d0" >
+                            <attributelist id="5629" addr="0x7fdf0850a3d0" >
+                                <attribute name="name" value="onCleanStarted" id="5630" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="5631" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf085084b0" id="5632" addr="0x7fdf085084b0" />
+                                <attribute name="kind" value="function" id="5633" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="onCleanStarted" id="5634" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(q(const).XBMCAddon::String)." id="5635" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="5636" addr="0x7fdf085119d0" />
+                                <parmlist id="5637" addr="0x7fdf0850a330" >
                                     <parm id="5638">
-                                        <attributelist id="5639" addr="0x7ff9f1fb3330" >
-                                            <attribute name="name" value="library" id="5640" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="q(const).XBMCAddon::String" id="5641" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="5639" addr="0x7fdf0850a330" >
+                                            <attribute name="name" value="library" id="5640" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="q(const).XBMCAddon::String" id="5641" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="5642" addr="0x7ff9f1fba9d0" />
-                                <attribute name="code" value="{ XBMC_TRACE; }" id="5643" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="5644" addr="0x7ff9f1fba9d0" />
-                                <attribute name="storage" value="virtual" id="5645" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="5646" addr="0x7ff9f1fb36f0" >
-                            <attributelist id="5647" addr="0x7ff9f1fb36f0" >
-                                <attribute name="name" value="onCleanFinished" id="5648" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="5649" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fb14b0" id="5650" addr="0x7ff9f1fb14b0" />
-                                <attribute name="kind" value="function" id="5651" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="onCleanFinished" id="5652" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(q(const).XBMCAddon::String)." id="5653" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="5654" addr="0x7ff9f1fba9d0" />
-                                <parmlist id="5655" addr="0x7ff9f1fb3650" >
+                                <attribute name="type" value="void" id="5642" addr="0x7fdf085119d0" />
+                                <attribute name="code" value="{ XBMC_TRACE; }" id="5643" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="5644" addr="0x7fdf085119d0" />
+                                <attribute name="storage" value="virtual" id="5645" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="5646" addr="0x7fdf0850a6f0" >
+                            <attributelist id="5647" addr="0x7fdf0850a6f0" >
+                                <attribute name="name" value="onCleanFinished" id="5648" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="5649" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf085084b0" id="5650" addr="0x7fdf085084b0" />
+                                <attribute name="kind" value="function" id="5651" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="onCleanFinished" id="5652" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(q(const).XBMCAddon::String)." id="5653" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="5654" addr="0x7fdf085119d0" />
+                                <parmlist id="5655" addr="0x7fdf0850a650" >
                                     <parm id="5656">
-                                        <attributelist id="5657" addr="0x7ff9f1fb3650" >
-                                            <attribute name="name" value="library" id="5658" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="q(const).XBMCAddon::String" id="5659" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="5657" addr="0x7fdf0850a650" >
+                                            <attribute name="name" value="library" id="5658" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="q(const).XBMCAddon::String" id="5659" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="5660" addr="0x7ff9f1fba9d0" />
-                                <attribute name="code" value="{ XBMC_TRACE; }" id="5661" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="5662" addr="0x7ff9f1fba9d0" />
-                                <attribute name="storage" value="virtual" id="5663" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="5664" addr="0x7ff9f1fb38d0" >
-                            <attributelist id="5665" addr="0x7ff9f1fb38d0" >
-                                <attribute name="name" value="onAbortRequested" id="5666" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="5667" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fb14b0" id="5668" addr="0x7ff9f1fb14b0" />
-                                <attribute name="kind" value="function" id="5669" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="onAbortRequested" id="5670" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="5671" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="5672" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="void" id="5673" addr="0x7ff9f1fba9d0" />
-                                <attribute name="code" value="{ XBMC_TRACE; }" id="5674" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="5675" addr="0x7ff9f1fba9d0" />
-                                <attribute name="storage" value="virtual" id="5676" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="5677" addr="0x7ff9f1fb3e70" >
-                            <attributelist id="5678" addr="0x7ff9f1fb3e70" >
-                                <attribute name="name" value="onNotification" id="5679" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="5680" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fb14b0" id="5681" addr="0x7ff9f1fb14b0" />
-                                <attribute name="kind" value="function" id="5682" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="onNotification" id="5683" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(q(const).XBMCAddon::String,q(const).XBMCAddon::String,q(const).XBMCAddon::String)." id="5684" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="5685" addr="0x7ff9f1fba9d0" />
-                                <parmlist id="5686" addr="0x7ff9f1fb3b50" >
+                                <attribute name="type" value="void" id="5660" addr="0x7fdf085119d0" />
+                                <attribute name="code" value="{ XBMC_TRACE; }" id="5661" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="5662" addr="0x7fdf085119d0" />
+                                <attribute name="storage" value="virtual" id="5663" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="5664" addr="0x7fdf0850a8d0" >
+                            <attributelist id="5665" addr="0x7fdf0850a8d0" >
+                                <attribute name="name" value="onAbortRequested" id="5666" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="5667" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf085084b0" id="5668" addr="0x7fdf085084b0" />
+                                <attribute name="kind" value="function" id="5669" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="onAbortRequested" id="5670" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="5671" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="5672" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="void" id="5673" addr="0x7fdf085119d0" />
+                                <attribute name="code" value="{ XBMC_TRACE; }" id="5674" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="5675" addr="0x7fdf085119d0" />
+                                <attribute name="storage" value="virtual" id="5676" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="5677" addr="0x7fdf0850ae70" >
+                            <attributelist id="5678" addr="0x7fdf0850ae70" >
+                                <attribute name="name" value="onNotification" id="5679" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="5680" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf085084b0" id="5681" addr="0x7fdf085084b0" />
+                                <attribute name="kind" value="function" id="5682" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="onNotification" id="5683" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(q(const).XBMCAddon::String,q(const).XBMCAddon::String,q(const).XBMCAddon::String)." id="5684" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="5685" addr="0x7fdf085119d0" />
+                                <parmlist id="5686" addr="0x7fdf0850ab50" >
                                     <parm id="5687">
-                                        <attributelist id="5688" addr="0x7ff9f1fb3b50" >
-                                            <attribute name="name" value="sender" id="5689" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="q(const).XBMCAddon::String" id="5690" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="5688" addr="0x7fdf0850ab50" >
+                                            <attribute name="name" value="sender" id="5689" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="q(const).XBMCAddon::String" id="5690" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5691">
-                                        <attributelist id="5692" addr="0x7ff9f1fb3c90" >
-                                            <attribute name="name" value="method" id="5693" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="q(const).XBMCAddon::String" id="5694" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="5692" addr="0x7fdf0850ac90" >
+                                            <attribute name="name" value="method" id="5693" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="q(const).XBMCAddon::String" id="5694" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5695">
-                                        <attributelist id="5696" addr="0x7ff9f1fb3dd0" >
-                                            <attribute name="name" value="data" id="5697" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="q(const).XBMCAddon::String" id="5698" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="5696" addr="0x7fdf0850add0" >
+                                            <attribute name="name" value="data" id="5697" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="q(const).XBMCAddon::String" id="5698" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="5699" addr="0x7ff9f1fba9d0" />
-                                <attribute name="code" value="{ XBMC_TRACE; }" id="5700" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="5701" addr="0x7ff9f1fba9d0" />
-                                <attribute name="storage" value="virtual" id="5702" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="5703" addr="0x7ff9f1fb41f0" >
-                            <attributelist id="5704" addr="0x7ff9f1fb41f0" >
-                                <attribute name="name" value="waitForAbort" id="5705" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="5706" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fb14b0" id="5707" addr="0x7ff9f1fb14b0" />
-                                <attribute name="sym_nextSibling" value="0x7ff9f1fb42f0" id="5708" addr="0x7ff9f1fb42f0" />
-                                <attribute name="csym_nextSibling" value="0x7ff9f1fb42f0" id="5709" addr="0x7ff9f1fb42f0" />
-                                <attribute name="kind" value="function" id="5710" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="waitForAbort" id="5711" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f(double)." id="5712" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="5713" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overloaded" value="0x7ff9f1fb41f0" id="5714" addr="0x7ff9f1fb41f0" />
-                                <parmlist id="5715" addr="0x7ff9f1fb4130" >
+                                <attribute name="type" value="void" id="5699" addr="0x7fdf085119d0" />
+                                <attribute name="code" value="{ XBMC_TRACE; }" id="5700" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="5701" addr="0x7fdf085119d0" />
+                                <attribute name="storage" value="virtual" id="5702" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="5703" addr="0x7fdf0850b1f0" >
+                            <attributelist id="5704" addr="0x7fdf0850b1f0" >
+                                <attribute name="name" value="waitForAbort" id="5705" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="5706" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf085084b0" id="5707" addr="0x7fdf085084b0" />
+                                <attribute name="sym_nextSibling" value="0x7fdf0850b2f0" id="5708" addr="0x7fdf0850b2f0" />
+                                <attribute name="csym_nextSibling" value="0x7fdf0850b2f0" id="5709" addr="0x7fdf0850b2f0" />
+                                <attribute name="kind" value="function" id="5710" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="waitForAbort" id="5711" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f(double)." id="5712" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="5713" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overloaded" value="0x7fdf0850b1f0" id="5714" addr="0x7fdf0850b1f0" />
+                                <parmlist id="5715" addr="0x7fdf0850b130" >
                                     <parm id="5716">
-                                        <attributelist id="5717" addr="0x7ff9f1fb4130" >
-                                            <attribute name="name" value="timeout" id="5718" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="value" value="-1" id="5719" addr="0x7ff9f1fba9d0" />
-                                            <attribute name="type" value="double" id="5720" addr="0x7ff9f1fba9d0" />
+                                        <attributelist id="5717" addr="0x7fdf0850b130" >
+                                            <attribute name="name" value="timeout" id="5718" addr="0x7fdf085119d0" />
+                                            <attribute name="value" value="-1" id="5719" addr="0x7fdf085119d0" />
+                                            <attribute name="type" value="double" id="5720" addr="0x7fdf085119d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="bool" id="5721" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="5722" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="5723" addr="0x7ff9f1fb42f0" >
-                            <attributelist id="5724" addr="0x7ff9f1fb42f0" >
-                                <attribute name="name" value="waitForAbort" id="5725" addr="0x7ff9f1fba9d0" />
-                                <attribute name="ismember" value="1" id="5726" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fb14b0" id="5727" addr="0x7ff9f1fb14b0" />
-                                <attribute name="sym_previousSibling" value="0x7ff9f1fb41f0" id="5728" addr="0x7ff9f1fb41f0" />
-                                <attribute name="kind" value="function" id="5729" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="waitForAbort" id="5730" addr="0x7ff9f1fba9d0" />
-                                <attribute name="defaultargs" value="0x7ff9f1fb41f0" id="5731" addr="0x7ff9f1fb41f0" />
-                                <attribute name="decl" value="f()." id="5732" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="5733" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overloaded" value="0x7ff9f1fb41f0" id="5734" addr="0x7ff9f1fb41f0" />
-                                <attribute name="type" value="bool" id="5735" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="5736" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="5737" addr="0x7ff9f1fb44d0" >
-                            <attributelist id="5738" addr="0x7ff9f1fb44d0" >
-                                <attribute name="ismember" value="1" id="5739" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="abortRequested" id="5740" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="abortRequested" id="5741" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="5742" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="5743" addr="0x7ff9f1fba9d0" />
-                                <attribute name="kind" value="function" id="5744" addr="0x7ff9f1fba9d0" />
-                                <attribute name="type" value="bool" id="5745" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fb14b0" id="5746" addr="0x7ff9f1fb14b0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="5747" addr="0x7ff9f1fba9d0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <destructor id="5748" addr="0x7ff9f1fb4650" >
-                            <attributelist id="5749" addr="0x7ff9f1fb4650" >
-                                <attribute name="ismember" value="1" id="5750" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_name" value="~Monitor" id="5751" addr="0x7ff9f1fba9d0" />
-                                <attribute name="name" value="~Monitor" id="5752" addr="0x7ff9f1fba9d0" />
-                                <attribute name="decl" value="f()." id="5753" addr="0x7ff9f1fba9d0" />
-                                <attribute name="access" value="public" id="5754" addr="0x7ff9f1fba9d0" />
-                                <attribute name="sym_symtab" value="0x7ff9f1fb14b0" id="5755" addr="0x7ff9f1fb14b0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="5756" addr="0x7ff9f1fba9d0" />
+                                <attribute name="type" value="bool" id="5721" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="5722" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="5723" addr="0x7fdf0850b2f0" >
+                            <attributelist id="5724" addr="0x7fdf0850b2f0" >
+                                <attribute name="name" value="waitForAbort" id="5725" addr="0x7fdf085119d0" />
+                                <attribute name="ismember" value="1" id="5726" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf085084b0" id="5727" addr="0x7fdf085084b0" />
+                                <attribute name="sym_previousSibling" value="0x7fdf0850b1f0" id="5728" addr="0x7fdf0850b1f0" />
+                                <attribute name="kind" value="function" id="5729" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="waitForAbort" id="5730" addr="0x7fdf085119d0" />
+                                <attribute name="defaultargs" value="0x7fdf0850b1f0" id="5731" addr="0x7fdf0850b1f0" />
+                                <attribute name="decl" value="f()." id="5732" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="5733" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overloaded" value="0x7fdf0850b1f0" id="5734" addr="0x7fdf0850b1f0" />
+                                <attribute name="type" value="bool" id="5735" addr="0x7fdf085119d0" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="5736" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="5737" addr="0x7fdf0850b4d0" >
+                            <attributelist id="5738" addr="0x7fdf0850b4d0" >
+                                <attribute name="ismember" value="1" id="5739" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="abortRequested" id="5740" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="abortRequested" id="5741" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="5742" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="5743" addr="0x7fdf085119d0" />
+                                <attribute name="kind" value="function" id="5744" addr="0x7fdf085119d0" />
+                                <attribute name="type" value="bool" id="5745" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf085084b0" id="5746" addr="0x7fdf085084b0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="5747" addr="0x7fdf085119d0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <destructor id="5748" addr="0x7fdf0850b650" >
+                            <attributelist id="5749" addr="0x7fdf0850b650" >
+                                <attribute name="ismember" value="1" id="5750" addr="0x7fdf085119d0" />
+                                <attribute name="sym_name" value="~Monitor" id="5751" addr="0x7fdf085119d0" />
+                                <attribute name="name" value="~Monitor" id="5752" addr="0x7fdf085119d0" />
+                                <attribute name="decl" value="f()." id="5753" addr="0x7fdf085119d0" />
+                                <attribute name="access" value="public" id="5754" addr="0x7fdf085119d0" />
+                                <attribute name="sym_symtab" value="0x7fdf085084b0" id="5755" addr="0x7fdf085084b0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="5756" addr="0x7fdf085119d0" />
                             </attributelist >
                          
                         </destructor >
diff --git a/srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmcaddon.i.cpp b/srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmcaddon.i.cpp
similarity index 99%
rename from srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmcaddon.i.cpp
rename to srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmcaddon.i.cpp
index 62b0ba1e8cf..52eaa678f3a 100644
--- a/srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmcaddon.i.cpp
+++ b/srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmcaddon.i.cpp
@@ -927,7 +927,7 @@ namespace PythonBindings
 
    // constants
    PyModule_AddStringConstant(module, "__author__", "Team Kodi <http://kodi.tv>");
-   PyModule_AddStringConstant(module, "__date__", "Wed Jun 19 18:36:44 GMT 2019");
+   PyModule_AddStringConstant(module, "__date__", "Sun Sep 01 10:46:50 GMT 2019");
    PyModule_AddStringConstant(module, "__version__", "2.26.0");
    PyModule_AddStringConstant(module, "__credits__", "Team Kodi");
    PyModule_AddStringConstant(module, "__platform__", "ALL");
diff --git a/srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmcaddon.i.xml b/srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmcaddon.i.xml
similarity index 58%
rename from srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmcaddon.i.xml
rename to srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmcaddon.i.xml
index cd93caf78bc..a6cd368b8ac 100644
--- a/srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmcaddon.i.xml
+++ b/srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmcaddon.i.xml
@@ -1,141 +1,141 @@
 <?xml version="1.0" ?> 
-<top id="1" addr="0x7f0bacb21b30" >
-    <attributelist id="2" addr="0x7f0bacb21b30" >
-        <attribute name="outfile" value="AddonModuleXbmcaddon.i.xml" id="3" addr="0x7f0bacb3d530" />
-        <attribute name="name" value="xbmcaddon" id="4" addr="0x7f0bacb3d530" />
-        <attribute name="module" value="xbmcaddon" id="5" addr="0x7f0bacb36fd0" />
-        <attribute name="inputfile" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmcaddon.i" id="6" addr="0x7f0bacb3d530" />
-        <attribute name="classes" value="0x7f0bacb34590" id="7" addr="0x7f0bacb34590" />
-        <attribute name="infile" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmcaddon.i" id="8" addr="0x7f0bacb3d530" />
-        <attribute name="outfile_h" value="AddonModuleXbmcaddon.i.h" id="9" addr="0x7f0bacb3d530" />
+<top id="1" addr="0x7f136da18b30" >
+    <attributelist id="2" addr="0x7f136da18b30" >
+        <attribute name="outfile" value="AddonModuleXbmcaddon.i.xml" id="3" addr="0x7f136da34530" />
+        <attribute name="name" value="xbmcaddon" id="4" addr="0x7f136da34530" />
+        <attribute name="module" value="xbmcaddon" id="5" addr="0x7f136da2dfd0" />
+        <attribute name="inputfile" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmcaddon.i" id="6" addr="0x7f136da34530" />
+        <attribute name="classes" value="0x7f136da2b590" id="7" addr="0x7f136da2b590" />
+        <attribute name="infile" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmcaddon.i" id="8" addr="0x7f136da34530" />
+        <attribute name="outfile_h" value="AddonModuleXbmcaddon.i.h" id="9" addr="0x7f136da34530" />
     </attributelist >
 
-    <include id="10" addr="0x7f0bacb31ed0" >
-        <attributelist id="11" addr="0x7f0bacb31ed0" >
-            <attribute name="name" value="/usr/share/swig/3.0.12/swig.swg" id="12" addr="0x7f0bacb3d530" />
+    <include id="10" addr="0x7f136da28ed0" >
+        <attributelist id="11" addr="0x7f136da28ed0" >
+            <attribute name="name" value="/usr/share/swig/3.0.12/swig.swg" id="12" addr="0x7f136da34530" />
         </attributelist >
 
-        <include id="13" addr="0x7f0bacb31f30" >
-            <attributelist id="14" addr="0x7f0bacb31f30" >
-                <attribute name="name" value="/usr/share/swig/3.0.12/swigwarnings.swg" id="15" addr="0x7f0bacb3d530" />
+        <include id="13" addr="0x7f136da28f30" >
+            <attributelist id="14" addr="0x7f136da28f30" >
+                <attribute name="name" value="/usr/share/swig/3.0.12/swigwarnings.swg" id="15" addr="0x7f136da34530" />
             </attributelist >
 
-            <include id="16" addr="0x7f0bacb32050" >
-                <attributelist id="17" addr="0x7f0bacb32050" >
-                    <attribute name="name" value="/usr/share/swig/3.0.12/swigwarn.swg" id="18" addr="0x7f0bacb3d530" />
+            <include id="16" addr="0x7f136da29050" >
+                <attributelist id="17" addr="0x7f136da29050" >
+                    <attribute name="name" value="/usr/share/swig/3.0.12/swigwarn.swg" id="18" addr="0x7f136da34530" />
                 </attributelist >
              
             </include >
         </include >
-        <namespace id="19" addr="0x7f0bacb340b0" >
-            <attributelist id="20" addr="0x7f0bacb340b0" >
-                <attribute name="sym_name" value="std" id="21" addr="0x7f0bacb3d530" />
-                <attribute name="name" value="std" id="22" addr="0x7f0bacb3d530" />
-                <typescope id="23" addr="0x7f0bacb3c1d0" >
-                    <attributelist id="24" addr="0x7f0bacb3c1d0" >
-                        <attribute name="name" value="std" id="25" addr="0x7f0bacb3d530" />
-                        <typetab id="26" addr="0x7f0bacb3c1f0" >
-                            <attributelist id="27" addr="0x7f0bacb3c1f0" >
-                                <attribute name="initializer_list" value="initializer_list" id="28" addr="0x7f0bacb3d530" />
+        <namespace id="19" addr="0x7f136da2b0b0" >
+            <attributelist id="20" addr="0x7f136da2b0b0" >
+                <attribute name="sym_name" value="std" id="21" addr="0x7f136da34530" />
+                <attribute name="name" value="std" id="22" addr="0x7f136da34530" />
+                <typescope id="23" addr="0x7f136da331d0" >
+                    <attributelist id="24" addr="0x7f136da331d0" >
+                        <attribute name="name" value="std" id="25" addr="0x7f136da34530" />
+                        <typetab id="26" addr="0x7f136da331f0" >
+                            <attributelist id="27" addr="0x7f136da331f0" >
+                                <attribute name="initializer_list" value="initializer_list" id="28" addr="0x7f136da34530" />
                             </attributelist >
-                            <typetabsitem id="29" addr="0x7f0bacb3c310" >
-                                <attributelist id="30" addr="0x7f0bacb3c310" >
+                            <typetabsitem id="29" addr="0x7f136da33310" >
+                                <attributelist id="30" addr="0x7f136da33310" >
                                 </attributelist >
                             </typetabsitem >
                         </typetab >
-                        <attribute name="parent" value="0x7f0bacb20a30" id="31" addr="0x7f0bacb20a30" />
-                        <attribute name="qname" value="std" id="32" addr="0x7f0bacb3d530" />
-                        <attribute name="symtab" value="0x7f0bacb34010" id="33" addr="0x7f0bacb34010" />
+                        <attribute name="parent" value="0x7f136da17a30" id="31" addr="0x7f136da17a30" />
+                        <attribute name="qname" value="std" id="32" addr="0x7f136da34530" />
+                        <attribute name="symtab" value="0x7f136da2b010" id="33" addr="0x7f136da2b010" />
                     </attributelist >
-                    <typescopesitem id="34" addr="0x7f0bacb33f70" >
-                        <attributelist id="35" addr="0x7f0bacb33f70" >
+                    <typescopesitem id="34" addr="0x7f136da2af70" >
+                        <attributelist id="35" addr="0x7f136da2af70" >
                         </attributelist >
                     </typescopesitem >
-                    <typescopesitem id="36" addr="0x7f0bacb3c1f0" >
-                        <attributelist id="37" addr="0x7f0bacb3c1f0" >
-                            <attribute name="initializer_list" value="initializer_list" id="38" addr="0x7f0bacb3d530" />
+                    <typescopesitem id="36" addr="0x7f136da331f0" >
+                        <attributelist id="37" addr="0x7f136da331f0" >
+                            <attribute name="initializer_list" value="initializer_list" id="38" addr="0x7f136da34530" />
                         </attributelist >
                     </typescopesitem >
-                    <typescopesitem id="39" addr="0x7f0bacb20a30" >
-                        <attributelist id="40" addr="0x7f0bacb20a30" >
-                            <attribute name="name" value="" id="41" addr="0x7f0bacb3d530" />
-                            <typetab id="42" addr="0x7f0bacb20a90" >
-                                <attributelist id="43" addr="0x7f0bacb20a90" >
+                    <typescopesitem id="39" addr="0x7f136da17a30" >
+                        <attributelist id="40" addr="0x7f136da17a30" >
+                            <attribute name="name" value="" id="41" addr="0x7f136da34530" />
+                            <typetab id="42" addr="0x7f136da17a90" >
+                                <attributelist id="43" addr="0x7f136da17a90" >
                                 </attributelist >
                             </typetab >
                         </attributelist >
                     </typescopesitem >
-                    <typescopesitem id="44" addr="0x7f0bacb3c210" >
-                        <attributelist id="45" addr="0x7f0bacb3c210" >
+                    <typescopesitem id="44" addr="0x7f136da33210" >
+                        <attributelist id="45" addr="0x7f136da33210" >
                         </attributelist >
                     </typescopesitem >
-                    <typescopesitem id="46" addr="0x7f0bacb34010" >
-                        <attributelist id="47" addr="0x7f0bacb34010" >
-                            <attribute name="name" value="std" id="48" addr="0x7f0bacb3d530" />
-                            <attribute name="csymtab" value="0x7f0bacb34050" id="49" addr="0x7f0bacb34050" />
-                            <attribute name="symtab" value="0x7f0bacb33ff0" id="50" addr="0x7f0bacb33ff0" />
+                    <typescopesitem id="46" addr="0x7f136da2b010" >
+                        <attributelist id="47" addr="0x7f136da2b010" >
+                            <attribute name="name" value="std" id="48" addr="0x7f136da34530" />
+                            <attribute name="csymtab" value="0x7f136da2b050" id="49" addr="0x7f136da2b050" />
+                            <attribute name="symtab" value="0x7f136da2aff0" id="50" addr="0x7f136da2aff0" />
                         </attributelist >
                     </typescopesitem >
                 </typescope >
-                <attribute name="symtab" value="0x7f0bacb34010" id="51" addr="0x7f0bacb34010" />
-                <attribute name="sym_symtab" value="0x7f0bacb20950" id="52" addr="0x7f0bacb20950" />
-                <attribute name="sym_overname" value="__SWIG_0" id="53" addr="0x7f0bacb3d530" />
+                <attribute name="symtab" value="0x7f136da2b010" id="51" addr="0x7f136da2b010" />
+                <attribute name="sym_symtab" value="0x7f136da17950" id="52" addr="0x7f136da17950" />
+                <attribute name="sym_overname" value="__SWIG_0" id="53" addr="0x7f136da34530" />
             </attributelist >
 
-            <template id="54" addr="0x7f0bacb34230" >
-                <attributelist id="55" addr="0x7f0bacb34230" >
-                    <attribute name="templatetype" value="class" id="56" addr="0x7f0bacb3d530" />
-                    <attribute name="sym_typename" value="1" id="57" addr="0x7f0bacb3d530" />
-                    <attribute name="name" value="initializer_list" id="58" addr="0x7f0bacb3d530" />
-                    <attribute name="sym_symtab" value="0x7f0bacb34010" id="59" addr="0x7f0bacb34010" />
-                    <attribute name="symtab" value="0x7f0bacb34450" id="60" addr="0x7f0bacb34450" />
-                    <attribute name="allows_typedef" value="1" id="61" addr="0x7f0bacb3d530" />
-                    <attribute name="kind" value="class" id="62" addr="0x7f0bacb3d530" />
-                    <attribute name="sym_name" value="initializer_list" id="63" addr="0x7f0bacb3d530" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="64" addr="0x7f0bacb3d530" />
-                    <templateparms id="65" addr="0x7f0bacb34150" >
+            <template id="54" addr="0x7f136da2b230" >
+                <attributelist id="55" addr="0x7f136da2b230" >
+                    <attribute name="templatetype" value="class" id="56" addr="0x7f136da34530" />
+                    <attribute name="sym_typename" value="1" id="57" addr="0x7f136da34530" />
+                    <attribute name="name" value="initializer_list" id="58" addr="0x7f136da34530" />
+                    <attribute name="sym_symtab" value="0x7f136da2b010" id="59" addr="0x7f136da2b010" />
+                    <attribute name="symtab" value="0x7f136da2b450" id="60" addr="0x7f136da2b450" />
+                    <attribute name="allows_typedef" value="1" id="61" addr="0x7f136da34530" />
+                    <attribute name="kind" value="class" id="62" addr="0x7f136da34530" />
+                    <attribute name="sym_name" value="initializer_list" id="63" addr="0x7f136da34530" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="64" addr="0x7f136da34530" />
+                    <templateparms id="65" addr="0x7f136da2b150" >
                         <parm id="66">
-                            <attributelist id="67" addr="0x7f0bacb34150" >
-                                <attribute name="name" value="T" id="68" addr="0x7f0bacb3d530" />
-                                <attribute name="type" value="typename T" id="69" addr="0x7f0bacb3d530" />
+                            <attributelist id="67" addr="0x7f136da2b150" >
+                                <attribute name="name" value="T" id="68" addr="0x7f136da34530" />
+                                <attribute name="type" value="typename T" id="69" addr="0x7f136da34530" />
                             </attributelist >
                         </parm >
                     </templateparms >
                 </attributelist >
 
-                <access id="70" addr="0x7f0bacb34610" >
-                    <attributelist id="71" addr="0x7f0bacb34610" >
-                        <attribute name="kind" value="public" id="72" addr="0x7f0bacb3d530" />
+                <access id="70" addr="0x7f136da2b610" >
+                    <attributelist id="71" addr="0x7f136da2b610" >
+                        <attribute name="kind" value="public" id="72" addr="0x7f136da34530" />
                     </attributelist >
                  
                 </access >
             </template >
-            <typemap id="73" addr="0x7f0bacb34c70" >
-                <attributelist id="74" addr="0x7f0bacb34c70" >
-                    <kwargs id="75" addr="0x7f0bacb34970" >
-                        <attributelist id="76" addr="0x7f0bacb34970" >
-                            <attribute name="name" value="warning" id="77" addr="0x7f0bacb3d530" />
-                            <attribute name="value" value="476:Initialization using std::initializer_list." id="78" addr="0x7f0bacb3d530" />
+            <typemap id="73" addr="0x7f136da2bc70" >
+                <attributelist id="74" addr="0x7f136da2bc70" >
+                    <kwargs id="75" addr="0x7f136da2b970" >
+                        <attributelist id="76" addr="0x7f136da2b970" >
+                            <attribute name="name" value="warning" id="77" addr="0x7f136da34530" />
+                            <attribute name="value" value="476:Initialization using std::initializer_list." id="78" addr="0x7f136da34530" />
                         </attributelist >
-                        <kwargssitem id="79" addr="0x7f0bacb34af0" >
-                            <attributelist id="80" addr="0x7f0bacb34af0" >
+                        <kwargssitem id="79" addr="0x7f136da2baf0" >
+                            <attributelist id="80" addr="0x7f136da2baf0" >
                             </attributelist >
                         </kwargssitem >
-                        <kwargssitem id="81" addr="0x7f0bacb34950" >
-                            <attributelist id="82" addr="0x7f0bacb34950" >
+                        <kwargssitem id="81" addr="0x7f136da2b950" >
+                            <attributelist id="82" addr="0x7f136da2b950" >
                             </attributelist >
                         </kwargssitem >
                     </kwargs >
-                    <attribute name="code" value="" id="83" addr="0x7f0bacb3d530" />
-                    <attribute name="method" value="in" id="84" addr="0x7f0bacb3d530" />
+                    <attribute name="code" value="" id="83" addr="0x7f136da34530" />
+                    <attribute name="method" value="in" id="84" addr="0x7f136da34530" />
                 </attributelist >
 
-                <typemapitem id="85" addr="0x7f0bacb34b90" >
-                    <attributelist id="86" addr="0x7f0bacb34b90" >
-                        <parmlist id="87" addr="0x7f0bacb34bd0" >
+                <typemapitem id="85" addr="0x7f136da2bb90" >
+                    <attributelist id="86" addr="0x7f136da2bb90" >
+                        <parmlist id="87" addr="0x7f136da2bbd0" >
                             <parm id="88">
-                                <attributelist id="89" addr="0x7f0bacb34bd0" >
-                                    <attribute name="type" value="std::initializer_list&lt;(T)>" id="90" addr="0x7f0bacb3d530" />
+                                <attributelist id="89" addr="0x7f136da2bbd0" >
+                                    <attribute name="type" value="std::initializer_list&lt;(T)>" id="90" addr="0x7f136da34530" />
                                 </attributelist >
                             </parm >
                         </parmlist >
@@ -143,32 +143,32 @@
                  
                 </typemapitem >
             </typemap >
-            <typemap id="91" addr="0x7f0bacb34ff0" >
-                <attributelist id="92" addr="0x7f0bacb34ff0" >
-                    <kwargs id="93" addr="0x7f0bacb34d90" >
-                        <attributelist id="94" addr="0x7f0bacb34d90" >
-                            <attribute name="name" value="precedence" id="95" addr="0x7f0bacb3d530" />
-                            <attribute name="value" value="0" id="96" addr="0x7f0bacb3d530" />
+            <typemap id="91" addr="0x7f136da2bff0" >
+                <attributelist id="92" addr="0x7f136da2bff0" >
+                    <kwargs id="93" addr="0x7f136da2bd90" >
+                        <attributelist id="94" addr="0x7f136da2bd90" >
+                            <attribute name="name" value="precedence" id="95" addr="0x7f136da34530" />
+                            <attribute name="value" value="0" id="96" addr="0x7f136da34530" />
                         </attributelist >
-                        <kwargssitem id="97" addr="0x7f0bacb34db0" >
-                            <attributelist id="98" addr="0x7f0bacb34db0" >
+                        <kwargssitem id="97" addr="0x7f136da2bdb0" >
+                            <attributelist id="98" addr="0x7f136da2bdb0" >
                             </attributelist >
                         </kwargssitem >
-                        <kwargssitem id="99" addr="0x7f0bacb34dd0" >
-                            <attributelist id="100" addr="0x7f0bacb34dd0" >
+                        <kwargssitem id="99" addr="0x7f136da2bdd0" >
+                            <attributelist id="100" addr="0x7f136da2bdd0" >
                             </attributelist >
                         </kwargssitem >
                     </kwargs >
-                    <attribute name="code" value="" id="101" addr="0x7f0bacb3d530" />
-                    <attribute name="method" value="typecheck" id="102" addr="0x7f0bacb3d530" />
+                    <attribute name="code" value="" id="101" addr="0x7f136da34530" />
+                    <attribute name="method" value="typecheck" id="102" addr="0x7f136da34530" />
                 </attributelist >
 
-                <typemapitem id="103" addr="0x7f0bacb34f30" >
-                    <attributelist id="104" addr="0x7f0bacb34f30" >
-                        <parmlist id="105" addr="0x7f0bacb34f70" >
+                <typemapitem id="103" addr="0x7f136da2bf30" >
+                    <attributelist id="104" addr="0x7f136da2bf30" >
+                        <parmlist id="105" addr="0x7f136da2bf70" >
                             <parm id="106">
-                                <attributelist id="107" addr="0x7f0bacb34f70" >
-                                    <attribute name="type" value="std::initializer_list&lt;(T)>" id="108" addr="0x7f0bacb3d530" />
+                                <attributelist id="107" addr="0x7f136da2bf70" >
+                                    <attribute name="type" value="std::initializer_list&lt;(T)>" id="108" addr="0x7f136da34530" />
                                 </attributelist >
                             </parm >
                         </parmlist >
@@ -177,18 +177,18 @@
                 </typemapitem >
             </typemap >
         </namespace >
-        <typemap id="109" addr="0x7f0bacb35210" >
-            <attributelist id="110" addr="0x7f0bacb35210" >
-                <attribute name="code" value="delete [] $1;" id="111" addr="0x7f0bacb3d530" />
-                <attribute name="method" value="newfree" id="112" addr="0x7f0bacb3d530" />
+        <typemap id="109" addr="0x7f136da2c210" >
+            <attributelist id="110" addr="0x7f136da2c210" >
+                <attribute name="code" value="delete [] $1;" id="111" addr="0x7f136da34530" />
+                <attribute name="method" value="newfree" id="112" addr="0x7f136da34530" />
             </attributelist >
 
-            <typemapitem id="113" addr="0x7f0bacb35130" >
-                <attributelist id="114" addr="0x7f0bacb35130" >
-                    <parmlist id="115" addr="0x7f0bacb35170" >
+            <typemapitem id="113" addr="0x7f136da2c130" >
+                <attributelist id="114" addr="0x7f136da2c130" >
+                    <parmlist id="115" addr="0x7f136da2c170" >
                         <parm id="116">
-                            <attributelist id="117" addr="0x7f0bacb35170" >
-                                <attribute name="type" value="p.char" id="118" addr="0x7f0bacb3d530" />
+                            <attributelist id="117" addr="0x7f136da2c170" >
+                                <attribute name="type" value="p.char" id="118" addr="0x7f136da34530" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -196,18 +196,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="119" addr="0x7f0bacb353f0" >
-            <attributelist id="120" addr="0x7f0bacb353f0" >
-                <attribute name="code" value="{&#10;  delete [] $1;&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="121" addr="0x7f0bacb3d530" />
-                <attribute name="method" value="memberin" id="122" addr="0x7f0bacb3d530" />
+        <typemap id="119" addr="0x7f136da2c3f0" >
+            <attributelist id="120" addr="0x7f136da2c3f0" >
+                <attribute name="code" value="{&#10;  delete [] $1;&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="121" addr="0x7f136da34530" />
+                <attribute name="method" value="memberin" id="122" addr="0x7f136da34530" />
             </attributelist >
 
-            <typemapitem id="123" addr="0x7f0bacb35330" >
-                <attributelist id="124" addr="0x7f0bacb35330" >
-                    <parmlist id="125" addr="0x7f0bacb35370" >
+            <typemapitem id="123" addr="0x7f136da2c330" >
+                <attributelist id="124" addr="0x7f136da2c330" >
+                    <parmlist id="125" addr="0x7f136da2c370" >
                         <parm id="126">
-                            <attributelist id="127" addr="0x7f0bacb35370" >
-                                <attribute name="type" value="p.char" id="128" addr="0x7f0bacb3d530" />
+                            <attributelist id="127" addr="0x7f136da2c370" >
+                                <attribute name="type" value="p.char" id="128" addr="0x7f136da34530" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -215,32 +215,32 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="129" addr="0x7f0bacb35650" >
-            <attributelist id="130" addr="0x7f0bacb35650" >
-                <kwargs id="131" addr="0x7f0bacb35490" >
-                    <attributelist id="132" addr="0x7f0bacb35490" >
-                        <attribute name="name" value="warning" id="133" addr="0x7f0bacb3d530" />
-                        <attribute name="value" value="451:Setting a const char * variable may leak memory." id="134" addr="0x7f0bacb3d530" />
+        <typemap id="129" addr="0x7f136da2c650" >
+            <attributelist id="130" addr="0x7f136da2c650" >
+                <kwargs id="131" addr="0x7f136da2c490" >
+                    <attributelist id="132" addr="0x7f136da2c490" >
+                        <attribute name="name" value="warning" id="133" addr="0x7f136da34530" />
+                        <attribute name="value" value="451:Setting a const char * variable may leak memory." id="134" addr="0x7f136da34530" />
                     </attributelist >
-                    <kwargssitem id="135" addr="0x7f0bacb354b0" >
-                        <attributelist id="136" addr="0x7f0bacb354b0" >
+                    <kwargssitem id="135" addr="0x7f136da2c4b0" >
+                        <attributelist id="136" addr="0x7f136da2c4b0" >
                         </attributelist >
                     </kwargssitem >
-                    <kwargssitem id="137" addr="0x7f0bacb35470" >
-                        <attributelist id="138" addr="0x7f0bacb35470" >
+                    <kwargssitem id="137" addr="0x7f136da2c470" >
+                        <attributelist id="138" addr="0x7f136da2c470" >
                         </attributelist >
                     </kwargssitem >
                 </kwargs >
-                <attribute name="code" value="{&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="139" addr="0x7f0bacb3d530" />
-                <attribute name="method" value="memberin" id="140" addr="0x7f0bacb3d530" />
+                <attribute name="code" value="{&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="139" addr="0x7f136da34530" />
+                <attribute name="method" value="memberin" id="140" addr="0x7f136da34530" />
             </attributelist >
 
-            <typemapitem id="141" addr="0x7f0bacb35590" >
-                <attributelist id="142" addr="0x7f0bacb35590" >
-                    <parmlist id="143" addr="0x7f0bacb355d0" >
+            <typemapitem id="141" addr="0x7f136da2c590" >
+                <attributelist id="142" addr="0x7f136da2c590" >
+                    <parmlist id="143" addr="0x7f136da2c5d0" >
                         <parm id="144">
-                            <attributelist id="145" addr="0x7f0bacb355d0" >
-                                <attribute name="type" value="p.q(const).char" id="146" addr="0x7f0bacb3d530" />
+                            <attributelist id="145" addr="0x7f136da2c5d0" >
+                                <attribute name="type" value="p.q(const).char" id="146" addr="0x7f136da34530" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -248,18 +248,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="147" addr="0x7f0bacb35830" >
-            <attributelist id="148" addr="0x7f0bacb35830" >
-                <attribute name="code" value="{&#10;  delete [] $1;&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="149" addr="0x7f0bacb3d530" />
-                <attribute name="method" value="globalin" id="150" addr="0x7f0bacb3d530" />
+        <typemap id="147" addr="0x7f136da2c830" >
+            <attributelist id="148" addr="0x7f136da2c830" >
+                <attribute name="code" value="{&#10;  delete [] $1;&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="149" addr="0x7f136da34530" />
+                <attribute name="method" value="globalin" id="150" addr="0x7f136da34530" />
             </attributelist >
 
-            <typemapitem id="151" addr="0x7f0bacb35770" >
-                <attributelist id="152" addr="0x7f0bacb35770" >
-                    <parmlist id="153" addr="0x7f0bacb357b0" >
+            <typemapitem id="151" addr="0x7f136da2c770" >
+                <attributelist id="152" addr="0x7f136da2c770" >
+                    <parmlist id="153" addr="0x7f136da2c7b0" >
                         <parm id="154">
-                            <attributelist id="155" addr="0x7f0bacb357b0" >
-                                <attribute name="type" value="p.char" id="156" addr="0x7f0bacb3d530" />
+                            <attributelist id="155" addr="0x7f136da2c7b0" >
+                                <attribute name="type" value="p.char" id="156" addr="0x7f136da34530" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -267,32 +267,32 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="157" addr="0x7f0bacb35a90" >
-            <attributelist id="158" addr="0x7f0bacb35a90" >
-                <kwargs id="159" addr="0x7f0bacb358d0" >
-                    <attributelist id="160" addr="0x7f0bacb358d0" >
-                        <attribute name="name" value="warning" id="161" addr="0x7f0bacb3d530" />
-                        <attribute name="value" value="451:Setting a const char * variable may leak memory." id="162" addr="0x7f0bacb3d530" />
+        <typemap id="157" addr="0x7f136da2ca90" >
+            <attributelist id="158" addr="0x7f136da2ca90" >
+                <kwargs id="159" addr="0x7f136da2c8d0" >
+                    <attributelist id="160" addr="0x7f136da2c8d0" >
+                        <attribute name="name" value="warning" id="161" addr="0x7f136da34530" />
+                        <attribute name="value" value="451:Setting a const char * variable may leak memory." id="162" addr="0x7f136da34530" />
                     </attributelist >
-                    <kwargssitem id="163" addr="0x7f0bacb358f0" >
-                        <attributelist id="164" addr="0x7f0bacb358f0" >
+                    <kwargssitem id="163" addr="0x7f136da2c8f0" >
+                        <attributelist id="164" addr="0x7f136da2c8f0" >
                         </attributelist >
                     </kwargssitem >
-                    <kwargssitem id="165" addr="0x7f0bacb358b0" >
-                        <attributelist id="166" addr="0x7f0bacb358b0" >
+                    <kwargssitem id="165" addr="0x7f136da2c8b0" >
+                        <attributelist id="166" addr="0x7f136da2c8b0" >
                         </attributelist >
                     </kwargssitem >
                 </kwargs >
-                <attribute name="code" value="{&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="167" addr="0x7f0bacb3d530" />
-                <attribute name="method" value="globalin" id="168" addr="0x7f0bacb3d530" />
+                <attribute name="code" value="{&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="167" addr="0x7f136da34530" />
+                <attribute name="method" value="globalin" id="168" addr="0x7f136da34530" />
             </attributelist >
 
-            <typemapitem id="169" addr="0x7f0bacb359d0" >
-                <attributelist id="170" addr="0x7f0bacb359d0" >
-                    <parmlist id="171" addr="0x7f0bacb35a10" >
+            <typemapitem id="169" addr="0x7f136da2c9d0" >
+                <attributelist id="170" addr="0x7f136da2c9d0" >
+                    <parmlist id="171" addr="0x7f136da2ca10" >
                         <parm id="172">
-                            <attributelist id="173" addr="0x7f0bacb35a10" >
-                                <attribute name="type" value="p.q(const).char" id="174" addr="0x7f0bacb3d530" />
+                            <attributelist id="173" addr="0x7f136da2ca10" >
+                                <attribute name="type" value="p.q(const).char" id="174" addr="0x7f136da34530" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -300,18 +300,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="175" addr="0x7f0bacb35cb0" >
-            <attributelist id="176" addr="0x7f0bacb35cb0" >
-                <attribute name="code" value="{&#10;  if($input) {&#10;    strncpy((char*)$1, (const char *)$input, $1_dim0-1);&#10;    $1[$1_dim0-1] = 0;&#10;  } else {&#10;    $1[0] = 0;&#10;  }&#10;}" id="177" addr="0x7f0bacb3d530" />
-                <attribute name="method" value="memberin" id="178" addr="0x7f0bacb3d530" />
+        <typemap id="175" addr="0x7f136da2ccb0" >
+            <attributelist id="176" addr="0x7f136da2ccb0" >
+                <attribute name="code" value="{&#10;  if($input) {&#10;    strncpy((char*)$1, (const char *)$input, $1_dim0-1);&#10;    $1[$1_dim0-1] = 0;&#10;  } else {&#10;    $1[0] = 0;&#10;  }&#10;}" id="177" addr="0x7f136da34530" />
+                <attribute name="method" value="memberin" id="178" addr="0x7f136da34530" />
             </attributelist >
 
-            <typemapitem id="179" addr="0x7f0bacb35bf0" >
-                <attributelist id="180" addr="0x7f0bacb35bf0" >
-                    <parmlist id="181" addr="0x7f0bacb35c30" >
+            <typemapitem id="179" addr="0x7f136da2cbf0" >
+                <attributelist id="180" addr="0x7f136da2cbf0" >
+                    <parmlist id="181" addr="0x7f136da2cc30" >
                         <parm id="182">
-                            <attributelist id="183" addr="0x7f0bacb35c30" >
-                                <attribute name="type" value="a(ANY).char" id="184" addr="0x7f0bacb3d530" />
+                            <attributelist id="183" addr="0x7f136da2cc30" >
+                                <attribute name="type" value="a(ANY).char" id="184" addr="0x7f136da34530" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -319,18 +319,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="185" addr="0x7f0bacb35ed0" >
-            <attributelist id="186" addr="0x7f0bacb35ed0" >
-                <attribute name="code" value="{&#10;  if($input) {&#10;    strncpy((char*)$1, (const char *)$input, $1_dim0-1);&#10;    $1[$1_dim0-1] = 0;&#10;  } else {&#10;    $1[0] = 0;&#10;  }&#10;}" id="187" addr="0x7f0bacb3d530" />
-                <attribute name="method" value="globalin" id="188" addr="0x7f0bacb3d530" />
+        <typemap id="185" addr="0x7f136da2ced0" >
+            <attributelist id="186" addr="0x7f136da2ced0" >
+                <attribute name="code" value="{&#10;  if($input) {&#10;    strncpy((char*)$1, (const char *)$input, $1_dim0-1);&#10;    $1[$1_dim0-1] = 0;&#10;  } else {&#10;    $1[0] = 0;&#10;  }&#10;}" id="187" addr="0x7f136da34530" />
+                <attribute name="method" value="globalin" id="188" addr="0x7f136da34530" />
             </attributelist >
 
-            <typemapitem id="189" addr="0x7f0bacb35e10" >
-                <attributelist id="190" addr="0x7f0bacb35e10" >
-                    <parmlist id="191" addr="0x7f0bacb35e50" >
+            <typemapitem id="189" addr="0x7f136da2ce10" >
+                <attributelist id="190" addr="0x7f136da2ce10" >
+                    <parmlist id="191" addr="0x7f136da2ce50" >
                         <parm id="192">
-                            <attributelist id="193" addr="0x7f0bacb35e50" >
-                                <attribute name="type" value="a(ANY).char" id="194" addr="0x7f0bacb3d530" />
+                            <attributelist id="193" addr="0x7f136da2ce50" >
+                                <attribute name="type" value="a(ANY).char" id="194" addr="0x7f136da34530" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -338,18 +338,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="195" addr="0x7f0bacb360b0" >
-            <attributelist id="196" addr="0x7f0bacb360b0" >
-                <attribute name="code" value="{&#10;  if ($input) strcpy((char *)$1, (const char *)$input);&#10;  else $1[0] = 0;&#10;}" id="197" addr="0x7f0bacb3d530" />
-                <attribute name="method" value="memberin" id="198" addr="0x7f0bacb3d530" />
+        <typemap id="195" addr="0x7f136da2d0b0" >
+            <attributelist id="196" addr="0x7f136da2d0b0" >
+                <attribute name="code" value="{&#10;  if ($input) strcpy((char *)$1, (const char *)$input);&#10;  else $1[0] = 0;&#10;}" id="197" addr="0x7f136da34530" />
+                <attribute name="method" value="memberin" id="198" addr="0x7f136da34530" />
             </attributelist >
 
-            <typemapitem id="199" addr="0x7f0bacb35ff0" >
-                <attributelist id="200" addr="0x7f0bacb35ff0" >
-                    <parmlist id="201" addr="0x7f0bacb36030" >
+            <typemapitem id="199" addr="0x7f136da2cff0" >
+                <attributelist id="200" addr="0x7f136da2cff0" >
+                    <parmlist id="201" addr="0x7f136da2d030" >
                         <parm id="202">
-                            <attributelist id="203" addr="0x7f0bacb36030" >
-                                <attribute name="type" value="a().char" id="204" addr="0x7f0bacb3d530" />
+                            <attributelist id="203" addr="0x7f136da2d030" >
+                                <attribute name="type" value="a().char" id="204" addr="0x7f136da34530" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -357,18 +357,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="205" addr="0x7f0bacb36290" >
-            <attributelist id="206" addr="0x7f0bacb36290" >
-                <attribute name="code" value="{&#10;  if ($input) strcpy((char *)$1, (const char *)$input);&#10;  else $1[0] = 0;&#10;}" id="207" addr="0x7f0bacb3d530" />
-                <attribute name="method" value="globalin" id="208" addr="0x7f0bacb3d530" />
+        <typemap id="205" addr="0x7f136da2d290" >
+            <attributelist id="206" addr="0x7f136da2d290" >
+                <attribute name="code" value="{&#10;  if ($input) strcpy((char *)$1, (const char *)$input);&#10;  else $1[0] = 0;&#10;}" id="207" addr="0x7f136da34530" />
+                <attribute name="method" value="globalin" id="208" addr="0x7f136da34530" />
             </attributelist >
 
-            <typemapitem id="209" addr="0x7f0bacb361d0" >
-                <attributelist id="210" addr="0x7f0bacb361d0" >
-                    <parmlist id="211" addr="0x7f0bacb36210" >
+            <typemapitem id="209" addr="0x7f136da2d1d0" >
+                <attributelist id="210" addr="0x7f136da2d1d0" >
+                    <parmlist id="211" addr="0x7f136da2d210" >
                         <parm id="212">
-                            <attributelist id="213" addr="0x7f0bacb36210" >
-                                <attribute name="type" value="a().char" id="214" addr="0x7f0bacb3d530" />
+                            <attributelist id="213" addr="0x7f136da2d210" >
+                                <attribute name="type" value="a().char" id="214" addr="0x7f136da34530" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -376,18 +376,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="215" addr="0x7f0bacb364b0" >
-            <attributelist id="216" addr="0x7f0bacb364b0" >
-                <attribute name="code" value="{&#10;  size_t ii;&#10;  $1_basetype *b = ($1_basetype *) $1;&#10;  for (ii = 0; ii &lt; (size_t)$1_size; ii++) b[ii] = *(($1_basetype *) $input + ii);&#10;}" id="217" addr="0x7f0bacb3d530" />
-                <attribute name="method" value="memberin" id="218" addr="0x7f0bacb3d530" />
+        <typemap id="215" addr="0x7f136da2d4b0" >
+            <attributelist id="216" addr="0x7f136da2d4b0" >
+                <attribute name="code" value="{&#10;  size_t ii;&#10;  $1_basetype *b = ($1_basetype *) $1;&#10;  for (ii = 0; ii &lt; (size_t)$1_size; ii++) b[ii] = *(($1_basetype *) $input + ii);&#10;}" id="217" addr="0x7f136da34530" />
+                <attribute name="method" value="memberin" id="218" addr="0x7f136da34530" />
             </attributelist >
 
-            <typemapitem id="219" addr="0x7f0bacb363f0" >
-                <attributelist id="220" addr="0x7f0bacb363f0" >
-                    <parmlist id="221" addr="0x7f0bacb36430" >
+            <typemapitem id="219" addr="0x7f136da2d3f0" >
+                <attributelist id="220" addr="0x7f136da2d3f0" >
+                    <parmlist id="221" addr="0x7f136da2d430" >
                         <parm id="222">
-                            <attributelist id="223" addr="0x7f0bacb36430" >
-                                <attribute name="type" value="a(ANY).SWIGTYPE" id="224" addr="0x7f0bacb3d530" />
+                            <attributelist id="223" addr="0x7f136da2d430" >
+                                <attribute name="type" value="a(ANY).SWIGTYPE" id="224" addr="0x7f136da34530" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -395,18 +395,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="225" addr="0x7f0bacb366d0" >
-            <attributelist id="226" addr="0x7f0bacb366d0" >
-                <attribute name="code" value="{&#10;  size_t ii;&#10;  $1_basetype *b = ($1_basetype *) $1;&#10;  for (ii = 0; ii &lt; (size_t)$1_size; ii++) b[ii] = *(($1_basetype *) $input + ii);&#10;}" id="227" addr="0x7f0bacb3d530" />
-                <attribute name="method" value="globalin" id="228" addr="0x7f0bacb3d530" />
+        <typemap id="225" addr="0x7f136da2d6d0" >
+            <attributelist id="226" addr="0x7f136da2d6d0" >
+                <attribute name="code" value="{&#10;  size_t ii;&#10;  $1_basetype *b = ($1_basetype *) $1;&#10;  for (ii = 0; ii &lt; (size_t)$1_size; ii++) b[ii] = *(($1_basetype *) $input + ii);&#10;}" id="227" addr="0x7f136da34530" />
+                <attribute name="method" value="globalin" id="228" addr="0x7f136da34530" />
             </attributelist >
 
-            <typemapitem id="229" addr="0x7f0bacb36610" >
-                <attributelist id="230" addr="0x7f0bacb36610" >
-                    <parmlist id="231" addr="0x7f0bacb36650" >
+            <typemapitem id="229" addr="0x7f136da2d610" >
+                <attributelist id="230" addr="0x7f136da2d610" >
+                    <parmlist id="231" addr="0x7f136da2d650" >
                         <parm id="232">
-                            <attributelist id="233" addr="0x7f0bacb36650" >
-                                <attribute name="type" value="a(ANY).SWIGTYPE" id="234" addr="0x7f0bacb3d530" />
+                            <attributelist id="233" addr="0x7f136da2d650" >
+                                <attribute name="type" value="a(ANY).SWIGTYPE" id="234" addr="0x7f136da34530" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -414,18 +414,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="235" addr="0x7f0bacb36930" >
-            <attributelist id="236" addr="0x7f0bacb36930" >
-                <attribute name="code" value="{&#10;  $basetype (*inp)[$1_dim1] = ($basetype (*)[$1_dim1])($input);&#10;  $basetype (*dest)[$1_dim1] = ($basetype (*)[$1_dim1])($1);&#10;  size_t ii = 0;&#10;  for (; ii &lt; $1_dim0; ++ii) {&#10;    $basetype *ip = inp[ii];&#10;    $basetype *dp = dest[ii];&#10;    size_t jj = 0;&#10;    for (; jj &lt; $1_dim1; ++jj) dp[jj] = ip[jj];&#10;  }&#10;}" id="237" addr="0x7f0bacb3d530" />
-                <attribute name="method" value="memberin" id="238" addr="0x7f0bacb3d530" />
+        <typemap id="235" addr="0x7f136da2d930" >
+            <attributelist id="236" addr="0x7f136da2d930" >
+                <attribute name="code" value="{&#10;  $basetype (*inp)[$1_dim1] = ($basetype (*)[$1_dim1])($input);&#10;  $basetype (*dest)[$1_dim1] = ($basetype (*)[$1_dim1])($1);&#10;  size_t ii = 0;&#10;  for (; ii &lt; $1_dim0; ++ii) {&#10;    $basetype *ip = inp[ii];&#10;    $basetype *dp = dest[ii];&#10;    size_t jj = 0;&#10;    for (; jj &lt; $1_dim1; ++jj) dp[jj] = ip[jj];&#10;  }&#10;}" id="237" addr="0x7f136da34530" />
+                <attribute name="method" value="memberin" id="238" addr="0x7f136da34530" />
             </attributelist >
 
-            <typemapitem id="239" addr="0x7f0bacb36810" >
-                <attributelist id="240" addr="0x7f0bacb36810" >
-                    <parmlist id="241" addr="0x7f0bacb368b0" >
+            <typemapitem id="239" addr="0x7f136da2d810" >
+                <attributelist id="240" addr="0x7f136da2d810" >
+                    <parmlist id="241" addr="0x7f136da2d8b0" >
                         <parm id="242">
-                            <attributelist id="243" addr="0x7f0bacb368b0" >
-                                <attribute name="type" value="a(ANY).a(ANY).SWIGTYPE" id="244" addr="0x7f0bacb3d530" />
+                            <attributelist id="243" addr="0x7f136da2d8b0" >
+                                <attribute name="type" value="a(ANY).a(ANY).SWIGTYPE" id="244" addr="0x7f136da34530" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -433,18 +433,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="245" addr="0x7f0bacb36b90" >
-            <attributelist id="246" addr="0x7f0bacb36b90" >
-                <attribute name="code" value="{&#10;  $basetype (*inp)[$1_dim1] = ($basetype (*)[$1_dim1])($input);&#10;  $basetype (*dest)[$1_dim1] = ($basetype (*)[$1_dim1])($1);&#10;  size_t ii = 0;&#10;  for (; ii &lt; $1_dim0; ++ii) {&#10;    $basetype *ip = inp[ii];&#10;    $basetype *dp = dest[ii];&#10;    size_t jj = 0;&#10;    for (; jj &lt; $1_dim1; ++jj) dp[jj] = ip[jj];&#10;  }&#10;}" id="247" addr="0x7f0bacb3d530" />
-                <attribute name="method" value="globalin" id="248" addr="0x7f0bacb3d530" />
+        <typemap id="245" addr="0x7f136da2db90" >
+            <attributelist id="246" addr="0x7f136da2db90" >
+                <attribute name="code" value="{&#10;  $basetype (*inp)[$1_dim1] = ($basetype (*)[$1_dim1])($input);&#10;  $basetype (*dest)[$1_dim1] = ($basetype (*)[$1_dim1])($1);&#10;  size_t ii = 0;&#10;  for (; ii &lt; $1_dim0; ++ii) {&#10;    $basetype *ip = inp[ii];&#10;    $basetype *dp = dest[ii];&#10;    size_t jj = 0;&#10;    for (; jj &lt; $1_dim1; ++jj) dp[jj] = ip[jj];&#10;  }&#10;}" id="247" addr="0x7f136da34530" />
+                <attribute name="method" value="globalin" id="248" addr="0x7f136da34530" />
             </attributelist >
 
-            <typemapitem id="249" addr="0x7f0bacb36a70" >
-                <attributelist id="250" addr="0x7f0bacb36a70" >
-                    <parmlist id="251" addr="0x7f0bacb36b10" >
+            <typemapitem id="249" addr="0x7f136da2da70" >
+                <attributelist id="250" addr="0x7f136da2da70" >
+                    <parmlist id="251" addr="0x7f136da2db10" >
                         <parm id="252">
-                            <attributelist id="253" addr="0x7f0bacb36b10" >
-                                <attribute name="type" value="a(ANY).a(ANY).SWIGTYPE" id="254" addr="0x7f0bacb3d530" />
+                            <attributelist id="253" addr="0x7f136da2db10" >
+                                <attribute name="type" value="a(ANY).a(ANY).SWIGTYPE" id="254" addr="0x7f136da34530" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -452,780 +452,780 @@
              
             </typemapitem >
         </typemap >
-        <insert id="255" addr="0x7f0bacb36c50" >
-            <attributelist id="256" addr="0x7f0bacb36c50" >
-                <attribute name="code" value="&#10;#ifdef __cplusplus&#10;/* SwigValueWrapper is described in swig.swg */&#10;template&lt;typename T> class SwigValueWrapper {&#10;  struct SwigMovePointer {&#10;    T *ptr;&#10;    SwigMovePointer(T *p) : ptr(p) { }&#10;    ~SwigMovePointer() { delete ptr; }&#10;    SwigMovePointer&amp; operator=(SwigMovePointer&amp; rhs) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = rhs.ptr; rhs.ptr = 0; return *this; }&#10;  } pointer;&#10;  SwigValueWrapper&amp; operator=(const SwigValueWrapper&lt;T>&amp; rhs);&#10;  SwigValueWrapper(const SwigValueWrapper&lt;T>&amp; rhs);&#10;public:&#10;  SwigValueWrapper() : pointer(0) { }&#10;  SwigValueWrapper&amp; operator=(const T&amp; t) { SwigMovePointer tmp(new T(t)); pointer = tmp; return *this; }&#10;  operator T&amp;() const { return *pointer.ptr; }&#10;  T *operator&amp;() { return pointer.ptr; }&#10;};" id="257" addr="0x7f0bacb3d530" />
-                <attribute name="section" value="runtime" id="258" addr="0x7f0bacb3d530" />
+        <insert id="255" addr="0x7f136da2dc50" >
+            <attributelist id="256" addr="0x7f136da2dc50" >
+                <attribute name="code" value="&#10;#ifdef __cplusplus&#10;/* SwigValueWrapper is described in swig.swg */&#10;template&lt;typename T> class SwigValueWrapper {&#10;  struct SwigMovePointer {&#10;    T *ptr;&#10;    SwigMovePointer(T *p) : ptr(p) { }&#10;    ~SwigMovePointer() { delete ptr; }&#10;    SwigMovePointer&amp; operator=(SwigMovePointer&amp; rhs) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = rhs.ptr; rhs.ptr = 0; return *this; }&#10;  } pointer;&#10;  SwigValueWrapper&amp; operator=(const SwigValueWrapper&lt;T>&amp; rhs);&#10;  SwigValueWrapper(const SwigValueWrapper&lt;T>&amp; rhs);&#10;public:&#10;  SwigValueWrapper() : pointer(0) { }&#10;  SwigValueWrapper&amp; operator=(const T&amp; t) { SwigMovePointer tmp(new T(t)); pointer = tmp; return *this; }&#10;  operator T&amp;() const { return *pointer.ptr; }&#10;  T *operator&amp;() { return pointer.ptr; }&#10;};" id="257" addr="0x7f136da34530" />
+                <attribute name="section" value="runtime" id="258" addr="0x7f136da34530" />
             </attributelist >
          
         </insert >
-        <insert id="259" addr="0x7f0bacb36d30" >
-            <attributelist id="260" addr="0x7f0bacb36d30" >
-                <attribute name="code" value="&#10;template &lt;typename T> T SwigValueInit() {&#10;  return T();&#10;}&#10;#endif&#10;" id="261" addr="0x7f0bacb3d530" />
-                <attribute name="section" value="runtime" id="262" addr="0x7f0bacb3d530" />
+        <insert id="259" addr="0x7f136da2dd30" >
+            <attributelist id="260" addr="0x7f136da2dd30" >
+                <attribute name="code" value="&#10;template &lt;typename T> T SwigValueInit() {&#10;  return T();&#10;}&#10;#endif&#10;" id="261" addr="0x7f136da34530" />
+                <attribute name="section" value="runtime" id="262" addr="0x7f136da34530" />
             </attributelist >
          
         </insert >
-        <insert id="263" addr="0x7f0bacb36e10" >
-            <attributelist id="264" addr="0x7f0bacb36e10" >
-                <attribute name="code" value="/* -----------------------------------------------------------------------------&#10; *  This section contains generic SWIG labels for method/variable&#10; *  declarations/attributes, and other compiler dependent labels.&#10; * ----------------------------------------------------------------------------- */&#10;&#10;/* template workaround for compilers that cannot correctly implement the C++ standard */&#10;#ifndef SWIGTEMPLATEDISAMBIGUATOR&#10;# if defined(__SUNPRO_CC) &amp;&amp; (__SUNPRO_CC &lt;= 0x560)&#10;#  define SWIGTEMPLATEDISAMBIGUATOR template&#10;# elif defined(__HP_aCC)&#10;/* Needed even with `aCC -AA' when `aCC -V' reports HP ANSI C++ B3910B A.03.55 */&#10;/* If we find a maximum version that requires this, the test would be __HP_aCC &lt;= 35500 for A.03.55 */&#10;#  define SWIGTEMPLATEDISAMBIGUATOR template&#10;# else&#10;#  define SWIGTEMPLATEDISAMBIGUATOR&#10;# endif&#10;#endif&#10;&#10;/* inline attribute */&#10;#ifndef SWIGINLINE&#10;# if defined(__cplusplus) || (defined(__GNUC__) &amp;&amp; !defined(__STRICT_ANSI__))&#10;#   define SWIGINLINE inline&#10;# else&#10;#   define SWIGINLINE&#10;# endif&#10;#endif&#10;&#10;/* attribute recognised by some compilers to avoid 'unused' warnings */&#10;#ifndef SWIGUNUSED&#10;# if defined(__GNUC__)&#10;#   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 &amp;&amp; __GNUC_MINOR__ >= 4))&#10;#     define SWIGUNUSED __attribute__ ((__unused__))&#10;#   else&#10;#     define SWIGUNUSED&#10;#   endif&#10;# elif defined(__ICC)&#10;#   define SWIGUNUSED __attribute__ ((__unused__))&#10;# else&#10;#   define SWIGUNUSED&#10;# endif&#10;#endif&#10;&#10;#ifndef SWIG_MSC_UNSUPPRESS_4505&#10;# if defined(_MSC_VER)&#10;#   pragma warning(disable : 4505) /* unreferenced local function has been removed */&#10;# endif&#10;#endif&#10;&#10;#ifndef SWIGUNUSEDPARM&#10;# ifdef __cplusplus&#10;#   define SWIGUNUSEDPARM(p)&#10;# else&#10;#   define SWIGUNUSEDPARM(p) p SWIGUNUSED&#10;# endif&#10;#endif&#10;&#10;/* internal SWIG method */&#10;#ifndef SWIGINTERN&#10;# define SWIGINTERN static SWIGUNUSED&#10;#endif&#10;&#10;/* internal inline SWIG method */&#10;#ifndef SWIGINTERNINLINE&#10;# define SWIGINTERNINLINE SWIGINTERN SWIGINLINE&#10;#endif&#10;&#10;/* exporting methods */&#10;#if defined(__GNUC__)&#10;#  if (__GNUC__ >= 4) || (__GNUC__ == 3 &amp;&amp; __GNUC_MINOR__ >= 4)&#10;#    ifndef GCC_HASCLASSVISIBILITY&#10;#      define GCC_HASCLASSVISIBILITY&#10;#    endif&#10;#  endif&#10;#endif&#10;&#10;#ifndef SWIGEXPORT&#10;# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)&#10;#   if defined(STATIC_LINKED)&#10;#     define SWIGEXPORT&#10;#   else&#10;#     define SWIGEXPORT __declspec(dllexport)&#10;#   endif&#10;# else&#10;#   if defined(__GNUC__) &amp;&amp; defined(GCC_HASCLASSVISIBILITY)&#10;#     define SWIGEXPORT __attribute__ ((visibility(&quot;default&quot;)))&#10;#   else&#10;#     define SWIGEXPORT&#10;#   endif&#10;# endif&#10;#endif&#10;&#10;/* calling conventions for Windows */&#10;#ifndef SWIGSTDCALL&#10;# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)&#10;#   define SWIGSTDCALL __stdcall&#10;# else&#10;#   define SWIGSTDCALL&#10;# endif&#10;#endif&#10;&#10;/* Deal with Microsoft's attempt at deprecating C standard runtime functions */&#10;#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) &amp;&amp; defined(_MSC_VER) &amp;&amp; !defined(_CRT_SECURE_NO_DEPRECATE)&#10;# define _CRT_SECURE_NO_DEPRECATE&#10;#endif&#10;&#10;/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */&#10;#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) &amp;&amp; defined(_MSC_VER) &amp;&amp; !defined(_SCL_SECURE_NO_DEPRECATE)&#10;# define _SCL_SECURE_NO_DEPRECATE&#10;#endif&#10;&#10;/* Deal with Apple's deprecated 'AssertMacros.h' from Carbon-framework */&#10;#if defined(__APPLE__) &amp;&amp; !defined(__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES)&#10;# define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0&#10;#endif&#10;&#10;/* Intel's compiler complains if a variable which was never initialised is&#10; * cast to void, which is a common idiom which we use to indicate that we&#10; * are aware a variable isn't used.  So we just silence that warning.&#10; * See: https://github.com/swig/swig/issues/192 for more discussion.&#10; */&#10;#ifdef __INTEL_COMPILER&#10;# pragma warning disable 592&#10;#endif&#10;" id="265" addr="0x7f0bacb3d530" />
-                <attribute name="section" value="runtime" id="266" addr="0x7f0bacb3d530" />
+        <insert id="263" addr="0x7f136da2de10" >
+            <attributelist id="264" addr="0x7f136da2de10" >
+                <attribute name="code" value="/* -----------------------------------------------------------------------------&#10; *  This section contains generic SWIG labels for method/variable&#10; *  declarations/attributes, and other compiler dependent labels.&#10; * ----------------------------------------------------------------------------- */&#10;&#10;/* template workaround for compilers that cannot correctly implement the C++ standard */&#10;#ifndef SWIGTEMPLATEDISAMBIGUATOR&#10;# if defined(__SUNPRO_CC) &amp;&amp; (__SUNPRO_CC &lt;= 0x560)&#10;#  define SWIGTEMPLATEDISAMBIGUATOR template&#10;# elif defined(__HP_aCC)&#10;/* Needed even with `aCC -AA' when `aCC -V' reports HP ANSI C++ B3910B A.03.55 */&#10;/* If we find a maximum version that requires this, the test would be __HP_aCC &lt;= 35500 for A.03.55 */&#10;#  define SWIGTEMPLATEDISAMBIGUATOR template&#10;# else&#10;#  define SWIGTEMPLATEDISAMBIGUATOR&#10;# endif&#10;#endif&#10;&#10;/* inline attribute */&#10;#ifndef SWIGINLINE&#10;# if defined(__cplusplus) || (defined(__GNUC__) &amp;&amp; !defined(__STRICT_ANSI__))&#10;#   define SWIGINLINE inline&#10;# else&#10;#   define SWIGINLINE&#10;# endif&#10;#endif&#10;&#10;/* attribute recognised by some compilers to avoid 'unused' warnings */&#10;#ifndef SWIGUNUSED&#10;# if defined(__GNUC__)&#10;#   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 &amp;&amp; __GNUC_MINOR__ >= 4))&#10;#     define SWIGUNUSED __attribute__ ((__unused__))&#10;#   else&#10;#     define SWIGUNUSED&#10;#   endif&#10;# elif defined(__ICC)&#10;#   define SWIGUNUSED __attribute__ ((__unused__))&#10;# else&#10;#   define SWIGUNUSED&#10;# endif&#10;#endif&#10;&#10;#ifndef SWIG_MSC_UNSUPPRESS_4505&#10;# if defined(_MSC_VER)&#10;#   pragma warning(disable : 4505) /* unreferenced local function has been removed */&#10;# endif&#10;#endif&#10;&#10;#ifndef SWIGUNUSEDPARM&#10;# ifdef __cplusplus&#10;#   define SWIGUNUSEDPARM(p)&#10;# else&#10;#   define SWIGUNUSEDPARM(p) p SWIGUNUSED&#10;# endif&#10;#endif&#10;&#10;/* internal SWIG method */&#10;#ifndef SWIGINTERN&#10;# define SWIGINTERN static SWIGUNUSED&#10;#endif&#10;&#10;/* internal inline SWIG method */&#10;#ifndef SWIGINTERNINLINE&#10;# define SWIGINTERNINLINE SWIGINTERN SWIGINLINE&#10;#endif&#10;&#10;/* exporting methods */&#10;#if defined(__GNUC__)&#10;#  if (__GNUC__ >= 4) || (__GNUC__ == 3 &amp;&amp; __GNUC_MINOR__ >= 4)&#10;#    ifndef GCC_HASCLASSVISIBILITY&#10;#      define GCC_HASCLASSVISIBILITY&#10;#    endif&#10;#  endif&#10;#endif&#10;&#10;#ifndef SWIGEXPORT&#10;# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)&#10;#   if defined(STATIC_LINKED)&#10;#     define SWIGEXPORT&#10;#   else&#10;#     define SWIGEXPORT __declspec(dllexport)&#10;#   endif&#10;# else&#10;#   if defined(__GNUC__) &amp;&amp; defined(GCC_HASCLASSVISIBILITY)&#10;#     define SWIGEXPORT __attribute__ ((visibility(&quot;default&quot;)))&#10;#   else&#10;#     define SWIGEXPORT&#10;#   endif&#10;# endif&#10;#endif&#10;&#10;/* calling conventions for Windows */&#10;#ifndef SWIGSTDCALL&#10;# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)&#10;#   define SWIGSTDCALL __stdcall&#10;# else&#10;#   define SWIGSTDCALL&#10;# endif&#10;#endif&#10;&#10;/* Deal with Microsoft's attempt at deprecating C standard runtime functions */&#10;#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) &amp;&amp; defined(_MSC_VER) &amp;&amp; !defined(_CRT_SECURE_NO_DEPRECATE)&#10;# define _CRT_SECURE_NO_DEPRECATE&#10;#endif&#10;&#10;/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */&#10;#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) &amp;&amp; defined(_MSC_VER) &amp;&amp; !defined(_SCL_SECURE_NO_DEPRECATE)&#10;# define _SCL_SECURE_NO_DEPRECATE&#10;#endif&#10;&#10;/* Deal with Apple's deprecated 'AssertMacros.h' from Carbon-framework */&#10;#if defined(__APPLE__) &amp;&amp; !defined(__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES)&#10;# define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0&#10;#endif&#10;&#10;/* Intel's compiler complains if a variable which was never initialised is&#10; * cast to void, which is a common idiom which we use to indicate that we&#10; * are aware a variable isn't used.  So we just silence that warning.&#10; * See: https://github.com/swig/swig/issues/192 for more discussion.&#10; */&#10;#ifdef __INTEL_COMPILER&#10;# pragma warning disable 592&#10;#endif&#10;" id="265" addr="0x7f136da34530" />
+                <attribute name="section" value="runtime" id="266" addr="0x7f136da34530" />
             </attributelist >
          
         </insert >
     </include >
-    <include id="267" addr="0x7f0bacb36f90" >
-        <attributelist id="268" addr="0x7f0bacb36f90" >
-            <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmcaddon.i" id="269" addr="0x7f0bacb3d530" />
-            <attribute name="module" value="" id="270" addr="0x7f0bacb37030" />
-            <attribute name="options" value="0x7f0bacb36f10" id="271" addr="0x7f0bacb36f10" />
+    <include id="267" addr="0x7f136da2df90" >
+        <attributelist id="268" addr="0x7f136da2df90" >
+            <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmcaddon.i" id="269" addr="0x7f136da34530" />
+            <attribute name="module" value="" id="270" addr="0x7f136da2e030" />
+            <attribute name="options" value="0x7f136da2df10" id="271" addr="0x7f136da2df10" />
         </attributelist >
 
-        <module id="272" addr="0x7f0bacb36fd0" >
-            <attributelist id="273" addr="0x7f0bacb36fd0" >
-                <attribute name="name" value="xbmcaddon" id="274" addr="0x7f0bacb3d530" />
+        <module id="272" addr="0x7f136da2dfd0" >
+            <attributelist id="273" addr="0x7f136da2dfd0" >
+                <attribute name="name" value="xbmcaddon" id="274" addr="0x7f136da34530" />
             </attributelist >
          
         </module >
-        <insert id="275" addr="0x7f0bacb37070" >
-            <attributelist id="276" addr="0x7f0bacb37070" >
-                <attribute name="code" value="&#10;#if defined(TARGET_WINDOWS)&#10;#  include &lt;windows.h>&#10;#endif&#10;&#10;#include &quot;interfaces/legacy/Addon.h&quot;&#10;&#10;using namespace XBMCAddon;&#10;using namespace xbmcaddon;&#10;&#10;#if defined(__GNUG__)&#10;#pragma GCC diagnostic ignored &quot;-Wstrict-aliasing&quot;&#10;#endif&#10;&#10;" id="277" addr="0x7f0bacb3d530" />
+        <insert id="275" addr="0x7f136da2e070" >
+            <attributelist id="276" addr="0x7f136da2e070" >
+                <attribute name="code" value="&#10;#if defined(TARGET_WINDOWS)&#10;#  include &lt;windows.h>&#10;#endif&#10;&#10;#include &quot;interfaces/legacy/Addon.h&quot;&#10;&#10;using namespace XBMCAddon;&#10;using namespace xbmcaddon;&#10;&#10;#if defined(__GNUG__)&#10;#pragma GCC diagnostic ignored &quot;-Wstrict-aliasing&quot;&#10;#endif&#10;&#10;" id="277" addr="0x7f136da34530" />
             </attributelist >
          
         </insert >
-        <include id="278" addr="0x7f0bacb37290" >
-            <attributelist id="279" addr="0x7f0bacb37290" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/swighelper.h" id="280" addr="0x7f0bacb3d530" />
+        <include id="278" addr="0x7f136da2e290" >
+            <attributelist id="279" addr="0x7f136da2e290" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/swighelper.h" id="280" addr="0x7f136da34530" />
             </attributelist >
          
         </include >
-        <include id="281" addr="0x7f0bacb37310" >
-            <attributelist id="282" addr="0x7f0bacb37310" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/AddonString.h" id="283" addr="0x7f0bacb3d530" />
+        <include id="281" addr="0x7f136da2e310" >
+            <attributelist id="282" addr="0x7f136da2e310" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/AddonString.h" id="283" addr="0x7f136da34530" />
             </attributelist >
 
-            <namespace id="284" addr="0x7f0bacb37450" >
-                <attributelist id="285" addr="0x7f0bacb37450" >
-                    <attribute name="sym_name" value="XBMCAddon" id="286" addr="0x7f0bacb3d530" />
-                    <attribute name="name" value="XBMCAddon" id="287" addr="0x7f0bacb3d530" />
-                    <attribute name="csym_nextSibling" value="0x7f0bacb37bf0" id="288" addr="0x7f0bacb37bf0" />
-                    <attribute name="sym_nextSibling" value="0x7f0bacb37bf0" id="289" addr="0x7f0bacb37bf0" />
-                    <typescope id="290" addr="0x7f0bacb3c250" >
-                        <attributelist id="291" addr="0x7f0bacb3c250" >
-                            <attribute name="name" value="XBMCAddon" id="292" addr="0x7f0bacb3d530" />
-                            <typetab id="293" addr="0x7f0bacb3c290" >
-                                <attributelist id="294" addr="0x7f0bacb3c290" >
-                                    <attribute name="String" value="std::string" id="295" addr="0x7f0bacb3d530" />
+            <namespace id="284" addr="0x7f136da2e450" >
+                <attributelist id="285" addr="0x7f136da2e450" >
+                    <attribute name="sym_name" value="XBMCAddon" id="286" addr="0x7f136da34530" />
+                    <attribute name="name" value="XBMCAddon" id="287" addr="0x7f136da34530" />
+                    <attribute name="csym_nextSibling" value="0x7f136da2ebf0" id="288" addr="0x7f136da2ebf0" />
+                    <attribute name="sym_nextSibling" value="0x7f136da2ebf0" id="289" addr="0x7f136da2ebf0" />
+                    <typescope id="290" addr="0x7f136da33250" >
+                        <attributelist id="291" addr="0x7f136da33250" >
+                            <attribute name="name" value="XBMCAddon" id="292" addr="0x7f136da34530" />
+                            <typetab id="293" addr="0x7f136da33290" >
+                                <attributelist id="294" addr="0x7f136da33290" >
+                                    <attribute name="String" value="std::string" id="295" addr="0x7f136da34530" />
                                 </attributelist >
-                                <typetabsitem id="296" addr="0x7f0bacb3c470" >
-                                    <attributelist id="297" addr="0x7f0bacb3c470" >
+                                <typetabsitem id="296" addr="0x7f136da33470" >
+                                    <attributelist id="297" addr="0x7f136da33470" >
                                     </attributelist >
                                 </typetabsitem >
                             </typetab >
-                            <attribute name="parent" value="0x7f0bacb20a30" id="298" addr="0x7f0bacb20a30" />
-                            <attribute name="qname" value="XBMCAddon" id="299" addr="0x7f0bacb3d530" />
-                            <attribute name="symtab" value="0x7f0bacb373b0" id="300" addr="0x7f0bacb373b0" />
+                            <attribute name="parent" value="0x7f136da17a30" id="298" addr="0x7f136da17a30" />
+                            <attribute name="qname" value="XBMCAddon" id="299" addr="0x7f136da34530" />
+                            <attribute name="symtab" value="0x7f136da2e3b0" id="300" addr="0x7f136da2e3b0" />
                         </attributelist >
-                        <typescopesitem id="301" addr="0x7f0bacb37370" >
-                            <attributelist id="302" addr="0x7f0bacb37370" >
+                        <typescopesitem id="301" addr="0x7f136da2e370" >
+                            <attributelist id="302" addr="0x7f136da2e370" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="303" addr="0x7f0bacb3c290" >
-                            <attributelist id="304" addr="0x7f0bacb3c290" >
-                                <attribute name="String" value="std::string" id="305" addr="0x7f0bacb3d530" />
+                        <typescopesitem id="303" addr="0x7f136da33290" >
+                            <attributelist id="304" addr="0x7f136da33290" >
+                                <attribute name="String" value="std::string" id="305" addr="0x7f136da34530" />
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="306" addr="0x7f0bacb20a30" >
-                            <attributelist id="307" addr="0x7f0bacb20a30" >
-                                <attribute name="name" value="" id="308" addr="0x7f0bacb3d530" />
-                                <typetab id="309" addr="0x7f0bacb20a90" >
-                                    <attributelist id="310" addr="0x7f0bacb20a90" >
+                        <typescopesitem id="306" addr="0x7f136da17a30" >
+                            <attributelist id="307" addr="0x7f136da17a30" >
+                                <attribute name="name" value="" id="308" addr="0x7f136da34530" />
+                                <typetab id="309" addr="0x7f136da17a90" >
+                                    <attributelist id="310" addr="0x7f136da17a90" >
                                     </attributelist >
                                 </typetab >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="311" addr="0x7f0bacb3c390" >
-                            <attributelist id="312" addr="0x7f0bacb3c390" >
+                        <typescopesitem id="311" addr="0x7f136da33390" >
+                            <attributelist id="312" addr="0x7f136da33390" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="313" addr="0x7f0bacb373b0" >
-                            <attributelist id="314" addr="0x7f0bacb373b0" >
-                                <attribute name="name" value="XBMCAddon" id="315" addr="0x7f0bacb3d530" />
-                                <attribute name="csymtab" value="0x7f0bacb373f0" id="316" addr="0x7f0bacb373f0" />
-                                <attribute name="symtab" value="0x7f0bacb37390" id="317" addr="0x7f0bacb37390" />
+                        <typescopesitem id="313" addr="0x7f136da2e3b0" >
+                            <attributelist id="314" addr="0x7f136da2e3b0" >
+                                <attribute name="name" value="XBMCAddon" id="315" addr="0x7f136da34530" />
+                                <attribute name="csymtab" value="0x7f136da2e3f0" id="316" addr="0x7f136da2e3f0" />
+                                <attribute name="symtab" value="0x7f136da2e390" id="317" addr="0x7f136da2e390" />
                             </attributelist >
                         </typescopesitem >
                     </typescope >
-                    <attribute name="symtab" value="0x7f0bacb373b0" id="318" addr="0x7f0bacb373b0" />
-                    <attribute name="sym_symtab" value="0x7f0bacb20950" id="319" addr="0x7f0bacb20950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="320" addr="0x7f0bacb3d530" />
+                    <attribute name="symtab" value="0x7f136da2e3b0" id="318" addr="0x7f136da2e3b0" />
+                    <attribute name="sym_symtab" value="0x7f136da17950" id="319" addr="0x7f136da17950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="320" addr="0x7f136da34530" />
                 </attributelist >
 
-                <cdecl id="321" addr="0x7f0bacb37570" >
-                    <attributelist id="322" addr="0x7f0bacb37570" >
-                        <attribute name="sym_name" value="String" id="323" addr="0x7f0bacb3d530" />
-                        <attribute name="name" value="XBMCAddon::String" id="324" addr="0x7f0bacb3d530" />
-                        <attribute name="decl" value="" id="325" addr="0x7f0bacb3d530" />
-                        <attribute name="storage" value="typedef" id="326" addr="0x7f0bacb3d530" />
-                        <attribute name="kind" value="typedef" id="327" addr="0x7f0bacb3d530" />
-                        <attribute name="type" value="std::string" id="328" addr="0x7f0bacb3d530" />
-                        <attribute name="sym_symtab" value="0x7f0bacb373b0" id="329" addr="0x7f0bacb373b0" />
-                        <attribute name="sym_overname" value="__SWIG_0" id="330" addr="0x7f0bacb3d530" />
+                <cdecl id="321" addr="0x7f136da2e570" >
+                    <attributelist id="322" addr="0x7f136da2e570" >
+                        <attribute name="sym_name" value="String" id="323" addr="0x7f136da34530" />
+                        <attribute name="name" value="XBMCAddon::String" id="324" addr="0x7f136da34530" />
+                        <attribute name="decl" value="" id="325" addr="0x7f136da34530" />
+                        <attribute name="storage" value="typedef" id="326" addr="0x7f136da34530" />
+                        <attribute name="kind" value="typedef" id="327" addr="0x7f136da34530" />
+                        <attribute name="type" value="std::string" id="328" addr="0x7f136da34530" />
+                        <attribute name="sym_symtab" value="0x7f136da2e3b0" id="329" addr="0x7f136da2e3b0" />
+                        <attribute name="sym_overname" value="__SWIG_0" id="330" addr="0x7f136da34530" />
                     </attributelist >
                  
                 </cdecl >
-                <cdecl id="331" addr="0x7f0bacb37770" >
-                    <attributelist id="332" addr="0x7f0bacb37770" >
-                        <attribute name="sym_name" value="emptyString" id="333" addr="0x7f0bacb3d530" />
-                        <attribute name="name" value="XBMCAddon::emptyString" id="334" addr="0x7f0bacb3d530" />
-                        <attribute name="decl" value="" id="335" addr="0x7f0bacb3d530" />
-                        <attribute name="storage" value="extern" id="336" addr="0x7f0bacb3d530" />
-                        <attribute name="kind" value="variable" id="337" addr="0x7f0bacb3d530" />
-                        <attribute name="type" value="XBMCAddon::String" id="338" addr="0x7f0bacb3d530" />
-                        <attribute name="sym_symtab" value="0x7f0bacb373b0" id="339" addr="0x7f0bacb373b0" />
-                        <attribute name="sym_overname" value="__SWIG_0" id="340" addr="0x7f0bacb3d530" />
+                <cdecl id="331" addr="0x7f136da2e770" >
+                    <attributelist id="332" addr="0x7f136da2e770" >
+                        <attribute name="sym_name" value="emptyString" id="333" addr="0x7f136da34530" />
+                        <attribute name="name" value="XBMCAddon::emptyString" id="334" addr="0x7f136da34530" />
+                        <attribute name="decl" value="" id="335" addr="0x7f136da34530" />
+                        <attribute name="storage" value="extern" id="336" addr="0x7f136da34530" />
+                        <attribute name="kind" value="variable" id="337" addr="0x7f136da34530" />
+                        <attribute name="type" value="XBMCAddon::String" id="338" addr="0x7f136da34530" />
+                        <attribute name="sym_symtab" value="0x7f136da2e3b0" id="339" addr="0x7f136da2e3b0" />
+                        <attribute name="sym_overname" value="__SWIG_0" id="340" addr="0x7f136da34530" />
                     </attributelist >
                  
                 </cdecl >
             </namespace >
         </include >
-        <include id="341" addr="0x7f0bacb37b30" >
-            <attributelist id="342" addr="0x7f0bacb37b30" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/Addon.h" id="343" addr="0x7f0bacb3d530" />
+        <include id="341" addr="0x7f136da2eb30" >
+            <attributelist id="342" addr="0x7f136da2eb30" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/Addon.h" id="343" addr="0x7f136da34530" />
             </attributelist >
 
-            <namespace id="344" addr="0x7f0bacb37bf0" >
-                <attributelist id="345" addr="0x7f0bacb37bf0" >
-                    <attribute name="sym_name" value="XBMCAddon" id="346" addr="0x7f0bacb3d530" />
-                    <attribute name="name" value="XBMCAddon" id="347" addr="0x7f0bacb3d530" />
-                    <attribute name="sym_previousSibling" value="0x7f0bacb37450" id="348" addr="0x7f0bacb37450" />
-                    <typescope id="349" addr="0x7f0bacb3c250" >
-                        <attributelist id="350" addr="0x7f0bacb3c250" >
-                            <attribute name="name" value="XBMCAddon" id="351" addr="0x7f0bacb3d530" />
-                            <typetab id="352" addr="0x7f0bacb3c290" >
-                                <attributelist id="353" addr="0x7f0bacb3c290" >
-                                    <attribute name="String" value="std::string" id="354" addr="0x7f0bacb3d530" />
+            <namespace id="344" addr="0x7f136da2ebf0" >
+                <attributelist id="345" addr="0x7f136da2ebf0" >
+                    <attribute name="sym_name" value="XBMCAddon" id="346" addr="0x7f136da34530" />
+                    <attribute name="name" value="XBMCAddon" id="347" addr="0x7f136da34530" />
+                    <attribute name="sym_previousSibling" value="0x7f136da2e450" id="348" addr="0x7f136da2e450" />
+                    <typescope id="349" addr="0x7f136da33250" >
+                        <attributelist id="350" addr="0x7f136da33250" >
+                            <attribute name="name" value="XBMCAddon" id="351" addr="0x7f136da34530" />
+                            <typetab id="352" addr="0x7f136da33290" >
+                                <attributelist id="353" addr="0x7f136da33290" >
+                                    <attribute name="String" value="std::string" id="354" addr="0x7f136da34530" />
                                 </attributelist >
-                                <typetabsitem id="355" addr="0x7f0bacb3c470" >
-                                    <attributelist id="356" addr="0x7f0bacb3c470" >
+                                <typetabsitem id="355" addr="0x7f136da33470" >
+                                    <attributelist id="356" addr="0x7f136da33470" >
                                     </attributelist >
                                 </typetabsitem >
                             </typetab >
-                            <attribute name="parent" value="0x7f0bacb20a30" id="357" addr="0x7f0bacb20a30" />
-                            <attribute name="qname" value="XBMCAddon" id="358" addr="0x7f0bacb3d530" />
-                            <attribute name="symtab" value="0x7f0bacb373b0" id="359" addr="0x7f0bacb373b0" />
+                            <attribute name="parent" value="0x7f136da17a30" id="357" addr="0x7f136da17a30" />
+                            <attribute name="qname" value="XBMCAddon" id="358" addr="0x7f136da34530" />
+                            <attribute name="symtab" value="0x7f136da2e3b0" id="359" addr="0x7f136da2e3b0" />
                         </attributelist >
-                        <typescopesitem id="360" addr="0x7f0bacb37370" >
-                            <attributelist id="361" addr="0x7f0bacb37370" >
+                        <typescopesitem id="360" addr="0x7f136da2e370" >
+                            <attributelist id="361" addr="0x7f136da2e370" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="362" addr="0x7f0bacb3c290" >
-                            <attributelist id="363" addr="0x7f0bacb3c290" >
-                                <attribute name="String" value="std::string" id="364" addr="0x7f0bacb3d530" />
+                        <typescopesitem id="362" addr="0x7f136da33290" >
+                            <attributelist id="363" addr="0x7f136da33290" >
+                                <attribute name="String" value="std::string" id="364" addr="0x7f136da34530" />
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="365" addr="0x7f0bacb20a30" >
-                            <attributelist id="366" addr="0x7f0bacb20a30" >
-                                <attribute name="name" value="" id="367" addr="0x7f0bacb3d530" />
-                                <typetab id="368" addr="0x7f0bacb20a90" >
-                                    <attributelist id="369" addr="0x7f0bacb20a90" >
+                        <typescopesitem id="365" addr="0x7f136da17a30" >
+                            <attributelist id="366" addr="0x7f136da17a30" >
+                                <attribute name="name" value="" id="367" addr="0x7f136da34530" />
+                                <typetab id="368" addr="0x7f136da17a90" >
+                                    <attributelist id="369" addr="0x7f136da17a90" >
                                     </attributelist >
                                 </typetab >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="370" addr="0x7f0bacb3c390" >
-                            <attributelist id="371" addr="0x7f0bacb3c390" >
+                        <typescopesitem id="370" addr="0x7f136da33390" >
+                            <attributelist id="371" addr="0x7f136da33390" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="372" addr="0x7f0bacb373b0" >
-                            <attributelist id="373" addr="0x7f0bacb373b0" >
-                                <attribute name="name" value="XBMCAddon" id="374" addr="0x7f0bacb3d530" />
-                                <attribute name="csymtab" value="0x7f0bacb373f0" id="375" addr="0x7f0bacb373f0" />
-                                <attribute name="symtab" value="0x7f0bacb37390" id="376" addr="0x7f0bacb37390" />
+                        <typescopesitem id="372" addr="0x7f136da2e3b0" >
+                            <attributelist id="373" addr="0x7f136da2e3b0" >
+                                <attribute name="name" value="XBMCAddon" id="374" addr="0x7f136da34530" />
+                                <attribute name="csymtab" value="0x7f136da2e3f0" id="375" addr="0x7f136da2e3f0" />
+                                <attribute name="symtab" value="0x7f136da2e390" id="376" addr="0x7f136da2e390" />
                             </attributelist >
                         </typescopesitem >
                     </typescope >
-                    <attribute name="symtab" value="0x7f0bacb373b0" id="377" addr="0x7f0bacb373b0" />
-                    <attribute name="sym_symtab" value="0x7f0bacb20950" id="378" addr="0x7f0bacb20950" />
+                    <attribute name="symtab" value="0x7f136da2e3b0" id="377" addr="0x7f136da2e3b0" />
+                    <attribute name="sym_symtab" value="0x7f136da17950" id="378" addr="0x7f136da17950" />
                 </attributelist >
 
-                <namespace id="379" addr="0x7f0bacb37d10" >
-                    <attributelist id="380" addr="0x7f0bacb37d10" >
-                        <attribute name="sym_name" value="xbmcaddon" id="381" addr="0x7f0bacb3d530" />
-                        <attribute name="name" value="xbmcaddon" id="382" addr="0x7f0bacb3d530" />
-                        <attribute name="feature_knownbasetypes" value="AddonClass" id="383" addr="0x7f0bacb3d530" />
-                        <typescope id="384" addr="0x7f0bacb3c630" >
-                            <attributelist id="385" addr="0x7f0bacb3c630" >
-                                <attribute name="name" value="xbmcaddon" id="386" addr="0x7f0bacb3d530" />
-                                <typetab id="387" addr="0x7f0bacb3c650" >
-                                    <attributelist id="388" addr="0x7f0bacb3c650" >
-                                        <attribute name="Addon" value="Addon" id="389" addr="0x7f0bacb3d530" />
+                <namespace id="379" addr="0x7f136da2ed10" >
+                    <attributelist id="380" addr="0x7f136da2ed10" >
+                        <attribute name="sym_name" value="xbmcaddon" id="381" addr="0x7f136da34530" />
+                        <attribute name="name" value="xbmcaddon" id="382" addr="0x7f136da34530" />
+                        <attribute name="feature_knownbasetypes" value="AddonClass" id="383" addr="0x7f136da34530" />
+                        <typescope id="384" addr="0x7f136da33630" >
+                            <attributelist id="385" addr="0x7f136da33630" >
+                                <attribute name="name" value="xbmcaddon" id="386" addr="0x7f136da34530" />
+                                <typetab id="387" addr="0x7f136da33650" >
+                                    <attributelist id="388" addr="0x7f136da33650" >
+                                        <attribute name="Addon" value="Addon" id="389" addr="0x7f136da34530" />
                                     </attributelist >
-                                    <typetabsitem id="390" addr="0x7f0bacb3c7b0" >
-                                        <attributelist id="391" addr="0x7f0bacb3c7b0" >
+                                    <typetabsitem id="390" addr="0x7f136da337b0" >
+                                        <attributelist id="391" addr="0x7f136da337b0" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
-                                <attribute name="parent" value="0x7f0bacb3c250" id="392" addr="0x7f0bacb3c250" />
-                                <attribute name="qname" value="XBMCAddon::xbmcaddon" id="393" addr="0x7f0bacb3d530" />
-                                <attribute name="symtab" value="0x7f0bacb37c90" id="394" addr="0x7f0bacb37c90" />
+                                <attribute name="parent" value="0x7f136da33250" id="392" addr="0x7f136da33250" />
+                                <attribute name="qname" value="XBMCAddon::xbmcaddon" id="393" addr="0x7f136da34530" />
+                                <attribute name="symtab" value="0x7f136da2ec90" id="394" addr="0x7f136da2ec90" />
                             </attributelist >
-                            <typescopesitem id="395" addr="0x7f0bacb37c50" >
-                                <attributelist id="396" addr="0x7f0bacb37c50" >
+                            <typescopesitem id="395" addr="0x7f136da2ec50" >
+                                <attributelist id="396" addr="0x7f136da2ec50" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="397" addr="0x7f0bacb3c650" >
-                                <attributelist id="398" addr="0x7f0bacb3c650" >
-                                    <attribute name="Addon" value="Addon" id="399" addr="0x7f0bacb3d530" />
+                            <typescopesitem id="397" addr="0x7f136da33650" >
+                                <attributelist id="398" addr="0x7f136da33650" >
+                                    <attribute name="Addon" value="Addon" id="399" addr="0x7f136da34530" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="400" addr="0x7f0bacb3c250" >
-                                <attributelist id="401" addr="0x7f0bacb3c250" >
-                                    <attribute name="name" value="XBMCAddon" id="402" addr="0x7f0bacb3d530" />
-                                    <typetab id="403" addr="0x7f0bacb3c290" >
-                                        <attributelist id="404" addr="0x7f0bacb3c290" >
-                                            <attribute name="String" value="std::string" id="405" addr="0x7f0bacb3d530" />
+                            <typescopesitem id="400" addr="0x7f136da33250" >
+                                <attributelist id="401" addr="0x7f136da33250" >
+                                    <attribute name="name" value="XBMCAddon" id="402" addr="0x7f136da34530" />
+                                    <typetab id="403" addr="0x7f136da33290" >
+                                        <attributelist id="404" addr="0x7f136da33290" >
+                                            <attribute name="String" value="std::string" id="405" addr="0x7f136da34530" />
                                         </attributelist >
-                                        <typetabsitem id="406" addr="0x7f0bacb3c470" >
-                                            <attributelist id="407" addr="0x7f0bacb3c470" >
+                                        <typetabsitem id="406" addr="0x7f136da33470" >
+                                            <attributelist id="407" addr="0x7f136da33470" >
                                             </attributelist >
                                         </typetabsitem >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f0bacb20a30" id="408" addr="0x7f0bacb20a30" />
-                                    <attribute name="qname" value="XBMCAddon" id="409" addr="0x7f0bacb3d530" />
-                                    <attribute name="symtab" value="0x7f0bacb373b0" id="410" addr="0x7f0bacb373b0" />
+                                    <attribute name="parent" value="0x7f136da17a30" id="408" addr="0x7f136da17a30" />
+                                    <attribute name="qname" value="XBMCAddon" id="409" addr="0x7f136da34530" />
+                                    <attribute name="symtab" value="0x7f136da2e3b0" id="410" addr="0x7f136da2e3b0" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="411" addr="0x7f0bacb3c670" >
-                                <attributelist id="412" addr="0x7f0bacb3c670" >
+                            <typescopesitem id="411" addr="0x7f136da33670" >
+                                <attributelist id="412" addr="0x7f136da33670" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="413" addr="0x7f0bacb37c90" >
-                                <attributelist id="414" addr="0x7f0bacb37c90" >
-                                    <attribute name="name" value="xbmcaddon" id="415" addr="0x7f0bacb3d530" />
-                                    <attribute name="csymtab" value="0x7f0bacb37cd0" id="416" addr="0x7f0bacb37cd0" />
-                                    <attribute name="symtab" value="0x7f0bacb37c70" id="417" addr="0x7f0bacb37c70" />
+                            <typescopesitem id="413" addr="0x7f136da2ec90" >
+                                <attributelist id="414" addr="0x7f136da2ec90" >
+                                    <attribute name="name" value="xbmcaddon" id="415" addr="0x7f136da34530" />
+                                    <attribute name="csymtab" value="0x7f136da2ecd0" id="416" addr="0x7f136da2ecd0" />
+                                    <attribute name="symtab" value="0x7f136da2ec70" id="417" addr="0x7f136da2ec70" />
                                 </attributelist >
                             </typescopesitem >
                         </typescope >
-                        <attribute name="symtab" value="0x7f0bacb37c90" id="418" addr="0x7f0bacb37c90" />
-                        <attribute name="sym_symtab" value="0x7f0bacb373b0" id="419" addr="0x7f0bacb373b0" />
-                        <attribute name="sym_overname" value="__SWIG_0" id="420" addr="0x7f0bacb3d530" />
+                        <attribute name="symtab" value="0x7f136da2ec90" id="418" addr="0x7f136da2ec90" />
+                        <attribute name="sym_symtab" value="0x7f136da2e3b0" id="419" addr="0x7f136da2e3b0" />
+                        <attribute name="sym_overname" value="__SWIG_0" id="420" addr="0x7f136da34530" />
                     </attributelist >
 
-                    <cdecl id="421" addr="0x7f0bacb37e70" >
-                        <attributelist id="422" addr="0x7f0bacb37e70" >
-                            <attribute name="sym_name" value="AddonException" id="423" addr="0x7f0bacb3d530" />
-                            <attribute name="name" value="XBMCAddon::xbmcaddon::AddonException" id="424" addr="0x7f0bacb3d530" />
-                            <attribute name="kind" value="variable" id="425" addr="0x7f0bacb3d530" />
-                            <attribute name="type" value="XBMCCOMMONS_STANDARD_EXCEPTION" id="426" addr="0x7f0bacb3d530" />
-                            <attribute name="sym_symtab" value="0x7f0bacb37c90" id="427" addr="0x7f0bacb37c90" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="428" addr="0x7f0bacb3d530" />
+                    <cdecl id="421" addr="0x7f136da2ee70" >
+                        <attributelist id="422" addr="0x7f136da2ee70" >
+                            <attribute name="sym_name" value="AddonException" id="423" addr="0x7f136da34530" />
+                            <attribute name="name" value="XBMCAddon::xbmcaddon::AddonException" id="424" addr="0x7f136da34530" />
+                            <attribute name="kind" value="variable" id="425" addr="0x7f136da34530" />
+                            <attribute name="type" value="XBMCCOMMONS_STANDARD_EXCEPTION" id="426" addr="0x7f136da34530" />
+                            <attribute name="sym_symtab" value="0x7f136da2ec90" id="427" addr="0x7f136da2ec90" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="428" addr="0x7f136da34530" />
                         </attributelist >
                      
                     </cdecl >
-                    <class id="429" addr="0x7f0bacb38110" >
-                        <attributelist id="430" addr="0x7f0bacb38110" >
-                            <attribute name="name" value="XBMCAddon::xbmcaddon::Addon" id="431" addr="0x7f0bacb3d530" />
-                            <attribute name="sym_symtab" value="0x7f0bacb37c90" id="432" addr="0x7f0bacb37c90" />
-                            <attribute name="symtab" value="0x7f0bacb38290" id="433" addr="0x7f0bacb38290" />
-                            <attribute name="allows_typedef" value="1" id="434" addr="0x7f0bacb3d530" />
-                            <attribute name="typepass_visit" value="1" id="435" addr="0x7f0bacb3d530" />
-                            <attribute name="allocate_visit" value="1" id="436" addr="0x7f0bacb3d530" />
-                            <attribute name="kind" value="class" id="437" addr="0x7f0bacb3d530" />
-                            <attribute name="sym_name" value="Addon" id="438" addr="0x7f0bacb3d530" />
-                            <attribute name="allocate_default_constructor" value="1" id="439" addr="0x7f0bacb3d530" />
-                            <attribute name="allocate_has_constructor" value="1" id="440" addr="0x7f0bacb3d530" />
-                            <attribute name="allocate_public_constructor" value="1" id="441" addr="0x7f0bacb3d530" />
-                            <attribute name="allocate_has_destructor" value="1" id="442" addr="0x7f0bacb3d530" />
-                            <attribute name="allocate_default_destructor" value="1" id="443" addr="0x7f0bacb3d530" />
-                            <attribute name="allocate_copy_constructor" value="1" id="444" addr="0x7f0bacb3d530" />
-                            <attribute name="privatebaselist" value="0x7f0bacb38090" id="445" addr="0x7f0bacb38090" />
-                            <attribute name="protectedbaselist" value="0x7f0bacb38070" id="446" addr="0x7f0bacb38070" />
-                            <baselist id="447" addr="0x7f0bacb38050" >
-                                <base name="AddonClass" id="448" addr="0x7f0bacb37fb0" />
+                    <class id="429" addr="0x7f136da2f110" >
+                        <attributelist id="430" addr="0x7f136da2f110" >
+                            <attribute name="name" value="XBMCAddon::xbmcaddon::Addon" id="431" addr="0x7f136da34530" />
+                            <attribute name="sym_symtab" value="0x7f136da2ec90" id="432" addr="0x7f136da2ec90" />
+                            <attribute name="symtab" value="0x7f136da2f290" id="433" addr="0x7f136da2f290" />
+                            <attribute name="allows_typedef" value="1" id="434" addr="0x7f136da34530" />
+                            <attribute name="typepass_visit" value="1" id="435" addr="0x7f136da34530" />
+                            <attribute name="allocate_visit" value="1" id="436" addr="0x7f136da34530" />
+                            <attribute name="kind" value="class" id="437" addr="0x7f136da34530" />
+                            <attribute name="sym_name" value="Addon" id="438" addr="0x7f136da34530" />
+                            <attribute name="allocate_default_constructor" value="1" id="439" addr="0x7f136da34530" />
+                            <attribute name="allocate_has_constructor" value="1" id="440" addr="0x7f136da34530" />
+                            <attribute name="allocate_public_constructor" value="1" id="441" addr="0x7f136da34530" />
+                            <attribute name="allocate_has_destructor" value="1" id="442" addr="0x7f136da34530" />
+                            <attribute name="allocate_default_destructor" value="1" id="443" addr="0x7f136da34530" />
+                            <attribute name="allocate_copy_constructor" value="1" id="444" addr="0x7f136da34530" />
+                            <attribute name="privatebaselist" value="0x7f136da2f090" id="445" addr="0x7f136da2f090" />
+                            <attribute name="protectedbaselist" value="0x7f136da2f070" id="446" addr="0x7f136da2f070" />
+                            <baselist id="447" addr="0x7f136da2f050" >
+                                <base name="AddonClass" id="448" addr="0x7f136da2efb0" />
                             </baselist >
-                            <attribute name="module" value="xbmcaddon" id="449" addr="0x7f0bacb36fd0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="450" addr="0x7f0bacb3d530" />
-                            <typescope id="451" addr="0x7f0bacb3c8b0" >
-                                <attributelist id="452" addr="0x7f0bacb3c8b0" >
-                                    <attribute name="name" value="Addon" id="453" addr="0x7f0bacb3d530" />
-                                    <typetab id="454" addr="0x7f0bacb3c8d0" >
-                                        <attributelist id="455" addr="0x7f0bacb3c8d0" >
+                            <attribute name="module" value="xbmcaddon" id="449" addr="0x7f136da2dfd0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="450" addr="0x7f136da34530" />
+                            <typescope id="451" addr="0x7f136da338b0" >
+                                <attributelist id="452" addr="0x7f136da338b0" >
+                                    <attribute name="name" value="Addon" id="453" addr="0x7f136da34530" />
+                                    <typetab id="454" addr="0x7f136da338d0" >
+                                        <attributelist id="455" addr="0x7f136da338d0" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f0bacb3c630" id="456" addr="0x7f0bacb3c630" />
-                                    <attribute name="qname" value="XBMCAddon::xbmcaddon::Addon" id="457" addr="0x7f0bacb3d530" />
-                                    <attribute name="symtab" value="0x7f0bacb38290" id="458" addr="0x7f0bacb38290" />
+                                    <attribute name="parent" value="0x7f136da33630" id="456" addr="0x7f136da33630" />
+                                    <attribute name="qname" value="XBMCAddon::xbmcaddon::Addon" id="457" addr="0x7f136da34530" />
+                                    <attribute name="symtab" value="0x7f136da2f290" id="458" addr="0x7f136da2f290" />
                                 </attributelist >
-                                <typescopesitem id="459" addr="0x7f0bacb3c810" >
-                                    <attributelist id="460" addr="0x7f0bacb3c810" >
+                                <typescopesitem id="459" addr="0x7f136da33810" >
+                                    <attributelist id="460" addr="0x7f136da33810" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="461" addr="0x7f0bacb3c8d0" >
-                                    <attributelist id="462" addr="0x7f0bacb3c8d0" >
+                                <typescopesitem id="461" addr="0x7f136da338d0" >
+                                    <attributelist id="462" addr="0x7f136da338d0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="463" addr="0x7f0bacb3c630" >
-                                    <attributelist id="464" addr="0x7f0bacb3c630" >
-                                        <attribute name="name" value="xbmcaddon" id="465" addr="0x7f0bacb3d530" />
-                                        <typetab id="466" addr="0x7f0bacb3c650" >
-                                            <attributelist id="467" addr="0x7f0bacb3c650" >
-                                                <attribute name="Addon" value="Addon" id="468" addr="0x7f0bacb3d530" />
+                                <typescopesitem id="463" addr="0x7f136da33630" >
+                                    <attributelist id="464" addr="0x7f136da33630" >
+                                        <attribute name="name" value="xbmcaddon" id="465" addr="0x7f136da34530" />
+                                        <typetab id="466" addr="0x7f136da33650" >
+                                            <attributelist id="467" addr="0x7f136da33650" >
+                                                <attribute name="Addon" value="Addon" id="468" addr="0x7f136da34530" />
                                             </attributelist >
-                                            <typetabsitem id="469" addr="0x7f0bacb3c7b0" >
-                                                <attributelist id="470" addr="0x7f0bacb3c7b0" >
+                                            <typetabsitem id="469" addr="0x7f136da337b0" >
+                                                <attributelist id="470" addr="0x7f136da337b0" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7f0bacb3c250" id="471" addr="0x7f0bacb3c250" />
-                                        <attribute name="qname" value="XBMCAddon::xbmcaddon" id="472" addr="0x7f0bacb3d530" />
-                                        <attribute name="symtab" value="0x7f0bacb37c90" id="473" addr="0x7f0bacb37c90" />
+                                        <attribute name="parent" value="0x7f136da33250" id="471" addr="0x7f136da33250" />
+                                        <attribute name="qname" value="XBMCAddon::xbmcaddon" id="472" addr="0x7f136da34530" />
+                                        <attribute name="symtab" value="0x7f136da2ec90" id="473" addr="0x7f136da2ec90" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="474" addr="0x7f0bacb3c8f0" >
-                                    <attributelist id="475" addr="0x7f0bacb3c8f0" >
+                                <typescopesitem id="474" addr="0x7f136da338f0" >
+                                    <attributelist id="475" addr="0x7f136da338f0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="476" addr="0x7f0bacb38290" >
-                                    <attributelist id="477" addr="0x7f0bacb38290" >
-                                        <attribute name="name" value="Addon" id="478" addr="0x7f0bacb3d530" />
-                                        <attribute name="csymtab" value="0x7f0bacb382f0" id="479" addr="0x7f0bacb382f0" />
-                                        <attribute name="symtab" value="0x7f0bacb38270" id="480" addr="0x7f0bacb38270" />
+                                <typescopesitem id="476" addr="0x7f136da2f290" >
+                                    <attributelist id="477" addr="0x7f136da2f290" >
+                                        <attribute name="name" value="Addon" id="478" addr="0x7f136da34530" />
+                                        <attribute name="csymtab" value="0x7f136da2f2f0" id="479" addr="0x7f136da2f2f0" />
+                                        <attribute name="symtab" value="0x7f136da2f270" id="480" addr="0x7f136da2f270" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <cdecl id="481" addr="0x7f0bacb383f0" >
-                            <attributelist id="482" addr="0x7f0bacb383f0" >
-                                <attribute name="ismember" value="1" id="483" addr="0x7f0bacb3d530" />
-                                <attribute name="name" value="pAddon" id="484" addr="0x7f0bacb3d530" />
-                                <attribute name="decl" value="" id="485" addr="0x7f0bacb3d530" />
-                                <attribute name="access" value="private" id="486" addr="0x7f0bacb3d530" />
-                                <attribute name="kind" value="variable" id="487" addr="0x7f0bacb3d530" />
-                                <attribute name="type" value="ADDON::AddonPtr" id="488" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_symtab" value="0x7f0bacb38290" id="489" addr="0x7f0bacb38290" />
+                        <cdecl id="481" addr="0x7f136da2f3f0" >
+                            <attributelist id="482" addr="0x7f136da2f3f0" >
+                                <attribute name="ismember" value="1" id="483" addr="0x7f136da34530" />
+                                <attribute name="name" value="pAddon" id="484" addr="0x7f136da34530" />
+                                <attribute name="decl" value="" id="485" addr="0x7f136da34530" />
+                                <attribute name="access" value="private" id="486" addr="0x7f136da34530" />
+                                <attribute name="kind" value="variable" id="487" addr="0x7f136da34530" />
+                                <attribute name="type" value="ADDON::AddonPtr" id="488" addr="0x7f136da34530" />
+                                <attribute name="sym_symtab" value="0x7f136da2f290" id="489" addr="0x7f136da2f290" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="490" addr="0x7f0bacb38670" >
-                            <attributelist id="491" addr="0x7f0bacb38670" >
-                                <attribute name="ismember" value="1" id="492" addr="0x7f0bacb3d530" />
-                                <attribute name="name" value="getDefaultId" id="493" addr="0x7f0bacb3d530" />
-                                <attribute name="decl" value="f()." id="494" addr="0x7f0bacb3d530" />
-                                <attribute name="access" value="private" id="495" addr="0x7f0bacb3d530" />
-                                <attribute name="kind" value="function" id="496" addr="0x7f0bacb3d530" />
-                                <attribute name="type" value="XBMCAddon::String" id="497" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_symtab" value="0x7f0bacb38290" id="498" addr="0x7f0bacb38290" />
+                        <cdecl id="490" addr="0x7f136da2f670" >
+                            <attributelist id="491" addr="0x7f136da2f670" >
+                                <attribute name="ismember" value="1" id="492" addr="0x7f136da34530" />
+                                <attribute name="name" value="getDefaultId" id="493" addr="0x7f136da34530" />
+                                <attribute name="decl" value="f()." id="494" addr="0x7f136da34530" />
+                                <attribute name="access" value="private" id="495" addr="0x7f136da34530" />
+                                <attribute name="kind" value="function" id="496" addr="0x7f136da34530" />
+                                <attribute name="type" value="XBMCAddon::String" id="497" addr="0x7f136da34530" />
+                                <attribute name="sym_symtab" value="0x7f136da2f290" id="498" addr="0x7f136da2f290" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="499" addr="0x7f0bacb38810" >
-                            <attributelist id="500" addr="0x7f0bacb38810" >
-                                <attribute name="ismember" value="1" id="501" addr="0x7f0bacb3d530" />
-                                <attribute name="name" value="getAddonVersion" id="502" addr="0x7f0bacb3d530" />
-                                <attribute name="decl" value="f()." id="503" addr="0x7f0bacb3d530" />
-                                <attribute name="access" value="private" id="504" addr="0x7f0bacb3d530" />
-                                <attribute name="kind" value="function" id="505" addr="0x7f0bacb3d530" />
-                                <attribute name="type" value="XBMCAddon::String" id="506" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_symtab" value="0x7f0bacb38290" id="507" addr="0x7f0bacb38290" />
+                        <cdecl id="499" addr="0x7f136da2f810" >
+                            <attributelist id="500" addr="0x7f136da2f810" >
+                                <attribute name="ismember" value="1" id="501" addr="0x7f136da34530" />
+                                <attribute name="name" value="getAddonVersion" id="502" addr="0x7f136da34530" />
+                                <attribute name="decl" value="f()." id="503" addr="0x7f136da34530" />
+                                <attribute name="access" value="private" id="504" addr="0x7f136da34530" />
+                                <attribute name="kind" value="function" id="505" addr="0x7f136da34530" />
+                                <attribute name="type" value="XBMCAddon::String" id="506" addr="0x7f136da34530" />
+                                <attribute name="sym_symtab" value="0x7f136da2f290" id="507" addr="0x7f136da2f290" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="508" addr="0x7f0bacb38c10" >
-                            <attributelist id="509" addr="0x7f0bacb38c10" >
-                                <attribute name="ismember" value="1" id="510" addr="0x7f0bacb3d530" />
-                                <attribute name="name" value="UpdateSettingInActiveDialog" id="511" addr="0x7f0bacb3d530" />
-                                <attribute name="decl" value="f(p.q(const).char,r.q(const).XBMCAddon::String)." id="512" addr="0x7f0bacb3d530" />
-                                <parmlist id="513" addr="0x7f0bacb38a10" >
+                        <cdecl id="508" addr="0x7f136da2fc10" >
+                            <attributelist id="509" addr="0x7f136da2fc10" >
+                                <attribute name="ismember" value="1" id="510" addr="0x7f136da34530" />
+                                <attribute name="name" value="UpdateSettingInActiveDialog" id="511" addr="0x7f136da34530" />
+                                <attribute name="decl" value="f(p.q(const).char,r.q(const).XBMCAddon::String)." id="512" addr="0x7f136da34530" />
+                                <parmlist id="513" addr="0x7f136da2fa10" >
                                     <parm id="514">
-                                        <attributelist id="515" addr="0x7f0bacb38a10" >
-                                            <attribute name="name" value="id" id="516" addr="0x7f0bacb3d530" />
-                                            <attribute name="type" value="p.q(const).char" id="517" addr="0x7f0bacb3d530" />
+                                        <attributelist id="515" addr="0x7f136da2fa10" >
+                                            <attribute name="name" value="id" id="516" addr="0x7f136da34530" />
+                                            <attribute name="type" value="p.q(const).char" id="517" addr="0x7f136da34530" />
                                         </attributelist >
                                     </parm >
                                     <parm id="518">
-                                        <attributelist id="519" addr="0x7f0bacb38b50" >
-                                            <attribute name="name" value="value" id="520" addr="0x7f0bacb3d530" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="521" addr="0x7f0bacb3d530" />
+                                        <attributelist id="519" addr="0x7f136da2fb50" >
+                                            <attribute name="name" value="value" id="520" addr="0x7f136da34530" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="521" addr="0x7f136da34530" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="access" value="private" id="522" addr="0x7f0bacb3d530" />
-                                <attribute name="kind" value="function" id="523" addr="0x7f0bacb3d530" />
-                                <attribute name="type" value="bool" id="524" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_symtab" value="0x7f0bacb38290" id="525" addr="0x7f0bacb38290" />
+                                <attribute name="access" value="private" id="522" addr="0x7f136da34530" />
+                                <attribute name="kind" value="function" id="523" addr="0x7f136da34530" />
+                                <attribute name="type" value="bool" id="524" addr="0x7f136da34530" />
+                                <attribute name="sym_symtab" value="0x7f136da2f290" id="525" addr="0x7f136da2f290" />
                             </attributelist >
                          
                         </cdecl >
-                        <access id="526" addr="0x7f0bacb38d30" >
-                            <attributelist id="527" addr="0x7f0bacb38d30" >
-                                <attribute name="kind" value="public" id="528" addr="0x7f0bacb3d530" />
+                        <access id="526" addr="0x7f136da2fd30" >
+                            <attributelist id="527" addr="0x7f136da2fd30" >
+                                <attribute name="kind" value="public" id="528" addr="0x7f136da34530" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="529" addr="0x7f0bacb38f70" >
-                            <attributelist id="530" addr="0x7f0bacb38f70" >
-                                <attribute name="name" value="Addon" id="531" addr="0x7f0bacb3d530" />
-                                <attribute name="ismember" value="1" id="532" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_symtab" value="0x7f0bacb38290" id="533" addr="0x7f0bacb38290" />
-                                <attribute name="sym_nextSibling" value="0x7f0bacb39090" id="534" addr="0x7f0bacb39090" />
-                                <attribute name="csym_nextSibling" value="0x7f0bacb39090" id="535" addr="0x7f0bacb39090" />
-                                <attribute name="sym_name" value="Addon" id="536" addr="0x7f0bacb3d530" />
-                                <attribute name="decl" value="f(p.q(const).char)." id="537" addr="0x7f0bacb3d530" />
-                                <attribute name="access" value="public" id="538" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_overloaded" value="0x7f0bacb38f70" id="539" addr="0x7f0bacb38f70" />
-                                <parmlist id="540" addr="0x7f0bacb38eb0" >
+                        <constructor id="529" addr="0x7f136da2ff70" >
+                            <attributelist id="530" addr="0x7f136da2ff70" >
+                                <attribute name="name" value="Addon" id="531" addr="0x7f136da34530" />
+                                <attribute name="ismember" value="1" id="532" addr="0x7f136da34530" />
+                                <attribute name="sym_symtab" value="0x7f136da2f290" id="533" addr="0x7f136da2f290" />
+                                <attribute name="sym_nextSibling" value="0x7f136da30090" id="534" addr="0x7f136da30090" />
+                                <attribute name="csym_nextSibling" value="0x7f136da30090" id="535" addr="0x7f136da30090" />
+                                <attribute name="sym_name" value="Addon" id="536" addr="0x7f136da34530" />
+                                <attribute name="decl" value="f(p.q(const).char)." id="537" addr="0x7f136da34530" />
+                                <attribute name="access" value="public" id="538" addr="0x7f136da34530" />
+                                <attribute name="sym_overloaded" value="0x7f136da2ff70" id="539" addr="0x7f136da2ff70" />
+                                <parmlist id="540" addr="0x7f136da2feb0" >
                                     <parm id="541">
-                                        <attributelist id="542" addr="0x7f0bacb38eb0" >
-                                            <attribute name="name" value="id" id="543" addr="0x7f0bacb3d530" />
-                                            <attribute name="value" value="NULL" id="544" addr="0x7f0bacb3d530" />
-                                            <attribute name="type" value="p.q(const).char" id="545" addr="0x7f0bacb3d530" />
+                                        <attributelist id="542" addr="0x7f136da2feb0" >
+                                            <attribute name="name" value="id" id="543" addr="0x7f136da34530" />
+                                            <attribute name="value" value="NULL" id="544" addr="0x7f136da34530" />
+                                            <attribute name="type" value="p.q(const).char" id="545" addr="0x7f136da34530" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_0" id="546" addr="0x7f0bacb3d530" />
-                                <attribute name="storage" value="explicit" id="547" addr="0x7f0bacb3d530" />
-                                <attribute name="feature_new" value="1" id="548" addr="0x7f0bacb3d530" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="546" addr="0x7f136da34530" />
+                                <attribute name="storage" value="explicit" id="547" addr="0x7f136da34530" />
+                                <attribute name="feature_new" value="1" id="548" addr="0x7f136da34530" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="549" addr="0x7f0bacb39090" >
-                            <attributelist id="550" addr="0x7f0bacb39090" >
-                                <attribute name="name" value="Addon" id="551" addr="0x7f0bacb3d530" />
-                                <attribute name="ismember" value="1" id="552" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_symtab" value="0x7f0bacb38290" id="553" addr="0x7f0bacb38290" />
-                                <attribute name="sym_previousSibling" value="0x7f0bacb38f70" id="554" addr="0x7f0bacb38f70" />
-                                <attribute name="sym_name" value="Addon" id="555" addr="0x7f0bacb3d530" />
-                                <attribute name="defaultargs" value="0x7f0bacb38f70" id="556" addr="0x7f0bacb38f70" />
-                                <attribute name="decl" value="f()." id="557" addr="0x7f0bacb3d530" />
-                                <attribute name="access" value="public" id="558" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_overloaded" value="0x7f0bacb38f70" id="559" addr="0x7f0bacb38f70" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="560" addr="0x7f0bacb3d530" />
-                                <attribute name="storage" value="explicit" id="561" addr="0x7f0bacb3d530" />
-                                <attribute name="feature_new" value="1" id="562" addr="0x7f0bacb3d530" />
+                        <constructor id="549" addr="0x7f136da30090" >
+                            <attributelist id="550" addr="0x7f136da30090" >
+                                <attribute name="name" value="Addon" id="551" addr="0x7f136da34530" />
+                                <attribute name="ismember" value="1" id="552" addr="0x7f136da34530" />
+                                <attribute name="sym_symtab" value="0x7f136da2f290" id="553" addr="0x7f136da2f290" />
+                                <attribute name="sym_previousSibling" value="0x7f136da2ff70" id="554" addr="0x7f136da2ff70" />
+                                <attribute name="sym_name" value="Addon" id="555" addr="0x7f136da34530" />
+                                <attribute name="defaultargs" value="0x7f136da2ff70" id="556" addr="0x7f136da2ff70" />
+                                <attribute name="decl" value="f()." id="557" addr="0x7f136da34530" />
+                                <attribute name="access" value="public" id="558" addr="0x7f136da34530" />
+                                <attribute name="sym_overloaded" value="0x7f136da2ff70" id="559" addr="0x7f136da2ff70" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="560" addr="0x7f136da34530" />
+                                <attribute name="storage" value="explicit" id="561" addr="0x7f136da34530" />
+                                <attribute name="feature_new" value="1" id="562" addr="0x7f136da34530" />
                             </attributelist >
                          
                         </constructor >
-                        <destructor id="563" addr="0x7f0bacb392f0" >
-                            <attributelist id="564" addr="0x7f0bacb392f0" >
-                                <attribute name="ismember" value="1" id="565" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_name" value="~Addon" id="566" addr="0x7f0bacb3d530" />
-                                <attribute name="name" value="~Addon" id="567" addr="0x7f0bacb3d530" />
-                                <attribute name="decl" value="f()." id="568" addr="0x7f0bacb3d530" />
-                                <attribute name="access" value="public" id="569" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_symtab" value="0x7f0bacb38290" id="570" addr="0x7f0bacb38290" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="571" addr="0x7f0bacb3d530" />
+                        <destructor id="563" addr="0x7f136da302f0" >
+                            <attributelist id="564" addr="0x7f136da302f0" >
+                                <attribute name="ismember" value="1" id="565" addr="0x7f136da34530" />
+                                <attribute name="sym_name" value="~Addon" id="566" addr="0x7f136da34530" />
+                                <attribute name="name" value="~Addon" id="567" addr="0x7f136da34530" />
+                                <attribute name="decl" value="f()." id="568" addr="0x7f136da34530" />
+                                <attribute name="access" value="public" id="569" addr="0x7f136da34530" />
+                                <attribute name="sym_symtab" value="0x7f136da2f290" id="570" addr="0x7f136da2f290" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="571" addr="0x7f136da34530" />
                             </attributelist >
                          
                         </destructor >
-                        <cdecl id="572" addr="0x7f0bacb395d0" >
-                            <attributelist id="573" addr="0x7f0bacb395d0" >
-                                <attribute name="feature_python_coerceToUnicode" value="true" id="574" addr="0x7f0bacb3d530" />
-                                <attribute name="name" value="getLocalizedString" id="575" addr="0x7f0bacb3d530" />
-                                <attribute name="ismember" value="1" id="576" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_symtab" value="0x7f0bacb38290" id="577" addr="0x7f0bacb38290" />
-                                <attribute name="kind" value="function" id="578" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_name" value="getLocalizedString" id="579" addr="0x7f0bacb3d530" />
-                                <attribute name="decl" value="f(int)." id="580" addr="0x7f0bacb3d530" />
-                                <attribute name="access" value="public" id="581" addr="0x7f0bacb3d530" />
-                                <parmlist id="582" addr="0x7f0bacb39510" >
+                        <cdecl id="572" addr="0x7f136da305d0" >
+                            <attributelist id="573" addr="0x7f136da305d0" >
+                                <attribute name="feature_python_coerceToUnicode" value="true" id="574" addr="0x7f136da34530" />
+                                <attribute name="name" value="getLocalizedString" id="575" addr="0x7f136da34530" />
+                                <attribute name="ismember" value="1" id="576" addr="0x7f136da34530" />
+                                <attribute name="sym_symtab" value="0x7f136da2f290" id="577" addr="0x7f136da2f290" />
+                                <attribute name="kind" value="function" id="578" addr="0x7f136da34530" />
+                                <attribute name="sym_name" value="getLocalizedString" id="579" addr="0x7f136da34530" />
+                                <attribute name="decl" value="f(int)." id="580" addr="0x7f136da34530" />
+                                <attribute name="access" value="public" id="581" addr="0x7f136da34530" />
+                                <parmlist id="582" addr="0x7f136da30510" >
                                     <parm id="583">
-                                        <attributelist id="584" addr="0x7f0bacb39510" >
-                                            <attribute name="name" value="id" id="585" addr="0x7f0bacb3d530" />
-                                            <attribute name="type" value="int" id="586" addr="0x7f0bacb3d530" />
+                                        <attributelist id="584" addr="0x7f136da30510" >
+                                            <attribute name="name" value="id" id="585" addr="0x7f136da34530" />
+                                            <attribute name="type" value="int" id="586" addr="0x7f136da34530" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="XBMCAddon::String" id="587" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="588" addr="0x7f0bacb3d530" />
+                                <attribute name="type" value="XBMCAddon::String" id="587" addr="0x7f136da34530" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="588" addr="0x7f136da34530" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="589" addr="0x7f0bacb39910" >
-                            <attributelist id="590" addr="0x7f0bacb39910" >
-                                <attribute name="name" value="getSetting" id="591" addr="0x7f0bacb3d530" />
-                                <attribute name="ismember" value="1" id="592" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_symtab" value="0x7f0bacb38290" id="593" addr="0x7f0bacb38290" />
-                                <attribute name="kind" value="function" id="594" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_name" value="getSetting" id="595" addr="0x7f0bacb3d530" />
-                                <attribute name="decl" value="f(p.q(const).char)." id="596" addr="0x7f0bacb3d530" />
-                                <attribute name="access" value="public" id="597" addr="0x7f0bacb3d530" />
-                                <parmlist id="598" addr="0x7f0bacb39850" >
+                        <cdecl id="589" addr="0x7f136da30910" >
+                            <attributelist id="590" addr="0x7f136da30910" >
+                                <attribute name="name" value="getSetting" id="591" addr="0x7f136da34530" />
+                                <attribute name="ismember" value="1" id="592" addr="0x7f136da34530" />
+                                <attribute name="sym_symtab" value="0x7f136da2f290" id="593" addr="0x7f136da2f290" />
+                                <attribute name="kind" value="function" id="594" addr="0x7f136da34530" />
+                                <attribute name="sym_name" value="getSetting" id="595" addr="0x7f136da34530" />
+                                <attribute name="decl" value="f(p.q(const).char)." id="596" addr="0x7f136da34530" />
+                                <attribute name="access" value="public" id="597" addr="0x7f136da34530" />
+                                <parmlist id="598" addr="0x7f136da30850" >
                                     <parm id="599">
-                                        <attributelist id="600" addr="0x7f0bacb39850" >
-                                            <attribute name="name" value="id" id="601" addr="0x7f0bacb3d530" />
-                                            <attribute name="type" value="p.q(const).char" id="602" addr="0x7f0bacb3d530" />
+                                        <attributelist id="600" addr="0x7f136da30850" >
+                                            <attribute name="name" value="id" id="601" addr="0x7f136da34530" />
+                                            <attribute name="type" value="p.q(const).char" id="602" addr="0x7f136da34530" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="XBMCAddon::String" id="603" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="604" addr="0x7f0bacb3d530" />
+                                <attribute name="type" value="XBMCAddon::String" id="603" addr="0x7f136da34530" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="604" addr="0x7f136da34530" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="605" addr="0x7f0bacb39c10" >
-                            <attributelist id="606" addr="0x7f0bacb39c10" >
-                                <attribute name="name" value="getSettingBool" id="607" addr="0x7f0bacb3d530" />
-                                <attribute name="ismember" value="1" id="608" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_symtab" value="0x7f0bacb38290" id="609" addr="0x7f0bacb38290" />
-                                <attribute name="kind" value="function" id="610" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_name" value="getSettingBool" id="611" addr="0x7f0bacb3d530" />
-                                <attribute name="decl" value="f(p.q(const).char)." id="612" addr="0x7f0bacb3d530" />
-                                <attribute name="access" value="public" id="613" addr="0x7f0bacb3d530" />
-                                <parmlist id="614" addr="0x7f0bacb39b50" >
+                        <cdecl id="605" addr="0x7f136da30c10" >
+                            <attributelist id="606" addr="0x7f136da30c10" >
+                                <attribute name="name" value="getSettingBool" id="607" addr="0x7f136da34530" />
+                                <attribute name="ismember" value="1" id="608" addr="0x7f136da34530" />
+                                <attribute name="sym_symtab" value="0x7f136da2f290" id="609" addr="0x7f136da2f290" />
+                                <attribute name="kind" value="function" id="610" addr="0x7f136da34530" />
+                                <attribute name="sym_name" value="getSettingBool" id="611" addr="0x7f136da34530" />
+                                <attribute name="decl" value="f(p.q(const).char)." id="612" addr="0x7f136da34530" />
+                                <attribute name="access" value="public" id="613" addr="0x7f136da34530" />
+                                <parmlist id="614" addr="0x7f136da30b50" >
                                     <parm id="615">
-                                        <attributelist id="616" addr="0x7f0bacb39b50" >
-                                            <attribute name="name" value="id" id="617" addr="0x7f0bacb3d530" />
-                                            <attribute name="type" value="p.q(const).char" id="618" addr="0x7f0bacb3d530" />
+                                        <attributelist id="616" addr="0x7f136da30b50" >
+                                            <attribute name="name" value="id" id="617" addr="0x7f136da34530" />
+                                            <attribute name="type" value="p.q(const).char" id="618" addr="0x7f136da34530" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="bool" id="619" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="620" addr="0x7f0bacb3d530" />
+                                <attribute name="type" value="bool" id="619" addr="0x7f136da34530" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="620" addr="0x7f136da34530" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="621" addr="0x7f0bacb39f30" >
-                            <attributelist id="622" addr="0x7f0bacb39f30" >
-                                <attribute name="name" value="getSettingInt" id="623" addr="0x7f0bacb3d530" />
-                                <attribute name="ismember" value="1" id="624" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_symtab" value="0x7f0bacb38290" id="625" addr="0x7f0bacb38290" />
-                                <attribute name="kind" value="function" id="626" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_name" value="getSettingInt" id="627" addr="0x7f0bacb3d530" />
-                                <attribute name="decl" value="f(p.q(const).char)." id="628" addr="0x7f0bacb3d530" />
-                                <attribute name="access" value="public" id="629" addr="0x7f0bacb3d530" />
-                                <parmlist id="630" addr="0x7f0bacb39e70" >
+                        <cdecl id="621" addr="0x7f136da30f30" >
+                            <attributelist id="622" addr="0x7f136da30f30" >
+                                <attribute name="name" value="getSettingInt" id="623" addr="0x7f136da34530" />
+                                <attribute name="ismember" value="1" id="624" addr="0x7f136da34530" />
+                                <attribute name="sym_symtab" value="0x7f136da2f290" id="625" addr="0x7f136da2f290" />
+                                <attribute name="kind" value="function" id="626" addr="0x7f136da34530" />
+                                <attribute name="sym_name" value="getSettingInt" id="627" addr="0x7f136da34530" />
+                                <attribute name="decl" value="f(p.q(const).char)." id="628" addr="0x7f136da34530" />
+                                <attribute name="access" value="public" id="629" addr="0x7f136da34530" />
+                                <parmlist id="630" addr="0x7f136da30e70" >
                                     <parm id="631">
-                                        <attributelist id="632" addr="0x7f0bacb39e70" >
-                                            <attribute name="name" value="id" id="633" addr="0x7f0bacb3d530" />
-                                            <attribute name="type" value="p.q(const).char" id="634" addr="0x7f0bacb3d530" />
+                                        <attributelist id="632" addr="0x7f136da30e70" >
+                                            <attribute name="name" value="id" id="633" addr="0x7f136da34530" />
+                                            <attribute name="type" value="p.q(const).char" id="634" addr="0x7f136da34530" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="int" id="635" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="636" addr="0x7f0bacb3d530" />
+                                <attribute name="type" value="int" id="635" addr="0x7f136da34530" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="636" addr="0x7f136da34530" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="637" addr="0x7f0bacb3a250" >
-                            <attributelist id="638" addr="0x7f0bacb3a250" >
-                                <attribute name="name" value="getSettingNumber" id="639" addr="0x7f0bacb3d530" />
-                                <attribute name="ismember" value="1" id="640" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_symtab" value="0x7f0bacb38290" id="641" addr="0x7f0bacb38290" />
-                                <attribute name="kind" value="function" id="642" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_name" value="getSettingNumber" id="643" addr="0x7f0bacb3d530" />
-                                <attribute name="decl" value="f(p.q(const).char)." id="644" addr="0x7f0bacb3d530" />
-                                <attribute name="access" value="public" id="645" addr="0x7f0bacb3d530" />
-                                <parmlist id="646" addr="0x7f0bacb3a190" >
+                        <cdecl id="637" addr="0x7f136da31250" >
+                            <attributelist id="638" addr="0x7f136da31250" >
+                                <attribute name="name" value="getSettingNumber" id="639" addr="0x7f136da34530" />
+                                <attribute name="ismember" value="1" id="640" addr="0x7f136da34530" />
+                                <attribute name="sym_symtab" value="0x7f136da2f290" id="641" addr="0x7f136da2f290" />
+                                <attribute name="kind" value="function" id="642" addr="0x7f136da34530" />
+                                <attribute name="sym_name" value="getSettingNumber" id="643" addr="0x7f136da34530" />
+                                <attribute name="decl" value="f(p.q(const).char)." id="644" addr="0x7f136da34530" />
+                                <attribute name="access" value="public" id="645" addr="0x7f136da34530" />
+                                <parmlist id="646" addr="0x7f136da31190" >
                                     <parm id="647">
-                                        <attributelist id="648" addr="0x7f0bacb3a190" >
-                                            <attribute name="name" value="id" id="649" addr="0x7f0bacb3d530" />
-                                            <attribute name="type" value="p.q(const).char" id="650" addr="0x7f0bacb3d530" />
+                                        <attributelist id="648" addr="0x7f136da31190" >
+                                            <attribute name="name" value="id" id="649" addr="0x7f136da34530" />
+                                            <attribute name="type" value="p.q(const).char" id="650" addr="0x7f136da34530" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="double" id="651" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="652" addr="0x7f0bacb3d530" />
+                                <attribute name="type" value="double" id="651" addr="0x7f136da34530" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="652" addr="0x7f136da34530" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="653" addr="0x7f0bacb3a570" >
-                            <attributelist id="654" addr="0x7f0bacb3a570" >
-                                <attribute name="name" value="getSettingString" id="655" addr="0x7f0bacb3d530" />
-                                <attribute name="ismember" value="1" id="656" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_symtab" value="0x7f0bacb38290" id="657" addr="0x7f0bacb38290" />
-                                <attribute name="kind" value="function" id="658" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_name" value="getSettingString" id="659" addr="0x7f0bacb3d530" />
-                                <attribute name="decl" value="f(p.q(const).char)." id="660" addr="0x7f0bacb3d530" />
-                                <attribute name="access" value="public" id="661" addr="0x7f0bacb3d530" />
-                                <parmlist id="662" addr="0x7f0bacb3a4b0" >
+                        <cdecl id="653" addr="0x7f136da31570" >
+                            <attributelist id="654" addr="0x7f136da31570" >
+                                <attribute name="name" value="getSettingString" id="655" addr="0x7f136da34530" />
+                                <attribute name="ismember" value="1" id="656" addr="0x7f136da34530" />
+                                <attribute name="sym_symtab" value="0x7f136da2f290" id="657" addr="0x7f136da2f290" />
+                                <attribute name="kind" value="function" id="658" addr="0x7f136da34530" />
+                                <attribute name="sym_name" value="getSettingString" id="659" addr="0x7f136da34530" />
+                                <attribute name="decl" value="f(p.q(const).char)." id="660" addr="0x7f136da34530" />
+                                <attribute name="access" value="public" id="661" addr="0x7f136da34530" />
+                                <parmlist id="662" addr="0x7f136da314b0" >
                                     <parm id="663">
-                                        <attributelist id="664" addr="0x7f0bacb3a4b0" >
-                                            <attribute name="name" value="id" id="665" addr="0x7f0bacb3d530" />
-                                            <attribute name="type" value="p.q(const).char" id="666" addr="0x7f0bacb3d530" />
+                                        <attributelist id="664" addr="0x7f136da314b0" >
+                                            <attribute name="name" value="id" id="665" addr="0x7f136da34530" />
+                                            <attribute name="type" value="p.q(const).char" id="666" addr="0x7f136da34530" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="XBMCAddon::String" id="667" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="668" addr="0x7f0bacb3d530" />
+                                <attribute name="type" value="XBMCAddon::String" id="667" addr="0x7f136da34530" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="668" addr="0x7f136da34530" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="669" addr="0x7f0bacb3a9b0" >
-                            <attributelist id="670" addr="0x7f0bacb3a9b0" >
-                                <attribute name="name" value="setSetting" id="671" addr="0x7f0bacb3d530" />
-                                <attribute name="ismember" value="1" id="672" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_symtab" value="0x7f0bacb38290" id="673" addr="0x7f0bacb38290" />
-                                <attribute name="kind" value="function" id="674" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_name" value="setSetting" id="675" addr="0x7f0bacb3d530" />
-                                <attribute name="decl" value="f(p.q(const).char,r.q(const).XBMCAddon::String)." id="676" addr="0x7f0bacb3d530" />
-                                <attribute name="access" value="public" id="677" addr="0x7f0bacb3d530" />
-                                <parmlist id="678" addr="0x7f0bacb3a7b0" >
+                        <cdecl id="669" addr="0x7f136da319b0" >
+                            <attributelist id="670" addr="0x7f136da319b0" >
+                                <attribute name="name" value="setSetting" id="671" addr="0x7f136da34530" />
+                                <attribute name="ismember" value="1" id="672" addr="0x7f136da34530" />
+                                <attribute name="sym_symtab" value="0x7f136da2f290" id="673" addr="0x7f136da2f290" />
+                                <attribute name="kind" value="function" id="674" addr="0x7f136da34530" />
+                                <attribute name="sym_name" value="setSetting" id="675" addr="0x7f136da34530" />
+                                <attribute name="decl" value="f(p.q(const).char,r.q(const).XBMCAddon::String)." id="676" addr="0x7f136da34530" />
+                                <attribute name="access" value="public" id="677" addr="0x7f136da34530" />
+                                <parmlist id="678" addr="0x7f136da317b0" >
                                     <parm id="679">
-                                        <attributelist id="680" addr="0x7f0bacb3a7b0" >
-                                            <attribute name="name" value="id" id="681" addr="0x7f0bacb3d530" />
-                                            <attribute name="type" value="p.q(const).char" id="682" addr="0x7f0bacb3d530" />
+                                        <attributelist id="680" addr="0x7f136da317b0" >
+                                            <attribute name="name" value="id" id="681" addr="0x7f136da34530" />
+                                            <attribute name="type" value="p.q(const).char" id="682" addr="0x7f136da34530" />
                                         </attributelist >
                                     </parm >
                                     <parm id="683">
-                                        <attributelist id="684" addr="0x7f0bacb3a8f0" >
-                                            <attribute name="name" value="value" id="685" addr="0x7f0bacb3d530" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="686" addr="0x7f0bacb3d530" />
+                                        <attributelist id="684" addr="0x7f136da318f0" >
+                                            <attribute name="name" value="value" id="685" addr="0x7f136da34530" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="686" addr="0x7f136da34530" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="687" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="688" addr="0x7f0bacb3d530" />
+                                <attribute name="type" value="void" id="687" addr="0x7f136da34530" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="688" addr="0x7f136da34530" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="689" addr="0x7f0bacb3adb0" >
-                            <attributelist id="690" addr="0x7f0bacb3adb0" >
-                                <attribute name="name" value="setSettingBool" id="691" addr="0x7f0bacb3d530" />
-                                <attribute name="ismember" value="1" id="692" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_symtab" value="0x7f0bacb38290" id="693" addr="0x7f0bacb38290" />
-                                <attribute name="kind" value="function" id="694" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_name" value="setSettingBool" id="695" addr="0x7f0bacb3d530" />
-                                <attribute name="decl" value="f(p.q(const).char,bool)." id="696" addr="0x7f0bacb3d530" />
-                                <attribute name="access" value="public" id="697" addr="0x7f0bacb3d530" />
-                                <parmlist id="698" addr="0x7f0bacb3abf0" >
+                        <cdecl id="689" addr="0x7f136da31db0" >
+                            <attributelist id="690" addr="0x7f136da31db0" >
+                                <attribute name="name" value="setSettingBool" id="691" addr="0x7f136da34530" />
+                                <attribute name="ismember" value="1" id="692" addr="0x7f136da34530" />
+                                <attribute name="sym_symtab" value="0x7f136da2f290" id="693" addr="0x7f136da2f290" />
+                                <attribute name="kind" value="function" id="694" addr="0x7f136da34530" />
+                                <attribute name="sym_name" value="setSettingBool" id="695" addr="0x7f136da34530" />
+                                <attribute name="decl" value="f(p.q(const).char,bool)." id="696" addr="0x7f136da34530" />
+                                <attribute name="access" value="public" id="697" addr="0x7f136da34530" />
+                                <parmlist id="698" addr="0x7f136da31bf0" >
                                     <parm id="699">
-                                        <attributelist id="700" addr="0x7f0bacb3abf0" >
-                                            <attribute name="name" value="id" id="701" addr="0x7f0bacb3d530" />
-                                            <attribute name="type" value="p.q(const).char" id="702" addr="0x7f0bacb3d530" />
+                                        <attributelist id="700" addr="0x7f136da31bf0" >
+                                            <attribute name="name" value="id" id="701" addr="0x7f136da34530" />
+                                            <attribute name="type" value="p.q(const).char" id="702" addr="0x7f136da34530" />
                                         </attributelist >
                                     </parm >
                                     <parm id="703">
-                                        <attributelist id="704" addr="0x7f0bacb3acf0" >
-                                            <attribute name="name" value="value" id="705" addr="0x7f0bacb3d530" />
-                                            <attribute name="type" value="bool" id="706" addr="0x7f0bacb3d530" />
+                                        <attributelist id="704" addr="0x7f136da31cf0" >
+                                            <attribute name="name" value="value" id="705" addr="0x7f136da34530" />
+                                            <attribute name="type" value="bool" id="706" addr="0x7f136da34530" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="bool" id="707" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="708" addr="0x7f0bacb3d530" />
+                                <attribute name="type" value="bool" id="707" addr="0x7f136da34530" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="708" addr="0x7f136da34530" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="709" addr="0x7f0bacb3b1d0" >
-                            <attributelist id="710" addr="0x7f0bacb3b1d0" >
-                                <attribute name="name" value="setSettingInt" id="711" addr="0x7f0bacb3d530" />
-                                <attribute name="ismember" value="1" id="712" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_symtab" value="0x7f0bacb38290" id="713" addr="0x7f0bacb38290" />
-                                <attribute name="kind" value="function" id="714" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_name" value="setSettingInt" id="715" addr="0x7f0bacb3d530" />
-                                <attribute name="decl" value="f(p.q(const).char,int)." id="716" addr="0x7f0bacb3d530" />
-                                <attribute name="access" value="public" id="717" addr="0x7f0bacb3d530" />
-                                <parmlist id="718" addr="0x7f0bacb3aff0" >
+                        <cdecl id="709" addr="0x7f136da321d0" >
+                            <attributelist id="710" addr="0x7f136da321d0" >
+                                <attribute name="name" value="setSettingInt" id="711" addr="0x7f136da34530" />
+                                <attribute name="ismember" value="1" id="712" addr="0x7f136da34530" />
+                                <attribute name="sym_symtab" value="0x7f136da2f290" id="713" addr="0x7f136da2f290" />
+                                <attribute name="kind" value="function" id="714" addr="0x7f136da34530" />
+                                <attribute name="sym_name" value="setSettingInt" id="715" addr="0x7f136da34530" />
+                                <attribute name="decl" value="f(p.q(const).char,int)." id="716" addr="0x7f136da34530" />
+                                <attribute name="access" value="public" id="717" addr="0x7f136da34530" />
+                                <parmlist id="718" addr="0x7f136da31ff0" >
                                     <parm id="719">
-                                        <attributelist id="720" addr="0x7f0bacb3aff0" >
-                                            <attribute name="name" value="id" id="721" addr="0x7f0bacb3d530" />
-                                            <attribute name="type" value="p.q(const).char" id="722" addr="0x7f0bacb3d530" />
+                                        <attributelist id="720" addr="0x7f136da31ff0" >
+                                            <attribute name="name" value="id" id="721" addr="0x7f136da34530" />
+                                            <attribute name="type" value="p.q(const).char" id="722" addr="0x7f136da34530" />
                                         </attributelist >
                                     </parm >
                                     <parm id="723">
-                                        <attributelist id="724" addr="0x7f0bacb3b110" >
-                                            <attribute name="name" value="value" id="725" addr="0x7f0bacb3d530" />
-                                            <attribute name="type" value="int" id="726" addr="0x7f0bacb3d530" />
+                                        <attributelist id="724" addr="0x7f136da32110" >
+                                            <attribute name="name" value="value" id="725" addr="0x7f136da34530" />
+                                            <attribute name="type" value="int" id="726" addr="0x7f136da34530" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="bool" id="727" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="728" addr="0x7f0bacb3d530" />
+                                <attribute name="type" value="bool" id="727" addr="0x7f136da34530" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="728" addr="0x7f136da34530" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="729" addr="0x7f0bacb3b5f0" >
-                            <attributelist id="730" addr="0x7f0bacb3b5f0" >
-                                <attribute name="name" value="setSettingNumber" id="731" addr="0x7f0bacb3d530" />
-                                <attribute name="ismember" value="1" id="732" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_symtab" value="0x7f0bacb38290" id="733" addr="0x7f0bacb38290" />
-                                <attribute name="kind" value="function" id="734" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_name" value="setSettingNumber" id="735" addr="0x7f0bacb3d530" />
-                                <attribute name="decl" value="f(p.q(const).char,double)." id="736" addr="0x7f0bacb3d530" />
-                                <attribute name="access" value="public" id="737" addr="0x7f0bacb3d530" />
-                                <parmlist id="738" addr="0x7f0bacb3b410" >
+                        <cdecl id="729" addr="0x7f136da325f0" >
+                            <attributelist id="730" addr="0x7f136da325f0" >
+                                <attribute name="name" value="setSettingNumber" id="731" addr="0x7f136da34530" />
+                                <attribute name="ismember" value="1" id="732" addr="0x7f136da34530" />
+                                <attribute name="sym_symtab" value="0x7f136da2f290" id="733" addr="0x7f136da2f290" />
+                                <attribute name="kind" value="function" id="734" addr="0x7f136da34530" />
+                                <attribute name="sym_name" value="setSettingNumber" id="735" addr="0x7f136da34530" />
+                                <attribute name="decl" value="f(p.q(const).char,double)." id="736" addr="0x7f136da34530" />
+                                <attribute name="access" value="public" id="737" addr="0x7f136da34530" />
+                                <parmlist id="738" addr="0x7f136da32410" >
                                     <parm id="739">
-                                        <attributelist id="740" addr="0x7f0bacb3b410" >
-                                            <attribute name="name" value="id" id="741" addr="0x7f0bacb3d530" />
-                                            <attribute name="type" value="p.q(const).char" id="742" addr="0x7f0bacb3d530" />
+                                        <attributelist id="740" addr="0x7f136da32410" >
+                                            <attribute name="name" value="id" id="741" addr="0x7f136da34530" />
+                                            <attribute name="type" value="p.q(const).char" id="742" addr="0x7f136da34530" />
                                         </attributelist >
                                     </parm >
                                     <parm id="743">
-                                        <attributelist id="744" addr="0x7f0bacb3b530" >
-                                            <attribute name="name" value="value" id="745" addr="0x7f0bacb3d530" />
-                                            <attribute name="type" value="double" id="746" addr="0x7f0bacb3d530" />
+                                        <attributelist id="744" addr="0x7f136da32530" >
+                                            <attribute name="name" value="value" id="745" addr="0x7f136da34530" />
+                                            <attribute name="type" value="double" id="746" addr="0x7f136da34530" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="bool" id="747" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="748" addr="0x7f0bacb3d530" />
+                                <attribute name="type" value="bool" id="747" addr="0x7f136da34530" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="748" addr="0x7f136da34530" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="749" addr="0x7f0bacb3ba30" >
-                            <attributelist id="750" addr="0x7f0bacb3ba30" >
-                                <attribute name="name" value="setSettingString" id="751" addr="0x7f0bacb3d530" />
-                                <attribute name="ismember" value="1" id="752" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_symtab" value="0x7f0bacb38290" id="753" addr="0x7f0bacb38290" />
-                                <attribute name="kind" value="function" id="754" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_name" value="setSettingString" id="755" addr="0x7f0bacb3d530" />
-                                <attribute name="decl" value="f(p.q(const).char,r.q(const).XBMCAddon::String)." id="756" addr="0x7f0bacb3d530" />
-                                <attribute name="access" value="public" id="757" addr="0x7f0bacb3d530" />
-                                <parmlist id="758" addr="0x7f0bacb3b830" >
+                        <cdecl id="749" addr="0x7f136da32a30" >
+                            <attributelist id="750" addr="0x7f136da32a30" >
+                                <attribute name="name" value="setSettingString" id="751" addr="0x7f136da34530" />
+                                <attribute name="ismember" value="1" id="752" addr="0x7f136da34530" />
+                                <attribute name="sym_symtab" value="0x7f136da2f290" id="753" addr="0x7f136da2f290" />
+                                <attribute name="kind" value="function" id="754" addr="0x7f136da34530" />
+                                <attribute name="sym_name" value="setSettingString" id="755" addr="0x7f136da34530" />
+                                <attribute name="decl" value="f(p.q(const).char,r.q(const).XBMCAddon::String)." id="756" addr="0x7f136da34530" />
+                                <attribute name="access" value="public" id="757" addr="0x7f136da34530" />
+                                <parmlist id="758" addr="0x7f136da32830" >
                                     <parm id="759">
-                                        <attributelist id="760" addr="0x7f0bacb3b830" >
-                                            <attribute name="name" value="id" id="761" addr="0x7f0bacb3d530" />
-                                            <attribute name="type" value="p.q(const).char" id="762" addr="0x7f0bacb3d530" />
+                                        <attributelist id="760" addr="0x7f136da32830" >
+                                            <attribute name="name" value="id" id="761" addr="0x7f136da34530" />
+                                            <attribute name="type" value="p.q(const).char" id="762" addr="0x7f136da34530" />
                                         </attributelist >
                                     </parm >
                                     <parm id="763">
-                                        <attributelist id="764" addr="0x7f0bacb3b970" >
-                                            <attribute name="name" value="value" id="765" addr="0x7f0bacb3d530" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="766" addr="0x7f0bacb3d530" />
+                                        <attributelist id="764" addr="0x7f136da32970" >
+                                            <attribute name="name" value="value" id="765" addr="0x7f136da34530" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="766" addr="0x7f136da34530" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="bool" id="767" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="768" addr="0x7f0bacb3d530" />
+                                <attribute name="type" value="bool" id="767" addr="0x7f136da34530" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="768" addr="0x7f136da34530" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="769" addr="0x7f0bacb3bbf0" >
-                            <attributelist id="770" addr="0x7f0bacb3bbf0" >
-                                <attribute name="ismember" value="1" id="771" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_name" value="openSettings" id="772" addr="0x7f0bacb3d530" />
-                                <attribute name="name" value="openSettings" id="773" addr="0x7f0bacb3d530" />
-                                <attribute name="decl" value="f()." id="774" addr="0x7f0bacb3d530" />
-                                <attribute name="access" value="public" id="775" addr="0x7f0bacb3d530" />
-                                <attribute name="kind" value="function" id="776" addr="0x7f0bacb3d530" />
-                                <attribute name="type" value="void" id="777" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_symtab" value="0x7f0bacb38290" id="778" addr="0x7f0bacb38290" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="779" addr="0x7f0bacb3d530" />
+                        <cdecl id="769" addr="0x7f136da32bf0" >
+                            <attributelist id="770" addr="0x7f136da32bf0" >
+                                <attribute name="ismember" value="1" id="771" addr="0x7f136da34530" />
+                                <attribute name="sym_name" value="openSettings" id="772" addr="0x7f136da34530" />
+                                <attribute name="name" value="openSettings" id="773" addr="0x7f136da34530" />
+                                <attribute name="decl" value="f()." id="774" addr="0x7f136da34530" />
+                                <attribute name="access" value="public" id="775" addr="0x7f136da34530" />
+                                <attribute name="kind" value="function" id="776" addr="0x7f136da34530" />
+                                <attribute name="type" value="void" id="777" addr="0x7f136da34530" />
+                                <attribute name="sym_symtab" value="0x7f136da2f290" id="778" addr="0x7f136da2f290" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="779" addr="0x7f136da34530" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="780" addr="0x7f0bacb3bf10" >
-                            <attributelist id="781" addr="0x7f0bacb3bf10" >
-                                <attribute name="ismember" value="1" id="782" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_name" value="getAddonInfo" id="783" addr="0x7f0bacb3d530" />
-                                <attribute name="name" value="getAddonInfo" id="784" addr="0x7f0bacb3d530" />
-                                <attribute name="decl" value="f(p.q(const).char)." id="785" addr="0x7f0bacb3d530" />
-                                <parmlist id="786" addr="0x7f0bacb3be50" >
+                        <cdecl id="780" addr="0x7f136da32f10" >
+                            <attributelist id="781" addr="0x7f136da32f10" >
+                                <attribute name="ismember" value="1" id="782" addr="0x7f136da34530" />
+                                <attribute name="sym_name" value="getAddonInfo" id="783" addr="0x7f136da34530" />
+                                <attribute name="name" value="getAddonInfo" id="784" addr="0x7f136da34530" />
+                                <attribute name="decl" value="f(p.q(const).char)." id="785" addr="0x7f136da34530" />
+                                <parmlist id="786" addr="0x7f136da32e50" >
                                     <parm id="787">
-                                        <attributelist id="788" addr="0x7f0bacb3be50" >
-                                            <attribute name="name" value="id" id="789" addr="0x7f0bacb3d530" />
-                                            <attribute name="type" value="p.q(const).char" id="790" addr="0x7f0bacb3d530" />
+                                        <attributelist id="788" addr="0x7f136da32e50" >
+                                            <attribute name="name" value="id" id="789" addr="0x7f136da34530" />
+                                            <attribute name="type" value="p.q(const).char" id="790" addr="0x7f136da34530" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="access" value="public" id="791" addr="0x7f0bacb3d530" />
-                                <attribute name="kind" value="function" id="792" addr="0x7f0bacb3d530" />
-                                <attribute name="type" value="XBMCAddon::String" id="793" addr="0x7f0bacb3d530" />
-                                <attribute name="sym_symtab" value="0x7f0bacb38290" id="794" addr="0x7f0bacb38290" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="795" addr="0x7f0bacb3d530" />
+                                <attribute name="access" value="public" id="791" addr="0x7f136da34530" />
+                                <attribute name="kind" value="function" id="792" addr="0x7f136da34530" />
+                                <attribute name="type" value="XBMCAddon::String" id="793" addr="0x7f136da34530" />
+                                <attribute name="sym_symtab" value="0x7f136da2f290" id="794" addr="0x7f136da2f290" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="795" addr="0x7f136da34530" />
                             </attributelist >
                          
                         </cdecl >
diff --git a/srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmcdrm.i.cpp b/srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmcdrm.i.cpp
similarity index 99%
rename from srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmcdrm.i.cpp
rename to srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmcdrm.i.cpp
index a541b837809..096ebdfda78 100644
--- a/srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmcdrm.i.cpp
+++ b/srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmcdrm.i.cpp
@@ -1061,7 +1061,7 @@ namespace PythonBindings
 
    // constants
    PyModule_AddStringConstant(module, "__author__", "Team Kodi <http://kodi.tv>");
-   PyModule_AddStringConstant(module, "__date__", "Wed Jun 19 18:36:49 GMT 2019");
+   PyModule_AddStringConstant(module, "__date__", "Sun Sep 01 10:46:53 GMT 2019");
    PyModule_AddStringConstant(module, "__version__", "2.26.0");
    PyModule_AddStringConstant(module, "__credits__", "Team Kodi");
    PyModule_AddStringConstant(module, "__platform__", "ALL");
diff --git a/srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmcdrm.i.xml b/srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmcdrm.i.xml
similarity index 59%
rename from srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmcdrm.i.xml
rename to srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmcdrm.i.xml
index 1ba16b19b41..2683d3c06bf 100644
--- a/srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmcdrm.i.xml
+++ b/srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmcdrm.i.xml
@@ -1,141 +1,141 @@
 <?xml version="1.0" ?> 
-<top id="1" addr="0x7f3904248b30" >
-    <attributelist id="2" addr="0x7f3904248b30" >
-        <attribute name="outfile" value="AddonModuleXbmcdrm.i.xml" id="3" addr="0x7f39042648d0" />
-        <attribute name="name" value="xbmcdrm" id="4" addr="0x7f39042648d0" />
-        <attribute name="module" value="xbmcdrm" id="5" addr="0x7f390425dfd0" />
-        <attribute name="inputfile" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmcdrm.i" id="6" addr="0x7f39042648d0" />
-        <attribute name="classes" value="0x7f390425b590" id="7" addr="0x7f390425b590" />
-        <attribute name="infile" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmcdrm.i" id="8" addr="0x7f39042648d0" />
-        <attribute name="outfile_h" value="AddonModuleXbmcdrm.i.h" id="9" addr="0x7f39042648d0" />
+<top id="1" addr="0x7f6d3685ab30" >
+    <attributelist id="2" addr="0x7f6d3685ab30" >
+        <attribute name="outfile" value="AddonModuleXbmcdrm.i.xml" id="3" addr="0x7f6d368768d0" />
+        <attribute name="name" value="xbmcdrm" id="4" addr="0x7f6d368768d0" />
+        <attribute name="module" value="xbmcdrm" id="5" addr="0x7f6d3686ffd0" />
+        <attribute name="inputfile" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmcdrm.i" id="6" addr="0x7f6d368768d0" />
+        <attribute name="classes" value="0x7f6d3686d590" id="7" addr="0x7f6d3686d590" />
+        <attribute name="infile" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmcdrm.i" id="8" addr="0x7f6d368768d0" />
+        <attribute name="outfile_h" value="AddonModuleXbmcdrm.i.h" id="9" addr="0x7f6d368768d0" />
     </attributelist >
 
-    <include id="10" addr="0x7f3904258ed0" >
-        <attributelist id="11" addr="0x7f3904258ed0" >
-            <attribute name="name" value="/usr/share/swig/3.0.12/swig.swg" id="12" addr="0x7f39042648d0" />
+    <include id="10" addr="0x7f6d3686aed0" >
+        <attributelist id="11" addr="0x7f6d3686aed0" >
+            <attribute name="name" value="/usr/share/swig/3.0.12/swig.swg" id="12" addr="0x7f6d368768d0" />
         </attributelist >
 
-        <include id="13" addr="0x7f3904258f30" >
-            <attributelist id="14" addr="0x7f3904258f30" >
-                <attribute name="name" value="/usr/share/swig/3.0.12/swigwarnings.swg" id="15" addr="0x7f39042648d0" />
+        <include id="13" addr="0x7f6d3686af30" >
+            <attributelist id="14" addr="0x7f6d3686af30" >
+                <attribute name="name" value="/usr/share/swig/3.0.12/swigwarnings.swg" id="15" addr="0x7f6d368768d0" />
             </attributelist >
 
-            <include id="16" addr="0x7f3904259050" >
-                <attributelist id="17" addr="0x7f3904259050" >
-                    <attribute name="name" value="/usr/share/swig/3.0.12/swigwarn.swg" id="18" addr="0x7f39042648d0" />
+            <include id="16" addr="0x7f6d3686b050" >
+                <attributelist id="17" addr="0x7f6d3686b050" >
+                    <attribute name="name" value="/usr/share/swig/3.0.12/swigwarn.swg" id="18" addr="0x7f6d368768d0" />
                 </attributelist >
              
             </include >
         </include >
-        <namespace id="19" addr="0x7f390425b0b0" >
-            <attributelist id="20" addr="0x7f390425b0b0" >
-                <attribute name="sym_name" value="std" id="21" addr="0x7f39042648d0" />
-                <attribute name="name" value="std" id="22" addr="0x7f39042648d0" />
-                <typescope id="23" addr="0x7f3904262ed0" >
-                    <attributelist id="24" addr="0x7f3904262ed0" >
-                        <attribute name="name" value="std" id="25" addr="0x7f39042648d0" />
-                        <typetab id="26" addr="0x7f3904262ef0" >
-                            <attributelist id="27" addr="0x7f3904262ef0" >
-                                <attribute name="initializer_list" value="initializer_list" id="28" addr="0x7f39042648d0" />
+        <namespace id="19" addr="0x7f6d3686d0b0" >
+            <attributelist id="20" addr="0x7f6d3686d0b0" >
+                <attribute name="sym_name" value="std" id="21" addr="0x7f6d368768d0" />
+                <attribute name="name" value="std" id="22" addr="0x7f6d368768d0" />
+                <typescope id="23" addr="0x7f6d36874ed0" >
+                    <attributelist id="24" addr="0x7f6d36874ed0" >
+                        <attribute name="name" value="std" id="25" addr="0x7f6d368768d0" />
+                        <typetab id="26" addr="0x7f6d36874ef0" >
+                            <attributelist id="27" addr="0x7f6d36874ef0" >
+                                <attribute name="initializer_list" value="initializer_list" id="28" addr="0x7f6d368768d0" />
                             </attributelist >
-                            <typetabsitem id="29" addr="0x7f3904263010" >
-                                <attributelist id="30" addr="0x7f3904263010" >
+                            <typetabsitem id="29" addr="0x7f6d36875010" >
+                                <attributelist id="30" addr="0x7f6d36875010" >
                                 </attributelist >
                             </typetabsitem >
                         </typetab >
-                        <attribute name="parent" value="0x7f3904247a30" id="31" addr="0x7f3904247a30" />
-                        <attribute name="qname" value="std" id="32" addr="0x7f39042648d0" />
-                        <attribute name="symtab" value="0x7f390425b010" id="33" addr="0x7f390425b010" />
+                        <attribute name="parent" value="0x7f6d36859a30" id="31" addr="0x7f6d36859a30" />
+                        <attribute name="qname" value="std" id="32" addr="0x7f6d368768d0" />
+                        <attribute name="symtab" value="0x7f6d3686d010" id="33" addr="0x7f6d3686d010" />
                     </attributelist >
-                    <typescopesitem id="34" addr="0x7f390425af70" >
-                        <attributelist id="35" addr="0x7f390425af70" >
+                    <typescopesitem id="34" addr="0x7f6d3686cf70" >
+                        <attributelist id="35" addr="0x7f6d3686cf70" >
                         </attributelist >
                     </typescopesitem >
-                    <typescopesitem id="36" addr="0x7f3904262ef0" >
-                        <attributelist id="37" addr="0x7f3904262ef0" >
-                            <attribute name="initializer_list" value="initializer_list" id="38" addr="0x7f39042648d0" />
+                    <typescopesitem id="36" addr="0x7f6d36874ef0" >
+                        <attributelist id="37" addr="0x7f6d36874ef0" >
+                            <attribute name="initializer_list" value="initializer_list" id="38" addr="0x7f6d368768d0" />
                         </attributelist >
                     </typescopesitem >
-                    <typescopesitem id="39" addr="0x7f3904247a30" >
-                        <attributelist id="40" addr="0x7f3904247a30" >
-                            <attribute name="name" value="" id="41" addr="0x7f39042648d0" />
-                            <typetab id="42" addr="0x7f3904247a90" >
-                                <attributelist id="43" addr="0x7f3904247a90" >
+                    <typescopesitem id="39" addr="0x7f6d36859a30" >
+                        <attributelist id="40" addr="0x7f6d36859a30" >
+                            <attribute name="name" value="" id="41" addr="0x7f6d368768d0" />
+                            <typetab id="42" addr="0x7f6d36859a90" >
+                                <attributelist id="43" addr="0x7f6d36859a90" >
                                 </attributelist >
                             </typetab >
                         </attributelist >
                     </typescopesitem >
-                    <typescopesitem id="44" addr="0x7f3904262f10" >
-                        <attributelist id="45" addr="0x7f3904262f10" >
+                    <typescopesitem id="44" addr="0x7f6d36874f10" >
+                        <attributelist id="45" addr="0x7f6d36874f10" >
                         </attributelist >
                     </typescopesitem >
-                    <typescopesitem id="46" addr="0x7f390425b010" >
-                        <attributelist id="47" addr="0x7f390425b010" >
-                            <attribute name="name" value="std" id="48" addr="0x7f39042648d0" />
-                            <attribute name="csymtab" value="0x7f390425b050" id="49" addr="0x7f390425b050" />
-                            <attribute name="symtab" value="0x7f390425aff0" id="50" addr="0x7f390425aff0" />
+                    <typescopesitem id="46" addr="0x7f6d3686d010" >
+                        <attributelist id="47" addr="0x7f6d3686d010" >
+                            <attribute name="name" value="std" id="48" addr="0x7f6d368768d0" />
+                            <attribute name="csymtab" value="0x7f6d3686d050" id="49" addr="0x7f6d3686d050" />
+                            <attribute name="symtab" value="0x7f6d3686cff0" id="50" addr="0x7f6d3686cff0" />
                         </attributelist >
                     </typescopesitem >
                 </typescope >
-                <attribute name="symtab" value="0x7f390425b010" id="51" addr="0x7f390425b010" />
-                <attribute name="sym_symtab" value="0x7f3904247950" id="52" addr="0x7f3904247950" />
-                <attribute name="sym_overname" value="__SWIG_0" id="53" addr="0x7f39042648d0" />
+                <attribute name="symtab" value="0x7f6d3686d010" id="51" addr="0x7f6d3686d010" />
+                <attribute name="sym_symtab" value="0x7f6d36859950" id="52" addr="0x7f6d36859950" />
+                <attribute name="sym_overname" value="__SWIG_0" id="53" addr="0x7f6d368768d0" />
             </attributelist >
 
-            <template id="54" addr="0x7f390425b230" >
-                <attributelist id="55" addr="0x7f390425b230" >
-                    <attribute name="templatetype" value="class" id="56" addr="0x7f39042648d0" />
-                    <attribute name="sym_typename" value="1" id="57" addr="0x7f39042648d0" />
-                    <attribute name="name" value="initializer_list" id="58" addr="0x7f39042648d0" />
-                    <attribute name="sym_symtab" value="0x7f390425b010" id="59" addr="0x7f390425b010" />
-                    <attribute name="symtab" value="0x7f390425b450" id="60" addr="0x7f390425b450" />
-                    <attribute name="allows_typedef" value="1" id="61" addr="0x7f39042648d0" />
-                    <attribute name="kind" value="class" id="62" addr="0x7f39042648d0" />
-                    <attribute name="sym_name" value="initializer_list" id="63" addr="0x7f39042648d0" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="64" addr="0x7f39042648d0" />
-                    <templateparms id="65" addr="0x7f390425b150" >
+            <template id="54" addr="0x7f6d3686d230" >
+                <attributelist id="55" addr="0x7f6d3686d230" >
+                    <attribute name="templatetype" value="class" id="56" addr="0x7f6d368768d0" />
+                    <attribute name="sym_typename" value="1" id="57" addr="0x7f6d368768d0" />
+                    <attribute name="name" value="initializer_list" id="58" addr="0x7f6d368768d0" />
+                    <attribute name="sym_symtab" value="0x7f6d3686d010" id="59" addr="0x7f6d3686d010" />
+                    <attribute name="symtab" value="0x7f6d3686d450" id="60" addr="0x7f6d3686d450" />
+                    <attribute name="allows_typedef" value="1" id="61" addr="0x7f6d368768d0" />
+                    <attribute name="kind" value="class" id="62" addr="0x7f6d368768d0" />
+                    <attribute name="sym_name" value="initializer_list" id="63" addr="0x7f6d368768d0" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="64" addr="0x7f6d368768d0" />
+                    <templateparms id="65" addr="0x7f6d3686d150" >
                         <parm id="66">
-                            <attributelist id="67" addr="0x7f390425b150" >
-                                <attribute name="name" value="T" id="68" addr="0x7f39042648d0" />
-                                <attribute name="type" value="typename T" id="69" addr="0x7f39042648d0" />
+                            <attributelist id="67" addr="0x7f6d3686d150" >
+                                <attribute name="name" value="T" id="68" addr="0x7f6d368768d0" />
+                                <attribute name="type" value="typename T" id="69" addr="0x7f6d368768d0" />
                             </attributelist >
                         </parm >
                     </templateparms >
                 </attributelist >
 
-                <access id="70" addr="0x7f390425b610" >
-                    <attributelist id="71" addr="0x7f390425b610" >
-                        <attribute name="kind" value="public" id="72" addr="0x7f39042648d0" />
+                <access id="70" addr="0x7f6d3686d610" >
+                    <attributelist id="71" addr="0x7f6d3686d610" >
+                        <attribute name="kind" value="public" id="72" addr="0x7f6d368768d0" />
                     </attributelist >
                  
                 </access >
             </template >
-            <typemap id="73" addr="0x7f390425bc70" >
-                <attributelist id="74" addr="0x7f390425bc70" >
-                    <kwargs id="75" addr="0x7f390425b970" >
-                        <attributelist id="76" addr="0x7f390425b970" >
-                            <attribute name="name" value="warning" id="77" addr="0x7f39042648d0" />
-                            <attribute name="value" value="476:Initialization using std::initializer_list." id="78" addr="0x7f39042648d0" />
+            <typemap id="73" addr="0x7f6d3686dc70" >
+                <attributelist id="74" addr="0x7f6d3686dc70" >
+                    <kwargs id="75" addr="0x7f6d3686d970" >
+                        <attributelist id="76" addr="0x7f6d3686d970" >
+                            <attribute name="name" value="warning" id="77" addr="0x7f6d368768d0" />
+                            <attribute name="value" value="476:Initialization using std::initializer_list." id="78" addr="0x7f6d368768d0" />
                         </attributelist >
-                        <kwargssitem id="79" addr="0x7f390425baf0" >
-                            <attributelist id="80" addr="0x7f390425baf0" >
+                        <kwargssitem id="79" addr="0x7f6d3686daf0" >
+                            <attributelist id="80" addr="0x7f6d3686daf0" >
                             </attributelist >
                         </kwargssitem >
-                        <kwargssitem id="81" addr="0x7f390425b950" >
-                            <attributelist id="82" addr="0x7f390425b950" >
+                        <kwargssitem id="81" addr="0x7f6d3686d950" >
+                            <attributelist id="82" addr="0x7f6d3686d950" >
                             </attributelist >
                         </kwargssitem >
                     </kwargs >
-                    <attribute name="code" value="" id="83" addr="0x7f39042648d0" />
-                    <attribute name="method" value="in" id="84" addr="0x7f39042648d0" />
+                    <attribute name="code" value="" id="83" addr="0x7f6d368768d0" />
+                    <attribute name="method" value="in" id="84" addr="0x7f6d368768d0" />
                 </attributelist >
 
-                <typemapitem id="85" addr="0x7f390425bb90" >
-                    <attributelist id="86" addr="0x7f390425bb90" >
-                        <parmlist id="87" addr="0x7f390425bbd0" >
+                <typemapitem id="85" addr="0x7f6d3686db90" >
+                    <attributelist id="86" addr="0x7f6d3686db90" >
+                        <parmlist id="87" addr="0x7f6d3686dbd0" >
                             <parm id="88">
-                                <attributelist id="89" addr="0x7f390425bbd0" >
-                                    <attribute name="type" value="std::initializer_list&lt;(T)>" id="90" addr="0x7f39042648d0" />
+                                <attributelist id="89" addr="0x7f6d3686dbd0" >
+                                    <attribute name="type" value="std::initializer_list&lt;(T)>" id="90" addr="0x7f6d368768d0" />
                                 </attributelist >
                             </parm >
                         </parmlist >
@@ -143,32 +143,32 @@
                  
                 </typemapitem >
             </typemap >
-            <typemap id="91" addr="0x7f390425bff0" >
-                <attributelist id="92" addr="0x7f390425bff0" >
-                    <kwargs id="93" addr="0x7f390425bd90" >
-                        <attributelist id="94" addr="0x7f390425bd90" >
-                            <attribute name="name" value="precedence" id="95" addr="0x7f39042648d0" />
-                            <attribute name="value" value="0" id="96" addr="0x7f39042648d0" />
+            <typemap id="91" addr="0x7f6d3686dff0" >
+                <attributelist id="92" addr="0x7f6d3686dff0" >
+                    <kwargs id="93" addr="0x7f6d3686dd90" >
+                        <attributelist id="94" addr="0x7f6d3686dd90" >
+                            <attribute name="name" value="precedence" id="95" addr="0x7f6d368768d0" />
+                            <attribute name="value" value="0" id="96" addr="0x7f6d368768d0" />
                         </attributelist >
-                        <kwargssitem id="97" addr="0x7f390425bdb0" >
-                            <attributelist id="98" addr="0x7f390425bdb0" >
+                        <kwargssitem id="97" addr="0x7f6d3686ddb0" >
+                            <attributelist id="98" addr="0x7f6d3686ddb0" >
                             </attributelist >
                         </kwargssitem >
-                        <kwargssitem id="99" addr="0x7f390425bdd0" >
-                            <attributelist id="100" addr="0x7f390425bdd0" >
+                        <kwargssitem id="99" addr="0x7f6d3686ddd0" >
+                            <attributelist id="100" addr="0x7f6d3686ddd0" >
                             </attributelist >
                         </kwargssitem >
                     </kwargs >
-                    <attribute name="code" value="" id="101" addr="0x7f39042648d0" />
-                    <attribute name="method" value="typecheck" id="102" addr="0x7f39042648d0" />
+                    <attribute name="code" value="" id="101" addr="0x7f6d368768d0" />
+                    <attribute name="method" value="typecheck" id="102" addr="0x7f6d368768d0" />
                 </attributelist >
 
-                <typemapitem id="103" addr="0x7f390425bf30" >
-                    <attributelist id="104" addr="0x7f390425bf30" >
-                        <parmlist id="105" addr="0x7f390425bf70" >
+                <typemapitem id="103" addr="0x7f6d3686df30" >
+                    <attributelist id="104" addr="0x7f6d3686df30" >
+                        <parmlist id="105" addr="0x7f6d3686df70" >
                             <parm id="106">
-                                <attributelist id="107" addr="0x7f390425bf70" >
-                                    <attribute name="type" value="std::initializer_list&lt;(T)>" id="108" addr="0x7f39042648d0" />
+                                <attributelist id="107" addr="0x7f6d3686df70" >
+                                    <attribute name="type" value="std::initializer_list&lt;(T)>" id="108" addr="0x7f6d368768d0" />
                                 </attributelist >
                             </parm >
                         </parmlist >
@@ -177,18 +177,18 @@
                 </typemapitem >
             </typemap >
         </namespace >
-        <typemap id="109" addr="0x7f390425c210" >
-            <attributelist id="110" addr="0x7f390425c210" >
-                <attribute name="code" value="delete [] $1;" id="111" addr="0x7f39042648d0" />
-                <attribute name="method" value="newfree" id="112" addr="0x7f39042648d0" />
+        <typemap id="109" addr="0x7f6d3686e210" >
+            <attributelist id="110" addr="0x7f6d3686e210" >
+                <attribute name="code" value="delete [] $1;" id="111" addr="0x7f6d368768d0" />
+                <attribute name="method" value="newfree" id="112" addr="0x7f6d368768d0" />
             </attributelist >
 
-            <typemapitem id="113" addr="0x7f390425c130" >
-                <attributelist id="114" addr="0x7f390425c130" >
-                    <parmlist id="115" addr="0x7f390425c170" >
+            <typemapitem id="113" addr="0x7f6d3686e130" >
+                <attributelist id="114" addr="0x7f6d3686e130" >
+                    <parmlist id="115" addr="0x7f6d3686e170" >
                         <parm id="116">
-                            <attributelist id="117" addr="0x7f390425c170" >
-                                <attribute name="type" value="p.char" id="118" addr="0x7f39042648d0" />
+                            <attributelist id="117" addr="0x7f6d3686e170" >
+                                <attribute name="type" value="p.char" id="118" addr="0x7f6d368768d0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -196,18 +196,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="119" addr="0x7f390425c3f0" >
-            <attributelist id="120" addr="0x7f390425c3f0" >
-                <attribute name="code" value="{&#10;  delete [] $1;&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="121" addr="0x7f39042648d0" />
-                <attribute name="method" value="memberin" id="122" addr="0x7f39042648d0" />
+        <typemap id="119" addr="0x7f6d3686e3f0" >
+            <attributelist id="120" addr="0x7f6d3686e3f0" >
+                <attribute name="code" value="{&#10;  delete [] $1;&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="121" addr="0x7f6d368768d0" />
+                <attribute name="method" value="memberin" id="122" addr="0x7f6d368768d0" />
             </attributelist >
 
-            <typemapitem id="123" addr="0x7f390425c330" >
-                <attributelist id="124" addr="0x7f390425c330" >
-                    <parmlist id="125" addr="0x7f390425c370" >
+            <typemapitem id="123" addr="0x7f6d3686e330" >
+                <attributelist id="124" addr="0x7f6d3686e330" >
+                    <parmlist id="125" addr="0x7f6d3686e370" >
                         <parm id="126">
-                            <attributelist id="127" addr="0x7f390425c370" >
-                                <attribute name="type" value="p.char" id="128" addr="0x7f39042648d0" />
+                            <attributelist id="127" addr="0x7f6d3686e370" >
+                                <attribute name="type" value="p.char" id="128" addr="0x7f6d368768d0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -215,32 +215,32 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="129" addr="0x7f390425c650" >
-            <attributelist id="130" addr="0x7f390425c650" >
-                <kwargs id="131" addr="0x7f390425c490" >
-                    <attributelist id="132" addr="0x7f390425c490" >
-                        <attribute name="name" value="warning" id="133" addr="0x7f39042648d0" />
-                        <attribute name="value" value="451:Setting a const char * variable may leak memory." id="134" addr="0x7f39042648d0" />
+        <typemap id="129" addr="0x7f6d3686e650" >
+            <attributelist id="130" addr="0x7f6d3686e650" >
+                <kwargs id="131" addr="0x7f6d3686e490" >
+                    <attributelist id="132" addr="0x7f6d3686e490" >
+                        <attribute name="name" value="warning" id="133" addr="0x7f6d368768d0" />
+                        <attribute name="value" value="451:Setting a const char * variable may leak memory." id="134" addr="0x7f6d368768d0" />
                     </attributelist >
-                    <kwargssitem id="135" addr="0x7f390425c4b0" >
-                        <attributelist id="136" addr="0x7f390425c4b0" >
+                    <kwargssitem id="135" addr="0x7f6d3686e4b0" >
+                        <attributelist id="136" addr="0x7f6d3686e4b0" >
                         </attributelist >
                     </kwargssitem >
-                    <kwargssitem id="137" addr="0x7f390425c470" >
-                        <attributelist id="138" addr="0x7f390425c470" >
+                    <kwargssitem id="137" addr="0x7f6d3686e470" >
+                        <attributelist id="138" addr="0x7f6d3686e470" >
                         </attributelist >
                     </kwargssitem >
                 </kwargs >
-                <attribute name="code" value="{&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="139" addr="0x7f39042648d0" />
-                <attribute name="method" value="memberin" id="140" addr="0x7f39042648d0" />
+                <attribute name="code" value="{&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="139" addr="0x7f6d368768d0" />
+                <attribute name="method" value="memberin" id="140" addr="0x7f6d368768d0" />
             </attributelist >
 
-            <typemapitem id="141" addr="0x7f390425c590" >
-                <attributelist id="142" addr="0x7f390425c590" >
-                    <parmlist id="143" addr="0x7f390425c5d0" >
+            <typemapitem id="141" addr="0x7f6d3686e590" >
+                <attributelist id="142" addr="0x7f6d3686e590" >
+                    <parmlist id="143" addr="0x7f6d3686e5d0" >
                         <parm id="144">
-                            <attributelist id="145" addr="0x7f390425c5d0" >
-                                <attribute name="type" value="p.q(const).char" id="146" addr="0x7f39042648d0" />
+                            <attributelist id="145" addr="0x7f6d3686e5d0" >
+                                <attribute name="type" value="p.q(const).char" id="146" addr="0x7f6d368768d0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -248,18 +248,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="147" addr="0x7f390425c830" >
-            <attributelist id="148" addr="0x7f390425c830" >
-                <attribute name="code" value="{&#10;  delete [] $1;&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="149" addr="0x7f39042648d0" />
-                <attribute name="method" value="globalin" id="150" addr="0x7f39042648d0" />
+        <typemap id="147" addr="0x7f6d3686e830" >
+            <attributelist id="148" addr="0x7f6d3686e830" >
+                <attribute name="code" value="{&#10;  delete [] $1;&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="149" addr="0x7f6d368768d0" />
+                <attribute name="method" value="globalin" id="150" addr="0x7f6d368768d0" />
             </attributelist >
 
-            <typemapitem id="151" addr="0x7f390425c770" >
-                <attributelist id="152" addr="0x7f390425c770" >
-                    <parmlist id="153" addr="0x7f390425c7b0" >
+            <typemapitem id="151" addr="0x7f6d3686e770" >
+                <attributelist id="152" addr="0x7f6d3686e770" >
+                    <parmlist id="153" addr="0x7f6d3686e7b0" >
                         <parm id="154">
-                            <attributelist id="155" addr="0x7f390425c7b0" >
-                                <attribute name="type" value="p.char" id="156" addr="0x7f39042648d0" />
+                            <attributelist id="155" addr="0x7f6d3686e7b0" >
+                                <attribute name="type" value="p.char" id="156" addr="0x7f6d368768d0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -267,32 +267,32 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="157" addr="0x7f390425ca90" >
-            <attributelist id="158" addr="0x7f390425ca90" >
-                <kwargs id="159" addr="0x7f390425c8d0" >
-                    <attributelist id="160" addr="0x7f390425c8d0" >
-                        <attribute name="name" value="warning" id="161" addr="0x7f39042648d0" />
-                        <attribute name="value" value="451:Setting a const char * variable may leak memory." id="162" addr="0x7f39042648d0" />
+        <typemap id="157" addr="0x7f6d3686ea90" >
+            <attributelist id="158" addr="0x7f6d3686ea90" >
+                <kwargs id="159" addr="0x7f6d3686e8d0" >
+                    <attributelist id="160" addr="0x7f6d3686e8d0" >
+                        <attribute name="name" value="warning" id="161" addr="0x7f6d368768d0" />
+                        <attribute name="value" value="451:Setting a const char * variable may leak memory." id="162" addr="0x7f6d368768d0" />
                     </attributelist >
-                    <kwargssitem id="163" addr="0x7f390425c8f0" >
-                        <attributelist id="164" addr="0x7f390425c8f0" >
+                    <kwargssitem id="163" addr="0x7f6d3686e8f0" >
+                        <attributelist id="164" addr="0x7f6d3686e8f0" >
                         </attributelist >
                     </kwargssitem >
-                    <kwargssitem id="165" addr="0x7f390425c8b0" >
-                        <attributelist id="166" addr="0x7f390425c8b0" >
+                    <kwargssitem id="165" addr="0x7f6d3686e8b0" >
+                        <attributelist id="166" addr="0x7f6d3686e8b0" >
                         </attributelist >
                     </kwargssitem >
                 </kwargs >
-                <attribute name="code" value="{&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="167" addr="0x7f39042648d0" />
-                <attribute name="method" value="globalin" id="168" addr="0x7f39042648d0" />
+                <attribute name="code" value="{&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="167" addr="0x7f6d368768d0" />
+                <attribute name="method" value="globalin" id="168" addr="0x7f6d368768d0" />
             </attributelist >
 
-            <typemapitem id="169" addr="0x7f390425c9d0" >
-                <attributelist id="170" addr="0x7f390425c9d0" >
-                    <parmlist id="171" addr="0x7f390425ca10" >
+            <typemapitem id="169" addr="0x7f6d3686e9d0" >
+                <attributelist id="170" addr="0x7f6d3686e9d0" >
+                    <parmlist id="171" addr="0x7f6d3686ea10" >
                         <parm id="172">
-                            <attributelist id="173" addr="0x7f390425ca10" >
-                                <attribute name="type" value="p.q(const).char" id="174" addr="0x7f39042648d0" />
+                            <attributelist id="173" addr="0x7f6d3686ea10" >
+                                <attribute name="type" value="p.q(const).char" id="174" addr="0x7f6d368768d0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -300,18 +300,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="175" addr="0x7f390425ccb0" >
-            <attributelist id="176" addr="0x7f390425ccb0" >
-                <attribute name="code" value="{&#10;  if($input) {&#10;    strncpy((char*)$1, (const char *)$input, $1_dim0-1);&#10;    $1[$1_dim0-1] = 0;&#10;  } else {&#10;    $1[0] = 0;&#10;  }&#10;}" id="177" addr="0x7f39042648d0" />
-                <attribute name="method" value="memberin" id="178" addr="0x7f39042648d0" />
+        <typemap id="175" addr="0x7f6d3686ecb0" >
+            <attributelist id="176" addr="0x7f6d3686ecb0" >
+                <attribute name="code" value="{&#10;  if($input) {&#10;    strncpy((char*)$1, (const char *)$input, $1_dim0-1);&#10;    $1[$1_dim0-1] = 0;&#10;  } else {&#10;    $1[0] = 0;&#10;  }&#10;}" id="177" addr="0x7f6d368768d0" />
+                <attribute name="method" value="memberin" id="178" addr="0x7f6d368768d0" />
             </attributelist >
 
-            <typemapitem id="179" addr="0x7f390425cbf0" >
-                <attributelist id="180" addr="0x7f390425cbf0" >
-                    <parmlist id="181" addr="0x7f390425cc30" >
+            <typemapitem id="179" addr="0x7f6d3686ebf0" >
+                <attributelist id="180" addr="0x7f6d3686ebf0" >
+                    <parmlist id="181" addr="0x7f6d3686ec30" >
                         <parm id="182">
-                            <attributelist id="183" addr="0x7f390425cc30" >
-                                <attribute name="type" value="a(ANY).char" id="184" addr="0x7f39042648d0" />
+                            <attributelist id="183" addr="0x7f6d3686ec30" >
+                                <attribute name="type" value="a(ANY).char" id="184" addr="0x7f6d368768d0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -319,18 +319,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="185" addr="0x7f390425ced0" >
-            <attributelist id="186" addr="0x7f390425ced0" >
-                <attribute name="code" value="{&#10;  if($input) {&#10;    strncpy((char*)$1, (const char *)$input, $1_dim0-1);&#10;    $1[$1_dim0-1] = 0;&#10;  } else {&#10;    $1[0] = 0;&#10;  }&#10;}" id="187" addr="0x7f39042648d0" />
-                <attribute name="method" value="globalin" id="188" addr="0x7f39042648d0" />
+        <typemap id="185" addr="0x7f6d3686eed0" >
+            <attributelist id="186" addr="0x7f6d3686eed0" >
+                <attribute name="code" value="{&#10;  if($input) {&#10;    strncpy((char*)$1, (const char *)$input, $1_dim0-1);&#10;    $1[$1_dim0-1] = 0;&#10;  } else {&#10;    $1[0] = 0;&#10;  }&#10;}" id="187" addr="0x7f6d368768d0" />
+                <attribute name="method" value="globalin" id="188" addr="0x7f6d368768d0" />
             </attributelist >
 
-            <typemapitem id="189" addr="0x7f390425ce10" >
-                <attributelist id="190" addr="0x7f390425ce10" >
-                    <parmlist id="191" addr="0x7f390425ce50" >
+            <typemapitem id="189" addr="0x7f6d3686ee10" >
+                <attributelist id="190" addr="0x7f6d3686ee10" >
+                    <parmlist id="191" addr="0x7f6d3686ee50" >
                         <parm id="192">
-                            <attributelist id="193" addr="0x7f390425ce50" >
-                                <attribute name="type" value="a(ANY).char" id="194" addr="0x7f39042648d0" />
+                            <attributelist id="193" addr="0x7f6d3686ee50" >
+                                <attribute name="type" value="a(ANY).char" id="194" addr="0x7f6d368768d0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -338,18 +338,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="195" addr="0x7f390425d0b0" >
-            <attributelist id="196" addr="0x7f390425d0b0" >
-                <attribute name="code" value="{&#10;  if ($input) strcpy((char *)$1, (const char *)$input);&#10;  else $1[0] = 0;&#10;}" id="197" addr="0x7f39042648d0" />
-                <attribute name="method" value="memberin" id="198" addr="0x7f39042648d0" />
+        <typemap id="195" addr="0x7f6d3686f0b0" >
+            <attributelist id="196" addr="0x7f6d3686f0b0" >
+                <attribute name="code" value="{&#10;  if ($input) strcpy((char *)$1, (const char *)$input);&#10;  else $1[0] = 0;&#10;}" id="197" addr="0x7f6d368768d0" />
+                <attribute name="method" value="memberin" id="198" addr="0x7f6d368768d0" />
             </attributelist >
 
-            <typemapitem id="199" addr="0x7f390425cff0" >
-                <attributelist id="200" addr="0x7f390425cff0" >
-                    <parmlist id="201" addr="0x7f390425d030" >
+            <typemapitem id="199" addr="0x7f6d3686eff0" >
+                <attributelist id="200" addr="0x7f6d3686eff0" >
+                    <parmlist id="201" addr="0x7f6d3686f030" >
                         <parm id="202">
-                            <attributelist id="203" addr="0x7f390425d030" >
-                                <attribute name="type" value="a().char" id="204" addr="0x7f39042648d0" />
+                            <attributelist id="203" addr="0x7f6d3686f030" >
+                                <attribute name="type" value="a().char" id="204" addr="0x7f6d368768d0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -357,18 +357,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="205" addr="0x7f390425d290" >
-            <attributelist id="206" addr="0x7f390425d290" >
-                <attribute name="code" value="{&#10;  if ($input) strcpy((char *)$1, (const char *)$input);&#10;  else $1[0] = 0;&#10;}" id="207" addr="0x7f39042648d0" />
-                <attribute name="method" value="globalin" id="208" addr="0x7f39042648d0" />
+        <typemap id="205" addr="0x7f6d3686f290" >
+            <attributelist id="206" addr="0x7f6d3686f290" >
+                <attribute name="code" value="{&#10;  if ($input) strcpy((char *)$1, (const char *)$input);&#10;  else $1[0] = 0;&#10;}" id="207" addr="0x7f6d368768d0" />
+                <attribute name="method" value="globalin" id="208" addr="0x7f6d368768d0" />
             </attributelist >
 
-            <typemapitem id="209" addr="0x7f390425d1d0" >
-                <attributelist id="210" addr="0x7f390425d1d0" >
-                    <parmlist id="211" addr="0x7f390425d210" >
+            <typemapitem id="209" addr="0x7f6d3686f1d0" >
+                <attributelist id="210" addr="0x7f6d3686f1d0" >
+                    <parmlist id="211" addr="0x7f6d3686f210" >
                         <parm id="212">
-                            <attributelist id="213" addr="0x7f390425d210" >
-                                <attribute name="type" value="a().char" id="214" addr="0x7f39042648d0" />
+                            <attributelist id="213" addr="0x7f6d3686f210" >
+                                <attribute name="type" value="a().char" id="214" addr="0x7f6d368768d0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -376,18 +376,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="215" addr="0x7f390425d4b0" >
-            <attributelist id="216" addr="0x7f390425d4b0" >
-                <attribute name="code" value="{&#10;  size_t ii;&#10;  $1_basetype *b = ($1_basetype *) $1;&#10;  for (ii = 0; ii &lt; (size_t)$1_size; ii++) b[ii] = *(($1_basetype *) $input + ii);&#10;}" id="217" addr="0x7f39042648d0" />
-                <attribute name="method" value="memberin" id="218" addr="0x7f39042648d0" />
+        <typemap id="215" addr="0x7f6d3686f4b0" >
+            <attributelist id="216" addr="0x7f6d3686f4b0" >
+                <attribute name="code" value="{&#10;  size_t ii;&#10;  $1_basetype *b = ($1_basetype *) $1;&#10;  for (ii = 0; ii &lt; (size_t)$1_size; ii++) b[ii] = *(($1_basetype *) $input + ii);&#10;}" id="217" addr="0x7f6d368768d0" />
+                <attribute name="method" value="memberin" id="218" addr="0x7f6d368768d0" />
             </attributelist >
 
-            <typemapitem id="219" addr="0x7f390425d3f0" >
-                <attributelist id="220" addr="0x7f390425d3f0" >
-                    <parmlist id="221" addr="0x7f390425d430" >
+            <typemapitem id="219" addr="0x7f6d3686f3f0" >
+                <attributelist id="220" addr="0x7f6d3686f3f0" >
+                    <parmlist id="221" addr="0x7f6d3686f430" >
                         <parm id="222">
-                            <attributelist id="223" addr="0x7f390425d430" >
-                                <attribute name="type" value="a(ANY).SWIGTYPE" id="224" addr="0x7f39042648d0" />
+                            <attributelist id="223" addr="0x7f6d3686f430" >
+                                <attribute name="type" value="a(ANY).SWIGTYPE" id="224" addr="0x7f6d368768d0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -395,18 +395,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="225" addr="0x7f390425d6d0" >
-            <attributelist id="226" addr="0x7f390425d6d0" >
-                <attribute name="code" value="{&#10;  size_t ii;&#10;  $1_basetype *b = ($1_basetype *) $1;&#10;  for (ii = 0; ii &lt; (size_t)$1_size; ii++) b[ii] = *(($1_basetype *) $input + ii);&#10;}" id="227" addr="0x7f39042648d0" />
-                <attribute name="method" value="globalin" id="228" addr="0x7f39042648d0" />
+        <typemap id="225" addr="0x7f6d3686f6d0" >
+            <attributelist id="226" addr="0x7f6d3686f6d0" >
+                <attribute name="code" value="{&#10;  size_t ii;&#10;  $1_basetype *b = ($1_basetype *) $1;&#10;  for (ii = 0; ii &lt; (size_t)$1_size; ii++) b[ii] = *(($1_basetype *) $input + ii);&#10;}" id="227" addr="0x7f6d368768d0" />
+                <attribute name="method" value="globalin" id="228" addr="0x7f6d368768d0" />
             </attributelist >
 
-            <typemapitem id="229" addr="0x7f390425d610" >
-                <attributelist id="230" addr="0x7f390425d610" >
-                    <parmlist id="231" addr="0x7f390425d650" >
+            <typemapitem id="229" addr="0x7f6d3686f610" >
+                <attributelist id="230" addr="0x7f6d3686f610" >
+                    <parmlist id="231" addr="0x7f6d3686f650" >
                         <parm id="232">
-                            <attributelist id="233" addr="0x7f390425d650" >
-                                <attribute name="type" value="a(ANY).SWIGTYPE" id="234" addr="0x7f39042648d0" />
+                            <attributelist id="233" addr="0x7f6d3686f650" >
+                                <attribute name="type" value="a(ANY).SWIGTYPE" id="234" addr="0x7f6d368768d0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -414,18 +414,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="235" addr="0x7f390425d930" >
-            <attributelist id="236" addr="0x7f390425d930" >
-                <attribute name="code" value="{&#10;  $basetype (*inp)[$1_dim1] = ($basetype (*)[$1_dim1])($input);&#10;  $basetype (*dest)[$1_dim1] = ($basetype (*)[$1_dim1])($1);&#10;  size_t ii = 0;&#10;  for (; ii &lt; $1_dim0; ++ii) {&#10;    $basetype *ip = inp[ii];&#10;    $basetype *dp = dest[ii];&#10;    size_t jj = 0;&#10;    for (; jj &lt; $1_dim1; ++jj) dp[jj] = ip[jj];&#10;  }&#10;}" id="237" addr="0x7f39042648d0" />
-                <attribute name="method" value="memberin" id="238" addr="0x7f39042648d0" />
+        <typemap id="235" addr="0x7f6d3686f930" >
+            <attributelist id="236" addr="0x7f6d3686f930" >
+                <attribute name="code" value="{&#10;  $basetype (*inp)[$1_dim1] = ($basetype (*)[$1_dim1])($input);&#10;  $basetype (*dest)[$1_dim1] = ($basetype (*)[$1_dim1])($1);&#10;  size_t ii = 0;&#10;  for (; ii &lt; $1_dim0; ++ii) {&#10;    $basetype *ip = inp[ii];&#10;    $basetype *dp = dest[ii];&#10;    size_t jj = 0;&#10;    for (; jj &lt; $1_dim1; ++jj) dp[jj] = ip[jj];&#10;  }&#10;}" id="237" addr="0x7f6d368768d0" />
+                <attribute name="method" value="memberin" id="238" addr="0x7f6d368768d0" />
             </attributelist >
 
-            <typemapitem id="239" addr="0x7f390425d810" >
-                <attributelist id="240" addr="0x7f390425d810" >
-                    <parmlist id="241" addr="0x7f390425d8b0" >
+            <typemapitem id="239" addr="0x7f6d3686f810" >
+                <attributelist id="240" addr="0x7f6d3686f810" >
+                    <parmlist id="241" addr="0x7f6d3686f8b0" >
                         <parm id="242">
-                            <attributelist id="243" addr="0x7f390425d8b0" >
-                                <attribute name="type" value="a(ANY).a(ANY).SWIGTYPE" id="244" addr="0x7f39042648d0" />
+                            <attributelist id="243" addr="0x7f6d3686f8b0" >
+                                <attribute name="type" value="a(ANY).a(ANY).SWIGTYPE" id="244" addr="0x7f6d368768d0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -433,18 +433,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="245" addr="0x7f390425db90" >
-            <attributelist id="246" addr="0x7f390425db90" >
-                <attribute name="code" value="{&#10;  $basetype (*inp)[$1_dim1] = ($basetype (*)[$1_dim1])($input);&#10;  $basetype (*dest)[$1_dim1] = ($basetype (*)[$1_dim1])($1);&#10;  size_t ii = 0;&#10;  for (; ii &lt; $1_dim0; ++ii) {&#10;    $basetype *ip = inp[ii];&#10;    $basetype *dp = dest[ii];&#10;    size_t jj = 0;&#10;    for (; jj &lt; $1_dim1; ++jj) dp[jj] = ip[jj];&#10;  }&#10;}" id="247" addr="0x7f39042648d0" />
-                <attribute name="method" value="globalin" id="248" addr="0x7f39042648d0" />
+        <typemap id="245" addr="0x7f6d3686fb90" >
+            <attributelist id="246" addr="0x7f6d3686fb90" >
+                <attribute name="code" value="{&#10;  $basetype (*inp)[$1_dim1] = ($basetype (*)[$1_dim1])($input);&#10;  $basetype (*dest)[$1_dim1] = ($basetype (*)[$1_dim1])($1);&#10;  size_t ii = 0;&#10;  for (; ii &lt; $1_dim0; ++ii) {&#10;    $basetype *ip = inp[ii];&#10;    $basetype *dp = dest[ii];&#10;    size_t jj = 0;&#10;    for (; jj &lt; $1_dim1; ++jj) dp[jj] = ip[jj];&#10;  }&#10;}" id="247" addr="0x7f6d368768d0" />
+                <attribute name="method" value="globalin" id="248" addr="0x7f6d368768d0" />
             </attributelist >
 
-            <typemapitem id="249" addr="0x7f390425da70" >
-                <attributelist id="250" addr="0x7f390425da70" >
-                    <parmlist id="251" addr="0x7f390425db10" >
+            <typemapitem id="249" addr="0x7f6d3686fa70" >
+                <attributelist id="250" addr="0x7f6d3686fa70" >
+                    <parmlist id="251" addr="0x7f6d3686fb10" >
                         <parm id="252">
-                            <attributelist id="253" addr="0x7f390425db10" >
-                                <attribute name="type" value="a(ANY).a(ANY).SWIGTYPE" id="254" addr="0x7f39042648d0" />
+                            <attributelist id="253" addr="0x7f6d3686fb10" >
+                                <attribute name="type" value="a(ANY).a(ANY).SWIGTYPE" id="254" addr="0x7f6d368768d0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -452,784 +452,784 @@
              
             </typemapitem >
         </typemap >
-        <insert id="255" addr="0x7f390425dc50" >
-            <attributelist id="256" addr="0x7f390425dc50" >
-                <attribute name="code" value="&#10;#ifdef __cplusplus&#10;/* SwigValueWrapper is described in swig.swg */&#10;template&lt;typename T> class SwigValueWrapper {&#10;  struct SwigMovePointer {&#10;    T *ptr;&#10;    SwigMovePointer(T *p) : ptr(p) { }&#10;    ~SwigMovePointer() { delete ptr; }&#10;    SwigMovePointer&amp; operator=(SwigMovePointer&amp; rhs) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = rhs.ptr; rhs.ptr = 0; return *this; }&#10;  } pointer;&#10;  SwigValueWrapper&amp; operator=(const SwigValueWrapper&lt;T>&amp; rhs);&#10;  SwigValueWrapper(const SwigValueWrapper&lt;T>&amp; rhs);&#10;public:&#10;  SwigValueWrapper() : pointer(0) { }&#10;  SwigValueWrapper&amp; operator=(const T&amp; t) { SwigMovePointer tmp(new T(t)); pointer = tmp; return *this; }&#10;  operator T&amp;() const { return *pointer.ptr; }&#10;  T *operator&amp;() { return pointer.ptr; }&#10;};" id="257" addr="0x7f39042648d0" />
-                <attribute name="section" value="runtime" id="258" addr="0x7f39042648d0" />
+        <insert id="255" addr="0x7f6d3686fc50" >
+            <attributelist id="256" addr="0x7f6d3686fc50" >
+                <attribute name="code" value="&#10;#ifdef __cplusplus&#10;/* SwigValueWrapper is described in swig.swg */&#10;template&lt;typename T> class SwigValueWrapper {&#10;  struct SwigMovePointer {&#10;    T *ptr;&#10;    SwigMovePointer(T *p) : ptr(p) { }&#10;    ~SwigMovePointer() { delete ptr; }&#10;    SwigMovePointer&amp; operator=(SwigMovePointer&amp; rhs) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = rhs.ptr; rhs.ptr = 0; return *this; }&#10;  } pointer;&#10;  SwigValueWrapper&amp; operator=(const SwigValueWrapper&lt;T>&amp; rhs);&#10;  SwigValueWrapper(const SwigValueWrapper&lt;T>&amp; rhs);&#10;public:&#10;  SwigValueWrapper() : pointer(0) { }&#10;  SwigValueWrapper&amp; operator=(const T&amp; t) { SwigMovePointer tmp(new T(t)); pointer = tmp; return *this; }&#10;  operator T&amp;() const { return *pointer.ptr; }&#10;  T *operator&amp;() { return pointer.ptr; }&#10;};" id="257" addr="0x7f6d368768d0" />
+                <attribute name="section" value="runtime" id="258" addr="0x7f6d368768d0" />
             </attributelist >
          
         </insert >
-        <insert id="259" addr="0x7f390425dd30" >
-            <attributelist id="260" addr="0x7f390425dd30" >
-                <attribute name="code" value="&#10;template &lt;typename T> T SwigValueInit() {&#10;  return T();&#10;}&#10;#endif&#10;" id="261" addr="0x7f39042648d0" />
-                <attribute name="section" value="runtime" id="262" addr="0x7f39042648d0" />
+        <insert id="259" addr="0x7f6d3686fd30" >
+            <attributelist id="260" addr="0x7f6d3686fd30" >
+                <attribute name="code" value="&#10;template &lt;typename T> T SwigValueInit() {&#10;  return T();&#10;}&#10;#endif&#10;" id="261" addr="0x7f6d368768d0" />
+                <attribute name="section" value="runtime" id="262" addr="0x7f6d368768d0" />
             </attributelist >
          
         </insert >
-        <insert id="263" addr="0x7f390425de10" >
-            <attributelist id="264" addr="0x7f390425de10" >
-                <attribute name="code" value="/* -----------------------------------------------------------------------------&#10; *  This section contains generic SWIG labels for method/variable&#10; *  declarations/attributes, and other compiler dependent labels.&#10; * ----------------------------------------------------------------------------- */&#10;&#10;/* template workaround for compilers that cannot correctly implement the C++ standard */&#10;#ifndef SWIGTEMPLATEDISAMBIGUATOR&#10;# if defined(__SUNPRO_CC) &amp;&amp; (__SUNPRO_CC &lt;= 0x560)&#10;#  define SWIGTEMPLATEDISAMBIGUATOR template&#10;# elif defined(__HP_aCC)&#10;/* Needed even with `aCC -AA' when `aCC -V' reports HP ANSI C++ B3910B A.03.55 */&#10;/* If we find a maximum version that requires this, the test would be __HP_aCC &lt;= 35500 for A.03.55 */&#10;#  define SWIGTEMPLATEDISAMBIGUATOR template&#10;# else&#10;#  define SWIGTEMPLATEDISAMBIGUATOR&#10;# endif&#10;#endif&#10;&#10;/* inline attribute */&#10;#ifndef SWIGINLINE&#10;# if defined(__cplusplus) || (defined(__GNUC__) &amp;&amp; !defined(__STRICT_ANSI__))&#10;#   define SWIGINLINE inline&#10;# else&#10;#   define SWIGINLINE&#10;# endif&#10;#endif&#10;&#10;/* attribute recognised by some compilers to avoid 'unused' warnings */&#10;#ifndef SWIGUNUSED&#10;# if defined(__GNUC__)&#10;#   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 &amp;&amp; __GNUC_MINOR__ >= 4))&#10;#     define SWIGUNUSED __attribute__ ((__unused__))&#10;#   else&#10;#     define SWIGUNUSED&#10;#   endif&#10;# elif defined(__ICC)&#10;#   define SWIGUNUSED __attribute__ ((__unused__))&#10;# else&#10;#   define SWIGUNUSED&#10;# endif&#10;#endif&#10;&#10;#ifndef SWIG_MSC_UNSUPPRESS_4505&#10;# if defined(_MSC_VER)&#10;#   pragma warning(disable : 4505) /* unreferenced local function has been removed */&#10;# endif&#10;#endif&#10;&#10;#ifndef SWIGUNUSEDPARM&#10;# ifdef __cplusplus&#10;#   define SWIGUNUSEDPARM(p)&#10;# else&#10;#   define SWIGUNUSEDPARM(p) p SWIGUNUSED&#10;# endif&#10;#endif&#10;&#10;/* internal SWIG method */&#10;#ifndef SWIGINTERN&#10;# define SWIGINTERN static SWIGUNUSED&#10;#endif&#10;&#10;/* internal inline SWIG method */&#10;#ifndef SWIGINTERNINLINE&#10;# define SWIGINTERNINLINE SWIGINTERN SWIGINLINE&#10;#endif&#10;&#10;/* exporting methods */&#10;#if defined(__GNUC__)&#10;#  if (__GNUC__ >= 4) || (__GNUC__ == 3 &amp;&amp; __GNUC_MINOR__ >= 4)&#10;#    ifndef GCC_HASCLASSVISIBILITY&#10;#      define GCC_HASCLASSVISIBILITY&#10;#    endif&#10;#  endif&#10;#endif&#10;&#10;#ifndef SWIGEXPORT&#10;# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)&#10;#   if defined(STATIC_LINKED)&#10;#     define SWIGEXPORT&#10;#   else&#10;#     define SWIGEXPORT __declspec(dllexport)&#10;#   endif&#10;# else&#10;#   if defined(__GNUC__) &amp;&amp; defined(GCC_HASCLASSVISIBILITY)&#10;#     define SWIGEXPORT __attribute__ ((visibility(&quot;default&quot;)))&#10;#   else&#10;#     define SWIGEXPORT&#10;#   endif&#10;# endif&#10;#endif&#10;&#10;/* calling conventions for Windows */&#10;#ifndef SWIGSTDCALL&#10;# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)&#10;#   define SWIGSTDCALL __stdcall&#10;# else&#10;#   define SWIGSTDCALL&#10;# endif&#10;#endif&#10;&#10;/* Deal with Microsoft's attempt at deprecating C standard runtime functions */&#10;#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) &amp;&amp; defined(_MSC_VER) &amp;&amp; !defined(_CRT_SECURE_NO_DEPRECATE)&#10;# define _CRT_SECURE_NO_DEPRECATE&#10;#endif&#10;&#10;/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */&#10;#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) &amp;&amp; defined(_MSC_VER) &amp;&amp; !defined(_SCL_SECURE_NO_DEPRECATE)&#10;# define _SCL_SECURE_NO_DEPRECATE&#10;#endif&#10;&#10;/* Deal with Apple's deprecated 'AssertMacros.h' from Carbon-framework */&#10;#if defined(__APPLE__) &amp;&amp; !defined(__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES)&#10;# define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0&#10;#endif&#10;&#10;/* Intel's compiler complains if a variable which was never initialised is&#10; * cast to void, which is a common idiom which we use to indicate that we&#10; * are aware a variable isn't used.  So we just silence that warning.&#10; * See: https://github.com/swig/swig/issues/192 for more discussion.&#10; */&#10;#ifdef __INTEL_COMPILER&#10;# pragma warning disable 592&#10;#endif&#10;" id="265" addr="0x7f39042648d0" />
-                <attribute name="section" value="runtime" id="266" addr="0x7f39042648d0" />
+        <insert id="263" addr="0x7f6d3686fe10" >
+            <attributelist id="264" addr="0x7f6d3686fe10" >
+                <attribute name="code" value="/* -----------------------------------------------------------------------------&#10; *  This section contains generic SWIG labels for method/variable&#10; *  declarations/attributes, and other compiler dependent labels.&#10; * ----------------------------------------------------------------------------- */&#10;&#10;/* template workaround for compilers that cannot correctly implement the C++ standard */&#10;#ifndef SWIGTEMPLATEDISAMBIGUATOR&#10;# if defined(__SUNPRO_CC) &amp;&amp; (__SUNPRO_CC &lt;= 0x560)&#10;#  define SWIGTEMPLATEDISAMBIGUATOR template&#10;# elif defined(__HP_aCC)&#10;/* Needed even with `aCC -AA' when `aCC -V' reports HP ANSI C++ B3910B A.03.55 */&#10;/* If we find a maximum version that requires this, the test would be __HP_aCC &lt;= 35500 for A.03.55 */&#10;#  define SWIGTEMPLATEDISAMBIGUATOR template&#10;# else&#10;#  define SWIGTEMPLATEDISAMBIGUATOR&#10;# endif&#10;#endif&#10;&#10;/* inline attribute */&#10;#ifndef SWIGINLINE&#10;# if defined(__cplusplus) || (defined(__GNUC__) &amp;&amp; !defined(__STRICT_ANSI__))&#10;#   define SWIGINLINE inline&#10;# else&#10;#   define SWIGINLINE&#10;# endif&#10;#endif&#10;&#10;/* attribute recognised by some compilers to avoid 'unused' warnings */&#10;#ifndef SWIGUNUSED&#10;# if defined(__GNUC__)&#10;#   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 &amp;&amp; __GNUC_MINOR__ >= 4))&#10;#     define SWIGUNUSED __attribute__ ((__unused__))&#10;#   else&#10;#     define SWIGUNUSED&#10;#   endif&#10;# elif defined(__ICC)&#10;#   define SWIGUNUSED __attribute__ ((__unused__))&#10;# else&#10;#   define SWIGUNUSED&#10;# endif&#10;#endif&#10;&#10;#ifndef SWIG_MSC_UNSUPPRESS_4505&#10;# if defined(_MSC_VER)&#10;#   pragma warning(disable : 4505) /* unreferenced local function has been removed */&#10;# endif&#10;#endif&#10;&#10;#ifndef SWIGUNUSEDPARM&#10;# ifdef __cplusplus&#10;#   define SWIGUNUSEDPARM(p)&#10;# else&#10;#   define SWIGUNUSEDPARM(p) p SWIGUNUSED&#10;# endif&#10;#endif&#10;&#10;/* internal SWIG method */&#10;#ifndef SWIGINTERN&#10;# define SWIGINTERN static SWIGUNUSED&#10;#endif&#10;&#10;/* internal inline SWIG method */&#10;#ifndef SWIGINTERNINLINE&#10;# define SWIGINTERNINLINE SWIGINTERN SWIGINLINE&#10;#endif&#10;&#10;/* exporting methods */&#10;#if defined(__GNUC__)&#10;#  if (__GNUC__ >= 4) || (__GNUC__ == 3 &amp;&amp; __GNUC_MINOR__ >= 4)&#10;#    ifndef GCC_HASCLASSVISIBILITY&#10;#      define GCC_HASCLASSVISIBILITY&#10;#    endif&#10;#  endif&#10;#endif&#10;&#10;#ifndef SWIGEXPORT&#10;# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)&#10;#   if defined(STATIC_LINKED)&#10;#     define SWIGEXPORT&#10;#   else&#10;#     define SWIGEXPORT __declspec(dllexport)&#10;#   endif&#10;# else&#10;#   if defined(__GNUC__) &amp;&amp; defined(GCC_HASCLASSVISIBILITY)&#10;#     define SWIGEXPORT __attribute__ ((visibility(&quot;default&quot;)))&#10;#   else&#10;#     define SWIGEXPORT&#10;#   endif&#10;# endif&#10;#endif&#10;&#10;/* calling conventions for Windows */&#10;#ifndef SWIGSTDCALL&#10;# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)&#10;#   define SWIGSTDCALL __stdcall&#10;# else&#10;#   define SWIGSTDCALL&#10;# endif&#10;#endif&#10;&#10;/* Deal with Microsoft's attempt at deprecating C standard runtime functions */&#10;#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) &amp;&amp; defined(_MSC_VER) &amp;&amp; !defined(_CRT_SECURE_NO_DEPRECATE)&#10;# define _CRT_SECURE_NO_DEPRECATE&#10;#endif&#10;&#10;/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */&#10;#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) &amp;&amp; defined(_MSC_VER) &amp;&amp; !defined(_SCL_SECURE_NO_DEPRECATE)&#10;# define _SCL_SECURE_NO_DEPRECATE&#10;#endif&#10;&#10;/* Deal with Apple's deprecated 'AssertMacros.h' from Carbon-framework */&#10;#if defined(__APPLE__) &amp;&amp; !defined(__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES)&#10;# define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0&#10;#endif&#10;&#10;/* Intel's compiler complains if a variable which was never initialised is&#10; * cast to void, which is a common idiom which we use to indicate that we&#10; * are aware a variable isn't used.  So we just silence that warning.&#10; * See: https://github.com/swig/swig/issues/192 for more discussion.&#10; */&#10;#ifdef __INTEL_COMPILER&#10;# pragma warning disable 592&#10;#endif&#10;" id="265" addr="0x7f6d368768d0" />
+                <attribute name="section" value="runtime" id="266" addr="0x7f6d368768d0" />
             </attributelist >
          
         </insert >
     </include >
-    <include id="267" addr="0x7f390425df90" >
-        <attributelist id="268" addr="0x7f390425df90" >
-            <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmcdrm.i" id="269" addr="0x7f39042648d0" />
-            <attribute name="module" value="" id="270" addr="0x7f390425e030" />
-            <attribute name="options" value="0x7f390425df10" id="271" addr="0x7f390425df10" />
+    <include id="267" addr="0x7f6d3686ff90" >
+        <attributelist id="268" addr="0x7f6d3686ff90" >
+            <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmcdrm.i" id="269" addr="0x7f6d368768d0" />
+            <attribute name="module" value="" id="270" addr="0x7f6d36870030" />
+            <attribute name="options" value="0x7f6d3686ff10" id="271" addr="0x7f6d3686ff10" />
         </attributelist >
 
-        <module id="272" addr="0x7f390425dfd0" >
-            <attributelist id="273" addr="0x7f390425dfd0" >
-                <attribute name="name" value="xbmcdrm" id="274" addr="0x7f39042648d0" />
+        <module id="272" addr="0x7f6d3686ffd0" >
+            <attributelist id="273" addr="0x7f6d3686ffd0" >
+                <attribute name="name" value="xbmcdrm" id="274" addr="0x7f6d368768d0" />
             </attributelist >
          
         </module >
-        <insert id="275" addr="0x7f390425e070" >
-            <attributelist id="276" addr="0x7f390425e070" >
-                <attribute name="code" value="&#10;#if defined(TARGET_WINDOWS)&#10;#  include &lt;windows.h>&#10;#endif&#10;&#10;#include &quot;interfaces/legacy/DrmCryptoSession.h&quot;&#10;#include &quot;utils/log.h&quot;&#10;&#10;using namespace XBMCAddon;&#10;using namespace xbmcdrm;&#10;&#10;#if defined(__GNUG__)&#10;#pragma GCC diagnostic ignored &quot;-Wstrict-aliasing&quot;&#10;#endif&#10;&#10;" id="277" addr="0x7f39042648d0" />
+        <insert id="275" addr="0x7f6d36870070" >
+            <attributelist id="276" addr="0x7f6d36870070" >
+                <attribute name="code" value="&#10;#if defined(TARGET_WINDOWS)&#10;#  include &lt;windows.h>&#10;#endif&#10;&#10;#include &quot;interfaces/legacy/DrmCryptoSession.h&quot;&#10;#include &quot;utils/log.h&quot;&#10;&#10;using namespace XBMCAddon;&#10;using namespace xbmcdrm;&#10;&#10;#if defined(__GNUG__)&#10;#pragma GCC diagnostic ignored &quot;-Wstrict-aliasing&quot;&#10;#endif&#10;&#10;" id="277" addr="0x7f6d368768d0" />
             </attributelist >
          
         </insert >
-        <include id="278" addr="0x7f390425e0f0" >
-            <attributelist id="279" addr="0x7f390425e0f0" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/swighelper.h" id="280" addr="0x7f39042648d0" />
+        <include id="278" addr="0x7f6d368700f0" >
+            <attributelist id="279" addr="0x7f6d368700f0" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/swighelper.h" id="280" addr="0x7f6d368768d0" />
             </attributelist >
          
         </include >
-        <include id="281" addr="0x7f390425e170" >
-            <attributelist id="282" addr="0x7f390425e170" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/AddonString.h" id="283" addr="0x7f39042648d0" />
+        <include id="281" addr="0x7f6d36870170" >
+            <attributelist id="282" addr="0x7f6d36870170" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/AddonString.h" id="283" addr="0x7f6d368768d0" />
             </attributelist >
 
-            <namespace id="284" addr="0x7f390425e2b0" >
-                <attributelist id="285" addr="0x7f390425e2b0" >
-                    <attribute name="sym_name" value="XBMCAddon" id="286" addr="0x7f39042648d0" />
-                    <attribute name="name" value="XBMCAddon" id="287" addr="0x7f39042648d0" />
-                    <attribute name="csym_nextSibling" value="0x7f390425eaf0" id="288" addr="0x7f390425eaf0" />
-                    <attribute name="sym_nextSibling" value="0x7f390425eaf0" id="289" addr="0x7f390425eaf0" />
-                    <typescope id="290" addr="0x7f3904262f50" >
-                        <attributelist id="291" addr="0x7f3904262f50" >
-                            <attribute name="name" value="XBMCAddon" id="292" addr="0x7f39042648d0" />
-                            <typetab id="293" addr="0x7f3904262f90" >
-                                <attributelist id="294" addr="0x7f3904262f90" >
-                                    <attribute name="charVec" value="std::vector&lt;(char)>" id="295" addr="0x7f39042648d0" />
-                                    <attribute name="String" value="std::string" id="296" addr="0x7f39042648d0" />
+            <namespace id="284" addr="0x7f6d368702b0" >
+                <attributelist id="285" addr="0x7f6d368702b0" >
+                    <attribute name="sym_name" value="XBMCAddon" id="286" addr="0x7f6d368768d0" />
+                    <attribute name="name" value="XBMCAddon" id="287" addr="0x7f6d368768d0" />
+                    <attribute name="csym_nextSibling" value="0x7f6d36870af0" id="288" addr="0x7f6d36870af0" />
+                    <attribute name="sym_nextSibling" value="0x7f6d36870af0" id="289" addr="0x7f6d36870af0" />
+                    <typescope id="290" addr="0x7f6d36874f50" >
+                        <attributelist id="291" addr="0x7f6d36874f50" >
+                            <attribute name="name" value="XBMCAddon" id="292" addr="0x7f6d368768d0" />
+                            <typetab id="293" addr="0x7f6d36874f90" >
+                                <attributelist id="294" addr="0x7f6d36874f90" >
+                                    <attribute name="charVec" value="std::vector&lt;(char)>" id="295" addr="0x7f6d368768d0" />
+                                    <attribute name="String" value="std::string" id="296" addr="0x7f6d368768d0" />
                                 </attributelist >
-                                <typetabsitem id="297" addr="0x7f3904263430" >
-                                    <attributelist id="298" addr="0x7f3904263430" >
+                                <typetabsitem id="297" addr="0x7f6d36875430" >
+                                    <attributelist id="298" addr="0x7f6d36875430" >
                                     </attributelist >
                                 </typetabsitem >
-                                <typetabsitem id="299" addr="0x7f3904263170" >
-                                    <attributelist id="300" addr="0x7f3904263170" >
+                                <typetabsitem id="299" addr="0x7f6d36875170" >
+                                    <attributelist id="300" addr="0x7f6d36875170" >
                                     </attributelist >
                                 </typetabsitem >
                             </typetab >
-                            <attribute name="parent" value="0x7f3904247a30" id="301" addr="0x7f3904247a30" />
-                            <attribute name="qname" value="XBMCAddon" id="302" addr="0x7f39042648d0" />
-                            <attribute name="symtab" value="0x7f390425e210" id="303" addr="0x7f390425e210" />
+                            <attribute name="parent" value="0x7f6d36859a30" id="301" addr="0x7f6d36859a30" />
+                            <attribute name="qname" value="XBMCAddon" id="302" addr="0x7f6d368768d0" />
+                            <attribute name="symtab" value="0x7f6d36870210" id="303" addr="0x7f6d36870210" />
                         </attributelist >
-                        <typescopesitem id="304" addr="0x7f390425e1d0" >
-                            <attributelist id="305" addr="0x7f390425e1d0" >
+                        <typescopesitem id="304" addr="0x7f6d368701d0" >
+                            <attributelist id="305" addr="0x7f6d368701d0" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="306" addr="0x7f3904262f90" >
-                            <attributelist id="307" addr="0x7f3904262f90" >
-                                <attribute name="charVec" value="std::vector&lt;(char)>" id="308" addr="0x7f39042648d0" />
-                                <attribute name="String" value="std::string" id="309" addr="0x7f39042648d0" />
+                        <typescopesitem id="306" addr="0x7f6d36874f90" >
+                            <attributelist id="307" addr="0x7f6d36874f90" >
+                                <attribute name="charVec" value="std::vector&lt;(char)>" id="308" addr="0x7f6d368768d0" />
+                                <attribute name="String" value="std::string" id="309" addr="0x7f6d368768d0" />
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="310" addr="0x7f3904247a30" >
-                            <attributelist id="311" addr="0x7f3904247a30" >
-                                <attribute name="name" value="" id="312" addr="0x7f39042648d0" />
-                                <typetab id="313" addr="0x7f3904247a90" >
-                                    <attributelist id="314" addr="0x7f3904247a90" >
+                        <typescopesitem id="310" addr="0x7f6d36859a30" >
+                            <attributelist id="311" addr="0x7f6d36859a30" >
+                                <attribute name="name" value="" id="312" addr="0x7f6d368768d0" />
+                                <typetab id="313" addr="0x7f6d36859a90" >
+                                    <attributelist id="314" addr="0x7f6d36859a90" >
                                     </attributelist >
                                 </typetab >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="315" addr="0x7f3904263090" >
-                            <attributelist id="316" addr="0x7f3904263090" >
+                        <typescopesitem id="315" addr="0x7f6d36875090" >
+                            <attributelist id="316" addr="0x7f6d36875090" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="317" addr="0x7f390425e210" >
-                            <attributelist id="318" addr="0x7f390425e210" >
-                                <attribute name="name" value="XBMCAddon" id="319" addr="0x7f39042648d0" />
-                                <attribute name="csymtab" value="0x7f390425e250" id="320" addr="0x7f390425e250" />
-                                <attribute name="symtab" value="0x7f390425e1f0" id="321" addr="0x7f390425e1f0" />
+                        <typescopesitem id="317" addr="0x7f6d36870210" >
+                            <attributelist id="318" addr="0x7f6d36870210" >
+                                <attribute name="name" value="XBMCAddon" id="319" addr="0x7f6d368768d0" />
+                                <attribute name="csymtab" value="0x7f6d36870250" id="320" addr="0x7f6d36870250" />
+                                <attribute name="symtab" value="0x7f6d368701f0" id="321" addr="0x7f6d368701f0" />
                             </attributelist >
                         </typescopesitem >
                     </typescope >
-                    <attribute name="symtab" value="0x7f390425e210" id="322" addr="0x7f390425e210" />
-                    <attribute name="sym_symtab" value="0x7f3904247950" id="323" addr="0x7f3904247950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="324" addr="0x7f39042648d0" />
+                    <attribute name="symtab" value="0x7f6d36870210" id="322" addr="0x7f6d36870210" />
+                    <attribute name="sym_symtab" value="0x7f6d36859950" id="323" addr="0x7f6d36859950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="324" addr="0x7f6d368768d0" />
                 </attributelist >
 
-                <cdecl id="325" addr="0x7f390425e3d0" >
-                    <attributelist id="326" addr="0x7f390425e3d0" >
-                        <attribute name="sym_name" value="String" id="327" addr="0x7f39042648d0" />
-                        <attribute name="name" value="XBMCAddon::String" id="328" addr="0x7f39042648d0" />
-                        <attribute name="decl" value="" id="329" addr="0x7f39042648d0" />
-                        <attribute name="storage" value="typedef" id="330" addr="0x7f39042648d0" />
-                        <attribute name="kind" value="typedef" id="331" addr="0x7f39042648d0" />
-                        <attribute name="type" value="std::string" id="332" addr="0x7f39042648d0" />
-                        <attribute name="sym_symtab" value="0x7f390425e210" id="333" addr="0x7f390425e210" />
-                        <attribute name="sym_overname" value="__SWIG_0" id="334" addr="0x7f39042648d0" />
+                <cdecl id="325" addr="0x7f6d368703d0" >
+                    <attributelist id="326" addr="0x7f6d368703d0" >
+                        <attribute name="sym_name" value="String" id="327" addr="0x7f6d368768d0" />
+                        <attribute name="name" value="XBMCAddon::String" id="328" addr="0x7f6d368768d0" />
+                        <attribute name="decl" value="" id="329" addr="0x7f6d368768d0" />
+                        <attribute name="storage" value="typedef" id="330" addr="0x7f6d368768d0" />
+                        <attribute name="kind" value="typedef" id="331" addr="0x7f6d368768d0" />
+                        <attribute name="type" value="std::string" id="332" addr="0x7f6d368768d0" />
+                        <attribute name="sym_symtab" value="0x7f6d36870210" id="333" addr="0x7f6d36870210" />
+                        <attribute name="sym_overname" value="__SWIG_0" id="334" addr="0x7f6d368768d0" />
                     </attributelist >
                  
                 </cdecl >
-                <cdecl id="335" addr="0x7f390425e5d0" >
-                    <attributelist id="336" addr="0x7f390425e5d0" >
-                        <attribute name="sym_name" value="emptyString" id="337" addr="0x7f39042648d0" />
-                        <attribute name="name" value="XBMCAddon::emptyString" id="338" addr="0x7f39042648d0" />
-                        <attribute name="decl" value="" id="339" addr="0x7f39042648d0" />
-                        <attribute name="storage" value="extern" id="340" addr="0x7f39042648d0" />
-                        <attribute name="kind" value="variable" id="341" addr="0x7f39042648d0" />
-                        <attribute name="type" value="XBMCAddon::String" id="342" addr="0x7f39042648d0" />
-                        <attribute name="sym_symtab" value="0x7f390425e210" id="343" addr="0x7f390425e210" />
-                        <attribute name="sym_overname" value="__SWIG_0" id="344" addr="0x7f39042648d0" />
+                <cdecl id="335" addr="0x7f6d368705d0" >
+                    <attributelist id="336" addr="0x7f6d368705d0" >
+                        <attribute name="sym_name" value="emptyString" id="337" addr="0x7f6d368768d0" />
+                        <attribute name="name" value="XBMCAddon::emptyString" id="338" addr="0x7f6d368768d0" />
+                        <attribute name="decl" value="" id="339" addr="0x7f6d368768d0" />
+                        <attribute name="storage" value="extern" id="340" addr="0x7f6d368768d0" />
+                        <attribute name="kind" value="variable" id="341" addr="0x7f6d368768d0" />
+                        <attribute name="type" value="XBMCAddon::String" id="342" addr="0x7f6d368768d0" />
+                        <attribute name="sym_symtab" value="0x7f6d36870210" id="343" addr="0x7f6d36870210" />
+                        <attribute name="sym_overname" value="__SWIG_0" id="344" addr="0x7f6d368768d0" />
                     </attributelist >
                  
                 </cdecl >
             </namespace >
         </include >
-        <include id="345" addr="0x7f390425e7b0" >
-            <attributelist id="346" addr="0x7f390425e7b0" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/DrmCryptoSession.h" id="347" addr="0x7f39042648d0" />
+        <include id="345" addr="0x7f6d368707b0" >
+            <attributelist id="346" addr="0x7f6d368707b0" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/DrmCryptoSession.h" id="347" addr="0x7f6d368768d0" />
             </attributelist >
 
-            <namespace id="348" addr="0x7f390425e8f0" >
-                <attributelist id="349" addr="0x7f390425e8f0" >
-                    <attribute name="sym_name" value="DRM" id="350" addr="0x7f39042648d0" />
-                    <attribute name="name" value="DRM" id="351" addr="0x7f39042648d0" />
-                    <typescope id="352" addr="0x7f39042630d0" >
-                        <attributelist id="353" addr="0x7f39042630d0" >
-                            <attribute name="name" value="DRM" id="354" addr="0x7f39042648d0" />
-                            <typetab id="355" addr="0x7f3904263310" >
-                                <attributelist id="356" addr="0x7f3904263310" >
-                                    <attribute name="CCryptoSession" value="CCryptoSession" id="357" addr="0x7f39042648d0" />
+            <namespace id="348" addr="0x7f6d368708f0" >
+                <attributelist id="349" addr="0x7f6d368708f0" >
+                    <attribute name="sym_name" value="DRM" id="350" addr="0x7f6d368768d0" />
+                    <attribute name="name" value="DRM" id="351" addr="0x7f6d368768d0" />
+                    <typescope id="352" addr="0x7f6d368750d0" >
+                        <attributelist id="353" addr="0x7f6d368750d0" >
+                            <attribute name="name" value="DRM" id="354" addr="0x7f6d368768d0" />
+                            <typetab id="355" addr="0x7f6d36875310" >
+                                <attributelist id="356" addr="0x7f6d36875310" >
+                                    <attribute name="CCryptoSession" value="CCryptoSession" id="357" addr="0x7f6d368768d0" />
                                 </attributelist >
-                                <typetabsitem id="358" addr="0x7f3904263390" >
-                                    <attributelist id="359" addr="0x7f3904263390" >
+                                <typetabsitem id="358" addr="0x7f6d36875390" >
+                                    <attributelist id="359" addr="0x7f6d36875390" >
                                     </attributelist >
                                 </typetabsitem >
                             </typetab >
-                            <attribute name="parent" value="0x7f3904247a30" id="360" addr="0x7f3904247a30" />
-                            <attribute name="qname" value="DRM" id="361" addr="0x7f39042648d0" />
-                            <attribute name="symtab" value="0x7f390425e850" id="362" addr="0x7f390425e850" />
+                            <attribute name="parent" value="0x7f6d36859a30" id="360" addr="0x7f6d36859a30" />
+                            <attribute name="qname" value="DRM" id="361" addr="0x7f6d368768d0" />
+                            <attribute name="symtab" value="0x7f6d36870850" id="362" addr="0x7f6d36870850" />
                         </attributelist >
-                        <typescopesitem id="363" addr="0x7f390425e810" >
-                            <attributelist id="364" addr="0x7f390425e810" >
+                        <typescopesitem id="363" addr="0x7f6d36870810" >
+                            <attributelist id="364" addr="0x7f6d36870810" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="365" addr="0x7f3904263310" >
-                            <attributelist id="366" addr="0x7f3904263310" >
-                                <attribute name="CCryptoSession" value="CCryptoSession" id="367" addr="0x7f39042648d0" />
+                        <typescopesitem id="365" addr="0x7f6d36875310" >
+                            <attributelist id="366" addr="0x7f6d36875310" >
+                                <attribute name="CCryptoSession" value="CCryptoSession" id="367" addr="0x7f6d368768d0" />
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="368" addr="0x7f3904247a30" >
-                            <attributelist id="369" addr="0x7f3904247a30" >
-                                <attribute name="name" value="" id="370" addr="0x7f39042648d0" />
-                                <typetab id="371" addr="0x7f3904247a90" >
-                                    <attributelist id="372" addr="0x7f3904247a90" >
+                        <typescopesitem id="368" addr="0x7f6d36859a30" >
+                            <attributelist id="369" addr="0x7f6d36859a30" >
+                                <attribute name="name" value="" id="370" addr="0x7f6d368768d0" />
+                                <typetab id="371" addr="0x7f6d36859a90" >
+                                    <attributelist id="372" addr="0x7f6d36859a90" >
                                     </attributelist >
                                 </typetab >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="373" addr="0x7f3904263330" >
-                            <attributelist id="374" addr="0x7f3904263330" >
+                        <typescopesitem id="373" addr="0x7f6d36875330" >
+                            <attributelist id="374" addr="0x7f6d36875330" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="375" addr="0x7f390425e850" >
-                            <attributelist id="376" addr="0x7f390425e850" >
-                                <attribute name="name" value="DRM" id="377" addr="0x7f39042648d0" />
-                                <attribute name="csymtab" value="0x7f390425e890" id="378" addr="0x7f390425e890" />
-                                <attribute name="symtab" value="0x7f390425e830" id="379" addr="0x7f390425e830" />
+                        <typescopesitem id="375" addr="0x7f6d36870850" >
+                            <attributelist id="376" addr="0x7f6d36870850" >
+                                <attribute name="name" value="DRM" id="377" addr="0x7f6d368768d0" />
+                                <attribute name="csymtab" value="0x7f6d36870890" id="378" addr="0x7f6d36870890" />
+                                <attribute name="symtab" value="0x7f6d36870830" id="379" addr="0x7f6d36870830" />
                             </attributelist >
                         </typescopesitem >
                     </typescope >
-                    <attribute name="symtab" value="0x7f390425e850" id="380" addr="0x7f390425e850" />
-                    <attribute name="sym_symtab" value="0x7f3904247950" id="381" addr="0x7f3904247950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="382" addr="0x7f39042648d0" />
+                    <attribute name="symtab" value="0x7f6d36870850" id="380" addr="0x7f6d36870850" />
+                    <attribute name="sym_symtab" value="0x7f6d36859950" id="381" addr="0x7f6d36859950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="382" addr="0x7f6d368768d0" />
                 </attributelist >
 
-                <classforward id="383" addr="0x7f390425e990" >
-                    <attributelist id="384" addr="0x7f390425e990" >
-                        <attribute name="sym_name" value="CCryptoSession" id="385" addr="0x7f39042648d0" />
-                        <attribute name="name" value="CCryptoSession" id="386" addr="0x7f39042648d0" />
-                        <attribute name="kind" value="class" id="387" addr="0x7f39042648d0" />
-                        <attribute name="sym_weak" value="1" id="388" addr="0x7f39042648d0" />
-                        <attribute name="sym_symtab" value="0x7f390425e850" id="389" addr="0x7f390425e850" />
-                        <attribute name="sym_overname" value="__SWIG_0" id="390" addr="0x7f39042648d0" />
+                <classforward id="383" addr="0x7f6d36870990" >
+                    <attributelist id="384" addr="0x7f6d36870990" >
+                        <attribute name="sym_name" value="CCryptoSession" id="385" addr="0x7f6d368768d0" />
+                        <attribute name="name" value="CCryptoSession" id="386" addr="0x7f6d368768d0" />
+                        <attribute name="kind" value="class" id="387" addr="0x7f6d368768d0" />
+                        <attribute name="sym_weak" value="1" id="388" addr="0x7f6d368768d0" />
+                        <attribute name="sym_symtab" value="0x7f6d36870850" id="389" addr="0x7f6d36870850" />
+                        <attribute name="sym_overname" value="__SWIG_0" id="390" addr="0x7f6d368768d0" />
                     </attributelist >
                  
                 </classforward >
             </namespace >
-            <namespace id="391" addr="0x7f390425eaf0" >
-                <attributelist id="392" addr="0x7f390425eaf0" >
-                    <attribute name="sym_name" value="XBMCAddon" id="393" addr="0x7f39042648d0" />
-                    <attribute name="name" value="XBMCAddon" id="394" addr="0x7f39042648d0" />
-                    <attribute name="sym_previousSibling" value="0x7f390425e2b0" id="395" addr="0x7f390425e2b0" />
-                    <typescope id="396" addr="0x7f3904262f50" >
-                        <attributelist id="397" addr="0x7f3904262f50" >
-                            <attribute name="name" value="XBMCAddon" id="398" addr="0x7f39042648d0" />
-                            <typetab id="399" addr="0x7f3904262f90" >
-                                <attributelist id="400" addr="0x7f3904262f90" >
-                                    <attribute name="charVec" value="std::vector&lt;(char)>" id="401" addr="0x7f39042648d0" />
-                                    <attribute name="String" value="std::string" id="402" addr="0x7f39042648d0" />
+            <namespace id="391" addr="0x7f6d36870af0" >
+                <attributelist id="392" addr="0x7f6d36870af0" >
+                    <attribute name="sym_name" value="XBMCAddon" id="393" addr="0x7f6d368768d0" />
+                    <attribute name="name" value="XBMCAddon" id="394" addr="0x7f6d368768d0" />
+                    <attribute name="sym_previousSibling" value="0x7f6d368702b0" id="395" addr="0x7f6d368702b0" />
+                    <typescope id="396" addr="0x7f6d36874f50" >
+                        <attributelist id="397" addr="0x7f6d36874f50" >
+                            <attribute name="name" value="XBMCAddon" id="398" addr="0x7f6d368768d0" />
+                            <typetab id="399" addr="0x7f6d36874f90" >
+                                <attributelist id="400" addr="0x7f6d36874f90" >
+                                    <attribute name="charVec" value="std::vector&lt;(char)>" id="401" addr="0x7f6d368768d0" />
+                                    <attribute name="String" value="std::string" id="402" addr="0x7f6d368768d0" />
                                 </attributelist >
-                                <typetabsitem id="403" addr="0x7f3904263430" >
-                                    <attributelist id="404" addr="0x7f3904263430" >
+                                <typetabsitem id="403" addr="0x7f6d36875430" >
+                                    <attributelist id="404" addr="0x7f6d36875430" >
                                     </attributelist >
                                 </typetabsitem >
-                                <typetabsitem id="405" addr="0x7f3904263170" >
-                                    <attributelist id="406" addr="0x7f3904263170" >
+                                <typetabsitem id="405" addr="0x7f6d36875170" >
+                                    <attributelist id="406" addr="0x7f6d36875170" >
                                     </attributelist >
                                 </typetabsitem >
                             </typetab >
-                            <attribute name="parent" value="0x7f3904247a30" id="407" addr="0x7f3904247a30" />
-                            <attribute name="qname" value="XBMCAddon" id="408" addr="0x7f39042648d0" />
-                            <attribute name="symtab" value="0x7f390425e210" id="409" addr="0x7f390425e210" />
+                            <attribute name="parent" value="0x7f6d36859a30" id="407" addr="0x7f6d36859a30" />
+                            <attribute name="qname" value="XBMCAddon" id="408" addr="0x7f6d368768d0" />
+                            <attribute name="symtab" value="0x7f6d36870210" id="409" addr="0x7f6d36870210" />
                         </attributelist >
-                        <typescopesitem id="410" addr="0x7f390425e1d0" >
-                            <attributelist id="411" addr="0x7f390425e1d0" >
+                        <typescopesitem id="410" addr="0x7f6d368701d0" >
+                            <attributelist id="411" addr="0x7f6d368701d0" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="412" addr="0x7f3904262f90" >
-                            <attributelist id="413" addr="0x7f3904262f90" >
-                                <attribute name="charVec" value="std::vector&lt;(char)>" id="414" addr="0x7f39042648d0" />
-                                <attribute name="String" value="std::string" id="415" addr="0x7f39042648d0" />
+                        <typescopesitem id="412" addr="0x7f6d36874f90" >
+                            <attributelist id="413" addr="0x7f6d36874f90" >
+                                <attribute name="charVec" value="std::vector&lt;(char)>" id="414" addr="0x7f6d368768d0" />
+                                <attribute name="String" value="std::string" id="415" addr="0x7f6d368768d0" />
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="416" addr="0x7f3904247a30" >
-                            <attributelist id="417" addr="0x7f3904247a30" >
-                                <attribute name="name" value="" id="418" addr="0x7f39042648d0" />
-                                <typetab id="419" addr="0x7f3904247a90" >
-                                    <attributelist id="420" addr="0x7f3904247a90" >
+                        <typescopesitem id="416" addr="0x7f6d36859a30" >
+                            <attributelist id="417" addr="0x7f6d36859a30" >
+                                <attribute name="name" value="" id="418" addr="0x7f6d368768d0" />
+                                <typetab id="419" addr="0x7f6d36859a90" >
+                                    <attributelist id="420" addr="0x7f6d36859a90" >
                                     </attributelist >
                                 </typetab >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="421" addr="0x7f3904263090" >
-                            <attributelist id="422" addr="0x7f3904263090" >
+                        <typescopesitem id="421" addr="0x7f6d36875090" >
+                            <attributelist id="422" addr="0x7f6d36875090" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="423" addr="0x7f390425e210" >
-                            <attributelist id="424" addr="0x7f390425e210" >
-                                <attribute name="name" value="XBMCAddon" id="425" addr="0x7f39042648d0" />
-                                <attribute name="csymtab" value="0x7f390425e250" id="426" addr="0x7f390425e250" />
-                                <attribute name="symtab" value="0x7f390425e1f0" id="427" addr="0x7f390425e1f0" />
+                        <typescopesitem id="423" addr="0x7f6d36870210" >
+                            <attributelist id="424" addr="0x7f6d36870210" >
+                                <attribute name="name" value="XBMCAddon" id="425" addr="0x7f6d368768d0" />
+                                <attribute name="csymtab" value="0x7f6d36870250" id="426" addr="0x7f6d36870250" />
+                                <attribute name="symtab" value="0x7f6d368701f0" id="427" addr="0x7f6d368701f0" />
                             </attributelist >
                         </typescopesitem >
                     </typescope >
-                    <attribute name="symtab" value="0x7f390425e210" id="428" addr="0x7f390425e210" />
-                    <attribute name="sym_symtab" value="0x7f3904247950" id="429" addr="0x7f3904247950" />
+                    <attribute name="symtab" value="0x7f6d36870210" id="428" addr="0x7f6d36870210" />
+                    <attribute name="sym_symtab" value="0x7f6d36859950" id="429" addr="0x7f6d36859950" />
                 </attributelist >
 
-                <cdecl id="430" addr="0x7f390425ecd0" >
-                    <attributelist id="431" addr="0x7f390425ecd0" >
-                        <attribute name="sym_name" value="charVec" id="432" addr="0x7f39042648d0" />
-                        <attribute name="name" value="XBMCAddon::charVec" id="433" addr="0x7f39042648d0" />
-                        <attribute name="decl" value="" id="434" addr="0x7f39042648d0" />
-                        <attribute name="storage" value="typedef" id="435" addr="0x7f39042648d0" />
-                        <attribute name="kind" value="typedef" id="436" addr="0x7f39042648d0" />
-                        <attribute name="type" value="std::vector&lt;(char)>" id="437" addr="0x7f39042648d0" />
-                        <attribute name="sym_symtab" value="0x7f390425e210" id="438" addr="0x7f390425e210" />
-                        <attribute name="sym_overname" value="__SWIG_0" id="439" addr="0x7f39042648d0" />
+                <cdecl id="430" addr="0x7f6d36870cd0" >
+                    <attributelist id="431" addr="0x7f6d36870cd0" >
+                        <attribute name="sym_name" value="charVec" id="432" addr="0x7f6d368768d0" />
+                        <attribute name="name" value="XBMCAddon::charVec" id="433" addr="0x7f6d368768d0" />
+                        <attribute name="decl" value="" id="434" addr="0x7f6d368768d0" />
+                        <attribute name="storage" value="typedef" id="435" addr="0x7f6d368768d0" />
+                        <attribute name="kind" value="typedef" id="436" addr="0x7f6d368768d0" />
+                        <attribute name="type" value="std::vector&lt;(char)>" id="437" addr="0x7f6d368768d0" />
+                        <attribute name="sym_symtab" value="0x7f6d36870210" id="438" addr="0x7f6d36870210" />
+                        <attribute name="sym_overname" value="__SWIG_0" id="439" addr="0x7f6d368768d0" />
                     </attributelist >
                  
                 </cdecl >
-                <namespace id="440" addr="0x7f390425efd0" >
-                    <attributelist id="441" addr="0x7f390425efd0" >
-                        <attribute name="sym_name" value="xbmcdrm" id="442" addr="0x7f39042648d0" />
-                        <attribute name="name" value="xbmcdrm" id="443" addr="0x7f39042648d0" />
-                        <typescope id="444" addr="0x7f39042636d0" >
-                            <attributelist id="445" addr="0x7f39042636d0" >
-                                <attribute name="name" value="xbmcdrm" id="446" addr="0x7f39042648d0" />
-                                <typetab id="447" addr="0x7f39042636f0" >
-                                    <attributelist id="448" addr="0x7f39042636f0" >
-                                        <attribute name="CryptoSession" value="CryptoSession" id="449" addr="0x7f39042648d0" />
+                <namespace id="440" addr="0x7f6d36870fd0" >
+                    <attributelist id="441" addr="0x7f6d36870fd0" >
+                        <attribute name="sym_name" value="xbmcdrm" id="442" addr="0x7f6d368768d0" />
+                        <attribute name="name" value="xbmcdrm" id="443" addr="0x7f6d368768d0" />
+                        <typescope id="444" addr="0x7f6d368756d0" >
+                            <attributelist id="445" addr="0x7f6d368756d0" >
+                                <attribute name="name" value="xbmcdrm" id="446" addr="0x7f6d368768d0" />
+                                <typetab id="447" addr="0x7f6d368756f0" >
+                                    <attributelist id="448" addr="0x7f6d368756f0" >
+                                        <attribute name="CryptoSession" value="CryptoSession" id="449" addr="0x7f6d368768d0" />
                                     </attributelist >
-                                    <typetabsitem id="450" addr="0x7f3904263850" >
-                                        <attributelist id="451" addr="0x7f3904263850" >
+                                    <typetabsitem id="450" addr="0x7f6d36875850" >
+                                        <attributelist id="451" addr="0x7f6d36875850" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
-                                <attribute name="parent" value="0x7f3904262f50" id="452" addr="0x7f3904262f50" />
-                                <attribute name="qname" value="XBMCAddon::xbmcdrm" id="453" addr="0x7f39042648d0" />
-                                <attribute name="symtab" value="0x7f390425ee30" id="454" addr="0x7f390425ee30" />
+                                <attribute name="parent" value="0x7f6d36874f50" id="452" addr="0x7f6d36874f50" />
+                                <attribute name="qname" value="XBMCAddon::xbmcdrm" id="453" addr="0x7f6d368768d0" />
+                                <attribute name="symtab" value="0x7f6d36870e30" id="454" addr="0x7f6d36870e30" />
                             </attributelist >
-                            <typescopesitem id="455" addr="0x7f390425edd0" >
-                                <attributelist id="456" addr="0x7f390425edd0" >
+                            <typescopesitem id="455" addr="0x7f6d36870dd0" >
+                                <attributelist id="456" addr="0x7f6d36870dd0" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="457" addr="0x7f39042636f0" >
-                                <attributelist id="458" addr="0x7f39042636f0" >
-                                    <attribute name="CryptoSession" value="CryptoSession" id="459" addr="0x7f39042648d0" />
+                            <typescopesitem id="457" addr="0x7f6d368756f0" >
+                                <attributelist id="458" addr="0x7f6d368756f0" >
+                                    <attribute name="CryptoSession" value="CryptoSession" id="459" addr="0x7f6d368768d0" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="460" addr="0x7f3904262f50" >
-                                <attributelist id="461" addr="0x7f3904262f50" >
-                                    <attribute name="name" value="XBMCAddon" id="462" addr="0x7f39042648d0" />
-                                    <typetab id="463" addr="0x7f3904262f90" >
-                                        <attributelist id="464" addr="0x7f3904262f90" >
-                                            <attribute name="charVec" value="std::vector&lt;(char)>" id="465" addr="0x7f39042648d0" />
-                                            <attribute name="String" value="std::string" id="466" addr="0x7f39042648d0" />
+                            <typescopesitem id="460" addr="0x7f6d36874f50" >
+                                <attributelist id="461" addr="0x7f6d36874f50" >
+                                    <attribute name="name" value="XBMCAddon" id="462" addr="0x7f6d368768d0" />
+                                    <typetab id="463" addr="0x7f6d36874f90" >
+                                        <attributelist id="464" addr="0x7f6d36874f90" >
+                                            <attribute name="charVec" value="std::vector&lt;(char)>" id="465" addr="0x7f6d368768d0" />
+                                            <attribute name="String" value="std::string" id="466" addr="0x7f6d368768d0" />
                                         </attributelist >
-                                        <typetabsitem id="467" addr="0x7f3904263430" >
-                                            <attributelist id="468" addr="0x7f3904263430" >
+                                        <typetabsitem id="467" addr="0x7f6d36875430" >
+                                            <attributelist id="468" addr="0x7f6d36875430" >
                                             </attributelist >
                                         </typetabsitem >
-                                        <typetabsitem id="469" addr="0x7f3904263170" >
-                                            <attributelist id="470" addr="0x7f3904263170" >
+                                        <typetabsitem id="469" addr="0x7f6d36875170" >
+                                            <attributelist id="470" addr="0x7f6d36875170" >
                                             </attributelist >
                                         </typetabsitem >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f3904247a30" id="471" addr="0x7f3904247a30" />
-                                    <attribute name="qname" value="XBMCAddon" id="472" addr="0x7f39042648d0" />
-                                    <attribute name="symtab" value="0x7f390425e210" id="473" addr="0x7f390425e210" />
+                                    <attribute name="parent" value="0x7f6d36859a30" id="471" addr="0x7f6d36859a30" />
+                                    <attribute name="qname" value="XBMCAddon" id="472" addr="0x7f6d368768d0" />
+                                    <attribute name="symtab" value="0x7f6d36870210" id="473" addr="0x7f6d36870210" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="474" addr="0x7f3904263710" >
-                                <attributelist id="475" addr="0x7f3904263710" >
+                            <typescopesitem id="474" addr="0x7f6d36875710" >
+                                <attributelist id="475" addr="0x7f6d36875710" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="476" addr="0x7f390425ee30" >
-                                <attributelist id="477" addr="0x7f390425ee30" >
-                                    <attribute name="name" value="xbmcdrm" id="478" addr="0x7f39042648d0" />
-                                    <attribute name="csymtab" value="0x7f390425ef90" id="479" addr="0x7f390425ef90" />
-                                    <attribute name="symtab" value="0x7f390425edf0" id="480" addr="0x7f390425edf0" />
+                            <typescopesitem id="476" addr="0x7f6d36870e30" >
+                                <attributelist id="477" addr="0x7f6d36870e30" >
+                                    <attribute name="name" value="xbmcdrm" id="478" addr="0x7f6d368768d0" />
+                                    <attribute name="csymtab" value="0x7f6d36870f90" id="479" addr="0x7f6d36870f90" />
+                                    <attribute name="symtab" value="0x7f6d36870df0" id="480" addr="0x7f6d36870df0" />
                                 </attributelist >
                             </typescopesitem >
                         </typescope >
-                        <attribute name="symtab" value="0x7f390425ee30" id="481" addr="0x7f390425ee30" />
-                        <attribute name="sym_symtab" value="0x7f390425e210" id="482" addr="0x7f390425e210" />
-                        <attribute name="sym_overname" value="__SWIG_0" id="483" addr="0x7f39042648d0" />
+                        <attribute name="symtab" value="0x7f6d36870e30" id="481" addr="0x7f6d36870e30" />
+                        <attribute name="sym_symtab" value="0x7f6d36870210" id="482" addr="0x7f6d36870210" />
+                        <attribute name="sym_overname" value="__SWIG_0" id="483" addr="0x7f6d368768d0" />
                     </attributelist >
 
-                    <cdecl id="484" addr="0x7f390425f050" >
-                        <attributelist id="485" addr="0x7f390425f050" >
-                            <attribute name="sym_name" value="DRMException" id="486" addr="0x7f39042648d0" />
-                            <attribute name="name" value="XBMCAddon::xbmcdrm::DRMException" id="487" addr="0x7f39042648d0" />
-                            <attribute name="kind" value="variable" id="488" addr="0x7f39042648d0" />
-                            <attribute name="type" value="XBMCCOMMONS_STANDARD_EXCEPTION" id="489" addr="0x7f39042648d0" />
-                            <attribute name="sym_symtab" value="0x7f390425ee30" id="490" addr="0x7f390425ee30" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="491" addr="0x7f39042648d0" />
+                    <cdecl id="484" addr="0x7f6d36871050" >
+                        <attributelist id="485" addr="0x7f6d36871050" >
+                            <attribute name="sym_name" value="DRMException" id="486" addr="0x7f6d368768d0" />
+                            <attribute name="name" value="XBMCAddon::xbmcdrm::DRMException" id="487" addr="0x7f6d368768d0" />
+                            <attribute name="kind" value="variable" id="488" addr="0x7f6d368768d0" />
+                            <attribute name="type" value="XBMCCOMMONS_STANDARD_EXCEPTION" id="489" addr="0x7f6d368768d0" />
+                            <attribute name="sym_symtab" value="0x7f6d36870e30" id="490" addr="0x7f6d36870e30" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="491" addr="0x7f6d368768d0" />
                         </attributelist >
                      
                     </cdecl >
-                    <class id="492" addr="0x7f390425f2f0" >
-                        <attributelist id="493" addr="0x7f390425f2f0" >
-                            <attribute name="name" value="XBMCAddon::xbmcdrm::CryptoSession" id="494" addr="0x7f39042648d0" />
-                            <attribute name="sym_symtab" value="0x7f390425ee30" id="495" addr="0x7f390425ee30" />
-                            <attribute name="symtab" value="0x7f390425f470" id="496" addr="0x7f390425f470" />
-                            <attribute name="allows_typedef" value="1" id="497" addr="0x7f39042648d0" />
-                            <attribute name="typepass_visit" value="1" id="498" addr="0x7f39042648d0" />
-                            <attribute name="allocate_visit" value="1" id="499" addr="0x7f39042648d0" />
-                            <attribute name="kind" value="class" id="500" addr="0x7f39042648d0" />
-                            <attribute name="sym_name" value="CryptoSession" id="501" addr="0x7f39042648d0" />
-                            <attribute name="allocate_has_constructor" value="1" id="502" addr="0x7f39042648d0" />
-                            <attribute name="allocate_public_constructor" value="1" id="503" addr="0x7f39042648d0" />
-                            <attribute name="allocate_has_destructor" value="1" id="504" addr="0x7f39042648d0" />
-                            <attribute name="allocate_default_destructor" value="1" id="505" addr="0x7f39042648d0" />
-                            <attribute name="allocate_copy_constructor" value="1" id="506" addr="0x7f39042648d0" />
-                            <attribute name="privatebaselist" value="0x7f390425f270" id="507" addr="0x7f390425f270" />
-                            <attribute name="protectedbaselist" value="0x7f390425f250" id="508" addr="0x7f390425f250" />
-                            <baselist id="509" addr="0x7f390425f230" >
-                                <base name="AddonClass" id="510" addr="0x7f390425f190" />
+                    <class id="492" addr="0x7f6d368712f0" >
+                        <attributelist id="493" addr="0x7f6d368712f0" >
+                            <attribute name="name" value="XBMCAddon::xbmcdrm::CryptoSession" id="494" addr="0x7f6d368768d0" />
+                            <attribute name="sym_symtab" value="0x7f6d36870e30" id="495" addr="0x7f6d36870e30" />
+                            <attribute name="symtab" value="0x7f6d36871470" id="496" addr="0x7f6d36871470" />
+                            <attribute name="allows_typedef" value="1" id="497" addr="0x7f6d368768d0" />
+                            <attribute name="typepass_visit" value="1" id="498" addr="0x7f6d368768d0" />
+                            <attribute name="allocate_visit" value="1" id="499" addr="0x7f6d368768d0" />
+                            <attribute name="kind" value="class" id="500" addr="0x7f6d368768d0" />
+                            <attribute name="sym_name" value="CryptoSession" id="501" addr="0x7f6d368768d0" />
+                            <attribute name="allocate_has_constructor" value="1" id="502" addr="0x7f6d368768d0" />
+                            <attribute name="allocate_public_constructor" value="1" id="503" addr="0x7f6d368768d0" />
+                            <attribute name="allocate_has_destructor" value="1" id="504" addr="0x7f6d368768d0" />
+                            <attribute name="allocate_default_destructor" value="1" id="505" addr="0x7f6d368768d0" />
+                            <attribute name="allocate_copy_constructor" value="1" id="506" addr="0x7f6d368768d0" />
+                            <attribute name="privatebaselist" value="0x7f6d36871270" id="507" addr="0x7f6d36871270" />
+                            <attribute name="protectedbaselist" value="0x7f6d36871250" id="508" addr="0x7f6d36871250" />
+                            <baselist id="509" addr="0x7f6d36871230" >
+                                <base name="AddonClass" id="510" addr="0x7f6d36871190" />
                             </baselist >
-                            <attribute name="module" value="xbmcdrm" id="511" addr="0x7f390425dfd0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="512" addr="0x7f39042648d0" />
-                            <typescope id="513" addr="0x7f3904263950" >
-                                <attributelist id="514" addr="0x7f3904263950" >
-                                    <attribute name="name" value="CryptoSession" id="515" addr="0x7f39042648d0" />
-                                    <typetab id="516" addr="0x7f3904263970" >
-                                        <attributelist id="517" addr="0x7f3904263970" >
+                            <attribute name="module" value="xbmcdrm" id="511" addr="0x7f6d3686ffd0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="512" addr="0x7f6d368768d0" />
+                            <typescope id="513" addr="0x7f6d36875950" >
+                                <attributelist id="514" addr="0x7f6d36875950" >
+                                    <attribute name="name" value="CryptoSession" id="515" addr="0x7f6d368768d0" />
+                                    <typetab id="516" addr="0x7f6d36875970" >
+                                        <attributelist id="517" addr="0x7f6d36875970" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f39042636d0" id="518" addr="0x7f39042636d0" />
-                                    <attribute name="qname" value="XBMCAddon::xbmcdrm::CryptoSession" id="519" addr="0x7f39042648d0" />
-                                    <attribute name="symtab" value="0x7f390425f470" id="520" addr="0x7f390425f470" />
+                                    <attribute name="parent" value="0x7f6d368756d0" id="518" addr="0x7f6d368756d0" />
+                                    <attribute name="qname" value="XBMCAddon::xbmcdrm::CryptoSession" id="519" addr="0x7f6d368768d0" />
+                                    <attribute name="symtab" value="0x7f6d36871470" id="520" addr="0x7f6d36871470" />
                                 </attributelist >
-                                <typescopesitem id="521" addr="0x7f39042638b0" >
-                                    <attributelist id="522" addr="0x7f39042638b0" >
+                                <typescopesitem id="521" addr="0x7f6d368758b0" >
+                                    <attributelist id="522" addr="0x7f6d368758b0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="523" addr="0x7f3904263970" >
-                                    <attributelist id="524" addr="0x7f3904263970" >
+                                <typescopesitem id="523" addr="0x7f6d36875970" >
+                                    <attributelist id="524" addr="0x7f6d36875970" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="525" addr="0x7f39042636d0" >
-                                    <attributelist id="526" addr="0x7f39042636d0" >
-                                        <attribute name="name" value="xbmcdrm" id="527" addr="0x7f39042648d0" />
-                                        <typetab id="528" addr="0x7f39042636f0" >
-                                            <attributelist id="529" addr="0x7f39042636f0" >
-                                                <attribute name="CryptoSession" value="CryptoSession" id="530" addr="0x7f39042648d0" />
+                                <typescopesitem id="525" addr="0x7f6d368756d0" >
+                                    <attributelist id="526" addr="0x7f6d368756d0" >
+                                        <attribute name="name" value="xbmcdrm" id="527" addr="0x7f6d368768d0" />
+                                        <typetab id="528" addr="0x7f6d368756f0" >
+                                            <attributelist id="529" addr="0x7f6d368756f0" >
+                                                <attribute name="CryptoSession" value="CryptoSession" id="530" addr="0x7f6d368768d0" />
                                             </attributelist >
-                                            <typetabsitem id="531" addr="0x7f3904263850" >
-                                                <attributelist id="532" addr="0x7f3904263850" >
+                                            <typetabsitem id="531" addr="0x7f6d36875850" >
+                                                <attributelist id="532" addr="0x7f6d36875850" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7f3904262f50" id="533" addr="0x7f3904262f50" />
-                                        <attribute name="qname" value="XBMCAddon::xbmcdrm" id="534" addr="0x7f39042648d0" />
-                                        <attribute name="symtab" value="0x7f390425ee30" id="535" addr="0x7f390425ee30" />
+                                        <attribute name="parent" value="0x7f6d36874f50" id="533" addr="0x7f6d36874f50" />
+                                        <attribute name="qname" value="XBMCAddon::xbmcdrm" id="534" addr="0x7f6d368768d0" />
+                                        <attribute name="symtab" value="0x7f6d36870e30" id="535" addr="0x7f6d36870e30" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="536" addr="0x7f3904263990" >
-                                    <attributelist id="537" addr="0x7f3904263990" >
+                                <typescopesitem id="536" addr="0x7f6d36875990" >
+                                    <attributelist id="537" addr="0x7f6d36875990" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="538" addr="0x7f390425f470" >
-                                    <attributelist id="539" addr="0x7f390425f470" >
-                                        <attribute name="name" value="CryptoSession" id="540" addr="0x7f39042648d0" />
-                                        <attribute name="csymtab" value="0x7f390425f4d0" id="541" addr="0x7f390425f4d0" />
-                                        <attribute name="symtab" value="0x7f390425f450" id="542" addr="0x7f390425f450" />
+                                <typescopesitem id="538" addr="0x7f6d36871470" >
+                                    <attributelist id="539" addr="0x7f6d36871470" >
+                                        <attribute name="name" value="CryptoSession" id="540" addr="0x7f6d368768d0" />
+                                        <attribute name="csymtab" value="0x7f6d368714d0" id="541" addr="0x7f6d368714d0" />
+                                        <attribute name="symtab" value="0x7f6d36871450" id="542" addr="0x7f6d36871450" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <cdecl id="543" addr="0x7f390425f5d0" >
-                            <attributelist id="544" addr="0x7f390425f5d0" >
-                                <attribute name="ismember" value="1" id="545" addr="0x7f39042648d0" />
-                                <attribute name="name" value="m_cryptoSession" id="546" addr="0x7f39042648d0" />
-                                <attribute name="decl" value="p." id="547" addr="0x7f39042648d0" />
-                                <attribute name="access" value="private" id="548" addr="0x7f39042648d0" />
-                                <attribute name="kind" value="variable" id="549" addr="0x7f39042648d0" />
-                                <attribute name="type" value="DRM::CCryptoSession" id="550" addr="0x7f39042648d0" />
-                                <attribute name="sym_symtab" value="0x7f390425f470" id="551" addr="0x7f390425f470" />
+                        <cdecl id="543" addr="0x7f6d368715d0" >
+                            <attributelist id="544" addr="0x7f6d368715d0" >
+                                <attribute name="ismember" value="1" id="545" addr="0x7f6d368768d0" />
+                                <attribute name="name" value="m_cryptoSession" id="546" addr="0x7f6d368768d0" />
+                                <attribute name="decl" value="p." id="547" addr="0x7f6d368768d0" />
+                                <attribute name="access" value="private" id="548" addr="0x7f6d368768d0" />
+                                <attribute name="kind" value="variable" id="549" addr="0x7f6d368768d0" />
+                                <attribute name="type" value="DRM::CCryptoSession" id="550" addr="0x7f6d368768d0" />
+                                <attribute name="sym_symtab" value="0x7f6d36871470" id="551" addr="0x7f6d36871470" />
                             </attributelist >
                          
                         </cdecl >
-                        <access id="552" addr="0x7f390425f790" >
-                            <attributelist id="553" addr="0x7f390425f790" >
-                                <attribute name="kind" value="public" id="554" addr="0x7f39042648d0" />
+                        <access id="552" addr="0x7f6d36871790" >
+                            <attributelist id="553" addr="0x7f6d36871790" >
+                                <attribute name="kind" value="public" id="554" addr="0x7f6d368768d0" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="555" addr="0x7f390425fbd0" >
-                            <attributelist id="556" addr="0x7f390425fbd0" >
-                                <attribute name="ismember" value="1" id="557" addr="0x7f39042648d0" />
-                                <attribute name="sym_name" value="CryptoSession" id="558" addr="0x7f39042648d0" />
-                                <attribute name="name" value="CryptoSession" id="559" addr="0x7f39042648d0" />
-                                <parmlist id="560" addr="0x7f390425f8d0" >
+                        <constructor id="555" addr="0x7f6d36871bd0" >
+                            <attributelist id="556" addr="0x7f6d36871bd0" >
+                                <attribute name="ismember" value="1" id="557" addr="0x7f6d368768d0" />
+                                <attribute name="sym_name" value="CryptoSession" id="558" addr="0x7f6d368768d0" />
+                                <attribute name="name" value="CryptoSession" id="559" addr="0x7f6d368768d0" />
+                                <parmlist id="560" addr="0x7f6d368718d0" >
                                     <parm id="561">
-                                        <attributelist id="562" addr="0x7f390425f8d0" >
-                                            <attribute name="name" value="UUID" id="563" addr="0x7f39042648d0" />
-                                            <attribute name="type" value="XBMCAddon::String" id="564" addr="0x7f39042648d0" />
+                                        <attributelist id="562" addr="0x7f6d368718d0" >
+                                            <attribute name="name" value="UUID" id="563" addr="0x7f6d368768d0" />
+                                            <attribute name="type" value="XBMCAddon::String" id="564" addr="0x7f6d368768d0" />
                                         </attributelist >
                                     </parm >
                                     <parm id="565">
-                                        <attributelist id="566" addr="0x7f390425f9f0" >
-                                            <attribute name="name" value="cipherAlgorithm" id="567" addr="0x7f39042648d0" />
-                                            <attribute name="type" value="XBMCAddon::String" id="568" addr="0x7f39042648d0" />
+                                        <attributelist id="566" addr="0x7f6d368719f0" >
+                                            <attribute name="name" value="cipherAlgorithm" id="567" addr="0x7f6d368768d0" />
+                                            <attribute name="type" value="XBMCAddon::String" id="568" addr="0x7f6d368768d0" />
                                         </attributelist >
                                     </parm >
                                     <parm id="569">
-                                        <attributelist id="570" addr="0x7f390425fb10" >
-                                            <attribute name="name" value="macAlgorithm" id="571" addr="0x7f39042648d0" />
-                                            <attribute name="type" value="XBMCAddon::String" id="572" addr="0x7f39042648d0" />
+                                        <attributelist id="570" addr="0x7f6d36871b10" >
+                                            <attribute name="name" value="macAlgorithm" id="571" addr="0x7f6d368768d0" />
+                                            <attribute name="type" value="XBMCAddon::String" id="572" addr="0x7f6d368768d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="decl" value="f(String,String,String)." id="573" addr="0x7f39042648d0" />
-                                <attribute name="access" value="public" id="574" addr="0x7f39042648d0" />
-                                <attribute name="feature_new" value="1" id="575" addr="0x7f39042648d0" />
-                                <attribute name="sym_symtab" value="0x7f390425f470" id="576" addr="0x7f390425f470" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="577" addr="0x7f39042648d0" />
+                                <attribute name="decl" value="f(String,String,String)." id="573" addr="0x7f6d368768d0" />
+                                <attribute name="access" value="public" id="574" addr="0x7f6d368768d0" />
+                                <attribute name="feature_new" value="1" id="575" addr="0x7f6d368768d0" />
+                                <attribute name="sym_symtab" value="0x7f6d36871470" id="576" addr="0x7f6d36871470" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="577" addr="0x7f6d368768d0" />
                             </attributelist >
                          
                         </constructor >
-                        <destructor id="578" addr="0x7f390425fd70" >
-                            <attributelist id="579" addr="0x7f390425fd70" >
-                                <attribute name="ismember" value="1" id="580" addr="0x7f39042648d0" />
-                                <attribute name="sym_name" value="~CryptoSession" id="581" addr="0x7f39042648d0" />
-                                <attribute name="name" value="~CryptoSession" id="582" addr="0x7f39042648d0" />
-                                <attribute name="decl" value="f()." id="583" addr="0x7f39042648d0" />
-                                <attribute name="access" value="public" id="584" addr="0x7f39042648d0" />
-                                <attribute name="sym_symtab" value="0x7f390425f470" id="585" addr="0x7f390425f470" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="586" addr="0x7f39042648d0" />
+                        <destructor id="578" addr="0x7f6d36871d70" >
+                            <attributelist id="579" addr="0x7f6d36871d70" >
+                                <attribute name="ismember" value="1" id="580" addr="0x7f6d368768d0" />
+                                <attribute name="sym_name" value="~CryptoSession" id="581" addr="0x7f6d368768d0" />
+                                <attribute name="name" value="~CryptoSession" id="582" addr="0x7f6d368768d0" />
+                                <attribute name="decl" value="f()." id="583" addr="0x7f6d368768d0" />
+                                <attribute name="access" value="public" id="584" addr="0x7f6d368768d0" />
+                                <attribute name="sym_symtab" value="0x7f6d36871470" id="585" addr="0x7f6d36871470" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="586" addr="0x7f6d368768d0" />
                             </attributelist >
                          
                         </destructor >
-                        <cdecl id="587" addr="0x7f39042605b0" >
-                            <attributelist id="588" addr="0x7f39042605b0" >
-                                <attribute name="name" value="GetKeyRequest" id="589" addr="0x7f39042648d0" />
-                                <attribute name="ismember" value="1" id="590" addr="0x7f39042648d0" />
-                                <attribute name="sym_symtab" value="0x7f390425f470" id="591" addr="0x7f390425f470" />
-                                <attribute name="kind" value="function" id="592" addr="0x7f39042648d0" />
-                                <attribute name="sym_name" value="GetKeyRequest" id="593" addr="0x7f39042648d0" />
-                                <attribute name="decl" value="f(r.q(const).XbmcCommons::Buffer,r.q(const).XBMCAddon::String,bool,r.q(const).std::map&lt;(XBMCAddon::String,XBMCAddon::String)>)." id="594" addr="0x7f39042648d0" />
-                                <attribute name="access" value="public" id="595" addr="0x7f39042648d0" />
-                                <parmlist id="596" addr="0x7f390425fff0" >
+                        <cdecl id="587" addr="0x7f6d368725b0" >
+                            <attributelist id="588" addr="0x7f6d368725b0" >
+                                <attribute name="name" value="GetKeyRequest" id="589" addr="0x7f6d368768d0" />
+                                <attribute name="ismember" value="1" id="590" addr="0x7f6d368768d0" />
+                                <attribute name="sym_symtab" value="0x7f6d36871470" id="591" addr="0x7f6d36871470" />
+                                <attribute name="kind" value="function" id="592" addr="0x7f6d368768d0" />
+                                <attribute name="sym_name" value="GetKeyRequest" id="593" addr="0x7f6d368768d0" />
+                                <attribute name="decl" value="f(r.q(const).XbmcCommons::Buffer,r.q(const).XBMCAddon::String,bool,r.q(const).std::map&lt;(XBMCAddon::String,XBMCAddon::String)>)." id="594" addr="0x7f6d368768d0" />
+                                <attribute name="access" value="public" id="595" addr="0x7f6d368768d0" />
+                                <parmlist id="596" addr="0x7f6d36871ff0" >
                                     <parm id="597">
-                                        <attributelist id="598" addr="0x7f390425fff0" >
-                                            <attribute name="name" value="init" id="599" addr="0x7f39042648d0" />
-                                            <attribute name="type" value="r.q(const).XbmcCommons::Buffer" id="600" addr="0x7f39042648d0" />
+                                        <attributelist id="598" addr="0x7f6d36871ff0" >
+                                            <attribute name="name" value="init" id="599" addr="0x7f6d368768d0" />
+                                            <attribute name="type" value="r.q(const).XbmcCommons::Buffer" id="600" addr="0x7f6d368768d0" />
                                         </attributelist >
                                     </parm >
                                     <parm id="601">
-                                        <attributelist id="602" addr="0x7f3904260130" >
-                                            <attribute name="name" value="mimeType" id="603" addr="0x7f39042648d0" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="604" addr="0x7f39042648d0" />
+                                        <attributelist id="602" addr="0x7f6d36872130" >
+                                            <attribute name="name" value="mimeType" id="603" addr="0x7f6d368768d0" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="604" addr="0x7f6d368768d0" />
                                         </attributelist >
                                     </parm >
                                     <parm id="605">
-                                        <attributelist id="606" addr="0x7f3904260230" >
-                                            <attribute name="name" value="offlineKey" id="607" addr="0x7f39042648d0" />
-                                            <attribute name="type" value="bool" id="608" addr="0x7f39042648d0" />
+                                        <attributelist id="606" addr="0x7f6d36872230" >
+                                            <attribute name="name" value="offlineKey" id="607" addr="0x7f6d368768d0" />
+                                            <attribute name="type" value="bool" id="608" addr="0x7f6d368768d0" />
                                         </attributelist >
                                     </parm >
                                     <parm id="609">
-                                        <attributelist id="610" addr="0x7f39042604f0" >
-                                            <attribute name="name" value="optionalParameters" id="611" addr="0x7f39042648d0" />
-                                            <attribute name="type" value="r.q(const).std::map&lt;(XBMCAddon::String,XBMCAddon::String)>" id="612" addr="0x7f39042648d0" />
+                                        <attributelist id="610" addr="0x7f6d368724f0" >
+                                            <attribute name="name" value="optionalParameters" id="611" addr="0x7f6d368768d0" />
+                                            <attribute name="type" value="r.q(const).std::map&lt;(XBMCAddon::String,XBMCAddon::String)>" id="612" addr="0x7f6d368768d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="XbmcCommons::Buffer" id="613" addr="0x7f39042648d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="614" addr="0x7f39042648d0" />
+                                <attribute name="type" value="XbmcCommons::Buffer" id="613" addr="0x7f6d368768d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="614" addr="0x7f6d368768d0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="615" addr="0x7f39042608d0" >
-                            <attributelist id="616" addr="0x7f39042608d0" >
-                                <attribute name="name" value="GetPropertyString" id="617" addr="0x7f39042648d0" />
-                                <attribute name="ismember" value="1" id="618" addr="0x7f39042648d0" />
-                                <attribute name="sym_symtab" value="0x7f390425f470" id="619" addr="0x7f390425f470" />
-                                <attribute name="kind" value="function" id="620" addr="0x7f39042648d0" />
-                                <attribute name="sym_name" value="GetPropertyString" id="621" addr="0x7f39042648d0" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="622" addr="0x7f39042648d0" />
-                                <attribute name="access" value="public" id="623" addr="0x7f39042648d0" />
-                                <parmlist id="624" addr="0x7f3904260810" >
+                        <cdecl id="615" addr="0x7f6d368728d0" >
+                            <attributelist id="616" addr="0x7f6d368728d0" >
+                                <attribute name="name" value="GetPropertyString" id="617" addr="0x7f6d368768d0" />
+                                <attribute name="ismember" value="1" id="618" addr="0x7f6d368768d0" />
+                                <attribute name="sym_symtab" value="0x7f6d36871470" id="619" addr="0x7f6d36871470" />
+                                <attribute name="kind" value="function" id="620" addr="0x7f6d368768d0" />
+                                <attribute name="sym_name" value="GetPropertyString" id="621" addr="0x7f6d368768d0" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="622" addr="0x7f6d368768d0" />
+                                <attribute name="access" value="public" id="623" addr="0x7f6d368768d0" />
+                                <parmlist id="624" addr="0x7f6d36872810" >
                                     <parm id="625">
-                                        <attributelist id="626" addr="0x7f3904260810" >
-                                            <attribute name="name" value="name" id="627" addr="0x7f39042648d0" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="628" addr="0x7f39042648d0" />
+                                        <attributelist id="626" addr="0x7f6d36872810" >
+                                            <attribute name="name" value="name" id="627" addr="0x7f6d368768d0" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="628" addr="0x7f6d368768d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="XBMCAddon::String" id="629" addr="0x7f39042648d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="630" addr="0x7f39042648d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="629" addr="0x7f6d368768d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="630" addr="0x7f6d368768d0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="631" addr="0x7f3904260c10" >
-                            <attributelist id="632" addr="0x7f3904260c10" >
-                                <attribute name="name" value="ProvideKeyResponse" id="633" addr="0x7f39042648d0" />
-                                <attribute name="ismember" value="1" id="634" addr="0x7f39042648d0" />
-                                <attribute name="sym_symtab" value="0x7f390425f470" id="635" addr="0x7f390425f470" />
-                                <attribute name="kind" value="function" id="636" addr="0x7f39042648d0" />
-                                <attribute name="sym_name" value="ProvideKeyResponse" id="637" addr="0x7f39042648d0" />
-                                <attribute name="decl" value="f(r.q(const).XbmcCommons::Buffer)." id="638" addr="0x7f39042648d0" />
-                                <attribute name="access" value="public" id="639" addr="0x7f39042648d0" />
-                                <parmlist id="640" addr="0x7f3904260b50" >
+                        <cdecl id="631" addr="0x7f6d36872c10" >
+                            <attributelist id="632" addr="0x7f6d36872c10" >
+                                <attribute name="name" value="ProvideKeyResponse" id="633" addr="0x7f6d368768d0" />
+                                <attribute name="ismember" value="1" id="634" addr="0x7f6d368768d0" />
+                                <attribute name="sym_symtab" value="0x7f6d36871470" id="635" addr="0x7f6d36871470" />
+                                <attribute name="kind" value="function" id="636" addr="0x7f6d368768d0" />
+                                <attribute name="sym_name" value="ProvideKeyResponse" id="637" addr="0x7f6d368768d0" />
+                                <attribute name="decl" value="f(r.q(const).XbmcCommons::Buffer)." id="638" addr="0x7f6d368768d0" />
+                                <attribute name="access" value="public" id="639" addr="0x7f6d368768d0" />
+                                <parmlist id="640" addr="0x7f6d36872b50" >
                                     <parm id="641">
-                                        <attributelist id="642" addr="0x7f3904260b50" >
-                                            <attribute name="name" value="response" id="643" addr="0x7f39042648d0" />
-                                            <attribute name="type" value="r.q(const).XbmcCommons::Buffer" id="644" addr="0x7f39042648d0" />
+                                        <attributelist id="642" addr="0x7f6d36872b50" >
+                                            <attribute name="name" value="response" id="643" addr="0x7f6d368768d0" />
+                                            <attribute name="type" value="r.q(const).XbmcCommons::Buffer" id="644" addr="0x7f6d368768d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="XBMCAddon::String" id="645" addr="0x7f39042648d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="646" addr="0x7f39042648d0" />
+                                <attribute name="type" value="XBMCAddon::String" id="645" addr="0x7f6d368768d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="646" addr="0x7f6d368768d0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="647" addr="0x7f3904260dd0" >
-                            <attributelist id="648" addr="0x7f3904260dd0" >
-                                <attribute name="ismember" value="1" id="649" addr="0x7f39042648d0" />
-                                <attribute name="sym_name" value="RemoveKeys" id="650" addr="0x7f39042648d0" />
-                                <attribute name="name" value="RemoveKeys" id="651" addr="0x7f39042648d0" />
-                                <attribute name="decl" value="f()." id="652" addr="0x7f39042648d0" />
-                                <attribute name="access" value="public" id="653" addr="0x7f39042648d0" />
-                                <attribute name="kind" value="function" id="654" addr="0x7f39042648d0" />
-                                <attribute name="type" value="void" id="655" addr="0x7f39042648d0" />
-                                <attribute name="sym_symtab" value="0x7f390425f470" id="656" addr="0x7f390425f470" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="657" addr="0x7f39042648d0" />
+                        <cdecl id="647" addr="0x7f6d36872dd0" >
+                            <attributelist id="648" addr="0x7f6d36872dd0" >
+                                <attribute name="ismember" value="1" id="649" addr="0x7f6d368768d0" />
+                                <attribute name="sym_name" value="RemoveKeys" id="650" addr="0x7f6d368768d0" />
+                                <attribute name="name" value="RemoveKeys" id="651" addr="0x7f6d368768d0" />
+                                <attribute name="decl" value="f()." id="652" addr="0x7f6d368768d0" />
+                                <attribute name="access" value="public" id="653" addr="0x7f6d368768d0" />
+                                <attribute name="kind" value="function" id="654" addr="0x7f6d368768d0" />
+                                <attribute name="type" value="void" id="655" addr="0x7f6d368768d0" />
+                                <attribute name="sym_symtab" value="0x7f6d36871470" id="656" addr="0x7f6d36871470" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="657" addr="0x7f6d368768d0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="658" addr="0x7f39042610b0" >
-                            <attributelist id="659" addr="0x7f39042610b0" >
-                                <attribute name="name" value="RestoreKeys" id="660" addr="0x7f39042648d0" />
-                                <attribute name="ismember" value="1" id="661" addr="0x7f39042648d0" />
-                                <attribute name="sym_symtab" value="0x7f390425f470" id="662" addr="0x7f390425f470" />
-                                <attribute name="kind" value="function" id="663" addr="0x7f39042648d0" />
-                                <attribute name="sym_name" value="RestoreKeys" id="664" addr="0x7f39042648d0" />
-                                <attribute name="decl" value="f(XBMCAddon::String)." id="665" addr="0x7f39042648d0" />
-                                <attribute name="access" value="public" id="666" addr="0x7f39042648d0" />
-                                <parmlist id="667" addr="0x7f3904260ff0" >
+                        <cdecl id="658" addr="0x7f6d368730b0" >
+                            <attributelist id="659" addr="0x7f6d368730b0" >
+                                <attribute name="name" value="RestoreKeys" id="660" addr="0x7f6d368768d0" />
+                                <attribute name="ismember" value="1" id="661" addr="0x7f6d368768d0" />
+                                <attribute name="sym_symtab" value="0x7f6d36871470" id="662" addr="0x7f6d36871470" />
+                                <attribute name="kind" value="function" id="663" addr="0x7f6d368768d0" />
+                                <attribute name="sym_name" value="RestoreKeys" id="664" addr="0x7f6d368768d0" />
+                                <attribute name="decl" value="f(XBMCAddon::String)." id="665" addr="0x7f6d368768d0" />
+                                <attribute name="access" value="public" id="666" addr="0x7f6d368768d0" />
+                                <parmlist id="667" addr="0x7f6d36872ff0" >
                                     <parm id="668">
-                                        <attributelist id="669" addr="0x7f3904260ff0" >
-                                            <attribute name="name" value="keySetId" id="670" addr="0x7f39042648d0" />
-                                            <attribute name="type" value="XBMCAddon::String" id="671" addr="0x7f39042648d0" />
+                                        <attributelist id="669" addr="0x7f6d36872ff0" >
+                                            <attribute name="name" value="keySetId" id="670" addr="0x7f6d368768d0" />
+                                            <attribute name="type" value="XBMCAddon::String" id="671" addr="0x7f6d368768d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="672" addr="0x7f39042648d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="673" addr="0x7f39042648d0" />
+                                <attribute name="type" value="void" id="672" addr="0x7f6d368768d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="673" addr="0x7f6d368768d0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="674" addr="0x7f39042614f0" >
-                            <attributelist id="675" addr="0x7f39042614f0" >
-                                <attribute name="name" value="SetPropertyString" id="676" addr="0x7f39042648d0" />
-                                <attribute name="ismember" value="1" id="677" addr="0x7f39042648d0" />
-                                <attribute name="sym_symtab" value="0x7f390425f470" id="678" addr="0x7f390425f470" />
-                                <attribute name="kind" value="function" id="679" addr="0x7f39042648d0" />
-                                <attribute name="sym_name" value="SetPropertyString" id="680" addr="0x7f39042648d0" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="681" addr="0x7f39042648d0" />
-                                <attribute name="access" value="public" id="682" addr="0x7f39042648d0" />
-                                <parmlist id="683" addr="0x7f39042612f0" >
+                        <cdecl id="674" addr="0x7f6d368734f0" >
+                            <attributelist id="675" addr="0x7f6d368734f0" >
+                                <attribute name="name" value="SetPropertyString" id="676" addr="0x7f6d368768d0" />
+                                <attribute name="ismember" value="1" id="677" addr="0x7f6d368768d0" />
+                                <attribute name="sym_symtab" value="0x7f6d36871470" id="678" addr="0x7f6d36871470" />
+                                <attribute name="kind" value="function" id="679" addr="0x7f6d368768d0" />
+                                <attribute name="sym_name" value="SetPropertyString" id="680" addr="0x7f6d368768d0" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="681" addr="0x7f6d368768d0" />
+                                <attribute name="access" value="public" id="682" addr="0x7f6d368768d0" />
+                                <parmlist id="683" addr="0x7f6d368732f0" >
                                     <parm id="684">
-                                        <attributelist id="685" addr="0x7f39042612f0" >
-                                            <attribute name="name" value="name" id="686" addr="0x7f39042648d0" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="687" addr="0x7f39042648d0" />
+                                        <attributelist id="685" addr="0x7f6d368732f0" >
+                                            <attribute name="name" value="name" id="686" addr="0x7f6d368768d0" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="687" addr="0x7f6d368768d0" />
                                         </attributelist >
                                     </parm >
                                     <parm id="688">
-                                        <attributelist id="689" addr="0x7f3904261430" >
-                                            <attribute name="name" value="value" id="690" addr="0x7f39042648d0" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="691" addr="0x7f39042648d0" />
+                                        <attributelist id="689" addr="0x7f6d36873430" >
+                                            <attribute name="name" value="value" id="690" addr="0x7f6d368768d0" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="691" addr="0x7f6d368768d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="692" addr="0x7f39042648d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="693" addr="0x7f39042648d0" />
+                                <attribute name="type" value="void" id="692" addr="0x7f6d368768d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="693" addr="0x7f6d368768d0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="694" addr="0x7f3904261b10" >
-                            <attributelist id="695" addr="0x7f3904261b10" >
-                                <attribute name="name" value="Decrypt" id="696" addr="0x7f39042648d0" />
-                                <attribute name="ismember" value="1" id="697" addr="0x7f39042648d0" />
-                                <attribute name="sym_symtab" value="0x7f390425f470" id="698" addr="0x7f390425f470" />
-                                <attribute name="kind" value="function" id="699" addr="0x7f39042648d0" />
-                                <attribute name="sym_name" value="Decrypt" id="700" addr="0x7f39042648d0" />
-                                <attribute name="decl" value="f(r.q(const).XbmcCommons::Buffer,r.q(const).XbmcCommons::Buffer,r.q(const).XbmcCommons::Buffer)." id="701" addr="0x7f39042648d0" />
-                                <attribute name="access" value="public" id="702" addr="0x7f39042648d0" />
-                                <parmlist id="703" addr="0x7f3904261790" >
+                        <cdecl id="694" addr="0x7f6d36873b10" >
+                            <attributelist id="695" addr="0x7f6d36873b10" >
+                                <attribute name="name" value="Decrypt" id="696" addr="0x7f6d368768d0" />
+                                <attribute name="ismember" value="1" id="697" addr="0x7f6d368768d0" />
+                                <attribute name="sym_symtab" value="0x7f6d36871470" id="698" addr="0x7f6d36871470" />
+                                <attribute name="kind" value="function" id="699" addr="0x7f6d368768d0" />
+                                <attribute name="sym_name" value="Decrypt" id="700" addr="0x7f6d368768d0" />
+                                <attribute name="decl" value="f(r.q(const).XbmcCommons::Buffer,r.q(const).XbmcCommons::Buffer,r.q(const).XbmcCommons::Buffer)." id="701" addr="0x7f6d368768d0" />
+                                <attribute name="access" value="public" id="702" addr="0x7f6d368768d0" />
+                                <parmlist id="703" addr="0x7f6d36873790" >
                                     <parm id="704">
-                                        <attributelist id="705" addr="0x7f3904261790" >
-                                            <attribute name="name" value="cipherKeyId" id="706" addr="0x7f39042648d0" />
-                                            <attribute name="type" value="r.q(const).XbmcCommons::Buffer" id="707" addr="0x7f39042648d0" />
+                                        <attributelist id="705" addr="0x7f6d36873790" >
+                                            <attribute name="name" value="cipherKeyId" id="706" addr="0x7f6d368768d0" />
+                                            <attribute name="type" value="r.q(const).XbmcCommons::Buffer" id="707" addr="0x7f6d368768d0" />
                                         </attributelist >
                                     </parm >
                                     <parm id="708">
-                                        <attributelist id="709" addr="0x7f39042618f0" >
-                                            <attribute name="name" value="input" id="710" addr="0x7f39042648d0" />
-                                            <attribute name="type" value="r.q(const).XbmcCommons::Buffer" id="711" addr="0x7f39042648d0" />
+                                        <attributelist id="709" addr="0x7f6d368738f0" >
+                                            <attribute name="name" value="input" id="710" addr="0x7f6d368768d0" />
+                                            <attribute name="type" value="r.q(const).XbmcCommons::Buffer" id="711" addr="0x7f6d368768d0" />
                                         </attributelist >
                                     </parm >
                                     <parm id="712">
-                                        <attributelist id="713" addr="0x7f3904261a50" >
-                                            <attribute name="name" value="iv" id="714" addr="0x7f39042648d0" />
-                                            <attribute name="type" value="r.q(const).XbmcCommons::Buffer" id="715" addr="0x7f39042648d0" />
+                                        <attributelist id="713" addr="0x7f6d36873a50" >
+                                            <attribute name="name" value="iv" id="714" addr="0x7f6d368768d0" />
+                                            <attribute name="type" value="r.q(const).XbmcCommons::Buffer" id="715" addr="0x7f6d368768d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="XbmcCommons::Buffer" id="716" addr="0x7f39042648d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="717" addr="0x7f39042648d0" />
+                                <attribute name="type" value="XbmcCommons::Buffer" id="716" addr="0x7f6d368768d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="717" addr="0x7f6d368768d0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="718" addr="0x7f3904262130" >
-                            <attributelist id="719" addr="0x7f3904262130" >
-                                <attribute name="name" value="Encrypt" id="720" addr="0x7f39042648d0" />
-                                <attribute name="ismember" value="1" id="721" addr="0x7f39042648d0" />
-                                <attribute name="sym_symtab" value="0x7f390425f470" id="722" addr="0x7f390425f470" />
-                                <attribute name="kind" value="function" id="723" addr="0x7f39042648d0" />
-                                <attribute name="sym_name" value="Encrypt" id="724" addr="0x7f39042648d0" />
-                                <attribute name="decl" value="f(r.q(const).XbmcCommons::Buffer,r.q(const).XbmcCommons::Buffer,r.q(const).XbmcCommons::Buffer)." id="725" addr="0x7f39042648d0" />
-                                <attribute name="access" value="public" id="726" addr="0x7f39042648d0" />
-                                <parmlist id="727" addr="0x7f3904261db0" >
+                        <cdecl id="718" addr="0x7f6d36874130" >
+                            <attributelist id="719" addr="0x7f6d36874130" >
+                                <attribute name="name" value="Encrypt" id="720" addr="0x7f6d368768d0" />
+                                <attribute name="ismember" value="1" id="721" addr="0x7f6d368768d0" />
+                                <attribute name="sym_symtab" value="0x7f6d36871470" id="722" addr="0x7f6d36871470" />
+                                <attribute name="kind" value="function" id="723" addr="0x7f6d368768d0" />
+                                <attribute name="sym_name" value="Encrypt" id="724" addr="0x7f6d368768d0" />
+                                <attribute name="decl" value="f(r.q(const).XbmcCommons::Buffer,r.q(const).XbmcCommons::Buffer,r.q(const).XbmcCommons::Buffer)." id="725" addr="0x7f6d368768d0" />
+                                <attribute name="access" value="public" id="726" addr="0x7f6d368768d0" />
+                                <parmlist id="727" addr="0x7f6d36873db0" >
                                     <parm id="728">
-                                        <attributelist id="729" addr="0x7f3904261db0" >
-                                            <attribute name="name" value="cipherKeyId" id="730" addr="0x7f39042648d0" />
-                                            <attribute name="type" value="r.q(const).XbmcCommons::Buffer" id="731" addr="0x7f39042648d0" />
+                                        <attributelist id="729" addr="0x7f6d36873db0" >
+                                            <attribute name="name" value="cipherKeyId" id="730" addr="0x7f6d368768d0" />
+                                            <attribute name="type" value="r.q(const).XbmcCommons::Buffer" id="731" addr="0x7f6d368768d0" />
                                         </attributelist >
                                     </parm >
                                     <parm id="732">
-                                        <attributelist id="733" addr="0x7f3904261f10" >
-                                            <attribute name="name" value="input" id="734" addr="0x7f39042648d0" />
-                                            <attribute name="type" value="r.q(const).XbmcCommons::Buffer" id="735" addr="0x7f39042648d0" />
+                                        <attributelist id="733" addr="0x7f6d36873f10" >
+                                            <attribute name="name" value="input" id="734" addr="0x7f6d368768d0" />
+                                            <attribute name="type" value="r.q(const).XbmcCommons::Buffer" id="735" addr="0x7f6d368768d0" />
                                         </attributelist >
                                     </parm >
                                     <parm id="736">
-                                        <attributelist id="737" addr="0x7f3904262070" >
-                                            <attribute name="name" value="iv" id="738" addr="0x7f39042648d0" />
-                                            <attribute name="type" value="r.q(const).XbmcCommons::Buffer" id="739" addr="0x7f39042648d0" />
+                                        <attributelist id="737" addr="0x7f6d36874070" >
+                                            <attribute name="name" value="iv" id="738" addr="0x7f6d368768d0" />
+                                            <attribute name="type" value="r.q(const).XbmcCommons::Buffer" id="739" addr="0x7f6d368768d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="XbmcCommons::Buffer" id="740" addr="0x7f39042648d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="741" addr="0x7f39042648d0" />
+                                <attribute name="type" value="XbmcCommons::Buffer" id="740" addr="0x7f6d368768d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="741" addr="0x7f6d368768d0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="742" addr="0x7f39042625f0" >
-                            <attributelist id="743" addr="0x7f39042625f0" >
-                                <attribute name="name" value="Sign" id="744" addr="0x7f39042648d0" />
-                                <attribute name="ismember" value="1" id="745" addr="0x7f39042648d0" />
-                                <attribute name="sym_symtab" value="0x7f390425f470" id="746" addr="0x7f390425f470" />
-                                <attribute name="kind" value="function" id="747" addr="0x7f39042648d0" />
-                                <attribute name="sym_name" value="Sign" id="748" addr="0x7f39042648d0" />
-                                <attribute name="decl" value="f(r.q(const).XbmcCommons::Buffer,r.q(const).XbmcCommons::Buffer)." id="749" addr="0x7f39042648d0" />
-                                <attribute name="access" value="public" id="750" addr="0x7f39042648d0" />
-                                <parmlist id="751" addr="0x7f39042623d0" >
+                        <cdecl id="742" addr="0x7f6d368745f0" >
+                            <attributelist id="743" addr="0x7f6d368745f0" >
+                                <attribute name="name" value="Sign" id="744" addr="0x7f6d368768d0" />
+                                <attribute name="ismember" value="1" id="745" addr="0x7f6d368768d0" />
+                                <attribute name="sym_symtab" value="0x7f6d36871470" id="746" addr="0x7f6d36871470" />
+                                <attribute name="kind" value="function" id="747" addr="0x7f6d368768d0" />
+                                <attribute name="sym_name" value="Sign" id="748" addr="0x7f6d368768d0" />
+                                <attribute name="decl" value="f(r.q(const).XbmcCommons::Buffer,r.q(const).XbmcCommons::Buffer)." id="749" addr="0x7f6d368768d0" />
+                                <attribute name="access" value="public" id="750" addr="0x7f6d368768d0" />
+                                <parmlist id="751" addr="0x7f6d368743d0" >
                                     <parm id="752">
-                                        <attributelist id="753" addr="0x7f39042623d0" >
-                                            <attribute name="name" value="macKeyId" id="754" addr="0x7f39042648d0" />
-                                            <attribute name="type" value="r.q(const).XbmcCommons::Buffer" id="755" addr="0x7f39042648d0" />
+                                        <attributelist id="753" addr="0x7f6d368743d0" >
+                                            <attribute name="name" value="macKeyId" id="754" addr="0x7f6d368768d0" />
+                                            <attribute name="type" value="r.q(const).XbmcCommons::Buffer" id="755" addr="0x7f6d368768d0" />
                                         </attributelist >
                                     </parm >
                                     <parm id="756">
-                                        <attributelist id="757" addr="0x7f3904262530" >
-                                            <attribute name="name" value="message" id="758" addr="0x7f39042648d0" />
-                                            <attribute name="type" value="r.q(const).XbmcCommons::Buffer" id="759" addr="0x7f39042648d0" />
+                                        <attributelist id="757" addr="0x7f6d36874530" >
+                                            <attribute name="name" value="message" id="758" addr="0x7f6d368768d0" />
+                                            <attribute name="type" value="r.q(const).XbmcCommons::Buffer" id="759" addr="0x7f6d368768d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="XbmcCommons::Buffer" id="760" addr="0x7f39042648d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="761" addr="0x7f39042648d0" />
+                                <attribute name="type" value="XbmcCommons::Buffer" id="760" addr="0x7f6d368768d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="761" addr="0x7f6d368768d0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="762" addr="0x7f3904262bd0" >
-                            <attributelist id="763" addr="0x7f3904262bd0" >
-                                <attribute name="ismember" value="1" id="764" addr="0x7f39042648d0" />
-                                <attribute name="sym_name" value="Verify" id="765" addr="0x7f39042648d0" />
-                                <attribute name="name" value="Verify" id="766" addr="0x7f39042648d0" />
-                                <attribute name="decl" value="f(r.q(const).XbmcCommons::Buffer,r.q(const).XbmcCommons::Buffer,r.q(const).XbmcCommons::Buffer)." id="767" addr="0x7f39042648d0" />
-                                <parmlist id="768" addr="0x7f3904262850" >
+                        <cdecl id="762" addr="0x7f6d36874bd0" >
+                            <attributelist id="763" addr="0x7f6d36874bd0" >
+                                <attribute name="ismember" value="1" id="764" addr="0x7f6d368768d0" />
+                                <attribute name="sym_name" value="Verify" id="765" addr="0x7f6d368768d0" />
+                                <attribute name="name" value="Verify" id="766" addr="0x7f6d368768d0" />
+                                <attribute name="decl" value="f(r.q(const).XbmcCommons::Buffer,r.q(const).XbmcCommons::Buffer,r.q(const).XbmcCommons::Buffer)." id="767" addr="0x7f6d368768d0" />
+                                <parmlist id="768" addr="0x7f6d36874850" >
                                     <parm id="769">
-                                        <attributelist id="770" addr="0x7f3904262850" >
-                                            <attribute name="name" value="macKeyId" id="771" addr="0x7f39042648d0" />
-                                            <attribute name="type" value="r.q(const).XbmcCommons::Buffer" id="772" addr="0x7f39042648d0" />
+                                        <attributelist id="770" addr="0x7f6d36874850" >
+                                            <attribute name="name" value="macKeyId" id="771" addr="0x7f6d368768d0" />
+                                            <attribute name="type" value="r.q(const).XbmcCommons::Buffer" id="772" addr="0x7f6d368768d0" />
                                         </attributelist >
                                     </parm >
                                     <parm id="773">
-                                        <attributelist id="774" addr="0x7f39042629b0" >
-                                            <attribute name="name" value="message" id="775" addr="0x7f39042648d0" />
-                                            <attribute name="type" value="r.q(const).XbmcCommons::Buffer" id="776" addr="0x7f39042648d0" />
+                                        <attributelist id="774" addr="0x7f6d368749b0" >
+                                            <attribute name="name" value="message" id="775" addr="0x7f6d368768d0" />
+                                            <attribute name="type" value="r.q(const).XbmcCommons::Buffer" id="776" addr="0x7f6d368768d0" />
                                         </attributelist >
                                     </parm >
                                     <parm id="777">
-                                        <attributelist id="778" addr="0x7f3904262b10" >
-                                            <attribute name="name" value="signature" id="779" addr="0x7f39042648d0" />
-                                            <attribute name="type" value="r.q(const).XbmcCommons::Buffer" id="780" addr="0x7f39042648d0" />
+                                        <attributelist id="778" addr="0x7f6d36874b10" >
+                                            <attribute name="name" value="signature" id="779" addr="0x7f6d368768d0" />
+                                            <attribute name="type" value="r.q(const).XbmcCommons::Buffer" id="780" addr="0x7f6d368768d0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="access" value="public" id="781" addr="0x7f39042648d0" />
-                                <attribute name="kind" value="function" id="782" addr="0x7f39042648d0" />
-                                <attribute name="type" value="bool" id="783" addr="0x7f39042648d0" />
-                                <attribute name="sym_symtab" value="0x7f390425f470" id="784" addr="0x7f390425f470" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="785" addr="0x7f39042648d0" />
+                                <attribute name="access" value="public" id="781" addr="0x7f6d368768d0" />
+                                <attribute name="kind" value="function" id="782" addr="0x7f6d368768d0" />
+                                <attribute name="type" value="bool" id="783" addr="0x7f6d368768d0" />
+                                <attribute name="sym_symtab" value="0x7f6d36871470" id="784" addr="0x7f6d36871470" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="785" addr="0x7f6d368768d0" />
                             </attributelist >
                          
                         </cdecl >
diff --git a/srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmcgui.i.cpp b/srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmcgui.i.cpp
similarity index 99%
rename from srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmcgui.i.cpp
rename to srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmcgui.i.cpp
index e31ce7ce8c1..fbee7dfdb3b 100644
--- a/srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmcgui.i.cpp
+++ b/srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmcgui.i.cpp
@@ -13783,7 +13783,7 @@ namespace PythonBindings
 
    // constants
    PyModule_AddStringConstant(module, "__author__", "Team Kodi <http://kodi.tv>");
-   PyModule_AddStringConstant(module, "__date__", "Wed Jun 19 18:36:56 GMT 2019");
+   PyModule_AddStringConstant(module, "__date__", "Sun Sep 01 10:46:59 GMT 2019");
    PyModule_AddStringConstant(module, "__version__", "2.26.0");
    PyModule_AddStringConstant(module, "__credits__", "Team Kodi");
    PyModule_AddStringConstant(module, "__platform__", "ALL");
diff --git a/srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmcgui.i.xml b/srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmcgui.i.xml
similarity index 67%
rename from srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmcgui.i.xml
rename to srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmcgui.i.xml
index 7cb59a9924b..1bcca339147 100644
--- a/srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmcgui.i.xml
+++ b/srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmcgui.i.xml
@@ -1,141 +1,141 @@
 <?xml version="1.0" ?> 
-<top id="1" addr="0x7f99f1e1eb30" >
-    <attributelist id="2" addr="0x7f99f1e1eb30" >
-        <attribute name="outfile" value="AddonModuleXbmcgui.i.xml" id="3" addr="0x7f99f1de6c90" />
-        <attribute name="name" value="xbmcgui" id="4" addr="0x7f99f1de6c90" />
-        <attribute name="module" value="xbmcgui" id="5" addr="0x7f99f1e402f0" />
-        <attribute name="inputfile" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmcgui.i" id="6" addr="0x7f99f1de6c90" />
-        <attribute name="classes" value="0x7f99f1e3d810" id="7" addr="0x7f99f1e3d810" />
-        <attribute name="infile" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmcgui.i" id="8" addr="0x7f99f1de6c90" />
-        <attribute name="outfile_h" value="AddonModuleXbmcgui.i.h" id="9" addr="0x7f99f1de6c90" />
+<top id="1" addr="0x7fca4696cb30" >
+    <attributelist id="2" addr="0x7fca4696cb30" >
+        <attribute name="outfile" value="AddonModuleXbmcgui.i.xml" id="3" addr="0x7fca46934c90" />
+        <attribute name="name" value="xbmcgui" id="4" addr="0x7fca46934c90" />
+        <attribute name="module" value="xbmcgui" id="5" addr="0x7fca4698e2f0" />
+        <attribute name="inputfile" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmcgui.i" id="6" addr="0x7fca46934c90" />
+        <attribute name="classes" value="0x7fca4698b810" id="7" addr="0x7fca4698b810" />
+        <attribute name="infile" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmcgui.i" id="8" addr="0x7fca46934c90" />
+        <attribute name="outfile_h" value="AddonModuleXbmcgui.i.h" id="9" addr="0x7fca46934c90" />
     </attributelist >
 
-    <include id="10" addr="0x7f99f1e2eed0" >
-        <attributelist id="11" addr="0x7f99f1e2eed0" >
-            <attribute name="name" value="/usr/share/swig/3.0.12/swig.swg" id="12" addr="0x7f99f1de6c90" />
+    <include id="10" addr="0x7fca4697ced0" >
+        <attributelist id="11" addr="0x7fca4697ced0" >
+            <attribute name="name" value="/usr/share/swig/3.0.12/swig.swg" id="12" addr="0x7fca46934c90" />
         </attributelist >
 
-        <include id="13" addr="0x7f99f1e2ef30" >
-            <attributelist id="14" addr="0x7f99f1e2ef30" >
-                <attribute name="name" value="/usr/share/swig/3.0.12/swigwarnings.swg" id="15" addr="0x7f99f1de6c90" />
+        <include id="13" addr="0x7fca4697cf30" >
+            <attributelist id="14" addr="0x7fca4697cf30" >
+                <attribute name="name" value="/usr/share/swig/3.0.12/swigwarnings.swg" id="15" addr="0x7fca46934c90" />
             </attributelist >
 
-            <include id="16" addr="0x7f99f1e2ff50" >
-                <attributelist id="17" addr="0x7f99f1e2ff50" >
-                    <attribute name="name" value="/usr/share/swig/3.0.12/swigwarn.swg" id="18" addr="0x7f99f1de6c90" />
+            <include id="16" addr="0x7fca4697df50" >
+                <attributelist id="17" addr="0x7fca4697df50" >
+                    <attribute name="name" value="/usr/share/swig/3.0.12/swigwarn.swg" id="18" addr="0x7fca46934c90" />
                 </attributelist >
              
             </include >
         </include >
-        <namespace id="19" addr="0x7f99f1e3d330" >
-            <attributelist id="20" addr="0x7f99f1e3d330" >
-                <attribute name="sym_name" value="std" id="21" addr="0x7f99f1de6c90" />
-                <attribute name="name" value="std" id="22" addr="0x7f99f1de6c90" />
-                <typescope id="23" addr="0x7f99f1dd1cf0" >
-                    <attributelist id="24" addr="0x7f99f1dd1cf0" >
-                        <attribute name="name" value="std" id="25" addr="0x7f99f1de6c90" />
-                        <typetab id="26" addr="0x7f99f1dd1d10" >
-                            <attributelist id="27" addr="0x7f99f1dd1d10" >
-                                <attribute name="initializer_list" value="initializer_list" id="28" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                            <typetabsitem id="29" addr="0x7f99f1dd1e30" >
-                                <attributelist id="30" addr="0x7f99f1dd1e30" >
+        <namespace id="19" addr="0x7fca4698b330" >
+            <attributelist id="20" addr="0x7fca4698b330" >
+                <attribute name="sym_name" value="std" id="21" addr="0x7fca46934c90" />
+                <attribute name="name" value="std" id="22" addr="0x7fca46934c90" />
+                <typescope id="23" addr="0x7fca4691fcf0" >
+                    <attributelist id="24" addr="0x7fca4691fcf0" >
+                        <attribute name="name" value="std" id="25" addr="0x7fca46934c90" />
+                        <typetab id="26" addr="0x7fca4691fd10" >
+                            <attributelist id="27" addr="0x7fca4691fd10" >
+                                <attribute name="initializer_list" value="initializer_list" id="28" addr="0x7fca46934c90" />
+                            </attributelist >
+                            <typetabsitem id="29" addr="0x7fca4691fe30" >
+                                <attributelist id="30" addr="0x7fca4691fe30" >
                                 </attributelist >
                             </typetabsitem >
                         </typetab >
-                        <attribute name="parent" value="0x7f99f1e1da30" id="31" addr="0x7f99f1e1da30" />
-                        <attribute name="qname" value="std" id="32" addr="0x7f99f1de6c90" />
-                        <attribute name="symtab" value="0x7f99f1e3d290" id="33" addr="0x7f99f1e3d290" />
+                        <attribute name="parent" value="0x7fca4696ba30" id="31" addr="0x7fca4696ba30" />
+                        <attribute name="qname" value="std" id="32" addr="0x7fca46934c90" />
+                        <attribute name="symtab" value="0x7fca4698b290" id="33" addr="0x7fca4698b290" />
                     </attributelist >
-                    <typescopesitem id="34" addr="0x7f99f1e3d1f0" >
-                        <attributelist id="35" addr="0x7f99f1e3d1f0" >
+                    <typescopesitem id="34" addr="0x7fca4698b1f0" >
+                        <attributelist id="35" addr="0x7fca4698b1f0" >
                         </attributelist >
                     </typescopesitem >
-                    <typescopesitem id="36" addr="0x7f99f1dd1d10" >
-                        <attributelist id="37" addr="0x7f99f1dd1d10" >
-                            <attribute name="initializer_list" value="initializer_list" id="38" addr="0x7f99f1de6c90" />
+                    <typescopesitem id="36" addr="0x7fca4691fd10" >
+                        <attributelist id="37" addr="0x7fca4691fd10" >
+                            <attribute name="initializer_list" value="initializer_list" id="38" addr="0x7fca46934c90" />
                         </attributelist >
                     </typescopesitem >
-                    <typescopesitem id="39" addr="0x7f99f1e1da30" >
-                        <attributelist id="40" addr="0x7f99f1e1da30" >
-                            <attribute name="name" value="" id="41" addr="0x7f99f1de6c90" />
-                            <typetab id="42" addr="0x7f99f1e1da90" >
-                                <attributelist id="43" addr="0x7f99f1e1da90" >
+                    <typescopesitem id="39" addr="0x7fca4696ba30" >
+                        <attributelist id="40" addr="0x7fca4696ba30" >
+                            <attribute name="name" value="" id="41" addr="0x7fca46934c90" />
+                            <typetab id="42" addr="0x7fca4696ba90" >
+                                <attributelist id="43" addr="0x7fca4696ba90" >
                                 </attributelist >
                             </typetab >
                         </attributelist >
                     </typescopesitem >
-                    <typescopesitem id="44" addr="0x7f99f1dd1d30" >
-                        <attributelist id="45" addr="0x7f99f1dd1d30" >
+                    <typescopesitem id="44" addr="0x7fca4691fd30" >
+                        <attributelist id="45" addr="0x7fca4691fd30" >
                         </attributelist >
                     </typescopesitem >
-                    <typescopesitem id="46" addr="0x7f99f1e3d290" >
-                        <attributelist id="47" addr="0x7f99f1e3d290" >
-                            <attribute name="name" value="std" id="48" addr="0x7f99f1de6c90" />
-                            <attribute name="csymtab" value="0x7f99f1e3d2d0" id="49" addr="0x7f99f1e3d2d0" />
-                            <attribute name="symtab" value="0x7f99f1e3d270" id="50" addr="0x7f99f1e3d270" />
+                    <typescopesitem id="46" addr="0x7fca4698b290" >
+                        <attributelist id="47" addr="0x7fca4698b290" >
+                            <attribute name="name" value="std" id="48" addr="0x7fca46934c90" />
+                            <attribute name="csymtab" value="0x7fca4698b2d0" id="49" addr="0x7fca4698b2d0" />
+                            <attribute name="symtab" value="0x7fca4698b270" id="50" addr="0x7fca4698b270" />
                         </attributelist >
                     </typescopesitem >
                 </typescope >
-                <attribute name="symtab" value="0x7f99f1e3d290" id="51" addr="0x7f99f1e3d290" />
-                <attribute name="sym_symtab" value="0x7f99f1e1d950" id="52" addr="0x7f99f1e1d950" />
-                <attribute name="sym_overname" value="__SWIG_0" id="53" addr="0x7f99f1de6c90" />
+                <attribute name="symtab" value="0x7fca4698b290" id="51" addr="0x7fca4698b290" />
+                <attribute name="sym_symtab" value="0x7fca4696b950" id="52" addr="0x7fca4696b950" />
+                <attribute name="sym_overname" value="__SWIG_0" id="53" addr="0x7fca46934c90" />
             </attributelist >
 
-            <template id="54" addr="0x7f99f1e3d4b0" >
-                <attributelist id="55" addr="0x7f99f1e3d4b0" >
-                    <attribute name="templatetype" value="class" id="56" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_typename" value="1" id="57" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="initializer_list" id="58" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e3d290" id="59" addr="0x7f99f1e3d290" />
-                    <attribute name="symtab" value="0x7f99f1e3d6d0" id="60" addr="0x7f99f1e3d6d0" />
-                    <attribute name="allows_typedef" value="1" id="61" addr="0x7f99f1de6c90" />
-                    <attribute name="kind" value="class" id="62" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_name" value="initializer_list" id="63" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="64" addr="0x7f99f1de6c90" />
-                    <templateparms id="65" addr="0x7f99f1e3d3d0" >
+            <template id="54" addr="0x7fca4698b4b0" >
+                <attributelist id="55" addr="0x7fca4698b4b0" >
+                    <attribute name="templatetype" value="class" id="56" addr="0x7fca46934c90" />
+                    <attribute name="sym_typename" value="1" id="57" addr="0x7fca46934c90" />
+                    <attribute name="name" value="initializer_list" id="58" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4698b290" id="59" addr="0x7fca4698b290" />
+                    <attribute name="symtab" value="0x7fca4698b6d0" id="60" addr="0x7fca4698b6d0" />
+                    <attribute name="allows_typedef" value="1" id="61" addr="0x7fca46934c90" />
+                    <attribute name="kind" value="class" id="62" addr="0x7fca46934c90" />
+                    <attribute name="sym_name" value="initializer_list" id="63" addr="0x7fca46934c90" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="64" addr="0x7fca46934c90" />
+                    <templateparms id="65" addr="0x7fca4698b3d0" >
                         <parm id="66">
-                            <attributelist id="67" addr="0x7f99f1e3d3d0" >
-                                <attribute name="name" value="T" id="68" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="typename T" id="69" addr="0x7f99f1de6c90" />
+                            <attributelist id="67" addr="0x7fca4698b3d0" >
+                                <attribute name="name" value="T" id="68" addr="0x7fca46934c90" />
+                                <attribute name="type" value="typename T" id="69" addr="0x7fca46934c90" />
                             </attributelist >
                         </parm >
                     </templateparms >
                 </attributelist >
 
-                <access id="70" addr="0x7f99f1e3d890" >
-                    <attributelist id="71" addr="0x7f99f1e3d890" >
-                        <attribute name="kind" value="public" id="72" addr="0x7f99f1de6c90" />
+                <access id="70" addr="0x7fca4698b890" >
+                    <attributelist id="71" addr="0x7fca4698b890" >
+                        <attribute name="kind" value="public" id="72" addr="0x7fca46934c90" />
                     </attributelist >
                  
                 </access >
             </template >
-            <typemap id="73" addr="0x7f99f1e3def0" >
-                <attributelist id="74" addr="0x7f99f1e3def0" >
-                    <kwargs id="75" addr="0x7f99f1e3dbf0" >
-                        <attributelist id="76" addr="0x7f99f1e3dbf0" >
-                            <attribute name="name" value="warning" id="77" addr="0x7f99f1de6c90" />
-                            <attribute name="value" value="476:Initialization using std::initializer_list." id="78" addr="0x7f99f1de6c90" />
+            <typemap id="73" addr="0x7fca4698bef0" >
+                <attributelist id="74" addr="0x7fca4698bef0" >
+                    <kwargs id="75" addr="0x7fca4698bbf0" >
+                        <attributelist id="76" addr="0x7fca4698bbf0" >
+                            <attribute name="name" value="warning" id="77" addr="0x7fca46934c90" />
+                            <attribute name="value" value="476:Initialization using std::initializer_list." id="78" addr="0x7fca46934c90" />
                         </attributelist >
-                        <kwargssitem id="79" addr="0x7f99f1e3dd70" >
-                            <attributelist id="80" addr="0x7f99f1e3dd70" >
+                        <kwargssitem id="79" addr="0x7fca4698bd70" >
+                            <attributelist id="80" addr="0x7fca4698bd70" >
                             </attributelist >
                         </kwargssitem >
-                        <kwargssitem id="81" addr="0x7f99f1e3dbd0" >
-                            <attributelist id="82" addr="0x7f99f1e3dbd0" >
+                        <kwargssitem id="81" addr="0x7fca4698bbd0" >
+                            <attributelist id="82" addr="0x7fca4698bbd0" >
                             </attributelist >
                         </kwargssitem >
                     </kwargs >
-                    <attribute name="code" value="" id="83" addr="0x7f99f1de6c90" />
-                    <attribute name="method" value="in" id="84" addr="0x7f99f1de6c90" />
+                    <attribute name="code" value="" id="83" addr="0x7fca46934c90" />
+                    <attribute name="method" value="in" id="84" addr="0x7fca46934c90" />
                 </attributelist >
 
-                <typemapitem id="85" addr="0x7f99f1e3de10" >
-                    <attributelist id="86" addr="0x7f99f1e3de10" >
-                        <parmlist id="87" addr="0x7f99f1e3de50" >
+                <typemapitem id="85" addr="0x7fca4698be10" >
+                    <attributelist id="86" addr="0x7fca4698be10" >
+                        <parmlist id="87" addr="0x7fca4698be50" >
                             <parm id="88">
-                                <attributelist id="89" addr="0x7f99f1e3de50" >
-                                    <attribute name="type" value="std::initializer_list&lt;(T)>" id="90" addr="0x7f99f1de6c90" />
+                                <attributelist id="89" addr="0x7fca4698be50" >
+                                    <attribute name="type" value="std::initializer_list&lt;(T)>" id="90" addr="0x7fca46934c90" />
                                 </attributelist >
                             </parm >
                         </parmlist >
@@ -143,32 +143,32 @@
                  
                 </typemapitem >
             </typemap >
-            <typemap id="91" addr="0x7f99f1e3e270" >
-                <attributelist id="92" addr="0x7f99f1e3e270" >
-                    <kwargs id="93" addr="0x7f99f1e3e010" >
-                        <attributelist id="94" addr="0x7f99f1e3e010" >
-                            <attribute name="name" value="precedence" id="95" addr="0x7f99f1de6c90" />
-                            <attribute name="value" value="0" id="96" addr="0x7f99f1de6c90" />
+            <typemap id="91" addr="0x7fca4698c270" >
+                <attributelist id="92" addr="0x7fca4698c270" >
+                    <kwargs id="93" addr="0x7fca4698c010" >
+                        <attributelist id="94" addr="0x7fca4698c010" >
+                            <attribute name="name" value="precedence" id="95" addr="0x7fca46934c90" />
+                            <attribute name="value" value="0" id="96" addr="0x7fca46934c90" />
                         </attributelist >
-                        <kwargssitem id="97" addr="0x7f99f1e3e030" >
-                            <attributelist id="98" addr="0x7f99f1e3e030" >
+                        <kwargssitem id="97" addr="0x7fca4698c030" >
+                            <attributelist id="98" addr="0x7fca4698c030" >
                             </attributelist >
                         </kwargssitem >
-                        <kwargssitem id="99" addr="0x7f99f1e3e050" >
-                            <attributelist id="100" addr="0x7f99f1e3e050" >
+                        <kwargssitem id="99" addr="0x7fca4698c050" >
+                            <attributelist id="100" addr="0x7fca4698c050" >
                             </attributelist >
                         </kwargssitem >
                     </kwargs >
-                    <attribute name="code" value="" id="101" addr="0x7f99f1de6c90" />
-                    <attribute name="method" value="typecheck" id="102" addr="0x7f99f1de6c90" />
+                    <attribute name="code" value="" id="101" addr="0x7fca46934c90" />
+                    <attribute name="method" value="typecheck" id="102" addr="0x7fca46934c90" />
                 </attributelist >
 
-                <typemapitem id="103" addr="0x7f99f1e3e1b0" >
-                    <attributelist id="104" addr="0x7f99f1e3e1b0" >
-                        <parmlist id="105" addr="0x7f99f1e3e1f0" >
+                <typemapitem id="103" addr="0x7fca4698c1b0" >
+                    <attributelist id="104" addr="0x7fca4698c1b0" >
+                        <parmlist id="105" addr="0x7fca4698c1f0" >
                             <parm id="106">
-                                <attributelist id="107" addr="0x7f99f1e3e1f0" >
-                                    <attribute name="type" value="std::initializer_list&lt;(T)>" id="108" addr="0x7f99f1de6c90" />
+                                <attributelist id="107" addr="0x7fca4698c1f0" >
+                                    <attribute name="type" value="std::initializer_list&lt;(T)>" id="108" addr="0x7fca46934c90" />
                                 </attributelist >
                             </parm >
                         </parmlist >
@@ -177,18 +177,18 @@
                 </typemapitem >
             </typemap >
         </namespace >
-        <typemap id="109" addr="0x7f99f1e3e490" >
-            <attributelist id="110" addr="0x7f99f1e3e490" >
-                <attribute name="code" value="delete [] $1;" id="111" addr="0x7f99f1de6c90" />
-                <attribute name="method" value="newfree" id="112" addr="0x7f99f1de6c90" />
+        <typemap id="109" addr="0x7fca4698c490" >
+            <attributelist id="110" addr="0x7fca4698c490" >
+                <attribute name="code" value="delete [] $1;" id="111" addr="0x7fca46934c90" />
+                <attribute name="method" value="newfree" id="112" addr="0x7fca46934c90" />
             </attributelist >
 
-            <typemapitem id="113" addr="0x7f99f1e3e3b0" >
-                <attributelist id="114" addr="0x7f99f1e3e3b0" >
-                    <parmlist id="115" addr="0x7f99f1e3e3f0" >
+            <typemapitem id="113" addr="0x7fca4698c3b0" >
+                <attributelist id="114" addr="0x7fca4698c3b0" >
+                    <parmlist id="115" addr="0x7fca4698c3f0" >
                         <parm id="116">
-                            <attributelist id="117" addr="0x7f99f1e3e3f0" >
-                                <attribute name="type" value="p.char" id="118" addr="0x7f99f1de6c90" />
+                            <attributelist id="117" addr="0x7fca4698c3f0" >
+                                <attribute name="type" value="p.char" id="118" addr="0x7fca46934c90" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -196,18 +196,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="119" addr="0x7f99f1e3e670" >
-            <attributelist id="120" addr="0x7f99f1e3e670" >
-                <attribute name="code" value="{&#10;  delete [] $1;&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="121" addr="0x7f99f1de6c90" />
-                <attribute name="method" value="memberin" id="122" addr="0x7f99f1de6c90" />
+        <typemap id="119" addr="0x7fca4698c670" >
+            <attributelist id="120" addr="0x7fca4698c670" >
+                <attribute name="code" value="{&#10;  delete [] $1;&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="121" addr="0x7fca46934c90" />
+                <attribute name="method" value="memberin" id="122" addr="0x7fca46934c90" />
             </attributelist >
 
-            <typemapitem id="123" addr="0x7f99f1e3e5b0" >
-                <attributelist id="124" addr="0x7f99f1e3e5b0" >
-                    <parmlist id="125" addr="0x7f99f1e3e5f0" >
+            <typemapitem id="123" addr="0x7fca4698c5b0" >
+                <attributelist id="124" addr="0x7fca4698c5b0" >
+                    <parmlist id="125" addr="0x7fca4698c5f0" >
                         <parm id="126">
-                            <attributelist id="127" addr="0x7f99f1e3e5f0" >
-                                <attribute name="type" value="p.char" id="128" addr="0x7f99f1de6c90" />
+                            <attributelist id="127" addr="0x7fca4698c5f0" >
+                                <attribute name="type" value="p.char" id="128" addr="0x7fca46934c90" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -215,32 +215,32 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="129" addr="0x7f99f1e3e8d0" >
-            <attributelist id="130" addr="0x7f99f1e3e8d0" >
-                <kwargs id="131" addr="0x7f99f1e3e710" >
-                    <attributelist id="132" addr="0x7f99f1e3e710" >
-                        <attribute name="name" value="warning" id="133" addr="0x7f99f1de6c90" />
-                        <attribute name="value" value="451:Setting a const char * variable may leak memory." id="134" addr="0x7f99f1de6c90" />
+        <typemap id="129" addr="0x7fca4698c8d0" >
+            <attributelist id="130" addr="0x7fca4698c8d0" >
+                <kwargs id="131" addr="0x7fca4698c710" >
+                    <attributelist id="132" addr="0x7fca4698c710" >
+                        <attribute name="name" value="warning" id="133" addr="0x7fca46934c90" />
+                        <attribute name="value" value="451:Setting a const char * variable may leak memory." id="134" addr="0x7fca46934c90" />
                     </attributelist >
-                    <kwargssitem id="135" addr="0x7f99f1e3e730" >
-                        <attributelist id="136" addr="0x7f99f1e3e730" >
+                    <kwargssitem id="135" addr="0x7fca4698c730" >
+                        <attributelist id="136" addr="0x7fca4698c730" >
                         </attributelist >
                     </kwargssitem >
-                    <kwargssitem id="137" addr="0x7f99f1e3e6f0" >
-                        <attributelist id="138" addr="0x7f99f1e3e6f0" >
+                    <kwargssitem id="137" addr="0x7fca4698c6f0" >
+                        <attributelist id="138" addr="0x7fca4698c6f0" >
                         </attributelist >
                     </kwargssitem >
                 </kwargs >
-                <attribute name="code" value="{&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="139" addr="0x7f99f1de6c90" />
-                <attribute name="method" value="memberin" id="140" addr="0x7f99f1de6c90" />
+                <attribute name="code" value="{&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="139" addr="0x7fca46934c90" />
+                <attribute name="method" value="memberin" id="140" addr="0x7fca46934c90" />
             </attributelist >
 
-            <typemapitem id="141" addr="0x7f99f1e3e810" >
-                <attributelist id="142" addr="0x7f99f1e3e810" >
-                    <parmlist id="143" addr="0x7f99f1e3e850" >
+            <typemapitem id="141" addr="0x7fca4698c810" >
+                <attributelist id="142" addr="0x7fca4698c810" >
+                    <parmlist id="143" addr="0x7fca4698c850" >
                         <parm id="144">
-                            <attributelist id="145" addr="0x7f99f1e3e850" >
-                                <attribute name="type" value="p.q(const).char" id="146" addr="0x7f99f1de6c90" />
+                            <attributelist id="145" addr="0x7fca4698c850" >
+                                <attribute name="type" value="p.q(const).char" id="146" addr="0x7fca46934c90" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -248,18 +248,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="147" addr="0x7f99f1e3eab0" >
-            <attributelist id="148" addr="0x7f99f1e3eab0" >
-                <attribute name="code" value="{&#10;  delete [] $1;&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="149" addr="0x7f99f1de6c90" />
-                <attribute name="method" value="globalin" id="150" addr="0x7f99f1de6c90" />
+        <typemap id="147" addr="0x7fca4698cab0" >
+            <attributelist id="148" addr="0x7fca4698cab0" >
+                <attribute name="code" value="{&#10;  delete [] $1;&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="149" addr="0x7fca46934c90" />
+                <attribute name="method" value="globalin" id="150" addr="0x7fca46934c90" />
             </attributelist >
 
-            <typemapitem id="151" addr="0x7f99f1e3e9f0" >
-                <attributelist id="152" addr="0x7f99f1e3e9f0" >
-                    <parmlist id="153" addr="0x7f99f1e3ea30" >
+            <typemapitem id="151" addr="0x7fca4698c9f0" >
+                <attributelist id="152" addr="0x7fca4698c9f0" >
+                    <parmlist id="153" addr="0x7fca4698ca30" >
                         <parm id="154">
-                            <attributelist id="155" addr="0x7f99f1e3ea30" >
-                                <attribute name="type" value="p.char" id="156" addr="0x7f99f1de6c90" />
+                            <attributelist id="155" addr="0x7fca4698ca30" >
+                                <attribute name="type" value="p.char" id="156" addr="0x7fca46934c90" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -267,32 +267,32 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="157" addr="0x7f99f1e3ed10" >
-            <attributelist id="158" addr="0x7f99f1e3ed10" >
-                <kwargs id="159" addr="0x7f99f1e3eb50" >
-                    <attributelist id="160" addr="0x7f99f1e3eb50" >
-                        <attribute name="name" value="warning" id="161" addr="0x7f99f1de6c90" />
-                        <attribute name="value" value="451:Setting a const char * variable may leak memory." id="162" addr="0x7f99f1de6c90" />
+        <typemap id="157" addr="0x7fca4698cd10" >
+            <attributelist id="158" addr="0x7fca4698cd10" >
+                <kwargs id="159" addr="0x7fca4698cb50" >
+                    <attributelist id="160" addr="0x7fca4698cb50" >
+                        <attribute name="name" value="warning" id="161" addr="0x7fca46934c90" />
+                        <attribute name="value" value="451:Setting a const char * variable may leak memory." id="162" addr="0x7fca46934c90" />
                     </attributelist >
-                    <kwargssitem id="163" addr="0x7f99f1e3eb70" >
-                        <attributelist id="164" addr="0x7f99f1e3eb70" >
+                    <kwargssitem id="163" addr="0x7fca4698cb70" >
+                        <attributelist id="164" addr="0x7fca4698cb70" >
                         </attributelist >
                     </kwargssitem >
-                    <kwargssitem id="165" addr="0x7f99f1e3eb30" >
-                        <attributelist id="166" addr="0x7f99f1e3eb30" >
+                    <kwargssitem id="165" addr="0x7fca4698cb30" >
+                        <attributelist id="166" addr="0x7fca4698cb30" >
                         </attributelist >
                     </kwargssitem >
                 </kwargs >
-                <attribute name="code" value="{&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="167" addr="0x7f99f1de6c90" />
-                <attribute name="method" value="globalin" id="168" addr="0x7f99f1de6c90" />
+                <attribute name="code" value="{&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="167" addr="0x7fca46934c90" />
+                <attribute name="method" value="globalin" id="168" addr="0x7fca46934c90" />
             </attributelist >
 
-            <typemapitem id="169" addr="0x7f99f1e3ec50" >
-                <attributelist id="170" addr="0x7f99f1e3ec50" >
-                    <parmlist id="171" addr="0x7f99f1e3ec90" >
+            <typemapitem id="169" addr="0x7fca4698cc50" >
+                <attributelist id="170" addr="0x7fca4698cc50" >
+                    <parmlist id="171" addr="0x7fca4698cc90" >
                         <parm id="172">
-                            <attributelist id="173" addr="0x7f99f1e3ec90" >
-                                <attribute name="type" value="p.q(const).char" id="174" addr="0x7f99f1de6c90" />
+                            <attributelist id="173" addr="0x7fca4698cc90" >
+                                <attribute name="type" value="p.q(const).char" id="174" addr="0x7fca46934c90" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -300,18 +300,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="175" addr="0x7f99f1e3ef30" >
-            <attributelist id="176" addr="0x7f99f1e3ef30" >
-                <attribute name="code" value="{&#10;  if($input) {&#10;    strncpy((char*)$1, (const char *)$input, $1_dim0-1);&#10;    $1[$1_dim0-1] = 0;&#10;  } else {&#10;    $1[0] = 0;&#10;  }&#10;}" id="177" addr="0x7f99f1de6c90" />
-                <attribute name="method" value="memberin" id="178" addr="0x7f99f1de6c90" />
+        <typemap id="175" addr="0x7fca4698cf30" >
+            <attributelist id="176" addr="0x7fca4698cf30" >
+                <attribute name="code" value="{&#10;  if($input) {&#10;    strncpy((char*)$1, (const char *)$input, $1_dim0-1);&#10;    $1[$1_dim0-1] = 0;&#10;  } else {&#10;    $1[0] = 0;&#10;  }&#10;}" id="177" addr="0x7fca46934c90" />
+                <attribute name="method" value="memberin" id="178" addr="0x7fca46934c90" />
             </attributelist >
 
-            <typemapitem id="179" addr="0x7f99f1e3ee70" >
-                <attributelist id="180" addr="0x7f99f1e3ee70" >
-                    <parmlist id="181" addr="0x7f99f1e3eeb0" >
+            <typemapitem id="179" addr="0x7fca4698ce70" >
+                <attributelist id="180" addr="0x7fca4698ce70" >
+                    <parmlist id="181" addr="0x7fca4698ceb0" >
                         <parm id="182">
-                            <attributelist id="183" addr="0x7f99f1e3eeb0" >
-                                <attribute name="type" value="a(ANY).char" id="184" addr="0x7f99f1de6c90" />
+                            <attributelist id="183" addr="0x7fca4698ceb0" >
+                                <attribute name="type" value="a(ANY).char" id="184" addr="0x7fca46934c90" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -319,18 +319,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="185" addr="0x7f99f1e3f150" >
-            <attributelist id="186" addr="0x7f99f1e3f150" >
-                <attribute name="code" value="{&#10;  if($input) {&#10;    strncpy((char*)$1, (const char *)$input, $1_dim0-1);&#10;    $1[$1_dim0-1] = 0;&#10;  } else {&#10;    $1[0] = 0;&#10;  }&#10;}" id="187" addr="0x7f99f1de6c90" />
-                <attribute name="method" value="globalin" id="188" addr="0x7f99f1de6c90" />
+        <typemap id="185" addr="0x7fca4698d150" >
+            <attributelist id="186" addr="0x7fca4698d150" >
+                <attribute name="code" value="{&#10;  if($input) {&#10;    strncpy((char*)$1, (const char *)$input, $1_dim0-1);&#10;    $1[$1_dim0-1] = 0;&#10;  } else {&#10;    $1[0] = 0;&#10;  }&#10;}" id="187" addr="0x7fca46934c90" />
+                <attribute name="method" value="globalin" id="188" addr="0x7fca46934c90" />
             </attributelist >
 
-            <typemapitem id="189" addr="0x7f99f1e3f090" >
-                <attributelist id="190" addr="0x7f99f1e3f090" >
-                    <parmlist id="191" addr="0x7f99f1e3f0d0" >
+            <typemapitem id="189" addr="0x7fca4698d090" >
+                <attributelist id="190" addr="0x7fca4698d090" >
+                    <parmlist id="191" addr="0x7fca4698d0d0" >
                         <parm id="192">
-                            <attributelist id="193" addr="0x7f99f1e3f0d0" >
-                                <attribute name="type" value="a(ANY).char" id="194" addr="0x7f99f1de6c90" />
+                            <attributelist id="193" addr="0x7fca4698d0d0" >
+                                <attribute name="type" value="a(ANY).char" id="194" addr="0x7fca46934c90" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -338,18 +338,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="195" addr="0x7f99f1e3f330" >
-            <attributelist id="196" addr="0x7f99f1e3f330" >
-                <attribute name="code" value="{&#10;  if ($input) strcpy((char *)$1, (const char *)$input);&#10;  else $1[0] = 0;&#10;}" id="197" addr="0x7f99f1de6c90" />
-                <attribute name="method" value="memberin" id="198" addr="0x7f99f1de6c90" />
+        <typemap id="195" addr="0x7fca4698d330" >
+            <attributelist id="196" addr="0x7fca4698d330" >
+                <attribute name="code" value="{&#10;  if ($input) strcpy((char *)$1, (const char *)$input);&#10;  else $1[0] = 0;&#10;}" id="197" addr="0x7fca46934c90" />
+                <attribute name="method" value="memberin" id="198" addr="0x7fca46934c90" />
             </attributelist >
 
-            <typemapitem id="199" addr="0x7f99f1e3f270" >
-                <attributelist id="200" addr="0x7f99f1e3f270" >
-                    <parmlist id="201" addr="0x7f99f1e3f2b0" >
+            <typemapitem id="199" addr="0x7fca4698d270" >
+                <attributelist id="200" addr="0x7fca4698d270" >
+                    <parmlist id="201" addr="0x7fca4698d2b0" >
                         <parm id="202">
-                            <attributelist id="203" addr="0x7f99f1e3f2b0" >
-                                <attribute name="type" value="a().char" id="204" addr="0x7f99f1de6c90" />
+                            <attributelist id="203" addr="0x7fca4698d2b0" >
+                                <attribute name="type" value="a().char" id="204" addr="0x7fca46934c90" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -357,18 +357,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="205" addr="0x7f99f1e3f510" >
-            <attributelist id="206" addr="0x7f99f1e3f510" >
-                <attribute name="code" value="{&#10;  if ($input) strcpy((char *)$1, (const char *)$input);&#10;  else $1[0] = 0;&#10;}" id="207" addr="0x7f99f1de6c90" />
-                <attribute name="method" value="globalin" id="208" addr="0x7f99f1de6c90" />
+        <typemap id="205" addr="0x7fca4698d510" >
+            <attributelist id="206" addr="0x7fca4698d510" >
+                <attribute name="code" value="{&#10;  if ($input) strcpy((char *)$1, (const char *)$input);&#10;  else $1[0] = 0;&#10;}" id="207" addr="0x7fca46934c90" />
+                <attribute name="method" value="globalin" id="208" addr="0x7fca46934c90" />
             </attributelist >
 
-            <typemapitem id="209" addr="0x7f99f1e3f450" >
-                <attributelist id="210" addr="0x7f99f1e3f450" >
-                    <parmlist id="211" addr="0x7f99f1e3f490" >
+            <typemapitem id="209" addr="0x7fca4698d450" >
+                <attributelist id="210" addr="0x7fca4698d450" >
+                    <parmlist id="211" addr="0x7fca4698d490" >
                         <parm id="212">
-                            <attributelist id="213" addr="0x7f99f1e3f490" >
-                                <attribute name="type" value="a().char" id="214" addr="0x7f99f1de6c90" />
+                            <attributelist id="213" addr="0x7fca4698d490" >
+                                <attribute name="type" value="a().char" id="214" addr="0x7fca46934c90" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -376,18 +376,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="215" addr="0x7f99f1e3f730" >
-            <attributelist id="216" addr="0x7f99f1e3f730" >
-                <attribute name="code" value="{&#10;  size_t ii;&#10;  $1_basetype *b = ($1_basetype *) $1;&#10;  for (ii = 0; ii &lt; (size_t)$1_size; ii++) b[ii] = *(($1_basetype *) $input + ii);&#10;}" id="217" addr="0x7f99f1de6c90" />
-                <attribute name="method" value="memberin" id="218" addr="0x7f99f1de6c90" />
+        <typemap id="215" addr="0x7fca4698d730" >
+            <attributelist id="216" addr="0x7fca4698d730" >
+                <attribute name="code" value="{&#10;  size_t ii;&#10;  $1_basetype *b = ($1_basetype *) $1;&#10;  for (ii = 0; ii &lt; (size_t)$1_size; ii++) b[ii] = *(($1_basetype *) $input + ii);&#10;}" id="217" addr="0x7fca46934c90" />
+                <attribute name="method" value="memberin" id="218" addr="0x7fca46934c90" />
             </attributelist >
 
-            <typemapitem id="219" addr="0x7f99f1e3f670" >
-                <attributelist id="220" addr="0x7f99f1e3f670" >
-                    <parmlist id="221" addr="0x7f99f1e3f6b0" >
+            <typemapitem id="219" addr="0x7fca4698d670" >
+                <attributelist id="220" addr="0x7fca4698d670" >
+                    <parmlist id="221" addr="0x7fca4698d6b0" >
                         <parm id="222">
-                            <attributelist id="223" addr="0x7f99f1e3f6b0" >
-                                <attribute name="type" value="a(ANY).SWIGTYPE" id="224" addr="0x7f99f1de6c90" />
+                            <attributelist id="223" addr="0x7fca4698d6b0" >
+                                <attribute name="type" value="a(ANY).SWIGTYPE" id="224" addr="0x7fca46934c90" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -395,18 +395,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="225" addr="0x7f99f1e3f950" >
-            <attributelist id="226" addr="0x7f99f1e3f950" >
-                <attribute name="code" value="{&#10;  size_t ii;&#10;  $1_basetype *b = ($1_basetype *) $1;&#10;  for (ii = 0; ii &lt; (size_t)$1_size; ii++) b[ii] = *(($1_basetype *) $input + ii);&#10;}" id="227" addr="0x7f99f1de6c90" />
-                <attribute name="method" value="globalin" id="228" addr="0x7f99f1de6c90" />
+        <typemap id="225" addr="0x7fca4698d950" >
+            <attributelist id="226" addr="0x7fca4698d950" >
+                <attribute name="code" value="{&#10;  size_t ii;&#10;  $1_basetype *b = ($1_basetype *) $1;&#10;  for (ii = 0; ii &lt; (size_t)$1_size; ii++) b[ii] = *(($1_basetype *) $input + ii);&#10;}" id="227" addr="0x7fca46934c90" />
+                <attribute name="method" value="globalin" id="228" addr="0x7fca46934c90" />
             </attributelist >
 
-            <typemapitem id="229" addr="0x7f99f1e3f890" >
-                <attributelist id="230" addr="0x7f99f1e3f890" >
-                    <parmlist id="231" addr="0x7f99f1e3f8d0" >
+            <typemapitem id="229" addr="0x7fca4698d890" >
+                <attributelist id="230" addr="0x7fca4698d890" >
+                    <parmlist id="231" addr="0x7fca4698d8d0" >
                         <parm id="232">
-                            <attributelist id="233" addr="0x7f99f1e3f8d0" >
-                                <attribute name="type" value="a(ANY).SWIGTYPE" id="234" addr="0x7f99f1de6c90" />
+                            <attributelist id="233" addr="0x7fca4698d8d0" >
+                                <attribute name="type" value="a(ANY).SWIGTYPE" id="234" addr="0x7fca46934c90" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -414,18 +414,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="235" addr="0x7f99f1e3fbb0" >
-            <attributelist id="236" addr="0x7f99f1e3fbb0" >
-                <attribute name="code" value="{&#10;  $basetype (*inp)[$1_dim1] = ($basetype (*)[$1_dim1])($input);&#10;  $basetype (*dest)[$1_dim1] = ($basetype (*)[$1_dim1])($1);&#10;  size_t ii = 0;&#10;  for (; ii &lt; $1_dim0; ++ii) {&#10;    $basetype *ip = inp[ii];&#10;    $basetype *dp = dest[ii];&#10;    size_t jj = 0;&#10;    for (; jj &lt; $1_dim1; ++jj) dp[jj] = ip[jj];&#10;  }&#10;}" id="237" addr="0x7f99f1de6c90" />
-                <attribute name="method" value="memberin" id="238" addr="0x7f99f1de6c90" />
+        <typemap id="235" addr="0x7fca4698dbb0" >
+            <attributelist id="236" addr="0x7fca4698dbb0" >
+                <attribute name="code" value="{&#10;  $basetype (*inp)[$1_dim1] = ($basetype (*)[$1_dim1])($input);&#10;  $basetype (*dest)[$1_dim1] = ($basetype (*)[$1_dim1])($1);&#10;  size_t ii = 0;&#10;  for (; ii &lt; $1_dim0; ++ii) {&#10;    $basetype *ip = inp[ii];&#10;    $basetype *dp = dest[ii];&#10;    size_t jj = 0;&#10;    for (; jj &lt; $1_dim1; ++jj) dp[jj] = ip[jj];&#10;  }&#10;}" id="237" addr="0x7fca46934c90" />
+                <attribute name="method" value="memberin" id="238" addr="0x7fca46934c90" />
             </attributelist >
 
-            <typemapitem id="239" addr="0x7f99f1e3fa90" >
-                <attributelist id="240" addr="0x7f99f1e3fa90" >
-                    <parmlist id="241" addr="0x7f99f1e3fb30" >
+            <typemapitem id="239" addr="0x7fca4698da90" >
+                <attributelist id="240" addr="0x7fca4698da90" >
+                    <parmlist id="241" addr="0x7fca4698db30" >
                         <parm id="242">
-                            <attributelist id="243" addr="0x7f99f1e3fb30" >
-                                <attribute name="type" value="a(ANY).a(ANY).SWIGTYPE" id="244" addr="0x7f99f1de6c90" />
+                            <attributelist id="243" addr="0x7fca4698db30" >
+                                <attribute name="type" value="a(ANY).a(ANY).SWIGTYPE" id="244" addr="0x7fca46934c90" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -433,18 +433,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="245" addr="0x7f99f1e3fe10" >
-            <attributelist id="246" addr="0x7f99f1e3fe10" >
-                <attribute name="code" value="{&#10;  $basetype (*inp)[$1_dim1] = ($basetype (*)[$1_dim1])($input);&#10;  $basetype (*dest)[$1_dim1] = ($basetype (*)[$1_dim1])($1);&#10;  size_t ii = 0;&#10;  for (; ii &lt; $1_dim0; ++ii) {&#10;    $basetype *ip = inp[ii];&#10;    $basetype *dp = dest[ii];&#10;    size_t jj = 0;&#10;    for (; jj &lt; $1_dim1; ++jj) dp[jj] = ip[jj];&#10;  }&#10;}" id="247" addr="0x7f99f1de6c90" />
-                <attribute name="method" value="globalin" id="248" addr="0x7f99f1de6c90" />
+        <typemap id="245" addr="0x7fca4698de10" >
+            <attributelist id="246" addr="0x7fca4698de10" >
+                <attribute name="code" value="{&#10;  $basetype (*inp)[$1_dim1] = ($basetype (*)[$1_dim1])($input);&#10;  $basetype (*dest)[$1_dim1] = ($basetype (*)[$1_dim1])($1);&#10;  size_t ii = 0;&#10;  for (; ii &lt; $1_dim0; ++ii) {&#10;    $basetype *ip = inp[ii];&#10;    $basetype *dp = dest[ii];&#10;    size_t jj = 0;&#10;    for (; jj &lt; $1_dim1; ++jj) dp[jj] = ip[jj];&#10;  }&#10;}" id="247" addr="0x7fca46934c90" />
+                <attribute name="method" value="globalin" id="248" addr="0x7fca46934c90" />
             </attributelist >
 
-            <typemapitem id="249" addr="0x7f99f1e3fcf0" >
-                <attributelist id="250" addr="0x7f99f1e3fcf0" >
-                    <parmlist id="251" addr="0x7f99f1e3fd90" >
+            <typemapitem id="249" addr="0x7fca4698dcf0" >
+                <attributelist id="250" addr="0x7fca4698dcf0" >
+                    <parmlist id="251" addr="0x7fca4698dd90" >
                         <parm id="252">
-                            <attributelist id="253" addr="0x7f99f1e3fd90" >
-                                <attribute name="type" value="a(ANY).a(ANY).SWIGTYPE" id="254" addr="0x7f99f1de6c90" />
+                            <attributelist id="253" addr="0x7fca4698dd90" >
+                                <attribute name="type" value="a(ANY).a(ANY).SWIGTYPE" id="254" addr="0x7fca46934c90" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -452,16311 +452,16311 @@
              
             </typemapitem >
         </typemap >
-        <insert id="255" addr="0x7f99f1e3fed0" >
-            <attributelist id="256" addr="0x7f99f1e3fed0" >
-                <attribute name="code" value="&#10;#ifdef __cplusplus&#10;/* SwigValueWrapper is described in swig.swg */&#10;template&lt;typename T> class SwigValueWrapper {&#10;  struct SwigMovePointer {&#10;    T *ptr;&#10;    SwigMovePointer(T *p) : ptr(p) { }&#10;    ~SwigMovePointer() { delete ptr; }&#10;    SwigMovePointer&amp; operator=(SwigMovePointer&amp; rhs) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = rhs.ptr; rhs.ptr = 0; return *this; }&#10;  } pointer;&#10;  SwigValueWrapper&amp; operator=(const SwigValueWrapper&lt;T>&amp; rhs);&#10;  SwigValueWrapper(const SwigValueWrapper&lt;T>&amp; rhs);&#10;public:&#10;  SwigValueWrapper() : pointer(0) { }&#10;  SwigValueWrapper&amp; operator=(const T&amp; t) { SwigMovePointer tmp(new T(t)); pointer = tmp; return *this; }&#10;  operator T&amp;() const { return *pointer.ptr; }&#10;  T *operator&amp;() { return pointer.ptr; }&#10;};" id="257" addr="0x7f99f1de6c90" />
-                <attribute name="section" value="runtime" id="258" addr="0x7f99f1de6c90" />
+        <insert id="255" addr="0x7fca4698ded0" >
+            <attributelist id="256" addr="0x7fca4698ded0" >
+                <attribute name="code" value="&#10;#ifdef __cplusplus&#10;/* SwigValueWrapper is described in swig.swg */&#10;template&lt;typename T> class SwigValueWrapper {&#10;  struct SwigMovePointer {&#10;    T *ptr;&#10;    SwigMovePointer(T *p) : ptr(p) { }&#10;    ~SwigMovePointer() { delete ptr; }&#10;    SwigMovePointer&amp; operator=(SwigMovePointer&amp; rhs) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = rhs.ptr; rhs.ptr = 0; return *this; }&#10;  } pointer;&#10;  SwigValueWrapper&amp; operator=(const SwigValueWrapper&lt;T>&amp; rhs);&#10;  SwigValueWrapper(const SwigValueWrapper&lt;T>&amp; rhs);&#10;public:&#10;  SwigValueWrapper() : pointer(0) { }&#10;  SwigValueWrapper&amp; operator=(const T&amp; t) { SwigMovePointer tmp(new T(t)); pointer = tmp; return *this; }&#10;  operator T&amp;() const { return *pointer.ptr; }&#10;  T *operator&amp;() { return pointer.ptr; }&#10;};" id="257" addr="0x7fca46934c90" />
+                <attribute name="section" value="runtime" id="258" addr="0x7fca46934c90" />
             </attributelist >
          
         </insert >
-        <insert id="259" addr="0x7f99f1e3ffb0" >
-            <attributelist id="260" addr="0x7f99f1e3ffb0" >
-                <attribute name="code" value="&#10;template &lt;typename T> T SwigValueInit() {&#10;  return T();&#10;}&#10;#endif&#10;" id="261" addr="0x7f99f1de6c90" />
-                <attribute name="section" value="runtime" id="262" addr="0x7f99f1de6c90" />
+        <insert id="259" addr="0x7fca4698dfb0" >
+            <attributelist id="260" addr="0x7fca4698dfb0" >
+                <attribute name="code" value="&#10;template &lt;typename T> T SwigValueInit() {&#10;  return T();&#10;}&#10;#endif&#10;" id="261" addr="0x7fca46934c90" />
+                <attribute name="section" value="runtime" id="262" addr="0x7fca46934c90" />
             </attributelist >
          
         </insert >
-        <insert id="263" addr="0x7f99f1e40090" >
-            <attributelist id="264" addr="0x7f99f1e40090" >
-                <attribute name="code" value="/* -----------------------------------------------------------------------------&#10; *  This section contains generic SWIG labels for method/variable&#10; *  declarations/attributes, and other compiler dependent labels.&#10; * ----------------------------------------------------------------------------- */&#10;&#10;/* template workaround for compilers that cannot correctly implement the C++ standard */&#10;#ifndef SWIGTEMPLATEDISAMBIGUATOR&#10;# if defined(__SUNPRO_CC) &amp;&amp; (__SUNPRO_CC &lt;= 0x560)&#10;#  define SWIGTEMPLATEDISAMBIGUATOR template&#10;# elif defined(__HP_aCC)&#10;/* Needed even with `aCC -AA' when `aCC -V' reports HP ANSI C++ B3910B A.03.55 */&#10;/* If we find a maximum version that requires this, the test would be __HP_aCC &lt;= 35500 for A.03.55 */&#10;#  define SWIGTEMPLATEDISAMBIGUATOR template&#10;# else&#10;#  define SWIGTEMPLATEDISAMBIGUATOR&#10;# endif&#10;#endif&#10;&#10;/* inline attribute */&#10;#ifndef SWIGINLINE&#10;# if defined(__cplusplus) || (defined(__GNUC__) &amp;&amp; !defined(__STRICT_ANSI__))&#10;#   define SWIGINLINE inline&#10;# else&#10;#   define SWIGINLINE&#10;# endif&#10;#endif&#10;&#10;/* attribute recognised by some compilers to avoid 'unused' warnings */&#10;#ifndef SWIGUNUSED&#10;# if defined(__GNUC__)&#10;#   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 &amp;&amp; __GNUC_MINOR__ >= 4))&#10;#     define SWIGUNUSED __attribute__ ((__unused__))&#10;#   else&#10;#     define SWIGUNUSED&#10;#   endif&#10;# elif defined(__ICC)&#10;#   define SWIGUNUSED __attribute__ ((__unused__))&#10;# else&#10;#   define SWIGUNUSED&#10;# endif&#10;#endif&#10;&#10;#ifndef SWIG_MSC_UNSUPPRESS_4505&#10;# if defined(_MSC_VER)&#10;#   pragma warning(disable : 4505) /* unreferenced local function has been removed */&#10;# endif&#10;#endif&#10;&#10;#ifndef SWIGUNUSEDPARM&#10;# ifdef __cplusplus&#10;#   define SWIGUNUSEDPARM(p)&#10;# else&#10;#   define SWIGUNUSEDPARM(p) p SWIGUNUSED&#10;# endif&#10;#endif&#10;&#10;/* internal SWIG method */&#10;#ifndef SWIGINTERN&#10;# define SWIGINTERN static SWIGUNUSED&#10;#endif&#10;&#10;/* internal inline SWIG method */&#10;#ifndef SWIGINTERNINLINE&#10;# define SWIGINTERNINLINE SWIGINTERN SWIGINLINE&#10;#endif&#10;&#10;/* exporting methods */&#10;#if defined(__GNUC__)&#10;#  if (__GNUC__ >= 4) || (__GNUC__ == 3 &amp;&amp; __GNUC_MINOR__ >= 4)&#10;#    ifndef GCC_HASCLASSVISIBILITY&#10;#      define GCC_HASCLASSVISIBILITY&#10;#    endif&#10;#  endif&#10;#endif&#10;&#10;#ifndef SWIGEXPORT&#10;# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)&#10;#   if defined(STATIC_LINKED)&#10;#     define SWIGEXPORT&#10;#   else&#10;#     define SWIGEXPORT __declspec(dllexport)&#10;#   endif&#10;# else&#10;#   if defined(__GNUC__) &amp;&amp; defined(GCC_HASCLASSVISIBILITY)&#10;#     define SWIGEXPORT __attribute__ ((visibility(&quot;default&quot;)))&#10;#   else&#10;#     define SWIGEXPORT&#10;#   endif&#10;# endif&#10;#endif&#10;&#10;/* calling conventions for Windows */&#10;#ifndef SWIGSTDCALL&#10;# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)&#10;#   define SWIGSTDCALL __stdcall&#10;# else&#10;#   define SWIGSTDCALL&#10;# endif&#10;#endif&#10;&#10;/* Deal with Microsoft's attempt at deprecating C standard runtime functions */&#10;#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) &amp;&amp; defined(_MSC_VER) &amp;&amp; !defined(_CRT_SECURE_NO_DEPRECATE)&#10;# define _CRT_SECURE_NO_DEPRECATE&#10;#endif&#10;&#10;/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */&#10;#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) &amp;&amp; defined(_MSC_VER) &amp;&amp; !defined(_SCL_SECURE_NO_DEPRECATE)&#10;# define _SCL_SECURE_NO_DEPRECATE&#10;#endif&#10;&#10;/* Deal with Apple's deprecated 'AssertMacros.h' from Carbon-framework */&#10;#if defined(__APPLE__) &amp;&amp; !defined(__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES)&#10;# define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0&#10;#endif&#10;&#10;/* Intel's compiler complains if a variable which was never initialised is&#10; * cast to void, which is a common idiom which we use to indicate that we&#10; * are aware a variable isn't used.  So we just silence that warning.&#10; * See: https://github.com/swig/swig/issues/192 for more discussion.&#10; */&#10;#ifdef __INTEL_COMPILER&#10;# pragma warning disable 592&#10;#endif&#10;" id="265" addr="0x7f99f1de6c90" />
-                <attribute name="section" value="runtime" id="266" addr="0x7f99f1de6c90" />
+        <insert id="263" addr="0x7fca4698e090" >
+            <attributelist id="264" addr="0x7fca4698e090" >
+                <attribute name="code" value="/* -----------------------------------------------------------------------------&#10; *  This section contains generic SWIG labels for method/variable&#10; *  declarations/attributes, and other compiler dependent labels.&#10; * ----------------------------------------------------------------------------- */&#10;&#10;/* template workaround for compilers that cannot correctly implement the C++ standard */&#10;#ifndef SWIGTEMPLATEDISAMBIGUATOR&#10;# if defined(__SUNPRO_CC) &amp;&amp; (__SUNPRO_CC &lt;= 0x560)&#10;#  define SWIGTEMPLATEDISAMBIGUATOR template&#10;# elif defined(__HP_aCC)&#10;/* Needed even with `aCC -AA' when `aCC -V' reports HP ANSI C++ B3910B A.03.55 */&#10;/* If we find a maximum version that requires this, the test would be __HP_aCC &lt;= 35500 for A.03.55 */&#10;#  define SWIGTEMPLATEDISAMBIGUATOR template&#10;# else&#10;#  define SWIGTEMPLATEDISAMBIGUATOR&#10;# endif&#10;#endif&#10;&#10;/* inline attribute */&#10;#ifndef SWIGINLINE&#10;# if defined(__cplusplus) || (defined(__GNUC__) &amp;&amp; !defined(__STRICT_ANSI__))&#10;#   define SWIGINLINE inline&#10;# else&#10;#   define SWIGINLINE&#10;# endif&#10;#endif&#10;&#10;/* attribute recognised by some compilers to avoid 'unused' warnings */&#10;#ifndef SWIGUNUSED&#10;# if defined(__GNUC__)&#10;#   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 &amp;&amp; __GNUC_MINOR__ >= 4))&#10;#     define SWIGUNUSED __attribute__ ((__unused__))&#10;#   else&#10;#     define SWIGUNUSED&#10;#   endif&#10;# elif defined(__ICC)&#10;#   define SWIGUNUSED __attribute__ ((__unused__))&#10;# else&#10;#   define SWIGUNUSED&#10;# endif&#10;#endif&#10;&#10;#ifndef SWIG_MSC_UNSUPPRESS_4505&#10;# if defined(_MSC_VER)&#10;#   pragma warning(disable : 4505) /* unreferenced local function has been removed */&#10;# endif&#10;#endif&#10;&#10;#ifndef SWIGUNUSEDPARM&#10;# ifdef __cplusplus&#10;#   define SWIGUNUSEDPARM(p)&#10;# else&#10;#   define SWIGUNUSEDPARM(p) p SWIGUNUSED&#10;# endif&#10;#endif&#10;&#10;/* internal SWIG method */&#10;#ifndef SWIGINTERN&#10;# define SWIGINTERN static SWIGUNUSED&#10;#endif&#10;&#10;/* internal inline SWIG method */&#10;#ifndef SWIGINTERNINLINE&#10;# define SWIGINTERNINLINE SWIGINTERN SWIGINLINE&#10;#endif&#10;&#10;/* exporting methods */&#10;#if defined(__GNUC__)&#10;#  if (__GNUC__ >= 4) || (__GNUC__ == 3 &amp;&amp; __GNUC_MINOR__ >= 4)&#10;#    ifndef GCC_HASCLASSVISIBILITY&#10;#      define GCC_HASCLASSVISIBILITY&#10;#    endif&#10;#  endif&#10;#endif&#10;&#10;#ifndef SWIGEXPORT&#10;# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)&#10;#   if defined(STATIC_LINKED)&#10;#     define SWIGEXPORT&#10;#   else&#10;#     define SWIGEXPORT __declspec(dllexport)&#10;#   endif&#10;# else&#10;#   if defined(__GNUC__) &amp;&amp; defined(GCC_HASCLASSVISIBILITY)&#10;#     define SWIGEXPORT __attribute__ ((visibility(&quot;default&quot;)))&#10;#   else&#10;#     define SWIGEXPORT&#10;#   endif&#10;# endif&#10;#endif&#10;&#10;/* calling conventions for Windows */&#10;#ifndef SWIGSTDCALL&#10;# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)&#10;#   define SWIGSTDCALL __stdcall&#10;# else&#10;#   define SWIGSTDCALL&#10;# endif&#10;#endif&#10;&#10;/* Deal with Microsoft's attempt at deprecating C standard runtime functions */&#10;#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) &amp;&amp; defined(_MSC_VER) &amp;&amp; !defined(_CRT_SECURE_NO_DEPRECATE)&#10;# define _CRT_SECURE_NO_DEPRECATE&#10;#endif&#10;&#10;/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */&#10;#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) &amp;&amp; defined(_MSC_VER) &amp;&amp; !defined(_SCL_SECURE_NO_DEPRECATE)&#10;# define _SCL_SECURE_NO_DEPRECATE&#10;#endif&#10;&#10;/* Deal with Apple's deprecated 'AssertMacros.h' from Carbon-framework */&#10;#if defined(__APPLE__) &amp;&amp; !defined(__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES)&#10;# define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0&#10;#endif&#10;&#10;/* Intel's compiler complains if a variable which was never initialised is&#10; * cast to void, which is a common idiom which we use to indicate that we&#10; * are aware a variable isn't used.  So we just silence that warning.&#10; * See: https://github.com/swig/swig/issues/192 for more discussion.&#10; */&#10;#ifdef __INTEL_COMPILER&#10;# pragma warning disable 592&#10;#endif&#10;" id="265" addr="0x7fca46934c90" />
+                <attribute name="section" value="runtime" id="266" addr="0x7fca46934c90" />
             </attributelist >
          
         </insert >
     </include >
-    <include id="267" addr="0x7f99f1e40210" >
-        <attributelist id="268" addr="0x7f99f1e40210" >
-            <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmcgui.i" id="269" addr="0x7f99f1de6c90" />
-            <attribute name="module" value="" id="270" addr="0x7f99f1e403f0" />
-            <attribute name="options" value="0x7f99f1e40190" id="271" addr="0x7f99f1e40190" />
+    <include id="267" addr="0x7fca4698e210" >
+        <attributelist id="268" addr="0x7fca4698e210" >
+            <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmcgui.i" id="269" addr="0x7fca46934c90" />
+            <attribute name="module" value="" id="270" addr="0x7fca4698e3f0" />
+            <attribute name="options" value="0x7fca4698e190" id="271" addr="0x7fca4698e190" />
         </attributelist >
 
-        <module id="272" addr="0x7f99f1e402f0" >
-            <attributelist id="273" addr="0x7f99f1e402f0" >
-                <attribute name="name" value="xbmcgui" id="274" addr="0x7f99f1de6c90" />
-                <attribute name="options" value="0x7f99f1e402d0" id="275" addr="0x7f99f1e402d0" />
+        <module id="272" addr="0x7fca4698e2f0" >
+            <attributelist id="273" addr="0x7fca4698e2f0" >
+                <attribute name="name" value="xbmcgui" id="274" addr="0x7fca46934c90" />
+                <attribute name="options" value="0x7fca4698e2d0" id="275" addr="0x7fca4698e2d0" />
             </attributelist >
          
         </module >
-        <insert id="276" addr="0x7f99f1e40430" >
-            <attributelist id="277" addr="0x7f99f1e40430" >
-                <attribute name="code" value="&#10;#if defined(TARGET_WINDOWS)&#10;#  include &lt;windows.h>&#10;#endif&#10;&#10;#include &quot;interfaces/legacy/Dialog.h&quot;&#10;#include &quot;interfaces/legacy/ModuleXbmcgui.h&quot;&#10;#include &quot;interfaces/legacy/Control.h&quot;&#10;#include &quot;interfaces/legacy/Window.h&quot;&#10;#include &quot;interfaces/legacy/WindowDialog.h&quot;&#10;#include &quot;interfaces/legacy/Dialog.h&quot;&#10;#include &quot;interfaces/legacy/WindowXML.h&quot;&#10;#include &quot;input/actions/ActionIDs.h&quot;&#10;#include &quot;input/Key.h&quot;&#10;&#10;using namespace XBMCAddon;&#10;using namespace xbmcgui;&#10;&#10;#if defined(__GNUG__)&#10;#pragma GCC diagnostic ignored &quot;-Wstrict-aliasing&quot;&#10;#endif&#10;&#10;" id="278" addr="0x7f99f1de6c90" />
+        <insert id="276" addr="0x7fca4698e430" >
+            <attributelist id="277" addr="0x7fca4698e430" >
+                <attribute name="code" value="&#10;#if defined(TARGET_WINDOWS)&#10;#  include &lt;windows.h>&#10;#endif&#10;&#10;#include &quot;interfaces/legacy/Dialog.h&quot;&#10;#include &quot;interfaces/legacy/ModuleXbmcgui.h&quot;&#10;#include &quot;interfaces/legacy/Control.h&quot;&#10;#include &quot;interfaces/legacy/Window.h&quot;&#10;#include &quot;interfaces/legacy/WindowDialog.h&quot;&#10;#include &quot;interfaces/legacy/Dialog.h&quot;&#10;#include &quot;interfaces/legacy/WindowXML.h&quot;&#10;#include &quot;input/actions/ActionIDs.h&quot;&#10;#include &quot;input/Key.h&quot;&#10;&#10;using namespace XBMCAddon;&#10;using namespace xbmcgui;&#10;&#10;#if defined(__GNUG__)&#10;#pragma GCC diagnostic ignored &quot;-Wstrict-aliasing&quot;&#10;#endif&#10;&#10;" id="278" addr="0x7fca46934c90" />
             </attributelist >
          
         </insert >
-        <include id="279" addr="0x7f99f1e40790" >
-            <attributelist id="280" addr="0x7f99f1e40790" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/swighelper.h" id="281" addr="0x7f99f1de6c90" />
+        <include id="279" addr="0x7fca4698e790" >
+            <attributelist id="280" addr="0x7fca4698e790" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/swighelper.h" id="281" addr="0x7fca46934c90" />
             </attributelist >
          
         </include >
-        <include id="282" addr="0x7f99f1e40810" >
-            <attributelist id="283" addr="0x7f99f1e40810" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/AddonString.h" id="284" addr="0x7f99f1de6c90" />
+        <include id="282" addr="0x7fca4698e810" >
+            <attributelist id="283" addr="0x7fca4698e810" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/AddonString.h" id="284" addr="0x7fca46934c90" />
             </attributelist >
 
-            <namespace id="285" addr="0x7f99f1e40950" >
-                <attributelist id="286" addr="0x7f99f1e40950" >
-                    <attribute name="sym_name" value="XBMCAddon" id="287" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="XBMCAddon" id="288" addr="0x7f99f1de6c90" />
-                    <attribute name="csym_nextSibling" value="0x7f99f1e40f10" id="289" addr="0x7f99f1e40f10" />
-                    <attribute name="sym_nextSibling" value="0x7f99f1e40f10" id="290" addr="0x7f99f1e40f10" />
-                    <typescope id="291" addr="0x7f99f1dd1d70" >
-                        <attributelist id="292" addr="0x7f99f1dd1d70" >
-                            <attribute name="name" value="XBMCAddon" id="293" addr="0x7f99f1de6c90" />
-                            <typetab id="294" addr="0x7f99f1dd1db0" >
-                                <attributelist id="295" addr="0x7f99f1dd1db0" >
-                                    <attribute name="Dictionary" value="Dictionary" id="296" addr="0x7f99f1de6c90" />
-                                    <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="297" addr="0x7f99f1de6c90" />
-                                    <attribute name="String" value="std::string" id="298" addr="0x7f99f1de6c90" />
-                                    <attribute name="StringOrInt" value="XBMCAddon::String" id="299" addr="0x7f99f1de6c90" />
+            <namespace id="285" addr="0x7fca4698e950" >
+                <attributelist id="286" addr="0x7fca4698e950" >
+                    <attribute name="sym_name" value="XBMCAddon" id="287" addr="0x7fca46934c90" />
+                    <attribute name="name" value="XBMCAddon" id="288" addr="0x7fca46934c90" />
+                    <attribute name="csym_nextSibling" value="0x7fca4698ef10" id="289" addr="0x7fca4698ef10" />
+                    <attribute name="sym_nextSibling" value="0x7fca4698ef10" id="290" addr="0x7fca4698ef10" />
+                    <typescope id="291" addr="0x7fca4691fd70" >
+                        <attributelist id="292" addr="0x7fca4691fd70" >
+                            <attribute name="name" value="XBMCAddon" id="293" addr="0x7fca46934c90" />
+                            <typetab id="294" addr="0x7fca4691fdb0" >
+                                <attributelist id="295" addr="0x7fca4691fdb0" >
+                                    <attribute name="Dictionary" value="Dictionary" id="296" addr="0x7fca46934c90" />
+                                    <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="297" addr="0x7fca46934c90" />
+                                    <attribute name="String" value="std::string" id="298" addr="0x7fca46934c90" />
+                                    <attribute name="StringOrInt" value="XBMCAddon::String" id="299" addr="0x7fca46934c90" />
                                 </attributelist >
-                                <typetabsitem id="300" addr="0x7f99f1dd28b0" >
-                                    <attributelist id="301" addr="0x7f99f1dd28b0" >
+                                <typetabsitem id="300" addr="0x7fca469208b0" >
+                                    <attributelist id="301" addr="0x7fca469208b0" >
                                     </attributelist >
                                 </typetabsitem >
-                                <typetabsitem id="302" addr="0x7f99f1dd2910" >
-                                    <attributelist id="303" addr="0x7f99f1dd2910" >
+                                <typetabsitem id="302" addr="0x7fca46920910" >
+                                    <attributelist id="303" addr="0x7fca46920910" >
                                     </attributelist >
                                 </typetabsitem >
-                                <typetabsitem id="304" addr="0x7f99f1dd1f90" >
-                                    <attributelist id="305" addr="0x7f99f1dd1f90" >
+                                <typetabsitem id="304" addr="0x7fca4691ff90" >
+                                    <attributelist id="305" addr="0x7fca4691ff90" >
                                     </attributelist >
                                 </typetabsitem >
-                                <typetabsitem id="306" addr="0x7f99f1dd2710" >
-                                    <attributelist id="307" addr="0x7f99f1dd2710" >
+                                <typetabsitem id="306" addr="0x7fca46920710" >
+                                    <attributelist id="307" addr="0x7fca46920710" >
                                     </attributelist >
                                 </typetabsitem >
                             </typetab >
-                            <attribute name="parent" value="0x7f99f1e1da30" id="308" addr="0x7f99f1e1da30" />
-                            <attribute name="qname" value="XBMCAddon" id="309" addr="0x7f99f1de6c90" />
-                            <attribute name="symtab" value="0x7f99f1e408b0" id="310" addr="0x7f99f1e408b0" />
+                            <attribute name="parent" value="0x7fca4696ba30" id="308" addr="0x7fca4696ba30" />
+                            <attribute name="qname" value="XBMCAddon" id="309" addr="0x7fca46934c90" />
+                            <attribute name="symtab" value="0x7fca4698e8b0" id="310" addr="0x7fca4698e8b0" />
                         </attributelist >
-                        <typescopesitem id="311" addr="0x7f99f1e40870" >
-                            <attributelist id="312" addr="0x7f99f1e40870" >
+                        <typescopesitem id="311" addr="0x7fca4698e870" >
+                            <attributelist id="312" addr="0x7fca4698e870" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="313" addr="0x7f99f1dd1db0" >
-                            <attributelist id="314" addr="0x7f99f1dd1db0" >
-                                <attribute name="Dictionary" value="Dictionary" id="315" addr="0x7f99f1de6c90" />
-                                <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="316" addr="0x7f99f1de6c90" />
-                                <attribute name="String" value="std::string" id="317" addr="0x7f99f1de6c90" />
-                                <attribute name="StringOrInt" value="XBMCAddon::String" id="318" addr="0x7f99f1de6c90" />
+                        <typescopesitem id="313" addr="0x7fca4691fdb0" >
+                            <attributelist id="314" addr="0x7fca4691fdb0" >
+                                <attribute name="Dictionary" value="Dictionary" id="315" addr="0x7fca46934c90" />
+                                <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="316" addr="0x7fca46934c90" />
+                                <attribute name="String" value="std::string" id="317" addr="0x7fca46934c90" />
+                                <attribute name="StringOrInt" value="XBMCAddon::String" id="318" addr="0x7fca46934c90" />
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="319" addr="0x7f99f1e1da30" >
-                            <attributelist id="320" addr="0x7f99f1e1da30" >
-                                <attribute name="name" value="" id="321" addr="0x7f99f1de6c90" />
-                                <typetab id="322" addr="0x7f99f1e1da90" >
-                                    <attributelist id="323" addr="0x7f99f1e1da90" >
+                        <typescopesitem id="319" addr="0x7fca4696ba30" >
+                            <attributelist id="320" addr="0x7fca4696ba30" >
+                                <attribute name="name" value="" id="321" addr="0x7fca46934c90" />
+                                <typetab id="322" addr="0x7fca4696ba90" >
+                                    <attributelist id="323" addr="0x7fca4696ba90" >
                                     </attributelist >
                                 </typetab >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="324" addr="0x7f99f1dd1eb0" >
-                            <attributelist id="325" addr="0x7f99f1dd1eb0" >
+                        <typescopesitem id="324" addr="0x7fca4691feb0" >
+                            <attributelist id="325" addr="0x7fca4691feb0" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="326" addr="0x7f99f1e408b0" >
-                            <attributelist id="327" addr="0x7f99f1e408b0" >
-                                <attribute name="name" value="XBMCAddon" id="328" addr="0x7f99f1de6c90" />
-                                <attribute name="csymtab" value="0x7f99f1e408f0" id="329" addr="0x7f99f1e408f0" />
-                                <attribute name="symtab" value="0x7f99f1e40890" id="330" addr="0x7f99f1e40890" />
+                        <typescopesitem id="326" addr="0x7fca4698e8b0" >
+                            <attributelist id="327" addr="0x7fca4698e8b0" >
+                                <attribute name="name" value="XBMCAddon" id="328" addr="0x7fca46934c90" />
+                                <attribute name="csymtab" value="0x7fca4698e8f0" id="329" addr="0x7fca4698e8f0" />
+                                <attribute name="symtab" value="0x7fca4698e890" id="330" addr="0x7fca4698e890" />
                             </attributelist >
                         </typescopesitem >
                     </typescope >
-                    <attribute name="symtab" value="0x7f99f1e408b0" id="331" addr="0x7f99f1e408b0" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="332" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="333" addr="0x7f99f1de6c90" />
+                    <attribute name="symtab" value="0x7fca4698e8b0" id="331" addr="0x7fca4698e8b0" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="332" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="333" addr="0x7fca46934c90" />
                 </attributelist >
 
-                <cdecl id="334" addr="0x7f99f1e40a70" >
-                    <attributelist id="335" addr="0x7f99f1e40a70" >
-                        <attribute name="sym_name" value="String" id="336" addr="0x7f99f1de6c90" />
-                        <attribute name="name" value="XBMCAddon::String" id="337" addr="0x7f99f1de6c90" />
-                        <attribute name="decl" value="" id="338" addr="0x7f99f1de6c90" />
-                        <attribute name="storage" value="typedef" id="339" addr="0x7f99f1de6c90" />
-                        <attribute name="kind" value="typedef" id="340" addr="0x7f99f1de6c90" />
-                        <attribute name="type" value="std::string" id="341" addr="0x7f99f1de6c90" />
-                        <attribute name="sym_symtab" value="0x7f99f1e408b0" id="342" addr="0x7f99f1e408b0" />
-                        <attribute name="sym_overname" value="__SWIG_0" id="343" addr="0x7f99f1de6c90" />
+                <cdecl id="334" addr="0x7fca4698ea70" >
+                    <attributelist id="335" addr="0x7fca4698ea70" >
+                        <attribute name="sym_name" value="String" id="336" addr="0x7fca46934c90" />
+                        <attribute name="name" value="XBMCAddon::String" id="337" addr="0x7fca46934c90" />
+                        <attribute name="decl" value="" id="338" addr="0x7fca46934c90" />
+                        <attribute name="storage" value="typedef" id="339" addr="0x7fca46934c90" />
+                        <attribute name="kind" value="typedef" id="340" addr="0x7fca46934c90" />
+                        <attribute name="type" value="std::string" id="341" addr="0x7fca46934c90" />
+                        <attribute name="sym_symtab" value="0x7fca4698e8b0" id="342" addr="0x7fca4698e8b0" />
+                        <attribute name="sym_overname" value="__SWIG_0" id="343" addr="0x7fca46934c90" />
                     </attributelist >
                  
                 </cdecl >
-                <cdecl id="344" addr="0x7f99f1e40c70" >
-                    <attributelist id="345" addr="0x7f99f1e40c70" >
-                        <attribute name="sym_name" value="emptyString" id="346" addr="0x7f99f1de6c90" />
-                        <attribute name="name" value="XBMCAddon::emptyString" id="347" addr="0x7f99f1de6c90" />
-                        <attribute name="decl" value="" id="348" addr="0x7f99f1de6c90" />
-                        <attribute name="storage" value="extern" id="349" addr="0x7f99f1de6c90" />
-                        <attribute name="kind" value="variable" id="350" addr="0x7f99f1de6c90" />
-                        <attribute name="type" value="XBMCAddon::String" id="351" addr="0x7f99f1de6c90" />
-                        <attribute name="sym_symtab" value="0x7f99f1e408b0" id="352" addr="0x7f99f1e408b0" />
-                        <attribute name="sym_overname" value="__SWIG_0" id="353" addr="0x7f99f1de6c90" />
+                <cdecl id="344" addr="0x7fca4698ec70" >
+                    <attributelist id="345" addr="0x7fca4698ec70" >
+                        <attribute name="sym_name" value="emptyString" id="346" addr="0x7fca46934c90" />
+                        <attribute name="name" value="XBMCAddon::emptyString" id="347" addr="0x7fca46934c90" />
+                        <attribute name="decl" value="" id="348" addr="0x7fca46934c90" />
+                        <attribute name="storage" value="extern" id="349" addr="0x7fca46934c90" />
+                        <attribute name="kind" value="variable" id="350" addr="0x7fca46934c90" />
+                        <attribute name="type" value="XBMCAddon::String" id="351" addr="0x7fca46934c90" />
+                        <attribute name="sym_symtab" value="0x7fca4698e8b0" id="352" addr="0x7fca4698e8b0" />
+                        <attribute name="sym_overname" value="__SWIG_0" id="353" addr="0x7fca46934c90" />
                     </attributelist >
                  
                 </cdecl >
             </namespace >
         </include >
-        <include id="354" addr="0x7f99f1e40e50" >
-            <attributelist id="355" addr="0x7f99f1e40e50" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/ModuleXbmcgui.h" id="356" addr="0x7f99f1de6c90" />
+        <include id="354" addr="0x7fca4698ee50" >
+            <attributelist id="355" addr="0x7fca4698ee50" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/ModuleXbmcgui.h" id="356" addr="0x7fca46934c90" />
             </attributelist >
 
-            <namespace id="357" addr="0x7f99f1e40f10" >
-                <attributelist id="358" addr="0x7f99f1e40f10" >
-                    <attribute name="sym_name" value="XBMCAddon" id="359" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="XBMCAddon" id="360" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_previousSibling" value="0x7f99f1e40950" id="361" addr="0x7f99f1e40950" />
-                    <attribute name="csym_nextSibling" value="0x7f99f1e45470" id="362" addr="0x7f99f1e45470" />
-                    <attribute name="sym_nextSibling" value="0x7f99f1e45470" id="363" addr="0x7f99f1e45470" />
-                    <typescope id="364" addr="0x7f99f1dd1d70" >
-                        <attributelist id="365" addr="0x7f99f1dd1d70" >
-                            <attribute name="name" value="XBMCAddon" id="366" addr="0x7f99f1de6c90" />
-                            <typetab id="367" addr="0x7f99f1dd1db0" >
-                                <attributelist id="368" addr="0x7f99f1dd1db0" >
-                                    <attribute name="Dictionary" value="Dictionary" id="369" addr="0x7f99f1de6c90" />
-                                    <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="370" addr="0x7f99f1de6c90" />
-                                    <attribute name="String" value="std::string" id="371" addr="0x7f99f1de6c90" />
-                                    <attribute name="StringOrInt" value="XBMCAddon::String" id="372" addr="0x7f99f1de6c90" />
+            <namespace id="357" addr="0x7fca4698ef10" >
+                <attributelist id="358" addr="0x7fca4698ef10" >
+                    <attribute name="sym_name" value="XBMCAddon" id="359" addr="0x7fca46934c90" />
+                    <attribute name="name" value="XBMCAddon" id="360" addr="0x7fca46934c90" />
+                    <attribute name="sym_previousSibling" value="0x7fca4698e950" id="361" addr="0x7fca4698e950" />
+                    <attribute name="csym_nextSibling" value="0x7fca46993470" id="362" addr="0x7fca46993470" />
+                    <attribute name="sym_nextSibling" value="0x7fca46993470" id="363" addr="0x7fca46993470" />
+                    <typescope id="364" addr="0x7fca4691fd70" >
+                        <attributelist id="365" addr="0x7fca4691fd70" >
+                            <attribute name="name" value="XBMCAddon" id="366" addr="0x7fca46934c90" />
+                            <typetab id="367" addr="0x7fca4691fdb0" >
+                                <attributelist id="368" addr="0x7fca4691fdb0" >
+                                    <attribute name="Dictionary" value="Dictionary" id="369" addr="0x7fca46934c90" />
+                                    <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="370" addr="0x7fca46934c90" />
+                                    <attribute name="String" value="std::string" id="371" addr="0x7fca46934c90" />
+                                    <attribute name="StringOrInt" value="XBMCAddon::String" id="372" addr="0x7fca46934c90" />
                                 </attributelist >
-                                <typetabsitem id="373" addr="0x7f99f1dd28b0" >
-                                    <attributelist id="374" addr="0x7f99f1dd28b0" >
+                                <typetabsitem id="373" addr="0x7fca469208b0" >
+                                    <attributelist id="374" addr="0x7fca469208b0" >
                                     </attributelist >
                                 </typetabsitem >
-                                <typetabsitem id="375" addr="0x7f99f1dd2910" >
-                                    <attributelist id="376" addr="0x7f99f1dd2910" >
+                                <typetabsitem id="375" addr="0x7fca46920910" >
+                                    <attributelist id="376" addr="0x7fca46920910" >
                                     </attributelist >
                                 </typetabsitem >
-                                <typetabsitem id="377" addr="0x7f99f1dd1f90" >
-                                    <attributelist id="378" addr="0x7f99f1dd1f90" >
+                                <typetabsitem id="377" addr="0x7fca4691ff90" >
+                                    <attributelist id="378" addr="0x7fca4691ff90" >
                                     </attributelist >
                                 </typetabsitem >
-                                <typetabsitem id="379" addr="0x7f99f1dd2710" >
-                                    <attributelist id="380" addr="0x7f99f1dd2710" >
+                                <typetabsitem id="379" addr="0x7fca46920710" >
+                                    <attributelist id="380" addr="0x7fca46920710" >
                                     </attributelist >
                                 </typetabsitem >
                             </typetab >
-                            <attribute name="parent" value="0x7f99f1e1da30" id="381" addr="0x7f99f1e1da30" />
-                            <attribute name="qname" value="XBMCAddon" id="382" addr="0x7f99f1de6c90" />
-                            <attribute name="symtab" value="0x7f99f1e408b0" id="383" addr="0x7f99f1e408b0" />
+                            <attribute name="parent" value="0x7fca4696ba30" id="381" addr="0x7fca4696ba30" />
+                            <attribute name="qname" value="XBMCAddon" id="382" addr="0x7fca46934c90" />
+                            <attribute name="symtab" value="0x7fca4698e8b0" id="383" addr="0x7fca4698e8b0" />
                         </attributelist >
-                        <typescopesitem id="384" addr="0x7f99f1e40870" >
-                            <attributelist id="385" addr="0x7f99f1e40870" >
+                        <typescopesitem id="384" addr="0x7fca4698e870" >
+                            <attributelist id="385" addr="0x7fca4698e870" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="386" addr="0x7f99f1dd1db0" >
-                            <attributelist id="387" addr="0x7f99f1dd1db0" >
-                                <attribute name="Dictionary" value="Dictionary" id="388" addr="0x7f99f1de6c90" />
-                                <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="389" addr="0x7f99f1de6c90" />
-                                <attribute name="String" value="std::string" id="390" addr="0x7f99f1de6c90" />
-                                <attribute name="StringOrInt" value="XBMCAddon::String" id="391" addr="0x7f99f1de6c90" />
+                        <typescopesitem id="386" addr="0x7fca4691fdb0" >
+                            <attributelist id="387" addr="0x7fca4691fdb0" >
+                                <attribute name="Dictionary" value="Dictionary" id="388" addr="0x7fca46934c90" />
+                                <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="389" addr="0x7fca46934c90" />
+                                <attribute name="String" value="std::string" id="390" addr="0x7fca46934c90" />
+                                <attribute name="StringOrInt" value="XBMCAddon::String" id="391" addr="0x7fca46934c90" />
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="392" addr="0x7f99f1e1da30" >
-                            <attributelist id="393" addr="0x7f99f1e1da30" >
-                                <attribute name="name" value="" id="394" addr="0x7f99f1de6c90" />
-                                <typetab id="395" addr="0x7f99f1e1da90" >
-                                    <attributelist id="396" addr="0x7f99f1e1da90" >
+                        <typescopesitem id="392" addr="0x7fca4696ba30" >
+                            <attributelist id="393" addr="0x7fca4696ba30" >
+                                <attribute name="name" value="" id="394" addr="0x7fca46934c90" />
+                                <typetab id="395" addr="0x7fca4696ba90" >
+                                    <attributelist id="396" addr="0x7fca4696ba90" >
                                     </attributelist >
                                 </typetab >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="397" addr="0x7f99f1dd1eb0" >
-                            <attributelist id="398" addr="0x7f99f1dd1eb0" >
+                        <typescopesitem id="397" addr="0x7fca4691feb0" >
+                            <attributelist id="398" addr="0x7fca4691feb0" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="399" addr="0x7f99f1e408b0" >
-                            <attributelist id="400" addr="0x7f99f1e408b0" >
-                                <attribute name="name" value="XBMCAddon" id="401" addr="0x7f99f1de6c90" />
-                                <attribute name="csymtab" value="0x7f99f1e408f0" id="402" addr="0x7f99f1e408f0" />
-                                <attribute name="symtab" value="0x7f99f1e40890" id="403" addr="0x7f99f1e40890" />
+                        <typescopesitem id="399" addr="0x7fca4698e8b0" >
+                            <attributelist id="400" addr="0x7fca4698e8b0" >
+                                <attribute name="name" value="XBMCAddon" id="401" addr="0x7fca46934c90" />
+                                <attribute name="csymtab" value="0x7fca4698e8f0" id="402" addr="0x7fca4698e8f0" />
+                                <attribute name="symtab" value="0x7fca4698e890" id="403" addr="0x7fca4698e890" />
                             </attributelist >
                         </typescopesitem >
                     </typescope >
-                    <attribute name="symtab" value="0x7f99f1e408b0" id="404" addr="0x7f99f1e408b0" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="405" addr="0x7f99f1e1d950" />
+                    <attribute name="symtab" value="0x7fca4698e8b0" id="404" addr="0x7fca4698e8b0" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="405" addr="0x7fca4696b950" />
                 </attributelist >
 
-                <namespace id="406" addr="0x7f99f1e41030" >
-                    <attributelist id="407" addr="0x7f99f1e41030" >
-                        <attribute name="feature_knownbasetypes" value="AddonClass,AddonCallback" id="408" addr="0x7f99f1de6c90" />
-                        <attribute name="name" value="xbmcgui" id="409" addr="0x7f99f1de6c90" />
-                        <attribute name="sym_symtab" value="0x7f99f1e408b0" id="410" addr="0x7f99f1e408b0" />
-                        <attribute name="symtab" value="0x7f99f1e40fb0" id="411" addr="0x7f99f1e40fb0" />
-                        <attribute name="sym_nextSibling" value="0x7f99f1e46490" id="412" addr="0x7f99f1e46490" />
-                        <attribute name="csym_nextSibling" value="0x7f99f1e46490" id="413" addr="0x7f99f1e46490" />
-                        <attribute name="feature_knownapitypes" value="XBMCAddon::xbmc::InfoTagVideo,xbmc::InfoTagMusic" id="414" addr="0x7f99f1de6c90" />
-                        <attribute name="sym_name" value="xbmcgui" id="415" addr="0x7f99f1de6c90" />
-                        <attribute name="sym_overname" value="__SWIG_0" id="416" addr="0x7f99f1de6c90" />
-                        <typescope id="417" addr="0x7f99f1dd2150" >
-                            <attributelist id="418" addr="0x7f99f1dd2150" >
-                                <attribute name="name" value="xbmcgui" id="419" addr="0x7f99f1de6c90" />
-                                <typetab id="420" addr="0x7f99f1dd2170" >
-                                    <attributelist id="421" addr="0x7f99f1dd2170" >
-                                        <attribute name="InterceptorBase" value="InterceptorBase" id="422" addr="0x7f99f1de6c90" />
-                                        <attribute name="Dialog" value="Dialog" id="423" addr="0x7f99f1de6c90" />
-                                        <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="424" addr="0x7f99f1de6c90" />
-                                        <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="425" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlTextBox" value="ControlTextBox" id="426" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlRadioButton" value="ControlRadioButton" id="427" addr="0x7f99f1de6c90" />
-                                        <attribute name="Window" value="Window" id="428" addr="0x7f99f1de6c90" />
-                                        <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="429" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlList" value="ControlList" id="430" addr="0x7f99f1de6c90" />
-                                        <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="431" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlImage" value="ControlImage" id="432" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlButton" value="ControlButton" id="433" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlGroup" value="ControlGroup" id="434" addr="0x7f99f1de6c90" />
-                                        <attribute name="DialogBusy" value="DialogBusy" id="435" addr="0x7f99f1de6c90" />
-                                        <attribute name="DialogProgressBG" value="DialogProgressBG" id="436" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlSpin" value="ControlSpin" id="437" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlEdit" value="ControlEdit" id="438" addr="0x7f99f1de6c90" />
-                                        <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="439" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="440" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlLabel" value="ControlLabel" id="441" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlProgress" value="ControlProgress" id="442" addr="0x7f99f1de6c90" />
-                                        <attribute name="Control" value="Control" id="443" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlSlider" value="ControlSlider" id="444" addr="0x7f99f1de6c90" />
-                                        <attribute name="DialogProgress" value="DialogProgress" id="445" addr="0x7f99f1de6c90" />
-                                        <attribute name="Action" value="Action" id="446" addr="0x7f99f1de6c90" />
-                                        <attribute name="WindowDialog" value="WindowDialog" id="447" addr="0x7f99f1de6c90" />
-                                        <attribute name="WindowXML" value="WindowXML" id="448" addr="0x7f99f1de6c90" />
-                                        <attribute name="ListItem" value="ListItem" id="449" addr="0x7f99f1de6c90" />
-                                        <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="450" addr="0x7f99f1de6c90" />
+                <namespace id="406" addr="0x7fca4698f030" >
+                    <attributelist id="407" addr="0x7fca4698f030" >
+                        <attribute name="feature_knownbasetypes" value="AddonClass,AddonCallback" id="408" addr="0x7fca46934c90" />
+                        <attribute name="name" value="xbmcgui" id="409" addr="0x7fca46934c90" />
+                        <attribute name="sym_symtab" value="0x7fca4698e8b0" id="410" addr="0x7fca4698e8b0" />
+                        <attribute name="symtab" value="0x7fca4698efb0" id="411" addr="0x7fca4698efb0" />
+                        <attribute name="sym_nextSibling" value="0x7fca46994490" id="412" addr="0x7fca46994490" />
+                        <attribute name="csym_nextSibling" value="0x7fca46994490" id="413" addr="0x7fca46994490" />
+                        <attribute name="feature_knownapitypes" value="XBMCAddon::xbmc::InfoTagVideo,xbmc::InfoTagMusic" id="414" addr="0x7fca46934c90" />
+                        <attribute name="sym_name" value="xbmcgui" id="415" addr="0x7fca46934c90" />
+                        <attribute name="sym_overname" value="__SWIG_0" id="416" addr="0x7fca46934c90" />
+                        <typescope id="417" addr="0x7fca46920150" >
+                            <attributelist id="418" addr="0x7fca46920150" >
+                                <attribute name="name" value="xbmcgui" id="419" addr="0x7fca46934c90" />
+                                <typetab id="420" addr="0x7fca46920170" >
+                                    <attributelist id="421" addr="0x7fca46920170" >
+                                        <attribute name="InterceptorBase" value="InterceptorBase" id="422" addr="0x7fca46934c90" />
+                                        <attribute name="Dialog" value="Dialog" id="423" addr="0x7fca46934c90" />
+                                        <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="424" addr="0x7fca46934c90" />
+                                        <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="425" addr="0x7fca46934c90" />
+                                        <attribute name="ControlTextBox" value="ControlTextBox" id="426" addr="0x7fca46934c90" />
+                                        <attribute name="ControlRadioButton" value="ControlRadioButton" id="427" addr="0x7fca46934c90" />
+                                        <attribute name="Window" value="Window" id="428" addr="0x7fca46934c90" />
+                                        <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="429" addr="0x7fca46934c90" />
+                                        <attribute name="ControlList" value="ControlList" id="430" addr="0x7fca46934c90" />
+                                        <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="431" addr="0x7fca46934c90" />
+                                        <attribute name="ControlImage" value="ControlImage" id="432" addr="0x7fca46934c90" />
+                                        <attribute name="ControlButton" value="ControlButton" id="433" addr="0x7fca46934c90" />
+                                        <attribute name="ControlGroup" value="ControlGroup" id="434" addr="0x7fca46934c90" />
+                                        <attribute name="DialogBusy" value="DialogBusy" id="435" addr="0x7fca46934c90" />
+                                        <attribute name="DialogProgressBG" value="DialogProgressBG" id="436" addr="0x7fca46934c90" />
+                                        <attribute name="ControlSpin" value="ControlSpin" id="437" addr="0x7fca46934c90" />
+                                        <attribute name="ControlEdit" value="ControlEdit" id="438" addr="0x7fca46934c90" />
+                                        <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="439" addr="0x7fca46934c90" />
+                                        <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="440" addr="0x7fca46934c90" />
+                                        <attribute name="ControlLabel" value="ControlLabel" id="441" addr="0x7fca46934c90" />
+                                        <attribute name="ControlProgress" value="ControlProgress" id="442" addr="0x7fca46934c90" />
+                                        <attribute name="Control" value="Control" id="443" addr="0x7fca46934c90" />
+                                        <attribute name="ControlSlider" value="ControlSlider" id="444" addr="0x7fca46934c90" />
+                                        <attribute name="DialogProgress" value="DialogProgress" id="445" addr="0x7fca46934c90" />
+                                        <attribute name="Action" value="Action" id="446" addr="0x7fca46934c90" />
+                                        <attribute name="WindowDialog" value="WindowDialog" id="447" addr="0x7fca46934c90" />
+                                        <attribute name="WindowXML" value="WindowXML" id="448" addr="0x7fca46934c90" />
+                                        <attribute name="ListItem" value="ListItem" id="449" addr="0x7fca46934c90" />
+                                        <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="450" addr="0x7fca46934c90" />
                                     </attributelist >
-                                    <typetabsitem id="451" addr="0x7f99f1de1dd0" >
-                                        <attributelist id="452" addr="0x7f99f1de1dd0" >
+                                    <typetabsitem id="451" addr="0x7fca4692fdd0" >
+                                        <attributelist id="452" addr="0x7fca4692fdd0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="453" addr="0x7f99f1dde790" >
-                                        <attributelist id="454" addr="0x7f99f1dde790" >
+                                    <typetabsitem id="453" addr="0x7fca4692c790" >
+                                        <attributelist id="454" addr="0x7fca4692c790" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="455" addr="0x7f99f1de3f10" >
-                                        <attributelist id="456" addr="0x7f99f1de3f10" >
+                                    <typetabsitem id="455" addr="0x7fca46931f10" >
+                                        <attributelist id="456" addr="0x7fca46931f10" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="457" addr="0x7f99f1dd67b0" >
-                                        <attributelist id="458" addr="0x7f99f1dd67b0" >
+                                    <typetabsitem id="457" addr="0x7fca469247b0" >
+                                        <attributelist id="458" addr="0x7fca469247b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="459" addr="0x7f99f1ddafd0" >
-                                        <attributelist id="460" addr="0x7f99f1ddafd0" >
+                                    <typetabsitem id="459" addr="0x7fca46928fd0" >
+                                        <attributelist id="460" addr="0x7fca46928fd0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="461" addr="0x7f99f1ddd430" >
-                                        <attributelist id="462" addr="0x7f99f1ddd430" >
+                                    <typetabsitem id="461" addr="0x7fca4692b430" >
+                                        <attributelist id="462" addr="0x7fca4692b430" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="463" addr="0x7f99f1de2130" >
-                                        <attributelist id="464" addr="0x7f99f1de2130" >
+                                    <typetabsitem id="463" addr="0x7fca46930130" >
+                                        <attributelist id="464" addr="0x7fca46930130" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="465" addr="0x7f99f1dd2f50" >
-                                        <attributelist id="466" addr="0x7f99f1dd2f50" >
+                                    <typetabsitem id="465" addr="0x7fca46920f50" >
+                                        <attributelist id="466" addr="0x7fca46920f50" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="467" addr="0x7f99f1dd9650" >
-                                        <attributelist id="468" addr="0x7f99f1dd9650" >
+                                    <typetabsitem id="467" addr="0x7fca46927650" >
+                                        <attributelist id="468" addr="0x7fca46927650" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="469" addr="0x7f99f1de3390" >
-                                        <attributelist id="470" addr="0x7f99f1de3390" >
+                                    <typetabsitem id="469" addr="0x7fca46931390" >
+                                        <attributelist id="470" addr="0x7fca46931390" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="471" addr="0x7f99f1ddb7b0" >
-                                        <attributelist id="472" addr="0x7f99f1ddb7b0" >
+                                    <typetabsitem id="471" addr="0x7fca469297b0" >
+                                        <attributelist id="472" addr="0x7fca469297b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="473" addr="0x7f99f1ddc4b0" >
-                                        <attributelist id="474" addr="0x7f99f1ddc4b0" >
+                                    <typetabsitem id="473" addr="0x7fca4692a4b0" >
+                                        <attributelist id="474" addr="0x7fca4692a4b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="475" addr="0x7f99f1ddcf90" >
-                                        <attributelist id="476" addr="0x7f99f1ddcf90" >
+                                    <typetabsitem id="475" addr="0x7fca4692af90" >
+                                        <attributelist id="476" addr="0x7fca4692af90" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="477" addr="0x7f99f1de11b0" >
-                                        <attributelist id="478" addr="0x7f99f1de11b0" >
+                                    <typetabsitem id="477" addr="0x7fca4692f1b0" >
+                                        <attributelist id="478" addr="0x7fca4692f1b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="479" addr="0x7f99f1de15b0" >
-                                        <attributelist id="480" addr="0x7f99f1de15b0" >
+                                    <typetabsitem id="479" addr="0x7fca4692f5b0" >
+                                        <attributelist id="480" addr="0x7fca4692f5b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="481" addr="0x7f99f1dd77f0" >
-                                        <attributelist id="482" addr="0x7f99f1dd77f0" >
+                                    <typetabsitem id="481" addr="0x7fca469257f0" >
+                                        <attributelist id="482" addr="0x7fca469257f0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="483" addr="0x7f99f1dd8b30" >
-                                        <attributelist id="484" addr="0x7f99f1dd8b30" >
+                                    <typetabsitem id="483" addr="0x7fca46926b30" >
+                                        <attributelist id="484" addr="0x7fca46926b30" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="485" addr="0x7f99f1dd2c50" >
-                                        <attributelist id="486" addr="0x7f99f1dd2c50" >
+                                    <typetabsitem id="485" addr="0x7fca46920c50" >
+                                        <attributelist id="486" addr="0x7fca46920c50" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="487" addr="0x7f99f1dda790" >
-                                        <attributelist id="488" addr="0x7f99f1dda790" >
+                                    <typetabsitem id="487" addr="0x7fca46928790" >
+                                        <attributelist id="488" addr="0x7fca46928790" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="489" addr="0x7f99f1dd8030" >
-                                        <attributelist id="490" addr="0x7f99f1dd8030" >
+                                    <typetabsitem id="489" addr="0x7fca46926030" >
+                                        <attributelist id="490" addr="0x7fca46926030" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="491" addr="0x7f99f1ddbe10" >
-                                        <attributelist id="492" addr="0x7f99f1ddbe10" >
+                                    <typetabsitem id="491" addr="0x7fca46929e10" >
+                                        <attributelist id="492" addr="0x7fca46929e10" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="493" addr="0x7f99f1dd6b10" >
-                                        <attributelist id="494" addr="0x7f99f1dd6b10" >
+                                    <typetabsitem id="493" addr="0x7fca46924b10" >
+                                        <attributelist id="494" addr="0x7fca46924b10" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="495" addr="0x7f99f1dddf90" >
-                                        <attributelist id="496" addr="0x7f99f1dddf90" >
+                                    <typetabsitem id="495" addr="0x7fca4692bf90" >
+                                        <attributelist id="496" addr="0x7fca4692bf90" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="497" addr="0x7f99f1de0530" >
-                                        <attributelist id="498" addr="0x7f99f1de0530" >
+                                    <typetabsitem id="497" addr="0x7fca4692e530" >
+                                        <attributelist id="498" addr="0x7fca4692e530" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="499" addr="0x7f99f1de1e50" >
-                                        <attributelist id="500" addr="0x7f99f1de1e50" >
+                                    <typetabsitem id="499" addr="0x7fca4692fe50" >
+                                        <attributelist id="500" addr="0x7fca4692fe50" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="501" addr="0x7f99f1de2d90" >
-                                        <attributelist id="502" addr="0x7f99f1de2d90" >
+                                    <typetabsitem id="501" addr="0x7fca46930d90" >
+                                        <attributelist id="502" addr="0x7fca46930d90" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="503" addr="0x7f99f1de3410" >
-                                        <attributelist id="504" addr="0x7f99f1de3410" >
+                                    <typetabsitem id="503" addr="0x7fca46931410" >
+                                        <attributelist id="504" addr="0x7fca46931410" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="505" addr="0x7f99f1dd3590" >
-                                        <attributelist id="506" addr="0x7f99f1dd3590" >
+                                    <typetabsitem id="505" addr="0x7fca46921590" >
+                                        <attributelist id="506" addr="0x7fca46921590" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="507" addr="0x7f99f1dd3390" >
-                                        <attributelist id="508" addr="0x7f99f1dd3390" >
+                                    <typetabsitem id="507" addr="0x7fca46921390" >
+                                        <attributelist id="508" addr="0x7fca46921390" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
-                                <attribute name="parent" value="0x7f99f1dd1d70" id="509" addr="0x7f99f1dd1d70" />
-                                <attribute name="qname" value="XBMCAddon::xbmcgui" id="510" addr="0x7f99f1de6c90" />
-                                <attribute name="symtab" value="0x7f99f1e40fb0" id="511" addr="0x7f99f1e40fb0" />
+                                <attribute name="parent" value="0x7fca4691fd70" id="509" addr="0x7fca4691fd70" />
+                                <attribute name="qname" value="XBMCAddon::xbmcgui" id="510" addr="0x7fca46934c90" />
+                                <attribute name="symtab" value="0x7fca4698efb0" id="511" addr="0x7fca4698efb0" />
                             </attributelist >
-                            <typescopesitem id="512" addr="0x7f99f1e40f70" >
-                                <attributelist id="513" addr="0x7f99f1e40f70" >
+                            <typescopesitem id="512" addr="0x7fca4698ef70" >
+                                <attributelist id="513" addr="0x7fca4698ef70" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="514" addr="0x7f99f1dd2170" >
-                                <attributelist id="515" addr="0x7f99f1dd2170" >
-                                    <attribute name="InterceptorBase" value="InterceptorBase" id="516" addr="0x7f99f1de6c90" />
-                                    <attribute name="Dialog" value="Dialog" id="517" addr="0x7f99f1de6c90" />
-                                    <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="518" addr="0x7f99f1de6c90" />
-                                    <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="519" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlTextBox" value="ControlTextBox" id="520" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlRadioButton" value="ControlRadioButton" id="521" addr="0x7f99f1de6c90" />
-                                    <attribute name="Window" value="Window" id="522" addr="0x7f99f1de6c90" />
-                                    <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="523" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlList" value="ControlList" id="524" addr="0x7f99f1de6c90" />
-                                    <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="525" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlImage" value="ControlImage" id="526" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlButton" value="ControlButton" id="527" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlGroup" value="ControlGroup" id="528" addr="0x7f99f1de6c90" />
-                                    <attribute name="DialogBusy" value="DialogBusy" id="529" addr="0x7f99f1de6c90" />
-                                    <attribute name="DialogProgressBG" value="DialogProgressBG" id="530" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlSpin" value="ControlSpin" id="531" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlEdit" value="ControlEdit" id="532" addr="0x7f99f1de6c90" />
-                                    <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="533" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="534" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlLabel" value="ControlLabel" id="535" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlProgress" value="ControlProgress" id="536" addr="0x7f99f1de6c90" />
-                                    <attribute name="Control" value="Control" id="537" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlSlider" value="ControlSlider" id="538" addr="0x7f99f1de6c90" />
-                                    <attribute name="DialogProgress" value="DialogProgress" id="539" addr="0x7f99f1de6c90" />
-                                    <attribute name="Action" value="Action" id="540" addr="0x7f99f1de6c90" />
-                                    <attribute name="WindowDialog" value="WindowDialog" id="541" addr="0x7f99f1de6c90" />
-                                    <attribute name="WindowXML" value="WindowXML" id="542" addr="0x7f99f1de6c90" />
-                                    <attribute name="ListItem" value="ListItem" id="543" addr="0x7f99f1de6c90" />
-                                    <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="544" addr="0x7f99f1de6c90" />
+                            <typescopesitem id="514" addr="0x7fca46920170" >
+                                <attributelist id="515" addr="0x7fca46920170" >
+                                    <attribute name="InterceptorBase" value="InterceptorBase" id="516" addr="0x7fca46934c90" />
+                                    <attribute name="Dialog" value="Dialog" id="517" addr="0x7fca46934c90" />
+                                    <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="518" addr="0x7fca46934c90" />
+                                    <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="519" addr="0x7fca46934c90" />
+                                    <attribute name="ControlTextBox" value="ControlTextBox" id="520" addr="0x7fca46934c90" />
+                                    <attribute name="ControlRadioButton" value="ControlRadioButton" id="521" addr="0x7fca46934c90" />
+                                    <attribute name="Window" value="Window" id="522" addr="0x7fca46934c90" />
+                                    <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="523" addr="0x7fca46934c90" />
+                                    <attribute name="ControlList" value="ControlList" id="524" addr="0x7fca46934c90" />
+                                    <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="525" addr="0x7fca46934c90" />
+                                    <attribute name="ControlImage" value="ControlImage" id="526" addr="0x7fca46934c90" />
+                                    <attribute name="ControlButton" value="ControlButton" id="527" addr="0x7fca46934c90" />
+                                    <attribute name="ControlGroup" value="ControlGroup" id="528" addr="0x7fca46934c90" />
+                                    <attribute name="DialogBusy" value="DialogBusy" id="529" addr="0x7fca46934c90" />
+                                    <attribute name="DialogProgressBG" value="DialogProgressBG" id="530" addr="0x7fca46934c90" />
+                                    <attribute name="ControlSpin" value="ControlSpin" id="531" addr="0x7fca46934c90" />
+                                    <attribute name="ControlEdit" value="ControlEdit" id="532" addr="0x7fca46934c90" />
+                                    <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="533" addr="0x7fca46934c90" />
+                                    <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="534" addr="0x7fca46934c90" />
+                                    <attribute name="ControlLabel" value="ControlLabel" id="535" addr="0x7fca46934c90" />
+                                    <attribute name="ControlProgress" value="ControlProgress" id="536" addr="0x7fca46934c90" />
+                                    <attribute name="Control" value="Control" id="537" addr="0x7fca46934c90" />
+                                    <attribute name="ControlSlider" value="ControlSlider" id="538" addr="0x7fca46934c90" />
+                                    <attribute name="DialogProgress" value="DialogProgress" id="539" addr="0x7fca46934c90" />
+                                    <attribute name="Action" value="Action" id="540" addr="0x7fca46934c90" />
+                                    <attribute name="WindowDialog" value="WindowDialog" id="541" addr="0x7fca46934c90" />
+                                    <attribute name="WindowXML" value="WindowXML" id="542" addr="0x7fca46934c90" />
+                                    <attribute name="ListItem" value="ListItem" id="543" addr="0x7fca46934c90" />
+                                    <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="544" addr="0x7fca46934c90" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="545" addr="0x7f99f1dd1d70" >
-                                <attributelist id="546" addr="0x7f99f1dd1d70" >
-                                    <attribute name="name" value="XBMCAddon" id="547" addr="0x7f99f1de6c90" />
-                                    <typetab id="548" addr="0x7f99f1dd1db0" >
-                                        <attributelist id="549" addr="0x7f99f1dd1db0" >
-                                            <attribute name="Dictionary" value="Dictionary" id="550" addr="0x7f99f1de6c90" />
-                                            <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="551" addr="0x7f99f1de6c90" />
-                                            <attribute name="String" value="std::string" id="552" addr="0x7f99f1de6c90" />
-                                            <attribute name="StringOrInt" value="XBMCAddon::String" id="553" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                        <typetabsitem id="554" addr="0x7f99f1dd28b0" >
-                                            <attributelist id="555" addr="0x7f99f1dd28b0" >
+                            <typescopesitem id="545" addr="0x7fca4691fd70" >
+                                <attributelist id="546" addr="0x7fca4691fd70" >
+                                    <attribute name="name" value="XBMCAddon" id="547" addr="0x7fca46934c90" />
+                                    <typetab id="548" addr="0x7fca4691fdb0" >
+                                        <attributelist id="549" addr="0x7fca4691fdb0" >
+                                            <attribute name="Dictionary" value="Dictionary" id="550" addr="0x7fca46934c90" />
+                                            <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="551" addr="0x7fca46934c90" />
+                                            <attribute name="String" value="std::string" id="552" addr="0x7fca46934c90" />
+                                            <attribute name="StringOrInt" value="XBMCAddon::String" id="553" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                        <typetabsitem id="554" addr="0x7fca469208b0" >
+                                            <attributelist id="555" addr="0x7fca469208b0" >
                                             </attributelist >
                                         </typetabsitem >
-                                        <typetabsitem id="556" addr="0x7f99f1dd2910" >
-                                            <attributelist id="557" addr="0x7f99f1dd2910" >
+                                        <typetabsitem id="556" addr="0x7fca46920910" >
+                                            <attributelist id="557" addr="0x7fca46920910" >
                                             </attributelist >
                                         </typetabsitem >
-                                        <typetabsitem id="558" addr="0x7f99f1dd1f90" >
-                                            <attributelist id="559" addr="0x7f99f1dd1f90" >
+                                        <typetabsitem id="558" addr="0x7fca4691ff90" >
+                                            <attributelist id="559" addr="0x7fca4691ff90" >
                                             </attributelist >
                                         </typetabsitem >
-                                        <typetabsitem id="560" addr="0x7f99f1dd2710" >
-                                            <attributelist id="561" addr="0x7f99f1dd2710" >
+                                        <typetabsitem id="560" addr="0x7fca46920710" >
+                                            <attributelist id="561" addr="0x7fca46920710" >
                                             </attributelist >
                                         </typetabsitem >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f99f1e1da30" id="562" addr="0x7f99f1e1da30" />
-                                    <attribute name="qname" value="XBMCAddon" id="563" addr="0x7f99f1de6c90" />
-                                    <attribute name="symtab" value="0x7f99f1e408b0" id="564" addr="0x7f99f1e408b0" />
+                                    <attribute name="parent" value="0x7fca4696ba30" id="562" addr="0x7fca4696ba30" />
+                                    <attribute name="qname" value="XBMCAddon" id="563" addr="0x7fca46934c90" />
+                                    <attribute name="symtab" value="0x7fca4698e8b0" id="564" addr="0x7fca4698e8b0" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="565" addr="0x7f99f1dd2190" >
-                                <attributelist id="566" addr="0x7f99f1dd2190" >
+                            <typescopesitem id="565" addr="0x7fca46920190" >
+                                <attributelist id="566" addr="0x7fca46920190" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="567" addr="0x7f99f1e40fb0" >
-                                <attributelist id="568" addr="0x7f99f1e40fb0" >
-                                    <attribute name="name" value="xbmcgui" id="569" addr="0x7f99f1de6c90" />
-                                    <attribute name="csymtab" value="0x7f99f1e40ff0" id="570" addr="0x7f99f1e40ff0" />
-                                    <attribute name="symtab" value="0x7f99f1e40f90" id="571" addr="0x7f99f1e40f90" />
+                            <typescopesitem id="567" addr="0x7fca4698efb0" >
+                                <attributelist id="568" addr="0x7fca4698efb0" >
+                                    <attribute name="name" value="xbmcgui" id="569" addr="0x7fca46934c90" />
+                                    <attribute name="csymtab" value="0x7fca4698eff0" id="570" addr="0x7fca4698eff0" />
+                                    <attribute name="symtab" value="0x7fca4698ef90" id="571" addr="0x7fca4698ef90" />
                                 </attributelist >
                             </typescopesitem >
                         </typescope >
                     </attributelist >
 
-                    <cdecl id="572" addr="0x7f99f1e41150" >
-                        <attributelist id="573" addr="0x7f99f1e41150" >
-                            <attribute name="sym_name" value="getCurrentWindowId" id="574" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="XBMCAddon::xbmcgui::getCurrentWindowId" id="575" addr="0x7f99f1de6c90" />
-                            <attribute name="decl" value="f()." id="576" addr="0x7f99f1de6c90" />
-                            <attribute name="kind" value="function" id="577" addr="0x7f99f1de6c90" />
-                            <attribute name="type" value="long" id="578" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="579" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="580" addr="0x7f99f1de6c90" />
+                    <cdecl id="572" addr="0x7fca4698f150" >
+                        <attributelist id="573" addr="0x7fca4698f150" >
+                            <attribute name="sym_name" value="getCurrentWindowId" id="574" addr="0x7fca46934c90" />
+                            <attribute name="name" value="XBMCAddon::xbmcgui::getCurrentWindowId" id="575" addr="0x7fca46934c90" />
+                            <attribute name="decl" value="f()." id="576" addr="0x7fca46934c90" />
+                            <attribute name="kind" value="function" id="577" addr="0x7fca46934c90" />
+                            <attribute name="type" value="long" id="578" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="579" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="580" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="581" addr="0x7f99f1e412f0" >
-                        <attributelist id="582" addr="0x7f99f1e412f0" >
-                            <attribute name="sym_name" value="getCurrentWindowDialogId" id="583" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="XBMCAddon::xbmcgui::getCurrentWindowDialogId" id="584" addr="0x7f99f1de6c90" />
-                            <attribute name="decl" value="f()." id="585" addr="0x7f99f1de6c90" />
-                            <attribute name="kind" value="function" id="586" addr="0x7f99f1de6c90" />
-                            <attribute name="type" value="long" id="587" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="588" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="589" addr="0x7f99f1de6c90" />
+                    <cdecl id="581" addr="0x7fca4698f2f0" >
+                        <attributelist id="582" addr="0x7fca4698f2f0" >
+                            <attribute name="sym_name" value="getCurrentWindowDialogId" id="583" addr="0x7fca46934c90" />
+                            <attribute name="name" value="XBMCAddon::xbmcgui::getCurrentWindowDialogId" id="584" addr="0x7fca46934c90" />
+                            <attribute name="decl" value="f()." id="585" addr="0x7fca46934c90" />
+                            <attribute name="kind" value="function" id="586" addr="0x7fca46934c90" />
+                            <attribute name="type" value="long" id="587" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="588" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="589" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="590" addr="0x7f99f1e41490" >
-                        <attributelist id="591" addr="0x7f99f1e41490" >
-                            <attribute name="sym_name" value="getScreenHeight" id="592" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="XBMCAddon::xbmcgui::getScreenHeight" id="593" addr="0x7f99f1de6c90" />
-                            <attribute name="decl" value="f()." id="594" addr="0x7f99f1de6c90" />
-                            <attribute name="kind" value="function" id="595" addr="0x7f99f1de6c90" />
-                            <attribute name="type" value="long" id="596" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="597" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="598" addr="0x7f99f1de6c90" />
+                    <cdecl id="590" addr="0x7fca4698f490" >
+                        <attributelist id="591" addr="0x7fca4698f490" >
+                            <attribute name="sym_name" value="getScreenHeight" id="592" addr="0x7fca46934c90" />
+                            <attribute name="name" value="XBMCAddon::xbmcgui::getScreenHeight" id="593" addr="0x7fca46934c90" />
+                            <attribute name="decl" value="f()." id="594" addr="0x7fca46934c90" />
+                            <attribute name="kind" value="function" id="595" addr="0x7fca46934c90" />
+                            <attribute name="type" value="long" id="596" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="597" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="598" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="599" addr="0x7f99f1e41630" >
-                        <attributelist id="600" addr="0x7f99f1e41630" >
-                            <attribute name="sym_name" value="getScreenWidth" id="601" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="XBMCAddon::xbmcgui::getScreenWidth" id="602" addr="0x7f99f1de6c90" />
-                            <attribute name="decl" value="f()." id="603" addr="0x7f99f1de6c90" />
-                            <attribute name="kind" value="function" id="604" addr="0x7f99f1de6c90" />
-                            <attribute name="type" value="long" id="605" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="606" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="607" addr="0x7f99f1de6c90" />
+                    <cdecl id="599" addr="0x7fca4698f630" >
+                        <attributelist id="600" addr="0x7fca4698f630" >
+                            <attribute name="sym_name" value="getScreenWidth" id="601" addr="0x7fca46934c90" />
+                            <attribute name="name" value="XBMCAddon::xbmcgui::getScreenWidth" id="602" addr="0x7fca46934c90" />
+                            <attribute name="decl" value="f()." id="603" addr="0x7fca46934c90" />
+                            <attribute name="kind" value="function" id="604" addr="0x7fca46934c90" />
+                            <attribute name="type" value="long" id="605" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="606" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="607" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </cdecl >
-                    <constant id="608" addr="0x7f99f1e41830" >
-                        <attributelist id="609" addr="0x7f99f1e41830" >
-                            <attribute name="sym_name" value="ICON_OVERLAY_NONE" id="610" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="ICON_OVERLAY_NONE" id="611" addr="0x7f99f1de6c90" />
-                            <attribute name="rawval" value="CGUIListItem::ICON_OVERLAY_NONE" id="612" addr="0x7f99f1de6c90" />
-                            <attribute name="feature_immutable" value="1" id="613" addr="0x7f99f1de6c90" />
-                            <attribute name="value" value="CGUIListItem::ICON_OVERLAY_NONE" id="614" addr="0x7f99f1de6c90" />
-                            <attribute name="storage" value="%constant" id="615" addr="0x7f99f1de6c90" />
-                            <attribute name="type" value="int" id="616" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="617" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="618" addr="0x7f99f1de6c90" />
+                    <constant id="608" addr="0x7fca4698f830" >
+                        <attributelist id="609" addr="0x7fca4698f830" >
+                            <attribute name="sym_name" value="ICON_OVERLAY_NONE" id="610" addr="0x7fca46934c90" />
+                            <attribute name="name" value="ICON_OVERLAY_NONE" id="611" addr="0x7fca46934c90" />
+                            <attribute name="rawval" value="CGUIListItem::ICON_OVERLAY_NONE" id="612" addr="0x7fca46934c90" />
+                            <attribute name="feature_immutable" value="1" id="613" addr="0x7fca46934c90" />
+                            <attribute name="value" value="CGUIListItem::ICON_OVERLAY_NONE" id="614" addr="0x7fca46934c90" />
+                            <attribute name="storage" value="%constant" id="615" addr="0x7fca46934c90" />
+                            <attribute name="type" value="int" id="616" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="617" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="618" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="619" addr="0x7f99f1e41a90" >
-                        <attributelist id="620" addr="0x7f99f1e41a90" >
-                            <attribute name="sym_name" value="ICON_OVERLAY_RAR" id="621" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="ICON_OVERLAY_RAR" id="622" addr="0x7f99f1de6c90" />
-                            <attribute name="rawval" value="CGUIListItem::ICON_OVERLAY_RAR" id="623" addr="0x7f99f1de6c90" />
-                            <attribute name="feature_immutable" value="1" id="624" addr="0x7f99f1de6c90" />
-                            <attribute name="value" value="CGUIListItem::ICON_OVERLAY_RAR" id="625" addr="0x7f99f1de6c90" />
-                            <attribute name="storage" value="%constant" id="626" addr="0x7f99f1de6c90" />
-                            <attribute name="type" value="int" id="627" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="628" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="629" addr="0x7f99f1de6c90" />
+                    <constant id="619" addr="0x7fca4698fa90" >
+                        <attributelist id="620" addr="0x7fca4698fa90" >
+                            <attribute name="sym_name" value="ICON_OVERLAY_RAR" id="621" addr="0x7fca46934c90" />
+                            <attribute name="name" value="ICON_OVERLAY_RAR" id="622" addr="0x7fca46934c90" />
+                            <attribute name="rawval" value="CGUIListItem::ICON_OVERLAY_RAR" id="623" addr="0x7fca46934c90" />
+                            <attribute name="feature_immutable" value="1" id="624" addr="0x7fca46934c90" />
+                            <attribute name="value" value="CGUIListItem::ICON_OVERLAY_RAR" id="625" addr="0x7fca46934c90" />
+                            <attribute name="storage" value="%constant" id="626" addr="0x7fca46934c90" />
+                            <attribute name="type" value="int" id="627" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="628" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="629" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="630" addr="0x7f99f1e41cb0" >
-                        <attributelist id="631" addr="0x7f99f1e41cb0" >
-                            <attribute name="sym_name" value="ICON_OVERLAY_ZIP" id="632" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="ICON_OVERLAY_ZIP" id="633" addr="0x7f99f1de6c90" />
-                            <attribute name="rawval" value="CGUIListItem::ICON_OVERLAY_ZIP" id="634" addr="0x7f99f1de6c90" />
-                            <attribute name="feature_immutable" value="1" id="635" addr="0x7f99f1de6c90" />
-                            <attribute name="value" value="CGUIListItem::ICON_OVERLAY_ZIP" id="636" addr="0x7f99f1de6c90" />
-                            <attribute name="storage" value="%constant" id="637" addr="0x7f99f1de6c90" />
-                            <attribute name="type" value="int" id="638" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="639" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="640" addr="0x7f99f1de6c90" />
+                    <constant id="630" addr="0x7fca4698fcb0" >
+                        <attributelist id="631" addr="0x7fca4698fcb0" >
+                            <attribute name="sym_name" value="ICON_OVERLAY_ZIP" id="632" addr="0x7fca46934c90" />
+                            <attribute name="name" value="ICON_OVERLAY_ZIP" id="633" addr="0x7fca46934c90" />
+                            <attribute name="rawval" value="CGUIListItem::ICON_OVERLAY_ZIP" id="634" addr="0x7fca46934c90" />
+                            <attribute name="feature_immutable" value="1" id="635" addr="0x7fca46934c90" />
+                            <attribute name="value" value="CGUIListItem::ICON_OVERLAY_ZIP" id="636" addr="0x7fca46934c90" />
+                            <attribute name="storage" value="%constant" id="637" addr="0x7fca46934c90" />
+                            <attribute name="type" value="int" id="638" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="639" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="640" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="641" addr="0x7f99f1e41ed0" >
-                        <attributelist id="642" addr="0x7f99f1e41ed0" >
-                            <attribute name="sym_name" value="ICON_OVERLAY_LOCKED" id="643" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="ICON_OVERLAY_LOCKED" id="644" addr="0x7f99f1de6c90" />
-                            <attribute name="rawval" value="CGUIListItem::ICON_OVERLAY_LOCKED" id="645" addr="0x7f99f1de6c90" />
-                            <attribute name="feature_immutable" value="1" id="646" addr="0x7f99f1de6c90" />
-                            <attribute name="value" value="CGUIListItem::ICON_OVERLAY_LOCKED" id="647" addr="0x7f99f1de6c90" />
-                            <attribute name="storage" value="%constant" id="648" addr="0x7f99f1de6c90" />
-                            <attribute name="type" value="int" id="649" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="650" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="651" addr="0x7f99f1de6c90" />
+                    <constant id="641" addr="0x7fca4698fed0" >
+                        <attributelist id="642" addr="0x7fca4698fed0" >
+                            <attribute name="sym_name" value="ICON_OVERLAY_LOCKED" id="643" addr="0x7fca46934c90" />
+                            <attribute name="name" value="ICON_OVERLAY_LOCKED" id="644" addr="0x7fca46934c90" />
+                            <attribute name="rawval" value="CGUIListItem::ICON_OVERLAY_LOCKED" id="645" addr="0x7fca46934c90" />
+                            <attribute name="feature_immutable" value="1" id="646" addr="0x7fca46934c90" />
+                            <attribute name="value" value="CGUIListItem::ICON_OVERLAY_LOCKED" id="647" addr="0x7fca46934c90" />
+                            <attribute name="storage" value="%constant" id="648" addr="0x7fca46934c90" />
+                            <attribute name="type" value="int" id="649" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="650" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="651" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="652" addr="0x7f99f1e420f0" >
-                        <attributelist id="653" addr="0x7f99f1e420f0" >
-                            <attribute name="sym_name" value="ICON_OVERLAY_UNWATCHED" id="654" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="ICON_OVERLAY_UNWATCHED" id="655" addr="0x7f99f1de6c90" />
-                            <attribute name="rawval" value="CGUIListItem::ICON_OVERLAY_UNWATCHED" id="656" addr="0x7f99f1de6c90" />
-                            <attribute name="feature_immutable" value="1" id="657" addr="0x7f99f1de6c90" />
-                            <attribute name="value" value="CGUIListItem::ICON_OVERLAY_UNWATCHED" id="658" addr="0x7f99f1de6c90" />
-                            <attribute name="storage" value="%constant" id="659" addr="0x7f99f1de6c90" />
-                            <attribute name="type" value="int" id="660" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="661" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="662" addr="0x7f99f1de6c90" />
+                    <constant id="652" addr="0x7fca469900f0" >
+                        <attributelist id="653" addr="0x7fca469900f0" >
+                            <attribute name="sym_name" value="ICON_OVERLAY_UNWATCHED" id="654" addr="0x7fca46934c90" />
+                            <attribute name="name" value="ICON_OVERLAY_UNWATCHED" id="655" addr="0x7fca46934c90" />
+                            <attribute name="rawval" value="CGUIListItem::ICON_OVERLAY_UNWATCHED" id="656" addr="0x7fca46934c90" />
+                            <attribute name="feature_immutable" value="1" id="657" addr="0x7fca46934c90" />
+                            <attribute name="value" value="CGUIListItem::ICON_OVERLAY_UNWATCHED" id="658" addr="0x7fca46934c90" />
+                            <attribute name="storage" value="%constant" id="659" addr="0x7fca46934c90" />
+                            <attribute name="type" value="int" id="660" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="661" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="662" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="663" addr="0x7f99f1e42310" >
-                        <attributelist id="664" addr="0x7f99f1e42310" >
-                            <attribute name="sym_name" value="ICON_OVERLAY_WATCHED" id="665" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="ICON_OVERLAY_WATCHED" id="666" addr="0x7f99f1de6c90" />
-                            <attribute name="rawval" value="CGUIListItem::ICON_OVERLAY_WATCHED" id="667" addr="0x7f99f1de6c90" />
-                            <attribute name="feature_immutable" value="1" id="668" addr="0x7f99f1de6c90" />
-                            <attribute name="value" value="CGUIListItem::ICON_OVERLAY_WATCHED" id="669" addr="0x7f99f1de6c90" />
-                            <attribute name="storage" value="%constant" id="670" addr="0x7f99f1de6c90" />
-                            <attribute name="type" value="int" id="671" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="672" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="673" addr="0x7f99f1de6c90" />
+                    <constant id="663" addr="0x7fca46990310" >
+                        <attributelist id="664" addr="0x7fca46990310" >
+                            <attribute name="sym_name" value="ICON_OVERLAY_WATCHED" id="665" addr="0x7fca46934c90" />
+                            <attribute name="name" value="ICON_OVERLAY_WATCHED" id="666" addr="0x7fca46934c90" />
+                            <attribute name="rawval" value="CGUIListItem::ICON_OVERLAY_WATCHED" id="667" addr="0x7fca46934c90" />
+                            <attribute name="feature_immutable" value="1" id="668" addr="0x7fca46934c90" />
+                            <attribute name="value" value="CGUIListItem::ICON_OVERLAY_WATCHED" id="669" addr="0x7fca46934c90" />
+                            <attribute name="storage" value="%constant" id="670" addr="0x7fca46934c90" />
+                            <attribute name="type" value="int" id="671" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="672" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="673" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="674" addr="0x7f99f1e42530" >
-                        <attributelist id="675" addr="0x7f99f1e42530" >
-                            <attribute name="sym_name" value="ICON_OVERLAY_HD" id="676" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="ICON_OVERLAY_HD" id="677" addr="0x7f99f1de6c90" />
-                            <attribute name="rawval" value="CGUIListItem::ICON_OVERLAY_HD" id="678" addr="0x7f99f1de6c90" />
-                            <attribute name="feature_immutable" value="1" id="679" addr="0x7f99f1de6c90" />
-                            <attribute name="value" value="CGUIListItem::ICON_OVERLAY_HD" id="680" addr="0x7f99f1de6c90" />
-                            <attribute name="storage" value="%constant" id="681" addr="0x7f99f1de6c90" />
-                            <attribute name="type" value="int" id="682" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="683" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="684" addr="0x7f99f1de6c90" />
+                    <constant id="674" addr="0x7fca46990530" >
+                        <attributelist id="675" addr="0x7fca46990530" >
+                            <attribute name="sym_name" value="ICON_OVERLAY_HD" id="676" addr="0x7fca46934c90" />
+                            <attribute name="name" value="ICON_OVERLAY_HD" id="677" addr="0x7fca46934c90" />
+                            <attribute name="rawval" value="CGUIListItem::ICON_OVERLAY_HD" id="678" addr="0x7fca46934c90" />
+                            <attribute name="feature_immutable" value="1" id="679" addr="0x7fca46934c90" />
+                            <attribute name="value" value="CGUIListItem::ICON_OVERLAY_HD" id="680" addr="0x7fca46934c90" />
+                            <attribute name="storage" value="%constant" id="681" addr="0x7fca46934c90" />
+                            <attribute name="type" value="int" id="682" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="683" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="684" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="685" addr="0x7f99f1e42750" >
-                        <attributelist id="686" addr="0x7f99f1e42750" >
-                            <attribute name="sym_name" value="INPUT_TYPE_TEXT" id="687" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="INPUT_TYPE_TEXT" id="688" addr="0x7f99f1de6c90" />
-                            <attribute name="rawval" value="CGUIEditControl::INPUT_TYPE_TEXT" id="689" addr="0x7f99f1de6c90" />
-                            <attribute name="feature_immutable" value="1" id="690" addr="0x7f99f1de6c90" />
-                            <attribute name="value" value="CGUIEditControl::INPUT_TYPE_TEXT" id="691" addr="0x7f99f1de6c90" />
-                            <attribute name="storage" value="%constant" id="692" addr="0x7f99f1de6c90" />
-                            <attribute name="type" value="int" id="693" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="694" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="695" addr="0x7f99f1de6c90" />
+                    <constant id="685" addr="0x7fca46990750" >
+                        <attributelist id="686" addr="0x7fca46990750" >
+                            <attribute name="sym_name" value="INPUT_TYPE_TEXT" id="687" addr="0x7fca46934c90" />
+                            <attribute name="name" value="INPUT_TYPE_TEXT" id="688" addr="0x7fca46934c90" />
+                            <attribute name="rawval" value="CGUIEditControl::INPUT_TYPE_TEXT" id="689" addr="0x7fca46934c90" />
+                            <attribute name="feature_immutable" value="1" id="690" addr="0x7fca46934c90" />
+                            <attribute name="value" value="CGUIEditControl::INPUT_TYPE_TEXT" id="691" addr="0x7fca46934c90" />
+                            <attribute name="storage" value="%constant" id="692" addr="0x7fca46934c90" />
+                            <attribute name="type" value="int" id="693" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="694" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="695" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="696" addr="0x7f99f1e42970" >
-                        <attributelist id="697" addr="0x7f99f1e42970" >
-                            <attribute name="sym_name" value="INPUT_TYPE_NUMBER" id="698" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="INPUT_TYPE_NUMBER" id="699" addr="0x7f99f1de6c90" />
-                            <attribute name="rawval" value="CGUIEditControl::INPUT_TYPE_NUMBER" id="700" addr="0x7f99f1de6c90" />
-                            <attribute name="feature_immutable" value="1" id="701" addr="0x7f99f1de6c90" />
-                            <attribute name="value" value="CGUIEditControl::INPUT_TYPE_NUMBER" id="702" addr="0x7f99f1de6c90" />
-                            <attribute name="storage" value="%constant" id="703" addr="0x7f99f1de6c90" />
-                            <attribute name="type" value="int" id="704" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="705" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="706" addr="0x7f99f1de6c90" />
+                    <constant id="696" addr="0x7fca46990970" >
+                        <attributelist id="697" addr="0x7fca46990970" >
+                            <attribute name="sym_name" value="INPUT_TYPE_NUMBER" id="698" addr="0x7fca46934c90" />
+                            <attribute name="name" value="INPUT_TYPE_NUMBER" id="699" addr="0x7fca46934c90" />
+                            <attribute name="rawval" value="CGUIEditControl::INPUT_TYPE_NUMBER" id="700" addr="0x7fca46934c90" />
+                            <attribute name="feature_immutable" value="1" id="701" addr="0x7fca46934c90" />
+                            <attribute name="value" value="CGUIEditControl::INPUT_TYPE_NUMBER" id="702" addr="0x7fca46934c90" />
+                            <attribute name="storage" value="%constant" id="703" addr="0x7fca46934c90" />
+                            <attribute name="type" value="int" id="704" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="705" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="706" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="707" addr="0x7f99f1e42b90" >
-                        <attributelist id="708" addr="0x7f99f1e42b90" >
-                            <attribute name="sym_name" value="INPUT_TYPE_DATE" id="709" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="INPUT_TYPE_DATE" id="710" addr="0x7f99f1de6c90" />
-                            <attribute name="rawval" value="CGUIEditControl::INPUT_TYPE_DATE" id="711" addr="0x7f99f1de6c90" />
-                            <attribute name="feature_immutable" value="1" id="712" addr="0x7f99f1de6c90" />
-                            <attribute name="value" value="CGUIEditControl::INPUT_TYPE_DATE" id="713" addr="0x7f99f1de6c90" />
-                            <attribute name="storage" value="%constant" id="714" addr="0x7f99f1de6c90" />
-                            <attribute name="type" value="int" id="715" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="716" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="717" addr="0x7f99f1de6c90" />
+                    <constant id="707" addr="0x7fca46990b90" >
+                        <attributelist id="708" addr="0x7fca46990b90" >
+                            <attribute name="sym_name" value="INPUT_TYPE_DATE" id="709" addr="0x7fca46934c90" />
+                            <attribute name="name" value="INPUT_TYPE_DATE" id="710" addr="0x7fca46934c90" />
+                            <attribute name="rawval" value="CGUIEditControl::INPUT_TYPE_DATE" id="711" addr="0x7fca46934c90" />
+                            <attribute name="feature_immutable" value="1" id="712" addr="0x7fca46934c90" />
+                            <attribute name="value" value="CGUIEditControl::INPUT_TYPE_DATE" id="713" addr="0x7fca46934c90" />
+                            <attribute name="storage" value="%constant" id="714" addr="0x7fca46934c90" />
+                            <attribute name="type" value="int" id="715" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="716" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="717" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="718" addr="0x7f99f1e42db0" >
-                        <attributelist id="719" addr="0x7f99f1e42db0" >
-                            <attribute name="sym_name" value="INPUT_TYPE_TIME" id="720" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="INPUT_TYPE_TIME" id="721" addr="0x7f99f1de6c90" />
-                            <attribute name="rawval" value="CGUIEditControl::INPUT_TYPE_TIME" id="722" addr="0x7f99f1de6c90" />
-                            <attribute name="feature_immutable" value="1" id="723" addr="0x7f99f1de6c90" />
-                            <attribute name="value" value="CGUIEditControl::INPUT_TYPE_TIME" id="724" addr="0x7f99f1de6c90" />
-                            <attribute name="storage" value="%constant" id="725" addr="0x7f99f1de6c90" />
-                            <attribute name="type" value="int" id="726" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="727" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="728" addr="0x7f99f1de6c90" />
+                    <constant id="718" addr="0x7fca46990db0" >
+                        <attributelist id="719" addr="0x7fca46990db0" >
+                            <attribute name="sym_name" value="INPUT_TYPE_TIME" id="720" addr="0x7fca46934c90" />
+                            <attribute name="name" value="INPUT_TYPE_TIME" id="721" addr="0x7fca46934c90" />
+                            <attribute name="rawval" value="CGUIEditControl::INPUT_TYPE_TIME" id="722" addr="0x7fca46934c90" />
+                            <attribute name="feature_immutable" value="1" id="723" addr="0x7fca46934c90" />
+                            <attribute name="value" value="CGUIEditControl::INPUT_TYPE_TIME" id="724" addr="0x7fca46934c90" />
+                            <attribute name="storage" value="%constant" id="725" addr="0x7fca46934c90" />
+                            <attribute name="type" value="int" id="726" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="727" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="728" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="729" addr="0x7f99f1e42fd0" >
-                        <attributelist id="730" addr="0x7f99f1e42fd0" >
-                            <attribute name="sym_name" value="INPUT_TYPE_IPADDRESS" id="731" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="INPUT_TYPE_IPADDRESS" id="732" addr="0x7f99f1de6c90" />
-                            <attribute name="rawval" value="CGUIEditControl::INPUT_TYPE_IPADDRESS" id="733" addr="0x7f99f1de6c90" />
-                            <attribute name="feature_immutable" value="1" id="734" addr="0x7f99f1de6c90" />
-                            <attribute name="value" value="CGUIEditControl::INPUT_TYPE_IPADDRESS" id="735" addr="0x7f99f1de6c90" />
-                            <attribute name="storage" value="%constant" id="736" addr="0x7f99f1de6c90" />
-                            <attribute name="type" value="int" id="737" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="738" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="739" addr="0x7f99f1de6c90" />
+                    <constant id="729" addr="0x7fca46990fd0" >
+                        <attributelist id="730" addr="0x7fca46990fd0" >
+                            <attribute name="sym_name" value="INPUT_TYPE_IPADDRESS" id="731" addr="0x7fca46934c90" />
+                            <attribute name="name" value="INPUT_TYPE_IPADDRESS" id="732" addr="0x7fca46934c90" />
+                            <attribute name="rawval" value="CGUIEditControl::INPUT_TYPE_IPADDRESS" id="733" addr="0x7fca46934c90" />
+                            <attribute name="feature_immutable" value="1" id="734" addr="0x7fca46934c90" />
+                            <attribute name="value" value="CGUIEditControl::INPUT_TYPE_IPADDRESS" id="735" addr="0x7fca46934c90" />
+                            <attribute name="storage" value="%constant" id="736" addr="0x7fca46934c90" />
+                            <attribute name="type" value="int" id="737" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="738" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="739" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="740" addr="0x7f99f1e431f0" >
-                        <attributelist id="741" addr="0x7f99f1e431f0" >
-                            <attribute name="sym_name" value="INPUT_TYPE_PASSWORD" id="742" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="INPUT_TYPE_PASSWORD" id="743" addr="0x7f99f1de6c90" />
-                            <attribute name="rawval" value="CGUIEditControl::INPUT_TYPE_PASSWORD" id="744" addr="0x7f99f1de6c90" />
-                            <attribute name="feature_immutable" value="1" id="745" addr="0x7f99f1de6c90" />
-                            <attribute name="value" value="CGUIEditControl::INPUT_TYPE_PASSWORD" id="746" addr="0x7f99f1de6c90" />
-                            <attribute name="storage" value="%constant" id="747" addr="0x7f99f1de6c90" />
-                            <attribute name="type" value="int" id="748" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="749" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="750" addr="0x7f99f1de6c90" />
+                    <constant id="740" addr="0x7fca469911f0" >
+                        <attributelist id="741" addr="0x7fca469911f0" >
+                            <attribute name="sym_name" value="INPUT_TYPE_PASSWORD" id="742" addr="0x7fca46934c90" />
+                            <attribute name="name" value="INPUT_TYPE_PASSWORD" id="743" addr="0x7fca46934c90" />
+                            <attribute name="rawval" value="CGUIEditControl::INPUT_TYPE_PASSWORD" id="744" addr="0x7fca46934c90" />
+                            <attribute name="feature_immutable" value="1" id="745" addr="0x7fca46934c90" />
+                            <attribute name="value" value="CGUIEditControl::INPUT_TYPE_PASSWORD" id="746" addr="0x7fca46934c90" />
+                            <attribute name="storage" value="%constant" id="747" addr="0x7fca46934c90" />
+                            <attribute name="type" value="int" id="748" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="749" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="750" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="751" addr="0x7f99f1e43410" >
-                        <attributelist id="752" addr="0x7f99f1e43410" >
-                            <attribute name="sym_name" value="INPUT_TYPE_PASSWORD_MD5" id="753" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="INPUT_TYPE_PASSWORD_MD5" id="754" addr="0x7f99f1de6c90" />
-                            <attribute name="rawval" value="CGUIEditControl::INPUT_TYPE_PASSWORD_MD5" id="755" addr="0x7f99f1de6c90" />
-                            <attribute name="feature_immutable" value="1" id="756" addr="0x7f99f1de6c90" />
-                            <attribute name="value" value="CGUIEditControl::INPUT_TYPE_PASSWORD_MD5" id="757" addr="0x7f99f1de6c90" />
-                            <attribute name="storage" value="%constant" id="758" addr="0x7f99f1de6c90" />
-                            <attribute name="type" value="int" id="759" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="760" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="761" addr="0x7f99f1de6c90" />
+                    <constant id="751" addr="0x7fca46991410" >
+                        <attributelist id="752" addr="0x7fca46991410" >
+                            <attribute name="sym_name" value="INPUT_TYPE_PASSWORD_MD5" id="753" addr="0x7fca46934c90" />
+                            <attribute name="name" value="INPUT_TYPE_PASSWORD_MD5" id="754" addr="0x7fca46934c90" />
+                            <attribute name="rawval" value="CGUIEditControl::INPUT_TYPE_PASSWORD_MD5" id="755" addr="0x7fca46934c90" />
+                            <attribute name="feature_immutable" value="1" id="756" addr="0x7fca46934c90" />
+                            <attribute name="value" value="CGUIEditControl::INPUT_TYPE_PASSWORD_MD5" id="757" addr="0x7fca46934c90" />
+                            <attribute name="storage" value="%constant" id="758" addr="0x7fca46934c90" />
+                            <attribute name="type" value="int" id="759" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="760" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="761" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="762" addr="0x7f99f1e43630" >
-                        <attributelist id="763" addr="0x7f99f1e43630" >
-                            <attribute name="sym_name" value="INPUT_TYPE_SECONDS" id="764" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="INPUT_TYPE_SECONDS" id="765" addr="0x7f99f1de6c90" />
-                            <attribute name="rawval" value="CGUIEditControl::INPUT_TYPE_SECONDS" id="766" addr="0x7f99f1de6c90" />
-                            <attribute name="feature_immutable" value="1" id="767" addr="0x7f99f1de6c90" />
-                            <attribute name="value" value="CGUIEditControl::INPUT_TYPE_SECONDS" id="768" addr="0x7f99f1de6c90" />
-                            <attribute name="storage" value="%constant" id="769" addr="0x7f99f1de6c90" />
-                            <attribute name="type" value="int" id="770" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="771" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="772" addr="0x7f99f1de6c90" />
+                    <constant id="762" addr="0x7fca46991630" >
+                        <attributelist id="763" addr="0x7fca46991630" >
+                            <attribute name="sym_name" value="INPUT_TYPE_SECONDS" id="764" addr="0x7fca46934c90" />
+                            <attribute name="name" value="INPUT_TYPE_SECONDS" id="765" addr="0x7fca46934c90" />
+                            <attribute name="rawval" value="CGUIEditControl::INPUT_TYPE_SECONDS" id="766" addr="0x7fca46934c90" />
+                            <attribute name="feature_immutable" value="1" id="767" addr="0x7fca46934c90" />
+                            <attribute name="value" value="CGUIEditControl::INPUT_TYPE_SECONDS" id="768" addr="0x7fca46934c90" />
+                            <attribute name="storage" value="%constant" id="769" addr="0x7fca46934c90" />
+                            <attribute name="type" value="int" id="770" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="771" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="772" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="773" addr="0x7f99f1e43890" >
-                        <attributelist id="774" addr="0x7f99f1e43890" >
-                            <attribute name="sym_name" value="NOTIFICATION_INFO" id="775" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="NOTIFICATION_INFO" id="776" addr="0x7f99f1de6c90" />
-                            <attribute name="rawval" value="getNOTIFICATION_INFO()" id="777" addr="0x7f99f1de6c90" />
-                            <attribute name="feature_immutable" value="1" id="778" addr="0x7f99f1de6c90" />
-                            <attribute name="value" value="getNOTIFICATION_INFO()" id="779" addr="0x7f99f1de6c90" />
-                            <attribute name="storage" value="%constant" id="780" addr="0x7f99f1de6c90" />
-                            <attribute name="type" value="p.q(const).char" id="781" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="782" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="783" addr="0x7f99f1de6c90" />
+                    <constant id="773" addr="0x7fca46991890" >
+                        <attributelist id="774" addr="0x7fca46991890" >
+                            <attribute name="sym_name" value="NOTIFICATION_INFO" id="775" addr="0x7fca46934c90" />
+                            <attribute name="name" value="NOTIFICATION_INFO" id="776" addr="0x7fca46934c90" />
+                            <attribute name="rawval" value="getNOTIFICATION_INFO()" id="777" addr="0x7fca46934c90" />
+                            <attribute name="feature_immutable" value="1" id="778" addr="0x7fca46934c90" />
+                            <attribute name="value" value="getNOTIFICATION_INFO()" id="779" addr="0x7fca46934c90" />
+                            <attribute name="storage" value="%constant" id="780" addr="0x7fca46934c90" />
+                            <attribute name="type" value="p.q(const).char" id="781" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="782" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="783" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="784" addr="0x7f99f1e43af0" >
-                        <attributelist id="785" addr="0x7f99f1e43af0" >
-                            <attribute name="sym_name" value="NOTIFICATION_WARNING" id="786" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="NOTIFICATION_WARNING" id="787" addr="0x7f99f1de6c90" />
-                            <attribute name="rawval" value="getNOTIFICATION_WARNING()" id="788" addr="0x7f99f1de6c90" />
-                            <attribute name="feature_immutable" value="1" id="789" addr="0x7f99f1de6c90" />
-                            <attribute name="value" value="getNOTIFICATION_WARNING()" id="790" addr="0x7f99f1de6c90" />
-                            <attribute name="storage" value="%constant" id="791" addr="0x7f99f1de6c90" />
-                            <attribute name="type" value="p.q(const).char" id="792" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="793" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="794" addr="0x7f99f1de6c90" />
+                    <constant id="784" addr="0x7fca46991af0" >
+                        <attributelist id="785" addr="0x7fca46991af0" >
+                            <attribute name="sym_name" value="NOTIFICATION_WARNING" id="786" addr="0x7fca46934c90" />
+                            <attribute name="name" value="NOTIFICATION_WARNING" id="787" addr="0x7fca46934c90" />
+                            <attribute name="rawval" value="getNOTIFICATION_WARNING()" id="788" addr="0x7fca46934c90" />
+                            <attribute name="feature_immutable" value="1" id="789" addr="0x7fca46934c90" />
+                            <attribute name="value" value="getNOTIFICATION_WARNING()" id="790" addr="0x7fca46934c90" />
+                            <attribute name="storage" value="%constant" id="791" addr="0x7fca46934c90" />
+                            <attribute name="type" value="p.q(const).char" id="792" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="793" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="794" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="795" addr="0x7f99f1e43d50" >
-                        <attributelist id="796" addr="0x7f99f1e43d50" >
-                            <attribute name="sym_name" value="NOTIFICATION_ERROR" id="797" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="NOTIFICATION_ERROR" id="798" addr="0x7f99f1de6c90" />
-                            <attribute name="rawval" value="getNOTIFICATION_ERROR()" id="799" addr="0x7f99f1de6c90" />
-                            <attribute name="feature_immutable" value="1" id="800" addr="0x7f99f1de6c90" />
-                            <attribute name="value" value="getNOTIFICATION_ERROR()" id="801" addr="0x7f99f1de6c90" />
-                            <attribute name="storage" value="%constant" id="802" addr="0x7f99f1de6c90" />
-                            <attribute name="type" value="p.q(const).char" id="803" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="804" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="805" addr="0x7f99f1de6c90" />
+                    <constant id="795" addr="0x7fca46991d50" >
+                        <attributelist id="796" addr="0x7fca46991d50" >
+                            <attribute name="sym_name" value="NOTIFICATION_ERROR" id="797" addr="0x7fca46934c90" />
+                            <attribute name="name" value="NOTIFICATION_ERROR" id="798" addr="0x7fca46934c90" />
+                            <attribute name="rawval" value="getNOTIFICATION_ERROR()" id="799" addr="0x7fca46934c90" />
+                            <attribute name="feature_immutable" value="1" id="800" addr="0x7fca46934c90" />
+                            <attribute name="value" value="getNOTIFICATION_ERROR()" id="801" addr="0x7fca46934c90" />
+                            <attribute name="storage" value="%constant" id="802" addr="0x7fca46934c90" />
+                            <attribute name="type" value="p.q(const).char" id="803" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="804" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="805" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="806" addr="0x7f99f1e43f50" >
-                        <attributelist id="807" addr="0x7f99f1e43f50" >
-                            <attribute name="sym_name" value="INPUT_ALPHANUM" id="808" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="INPUT_ALPHANUM" id="809" addr="0x7f99f1de6c90" />
-                            <attribute name="rawval" value="INPUT_ALPHANUM" id="810" addr="0x7f99f1de6c90" />
-                            <attribute name="feature_immutable" value="1" id="811" addr="0x7f99f1de6c90" />
-                            <attribute name="value" value="INPUT_ALPHANUM" id="812" addr="0x7f99f1de6c90" />
-                            <attribute name="storage" value="%constant" id="813" addr="0x7f99f1de6c90" />
-                            <attribute name="type" value="int" id="814" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="815" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="816" addr="0x7f99f1de6c90" />
+                    <constant id="806" addr="0x7fca46991f50" >
+                        <attributelist id="807" addr="0x7fca46991f50" >
+                            <attribute name="sym_name" value="INPUT_ALPHANUM" id="808" addr="0x7fca46934c90" />
+                            <attribute name="name" value="INPUT_ALPHANUM" id="809" addr="0x7fca46934c90" />
+                            <attribute name="rawval" value="INPUT_ALPHANUM" id="810" addr="0x7fca46934c90" />
+                            <attribute name="feature_immutable" value="1" id="811" addr="0x7fca46934c90" />
+                            <attribute name="value" value="INPUT_ALPHANUM" id="812" addr="0x7fca46934c90" />
+                            <attribute name="storage" value="%constant" id="813" addr="0x7fca46934c90" />
+                            <attribute name="type" value="int" id="814" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="815" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="816" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="817" addr="0x7f99f1e44150" >
-                        <attributelist id="818" addr="0x7f99f1e44150" >
-                            <attribute name="sym_name" value="INPUT_NUMERIC" id="819" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="INPUT_NUMERIC" id="820" addr="0x7f99f1de6c90" />
-                            <attribute name="rawval" value="INPUT_NUMERIC" id="821" addr="0x7f99f1de6c90" />
-                            <attribute name="feature_immutable" value="1" id="822" addr="0x7f99f1de6c90" />
-                            <attribute name="value" value="INPUT_NUMERIC" id="823" addr="0x7f99f1de6c90" />
-                            <attribute name="storage" value="%constant" id="824" addr="0x7f99f1de6c90" />
-                            <attribute name="type" value="int" id="825" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="826" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="827" addr="0x7f99f1de6c90" />
+                    <constant id="817" addr="0x7fca46992150" >
+                        <attributelist id="818" addr="0x7fca46992150" >
+                            <attribute name="sym_name" value="INPUT_NUMERIC" id="819" addr="0x7fca46934c90" />
+                            <attribute name="name" value="INPUT_NUMERIC" id="820" addr="0x7fca46934c90" />
+                            <attribute name="rawval" value="INPUT_NUMERIC" id="821" addr="0x7fca46934c90" />
+                            <attribute name="feature_immutable" value="1" id="822" addr="0x7fca46934c90" />
+                            <attribute name="value" value="INPUT_NUMERIC" id="823" addr="0x7fca46934c90" />
+                            <attribute name="storage" value="%constant" id="824" addr="0x7fca46934c90" />
+                            <attribute name="type" value="int" id="825" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="826" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="827" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="828" addr="0x7f99f1e44350" >
-                        <attributelist id="829" addr="0x7f99f1e44350" >
-                            <attribute name="sym_name" value="INPUT_DATE" id="830" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="INPUT_DATE" id="831" addr="0x7f99f1de6c90" />
-                            <attribute name="rawval" value="INPUT_DATE" id="832" addr="0x7f99f1de6c90" />
-                            <attribute name="feature_immutable" value="1" id="833" addr="0x7f99f1de6c90" />
-                            <attribute name="value" value="INPUT_DATE" id="834" addr="0x7f99f1de6c90" />
-                            <attribute name="storage" value="%constant" id="835" addr="0x7f99f1de6c90" />
-                            <attribute name="type" value="int" id="836" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="837" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="838" addr="0x7f99f1de6c90" />
+                    <constant id="828" addr="0x7fca46992350" >
+                        <attributelist id="829" addr="0x7fca46992350" >
+                            <attribute name="sym_name" value="INPUT_DATE" id="830" addr="0x7fca46934c90" />
+                            <attribute name="name" value="INPUT_DATE" id="831" addr="0x7fca46934c90" />
+                            <attribute name="rawval" value="INPUT_DATE" id="832" addr="0x7fca46934c90" />
+                            <attribute name="feature_immutable" value="1" id="833" addr="0x7fca46934c90" />
+                            <attribute name="value" value="INPUT_DATE" id="834" addr="0x7fca46934c90" />
+                            <attribute name="storage" value="%constant" id="835" addr="0x7fca46934c90" />
+                            <attribute name="type" value="int" id="836" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="837" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="838" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="839" addr="0x7f99f1e44550" >
-                        <attributelist id="840" addr="0x7f99f1e44550" >
-                            <attribute name="sym_name" value="INPUT_TIME" id="841" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="INPUT_TIME" id="842" addr="0x7f99f1de6c90" />
-                            <attribute name="rawval" value="INPUT_TIME" id="843" addr="0x7f99f1de6c90" />
-                            <attribute name="feature_immutable" value="1" id="844" addr="0x7f99f1de6c90" />
-                            <attribute name="value" value="INPUT_TIME" id="845" addr="0x7f99f1de6c90" />
-                            <attribute name="storage" value="%constant" id="846" addr="0x7f99f1de6c90" />
-                            <attribute name="type" value="int" id="847" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="848" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="849" addr="0x7f99f1de6c90" />
+                    <constant id="839" addr="0x7fca46992550" >
+                        <attributelist id="840" addr="0x7fca46992550" >
+                            <attribute name="sym_name" value="INPUT_TIME" id="841" addr="0x7fca46934c90" />
+                            <attribute name="name" value="INPUT_TIME" id="842" addr="0x7fca46934c90" />
+                            <attribute name="rawval" value="INPUT_TIME" id="843" addr="0x7fca46934c90" />
+                            <attribute name="feature_immutable" value="1" id="844" addr="0x7fca46934c90" />
+                            <attribute name="value" value="INPUT_TIME" id="845" addr="0x7fca46934c90" />
+                            <attribute name="storage" value="%constant" id="846" addr="0x7fca46934c90" />
+                            <attribute name="type" value="int" id="847" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="848" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="849" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="850" addr="0x7f99f1e44750" >
-                        <attributelist id="851" addr="0x7f99f1e44750" >
-                            <attribute name="sym_name" value="INPUT_IPADDRESS" id="852" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="INPUT_IPADDRESS" id="853" addr="0x7f99f1de6c90" />
-                            <attribute name="rawval" value="INPUT_IPADDRESS" id="854" addr="0x7f99f1de6c90" />
-                            <attribute name="feature_immutable" value="1" id="855" addr="0x7f99f1de6c90" />
-                            <attribute name="value" value="INPUT_IPADDRESS" id="856" addr="0x7f99f1de6c90" />
-                            <attribute name="storage" value="%constant" id="857" addr="0x7f99f1de6c90" />
-                            <attribute name="type" value="int" id="858" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="859" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="860" addr="0x7f99f1de6c90" />
+                    <constant id="850" addr="0x7fca46992750" >
+                        <attributelist id="851" addr="0x7fca46992750" >
+                            <attribute name="sym_name" value="INPUT_IPADDRESS" id="852" addr="0x7fca46934c90" />
+                            <attribute name="name" value="INPUT_IPADDRESS" id="853" addr="0x7fca46934c90" />
+                            <attribute name="rawval" value="INPUT_IPADDRESS" id="854" addr="0x7fca46934c90" />
+                            <attribute name="feature_immutable" value="1" id="855" addr="0x7fca46934c90" />
+                            <attribute name="value" value="INPUT_IPADDRESS" id="856" addr="0x7fca46934c90" />
+                            <attribute name="storage" value="%constant" id="857" addr="0x7fca46934c90" />
+                            <attribute name="type" value="int" id="858" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="859" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="860" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="861" addr="0x7f99f1e44950" >
-                        <attributelist id="862" addr="0x7f99f1e44950" >
-                            <attribute name="sym_name" value="INPUT_PASSWORD" id="863" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="INPUT_PASSWORD" id="864" addr="0x7f99f1de6c90" />
-                            <attribute name="rawval" value="INPUT_PASSWORD" id="865" addr="0x7f99f1de6c90" />
-                            <attribute name="feature_immutable" value="1" id="866" addr="0x7f99f1de6c90" />
-                            <attribute name="value" value="INPUT_PASSWORD" id="867" addr="0x7f99f1de6c90" />
-                            <attribute name="storage" value="%constant" id="868" addr="0x7f99f1de6c90" />
-                            <attribute name="type" value="int" id="869" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="870" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="871" addr="0x7f99f1de6c90" />
+                    <constant id="861" addr="0x7fca46992950" >
+                        <attributelist id="862" addr="0x7fca46992950" >
+                            <attribute name="sym_name" value="INPUT_PASSWORD" id="863" addr="0x7fca46934c90" />
+                            <attribute name="name" value="INPUT_PASSWORD" id="864" addr="0x7fca46934c90" />
+                            <attribute name="rawval" value="INPUT_PASSWORD" id="865" addr="0x7fca46934c90" />
+                            <attribute name="feature_immutable" value="1" id="866" addr="0x7fca46934c90" />
+                            <attribute name="value" value="INPUT_PASSWORD" id="867" addr="0x7fca46934c90" />
+                            <attribute name="storage" value="%constant" id="868" addr="0x7fca46934c90" />
+                            <attribute name="type" value="int" id="869" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="870" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="871" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="872" addr="0x7f99f1e44b50" >
-                        <attributelist id="873" addr="0x7f99f1e44b50" >
-                            <attribute name="sym_name" value="HORIZONTAL" id="874" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="HORIZONTAL" id="875" addr="0x7f99f1de6c90" />
-                            <attribute name="rawval" value="HORIZONTAL" id="876" addr="0x7f99f1de6c90" />
-                            <attribute name="feature_immutable" value="1" id="877" addr="0x7f99f1de6c90" />
-                            <attribute name="value" value="HORIZONTAL" id="878" addr="0x7f99f1de6c90" />
-                            <attribute name="storage" value="%constant" id="879" addr="0x7f99f1de6c90" />
-                            <attribute name="type" value="int" id="880" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="881" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="882" addr="0x7f99f1de6c90" />
+                    <constant id="872" addr="0x7fca46992b50" >
+                        <attributelist id="873" addr="0x7fca46992b50" >
+                            <attribute name="sym_name" value="HORIZONTAL" id="874" addr="0x7fca46934c90" />
+                            <attribute name="name" value="HORIZONTAL" id="875" addr="0x7fca46934c90" />
+                            <attribute name="rawval" value="HORIZONTAL" id="876" addr="0x7fca46934c90" />
+                            <attribute name="feature_immutable" value="1" id="877" addr="0x7fca46934c90" />
+                            <attribute name="value" value="HORIZONTAL" id="878" addr="0x7fca46934c90" />
+                            <attribute name="storage" value="%constant" id="879" addr="0x7fca46934c90" />
+                            <attribute name="type" value="int" id="880" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="881" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="882" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="883" addr="0x7f99f1e44d50" >
-                        <attributelist id="884" addr="0x7f99f1e44d50" >
-                            <attribute name="sym_name" value="VERTICAL" id="885" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="VERTICAL" id="886" addr="0x7f99f1de6c90" />
-                            <attribute name="rawval" value="VERTICAL" id="887" addr="0x7f99f1de6c90" />
-                            <attribute name="feature_immutable" value="1" id="888" addr="0x7f99f1de6c90" />
-                            <attribute name="value" value="VERTICAL" id="889" addr="0x7f99f1de6c90" />
-                            <attribute name="storage" value="%constant" id="890" addr="0x7f99f1de6c90" />
-                            <attribute name="type" value="int" id="891" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="892" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="893" addr="0x7f99f1de6c90" />
+                    <constant id="883" addr="0x7fca46992d50" >
+                        <attributelist id="884" addr="0x7fca46992d50" >
+                            <attribute name="sym_name" value="VERTICAL" id="885" addr="0x7fca46934c90" />
+                            <attribute name="name" value="VERTICAL" id="886" addr="0x7fca46934c90" />
+                            <attribute name="rawval" value="VERTICAL" id="887" addr="0x7fca46934c90" />
+                            <attribute name="feature_immutable" value="1" id="888" addr="0x7fca46934c90" />
+                            <attribute name="value" value="VERTICAL" id="889" addr="0x7fca46934c90" />
+                            <attribute name="storage" value="%constant" id="890" addr="0x7fca46934c90" />
+                            <attribute name="type" value="int" id="891" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="892" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="893" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="894" addr="0x7f99f1e44f50" >
-                        <attributelist id="895" addr="0x7f99f1e44f50" >
-                            <attribute name="sym_name" value="PASSWORD_VERIFY" id="896" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="PASSWORD_VERIFY" id="897" addr="0x7f99f1de6c90" />
-                            <attribute name="rawval" value="PASSWORD_VERIFY" id="898" addr="0x7f99f1de6c90" />
-                            <attribute name="feature_immutable" value="1" id="899" addr="0x7f99f1de6c90" />
-                            <attribute name="value" value="PASSWORD_VERIFY" id="900" addr="0x7f99f1de6c90" />
-                            <attribute name="storage" value="%constant" id="901" addr="0x7f99f1de6c90" />
-                            <attribute name="type" value="int" id="902" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="903" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="904" addr="0x7f99f1de6c90" />
+                    <constant id="894" addr="0x7fca46992f50" >
+                        <attributelist id="895" addr="0x7fca46992f50" >
+                            <attribute name="sym_name" value="PASSWORD_VERIFY" id="896" addr="0x7fca46934c90" />
+                            <attribute name="name" value="PASSWORD_VERIFY" id="897" addr="0x7fca46934c90" />
+                            <attribute name="rawval" value="PASSWORD_VERIFY" id="898" addr="0x7fca46934c90" />
+                            <attribute name="feature_immutable" value="1" id="899" addr="0x7fca46934c90" />
+                            <attribute name="value" value="PASSWORD_VERIFY" id="900" addr="0x7fca46934c90" />
+                            <attribute name="storage" value="%constant" id="901" addr="0x7fca46934c90" />
+                            <attribute name="type" value="int" id="902" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="903" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="904" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="905" addr="0x7f99f1e45150" >
-                        <attributelist id="906" addr="0x7f99f1e45150" >
-                            <attribute name="sym_name" value="ALPHANUM_HIDE_INPUT" id="907" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="ALPHANUM_HIDE_INPUT" id="908" addr="0x7f99f1de6c90" />
-                            <attribute name="rawval" value="ALPHANUM_HIDE_INPUT" id="909" addr="0x7f99f1de6c90" />
-                            <attribute name="feature_immutable" value="1" id="910" addr="0x7f99f1de6c90" />
-                            <attribute name="value" value="ALPHANUM_HIDE_INPUT" id="911" addr="0x7f99f1de6c90" />
-                            <attribute name="storage" value="%constant" id="912" addr="0x7f99f1de6c90" />
-                            <attribute name="type" value="int" id="913" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="914" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="915" addr="0x7f99f1de6c90" />
+                    <constant id="905" addr="0x7fca46993150" >
+                        <attributelist id="906" addr="0x7fca46993150" >
+                            <attribute name="sym_name" value="ALPHANUM_HIDE_INPUT" id="907" addr="0x7fca46934c90" />
+                            <attribute name="name" value="ALPHANUM_HIDE_INPUT" id="908" addr="0x7fca46934c90" />
+                            <attribute name="rawval" value="ALPHANUM_HIDE_INPUT" id="909" addr="0x7fca46934c90" />
+                            <attribute name="feature_immutable" value="1" id="910" addr="0x7fca46934c90" />
+                            <attribute name="value" value="ALPHANUM_HIDE_INPUT" id="911" addr="0x7fca46934c90" />
+                            <attribute name="storage" value="%constant" id="912" addr="0x7fca46934c90" />
+                            <attribute name="type" value="int" id="913" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="914" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="915" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </constant >
                 </namespace >
             </namespace >
         </include >
-        <include id="916" addr="0x7f99f1e45350" >
-            <attributelist id="917" addr="0x7f99f1e45350" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/Exception.h" id="918" addr="0x7f99f1de6c90" />
+        <include id="916" addr="0x7fca46993350" >
+            <attributelist id="917" addr="0x7fca46993350" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/Exception.h" id="918" addr="0x7fca46934c90" />
             </attributelist >
          
         </include >
-        <include id="919" addr="0x7f99f1e453d0" >
-            <attributelist id="920" addr="0x7f99f1e453d0" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/Dictionary.h" id="921" addr="0x7f99f1de6c90" />
+        <include id="919" addr="0x7fca469933d0" >
+            <attributelist id="920" addr="0x7fca469933d0" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/Dictionary.h" id="921" addr="0x7fca46934c90" />
             </attributelist >
 
-            <namespace id="922" addr="0x7f99f1e45470" >
-                <attributelist id="923" addr="0x7f99f1e45470" >
-                    <attribute name="sym_name" value="XBMCAddon" id="924" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="XBMCAddon" id="925" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_previousSibling" value="0x7f99f1e40f10" id="926" addr="0x7f99f1e40f10" />
-                    <attribute name="csym_nextSibling" value="0x7f99f1e462b0" id="927" addr="0x7f99f1e462b0" />
-                    <attribute name="sym_nextSibling" value="0x7f99f1e462b0" id="928" addr="0x7f99f1e462b0" />
-                    <typescope id="929" addr="0x7f99f1dd1d70" >
-                        <attributelist id="930" addr="0x7f99f1dd1d70" >
-                            <attribute name="name" value="XBMCAddon" id="931" addr="0x7f99f1de6c90" />
-                            <typetab id="932" addr="0x7f99f1dd1db0" >
-                                <attributelist id="933" addr="0x7f99f1dd1db0" >
-                                    <attribute name="Dictionary" value="Dictionary" id="934" addr="0x7f99f1de6c90" />
-                                    <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="935" addr="0x7f99f1de6c90" />
-                                    <attribute name="String" value="std::string" id="936" addr="0x7f99f1de6c90" />
-                                    <attribute name="StringOrInt" value="XBMCAddon::String" id="937" addr="0x7f99f1de6c90" />
+            <namespace id="922" addr="0x7fca46993470" >
+                <attributelist id="923" addr="0x7fca46993470" >
+                    <attribute name="sym_name" value="XBMCAddon" id="924" addr="0x7fca46934c90" />
+                    <attribute name="name" value="XBMCAddon" id="925" addr="0x7fca46934c90" />
+                    <attribute name="sym_previousSibling" value="0x7fca4698ef10" id="926" addr="0x7fca4698ef10" />
+                    <attribute name="csym_nextSibling" value="0x7fca469942b0" id="927" addr="0x7fca469942b0" />
+                    <attribute name="sym_nextSibling" value="0x7fca469942b0" id="928" addr="0x7fca469942b0" />
+                    <typescope id="929" addr="0x7fca4691fd70" >
+                        <attributelist id="930" addr="0x7fca4691fd70" >
+                            <attribute name="name" value="XBMCAddon" id="931" addr="0x7fca46934c90" />
+                            <typetab id="932" addr="0x7fca4691fdb0" >
+                                <attributelist id="933" addr="0x7fca4691fdb0" >
+                                    <attribute name="Dictionary" value="Dictionary" id="934" addr="0x7fca46934c90" />
+                                    <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="935" addr="0x7fca46934c90" />
+                                    <attribute name="String" value="std::string" id="936" addr="0x7fca46934c90" />
+                                    <attribute name="StringOrInt" value="XBMCAddon::String" id="937" addr="0x7fca46934c90" />
                                 </attributelist >
-                                <typetabsitem id="938" addr="0x7f99f1dd28b0" >
-                                    <attributelist id="939" addr="0x7f99f1dd28b0" >
+                                <typetabsitem id="938" addr="0x7fca469208b0" >
+                                    <attributelist id="939" addr="0x7fca469208b0" >
                                     </attributelist >
                                 </typetabsitem >
-                                <typetabsitem id="940" addr="0x7f99f1dd2910" >
-                                    <attributelist id="941" addr="0x7f99f1dd2910" >
+                                <typetabsitem id="940" addr="0x7fca46920910" >
+                                    <attributelist id="941" addr="0x7fca46920910" >
                                     </attributelist >
                                 </typetabsitem >
-                                <typetabsitem id="942" addr="0x7f99f1dd1f90" >
-                                    <attributelist id="943" addr="0x7f99f1dd1f90" >
+                                <typetabsitem id="942" addr="0x7fca4691ff90" >
+                                    <attributelist id="943" addr="0x7fca4691ff90" >
                                     </attributelist >
                                 </typetabsitem >
-                                <typetabsitem id="944" addr="0x7f99f1dd2710" >
-                                    <attributelist id="945" addr="0x7f99f1dd2710" >
+                                <typetabsitem id="944" addr="0x7fca46920710" >
+                                    <attributelist id="945" addr="0x7fca46920710" >
                                     </attributelist >
                                 </typetabsitem >
                             </typetab >
-                            <attribute name="parent" value="0x7f99f1e1da30" id="946" addr="0x7f99f1e1da30" />
-                            <attribute name="qname" value="XBMCAddon" id="947" addr="0x7f99f1de6c90" />
-                            <attribute name="symtab" value="0x7f99f1e408b0" id="948" addr="0x7f99f1e408b0" />
+                            <attribute name="parent" value="0x7fca4696ba30" id="946" addr="0x7fca4696ba30" />
+                            <attribute name="qname" value="XBMCAddon" id="947" addr="0x7fca46934c90" />
+                            <attribute name="symtab" value="0x7fca4698e8b0" id="948" addr="0x7fca4698e8b0" />
                         </attributelist >
-                        <typescopesitem id="949" addr="0x7f99f1e40870" >
-                            <attributelist id="950" addr="0x7f99f1e40870" >
+                        <typescopesitem id="949" addr="0x7fca4698e870" >
+                            <attributelist id="950" addr="0x7fca4698e870" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="951" addr="0x7f99f1dd1db0" >
-                            <attributelist id="952" addr="0x7f99f1dd1db0" >
-                                <attribute name="Dictionary" value="Dictionary" id="953" addr="0x7f99f1de6c90" />
-                                <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="954" addr="0x7f99f1de6c90" />
-                                <attribute name="String" value="std::string" id="955" addr="0x7f99f1de6c90" />
-                                <attribute name="StringOrInt" value="XBMCAddon::String" id="956" addr="0x7f99f1de6c90" />
+                        <typescopesitem id="951" addr="0x7fca4691fdb0" >
+                            <attributelist id="952" addr="0x7fca4691fdb0" >
+                                <attribute name="Dictionary" value="Dictionary" id="953" addr="0x7fca46934c90" />
+                                <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="954" addr="0x7fca46934c90" />
+                                <attribute name="String" value="std::string" id="955" addr="0x7fca46934c90" />
+                                <attribute name="StringOrInt" value="XBMCAddon::String" id="956" addr="0x7fca46934c90" />
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="957" addr="0x7f99f1e1da30" >
-                            <attributelist id="958" addr="0x7f99f1e1da30" >
-                                <attribute name="name" value="" id="959" addr="0x7f99f1de6c90" />
-                                <typetab id="960" addr="0x7f99f1e1da90" >
-                                    <attributelist id="961" addr="0x7f99f1e1da90" >
+                        <typescopesitem id="957" addr="0x7fca4696ba30" >
+                            <attributelist id="958" addr="0x7fca4696ba30" >
+                                <attribute name="name" value="" id="959" addr="0x7fca46934c90" />
+                                <typetab id="960" addr="0x7fca4696ba90" >
+                                    <attributelist id="961" addr="0x7fca4696ba90" >
                                     </attributelist >
                                 </typetab >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="962" addr="0x7f99f1dd1eb0" >
-                            <attributelist id="963" addr="0x7f99f1dd1eb0" >
+                        <typescopesitem id="962" addr="0x7fca4691feb0" >
+                            <attributelist id="963" addr="0x7fca4691feb0" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="964" addr="0x7f99f1e408b0" >
-                            <attributelist id="965" addr="0x7f99f1e408b0" >
-                                <attribute name="name" value="XBMCAddon" id="966" addr="0x7f99f1de6c90" />
-                                <attribute name="csymtab" value="0x7f99f1e408f0" id="967" addr="0x7f99f1e408f0" />
-                                <attribute name="symtab" value="0x7f99f1e40890" id="968" addr="0x7f99f1e40890" />
+                        <typescopesitem id="964" addr="0x7fca4698e8b0" >
+                            <attributelist id="965" addr="0x7fca4698e8b0" >
+                                <attribute name="name" value="XBMCAddon" id="966" addr="0x7fca46934c90" />
+                                <attribute name="csymtab" value="0x7fca4698e8f0" id="967" addr="0x7fca4698e8f0" />
+                                <attribute name="symtab" value="0x7fca4698e890" id="968" addr="0x7fca4698e890" />
                             </attributelist >
                         </typescopesitem >
                     </typescope >
-                    <attribute name="symtab" value="0x7f99f1e408b0" id="969" addr="0x7f99f1e408b0" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="970" addr="0x7f99f1e1d950" />
+                    <attribute name="symtab" value="0x7fca4698e8b0" id="969" addr="0x7fca4698e8b0" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="970" addr="0x7fca4696b950" />
                 </attributelist >
 
-                <cdecl id="971" addr="0x7f99f1e45570" >
-                    <attributelist id="972" addr="0x7f99f1e45570" >
-                        <attribute name="sym_name" value="StringOrInt" id="973" addr="0x7f99f1de6c90" />
-                        <attribute name="name" value="XBMCAddon::StringOrInt" id="974" addr="0x7f99f1de6c90" />
-                        <attribute name="decl" value="" id="975" addr="0x7f99f1de6c90" />
-                        <attribute name="storage" value="typedef" id="976" addr="0x7f99f1de6c90" />
-                        <attribute name="kind" value="typedef" id="977" addr="0x7f99f1de6c90" />
-                        <attribute name="type" value="XBMCAddon::String" id="978" addr="0x7f99f1de6c90" />
-                        <attribute name="sym_symtab" value="0x7f99f1e408b0" id="979" addr="0x7f99f1e408b0" />
-                        <attribute name="sym_overname" value="__SWIG_0" id="980" addr="0x7f99f1de6c90" />
+                <cdecl id="971" addr="0x7fca46993570" >
+                    <attributelist id="972" addr="0x7fca46993570" >
+                        <attribute name="sym_name" value="StringOrInt" id="973" addr="0x7fca46934c90" />
+                        <attribute name="name" value="XBMCAddon::StringOrInt" id="974" addr="0x7fca46934c90" />
+                        <attribute name="decl" value="" id="975" addr="0x7fca46934c90" />
+                        <attribute name="storage" value="typedef" id="976" addr="0x7fca46934c90" />
+                        <attribute name="kind" value="typedef" id="977" addr="0x7fca46934c90" />
+                        <attribute name="type" value="XBMCAddon::String" id="978" addr="0x7fca46934c90" />
+                        <attribute name="sym_symtab" value="0x7fca4698e8b0" id="979" addr="0x7fca4698e8b0" />
+                        <attribute name="sym_overname" value="__SWIG_0" id="980" addr="0x7fca46934c90" />
                     </attributelist >
                  
                 </cdecl >
-                <template id="981" addr="0x7f99f1e45a70" >
-                    <attributelist id="982" addr="0x7f99f1e45a70" >
-                        <attribute name="templatetype" value="class" id="983" addr="0x7f99f1de6c90" />
-                        <attribute name="sym_typename" value="1" id="984" addr="0x7f99f1de6c90" />
-                        <attribute name="name" value="Dictionary" id="985" addr="0x7f99f1de6c90" />
-                        <attribute name="sym_symtab" value="0x7f99f1e408b0" id="986" addr="0x7f99f1e408b0" />
-                        <attribute name="symtab" value="0x7f99f1e45c10" id="987" addr="0x7f99f1e45c10" />
-                        <attribute name="allows_typedef" value="1" id="988" addr="0x7f99f1de6c90" />
-                        <attribute name="kind" value="class" id="989" addr="0x7f99f1de6c90" />
-                        <attribute name="sym_name" value="Dictionary" id="990" addr="0x7f99f1de6c90" />
-                        <attribute name="privatebaselist" value="0x7f99f1e459f0" id="991" addr="0x7f99f1e459f0" />
-                        <attribute name="protectedbaselist" value="0x7f99f1e459d0" id="992" addr="0x7f99f1e459d0" />
-                        <baselist id="993" addr="0x7f99f1e459b0" >
-                            <base name="std::map&lt;(String,T)>" id="994" addr="0x7f99f1e45930" />
+                <template id="981" addr="0x7fca46993a70" >
+                    <attributelist id="982" addr="0x7fca46993a70" >
+                        <attribute name="templatetype" value="class" id="983" addr="0x7fca46934c90" />
+                        <attribute name="sym_typename" value="1" id="984" addr="0x7fca46934c90" />
+                        <attribute name="name" value="Dictionary" id="985" addr="0x7fca46934c90" />
+                        <attribute name="sym_symtab" value="0x7fca4698e8b0" id="986" addr="0x7fca4698e8b0" />
+                        <attribute name="symtab" value="0x7fca46993c10" id="987" addr="0x7fca46993c10" />
+                        <attribute name="allows_typedef" value="1" id="988" addr="0x7fca46934c90" />
+                        <attribute name="kind" value="class" id="989" addr="0x7fca46934c90" />
+                        <attribute name="sym_name" value="Dictionary" id="990" addr="0x7fca46934c90" />
+                        <attribute name="privatebaselist" value="0x7fca469939f0" id="991" addr="0x7fca469939f0" />
+                        <attribute name="protectedbaselist" value="0x7fca469939d0" id="992" addr="0x7fca469939d0" />
+                        <baselist id="993" addr="0x7fca469939b0" >
+                            <base name="std::map&lt;(String,T)>" id="994" addr="0x7fca46993930" />
                         </baselist >
-                        <attribute name="sym_overname" value="__SWIG_0" id="995" addr="0x7f99f1de6c90" />
-                        <templateparms id="996" addr="0x7f99f1e456b0" >
+                        <attribute name="sym_overname" value="__SWIG_0" id="995" addr="0x7fca46934c90" />
+                        <templateparms id="996" addr="0x7fca469936b0" >
                             <parm id="997">
-                                <attributelist id="998" addr="0x7f99f1e456b0" >
-                                    <attribute name="name" value="T" id="999" addr="0x7f99f1de6c90" />
-                                    <attribute name="type" value="class T" id="1000" addr="0x7f99f1de6c90" />
+                                <attributelist id="998" addr="0x7fca469936b0" >
+                                    <attribute name="name" value="T" id="999" addr="0x7fca46934c90" />
+                                    <attribute name="type" value="class T" id="1000" addr="0x7fca46934c90" />
                                 </attributelist >
                             </parm >
                         </templateparms >
                     </attributelist >
 
-                    <access id="1001" addr="0x7f99f1e45d50" >
-                        <attributelist id="1002" addr="0x7f99f1e45d50" >
-                            <attribute name="kind" value="public" id="1003" addr="0x7f99f1de6c90" />
+                    <access id="1001" addr="0x7fca46993d50" >
+                        <attributelist id="1002" addr="0x7fca46993d50" >
+                            <attribute name="kind" value="public" id="1003" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </access >
                 </template >
-                <cdecl id="1004" addr="0x7f99f1e46070" >
-                    <attributelist id="1005" addr="0x7f99f1e46070" >
-                        <attribute name="sym_name" value="Properties" id="1006" addr="0x7f99f1de6c90" />
-                        <attribute name="name" value="XBMCAddon::Properties" id="1007" addr="0x7f99f1de6c90" />
-                        <attribute name="decl" value="" id="1008" addr="0x7f99f1de6c90" />
-                        <attribute name="storage" value="typedef" id="1009" addr="0x7f99f1de6c90" />
-                        <attribute name="kind" value="typedef" id="1010" addr="0x7f99f1de6c90" />
-                        <attribute name="type" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="1011" addr="0x7f99f1de6c90" />
-                        <attribute name="sym_symtab" value="0x7f99f1e408b0" id="1012" addr="0x7f99f1e408b0" />
-                        <attribute name="sym_overname" value="__SWIG_0" id="1013" addr="0x7f99f1de6c90" />
+                <cdecl id="1004" addr="0x7fca46994070" >
+                    <attributelist id="1005" addr="0x7fca46994070" >
+                        <attribute name="sym_name" value="Properties" id="1006" addr="0x7fca46934c90" />
+                        <attribute name="name" value="XBMCAddon::Properties" id="1007" addr="0x7fca46934c90" />
+                        <attribute name="decl" value="" id="1008" addr="0x7fca46934c90" />
+                        <attribute name="storage" value="typedef" id="1009" addr="0x7fca46934c90" />
+                        <attribute name="kind" value="typedef" id="1010" addr="0x7fca46934c90" />
+                        <attribute name="type" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="1011" addr="0x7fca46934c90" />
+                        <attribute name="sym_symtab" value="0x7fca4698e8b0" id="1012" addr="0x7fca4698e8b0" />
+                        <attribute name="sym_overname" value="__SWIG_0" id="1013" addr="0x7fca46934c90" />
                     </attributelist >
                  
                 </cdecl >
             </namespace >
         </include >
-        <include id="1014" addr="0x7f99f1e46450" >
-            <attributelist id="1015" addr="0x7f99f1e46450" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/ListItem.h" id="1016" addr="0x7f99f1de6c90" />
+        <include id="1014" addr="0x7fca46994450" >
+            <attributelist id="1015" addr="0x7fca46994450" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/ListItem.h" id="1016" addr="0x7fca46934c90" />
             </attributelist >
 
-            <namespace id="1017" addr="0x7f99f1e462b0" >
-                <attributelist id="1018" addr="0x7f99f1e462b0" >
-                    <attribute name="sym_name" value="XBMCAddon" id="1019" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="XBMCAddon" id="1020" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_previousSibling" value="0x7f99f1e45470" id="1021" addr="0x7f99f1e45470" />
-                    <attribute name="csym_nextSibling" value="0x7f99f1e54770" id="1022" addr="0x7f99f1e54770" />
-                    <attribute name="sym_nextSibling" value="0x7f99f1e54770" id="1023" addr="0x7f99f1e54770" />
-                    <typescope id="1024" addr="0x7f99f1dd1d70" >
-                        <attributelist id="1025" addr="0x7f99f1dd1d70" >
-                            <attribute name="name" value="XBMCAddon" id="1026" addr="0x7f99f1de6c90" />
-                            <typetab id="1027" addr="0x7f99f1dd1db0" >
-                                <attributelist id="1028" addr="0x7f99f1dd1db0" >
-                                    <attribute name="Dictionary" value="Dictionary" id="1029" addr="0x7f99f1de6c90" />
-                                    <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="1030" addr="0x7f99f1de6c90" />
-                                    <attribute name="String" value="std::string" id="1031" addr="0x7f99f1de6c90" />
-                                    <attribute name="StringOrInt" value="XBMCAddon::String" id="1032" addr="0x7f99f1de6c90" />
+            <namespace id="1017" addr="0x7fca469942b0" >
+                <attributelist id="1018" addr="0x7fca469942b0" >
+                    <attribute name="sym_name" value="XBMCAddon" id="1019" addr="0x7fca46934c90" />
+                    <attribute name="name" value="XBMCAddon" id="1020" addr="0x7fca46934c90" />
+                    <attribute name="sym_previousSibling" value="0x7fca46993470" id="1021" addr="0x7fca46993470" />
+                    <attribute name="csym_nextSibling" value="0x7fca469a2770" id="1022" addr="0x7fca469a2770" />
+                    <attribute name="sym_nextSibling" value="0x7fca469a2770" id="1023" addr="0x7fca469a2770" />
+                    <typescope id="1024" addr="0x7fca4691fd70" >
+                        <attributelist id="1025" addr="0x7fca4691fd70" >
+                            <attribute name="name" value="XBMCAddon" id="1026" addr="0x7fca46934c90" />
+                            <typetab id="1027" addr="0x7fca4691fdb0" >
+                                <attributelist id="1028" addr="0x7fca4691fdb0" >
+                                    <attribute name="Dictionary" value="Dictionary" id="1029" addr="0x7fca46934c90" />
+                                    <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="1030" addr="0x7fca46934c90" />
+                                    <attribute name="String" value="std::string" id="1031" addr="0x7fca46934c90" />
+                                    <attribute name="StringOrInt" value="XBMCAddon::String" id="1032" addr="0x7fca46934c90" />
                                 </attributelist >
-                                <typetabsitem id="1033" addr="0x7f99f1dd28b0" >
-                                    <attributelist id="1034" addr="0x7f99f1dd28b0" >
+                                <typetabsitem id="1033" addr="0x7fca469208b0" >
+                                    <attributelist id="1034" addr="0x7fca469208b0" >
                                     </attributelist >
                                 </typetabsitem >
-                                <typetabsitem id="1035" addr="0x7f99f1dd2910" >
-                                    <attributelist id="1036" addr="0x7f99f1dd2910" >
+                                <typetabsitem id="1035" addr="0x7fca46920910" >
+                                    <attributelist id="1036" addr="0x7fca46920910" >
                                     </attributelist >
                                 </typetabsitem >
-                                <typetabsitem id="1037" addr="0x7f99f1dd1f90" >
-                                    <attributelist id="1038" addr="0x7f99f1dd1f90" >
+                                <typetabsitem id="1037" addr="0x7fca4691ff90" >
+                                    <attributelist id="1038" addr="0x7fca4691ff90" >
                                     </attributelist >
                                 </typetabsitem >
-                                <typetabsitem id="1039" addr="0x7f99f1dd2710" >
-                                    <attributelist id="1040" addr="0x7f99f1dd2710" >
+                                <typetabsitem id="1039" addr="0x7fca46920710" >
+                                    <attributelist id="1040" addr="0x7fca46920710" >
                                     </attributelist >
                                 </typetabsitem >
                             </typetab >
-                            <attribute name="parent" value="0x7f99f1e1da30" id="1041" addr="0x7f99f1e1da30" />
-                            <attribute name="qname" value="XBMCAddon" id="1042" addr="0x7f99f1de6c90" />
-                            <attribute name="symtab" value="0x7f99f1e408b0" id="1043" addr="0x7f99f1e408b0" />
+                            <attribute name="parent" value="0x7fca4696ba30" id="1041" addr="0x7fca4696ba30" />
+                            <attribute name="qname" value="XBMCAddon" id="1042" addr="0x7fca46934c90" />
+                            <attribute name="symtab" value="0x7fca4698e8b0" id="1043" addr="0x7fca4698e8b0" />
                         </attributelist >
-                        <typescopesitem id="1044" addr="0x7f99f1e40870" >
-                            <attributelist id="1045" addr="0x7f99f1e40870" >
+                        <typescopesitem id="1044" addr="0x7fca4698e870" >
+                            <attributelist id="1045" addr="0x7fca4698e870" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="1046" addr="0x7f99f1dd1db0" >
-                            <attributelist id="1047" addr="0x7f99f1dd1db0" >
-                                <attribute name="Dictionary" value="Dictionary" id="1048" addr="0x7f99f1de6c90" />
-                                <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="1049" addr="0x7f99f1de6c90" />
-                                <attribute name="String" value="std::string" id="1050" addr="0x7f99f1de6c90" />
-                                <attribute name="StringOrInt" value="XBMCAddon::String" id="1051" addr="0x7f99f1de6c90" />
+                        <typescopesitem id="1046" addr="0x7fca4691fdb0" >
+                            <attributelist id="1047" addr="0x7fca4691fdb0" >
+                                <attribute name="Dictionary" value="Dictionary" id="1048" addr="0x7fca46934c90" />
+                                <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="1049" addr="0x7fca46934c90" />
+                                <attribute name="String" value="std::string" id="1050" addr="0x7fca46934c90" />
+                                <attribute name="StringOrInt" value="XBMCAddon::String" id="1051" addr="0x7fca46934c90" />
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="1052" addr="0x7f99f1e1da30" >
-                            <attributelist id="1053" addr="0x7f99f1e1da30" >
-                                <attribute name="name" value="" id="1054" addr="0x7f99f1de6c90" />
-                                <typetab id="1055" addr="0x7f99f1e1da90" >
-                                    <attributelist id="1056" addr="0x7f99f1e1da90" >
+                        <typescopesitem id="1052" addr="0x7fca4696ba30" >
+                            <attributelist id="1053" addr="0x7fca4696ba30" >
+                                <attribute name="name" value="" id="1054" addr="0x7fca46934c90" />
+                                <typetab id="1055" addr="0x7fca4696ba90" >
+                                    <attributelist id="1056" addr="0x7fca4696ba90" >
                                     </attributelist >
                                 </typetab >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="1057" addr="0x7f99f1dd1eb0" >
-                            <attributelist id="1058" addr="0x7f99f1dd1eb0" >
+                        <typescopesitem id="1057" addr="0x7fca4691feb0" >
+                            <attributelist id="1058" addr="0x7fca4691feb0" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="1059" addr="0x7f99f1e408b0" >
-                            <attributelist id="1060" addr="0x7f99f1e408b0" >
-                                <attribute name="name" value="XBMCAddon" id="1061" addr="0x7f99f1de6c90" />
-                                <attribute name="csymtab" value="0x7f99f1e408f0" id="1062" addr="0x7f99f1e408f0" />
-                                <attribute name="symtab" value="0x7f99f1e40890" id="1063" addr="0x7f99f1e40890" />
+                        <typescopesitem id="1059" addr="0x7fca4698e8b0" >
+                            <attributelist id="1060" addr="0x7fca4698e8b0" >
+                                <attribute name="name" value="XBMCAddon" id="1061" addr="0x7fca46934c90" />
+                                <attribute name="csymtab" value="0x7fca4698e8f0" id="1062" addr="0x7fca4698e8f0" />
+                                <attribute name="symtab" value="0x7fca4698e890" id="1063" addr="0x7fca4698e890" />
                             </attributelist >
                         </typescopesitem >
                     </typescope >
-                    <attribute name="symtab" value="0x7f99f1e408b0" id="1064" addr="0x7f99f1e408b0" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="1065" addr="0x7f99f1e1d950" />
+                    <attribute name="symtab" value="0x7fca4698e8b0" id="1064" addr="0x7fca4698e8b0" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="1065" addr="0x7fca4696b950" />
                 </attributelist >
 
-                <namespace id="1066" addr="0x7f99f1e46490" >
-                    <attributelist id="1067" addr="0x7f99f1e46490" >
-                        <attribute name="feature_knownbasetypes" value="AddonClass,AddonCallback" id="1068" addr="0x7f99f1de6c90" />
-                        <attribute name="name" value="xbmcgui" id="1069" addr="0x7f99f1de6c90" />
-                        <attribute name="sym_symtab" value="0x7f99f1e408b0" id="1070" addr="0x7f99f1e408b0" />
-                        <attribute name="symtab" value="0x7f99f1e40fb0" id="1071" addr="0x7f99f1e40fb0" />
-                        <attribute name="sym_nextSibling" value="0x7f99f1e547f0" id="1072" addr="0x7f99f1e547f0" />
-                        <attribute name="csym_nextSibling" value="0x7f99f1e547f0" id="1073" addr="0x7f99f1e547f0" />
-                        <attribute name="sym_previousSibling" value="0x7f99f1e41030" id="1074" addr="0x7f99f1e41030" />
-                        <attribute name="feature_knownapitypes" value="XBMCAddon::xbmc::InfoTagVideo,xbmc::InfoTagMusic" id="1075" addr="0x7f99f1de6c90" />
-                        <attribute name="sym_name" value="xbmcgui" id="1076" addr="0x7f99f1de6c90" />
-                        <typescope id="1077" addr="0x7f99f1dd2150" >
-                            <attributelist id="1078" addr="0x7f99f1dd2150" >
-                                <attribute name="name" value="xbmcgui" id="1079" addr="0x7f99f1de6c90" />
-                                <typetab id="1080" addr="0x7f99f1dd2170" >
-                                    <attributelist id="1081" addr="0x7f99f1dd2170" >
-                                        <attribute name="InterceptorBase" value="InterceptorBase" id="1082" addr="0x7f99f1de6c90" />
-                                        <attribute name="Dialog" value="Dialog" id="1083" addr="0x7f99f1de6c90" />
-                                        <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="1084" addr="0x7f99f1de6c90" />
-                                        <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="1085" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlTextBox" value="ControlTextBox" id="1086" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlRadioButton" value="ControlRadioButton" id="1087" addr="0x7f99f1de6c90" />
-                                        <attribute name="Window" value="Window" id="1088" addr="0x7f99f1de6c90" />
-                                        <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="1089" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlList" value="ControlList" id="1090" addr="0x7f99f1de6c90" />
-                                        <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="1091" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlImage" value="ControlImage" id="1092" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlButton" value="ControlButton" id="1093" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlGroup" value="ControlGroup" id="1094" addr="0x7f99f1de6c90" />
-                                        <attribute name="DialogBusy" value="DialogBusy" id="1095" addr="0x7f99f1de6c90" />
-                                        <attribute name="DialogProgressBG" value="DialogProgressBG" id="1096" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlSpin" value="ControlSpin" id="1097" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlEdit" value="ControlEdit" id="1098" addr="0x7f99f1de6c90" />
-                                        <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="1099" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="1100" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlLabel" value="ControlLabel" id="1101" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlProgress" value="ControlProgress" id="1102" addr="0x7f99f1de6c90" />
-                                        <attribute name="Control" value="Control" id="1103" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlSlider" value="ControlSlider" id="1104" addr="0x7f99f1de6c90" />
-                                        <attribute name="DialogProgress" value="DialogProgress" id="1105" addr="0x7f99f1de6c90" />
-                                        <attribute name="Action" value="Action" id="1106" addr="0x7f99f1de6c90" />
-                                        <attribute name="WindowDialog" value="WindowDialog" id="1107" addr="0x7f99f1de6c90" />
-                                        <attribute name="WindowXML" value="WindowXML" id="1108" addr="0x7f99f1de6c90" />
-                                        <attribute name="ListItem" value="ListItem" id="1109" addr="0x7f99f1de6c90" />
-                                        <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="1110" addr="0x7f99f1de6c90" />
+                <namespace id="1066" addr="0x7fca46994490" >
+                    <attributelist id="1067" addr="0x7fca46994490" >
+                        <attribute name="feature_knownbasetypes" value="AddonClass,AddonCallback" id="1068" addr="0x7fca46934c90" />
+                        <attribute name="name" value="xbmcgui" id="1069" addr="0x7fca46934c90" />
+                        <attribute name="sym_symtab" value="0x7fca4698e8b0" id="1070" addr="0x7fca4698e8b0" />
+                        <attribute name="symtab" value="0x7fca4698efb0" id="1071" addr="0x7fca4698efb0" />
+                        <attribute name="sym_nextSibling" value="0x7fca469a27f0" id="1072" addr="0x7fca469a27f0" />
+                        <attribute name="csym_nextSibling" value="0x7fca469a27f0" id="1073" addr="0x7fca469a27f0" />
+                        <attribute name="sym_previousSibling" value="0x7fca4698f030" id="1074" addr="0x7fca4698f030" />
+                        <attribute name="feature_knownapitypes" value="XBMCAddon::xbmc::InfoTagVideo,xbmc::InfoTagMusic" id="1075" addr="0x7fca46934c90" />
+                        <attribute name="sym_name" value="xbmcgui" id="1076" addr="0x7fca46934c90" />
+                        <typescope id="1077" addr="0x7fca46920150" >
+                            <attributelist id="1078" addr="0x7fca46920150" >
+                                <attribute name="name" value="xbmcgui" id="1079" addr="0x7fca46934c90" />
+                                <typetab id="1080" addr="0x7fca46920170" >
+                                    <attributelist id="1081" addr="0x7fca46920170" >
+                                        <attribute name="InterceptorBase" value="InterceptorBase" id="1082" addr="0x7fca46934c90" />
+                                        <attribute name="Dialog" value="Dialog" id="1083" addr="0x7fca46934c90" />
+                                        <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="1084" addr="0x7fca46934c90" />
+                                        <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="1085" addr="0x7fca46934c90" />
+                                        <attribute name="ControlTextBox" value="ControlTextBox" id="1086" addr="0x7fca46934c90" />
+                                        <attribute name="ControlRadioButton" value="ControlRadioButton" id="1087" addr="0x7fca46934c90" />
+                                        <attribute name="Window" value="Window" id="1088" addr="0x7fca46934c90" />
+                                        <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="1089" addr="0x7fca46934c90" />
+                                        <attribute name="ControlList" value="ControlList" id="1090" addr="0x7fca46934c90" />
+                                        <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="1091" addr="0x7fca46934c90" />
+                                        <attribute name="ControlImage" value="ControlImage" id="1092" addr="0x7fca46934c90" />
+                                        <attribute name="ControlButton" value="ControlButton" id="1093" addr="0x7fca46934c90" />
+                                        <attribute name="ControlGroup" value="ControlGroup" id="1094" addr="0x7fca46934c90" />
+                                        <attribute name="DialogBusy" value="DialogBusy" id="1095" addr="0x7fca46934c90" />
+                                        <attribute name="DialogProgressBG" value="DialogProgressBG" id="1096" addr="0x7fca46934c90" />
+                                        <attribute name="ControlSpin" value="ControlSpin" id="1097" addr="0x7fca46934c90" />
+                                        <attribute name="ControlEdit" value="ControlEdit" id="1098" addr="0x7fca46934c90" />
+                                        <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="1099" addr="0x7fca46934c90" />
+                                        <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="1100" addr="0x7fca46934c90" />
+                                        <attribute name="ControlLabel" value="ControlLabel" id="1101" addr="0x7fca46934c90" />
+                                        <attribute name="ControlProgress" value="ControlProgress" id="1102" addr="0x7fca46934c90" />
+                                        <attribute name="Control" value="Control" id="1103" addr="0x7fca46934c90" />
+                                        <attribute name="ControlSlider" value="ControlSlider" id="1104" addr="0x7fca46934c90" />
+                                        <attribute name="DialogProgress" value="DialogProgress" id="1105" addr="0x7fca46934c90" />
+                                        <attribute name="Action" value="Action" id="1106" addr="0x7fca46934c90" />
+                                        <attribute name="WindowDialog" value="WindowDialog" id="1107" addr="0x7fca46934c90" />
+                                        <attribute name="WindowXML" value="WindowXML" id="1108" addr="0x7fca46934c90" />
+                                        <attribute name="ListItem" value="ListItem" id="1109" addr="0x7fca46934c90" />
+                                        <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="1110" addr="0x7fca46934c90" />
                                     </attributelist >
-                                    <typetabsitem id="1111" addr="0x7f99f1de1dd0" >
-                                        <attributelist id="1112" addr="0x7f99f1de1dd0" >
+                                    <typetabsitem id="1111" addr="0x7fca4692fdd0" >
+                                        <attributelist id="1112" addr="0x7fca4692fdd0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1113" addr="0x7f99f1dde790" >
-                                        <attributelist id="1114" addr="0x7f99f1dde790" >
+                                    <typetabsitem id="1113" addr="0x7fca4692c790" >
+                                        <attributelist id="1114" addr="0x7fca4692c790" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1115" addr="0x7f99f1de3f10" >
-                                        <attributelist id="1116" addr="0x7f99f1de3f10" >
+                                    <typetabsitem id="1115" addr="0x7fca46931f10" >
+                                        <attributelist id="1116" addr="0x7fca46931f10" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1117" addr="0x7f99f1dd67b0" >
-                                        <attributelist id="1118" addr="0x7f99f1dd67b0" >
+                                    <typetabsitem id="1117" addr="0x7fca469247b0" >
+                                        <attributelist id="1118" addr="0x7fca469247b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1119" addr="0x7f99f1ddafd0" >
-                                        <attributelist id="1120" addr="0x7f99f1ddafd0" >
+                                    <typetabsitem id="1119" addr="0x7fca46928fd0" >
+                                        <attributelist id="1120" addr="0x7fca46928fd0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1121" addr="0x7f99f1ddd430" >
-                                        <attributelist id="1122" addr="0x7f99f1ddd430" >
+                                    <typetabsitem id="1121" addr="0x7fca4692b430" >
+                                        <attributelist id="1122" addr="0x7fca4692b430" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1123" addr="0x7f99f1de2130" >
-                                        <attributelist id="1124" addr="0x7f99f1de2130" >
+                                    <typetabsitem id="1123" addr="0x7fca46930130" >
+                                        <attributelist id="1124" addr="0x7fca46930130" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1125" addr="0x7f99f1dd2f50" >
-                                        <attributelist id="1126" addr="0x7f99f1dd2f50" >
+                                    <typetabsitem id="1125" addr="0x7fca46920f50" >
+                                        <attributelist id="1126" addr="0x7fca46920f50" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1127" addr="0x7f99f1dd9650" >
-                                        <attributelist id="1128" addr="0x7f99f1dd9650" >
+                                    <typetabsitem id="1127" addr="0x7fca46927650" >
+                                        <attributelist id="1128" addr="0x7fca46927650" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1129" addr="0x7f99f1de3390" >
-                                        <attributelist id="1130" addr="0x7f99f1de3390" >
+                                    <typetabsitem id="1129" addr="0x7fca46931390" >
+                                        <attributelist id="1130" addr="0x7fca46931390" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1131" addr="0x7f99f1ddb7b0" >
-                                        <attributelist id="1132" addr="0x7f99f1ddb7b0" >
+                                    <typetabsitem id="1131" addr="0x7fca469297b0" >
+                                        <attributelist id="1132" addr="0x7fca469297b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1133" addr="0x7f99f1ddc4b0" >
-                                        <attributelist id="1134" addr="0x7f99f1ddc4b0" >
+                                    <typetabsitem id="1133" addr="0x7fca4692a4b0" >
+                                        <attributelist id="1134" addr="0x7fca4692a4b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1135" addr="0x7f99f1ddcf90" >
-                                        <attributelist id="1136" addr="0x7f99f1ddcf90" >
+                                    <typetabsitem id="1135" addr="0x7fca4692af90" >
+                                        <attributelist id="1136" addr="0x7fca4692af90" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1137" addr="0x7f99f1de11b0" >
-                                        <attributelist id="1138" addr="0x7f99f1de11b0" >
+                                    <typetabsitem id="1137" addr="0x7fca4692f1b0" >
+                                        <attributelist id="1138" addr="0x7fca4692f1b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1139" addr="0x7f99f1de15b0" >
-                                        <attributelist id="1140" addr="0x7f99f1de15b0" >
+                                    <typetabsitem id="1139" addr="0x7fca4692f5b0" >
+                                        <attributelist id="1140" addr="0x7fca4692f5b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1141" addr="0x7f99f1dd77f0" >
-                                        <attributelist id="1142" addr="0x7f99f1dd77f0" >
+                                    <typetabsitem id="1141" addr="0x7fca469257f0" >
+                                        <attributelist id="1142" addr="0x7fca469257f0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1143" addr="0x7f99f1dd8b30" >
-                                        <attributelist id="1144" addr="0x7f99f1dd8b30" >
+                                    <typetabsitem id="1143" addr="0x7fca46926b30" >
+                                        <attributelist id="1144" addr="0x7fca46926b30" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1145" addr="0x7f99f1dd2c50" >
-                                        <attributelist id="1146" addr="0x7f99f1dd2c50" >
+                                    <typetabsitem id="1145" addr="0x7fca46920c50" >
+                                        <attributelist id="1146" addr="0x7fca46920c50" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1147" addr="0x7f99f1dda790" >
-                                        <attributelist id="1148" addr="0x7f99f1dda790" >
+                                    <typetabsitem id="1147" addr="0x7fca46928790" >
+                                        <attributelist id="1148" addr="0x7fca46928790" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1149" addr="0x7f99f1dd8030" >
-                                        <attributelist id="1150" addr="0x7f99f1dd8030" >
+                                    <typetabsitem id="1149" addr="0x7fca46926030" >
+                                        <attributelist id="1150" addr="0x7fca46926030" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1151" addr="0x7f99f1ddbe10" >
-                                        <attributelist id="1152" addr="0x7f99f1ddbe10" >
+                                    <typetabsitem id="1151" addr="0x7fca46929e10" >
+                                        <attributelist id="1152" addr="0x7fca46929e10" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1153" addr="0x7f99f1dd6b10" >
-                                        <attributelist id="1154" addr="0x7f99f1dd6b10" >
+                                    <typetabsitem id="1153" addr="0x7fca46924b10" >
+                                        <attributelist id="1154" addr="0x7fca46924b10" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1155" addr="0x7f99f1dddf90" >
-                                        <attributelist id="1156" addr="0x7f99f1dddf90" >
+                                    <typetabsitem id="1155" addr="0x7fca4692bf90" >
+                                        <attributelist id="1156" addr="0x7fca4692bf90" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1157" addr="0x7f99f1de0530" >
-                                        <attributelist id="1158" addr="0x7f99f1de0530" >
+                                    <typetabsitem id="1157" addr="0x7fca4692e530" >
+                                        <attributelist id="1158" addr="0x7fca4692e530" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1159" addr="0x7f99f1de1e50" >
-                                        <attributelist id="1160" addr="0x7f99f1de1e50" >
+                                    <typetabsitem id="1159" addr="0x7fca4692fe50" >
+                                        <attributelist id="1160" addr="0x7fca4692fe50" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1161" addr="0x7f99f1de2d90" >
-                                        <attributelist id="1162" addr="0x7f99f1de2d90" >
+                                    <typetabsitem id="1161" addr="0x7fca46930d90" >
+                                        <attributelist id="1162" addr="0x7fca46930d90" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1163" addr="0x7f99f1de3410" >
-                                        <attributelist id="1164" addr="0x7f99f1de3410" >
+                                    <typetabsitem id="1163" addr="0x7fca46931410" >
+                                        <attributelist id="1164" addr="0x7fca46931410" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1165" addr="0x7f99f1dd3590" >
-                                        <attributelist id="1166" addr="0x7f99f1dd3590" >
+                                    <typetabsitem id="1165" addr="0x7fca46921590" >
+                                        <attributelist id="1166" addr="0x7fca46921590" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1167" addr="0x7f99f1dd3390" >
-                                        <attributelist id="1168" addr="0x7f99f1dd3390" >
+                                    <typetabsitem id="1167" addr="0x7fca46921390" >
+                                        <attributelist id="1168" addr="0x7fca46921390" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
-                                <attribute name="parent" value="0x7f99f1dd1d70" id="1169" addr="0x7f99f1dd1d70" />
-                                <attribute name="qname" value="XBMCAddon::xbmcgui" id="1170" addr="0x7f99f1de6c90" />
-                                <attribute name="symtab" value="0x7f99f1e40fb0" id="1171" addr="0x7f99f1e40fb0" />
+                                <attribute name="parent" value="0x7fca4691fd70" id="1169" addr="0x7fca4691fd70" />
+                                <attribute name="qname" value="XBMCAddon::xbmcgui" id="1170" addr="0x7fca46934c90" />
+                                <attribute name="symtab" value="0x7fca4698efb0" id="1171" addr="0x7fca4698efb0" />
                             </attributelist >
-                            <typescopesitem id="1172" addr="0x7f99f1e40f70" >
-                                <attributelist id="1173" addr="0x7f99f1e40f70" >
+                            <typescopesitem id="1172" addr="0x7fca4698ef70" >
+                                <attributelist id="1173" addr="0x7fca4698ef70" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="1174" addr="0x7f99f1dd2170" >
-                                <attributelist id="1175" addr="0x7f99f1dd2170" >
-                                    <attribute name="InterceptorBase" value="InterceptorBase" id="1176" addr="0x7f99f1de6c90" />
-                                    <attribute name="Dialog" value="Dialog" id="1177" addr="0x7f99f1de6c90" />
-                                    <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="1178" addr="0x7f99f1de6c90" />
-                                    <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="1179" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlTextBox" value="ControlTextBox" id="1180" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlRadioButton" value="ControlRadioButton" id="1181" addr="0x7f99f1de6c90" />
-                                    <attribute name="Window" value="Window" id="1182" addr="0x7f99f1de6c90" />
-                                    <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="1183" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlList" value="ControlList" id="1184" addr="0x7f99f1de6c90" />
-                                    <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="1185" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlImage" value="ControlImage" id="1186" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlButton" value="ControlButton" id="1187" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlGroup" value="ControlGroup" id="1188" addr="0x7f99f1de6c90" />
-                                    <attribute name="DialogBusy" value="DialogBusy" id="1189" addr="0x7f99f1de6c90" />
-                                    <attribute name="DialogProgressBG" value="DialogProgressBG" id="1190" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlSpin" value="ControlSpin" id="1191" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlEdit" value="ControlEdit" id="1192" addr="0x7f99f1de6c90" />
-                                    <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="1193" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="1194" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlLabel" value="ControlLabel" id="1195" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlProgress" value="ControlProgress" id="1196" addr="0x7f99f1de6c90" />
-                                    <attribute name="Control" value="Control" id="1197" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlSlider" value="ControlSlider" id="1198" addr="0x7f99f1de6c90" />
-                                    <attribute name="DialogProgress" value="DialogProgress" id="1199" addr="0x7f99f1de6c90" />
-                                    <attribute name="Action" value="Action" id="1200" addr="0x7f99f1de6c90" />
-                                    <attribute name="WindowDialog" value="WindowDialog" id="1201" addr="0x7f99f1de6c90" />
-                                    <attribute name="WindowXML" value="WindowXML" id="1202" addr="0x7f99f1de6c90" />
-                                    <attribute name="ListItem" value="ListItem" id="1203" addr="0x7f99f1de6c90" />
-                                    <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="1204" addr="0x7f99f1de6c90" />
+                            <typescopesitem id="1174" addr="0x7fca46920170" >
+                                <attributelist id="1175" addr="0x7fca46920170" >
+                                    <attribute name="InterceptorBase" value="InterceptorBase" id="1176" addr="0x7fca46934c90" />
+                                    <attribute name="Dialog" value="Dialog" id="1177" addr="0x7fca46934c90" />
+                                    <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="1178" addr="0x7fca46934c90" />
+                                    <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="1179" addr="0x7fca46934c90" />
+                                    <attribute name="ControlTextBox" value="ControlTextBox" id="1180" addr="0x7fca46934c90" />
+                                    <attribute name="ControlRadioButton" value="ControlRadioButton" id="1181" addr="0x7fca46934c90" />
+                                    <attribute name="Window" value="Window" id="1182" addr="0x7fca46934c90" />
+                                    <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="1183" addr="0x7fca46934c90" />
+                                    <attribute name="ControlList" value="ControlList" id="1184" addr="0x7fca46934c90" />
+                                    <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="1185" addr="0x7fca46934c90" />
+                                    <attribute name="ControlImage" value="ControlImage" id="1186" addr="0x7fca46934c90" />
+                                    <attribute name="ControlButton" value="ControlButton" id="1187" addr="0x7fca46934c90" />
+                                    <attribute name="ControlGroup" value="ControlGroup" id="1188" addr="0x7fca46934c90" />
+                                    <attribute name="DialogBusy" value="DialogBusy" id="1189" addr="0x7fca46934c90" />
+                                    <attribute name="DialogProgressBG" value="DialogProgressBG" id="1190" addr="0x7fca46934c90" />
+                                    <attribute name="ControlSpin" value="ControlSpin" id="1191" addr="0x7fca46934c90" />
+                                    <attribute name="ControlEdit" value="ControlEdit" id="1192" addr="0x7fca46934c90" />
+                                    <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="1193" addr="0x7fca46934c90" />
+                                    <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="1194" addr="0x7fca46934c90" />
+                                    <attribute name="ControlLabel" value="ControlLabel" id="1195" addr="0x7fca46934c90" />
+                                    <attribute name="ControlProgress" value="ControlProgress" id="1196" addr="0x7fca46934c90" />
+                                    <attribute name="Control" value="Control" id="1197" addr="0x7fca46934c90" />
+                                    <attribute name="ControlSlider" value="ControlSlider" id="1198" addr="0x7fca46934c90" />
+                                    <attribute name="DialogProgress" value="DialogProgress" id="1199" addr="0x7fca46934c90" />
+                                    <attribute name="Action" value="Action" id="1200" addr="0x7fca46934c90" />
+                                    <attribute name="WindowDialog" value="WindowDialog" id="1201" addr="0x7fca46934c90" />
+                                    <attribute name="WindowXML" value="WindowXML" id="1202" addr="0x7fca46934c90" />
+                                    <attribute name="ListItem" value="ListItem" id="1203" addr="0x7fca46934c90" />
+                                    <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="1204" addr="0x7fca46934c90" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="1205" addr="0x7f99f1dd1d70" >
-                                <attributelist id="1206" addr="0x7f99f1dd1d70" >
-                                    <attribute name="name" value="XBMCAddon" id="1207" addr="0x7f99f1de6c90" />
-                                    <typetab id="1208" addr="0x7f99f1dd1db0" >
-                                        <attributelist id="1209" addr="0x7f99f1dd1db0" >
-                                            <attribute name="Dictionary" value="Dictionary" id="1210" addr="0x7f99f1de6c90" />
-                                            <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="1211" addr="0x7f99f1de6c90" />
-                                            <attribute name="String" value="std::string" id="1212" addr="0x7f99f1de6c90" />
-                                            <attribute name="StringOrInt" value="XBMCAddon::String" id="1213" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                        <typetabsitem id="1214" addr="0x7f99f1dd28b0" >
-                                            <attributelist id="1215" addr="0x7f99f1dd28b0" >
+                            <typescopesitem id="1205" addr="0x7fca4691fd70" >
+                                <attributelist id="1206" addr="0x7fca4691fd70" >
+                                    <attribute name="name" value="XBMCAddon" id="1207" addr="0x7fca46934c90" />
+                                    <typetab id="1208" addr="0x7fca4691fdb0" >
+                                        <attributelist id="1209" addr="0x7fca4691fdb0" >
+                                            <attribute name="Dictionary" value="Dictionary" id="1210" addr="0x7fca46934c90" />
+                                            <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="1211" addr="0x7fca46934c90" />
+                                            <attribute name="String" value="std::string" id="1212" addr="0x7fca46934c90" />
+                                            <attribute name="StringOrInt" value="XBMCAddon::String" id="1213" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                        <typetabsitem id="1214" addr="0x7fca469208b0" >
+                                            <attributelist id="1215" addr="0x7fca469208b0" >
                                             </attributelist >
                                         </typetabsitem >
-                                        <typetabsitem id="1216" addr="0x7f99f1dd2910" >
-                                            <attributelist id="1217" addr="0x7f99f1dd2910" >
+                                        <typetabsitem id="1216" addr="0x7fca46920910" >
+                                            <attributelist id="1217" addr="0x7fca46920910" >
                                             </attributelist >
                                         </typetabsitem >
-                                        <typetabsitem id="1218" addr="0x7f99f1dd1f90" >
-                                            <attributelist id="1219" addr="0x7f99f1dd1f90" >
+                                        <typetabsitem id="1218" addr="0x7fca4691ff90" >
+                                            <attributelist id="1219" addr="0x7fca4691ff90" >
                                             </attributelist >
                                         </typetabsitem >
-                                        <typetabsitem id="1220" addr="0x7f99f1dd2710" >
-                                            <attributelist id="1221" addr="0x7f99f1dd2710" >
+                                        <typetabsitem id="1220" addr="0x7fca46920710" >
+                                            <attributelist id="1221" addr="0x7fca46920710" >
                                             </attributelist >
                                         </typetabsitem >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f99f1e1da30" id="1222" addr="0x7f99f1e1da30" />
-                                    <attribute name="qname" value="XBMCAddon" id="1223" addr="0x7f99f1de6c90" />
-                                    <attribute name="symtab" value="0x7f99f1e408b0" id="1224" addr="0x7f99f1e408b0" />
+                                    <attribute name="parent" value="0x7fca4696ba30" id="1222" addr="0x7fca4696ba30" />
+                                    <attribute name="qname" value="XBMCAddon" id="1223" addr="0x7fca46934c90" />
+                                    <attribute name="symtab" value="0x7fca4698e8b0" id="1224" addr="0x7fca4698e8b0" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="1225" addr="0x7f99f1dd2190" >
-                                <attributelist id="1226" addr="0x7f99f1dd2190" >
+                            <typescopesitem id="1225" addr="0x7fca46920190" >
+                                <attributelist id="1226" addr="0x7fca46920190" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="1227" addr="0x7f99f1e40fb0" >
-                                <attributelist id="1228" addr="0x7f99f1e40fb0" >
-                                    <attribute name="name" value="xbmcgui" id="1229" addr="0x7f99f1de6c90" />
-                                    <attribute name="csymtab" value="0x7f99f1e40ff0" id="1230" addr="0x7f99f1e40ff0" />
-                                    <attribute name="symtab" value="0x7f99f1e40f90" id="1231" addr="0x7f99f1e40f90" />
+                            <typescopesitem id="1227" addr="0x7fca4698efb0" >
+                                <attributelist id="1228" addr="0x7fca4698efb0" >
+                                    <attribute name="name" value="xbmcgui" id="1229" addr="0x7fca46934c90" />
+                                    <attribute name="csymtab" value="0x7fca4698eff0" id="1230" addr="0x7fca4698eff0" />
+                                    <attribute name="symtab" value="0x7fca4698ef90" id="1231" addr="0x7fca4698ef90" />
                                 </attributelist >
                             </typescopesitem >
                         </typescope >
                     </attributelist >
 
-                    <cdecl id="1232" addr="0x7f99f1e465f0" >
-                        <attributelist id="1233" addr="0x7f99f1e465f0" >
-                            <attribute name="sym_name" value="ListItemException" id="1234" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="XBMCAddon::xbmcgui::ListItemException" id="1235" addr="0x7f99f1de6c90" />
-                            <attribute name="kind" value="variable" id="1236" addr="0x7f99f1de6c90" />
-                            <attribute name="type" value="XBMCCOMMONS_STANDARD_EXCEPTION" id="1237" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="1238" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1239" addr="0x7f99f1de6c90" />
+                    <cdecl id="1232" addr="0x7fca469945f0" >
+                        <attributelist id="1233" addr="0x7fca469945f0" >
+                            <attribute name="sym_name" value="ListItemException" id="1234" addr="0x7fca46934c90" />
+                            <attribute name="name" value="XBMCAddon::xbmcgui::ListItemException" id="1235" addr="0x7fca46934c90" />
+                            <attribute name="kind" value="variable" id="1236" addr="0x7fca46934c90" />
+                            <attribute name="type" value="XBMCCOMMONS_STANDARD_EXCEPTION" id="1237" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="1238" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1239" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="1240" addr="0x7f99f1e46a50" >
-                        <attributelist id="1241" addr="0x7f99f1e46a50" >
-                            <attribute name="sym_name" value="InfoLabelStringOrTuple" id="1242" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="XBMCAddon::xbmcgui::InfoLabelStringOrTuple" id="1243" addr="0x7f99f1de6c90" />
-                            <attribute name="decl" value="" id="1244" addr="0x7f99f1de6c90" />
-                            <attribute name="storage" value="typedef" id="1245" addr="0x7f99f1de6c90" />
-                            <attribute name="kind" value="typedef" id="1246" addr="0x7f99f1de6c90" />
-                            <attribute name="type" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="1247" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="1248" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1249" addr="0x7f99f1de6c90" />
+                    <cdecl id="1240" addr="0x7fca46994a50" >
+                        <attributelist id="1241" addr="0x7fca46994a50" >
+                            <attribute name="sym_name" value="InfoLabelStringOrTuple" id="1242" addr="0x7fca46934c90" />
+                            <attribute name="name" value="XBMCAddon::xbmcgui::InfoLabelStringOrTuple" id="1243" addr="0x7fca46934c90" />
+                            <attribute name="decl" value="" id="1244" addr="0x7fca46934c90" />
+                            <attribute name="storage" value="typedef" id="1245" addr="0x7fca46934c90" />
+                            <attribute name="kind" value="typedef" id="1246" addr="0x7fca46934c90" />
+                            <attribute name="type" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="1247" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="1248" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1249" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="1250" addr="0x7f99f1e471d0" >
-                        <attributelist id="1251" addr="0x7f99f1e471d0" >
-                            <attribute name="sym_name" value="InfoLabelValue" id="1252" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="XBMCAddon::xbmcgui::InfoLabelValue" id="1253" addr="0x7f99f1de6c90" />
-                            <attribute name="decl" value="" id="1254" addr="0x7f99f1de6c90" />
-                            <attribute name="storage" value="typedef" id="1255" addr="0x7f99f1de6c90" />
-                            <attribute name="kind" value="typedef" id="1256" addr="0x7f99f1de6c90" />
-                            <attribute name="type" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="1257" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="1258" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1259" addr="0x7f99f1de6c90" />
+                    <cdecl id="1250" addr="0x7fca469951d0" >
+                        <attributelist id="1251" addr="0x7fca469951d0" >
+                            <attribute name="sym_name" value="InfoLabelValue" id="1252" addr="0x7fca46934c90" />
+                            <attribute name="name" value="XBMCAddon::xbmcgui::InfoLabelValue" id="1253" addr="0x7fca46934c90" />
+                            <attribute name="decl" value="" id="1254" addr="0x7fca46934c90" />
+                            <attribute name="storage" value="typedef" id="1255" addr="0x7fca46934c90" />
+                            <attribute name="kind" value="typedef" id="1256" addr="0x7fca46934c90" />
+                            <attribute name="type" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="1257" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="1258" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1259" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="1260" addr="0x7f99f1e47450" >
-                        <attributelist id="1261" addr="0x7f99f1e47450" >
-                            <attribute name="sym_name" value="InfoLabelDict" id="1262" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="XBMCAddon::xbmcgui::InfoLabelDict" id="1263" addr="0x7f99f1de6c90" />
-                            <attribute name="decl" value="" id="1264" addr="0x7f99f1de6c90" />
-                            <attribute name="storage" value="typedef" id="1265" addr="0x7f99f1de6c90" />
-                            <attribute name="kind" value="typedef" id="1266" addr="0x7f99f1de6c90" />
-                            <attribute name="type" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="1267" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="1268" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1269" addr="0x7f99f1de6c90" />
+                    <cdecl id="1260" addr="0x7fca46995450" >
+                        <attributelist id="1261" addr="0x7fca46995450" >
+                            <attribute name="sym_name" value="InfoLabelDict" id="1262" addr="0x7fca46934c90" />
+                            <attribute name="name" value="XBMCAddon::xbmcgui::InfoLabelDict" id="1263" addr="0x7fca46934c90" />
+                            <attribute name="decl" value="" id="1264" addr="0x7fca46934c90" />
+                            <attribute name="storage" value="typedef" id="1265" addr="0x7fca46934c90" />
+                            <attribute name="kind" value="typedef" id="1266" addr="0x7fca46934c90" />
+                            <attribute name="type" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="1267" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="1268" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1269" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </cdecl >
-                    <class id="1270" addr="0x7f99f1e476b0" >
-                        <attributelist id="1271" addr="0x7f99f1e476b0" >
-                            <attribute name="name" value="XBMCAddon::xbmcgui::ListItem" id="1272" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="1273" addr="0x7f99f1e40fb0" />
-                            <attribute name="symtab" value="0x7f99f1e478f0" id="1274" addr="0x7f99f1e478f0" />
-                            <attribute name="allows_typedef" value="1" id="1275" addr="0x7f99f1de6c90" />
-                            <attribute name="typepass_visit" value="1" id="1276" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_visit" value="1" id="1277" addr="0x7f99f1de6c90" />
-                            <attribute name="kind" value="class" id="1278" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_name" value="ListItem" id="1279" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_default_constructor" value="1" id="1280" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_has_constructor" value="1" id="1281" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_public_constructor" value="1" id="1282" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_has_destructor" value="1" id="1283" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_default_destructor" value="1" id="1284" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_copy_constructor" value="1" id="1285" addr="0x7f99f1de6c90" />
-                            <attribute name="privatebaselist" value="0x7f99f1e47610" id="1286" addr="0x7f99f1e47610" />
-                            <attribute name="protectedbaselist" value="0x7f99f1e475f0" id="1287" addr="0x7f99f1e475f0" />
-                            <baselist id="1288" addr="0x7f99f1e47630" >
-                                <base name="AddonClass" id="1289" addr="0x7f99f1e477b0" />
+                    <class id="1270" addr="0x7fca469956b0" >
+                        <attributelist id="1271" addr="0x7fca469956b0" >
+                            <attribute name="name" value="XBMCAddon::xbmcgui::ListItem" id="1272" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="1273" addr="0x7fca4698efb0" />
+                            <attribute name="symtab" value="0x7fca469958f0" id="1274" addr="0x7fca469958f0" />
+                            <attribute name="allows_typedef" value="1" id="1275" addr="0x7fca46934c90" />
+                            <attribute name="typepass_visit" value="1" id="1276" addr="0x7fca46934c90" />
+                            <attribute name="allocate_visit" value="1" id="1277" addr="0x7fca46934c90" />
+                            <attribute name="kind" value="class" id="1278" addr="0x7fca46934c90" />
+                            <attribute name="sym_name" value="ListItem" id="1279" addr="0x7fca46934c90" />
+                            <attribute name="allocate_default_constructor" value="1" id="1280" addr="0x7fca46934c90" />
+                            <attribute name="allocate_has_constructor" value="1" id="1281" addr="0x7fca46934c90" />
+                            <attribute name="allocate_public_constructor" value="1" id="1282" addr="0x7fca46934c90" />
+                            <attribute name="allocate_has_destructor" value="1" id="1283" addr="0x7fca46934c90" />
+                            <attribute name="allocate_default_destructor" value="1" id="1284" addr="0x7fca46934c90" />
+                            <attribute name="allocate_copy_constructor" value="1" id="1285" addr="0x7fca46934c90" />
+                            <attribute name="privatebaselist" value="0x7fca46995610" id="1286" addr="0x7fca46995610" />
+                            <attribute name="protectedbaselist" value="0x7fca469955f0" id="1287" addr="0x7fca469955f0" />
+                            <baselist id="1288" addr="0x7fca46995630" >
+                                <base name="AddonClass" id="1289" addr="0x7fca469957b0" />
                             </baselist >
-                            <attribute name="module" value="xbmcgui" id="1290" addr="0x7f99f1e402f0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1291" addr="0x7f99f1de6c90" />
-                            <typescope id="1292" addr="0x7f99f1dd3690" >
-                                <attributelist id="1293" addr="0x7f99f1dd3690" >
-                                    <attribute name="name" value="ListItem" id="1294" addr="0x7f99f1de6c90" />
-                                    <typetab id="1295" addr="0x7f99f1dd36b0" >
-                                        <attributelist id="1296" addr="0x7f99f1dd36b0" >
+                            <attribute name="module" value="xbmcgui" id="1290" addr="0x7fca4698e2f0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1291" addr="0x7fca46934c90" />
+                            <typescope id="1292" addr="0x7fca46921690" >
+                                <attributelist id="1293" addr="0x7fca46921690" >
+                                    <attribute name="name" value="ListItem" id="1294" addr="0x7fca46934c90" />
+                                    <typetab id="1295" addr="0x7fca469216b0" >
+                                        <attributelist id="1296" addr="0x7fca469216b0" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f99f1dd2150" id="1297" addr="0x7f99f1dd2150" />
-                                    <attribute name="qname" value="XBMCAddon::xbmcgui::ListItem" id="1298" addr="0x7f99f1de6c90" />
-                                    <attribute name="symtab" value="0x7f99f1e478f0" id="1299" addr="0x7f99f1e478f0" />
+                                    <attribute name="parent" value="0x7fca46920150" id="1297" addr="0x7fca46920150" />
+                                    <attribute name="qname" value="XBMCAddon::xbmcgui::ListItem" id="1298" addr="0x7fca46934c90" />
+                                    <attribute name="symtab" value="0x7fca469958f0" id="1299" addr="0x7fca469958f0" />
                                 </attributelist >
-                                <typescopesitem id="1300" addr="0x7f99f1dd35f0" >
-                                    <attributelist id="1301" addr="0x7f99f1dd35f0" >
+                                <typescopesitem id="1300" addr="0x7fca469215f0" >
+                                    <attributelist id="1301" addr="0x7fca469215f0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="1302" addr="0x7f99f1dd36b0" >
-                                    <attributelist id="1303" addr="0x7f99f1dd36b0" >
+                                <typescopesitem id="1302" addr="0x7fca469216b0" >
+                                    <attributelist id="1303" addr="0x7fca469216b0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="1304" addr="0x7f99f1dd2150" >
-                                    <attributelist id="1305" addr="0x7f99f1dd2150" >
-                                        <attribute name="name" value="xbmcgui" id="1306" addr="0x7f99f1de6c90" />
-                                        <typetab id="1307" addr="0x7f99f1dd2170" >
-                                            <attributelist id="1308" addr="0x7f99f1dd2170" >
-                                                <attribute name="InterceptorBase" value="InterceptorBase" id="1309" addr="0x7f99f1de6c90" />
-                                                <attribute name="Dialog" value="Dialog" id="1310" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="1311" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="1312" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlTextBox" value="ControlTextBox" id="1313" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="1314" addr="0x7f99f1de6c90" />
-                                                <attribute name="Window" value="Window" id="1315" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="1316" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlList" value="ControlList" id="1317" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="1318" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlImage" value="ControlImage" id="1319" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlButton" value="ControlButton" id="1320" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlGroup" value="ControlGroup" id="1321" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogBusy" value="DialogBusy" id="1322" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="1323" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSpin" value="ControlSpin" id="1324" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlEdit" value="ControlEdit" id="1325" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="1326" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="1327" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlLabel" value="ControlLabel" id="1328" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlProgress" value="ControlProgress" id="1329" addr="0x7f99f1de6c90" />
-                                                <attribute name="Control" value="Control" id="1330" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSlider" value="ControlSlider" id="1331" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgress" value="DialogProgress" id="1332" addr="0x7f99f1de6c90" />
-                                                <attribute name="Action" value="Action" id="1333" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowDialog" value="WindowDialog" id="1334" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXML" value="WindowXML" id="1335" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItem" value="ListItem" id="1336" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="1337" addr="0x7f99f1de6c90" />
+                                <typescopesitem id="1304" addr="0x7fca46920150" >
+                                    <attributelist id="1305" addr="0x7fca46920150" >
+                                        <attribute name="name" value="xbmcgui" id="1306" addr="0x7fca46934c90" />
+                                        <typetab id="1307" addr="0x7fca46920170" >
+                                            <attributelist id="1308" addr="0x7fca46920170" >
+                                                <attribute name="InterceptorBase" value="InterceptorBase" id="1309" addr="0x7fca46934c90" />
+                                                <attribute name="Dialog" value="Dialog" id="1310" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="1311" addr="0x7fca46934c90" />
+                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="1312" addr="0x7fca46934c90" />
+                                                <attribute name="ControlTextBox" value="ControlTextBox" id="1313" addr="0x7fca46934c90" />
+                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="1314" addr="0x7fca46934c90" />
+                                                <attribute name="Window" value="Window" id="1315" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="1316" addr="0x7fca46934c90" />
+                                                <attribute name="ControlList" value="ControlList" id="1317" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="1318" addr="0x7fca46934c90" />
+                                                <attribute name="ControlImage" value="ControlImage" id="1319" addr="0x7fca46934c90" />
+                                                <attribute name="ControlButton" value="ControlButton" id="1320" addr="0x7fca46934c90" />
+                                                <attribute name="ControlGroup" value="ControlGroup" id="1321" addr="0x7fca46934c90" />
+                                                <attribute name="DialogBusy" value="DialogBusy" id="1322" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="1323" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSpin" value="ControlSpin" id="1324" addr="0x7fca46934c90" />
+                                                <attribute name="ControlEdit" value="ControlEdit" id="1325" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="1326" addr="0x7fca46934c90" />
+                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="1327" addr="0x7fca46934c90" />
+                                                <attribute name="ControlLabel" value="ControlLabel" id="1328" addr="0x7fca46934c90" />
+                                                <attribute name="ControlProgress" value="ControlProgress" id="1329" addr="0x7fca46934c90" />
+                                                <attribute name="Control" value="Control" id="1330" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSlider" value="ControlSlider" id="1331" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgress" value="DialogProgress" id="1332" addr="0x7fca46934c90" />
+                                                <attribute name="Action" value="Action" id="1333" addr="0x7fca46934c90" />
+                                                <attribute name="WindowDialog" value="WindowDialog" id="1334" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXML" value="WindowXML" id="1335" addr="0x7fca46934c90" />
+                                                <attribute name="ListItem" value="ListItem" id="1336" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="1337" addr="0x7fca46934c90" />
                                             </attributelist >
-                                            <typetabsitem id="1338" addr="0x7f99f1de1dd0" >
-                                                <attributelist id="1339" addr="0x7f99f1de1dd0" >
+                                            <typetabsitem id="1338" addr="0x7fca4692fdd0" >
+                                                <attributelist id="1339" addr="0x7fca4692fdd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1340" addr="0x7f99f1dde790" >
-                                                <attributelist id="1341" addr="0x7f99f1dde790" >
+                                            <typetabsitem id="1340" addr="0x7fca4692c790" >
+                                                <attributelist id="1341" addr="0x7fca4692c790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1342" addr="0x7f99f1de3f10" >
-                                                <attributelist id="1343" addr="0x7f99f1de3f10" >
+                                            <typetabsitem id="1342" addr="0x7fca46931f10" >
+                                                <attributelist id="1343" addr="0x7fca46931f10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1344" addr="0x7f99f1dd67b0" >
-                                                <attributelist id="1345" addr="0x7f99f1dd67b0" >
+                                            <typetabsitem id="1344" addr="0x7fca469247b0" >
+                                                <attributelist id="1345" addr="0x7fca469247b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1346" addr="0x7f99f1ddafd0" >
-                                                <attributelist id="1347" addr="0x7f99f1ddafd0" >
+                                            <typetabsitem id="1346" addr="0x7fca46928fd0" >
+                                                <attributelist id="1347" addr="0x7fca46928fd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1348" addr="0x7f99f1ddd430" >
-                                                <attributelist id="1349" addr="0x7f99f1ddd430" >
+                                            <typetabsitem id="1348" addr="0x7fca4692b430" >
+                                                <attributelist id="1349" addr="0x7fca4692b430" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1350" addr="0x7f99f1de2130" >
-                                                <attributelist id="1351" addr="0x7f99f1de2130" >
+                                            <typetabsitem id="1350" addr="0x7fca46930130" >
+                                                <attributelist id="1351" addr="0x7fca46930130" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1352" addr="0x7f99f1dd2f50" >
-                                                <attributelist id="1353" addr="0x7f99f1dd2f50" >
+                                            <typetabsitem id="1352" addr="0x7fca46920f50" >
+                                                <attributelist id="1353" addr="0x7fca46920f50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1354" addr="0x7f99f1dd9650" >
-                                                <attributelist id="1355" addr="0x7f99f1dd9650" >
+                                            <typetabsitem id="1354" addr="0x7fca46927650" >
+                                                <attributelist id="1355" addr="0x7fca46927650" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1356" addr="0x7f99f1de3390" >
-                                                <attributelist id="1357" addr="0x7f99f1de3390" >
+                                            <typetabsitem id="1356" addr="0x7fca46931390" >
+                                                <attributelist id="1357" addr="0x7fca46931390" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1358" addr="0x7f99f1ddb7b0" >
-                                                <attributelist id="1359" addr="0x7f99f1ddb7b0" >
+                                            <typetabsitem id="1358" addr="0x7fca469297b0" >
+                                                <attributelist id="1359" addr="0x7fca469297b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1360" addr="0x7f99f1ddc4b0" >
-                                                <attributelist id="1361" addr="0x7f99f1ddc4b0" >
+                                            <typetabsitem id="1360" addr="0x7fca4692a4b0" >
+                                                <attributelist id="1361" addr="0x7fca4692a4b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1362" addr="0x7f99f1ddcf90" >
-                                                <attributelist id="1363" addr="0x7f99f1ddcf90" >
+                                            <typetabsitem id="1362" addr="0x7fca4692af90" >
+                                                <attributelist id="1363" addr="0x7fca4692af90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1364" addr="0x7f99f1de11b0" >
-                                                <attributelist id="1365" addr="0x7f99f1de11b0" >
+                                            <typetabsitem id="1364" addr="0x7fca4692f1b0" >
+                                                <attributelist id="1365" addr="0x7fca4692f1b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1366" addr="0x7f99f1de15b0" >
-                                                <attributelist id="1367" addr="0x7f99f1de15b0" >
+                                            <typetabsitem id="1366" addr="0x7fca4692f5b0" >
+                                                <attributelist id="1367" addr="0x7fca4692f5b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1368" addr="0x7f99f1dd77f0" >
-                                                <attributelist id="1369" addr="0x7f99f1dd77f0" >
+                                            <typetabsitem id="1368" addr="0x7fca469257f0" >
+                                                <attributelist id="1369" addr="0x7fca469257f0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1370" addr="0x7f99f1dd8b30" >
-                                                <attributelist id="1371" addr="0x7f99f1dd8b30" >
+                                            <typetabsitem id="1370" addr="0x7fca46926b30" >
+                                                <attributelist id="1371" addr="0x7fca46926b30" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1372" addr="0x7f99f1dd2c50" >
-                                                <attributelist id="1373" addr="0x7f99f1dd2c50" >
+                                            <typetabsitem id="1372" addr="0x7fca46920c50" >
+                                                <attributelist id="1373" addr="0x7fca46920c50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1374" addr="0x7f99f1dda790" >
-                                                <attributelist id="1375" addr="0x7f99f1dda790" >
+                                            <typetabsitem id="1374" addr="0x7fca46928790" >
+                                                <attributelist id="1375" addr="0x7fca46928790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1376" addr="0x7f99f1dd8030" >
-                                                <attributelist id="1377" addr="0x7f99f1dd8030" >
+                                            <typetabsitem id="1376" addr="0x7fca46926030" >
+                                                <attributelist id="1377" addr="0x7fca46926030" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1378" addr="0x7f99f1ddbe10" >
-                                                <attributelist id="1379" addr="0x7f99f1ddbe10" >
+                                            <typetabsitem id="1378" addr="0x7fca46929e10" >
+                                                <attributelist id="1379" addr="0x7fca46929e10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1380" addr="0x7f99f1dd6b10" >
-                                                <attributelist id="1381" addr="0x7f99f1dd6b10" >
+                                            <typetabsitem id="1380" addr="0x7fca46924b10" >
+                                                <attributelist id="1381" addr="0x7fca46924b10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1382" addr="0x7f99f1dddf90" >
-                                                <attributelist id="1383" addr="0x7f99f1dddf90" >
+                                            <typetabsitem id="1382" addr="0x7fca4692bf90" >
+                                                <attributelist id="1383" addr="0x7fca4692bf90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1384" addr="0x7f99f1de0530" >
-                                                <attributelist id="1385" addr="0x7f99f1de0530" >
+                                            <typetabsitem id="1384" addr="0x7fca4692e530" >
+                                                <attributelist id="1385" addr="0x7fca4692e530" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1386" addr="0x7f99f1de1e50" >
-                                                <attributelist id="1387" addr="0x7f99f1de1e50" >
+                                            <typetabsitem id="1386" addr="0x7fca4692fe50" >
+                                                <attributelist id="1387" addr="0x7fca4692fe50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1388" addr="0x7f99f1de2d90" >
-                                                <attributelist id="1389" addr="0x7f99f1de2d90" >
+                                            <typetabsitem id="1388" addr="0x7fca46930d90" >
+                                                <attributelist id="1389" addr="0x7fca46930d90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1390" addr="0x7f99f1de3410" >
-                                                <attributelist id="1391" addr="0x7f99f1de3410" >
+                                            <typetabsitem id="1390" addr="0x7fca46931410" >
+                                                <attributelist id="1391" addr="0x7fca46931410" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1392" addr="0x7f99f1dd3590" >
-                                                <attributelist id="1393" addr="0x7f99f1dd3590" >
+                                            <typetabsitem id="1392" addr="0x7fca46921590" >
+                                                <attributelist id="1393" addr="0x7fca46921590" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1394" addr="0x7f99f1dd3390" >
-                                                <attributelist id="1395" addr="0x7f99f1dd3390" >
+                                            <typetabsitem id="1394" addr="0x7fca46921390" >
+                                                <attributelist id="1395" addr="0x7fca46921390" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7f99f1dd1d70" id="1396" addr="0x7f99f1dd1d70" />
-                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="1397" addr="0x7f99f1de6c90" />
-                                        <attribute name="symtab" value="0x7f99f1e40fb0" id="1398" addr="0x7f99f1e40fb0" />
+                                        <attribute name="parent" value="0x7fca4691fd70" id="1396" addr="0x7fca4691fd70" />
+                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="1397" addr="0x7fca46934c90" />
+                                        <attribute name="symtab" value="0x7fca4698efb0" id="1398" addr="0x7fca4698efb0" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="1399" addr="0x7f99f1dd36d0" >
-                                    <attributelist id="1400" addr="0x7f99f1dd36d0" >
+                                <typescopesitem id="1399" addr="0x7fca469216d0" >
+                                    <attributelist id="1400" addr="0x7fca469216d0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="1401" addr="0x7f99f1e478f0" >
-                                    <attributelist id="1402" addr="0x7f99f1e478f0" >
-                                        <attribute name="name" value="ListItem" id="1403" addr="0x7f99f1de6c90" />
-                                        <attribute name="csymtab" value="0x7f99f1e47910" id="1404" addr="0x7f99f1e47910" />
-                                        <attribute name="symtab" value="0x7f99f1e478b0" id="1405" addr="0x7f99f1e478b0" />
+                                <typescopesitem id="1401" addr="0x7fca469958f0" >
+                                    <attributelist id="1402" addr="0x7fca469958f0" >
+                                        <attribute name="name" value="ListItem" id="1403" addr="0x7fca46934c90" />
+                                        <attribute name="csymtab" value="0x7fca46995910" id="1404" addr="0x7fca46995910" />
+                                        <attribute name="symtab" value="0x7fca469958b0" id="1405" addr="0x7fca469958b0" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <access id="1406" addr="0x7f99f1e47870" >
-                            <attributelist id="1407" addr="0x7f99f1e47870" >
-                                <attribute name="kind" value="public" id="1408" addr="0x7f99f1de6c90" />
+                        <access id="1406" addr="0x7fca46995870" >
+                            <attributelist id="1407" addr="0x7fca46995870" >
+                                <attribute name="kind" value="public" id="1408" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="1409" addr="0x7f99f1e48390" >
-                            <attributelist id="1410" addr="0x7f99f1e48390" >
-                                <attribute name="name" value="ListItem" id="1411" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="1412" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="1413" addr="0x7f99f1e478f0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e487f0" id="1414" addr="0x7f99f1e487f0" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e487f0" id="1415" addr="0x7f99f1e487f0" />
-                                <attribute name="sym_name" value="ListItem" id="1416" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).String,r.q(const).String,r.q(const).String,r.q(const).String,r.q(const).String,bool)." id="1417" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="1418" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e48390" id="1419" addr="0x7f99f1e48390" />
-                                <parmlist id="1420" addr="0x7f99f1e47b10" >
+                        <constructor id="1409" addr="0x7fca46996390" >
+                            <attributelist id="1410" addr="0x7fca46996390" >
+                                <attribute name="name" value="ListItem" id="1411" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="1412" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="1413" addr="0x7fca469958f0" />
+                                <attribute name="sym_nextSibling" value="0x7fca469967f0" id="1414" addr="0x7fca469967f0" />
+                                <attribute name="csym_nextSibling" value="0x7fca469967f0" id="1415" addr="0x7fca469967f0" />
+                                <attribute name="sym_name" value="ListItem" id="1416" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).String,r.q(const).String,r.q(const).String,r.q(const).String,r.q(const).String,bool)." id="1417" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="1418" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca46996390" id="1419" addr="0x7fca46996390" />
+                                <parmlist id="1420" addr="0x7fca46995b10" >
                                     <parm id="1421">
-                                        <attributelist id="1422" addr="0x7f99f1e47b10" >
-                                            <attribute name="name" value="label" id="1423" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="1424" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1425" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1422" addr="0x7fca46995b10" >
+                                            <attribute name="name" value="label" id="1423" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="1424" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1425" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1426">
-                                        <attributelist id="1427" addr="0x7f99f1e47cb0" >
-                                            <attribute name="name" value="label2" id="1428" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="1429" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1430" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1427" addr="0x7fca46995cb0" >
+                                            <attribute name="name" value="label2" id="1428" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="1429" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1430" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1431">
-                                        <attributelist id="1432" addr="0x7f99f1e47e50" >
-                                            <attribute name="name" value="iconImage" id="1433" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="1434" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1435" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1432" addr="0x7fca46995e50" >
+                                            <attribute name="name" value="iconImage" id="1433" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="1434" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1435" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1436">
-                                        <attributelist id="1437" addr="0x7f99f1e47ff0" >
-                                            <attribute name="name" value="thumbnailImage" id="1438" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="1439" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1440" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1437" addr="0x7fca46995ff0" >
+                                            <attribute name="name" value="thumbnailImage" id="1438" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="1439" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1440" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1441">
-                                        <attributelist id="1442" addr="0x7f99f1e48190" >
-                                            <attribute name="name" value="path" id="1443" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="1444" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1445" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1442" addr="0x7fca46996190" >
+                                            <attribute name="name" value="path" id="1443" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="1444" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1445" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1446">
-                                        <attributelist id="1447" addr="0x7f99f1e482d0" >
-                                            <attribute name="name" value="offscreen" id="1448" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="false" id="1449" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="1450" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1447" addr="0x7fca469962d0" >
+                                            <attribute name="name" value="offscreen" id="1448" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="false" id="1449" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="1450" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_0" id="1451" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="1452" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="1451" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="1452" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="1453" addr="0x7f99f1e487f0" >
-                            <attributelist id="1454" addr="0x7f99f1e487f0" >
-                                <attribute name="name" value="ListItem" id="1455" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="1456" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="1457" addr="0x7f99f1e478f0" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e48bb0" id="1458" addr="0x7f99f1e48bb0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e48390" id="1459" addr="0x7f99f1e48390" />
-                                <attribute name="sym_name" value="ListItem" id="1460" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e48bb0" id="1461" addr="0x7f99f1e48bb0" />
-                                <attribute name="defaultargs" value="0x7f99f1e48390" id="1462" addr="0x7f99f1e48390" />
-                                <attribute name="decl" value="f(r.q(const).String,r.q(const).String,r.q(const).String,r.q(const).String,r.q(const).String)." id="1463" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="1464" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e48390" id="1465" addr="0x7f99f1e48390" />
-                                <parmlist id="1466" addr="0x7f99f1e48470" >
+                        <constructor id="1453" addr="0x7fca469967f0" >
+                            <attributelist id="1454" addr="0x7fca469967f0" >
+                                <attribute name="name" value="ListItem" id="1455" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="1456" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="1457" addr="0x7fca469958f0" />
+                                <attribute name="csym_nextSibling" value="0x7fca46996bb0" id="1458" addr="0x7fca46996bb0" />
+                                <attribute name="sym_previousSibling" value="0x7fca46996390" id="1459" addr="0x7fca46996390" />
+                                <attribute name="sym_name" value="ListItem" id="1460" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca46996bb0" id="1461" addr="0x7fca46996bb0" />
+                                <attribute name="defaultargs" value="0x7fca46996390" id="1462" addr="0x7fca46996390" />
+                                <attribute name="decl" value="f(r.q(const).String,r.q(const).String,r.q(const).String,r.q(const).String,r.q(const).String)." id="1463" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="1464" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca46996390" id="1465" addr="0x7fca46996390" />
+                                <parmlist id="1466" addr="0x7fca46996470" >
                                     <parm id="1467">
-                                        <attributelist id="1468" addr="0x7f99f1e48470" >
-                                            <attribute name="name" value="label" id="1469" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="1470" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1471" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1468" addr="0x7fca46996470" >
+                                            <attribute name="name" value="label" id="1469" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="1470" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1471" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1472">
-                                        <attributelist id="1473" addr="0x7f99f1e48550" >
-                                            <attribute name="name" value="label2" id="1474" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="1475" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1476" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1473" addr="0x7fca46996550" >
+                                            <attribute name="name" value="label2" id="1474" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="1475" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1476" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1477">
-                                        <attributelist id="1478" addr="0x7f99f1e485f0" >
-                                            <attribute name="name" value="iconImage" id="1479" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="1480" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1481" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1478" addr="0x7fca469965f0" >
+                                            <attribute name="name" value="iconImage" id="1479" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="1480" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1481" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1482">
-                                        <attributelist id="1483" addr="0x7f99f1e48690" >
-                                            <attribute name="name" value="thumbnailImage" id="1484" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="1485" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1486" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1483" addr="0x7fca46996690" >
+                                            <attribute name="name" value="thumbnailImage" id="1484" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="1485" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1486" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1487">
-                                        <attributelist id="1488" addr="0x7f99f1e48730" >
-                                            <attribute name="name" value="path" id="1489" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="1490" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1491" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1488" addr="0x7fca46996730" >
+                                            <attribute name="name" value="path" id="1489" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="1490" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1491" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_1" id="1492" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="1493" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="1492" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="1493" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="1494" addr="0x7f99f1e48bb0" >
-                            <attributelist id="1495" addr="0x7f99f1e48bb0" >
-                                <attribute name="name" value="ListItem" id="1496" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="1497" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="1498" addr="0x7f99f1e478f0" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e48e90" id="1499" addr="0x7f99f1e48e90" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e487f0" id="1500" addr="0x7f99f1e487f0" />
-                                <attribute name="sym_name" value="ListItem" id="1501" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e48e90" id="1502" addr="0x7f99f1e48e90" />
-                                <attribute name="defaultargs" value="0x7f99f1e48390" id="1503" addr="0x7f99f1e48390" />
-                                <attribute name="decl" value="f(r.q(const).String,r.q(const).String,r.q(const).String,r.q(const).String)." id="1504" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="1505" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e48390" id="1506" addr="0x7f99f1e48390" />
-                                <parmlist id="1507" addr="0x7f99f1e48910" >
+                        <constructor id="1494" addr="0x7fca46996bb0" >
+                            <attributelist id="1495" addr="0x7fca46996bb0" >
+                                <attribute name="name" value="ListItem" id="1496" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="1497" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="1498" addr="0x7fca469958f0" />
+                                <attribute name="csym_nextSibling" value="0x7fca46996e90" id="1499" addr="0x7fca46996e90" />
+                                <attribute name="sym_previousSibling" value="0x7fca469967f0" id="1500" addr="0x7fca469967f0" />
+                                <attribute name="sym_name" value="ListItem" id="1501" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca46996e90" id="1502" addr="0x7fca46996e90" />
+                                <attribute name="defaultargs" value="0x7fca46996390" id="1503" addr="0x7fca46996390" />
+                                <attribute name="decl" value="f(r.q(const).String,r.q(const).String,r.q(const).String,r.q(const).String)." id="1504" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="1505" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca46996390" id="1506" addr="0x7fca46996390" />
+                                <parmlist id="1507" addr="0x7fca46996910" >
                                     <parm id="1508">
-                                        <attributelist id="1509" addr="0x7f99f1e48910" >
-                                            <attribute name="name" value="label" id="1510" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="1511" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1512" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1509" addr="0x7fca46996910" >
+                                            <attribute name="name" value="label" id="1510" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="1511" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1512" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1513">
-                                        <attributelist id="1514" addr="0x7f99f1e489b0" >
-                                            <attribute name="name" value="label2" id="1515" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="1516" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1517" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1514" addr="0x7fca469969b0" >
+                                            <attribute name="name" value="label2" id="1515" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="1516" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1517" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1518">
-                                        <attributelist id="1519" addr="0x7f99f1e48a50" >
-                                            <attribute name="name" value="iconImage" id="1520" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="1521" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1522" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1519" addr="0x7fca46996a50" >
+                                            <attribute name="name" value="iconImage" id="1520" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="1521" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1522" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1523">
-                                        <attributelist id="1524" addr="0x7f99f1e48af0" >
-                                            <attribute name="name" value="thumbnailImage" id="1525" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="1526" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1527" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1524" addr="0x7fca46996af0" >
+                                            <attribute name="name" value="thumbnailImage" id="1525" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="1526" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1527" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_2" id="1528" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="1529" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_2" id="1528" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="1529" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="1530" addr="0x7f99f1e48e90" >
-                            <attributelist id="1531" addr="0x7f99f1e48e90" >
-                                <attribute name="name" value="ListItem" id="1532" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="1533" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="1534" addr="0x7f99f1e478f0" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e490d0" id="1535" addr="0x7f99f1e490d0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e48bb0" id="1536" addr="0x7f99f1e48bb0" />
-                                <attribute name="sym_name" value="ListItem" id="1537" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e490d0" id="1538" addr="0x7f99f1e490d0" />
-                                <attribute name="defaultargs" value="0x7f99f1e48390" id="1539" addr="0x7f99f1e48390" />
-                                <attribute name="decl" value="f(r.q(const).String,r.q(const).String,r.q(const).String)." id="1540" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="1541" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e48390" id="1542" addr="0x7f99f1e48390" />
-                                <parmlist id="1543" addr="0x7f99f1e48c50" >
+                        <constructor id="1530" addr="0x7fca46996e90" >
+                            <attributelist id="1531" addr="0x7fca46996e90" >
+                                <attribute name="name" value="ListItem" id="1532" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="1533" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="1534" addr="0x7fca469958f0" />
+                                <attribute name="csym_nextSibling" value="0x7fca469970d0" id="1535" addr="0x7fca469970d0" />
+                                <attribute name="sym_previousSibling" value="0x7fca46996bb0" id="1536" addr="0x7fca46996bb0" />
+                                <attribute name="sym_name" value="ListItem" id="1537" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469970d0" id="1538" addr="0x7fca469970d0" />
+                                <attribute name="defaultargs" value="0x7fca46996390" id="1539" addr="0x7fca46996390" />
+                                <attribute name="decl" value="f(r.q(const).String,r.q(const).String,r.q(const).String)." id="1540" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="1541" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca46996390" id="1542" addr="0x7fca46996390" />
+                                <parmlist id="1543" addr="0x7fca46996c50" >
                                     <parm id="1544">
-                                        <attributelist id="1545" addr="0x7f99f1e48c50" >
-                                            <attribute name="name" value="label" id="1546" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="1547" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1548" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1545" addr="0x7fca46996c50" >
+                                            <attribute name="name" value="label" id="1546" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="1547" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1548" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1549">
-                                        <attributelist id="1550" addr="0x7f99f1e48d30" >
-                                            <attribute name="name" value="label2" id="1551" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="1552" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1553" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1550" addr="0x7fca46996d30" >
+                                            <attribute name="name" value="label2" id="1551" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="1552" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1553" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1554">
-                                        <attributelist id="1555" addr="0x7f99f1e48dd0" >
-                                            <attribute name="name" value="iconImage" id="1556" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="1557" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1558" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1555" addr="0x7fca46996dd0" >
+                                            <attribute name="name" value="iconImage" id="1556" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="1557" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1558" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_3" id="1559" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="1560" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_3" id="1559" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="1560" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="1561" addr="0x7f99f1e490d0" >
-                            <attributelist id="1562" addr="0x7f99f1e490d0" >
-                                <attribute name="name" value="ListItem" id="1563" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="1564" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="1565" addr="0x7f99f1e478f0" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e49270" id="1566" addr="0x7f99f1e49270" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e48e90" id="1567" addr="0x7f99f1e48e90" />
-                                <attribute name="sym_name" value="ListItem" id="1568" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e49270" id="1569" addr="0x7f99f1e49270" />
-                                <attribute name="defaultargs" value="0x7f99f1e48390" id="1570" addr="0x7f99f1e48390" />
-                                <attribute name="decl" value="f(r.q(const).String,r.q(const).String)." id="1571" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="1572" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e48390" id="1573" addr="0x7f99f1e48390" />
-                                <parmlist id="1574" addr="0x7f99f1e48f30" >
+                        <constructor id="1561" addr="0x7fca469970d0" >
+                            <attributelist id="1562" addr="0x7fca469970d0" >
+                                <attribute name="name" value="ListItem" id="1563" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="1564" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="1565" addr="0x7fca469958f0" />
+                                <attribute name="csym_nextSibling" value="0x7fca46997270" id="1566" addr="0x7fca46997270" />
+                                <attribute name="sym_previousSibling" value="0x7fca46996e90" id="1567" addr="0x7fca46996e90" />
+                                <attribute name="sym_name" value="ListItem" id="1568" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca46997270" id="1569" addr="0x7fca46997270" />
+                                <attribute name="defaultargs" value="0x7fca46996390" id="1570" addr="0x7fca46996390" />
+                                <attribute name="decl" value="f(r.q(const).String,r.q(const).String)." id="1571" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="1572" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca46996390" id="1573" addr="0x7fca46996390" />
+                                <parmlist id="1574" addr="0x7fca46996f30" >
                                     <parm id="1575">
-                                        <attributelist id="1576" addr="0x7f99f1e48f30" >
-                                            <attribute name="name" value="label" id="1577" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="1578" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1579" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1576" addr="0x7fca46996f30" >
+                                            <attribute name="name" value="label" id="1577" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="1578" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1579" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1580">
-                                        <attributelist id="1581" addr="0x7f99f1e49010" >
-                                            <attribute name="name" value="label2" id="1582" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="1583" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1584" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1581" addr="0x7fca46997010" >
+                                            <attribute name="name" value="label2" id="1582" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="1583" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1584" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_4" id="1585" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="1586" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_4" id="1585" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="1586" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="1587" addr="0x7f99f1e49270" >
-                            <attributelist id="1588" addr="0x7f99f1e49270" >
-                                <attribute name="name" value="ListItem" id="1589" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="1590" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="1591" addr="0x7f99f1e478f0" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e49350" id="1592" addr="0x7f99f1e49350" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e490d0" id="1593" addr="0x7f99f1e490d0" />
-                                <attribute name="sym_name" value="ListItem" id="1594" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e49350" id="1595" addr="0x7f99f1e49350" />
-                                <attribute name="defaultargs" value="0x7f99f1e48390" id="1596" addr="0x7f99f1e48390" />
-                                <attribute name="decl" value="f(r.q(const).String)." id="1597" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="1598" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e48390" id="1599" addr="0x7f99f1e48390" />
-                                <parmlist id="1600" addr="0x7f99f1e49170" >
+                        <constructor id="1587" addr="0x7fca46997270" >
+                            <attributelist id="1588" addr="0x7fca46997270" >
+                                <attribute name="name" value="ListItem" id="1589" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="1590" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="1591" addr="0x7fca469958f0" />
+                                <attribute name="csym_nextSibling" value="0x7fca46997350" id="1592" addr="0x7fca46997350" />
+                                <attribute name="sym_previousSibling" value="0x7fca469970d0" id="1593" addr="0x7fca469970d0" />
+                                <attribute name="sym_name" value="ListItem" id="1594" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca46997350" id="1595" addr="0x7fca46997350" />
+                                <attribute name="defaultargs" value="0x7fca46996390" id="1596" addr="0x7fca46996390" />
+                                <attribute name="decl" value="f(r.q(const).String)." id="1597" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="1598" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca46996390" id="1599" addr="0x7fca46996390" />
+                                <parmlist id="1600" addr="0x7fca46997170" >
                                     <parm id="1601">
-                                        <attributelist id="1602" addr="0x7f99f1e49170" >
-                                            <attribute name="name" value="label" id="1603" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="1604" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1605" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1602" addr="0x7fca46997170" >
+                                            <attribute name="name" value="label" id="1603" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="1604" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1605" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_5" id="1606" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="1607" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_5" id="1606" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="1607" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="1608" addr="0x7f99f1e49350" >
-                            <attributelist id="1609" addr="0x7f99f1e49350" >
-                                <attribute name="name" value="ListItem" id="1610" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="1611" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="1612" addr="0x7f99f1e478f0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e49270" id="1613" addr="0x7f99f1e49270" />
-                                <attribute name="sym_name" value="ListItem" id="1614" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e48390" id="1615" addr="0x7f99f1e48390" />
-                                <attribute name="decl" value="f()." id="1616" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="1617" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e48390" id="1618" addr="0x7f99f1e48390" />
-                                <attribute name="sym_overname" value="__SWIG_6" id="1619" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="1620" addr="0x7f99f1de6c90" />
+                        <constructor id="1608" addr="0x7fca46997350" >
+                            <attributelist id="1609" addr="0x7fca46997350" >
+                                <attribute name="name" value="ListItem" id="1610" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="1611" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="1612" addr="0x7fca469958f0" />
+                                <attribute name="sym_previousSibling" value="0x7fca46997270" id="1613" addr="0x7fca46997270" />
+                                <attribute name="sym_name" value="ListItem" id="1614" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca46996390" id="1615" addr="0x7fca46996390" />
+                                <attribute name="decl" value="f()." id="1616" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="1617" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca46996390" id="1618" addr="0x7fca46996390" />
+                                <attribute name="sym_overname" value="__SWIG_6" id="1619" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="1620" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <destructor id="1621" addr="0x7f99f1e494d0" >
-                            <attributelist id="1622" addr="0x7f99f1e494d0" >
-                                <attribute name="ismember" value="1" id="1623" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="~ListItem" id="1624" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="~ListItem" id="1625" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="1626" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="1627" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="1628" addr="0x7f99f1e478f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="1629" addr="0x7f99f1de6c90" />
+                        <destructor id="1621" addr="0x7fca469974d0" >
+                            <attributelist id="1622" addr="0x7fca469974d0" >
+                                <attribute name="ismember" value="1" id="1623" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="~ListItem" id="1624" addr="0x7fca46934c90" />
+                                <attribute name="name" value="~ListItem" id="1625" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="1626" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="1627" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="1628" addr="0x7fca469958f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="1629" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </destructor >
-                        <cdecl id="1630" addr="0x7f99f1e49690" >
-                            <attributelist id="1631" addr="0x7f99f1e49690" >
-                                <attribute name="ismember" value="1" id="1632" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getLabel" id="1633" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="getLabel" id="1634" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="1635" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="1636" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="1637" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="XBMCAddon::String" id="1638" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="1639" addr="0x7f99f1e478f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="1640" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="1641" addr="0x7f99f1e49870" >
-                            <attributelist id="1642" addr="0x7f99f1e49870" >
-                                <attribute name="ismember" value="1" id="1643" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getLabel2" id="1644" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="getLabel2" id="1645" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="1646" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="1647" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="1648" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="XBMCAddon::String" id="1649" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="1650" addr="0x7f99f1e478f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="1651" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="1652" addr="0x7f99f1e49b70" >
-                            <attributelist id="1653" addr="0x7f99f1e49b70" >
-                                <attribute name="name" value="setLabel" id="1654" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="1655" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="1656" addr="0x7f99f1e478f0" />
-                                <attribute name="kind" value="function" id="1657" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setLabel" id="1658" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="1659" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="1660" addr="0x7f99f1de6c90" />
-                                <parmlist id="1661" addr="0x7f99f1e49ab0" >
+                        <cdecl id="1630" addr="0x7fca46997690" >
+                            <attributelist id="1631" addr="0x7fca46997690" >
+                                <attribute name="ismember" value="1" id="1632" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getLabel" id="1633" addr="0x7fca46934c90" />
+                                <attribute name="name" value="getLabel" id="1634" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="1635" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="1636" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="1637" addr="0x7fca46934c90" />
+                                <attribute name="type" value="XBMCAddon::String" id="1638" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="1639" addr="0x7fca469958f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="1640" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="1641" addr="0x7fca46997870" >
+                            <attributelist id="1642" addr="0x7fca46997870" >
+                                <attribute name="ismember" value="1" id="1643" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getLabel2" id="1644" addr="0x7fca46934c90" />
+                                <attribute name="name" value="getLabel2" id="1645" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="1646" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="1647" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="1648" addr="0x7fca46934c90" />
+                                <attribute name="type" value="XBMCAddon::String" id="1649" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="1650" addr="0x7fca469958f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="1651" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="1652" addr="0x7fca46997b70" >
+                            <attributelist id="1653" addr="0x7fca46997b70" >
+                                <attribute name="name" value="setLabel" id="1654" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="1655" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="1656" addr="0x7fca469958f0" />
+                                <attribute name="kind" value="function" id="1657" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setLabel" id="1658" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="1659" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="1660" addr="0x7fca46934c90" />
+                                <parmlist id="1661" addr="0x7fca46997ab0" >
                                     <parm id="1662">
-                                        <attributelist id="1663" addr="0x7f99f1e49ab0" >
-                                            <attribute name="name" value="label" id="1664" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1665" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1663" addr="0x7fca46997ab0" >
+                                            <attribute name="name" value="label" id="1664" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1665" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="1666" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="1667" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="1666" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="1667" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="1668" addr="0x7f99f1e49e70" >
-                            <attributelist id="1669" addr="0x7f99f1e49e70" >
-                                <attribute name="name" value="setLabel2" id="1670" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="1671" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="1672" addr="0x7f99f1e478f0" />
-                                <attribute name="kind" value="function" id="1673" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setLabel2" id="1674" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="1675" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="1676" addr="0x7f99f1de6c90" />
-                                <parmlist id="1677" addr="0x7f99f1e49db0" >
+                        <cdecl id="1668" addr="0x7fca46997e70" >
+                            <attributelist id="1669" addr="0x7fca46997e70" >
+                                <attribute name="name" value="setLabel2" id="1670" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="1671" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="1672" addr="0x7fca469958f0" />
+                                <attribute name="kind" value="function" id="1673" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setLabel2" id="1674" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="1675" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="1676" addr="0x7fca46934c90" />
+                                <parmlist id="1677" addr="0x7fca46997db0" >
                                     <parm id="1678">
-                                        <attributelist id="1679" addr="0x7f99f1e49db0" >
-                                            <attribute name="name" value="label" id="1680" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1681" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1679" addr="0x7fca46997db0" >
+                                            <attribute name="name" value="label" id="1680" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1681" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="1682" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="1683" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="1682" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="1683" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="1684" addr="0x7f99f1e4a170" >
-                            <attributelist id="1685" addr="0x7f99f1e4a170" >
-                                <attribute name="name" value="setIconImage" id="1686" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="1687" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="1688" addr="0x7f99f1e478f0" />
-                                <attribute name="kind" value="function" id="1689" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setIconImage" id="1690" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="1691" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="1692" addr="0x7f99f1de6c90" />
-                                <parmlist id="1693" addr="0x7f99f1e4a0b0" >
+                        <cdecl id="1684" addr="0x7fca46998170" >
+                            <attributelist id="1685" addr="0x7fca46998170" >
+                                <attribute name="name" value="setIconImage" id="1686" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="1687" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="1688" addr="0x7fca469958f0" />
+                                <attribute name="kind" value="function" id="1689" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setIconImage" id="1690" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="1691" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="1692" addr="0x7fca46934c90" />
+                                <parmlist id="1693" addr="0x7fca469980b0" >
                                     <parm id="1694">
-                                        <attributelist id="1695" addr="0x7f99f1e4a0b0" >
-                                            <attribute name="name" value="iconImage" id="1696" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1697" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1695" addr="0x7fca469980b0" >
+                                            <attribute name="name" value="iconImage" id="1696" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1697" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="1698" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="1699" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="1698" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="1699" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="1700" addr="0x7f99f1e4a470" >
-                            <attributelist id="1701" addr="0x7f99f1e4a470" >
-                                <attribute name="name" value="setThumbnailImage" id="1702" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="1703" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="1704" addr="0x7f99f1e478f0" />
-                                <attribute name="kind" value="function" id="1705" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setThumbnailImage" id="1706" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="1707" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="1708" addr="0x7f99f1de6c90" />
-                                <parmlist id="1709" addr="0x7f99f1e4a3b0" >
+                        <cdecl id="1700" addr="0x7fca46998470" >
+                            <attributelist id="1701" addr="0x7fca46998470" >
+                                <attribute name="name" value="setThumbnailImage" id="1702" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="1703" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="1704" addr="0x7fca469958f0" />
+                                <attribute name="kind" value="function" id="1705" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setThumbnailImage" id="1706" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="1707" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="1708" addr="0x7fca46934c90" />
+                                <parmlist id="1709" addr="0x7fca469983b0" >
                                     <parm id="1710">
-                                        <attributelist id="1711" addr="0x7f99f1e4a3b0" >
-                                            <attribute name="name" value="thumbFilename" id="1712" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1713" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1711" addr="0x7fca469983b0" >
+                                            <attribute name="name" value="thumbFilename" id="1712" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1713" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="1714" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="1715" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="1714" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="1715" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="1716" addr="0x7f99f1e4a770" >
-                            <attributelist id="1717" addr="0x7f99f1e4a770" >
-                                <attribute name="name" value="setArt" id="1718" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="1719" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="1720" addr="0x7f99f1e478f0" />
-                                <attribute name="kind" value="function" id="1721" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setArt" id="1722" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::Properties)." id="1723" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="1724" addr="0x7f99f1de6c90" />
-                                <parmlist id="1725" addr="0x7f99f1e4a6b0" >
+                        <cdecl id="1716" addr="0x7fca46998770" >
+                            <attributelist id="1717" addr="0x7fca46998770" >
+                                <attribute name="name" value="setArt" id="1718" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="1719" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="1720" addr="0x7fca469958f0" />
+                                <attribute name="kind" value="function" id="1721" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setArt" id="1722" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::Properties)." id="1723" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="1724" addr="0x7fca46934c90" />
+                                <parmlist id="1725" addr="0x7fca469986b0" >
                                     <parm id="1726">
-                                        <attributelist id="1727" addr="0x7f99f1e4a6b0" >
-                                            <attribute name="name" value="dictionary" id="1728" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::Properties" id="1729" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1727" addr="0x7fca469986b0" >
+                                            <attribute name="name" value="dictionary" id="1728" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::Properties" id="1729" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="1730" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="1731" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="1730" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="1731" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="1732" addr="0x7f99f1e4aa30" >
-                            <attributelist id="1733" addr="0x7f99f1e4aa30" >
-                                <attribute name="name" value="setIsFolder" id="1734" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="1735" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="1736" addr="0x7f99f1e478f0" />
-                                <attribute name="kind" value="function" id="1737" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setIsFolder" id="1738" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(bool)." id="1739" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="1740" addr="0x7f99f1de6c90" />
-                                <parmlist id="1741" addr="0x7f99f1e4a970" >
+                        <cdecl id="1732" addr="0x7fca46998a30" >
+                            <attributelist id="1733" addr="0x7fca46998a30" >
+                                <attribute name="name" value="setIsFolder" id="1734" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="1735" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="1736" addr="0x7fca469958f0" />
+                                <attribute name="kind" value="function" id="1737" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setIsFolder" id="1738" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(bool)." id="1739" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="1740" addr="0x7fca46934c90" />
+                                <parmlist id="1741" addr="0x7fca46998970" >
                                     <parm id="1742">
-                                        <attributelist id="1743" addr="0x7f99f1e4a970" >
-                                            <attribute name="name" value="isFolder" id="1744" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="1745" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1743" addr="0x7fca46998970" >
+                                            <attribute name="name" value="isFolder" id="1744" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="1745" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="1746" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="1747" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="1746" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="1747" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="1748" addr="0x7f99f1e4aeb0" >
-                            <attributelist id="1749" addr="0x7f99f1e4aeb0" >
-                                <attribute name="name" value="setUniqueIDs" id="1750" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="1751" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="1752" addr="0x7f99f1e478f0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e4b050" id="1753" addr="0x7f99f1e4b050" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e4b050" id="1754" addr="0x7f99f1e4b050" />
-                                <attribute name="kind" value="function" id="1755" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setUniqueIDs" id="1756" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::Properties,r.q(const).XBMCAddon::String)." id="1757" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="1758" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e4aeb0" id="1759" addr="0x7f99f1e4aeb0" />
-                                <parmlist id="1760" addr="0x7f99f1e4ac70" >
+                        <cdecl id="1748" addr="0x7fca46998eb0" >
+                            <attributelist id="1749" addr="0x7fca46998eb0" >
+                                <attribute name="name" value="setUniqueIDs" id="1750" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="1751" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="1752" addr="0x7fca469958f0" />
+                                <attribute name="sym_nextSibling" value="0x7fca46999050" id="1753" addr="0x7fca46999050" />
+                                <attribute name="csym_nextSibling" value="0x7fca46999050" id="1754" addr="0x7fca46999050" />
+                                <attribute name="kind" value="function" id="1755" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setUniqueIDs" id="1756" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::Properties,r.q(const).XBMCAddon::String)." id="1757" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="1758" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca46998eb0" id="1759" addr="0x7fca46998eb0" />
+                                <parmlist id="1760" addr="0x7fca46998c70" >
                                     <parm id="1761">
-                                        <attributelist id="1762" addr="0x7f99f1e4ac70" >
-                                            <attribute name="name" value="dictionary" id="1763" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::Properties" id="1764" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1762" addr="0x7fca46998c70" >
+                                            <attribute name="name" value="dictionary" id="1763" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::Properties" id="1764" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1765">
-                                        <attributelist id="1766" addr="0x7f99f1e4adf0" >
-                                            <attribute name="name" value="defaultrating" id="1767" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="&quot;&quot;" id="1768" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1769" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1766" addr="0x7fca46998df0" >
+                                            <attribute name="name" value="defaultrating" id="1767" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="&quot;&quot;" id="1768" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1769" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="1770" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="1771" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="1770" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="1771" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="1772" addr="0x7f99f1e4b050" >
-                            <attributelist id="1773" addr="0x7f99f1e4b050" >
-                                <attribute name="name" value="setUniqueIDs" id="1774" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="1775" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="1776" addr="0x7f99f1e478f0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e4aeb0" id="1777" addr="0x7f99f1e4aeb0" />
-                                <attribute name="kind" value="function" id="1778" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setUniqueIDs" id="1779" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e4aeb0" id="1780" addr="0x7f99f1e4aeb0" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::Properties)." id="1781" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="1782" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e4aeb0" id="1783" addr="0x7f99f1e4aeb0" />
-                                <parmlist id="1784" addr="0x7f99f1e4af50" >
+                        <cdecl id="1772" addr="0x7fca46999050" >
+                            <attributelist id="1773" addr="0x7fca46999050" >
+                                <attribute name="name" value="setUniqueIDs" id="1774" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="1775" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="1776" addr="0x7fca469958f0" />
+                                <attribute name="sym_previousSibling" value="0x7fca46998eb0" id="1777" addr="0x7fca46998eb0" />
+                                <attribute name="kind" value="function" id="1778" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setUniqueIDs" id="1779" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca46998eb0" id="1780" addr="0x7fca46998eb0" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::Properties)." id="1781" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="1782" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca46998eb0" id="1783" addr="0x7fca46998eb0" />
+                                <parmlist id="1784" addr="0x7fca46998f50" >
                                     <parm id="1785">
-                                        <attributelist id="1786" addr="0x7f99f1e4af50" >
-                                            <attribute name="name" value="dictionary" id="1787" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::Properties" id="1788" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1786" addr="0x7fca46998f50" >
+                                            <attribute name="name" value="dictionary" id="1787" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::Properties" id="1788" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="1789" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="1790" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="1789" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="1790" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="1791" addr="0x7f99f1e4b710" >
-                            <attributelist id="1792" addr="0x7f99f1e4b710" >
-                                <attribute name="name" value="setRating" id="1793" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="1794" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="1795" addr="0x7f99f1e478f0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e4b9d0" id="1796" addr="0x7f99f1e4b9d0" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e4b9d0" id="1797" addr="0x7f99f1e4b9d0" />
-                                <attribute name="kind" value="function" id="1798" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setRating" id="1799" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(std::string,float,int,bool)." id="1800" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="1801" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e4b710" id="1802" addr="0x7f99f1e4b710" />
-                                <parmlist id="1803" addr="0x7f99f1e4b290" >
+                        <cdecl id="1791" addr="0x7fca46999710" >
+                            <attributelist id="1792" addr="0x7fca46999710" >
+                                <attribute name="name" value="setRating" id="1793" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="1794" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="1795" addr="0x7fca469958f0" />
+                                <attribute name="sym_nextSibling" value="0x7fca469999d0" id="1796" addr="0x7fca469999d0" />
+                                <attribute name="csym_nextSibling" value="0x7fca469999d0" id="1797" addr="0x7fca469999d0" />
+                                <attribute name="kind" value="function" id="1798" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setRating" id="1799" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(std::string,float,int,bool)." id="1800" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="1801" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca46999710" id="1802" addr="0x7fca46999710" />
+                                <parmlist id="1803" addr="0x7fca46999290" >
                                     <parm id="1804">
-                                        <attributelist id="1805" addr="0x7f99f1e4b290" >
-                                            <attribute name="name" value="type" id="1806" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="std::string" id="1807" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1805" addr="0x7fca46999290" >
+                                            <attribute name="name" value="type" id="1806" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="std::string" id="1807" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1808">
-                                        <attributelist id="1809" addr="0x7f99f1e4b3b0" >
-                                            <attribute name="name" value="rating" id="1810" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="float" id="1811" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1809" addr="0x7fca469993b0" >
+                                            <attribute name="name" value="rating" id="1810" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="float" id="1811" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1812">
-                                        <attributelist id="1813" addr="0x7f99f1e4b510" >
-                                            <attribute name="name" value="votes" id="1814" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="0" id="1815" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="1816" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1813" addr="0x7fca46999510" >
+                                            <attribute name="name" value="votes" id="1814" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="0" id="1815" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="1816" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1817">
-                                        <attributelist id="1818" addr="0x7f99f1e4b650" >
-                                            <attribute name="name" value="defaultt" id="1819" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="false" id="1820" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="1821" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1818" addr="0x7fca46999650" >
+                                            <attribute name="name" value="defaultt" id="1819" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="false" id="1820" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="1821" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="1822" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="1823" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="1822" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="1823" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="1824" addr="0x7f99f1e4b9d0" >
-                            <attributelist id="1825" addr="0x7f99f1e4b9d0" >
-                                <attribute name="name" value="setRating" id="1826" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="1827" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="1828" addr="0x7f99f1e478f0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e4b710" id="1829" addr="0x7f99f1e4b710" />
-                                <attribute name="kind" value="function" id="1830" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setRating" id="1831" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e4bbf0" id="1832" addr="0x7f99f1e4bbf0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e4bbf0" id="1833" addr="0x7f99f1e4bbf0" />
-                                <attribute name="defaultargs" value="0x7f99f1e4b710" id="1834" addr="0x7f99f1e4b710" />
-                                <attribute name="decl" value="f(std::string,float,int)." id="1835" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="1836" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e4b710" id="1837" addr="0x7f99f1e4b710" />
-                                <parmlist id="1838" addr="0x7f99f1e4b7b0" >
+                        <cdecl id="1824" addr="0x7fca469999d0" >
+                            <attributelist id="1825" addr="0x7fca469999d0" >
+                                <attribute name="name" value="setRating" id="1826" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="1827" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="1828" addr="0x7fca469958f0" />
+                                <attribute name="sym_previousSibling" value="0x7fca46999710" id="1829" addr="0x7fca46999710" />
+                                <attribute name="kind" value="function" id="1830" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setRating" id="1831" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca46999bf0" id="1832" addr="0x7fca46999bf0" />
+                                <attribute name="sym_nextSibling" value="0x7fca46999bf0" id="1833" addr="0x7fca46999bf0" />
+                                <attribute name="defaultargs" value="0x7fca46999710" id="1834" addr="0x7fca46999710" />
+                                <attribute name="decl" value="f(std::string,float,int)." id="1835" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="1836" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca46999710" id="1837" addr="0x7fca46999710" />
+                                <parmlist id="1838" addr="0x7fca469997b0" >
                                     <parm id="1839">
-                                        <attributelist id="1840" addr="0x7f99f1e4b7b0" >
-                                            <attribute name="name" value="type" id="1841" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="std::string" id="1842" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1840" addr="0x7fca469997b0" >
+                                            <attribute name="name" value="type" id="1841" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="std::string" id="1842" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1843">
-                                        <attributelist id="1844" addr="0x7f99f1e4b890" >
-                                            <attribute name="name" value="rating" id="1845" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="float" id="1846" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1844" addr="0x7fca46999890" >
+                                            <attribute name="name" value="rating" id="1845" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="float" id="1846" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1847">
-                                        <attributelist id="1848" addr="0x7f99f1e4b910" >
-                                            <attribute name="name" value="votes" id="1849" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="0" id="1850" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="1851" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1848" addr="0x7fca46999910" >
+                                            <attribute name="name" value="votes" id="1849" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="0" id="1850" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="1851" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="1852" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="1853" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="1852" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="1853" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="1854" addr="0x7f99f1e4bbf0" >
-                            <attributelist id="1855" addr="0x7f99f1e4bbf0" >
-                                <attribute name="name" value="setRating" id="1856" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="1857" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="1858" addr="0x7f99f1e478f0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e4b9d0" id="1859" addr="0x7f99f1e4b9d0" />
-                                <attribute name="kind" value="function" id="1860" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setRating" id="1861" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e4b710" id="1862" addr="0x7f99f1e4b710" />
-                                <attribute name="decl" value="f(std::string,float)." id="1863" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="1864" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e4b710" id="1865" addr="0x7f99f1e4b710" />
-                                <parmlist id="1866" addr="0x7f99f1e4ba70" >
+                        <cdecl id="1854" addr="0x7fca46999bf0" >
+                            <attributelist id="1855" addr="0x7fca46999bf0" >
+                                <attribute name="name" value="setRating" id="1856" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="1857" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="1858" addr="0x7fca469958f0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469999d0" id="1859" addr="0x7fca469999d0" />
+                                <attribute name="kind" value="function" id="1860" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setRating" id="1861" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca46999710" id="1862" addr="0x7fca46999710" />
+                                <attribute name="decl" value="f(std::string,float)." id="1863" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="1864" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca46999710" id="1865" addr="0x7fca46999710" />
+                                <parmlist id="1866" addr="0x7fca46999a70" >
                                     <parm id="1867">
-                                        <attributelist id="1868" addr="0x7f99f1e4ba70" >
-                                            <attribute name="name" value="type" id="1869" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="std::string" id="1870" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1868" addr="0x7fca46999a70" >
+                                            <attribute name="name" value="type" id="1869" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="std::string" id="1870" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1871">
-                                        <attributelist id="1872" addr="0x7f99f1e4bb50" >
-                                            <attribute name="name" value="rating" id="1873" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="float" id="1874" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1872" addr="0x7fca46999b50" >
+                                            <attribute name="name" value="rating" id="1873" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="float" id="1874" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="1875" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_2" id="1876" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="1875" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_2" id="1876" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="1877" addr="0x7f99f1e4c050" >
-                            <attributelist id="1878" addr="0x7f99f1e4c050" >
-                                <attribute name="name" value="addSeason" id="1879" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="1880" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="1881" addr="0x7f99f1e478f0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e4c1f0" id="1882" addr="0x7f99f1e4c1f0" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e4c1f0" id="1883" addr="0x7f99f1e4c1f0" />
-                                <attribute name="kind" value="function" id="1884" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="addSeason" id="1885" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(int,std::string)." id="1886" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="1887" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e4c050" id="1888" addr="0x7f99f1e4c050" />
-                                <parmlist id="1889" addr="0x7f99f1e4be10" >
+                        <cdecl id="1877" addr="0x7fca4699a050" >
+                            <attributelist id="1878" addr="0x7fca4699a050" >
+                                <attribute name="name" value="addSeason" id="1879" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="1880" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="1881" addr="0x7fca469958f0" />
+                                <attribute name="sym_nextSibling" value="0x7fca4699a1f0" id="1882" addr="0x7fca4699a1f0" />
+                                <attribute name="csym_nextSibling" value="0x7fca4699a1f0" id="1883" addr="0x7fca4699a1f0" />
+                                <attribute name="kind" value="function" id="1884" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="addSeason" id="1885" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(int,std::string)." id="1886" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="1887" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca4699a050" id="1888" addr="0x7fca4699a050" />
+                                <parmlist id="1889" addr="0x7fca46999e10" >
                                     <parm id="1890">
-                                        <attributelist id="1891" addr="0x7f99f1e4be10" >
-                                            <attribute name="name" value="number" id="1892" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="1893" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1891" addr="0x7fca46999e10" >
+                                            <attribute name="name" value="number" id="1892" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="1893" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1894">
-                                        <attributelist id="1895" addr="0x7f99f1e4bf90" >
-                                            <attribute name="name" value="name" id="1896" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="&quot;&quot;" id="1897" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="std::string" id="1898" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1895" addr="0x7fca46999f90" >
+                                            <attribute name="name" value="name" id="1896" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="&quot;&quot;" id="1897" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="std::string" id="1898" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="1899" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="1900" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="1899" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="1900" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="1901" addr="0x7f99f1e4c1f0" >
-                            <attributelist id="1902" addr="0x7f99f1e4c1f0" >
-                                <attribute name="name" value="addSeason" id="1903" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="1904" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="1905" addr="0x7f99f1e478f0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e4c050" id="1906" addr="0x7f99f1e4c050" />
-                                <attribute name="kind" value="function" id="1907" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="addSeason" id="1908" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e4c050" id="1909" addr="0x7f99f1e4c050" />
-                                <attribute name="decl" value="f(int)." id="1910" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="1911" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e4c050" id="1912" addr="0x7f99f1e4c050" />
-                                <parmlist id="1913" addr="0x7f99f1e4c0f0" >
+                        <cdecl id="1901" addr="0x7fca4699a1f0" >
+                            <attributelist id="1902" addr="0x7fca4699a1f0" >
+                                <attribute name="name" value="addSeason" id="1903" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="1904" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="1905" addr="0x7fca469958f0" />
+                                <attribute name="sym_previousSibling" value="0x7fca4699a050" id="1906" addr="0x7fca4699a050" />
+                                <attribute name="kind" value="function" id="1907" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="addSeason" id="1908" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca4699a050" id="1909" addr="0x7fca4699a050" />
+                                <attribute name="decl" value="f(int)." id="1910" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="1911" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca4699a050" id="1912" addr="0x7fca4699a050" />
+                                <parmlist id="1913" addr="0x7fca4699a0f0" >
                                     <parm id="1914">
-                                        <attributelist id="1915" addr="0x7f99f1e4c0f0" >
-                                            <attribute name="name" value="number" id="1916" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="1917" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1915" addr="0x7fca4699a0f0" >
+                                            <attribute name="name" value="number" id="1916" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="1917" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="1918" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="1919" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="1918" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="1919" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="1920" addr="0x7f99f1e4c510" >
-                            <attributelist id="1921" addr="0x7f99f1e4c510" >
-                                <attribute name="name" value="getArt" id="1922" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="1923" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="1924" addr="0x7f99f1e478f0" />
-                                <attribute name="kind" value="function" id="1925" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getArt" id="1926" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(p.q(const).char)." id="1927" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="1928" addr="0x7f99f1de6c90" />
-                                <parmlist id="1929" addr="0x7f99f1e4c450" >
+                        <cdecl id="1920" addr="0x7fca4699a510" >
+                            <attributelist id="1921" addr="0x7fca4699a510" >
+                                <attribute name="name" value="getArt" id="1922" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="1923" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="1924" addr="0x7fca469958f0" />
+                                <attribute name="kind" value="function" id="1925" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getArt" id="1926" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(p.q(const).char)." id="1927" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="1928" addr="0x7fca46934c90" />
+                                <parmlist id="1929" addr="0x7fca4699a450" >
                                     <parm id="1930">
-                                        <attributelist id="1931" addr="0x7f99f1e4c450" >
-                                            <attribute name="name" value="key" id="1932" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="1933" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1931" addr="0x7fca4699a450" >
+                                            <attribute name="name" value="key" id="1932" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="1933" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="XBMCAddon::String" id="1934" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="1935" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="XBMCAddon::String" id="1934" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="1935" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="1936" addr="0x7f99f1e4c830" >
-                            <attributelist id="1937" addr="0x7f99f1e4c830" >
-                                <attribute name="name" value="getUniqueID" id="1938" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="1939" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="1940" addr="0x7f99f1e478f0" />
-                                <attribute name="kind" value="function" id="1941" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getUniqueID" id="1942" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(p.q(const).char)." id="1943" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="1944" addr="0x7f99f1de6c90" />
-                                <parmlist id="1945" addr="0x7f99f1e4c770" >
+                        <cdecl id="1936" addr="0x7fca4699a830" >
+                            <attributelist id="1937" addr="0x7fca4699a830" >
+                                <attribute name="name" value="getUniqueID" id="1938" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="1939" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="1940" addr="0x7fca469958f0" />
+                                <attribute name="kind" value="function" id="1941" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getUniqueID" id="1942" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(p.q(const).char)." id="1943" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="1944" addr="0x7fca46934c90" />
+                                <parmlist id="1945" addr="0x7fca4699a770" >
                                     <parm id="1946">
-                                        <attributelist id="1947" addr="0x7f99f1e4c770" >
-                                            <attribute name="name" value="key" id="1948" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="1949" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1947" addr="0x7fca4699a770" >
+                                            <attribute name="name" value="key" id="1948" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="1949" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="XBMCAddon::String" id="1950" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="1951" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="XBMCAddon::String" id="1950" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="1951" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="1952" addr="0x7f99f1e4cb50" >
-                            <attributelist id="1953" addr="0x7f99f1e4cb50" >
-                                <attribute name="name" value="getRating" id="1954" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="1955" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="1956" addr="0x7f99f1e478f0" />
-                                <attribute name="kind" value="function" id="1957" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getRating" id="1958" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(p.q(const).char)." id="1959" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="1960" addr="0x7f99f1de6c90" />
-                                <parmlist id="1961" addr="0x7f99f1e4ca90" >
+                        <cdecl id="1952" addr="0x7fca4699ab50" >
+                            <attributelist id="1953" addr="0x7fca4699ab50" >
+                                <attribute name="name" value="getRating" id="1954" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="1955" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="1956" addr="0x7fca469958f0" />
+                                <attribute name="kind" value="function" id="1957" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getRating" id="1958" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(p.q(const).char)." id="1959" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="1960" addr="0x7fca46934c90" />
+                                <parmlist id="1961" addr="0x7fca4699aa90" >
                                     <parm id="1962">
-                                        <attributelist id="1963" addr="0x7f99f1e4ca90" >
-                                            <attribute name="name" value="key" id="1964" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="1965" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1963" addr="0x7fca4699aa90" >
+                                            <attribute name="name" value="key" id="1964" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="1965" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="float" id="1966" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="1967" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="float" id="1966" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="1967" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="1968" addr="0x7f99f1e4ce70" >
-                            <attributelist id="1969" addr="0x7f99f1e4ce70" >
-                                <attribute name="name" value="getVotes" id="1970" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="1971" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="1972" addr="0x7f99f1e478f0" />
-                                <attribute name="kind" value="function" id="1973" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getVotes" id="1974" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(p.q(const).char)." id="1975" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="1976" addr="0x7f99f1de6c90" />
-                                <parmlist id="1977" addr="0x7f99f1e4cdb0" >
+                        <cdecl id="1968" addr="0x7fca4699ae70" >
+                            <attributelist id="1969" addr="0x7fca4699ae70" >
+                                <attribute name="name" value="getVotes" id="1970" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="1971" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="1972" addr="0x7fca469958f0" />
+                                <attribute name="kind" value="function" id="1973" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getVotes" id="1974" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(p.q(const).char)." id="1975" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="1976" addr="0x7fca46934c90" />
+                                <parmlist id="1977" addr="0x7fca4699adb0" >
                                     <parm id="1978">
-                                        <attributelist id="1979" addr="0x7f99f1e4cdb0" >
-                                            <attribute name="name" value="key" id="1980" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="1981" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1979" addr="0x7fca4699adb0" >
+                                            <attribute name="name" value="key" id="1980" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="1981" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="int" id="1982" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="1983" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="int" id="1982" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="1983" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="1984" addr="0x7f99f1e4d130" >
-                            <attributelist id="1985" addr="0x7f99f1e4d130" >
-                                <attribute name="name" value="select" id="1986" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="1987" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="1988" addr="0x7f99f1e478f0" />
-                                <attribute name="kind" value="function" id="1989" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="select" id="1990" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(bool)." id="1991" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="1992" addr="0x7f99f1de6c90" />
-                                <parmlist id="1993" addr="0x7f99f1e4d070" >
+                        <cdecl id="1984" addr="0x7fca4699b130" >
+                            <attributelist id="1985" addr="0x7fca4699b130" >
+                                <attribute name="name" value="select" id="1986" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="1987" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="1988" addr="0x7fca469958f0" />
+                                <attribute name="kind" value="function" id="1989" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="select" id="1990" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(bool)." id="1991" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="1992" addr="0x7fca46934c90" />
+                                <parmlist id="1993" addr="0x7fca4699b070" >
                                     <parm id="1994">
-                                        <attributelist id="1995" addr="0x7f99f1e4d070" >
-                                            <attribute name="name" value="selected" id="1996" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="1997" addr="0x7f99f1de6c90" />
+                                        <attributelist id="1995" addr="0x7fca4699b070" >
+                                            <attribute name="name" value="selected" id="1996" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="1997" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="1998" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="1999" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="1998" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="1999" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="2000" addr="0x7f99f1e4d2f0" >
-                            <attributelist id="2001" addr="0x7f99f1e4d2f0" >
-                                <attribute name="ismember" value="1" id="2002" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="isSelected" id="2003" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="isSelected" id="2004" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="2005" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="2006" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="2007" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="bool" id="2008" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="2009" addr="0x7f99f1e478f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2010" addr="0x7f99f1de6c90" />
+                        <cdecl id="2000" addr="0x7fca4699b2f0" >
+                            <attributelist id="2001" addr="0x7fca4699b2f0" >
+                                <attribute name="ismember" value="1" id="2002" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="isSelected" id="2003" addr="0x7fca46934c90" />
+                                <attribute name="name" value="isSelected" id="2004" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="2005" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="2006" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="2007" addr="0x7fca46934c90" />
+                                <attribute name="type" value="bool" id="2008" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="2009" addr="0x7fca469958f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2010" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="2011" addr="0x7f99f1e4d730" >
-                            <attributelist id="2012" addr="0x7f99f1e4d730" >
-                                <attribute name="name" value="setInfo" id="2013" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="2014" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="2015" addr="0x7f99f1e478f0" />
-                                <attribute name="kind" value="function" id="2016" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setInfo" id="2017" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(p.q(const).char,r.q(const).XBMCAddon::xbmcgui::InfoLabelDict)." id="2018" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="2019" addr="0x7f99f1de6c90" />
-                                <parmlist id="2020" addr="0x7f99f1e4d530" >
+                        <cdecl id="2011" addr="0x7fca4699b730" >
+                            <attributelist id="2012" addr="0x7fca4699b730" >
+                                <attribute name="name" value="setInfo" id="2013" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="2014" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="2015" addr="0x7fca469958f0" />
+                                <attribute name="kind" value="function" id="2016" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setInfo" id="2017" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(p.q(const).char,r.q(const).XBMCAddon::xbmcgui::InfoLabelDict)." id="2018" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="2019" addr="0x7fca46934c90" />
+                                <parmlist id="2020" addr="0x7fca4699b530" >
                                     <parm id="2021">
-                                        <attributelist id="2022" addr="0x7f99f1e4d530" >
-                                            <attribute name="name" value="type" id="2023" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="2024" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2022" addr="0x7fca4699b530" >
+                                            <attribute name="name" value="type" id="2023" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="2024" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="2025">
-                                        <attributelist id="2026" addr="0x7f99f1e4d670" >
-                                            <attribute name="name" value="infoLabels" id="2027" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::xbmcgui::InfoLabelDict" id="2028" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2026" addr="0x7fca4699b670" >
+                                            <attribute name="name" value="infoLabels" id="2027" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::xbmcgui::InfoLabelDict" id="2028" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="2029" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2030" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="2029" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2030" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="2031" addr="0x7f99f1e4db10" >
-                            <attributelist id="2032" addr="0x7f99f1e4db10" >
-                                <attribute name="name" value="setCast" id="2033" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="2034" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="2035" addr="0x7f99f1e478f0" />
-                                <attribute name="kind" value="function" id="2036" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setCast" id="2037" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).std::vector&lt;(XBMCAddon::Properties)>)." id="2038" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="2039" addr="0x7f99f1de6c90" />
-                                <parmlist id="2040" addr="0x7f99f1e4da50" >
+                        <cdecl id="2031" addr="0x7fca4699bb10" >
+                            <attributelist id="2032" addr="0x7fca4699bb10" >
+                                <attribute name="name" value="setCast" id="2033" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="2034" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="2035" addr="0x7fca469958f0" />
+                                <attribute name="kind" value="function" id="2036" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setCast" id="2037" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).std::vector&lt;(XBMCAddon::Properties)>)." id="2038" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="2039" addr="0x7fca46934c90" />
+                                <parmlist id="2040" addr="0x7fca4699ba50" >
                                     <parm id="2041">
-                                        <attributelist id="2042" addr="0x7f99f1e4da50" >
-                                            <attribute name="name" value="actors" id="2043" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).std::vector&lt;(XBMCAddon::Properties)>" id="2044" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2042" addr="0x7fca4699ba50" >
+                                            <attribute name="name" value="actors" id="2043" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).std::vector&lt;(XBMCAddon::Properties)>" id="2044" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="2045" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2046" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="2045" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2046" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="2047" addr="0x7f99f1e4def0" >
-                            <attributelist id="2048" addr="0x7f99f1e4def0" >
-                                <attribute name="name" value="setAvailableFanart" id="2049" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="2050" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="2051" addr="0x7f99f1e478f0" />
-                                <attribute name="kind" value="function" id="2052" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setAvailableFanart" id="2053" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).std::vector&lt;(XBMCAddon::Properties)>)." id="2054" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="2055" addr="0x7f99f1de6c90" />
-                                <parmlist id="2056" addr="0x7f99f1e4de30" >
+                        <cdecl id="2047" addr="0x7fca4699bef0" >
+                            <attributelist id="2048" addr="0x7fca4699bef0" >
+                                <attribute name="name" value="setAvailableFanart" id="2049" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="2050" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="2051" addr="0x7fca469958f0" />
+                                <attribute name="kind" value="function" id="2052" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setAvailableFanart" id="2053" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).std::vector&lt;(XBMCAddon::Properties)>)." id="2054" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="2055" addr="0x7fca46934c90" />
+                                <parmlist id="2056" addr="0x7fca4699be30" >
                                     <parm id="2057">
-                                        <attributelist id="2058" addr="0x7f99f1e4de30" >
-                                            <attribute name="name" value="images" id="2059" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).std::vector&lt;(XBMCAddon::Properties)>" id="2060" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2058" addr="0x7fca4699be30" >
+                                            <attribute name="name" value="images" id="2059" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).std::vector&lt;(XBMCAddon::Properties)>" id="2060" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="2061" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2062" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="2061" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2062" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="2063" addr="0x7f99f1e4ea70" >
-                            <attributelist id="2064" addr="0x7f99f1e4ea70" >
-                                <attribute name="name" value="addAvailableArtwork" id="2065" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="2066" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="2067" addr="0x7f99f1e478f0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e4ef30" id="2068" addr="0x7f99f1e4ef30" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e4ef30" id="2069" addr="0x7f99f1e4ef30" />
-                                <attribute name="kind" value="function" id="2070" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="addAvailableArtwork" id="2071" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(std::string,std::string,std::string,std::string,bool,bool,int)." id="2072" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="2073" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e4ea70" id="2074" addr="0x7f99f1e4ea70" />
-                                <parmlist id="2075" addr="0x7f99f1e4e130" >
+                        <cdecl id="2063" addr="0x7fca4699ca70" >
+                            <attributelist id="2064" addr="0x7fca4699ca70" >
+                                <attribute name="name" value="addAvailableArtwork" id="2065" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="2066" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="2067" addr="0x7fca469958f0" />
+                                <attribute name="sym_nextSibling" value="0x7fca4699cf30" id="2068" addr="0x7fca4699cf30" />
+                                <attribute name="csym_nextSibling" value="0x7fca4699cf30" id="2069" addr="0x7fca4699cf30" />
+                                <attribute name="kind" value="function" id="2070" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="addAvailableArtwork" id="2071" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(std::string,std::string,std::string,std::string,bool,bool,int)." id="2072" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="2073" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca4699ca70" id="2074" addr="0x7fca4699ca70" />
+                                <parmlist id="2075" addr="0x7fca4699c130" >
                                     <parm id="2076">
-                                        <attributelist id="2077" addr="0x7f99f1e4e130" >
-                                            <attribute name="name" value="url" id="2078" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="std::string" id="2079" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2077" addr="0x7fca4699c130" >
+                                            <attribute name="name" value="url" id="2078" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="std::string" id="2079" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="2080">
-                                        <attributelist id="2081" addr="0x7f99f1e4e2b0" >
-                                            <attribute name="name" value="art_type" id="2082" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="&quot;&quot;" id="2083" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="std::string" id="2084" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2081" addr="0x7fca4699c2b0" >
+                                            <attribute name="name" value="art_type" id="2082" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="&quot;&quot;" id="2083" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="std::string" id="2084" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="2085">
-                                        <attributelist id="2086" addr="0x7f99f1e4e430" >
-                                            <attribute name="name" value="referrer" id="2087" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="&quot;&quot;" id="2088" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="std::string" id="2089" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2086" addr="0x7fca4699c430" >
+                                            <attribute name="name" value="referrer" id="2087" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="&quot;&quot;" id="2088" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="std::string" id="2089" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="2090">
-                                        <attributelist id="2091" addr="0x7f99f1e4e5b0" >
-                                            <attribute name="name" value="cache" id="2092" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="&quot;&quot;" id="2093" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="std::string" id="2094" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2091" addr="0x7fca4699c5b0" >
+                                            <attribute name="name" value="cache" id="2092" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="&quot;&quot;" id="2093" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="std::string" id="2094" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="2095">
-                                        <attributelist id="2096" addr="0x7f99f1e4e6f0" >
-                                            <attribute name="name" value="post" id="2097" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="false" id="2098" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="2099" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2096" addr="0x7fca4699c6f0" >
+                                            <attribute name="name" value="post" id="2097" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="false" id="2098" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="2099" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="2100">
-                                        <attributelist id="2101" addr="0x7f99f1e4e830" >
-                                            <attribute name="name" value="isgz" id="2102" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="false" id="2103" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="2104" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2101" addr="0x7fca4699c830" >
+                                            <attribute name="name" value="isgz" id="2102" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="false" id="2103" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="2104" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="2105">
-                                        <attributelist id="2106" addr="0x7f99f1e4e9b0" >
-                                            <attribute name="name" value="season" id="2107" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="-1" id="2108" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="2109" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2106" addr="0x7fca4699c9b0" >
+                                            <attribute name="name" value="season" id="2107" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="-1" id="2108" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="2109" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="2110" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2111" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="2110" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2111" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="2112" addr="0x7f99f1e4ef30" >
-                            <attributelist id="2113" addr="0x7f99f1e4ef30" >
-                                <attribute name="name" value="addAvailableArtwork" id="2114" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="2115" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="2116" addr="0x7f99f1e478f0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e4ea70" id="2117" addr="0x7f99f1e4ea70" />
-                                <attribute name="kind" value="function" id="2118" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="addAvailableArtwork" id="2119" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e4f350" id="2120" addr="0x7f99f1e4f350" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e4f350" id="2121" addr="0x7f99f1e4f350" />
-                                <attribute name="defaultargs" value="0x7f99f1e4ea70" id="2122" addr="0x7f99f1e4ea70" />
-                                <attribute name="decl" value="f(std::string,std::string,std::string,std::string,bool,bool)." id="2123" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="2124" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e4ea70" id="2125" addr="0x7f99f1e4ea70" />
-                                <parmlist id="2126" addr="0x7f99f1e4eb10" >
+                        <cdecl id="2112" addr="0x7fca4699cf30" >
+                            <attributelist id="2113" addr="0x7fca4699cf30" >
+                                <attribute name="name" value="addAvailableArtwork" id="2114" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="2115" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="2116" addr="0x7fca469958f0" />
+                                <attribute name="sym_previousSibling" value="0x7fca4699ca70" id="2117" addr="0x7fca4699ca70" />
+                                <attribute name="kind" value="function" id="2118" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="addAvailableArtwork" id="2119" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca4699d350" id="2120" addr="0x7fca4699d350" />
+                                <attribute name="sym_nextSibling" value="0x7fca4699d350" id="2121" addr="0x7fca4699d350" />
+                                <attribute name="defaultargs" value="0x7fca4699ca70" id="2122" addr="0x7fca4699ca70" />
+                                <attribute name="decl" value="f(std::string,std::string,std::string,std::string,bool,bool)." id="2123" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="2124" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca4699ca70" id="2125" addr="0x7fca4699ca70" />
+                                <parmlist id="2126" addr="0x7fca4699cb10" >
                                     <parm id="2127">
-                                        <attributelist id="2128" addr="0x7f99f1e4eb10" >
-                                            <attribute name="name" value="url" id="2129" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="std::string" id="2130" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2128" addr="0x7fca4699cb10" >
+                                            <attribute name="name" value="url" id="2129" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="std::string" id="2130" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="2131">
-                                        <attributelist id="2132" addr="0x7f99f1e4ebf0" >
-                                            <attribute name="name" value="art_type" id="2133" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="&quot;&quot;" id="2134" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="std::string" id="2135" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2132" addr="0x7fca4699cbf0" >
+                                            <attribute name="name" value="art_type" id="2133" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="&quot;&quot;" id="2134" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="std::string" id="2135" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="2136">
-                                        <attributelist id="2137" addr="0x7f99f1e4ec90" >
-                                            <attribute name="name" value="referrer" id="2138" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="&quot;&quot;" id="2139" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="std::string" id="2140" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2137" addr="0x7fca4699cc90" >
+                                            <attribute name="name" value="referrer" id="2138" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="&quot;&quot;" id="2139" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="std::string" id="2140" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="2141">
-                                        <attributelist id="2142" addr="0x7f99f1e4ed30" >
-                                            <attribute name="name" value="cache" id="2143" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="&quot;&quot;" id="2144" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="std::string" id="2145" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2142" addr="0x7fca4699cd30" >
+                                            <attribute name="name" value="cache" id="2143" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="&quot;&quot;" id="2144" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="std::string" id="2145" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="2146">
-                                        <attributelist id="2147" addr="0x7f99f1e4edd0" >
-                                            <attribute name="name" value="post" id="2148" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="false" id="2149" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="2150" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2147" addr="0x7fca4699cdd0" >
+                                            <attribute name="name" value="post" id="2148" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="false" id="2149" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="2150" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="2151">
-                                        <attributelist id="2152" addr="0x7f99f1e4ee70" >
-                                            <attribute name="name" value="isgz" id="2153" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="false" id="2154" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="2155" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2152" addr="0x7fca4699ce70" >
+                                            <attribute name="name" value="isgz" id="2153" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="false" id="2154" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="2155" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="2156" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="2157" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="2156" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="2157" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="2158" addr="0x7f99f1e4f350" >
-                            <attributelist id="2159" addr="0x7f99f1e4f350" >
-                                <attribute name="name" value="addAvailableArtwork" id="2160" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="2161" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="2162" addr="0x7f99f1e478f0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e4ef30" id="2163" addr="0x7f99f1e4ef30" />
-                                <attribute name="kind" value="function" id="2164" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="addAvailableArtwork" id="2165" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e4f6d0" id="2166" addr="0x7f99f1e4f6d0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e4f6d0" id="2167" addr="0x7f99f1e4f6d0" />
-                                <attribute name="defaultargs" value="0x7f99f1e4ea70" id="2168" addr="0x7f99f1e4ea70" />
-                                <attribute name="decl" value="f(std::string,std::string,std::string,std::string,bool)." id="2169" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="2170" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e4ea70" id="2171" addr="0x7f99f1e4ea70" />
-                                <parmlist id="2172" addr="0x7f99f1e4efd0" >
+                        <cdecl id="2158" addr="0x7fca4699d350" >
+                            <attributelist id="2159" addr="0x7fca4699d350" >
+                                <attribute name="name" value="addAvailableArtwork" id="2160" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="2161" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="2162" addr="0x7fca469958f0" />
+                                <attribute name="sym_previousSibling" value="0x7fca4699cf30" id="2163" addr="0x7fca4699cf30" />
+                                <attribute name="kind" value="function" id="2164" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="addAvailableArtwork" id="2165" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca4699d6d0" id="2166" addr="0x7fca4699d6d0" />
+                                <attribute name="sym_nextSibling" value="0x7fca4699d6d0" id="2167" addr="0x7fca4699d6d0" />
+                                <attribute name="defaultargs" value="0x7fca4699ca70" id="2168" addr="0x7fca4699ca70" />
+                                <attribute name="decl" value="f(std::string,std::string,std::string,std::string,bool)." id="2169" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="2170" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca4699ca70" id="2171" addr="0x7fca4699ca70" />
+                                <parmlist id="2172" addr="0x7fca4699cfd0" >
                                     <parm id="2173">
-                                        <attributelist id="2174" addr="0x7f99f1e4efd0" >
-                                            <attribute name="name" value="url" id="2175" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="std::string" id="2176" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2174" addr="0x7fca4699cfd0" >
+                                            <attribute name="name" value="url" id="2175" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="std::string" id="2176" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="2177">
-                                        <attributelist id="2178" addr="0x7f99f1e4f0b0" >
-                                            <attribute name="name" value="art_type" id="2179" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="&quot;&quot;" id="2180" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="std::string" id="2181" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2178" addr="0x7fca4699d0b0" >
+                                            <attribute name="name" value="art_type" id="2179" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="&quot;&quot;" id="2180" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="std::string" id="2181" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="2182">
-                                        <attributelist id="2183" addr="0x7f99f1e4f150" >
-                                            <attribute name="name" value="referrer" id="2184" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="&quot;&quot;" id="2185" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="std::string" id="2186" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2183" addr="0x7fca4699d150" >
+                                            <attribute name="name" value="referrer" id="2184" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="&quot;&quot;" id="2185" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="std::string" id="2186" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="2187">
-                                        <attributelist id="2188" addr="0x7f99f1e4f1f0" >
-                                            <attribute name="name" value="cache" id="2189" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="&quot;&quot;" id="2190" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="std::string" id="2191" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2188" addr="0x7fca4699d1f0" >
+                                            <attribute name="name" value="cache" id="2189" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="&quot;&quot;" id="2190" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="std::string" id="2191" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="2192">
-                                        <attributelist id="2193" addr="0x7f99f1e4f290" >
-                                            <attribute name="name" value="post" id="2194" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="false" id="2195" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="2196" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2193" addr="0x7fca4699d290" >
+                                            <attribute name="name" value="post" id="2194" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="false" id="2195" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="2196" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="2197" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_2" id="2198" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="2197" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_2" id="2198" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="2199" addr="0x7f99f1e4f6d0" >
-                            <attributelist id="2200" addr="0x7f99f1e4f6d0" >
-                                <attribute name="name" value="addAvailableArtwork" id="2201" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="2202" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="2203" addr="0x7f99f1e478f0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e4f350" id="2204" addr="0x7f99f1e4f350" />
-                                <attribute name="kind" value="function" id="2205" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="addAvailableArtwork" id="2206" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e4f9b0" id="2207" addr="0x7f99f1e4f9b0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e4f9b0" id="2208" addr="0x7f99f1e4f9b0" />
-                                <attribute name="defaultargs" value="0x7f99f1e4ea70" id="2209" addr="0x7f99f1e4ea70" />
-                                <attribute name="decl" value="f(std::string,std::string,std::string,std::string)." id="2210" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="2211" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e4ea70" id="2212" addr="0x7f99f1e4ea70" />
-                                <parmlist id="2213" addr="0x7f99f1e4f3f0" >
+                        <cdecl id="2199" addr="0x7fca4699d6d0" >
+                            <attributelist id="2200" addr="0x7fca4699d6d0" >
+                                <attribute name="name" value="addAvailableArtwork" id="2201" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="2202" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="2203" addr="0x7fca469958f0" />
+                                <attribute name="sym_previousSibling" value="0x7fca4699d350" id="2204" addr="0x7fca4699d350" />
+                                <attribute name="kind" value="function" id="2205" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="addAvailableArtwork" id="2206" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca4699d9b0" id="2207" addr="0x7fca4699d9b0" />
+                                <attribute name="sym_nextSibling" value="0x7fca4699d9b0" id="2208" addr="0x7fca4699d9b0" />
+                                <attribute name="defaultargs" value="0x7fca4699ca70" id="2209" addr="0x7fca4699ca70" />
+                                <attribute name="decl" value="f(std::string,std::string,std::string,std::string)." id="2210" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="2211" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca4699ca70" id="2212" addr="0x7fca4699ca70" />
+                                <parmlist id="2213" addr="0x7fca4699d3f0" >
                                     <parm id="2214">
-                                        <attributelist id="2215" addr="0x7f99f1e4f3f0" >
-                                            <attribute name="name" value="url" id="2216" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="std::string" id="2217" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2215" addr="0x7fca4699d3f0" >
+                                            <attribute name="name" value="url" id="2216" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="std::string" id="2217" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="2218">
-                                        <attributelist id="2219" addr="0x7f99f1e4f4d0" >
-                                            <attribute name="name" value="art_type" id="2220" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="&quot;&quot;" id="2221" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="std::string" id="2222" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2219" addr="0x7fca4699d4d0" >
+                                            <attribute name="name" value="art_type" id="2220" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="&quot;&quot;" id="2221" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="std::string" id="2222" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="2223">
-                                        <attributelist id="2224" addr="0x7f99f1e4f570" >
-                                            <attribute name="name" value="referrer" id="2225" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="&quot;&quot;" id="2226" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="std::string" id="2227" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2224" addr="0x7fca4699d570" >
+                                            <attribute name="name" value="referrer" id="2225" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="&quot;&quot;" id="2226" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="std::string" id="2227" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="2228">
-                                        <attributelist id="2229" addr="0x7f99f1e4f610" >
-                                            <attribute name="name" value="cache" id="2230" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="&quot;&quot;" id="2231" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="std::string" id="2232" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2229" addr="0x7fca4699d610" >
+                                            <attribute name="name" value="cache" id="2230" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="&quot;&quot;" id="2231" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="std::string" id="2232" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="2233" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_3" id="2234" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="2233" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_3" id="2234" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="2235" addr="0x7f99f1e4f9b0" >
-                            <attributelist id="2236" addr="0x7f99f1e4f9b0" >
-                                <attribute name="name" value="addAvailableArtwork" id="2237" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="2238" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="2239" addr="0x7f99f1e478f0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e4f6d0" id="2240" addr="0x7f99f1e4f6d0" />
-                                <attribute name="kind" value="function" id="2241" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="addAvailableArtwork" id="2242" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e4fbf0" id="2243" addr="0x7f99f1e4fbf0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e4fbf0" id="2244" addr="0x7f99f1e4fbf0" />
-                                <attribute name="defaultargs" value="0x7f99f1e4ea70" id="2245" addr="0x7f99f1e4ea70" />
-                                <attribute name="decl" value="f(std::string,std::string,std::string)." id="2246" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="2247" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e4ea70" id="2248" addr="0x7f99f1e4ea70" />
-                                <parmlist id="2249" addr="0x7f99f1e4f770" >
+                        <cdecl id="2235" addr="0x7fca4699d9b0" >
+                            <attributelist id="2236" addr="0x7fca4699d9b0" >
+                                <attribute name="name" value="addAvailableArtwork" id="2237" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="2238" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="2239" addr="0x7fca469958f0" />
+                                <attribute name="sym_previousSibling" value="0x7fca4699d6d0" id="2240" addr="0x7fca4699d6d0" />
+                                <attribute name="kind" value="function" id="2241" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="addAvailableArtwork" id="2242" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca4699dbf0" id="2243" addr="0x7fca4699dbf0" />
+                                <attribute name="sym_nextSibling" value="0x7fca4699dbf0" id="2244" addr="0x7fca4699dbf0" />
+                                <attribute name="defaultargs" value="0x7fca4699ca70" id="2245" addr="0x7fca4699ca70" />
+                                <attribute name="decl" value="f(std::string,std::string,std::string)." id="2246" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="2247" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca4699ca70" id="2248" addr="0x7fca4699ca70" />
+                                <parmlist id="2249" addr="0x7fca4699d770" >
                                     <parm id="2250">
-                                        <attributelist id="2251" addr="0x7f99f1e4f770" >
-                                            <attribute name="name" value="url" id="2252" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="std::string" id="2253" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2251" addr="0x7fca4699d770" >
+                                            <attribute name="name" value="url" id="2252" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="std::string" id="2253" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="2254">
-                                        <attributelist id="2255" addr="0x7f99f1e4f850" >
-                                            <attribute name="name" value="art_type" id="2256" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="&quot;&quot;" id="2257" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="std::string" id="2258" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2255" addr="0x7fca4699d850" >
+                                            <attribute name="name" value="art_type" id="2256" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="&quot;&quot;" id="2257" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="std::string" id="2258" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="2259">
-                                        <attributelist id="2260" addr="0x7f99f1e4f8f0" >
-                                            <attribute name="name" value="referrer" id="2261" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="&quot;&quot;" id="2262" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="std::string" id="2263" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2260" addr="0x7fca4699d8f0" >
+                                            <attribute name="name" value="referrer" id="2261" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="&quot;&quot;" id="2262" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="std::string" id="2263" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="2264" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_4" id="2265" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="2264" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_4" id="2265" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="2266" addr="0x7f99f1e4fbf0" >
-                            <attributelist id="2267" addr="0x7f99f1e4fbf0" >
-                                <attribute name="name" value="addAvailableArtwork" id="2268" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="2269" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="2270" addr="0x7f99f1e478f0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e4f9b0" id="2271" addr="0x7f99f1e4f9b0" />
-                                <attribute name="kind" value="function" id="2272" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="addAvailableArtwork" id="2273" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e4fd90" id="2274" addr="0x7f99f1e4fd90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e4fd90" id="2275" addr="0x7f99f1e4fd90" />
-                                <attribute name="defaultargs" value="0x7f99f1e4ea70" id="2276" addr="0x7f99f1e4ea70" />
-                                <attribute name="decl" value="f(std::string,std::string)." id="2277" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="2278" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e4ea70" id="2279" addr="0x7f99f1e4ea70" />
-                                <parmlist id="2280" addr="0x7f99f1e4fa50" >
+                        <cdecl id="2266" addr="0x7fca4699dbf0" >
+                            <attributelist id="2267" addr="0x7fca4699dbf0" >
+                                <attribute name="name" value="addAvailableArtwork" id="2268" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="2269" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="2270" addr="0x7fca469958f0" />
+                                <attribute name="sym_previousSibling" value="0x7fca4699d9b0" id="2271" addr="0x7fca4699d9b0" />
+                                <attribute name="kind" value="function" id="2272" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="addAvailableArtwork" id="2273" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca4699dd90" id="2274" addr="0x7fca4699dd90" />
+                                <attribute name="sym_nextSibling" value="0x7fca4699dd90" id="2275" addr="0x7fca4699dd90" />
+                                <attribute name="defaultargs" value="0x7fca4699ca70" id="2276" addr="0x7fca4699ca70" />
+                                <attribute name="decl" value="f(std::string,std::string)." id="2277" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="2278" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca4699ca70" id="2279" addr="0x7fca4699ca70" />
+                                <parmlist id="2280" addr="0x7fca4699da50" >
                                     <parm id="2281">
-                                        <attributelist id="2282" addr="0x7f99f1e4fa50" >
-                                            <attribute name="name" value="url" id="2283" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="std::string" id="2284" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2282" addr="0x7fca4699da50" >
+                                            <attribute name="name" value="url" id="2283" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="std::string" id="2284" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="2285">
-                                        <attributelist id="2286" addr="0x7f99f1e4fb30" >
-                                            <attribute name="name" value="art_type" id="2287" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="&quot;&quot;" id="2288" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="std::string" id="2289" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2286" addr="0x7fca4699db30" >
+                                            <attribute name="name" value="art_type" id="2287" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="&quot;&quot;" id="2288" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="std::string" id="2289" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="2290" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_5" id="2291" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="2290" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_5" id="2291" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="2292" addr="0x7f99f1e4fd90" >
-                            <attributelist id="2293" addr="0x7f99f1e4fd90" >
-                                <attribute name="name" value="addAvailableArtwork" id="2294" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="2295" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="2296" addr="0x7f99f1e478f0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e4fbf0" id="2297" addr="0x7f99f1e4fbf0" />
-                                <attribute name="kind" value="function" id="2298" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="addAvailableArtwork" id="2299" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e4ea70" id="2300" addr="0x7f99f1e4ea70" />
-                                <attribute name="decl" value="f(std::string)." id="2301" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="2302" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e4ea70" id="2303" addr="0x7f99f1e4ea70" />
-                                <parmlist id="2304" addr="0x7f99f1e4fc90" >
+                        <cdecl id="2292" addr="0x7fca4699dd90" >
+                            <attributelist id="2293" addr="0x7fca4699dd90" >
+                                <attribute name="name" value="addAvailableArtwork" id="2294" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="2295" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="2296" addr="0x7fca469958f0" />
+                                <attribute name="sym_previousSibling" value="0x7fca4699dbf0" id="2297" addr="0x7fca4699dbf0" />
+                                <attribute name="kind" value="function" id="2298" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="addAvailableArtwork" id="2299" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca4699ca70" id="2300" addr="0x7fca4699ca70" />
+                                <attribute name="decl" value="f(std::string)." id="2301" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="2302" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca4699ca70" id="2303" addr="0x7fca4699ca70" />
+                                <parmlist id="2304" addr="0x7fca4699dc90" >
                                     <parm id="2305">
-                                        <attributelist id="2306" addr="0x7f99f1e4fc90" >
-                                            <attribute name="name" value="url" id="2307" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="std::string" id="2308" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2306" addr="0x7fca4699dc90" >
+                                            <attribute name="name" value="url" id="2307" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="std::string" id="2308" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="2309" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_6" id="2310" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="2309" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_6" id="2310" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="2311" addr="0x7f99f1e50210" >
-                            <attributelist id="2312" addr="0x7f99f1e50210" >
-                                <attribute name="name" value="addStreamInfo" id="2313" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="2314" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="2315" addr="0x7f99f1e478f0" />
-                                <attribute name="kind" value="function" id="2316" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="addStreamInfo" id="2317" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(p.q(const).char,r.q(const).XBMCAddon::Properties)." id="2318" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="2319" addr="0x7f99f1de6c90" />
-                                <parmlist id="2320" addr="0x7f99f1e50010" >
+                        <cdecl id="2311" addr="0x7fca4699e210" >
+                            <attributelist id="2312" addr="0x7fca4699e210" >
+                                <attribute name="name" value="addStreamInfo" id="2313" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="2314" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="2315" addr="0x7fca469958f0" />
+                                <attribute name="kind" value="function" id="2316" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="addStreamInfo" id="2317" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(p.q(const).char,r.q(const).XBMCAddon::Properties)." id="2318" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="2319" addr="0x7fca46934c90" />
+                                <parmlist id="2320" addr="0x7fca4699e010" >
                                     <parm id="2321">
-                                        <attributelist id="2322" addr="0x7f99f1e50010" >
-                                            <attribute name="name" value="cType" id="2323" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="2324" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2322" addr="0x7fca4699e010" >
+                                            <attribute name="name" value="cType" id="2323" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="2324" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="2325">
-                                        <attributelist id="2326" addr="0x7f99f1e50150" >
-                                            <attribute name="name" value="dictionary" id="2327" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::Properties" id="2328" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2326" addr="0x7fca4699e150" >
+                                            <attribute name="name" value="dictionary" id="2327" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::Properties" id="2328" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="2329" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2330" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="2329" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2330" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="2331" addr="0x7f99f1e50a30" >
-                            <attributelist id="2332" addr="0x7f99f1e50a30" >
-                                <attribute name="name" value="addContextMenuItems" id="2333" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="2334" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="2335" addr="0x7f99f1e478f0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e50bd0" id="2336" addr="0x7f99f1e50bd0" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e50bd0" id="2337" addr="0x7f99f1e50bd0" />
-                                <attribute name="kind" value="function" id="2338" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="addContextMenuItems" id="2339" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).std::vector&lt;(Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>)>,bool)." id="2340" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="2341" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e50a30" id="2342" addr="0x7f99f1e50a30" />
-                                <parmlist id="2343" addr="0x7f99f1e50950" >
+                        <cdecl id="2331" addr="0x7fca4699ea30" >
+                            <attributelist id="2332" addr="0x7fca4699ea30" >
+                                <attribute name="name" value="addContextMenuItems" id="2333" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="2334" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="2335" addr="0x7fca469958f0" />
+                                <attribute name="sym_nextSibling" value="0x7fca4699ebd0" id="2336" addr="0x7fca4699ebd0" />
+                                <attribute name="csym_nextSibling" value="0x7fca4699ebd0" id="2337" addr="0x7fca4699ebd0" />
+                                <attribute name="kind" value="function" id="2338" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="addContextMenuItems" id="2339" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).std::vector&lt;(Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>)>,bool)." id="2340" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="2341" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca4699ea30" id="2342" addr="0x7fca4699ea30" />
+                                <parmlist id="2343" addr="0x7fca4699e950" >
                                     <parm id="2344">
-                                        <attributelist id="2345" addr="0x7f99f1e50950" >
-                                            <attribute name="name" value="items" id="2346" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).std::vector&lt;(Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>)>" id="2347" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2345" addr="0x7fca4699e950" >
+                                            <attribute name="name" value="items" id="2346" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).std::vector&lt;(Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>)>" id="2347" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="2348">
-                                        <attributelist id="2349" addr="0x7f99f1e50970" >
-                                            <attribute name="name" value="replaceItems" id="2350" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="false" id="2351" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="2352" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2349" addr="0x7fca4699e970" >
+                                            <attribute name="name" value="replaceItems" id="2350" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="false" id="2351" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="2352" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="2353" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2354" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="2353" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2354" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="2355" addr="0x7f99f1e50bd0" >
-                            <attributelist id="2356" addr="0x7f99f1e50bd0" >
-                                <attribute name="name" value="addContextMenuItems" id="2357" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="2358" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="2359" addr="0x7f99f1e478f0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e50a30" id="2360" addr="0x7f99f1e50a30" />
-                                <attribute name="kind" value="function" id="2361" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="addContextMenuItems" id="2362" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e50a30" id="2363" addr="0x7f99f1e50a30" />
-                                <attribute name="decl" value="f(r.q(const).std::vector&lt;(Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>)>)." id="2364" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="2365" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e50a30" id="2366" addr="0x7f99f1e50a30" />
-                                <parmlist id="2367" addr="0x7f99f1e50ad0" >
+                        <cdecl id="2355" addr="0x7fca4699ebd0" >
+                            <attributelist id="2356" addr="0x7fca4699ebd0" >
+                                <attribute name="name" value="addContextMenuItems" id="2357" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="2358" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="2359" addr="0x7fca469958f0" />
+                                <attribute name="sym_previousSibling" value="0x7fca4699ea30" id="2360" addr="0x7fca4699ea30" />
+                                <attribute name="kind" value="function" id="2361" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="addContextMenuItems" id="2362" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca4699ea30" id="2363" addr="0x7fca4699ea30" />
+                                <attribute name="decl" value="f(r.q(const).std::vector&lt;(Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>)>)." id="2364" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="2365" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca4699ea30" id="2366" addr="0x7fca4699ea30" />
+                                <parmlist id="2367" addr="0x7fca4699ead0" >
                                     <parm id="2368">
-                                        <attributelist id="2369" addr="0x7f99f1e50ad0" >
-                                            <attribute name="name" value="items" id="2370" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).std::vector&lt;(Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>)>" id="2371" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2369" addr="0x7fca4699ead0" >
+                                            <attribute name="name" value="items" id="2370" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).std::vector&lt;(Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>)>" id="2371" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="2372" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="2373" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="2372" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="2373" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="2374" addr="0x7f99f1e51010" >
-                            <attributelist id="2375" addr="0x7f99f1e51010" >
-                                <attribute name="name" value="setProperty" id="2376" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="2377" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="2378" addr="0x7f99f1e478f0" />
-                                <attribute name="kind" value="function" id="2379" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setProperty" id="2380" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(p.q(const).char,r.q(const).XBMCAddon::String)." id="2381" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="2382" addr="0x7f99f1de6c90" />
-                                <parmlist id="2383" addr="0x7f99f1e50e10" >
+                        <cdecl id="2374" addr="0x7fca4699f010" >
+                            <attributelist id="2375" addr="0x7fca4699f010" >
+                                <attribute name="name" value="setProperty" id="2376" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="2377" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="2378" addr="0x7fca469958f0" />
+                                <attribute name="kind" value="function" id="2379" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setProperty" id="2380" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(p.q(const).char,r.q(const).XBMCAddon::String)." id="2381" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="2382" addr="0x7fca46934c90" />
+                                <parmlist id="2383" addr="0x7fca4699ee10" >
                                     <parm id="2384">
-                                        <attributelist id="2385" addr="0x7f99f1e50e10" >
-                                            <attribute name="name" value="key" id="2386" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="2387" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2385" addr="0x7fca4699ee10" >
+                                            <attribute name="name" value="key" id="2386" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="2387" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="2388">
-                                        <attributelist id="2389" addr="0x7f99f1e50f50" >
-                                            <attribute name="name" value="value" id="2390" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="2391" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2389" addr="0x7fca4699ef50" >
+                                            <attribute name="name" value="value" id="2390" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="2391" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="2392" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2393" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="2392" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2393" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="2394" addr="0x7f99f1e51310" >
-                            <attributelist id="2395" addr="0x7f99f1e51310" >
-                                <attribute name="name" value="setProperties" id="2396" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="2397" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="2398" addr="0x7f99f1e478f0" />
-                                <attribute name="kind" value="function" id="2399" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setProperties" id="2400" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::Properties)." id="2401" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="2402" addr="0x7f99f1de6c90" />
-                                <parmlist id="2403" addr="0x7f99f1e51250" >
+                        <cdecl id="2394" addr="0x7fca4699f310" >
+                            <attributelist id="2395" addr="0x7fca4699f310" >
+                                <attribute name="name" value="setProperties" id="2396" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="2397" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="2398" addr="0x7fca469958f0" />
+                                <attribute name="kind" value="function" id="2399" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setProperties" id="2400" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::Properties)." id="2401" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="2402" addr="0x7fca46934c90" />
+                                <parmlist id="2403" addr="0x7fca4699f250" >
                                     <parm id="2404">
-                                        <attributelist id="2405" addr="0x7f99f1e51250" >
-                                            <attribute name="name" value="dictionary" id="2406" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::Properties" id="2407" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2405" addr="0x7fca4699f250" >
+                                            <attribute name="name" value="dictionary" id="2406" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::Properties" id="2407" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="2408" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2409" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="2408" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2409" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="2410" addr="0x7f99f1e51630" >
-                            <attributelist id="2411" addr="0x7f99f1e51630" >
-                                <attribute name="name" value="getProperty" id="2412" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="2413" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="2414" addr="0x7f99f1e478f0" />
-                                <attribute name="kind" value="function" id="2415" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getProperty" id="2416" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(p.q(const).char)." id="2417" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="2418" addr="0x7f99f1de6c90" />
-                                <parmlist id="2419" addr="0x7f99f1e51570" >
+                        <cdecl id="2410" addr="0x7fca4699f630" >
+                            <attributelist id="2411" addr="0x7fca4699f630" >
+                                <attribute name="name" value="getProperty" id="2412" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="2413" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="2414" addr="0x7fca469958f0" />
+                                <attribute name="kind" value="function" id="2415" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getProperty" id="2416" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(p.q(const).char)." id="2417" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="2418" addr="0x7fca46934c90" />
+                                <parmlist id="2419" addr="0x7fca4699f570" >
                                     <parm id="2420">
-                                        <attributelist id="2421" addr="0x7f99f1e51570" >
-                                            <attribute name="name" value="key" id="2422" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="2423" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2421" addr="0x7fca4699f570" >
+                                            <attribute name="name" value="key" id="2422" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="2423" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="XBMCAddon::String" id="2424" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2425" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="XBMCAddon::String" id="2424" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2425" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="2426" addr="0x7f99f1e51930" >
-                            <attributelist id="2427" addr="0x7f99f1e51930" >
-                                <attribute name="name" value="setPath" id="2428" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="2429" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="2430" addr="0x7f99f1e478f0" />
-                                <attribute name="kind" value="function" id="2431" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setPath" id="2432" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="2433" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="2434" addr="0x7f99f1de6c90" />
-                                <parmlist id="2435" addr="0x7f99f1e51870" >
+                        <cdecl id="2426" addr="0x7fca4699f930" >
+                            <attributelist id="2427" addr="0x7fca4699f930" >
+                                <attribute name="name" value="setPath" id="2428" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="2429" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="2430" addr="0x7fca469958f0" />
+                                <attribute name="kind" value="function" id="2431" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setPath" id="2432" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="2433" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="2434" addr="0x7fca46934c90" />
+                                <parmlist id="2435" addr="0x7fca4699f870" >
                                     <parm id="2436">
-                                        <attributelist id="2437" addr="0x7f99f1e51870" >
-                                            <attribute name="name" value="path" id="2438" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="2439" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2437" addr="0x7fca4699f870" >
+                                            <attribute name="name" value="path" id="2438" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="2439" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="2440" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2441" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="2440" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2441" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="2442" addr="0x7f99f1e51c30" >
-                            <attributelist id="2443" addr="0x7f99f1e51c30" >
-                                <attribute name="name" value="setMimeType" id="2444" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="2445" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="2446" addr="0x7f99f1e478f0" />
-                                <attribute name="kind" value="function" id="2447" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setMimeType" id="2448" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="2449" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="2450" addr="0x7f99f1de6c90" />
-                                <parmlist id="2451" addr="0x7f99f1e51b70" >
+                        <cdecl id="2442" addr="0x7fca4699fc30" >
+                            <attributelist id="2443" addr="0x7fca4699fc30" >
+                                <attribute name="name" value="setMimeType" id="2444" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="2445" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="2446" addr="0x7fca469958f0" />
+                                <attribute name="kind" value="function" id="2447" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setMimeType" id="2448" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="2449" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="2450" addr="0x7fca46934c90" />
+                                <parmlist id="2451" addr="0x7fca4699fb70" >
                                     <parm id="2452">
-                                        <attributelist id="2453" addr="0x7f99f1e51b70" >
-                                            <attribute name="name" value="mimetype" id="2454" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="2455" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2453" addr="0x7fca4699fb70" >
+                                            <attribute name="name" value="mimetype" id="2454" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="2455" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="2456" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2457" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="2456" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2457" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="2458" addr="0x7f99f1e51ef0" >
-                            <attributelist id="2459" addr="0x7f99f1e51ef0" >
-                                <attribute name="name" value="setContentLookup" id="2460" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="2461" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="2462" addr="0x7f99f1e478f0" />
-                                <attribute name="kind" value="function" id="2463" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setContentLookup" id="2464" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(bool)." id="2465" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="2466" addr="0x7f99f1de6c90" />
-                                <parmlist id="2467" addr="0x7f99f1e51e30" >
+                        <cdecl id="2458" addr="0x7fca4699fef0" >
+                            <attributelist id="2459" addr="0x7fca4699fef0" >
+                                <attribute name="name" value="setContentLookup" id="2460" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="2461" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="2462" addr="0x7fca469958f0" />
+                                <attribute name="kind" value="function" id="2463" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setContentLookup" id="2464" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(bool)." id="2465" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="2466" addr="0x7fca46934c90" />
+                                <parmlist id="2467" addr="0x7fca4699fe30" >
                                     <parm id="2468">
-                                        <attributelist id="2469" addr="0x7f99f1e51e30" >
-                                            <attribute name="name" value="enable" id="2470" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="2471" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2469" addr="0x7fca4699fe30" >
+                                            <attribute name="name" value="enable" id="2470" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="2471" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="2472" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2473" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="2472" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2473" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="2474" addr="0x7f99f1e522d0" >
-                            <attributelist id="2475" addr="0x7f99f1e522d0" >
-                                <attribute name="name" value="setSubtitles" id="2476" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="2477" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="2478" addr="0x7f99f1e478f0" />
-                                <attribute name="kind" value="function" id="2479" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setSubtitles" id="2480" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).std::vector&lt;(XBMCAddon::String)>)." id="2481" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="2482" addr="0x7f99f1de6c90" />
-                                <parmlist id="2483" addr="0x7f99f1e52210" >
+                        <cdecl id="2474" addr="0x7fca469a02d0" >
+                            <attributelist id="2475" addr="0x7fca469a02d0" >
+                                <attribute name="name" value="setSubtitles" id="2476" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="2477" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="2478" addr="0x7fca469958f0" />
+                                <attribute name="kind" value="function" id="2479" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setSubtitles" id="2480" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).std::vector&lt;(XBMCAddon::String)>)." id="2481" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="2482" addr="0x7fca46934c90" />
+                                <parmlist id="2483" addr="0x7fca469a0210" >
                                     <parm id="2484">
-                                        <attributelist id="2485" addr="0x7f99f1e52210" >
-                                            <attribute name="name" value="subtitleFiles" id="2486" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).std::vector&lt;(XBMCAddon::String)>" id="2487" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2485" addr="0x7fca469a0210" >
+                                            <attribute name="name" value="subtitleFiles" id="2486" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).std::vector&lt;(XBMCAddon::String)>" id="2487" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="2488" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2489" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="2488" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2489" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="2490" addr="0x7f99f1e524b0" >
-                            <attributelist id="2491" addr="0x7f99f1e524b0" >
-                                <attribute name="ismember" value="1" id="2492" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getdescription" id="2493" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="getdescription" id="2494" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="2495" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="2496" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="2497" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="XBMCAddon::String" id="2498" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="2499" addr="0x7f99f1e478f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2500" addr="0x7f99f1de6c90" />
+                        <cdecl id="2490" addr="0x7fca469a04b0" >
+                            <attributelist id="2491" addr="0x7fca469a04b0" >
+                                <attribute name="ismember" value="1" id="2492" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getdescription" id="2493" addr="0x7fca46934c90" />
+                                <attribute name="name" value="getdescription" id="2494" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="2495" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="2496" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="2497" addr="0x7fca46934c90" />
+                                <attribute name="type" value="XBMCAddon::String" id="2498" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="2499" addr="0x7fca469958f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2500" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="2501" addr="0x7f99f1e52690" >
-                            <attributelist id="2502" addr="0x7f99f1e52690" >
-                                <attribute name="ismember" value="1" id="2503" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getduration" id="2504" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="getduration" id="2505" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="2506" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="2507" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="2508" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="XBMCAddon::String" id="2509" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="2510" addr="0x7f99f1e478f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2511" addr="0x7f99f1de6c90" />
+                        <cdecl id="2501" addr="0x7fca469a0690" >
+                            <attributelist id="2502" addr="0x7fca469a0690" >
+                                <attribute name="ismember" value="1" id="2503" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getduration" id="2504" addr="0x7fca46934c90" />
+                                <attribute name="name" value="getduration" id="2505" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="2506" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="2507" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="2508" addr="0x7fca46934c90" />
+                                <attribute name="type" value="XBMCAddon::String" id="2509" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="2510" addr="0x7fca469958f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2511" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="2512" addr="0x7f99f1e52870" >
-                            <attributelist id="2513" addr="0x7f99f1e52870" >
-                                <attribute name="ismember" value="1" id="2514" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getfilename" id="2515" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="getfilename" id="2516" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="2517" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="2518" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="2519" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="XBMCAddon::String" id="2520" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="2521" addr="0x7f99f1e478f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2522" addr="0x7f99f1de6c90" />
+                        <cdecl id="2512" addr="0x7fca469a0870" >
+                            <attributelist id="2513" addr="0x7fca469a0870" >
+                                <attribute name="ismember" value="1" id="2514" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getfilename" id="2515" addr="0x7fca46934c90" />
+                                <attribute name="name" value="getfilename" id="2516" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="2517" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="2518" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="2519" addr="0x7fca46934c90" />
+                                <attribute name="type" value="XBMCAddon::String" id="2520" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="2521" addr="0x7fca469958f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2522" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="2523" addr="0x7f99f1e52a50" >
-                            <attributelist id="2524" addr="0x7f99f1e52a50" >
-                                <attribute name="ismember" value="1" id="2525" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getPath" id="2526" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="getPath" id="2527" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="2528" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="2529" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="2530" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="XBMCAddon::String" id="2531" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="2532" addr="0x7f99f1e478f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2533" addr="0x7f99f1de6c90" />
+                        <cdecl id="2523" addr="0x7fca469a0a50" >
+                            <attributelist id="2524" addr="0x7fca469a0a50" >
+                                <attribute name="ismember" value="1" id="2525" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getPath" id="2526" addr="0x7fca46934c90" />
+                                <attribute name="name" value="getPath" id="2527" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="2528" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="2529" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="2530" addr="0x7fca46934c90" />
+                                <attribute name="type" value="XBMCAddon::String" id="2531" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="2532" addr="0x7fca469958f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2533" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="2534" addr="0x7f99f1e52c30" >
-                            <attributelist id="2535" addr="0x7f99f1e52c30" >
-                                <attribute name="ismember" value="1" id="2536" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getVideoInfoTag" id="2537" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="getVideoInfoTag" id="2538" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f().p." id="2539" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="2540" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="2541" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="xbmc::InfoTagVideo" id="2542" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="2543" addr="0x7f99f1e478f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2544" addr="0x7f99f1de6c90" />
+                        <cdecl id="2534" addr="0x7fca469a0c30" >
+                            <attributelist id="2535" addr="0x7fca469a0c30" >
+                                <attribute name="ismember" value="1" id="2536" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getVideoInfoTag" id="2537" addr="0x7fca46934c90" />
+                                <attribute name="name" value="getVideoInfoTag" id="2538" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f().p." id="2539" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="2540" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="2541" addr="0x7fca46934c90" />
+                                <attribute name="type" value="xbmc::InfoTagVideo" id="2542" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="2543" addr="0x7fca469958f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2544" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="2545" addr="0x7f99f1e52e30" >
-                            <attributelist id="2546" addr="0x7f99f1e52e30" >
-                                <attribute name="ismember" value="1" id="2547" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getMusicInfoTag" id="2548" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="getMusicInfoTag" id="2549" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f().p." id="2550" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="2551" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="2552" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="xbmc::InfoTagMusic" id="2553" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="2554" addr="0x7f99f1e478f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="2555" addr="0x7f99f1de6c90" />
+                        <cdecl id="2545" addr="0x7fca469a0e30" >
+                            <attributelist id="2546" addr="0x7fca469a0e30" >
+                                <attribute name="ismember" value="1" id="2547" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getMusicInfoTag" id="2548" addr="0x7fca46934c90" />
+                                <attribute name="name" value="getMusicInfoTag" id="2549" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f().p." id="2550" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="2551" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="2552" addr="0x7fca46934c90" />
+                                <attribute name="type" value="xbmc::InfoTagMusic" id="2553" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="2554" addr="0x7fca469958f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="2555" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <access id="2556" addr="0x7f99f1e52ef0" >
-                            <attributelist id="2557" addr="0x7f99f1e52ef0" >
-                                <attribute name="kind" value="private" id="2558" addr="0x7f99f1de6c90" />
+                        <access id="2556" addr="0x7fca469a0ef0" >
+                            <attributelist id="2557" addr="0x7fca469a0ef0" >
+                                <attribute name="kind" value="private" id="2558" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </access >
-                        <cdecl id="2559" addr="0x7f99f1e535b0" >
-                            <attributelist id="2560" addr="0x7f99f1e535b0" >
-                                <attribute name="ismember" value="1" id="2561" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="getStringArray" id="2562" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::xbmcgui::InfoLabelValue,r.q(const).std::string,std::string)." id="2563" addr="0x7f99f1de6c90" />
-                                <parmlist id="2564" addr="0x7f99f1e53210" >
+                        <cdecl id="2559" addr="0x7fca469a15b0" >
+                            <attributelist id="2560" addr="0x7fca469a15b0" >
+                                <attribute name="ismember" value="1" id="2561" addr="0x7fca46934c90" />
+                                <attribute name="name" value="getStringArray" id="2562" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::xbmcgui::InfoLabelValue,r.q(const).std::string,std::string)." id="2563" addr="0x7fca46934c90" />
+                                <parmlist id="2564" addr="0x7fca469a1210" >
                                     <parm id="2565">
-                                        <attributelist id="2566" addr="0x7f99f1e53210" >
-                                            <attribute name="name" value="alt" id="2567" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::xbmcgui::InfoLabelValue" id="2568" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2566" addr="0x7fca469a1210" >
+                                            <attribute name="name" value="alt" id="2567" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::xbmcgui::InfoLabelValue" id="2568" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="2569">
-                                        <attributelist id="2570" addr="0x7f99f1e53370" >
-                                            <attribute name="name" value="tag" id="2571" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).std::string" id="2572" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2570" addr="0x7fca469a1370" >
+                                            <attribute name="name" value="tag" id="2571" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).std::string" id="2572" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="2573">
-                                        <attributelist id="2574" addr="0x7f99f1e534f0" >
-                                            <attribute name="name" value="value" id="2575" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="&quot;&quot;" id="2576" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="std::string" id="2577" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2574" addr="0x7fca469a14f0" >
+                                            <attribute name="name" value="value" id="2575" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="&quot;&quot;" id="2576" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="std::string" id="2577" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="access" value="private" id="2578" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="2579" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="std::vector&lt;(std::string)>" id="2580" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e53790" id="2581" addr="0x7f99f1e53790" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="2582" addr="0x7f99f1e478f0" />
+                                <attribute name="access" value="private" id="2578" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="2579" addr="0x7fca46934c90" />
+                                <attribute name="type" value="std::vector&lt;(std::string)>" id="2580" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469a1790" id="2581" addr="0x7fca469a1790" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="2582" addr="0x7fca469958f0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="2583" addr="0x7f99f1e53790" >
-                            <attributelist id="2584" addr="0x7f99f1e53790" >
-                                <attribute name="ismember" value="1" id="2585" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="getStringArray" id="2586" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::xbmcgui::InfoLabelValue,r.q(const).std::string)." id="2587" addr="0x7f99f1de6c90" />
-                                <parmlist id="2588" addr="0x7f99f1e536d0" >
+                        <cdecl id="2583" addr="0x7fca469a1790" >
+                            <attributelist id="2584" addr="0x7fca469a1790" >
+                                <attribute name="ismember" value="1" id="2585" addr="0x7fca46934c90" />
+                                <attribute name="name" value="getStringArray" id="2586" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::xbmcgui::InfoLabelValue,r.q(const).std::string)." id="2587" addr="0x7fca46934c90" />
+                                <parmlist id="2588" addr="0x7fca469a16d0" >
                                     <parm id="2589">
-                                        <attributelist id="2590" addr="0x7f99f1e536d0" >
-                                            <attribute name="name" value="alt" id="2591" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::xbmcgui::InfoLabelValue" id="2592" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2590" addr="0x7fca469a16d0" >
+                                            <attribute name="name" value="alt" id="2591" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::xbmcgui::InfoLabelValue" id="2592" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="2593">
-                                        <attributelist id="2594" addr="0x7f99f1e536f0" >
-                                            <attribute name="name" value="tag" id="2595" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).std::string" id="2596" addr="0x7f99f1de6c90" />
+                                        <attributelist id="2594" addr="0x7fca469a16f0" >
+                                            <attribute name="name" value="tag" id="2595" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).std::string" id="2596" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="access" value="private" id="2597" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="2598" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e535b0" id="2599" addr="0x7f99f1e535b0" />
-                                <attribute name="type" value="std::vector&lt;(std::string)>" id="2600" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="2601" addr="0x7f99f1e478f0" />
+                                <attribute name="access" value="private" id="2597" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="2598" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469a15b0" id="2599" addr="0x7fca469a15b0" />
+                                <attribute name="type" value="std::vector&lt;(std::string)>" id="2600" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="2601" addr="0x7fca469958f0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="2602" addr="0x7f99f1e53910" >
-                            <attributelist id="2603" addr="0x7f99f1e53910" >
-                                <attribute name="ismember" value="1" id="2604" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="GetVideoInfoTag" id="2605" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f().p." id="2606" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="private" id="2607" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="2608" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="CVideoInfoTag" id="2609" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e53b10" id="2610" addr="0x7f99f1e53b10" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="2611" addr="0x7f99f1e478f0" />
+                        <cdecl id="2602" addr="0x7fca469a1910" >
+                            <attributelist id="2603" addr="0x7fca469a1910" >
+                                <attribute name="ismember" value="1" id="2604" addr="0x7fca46934c90" />
+                                <attribute name="name" value="GetVideoInfoTag" id="2605" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f().p." id="2606" addr="0x7fca46934c90" />
+                                <attribute name="access" value="private" id="2607" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="2608" addr="0x7fca46934c90" />
+                                <attribute name="type" value="CVideoInfoTag" id="2609" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469a1b10" id="2610" addr="0x7fca469a1b10" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="2611" addr="0x7fca469958f0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="2612" addr="0x7f99f1e53b10" >
-                            <attributelist id="2613" addr="0x7f99f1e53b10" >
-                                <attribute name="ismember" value="1" id="2614" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="GetVideoInfoTag" id="2615" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="q(const).f().p." id="2616" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="private" id="2617" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="2618" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="q(const).CVideoInfoTag" id="2619" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e478f0" id="2620" addr="0x7f99f1e478f0" />
+                        <cdecl id="2612" addr="0x7fca469a1b10" >
+                            <attributelist id="2613" addr="0x7fca469a1b10" >
+                                <attribute name="ismember" value="1" id="2614" addr="0x7fca46934c90" />
+                                <attribute name="name" value="GetVideoInfoTag" id="2615" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="q(const).f().p." id="2616" addr="0x7fca46934c90" />
+                                <attribute name="access" value="private" id="2617" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="2618" addr="0x7fca46934c90" />
+                                <attribute name="type" value="q(const).CVideoInfoTag" id="2619" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469958f0" id="2620" addr="0x7fca469958f0" />
                             </attributelist >
                          
                         </cdecl >
-                        <access id="2621" addr="0x7f99f1e53c10" >
-                            <attributelist id="2622" addr="0x7f99f1e53c10" >
-                                <attribute name="kind" value="public" id="2623" addr="0x7f99f1de6c90" />
+                        <access id="2621" addr="0x7fca469a1c10" >
+                            <attributelist id="2622" addr="0x7fca469a1c10" >
+                                <attribute name="kind" value="public" id="2623" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </access >
                     </class >
-                    <cdecl id="2624" addr="0x7f99f1e53e70" >
-                        <attributelist id="2625" addr="0x7f99f1e53e70" >
-                            <attribute name="sym_name" value="ListItemList" id="2626" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="XBMCAddon::xbmcgui::ListItemList" id="2627" addr="0x7f99f1de6c90" />
-                            <attribute name="decl" value="" id="2628" addr="0x7f99f1de6c90" />
-                            <attribute name="storage" value="typedef" id="2629" addr="0x7f99f1de6c90" />
-                            <attribute name="kind" value="typedef" id="2630" addr="0x7f99f1de6c90" />
-                            <attribute name="type" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="2631" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="2632" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="2633" addr="0x7f99f1de6c90" />
+                    <cdecl id="2624" addr="0x7fca469a1e70" >
+                        <attributelist id="2625" addr="0x7fca469a1e70" >
+                            <attribute name="sym_name" value="ListItemList" id="2626" addr="0x7fca46934c90" />
+                            <attribute name="name" value="XBMCAddon::xbmcgui::ListItemList" id="2627" addr="0x7fca46934c90" />
+                            <attribute name="decl" value="" id="2628" addr="0x7fca46934c90" />
+                            <attribute name="storage" value="typedef" id="2629" addr="0x7fca46934c90" />
+                            <attribute name="kind" value="typedef" id="2630" addr="0x7fca46934c90" />
+                            <attribute name="type" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="2631" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="2632" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="2633" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </cdecl >
                 </namespace >
             </namespace >
         </include >
-        <include id="2634" addr="0x7f99f1e54410" >
-            <attributelist id="2635" addr="0x7f99f1e54410" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/Control.h" id="2636" addr="0x7f99f1de6c90" />
+        <include id="2634" addr="0x7fca469a2410" >
+            <attributelist id="2635" addr="0x7fca469a2410" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/Control.h" id="2636" addr="0x7fca46934c90" />
             </attributelist >
 
-            <constant id="2637" addr="0x7f99f1e544d0" >
-                <attributelist id="2638" addr="0x7f99f1e544d0" >
-                    <attribute name="sym_name" value="CONTROL_TEXT_OFFSET_X" id="2639" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="CONTROL_TEXT_OFFSET_X" id="2640" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="10" id="2641" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="2642" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="10" id="2643" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="2644" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="2645" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="2646" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="2647" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="2648" addr="0x7f99f1e54630" >
-                <attributelist id="2649" addr="0x7f99f1e54630" >
-                    <attribute name="sym_name" value="CONTROL_TEXT_OFFSET_Y" id="2650" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="CONTROL_TEXT_OFFSET_Y" id="2651" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="2" id="2652" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="2653" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="2" id="2654" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="2655" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="2656" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="2657" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="2658" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <namespace id="2659" addr="0x7f99f1e54770" >
-                <attributelist id="2660" addr="0x7f99f1e54770" >
-                    <attribute name="sym_name" value="XBMCAddon" id="2661" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="XBMCAddon" id="2662" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_previousSibling" value="0x7f99f1e462b0" id="2663" addr="0x7f99f1e462b0" />
-                    <attribute name="csym_nextSibling" value="0x7f99f1e967b0" id="2664" addr="0x7f99f1e967b0" />
-                    <attribute name="sym_nextSibling" value="0x7f99f1e967b0" id="2665" addr="0x7f99f1e967b0" />
-                    <typescope id="2666" addr="0x7f99f1dd1d70" >
-                        <attributelist id="2667" addr="0x7f99f1dd1d70" >
-                            <attribute name="name" value="XBMCAddon" id="2668" addr="0x7f99f1de6c90" />
-                            <typetab id="2669" addr="0x7f99f1dd1db0" >
-                                <attributelist id="2670" addr="0x7f99f1dd1db0" >
-                                    <attribute name="Dictionary" value="Dictionary" id="2671" addr="0x7f99f1de6c90" />
-                                    <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="2672" addr="0x7f99f1de6c90" />
-                                    <attribute name="String" value="std::string" id="2673" addr="0x7f99f1de6c90" />
-                                    <attribute name="StringOrInt" value="XBMCAddon::String" id="2674" addr="0x7f99f1de6c90" />
+            <constant id="2637" addr="0x7fca469a24d0" >
+                <attributelist id="2638" addr="0x7fca469a24d0" >
+                    <attribute name="sym_name" value="CONTROL_TEXT_OFFSET_X" id="2639" addr="0x7fca46934c90" />
+                    <attribute name="name" value="CONTROL_TEXT_OFFSET_X" id="2640" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="10" id="2641" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="2642" addr="0x7fca46934c90" />
+                    <attribute name="value" value="10" id="2643" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="2644" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="2645" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="2646" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="2647" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="2648" addr="0x7fca469a2630" >
+                <attributelist id="2649" addr="0x7fca469a2630" >
+                    <attribute name="sym_name" value="CONTROL_TEXT_OFFSET_Y" id="2650" addr="0x7fca46934c90" />
+                    <attribute name="name" value="CONTROL_TEXT_OFFSET_Y" id="2651" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="2" id="2652" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="2653" addr="0x7fca46934c90" />
+                    <attribute name="value" value="2" id="2654" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="2655" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="2656" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="2657" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="2658" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <namespace id="2659" addr="0x7fca469a2770" >
+                <attributelist id="2660" addr="0x7fca469a2770" >
+                    <attribute name="sym_name" value="XBMCAddon" id="2661" addr="0x7fca46934c90" />
+                    <attribute name="name" value="XBMCAddon" id="2662" addr="0x7fca46934c90" />
+                    <attribute name="sym_previousSibling" value="0x7fca469942b0" id="2663" addr="0x7fca469942b0" />
+                    <attribute name="csym_nextSibling" value="0x7fca469e47b0" id="2664" addr="0x7fca469e47b0" />
+                    <attribute name="sym_nextSibling" value="0x7fca469e47b0" id="2665" addr="0x7fca469e47b0" />
+                    <typescope id="2666" addr="0x7fca4691fd70" >
+                        <attributelist id="2667" addr="0x7fca4691fd70" >
+                            <attribute name="name" value="XBMCAddon" id="2668" addr="0x7fca46934c90" />
+                            <typetab id="2669" addr="0x7fca4691fdb0" >
+                                <attributelist id="2670" addr="0x7fca4691fdb0" >
+                                    <attribute name="Dictionary" value="Dictionary" id="2671" addr="0x7fca46934c90" />
+                                    <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="2672" addr="0x7fca46934c90" />
+                                    <attribute name="String" value="std::string" id="2673" addr="0x7fca46934c90" />
+                                    <attribute name="StringOrInt" value="XBMCAddon::String" id="2674" addr="0x7fca46934c90" />
                                 </attributelist >
-                                <typetabsitem id="2675" addr="0x7f99f1dd28b0" >
-                                    <attributelist id="2676" addr="0x7f99f1dd28b0" >
+                                <typetabsitem id="2675" addr="0x7fca469208b0" >
+                                    <attributelist id="2676" addr="0x7fca469208b0" >
                                     </attributelist >
                                 </typetabsitem >
-                                <typetabsitem id="2677" addr="0x7f99f1dd2910" >
-                                    <attributelist id="2678" addr="0x7f99f1dd2910" >
+                                <typetabsitem id="2677" addr="0x7fca46920910" >
+                                    <attributelist id="2678" addr="0x7fca46920910" >
                                     </attributelist >
                                 </typetabsitem >
-                                <typetabsitem id="2679" addr="0x7f99f1dd1f90" >
-                                    <attributelist id="2680" addr="0x7f99f1dd1f90" >
+                                <typetabsitem id="2679" addr="0x7fca4691ff90" >
+                                    <attributelist id="2680" addr="0x7fca4691ff90" >
                                     </attributelist >
                                 </typetabsitem >
-                                <typetabsitem id="2681" addr="0x7f99f1dd2710" >
-                                    <attributelist id="2682" addr="0x7f99f1dd2710" >
+                                <typetabsitem id="2681" addr="0x7fca46920710" >
+                                    <attributelist id="2682" addr="0x7fca46920710" >
                                     </attributelist >
                                 </typetabsitem >
                             </typetab >
-                            <attribute name="parent" value="0x7f99f1e1da30" id="2683" addr="0x7f99f1e1da30" />
-                            <attribute name="qname" value="XBMCAddon" id="2684" addr="0x7f99f1de6c90" />
-                            <attribute name="symtab" value="0x7f99f1e408b0" id="2685" addr="0x7f99f1e408b0" />
+                            <attribute name="parent" value="0x7fca4696ba30" id="2683" addr="0x7fca4696ba30" />
+                            <attribute name="qname" value="XBMCAddon" id="2684" addr="0x7fca46934c90" />
+                            <attribute name="symtab" value="0x7fca4698e8b0" id="2685" addr="0x7fca4698e8b0" />
                         </attributelist >
-                        <typescopesitem id="2686" addr="0x7f99f1e40870" >
-                            <attributelist id="2687" addr="0x7f99f1e40870" >
+                        <typescopesitem id="2686" addr="0x7fca4698e870" >
+                            <attributelist id="2687" addr="0x7fca4698e870" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="2688" addr="0x7f99f1dd1db0" >
-                            <attributelist id="2689" addr="0x7f99f1dd1db0" >
-                                <attribute name="Dictionary" value="Dictionary" id="2690" addr="0x7f99f1de6c90" />
-                                <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="2691" addr="0x7f99f1de6c90" />
-                                <attribute name="String" value="std::string" id="2692" addr="0x7f99f1de6c90" />
-                                <attribute name="StringOrInt" value="XBMCAddon::String" id="2693" addr="0x7f99f1de6c90" />
+                        <typescopesitem id="2688" addr="0x7fca4691fdb0" >
+                            <attributelist id="2689" addr="0x7fca4691fdb0" >
+                                <attribute name="Dictionary" value="Dictionary" id="2690" addr="0x7fca46934c90" />
+                                <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="2691" addr="0x7fca46934c90" />
+                                <attribute name="String" value="std::string" id="2692" addr="0x7fca46934c90" />
+                                <attribute name="StringOrInt" value="XBMCAddon::String" id="2693" addr="0x7fca46934c90" />
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="2694" addr="0x7f99f1e1da30" >
-                            <attributelist id="2695" addr="0x7f99f1e1da30" >
-                                <attribute name="name" value="" id="2696" addr="0x7f99f1de6c90" />
-                                <typetab id="2697" addr="0x7f99f1e1da90" >
-                                    <attributelist id="2698" addr="0x7f99f1e1da90" >
+                        <typescopesitem id="2694" addr="0x7fca4696ba30" >
+                            <attributelist id="2695" addr="0x7fca4696ba30" >
+                                <attribute name="name" value="" id="2696" addr="0x7fca46934c90" />
+                                <typetab id="2697" addr="0x7fca4696ba90" >
+                                    <attributelist id="2698" addr="0x7fca4696ba90" >
                                     </attributelist >
                                 </typetab >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="2699" addr="0x7f99f1dd1eb0" >
-                            <attributelist id="2700" addr="0x7f99f1dd1eb0" >
+                        <typescopesitem id="2699" addr="0x7fca4691feb0" >
+                            <attributelist id="2700" addr="0x7fca4691feb0" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="2701" addr="0x7f99f1e408b0" >
-                            <attributelist id="2702" addr="0x7f99f1e408b0" >
-                                <attribute name="name" value="XBMCAddon" id="2703" addr="0x7f99f1de6c90" />
-                                <attribute name="csymtab" value="0x7f99f1e408f0" id="2704" addr="0x7f99f1e408f0" />
-                                <attribute name="symtab" value="0x7f99f1e40890" id="2705" addr="0x7f99f1e40890" />
+                        <typescopesitem id="2701" addr="0x7fca4698e8b0" >
+                            <attributelist id="2702" addr="0x7fca4698e8b0" >
+                                <attribute name="name" value="XBMCAddon" id="2703" addr="0x7fca46934c90" />
+                                <attribute name="csymtab" value="0x7fca4698e8f0" id="2704" addr="0x7fca4698e8f0" />
+                                <attribute name="symtab" value="0x7fca4698e890" id="2705" addr="0x7fca4698e890" />
                             </attributelist >
                         </typescopesitem >
                     </typescope >
-                    <attribute name="symtab" value="0x7f99f1e408b0" id="2706" addr="0x7f99f1e408b0" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="2707" addr="0x7f99f1e1d950" />
+                    <attribute name="symtab" value="0x7fca4698e8b0" id="2706" addr="0x7fca4698e8b0" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="2707" addr="0x7fca4696b950" />
                 </attributelist >
 
-                <namespace id="2708" addr="0x7f99f1e547f0" >
-                    <attributelist id="2709" addr="0x7f99f1e547f0" >
-                        <attribute name="feature_knownbasetypes" value="AddonClass,AddonCallback" id="2710" addr="0x7f99f1de6c90" />
-                        <attribute name="name" value="xbmcgui" id="2711" addr="0x7f99f1de6c90" />
-                        <attribute name="sym_symtab" value="0x7f99f1e408b0" id="2712" addr="0x7f99f1e408b0" />
-                        <attribute name="symtab" value="0x7f99f1e40fb0" id="2713" addr="0x7f99f1e40fb0" />
-                        <attribute name="sym_nextSibling" value="0x7f99f1e96830" id="2714" addr="0x7f99f1e96830" />
-                        <attribute name="csym_nextSibling" value="0x7f99f1e96830" id="2715" addr="0x7f99f1e96830" />
-                        <attribute name="sym_previousSibling" value="0x7f99f1e46490" id="2716" addr="0x7f99f1e46490" />
-                        <attribute name="feature_knownapitypes" value="XBMCAddon::xbmc::InfoTagVideo,xbmc::InfoTagMusic" id="2717" addr="0x7f99f1de6c90" />
-                        <attribute name="sym_name" value="xbmcgui" id="2718" addr="0x7f99f1de6c90" />
-                        <typescope id="2719" addr="0x7f99f1dd2150" >
-                            <attributelist id="2720" addr="0x7f99f1dd2150" >
-                                <attribute name="name" value="xbmcgui" id="2721" addr="0x7f99f1de6c90" />
-                                <typetab id="2722" addr="0x7f99f1dd2170" >
-                                    <attributelist id="2723" addr="0x7f99f1dd2170" >
-                                        <attribute name="InterceptorBase" value="InterceptorBase" id="2724" addr="0x7f99f1de6c90" />
-                                        <attribute name="Dialog" value="Dialog" id="2725" addr="0x7f99f1de6c90" />
-                                        <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="2726" addr="0x7f99f1de6c90" />
-                                        <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="2727" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlTextBox" value="ControlTextBox" id="2728" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlRadioButton" value="ControlRadioButton" id="2729" addr="0x7f99f1de6c90" />
-                                        <attribute name="Window" value="Window" id="2730" addr="0x7f99f1de6c90" />
-                                        <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="2731" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlList" value="ControlList" id="2732" addr="0x7f99f1de6c90" />
-                                        <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="2733" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlImage" value="ControlImage" id="2734" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlButton" value="ControlButton" id="2735" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlGroup" value="ControlGroup" id="2736" addr="0x7f99f1de6c90" />
-                                        <attribute name="DialogBusy" value="DialogBusy" id="2737" addr="0x7f99f1de6c90" />
-                                        <attribute name="DialogProgressBG" value="DialogProgressBG" id="2738" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlSpin" value="ControlSpin" id="2739" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlEdit" value="ControlEdit" id="2740" addr="0x7f99f1de6c90" />
-                                        <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="2741" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="2742" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlLabel" value="ControlLabel" id="2743" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlProgress" value="ControlProgress" id="2744" addr="0x7f99f1de6c90" />
-                                        <attribute name="Control" value="Control" id="2745" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlSlider" value="ControlSlider" id="2746" addr="0x7f99f1de6c90" />
-                                        <attribute name="DialogProgress" value="DialogProgress" id="2747" addr="0x7f99f1de6c90" />
-                                        <attribute name="Action" value="Action" id="2748" addr="0x7f99f1de6c90" />
-                                        <attribute name="WindowDialog" value="WindowDialog" id="2749" addr="0x7f99f1de6c90" />
-                                        <attribute name="WindowXML" value="WindowXML" id="2750" addr="0x7f99f1de6c90" />
-                                        <attribute name="ListItem" value="ListItem" id="2751" addr="0x7f99f1de6c90" />
-                                        <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="2752" addr="0x7f99f1de6c90" />
+                <namespace id="2708" addr="0x7fca469a27f0" >
+                    <attributelist id="2709" addr="0x7fca469a27f0" >
+                        <attribute name="feature_knownbasetypes" value="AddonClass,AddonCallback" id="2710" addr="0x7fca46934c90" />
+                        <attribute name="name" value="xbmcgui" id="2711" addr="0x7fca46934c90" />
+                        <attribute name="sym_symtab" value="0x7fca4698e8b0" id="2712" addr="0x7fca4698e8b0" />
+                        <attribute name="symtab" value="0x7fca4698efb0" id="2713" addr="0x7fca4698efb0" />
+                        <attribute name="sym_nextSibling" value="0x7fca469e4830" id="2714" addr="0x7fca469e4830" />
+                        <attribute name="csym_nextSibling" value="0x7fca469e4830" id="2715" addr="0x7fca469e4830" />
+                        <attribute name="sym_previousSibling" value="0x7fca46994490" id="2716" addr="0x7fca46994490" />
+                        <attribute name="feature_knownapitypes" value="XBMCAddon::xbmc::InfoTagVideo,xbmc::InfoTagMusic" id="2717" addr="0x7fca46934c90" />
+                        <attribute name="sym_name" value="xbmcgui" id="2718" addr="0x7fca46934c90" />
+                        <typescope id="2719" addr="0x7fca46920150" >
+                            <attributelist id="2720" addr="0x7fca46920150" >
+                                <attribute name="name" value="xbmcgui" id="2721" addr="0x7fca46934c90" />
+                                <typetab id="2722" addr="0x7fca46920170" >
+                                    <attributelist id="2723" addr="0x7fca46920170" >
+                                        <attribute name="InterceptorBase" value="InterceptorBase" id="2724" addr="0x7fca46934c90" />
+                                        <attribute name="Dialog" value="Dialog" id="2725" addr="0x7fca46934c90" />
+                                        <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="2726" addr="0x7fca46934c90" />
+                                        <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="2727" addr="0x7fca46934c90" />
+                                        <attribute name="ControlTextBox" value="ControlTextBox" id="2728" addr="0x7fca46934c90" />
+                                        <attribute name="ControlRadioButton" value="ControlRadioButton" id="2729" addr="0x7fca46934c90" />
+                                        <attribute name="Window" value="Window" id="2730" addr="0x7fca46934c90" />
+                                        <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="2731" addr="0x7fca46934c90" />
+                                        <attribute name="ControlList" value="ControlList" id="2732" addr="0x7fca46934c90" />
+                                        <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="2733" addr="0x7fca46934c90" />
+                                        <attribute name="ControlImage" value="ControlImage" id="2734" addr="0x7fca46934c90" />
+                                        <attribute name="ControlButton" value="ControlButton" id="2735" addr="0x7fca46934c90" />
+                                        <attribute name="ControlGroup" value="ControlGroup" id="2736" addr="0x7fca46934c90" />
+                                        <attribute name="DialogBusy" value="DialogBusy" id="2737" addr="0x7fca46934c90" />
+                                        <attribute name="DialogProgressBG" value="DialogProgressBG" id="2738" addr="0x7fca46934c90" />
+                                        <attribute name="ControlSpin" value="ControlSpin" id="2739" addr="0x7fca46934c90" />
+                                        <attribute name="ControlEdit" value="ControlEdit" id="2740" addr="0x7fca46934c90" />
+                                        <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="2741" addr="0x7fca46934c90" />
+                                        <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="2742" addr="0x7fca46934c90" />
+                                        <attribute name="ControlLabel" value="ControlLabel" id="2743" addr="0x7fca46934c90" />
+                                        <attribute name="ControlProgress" value="ControlProgress" id="2744" addr="0x7fca46934c90" />
+                                        <attribute name="Control" value="Control" id="2745" addr="0x7fca46934c90" />
+                                        <attribute name="ControlSlider" value="ControlSlider" id="2746" addr="0x7fca46934c90" />
+                                        <attribute name="DialogProgress" value="DialogProgress" id="2747" addr="0x7fca46934c90" />
+                                        <attribute name="Action" value="Action" id="2748" addr="0x7fca46934c90" />
+                                        <attribute name="WindowDialog" value="WindowDialog" id="2749" addr="0x7fca46934c90" />
+                                        <attribute name="WindowXML" value="WindowXML" id="2750" addr="0x7fca46934c90" />
+                                        <attribute name="ListItem" value="ListItem" id="2751" addr="0x7fca46934c90" />
+                                        <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="2752" addr="0x7fca46934c90" />
                                     </attributelist >
-                                    <typetabsitem id="2753" addr="0x7f99f1de1dd0" >
-                                        <attributelist id="2754" addr="0x7f99f1de1dd0" >
+                                    <typetabsitem id="2753" addr="0x7fca4692fdd0" >
+                                        <attributelist id="2754" addr="0x7fca4692fdd0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2755" addr="0x7f99f1dde790" >
-                                        <attributelist id="2756" addr="0x7f99f1dde790" >
+                                    <typetabsitem id="2755" addr="0x7fca4692c790" >
+                                        <attributelist id="2756" addr="0x7fca4692c790" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2757" addr="0x7f99f1de3f10" >
-                                        <attributelist id="2758" addr="0x7f99f1de3f10" >
+                                    <typetabsitem id="2757" addr="0x7fca46931f10" >
+                                        <attributelist id="2758" addr="0x7fca46931f10" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2759" addr="0x7f99f1dd67b0" >
-                                        <attributelist id="2760" addr="0x7f99f1dd67b0" >
+                                    <typetabsitem id="2759" addr="0x7fca469247b0" >
+                                        <attributelist id="2760" addr="0x7fca469247b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2761" addr="0x7f99f1ddafd0" >
-                                        <attributelist id="2762" addr="0x7f99f1ddafd0" >
+                                    <typetabsitem id="2761" addr="0x7fca46928fd0" >
+                                        <attributelist id="2762" addr="0x7fca46928fd0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2763" addr="0x7f99f1ddd430" >
-                                        <attributelist id="2764" addr="0x7f99f1ddd430" >
+                                    <typetabsitem id="2763" addr="0x7fca4692b430" >
+                                        <attributelist id="2764" addr="0x7fca4692b430" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2765" addr="0x7f99f1de2130" >
-                                        <attributelist id="2766" addr="0x7f99f1de2130" >
+                                    <typetabsitem id="2765" addr="0x7fca46930130" >
+                                        <attributelist id="2766" addr="0x7fca46930130" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2767" addr="0x7f99f1dd2f50" >
-                                        <attributelist id="2768" addr="0x7f99f1dd2f50" >
+                                    <typetabsitem id="2767" addr="0x7fca46920f50" >
+                                        <attributelist id="2768" addr="0x7fca46920f50" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2769" addr="0x7f99f1dd9650" >
-                                        <attributelist id="2770" addr="0x7f99f1dd9650" >
+                                    <typetabsitem id="2769" addr="0x7fca46927650" >
+                                        <attributelist id="2770" addr="0x7fca46927650" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2771" addr="0x7f99f1de3390" >
-                                        <attributelist id="2772" addr="0x7f99f1de3390" >
+                                    <typetabsitem id="2771" addr="0x7fca46931390" >
+                                        <attributelist id="2772" addr="0x7fca46931390" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2773" addr="0x7f99f1ddb7b0" >
-                                        <attributelist id="2774" addr="0x7f99f1ddb7b0" >
+                                    <typetabsitem id="2773" addr="0x7fca469297b0" >
+                                        <attributelist id="2774" addr="0x7fca469297b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2775" addr="0x7f99f1ddc4b0" >
-                                        <attributelist id="2776" addr="0x7f99f1ddc4b0" >
+                                    <typetabsitem id="2775" addr="0x7fca4692a4b0" >
+                                        <attributelist id="2776" addr="0x7fca4692a4b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2777" addr="0x7f99f1ddcf90" >
-                                        <attributelist id="2778" addr="0x7f99f1ddcf90" >
+                                    <typetabsitem id="2777" addr="0x7fca4692af90" >
+                                        <attributelist id="2778" addr="0x7fca4692af90" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2779" addr="0x7f99f1de11b0" >
-                                        <attributelist id="2780" addr="0x7f99f1de11b0" >
+                                    <typetabsitem id="2779" addr="0x7fca4692f1b0" >
+                                        <attributelist id="2780" addr="0x7fca4692f1b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2781" addr="0x7f99f1de15b0" >
-                                        <attributelist id="2782" addr="0x7f99f1de15b0" >
+                                    <typetabsitem id="2781" addr="0x7fca4692f5b0" >
+                                        <attributelist id="2782" addr="0x7fca4692f5b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2783" addr="0x7f99f1dd77f0" >
-                                        <attributelist id="2784" addr="0x7f99f1dd77f0" >
+                                    <typetabsitem id="2783" addr="0x7fca469257f0" >
+                                        <attributelist id="2784" addr="0x7fca469257f0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2785" addr="0x7f99f1dd8b30" >
-                                        <attributelist id="2786" addr="0x7f99f1dd8b30" >
+                                    <typetabsitem id="2785" addr="0x7fca46926b30" >
+                                        <attributelist id="2786" addr="0x7fca46926b30" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2787" addr="0x7f99f1dd2c50" >
-                                        <attributelist id="2788" addr="0x7f99f1dd2c50" >
+                                    <typetabsitem id="2787" addr="0x7fca46920c50" >
+                                        <attributelist id="2788" addr="0x7fca46920c50" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2789" addr="0x7f99f1dda790" >
-                                        <attributelist id="2790" addr="0x7f99f1dda790" >
+                                    <typetabsitem id="2789" addr="0x7fca46928790" >
+                                        <attributelist id="2790" addr="0x7fca46928790" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2791" addr="0x7f99f1dd8030" >
-                                        <attributelist id="2792" addr="0x7f99f1dd8030" >
+                                    <typetabsitem id="2791" addr="0x7fca46926030" >
+                                        <attributelist id="2792" addr="0x7fca46926030" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2793" addr="0x7f99f1ddbe10" >
-                                        <attributelist id="2794" addr="0x7f99f1ddbe10" >
+                                    <typetabsitem id="2793" addr="0x7fca46929e10" >
+                                        <attributelist id="2794" addr="0x7fca46929e10" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2795" addr="0x7f99f1dd6b10" >
-                                        <attributelist id="2796" addr="0x7f99f1dd6b10" >
+                                    <typetabsitem id="2795" addr="0x7fca46924b10" >
+                                        <attributelist id="2796" addr="0x7fca46924b10" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2797" addr="0x7f99f1dddf90" >
-                                        <attributelist id="2798" addr="0x7f99f1dddf90" >
+                                    <typetabsitem id="2797" addr="0x7fca4692bf90" >
+                                        <attributelist id="2798" addr="0x7fca4692bf90" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2799" addr="0x7f99f1de0530" >
-                                        <attributelist id="2800" addr="0x7f99f1de0530" >
+                                    <typetabsitem id="2799" addr="0x7fca4692e530" >
+                                        <attributelist id="2800" addr="0x7fca4692e530" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2801" addr="0x7f99f1de1e50" >
-                                        <attributelist id="2802" addr="0x7f99f1de1e50" >
+                                    <typetabsitem id="2801" addr="0x7fca4692fe50" >
+                                        <attributelist id="2802" addr="0x7fca4692fe50" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2803" addr="0x7f99f1de2d90" >
-                                        <attributelist id="2804" addr="0x7f99f1de2d90" >
+                                    <typetabsitem id="2803" addr="0x7fca46930d90" >
+                                        <attributelist id="2804" addr="0x7fca46930d90" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2805" addr="0x7f99f1de3410" >
-                                        <attributelist id="2806" addr="0x7f99f1de3410" >
+                                    <typetabsitem id="2805" addr="0x7fca46931410" >
+                                        <attributelist id="2806" addr="0x7fca46931410" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2807" addr="0x7f99f1dd3590" >
-                                        <attributelist id="2808" addr="0x7f99f1dd3590" >
+                                    <typetabsitem id="2807" addr="0x7fca46921590" >
+                                        <attributelist id="2808" addr="0x7fca46921590" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="2809" addr="0x7f99f1dd3390" >
-                                        <attributelist id="2810" addr="0x7f99f1dd3390" >
+                                    <typetabsitem id="2809" addr="0x7fca46921390" >
+                                        <attributelist id="2810" addr="0x7fca46921390" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
-                                <attribute name="parent" value="0x7f99f1dd1d70" id="2811" addr="0x7f99f1dd1d70" />
-                                <attribute name="qname" value="XBMCAddon::xbmcgui" id="2812" addr="0x7f99f1de6c90" />
-                                <attribute name="symtab" value="0x7f99f1e40fb0" id="2813" addr="0x7f99f1e40fb0" />
+                                <attribute name="parent" value="0x7fca4691fd70" id="2811" addr="0x7fca4691fd70" />
+                                <attribute name="qname" value="XBMCAddon::xbmcgui" id="2812" addr="0x7fca46934c90" />
+                                <attribute name="symtab" value="0x7fca4698efb0" id="2813" addr="0x7fca4698efb0" />
                             </attributelist >
-                            <typescopesitem id="2814" addr="0x7f99f1e40f70" >
-                                <attributelist id="2815" addr="0x7f99f1e40f70" >
+                            <typescopesitem id="2814" addr="0x7fca4698ef70" >
+                                <attributelist id="2815" addr="0x7fca4698ef70" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="2816" addr="0x7f99f1dd2170" >
-                                <attributelist id="2817" addr="0x7f99f1dd2170" >
-                                    <attribute name="InterceptorBase" value="InterceptorBase" id="2818" addr="0x7f99f1de6c90" />
-                                    <attribute name="Dialog" value="Dialog" id="2819" addr="0x7f99f1de6c90" />
-                                    <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="2820" addr="0x7f99f1de6c90" />
-                                    <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="2821" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlTextBox" value="ControlTextBox" id="2822" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlRadioButton" value="ControlRadioButton" id="2823" addr="0x7f99f1de6c90" />
-                                    <attribute name="Window" value="Window" id="2824" addr="0x7f99f1de6c90" />
-                                    <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="2825" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlList" value="ControlList" id="2826" addr="0x7f99f1de6c90" />
-                                    <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="2827" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlImage" value="ControlImage" id="2828" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlButton" value="ControlButton" id="2829" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlGroup" value="ControlGroup" id="2830" addr="0x7f99f1de6c90" />
-                                    <attribute name="DialogBusy" value="DialogBusy" id="2831" addr="0x7f99f1de6c90" />
-                                    <attribute name="DialogProgressBG" value="DialogProgressBG" id="2832" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlSpin" value="ControlSpin" id="2833" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlEdit" value="ControlEdit" id="2834" addr="0x7f99f1de6c90" />
-                                    <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="2835" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="2836" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlLabel" value="ControlLabel" id="2837" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlProgress" value="ControlProgress" id="2838" addr="0x7f99f1de6c90" />
-                                    <attribute name="Control" value="Control" id="2839" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlSlider" value="ControlSlider" id="2840" addr="0x7f99f1de6c90" />
-                                    <attribute name="DialogProgress" value="DialogProgress" id="2841" addr="0x7f99f1de6c90" />
-                                    <attribute name="Action" value="Action" id="2842" addr="0x7f99f1de6c90" />
-                                    <attribute name="WindowDialog" value="WindowDialog" id="2843" addr="0x7f99f1de6c90" />
-                                    <attribute name="WindowXML" value="WindowXML" id="2844" addr="0x7f99f1de6c90" />
-                                    <attribute name="ListItem" value="ListItem" id="2845" addr="0x7f99f1de6c90" />
-                                    <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="2846" addr="0x7f99f1de6c90" />
+                            <typescopesitem id="2816" addr="0x7fca46920170" >
+                                <attributelist id="2817" addr="0x7fca46920170" >
+                                    <attribute name="InterceptorBase" value="InterceptorBase" id="2818" addr="0x7fca46934c90" />
+                                    <attribute name="Dialog" value="Dialog" id="2819" addr="0x7fca46934c90" />
+                                    <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="2820" addr="0x7fca46934c90" />
+                                    <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="2821" addr="0x7fca46934c90" />
+                                    <attribute name="ControlTextBox" value="ControlTextBox" id="2822" addr="0x7fca46934c90" />
+                                    <attribute name="ControlRadioButton" value="ControlRadioButton" id="2823" addr="0x7fca46934c90" />
+                                    <attribute name="Window" value="Window" id="2824" addr="0x7fca46934c90" />
+                                    <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="2825" addr="0x7fca46934c90" />
+                                    <attribute name="ControlList" value="ControlList" id="2826" addr="0x7fca46934c90" />
+                                    <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="2827" addr="0x7fca46934c90" />
+                                    <attribute name="ControlImage" value="ControlImage" id="2828" addr="0x7fca46934c90" />
+                                    <attribute name="ControlButton" value="ControlButton" id="2829" addr="0x7fca46934c90" />
+                                    <attribute name="ControlGroup" value="ControlGroup" id="2830" addr="0x7fca46934c90" />
+                                    <attribute name="DialogBusy" value="DialogBusy" id="2831" addr="0x7fca46934c90" />
+                                    <attribute name="DialogProgressBG" value="DialogProgressBG" id="2832" addr="0x7fca46934c90" />
+                                    <attribute name="ControlSpin" value="ControlSpin" id="2833" addr="0x7fca46934c90" />
+                                    <attribute name="ControlEdit" value="ControlEdit" id="2834" addr="0x7fca46934c90" />
+                                    <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="2835" addr="0x7fca46934c90" />
+                                    <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="2836" addr="0x7fca46934c90" />
+                                    <attribute name="ControlLabel" value="ControlLabel" id="2837" addr="0x7fca46934c90" />
+                                    <attribute name="ControlProgress" value="ControlProgress" id="2838" addr="0x7fca46934c90" />
+                                    <attribute name="Control" value="Control" id="2839" addr="0x7fca46934c90" />
+                                    <attribute name="ControlSlider" value="ControlSlider" id="2840" addr="0x7fca46934c90" />
+                                    <attribute name="DialogProgress" value="DialogProgress" id="2841" addr="0x7fca46934c90" />
+                                    <attribute name="Action" value="Action" id="2842" addr="0x7fca46934c90" />
+                                    <attribute name="WindowDialog" value="WindowDialog" id="2843" addr="0x7fca46934c90" />
+                                    <attribute name="WindowXML" value="WindowXML" id="2844" addr="0x7fca46934c90" />
+                                    <attribute name="ListItem" value="ListItem" id="2845" addr="0x7fca46934c90" />
+                                    <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="2846" addr="0x7fca46934c90" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="2847" addr="0x7f99f1dd1d70" >
-                                <attributelist id="2848" addr="0x7f99f1dd1d70" >
-                                    <attribute name="name" value="XBMCAddon" id="2849" addr="0x7f99f1de6c90" />
-                                    <typetab id="2850" addr="0x7f99f1dd1db0" >
-                                        <attributelist id="2851" addr="0x7f99f1dd1db0" >
-                                            <attribute name="Dictionary" value="Dictionary" id="2852" addr="0x7f99f1de6c90" />
-                                            <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="2853" addr="0x7f99f1de6c90" />
-                                            <attribute name="String" value="std::string" id="2854" addr="0x7f99f1de6c90" />
-                                            <attribute name="StringOrInt" value="XBMCAddon::String" id="2855" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                        <typetabsitem id="2856" addr="0x7f99f1dd28b0" >
-                                            <attributelist id="2857" addr="0x7f99f1dd28b0" >
+                            <typescopesitem id="2847" addr="0x7fca4691fd70" >
+                                <attributelist id="2848" addr="0x7fca4691fd70" >
+                                    <attribute name="name" value="XBMCAddon" id="2849" addr="0x7fca46934c90" />
+                                    <typetab id="2850" addr="0x7fca4691fdb0" >
+                                        <attributelist id="2851" addr="0x7fca4691fdb0" >
+                                            <attribute name="Dictionary" value="Dictionary" id="2852" addr="0x7fca46934c90" />
+                                            <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="2853" addr="0x7fca46934c90" />
+                                            <attribute name="String" value="std::string" id="2854" addr="0x7fca46934c90" />
+                                            <attribute name="StringOrInt" value="XBMCAddon::String" id="2855" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                        <typetabsitem id="2856" addr="0x7fca469208b0" >
+                                            <attributelist id="2857" addr="0x7fca469208b0" >
                                             </attributelist >
                                         </typetabsitem >
-                                        <typetabsitem id="2858" addr="0x7f99f1dd2910" >
-                                            <attributelist id="2859" addr="0x7f99f1dd2910" >
+                                        <typetabsitem id="2858" addr="0x7fca46920910" >
+                                            <attributelist id="2859" addr="0x7fca46920910" >
                                             </attributelist >
                                         </typetabsitem >
-                                        <typetabsitem id="2860" addr="0x7f99f1dd1f90" >
-                                            <attributelist id="2861" addr="0x7f99f1dd1f90" >
+                                        <typetabsitem id="2860" addr="0x7fca4691ff90" >
+                                            <attributelist id="2861" addr="0x7fca4691ff90" >
                                             </attributelist >
                                         </typetabsitem >
-                                        <typetabsitem id="2862" addr="0x7f99f1dd2710" >
-                                            <attributelist id="2863" addr="0x7f99f1dd2710" >
+                                        <typetabsitem id="2862" addr="0x7fca46920710" >
+                                            <attributelist id="2863" addr="0x7fca46920710" >
                                             </attributelist >
                                         </typetabsitem >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f99f1e1da30" id="2864" addr="0x7f99f1e1da30" />
-                                    <attribute name="qname" value="XBMCAddon" id="2865" addr="0x7f99f1de6c90" />
-                                    <attribute name="symtab" value="0x7f99f1e408b0" id="2866" addr="0x7f99f1e408b0" />
+                                    <attribute name="parent" value="0x7fca4696ba30" id="2864" addr="0x7fca4696ba30" />
+                                    <attribute name="qname" value="XBMCAddon" id="2865" addr="0x7fca46934c90" />
+                                    <attribute name="symtab" value="0x7fca4698e8b0" id="2866" addr="0x7fca4698e8b0" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="2867" addr="0x7f99f1dd2190" >
-                                <attributelist id="2868" addr="0x7f99f1dd2190" >
+                            <typescopesitem id="2867" addr="0x7fca46920190" >
+                                <attributelist id="2868" addr="0x7fca46920190" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="2869" addr="0x7f99f1e40fb0" >
-                                <attributelist id="2870" addr="0x7f99f1e40fb0" >
-                                    <attribute name="name" value="xbmcgui" id="2871" addr="0x7f99f1de6c90" />
-                                    <attribute name="csymtab" value="0x7f99f1e40ff0" id="2872" addr="0x7f99f1e40ff0" />
-                                    <attribute name="symtab" value="0x7f99f1e40f90" id="2873" addr="0x7f99f1e40f90" />
+                            <typescopesitem id="2869" addr="0x7fca4698efb0" >
+                                <attributelist id="2870" addr="0x7fca4698efb0" >
+                                    <attribute name="name" value="xbmcgui" id="2871" addr="0x7fca46934c90" />
+                                    <attribute name="csymtab" value="0x7fca4698eff0" id="2872" addr="0x7fca4698eff0" />
+                                    <attribute name="symtab" value="0x7fca4698ef90" id="2873" addr="0x7fca4698ef90" />
                                 </attributelist >
                             </typescopesitem >
                         </typescope >
                     </attributelist >
 
-                    <class id="2874" addr="0x7f99f1e54970" >
-                        <attributelist id="2875" addr="0x7f99f1e54970" >
-                            <attribute name="name" value="XBMCAddon::xbmcgui::Control" id="2876" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="2877" addr="0x7f99f1e40fb0" />
-                            <attribute name="symtab" value="0x7f99f1e54ab0" id="2878" addr="0x7f99f1e54ab0" />
-                            <attribute name="allows_typedef" value="1" id="2879" addr="0x7f99f1de6c90" />
-                            <attribute name="typepass_visit" value="1" id="2880" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_visit" value="1" id="2881" addr="0x7f99f1de6c90" />
-                            <attribute name="kind" value="class" id="2882" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_name" value="Control" id="2883" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_default_base_constructor" value="1" id="2884" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_has_constructor" value="1" id="2885" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_has_destructor" value="1" id="2886" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_default_destructor" value="1" id="2887" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_copy_constructor" value="1" id="2888" addr="0x7f99f1de6c90" />
-                            <attribute name="privatebaselist" value="0x7f99f1e54950" id="2889" addr="0x7f99f1e54950" />
-                            <attribute name="protectedbaselist" value="0x7f99f1e54930" id="2890" addr="0x7f99f1e54930" />
-                            <baselist id="2891" addr="0x7f99f1e54910" >
-                                <base name="AddonClass" id="2892" addr="0x7f99f1e54890" />
+                    <class id="2874" addr="0x7fca469a2970" >
+                        <attributelist id="2875" addr="0x7fca469a2970" >
+                            <attribute name="name" value="XBMCAddon::xbmcgui::Control" id="2876" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="2877" addr="0x7fca4698efb0" />
+                            <attribute name="symtab" value="0x7fca469a2ab0" id="2878" addr="0x7fca469a2ab0" />
+                            <attribute name="allows_typedef" value="1" id="2879" addr="0x7fca46934c90" />
+                            <attribute name="typepass_visit" value="1" id="2880" addr="0x7fca46934c90" />
+                            <attribute name="allocate_visit" value="1" id="2881" addr="0x7fca46934c90" />
+                            <attribute name="kind" value="class" id="2882" addr="0x7fca46934c90" />
+                            <attribute name="sym_name" value="Control" id="2883" addr="0x7fca46934c90" />
+                            <attribute name="allocate_default_base_constructor" value="1" id="2884" addr="0x7fca46934c90" />
+                            <attribute name="allocate_has_constructor" value="1" id="2885" addr="0x7fca46934c90" />
+                            <attribute name="allocate_has_destructor" value="1" id="2886" addr="0x7fca46934c90" />
+                            <attribute name="allocate_default_destructor" value="1" id="2887" addr="0x7fca46934c90" />
+                            <attribute name="allocate_copy_constructor" value="1" id="2888" addr="0x7fca46934c90" />
+                            <attribute name="privatebaselist" value="0x7fca469a2950" id="2889" addr="0x7fca469a2950" />
+                            <attribute name="protectedbaselist" value="0x7fca469a2930" id="2890" addr="0x7fca469a2930" />
+                            <baselist id="2891" addr="0x7fca469a2910" >
+                                <base name="AddonClass" id="2892" addr="0x7fca469a2890" />
                             </baselist >
-                            <attribute name="module" value="xbmcgui" id="2893" addr="0x7f99f1e402f0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="2894" addr="0x7f99f1de6c90" />
-                            <typescope id="2895" addr="0x7f99f1dd6bd0" >
-                                <attributelist id="2896" addr="0x7f99f1dd6bd0" >
-                                    <attribute name="name" value="Control" id="2897" addr="0x7f99f1de6c90" />
-                                    <typetab id="2898" addr="0x7f99f1dd6bf0" >
-                                        <attributelist id="2899" addr="0x7f99f1dd6bf0" >
+                            <attribute name="module" value="xbmcgui" id="2893" addr="0x7fca4698e2f0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="2894" addr="0x7fca46934c90" />
+                            <typescope id="2895" addr="0x7fca46924bd0" >
+                                <attributelist id="2896" addr="0x7fca46924bd0" >
+                                    <attribute name="name" value="Control" id="2897" addr="0x7fca46934c90" />
+                                    <typetab id="2898" addr="0x7fca46924bf0" >
+                                        <attributelist id="2899" addr="0x7fca46924bf0" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f99f1dd2150" id="2900" addr="0x7f99f1dd2150" />
-                                    <attribute name="qname" value="XBMCAddon::xbmcgui::Control" id="2901" addr="0x7f99f1de6c90" />
-                                    <attribute name="symtab" value="0x7f99f1e54ab0" id="2902" addr="0x7f99f1e54ab0" />
+                                    <attribute name="parent" value="0x7fca46920150" id="2900" addr="0x7fca46920150" />
+                                    <attribute name="qname" value="XBMCAddon::xbmcgui::Control" id="2901" addr="0x7fca46934c90" />
+                                    <attribute name="symtab" value="0x7fca469a2ab0" id="2902" addr="0x7fca469a2ab0" />
                                 </attributelist >
-                                <typescopesitem id="2903" addr="0x7f99f1dd6b70" >
-                                    <attributelist id="2904" addr="0x7f99f1dd6b70" >
+                                <typescopesitem id="2903" addr="0x7fca46924b70" >
+                                    <attributelist id="2904" addr="0x7fca46924b70" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="2905" addr="0x7f99f1dd6bf0" >
-                                    <attributelist id="2906" addr="0x7f99f1dd6bf0" >
+                                <typescopesitem id="2905" addr="0x7fca46924bf0" >
+                                    <attributelist id="2906" addr="0x7fca46924bf0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="2907" addr="0x7f99f1dd2150" >
-                                    <attributelist id="2908" addr="0x7f99f1dd2150" >
-                                        <attribute name="name" value="xbmcgui" id="2909" addr="0x7f99f1de6c90" />
-                                        <typetab id="2910" addr="0x7f99f1dd2170" >
-                                            <attributelist id="2911" addr="0x7f99f1dd2170" >
-                                                <attribute name="InterceptorBase" value="InterceptorBase" id="2912" addr="0x7f99f1de6c90" />
-                                                <attribute name="Dialog" value="Dialog" id="2913" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="2914" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="2915" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlTextBox" value="ControlTextBox" id="2916" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="2917" addr="0x7f99f1de6c90" />
-                                                <attribute name="Window" value="Window" id="2918" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="2919" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlList" value="ControlList" id="2920" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="2921" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlImage" value="ControlImage" id="2922" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlButton" value="ControlButton" id="2923" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlGroup" value="ControlGroup" id="2924" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogBusy" value="DialogBusy" id="2925" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="2926" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSpin" value="ControlSpin" id="2927" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlEdit" value="ControlEdit" id="2928" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="2929" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="2930" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlLabel" value="ControlLabel" id="2931" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlProgress" value="ControlProgress" id="2932" addr="0x7f99f1de6c90" />
-                                                <attribute name="Control" value="Control" id="2933" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSlider" value="ControlSlider" id="2934" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgress" value="DialogProgress" id="2935" addr="0x7f99f1de6c90" />
-                                                <attribute name="Action" value="Action" id="2936" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowDialog" value="WindowDialog" id="2937" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXML" value="WindowXML" id="2938" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItem" value="ListItem" id="2939" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="2940" addr="0x7f99f1de6c90" />
+                                <typescopesitem id="2907" addr="0x7fca46920150" >
+                                    <attributelist id="2908" addr="0x7fca46920150" >
+                                        <attribute name="name" value="xbmcgui" id="2909" addr="0x7fca46934c90" />
+                                        <typetab id="2910" addr="0x7fca46920170" >
+                                            <attributelist id="2911" addr="0x7fca46920170" >
+                                                <attribute name="InterceptorBase" value="InterceptorBase" id="2912" addr="0x7fca46934c90" />
+                                                <attribute name="Dialog" value="Dialog" id="2913" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="2914" addr="0x7fca46934c90" />
+                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="2915" addr="0x7fca46934c90" />
+                                                <attribute name="ControlTextBox" value="ControlTextBox" id="2916" addr="0x7fca46934c90" />
+                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="2917" addr="0x7fca46934c90" />
+                                                <attribute name="Window" value="Window" id="2918" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="2919" addr="0x7fca46934c90" />
+                                                <attribute name="ControlList" value="ControlList" id="2920" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="2921" addr="0x7fca46934c90" />
+                                                <attribute name="ControlImage" value="ControlImage" id="2922" addr="0x7fca46934c90" />
+                                                <attribute name="ControlButton" value="ControlButton" id="2923" addr="0x7fca46934c90" />
+                                                <attribute name="ControlGroup" value="ControlGroup" id="2924" addr="0x7fca46934c90" />
+                                                <attribute name="DialogBusy" value="DialogBusy" id="2925" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="2926" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSpin" value="ControlSpin" id="2927" addr="0x7fca46934c90" />
+                                                <attribute name="ControlEdit" value="ControlEdit" id="2928" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="2929" addr="0x7fca46934c90" />
+                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="2930" addr="0x7fca46934c90" />
+                                                <attribute name="ControlLabel" value="ControlLabel" id="2931" addr="0x7fca46934c90" />
+                                                <attribute name="ControlProgress" value="ControlProgress" id="2932" addr="0x7fca46934c90" />
+                                                <attribute name="Control" value="Control" id="2933" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSlider" value="ControlSlider" id="2934" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgress" value="DialogProgress" id="2935" addr="0x7fca46934c90" />
+                                                <attribute name="Action" value="Action" id="2936" addr="0x7fca46934c90" />
+                                                <attribute name="WindowDialog" value="WindowDialog" id="2937" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXML" value="WindowXML" id="2938" addr="0x7fca46934c90" />
+                                                <attribute name="ListItem" value="ListItem" id="2939" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="2940" addr="0x7fca46934c90" />
                                             </attributelist >
-                                            <typetabsitem id="2941" addr="0x7f99f1de1dd0" >
-                                                <attributelist id="2942" addr="0x7f99f1de1dd0" >
+                                            <typetabsitem id="2941" addr="0x7fca4692fdd0" >
+                                                <attributelist id="2942" addr="0x7fca4692fdd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2943" addr="0x7f99f1dde790" >
-                                                <attributelist id="2944" addr="0x7f99f1dde790" >
+                                            <typetabsitem id="2943" addr="0x7fca4692c790" >
+                                                <attributelist id="2944" addr="0x7fca4692c790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2945" addr="0x7f99f1de3f10" >
-                                                <attributelist id="2946" addr="0x7f99f1de3f10" >
+                                            <typetabsitem id="2945" addr="0x7fca46931f10" >
+                                                <attributelist id="2946" addr="0x7fca46931f10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2947" addr="0x7f99f1dd67b0" >
-                                                <attributelist id="2948" addr="0x7f99f1dd67b0" >
+                                            <typetabsitem id="2947" addr="0x7fca469247b0" >
+                                                <attributelist id="2948" addr="0x7fca469247b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2949" addr="0x7f99f1ddafd0" >
-                                                <attributelist id="2950" addr="0x7f99f1ddafd0" >
+                                            <typetabsitem id="2949" addr="0x7fca46928fd0" >
+                                                <attributelist id="2950" addr="0x7fca46928fd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2951" addr="0x7f99f1ddd430" >
-                                                <attributelist id="2952" addr="0x7f99f1ddd430" >
+                                            <typetabsitem id="2951" addr="0x7fca4692b430" >
+                                                <attributelist id="2952" addr="0x7fca4692b430" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2953" addr="0x7f99f1de2130" >
-                                                <attributelist id="2954" addr="0x7f99f1de2130" >
+                                            <typetabsitem id="2953" addr="0x7fca46930130" >
+                                                <attributelist id="2954" addr="0x7fca46930130" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2955" addr="0x7f99f1dd2f50" >
-                                                <attributelist id="2956" addr="0x7f99f1dd2f50" >
+                                            <typetabsitem id="2955" addr="0x7fca46920f50" >
+                                                <attributelist id="2956" addr="0x7fca46920f50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2957" addr="0x7f99f1dd9650" >
-                                                <attributelist id="2958" addr="0x7f99f1dd9650" >
+                                            <typetabsitem id="2957" addr="0x7fca46927650" >
+                                                <attributelist id="2958" addr="0x7fca46927650" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2959" addr="0x7f99f1de3390" >
-                                                <attributelist id="2960" addr="0x7f99f1de3390" >
+                                            <typetabsitem id="2959" addr="0x7fca46931390" >
+                                                <attributelist id="2960" addr="0x7fca46931390" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2961" addr="0x7f99f1ddb7b0" >
-                                                <attributelist id="2962" addr="0x7f99f1ddb7b0" >
+                                            <typetabsitem id="2961" addr="0x7fca469297b0" >
+                                                <attributelist id="2962" addr="0x7fca469297b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2963" addr="0x7f99f1ddc4b0" >
-                                                <attributelist id="2964" addr="0x7f99f1ddc4b0" >
+                                            <typetabsitem id="2963" addr="0x7fca4692a4b0" >
+                                                <attributelist id="2964" addr="0x7fca4692a4b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2965" addr="0x7f99f1ddcf90" >
-                                                <attributelist id="2966" addr="0x7f99f1ddcf90" >
+                                            <typetabsitem id="2965" addr="0x7fca4692af90" >
+                                                <attributelist id="2966" addr="0x7fca4692af90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2967" addr="0x7f99f1de11b0" >
-                                                <attributelist id="2968" addr="0x7f99f1de11b0" >
+                                            <typetabsitem id="2967" addr="0x7fca4692f1b0" >
+                                                <attributelist id="2968" addr="0x7fca4692f1b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2969" addr="0x7f99f1de15b0" >
-                                                <attributelist id="2970" addr="0x7f99f1de15b0" >
+                                            <typetabsitem id="2969" addr="0x7fca4692f5b0" >
+                                                <attributelist id="2970" addr="0x7fca4692f5b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2971" addr="0x7f99f1dd77f0" >
-                                                <attributelist id="2972" addr="0x7f99f1dd77f0" >
+                                            <typetabsitem id="2971" addr="0x7fca469257f0" >
+                                                <attributelist id="2972" addr="0x7fca469257f0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2973" addr="0x7f99f1dd8b30" >
-                                                <attributelist id="2974" addr="0x7f99f1dd8b30" >
+                                            <typetabsitem id="2973" addr="0x7fca46926b30" >
+                                                <attributelist id="2974" addr="0x7fca46926b30" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2975" addr="0x7f99f1dd2c50" >
-                                                <attributelist id="2976" addr="0x7f99f1dd2c50" >
+                                            <typetabsitem id="2975" addr="0x7fca46920c50" >
+                                                <attributelist id="2976" addr="0x7fca46920c50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2977" addr="0x7f99f1dda790" >
-                                                <attributelist id="2978" addr="0x7f99f1dda790" >
+                                            <typetabsitem id="2977" addr="0x7fca46928790" >
+                                                <attributelist id="2978" addr="0x7fca46928790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2979" addr="0x7f99f1dd8030" >
-                                                <attributelist id="2980" addr="0x7f99f1dd8030" >
+                                            <typetabsitem id="2979" addr="0x7fca46926030" >
+                                                <attributelist id="2980" addr="0x7fca46926030" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2981" addr="0x7f99f1ddbe10" >
-                                                <attributelist id="2982" addr="0x7f99f1ddbe10" >
+                                            <typetabsitem id="2981" addr="0x7fca46929e10" >
+                                                <attributelist id="2982" addr="0x7fca46929e10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2983" addr="0x7f99f1dd6b10" >
-                                                <attributelist id="2984" addr="0x7f99f1dd6b10" >
+                                            <typetabsitem id="2983" addr="0x7fca46924b10" >
+                                                <attributelist id="2984" addr="0x7fca46924b10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2985" addr="0x7f99f1dddf90" >
-                                                <attributelist id="2986" addr="0x7f99f1dddf90" >
+                                            <typetabsitem id="2985" addr="0x7fca4692bf90" >
+                                                <attributelist id="2986" addr="0x7fca4692bf90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2987" addr="0x7f99f1de0530" >
-                                                <attributelist id="2988" addr="0x7f99f1de0530" >
+                                            <typetabsitem id="2987" addr="0x7fca4692e530" >
+                                                <attributelist id="2988" addr="0x7fca4692e530" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2989" addr="0x7f99f1de1e50" >
-                                                <attributelist id="2990" addr="0x7f99f1de1e50" >
+                                            <typetabsitem id="2989" addr="0x7fca4692fe50" >
+                                                <attributelist id="2990" addr="0x7fca4692fe50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2991" addr="0x7f99f1de2d90" >
-                                                <attributelist id="2992" addr="0x7f99f1de2d90" >
+                                            <typetabsitem id="2991" addr="0x7fca46930d90" >
+                                                <attributelist id="2992" addr="0x7fca46930d90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2993" addr="0x7f99f1de3410" >
-                                                <attributelist id="2994" addr="0x7f99f1de3410" >
+                                            <typetabsitem id="2993" addr="0x7fca46931410" >
+                                                <attributelist id="2994" addr="0x7fca46931410" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2995" addr="0x7f99f1dd3590" >
-                                                <attributelist id="2996" addr="0x7f99f1dd3590" >
+                                            <typetabsitem id="2995" addr="0x7fca46921590" >
+                                                <attributelist id="2996" addr="0x7fca46921590" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="2997" addr="0x7f99f1dd3390" >
-                                                <attributelist id="2998" addr="0x7f99f1dd3390" >
+                                            <typetabsitem id="2997" addr="0x7fca46921390" >
+                                                <attributelist id="2998" addr="0x7fca46921390" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7f99f1dd1d70" id="2999" addr="0x7f99f1dd1d70" />
-                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="3000" addr="0x7f99f1de6c90" />
-                                        <attribute name="symtab" value="0x7f99f1e40fb0" id="3001" addr="0x7f99f1e40fb0" />
+                                        <attribute name="parent" value="0x7fca4691fd70" id="2999" addr="0x7fca4691fd70" />
+                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="3000" addr="0x7fca46934c90" />
+                                        <attribute name="symtab" value="0x7fca4698efb0" id="3001" addr="0x7fca4698efb0" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="3002" addr="0x7f99f1dd6c10" >
-                                    <attributelist id="3003" addr="0x7f99f1dd6c10" >
+                                <typescopesitem id="3002" addr="0x7fca46924c10" >
+                                    <attributelist id="3003" addr="0x7fca46924c10" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="3004" addr="0x7f99f1e54ab0" >
-                                    <attributelist id="3005" addr="0x7f99f1e54ab0" >
-                                        <attribute name="name" value="Control" id="3006" addr="0x7f99f1de6c90" />
-                                        <attribute name="csymtab" value="0x7f99f1e54ad0" id="3007" addr="0x7f99f1e54ad0" />
-                                        <attribute name="symtab" value="0x7f99f1e54a70" id="3008" addr="0x7f99f1e54a70" />
+                                <typescopesitem id="3004" addr="0x7fca469a2ab0" >
+                                    <attributelist id="3005" addr="0x7fca469a2ab0" >
+                                        <attribute name="name" value="Control" id="3006" addr="0x7fca46934c90" />
+                                        <attribute name="csymtab" value="0x7fca469a2ad0" id="3007" addr="0x7fca469a2ad0" />
+                                        <attribute name="symtab" value="0x7fca469a2a70" id="3008" addr="0x7fca469a2a70" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <access id="3009" addr="0x7f99f1e54a30" >
-                            <attributelist id="3010" addr="0x7f99f1e54a30" >
-                                <attribute name="kind" value="protected" id="3011" addr="0x7f99f1de6c90" />
+                        <access id="3009" addr="0x7fca469a2a30" >
+                            <attributelist id="3010" addr="0x7fca469a2a30" >
+                                <attribute name="kind" value="protected" id="3011" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="3012" addr="0x7f99f1e54c10" >
-                            <attributelist id="3013" addr="0x7f99f1e54c10" >
-                                <attribute name="ismember" value="1" id="3014" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="Control" id="3015" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="Control" id="3016" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="3017" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="protected" id="3018" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="3019" addr="0x7f99f1de6c90" />
-                                <attribute name="value" value="default" id="3020" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e54ab0" id="3021" addr="0x7f99f1e54ab0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3022" addr="0x7f99f1de6c90" />
+                        <constructor id="3012" addr="0x7fca469a2c10" >
+                            <attributelist id="3013" addr="0x7fca469a2c10" >
+                                <attribute name="ismember" value="1" id="3014" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="Control" id="3015" addr="0x7fca46934c90" />
+                                <attribute name="name" value="Control" id="3016" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="3017" addr="0x7fca46934c90" />
+                                <attribute name="access" value="protected" id="3018" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="3019" addr="0x7fca46934c90" />
+                                <attribute name="value" value="default" id="3020" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a2ab0" id="3021" addr="0x7fca469a2ab0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3022" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <access id="3023" addr="0x7f99f1e54cb0" >
-                            <attributelist id="3024" addr="0x7f99f1e54cb0" >
-                                <attribute name="kind" value="public" id="3025" addr="0x7f99f1de6c90" />
+                        <access id="3023" addr="0x7fca469a2cb0" >
+                            <attributelist id="3024" addr="0x7fca469a2cb0" >
+                                <attribute name="kind" value="public" id="3025" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </access >
-                        <destructor id="3026" addr="0x7f99f1e54dd0" >
-                            <attributelist id="3027" addr="0x7f99f1e54dd0" >
-                                <attribute name="ismember" value="1" id="3028" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="~Control" id="3029" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="~Control" id="3030" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="3031" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="3032" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e54ab0" id="3033" addr="0x7f99f1e54ab0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3034" addr="0x7f99f1de6c90" />
+                        <destructor id="3026" addr="0x7fca469a2dd0" >
+                            <attributelist id="3027" addr="0x7fca469a2dd0" >
+                                <attribute name="ismember" value="1" id="3028" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="~Control" id="3029" addr="0x7fca46934c90" />
+                                <attribute name="name" value="~Control" id="3030" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="3031" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="3032" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a2ab0" id="3033" addr="0x7fca469a2ab0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3034" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </destructor >
-                        <cdecl id="3035" addr="0x7f99f1e55070" >
-                            <attributelist id="3036" addr="0x7f99f1e55070" >
-                                <attribute name="name" value="canAcceptMessages" id="3037" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="3038" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e54ab0" id="3039" addr="0x7f99f1e54ab0" />
-                                <attribute name="kind" value="function" id="3040" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="canAcceptMessages" id="3041" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(int)." id="3042" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="3043" addr="0x7f99f1de6c90" />
-                                <parmlist id="3044" addr="0x7f99f1e54fd0" >
+                        <cdecl id="3035" addr="0x7fca469a3070" >
+                            <attributelist id="3036" addr="0x7fca469a3070" >
+                                <attribute name="name" value="canAcceptMessages" id="3037" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="3038" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a2ab0" id="3039" addr="0x7fca469a2ab0" />
+                                <attribute name="kind" value="function" id="3040" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="canAcceptMessages" id="3041" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(int)." id="3042" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="3043" addr="0x7fca46934c90" />
+                                <parmlist id="3044" addr="0x7fca469a2fd0" >
                                     <parm id="3045">
-                                        <attributelist id="3046" addr="0x7f99f1e54fd0" >
-                                            <attribute name="name" value="actionId" id="3047" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="3048" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3046" addr="0x7fca469a2fd0" >
+                                            <attribute name="name" value="actionId" id="3047" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="3048" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="bool" id="3049" addr="0x7f99f1de6c90" />
-                                <attribute name="code" value="{ return false; }" id="3050" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3051" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="3052" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="bool" id="3049" addr="0x7fca46934c90" />
+                                <attribute name="code" value="{ return false; }" id="3050" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3051" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="3052" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="3053" addr="0x7f99f1e55270" >
-                            <attributelist id="3054" addr="0x7f99f1e55270" >
-                                <attribute name="name" value="getId" id="3055" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="3056" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e54ab0" id="3057" addr="0x7f99f1e54ab0" />
-                                <attribute name="kind" value="function" id="3058" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getId" id="3059" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="3060" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="3061" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="int" id="3062" addr="0x7f99f1de6c90" />
-                                <attribute name="code" value="{ return iControlId; }" id="3063" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3064" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="3065" addr="0x7f99f1de6c90" />
+                        <cdecl id="3053" addr="0x7fca469a3270" >
+                            <attributelist id="3054" addr="0x7fca469a3270" >
+                                <attribute name="name" value="getId" id="3055" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="3056" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a2ab0" id="3057" addr="0x7fca469a2ab0" />
+                                <attribute name="kind" value="function" id="3058" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getId" id="3059" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="3060" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="3061" addr="0x7fca46934c90" />
+                                <attribute name="type" value="int" id="3062" addr="0x7fca46934c90" />
+                                <attribute name="code" value="{ return iControlId; }" id="3063" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3064" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="3065" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="3066" addr="0x7f99f1e555b0" >
-                            <attributelist id="3067" addr="0x7f99f1e555b0" >
-                                <attribute name="name" value="operator ==" id="3068" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="3069" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e54ab0" id="3070" addr="0x7f99f1e54ab0" />
-                                <attribute name="kind" value="function" id="3071" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="operator ==" id="3072" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="q(const).f(r.q(const).XBMCAddon::xbmcgui::Control)." id="3073" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="3074" addr="0x7f99f1de6c90" />
-                                <parmlist id="3075" addr="0x7f99f1e554f0" >
+                        <cdecl id="3066" addr="0x7fca469a35b0" >
+                            <attributelist id="3067" addr="0x7fca469a35b0" >
+                                <attribute name="name" value="operator ==" id="3068" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="3069" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a2ab0" id="3070" addr="0x7fca469a2ab0" />
+                                <attribute name="kind" value="function" id="3071" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="operator ==" id="3072" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="q(const).f(r.q(const).XBMCAddon::xbmcgui::Control)." id="3073" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="3074" addr="0x7fca46934c90" />
+                                <parmlist id="3075" addr="0x7fca469a34f0" >
                                     <parm id="3076">
-                                        <attributelist id="3077" addr="0x7f99f1e554f0" >
-                                            <attribute name="name" value="other" id="3078" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::xbmcgui::Control" id="3079" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3077" addr="0x7fca469a34f0" >
+                                            <attribute name="name" value="other" id="3078" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::xbmcgui::Control" id="3079" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="bool" id="3080" addr="0x7f99f1de6c90" />
-                                <attribute name="code" value="{ return iControlId == other.iControlId; }" id="3081" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3082" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="bool" id="3080" addr="0x7fca46934c90" />
+                                <attribute name="code" value="{ return iControlId == other.iControlId; }" id="3081" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3082" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="3083" addr="0x7f99f1e558d0" >
-                            <attributelist id="3084" addr="0x7f99f1e558d0" >
-                                <attribute name="name" value="operator >" id="3085" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="3086" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e54ab0" id="3087" addr="0x7f99f1e54ab0" />
-                                <attribute name="kind" value="function" id="3088" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="operator >" id="3089" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="q(const).f(r.q(const).XBMCAddon::xbmcgui::Control)." id="3090" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="3091" addr="0x7f99f1de6c90" />
-                                <parmlist id="3092" addr="0x7f99f1e55810" >
+                        <cdecl id="3083" addr="0x7fca469a38d0" >
+                            <attributelist id="3084" addr="0x7fca469a38d0" >
+                                <attribute name="name" value="operator >" id="3085" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="3086" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a2ab0" id="3087" addr="0x7fca469a2ab0" />
+                                <attribute name="kind" value="function" id="3088" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="operator >" id="3089" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="q(const).f(r.q(const).XBMCAddon::xbmcgui::Control)." id="3090" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="3091" addr="0x7fca46934c90" />
+                                <parmlist id="3092" addr="0x7fca469a3810" >
                                     <parm id="3093">
-                                        <attributelist id="3094" addr="0x7f99f1e55810" >
-                                            <attribute name="name" value="other" id="3095" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::xbmcgui::Control" id="3096" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3094" addr="0x7fca469a3810" >
+                                            <attribute name="name" value="other" id="3095" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::xbmcgui::Control" id="3096" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="bool" id="3097" addr="0x7f99f1de6c90" />
-                                <attribute name="code" value="{ return iControlId > other.iControlId; }" id="3098" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3099" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="bool" id="3097" addr="0x7fca46934c90" />
+                                <attribute name="code" value="{ return iControlId > other.iControlId; }" id="3098" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3099" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="3100" addr="0x7f99f1e55bf0" >
-                            <attributelist id="3101" addr="0x7f99f1e55bf0" >
-                                <attribute name="name" value="operator &lt;" id="3102" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="3103" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e54ab0" id="3104" addr="0x7f99f1e54ab0" />
-                                <attribute name="kind" value="function" id="3105" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="operator &lt;" id="3106" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="q(const).f(r.q(const).XBMCAddon::xbmcgui::Control)." id="3107" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="3108" addr="0x7f99f1de6c90" />
-                                <parmlist id="3109" addr="0x7f99f1e55b30" >
+                        <cdecl id="3100" addr="0x7fca469a3bf0" >
+                            <attributelist id="3101" addr="0x7fca469a3bf0" >
+                                <attribute name="name" value="operator &lt;" id="3102" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="3103" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a2ab0" id="3104" addr="0x7fca469a2ab0" />
+                                <attribute name="kind" value="function" id="3105" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="operator &lt;" id="3106" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="q(const).f(r.q(const).XBMCAddon::xbmcgui::Control)." id="3107" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="3108" addr="0x7fca46934c90" />
+                                <parmlist id="3109" addr="0x7fca469a3b30" >
                                     <parm id="3110">
-                                        <attributelist id="3111" addr="0x7f99f1e55b30" >
-                                            <attribute name="name" value="other" id="3112" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::xbmcgui::Control" id="3113" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                    </parm >
-                                </parmlist >
-                                <attribute name="type" value="bool" id="3114" addr="0x7f99f1de6c90" />
-                                <attribute name="code" value="{ return iControlId &lt; other.iControlId; }" id="3115" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3116" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3117" addr="0x7f99f1e55ed0" >
-                            <attributelist id="3118" addr="0x7f99f1e55ed0" >
-                                <attribute name="name" value="getPosition" id="3119" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="3120" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e54ab0" id="3121" addr="0x7f99f1e54ab0" />
-                                <attribute name="kind" value="function" id="3122" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getPosition" id="3123" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="3124" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="3125" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="std::vector&lt;(int)>" id="3126" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3127" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="3128" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3129" addr="0x7f99f1e560b0" >
-                            <attributelist id="3130" addr="0x7f99f1e560b0" >
-                                <attribute name="name" value="getX" id="3131" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="3132" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e54ab0" id="3133" addr="0x7f99f1e54ab0" />
-                                <attribute name="kind" value="function" id="3134" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getX" id="3135" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="3136" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="3137" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="int" id="3138" addr="0x7f99f1de6c90" />
-                                <attribute name="code" value="{ return dwPosX; }" id="3139" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3140" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3141" addr="0x7f99f1e56290" >
-                            <attributelist id="3142" addr="0x7f99f1e56290" >
-                                <attribute name="name" value="getY" id="3143" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="3144" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e54ab0" id="3145" addr="0x7f99f1e54ab0" />
-                                <attribute name="kind" value="function" id="3146" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getY" id="3147" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="3148" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="3149" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="int" id="3150" addr="0x7f99f1de6c90" />
-                                <attribute name="code" value="{ return dwPosY; }" id="3151" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3152" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3153" addr="0x7f99f1e56470" >
-                            <attributelist id="3154" addr="0x7f99f1e56470" >
-                                <attribute name="name" value="getHeight" id="3155" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="3156" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e54ab0" id="3157" addr="0x7f99f1e54ab0" />
-                                <attribute name="kind" value="function" id="3158" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getHeight" id="3159" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="3160" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="3161" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="int" id="3162" addr="0x7f99f1de6c90" />
-                                <attribute name="code" value="{ return dwHeight; }" id="3163" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3164" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="3165" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3166" addr="0x7f99f1e56670" >
-                            <attributelist id="3167" addr="0x7f99f1e56670" >
-                                <attribute name="name" value="getWidth" id="3168" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="3169" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e54ab0" id="3170" addr="0x7f99f1e54ab0" />
-                                <attribute name="kind" value="function" id="3171" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getWidth" id="3172" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="3173" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="3174" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="int" id="3175" addr="0x7f99f1de6c90" />
-                                <attribute name="code" value="{ return dwWidth; }" id="3176" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3177" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="3178" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="3179" addr="0x7f99f1e56970" >
-                            <attributelist id="3180" addr="0x7f99f1e56970" >
-                                <attribute name="name" value="setEnabled" id="3181" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="3182" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e54ab0" id="3183" addr="0x7f99f1e54ab0" />
-                                <attribute name="kind" value="function" id="3184" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setEnabled" id="3185" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(bool)." id="3186" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="3187" addr="0x7f99f1de6c90" />
-                                <parmlist id="3188" addr="0x7f99f1e568b0" >
+                                        <attributelist id="3111" addr="0x7fca469a3b30" >
+                                            <attribute name="name" value="other" id="3112" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::xbmcgui::Control" id="3113" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                    </parm >
+                                </parmlist >
+                                <attribute name="type" value="bool" id="3114" addr="0x7fca46934c90" />
+                                <attribute name="code" value="{ return iControlId &lt; other.iControlId; }" id="3115" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3116" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3117" addr="0x7fca469a3ed0" >
+                            <attributelist id="3118" addr="0x7fca469a3ed0" >
+                                <attribute name="name" value="getPosition" id="3119" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="3120" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a2ab0" id="3121" addr="0x7fca469a2ab0" />
+                                <attribute name="kind" value="function" id="3122" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getPosition" id="3123" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="3124" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="3125" addr="0x7fca46934c90" />
+                                <attribute name="type" value="std::vector&lt;(int)>" id="3126" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3127" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="3128" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3129" addr="0x7fca469a40b0" >
+                            <attributelist id="3130" addr="0x7fca469a40b0" >
+                                <attribute name="name" value="getX" id="3131" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="3132" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a2ab0" id="3133" addr="0x7fca469a2ab0" />
+                                <attribute name="kind" value="function" id="3134" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getX" id="3135" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="3136" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="3137" addr="0x7fca46934c90" />
+                                <attribute name="type" value="int" id="3138" addr="0x7fca46934c90" />
+                                <attribute name="code" value="{ return dwPosX; }" id="3139" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3140" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3141" addr="0x7fca469a4290" >
+                            <attributelist id="3142" addr="0x7fca469a4290" >
+                                <attribute name="name" value="getY" id="3143" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="3144" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a2ab0" id="3145" addr="0x7fca469a2ab0" />
+                                <attribute name="kind" value="function" id="3146" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getY" id="3147" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="3148" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="3149" addr="0x7fca46934c90" />
+                                <attribute name="type" value="int" id="3150" addr="0x7fca46934c90" />
+                                <attribute name="code" value="{ return dwPosY; }" id="3151" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3152" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3153" addr="0x7fca469a4470" >
+                            <attributelist id="3154" addr="0x7fca469a4470" >
+                                <attribute name="name" value="getHeight" id="3155" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="3156" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a2ab0" id="3157" addr="0x7fca469a2ab0" />
+                                <attribute name="kind" value="function" id="3158" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getHeight" id="3159" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="3160" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="3161" addr="0x7fca46934c90" />
+                                <attribute name="type" value="int" id="3162" addr="0x7fca46934c90" />
+                                <attribute name="code" value="{ return dwHeight; }" id="3163" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3164" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="3165" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3166" addr="0x7fca469a4670" >
+                            <attributelist id="3167" addr="0x7fca469a4670" >
+                                <attribute name="name" value="getWidth" id="3168" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="3169" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a2ab0" id="3170" addr="0x7fca469a2ab0" />
+                                <attribute name="kind" value="function" id="3171" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getWidth" id="3172" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="3173" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="3174" addr="0x7fca46934c90" />
+                                <attribute name="type" value="int" id="3175" addr="0x7fca46934c90" />
+                                <attribute name="code" value="{ return dwWidth; }" id="3176" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3177" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="3178" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="3179" addr="0x7fca469a4970" >
+                            <attributelist id="3180" addr="0x7fca469a4970" >
+                                <attribute name="name" value="setEnabled" id="3181" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="3182" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a2ab0" id="3183" addr="0x7fca469a2ab0" />
+                                <attribute name="kind" value="function" id="3184" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setEnabled" id="3185" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(bool)." id="3186" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="3187" addr="0x7fca46934c90" />
+                                <parmlist id="3188" addr="0x7fca469a48b0" >
                                     <parm id="3189">
-                                        <attributelist id="3190" addr="0x7f99f1e568b0" >
-                                            <attribute name="name" value="enabled" id="3191" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="3192" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3190" addr="0x7fca469a48b0" >
+                                            <attribute name="name" value="enabled" id="3191" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="3192" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="3193" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3194" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="3195" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="3193" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3194" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="3195" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="3196" addr="0x7f99f1e56c50" >
-                            <attributelist id="3197" addr="0x7f99f1e56c50" >
-                                <attribute name="name" value="setVisible" id="3198" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="3199" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e54ab0" id="3200" addr="0x7f99f1e54ab0" />
-                                <attribute name="kind" value="function" id="3201" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setVisible" id="3202" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(bool)." id="3203" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="3204" addr="0x7f99f1de6c90" />
-                                <parmlist id="3205" addr="0x7f99f1e56b90" >
+                        <cdecl id="3196" addr="0x7fca469a4c50" >
+                            <attributelist id="3197" addr="0x7fca469a4c50" >
+                                <attribute name="name" value="setVisible" id="3198" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="3199" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a2ab0" id="3200" addr="0x7fca469a2ab0" />
+                                <attribute name="kind" value="function" id="3201" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setVisible" id="3202" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(bool)." id="3203" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="3204" addr="0x7fca46934c90" />
+                                <parmlist id="3205" addr="0x7fca469a4b90" >
                                     <parm id="3206">
-                                        <attributelist id="3207" addr="0x7f99f1e56b90" >
-                                            <attribute name="name" value="visible" id="3208" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="3209" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3207" addr="0x7fca469a4b90" >
+                                            <attribute name="name" value="visible" id="3208" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="3209" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="3210" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3211" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="3212" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="3210" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3211" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="3212" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="3213" addr="0x7f99f1e56e30" >
-                            <attributelist id="3214" addr="0x7f99f1e56e30" >
-                                <attribute name="name" value="isVisible" id="3215" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="3216" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e54ab0" id="3217" addr="0x7f99f1e54ab0" />
-                                <attribute name="kind" value="function" id="3218" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="isVisible" id="3219" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="3220" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="3221" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="bool" id="3222" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3223" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="3224" addr="0x7f99f1de6c90" />
+                        <cdecl id="3213" addr="0x7fca469a4e30" >
+                            <attributelist id="3214" addr="0x7fca469a4e30" >
+                                <attribute name="name" value="isVisible" id="3215" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="3216" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a2ab0" id="3217" addr="0x7fca469a2ab0" />
+                                <attribute name="kind" value="function" id="3218" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="isVisible" id="3219" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="3220" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="3221" addr="0x7fca46934c90" />
+                                <attribute name="type" value="bool" id="3222" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3223" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="3224" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="3225" addr="0x7f99f1e57290" >
-                            <attributelist id="3226" addr="0x7f99f1e57290" >
-                                <attribute name="name" value="setVisibleCondition" id="3227" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="3228" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e54ab0" id="3229" addr="0x7f99f1e54ab0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e57450" id="3230" addr="0x7f99f1e57450" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e57450" id="3231" addr="0x7f99f1e57450" />
-                                <attribute name="kind" value="function" id="3232" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setVisibleCondition" id="3233" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(p.q(const).char,bool)." id="3234" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="3235" addr="0x7f99f1de6c90" />
-                                <parmlist id="3236" addr="0x7f99f1e57090" >
+                        <cdecl id="3225" addr="0x7fca469a5290" >
+                            <attributelist id="3226" addr="0x7fca469a5290" >
+                                <attribute name="name" value="setVisibleCondition" id="3227" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="3228" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a2ab0" id="3229" addr="0x7fca469a2ab0" />
+                                <attribute name="sym_nextSibling" value="0x7fca469a5450" id="3230" addr="0x7fca469a5450" />
+                                <attribute name="csym_nextSibling" value="0x7fca469a5450" id="3231" addr="0x7fca469a5450" />
+                                <attribute name="kind" value="function" id="3232" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setVisibleCondition" id="3233" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(p.q(const).char,bool)." id="3234" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="3235" addr="0x7fca46934c90" />
+                                <parmlist id="3236" addr="0x7fca469a5090" >
                                     <parm id="3237">
-                                        <attributelist id="3238" addr="0x7f99f1e57090" >
-                                            <attribute name="name" value="visible" id="3239" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="3240" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3238" addr="0x7fca469a5090" >
+                                            <attribute name="name" value="visible" id="3239" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="3240" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="3241">
-                                        <attributelist id="3242" addr="0x7f99f1e571d0" >
-                                            <attribute name="name" value="allowHiddenFocus" id="3243" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="false" id="3244" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="3245" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3242" addr="0x7fca469a51d0" >
+                                            <attribute name="name" value="allowHiddenFocus" id="3243" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="false" id="3244" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="3245" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overloaded" value="0x7f99f1e57290" id="3246" addr="0x7f99f1e57290" />
-                                <attribute name="type" value="void" id="3247" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3248" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="3249" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469a5290" id="3246" addr="0x7fca469a5290" />
+                                <attribute name="type" value="void" id="3247" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3248" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="3249" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="3250" addr="0x7f99f1e57450" >
-                            <attributelist id="3251" addr="0x7f99f1e57450" >
-                                <attribute name="name" value="setVisibleCondition" id="3252" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="3253" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e54ab0" id="3254" addr="0x7f99f1e54ab0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e57290" id="3255" addr="0x7f99f1e57290" />
-                                <attribute name="kind" value="function" id="3256" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setVisibleCondition" id="3257" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(p.q(const).char)." id="3258" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e57290" id="3259" addr="0x7f99f1e57290" />
-                                <attribute name="access" value="public" id="3260" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e57290" id="3261" addr="0x7f99f1e57290" />
-                                <parmlist id="3262" addr="0x7f99f1e57350" >
+                        <cdecl id="3250" addr="0x7fca469a5450" >
+                            <attributelist id="3251" addr="0x7fca469a5450" >
+                                <attribute name="name" value="setVisibleCondition" id="3252" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="3253" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a2ab0" id="3254" addr="0x7fca469a2ab0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469a5290" id="3255" addr="0x7fca469a5290" />
+                                <attribute name="kind" value="function" id="3256" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setVisibleCondition" id="3257" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(p.q(const).char)." id="3258" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469a5290" id="3259" addr="0x7fca469a5290" />
+                                <attribute name="access" value="public" id="3260" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469a5290" id="3261" addr="0x7fca469a5290" />
+                                <parmlist id="3262" addr="0x7fca469a5350" >
                                     <parm id="3263">
-                                        <attributelist id="3264" addr="0x7f99f1e57350" >
-                                            <attribute name="name" value="visible" id="3265" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="3266" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3264" addr="0x7fca469a5350" >
+                                            <attribute name="name" value="visible" id="3265" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="3266" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="3267" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="3268" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="3269" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="3267" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="3268" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="3269" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="3270" addr="0x7f99f1e57770" >
-                            <attributelist id="3271" addr="0x7f99f1e57770" >
-                                <attribute name="name" value="setEnableCondition" id="3272" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="3273" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e54ab0" id="3274" addr="0x7f99f1e54ab0" />
-                                <attribute name="kind" value="function" id="3275" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setEnableCondition" id="3276" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(p.q(const).char)." id="3277" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="3278" addr="0x7f99f1de6c90" />
-                                <parmlist id="3279" addr="0x7f99f1e576b0" >
+                        <cdecl id="3270" addr="0x7fca469a5770" >
+                            <attributelist id="3271" addr="0x7fca469a5770" >
+                                <attribute name="name" value="setEnableCondition" id="3272" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="3273" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a2ab0" id="3274" addr="0x7fca469a2ab0" />
+                                <attribute name="kind" value="function" id="3275" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setEnableCondition" id="3276" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(p.q(const).char)." id="3277" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="3278" addr="0x7fca46934c90" />
+                                <parmlist id="3279" addr="0x7fca469a56b0" >
                                     <parm id="3280">
-                                        <attributelist id="3281" addr="0x7f99f1e576b0" >
-                                            <attribute name="name" value="enable" id="3282" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="3283" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3281" addr="0x7fca469a56b0" >
+                                            <attribute name="name" value="enable" id="3282" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="3283" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="3284" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3285" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="3286" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="3284" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3285" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="3286" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="3287" addr="0x7f99f1e57e10" >
-                            <attributelist id="3288" addr="0x7f99f1e57e10" >
-                                <attribute name="name" value="setAnimations" id="3289" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="3290" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e54ab0" id="3291" addr="0x7f99f1e54ab0" />
-                                <attribute name="kind" value="function" id="3292" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setAnimations" id="3293" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).std::vector&lt;(Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>)>)." id="3294" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="3295" addr="0x7f99f1de6c90" />
-                                <parmlist id="3296" addr="0x7f99f1e57c10" >
+                        <cdecl id="3287" addr="0x7fca469a5e10" >
+                            <attributelist id="3288" addr="0x7fca469a5e10" >
+                                <attribute name="name" value="setAnimations" id="3289" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="3290" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a2ab0" id="3291" addr="0x7fca469a2ab0" />
+                                <attribute name="kind" value="function" id="3292" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setAnimations" id="3293" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).std::vector&lt;(Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>)>)." id="3294" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="3295" addr="0x7fca46934c90" />
+                                <parmlist id="3296" addr="0x7fca469a5c10" >
                                     <parm id="3297">
-                                        <attributelist id="3298" addr="0x7f99f1e57c10" >
-                                            <attribute name="name" value="eventAttr" id="3299" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).std::vector&lt;(Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>)>" id="3300" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3298" addr="0x7fca469a5c10" >
+                                            <attribute name="name" value="eventAttr" id="3299" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).std::vector&lt;(Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>)>" id="3300" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="3301" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3302" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="3303" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="3301" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3302" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="3303" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="3304" addr="0x7f99f1e58230" >
-                            <attributelist id="3305" addr="0x7f99f1e58230" >
-                                <attribute name="name" value="setPosition" id="3306" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="3307" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e54ab0" id="3308" addr="0x7f99f1e54ab0" />
-                                <attribute name="kind" value="function" id="3309" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setPosition" id="3310" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(long,long)." id="3311" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="3312" addr="0x7f99f1de6c90" />
-                                <parmlist id="3313" addr="0x7f99f1e58050" >
+                        <cdecl id="3304" addr="0x7fca469a6230" >
+                            <attributelist id="3305" addr="0x7fca469a6230" >
+                                <attribute name="name" value="setPosition" id="3306" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="3307" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a2ab0" id="3308" addr="0x7fca469a2ab0" />
+                                <attribute name="kind" value="function" id="3309" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setPosition" id="3310" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(long,long)." id="3311" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="3312" addr="0x7fca46934c90" />
+                                <parmlist id="3313" addr="0x7fca469a6050" >
                                     <parm id="3314">
-                                        <attributelist id="3315" addr="0x7f99f1e58050" >
-                                            <attribute name="name" value="x" id="3316" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="3317" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3315" addr="0x7fca469a6050" >
+                                            <attribute name="name" value="x" id="3316" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="3317" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="3318">
-                                        <attributelist id="3319" addr="0x7f99f1e58170" >
-                                            <attribute name="name" value="y" id="3320" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="3321" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3319" addr="0x7fca469a6170" >
+                                            <attribute name="name" value="y" id="3320" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="3321" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="3322" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3323" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="3324" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="3322" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3323" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="3324" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="3325" addr="0x7f99f1e58530" >
-                            <attributelist id="3326" addr="0x7f99f1e58530" >
-                                <attribute name="name" value="setWidth" id="3327" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="3328" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e54ab0" id="3329" addr="0x7f99f1e54ab0" />
-                                <attribute name="kind" value="function" id="3330" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setWidth" id="3331" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(long)." id="3332" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="3333" addr="0x7f99f1de6c90" />
-                                <parmlist id="3334" addr="0x7f99f1e58470" >
+                        <cdecl id="3325" addr="0x7fca469a6530" >
+                            <attributelist id="3326" addr="0x7fca469a6530" >
+                                <attribute name="name" value="setWidth" id="3327" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="3328" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a2ab0" id="3329" addr="0x7fca469a2ab0" />
+                                <attribute name="kind" value="function" id="3330" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setWidth" id="3331" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(long)." id="3332" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="3333" addr="0x7fca46934c90" />
+                                <parmlist id="3334" addr="0x7fca469a6470" >
                                     <parm id="3335">
-                                        <attributelist id="3336" addr="0x7f99f1e58470" >
-                                            <attribute name="name" value="width" id="3337" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="3338" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3336" addr="0x7fca469a6470" >
+                                            <attribute name="name" value="width" id="3337" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="3338" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="3339" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3340" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="3341" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="3339" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3340" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="3341" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="3342" addr="0x7f99f1e58830" >
-                            <attributelist id="3343" addr="0x7f99f1e58830" >
-                                <attribute name="name" value="setHeight" id="3344" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="3345" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e54ab0" id="3346" addr="0x7f99f1e54ab0" />
-                                <attribute name="kind" value="function" id="3347" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setHeight" id="3348" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(long)." id="3349" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="3350" addr="0x7f99f1de6c90" />
-                                <parmlist id="3351" addr="0x7f99f1e58770" >
+                        <cdecl id="3342" addr="0x7fca469a6830" >
+                            <attributelist id="3343" addr="0x7fca469a6830" >
+                                <attribute name="name" value="setHeight" id="3344" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="3345" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a2ab0" id="3346" addr="0x7fca469a2ab0" />
+                                <attribute name="kind" value="function" id="3347" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setHeight" id="3348" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(long)." id="3349" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="3350" addr="0x7fca46934c90" />
+                                <parmlist id="3351" addr="0x7fca469a6770" >
                                     <parm id="3352">
-                                        <attributelist id="3353" addr="0x7f99f1e58770" >
-                                            <attribute name="name" value="height" id="3354" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="3355" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3353" addr="0x7fca469a6770" >
+                                            <attribute name="name" value="height" id="3354" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="3355" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="3356" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3357" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="3358" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="3356" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3357" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="3358" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="3359" addr="0x7f99f1e58f10" >
-                            <attributelist id="3360" addr="0x7f99f1e58f10" >
-                                <attribute name="name" value="setNavigation" id="3361" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="3362" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e54ab0" id="3363" addr="0x7f99f1e54ab0" />
-                                <attribute name="kind" value="function" id="3364" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setNavigation" id="3365" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(p.q(const).XBMCAddon::xbmcgui::Control,p.q(const).XBMCAddon::xbmcgui::Control,p.q(const).XBMCAddon::xbmcgui::Control,p.q(const).XBMCAddon::xbmcgui::Control)." id="3366" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="3367" addr="0x7f99f1de6c90" />
-                                <parmlist id="3368" addr="0x7f99f1e58a90" >
+                        <cdecl id="3359" addr="0x7fca469a6f10" >
+                            <attributelist id="3360" addr="0x7fca469a6f10" >
+                                <attribute name="name" value="setNavigation" id="3361" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="3362" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a2ab0" id="3363" addr="0x7fca469a2ab0" />
+                                <attribute name="kind" value="function" id="3364" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setNavigation" id="3365" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(p.q(const).XBMCAddon::xbmcgui::Control,p.q(const).XBMCAddon::xbmcgui::Control,p.q(const).XBMCAddon::xbmcgui::Control,p.q(const).XBMCAddon::xbmcgui::Control)." id="3366" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="3367" addr="0x7fca46934c90" />
+                                <parmlist id="3368" addr="0x7fca469a6a90" >
                                     <parm id="3369">
-                                        <attributelist id="3370" addr="0x7f99f1e58a90" >
-                                            <attribute name="name" value="up" id="3371" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::Control" id="3372" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3370" addr="0x7fca469a6a90" >
+                                            <attribute name="name" value="up" id="3371" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::Control" id="3372" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="3373">
-                                        <attributelist id="3374" addr="0x7f99f1e58bd0" >
-                                            <attribute name="name" value="down" id="3375" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::Control" id="3376" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3374" addr="0x7fca469a6bd0" >
+                                            <attribute name="name" value="down" id="3375" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::Control" id="3376" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="3377">
-                                        <attributelist id="3378" addr="0x7f99f1e58d10" >
-                                            <attribute name="name" value="left" id="3379" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::Control" id="3380" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3378" addr="0x7fca469a6d10" >
+                                            <attribute name="name" value="left" id="3379" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::Control" id="3380" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="3381">
-                                        <attributelist id="3382" addr="0x7f99f1e58e50" >
-                                            <attribute name="name" value="right" id="3383" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::Control" id="3384" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3382" addr="0x7fca469a6e50" >
+                                            <attribute name="name" value="right" id="3383" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::Control" id="3384" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="3385" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3386" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="3387" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="3385" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3386" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="3387" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="3388" addr="0x7f99f1e59230" >
-                            <attributelist id="3389" addr="0x7f99f1e59230" >
-                                <attribute name="name" value="controlUp" id="3390" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="3391" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e54ab0" id="3392" addr="0x7f99f1e54ab0" />
-                                <attribute name="kind" value="function" id="3393" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="controlUp" id="3394" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(p.q(const).XBMCAddon::xbmcgui::Control)." id="3395" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="3396" addr="0x7f99f1de6c90" />
-                                <parmlist id="3397" addr="0x7f99f1e59170" >
+                        <cdecl id="3388" addr="0x7fca469a7230" >
+                            <attributelist id="3389" addr="0x7fca469a7230" >
+                                <attribute name="name" value="controlUp" id="3390" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="3391" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a2ab0" id="3392" addr="0x7fca469a2ab0" />
+                                <attribute name="kind" value="function" id="3393" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="controlUp" id="3394" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(p.q(const).XBMCAddon::xbmcgui::Control)." id="3395" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="3396" addr="0x7fca46934c90" />
+                                <parmlist id="3397" addr="0x7fca469a7170" >
                                     <parm id="3398">
-                                        <attributelist id="3399" addr="0x7f99f1e59170" >
-                                            <attribute name="name" value="up" id="3400" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::Control" id="3401" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3399" addr="0x7fca469a7170" >
+                                            <attribute name="name" value="up" id="3400" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::Control" id="3401" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="3402" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3403" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="3404" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="3402" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3403" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="3404" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="3405" addr="0x7f99f1e59570" >
-                            <attributelist id="3406" addr="0x7f99f1e59570" >
-                                <attribute name="name" value="controlDown" id="3407" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="3408" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e54ab0" id="3409" addr="0x7f99f1e54ab0" />
-                                <attribute name="kind" value="function" id="3410" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="controlDown" id="3411" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(p.q(const).XBMCAddon::xbmcgui::Control)." id="3412" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="3413" addr="0x7f99f1de6c90" />
-                                <parmlist id="3414" addr="0x7f99f1e594b0" >
+                        <cdecl id="3405" addr="0x7fca469a7570" >
+                            <attributelist id="3406" addr="0x7fca469a7570" >
+                                <attribute name="name" value="controlDown" id="3407" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="3408" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a2ab0" id="3409" addr="0x7fca469a2ab0" />
+                                <attribute name="kind" value="function" id="3410" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="controlDown" id="3411" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(p.q(const).XBMCAddon::xbmcgui::Control)." id="3412" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="3413" addr="0x7fca46934c90" />
+                                <parmlist id="3414" addr="0x7fca469a74b0" >
                                     <parm id="3415">
-                                        <attributelist id="3416" addr="0x7f99f1e594b0" >
-                                            <attribute name="name" value="control" id="3417" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::Control" id="3418" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3416" addr="0x7fca469a74b0" >
+                                            <attribute name="name" value="control" id="3417" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::Control" id="3418" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="3419" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3420" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="3421" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="3419" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3420" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="3421" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="3422" addr="0x7f99f1e59890" >
-                            <attributelist id="3423" addr="0x7f99f1e59890" >
-                                <attribute name="name" value="controlLeft" id="3424" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="3425" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e54ab0" id="3426" addr="0x7f99f1e54ab0" />
-                                <attribute name="kind" value="function" id="3427" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="controlLeft" id="3428" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(p.q(const).XBMCAddon::xbmcgui::Control)." id="3429" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="3430" addr="0x7f99f1de6c90" />
-                                <parmlist id="3431" addr="0x7f99f1e597d0" >
+                        <cdecl id="3422" addr="0x7fca469a7890" >
+                            <attributelist id="3423" addr="0x7fca469a7890" >
+                                <attribute name="name" value="controlLeft" id="3424" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="3425" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a2ab0" id="3426" addr="0x7fca469a2ab0" />
+                                <attribute name="kind" value="function" id="3427" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="controlLeft" id="3428" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(p.q(const).XBMCAddon::xbmcgui::Control)." id="3429" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="3430" addr="0x7fca46934c90" />
+                                <parmlist id="3431" addr="0x7fca469a77d0" >
                                     <parm id="3432">
-                                        <attributelist id="3433" addr="0x7f99f1e597d0" >
-                                            <attribute name="name" value="control" id="3434" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::Control" id="3435" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3433" addr="0x7fca469a77d0" >
+                                            <attribute name="name" value="control" id="3434" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::Control" id="3435" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="3436" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3437" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="3438" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="3436" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3437" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="3438" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="3439" addr="0x7f99f1e59bb0" >
-                            <attributelist id="3440" addr="0x7f99f1e59bb0" >
-                                <attribute name="name" value="controlRight" id="3441" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="3442" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e54ab0" id="3443" addr="0x7f99f1e54ab0" />
-                                <attribute name="kind" value="function" id="3444" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="controlRight" id="3445" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(p.q(const).XBMCAddon::xbmcgui::Control)." id="3446" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="3447" addr="0x7f99f1de6c90" />
-                                <parmlist id="3448" addr="0x7f99f1e59af0" >
+                        <cdecl id="3439" addr="0x7fca469a7bb0" >
+                            <attributelist id="3440" addr="0x7fca469a7bb0" >
+                                <attribute name="name" value="controlRight" id="3441" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="3442" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a2ab0" id="3443" addr="0x7fca469a2ab0" />
+                                <attribute name="kind" value="function" id="3444" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="controlRight" id="3445" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(p.q(const).XBMCAddon::xbmcgui::Control)." id="3446" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="3447" addr="0x7fca46934c90" />
+                                <parmlist id="3448" addr="0x7fca469a7af0" >
                                     <parm id="3449">
-                                        <attributelist id="3450" addr="0x7f99f1e59af0" >
-                                            <attribute name="name" value="control" id="3451" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::Control" id="3452" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3450" addr="0x7fca469a7af0" >
+                                            <attribute name="name" value="control" id="3451" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::Control" id="3452" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="3453" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3454" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="3455" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="3453" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3454" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="3455" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
                     </class >
-                    <class id="3456" addr="0x7f99f1e59e90" >
-                        <attributelist id="3457" addr="0x7f99f1e59e90" >
-                            <attribute name="name" value="XBMCAddon::xbmcgui::ControlSpin" id="3458" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="3459" addr="0x7f99f1e40fb0" />
-                            <attribute name="symtab" value="0x7f99f1e59fd0" id="3460" addr="0x7f99f1e59fd0" />
-                            <attribute name="allows_typedef" value="1" id="3461" addr="0x7f99f1de6c90" />
-                            <attribute name="typepass_visit" value="1" id="3462" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_visit" value="1" id="3463" addr="0x7f99f1de6c90" />
-                            <attribute name="kind" value="class" id="3464" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_name" value="ControlSpin" id="3465" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_has_destructor" value="1" id="3466" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_default_destructor" value="1" id="3467" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_has_constructor" value="1" id="3468" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_copy_constructor" value="1" id="3469" addr="0x7f99f1de6c90" />
-                            <attribute name="privatebaselist" value="0x7f99f1e59e70" id="3470" addr="0x7f99f1e59e70" />
-                            <attribute name="protectedbaselist" value="0x7f99f1e59e50" id="3471" addr="0x7f99f1e59e50" />
-                            <baselist id="3472" addr="0x7f99f1e59e30" >
-                                <base name="Control" id="3473" addr="0x7f99f1e59db0" />
+                    <class id="3456" addr="0x7fca469a7e90" >
+                        <attributelist id="3457" addr="0x7fca469a7e90" >
+                            <attribute name="name" value="XBMCAddon::xbmcgui::ControlSpin" id="3458" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="3459" addr="0x7fca4698efb0" />
+                            <attribute name="symtab" value="0x7fca469a7fd0" id="3460" addr="0x7fca469a7fd0" />
+                            <attribute name="allows_typedef" value="1" id="3461" addr="0x7fca46934c90" />
+                            <attribute name="typepass_visit" value="1" id="3462" addr="0x7fca46934c90" />
+                            <attribute name="allocate_visit" value="1" id="3463" addr="0x7fca46934c90" />
+                            <attribute name="kind" value="class" id="3464" addr="0x7fca46934c90" />
+                            <attribute name="sym_name" value="ControlSpin" id="3465" addr="0x7fca46934c90" />
+                            <attribute name="allocate_has_destructor" value="1" id="3466" addr="0x7fca46934c90" />
+                            <attribute name="allocate_default_destructor" value="1" id="3467" addr="0x7fca46934c90" />
+                            <attribute name="allocate_has_constructor" value="1" id="3468" addr="0x7fca46934c90" />
+                            <attribute name="allocate_copy_constructor" value="1" id="3469" addr="0x7fca46934c90" />
+                            <attribute name="privatebaselist" value="0x7fca469a7e70" id="3470" addr="0x7fca469a7e70" />
+                            <attribute name="protectedbaselist" value="0x7fca469a7e50" id="3471" addr="0x7fca469a7e50" />
+                            <baselist id="3472" addr="0x7fca469a7e30" >
+                                <base name="Control" id="3473" addr="0x7fca469a7db0" />
                             </baselist >
-                            <attribute name="module" value="xbmcgui" id="3474" addr="0x7f99f1e402f0" />
-                            <attribute name="bases" value="0x7f99f1dd7a10" id="3475" addr="0x7f99f1dd7a10" />
-                            <attribute name="allbases" value="0x7f99f1dd7eb0" id="3476" addr="0x7f99f1dd7eb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="3477" addr="0x7f99f1de6c90" />
-                            <typescope id="3478" addr="0x7f99f1dd7930" >
-                                <attributelist id="3479" addr="0x7f99f1dd7930" >
-                                    <attribute name="inherit" value="0x7f99f1dd7a90" id="3480" addr="0x7f99f1dd7a90" />
-                                    <attribute name="name" value="ControlSpin" id="3481" addr="0x7f99f1de6c90" />
-                                    <typetab id="3482" addr="0x7f99f1dd7950" >
-                                        <attributelist id="3483" addr="0x7f99f1dd7950" >
+                            <attribute name="module" value="xbmcgui" id="3474" addr="0x7fca4698e2f0" />
+                            <attribute name="bases" value="0x7fca46925a10" id="3475" addr="0x7fca46925a10" />
+                            <attribute name="allbases" value="0x7fca46925eb0" id="3476" addr="0x7fca46925eb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="3477" addr="0x7fca46934c90" />
+                            <typescope id="3478" addr="0x7fca46925930" >
+                                <attributelist id="3479" addr="0x7fca46925930" >
+                                    <attribute name="inherit" value="0x7fca46925a90" id="3480" addr="0x7fca46925a90" />
+                                    <attribute name="name" value="ControlSpin" id="3481" addr="0x7fca46934c90" />
+                                    <typetab id="3482" addr="0x7fca46925950" >
+                                        <attributelist id="3483" addr="0x7fca46925950" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f99f1dd2150" id="3484" addr="0x7f99f1dd2150" />
-                                    <attribute name="qname" value="XBMCAddon::xbmcgui::ControlSpin" id="3485" addr="0x7f99f1de6c90" />
-                                    <attribute name="symtab" value="0x7f99f1e59fd0" id="3486" addr="0x7f99f1e59fd0" />
+                                    <attribute name="parent" value="0x7fca46920150" id="3484" addr="0x7fca46920150" />
+                                    <attribute name="qname" value="XBMCAddon::xbmcgui::ControlSpin" id="3485" addr="0x7fca46934c90" />
+                                    <attribute name="symtab" value="0x7fca469a7fd0" id="3486" addr="0x7fca469a7fd0" />
                                 </attributelist >
-                                <typescopesitem id="3487" addr="0x7f99f1dd7a90" >
-                                    <attributelist id="3488" addr="0x7f99f1dd7a90" >
+                                <typescopesitem id="3487" addr="0x7fca46925a90" >
+                                    <attributelist id="3488" addr="0x7fca46925a90" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="3489" addr="0x7f99f1dd78d0" >
-                                    <attributelist id="3490" addr="0x7f99f1dd78d0" >
+                                <typescopesitem id="3489" addr="0x7fca469258d0" >
+                                    <attributelist id="3490" addr="0x7fca469258d0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="3491" addr="0x7f99f1dd7950" >
-                                    <attributelist id="3492" addr="0x7f99f1dd7950" >
+                                <typescopesitem id="3491" addr="0x7fca46925950" >
+                                    <attributelist id="3492" addr="0x7fca46925950" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="3493" addr="0x7f99f1dd2150" >
-                                    <attributelist id="3494" addr="0x7f99f1dd2150" >
-                                        <attribute name="name" value="xbmcgui" id="3495" addr="0x7f99f1de6c90" />
-                                        <typetab id="3496" addr="0x7f99f1dd2170" >
-                                            <attributelist id="3497" addr="0x7f99f1dd2170" >
-                                                <attribute name="InterceptorBase" value="InterceptorBase" id="3498" addr="0x7f99f1de6c90" />
-                                                <attribute name="Dialog" value="Dialog" id="3499" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="3500" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="3501" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlTextBox" value="ControlTextBox" id="3502" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="3503" addr="0x7f99f1de6c90" />
-                                                <attribute name="Window" value="Window" id="3504" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="3505" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlList" value="ControlList" id="3506" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="3507" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlImage" value="ControlImage" id="3508" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlButton" value="ControlButton" id="3509" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlGroup" value="ControlGroup" id="3510" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogBusy" value="DialogBusy" id="3511" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="3512" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSpin" value="ControlSpin" id="3513" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlEdit" value="ControlEdit" id="3514" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="3515" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="3516" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlLabel" value="ControlLabel" id="3517" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlProgress" value="ControlProgress" id="3518" addr="0x7f99f1de6c90" />
-                                                <attribute name="Control" value="Control" id="3519" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSlider" value="ControlSlider" id="3520" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgress" value="DialogProgress" id="3521" addr="0x7f99f1de6c90" />
-                                                <attribute name="Action" value="Action" id="3522" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowDialog" value="WindowDialog" id="3523" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXML" value="WindowXML" id="3524" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItem" value="ListItem" id="3525" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="3526" addr="0x7f99f1de6c90" />
+                                <typescopesitem id="3493" addr="0x7fca46920150" >
+                                    <attributelist id="3494" addr="0x7fca46920150" >
+                                        <attribute name="name" value="xbmcgui" id="3495" addr="0x7fca46934c90" />
+                                        <typetab id="3496" addr="0x7fca46920170" >
+                                            <attributelist id="3497" addr="0x7fca46920170" >
+                                                <attribute name="InterceptorBase" value="InterceptorBase" id="3498" addr="0x7fca46934c90" />
+                                                <attribute name="Dialog" value="Dialog" id="3499" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="3500" addr="0x7fca46934c90" />
+                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="3501" addr="0x7fca46934c90" />
+                                                <attribute name="ControlTextBox" value="ControlTextBox" id="3502" addr="0x7fca46934c90" />
+                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="3503" addr="0x7fca46934c90" />
+                                                <attribute name="Window" value="Window" id="3504" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="3505" addr="0x7fca46934c90" />
+                                                <attribute name="ControlList" value="ControlList" id="3506" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="3507" addr="0x7fca46934c90" />
+                                                <attribute name="ControlImage" value="ControlImage" id="3508" addr="0x7fca46934c90" />
+                                                <attribute name="ControlButton" value="ControlButton" id="3509" addr="0x7fca46934c90" />
+                                                <attribute name="ControlGroup" value="ControlGroup" id="3510" addr="0x7fca46934c90" />
+                                                <attribute name="DialogBusy" value="DialogBusy" id="3511" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="3512" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSpin" value="ControlSpin" id="3513" addr="0x7fca46934c90" />
+                                                <attribute name="ControlEdit" value="ControlEdit" id="3514" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="3515" addr="0x7fca46934c90" />
+                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="3516" addr="0x7fca46934c90" />
+                                                <attribute name="ControlLabel" value="ControlLabel" id="3517" addr="0x7fca46934c90" />
+                                                <attribute name="ControlProgress" value="ControlProgress" id="3518" addr="0x7fca46934c90" />
+                                                <attribute name="Control" value="Control" id="3519" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSlider" value="ControlSlider" id="3520" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgress" value="DialogProgress" id="3521" addr="0x7fca46934c90" />
+                                                <attribute name="Action" value="Action" id="3522" addr="0x7fca46934c90" />
+                                                <attribute name="WindowDialog" value="WindowDialog" id="3523" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXML" value="WindowXML" id="3524" addr="0x7fca46934c90" />
+                                                <attribute name="ListItem" value="ListItem" id="3525" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="3526" addr="0x7fca46934c90" />
                                             </attributelist >
-                                            <typetabsitem id="3527" addr="0x7f99f1de1dd0" >
-                                                <attributelist id="3528" addr="0x7f99f1de1dd0" >
+                                            <typetabsitem id="3527" addr="0x7fca4692fdd0" >
+                                                <attributelist id="3528" addr="0x7fca4692fdd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3529" addr="0x7f99f1dde790" >
-                                                <attributelist id="3530" addr="0x7f99f1dde790" >
+                                            <typetabsitem id="3529" addr="0x7fca4692c790" >
+                                                <attributelist id="3530" addr="0x7fca4692c790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3531" addr="0x7f99f1de3f10" >
-                                                <attributelist id="3532" addr="0x7f99f1de3f10" >
+                                            <typetabsitem id="3531" addr="0x7fca46931f10" >
+                                                <attributelist id="3532" addr="0x7fca46931f10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3533" addr="0x7f99f1dd67b0" >
-                                                <attributelist id="3534" addr="0x7f99f1dd67b0" >
+                                            <typetabsitem id="3533" addr="0x7fca469247b0" >
+                                                <attributelist id="3534" addr="0x7fca469247b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3535" addr="0x7f99f1ddafd0" >
-                                                <attributelist id="3536" addr="0x7f99f1ddafd0" >
+                                            <typetabsitem id="3535" addr="0x7fca46928fd0" >
+                                                <attributelist id="3536" addr="0x7fca46928fd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3537" addr="0x7f99f1ddd430" >
-                                                <attributelist id="3538" addr="0x7f99f1ddd430" >
+                                            <typetabsitem id="3537" addr="0x7fca4692b430" >
+                                                <attributelist id="3538" addr="0x7fca4692b430" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3539" addr="0x7f99f1de2130" >
-                                                <attributelist id="3540" addr="0x7f99f1de2130" >
+                                            <typetabsitem id="3539" addr="0x7fca46930130" >
+                                                <attributelist id="3540" addr="0x7fca46930130" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3541" addr="0x7f99f1dd2f50" >
-                                                <attributelist id="3542" addr="0x7f99f1dd2f50" >
+                                            <typetabsitem id="3541" addr="0x7fca46920f50" >
+                                                <attributelist id="3542" addr="0x7fca46920f50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3543" addr="0x7f99f1dd9650" >
-                                                <attributelist id="3544" addr="0x7f99f1dd9650" >
+                                            <typetabsitem id="3543" addr="0x7fca46927650" >
+                                                <attributelist id="3544" addr="0x7fca46927650" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3545" addr="0x7f99f1de3390" >
-                                                <attributelist id="3546" addr="0x7f99f1de3390" >
+                                            <typetabsitem id="3545" addr="0x7fca46931390" >
+                                                <attributelist id="3546" addr="0x7fca46931390" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3547" addr="0x7f99f1ddb7b0" >
-                                                <attributelist id="3548" addr="0x7f99f1ddb7b0" >
+                                            <typetabsitem id="3547" addr="0x7fca469297b0" >
+                                                <attributelist id="3548" addr="0x7fca469297b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3549" addr="0x7f99f1ddc4b0" >
-                                                <attributelist id="3550" addr="0x7f99f1ddc4b0" >
+                                            <typetabsitem id="3549" addr="0x7fca4692a4b0" >
+                                                <attributelist id="3550" addr="0x7fca4692a4b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3551" addr="0x7f99f1ddcf90" >
-                                                <attributelist id="3552" addr="0x7f99f1ddcf90" >
+                                            <typetabsitem id="3551" addr="0x7fca4692af90" >
+                                                <attributelist id="3552" addr="0x7fca4692af90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3553" addr="0x7f99f1de11b0" >
-                                                <attributelist id="3554" addr="0x7f99f1de11b0" >
+                                            <typetabsitem id="3553" addr="0x7fca4692f1b0" >
+                                                <attributelist id="3554" addr="0x7fca4692f1b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3555" addr="0x7f99f1de15b0" >
-                                                <attributelist id="3556" addr="0x7f99f1de15b0" >
+                                            <typetabsitem id="3555" addr="0x7fca4692f5b0" >
+                                                <attributelist id="3556" addr="0x7fca4692f5b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3557" addr="0x7f99f1dd77f0" >
-                                                <attributelist id="3558" addr="0x7f99f1dd77f0" >
+                                            <typetabsitem id="3557" addr="0x7fca469257f0" >
+                                                <attributelist id="3558" addr="0x7fca469257f0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3559" addr="0x7f99f1dd8b30" >
-                                                <attributelist id="3560" addr="0x7f99f1dd8b30" >
+                                            <typetabsitem id="3559" addr="0x7fca46926b30" >
+                                                <attributelist id="3560" addr="0x7fca46926b30" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3561" addr="0x7f99f1dd2c50" >
-                                                <attributelist id="3562" addr="0x7f99f1dd2c50" >
+                                            <typetabsitem id="3561" addr="0x7fca46920c50" >
+                                                <attributelist id="3562" addr="0x7fca46920c50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3563" addr="0x7f99f1dda790" >
-                                                <attributelist id="3564" addr="0x7f99f1dda790" >
+                                            <typetabsitem id="3563" addr="0x7fca46928790" >
+                                                <attributelist id="3564" addr="0x7fca46928790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3565" addr="0x7f99f1dd8030" >
-                                                <attributelist id="3566" addr="0x7f99f1dd8030" >
+                                            <typetabsitem id="3565" addr="0x7fca46926030" >
+                                                <attributelist id="3566" addr="0x7fca46926030" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3567" addr="0x7f99f1ddbe10" >
-                                                <attributelist id="3568" addr="0x7f99f1ddbe10" >
+                                            <typetabsitem id="3567" addr="0x7fca46929e10" >
+                                                <attributelist id="3568" addr="0x7fca46929e10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3569" addr="0x7f99f1dd6b10" >
-                                                <attributelist id="3570" addr="0x7f99f1dd6b10" >
+                                            <typetabsitem id="3569" addr="0x7fca46924b10" >
+                                                <attributelist id="3570" addr="0x7fca46924b10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3571" addr="0x7f99f1dddf90" >
-                                                <attributelist id="3572" addr="0x7f99f1dddf90" >
+                                            <typetabsitem id="3571" addr="0x7fca4692bf90" >
+                                                <attributelist id="3572" addr="0x7fca4692bf90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3573" addr="0x7f99f1de0530" >
-                                                <attributelist id="3574" addr="0x7f99f1de0530" >
+                                            <typetabsitem id="3573" addr="0x7fca4692e530" >
+                                                <attributelist id="3574" addr="0x7fca4692e530" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3575" addr="0x7f99f1de1e50" >
-                                                <attributelist id="3576" addr="0x7f99f1de1e50" >
+                                            <typetabsitem id="3575" addr="0x7fca4692fe50" >
+                                                <attributelist id="3576" addr="0x7fca4692fe50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3577" addr="0x7f99f1de2d90" >
-                                                <attributelist id="3578" addr="0x7f99f1de2d90" >
+                                            <typetabsitem id="3577" addr="0x7fca46930d90" >
+                                                <attributelist id="3578" addr="0x7fca46930d90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3579" addr="0x7f99f1de3410" >
-                                                <attributelist id="3580" addr="0x7f99f1de3410" >
+                                            <typetabsitem id="3579" addr="0x7fca46931410" >
+                                                <attributelist id="3580" addr="0x7fca46931410" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3581" addr="0x7f99f1dd3590" >
-                                                <attributelist id="3582" addr="0x7f99f1dd3590" >
+                                            <typetabsitem id="3581" addr="0x7fca46921590" >
+                                                <attributelist id="3582" addr="0x7fca46921590" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3583" addr="0x7f99f1dd3390" >
-                                                <attributelist id="3584" addr="0x7f99f1dd3390" >
+                                            <typetabsitem id="3583" addr="0x7fca46921390" >
+                                                <attributelist id="3584" addr="0x7fca46921390" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7f99f1dd1d70" id="3585" addr="0x7f99f1dd1d70" />
-                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="3586" addr="0x7f99f1de6c90" />
-                                        <attribute name="symtab" value="0x7f99f1e40fb0" id="3587" addr="0x7f99f1e40fb0" />
+                                        <attribute name="parent" value="0x7fca4691fd70" id="3585" addr="0x7fca4691fd70" />
+                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="3586" addr="0x7fca46934c90" />
+                                        <attribute name="symtab" value="0x7fca4698efb0" id="3587" addr="0x7fca4698efb0" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="3588" addr="0x7f99f1dd7970" >
-                                    <attributelist id="3589" addr="0x7f99f1dd7970" >
+                                <typescopesitem id="3588" addr="0x7fca46925970" >
+                                    <attributelist id="3589" addr="0x7fca46925970" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="3590" addr="0x7f99f1e59fd0" >
-                                    <attributelist id="3591" addr="0x7f99f1e59fd0" >
-                                        <attribute name="inherit" value="0x7f99f1e5a030" id="3592" addr="0x7f99f1e5a030" />
-                                        <attribute name="name" value="ControlSpin" id="3593" addr="0x7f99f1de6c90" />
-                                        <attribute name="csymtab" value="0x7f99f1e59ff0" id="3594" addr="0x7f99f1e59ff0" />
-                                        <attribute name="symtab" value="0x7f99f1e59fb0" id="3595" addr="0x7f99f1e59fb0" />
+                                <typescopesitem id="3590" addr="0x7fca469a7fd0" >
+                                    <attributelist id="3591" addr="0x7fca469a7fd0" >
+                                        <attribute name="inherit" value="0x7fca469a8030" id="3592" addr="0x7fca469a8030" />
+                                        <attribute name="name" value="ControlSpin" id="3593" addr="0x7fca46934c90" />
+                                        <attribute name="csymtab" value="0x7fca469a7ff0" id="3594" addr="0x7fca469a7ff0" />
+                                        <attribute name="symtab" value="0x7fca469a7fb0" id="3595" addr="0x7fca469a7fb0" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <access id="3596" addr="0x7f99f1e59f50" >
-                            <attributelist id="3597" addr="0x7f99f1e59f50" >
-                                <attribute name="kind" value="public" id="3598" addr="0x7f99f1de6c90" />
+                        <access id="3596" addr="0x7fca469a7f50" >
+                            <attributelist id="3597" addr="0x7fca469a7f50" >
+                                <attribute name="kind" value="public" id="3598" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </access >
-                        <destructor id="3599" addr="0x7f99f1e5a110" >
-                            <attributelist id="3600" addr="0x7f99f1e5a110" >
-                                <attribute name="ismember" value="1" id="3601" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="~ControlSpin" id="3602" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="~ControlSpin" id="3603" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="3604" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="3605" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e59fd0" id="3606" addr="0x7f99f1e59fd0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3607" addr="0x7f99f1de6c90" />
+                        <destructor id="3599" addr="0x7fca469a8110" >
+                            <attributelist id="3600" addr="0x7fca469a8110" >
+                                <attribute name="ismember" value="1" id="3601" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="~ControlSpin" id="3602" addr="0x7fca46934c90" />
+                                <attribute name="name" value="~ControlSpin" id="3603" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="3604" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="3605" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a7fd0" id="3606" addr="0x7fca469a7fd0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3607" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </destructor >
-                        <cdecl id="3608" addr="0x7f99f1e5aa30" >
-                            <attributelist id="3609" addr="0x7f99f1e5aa30" >
-                                <attribute name="name" value="setTextures" id="3610" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="3611" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e59fd0" id="3612" addr="0x7f99f1e59fd0" />
-                                <attribute name="kind" value="function" id="3613" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setTextures" id="3614" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char)." id="3615" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="3616" addr="0x7f99f1de6c90" />
-                                <parmlist id="3617" addr="0x7f99f1e5a330" >
+                        <cdecl id="3608" addr="0x7fca469a8a30" >
+                            <attributelist id="3609" addr="0x7fca469a8a30" >
+                                <attribute name="name" value="setTextures" id="3610" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="3611" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a7fd0" id="3612" addr="0x7fca469a7fd0" />
+                                <attribute name="kind" value="function" id="3613" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setTextures" id="3614" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char)." id="3615" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="3616" addr="0x7fca46934c90" />
+                                <parmlist id="3617" addr="0x7fca469a8330" >
                                     <parm id="3618">
-                                        <attributelist id="3619" addr="0x7f99f1e5a330" >
-                                            <attribute name="name" value="up" id="3620" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="3621" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3619" addr="0x7fca469a8330" >
+                                            <attribute name="name" value="up" id="3620" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="3621" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="3622">
-                                        <attributelist id="3623" addr="0x7f99f1e5a470" >
-                                            <attribute name="name" value="down" id="3624" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="3625" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3623" addr="0x7fca469a8470" >
+                                            <attribute name="name" value="down" id="3624" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="3625" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="3626">
-                                        <attributelist id="3627" addr="0x7f99f1e5a5b0" >
-                                            <attribute name="name" value="upFocus" id="3628" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="3629" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3627" addr="0x7fca469a85b0" >
+                                            <attribute name="name" value="upFocus" id="3628" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="3629" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="3630">
-                                        <attributelist id="3631" addr="0x7f99f1e5a6f0" >
-                                            <attribute name="name" value="downFocus" id="3632" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="3633" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3631" addr="0x7fca469a86f0" >
+                                            <attribute name="name" value="downFocus" id="3632" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="3633" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="3634">
-                                        <attributelist id="3635" addr="0x7f99f1e5a830" >
-                                            <attribute name="name" value="upDisabled" id="3636" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="3637" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3635" addr="0x7fca469a8830" >
+                                            <attribute name="name" value="upDisabled" id="3636" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="3637" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="3638">
-                                        <attributelist id="3639" addr="0x7f99f1e5a970" >
-                                            <attribute name="name" value="downDisabled" id="3640" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="3641" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3639" addr="0x7fca469a8970" >
+                                            <attribute name="name" value="downDisabled" id="3640" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="3641" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="3642" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="3643" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="3644" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="3642" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3643" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="3644" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <access id="3645" addr="0x7f99f1e5aaf0" >
-                            <attributelist id="3646" addr="0x7f99f1e5aaf0" >
-                                <attribute name="kind" value="private" id="3647" addr="0x7f99f1de6c90" />
+                        <access id="3645" addr="0x7fca469a8af0" >
+                            <attributelist id="3646" addr="0x7fca469a8af0" >
+                                <attribute name="kind" value="private" id="3647" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="3648" addr="0x7f99f1e5ac50" >
-                            <attributelist id="3649" addr="0x7f99f1e5ac50" >
-                                <attribute name="ismember" value="1" id="3650" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="ControlSpin" id="3651" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="3652" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="private" id="3653" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="3654" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e59fd0" id="3655" addr="0x7f99f1e59fd0" />
+                        <constructor id="3648" addr="0x7fca469a8c50" >
+                            <attributelist id="3649" addr="0x7fca469a8c50" >
+                                <attribute name="ismember" value="1" id="3650" addr="0x7fca46934c90" />
+                                <attribute name="name" value="ControlSpin" id="3651" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="3652" addr="0x7fca46934c90" />
+                                <attribute name="access" value="private" id="3653" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="3654" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a7fd0" id="3655" addr="0x7fca469a7fd0" />
                             </attributelist >
                          
                         </constructor >
-                        <access id="3656" addr="0x7f99f1e5ae10" >
-                            <attributelist id="3657" addr="0x7f99f1e5ae10" >
-                                <attribute name="kind" value="public" id="3658" addr="0x7f99f1de6c90" />
+                        <access id="3656" addr="0x7fca469a8e10" >
+                            <attributelist id="3657" addr="0x7fca469a8e10" >
+                                <attribute name="kind" value="public" id="3658" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </access >
                     </class >
-                    <class id="3659" addr="0x7f99f1e5afd0" >
-                        <attributelist id="3660" addr="0x7f99f1e5afd0" >
-                            <attribute name="name" value="XBMCAddon::xbmcgui::ControlLabel" id="3661" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="3662" addr="0x7f99f1e40fb0" />
-                            <attribute name="symtab" value="0x7f99f1e5b110" id="3663" addr="0x7f99f1e5b110" />
-                            <attribute name="allows_typedef" value="1" id="3664" addr="0x7f99f1de6c90" />
-                            <attribute name="typepass_visit" value="1" id="3665" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_visit" value="1" id="3666" addr="0x7f99f1de6c90" />
-                            <attribute name="kind" value="class" id="3667" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_name" value="ControlLabel" id="3668" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_has_constructor" value="1" id="3669" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_public_constructor" value="1" id="3670" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_has_destructor" value="1" id="3671" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_default_destructor" value="1" id="3672" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_copy_constructor" value="1" id="3673" addr="0x7f99f1de6c90" />
-                            <attribute name="privatebaselist" value="0x7f99f1e5afb0" id="3674" addr="0x7f99f1e5afb0" />
-                            <attribute name="protectedbaselist" value="0x7f99f1e5af90" id="3675" addr="0x7f99f1e5af90" />
-                            <baselist id="3676" addr="0x7f99f1e5af70" >
-                                <base name="Control" id="3677" addr="0x7f99f1e5aef0" />
+                    <class id="3659" addr="0x7fca469a8fd0" >
+                        <attributelist id="3660" addr="0x7fca469a8fd0" >
+                            <attribute name="name" value="XBMCAddon::xbmcgui::ControlLabel" id="3661" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="3662" addr="0x7fca4698efb0" />
+                            <attribute name="symtab" value="0x7fca469a9110" id="3663" addr="0x7fca469a9110" />
+                            <attribute name="allows_typedef" value="1" id="3664" addr="0x7fca46934c90" />
+                            <attribute name="typepass_visit" value="1" id="3665" addr="0x7fca46934c90" />
+                            <attribute name="allocate_visit" value="1" id="3666" addr="0x7fca46934c90" />
+                            <attribute name="kind" value="class" id="3667" addr="0x7fca46934c90" />
+                            <attribute name="sym_name" value="ControlLabel" id="3668" addr="0x7fca46934c90" />
+                            <attribute name="allocate_has_constructor" value="1" id="3669" addr="0x7fca46934c90" />
+                            <attribute name="allocate_public_constructor" value="1" id="3670" addr="0x7fca46934c90" />
+                            <attribute name="allocate_has_destructor" value="1" id="3671" addr="0x7fca46934c90" />
+                            <attribute name="allocate_default_destructor" value="1" id="3672" addr="0x7fca46934c90" />
+                            <attribute name="allocate_copy_constructor" value="1" id="3673" addr="0x7fca46934c90" />
+                            <attribute name="privatebaselist" value="0x7fca469a8fb0" id="3674" addr="0x7fca469a8fb0" />
+                            <attribute name="protectedbaselist" value="0x7fca469a8f90" id="3675" addr="0x7fca469a8f90" />
+                            <baselist id="3676" addr="0x7fca469a8f70" >
+                                <base name="Control" id="3677" addr="0x7fca469a8ef0" />
                             </baselist >
-                            <attribute name="module" value="xbmcgui" id="3678" addr="0x7f99f1e402f0" />
-                            <attribute name="bases" value="0x7f99f1dd8150" id="3679" addr="0x7f99f1dd8150" />
-                            <attribute name="allbases" value="0x7f99f1dd83f0" id="3680" addr="0x7f99f1dd83f0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="3681" addr="0x7f99f1de6c90" />
-                            <typescope id="3682" addr="0x7f99f1dd8090" >
-                                <attributelist id="3683" addr="0x7f99f1dd8090" >
-                                    <attribute name="inherit" value="0x7f99f1dd81d0" id="3684" addr="0x7f99f1dd81d0" />
-                                    <attribute name="name" value="ControlLabel" id="3685" addr="0x7f99f1de6c90" />
-                                    <typetab id="3686" addr="0x7f99f1dd80f0" >
-                                        <attributelist id="3687" addr="0x7f99f1dd80f0" >
+                            <attribute name="module" value="xbmcgui" id="3678" addr="0x7fca4698e2f0" />
+                            <attribute name="bases" value="0x7fca46926150" id="3679" addr="0x7fca46926150" />
+                            <attribute name="allbases" value="0x7fca469263f0" id="3680" addr="0x7fca469263f0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="3681" addr="0x7fca46934c90" />
+                            <typescope id="3682" addr="0x7fca46926090" >
+                                <attributelist id="3683" addr="0x7fca46926090" >
+                                    <attribute name="inherit" value="0x7fca469261d0" id="3684" addr="0x7fca469261d0" />
+                                    <attribute name="name" value="ControlLabel" id="3685" addr="0x7fca46934c90" />
+                                    <typetab id="3686" addr="0x7fca469260f0" >
+                                        <attributelist id="3687" addr="0x7fca469260f0" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f99f1dd2150" id="3688" addr="0x7f99f1dd2150" />
-                                    <attribute name="qname" value="XBMCAddon::xbmcgui::ControlLabel" id="3689" addr="0x7f99f1de6c90" />
-                                    <attribute name="symtab" value="0x7f99f1e5b110" id="3690" addr="0x7f99f1e5b110" />
+                                    <attribute name="parent" value="0x7fca46920150" id="3688" addr="0x7fca46920150" />
+                                    <attribute name="qname" value="XBMCAddon::xbmcgui::ControlLabel" id="3689" addr="0x7fca46934c90" />
+                                    <attribute name="symtab" value="0x7fca469a9110" id="3690" addr="0x7fca469a9110" />
                                 </attributelist >
-                                <typescopesitem id="3691" addr="0x7f99f1dd81d0" >
-                                    <attributelist id="3692" addr="0x7f99f1dd81d0" >
+                                <typescopesitem id="3691" addr="0x7fca469261d0" >
+                                    <attributelist id="3692" addr="0x7fca469261d0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="3693" addr="0x7f99f1dd7fd0" >
-                                    <attributelist id="3694" addr="0x7f99f1dd7fd0" >
+                                <typescopesitem id="3693" addr="0x7fca46925fd0" >
+                                    <attributelist id="3694" addr="0x7fca46925fd0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="3695" addr="0x7f99f1dd80f0" >
-                                    <attributelist id="3696" addr="0x7f99f1dd80f0" >
+                                <typescopesitem id="3695" addr="0x7fca469260f0" >
+                                    <attributelist id="3696" addr="0x7fca469260f0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="3697" addr="0x7f99f1dd2150" >
-                                    <attributelist id="3698" addr="0x7f99f1dd2150" >
-                                        <attribute name="name" value="xbmcgui" id="3699" addr="0x7f99f1de6c90" />
-                                        <typetab id="3700" addr="0x7f99f1dd2170" >
-                                            <attributelist id="3701" addr="0x7f99f1dd2170" >
-                                                <attribute name="InterceptorBase" value="InterceptorBase" id="3702" addr="0x7f99f1de6c90" />
-                                                <attribute name="Dialog" value="Dialog" id="3703" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="3704" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="3705" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlTextBox" value="ControlTextBox" id="3706" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="3707" addr="0x7f99f1de6c90" />
-                                                <attribute name="Window" value="Window" id="3708" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="3709" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlList" value="ControlList" id="3710" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="3711" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlImage" value="ControlImage" id="3712" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlButton" value="ControlButton" id="3713" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlGroup" value="ControlGroup" id="3714" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogBusy" value="DialogBusy" id="3715" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="3716" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSpin" value="ControlSpin" id="3717" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlEdit" value="ControlEdit" id="3718" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="3719" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="3720" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlLabel" value="ControlLabel" id="3721" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlProgress" value="ControlProgress" id="3722" addr="0x7f99f1de6c90" />
-                                                <attribute name="Control" value="Control" id="3723" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSlider" value="ControlSlider" id="3724" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgress" value="DialogProgress" id="3725" addr="0x7f99f1de6c90" />
-                                                <attribute name="Action" value="Action" id="3726" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowDialog" value="WindowDialog" id="3727" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXML" value="WindowXML" id="3728" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItem" value="ListItem" id="3729" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="3730" addr="0x7f99f1de6c90" />
+                                <typescopesitem id="3697" addr="0x7fca46920150" >
+                                    <attributelist id="3698" addr="0x7fca46920150" >
+                                        <attribute name="name" value="xbmcgui" id="3699" addr="0x7fca46934c90" />
+                                        <typetab id="3700" addr="0x7fca46920170" >
+                                            <attributelist id="3701" addr="0x7fca46920170" >
+                                                <attribute name="InterceptorBase" value="InterceptorBase" id="3702" addr="0x7fca46934c90" />
+                                                <attribute name="Dialog" value="Dialog" id="3703" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="3704" addr="0x7fca46934c90" />
+                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="3705" addr="0x7fca46934c90" />
+                                                <attribute name="ControlTextBox" value="ControlTextBox" id="3706" addr="0x7fca46934c90" />
+                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="3707" addr="0x7fca46934c90" />
+                                                <attribute name="Window" value="Window" id="3708" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="3709" addr="0x7fca46934c90" />
+                                                <attribute name="ControlList" value="ControlList" id="3710" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="3711" addr="0x7fca46934c90" />
+                                                <attribute name="ControlImage" value="ControlImage" id="3712" addr="0x7fca46934c90" />
+                                                <attribute name="ControlButton" value="ControlButton" id="3713" addr="0x7fca46934c90" />
+                                                <attribute name="ControlGroup" value="ControlGroup" id="3714" addr="0x7fca46934c90" />
+                                                <attribute name="DialogBusy" value="DialogBusy" id="3715" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="3716" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSpin" value="ControlSpin" id="3717" addr="0x7fca46934c90" />
+                                                <attribute name="ControlEdit" value="ControlEdit" id="3718" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="3719" addr="0x7fca46934c90" />
+                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="3720" addr="0x7fca46934c90" />
+                                                <attribute name="ControlLabel" value="ControlLabel" id="3721" addr="0x7fca46934c90" />
+                                                <attribute name="ControlProgress" value="ControlProgress" id="3722" addr="0x7fca46934c90" />
+                                                <attribute name="Control" value="Control" id="3723" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSlider" value="ControlSlider" id="3724" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgress" value="DialogProgress" id="3725" addr="0x7fca46934c90" />
+                                                <attribute name="Action" value="Action" id="3726" addr="0x7fca46934c90" />
+                                                <attribute name="WindowDialog" value="WindowDialog" id="3727" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXML" value="WindowXML" id="3728" addr="0x7fca46934c90" />
+                                                <attribute name="ListItem" value="ListItem" id="3729" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="3730" addr="0x7fca46934c90" />
                                             </attributelist >
-                                            <typetabsitem id="3731" addr="0x7f99f1de1dd0" >
-                                                <attributelist id="3732" addr="0x7f99f1de1dd0" >
+                                            <typetabsitem id="3731" addr="0x7fca4692fdd0" >
+                                                <attributelist id="3732" addr="0x7fca4692fdd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3733" addr="0x7f99f1dde790" >
-                                                <attributelist id="3734" addr="0x7f99f1dde790" >
+                                            <typetabsitem id="3733" addr="0x7fca4692c790" >
+                                                <attributelist id="3734" addr="0x7fca4692c790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3735" addr="0x7f99f1de3f10" >
-                                                <attributelist id="3736" addr="0x7f99f1de3f10" >
+                                            <typetabsitem id="3735" addr="0x7fca46931f10" >
+                                                <attributelist id="3736" addr="0x7fca46931f10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3737" addr="0x7f99f1dd67b0" >
-                                                <attributelist id="3738" addr="0x7f99f1dd67b0" >
+                                            <typetabsitem id="3737" addr="0x7fca469247b0" >
+                                                <attributelist id="3738" addr="0x7fca469247b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3739" addr="0x7f99f1ddafd0" >
-                                                <attributelist id="3740" addr="0x7f99f1ddafd0" >
+                                            <typetabsitem id="3739" addr="0x7fca46928fd0" >
+                                                <attributelist id="3740" addr="0x7fca46928fd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3741" addr="0x7f99f1ddd430" >
-                                                <attributelist id="3742" addr="0x7f99f1ddd430" >
+                                            <typetabsitem id="3741" addr="0x7fca4692b430" >
+                                                <attributelist id="3742" addr="0x7fca4692b430" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3743" addr="0x7f99f1de2130" >
-                                                <attributelist id="3744" addr="0x7f99f1de2130" >
+                                            <typetabsitem id="3743" addr="0x7fca46930130" >
+                                                <attributelist id="3744" addr="0x7fca46930130" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3745" addr="0x7f99f1dd2f50" >
-                                                <attributelist id="3746" addr="0x7f99f1dd2f50" >
+                                            <typetabsitem id="3745" addr="0x7fca46920f50" >
+                                                <attributelist id="3746" addr="0x7fca46920f50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3747" addr="0x7f99f1dd9650" >
-                                                <attributelist id="3748" addr="0x7f99f1dd9650" >
+                                            <typetabsitem id="3747" addr="0x7fca46927650" >
+                                                <attributelist id="3748" addr="0x7fca46927650" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3749" addr="0x7f99f1de3390" >
-                                                <attributelist id="3750" addr="0x7f99f1de3390" >
+                                            <typetabsitem id="3749" addr="0x7fca46931390" >
+                                                <attributelist id="3750" addr="0x7fca46931390" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3751" addr="0x7f99f1ddb7b0" >
-                                                <attributelist id="3752" addr="0x7f99f1ddb7b0" >
+                                            <typetabsitem id="3751" addr="0x7fca469297b0" >
+                                                <attributelist id="3752" addr="0x7fca469297b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3753" addr="0x7f99f1ddc4b0" >
-                                                <attributelist id="3754" addr="0x7f99f1ddc4b0" >
+                                            <typetabsitem id="3753" addr="0x7fca4692a4b0" >
+                                                <attributelist id="3754" addr="0x7fca4692a4b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3755" addr="0x7f99f1ddcf90" >
-                                                <attributelist id="3756" addr="0x7f99f1ddcf90" >
+                                            <typetabsitem id="3755" addr="0x7fca4692af90" >
+                                                <attributelist id="3756" addr="0x7fca4692af90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3757" addr="0x7f99f1de11b0" >
-                                                <attributelist id="3758" addr="0x7f99f1de11b0" >
+                                            <typetabsitem id="3757" addr="0x7fca4692f1b0" >
+                                                <attributelist id="3758" addr="0x7fca4692f1b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3759" addr="0x7f99f1de15b0" >
-                                                <attributelist id="3760" addr="0x7f99f1de15b0" >
+                                            <typetabsitem id="3759" addr="0x7fca4692f5b0" >
+                                                <attributelist id="3760" addr="0x7fca4692f5b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3761" addr="0x7f99f1dd77f0" >
-                                                <attributelist id="3762" addr="0x7f99f1dd77f0" >
+                                            <typetabsitem id="3761" addr="0x7fca469257f0" >
+                                                <attributelist id="3762" addr="0x7fca469257f0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3763" addr="0x7f99f1dd8b30" >
-                                                <attributelist id="3764" addr="0x7f99f1dd8b30" >
+                                            <typetabsitem id="3763" addr="0x7fca46926b30" >
+                                                <attributelist id="3764" addr="0x7fca46926b30" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3765" addr="0x7f99f1dd2c50" >
-                                                <attributelist id="3766" addr="0x7f99f1dd2c50" >
+                                            <typetabsitem id="3765" addr="0x7fca46920c50" >
+                                                <attributelist id="3766" addr="0x7fca46920c50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3767" addr="0x7f99f1dda790" >
-                                                <attributelist id="3768" addr="0x7f99f1dda790" >
+                                            <typetabsitem id="3767" addr="0x7fca46928790" >
+                                                <attributelist id="3768" addr="0x7fca46928790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3769" addr="0x7f99f1dd8030" >
-                                                <attributelist id="3770" addr="0x7f99f1dd8030" >
+                                            <typetabsitem id="3769" addr="0x7fca46926030" >
+                                                <attributelist id="3770" addr="0x7fca46926030" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3771" addr="0x7f99f1ddbe10" >
-                                                <attributelist id="3772" addr="0x7f99f1ddbe10" >
+                                            <typetabsitem id="3771" addr="0x7fca46929e10" >
+                                                <attributelist id="3772" addr="0x7fca46929e10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3773" addr="0x7f99f1dd6b10" >
-                                                <attributelist id="3774" addr="0x7f99f1dd6b10" >
+                                            <typetabsitem id="3773" addr="0x7fca46924b10" >
+                                                <attributelist id="3774" addr="0x7fca46924b10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3775" addr="0x7f99f1dddf90" >
-                                                <attributelist id="3776" addr="0x7f99f1dddf90" >
+                                            <typetabsitem id="3775" addr="0x7fca4692bf90" >
+                                                <attributelist id="3776" addr="0x7fca4692bf90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3777" addr="0x7f99f1de0530" >
-                                                <attributelist id="3778" addr="0x7f99f1de0530" >
+                                            <typetabsitem id="3777" addr="0x7fca4692e530" >
+                                                <attributelist id="3778" addr="0x7fca4692e530" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3779" addr="0x7f99f1de1e50" >
-                                                <attributelist id="3780" addr="0x7f99f1de1e50" >
+                                            <typetabsitem id="3779" addr="0x7fca4692fe50" >
+                                                <attributelist id="3780" addr="0x7fca4692fe50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3781" addr="0x7f99f1de2d90" >
-                                                <attributelist id="3782" addr="0x7f99f1de2d90" >
+                                            <typetabsitem id="3781" addr="0x7fca46930d90" >
+                                                <attributelist id="3782" addr="0x7fca46930d90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3783" addr="0x7f99f1de3410" >
-                                                <attributelist id="3784" addr="0x7f99f1de3410" >
+                                            <typetabsitem id="3783" addr="0x7fca46931410" >
+                                                <attributelist id="3784" addr="0x7fca46931410" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3785" addr="0x7f99f1dd3590" >
-                                                <attributelist id="3786" addr="0x7f99f1dd3590" >
+                                            <typetabsitem id="3785" addr="0x7fca46921590" >
+                                                <attributelist id="3786" addr="0x7fca46921590" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="3787" addr="0x7f99f1dd3390" >
-                                                <attributelist id="3788" addr="0x7f99f1dd3390" >
+                                            <typetabsitem id="3787" addr="0x7fca46921390" >
+                                                <attributelist id="3788" addr="0x7fca46921390" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7f99f1dd1d70" id="3789" addr="0x7f99f1dd1d70" />
-                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="3790" addr="0x7f99f1de6c90" />
-                                        <attribute name="symtab" value="0x7f99f1e40fb0" id="3791" addr="0x7f99f1e40fb0" />
+                                        <attribute name="parent" value="0x7fca4691fd70" id="3789" addr="0x7fca4691fd70" />
+                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="3790" addr="0x7fca46934c90" />
+                                        <attribute name="symtab" value="0x7fca4698efb0" id="3791" addr="0x7fca4698efb0" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="3792" addr="0x7f99f1dd80d0" >
-                                    <attributelist id="3793" addr="0x7f99f1dd80d0" >
+                                <typescopesitem id="3792" addr="0x7fca469260d0" >
+                                    <attributelist id="3793" addr="0x7fca469260d0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="3794" addr="0x7f99f1e5b110" >
-                                    <attributelist id="3795" addr="0x7f99f1e5b110" >
-                                        <attribute name="inherit" value="0x7f99f1e5b170" id="3796" addr="0x7f99f1e5b170" />
-                                        <attribute name="name" value="ControlLabel" id="3797" addr="0x7f99f1de6c90" />
-                                        <attribute name="csymtab" value="0x7f99f1e5b130" id="3798" addr="0x7f99f1e5b130" />
-                                        <attribute name="symtab" value="0x7f99f1e5b0f0" id="3799" addr="0x7f99f1e5b0f0" />
+                                <typescopesitem id="3794" addr="0x7fca469a9110" >
+                                    <attributelist id="3795" addr="0x7fca469a9110" >
+                                        <attribute name="inherit" value="0x7fca469a9170" id="3796" addr="0x7fca469a9170" />
+                                        <attribute name="name" value="ControlLabel" id="3797" addr="0x7fca46934c90" />
+                                        <attribute name="csymtab" value="0x7fca469a9130" id="3798" addr="0x7fca469a9130" />
+                                        <attribute name="symtab" value="0x7fca469a90f0" id="3799" addr="0x7fca469a90f0" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <access id="3800" addr="0x7f99f1e5b090" >
-                            <attributelist id="3801" addr="0x7f99f1e5b090" >
-                                <attribute name="kind" value="public" id="3802" addr="0x7f99f1de6c90" />
+                        <access id="3800" addr="0x7fca469a9090" >
+                            <attributelist id="3801" addr="0x7fca469a9090" >
+                                <attribute name="kind" value="public" id="3802" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="3803" addr="0x7f99f1e5c130" >
-                            <attributelist id="3804" addr="0x7f99f1e5c130" >
-                                <attribute name="name" value="ControlLabel" id="3805" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="3806" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e5b110" id="3807" addr="0x7f99f1e5b110" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e5c7d0" id="3808" addr="0x7f99f1e5c7d0" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e5c7d0" id="3809" addr="0x7f99f1e5c7d0" />
-                                <attribute name="sym_name" value="ControlLabel" id="3810" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,long,bool,long)." id="3811" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="3812" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e5c130" id="3813" addr="0x7f99f1e5c130" />
-                                <parmlist id="3814" addr="0x7f99f1e5b2d0" >
+                        <constructor id="3803" addr="0x7fca469aa130" >
+                            <attributelist id="3804" addr="0x7fca469aa130" >
+                                <attribute name="name" value="ControlLabel" id="3805" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="3806" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a9110" id="3807" addr="0x7fca469a9110" />
+                                <attribute name="sym_nextSibling" value="0x7fca469aa7d0" id="3808" addr="0x7fca469aa7d0" />
+                                <attribute name="csym_nextSibling" value="0x7fca469aa7d0" id="3809" addr="0x7fca469aa7d0" />
+                                <attribute name="sym_name" value="ControlLabel" id="3810" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,long,bool,long)." id="3811" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="3812" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469aa130" id="3813" addr="0x7fca469aa130" />
+                                <parmlist id="3814" addr="0x7fca469a92d0" >
                                     <parm id="3815">
-                                        <attributelist id="3816" addr="0x7f99f1e5b2d0" >
-                                            <attribute name="name" value="x" id="3817" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="3818" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3816" addr="0x7fca469a92d0" >
+                                            <attribute name="name" value="x" id="3817" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="3818" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="3819">
-                                        <attributelist id="3820" addr="0x7f99f1e5b3f0" >
-                                            <attribute name="name" value="y" id="3821" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="3822" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3820" addr="0x7fca469a93f0" >
+                                            <attribute name="name" value="y" id="3821" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="3822" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="3823">
-                                        <attributelist id="3824" addr="0x7f99f1e5b510" >
-                                            <attribute name="name" value="width" id="3825" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="3826" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3824" addr="0x7fca469a9510" >
+                                            <attribute name="name" value="width" id="3825" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="3826" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="3827">
-                                        <attributelist id="3828" addr="0x7f99f1e5b630" >
-                                            <attribute name="name" value="height" id="3829" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="3830" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3828" addr="0x7fca469a9630" >
+                                            <attribute name="name" value="height" id="3829" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="3830" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="3831">
-                                        <attributelist id="3832" addr="0x7f99f1e5b770" >
-                                            <attribute name="name" value="label" id="3833" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="3834" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3832" addr="0x7fca469a9770" >
+                                            <attribute name="name" value="label" id="3833" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="3834" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="3835">
-                                        <attributelist id="3836" addr="0x7f99f1e5b910" >
-                                            <attribute name="name" value="font" id="3837" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="3838" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="3839" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3836" addr="0x7fca469a9910" >
+                                            <attribute name="name" value="font" id="3837" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="3838" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="3839" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="3840">
-                                        <attributelist id="3841" addr="0x7f99f1e5bab0" >
-                                            <attribute name="name" value="textColor" id="3842" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="3843" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="3844" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3841" addr="0x7fca469a9ab0" >
+                                            <attribute name="name" value="textColor" id="3842" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="3843" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="3844" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="3845">
-                                        <attributelist id="3846" addr="0x7f99f1e5bc50" >
-                                            <attribute name="name" value="disabledColor" id="3847" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="3848" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="3849" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3846" addr="0x7fca469a9c50" >
+                                            <attribute name="name" value="disabledColor" id="3847" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="3848" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="3849" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="3850">
-                                        <attributelist id="3851" addr="0x7f99f1e5bdd0" >
-                                            <attribute name="name" value="alignment" id="3852" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBFONT_LEFT" id="3853" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="3854" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3851" addr="0x7fca469a9dd0" >
+                                            <attribute name="name" value="alignment" id="3852" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBFONT_LEFT" id="3853" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="3854" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="3855">
-                                        <attributelist id="3856" addr="0x7f99f1e5bf10" >
-                                            <attribute name="name" value="hasPath" id="3857" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="false" id="3858" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="3859" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3856" addr="0x7fca469a9f10" >
+                                            <attribute name="name" value="hasPath" id="3857" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="false" id="3858" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="3859" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="3860">
-                                        <attributelist id="3861" addr="0x7f99f1e5c070" >
-                                            <attribute name="name" value="angle" id="3862" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="0" id="3863" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="3864" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3861" addr="0x7fca469aa070" >
+                                            <attribute name="name" value="angle" id="3862" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="0" id="3863" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="3864" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_0" id="3865" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="3866" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="3865" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="3866" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="3867" addr="0x7f99f1e5c7d0" >
-                            <attributelist id="3868" addr="0x7f99f1e5c7d0" >
-                                <attribute name="name" value="ControlLabel" id="3869" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="3870" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e5b110" id="3871" addr="0x7f99f1e5b110" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e5cdd0" id="3872" addr="0x7f99f1e5cdd0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e5c130" id="3873" addr="0x7f99f1e5c130" />
-                                <attribute name="sym_name" value="ControlLabel" id="3874" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e5cdd0" id="3875" addr="0x7f99f1e5cdd0" />
-                                <attribute name="defaultargs" value="0x7f99f1e5c130" id="3876" addr="0x7f99f1e5c130" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,long,bool)." id="3877" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="3878" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e5c130" id="3879" addr="0x7f99f1e5c130" />
-                                <parmlist id="3880" addr="0x7f99f1e5c1d0" >
+                        <constructor id="3867" addr="0x7fca469aa7d0" >
+                            <attributelist id="3868" addr="0x7fca469aa7d0" >
+                                <attribute name="name" value="ControlLabel" id="3869" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="3870" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a9110" id="3871" addr="0x7fca469a9110" />
+                                <attribute name="csym_nextSibling" value="0x7fca469aadd0" id="3872" addr="0x7fca469aadd0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469aa130" id="3873" addr="0x7fca469aa130" />
+                                <attribute name="sym_name" value="ControlLabel" id="3874" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469aadd0" id="3875" addr="0x7fca469aadd0" />
+                                <attribute name="defaultargs" value="0x7fca469aa130" id="3876" addr="0x7fca469aa130" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,long,bool)." id="3877" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="3878" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469aa130" id="3879" addr="0x7fca469aa130" />
+                                <parmlist id="3880" addr="0x7fca469aa1d0" >
                                     <parm id="3881">
-                                        <attributelist id="3882" addr="0x7f99f1e5c1d0" >
-                                            <attribute name="name" value="x" id="3883" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="3884" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3882" addr="0x7fca469aa1d0" >
+                                            <attribute name="name" value="x" id="3883" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="3884" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="3885">
-                                        <attributelist id="3886" addr="0x7f99f1e5c290" >
-                                            <attribute name="name" value="y" id="3887" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="3888" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3886" addr="0x7fca469aa290" >
+                                            <attribute name="name" value="y" id="3887" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="3888" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="3889">
-                                        <attributelist id="3890" addr="0x7f99f1e5c310" >
-                                            <attribute name="name" value="width" id="3891" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="3892" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3890" addr="0x7fca469aa310" >
+                                            <attribute name="name" value="width" id="3891" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="3892" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="3893">
-                                        <attributelist id="3894" addr="0x7f99f1e5c390" >
-                                            <attribute name="name" value="height" id="3895" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="3896" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3894" addr="0x7fca469aa390" >
+                                            <attribute name="name" value="height" id="3895" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="3896" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="3897">
-                                        <attributelist id="3898" addr="0x7f99f1e5c410" >
-                                            <attribute name="name" value="label" id="3899" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="3900" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3898" addr="0x7fca469aa410" >
+                                            <attribute name="name" value="label" id="3899" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="3900" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="3901">
-                                        <attributelist id="3902" addr="0x7f99f1e5c490" >
-                                            <attribute name="name" value="font" id="3903" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="3904" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="3905" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3902" addr="0x7fca469aa490" >
+                                            <attribute name="name" value="font" id="3903" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="3904" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="3905" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="3906">
-                                        <attributelist id="3907" addr="0x7f99f1e5c530" >
-                                            <attribute name="name" value="textColor" id="3908" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="3909" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="3910" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3907" addr="0x7fca469aa530" >
+                                            <attribute name="name" value="textColor" id="3908" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="3909" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="3910" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="3911">
-                                        <attributelist id="3912" addr="0x7f99f1e5c5d0" >
-                                            <attribute name="name" value="disabledColor" id="3913" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="3914" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="3915" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3912" addr="0x7fca469aa5d0" >
+                                            <attribute name="name" value="disabledColor" id="3913" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="3914" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="3915" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="3916">
-                                        <attributelist id="3917" addr="0x7f99f1e5c670" >
-                                            <attribute name="name" value="alignment" id="3918" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBFONT_LEFT" id="3919" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="3920" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3917" addr="0x7fca469aa670" >
+                                            <attribute name="name" value="alignment" id="3918" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBFONT_LEFT" id="3919" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="3920" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="3921">
-                                        <attributelist id="3922" addr="0x7f99f1e5c710" >
-                                            <attribute name="name" value="hasPath" id="3923" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="false" id="3924" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="3925" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3922" addr="0x7fca469aa710" >
+                                            <attribute name="name" value="hasPath" id="3923" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="false" id="3924" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="3925" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_1" id="3926" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="3927" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="3926" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="3927" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="3928" addr="0x7f99f1e5cdd0" >
-                            <attributelist id="3929" addr="0x7f99f1e5cdd0" >
-                                <attribute name="name" value="ControlLabel" id="3930" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="3931" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e5b110" id="3932" addr="0x7f99f1e5b110" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e5d330" id="3933" addr="0x7f99f1e5d330" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e5c7d0" id="3934" addr="0x7f99f1e5c7d0" />
-                                <attribute name="sym_name" value="ControlLabel" id="3935" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e5d330" id="3936" addr="0x7f99f1e5d330" />
-                                <attribute name="defaultargs" value="0x7f99f1e5c130" id="3937" addr="0x7f99f1e5c130" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,long)." id="3938" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="3939" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e5c130" id="3940" addr="0x7f99f1e5c130" />
-                                <parmlist id="3941" addr="0x7f99f1e5c870" >
+                        <constructor id="3928" addr="0x7fca469aadd0" >
+                            <attributelist id="3929" addr="0x7fca469aadd0" >
+                                <attribute name="name" value="ControlLabel" id="3930" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="3931" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a9110" id="3932" addr="0x7fca469a9110" />
+                                <attribute name="csym_nextSibling" value="0x7fca469ab330" id="3933" addr="0x7fca469ab330" />
+                                <attribute name="sym_previousSibling" value="0x7fca469aa7d0" id="3934" addr="0x7fca469aa7d0" />
+                                <attribute name="sym_name" value="ControlLabel" id="3935" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469ab330" id="3936" addr="0x7fca469ab330" />
+                                <attribute name="defaultargs" value="0x7fca469aa130" id="3937" addr="0x7fca469aa130" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,long)." id="3938" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="3939" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469aa130" id="3940" addr="0x7fca469aa130" />
+                                <parmlist id="3941" addr="0x7fca469aa870" >
                                     <parm id="3942">
-                                        <attributelist id="3943" addr="0x7f99f1e5c870" >
-                                            <attribute name="name" value="x" id="3944" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="3945" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3943" addr="0x7fca469aa870" >
+                                            <attribute name="name" value="x" id="3944" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="3945" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="3946">
-                                        <attributelist id="3947" addr="0x7f99f1e5c930" >
-                                            <attribute name="name" value="y" id="3948" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="3949" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3947" addr="0x7fca469aa930" >
+                                            <attribute name="name" value="y" id="3948" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="3949" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="3950">
-                                        <attributelist id="3951" addr="0x7f99f1e5c9b0" >
-                                            <attribute name="name" value="width" id="3952" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="3953" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3951" addr="0x7fca469aa9b0" >
+                                            <attribute name="name" value="width" id="3952" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="3953" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="3954">
-                                        <attributelist id="3955" addr="0x7f99f1e5ca30" >
-                                            <attribute name="name" value="height" id="3956" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="3957" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3955" addr="0x7fca469aaa30" >
+                                            <attribute name="name" value="height" id="3956" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="3957" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="3958">
-                                        <attributelist id="3959" addr="0x7f99f1e5cab0" >
-                                            <attribute name="name" value="label" id="3960" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="3961" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3959" addr="0x7fca469aaab0" >
+                                            <attribute name="name" value="label" id="3960" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="3961" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="3962">
-                                        <attributelist id="3963" addr="0x7f99f1e5cb30" >
-                                            <attribute name="name" value="font" id="3964" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="3965" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="3966" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3963" addr="0x7fca469aab30" >
+                                            <attribute name="name" value="font" id="3964" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="3965" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="3966" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="3967">
-                                        <attributelist id="3968" addr="0x7f99f1e5cbd0" >
-                                            <attribute name="name" value="textColor" id="3969" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="3970" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="3971" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3968" addr="0x7fca469aabd0" >
+                                            <attribute name="name" value="textColor" id="3969" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="3970" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="3971" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="3972">
-                                        <attributelist id="3973" addr="0x7f99f1e5cc70" >
-                                            <attribute name="name" value="disabledColor" id="3974" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="3975" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="3976" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3973" addr="0x7fca469aac70" >
+                                            <attribute name="name" value="disabledColor" id="3974" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="3975" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="3976" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="3977">
-                                        <attributelist id="3978" addr="0x7f99f1e5cd10" >
-                                            <attribute name="name" value="alignment" id="3979" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBFONT_LEFT" id="3980" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="3981" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3978" addr="0x7fca469aad10" >
+                                            <attribute name="name" value="alignment" id="3979" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBFONT_LEFT" id="3980" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="3981" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_2" id="3982" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="3983" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_2" id="3982" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="3983" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="3984" addr="0x7f99f1e5d330" >
-                            <attributelist id="3985" addr="0x7f99f1e5d330" >
-                                <attribute name="name" value="ControlLabel" id="3986" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="3987" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e5b110" id="3988" addr="0x7f99f1e5b110" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e5d7f0" id="3989" addr="0x7f99f1e5d7f0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e5cdd0" id="3990" addr="0x7f99f1e5cdd0" />
-                                <attribute name="sym_name" value="ControlLabel" id="3991" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e5d7f0" id="3992" addr="0x7f99f1e5d7f0" />
-                                <attribute name="defaultargs" value="0x7f99f1e5c130" id="3993" addr="0x7f99f1e5c130" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char)." id="3994" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="3995" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e5c130" id="3996" addr="0x7f99f1e5c130" />
-                                <parmlist id="3997" addr="0x7f99f1e5ce70" >
+                        <constructor id="3984" addr="0x7fca469ab330" >
+                            <attributelist id="3985" addr="0x7fca469ab330" >
+                                <attribute name="name" value="ControlLabel" id="3986" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="3987" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a9110" id="3988" addr="0x7fca469a9110" />
+                                <attribute name="csym_nextSibling" value="0x7fca469ab7f0" id="3989" addr="0x7fca469ab7f0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469aadd0" id="3990" addr="0x7fca469aadd0" />
+                                <attribute name="sym_name" value="ControlLabel" id="3991" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469ab7f0" id="3992" addr="0x7fca469ab7f0" />
+                                <attribute name="defaultargs" value="0x7fca469aa130" id="3993" addr="0x7fca469aa130" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char)." id="3994" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="3995" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469aa130" id="3996" addr="0x7fca469aa130" />
+                                <parmlist id="3997" addr="0x7fca469aae70" >
                                     <parm id="3998">
-                                        <attributelist id="3999" addr="0x7f99f1e5ce70" >
-                                            <attribute name="name" value="x" id="4000" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4001" addr="0x7f99f1de6c90" />
+                                        <attributelist id="3999" addr="0x7fca469aae70" >
+                                            <attribute name="name" value="x" id="4000" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4001" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4002">
-                                        <attributelist id="4003" addr="0x7f99f1e5cf30" >
-                                            <attribute name="name" value="y" id="4004" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4005" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4003" addr="0x7fca469aaf30" >
+                                            <attribute name="name" value="y" id="4004" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4005" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4006">
-                                        <attributelist id="4007" addr="0x7f99f1e5cfb0" >
-                                            <attribute name="name" value="width" id="4008" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4009" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4007" addr="0x7fca469aafb0" >
+                                            <attribute name="name" value="width" id="4008" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4009" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4010">
-                                        <attributelist id="4011" addr="0x7f99f1e5d030" >
-                                            <attribute name="name" value="height" id="4012" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4013" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4011" addr="0x7fca469ab030" >
+                                            <attribute name="name" value="height" id="4012" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4013" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4014">
-                                        <attributelist id="4015" addr="0x7f99f1e5d0b0" >
-                                            <attribute name="name" value="label" id="4016" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4017" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4015" addr="0x7fca469ab0b0" >
+                                            <attribute name="name" value="label" id="4016" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4017" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4018">
-                                        <attributelist id="4019" addr="0x7f99f1e5d130" >
-                                            <attribute name="name" value="font" id="4020" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4021" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4022" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4019" addr="0x7fca469ab130" >
+                                            <attribute name="name" value="font" id="4020" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4021" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4022" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4023">
-                                        <attributelist id="4024" addr="0x7f99f1e5d1d0" >
-                                            <attribute name="name" value="textColor" id="4025" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4026" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4027" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4024" addr="0x7fca469ab1d0" >
+                                            <attribute name="name" value="textColor" id="4025" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4026" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4027" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4028">
-                                        <attributelist id="4029" addr="0x7f99f1e5d270" >
-                                            <attribute name="name" value="disabledColor" id="4030" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4031" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4032" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4029" addr="0x7fca469ab270" >
+                                            <attribute name="name" value="disabledColor" id="4030" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4031" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4032" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_3" id="4033" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="4034" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_3" id="4033" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="4034" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="4035" addr="0x7f99f1e5d7f0" >
-                            <attributelist id="4036" addr="0x7f99f1e5d7f0" >
-                                <attribute name="name" value="ControlLabel" id="4037" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="4038" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e5b110" id="4039" addr="0x7f99f1e5b110" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e5dc10" id="4040" addr="0x7f99f1e5dc10" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e5d330" id="4041" addr="0x7f99f1e5d330" />
-                                <attribute name="sym_name" value="ControlLabel" id="4042" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e5dc10" id="4043" addr="0x7f99f1e5dc10" />
-                                <attribute name="defaultargs" value="0x7f99f1e5c130" id="4044" addr="0x7f99f1e5c130" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char)." id="4045" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="4046" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e5c130" id="4047" addr="0x7f99f1e5c130" />
-                                <parmlist id="4048" addr="0x7f99f1e5d3d0" >
+                        <constructor id="4035" addr="0x7fca469ab7f0" >
+                            <attributelist id="4036" addr="0x7fca469ab7f0" >
+                                <attribute name="name" value="ControlLabel" id="4037" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="4038" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a9110" id="4039" addr="0x7fca469a9110" />
+                                <attribute name="csym_nextSibling" value="0x7fca469abc10" id="4040" addr="0x7fca469abc10" />
+                                <attribute name="sym_previousSibling" value="0x7fca469ab330" id="4041" addr="0x7fca469ab330" />
+                                <attribute name="sym_name" value="ControlLabel" id="4042" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469abc10" id="4043" addr="0x7fca469abc10" />
+                                <attribute name="defaultargs" value="0x7fca469aa130" id="4044" addr="0x7fca469aa130" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char)." id="4045" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="4046" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469aa130" id="4047" addr="0x7fca469aa130" />
+                                <parmlist id="4048" addr="0x7fca469ab3d0" >
                                     <parm id="4049">
-                                        <attributelist id="4050" addr="0x7f99f1e5d3d0" >
-                                            <attribute name="name" value="x" id="4051" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4052" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4050" addr="0x7fca469ab3d0" >
+                                            <attribute name="name" value="x" id="4051" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4052" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4053">
-                                        <attributelist id="4054" addr="0x7f99f1e5d490" >
-                                            <attribute name="name" value="y" id="4055" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4056" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4054" addr="0x7fca469ab490" >
+                                            <attribute name="name" value="y" id="4055" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4056" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4057">
-                                        <attributelist id="4058" addr="0x7f99f1e5d510" >
-                                            <attribute name="name" value="width" id="4059" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4060" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4058" addr="0x7fca469ab510" >
+                                            <attribute name="name" value="width" id="4059" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4060" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4061">
-                                        <attributelist id="4062" addr="0x7f99f1e5d590" >
-                                            <attribute name="name" value="height" id="4063" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4064" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4062" addr="0x7fca469ab590" >
+                                            <attribute name="name" value="height" id="4063" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4064" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4065">
-                                        <attributelist id="4066" addr="0x7f99f1e5d610" >
-                                            <attribute name="name" value="label" id="4067" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4068" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4066" addr="0x7fca469ab610" >
+                                            <attribute name="name" value="label" id="4067" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4068" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4069">
-                                        <attributelist id="4070" addr="0x7f99f1e5d690" >
-                                            <attribute name="name" value="font" id="4071" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4072" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4073" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4070" addr="0x7fca469ab690" >
+                                            <attribute name="name" value="font" id="4071" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4072" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4073" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4074">
-                                        <attributelist id="4075" addr="0x7f99f1e5d730" >
-                                            <attribute name="name" value="textColor" id="4076" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4077" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4078" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4075" addr="0x7fca469ab730" >
+                                            <attribute name="name" value="textColor" id="4076" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4077" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4078" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_4" id="4079" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="4080" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_4" id="4079" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="4080" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="4081" addr="0x7f99f1e5dc10" >
-                            <attributelist id="4082" addr="0x7f99f1e5dc10" >
-                                <attribute name="name" value="ControlLabel" id="4083" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="4084" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e5b110" id="4085" addr="0x7f99f1e5b110" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e5df90" id="4086" addr="0x7f99f1e5df90" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e5d7f0" id="4087" addr="0x7f99f1e5d7f0" />
-                                <attribute name="sym_name" value="ControlLabel" id="4088" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e5df90" id="4089" addr="0x7f99f1e5df90" />
-                                <attribute name="defaultargs" value="0x7f99f1e5c130" id="4090" addr="0x7f99f1e5c130" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char)." id="4091" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="4092" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e5c130" id="4093" addr="0x7f99f1e5c130" />
-                                <parmlist id="4094" addr="0x7f99f1e5d890" >
+                        <constructor id="4081" addr="0x7fca469abc10" >
+                            <attributelist id="4082" addr="0x7fca469abc10" >
+                                <attribute name="name" value="ControlLabel" id="4083" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="4084" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a9110" id="4085" addr="0x7fca469a9110" />
+                                <attribute name="csym_nextSibling" value="0x7fca469abf90" id="4086" addr="0x7fca469abf90" />
+                                <attribute name="sym_previousSibling" value="0x7fca469ab7f0" id="4087" addr="0x7fca469ab7f0" />
+                                <attribute name="sym_name" value="ControlLabel" id="4088" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469abf90" id="4089" addr="0x7fca469abf90" />
+                                <attribute name="defaultargs" value="0x7fca469aa130" id="4090" addr="0x7fca469aa130" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char)." id="4091" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="4092" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469aa130" id="4093" addr="0x7fca469aa130" />
+                                <parmlist id="4094" addr="0x7fca469ab890" >
                                     <parm id="4095">
-                                        <attributelist id="4096" addr="0x7f99f1e5d890" >
-                                            <attribute name="name" value="x" id="4097" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4098" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4096" addr="0x7fca469ab890" >
+                                            <attribute name="name" value="x" id="4097" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4098" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4099">
-                                        <attributelist id="4100" addr="0x7f99f1e5d950" >
-                                            <attribute name="name" value="y" id="4101" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4102" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4100" addr="0x7fca469ab950" >
+                                            <attribute name="name" value="y" id="4101" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4102" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4103">
-                                        <attributelist id="4104" addr="0x7f99f1e5d9d0" >
-                                            <attribute name="name" value="width" id="4105" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4106" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4104" addr="0x7fca469ab9d0" >
+                                            <attribute name="name" value="width" id="4105" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4106" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4107">
-                                        <attributelist id="4108" addr="0x7f99f1e5da50" >
-                                            <attribute name="name" value="height" id="4109" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4110" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4108" addr="0x7fca469aba50" >
+                                            <attribute name="name" value="height" id="4109" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4110" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4111">
-                                        <attributelist id="4112" addr="0x7f99f1e5dad0" >
-                                            <attribute name="name" value="label" id="4113" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4114" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4112" addr="0x7fca469abad0" >
+                                            <attribute name="name" value="label" id="4113" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4114" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4115">
-                                        <attributelist id="4116" addr="0x7f99f1e5db50" >
-                                            <attribute name="name" value="font" id="4117" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4118" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4119" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4116" addr="0x7fca469abb50" >
+                                            <attribute name="name" value="font" id="4117" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4118" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4119" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_5" id="4120" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="4121" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_5" id="4120" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="4121" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="4122" addr="0x7f99f1e5df90" >
-                            <attributelist id="4123" addr="0x7f99f1e5df90" >
-                                <attribute name="name" value="ControlLabel" id="4124" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="4125" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e5b110" id="4126" addr="0x7f99f1e5b110" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e5dc10" id="4127" addr="0x7f99f1e5dc10" />
-                                <attribute name="sym_name" value="ControlLabel" id="4128" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e5c130" id="4129" addr="0x7f99f1e5c130" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String)." id="4130" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="4131" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e5c130" id="4132" addr="0x7f99f1e5c130" />
-                                <parmlist id="4133" addr="0x7f99f1e5dcb0" >
+                        <constructor id="4122" addr="0x7fca469abf90" >
+                            <attributelist id="4123" addr="0x7fca469abf90" >
+                                <attribute name="name" value="ControlLabel" id="4124" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="4125" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a9110" id="4126" addr="0x7fca469a9110" />
+                                <attribute name="sym_previousSibling" value="0x7fca469abc10" id="4127" addr="0x7fca469abc10" />
+                                <attribute name="sym_name" value="ControlLabel" id="4128" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469aa130" id="4129" addr="0x7fca469aa130" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String)." id="4130" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="4131" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469aa130" id="4132" addr="0x7fca469aa130" />
+                                <parmlist id="4133" addr="0x7fca469abcb0" >
                                     <parm id="4134">
-                                        <attributelist id="4135" addr="0x7f99f1e5dcb0" >
-                                            <attribute name="name" value="x" id="4136" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4137" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4135" addr="0x7fca469abcb0" >
+                                            <attribute name="name" value="x" id="4136" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4137" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4138">
-                                        <attributelist id="4139" addr="0x7f99f1e5dd70" >
-                                            <attribute name="name" value="y" id="4140" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4141" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4139" addr="0x7fca469abd70" >
+                                            <attribute name="name" value="y" id="4140" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4141" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4142">
-                                        <attributelist id="4143" addr="0x7f99f1e5ddf0" >
-                                            <attribute name="name" value="width" id="4144" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4145" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4143" addr="0x7fca469abdf0" >
+                                            <attribute name="name" value="width" id="4144" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4145" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4146">
-                                        <attributelist id="4147" addr="0x7f99f1e5de70" >
-                                            <attribute name="name" value="height" id="4148" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4149" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4147" addr="0x7fca469abe70" >
+                                            <attribute name="name" value="height" id="4148" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4149" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4150">
-                                        <attributelist id="4151" addr="0x7f99f1e5def0" >
-                                            <attribute name="name" value="label" id="4152" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4153" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4151" addr="0x7fca469abef0" >
+                                            <attribute name="name" value="label" id="4152" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4153" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_6" id="4154" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="4155" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_6" id="4154" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="4155" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <destructor id="4156" addr="0x7f99f1e5e0f0" >
-                            <attributelist id="4157" addr="0x7f99f1e5e0f0" >
-                                <attribute name="ismember" value="1" id="4158" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="~ControlLabel" id="4159" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="~ControlLabel" id="4160" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="4161" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="4162" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e5b110" id="4163" addr="0x7f99f1e5b110" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4164" addr="0x7f99f1de6c90" />
+                        <destructor id="4156" addr="0x7fca469ac0f0" >
+                            <attributelist id="4157" addr="0x7fca469ac0f0" >
+                                <attribute name="ismember" value="1" id="4158" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="~ControlLabel" id="4159" addr="0x7fca46934c90" />
+                                <attribute name="name" value="~ControlLabel" id="4160" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="4161" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="4162" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a9110" id="4163" addr="0x7fca469a9110" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4164" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </destructor >
-                        <cdecl id="4165" addr="0x7f99f1e5e2b0" >
-                            <attributelist id="4166" addr="0x7f99f1e5e2b0" >
-                                <attribute name="name" value="getLabel" id="4167" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="4168" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e5b110" id="4169" addr="0x7f99f1e5b110" />
-                                <attribute name="kind" value="function" id="4170" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getLabel" id="4171" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="4172" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="4173" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="XBMCAddon::String" id="4174" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4175" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="4176" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4177" addr="0x7f99f1e5eff0" >
-                            <attributelist id="4178" addr="0x7f99f1e5eff0" >
-                                <attribute name="name" value="setLabel" id="4179" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="4180" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e5b110" id="4181" addr="0x7f99f1e5b110" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e5f4f0" id="4182" addr="0x7f99f1e5f4f0" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e5f4f0" id="4183" addr="0x7f99f1e5f4f0" />
-                                <attribute name="kind" value="function" id="4184" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setLabel" id="4185" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,r.q(const).XBMCAddon::String)." id="4186" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="4187" addr="0x7f99f1de6c90" />
-                                <parmlist id="4188" addr="0x7f99f1e5e570" >
+                        <cdecl id="4165" addr="0x7fca469ac2b0" >
+                            <attributelist id="4166" addr="0x7fca469ac2b0" >
+                                <attribute name="name" value="getLabel" id="4167" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="4168" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a9110" id="4169" addr="0x7fca469a9110" />
+                                <attribute name="kind" value="function" id="4170" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getLabel" id="4171" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="4172" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="4173" addr="0x7fca46934c90" />
+                                <attribute name="type" value="XBMCAddon::String" id="4174" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4175" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="4176" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4177" addr="0x7fca469acff0" >
+                            <attributelist id="4178" addr="0x7fca469acff0" >
+                                <attribute name="name" value="setLabel" id="4179" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="4180" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a9110" id="4181" addr="0x7fca469a9110" />
+                                <attribute name="sym_nextSibling" value="0x7fca469ad4f0" id="4182" addr="0x7fca469ad4f0" />
+                                <attribute name="csym_nextSibling" value="0x7fca469ad4f0" id="4183" addr="0x7fca469ad4f0" />
+                                <attribute name="kind" value="function" id="4184" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setLabel" id="4185" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,r.q(const).XBMCAddon::String)." id="4186" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="4187" addr="0x7fca46934c90" />
+                                <parmlist id="4188" addr="0x7fca469ac570" >
                                     <parm id="4189">
-                                        <attributelist id="4190" addr="0x7f99f1e5e570" >
-                                            <attribute name="name" value="label" id="4191" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="4192" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4193" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4190" addr="0x7fca469ac570" >
+                                            <attribute name="name" value="label" id="4191" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="4192" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4193" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4194">
-                                        <attributelist id="4195" addr="0x7f99f1e5e710" >
-                                            <attribute name="name" value="font" id="4196" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4197" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4198" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4195" addr="0x7fca469ac710" >
+                                            <attribute name="name" value="font" id="4196" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4197" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4198" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4199">
-                                        <attributelist id="4200" addr="0x7f99f1e5e8b0" >
-                                            <attribute name="name" value="textColor" id="4201" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4202" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4203" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4200" addr="0x7fca469ac8b0" >
+                                            <attribute name="name" value="textColor" id="4201" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4202" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4203" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4204">
-                                        <attributelist id="4205" addr="0x7f99f1e5ea50" >
-                                            <attribute name="name" value="disabledColor" id="4206" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4207" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4208" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4205" addr="0x7fca469aca50" >
+                                            <attribute name="name" value="disabledColor" id="4206" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4207" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4208" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4209">
-                                        <attributelist id="4210" addr="0x7f99f1e5ebf0" >
-                                            <attribute name="name" value="shadowColor" id="4211" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4212" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4213" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4210" addr="0x7fca469acbf0" >
+                                            <attribute name="name" value="shadowColor" id="4211" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4212" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4213" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4214">
-                                        <attributelist id="4215" addr="0x7f99f1e5ed90" >
-                                            <attribute name="name" value="focusedColor" id="4216" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4217" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4218" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4215" addr="0x7fca469acd90" >
+                                            <attribute name="name" value="focusedColor" id="4216" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4217" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4218" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4219">
-                                        <attributelist id="4220" addr="0x7f99f1e5ef30" >
-                                            <attribute name="name" value="label2" id="4221" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="4222" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4223" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                    </parm >
-                                </parmlist >
-                                <attribute name="sym_overloaded" value="0x7f99f1e5eff0" id="4224" addr="0x7f99f1e5eff0" />
-                                <attribute name="type" value="void" id="4225" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="4226" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="4227" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4228" addr="0x7f99f1e5f4f0" >
-                            <attributelist id="4229" addr="0x7f99f1e5f4f0" >
-                                <attribute name="name" value="setLabel" id="4230" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="4231" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e5b110" id="4232" addr="0x7f99f1e5b110" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e5eff0" id="4233" addr="0x7f99f1e5eff0" />
-                                <attribute name="kind" value="function" id="4234" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setLabel" id="4235" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e5f950" id="4236" addr="0x7f99f1e5f950" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e5f950" id="4237" addr="0x7f99f1e5f950" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char)." id="4238" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e5eff0" id="4239" addr="0x7f99f1e5eff0" />
-                                <attribute name="access" value="public" id="4240" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e5eff0" id="4241" addr="0x7f99f1e5eff0" />
-                                <parmlist id="4242" addr="0x7f99f1e5f0b0" >
+                                        <attributelist id="4220" addr="0x7fca469acf30" >
+                                            <attribute name="name" value="label2" id="4221" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="4222" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4223" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                    </parm >
+                                </parmlist >
+                                <attribute name="sym_overloaded" value="0x7fca469acff0" id="4224" addr="0x7fca469acff0" />
+                                <attribute name="type" value="void" id="4225" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4226" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="4227" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4228" addr="0x7fca469ad4f0" >
+                            <attributelist id="4229" addr="0x7fca469ad4f0" >
+                                <attribute name="name" value="setLabel" id="4230" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="4231" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a9110" id="4232" addr="0x7fca469a9110" />
+                                <attribute name="sym_previousSibling" value="0x7fca469acff0" id="4233" addr="0x7fca469acff0" />
+                                <attribute name="kind" value="function" id="4234" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setLabel" id="4235" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469ad950" id="4236" addr="0x7fca469ad950" />
+                                <attribute name="sym_nextSibling" value="0x7fca469ad950" id="4237" addr="0x7fca469ad950" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char)." id="4238" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469acff0" id="4239" addr="0x7fca469acff0" />
+                                <attribute name="access" value="public" id="4240" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469acff0" id="4241" addr="0x7fca469acff0" />
+                                <parmlist id="4242" addr="0x7fca469ad0b0" >
                                     <parm id="4243">
-                                        <attributelist id="4244" addr="0x7f99f1e5f0b0" >
-                                            <attribute name="name" value="label" id="4245" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="4246" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4247" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4244" addr="0x7fca469ad0b0" >
+                                            <attribute name="name" value="label" id="4245" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="4246" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4247" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4248">
-                                        <attributelist id="4249" addr="0x7f99f1e5f1b0" >
-                                            <attribute name="name" value="font" id="4250" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4251" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4252" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4249" addr="0x7fca469ad1b0" >
+                                            <attribute name="name" value="font" id="4250" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4251" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4252" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4253">
-                                        <attributelist id="4254" addr="0x7f99f1e5f250" >
-                                            <attribute name="name" value="textColor" id="4255" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4256" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4257" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4254" addr="0x7fca469ad250" >
+                                            <attribute name="name" value="textColor" id="4255" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4256" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4257" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4258">
-                                        <attributelist id="4259" addr="0x7f99f1e5f2f0" >
-                                            <attribute name="name" value="disabledColor" id="4260" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4261" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4262" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4259" addr="0x7fca469ad2f0" >
+                                            <attribute name="name" value="disabledColor" id="4260" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4261" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4262" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4263">
-                                        <attributelist id="4264" addr="0x7f99f1e5f390" >
-                                            <attribute name="name" value="shadowColor" id="4265" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4266" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4267" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4264" addr="0x7fca469ad390" >
+                                            <attribute name="name" value="shadowColor" id="4265" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4266" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4267" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4268">
-                                        <attributelist id="4269" addr="0x7f99f1e5f430" >
-                                            <attribute name="name" value="focusedColor" id="4270" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4271" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4272" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                    </parm >
-                                </parmlist >
-                                <attribute name="type" value="void" id="4273" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="4274" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="4275" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4276" addr="0x7f99f1e5f950" >
-                            <attributelist id="4277" addr="0x7f99f1e5f950" >
-                                <attribute name="name" value="setLabel" id="4278" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="4279" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e5b110" id="4280" addr="0x7f99f1e5b110" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e5f4f0" id="4281" addr="0x7f99f1e5f4f0" />
-                                <attribute name="kind" value="function" id="4282" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setLabel" id="4283" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e5fd10" id="4284" addr="0x7f99f1e5fd10" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e5fd10" id="4285" addr="0x7f99f1e5fd10" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char)." id="4286" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e5eff0" id="4287" addr="0x7f99f1e5eff0" />
-                                <attribute name="access" value="public" id="4288" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e5eff0" id="4289" addr="0x7f99f1e5eff0" />
-                                <parmlist id="4290" addr="0x7f99f1e5f5b0" >
+                                        <attributelist id="4269" addr="0x7fca469ad430" >
+                                            <attribute name="name" value="focusedColor" id="4270" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4271" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4272" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                    </parm >
+                                </parmlist >
+                                <attribute name="type" value="void" id="4273" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="4274" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="4275" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4276" addr="0x7fca469ad950" >
+                            <attributelist id="4277" addr="0x7fca469ad950" >
+                                <attribute name="name" value="setLabel" id="4278" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="4279" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a9110" id="4280" addr="0x7fca469a9110" />
+                                <attribute name="sym_previousSibling" value="0x7fca469ad4f0" id="4281" addr="0x7fca469ad4f0" />
+                                <attribute name="kind" value="function" id="4282" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setLabel" id="4283" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469add10" id="4284" addr="0x7fca469add10" />
+                                <attribute name="sym_nextSibling" value="0x7fca469add10" id="4285" addr="0x7fca469add10" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char)." id="4286" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469acff0" id="4287" addr="0x7fca469acff0" />
+                                <attribute name="access" value="public" id="4288" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469acff0" id="4289" addr="0x7fca469acff0" />
+                                <parmlist id="4290" addr="0x7fca469ad5b0" >
                                     <parm id="4291">
-                                        <attributelist id="4292" addr="0x7f99f1e5f5b0" >
-                                            <attribute name="name" value="label" id="4293" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="4294" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4295" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4292" addr="0x7fca469ad5b0" >
+                                            <attribute name="name" value="label" id="4293" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="4294" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4295" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4296">
-                                        <attributelist id="4297" addr="0x7f99f1e5f6b0" >
-                                            <attribute name="name" value="font" id="4298" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4299" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4300" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4297" addr="0x7fca469ad6b0" >
+                                            <attribute name="name" value="font" id="4298" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4299" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4300" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4301">
-                                        <attributelist id="4302" addr="0x7f99f1e5f750" >
-                                            <attribute name="name" value="textColor" id="4303" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4304" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4305" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4302" addr="0x7fca469ad750" >
+                                            <attribute name="name" value="textColor" id="4303" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4304" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4305" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4306">
-                                        <attributelist id="4307" addr="0x7f99f1e5f7f0" >
-                                            <attribute name="name" value="disabledColor" id="4308" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4309" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4310" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4307" addr="0x7fca469ad7f0" >
+                                            <attribute name="name" value="disabledColor" id="4308" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4309" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4310" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4311">
-                                        <attributelist id="4312" addr="0x7f99f1e5f890" >
-                                            <attribute name="name" value="shadowColor" id="4313" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4314" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4315" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                    </parm >
-                                </parmlist >
-                                <attribute name="type" value="void" id="4316" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_2" id="4317" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="4318" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4319" addr="0x7f99f1e5fd10" >
-                            <attributelist id="4320" addr="0x7f99f1e5fd10" >
-                                <attribute name="name" value="setLabel" id="4321" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="4322" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e5b110" id="4323" addr="0x7f99f1e5b110" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e5f950" id="4324" addr="0x7f99f1e5f950" />
-                                <attribute name="kind" value="function" id="4325" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setLabel" id="4326" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e60030" id="4327" addr="0x7f99f1e60030" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e60030" id="4328" addr="0x7f99f1e60030" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char,p.q(const).char)." id="4329" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e5eff0" id="4330" addr="0x7f99f1e5eff0" />
-                                <attribute name="access" value="public" id="4331" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e5eff0" id="4332" addr="0x7f99f1e5eff0" />
-                                <parmlist id="4333" addr="0x7f99f1e5fa10" >
+                                        <attributelist id="4312" addr="0x7fca469ad890" >
+                                            <attribute name="name" value="shadowColor" id="4313" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4314" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4315" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                    </parm >
+                                </parmlist >
+                                <attribute name="type" value="void" id="4316" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_2" id="4317" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="4318" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4319" addr="0x7fca469add10" >
+                            <attributelist id="4320" addr="0x7fca469add10" >
+                                <attribute name="name" value="setLabel" id="4321" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="4322" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a9110" id="4323" addr="0x7fca469a9110" />
+                                <attribute name="sym_previousSibling" value="0x7fca469ad950" id="4324" addr="0x7fca469ad950" />
+                                <attribute name="kind" value="function" id="4325" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setLabel" id="4326" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469ae030" id="4327" addr="0x7fca469ae030" />
+                                <attribute name="sym_nextSibling" value="0x7fca469ae030" id="4328" addr="0x7fca469ae030" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char,p.q(const).char)." id="4329" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469acff0" id="4330" addr="0x7fca469acff0" />
+                                <attribute name="access" value="public" id="4331" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469acff0" id="4332" addr="0x7fca469acff0" />
+                                <parmlist id="4333" addr="0x7fca469ada10" >
                                     <parm id="4334">
-                                        <attributelist id="4335" addr="0x7f99f1e5fa10" >
-                                            <attribute name="name" value="label" id="4336" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="4337" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4338" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4335" addr="0x7fca469ada10" >
+                                            <attribute name="name" value="label" id="4336" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="4337" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4338" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4339">
-                                        <attributelist id="4340" addr="0x7f99f1e5fb10" >
-                                            <attribute name="name" value="font" id="4341" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4342" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4343" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4340" addr="0x7fca469adb10" >
+                                            <attribute name="name" value="font" id="4341" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4342" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4343" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4344">
-                                        <attributelist id="4345" addr="0x7f99f1e5fbb0" >
-                                            <attribute name="name" value="textColor" id="4346" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4347" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4348" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4345" addr="0x7fca469adbb0" >
+                                            <attribute name="name" value="textColor" id="4346" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4347" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4348" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4349">
-                                        <attributelist id="4350" addr="0x7f99f1e5fc50" >
-                                            <attribute name="name" value="disabledColor" id="4351" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4352" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4353" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                    </parm >
-                                </parmlist >
-                                <attribute name="type" value="void" id="4354" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_3" id="4355" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="4356" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4357" addr="0x7f99f1e60030" >
-                            <attributelist id="4358" addr="0x7f99f1e60030" >
-                                <attribute name="name" value="setLabel" id="4359" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="4360" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e5b110" id="4361" addr="0x7f99f1e5b110" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e5fd10" id="4362" addr="0x7f99f1e5fd10" />
-                                <attribute name="kind" value="function" id="4363" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setLabel" id="4364" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e602b0" id="4365" addr="0x7f99f1e602b0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e602b0" id="4366" addr="0x7f99f1e602b0" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char)." id="4367" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e5eff0" id="4368" addr="0x7f99f1e5eff0" />
-                                <attribute name="access" value="public" id="4369" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e5eff0" id="4370" addr="0x7f99f1e5eff0" />
-                                <parmlist id="4371" addr="0x7f99f1e5fdd0" >
+                                        <attributelist id="4350" addr="0x7fca469adc50" >
+                                            <attribute name="name" value="disabledColor" id="4351" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4352" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4353" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                    </parm >
+                                </parmlist >
+                                <attribute name="type" value="void" id="4354" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_3" id="4355" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="4356" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4357" addr="0x7fca469ae030" >
+                            <attributelist id="4358" addr="0x7fca469ae030" >
+                                <attribute name="name" value="setLabel" id="4359" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="4360" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a9110" id="4361" addr="0x7fca469a9110" />
+                                <attribute name="sym_previousSibling" value="0x7fca469add10" id="4362" addr="0x7fca469add10" />
+                                <attribute name="kind" value="function" id="4363" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setLabel" id="4364" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469ae2b0" id="4365" addr="0x7fca469ae2b0" />
+                                <attribute name="sym_nextSibling" value="0x7fca469ae2b0" id="4366" addr="0x7fca469ae2b0" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char)." id="4367" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469acff0" id="4368" addr="0x7fca469acff0" />
+                                <attribute name="access" value="public" id="4369" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469acff0" id="4370" addr="0x7fca469acff0" />
+                                <parmlist id="4371" addr="0x7fca469addd0" >
                                     <parm id="4372">
-                                        <attributelist id="4373" addr="0x7f99f1e5fdd0" >
-                                            <attribute name="name" value="label" id="4374" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="4375" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4376" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4373" addr="0x7fca469addd0" >
+                                            <attribute name="name" value="label" id="4374" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="4375" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4376" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4377">
-                                        <attributelist id="4378" addr="0x7f99f1e5fed0" >
-                                            <attribute name="name" value="font" id="4379" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4380" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4381" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4378" addr="0x7fca469aded0" >
+                                            <attribute name="name" value="font" id="4379" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4380" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4381" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4382">
-                                        <attributelist id="4383" addr="0x7f99f1e5ff70" >
-                                            <attribute name="name" value="textColor" id="4384" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4385" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4386" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                    </parm >
-                                </parmlist >
-                                <attribute name="type" value="void" id="4387" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_4" id="4388" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="4389" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4390" addr="0x7f99f1e602b0" >
-                            <attributelist id="4391" addr="0x7f99f1e602b0" >
-                                <attribute name="name" value="setLabel" id="4392" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="4393" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e5b110" id="4394" addr="0x7f99f1e5b110" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e60030" id="4395" addr="0x7f99f1e60030" />
-                                <attribute name="kind" value="function" id="4396" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setLabel" id="4397" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e60490" id="4398" addr="0x7f99f1e60490" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e60490" id="4399" addr="0x7f99f1e60490" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char)." id="4400" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e5eff0" id="4401" addr="0x7f99f1e5eff0" />
-                                <attribute name="access" value="public" id="4402" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e5eff0" id="4403" addr="0x7f99f1e5eff0" />
-                                <parmlist id="4404" addr="0x7f99f1e600f0" >
+                                        <attributelist id="4383" addr="0x7fca469adf70" >
+                                            <attribute name="name" value="textColor" id="4384" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4385" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4386" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                    </parm >
+                                </parmlist >
+                                <attribute name="type" value="void" id="4387" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_4" id="4388" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="4389" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4390" addr="0x7fca469ae2b0" >
+                            <attributelist id="4391" addr="0x7fca469ae2b0" >
+                                <attribute name="name" value="setLabel" id="4392" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="4393" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a9110" id="4394" addr="0x7fca469a9110" />
+                                <attribute name="sym_previousSibling" value="0x7fca469ae030" id="4395" addr="0x7fca469ae030" />
+                                <attribute name="kind" value="function" id="4396" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setLabel" id="4397" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469ae490" id="4398" addr="0x7fca469ae490" />
+                                <attribute name="sym_nextSibling" value="0x7fca469ae490" id="4399" addr="0x7fca469ae490" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char)." id="4400" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469acff0" id="4401" addr="0x7fca469acff0" />
+                                <attribute name="access" value="public" id="4402" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469acff0" id="4403" addr="0x7fca469acff0" />
+                                <parmlist id="4404" addr="0x7fca469ae0f0" >
                                     <parm id="4405">
-                                        <attributelist id="4406" addr="0x7f99f1e600f0" >
-                                            <attribute name="name" value="label" id="4407" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="4408" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4409" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4406" addr="0x7fca469ae0f0" >
+                                            <attribute name="name" value="label" id="4407" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="4408" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4409" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4410">
-                                        <attributelist id="4411" addr="0x7f99f1e601f0" >
-                                            <attribute name="name" value="font" id="4412" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4413" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4414" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                    </parm >
-                                </parmlist >
-                                <attribute name="type" value="void" id="4415" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_5" id="4416" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="4417" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="4418" addr="0x7f99f1e60490" >
-                            <attributelist id="4419" addr="0x7f99f1e60490" >
-                                <attribute name="name" value="setLabel" id="4420" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="4421" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e5b110" id="4422" addr="0x7f99f1e5b110" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e602b0" id="4423" addr="0x7f99f1e602b0" />
-                                <attribute name="kind" value="function" id="4424" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setLabel" id="4425" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e605b0" id="4426" addr="0x7f99f1e605b0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e605b0" id="4427" addr="0x7f99f1e605b0" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="4428" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e5eff0" id="4429" addr="0x7f99f1e5eff0" />
-                                <attribute name="access" value="public" id="4430" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e5eff0" id="4431" addr="0x7f99f1e5eff0" />
-                                <parmlist id="4432" addr="0x7f99f1e60370" >
+                                        <attributelist id="4411" addr="0x7fca469ae1f0" >
+                                            <attribute name="name" value="font" id="4412" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4413" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4414" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                    </parm >
+                                </parmlist >
+                                <attribute name="type" value="void" id="4415" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_5" id="4416" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="4417" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="4418" addr="0x7fca469ae490" >
+                            <attributelist id="4419" addr="0x7fca469ae490" >
+                                <attribute name="name" value="setLabel" id="4420" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="4421" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a9110" id="4422" addr="0x7fca469a9110" />
+                                <attribute name="sym_previousSibling" value="0x7fca469ae2b0" id="4423" addr="0x7fca469ae2b0" />
+                                <attribute name="kind" value="function" id="4424" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setLabel" id="4425" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469ae5b0" id="4426" addr="0x7fca469ae5b0" />
+                                <attribute name="sym_nextSibling" value="0x7fca469ae5b0" id="4427" addr="0x7fca469ae5b0" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="4428" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469acff0" id="4429" addr="0x7fca469acff0" />
+                                <attribute name="access" value="public" id="4430" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469acff0" id="4431" addr="0x7fca469acff0" />
+                                <parmlist id="4432" addr="0x7fca469ae370" >
                                     <parm id="4433">
-                                        <attributelist id="4434" addr="0x7f99f1e60370" >
-                                            <attribute name="name" value="label" id="4435" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="4436" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4437" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4434" addr="0x7fca469ae370" >
+                                            <attribute name="name" value="label" id="4435" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="4436" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4437" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="4438" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_6" id="4439" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="4440" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="4438" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_6" id="4439" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="4440" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="4441" addr="0x7f99f1e605b0" >
-                            <attributelist id="4442" addr="0x7f99f1e605b0" >
-                                <attribute name="name" value="setLabel" id="4443" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="4444" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e5b110" id="4445" addr="0x7f99f1e5b110" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e60490" id="4446" addr="0x7f99f1e60490" />
-                                <attribute name="kind" value="function" id="4447" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setLabel" id="4448" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e5eff0" id="4449" addr="0x7f99f1e5eff0" />
-                                <attribute name="decl" value="f()." id="4450" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="4451" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e5eff0" id="4452" addr="0x7f99f1e5eff0" />
-                                <attribute name="type" value="void" id="4453" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_7" id="4454" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="4455" addr="0x7f99f1de6c90" />
+                        <cdecl id="4441" addr="0x7fca469ae5b0" >
+                            <attributelist id="4442" addr="0x7fca469ae5b0" >
+                                <attribute name="name" value="setLabel" id="4443" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="4444" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469a9110" id="4445" addr="0x7fca469a9110" />
+                                <attribute name="sym_previousSibling" value="0x7fca469ae490" id="4446" addr="0x7fca469ae490" />
+                                <attribute name="kind" value="function" id="4447" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setLabel" id="4448" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469acff0" id="4449" addr="0x7fca469acff0" />
+                                <attribute name="decl" value="f()." id="4450" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="4451" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469acff0" id="4452" addr="0x7fca469acff0" />
+                                <attribute name="type" value="void" id="4453" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_7" id="4454" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="4455" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
                     </class >
-                    <class id="4456" addr="0x7f99f1e608b0" >
-                        <attributelist id="4457" addr="0x7f99f1e608b0" >
-                            <attribute name="name" value="XBMCAddon::xbmcgui::ControlEdit" id="4458" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="4459" addr="0x7f99f1e40fb0" />
-                            <attribute name="symtab" value="0x7f99f1e609f0" id="4460" addr="0x7f99f1e609f0" />
-                            <attribute name="allows_typedef" value="1" id="4461" addr="0x7f99f1de6c90" />
-                            <attribute name="typepass_visit" value="1" id="4462" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_visit" value="1" id="4463" addr="0x7f99f1de6c90" />
-                            <attribute name="kind" value="class" id="4464" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_name" value="ControlEdit" id="4465" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_has_constructor" value="1" id="4466" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_public_constructor" value="1" id="4467" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_copy_constructor" value="1" id="4468" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_default_destructor" value="1" id="4469" addr="0x7f99f1de6c90" />
-                            <attribute name="privatebaselist" value="0x7f99f1e60890" id="4470" addr="0x7f99f1e60890" />
-                            <attribute name="protectedbaselist" value="0x7f99f1e60870" id="4471" addr="0x7f99f1e60870" />
-                            <baselist id="4472" addr="0x7f99f1e60850" >
-                                <base name="Control" id="4473" addr="0x7f99f1e607d0" />
+                    <class id="4456" addr="0x7fca469ae8b0" >
+                        <attributelist id="4457" addr="0x7fca469ae8b0" >
+                            <attribute name="name" value="XBMCAddon::xbmcgui::ControlEdit" id="4458" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="4459" addr="0x7fca4698efb0" />
+                            <attribute name="symtab" value="0x7fca469ae9f0" id="4460" addr="0x7fca469ae9f0" />
+                            <attribute name="allows_typedef" value="1" id="4461" addr="0x7fca46934c90" />
+                            <attribute name="typepass_visit" value="1" id="4462" addr="0x7fca46934c90" />
+                            <attribute name="allocate_visit" value="1" id="4463" addr="0x7fca46934c90" />
+                            <attribute name="kind" value="class" id="4464" addr="0x7fca46934c90" />
+                            <attribute name="sym_name" value="ControlEdit" id="4465" addr="0x7fca46934c90" />
+                            <attribute name="allocate_has_constructor" value="1" id="4466" addr="0x7fca46934c90" />
+                            <attribute name="allocate_public_constructor" value="1" id="4467" addr="0x7fca46934c90" />
+                            <attribute name="allocate_copy_constructor" value="1" id="4468" addr="0x7fca46934c90" />
+                            <attribute name="allocate_default_destructor" value="1" id="4469" addr="0x7fca46934c90" />
+                            <attribute name="privatebaselist" value="0x7fca469ae890" id="4470" addr="0x7fca469ae890" />
+                            <attribute name="protectedbaselist" value="0x7fca469ae870" id="4471" addr="0x7fca469ae870" />
+                            <baselist id="4472" addr="0x7fca469ae850" >
+                                <base name="Control" id="4473" addr="0x7fca469ae7d0" />
                             </baselist >
-                            <attribute name="module" value="xbmcgui" id="4474" addr="0x7f99f1e402f0" />
-                            <attribute name="bases" value="0x7f99f1dd8c70" id="4475" addr="0x7f99f1dd8c70" />
-                            <attribute name="allbases" value="0x7f99f1dd8f10" id="4476" addr="0x7f99f1dd8f10" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="4477" addr="0x7f99f1de6c90" />
-                            <typescope id="4478" addr="0x7f99f1dd8bf0" >
-                                <attributelist id="4479" addr="0x7f99f1dd8bf0" >
-                                    <attribute name="inherit" value="0x7f99f1dd8cf0" id="4480" addr="0x7f99f1dd8cf0" />
-                                    <attribute name="name" value="ControlEdit" id="4481" addr="0x7f99f1de6c90" />
-                                    <typetab id="4482" addr="0x7f99f1dd8c10" >
-                                        <attributelist id="4483" addr="0x7f99f1dd8c10" >
+                            <attribute name="module" value="xbmcgui" id="4474" addr="0x7fca4698e2f0" />
+                            <attribute name="bases" value="0x7fca46926c70" id="4475" addr="0x7fca46926c70" />
+                            <attribute name="allbases" value="0x7fca46926f10" id="4476" addr="0x7fca46926f10" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="4477" addr="0x7fca46934c90" />
+                            <typescope id="4478" addr="0x7fca46926bf0" >
+                                <attributelist id="4479" addr="0x7fca46926bf0" >
+                                    <attribute name="inherit" value="0x7fca46926cf0" id="4480" addr="0x7fca46926cf0" />
+                                    <attribute name="name" value="ControlEdit" id="4481" addr="0x7fca46934c90" />
+                                    <typetab id="4482" addr="0x7fca46926c10" >
+                                        <attributelist id="4483" addr="0x7fca46926c10" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f99f1dd2150" id="4484" addr="0x7f99f1dd2150" />
-                                    <attribute name="qname" value="XBMCAddon::xbmcgui::ControlEdit" id="4485" addr="0x7f99f1de6c90" />
-                                    <attribute name="symtab" value="0x7f99f1e609f0" id="4486" addr="0x7f99f1e609f0" />
+                                    <attribute name="parent" value="0x7fca46920150" id="4484" addr="0x7fca46920150" />
+                                    <attribute name="qname" value="XBMCAddon::xbmcgui::ControlEdit" id="4485" addr="0x7fca46934c90" />
+                                    <attribute name="symtab" value="0x7fca469ae9f0" id="4486" addr="0x7fca469ae9f0" />
                                 </attributelist >
-                                <typescopesitem id="4487" addr="0x7f99f1dd8cf0" >
-                                    <attributelist id="4488" addr="0x7f99f1dd8cf0" >
+                                <typescopesitem id="4487" addr="0x7fca46926cf0" >
+                                    <attributelist id="4488" addr="0x7fca46926cf0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="4489" addr="0x7f99f1dd8b90" >
-                                    <attributelist id="4490" addr="0x7f99f1dd8b90" >
+                                <typescopesitem id="4489" addr="0x7fca46926b90" >
+                                    <attributelist id="4490" addr="0x7fca46926b90" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="4491" addr="0x7f99f1dd8c10" >
-                                    <attributelist id="4492" addr="0x7f99f1dd8c10" >
+                                <typescopesitem id="4491" addr="0x7fca46926c10" >
+                                    <attributelist id="4492" addr="0x7fca46926c10" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="4493" addr="0x7f99f1dd2150" >
-                                    <attributelist id="4494" addr="0x7f99f1dd2150" >
-                                        <attribute name="name" value="xbmcgui" id="4495" addr="0x7f99f1de6c90" />
-                                        <typetab id="4496" addr="0x7f99f1dd2170" >
-                                            <attributelist id="4497" addr="0x7f99f1dd2170" >
-                                                <attribute name="InterceptorBase" value="InterceptorBase" id="4498" addr="0x7f99f1de6c90" />
-                                                <attribute name="Dialog" value="Dialog" id="4499" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="4500" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="4501" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlTextBox" value="ControlTextBox" id="4502" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="4503" addr="0x7f99f1de6c90" />
-                                                <attribute name="Window" value="Window" id="4504" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="4505" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlList" value="ControlList" id="4506" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="4507" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlImage" value="ControlImage" id="4508" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlButton" value="ControlButton" id="4509" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlGroup" value="ControlGroup" id="4510" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogBusy" value="DialogBusy" id="4511" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="4512" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSpin" value="ControlSpin" id="4513" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlEdit" value="ControlEdit" id="4514" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="4515" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="4516" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlLabel" value="ControlLabel" id="4517" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlProgress" value="ControlProgress" id="4518" addr="0x7f99f1de6c90" />
-                                                <attribute name="Control" value="Control" id="4519" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSlider" value="ControlSlider" id="4520" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgress" value="DialogProgress" id="4521" addr="0x7f99f1de6c90" />
-                                                <attribute name="Action" value="Action" id="4522" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowDialog" value="WindowDialog" id="4523" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXML" value="WindowXML" id="4524" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItem" value="ListItem" id="4525" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="4526" addr="0x7f99f1de6c90" />
+                                <typescopesitem id="4493" addr="0x7fca46920150" >
+                                    <attributelist id="4494" addr="0x7fca46920150" >
+                                        <attribute name="name" value="xbmcgui" id="4495" addr="0x7fca46934c90" />
+                                        <typetab id="4496" addr="0x7fca46920170" >
+                                            <attributelist id="4497" addr="0x7fca46920170" >
+                                                <attribute name="InterceptorBase" value="InterceptorBase" id="4498" addr="0x7fca46934c90" />
+                                                <attribute name="Dialog" value="Dialog" id="4499" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="4500" addr="0x7fca46934c90" />
+                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="4501" addr="0x7fca46934c90" />
+                                                <attribute name="ControlTextBox" value="ControlTextBox" id="4502" addr="0x7fca46934c90" />
+                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="4503" addr="0x7fca46934c90" />
+                                                <attribute name="Window" value="Window" id="4504" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="4505" addr="0x7fca46934c90" />
+                                                <attribute name="ControlList" value="ControlList" id="4506" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="4507" addr="0x7fca46934c90" />
+                                                <attribute name="ControlImage" value="ControlImage" id="4508" addr="0x7fca46934c90" />
+                                                <attribute name="ControlButton" value="ControlButton" id="4509" addr="0x7fca46934c90" />
+                                                <attribute name="ControlGroup" value="ControlGroup" id="4510" addr="0x7fca46934c90" />
+                                                <attribute name="DialogBusy" value="DialogBusy" id="4511" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="4512" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSpin" value="ControlSpin" id="4513" addr="0x7fca46934c90" />
+                                                <attribute name="ControlEdit" value="ControlEdit" id="4514" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="4515" addr="0x7fca46934c90" />
+                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="4516" addr="0x7fca46934c90" />
+                                                <attribute name="ControlLabel" value="ControlLabel" id="4517" addr="0x7fca46934c90" />
+                                                <attribute name="ControlProgress" value="ControlProgress" id="4518" addr="0x7fca46934c90" />
+                                                <attribute name="Control" value="Control" id="4519" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSlider" value="ControlSlider" id="4520" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgress" value="DialogProgress" id="4521" addr="0x7fca46934c90" />
+                                                <attribute name="Action" value="Action" id="4522" addr="0x7fca46934c90" />
+                                                <attribute name="WindowDialog" value="WindowDialog" id="4523" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXML" value="WindowXML" id="4524" addr="0x7fca46934c90" />
+                                                <attribute name="ListItem" value="ListItem" id="4525" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="4526" addr="0x7fca46934c90" />
                                             </attributelist >
-                                            <typetabsitem id="4527" addr="0x7f99f1de1dd0" >
-                                                <attributelist id="4528" addr="0x7f99f1de1dd0" >
+                                            <typetabsitem id="4527" addr="0x7fca4692fdd0" >
+                                                <attributelist id="4528" addr="0x7fca4692fdd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4529" addr="0x7f99f1dde790" >
-                                                <attributelist id="4530" addr="0x7f99f1dde790" >
+                                            <typetabsitem id="4529" addr="0x7fca4692c790" >
+                                                <attributelist id="4530" addr="0x7fca4692c790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4531" addr="0x7f99f1de3f10" >
-                                                <attributelist id="4532" addr="0x7f99f1de3f10" >
+                                            <typetabsitem id="4531" addr="0x7fca46931f10" >
+                                                <attributelist id="4532" addr="0x7fca46931f10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4533" addr="0x7f99f1dd67b0" >
-                                                <attributelist id="4534" addr="0x7f99f1dd67b0" >
+                                            <typetabsitem id="4533" addr="0x7fca469247b0" >
+                                                <attributelist id="4534" addr="0x7fca469247b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4535" addr="0x7f99f1ddafd0" >
-                                                <attributelist id="4536" addr="0x7f99f1ddafd0" >
+                                            <typetabsitem id="4535" addr="0x7fca46928fd0" >
+                                                <attributelist id="4536" addr="0x7fca46928fd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4537" addr="0x7f99f1ddd430" >
-                                                <attributelist id="4538" addr="0x7f99f1ddd430" >
+                                            <typetabsitem id="4537" addr="0x7fca4692b430" >
+                                                <attributelist id="4538" addr="0x7fca4692b430" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4539" addr="0x7f99f1de2130" >
-                                                <attributelist id="4540" addr="0x7f99f1de2130" >
+                                            <typetabsitem id="4539" addr="0x7fca46930130" >
+                                                <attributelist id="4540" addr="0x7fca46930130" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4541" addr="0x7f99f1dd2f50" >
-                                                <attributelist id="4542" addr="0x7f99f1dd2f50" >
+                                            <typetabsitem id="4541" addr="0x7fca46920f50" >
+                                                <attributelist id="4542" addr="0x7fca46920f50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4543" addr="0x7f99f1dd9650" >
-                                                <attributelist id="4544" addr="0x7f99f1dd9650" >
+                                            <typetabsitem id="4543" addr="0x7fca46927650" >
+                                                <attributelist id="4544" addr="0x7fca46927650" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4545" addr="0x7f99f1de3390" >
-                                                <attributelist id="4546" addr="0x7f99f1de3390" >
+                                            <typetabsitem id="4545" addr="0x7fca46931390" >
+                                                <attributelist id="4546" addr="0x7fca46931390" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4547" addr="0x7f99f1ddb7b0" >
-                                                <attributelist id="4548" addr="0x7f99f1ddb7b0" >
+                                            <typetabsitem id="4547" addr="0x7fca469297b0" >
+                                                <attributelist id="4548" addr="0x7fca469297b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4549" addr="0x7f99f1ddc4b0" >
-                                                <attributelist id="4550" addr="0x7f99f1ddc4b0" >
+                                            <typetabsitem id="4549" addr="0x7fca4692a4b0" >
+                                                <attributelist id="4550" addr="0x7fca4692a4b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4551" addr="0x7f99f1ddcf90" >
-                                                <attributelist id="4552" addr="0x7f99f1ddcf90" >
+                                            <typetabsitem id="4551" addr="0x7fca4692af90" >
+                                                <attributelist id="4552" addr="0x7fca4692af90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4553" addr="0x7f99f1de11b0" >
-                                                <attributelist id="4554" addr="0x7f99f1de11b0" >
+                                            <typetabsitem id="4553" addr="0x7fca4692f1b0" >
+                                                <attributelist id="4554" addr="0x7fca4692f1b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4555" addr="0x7f99f1de15b0" >
-                                                <attributelist id="4556" addr="0x7f99f1de15b0" >
+                                            <typetabsitem id="4555" addr="0x7fca4692f5b0" >
+                                                <attributelist id="4556" addr="0x7fca4692f5b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4557" addr="0x7f99f1dd77f0" >
-                                                <attributelist id="4558" addr="0x7f99f1dd77f0" >
+                                            <typetabsitem id="4557" addr="0x7fca469257f0" >
+                                                <attributelist id="4558" addr="0x7fca469257f0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4559" addr="0x7f99f1dd8b30" >
-                                                <attributelist id="4560" addr="0x7f99f1dd8b30" >
+                                            <typetabsitem id="4559" addr="0x7fca46926b30" >
+                                                <attributelist id="4560" addr="0x7fca46926b30" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4561" addr="0x7f99f1dd2c50" >
-                                                <attributelist id="4562" addr="0x7f99f1dd2c50" >
+                                            <typetabsitem id="4561" addr="0x7fca46920c50" >
+                                                <attributelist id="4562" addr="0x7fca46920c50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4563" addr="0x7f99f1dda790" >
-                                                <attributelist id="4564" addr="0x7f99f1dda790" >
+                                            <typetabsitem id="4563" addr="0x7fca46928790" >
+                                                <attributelist id="4564" addr="0x7fca46928790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4565" addr="0x7f99f1dd8030" >
-                                                <attributelist id="4566" addr="0x7f99f1dd8030" >
+                                            <typetabsitem id="4565" addr="0x7fca46926030" >
+                                                <attributelist id="4566" addr="0x7fca46926030" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4567" addr="0x7f99f1ddbe10" >
-                                                <attributelist id="4568" addr="0x7f99f1ddbe10" >
+                                            <typetabsitem id="4567" addr="0x7fca46929e10" >
+                                                <attributelist id="4568" addr="0x7fca46929e10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4569" addr="0x7f99f1dd6b10" >
-                                                <attributelist id="4570" addr="0x7f99f1dd6b10" >
+                                            <typetabsitem id="4569" addr="0x7fca46924b10" >
+                                                <attributelist id="4570" addr="0x7fca46924b10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4571" addr="0x7f99f1dddf90" >
-                                                <attributelist id="4572" addr="0x7f99f1dddf90" >
+                                            <typetabsitem id="4571" addr="0x7fca4692bf90" >
+                                                <attributelist id="4572" addr="0x7fca4692bf90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4573" addr="0x7f99f1de0530" >
-                                                <attributelist id="4574" addr="0x7f99f1de0530" >
+                                            <typetabsitem id="4573" addr="0x7fca4692e530" >
+                                                <attributelist id="4574" addr="0x7fca4692e530" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4575" addr="0x7f99f1de1e50" >
-                                                <attributelist id="4576" addr="0x7f99f1de1e50" >
+                                            <typetabsitem id="4575" addr="0x7fca4692fe50" >
+                                                <attributelist id="4576" addr="0x7fca4692fe50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4577" addr="0x7f99f1de2d90" >
-                                                <attributelist id="4578" addr="0x7f99f1de2d90" >
+                                            <typetabsitem id="4577" addr="0x7fca46930d90" >
+                                                <attributelist id="4578" addr="0x7fca46930d90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4579" addr="0x7f99f1de3410" >
-                                                <attributelist id="4580" addr="0x7f99f1de3410" >
+                                            <typetabsitem id="4579" addr="0x7fca46931410" >
+                                                <attributelist id="4580" addr="0x7fca46931410" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4581" addr="0x7f99f1dd3590" >
-                                                <attributelist id="4582" addr="0x7f99f1dd3590" >
+                                            <typetabsitem id="4581" addr="0x7fca46921590" >
+                                                <attributelist id="4582" addr="0x7fca46921590" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="4583" addr="0x7f99f1dd3390" >
-                                                <attributelist id="4584" addr="0x7f99f1dd3390" >
+                                            <typetabsitem id="4583" addr="0x7fca46921390" >
+                                                <attributelist id="4584" addr="0x7fca46921390" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7f99f1dd1d70" id="4585" addr="0x7f99f1dd1d70" />
-                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="4586" addr="0x7f99f1de6c90" />
-                                        <attribute name="symtab" value="0x7f99f1e40fb0" id="4587" addr="0x7f99f1e40fb0" />
+                                        <attribute name="parent" value="0x7fca4691fd70" id="4585" addr="0x7fca4691fd70" />
+                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="4586" addr="0x7fca46934c90" />
+                                        <attribute name="symtab" value="0x7fca4698efb0" id="4587" addr="0x7fca4698efb0" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="4588" addr="0x7f99f1dd8c30" >
-                                    <attributelist id="4589" addr="0x7f99f1dd8c30" >
+                                <typescopesitem id="4588" addr="0x7fca46926c30" >
+                                    <attributelist id="4589" addr="0x7fca46926c30" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="4590" addr="0x7f99f1e609f0" >
-                                    <attributelist id="4591" addr="0x7f99f1e609f0" >
-                                        <attribute name="inherit" value="0x7f99f1e60a50" id="4592" addr="0x7f99f1e60a50" />
-                                        <attribute name="name" value="ControlEdit" id="4593" addr="0x7f99f1de6c90" />
-                                        <attribute name="csymtab" value="0x7f99f1e60a10" id="4594" addr="0x7f99f1e60a10" />
-                                        <attribute name="symtab" value="0x7f99f1e609d0" id="4595" addr="0x7f99f1e609d0" />
+                                <typescopesitem id="4590" addr="0x7fca469ae9f0" >
+                                    <attributelist id="4591" addr="0x7fca469ae9f0" >
+                                        <attribute name="inherit" value="0x7fca469aea50" id="4592" addr="0x7fca469aea50" />
+                                        <attribute name="name" value="ControlEdit" id="4593" addr="0x7fca46934c90" />
+                                        <attribute name="csymtab" value="0x7fca469aea10" id="4594" addr="0x7fca469aea10" />
+                                        <attribute name="symtab" value="0x7fca469ae9d0" id="4595" addr="0x7fca469ae9d0" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <access id="4596" addr="0x7f99f1e60970" >
-                            <attributelist id="4597" addr="0x7f99f1e60970" >
-                                <attribute name="kind" value="public" id="4598" addr="0x7f99f1de6c90" />
+                        <access id="4596" addr="0x7fca469ae970" >
+                            <attributelist id="4597" addr="0x7fca469ae970" >
+                                <attribute name="kind" value="public" id="4598" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="4599" addr="0x7f99f1e61bf0" >
-                            <attributelist id="4600" addr="0x7f99f1e61bf0" >
-                                <attribute name="name" value="ControlEdit" id="4601" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="4602" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e609f0" id="4603" addr="0x7f99f1e609f0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e62330" id="4604" addr="0x7f99f1e62330" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e62330" id="4605" addr="0x7f99f1e62330" />
-                                <attribute name="sym_name" value="ControlEdit" id="4606" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,long,p.q(const).char,p.q(const).char,bool)." id="4607" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="4608" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e61bf0" id="4609" addr="0x7f99f1e61bf0" />
-                                <parmlist id="4610" addr="0x7f99f1e60bb0" >
+                        <constructor id="4599" addr="0x7fca469afbf0" >
+                            <attributelist id="4600" addr="0x7fca469afbf0" >
+                                <attribute name="name" value="ControlEdit" id="4601" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="4602" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469ae9f0" id="4603" addr="0x7fca469ae9f0" />
+                                <attribute name="sym_nextSibling" value="0x7fca469b0330" id="4604" addr="0x7fca469b0330" />
+                                <attribute name="csym_nextSibling" value="0x7fca469b0330" id="4605" addr="0x7fca469b0330" />
+                                <attribute name="sym_name" value="ControlEdit" id="4606" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,long,p.q(const).char,p.q(const).char,bool)." id="4607" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="4608" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469afbf0" id="4609" addr="0x7fca469afbf0" />
+                                <parmlist id="4610" addr="0x7fca469aebb0" >
                                     <parm id="4611">
-                                        <attributelist id="4612" addr="0x7f99f1e60bb0" >
-                                            <attribute name="name" value="x" id="4613" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4614" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4612" addr="0x7fca469aebb0" >
+                                            <attribute name="name" value="x" id="4613" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4614" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4615">
-                                        <attributelist id="4616" addr="0x7f99f1e60cd0" >
-                                            <attribute name="name" value="y" id="4617" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4618" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4616" addr="0x7fca469aecd0" >
+                                            <attribute name="name" value="y" id="4617" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4618" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4619">
-                                        <attributelist id="4620" addr="0x7f99f1e60df0" >
-                                            <attribute name="name" value="width" id="4621" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4622" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4620" addr="0x7fca469aedf0" >
+                                            <attribute name="name" value="width" id="4621" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4622" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4623">
-                                        <attributelist id="4624" addr="0x7f99f1e60f10" >
-                                            <attribute name="name" value="height" id="4625" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4626" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4624" addr="0x7fca469aef10" >
+                                            <attribute name="name" value="height" id="4625" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4626" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4627">
-                                        <attributelist id="4628" addr="0x7f99f1e61050" >
-                                            <attribute name="name" value="label" id="4629" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4630" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4628" addr="0x7fca469af050" >
+                                            <attribute name="name" value="label" id="4629" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4630" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4631">
-                                        <attributelist id="4632" addr="0x7f99f1e611f0" >
-                                            <attribute name="name" value="font" id="4633" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4634" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4635" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4632" addr="0x7fca469af1f0" >
+                                            <attribute name="name" value="font" id="4633" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4634" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4635" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4636">
-                                        <attributelist id="4637" addr="0x7f99f1e61390" >
-                                            <attribute name="name" value="textColor" id="4638" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4639" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4640" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4637" addr="0x7fca469af390" >
+                                            <attribute name="name" value="textColor" id="4638" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4639" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4640" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4641">
-                                        <attributelist id="4642" addr="0x7f99f1e61530" >
-                                            <attribute name="name" value="disabledColor" id="4643" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4644" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4645" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4642" addr="0x7fca469af530" >
+                                            <attribute name="name" value="disabledColor" id="4643" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4644" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4645" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4646">
-                                        <attributelist id="4647" addr="0x7f99f1e616b0" >
-                                            <attribute name="name" value="_alignment" id="4648" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBFONT_LEFT" id="4649" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4650" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4647" addr="0x7fca469af6b0" >
+                                            <attribute name="name" value="_alignment" id="4648" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBFONT_LEFT" id="4649" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4650" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4651">
-                                        <attributelist id="4652" addr="0x7f99f1e61850" >
-                                            <attribute name="name" value="focusTexture" id="4653" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4654" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4655" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4652" addr="0x7fca469af850" >
+                                            <attribute name="name" value="focusTexture" id="4653" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4654" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4655" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4656">
-                                        <attributelist id="4657" addr="0x7f99f1e619f0" >
-                                            <attribute name="name" value="noFocusTexture" id="4658" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4659" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4660" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4657" addr="0x7fca469af9f0" >
+                                            <attribute name="name" value="noFocusTexture" id="4658" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4659" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4660" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4661">
-                                        <attributelist id="4662" addr="0x7f99f1e61b30" >
-                                            <attribute name="name" value="isPassword" id="4663" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="false" id="4664" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="4665" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4662" addr="0x7fca469afb30" >
+                                            <attribute name="name" value="isPassword" id="4663" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="false" id="4664" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="4665" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_0" id="4666" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="4667" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="4666" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="4667" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="4668" addr="0x7f99f1e62330" >
-                            <attributelist id="4669" addr="0x7f99f1e62330" >
-                                <attribute name="name" value="ControlEdit" id="4670" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="4671" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e609f0" id="4672" addr="0x7f99f1e609f0" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e629d0" id="4673" addr="0x7f99f1e629d0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e61bf0" id="4674" addr="0x7f99f1e61bf0" />
-                                <attribute name="sym_name" value="ControlEdit" id="4675" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e629d0" id="4676" addr="0x7f99f1e629d0" />
-                                <attribute name="defaultargs" value="0x7f99f1e61bf0" id="4677" addr="0x7f99f1e61bf0" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,long,p.q(const).char,p.q(const).char)." id="4678" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="4679" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e61bf0" id="4680" addr="0x7f99f1e61bf0" />
-                                <parmlist id="4681" addr="0x7f99f1e61c90" >
+                        <constructor id="4668" addr="0x7fca469b0330" >
+                            <attributelist id="4669" addr="0x7fca469b0330" >
+                                <attribute name="name" value="ControlEdit" id="4670" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="4671" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469ae9f0" id="4672" addr="0x7fca469ae9f0" />
+                                <attribute name="csym_nextSibling" value="0x7fca469b09d0" id="4673" addr="0x7fca469b09d0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469afbf0" id="4674" addr="0x7fca469afbf0" />
+                                <attribute name="sym_name" value="ControlEdit" id="4675" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469b09d0" id="4676" addr="0x7fca469b09d0" />
+                                <attribute name="defaultargs" value="0x7fca469afbf0" id="4677" addr="0x7fca469afbf0" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,long,p.q(const).char,p.q(const).char)." id="4678" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="4679" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469afbf0" id="4680" addr="0x7fca469afbf0" />
+                                <parmlist id="4681" addr="0x7fca469afc90" >
                                     <parm id="4682">
-                                        <attributelist id="4683" addr="0x7f99f1e61c90" >
-                                            <attribute name="name" value="x" id="4684" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4685" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4683" addr="0x7fca469afc90" >
+                                            <attribute name="name" value="x" id="4684" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4685" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4686">
-                                        <attributelist id="4687" addr="0x7f99f1e61d50" >
-                                            <attribute name="name" value="y" id="4688" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4689" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4687" addr="0x7fca469afd50" >
+                                            <attribute name="name" value="y" id="4688" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4689" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4690">
-                                        <attributelist id="4691" addr="0x7f99f1e61dd0" >
-                                            <attribute name="name" value="width" id="4692" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4693" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4691" addr="0x7fca469afdd0" >
+                                            <attribute name="name" value="width" id="4692" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4693" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4694">
-                                        <attributelist id="4695" addr="0x7f99f1e61e50" >
-                                            <attribute name="name" value="height" id="4696" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4697" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4695" addr="0x7fca469afe50" >
+                                            <attribute name="name" value="height" id="4696" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4697" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4698">
-                                        <attributelist id="4699" addr="0x7f99f1e61ed0" >
-                                            <attribute name="name" value="label" id="4700" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4701" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4699" addr="0x7fca469afed0" >
+                                            <attribute name="name" value="label" id="4700" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4701" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4702">
-                                        <attributelist id="4703" addr="0x7f99f1e61f50" >
-                                            <attribute name="name" value="font" id="4704" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4705" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4706" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4703" addr="0x7fca469aff50" >
+                                            <attribute name="name" value="font" id="4704" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4705" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4706" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4707">
-                                        <attributelist id="4708" addr="0x7f99f1e61ff0" >
-                                            <attribute name="name" value="textColor" id="4709" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4710" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4711" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4708" addr="0x7fca469afff0" >
+                                            <attribute name="name" value="textColor" id="4709" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4710" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4711" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4712">
-                                        <attributelist id="4713" addr="0x7f99f1e62090" >
-                                            <attribute name="name" value="disabledColor" id="4714" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4715" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4716" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4713" addr="0x7fca469b0090" >
+                                            <attribute name="name" value="disabledColor" id="4714" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4715" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4716" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4717">
-                                        <attributelist id="4718" addr="0x7f99f1e62130" >
-                                            <attribute name="name" value="_alignment" id="4719" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBFONT_LEFT" id="4720" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4721" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4718" addr="0x7fca469b0130" >
+                                            <attribute name="name" value="_alignment" id="4719" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBFONT_LEFT" id="4720" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4721" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4722">
-                                        <attributelist id="4723" addr="0x7f99f1e621d0" >
-                                            <attribute name="name" value="focusTexture" id="4724" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4725" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4726" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4723" addr="0x7fca469b01d0" >
+                                            <attribute name="name" value="focusTexture" id="4724" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4725" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4726" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4727">
-                                        <attributelist id="4728" addr="0x7f99f1e62270" >
-                                            <attribute name="name" value="noFocusTexture" id="4729" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4730" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4731" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4728" addr="0x7fca469b0270" >
+                                            <attribute name="name" value="noFocusTexture" id="4729" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4730" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4731" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_1" id="4732" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="4733" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="4732" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="4733" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="4734" addr="0x7f99f1e629d0" >
-                            <attributelist id="4735" addr="0x7f99f1e629d0" >
-                                <attribute name="name" value="ControlEdit" id="4736" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="4737" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e609f0" id="4738" addr="0x7f99f1e609f0" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e62fd0" id="4739" addr="0x7f99f1e62fd0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e62330" id="4740" addr="0x7f99f1e62330" />
-                                <attribute name="sym_name" value="ControlEdit" id="4741" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e62fd0" id="4742" addr="0x7f99f1e62fd0" />
-                                <attribute name="defaultargs" value="0x7f99f1e61bf0" id="4743" addr="0x7f99f1e61bf0" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,long,p.q(const).char)." id="4744" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="4745" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e61bf0" id="4746" addr="0x7f99f1e61bf0" />
-                                <parmlist id="4747" addr="0x7f99f1e623d0" >
+                        <constructor id="4734" addr="0x7fca469b09d0" >
+                            <attributelist id="4735" addr="0x7fca469b09d0" >
+                                <attribute name="name" value="ControlEdit" id="4736" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="4737" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469ae9f0" id="4738" addr="0x7fca469ae9f0" />
+                                <attribute name="csym_nextSibling" value="0x7fca469b0fd0" id="4739" addr="0x7fca469b0fd0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469b0330" id="4740" addr="0x7fca469b0330" />
+                                <attribute name="sym_name" value="ControlEdit" id="4741" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469b0fd0" id="4742" addr="0x7fca469b0fd0" />
+                                <attribute name="defaultargs" value="0x7fca469afbf0" id="4743" addr="0x7fca469afbf0" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,long,p.q(const).char)." id="4744" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="4745" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469afbf0" id="4746" addr="0x7fca469afbf0" />
+                                <parmlist id="4747" addr="0x7fca469b03d0" >
                                     <parm id="4748">
-                                        <attributelist id="4749" addr="0x7f99f1e623d0" >
-                                            <attribute name="name" value="x" id="4750" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4751" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4749" addr="0x7fca469b03d0" >
+                                            <attribute name="name" value="x" id="4750" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4751" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4752">
-                                        <attributelist id="4753" addr="0x7f99f1e62490" >
-                                            <attribute name="name" value="y" id="4754" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4755" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4753" addr="0x7fca469b0490" >
+                                            <attribute name="name" value="y" id="4754" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4755" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4756">
-                                        <attributelist id="4757" addr="0x7f99f1e62510" >
-                                            <attribute name="name" value="width" id="4758" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4759" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4757" addr="0x7fca469b0510" >
+                                            <attribute name="name" value="width" id="4758" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4759" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4760">
-                                        <attributelist id="4761" addr="0x7f99f1e62590" >
-                                            <attribute name="name" value="height" id="4762" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4763" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4761" addr="0x7fca469b0590" >
+                                            <attribute name="name" value="height" id="4762" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4763" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4764">
-                                        <attributelist id="4765" addr="0x7f99f1e62610" >
-                                            <attribute name="name" value="label" id="4766" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4767" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4765" addr="0x7fca469b0610" >
+                                            <attribute name="name" value="label" id="4766" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4767" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4768">
-                                        <attributelist id="4769" addr="0x7f99f1e62690" >
-                                            <attribute name="name" value="font" id="4770" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4771" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4772" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4769" addr="0x7fca469b0690" >
+                                            <attribute name="name" value="font" id="4770" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4771" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4772" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4773">
-                                        <attributelist id="4774" addr="0x7f99f1e62730" >
-                                            <attribute name="name" value="textColor" id="4775" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4776" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4777" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4774" addr="0x7fca469b0730" >
+                                            <attribute name="name" value="textColor" id="4775" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4776" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4777" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4778">
-                                        <attributelist id="4779" addr="0x7f99f1e627d0" >
-                                            <attribute name="name" value="disabledColor" id="4780" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4781" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4782" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4779" addr="0x7fca469b07d0" >
+                                            <attribute name="name" value="disabledColor" id="4780" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4781" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4782" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4783">
-                                        <attributelist id="4784" addr="0x7f99f1e62870" >
-                                            <attribute name="name" value="_alignment" id="4785" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBFONT_LEFT" id="4786" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4787" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4784" addr="0x7fca469b0870" >
+                                            <attribute name="name" value="_alignment" id="4785" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBFONT_LEFT" id="4786" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4787" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4788">
-                                        <attributelist id="4789" addr="0x7f99f1e62910" >
-                                            <attribute name="name" value="focusTexture" id="4790" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4791" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4792" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4789" addr="0x7fca469b0910" >
+                                            <attribute name="name" value="focusTexture" id="4790" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4791" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4792" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_2" id="4793" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="4794" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_2" id="4793" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="4794" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="4795" addr="0x7f99f1e62fd0" >
-                            <attributelist id="4796" addr="0x7f99f1e62fd0" >
-                                <attribute name="name" value="ControlEdit" id="4797" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="4798" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e609f0" id="4799" addr="0x7f99f1e609f0" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e63530" id="4800" addr="0x7f99f1e63530" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e629d0" id="4801" addr="0x7f99f1e629d0" />
-                                <attribute name="sym_name" value="ControlEdit" id="4802" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e63530" id="4803" addr="0x7f99f1e63530" />
-                                <attribute name="defaultargs" value="0x7f99f1e61bf0" id="4804" addr="0x7f99f1e61bf0" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,long)." id="4805" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="4806" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e61bf0" id="4807" addr="0x7f99f1e61bf0" />
-                                <parmlist id="4808" addr="0x7f99f1e62a70" >
+                        <constructor id="4795" addr="0x7fca469b0fd0" >
+                            <attributelist id="4796" addr="0x7fca469b0fd0" >
+                                <attribute name="name" value="ControlEdit" id="4797" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="4798" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469ae9f0" id="4799" addr="0x7fca469ae9f0" />
+                                <attribute name="csym_nextSibling" value="0x7fca469b1530" id="4800" addr="0x7fca469b1530" />
+                                <attribute name="sym_previousSibling" value="0x7fca469b09d0" id="4801" addr="0x7fca469b09d0" />
+                                <attribute name="sym_name" value="ControlEdit" id="4802" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469b1530" id="4803" addr="0x7fca469b1530" />
+                                <attribute name="defaultargs" value="0x7fca469afbf0" id="4804" addr="0x7fca469afbf0" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,long)." id="4805" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="4806" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469afbf0" id="4807" addr="0x7fca469afbf0" />
+                                <parmlist id="4808" addr="0x7fca469b0a70" >
                                     <parm id="4809">
-                                        <attributelist id="4810" addr="0x7f99f1e62a70" >
-                                            <attribute name="name" value="x" id="4811" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4812" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4810" addr="0x7fca469b0a70" >
+                                            <attribute name="name" value="x" id="4811" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4812" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4813">
-                                        <attributelist id="4814" addr="0x7f99f1e62b30" >
-                                            <attribute name="name" value="y" id="4815" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4816" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4814" addr="0x7fca469b0b30" >
+                                            <attribute name="name" value="y" id="4815" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4816" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4817">
-                                        <attributelist id="4818" addr="0x7f99f1e62bb0" >
-                                            <attribute name="name" value="width" id="4819" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4820" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4818" addr="0x7fca469b0bb0" >
+                                            <attribute name="name" value="width" id="4819" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4820" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4821">
-                                        <attributelist id="4822" addr="0x7f99f1e62c30" >
-                                            <attribute name="name" value="height" id="4823" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4824" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4822" addr="0x7fca469b0c30" >
+                                            <attribute name="name" value="height" id="4823" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4824" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4825">
-                                        <attributelist id="4826" addr="0x7f99f1e62cb0" >
-                                            <attribute name="name" value="label" id="4827" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4828" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4826" addr="0x7fca469b0cb0" >
+                                            <attribute name="name" value="label" id="4827" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4828" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4829">
-                                        <attributelist id="4830" addr="0x7f99f1e62d30" >
-                                            <attribute name="name" value="font" id="4831" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4832" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4833" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4830" addr="0x7fca469b0d30" >
+                                            <attribute name="name" value="font" id="4831" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4832" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4833" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4834">
-                                        <attributelist id="4835" addr="0x7f99f1e62dd0" >
-                                            <attribute name="name" value="textColor" id="4836" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4837" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4838" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4835" addr="0x7fca469b0dd0" >
+                                            <attribute name="name" value="textColor" id="4836" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4837" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4838" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4839">
-                                        <attributelist id="4840" addr="0x7f99f1e62e70" >
-                                            <attribute name="name" value="disabledColor" id="4841" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4842" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4843" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4840" addr="0x7fca469b0e70" >
+                                            <attribute name="name" value="disabledColor" id="4841" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4842" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4843" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4844">
-                                        <attributelist id="4845" addr="0x7f99f1e62f10" >
-                                            <attribute name="name" value="_alignment" id="4846" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBFONT_LEFT" id="4847" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4848" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4845" addr="0x7fca469b0f10" >
+                                            <attribute name="name" value="_alignment" id="4846" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBFONT_LEFT" id="4847" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4848" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_3" id="4849" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="4850" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_3" id="4849" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="4850" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="4851" addr="0x7f99f1e63530" >
-                            <attributelist id="4852" addr="0x7f99f1e63530" >
-                                <attribute name="name" value="ControlEdit" id="4853" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="4854" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e609f0" id="4855" addr="0x7f99f1e609f0" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e639f0" id="4856" addr="0x7f99f1e639f0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e62fd0" id="4857" addr="0x7f99f1e62fd0" />
-                                <attribute name="sym_name" value="ControlEdit" id="4858" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e639f0" id="4859" addr="0x7f99f1e639f0" />
-                                <attribute name="defaultargs" value="0x7f99f1e61bf0" id="4860" addr="0x7f99f1e61bf0" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char)." id="4861" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="4862" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e61bf0" id="4863" addr="0x7f99f1e61bf0" />
-                                <parmlist id="4864" addr="0x7f99f1e63070" >
+                        <constructor id="4851" addr="0x7fca469b1530" >
+                            <attributelist id="4852" addr="0x7fca469b1530" >
+                                <attribute name="name" value="ControlEdit" id="4853" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="4854" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469ae9f0" id="4855" addr="0x7fca469ae9f0" />
+                                <attribute name="csym_nextSibling" value="0x7fca469b19f0" id="4856" addr="0x7fca469b19f0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469b0fd0" id="4857" addr="0x7fca469b0fd0" />
+                                <attribute name="sym_name" value="ControlEdit" id="4858" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469b19f0" id="4859" addr="0x7fca469b19f0" />
+                                <attribute name="defaultargs" value="0x7fca469afbf0" id="4860" addr="0x7fca469afbf0" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char)." id="4861" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="4862" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469afbf0" id="4863" addr="0x7fca469afbf0" />
+                                <parmlist id="4864" addr="0x7fca469b1070" >
                                     <parm id="4865">
-                                        <attributelist id="4866" addr="0x7f99f1e63070" >
-                                            <attribute name="name" value="x" id="4867" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4868" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4866" addr="0x7fca469b1070" >
+                                            <attribute name="name" value="x" id="4867" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4868" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4869">
-                                        <attributelist id="4870" addr="0x7f99f1e63130" >
-                                            <attribute name="name" value="y" id="4871" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4872" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4870" addr="0x7fca469b1130" >
+                                            <attribute name="name" value="y" id="4871" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4872" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4873">
-                                        <attributelist id="4874" addr="0x7f99f1e631b0" >
-                                            <attribute name="name" value="width" id="4875" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4876" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4874" addr="0x7fca469b11b0" >
+                                            <attribute name="name" value="width" id="4875" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4876" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4877">
-                                        <attributelist id="4878" addr="0x7f99f1e63230" >
-                                            <attribute name="name" value="height" id="4879" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4880" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4878" addr="0x7fca469b1230" >
+                                            <attribute name="name" value="height" id="4879" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4880" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4881">
-                                        <attributelist id="4882" addr="0x7f99f1e632b0" >
-                                            <attribute name="name" value="label" id="4883" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4884" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4882" addr="0x7fca469b12b0" >
+                                            <attribute name="name" value="label" id="4883" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4884" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4885">
-                                        <attributelist id="4886" addr="0x7f99f1e63330" >
-                                            <attribute name="name" value="font" id="4887" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4888" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4889" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4886" addr="0x7fca469b1330" >
+                                            <attribute name="name" value="font" id="4887" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4888" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4889" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4890">
-                                        <attributelist id="4891" addr="0x7f99f1e633d0" >
-                                            <attribute name="name" value="textColor" id="4892" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4893" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4894" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4891" addr="0x7fca469b13d0" >
+                                            <attribute name="name" value="textColor" id="4892" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4893" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4894" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4895">
-                                        <attributelist id="4896" addr="0x7f99f1e63470" >
-                                            <attribute name="name" value="disabledColor" id="4897" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4898" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4899" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4896" addr="0x7fca469b1470" >
+                                            <attribute name="name" value="disabledColor" id="4897" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4898" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4899" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_4" id="4900" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="4901" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_4" id="4900" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="4901" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="4902" addr="0x7f99f1e639f0" >
-                            <attributelist id="4903" addr="0x7f99f1e639f0" >
-                                <attribute name="name" value="ControlEdit" id="4904" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="4905" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e609f0" id="4906" addr="0x7f99f1e609f0" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e63e10" id="4907" addr="0x7f99f1e63e10" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e63530" id="4908" addr="0x7f99f1e63530" />
-                                <attribute name="sym_name" value="ControlEdit" id="4909" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e63e10" id="4910" addr="0x7f99f1e63e10" />
-                                <attribute name="defaultargs" value="0x7f99f1e61bf0" id="4911" addr="0x7f99f1e61bf0" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char)." id="4912" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="4913" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e61bf0" id="4914" addr="0x7f99f1e61bf0" />
-                                <parmlist id="4915" addr="0x7f99f1e635d0" >
+                        <constructor id="4902" addr="0x7fca469b19f0" >
+                            <attributelist id="4903" addr="0x7fca469b19f0" >
+                                <attribute name="name" value="ControlEdit" id="4904" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="4905" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469ae9f0" id="4906" addr="0x7fca469ae9f0" />
+                                <attribute name="csym_nextSibling" value="0x7fca469b1e10" id="4907" addr="0x7fca469b1e10" />
+                                <attribute name="sym_previousSibling" value="0x7fca469b1530" id="4908" addr="0x7fca469b1530" />
+                                <attribute name="sym_name" value="ControlEdit" id="4909" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469b1e10" id="4910" addr="0x7fca469b1e10" />
+                                <attribute name="defaultargs" value="0x7fca469afbf0" id="4911" addr="0x7fca469afbf0" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char)." id="4912" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="4913" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469afbf0" id="4914" addr="0x7fca469afbf0" />
+                                <parmlist id="4915" addr="0x7fca469b15d0" >
                                     <parm id="4916">
-                                        <attributelist id="4917" addr="0x7f99f1e635d0" >
-                                            <attribute name="name" value="x" id="4918" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4919" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4917" addr="0x7fca469b15d0" >
+                                            <attribute name="name" value="x" id="4918" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4919" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4920">
-                                        <attributelist id="4921" addr="0x7f99f1e63690" >
-                                            <attribute name="name" value="y" id="4922" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4923" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4921" addr="0x7fca469b1690" >
+                                            <attribute name="name" value="y" id="4922" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4923" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4924">
-                                        <attributelist id="4925" addr="0x7f99f1e63710" >
-                                            <attribute name="name" value="width" id="4926" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4927" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4925" addr="0x7fca469b1710" >
+                                            <attribute name="name" value="width" id="4926" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4927" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4928">
-                                        <attributelist id="4929" addr="0x7f99f1e63790" >
-                                            <attribute name="name" value="height" id="4930" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4931" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4929" addr="0x7fca469b1790" >
+                                            <attribute name="name" value="height" id="4930" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4931" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4932">
-                                        <attributelist id="4933" addr="0x7f99f1e63810" >
-                                            <attribute name="name" value="label" id="4934" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4935" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4933" addr="0x7fca469b1810" >
+                                            <attribute name="name" value="label" id="4934" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4935" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4936">
-                                        <attributelist id="4937" addr="0x7f99f1e63890" >
-                                            <attribute name="name" value="font" id="4938" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4939" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4940" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4937" addr="0x7fca469b1890" >
+                                            <attribute name="name" value="font" id="4938" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4939" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4940" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4941">
-                                        <attributelist id="4942" addr="0x7f99f1e63930" >
-                                            <attribute name="name" value="textColor" id="4943" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4944" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4945" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4942" addr="0x7fca469b1930" >
+                                            <attribute name="name" value="textColor" id="4943" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4944" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4945" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_5" id="4946" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="4947" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_5" id="4946" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="4947" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="4948" addr="0x7f99f1e63e10" >
-                            <attributelist id="4949" addr="0x7f99f1e63e10" >
-                                <attribute name="name" value="ControlEdit" id="4950" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="4951" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e609f0" id="4952" addr="0x7f99f1e609f0" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e64190" id="4953" addr="0x7f99f1e64190" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e639f0" id="4954" addr="0x7f99f1e639f0" />
-                                <attribute name="sym_name" value="ControlEdit" id="4955" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e64190" id="4956" addr="0x7f99f1e64190" />
-                                <attribute name="defaultargs" value="0x7f99f1e61bf0" id="4957" addr="0x7f99f1e61bf0" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char)." id="4958" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="4959" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e61bf0" id="4960" addr="0x7f99f1e61bf0" />
-                                <parmlist id="4961" addr="0x7f99f1e63a90" >
+                        <constructor id="4948" addr="0x7fca469b1e10" >
+                            <attributelist id="4949" addr="0x7fca469b1e10" >
+                                <attribute name="name" value="ControlEdit" id="4950" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="4951" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469ae9f0" id="4952" addr="0x7fca469ae9f0" />
+                                <attribute name="csym_nextSibling" value="0x7fca469b2190" id="4953" addr="0x7fca469b2190" />
+                                <attribute name="sym_previousSibling" value="0x7fca469b19f0" id="4954" addr="0x7fca469b19f0" />
+                                <attribute name="sym_name" value="ControlEdit" id="4955" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469b2190" id="4956" addr="0x7fca469b2190" />
+                                <attribute name="defaultargs" value="0x7fca469afbf0" id="4957" addr="0x7fca469afbf0" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char)." id="4958" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="4959" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469afbf0" id="4960" addr="0x7fca469afbf0" />
+                                <parmlist id="4961" addr="0x7fca469b1a90" >
                                     <parm id="4962">
-                                        <attributelist id="4963" addr="0x7f99f1e63a90" >
-                                            <attribute name="name" value="x" id="4964" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4965" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4963" addr="0x7fca469b1a90" >
+                                            <attribute name="name" value="x" id="4964" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4965" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4966">
-                                        <attributelist id="4967" addr="0x7f99f1e63b50" >
-                                            <attribute name="name" value="y" id="4968" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4969" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4967" addr="0x7fca469b1b50" >
+                                            <attribute name="name" value="y" id="4968" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4969" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4970">
-                                        <attributelist id="4971" addr="0x7f99f1e63bd0" >
-                                            <attribute name="name" value="width" id="4972" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4973" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4971" addr="0x7fca469b1bd0" >
+                                            <attribute name="name" value="width" id="4972" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4973" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4974">
-                                        <attributelist id="4975" addr="0x7f99f1e63c50" >
-                                            <attribute name="name" value="height" id="4976" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="4977" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4975" addr="0x7fca469b1c50" >
+                                            <attribute name="name" value="height" id="4976" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="4977" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4978">
-                                        <attributelist id="4979" addr="0x7f99f1e63cd0" >
-                                            <attribute name="name" value="label" id="4980" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4981" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4979" addr="0x7fca469b1cd0" >
+                                            <attribute name="name" value="label" id="4980" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="4981" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="4982">
-                                        <attributelist id="4983" addr="0x7f99f1e63d50" >
-                                            <attribute name="name" value="font" id="4984" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="4985" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="4986" addr="0x7f99f1de6c90" />
+                                        <attributelist id="4983" addr="0x7fca469b1d50" >
+                                            <attribute name="name" value="font" id="4984" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="4985" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="4986" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_6" id="4987" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="4988" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_6" id="4987" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="4988" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="4989" addr="0x7f99f1e64190" >
-                            <attributelist id="4990" addr="0x7f99f1e64190" >
-                                <attribute name="name" value="ControlEdit" id="4991" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="4992" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e609f0" id="4993" addr="0x7f99f1e609f0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e63e10" id="4994" addr="0x7f99f1e63e10" />
-                                <attribute name="sym_name" value="ControlEdit" id="4995" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e61bf0" id="4996" addr="0x7f99f1e61bf0" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String)." id="4997" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="4998" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e61bf0" id="4999" addr="0x7f99f1e61bf0" />
-                                <parmlist id="5000" addr="0x7f99f1e63eb0" >
+                        <constructor id="4989" addr="0x7fca469b2190" >
+                            <attributelist id="4990" addr="0x7fca469b2190" >
+                                <attribute name="name" value="ControlEdit" id="4991" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="4992" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469ae9f0" id="4993" addr="0x7fca469ae9f0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469b1e10" id="4994" addr="0x7fca469b1e10" />
+                                <attribute name="sym_name" value="ControlEdit" id="4995" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469afbf0" id="4996" addr="0x7fca469afbf0" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String)." id="4997" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="4998" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469afbf0" id="4999" addr="0x7fca469afbf0" />
+                                <parmlist id="5000" addr="0x7fca469b1eb0" >
                                     <parm id="5001">
-                                        <attributelist id="5002" addr="0x7f99f1e63eb0" >
-                                            <attribute name="name" value="x" id="5003" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5004" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5002" addr="0x7fca469b1eb0" >
+                                            <attribute name="name" value="x" id="5003" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5004" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5005">
-                                        <attributelist id="5006" addr="0x7f99f1e63f70" >
-                                            <attribute name="name" value="y" id="5007" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5008" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5006" addr="0x7fca469b1f70" >
+                                            <attribute name="name" value="y" id="5007" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5008" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5009">
-                                        <attributelist id="5010" addr="0x7f99f1e63ff0" >
-                                            <attribute name="name" value="width" id="5011" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5012" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5010" addr="0x7fca469b1ff0" >
+                                            <attribute name="name" value="width" id="5011" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5012" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5013">
-                                        <attributelist id="5014" addr="0x7f99f1e64070" >
-                                            <attribute name="name" value="height" id="5015" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5016" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5014" addr="0x7fca469b2070" >
+                                            <attribute name="name" value="height" id="5015" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5016" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5017">
-                                        <attributelist id="5018" addr="0x7f99f1e640f0" >
-                                            <attribute name="name" value="label" id="5019" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="5020" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5018" addr="0x7fca469b20f0" >
+                                            <attribute name="name" value="label" id="5019" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="5020" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_7" id="5021" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="5022" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_7" id="5021" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="5022" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <cdecl id="5023" addr="0x7f99f1e64e90" >
-                            <attributelist id="5024" addr="0x7f99f1e64e90" >
-                                <attribute name="name" value="setLabel" id="5025" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="5026" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e609f0" id="5027" addr="0x7f99f1e609f0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e65390" id="5028" addr="0x7f99f1e65390" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e65390" id="5029" addr="0x7f99f1e65390" />
-                                <attribute name="kind" value="function" id="5030" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setLabel" id="5031" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,r.q(const).XBMCAddon::String)." id="5032" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="5033" addr="0x7f99f1de6c90" />
-                                <parmlist id="5034" addr="0x7f99f1e64410" >
+                        <cdecl id="5023" addr="0x7fca469b2e90" >
+                            <attributelist id="5024" addr="0x7fca469b2e90" >
+                                <attribute name="name" value="setLabel" id="5025" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="5026" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469ae9f0" id="5027" addr="0x7fca469ae9f0" />
+                                <attribute name="sym_nextSibling" value="0x7fca469b3390" id="5028" addr="0x7fca469b3390" />
+                                <attribute name="csym_nextSibling" value="0x7fca469b3390" id="5029" addr="0x7fca469b3390" />
+                                <attribute name="kind" value="function" id="5030" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setLabel" id="5031" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,r.q(const).XBMCAddon::String)." id="5032" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="5033" addr="0x7fca46934c90" />
+                                <parmlist id="5034" addr="0x7fca469b2410" >
                                     <parm id="5035">
-                                        <attributelist id="5036" addr="0x7f99f1e64410" >
-                                            <attribute name="name" value="label" id="5037" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="5038" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="5039" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5036" addr="0x7fca469b2410" >
+                                            <attribute name="name" value="label" id="5037" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="5038" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="5039" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5040">
-                                        <attributelist id="5041" addr="0x7f99f1e645b0" >
-                                            <attribute name="name" value="font" id="5042" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5043" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5044" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5041" addr="0x7fca469b25b0" >
+                                            <attribute name="name" value="font" id="5042" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5043" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5044" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5045">
-                                        <attributelist id="5046" addr="0x7f99f1e64750" >
-                                            <attribute name="name" value="textColor" id="5047" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5048" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5049" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5046" addr="0x7fca469b2750" >
+                                            <attribute name="name" value="textColor" id="5047" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5048" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5049" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5050">
-                                        <attributelist id="5051" addr="0x7f99f1e648f0" >
-                                            <attribute name="name" value="disabledColor" id="5052" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5053" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5054" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5051" addr="0x7fca469b28f0" >
+                                            <attribute name="name" value="disabledColor" id="5052" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5053" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5054" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5055">
-                                        <attributelist id="5056" addr="0x7f99f1e64a90" >
-                                            <attribute name="name" value="shadowColor" id="5057" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5058" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5059" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5056" addr="0x7fca469b2a90" >
+                                            <attribute name="name" value="shadowColor" id="5057" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5058" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5059" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5060">
-                                        <attributelist id="5061" addr="0x7f99f1e64c30" >
-                                            <attribute name="name" value="focusedColor" id="5062" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5063" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5064" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5061" addr="0x7fca469b2c30" >
+                                            <attribute name="name" value="focusedColor" id="5062" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5063" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5064" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5065">
-                                        <attributelist id="5066" addr="0x7f99f1e64dd0" >
-                                            <attribute name="name" value="label2" id="5067" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="5068" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="5069" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                    </parm >
-                                </parmlist >
-                                <attribute name="sym_overloaded" value="0x7f99f1e64e90" id="5070" addr="0x7f99f1e64e90" />
-                                <attribute name="type" value="void" id="5071" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="5072" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="5073" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="5074" addr="0x7f99f1e65390" >
-                            <attributelist id="5075" addr="0x7f99f1e65390" >
-                                <attribute name="name" value="setLabel" id="5076" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="5077" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e609f0" id="5078" addr="0x7f99f1e609f0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e64e90" id="5079" addr="0x7f99f1e64e90" />
-                                <attribute name="kind" value="function" id="5080" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setLabel" id="5081" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e657f0" id="5082" addr="0x7f99f1e657f0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e657f0" id="5083" addr="0x7f99f1e657f0" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char)." id="5084" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e64e90" id="5085" addr="0x7f99f1e64e90" />
-                                <attribute name="access" value="public" id="5086" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e64e90" id="5087" addr="0x7f99f1e64e90" />
-                                <parmlist id="5088" addr="0x7f99f1e64f50" >
+                                        <attributelist id="5066" addr="0x7fca469b2dd0" >
+                                            <attribute name="name" value="label2" id="5067" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="5068" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="5069" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                    </parm >
+                                </parmlist >
+                                <attribute name="sym_overloaded" value="0x7fca469b2e90" id="5070" addr="0x7fca469b2e90" />
+                                <attribute name="type" value="void" id="5071" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="5072" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="5073" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="5074" addr="0x7fca469b3390" >
+                            <attributelist id="5075" addr="0x7fca469b3390" >
+                                <attribute name="name" value="setLabel" id="5076" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="5077" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469ae9f0" id="5078" addr="0x7fca469ae9f0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469b2e90" id="5079" addr="0x7fca469b2e90" />
+                                <attribute name="kind" value="function" id="5080" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setLabel" id="5081" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469b37f0" id="5082" addr="0x7fca469b37f0" />
+                                <attribute name="sym_nextSibling" value="0x7fca469b37f0" id="5083" addr="0x7fca469b37f0" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char)." id="5084" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469b2e90" id="5085" addr="0x7fca469b2e90" />
+                                <attribute name="access" value="public" id="5086" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469b2e90" id="5087" addr="0x7fca469b2e90" />
+                                <parmlist id="5088" addr="0x7fca469b2f50" >
                                     <parm id="5089">
-                                        <attributelist id="5090" addr="0x7f99f1e64f50" >
-                                            <attribute name="name" value="label" id="5091" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="5092" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="5093" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5090" addr="0x7fca469b2f50" >
+                                            <attribute name="name" value="label" id="5091" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="5092" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="5093" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5094">
-                                        <attributelist id="5095" addr="0x7f99f1e65050" >
-                                            <attribute name="name" value="font" id="5096" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5097" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5098" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5095" addr="0x7fca469b3050" >
+                                            <attribute name="name" value="font" id="5096" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5097" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5098" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5099">
-                                        <attributelist id="5100" addr="0x7f99f1e650f0" >
-                                            <attribute name="name" value="textColor" id="5101" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5102" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5103" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5100" addr="0x7fca469b30f0" >
+                                            <attribute name="name" value="textColor" id="5101" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5102" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5103" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5104">
-                                        <attributelist id="5105" addr="0x7f99f1e65190" >
-                                            <attribute name="name" value="disabledColor" id="5106" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5107" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5108" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5105" addr="0x7fca469b3190" >
+                                            <attribute name="name" value="disabledColor" id="5106" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5107" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5108" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5109">
-                                        <attributelist id="5110" addr="0x7f99f1e65230" >
-                                            <attribute name="name" value="shadowColor" id="5111" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5112" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5113" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5110" addr="0x7fca469b3230" >
+                                            <attribute name="name" value="shadowColor" id="5111" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5112" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5113" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5114">
-                                        <attributelist id="5115" addr="0x7f99f1e652d0" >
-                                            <attribute name="name" value="focusedColor" id="5116" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5117" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5118" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                    </parm >
-                                </parmlist >
-                                <attribute name="type" value="void" id="5119" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="5120" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="5121" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="5122" addr="0x7f99f1e657f0" >
-                            <attributelist id="5123" addr="0x7f99f1e657f0" >
-                                <attribute name="name" value="setLabel" id="5124" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="5125" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e609f0" id="5126" addr="0x7f99f1e609f0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e65390" id="5127" addr="0x7f99f1e65390" />
-                                <attribute name="kind" value="function" id="5128" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setLabel" id="5129" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e65bb0" id="5130" addr="0x7f99f1e65bb0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e65bb0" id="5131" addr="0x7f99f1e65bb0" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char)." id="5132" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e64e90" id="5133" addr="0x7f99f1e64e90" />
-                                <attribute name="access" value="public" id="5134" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e64e90" id="5135" addr="0x7f99f1e64e90" />
-                                <parmlist id="5136" addr="0x7f99f1e65450" >
+                                        <attributelist id="5115" addr="0x7fca469b32d0" >
+                                            <attribute name="name" value="focusedColor" id="5116" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5117" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5118" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                    </parm >
+                                </parmlist >
+                                <attribute name="type" value="void" id="5119" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="5120" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="5121" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="5122" addr="0x7fca469b37f0" >
+                            <attributelist id="5123" addr="0x7fca469b37f0" >
+                                <attribute name="name" value="setLabel" id="5124" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="5125" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469ae9f0" id="5126" addr="0x7fca469ae9f0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469b3390" id="5127" addr="0x7fca469b3390" />
+                                <attribute name="kind" value="function" id="5128" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setLabel" id="5129" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469b3bb0" id="5130" addr="0x7fca469b3bb0" />
+                                <attribute name="sym_nextSibling" value="0x7fca469b3bb0" id="5131" addr="0x7fca469b3bb0" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char)." id="5132" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469b2e90" id="5133" addr="0x7fca469b2e90" />
+                                <attribute name="access" value="public" id="5134" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469b2e90" id="5135" addr="0x7fca469b2e90" />
+                                <parmlist id="5136" addr="0x7fca469b3450" >
                                     <parm id="5137">
-                                        <attributelist id="5138" addr="0x7f99f1e65450" >
-                                            <attribute name="name" value="label" id="5139" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="5140" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="5141" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5138" addr="0x7fca469b3450" >
+                                            <attribute name="name" value="label" id="5139" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="5140" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="5141" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5142">
-                                        <attributelist id="5143" addr="0x7f99f1e65550" >
-                                            <attribute name="name" value="font" id="5144" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5145" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5146" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5143" addr="0x7fca469b3550" >
+                                            <attribute name="name" value="font" id="5144" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5145" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5146" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5147">
-                                        <attributelist id="5148" addr="0x7f99f1e655f0" >
-                                            <attribute name="name" value="textColor" id="5149" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5150" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5151" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5148" addr="0x7fca469b35f0" >
+                                            <attribute name="name" value="textColor" id="5149" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5150" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5151" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5152">
-                                        <attributelist id="5153" addr="0x7f99f1e65690" >
-                                            <attribute name="name" value="disabledColor" id="5154" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5155" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5156" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5153" addr="0x7fca469b3690" >
+                                            <attribute name="name" value="disabledColor" id="5154" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5155" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5156" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5157">
-                                        <attributelist id="5158" addr="0x7f99f1e65730" >
-                                            <attribute name="name" value="shadowColor" id="5159" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5160" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5161" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                    </parm >
-                                </parmlist >
-                                <attribute name="type" value="void" id="5162" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_2" id="5163" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="5164" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="5165" addr="0x7f99f1e65bb0" >
-                            <attributelist id="5166" addr="0x7f99f1e65bb0" >
-                                <attribute name="name" value="setLabel" id="5167" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="5168" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e609f0" id="5169" addr="0x7f99f1e609f0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e657f0" id="5170" addr="0x7f99f1e657f0" />
-                                <attribute name="kind" value="function" id="5171" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setLabel" id="5172" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e65ed0" id="5173" addr="0x7f99f1e65ed0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e65ed0" id="5174" addr="0x7f99f1e65ed0" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char,p.q(const).char)." id="5175" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e64e90" id="5176" addr="0x7f99f1e64e90" />
-                                <attribute name="access" value="public" id="5177" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e64e90" id="5178" addr="0x7f99f1e64e90" />
-                                <parmlist id="5179" addr="0x7f99f1e658b0" >
+                                        <attributelist id="5158" addr="0x7fca469b3730" >
+                                            <attribute name="name" value="shadowColor" id="5159" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5160" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5161" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                    </parm >
+                                </parmlist >
+                                <attribute name="type" value="void" id="5162" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_2" id="5163" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="5164" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="5165" addr="0x7fca469b3bb0" >
+                            <attributelist id="5166" addr="0x7fca469b3bb0" >
+                                <attribute name="name" value="setLabel" id="5167" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="5168" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469ae9f0" id="5169" addr="0x7fca469ae9f0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469b37f0" id="5170" addr="0x7fca469b37f0" />
+                                <attribute name="kind" value="function" id="5171" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setLabel" id="5172" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469b3ed0" id="5173" addr="0x7fca469b3ed0" />
+                                <attribute name="sym_nextSibling" value="0x7fca469b3ed0" id="5174" addr="0x7fca469b3ed0" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char,p.q(const).char)." id="5175" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469b2e90" id="5176" addr="0x7fca469b2e90" />
+                                <attribute name="access" value="public" id="5177" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469b2e90" id="5178" addr="0x7fca469b2e90" />
+                                <parmlist id="5179" addr="0x7fca469b38b0" >
                                     <parm id="5180">
-                                        <attributelist id="5181" addr="0x7f99f1e658b0" >
-                                            <attribute name="name" value="label" id="5182" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="5183" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="5184" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5181" addr="0x7fca469b38b0" >
+                                            <attribute name="name" value="label" id="5182" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="5183" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="5184" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5185">
-                                        <attributelist id="5186" addr="0x7f99f1e659b0" >
-                                            <attribute name="name" value="font" id="5187" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5188" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5189" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5186" addr="0x7fca469b39b0" >
+                                            <attribute name="name" value="font" id="5187" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5188" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5189" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5190">
-                                        <attributelist id="5191" addr="0x7f99f1e65a50" >
-                                            <attribute name="name" value="textColor" id="5192" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5193" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5194" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5191" addr="0x7fca469b3a50" >
+                                            <attribute name="name" value="textColor" id="5192" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5193" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5194" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5195">
-                                        <attributelist id="5196" addr="0x7f99f1e65af0" >
-                                            <attribute name="name" value="disabledColor" id="5197" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5198" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5199" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                    </parm >
-                                </parmlist >
-                                <attribute name="type" value="void" id="5200" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_3" id="5201" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="5202" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="5203" addr="0x7f99f1e65ed0" >
-                            <attributelist id="5204" addr="0x7f99f1e65ed0" >
-                                <attribute name="name" value="setLabel" id="5205" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="5206" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e609f0" id="5207" addr="0x7f99f1e609f0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e65bb0" id="5208" addr="0x7f99f1e65bb0" />
-                                <attribute name="kind" value="function" id="5209" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setLabel" id="5210" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e66150" id="5211" addr="0x7f99f1e66150" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e66150" id="5212" addr="0x7f99f1e66150" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char)." id="5213" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e64e90" id="5214" addr="0x7f99f1e64e90" />
-                                <attribute name="access" value="public" id="5215" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e64e90" id="5216" addr="0x7f99f1e64e90" />
-                                <parmlist id="5217" addr="0x7f99f1e65c70" >
+                                        <attributelist id="5196" addr="0x7fca469b3af0" >
+                                            <attribute name="name" value="disabledColor" id="5197" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5198" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5199" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                    </parm >
+                                </parmlist >
+                                <attribute name="type" value="void" id="5200" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_3" id="5201" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="5202" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="5203" addr="0x7fca469b3ed0" >
+                            <attributelist id="5204" addr="0x7fca469b3ed0" >
+                                <attribute name="name" value="setLabel" id="5205" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="5206" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469ae9f0" id="5207" addr="0x7fca469ae9f0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469b3bb0" id="5208" addr="0x7fca469b3bb0" />
+                                <attribute name="kind" value="function" id="5209" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setLabel" id="5210" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469b4150" id="5211" addr="0x7fca469b4150" />
+                                <attribute name="sym_nextSibling" value="0x7fca469b4150" id="5212" addr="0x7fca469b4150" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char)." id="5213" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469b2e90" id="5214" addr="0x7fca469b2e90" />
+                                <attribute name="access" value="public" id="5215" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469b2e90" id="5216" addr="0x7fca469b2e90" />
+                                <parmlist id="5217" addr="0x7fca469b3c70" >
                                     <parm id="5218">
-                                        <attributelist id="5219" addr="0x7f99f1e65c70" >
-                                            <attribute name="name" value="label" id="5220" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="5221" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="5222" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5219" addr="0x7fca469b3c70" >
+                                            <attribute name="name" value="label" id="5220" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="5221" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="5222" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5223">
-                                        <attributelist id="5224" addr="0x7f99f1e65d70" >
-                                            <attribute name="name" value="font" id="5225" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5226" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5227" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5224" addr="0x7fca469b3d70" >
+                                            <attribute name="name" value="font" id="5225" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5226" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5227" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5228">
-                                        <attributelist id="5229" addr="0x7f99f1e65e10" >
-                                            <attribute name="name" value="textColor" id="5230" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5231" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5232" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                    </parm >
-                                </parmlist >
-                                <attribute name="type" value="void" id="5233" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_4" id="5234" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="5235" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="5236" addr="0x7f99f1e66150" >
-                            <attributelist id="5237" addr="0x7f99f1e66150" >
-                                <attribute name="name" value="setLabel" id="5238" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="5239" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e609f0" id="5240" addr="0x7f99f1e609f0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e65ed0" id="5241" addr="0x7f99f1e65ed0" />
-                                <attribute name="kind" value="function" id="5242" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setLabel" id="5243" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e66330" id="5244" addr="0x7f99f1e66330" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e66330" id="5245" addr="0x7f99f1e66330" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char)." id="5246" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e64e90" id="5247" addr="0x7f99f1e64e90" />
-                                <attribute name="access" value="public" id="5248" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e64e90" id="5249" addr="0x7f99f1e64e90" />
-                                <parmlist id="5250" addr="0x7f99f1e65f90" >
+                                        <attributelist id="5229" addr="0x7fca469b3e10" >
+                                            <attribute name="name" value="textColor" id="5230" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5231" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5232" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                    </parm >
+                                </parmlist >
+                                <attribute name="type" value="void" id="5233" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_4" id="5234" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="5235" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="5236" addr="0x7fca469b4150" >
+                            <attributelist id="5237" addr="0x7fca469b4150" >
+                                <attribute name="name" value="setLabel" id="5238" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="5239" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469ae9f0" id="5240" addr="0x7fca469ae9f0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469b3ed0" id="5241" addr="0x7fca469b3ed0" />
+                                <attribute name="kind" value="function" id="5242" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setLabel" id="5243" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469b4330" id="5244" addr="0x7fca469b4330" />
+                                <attribute name="sym_nextSibling" value="0x7fca469b4330" id="5245" addr="0x7fca469b4330" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char)." id="5246" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469b2e90" id="5247" addr="0x7fca469b2e90" />
+                                <attribute name="access" value="public" id="5248" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469b2e90" id="5249" addr="0x7fca469b2e90" />
+                                <parmlist id="5250" addr="0x7fca469b3f90" >
                                     <parm id="5251">
-                                        <attributelist id="5252" addr="0x7f99f1e65f90" >
-                                            <attribute name="name" value="label" id="5253" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="5254" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="5255" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5252" addr="0x7fca469b3f90" >
+                                            <attribute name="name" value="label" id="5253" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="5254" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="5255" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5256">
-                                        <attributelist id="5257" addr="0x7f99f1e66090" >
-                                            <attribute name="name" value="font" id="5258" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5259" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5260" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                    </parm >
-                                </parmlist >
-                                <attribute name="type" value="void" id="5261" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_5" id="5262" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="5263" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="5264" addr="0x7f99f1e66330" >
-                            <attributelist id="5265" addr="0x7f99f1e66330" >
-                                <attribute name="name" value="setLabel" id="5266" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="5267" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e609f0" id="5268" addr="0x7f99f1e609f0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e66150" id="5269" addr="0x7f99f1e66150" />
-                                <attribute name="kind" value="function" id="5270" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setLabel" id="5271" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e66450" id="5272" addr="0x7f99f1e66450" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e66450" id="5273" addr="0x7f99f1e66450" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="5274" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e64e90" id="5275" addr="0x7f99f1e64e90" />
-                                <attribute name="access" value="public" id="5276" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e64e90" id="5277" addr="0x7f99f1e64e90" />
-                                <parmlist id="5278" addr="0x7f99f1e66210" >
+                                        <attributelist id="5257" addr="0x7fca469b4090" >
+                                            <attribute name="name" value="font" id="5258" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5259" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5260" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                    </parm >
+                                </parmlist >
+                                <attribute name="type" value="void" id="5261" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_5" id="5262" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="5263" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="5264" addr="0x7fca469b4330" >
+                            <attributelist id="5265" addr="0x7fca469b4330" >
+                                <attribute name="name" value="setLabel" id="5266" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="5267" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469ae9f0" id="5268" addr="0x7fca469ae9f0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469b4150" id="5269" addr="0x7fca469b4150" />
+                                <attribute name="kind" value="function" id="5270" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setLabel" id="5271" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469b4450" id="5272" addr="0x7fca469b4450" />
+                                <attribute name="sym_nextSibling" value="0x7fca469b4450" id="5273" addr="0x7fca469b4450" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="5274" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469b2e90" id="5275" addr="0x7fca469b2e90" />
+                                <attribute name="access" value="public" id="5276" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469b2e90" id="5277" addr="0x7fca469b2e90" />
+                                <parmlist id="5278" addr="0x7fca469b4210" >
                                     <parm id="5279">
-                                        <attributelist id="5280" addr="0x7f99f1e66210" >
-                                            <attribute name="name" value="label" id="5281" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="5282" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="5283" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                    </parm >
-                                </parmlist >
-                                <attribute name="type" value="void" id="5284" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_6" id="5285" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="5286" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="5287" addr="0x7f99f1e66450" >
-                            <attributelist id="5288" addr="0x7f99f1e66450" >
-                                <attribute name="name" value="setLabel" id="5289" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="5290" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e609f0" id="5291" addr="0x7f99f1e609f0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e66330" id="5292" addr="0x7f99f1e66330" />
-                                <attribute name="kind" value="function" id="5293" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setLabel" id="5294" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e64e90" id="5295" addr="0x7f99f1e64e90" />
-                                <attribute name="decl" value="f()." id="5296" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="5297" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e64e90" id="5298" addr="0x7f99f1e64e90" />
-                                <attribute name="type" value="void" id="5299" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_7" id="5300" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="5301" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="5302" addr="0x7f99f1e66670" >
-                            <attributelist id="5303" addr="0x7f99f1e66670" >
-                                <attribute name="name" value="getLabel" id="5304" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="5305" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e609f0" id="5306" addr="0x7f99f1e609f0" />
-                                <attribute name="kind" value="function" id="5307" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getLabel" id="5308" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="5309" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="5310" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="XBMCAddon::String" id="5311" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="5312" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="5313" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="5314" addr="0x7f99f1e66990" >
-                            <attributelist id="5315" addr="0x7f99f1e66990" >
-                                <attribute name="name" value="setText" id="5316" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="5317" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e609f0" id="5318" addr="0x7f99f1e609f0" />
-                                <attribute name="kind" value="function" id="5319" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setText" id="5320" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="5321" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="5322" addr="0x7f99f1de6c90" />
-                                <parmlist id="5323" addr="0x7f99f1e668d0" >
+                                        <attributelist id="5280" addr="0x7fca469b4210" >
+                                            <attribute name="name" value="label" id="5281" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="5282" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="5283" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                    </parm >
+                                </parmlist >
+                                <attribute name="type" value="void" id="5284" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_6" id="5285" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="5286" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="5287" addr="0x7fca469b4450" >
+                            <attributelist id="5288" addr="0x7fca469b4450" >
+                                <attribute name="name" value="setLabel" id="5289" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="5290" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469ae9f0" id="5291" addr="0x7fca469ae9f0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469b4330" id="5292" addr="0x7fca469b4330" />
+                                <attribute name="kind" value="function" id="5293" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setLabel" id="5294" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469b2e90" id="5295" addr="0x7fca469b2e90" />
+                                <attribute name="decl" value="f()." id="5296" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="5297" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469b2e90" id="5298" addr="0x7fca469b2e90" />
+                                <attribute name="type" value="void" id="5299" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_7" id="5300" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="5301" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="5302" addr="0x7fca469b4670" >
+                            <attributelist id="5303" addr="0x7fca469b4670" >
+                                <attribute name="name" value="getLabel" id="5304" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="5305" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469ae9f0" id="5306" addr="0x7fca469ae9f0" />
+                                <attribute name="kind" value="function" id="5307" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getLabel" id="5308" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="5309" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="5310" addr="0x7fca46934c90" />
+                                <attribute name="type" value="XBMCAddon::String" id="5311" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="5312" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="5313" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="5314" addr="0x7fca469b4990" >
+                            <attributelist id="5315" addr="0x7fca469b4990" >
+                                <attribute name="name" value="setText" id="5316" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="5317" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469ae9f0" id="5318" addr="0x7fca469ae9f0" />
+                                <attribute name="kind" value="function" id="5319" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setText" id="5320" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="5321" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="5322" addr="0x7fca46934c90" />
+                                <parmlist id="5323" addr="0x7fca469b48d0" >
                                     <parm id="5324">
-                                        <attributelist id="5325" addr="0x7f99f1e668d0" >
-                                            <attribute name="name" value="text" id="5326" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="5327" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5325" addr="0x7fca469b48d0" >
+                                            <attribute name="name" value="text" id="5326" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="5327" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="5328" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="5329" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="5330" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="5328" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="5329" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="5330" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="5331" addr="0x7f99f1e66b90" >
-                            <attributelist id="5332" addr="0x7f99f1e66b90" >
-                                <attribute name="name" value="getText" id="5333" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="5334" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e609f0" id="5335" addr="0x7f99f1e609f0" />
-                                <attribute name="kind" value="function" id="5336" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getText" id="5337" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="5338" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="5339" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="XBMCAddon::String" id="5340" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="5341" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="5342" addr="0x7f99f1de6c90" />
+                        <cdecl id="5331" addr="0x7fca469b4b90" >
+                            <attributelist id="5332" addr="0x7fca469b4b90" >
+                                <attribute name="name" value="getText" id="5333" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="5334" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469ae9f0" id="5335" addr="0x7fca469ae9f0" />
+                                <attribute name="kind" value="function" id="5336" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getText" id="5337" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="5338" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="5339" addr="0x7fca46934c90" />
+                                <attribute name="type" value="XBMCAddon::String" id="5340" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="5341" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="5342" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="5343" addr="0x7f99f1e66fd0" >
-                            <attributelist id="5344" addr="0x7f99f1e66fd0" >
-                                <attribute name="name" value="setType" id="5345" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="5346" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e609f0" id="5347" addr="0x7f99f1e609f0" />
-                                <attribute name="kind" value="function" id="5348" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setType" id="5349" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String)." id="5350" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="5351" addr="0x7f99f1de6c90" />
-                                <parmlist id="5352" addr="0x7f99f1e66dd0" >
+                        <cdecl id="5343" addr="0x7fca469b4fd0" >
+                            <attributelist id="5344" addr="0x7fca469b4fd0" >
+                                <attribute name="name" value="setType" id="5345" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="5346" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469ae9f0" id="5347" addr="0x7fca469ae9f0" />
+                                <attribute name="kind" value="function" id="5348" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setType" id="5349" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String)." id="5350" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="5351" addr="0x7fca46934c90" />
+                                <parmlist id="5352" addr="0x7fca469b4dd0" >
                                     <parm id="5353">
-                                        <attributelist id="5354" addr="0x7f99f1e66dd0" >
-                                            <attribute name="name" value="type" id="5355" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="5356" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5354" addr="0x7fca469b4dd0" >
+                                            <attribute name="name" value="type" id="5355" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="5356" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5357">
-                                        <attributelist id="5358" addr="0x7f99f1e66f10" >
-                                            <attribute name="name" value="heading" id="5359" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="5360" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5358" addr="0x7fca469b4f10" >
+                                            <attribute name="name" value="heading" id="5359" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="5360" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="5361" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="5362" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="5363" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="5361" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="5362" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="5363" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
                     </class >
-                    <class id="5364" addr="0x7f99f1e672b0" >
-                        <attributelist id="5365" addr="0x7f99f1e672b0" >
-                            <attribute name="name" value="XBMCAddon::xbmcgui::ControlList" id="5366" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="5367" addr="0x7f99f1e40fb0" />
-                            <attribute name="symtab" value="0x7f99f1e673f0" id="5368" addr="0x7f99f1e673f0" />
-                            <attribute name="allows_typedef" value="1" id="5369" addr="0x7f99f1de6c90" />
-                            <attribute name="typepass_visit" value="1" id="5370" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_visit" value="1" id="5371" addr="0x7f99f1de6c90" />
-                            <attribute name="kind" value="class" id="5372" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_name" value="ControlList" id="5373" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_has_constructor" value="1" id="5374" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_public_constructor" value="1" id="5375" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_has_destructor" value="1" id="5376" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_default_destructor" value="1" id="5377" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_copy_constructor" value="1" id="5378" addr="0x7f99f1de6c90" />
-                            <attribute name="privatebaselist" value="0x7f99f1e67290" id="5379" addr="0x7f99f1e67290" />
-                            <attribute name="protectedbaselist" value="0x7f99f1e67270" id="5380" addr="0x7f99f1e67270" />
-                            <baselist id="5381" addr="0x7f99f1e67250" >
-                                <base name="Control" id="5382" addr="0x7f99f1e671d0" />
+                    <class id="5364" addr="0x7fca469b52b0" >
+                        <attributelist id="5365" addr="0x7fca469b52b0" >
+                            <attribute name="name" value="XBMCAddon::xbmcgui::ControlList" id="5366" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="5367" addr="0x7fca4698efb0" />
+                            <attribute name="symtab" value="0x7fca469b53f0" id="5368" addr="0x7fca469b53f0" />
+                            <attribute name="allows_typedef" value="1" id="5369" addr="0x7fca46934c90" />
+                            <attribute name="typepass_visit" value="1" id="5370" addr="0x7fca46934c90" />
+                            <attribute name="allocate_visit" value="1" id="5371" addr="0x7fca46934c90" />
+                            <attribute name="kind" value="class" id="5372" addr="0x7fca46934c90" />
+                            <attribute name="sym_name" value="ControlList" id="5373" addr="0x7fca46934c90" />
+                            <attribute name="allocate_has_constructor" value="1" id="5374" addr="0x7fca46934c90" />
+                            <attribute name="allocate_public_constructor" value="1" id="5375" addr="0x7fca46934c90" />
+                            <attribute name="allocate_has_destructor" value="1" id="5376" addr="0x7fca46934c90" />
+                            <attribute name="allocate_default_destructor" value="1" id="5377" addr="0x7fca46934c90" />
+                            <attribute name="allocate_copy_constructor" value="1" id="5378" addr="0x7fca46934c90" />
+                            <attribute name="privatebaselist" value="0x7fca469b5290" id="5379" addr="0x7fca469b5290" />
+                            <attribute name="protectedbaselist" value="0x7fca469b5270" id="5380" addr="0x7fca469b5270" />
+                            <baselist id="5381" addr="0x7fca469b5250" >
+                                <base name="Control" id="5382" addr="0x7fca469b51d0" />
                             </baselist >
-                            <attribute name="module" value="xbmcgui" id="5383" addr="0x7f99f1e402f0" />
-                            <attribute name="bases" value="0x7f99f1dd9850" id="5384" addr="0x7f99f1dd9850" />
-                            <attribute name="allbases" value="0x7f99f1dd9af0" id="5385" addr="0x7f99f1dd9af0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="5386" addr="0x7f99f1de6c90" />
-                            <typescope id="5387" addr="0x7f99f1dd97d0" >
-                                <attributelist id="5388" addr="0x7f99f1dd97d0" >
-                                    <attribute name="inherit" value="0x7f99f1dd98d0" id="5389" addr="0x7f99f1dd98d0" />
-                                    <attribute name="name" value="ControlList" id="5390" addr="0x7f99f1de6c90" />
-                                    <typetab id="5391" addr="0x7f99f1dd97f0" >
-                                        <attributelist id="5392" addr="0x7f99f1dd97f0" >
+                            <attribute name="module" value="xbmcgui" id="5383" addr="0x7fca4698e2f0" />
+                            <attribute name="bases" value="0x7fca46927850" id="5384" addr="0x7fca46927850" />
+                            <attribute name="allbases" value="0x7fca46927af0" id="5385" addr="0x7fca46927af0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="5386" addr="0x7fca46934c90" />
+                            <typescope id="5387" addr="0x7fca469277d0" >
+                                <attributelist id="5388" addr="0x7fca469277d0" >
+                                    <attribute name="inherit" value="0x7fca469278d0" id="5389" addr="0x7fca469278d0" />
+                                    <attribute name="name" value="ControlList" id="5390" addr="0x7fca46934c90" />
+                                    <typetab id="5391" addr="0x7fca469277f0" >
+                                        <attributelist id="5392" addr="0x7fca469277f0" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f99f1dd2150" id="5393" addr="0x7f99f1dd2150" />
-                                    <attribute name="qname" value="XBMCAddon::xbmcgui::ControlList" id="5394" addr="0x7f99f1de6c90" />
-                                    <attribute name="symtab" value="0x7f99f1e673f0" id="5395" addr="0x7f99f1e673f0" />
+                                    <attribute name="parent" value="0x7fca46920150" id="5393" addr="0x7fca46920150" />
+                                    <attribute name="qname" value="XBMCAddon::xbmcgui::ControlList" id="5394" addr="0x7fca46934c90" />
+                                    <attribute name="symtab" value="0x7fca469b53f0" id="5395" addr="0x7fca469b53f0" />
                                 </attributelist >
-                                <typescopesitem id="5396" addr="0x7f99f1dd98d0" >
-                                    <attributelist id="5397" addr="0x7f99f1dd98d0" >
+                                <typescopesitem id="5396" addr="0x7fca469278d0" >
+                                    <attributelist id="5397" addr="0x7fca469278d0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="5398" addr="0x7f99f1dd9770" >
-                                    <attributelist id="5399" addr="0x7f99f1dd9770" >
+                                <typescopesitem id="5398" addr="0x7fca46927770" >
+                                    <attributelist id="5399" addr="0x7fca46927770" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="5400" addr="0x7f99f1dd97f0" >
-                                    <attributelist id="5401" addr="0x7f99f1dd97f0" >
+                                <typescopesitem id="5400" addr="0x7fca469277f0" >
+                                    <attributelist id="5401" addr="0x7fca469277f0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="5402" addr="0x7f99f1dd2150" >
-                                    <attributelist id="5403" addr="0x7f99f1dd2150" >
-                                        <attribute name="name" value="xbmcgui" id="5404" addr="0x7f99f1de6c90" />
-                                        <typetab id="5405" addr="0x7f99f1dd2170" >
-                                            <attributelist id="5406" addr="0x7f99f1dd2170" >
-                                                <attribute name="InterceptorBase" value="InterceptorBase" id="5407" addr="0x7f99f1de6c90" />
-                                                <attribute name="Dialog" value="Dialog" id="5408" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="5409" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="5410" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlTextBox" value="ControlTextBox" id="5411" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="5412" addr="0x7f99f1de6c90" />
-                                                <attribute name="Window" value="Window" id="5413" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="5414" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlList" value="ControlList" id="5415" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="5416" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlImage" value="ControlImage" id="5417" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlButton" value="ControlButton" id="5418" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlGroup" value="ControlGroup" id="5419" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogBusy" value="DialogBusy" id="5420" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="5421" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSpin" value="ControlSpin" id="5422" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlEdit" value="ControlEdit" id="5423" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="5424" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="5425" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlLabel" value="ControlLabel" id="5426" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlProgress" value="ControlProgress" id="5427" addr="0x7f99f1de6c90" />
-                                                <attribute name="Control" value="Control" id="5428" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSlider" value="ControlSlider" id="5429" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgress" value="DialogProgress" id="5430" addr="0x7f99f1de6c90" />
-                                                <attribute name="Action" value="Action" id="5431" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowDialog" value="WindowDialog" id="5432" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXML" value="WindowXML" id="5433" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItem" value="ListItem" id="5434" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="5435" addr="0x7f99f1de6c90" />
+                                <typescopesitem id="5402" addr="0x7fca46920150" >
+                                    <attributelist id="5403" addr="0x7fca46920150" >
+                                        <attribute name="name" value="xbmcgui" id="5404" addr="0x7fca46934c90" />
+                                        <typetab id="5405" addr="0x7fca46920170" >
+                                            <attributelist id="5406" addr="0x7fca46920170" >
+                                                <attribute name="InterceptorBase" value="InterceptorBase" id="5407" addr="0x7fca46934c90" />
+                                                <attribute name="Dialog" value="Dialog" id="5408" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="5409" addr="0x7fca46934c90" />
+                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="5410" addr="0x7fca46934c90" />
+                                                <attribute name="ControlTextBox" value="ControlTextBox" id="5411" addr="0x7fca46934c90" />
+                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="5412" addr="0x7fca46934c90" />
+                                                <attribute name="Window" value="Window" id="5413" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="5414" addr="0x7fca46934c90" />
+                                                <attribute name="ControlList" value="ControlList" id="5415" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="5416" addr="0x7fca46934c90" />
+                                                <attribute name="ControlImage" value="ControlImage" id="5417" addr="0x7fca46934c90" />
+                                                <attribute name="ControlButton" value="ControlButton" id="5418" addr="0x7fca46934c90" />
+                                                <attribute name="ControlGroup" value="ControlGroup" id="5419" addr="0x7fca46934c90" />
+                                                <attribute name="DialogBusy" value="DialogBusy" id="5420" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="5421" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSpin" value="ControlSpin" id="5422" addr="0x7fca46934c90" />
+                                                <attribute name="ControlEdit" value="ControlEdit" id="5423" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="5424" addr="0x7fca46934c90" />
+                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="5425" addr="0x7fca46934c90" />
+                                                <attribute name="ControlLabel" value="ControlLabel" id="5426" addr="0x7fca46934c90" />
+                                                <attribute name="ControlProgress" value="ControlProgress" id="5427" addr="0x7fca46934c90" />
+                                                <attribute name="Control" value="Control" id="5428" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSlider" value="ControlSlider" id="5429" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgress" value="DialogProgress" id="5430" addr="0x7fca46934c90" />
+                                                <attribute name="Action" value="Action" id="5431" addr="0x7fca46934c90" />
+                                                <attribute name="WindowDialog" value="WindowDialog" id="5432" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXML" value="WindowXML" id="5433" addr="0x7fca46934c90" />
+                                                <attribute name="ListItem" value="ListItem" id="5434" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="5435" addr="0x7fca46934c90" />
                                             </attributelist >
-                                            <typetabsitem id="5436" addr="0x7f99f1de1dd0" >
-                                                <attributelist id="5437" addr="0x7f99f1de1dd0" >
+                                            <typetabsitem id="5436" addr="0x7fca4692fdd0" >
+                                                <attributelist id="5437" addr="0x7fca4692fdd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5438" addr="0x7f99f1dde790" >
-                                                <attributelist id="5439" addr="0x7f99f1dde790" >
+                                            <typetabsitem id="5438" addr="0x7fca4692c790" >
+                                                <attributelist id="5439" addr="0x7fca4692c790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5440" addr="0x7f99f1de3f10" >
-                                                <attributelist id="5441" addr="0x7f99f1de3f10" >
+                                            <typetabsitem id="5440" addr="0x7fca46931f10" >
+                                                <attributelist id="5441" addr="0x7fca46931f10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5442" addr="0x7f99f1dd67b0" >
-                                                <attributelist id="5443" addr="0x7f99f1dd67b0" >
+                                            <typetabsitem id="5442" addr="0x7fca469247b0" >
+                                                <attributelist id="5443" addr="0x7fca469247b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5444" addr="0x7f99f1ddafd0" >
-                                                <attributelist id="5445" addr="0x7f99f1ddafd0" >
+                                            <typetabsitem id="5444" addr="0x7fca46928fd0" >
+                                                <attributelist id="5445" addr="0x7fca46928fd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5446" addr="0x7f99f1ddd430" >
-                                                <attributelist id="5447" addr="0x7f99f1ddd430" >
+                                            <typetabsitem id="5446" addr="0x7fca4692b430" >
+                                                <attributelist id="5447" addr="0x7fca4692b430" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5448" addr="0x7f99f1de2130" >
-                                                <attributelist id="5449" addr="0x7f99f1de2130" >
+                                            <typetabsitem id="5448" addr="0x7fca46930130" >
+                                                <attributelist id="5449" addr="0x7fca46930130" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5450" addr="0x7f99f1dd2f50" >
-                                                <attributelist id="5451" addr="0x7f99f1dd2f50" >
+                                            <typetabsitem id="5450" addr="0x7fca46920f50" >
+                                                <attributelist id="5451" addr="0x7fca46920f50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5452" addr="0x7f99f1dd9650" >
-                                                <attributelist id="5453" addr="0x7f99f1dd9650" >
+                                            <typetabsitem id="5452" addr="0x7fca46927650" >
+                                                <attributelist id="5453" addr="0x7fca46927650" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5454" addr="0x7f99f1de3390" >
-                                                <attributelist id="5455" addr="0x7f99f1de3390" >
+                                            <typetabsitem id="5454" addr="0x7fca46931390" >
+                                                <attributelist id="5455" addr="0x7fca46931390" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5456" addr="0x7f99f1ddb7b0" >
-                                                <attributelist id="5457" addr="0x7f99f1ddb7b0" >
+                                            <typetabsitem id="5456" addr="0x7fca469297b0" >
+                                                <attributelist id="5457" addr="0x7fca469297b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5458" addr="0x7f99f1ddc4b0" >
-                                                <attributelist id="5459" addr="0x7f99f1ddc4b0" >
+                                            <typetabsitem id="5458" addr="0x7fca4692a4b0" >
+                                                <attributelist id="5459" addr="0x7fca4692a4b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5460" addr="0x7f99f1ddcf90" >
-                                                <attributelist id="5461" addr="0x7f99f1ddcf90" >
+                                            <typetabsitem id="5460" addr="0x7fca4692af90" >
+                                                <attributelist id="5461" addr="0x7fca4692af90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5462" addr="0x7f99f1de11b0" >
-                                                <attributelist id="5463" addr="0x7f99f1de11b0" >
+                                            <typetabsitem id="5462" addr="0x7fca4692f1b0" >
+                                                <attributelist id="5463" addr="0x7fca4692f1b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5464" addr="0x7f99f1de15b0" >
-                                                <attributelist id="5465" addr="0x7f99f1de15b0" >
+                                            <typetabsitem id="5464" addr="0x7fca4692f5b0" >
+                                                <attributelist id="5465" addr="0x7fca4692f5b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5466" addr="0x7f99f1dd77f0" >
-                                                <attributelist id="5467" addr="0x7f99f1dd77f0" >
+                                            <typetabsitem id="5466" addr="0x7fca469257f0" >
+                                                <attributelist id="5467" addr="0x7fca469257f0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5468" addr="0x7f99f1dd8b30" >
-                                                <attributelist id="5469" addr="0x7f99f1dd8b30" >
+                                            <typetabsitem id="5468" addr="0x7fca46926b30" >
+                                                <attributelist id="5469" addr="0x7fca46926b30" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5470" addr="0x7f99f1dd2c50" >
-                                                <attributelist id="5471" addr="0x7f99f1dd2c50" >
+                                            <typetabsitem id="5470" addr="0x7fca46920c50" >
+                                                <attributelist id="5471" addr="0x7fca46920c50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5472" addr="0x7f99f1dda790" >
-                                                <attributelist id="5473" addr="0x7f99f1dda790" >
+                                            <typetabsitem id="5472" addr="0x7fca46928790" >
+                                                <attributelist id="5473" addr="0x7fca46928790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5474" addr="0x7f99f1dd8030" >
-                                                <attributelist id="5475" addr="0x7f99f1dd8030" >
+                                            <typetabsitem id="5474" addr="0x7fca46926030" >
+                                                <attributelist id="5475" addr="0x7fca46926030" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5476" addr="0x7f99f1ddbe10" >
-                                                <attributelist id="5477" addr="0x7f99f1ddbe10" >
+                                            <typetabsitem id="5476" addr="0x7fca46929e10" >
+                                                <attributelist id="5477" addr="0x7fca46929e10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5478" addr="0x7f99f1dd6b10" >
-                                                <attributelist id="5479" addr="0x7f99f1dd6b10" >
+                                            <typetabsitem id="5478" addr="0x7fca46924b10" >
+                                                <attributelist id="5479" addr="0x7fca46924b10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5480" addr="0x7f99f1dddf90" >
-                                                <attributelist id="5481" addr="0x7f99f1dddf90" >
+                                            <typetabsitem id="5480" addr="0x7fca4692bf90" >
+                                                <attributelist id="5481" addr="0x7fca4692bf90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5482" addr="0x7f99f1de0530" >
-                                                <attributelist id="5483" addr="0x7f99f1de0530" >
+                                            <typetabsitem id="5482" addr="0x7fca4692e530" >
+                                                <attributelist id="5483" addr="0x7fca4692e530" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5484" addr="0x7f99f1de1e50" >
-                                                <attributelist id="5485" addr="0x7f99f1de1e50" >
+                                            <typetabsitem id="5484" addr="0x7fca4692fe50" >
+                                                <attributelist id="5485" addr="0x7fca4692fe50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5486" addr="0x7f99f1de2d90" >
-                                                <attributelist id="5487" addr="0x7f99f1de2d90" >
+                                            <typetabsitem id="5486" addr="0x7fca46930d90" >
+                                                <attributelist id="5487" addr="0x7fca46930d90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5488" addr="0x7f99f1de3410" >
-                                                <attributelist id="5489" addr="0x7f99f1de3410" >
+                                            <typetabsitem id="5488" addr="0x7fca46931410" >
+                                                <attributelist id="5489" addr="0x7fca46931410" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5490" addr="0x7f99f1dd3590" >
-                                                <attributelist id="5491" addr="0x7f99f1dd3590" >
+                                            <typetabsitem id="5490" addr="0x7fca46921590" >
+                                                <attributelist id="5491" addr="0x7fca46921590" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="5492" addr="0x7f99f1dd3390" >
-                                                <attributelist id="5493" addr="0x7f99f1dd3390" >
+                                            <typetabsitem id="5492" addr="0x7fca46921390" >
+                                                <attributelist id="5493" addr="0x7fca46921390" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7f99f1dd1d70" id="5494" addr="0x7f99f1dd1d70" />
-                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="5495" addr="0x7f99f1de6c90" />
-                                        <attribute name="symtab" value="0x7f99f1e40fb0" id="5496" addr="0x7f99f1e40fb0" />
+                                        <attribute name="parent" value="0x7fca4691fd70" id="5494" addr="0x7fca4691fd70" />
+                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="5495" addr="0x7fca46934c90" />
+                                        <attribute name="symtab" value="0x7fca4698efb0" id="5496" addr="0x7fca4698efb0" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="5497" addr="0x7f99f1dd9810" >
-                                    <attributelist id="5498" addr="0x7f99f1dd9810" >
+                                <typescopesitem id="5497" addr="0x7fca46927810" >
+                                    <attributelist id="5498" addr="0x7fca46927810" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="5499" addr="0x7f99f1e673f0" >
-                                    <attributelist id="5500" addr="0x7f99f1e673f0" >
-                                        <attribute name="inherit" value="0x7f99f1e67450" id="5501" addr="0x7f99f1e67450" />
-                                        <attribute name="name" value="ControlList" id="5502" addr="0x7f99f1de6c90" />
-                                        <attribute name="csymtab" value="0x7f99f1e67410" id="5503" addr="0x7f99f1e67410" />
-                                        <attribute name="symtab" value="0x7f99f1e673d0" id="5504" addr="0x7f99f1e673d0" />
+                                <typescopesitem id="5499" addr="0x7fca469b53f0" >
+                                    <attributelist id="5500" addr="0x7fca469b53f0" >
+                                        <attribute name="inherit" value="0x7fca469b5450" id="5501" addr="0x7fca469b5450" />
+                                        <attribute name="name" value="ControlList" id="5502" addr="0x7fca46934c90" />
+                                        <attribute name="csymtab" value="0x7fca469b5410" id="5503" addr="0x7fca469b5410" />
+                                        <attribute name="symtab" value="0x7fca469b53d0" id="5504" addr="0x7fca469b53d0" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <cdecl id="5505" addr="0x7f99f1e67810" >
-                            <attributelist id="5506" addr="0x7f99f1e67810" >
-                                <attribute name="ismember" value="1" id="5507" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="internAddListItem" id="5508" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(AddonClass::Ref&lt;(XBMCAddon::xbmcgui::ListItem)>,bool)." id="5509" addr="0x7f99f1de6c90" />
-                                <parmlist id="5510" addr="0x7f99f1e67650" >
+                        <cdecl id="5505" addr="0x7fca469b5810" >
+                            <attributelist id="5506" addr="0x7fca469b5810" >
+                                <attribute name="ismember" value="1" id="5507" addr="0x7fca46934c90" />
+                                <attribute name="name" value="internAddListItem" id="5508" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(AddonClass::Ref&lt;(XBMCAddon::xbmcgui::ListItem)>,bool)." id="5509" addr="0x7fca46934c90" />
+                                <parmlist id="5510" addr="0x7fca469b5650" >
                                     <parm id="5511">
-                                        <attributelist id="5512" addr="0x7f99f1e67650" >
-                                            <attribute name="name" value="listitem" id="5513" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="AddonClass::Ref&lt;(XBMCAddon::xbmcgui::ListItem)>" id="5514" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5512" addr="0x7fca469b5650" >
+                                            <attribute name="name" value="listitem" id="5513" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="AddonClass::Ref&lt;(XBMCAddon::xbmcgui::ListItem)>" id="5514" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5515">
-                                        <attributelist id="5516" addr="0x7f99f1e67750" >
-                                            <attribute name="name" value="sendMessage" id="5517" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="5518" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5516" addr="0x7fca469b5750" >
+                                            <attribute name="name" value="sendMessage" id="5517" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="5518" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="access" value="private" id="5519" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="5520" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="void" id="5521" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e673f0" id="5522" addr="0x7f99f1e673f0" />
+                                <attribute name="access" value="private" id="5519" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="5520" addr="0x7fca46934c90" />
+                                <attribute name="type" value="void" id="5521" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469b53f0" id="5522" addr="0x7fca469b53f0" />
                             </attributelist >
                          
                         </cdecl >
-                        <access id="5523" addr="0x7f99f1e67930" >
-                            <attributelist id="5524" addr="0x7f99f1e67930" >
-                                <attribute name="kind" value="public" id="5525" addr="0x7f99f1de6c90" />
+                        <access id="5523" addr="0x7fca469b5930" >
+                            <attributelist id="5524" addr="0x7fca469b5930" >
+                                <attribute name="kind" value="public" id="5525" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="5526" addr="0x7f99f1e69030" >
-                            <attributelist id="5527" addr="0x7f99f1e69030" >
-                                <attribute name="name" value="ControlList" id="5528" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="5529" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e673f0" id="5530" addr="0x7f99f1e673f0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e69a10" id="5531" addr="0x7f99f1e69a10" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e69a10" id="5532" addr="0x7f99f1e69a10" />
-                                <attribute name="sym_name" value="ControlList" id="5533" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,long,long,long,long,long,long,long)." id="5534" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="5535" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e69030" id="5536" addr="0x7f99f1e69030" />
-                                <parmlist id="5537" addr="0x7f99f1e67a30" >
+                        <constructor id="5526" addr="0x7fca469b7030" >
+                            <attributelist id="5527" addr="0x7fca469b7030" >
+                                <attribute name="name" value="ControlList" id="5528" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="5529" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469b53f0" id="5530" addr="0x7fca469b53f0" />
+                                <attribute name="sym_nextSibling" value="0x7fca469b7a10" id="5531" addr="0x7fca469b7a10" />
+                                <attribute name="csym_nextSibling" value="0x7fca469b7a10" id="5532" addr="0x7fca469b7a10" />
+                                <attribute name="sym_name" value="ControlList" id="5533" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,long,long,long,long,long,long,long)." id="5534" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="5535" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469b7030" id="5536" addr="0x7fca469b7030" />
+                                <parmlist id="5537" addr="0x7fca469b5a30" >
                                     <parm id="5538">
-                                        <attributelist id="5539" addr="0x7f99f1e67a30" >
-                                            <attribute name="name" value="x" id="5540" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5541" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5539" addr="0x7fca469b5a30" >
+                                            <attribute name="name" value="x" id="5540" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5541" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5542">
-                                        <attributelist id="5543" addr="0x7f99f1e67b50" >
-                                            <attribute name="name" value="y" id="5544" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5545" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5543" addr="0x7fca469b5b50" >
+                                            <attribute name="name" value="y" id="5544" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5545" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5546">
-                                        <attributelist id="5547" addr="0x7f99f1e67c70" >
-                                            <attribute name="name" value="width" id="5548" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5549" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5547" addr="0x7fca469b5c70" >
+                                            <attribute name="name" value="width" id="5548" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5549" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5550">
-                                        <attributelist id="5551" addr="0x7f99f1e67d90" >
-                                            <attribute name="name" value="height" id="5552" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5553" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5551" addr="0x7fca469b5d90" >
+                                            <attribute name="name" value="height" id="5552" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5553" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5554">
-                                        <attributelist id="5555" addr="0x7f99f1e67f30" >
-                                            <attribute name="name" value="font" id="5556" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5557" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5558" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5555" addr="0x7fca469b5f30" >
+                                            <attribute name="name" value="font" id="5556" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5557" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5558" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5559">
-                                        <attributelist id="5560" addr="0x7f99f1e680d0" >
-                                            <attribute name="name" value="textColor" id="5561" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5562" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5563" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5560" addr="0x7fca469b60d0" >
+                                            <attribute name="name" value="textColor" id="5561" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5562" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5563" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5564">
-                                        <attributelist id="5565" addr="0x7f99f1e68270" >
-                                            <attribute name="name" value="buttonTexture" id="5566" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5567" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5568" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5565" addr="0x7fca469b6270" >
+                                            <attribute name="name" value="buttonTexture" id="5566" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5567" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5568" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5569">
-                                        <attributelist id="5570" addr="0x7f99f1e68410" >
-                                            <attribute name="name" value="buttonFocusTexture" id="5571" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5572" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5573" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5570" addr="0x7fca469b6410" >
+                                            <attribute name="name" value="buttonFocusTexture" id="5571" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5572" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5573" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5574">
-                                        <attributelist id="5575" addr="0x7f99f1e685b0" >
-                                            <attribute name="name" value="selectedColor" id="5576" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5577" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5578" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5575" addr="0x7fca469b65b0" >
+                                            <attribute name="name" value="selectedColor" id="5576" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5577" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5578" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5579">
-                                        <attributelist id="5580" addr="0x7f99f1e68710" >
-                                            <attribute name="name" value="_imageWidth" id="5581" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="5582" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5583" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5580" addr="0x7fca469b6710" >
+                                            <attribute name="name" value="_imageWidth" id="5581" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="5582" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5583" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5584">
-                                        <attributelist id="5585" addr="0x7f99f1e68870" >
-                                            <attribute name="name" value="_imageHeight" id="5586" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="5587" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5588" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5585" addr="0x7fca469b6870" >
+                                            <attribute name="name" value="_imageHeight" id="5586" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="5587" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5588" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5589">
-                                        <attributelist id="5590" addr="0x7f99f1e689d0" >
-                                            <attribute name="name" value="_itemTextXOffset" id="5591" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="5592" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5593" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5590" addr="0x7fca469b69d0" >
+                                            <attribute name="name" value="_itemTextXOffset" id="5591" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="5592" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5593" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5594">
-                                        <attributelist id="5595" addr="0x7f99f1e68b30" >
-                                            <attribute name="name" value="_itemTextYOffset" id="5596" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="2" id="5597" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5598" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5595" addr="0x7fca469b6b30" >
+                                            <attribute name="name" value="_itemTextYOffset" id="5596" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="2" id="5597" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5598" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5599">
-                                        <attributelist id="5600" addr="0x7f99f1e68c90" >
-                                            <attribute name="name" value="_itemHeight" id="5601" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="27" id="5602" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5603" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5600" addr="0x7fca469b6c90" >
+                                            <attribute name="name" value="_itemHeight" id="5601" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="27" id="5602" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5603" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5604">
-                                        <attributelist id="5605" addr="0x7f99f1e68df0" >
-                                            <attribute name="name" value="_space" id="5606" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="2" id="5607" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5608" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5605" addr="0x7fca469b6df0" >
+                                            <attribute name="name" value="_space" id="5606" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="2" id="5607" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5608" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5609">
-                                        <attributelist id="5610" addr="0x7f99f1e68f70" >
-                                            <attribute name="name" value="_alignmentY" id="5611" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBFONT_CENTER_Y" id="5612" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5613" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5610" addr="0x7fca469b6f70" >
+                                            <attribute name="name" value="_alignmentY" id="5611" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBFONT_CENTER_Y" id="5612" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5613" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_0" id="5614" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="5615" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="5614" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="5615" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="5616" addr="0x7f99f1e69a10" >
-                            <attributelist id="5617" addr="0x7f99f1e69a10" >
-                                <attribute name="name" value="ControlList" id="5618" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="5619" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e673f0" id="5620" addr="0x7f99f1e673f0" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e6a350" id="5621" addr="0x7f99f1e6a350" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e69030" id="5622" addr="0x7f99f1e69030" />
-                                <attribute name="sym_name" value="ControlList" id="5623" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e6a350" id="5624" addr="0x7f99f1e6a350" />
-                                <attribute name="defaultargs" value="0x7f99f1e69030" id="5625" addr="0x7f99f1e69030" />
-                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,long,long,long,long,long,long)." id="5626" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="5627" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e69030" id="5628" addr="0x7f99f1e69030" />
-                                <parmlist id="5629" addr="0x7f99f1e690d0" >
+                        <constructor id="5616" addr="0x7fca469b7a10" >
+                            <attributelist id="5617" addr="0x7fca469b7a10" >
+                                <attribute name="name" value="ControlList" id="5618" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="5619" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469b53f0" id="5620" addr="0x7fca469b53f0" />
+                                <attribute name="csym_nextSibling" value="0x7fca469b8350" id="5621" addr="0x7fca469b8350" />
+                                <attribute name="sym_previousSibling" value="0x7fca469b7030" id="5622" addr="0x7fca469b7030" />
+                                <attribute name="sym_name" value="ControlList" id="5623" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469b8350" id="5624" addr="0x7fca469b8350" />
+                                <attribute name="defaultargs" value="0x7fca469b7030" id="5625" addr="0x7fca469b7030" />
+                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,long,long,long,long,long,long)." id="5626" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="5627" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469b7030" id="5628" addr="0x7fca469b7030" />
+                                <parmlist id="5629" addr="0x7fca469b70d0" >
                                     <parm id="5630">
-                                        <attributelist id="5631" addr="0x7f99f1e690d0" >
-                                            <attribute name="name" value="x" id="5632" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5633" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5631" addr="0x7fca469b70d0" >
+                                            <attribute name="name" value="x" id="5632" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5633" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5634">
-                                        <attributelist id="5635" addr="0x7f99f1e69190" >
-                                            <attribute name="name" value="y" id="5636" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5637" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5635" addr="0x7fca469b7190" >
+                                            <attribute name="name" value="y" id="5636" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5637" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5638">
-                                        <attributelist id="5639" addr="0x7f99f1e69210" >
-                                            <attribute name="name" value="width" id="5640" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5641" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5639" addr="0x7fca469b7210" >
+                                            <attribute name="name" value="width" id="5640" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5641" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5642">
-                                        <attributelist id="5643" addr="0x7f99f1e69290" >
-                                            <attribute name="name" value="height" id="5644" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5645" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5643" addr="0x7fca469b7290" >
+                                            <attribute name="name" value="height" id="5644" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5645" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5646">
-                                        <attributelist id="5647" addr="0x7f99f1e69310" >
-                                            <attribute name="name" value="font" id="5648" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5649" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5650" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5647" addr="0x7fca469b7310" >
+                                            <attribute name="name" value="font" id="5648" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5649" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5650" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5651">
-                                        <attributelist id="5652" addr="0x7f99f1e693b0" >
-                                            <attribute name="name" value="textColor" id="5653" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5654" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5655" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5652" addr="0x7fca469b73b0" >
+                                            <attribute name="name" value="textColor" id="5653" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5654" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5655" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5656">
-                                        <attributelist id="5657" addr="0x7f99f1e69450" >
-                                            <attribute name="name" value="buttonTexture" id="5658" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5659" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5660" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5657" addr="0x7fca469b7450" >
+                                            <attribute name="name" value="buttonTexture" id="5658" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5659" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5660" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5661">
-                                        <attributelist id="5662" addr="0x7f99f1e694f0" >
-                                            <attribute name="name" value="buttonFocusTexture" id="5663" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5664" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5665" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5662" addr="0x7fca469b74f0" >
+                                            <attribute name="name" value="buttonFocusTexture" id="5663" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5664" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5665" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5666">
-                                        <attributelist id="5667" addr="0x7f99f1e69590" >
-                                            <attribute name="name" value="selectedColor" id="5668" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5669" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5670" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5667" addr="0x7fca469b7590" >
+                                            <attribute name="name" value="selectedColor" id="5668" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5669" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5670" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5671">
-                                        <attributelist id="5672" addr="0x7f99f1e69630" >
-                                            <attribute name="name" value="_imageWidth" id="5673" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="5674" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5675" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5672" addr="0x7fca469b7630" >
+                                            <attribute name="name" value="_imageWidth" id="5673" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="5674" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5675" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5676">
-                                        <attributelist id="5677" addr="0x7f99f1e696d0" >
-                                            <attribute name="name" value="_imageHeight" id="5678" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="5679" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5680" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5677" addr="0x7fca469b76d0" >
+                                            <attribute name="name" value="_imageHeight" id="5678" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="5679" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5680" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5681">
-                                        <attributelist id="5682" addr="0x7f99f1e69770" >
-                                            <attribute name="name" value="_itemTextXOffset" id="5683" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="5684" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5685" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5682" addr="0x7fca469b7770" >
+                                            <attribute name="name" value="_itemTextXOffset" id="5683" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="5684" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5685" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5686">
-                                        <attributelist id="5687" addr="0x7f99f1e69810" >
-                                            <attribute name="name" value="_itemTextYOffset" id="5688" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="2" id="5689" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5690" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5687" addr="0x7fca469b7810" >
+                                            <attribute name="name" value="_itemTextYOffset" id="5688" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="2" id="5689" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5690" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5691">
-                                        <attributelist id="5692" addr="0x7f99f1e698b0" >
-                                            <attribute name="name" value="_itemHeight" id="5693" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="27" id="5694" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5695" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5692" addr="0x7fca469b78b0" >
+                                            <attribute name="name" value="_itemHeight" id="5693" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="27" id="5694" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5695" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5696">
-                                        <attributelist id="5697" addr="0x7f99f1e69950" >
-                                            <attribute name="name" value="_space" id="5698" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="2" id="5699" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5700" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5697" addr="0x7fca469b7950" >
+                                            <attribute name="name" value="_space" id="5698" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="2" id="5699" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5700" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_1" id="5701" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="5702" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="5701" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="5702" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="5703" addr="0x7f99f1e6a350" >
-                            <attributelist id="5704" addr="0x7f99f1e6a350" >
-                                <attribute name="name" value="ControlList" id="5705" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="5706" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e673f0" id="5707" addr="0x7f99f1e673f0" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e6abf0" id="5708" addr="0x7f99f1e6abf0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e69a10" id="5709" addr="0x7f99f1e69a10" />
-                                <attribute name="sym_name" value="ControlList" id="5710" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e6abf0" id="5711" addr="0x7f99f1e6abf0" />
-                                <attribute name="defaultargs" value="0x7f99f1e69030" id="5712" addr="0x7f99f1e69030" />
-                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,long,long,long,long,long)." id="5713" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="5714" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e69030" id="5715" addr="0x7f99f1e69030" />
-                                <parmlist id="5716" addr="0x7f99f1e69ab0" >
+                        <constructor id="5703" addr="0x7fca469b8350" >
+                            <attributelist id="5704" addr="0x7fca469b8350" >
+                                <attribute name="name" value="ControlList" id="5705" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="5706" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469b53f0" id="5707" addr="0x7fca469b53f0" />
+                                <attribute name="csym_nextSibling" value="0x7fca469b8bf0" id="5708" addr="0x7fca469b8bf0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469b7a10" id="5709" addr="0x7fca469b7a10" />
+                                <attribute name="sym_name" value="ControlList" id="5710" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469b8bf0" id="5711" addr="0x7fca469b8bf0" />
+                                <attribute name="defaultargs" value="0x7fca469b7030" id="5712" addr="0x7fca469b7030" />
+                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,long,long,long,long,long)." id="5713" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="5714" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469b7030" id="5715" addr="0x7fca469b7030" />
+                                <parmlist id="5716" addr="0x7fca469b7ab0" >
                                     <parm id="5717">
-                                        <attributelist id="5718" addr="0x7f99f1e69ab0" >
-                                            <attribute name="name" value="x" id="5719" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5720" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5718" addr="0x7fca469b7ab0" >
+                                            <attribute name="name" value="x" id="5719" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5720" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5721">
-                                        <attributelist id="5722" addr="0x7f99f1e69b70" >
-                                            <attribute name="name" value="y" id="5723" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5724" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5722" addr="0x7fca469b7b70" >
+                                            <attribute name="name" value="y" id="5723" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5724" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5725">
-                                        <attributelist id="5726" addr="0x7f99f1e69bf0" >
-                                            <attribute name="name" value="width" id="5727" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5728" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5726" addr="0x7fca469b7bf0" >
+                                            <attribute name="name" value="width" id="5727" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5728" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5729">
-                                        <attributelist id="5730" addr="0x7f99f1e69c70" >
-                                            <attribute name="name" value="height" id="5731" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5732" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5730" addr="0x7fca469b7c70" >
+                                            <attribute name="name" value="height" id="5731" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5732" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5733">
-                                        <attributelist id="5734" addr="0x7f99f1e69cf0" >
-                                            <attribute name="name" value="font" id="5735" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5736" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5737" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5734" addr="0x7fca469b7cf0" >
+                                            <attribute name="name" value="font" id="5735" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5736" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5737" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5738">
-                                        <attributelist id="5739" addr="0x7f99f1e69d90" >
-                                            <attribute name="name" value="textColor" id="5740" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5741" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5742" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5739" addr="0x7fca469b7d90" >
+                                            <attribute name="name" value="textColor" id="5740" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5741" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5742" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5743">
-                                        <attributelist id="5744" addr="0x7f99f1e69e30" >
-                                            <attribute name="name" value="buttonTexture" id="5745" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5746" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5747" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5744" addr="0x7fca469b7e30" >
+                                            <attribute name="name" value="buttonTexture" id="5745" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5746" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5747" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5748">
-                                        <attributelist id="5749" addr="0x7f99f1e69ed0" >
-                                            <attribute name="name" value="buttonFocusTexture" id="5750" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5751" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5752" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5749" addr="0x7fca469b7ed0" >
+                                            <attribute name="name" value="buttonFocusTexture" id="5750" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5751" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5752" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5753">
-                                        <attributelist id="5754" addr="0x7f99f1e69f70" >
-                                            <attribute name="name" value="selectedColor" id="5755" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5756" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5757" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5754" addr="0x7fca469b7f70" >
+                                            <attribute name="name" value="selectedColor" id="5755" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5756" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5757" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5758">
-                                        <attributelist id="5759" addr="0x7f99f1e6a010" >
-                                            <attribute name="name" value="_imageWidth" id="5760" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="5761" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5762" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5759" addr="0x7fca469b8010" >
+                                            <attribute name="name" value="_imageWidth" id="5760" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="5761" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5762" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5763">
-                                        <attributelist id="5764" addr="0x7f99f1e6a0b0" >
-                                            <attribute name="name" value="_imageHeight" id="5765" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="5766" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5767" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5764" addr="0x7fca469b80b0" >
+                                            <attribute name="name" value="_imageHeight" id="5765" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="5766" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5767" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5768">
-                                        <attributelist id="5769" addr="0x7f99f1e6a150" >
-                                            <attribute name="name" value="_itemTextXOffset" id="5770" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="5771" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5772" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5769" addr="0x7fca469b8150" >
+                                            <attribute name="name" value="_itemTextXOffset" id="5770" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="5771" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5772" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5773">
-                                        <attributelist id="5774" addr="0x7f99f1e6a1f0" >
-                                            <attribute name="name" value="_itemTextYOffset" id="5775" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="2" id="5776" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5777" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5774" addr="0x7fca469b81f0" >
+                                            <attribute name="name" value="_itemTextYOffset" id="5775" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="2" id="5776" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5777" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5778">
-                                        <attributelist id="5779" addr="0x7f99f1e6a290" >
-                                            <attribute name="name" value="_itemHeight" id="5780" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="27" id="5781" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5782" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5779" addr="0x7fca469b8290" >
+                                            <attribute name="name" value="_itemHeight" id="5780" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="27" id="5781" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5782" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_2" id="5783" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="5784" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_2" id="5783" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="5784" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="5785" addr="0x7f99f1e6abf0" >
-                            <attributelist id="5786" addr="0x7f99f1e6abf0" >
-                                <attribute name="name" value="ControlList" id="5787" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="5788" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e673f0" id="5789" addr="0x7f99f1e673f0" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e6b3f0" id="5790" addr="0x7f99f1e6b3f0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e6a350" id="5791" addr="0x7f99f1e6a350" />
-                                <attribute name="sym_name" value="ControlList" id="5792" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e6b3f0" id="5793" addr="0x7f99f1e6b3f0" />
-                                <attribute name="defaultargs" value="0x7f99f1e69030" id="5794" addr="0x7f99f1e69030" />
-                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,long,long,long,long)." id="5795" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="5796" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e69030" id="5797" addr="0x7f99f1e69030" />
-                                <parmlist id="5798" addr="0x7f99f1e6a3f0" >
+                        <constructor id="5785" addr="0x7fca469b8bf0" >
+                            <attributelist id="5786" addr="0x7fca469b8bf0" >
+                                <attribute name="name" value="ControlList" id="5787" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="5788" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469b53f0" id="5789" addr="0x7fca469b53f0" />
+                                <attribute name="csym_nextSibling" value="0x7fca469b93f0" id="5790" addr="0x7fca469b93f0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469b8350" id="5791" addr="0x7fca469b8350" />
+                                <attribute name="sym_name" value="ControlList" id="5792" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469b93f0" id="5793" addr="0x7fca469b93f0" />
+                                <attribute name="defaultargs" value="0x7fca469b7030" id="5794" addr="0x7fca469b7030" />
+                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,long,long,long,long)." id="5795" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="5796" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469b7030" id="5797" addr="0x7fca469b7030" />
+                                <parmlist id="5798" addr="0x7fca469b83f0" >
                                     <parm id="5799">
-                                        <attributelist id="5800" addr="0x7f99f1e6a3f0" >
-                                            <attribute name="name" value="x" id="5801" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5802" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5800" addr="0x7fca469b83f0" >
+                                            <attribute name="name" value="x" id="5801" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5802" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5803">
-                                        <attributelist id="5804" addr="0x7f99f1e6a4b0" >
-                                            <attribute name="name" value="y" id="5805" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5806" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5804" addr="0x7fca469b84b0" >
+                                            <attribute name="name" value="y" id="5805" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5806" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5807">
-                                        <attributelist id="5808" addr="0x7f99f1e6a530" >
-                                            <attribute name="name" value="width" id="5809" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5810" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5808" addr="0x7fca469b8530" >
+                                            <attribute name="name" value="width" id="5809" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5810" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5811">
-                                        <attributelist id="5812" addr="0x7f99f1e6a5b0" >
-                                            <attribute name="name" value="height" id="5813" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5814" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5812" addr="0x7fca469b85b0" >
+                                            <attribute name="name" value="height" id="5813" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5814" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5815">
-                                        <attributelist id="5816" addr="0x7f99f1e6a630" >
-                                            <attribute name="name" value="font" id="5817" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5818" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5819" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5816" addr="0x7fca469b8630" >
+                                            <attribute name="name" value="font" id="5817" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5818" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5819" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5820">
-                                        <attributelist id="5821" addr="0x7f99f1e6a6d0" >
-                                            <attribute name="name" value="textColor" id="5822" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5823" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5824" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5821" addr="0x7fca469b86d0" >
+                                            <attribute name="name" value="textColor" id="5822" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5823" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5824" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5825">
-                                        <attributelist id="5826" addr="0x7f99f1e6a770" >
-                                            <attribute name="name" value="buttonTexture" id="5827" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5828" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5829" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5826" addr="0x7fca469b8770" >
+                                            <attribute name="name" value="buttonTexture" id="5827" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5828" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5829" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5830">
-                                        <attributelist id="5831" addr="0x7f99f1e6a810" >
-                                            <attribute name="name" value="buttonFocusTexture" id="5832" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5833" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5834" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5831" addr="0x7fca469b8810" >
+                                            <attribute name="name" value="buttonFocusTexture" id="5832" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5833" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5834" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5835">
-                                        <attributelist id="5836" addr="0x7f99f1e6a8b0" >
-                                            <attribute name="name" value="selectedColor" id="5837" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5838" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5839" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5836" addr="0x7fca469b88b0" >
+                                            <attribute name="name" value="selectedColor" id="5837" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5838" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5839" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5840">
-                                        <attributelist id="5841" addr="0x7f99f1e6a950" >
-                                            <attribute name="name" value="_imageWidth" id="5842" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="5843" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5844" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5841" addr="0x7fca469b8950" >
+                                            <attribute name="name" value="_imageWidth" id="5842" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="5843" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5844" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5845">
-                                        <attributelist id="5846" addr="0x7f99f1e6a9f0" >
-                                            <attribute name="name" value="_imageHeight" id="5847" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="5848" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5849" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5846" addr="0x7fca469b89f0" >
+                                            <attribute name="name" value="_imageHeight" id="5847" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="5848" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5849" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5850">
-                                        <attributelist id="5851" addr="0x7f99f1e6aa90" >
-                                            <attribute name="name" value="_itemTextXOffset" id="5852" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="5853" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5854" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5851" addr="0x7fca469b8a90" >
+                                            <attribute name="name" value="_itemTextXOffset" id="5852" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="5853" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5854" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5855">
-                                        <attributelist id="5856" addr="0x7f99f1e6ab30" >
-                                            <attribute name="name" value="_itemTextYOffset" id="5857" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="2" id="5858" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5859" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5856" addr="0x7fca469b8b30" >
+                                            <attribute name="name" value="_itemTextYOffset" id="5857" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="2" id="5858" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5859" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_3" id="5860" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="5861" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_3" id="5860" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="5861" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="5862" addr="0x7f99f1e6b3f0" >
-                            <attributelist id="5863" addr="0x7f99f1e6b3f0" >
-                                <attribute name="name" value="ControlList" id="5864" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="5865" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e673f0" id="5866" addr="0x7f99f1e673f0" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e6bb50" id="5867" addr="0x7f99f1e6bb50" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e6abf0" id="5868" addr="0x7f99f1e6abf0" />
-                                <attribute name="sym_name" value="ControlList" id="5869" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e6bb50" id="5870" addr="0x7f99f1e6bb50" />
-                                <attribute name="defaultargs" value="0x7f99f1e69030" id="5871" addr="0x7f99f1e69030" />
-                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,long,long,long)." id="5872" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="5873" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e69030" id="5874" addr="0x7f99f1e69030" />
-                                <parmlist id="5875" addr="0x7f99f1e6ac90" >
+                        <constructor id="5862" addr="0x7fca469b93f0" >
+                            <attributelist id="5863" addr="0x7fca469b93f0" >
+                                <attribute name="name" value="ControlList" id="5864" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="5865" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469b53f0" id="5866" addr="0x7fca469b53f0" />
+                                <attribute name="csym_nextSibling" value="0x7fca469b9b50" id="5867" addr="0x7fca469b9b50" />
+                                <attribute name="sym_previousSibling" value="0x7fca469b8bf0" id="5868" addr="0x7fca469b8bf0" />
+                                <attribute name="sym_name" value="ControlList" id="5869" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469b9b50" id="5870" addr="0x7fca469b9b50" />
+                                <attribute name="defaultargs" value="0x7fca469b7030" id="5871" addr="0x7fca469b7030" />
+                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,long,long,long)." id="5872" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="5873" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469b7030" id="5874" addr="0x7fca469b7030" />
+                                <parmlist id="5875" addr="0x7fca469b8c90" >
                                     <parm id="5876">
-                                        <attributelist id="5877" addr="0x7f99f1e6ac90" >
-                                            <attribute name="name" value="x" id="5878" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5879" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5877" addr="0x7fca469b8c90" >
+                                            <attribute name="name" value="x" id="5878" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5879" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5880">
-                                        <attributelist id="5881" addr="0x7f99f1e6ad50" >
-                                            <attribute name="name" value="y" id="5882" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5883" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5881" addr="0x7fca469b8d50" >
+                                            <attribute name="name" value="y" id="5882" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5883" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5884">
-                                        <attributelist id="5885" addr="0x7f99f1e6add0" >
-                                            <attribute name="name" value="width" id="5886" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5887" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5885" addr="0x7fca469b8dd0" >
+                                            <attribute name="name" value="width" id="5886" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5887" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5888">
-                                        <attributelist id="5889" addr="0x7f99f1e6ae50" >
-                                            <attribute name="name" value="height" id="5890" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5891" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5889" addr="0x7fca469b8e50" >
+                                            <attribute name="name" value="height" id="5890" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5891" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5892">
-                                        <attributelist id="5893" addr="0x7f99f1e6aed0" >
-                                            <attribute name="name" value="font" id="5894" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5895" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5896" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5893" addr="0x7fca469b8ed0" >
+                                            <attribute name="name" value="font" id="5894" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5895" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5896" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5897">
-                                        <attributelist id="5898" addr="0x7f99f1e6af70" >
-                                            <attribute name="name" value="textColor" id="5899" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5900" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5901" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5898" addr="0x7fca469b8f70" >
+                                            <attribute name="name" value="textColor" id="5899" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5900" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5901" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5902">
-                                        <attributelist id="5903" addr="0x7f99f1e6b010" >
-                                            <attribute name="name" value="buttonTexture" id="5904" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5905" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5906" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5903" addr="0x7fca469b9010" >
+                                            <attribute name="name" value="buttonTexture" id="5904" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5905" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5906" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5907">
-                                        <attributelist id="5908" addr="0x7f99f1e6b0b0" >
-                                            <attribute name="name" value="buttonFocusTexture" id="5909" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5910" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5911" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5908" addr="0x7fca469b90b0" >
+                                            <attribute name="name" value="buttonFocusTexture" id="5909" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5910" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5911" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5912">
-                                        <attributelist id="5913" addr="0x7f99f1e6b150" >
-                                            <attribute name="name" value="selectedColor" id="5914" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5915" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5916" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5913" addr="0x7fca469b9150" >
+                                            <attribute name="name" value="selectedColor" id="5914" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5915" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5916" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5917">
-                                        <attributelist id="5918" addr="0x7f99f1e6b1f0" >
-                                            <attribute name="name" value="_imageWidth" id="5919" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="5920" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5921" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5918" addr="0x7fca469b91f0" >
+                                            <attribute name="name" value="_imageWidth" id="5919" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="5920" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5921" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5922">
-                                        <attributelist id="5923" addr="0x7f99f1e6b290" >
-                                            <attribute name="name" value="_imageHeight" id="5924" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="5925" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5926" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5923" addr="0x7fca469b9290" >
+                                            <attribute name="name" value="_imageHeight" id="5924" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="5925" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5926" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5927">
-                                        <attributelist id="5928" addr="0x7f99f1e6b330" >
-                                            <attribute name="name" value="_itemTextXOffset" id="5929" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="5930" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5931" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5928" addr="0x7fca469b9330" >
+                                            <attribute name="name" value="_itemTextXOffset" id="5929" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="5930" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5931" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_4" id="5932" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="5933" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_4" id="5932" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="5933" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="5934" addr="0x7f99f1e6bb50" >
-                            <attributelist id="5935" addr="0x7f99f1e6bb50" >
-                                <attribute name="name" value="ControlList" id="5936" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="5937" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e673f0" id="5938" addr="0x7f99f1e673f0" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e6c210" id="5939" addr="0x7f99f1e6c210" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e6b3f0" id="5940" addr="0x7f99f1e6b3f0" />
-                                <attribute name="sym_name" value="ControlList" id="5941" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e6c210" id="5942" addr="0x7f99f1e6c210" />
-                                <attribute name="defaultargs" value="0x7f99f1e69030" id="5943" addr="0x7f99f1e69030" />
-                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,long,long)." id="5944" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="5945" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e69030" id="5946" addr="0x7f99f1e69030" />
-                                <parmlist id="5947" addr="0x7f99f1e6b490" >
+                        <constructor id="5934" addr="0x7fca469b9b50" >
+                            <attributelist id="5935" addr="0x7fca469b9b50" >
+                                <attribute name="name" value="ControlList" id="5936" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="5937" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469b53f0" id="5938" addr="0x7fca469b53f0" />
+                                <attribute name="csym_nextSibling" value="0x7fca469ba210" id="5939" addr="0x7fca469ba210" />
+                                <attribute name="sym_previousSibling" value="0x7fca469b93f0" id="5940" addr="0x7fca469b93f0" />
+                                <attribute name="sym_name" value="ControlList" id="5941" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469ba210" id="5942" addr="0x7fca469ba210" />
+                                <attribute name="defaultargs" value="0x7fca469b7030" id="5943" addr="0x7fca469b7030" />
+                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,long,long)." id="5944" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="5945" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469b7030" id="5946" addr="0x7fca469b7030" />
+                                <parmlist id="5947" addr="0x7fca469b9490" >
                                     <parm id="5948">
-                                        <attributelist id="5949" addr="0x7f99f1e6b490" >
-                                            <attribute name="name" value="x" id="5950" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5951" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5949" addr="0x7fca469b9490" >
+                                            <attribute name="name" value="x" id="5950" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5951" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5952">
-                                        <attributelist id="5953" addr="0x7f99f1e6b550" >
-                                            <attribute name="name" value="y" id="5954" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5955" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5953" addr="0x7fca469b9550" >
+                                            <attribute name="name" value="y" id="5954" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5955" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5956">
-                                        <attributelist id="5957" addr="0x7f99f1e6b5d0" >
-                                            <attribute name="name" value="width" id="5958" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5959" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5957" addr="0x7fca469b95d0" >
+                                            <attribute name="name" value="width" id="5958" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5959" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5960">
-                                        <attributelist id="5961" addr="0x7f99f1e6b650" >
-                                            <attribute name="name" value="height" id="5962" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5963" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5961" addr="0x7fca469b9650" >
+                                            <attribute name="name" value="height" id="5962" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5963" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5964">
-                                        <attributelist id="5965" addr="0x7f99f1e6b6d0" >
-                                            <attribute name="name" value="font" id="5966" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5967" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5968" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5965" addr="0x7fca469b96d0" >
+                                            <attribute name="name" value="font" id="5966" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5967" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5968" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5969">
-                                        <attributelist id="5970" addr="0x7f99f1e6b770" >
-                                            <attribute name="name" value="textColor" id="5971" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5972" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5973" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5970" addr="0x7fca469b9770" >
+                                            <attribute name="name" value="textColor" id="5971" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5972" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5973" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5974">
-                                        <attributelist id="5975" addr="0x7f99f1e6b810" >
-                                            <attribute name="name" value="buttonTexture" id="5976" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5977" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5978" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5975" addr="0x7fca469b9810" >
+                                            <attribute name="name" value="buttonTexture" id="5976" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5977" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5978" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5979">
-                                        <attributelist id="5980" addr="0x7f99f1e6b8b0" >
-                                            <attribute name="name" value="buttonFocusTexture" id="5981" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5982" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5983" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5980" addr="0x7fca469b98b0" >
+                                            <attribute name="name" value="buttonFocusTexture" id="5981" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5982" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5983" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5984">
-                                        <attributelist id="5985" addr="0x7f99f1e6b950" >
-                                            <attribute name="name" value="selectedColor" id="5986" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="5987" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="5988" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5985" addr="0x7fca469b9950" >
+                                            <attribute name="name" value="selectedColor" id="5986" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="5987" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="5988" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5989">
-                                        <attributelist id="5990" addr="0x7f99f1e6b9f0" >
-                                            <attribute name="name" value="_imageWidth" id="5991" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="5992" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5993" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5990" addr="0x7fca469b99f0" >
+                                            <attribute name="name" value="_imageWidth" id="5991" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="5992" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5993" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="5994">
-                                        <attributelist id="5995" addr="0x7f99f1e6ba90" >
-                                            <attribute name="name" value="_imageHeight" id="5996" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="5997" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="5998" addr="0x7f99f1de6c90" />
+                                        <attributelist id="5995" addr="0x7fca469b9a90" >
+                                            <attribute name="name" value="_imageHeight" id="5996" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="5997" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="5998" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_5" id="5999" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="6000" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_5" id="5999" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="6000" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="6001" addr="0x7f99f1e6c210" >
-                            <attributelist id="6002" addr="0x7f99f1e6c210" >
-                                <attribute name="name" value="ControlList" id="6003" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="6004" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e673f0" id="6005" addr="0x7f99f1e673f0" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e6c830" id="6006" addr="0x7f99f1e6c830" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e6bb50" id="6007" addr="0x7f99f1e6bb50" />
-                                <attribute name="sym_name" value="ControlList" id="6008" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e6c830" id="6009" addr="0x7f99f1e6c830" />
-                                <attribute name="defaultargs" value="0x7f99f1e69030" id="6010" addr="0x7f99f1e69030" />
-                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,long)." id="6011" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="6012" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e69030" id="6013" addr="0x7f99f1e69030" />
-                                <parmlist id="6014" addr="0x7f99f1e6bbf0" >
+                        <constructor id="6001" addr="0x7fca469ba210" >
+                            <attributelist id="6002" addr="0x7fca469ba210" >
+                                <attribute name="name" value="ControlList" id="6003" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="6004" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469b53f0" id="6005" addr="0x7fca469b53f0" />
+                                <attribute name="csym_nextSibling" value="0x7fca469ba830" id="6006" addr="0x7fca469ba830" />
+                                <attribute name="sym_previousSibling" value="0x7fca469b9b50" id="6007" addr="0x7fca469b9b50" />
+                                <attribute name="sym_name" value="ControlList" id="6008" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469ba830" id="6009" addr="0x7fca469ba830" />
+                                <attribute name="defaultargs" value="0x7fca469b7030" id="6010" addr="0x7fca469b7030" />
+                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,long)." id="6011" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="6012" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469b7030" id="6013" addr="0x7fca469b7030" />
+                                <parmlist id="6014" addr="0x7fca469b9bf0" >
                                     <parm id="6015">
-                                        <attributelist id="6016" addr="0x7f99f1e6bbf0" >
-                                            <attribute name="name" value="x" id="6017" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6018" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6016" addr="0x7fca469b9bf0" >
+                                            <attribute name="name" value="x" id="6017" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6018" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6019">
-                                        <attributelist id="6020" addr="0x7f99f1e6bcb0" >
-                                            <attribute name="name" value="y" id="6021" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6022" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6020" addr="0x7fca469b9cb0" >
+                                            <attribute name="name" value="y" id="6021" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6022" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6023">
-                                        <attributelist id="6024" addr="0x7f99f1e6bd30" >
-                                            <attribute name="name" value="width" id="6025" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6026" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6024" addr="0x7fca469b9d30" >
+                                            <attribute name="name" value="width" id="6025" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6026" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6027">
-                                        <attributelist id="6028" addr="0x7f99f1e6bdb0" >
-                                            <attribute name="name" value="height" id="6029" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6030" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6028" addr="0x7fca469b9db0" >
+                                            <attribute name="name" value="height" id="6029" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6030" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6031">
-                                        <attributelist id="6032" addr="0x7f99f1e6be30" >
-                                            <attribute name="name" value="font" id="6033" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="6034" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="6035" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6032" addr="0x7fca469b9e30" >
+                                            <attribute name="name" value="font" id="6033" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="6034" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="6035" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6036">
-                                        <attributelist id="6037" addr="0x7f99f1e6bed0" >
-                                            <attribute name="name" value="textColor" id="6038" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="6039" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="6040" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6037" addr="0x7fca469b9ed0" >
+                                            <attribute name="name" value="textColor" id="6038" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="6039" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="6040" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6041">
-                                        <attributelist id="6042" addr="0x7f99f1e6bf70" >
-                                            <attribute name="name" value="buttonTexture" id="6043" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="6044" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="6045" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6042" addr="0x7fca469b9f70" >
+                                            <attribute name="name" value="buttonTexture" id="6043" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="6044" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="6045" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6046">
-                                        <attributelist id="6047" addr="0x7f99f1e6c010" >
-                                            <attribute name="name" value="buttonFocusTexture" id="6048" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="6049" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="6050" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6047" addr="0x7fca469ba010" >
+                                            <attribute name="name" value="buttonFocusTexture" id="6048" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="6049" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="6050" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6051">
-                                        <attributelist id="6052" addr="0x7f99f1e6c0b0" >
-                                            <attribute name="name" value="selectedColor" id="6053" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="6054" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="6055" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6052" addr="0x7fca469ba0b0" >
+                                            <attribute name="name" value="selectedColor" id="6053" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="6054" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="6055" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6056">
-                                        <attributelist id="6057" addr="0x7f99f1e6c150" >
-                                            <attribute name="name" value="_imageWidth" id="6058" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="6059" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6060" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6057" addr="0x7fca469ba150" >
+                                            <attribute name="name" value="_imageWidth" id="6058" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="6059" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6060" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_6" id="6061" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="6062" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_6" id="6061" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="6062" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="6063" addr="0x7f99f1e6c830" >
-                            <attributelist id="6064" addr="0x7f99f1e6c830" >
-                                <attribute name="name" value="ControlList" id="6065" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="6066" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e673f0" id="6067" addr="0x7f99f1e673f0" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e6cdb0" id="6068" addr="0x7f99f1e6cdb0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e6c210" id="6069" addr="0x7f99f1e6c210" />
-                                <attribute name="sym_name" value="ControlList" id="6070" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e6cdb0" id="6071" addr="0x7f99f1e6cdb0" />
-                                <attribute name="defaultargs" value="0x7f99f1e69030" id="6072" addr="0x7f99f1e69030" />
-                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char)." id="6073" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="6074" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e69030" id="6075" addr="0x7f99f1e69030" />
-                                <parmlist id="6076" addr="0x7f99f1e6c2b0" >
+                        <constructor id="6063" addr="0x7fca469ba830" >
+                            <attributelist id="6064" addr="0x7fca469ba830" >
+                                <attribute name="name" value="ControlList" id="6065" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="6066" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469b53f0" id="6067" addr="0x7fca469b53f0" />
+                                <attribute name="csym_nextSibling" value="0x7fca469badb0" id="6068" addr="0x7fca469badb0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469ba210" id="6069" addr="0x7fca469ba210" />
+                                <attribute name="sym_name" value="ControlList" id="6070" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469badb0" id="6071" addr="0x7fca469badb0" />
+                                <attribute name="defaultargs" value="0x7fca469b7030" id="6072" addr="0x7fca469b7030" />
+                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char)." id="6073" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="6074" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469b7030" id="6075" addr="0x7fca469b7030" />
+                                <parmlist id="6076" addr="0x7fca469ba2b0" >
                                     <parm id="6077">
-                                        <attributelist id="6078" addr="0x7f99f1e6c2b0" >
-                                            <attribute name="name" value="x" id="6079" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6080" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6078" addr="0x7fca469ba2b0" >
+                                            <attribute name="name" value="x" id="6079" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6080" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6081">
-                                        <attributelist id="6082" addr="0x7f99f1e6c370" >
-                                            <attribute name="name" value="y" id="6083" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6084" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6082" addr="0x7fca469ba370" >
+                                            <attribute name="name" value="y" id="6083" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6084" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6085">
-                                        <attributelist id="6086" addr="0x7f99f1e6c3f0" >
-                                            <attribute name="name" value="width" id="6087" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6088" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6086" addr="0x7fca469ba3f0" >
+                                            <attribute name="name" value="width" id="6087" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6088" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6089">
-                                        <attributelist id="6090" addr="0x7f99f1e6c470" >
-                                            <attribute name="name" value="height" id="6091" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6092" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6090" addr="0x7fca469ba470" >
+                                            <attribute name="name" value="height" id="6091" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6092" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6093">
-                                        <attributelist id="6094" addr="0x7f99f1e6c4f0" >
-                                            <attribute name="name" value="font" id="6095" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="6096" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="6097" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6094" addr="0x7fca469ba4f0" >
+                                            <attribute name="name" value="font" id="6095" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="6096" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="6097" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6098">
-                                        <attributelist id="6099" addr="0x7f99f1e6c590" >
-                                            <attribute name="name" value="textColor" id="6100" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="6101" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="6102" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6099" addr="0x7fca469ba590" >
+                                            <attribute name="name" value="textColor" id="6100" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="6101" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="6102" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6103">
-                                        <attributelist id="6104" addr="0x7f99f1e6c630" >
-                                            <attribute name="name" value="buttonTexture" id="6105" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="6106" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="6107" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6104" addr="0x7fca469ba630" >
+                                            <attribute name="name" value="buttonTexture" id="6105" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="6106" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="6107" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6108">
-                                        <attributelist id="6109" addr="0x7f99f1e6c6d0" >
-                                            <attribute name="name" value="buttonFocusTexture" id="6110" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="6111" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="6112" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6109" addr="0x7fca469ba6d0" >
+                                            <attribute name="name" value="buttonFocusTexture" id="6110" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="6111" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="6112" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6113">
-                                        <attributelist id="6114" addr="0x7f99f1e6c770" >
-                                            <attribute name="name" value="selectedColor" id="6115" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="6116" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="6117" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6114" addr="0x7fca469ba770" >
+                                            <attribute name="name" value="selectedColor" id="6115" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="6116" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="6117" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_7" id="6118" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="6119" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_7" id="6118" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="6119" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="6120" addr="0x7f99f1e6cdb0" >
-                            <attributelist id="6121" addr="0x7f99f1e6cdb0" >
-                                <attribute name="name" value="ControlList" id="6122" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="6123" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e673f0" id="6124" addr="0x7f99f1e673f0" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e6d290" id="6125" addr="0x7f99f1e6d290" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e6c830" id="6126" addr="0x7f99f1e6c830" />
-                                <attribute name="sym_name" value="ControlList" id="6127" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e6d290" id="6128" addr="0x7f99f1e6d290" />
-                                <attribute name="defaultargs" value="0x7f99f1e69030" id="6129" addr="0x7f99f1e69030" />
-                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char)." id="6130" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="6131" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e69030" id="6132" addr="0x7f99f1e69030" />
-                                <parmlist id="6133" addr="0x7f99f1e6c8d0" >
+                        <constructor id="6120" addr="0x7fca469badb0" >
+                            <attributelist id="6121" addr="0x7fca469badb0" >
+                                <attribute name="name" value="ControlList" id="6122" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="6123" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469b53f0" id="6124" addr="0x7fca469b53f0" />
+                                <attribute name="csym_nextSibling" value="0x7fca469bb290" id="6125" addr="0x7fca469bb290" />
+                                <attribute name="sym_previousSibling" value="0x7fca469ba830" id="6126" addr="0x7fca469ba830" />
+                                <attribute name="sym_name" value="ControlList" id="6127" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469bb290" id="6128" addr="0x7fca469bb290" />
+                                <attribute name="defaultargs" value="0x7fca469b7030" id="6129" addr="0x7fca469b7030" />
+                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char)." id="6130" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="6131" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469b7030" id="6132" addr="0x7fca469b7030" />
+                                <parmlist id="6133" addr="0x7fca469ba8d0" >
                                     <parm id="6134">
-                                        <attributelist id="6135" addr="0x7f99f1e6c8d0" >
-                                            <attribute name="name" value="x" id="6136" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6137" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6135" addr="0x7fca469ba8d0" >
+                                            <attribute name="name" value="x" id="6136" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6137" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6138">
-                                        <attributelist id="6139" addr="0x7f99f1e6c990" >
-                                            <attribute name="name" value="y" id="6140" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6141" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6139" addr="0x7fca469ba990" >
+                                            <attribute name="name" value="y" id="6140" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6141" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6142">
-                                        <attributelist id="6143" addr="0x7f99f1e6ca10" >
-                                            <attribute name="name" value="width" id="6144" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6145" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6143" addr="0x7fca469baa10" >
+                                            <attribute name="name" value="width" id="6144" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6145" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6146">
-                                        <attributelist id="6147" addr="0x7f99f1e6ca90" >
-                                            <attribute name="name" value="height" id="6148" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6149" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6147" addr="0x7fca469baa90" >
+                                            <attribute name="name" value="height" id="6148" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6149" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6150">
-                                        <attributelist id="6151" addr="0x7f99f1e6cb10" >
-                                            <attribute name="name" value="font" id="6152" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="6153" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="6154" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6151" addr="0x7fca469bab10" >
+                                            <attribute name="name" value="font" id="6152" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="6153" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="6154" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6155">
-                                        <attributelist id="6156" addr="0x7f99f1e6cbb0" >
-                                            <attribute name="name" value="textColor" id="6157" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="6158" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="6159" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6156" addr="0x7fca469babb0" >
+                                            <attribute name="name" value="textColor" id="6157" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="6158" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="6159" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6160">
-                                        <attributelist id="6161" addr="0x7f99f1e6cc50" >
-                                            <attribute name="name" value="buttonTexture" id="6162" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="6163" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="6164" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6161" addr="0x7fca469bac50" >
+                                            <attribute name="name" value="buttonTexture" id="6162" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="6163" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="6164" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6165">
-                                        <attributelist id="6166" addr="0x7f99f1e6ccf0" >
-                                            <attribute name="name" value="buttonFocusTexture" id="6167" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="6168" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="6169" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6166" addr="0x7fca469bacf0" >
+                                            <attribute name="name" value="buttonFocusTexture" id="6167" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="6168" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="6169" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_8" id="6170" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="6171" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_8" id="6170" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="6171" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="6172" addr="0x7f99f1e6d290" >
-                            <attributelist id="6173" addr="0x7f99f1e6d290" >
-                                <attribute name="name" value="ControlList" id="6174" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="6175" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e673f0" id="6176" addr="0x7f99f1e673f0" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e6d6d0" id="6177" addr="0x7f99f1e6d6d0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e6cdb0" id="6178" addr="0x7f99f1e6cdb0" />
-                                <attribute name="sym_name" value="ControlList" id="6179" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e6d6d0" id="6180" addr="0x7f99f1e6d6d0" />
-                                <attribute name="defaultargs" value="0x7f99f1e69030" id="6181" addr="0x7f99f1e69030" />
-                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char)." id="6182" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="6183" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e69030" id="6184" addr="0x7f99f1e69030" />
-                                <parmlist id="6185" addr="0x7f99f1e6ce50" >
+                        <constructor id="6172" addr="0x7fca469bb290" >
+                            <attributelist id="6173" addr="0x7fca469bb290" >
+                                <attribute name="name" value="ControlList" id="6174" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="6175" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469b53f0" id="6176" addr="0x7fca469b53f0" />
+                                <attribute name="csym_nextSibling" value="0x7fca469bb6d0" id="6177" addr="0x7fca469bb6d0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469badb0" id="6178" addr="0x7fca469badb0" />
+                                <attribute name="sym_name" value="ControlList" id="6179" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469bb6d0" id="6180" addr="0x7fca469bb6d0" />
+                                <attribute name="defaultargs" value="0x7fca469b7030" id="6181" addr="0x7fca469b7030" />
+                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char)." id="6182" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="6183" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469b7030" id="6184" addr="0x7fca469b7030" />
+                                <parmlist id="6185" addr="0x7fca469bae50" >
                                     <parm id="6186">
-                                        <attributelist id="6187" addr="0x7f99f1e6ce50" >
-                                            <attribute name="name" value="x" id="6188" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6189" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6187" addr="0x7fca469bae50" >
+                                            <attribute name="name" value="x" id="6188" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6189" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6190">
-                                        <attributelist id="6191" addr="0x7f99f1e6cf10" >
-                                            <attribute name="name" value="y" id="6192" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6193" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6191" addr="0x7fca469baf10" >
+                                            <attribute name="name" value="y" id="6192" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6193" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6194">
-                                        <attributelist id="6195" addr="0x7f99f1e6cf90" >
-                                            <attribute name="name" value="width" id="6196" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6197" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6195" addr="0x7fca469baf90" >
+                                            <attribute name="name" value="width" id="6196" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6197" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6198">
-                                        <attributelist id="6199" addr="0x7f99f1e6d010" >
-                                            <attribute name="name" value="height" id="6200" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6201" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6199" addr="0x7fca469bb010" >
+                                            <attribute name="name" value="height" id="6200" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6201" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6202">
-                                        <attributelist id="6203" addr="0x7f99f1e6d090" >
-                                            <attribute name="name" value="font" id="6204" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="6205" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="6206" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6203" addr="0x7fca469bb090" >
+                                            <attribute name="name" value="font" id="6204" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="6205" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="6206" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6207">
-                                        <attributelist id="6208" addr="0x7f99f1e6d130" >
-                                            <attribute name="name" value="textColor" id="6209" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="6210" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="6211" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6208" addr="0x7fca469bb130" >
+                                            <attribute name="name" value="textColor" id="6209" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="6210" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="6211" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6212">
-                                        <attributelist id="6213" addr="0x7f99f1e6d1d0" >
-                                            <attribute name="name" value="buttonTexture" id="6214" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="6215" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="6216" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6213" addr="0x7fca469bb1d0" >
+                                            <attribute name="name" value="buttonTexture" id="6214" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="6215" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="6216" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_9" id="6217" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="6218" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_9" id="6217" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="6218" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="6219" addr="0x7f99f1e6d6d0" >
-                            <attributelist id="6220" addr="0x7f99f1e6d6d0" >
-                                <attribute name="name" value="ControlList" id="6221" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="6222" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e673f0" id="6223" addr="0x7f99f1e673f0" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e6da70" id="6224" addr="0x7f99f1e6da70" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e6d290" id="6225" addr="0x7f99f1e6d290" />
-                                <attribute name="sym_name" value="ControlList" id="6226" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e6da70" id="6227" addr="0x7f99f1e6da70" />
-                                <attribute name="defaultargs" value="0x7f99f1e69030" id="6228" addr="0x7f99f1e69030" />
-                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char)." id="6229" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="6230" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e69030" id="6231" addr="0x7f99f1e69030" />
-                                <parmlist id="6232" addr="0x7f99f1e6d330" >
+                        <constructor id="6219" addr="0x7fca469bb6d0" >
+                            <attributelist id="6220" addr="0x7fca469bb6d0" >
+                                <attribute name="name" value="ControlList" id="6221" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="6222" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469b53f0" id="6223" addr="0x7fca469b53f0" />
+                                <attribute name="csym_nextSibling" value="0x7fca469bba70" id="6224" addr="0x7fca469bba70" />
+                                <attribute name="sym_previousSibling" value="0x7fca469bb290" id="6225" addr="0x7fca469bb290" />
+                                <attribute name="sym_name" value="ControlList" id="6226" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469bba70" id="6227" addr="0x7fca469bba70" />
+                                <attribute name="defaultargs" value="0x7fca469b7030" id="6228" addr="0x7fca469b7030" />
+                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char)." id="6229" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="6230" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469b7030" id="6231" addr="0x7fca469b7030" />
+                                <parmlist id="6232" addr="0x7fca469bb330" >
                                     <parm id="6233">
-                                        <attributelist id="6234" addr="0x7f99f1e6d330" >
-                                            <attribute name="name" value="x" id="6235" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6236" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6234" addr="0x7fca469bb330" >
+                                            <attribute name="name" value="x" id="6235" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6236" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6237">
-                                        <attributelist id="6238" addr="0x7f99f1e6d3f0" >
-                                            <attribute name="name" value="y" id="6239" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6240" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6238" addr="0x7fca469bb3f0" >
+                                            <attribute name="name" value="y" id="6239" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6240" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6241">
-                                        <attributelist id="6242" addr="0x7f99f1e6d470" >
-                                            <attribute name="name" value="width" id="6243" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6244" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6242" addr="0x7fca469bb470" >
+                                            <attribute name="name" value="width" id="6243" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6244" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6245">
-                                        <attributelist id="6246" addr="0x7f99f1e6d4f0" >
-                                            <attribute name="name" value="height" id="6247" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6248" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6246" addr="0x7fca469bb4f0" >
+                                            <attribute name="name" value="height" id="6247" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6248" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6249">
-                                        <attributelist id="6250" addr="0x7f99f1e6d570" >
-                                            <attribute name="name" value="font" id="6251" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="6252" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="6253" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6250" addr="0x7fca469bb570" >
+                                            <attribute name="name" value="font" id="6251" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="6252" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="6253" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6254">
-                                        <attributelist id="6255" addr="0x7f99f1e6d610" >
-                                            <attribute name="name" value="textColor" id="6256" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="6257" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="6258" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6255" addr="0x7fca469bb610" >
+                                            <attribute name="name" value="textColor" id="6256" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="6257" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="6258" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_10" id="6259" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="6260" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_10" id="6259" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="6260" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="6261" addr="0x7f99f1e6da70" >
-                            <attributelist id="6262" addr="0x7f99f1e6da70" >
-                                <attribute name="name" value="ControlList" id="6263" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="6264" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e673f0" id="6265" addr="0x7f99f1e673f0" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e6dd70" id="6266" addr="0x7f99f1e6dd70" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e6d6d0" id="6267" addr="0x7f99f1e6d6d0" />
-                                <attribute name="sym_name" value="ControlList" id="6268" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e6dd70" id="6269" addr="0x7f99f1e6dd70" />
-                                <attribute name="defaultargs" value="0x7f99f1e69030" id="6270" addr="0x7f99f1e69030" />
-                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char)." id="6271" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="6272" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e69030" id="6273" addr="0x7f99f1e69030" />
-                                <parmlist id="6274" addr="0x7f99f1e6d770" >
+                        <constructor id="6261" addr="0x7fca469bba70" >
+                            <attributelist id="6262" addr="0x7fca469bba70" >
+                                <attribute name="name" value="ControlList" id="6263" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="6264" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469b53f0" id="6265" addr="0x7fca469b53f0" />
+                                <attribute name="csym_nextSibling" value="0x7fca469bbd70" id="6266" addr="0x7fca469bbd70" />
+                                <attribute name="sym_previousSibling" value="0x7fca469bb6d0" id="6267" addr="0x7fca469bb6d0" />
+                                <attribute name="sym_name" value="ControlList" id="6268" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469bbd70" id="6269" addr="0x7fca469bbd70" />
+                                <attribute name="defaultargs" value="0x7fca469b7030" id="6270" addr="0x7fca469b7030" />
+                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char)." id="6271" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="6272" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469b7030" id="6273" addr="0x7fca469b7030" />
+                                <parmlist id="6274" addr="0x7fca469bb770" >
                                     <parm id="6275">
-                                        <attributelist id="6276" addr="0x7f99f1e6d770" >
-                                            <attribute name="name" value="x" id="6277" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6278" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6276" addr="0x7fca469bb770" >
+                                            <attribute name="name" value="x" id="6277" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6278" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6279">
-                                        <attributelist id="6280" addr="0x7f99f1e6d830" >
-                                            <attribute name="name" value="y" id="6281" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6282" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6280" addr="0x7fca469bb830" >
+                                            <attribute name="name" value="y" id="6281" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6282" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6283">
-                                        <attributelist id="6284" addr="0x7f99f1e6d8b0" >
-                                            <attribute name="name" value="width" id="6285" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6286" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6284" addr="0x7fca469bb8b0" >
+                                            <attribute name="name" value="width" id="6285" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6286" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6287">
-                                        <attributelist id="6288" addr="0x7f99f1e6d930" >
-                                            <attribute name="name" value="height" id="6289" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6290" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6288" addr="0x7fca469bb930" >
+                                            <attribute name="name" value="height" id="6289" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6290" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6291">
-                                        <attributelist id="6292" addr="0x7f99f1e6d9b0" >
-                                            <attribute name="name" value="font" id="6293" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="6294" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="6295" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6292" addr="0x7fca469bb9b0" >
+                                            <attribute name="name" value="font" id="6293" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="6294" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="6295" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_11" id="6296" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="6297" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_11" id="6296" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="6297" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="6298" addr="0x7f99f1e6dd70" >
-                            <attributelist id="6299" addr="0x7f99f1e6dd70" >
-                                <attribute name="name" value="ControlList" id="6300" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="6301" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e673f0" id="6302" addr="0x7f99f1e673f0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e6da70" id="6303" addr="0x7f99f1e6da70" />
-                                <attribute name="sym_name" value="ControlList" id="6304" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e69030" id="6305" addr="0x7f99f1e69030" />
-                                <attribute name="decl" value="f(long,long,long,long)." id="6306" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="6307" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e69030" id="6308" addr="0x7f99f1e69030" />
-                                <parmlist id="6309" addr="0x7f99f1e6db10" >
+                        <constructor id="6298" addr="0x7fca469bbd70" >
+                            <attributelist id="6299" addr="0x7fca469bbd70" >
+                                <attribute name="name" value="ControlList" id="6300" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="6301" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469b53f0" id="6302" addr="0x7fca469b53f0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469bba70" id="6303" addr="0x7fca469bba70" />
+                                <attribute name="sym_name" value="ControlList" id="6304" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469b7030" id="6305" addr="0x7fca469b7030" />
+                                <attribute name="decl" value="f(long,long,long,long)." id="6306" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="6307" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469b7030" id="6308" addr="0x7fca469b7030" />
+                                <parmlist id="6309" addr="0x7fca469bbb10" >
                                     <parm id="6310">
-                                        <attributelist id="6311" addr="0x7f99f1e6db10" >
-                                            <attribute name="name" value="x" id="6312" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6313" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6311" addr="0x7fca469bbb10" >
+                                            <attribute name="name" value="x" id="6312" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6313" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6314">
-                                        <attributelist id="6315" addr="0x7f99f1e6dbd0" >
-                                            <attribute name="name" value="y" id="6316" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6317" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6315" addr="0x7fca469bbbd0" >
+                                            <attribute name="name" value="y" id="6316" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6317" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6318">
-                                        <attributelist id="6319" addr="0x7f99f1e6dc50" >
-                                            <attribute name="name" value="width" id="6320" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6321" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6319" addr="0x7fca469bbc50" >
+                                            <attribute name="name" value="width" id="6320" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6321" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6322">
-                                        <attributelist id="6323" addr="0x7f99f1e6dcd0" >
-                                            <attribute name="name" value="height" id="6324" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6325" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6323" addr="0x7fca469bbcd0" >
+                                            <attribute name="name" value="height" id="6324" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6325" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_12" id="6326" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="6327" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_12" id="6326" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="6327" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <destructor id="6328" addr="0x7f99f1e6ded0" >
-                            <attributelist id="6329" addr="0x7f99f1e6ded0" >
-                                <attribute name="ismember" value="1" id="6330" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="~ControlList" id="6331" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="~ControlList" id="6332" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="6333" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="6334" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e673f0" id="6335" addr="0x7f99f1e673f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="6336" addr="0x7f99f1de6c90" />
+                        <destructor id="6328" addr="0x7fca469bbed0" >
+                            <attributelist id="6329" addr="0x7fca469bbed0" >
+                                <attribute name="ismember" value="1" id="6330" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="~ControlList" id="6331" addr="0x7fca46934c90" />
+                                <attribute name="name" value="~ControlList" id="6332" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="6333" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="6334" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469b53f0" id="6335" addr="0x7fca469b53f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="6336" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </destructor >
-                        <cdecl id="6337" addr="0x7f99f1e6e4d0" >
-                            <attributelist id="6338" addr="0x7f99f1e6e4d0" >
-                                <attribute name="name" value="addItem" id="6339" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="6340" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e673f0" id="6341" addr="0x7f99f1e673f0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e6e690" id="6342" addr="0x7f99f1e6e690" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e6e690" id="6343" addr="0x7f99f1e6e690" />
-                                <attribute name="kind" value="function" id="6344" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="addItem" id="6345" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>,bool)." id="6346" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="6347" addr="0x7f99f1de6c90" />
-                                <parmlist id="6348" addr="0x7f99f1e6e2d0" >
+                        <cdecl id="6337" addr="0x7fca469bc4d0" >
+                            <attributelist id="6338" addr="0x7fca469bc4d0" >
+                                <attribute name="name" value="addItem" id="6339" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="6340" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469b53f0" id="6341" addr="0x7fca469b53f0" />
+                                <attribute name="sym_nextSibling" value="0x7fca469bc690" id="6342" addr="0x7fca469bc690" />
+                                <attribute name="csym_nextSibling" value="0x7fca469bc690" id="6343" addr="0x7fca469bc690" />
+                                <attribute name="kind" value="function" id="6344" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="addItem" id="6345" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>,bool)." id="6346" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="6347" addr="0x7fca46934c90" />
+                                <parmlist id="6348" addr="0x7fca469bc2d0" >
                                     <parm id="6349">
-                                        <attributelist id="6350" addr="0x7f99f1e6e2d0" >
-                                            <attribute name="name" value="item" id="6351" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>" id="6352" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6350" addr="0x7fca469bc2d0" >
+                                            <attribute name="name" value="item" id="6351" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>" id="6352" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6353">
-                                        <attributelist id="6354" addr="0x7f99f1e6e410" >
-                                            <attribute name="name" value="sendMessage" id="6355" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="true" id="6356" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="6357" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6354" addr="0x7fca469bc410" >
+                                            <attribute name="name" value="sendMessage" id="6355" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="true" id="6356" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="6357" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overloaded" value="0x7f99f1e6e4d0" id="6358" addr="0x7f99f1e6e4d0" />
-                                <attribute name="type" value="void" id="6359" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="6360" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="6361" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469bc4d0" id="6358" addr="0x7fca469bc4d0" />
+                                <attribute name="type" value="void" id="6359" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="6360" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="6361" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="6362" addr="0x7f99f1e6e690" >
-                            <attributelist id="6363" addr="0x7f99f1e6e690" >
-                                <attribute name="name" value="addItem" id="6364" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="6365" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e673f0" id="6366" addr="0x7f99f1e673f0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e6e4d0" id="6367" addr="0x7f99f1e6e4d0" />
-                                <attribute name="kind" value="function" id="6368" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="addItem" id="6369" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)." id="6370" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e6e4d0" id="6371" addr="0x7f99f1e6e4d0" />
-                                <attribute name="access" value="public" id="6372" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e6e4d0" id="6373" addr="0x7f99f1e6e4d0" />
-                                <parmlist id="6374" addr="0x7f99f1e6e590" >
+                        <cdecl id="6362" addr="0x7fca469bc690" >
+                            <attributelist id="6363" addr="0x7fca469bc690" >
+                                <attribute name="name" value="addItem" id="6364" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="6365" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469b53f0" id="6366" addr="0x7fca469b53f0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469bc4d0" id="6367" addr="0x7fca469bc4d0" />
+                                <attribute name="kind" value="function" id="6368" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="addItem" id="6369" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)." id="6370" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469bc4d0" id="6371" addr="0x7fca469bc4d0" />
+                                <attribute name="access" value="public" id="6372" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469bc4d0" id="6373" addr="0x7fca469bc4d0" />
+                                <parmlist id="6374" addr="0x7fca469bc590" >
                                     <parm id="6375">
-                                        <attributelist id="6376" addr="0x7f99f1e6e590" >
-                                            <attribute name="name" value="item" id="6377" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>" id="6378" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6376" addr="0x7fca469bc590" >
+                                            <attribute name="name" value="item" id="6377" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>" id="6378" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="6379" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="6380" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="6381" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="6379" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="6380" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="6381" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="6382" addr="0x7f99f1e6ee50" >
-                            <attributelist id="6383" addr="0x7f99f1e6ee50" >
-                                <attribute name="name" value="addItems" id="6384" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="6385" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e673f0" id="6386" addr="0x7f99f1e673f0" />
-                                <attribute name="kind" value="function" id="6387" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="addItems" id="6388" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>)." id="6389" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="6390" addr="0x7f99f1de6c90" />
-                                <parmlist id="6391" addr="0x7f99f1e6eed0" >
+                        <cdecl id="6382" addr="0x7fca469bce50" >
+                            <attributelist id="6383" addr="0x7fca469bce50" >
+                                <attribute name="name" value="addItems" id="6384" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="6385" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469b53f0" id="6386" addr="0x7fca469b53f0" />
+                                <attribute name="kind" value="function" id="6387" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="addItems" id="6388" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>)." id="6389" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="6390" addr="0x7fca46934c90" />
+                                <parmlist id="6391" addr="0x7fca469bced0" >
                                     <parm id="6392">
-                                        <attributelist id="6393" addr="0x7f99f1e6eed0" >
-                                            <attribute name="name" value="items" id="6394" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>" id="6395" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6393" addr="0x7fca469bced0" >
+                                            <attribute name="name" value="items" id="6394" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>" id="6395" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="6396" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="6397" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="6398" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="6396" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="6397" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="6398" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="6399" addr="0x7f99f1e6f170" >
-                            <attributelist id="6400" addr="0x7f99f1e6f170" >
-                                <attribute name="name" value="selectItem" id="6401" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="6402" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e673f0" id="6403" addr="0x7f99f1e673f0" />
-                                <attribute name="kind" value="function" id="6404" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="selectItem" id="6405" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(long)." id="6406" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="6407" addr="0x7f99f1de6c90" />
-                                <parmlist id="6408" addr="0x7f99f1e6f0b0" >
+                        <cdecl id="6399" addr="0x7fca469bd170" >
+                            <attributelist id="6400" addr="0x7fca469bd170" >
+                                <attribute name="name" value="selectItem" id="6401" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="6402" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469b53f0" id="6403" addr="0x7fca469b53f0" />
+                                <attribute name="kind" value="function" id="6404" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="selectItem" id="6405" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(long)." id="6406" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="6407" addr="0x7fca46934c90" />
+                                <parmlist id="6408" addr="0x7fca469bd0b0" >
                                     <parm id="6409">
-                                        <attributelist id="6410" addr="0x7f99f1e6f0b0" >
-                                            <attribute name="name" value="item" id="6411" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6412" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6410" addr="0x7fca469bd0b0" >
+                                            <attribute name="name" value="item" id="6411" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6412" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="6413" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="6414" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="6415" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="6413" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="6414" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="6415" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="6416" addr="0x7f99f1e6f470" >
-                            <attributelist id="6417" addr="0x7f99f1e6f470" >
-                                <attribute name="name" value="removeItem" id="6418" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="6419" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e673f0" id="6420" addr="0x7f99f1e673f0" />
-                                <attribute name="kind" value="function" id="6421" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="removeItem" id="6422" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(int)." id="6423" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="6424" addr="0x7f99f1de6c90" />
-                                <parmlist id="6425" addr="0x7f99f1e6f3b0" >
+                        <cdecl id="6416" addr="0x7fca469bd470" >
+                            <attributelist id="6417" addr="0x7fca469bd470" >
+                                <attribute name="name" value="removeItem" id="6418" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="6419" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469b53f0" id="6420" addr="0x7fca469b53f0" />
+                                <attribute name="kind" value="function" id="6421" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="removeItem" id="6422" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(int)." id="6423" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="6424" addr="0x7fca46934c90" />
+                                <parmlist id="6425" addr="0x7fca469bd3b0" >
                                     <parm id="6426">
-                                        <attributelist id="6427" addr="0x7f99f1e6f3b0" >
-                                            <attribute name="name" value="index" id="6428" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="6429" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                    </parm >
-                                </parmlist >
-                                <attribute name="type" value="void" id="6430" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="6431" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="6432" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="6433" addr="0x7f99f1e6f650" >
-                            <attributelist id="6434" addr="0x7f99f1e6f650" >
-                                <attribute name="name" value="reset" id="6435" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="6436" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e673f0" id="6437" addr="0x7f99f1e673f0" />
-                                <attribute name="kind" value="function" id="6438" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="reset" id="6439" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="6440" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="6441" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="void" id="6442" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="6443" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="6444" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="6445" addr="0x7f99f1e6f830" >
-                            <attributelist id="6446" addr="0x7f99f1e6f830" >
-                                <attribute name="name" value="getSpinControl" id="6447" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="6448" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e673f0" id="6449" addr="0x7f99f1e673f0" />
-                                <attribute name="kind" value="function" id="6450" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getSpinControl" id="6451" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f().p." id="6452" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="6453" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="XBMCAddon::xbmcgui::Control" id="6454" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="6455" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="6456" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="6457" addr="0x7f99f1e6fa50" >
-                            <attributelist id="6458" addr="0x7f99f1e6fa50" >
-                                <attribute name="name" value="getSelectedPosition" id="6459" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="6460" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e673f0" id="6461" addr="0x7f99f1e673f0" />
-                                <attribute name="kind" value="function" id="6462" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getSelectedPosition" id="6463" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="6464" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="6465" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="long" id="6466" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="6467" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="6468" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="6469" addr="0x7f99f1e6fc70" >
-                            <attributelist id="6470" addr="0x7f99f1e6fc70" >
-                                <attribute name="name" value="getSelectedItem" id="6471" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="6472" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e673f0" id="6473" addr="0x7f99f1e673f0" />
-                                <attribute name="kind" value="function" id="6474" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getSelectedItem" id="6475" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f().p." id="6476" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="6477" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="XBMCAddon::xbmcgui::ListItem" id="6478" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="6479" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="6480" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="6481" addr="0x7f99f1e700b0" >
-                            <attributelist id="6482" addr="0x7f99f1e700b0" >
-                                <attribute name="name" value="setImageDimensions" id="6483" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="6484" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e673f0" id="6485" addr="0x7f99f1e673f0" />
-                                <attribute name="kind" value="function" id="6486" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setImageDimensions" id="6487" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(long,long)." id="6488" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="6489" addr="0x7f99f1de6c90" />
-                                <parmlist id="6490" addr="0x7f99f1e6fed0" >
+                                        <attributelist id="6427" addr="0x7fca469bd3b0" >
+                                            <attribute name="name" value="index" id="6428" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="6429" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                    </parm >
+                                </parmlist >
+                                <attribute name="type" value="void" id="6430" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="6431" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="6432" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="6433" addr="0x7fca469bd650" >
+                            <attributelist id="6434" addr="0x7fca469bd650" >
+                                <attribute name="name" value="reset" id="6435" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="6436" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469b53f0" id="6437" addr="0x7fca469b53f0" />
+                                <attribute name="kind" value="function" id="6438" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="reset" id="6439" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="6440" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="6441" addr="0x7fca46934c90" />
+                                <attribute name="type" value="void" id="6442" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="6443" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="6444" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="6445" addr="0x7fca469bd830" >
+                            <attributelist id="6446" addr="0x7fca469bd830" >
+                                <attribute name="name" value="getSpinControl" id="6447" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="6448" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469b53f0" id="6449" addr="0x7fca469b53f0" />
+                                <attribute name="kind" value="function" id="6450" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getSpinControl" id="6451" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f().p." id="6452" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="6453" addr="0x7fca46934c90" />
+                                <attribute name="type" value="XBMCAddon::xbmcgui::Control" id="6454" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="6455" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="6456" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="6457" addr="0x7fca469bda50" >
+                            <attributelist id="6458" addr="0x7fca469bda50" >
+                                <attribute name="name" value="getSelectedPosition" id="6459" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="6460" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469b53f0" id="6461" addr="0x7fca469b53f0" />
+                                <attribute name="kind" value="function" id="6462" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getSelectedPosition" id="6463" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="6464" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="6465" addr="0x7fca46934c90" />
+                                <attribute name="type" value="long" id="6466" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="6467" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="6468" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="6469" addr="0x7fca469bdc70" >
+                            <attributelist id="6470" addr="0x7fca469bdc70" >
+                                <attribute name="name" value="getSelectedItem" id="6471" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="6472" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469b53f0" id="6473" addr="0x7fca469b53f0" />
+                                <attribute name="kind" value="function" id="6474" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getSelectedItem" id="6475" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f().p." id="6476" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="6477" addr="0x7fca46934c90" />
+                                <attribute name="type" value="XBMCAddon::xbmcgui::ListItem" id="6478" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="6479" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="6480" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="6481" addr="0x7fca469be0b0" >
+                            <attributelist id="6482" addr="0x7fca469be0b0" >
+                                <attribute name="name" value="setImageDimensions" id="6483" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="6484" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469b53f0" id="6485" addr="0x7fca469b53f0" />
+                                <attribute name="kind" value="function" id="6486" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setImageDimensions" id="6487" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(long,long)." id="6488" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="6489" addr="0x7fca46934c90" />
+                                <parmlist id="6490" addr="0x7fca469bded0" >
                                     <parm id="6491">
-                                        <attributelist id="6492" addr="0x7f99f1e6fed0" >
-                                            <attribute name="name" value="imageWidth" id="6493" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6494" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6492" addr="0x7fca469bded0" >
+                                            <attribute name="name" value="imageWidth" id="6493" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6494" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6495">
-                                        <attributelist id="6496" addr="0x7f99f1e6fff0" >
-                                            <attribute name="name" value="imageHeight" id="6497" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6498" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6496" addr="0x7fca469bdff0" >
+                                            <attribute name="name" value="imageHeight" id="6497" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6498" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="6499" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="6500" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="6501" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="6499" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="6500" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="6501" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="6502" addr="0x7f99f1e703b0" >
-                            <attributelist id="6503" addr="0x7f99f1e703b0" >
-                                <attribute name="name" value="setItemHeight" id="6504" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="6505" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e673f0" id="6506" addr="0x7f99f1e673f0" />
-                                <attribute name="kind" value="function" id="6507" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setItemHeight" id="6508" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(long)." id="6509" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="6510" addr="0x7f99f1de6c90" />
-                                <parmlist id="6511" addr="0x7f99f1e702f0" >
+                        <cdecl id="6502" addr="0x7fca469be3b0" >
+                            <attributelist id="6503" addr="0x7fca469be3b0" >
+                                <attribute name="name" value="setItemHeight" id="6504" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="6505" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469b53f0" id="6506" addr="0x7fca469b53f0" />
+                                <attribute name="kind" value="function" id="6507" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setItemHeight" id="6508" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(long)." id="6509" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="6510" addr="0x7fca46934c90" />
+                                <parmlist id="6511" addr="0x7fca469be2f0" >
                                     <parm id="6512">
-                                        <attributelist id="6513" addr="0x7f99f1e702f0" >
-                                            <attribute name="name" value="height" id="6514" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6515" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6513" addr="0x7fca469be2f0" >
+                                            <attribute name="name" value="height" id="6514" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6515" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="6516" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="6517" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="6518" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="6516" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="6517" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="6518" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="6519" addr="0x7f99f1e706b0" >
-                            <attributelist id="6520" addr="0x7f99f1e706b0" >
-                                <attribute name="name" value="setSpace" id="6521" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="6522" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e673f0" id="6523" addr="0x7f99f1e673f0" />
-                                <attribute name="kind" value="function" id="6524" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setSpace" id="6525" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(int)." id="6526" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="6527" addr="0x7f99f1de6c90" />
-                                <parmlist id="6528" addr="0x7f99f1e705f0" >
+                        <cdecl id="6519" addr="0x7fca469be6b0" >
+                            <attributelist id="6520" addr="0x7fca469be6b0" >
+                                <attribute name="name" value="setSpace" id="6521" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="6522" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469b53f0" id="6523" addr="0x7fca469b53f0" />
+                                <attribute name="kind" value="function" id="6524" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setSpace" id="6525" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(int)." id="6526" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="6527" addr="0x7fca46934c90" />
+                                <parmlist id="6528" addr="0x7fca469be5f0" >
                                     <parm id="6529">
-                                        <attributelist id="6530" addr="0x7f99f1e705f0" >
-                                            <attribute name="name" value="space" id="6531" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="6532" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6530" addr="0x7fca469be5f0" >
+                                            <attribute name="name" value="space" id="6531" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="6532" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="6533" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="6534" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="6535" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="6533" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="6534" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="6535" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="6536" addr="0x7f99f1e70990" >
-                            <attributelist id="6537" addr="0x7f99f1e70990" >
-                                <attribute name="name" value="setPageControlVisible" id="6538" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="6539" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e673f0" id="6540" addr="0x7f99f1e673f0" />
-                                <attribute name="kind" value="function" id="6541" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setPageControlVisible" id="6542" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(bool)." id="6543" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="6544" addr="0x7f99f1de6c90" />
-                                <parmlist id="6545" addr="0x7f99f1e708d0" >
+                        <cdecl id="6536" addr="0x7fca469be990" >
+                            <attributelist id="6537" addr="0x7fca469be990" >
+                                <attribute name="name" value="setPageControlVisible" id="6538" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="6539" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469b53f0" id="6540" addr="0x7fca469b53f0" />
+                                <attribute name="kind" value="function" id="6541" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setPageControlVisible" id="6542" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(bool)." id="6543" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="6544" addr="0x7fca46934c90" />
+                                <parmlist id="6545" addr="0x7fca469be8d0" >
                                     <parm id="6546">
-                                        <attributelist id="6547" addr="0x7f99f1e708d0" >
-                                            <attribute name="name" value="visible" id="6548" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="6549" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                    </parm >
-                                </parmlist >
-                                <attribute name="type" value="void" id="6550" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="6551" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="6552" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="6553" addr="0x7f99f1e70b90" >
-                            <attributelist id="6554" addr="0x7f99f1e70b90" >
-                                <attribute name="name" value="size" id="6555" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="6556" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e673f0" id="6557" addr="0x7f99f1e673f0" />
-                                <attribute name="kind" value="function" id="6558" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="size" id="6559" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="6560" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="6561" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="long" id="6562" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="6563" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="6564" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="6565" addr="0x7f99f1e70d90" >
-                            <attributelist id="6566" addr="0x7f99f1e70d90" >
-                                <attribute name="name" value="getItemHeight" id="6567" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="6568" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e673f0" id="6569" addr="0x7f99f1e673f0" />
-                                <attribute name="kind" value="function" id="6570" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getItemHeight" id="6571" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="6572" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="6573" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="long" id="6574" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="6575" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="6576" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="6577" addr="0x7f99f1e70f90" >
-                            <attributelist id="6578" addr="0x7f99f1e70f90" >
-                                <attribute name="name" value="getSpace" id="6579" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="6580" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e673f0" id="6581" addr="0x7f99f1e673f0" />
-                                <attribute name="kind" value="function" id="6582" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getSpace" id="6583" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="6584" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="6585" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="long" id="6586" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="6587" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="6588" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="6589" addr="0x7f99f1e712d0" >
-                            <attributelist id="6590" addr="0x7f99f1e712d0" >
-                                <attribute name="name" value="getListItem" id="6591" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="6592" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e673f0" id="6593" addr="0x7f99f1e673f0" />
-                                <attribute name="kind" value="function" id="6594" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getListItem" id="6595" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(int).p." id="6596" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="6597" addr="0x7f99f1de6c90" />
-                                <parmlist id="6598" addr="0x7f99f1e71250" >
+                                        <attributelist id="6547" addr="0x7fca469be8d0" >
+                                            <attribute name="name" value="visible" id="6548" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="6549" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                    </parm >
+                                </parmlist >
+                                <attribute name="type" value="void" id="6550" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="6551" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="6552" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="6553" addr="0x7fca469beb90" >
+                            <attributelist id="6554" addr="0x7fca469beb90" >
+                                <attribute name="name" value="size" id="6555" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="6556" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469b53f0" id="6557" addr="0x7fca469b53f0" />
+                                <attribute name="kind" value="function" id="6558" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="size" id="6559" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="6560" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="6561" addr="0x7fca46934c90" />
+                                <attribute name="type" value="long" id="6562" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="6563" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="6564" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="6565" addr="0x7fca469bed90" >
+                            <attributelist id="6566" addr="0x7fca469bed90" >
+                                <attribute name="name" value="getItemHeight" id="6567" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="6568" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469b53f0" id="6569" addr="0x7fca469b53f0" />
+                                <attribute name="kind" value="function" id="6570" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getItemHeight" id="6571" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="6572" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="6573" addr="0x7fca46934c90" />
+                                <attribute name="type" value="long" id="6574" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="6575" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="6576" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="6577" addr="0x7fca469bef90" >
+                            <attributelist id="6578" addr="0x7fca469bef90" >
+                                <attribute name="name" value="getSpace" id="6579" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="6580" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469b53f0" id="6581" addr="0x7fca469b53f0" />
+                                <attribute name="kind" value="function" id="6582" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getSpace" id="6583" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="6584" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="6585" addr="0x7fca46934c90" />
+                                <attribute name="type" value="long" id="6586" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="6587" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="6588" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="6589" addr="0x7fca469bf2d0" >
+                            <attributelist id="6590" addr="0x7fca469bf2d0" >
+                                <attribute name="name" value="getListItem" id="6591" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="6592" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469b53f0" id="6593" addr="0x7fca469b53f0" />
+                                <attribute name="kind" value="function" id="6594" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getListItem" id="6595" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(int).p." id="6596" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="6597" addr="0x7fca46934c90" />
+                                <parmlist id="6598" addr="0x7fca469bf250" >
                                     <parm id="6599">
-                                        <attributelist id="6600" addr="0x7f99f1e71250" >
-                                            <attribute name="name" value="index" id="6601" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="6602" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6600" addr="0x7fca469bf250" >
+                                            <attribute name="name" value="index" id="6601" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="6602" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="XBMCAddon::xbmcgui::ListItem" id="6603" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="6604" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="6605" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="XBMCAddon::xbmcgui::ListItem" id="6603" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="6604" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="6605" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="6606" addr="0x7f99f1e71610" >
-                            <attributelist id="6607" addr="0x7f99f1e71610" >
-                                <attribute name="name" value="setStaticContent" id="6608" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="6609" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e673f0" id="6610" addr="0x7f99f1e673f0" />
-                                <attribute name="kind" value="function" id="6611" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setStaticContent" id="6612" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(p.q(const).XBMCAddon::xbmcgui::ListItemList)." id="6613" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="6614" addr="0x7f99f1de6c90" />
-                                <parmlist id="6615" addr="0x7f99f1e71550" >
+                        <cdecl id="6606" addr="0x7fca469bf610" >
+                            <attributelist id="6607" addr="0x7fca469bf610" >
+                                <attribute name="name" value="setStaticContent" id="6608" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="6609" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469b53f0" id="6610" addr="0x7fca469b53f0" />
+                                <attribute name="kind" value="function" id="6611" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setStaticContent" id="6612" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(p.q(const).XBMCAddon::xbmcgui::ListItemList)." id="6613" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="6614" addr="0x7fca46934c90" />
+                                <parmlist id="6615" addr="0x7fca469bf550" >
                                     <parm id="6616">
-                                        <attributelist id="6617" addr="0x7f99f1e71550" >
-                                            <attribute name="name" value="items" id="6618" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::ListItemList" id="6619" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6617" addr="0x7fca469bf550" >
+                                            <attribute name="name" value="items" id="6618" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::ListItemList" id="6619" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="6620" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="6621" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="6622" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="6620" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="6621" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="6622" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
                     </class >
-                    <class id="6623" addr="0x7f99f1e71910" >
-                        <attributelist id="6624" addr="0x7f99f1e71910" >
-                            <attribute name="name" value="XBMCAddon::xbmcgui::ControlFadeLabel" id="6625" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="6626" addr="0x7f99f1e40fb0" />
-                            <attribute name="symtab" value="0x7f99f1e71a50" id="6627" addr="0x7f99f1e71a50" />
-                            <attribute name="allows_typedef" value="1" id="6628" addr="0x7f99f1de6c90" />
-                            <attribute name="typepass_visit" value="1" id="6629" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_visit" value="1" id="6630" addr="0x7f99f1de6c90" />
-                            <attribute name="kind" value="class" id="6631" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_name" value="ControlFadeLabel" id="6632" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_has_constructor" value="1" id="6633" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_public_constructor" value="1" id="6634" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_copy_constructor" value="1" id="6635" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_default_destructor" value="1" id="6636" addr="0x7f99f1de6c90" />
-                            <attribute name="privatebaselist" value="0x7f99f1e718f0" id="6637" addr="0x7f99f1e718f0" />
-                            <attribute name="protectedbaselist" value="0x7f99f1e718d0" id="6638" addr="0x7f99f1e718d0" />
-                            <baselist id="6639" addr="0x7f99f1e718b0" >
-                                <base name="Control" id="6640" addr="0x7f99f1e71830" />
+                    <class id="6623" addr="0x7fca469bf910" >
+                        <attributelist id="6624" addr="0x7fca469bf910" >
+                            <attribute name="name" value="XBMCAddon::xbmcgui::ControlFadeLabel" id="6625" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="6626" addr="0x7fca4698efb0" />
+                            <attribute name="symtab" value="0x7fca469bfa50" id="6627" addr="0x7fca469bfa50" />
+                            <attribute name="allows_typedef" value="1" id="6628" addr="0x7fca46934c90" />
+                            <attribute name="typepass_visit" value="1" id="6629" addr="0x7fca46934c90" />
+                            <attribute name="allocate_visit" value="1" id="6630" addr="0x7fca46934c90" />
+                            <attribute name="kind" value="class" id="6631" addr="0x7fca46934c90" />
+                            <attribute name="sym_name" value="ControlFadeLabel" id="6632" addr="0x7fca46934c90" />
+                            <attribute name="allocate_has_constructor" value="1" id="6633" addr="0x7fca46934c90" />
+                            <attribute name="allocate_public_constructor" value="1" id="6634" addr="0x7fca46934c90" />
+                            <attribute name="allocate_copy_constructor" value="1" id="6635" addr="0x7fca46934c90" />
+                            <attribute name="allocate_default_destructor" value="1" id="6636" addr="0x7fca46934c90" />
+                            <attribute name="privatebaselist" value="0x7fca469bf8f0" id="6637" addr="0x7fca469bf8f0" />
+                            <attribute name="protectedbaselist" value="0x7fca469bf8d0" id="6638" addr="0x7fca469bf8d0" />
+                            <baselist id="6639" addr="0x7fca469bf8b0" >
+                                <base name="Control" id="6640" addr="0x7fca469bf830" />
                             </baselist >
-                            <attribute name="module" value="xbmcgui" id="6641" addr="0x7f99f1e402f0" />
-                            <attribute name="bases" value="0x7f99f1dda970" id="6642" addr="0x7f99f1dda970" />
-                            <attribute name="allbases" value="0x7f99f1ddac10" id="6643" addr="0x7f99f1ddac10" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="6644" addr="0x7f99f1de6c90" />
-                            <typescope id="6645" addr="0x7f99f1dda910" >
-                                <attributelist id="6646" addr="0x7f99f1dda910" >
-                                    <attribute name="inherit" value="0x7f99f1dda9f0" id="6647" addr="0x7f99f1dda9f0" />
-                                    <attribute name="name" value="ControlFadeLabel" id="6648" addr="0x7f99f1de6c90" />
-                                    <typetab id="6649" addr="0x7f99f1dda8d0" >
-                                        <attributelist id="6650" addr="0x7f99f1dda8d0" >
+                            <attribute name="module" value="xbmcgui" id="6641" addr="0x7fca4698e2f0" />
+                            <attribute name="bases" value="0x7fca46928970" id="6642" addr="0x7fca46928970" />
+                            <attribute name="allbases" value="0x7fca46928c10" id="6643" addr="0x7fca46928c10" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="6644" addr="0x7fca46934c90" />
+                            <typescope id="6645" addr="0x7fca46928910" >
+                                <attributelist id="6646" addr="0x7fca46928910" >
+                                    <attribute name="inherit" value="0x7fca469289f0" id="6647" addr="0x7fca469289f0" />
+                                    <attribute name="name" value="ControlFadeLabel" id="6648" addr="0x7fca46934c90" />
+                                    <typetab id="6649" addr="0x7fca469288d0" >
+                                        <attributelist id="6650" addr="0x7fca469288d0" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f99f1dd2150" id="6651" addr="0x7f99f1dd2150" />
-                                    <attribute name="qname" value="XBMCAddon::xbmcgui::ControlFadeLabel" id="6652" addr="0x7f99f1de6c90" />
-                                    <attribute name="symtab" value="0x7f99f1e71a50" id="6653" addr="0x7f99f1e71a50" />
+                                    <attribute name="parent" value="0x7fca46920150" id="6651" addr="0x7fca46920150" />
+                                    <attribute name="qname" value="XBMCAddon::xbmcgui::ControlFadeLabel" id="6652" addr="0x7fca46934c90" />
+                                    <attribute name="symtab" value="0x7fca469bfa50" id="6653" addr="0x7fca469bfa50" />
                                 </attributelist >
-                                <typescopesitem id="6654" addr="0x7f99f1dda9f0" >
-                                    <attributelist id="6655" addr="0x7f99f1dda9f0" >
+                                <typescopesitem id="6654" addr="0x7fca469289f0" >
+                                    <attributelist id="6655" addr="0x7fca469289f0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="6656" addr="0x7f99f1dda8b0" >
-                                    <attributelist id="6657" addr="0x7f99f1dda8b0" >
+                                <typescopesitem id="6656" addr="0x7fca469288b0" >
+                                    <attributelist id="6657" addr="0x7fca469288b0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="6658" addr="0x7f99f1dda8d0" >
-                                    <attributelist id="6659" addr="0x7f99f1dda8d0" >
+                                <typescopesitem id="6658" addr="0x7fca469288d0" >
+                                    <attributelist id="6659" addr="0x7fca469288d0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="6660" addr="0x7f99f1dd2150" >
-                                    <attributelist id="6661" addr="0x7f99f1dd2150" >
-                                        <attribute name="name" value="xbmcgui" id="6662" addr="0x7f99f1de6c90" />
-                                        <typetab id="6663" addr="0x7f99f1dd2170" >
-                                            <attributelist id="6664" addr="0x7f99f1dd2170" >
-                                                <attribute name="InterceptorBase" value="InterceptorBase" id="6665" addr="0x7f99f1de6c90" />
-                                                <attribute name="Dialog" value="Dialog" id="6666" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="6667" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="6668" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlTextBox" value="ControlTextBox" id="6669" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="6670" addr="0x7f99f1de6c90" />
-                                                <attribute name="Window" value="Window" id="6671" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="6672" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlList" value="ControlList" id="6673" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="6674" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlImage" value="ControlImage" id="6675" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlButton" value="ControlButton" id="6676" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlGroup" value="ControlGroup" id="6677" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogBusy" value="DialogBusy" id="6678" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="6679" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSpin" value="ControlSpin" id="6680" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlEdit" value="ControlEdit" id="6681" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="6682" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="6683" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlLabel" value="ControlLabel" id="6684" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlProgress" value="ControlProgress" id="6685" addr="0x7f99f1de6c90" />
-                                                <attribute name="Control" value="Control" id="6686" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSlider" value="ControlSlider" id="6687" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgress" value="DialogProgress" id="6688" addr="0x7f99f1de6c90" />
-                                                <attribute name="Action" value="Action" id="6689" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowDialog" value="WindowDialog" id="6690" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXML" value="WindowXML" id="6691" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItem" value="ListItem" id="6692" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="6693" addr="0x7f99f1de6c90" />
+                                <typescopesitem id="6660" addr="0x7fca46920150" >
+                                    <attributelist id="6661" addr="0x7fca46920150" >
+                                        <attribute name="name" value="xbmcgui" id="6662" addr="0x7fca46934c90" />
+                                        <typetab id="6663" addr="0x7fca46920170" >
+                                            <attributelist id="6664" addr="0x7fca46920170" >
+                                                <attribute name="InterceptorBase" value="InterceptorBase" id="6665" addr="0x7fca46934c90" />
+                                                <attribute name="Dialog" value="Dialog" id="6666" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="6667" addr="0x7fca46934c90" />
+                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="6668" addr="0x7fca46934c90" />
+                                                <attribute name="ControlTextBox" value="ControlTextBox" id="6669" addr="0x7fca46934c90" />
+                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="6670" addr="0x7fca46934c90" />
+                                                <attribute name="Window" value="Window" id="6671" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="6672" addr="0x7fca46934c90" />
+                                                <attribute name="ControlList" value="ControlList" id="6673" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="6674" addr="0x7fca46934c90" />
+                                                <attribute name="ControlImage" value="ControlImage" id="6675" addr="0x7fca46934c90" />
+                                                <attribute name="ControlButton" value="ControlButton" id="6676" addr="0x7fca46934c90" />
+                                                <attribute name="ControlGroup" value="ControlGroup" id="6677" addr="0x7fca46934c90" />
+                                                <attribute name="DialogBusy" value="DialogBusy" id="6678" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="6679" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSpin" value="ControlSpin" id="6680" addr="0x7fca46934c90" />
+                                                <attribute name="ControlEdit" value="ControlEdit" id="6681" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="6682" addr="0x7fca46934c90" />
+                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="6683" addr="0x7fca46934c90" />
+                                                <attribute name="ControlLabel" value="ControlLabel" id="6684" addr="0x7fca46934c90" />
+                                                <attribute name="ControlProgress" value="ControlProgress" id="6685" addr="0x7fca46934c90" />
+                                                <attribute name="Control" value="Control" id="6686" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSlider" value="ControlSlider" id="6687" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgress" value="DialogProgress" id="6688" addr="0x7fca46934c90" />
+                                                <attribute name="Action" value="Action" id="6689" addr="0x7fca46934c90" />
+                                                <attribute name="WindowDialog" value="WindowDialog" id="6690" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXML" value="WindowXML" id="6691" addr="0x7fca46934c90" />
+                                                <attribute name="ListItem" value="ListItem" id="6692" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="6693" addr="0x7fca46934c90" />
                                             </attributelist >
-                                            <typetabsitem id="6694" addr="0x7f99f1de1dd0" >
-                                                <attributelist id="6695" addr="0x7f99f1de1dd0" >
+                                            <typetabsitem id="6694" addr="0x7fca4692fdd0" >
+                                                <attributelist id="6695" addr="0x7fca4692fdd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="6696" addr="0x7f99f1dde790" >
-                                                <attributelist id="6697" addr="0x7f99f1dde790" >
+                                            <typetabsitem id="6696" addr="0x7fca4692c790" >
+                                                <attributelist id="6697" addr="0x7fca4692c790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="6698" addr="0x7f99f1de3f10" >
-                                                <attributelist id="6699" addr="0x7f99f1de3f10" >
+                                            <typetabsitem id="6698" addr="0x7fca46931f10" >
+                                                <attributelist id="6699" addr="0x7fca46931f10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="6700" addr="0x7f99f1dd67b0" >
-                                                <attributelist id="6701" addr="0x7f99f1dd67b0" >
+                                            <typetabsitem id="6700" addr="0x7fca469247b0" >
+                                                <attributelist id="6701" addr="0x7fca469247b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="6702" addr="0x7f99f1ddafd0" >
-                                                <attributelist id="6703" addr="0x7f99f1ddafd0" >
+                                            <typetabsitem id="6702" addr="0x7fca46928fd0" >
+                                                <attributelist id="6703" addr="0x7fca46928fd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="6704" addr="0x7f99f1ddd430" >
-                                                <attributelist id="6705" addr="0x7f99f1ddd430" >
+                                            <typetabsitem id="6704" addr="0x7fca4692b430" >
+                                                <attributelist id="6705" addr="0x7fca4692b430" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="6706" addr="0x7f99f1de2130" >
-                                                <attributelist id="6707" addr="0x7f99f1de2130" >
+                                            <typetabsitem id="6706" addr="0x7fca46930130" >
+                                                <attributelist id="6707" addr="0x7fca46930130" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="6708" addr="0x7f99f1dd2f50" >
-                                                <attributelist id="6709" addr="0x7f99f1dd2f50" >
+                                            <typetabsitem id="6708" addr="0x7fca46920f50" >
+                                                <attributelist id="6709" addr="0x7fca46920f50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="6710" addr="0x7f99f1dd9650" >
-                                                <attributelist id="6711" addr="0x7f99f1dd9650" >
+                                            <typetabsitem id="6710" addr="0x7fca46927650" >
+                                                <attributelist id="6711" addr="0x7fca46927650" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="6712" addr="0x7f99f1de3390" >
-                                                <attributelist id="6713" addr="0x7f99f1de3390" >
+                                            <typetabsitem id="6712" addr="0x7fca46931390" >
+                                                <attributelist id="6713" addr="0x7fca46931390" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="6714" addr="0x7f99f1ddb7b0" >
-                                                <attributelist id="6715" addr="0x7f99f1ddb7b0" >
+                                            <typetabsitem id="6714" addr="0x7fca469297b0" >
+                                                <attributelist id="6715" addr="0x7fca469297b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="6716" addr="0x7f99f1ddc4b0" >
-                                                <attributelist id="6717" addr="0x7f99f1ddc4b0" >
+                                            <typetabsitem id="6716" addr="0x7fca4692a4b0" >
+                                                <attributelist id="6717" addr="0x7fca4692a4b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="6718" addr="0x7f99f1ddcf90" >
-                                                <attributelist id="6719" addr="0x7f99f1ddcf90" >
+                                            <typetabsitem id="6718" addr="0x7fca4692af90" >
+                                                <attributelist id="6719" addr="0x7fca4692af90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="6720" addr="0x7f99f1de11b0" >
-                                                <attributelist id="6721" addr="0x7f99f1de11b0" >
+                                            <typetabsitem id="6720" addr="0x7fca4692f1b0" >
+                                                <attributelist id="6721" addr="0x7fca4692f1b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="6722" addr="0x7f99f1de15b0" >
-                                                <attributelist id="6723" addr="0x7f99f1de15b0" >
+                                            <typetabsitem id="6722" addr="0x7fca4692f5b0" >
+                                                <attributelist id="6723" addr="0x7fca4692f5b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="6724" addr="0x7f99f1dd77f0" >
-                                                <attributelist id="6725" addr="0x7f99f1dd77f0" >
+                                            <typetabsitem id="6724" addr="0x7fca469257f0" >
+                                                <attributelist id="6725" addr="0x7fca469257f0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="6726" addr="0x7f99f1dd8b30" >
-                                                <attributelist id="6727" addr="0x7f99f1dd8b30" >
+                                            <typetabsitem id="6726" addr="0x7fca46926b30" >
+                                                <attributelist id="6727" addr="0x7fca46926b30" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="6728" addr="0x7f99f1dd2c50" >
-                                                <attributelist id="6729" addr="0x7f99f1dd2c50" >
+                                            <typetabsitem id="6728" addr="0x7fca46920c50" >
+                                                <attributelist id="6729" addr="0x7fca46920c50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="6730" addr="0x7f99f1dda790" >
-                                                <attributelist id="6731" addr="0x7f99f1dda790" >
+                                            <typetabsitem id="6730" addr="0x7fca46928790" >
+                                                <attributelist id="6731" addr="0x7fca46928790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="6732" addr="0x7f99f1dd8030" >
-                                                <attributelist id="6733" addr="0x7f99f1dd8030" >
+                                            <typetabsitem id="6732" addr="0x7fca46926030" >
+                                                <attributelist id="6733" addr="0x7fca46926030" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="6734" addr="0x7f99f1ddbe10" >
-                                                <attributelist id="6735" addr="0x7f99f1ddbe10" >
+                                            <typetabsitem id="6734" addr="0x7fca46929e10" >
+                                                <attributelist id="6735" addr="0x7fca46929e10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="6736" addr="0x7f99f1dd6b10" >
-                                                <attributelist id="6737" addr="0x7f99f1dd6b10" >
+                                            <typetabsitem id="6736" addr="0x7fca46924b10" >
+                                                <attributelist id="6737" addr="0x7fca46924b10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="6738" addr="0x7f99f1dddf90" >
-                                                <attributelist id="6739" addr="0x7f99f1dddf90" >
+                                            <typetabsitem id="6738" addr="0x7fca4692bf90" >
+                                                <attributelist id="6739" addr="0x7fca4692bf90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="6740" addr="0x7f99f1de0530" >
-                                                <attributelist id="6741" addr="0x7f99f1de0530" >
+                                            <typetabsitem id="6740" addr="0x7fca4692e530" >
+                                                <attributelist id="6741" addr="0x7fca4692e530" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="6742" addr="0x7f99f1de1e50" >
-                                                <attributelist id="6743" addr="0x7f99f1de1e50" >
+                                            <typetabsitem id="6742" addr="0x7fca4692fe50" >
+                                                <attributelist id="6743" addr="0x7fca4692fe50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="6744" addr="0x7f99f1de2d90" >
-                                                <attributelist id="6745" addr="0x7f99f1de2d90" >
+                                            <typetabsitem id="6744" addr="0x7fca46930d90" >
+                                                <attributelist id="6745" addr="0x7fca46930d90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="6746" addr="0x7f99f1de3410" >
-                                                <attributelist id="6747" addr="0x7f99f1de3410" >
+                                            <typetabsitem id="6746" addr="0x7fca46931410" >
+                                                <attributelist id="6747" addr="0x7fca46931410" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="6748" addr="0x7f99f1dd3590" >
-                                                <attributelist id="6749" addr="0x7f99f1dd3590" >
+                                            <typetabsitem id="6748" addr="0x7fca46921590" >
+                                                <attributelist id="6749" addr="0x7fca46921590" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="6750" addr="0x7f99f1dd3390" >
-                                                <attributelist id="6751" addr="0x7f99f1dd3390" >
+                                            <typetabsitem id="6750" addr="0x7fca46921390" >
+                                                <attributelist id="6751" addr="0x7fca46921390" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7f99f1dd1d70" id="6752" addr="0x7f99f1dd1d70" />
-                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="6753" addr="0x7f99f1de6c90" />
-                                        <attribute name="symtab" value="0x7f99f1e40fb0" id="6754" addr="0x7f99f1e40fb0" />
+                                        <attribute name="parent" value="0x7fca4691fd70" id="6752" addr="0x7fca4691fd70" />
+                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="6753" addr="0x7fca46934c90" />
+                                        <attribute name="symtab" value="0x7fca4698efb0" id="6754" addr="0x7fca4698efb0" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="6755" addr="0x7f99f1dda950" >
-                                    <attributelist id="6756" addr="0x7f99f1dda950" >
+                                <typescopesitem id="6755" addr="0x7fca46928950" >
+                                    <attributelist id="6756" addr="0x7fca46928950" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="6757" addr="0x7f99f1e71a50" >
-                                    <attributelist id="6758" addr="0x7f99f1e71a50" >
-                                        <attribute name="inherit" value="0x7f99f1e71ab0" id="6759" addr="0x7f99f1e71ab0" />
-                                        <attribute name="name" value="ControlFadeLabel" id="6760" addr="0x7f99f1de6c90" />
-                                        <attribute name="csymtab" value="0x7f99f1e71a70" id="6761" addr="0x7f99f1e71a70" />
-                                        <attribute name="symtab" value="0x7f99f1e71a30" id="6762" addr="0x7f99f1e71a30" />
+                                <typescopesitem id="6757" addr="0x7fca469bfa50" >
+                                    <attributelist id="6758" addr="0x7fca469bfa50" >
+                                        <attribute name="inherit" value="0x7fca469bfab0" id="6759" addr="0x7fca469bfab0" />
+                                        <attribute name="name" value="ControlFadeLabel" id="6760" addr="0x7fca46934c90" />
+                                        <attribute name="csymtab" value="0x7fca469bfa70" id="6761" addr="0x7fca469bfa70" />
+                                        <attribute name="symtab" value="0x7fca469bfa30" id="6762" addr="0x7fca469bfa30" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <access id="6763" addr="0x7f99f1e719d0" >
-                            <attributelist id="6764" addr="0x7f99f1e719d0" >
-                                <attribute name="kind" value="public" id="6765" addr="0x7f99f1de6c90" />
+                        <access id="6763" addr="0x7fca469bf9d0" >
+                            <attributelist id="6764" addr="0x7fca469bf9d0" >
+                                <attribute name="kind" value="public" id="6765" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="6766" addr="0x7f99f1e724f0" >
-                            <attributelist id="6767" addr="0x7f99f1e724f0" >
-                                <attribute name="name" value="ControlFadeLabel" id="6768" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="6769" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e71a50" id="6770" addr="0x7f99f1e71a50" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e72930" id="6771" addr="0x7f99f1e72930" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e72930" id="6772" addr="0x7f99f1e72930" />
-                                <attribute name="sym_name" value="ControlFadeLabel" id="6773" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char,long)." id="6774" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="6775" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e724f0" id="6776" addr="0x7f99f1e724f0" />
-                                <parmlist id="6777" addr="0x7f99f1e71c10" >
+                        <constructor id="6766" addr="0x7fca469c04f0" >
+                            <attributelist id="6767" addr="0x7fca469c04f0" >
+                                <attribute name="name" value="ControlFadeLabel" id="6768" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="6769" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469bfa50" id="6770" addr="0x7fca469bfa50" />
+                                <attribute name="sym_nextSibling" value="0x7fca469c0930" id="6771" addr="0x7fca469c0930" />
+                                <attribute name="csym_nextSibling" value="0x7fca469c0930" id="6772" addr="0x7fca469c0930" />
+                                <attribute name="sym_name" value="ControlFadeLabel" id="6773" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char,long)." id="6774" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="6775" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469c04f0" id="6776" addr="0x7fca469c04f0" />
+                                <parmlist id="6777" addr="0x7fca469bfc10" >
                                     <parm id="6778">
-                                        <attributelist id="6779" addr="0x7f99f1e71c10" >
-                                            <attribute name="name" value="x" id="6780" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6781" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6779" addr="0x7fca469bfc10" >
+                                            <attribute name="name" value="x" id="6780" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6781" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6782">
-                                        <attributelist id="6783" addr="0x7f99f1e71d30" >
-                                            <attribute name="name" value="y" id="6784" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6785" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6783" addr="0x7fca469bfd30" >
+                                            <attribute name="name" value="y" id="6784" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6785" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6786">
-                                        <attributelist id="6787" addr="0x7f99f1e71e50" >
-                                            <attribute name="name" value="width" id="6788" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6789" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6787" addr="0x7fca469bfe50" >
+                                            <attribute name="name" value="width" id="6788" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6789" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6790">
-                                        <attributelist id="6791" addr="0x7f99f1e71f70" >
-                                            <attribute name="name" value="height" id="6792" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6793" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6791" addr="0x7fca469bff70" >
+                                            <attribute name="name" value="height" id="6792" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6793" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6794">
-                                        <attributelist id="6795" addr="0x7f99f1e72110" >
-                                            <attribute name="name" value="font" id="6796" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="6797" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="6798" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6795" addr="0x7fca469c0110" >
+                                            <attribute name="name" value="font" id="6796" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="6797" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="6798" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6799">
-                                        <attributelist id="6800" addr="0x7f99f1e722b0" >
-                                            <attribute name="name" value="textColor" id="6801" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="6802" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="6803" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6800" addr="0x7fca469c02b0" >
+                                            <attribute name="name" value="textColor" id="6801" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="6802" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="6803" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6804">
-                                        <attributelist id="6805" addr="0x7f99f1e72430" >
-                                            <attribute name="name" value="_alignment" id="6806" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBFONT_LEFT" id="6807" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6808" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6805" addr="0x7fca469c0430" >
+                                            <attribute name="name" value="_alignment" id="6806" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBFONT_LEFT" id="6807" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6808" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_0" id="6809" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="6810" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="6809" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="6810" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="6811" addr="0x7f99f1e72930" >
-                            <attributelist id="6812" addr="0x7f99f1e72930" >
-                                <attribute name="name" value="ControlFadeLabel" id="6813" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="6814" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e71a50" id="6815" addr="0x7f99f1e71a50" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e72cd0" id="6816" addr="0x7f99f1e72cd0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e724f0" id="6817" addr="0x7f99f1e724f0" />
-                                <attribute name="sym_name" value="ControlFadeLabel" id="6818" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e72cd0" id="6819" addr="0x7f99f1e72cd0" />
-                                <attribute name="defaultargs" value="0x7f99f1e724f0" id="6820" addr="0x7f99f1e724f0" />
-                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char)." id="6821" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="6822" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e724f0" id="6823" addr="0x7f99f1e724f0" />
-                                <parmlist id="6824" addr="0x7f99f1e72590" >
+                        <constructor id="6811" addr="0x7fca469c0930" >
+                            <attributelist id="6812" addr="0x7fca469c0930" >
+                                <attribute name="name" value="ControlFadeLabel" id="6813" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="6814" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469bfa50" id="6815" addr="0x7fca469bfa50" />
+                                <attribute name="csym_nextSibling" value="0x7fca469c0cd0" id="6816" addr="0x7fca469c0cd0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469c04f0" id="6817" addr="0x7fca469c04f0" />
+                                <attribute name="sym_name" value="ControlFadeLabel" id="6818" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469c0cd0" id="6819" addr="0x7fca469c0cd0" />
+                                <attribute name="defaultargs" value="0x7fca469c04f0" id="6820" addr="0x7fca469c04f0" />
+                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char)." id="6821" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="6822" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469c04f0" id="6823" addr="0x7fca469c04f0" />
+                                <parmlist id="6824" addr="0x7fca469c0590" >
                                     <parm id="6825">
-                                        <attributelist id="6826" addr="0x7f99f1e72590" >
-                                            <attribute name="name" value="x" id="6827" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6828" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6826" addr="0x7fca469c0590" >
+                                            <attribute name="name" value="x" id="6827" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6828" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6829">
-                                        <attributelist id="6830" addr="0x7f99f1e72650" >
-                                            <attribute name="name" value="y" id="6831" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6832" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6830" addr="0x7fca469c0650" >
+                                            <attribute name="name" value="y" id="6831" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6832" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6833">
-                                        <attributelist id="6834" addr="0x7f99f1e726d0" >
-                                            <attribute name="name" value="width" id="6835" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6836" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6834" addr="0x7fca469c06d0" >
+                                            <attribute name="name" value="width" id="6835" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6836" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6837">
-                                        <attributelist id="6838" addr="0x7f99f1e72750" >
-                                            <attribute name="name" value="height" id="6839" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6840" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6838" addr="0x7fca469c0750" >
+                                            <attribute name="name" value="height" id="6839" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6840" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6841">
-                                        <attributelist id="6842" addr="0x7f99f1e727d0" >
-                                            <attribute name="name" value="font" id="6843" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="6844" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="6845" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6842" addr="0x7fca469c07d0" >
+                                            <attribute name="name" value="font" id="6843" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="6844" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="6845" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6846">
-                                        <attributelist id="6847" addr="0x7f99f1e72870" >
-                                            <attribute name="name" value="textColor" id="6848" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="6849" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="6850" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6847" addr="0x7fca469c0870" >
+                                            <attribute name="name" value="textColor" id="6848" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="6849" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="6850" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_1" id="6851" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="6852" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="6851" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="6852" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="6853" addr="0x7f99f1e72cd0" >
-                            <attributelist id="6854" addr="0x7f99f1e72cd0" >
-                                <attribute name="name" value="ControlFadeLabel" id="6855" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="6856" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e71a50" id="6857" addr="0x7f99f1e71a50" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e72fd0" id="6858" addr="0x7f99f1e72fd0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e72930" id="6859" addr="0x7f99f1e72930" />
-                                <attribute name="sym_name" value="ControlFadeLabel" id="6860" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e72fd0" id="6861" addr="0x7f99f1e72fd0" />
-                                <attribute name="defaultargs" value="0x7f99f1e724f0" id="6862" addr="0x7f99f1e724f0" />
-                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char)." id="6863" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="6864" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e724f0" id="6865" addr="0x7f99f1e724f0" />
-                                <parmlist id="6866" addr="0x7f99f1e729d0" >
+                        <constructor id="6853" addr="0x7fca469c0cd0" >
+                            <attributelist id="6854" addr="0x7fca469c0cd0" >
+                                <attribute name="name" value="ControlFadeLabel" id="6855" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="6856" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469bfa50" id="6857" addr="0x7fca469bfa50" />
+                                <attribute name="csym_nextSibling" value="0x7fca469c0fd0" id="6858" addr="0x7fca469c0fd0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469c0930" id="6859" addr="0x7fca469c0930" />
+                                <attribute name="sym_name" value="ControlFadeLabel" id="6860" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469c0fd0" id="6861" addr="0x7fca469c0fd0" />
+                                <attribute name="defaultargs" value="0x7fca469c04f0" id="6862" addr="0x7fca469c04f0" />
+                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char)." id="6863" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="6864" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469c04f0" id="6865" addr="0x7fca469c04f0" />
+                                <parmlist id="6866" addr="0x7fca469c09d0" >
                                     <parm id="6867">
-                                        <attributelist id="6868" addr="0x7f99f1e729d0" >
-                                            <attribute name="name" value="x" id="6869" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6870" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6868" addr="0x7fca469c09d0" >
+                                            <attribute name="name" value="x" id="6869" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6870" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6871">
-                                        <attributelist id="6872" addr="0x7f99f1e72a90" >
-                                            <attribute name="name" value="y" id="6873" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6874" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6872" addr="0x7fca469c0a90" >
+                                            <attribute name="name" value="y" id="6873" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6874" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6875">
-                                        <attributelist id="6876" addr="0x7f99f1e72b10" >
-                                            <attribute name="name" value="width" id="6877" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6878" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6876" addr="0x7fca469c0b10" >
+                                            <attribute name="name" value="width" id="6877" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6878" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6879">
-                                        <attributelist id="6880" addr="0x7f99f1e72b90" >
-                                            <attribute name="name" value="height" id="6881" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6882" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6880" addr="0x7fca469c0b90" >
+                                            <attribute name="name" value="height" id="6881" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6882" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6883">
-                                        <attributelist id="6884" addr="0x7f99f1e72c10" >
-                                            <attribute name="name" value="font" id="6885" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="6886" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="6887" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6884" addr="0x7fca469c0c10" >
+                                            <attribute name="name" value="font" id="6885" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="6886" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="6887" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_2" id="6888" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="6889" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_2" id="6888" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="6889" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="6890" addr="0x7f99f1e72fd0" >
-                            <attributelist id="6891" addr="0x7f99f1e72fd0" >
-                                <attribute name="name" value="ControlFadeLabel" id="6892" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="6893" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e71a50" id="6894" addr="0x7f99f1e71a50" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e72cd0" id="6895" addr="0x7f99f1e72cd0" />
-                                <attribute name="sym_name" value="ControlFadeLabel" id="6896" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e724f0" id="6897" addr="0x7f99f1e724f0" />
-                                <attribute name="decl" value="f(long,long,long,long)." id="6898" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="6899" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e724f0" id="6900" addr="0x7f99f1e724f0" />
-                                <parmlist id="6901" addr="0x7f99f1e72d70" >
+                        <constructor id="6890" addr="0x7fca469c0fd0" >
+                            <attributelist id="6891" addr="0x7fca469c0fd0" >
+                                <attribute name="name" value="ControlFadeLabel" id="6892" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="6893" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469bfa50" id="6894" addr="0x7fca469bfa50" />
+                                <attribute name="sym_previousSibling" value="0x7fca469c0cd0" id="6895" addr="0x7fca469c0cd0" />
+                                <attribute name="sym_name" value="ControlFadeLabel" id="6896" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469c04f0" id="6897" addr="0x7fca469c04f0" />
+                                <attribute name="decl" value="f(long,long,long,long)." id="6898" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="6899" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469c04f0" id="6900" addr="0x7fca469c04f0" />
+                                <parmlist id="6901" addr="0x7fca469c0d70" >
                                     <parm id="6902">
-                                        <attributelist id="6903" addr="0x7f99f1e72d70" >
-                                            <attribute name="name" value="x" id="6904" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6905" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6903" addr="0x7fca469c0d70" >
+                                            <attribute name="name" value="x" id="6904" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6905" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6906">
-                                        <attributelist id="6907" addr="0x7f99f1e72e30" >
-                                            <attribute name="name" value="y" id="6908" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6909" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6907" addr="0x7fca469c0e30" >
+                                            <attribute name="name" value="y" id="6908" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6909" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6910">
-                                        <attributelist id="6911" addr="0x7f99f1e72eb0" >
-                                            <attribute name="name" value="width" id="6912" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6913" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6911" addr="0x7fca469c0eb0" >
+                                            <attribute name="name" value="width" id="6912" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6913" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="6914">
-                                        <attributelist id="6915" addr="0x7f99f1e72f30" >
-                                            <attribute name="name" value="height" id="6916" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="6917" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6915" addr="0x7fca469c0f30" >
+                                            <attribute name="name" value="height" id="6916" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="6917" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_3" id="6918" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="6919" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_3" id="6918" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="6919" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <cdecl id="6920" addr="0x7f99f1e732b0" >
-                            <attributelist id="6921" addr="0x7f99f1e732b0" >
-                                <attribute name="name" value="addLabel" id="6922" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="6923" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e71a50" id="6924" addr="0x7f99f1e71a50" />
-                                <attribute name="kind" value="function" id="6925" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="addLabel" id="6926" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="6927" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="6928" addr="0x7f99f1de6c90" />
-                                <parmlist id="6929" addr="0x7f99f1e731f0" >
+                        <cdecl id="6920" addr="0x7fca469c12b0" >
+                            <attributelist id="6921" addr="0x7fca469c12b0" >
+                                <attribute name="name" value="addLabel" id="6922" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="6923" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469bfa50" id="6924" addr="0x7fca469bfa50" />
+                                <attribute name="kind" value="function" id="6925" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="addLabel" id="6926" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="6927" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="6928" addr="0x7fca46934c90" />
+                                <parmlist id="6929" addr="0x7fca469c11f0" >
                                     <parm id="6930">
-                                        <attributelist id="6931" addr="0x7f99f1e731f0" >
-                                            <attribute name="name" value="label" id="6932" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="6933" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6931" addr="0x7fca469c11f0" >
+                                            <attribute name="name" value="label" id="6932" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="6933" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="6934" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="6935" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="6936" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="6934" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="6935" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="6936" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="6937" addr="0x7f99f1e73590" >
-                            <attributelist id="6938" addr="0x7f99f1e73590" >
-                                <attribute name="name" value="setScrolling" id="6939" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="6940" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e71a50" id="6941" addr="0x7f99f1e71a50" />
-                                <attribute name="kind" value="function" id="6942" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setScrolling" id="6943" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(bool)." id="6944" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="6945" addr="0x7f99f1de6c90" />
-                                <parmlist id="6946" addr="0x7f99f1e734d0" >
+                        <cdecl id="6937" addr="0x7fca469c1590" >
+                            <attributelist id="6938" addr="0x7fca469c1590" >
+                                <attribute name="name" value="setScrolling" id="6939" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="6940" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469bfa50" id="6941" addr="0x7fca469bfa50" />
+                                <attribute name="kind" value="function" id="6942" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setScrolling" id="6943" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(bool)." id="6944" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="6945" addr="0x7fca46934c90" />
+                                <parmlist id="6946" addr="0x7fca469c14d0" >
                                     <parm id="6947">
-                                        <attributelist id="6948" addr="0x7f99f1e734d0" >
-                                            <attribute name="name" value="scroll" id="6949" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="6950" addr="0x7f99f1de6c90" />
+                                        <attributelist id="6948" addr="0x7fca469c14d0" >
+                                            <attribute name="name" value="scroll" id="6949" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="6950" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="6951" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="6952" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="6953" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="6951" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="6952" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="6953" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="6954" addr="0x7f99f1e73770" >
-                            <attributelist id="6955" addr="0x7f99f1e73770" >
-                                <attribute name="ismember" value="1" id="6956" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="reset" id="6957" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="reset" id="6958" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="6959" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="6960" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="6961" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="6962" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="void" id="6963" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e71a50" id="6964" addr="0x7f99f1e71a50" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="6965" addr="0x7f99f1de6c90" />
+                        <cdecl id="6954" addr="0x7fca469c1770" >
+                            <attributelist id="6955" addr="0x7fca469c1770" >
+                                <attribute name="ismember" value="1" id="6956" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="reset" id="6957" addr="0x7fca46934c90" />
+                                <attribute name="name" value="reset" id="6958" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="6959" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="6960" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="6961" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="6962" addr="0x7fca46934c90" />
+                                <attribute name="type" value="void" id="6963" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469bfa50" id="6964" addr="0x7fca469bfa50" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="6965" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
                     </class >
-                    <class id="6966" addr="0x7f99f1e73a50" >
-                        <attributelist id="6967" addr="0x7f99f1e73a50" >
-                            <attribute name="name" value="XBMCAddon::xbmcgui::ControlTextBox" id="6968" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="6969" addr="0x7f99f1e40fb0" />
-                            <attribute name="symtab" value="0x7f99f1e73b90" id="6970" addr="0x7f99f1e73b90" />
-                            <attribute name="allows_typedef" value="1" id="6971" addr="0x7f99f1de6c90" />
-                            <attribute name="typepass_visit" value="1" id="6972" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_visit" value="1" id="6973" addr="0x7f99f1de6c90" />
-                            <attribute name="kind" value="class" id="6974" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_name" value="ControlTextBox" id="6975" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_has_constructor" value="1" id="6976" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_public_constructor" value="1" id="6977" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_copy_constructor" value="1" id="6978" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_default_destructor" value="1" id="6979" addr="0x7f99f1de6c90" />
-                            <attribute name="privatebaselist" value="0x7f99f1e73a30" id="6980" addr="0x7f99f1e73a30" />
-                            <attribute name="protectedbaselist" value="0x7f99f1e73a10" id="6981" addr="0x7f99f1e73a10" />
-                            <baselist id="6982" addr="0x7f99f1e739f0" >
-                                <base name="Control" id="6983" addr="0x7f99f1e73970" />
+                    <class id="6966" addr="0x7fca469c1a50" >
+                        <attributelist id="6967" addr="0x7fca469c1a50" >
+                            <attribute name="name" value="XBMCAddon::xbmcgui::ControlTextBox" id="6968" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="6969" addr="0x7fca4698efb0" />
+                            <attribute name="symtab" value="0x7fca469c1b90" id="6970" addr="0x7fca469c1b90" />
+                            <attribute name="allows_typedef" value="1" id="6971" addr="0x7fca46934c90" />
+                            <attribute name="typepass_visit" value="1" id="6972" addr="0x7fca46934c90" />
+                            <attribute name="allocate_visit" value="1" id="6973" addr="0x7fca46934c90" />
+                            <attribute name="kind" value="class" id="6974" addr="0x7fca46934c90" />
+                            <attribute name="sym_name" value="ControlTextBox" id="6975" addr="0x7fca46934c90" />
+                            <attribute name="allocate_has_constructor" value="1" id="6976" addr="0x7fca46934c90" />
+                            <attribute name="allocate_public_constructor" value="1" id="6977" addr="0x7fca46934c90" />
+                            <attribute name="allocate_copy_constructor" value="1" id="6978" addr="0x7fca46934c90" />
+                            <attribute name="allocate_default_destructor" value="1" id="6979" addr="0x7fca46934c90" />
+                            <attribute name="privatebaselist" value="0x7fca469c1a30" id="6980" addr="0x7fca469c1a30" />
+                            <attribute name="protectedbaselist" value="0x7fca469c1a10" id="6981" addr="0x7fca469c1a10" />
+                            <baselist id="6982" addr="0x7fca469c19f0" >
+                                <base name="Control" id="6983" addr="0x7fca469c1970" />
                             </baselist >
-                            <attribute name="module" value="xbmcgui" id="6984" addr="0x7f99f1e402f0" />
-                            <attribute name="bases" value="0x7f99f1ddb110" id="6985" addr="0x7f99f1ddb110" />
-                            <attribute name="allbases" value="0x7f99f1ddb3b0" id="6986" addr="0x7f99f1ddb3b0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="6987" addr="0x7f99f1de6c90" />
-                            <typescope id="6988" addr="0x7f99f1ddb090" >
-                                <attributelist id="6989" addr="0x7f99f1ddb090" >
-                                    <attribute name="inherit" value="0x7f99f1ddb190" id="6990" addr="0x7f99f1ddb190" />
-                                    <attribute name="name" value="ControlTextBox" id="6991" addr="0x7f99f1de6c90" />
-                                    <typetab id="6992" addr="0x7f99f1ddb0b0" >
-                                        <attributelist id="6993" addr="0x7f99f1ddb0b0" >
+                            <attribute name="module" value="xbmcgui" id="6984" addr="0x7fca4698e2f0" />
+                            <attribute name="bases" value="0x7fca46929110" id="6985" addr="0x7fca46929110" />
+                            <attribute name="allbases" value="0x7fca469293b0" id="6986" addr="0x7fca469293b0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="6987" addr="0x7fca46934c90" />
+                            <typescope id="6988" addr="0x7fca46929090" >
+                                <attributelist id="6989" addr="0x7fca46929090" >
+                                    <attribute name="inherit" value="0x7fca46929190" id="6990" addr="0x7fca46929190" />
+                                    <attribute name="name" value="ControlTextBox" id="6991" addr="0x7fca46934c90" />
+                                    <typetab id="6992" addr="0x7fca469290b0" >
+                                        <attributelist id="6993" addr="0x7fca469290b0" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f99f1dd2150" id="6994" addr="0x7f99f1dd2150" />
-                                    <attribute name="qname" value="XBMCAddon::xbmcgui::ControlTextBox" id="6995" addr="0x7f99f1de6c90" />
-                                    <attribute name="symtab" value="0x7f99f1e73b90" id="6996" addr="0x7f99f1e73b90" />
+                                    <attribute name="parent" value="0x7fca46920150" id="6994" addr="0x7fca46920150" />
+                                    <attribute name="qname" value="XBMCAddon::xbmcgui::ControlTextBox" id="6995" addr="0x7fca46934c90" />
+                                    <attribute name="symtab" value="0x7fca469c1b90" id="6996" addr="0x7fca469c1b90" />
                                 </attributelist >
-                                <typescopesitem id="6997" addr="0x7f99f1ddb190" >
-                                    <attributelist id="6998" addr="0x7f99f1ddb190" >
+                                <typescopesitem id="6997" addr="0x7fca46929190" >
+                                    <attributelist id="6998" addr="0x7fca46929190" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="6999" addr="0x7f99f1ddb030" >
-                                    <attributelist id="7000" addr="0x7f99f1ddb030" >
+                                <typescopesitem id="6999" addr="0x7fca46929030" >
+                                    <attributelist id="7000" addr="0x7fca46929030" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="7001" addr="0x7f99f1ddb0b0" >
-                                    <attributelist id="7002" addr="0x7f99f1ddb0b0" >
+                                <typescopesitem id="7001" addr="0x7fca469290b0" >
+                                    <attributelist id="7002" addr="0x7fca469290b0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="7003" addr="0x7f99f1dd2150" >
-                                    <attributelist id="7004" addr="0x7f99f1dd2150" >
-                                        <attribute name="name" value="xbmcgui" id="7005" addr="0x7f99f1de6c90" />
-                                        <typetab id="7006" addr="0x7f99f1dd2170" >
-                                            <attributelist id="7007" addr="0x7f99f1dd2170" >
-                                                <attribute name="InterceptorBase" value="InterceptorBase" id="7008" addr="0x7f99f1de6c90" />
-                                                <attribute name="Dialog" value="Dialog" id="7009" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="7010" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="7011" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlTextBox" value="ControlTextBox" id="7012" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="7013" addr="0x7f99f1de6c90" />
-                                                <attribute name="Window" value="Window" id="7014" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="7015" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlList" value="ControlList" id="7016" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="7017" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlImage" value="ControlImage" id="7018" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlButton" value="ControlButton" id="7019" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlGroup" value="ControlGroup" id="7020" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogBusy" value="DialogBusy" id="7021" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="7022" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSpin" value="ControlSpin" id="7023" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlEdit" value="ControlEdit" id="7024" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="7025" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="7026" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlLabel" value="ControlLabel" id="7027" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlProgress" value="ControlProgress" id="7028" addr="0x7f99f1de6c90" />
-                                                <attribute name="Control" value="Control" id="7029" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSlider" value="ControlSlider" id="7030" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgress" value="DialogProgress" id="7031" addr="0x7f99f1de6c90" />
-                                                <attribute name="Action" value="Action" id="7032" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowDialog" value="WindowDialog" id="7033" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXML" value="WindowXML" id="7034" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItem" value="ListItem" id="7035" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="7036" addr="0x7f99f1de6c90" />
+                                <typescopesitem id="7003" addr="0x7fca46920150" >
+                                    <attributelist id="7004" addr="0x7fca46920150" >
+                                        <attribute name="name" value="xbmcgui" id="7005" addr="0x7fca46934c90" />
+                                        <typetab id="7006" addr="0x7fca46920170" >
+                                            <attributelist id="7007" addr="0x7fca46920170" >
+                                                <attribute name="InterceptorBase" value="InterceptorBase" id="7008" addr="0x7fca46934c90" />
+                                                <attribute name="Dialog" value="Dialog" id="7009" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="7010" addr="0x7fca46934c90" />
+                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="7011" addr="0x7fca46934c90" />
+                                                <attribute name="ControlTextBox" value="ControlTextBox" id="7012" addr="0x7fca46934c90" />
+                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="7013" addr="0x7fca46934c90" />
+                                                <attribute name="Window" value="Window" id="7014" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="7015" addr="0x7fca46934c90" />
+                                                <attribute name="ControlList" value="ControlList" id="7016" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="7017" addr="0x7fca46934c90" />
+                                                <attribute name="ControlImage" value="ControlImage" id="7018" addr="0x7fca46934c90" />
+                                                <attribute name="ControlButton" value="ControlButton" id="7019" addr="0x7fca46934c90" />
+                                                <attribute name="ControlGroup" value="ControlGroup" id="7020" addr="0x7fca46934c90" />
+                                                <attribute name="DialogBusy" value="DialogBusy" id="7021" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="7022" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSpin" value="ControlSpin" id="7023" addr="0x7fca46934c90" />
+                                                <attribute name="ControlEdit" value="ControlEdit" id="7024" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="7025" addr="0x7fca46934c90" />
+                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="7026" addr="0x7fca46934c90" />
+                                                <attribute name="ControlLabel" value="ControlLabel" id="7027" addr="0x7fca46934c90" />
+                                                <attribute name="ControlProgress" value="ControlProgress" id="7028" addr="0x7fca46934c90" />
+                                                <attribute name="Control" value="Control" id="7029" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSlider" value="ControlSlider" id="7030" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgress" value="DialogProgress" id="7031" addr="0x7fca46934c90" />
+                                                <attribute name="Action" value="Action" id="7032" addr="0x7fca46934c90" />
+                                                <attribute name="WindowDialog" value="WindowDialog" id="7033" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXML" value="WindowXML" id="7034" addr="0x7fca46934c90" />
+                                                <attribute name="ListItem" value="ListItem" id="7035" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="7036" addr="0x7fca46934c90" />
                                             </attributelist >
-                                            <typetabsitem id="7037" addr="0x7f99f1de1dd0" >
-                                                <attributelist id="7038" addr="0x7f99f1de1dd0" >
+                                            <typetabsitem id="7037" addr="0x7fca4692fdd0" >
+                                                <attributelist id="7038" addr="0x7fca4692fdd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7039" addr="0x7f99f1dde790" >
-                                                <attributelist id="7040" addr="0x7f99f1dde790" >
+                                            <typetabsitem id="7039" addr="0x7fca4692c790" >
+                                                <attributelist id="7040" addr="0x7fca4692c790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7041" addr="0x7f99f1de3f10" >
-                                                <attributelist id="7042" addr="0x7f99f1de3f10" >
+                                            <typetabsitem id="7041" addr="0x7fca46931f10" >
+                                                <attributelist id="7042" addr="0x7fca46931f10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7043" addr="0x7f99f1dd67b0" >
-                                                <attributelist id="7044" addr="0x7f99f1dd67b0" >
+                                            <typetabsitem id="7043" addr="0x7fca469247b0" >
+                                                <attributelist id="7044" addr="0x7fca469247b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7045" addr="0x7f99f1ddafd0" >
-                                                <attributelist id="7046" addr="0x7f99f1ddafd0" >
+                                            <typetabsitem id="7045" addr="0x7fca46928fd0" >
+                                                <attributelist id="7046" addr="0x7fca46928fd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7047" addr="0x7f99f1ddd430" >
-                                                <attributelist id="7048" addr="0x7f99f1ddd430" >
+                                            <typetabsitem id="7047" addr="0x7fca4692b430" >
+                                                <attributelist id="7048" addr="0x7fca4692b430" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7049" addr="0x7f99f1de2130" >
-                                                <attributelist id="7050" addr="0x7f99f1de2130" >
+                                            <typetabsitem id="7049" addr="0x7fca46930130" >
+                                                <attributelist id="7050" addr="0x7fca46930130" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7051" addr="0x7f99f1dd2f50" >
-                                                <attributelist id="7052" addr="0x7f99f1dd2f50" >
+                                            <typetabsitem id="7051" addr="0x7fca46920f50" >
+                                                <attributelist id="7052" addr="0x7fca46920f50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7053" addr="0x7f99f1dd9650" >
-                                                <attributelist id="7054" addr="0x7f99f1dd9650" >
+                                            <typetabsitem id="7053" addr="0x7fca46927650" >
+                                                <attributelist id="7054" addr="0x7fca46927650" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7055" addr="0x7f99f1de3390" >
-                                                <attributelist id="7056" addr="0x7f99f1de3390" >
+                                            <typetabsitem id="7055" addr="0x7fca46931390" >
+                                                <attributelist id="7056" addr="0x7fca46931390" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7057" addr="0x7f99f1ddb7b0" >
-                                                <attributelist id="7058" addr="0x7f99f1ddb7b0" >
+                                            <typetabsitem id="7057" addr="0x7fca469297b0" >
+                                                <attributelist id="7058" addr="0x7fca469297b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7059" addr="0x7f99f1ddc4b0" >
-                                                <attributelist id="7060" addr="0x7f99f1ddc4b0" >
+                                            <typetabsitem id="7059" addr="0x7fca4692a4b0" >
+                                                <attributelist id="7060" addr="0x7fca4692a4b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7061" addr="0x7f99f1ddcf90" >
-                                                <attributelist id="7062" addr="0x7f99f1ddcf90" >
+                                            <typetabsitem id="7061" addr="0x7fca4692af90" >
+                                                <attributelist id="7062" addr="0x7fca4692af90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7063" addr="0x7f99f1de11b0" >
-                                                <attributelist id="7064" addr="0x7f99f1de11b0" >
+                                            <typetabsitem id="7063" addr="0x7fca4692f1b0" >
+                                                <attributelist id="7064" addr="0x7fca4692f1b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7065" addr="0x7f99f1de15b0" >
-                                                <attributelist id="7066" addr="0x7f99f1de15b0" >
+                                            <typetabsitem id="7065" addr="0x7fca4692f5b0" >
+                                                <attributelist id="7066" addr="0x7fca4692f5b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7067" addr="0x7f99f1dd77f0" >
-                                                <attributelist id="7068" addr="0x7f99f1dd77f0" >
+                                            <typetabsitem id="7067" addr="0x7fca469257f0" >
+                                                <attributelist id="7068" addr="0x7fca469257f0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7069" addr="0x7f99f1dd8b30" >
-                                                <attributelist id="7070" addr="0x7f99f1dd8b30" >
+                                            <typetabsitem id="7069" addr="0x7fca46926b30" >
+                                                <attributelist id="7070" addr="0x7fca46926b30" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7071" addr="0x7f99f1dd2c50" >
-                                                <attributelist id="7072" addr="0x7f99f1dd2c50" >
+                                            <typetabsitem id="7071" addr="0x7fca46920c50" >
+                                                <attributelist id="7072" addr="0x7fca46920c50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7073" addr="0x7f99f1dda790" >
-                                                <attributelist id="7074" addr="0x7f99f1dda790" >
+                                            <typetabsitem id="7073" addr="0x7fca46928790" >
+                                                <attributelist id="7074" addr="0x7fca46928790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7075" addr="0x7f99f1dd8030" >
-                                                <attributelist id="7076" addr="0x7f99f1dd8030" >
+                                            <typetabsitem id="7075" addr="0x7fca46926030" >
+                                                <attributelist id="7076" addr="0x7fca46926030" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7077" addr="0x7f99f1ddbe10" >
-                                                <attributelist id="7078" addr="0x7f99f1ddbe10" >
+                                            <typetabsitem id="7077" addr="0x7fca46929e10" >
+                                                <attributelist id="7078" addr="0x7fca46929e10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7079" addr="0x7f99f1dd6b10" >
-                                                <attributelist id="7080" addr="0x7f99f1dd6b10" >
+                                            <typetabsitem id="7079" addr="0x7fca46924b10" >
+                                                <attributelist id="7080" addr="0x7fca46924b10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7081" addr="0x7f99f1dddf90" >
-                                                <attributelist id="7082" addr="0x7f99f1dddf90" >
+                                            <typetabsitem id="7081" addr="0x7fca4692bf90" >
+                                                <attributelist id="7082" addr="0x7fca4692bf90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7083" addr="0x7f99f1de0530" >
-                                                <attributelist id="7084" addr="0x7f99f1de0530" >
+                                            <typetabsitem id="7083" addr="0x7fca4692e530" >
+                                                <attributelist id="7084" addr="0x7fca4692e530" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7085" addr="0x7f99f1de1e50" >
-                                                <attributelist id="7086" addr="0x7f99f1de1e50" >
+                                            <typetabsitem id="7085" addr="0x7fca4692fe50" >
+                                                <attributelist id="7086" addr="0x7fca4692fe50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7087" addr="0x7f99f1de2d90" >
-                                                <attributelist id="7088" addr="0x7f99f1de2d90" >
+                                            <typetabsitem id="7087" addr="0x7fca46930d90" >
+                                                <attributelist id="7088" addr="0x7fca46930d90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7089" addr="0x7f99f1de3410" >
-                                                <attributelist id="7090" addr="0x7f99f1de3410" >
+                                            <typetabsitem id="7089" addr="0x7fca46931410" >
+                                                <attributelist id="7090" addr="0x7fca46931410" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7091" addr="0x7f99f1dd3590" >
-                                                <attributelist id="7092" addr="0x7f99f1dd3590" >
+                                            <typetabsitem id="7091" addr="0x7fca46921590" >
+                                                <attributelist id="7092" addr="0x7fca46921590" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7093" addr="0x7f99f1dd3390" >
-                                                <attributelist id="7094" addr="0x7f99f1dd3390" >
+                                            <typetabsitem id="7093" addr="0x7fca46921390" >
+                                                <attributelist id="7094" addr="0x7fca46921390" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7f99f1dd1d70" id="7095" addr="0x7f99f1dd1d70" />
-                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="7096" addr="0x7f99f1de6c90" />
-                                        <attribute name="symtab" value="0x7f99f1e40fb0" id="7097" addr="0x7f99f1e40fb0" />
+                                        <attribute name="parent" value="0x7fca4691fd70" id="7095" addr="0x7fca4691fd70" />
+                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="7096" addr="0x7fca46934c90" />
+                                        <attribute name="symtab" value="0x7fca4698efb0" id="7097" addr="0x7fca4698efb0" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="7098" addr="0x7f99f1ddb0d0" >
-                                    <attributelist id="7099" addr="0x7f99f1ddb0d0" >
+                                <typescopesitem id="7098" addr="0x7fca469290d0" >
+                                    <attributelist id="7099" addr="0x7fca469290d0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="7100" addr="0x7f99f1e73b90" >
-                                    <attributelist id="7101" addr="0x7f99f1e73b90" >
-                                        <attribute name="inherit" value="0x7f99f1e73bf0" id="7102" addr="0x7f99f1e73bf0" />
-                                        <attribute name="name" value="ControlTextBox" id="7103" addr="0x7f99f1de6c90" />
-                                        <attribute name="csymtab" value="0x7f99f1e73bb0" id="7104" addr="0x7f99f1e73bb0" />
-                                        <attribute name="symtab" value="0x7f99f1e73b70" id="7105" addr="0x7f99f1e73b70" />
+                                <typescopesitem id="7100" addr="0x7fca469c1b90" >
+                                    <attributelist id="7101" addr="0x7fca469c1b90" >
+                                        <attribute name="inherit" value="0x7fca469c1bf0" id="7102" addr="0x7fca469c1bf0" />
+                                        <attribute name="name" value="ControlTextBox" id="7103" addr="0x7fca46934c90" />
+                                        <attribute name="csymtab" value="0x7fca469c1bb0" id="7104" addr="0x7fca469c1bb0" />
+                                        <attribute name="symtab" value="0x7fca469c1b70" id="7105" addr="0x7fca469c1b70" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <access id="7106" addr="0x7f99f1e73b10" >
-                            <attributelist id="7107" addr="0x7f99f1e73b10" >
-                                <attribute name="kind" value="public" id="7108" addr="0x7f99f1de6c90" />
+                        <access id="7106" addr="0x7fca469c1b10" >
+                            <attributelist id="7107" addr="0x7fca469c1b10" >
+                                <attribute name="kind" value="public" id="7108" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="7109" addr="0x7f99f1e744b0" >
-                            <attributelist id="7110" addr="0x7f99f1e744b0" >
-                                <attribute name="name" value="ControlTextBox" id="7111" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="7112" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e73b90" id="7113" addr="0x7f99f1e73b90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e74850" id="7114" addr="0x7f99f1e74850" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e74850" id="7115" addr="0x7f99f1e74850" />
-                                <attribute name="sym_name" value="ControlTextBox" id="7116" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char)." id="7117" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="7118" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e744b0" id="7119" addr="0x7f99f1e744b0" />
-                                <parmlist id="7120" addr="0x7f99f1e73d50" >
+                        <constructor id="7109" addr="0x7fca469c24b0" >
+                            <attributelist id="7110" addr="0x7fca469c24b0" >
+                                <attribute name="name" value="ControlTextBox" id="7111" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="7112" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c1b90" id="7113" addr="0x7fca469c1b90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469c2850" id="7114" addr="0x7fca469c2850" />
+                                <attribute name="csym_nextSibling" value="0x7fca469c2850" id="7115" addr="0x7fca469c2850" />
+                                <attribute name="sym_name" value="ControlTextBox" id="7116" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char)." id="7117" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="7118" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469c24b0" id="7119" addr="0x7fca469c24b0" />
+                                <parmlist id="7120" addr="0x7fca469c1d50" >
                                     <parm id="7121">
-                                        <attributelist id="7122" addr="0x7f99f1e73d50" >
-                                            <attribute name="name" value="x" id="7123" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7124" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7122" addr="0x7fca469c1d50" >
+                                            <attribute name="name" value="x" id="7123" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7124" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7125">
-                                        <attributelist id="7126" addr="0x7f99f1e73e70" >
-                                            <attribute name="name" value="y" id="7127" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7128" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7126" addr="0x7fca469c1e70" >
+                                            <attribute name="name" value="y" id="7127" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7128" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7129">
-                                        <attributelist id="7130" addr="0x7f99f1e73f90" >
-                                            <attribute name="name" value="width" id="7131" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7132" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7130" addr="0x7fca469c1f90" >
+                                            <attribute name="name" value="width" id="7131" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7132" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7133">
-                                        <attributelist id="7134" addr="0x7f99f1e740b0" >
-                                            <attribute name="name" value="height" id="7135" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7136" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7134" addr="0x7fca469c20b0" >
+                                            <attribute name="name" value="height" id="7135" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7136" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7137">
-                                        <attributelist id="7138" addr="0x7f99f1e74250" >
-                                            <attribute name="name" value="font" id="7139" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="7140" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="7141" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7138" addr="0x7fca469c2250" >
+                                            <attribute name="name" value="font" id="7139" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="7140" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="7141" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7142">
-                                        <attributelist id="7143" addr="0x7f99f1e743f0" >
-                                            <attribute name="name" value="textColor" id="7144" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="7145" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="7146" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7143" addr="0x7fca469c23f0" >
+                                            <attribute name="name" value="textColor" id="7144" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="7145" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="7146" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_0" id="7147" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="7148" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="7147" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="7148" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="7149" addr="0x7f99f1e74850" >
-                            <attributelist id="7150" addr="0x7f99f1e74850" >
-                                <attribute name="name" value="ControlTextBox" id="7151" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="7152" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e73b90" id="7153" addr="0x7f99f1e73b90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e74b50" id="7154" addr="0x7f99f1e74b50" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e744b0" id="7155" addr="0x7f99f1e744b0" />
-                                <attribute name="sym_name" value="ControlTextBox" id="7156" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e74b50" id="7157" addr="0x7f99f1e74b50" />
-                                <attribute name="defaultargs" value="0x7f99f1e744b0" id="7158" addr="0x7f99f1e744b0" />
-                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char)." id="7159" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="7160" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e744b0" id="7161" addr="0x7f99f1e744b0" />
-                                <parmlist id="7162" addr="0x7f99f1e74550" >
+                        <constructor id="7149" addr="0x7fca469c2850" >
+                            <attributelist id="7150" addr="0x7fca469c2850" >
+                                <attribute name="name" value="ControlTextBox" id="7151" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="7152" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c1b90" id="7153" addr="0x7fca469c1b90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469c2b50" id="7154" addr="0x7fca469c2b50" />
+                                <attribute name="sym_previousSibling" value="0x7fca469c24b0" id="7155" addr="0x7fca469c24b0" />
+                                <attribute name="sym_name" value="ControlTextBox" id="7156" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469c2b50" id="7157" addr="0x7fca469c2b50" />
+                                <attribute name="defaultargs" value="0x7fca469c24b0" id="7158" addr="0x7fca469c24b0" />
+                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char)." id="7159" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="7160" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469c24b0" id="7161" addr="0x7fca469c24b0" />
+                                <parmlist id="7162" addr="0x7fca469c2550" >
                                     <parm id="7163">
-                                        <attributelist id="7164" addr="0x7f99f1e74550" >
-                                            <attribute name="name" value="x" id="7165" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7166" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7164" addr="0x7fca469c2550" >
+                                            <attribute name="name" value="x" id="7165" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7166" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7167">
-                                        <attributelist id="7168" addr="0x7f99f1e74610" >
-                                            <attribute name="name" value="y" id="7169" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7170" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7168" addr="0x7fca469c2610" >
+                                            <attribute name="name" value="y" id="7169" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7170" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7171">
-                                        <attributelist id="7172" addr="0x7f99f1e74690" >
-                                            <attribute name="name" value="width" id="7173" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7174" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7172" addr="0x7fca469c2690" >
+                                            <attribute name="name" value="width" id="7173" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7174" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7175">
-                                        <attributelist id="7176" addr="0x7f99f1e74710" >
-                                            <attribute name="name" value="height" id="7177" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7178" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7176" addr="0x7fca469c2710" >
+                                            <attribute name="name" value="height" id="7177" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7178" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7179">
-                                        <attributelist id="7180" addr="0x7f99f1e74790" >
-                                            <attribute name="name" value="font" id="7181" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="7182" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="7183" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7180" addr="0x7fca469c2790" >
+                                            <attribute name="name" value="font" id="7181" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="7182" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="7183" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_1" id="7184" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="7185" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="7184" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="7185" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="7186" addr="0x7f99f1e74b50" >
-                            <attributelist id="7187" addr="0x7f99f1e74b50" >
-                                <attribute name="name" value="ControlTextBox" id="7188" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="7189" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e73b90" id="7190" addr="0x7f99f1e73b90" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e74850" id="7191" addr="0x7f99f1e74850" />
-                                <attribute name="sym_name" value="ControlTextBox" id="7192" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e744b0" id="7193" addr="0x7f99f1e744b0" />
-                                <attribute name="decl" value="f(long,long,long,long)." id="7194" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="7195" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e744b0" id="7196" addr="0x7f99f1e744b0" />
-                                <parmlist id="7197" addr="0x7f99f1e748f0" >
+                        <constructor id="7186" addr="0x7fca469c2b50" >
+                            <attributelist id="7187" addr="0x7fca469c2b50" >
+                                <attribute name="name" value="ControlTextBox" id="7188" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="7189" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c1b90" id="7190" addr="0x7fca469c1b90" />
+                                <attribute name="sym_previousSibling" value="0x7fca469c2850" id="7191" addr="0x7fca469c2850" />
+                                <attribute name="sym_name" value="ControlTextBox" id="7192" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469c24b0" id="7193" addr="0x7fca469c24b0" />
+                                <attribute name="decl" value="f(long,long,long,long)." id="7194" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="7195" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469c24b0" id="7196" addr="0x7fca469c24b0" />
+                                <parmlist id="7197" addr="0x7fca469c28f0" >
                                     <parm id="7198">
-                                        <attributelist id="7199" addr="0x7f99f1e748f0" >
-                                            <attribute name="name" value="x" id="7200" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7201" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7199" addr="0x7fca469c28f0" >
+                                            <attribute name="name" value="x" id="7200" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7201" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7202">
-                                        <attributelist id="7203" addr="0x7f99f1e749b0" >
-                                            <attribute name="name" value="y" id="7204" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7205" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7203" addr="0x7fca469c29b0" >
+                                            <attribute name="name" value="y" id="7204" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7205" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7206">
-                                        <attributelist id="7207" addr="0x7f99f1e74a30" >
-                                            <attribute name="name" value="width" id="7208" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7209" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7207" addr="0x7fca469c2a30" >
+                                            <attribute name="name" value="width" id="7208" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7209" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7210">
-                                        <attributelist id="7211" addr="0x7f99f1e74ab0" >
-                                            <attribute name="name" value="height" id="7212" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7213" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7211" addr="0x7fca469c2ab0" >
+                                            <attribute name="name" value="height" id="7212" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7213" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_2" id="7214" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="7215" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_2" id="7214" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="7215" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <cdecl id="7216" addr="0x7f99f1e74e30" >
-                            <attributelist id="7217" addr="0x7f99f1e74e30" >
-                                <attribute name="name" value="setText" id="7218" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="7219" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e73b90" id="7220" addr="0x7f99f1e73b90" />
-                                <attribute name="kind" value="function" id="7221" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setText" id="7222" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="7223" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="7224" addr="0x7f99f1de6c90" />
-                                <parmlist id="7225" addr="0x7f99f1e74d70" >
+                        <cdecl id="7216" addr="0x7fca469c2e30" >
+                            <attributelist id="7217" addr="0x7fca469c2e30" >
+                                <attribute name="name" value="setText" id="7218" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="7219" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c1b90" id="7220" addr="0x7fca469c1b90" />
+                                <attribute name="kind" value="function" id="7221" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setText" id="7222" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="7223" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="7224" addr="0x7fca46934c90" />
+                                <parmlist id="7225" addr="0x7fca469c2d70" >
                                     <parm id="7226">
-                                        <attributelist id="7227" addr="0x7f99f1e74d70" >
-                                            <attribute name="name" value="text" id="7228" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="7229" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                    </parm >
-                                </parmlist >
-                                <attribute name="type" value="void" id="7230" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="7231" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="7232" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="7233" addr="0x7f99f1e75030" >
-                            <attributelist id="7234" addr="0x7f99f1e75030" >
-                                <attribute name="name" value="getText" id="7235" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="7236" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e73b90" id="7237" addr="0x7f99f1e73b90" />
-                                <attribute name="kind" value="function" id="7238" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getText" id="7239" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="7240" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="7241" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="XBMCAddon::String" id="7242" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="7243" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="7244" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="7245" addr="0x7f99f1e75210" >
-                            <attributelist id="7246" addr="0x7f99f1e75210" >
-                                <attribute name="name" value="reset" id="7247" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="7248" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e73b90" id="7249" addr="0x7f99f1e73b90" />
-                                <attribute name="kind" value="function" id="7250" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="reset" id="7251" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="7252" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="7253" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="void" id="7254" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="7255" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="7256" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="7257" addr="0x7f99f1e75510" >
-                            <attributelist id="7258" addr="0x7f99f1e75510" >
-                                <attribute name="name" value="scroll" id="7259" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="7260" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e73b90" id="7261" addr="0x7f99f1e73b90" />
-                                <attribute name="kind" value="function" id="7262" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="scroll" id="7263" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(long)." id="7264" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="7265" addr="0x7f99f1de6c90" />
-                                <parmlist id="7266" addr="0x7f99f1e75450" >
+                                        <attributelist id="7227" addr="0x7fca469c2d70" >
+                                            <attribute name="name" value="text" id="7228" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="7229" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                    </parm >
+                                </parmlist >
+                                <attribute name="type" value="void" id="7230" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="7231" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="7232" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="7233" addr="0x7fca469c3030" >
+                            <attributelist id="7234" addr="0x7fca469c3030" >
+                                <attribute name="name" value="getText" id="7235" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="7236" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c1b90" id="7237" addr="0x7fca469c1b90" />
+                                <attribute name="kind" value="function" id="7238" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getText" id="7239" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="7240" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="7241" addr="0x7fca46934c90" />
+                                <attribute name="type" value="XBMCAddon::String" id="7242" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="7243" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="7244" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="7245" addr="0x7fca469c3210" >
+                            <attributelist id="7246" addr="0x7fca469c3210" >
+                                <attribute name="name" value="reset" id="7247" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="7248" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c1b90" id="7249" addr="0x7fca469c1b90" />
+                                <attribute name="kind" value="function" id="7250" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="reset" id="7251" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="7252" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="7253" addr="0x7fca46934c90" />
+                                <attribute name="type" value="void" id="7254" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="7255" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="7256" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="7257" addr="0x7fca469c3510" >
+                            <attributelist id="7258" addr="0x7fca469c3510" >
+                                <attribute name="name" value="scroll" id="7259" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="7260" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c1b90" id="7261" addr="0x7fca469c1b90" />
+                                <attribute name="kind" value="function" id="7262" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="scroll" id="7263" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(long)." id="7264" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="7265" addr="0x7fca46934c90" />
+                                <parmlist id="7266" addr="0x7fca469c3450" >
                                     <parm id="7267">
-                                        <attributelist id="7268" addr="0x7f99f1e75450" >
-                                            <attribute name="name" value="id" id="7269" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7270" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7268" addr="0x7fca469c3450" >
+                                            <attribute name="name" value="id" id="7269" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7270" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="7271" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="7272" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="7273" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="7271" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="7272" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="7273" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="7274" addr="0x7f99f1e75a50" >
-                            <attributelist id="7275" addr="0x7f99f1e75a50" >
-                                <attribute name="name" value="autoScroll" id="7276" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="7277" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e73b90" id="7278" addr="0x7f99f1e73b90" />
-                                <attribute name="kind" value="function" id="7279" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="autoScroll" id="7280" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(int,int,int)." id="7281" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="7282" addr="0x7f99f1de6c90" />
-                                <parmlist id="7283" addr="0x7f99f1e75750" >
+                        <cdecl id="7274" addr="0x7fca469c3a50" >
+                            <attributelist id="7275" addr="0x7fca469c3a50" >
+                                <attribute name="name" value="autoScroll" id="7276" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="7277" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c1b90" id="7278" addr="0x7fca469c1b90" />
+                                <attribute name="kind" value="function" id="7279" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="autoScroll" id="7280" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(int,int,int)." id="7281" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="7282" addr="0x7fca46934c90" />
+                                <parmlist id="7283" addr="0x7fca469c3750" >
                                     <parm id="7284">
-                                        <attributelist id="7285" addr="0x7f99f1e75750" >
-                                            <attribute name="name" value="delay" id="7286" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="7287" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7285" addr="0x7fca469c3750" >
+                                            <attribute name="name" value="delay" id="7286" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="7287" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7288">
-                                        <attributelist id="7289" addr="0x7f99f1e75870" >
-                                            <attribute name="name" value="time" id="7290" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="7291" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7289" addr="0x7fca469c3870" >
+                                            <attribute name="name" value="time" id="7290" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="7291" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7292">
-                                        <attributelist id="7293" addr="0x7f99f1e75990" >
-                                            <attribute name="name" value="repeat" id="7294" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="7295" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7293" addr="0x7fca469c3990" >
+                                            <attribute name="name" value="repeat" id="7294" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="7295" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="7296" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="7297" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="7298" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="7296" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="7297" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="7298" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
                     </class >
-                    <class id="7299" addr="0x7f99f1e75d30" >
-                        <attributelist id="7300" addr="0x7f99f1e75d30" >
-                            <attribute name="name" value="XBMCAddon::xbmcgui::ControlImage" id="7301" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="7302" addr="0x7f99f1e40fb0" />
-                            <attribute name="symtab" value="0x7f99f1e75e70" id="7303" addr="0x7f99f1e75e70" />
-                            <attribute name="allows_typedef" value="1" id="7304" addr="0x7f99f1de6c90" />
-                            <attribute name="typepass_visit" value="1" id="7305" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_visit" value="1" id="7306" addr="0x7f99f1de6c90" />
-                            <attribute name="kind" value="class" id="7307" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_name" value="ControlImage" id="7308" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_has_constructor" value="1" id="7309" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_public_constructor" value="1" id="7310" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_copy_constructor" value="1" id="7311" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_default_destructor" value="1" id="7312" addr="0x7f99f1de6c90" />
-                            <attribute name="privatebaselist" value="0x7f99f1e75d10" id="7313" addr="0x7f99f1e75d10" />
-                            <attribute name="protectedbaselist" value="0x7f99f1e75cf0" id="7314" addr="0x7f99f1e75cf0" />
-                            <baselist id="7315" addr="0x7f99f1e75cd0" >
-                                <base name="Control" id="7316" addr="0x7f99f1e75c50" />
+                    <class id="7299" addr="0x7fca469c3d30" >
+                        <attributelist id="7300" addr="0x7fca469c3d30" >
+                            <attribute name="name" value="XBMCAddon::xbmcgui::ControlImage" id="7301" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="7302" addr="0x7fca4698efb0" />
+                            <attribute name="symtab" value="0x7fca469c3e70" id="7303" addr="0x7fca469c3e70" />
+                            <attribute name="allows_typedef" value="1" id="7304" addr="0x7fca46934c90" />
+                            <attribute name="typepass_visit" value="1" id="7305" addr="0x7fca46934c90" />
+                            <attribute name="allocate_visit" value="1" id="7306" addr="0x7fca46934c90" />
+                            <attribute name="kind" value="class" id="7307" addr="0x7fca46934c90" />
+                            <attribute name="sym_name" value="ControlImage" id="7308" addr="0x7fca46934c90" />
+                            <attribute name="allocate_has_constructor" value="1" id="7309" addr="0x7fca46934c90" />
+                            <attribute name="allocate_public_constructor" value="1" id="7310" addr="0x7fca46934c90" />
+                            <attribute name="allocate_copy_constructor" value="1" id="7311" addr="0x7fca46934c90" />
+                            <attribute name="allocate_default_destructor" value="1" id="7312" addr="0x7fca46934c90" />
+                            <attribute name="privatebaselist" value="0x7fca469c3d10" id="7313" addr="0x7fca469c3d10" />
+                            <attribute name="protectedbaselist" value="0x7fca469c3cf0" id="7314" addr="0x7fca469c3cf0" />
+                            <baselist id="7315" addr="0x7fca469c3cd0" >
+                                <base name="Control" id="7316" addr="0x7fca469c3c50" />
                             </baselist >
-                            <attribute name="module" value="xbmcgui" id="7317" addr="0x7f99f1e402f0" />
-                            <attribute name="bases" value="0x7f99f1ddb930" id="7318" addr="0x7f99f1ddb930" />
-                            <attribute name="allbases" value="0x7f99f1ddbbd0" id="7319" addr="0x7f99f1ddbbd0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="7320" addr="0x7f99f1de6c90" />
-                            <typescope id="7321" addr="0x7f99f1ddb8b0" >
-                                <attributelist id="7322" addr="0x7f99f1ddb8b0" >
-                                    <attribute name="inherit" value="0x7f99f1ddb9b0" id="7323" addr="0x7f99f1ddb9b0" />
-                                    <attribute name="name" value="ControlImage" id="7324" addr="0x7f99f1de6c90" />
-                                    <typetab id="7325" addr="0x7f99f1ddb8d0" >
-                                        <attributelist id="7326" addr="0x7f99f1ddb8d0" >
+                            <attribute name="module" value="xbmcgui" id="7317" addr="0x7fca4698e2f0" />
+                            <attribute name="bases" value="0x7fca46929930" id="7318" addr="0x7fca46929930" />
+                            <attribute name="allbases" value="0x7fca46929bd0" id="7319" addr="0x7fca46929bd0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="7320" addr="0x7fca46934c90" />
+                            <typescope id="7321" addr="0x7fca469298b0" >
+                                <attributelist id="7322" addr="0x7fca469298b0" >
+                                    <attribute name="inherit" value="0x7fca469299b0" id="7323" addr="0x7fca469299b0" />
+                                    <attribute name="name" value="ControlImage" id="7324" addr="0x7fca46934c90" />
+                                    <typetab id="7325" addr="0x7fca469298d0" >
+                                        <attributelist id="7326" addr="0x7fca469298d0" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f99f1dd2150" id="7327" addr="0x7f99f1dd2150" />
-                                    <attribute name="qname" value="XBMCAddon::xbmcgui::ControlImage" id="7328" addr="0x7f99f1de6c90" />
-                                    <attribute name="symtab" value="0x7f99f1e75e70" id="7329" addr="0x7f99f1e75e70" />
+                                    <attribute name="parent" value="0x7fca46920150" id="7327" addr="0x7fca46920150" />
+                                    <attribute name="qname" value="XBMCAddon::xbmcgui::ControlImage" id="7328" addr="0x7fca46934c90" />
+                                    <attribute name="symtab" value="0x7fca469c3e70" id="7329" addr="0x7fca469c3e70" />
                                 </attributelist >
-                                <typescopesitem id="7330" addr="0x7f99f1ddb9b0" >
-                                    <attributelist id="7331" addr="0x7f99f1ddb9b0" >
+                                <typescopesitem id="7330" addr="0x7fca469299b0" >
+                                    <attributelist id="7331" addr="0x7fca469299b0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="7332" addr="0x7f99f1ddb810" >
-                                    <attributelist id="7333" addr="0x7f99f1ddb810" >
+                                <typescopesitem id="7332" addr="0x7fca46929810" >
+                                    <attributelist id="7333" addr="0x7fca46929810" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="7334" addr="0x7f99f1ddb8d0" >
-                                    <attributelist id="7335" addr="0x7f99f1ddb8d0" >
+                                <typescopesitem id="7334" addr="0x7fca469298d0" >
+                                    <attributelist id="7335" addr="0x7fca469298d0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="7336" addr="0x7f99f1dd2150" >
-                                    <attributelist id="7337" addr="0x7f99f1dd2150" >
-                                        <attribute name="name" value="xbmcgui" id="7338" addr="0x7f99f1de6c90" />
-                                        <typetab id="7339" addr="0x7f99f1dd2170" >
-                                            <attributelist id="7340" addr="0x7f99f1dd2170" >
-                                                <attribute name="InterceptorBase" value="InterceptorBase" id="7341" addr="0x7f99f1de6c90" />
-                                                <attribute name="Dialog" value="Dialog" id="7342" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="7343" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="7344" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlTextBox" value="ControlTextBox" id="7345" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="7346" addr="0x7f99f1de6c90" />
-                                                <attribute name="Window" value="Window" id="7347" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="7348" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlList" value="ControlList" id="7349" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="7350" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlImage" value="ControlImage" id="7351" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlButton" value="ControlButton" id="7352" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlGroup" value="ControlGroup" id="7353" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogBusy" value="DialogBusy" id="7354" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="7355" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSpin" value="ControlSpin" id="7356" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlEdit" value="ControlEdit" id="7357" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="7358" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="7359" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlLabel" value="ControlLabel" id="7360" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlProgress" value="ControlProgress" id="7361" addr="0x7f99f1de6c90" />
-                                                <attribute name="Control" value="Control" id="7362" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSlider" value="ControlSlider" id="7363" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgress" value="DialogProgress" id="7364" addr="0x7f99f1de6c90" />
-                                                <attribute name="Action" value="Action" id="7365" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowDialog" value="WindowDialog" id="7366" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXML" value="WindowXML" id="7367" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItem" value="ListItem" id="7368" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="7369" addr="0x7f99f1de6c90" />
+                                <typescopesitem id="7336" addr="0x7fca46920150" >
+                                    <attributelist id="7337" addr="0x7fca46920150" >
+                                        <attribute name="name" value="xbmcgui" id="7338" addr="0x7fca46934c90" />
+                                        <typetab id="7339" addr="0x7fca46920170" >
+                                            <attributelist id="7340" addr="0x7fca46920170" >
+                                                <attribute name="InterceptorBase" value="InterceptorBase" id="7341" addr="0x7fca46934c90" />
+                                                <attribute name="Dialog" value="Dialog" id="7342" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="7343" addr="0x7fca46934c90" />
+                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="7344" addr="0x7fca46934c90" />
+                                                <attribute name="ControlTextBox" value="ControlTextBox" id="7345" addr="0x7fca46934c90" />
+                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="7346" addr="0x7fca46934c90" />
+                                                <attribute name="Window" value="Window" id="7347" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="7348" addr="0x7fca46934c90" />
+                                                <attribute name="ControlList" value="ControlList" id="7349" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="7350" addr="0x7fca46934c90" />
+                                                <attribute name="ControlImage" value="ControlImage" id="7351" addr="0x7fca46934c90" />
+                                                <attribute name="ControlButton" value="ControlButton" id="7352" addr="0x7fca46934c90" />
+                                                <attribute name="ControlGroup" value="ControlGroup" id="7353" addr="0x7fca46934c90" />
+                                                <attribute name="DialogBusy" value="DialogBusy" id="7354" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="7355" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSpin" value="ControlSpin" id="7356" addr="0x7fca46934c90" />
+                                                <attribute name="ControlEdit" value="ControlEdit" id="7357" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="7358" addr="0x7fca46934c90" />
+                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="7359" addr="0x7fca46934c90" />
+                                                <attribute name="ControlLabel" value="ControlLabel" id="7360" addr="0x7fca46934c90" />
+                                                <attribute name="ControlProgress" value="ControlProgress" id="7361" addr="0x7fca46934c90" />
+                                                <attribute name="Control" value="Control" id="7362" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSlider" value="ControlSlider" id="7363" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgress" value="DialogProgress" id="7364" addr="0x7fca46934c90" />
+                                                <attribute name="Action" value="Action" id="7365" addr="0x7fca46934c90" />
+                                                <attribute name="WindowDialog" value="WindowDialog" id="7366" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXML" value="WindowXML" id="7367" addr="0x7fca46934c90" />
+                                                <attribute name="ListItem" value="ListItem" id="7368" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="7369" addr="0x7fca46934c90" />
                                             </attributelist >
-                                            <typetabsitem id="7370" addr="0x7f99f1de1dd0" >
-                                                <attributelist id="7371" addr="0x7f99f1de1dd0" >
+                                            <typetabsitem id="7370" addr="0x7fca4692fdd0" >
+                                                <attributelist id="7371" addr="0x7fca4692fdd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7372" addr="0x7f99f1dde790" >
-                                                <attributelist id="7373" addr="0x7f99f1dde790" >
+                                            <typetabsitem id="7372" addr="0x7fca4692c790" >
+                                                <attributelist id="7373" addr="0x7fca4692c790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7374" addr="0x7f99f1de3f10" >
-                                                <attributelist id="7375" addr="0x7f99f1de3f10" >
+                                            <typetabsitem id="7374" addr="0x7fca46931f10" >
+                                                <attributelist id="7375" addr="0x7fca46931f10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7376" addr="0x7f99f1dd67b0" >
-                                                <attributelist id="7377" addr="0x7f99f1dd67b0" >
+                                            <typetabsitem id="7376" addr="0x7fca469247b0" >
+                                                <attributelist id="7377" addr="0x7fca469247b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7378" addr="0x7f99f1ddafd0" >
-                                                <attributelist id="7379" addr="0x7f99f1ddafd0" >
+                                            <typetabsitem id="7378" addr="0x7fca46928fd0" >
+                                                <attributelist id="7379" addr="0x7fca46928fd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7380" addr="0x7f99f1ddd430" >
-                                                <attributelist id="7381" addr="0x7f99f1ddd430" >
+                                            <typetabsitem id="7380" addr="0x7fca4692b430" >
+                                                <attributelist id="7381" addr="0x7fca4692b430" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7382" addr="0x7f99f1de2130" >
-                                                <attributelist id="7383" addr="0x7f99f1de2130" >
+                                            <typetabsitem id="7382" addr="0x7fca46930130" >
+                                                <attributelist id="7383" addr="0x7fca46930130" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7384" addr="0x7f99f1dd2f50" >
-                                                <attributelist id="7385" addr="0x7f99f1dd2f50" >
+                                            <typetabsitem id="7384" addr="0x7fca46920f50" >
+                                                <attributelist id="7385" addr="0x7fca46920f50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7386" addr="0x7f99f1dd9650" >
-                                                <attributelist id="7387" addr="0x7f99f1dd9650" >
+                                            <typetabsitem id="7386" addr="0x7fca46927650" >
+                                                <attributelist id="7387" addr="0x7fca46927650" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7388" addr="0x7f99f1de3390" >
-                                                <attributelist id="7389" addr="0x7f99f1de3390" >
+                                            <typetabsitem id="7388" addr="0x7fca46931390" >
+                                                <attributelist id="7389" addr="0x7fca46931390" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7390" addr="0x7f99f1ddb7b0" >
-                                                <attributelist id="7391" addr="0x7f99f1ddb7b0" >
+                                            <typetabsitem id="7390" addr="0x7fca469297b0" >
+                                                <attributelist id="7391" addr="0x7fca469297b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7392" addr="0x7f99f1ddc4b0" >
-                                                <attributelist id="7393" addr="0x7f99f1ddc4b0" >
+                                            <typetabsitem id="7392" addr="0x7fca4692a4b0" >
+                                                <attributelist id="7393" addr="0x7fca4692a4b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7394" addr="0x7f99f1ddcf90" >
-                                                <attributelist id="7395" addr="0x7f99f1ddcf90" >
+                                            <typetabsitem id="7394" addr="0x7fca4692af90" >
+                                                <attributelist id="7395" addr="0x7fca4692af90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7396" addr="0x7f99f1de11b0" >
-                                                <attributelist id="7397" addr="0x7f99f1de11b0" >
+                                            <typetabsitem id="7396" addr="0x7fca4692f1b0" >
+                                                <attributelist id="7397" addr="0x7fca4692f1b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7398" addr="0x7f99f1de15b0" >
-                                                <attributelist id="7399" addr="0x7f99f1de15b0" >
+                                            <typetabsitem id="7398" addr="0x7fca4692f5b0" >
+                                                <attributelist id="7399" addr="0x7fca4692f5b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7400" addr="0x7f99f1dd77f0" >
-                                                <attributelist id="7401" addr="0x7f99f1dd77f0" >
+                                            <typetabsitem id="7400" addr="0x7fca469257f0" >
+                                                <attributelist id="7401" addr="0x7fca469257f0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7402" addr="0x7f99f1dd8b30" >
-                                                <attributelist id="7403" addr="0x7f99f1dd8b30" >
+                                            <typetabsitem id="7402" addr="0x7fca46926b30" >
+                                                <attributelist id="7403" addr="0x7fca46926b30" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7404" addr="0x7f99f1dd2c50" >
-                                                <attributelist id="7405" addr="0x7f99f1dd2c50" >
+                                            <typetabsitem id="7404" addr="0x7fca46920c50" >
+                                                <attributelist id="7405" addr="0x7fca46920c50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7406" addr="0x7f99f1dda790" >
-                                                <attributelist id="7407" addr="0x7f99f1dda790" >
+                                            <typetabsitem id="7406" addr="0x7fca46928790" >
+                                                <attributelist id="7407" addr="0x7fca46928790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7408" addr="0x7f99f1dd8030" >
-                                                <attributelist id="7409" addr="0x7f99f1dd8030" >
+                                            <typetabsitem id="7408" addr="0x7fca46926030" >
+                                                <attributelist id="7409" addr="0x7fca46926030" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7410" addr="0x7f99f1ddbe10" >
-                                                <attributelist id="7411" addr="0x7f99f1ddbe10" >
+                                            <typetabsitem id="7410" addr="0x7fca46929e10" >
+                                                <attributelist id="7411" addr="0x7fca46929e10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7412" addr="0x7f99f1dd6b10" >
-                                                <attributelist id="7413" addr="0x7f99f1dd6b10" >
+                                            <typetabsitem id="7412" addr="0x7fca46924b10" >
+                                                <attributelist id="7413" addr="0x7fca46924b10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7414" addr="0x7f99f1dddf90" >
-                                                <attributelist id="7415" addr="0x7f99f1dddf90" >
+                                            <typetabsitem id="7414" addr="0x7fca4692bf90" >
+                                                <attributelist id="7415" addr="0x7fca4692bf90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7416" addr="0x7f99f1de0530" >
-                                                <attributelist id="7417" addr="0x7f99f1de0530" >
+                                            <typetabsitem id="7416" addr="0x7fca4692e530" >
+                                                <attributelist id="7417" addr="0x7fca4692e530" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7418" addr="0x7f99f1de1e50" >
-                                                <attributelist id="7419" addr="0x7f99f1de1e50" >
+                                            <typetabsitem id="7418" addr="0x7fca4692fe50" >
+                                                <attributelist id="7419" addr="0x7fca4692fe50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7420" addr="0x7f99f1de2d90" >
-                                                <attributelist id="7421" addr="0x7f99f1de2d90" >
+                                            <typetabsitem id="7420" addr="0x7fca46930d90" >
+                                                <attributelist id="7421" addr="0x7fca46930d90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7422" addr="0x7f99f1de3410" >
-                                                <attributelist id="7423" addr="0x7f99f1de3410" >
+                                            <typetabsitem id="7422" addr="0x7fca46931410" >
+                                                <attributelist id="7423" addr="0x7fca46931410" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7424" addr="0x7f99f1dd3590" >
-                                                <attributelist id="7425" addr="0x7f99f1dd3590" >
+                                            <typetabsitem id="7424" addr="0x7fca46921590" >
+                                                <attributelist id="7425" addr="0x7fca46921590" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7426" addr="0x7f99f1dd3390" >
-                                                <attributelist id="7427" addr="0x7f99f1dd3390" >
+                                            <typetabsitem id="7426" addr="0x7fca46921390" >
+                                                <attributelist id="7427" addr="0x7fca46921390" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7f99f1dd1d70" id="7428" addr="0x7f99f1dd1d70" />
-                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="7429" addr="0x7f99f1de6c90" />
-                                        <attribute name="symtab" value="0x7f99f1e40fb0" id="7430" addr="0x7f99f1e40fb0" />
+                                        <attribute name="parent" value="0x7fca4691fd70" id="7428" addr="0x7fca4691fd70" />
+                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="7429" addr="0x7fca46934c90" />
+                                        <attribute name="symtab" value="0x7fca4698efb0" id="7430" addr="0x7fca4698efb0" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="7431" addr="0x7f99f1ddb8f0" >
-                                    <attributelist id="7432" addr="0x7f99f1ddb8f0" >
+                                <typescopesitem id="7431" addr="0x7fca469298f0" >
+                                    <attributelist id="7432" addr="0x7fca469298f0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="7433" addr="0x7f99f1e75e70" >
-                                    <attributelist id="7434" addr="0x7f99f1e75e70" >
-                                        <attribute name="inherit" value="0x7f99f1e75ed0" id="7435" addr="0x7f99f1e75ed0" />
-                                        <attribute name="name" value="ControlImage" id="7436" addr="0x7f99f1de6c90" />
-                                        <attribute name="csymtab" value="0x7f99f1e75e90" id="7437" addr="0x7f99f1e75e90" />
-                                        <attribute name="symtab" value="0x7f99f1e75e50" id="7438" addr="0x7f99f1e75e50" />
+                                <typescopesitem id="7433" addr="0x7fca469c3e70" >
+                                    <attributelist id="7434" addr="0x7fca469c3e70" >
+                                        <attribute name="inherit" value="0x7fca469c3ed0" id="7435" addr="0x7fca469c3ed0" />
+                                        <attribute name="name" value="ControlImage" id="7436" addr="0x7fca46934c90" />
+                                        <attribute name="csymtab" value="0x7fca469c3e90" id="7437" addr="0x7fca469c3e90" />
+                                        <attribute name="symtab" value="0x7fca469c3e50" id="7438" addr="0x7fca469c3e50" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <access id="7439" addr="0x7f99f1e75df0" >
-                            <attributelist id="7440" addr="0x7f99f1e75df0" >
-                                <attribute name="kind" value="public" id="7441" addr="0x7f99f1de6c90" />
+                        <access id="7439" addr="0x7fca469c3df0" >
+                            <attributelist id="7440" addr="0x7fca469c3df0" >
+                                <attribute name="kind" value="public" id="7441" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="7442" addr="0x7f99f1e76890" >
-                            <attributelist id="7443" addr="0x7f99f1e76890" >
-                                <attribute name="name" value="ControlImage" id="7444" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="7445" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e75e70" id="7446" addr="0x7f99f1e75e70" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e76cb0" id="7447" addr="0x7f99f1e76cb0" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e76cb0" id="7448" addr="0x7f99f1e76cb0" />
-                                <attribute name="sym_name" value="ControlImage" id="7449" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,long,p.q(const).char)." id="7450" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="7451" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e76890" id="7452" addr="0x7f99f1e76890" />
-                                <parmlist id="7453" addr="0x7f99f1e76030" >
+                        <constructor id="7442" addr="0x7fca469c4890" >
+                            <attributelist id="7443" addr="0x7fca469c4890" >
+                                <attribute name="name" value="ControlImage" id="7444" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="7445" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c3e70" id="7446" addr="0x7fca469c3e70" />
+                                <attribute name="sym_nextSibling" value="0x7fca469c4cb0" id="7447" addr="0x7fca469c4cb0" />
+                                <attribute name="csym_nextSibling" value="0x7fca469c4cb0" id="7448" addr="0x7fca469c4cb0" />
+                                <attribute name="sym_name" value="ControlImage" id="7449" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,long,p.q(const).char)." id="7450" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="7451" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469c4890" id="7452" addr="0x7fca469c4890" />
+                                <parmlist id="7453" addr="0x7fca469c4030" >
                                     <parm id="7454">
-                                        <attributelist id="7455" addr="0x7f99f1e76030" >
-                                            <attribute name="name" value="x" id="7456" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7457" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7455" addr="0x7fca469c4030" >
+                                            <attribute name="name" value="x" id="7456" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7457" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7458">
-                                        <attributelist id="7459" addr="0x7f99f1e76150" >
-                                            <attribute name="name" value="y" id="7460" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7461" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7459" addr="0x7fca469c4150" >
+                                            <attribute name="name" value="y" id="7460" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7461" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7462">
-                                        <attributelist id="7463" addr="0x7f99f1e76270" >
-                                            <attribute name="name" value="width" id="7464" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7465" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7463" addr="0x7fca469c4270" >
+                                            <attribute name="name" value="width" id="7464" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7465" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7466">
-                                        <attributelist id="7467" addr="0x7f99f1e76390" >
-                                            <attribute name="name" value="height" id="7468" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7469" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7467" addr="0x7fca469c4390" >
+                                            <attribute name="name" value="height" id="7468" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7469" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7470">
-                                        <attributelist id="7471" addr="0x7f99f1e764d0" >
-                                            <attribute name="name" value="filename" id="7472" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="7473" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7471" addr="0x7fca469c44d0" >
+                                            <attribute name="name" value="filename" id="7472" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="7473" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7474">
-                                        <attributelist id="7475" addr="0x7f99f1e76630" >
-                                            <attribute name="name" value="aspectRatio" id="7476" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="0" id="7477" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7478" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7475" addr="0x7fca469c4630" >
+                                            <attribute name="name" value="aspectRatio" id="7476" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="0" id="7477" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7478" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7479">
-                                        <attributelist id="7480" addr="0x7f99f1e767d0" >
-                                            <attribute name="name" value="colorDiffuse" id="7481" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="7482" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="7483" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7480" addr="0x7fca469c47d0" >
+                                            <attribute name="name" value="colorDiffuse" id="7481" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="7482" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="7483" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_0" id="7484" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="7485" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="7484" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="7485" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="7486" addr="0x7f99f1e76cb0" >
-                            <attributelist id="7487" addr="0x7f99f1e76cb0" >
-                                <attribute name="name" value="ControlImage" id="7488" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="7489" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e75e70" id="7490" addr="0x7f99f1e75e70" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e77030" id="7491" addr="0x7f99f1e77030" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e76890" id="7492" addr="0x7f99f1e76890" />
-                                <attribute name="sym_name" value="ControlImage" id="7493" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e77030" id="7494" addr="0x7f99f1e77030" />
-                                <attribute name="defaultargs" value="0x7f99f1e76890" id="7495" addr="0x7f99f1e76890" />
-                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,long)." id="7496" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="7497" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e76890" id="7498" addr="0x7f99f1e76890" />
-                                <parmlist id="7499" addr="0x7f99f1e76930" >
+                        <constructor id="7486" addr="0x7fca469c4cb0" >
+                            <attributelist id="7487" addr="0x7fca469c4cb0" >
+                                <attribute name="name" value="ControlImage" id="7488" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="7489" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c3e70" id="7490" addr="0x7fca469c3e70" />
+                                <attribute name="csym_nextSibling" value="0x7fca469c5030" id="7491" addr="0x7fca469c5030" />
+                                <attribute name="sym_previousSibling" value="0x7fca469c4890" id="7492" addr="0x7fca469c4890" />
+                                <attribute name="sym_name" value="ControlImage" id="7493" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469c5030" id="7494" addr="0x7fca469c5030" />
+                                <attribute name="defaultargs" value="0x7fca469c4890" id="7495" addr="0x7fca469c4890" />
+                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,long)." id="7496" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="7497" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469c4890" id="7498" addr="0x7fca469c4890" />
+                                <parmlist id="7499" addr="0x7fca469c4930" >
                                     <parm id="7500">
-                                        <attributelist id="7501" addr="0x7f99f1e76930" >
-                                            <attribute name="name" value="x" id="7502" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7503" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7501" addr="0x7fca469c4930" >
+                                            <attribute name="name" value="x" id="7502" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7503" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7504">
-                                        <attributelist id="7505" addr="0x7f99f1e769f0" >
-                                            <attribute name="name" value="y" id="7506" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7507" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7505" addr="0x7fca469c49f0" >
+                                            <attribute name="name" value="y" id="7506" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7507" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7508">
-                                        <attributelist id="7509" addr="0x7f99f1e76a70" >
-                                            <attribute name="name" value="width" id="7510" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7511" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7509" addr="0x7fca469c4a70" >
+                                            <attribute name="name" value="width" id="7510" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7511" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7512">
-                                        <attributelist id="7513" addr="0x7f99f1e76af0" >
-                                            <attribute name="name" value="height" id="7514" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7515" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7513" addr="0x7fca469c4af0" >
+                                            <attribute name="name" value="height" id="7514" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7515" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7516">
-                                        <attributelist id="7517" addr="0x7f99f1e76b70" >
-                                            <attribute name="name" value="filename" id="7518" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="7519" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7517" addr="0x7fca469c4b70" >
+                                            <attribute name="name" value="filename" id="7518" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="7519" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7520">
-                                        <attributelist id="7521" addr="0x7f99f1e76bf0" >
-                                            <attribute name="name" value="aspectRatio" id="7522" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="0" id="7523" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7524" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7521" addr="0x7fca469c4bf0" >
+                                            <attribute name="name" value="aspectRatio" id="7522" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="0" id="7523" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7524" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_1" id="7525" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="7526" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="7525" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="7526" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="7527" addr="0x7f99f1e77030" >
-                            <attributelist id="7528" addr="0x7f99f1e77030" >
-                                <attribute name="name" value="ControlImage" id="7529" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="7530" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e75e70" id="7531" addr="0x7f99f1e75e70" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e76cb0" id="7532" addr="0x7f99f1e76cb0" />
-                                <attribute name="sym_name" value="ControlImage" id="7533" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e76890" id="7534" addr="0x7f99f1e76890" />
-                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char)." id="7535" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="7536" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e76890" id="7537" addr="0x7f99f1e76890" />
-                                <parmlist id="7538" addr="0x7f99f1e76d50" >
+                        <constructor id="7527" addr="0x7fca469c5030" >
+                            <attributelist id="7528" addr="0x7fca469c5030" >
+                                <attribute name="name" value="ControlImage" id="7529" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="7530" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c3e70" id="7531" addr="0x7fca469c3e70" />
+                                <attribute name="sym_previousSibling" value="0x7fca469c4cb0" id="7532" addr="0x7fca469c4cb0" />
+                                <attribute name="sym_name" value="ControlImage" id="7533" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469c4890" id="7534" addr="0x7fca469c4890" />
+                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char)." id="7535" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="7536" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469c4890" id="7537" addr="0x7fca469c4890" />
+                                <parmlist id="7538" addr="0x7fca469c4d50" >
                                     <parm id="7539">
-                                        <attributelist id="7540" addr="0x7f99f1e76d50" >
-                                            <attribute name="name" value="x" id="7541" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7542" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7540" addr="0x7fca469c4d50" >
+                                            <attribute name="name" value="x" id="7541" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7542" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7543">
-                                        <attributelist id="7544" addr="0x7f99f1e76e10" >
-                                            <attribute name="name" value="y" id="7545" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7546" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7544" addr="0x7fca469c4e10" >
+                                            <attribute name="name" value="y" id="7545" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7546" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7547">
-                                        <attributelist id="7548" addr="0x7f99f1e76e90" >
-                                            <attribute name="name" value="width" id="7549" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7550" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7548" addr="0x7fca469c4e90" >
+                                            <attribute name="name" value="width" id="7549" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7550" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7551">
-                                        <attributelist id="7552" addr="0x7f99f1e76f10" >
-                                            <attribute name="name" value="height" id="7553" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7554" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7552" addr="0x7fca469c4f10" >
+                                            <attribute name="name" value="height" id="7553" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7554" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7555">
-                                        <attributelist id="7556" addr="0x7f99f1e76f90" >
-                                            <attribute name="name" value="filename" id="7557" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="7558" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7556" addr="0x7fca469c4f90" >
+                                            <attribute name="name" value="filename" id="7557" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="7558" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_2" id="7559" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="7560" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_2" id="7559" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="7560" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <cdecl id="7561" addr="0x7f99f1e77470" >
-                            <attributelist id="7562" addr="0x7f99f1e77470" >
-                                <attribute name="name" value="setImage" id="7563" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="7564" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e75e70" id="7565" addr="0x7f99f1e75e70" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e77630" id="7566" addr="0x7f99f1e77630" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e77630" id="7567" addr="0x7f99f1e77630" />
-                                <attribute name="kind" value="function" id="7568" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setImage" id="7569" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(p.q(const).char,q(const).bool)." id="7570" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="7571" addr="0x7f99f1de6c90" />
-                                <parmlist id="7572" addr="0x7f99f1e77250" >
+                        <cdecl id="7561" addr="0x7fca469c5470" >
+                            <attributelist id="7562" addr="0x7fca469c5470" >
+                                <attribute name="name" value="setImage" id="7563" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="7564" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c3e70" id="7565" addr="0x7fca469c3e70" />
+                                <attribute name="sym_nextSibling" value="0x7fca469c5630" id="7566" addr="0x7fca469c5630" />
+                                <attribute name="csym_nextSibling" value="0x7fca469c5630" id="7567" addr="0x7fca469c5630" />
+                                <attribute name="kind" value="function" id="7568" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setImage" id="7569" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(p.q(const).char,q(const).bool)." id="7570" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="7571" addr="0x7fca46934c90" />
+                                <parmlist id="7572" addr="0x7fca469c5250" >
                                     <parm id="7573">
-                                        <attributelist id="7574" addr="0x7f99f1e77250" >
-                                            <attribute name="name" value="imageFilename" id="7575" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="7576" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7574" addr="0x7fca469c5250" >
+                                            <attribute name="name" value="imageFilename" id="7575" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="7576" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7577">
-                                        <attributelist id="7578" addr="0x7f99f1e773b0" >
-                                            <attribute name="name" value="useCache" id="7579" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="true" id="7580" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="q(const).bool" id="7581" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7578" addr="0x7fca469c53b0" >
+                                            <attribute name="name" value="useCache" id="7579" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="true" id="7580" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="q(const).bool" id="7581" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overloaded" value="0x7f99f1e77470" id="7582" addr="0x7f99f1e77470" />
-                                <attribute name="type" value="void" id="7583" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="7584" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="7585" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469c5470" id="7582" addr="0x7fca469c5470" />
+                                <attribute name="type" value="void" id="7583" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="7584" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="7585" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="7586" addr="0x7f99f1e77630" >
-                            <attributelist id="7587" addr="0x7f99f1e77630" >
-                                <attribute name="name" value="setImage" id="7588" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="7589" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e75e70" id="7590" addr="0x7f99f1e75e70" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e77470" id="7591" addr="0x7f99f1e77470" />
-                                <attribute name="kind" value="function" id="7592" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setImage" id="7593" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(p.q(const).char)." id="7594" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e77470" id="7595" addr="0x7f99f1e77470" />
-                                <attribute name="access" value="public" id="7596" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e77470" id="7597" addr="0x7f99f1e77470" />
-                                <parmlist id="7598" addr="0x7f99f1e77530" >
+                        <cdecl id="7586" addr="0x7fca469c5630" >
+                            <attributelist id="7587" addr="0x7fca469c5630" >
+                                <attribute name="name" value="setImage" id="7588" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="7589" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c3e70" id="7590" addr="0x7fca469c3e70" />
+                                <attribute name="sym_previousSibling" value="0x7fca469c5470" id="7591" addr="0x7fca469c5470" />
+                                <attribute name="kind" value="function" id="7592" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setImage" id="7593" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(p.q(const).char)." id="7594" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469c5470" id="7595" addr="0x7fca469c5470" />
+                                <attribute name="access" value="public" id="7596" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469c5470" id="7597" addr="0x7fca469c5470" />
+                                <parmlist id="7598" addr="0x7fca469c5530" >
                                     <parm id="7599">
-                                        <attributelist id="7600" addr="0x7f99f1e77530" >
-                                            <attribute name="name" value="imageFilename" id="7601" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="7602" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7600" addr="0x7fca469c5530" >
+                                            <attribute name="name" value="imageFilename" id="7601" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="7602" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="7603" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="7604" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="7605" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="7603" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="7604" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="7605" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="7606" addr="0x7f99f1e77950" >
-                            <attributelist id="7607" addr="0x7f99f1e77950" >
-                                <attribute name="name" value="setColorDiffuse" id="7608" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="7609" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e75e70" id="7610" addr="0x7f99f1e75e70" />
-                                <attribute name="kind" value="function" id="7611" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setColorDiffuse" id="7612" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(p.q(const).char)." id="7613" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="7614" addr="0x7f99f1de6c90" />
-                                <parmlist id="7615" addr="0x7f99f1e77890" >
+                        <cdecl id="7606" addr="0x7fca469c5950" >
+                            <attributelist id="7607" addr="0x7fca469c5950" >
+                                <attribute name="name" value="setColorDiffuse" id="7608" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="7609" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c3e70" id="7610" addr="0x7fca469c3e70" />
+                                <attribute name="kind" value="function" id="7611" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setColorDiffuse" id="7612" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(p.q(const).char)." id="7613" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="7614" addr="0x7fca46934c90" />
+                                <parmlist id="7615" addr="0x7fca469c5890" >
                                     <parm id="7616">
-                                        <attributelist id="7617" addr="0x7f99f1e77890" >
-                                            <attribute name="name" value="hexString" id="7618" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="7619" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7617" addr="0x7fca469c5890" >
+                                            <attribute name="name" value="hexString" id="7618" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="7619" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="7620" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="7621" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="7622" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="7620" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="7621" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="7622" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
                     </class >
-                    <class id="7623" addr="0x7f99f1e77c30" >
-                        <attributelist id="7624" addr="0x7f99f1e77c30" >
-                            <attribute name="name" value="XBMCAddon::xbmcgui::ControlProgress" id="7625" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="7626" addr="0x7f99f1e40fb0" />
-                            <attribute name="symtab" value="0x7f99f1e77d70" id="7627" addr="0x7f99f1e77d70" />
-                            <attribute name="allows_typedef" value="1" id="7628" addr="0x7f99f1de6c90" />
-                            <attribute name="typepass_visit" value="1" id="7629" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_visit" value="1" id="7630" addr="0x7f99f1de6c90" />
-                            <attribute name="kind" value="class" id="7631" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_name" value="ControlProgress" id="7632" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_has_constructor" value="1" id="7633" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_public_constructor" value="1" id="7634" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_copy_constructor" value="1" id="7635" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_default_destructor" value="1" id="7636" addr="0x7f99f1de6c90" />
-                            <attribute name="privatebaselist" value="0x7f99f1e77c10" id="7637" addr="0x7f99f1e77c10" />
-                            <attribute name="protectedbaselist" value="0x7f99f1e77bf0" id="7638" addr="0x7f99f1e77bf0" />
-                            <baselist id="7639" addr="0x7f99f1e77bd0" >
-                                <base name="Control" id="7640" addr="0x7f99f1e77b50" />
+                    <class id="7623" addr="0x7fca469c5c30" >
+                        <attributelist id="7624" addr="0x7fca469c5c30" >
+                            <attribute name="name" value="XBMCAddon::xbmcgui::ControlProgress" id="7625" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="7626" addr="0x7fca4698efb0" />
+                            <attribute name="symtab" value="0x7fca469c5d70" id="7627" addr="0x7fca469c5d70" />
+                            <attribute name="allows_typedef" value="1" id="7628" addr="0x7fca46934c90" />
+                            <attribute name="typepass_visit" value="1" id="7629" addr="0x7fca46934c90" />
+                            <attribute name="allocate_visit" value="1" id="7630" addr="0x7fca46934c90" />
+                            <attribute name="kind" value="class" id="7631" addr="0x7fca46934c90" />
+                            <attribute name="sym_name" value="ControlProgress" id="7632" addr="0x7fca46934c90" />
+                            <attribute name="allocate_has_constructor" value="1" id="7633" addr="0x7fca46934c90" />
+                            <attribute name="allocate_public_constructor" value="1" id="7634" addr="0x7fca46934c90" />
+                            <attribute name="allocate_copy_constructor" value="1" id="7635" addr="0x7fca46934c90" />
+                            <attribute name="allocate_default_destructor" value="1" id="7636" addr="0x7fca46934c90" />
+                            <attribute name="privatebaselist" value="0x7fca469c5c10" id="7637" addr="0x7fca469c5c10" />
+                            <attribute name="protectedbaselist" value="0x7fca469c5bf0" id="7638" addr="0x7fca469c5bf0" />
+                            <baselist id="7639" addr="0x7fca469c5bd0" >
+                                <base name="Control" id="7640" addr="0x7fca469c5b50" />
                             </baselist >
-                            <attribute name="module" value="xbmcgui" id="7641" addr="0x7f99f1e402f0" />
-                            <attribute name="bases" value="0x7f99f1ddbf90" id="7642" addr="0x7f99f1ddbf90" />
-                            <attribute name="allbases" value="0x7f99f1ddc230" id="7643" addr="0x7f99f1ddc230" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="7644" addr="0x7f99f1de6c90" />
-                            <typescope id="7645" addr="0x7f99f1ddbf10" >
-                                <attributelist id="7646" addr="0x7f99f1ddbf10" >
-                                    <attribute name="inherit" value="0x7f99f1ddc010" id="7647" addr="0x7f99f1ddc010" />
-                                    <attribute name="name" value="ControlProgress" id="7648" addr="0x7f99f1de6c90" />
-                                    <typetab id="7649" addr="0x7f99f1ddbf30" >
-                                        <attributelist id="7650" addr="0x7f99f1ddbf30" >
+                            <attribute name="module" value="xbmcgui" id="7641" addr="0x7fca4698e2f0" />
+                            <attribute name="bases" value="0x7fca46929f90" id="7642" addr="0x7fca46929f90" />
+                            <attribute name="allbases" value="0x7fca4692a230" id="7643" addr="0x7fca4692a230" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="7644" addr="0x7fca46934c90" />
+                            <typescope id="7645" addr="0x7fca46929f10" >
+                                <attributelist id="7646" addr="0x7fca46929f10" >
+                                    <attribute name="inherit" value="0x7fca4692a010" id="7647" addr="0x7fca4692a010" />
+                                    <attribute name="name" value="ControlProgress" id="7648" addr="0x7fca46934c90" />
+                                    <typetab id="7649" addr="0x7fca46929f30" >
+                                        <attributelist id="7650" addr="0x7fca46929f30" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f99f1dd2150" id="7651" addr="0x7f99f1dd2150" />
-                                    <attribute name="qname" value="XBMCAddon::xbmcgui::ControlProgress" id="7652" addr="0x7f99f1de6c90" />
-                                    <attribute name="symtab" value="0x7f99f1e77d70" id="7653" addr="0x7f99f1e77d70" />
+                                    <attribute name="parent" value="0x7fca46920150" id="7651" addr="0x7fca46920150" />
+                                    <attribute name="qname" value="XBMCAddon::xbmcgui::ControlProgress" id="7652" addr="0x7fca46934c90" />
+                                    <attribute name="symtab" value="0x7fca469c5d70" id="7653" addr="0x7fca469c5d70" />
                                 </attributelist >
-                                <typescopesitem id="7654" addr="0x7f99f1ddc010" >
-                                    <attributelist id="7655" addr="0x7f99f1ddc010" >
+                                <typescopesitem id="7654" addr="0x7fca4692a010" >
+                                    <attributelist id="7655" addr="0x7fca4692a010" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="7656" addr="0x7f99f1ddbeb0" >
-                                    <attributelist id="7657" addr="0x7f99f1ddbeb0" >
+                                <typescopesitem id="7656" addr="0x7fca46929eb0" >
+                                    <attributelist id="7657" addr="0x7fca46929eb0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="7658" addr="0x7f99f1ddbf30" >
-                                    <attributelist id="7659" addr="0x7f99f1ddbf30" >
+                                <typescopesitem id="7658" addr="0x7fca46929f30" >
+                                    <attributelist id="7659" addr="0x7fca46929f30" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="7660" addr="0x7f99f1dd2150" >
-                                    <attributelist id="7661" addr="0x7f99f1dd2150" >
-                                        <attribute name="name" value="xbmcgui" id="7662" addr="0x7f99f1de6c90" />
-                                        <typetab id="7663" addr="0x7f99f1dd2170" >
-                                            <attributelist id="7664" addr="0x7f99f1dd2170" >
-                                                <attribute name="InterceptorBase" value="InterceptorBase" id="7665" addr="0x7f99f1de6c90" />
-                                                <attribute name="Dialog" value="Dialog" id="7666" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="7667" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="7668" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlTextBox" value="ControlTextBox" id="7669" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="7670" addr="0x7f99f1de6c90" />
-                                                <attribute name="Window" value="Window" id="7671" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="7672" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlList" value="ControlList" id="7673" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="7674" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlImage" value="ControlImage" id="7675" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlButton" value="ControlButton" id="7676" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlGroup" value="ControlGroup" id="7677" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogBusy" value="DialogBusy" id="7678" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="7679" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSpin" value="ControlSpin" id="7680" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlEdit" value="ControlEdit" id="7681" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="7682" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="7683" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlLabel" value="ControlLabel" id="7684" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlProgress" value="ControlProgress" id="7685" addr="0x7f99f1de6c90" />
-                                                <attribute name="Control" value="Control" id="7686" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSlider" value="ControlSlider" id="7687" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgress" value="DialogProgress" id="7688" addr="0x7f99f1de6c90" />
-                                                <attribute name="Action" value="Action" id="7689" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowDialog" value="WindowDialog" id="7690" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXML" value="WindowXML" id="7691" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItem" value="ListItem" id="7692" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="7693" addr="0x7f99f1de6c90" />
+                                <typescopesitem id="7660" addr="0x7fca46920150" >
+                                    <attributelist id="7661" addr="0x7fca46920150" >
+                                        <attribute name="name" value="xbmcgui" id="7662" addr="0x7fca46934c90" />
+                                        <typetab id="7663" addr="0x7fca46920170" >
+                                            <attributelist id="7664" addr="0x7fca46920170" >
+                                                <attribute name="InterceptorBase" value="InterceptorBase" id="7665" addr="0x7fca46934c90" />
+                                                <attribute name="Dialog" value="Dialog" id="7666" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="7667" addr="0x7fca46934c90" />
+                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="7668" addr="0x7fca46934c90" />
+                                                <attribute name="ControlTextBox" value="ControlTextBox" id="7669" addr="0x7fca46934c90" />
+                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="7670" addr="0x7fca46934c90" />
+                                                <attribute name="Window" value="Window" id="7671" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="7672" addr="0x7fca46934c90" />
+                                                <attribute name="ControlList" value="ControlList" id="7673" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="7674" addr="0x7fca46934c90" />
+                                                <attribute name="ControlImage" value="ControlImage" id="7675" addr="0x7fca46934c90" />
+                                                <attribute name="ControlButton" value="ControlButton" id="7676" addr="0x7fca46934c90" />
+                                                <attribute name="ControlGroup" value="ControlGroup" id="7677" addr="0x7fca46934c90" />
+                                                <attribute name="DialogBusy" value="DialogBusy" id="7678" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="7679" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSpin" value="ControlSpin" id="7680" addr="0x7fca46934c90" />
+                                                <attribute name="ControlEdit" value="ControlEdit" id="7681" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="7682" addr="0x7fca46934c90" />
+                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="7683" addr="0x7fca46934c90" />
+                                                <attribute name="ControlLabel" value="ControlLabel" id="7684" addr="0x7fca46934c90" />
+                                                <attribute name="ControlProgress" value="ControlProgress" id="7685" addr="0x7fca46934c90" />
+                                                <attribute name="Control" value="Control" id="7686" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSlider" value="ControlSlider" id="7687" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgress" value="DialogProgress" id="7688" addr="0x7fca46934c90" />
+                                                <attribute name="Action" value="Action" id="7689" addr="0x7fca46934c90" />
+                                                <attribute name="WindowDialog" value="WindowDialog" id="7690" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXML" value="WindowXML" id="7691" addr="0x7fca46934c90" />
+                                                <attribute name="ListItem" value="ListItem" id="7692" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="7693" addr="0x7fca46934c90" />
                                             </attributelist >
-                                            <typetabsitem id="7694" addr="0x7f99f1de1dd0" >
-                                                <attributelist id="7695" addr="0x7f99f1de1dd0" >
+                                            <typetabsitem id="7694" addr="0x7fca4692fdd0" >
+                                                <attributelist id="7695" addr="0x7fca4692fdd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7696" addr="0x7f99f1dde790" >
-                                                <attributelist id="7697" addr="0x7f99f1dde790" >
+                                            <typetabsitem id="7696" addr="0x7fca4692c790" >
+                                                <attributelist id="7697" addr="0x7fca4692c790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7698" addr="0x7f99f1de3f10" >
-                                                <attributelist id="7699" addr="0x7f99f1de3f10" >
+                                            <typetabsitem id="7698" addr="0x7fca46931f10" >
+                                                <attributelist id="7699" addr="0x7fca46931f10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7700" addr="0x7f99f1dd67b0" >
-                                                <attributelist id="7701" addr="0x7f99f1dd67b0" >
+                                            <typetabsitem id="7700" addr="0x7fca469247b0" >
+                                                <attributelist id="7701" addr="0x7fca469247b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7702" addr="0x7f99f1ddafd0" >
-                                                <attributelist id="7703" addr="0x7f99f1ddafd0" >
+                                            <typetabsitem id="7702" addr="0x7fca46928fd0" >
+                                                <attributelist id="7703" addr="0x7fca46928fd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7704" addr="0x7f99f1ddd430" >
-                                                <attributelist id="7705" addr="0x7f99f1ddd430" >
+                                            <typetabsitem id="7704" addr="0x7fca4692b430" >
+                                                <attributelist id="7705" addr="0x7fca4692b430" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7706" addr="0x7f99f1de2130" >
-                                                <attributelist id="7707" addr="0x7f99f1de2130" >
+                                            <typetabsitem id="7706" addr="0x7fca46930130" >
+                                                <attributelist id="7707" addr="0x7fca46930130" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7708" addr="0x7f99f1dd2f50" >
-                                                <attributelist id="7709" addr="0x7f99f1dd2f50" >
+                                            <typetabsitem id="7708" addr="0x7fca46920f50" >
+                                                <attributelist id="7709" addr="0x7fca46920f50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7710" addr="0x7f99f1dd9650" >
-                                                <attributelist id="7711" addr="0x7f99f1dd9650" >
+                                            <typetabsitem id="7710" addr="0x7fca46927650" >
+                                                <attributelist id="7711" addr="0x7fca46927650" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7712" addr="0x7f99f1de3390" >
-                                                <attributelist id="7713" addr="0x7f99f1de3390" >
+                                            <typetabsitem id="7712" addr="0x7fca46931390" >
+                                                <attributelist id="7713" addr="0x7fca46931390" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7714" addr="0x7f99f1ddb7b0" >
-                                                <attributelist id="7715" addr="0x7f99f1ddb7b0" >
+                                            <typetabsitem id="7714" addr="0x7fca469297b0" >
+                                                <attributelist id="7715" addr="0x7fca469297b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7716" addr="0x7f99f1ddc4b0" >
-                                                <attributelist id="7717" addr="0x7f99f1ddc4b0" >
+                                            <typetabsitem id="7716" addr="0x7fca4692a4b0" >
+                                                <attributelist id="7717" addr="0x7fca4692a4b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7718" addr="0x7f99f1ddcf90" >
-                                                <attributelist id="7719" addr="0x7f99f1ddcf90" >
+                                            <typetabsitem id="7718" addr="0x7fca4692af90" >
+                                                <attributelist id="7719" addr="0x7fca4692af90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7720" addr="0x7f99f1de11b0" >
-                                                <attributelist id="7721" addr="0x7f99f1de11b0" >
+                                            <typetabsitem id="7720" addr="0x7fca4692f1b0" >
+                                                <attributelist id="7721" addr="0x7fca4692f1b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7722" addr="0x7f99f1de15b0" >
-                                                <attributelist id="7723" addr="0x7f99f1de15b0" >
+                                            <typetabsitem id="7722" addr="0x7fca4692f5b0" >
+                                                <attributelist id="7723" addr="0x7fca4692f5b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7724" addr="0x7f99f1dd77f0" >
-                                                <attributelist id="7725" addr="0x7f99f1dd77f0" >
+                                            <typetabsitem id="7724" addr="0x7fca469257f0" >
+                                                <attributelist id="7725" addr="0x7fca469257f0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7726" addr="0x7f99f1dd8b30" >
-                                                <attributelist id="7727" addr="0x7f99f1dd8b30" >
+                                            <typetabsitem id="7726" addr="0x7fca46926b30" >
+                                                <attributelist id="7727" addr="0x7fca46926b30" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7728" addr="0x7f99f1dd2c50" >
-                                                <attributelist id="7729" addr="0x7f99f1dd2c50" >
+                                            <typetabsitem id="7728" addr="0x7fca46920c50" >
+                                                <attributelist id="7729" addr="0x7fca46920c50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7730" addr="0x7f99f1dda790" >
-                                                <attributelist id="7731" addr="0x7f99f1dda790" >
+                                            <typetabsitem id="7730" addr="0x7fca46928790" >
+                                                <attributelist id="7731" addr="0x7fca46928790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7732" addr="0x7f99f1dd8030" >
-                                                <attributelist id="7733" addr="0x7f99f1dd8030" >
+                                            <typetabsitem id="7732" addr="0x7fca46926030" >
+                                                <attributelist id="7733" addr="0x7fca46926030" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7734" addr="0x7f99f1ddbe10" >
-                                                <attributelist id="7735" addr="0x7f99f1ddbe10" >
+                                            <typetabsitem id="7734" addr="0x7fca46929e10" >
+                                                <attributelist id="7735" addr="0x7fca46929e10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7736" addr="0x7f99f1dd6b10" >
-                                                <attributelist id="7737" addr="0x7f99f1dd6b10" >
+                                            <typetabsitem id="7736" addr="0x7fca46924b10" >
+                                                <attributelist id="7737" addr="0x7fca46924b10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7738" addr="0x7f99f1dddf90" >
-                                                <attributelist id="7739" addr="0x7f99f1dddf90" >
+                                            <typetabsitem id="7738" addr="0x7fca4692bf90" >
+                                                <attributelist id="7739" addr="0x7fca4692bf90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7740" addr="0x7f99f1de0530" >
-                                                <attributelist id="7741" addr="0x7f99f1de0530" >
+                                            <typetabsitem id="7740" addr="0x7fca4692e530" >
+                                                <attributelist id="7741" addr="0x7fca4692e530" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7742" addr="0x7f99f1de1e50" >
-                                                <attributelist id="7743" addr="0x7f99f1de1e50" >
+                                            <typetabsitem id="7742" addr="0x7fca4692fe50" >
+                                                <attributelist id="7743" addr="0x7fca4692fe50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7744" addr="0x7f99f1de2d90" >
-                                                <attributelist id="7745" addr="0x7f99f1de2d90" >
+                                            <typetabsitem id="7744" addr="0x7fca46930d90" >
+                                                <attributelist id="7745" addr="0x7fca46930d90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7746" addr="0x7f99f1de3410" >
-                                                <attributelist id="7747" addr="0x7f99f1de3410" >
+                                            <typetabsitem id="7746" addr="0x7fca46931410" >
+                                                <attributelist id="7747" addr="0x7fca46931410" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7748" addr="0x7f99f1dd3590" >
-                                                <attributelist id="7749" addr="0x7f99f1dd3590" >
+                                            <typetabsitem id="7748" addr="0x7fca46921590" >
+                                                <attributelist id="7749" addr="0x7fca46921590" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="7750" addr="0x7f99f1dd3390" >
-                                                <attributelist id="7751" addr="0x7f99f1dd3390" >
+                                            <typetabsitem id="7750" addr="0x7fca46921390" >
+                                                <attributelist id="7751" addr="0x7fca46921390" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7f99f1dd1d70" id="7752" addr="0x7f99f1dd1d70" />
-                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="7753" addr="0x7f99f1de6c90" />
-                                        <attribute name="symtab" value="0x7f99f1e40fb0" id="7754" addr="0x7f99f1e40fb0" />
+                                        <attribute name="parent" value="0x7fca4691fd70" id="7752" addr="0x7fca4691fd70" />
+                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="7753" addr="0x7fca46934c90" />
+                                        <attribute name="symtab" value="0x7fca4698efb0" id="7754" addr="0x7fca4698efb0" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="7755" addr="0x7f99f1ddbf50" >
-                                    <attributelist id="7756" addr="0x7f99f1ddbf50" >
+                                <typescopesitem id="7755" addr="0x7fca46929f50" >
+                                    <attributelist id="7756" addr="0x7fca46929f50" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="7757" addr="0x7f99f1e77d70" >
-                                    <attributelist id="7758" addr="0x7f99f1e77d70" >
-                                        <attribute name="inherit" value="0x7f99f1e77dd0" id="7759" addr="0x7f99f1e77dd0" />
-                                        <attribute name="name" value="ControlProgress" id="7760" addr="0x7f99f1de6c90" />
-                                        <attribute name="csymtab" value="0x7f99f1e77d90" id="7761" addr="0x7f99f1e77d90" />
-                                        <attribute name="symtab" value="0x7f99f1e77d50" id="7762" addr="0x7f99f1e77d50" />
+                                <typescopesitem id="7757" addr="0x7fca469c5d70" >
+                                    <attributelist id="7758" addr="0x7fca469c5d70" >
+                                        <attribute name="inherit" value="0x7fca469c5dd0" id="7759" addr="0x7fca469c5dd0" />
+                                        <attribute name="name" value="ControlProgress" id="7760" addr="0x7fca46934c90" />
+                                        <attribute name="csymtab" value="0x7fca469c5d90" id="7761" addr="0x7fca469c5d90" />
+                                        <attribute name="symtab" value="0x7fca469c5d50" id="7762" addr="0x7fca469c5d50" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <access id="7763" addr="0x7f99f1e77cf0" >
-                            <attributelist id="7764" addr="0x7f99f1e77cf0" >
-                                <attribute name="kind" value="public" id="7765" addr="0x7f99f1de6c90" />
+                        <access id="7763" addr="0x7fca469c5cf0" >
+                            <attributelist id="7764" addr="0x7fca469c5cf0" >
+                                <attribute name="kind" value="public" id="7765" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="7766" addr="0x7f99f1e78b70" >
-                            <attributelist id="7767" addr="0x7f99f1e78b70" >
-                                <attribute name="name" value="ControlProgress" id="7768" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="7769" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e77d70" id="7770" addr="0x7f99f1e77d70" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e790f0" id="7771" addr="0x7f99f1e790f0" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e790f0" id="7772" addr="0x7f99f1e790f0" />
-                                <attribute name="sym_name" value="ControlProgress" id="7773" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char)." id="7774" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="7775" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e78b70" id="7776" addr="0x7f99f1e78b70" />
-                                <parmlist id="7777" addr="0x7f99f1e77f30" >
+                        <constructor id="7766" addr="0x7fca469c6b70" >
+                            <attributelist id="7767" addr="0x7fca469c6b70" >
+                                <attribute name="name" value="ControlProgress" id="7768" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="7769" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c5d70" id="7770" addr="0x7fca469c5d70" />
+                                <attribute name="sym_nextSibling" value="0x7fca469c70f0" id="7771" addr="0x7fca469c70f0" />
+                                <attribute name="csym_nextSibling" value="0x7fca469c70f0" id="7772" addr="0x7fca469c70f0" />
+                                <attribute name="sym_name" value="ControlProgress" id="7773" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char)." id="7774" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="7775" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469c6b70" id="7776" addr="0x7fca469c6b70" />
+                                <parmlist id="7777" addr="0x7fca469c5f30" >
                                     <parm id="7778">
-                                        <attributelist id="7779" addr="0x7f99f1e77f30" >
-                                            <attribute name="name" value="x" id="7780" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7781" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7779" addr="0x7fca469c5f30" >
+                                            <attribute name="name" value="x" id="7780" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7781" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7782">
-                                        <attributelist id="7783" addr="0x7f99f1e78050" >
-                                            <attribute name="name" value="y" id="7784" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7785" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7783" addr="0x7fca469c6050" >
+                                            <attribute name="name" value="y" id="7784" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7785" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7786">
-                                        <attributelist id="7787" addr="0x7f99f1e78170" >
-                                            <attribute name="name" value="width" id="7788" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7789" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7787" addr="0x7fca469c6170" >
+                                            <attribute name="name" value="width" id="7788" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7789" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7790">
-                                        <attributelist id="7791" addr="0x7f99f1e78290" >
-                                            <attribute name="name" value="height" id="7792" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7793" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7791" addr="0x7fca469c6290" >
+                                            <attribute name="name" value="height" id="7792" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7793" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7794">
-                                        <attributelist id="7795" addr="0x7f99f1e78430" >
-                                            <attribute name="name" value="texturebg" id="7796" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="7797" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="7798" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7795" addr="0x7fca469c6430" >
+                                            <attribute name="name" value="texturebg" id="7796" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="7797" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="7798" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7799">
-                                        <attributelist id="7800" addr="0x7f99f1e785d0" >
-                                            <attribute name="name" value="textureleft" id="7801" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="7802" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="7803" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7800" addr="0x7fca469c65d0" >
+                                            <attribute name="name" value="textureleft" id="7801" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="7802" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="7803" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7804">
-                                        <attributelist id="7805" addr="0x7f99f1e78770" >
-                                            <attribute name="name" value="texturemid" id="7806" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="7807" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="7808" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7805" addr="0x7fca469c6770" >
+                                            <attribute name="name" value="texturemid" id="7806" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="7807" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="7808" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7809">
-                                        <attributelist id="7810" addr="0x7f99f1e78910" >
-                                            <attribute name="name" value="textureright" id="7811" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="7812" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="7813" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7810" addr="0x7fca469c6910" >
+                                            <attribute name="name" value="textureright" id="7811" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="7812" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="7813" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7814">
-                                        <attributelist id="7815" addr="0x7f99f1e78ab0" >
-                                            <attribute name="name" value="textureoverlay" id="7816" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="7817" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="7818" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7815" addr="0x7fca469c6ab0" >
+                                            <attribute name="name" value="textureoverlay" id="7816" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="7817" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="7818" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_0" id="7819" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="7820" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="7819" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="7820" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="7821" addr="0x7f99f1e790f0" >
-                            <attributelist id="7822" addr="0x7f99f1e790f0" >
-                                <attribute name="name" value="ControlProgress" id="7823" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="7824" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e77d70" id="7825" addr="0x7f99f1e77d70" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e795d0" id="7826" addr="0x7f99f1e795d0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e78b70" id="7827" addr="0x7f99f1e78b70" />
-                                <attribute name="sym_name" value="ControlProgress" id="7828" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e795d0" id="7829" addr="0x7f99f1e795d0" />
-                                <attribute name="defaultargs" value="0x7f99f1e78b70" id="7830" addr="0x7f99f1e78b70" />
-                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char)." id="7831" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="7832" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e78b70" id="7833" addr="0x7f99f1e78b70" />
-                                <parmlist id="7834" addr="0x7f99f1e78c10" >
+                        <constructor id="7821" addr="0x7fca469c70f0" >
+                            <attributelist id="7822" addr="0x7fca469c70f0" >
+                                <attribute name="name" value="ControlProgress" id="7823" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="7824" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c5d70" id="7825" addr="0x7fca469c5d70" />
+                                <attribute name="csym_nextSibling" value="0x7fca469c75d0" id="7826" addr="0x7fca469c75d0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469c6b70" id="7827" addr="0x7fca469c6b70" />
+                                <attribute name="sym_name" value="ControlProgress" id="7828" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469c75d0" id="7829" addr="0x7fca469c75d0" />
+                                <attribute name="defaultargs" value="0x7fca469c6b70" id="7830" addr="0x7fca469c6b70" />
+                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char)." id="7831" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="7832" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469c6b70" id="7833" addr="0x7fca469c6b70" />
+                                <parmlist id="7834" addr="0x7fca469c6c10" >
                                     <parm id="7835">
-                                        <attributelist id="7836" addr="0x7f99f1e78c10" >
-                                            <attribute name="name" value="x" id="7837" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7838" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7836" addr="0x7fca469c6c10" >
+                                            <attribute name="name" value="x" id="7837" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7838" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7839">
-                                        <attributelist id="7840" addr="0x7f99f1e78cd0" >
-                                            <attribute name="name" value="y" id="7841" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7842" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7840" addr="0x7fca469c6cd0" >
+                                            <attribute name="name" value="y" id="7841" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7842" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7843">
-                                        <attributelist id="7844" addr="0x7f99f1e78d50" >
-                                            <attribute name="name" value="width" id="7845" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7846" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7844" addr="0x7fca469c6d50" >
+                                            <attribute name="name" value="width" id="7845" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7846" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7847">
-                                        <attributelist id="7848" addr="0x7f99f1e78dd0" >
-                                            <attribute name="name" value="height" id="7849" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7850" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7848" addr="0x7fca469c6dd0" >
+                                            <attribute name="name" value="height" id="7849" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7850" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7851">
-                                        <attributelist id="7852" addr="0x7f99f1e78e50" >
-                                            <attribute name="name" value="texturebg" id="7853" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="7854" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="7855" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7852" addr="0x7fca469c6e50" >
+                                            <attribute name="name" value="texturebg" id="7853" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="7854" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="7855" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7856">
-                                        <attributelist id="7857" addr="0x7f99f1e78ef0" >
-                                            <attribute name="name" value="textureleft" id="7858" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="7859" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="7860" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7857" addr="0x7fca469c6ef0" >
+                                            <attribute name="name" value="textureleft" id="7858" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="7859" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="7860" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7861">
-                                        <attributelist id="7862" addr="0x7f99f1e78f90" >
-                                            <attribute name="name" value="texturemid" id="7863" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="7864" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="7865" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7862" addr="0x7fca469c6f90" >
+                                            <attribute name="name" value="texturemid" id="7863" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="7864" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="7865" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7866">
-                                        <attributelist id="7867" addr="0x7f99f1e79030" >
-                                            <attribute name="name" value="textureright" id="7868" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="7869" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="7870" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7867" addr="0x7fca469c7030" >
+                                            <attribute name="name" value="textureright" id="7868" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="7869" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="7870" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_1" id="7871" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="7872" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="7871" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="7872" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="7873" addr="0x7f99f1e795d0" >
-                            <attributelist id="7874" addr="0x7f99f1e795d0" >
-                                <attribute name="name" value="ControlProgress" id="7875" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="7876" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e77d70" id="7877" addr="0x7f99f1e77d70" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e79a10" id="7878" addr="0x7f99f1e79a10" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e790f0" id="7879" addr="0x7f99f1e790f0" />
-                                <attribute name="sym_name" value="ControlProgress" id="7880" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e79a10" id="7881" addr="0x7f99f1e79a10" />
-                                <attribute name="defaultargs" value="0x7f99f1e78b70" id="7882" addr="0x7f99f1e78b70" />
-                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char)." id="7883" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="7884" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e78b70" id="7885" addr="0x7f99f1e78b70" />
-                                <parmlist id="7886" addr="0x7f99f1e79190" >
+                        <constructor id="7873" addr="0x7fca469c75d0" >
+                            <attributelist id="7874" addr="0x7fca469c75d0" >
+                                <attribute name="name" value="ControlProgress" id="7875" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="7876" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c5d70" id="7877" addr="0x7fca469c5d70" />
+                                <attribute name="csym_nextSibling" value="0x7fca469c7a10" id="7878" addr="0x7fca469c7a10" />
+                                <attribute name="sym_previousSibling" value="0x7fca469c70f0" id="7879" addr="0x7fca469c70f0" />
+                                <attribute name="sym_name" value="ControlProgress" id="7880" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469c7a10" id="7881" addr="0x7fca469c7a10" />
+                                <attribute name="defaultargs" value="0x7fca469c6b70" id="7882" addr="0x7fca469c6b70" />
+                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char)." id="7883" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="7884" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469c6b70" id="7885" addr="0x7fca469c6b70" />
+                                <parmlist id="7886" addr="0x7fca469c7190" >
                                     <parm id="7887">
-                                        <attributelist id="7888" addr="0x7f99f1e79190" >
-                                            <attribute name="name" value="x" id="7889" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7890" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7888" addr="0x7fca469c7190" >
+                                            <attribute name="name" value="x" id="7889" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7890" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7891">
-                                        <attributelist id="7892" addr="0x7f99f1e79250" >
-                                            <attribute name="name" value="y" id="7893" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7894" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7892" addr="0x7fca469c7250" >
+                                            <attribute name="name" value="y" id="7893" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7894" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7895">
-                                        <attributelist id="7896" addr="0x7f99f1e792d0" >
-                                            <attribute name="name" value="width" id="7897" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7898" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7896" addr="0x7fca469c72d0" >
+                                            <attribute name="name" value="width" id="7897" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7898" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7899">
-                                        <attributelist id="7900" addr="0x7f99f1e79350" >
-                                            <attribute name="name" value="height" id="7901" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7902" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7900" addr="0x7fca469c7350" >
+                                            <attribute name="name" value="height" id="7901" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7902" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7903">
-                                        <attributelist id="7904" addr="0x7f99f1e793d0" >
-                                            <attribute name="name" value="texturebg" id="7905" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="7906" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="7907" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7904" addr="0x7fca469c73d0" >
+                                            <attribute name="name" value="texturebg" id="7905" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="7906" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="7907" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7908">
-                                        <attributelist id="7909" addr="0x7f99f1e79470" >
-                                            <attribute name="name" value="textureleft" id="7910" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="7911" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="7912" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7909" addr="0x7fca469c7470" >
+                                            <attribute name="name" value="textureleft" id="7910" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="7911" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="7912" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7913">
-                                        <attributelist id="7914" addr="0x7f99f1e79510" >
-                                            <attribute name="name" value="texturemid" id="7915" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="7916" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="7917" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7914" addr="0x7fca469c7510" >
+                                            <attribute name="name" value="texturemid" id="7915" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="7916" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="7917" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_2" id="7918" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="7919" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_2" id="7918" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="7919" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="7920" addr="0x7f99f1e79a10" >
-                            <attributelist id="7921" addr="0x7f99f1e79a10" >
-                                <attribute name="name" value="ControlProgress" id="7922" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="7923" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e77d70" id="7924" addr="0x7f99f1e77d70" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e79db0" id="7925" addr="0x7f99f1e79db0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e795d0" id="7926" addr="0x7f99f1e795d0" />
-                                <attribute name="sym_name" value="ControlProgress" id="7927" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e79db0" id="7928" addr="0x7f99f1e79db0" />
-                                <attribute name="defaultargs" value="0x7f99f1e78b70" id="7929" addr="0x7f99f1e78b70" />
-                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char)." id="7930" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="7931" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e78b70" id="7932" addr="0x7f99f1e78b70" />
-                                <parmlist id="7933" addr="0x7f99f1e79670" >
+                        <constructor id="7920" addr="0x7fca469c7a10" >
+                            <attributelist id="7921" addr="0x7fca469c7a10" >
+                                <attribute name="name" value="ControlProgress" id="7922" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="7923" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c5d70" id="7924" addr="0x7fca469c5d70" />
+                                <attribute name="csym_nextSibling" value="0x7fca469c7db0" id="7925" addr="0x7fca469c7db0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469c75d0" id="7926" addr="0x7fca469c75d0" />
+                                <attribute name="sym_name" value="ControlProgress" id="7927" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469c7db0" id="7928" addr="0x7fca469c7db0" />
+                                <attribute name="defaultargs" value="0x7fca469c6b70" id="7929" addr="0x7fca469c6b70" />
+                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char)." id="7930" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="7931" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469c6b70" id="7932" addr="0x7fca469c6b70" />
+                                <parmlist id="7933" addr="0x7fca469c7670" >
                                     <parm id="7934">
-                                        <attributelist id="7935" addr="0x7f99f1e79670" >
-                                            <attribute name="name" value="x" id="7936" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7937" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7935" addr="0x7fca469c7670" >
+                                            <attribute name="name" value="x" id="7936" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7937" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7938">
-                                        <attributelist id="7939" addr="0x7f99f1e79730" >
-                                            <attribute name="name" value="y" id="7940" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7941" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7939" addr="0x7fca469c7730" >
+                                            <attribute name="name" value="y" id="7940" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7941" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7942">
-                                        <attributelist id="7943" addr="0x7f99f1e797b0" >
-                                            <attribute name="name" value="width" id="7944" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7945" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7943" addr="0x7fca469c77b0" >
+                                            <attribute name="name" value="width" id="7944" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7945" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7946">
-                                        <attributelist id="7947" addr="0x7f99f1e79830" >
-                                            <attribute name="name" value="height" id="7948" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7949" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7947" addr="0x7fca469c7830" >
+                                            <attribute name="name" value="height" id="7948" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7949" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7950">
-                                        <attributelist id="7951" addr="0x7f99f1e798b0" >
-                                            <attribute name="name" value="texturebg" id="7952" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="7953" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="7954" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7951" addr="0x7fca469c78b0" >
+                                            <attribute name="name" value="texturebg" id="7952" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="7953" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="7954" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7955">
-                                        <attributelist id="7956" addr="0x7f99f1e79950" >
-                                            <attribute name="name" value="textureleft" id="7957" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="7958" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="7959" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7956" addr="0x7fca469c7950" >
+                                            <attribute name="name" value="textureleft" id="7957" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="7958" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="7959" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_3" id="7960" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="7961" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_3" id="7960" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="7961" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="7962" addr="0x7f99f1e79db0" >
-                            <attributelist id="7963" addr="0x7f99f1e79db0" >
-                                <attribute name="name" value="ControlProgress" id="7964" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="7965" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e77d70" id="7966" addr="0x7f99f1e77d70" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e7a0b0" id="7967" addr="0x7f99f1e7a0b0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e79a10" id="7968" addr="0x7f99f1e79a10" />
-                                <attribute name="sym_name" value="ControlProgress" id="7969" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e7a0b0" id="7970" addr="0x7f99f1e7a0b0" />
-                                <attribute name="defaultargs" value="0x7f99f1e78b70" id="7971" addr="0x7f99f1e78b70" />
-                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char)." id="7972" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="7973" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e78b70" id="7974" addr="0x7f99f1e78b70" />
-                                <parmlist id="7975" addr="0x7f99f1e79ab0" >
+                        <constructor id="7962" addr="0x7fca469c7db0" >
+                            <attributelist id="7963" addr="0x7fca469c7db0" >
+                                <attribute name="name" value="ControlProgress" id="7964" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="7965" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c5d70" id="7966" addr="0x7fca469c5d70" />
+                                <attribute name="csym_nextSibling" value="0x7fca469c80b0" id="7967" addr="0x7fca469c80b0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469c7a10" id="7968" addr="0x7fca469c7a10" />
+                                <attribute name="sym_name" value="ControlProgress" id="7969" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469c80b0" id="7970" addr="0x7fca469c80b0" />
+                                <attribute name="defaultargs" value="0x7fca469c6b70" id="7971" addr="0x7fca469c6b70" />
+                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char)." id="7972" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="7973" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469c6b70" id="7974" addr="0x7fca469c6b70" />
+                                <parmlist id="7975" addr="0x7fca469c7ab0" >
                                     <parm id="7976">
-                                        <attributelist id="7977" addr="0x7f99f1e79ab0" >
-                                            <attribute name="name" value="x" id="7978" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7979" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7977" addr="0x7fca469c7ab0" >
+                                            <attribute name="name" value="x" id="7978" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7979" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7980">
-                                        <attributelist id="7981" addr="0x7f99f1e79b70" >
-                                            <attribute name="name" value="y" id="7982" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7983" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7981" addr="0x7fca469c7b70" >
+                                            <attribute name="name" value="y" id="7982" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7983" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7984">
-                                        <attributelist id="7985" addr="0x7f99f1e79bf0" >
-                                            <attribute name="name" value="width" id="7986" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7987" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7985" addr="0x7fca469c7bf0" >
+                                            <attribute name="name" value="width" id="7986" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7987" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7988">
-                                        <attributelist id="7989" addr="0x7f99f1e79c70" >
-                                            <attribute name="name" value="height" id="7990" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="7991" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7989" addr="0x7fca469c7c70" >
+                                            <attribute name="name" value="height" id="7990" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="7991" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="7992">
-                                        <attributelist id="7993" addr="0x7f99f1e79cf0" >
-                                            <attribute name="name" value="texturebg" id="7994" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="7995" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="7996" addr="0x7f99f1de6c90" />
+                                        <attributelist id="7993" addr="0x7fca469c7cf0" >
+                                            <attribute name="name" value="texturebg" id="7994" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="7995" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="7996" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_4" id="7997" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="7998" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_4" id="7997" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="7998" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="7999" addr="0x7f99f1e7a0b0" >
-                            <attributelist id="8000" addr="0x7f99f1e7a0b0" >
-                                <attribute name="name" value="ControlProgress" id="8001" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="8002" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e77d70" id="8003" addr="0x7f99f1e77d70" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e79db0" id="8004" addr="0x7f99f1e79db0" />
-                                <attribute name="sym_name" value="ControlProgress" id="8005" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e78b70" id="8006" addr="0x7f99f1e78b70" />
-                                <attribute name="decl" value="f(long,long,long,long)." id="8007" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="8008" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e78b70" id="8009" addr="0x7f99f1e78b70" />
-                                <parmlist id="8010" addr="0x7f99f1e79e50" >
+                        <constructor id="7999" addr="0x7fca469c80b0" >
+                            <attributelist id="8000" addr="0x7fca469c80b0" >
+                                <attribute name="name" value="ControlProgress" id="8001" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="8002" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c5d70" id="8003" addr="0x7fca469c5d70" />
+                                <attribute name="sym_previousSibling" value="0x7fca469c7db0" id="8004" addr="0x7fca469c7db0" />
+                                <attribute name="sym_name" value="ControlProgress" id="8005" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469c6b70" id="8006" addr="0x7fca469c6b70" />
+                                <attribute name="decl" value="f(long,long,long,long)." id="8007" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="8008" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469c6b70" id="8009" addr="0x7fca469c6b70" />
+                                <parmlist id="8010" addr="0x7fca469c7e50" >
                                     <parm id="8011">
-                                        <attributelist id="8012" addr="0x7f99f1e79e50" >
-                                            <attribute name="name" value="x" id="8013" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8014" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8012" addr="0x7fca469c7e50" >
+                                            <attribute name="name" value="x" id="8013" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8014" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8015">
-                                        <attributelist id="8016" addr="0x7f99f1e79f10" >
-                                            <attribute name="name" value="y" id="8017" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8018" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8016" addr="0x7fca469c7f10" >
+                                            <attribute name="name" value="y" id="8017" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8018" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8019">
-                                        <attributelist id="8020" addr="0x7f99f1e79f90" >
-                                            <attribute name="name" value="width" id="8021" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8022" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8020" addr="0x7fca469c7f90" >
+                                            <attribute name="name" value="width" id="8021" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8022" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8023">
-                                        <attributelist id="8024" addr="0x7f99f1e7a010" >
-                                            <attribute name="name" value="height" id="8025" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8026" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8024" addr="0x7fca469c8010" >
+                                            <attribute name="name" value="height" id="8025" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8026" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_5" id="8027" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="8028" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_5" id="8027" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="8028" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <cdecl id="8029" addr="0x7f99f1e7a370" >
-                            <attributelist id="8030" addr="0x7f99f1e7a370" >
-                                <attribute name="name" value="setPercent" id="8031" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="8032" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e77d70" id="8033" addr="0x7f99f1e77d70" />
-                                <attribute name="kind" value="function" id="8034" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setPercent" id="8035" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(float)." id="8036" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="8037" addr="0x7f99f1de6c90" />
-                                <parmlist id="8038" addr="0x7f99f1e7a2b0" >
+                        <cdecl id="8029" addr="0x7fca469c8370" >
+                            <attributelist id="8030" addr="0x7fca469c8370" >
+                                <attribute name="name" value="setPercent" id="8031" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="8032" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c5d70" id="8033" addr="0x7fca469c5d70" />
+                                <attribute name="kind" value="function" id="8034" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setPercent" id="8035" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(float)." id="8036" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="8037" addr="0x7fca46934c90" />
+                                <parmlist id="8038" addr="0x7fca469c82b0" >
                                     <parm id="8039">
-                                        <attributelist id="8040" addr="0x7f99f1e7a2b0" >
-                                            <attribute name="name" value="pct" id="8041" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="float" id="8042" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8040" addr="0x7fca469c82b0" >
+                                            <attribute name="name" value="pct" id="8041" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="float" id="8042" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="8043" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="8044" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="8045" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="8043" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="8044" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="8045" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="8046" addr="0x7f99f1e7a570" >
-                            <attributelist id="8047" addr="0x7f99f1e7a570" >
-                                <attribute name="ismember" value="1" id="8048" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getPercent" id="8049" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="getPercent" id="8050" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="8051" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="8052" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="8053" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="8054" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="float" id="8055" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e77d70" id="8056" addr="0x7f99f1e77d70" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="8057" addr="0x7f99f1de6c90" />
+                        <cdecl id="8046" addr="0x7fca469c8570" >
+                            <attributelist id="8047" addr="0x7fca469c8570" >
+                                <attribute name="ismember" value="1" id="8048" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getPercent" id="8049" addr="0x7fca46934c90" />
+                                <attribute name="name" value="getPercent" id="8050" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="8051" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="8052" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="8053" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="8054" addr="0x7fca46934c90" />
+                                <attribute name="type" value="float" id="8055" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c5d70" id="8056" addr="0x7fca469c5d70" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="8057" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
                     </class >
-                    <class id="8058" addr="0x7f99f1e7a850" >
-                        <attributelist id="8059" addr="0x7f99f1e7a850" >
-                            <attribute name="name" value="XBMCAddon::xbmcgui::ControlButton" id="8060" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="8061" addr="0x7f99f1e40fb0" />
-                            <attribute name="symtab" value="0x7f99f1e7a990" id="8062" addr="0x7f99f1e7a990" />
-                            <attribute name="allows_typedef" value="1" id="8063" addr="0x7f99f1de6c90" />
-                            <attribute name="typepass_visit" value="1" id="8064" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_visit" value="1" id="8065" addr="0x7f99f1de6c90" />
-                            <attribute name="kind" value="class" id="8066" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_name" value="ControlButton" id="8067" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_has_constructor" value="1" id="8068" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_public_constructor" value="1" id="8069" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_copy_constructor" value="1" id="8070" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_default_destructor" value="1" id="8071" addr="0x7f99f1de6c90" />
-                            <attribute name="privatebaselist" value="0x7f99f1e7a830" id="8072" addr="0x7f99f1e7a830" />
-                            <attribute name="protectedbaselist" value="0x7f99f1e7a810" id="8073" addr="0x7f99f1e7a810" />
-                            <baselist id="8074" addr="0x7f99f1e7a7f0" >
-                                <base name="Control" id="8075" addr="0x7f99f1e7a770" />
+                    <class id="8058" addr="0x7fca469c8850" >
+                        <attributelist id="8059" addr="0x7fca469c8850" >
+                            <attribute name="name" value="XBMCAddon::xbmcgui::ControlButton" id="8060" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="8061" addr="0x7fca4698efb0" />
+                            <attribute name="symtab" value="0x7fca469c8990" id="8062" addr="0x7fca469c8990" />
+                            <attribute name="allows_typedef" value="1" id="8063" addr="0x7fca46934c90" />
+                            <attribute name="typepass_visit" value="1" id="8064" addr="0x7fca46934c90" />
+                            <attribute name="allocate_visit" value="1" id="8065" addr="0x7fca46934c90" />
+                            <attribute name="kind" value="class" id="8066" addr="0x7fca46934c90" />
+                            <attribute name="sym_name" value="ControlButton" id="8067" addr="0x7fca46934c90" />
+                            <attribute name="allocate_has_constructor" value="1" id="8068" addr="0x7fca46934c90" />
+                            <attribute name="allocate_public_constructor" value="1" id="8069" addr="0x7fca46934c90" />
+                            <attribute name="allocate_copy_constructor" value="1" id="8070" addr="0x7fca46934c90" />
+                            <attribute name="allocate_default_destructor" value="1" id="8071" addr="0x7fca46934c90" />
+                            <attribute name="privatebaselist" value="0x7fca469c8830" id="8072" addr="0x7fca469c8830" />
+                            <attribute name="protectedbaselist" value="0x7fca469c8810" id="8073" addr="0x7fca469c8810" />
+                            <baselist id="8074" addr="0x7fca469c87f0" >
+                                <base name="Control" id="8075" addr="0x7fca469c8770" />
                             </baselist >
-                            <attribute name="module" value="xbmcgui" id="8076" addr="0x7f99f1e402f0" />
-                            <attribute name="bases" value="0x7f99f1ddc5f0" id="8077" addr="0x7f99f1ddc5f0" />
-                            <attribute name="allbases" value="0x7f99f1ddc890" id="8078" addr="0x7f99f1ddc890" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="8079" addr="0x7f99f1de6c90" />
-                            <typescope id="8080" addr="0x7f99f1ddc570" >
-                                <attributelist id="8081" addr="0x7f99f1ddc570" >
-                                    <attribute name="inherit" value="0x7f99f1ddc670" id="8082" addr="0x7f99f1ddc670" />
-                                    <attribute name="name" value="ControlButton" id="8083" addr="0x7f99f1de6c90" />
-                                    <typetab id="8084" addr="0x7f99f1ddc590" >
-                                        <attributelist id="8085" addr="0x7f99f1ddc590" >
+                            <attribute name="module" value="xbmcgui" id="8076" addr="0x7fca4698e2f0" />
+                            <attribute name="bases" value="0x7fca4692a5f0" id="8077" addr="0x7fca4692a5f0" />
+                            <attribute name="allbases" value="0x7fca4692a890" id="8078" addr="0x7fca4692a890" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="8079" addr="0x7fca46934c90" />
+                            <typescope id="8080" addr="0x7fca4692a570" >
+                                <attributelist id="8081" addr="0x7fca4692a570" >
+                                    <attribute name="inherit" value="0x7fca4692a670" id="8082" addr="0x7fca4692a670" />
+                                    <attribute name="name" value="ControlButton" id="8083" addr="0x7fca46934c90" />
+                                    <typetab id="8084" addr="0x7fca4692a590" >
+                                        <attributelist id="8085" addr="0x7fca4692a590" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f99f1dd2150" id="8086" addr="0x7f99f1dd2150" />
-                                    <attribute name="qname" value="XBMCAddon::xbmcgui::ControlButton" id="8087" addr="0x7f99f1de6c90" />
-                                    <attribute name="symtab" value="0x7f99f1e7a990" id="8088" addr="0x7f99f1e7a990" />
+                                    <attribute name="parent" value="0x7fca46920150" id="8086" addr="0x7fca46920150" />
+                                    <attribute name="qname" value="XBMCAddon::xbmcgui::ControlButton" id="8087" addr="0x7fca46934c90" />
+                                    <attribute name="symtab" value="0x7fca469c8990" id="8088" addr="0x7fca469c8990" />
                                 </attributelist >
-                                <typescopesitem id="8089" addr="0x7f99f1ddc670" >
-                                    <attributelist id="8090" addr="0x7f99f1ddc670" >
+                                <typescopesitem id="8089" addr="0x7fca4692a670" >
+                                    <attributelist id="8090" addr="0x7fca4692a670" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="8091" addr="0x7f99f1ddc510" >
-                                    <attributelist id="8092" addr="0x7f99f1ddc510" >
+                                <typescopesitem id="8091" addr="0x7fca4692a510" >
+                                    <attributelist id="8092" addr="0x7fca4692a510" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="8093" addr="0x7f99f1ddc590" >
-                                    <attributelist id="8094" addr="0x7f99f1ddc590" >
+                                <typescopesitem id="8093" addr="0x7fca4692a590" >
+                                    <attributelist id="8094" addr="0x7fca4692a590" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="8095" addr="0x7f99f1dd2150" >
-                                    <attributelist id="8096" addr="0x7f99f1dd2150" >
-                                        <attribute name="name" value="xbmcgui" id="8097" addr="0x7f99f1de6c90" />
-                                        <typetab id="8098" addr="0x7f99f1dd2170" >
-                                            <attributelist id="8099" addr="0x7f99f1dd2170" >
-                                                <attribute name="InterceptorBase" value="InterceptorBase" id="8100" addr="0x7f99f1de6c90" />
-                                                <attribute name="Dialog" value="Dialog" id="8101" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="8102" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="8103" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlTextBox" value="ControlTextBox" id="8104" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="8105" addr="0x7f99f1de6c90" />
-                                                <attribute name="Window" value="Window" id="8106" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="8107" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlList" value="ControlList" id="8108" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="8109" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlImage" value="ControlImage" id="8110" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlButton" value="ControlButton" id="8111" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlGroup" value="ControlGroup" id="8112" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogBusy" value="DialogBusy" id="8113" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="8114" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSpin" value="ControlSpin" id="8115" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlEdit" value="ControlEdit" id="8116" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="8117" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="8118" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlLabel" value="ControlLabel" id="8119" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlProgress" value="ControlProgress" id="8120" addr="0x7f99f1de6c90" />
-                                                <attribute name="Control" value="Control" id="8121" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSlider" value="ControlSlider" id="8122" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgress" value="DialogProgress" id="8123" addr="0x7f99f1de6c90" />
-                                                <attribute name="Action" value="Action" id="8124" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowDialog" value="WindowDialog" id="8125" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXML" value="WindowXML" id="8126" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItem" value="ListItem" id="8127" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="8128" addr="0x7f99f1de6c90" />
+                                <typescopesitem id="8095" addr="0x7fca46920150" >
+                                    <attributelist id="8096" addr="0x7fca46920150" >
+                                        <attribute name="name" value="xbmcgui" id="8097" addr="0x7fca46934c90" />
+                                        <typetab id="8098" addr="0x7fca46920170" >
+                                            <attributelist id="8099" addr="0x7fca46920170" >
+                                                <attribute name="InterceptorBase" value="InterceptorBase" id="8100" addr="0x7fca46934c90" />
+                                                <attribute name="Dialog" value="Dialog" id="8101" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="8102" addr="0x7fca46934c90" />
+                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="8103" addr="0x7fca46934c90" />
+                                                <attribute name="ControlTextBox" value="ControlTextBox" id="8104" addr="0x7fca46934c90" />
+                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="8105" addr="0x7fca46934c90" />
+                                                <attribute name="Window" value="Window" id="8106" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="8107" addr="0x7fca46934c90" />
+                                                <attribute name="ControlList" value="ControlList" id="8108" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="8109" addr="0x7fca46934c90" />
+                                                <attribute name="ControlImage" value="ControlImage" id="8110" addr="0x7fca46934c90" />
+                                                <attribute name="ControlButton" value="ControlButton" id="8111" addr="0x7fca46934c90" />
+                                                <attribute name="ControlGroup" value="ControlGroup" id="8112" addr="0x7fca46934c90" />
+                                                <attribute name="DialogBusy" value="DialogBusy" id="8113" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="8114" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSpin" value="ControlSpin" id="8115" addr="0x7fca46934c90" />
+                                                <attribute name="ControlEdit" value="ControlEdit" id="8116" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="8117" addr="0x7fca46934c90" />
+                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="8118" addr="0x7fca46934c90" />
+                                                <attribute name="ControlLabel" value="ControlLabel" id="8119" addr="0x7fca46934c90" />
+                                                <attribute name="ControlProgress" value="ControlProgress" id="8120" addr="0x7fca46934c90" />
+                                                <attribute name="Control" value="Control" id="8121" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSlider" value="ControlSlider" id="8122" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgress" value="DialogProgress" id="8123" addr="0x7fca46934c90" />
+                                                <attribute name="Action" value="Action" id="8124" addr="0x7fca46934c90" />
+                                                <attribute name="WindowDialog" value="WindowDialog" id="8125" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXML" value="WindowXML" id="8126" addr="0x7fca46934c90" />
+                                                <attribute name="ListItem" value="ListItem" id="8127" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="8128" addr="0x7fca46934c90" />
                                             </attributelist >
-                                            <typetabsitem id="8129" addr="0x7f99f1de1dd0" >
-                                                <attributelist id="8130" addr="0x7f99f1de1dd0" >
+                                            <typetabsitem id="8129" addr="0x7fca4692fdd0" >
+                                                <attributelist id="8130" addr="0x7fca4692fdd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="8131" addr="0x7f99f1dde790" >
-                                                <attributelist id="8132" addr="0x7f99f1dde790" >
+                                            <typetabsitem id="8131" addr="0x7fca4692c790" >
+                                                <attributelist id="8132" addr="0x7fca4692c790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="8133" addr="0x7f99f1de3f10" >
-                                                <attributelist id="8134" addr="0x7f99f1de3f10" >
+                                            <typetabsitem id="8133" addr="0x7fca46931f10" >
+                                                <attributelist id="8134" addr="0x7fca46931f10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="8135" addr="0x7f99f1dd67b0" >
-                                                <attributelist id="8136" addr="0x7f99f1dd67b0" >
+                                            <typetabsitem id="8135" addr="0x7fca469247b0" >
+                                                <attributelist id="8136" addr="0x7fca469247b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="8137" addr="0x7f99f1ddafd0" >
-                                                <attributelist id="8138" addr="0x7f99f1ddafd0" >
+                                            <typetabsitem id="8137" addr="0x7fca46928fd0" >
+                                                <attributelist id="8138" addr="0x7fca46928fd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="8139" addr="0x7f99f1ddd430" >
-                                                <attributelist id="8140" addr="0x7f99f1ddd430" >
+                                            <typetabsitem id="8139" addr="0x7fca4692b430" >
+                                                <attributelist id="8140" addr="0x7fca4692b430" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="8141" addr="0x7f99f1de2130" >
-                                                <attributelist id="8142" addr="0x7f99f1de2130" >
+                                            <typetabsitem id="8141" addr="0x7fca46930130" >
+                                                <attributelist id="8142" addr="0x7fca46930130" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="8143" addr="0x7f99f1dd2f50" >
-                                                <attributelist id="8144" addr="0x7f99f1dd2f50" >
+                                            <typetabsitem id="8143" addr="0x7fca46920f50" >
+                                                <attributelist id="8144" addr="0x7fca46920f50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="8145" addr="0x7f99f1dd9650" >
-                                                <attributelist id="8146" addr="0x7f99f1dd9650" >
+                                            <typetabsitem id="8145" addr="0x7fca46927650" >
+                                                <attributelist id="8146" addr="0x7fca46927650" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="8147" addr="0x7f99f1de3390" >
-                                                <attributelist id="8148" addr="0x7f99f1de3390" >
+                                            <typetabsitem id="8147" addr="0x7fca46931390" >
+                                                <attributelist id="8148" addr="0x7fca46931390" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="8149" addr="0x7f99f1ddb7b0" >
-                                                <attributelist id="8150" addr="0x7f99f1ddb7b0" >
+                                            <typetabsitem id="8149" addr="0x7fca469297b0" >
+                                                <attributelist id="8150" addr="0x7fca469297b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="8151" addr="0x7f99f1ddc4b0" >
-                                                <attributelist id="8152" addr="0x7f99f1ddc4b0" >
+                                            <typetabsitem id="8151" addr="0x7fca4692a4b0" >
+                                                <attributelist id="8152" addr="0x7fca4692a4b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="8153" addr="0x7f99f1ddcf90" >
-                                                <attributelist id="8154" addr="0x7f99f1ddcf90" >
+                                            <typetabsitem id="8153" addr="0x7fca4692af90" >
+                                                <attributelist id="8154" addr="0x7fca4692af90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="8155" addr="0x7f99f1de11b0" >
-                                                <attributelist id="8156" addr="0x7f99f1de11b0" >
+                                            <typetabsitem id="8155" addr="0x7fca4692f1b0" >
+                                                <attributelist id="8156" addr="0x7fca4692f1b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="8157" addr="0x7f99f1de15b0" >
-                                                <attributelist id="8158" addr="0x7f99f1de15b0" >
+                                            <typetabsitem id="8157" addr="0x7fca4692f5b0" >
+                                                <attributelist id="8158" addr="0x7fca4692f5b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="8159" addr="0x7f99f1dd77f0" >
-                                                <attributelist id="8160" addr="0x7f99f1dd77f0" >
+                                            <typetabsitem id="8159" addr="0x7fca469257f0" >
+                                                <attributelist id="8160" addr="0x7fca469257f0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="8161" addr="0x7f99f1dd8b30" >
-                                                <attributelist id="8162" addr="0x7f99f1dd8b30" >
+                                            <typetabsitem id="8161" addr="0x7fca46926b30" >
+                                                <attributelist id="8162" addr="0x7fca46926b30" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="8163" addr="0x7f99f1dd2c50" >
-                                                <attributelist id="8164" addr="0x7f99f1dd2c50" >
+                                            <typetabsitem id="8163" addr="0x7fca46920c50" >
+                                                <attributelist id="8164" addr="0x7fca46920c50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="8165" addr="0x7f99f1dda790" >
-                                                <attributelist id="8166" addr="0x7f99f1dda790" >
+                                            <typetabsitem id="8165" addr="0x7fca46928790" >
+                                                <attributelist id="8166" addr="0x7fca46928790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="8167" addr="0x7f99f1dd8030" >
-                                                <attributelist id="8168" addr="0x7f99f1dd8030" >
+                                            <typetabsitem id="8167" addr="0x7fca46926030" >
+                                                <attributelist id="8168" addr="0x7fca46926030" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="8169" addr="0x7f99f1ddbe10" >
-                                                <attributelist id="8170" addr="0x7f99f1ddbe10" >
+                                            <typetabsitem id="8169" addr="0x7fca46929e10" >
+                                                <attributelist id="8170" addr="0x7fca46929e10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="8171" addr="0x7f99f1dd6b10" >
-                                                <attributelist id="8172" addr="0x7f99f1dd6b10" >
+                                            <typetabsitem id="8171" addr="0x7fca46924b10" >
+                                                <attributelist id="8172" addr="0x7fca46924b10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="8173" addr="0x7f99f1dddf90" >
-                                                <attributelist id="8174" addr="0x7f99f1dddf90" >
+                                            <typetabsitem id="8173" addr="0x7fca4692bf90" >
+                                                <attributelist id="8174" addr="0x7fca4692bf90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="8175" addr="0x7f99f1de0530" >
-                                                <attributelist id="8176" addr="0x7f99f1de0530" >
+                                            <typetabsitem id="8175" addr="0x7fca4692e530" >
+                                                <attributelist id="8176" addr="0x7fca4692e530" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="8177" addr="0x7f99f1de1e50" >
-                                                <attributelist id="8178" addr="0x7f99f1de1e50" >
+                                            <typetabsitem id="8177" addr="0x7fca4692fe50" >
+                                                <attributelist id="8178" addr="0x7fca4692fe50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="8179" addr="0x7f99f1de2d90" >
-                                                <attributelist id="8180" addr="0x7f99f1de2d90" >
+                                            <typetabsitem id="8179" addr="0x7fca46930d90" >
+                                                <attributelist id="8180" addr="0x7fca46930d90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="8181" addr="0x7f99f1de3410" >
-                                                <attributelist id="8182" addr="0x7f99f1de3410" >
+                                            <typetabsitem id="8181" addr="0x7fca46931410" >
+                                                <attributelist id="8182" addr="0x7fca46931410" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="8183" addr="0x7f99f1dd3590" >
-                                                <attributelist id="8184" addr="0x7f99f1dd3590" >
+                                            <typetabsitem id="8183" addr="0x7fca46921590" >
+                                                <attributelist id="8184" addr="0x7fca46921590" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="8185" addr="0x7f99f1dd3390" >
-                                                <attributelist id="8186" addr="0x7f99f1dd3390" >
+                                            <typetabsitem id="8185" addr="0x7fca46921390" >
+                                                <attributelist id="8186" addr="0x7fca46921390" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7f99f1dd1d70" id="8187" addr="0x7f99f1dd1d70" />
-                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="8188" addr="0x7f99f1de6c90" />
-                                        <attribute name="symtab" value="0x7f99f1e40fb0" id="8189" addr="0x7f99f1e40fb0" />
+                                        <attribute name="parent" value="0x7fca4691fd70" id="8187" addr="0x7fca4691fd70" />
+                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="8188" addr="0x7fca46934c90" />
+                                        <attribute name="symtab" value="0x7fca4698efb0" id="8189" addr="0x7fca4698efb0" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="8190" addr="0x7f99f1ddc5b0" >
-                                    <attributelist id="8191" addr="0x7f99f1ddc5b0" >
+                                <typescopesitem id="8190" addr="0x7fca4692a5b0" >
+                                    <attributelist id="8191" addr="0x7fca4692a5b0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="8192" addr="0x7f99f1e7a990" >
-                                    <attributelist id="8193" addr="0x7f99f1e7a990" >
-                                        <attribute name="inherit" value="0x7f99f1e7a9f0" id="8194" addr="0x7f99f1e7a9f0" />
-                                        <attribute name="name" value="ControlButton" id="8195" addr="0x7f99f1de6c90" />
-                                        <attribute name="csymtab" value="0x7f99f1e7a9b0" id="8196" addr="0x7f99f1e7a9b0" />
-                                        <attribute name="symtab" value="0x7f99f1e7a970" id="8197" addr="0x7f99f1e7a970" />
+                                <typescopesitem id="8192" addr="0x7fca469c8990" >
+                                    <attributelist id="8193" addr="0x7fca469c8990" >
+                                        <attribute name="inherit" value="0x7fca469c89f0" id="8194" addr="0x7fca469c89f0" />
+                                        <attribute name="name" value="ControlButton" id="8195" addr="0x7fca46934c90" />
+                                        <attribute name="csymtab" value="0x7fca469c89b0" id="8196" addr="0x7fca469c89b0" />
+                                        <attribute name="symtab" value="0x7fca469c8970" id="8197" addr="0x7fca469c8970" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <access id="8198" addr="0x7f99f1e7a910" >
-                            <attributelist id="8199" addr="0x7f99f1e7a910" >
-                                <attribute name="kind" value="public" id="8200" addr="0x7f99f1de6c90" />
+                        <access id="8198" addr="0x7fca469c8910" >
+                            <attributelist id="8199" addr="0x7fca469c8910" >
+                                <attribute name="kind" value="public" id="8200" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="8201" addr="0x7f99f1e7c250" >
-                            <attributelist id="8202" addr="0x7f99f1e7c250" >
-                                <attribute name="name" value="ControlButton" id="8203" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="8204" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e7a990" id="8205" addr="0x7f99f1e7a990" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e7cc10" id="8206" addr="0x7f99f1e7cc10" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e7cc10" id="8207" addr="0x7f99f1e7cc10" />
-                                <attribute name="sym_name" value="ControlButton" id="8208" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,long,p.q(const).char,p.q(const).char)." id="8209" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="8210" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e7c250" id="8211" addr="0x7f99f1e7c250" />
-                                <parmlist id="8212" addr="0x7f99f1e7ab50" >
+                        <constructor id="8201" addr="0x7fca469ca250" >
+                            <attributelist id="8202" addr="0x7fca469ca250" >
+                                <attribute name="name" value="ControlButton" id="8203" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="8204" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c8990" id="8205" addr="0x7fca469c8990" />
+                                <attribute name="sym_nextSibling" value="0x7fca469cac10" id="8206" addr="0x7fca469cac10" />
+                                <attribute name="csym_nextSibling" value="0x7fca469cac10" id="8207" addr="0x7fca469cac10" />
+                                <attribute name="sym_name" value="ControlButton" id="8208" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,long,p.q(const).char,p.q(const).char)." id="8209" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="8210" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469ca250" id="8211" addr="0x7fca469ca250" />
+                                <parmlist id="8212" addr="0x7fca469c8b50" >
                                     <parm id="8213">
-                                        <attributelist id="8214" addr="0x7f99f1e7ab50" >
-                                            <attribute name="name" value="x" id="8215" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8216" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8214" addr="0x7fca469c8b50" >
+                                            <attribute name="name" value="x" id="8215" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8216" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8217">
-                                        <attributelist id="8218" addr="0x7f99f1e7ac70" >
-                                            <attribute name="name" value="y" id="8219" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8220" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8218" addr="0x7fca469c8c70" >
+                                            <attribute name="name" value="y" id="8219" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8220" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8221">
-                                        <attributelist id="8222" addr="0x7f99f1e7ad90" >
-                                            <attribute name="name" value="width" id="8223" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8224" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8222" addr="0x7fca469c8d90" >
+                                            <attribute name="name" value="width" id="8223" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8224" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8225">
-                                        <attributelist id="8226" addr="0x7f99f1e7aeb0" >
-                                            <attribute name="name" value="height" id="8227" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8228" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8226" addr="0x7fca469c8eb0" >
+                                            <attribute name="name" value="height" id="8227" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8228" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8229">
-                                        <attributelist id="8230" addr="0x7f99f1e7aff0" >
-                                            <attribute name="name" value="label" id="8231" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="8232" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8230" addr="0x7fca469c8ff0" >
+                                            <attribute name="name" value="label" id="8231" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="8232" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8233">
-                                        <attributelist id="8234" addr="0x7f99f1e7b190" >
-                                            <attribute name="name" value="focusTexture" id="8235" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8236" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8237" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8234" addr="0x7fca469c9190" >
+                                            <attribute name="name" value="focusTexture" id="8235" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8236" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8237" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8238">
-                                        <attributelist id="8239" addr="0x7f99f1e7b330" >
-                                            <attribute name="name" value="noFocusTexture" id="8240" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8241" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8242" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8239" addr="0x7fca469c9330" >
+                                            <attribute name="name" value="noFocusTexture" id="8240" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8241" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8242" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8243">
-                                        <attributelist id="8244" addr="0x7f99f1e7b490" >
-                                            <attribute name="name" value="textOffsetX" id="8245" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="8246" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8247" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8244" addr="0x7fca469c9490" >
+                                            <attribute name="name" value="textOffsetX" id="8245" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="8246" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8247" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8248">
-                                        <attributelist id="8249" addr="0x7f99f1e7b5f0" >
-                                            <attribute name="name" value="textOffsetY" id="8250" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="2" id="8251" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8252" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8249" addr="0x7fca469c95f0" >
+                                            <attribute name="name" value="textOffsetY" id="8250" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="2" id="8251" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8252" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8253">
-                                        <attributelist id="8254" addr="0x7f99f1e7b810" >
-                                            <attribute name="name" value="alignment" id="8255" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="(XBFONT_LEFT|XBFONT_CENTER_Y)" id="8256" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8257" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8254" addr="0x7fca469c9810" >
+                                            <attribute name="name" value="alignment" id="8255" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="(XBFONT_LEFT|XBFONT_CENTER_Y)" id="8256" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8257" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8258">
-                                        <attributelist id="8259" addr="0x7f99f1e7b9b0" >
-                                            <attribute name="name" value="font" id="8260" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8261" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8262" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8259" addr="0x7fca469c99b0" >
+                                            <attribute name="name" value="font" id="8260" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8261" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8262" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8263">
-                                        <attributelist id="8264" addr="0x7f99f1e7bb50" >
-                                            <attribute name="name" value="textColor" id="8265" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8266" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8267" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8264" addr="0x7fca469c9b50" >
+                                            <attribute name="name" value="textColor" id="8265" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8266" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8267" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8268">
-                                        <attributelist id="8269" addr="0x7f99f1e7bcf0" >
-                                            <attribute name="name" value="disabledColor" id="8270" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8271" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8272" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8269" addr="0x7fca469c9cf0" >
+                                            <attribute name="name" value="disabledColor" id="8270" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8271" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8272" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8273">
-                                        <attributelist id="8274" addr="0x7f99f1e7be50" >
-                                            <attribute name="name" value="angle" id="8275" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="0" id="8276" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8277" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8274" addr="0x7fca469c9e50" >
+                                            <attribute name="name" value="angle" id="8275" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="0" id="8276" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8277" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8278">
-                                        <attributelist id="8279" addr="0x7f99f1e7bff0" >
-                                            <attribute name="name" value="shadowColor" id="8280" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8281" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8282" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8279" addr="0x7fca469c9ff0" >
+                                            <attribute name="name" value="shadowColor" id="8280" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8281" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8282" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8283">
-                                        <attributelist id="8284" addr="0x7f99f1e7c190" >
-                                            <attribute name="name" value="focusedColor" id="8285" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8286" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8287" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8284" addr="0x7fca469ca190" >
+                                            <attribute name="name" value="focusedColor" id="8285" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8286" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8287" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_0" id="8288" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="8289" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="8288" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="8289" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="8290" addr="0x7f99f1e7cc10" >
-                            <attributelist id="8291" addr="0x7f99f1e7cc10" >
-                                <attribute name="name" value="ControlButton" id="8292" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="8293" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e7a990" id="8294" addr="0x7f99f1e7a990" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e7d530" id="8295" addr="0x7f99f1e7d530" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e7c250" id="8296" addr="0x7f99f1e7c250" />
-                                <attribute name="sym_name" value="ControlButton" id="8297" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e7d530" id="8298" addr="0x7f99f1e7d530" />
-                                <attribute name="defaultargs" value="0x7f99f1e7c250" id="8299" addr="0x7f99f1e7c250" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,long,p.q(const).char)." id="8300" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="8301" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e7c250" id="8302" addr="0x7f99f1e7c250" />
-                                <parmlist id="8303" addr="0x7f99f1e7c2f0" >
+                        <constructor id="8290" addr="0x7fca469cac10" >
+                            <attributelist id="8291" addr="0x7fca469cac10" >
+                                <attribute name="name" value="ControlButton" id="8292" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="8293" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c8990" id="8294" addr="0x7fca469c8990" />
+                                <attribute name="csym_nextSibling" value="0x7fca469cb530" id="8295" addr="0x7fca469cb530" />
+                                <attribute name="sym_previousSibling" value="0x7fca469ca250" id="8296" addr="0x7fca469ca250" />
+                                <attribute name="sym_name" value="ControlButton" id="8297" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469cb530" id="8298" addr="0x7fca469cb530" />
+                                <attribute name="defaultargs" value="0x7fca469ca250" id="8299" addr="0x7fca469ca250" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,long,p.q(const).char)." id="8300" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="8301" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469ca250" id="8302" addr="0x7fca469ca250" />
+                                <parmlist id="8303" addr="0x7fca469ca2f0" >
                                     <parm id="8304">
-                                        <attributelist id="8305" addr="0x7f99f1e7c2f0" >
-                                            <attribute name="name" value="x" id="8306" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8307" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8305" addr="0x7fca469ca2f0" >
+                                            <attribute name="name" value="x" id="8306" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8307" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8308">
-                                        <attributelist id="8309" addr="0x7f99f1e7c3b0" >
-                                            <attribute name="name" value="y" id="8310" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8311" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8309" addr="0x7fca469ca3b0" >
+                                            <attribute name="name" value="y" id="8310" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8311" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8312">
-                                        <attributelist id="8313" addr="0x7f99f1e7c430" >
-                                            <attribute name="name" value="width" id="8314" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8315" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8313" addr="0x7fca469ca430" >
+                                            <attribute name="name" value="width" id="8314" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8315" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8316">
-                                        <attributelist id="8317" addr="0x7f99f1e7c4b0" >
-                                            <attribute name="name" value="height" id="8318" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8319" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8317" addr="0x7fca469ca4b0" >
+                                            <attribute name="name" value="height" id="8318" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8319" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8320">
-                                        <attributelist id="8321" addr="0x7f99f1e7c530" >
-                                            <attribute name="name" value="label" id="8322" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="8323" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8321" addr="0x7fca469ca530" >
+                                            <attribute name="name" value="label" id="8322" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="8323" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8324">
-                                        <attributelist id="8325" addr="0x7f99f1e7c5b0" >
-                                            <attribute name="name" value="focusTexture" id="8326" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8327" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8328" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8325" addr="0x7fca469ca5b0" >
+                                            <attribute name="name" value="focusTexture" id="8326" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8327" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8328" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8329">
-                                        <attributelist id="8330" addr="0x7f99f1e7c650" >
-                                            <attribute name="name" value="noFocusTexture" id="8331" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8332" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8333" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8330" addr="0x7fca469ca650" >
+                                            <attribute name="name" value="noFocusTexture" id="8331" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8332" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8333" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8334">
-                                        <attributelist id="8335" addr="0x7f99f1e7c6f0" >
-                                            <attribute name="name" value="textOffsetX" id="8336" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="8337" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8338" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8335" addr="0x7fca469ca6f0" >
+                                            <attribute name="name" value="textOffsetX" id="8336" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="8337" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8338" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8339">
-                                        <attributelist id="8340" addr="0x7f99f1e7c790" >
-                                            <attribute name="name" value="textOffsetY" id="8341" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="2" id="8342" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8343" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8340" addr="0x7fca469ca790" >
+                                            <attribute name="name" value="textOffsetY" id="8341" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="2" id="8342" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8343" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8344">
-                                        <attributelist id="8345" addr="0x7f99f1e7c830" >
-                                            <attribute name="name" value="alignment" id="8346" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="(XBFONT_LEFT|XBFONT_CENTER_Y)" id="8347" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8348" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8345" addr="0x7fca469ca830" >
+                                            <attribute name="name" value="alignment" id="8346" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="(XBFONT_LEFT|XBFONT_CENTER_Y)" id="8347" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8348" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8349">
-                                        <attributelist id="8350" addr="0x7f99f1e7c8d0" >
-                                            <attribute name="name" value="font" id="8351" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8352" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8353" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8350" addr="0x7fca469ca8d0" >
+                                            <attribute name="name" value="font" id="8351" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8352" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8353" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8354">
-                                        <attributelist id="8355" addr="0x7f99f1e7c970" >
-                                            <attribute name="name" value="textColor" id="8356" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8357" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8358" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8355" addr="0x7fca469ca970" >
+                                            <attribute name="name" value="textColor" id="8356" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8357" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8358" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8359">
-                                        <attributelist id="8360" addr="0x7f99f1e7ca10" >
-                                            <attribute name="name" value="disabledColor" id="8361" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8362" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8363" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8360" addr="0x7fca469caa10" >
+                                            <attribute name="name" value="disabledColor" id="8361" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8362" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8363" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8364">
-                                        <attributelist id="8365" addr="0x7f99f1e7cab0" >
-                                            <attribute name="name" value="angle" id="8366" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="0" id="8367" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8368" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8365" addr="0x7fca469caab0" >
+                                            <attribute name="name" value="angle" id="8366" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="0" id="8367" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8368" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8369">
-                                        <attributelist id="8370" addr="0x7f99f1e7cb50" >
-                                            <attribute name="name" value="shadowColor" id="8371" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8372" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8373" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8370" addr="0x7fca469cab50" >
+                                            <attribute name="name" value="shadowColor" id="8371" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8372" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8373" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_1" id="8374" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="8375" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="8374" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="8375" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="8376" addr="0x7f99f1e7d530" >
-                            <attributelist id="8377" addr="0x7f99f1e7d530" >
-                                <attribute name="name" value="ControlButton" id="8378" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="8379" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e7a990" id="8380" addr="0x7f99f1e7a990" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e7ddb0" id="8381" addr="0x7f99f1e7ddb0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e7cc10" id="8382" addr="0x7f99f1e7cc10" />
-                                <attribute name="sym_name" value="ControlButton" id="8383" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e7ddb0" id="8384" addr="0x7f99f1e7ddb0" />
-                                <attribute name="defaultargs" value="0x7f99f1e7c250" id="8385" addr="0x7f99f1e7c250" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,long)." id="8386" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="8387" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e7c250" id="8388" addr="0x7f99f1e7c250" />
-                                <parmlist id="8389" addr="0x7f99f1e7ccb0" >
+                        <constructor id="8376" addr="0x7fca469cb530" >
+                            <attributelist id="8377" addr="0x7fca469cb530" >
+                                <attribute name="name" value="ControlButton" id="8378" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="8379" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c8990" id="8380" addr="0x7fca469c8990" />
+                                <attribute name="csym_nextSibling" value="0x7fca469cbdb0" id="8381" addr="0x7fca469cbdb0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469cac10" id="8382" addr="0x7fca469cac10" />
+                                <attribute name="sym_name" value="ControlButton" id="8383" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469cbdb0" id="8384" addr="0x7fca469cbdb0" />
+                                <attribute name="defaultargs" value="0x7fca469ca250" id="8385" addr="0x7fca469ca250" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,long)." id="8386" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="8387" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469ca250" id="8388" addr="0x7fca469ca250" />
+                                <parmlist id="8389" addr="0x7fca469cacb0" >
                                     <parm id="8390">
-                                        <attributelist id="8391" addr="0x7f99f1e7ccb0" >
-                                            <attribute name="name" value="x" id="8392" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8393" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8391" addr="0x7fca469cacb0" >
+                                            <attribute name="name" value="x" id="8392" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8393" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8394">
-                                        <attributelist id="8395" addr="0x7f99f1e7cd70" >
-                                            <attribute name="name" value="y" id="8396" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8397" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8395" addr="0x7fca469cad70" >
+                                            <attribute name="name" value="y" id="8396" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8397" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8398">
-                                        <attributelist id="8399" addr="0x7f99f1e7cdf0" >
-                                            <attribute name="name" value="width" id="8400" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8401" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8399" addr="0x7fca469cadf0" >
+                                            <attribute name="name" value="width" id="8400" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8401" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8402">
-                                        <attributelist id="8403" addr="0x7f99f1e7ce70" >
-                                            <attribute name="name" value="height" id="8404" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8405" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8403" addr="0x7fca469cae70" >
+                                            <attribute name="name" value="height" id="8404" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8405" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8406">
-                                        <attributelist id="8407" addr="0x7f99f1e7cef0" >
-                                            <attribute name="name" value="label" id="8408" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="8409" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8407" addr="0x7fca469caef0" >
+                                            <attribute name="name" value="label" id="8408" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="8409" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8410">
-                                        <attributelist id="8411" addr="0x7f99f1e7cf70" >
-                                            <attribute name="name" value="focusTexture" id="8412" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8413" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8414" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8411" addr="0x7fca469caf70" >
+                                            <attribute name="name" value="focusTexture" id="8412" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8413" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8414" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8415">
-                                        <attributelist id="8416" addr="0x7f99f1e7d010" >
-                                            <attribute name="name" value="noFocusTexture" id="8417" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8418" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8419" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8416" addr="0x7fca469cb010" >
+                                            <attribute name="name" value="noFocusTexture" id="8417" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8418" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8419" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8420">
-                                        <attributelist id="8421" addr="0x7f99f1e7d0b0" >
-                                            <attribute name="name" value="textOffsetX" id="8422" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="8423" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8424" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8421" addr="0x7fca469cb0b0" >
+                                            <attribute name="name" value="textOffsetX" id="8422" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="8423" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8424" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8425">
-                                        <attributelist id="8426" addr="0x7f99f1e7d150" >
-                                            <attribute name="name" value="textOffsetY" id="8427" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="2" id="8428" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8429" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8426" addr="0x7fca469cb150" >
+                                            <attribute name="name" value="textOffsetY" id="8427" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="2" id="8428" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8429" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8430">
-                                        <attributelist id="8431" addr="0x7f99f1e7d1f0" >
-                                            <attribute name="name" value="alignment" id="8432" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="(XBFONT_LEFT|XBFONT_CENTER_Y)" id="8433" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8434" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8431" addr="0x7fca469cb1f0" >
+                                            <attribute name="name" value="alignment" id="8432" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="(XBFONT_LEFT|XBFONT_CENTER_Y)" id="8433" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8434" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8435">
-                                        <attributelist id="8436" addr="0x7f99f1e7d290" >
-                                            <attribute name="name" value="font" id="8437" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8438" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8439" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8436" addr="0x7fca469cb290" >
+                                            <attribute name="name" value="font" id="8437" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8438" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8439" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8440">
-                                        <attributelist id="8441" addr="0x7f99f1e7d330" >
-                                            <attribute name="name" value="textColor" id="8442" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8443" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8444" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8441" addr="0x7fca469cb330" >
+                                            <attribute name="name" value="textColor" id="8442" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8443" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8444" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8445">
-                                        <attributelist id="8446" addr="0x7f99f1e7d3d0" >
-                                            <attribute name="name" value="disabledColor" id="8447" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8448" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8449" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8446" addr="0x7fca469cb3d0" >
+                                            <attribute name="name" value="disabledColor" id="8447" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8448" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8449" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8450">
-                                        <attributelist id="8451" addr="0x7f99f1e7d470" >
-                                            <attribute name="name" value="angle" id="8452" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="0" id="8453" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8454" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8451" addr="0x7fca469cb470" >
+                                            <attribute name="name" value="angle" id="8452" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="0" id="8453" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8454" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_2" id="8455" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="8456" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_2" id="8455" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="8456" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="8457" addr="0x7f99f1e7ddb0" >
-                            <attributelist id="8458" addr="0x7f99f1e7ddb0" >
-                                <attribute name="name" value="ControlButton" id="8459" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="8460" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e7a990" id="8461" addr="0x7f99f1e7a990" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e7e590" id="8462" addr="0x7f99f1e7e590" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e7d530" id="8463" addr="0x7f99f1e7d530" />
-                                <attribute name="sym_name" value="ControlButton" id="8464" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e7e590" id="8465" addr="0x7f99f1e7e590" />
-                                <attribute name="defaultargs" value="0x7f99f1e7c250" id="8466" addr="0x7f99f1e7c250" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char)." id="8467" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="8468" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e7c250" id="8469" addr="0x7f99f1e7c250" />
-                                <parmlist id="8470" addr="0x7f99f1e7d5d0" >
+                        <constructor id="8457" addr="0x7fca469cbdb0" >
+                            <attributelist id="8458" addr="0x7fca469cbdb0" >
+                                <attribute name="name" value="ControlButton" id="8459" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="8460" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c8990" id="8461" addr="0x7fca469c8990" />
+                                <attribute name="csym_nextSibling" value="0x7fca469cc590" id="8462" addr="0x7fca469cc590" />
+                                <attribute name="sym_previousSibling" value="0x7fca469cb530" id="8463" addr="0x7fca469cb530" />
+                                <attribute name="sym_name" value="ControlButton" id="8464" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469cc590" id="8465" addr="0x7fca469cc590" />
+                                <attribute name="defaultargs" value="0x7fca469ca250" id="8466" addr="0x7fca469ca250" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char)." id="8467" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="8468" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469ca250" id="8469" addr="0x7fca469ca250" />
+                                <parmlist id="8470" addr="0x7fca469cb5d0" >
                                     <parm id="8471">
-                                        <attributelist id="8472" addr="0x7f99f1e7d5d0" >
-                                            <attribute name="name" value="x" id="8473" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8474" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8472" addr="0x7fca469cb5d0" >
+                                            <attribute name="name" value="x" id="8473" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8474" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8475">
-                                        <attributelist id="8476" addr="0x7f99f1e7d690" >
-                                            <attribute name="name" value="y" id="8477" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8478" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8476" addr="0x7fca469cb690" >
+                                            <attribute name="name" value="y" id="8477" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8478" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8479">
-                                        <attributelist id="8480" addr="0x7f99f1e7d710" >
-                                            <attribute name="name" value="width" id="8481" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8482" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8480" addr="0x7fca469cb710" >
+                                            <attribute name="name" value="width" id="8481" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8482" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8483">
-                                        <attributelist id="8484" addr="0x7f99f1e7d790" >
-                                            <attribute name="name" value="height" id="8485" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8486" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8484" addr="0x7fca469cb790" >
+                                            <attribute name="name" value="height" id="8485" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8486" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8487">
-                                        <attributelist id="8488" addr="0x7f99f1e7d810" >
-                                            <attribute name="name" value="label" id="8489" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="8490" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8488" addr="0x7fca469cb810" >
+                                            <attribute name="name" value="label" id="8489" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="8490" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8491">
-                                        <attributelist id="8492" addr="0x7f99f1e7d890" >
-                                            <attribute name="name" value="focusTexture" id="8493" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8494" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8495" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8492" addr="0x7fca469cb890" >
+                                            <attribute name="name" value="focusTexture" id="8493" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8494" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8495" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8496">
-                                        <attributelist id="8497" addr="0x7f99f1e7d930" >
-                                            <attribute name="name" value="noFocusTexture" id="8498" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8499" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8500" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8497" addr="0x7fca469cb930" >
+                                            <attribute name="name" value="noFocusTexture" id="8498" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8499" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8500" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8501">
-                                        <attributelist id="8502" addr="0x7f99f1e7d9d0" >
-                                            <attribute name="name" value="textOffsetX" id="8503" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="8504" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8505" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8502" addr="0x7fca469cb9d0" >
+                                            <attribute name="name" value="textOffsetX" id="8503" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="8504" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8505" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8506">
-                                        <attributelist id="8507" addr="0x7f99f1e7da70" >
-                                            <attribute name="name" value="textOffsetY" id="8508" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="2" id="8509" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8510" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8507" addr="0x7fca469cba70" >
+                                            <attribute name="name" value="textOffsetY" id="8508" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="2" id="8509" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8510" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8511">
-                                        <attributelist id="8512" addr="0x7f99f1e7db10" >
-                                            <attribute name="name" value="alignment" id="8513" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="(XBFONT_LEFT|XBFONT_CENTER_Y)" id="8514" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8515" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8512" addr="0x7fca469cbb10" >
+                                            <attribute name="name" value="alignment" id="8513" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="(XBFONT_LEFT|XBFONT_CENTER_Y)" id="8514" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8515" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8516">
-                                        <attributelist id="8517" addr="0x7f99f1e7dbb0" >
-                                            <attribute name="name" value="font" id="8518" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8519" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8520" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8517" addr="0x7fca469cbbb0" >
+                                            <attribute name="name" value="font" id="8518" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8519" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8520" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8521">
-                                        <attributelist id="8522" addr="0x7f99f1e7dc50" >
-                                            <attribute name="name" value="textColor" id="8523" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8524" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8525" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8522" addr="0x7fca469cbc50" >
+                                            <attribute name="name" value="textColor" id="8523" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8524" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8525" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8526">
-                                        <attributelist id="8527" addr="0x7f99f1e7dcf0" >
-                                            <attribute name="name" value="disabledColor" id="8528" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8529" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8530" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8527" addr="0x7fca469cbcf0" >
+                                            <attribute name="name" value="disabledColor" id="8528" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8529" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8530" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_3" id="8531" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="8532" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_3" id="8531" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="8532" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="8533" addr="0x7f99f1e7e590" >
-                            <attributelist id="8534" addr="0x7f99f1e7e590" >
-                                <attribute name="name" value="ControlButton" id="8535" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="8536" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e7a990" id="8537" addr="0x7f99f1e7a990" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e7ecd0" id="8538" addr="0x7f99f1e7ecd0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e7ddb0" id="8539" addr="0x7f99f1e7ddb0" />
-                                <attribute name="sym_name" value="ControlButton" id="8540" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e7ecd0" id="8541" addr="0x7f99f1e7ecd0" />
-                                <attribute name="defaultargs" value="0x7f99f1e7c250" id="8542" addr="0x7f99f1e7c250" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,long,long,long,p.q(const).char,p.q(const).char)." id="8543" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="8544" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e7c250" id="8545" addr="0x7f99f1e7c250" />
-                                <parmlist id="8546" addr="0x7f99f1e7de50" >
+                        <constructor id="8533" addr="0x7fca469cc590" >
+                            <attributelist id="8534" addr="0x7fca469cc590" >
+                                <attribute name="name" value="ControlButton" id="8535" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="8536" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c8990" id="8537" addr="0x7fca469c8990" />
+                                <attribute name="csym_nextSibling" value="0x7fca469cccd0" id="8538" addr="0x7fca469cccd0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469cbdb0" id="8539" addr="0x7fca469cbdb0" />
+                                <attribute name="sym_name" value="ControlButton" id="8540" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469cccd0" id="8541" addr="0x7fca469cccd0" />
+                                <attribute name="defaultargs" value="0x7fca469ca250" id="8542" addr="0x7fca469ca250" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,long,long,long,p.q(const).char,p.q(const).char)." id="8543" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="8544" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469ca250" id="8545" addr="0x7fca469ca250" />
+                                <parmlist id="8546" addr="0x7fca469cbe50" >
                                     <parm id="8547">
-                                        <attributelist id="8548" addr="0x7f99f1e7de50" >
-                                            <attribute name="name" value="x" id="8549" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8550" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8548" addr="0x7fca469cbe50" >
+                                            <attribute name="name" value="x" id="8549" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8550" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8551">
-                                        <attributelist id="8552" addr="0x7f99f1e7df10" >
-                                            <attribute name="name" value="y" id="8553" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8554" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8552" addr="0x7fca469cbf10" >
+                                            <attribute name="name" value="y" id="8553" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8554" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8555">
-                                        <attributelist id="8556" addr="0x7f99f1e7df90" >
-                                            <attribute name="name" value="width" id="8557" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8558" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8556" addr="0x7fca469cbf90" >
+                                            <attribute name="name" value="width" id="8557" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8558" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8559">
-                                        <attributelist id="8560" addr="0x7f99f1e7e010" >
-                                            <attribute name="name" value="height" id="8561" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8562" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8560" addr="0x7fca469cc010" >
+                                            <attribute name="name" value="height" id="8561" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8562" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8563">
-                                        <attributelist id="8564" addr="0x7f99f1e7e090" >
-                                            <attribute name="name" value="label" id="8565" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="8566" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8564" addr="0x7fca469cc090" >
+                                            <attribute name="name" value="label" id="8565" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="8566" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8567">
-                                        <attributelist id="8568" addr="0x7f99f1e7e110" >
-                                            <attribute name="name" value="focusTexture" id="8569" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8570" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8571" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8568" addr="0x7fca469cc110" >
+                                            <attribute name="name" value="focusTexture" id="8569" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8570" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8571" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8572">
-                                        <attributelist id="8573" addr="0x7f99f1e7e1b0" >
-                                            <attribute name="name" value="noFocusTexture" id="8574" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8575" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8576" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8573" addr="0x7fca469cc1b0" >
+                                            <attribute name="name" value="noFocusTexture" id="8574" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8575" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8576" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8577">
-                                        <attributelist id="8578" addr="0x7f99f1e7e250" >
-                                            <attribute name="name" value="textOffsetX" id="8579" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="8580" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8581" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8578" addr="0x7fca469cc250" >
+                                            <attribute name="name" value="textOffsetX" id="8579" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="8580" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8581" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8582">
-                                        <attributelist id="8583" addr="0x7f99f1e7e2f0" >
-                                            <attribute name="name" value="textOffsetY" id="8584" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="2" id="8585" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8586" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8583" addr="0x7fca469cc2f0" >
+                                            <attribute name="name" value="textOffsetY" id="8584" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="2" id="8585" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8586" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8587">
-                                        <attributelist id="8588" addr="0x7f99f1e7e390" >
-                                            <attribute name="name" value="alignment" id="8589" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="(XBFONT_LEFT|XBFONT_CENTER_Y)" id="8590" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8591" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8588" addr="0x7fca469cc390" >
+                                            <attribute name="name" value="alignment" id="8589" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="(XBFONT_LEFT|XBFONT_CENTER_Y)" id="8590" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8591" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8592">
-                                        <attributelist id="8593" addr="0x7f99f1e7e430" >
-                                            <attribute name="name" value="font" id="8594" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8595" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8596" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8593" addr="0x7fca469cc430" >
+                                            <attribute name="name" value="font" id="8594" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8595" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8596" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8597">
-                                        <attributelist id="8598" addr="0x7f99f1e7e4d0" >
-                                            <attribute name="name" value="textColor" id="8599" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8600" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8601" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8598" addr="0x7fca469cc4d0" >
+                                            <attribute name="name" value="textColor" id="8599" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8600" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8601" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_4" id="8602" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="8603" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_4" id="8602" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="8603" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="8604" addr="0x7f99f1e7ecd0" >
-                            <attributelist id="8605" addr="0x7f99f1e7ecd0" >
-                                <attribute name="name" value="ControlButton" id="8606" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="8607" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e7a990" id="8608" addr="0x7f99f1e7a990" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e7f370" id="8609" addr="0x7f99f1e7f370" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e7e590" id="8610" addr="0x7f99f1e7e590" />
-                                <attribute name="sym_name" value="ControlButton" id="8611" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e7f370" id="8612" addr="0x7f99f1e7f370" />
-                                <attribute name="defaultargs" value="0x7f99f1e7c250" id="8613" addr="0x7f99f1e7c250" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,long,long,long,p.q(const).char)." id="8614" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="8615" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e7c250" id="8616" addr="0x7f99f1e7c250" />
-                                <parmlist id="8617" addr="0x7f99f1e7e630" >
+                        <constructor id="8604" addr="0x7fca469cccd0" >
+                            <attributelist id="8605" addr="0x7fca469cccd0" >
+                                <attribute name="name" value="ControlButton" id="8606" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="8607" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c8990" id="8608" addr="0x7fca469c8990" />
+                                <attribute name="csym_nextSibling" value="0x7fca469cd370" id="8609" addr="0x7fca469cd370" />
+                                <attribute name="sym_previousSibling" value="0x7fca469cc590" id="8610" addr="0x7fca469cc590" />
+                                <attribute name="sym_name" value="ControlButton" id="8611" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469cd370" id="8612" addr="0x7fca469cd370" />
+                                <attribute name="defaultargs" value="0x7fca469ca250" id="8613" addr="0x7fca469ca250" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,long,long,long,p.q(const).char)." id="8614" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="8615" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469ca250" id="8616" addr="0x7fca469ca250" />
+                                <parmlist id="8617" addr="0x7fca469cc630" >
                                     <parm id="8618">
-                                        <attributelist id="8619" addr="0x7f99f1e7e630" >
-                                            <attribute name="name" value="x" id="8620" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8621" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8619" addr="0x7fca469cc630" >
+                                            <attribute name="name" value="x" id="8620" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8621" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8622">
-                                        <attributelist id="8623" addr="0x7f99f1e7e6f0" >
-                                            <attribute name="name" value="y" id="8624" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8625" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8623" addr="0x7fca469cc6f0" >
+                                            <attribute name="name" value="y" id="8624" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8625" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8626">
-                                        <attributelist id="8627" addr="0x7f99f1e7e770" >
-                                            <attribute name="name" value="width" id="8628" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8629" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8627" addr="0x7fca469cc770" >
+                                            <attribute name="name" value="width" id="8628" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8629" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8630">
-                                        <attributelist id="8631" addr="0x7f99f1e7e7f0" >
-                                            <attribute name="name" value="height" id="8632" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8633" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8631" addr="0x7fca469cc7f0" >
+                                            <attribute name="name" value="height" id="8632" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8633" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8634">
-                                        <attributelist id="8635" addr="0x7f99f1e7e870" >
-                                            <attribute name="name" value="label" id="8636" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="8637" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8635" addr="0x7fca469cc870" >
+                                            <attribute name="name" value="label" id="8636" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="8637" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8638">
-                                        <attributelist id="8639" addr="0x7f99f1e7e8f0" >
-                                            <attribute name="name" value="focusTexture" id="8640" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8641" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8642" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8639" addr="0x7fca469cc8f0" >
+                                            <attribute name="name" value="focusTexture" id="8640" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8641" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8642" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8643">
-                                        <attributelist id="8644" addr="0x7f99f1e7e990" >
-                                            <attribute name="name" value="noFocusTexture" id="8645" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8646" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8647" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8644" addr="0x7fca469cc990" >
+                                            <attribute name="name" value="noFocusTexture" id="8645" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8646" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8647" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8648">
-                                        <attributelist id="8649" addr="0x7f99f1e7ea30" >
-                                            <attribute name="name" value="textOffsetX" id="8650" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="8651" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8652" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8649" addr="0x7fca469cca30" >
+                                            <attribute name="name" value="textOffsetX" id="8650" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="8651" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8652" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8653">
-                                        <attributelist id="8654" addr="0x7f99f1e7ead0" >
-                                            <attribute name="name" value="textOffsetY" id="8655" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="2" id="8656" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8657" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8654" addr="0x7fca469ccad0" >
+                                            <attribute name="name" value="textOffsetY" id="8655" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="2" id="8656" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8657" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8658">
-                                        <attributelist id="8659" addr="0x7f99f1e7eb70" >
-                                            <attribute name="name" value="alignment" id="8660" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="(XBFONT_LEFT|XBFONT_CENTER_Y)" id="8661" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8662" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8659" addr="0x7fca469ccb70" >
+                                            <attribute name="name" value="alignment" id="8660" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="(XBFONT_LEFT|XBFONT_CENTER_Y)" id="8661" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8662" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8663">
-                                        <attributelist id="8664" addr="0x7f99f1e7ec10" >
-                                            <attribute name="name" value="font" id="8665" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8666" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8667" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8664" addr="0x7fca469ccc10" >
+                                            <attribute name="name" value="font" id="8665" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8666" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8667" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_5" id="8668" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="8669" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_5" id="8668" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="8669" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="8670" addr="0x7f99f1e7f370" >
-                            <attributelist id="8671" addr="0x7f99f1e7f370" >
-                                <attribute name="name" value="ControlButton" id="8672" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="8673" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e7a990" id="8674" addr="0x7f99f1e7a990" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e7f970" id="8675" addr="0x7f99f1e7f970" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e7ecd0" id="8676" addr="0x7f99f1e7ecd0" />
-                                <attribute name="sym_name" value="ControlButton" id="8677" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e7f970" id="8678" addr="0x7f99f1e7f970" />
-                                <attribute name="defaultargs" value="0x7f99f1e7c250" id="8679" addr="0x7f99f1e7c250" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,long,long,long)." id="8680" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="8681" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e7c250" id="8682" addr="0x7f99f1e7c250" />
-                                <parmlist id="8683" addr="0x7f99f1e7ed70" >
+                        <constructor id="8670" addr="0x7fca469cd370" >
+                            <attributelist id="8671" addr="0x7fca469cd370" >
+                                <attribute name="name" value="ControlButton" id="8672" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="8673" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c8990" id="8674" addr="0x7fca469c8990" />
+                                <attribute name="csym_nextSibling" value="0x7fca469cd970" id="8675" addr="0x7fca469cd970" />
+                                <attribute name="sym_previousSibling" value="0x7fca469cccd0" id="8676" addr="0x7fca469cccd0" />
+                                <attribute name="sym_name" value="ControlButton" id="8677" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469cd970" id="8678" addr="0x7fca469cd970" />
+                                <attribute name="defaultargs" value="0x7fca469ca250" id="8679" addr="0x7fca469ca250" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,long,long,long)." id="8680" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="8681" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469ca250" id="8682" addr="0x7fca469ca250" />
+                                <parmlist id="8683" addr="0x7fca469ccd70" >
                                     <parm id="8684">
-                                        <attributelist id="8685" addr="0x7f99f1e7ed70" >
-                                            <attribute name="name" value="x" id="8686" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8687" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8685" addr="0x7fca469ccd70" >
+                                            <attribute name="name" value="x" id="8686" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8687" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8688">
-                                        <attributelist id="8689" addr="0x7f99f1e7ee30" >
-                                            <attribute name="name" value="y" id="8690" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8691" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8689" addr="0x7fca469cce30" >
+                                            <attribute name="name" value="y" id="8690" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8691" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8692">
-                                        <attributelist id="8693" addr="0x7f99f1e7eeb0" >
-                                            <attribute name="name" value="width" id="8694" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8695" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8693" addr="0x7fca469cceb0" >
+                                            <attribute name="name" value="width" id="8694" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8695" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8696">
-                                        <attributelist id="8697" addr="0x7f99f1e7ef30" >
-                                            <attribute name="name" value="height" id="8698" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8699" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8697" addr="0x7fca469ccf30" >
+                                            <attribute name="name" value="height" id="8698" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8699" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8700">
-                                        <attributelist id="8701" addr="0x7f99f1e7efb0" >
-                                            <attribute name="name" value="label" id="8702" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="8703" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8701" addr="0x7fca469ccfb0" >
+                                            <attribute name="name" value="label" id="8702" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="8703" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8704">
-                                        <attributelist id="8705" addr="0x7f99f1e7f030" >
-                                            <attribute name="name" value="focusTexture" id="8706" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8707" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8708" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8705" addr="0x7fca469cd030" >
+                                            <attribute name="name" value="focusTexture" id="8706" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8707" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8708" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8709">
-                                        <attributelist id="8710" addr="0x7f99f1e7f0d0" >
-                                            <attribute name="name" value="noFocusTexture" id="8711" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8712" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8713" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8710" addr="0x7fca469cd0d0" >
+                                            <attribute name="name" value="noFocusTexture" id="8711" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8712" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8713" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8714">
-                                        <attributelist id="8715" addr="0x7f99f1e7f170" >
-                                            <attribute name="name" value="textOffsetX" id="8716" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="8717" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8718" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8715" addr="0x7fca469cd170" >
+                                            <attribute name="name" value="textOffsetX" id="8716" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="8717" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8718" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8719">
-                                        <attributelist id="8720" addr="0x7f99f1e7f210" >
-                                            <attribute name="name" value="textOffsetY" id="8721" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="2" id="8722" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8723" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8720" addr="0x7fca469cd210" >
+                                            <attribute name="name" value="textOffsetY" id="8721" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="2" id="8722" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8723" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8724">
-                                        <attributelist id="8725" addr="0x7f99f1e7f2b0" >
-                                            <attribute name="name" value="alignment" id="8726" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="(XBFONT_LEFT|XBFONT_CENTER_Y)" id="8727" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8728" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8725" addr="0x7fca469cd2b0" >
+                                            <attribute name="name" value="alignment" id="8726" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="(XBFONT_LEFT|XBFONT_CENTER_Y)" id="8727" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8728" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_6" id="8729" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="8730" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_6" id="8729" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="8730" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="8731" addr="0x7f99f1e7f970" >
-                            <attributelist id="8732" addr="0x7f99f1e7f970" >
-                                <attribute name="name" value="ControlButton" id="8733" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="8734" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e7a990" id="8735" addr="0x7f99f1e7a990" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e7fed0" id="8736" addr="0x7f99f1e7fed0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e7f370" id="8737" addr="0x7f99f1e7f370" />
-                                <attribute name="sym_name" value="ControlButton" id="8738" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e7fed0" id="8739" addr="0x7f99f1e7fed0" />
-                                <attribute name="defaultargs" value="0x7f99f1e7c250" id="8740" addr="0x7f99f1e7c250" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,long,long)." id="8741" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="8742" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e7c250" id="8743" addr="0x7f99f1e7c250" />
-                                <parmlist id="8744" addr="0x7f99f1e7f410" >
+                        <constructor id="8731" addr="0x7fca469cd970" >
+                            <attributelist id="8732" addr="0x7fca469cd970" >
+                                <attribute name="name" value="ControlButton" id="8733" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="8734" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c8990" id="8735" addr="0x7fca469c8990" />
+                                <attribute name="csym_nextSibling" value="0x7fca469cded0" id="8736" addr="0x7fca469cded0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469cd370" id="8737" addr="0x7fca469cd370" />
+                                <attribute name="sym_name" value="ControlButton" id="8738" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469cded0" id="8739" addr="0x7fca469cded0" />
+                                <attribute name="defaultargs" value="0x7fca469ca250" id="8740" addr="0x7fca469ca250" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,long,long)." id="8741" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="8742" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469ca250" id="8743" addr="0x7fca469ca250" />
+                                <parmlist id="8744" addr="0x7fca469cd410" >
                                     <parm id="8745">
-                                        <attributelist id="8746" addr="0x7f99f1e7f410" >
-                                            <attribute name="name" value="x" id="8747" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8748" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8746" addr="0x7fca469cd410" >
+                                            <attribute name="name" value="x" id="8747" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8748" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8749">
-                                        <attributelist id="8750" addr="0x7f99f1e7f4d0" >
-                                            <attribute name="name" value="y" id="8751" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8752" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8750" addr="0x7fca469cd4d0" >
+                                            <attribute name="name" value="y" id="8751" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8752" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8753">
-                                        <attributelist id="8754" addr="0x7f99f1e7f550" >
-                                            <attribute name="name" value="width" id="8755" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8756" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8754" addr="0x7fca469cd550" >
+                                            <attribute name="name" value="width" id="8755" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8756" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8757">
-                                        <attributelist id="8758" addr="0x7f99f1e7f5d0" >
-                                            <attribute name="name" value="height" id="8759" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8760" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8758" addr="0x7fca469cd5d0" >
+                                            <attribute name="name" value="height" id="8759" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8760" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8761">
-                                        <attributelist id="8762" addr="0x7f99f1e7f650" >
-                                            <attribute name="name" value="label" id="8763" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="8764" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8762" addr="0x7fca469cd650" >
+                                            <attribute name="name" value="label" id="8763" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="8764" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8765">
-                                        <attributelist id="8766" addr="0x7f99f1e7f6d0" >
-                                            <attribute name="name" value="focusTexture" id="8767" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8768" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8769" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8766" addr="0x7fca469cd6d0" >
+                                            <attribute name="name" value="focusTexture" id="8767" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8768" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8769" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8770">
-                                        <attributelist id="8771" addr="0x7f99f1e7f770" >
-                                            <attribute name="name" value="noFocusTexture" id="8772" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8773" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8774" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8771" addr="0x7fca469cd770" >
+                                            <attribute name="name" value="noFocusTexture" id="8772" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8773" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8774" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8775">
-                                        <attributelist id="8776" addr="0x7f99f1e7f810" >
-                                            <attribute name="name" value="textOffsetX" id="8777" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="8778" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8779" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8776" addr="0x7fca469cd810" >
+                                            <attribute name="name" value="textOffsetX" id="8777" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="8778" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8779" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8780">
-                                        <attributelist id="8781" addr="0x7f99f1e7f8b0" >
-                                            <attribute name="name" value="textOffsetY" id="8782" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="2" id="8783" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8784" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8781" addr="0x7fca469cd8b0" >
+                                            <attribute name="name" value="textOffsetY" id="8782" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="2" id="8783" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8784" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_7" id="8785" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="8786" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_7" id="8785" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="8786" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="8787" addr="0x7f99f1e7fed0" >
-                            <attributelist id="8788" addr="0x7f99f1e7fed0" >
-                                <attribute name="name" value="ControlButton" id="8789" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="8790" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e7a990" id="8791" addr="0x7f99f1e7a990" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e80390" id="8792" addr="0x7f99f1e80390" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e7f970" id="8793" addr="0x7f99f1e7f970" />
-                                <attribute name="sym_name" value="ControlButton" id="8794" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e80390" id="8795" addr="0x7f99f1e80390" />
-                                <attribute name="defaultargs" value="0x7f99f1e7c250" id="8796" addr="0x7f99f1e7c250" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,long)." id="8797" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="8798" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e7c250" id="8799" addr="0x7f99f1e7c250" />
-                                <parmlist id="8800" addr="0x7f99f1e7fa10" >
+                        <constructor id="8787" addr="0x7fca469cded0" >
+                            <attributelist id="8788" addr="0x7fca469cded0" >
+                                <attribute name="name" value="ControlButton" id="8789" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="8790" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c8990" id="8791" addr="0x7fca469c8990" />
+                                <attribute name="csym_nextSibling" value="0x7fca469ce390" id="8792" addr="0x7fca469ce390" />
+                                <attribute name="sym_previousSibling" value="0x7fca469cd970" id="8793" addr="0x7fca469cd970" />
+                                <attribute name="sym_name" value="ControlButton" id="8794" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469ce390" id="8795" addr="0x7fca469ce390" />
+                                <attribute name="defaultargs" value="0x7fca469ca250" id="8796" addr="0x7fca469ca250" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,long)." id="8797" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="8798" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469ca250" id="8799" addr="0x7fca469ca250" />
+                                <parmlist id="8800" addr="0x7fca469cda10" >
                                     <parm id="8801">
-                                        <attributelist id="8802" addr="0x7f99f1e7fa10" >
-                                            <attribute name="name" value="x" id="8803" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8804" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8802" addr="0x7fca469cda10" >
+                                            <attribute name="name" value="x" id="8803" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8804" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8805">
-                                        <attributelist id="8806" addr="0x7f99f1e7fad0" >
-                                            <attribute name="name" value="y" id="8807" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8808" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8806" addr="0x7fca469cdad0" >
+                                            <attribute name="name" value="y" id="8807" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8808" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8809">
-                                        <attributelist id="8810" addr="0x7f99f1e7fb50" >
-                                            <attribute name="name" value="width" id="8811" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8812" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8810" addr="0x7fca469cdb50" >
+                                            <attribute name="name" value="width" id="8811" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8812" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8813">
-                                        <attributelist id="8814" addr="0x7f99f1e7fbd0" >
-                                            <attribute name="name" value="height" id="8815" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8816" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8814" addr="0x7fca469cdbd0" >
+                                            <attribute name="name" value="height" id="8815" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8816" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8817">
-                                        <attributelist id="8818" addr="0x7f99f1e7fc50" >
-                                            <attribute name="name" value="label" id="8819" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="8820" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8818" addr="0x7fca469cdc50" >
+                                            <attribute name="name" value="label" id="8819" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="8820" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8821">
-                                        <attributelist id="8822" addr="0x7f99f1e7fcd0" >
-                                            <attribute name="name" value="focusTexture" id="8823" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8824" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8825" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8822" addr="0x7fca469cdcd0" >
+                                            <attribute name="name" value="focusTexture" id="8823" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8824" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8825" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8826">
-                                        <attributelist id="8827" addr="0x7f99f1e7fd70" >
-                                            <attribute name="name" value="noFocusTexture" id="8828" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8829" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8830" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8827" addr="0x7fca469cdd70" >
+                                            <attribute name="name" value="noFocusTexture" id="8828" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8829" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8830" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8831">
-                                        <attributelist id="8832" addr="0x7f99f1e7fe10" >
-                                            <attribute name="name" value="textOffsetX" id="8833" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="8834" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8835" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8832" addr="0x7fca469cde10" >
+                                            <attribute name="name" value="textOffsetX" id="8833" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="8834" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8835" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_8" id="8836" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="8837" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_8" id="8836" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="8837" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="8838" addr="0x7f99f1e80390" >
-                            <attributelist id="8839" addr="0x7f99f1e80390" >
-                                <attribute name="name" value="ControlButton" id="8840" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="8841" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e7a990" id="8842" addr="0x7f99f1e7a990" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e807b0" id="8843" addr="0x7f99f1e807b0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e7fed0" id="8844" addr="0x7f99f1e7fed0" />
-                                <attribute name="sym_name" value="ControlButton" id="8845" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e807b0" id="8846" addr="0x7f99f1e807b0" />
-                                <attribute name="defaultargs" value="0x7f99f1e7c250" id="8847" addr="0x7f99f1e7c250" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char)." id="8848" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="8849" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e7c250" id="8850" addr="0x7f99f1e7c250" />
-                                <parmlist id="8851" addr="0x7f99f1e7ff70" >
+                        <constructor id="8838" addr="0x7fca469ce390" >
+                            <attributelist id="8839" addr="0x7fca469ce390" >
+                                <attribute name="name" value="ControlButton" id="8840" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="8841" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c8990" id="8842" addr="0x7fca469c8990" />
+                                <attribute name="csym_nextSibling" value="0x7fca469ce7b0" id="8843" addr="0x7fca469ce7b0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469cded0" id="8844" addr="0x7fca469cded0" />
+                                <attribute name="sym_name" value="ControlButton" id="8845" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469ce7b0" id="8846" addr="0x7fca469ce7b0" />
+                                <attribute name="defaultargs" value="0x7fca469ca250" id="8847" addr="0x7fca469ca250" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char)." id="8848" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="8849" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469ca250" id="8850" addr="0x7fca469ca250" />
+                                <parmlist id="8851" addr="0x7fca469cdf70" >
                                     <parm id="8852">
-                                        <attributelist id="8853" addr="0x7f99f1e7ff70" >
-                                            <attribute name="name" value="x" id="8854" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8855" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8853" addr="0x7fca469cdf70" >
+                                            <attribute name="name" value="x" id="8854" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8855" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8856">
-                                        <attributelist id="8857" addr="0x7f99f1e80030" >
-                                            <attribute name="name" value="y" id="8858" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8859" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8857" addr="0x7fca469ce030" >
+                                            <attribute name="name" value="y" id="8858" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8859" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8860">
-                                        <attributelist id="8861" addr="0x7f99f1e800b0" >
-                                            <attribute name="name" value="width" id="8862" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8863" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8861" addr="0x7fca469ce0b0" >
+                                            <attribute name="name" value="width" id="8862" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8863" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8864">
-                                        <attributelist id="8865" addr="0x7f99f1e80130" >
-                                            <attribute name="name" value="height" id="8866" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8867" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8865" addr="0x7fca469ce130" >
+                                            <attribute name="name" value="height" id="8866" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8867" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8868">
-                                        <attributelist id="8869" addr="0x7f99f1e801b0" >
-                                            <attribute name="name" value="label" id="8870" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="8871" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8869" addr="0x7fca469ce1b0" >
+                                            <attribute name="name" value="label" id="8870" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="8871" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8872">
-                                        <attributelist id="8873" addr="0x7f99f1e80230" >
-                                            <attribute name="name" value="focusTexture" id="8874" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8875" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8876" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8873" addr="0x7fca469ce230" >
+                                            <attribute name="name" value="focusTexture" id="8874" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8875" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8876" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8877">
-                                        <attributelist id="8878" addr="0x7f99f1e802d0" >
-                                            <attribute name="name" value="noFocusTexture" id="8879" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8880" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8881" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8878" addr="0x7fca469ce2d0" >
+                                            <attribute name="name" value="noFocusTexture" id="8879" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8880" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8881" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_9" id="8882" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="8883" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_9" id="8882" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="8883" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="8884" addr="0x7f99f1e807b0" >
-                            <attributelist id="8885" addr="0x7f99f1e807b0" >
-                                <attribute name="name" value="ControlButton" id="8886" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="8887" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e7a990" id="8888" addr="0x7f99f1e7a990" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e80b30" id="8889" addr="0x7f99f1e80b30" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e80390" id="8890" addr="0x7f99f1e80390" />
-                                <attribute name="sym_name" value="ControlButton" id="8891" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e80b30" id="8892" addr="0x7f99f1e80b30" />
-                                <attribute name="defaultargs" value="0x7f99f1e7c250" id="8893" addr="0x7f99f1e7c250" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char)." id="8894" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="8895" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e7c250" id="8896" addr="0x7f99f1e7c250" />
-                                <parmlist id="8897" addr="0x7f99f1e80430" >
+                        <constructor id="8884" addr="0x7fca469ce7b0" >
+                            <attributelist id="8885" addr="0x7fca469ce7b0" >
+                                <attribute name="name" value="ControlButton" id="8886" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="8887" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c8990" id="8888" addr="0x7fca469c8990" />
+                                <attribute name="csym_nextSibling" value="0x7fca469ceb30" id="8889" addr="0x7fca469ceb30" />
+                                <attribute name="sym_previousSibling" value="0x7fca469ce390" id="8890" addr="0x7fca469ce390" />
+                                <attribute name="sym_name" value="ControlButton" id="8891" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469ceb30" id="8892" addr="0x7fca469ceb30" />
+                                <attribute name="defaultargs" value="0x7fca469ca250" id="8893" addr="0x7fca469ca250" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char)." id="8894" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="8895" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469ca250" id="8896" addr="0x7fca469ca250" />
+                                <parmlist id="8897" addr="0x7fca469ce430" >
                                     <parm id="8898">
-                                        <attributelist id="8899" addr="0x7f99f1e80430" >
-                                            <attribute name="name" value="x" id="8900" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8901" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8899" addr="0x7fca469ce430" >
+                                            <attribute name="name" value="x" id="8900" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8901" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8902">
-                                        <attributelist id="8903" addr="0x7f99f1e804f0" >
-                                            <attribute name="name" value="y" id="8904" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8905" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8903" addr="0x7fca469ce4f0" >
+                                            <attribute name="name" value="y" id="8904" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8905" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8906">
-                                        <attributelist id="8907" addr="0x7f99f1e80570" >
-                                            <attribute name="name" value="width" id="8908" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8909" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8907" addr="0x7fca469ce570" >
+                                            <attribute name="name" value="width" id="8908" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8909" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8910">
-                                        <attributelist id="8911" addr="0x7f99f1e805f0" >
-                                            <attribute name="name" value="height" id="8912" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8913" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8911" addr="0x7fca469ce5f0" >
+                                            <attribute name="name" value="height" id="8912" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8913" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8914">
-                                        <attributelist id="8915" addr="0x7f99f1e80670" >
-                                            <attribute name="name" value="label" id="8916" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="8917" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8915" addr="0x7fca469ce670" >
+                                            <attribute name="name" value="label" id="8916" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="8917" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8918">
-                                        <attributelist id="8919" addr="0x7f99f1e806f0" >
-                                            <attribute name="name" value="focusTexture" id="8920" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8921" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8922" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8919" addr="0x7fca469ce6f0" >
+                                            <attribute name="name" value="focusTexture" id="8920" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8921" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8922" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_10" id="8923" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="8924" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_10" id="8923" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="8924" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="8925" addr="0x7f99f1e80b30" >
-                            <attributelist id="8926" addr="0x7f99f1e80b30" >
-                                <attribute name="name" value="ControlButton" id="8927" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="8928" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e7a990" id="8929" addr="0x7f99f1e7a990" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e807b0" id="8930" addr="0x7f99f1e807b0" />
-                                <attribute name="sym_name" value="ControlButton" id="8931" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e7c250" id="8932" addr="0x7f99f1e7c250" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String)." id="8933" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="8934" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e7c250" id="8935" addr="0x7f99f1e7c250" />
-                                <parmlist id="8936" addr="0x7f99f1e80850" >
+                        <constructor id="8925" addr="0x7fca469ceb30" >
+                            <attributelist id="8926" addr="0x7fca469ceb30" >
+                                <attribute name="name" value="ControlButton" id="8927" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="8928" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c8990" id="8929" addr="0x7fca469c8990" />
+                                <attribute name="sym_previousSibling" value="0x7fca469ce7b0" id="8930" addr="0x7fca469ce7b0" />
+                                <attribute name="sym_name" value="ControlButton" id="8931" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469ca250" id="8932" addr="0x7fca469ca250" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String)." id="8933" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="8934" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469ca250" id="8935" addr="0x7fca469ca250" />
+                                <parmlist id="8936" addr="0x7fca469ce850" >
                                     <parm id="8937">
-                                        <attributelist id="8938" addr="0x7f99f1e80850" >
-                                            <attribute name="name" value="x" id="8939" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8940" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8938" addr="0x7fca469ce850" >
+                                            <attribute name="name" value="x" id="8939" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8940" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8941">
-                                        <attributelist id="8942" addr="0x7f99f1e80910" >
-                                            <attribute name="name" value="y" id="8943" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8944" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8942" addr="0x7fca469ce910" >
+                                            <attribute name="name" value="y" id="8943" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8944" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8945">
-                                        <attributelist id="8946" addr="0x7f99f1e80990" >
-                                            <attribute name="name" value="width" id="8947" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8948" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8946" addr="0x7fca469ce990" >
+                                            <attribute name="name" value="width" id="8947" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8948" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8949">
-                                        <attributelist id="8950" addr="0x7f99f1e80a10" >
-                                            <attribute name="name" value="height" id="8951" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="8952" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8950" addr="0x7fca469cea10" >
+                                            <attribute name="name" value="height" id="8951" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="8952" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8953">
-                                        <attributelist id="8954" addr="0x7f99f1e80a90" >
-                                            <attribute name="name" value="label" id="8955" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="8956" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8954" addr="0x7fca469cea90" >
+                                            <attribute name="name" value="label" id="8955" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="8956" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_11" id="8957" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="8958" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_11" id="8957" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="8958" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <cdecl id="8959" addr="0x7f99f1e81830" >
-                            <attributelist id="8960" addr="0x7f99f1e81830" >
-                                <attribute name="name" value="setLabel" id="8961" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="8962" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e7a990" id="8963" addr="0x7f99f1e7a990" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e81d30" id="8964" addr="0x7f99f1e81d30" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e81d30" id="8965" addr="0x7f99f1e81d30" />
-                                <attribute name="kind" value="function" id="8966" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setLabel" id="8967" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,r.q(const).XBMCAddon::String)." id="8968" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="8969" addr="0x7f99f1de6c90" />
-                                <parmlist id="8970" addr="0x7f99f1e80db0" >
+                        <cdecl id="8959" addr="0x7fca469cf830" >
+                            <attributelist id="8960" addr="0x7fca469cf830" >
+                                <attribute name="name" value="setLabel" id="8961" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="8962" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c8990" id="8963" addr="0x7fca469c8990" />
+                                <attribute name="sym_nextSibling" value="0x7fca469cfd30" id="8964" addr="0x7fca469cfd30" />
+                                <attribute name="csym_nextSibling" value="0x7fca469cfd30" id="8965" addr="0x7fca469cfd30" />
+                                <attribute name="kind" value="function" id="8966" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setLabel" id="8967" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,r.q(const).XBMCAddon::String)." id="8968" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="8969" addr="0x7fca46934c90" />
+                                <parmlist id="8970" addr="0x7fca469cedb0" >
                                     <parm id="8971">
-                                        <attributelist id="8972" addr="0x7f99f1e80db0" >
-                                            <attribute name="name" value="label" id="8973" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="8974" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="8975" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8972" addr="0x7fca469cedb0" >
+                                            <attribute name="name" value="label" id="8973" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="8974" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="8975" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8976">
-                                        <attributelist id="8977" addr="0x7f99f1e80f50" >
-                                            <attribute name="name" value="font" id="8978" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8979" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8980" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8977" addr="0x7fca469cef50" >
+                                            <attribute name="name" value="font" id="8978" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8979" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8980" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8981">
-                                        <attributelist id="8982" addr="0x7f99f1e810f0" >
-                                            <attribute name="name" value="textColor" id="8983" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8984" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8985" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8982" addr="0x7fca469cf0f0" >
+                                            <attribute name="name" value="textColor" id="8983" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8984" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8985" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8986">
-                                        <attributelist id="8987" addr="0x7f99f1e81290" >
-                                            <attribute name="name" value="disabledColor" id="8988" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8989" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8990" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8987" addr="0x7fca469cf290" >
+                                            <attribute name="name" value="disabledColor" id="8988" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8989" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8990" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8991">
-                                        <attributelist id="8992" addr="0x7f99f1e81430" >
-                                            <attribute name="name" value="shadowColor" id="8993" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8994" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="8995" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8992" addr="0x7fca469cf430" >
+                                            <attribute name="name" value="shadowColor" id="8993" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8994" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="8995" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="8996">
-                                        <attributelist id="8997" addr="0x7f99f1e815d0" >
-                                            <attribute name="name" value="focusedColor" id="8998" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="8999" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9000" addr="0x7f99f1de6c90" />
+                                        <attributelist id="8997" addr="0x7fca469cf5d0" >
+                                            <attribute name="name" value="focusedColor" id="8998" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="8999" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9000" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9001">
-                                        <attributelist id="9002" addr="0x7f99f1e81770" >
-                                            <attribute name="name" value="label2" id="9003" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="9004" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="9005" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                    </parm >
-                                </parmlist >
-                                <attribute name="sym_overloaded" value="0x7f99f1e81830" id="9006" addr="0x7f99f1e81830" />
-                                <attribute name="type" value="void" id="9007" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="9008" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="9009" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="9010" addr="0x7f99f1e81d30" >
-                            <attributelist id="9011" addr="0x7f99f1e81d30" >
-                                <attribute name="name" value="setLabel" id="9012" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="9013" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e7a990" id="9014" addr="0x7f99f1e7a990" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e81830" id="9015" addr="0x7f99f1e81830" />
-                                <attribute name="kind" value="function" id="9016" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setLabel" id="9017" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e82190" id="9018" addr="0x7f99f1e82190" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e82190" id="9019" addr="0x7f99f1e82190" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char)." id="9020" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e81830" id="9021" addr="0x7f99f1e81830" />
-                                <attribute name="access" value="public" id="9022" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e81830" id="9023" addr="0x7f99f1e81830" />
-                                <parmlist id="9024" addr="0x7f99f1e818f0" >
+                                        <attributelist id="9002" addr="0x7fca469cf770" >
+                                            <attribute name="name" value="label2" id="9003" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="9004" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="9005" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                    </parm >
+                                </parmlist >
+                                <attribute name="sym_overloaded" value="0x7fca469cf830" id="9006" addr="0x7fca469cf830" />
+                                <attribute name="type" value="void" id="9007" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="9008" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="9009" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="9010" addr="0x7fca469cfd30" >
+                            <attributelist id="9011" addr="0x7fca469cfd30" >
+                                <attribute name="name" value="setLabel" id="9012" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="9013" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c8990" id="9014" addr="0x7fca469c8990" />
+                                <attribute name="sym_previousSibling" value="0x7fca469cf830" id="9015" addr="0x7fca469cf830" />
+                                <attribute name="kind" value="function" id="9016" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setLabel" id="9017" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469d0190" id="9018" addr="0x7fca469d0190" />
+                                <attribute name="sym_nextSibling" value="0x7fca469d0190" id="9019" addr="0x7fca469d0190" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char)." id="9020" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469cf830" id="9021" addr="0x7fca469cf830" />
+                                <attribute name="access" value="public" id="9022" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469cf830" id="9023" addr="0x7fca469cf830" />
+                                <parmlist id="9024" addr="0x7fca469cf8f0" >
                                     <parm id="9025">
-                                        <attributelist id="9026" addr="0x7f99f1e818f0" >
-                                            <attribute name="name" value="label" id="9027" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="9028" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="9029" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9026" addr="0x7fca469cf8f0" >
+                                            <attribute name="name" value="label" id="9027" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="9028" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="9029" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9030">
-                                        <attributelist id="9031" addr="0x7f99f1e819f0" >
-                                            <attribute name="name" value="font" id="9032" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9033" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9034" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9031" addr="0x7fca469cf9f0" >
+                                            <attribute name="name" value="font" id="9032" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9033" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9034" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9035">
-                                        <attributelist id="9036" addr="0x7f99f1e81a90" >
-                                            <attribute name="name" value="textColor" id="9037" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9038" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9039" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9036" addr="0x7fca469cfa90" >
+                                            <attribute name="name" value="textColor" id="9037" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9038" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9039" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9040">
-                                        <attributelist id="9041" addr="0x7f99f1e81b30" >
-                                            <attribute name="name" value="disabledColor" id="9042" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9043" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9044" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9041" addr="0x7fca469cfb30" >
+                                            <attribute name="name" value="disabledColor" id="9042" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9043" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9044" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9045">
-                                        <attributelist id="9046" addr="0x7f99f1e81bd0" >
-                                            <attribute name="name" value="shadowColor" id="9047" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9048" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9049" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9046" addr="0x7fca469cfbd0" >
+                                            <attribute name="name" value="shadowColor" id="9047" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9048" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9049" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9050">
-                                        <attributelist id="9051" addr="0x7f99f1e81c70" >
-                                            <attribute name="name" value="focusedColor" id="9052" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9053" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9054" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                    </parm >
-                                </parmlist >
-                                <attribute name="type" value="void" id="9055" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="9056" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="9057" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="9058" addr="0x7f99f1e82190" >
-                            <attributelist id="9059" addr="0x7f99f1e82190" >
-                                <attribute name="name" value="setLabel" id="9060" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="9061" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e7a990" id="9062" addr="0x7f99f1e7a990" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e81d30" id="9063" addr="0x7f99f1e81d30" />
-                                <attribute name="kind" value="function" id="9064" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setLabel" id="9065" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e82550" id="9066" addr="0x7f99f1e82550" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e82550" id="9067" addr="0x7f99f1e82550" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char)." id="9068" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e81830" id="9069" addr="0x7f99f1e81830" />
-                                <attribute name="access" value="public" id="9070" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e81830" id="9071" addr="0x7f99f1e81830" />
-                                <parmlist id="9072" addr="0x7f99f1e81df0" >
+                                        <attributelist id="9051" addr="0x7fca469cfc70" >
+                                            <attribute name="name" value="focusedColor" id="9052" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9053" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9054" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                    </parm >
+                                </parmlist >
+                                <attribute name="type" value="void" id="9055" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="9056" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="9057" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="9058" addr="0x7fca469d0190" >
+                            <attributelist id="9059" addr="0x7fca469d0190" >
+                                <attribute name="name" value="setLabel" id="9060" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="9061" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c8990" id="9062" addr="0x7fca469c8990" />
+                                <attribute name="sym_previousSibling" value="0x7fca469cfd30" id="9063" addr="0x7fca469cfd30" />
+                                <attribute name="kind" value="function" id="9064" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setLabel" id="9065" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469d0550" id="9066" addr="0x7fca469d0550" />
+                                <attribute name="sym_nextSibling" value="0x7fca469d0550" id="9067" addr="0x7fca469d0550" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char)." id="9068" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469cf830" id="9069" addr="0x7fca469cf830" />
+                                <attribute name="access" value="public" id="9070" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469cf830" id="9071" addr="0x7fca469cf830" />
+                                <parmlist id="9072" addr="0x7fca469cfdf0" >
                                     <parm id="9073">
-                                        <attributelist id="9074" addr="0x7f99f1e81df0" >
-                                            <attribute name="name" value="label" id="9075" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="9076" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="9077" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9074" addr="0x7fca469cfdf0" >
+                                            <attribute name="name" value="label" id="9075" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="9076" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="9077" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9078">
-                                        <attributelist id="9079" addr="0x7f99f1e81ef0" >
-                                            <attribute name="name" value="font" id="9080" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9081" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9082" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9079" addr="0x7fca469cfef0" >
+                                            <attribute name="name" value="font" id="9080" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9081" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9082" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9083">
-                                        <attributelist id="9084" addr="0x7f99f1e81f90" >
-                                            <attribute name="name" value="textColor" id="9085" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9086" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9087" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9084" addr="0x7fca469cff90" >
+                                            <attribute name="name" value="textColor" id="9085" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9086" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9087" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9088">
-                                        <attributelist id="9089" addr="0x7f99f1e82030" >
-                                            <attribute name="name" value="disabledColor" id="9090" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9091" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9092" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9089" addr="0x7fca469d0030" >
+                                            <attribute name="name" value="disabledColor" id="9090" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9091" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9092" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9093">
-                                        <attributelist id="9094" addr="0x7f99f1e820d0" >
-                                            <attribute name="name" value="shadowColor" id="9095" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9096" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9097" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                    </parm >
-                                </parmlist >
-                                <attribute name="type" value="void" id="9098" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_2" id="9099" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="9100" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="9101" addr="0x7f99f1e82550" >
-                            <attributelist id="9102" addr="0x7f99f1e82550" >
-                                <attribute name="name" value="setLabel" id="9103" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="9104" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e7a990" id="9105" addr="0x7f99f1e7a990" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e82190" id="9106" addr="0x7f99f1e82190" />
-                                <attribute name="kind" value="function" id="9107" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setLabel" id="9108" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e82870" id="9109" addr="0x7f99f1e82870" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e82870" id="9110" addr="0x7f99f1e82870" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char,p.q(const).char)." id="9111" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e81830" id="9112" addr="0x7f99f1e81830" />
-                                <attribute name="access" value="public" id="9113" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e81830" id="9114" addr="0x7f99f1e81830" />
-                                <parmlist id="9115" addr="0x7f99f1e82250" >
+                                        <attributelist id="9094" addr="0x7fca469d00d0" >
+                                            <attribute name="name" value="shadowColor" id="9095" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9096" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9097" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                    </parm >
+                                </parmlist >
+                                <attribute name="type" value="void" id="9098" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_2" id="9099" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="9100" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="9101" addr="0x7fca469d0550" >
+                            <attributelist id="9102" addr="0x7fca469d0550" >
+                                <attribute name="name" value="setLabel" id="9103" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="9104" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c8990" id="9105" addr="0x7fca469c8990" />
+                                <attribute name="sym_previousSibling" value="0x7fca469d0190" id="9106" addr="0x7fca469d0190" />
+                                <attribute name="kind" value="function" id="9107" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setLabel" id="9108" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469d0870" id="9109" addr="0x7fca469d0870" />
+                                <attribute name="sym_nextSibling" value="0x7fca469d0870" id="9110" addr="0x7fca469d0870" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char,p.q(const).char)." id="9111" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469cf830" id="9112" addr="0x7fca469cf830" />
+                                <attribute name="access" value="public" id="9113" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469cf830" id="9114" addr="0x7fca469cf830" />
+                                <parmlist id="9115" addr="0x7fca469d0250" >
                                     <parm id="9116">
-                                        <attributelist id="9117" addr="0x7f99f1e82250" >
-                                            <attribute name="name" value="label" id="9118" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="9119" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="9120" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9117" addr="0x7fca469d0250" >
+                                            <attribute name="name" value="label" id="9118" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="9119" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="9120" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9121">
-                                        <attributelist id="9122" addr="0x7f99f1e82350" >
-                                            <attribute name="name" value="font" id="9123" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9124" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9125" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9122" addr="0x7fca469d0350" >
+                                            <attribute name="name" value="font" id="9123" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9124" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9125" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9126">
-                                        <attributelist id="9127" addr="0x7f99f1e823f0" >
-                                            <attribute name="name" value="textColor" id="9128" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9129" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9130" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9127" addr="0x7fca469d03f0" >
+                                            <attribute name="name" value="textColor" id="9128" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9129" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9130" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9131">
-                                        <attributelist id="9132" addr="0x7f99f1e82490" >
-                                            <attribute name="name" value="disabledColor" id="9133" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9134" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9135" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                    </parm >
-                                </parmlist >
-                                <attribute name="type" value="void" id="9136" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_3" id="9137" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="9138" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="9139" addr="0x7f99f1e82870" >
-                            <attributelist id="9140" addr="0x7f99f1e82870" >
-                                <attribute name="name" value="setLabel" id="9141" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="9142" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e7a990" id="9143" addr="0x7f99f1e7a990" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e82550" id="9144" addr="0x7f99f1e82550" />
-                                <attribute name="kind" value="function" id="9145" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setLabel" id="9146" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e82af0" id="9147" addr="0x7f99f1e82af0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e82af0" id="9148" addr="0x7f99f1e82af0" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char)." id="9149" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e81830" id="9150" addr="0x7f99f1e81830" />
-                                <attribute name="access" value="public" id="9151" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e81830" id="9152" addr="0x7f99f1e81830" />
-                                <parmlist id="9153" addr="0x7f99f1e82610" >
+                                        <attributelist id="9132" addr="0x7fca469d0490" >
+                                            <attribute name="name" value="disabledColor" id="9133" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9134" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9135" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                    </parm >
+                                </parmlist >
+                                <attribute name="type" value="void" id="9136" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_3" id="9137" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="9138" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="9139" addr="0x7fca469d0870" >
+                            <attributelist id="9140" addr="0x7fca469d0870" >
+                                <attribute name="name" value="setLabel" id="9141" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="9142" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c8990" id="9143" addr="0x7fca469c8990" />
+                                <attribute name="sym_previousSibling" value="0x7fca469d0550" id="9144" addr="0x7fca469d0550" />
+                                <attribute name="kind" value="function" id="9145" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setLabel" id="9146" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469d0af0" id="9147" addr="0x7fca469d0af0" />
+                                <attribute name="sym_nextSibling" value="0x7fca469d0af0" id="9148" addr="0x7fca469d0af0" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char)." id="9149" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469cf830" id="9150" addr="0x7fca469cf830" />
+                                <attribute name="access" value="public" id="9151" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469cf830" id="9152" addr="0x7fca469cf830" />
+                                <parmlist id="9153" addr="0x7fca469d0610" >
                                     <parm id="9154">
-                                        <attributelist id="9155" addr="0x7f99f1e82610" >
-                                            <attribute name="name" value="label" id="9156" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="9157" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="9158" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9155" addr="0x7fca469d0610" >
+                                            <attribute name="name" value="label" id="9156" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="9157" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="9158" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9159">
-                                        <attributelist id="9160" addr="0x7f99f1e82710" >
-                                            <attribute name="name" value="font" id="9161" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9162" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9163" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9160" addr="0x7fca469d0710" >
+                                            <attribute name="name" value="font" id="9161" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9162" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9163" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9164">
-                                        <attributelist id="9165" addr="0x7f99f1e827b0" >
-                                            <attribute name="name" value="textColor" id="9166" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9167" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9168" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                    </parm >
-                                </parmlist >
-                                <attribute name="type" value="void" id="9169" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_4" id="9170" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="9171" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="9172" addr="0x7f99f1e82af0" >
-                            <attributelist id="9173" addr="0x7f99f1e82af0" >
-                                <attribute name="name" value="setLabel" id="9174" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="9175" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e7a990" id="9176" addr="0x7f99f1e7a990" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e82870" id="9177" addr="0x7f99f1e82870" />
-                                <attribute name="kind" value="function" id="9178" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setLabel" id="9179" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e82cd0" id="9180" addr="0x7f99f1e82cd0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e82cd0" id="9181" addr="0x7f99f1e82cd0" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char)." id="9182" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e81830" id="9183" addr="0x7f99f1e81830" />
-                                <attribute name="access" value="public" id="9184" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e81830" id="9185" addr="0x7f99f1e81830" />
-                                <parmlist id="9186" addr="0x7f99f1e82930" >
+                                        <attributelist id="9165" addr="0x7fca469d07b0" >
+                                            <attribute name="name" value="textColor" id="9166" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9167" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9168" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                    </parm >
+                                </parmlist >
+                                <attribute name="type" value="void" id="9169" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_4" id="9170" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="9171" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="9172" addr="0x7fca469d0af0" >
+                            <attributelist id="9173" addr="0x7fca469d0af0" >
+                                <attribute name="name" value="setLabel" id="9174" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="9175" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c8990" id="9176" addr="0x7fca469c8990" />
+                                <attribute name="sym_previousSibling" value="0x7fca469d0870" id="9177" addr="0x7fca469d0870" />
+                                <attribute name="kind" value="function" id="9178" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setLabel" id="9179" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469d0cd0" id="9180" addr="0x7fca469d0cd0" />
+                                <attribute name="sym_nextSibling" value="0x7fca469d0cd0" id="9181" addr="0x7fca469d0cd0" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char)." id="9182" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469cf830" id="9183" addr="0x7fca469cf830" />
+                                <attribute name="access" value="public" id="9184" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469cf830" id="9185" addr="0x7fca469cf830" />
+                                <parmlist id="9186" addr="0x7fca469d0930" >
                                     <parm id="9187">
-                                        <attributelist id="9188" addr="0x7f99f1e82930" >
-                                            <attribute name="name" value="label" id="9189" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="9190" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="9191" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9188" addr="0x7fca469d0930" >
+                                            <attribute name="name" value="label" id="9189" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="9190" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="9191" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9192">
-                                        <attributelist id="9193" addr="0x7f99f1e82a30" >
-                                            <attribute name="name" value="font" id="9194" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9195" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9196" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                    </parm >
-                                </parmlist >
-                                <attribute name="type" value="void" id="9197" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_5" id="9198" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="9199" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="9200" addr="0x7f99f1e82cd0" >
-                            <attributelist id="9201" addr="0x7f99f1e82cd0" >
-                                <attribute name="name" value="setLabel" id="9202" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="9203" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e7a990" id="9204" addr="0x7f99f1e7a990" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e82af0" id="9205" addr="0x7f99f1e82af0" />
-                                <attribute name="kind" value="function" id="9206" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setLabel" id="9207" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e82df0" id="9208" addr="0x7f99f1e82df0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e82df0" id="9209" addr="0x7f99f1e82df0" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="9210" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e81830" id="9211" addr="0x7f99f1e81830" />
-                                <attribute name="access" value="public" id="9212" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e81830" id="9213" addr="0x7f99f1e81830" />
-                                <parmlist id="9214" addr="0x7f99f1e82bb0" >
+                                        <attributelist id="9193" addr="0x7fca469d0a30" >
+                                            <attribute name="name" value="font" id="9194" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9195" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9196" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                    </parm >
+                                </parmlist >
+                                <attribute name="type" value="void" id="9197" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_5" id="9198" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="9199" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="9200" addr="0x7fca469d0cd0" >
+                            <attributelist id="9201" addr="0x7fca469d0cd0" >
+                                <attribute name="name" value="setLabel" id="9202" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="9203" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c8990" id="9204" addr="0x7fca469c8990" />
+                                <attribute name="sym_previousSibling" value="0x7fca469d0af0" id="9205" addr="0x7fca469d0af0" />
+                                <attribute name="kind" value="function" id="9206" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setLabel" id="9207" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469d0df0" id="9208" addr="0x7fca469d0df0" />
+                                <attribute name="sym_nextSibling" value="0x7fca469d0df0" id="9209" addr="0x7fca469d0df0" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="9210" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469cf830" id="9211" addr="0x7fca469cf830" />
+                                <attribute name="access" value="public" id="9212" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469cf830" id="9213" addr="0x7fca469cf830" />
+                                <parmlist id="9214" addr="0x7fca469d0bb0" >
                                     <parm id="9215">
-                                        <attributelist id="9216" addr="0x7f99f1e82bb0" >
-                                            <attribute name="name" value="label" id="9217" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="9218" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="9219" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                    </parm >
-                                </parmlist >
-                                <attribute name="type" value="void" id="9220" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_6" id="9221" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="9222" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="9223" addr="0x7f99f1e82df0" >
-                            <attributelist id="9224" addr="0x7f99f1e82df0" >
-                                <attribute name="name" value="setLabel" id="9225" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="9226" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e7a990" id="9227" addr="0x7f99f1e7a990" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e82cd0" id="9228" addr="0x7f99f1e82cd0" />
-                                <attribute name="kind" value="function" id="9229" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setLabel" id="9230" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e81830" id="9231" addr="0x7f99f1e81830" />
-                                <attribute name="decl" value="f()." id="9232" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="9233" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e81830" id="9234" addr="0x7f99f1e81830" />
-                                <attribute name="type" value="void" id="9235" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_7" id="9236" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="9237" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="9238" addr="0x7f99f1e83130" >
-                            <attributelist id="9239" addr="0x7f99f1e83130" >
-                                <attribute name="name" value="setDisabledColor" id="9240" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="9241" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e7a990" id="9242" addr="0x7f99f1e7a990" />
-                                <attribute name="kind" value="function" id="9243" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setDisabledColor" id="9244" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(p.q(const).char)." id="9245" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="9246" addr="0x7f99f1de6c90" />
-                                <parmlist id="9247" addr="0x7f99f1e83070" >
+                                        <attributelist id="9216" addr="0x7fca469d0bb0" >
+                                            <attribute name="name" value="label" id="9217" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="9218" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="9219" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                    </parm >
+                                </parmlist >
+                                <attribute name="type" value="void" id="9220" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_6" id="9221" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="9222" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="9223" addr="0x7fca469d0df0" >
+                            <attributelist id="9224" addr="0x7fca469d0df0" >
+                                <attribute name="name" value="setLabel" id="9225" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="9226" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c8990" id="9227" addr="0x7fca469c8990" />
+                                <attribute name="sym_previousSibling" value="0x7fca469d0cd0" id="9228" addr="0x7fca469d0cd0" />
+                                <attribute name="kind" value="function" id="9229" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setLabel" id="9230" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469cf830" id="9231" addr="0x7fca469cf830" />
+                                <attribute name="decl" value="f()." id="9232" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="9233" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469cf830" id="9234" addr="0x7fca469cf830" />
+                                <attribute name="type" value="void" id="9235" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_7" id="9236" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="9237" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="9238" addr="0x7fca469d1130" >
+                            <attributelist id="9239" addr="0x7fca469d1130" >
+                                <attribute name="name" value="setDisabledColor" id="9240" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="9241" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c8990" id="9242" addr="0x7fca469c8990" />
+                                <attribute name="kind" value="function" id="9243" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setDisabledColor" id="9244" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(p.q(const).char)." id="9245" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="9246" addr="0x7fca46934c90" />
+                                <parmlist id="9247" addr="0x7fca469d1070" >
                                     <parm id="9248">
-                                        <attributelist id="9249" addr="0x7f99f1e83070" >
-                                            <attribute name="name" value="color" id="9250" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9251" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9249" addr="0x7fca469d1070" >
+                                            <attribute name="name" value="color" id="9250" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9251" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="9252" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="9253" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="9254" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="9252" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="9253" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="9254" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="9255" addr="0x7f99f1e83330" >
-                            <attributelist id="9256" addr="0x7f99f1e83330" >
-                                <attribute name="feature_python_coerceToUnicode" value="true" id="9257" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="getLabel" id="9258" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="9259" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e7a990" id="9260" addr="0x7f99f1e7a990" />
-                                <attribute name="kind" value="function" id="9261" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getLabel" id="9262" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="9263" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="9264" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="XBMCAddon::String" id="9265" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="9266" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="9267" addr="0x7f99f1de6c90" />
+                        <cdecl id="9255" addr="0x7fca469d1330" >
+                            <attributelist id="9256" addr="0x7fca469d1330" >
+                                <attribute name="feature_python_coerceToUnicode" value="true" id="9257" addr="0x7fca46934c90" />
+                                <attribute name="name" value="getLabel" id="9258" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="9259" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c8990" id="9260" addr="0x7fca469c8990" />
+                                <attribute name="kind" value="function" id="9261" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getLabel" id="9262" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="9263" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="9264" addr="0x7fca46934c90" />
+                                <attribute name="type" value="XBMCAddon::String" id="9265" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="9266" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="9267" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="9268" addr="0x7f99f1e83550" >
-                            <attributelist id="9269" addr="0x7f99f1e83550" >
-                                <attribute name="feature_python_coerceToUnicode" value="true" id="9270" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="getLabel2" id="9271" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="9272" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e7a990" id="9273" addr="0x7f99f1e7a990" />
-                                <attribute name="kind" value="function" id="9274" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getLabel2" id="9275" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="9276" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="9277" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="XBMCAddon::String" id="9278" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="9279" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="9280" addr="0x7f99f1de6c90" />
+                        <cdecl id="9268" addr="0x7fca469d1550" >
+                            <attributelist id="9269" addr="0x7fca469d1550" >
+                                <attribute name="feature_python_coerceToUnicode" value="true" id="9270" addr="0x7fca46934c90" />
+                                <attribute name="name" value="getLabel2" id="9271" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="9272" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469c8990" id="9273" addr="0x7fca469c8990" />
+                                <attribute name="kind" value="function" id="9274" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getLabel2" id="9275" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="9276" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="9277" addr="0x7fca46934c90" />
+                                <attribute name="type" value="XBMCAddon::String" id="9278" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="9279" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="9280" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
                     </class >
-                    <class id="9281" addr="0x7f99f1e83850" >
-                        <attributelist id="9282" addr="0x7f99f1e83850" >
-                            <attribute name="name" value="XBMCAddon::xbmcgui::ControlGroup" id="9283" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="9284" addr="0x7f99f1e40fb0" />
-                            <attribute name="symtab" value="0x7f99f1e83990" id="9285" addr="0x7f99f1e83990" />
-                            <attribute name="allows_typedef" value="1" id="9286" addr="0x7f99f1de6c90" />
-                            <attribute name="typepass_visit" value="1" id="9287" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_visit" value="1" id="9288" addr="0x7f99f1de6c90" />
-                            <attribute name="kind" value="class" id="9289" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_name" value="ControlGroup" id="9290" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_has_constructor" value="1" id="9291" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_public_constructor" value="1" id="9292" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_copy_constructor" value="1" id="9293" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_default_destructor" value="1" id="9294" addr="0x7f99f1de6c90" />
-                            <attribute name="privatebaselist" value="0x7f99f1e83830" id="9295" addr="0x7f99f1e83830" />
-                            <attribute name="protectedbaselist" value="0x7f99f1e83810" id="9296" addr="0x7f99f1e83810" />
-                            <baselist id="9297" addr="0x7f99f1e837f0" >
-                                <base name="Control" id="9298" addr="0x7f99f1e83770" />
+                    <class id="9281" addr="0x7fca469d1850" >
+                        <attributelist id="9282" addr="0x7fca469d1850" >
+                            <attribute name="name" value="XBMCAddon::xbmcgui::ControlGroup" id="9283" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="9284" addr="0x7fca4698efb0" />
+                            <attribute name="symtab" value="0x7fca469d1990" id="9285" addr="0x7fca469d1990" />
+                            <attribute name="allows_typedef" value="1" id="9286" addr="0x7fca46934c90" />
+                            <attribute name="typepass_visit" value="1" id="9287" addr="0x7fca46934c90" />
+                            <attribute name="allocate_visit" value="1" id="9288" addr="0x7fca46934c90" />
+                            <attribute name="kind" value="class" id="9289" addr="0x7fca46934c90" />
+                            <attribute name="sym_name" value="ControlGroup" id="9290" addr="0x7fca46934c90" />
+                            <attribute name="allocate_has_constructor" value="1" id="9291" addr="0x7fca46934c90" />
+                            <attribute name="allocate_public_constructor" value="1" id="9292" addr="0x7fca46934c90" />
+                            <attribute name="allocate_copy_constructor" value="1" id="9293" addr="0x7fca46934c90" />
+                            <attribute name="allocate_default_destructor" value="1" id="9294" addr="0x7fca46934c90" />
+                            <attribute name="privatebaselist" value="0x7fca469d1830" id="9295" addr="0x7fca469d1830" />
+                            <attribute name="protectedbaselist" value="0x7fca469d1810" id="9296" addr="0x7fca469d1810" />
+                            <baselist id="9297" addr="0x7fca469d17f0" >
+                                <base name="Control" id="9298" addr="0x7fca469d1770" />
                             </baselist >
-                            <attribute name="module" value="xbmcgui" id="9299" addr="0x7f99f1e402f0" />
-                            <attribute name="bases" value="0x7f99f1ddd0d0" id="9300" addr="0x7f99f1ddd0d0" />
-                            <attribute name="allbases" value="0x7f99f1ddd370" id="9301" addr="0x7f99f1ddd370" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="9302" addr="0x7f99f1de6c90" />
-                            <typescope id="9303" addr="0x7f99f1ddd050" >
-                                <attributelist id="9304" addr="0x7f99f1ddd050" >
-                                    <attribute name="inherit" value="0x7f99f1ddd150" id="9305" addr="0x7f99f1ddd150" />
-                                    <attribute name="name" value="ControlGroup" id="9306" addr="0x7f99f1de6c90" />
-                                    <typetab id="9307" addr="0x7f99f1ddd070" >
-                                        <attributelist id="9308" addr="0x7f99f1ddd070" >
+                            <attribute name="module" value="xbmcgui" id="9299" addr="0x7fca4698e2f0" />
+                            <attribute name="bases" value="0x7fca4692b0d0" id="9300" addr="0x7fca4692b0d0" />
+                            <attribute name="allbases" value="0x7fca4692b370" id="9301" addr="0x7fca4692b370" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="9302" addr="0x7fca46934c90" />
+                            <typescope id="9303" addr="0x7fca4692b050" >
+                                <attributelist id="9304" addr="0x7fca4692b050" >
+                                    <attribute name="inherit" value="0x7fca4692b150" id="9305" addr="0x7fca4692b150" />
+                                    <attribute name="name" value="ControlGroup" id="9306" addr="0x7fca46934c90" />
+                                    <typetab id="9307" addr="0x7fca4692b070" >
+                                        <attributelist id="9308" addr="0x7fca4692b070" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f99f1dd2150" id="9309" addr="0x7f99f1dd2150" />
-                                    <attribute name="qname" value="XBMCAddon::xbmcgui::ControlGroup" id="9310" addr="0x7f99f1de6c90" />
-                                    <attribute name="symtab" value="0x7f99f1e83990" id="9311" addr="0x7f99f1e83990" />
+                                    <attribute name="parent" value="0x7fca46920150" id="9309" addr="0x7fca46920150" />
+                                    <attribute name="qname" value="XBMCAddon::xbmcgui::ControlGroup" id="9310" addr="0x7fca46934c90" />
+                                    <attribute name="symtab" value="0x7fca469d1990" id="9311" addr="0x7fca469d1990" />
                                 </attributelist >
-                                <typescopesitem id="9312" addr="0x7f99f1ddd150" >
-                                    <attributelist id="9313" addr="0x7f99f1ddd150" >
+                                <typescopesitem id="9312" addr="0x7fca4692b150" >
+                                    <attributelist id="9313" addr="0x7fca4692b150" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="9314" addr="0x7f99f1ddcff0" >
-                                    <attributelist id="9315" addr="0x7f99f1ddcff0" >
+                                <typescopesitem id="9314" addr="0x7fca4692aff0" >
+                                    <attributelist id="9315" addr="0x7fca4692aff0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="9316" addr="0x7f99f1ddd070" >
-                                    <attributelist id="9317" addr="0x7f99f1ddd070" >
+                                <typescopesitem id="9316" addr="0x7fca4692b070" >
+                                    <attributelist id="9317" addr="0x7fca4692b070" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="9318" addr="0x7f99f1dd2150" >
-                                    <attributelist id="9319" addr="0x7f99f1dd2150" >
-                                        <attribute name="name" value="xbmcgui" id="9320" addr="0x7f99f1de6c90" />
-                                        <typetab id="9321" addr="0x7f99f1dd2170" >
-                                            <attributelist id="9322" addr="0x7f99f1dd2170" >
-                                                <attribute name="InterceptorBase" value="InterceptorBase" id="9323" addr="0x7f99f1de6c90" />
-                                                <attribute name="Dialog" value="Dialog" id="9324" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="9325" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="9326" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlTextBox" value="ControlTextBox" id="9327" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="9328" addr="0x7f99f1de6c90" />
-                                                <attribute name="Window" value="Window" id="9329" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="9330" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlList" value="ControlList" id="9331" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="9332" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlImage" value="ControlImage" id="9333" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlButton" value="ControlButton" id="9334" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlGroup" value="ControlGroup" id="9335" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogBusy" value="DialogBusy" id="9336" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="9337" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSpin" value="ControlSpin" id="9338" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlEdit" value="ControlEdit" id="9339" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="9340" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="9341" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlLabel" value="ControlLabel" id="9342" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlProgress" value="ControlProgress" id="9343" addr="0x7f99f1de6c90" />
-                                                <attribute name="Control" value="Control" id="9344" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSlider" value="ControlSlider" id="9345" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgress" value="DialogProgress" id="9346" addr="0x7f99f1de6c90" />
-                                                <attribute name="Action" value="Action" id="9347" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowDialog" value="WindowDialog" id="9348" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXML" value="WindowXML" id="9349" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItem" value="ListItem" id="9350" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="9351" addr="0x7f99f1de6c90" />
+                                <typescopesitem id="9318" addr="0x7fca46920150" >
+                                    <attributelist id="9319" addr="0x7fca46920150" >
+                                        <attribute name="name" value="xbmcgui" id="9320" addr="0x7fca46934c90" />
+                                        <typetab id="9321" addr="0x7fca46920170" >
+                                            <attributelist id="9322" addr="0x7fca46920170" >
+                                                <attribute name="InterceptorBase" value="InterceptorBase" id="9323" addr="0x7fca46934c90" />
+                                                <attribute name="Dialog" value="Dialog" id="9324" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="9325" addr="0x7fca46934c90" />
+                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="9326" addr="0x7fca46934c90" />
+                                                <attribute name="ControlTextBox" value="ControlTextBox" id="9327" addr="0x7fca46934c90" />
+                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="9328" addr="0x7fca46934c90" />
+                                                <attribute name="Window" value="Window" id="9329" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="9330" addr="0x7fca46934c90" />
+                                                <attribute name="ControlList" value="ControlList" id="9331" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="9332" addr="0x7fca46934c90" />
+                                                <attribute name="ControlImage" value="ControlImage" id="9333" addr="0x7fca46934c90" />
+                                                <attribute name="ControlButton" value="ControlButton" id="9334" addr="0x7fca46934c90" />
+                                                <attribute name="ControlGroup" value="ControlGroup" id="9335" addr="0x7fca46934c90" />
+                                                <attribute name="DialogBusy" value="DialogBusy" id="9336" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="9337" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSpin" value="ControlSpin" id="9338" addr="0x7fca46934c90" />
+                                                <attribute name="ControlEdit" value="ControlEdit" id="9339" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="9340" addr="0x7fca46934c90" />
+                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="9341" addr="0x7fca46934c90" />
+                                                <attribute name="ControlLabel" value="ControlLabel" id="9342" addr="0x7fca46934c90" />
+                                                <attribute name="ControlProgress" value="ControlProgress" id="9343" addr="0x7fca46934c90" />
+                                                <attribute name="Control" value="Control" id="9344" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSlider" value="ControlSlider" id="9345" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgress" value="DialogProgress" id="9346" addr="0x7fca46934c90" />
+                                                <attribute name="Action" value="Action" id="9347" addr="0x7fca46934c90" />
+                                                <attribute name="WindowDialog" value="WindowDialog" id="9348" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXML" value="WindowXML" id="9349" addr="0x7fca46934c90" />
+                                                <attribute name="ListItem" value="ListItem" id="9350" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="9351" addr="0x7fca46934c90" />
                                             </attributelist >
-                                            <typetabsitem id="9352" addr="0x7f99f1de1dd0" >
-                                                <attributelist id="9353" addr="0x7f99f1de1dd0" >
+                                            <typetabsitem id="9352" addr="0x7fca4692fdd0" >
+                                                <attributelist id="9353" addr="0x7fca4692fdd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9354" addr="0x7f99f1dde790" >
-                                                <attributelist id="9355" addr="0x7f99f1dde790" >
+                                            <typetabsitem id="9354" addr="0x7fca4692c790" >
+                                                <attributelist id="9355" addr="0x7fca4692c790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9356" addr="0x7f99f1de3f10" >
-                                                <attributelist id="9357" addr="0x7f99f1de3f10" >
+                                            <typetabsitem id="9356" addr="0x7fca46931f10" >
+                                                <attributelist id="9357" addr="0x7fca46931f10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9358" addr="0x7f99f1dd67b0" >
-                                                <attributelist id="9359" addr="0x7f99f1dd67b0" >
+                                            <typetabsitem id="9358" addr="0x7fca469247b0" >
+                                                <attributelist id="9359" addr="0x7fca469247b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9360" addr="0x7f99f1ddafd0" >
-                                                <attributelist id="9361" addr="0x7f99f1ddafd0" >
+                                            <typetabsitem id="9360" addr="0x7fca46928fd0" >
+                                                <attributelist id="9361" addr="0x7fca46928fd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9362" addr="0x7f99f1ddd430" >
-                                                <attributelist id="9363" addr="0x7f99f1ddd430" >
+                                            <typetabsitem id="9362" addr="0x7fca4692b430" >
+                                                <attributelist id="9363" addr="0x7fca4692b430" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9364" addr="0x7f99f1de2130" >
-                                                <attributelist id="9365" addr="0x7f99f1de2130" >
+                                            <typetabsitem id="9364" addr="0x7fca46930130" >
+                                                <attributelist id="9365" addr="0x7fca46930130" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9366" addr="0x7f99f1dd2f50" >
-                                                <attributelist id="9367" addr="0x7f99f1dd2f50" >
+                                            <typetabsitem id="9366" addr="0x7fca46920f50" >
+                                                <attributelist id="9367" addr="0x7fca46920f50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9368" addr="0x7f99f1dd9650" >
-                                                <attributelist id="9369" addr="0x7f99f1dd9650" >
+                                            <typetabsitem id="9368" addr="0x7fca46927650" >
+                                                <attributelist id="9369" addr="0x7fca46927650" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9370" addr="0x7f99f1de3390" >
-                                                <attributelist id="9371" addr="0x7f99f1de3390" >
+                                            <typetabsitem id="9370" addr="0x7fca46931390" >
+                                                <attributelist id="9371" addr="0x7fca46931390" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9372" addr="0x7f99f1ddb7b0" >
-                                                <attributelist id="9373" addr="0x7f99f1ddb7b0" >
+                                            <typetabsitem id="9372" addr="0x7fca469297b0" >
+                                                <attributelist id="9373" addr="0x7fca469297b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9374" addr="0x7f99f1ddc4b0" >
-                                                <attributelist id="9375" addr="0x7f99f1ddc4b0" >
+                                            <typetabsitem id="9374" addr="0x7fca4692a4b0" >
+                                                <attributelist id="9375" addr="0x7fca4692a4b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9376" addr="0x7f99f1ddcf90" >
-                                                <attributelist id="9377" addr="0x7f99f1ddcf90" >
+                                            <typetabsitem id="9376" addr="0x7fca4692af90" >
+                                                <attributelist id="9377" addr="0x7fca4692af90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9378" addr="0x7f99f1de11b0" >
-                                                <attributelist id="9379" addr="0x7f99f1de11b0" >
+                                            <typetabsitem id="9378" addr="0x7fca4692f1b0" >
+                                                <attributelist id="9379" addr="0x7fca4692f1b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9380" addr="0x7f99f1de15b0" >
-                                                <attributelist id="9381" addr="0x7f99f1de15b0" >
+                                            <typetabsitem id="9380" addr="0x7fca4692f5b0" >
+                                                <attributelist id="9381" addr="0x7fca4692f5b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9382" addr="0x7f99f1dd77f0" >
-                                                <attributelist id="9383" addr="0x7f99f1dd77f0" >
+                                            <typetabsitem id="9382" addr="0x7fca469257f0" >
+                                                <attributelist id="9383" addr="0x7fca469257f0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9384" addr="0x7f99f1dd8b30" >
-                                                <attributelist id="9385" addr="0x7f99f1dd8b30" >
+                                            <typetabsitem id="9384" addr="0x7fca46926b30" >
+                                                <attributelist id="9385" addr="0x7fca46926b30" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9386" addr="0x7f99f1dd2c50" >
-                                                <attributelist id="9387" addr="0x7f99f1dd2c50" >
+                                            <typetabsitem id="9386" addr="0x7fca46920c50" >
+                                                <attributelist id="9387" addr="0x7fca46920c50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9388" addr="0x7f99f1dda790" >
-                                                <attributelist id="9389" addr="0x7f99f1dda790" >
+                                            <typetabsitem id="9388" addr="0x7fca46928790" >
+                                                <attributelist id="9389" addr="0x7fca46928790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9390" addr="0x7f99f1dd8030" >
-                                                <attributelist id="9391" addr="0x7f99f1dd8030" >
+                                            <typetabsitem id="9390" addr="0x7fca46926030" >
+                                                <attributelist id="9391" addr="0x7fca46926030" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9392" addr="0x7f99f1ddbe10" >
-                                                <attributelist id="9393" addr="0x7f99f1ddbe10" >
+                                            <typetabsitem id="9392" addr="0x7fca46929e10" >
+                                                <attributelist id="9393" addr="0x7fca46929e10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9394" addr="0x7f99f1dd6b10" >
-                                                <attributelist id="9395" addr="0x7f99f1dd6b10" >
+                                            <typetabsitem id="9394" addr="0x7fca46924b10" >
+                                                <attributelist id="9395" addr="0x7fca46924b10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9396" addr="0x7f99f1dddf90" >
-                                                <attributelist id="9397" addr="0x7f99f1dddf90" >
+                                            <typetabsitem id="9396" addr="0x7fca4692bf90" >
+                                                <attributelist id="9397" addr="0x7fca4692bf90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9398" addr="0x7f99f1de0530" >
-                                                <attributelist id="9399" addr="0x7f99f1de0530" >
+                                            <typetabsitem id="9398" addr="0x7fca4692e530" >
+                                                <attributelist id="9399" addr="0x7fca4692e530" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9400" addr="0x7f99f1de1e50" >
-                                                <attributelist id="9401" addr="0x7f99f1de1e50" >
+                                            <typetabsitem id="9400" addr="0x7fca4692fe50" >
+                                                <attributelist id="9401" addr="0x7fca4692fe50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9402" addr="0x7f99f1de2d90" >
-                                                <attributelist id="9403" addr="0x7f99f1de2d90" >
+                                            <typetabsitem id="9402" addr="0x7fca46930d90" >
+                                                <attributelist id="9403" addr="0x7fca46930d90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9404" addr="0x7f99f1de3410" >
-                                                <attributelist id="9405" addr="0x7f99f1de3410" >
+                                            <typetabsitem id="9404" addr="0x7fca46931410" >
+                                                <attributelist id="9405" addr="0x7fca46931410" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9406" addr="0x7f99f1dd3590" >
-                                                <attributelist id="9407" addr="0x7f99f1dd3590" >
+                                            <typetabsitem id="9406" addr="0x7fca46921590" >
+                                                <attributelist id="9407" addr="0x7fca46921590" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9408" addr="0x7f99f1dd3390" >
-                                                <attributelist id="9409" addr="0x7f99f1dd3390" >
+                                            <typetabsitem id="9408" addr="0x7fca46921390" >
+                                                <attributelist id="9409" addr="0x7fca46921390" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7f99f1dd1d70" id="9410" addr="0x7f99f1dd1d70" />
-                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="9411" addr="0x7f99f1de6c90" />
-                                        <attribute name="symtab" value="0x7f99f1e40fb0" id="9412" addr="0x7f99f1e40fb0" />
+                                        <attribute name="parent" value="0x7fca4691fd70" id="9410" addr="0x7fca4691fd70" />
+                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="9411" addr="0x7fca46934c90" />
+                                        <attribute name="symtab" value="0x7fca4698efb0" id="9412" addr="0x7fca4698efb0" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="9413" addr="0x7f99f1ddd090" >
-                                    <attributelist id="9414" addr="0x7f99f1ddd090" >
+                                <typescopesitem id="9413" addr="0x7fca4692b090" >
+                                    <attributelist id="9414" addr="0x7fca4692b090" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="9415" addr="0x7f99f1e83990" >
-                                    <attributelist id="9416" addr="0x7f99f1e83990" >
-                                        <attribute name="inherit" value="0x7f99f1e839f0" id="9417" addr="0x7f99f1e839f0" />
-                                        <attribute name="name" value="ControlGroup" id="9418" addr="0x7f99f1de6c90" />
-                                        <attribute name="csymtab" value="0x7f99f1e839b0" id="9419" addr="0x7f99f1e839b0" />
-                                        <attribute name="symtab" value="0x7f99f1e83970" id="9420" addr="0x7f99f1e83970" />
+                                <typescopesitem id="9415" addr="0x7fca469d1990" >
+                                    <attributelist id="9416" addr="0x7fca469d1990" >
+                                        <attribute name="inherit" value="0x7fca469d19f0" id="9417" addr="0x7fca469d19f0" />
+                                        <attribute name="name" value="ControlGroup" id="9418" addr="0x7fca46934c90" />
+                                        <attribute name="csymtab" value="0x7fca469d19b0" id="9419" addr="0x7fca469d19b0" />
+                                        <attribute name="symtab" value="0x7fca469d1970" id="9420" addr="0x7fca469d1970" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <access id="9421" addr="0x7f99f1e83910" >
-                            <attributelist id="9422" addr="0x7f99f1e83910" >
-                                <attribute name="kind" value="public" id="9423" addr="0x7f99f1de6c90" />
+                        <access id="9421" addr="0x7fca469d1910" >
+                            <attributelist id="9422" addr="0x7fca469d1910" >
+                                <attribute name="kind" value="public" id="9423" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="9424" addr="0x7f99f1e83f70" >
-                            <attributelist id="9425" addr="0x7f99f1e83f70" >
-                                <attribute name="ismember" value="1" id="9426" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="ControlGroup" id="9427" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="ControlGroup" id="9428" addr="0x7f99f1de6c90" />
-                                <parmlist id="9429" addr="0x7f99f1e83b50" >
+                        <constructor id="9424" addr="0x7fca469d1f70" >
+                            <attributelist id="9425" addr="0x7fca469d1f70" >
+                                <attribute name="ismember" value="1" id="9426" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="ControlGroup" id="9427" addr="0x7fca46934c90" />
+                                <attribute name="name" value="ControlGroup" id="9428" addr="0x7fca46934c90" />
+                                <parmlist id="9429" addr="0x7fca469d1b50" >
                                     <parm id="9430">
-                                        <attributelist id="9431" addr="0x7f99f1e83b50" >
-                                            <attribute name="name" value="x" id="9432" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="9433" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9431" addr="0x7fca469d1b50" >
+                                            <attribute name="name" value="x" id="9432" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="9433" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9434">
-                                        <attributelist id="9435" addr="0x7f99f1e83c70" >
-                                            <attribute name="name" value="y" id="9436" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="9437" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9435" addr="0x7fca469d1c70" >
+                                            <attribute name="name" value="y" id="9436" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="9437" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9438">
-                                        <attributelist id="9439" addr="0x7f99f1e83d90" >
-                                            <attribute name="name" value="width" id="9440" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="9441" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9439" addr="0x7fca469d1d90" >
+                                            <attribute name="name" value="width" id="9440" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="9441" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9442">
-                                        <attributelist id="9443" addr="0x7f99f1e83eb0" >
-                                            <attribute name="name" value="height" id="9444" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="9445" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9443" addr="0x7fca469d1eb0" >
+                                            <attribute name="name" value="height" id="9444" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="9445" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="decl" value="f(long,long,long,long)." id="9446" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="9447" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="9448" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e83990" id="9449" addr="0x7f99f1e83990" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="9450" addr="0x7f99f1de6c90" />
+                                <attribute name="decl" value="f(long,long,long,long)." id="9446" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="9447" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="9448" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469d1990" id="9449" addr="0x7fca469d1990" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="9450" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
                     </class >
-                    <class id="9451" addr="0x7f99f1e84210" >
-                        <attributelist id="9452" addr="0x7f99f1e84210" >
-                            <attribute name="name" value="XBMCAddon::xbmcgui::ControlRadioButton" id="9453" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="9454" addr="0x7f99f1e40fb0" />
-                            <attribute name="symtab" value="0x7f99f1e84350" id="9455" addr="0x7f99f1e84350" />
-                            <attribute name="allows_typedef" value="1" id="9456" addr="0x7f99f1de6c90" />
-                            <attribute name="typepass_visit" value="1" id="9457" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_visit" value="1" id="9458" addr="0x7f99f1de6c90" />
-                            <attribute name="kind" value="class" id="9459" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_name" value="ControlRadioButton" id="9460" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_has_constructor" value="1" id="9461" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_public_constructor" value="1" id="9462" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_copy_constructor" value="1" id="9463" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_default_destructor" value="1" id="9464" addr="0x7f99f1de6c90" />
-                            <attribute name="privatebaselist" value="0x7f99f1e841f0" id="9465" addr="0x7f99f1e841f0" />
-                            <attribute name="protectedbaselist" value="0x7f99f1e841d0" id="9466" addr="0x7f99f1e841d0" />
-                            <baselist id="9467" addr="0x7f99f1e841b0" >
-                                <base name="Control" id="9468" addr="0x7f99f1e84130" />
+                    <class id="9451" addr="0x7fca469d2210" >
+                        <attributelist id="9452" addr="0x7fca469d2210" >
+                            <attribute name="name" value="XBMCAddon::xbmcgui::ControlRadioButton" id="9453" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="9454" addr="0x7fca4698efb0" />
+                            <attribute name="symtab" value="0x7fca469d2350" id="9455" addr="0x7fca469d2350" />
+                            <attribute name="allows_typedef" value="1" id="9456" addr="0x7fca46934c90" />
+                            <attribute name="typepass_visit" value="1" id="9457" addr="0x7fca46934c90" />
+                            <attribute name="allocate_visit" value="1" id="9458" addr="0x7fca46934c90" />
+                            <attribute name="kind" value="class" id="9459" addr="0x7fca46934c90" />
+                            <attribute name="sym_name" value="ControlRadioButton" id="9460" addr="0x7fca46934c90" />
+                            <attribute name="allocate_has_constructor" value="1" id="9461" addr="0x7fca46934c90" />
+                            <attribute name="allocate_public_constructor" value="1" id="9462" addr="0x7fca46934c90" />
+                            <attribute name="allocate_copy_constructor" value="1" id="9463" addr="0x7fca46934c90" />
+                            <attribute name="allocate_default_destructor" value="1" id="9464" addr="0x7fca46934c90" />
+                            <attribute name="privatebaselist" value="0x7fca469d21f0" id="9465" addr="0x7fca469d21f0" />
+                            <attribute name="protectedbaselist" value="0x7fca469d21d0" id="9466" addr="0x7fca469d21d0" />
+                            <baselist id="9467" addr="0x7fca469d21b0" >
+                                <base name="Control" id="9468" addr="0x7fca469d2130" />
                             </baselist >
-                            <attribute name="module" value="xbmcgui" id="9469" addr="0x7f99f1e402f0" />
-                            <attribute name="bases" value="0x7f99f1ddd570" id="9470" addr="0x7f99f1ddd570" />
-                            <attribute name="allbases" value="0x7f99f1ddd810" id="9471" addr="0x7f99f1ddd810" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="9472" addr="0x7f99f1de6c90" />
-                            <typescope id="9473" addr="0x7f99f1ddd4f0" >
-                                <attributelist id="9474" addr="0x7f99f1ddd4f0" >
-                                    <attribute name="inherit" value="0x7f99f1ddd5f0" id="9475" addr="0x7f99f1ddd5f0" />
-                                    <attribute name="name" value="ControlRadioButton" id="9476" addr="0x7f99f1de6c90" />
-                                    <typetab id="9477" addr="0x7f99f1ddd510" >
-                                        <attributelist id="9478" addr="0x7f99f1ddd510" >
+                            <attribute name="module" value="xbmcgui" id="9469" addr="0x7fca4698e2f0" />
+                            <attribute name="bases" value="0x7fca4692b570" id="9470" addr="0x7fca4692b570" />
+                            <attribute name="allbases" value="0x7fca4692b810" id="9471" addr="0x7fca4692b810" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="9472" addr="0x7fca46934c90" />
+                            <typescope id="9473" addr="0x7fca4692b4f0" >
+                                <attributelist id="9474" addr="0x7fca4692b4f0" >
+                                    <attribute name="inherit" value="0x7fca4692b5f0" id="9475" addr="0x7fca4692b5f0" />
+                                    <attribute name="name" value="ControlRadioButton" id="9476" addr="0x7fca46934c90" />
+                                    <typetab id="9477" addr="0x7fca4692b510" >
+                                        <attributelist id="9478" addr="0x7fca4692b510" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f99f1dd2150" id="9479" addr="0x7f99f1dd2150" />
-                                    <attribute name="qname" value="XBMCAddon::xbmcgui::ControlRadioButton" id="9480" addr="0x7f99f1de6c90" />
-                                    <attribute name="symtab" value="0x7f99f1e84350" id="9481" addr="0x7f99f1e84350" />
+                                    <attribute name="parent" value="0x7fca46920150" id="9479" addr="0x7fca46920150" />
+                                    <attribute name="qname" value="XBMCAddon::xbmcgui::ControlRadioButton" id="9480" addr="0x7fca46934c90" />
+                                    <attribute name="symtab" value="0x7fca469d2350" id="9481" addr="0x7fca469d2350" />
                                 </attributelist >
-                                <typescopesitem id="9482" addr="0x7f99f1ddd5f0" >
-                                    <attributelist id="9483" addr="0x7f99f1ddd5f0" >
+                                <typescopesitem id="9482" addr="0x7fca4692b5f0" >
+                                    <attributelist id="9483" addr="0x7fca4692b5f0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="9484" addr="0x7f99f1ddd490" >
-                                    <attributelist id="9485" addr="0x7f99f1ddd490" >
+                                <typescopesitem id="9484" addr="0x7fca4692b490" >
+                                    <attributelist id="9485" addr="0x7fca4692b490" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="9486" addr="0x7f99f1ddd510" >
-                                    <attributelist id="9487" addr="0x7f99f1ddd510" >
+                                <typescopesitem id="9486" addr="0x7fca4692b510" >
+                                    <attributelist id="9487" addr="0x7fca4692b510" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="9488" addr="0x7f99f1dd2150" >
-                                    <attributelist id="9489" addr="0x7f99f1dd2150" >
-                                        <attribute name="name" value="xbmcgui" id="9490" addr="0x7f99f1de6c90" />
-                                        <typetab id="9491" addr="0x7f99f1dd2170" >
-                                            <attributelist id="9492" addr="0x7f99f1dd2170" >
-                                                <attribute name="InterceptorBase" value="InterceptorBase" id="9493" addr="0x7f99f1de6c90" />
-                                                <attribute name="Dialog" value="Dialog" id="9494" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="9495" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="9496" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlTextBox" value="ControlTextBox" id="9497" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="9498" addr="0x7f99f1de6c90" />
-                                                <attribute name="Window" value="Window" id="9499" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="9500" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlList" value="ControlList" id="9501" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="9502" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlImage" value="ControlImage" id="9503" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlButton" value="ControlButton" id="9504" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlGroup" value="ControlGroup" id="9505" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogBusy" value="DialogBusy" id="9506" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="9507" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSpin" value="ControlSpin" id="9508" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlEdit" value="ControlEdit" id="9509" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="9510" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="9511" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlLabel" value="ControlLabel" id="9512" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlProgress" value="ControlProgress" id="9513" addr="0x7f99f1de6c90" />
-                                                <attribute name="Control" value="Control" id="9514" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSlider" value="ControlSlider" id="9515" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgress" value="DialogProgress" id="9516" addr="0x7f99f1de6c90" />
-                                                <attribute name="Action" value="Action" id="9517" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowDialog" value="WindowDialog" id="9518" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXML" value="WindowXML" id="9519" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItem" value="ListItem" id="9520" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="9521" addr="0x7f99f1de6c90" />
+                                <typescopesitem id="9488" addr="0x7fca46920150" >
+                                    <attributelist id="9489" addr="0x7fca46920150" >
+                                        <attribute name="name" value="xbmcgui" id="9490" addr="0x7fca46934c90" />
+                                        <typetab id="9491" addr="0x7fca46920170" >
+                                            <attributelist id="9492" addr="0x7fca46920170" >
+                                                <attribute name="InterceptorBase" value="InterceptorBase" id="9493" addr="0x7fca46934c90" />
+                                                <attribute name="Dialog" value="Dialog" id="9494" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="9495" addr="0x7fca46934c90" />
+                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="9496" addr="0x7fca46934c90" />
+                                                <attribute name="ControlTextBox" value="ControlTextBox" id="9497" addr="0x7fca46934c90" />
+                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="9498" addr="0x7fca46934c90" />
+                                                <attribute name="Window" value="Window" id="9499" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="9500" addr="0x7fca46934c90" />
+                                                <attribute name="ControlList" value="ControlList" id="9501" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="9502" addr="0x7fca46934c90" />
+                                                <attribute name="ControlImage" value="ControlImage" id="9503" addr="0x7fca46934c90" />
+                                                <attribute name="ControlButton" value="ControlButton" id="9504" addr="0x7fca46934c90" />
+                                                <attribute name="ControlGroup" value="ControlGroup" id="9505" addr="0x7fca46934c90" />
+                                                <attribute name="DialogBusy" value="DialogBusy" id="9506" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="9507" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSpin" value="ControlSpin" id="9508" addr="0x7fca46934c90" />
+                                                <attribute name="ControlEdit" value="ControlEdit" id="9509" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="9510" addr="0x7fca46934c90" />
+                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="9511" addr="0x7fca46934c90" />
+                                                <attribute name="ControlLabel" value="ControlLabel" id="9512" addr="0x7fca46934c90" />
+                                                <attribute name="ControlProgress" value="ControlProgress" id="9513" addr="0x7fca46934c90" />
+                                                <attribute name="Control" value="Control" id="9514" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSlider" value="ControlSlider" id="9515" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgress" value="DialogProgress" id="9516" addr="0x7fca46934c90" />
+                                                <attribute name="Action" value="Action" id="9517" addr="0x7fca46934c90" />
+                                                <attribute name="WindowDialog" value="WindowDialog" id="9518" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXML" value="WindowXML" id="9519" addr="0x7fca46934c90" />
+                                                <attribute name="ListItem" value="ListItem" id="9520" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="9521" addr="0x7fca46934c90" />
                                             </attributelist >
-                                            <typetabsitem id="9522" addr="0x7f99f1de1dd0" >
-                                                <attributelist id="9523" addr="0x7f99f1de1dd0" >
+                                            <typetabsitem id="9522" addr="0x7fca4692fdd0" >
+                                                <attributelist id="9523" addr="0x7fca4692fdd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9524" addr="0x7f99f1dde790" >
-                                                <attributelist id="9525" addr="0x7f99f1dde790" >
+                                            <typetabsitem id="9524" addr="0x7fca4692c790" >
+                                                <attributelist id="9525" addr="0x7fca4692c790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9526" addr="0x7f99f1de3f10" >
-                                                <attributelist id="9527" addr="0x7f99f1de3f10" >
+                                            <typetabsitem id="9526" addr="0x7fca46931f10" >
+                                                <attributelist id="9527" addr="0x7fca46931f10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9528" addr="0x7f99f1dd67b0" >
-                                                <attributelist id="9529" addr="0x7f99f1dd67b0" >
+                                            <typetabsitem id="9528" addr="0x7fca469247b0" >
+                                                <attributelist id="9529" addr="0x7fca469247b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9530" addr="0x7f99f1ddafd0" >
-                                                <attributelist id="9531" addr="0x7f99f1ddafd0" >
+                                            <typetabsitem id="9530" addr="0x7fca46928fd0" >
+                                                <attributelist id="9531" addr="0x7fca46928fd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9532" addr="0x7f99f1ddd430" >
-                                                <attributelist id="9533" addr="0x7f99f1ddd430" >
+                                            <typetabsitem id="9532" addr="0x7fca4692b430" >
+                                                <attributelist id="9533" addr="0x7fca4692b430" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9534" addr="0x7f99f1de2130" >
-                                                <attributelist id="9535" addr="0x7f99f1de2130" >
+                                            <typetabsitem id="9534" addr="0x7fca46930130" >
+                                                <attributelist id="9535" addr="0x7fca46930130" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9536" addr="0x7f99f1dd2f50" >
-                                                <attributelist id="9537" addr="0x7f99f1dd2f50" >
+                                            <typetabsitem id="9536" addr="0x7fca46920f50" >
+                                                <attributelist id="9537" addr="0x7fca46920f50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9538" addr="0x7f99f1dd9650" >
-                                                <attributelist id="9539" addr="0x7f99f1dd9650" >
+                                            <typetabsitem id="9538" addr="0x7fca46927650" >
+                                                <attributelist id="9539" addr="0x7fca46927650" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9540" addr="0x7f99f1de3390" >
-                                                <attributelist id="9541" addr="0x7f99f1de3390" >
+                                            <typetabsitem id="9540" addr="0x7fca46931390" >
+                                                <attributelist id="9541" addr="0x7fca46931390" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9542" addr="0x7f99f1ddb7b0" >
-                                                <attributelist id="9543" addr="0x7f99f1ddb7b0" >
+                                            <typetabsitem id="9542" addr="0x7fca469297b0" >
+                                                <attributelist id="9543" addr="0x7fca469297b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9544" addr="0x7f99f1ddc4b0" >
-                                                <attributelist id="9545" addr="0x7f99f1ddc4b0" >
+                                            <typetabsitem id="9544" addr="0x7fca4692a4b0" >
+                                                <attributelist id="9545" addr="0x7fca4692a4b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9546" addr="0x7f99f1ddcf90" >
-                                                <attributelist id="9547" addr="0x7f99f1ddcf90" >
+                                            <typetabsitem id="9546" addr="0x7fca4692af90" >
+                                                <attributelist id="9547" addr="0x7fca4692af90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9548" addr="0x7f99f1de11b0" >
-                                                <attributelist id="9549" addr="0x7f99f1de11b0" >
+                                            <typetabsitem id="9548" addr="0x7fca4692f1b0" >
+                                                <attributelist id="9549" addr="0x7fca4692f1b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9550" addr="0x7f99f1de15b0" >
-                                                <attributelist id="9551" addr="0x7f99f1de15b0" >
+                                            <typetabsitem id="9550" addr="0x7fca4692f5b0" >
+                                                <attributelist id="9551" addr="0x7fca4692f5b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9552" addr="0x7f99f1dd77f0" >
-                                                <attributelist id="9553" addr="0x7f99f1dd77f0" >
+                                            <typetabsitem id="9552" addr="0x7fca469257f0" >
+                                                <attributelist id="9553" addr="0x7fca469257f0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9554" addr="0x7f99f1dd8b30" >
-                                                <attributelist id="9555" addr="0x7f99f1dd8b30" >
+                                            <typetabsitem id="9554" addr="0x7fca46926b30" >
+                                                <attributelist id="9555" addr="0x7fca46926b30" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9556" addr="0x7f99f1dd2c50" >
-                                                <attributelist id="9557" addr="0x7f99f1dd2c50" >
+                                            <typetabsitem id="9556" addr="0x7fca46920c50" >
+                                                <attributelist id="9557" addr="0x7fca46920c50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9558" addr="0x7f99f1dda790" >
-                                                <attributelist id="9559" addr="0x7f99f1dda790" >
+                                            <typetabsitem id="9558" addr="0x7fca46928790" >
+                                                <attributelist id="9559" addr="0x7fca46928790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9560" addr="0x7f99f1dd8030" >
-                                                <attributelist id="9561" addr="0x7f99f1dd8030" >
+                                            <typetabsitem id="9560" addr="0x7fca46926030" >
+                                                <attributelist id="9561" addr="0x7fca46926030" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9562" addr="0x7f99f1ddbe10" >
-                                                <attributelist id="9563" addr="0x7f99f1ddbe10" >
+                                            <typetabsitem id="9562" addr="0x7fca46929e10" >
+                                                <attributelist id="9563" addr="0x7fca46929e10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9564" addr="0x7f99f1dd6b10" >
-                                                <attributelist id="9565" addr="0x7f99f1dd6b10" >
+                                            <typetabsitem id="9564" addr="0x7fca46924b10" >
+                                                <attributelist id="9565" addr="0x7fca46924b10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9566" addr="0x7f99f1dddf90" >
-                                                <attributelist id="9567" addr="0x7f99f1dddf90" >
+                                            <typetabsitem id="9566" addr="0x7fca4692bf90" >
+                                                <attributelist id="9567" addr="0x7fca4692bf90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9568" addr="0x7f99f1de0530" >
-                                                <attributelist id="9569" addr="0x7f99f1de0530" >
+                                            <typetabsitem id="9568" addr="0x7fca4692e530" >
+                                                <attributelist id="9569" addr="0x7fca4692e530" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9570" addr="0x7f99f1de1e50" >
-                                                <attributelist id="9571" addr="0x7f99f1de1e50" >
+                                            <typetabsitem id="9570" addr="0x7fca4692fe50" >
+                                                <attributelist id="9571" addr="0x7fca4692fe50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9572" addr="0x7f99f1de2d90" >
-                                                <attributelist id="9573" addr="0x7f99f1de2d90" >
+                                            <typetabsitem id="9572" addr="0x7fca46930d90" >
+                                                <attributelist id="9573" addr="0x7fca46930d90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9574" addr="0x7f99f1de3410" >
-                                                <attributelist id="9575" addr="0x7f99f1de3410" >
+                                            <typetabsitem id="9574" addr="0x7fca46931410" >
+                                                <attributelist id="9575" addr="0x7fca46931410" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9576" addr="0x7f99f1dd3590" >
-                                                <attributelist id="9577" addr="0x7f99f1dd3590" >
+                                            <typetabsitem id="9576" addr="0x7fca46921590" >
+                                                <attributelist id="9577" addr="0x7fca46921590" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="9578" addr="0x7f99f1dd3390" >
-                                                <attributelist id="9579" addr="0x7f99f1dd3390" >
+                                            <typetabsitem id="9578" addr="0x7fca46921390" >
+                                                <attributelist id="9579" addr="0x7fca46921390" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7f99f1dd1d70" id="9580" addr="0x7f99f1dd1d70" />
-                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="9581" addr="0x7f99f1de6c90" />
-                                        <attribute name="symtab" value="0x7f99f1e40fb0" id="9582" addr="0x7f99f1e40fb0" />
+                                        <attribute name="parent" value="0x7fca4691fd70" id="9580" addr="0x7fca4691fd70" />
+                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="9581" addr="0x7fca46934c90" />
+                                        <attribute name="symtab" value="0x7fca4698efb0" id="9582" addr="0x7fca4698efb0" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="9583" addr="0x7f99f1ddd530" >
-                                    <attributelist id="9584" addr="0x7f99f1ddd530" >
+                                <typescopesitem id="9583" addr="0x7fca4692b530" >
+                                    <attributelist id="9584" addr="0x7fca4692b530" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="9585" addr="0x7f99f1e84350" >
-                                    <attributelist id="9586" addr="0x7f99f1e84350" >
-                                        <attribute name="inherit" value="0x7f99f1e843b0" id="9587" addr="0x7f99f1e843b0" />
-                                        <attribute name="name" value="ControlRadioButton" id="9588" addr="0x7f99f1de6c90" />
-                                        <attribute name="csymtab" value="0x7f99f1e84370" id="9589" addr="0x7f99f1e84370" />
-                                        <attribute name="symtab" value="0x7f99f1e84330" id="9590" addr="0x7f99f1e84330" />
+                                <typescopesitem id="9585" addr="0x7fca469d2350" >
+                                    <attributelist id="9586" addr="0x7fca469d2350" >
+                                        <attribute name="inherit" value="0x7fca469d23b0" id="9587" addr="0x7fca469d23b0" />
+                                        <attribute name="name" value="ControlRadioButton" id="9588" addr="0x7fca46934c90" />
+                                        <attribute name="csymtab" value="0x7fca469d2370" id="9589" addr="0x7fca469d2370" />
+                                        <attribute name="symtab" value="0x7fca469d2330" id="9590" addr="0x7fca469d2330" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <access id="9591" addr="0x7f99f1e842d0" >
-                            <attributelist id="9592" addr="0x7f99f1e842d0" >
-                                <attribute name="kind" value="public" id="9593" addr="0x7f99f1de6c90" />
+                        <access id="9591" addr="0x7fca469d22d0" >
+                            <attributelist id="9592" addr="0x7fca469d22d0" >
+                                <attribute name="kind" value="public" id="9593" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="9594" addr="0x7f99f1e865d0" >
-                            <attributelist id="9595" addr="0x7f99f1e865d0" >
-                                <attribute name="name" value="ControlRadioButton" id="9596" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="9597" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e84350" id="9598" addr="0x7f99f1e84350" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e87350" id="9599" addr="0x7f99f1e87350" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e87350" id="9600" addr="0x7f99f1e87350" />
-                                <attribute name="sym_name" value="ControlRadioButton" id="9601" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,long,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char)." id="9602" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="9603" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e865d0" id="9604" addr="0x7f99f1e865d0" />
-                                <parmlist id="9605" addr="0x7f99f1e84510" >
+                        <constructor id="9594" addr="0x7fca469d45d0" >
+                            <attributelist id="9595" addr="0x7fca469d45d0" >
+                                <attribute name="name" value="ControlRadioButton" id="9596" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="9597" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469d2350" id="9598" addr="0x7fca469d2350" />
+                                <attribute name="sym_nextSibling" value="0x7fca469d5350" id="9599" addr="0x7fca469d5350" />
+                                <attribute name="csym_nextSibling" value="0x7fca469d5350" id="9600" addr="0x7fca469d5350" />
+                                <attribute name="sym_name" value="ControlRadioButton" id="9601" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,long,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char)." id="9602" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="9603" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469d45d0" id="9604" addr="0x7fca469d45d0" />
+                                <parmlist id="9605" addr="0x7fca469d2510" >
                                     <parm id="9606">
-                                        <attributelist id="9607" addr="0x7f99f1e84510" >
-                                            <attribute name="name" value="x" id="9608" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="9609" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9607" addr="0x7fca469d2510" >
+                                            <attribute name="name" value="x" id="9608" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="9609" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9610">
-                                        <attributelist id="9611" addr="0x7f99f1e84630" >
-                                            <attribute name="name" value="y" id="9612" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="9613" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9611" addr="0x7fca469d2630" >
+                                            <attribute name="name" value="y" id="9612" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="9613" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9614">
-                                        <attributelist id="9615" addr="0x7f99f1e84750" >
-                                            <attribute name="name" value="width" id="9616" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="9617" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9615" addr="0x7fca469d2750" >
+                                            <attribute name="name" value="width" id="9616" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="9617" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9618">
-                                        <attributelist id="9619" addr="0x7f99f1e84870" >
-                                            <attribute name="name" value="height" id="9620" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="9621" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9619" addr="0x7fca469d2870" >
+                                            <attribute name="name" value="height" id="9620" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="9621" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9622">
-                                        <attributelist id="9623" addr="0x7f99f1e849b0" >
-                                            <attribute name="name" value="label" id="9624" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="9625" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9623" addr="0x7fca469d29b0" >
+                                            <attribute name="name" value="label" id="9624" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="9625" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9626">
-                                        <attributelist id="9627" addr="0x7f99f1e84b50" >
-                                            <attribute name="name" value="focusOnTexture" id="9628" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9629" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9630" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9627" addr="0x7fca469d2b50" >
+                                            <attribute name="name" value="focusOnTexture" id="9628" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9629" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9630" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9631">
-                                        <attributelist id="9632" addr="0x7f99f1e84cf0" >
-                                            <attribute name="name" value="noFocusOnTexture" id="9633" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9634" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9635" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9632" addr="0x7fca469d2cf0" >
+                                            <attribute name="name" value="noFocusOnTexture" id="9633" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9634" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9635" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9636">
-                                        <attributelist id="9637" addr="0x7f99f1e84e90" >
-                                            <attribute name="name" value="focusOffTexture" id="9638" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9639" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9640" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9637" addr="0x7fca469d2e90" >
+                                            <attribute name="name" value="focusOffTexture" id="9638" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9639" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9640" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9641">
-                                        <attributelist id="9642" addr="0x7f99f1e85030" >
-                                            <attribute name="name" value="noFocusOffTexture" id="9643" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9644" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9645" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9642" addr="0x7fca469d3030" >
+                                            <attribute name="name" value="noFocusOffTexture" id="9643" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9644" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9645" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9646">
-                                        <attributelist id="9647" addr="0x7f99f1e851d0" >
-                                            <attribute name="name" value="focusTexture" id="9648" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9649" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9650" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9647" addr="0x7fca469d31d0" >
+                                            <attribute name="name" value="focusTexture" id="9648" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9649" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9650" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9651">
-                                        <attributelist id="9652" addr="0x7f99f1e85370" >
-                                            <attribute name="name" value="noFocusTexture" id="9653" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9654" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9655" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9652" addr="0x7fca469d3370" >
+                                            <attribute name="name" value="noFocusTexture" id="9653" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9654" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9655" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9656">
-                                        <attributelist id="9657" addr="0x7f99f1e854d0" >
-                                            <attribute name="name" value="textOffsetX" id="9658" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="9659" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="9660" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9657" addr="0x7fca469d34d0" >
+                                            <attribute name="name" value="textOffsetX" id="9658" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="9659" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="9660" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9661">
-                                        <attributelist id="9662" addr="0x7f99f1e85630" >
-                                            <attribute name="name" value="textOffsetY" id="9663" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="2" id="9664" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="9665" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9662" addr="0x7fca469d3630" >
+                                            <attribute name="name" value="textOffsetY" id="9663" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="2" id="9664" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="9665" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9666">
-                                        <attributelist id="9667" addr="0x7f99f1e85850" >
-                                            <attribute name="name" value="_alignment" id="9668" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="(XBFONT_LEFT|XBFONT_CENTER_Y)" id="9669" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="9670" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9667" addr="0x7fca469d3850" >
+                                            <attribute name="name" value="_alignment" id="9668" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="(XBFONT_LEFT|XBFONT_CENTER_Y)" id="9669" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="9670" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9671">
-                                        <attributelist id="9672" addr="0x7f99f1e859f0" >
-                                            <attribute name="name" value="font" id="9673" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9674" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9675" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9672" addr="0x7fca469d39f0" >
+                                            <attribute name="name" value="font" id="9673" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9674" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9675" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9676">
-                                        <attributelist id="9677" addr="0x7f99f1e85b90" >
-                                            <attribute name="name" value="textColor" id="9678" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9679" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9680" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9677" addr="0x7fca469d3b90" >
+                                            <attribute name="name" value="textColor" id="9678" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9679" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9680" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9681">
-                                        <attributelist id="9682" addr="0x7f99f1e85d30" >
-                                            <attribute name="name" value="disabledColor" id="9683" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9684" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9685" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9682" addr="0x7fca469d3d30" >
+                                            <attribute name="name" value="disabledColor" id="9683" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9684" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9685" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9686">
-                                        <attributelist id="9687" addr="0x7f99f1e85e90" >
-                                            <attribute name="name" value="angle" id="9688" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="0" id="9689" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="9690" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9687" addr="0x7fca469d3e90" >
+                                            <attribute name="name" value="angle" id="9688" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="0" id="9689" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="9690" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9691">
-                                        <attributelist id="9692" addr="0x7f99f1e86030" >
-                                            <attribute name="name" value="shadowColor" id="9693" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9694" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9695" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9692" addr="0x7fca469d4030" >
+                                            <attribute name="name" value="shadowColor" id="9693" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9694" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9695" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9696">
-                                        <attributelist id="9697" addr="0x7f99f1e861d0" >
-                                            <attribute name="name" value="focusedColor" id="9698" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9699" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9700" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9697" addr="0x7fca469d41d0" >
+                                            <attribute name="name" value="focusedColor" id="9698" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9699" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9700" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9701">
-                                        <attributelist id="9702" addr="0x7f99f1e86370" >
-                                            <attribute name="name" value="disabledOnTexture" id="9703" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9704" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9705" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9702" addr="0x7fca469d4370" >
+                                            <attribute name="name" value="disabledOnTexture" id="9703" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9704" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9705" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9706">
-                                        <attributelist id="9707" addr="0x7f99f1e86510" >
-                                            <attribute name="name" value="disabledOffTexture" id="9708" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9709" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9710" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9707" addr="0x7fca469d4510" >
+                                            <attribute name="name" value="disabledOffTexture" id="9708" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9709" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9710" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_0" id="9711" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="9712" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="9711" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="9712" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="9713" addr="0x7f99f1e87350" >
-                            <attributelist id="9714" addr="0x7f99f1e87350" >
-                                <attribute name="name" value="ControlRadioButton" id="9715" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="9716" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e84350" id="9717" addr="0x7f99f1e84350" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e88030" id="9718" addr="0x7f99f1e88030" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e865d0" id="9719" addr="0x7f99f1e865d0" />
-                                <attribute name="sym_name" value="ControlRadioButton" id="9720" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e88030" id="9721" addr="0x7f99f1e88030" />
-                                <attribute name="defaultargs" value="0x7f99f1e865d0" id="9722" addr="0x7f99f1e865d0" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,long,p.q(const).char,p.q(const).char,p.q(const).char)." id="9723" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="9724" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e865d0" id="9725" addr="0x7f99f1e865d0" />
-                                <parmlist id="9726" addr="0x7f99f1e86670" >
+                        <constructor id="9713" addr="0x7fca469d5350" >
+                            <attributelist id="9714" addr="0x7fca469d5350" >
+                                <attribute name="name" value="ControlRadioButton" id="9715" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="9716" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469d2350" id="9717" addr="0x7fca469d2350" />
+                                <attribute name="csym_nextSibling" value="0x7fca469d6030" id="9718" addr="0x7fca469d6030" />
+                                <attribute name="sym_previousSibling" value="0x7fca469d45d0" id="9719" addr="0x7fca469d45d0" />
+                                <attribute name="sym_name" value="ControlRadioButton" id="9720" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469d6030" id="9721" addr="0x7fca469d6030" />
+                                <attribute name="defaultargs" value="0x7fca469d45d0" id="9722" addr="0x7fca469d45d0" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,long,p.q(const).char,p.q(const).char,p.q(const).char)." id="9723" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="9724" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469d45d0" id="9725" addr="0x7fca469d45d0" />
+                                <parmlist id="9726" addr="0x7fca469d4670" >
                                     <parm id="9727">
-                                        <attributelist id="9728" addr="0x7f99f1e86670" >
-                                            <attribute name="name" value="x" id="9729" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="9730" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9728" addr="0x7fca469d4670" >
+                                            <attribute name="name" value="x" id="9729" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="9730" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9731">
-                                        <attributelist id="9732" addr="0x7f99f1e86730" >
-                                            <attribute name="name" value="y" id="9733" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="9734" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9732" addr="0x7fca469d4730" >
+                                            <attribute name="name" value="y" id="9733" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="9734" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9735">
-                                        <attributelist id="9736" addr="0x7f99f1e867b0" >
-                                            <attribute name="name" value="width" id="9737" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="9738" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9736" addr="0x7fca469d47b0" >
+                                            <attribute name="name" value="width" id="9737" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="9738" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9739">
-                                        <attributelist id="9740" addr="0x7f99f1e86830" >
-                                            <attribute name="name" value="height" id="9741" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="9742" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9740" addr="0x7fca469d4830" >
+                                            <attribute name="name" value="height" id="9741" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="9742" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9743">
-                                        <attributelist id="9744" addr="0x7f99f1e868b0" >
-                                            <attribute name="name" value="label" id="9745" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="9746" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9744" addr="0x7fca469d48b0" >
+                                            <attribute name="name" value="label" id="9745" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="9746" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9747">
-                                        <attributelist id="9748" addr="0x7f99f1e86930" >
-                                            <attribute name="name" value="focusOnTexture" id="9749" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9750" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9751" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9748" addr="0x7fca469d4930" >
+                                            <attribute name="name" value="focusOnTexture" id="9749" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9750" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9751" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9752">
-                                        <attributelist id="9753" addr="0x7f99f1e869d0" >
-                                            <attribute name="name" value="noFocusOnTexture" id="9754" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9755" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9756" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9753" addr="0x7fca469d49d0" >
+                                            <attribute name="name" value="noFocusOnTexture" id="9754" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9755" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9756" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9757">
-                                        <attributelist id="9758" addr="0x7f99f1e86a70" >
-                                            <attribute name="name" value="focusOffTexture" id="9759" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9760" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9761" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9758" addr="0x7fca469d4a70" >
+                                            <attribute name="name" value="focusOffTexture" id="9759" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9760" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9761" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9762">
-                                        <attributelist id="9763" addr="0x7f99f1e86b10" >
-                                            <attribute name="name" value="noFocusOffTexture" id="9764" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9765" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9766" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9763" addr="0x7fca469d4b10" >
+                                            <attribute name="name" value="noFocusOffTexture" id="9764" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9765" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9766" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9767">
-                                        <attributelist id="9768" addr="0x7f99f1e86bb0" >
-                                            <attribute name="name" value="focusTexture" id="9769" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9770" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9771" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9768" addr="0x7fca469d4bb0" >
+                                            <attribute name="name" value="focusTexture" id="9769" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9770" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9771" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9772">
-                                        <attributelist id="9773" addr="0x7f99f1e86c50" >
-                                            <attribute name="name" value="noFocusTexture" id="9774" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9775" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9776" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9773" addr="0x7fca469d4c50" >
+                                            <attribute name="name" value="noFocusTexture" id="9774" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9775" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9776" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9777">
-                                        <attributelist id="9778" addr="0x7f99f1e86cf0" >
-                                            <attribute name="name" value="textOffsetX" id="9779" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="9780" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="9781" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9778" addr="0x7fca469d4cf0" >
+                                            <attribute name="name" value="textOffsetX" id="9779" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="9780" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="9781" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9782">
-                                        <attributelist id="9783" addr="0x7f99f1e86d90" >
-                                            <attribute name="name" value="textOffsetY" id="9784" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="2" id="9785" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="9786" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9783" addr="0x7fca469d4d90" >
+                                            <attribute name="name" value="textOffsetY" id="9784" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="2" id="9785" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="9786" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9787">
-                                        <attributelist id="9788" addr="0x7f99f1e86e30" >
-                                            <attribute name="name" value="_alignment" id="9789" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="(XBFONT_LEFT|XBFONT_CENTER_Y)" id="9790" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="9791" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9788" addr="0x7fca469d4e30" >
+                                            <attribute name="name" value="_alignment" id="9789" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="(XBFONT_LEFT|XBFONT_CENTER_Y)" id="9790" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="9791" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9792">
-                                        <attributelist id="9793" addr="0x7f99f1e86ed0" >
-                                            <attribute name="name" value="font" id="9794" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9795" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9796" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9793" addr="0x7fca469d4ed0" >
+                                            <attribute name="name" value="font" id="9794" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9795" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9796" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9797">
-                                        <attributelist id="9798" addr="0x7f99f1e86f70" >
-                                            <attribute name="name" value="textColor" id="9799" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9800" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9801" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9798" addr="0x7fca469d4f70" >
+                                            <attribute name="name" value="textColor" id="9799" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9800" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9801" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9802">
-                                        <attributelist id="9803" addr="0x7f99f1e87010" >
-                                            <attribute name="name" value="disabledColor" id="9804" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9805" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9806" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9803" addr="0x7fca469d5010" >
+                                            <attribute name="name" value="disabledColor" id="9804" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9805" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9806" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9807">
-                                        <attributelist id="9808" addr="0x7f99f1e870b0" >
-                                            <attribute name="name" value="angle" id="9809" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="0" id="9810" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="9811" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9808" addr="0x7fca469d50b0" >
+                                            <attribute name="name" value="angle" id="9809" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="0" id="9810" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="9811" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9812">
-                                        <attributelist id="9813" addr="0x7f99f1e87150" >
-                                            <attribute name="name" value="shadowColor" id="9814" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9815" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9816" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9813" addr="0x7fca469d5150" >
+                                            <attribute name="name" value="shadowColor" id="9814" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9815" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9816" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9817">
-                                        <attributelist id="9818" addr="0x7f99f1e871f0" >
-                                            <attribute name="name" value="focusedColor" id="9819" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9820" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9821" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9818" addr="0x7fca469d51f0" >
+                                            <attribute name="name" value="focusedColor" id="9819" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9820" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9821" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9822">
-                                        <attributelist id="9823" addr="0x7f99f1e87290" >
-                                            <attribute name="name" value="disabledOnTexture" id="9824" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9825" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9826" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9823" addr="0x7fca469d5290" >
+                                            <attribute name="name" value="disabledOnTexture" id="9824" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9825" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9826" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_1" id="9827" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="9828" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="9827" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="9828" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="9829" addr="0x7f99f1e88030" >
-                            <attributelist id="9830" addr="0x7f99f1e88030" >
-                                <attribute name="name" value="ControlRadioButton" id="9831" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="9832" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e84350" id="9833" addr="0x7f99f1e84350" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e88c70" id="9834" addr="0x7f99f1e88c70" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e87350" id="9835" addr="0x7f99f1e87350" />
-                                <attribute name="sym_name" value="ControlRadioButton" id="9836" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e88c70" id="9837" addr="0x7f99f1e88c70" />
-                                <attribute name="defaultargs" value="0x7f99f1e865d0" id="9838" addr="0x7f99f1e865d0" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,long,p.q(const).char,p.q(const).char)." id="9839" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="9840" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e865d0" id="9841" addr="0x7f99f1e865d0" />
-                                <parmlist id="9842" addr="0x7f99f1e873f0" >
+                        <constructor id="9829" addr="0x7fca469d6030" >
+                            <attributelist id="9830" addr="0x7fca469d6030" >
+                                <attribute name="name" value="ControlRadioButton" id="9831" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="9832" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469d2350" id="9833" addr="0x7fca469d2350" />
+                                <attribute name="csym_nextSibling" value="0x7fca469d6c70" id="9834" addr="0x7fca469d6c70" />
+                                <attribute name="sym_previousSibling" value="0x7fca469d5350" id="9835" addr="0x7fca469d5350" />
+                                <attribute name="sym_name" value="ControlRadioButton" id="9836" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469d6c70" id="9837" addr="0x7fca469d6c70" />
+                                <attribute name="defaultargs" value="0x7fca469d45d0" id="9838" addr="0x7fca469d45d0" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,long,p.q(const).char,p.q(const).char)." id="9839" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="9840" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469d45d0" id="9841" addr="0x7fca469d45d0" />
+                                <parmlist id="9842" addr="0x7fca469d53f0" >
                                     <parm id="9843">
-                                        <attributelist id="9844" addr="0x7f99f1e873f0" >
-                                            <attribute name="name" value="x" id="9845" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="9846" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9844" addr="0x7fca469d53f0" >
+                                            <attribute name="name" value="x" id="9845" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="9846" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9847">
-                                        <attributelist id="9848" addr="0x7f99f1e874b0" >
-                                            <attribute name="name" value="y" id="9849" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="9850" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9848" addr="0x7fca469d54b0" >
+                                            <attribute name="name" value="y" id="9849" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="9850" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9851">
-                                        <attributelist id="9852" addr="0x7f99f1e87530" >
-                                            <attribute name="name" value="width" id="9853" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="9854" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9852" addr="0x7fca469d5530" >
+                                            <attribute name="name" value="width" id="9853" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="9854" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9855">
-                                        <attributelist id="9856" addr="0x7f99f1e875b0" >
-                                            <attribute name="name" value="height" id="9857" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="9858" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9856" addr="0x7fca469d55b0" >
+                                            <attribute name="name" value="height" id="9857" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="9858" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9859">
-                                        <attributelist id="9860" addr="0x7f99f1e87630" >
-                                            <attribute name="name" value="label" id="9861" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="9862" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9860" addr="0x7fca469d5630" >
+                                            <attribute name="name" value="label" id="9861" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="9862" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9863">
-                                        <attributelist id="9864" addr="0x7f99f1e876b0" >
-                                            <attribute name="name" value="focusOnTexture" id="9865" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9866" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9867" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9864" addr="0x7fca469d56b0" >
+                                            <attribute name="name" value="focusOnTexture" id="9865" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9866" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9867" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9868">
-                                        <attributelist id="9869" addr="0x7f99f1e87750" >
-                                            <attribute name="name" value="noFocusOnTexture" id="9870" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9871" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9872" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9869" addr="0x7fca469d5750" >
+                                            <attribute name="name" value="noFocusOnTexture" id="9870" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9871" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9872" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9873">
-                                        <attributelist id="9874" addr="0x7f99f1e877f0" >
-                                            <attribute name="name" value="focusOffTexture" id="9875" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9876" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9877" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9874" addr="0x7fca469d57f0" >
+                                            <attribute name="name" value="focusOffTexture" id="9875" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9876" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9877" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9878">
-                                        <attributelist id="9879" addr="0x7f99f1e87890" >
-                                            <attribute name="name" value="noFocusOffTexture" id="9880" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9881" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9882" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9879" addr="0x7fca469d5890" >
+                                            <attribute name="name" value="noFocusOffTexture" id="9880" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9881" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9882" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9883">
-                                        <attributelist id="9884" addr="0x7f99f1e87930" >
-                                            <attribute name="name" value="focusTexture" id="9885" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9886" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9887" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9884" addr="0x7fca469d5930" >
+                                            <attribute name="name" value="focusTexture" id="9885" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9886" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9887" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9888">
-                                        <attributelist id="9889" addr="0x7f99f1e879d0" >
-                                            <attribute name="name" value="noFocusTexture" id="9890" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9891" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9892" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9889" addr="0x7fca469d59d0" >
+                                            <attribute name="name" value="noFocusTexture" id="9890" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9891" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9892" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9893">
-                                        <attributelist id="9894" addr="0x7f99f1e87a70" >
-                                            <attribute name="name" value="textOffsetX" id="9895" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="9896" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="9897" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9894" addr="0x7fca469d5a70" >
+                                            <attribute name="name" value="textOffsetX" id="9895" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="9896" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="9897" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9898">
-                                        <attributelist id="9899" addr="0x7f99f1e87b10" >
-                                            <attribute name="name" value="textOffsetY" id="9900" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="2" id="9901" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="9902" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9899" addr="0x7fca469d5b10" >
+                                            <attribute name="name" value="textOffsetY" id="9900" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="2" id="9901" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="9902" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9903">
-                                        <attributelist id="9904" addr="0x7f99f1e87bb0" >
-                                            <attribute name="name" value="_alignment" id="9905" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="(XBFONT_LEFT|XBFONT_CENTER_Y)" id="9906" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="9907" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9904" addr="0x7fca469d5bb0" >
+                                            <attribute name="name" value="_alignment" id="9905" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="(XBFONT_LEFT|XBFONT_CENTER_Y)" id="9906" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="9907" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9908">
-                                        <attributelist id="9909" addr="0x7f99f1e87c50" >
-                                            <attribute name="name" value="font" id="9910" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9911" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9912" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9909" addr="0x7fca469d5c50" >
+                                            <attribute name="name" value="font" id="9910" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9911" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9912" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9913">
-                                        <attributelist id="9914" addr="0x7f99f1e87cf0" >
-                                            <attribute name="name" value="textColor" id="9915" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9916" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9917" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9914" addr="0x7fca469d5cf0" >
+                                            <attribute name="name" value="textColor" id="9915" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9916" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9917" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9918">
-                                        <attributelist id="9919" addr="0x7f99f1e87d90" >
-                                            <attribute name="name" value="disabledColor" id="9920" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9921" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9922" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9919" addr="0x7fca469d5d90" >
+                                            <attribute name="name" value="disabledColor" id="9920" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9921" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9922" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9923">
-                                        <attributelist id="9924" addr="0x7f99f1e87e30" >
-                                            <attribute name="name" value="angle" id="9925" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="0" id="9926" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="9927" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9924" addr="0x7fca469d5e30" >
+                                            <attribute name="name" value="angle" id="9925" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="0" id="9926" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="9927" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9928">
-                                        <attributelist id="9929" addr="0x7f99f1e87ed0" >
-                                            <attribute name="name" value="shadowColor" id="9930" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9931" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9932" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9929" addr="0x7fca469d5ed0" >
+                                            <attribute name="name" value="shadowColor" id="9930" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9931" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9932" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9933">
-                                        <attributelist id="9934" addr="0x7f99f1e87f70" >
-                                            <attribute name="name" value="focusedColor" id="9935" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9936" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9937" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9934" addr="0x7fca469d5f70" >
+                                            <attribute name="name" value="focusedColor" id="9935" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9936" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9937" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_2" id="9938" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="9939" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_2" id="9938" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="9939" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="9940" addr="0x7f99f1e88c70" >
-                            <attributelist id="9941" addr="0x7f99f1e88c70" >
-                                <attribute name="name" value="ControlRadioButton" id="9942" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="9943" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e84350" id="9944" addr="0x7f99f1e84350" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e89810" id="9945" addr="0x7f99f1e89810" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e88030" id="9946" addr="0x7f99f1e88030" />
-                                <attribute name="sym_name" value="ControlRadioButton" id="9947" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e89810" id="9948" addr="0x7f99f1e89810" />
-                                <attribute name="defaultargs" value="0x7f99f1e865d0" id="9949" addr="0x7f99f1e865d0" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,long,p.q(const).char)." id="9950" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="9951" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e865d0" id="9952" addr="0x7f99f1e865d0" />
-                                <parmlist id="9953" addr="0x7f99f1e880d0" >
+                        <constructor id="9940" addr="0x7fca469d6c70" >
+                            <attributelist id="9941" addr="0x7fca469d6c70" >
+                                <attribute name="name" value="ControlRadioButton" id="9942" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="9943" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469d2350" id="9944" addr="0x7fca469d2350" />
+                                <attribute name="csym_nextSibling" value="0x7fca469d7810" id="9945" addr="0x7fca469d7810" />
+                                <attribute name="sym_previousSibling" value="0x7fca469d6030" id="9946" addr="0x7fca469d6030" />
+                                <attribute name="sym_name" value="ControlRadioButton" id="9947" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469d7810" id="9948" addr="0x7fca469d7810" />
+                                <attribute name="defaultargs" value="0x7fca469d45d0" id="9949" addr="0x7fca469d45d0" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,long,p.q(const).char)." id="9950" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="9951" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469d45d0" id="9952" addr="0x7fca469d45d0" />
+                                <parmlist id="9953" addr="0x7fca469d60d0" >
                                     <parm id="9954">
-                                        <attributelist id="9955" addr="0x7f99f1e880d0" >
-                                            <attribute name="name" value="x" id="9956" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="9957" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9955" addr="0x7fca469d60d0" >
+                                            <attribute name="name" value="x" id="9956" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="9957" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9958">
-                                        <attributelist id="9959" addr="0x7f99f1e88190" >
-                                            <attribute name="name" value="y" id="9960" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="9961" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9959" addr="0x7fca469d6190" >
+                                            <attribute name="name" value="y" id="9960" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="9961" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9962">
-                                        <attributelist id="9963" addr="0x7f99f1e88210" >
-                                            <attribute name="name" value="width" id="9964" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="9965" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9963" addr="0x7fca469d6210" >
+                                            <attribute name="name" value="width" id="9964" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="9965" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9966">
-                                        <attributelist id="9967" addr="0x7f99f1e88290" >
-                                            <attribute name="name" value="height" id="9968" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="9969" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9967" addr="0x7fca469d6290" >
+                                            <attribute name="name" value="height" id="9968" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="9969" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9970">
-                                        <attributelist id="9971" addr="0x7f99f1e88310" >
-                                            <attribute name="name" value="label" id="9972" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="9973" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9971" addr="0x7fca469d6310" >
+                                            <attribute name="name" value="label" id="9972" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="9973" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9974">
-                                        <attributelist id="9975" addr="0x7f99f1e88390" >
-                                            <attribute name="name" value="focusOnTexture" id="9976" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9977" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9978" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9975" addr="0x7fca469d6390" >
+                                            <attribute name="name" value="focusOnTexture" id="9976" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9977" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9978" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9979">
-                                        <attributelist id="9980" addr="0x7f99f1e88430" >
-                                            <attribute name="name" value="noFocusOnTexture" id="9981" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9982" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9983" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9980" addr="0x7fca469d6430" >
+                                            <attribute name="name" value="noFocusOnTexture" id="9981" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9982" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9983" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9984">
-                                        <attributelist id="9985" addr="0x7f99f1e884d0" >
-                                            <attribute name="name" value="focusOffTexture" id="9986" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9987" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9988" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9985" addr="0x7fca469d64d0" >
+                                            <attribute name="name" value="focusOffTexture" id="9986" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9987" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9988" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9989">
-                                        <attributelist id="9990" addr="0x7f99f1e88570" >
-                                            <attribute name="name" value="noFocusOffTexture" id="9991" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9992" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9993" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9990" addr="0x7fca469d6570" >
+                                            <attribute name="name" value="noFocusOffTexture" id="9991" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9992" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9993" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9994">
-                                        <attributelist id="9995" addr="0x7f99f1e88610" >
-                                            <attribute name="name" value="focusTexture" id="9996" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="9997" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="9998" addr="0x7f99f1de6c90" />
+                                        <attributelist id="9995" addr="0x7fca469d6610" >
+                                            <attribute name="name" value="focusTexture" id="9996" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="9997" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="9998" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="9999">
-                                        <attributelist id="10000" addr="0x7f99f1e886b0" >
-                                            <attribute name="name" value="noFocusTexture" id="10001" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10002" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10003" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10000" addr="0x7fca469d66b0" >
+                                            <attribute name="name" value="noFocusTexture" id="10001" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10002" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10003" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10004">
-                                        <attributelist id="10005" addr="0x7f99f1e88750" >
-                                            <attribute name="name" value="textOffsetX" id="10006" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="10007" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10008" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10005" addr="0x7fca469d6750" >
+                                            <attribute name="name" value="textOffsetX" id="10006" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="10007" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10008" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10009">
-                                        <attributelist id="10010" addr="0x7f99f1e887f0" >
-                                            <attribute name="name" value="textOffsetY" id="10011" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="2" id="10012" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10013" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10010" addr="0x7fca469d67f0" >
+                                            <attribute name="name" value="textOffsetY" id="10011" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="2" id="10012" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10013" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10014">
-                                        <attributelist id="10015" addr="0x7f99f1e88890" >
-                                            <attribute name="name" value="_alignment" id="10016" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="(XBFONT_LEFT|XBFONT_CENTER_Y)" id="10017" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10018" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10015" addr="0x7fca469d6890" >
+                                            <attribute name="name" value="_alignment" id="10016" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="(XBFONT_LEFT|XBFONT_CENTER_Y)" id="10017" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10018" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10019">
-                                        <attributelist id="10020" addr="0x7f99f1e88930" >
-                                            <attribute name="name" value="font" id="10021" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10022" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10023" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10020" addr="0x7fca469d6930" >
+                                            <attribute name="name" value="font" id="10021" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10022" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10023" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10024">
-                                        <attributelist id="10025" addr="0x7f99f1e889d0" >
-                                            <attribute name="name" value="textColor" id="10026" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10027" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10028" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10025" addr="0x7fca469d69d0" >
+                                            <attribute name="name" value="textColor" id="10026" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10027" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10028" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10029">
-                                        <attributelist id="10030" addr="0x7f99f1e88a70" >
-                                            <attribute name="name" value="disabledColor" id="10031" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10032" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10033" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10030" addr="0x7fca469d6a70" >
+                                            <attribute name="name" value="disabledColor" id="10031" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10032" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10033" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10034">
-                                        <attributelist id="10035" addr="0x7f99f1e88b10" >
-                                            <attribute name="name" value="angle" id="10036" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="0" id="10037" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10038" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10035" addr="0x7fca469d6b10" >
+                                            <attribute name="name" value="angle" id="10036" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="0" id="10037" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10038" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10039">
-                                        <attributelist id="10040" addr="0x7f99f1e88bb0" >
-                                            <attribute name="name" value="shadowColor" id="10041" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10042" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10043" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10040" addr="0x7fca469d6bb0" >
+                                            <attribute name="name" value="shadowColor" id="10041" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10042" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10043" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_3" id="10044" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="10045" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_3" id="10044" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="10045" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="10046" addr="0x7f99f1e89810" >
-                            <attributelist id="10047" addr="0x7f99f1e89810" >
-                                <attribute name="name" value="ControlRadioButton" id="10048" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="10049" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e84350" id="10050" addr="0x7f99f1e84350" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e8a310" id="10051" addr="0x7f99f1e8a310" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e88c70" id="10052" addr="0x7f99f1e88c70" />
-                                <attribute name="sym_name" value="ControlRadioButton" id="10053" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e8a310" id="10054" addr="0x7f99f1e8a310" />
-                                <attribute name="defaultargs" value="0x7f99f1e865d0" id="10055" addr="0x7f99f1e865d0" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,long)." id="10056" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="10057" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e865d0" id="10058" addr="0x7f99f1e865d0" />
-                                <parmlist id="10059" addr="0x7f99f1e88d10" >
+                        <constructor id="10046" addr="0x7fca469d7810" >
+                            <attributelist id="10047" addr="0x7fca469d7810" >
+                                <attribute name="name" value="ControlRadioButton" id="10048" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="10049" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469d2350" id="10050" addr="0x7fca469d2350" />
+                                <attribute name="csym_nextSibling" value="0x7fca469d8310" id="10051" addr="0x7fca469d8310" />
+                                <attribute name="sym_previousSibling" value="0x7fca469d6c70" id="10052" addr="0x7fca469d6c70" />
+                                <attribute name="sym_name" value="ControlRadioButton" id="10053" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469d8310" id="10054" addr="0x7fca469d8310" />
+                                <attribute name="defaultargs" value="0x7fca469d45d0" id="10055" addr="0x7fca469d45d0" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,long)." id="10056" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="10057" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469d45d0" id="10058" addr="0x7fca469d45d0" />
+                                <parmlist id="10059" addr="0x7fca469d6d10" >
                                     <parm id="10060">
-                                        <attributelist id="10061" addr="0x7f99f1e88d10" >
-                                            <attribute name="name" value="x" id="10062" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10063" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10061" addr="0x7fca469d6d10" >
+                                            <attribute name="name" value="x" id="10062" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10063" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10064">
-                                        <attributelist id="10065" addr="0x7f99f1e88dd0" >
-                                            <attribute name="name" value="y" id="10066" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10067" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10065" addr="0x7fca469d6dd0" >
+                                            <attribute name="name" value="y" id="10066" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10067" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10068">
-                                        <attributelist id="10069" addr="0x7f99f1e88e50" >
-                                            <attribute name="name" value="width" id="10070" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10071" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10069" addr="0x7fca469d6e50" >
+                                            <attribute name="name" value="width" id="10070" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10071" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10072">
-                                        <attributelist id="10073" addr="0x7f99f1e88ed0" >
-                                            <attribute name="name" value="height" id="10074" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10075" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10073" addr="0x7fca469d6ed0" >
+                                            <attribute name="name" value="height" id="10074" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10075" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10076">
-                                        <attributelist id="10077" addr="0x7f99f1e88f50" >
-                                            <attribute name="name" value="label" id="10078" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="10079" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10077" addr="0x7fca469d6f50" >
+                                            <attribute name="name" value="label" id="10078" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="10079" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10080">
-                                        <attributelist id="10081" addr="0x7f99f1e88fd0" >
-                                            <attribute name="name" value="focusOnTexture" id="10082" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10083" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10084" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10081" addr="0x7fca469d6fd0" >
+                                            <attribute name="name" value="focusOnTexture" id="10082" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10083" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10084" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10085">
-                                        <attributelist id="10086" addr="0x7f99f1e89070" >
-                                            <attribute name="name" value="noFocusOnTexture" id="10087" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10088" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10089" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10086" addr="0x7fca469d7070" >
+                                            <attribute name="name" value="noFocusOnTexture" id="10087" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10088" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10089" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10090">
-                                        <attributelist id="10091" addr="0x7f99f1e89110" >
-                                            <attribute name="name" value="focusOffTexture" id="10092" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10093" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10094" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10091" addr="0x7fca469d7110" >
+                                            <attribute name="name" value="focusOffTexture" id="10092" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10093" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10094" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10095">
-                                        <attributelist id="10096" addr="0x7f99f1e891b0" >
-                                            <attribute name="name" value="noFocusOffTexture" id="10097" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10098" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10099" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10096" addr="0x7fca469d71b0" >
+                                            <attribute name="name" value="noFocusOffTexture" id="10097" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10098" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10099" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10100">
-                                        <attributelist id="10101" addr="0x7f99f1e89250" >
-                                            <attribute name="name" value="focusTexture" id="10102" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10103" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10104" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10101" addr="0x7fca469d7250" >
+                                            <attribute name="name" value="focusTexture" id="10102" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10103" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10104" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10105">
-                                        <attributelist id="10106" addr="0x7f99f1e892f0" >
-                                            <attribute name="name" value="noFocusTexture" id="10107" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10108" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10109" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10106" addr="0x7fca469d72f0" >
+                                            <attribute name="name" value="noFocusTexture" id="10107" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10108" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10109" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10110">
-                                        <attributelist id="10111" addr="0x7f99f1e89390" >
-                                            <attribute name="name" value="textOffsetX" id="10112" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="10113" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10114" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10111" addr="0x7fca469d7390" >
+                                            <attribute name="name" value="textOffsetX" id="10112" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="10113" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10114" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10115">
-                                        <attributelist id="10116" addr="0x7f99f1e89430" >
-                                            <attribute name="name" value="textOffsetY" id="10117" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="2" id="10118" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10119" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10116" addr="0x7fca469d7430" >
+                                            <attribute name="name" value="textOffsetY" id="10117" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="2" id="10118" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10119" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10120">
-                                        <attributelist id="10121" addr="0x7f99f1e894d0" >
-                                            <attribute name="name" value="_alignment" id="10122" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="(XBFONT_LEFT|XBFONT_CENTER_Y)" id="10123" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10124" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10121" addr="0x7fca469d74d0" >
+                                            <attribute name="name" value="_alignment" id="10122" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="(XBFONT_LEFT|XBFONT_CENTER_Y)" id="10123" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10124" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10125">
-                                        <attributelist id="10126" addr="0x7f99f1e89570" >
-                                            <attribute name="name" value="font" id="10127" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10128" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10129" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10126" addr="0x7fca469d7570" >
+                                            <attribute name="name" value="font" id="10127" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10128" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10129" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10130">
-                                        <attributelist id="10131" addr="0x7f99f1e89610" >
-                                            <attribute name="name" value="textColor" id="10132" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10133" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10134" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10131" addr="0x7fca469d7610" >
+                                            <attribute name="name" value="textColor" id="10132" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10133" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10134" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10135">
-                                        <attributelist id="10136" addr="0x7f99f1e896b0" >
-                                            <attribute name="name" value="disabledColor" id="10137" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10138" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10139" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10136" addr="0x7fca469d76b0" >
+                                            <attribute name="name" value="disabledColor" id="10137" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10138" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10139" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10140">
-                                        <attributelist id="10141" addr="0x7f99f1e89750" >
-                                            <attribute name="name" value="angle" id="10142" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="0" id="10143" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10144" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10141" addr="0x7fca469d7750" >
+                                            <attribute name="name" value="angle" id="10142" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="0" id="10143" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10144" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_4" id="10145" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="10146" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_4" id="10145" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="10146" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="10147" addr="0x7f99f1e8a310" >
-                            <attributelist id="10148" addr="0x7f99f1e8a310" >
-                                <attribute name="name" value="ControlRadioButton" id="10149" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="10150" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e84350" id="10151" addr="0x7f99f1e84350" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e8ad70" id="10152" addr="0x7f99f1e8ad70" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e89810" id="10153" addr="0x7f99f1e89810" />
-                                <attribute name="sym_name" value="ControlRadioButton" id="10154" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e8ad70" id="10155" addr="0x7f99f1e8ad70" />
-                                <attribute name="defaultargs" value="0x7f99f1e865d0" id="10156" addr="0x7f99f1e865d0" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char)." id="10157" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="10158" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e865d0" id="10159" addr="0x7f99f1e865d0" />
-                                <parmlist id="10160" addr="0x7f99f1e898b0" >
+                        <constructor id="10147" addr="0x7fca469d8310" >
+                            <attributelist id="10148" addr="0x7fca469d8310" >
+                                <attribute name="name" value="ControlRadioButton" id="10149" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="10150" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469d2350" id="10151" addr="0x7fca469d2350" />
+                                <attribute name="csym_nextSibling" value="0x7fca469d8d70" id="10152" addr="0x7fca469d8d70" />
+                                <attribute name="sym_previousSibling" value="0x7fca469d7810" id="10153" addr="0x7fca469d7810" />
+                                <attribute name="sym_name" value="ControlRadioButton" id="10154" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469d8d70" id="10155" addr="0x7fca469d8d70" />
+                                <attribute name="defaultargs" value="0x7fca469d45d0" id="10156" addr="0x7fca469d45d0" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char)." id="10157" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="10158" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469d45d0" id="10159" addr="0x7fca469d45d0" />
+                                <parmlist id="10160" addr="0x7fca469d78b0" >
                                     <parm id="10161">
-                                        <attributelist id="10162" addr="0x7f99f1e898b0" >
-                                            <attribute name="name" value="x" id="10163" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10164" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10162" addr="0x7fca469d78b0" >
+                                            <attribute name="name" value="x" id="10163" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10164" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10165">
-                                        <attributelist id="10166" addr="0x7f99f1e89970" >
-                                            <attribute name="name" value="y" id="10167" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10168" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10166" addr="0x7fca469d7970" >
+                                            <attribute name="name" value="y" id="10167" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10168" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10169">
-                                        <attributelist id="10170" addr="0x7f99f1e899f0" >
-                                            <attribute name="name" value="width" id="10171" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10172" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10170" addr="0x7fca469d79f0" >
+                                            <attribute name="name" value="width" id="10171" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10172" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10173">
-                                        <attributelist id="10174" addr="0x7f99f1e89a70" >
-                                            <attribute name="name" value="height" id="10175" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10176" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10174" addr="0x7fca469d7a70" >
+                                            <attribute name="name" value="height" id="10175" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10176" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10177">
-                                        <attributelist id="10178" addr="0x7f99f1e89af0" >
-                                            <attribute name="name" value="label" id="10179" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="10180" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10178" addr="0x7fca469d7af0" >
+                                            <attribute name="name" value="label" id="10179" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="10180" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10181">
-                                        <attributelist id="10182" addr="0x7f99f1e89b70" >
-                                            <attribute name="name" value="focusOnTexture" id="10183" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10184" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10185" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10182" addr="0x7fca469d7b70" >
+                                            <attribute name="name" value="focusOnTexture" id="10183" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10184" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10185" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10186">
-                                        <attributelist id="10187" addr="0x7f99f1e89c10" >
-                                            <attribute name="name" value="noFocusOnTexture" id="10188" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10189" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10190" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10187" addr="0x7fca469d7c10" >
+                                            <attribute name="name" value="noFocusOnTexture" id="10188" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10189" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10190" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10191">
-                                        <attributelist id="10192" addr="0x7f99f1e89cb0" >
-                                            <attribute name="name" value="focusOffTexture" id="10193" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10194" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10195" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10192" addr="0x7fca469d7cb0" >
+                                            <attribute name="name" value="focusOffTexture" id="10193" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10194" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10195" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10196">
-                                        <attributelist id="10197" addr="0x7f99f1e89d50" >
-                                            <attribute name="name" value="noFocusOffTexture" id="10198" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10199" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10200" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10197" addr="0x7fca469d7d50" >
+                                            <attribute name="name" value="noFocusOffTexture" id="10198" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10199" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10200" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10201">
-                                        <attributelist id="10202" addr="0x7f99f1e89df0" >
-                                            <attribute name="name" value="focusTexture" id="10203" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10204" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10205" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10202" addr="0x7fca469d7df0" >
+                                            <attribute name="name" value="focusTexture" id="10203" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10204" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10205" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10206">
-                                        <attributelist id="10207" addr="0x7f99f1e89e90" >
-                                            <attribute name="name" value="noFocusTexture" id="10208" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10209" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10210" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10207" addr="0x7fca469d7e90" >
+                                            <attribute name="name" value="noFocusTexture" id="10208" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10209" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10210" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10211">
-                                        <attributelist id="10212" addr="0x7f99f1e89f30" >
-                                            <attribute name="name" value="textOffsetX" id="10213" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="10214" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10215" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10212" addr="0x7fca469d7f30" >
+                                            <attribute name="name" value="textOffsetX" id="10213" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="10214" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10215" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10216">
-                                        <attributelist id="10217" addr="0x7f99f1e89fd0" >
-                                            <attribute name="name" value="textOffsetY" id="10218" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="2" id="10219" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10220" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10217" addr="0x7fca469d7fd0" >
+                                            <attribute name="name" value="textOffsetY" id="10218" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="2" id="10219" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10220" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10221">
-                                        <attributelist id="10222" addr="0x7f99f1e8a070" >
-                                            <attribute name="name" value="_alignment" id="10223" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="(XBFONT_LEFT|XBFONT_CENTER_Y)" id="10224" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10225" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10222" addr="0x7fca469d8070" >
+                                            <attribute name="name" value="_alignment" id="10223" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="(XBFONT_LEFT|XBFONT_CENTER_Y)" id="10224" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10225" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10226">
-                                        <attributelist id="10227" addr="0x7f99f1e8a110" >
-                                            <attribute name="name" value="font" id="10228" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10229" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10230" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10227" addr="0x7fca469d8110" >
+                                            <attribute name="name" value="font" id="10228" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10229" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10230" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10231">
-                                        <attributelist id="10232" addr="0x7f99f1e8a1b0" >
-                                            <attribute name="name" value="textColor" id="10233" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10234" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10235" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10232" addr="0x7fca469d81b0" >
+                                            <attribute name="name" value="textColor" id="10233" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10234" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10235" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10236">
-                                        <attributelist id="10237" addr="0x7f99f1e8a250" >
-                                            <attribute name="name" value="disabledColor" id="10238" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10239" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10240" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10237" addr="0x7fca469d8250" >
+                                            <attribute name="name" value="disabledColor" id="10238" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10239" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10240" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_5" id="10241" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="10242" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_5" id="10241" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="10242" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="10243" addr="0x7f99f1e8ad70" >
-                            <attributelist id="10244" addr="0x7f99f1e8ad70" >
-                                <attribute name="name" value="ControlRadioButton" id="10245" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="10246" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e84350" id="10247" addr="0x7f99f1e84350" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e8b730" id="10248" addr="0x7f99f1e8b730" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e8a310" id="10249" addr="0x7f99f1e8a310" />
-                                <attribute name="sym_name" value="ControlRadioButton" id="10250" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e8b730" id="10251" addr="0x7f99f1e8b730" />
-                                <attribute name="defaultargs" value="0x7f99f1e865d0" id="10252" addr="0x7f99f1e865d0" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,long,long,long,p.q(const).char,p.q(const).char)." id="10253" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="10254" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e865d0" id="10255" addr="0x7f99f1e865d0" />
-                                <parmlist id="10256" addr="0x7f99f1e8a3b0" >
+                        <constructor id="10243" addr="0x7fca469d8d70" >
+                            <attributelist id="10244" addr="0x7fca469d8d70" >
+                                <attribute name="name" value="ControlRadioButton" id="10245" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="10246" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469d2350" id="10247" addr="0x7fca469d2350" />
+                                <attribute name="csym_nextSibling" value="0x7fca469d9730" id="10248" addr="0x7fca469d9730" />
+                                <attribute name="sym_previousSibling" value="0x7fca469d8310" id="10249" addr="0x7fca469d8310" />
+                                <attribute name="sym_name" value="ControlRadioButton" id="10250" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469d9730" id="10251" addr="0x7fca469d9730" />
+                                <attribute name="defaultargs" value="0x7fca469d45d0" id="10252" addr="0x7fca469d45d0" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,long,long,long,p.q(const).char,p.q(const).char)." id="10253" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="10254" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469d45d0" id="10255" addr="0x7fca469d45d0" />
+                                <parmlist id="10256" addr="0x7fca469d83b0" >
                                     <parm id="10257">
-                                        <attributelist id="10258" addr="0x7f99f1e8a3b0" >
-                                            <attribute name="name" value="x" id="10259" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10260" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10258" addr="0x7fca469d83b0" >
+                                            <attribute name="name" value="x" id="10259" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10260" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10261">
-                                        <attributelist id="10262" addr="0x7f99f1e8a470" >
-                                            <attribute name="name" value="y" id="10263" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10264" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10262" addr="0x7fca469d8470" >
+                                            <attribute name="name" value="y" id="10263" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10264" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10265">
-                                        <attributelist id="10266" addr="0x7f99f1e8a4f0" >
-                                            <attribute name="name" value="width" id="10267" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10268" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10266" addr="0x7fca469d84f0" >
+                                            <attribute name="name" value="width" id="10267" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10268" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10269">
-                                        <attributelist id="10270" addr="0x7f99f1e8a570" >
-                                            <attribute name="name" value="height" id="10271" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10272" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10270" addr="0x7fca469d8570" >
+                                            <attribute name="name" value="height" id="10271" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10272" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10273">
-                                        <attributelist id="10274" addr="0x7f99f1e8a5f0" >
-                                            <attribute name="name" value="label" id="10275" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="10276" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10274" addr="0x7fca469d85f0" >
+                                            <attribute name="name" value="label" id="10275" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="10276" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10277">
-                                        <attributelist id="10278" addr="0x7f99f1e8a670" >
-                                            <attribute name="name" value="focusOnTexture" id="10279" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10280" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10281" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10278" addr="0x7fca469d8670" >
+                                            <attribute name="name" value="focusOnTexture" id="10279" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10280" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10281" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10282">
-                                        <attributelist id="10283" addr="0x7f99f1e8a710" >
-                                            <attribute name="name" value="noFocusOnTexture" id="10284" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10285" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10286" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10283" addr="0x7fca469d8710" >
+                                            <attribute name="name" value="noFocusOnTexture" id="10284" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10285" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10286" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10287">
-                                        <attributelist id="10288" addr="0x7f99f1e8a7b0" >
-                                            <attribute name="name" value="focusOffTexture" id="10289" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10290" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10291" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10288" addr="0x7fca469d87b0" >
+                                            <attribute name="name" value="focusOffTexture" id="10289" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10290" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10291" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10292">
-                                        <attributelist id="10293" addr="0x7f99f1e8a850" >
-                                            <attribute name="name" value="noFocusOffTexture" id="10294" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10295" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10296" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10293" addr="0x7fca469d8850" >
+                                            <attribute name="name" value="noFocusOffTexture" id="10294" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10295" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10296" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10297">
-                                        <attributelist id="10298" addr="0x7f99f1e8a8f0" >
-                                            <attribute name="name" value="focusTexture" id="10299" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10300" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10301" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10298" addr="0x7fca469d88f0" >
+                                            <attribute name="name" value="focusTexture" id="10299" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10300" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10301" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10302">
-                                        <attributelist id="10303" addr="0x7f99f1e8a990" >
-                                            <attribute name="name" value="noFocusTexture" id="10304" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10305" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10306" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10303" addr="0x7fca469d8990" >
+                                            <attribute name="name" value="noFocusTexture" id="10304" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10305" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10306" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10307">
-                                        <attributelist id="10308" addr="0x7f99f1e8aa30" >
-                                            <attribute name="name" value="textOffsetX" id="10309" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="10310" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10311" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10308" addr="0x7fca469d8a30" >
+                                            <attribute name="name" value="textOffsetX" id="10309" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="10310" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10311" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10312">
-                                        <attributelist id="10313" addr="0x7f99f1e8aad0" >
-                                            <attribute name="name" value="textOffsetY" id="10314" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="2" id="10315" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10316" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10313" addr="0x7fca469d8ad0" >
+                                            <attribute name="name" value="textOffsetY" id="10314" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="2" id="10315" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10316" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10317">
-                                        <attributelist id="10318" addr="0x7f99f1e8ab70" >
-                                            <attribute name="name" value="_alignment" id="10319" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="(XBFONT_LEFT|XBFONT_CENTER_Y)" id="10320" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10321" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10318" addr="0x7fca469d8b70" >
+                                            <attribute name="name" value="_alignment" id="10319" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="(XBFONT_LEFT|XBFONT_CENTER_Y)" id="10320" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10321" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10322">
-                                        <attributelist id="10323" addr="0x7f99f1e8ac10" >
-                                            <attribute name="name" value="font" id="10324" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10325" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10326" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10323" addr="0x7fca469d8c10" >
+                                            <attribute name="name" value="font" id="10324" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10325" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10326" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10327">
-                                        <attributelist id="10328" addr="0x7f99f1e8acb0" >
-                                            <attribute name="name" value="textColor" id="10329" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10330" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10331" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10328" addr="0x7fca469d8cb0" >
+                                            <attribute name="name" value="textColor" id="10329" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10330" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10331" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_6" id="10332" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="10333" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_6" id="10332" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="10333" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="10334" addr="0x7f99f1e8b730" >
-                            <attributelist id="10335" addr="0x7f99f1e8b730" >
-                                <attribute name="name" value="ControlRadioButton" id="10336" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="10337" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e84350" id="10338" addr="0x7f99f1e84350" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e8c050" id="10339" addr="0x7f99f1e8c050" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e8ad70" id="10340" addr="0x7f99f1e8ad70" />
-                                <attribute name="sym_name" value="ControlRadioButton" id="10341" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e8c050" id="10342" addr="0x7f99f1e8c050" />
-                                <attribute name="defaultargs" value="0x7f99f1e865d0" id="10343" addr="0x7f99f1e865d0" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,long,long,long,p.q(const).char)." id="10344" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="10345" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e865d0" id="10346" addr="0x7f99f1e865d0" />
-                                <parmlist id="10347" addr="0x7f99f1e8ae10" >
+                        <constructor id="10334" addr="0x7fca469d9730" >
+                            <attributelist id="10335" addr="0x7fca469d9730" >
+                                <attribute name="name" value="ControlRadioButton" id="10336" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="10337" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469d2350" id="10338" addr="0x7fca469d2350" />
+                                <attribute name="csym_nextSibling" value="0x7fca469da050" id="10339" addr="0x7fca469da050" />
+                                <attribute name="sym_previousSibling" value="0x7fca469d8d70" id="10340" addr="0x7fca469d8d70" />
+                                <attribute name="sym_name" value="ControlRadioButton" id="10341" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469da050" id="10342" addr="0x7fca469da050" />
+                                <attribute name="defaultargs" value="0x7fca469d45d0" id="10343" addr="0x7fca469d45d0" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,long,long,long,p.q(const).char)." id="10344" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="10345" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469d45d0" id="10346" addr="0x7fca469d45d0" />
+                                <parmlist id="10347" addr="0x7fca469d8e10" >
                                     <parm id="10348">
-                                        <attributelist id="10349" addr="0x7f99f1e8ae10" >
-                                            <attribute name="name" value="x" id="10350" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10351" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10349" addr="0x7fca469d8e10" >
+                                            <attribute name="name" value="x" id="10350" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10351" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10352">
-                                        <attributelist id="10353" addr="0x7f99f1e8aed0" >
-                                            <attribute name="name" value="y" id="10354" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10355" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10353" addr="0x7fca469d8ed0" >
+                                            <attribute name="name" value="y" id="10354" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10355" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10356">
-                                        <attributelist id="10357" addr="0x7f99f1e8af50" >
-                                            <attribute name="name" value="width" id="10358" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10359" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10357" addr="0x7fca469d8f50" >
+                                            <attribute name="name" value="width" id="10358" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10359" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10360">
-                                        <attributelist id="10361" addr="0x7f99f1e8afd0" >
-                                            <attribute name="name" value="height" id="10362" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10363" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10361" addr="0x7fca469d8fd0" >
+                                            <attribute name="name" value="height" id="10362" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10363" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10364">
-                                        <attributelist id="10365" addr="0x7f99f1e8b050" >
-                                            <attribute name="name" value="label" id="10366" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="10367" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10365" addr="0x7fca469d9050" >
+                                            <attribute name="name" value="label" id="10366" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="10367" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10368">
-                                        <attributelist id="10369" addr="0x7f99f1e8b0d0" >
-                                            <attribute name="name" value="focusOnTexture" id="10370" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10371" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10372" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10369" addr="0x7fca469d90d0" >
+                                            <attribute name="name" value="focusOnTexture" id="10370" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10371" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10372" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10373">
-                                        <attributelist id="10374" addr="0x7f99f1e8b170" >
-                                            <attribute name="name" value="noFocusOnTexture" id="10375" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10376" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10377" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10374" addr="0x7fca469d9170" >
+                                            <attribute name="name" value="noFocusOnTexture" id="10375" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10376" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10377" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10378">
-                                        <attributelist id="10379" addr="0x7f99f1e8b210" >
-                                            <attribute name="name" value="focusOffTexture" id="10380" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10381" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10382" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10379" addr="0x7fca469d9210" >
+                                            <attribute name="name" value="focusOffTexture" id="10380" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10381" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10382" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10383">
-                                        <attributelist id="10384" addr="0x7f99f1e8b2b0" >
-                                            <attribute name="name" value="noFocusOffTexture" id="10385" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10386" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10387" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10384" addr="0x7fca469d92b0" >
+                                            <attribute name="name" value="noFocusOffTexture" id="10385" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10386" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10387" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10388">
-                                        <attributelist id="10389" addr="0x7f99f1e8b350" >
-                                            <attribute name="name" value="focusTexture" id="10390" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10391" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10392" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10389" addr="0x7fca469d9350" >
+                                            <attribute name="name" value="focusTexture" id="10390" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10391" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10392" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10393">
-                                        <attributelist id="10394" addr="0x7f99f1e8b3f0" >
-                                            <attribute name="name" value="noFocusTexture" id="10395" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10396" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10397" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10394" addr="0x7fca469d93f0" >
+                                            <attribute name="name" value="noFocusTexture" id="10395" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10396" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10397" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10398">
-                                        <attributelist id="10399" addr="0x7f99f1e8b490" >
-                                            <attribute name="name" value="textOffsetX" id="10400" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="10401" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10402" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10399" addr="0x7fca469d9490" >
+                                            <attribute name="name" value="textOffsetX" id="10400" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="10401" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10402" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10403">
-                                        <attributelist id="10404" addr="0x7f99f1e8b530" >
-                                            <attribute name="name" value="textOffsetY" id="10405" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="2" id="10406" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10407" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10404" addr="0x7fca469d9530" >
+                                            <attribute name="name" value="textOffsetY" id="10405" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="2" id="10406" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10407" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10408">
-                                        <attributelist id="10409" addr="0x7f99f1e8b5d0" >
-                                            <attribute name="name" value="_alignment" id="10410" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="(XBFONT_LEFT|XBFONT_CENTER_Y)" id="10411" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10412" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10409" addr="0x7fca469d95d0" >
+                                            <attribute name="name" value="_alignment" id="10410" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="(XBFONT_LEFT|XBFONT_CENTER_Y)" id="10411" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10412" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10413">
-                                        <attributelist id="10414" addr="0x7f99f1e8b670" >
-                                            <attribute name="name" value="font" id="10415" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10416" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10417" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10414" addr="0x7fca469d9670" >
+                                            <attribute name="name" value="font" id="10415" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10416" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10417" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_7" id="10418" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="10419" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_7" id="10418" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="10419" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="10420" addr="0x7f99f1e8c050" >
-                            <attributelist id="10421" addr="0x7f99f1e8c050" >
-                                <attribute name="name" value="ControlRadioButton" id="10422" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="10423" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e84350" id="10424" addr="0x7f99f1e84350" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e8c8d0" id="10425" addr="0x7f99f1e8c8d0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e8b730" id="10426" addr="0x7f99f1e8b730" />
-                                <attribute name="sym_name" value="ControlRadioButton" id="10427" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e8c8d0" id="10428" addr="0x7f99f1e8c8d0" />
-                                <attribute name="defaultargs" value="0x7f99f1e865d0" id="10429" addr="0x7f99f1e865d0" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,long,long,long)." id="10430" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="10431" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e865d0" id="10432" addr="0x7f99f1e865d0" />
-                                <parmlist id="10433" addr="0x7f99f1e8b7d0" >
+                        <constructor id="10420" addr="0x7fca469da050" >
+                            <attributelist id="10421" addr="0x7fca469da050" >
+                                <attribute name="name" value="ControlRadioButton" id="10422" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="10423" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469d2350" id="10424" addr="0x7fca469d2350" />
+                                <attribute name="csym_nextSibling" value="0x7fca469da8d0" id="10425" addr="0x7fca469da8d0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469d9730" id="10426" addr="0x7fca469d9730" />
+                                <attribute name="sym_name" value="ControlRadioButton" id="10427" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469da8d0" id="10428" addr="0x7fca469da8d0" />
+                                <attribute name="defaultargs" value="0x7fca469d45d0" id="10429" addr="0x7fca469d45d0" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,long,long,long)." id="10430" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="10431" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469d45d0" id="10432" addr="0x7fca469d45d0" />
+                                <parmlist id="10433" addr="0x7fca469d97d0" >
                                     <parm id="10434">
-                                        <attributelist id="10435" addr="0x7f99f1e8b7d0" >
-                                            <attribute name="name" value="x" id="10436" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10437" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10435" addr="0x7fca469d97d0" >
+                                            <attribute name="name" value="x" id="10436" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10437" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10438">
-                                        <attributelist id="10439" addr="0x7f99f1e8b890" >
-                                            <attribute name="name" value="y" id="10440" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10441" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10439" addr="0x7fca469d9890" >
+                                            <attribute name="name" value="y" id="10440" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10441" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10442">
-                                        <attributelist id="10443" addr="0x7f99f1e8b910" >
-                                            <attribute name="name" value="width" id="10444" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10445" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10443" addr="0x7fca469d9910" >
+                                            <attribute name="name" value="width" id="10444" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10445" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10446">
-                                        <attributelist id="10447" addr="0x7f99f1e8b990" >
-                                            <attribute name="name" value="height" id="10448" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10449" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10447" addr="0x7fca469d9990" >
+                                            <attribute name="name" value="height" id="10448" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10449" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10450">
-                                        <attributelist id="10451" addr="0x7f99f1e8ba10" >
-                                            <attribute name="name" value="label" id="10452" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="10453" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10451" addr="0x7fca469d9a10" >
+                                            <attribute name="name" value="label" id="10452" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="10453" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10454">
-                                        <attributelist id="10455" addr="0x7f99f1e8ba90" >
-                                            <attribute name="name" value="focusOnTexture" id="10456" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10457" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10458" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10455" addr="0x7fca469d9a90" >
+                                            <attribute name="name" value="focusOnTexture" id="10456" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10457" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10458" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10459">
-                                        <attributelist id="10460" addr="0x7f99f1e8bb30" >
-                                            <attribute name="name" value="noFocusOnTexture" id="10461" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10462" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10463" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10460" addr="0x7fca469d9b30" >
+                                            <attribute name="name" value="noFocusOnTexture" id="10461" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10462" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10463" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10464">
-                                        <attributelist id="10465" addr="0x7f99f1e8bbd0" >
-                                            <attribute name="name" value="focusOffTexture" id="10466" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10467" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10468" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10465" addr="0x7fca469d9bd0" >
+                                            <attribute name="name" value="focusOffTexture" id="10466" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10467" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10468" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10469">
-                                        <attributelist id="10470" addr="0x7f99f1e8bc70" >
-                                            <attribute name="name" value="noFocusOffTexture" id="10471" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10472" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10473" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10470" addr="0x7fca469d9c70" >
+                                            <attribute name="name" value="noFocusOffTexture" id="10471" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10472" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10473" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10474">
-                                        <attributelist id="10475" addr="0x7f99f1e8bd10" >
-                                            <attribute name="name" value="focusTexture" id="10476" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10477" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10478" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10475" addr="0x7fca469d9d10" >
+                                            <attribute name="name" value="focusTexture" id="10476" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10477" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10478" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10479">
-                                        <attributelist id="10480" addr="0x7f99f1e8bdb0" >
-                                            <attribute name="name" value="noFocusTexture" id="10481" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10482" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10483" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10480" addr="0x7fca469d9db0" >
+                                            <attribute name="name" value="noFocusTexture" id="10481" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10482" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10483" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10484">
-                                        <attributelist id="10485" addr="0x7f99f1e8be50" >
-                                            <attribute name="name" value="textOffsetX" id="10486" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="10487" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10488" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10485" addr="0x7fca469d9e50" >
+                                            <attribute name="name" value="textOffsetX" id="10486" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="10487" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10488" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10489">
-                                        <attributelist id="10490" addr="0x7f99f1e8bef0" >
-                                            <attribute name="name" value="textOffsetY" id="10491" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="2" id="10492" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10493" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10490" addr="0x7fca469d9ef0" >
+                                            <attribute name="name" value="textOffsetY" id="10491" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="2" id="10492" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10493" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10494">
-                                        <attributelist id="10495" addr="0x7f99f1e8bf90" >
-                                            <attribute name="name" value="_alignment" id="10496" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="(XBFONT_LEFT|XBFONT_CENTER_Y)" id="10497" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10498" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10495" addr="0x7fca469d9f90" >
+                                            <attribute name="name" value="_alignment" id="10496" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="(XBFONT_LEFT|XBFONT_CENTER_Y)" id="10497" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10498" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_8" id="10499" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="10500" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_8" id="10499" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="10500" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="10501" addr="0x7f99f1e8c8d0" >
-                            <attributelist id="10502" addr="0x7f99f1e8c8d0" >
-                                <attribute name="name" value="ControlRadioButton" id="10503" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="10504" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e84350" id="10505" addr="0x7f99f1e84350" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e8d0b0" id="10506" addr="0x7f99f1e8d0b0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e8c050" id="10507" addr="0x7f99f1e8c050" />
-                                <attribute name="sym_name" value="ControlRadioButton" id="10508" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e8d0b0" id="10509" addr="0x7f99f1e8d0b0" />
-                                <attribute name="defaultargs" value="0x7f99f1e865d0" id="10510" addr="0x7f99f1e865d0" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,long,long)." id="10511" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="10512" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e865d0" id="10513" addr="0x7f99f1e865d0" />
-                                <parmlist id="10514" addr="0x7f99f1e8c0f0" >
+                        <constructor id="10501" addr="0x7fca469da8d0" >
+                            <attributelist id="10502" addr="0x7fca469da8d0" >
+                                <attribute name="name" value="ControlRadioButton" id="10503" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="10504" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469d2350" id="10505" addr="0x7fca469d2350" />
+                                <attribute name="csym_nextSibling" value="0x7fca469db0b0" id="10506" addr="0x7fca469db0b0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469da050" id="10507" addr="0x7fca469da050" />
+                                <attribute name="sym_name" value="ControlRadioButton" id="10508" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469db0b0" id="10509" addr="0x7fca469db0b0" />
+                                <attribute name="defaultargs" value="0x7fca469d45d0" id="10510" addr="0x7fca469d45d0" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,long,long)." id="10511" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="10512" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469d45d0" id="10513" addr="0x7fca469d45d0" />
+                                <parmlist id="10514" addr="0x7fca469da0f0" >
                                     <parm id="10515">
-                                        <attributelist id="10516" addr="0x7f99f1e8c0f0" >
-                                            <attribute name="name" value="x" id="10517" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10518" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10516" addr="0x7fca469da0f0" >
+                                            <attribute name="name" value="x" id="10517" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10518" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10519">
-                                        <attributelist id="10520" addr="0x7f99f1e8c1b0" >
-                                            <attribute name="name" value="y" id="10521" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10522" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10520" addr="0x7fca469da1b0" >
+                                            <attribute name="name" value="y" id="10521" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10522" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10523">
-                                        <attributelist id="10524" addr="0x7f99f1e8c230" >
-                                            <attribute name="name" value="width" id="10525" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10526" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10524" addr="0x7fca469da230" >
+                                            <attribute name="name" value="width" id="10525" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10526" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10527">
-                                        <attributelist id="10528" addr="0x7f99f1e8c2b0" >
-                                            <attribute name="name" value="height" id="10529" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10530" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10528" addr="0x7fca469da2b0" >
+                                            <attribute name="name" value="height" id="10529" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10530" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10531">
-                                        <attributelist id="10532" addr="0x7f99f1e8c330" >
-                                            <attribute name="name" value="label" id="10533" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="10534" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10532" addr="0x7fca469da330" >
+                                            <attribute name="name" value="label" id="10533" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="10534" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10535">
-                                        <attributelist id="10536" addr="0x7f99f1e8c3b0" >
-                                            <attribute name="name" value="focusOnTexture" id="10537" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10538" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10539" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10536" addr="0x7fca469da3b0" >
+                                            <attribute name="name" value="focusOnTexture" id="10537" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10538" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10539" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10540">
-                                        <attributelist id="10541" addr="0x7f99f1e8c450" >
-                                            <attribute name="name" value="noFocusOnTexture" id="10542" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10543" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10544" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10541" addr="0x7fca469da450" >
+                                            <attribute name="name" value="noFocusOnTexture" id="10542" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10543" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10544" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10545">
-                                        <attributelist id="10546" addr="0x7f99f1e8c4f0" >
-                                            <attribute name="name" value="focusOffTexture" id="10547" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10548" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10549" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10546" addr="0x7fca469da4f0" >
+                                            <attribute name="name" value="focusOffTexture" id="10547" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10548" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10549" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10550">
-                                        <attributelist id="10551" addr="0x7f99f1e8c590" >
-                                            <attribute name="name" value="noFocusOffTexture" id="10552" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10553" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10554" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10551" addr="0x7fca469da590" >
+                                            <attribute name="name" value="noFocusOffTexture" id="10552" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10553" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10554" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10555">
-                                        <attributelist id="10556" addr="0x7f99f1e8c630" >
-                                            <attribute name="name" value="focusTexture" id="10557" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10558" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10559" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10556" addr="0x7fca469da630" >
+                                            <attribute name="name" value="focusTexture" id="10557" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10558" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10559" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10560">
-                                        <attributelist id="10561" addr="0x7f99f1e8c6d0" >
-                                            <attribute name="name" value="noFocusTexture" id="10562" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10563" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10564" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10561" addr="0x7fca469da6d0" >
+                                            <attribute name="name" value="noFocusTexture" id="10562" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10563" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10564" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10565">
-                                        <attributelist id="10566" addr="0x7f99f1e8c770" >
-                                            <attribute name="name" value="textOffsetX" id="10567" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="10568" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10569" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10566" addr="0x7fca469da770" >
+                                            <attribute name="name" value="textOffsetX" id="10567" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="10568" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10569" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10570">
-                                        <attributelist id="10571" addr="0x7f99f1e8c810" >
-                                            <attribute name="name" value="textOffsetY" id="10572" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="2" id="10573" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10574" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10571" addr="0x7fca469da810" >
+                                            <attribute name="name" value="textOffsetY" id="10572" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="2" id="10573" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10574" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_9" id="10575" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="10576" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_9" id="10575" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="10576" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="10577" addr="0x7f99f1e8d0b0" >
-                            <attributelist id="10578" addr="0x7f99f1e8d0b0" >
-                                <attribute name="name" value="ControlRadioButton" id="10579" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="10580" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e84350" id="10581" addr="0x7f99f1e84350" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e8d7f0" id="10582" addr="0x7f99f1e8d7f0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e8c8d0" id="10583" addr="0x7f99f1e8c8d0" />
-                                <attribute name="sym_name" value="ControlRadioButton" id="10584" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e8d7f0" id="10585" addr="0x7f99f1e8d7f0" />
-                                <attribute name="defaultargs" value="0x7f99f1e865d0" id="10586" addr="0x7f99f1e865d0" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,long)." id="10587" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="10588" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e865d0" id="10589" addr="0x7f99f1e865d0" />
-                                <parmlist id="10590" addr="0x7f99f1e8c970" >
+                        <constructor id="10577" addr="0x7fca469db0b0" >
+                            <attributelist id="10578" addr="0x7fca469db0b0" >
+                                <attribute name="name" value="ControlRadioButton" id="10579" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="10580" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469d2350" id="10581" addr="0x7fca469d2350" />
+                                <attribute name="csym_nextSibling" value="0x7fca469db7f0" id="10582" addr="0x7fca469db7f0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469da8d0" id="10583" addr="0x7fca469da8d0" />
+                                <attribute name="sym_name" value="ControlRadioButton" id="10584" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469db7f0" id="10585" addr="0x7fca469db7f0" />
+                                <attribute name="defaultargs" value="0x7fca469d45d0" id="10586" addr="0x7fca469d45d0" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,long)." id="10587" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="10588" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469d45d0" id="10589" addr="0x7fca469d45d0" />
+                                <parmlist id="10590" addr="0x7fca469da970" >
                                     <parm id="10591">
-                                        <attributelist id="10592" addr="0x7f99f1e8c970" >
-                                            <attribute name="name" value="x" id="10593" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10594" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10592" addr="0x7fca469da970" >
+                                            <attribute name="name" value="x" id="10593" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10594" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10595">
-                                        <attributelist id="10596" addr="0x7f99f1e8ca30" >
-                                            <attribute name="name" value="y" id="10597" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10598" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10596" addr="0x7fca469daa30" >
+                                            <attribute name="name" value="y" id="10597" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10598" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10599">
-                                        <attributelist id="10600" addr="0x7f99f1e8cab0" >
-                                            <attribute name="name" value="width" id="10601" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10602" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10600" addr="0x7fca469daab0" >
+                                            <attribute name="name" value="width" id="10601" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10602" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10603">
-                                        <attributelist id="10604" addr="0x7f99f1e8cb30" >
-                                            <attribute name="name" value="height" id="10605" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10606" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10604" addr="0x7fca469dab30" >
+                                            <attribute name="name" value="height" id="10605" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10606" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10607">
-                                        <attributelist id="10608" addr="0x7f99f1e8cbb0" >
-                                            <attribute name="name" value="label" id="10609" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="10610" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10608" addr="0x7fca469dabb0" >
+                                            <attribute name="name" value="label" id="10609" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="10610" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10611">
-                                        <attributelist id="10612" addr="0x7f99f1e8cc30" >
-                                            <attribute name="name" value="focusOnTexture" id="10613" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10614" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10615" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10612" addr="0x7fca469dac30" >
+                                            <attribute name="name" value="focusOnTexture" id="10613" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10614" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10615" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10616">
-                                        <attributelist id="10617" addr="0x7f99f1e8ccd0" >
-                                            <attribute name="name" value="noFocusOnTexture" id="10618" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10619" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10620" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10617" addr="0x7fca469dacd0" >
+                                            <attribute name="name" value="noFocusOnTexture" id="10618" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10619" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10620" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10621">
-                                        <attributelist id="10622" addr="0x7f99f1e8cd70" >
-                                            <attribute name="name" value="focusOffTexture" id="10623" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10624" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10625" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10622" addr="0x7fca469dad70" >
+                                            <attribute name="name" value="focusOffTexture" id="10623" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10624" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10625" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10626">
-                                        <attributelist id="10627" addr="0x7f99f1e8ce10" >
-                                            <attribute name="name" value="noFocusOffTexture" id="10628" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10629" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10630" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10627" addr="0x7fca469dae10" >
+                                            <attribute name="name" value="noFocusOffTexture" id="10628" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10629" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10630" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10631">
-                                        <attributelist id="10632" addr="0x7f99f1e8ceb0" >
-                                            <attribute name="name" value="focusTexture" id="10633" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10634" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10635" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10632" addr="0x7fca469daeb0" >
+                                            <attribute name="name" value="focusTexture" id="10633" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10634" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10635" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10636">
-                                        <attributelist id="10637" addr="0x7f99f1e8cf50" >
-                                            <attribute name="name" value="noFocusTexture" id="10638" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10639" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10640" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10637" addr="0x7fca469daf50" >
+                                            <attribute name="name" value="noFocusTexture" id="10638" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10639" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10640" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10641">
-                                        <attributelist id="10642" addr="0x7f99f1e8cff0" >
-                                            <attribute name="name" value="textOffsetX" id="10643" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="10" id="10644" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10645" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10642" addr="0x7fca469daff0" >
+                                            <attribute name="name" value="textOffsetX" id="10643" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="10" id="10644" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10645" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_10" id="10646" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="10647" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_10" id="10646" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="10647" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="10648" addr="0x7f99f1e8d7f0" >
-                            <attributelist id="10649" addr="0x7f99f1e8d7f0" >
-                                <attribute name="name" value="ControlRadioButton" id="10650" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="10651" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e84350" id="10652" addr="0x7f99f1e84350" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e8de90" id="10653" addr="0x7f99f1e8de90" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e8d0b0" id="10654" addr="0x7f99f1e8d0b0" />
-                                <attribute name="sym_name" value="ControlRadioButton" id="10655" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e8de90" id="10656" addr="0x7f99f1e8de90" />
-                                <attribute name="defaultargs" value="0x7f99f1e865d0" id="10657" addr="0x7f99f1e865d0" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char)." id="10658" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="10659" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e865d0" id="10660" addr="0x7f99f1e865d0" />
-                                <parmlist id="10661" addr="0x7f99f1e8d150" >
+                        <constructor id="10648" addr="0x7fca469db7f0" >
+                            <attributelist id="10649" addr="0x7fca469db7f0" >
+                                <attribute name="name" value="ControlRadioButton" id="10650" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="10651" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469d2350" id="10652" addr="0x7fca469d2350" />
+                                <attribute name="csym_nextSibling" value="0x7fca469dbe90" id="10653" addr="0x7fca469dbe90" />
+                                <attribute name="sym_previousSibling" value="0x7fca469db0b0" id="10654" addr="0x7fca469db0b0" />
+                                <attribute name="sym_name" value="ControlRadioButton" id="10655" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469dbe90" id="10656" addr="0x7fca469dbe90" />
+                                <attribute name="defaultargs" value="0x7fca469d45d0" id="10657" addr="0x7fca469d45d0" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char)." id="10658" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="10659" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469d45d0" id="10660" addr="0x7fca469d45d0" />
+                                <parmlist id="10661" addr="0x7fca469db150" >
                                     <parm id="10662">
-                                        <attributelist id="10663" addr="0x7f99f1e8d150" >
-                                            <attribute name="name" value="x" id="10664" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10665" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10663" addr="0x7fca469db150" >
+                                            <attribute name="name" value="x" id="10664" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10665" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10666">
-                                        <attributelist id="10667" addr="0x7f99f1e8d210" >
-                                            <attribute name="name" value="y" id="10668" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10669" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10667" addr="0x7fca469db210" >
+                                            <attribute name="name" value="y" id="10668" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10669" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10670">
-                                        <attributelist id="10671" addr="0x7f99f1e8d290" >
-                                            <attribute name="name" value="width" id="10672" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10673" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10671" addr="0x7fca469db290" >
+                                            <attribute name="name" value="width" id="10672" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10673" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10674">
-                                        <attributelist id="10675" addr="0x7f99f1e8d310" >
-                                            <attribute name="name" value="height" id="10676" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10677" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10675" addr="0x7fca469db310" >
+                                            <attribute name="name" value="height" id="10676" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10677" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10678">
-                                        <attributelist id="10679" addr="0x7f99f1e8d390" >
-                                            <attribute name="name" value="label" id="10680" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="10681" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10679" addr="0x7fca469db390" >
+                                            <attribute name="name" value="label" id="10680" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="10681" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10682">
-                                        <attributelist id="10683" addr="0x7f99f1e8d410" >
-                                            <attribute name="name" value="focusOnTexture" id="10684" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10685" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10686" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10683" addr="0x7fca469db410" >
+                                            <attribute name="name" value="focusOnTexture" id="10684" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10685" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10686" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10687">
-                                        <attributelist id="10688" addr="0x7f99f1e8d4b0" >
-                                            <attribute name="name" value="noFocusOnTexture" id="10689" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10690" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10691" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10688" addr="0x7fca469db4b0" >
+                                            <attribute name="name" value="noFocusOnTexture" id="10689" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10690" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10691" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10692">
-                                        <attributelist id="10693" addr="0x7f99f1e8d550" >
-                                            <attribute name="name" value="focusOffTexture" id="10694" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10695" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10696" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10693" addr="0x7fca469db550" >
+                                            <attribute name="name" value="focusOffTexture" id="10694" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10695" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10696" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10697">
-                                        <attributelist id="10698" addr="0x7f99f1e8d5f0" >
-                                            <attribute name="name" value="noFocusOffTexture" id="10699" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10700" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10701" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10698" addr="0x7fca469db5f0" >
+                                            <attribute name="name" value="noFocusOffTexture" id="10699" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10700" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10701" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10702">
-                                        <attributelist id="10703" addr="0x7f99f1e8d690" >
-                                            <attribute name="name" value="focusTexture" id="10704" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10705" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10706" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10703" addr="0x7fca469db690" >
+                                            <attribute name="name" value="focusTexture" id="10704" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10705" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10706" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10707">
-                                        <attributelist id="10708" addr="0x7f99f1e8d730" >
-                                            <attribute name="name" value="noFocusTexture" id="10709" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10710" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10711" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10708" addr="0x7fca469db730" >
+                                            <attribute name="name" value="noFocusTexture" id="10709" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10710" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10711" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_11" id="10712" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="10713" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_11" id="10712" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="10713" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="10714" addr="0x7f99f1e8de90" >
-                            <attributelist id="10715" addr="0x7f99f1e8de90" >
-                                <attribute name="name" value="ControlRadioButton" id="10716" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="10717" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e84350" id="10718" addr="0x7f99f1e84350" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e8e490" id="10719" addr="0x7f99f1e8e490" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e8d7f0" id="10720" addr="0x7f99f1e8d7f0" />
-                                <attribute name="sym_name" value="ControlRadioButton" id="10721" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e8e490" id="10722" addr="0x7f99f1e8e490" />
-                                <attribute name="defaultargs" value="0x7f99f1e865d0" id="10723" addr="0x7f99f1e865d0" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char)." id="10724" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="10725" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e865d0" id="10726" addr="0x7f99f1e865d0" />
-                                <parmlist id="10727" addr="0x7f99f1e8d890" >
+                        <constructor id="10714" addr="0x7fca469dbe90" >
+                            <attributelist id="10715" addr="0x7fca469dbe90" >
+                                <attribute name="name" value="ControlRadioButton" id="10716" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="10717" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469d2350" id="10718" addr="0x7fca469d2350" />
+                                <attribute name="csym_nextSibling" value="0x7fca469dc490" id="10719" addr="0x7fca469dc490" />
+                                <attribute name="sym_previousSibling" value="0x7fca469db7f0" id="10720" addr="0x7fca469db7f0" />
+                                <attribute name="sym_name" value="ControlRadioButton" id="10721" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469dc490" id="10722" addr="0x7fca469dc490" />
+                                <attribute name="defaultargs" value="0x7fca469d45d0" id="10723" addr="0x7fca469d45d0" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char)." id="10724" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="10725" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469d45d0" id="10726" addr="0x7fca469d45d0" />
+                                <parmlist id="10727" addr="0x7fca469db890" >
                                     <parm id="10728">
-                                        <attributelist id="10729" addr="0x7f99f1e8d890" >
-                                            <attribute name="name" value="x" id="10730" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10731" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10729" addr="0x7fca469db890" >
+                                            <attribute name="name" value="x" id="10730" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10731" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10732">
-                                        <attributelist id="10733" addr="0x7f99f1e8d950" >
-                                            <attribute name="name" value="y" id="10734" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10735" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10733" addr="0x7fca469db950" >
+                                            <attribute name="name" value="y" id="10734" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10735" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10736">
-                                        <attributelist id="10737" addr="0x7f99f1e8d9d0" >
-                                            <attribute name="name" value="width" id="10738" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10739" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10737" addr="0x7fca469db9d0" >
+                                            <attribute name="name" value="width" id="10738" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10739" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10740">
-                                        <attributelist id="10741" addr="0x7f99f1e8da50" >
-                                            <attribute name="name" value="height" id="10742" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10743" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10741" addr="0x7fca469dba50" >
+                                            <attribute name="name" value="height" id="10742" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10743" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10744">
-                                        <attributelist id="10745" addr="0x7f99f1e8dad0" >
-                                            <attribute name="name" value="label" id="10746" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="10747" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10745" addr="0x7fca469dbad0" >
+                                            <attribute name="name" value="label" id="10746" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="10747" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10748">
-                                        <attributelist id="10749" addr="0x7f99f1e8db50" >
-                                            <attribute name="name" value="focusOnTexture" id="10750" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10751" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10752" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10749" addr="0x7fca469dbb50" >
+                                            <attribute name="name" value="focusOnTexture" id="10750" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10751" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10752" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10753">
-                                        <attributelist id="10754" addr="0x7f99f1e8dbf0" >
-                                            <attribute name="name" value="noFocusOnTexture" id="10755" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10756" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10757" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10754" addr="0x7fca469dbbf0" >
+                                            <attribute name="name" value="noFocusOnTexture" id="10755" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10756" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10757" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10758">
-                                        <attributelist id="10759" addr="0x7f99f1e8dc90" >
-                                            <attribute name="name" value="focusOffTexture" id="10760" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10761" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10762" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10759" addr="0x7fca469dbc90" >
+                                            <attribute name="name" value="focusOffTexture" id="10760" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10761" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10762" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10763">
-                                        <attributelist id="10764" addr="0x7f99f1e8dd30" >
-                                            <attribute name="name" value="noFocusOffTexture" id="10765" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10766" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10767" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10764" addr="0x7fca469dbd30" >
+                                            <attribute name="name" value="noFocusOffTexture" id="10765" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10766" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10767" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10768">
-                                        <attributelist id="10769" addr="0x7f99f1e8ddd0" >
-                                            <attribute name="name" value="focusTexture" id="10770" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10771" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10772" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10769" addr="0x7fca469dbdd0" >
+                                            <attribute name="name" value="focusTexture" id="10770" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10771" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10772" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_12" id="10773" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="10774" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_12" id="10773" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="10774" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="10775" addr="0x7f99f1e8e490" >
-                            <attributelist id="10776" addr="0x7f99f1e8e490" >
-                                <attribute name="name" value="ControlRadioButton" id="10777" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="10778" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e84350" id="10779" addr="0x7f99f1e84350" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e8e9f0" id="10780" addr="0x7f99f1e8e9f0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e8de90" id="10781" addr="0x7f99f1e8de90" />
-                                <attribute name="sym_name" value="ControlRadioButton" id="10782" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e8e9f0" id="10783" addr="0x7f99f1e8e9f0" />
-                                <attribute name="defaultargs" value="0x7f99f1e865d0" id="10784" addr="0x7f99f1e865d0" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char)." id="10785" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="10786" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e865d0" id="10787" addr="0x7f99f1e865d0" />
-                                <parmlist id="10788" addr="0x7f99f1e8df30" >
+                        <constructor id="10775" addr="0x7fca469dc490" >
+                            <attributelist id="10776" addr="0x7fca469dc490" >
+                                <attribute name="name" value="ControlRadioButton" id="10777" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="10778" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469d2350" id="10779" addr="0x7fca469d2350" />
+                                <attribute name="csym_nextSibling" value="0x7fca469dc9f0" id="10780" addr="0x7fca469dc9f0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469dbe90" id="10781" addr="0x7fca469dbe90" />
+                                <attribute name="sym_name" value="ControlRadioButton" id="10782" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469dc9f0" id="10783" addr="0x7fca469dc9f0" />
+                                <attribute name="defaultargs" value="0x7fca469d45d0" id="10784" addr="0x7fca469d45d0" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char)." id="10785" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="10786" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469d45d0" id="10787" addr="0x7fca469d45d0" />
+                                <parmlist id="10788" addr="0x7fca469dbf30" >
                                     <parm id="10789">
-                                        <attributelist id="10790" addr="0x7f99f1e8df30" >
-                                            <attribute name="name" value="x" id="10791" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10792" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10790" addr="0x7fca469dbf30" >
+                                            <attribute name="name" value="x" id="10791" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10792" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10793">
-                                        <attributelist id="10794" addr="0x7f99f1e8dff0" >
-                                            <attribute name="name" value="y" id="10795" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10796" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10794" addr="0x7fca469dbff0" >
+                                            <attribute name="name" value="y" id="10795" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10796" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10797">
-                                        <attributelist id="10798" addr="0x7f99f1e8e070" >
-                                            <attribute name="name" value="width" id="10799" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10800" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10798" addr="0x7fca469dc070" >
+                                            <attribute name="name" value="width" id="10799" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10800" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10801">
-                                        <attributelist id="10802" addr="0x7f99f1e8e0f0" >
-                                            <attribute name="name" value="height" id="10803" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10804" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10802" addr="0x7fca469dc0f0" >
+                                            <attribute name="name" value="height" id="10803" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10804" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10805">
-                                        <attributelist id="10806" addr="0x7f99f1e8e170" >
-                                            <attribute name="name" value="label" id="10807" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="10808" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10806" addr="0x7fca469dc170" >
+                                            <attribute name="name" value="label" id="10807" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="10808" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10809">
-                                        <attributelist id="10810" addr="0x7f99f1e8e1f0" >
-                                            <attribute name="name" value="focusOnTexture" id="10811" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10812" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10813" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10810" addr="0x7fca469dc1f0" >
+                                            <attribute name="name" value="focusOnTexture" id="10811" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10812" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10813" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10814">
-                                        <attributelist id="10815" addr="0x7f99f1e8e290" >
-                                            <attribute name="name" value="noFocusOnTexture" id="10816" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10817" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10818" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10815" addr="0x7fca469dc290" >
+                                            <attribute name="name" value="noFocusOnTexture" id="10816" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10817" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10818" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10819">
-                                        <attributelist id="10820" addr="0x7f99f1e8e330" >
-                                            <attribute name="name" value="focusOffTexture" id="10821" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10822" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10823" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10820" addr="0x7fca469dc330" >
+                                            <attribute name="name" value="focusOffTexture" id="10821" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10822" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10823" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10824">
-                                        <attributelist id="10825" addr="0x7f99f1e8e3d0" >
-                                            <attribute name="name" value="noFocusOffTexture" id="10826" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10827" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10828" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10825" addr="0x7fca469dc3d0" >
+                                            <attribute name="name" value="noFocusOffTexture" id="10826" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10827" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10828" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_13" id="10829" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="10830" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_13" id="10829" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="10830" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="10831" addr="0x7f99f1e8e9f0" >
-                            <attributelist id="10832" addr="0x7f99f1e8e9f0" >
-                                <attribute name="name" value="ControlRadioButton" id="10833" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="10834" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e84350" id="10835" addr="0x7f99f1e84350" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e8eeb0" id="10836" addr="0x7f99f1e8eeb0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e8e490" id="10837" addr="0x7f99f1e8e490" />
-                                <attribute name="sym_name" value="ControlRadioButton" id="10838" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e8eeb0" id="10839" addr="0x7f99f1e8eeb0" />
-                                <attribute name="defaultargs" value="0x7f99f1e865d0" id="10840" addr="0x7f99f1e865d0" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char)." id="10841" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="10842" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e865d0" id="10843" addr="0x7f99f1e865d0" />
-                                <parmlist id="10844" addr="0x7f99f1e8e530" >
+                        <constructor id="10831" addr="0x7fca469dc9f0" >
+                            <attributelist id="10832" addr="0x7fca469dc9f0" >
+                                <attribute name="name" value="ControlRadioButton" id="10833" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="10834" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469d2350" id="10835" addr="0x7fca469d2350" />
+                                <attribute name="csym_nextSibling" value="0x7fca469dceb0" id="10836" addr="0x7fca469dceb0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469dc490" id="10837" addr="0x7fca469dc490" />
+                                <attribute name="sym_name" value="ControlRadioButton" id="10838" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469dceb0" id="10839" addr="0x7fca469dceb0" />
+                                <attribute name="defaultargs" value="0x7fca469d45d0" id="10840" addr="0x7fca469d45d0" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char,p.q(const).char)." id="10841" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="10842" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469d45d0" id="10843" addr="0x7fca469d45d0" />
+                                <parmlist id="10844" addr="0x7fca469dc530" >
                                     <parm id="10845">
-                                        <attributelist id="10846" addr="0x7f99f1e8e530" >
-                                            <attribute name="name" value="x" id="10847" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10848" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10846" addr="0x7fca469dc530" >
+                                            <attribute name="name" value="x" id="10847" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10848" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10849">
-                                        <attributelist id="10850" addr="0x7f99f1e8e5f0" >
-                                            <attribute name="name" value="y" id="10851" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10852" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10850" addr="0x7fca469dc5f0" >
+                                            <attribute name="name" value="y" id="10851" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10852" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10853">
-                                        <attributelist id="10854" addr="0x7f99f1e8e670" >
-                                            <attribute name="name" value="width" id="10855" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10856" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10854" addr="0x7fca469dc670" >
+                                            <attribute name="name" value="width" id="10855" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10856" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10857">
-                                        <attributelist id="10858" addr="0x7f99f1e8e6f0" >
-                                            <attribute name="name" value="height" id="10859" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10860" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10858" addr="0x7fca469dc6f0" >
+                                            <attribute name="name" value="height" id="10859" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10860" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10861">
-                                        <attributelist id="10862" addr="0x7f99f1e8e770" >
-                                            <attribute name="name" value="label" id="10863" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="10864" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10862" addr="0x7fca469dc770" >
+                                            <attribute name="name" value="label" id="10863" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="10864" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10865">
-                                        <attributelist id="10866" addr="0x7f99f1e8e7f0" >
-                                            <attribute name="name" value="focusOnTexture" id="10867" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10868" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10869" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10866" addr="0x7fca469dc7f0" >
+                                            <attribute name="name" value="focusOnTexture" id="10867" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10868" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10869" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10870">
-                                        <attributelist id="10871" addr="0x7f99f1e8e890" >
-                                            <attribute name="name" value="noFocusOnTexture" id="10872" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10873" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10874" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10871" addr="0x7fca469dc890" >
+                                            <attribute name="name" value="noFocusOnTexture" id="10872" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10873" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10874" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10875">
-                                        <attributelist id="10876" addr="0x7f99f1e8e930" >
-                                            <attribute name="name" value="focusOffTexture" id="10877" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10878" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10879" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10876" addr="0x7fca469dc930" >
+                                            <attribute name="name" value="focusOffTexture" id="10877" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10878" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10879" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_14" id="10880" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="10881" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_14" id="10880" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="10881" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="10882" addr="0x7f99f1e8eeb0" >
-                            <attributelist id="10883" addr="0x7f99f1e8eeb0" >
-                                <attribute name="name" value="ControlRadioButton" id="10884" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="10885" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e84350" id="10886" addr="0x7f99f1e84350" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e8f2d0" id="10887" addr="0x7f99f1e8f2d0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e8e9f0" id="10888" addr="0x7f99f1e8e9f0" />
-                                <attribute name="sym_name" value="ControlRadioButton" id="10889" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e8f2d0" id="10890" addr="0x7f99f1e8f2d0" />
-                                <attribute name="defaultargs" value="0x7f99f1e865d0" id="10891" addr="0x7f99f1e865d0" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char)." id="10892" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="10893" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e865d0" id="10894" addr="0x7f99f1e865d0" />
-                                <parmlist id="10895" addr="0x7f99f1e8ea90" >
+                        <constructor id="10882" addr="0x7fca469dceb0" >
+                            <attributelist id="10883" addr="0x7fca469dceb0" >
+                                <attribute name="name" value="ControlRadioButton" id="10884" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="10885" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469d2350" id="10886" addr="0x7fca469d2350" />
+                                <attribute name="csym_nextSibling" value="0x7fca469dd2d0" id="10887" addr="0x7fca469dd2d0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469dc9f0" id="10888" addr="0x7fca469dc9f0" />
+                                <attribute name="sym_name" value="ControlRadioButton" id="10889" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469dd2d0" id="10890" addr="0x7fca469dd2d0" />
+                                <attribute name="defaultargs" value="0x7fca469d45d0" id="10891" addr="0x7fca469d45d0" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char,p.q(const).char)." id="10892" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="10893" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469d45d0" id="10894" addr="0x7fca469d45d0" />
+                                <parmlist id="10895" addr="0x7fca469dca90" >
                                     <parm id="10896">
-                                        <attributelist id="10897" addr="0x7f99f1e8ea90" >
-                                            <attribute name="name" value="x" id="10898" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10899" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10897" addr="0x7fca469dca90" >
+                                            <attribute name="name" value="x" id="10898" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10899" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10900">
-                                        <attributelist id="10901" addr="0x7f99f1e8eb50" >
-                                            <attribute name="name" value="y" id="10902" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10903" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10901" addr="0x7fca469dcb50" >
+                                            <attribute name="name" value="y" id="10902" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10903" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10904">
-                                        <attributelist id="10905" addr="0x7f99f1e8ebd0" >
-                                            <attribute name="name" value="width" id="10906" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10907" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10905" addr="0x7fca469dcbd0" >
+                                            <attribute name="name" value="width" id="10906" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10907" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10908">
-                                        <attributelist id="10909" addr="0x7f99f1e8ec50" >
-                                            <attribute name="name" value="height" id="10910" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10911" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10909" addr="0x7fca469dcc50" >
+                                            <attribute name="name" value="height" id="10910" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10911" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10912">
-                                        <attributelist id="10913" addr="0x7f99f1e8ecd0" >
-                                            <attribute name="name" value="label" id="10914" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="10915" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10913" addr="0x7fca469dccd0" >
+                                            <attribute name="name" value="label" id="10914" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="10915" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10916">
-                                        <attributelist id="10917" addr="0x7f99f1e8ed50" >
-                                            <attribute name="name" value="focusOnTexture" id="10918" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10919" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10920" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10917" addr="0x7fca469dcd50" >
+                                            <attribute name="name" value="focusOnTexture" id="10918" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10919" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10920" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10921">
-                                        <attributelist id="10922" addr="0x7f99f1e8edf0" >
-                                            <attribute name="name" value="noFocusOnTexture" id="10923" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10924" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10925" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10922" addr="0x7fca469dcdf0" >
+                                            <attribute name="name" value="noFocusOnTexture" id="10923" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10924" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10925" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_15" id="10926" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="10927" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_15" id="10926" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="10927" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="10928" addr="0x7f99f1e8f2d0" >
-                            <attributelist id="10929" addr="0x7f99f1e8f2d0" >
-                                <attribute name="name" value="ControlRadioButton" id="10930" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="10931" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e84350" id="10932" addr="0x7f99f1e84350" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e8f650" id="10933" addr="0x7f99f1e8f650" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e8eeb0" id="10934" addr="0x7f99f1e8eeb0" />
-                                <attribute name="sym_name" value="ControlRadioButton" id="10935" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e8f650" id="10936" addr="0x7f99f1e8f650" />
-                                <attribute name="defaultargs" value="0x7f99f1e865d0" id="10937" addr="0x7f99f1e865d0" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char)." id="10938" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="10939" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e865d0" id="10940" addr="0x7f99f1e865d0" />
-                                <parmlist id="10941" addr="0x7f99f1e8ef50" >
+                        <constructor id="10928" addr="0x7fca469dd2d0" >
+                            <attributelist id="10929" addr="0x7fca469dd2d0" >
+                                <attribute name="name" value="ControlRadioButton" id="10930" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="10931" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469d2350" id="10932" addr="0x7fca469d2350" />
+                                <attribute name="csym_nextSibling" value="0x7fca469dd650" id="10933" addr="0x7fca469dd650" />
+                                <attribute name="sym_previousSibling" value="0x7fca469dceb0" id="10934" addr="0x7fca469dceb0" />
+                                <attribute name="sym_name" value="ControlRadioButton" id="10935" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469dd650" id="10936" addr="0x7fca469dd650" />
+                                <attribute name="defaultargs" value="0x7fca469d45d0" id="10937" addr="0x7fca469d45d0" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String,p.q(const).char)." id="10938" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="10939" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469d45d0" id="10940" addr="0x7fca469d45d0" />
+                                <parmlist id="10941" addr="0x7fca469dcf50" >
                                     <parm id="10942">
-                                        <attributelist id="10943" addr="0x7f99f1e8ef50" >
-                                            <attribute name="name" value="x" id="10944" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10945" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10943" addr="0x7fca469dcf50" >
+                                            <attribute name="name" value="x" id="10944" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10945" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10946">
-                                        <attributelist id="10947" addr="0x7f99f1e8f010" >
-                                            <attribute name="name" value="y" id="10948" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10949" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10947" addr="0x7fca469dd010" >
+                                            <attribute name="name" value="y" id="10948" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10949" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10950">
-                                        <attributelist id="10951" addr="0x7f99f1e8f090" >
-                                            <attribute name="name" value="width" id="10952" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10953" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10951" addr="0x7fca469dd090" >
+                                            <attribute name="name" value="width" id="10952" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10953" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10954">
-                                        <attributelist id="10955" addr="0x7f99f1e8f110" >
-                                            <attribute name="name" value="height" id="10956" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10957" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10955" addr="0x7fca469dd110" >
+                                            <attribute name="name" value="height" id="10956" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10957" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10958">
-                                        <attributelist id="10959" addr="0x7f99f1e8f190" >
-                                            <attribute name="name" value="label" id="10960" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="10961" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10959" addr="0x7fca469dd190" >
+                                            <attribute name="name" value="label" id="10960" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="10961" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10962">
-                                        <attributelist id="10963" addr="0x7f99f1e8f210" >
-                                            <attribute name="name" value="focusOnTexture" id="10964" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="10965" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="10966" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10963" addr="0x7fca469dd210" >
+                                            <attribute name="name" value="focusOnTexture" id="10964" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="10965" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="10966" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_16" id="10967" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="10968" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_16" id="10967" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="10968" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="10969" addr="0x7f99f1e8f650" >
-                            <attributelist id="10970" addr="0x7f99f1e8f650" >
-                                <attribute name="name" value="ControlRadioButton" id="10971" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="10972" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e84350" id="10973" addr="0x7f99f1e84350" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e8f2d0" id="10974" addr="0x7f99f1e8f2d0" />
-                                <attribute name="sym_name" value="ControlRadioButton" id="10975" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e865d0" id="10976" addr="0x7f99f1e865d0" />
-                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String)." id="10977" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="10978" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e865d0" id="10979" addr="0x7f99f1e865d0" />
-                                <parmlist id="10980" addr="0x7f99f1e8f370" >
+                        <constructor id="10969" addr="0x7fca469dd650" >
+                            <attributelist id="10970" addr="0x7fca469dd650" >
+                                <attribute name="name" value="ControlRadioButton" id="10971" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="10972" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469d2350" id="10973" addr="0x7fca469d2350" />
+                                <attribute name="sym_previousSibling" value="0x7fca469dd2d0" id="10974" addr="0x7fca469dd2d0" />
+                                <attribute name="sym_name" value="ControlRadioButton" id="10975" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469d45d0" id="10976" addr="0x7fca469d45d0" />
+                                <attribute name="decl" value="f(long,long,long,long,r.q(const).String)." id="10977" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="10978" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469d45d0" id="10979" addr="0x7fca469d45d0" />
+                                <parmlist id="10980" addr="0x7fca469dd370" >
                                     <parm id="10981">
-                                        <attributelist id="10982" addr="0x7f99f1e8f370" >
-                                            <attribute name="name" value="x" id="10983" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10984" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10982" addr="0x7fca469dd370" >
+                                            <attribute name="name" value="x" id="10983" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10984" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10985">
-                                        <attributelist id="10986" addr="0x7f99f1e8f430" >
-                                            <attribute name="name" value="y" id="10987" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10988" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10986" addr="0x7fca469dd430" >
+                                            <attribute name="name" value="y" id="10987" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10988" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10989">
-                                        <attributelist id="10990" addr="0x7f99f1e8f4b0" >
-                                            <attribute name="name" value="width" id="10991" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10992" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10990" addr="0x7fca469dd4b0" >
+                                            <attribute name="name" value="width" id="10991" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10992" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10993">
-                                        <attributelist id="10994" addr="0x7f99f1e8f530" >
-                                            <attribute name="name" value="height" id="10995" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="10996" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10994" addr="0x7fca469dd530" >
+                                            <attribute name="name" value="height" id="10995" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="10996" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="10997">
-                                        <attributelist id="10998" addr="0x7f99f1e8f5b0" >
-                                            <attribute name="name" value="label" id="10999" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="11000" addr="0x7f99f1de6c90" />
+                                        <attributelist id="10998" addr="0x7fca469dd5b0" >
+                                            <attribute name="name" value="label" id="10999" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="11000" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_17" id="11001" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="11002" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_17" id="11001" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="11002" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <cdecl id="11003" addr="0x7f99f1e8f8f0" >
-                            <attributelist id="11004" addr="0x7f99f1e8f8f0" >
-                                <attribute name="name" value="setSelected" id="11005" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="11006" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e84350" id="11007" addr="0x7f99f1e84350" />
-                                <attribute name="kind" value="function" id="11008" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setSelected" id="11009" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(bool)." id="11010" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="11011" addr="0x7f99f1de6c90" />
-                                <parmlist id="11012" addr="0x7f99f1e8f830" >
+                        <cdecl id="11003" addr="0x7fca469dd8f0" >
+                            <attributelist id="11004" addr="0x7fca469dd8f0" >
+                                <attribute name="name" value="setSelected" id="11005" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="11006" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469d2350" id="11007" addr="0x7fca469d2350" />
+                                <attribute name="kind" value="function" id="11008" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setSelected" id="11009" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(bool)." id="11010" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="11011" addr="0x7fca46934c90" />
+                                <parmlist id="11012" addr="0x7fca469dd830" >
                                     <parm id="11013">
-                                        <attributelist id="11014" addr="0x7f99f1e8f830" >
-                                            <attribute name="name" value="selected" id="11015" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="11016" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11014" addr="0x7fca469dd830" >
+                                            <attribute name="name" value="selected" id="11015" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="11016" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="11017" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="11018" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="11019" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="11017" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="11018" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="11019" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="11020" addr="0x7f99f1e8fad0" >
-                            <attributelist id="11021" addr="0x7f99f1e8fad0" >
-                                <attribute name="name" value="isSelected" id="11022" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="11023" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e84350" id="11024" addr="0x7f99f1e84350" />
-                                <attribute name="kind" value="function" id="11025" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="isSelected" id="11026" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="11027" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="11028" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="bool" id="11029" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="11030" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="11031" addr="0x7f99f1de6c90" />
+                        <cdecl id="11020" addr="0x7fca469ddad0" >
+                            <attributelist id="11021" addr="0x7fca469ddad0" >
+                                <attribute name="name" value="isSelected" id="11022" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="11023" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469d2350" id="11024" addr="0x7fca469d2350" />
+                                <attribute name="kind" value="function" id="11025" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="isSelected" id="11026" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="11027" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="11028" addr="0x7fca46934c90" />
+                                <attribute name="type" value="bool" id="11029" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="11030" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="11031" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="11032" addr="0x7f99f1e90810" >
-                            <attributelist id="11033" addr="0x7f99f1e90810" >
-                                <attribute name="name" value="setLabel" id="11034" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="11035" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e84350" id="11036" addr="0x7f99f1e84350" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e90d10" id="11037" addr="0x7f99f1e90d10" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e90d10" id="11038" addr="0x7f99f1e90d10" />
-                                <attribute name="kind" value="function" id="11039" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setLabel" id="11040" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,r.q(const).XBMCAddon::String)." id="11041" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="11042" addr="0x7f99f1de6c90" />
-                                <parmlist id="11043" addr="0x7f99f1e8fd90" >
+                        <cdecl id="11032" addr="0x7fca469de810" >
+                            <attributelist id="11033" addr="0x7fca469de810" >
+                                <attribute name="name" value="setLabel" id="11034" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="11035" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469d2350" id="11036" addr="0x7fca469d2350" />
+                                <attribute name="sym_nextSibling" value="0x7fca469ded10" id="11037" addr="0x7fca469ded10" />
+                                <attribute name="csym_nextSibling" value="0x7fca469ded10" id="11038" addr="0x7fca469ded10" />
+                                <attribute name="kind" value="function" id="11039" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setLabel" id="11040" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,r.q(const).XBMCAddon::String)." id="11041" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="11042" addr="0x7fca46934c90" />
+                                <parmlist id="11043" addr="0x7fca469ddd90" >
                                     <parm id="11044">
-                                        <attributelist id="11045" addr="0x7f99f1e8fd90" >
-                                            <attribute name="name" value="label" id="11046" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="11047" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="11048" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11045" addr="0x7fca469ddd90" >
+                                            <attribute name="name" value="label" id="11046" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="11047" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="11048" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11049">
-                                        <attributelist id="11050" addr="0x7f99f1e8ff30" >
-                                            <attribute name="name" value="font" id="11051" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="11052" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="11053" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11050" addr="0x7fca469ddf30" >
+                                            <attribute name="name" value="font" id="11051" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="11052" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="11053" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11054">
-                                        <attributelist id="11055" addr="0x7f99f1e900d0" >
-                                            <attribute name="name" value="textColor" id="11056" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="11057" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="11058" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11055" addr="0x7fca469de0d0" >
+                                            <attribute name="name" value="textColor" id="11056" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="11057" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="11058" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11059">
-                                        <attributelist id="11060" addr="0x7f99f1e90270" >
-                                            <attribute name="name" value="disabledColor" id="11061" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="11062" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="11063" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11060" addr="0x7fca469de270" >
+                                            <attribute name="name" value="disabledColor" id="11061" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="11062" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="11063" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11064">
-                                        <attributelist id="11065" addr="0x7f99f1e90410" >
-                                            <attribute name="name" value="shadowColor" id="11066" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="11067" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="11068" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11065" addr="0x7fca469de410" >
+                                            <attribute name="name" value="shadowColor" id="11066" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="11067" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="11068" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11069">
-                                        <attributelist id="11070" addr="0x7f99f1e905b0" >
-                                            <attribute name="name" value="focusedColor" id="11071" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="11072" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="11073" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11070" addr="0x7fca469de5b0" >
+                                            <attribute name="name" value="focusedColor" id="11071" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="11072" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="11073" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11074">
-                                        <attributelist id="11075" addr="0x7f99f1e90750" >
-                                            <attribute name="name" value="label2" id="11076" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="11077" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="11078" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                    </parm >
-                                </parmlist >
-                                <attribute name="sym_overloaded" value="0x7f99f1e90810" id="11079" addr="0x7f99f1e90810" />
-                                <attribute name="type" value="void" id="11080" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="11081" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="11082" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="11083" addr="0x7f99f1e90d10" >
-                            <attributelist id="11084" addr="0x7f99f1e90d10" >
-                                <attribute name="name" value="setLabel" id="11085" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="11086" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e84350" id="11087" addr="0x7f99f1e84350" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e90810" id="11088" addr="0x7f99f1e90810" />
-                                <attribute name="kind" value="function" id="11089" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setLabel" id="11090" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e91170" id="11091" addr="0x7f99f1e91170" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e91170" id="11092" addr="0x7f99f1e91170" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char)." id="11093" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e90810" id="11094" addr="0x7f99f1e90810" />
-                                <attribute name="access" value="public" id="11095" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e90810" id="11096" addr="0x7f99f1e90810" />
-                                <parmlist id="11097" addr="0x7f99f1e908d0" >
+                                        <attributelist id="11075" addr="0x7fca469de750" >
+                                            <attribute name="name" value="label2" id="11076" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="11077" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="11078" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                    </parm >
+                                </parmlist >
+                                <attribute name="sym_overloaded" value="0x7fca469de810" id="11079" addr="0x7fca469de810" />
+                                <attribute name="type" value="void" id="11080" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="11081" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="11082" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="11083" addr="0x7fca469ded10" >
+                            <attributelist id="11084" addr="0x7fca469ded10" >
+                                <attribute name="name" value="setLabel" id="11085" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="11086" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469d2350" id="11087" addr="0x7fca469d2350" />
+                                <attribute name="sym_previousSibling" value="0x7fca469de810" id="11088" addr="0x7fca469de810" />
+                                <attribute name="kind" value="function" id="11089" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setLabel" id="11090" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469df170" id="11091" addr="0x7fca469df170" />
+                                <attribute name="sym_nextSibling" value="0x7fca469df170" id="11092" addr="0x7fca469df170" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char)." id="11093" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469de810" id="11094" addr="0x7fca469de810" />
+                                <attribute name="access" value="public" id="11095" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469de810" id="11096" addr="0x7fca469de810" />
+                                <parmlist id="11097" addr="0x7fca469de8d0" >
                                     <parm id="11098">
-                                        <attributelist id="11099" addr="0x7f99f1e908d0" >
-                                            <attribute name="name" value="label" id="11100" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="11101" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="11102" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11099" addr="0x7fca469de8d0" >
+                                            <attribute name="name" value="label" id="11100" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="11101" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="11102" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11103">
-                                        <attributelist id="11104" addr="0x7f99f1e909d0" >
-                                            <attribute name="name" value="font" id="11105" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="11106" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="11107" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11104" addr="0x7fca469de9d0" >
+                                            <attribute name="name" value="font" id="11105" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="11106" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="11107" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11108">
-                                        <attributelist id="11109" addr="0x7f99f1e90a70" >
-                                            <attribute name="name" value="textColor" id="11110" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="11111" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="11112" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11109" addr="0x7fca469dea70" >
+                                            <attribute name="name" value="textColor" id="11110" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="11111" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="11112" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11113">
-                                        <attributelist id="11114" addr="0x7f99f1e90b10" >
-                                            <attribute name="name" value="disabledColor" id="11115" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="11116" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="11117" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11114" addr="0x7fca469deb10" >
+                                            <attribute name="name" value="disabledColor" id="11115" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="11116" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="11117" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11118">
-                                        <attributelist id="11119" addr="0x7f99f1e90bb0" >
-                                            <attribute name="name" value="shadowColor" id="11120" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="11121" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="11122" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11119" addr="0x7fca469debb0" >
+                                            <attribute name="name" value="shadowColor" id="11120" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="11121" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="11122" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11123">
-                                        <attributelist id="11124" addr="0x7f99f1e90c50" >
-                                            <attribute name="name" value="focusedColor" id="11125" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="11126" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="11127" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                    </parm >
-                                </parmlist >
-                                <attribute name="type" value="void" id="11128" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="11129" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="11130" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="11131" addr="0x7f99f1e91170" >
-                            <attributelist id="11132" addr="0x7f99f1e91170" >
-                                <attribute name="name" value="setLabel" id="11133" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="11134" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e84350" id="11135" addr="0x7f99f1e84350" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e90d10" id="11136" addr="0x7f99f1e90d10" />
-                                <attribute name="kind" value="function" id="11137" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setLabel" id="11138" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e91530" id="11139" addr="0x7f99f1e91530" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e91530" id="11140" addr="0x7f99f1e91530" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char)." id="11141" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e90810" id="11142" addr="0x7f99f1e90810" />
-                                <attribute name="access" value="public" id="11143" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e90810" id="11144" addr="0x7f99f1e90810" />
-                                <parmlist id="11145" addr="0x7f99f1e90dd0" >
+                                        <attributelist id="11124" addr="0x7fca469dec50" >
+                                            <attribute name="name" value="focusedColor" id="11125" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="11126" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="11127" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                    </parm >
+                                </parmlist >
+                                <attribute name="type" value="void" id="11128" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="11129" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="11130" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="11131" addr="0x7fca469df170" >
+                            <attributelist id="11132" addr="0x7fca469df170" >
+                                <attribute name="name" value="setLabel" id="11133" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="11134" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469d2350" id="11135" addr="0x7fca469d2350" />
+                                <attribute name="sym_previousSibling" value="0x7fca469ded10" id="11136" addr="0x7fca469ded10" />
+                                <attribute name="kind" value="function" id="11137" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setLabel" id="11138" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469df530" id="11139" addr="0x7fca469df530" />
+                                <attribute name="sym_nextSibling" value="0x7fca469df530" id="11140" addr="0x7fca469df530" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char)." id="11141" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469de810" id="11142" addr="0x7fca469de810" />
+                                <attribute name="access" value="public" id="11143" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469de810" id="11144" addr="0x7fca469de810" />
+                                <parmlist id="11145" addr="0x7fca469dedd0" >
                                     <parm id="11146">
-                                        <attributelist id="11147" addr="0x7f99f1e90dd0" >
-                                            <attribute name="name" value="label" id="11148" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="11149" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="11150" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11147" addr="0x7fca469dedd0" >
+                                            <attribute name="name" value="label" id="11148" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="11149" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="11150" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11151">
-                                        <attributelist id="11152" addr="0x7f99f1e90ed0" >
-                                            <attribute name="name" value="font" id="11153" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="11154" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="11155" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11152" addr="0x7fca469deed0" >
+                                            <attribute name="name" value="font" id="11153" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="11154" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="11155" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11156">
-                                        <attributelist id="11157" addr="0x7f99f1e90f70" >
-                                            <attribute name="name" value="textColor" id="11158" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="11159" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="11160" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11157" addr="0x7fca469def70" >
+                                            <attribute name="name" value="textColor" id="11158" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="11159" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="11160" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11161">
-                                        <attributelist id="11162" addr="0x7f99f1e91010" >
-                                            <attribute name="name" value="disabledColor" id="11163" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="11164" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="11165" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11162" addr="0x7fca469df010" >
+                                            <attribute name="name" value="disabledColor" id="11163" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="11164" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="11165" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11166">
-                                        <attributelist id="11167" addr="0x7f99f1e910b0" >
-                                            <attribute name="name" value="shadowColor" id="11168" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="11169" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="11170" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                    </parm >
-                                </parmlist >
-                                <attribute name="type" value="void" id="11171" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_2" id="11172" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="11173" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="11174" addr="0x7f99f1e91530" >
-                            <attributelist id="11175" addr="0x7f99f1e91530" >
-                                <attribute name="name" value="setLabel" id="11176" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="11177" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e84350" id="11178" addr="0x7f99f1e84350" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e91170" id="11179" addr="0x7f99f1e91170" />
-                                <attribute name="kind" value="function" id="11180" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setLabel" id="11181" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e91850" id="11182" addr="0x7f99f1e91850" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e91850" id="11183" addr="0x7f99f1e91850" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char,p.q(const).char)." id="11184" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e90810" id="11185" addr="0x7f99f1e90810" />
-                                <attribute name="access" value="public" id="11186" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e90810" id="11187" addr="0x7f99f1e90810" />
-                                <parmlist id="11188" addr="0x7f99f1e91230" >
+                                        <attributelist id="11167" addr="0x7fca469df0b0" >
+                                            <attribute name="name" value="shadowColor" id="11168" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="11169" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="11170" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                    </parm >
+                                </parmlist >
+                                <attribute name="type" value="void" id="11171" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_2" id="11172" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="11173" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="11174" addr="0x7fca469df530" >
+                            <attributelist id="11175" addr="0x7fca469df530" >
+                                <attribute name="name" value="setLabel" id="11176" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="11177" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469d2350" id="11178" addr="0x7fca469d2350" />
+                                <attribute name="sym_previousSibling" value="0x7fca469df170" id="11179" addr="0x7fca469df170" />
+                                <attribute name="kind" value="function" id="11180" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setLabel" id="11181" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469df850" id="11182" addr="0x7fca469df850" />
+                                <attribute name="sym_nextSibling" value="0x7fca469df850" id="11183" addr="0x7fca469df850" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char,p.q(const).char)." id="11184" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469de810" id="11185" addr="0x7fca469de810" />
+                                <attribute name="access" value="public" id="11186" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469de810" id="11187" addr="0x7fca469de810" />
+                                <parmlist id="11188" addr="0x7fca469df230" >
                                     <parm id="11189">
-                                        <attributelist id="11190" addr="0x7f99f1e91230" >
-                                            <attribute name="name" value="label" id="11191" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="11192" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="11193" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11190" addr="0x7fca469df230" >
+                                            <attribute name="name" value="label" id="11191" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="11192" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="11193" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11194">
-                                        <attributelist id="11195" addr="0x7f99f1e91330" >
-                                            <attribute name="name" value="font" id="11196" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="11197" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="11198" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11195" addr="0x7fca469df330" >
+                                            <attribute name="name" value="font" id="11196" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="11197" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="11198" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11199">
-                                        <attributelist id="11200" addr="0x7f99f1e913d0" >
-                                            <attribute name="name" value="textColor" id="11201" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="11202" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="11203" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11200" addr="0x7fca469df3d0" >
+                                            <attribute name="name" value="textColor" id="11201" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="11202" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="11203" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11204">
-                                        <attributelist id="11205" addr="0x7f99f1e91470" >
-                                            <attribute name="name" value="disabledColor" id="11206" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="11207" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="11208" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                    </parm >
-                                </parmlist >
-                                <attribute name="type" value="void" id="11209" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_3" id="11210" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="11211" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="11212" addr="0x7f99f1e91850" >
-                            <attributelist id="11213" addr="0x7f99f1e91850" >
-                                <attribute name="name" value="setLabel" id="11214" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="11215" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e84350" id="11216" addr="0x7f99f1e84350" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e91530" id="11217" addr="0x7f99f1e91530" />
-                                <attribute name="kind" value="function" id="11218" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setLabel" id="11219" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e91ad0" id="11220" addr="0x7f99f1e91ad0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e91ad0" id="11221" addr="0x7f99f1e91ad0" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char)." id="11222" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e90810" id="11223" addr="0x7f99f1e90810" />
-                                <attribute name="access" value="public" id="11224" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e90810" id="11225" addr="0x7f99f1e90810" />
-                                <parmlist id="11226" addr="0x7f99f1e915f0" >
+                                        <attributelist id="11205" addr="0x7fca469df470" >
+                                            <attribute name="name" value="disabledColor" id="11206" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="11207" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="11208" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                    </parm >
+                                </parmlist >
+                                <attribute name="type" value="void" id="11209" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_3" id="11210" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="11211" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="11212" addr="0x7fca469df850" >
+                            <attributelist id="11213" addr="0x7fca469df850" >
+                                <attribute name="name" value="setLabel" id="11214" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="11215" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469d2350" id="11216" addr="0x7fca469d2350" />
+                                <attribute name="sym_previousSibling" value="0x7fca469df530" id="11217" addr="0x7fca469df530" />
+                                <attribute name="kind" value="function" id="11218" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setLabel" id="11219" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469dfad0" id="11220" addr="0x7fca469dfad0" />
+                                <attribute name="sym_nextSibling" value="0x7fca469dfad0" id="11221" addr="0x7fca469dfad0" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char,p.q(const).char)." id="11222" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469de810" id="11223" addr="0x7fca469de810" />
+                                <attribute name="access" value="public" id="11224" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469de810" id="11225" addr="0x7fca469de810" />
+                                <parmlist id="11226" addr="0x7fca469df5f0" >
                                     <parm id="11227">
-                                        <attributelist id="11228" addr="0x7f99f1e915f0" >
-                                            <attribute name="name" value="label" id="11229" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="11230" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="11231" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11228" addr="0x7fca469df5f0" >
+                                            <attribute name="name" value="label" id="11229" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="11230" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="11231" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11232">
-                                        <attributelist id="11233" addr="0x7f99f1e916f0" >
-                                            <attribute name="name" value="font" id="11234" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="11235" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="11236" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11233" addr="0x7fca469df6f0" >
+                                            <attribute name="name" value="font" id="11234" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="11235" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="11236" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11237">
-                                        <attributelist id="11238" addr="0x7f99f1e91790" >
-                                            <attribute name="name" value="textColor" id="11239" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="11240" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="11241" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                    </parm >
-                                </parmlist >
-                                <attribute name="type" value="void" id="11242" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_4" id="11243" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="11244" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="11245" addr="0x7f99f1e91ad0" >
-                            <attributelist id="11246" addr="0x7f99f1e91ad0" >
-                                <attribute name="name" value="setLabel" id="11247" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="11248" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e84350" id="11249" addr="0x7f99f1e84350" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e91850" id="11250" addr="0x7f99f1e91850" />
-                                <attribute name="kind" value="function" id="11251" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setLabel" id="11252" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e91cb0" id="11253" addr="0x7f99f1e91cb0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e91cb0" id="11254" addr="0x7f99f1e91cb0" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char)." id="11255" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e90810" id="11256" addr="0x7f99f1e90810" />
-                                <attribute name="access" value="public" id="11257" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e90810" id="11258" addr="0x7f99f1e90810" />
-                                <parmlist id="11259" addr="0x7f99f1e91910" >
+                                        <attributelist id="11238" addr="0x7fca469df790" >
+                                            <attribute name="name" value="textColor" id="11239" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="11240" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="11241" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                    </parm >
+                                </parmlist >
+                                <attribute name="type" value="void" id="11242" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_4" id="11243" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="11244" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="11245" addr="0x7fca469dfad0" >
+                            <attributelist id="11246" addr="0x7fca469dfad0" >
+                                <attribute name="name" value="setLabel" id="11247" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="11248" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469d2350" id="11249" addr="0x7fca469d2350" />
+                                <attribute name="sym_previousSibling" value="0x7fca469df850" id="11250" addr="0x7fca469df850" />
+                                <attribute name="kind" value="function" id="11251" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setLabel" id="11252" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469dfcb0" id="11253" addr="0x7fca469dfcb0" />
+                                <attribute name="sym_nextSibling" value="0x7fca469dfcb0" id="11254" addr="0x7fca469dfcb0" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,p.q(const).char)." id="11255" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469de810" id="11256" addr="0x7fca469de810" />
+                                <attribute name="access" value="public" id="11257" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469de810" id="11258" addr="0x7fca469de810" />
+                                <parmlist id="11259" addr="0x7fca469df910" >
                                     <parm id="11260">
-                                        <attributelist id="11261" addr="0x7f99f1e91910" >
-                                            <attribute name="name" value="label" id="11262" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="11263" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="11264" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11261" addr="0x7fca469df910" >
+                                            <attribute name="name" value="label" id="11262" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="11263" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="11264" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11265">
-                                        <attributelist id="11266" addr="0x7f99f1e91a10" >
-                                            <attribute name="name" value="font" id="11267" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="11268" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="11269" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                    </parm >
-                                </parmlist >
-                                <attribute name="type" value="void" id="11270" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_5" id="11271" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="11272" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="11273" addr="0x7f99f1e91cb0" >
-                            <attributelist id="11274" addr="0x7f99f1e91cb0" >
-                                <attribute name="name" value="setLabel" id="11275" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="11276" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e84350" id="11277" addr="0x7f99f1e84350" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e91ad0" id="11278" addr="0x7f99f1e91ad0" />
-                                <attribute name="kind" value="function" id="11279" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setLabel" id="11280" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e91dd0" id="11281" addr="0x7f99f1e91dd0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e91dd0" id="11282" addr="0x7f99f1e91dd0" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="11283" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e90810" id="11284" addr="0x7f99f1e90810" />
-                                <attribute name="access" value="public" id="11285" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e90810" id="11286" addr="0x7f99f1e90810" />
-                                <parmlist id="11287" addr="0x7f99f1e91b90" >
+                                        <attributelist id="11266" addr="0x7fca469dfa10" >
+                                            <attribute name="name" value="font" id="11267" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="11268" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="11269" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                    </parm >
+                                </parmlist >
+                                <attribute name="type" value="void" id="11270" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_5" id="11271" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="11272" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="11273" addr="0x7fca469dfcb0" >
+                            <attributelist id="11274" addr="0x7fca469dfcb0" >
+                                <attribute name="name" value="setLabel" id="11275" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="11276" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469d2350" id="11277" addr="0x7fca469d2350" />
+                                <attribute name="sym_previousSibling" value="0x7fca469dfad0" id="11278" addr="0x7fca469dfad0" />
+                                <attribute name="kind" value="function" id="11279" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setLabel" id="11280" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469dfdd0" id="11281" addr="0x7fca469dfdd0" />
+                                <attribute name="sym_nextSibling" value="0x7fca469dfdd0" id="11282" addr="0x7fca469dfdd0" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="11283" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469de810" id="11284" addr="0x7fca469de810" />
+                                <attribute name="access" value="public" id="11285" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469de810" id="11286" addr="0x7fca469de810" />
+                                <parmlist id="11287" addr="0x7fca469dfb90" >
                                     <parm id="11288">
-                                        <attributelist id="11289" addr="0x7f99f1e91b90" >
-                                            <attribute name="name" value="label" id="11290" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="11291" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="11292" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                    </parm >
-                                </parmlist >
-                                <attribute name="type" value="void" id="11293" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_6" id="11294" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="11295" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="11296" addr="0x7f99f1e91dd0" >
-                            <attributelist id="11297" addr="0x7f99f1e91dd0" >
-                                <attribute name="name" value="setLabel" id="11298" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="11299" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e84350" id="11300" addr="0x7f99f1e84350" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e91cb0" id="11301" addr="0x7f99f1e91cb0" />
-                                <attribute name="kind" value="function" id="11302" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setLabel" id="11303" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e90810" id="11304" addr="0x7f99f1e90810" />
-                                <attribute name="decl" value="f()." id="11305" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="11306" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e90810" id="11307" addr="0x7f99f1e90810" />
-                                <attribute name="type" value="void" id="11308" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_7" id="11309" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="11310" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="11311" addr="0x7f99f1e92450" >
-                            <attributelist id="11312" addr="0x7f99f1e92450" >
-                                <attribute name="name" value="setRadioDimension" id="11313" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="11314" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e84350" id="11315" addr="0x7f99f1e84350" />
-                                <attribute name="kind" value="function" id="11316" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setRadioDimension" id="11317" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(long,long,long,long)." id="11318" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="11319" addr="0x7f99f1de6c90" />
-                                <parmlist id="11320" addr="0x7f99f1e92030" >
+                                        <attributelist id="11289" addr="0x7fca469dfb90" >
+                                            <attribute name="name" value="label" id="11290" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="11291" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="11292" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                    </parm >
+                                </parmlist >
+                                <attribute name="type" value="void" id="11293" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_6" id="11294" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="11295" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="11296" addr="0x7fca469dfdd0" >
+                            <attributelist id="11297" addr="0x7fca469dfdd0" >
+                                <attribute name="name" value="setLabel" id="11298" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="11299" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469d2350" id="11300" addr="0x7fca469d2350" />
+                                <attribute name="sym_previousSibling" value="0x7fca469dfcb0" id="11301" addr="0x7fca469dfcb0" />
+                                <attribute name="kind" value="function" id="11302" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setLabel" id="11303" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469de810" id="11304" addr="0x7fca469de810" />
+                                <attribute name="decl" value="f()." id="11305" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="11306" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469de810" id="11307" addr="0x7fca469de810" />
+                                <attribute name="type" value="void" id="11308" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_7" id="11309" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="11310" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="11311" addr="0x7fca469e0450" >
+                            <attributelist id="11312" addr="0x7fca469e0450" >
+                                <attribute name="name" value="setRadioDimension" id="11313" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="11314" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469d2350" id="11315" addr="0x7fca469d2350" />
+                                <attribute name="kind" value="function" id="11316" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setRadioDimension" id="11317" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(long,long,long,long)." id="11318" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="11319" addr="0x7fca46934c90" />
+                                <parmlist id="11320" addr="0x7fca469e0030" >
                                     <parm id="11321">
-                                        <attributelist id="11322" addr="0x7f99f1e92030" >
-                                            <attribute name="name" value="x" id="11323" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="11324" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11322" addr="0x7fca469e0030" >
+                                            <attribute name="name" value="x" id="11323" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="11324" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11325">
-                                        <attributelist id="11326" addr="0x7f99f1e92150" >
-                                            <attribute name="name" value="y" id="11327" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="11328" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11326" addr="0x7fca469e0150" >
+                                            <attribute name="name" value="y" id="11327" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="11328" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11329">
-                                        <attributelist id="11330" addr="0x7f99f1e92270" >
-                                            <attribute name="name" value="width" id="11331" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="11332" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11330" addr="0x7fca469e0270" >
+                                            <attribute name="name" value="width" id="11331" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="11332" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11333">
-                                        <attributelist id="11334" addr="0x7f99f1e92390" >
-                                            <attribute name="name" value="height" id="11335" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="11336" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11334" addr="0x7fca469e0390" >
+                                            <attribute name="name" value="height" id="11335" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="11336" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="11337" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="11338" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="11339" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="11337" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="11338" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="11339" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
                     </class >
-                    <class id="11340" addr="0x7f99f1e92730" >
-                        <attributelist id="11341" addr="0x7f99f1e92730" >
-                            <attribute name="name" value="XBMCAddon::xbmcgui::ControlSlider" id="11342" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="11343" addr="0x7f99f1e40fb0" />
-                            <attribute name="symtab" value="0x7f99f1e92870" id="11344" addr="0x7f99f1e92870" />
-                            <attribute name="allows_typedef" value="1" id="11345" addr="0x7f99f1de6c90" />
-                            <attribute name="typepass_visit" value="1" id="11346" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_visit" value="1" id="11347" addr="0x7f99f1de6c90" />
-                            <attribute name="kind" value="class" id="11348" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_name" value="ControlSlider" id="11349" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_has_constructor" value="1" id="11350" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_public_constructor" value="1" id="11351" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_copy_constructor" value="1" id="11352" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_default_destructor" value="1" id="11353" addr="0x7f99f1de6c90" />
-                            <attribute name="privatebaselist" value="0x7f99f1e92710" id="11354" addr="0x7f99f1e92710" />
-                            <attribute name="protectedbaselist" value="0x7f99f1e926f0" id="11355" addr="0x7f99f1e926f0" />
-                            <baselist id="11356" addr="0x7f99f1e926d0" >
-                                <base name="Control" id="11357" addr="0x7f99f1e92650" />
+                    <class id="11340" addr="0x7fca469e0730" >
+                        <attributelist id="11341" addr="0x7fca469e0730" >
+                            <attribute name="name" value="XBMCAddon::xbmcgui::ControlSlider" id="11342" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="11343" addr="0x7fca4698efb0" />
+                            <attribute name="symtab" value="0x7fca469e0870" id="11344" addr="0x7fca469e0870" />
+                            <attribute name="allows_typedef" value="1" id="11345" addr="0x7fca46934c90" />
+                            <attribute name="typepass_visit" value="1" id="11346" addr="0x7fca46934c90" />
+                            <attribute name="allocate_visit" value="1" id="11347" addr="0x7fca46934c90" />
+                            <attribute name="kind" value="class" id="11348" addr="0x7fca46934c90" />
+                            <attribute name="sym_name" value="ControlSlider" id="11349" addr="0x7fca46934c90" />
+                            <attribute name="allocate_has_constructor" value="1" id="11350" addr="0x7fca46934c90" />
+                            <attribute name="allocate_public_constructor" value="1" id="11351" addr="0x7fca46934c90" />
+                            <attribute name="allocate_copy_constructor" value="1" id="11352" addr="0x7fca46934c90" />
+                            <attribute name="allocate_default_destructor" value="1" id="11353" addr="0x7fca46934c90" />
+                            <attribute name="privatebaselist" value="0x7fca469e0710" id="11354" addr="0x7fca469e0710" />
+                            <attribute name="protectedbaselist" value="0x7fca469e06f0" id="11355" addr="0x7fca469e06f0" />
+                            <baselist id="11356" addr="0x7fca469e06d0" >
+                                <base name="Control" id="11357" addr="0x7fca469e0650" />
                             </baselist >
-                            <attribute name="module" value="xbmcgui" id="11358" addr="0x7f99f1e402f0" />
-                            <attribute name="bases" value="0x7f99f1dde0d0" id="11359" addr="0x7f99f1dde0d0" />
-                            <attribute name="allbases" value="0x7f99f1dde370" id="11360" addr="0x7f99f1dde370" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="11361" addr="0x7f99f1de6c90" />
-                            <typescope id="11362" addr="0x7f99f1dde050" >
-                                <attributelist id="11363" addr="0x7f99f1dde050" >
-                                    <attribute name="inherit" value="0x7f99f1dde150" id="11364" addr="0x7f99f1dde150" />
-                                    <attribute name="name" value="ControlSlider" id="11365" addr="0x7f99f1de6c90" />
-                                    <typetab id="11366" addr="0x7f99f1dde070" >
-                                        <attributelist id="11367" addr="0x7f99f1dde070" >
+                            <attribute name="module" value="xbmcgui" id="11358" addr="0x7fca4698e2f0" />
+                            <attribute name="bases" value="0x7fca4692c0d0" id="11359" addr="0x7fca4692c0d0" />
+                            <attribute name="allbases" value="0x7fca4692c370" id="11360" addr="0x7fca4692c370" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="11361" addr="0x7fca46934c90" />
+                            <typescope id="11362" addr="0x7fca4692c050" >
+                                <attributelist id="11363" addr="0x7fca4692c050" >
+                                    <attribute name="inherit" value="0x7fca4692c150" id="11364" addr="0x7fca4692c150" />
+                                    <attribute name="name" value="ControlSlider" id="11365" addr="0x7fca46934c90" />
+                                    <typetab id="11366" addr="0x7fca4692c070" >
+                                        <attributelist id="11367" addr="0x7fca4692c070" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f99f1dd2150" id="11368" addr="0x7f99f1dd2150" />
-                                    <attribute name="qname" value="XBMCAddon::xbmcgui::ControlSlider" id="11369" addr="0x7f99f1de6c90" />
-                                    <attribute name="symtab" value="0x7f99f1e92870" id="11370" addr="0x7f99f1e92870" />
+                                    <attribute name="parent" value="0x7fca46920150" id="11368" addr="0x7fca46920150" />
+                                    <attribute name="qname" value="XBMCAddon::xbmcgui::ControlSlider" id="11369" addr="0x7fca46934c90" />
+                                    <attribute name="symtab" value="0x7fca469e0870" id="11370" addr="0x7fca469e0870" />
                                 </attributelist >
-                                <typescopesitem id="11371" addr="0x7f99f1dde150" >
-                                    <attributelist id="11372" addr="0x7f99f1dde150" >
+                                <typescopesitem id="11371" addr="0x7fca4692c150" >
+                                    <attributelist id="11372" addr="0x7fca4692c150" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="11373" addr="0x7f99f1dddfd0" >
-                                    <attributelist id="11374" addr="0x7f99f1dddfd0" >
+                                <typescopesitem id="11373" addr="0x7fca4692bfd0" >
+                                    <attributelist id="11374" addr="0x7fca4692bfd0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="11375" addr="0x7f99f1dde070" >
-                                    <attributelist id="11376" addr="0x7f99f1dde070" >
+                                <typescopesitem id="11375" addr="0x7fca4692c070" >
+                                    <attributelist id="11376" addr="0x7fca4692c070" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="11377" addr="0x7f99f1dd2150" >
-                                    <attributelist id="11378" addr="0x7f99f1dd2150" >
-                                        <attribute name="name" value="xbmcgui" id="11379" addr="0x7f99f1de6c90" />
-                                        <typetab id="11380" addr="0x7f99f1dd2170" >
-                                            <attributelist id="11381" addr="0x7f99f1dd2170" >
-                                                <attribute name="InterceptorBase" value="InterceptorBase" id="11382" addr="0x7f99f1de6c90" />
-                                                <attribute name="Dialog" value="Dialog" id="11383" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="11384" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="11385" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlTextBox" value="ControlTextBox" id="11386" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="11387" addr="0x7f99f1de6c90" />
-                                                <attribute name="Window" value="Window" id="11388" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="11389" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlList" value="ControlList" id="11390" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="11391" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlImage" value="ControlImage" id="11392" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlButton" value="ControlButton" id="11393" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlGroup" value="ControlGroup" id="11394" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogBusy" value="DialogBusy" id="11395" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="11396" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSpin" value="ControlSpin" id="11397" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlEdit" value="ControlEdit" id="11398" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="11399" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="11400" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlLabel" value="ControlLabel" id="11401" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlProgress" value="ControlProgress" id="11402" addr="0x7f99f1de6c90" />
-                                                <attribute name="Control" value="Control" id="11403" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSlider" value="ControlSlider" id="11404" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgress" value="DialogProgress" id="11405" addr="0x7f99f1de6c90" />
-                                                <attribute name="Action" value="Action" id="11406" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowDialog" value="WindowDialog" id="11407" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXML" value="WindowXML" id="11408" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItem" value="ListItem" id="11409" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="11410" addr="0x7f99f1de6c90" />
+                                <typescopesitem id="11377" addr="0x7fca46920150" >
+                                    <attributelist id="11378" addr="0x7fca46920150" >
+                                        <attribute name="name" value="xbmcgui" id="11379" addr="0x7fca46934c90" />
+                                        <typetab id="11380" addr="0x7fca46920170" >
+                                            <attributelist id="11381" addr="0x7fca46920170" >
+                                                <attribute name="InterceptorBase" value="InterceptorBase" id="11382" addr="0x7fca46934c90" />
+                                                <attribute name="Dialog" value="Dialog" id="11383" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="11384" addr="0x7fca46934c90" />
+                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="11385" addr="0x7fca46934c90" />
+                                                <attribute name="ControlTextBox" value="ControlTextBox" id="11386" addr="0x7fca46934c90" />
+                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="11387" addr="0x7fca46934c90" />
+                                                <attribute name="Window" value="Window" id="11388" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="11389" addr="0x7fca46934c90" />
+                                                <attribute name="ControlList" value="ControlList" id="11390" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="11391" addr="0x7fca46934c90" />
+                                                <attribute name="ControlImage" value="ControlImage" id="11392" addr="0x7fca46934c90" />
+                                                <attribute name="ControlButton" value="ControlButton" id="11393" addr="0x7fca46934c90" />
+                                                <attribute name="ControlGroup" value="ControlGroup" id="11394" addr="0x7fca46934c90" />
+                                                <attribute name="DialogBusy" value="DialogBusy" id="11395" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="11396" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSpin" value="ControlSpin" id="11397" addr="0x7fca46934c90" />
+                                                <attribute name="ControlEdit" value="ControlEdit" id="11398" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="11399" addr="0x7fca46934c90" />
+                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="11400" addr="0x7fca46934c90" />
+                                                <attribute name="ControlLabel" value="ControlLabel" id="11401" addr="0x7fca46934c90" />
+                                                <attribute name="ControlProgress" value="ControlProgress" id="11402" addr="0x7fca46934c90" />
+                                                <attribute name="Control" value="Control" id="11403" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSlider" value="ControlSlider" id="11404" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgress" value="DialogProgress" id="11405" addr="0x7fca46934c90" />
+                                                <attribute name="Action" value="Action" id="11406" addr="0x7fca46934c90" />
+                                                <attribute name="WindowDialog" value="WindowDialog" id="11407" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXML" value="WindowXML" id="11408" addr="0x7fca46934c90" />
+                                                <attribute name="ListItem" value="ListItem" id="11409" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="11410" addr="0x7fca46934c90" />
                                             </attributelist >
-                                            <typetabsitem id="11411" addr="0x7f99f1de1dd0" >
-                                                <attributelist id="11412" addr="0x7f99f1de1dd0" >
+                                            <typetabsitem id="11411" addr="0x7fca4692fdd0" >
+                                                <attributelist id="11412" addr="0x7fca4692fdd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="11413" addr="0x7f99f1dde790" >
-                                                <attributelist id="11414" addr="0x7f99f1dde790" >
+                                            <typetabsitem id="11413" addr="0x7fca4692c790" >
+                                                <attributelist id="11414" addr="0x7fca4692c790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="11415" addr="0x7f99f1de3f10" >
-                                                <attributelist id="11416" addr="0x7f99f1de3f10" >
+                                            <typetabsitem id="11415" addr="0x7fca46931f10" >
+                                                <attributelist id="11416" addr="0x7fca46931f10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="11417" addr="0x7f99f1dd67b0" >
-                                                <attributelist id="11418" addr="0x7f99f1dd67b0" >
+                                            <typetabsitem id="11417" addr="0x7fca469247b0" >
+                                                <attributelist id="11418" addr="0x7fca469247b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="11419" addr="0x7f99f1ddafd0" >
-                                                <attributelist id="11420" addr="0x7f99f1ddafd0" >
+                                            <typetabsitem id="11419" addr="0x7fca46928fd0" >
+                                                <attributelist id="11420" addr="0x7fca46928fd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="11421" addr="0x7f99f1ddd430" >
-                                                <attributelist id="11422" addr="0x7f99f1ddd430" >
+                                            <typetabsitem id="11421" addr="0x7fca4692b430" >
+                                                <attributelist id="11422" addr="0x7fca4692b430" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="11423" addr="0x7f99f1de2130" >
-                                                <attributelist id="11424" addr="0x7f99f1de2130" >
+                                            <typetabsitem id="11423" addr="0x7fca46930130" >
+                                                <attributelist id="11424" addr="0x7fca46930130" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="11425" addr="0x7f99f1dd2f50" >
-                                                <attributelist id="11426" addr="0x7f99f1dd2f50" >
+                                            <typetabsitem id="11425" addr="0x7fca46920f50" >
+                                                <attributelist id="11426" addr="0x7fca46920f50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="11427" addr="0x7f99f1dd9650" >
-                                                <attributelist id="11428" addr="0x7f99f1dd9650" >
+                                            <typetabsitem id="11427" addr="0x7fca46927650" >
+                                                <attributelist id="11428" addr="0x7fca46927650" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="11429" addr="0x7f99f1de3390" >
-                                                <attributelist id="11430" addr="0x7f99f1de3390" >
+                                            <typetabsitem id="11429" addr="0x7fca46931390" >
+                                                <attributelist id="11430" addr="0x7fca46931390" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="11431" addr="0x7f99f1ddb7b0" >
-                                                <attributelist id="11432" addr="0x7f99f1ddb7b0" >
+                                            <typetabsitem id="11431" addr="0x7fca469297b0" >
+                                                <attributelist id="11432" addr="0x7fca469297b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="11433" addr="0x7f99f1ddc4b0" >
-                                                <attributelist id="11434" addr="0x7f99f1ddc4b0" >
+                                            <typetabsitem id="11433" addr="0x7fca4692a4b0" >
+                                                <attributelist id="11434" addr="0x7fca4692a4b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="11435" addr="0x7f99f1ddcf90" >
-                                                <attributelist id="11436" addr="0x7f99f1ddcf90" >
+                                            <typetabsitem id="11435" addr="0x7fca4692af90" >
+                                                <attributelist id="11436" addr="0x7fca4692af90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="11437" addr="0x7f99f1de11b0" >
-                                                <attributelist id="11438" addr="0x7f99f1de11b0" >
+                                            <typetabsitem id="11437" addr="0x7fca4692f1b0" >
+                                                <attributelist id="11438" addr="0x7fca4692f1b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="11439" addr="0x7f99f1de15b0" >
-                                                <attributelist id="11440" addr="0x7f99f1de15b0" >
+                                            <typetabsitem id="11439" addr="0x7fca4692f5b0" >
+                                                <attributelist id="11440" addr="0x7fca4692f5b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="11441" addr="0x7f99f1dd77f0" >
-                                                <attributelist id="11442" addr="0x7f99f1dd77f0" >
+                                            <typetabsitem id="11441" addr="0x7fca469257f0" >
+                                                <attributelist id="11442" addr="0x7fca469257f0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="11443" addr="0x7f99f1dd8b30" >
-                                                <attributelist id="11444" addr="0x7f99f1dd8b30" >
+                                            <typetabsitem id="11443" addr="0x7fca46926b30" >
+                                                <attributelist id="11444" addr="0x7fca46926b30" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="11445" addr="0x7f99f1dd2c50" >
-                                                <attributelist id="11446" addr="0x7f99f1dd2c50" >
+                                            <typetabsitem id="11445" addr="0x7fca46920c50" >
+                                                <attributelist id="11446" addr="0x7fca46920c50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="11447" addr="0x7f99f1dda790" >
-                                                <attributelist id="11448" addr="0x7f99f1dda790" >
+                                            <typetabsitem id="11447" addr="0x7fca46928790" >
+                                                <attributelist id="11448" addr="0x7fca46928790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="11449" addr="0x7f99f1dd8030" >
-                                                <attributelist id="11450" addr="0x7f99f1dd8030" >
+                                            <typetabsitem id="11449" addr="0x7fca46926030" >
+                                                <attributelist id="11450" addr="0x7fca46926030" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="11451" addr="0x7f99f1ddbe10" >
-                                                <attributelist id="11452" addr="0x7f99f1ddbe10" >
+                                            <typetabsitem id="11451" addr="0x7fca46929e10" >
+                                                <attributelist id="11452" addr="0x7fca46929e10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="11453" addr="0x7f99f1dd6b10" >
-                                                <attributelist id="11454" addr="0x7f99f1dd6b10" >
+                                            <typetabsitem id="11453" addr="0x7fca46924b10" >
+                                                <attributelist id="11454" addr="0x7fca46924b10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="11455" addr="0x7f99f1dddf90" >
-                                                <attributelist id="11456" addr="0x7f99f1dddf90" >
+                                            <typetabsitem id="11455" addr="0x7fca4692bf90" >
+                                                <attributelist id="11456" addr="0x7fca4692bf90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="11457" addr="0x7f99f1de0530" >
-                                                <attributelist id="11458" addr="0x7f99f1de0530" >
+                                            <typetabsitem id="11457" addr="0x7fca4692e530" >
+                                                <attributelist id="11458" addr="0x7fca4692e530" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="11459" addr="0x7f99f1de1e50" >
-                                                <attributelist id="11460" addr="0x7f99f1de1e50" >
+                                            <typetabsitem id="11459" addr="0x7fca4692fe50" >
+                                                <attributelist id="11460" addr="0x7fca4692fe50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="11461" addr="0x7f99f1de2d90" >
-                                                <attributelist id="11462" addr="0x7f99f1de2d90" >
+                                            <typetabsitem id="11461" addr="0x7fca46930d90" >
+                                                <attributelist id="11462" addr="0x7fca46930d90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="11463" addr="0x7f99f1de3410" >
-                                                <attributelist id="11464" addr="0x7f99f1de3410" >
+                                            <typetabsitem id="11463" addr="0x7fca46931410" >
+                                                <attributelist id="11464" addr="0x7fca46931410" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="11465" addr="0x7f99f1dd3590" >
-                                                <attributelist id="11466" addr="0x7f99f1dd3590" >
+                                            <typetabsitem id="11465" addr="0x7fca46921590" >
+                                                <attributelist id="11466" addr="0x7fca46921590" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="11467" addr="0x7f99f1dd3390" >
-                                                <attributelist id="11468" addr="0x7f99f1dd3390" >
+                                            <typetabsitem id="11467" addr="0x7fca46921390" >
+                                                <attributelist id="11468" addr="0x7fca46921390" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7f99f1dd1d70" id="11469" addr="0x7f99f1dd1d70" />
-                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="11470" addr="0x7f99f1de6c90" />
-                                        <attribute name="symtab" value="0x7f99f1e40fb0" id="11471" addr="0x7f99f1e40fb0" />
+                                        <attribute name="parent" value="0x7fca4691fd70" id="11469" addr="0x7fca4691fd70" />
+                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="11470" addr="0x7fca46934c90" />
+                                        <attribute name="symtab" value="0x7fca4698efb0" id="11471" addr="0x7fca4698efb0" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="11472" addr="0x7f99f1dde090" >
-                                    <attributelist id="11473" addr="0x7f99f1dde090" >
+                                <typescopesitem id="11472" addr="0x7fca4692c090" >
+                                    <attributelist id="11473" addr="0x7fca4692c090" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="11474" addr="0x7f99f1e92870" >
-                                    <attributelist id="11475" addr="0x7f99f1e92870" >
-                                        <attribute name="inherit" value="0x7f99f1e928d0" id="11476" addr="0x7f99f1e928d0" />
-                                        <attribute name="name" value="ControlSlider" id="11477" addr="0x7f99f1de6c90" />
-                                        <attribute name="csymtab" value="0x7f99f1e92890" id="11478" addr="0x7f99f1e92890" />
-                                        <attribute name="symtab" value="0x7f99f1e92850" id="11479" addr="0x7f99f1e92850" />
+                                <typescopesitem id="11474" addr="0x7fca469e0870" >
+                                    <attributelist id="11475" addr="0x7fca469e0870" >
+                                        <attribute name="inherit" value="0x7fca469e08d0" id="11476" addr="0x7fca469e08d0" />
+                                        <attribute name="name" value="ControlSlider" id="11477" addr="0x7fca46934c90" />
+                                        <attribute name="csymtab" value="0x7fca469e0890" id="11478" addr="0x7fca469e0890" />
+                                        <attribute name="symtab" value="0x7fca469e0850" id="11479" addr="0x7fca469e0850" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <access id="11480" addr="0x7f99f1e927f0" >
-                            <attributelist id="11481" addr="0x7f99f1e927f0" >
-                                <attribute name="kind" value="public" id="11482" addr="0x7f99f1de6c90" />
+                        <access id="11480" addr="0x7fca469e07f0" >
+                            <attributelist id="11481" addr="0x7fca469e07f0" >
+                                <attribute name="kind" value="public" id="11482" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="11483" addr="0x7f99f1e93490" >
-                            <attributelist id="11484" addr="0x7f99f1e93490" >
-                                <attribute name="name" value="ControlSlider" id="11485" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="11486" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e92870" id="11487" addr="0x7f99f1e92870" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e93970" id="11488" addr="0x7f99f1e93970" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e93970" id="11489" addr="0x7f99f1e93970" />
-                                <attribute name="sym_name" value="ControlSlider" id="11490" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,int)." id="11491" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="11492" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e93490" id="11493" addr="0x7f99f1e93490" />
-                                <parmlist id="11494" addr="0x7f99f1e92a30" >
+                        <constructor id="11483" addr="0x7fca469e1490" >
+                            <attributelist id="11484" addr="0x7fca469e1490" >
+                                <attribute name="name" value="ControlSlider" id="11485" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="11486" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e0870" id="11487" addr="0x7fca469e0870" />
+                                <attribute name="sym_nextSibling" value="0x7fca469e1970" id="11488" addr="0x7fca469e1970" />
+                                <attribute name="csym_nextSibling" value="0x7fca469e1970" id="11489" addr="0x7fca469e1970" />
+                                <attribute name="sym_name" value="ControlSlider" id="11490" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char,int)." id="11491" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="11492" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469e1490" id="11493" addr="0x7fca469e1490" />
+                                <parmlist id="11494" addr="0x7fca469e0a30" >
                                     <parm id="11495">
-                                        <attributelist id="11496" addr="0x7f99f1e92a30" >
-                                            <attribute name="name" value="x" id="11497" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="11498" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11496" addr="0x7fca469e0a30" >
+                                            <attribute name="name" value="x" id="11497" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="11498" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11499">
-                                        <attributelist id="11500" addr="0x7f99f1e92b50" >
-                                            <attribute name="name" value="y" id="11501" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="11502" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11500" addr="0x7fca469e0b50" >
+                                            <attribute name="name" value="y" id="11501" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="11502" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11503">
-                                        <attributelist id="11504" addr="0x7f99f1e92c70" >
-                                            <attribute name="name" value="width" id="11505" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="11506" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11504" addr="0x7fca469e0c70" >
+                                            <attribute name="name" value="width" id="11505" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="11506" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11507">
-                                        <attributelist id="11508" addr="0x7f99f1e92d90" >
-                                            <attribute name="name" value="height" id="11509" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="11510" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11508" addr="0x7fca469e0d90" >
+                                            <attribute name="name" value="height" id="11509" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="11510" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11511">
-                                        <attributelist id="11512" addr="0x7f99f1e92f30" >
-                                            <attribute name="name" value="textureback" id="11513" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="11514" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="11515" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11512" addr="0x7fca469e0f30" >
+                                            <attribute name="name" value="textureback" id="11513" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="11514" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="11515" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11516">
-                                        <attributelist id="11517" addr="0x7f99f1e930d0" >
-                                            <attribute name="name" value="texture" id="11518" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="11519" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="11520" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11517" addr="0x7fca469e10d0" >
+                                            <attribute name="name" value="texture" id="11518" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="11519" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="11520" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11521">
-                                        <attributelist id="11522" addr="0x7f99f1e93270" >
-                                            <attribute name="name" value="texturefocus" id="11523" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="11524" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="11525" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11522" addr="0x7fca469e1270" >
+                                            <attribute name="name" value="texturefocus" id="11523" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="11524" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="11525" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11526">
-                                        <attributelist id="11527" addr="0x7f99f1e933d0" >
-                                            <attribute name="name" value="orientation" id="11528" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="1" id="11529" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="11530" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11527" addr="0x7fca469e13d0" >
+                                            <attribute name="name" value="orientation" id="11528" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="1" id="11529" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="11530" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_0" id="11531" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="11532" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="11531" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="11532" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="11533" addr="0x7f99f1e93970" >
-                            <attributelist id="11534" addr="0x7f99f1e93970" >
-                                <attribute name="name" value="ControlSlider" id="11535" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="11536" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e92870" id="11537" addr="0x7f99f1e92870" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e93db0" id="11538" addr="0x7f99f1e93db0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e93490" id="11539" addr="0x7f99f1e93490" />
-                                <attribute name="sym_name" value="ControlSlider" id="11540" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e93db0" id="11541" addr="0x7f99f1e93db0" />
-                                <attribute name="defaultargs" value="0x7f99f1e93490" id="11542" addr="0x7f99f1e93490" />
-                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char)." id="11543" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="11544" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e93490" id="11545" addr="0x7f99f1e93490" />
-                                <parmlist id="11546" addr="0x7f99f1e93530" >
+                        <constructor id="11533" addr="0x7fca469e1970" >
+                            <attributelist id="11534" addr="0x7fca469e1970" >
+                                <attribute name="name" value="ControlSlider" id="11535" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="11536" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e0870" id="11537" addr="0x7fca469e0870" />
+                                <attribute name="csym_nextSibling" value="0x7fca469e1db0" id="11538" addr="0x7fca469e1db0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469e1490" id="11539" addr="0x7fca469e1490" />
+                                <attribute name="sym_name" value="ControlSlider" id="11540" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469e1db0" id="11541" addr="0x7fca469e1db0" />
+                                <attribute name="defaultargs" value="0x7fca469e1490" id="11542" addr="0x7fca469e1490" />
+                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char,p.q(const).char)." id="11543" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="11544" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469e1490" id="11545" addr="0x7fca469e1490" />
+                                <parmlist id="11546" addr="0x7fca469e1530" >
                                     <parm id="11547">
-                                        <attributelist id="11548" addr="0x7f99f1e93530" >
-                                            <attribute name="name" value="x" id="11549" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="11550" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11548" addr="0x7fca469e1530" >
+                                            <attribute name="name" value="x" id="11549" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="11550" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11551">
-                                        <attributelist id="11552" addr="0x7f99f1e935f0" >
-                                            <attribute name="name" value="y" id="11553" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="11554" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11552" addr="0x7fca469e15f0" >
+                                            <attribute name="name" value="y" id="11553" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="11554" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11555">
-                                        <attributelist id="11556" addr="0x7f99f1e93670" >
-                                            <attribute name="name" value="width" id="11557" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="11558" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11556" addr="0x7fca469e1670" >
+                                            <attribute name="name" value="width" id="11557" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="11558" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11559">
-                                        <attributelist id="11560" addr="0x7f99f1e936f0" >
-                                            <attribute name="name" value="height" id="11561" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="11562" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11560" addr="0x7fca469e16f0" >
+                                            <attribute name="name" value="height" id="11561" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="11562" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11563">
-                                        <attributelist id="11564" addr="0x7f99f1e93770" >
-                                            <attribute name="name" value="textureback" id="11565" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="11566" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="11567" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11564" addr="0x7fca469e1770" >
+                                            <attribute name="name" value="textureback" id="11565" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="11566" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="11567" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11568">
-                                        <attributelist id="11569" addr="0x7f99f1e93810" >
-                                            <attribute name="name" value="texture" id="11570" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="11571" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="11572" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11569" addr="0x7fca469e1810" >
+                                            <attribute name="name" value="texture" id="11570" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="11571" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="11572" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11573">
-                                        <attributelist id="11574" addr="0x7f99f1e938b0" >
-                                            <attribute name="name" value="texturefocus" id="11575" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="11576" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="11577" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11574" addr="0x7fca469e18b0" >
+                                            <attribute name="name" value="texturefocus" id="11575" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="11576" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="11577" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_1" id="11578" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="11579" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="11578" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="11579" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="11580" addr="0x7f99f1e93db0" >
-                            <attributelist id="11581" addr="0x7f99f1e93db0" >
-                                <attribute name="name" value="ControlSlider" id="11582" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="11583" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e92870" id="11584" addr="0x7f99f1e92870" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e94150" id="11585" addr="0x7f99f1e94150" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e93970" id="11586" addr="0x7f99f1e93970" />
-                                <attribute name="sym_name" value="ControlSlider" id="11587" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e94150" id="11588" addr="0x7f99f1e94150" />
-                                <attribute name="defaultargs" value="0x7f99f1e93490" id="11589" addr="0x7f99f1e93490" />
-                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char)." id="11590" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="11591" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e93490" id="11592" addr="0x7f99f1e93490" />
-                                <parmlist id="11593" addr="0x7f99f1e93a10" >
+                        <constructor id="11580" addr="0x7fca469e1db0" >
+                            <attributelist id="11581" addr="0x7fca469e1db0" >
+                                <attribute name="name" value="ControlSlider" id="11582" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="11583" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e0870" id="11584" addr="0x7fca469e0870" />
+                                <attribute name="csym_nextSibling" value="0x7fca469e2150" id="11585" addr="0x7fca469e2150" />
+                                <attribute name="sym_previousSibling" value="0x7fca469e1970" id="11586" addr="0x7fca469e1970" />
+                                <attribute name="sym_name" value="ControlSlider" id="11587" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469e2150" id="11588" addr="0x7fca469e2150" />
+                                <attribute name="defaultargs" value="0x7fca469e1490" id="11589" addr="0x7fca469e1490" />
+                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char,p.q(const).char)." id="11590" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="11591" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469e1490" id="11592" addr="0x7fca469e1490" />
+                                <parmlist id="11593" addr="0x7fca469e1a10" >
                                     <parm id="11594">
-                                        <attributelist id="11595" addr="0x7f99f1e93a10" >
-                                            <attribute name="name" value="x" id="11596" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="11597" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11595" addr="0x7fca469e1a10" >
+                                            <attribute name="name" value="x" id="11596" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="11597" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11598">
-                                        <attributelist id="11599" addr="0x7f99f1e93ad0" >
-                                            <attribute name="name" value="y" id="11600" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="11601" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11599" addr="0x7fca469e1ad0" >
+                                            <attribute name="name" value="y" id="11600" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="11601" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11602">
-                                        <attributelist id="11603" addr="0x7f99f1e93b50" >
-                                            <attribute name="name" value="width" id="11604" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="11605" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11603" addr="0x7fca469e1b50" >
+                                            <attribute name="name" value="width" id="11604" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="11605" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11606">
-                                        <attributelist id="11607" addr="0x7f99f1e93bd0" >
-                                            <attribute name="name" value="height" id="11608" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="11609" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11607" addr="0x7fca469e1bd0" >
+                                            <attribute name="name" value="height" id="11608" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="11609" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11610">
-                                        <attributelist id="11611" addr="0x7f99f1e93c50" >
-                                            <attribute name="name" value="textureback" id="11612" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="11613" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="11614" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11611" addr="0x7fca469e1c50" >
+                                            <attribute name="name" value="textureback" id="11612" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="11613" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="11614" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11615">
-                                        <attributelist id="11616" addr="0x7f99f1e93cf0" >
-                                            <attribute name="name" value="texture" id="11617" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="11618" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="11619" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11616" addr="0x7fca469e1cf0" >
+                                            <attribute name="name" value="texture" id="11617" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="11618" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="11619" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_2" id="11620" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="11621" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_2" id="11620" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="11621" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="11622" addr="0x7f99f1e94150" >
-                            <attributelist id="11623" addr="0x7f99f1e94150" >
-                                <attribute name="name" value="ControlSlider" id="11624" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="11625" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e92870" id="11626" addr="0x7f99f1e92870" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e94450" id="11627" addr="0x7f99f1e94450" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e93db0" id="11628" addr="0x7f99f1e93db0" />
-                                <attribute name="sym_name" value="ControlSlider" id="11629" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e94450" id="11630" addr="0x7f99f1e94450" />
-                                <attribute name="defaultargs" value="0x7f99f1e93490" id="11631" addr="0x7f99f1e93490" />
-                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char)." id="11632" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="11633" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e93490" id="11634" addr="0x7f99f1e93490" />
-                                <parmlist id="11635" addr="0x7f99f1e93e50" >
+                        <constructor id="11622" addr="0x7fca469e2150" >
+                            <attributelist id="11623" addr="0x7fca469e2150" >
+                                <attribute name="name" value="ControlSlider" id="11624" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="11625" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e0870" id="11626" addr="0x7fca469e0870" />
+                                <attribute name="csym_nextSibling" value="0x7fca469e2450" id="11627" addr="0x7fca469e2450" />
+                                <attribute name="sym_previousSibling" value="0x7fca469e1db0" id="11628" addr="0x7fca469e1db0" />
+                                <attribute name="sym_name" value="ControlSlider" id="11629" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469e2450" id="11630" addr="0x7fca469e2450" />
+                                <attribute name="defaultargs" value="0x7fca469e1490" id="11631" addr="0x7fca469e1490" />
+                                <attribute name="decl" value="f(long,long,long,long,p.q(const).char)." id="11632" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="11633" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469e1490" id="11634" addr="0x7fca469e1490" />
+                                <parmlist id="11635" addr="0x7fca469e1e50" >
                                     <parm id="11636">
-                                        <attributelist id="11637" addr="0x7f99f1e93e50" >
-                                            <attribute name="name" value="x" id="11638" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="11639" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11637" addr="0x7fca469e1e50" >
+                                            <attribute name="name" value="x" id="11638" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="11639" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11640">
-                                        <attributelist id="11641" addr="0x7f99f1e93f10" >
-                                            <attribute name="name" value="y" id="11642" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="11643" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11641" addr="0x7fca469e1f10" >
+                                            <attribute name="name" value="y" id="11642" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="11643" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11644">
-                                        <attributelist id="11645" addr="0x7f99f1e93f90" >
-                                            <attribute name="name" value="width" id="11646" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="11647" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11645" addr="0x7fca469e1f90" >
+                                            <attribute name="name" value="width" id="11646" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="11647" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11648">
-                                        <attributelist id="11649" addr="0x7f99f1e94010" >
-                                            <attribute name="name" value="height" id="11650" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="11651" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11649" addr="0x7fca469e2010" >
+                                            <attribute name="name" value="height" id="11650" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="11651" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11652">
-                                        <attributelist id="11653" addr="0x7f99f1e94090" >
-                                            <attribute name="name" value="textureback" id="11654" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="NULL" id="11655" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="11656" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11653" addr="0x7fca469e2090" >
+                                            <attribute name="name" value="textureback" id="11654" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="NULL" id="11655" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="11656" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_3" id="11657" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="11658" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_3" id="11657" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="11658" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="11659" addr="0x7f99f1e94450" >
-                            <attributelist id="11660" addr="0x7f99f1e94450" >
-                                <attribute name="name" value="ControlSlider" id="11661" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="11662" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e92870" id="11663" addr="0x7f99f1e92870" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e94150" id="11664" addr="0x7f99f1e94150" />
-                                <attribute name="sym_name" value="ControlSlider" id="11665" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e93490" id="11666" addr="0x7f99f1e93490" />
-                                <attribute name="decl" value="f(long,long,long,long)." id="11667" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="11668" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e93490" id="11669" addr="0x7f99f1e93490" />
-                                <parmlist id="11670" addr="0x7f99f1e941f0" >
+                        <constructor id="11659" addr="0x7fca469e2450" >
+                            <attributelist id="11660" addr="0x7fca469e2450" >
+                                <attribute name="name" value="ControlSlider" id="11661" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="11662" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e0870" id="11663" addr="0x7fca469e0870" />
+                                <attribute name="sym_previousSibling" value="0x7fca469e2150" id="11664" addr="0x7fca469e2150" />
+                                <attribute name="sym_name" value="ControlSlider" id="11665" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469e1490" id="11666" addr="0x7fca469e1490" />
+                                <attribute name="decl" value="f(long,long,long,long)." id="11667" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="11668" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469e1490" id="11669" addr="0x7fca469e1490" />
+                                <parmlist id="11670" addr="0x7fca469e21f0" >
                                     <parm id="11671">
-                                        <attributelist id="11672" addr="0x7f99f1e941f0" >
-                                            <attribute name="name" value="x" id="11673" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="11674" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11672" addr="0x7fca469e21f0" >
+                                            <attribute name="name" value="x" id="11673" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="11674" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11675">
-                                        <attributelist id="11676" addr="0x7f99f1e942b0" >
-                                            <attribute name="name" value="y" id="11677" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="11678" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11676" addr="0x7fca469e22b0" >
+                                            <attribute name="name" value="y" id="11677" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="11678" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11679">
-                                        <attributelist id="11680" addr="0x7f99f1e94330" >
-                                            <attribute name="name" value="width" id="11681" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="11682" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11680" addr="0x7fca469e2330" >
+                                            <attribute name="name" value="width" id="11681" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="11682" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11683">
-                                        <attributelist id="11684" addr="0x7f99f1e943b0" >
-                                            <attribute name="name" value="height" id="11685" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="11686" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11684" addr="0x7fca469e23b0" >
+                                            <attribute name="name" value="height" id="11685" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="11686" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_4" id="11687" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="11688" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_4" id="11687" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="11688" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <cdecl id="11689" addr="0x7f99f1e94610" >
-                            <attributelist id="11690" addr="0x7f99f1e94610" >
-                                <attribute name="name" value="getPercent" id="11691" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="11692" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e92870" id="11693" addr="0x7f99f1e92870" />
-                                <attribute name="kind" value="function" id="11694" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getPercent" id="11695" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="11696" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="11697" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="float" id="11698" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="11699" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="11700" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="11701" addr="0x7f99f1e94910" >
-                            <attributelist id="11702" addr="0x7f99f1e94910" >
-                                <attribute name="name" value="setPercent" id="11703" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="11704" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e92870" id="11705" addr="0x7f99f1e92870" />
-                                <attribute name="kind" value="function" id="11706" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setPercent" id="11707" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(float)." id="11708" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="11709" addr="0x7f99f1de6c90" />
-                                <parmlist id="11710" addr="0x7f99f1e94850" >
+                        <cdecl id="11689" addr="0x7fca469e2610" >
+                            <attributelist id="11690" addr="0x7fca469e2610" >
+                                <attribute name="name" value="getPercent" id="11691" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="11692" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e0870" id="11693" addr="0x7fca469e0870" />
+                                <attribute name="kind" value="function" id="11694" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getPercent" id="11695" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="11696" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="11697" addr="0x7fca46934c90" />
+                                <attribute name="type" value="float" id="11698" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="11699" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="11700" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="11701" addr="0x7fca469e2910" >
+                            <attributelist id="11702" addr="0x7fca469e2910" >
+                                <attribute name="name" value="setPercent" id="11703" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="11704" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e0870" id="11705" addr="0x7fca469e0870" />
+                                <attribute name="kind" value="function" id="11706" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setPercent" id="11707" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(float)." id="11708" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="11709" addr="0x7fca46934c90" />
+                                <parmlist id="11710" addr="0x7fca469e2850" >
                                     <parm id="11711">
-                                        <attributelist id="11712" addr="0x7f99f1e94850" >
-                                            <attribute name="name" value="pct" id="11713" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="float" id="11714" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11712" addr="0x7fca469e2850" >
+                                            <attribute name="name" value="pct" id="11713" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="float" id="11714" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="11715" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="11716" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="11717" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="11715" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="11716" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="11717" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="11718" addr="0x7f99f1e94b10" >
-                            <attributelist id="11719" addr="0x7f99f1e94b10" >
-                                <attribute name="name" value="getInt" id="11720" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="11721" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e92870" id="11722" addr="0x7f99f1e92870" />
-                                <attribute name="kind" value="function" id="11723" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getInt" id="11724" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="11725" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="11726" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="int" id="11727" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="11728" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="11729" addr="0x7f99f1de6c90" />
+                        <cdecl id="11718" addr="0x7fca469e2b10" >
+                            <attributelist id="11719" addr="0x7fca469e2b10" >
+                                <attribute name="name" value="getInt" id="11720" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="11721" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e0870" id="11722" addr="0x7fca469e0870" />
+                                <attribute name="kind" value="function" id="11723" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getInt" id="11724" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="11725" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="11726" addr="0x7fca46934c90" />
+                                <attribute name="type" value="int" id="11727" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="11728" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="11729" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="11730" addr="0x7f99f1e95170" >
-                            <attributelist id="11731" addr="0x7f99f1e95170" >
-                                <attribute name="name" value="setInt" id="11732" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="11733" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e92870" id="11734" addr="0x7f99f1e92870" />
-                                <attribute name="kind" value="function" id="11735" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setInt" id="11736" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(int,int,int,int)." id="11737" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="11738" addr="0x7f99f1de6c90" />
-                                <parmlist id="11739" addr="0x7f99f1e94d50" >
+                        <cdecl id="11730" addr="0x7fca469e3170" >
+                            <attributelist id="11731" addr="0x7fca469e3170" >
+                                <attribute name="name" value="setInt" id="11732" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="11733" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e0870" id="11734" addr="0x7fca469e0870" />
+                                <attribute name="kind" value="function" id="11735" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setInt" id="11736" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(int,int,int,int)." id="11737" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="11738" addr="0x7fca46934c90" />
+                                <parmlist id="11739" addr="0x7fca469e2d50" >
                                     <parm id="11740">
-                                        <attributelist id="11741" addr="0x7f99f1e94d50" >
-                                            <attribute name="name" value="value" id="11742" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="11743" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11741" addr="0x7fca469e2d50" >
+                                            <attribute name="name" value="value" id="11742" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="11743" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11744">
-                                        <attributelist id="11745" addr="0x7f99f1e94e70" >
-                                            <attribute name="name" value="min" id="11746" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="11747" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11745" addr="0x7fca469e2e70" >
+                                            <attribute name="name" value="min" id="11746" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="11747" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11748">
-                                        <attributelist id="11749" addr="0x7f99f1e94f90" >
-                                            <attribute name="name" value="delta" id="11750" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="11751" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11749" addr="0x7fca469e2f90" >
+                                            <attribute name="name" value="delta" id="11750" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="11751" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11752">
-                                        <attributelist id="11753" addr="0x7f99f1e950b0" >
-                                            <attribute name="name" value="max" id="11754" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="11755" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11753" addr="0x7fca469e30b0" >
+                                            <attribute name="name" value="max" id="11754" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="11755" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="11756" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="11757" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="11758" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="11756" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="11757" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="11758" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="11759" addr="0x7f99f1e95370" >
-                            <attributelist id="11760" addr="0x7f99f1e95370" >
-                                <attribute name="name" value="getFloat" id="11761" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="11762" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e92870" id="11763" addr="0x7f99f1e92870" />
-                                <attribute name="kind" value="function" id="11764" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getFloat" id="11765" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="11766" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="11767" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="float" id="11768" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="11769" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="11770" addr="0x7f99f1de6c90" />
+                        <cdecl id="11759" addr="0x7fca469e3370" >
+                            <attributelist id="11760" addr="0x7fca469e3370" >
+                                <attribute name="name" value="getFloat" id="11761" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="11762" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e0870" id="11763" addr="0x7fca469e0870" />
+                                <attribute name="kind" value="function" id="11764" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getFloat" id="11765" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="11766" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="11767" addr="0x7fca46934c90" />
+                                <attribute name="type" value="float" id="11768" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="11769" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="11770" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="11771" addr="0x7f99f1e959d0" >
-                            <attributelist id="11772" addr="0x7f99f1e959d0" >
-                                <attribute name="name" value="setFloat" id="11773" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="11774" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e92870" id="11775" addr="0x7f99f1e92870" />
-                                <attribute name="kind" value="function" id="11776" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setFloat" id="11777" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(float,float,float,float)." id="11778" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="11779" addr="0x7f99f1de6c90" />
-                                <parmlist id="11780" addr="0x7f99f1e955b0" >
+                        <cdecl id="11771" addr="0x7fca469e39d0" >
+                            <attributelist id="11772" addr="0x7fca469e39d0" >
+                                <attribute name="name" value="setFloat" id="11773" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="11774" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e0870" id="11775" addr="0x7fca469e0870" />
+                                <attribute name="kind" value="function" id="11776" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setFloat" id="11777" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(float,float,float,float)." id="11778" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="11779" addr="0x7fca46934c90" />
+                                <parmlist id="11780" addr="0x7fca469e35b0" >
                                     <parm id="11781">
-                                        <attributelist id="11782" addr="0x7f99f1e955b0" >
-                                            <attribute name="name" value="value" id="11783" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="float" id="11784" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11782" addr="0x7fca469e35b0" >
+                                            <attribute name="name" value="value" id="11783" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="float" id="11784" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11785">
-                                        <attributelist id="11786" addr="0x7f99f1e956d0" >
-                                            <attribute name="name" value="min" id="11787" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="float" id="11788" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11786" addr="0x7fca469e36d0" >
+                                            <attribute name="name" value="min" id="11787" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="float" id="11788" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11789">
-                                        <attributelist id="11790" addr="0x7f99f1e957f0" >
-                                            <attribute name="name" value="delta" id="11791" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="float" id="11792" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11790" addr="0x7fca469e37f0" >
+                                            <attribute name="name" value="delta" id="11791" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="float" id="11792" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="11793">
-                                        <attributelist id="11794" addr="0x7f99f1e95910" >
-                                            <attribute name="name" value="max" id="11795" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="float" id="11796" addr="0x7f99f1de6c90" />
+                                        <attributelist id="11794" addr="0x7fca469e3910" >
+                                            <attribute name="name" value="max" id="11795" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="float" id="11796" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="11797" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="11798" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="11799" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="11797" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="11798" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="11799" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
@@ -16764,4317 +16764,4317 @@
                 </namespace >
             </namespace >
         </include >
-        <include id="11800" addr="0x7f99f1e95c10" >
-            <attributelist id="11801" addr="0x7f99f1e95c10" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/Dialog.h" id="11802" addr="0x7f99f1de6c90" />
+        <include id="11800" addr="0x7fca469e3c10" >
+            <attributelist id="11801" addr="0x7fca469e3c10" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/Dialog.h" id="11802" addr="0x7fca46934c90" />
             </attributelist >
 
-            <constant id="11803" addr="0x7f99f1e95cd0" >
-                <attributelist id="11804" addr="0x7f99f1e95cd0" >
-                    <attribute name="sym_name" value="INPUT_ALPHANUM" id="11805" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="INPUT_ALPHANUM" id="11806" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="0" id="11807" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="11808" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="0" id="11809" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="11810" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="11811" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="11812" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="11813" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="11814" addr="0x7f99f1e95e30" >
-                <attributelist id="11815" addr="0x7f99f1e95e30" >
-                    <attribute name="sym_name" value="INPUT_NUMERIC" id="11816" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="INPUT_NUMERIC" id="11817" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="1" id="11818" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="11819" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="1" id="11820" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="11821" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="11822" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="11823" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="11824" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="11825" addr="0x7f99f1e95f90" >
-                <attributelist id="11826" addr="0x7f99f1e95f90" >
-                    <attribute name="sym_name" value="INPUT_DATE" id="11827" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="INPUT_DATE" id="11828" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="2" id="11829" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="11830" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="2" id="11831" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="11832" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="11833" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="11834" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="11835" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="11836" addr="0x7f99f1e960f0" >
-                <attributelist id="11837" addr="0x7f99f1e960f0" >
-                    <attribute name="sym_name" value="INPUT_TIME" id="11838" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="INPUT_TIME" id="11839" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="3" id="11840" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="11841" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="3" id="11842" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="11843" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="11844" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="11845" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="11846" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="11847" addr="0x7f99f1e96250" >
-                <attributelist id="11848" addr="0x7f99f1e96250" >
-                    <attribute name="sym_name" value="INPUT_IPADDRESS" id="11849" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="INPUT_IPADDRESS" id="11850" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="4" id="11851" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="11852" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="4" id="11853" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="11854" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="11855" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="11856" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="11857" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="11858" addr="0x7f99f1e963b0" >
-                <attributelist id="11859" addr="0x7f99f1e963b0" >
-                    <attribute name="sym_name" value="INPUT_PASSWORD" id="11860" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="INPUT_PASSWORD" id="11861" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="5" id="11862" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="11863" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="5" id="11864" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="11865" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="11866" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="11867" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="11868" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="11869" addr="0x7f99f1e96510" >
-                <attributelist id="11870" addr="0x7f99f1e96510" >
-                    <attribute name="sym_name" value="PASSWORD_VERIFY" id="11871" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="PASSWORD_VERIFY" id="11872" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="1" id="11873" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="11874" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="1" id="11875" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="11876" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="11877" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="11878" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="11879" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="11880" addr="0x7f99f1e96670" >
-                <attributelist id="11881" addr="0x7f99f1e96670" >
-                    <attribute name="sym_name" value="ALPHANUM_HIDE_INPUT" id="11882" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ALPHANUM_HIDE_INPUT" id="11883" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="2" id="11884" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="11885" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="2" id="11886" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="11887" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="11888" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="11889" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="11890" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <namespace id="11891" addr="0x7f99f1e967b0" >
-                <attributelist id="11892" addr="0x7f99f1e967b0" >
-                    <attribute name="sym_name" value="XBMCAddon" id="11893" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="XBMCAddon" id="11894" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_previousSibling" value="0x7f99f1e54770" id="11895" addr="0x7f99f1e54770" />
-                    <attribute name="csym_nextSibling" value="0x7f99f1dabd50" id="11896" addr="0x7f99f1dabd50" />
-                    <attribute name="sym_nextSibling" value="0x7f99f1dabd50" id="11897" addr="0x7f99f1dabd50" />
-                    <typescope id="11898" addr="0x7f99f1dd1d70" >
-                        <attributelist id="11899" addr="0x7f99f1dd1d70" >
-                            <attribute name="name" value="XBMCAddon" id="11900" addr="0x7f99f1de6c90" />
-                            <typetab id="11901" addr="0x7f99f1dd1db0" >
-                                <attributelist id="11902" addr="0x7f99f1dd1db0" >
-                                    <attribute name="Dictionary" value="Dictionary" id="11903" addr="0x7f99f1de6c90" />
-                                    <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="11904" addr="0x7f99f1de6c90" />
-                                    <attribute name="String" value="std::string" id="11905" addr="0x7f99f1de6c90" />
-                                    <attribute name="StringOrInt" value="XBMCAddon::String" id="11906" addr="0x7f99f1de6c90" />
+            <constant id="11803" addr="0x7fca469e3cd0" >
+                <attributelist id="11804" addr="0x7fca469e3cd0" >
+                    <attribute name="sym_name" value="INPUT_ALPHANUM" id="11805" addr="0x7fca46934c90" />
+                    <attribute name="name" value="INPUT_ALPHANUM" id="11806" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="0" id="11807" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="11808" addr="0x7fca46934c90" />
+                    <attribute name="value" value="0" id="11809" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="11810" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="11811" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="11812" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="11813" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="11814" addr="0x7fca469e3e30" >
+                <attributelist id="11815" addr="0x7fca469e3e30" >
+                    <attribute name="sym_name" value="INPUT_NUMERIC" id="11816" addr="0x7fca46934c90" />
+                    <attribute name="name" value="INPUT_NUMERIC" id="11817" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="1" id="11818" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="11819" addr="0x7fca46934c90" />
+                    <attribute name="value" value="1" id="11820" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="11821" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="11822" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="11823" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="11824" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="11825" addr="0x7fca469e3f90" >
+                <attributelist id="11826" addr="0x7fca469e3f90" >
+                    <attribute name="sym_name" value="INPUT_DATE" id="11827" addr="0x7fca46934c90" />
+                    <attribute name="name" value="INPUT_DATE" id="11828" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="2" id="11829" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="11830" addr="0x7fca46934c90" />
+                    <attribute name="value" value="2" id="11831" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="11832" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="11833" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="11834" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="11835" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="11836" addr="0x7fca469e40f0" >
+                <attributelist id="11837" addr="0x7fca469e40f0" >
+                    <attribute name="sym_name" value="INPUT_TIME" id="11838" addr="0x7fca46934c90" />
+                    <attribute name="name" value="INPUT_TIME" id="11839" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="3" id="11840" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="11841" addr="0x7fca46934c90" />
+                    <attribute name="value" value="3" id="11842" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="11843" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="11844" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="11845" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="11846" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="11847" addr="0x7fca469e4250" >
+                <attributelist id="11848" addr="0x7fca469e4250" >
+                    <attribute name="sym_name" value="INPUT_IPADDRESS" id="11849" addr="0x7fca46934c90" />
+                    <attribute name="name" value="INPUT_IPADDRESS" id="11850" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="4" id="11851" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="11852" addr="0x7fca46934c90" />
+                    <attribute name="value" value="4" id="11853" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="11854" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="11855" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="11856" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="11857" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="11858" addr="0x7fca469e43b0" >
+                <attributelist id="11859" addr="0x7fca469e43b0" >
+                    <attribute name="sym_name" value="INPUT_PASSWORD" id="11860" addr="0x7fca46934c90" />
+                    <attribute name="name" value="INPUT_PASSWORD" id="11861" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="5" id="11862" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="11863" addr="0x7fca46934c90" />
+                    <attribute name="value" value="5" id="11864" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="11865" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="11866" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="11867" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="11868" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="11869" addr="0x7fca469e4510" >
+                <attributelist id="11870" addr="0x7fca469e4510" >
+                    <attribute name="sym_name" value="PASSWORD_VERIFY" id="11871" addr="0x7fca46934c90" />
+                    <attribute name="name" value="PASSWORD_VERIFY" id="11872" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="1" id="11873" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="11874" addr="0x7fca46934c90" />
+                    <attribute name="value" value="1" id="11875" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="11876" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="11877" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="11878" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="11879" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="11880" addr="0x7fca469e4670" >
+                <attributelist id="11881" addr="0x7fca469e4670" >
+                    <attribute name="sym_name" value="ALPHANUM_HIDE_INPUT" id="11882" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ALPHANUM_HIDE_INPUT" id="11883" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="2" id="11884" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="11885" addr="0x7fca46934c90" />
+                    <attribute name="value" value="2" id="11886" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="11887" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="11888" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="11889" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="11890" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <namespace id="11891" addr="0x7fca469e47b0" >
+                <attributelist id="11892" addr="0x7fca469e47b0" >
+                    <attribute name="sym_name" value="XBMCAddon" id="11893" addr="0x7fca46934c90" />
+                    <attribute name="name" value="XBMCAddon" id="11894" addr="0x7fca46934c90" />
+                    <attribute name="sym_previousSibling" value="0x7fca469a2770" id="11895" addr="0x7fca469a2770" />
+                    <attribute name="csym_nextSibling" value="0x7fca468f9d50" id="11896" addr="0x7fca468f9d50" />
+                    <attribute name="sym_nextSibling" value="0x7fca468f9d50" id="11897" addr="0x7fca468f9d50" />
+                    <typescope id="11898" addr="0x7fca4691fd70" >
+                        <attributelist id="11899" addr="0x7fca4691fd70" >
+                            <attribute name="name" value="XBMCAddon" id="11900" addr="0x7fca46934c90" />
+                            <typetab id="11901" addr="0x7fca4691fdb0" >
+                                <attributelist id="11902" addr="0x7fca4691fdb0" >
+                                    <attribute name="Dictionary" value="Dictionary" id="11903" addr="0x7fca46934c90" />
+                                    <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="11904" addr="0x7fca46934c90" />
+                                    <attribute name="String" value="std::string" id="11905" addr="0x7fca46934c90" />
+                                    <attribute name="StringOrInt" value="XBMCAddon::String" id="11906" addr="0x7fca46934c90" />
                                 </attributelist >
-                                <typetabsitem id="11907" addr="0x7f99f1dd28b0" >
-                                    <attributelist id="11908" addr="0x7f99f1dd28b0" >
+                                <typetabsitem id="11907" addr="0x7fca469208b0" >
+                                    <attributelist id="11908" addr="0x7fca469208b0" >
                                     </attributelist >
                                 </typetabsitem >
-                                <typetabsitem id="11909" addr="0x7f99f1dd2910" >
-                                    <attributelist id="11910" addr="0x7f99f1dd2910" >
+                                <typetabsitem id="11909" addr="0x7fca46920910" >
+                                    <attributelist id="11910" addr="0x7fca46920910" >
                                     </attributelist >
                                 </typetabsitem >
-                                <typetabsitem id="11911" addr="0x7f99f1dd1f90" >
-                                    <attributelist id="11912" addr="0x7f99f1dd1f90" >
+                                <typetabsitem id="11911" addr="0x7fca4691ff90" >
+                                    <attributelist id="11912" addr="0x7fca4691ff90" >
                                     </attributelist >
                                 </typetabsitem >
-                                <typetabsitem id="11913" addr="0x7f99f1dd2710" >
-                                    <attributelist id="11914" addr="0x7f99f1dd2710" >
+                                <typetabsitem id="11913" addr="0x7fca46920710" >
+                                    <attributelist id="11914" addr="0x7fca46920710" >
                                     </attributelist >
                                 </typetabsitem >
                             </typetab >
-                            <attribute name="parent" value="0x7f99f1e1da30" id="11915" addr="0x7f99f1e1da30" />
-                            <attribute name="qname" value="XBMCAddon" id="11916" addr="0x7f99f1de6c90" />
-                            <attribute name="symtab" value="0x7f99f1e408b0" id="11917" addr="0x7f99f1e408b0" />
+                            <attribute name="parent" value="0x7fca4696ba30" id="11915" addr="0x7fca4696ba30" />
+                            <attribute name="qname" value="XBMCAddon" id="11916" addr="0x7fca46934c90" />
+                            <attribute name="symtab" value="0x7fca4698e8b0" id="11917" addr="0x7fca4698e8b0" />
                         </attributelist >
-                        <typescopesitem id="11918" addr="0x7f99f1e40870" >
-                            <attributelist id="11919" addr="0x7f99f1e40870" >
+                        <typescopesitem id="11918" addr="0x7fca4698e870" >
+                            <attributelist id="11919" addr="0x7fca4698e870" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="11920" addr="0x7f99f1dd1db0" >
-                            <attributelist id="11921" addr="0x7f99f1dd1db0" >
-                                <attribute name="Dictionary" value="Dictionary" id="11922" addr="0x7f99f1de6c90" />
-                                <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="11923" addr="0x7f99f1de6c90" />
-                                <attribute name="String" value="std::string" id="11924" addr="0x7f99f1de6c90" />
-                                <attribute name="StringOrInt" value="XBMCAddon::String" id="11925" addr="0x7f99f1de6c90" />
+                        <typescopesitem id="11920" addr="0x7fca4691fdb0" >
+                            <attributelist id="11921" addr="0x7fca4691fdb0" >
+                                <attribute name="Dictionary" value="Dictionary" id="11922" addr="0x7fca46934c90" />
+                                <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="11923" addr="0x7fca46934c90" />
+                                <attribute name="String" value="std::string" id="11924" addr="0x7fca46934c90" />
+                                <attribute name="StringOrInt" value="XBMCAddon::String" id="11925" addr="0x7fca46934c90" />
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="11926" addr="0x7f99f1e1da30" >
-                            <attributelist id="11927" addr="0x7f99f1e1da30" >
-                                <attribute name="name" value="" id="11928" addr="0x7f99f1de6c90" />
-                                <typetab id="11929" addr="0x7f99f1e1da90" >
-                                    <attributelist id="11930" addr="0x7f99f1e1da90" >
+                        <typescopesitem id="11926" addr="0x7fca4696ba30" >
+                            <attributelist id="11927" addr="0x7fca4696ba30" >
+                                <attribute name="name" value="" id="11928" addr="0x7fca46934c90" />
+                                <typetab id="11929" addr="0x7fca4696ba90" >
+                                    <attributelist id="11930" addr="0x7fca4696ba90" >
                                     </attributelist >
                                 </typetab >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="11931" addr="0x7f99f1dd1eb0" >
-                            <attributelist id="11932" addr="0x7f99f1dd1eb0" >
+                        <typescopesitem id="11931" addr="0x7fca4691feb0" >
+                            <attributelist id="11932" addr="0x7fca4691feb0" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="11933" addr="0x7f99f1e408b0" >
-                            <attributelist id="11934" addr="0x7f99f1e408b0" >
-                                <attribute name="name" value="XBMCAddon" id="11935" addr="0x7f99f1de6c90" />
-                                <attribute name="csymtab" value="0x7f99f1e408f0" id="11936" addr="0x7f99f1e408f0" />
-                                <attribute name="symtab" value="0x7f99f1e40890" id="11937" addr="0x7f99f1e40890" />
+                        <typescopesitem id="11933" addr="0x7fca4698e8b0" >
+                            <attributelist id="11934" addr="0x7fca4698e8b0" >
+                                <attribute name="name" value="XBMCAddon" id="11935" addr="0x7fca46934c90" />
+                                <attribute name="csymtab" value="0x7fca4698e8f0" id="11936" addr="0x7fca4698e8f0" />
+                                <attribute name="symtab" value="0x7fca4698e890" id="11937" addr="0x7fca4698e890" />
                             </attributelist >
                         </typescopesitem >
                     </typescope >
-                    <attribute name="symtab" value="0x7f99f1e408b0" id="11938" addr="0x7f99f1e408b0" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="11939" addr="0x7f99f1e1d950" />
+                    <attribute name="symtab" value="0x7fca4698e8b0" id="11938" addr="0x7fca4698e8b0" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="11939" addr="0x7fca4696b950" />
                 </attributelist >
 
-                <namespace id="11940" addr="0x7f99f1e96830" >
-                    <attributelist id="11941" addr="0x7f99f1e96830" >
-                        <attribute name="feature_knownbasetypes" value="AddonClass,AddonCallback" id="11942" addr="0x7f99f1de6c90" />
-                        <attribute name="name" value="xbmcgui" id="11943" addr="0x7f99f1de6c90" />
-                        <attribute name="sym_symtab" value="0x7f99f1e408b0" id="11944" addr="0x7f99f1e408b0" />
-                        <attribute name="symtab" value="0x7f99f1e40fb0" id="11945" addr="0x7f99f1e40fb0" />
-                        <attribute name="sym_nextSibling" value="0x7f99f1dabdd0" id="11946" addr="0x7f99f1dabdd0" />
-                        <attribute name="csym_nextSibling" value="0x7f99f1dabdd0" id="11947" addr="0x7f99f1dabdd0" />
-                        <attribute name="sym_previousSibling" value="0x7f99f1e547f0" id="11948" addr="0x7f99f1e547f0" />
-                        <attribute name="feature_knownapitypes" value="XBMCAddon::xbmc::InfoTagVideo,xbmc::InfoTagMusic" id="11949" addr="0x7f99f1de6c90" />
-                        <attribute name="sym_name" value="xbmcgui" id="11950" addr="0x7f99f1de6c90" />
-                        <typescope id="11951" addr="0x7f99f1dd2150" >
-                            <attributelist id="11952" addr="0x7f99f1dd2150" >
-                                <attribute name="name" value="xbmcgui" id="11953" addr="0x7f99f1de6c90" />
-                                <typetab id="11954" addr="0x7f99f1dd2170" >
-                                    <attributelist id="11955" addr="0x7f99f1dd2170" >
-                                        <attribute name="InterceptorBase" value="InterceptorBase" id="11956" addr="0x7f99f1de6c90" />
-                                        <attribute name="Dialog" value="Dialog" id="11957" addr="0x7f99f1de6c90" />
-                                        <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="11958" addr="0x7f99f1de6c90" />
-                                        <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="11959" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlTextBox" value="ControlTextBox" id="11960" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlRadioButton" value="ControlRadioButton" id="11961" addr="0x7f99f1de6c90" />
-                                        <attribute name="Window" value="Window" id="11962" addr="0x7f99f1de6c90" />
-                                        <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="11963" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlList" value="ControlList" id="11964" addr="0x7f99f1de6c90" />
-                                        <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="11965" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlImage" value="ControlImage" id="11966" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlButton" value="ControlButton" id="11967" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlGroup" value="ControlGroup" id="11968" addr="0x7f99f1de6c90" />
-                                        <attribute name="DialogBusy" value="DialogBusy" id="11969" addr="0x7f99f1de6c90" />
-                                        <attribute name="DialogProgressBG" value="DialogProgressBG" id="11970" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlSpin" value="ControlSpin" id="11971" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlEdit" value="ControlEdit" id="11972" addr="0x7f99f1de6c90" />
-                                        <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="11973" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="11974" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlLabel" value="ControlLabel" id="11975" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlProgress" value="ControlProgress" id="11976" addr="0x7f99f1de6c90" />
-                                        <attribute name="Control" value="Control" id="11977" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlSlider" value="ControlSlider" id="11978" addr="0x7f99f1de6c90" />
-                                        <attribute name="DialogProgress" value="DialogProgress" id="11979" addr="0x7f99f1de6c90" />
-                                        <attribute name="Action" value="Action" id="11980" addr="0x7f99f1de6c90" />
-                                        <attribute name="WindowDialog" value="WindowDialog" id="11981" addr="0x7f99f1de6c90" />
-                                        <attribute name="WindowXML" value="WindowXML" id="11982" addr="0x7f99f1de6c90" />
-                                        <attribute name="ListItem" value="ListItem" id="11983" addr="0x7f99f1de6c90" />
-                                        <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="11984" addr="0x7f99f1de6c90" />
+                <namespace id="11940" addr="0x7fca469e4830" >
+                    <attributelist id="11941" addr="0x7fca469e4830" >
+                        <attribute name="feature_knownbasetypes" value="AddonClass,AddonCallback" id="11942" addr="0x7fca46934c90" />
+                        <attribute name="name" value="xbmcgui" id="11943" addr="0x7fca46934c90" />
+                        <attribute name="sym_symtab" value="0x7fca4698e8b0" id="11944" addr="0x7fca4698e8b0" />
+                        <attribute name="symtab" value="0x7fca4698efb0" id="11945" addr="0x7fca4698efb0" />
+                        <attribute name="sym_nextSibling" value="0x7fca468f9dd0" id="11946" addr="0x7fca468f9dd0" />
+                        <attribute name="csym_nextSibling" value="0x7fca468f9dd0" id="11947" addr="0x7fca468f9dd0" />
+                        <attribute name="sym_previousSibling" value="0x7fca469a27f0" id="11948" addr="0x7fca469a27f0" />
+                        <attribute name="feature_knownapitypes" value="XBMCAddon::xbmc::InfoTagVideo,xbmc::InfoTagMusic" id="11949" addr="0x7fca46934c90" />
+                        <attribute name="sym_name" value="xbmcgui" id="11950" addr="0x7fca46934c90" />
+                        <typescope id="11951" addr="0x7fca46920150" >
+                            <attributelist id="11952" addr="0x7fca46920150" >
+                                <attribute name="name" value="xbmcgui" id="11953" addr="0x7fca46934c90" />
+                                <typetab id="11954" addr="0x7fca46920170" >
+                                    <attributelist id="11955" addr="0x7fca46920170" >
+                                        <attribute name="InterceptorBase" value="InterceptorBase" id="11956" addr="0x7fca46934c90" />
+                                        <attribute name="Dialog" value="Dialog" id="11957" addr="0x7fca46934c90" />
+                                        <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="11958" addr="0x7fca46934c90" />
+                                        <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="11959" addr="0x7fca46934c90" />
+                                        <attribute name="ControlTextBox" value="ControlTextBox" id="11960" addr="0x7fca46934c90" />
+                                        <attribute name="ControlRadioButton" value="ControlRadioButton" id="11961" addr="0x7fca46934c90" />
+                                        <attribute name="Window" value="Window" id="11962" addr="0x7fca46934c90" />
+                                        <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="11963" addr="0x7fca46934c90" />
+                                        <attribute name="ControlList" value="ControlList" id="11964" addr="0x7fca46934c90" />
+                                        <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="11965" addr="0x7fca46934c90" />
+                                        <attribute name="ControlImage" value="ControlImage" id="11966" addr="0x7fca46934c90" />
+                                        <attribute name="ControlButton" value="ControlButton" id="11967" addr="0x7fca46934c90" />
+                                        <attribute name="ControlGroup" value="ControlGroup" id="11968" addr="0x7fca46934c90" />
+                                        <attribute name="DialogBusy" value="DialogBusy" id="11969" addr="0x7fca46934c90" />
+                                        <attribute name="DialogProgressBG" value="DialogProgressBG" id="11970" addr="0x7fca46934c90" />
+                                        <attribute name="ControlSpin" value="ControlSpin" id="11971" addr="0x7fca46934c90" />
+                                        <attribute name="ControlEdit" value="ControlEdit" id="11972" addr="0x7fca46934c90" />
+                                        <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="11973" addr="0x7fca46934c90" />
+                                        <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="11974" addr="0x7fca46934c90" />
+                                        <attribute name="ControlLabel" value="ControlLabel" id="11975" addr="0x7fca46934c90" />
+                                        <attribute name="ControlProgress" value="ControlProgress" id="11976" addr="0x7fca46934c90" />
+                                        <attribute name="Control" value="Control" id="11977" addr="0x7fca46934c90" />
+                                        <attribute name="ControlSlider" value="ControlSlider" id="11978" addr="0x7fca46934c90" />
+                                        <attribute name="DialogProgress" value="DialogProgress" id="11979" addr="0x7fca46934c90" />
+                                        <attribute name="Action" value="Action" id="11980" addr="0x7fca46934c90" />
+                                        <attribute name="WindowDialog" value="WindowDialog" id="11981" addr="0x7fca46934c90" />
+                                        <attribute name="WindowXML" value="WindowXML" id="11982" addr="0x7fca46934c90" />
+                                        <attribute name="ListItem" value="ListItem" id="11983" addr="0x7fca46934c90" />
+                                        <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="11984" addr="0x7fca46934c90" />
                                     </attributelist >
-                                    <typetabsitem id="11985" addr="0x7f99f1de1dd0" >
-                                        <attributelist id="11986" addr="0x7f99f1de1dd0" >
+                                    <typetabsitem id="11985" addr="0x7fca4692fdd0" >
+                                        <attributelist id="11986" addr="0x7fca4692fdd0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="11987" addr="0x7f99f1dde790" >
-                                        <attributelist id="11988" addr="0x7f99f1dde790" >
+                                    <typetabsitem id="11987" addr="0x7fca4692c790" >
+                                        <attributelist id="11988" addr="0x7fca4692c790" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="11989" addr="0x7f99f1de3f10" >
-                                        <attributelist id="11990" addr="0x7f99f1de3f10" >
+                                    <typetabsitem id="11989" addr="0x7fca46931f10" >
+                                        <attributelist id="11990" addr="0x7fca46931f10" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="11991" addr="0x7f99f1dd67b0" >
-                                        <attributelist id="11992" addr="0x7f99f1dd67b0" >
+                                    <typetabsitem id="11991" addr="0x7fca469247b0" >
+                                        <attributelist id="11992" addr="0x7fca469247b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="11993" addr="0x7f99f1ddafd0" >
-                                        <attributelist id="11994" addr="0x7f99f1ddafd0" >
+                                    <typetabsitem id="11993" addr="0x7fca46928fd0" >
+                                        <attributelist id="11994" addr="0x7fca46928fd0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="11995" addr="0x7f99f1ddd430" >
-                                        <attributelist id="11996" addr="0x7f99f1ddd430" >
+                                    <typetabsitem id="11995" addr="0x7fca4692b430" >
+                                        <attributelist id="11996" addr="0x7fca4692b430" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="11997" addr="0x7f99f1de2130" >
-                                        <attributelist id="11998" addr="0x7f99f1de2130" >
+                                    <typetabsitem id="11997" addr="0x7fca46930130" >
+                                        <attributelist id="11998" addr="0x7fca46930130" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="11999" addr="0x7f99f1dd2f50" >
-                                        <attributelist id="12000" addr="0x7f99f1dd2f50" >
+                                    <typetabsitem id="11999" addr="0x7fca46920f50" >
+                                        <attributelist id="12000" addr="0x7fca46920f50" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="12001" addr="0x7f99f1dd9650" >
-                                        <attributelist id="12002" addr="0x7f99f1dd9650" >
+                                    <typetabsitem id="12001" addr="0x7fca46927650" >
+                                        <attributelist id="12002" addr="0x7fca46927650" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="12003" addr="0x7f99f1de3390" >
-                                        <attributelist id="12004" addr="0x7f99f1de3390" >
+                                    <typetabsitem id="12003" addr="0x7fca46931390" >
+                                        <attributelist id="12004" addr="0x7fca46931390" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="12005" addr="0x7f99f1ddb7b0" >
-                                        <attributelist id="12006" addr="0x7f99f1ddb7b0" >
+                                    <typetabsitem id="12005" addr="0x7fca469297b0" >
+                                        <attributelist id="12006" addr="0x7fca469297b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="12007" addr="0x7f99f1ddc4b0" >
-                                        <attributelist id="12008" addr="0x7f99f1ddc4b0" >
+                                    <typetabsitem id="12007" addr="0x7fca4692a4b0" >
+                                        <attributelist id="12008" addr="0x7fca4692a4b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="12009" addr="0x7f99f1ddcf90" >
-                                        <attributelist id="12010" addr="0x7f99f1ddcf90" >
+                                    <typetabsitem id="12009" addr="0x7fca4692af90" >
+                                        <attributelist id="12010" addr="0x7fca4692af90" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="12011" addr="0x7f99f1de11b0" >
-                                        <attributelist id="12012" addr="0x7f99f1de11b0" >
+                                    <typetabsitem id="12011" addr="0x7fca4692f1b0" >
+                                        <attributelist id="12012" addr="0x7fca4692f1b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="12013" addr="0x7f99f1de15b0" >
-                                        <attributelist id="12014" addr="0x7f99f1de15b0" >
+                                    <typetabsitem id="12013" addr="0x7fca4692f5b0" >
+                                        <attributelist id="12014" addr="0x7fca4692f5b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="12015" addr="0x7f99f1dd77f0" >
-                                        <attributelist id="12016" addr="0x7f99f1dd77f0" >
+                                    <typetabsitem id="12015" addr="0x7fca469257f0" >
+                                        <attributelist id="12016" addr="0x7fca469257f0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="12017" addr="0x7f99f1dd8b30" >
-                                        <attributelist id="12018" addr="0x7f99f1dd8b30" >
+                                    <typetabsitem id="12017" addr="0x7fca46926b30" >
+                                        <attributelist id="12018" addr="0x7fca46926b30" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="12019" addr="0x7f99f1dd2c50" >
-                                        <attributelist id="12020" addr="0x7f99f1dd2c50" >
+                                    <typetabsitem id="12019" addr="0x7fca46920c50" >
+                                        <attributelist id="12020" addr="0x7fca46920c50" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="12021" addr="0x7f99f1dda790" >
-                                        <attributelist id="12022" addr="0x7f99f1dda790" >
+                                    <typetabsitem id="12021" addr="0x7fca46928790" >
+                                        <attributelist id="12022" addr="0x7fca46928790" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="12023" addr="0x7f99f1dd8030" >
-                                        <attributelist id="12024" addr="0x7f99f1dd8030" >
+                                    <typetabsitem id="12023" addr="0x7fca46926030" >
+                                        <attributelist id="12024" addr="0x7fca46926030" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="12025" addr="0x7f99f1ddbe10" >
-                                        <attributelist id="12026" addr="0x7f99f1ddbe10" >
+                                    <typetabsitem id="12025" addr="0x7fca46929e10" >
+                                        <attributelist id="12026" addr="0x7fca46929e10" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="12027" addr="0x7f99f1dd6b10" >
-                                        <attributelist id="12028" addr="0x7f99f1dd6b10" >
+                                    <typetabsitem id="12027" addr="0x7fca46924b10" >
+                                        <attributelist id="12028" addr="0x7fca46924b10" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="12029" addr="0x7f99f1dddf90" >
-                                        <attributelist id="12030" addr="0x7f99f1dddf90" >
+                                    <typetabsitem id="12029" addr="0x7fca4692bf90" >
+                                        <attributelist id="12030" addr="0x7fca4692bf90" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="12031" addr="0x7f99f1de0530" >
-                                        <attributelist id="12032" addr="0x7f99f1de0530" >
+                                    <typetabsitem id="12031" addr="0x7fca4692e530" >
+                                        <attributelist id="12032" addr="0x7fca4692e530" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="12033" addr="0x7f99f1de1e50" >
-                                        <attributelist id="12034" addr="0x7f99f1de1e50" >
+                                    <typetabsitem id="12033" addr="0x7fca4692fe50" >
+                                        <attributelist id="12034" addr="0x7fca4692fe50" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="12035" addr="0x7f99f1de2d90" >
-                                        <attributelist id="12036" addr="0x7f99f1de2d90" >
+                                    <typetabsitem id="12035" addr="0x7fca46930d90" >
+                                        <attributelist id="12036" addr="0x7fca46930d90" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="12037" addr="0x7f99f1de3410" >
-                                        <attributelist id="12038" addr="0x7f99f1de3410" >
+                                    <typetabsitem id="12037" addr="0x7fca46931410" >
+                                        <attributelist id="12038" addr="0x7fca46931410" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="12039" addr="0x7f99f1dd3590" >
-                                        <attributelist id="12040" addr="0x7f99f1dd3590" >
+                                    <typetabsitem id="12039" addr="0x7fca46921590" >
+                                        <attributelist id="12040" addr="0x7fca46921590" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="12041" addr="0x7f99f1dd3390" >
-                                        <attributelist id="12042" addr="0x7f99f1dd3390" >
+                                    <typetabsitem id="12041" addr="0x7fca46921390" >
+                                        <attributelist id="12042" addr="0x7fca46921390" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
-                                <attribute name="parent" value="0x7f99f1dd1d70" id="12043" addr="0x7f99f1dd1d70" />
-                                <attribute name="qname" value="XBMCAddon::xbmcgui" id="12044" addr="0x7f99f1de6c90" />
-                                <attribute name="symtab" value="0x7f99f1e40fb0" id="12045" addr="0x7f99f1e40fb0" />
+                                <attribute name="parent" value="0x7fca4691fd70" id="12043" addr="0x7fca4691fd70" />
+                                <attribute name="qname" value="XBMCAddon::xbmcgui" id="12044" addr="0x7fca46934c90" />
+                                <attribute name="symtab" value="0x7fca4698efb0" id="12045" addr="0x7fca4698efb0" />
                             </attributelist >
-                            <typescopesitem id="12046" addr="0x7f99f1e40f70" >
-                                <attributelist id="12047" addr="0x7f99f1e40f70" >
+                            <typescopesitem id="12046" addr="0x7fca4698ef70" >
+                                <attributelist id="12047" addr="0x7fca4698ef70" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="12048" addr="0x7f99f1dd2170" >
-                                <attributelist id="12049" addr="0x7f99f1dd2170" >
-                                    <attribute name="InterceptorBase" value="InterceptorBase" id="12050" addr="0x7f99f1de6c90" />
-                                    <attribute name="Dialog" value="Dialog" id="12051" addr="0x7f99f1de6c90" />
-                                    <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="12052" addr="0x7f99f1de6c90" />
-                                    <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="12053" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlTextBox" value="ControlTextBox" id="12054" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlRadioButton" value="ControlRadioButton" id="12055" addr="0x7f99f1de6c90" />
-                                    <attribute name="Window" value="Window" id="12056" addr="0x7f99f1de6c90" />
-                                    <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="12057" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlList" value="ControlList" id="12058" addr="0x7f99f1de6c90" />
-                                    <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="12059" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlImage" value="ControlImage" id="12060" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlButton" value="ControlButton" id="12061" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlGroup" value="ControlGroup" id="12062" addr="0x7f99f1de6c90" />
-                                    <attribute name="DialogBusy" value="DialogBusy" id="12063" addr="0x7f99f1de6c90" />
-                                    <attribute name="DialogProgressBG" value="DialogProgressBG" id="12064" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlSpin" value="ControlSpin" id="12065" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlEdit" value="ControlEdit" id="12066" addr="0x7f99f1de6c90" />
-                                    <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="12067" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="12068" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlLabel" value="ControlLabel" id="12069" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlProgress" value="ControlProgress" id="12070" addr="0x7f99f1de6c90" />
-                                    <attribute name="Control" value="Control" id="12071" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlSlider" value="ControlSlider" id="12072" addr="0x7f99f1de6c90" />
-                                    <attribute name="DialogProgress" value="DialogProgress" id="12073" addr="0x7f99f1de6c90" />
-                                    <attribute name="Action" value="Action" id="12074" addr="0x7f99f1de6c90" />
-                                    <attribute name="WindowDialog" value="WindowDialog" id="12075" addr="0x7f99f1de6c90" />
-                                    <attribute name="WindowXML" value="WindowXML" id="12076" addr="0x7f99f1de6c90" />
-                                    <attribute name="ListItem" value="ListItem" id="12077" addr="0x7f99f1de6c90" />
-                                    <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="12078" addr="0x7f99f1de6c90" />
+                            <typescopesitem id="12048" addr="0x7fca46920170" >
+                                <attributelist id="12049" addr="0x7fca46920170" >
+                                    <attribute name="InterceptorBase" value="InterceptorBase" id="12050" addr="0x7fca46934c90" />
+                                    <attribute name="Dialog" value="Dialog" id="12051" addr="0x7fca46934c90" />
+                                    <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="12052" addr="0x7fca46934c90" />
+                                    <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="12053" addr="0x7fca46934c90" />
+                                    <attribute name="ControlTextBox" value="ControlTextBox" id="12054" addr="0x7fca46934c90" />
+                                    <attribute name="ControlRadioButton" value="ControlRadioButton" id="12055" addr="0x7fca46934c90" />
+                                    <attribute name="Window" value="Window" id="12056" addr="0x7fca46934c90" />
+                                    <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="12057" addr="0x7fca46934c90" />
+                                    <attribute name="ControlList" value="ControlList" id="12058" addr="0x7fca46934c90" />
+                                    <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="12059" addr="0x7fca46934c90" />
+                                    <attribute name="ControlImage" value="ControlImage" id="12060" addr="0x7fca46934c90" />
+                                    <attribute name="ControlButton" value="ControlButton" id="12061" addr="0x7fca46934c90" />
+                                    <attribute name="ControlGroup" value="ControlGroup" id="12062" addr="0x7fca46934c90" />
+                                    <attribute name="DialogBusy" value="DialogBusy" id="12063" addr="0x7fca46934c90" />
+                                    <attribute name="DialogProgressBG" value="DialogProgressBG" id="12064" addr="0x7fca46934c90" />
+                                    <attribute name="ControlSpin" value="ControlSpin" id="12065" addr="0x7fca46934c90" />
+                                    <attribute name="ControlEdit" value="ControlEdit" id="12066" addr="0x7fca46934c90" />
+                                    <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="12067" addr="0x7fca46934c90" />
+                                    <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="12068" addr="0x7fca46934c90" />
+                                    <attribute name="ControlLabel" value="ControlLabel" id="12069" addr="0x7fca46934c90" />
+                                    <attribute name="ControlProgress" value="ControlProgress" id="12070" addr="0x7fca46934c90" />
+                                    <attribute name="Control" value="Control" id="12071" addr="0x7fca46934c90" />
+                                    <attribute name="ControlSlider" value="ControlSlider" id="12072" addr="0x7fca46934c90" />
+                                    <attribute name="DialogProgress" value="DialogProgress" id="12073" addr="0x7fca46934c90" />
+                                    <attribute name="Action" value="Action" id="12074" addr="0x7fca46934c90" />
+                                    <attribute name="WindowDialog" value="WindowDialog" id="12075" addr="0x7fca46934c90" />
+                                    <attribute name="WindowXML" value="WindowXML" id="12076" addr="0x7fca46934c90" />
+                                    <attribute name="ListItem" value="ListItem" id="12077" addr="0x7fca46934c90" />
+                                    <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="12078" addr="0x7fca46934c90" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="12079" addr="0x7f99f1dd1d70" >
-                                <attributelist id="12080" addr="0x7f99f1dd1d70" >
-                                    <attribute name="name" value="XBMCAddon" id="12081" addr="0x7f99f1de6c90" />
-                                    <typetab id="12082" addr="0x7f99f1dd1db0" >
-                                        <attributelist id="12083" addr="0x7f99f1dd1db0" >
-                                            <attribute name="Dictionary" value="Dictionary" id="12084" addr="0x7f99f1de6c90" />
-                                            <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="12085" addr="0x7f99f1de6c90" />
-                                            <attribute name="String" value="std::string" id="12086" addr="0x7f99f1de6c90" />
-                                            <attribute name="StringOrInt" value="XBMCAddon::String" id="12087" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                        <typetabsitem id="12088" addr="0x7f99f1dd28b0" >
-                                            <attributelist id="12089" addr="0x7f99f1dd28b0" >
+                            <typescopesitem id="12079" addr="0x7fca4691fd70" >
+                                <attributelist id="12080" addr="0x7fca4691fd70" >
+                                    <attribute name="name" value="XBMCAddon" id="12081" addr="0x7fca46934c90" />
+                                    <typetab id="12082" addr="0x7fca4691fdb0" >
+                                        <attributelist id="12083" addr="0x7fca4691fdb0" >
+                                            <attribute name="Dictionary" value="Dictionary" id="12084" addr="0x7fca46934c90" />
+                                            <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="12085" addr="0x7fca46934c90" />
+                                            <attribute name="String" value="std::string" id="12086" addr="0x7fca46934c90" />
+                                            <attribute name="StringOrInt" value="XBMCAddon::String" id="12087" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                        <typetabsitem id="12088" addr="0x7fca469208b0" >
+                                            <attributelist id="12089" addr="0x7fca469208b0" >
                                             </attributelist >
                                         </typetabsitem >
-                                        <typetabsitem id="12090" addr="0x7f99f1dd2910" >
-                                            <attributelist id="12091" addr="0x7f99f1dd2910" >
+                                        <typetabsitem id="12090" addr="0x7fca46920910" >
+                                            <attributelist id="12091" addr="0x7fca46920910" >
                                             </attributelist >
                                         </typetabsitem >
-                                        <typetabsitem id="12092" addr="0x7f99f1dd1f90" >
-                                            <attributelist id="12093" addr="0x7f99f1dd1f90" >
+                                        <typetabsitem id="12092" addr="0x7fca4691ff90" >
+                                            <attributelist id="12093" addr="0x7fca4691ff90" >
                                             </attributelist >
                                         </typetabsitem >
-                                        <typetabsitem id="12094" addr="0x7f99f1dd2710" >
-                                            <attributelist id="12095" addr="0x7f99f1dd2710" >
+                                        <typetabsitem id="12094" addr="0x7fca46920710" >
+                                            <attributelist id="12095" addr="0x7fca46920710" >
                                             </attributelist >
                                         </typetabsitem >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f99f1e1da30" id="12096" addr="0x7f99f1e1da30" />
-                                    <attribute name="qname" value="XBMCAddon" id="12097" addr="0x7f99f1de6c90" />
-                                    <attribute name="symtab" value="0x7f99f1e408b0" id="12098" addr="0x7f99f1e408b0" />
+                                    <attribute name="parent" value="0x7fca4696ba30" id="12096" addr="0x7fca4696ba30" />
+                                    <attribute name="qname" value="XBMCAddon" id="12097" addr="0x7fca46934c90" />
+                                    <attribute name="symtab" value="0x7fca4698e8b0" id="12098" addr="0x7fca4698e8b0" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="12099" addr="0x7f99f1dd2190" >
-                                <attributelist id="12100" addr="0x7f99f1dd2190" >
+                            <typescopesitem id="12099" addr="0x7fca46920190" >
+                                <attributelist id="12100" addr="0x7fca46920190" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="12101" addr="0x7f99f1e40fb0" >
-                                <attributelist id="12102" addr="0x7f99f1e40fb0" >
-                                    <attribute name="name" value="xbmcgui" id="12103" addr="0x7f99f1de6c90" />
-                                    <attribute name="csymtab" value="0x7f99f1e40ff0" id="12104" addr="0x7f99f1e40ff0" />
-                                    <attribute name="symtab" value="0x7f99f1e40f90" id="12105" addr="0x7f99f1e40f90" />
+                            <typescopesitem id="12101" addr="0x7fca4698efb0" >
+                                <attributelist id="12102" addr="0x7fca4698efb0" >
+                                    <attribute name="name" value="xbmcgui" id="12103" addr="0x7fca46934c90" />
+                                    <attribute name="csymtab" value="0x7fca4698eff0" id="12104" addr="0x7fca4698eff0" />
+                                    <attribute name="symtab" value="0x7fca4698ef90" id="12105" addr="0x7fca4698ef90" />
                                 </attributelist >
                             </typescopesitem >
                         </typescope >
                     </attributelist >
 
-                    <class id="12106" addr="0x7f99f1e969b0" >
-                        <attributelist id="12107" addr="0x7f99f1e969b0" >
-                            <attribute name="name" value="XBMCAddon::xbmcgui::Dialog" id="12108" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="12109" addr="0x7f99f1e40fb0" />
-                            <attribute name="symtab" value="0x7f99f1e96af0" id="12110" addr="0x7f99f1e96af0" />
-                            <attribute name="allows_typedef" value="1" id="12111" addr="0x7f99f1de6c90" />
-                            <attribute name="typepass_visit" value="1" id="12112" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_visit" value="1" id="12113" addr="0x7f99f1de6c90" />
-                            <attribute name="kind" value="class" id="12114" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_name" value="Dialog" id="12115" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_default_constructor" value="1" id="12116" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_has_constructor" value="1" id="12117" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_public_constructor" value="1" id="12118" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_has_destructor" value="1" id="12119" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_default_destructor" value="1" id="12120" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_copy_constructor" value="1" id="12121" addr="0x7f99f1de6c90" />
-                            <attribute name="privatebaselist" value="0x7f99f1e96990" id="12122" addr="0x7f99f1e96990" />
-                            <attribute name="protectedbaselist" value="0x7f99f1e96970" id="12123" addr="0x7f99f1e96970" />
-                            <baselist id="12124" addr="0x7f99f1e96950" >
-                                <base name="AddonClass" id="12125" addr="0x7f99f1e968d0" />
+                    <class id="12106" addr="0x7fca469e49b0" >
+                        <attributelist id="12107" addr="0x7fca469e49b0" >
+                            <attribute name="name" value="XBMCAddon::xbmcgui::Dialog" id="12108" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="12109" addr="0x7fca4698efb0" />
+                            <attribute name="symtab" value="0x7fca469e4af0" id="12110" addr="0x7fca469e4af0" />
+                            <attribute name="allows_typedef" value="1" id="12111" addr="0x7fca46934c90" />
+                            <attribute name="typepass_visit" value="1" id="12112" addr="0x7fca46934c90" />
+                            <attribute name="allocate_visit" value="1" id="12113" addr="0x7fca46934c90" />
+                            <attribute name="kind" value="class" id="12114" addr="0x7fca46934c90" />
+                            <attribute name="sym_name" value="Dialog" id="12115" addr="0x7fca46934c90" />
+                            <attribute name="allocate_default_constructor" value="1" id="12116" addr="0x7fca46934c90" />
+                            <attribute name="allocate_has_constructor" value="1" id="12117" addr="0x7fca46934c90" />
+                            <attribute name="allocate_public_constructor" value="1" id="12118" addr="0x7fca46934c90" />
+                            <attribute name="allocate_has_destructor" value="1" id="12119" addr="0x7fca46934c90" />
+                            <attribute name="allocate_default_destructor" value="1" id="12120" addr="0x7fca46934c90" />
+                            <attribute name="allocate_copy_constructor" value="1" id="12121" addr="0x7fca46934c90" />
+                            <attribute name="privatebaselist" value="0x7fca469e4990" id="12122" addr="0x7fca469e4990" />
+                            <attribute name="protectedbaselist" value="0x7fca469e4970" id="12123" addr="0x7fca469e4970" />
+                            <baselist id="12124" addr="0x7fca469e4950" >
+                                <base name="AddonClass" id="12125" addr="0x7fca469e48d0" />
                             </baselist >
-                            <attribute name="module" value="xbmcgui" id="12126" addr="0x7f99f1e402f0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="12127" addr="0x7f99f1de6c90" />
-                            <typescope id="12128" addr="0x7f99f1dde850" >
-                                <attributelist id="12129" addr="0x7f99f1dde850" >
-                                    <attribute name="name" value="Dialog" id="12130" addr="0x7f99f1de6c90" />
-                                    <typetab id="12131" addr="0x7f99f1dde870" >
-                                        <attributelist id="12132" addr="0x7f99f1dde870" >
+                            <attribute name="module" value="xbmcgui" id="12126" addr="0x7fca4698e2f0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="12127" addr="0x7fca46934c90" />
+                            <typescope id="12128" addr="0x7fca4692c850" >
+                                <attributelist id="12129" addr="0x7fca4692c850" >
+                                    <attribute name="name" value="Dialog" id="12130" addr="0x7fca46934c90" />
+                                    <typetab id="12131" addr="0x7fca4692c870" >
+                                        <attributelist id="12132" addr="0x7fca4692c870" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f99f1dd2150" id="12133" addr="0x7f99f1dd2150" />
-                                    <attribute name="qname" value="XBMCAddon::xbmcgui::Dialog" id="12134" addr="0x7f99f1de6c90" />
-                                    <attribute name="symtab" value="0x7f99f1e96af0" id="12135" addr="0x7f99f1e96af0" />
+                                    <attribute name="parent" value="0x7fca46920150" id="12133" addr="0x7fca46920150" />
+                                    <attribute name="qname" value="XBMCAddon::xbmcgui::Dialog" id="12134" addr="0x7fca46934c90" />
+                                    <attribute name="symtab" value="0x7fca469e4af0" id="12135" addr="0x7fca469e4af0" />
                                 </attributelist >
-                                <typescopesitem id="12136" addr="0x7f99f1dde7f0" >
-                                    <attributelist id="12137" addr="0x7f99f1dde7f0" >
+                                <typescopesitem id="12136" addr="0x7fca4692c7f0" >
+                                    <attributelist id="12137" addr="0x7fca4692c7f0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="12138" addr="0x7f99f1dde870" >
-                                    <attributelist id="12139" addr="0x7f99f1dde870" >
+                                <typescopesitem id="12138" addr="0x7fca4692c870" >
+                                    <attributelist id="12139" addr="0x7fca4692c870" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="12140" addr="0x7f99f1dd2150" >
-                                    <attributelist id="12141" addr="0x7f99f1dd2150" >
-                                        <attribute name="name" value="xbmcgui" id="12142" addr="0x7f99f1de6c90" />
-                                        <typetab id="12143" addr="0x7f99f1dd2170" >
-                                            <attributelist id="12144" addr="0x7f99f1dd2170" >
-                                                <attribute name="InterceptorBase" value="InterceptorBase" id="12145" addr="0x7f99f1de6c90" />
-                                                <attribute name="Dialog" value="Dialog" id="12146" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="12147" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="12148" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlTextBox" value="ControlTextBox" id="12149" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="12150" addr="0x7f99f1de6c90" />
-                                                <attribute name="Window" value="Window" id="12151" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="12152" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlList" value="ControlList" id="12153" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="12154" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlImage" value="ControlImage" id="12155" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlButton" value="ControlButton" id="12156" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlGroup" value="ControlGroup" id="12157" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogBusy" value="DialogBusy" id="12158" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="12159" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSpin" value="ControlSpin" id="12160" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlEdit" value="ControlEdit" id="12161" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="12162" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="12163" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlLabel" value="ControlLabel" id="12164" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlProgress" value="ControlProgress" id="12165" addr="0x7f99f1de6c90" />
-                                                <attribute name="Control" value="Control" id="12166" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSlider" value="ControlSlider" id="12167" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgress" value="DialogProgress" id="12168" addr="0x7f99f1de6c90" />
-                                                <attribute name="Action" value="Action" id="12169" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowDialog" value="WindowDialog" id="12170" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXML" value="WindowXML" id="12171" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItem" value="ListItem" id="12172" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="12173" addr="0x7f99f1de6c90" />
+                                <typescopesitem id="12140" addr="0x7fca46920150" >
+                                    <attributelist id="12141" addr="0x7fca46920150" >
+                                        <attribute name="name" value="xbmcgui" id="12142" addr="0x7fca46934c90" />
+                                        <typetab id="12143" addr="0x7fca46920170" >
+                                            <attributelist id="12144" addr="0x7fca46920170" >
+                                                <attribute name="InterceptorBase" value="InterceptorBase" id="12145" addr="0x7fca46934c90" />
+                                                <attribute name="Dialog" value="Dialog" id="12146" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="12147" addr="0x7fca46934c90" />
+                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="12148" addr="0x7fca46934c90" />
+                                                <attribute name="ControlTextBox" value="ControlTextBox" id="12149" addr="0x7fca46934c90" />
+                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="12150" addr="0x7fca46934c90" />
+                                                <attribute name="Window" value="Window" id="12151" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="12152" addr="0x7fca46934c90" />
+                                                <attribute name="ControlList" value="ControlList" id="12153" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="12154" addr="0x7fca46934c90" />
+                                                <attribute name="ControlImage" value="ControlImage" id="12155" addr="0x7fca46934c90" />
+                                                <attribute name="ControlButton" value="ControlButton" id="12156" addr="0x7fca46934c90" />
+                                                <attribute name="ControlGroup" value="ControlGroup" id="12157" addr="0x7fca46934c90" />
+                                                <attribute name="DialogBusy" value="DialogBusy" id="12158" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="12159" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSpin" value="ControlSpin" id="12160" addr="0x7fca46934c90" />
+                                                <attribute name="ControlEdit" value="ControlEdit" id="12161" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="12162" addr="0x7fca46934c90" />
+                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="12163" addr="0x7fca46934c90" />
+                                                <attribute name="ControlLabel" value="ControlLabel" id="12164" addr="0x7fca46934c90" />
+                                                <attribute name="ControlProgress" value="ControlProgress" id="12165" addr="0x7fca46934c90" />
+                                                <attribute name="Control" value="Control" id="12166" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSlider" value="ControlSlider" id="12167" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgress" value="DialogProgress" id="12168" addr="0x7fca46934c90" />
+                                                <attribute name="Action" value="Action" id="12169" addr="0x7fca46934c90" />
+                                                <attribute name="WindowDialog" value="WindowDialog" id="12170" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXML" value="WindowXML" id="12171" addr="0x7fca46934c90" />
+                                                <attribute name="ListItem" value="ListItem" id="12172" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="12173" addr="0x7fca46934c90" />
                                             </attributelist >
-                                            <typetabsitem id="12174" addr="0x7f99f1de1dd0" >
-                                                <attributelist id="12175" addr="0x7f99f1de1dd0" >
+                                            <typetabsitem id="12174" addr="0x7fca4692fdd0" >
+                                                <attributelist id="12175" addr="0x7fca4692fdd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="12176" addr="0x7f99f1dde790" >
-                                                <attributelist id="12177" addr="0x7f99f1dde790" >
+                                            <typetabsitem id="12176" addr="0x7fca4692c790" >
+                                                <attributelist id="12177" addr="0x7fca4692c790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="12178" addr="0x7f99f1de3f10" >
-                                                <attributelist id="12179" addr="0x7f99f1de3f10" >
+                                            <typetabsitem id="12178" addr="0x7fca46931f10" >
+                                                <attributelist id="12179" addr="0x7fca46931f10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="12180" addr="0x7f99f1dd67b0" >
-                                                <attributelist id="12181" addr="0x7f99f1dd67b0" >
+                                            <typetabsitem id="12180" addr="0x7fca469247b0" >
+                                                <attributelist id="12181" addr="0x7fca469247b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="12182" addr="0x7f99f1ddafd0" >
-                                                <attributelist id="12183" addr="0x7f99f1ddafd0" >
+                                            <typetabsitem id="12182" addr="0x7fca46928fd0" >
+                                                <attributelist id="12183" addr="0x7fca46928fd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="12184" addr="0x7f99f1ddd430" >
-                                                <attributelist id="12185" addr="0x7f99f1ddd430" >
+                                            <typetabsitem id="12184" addr="0x7fca4692b430" >
+                                                <attributelist id="12185" addr="0x7fca4692b430" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="12186" addr="0x7f99f1de2130" >
-                                                <attributelist id="12187" addr="0x7f99f1de2130" >
+                                            <typetabsitem id="12186" addr="0x7fca46930130" >
+                                                <attributelist id="12187" addr="0x7fca46930130" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="12188" addr="0x7f99f1dd2f50" >
-                                                <attributelist id="12189" addr="0x7f99f1dd2f50" >
+                                            <typetabsitem id="12188" addr="0x7fca46920f50" >
+                                                <attributelist id="12189" addr="0x7fca46920f50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="12190" addr="0x7f99f1dd9650" >
-                                                <attributelist id="12191" addr="0x7f99f1dd9650" >
+                                            <typetabsitem id="12190" addr="0x7fca46927650" >
+                                                <attributelist id="12191" addr="0x7fca46927650" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="12192" addr="0x7f99f1de3390" >
-                                                <attributelist id="12193" addr="0x7f99f1de3390" >
+                                            <typetabsitem id="12192" addr="0x7fca46931390" >
+                                                <attributelist id="12193" addr="0x7fca46931390" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="12194" addr="0x7f99f1ddb7b0" >
-                                                <attributelist id="12195" addr="0x7f99f1ddb7b0" >
+                                            <typetabsitem id="12194" addr="0x7fca469297b0" >
+                                                <attributelist id="12195" addr="0x7fca469297b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="12196" addr="0x7f99f1ddc4b0" >
-                                                <attributelist id="12197" addr="0x7f99f1ddc4b0" >
+                                            <typetabsitem id="12196" addr="0x7fca4692a4b0" >
+                                                <attributelist id="12197" addr="0x7fca4692a4b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="12198" addr="0x7f99f1ddcf90" >
-                                                <attributelist id="12199" addr="0x7f99f1ddcf90" >
+                                            <typetabsitem id="12198" addr="0x7fca4692af90" >
+                                                <attributelist id="12199" addr="0x7fca4692af90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="12200" addr="0x7f99f1de11b0" >
-                                                <attributelist id="12201" addr="0x7f99f1de11b0" >
+                                            <typetabsitem id="12200" addr="0x7fca4692f1b0" >
+                                                <attributelist id="12201" addr="0x7fca4692f1b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="12202" addr="0x7f99f1de15b0" >
-                                                <attributelist id="12203" addr="0x7f99f1de15b0" >
+                                            <typetabsitem id="12202" addr="0x7fca4692f5b0" >
+                                                <attributelist id="12203" addr="0x7fca4692f5b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="12204" addr="0x7f99f1dd77f0" >
-                                                <attributelist id="12205" addr="0x7f99f1dd77f0" >
+                                            <typetabsitem id="12204" addr="0x7fca469257f0" >
+                                                <attributelist id="12205" addr="0x7fca469257f0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="12206" addr="0x7f99f1dd8b30" >
-                                                <attributelist id="12207" addr="0x7f99f1dd8b30" >
+                                            <typetabsitem id="12206" addr="0x7fca46926b30" >
+                                                <attributelist id="12207" addr="0x7fca46926b30" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="12208" addr="0x7f99f1dd2c50" >
-                                                <attributelist id="12209" addr="0x7f99f1dd2c50" >
+                                            <typetabsitem id="12208" addr="0x7fca46920c50" >
+                                                <attributelist id="12209" addr="0x7fca46920c50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="12210" addr="0x7f99f1dda790" >
-                                                <attributelist id="12211" addr="0x7f99f1dda790" >
+                                            <typetabsitem id="12210" addr="0x7fca46928790" >
+                                                <attributelist id="12211" addr="0x7fca46928790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="12212" addr="0x7f99f1dd8030" >
-                                                <attributelist id="12213" addr="0x7f99f1dd8030" >
+                                            <typetabsitem id="12212" addr="0x7fca46926030" >
+                                                <attributelist id="12213" addr="0x7fca46926030" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="12214" addr="0x7f99f1ddbe10" >
-                                                <attributelist id="12215" addr="0x7f99f1ddbe10" >
+                                            <typetabsitem id="12214" addr="0x7fca46929e10" >
+                                                <attributelist id="12215" addr="0x7fca46929e10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="12216" addr="0x7f99f1dd6b10" >
-                                                <attributelist id="12217" addr="0x7f99f1dd6b10" >
+                                            <typetabsitem id="12216" addr="0x7fca46924b10" >
+                                                <attributelist id="12217" addr="0x7fca46924b10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="12218" addr="0x7f99f1dddf90" >
-                                                <attributelist id="12219" addr="0x7f99f1dddf90" >
+                                            <typetabsitem id="12218" addr="0x7fca4692bf90" >
+                                                <attributelist id="12219" addr="0x7fca4692bf90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="12220" addr="0x7f99f1de0530" >
-                                                <attributelist id="12221" addr="0x7f99f1de0530" >
+                                            <typetabsitem id="12220" addr="0x7fca4692e530" >
+                                                <attributelist id="12221" addr="0x7fca4692e530" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="12222" addr="0x7f99f1de1e50" >
-                                                <attributelist id="12223" addr="0x7f99f1de1e50" >
+                                            <typetabsitem id="12222" addr="0x7fca4692fe50" >
+                                                <attributelist id="12223" addr="0x7fca4692fe50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="12224" addr="0x7f99f1de2d90" >
-                                                <attributelist id="12225" addr="0x7f99f1de2d90" >
+                                            <typetabsitem id="12224" addr="0x7fca46930d90" >
+                                                <attributelist id="12225" addr="0x7fca46930d90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="12226" addr="0x7f99f1de3410" >
-                                                <attributelist id="12227" addr="0x7f99f1de3410" >
+                                            <typetabsitem id="12226" addr="0x7fca46931410" >
+                                                <attributelist id="12227" addr="0x7fca46931410" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="12228" addr="0x7f99f1dd3590" >
-                                                <attributelist id="12229" addr="0x7f99f1dd3590" >
+                                            <typetabsitem id="12228" addr="0x7fca46921590" >
+                                                <attributelist id="12229" addr="0x7fca46921590" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="12230" addr="0x7f99f1dd3390" >
-                                                <attributelist id="12231" addr="0x7f99f1dd3390" >
+                                            <typetabsitem id="12230" addr="0x7fca46921390" >
+                                                <attributelist id="12231" addr="0x7fca46921390" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7f99f1dd1d70" id="12232" addr="0x7f99f1dd1d70" />
-                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="12233" addr="0x7f99f1de6c90" />
-                                        <attribute name="symtab" value="0x7f99f1e40fb0" id="12234" addr="0x7f99f1e40fb0" />
+                                        <attribute name="parent" value="0x7fca4691fd70" id="12232" addr="0x7fca4691fd70" />
+                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="12233" addr="0x7fca46934c90" />
+                                        <attribute name="symtab" value="0x7fca4698efb0" id="12234" addr="0x7fca4698efb0" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="12235" addr="0x7f99f1dde890" >
-                                    <attributelist id="12236" addr="0x7f99f1dde890" >
+                                <typescopesitem id="12235" addr="0x7fca4692c890" >
+                                    <attributelist id="12236" addr="0x7fca4692c890" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="12237" addr="0x7f99f1e96af0" >
-                                    <attributelist id="12238" addr="0x7f99f1e96af0" >
-                                        <attribute name="name" value="Dialog" id="12239" addr="0x7f99f1de6c90" />
-                                        <attribute name="csymtab" value="0x7f99f1e96b10" id="12240" addr="0x7f99f1e96b10" />
-                                        <attribute name="symtab" value="0x7f99f1e96ab0" id="12241" addr="0x7f99f1e96ab0" />
+                                <typescopesitem id="12237" addr="0x7fca469e4af0" >
+                                    <attributelist id="12238" addr="0x7fca469e4af0" >
+                                        <attribute name="name" value="Dialog" id="12239" addr="0x7fca46934c90" />
+                                        <attribute name="csymtab" value="0x7fca469e4b10" id="12240" addr="0x7fca469e4b10" />
+                                        <attribute name="symtab" value="0x7fca469e4ab0" id="12241" addr="0x7fca469e4ab0" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <access id="12242" addr="0x7f99f1e96a70" >
-                            <attributelist id="12243" addr="0x7f99f1e96a70" >
-                                <attribute name="kind" value="public" id="12244" addr="0x7f99f1de6c90" />
+                        <access id="12242" addr="0x7fca469e4a70" >
+                            <attributelist id="12243" addr="0x7fca469e4a70" >
+                                <attribute name="kind" value="public" id="12244" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="12245" addr="0x7f99f1e96c50" >
-                            <attributelist id="12246" addr="0x7f99f1e96c50" >
-                                <attribute name="ismember" value="1" id="12247" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="Dialog" id="12248" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="Dialog" id="12249" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="12250" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="12251" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="12252" addr="0x7f99f1de6c90" />
-                                <attribute name="value" value="default" id="12253" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="12254" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="12255" addr="0x7f99f1de6c90" />
+                        <constructor id="12245" addr="0x7fca469e4c50" >
+                            <attributelist id="12246" addr="0x7fca469e4c50" >
+                                <attribute name="ismember" value="1" id="12247" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="Dialog" id="12248" addr="0x7fca46934c90" />
+                                <attribute name="name" value="Dialog" id="12249" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="12250" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="12251" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="12252" addr="0x7fca46934c90" />
+                                <attribute name="value" value="default" id="12253" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="12254" addr="0x7fca469e4af0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="12255" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <destructor id="12256" addr="0x7f99f1e96db0" >
-                            <attributelist id="12257" addr="0x7f99f1e96db0" >
-                                <attribute name="ismember" value="1" id="12258" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="~Dialog" id="12259" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="~Dialog" id="12260" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="12261" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="12262" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="12263" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="12264" addr="0x7f99f1de6c90" />
+                        <destructor id="12256" addr="0x7fca469e4db0" >
+                            <attributelist id="12257" addr="0x7fca469e4db0" >
+                                <attribute name="ismember" value="1" id="12258" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="~Dialog" id="12259" addr="0x7fca46934c90" />
+                                <attribute name="name" value="~Dialog" id="12260" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="12261" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="12262" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="12263" addr="0x7fca469e4af0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="12264" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </destructor >
-                        <cdecl id="12265" addr="0x7f99f1e979b0" >
-                            <attributelist id="12266" addr="0x7f99f1e979b0" >
-                                <attribute name="name" value="yesno" id="12267" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="12268" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="12269" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e97e50" id="12270" addr="0x7f99f1e97e50" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e97e50" id="12271" addr="0x7f99f1e97e50" />
-                                <attribute name="kind" value="function" id="12272" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="yesno" id="12273" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,int)." id="12274" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="12275" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e979b0" id="12276" addr="0x7f99f1e979b0" />
-                                <parmlist id="12277" addr="0x7f99f1e96fd0" >
+                        <cdecl id="12265" addr="0x7fca469e59b0" >
+                            <attributelist id="12266" addr="0x7fca469e59b0" >
+                                <attribute name="name" value="yesno" id="12267" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="12268" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="12269" addr="0x7fca469e4af0" />
+                                <attribute name="sym_nextSibling" value="0x7fca469e5e50" id="12270" addr="0x7fca469e5e50" />
+                                <attribute name="csym_nextSibling" value="0x7fca469e5e50" id="12271" addr="0x7fca469e5e50" />
+                                <attribute name="kind" value="function" id="12272" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="yesno" id="12273" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,int)." id="12274" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="12275" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469e59b0" id="12276" addr="0x7fca469e59b0" />
+                                <parmlist id="12277" addr="0x7fca469e4fd0" >
                                     <parm id="12278">
-                                        <attributelist id="12279" addr="0x7f99f1e96fd0" >
-                                            <attribute name="name" value="heading" id="12280" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12281" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12279" addr="0x7fca469e4fd0" >
+                                            <attribute name="name" value="heading" id="12280" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12281" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12282">
-                                        <attributelist id="12283" addr="0x7f99f1e97110" >
-                                            <attribute name="name" value="line1" id="12284" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12285" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12283" addr="0x7fca469e5110" >
+                                            <attribute name="name" value="line1" id="12284" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12285" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12286">
-                                        <attributelist id="12287" addr="0x7f99f1e972b0" >
-                                            <attribute name="name" value="line2" id="12288" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="12289" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12290" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12287" addr="0x7fca469e52b0" >
+                                            <attribute name="name" value="line2" id="12288" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="12289" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12290" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12291">
-                                        <attributelist id="12292" addr="0x7f99f1e97450" >
-                                            <attribute name="name" value="line3" id="12293" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="12294" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12295" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12292" addr="0x7fca469e5450" >
+                                            <attribute name="name" value="line3" id="12293" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="12294" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12295" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12296">
-                                        <attributelist id="12297" addr="0x7f99f1e975f0" >
-                                            <attribute name="name" value="nolabel" id="12298" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="12299" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12300" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12297" addr="0x7fca469e55f0" >
+                                            <attribute name="name" value="nolabel" id="12298" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="12299" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12300" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12301">
-                                        <attributelist id="12302" addr="0x7f99f1e97790" >
-                                            <attribute name="name" value="yeslabel" id="12303" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="12304" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12305" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12302" addr="0x7fca469e5790" >
+                                            <attribute name="name" value="yeslabel" id="12303" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="12304" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12305" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12306">
-                                        <attributelist id="12307" addr="0x7f99f1e978f0" >
-                                            <attribute name="name" value="autoclose" id="12308" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="0" id="12309" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="12310" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12307" addr="0x7fca469e58f0" >
+                                            <attribute name="name" value="autoclose" id="12308" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="0" id="12309" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="12310" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="bool" id="12311" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="12312" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="bool" id="12311" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="12312" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="12313" addr="0x7f99f1e97e50" >
-                            <attributelist id="12314" addr="0x7f99f1e97e50" >
-                                <attribute name="name" value="yesno" id="12315" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="12316" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="12317" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e979b0" id="12318" addr="0x7f99f1e979b0" />
-                                <attribute name="kind" value="function" id="12319" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="yesno" id="12320" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e98250" id="12321" addr="0x7f99f1e98250" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e98250" id="12322" addr="0x7f99f1e98250" />
-                                <attribute name="defaultargs" value="0x7f99f1e979b0" id="12323" addr="0x7f99f1e979b0" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="12324" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="12325" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e979b0" id="12326" addr="0x7f99f1e979b0" />
-                                <parmlist id="12327" addr="0x7f99f1e97a50" >
+                        <cdecl id="12313" addr="0x7fca469e5e50" >
+                            <attributelist id="12314" addr="0x7fca469e5e50" >
+                                <attribute name="name" value="yesno" id="12315" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="12316" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="12317" addr="0x7fca469e4af0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469e59b0" id="12318" addr="0x7fca469e59b0" />
+                                <attribute name="kind" value="function" id="12319" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="yesno" id="12320" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469e6250" id="12321" addr="0x7fca469e6250" />
+                                <attribute name="sym_nextSibling" value="0x7fca469e6250" id="12322" addr="0x7fca469e6250" />
+                                <attribute name="defaultargs" value="0x7fca469e59b0" id="12323" addr="0x7fca469e59b0" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="12324" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="12325" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469e59b0" id="12326" addr="0x7fca469e59b0" />
+                                <parmlist id="12327" addr="0x7fca469e5a50" >
                                     <parm id="12328">
-                                        <attributelist id="12329" addr="0x7f99f1e97a50" >
-                                            <attribute name="name" value="heading" id="12330" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12331" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12329" addr="0x7fca469e5a50" >
+                                            <attribute name="name" value="heading" id="12330" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12331" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12332">
-                                        <attributelist id="12333" addr="0x7f99f1e97b30" >
-                                            <attribute name="name" value="line1" id="12334" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12335" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12333" addr="0x7fca469e5b30" >
+                                            <attribute name="name" value="line1" id="12334" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12335" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12336">
-                                        <attributelist id="12337" addr="0x7f99f1e97bb0" >
-                                            <attribute name="name" value="line2" id="12338" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="12339" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12340" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12337" addr="0x7fca469e5bb0" >
+                                            <attribute name="name" value="line2" id="12338" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="12339" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12340" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12341">
-                                        <attributelist id="12342" addr="0x7f99f1e97c50" >
-                                            <attribute name="name" value="line3" id="12343" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="12344" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12345" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12342" addr="0x7fca469e5c50" >
+                                            <attribute name="name" value="line3" id="12343" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="12344" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12345" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12346">
-                                        <attributelist id="12347" addr="0x7f99f1e97cf0" >
-                                            <attribute name="name" value="nolabel" id="12348" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="12349" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12350" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12347" addr="0x7fca469e5cf0" >
+                                            <attribute name="name" value="nolabel" id="12348" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="12349" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12350" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12351">
-                                        <attributelist id="12352" addr="0x7f99f1e97d90" >
-                                            <attribute name="name" value="yeslabel" id="12353" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="12354" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12355" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12352" addr="0x7fca469e5d90" >
+                                            <attribute name="name" value="yeslabel" id="12353" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="12354" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12355" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="bool" id="12356" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="12357" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="bool" id="12356" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="12357" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="12358" addr="0x7f99f1e98250" >
-                            <attributelist id="12359" addr="0x7f99f1e98250" >
-                                <attribute name="name" value="yesno" id="12360" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="12361" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="12362" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e97e50" id="12363" addr="0x7f99f1e97e50" />
-                                <attribute name="kind" value="function" id="12364" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="yesno" id="12365" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e985b0" id="12366" addr="0x7f99f1e985b0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e985b0" id="12367" addr="0x7f99f1e985b0" />
-                                <attribute name="defaultargs" value="0x7f99f1e979b0" id="12368" addr="0x7f99f1e979b0" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="12369" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="12370" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e979b0" id="12371" addr="0x7f99f1e979b0" />
-                                <parmlist id="12372" addr="0x7f99f1e97ef0" >
+                        <cdecl id="12358" addr="0x7fca469e6250" >
+                            <attributelist id="12359" addr="0x7fca469e6250" >
+                                <attribute name="name" value="yesno" id="12360" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="12361" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="12362" addr="0x7fca469e4af0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469e5e50" id="12363" addr="0x7fca469e5e50" />
+                                <attribute name="kind" value="function" id="12364" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="yesno" id="12365" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469e65b0" id="12366" addr="0x7fca469e65b0" />
+                                <attribute name="sym_nextSibling" value="0x7fca469e65b0" id="12367" addr="0x7fca469e65b0" />
+                                <attribute name="defaultargs" value="0x7fca469e59b0" id="12368" addr="0x7fca469e59b0" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="12369" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="12370" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469e59b0" id="12371" addr="0x7fca469e59b0" />
+                                <parmlist id="12372" addr="0x7fca469e5ef0" >
                                     <parm id="12373">
-                                        <attributelist id="12374" addr="0x7f99f1e97ef0" >
-                                            <attribute name="name" value="heading" id="12375" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12376" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12374" addr="0x7fca469e5ef0" >
+                                            <attribute name="name" value="heading" id="12375" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12376" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12377">
-                                        <attributelist id="12378" addr="0x7f99f1e97fd0" >
-                                            <attribute name="name" value="line1" id="12379" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12380" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12378" addr="0x7fca469e5fd0" >
+                                            <attribute name="name" value="line1" id="12379" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12380" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12381">
-                                        <attributelist id="12382" addr="0x7f99f1e98050" >
-                                            <attribute name="name" value="line2" id="12383" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="12384" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12385" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12382" addr="0x7fca469e6050" >
+                                            <attribute name="name" value="line2" id="12383" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="12384" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12385" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12386">
-                                        <attributelist id="12387" addr="0x7f99f1e980f0" >
-                                            <attribute name="name" value="line3" id="12388" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="12389" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12390" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12387" addr="0x7fca469e60f0" >
+                                            <attribute name="name" value="line3" id="12388" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="12389" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12390" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12391">
-                                        <attributelist id="12392" addr="0x7f99f1e98190" >
-                                            <attribute name="name" value="nolabel" id="12393" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="12394" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12395" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12392" addr="0x7fca469e6190" >
+                                            <attribute name="name" value="nolabel" id="12393" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="12394" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12395" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="bool" id="12396" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_2" id="12397" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="bool" id="12396" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_2" id="12397" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="12398" addr="0x7f99f1e985b0" >
-                            <attributelist id="12399" addr="0x7f99f1e985b0" >
-                                <attribute name="name" value="yesno" id="12400" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="12401" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="12402" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e98250" id="12403" addr="0x7f99f1e98250" />
-                                <attribute name="kind" value="function" id="12404" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="yesno" id="12405" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e98870" id="12406" addr="0x7f99f1e98870" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e98870" id="12407" addr="0x7f99f1e98870" />
-                                <attribute name="defaultargs" value="0x7f99f1e979b0" id="12408" addr="0x7f99f1e979b0" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="12409" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="12410" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e979b0" id="12411" addr="0x7f99f1e979b0" />
-                                <parmlist id="12412" addr="0x7f99f1e982f0" >
+                        <cdecl id="12398" addr="0x7fca469e65b0" >
+                            <attributelist id="12399" addr="0x7fca469e65b0" >
+                                <attribute name="name" value="yesno" id="12400" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="12401" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="12402" addr="0x7fca469e4af0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469e6250" id="12403" addr="0x7fca469e6250" />
+                                <attribute name="kind" value="function" id="12404" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="yesno" id="12405" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469e6870" id="12406" addr="0x7fca469e6870" />
+                                <attribute name="sym_nextSibling" value="0x7fca469e6870" id="12407" addr="0x7fca469e6870" />
+                                <attribute name="defaultargs" value="0x7fca469e59b0" id="12408" addr="0x7fca469e59b0" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="12409" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="12410" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469e59b0" id="12411" addr="0x7fca469e59b0" />
+                                <parmlist id="12412" addr="0x7fca469e62f0" >
                                     <parm id="12413">
-                                        <attributelist id="12414" addr="0x7f99f1e982f0" >
-                                            <attribute name="name" value="heading" id="12415" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12416" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12414" addr="0x7fca469e62f0" >
+                                            <attribute name="name" value="heading" id="12415" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12416" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12417">
-                                        <attributelist id="12418" addr="0x7f99f1e983d0" >
-                                            <attribute name="name" value="line1" id="12419" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12420" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12418" addr="0x7fca469e63d0" >
+                                            <attribute name="name" value="line1" id="12419" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12420" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12421">
-                                        <attributelist id="12422" addr="0x7f99f1e98450" >
-                                            <attribute name="name" value="line2" id="12423" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="12424" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12425" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12422" addr="0x7fca469e6450" >
+                                            <attribute name="name" value="line2" id="12423" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="12424" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12425" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12426">
-                                        <attributelist id="12427" addr="0x7f99f1e984f0" >
-                                            <attribute name="name" value="line3" id="12428" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="12429" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12430" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12427" addr="0x7fca469e64f0" >
+                                            <attribute name="name" value="line3" id="12428" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="12429" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12430" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="bool" id="12431" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_3" id="12432" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="bool" id="12431" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_3" id="12432" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="12433" addr="0x7f99f1e98870" >
-                            <attributelist id="12434" addr="0x7f99f1e98870" >
-                                <attribute name="name" value="yesno" id="12435" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="12436" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="12437" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e985b0" id="12438" addr="0x7f99f1e985b0" />
-                                <attribute name="kind" value="function" id="12439" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="yesno" id="12440" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e98a90" id="12441" addr="0x7f99f1e98a90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e98a90" id="12442" addr="0x7f99f1e98a90" />
-                                <attribute name="defaultargs" value="0x7f99f1e979b0" id="12443" addr="0x7f99f1e979b0" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="12444" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="12445" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e979b0" id="12446" addr="0x7f99f1e979b0" />
-                                <parmlist id="12447" addr="0x7f99f1e98650" >
+                        <cdecl id="12433" addr="0x7fca469e6870" >
+                            <attributelist id="12434" addr="0x7fca469e6870" >
+                                <attribute name="name" value="yesno" id="12435" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="12436" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="12437" addr="0x7fca469e4af0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469e65b0" id="12438" addr="0x7fca469e65b0" />
+                                <attribute name="kind" value="function" id="12439" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="yesno" id="12440" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469e6a90" id="12441" addr="0x7fca469e6a90" />
+                                <attribute name="sym_nextSibling" value="0x7fca469e6a90" id="12442" addr="0x7fca469e6a90" />
+                                <attribute name="defaultargs" value="0x7fca469e59b0" id="12443" addr="0x7fca469e59b0" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="12444" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="12445" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469e59b0" id="12446" addr="0x7fca469e59b0" />
+                                <parmlist id="12447" addr="0x7fca469e6650" >
                                     <parm id="12448">
-                                        <attributelist id="12449" addr="0x7f99f1e98650" >
-                                            <attribute name="name" value="heading" id="12450" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12451" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12449" addr="0x7fca469e6650" >
+                                            <attribute name="name" value="heading" id="12450" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12451" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12452">
-                                        <attributelist id="12453" addr="0x7f99f1e98730" >
-                                            <attribute name="name" value="line1" id="12454" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12455" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12453" addr="0x7fca469e6730" >
+                                            <attribute name="name" value="line1" id="12454" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12455" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12456">
-                                        <attributelist id="12457" addr="0x7f99f1e987b0" >
-                                            <attribute name="name" value="line2" id="12458" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="12459" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12460" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12457" addr="0x7fca469e67b0" >
+                                            <attribute name="name" value="line2" id="12458" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="12459" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12460" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="bool" id="12461" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_4" id="12462" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="bool" id="12461" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_4" id="12462" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="12463" addr="0x7f99f1e98a90" >
-                            <attributelist id="12464" addr="0x7f99f1e98a90" >
-                                <attribute name="name" value="yesno" id="12465" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="12466" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="12467" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e98870" id="12468" addr="0x7f99f1e98870" />
-                                <attribute name="kind" value="function" id="12469" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="yesno" id="12470" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e979b0" id="12471" addr="0x7f99f1e979b0" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="12472" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="12473" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e979b0" id="12474" addr="0x7f99f1e979b0" />
-                                <parmlist id="12475" addr="0x7f99f1e98910" >
+                        <cdecl id="12463" addr="0x7fca469e6a90" >
+                            <attributelist id="12464" addr="0x7fca469e6a90" >
+                                <attribute name="name" value="yesno" id="12465" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="12466" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="12467" addr="0x7fca469e4af0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469e6870" id="12468" addr="0x7fca469e6870" />
+                                <attribute name="kind" value="function" id="12469" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="yesno" id="12470" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469e59b0" id="12471" addr="0x7fca469e59b0" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="12472" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="12473" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469e59b0" id="12474" addr="0x7fca469e59b0" />
+                                <parmlist id="12475" addr="0x7fca469e6910" >
                                     <parm id="12476">
-                                        <attributelist id="12477" addr="0x7f99f1e98910" >
-                                            <attribute name="name" value="heading" id="12478" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12479" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12477" addr="0x7fca469e6910" >
+                                            <attribute name="name" value="heading" id="12478" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12479" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12480">
-                                        <attributelist id="12481" addr="0x7f99f1e989f0" >
-                                            <attribute name="name" value="line1" id="12482" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12483" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12481" addr="0x7fca469e69f0" >
+                                            <attribute name="name" value="line1" id="12482" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12483" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="bool" id="12484" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_5" id="12485" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="bool" id="12484" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_5" id="12485" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="12486" addr="0x7f99f1e98d90" >
-                            <attributelist id="12487" addr="0x7f99f1e98d90" >
-                                <attribute name="name" value="info" id="12488" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="12489" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="12490" addr="0x7f99f1e96af0" />
-                                <attribute name="kind" value="function" id="12491" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="info" id="12492" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(p.q(const).XBMCAddon::xbmcgui::ListItem)." id="12493" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="12494" addr="0x7f99f1de6c90" />
-                                <parmlist id="12495" addr="0x7f99f1e98cd0" >
+                        <cdecl id="12486" addr="0x7fca469e6d90" >
+                            <attributelist id="12487" addr="0x7fca469e6d90" >
+                                <attribute name="name" value="info" id="12488" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="12489" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="12490" addr="0x7fca469e4af0" />
+                                <attribute name="kind" value="function" id="12491" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="info" id="12492" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(p.q(const).XBMCAddon::xbmcgui::ListItem)." id="12493" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="12494" addr="0x7fca46934c90" />
+                                <parmlist id="12495" addr="0x7fca469e6cd0" >
                                     <parm id="12496">
-                                        <attributelist id="12497" addr="0x7f99f1e98cd0" >
-                                            <attribute name="name" value="item" id="12498" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::ListItem" id="12499" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12497" addr="0x7fca469e6cd0" >
+                                            <attribute name="name" value="item" id="12498" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::ListItem" id="12499" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="bool" id="12500" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="12501" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="bool" id="12500" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="12501" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="12502" addr="0x7f99f1e99a50" >
-                            <attributelist id="12503" addr="0x7f99f1e99a50" >
-                                <attribute name="name" value="select" id="12504" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="12505" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="12506" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e99db0" id="12507" addr="0x7f99f1e99db0" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e99db0" id="12508" addr="0x7f99f1e99db0" />
-                                <attribute name="kind" value="function" id="12509" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="select" id="12510" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>,int,int,bool)." id="12511" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="12512" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e99a50" id="12513" addr="0x7f99f1e99a50" />
-                                <parmlist id="12514" addr="0x7f99f1e99010" >
+                        <cdecl id="12502" addr="0x7fca469e7a50" >
+                            <attributelist id="12503" addr="0x7fca469e7a50" >
+                                <attribute name="name" value="select" id="12504" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="12505" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="12506" addr="0x7fca469e4af0" />
+                                <attribute name="sym_nextSibling" value="0x7fca469e7db0" id="12507" addr="0x7fca469e7db0" />
+                                <attribute name="csym_nextSibling" value="0x7fca469e7db0" id="12508" addr="0x7fca469e7db0" />
+                                <attribute name="kind" value="function" id="12509" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="select" id="12510" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>,int,int,bool)." id="12511" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="12512" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469e7a50" id="12513" addr="0x7fca469e7a50" />
+                                <parmlist id="12514" addr="0x7fca469e7010" >
                                     <parm id="12515">
-                                        <attributelist id="12516" addr="0x7f99f1e99010" >
-                                            <attribute name="name" value="heading" id="12517" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12518" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12516" addr="0x7fca469e7010" >
+                                            <attribute name="name" value="heading" id="12517" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12518" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12519">
-                                        <attributelist id="12520" addr="0x7f99f1e99690" >
-                                            <attribute name="name" value="list" id="12521" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>" id="12522" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12520" addr="0x7fca469e7690" >
+                                            <attribute name="name" value="list" id="12521" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>" id="12522" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12523">
-                                        <attributelist id="12524" addr="0x7f99f1e996d0" >
-                                            <attribute name="name" value="autoclose" id="12525" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="0" id="12526" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="12527" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12524" addr="0x7fca469e76d0" >
+                                            <attribute name="name" value="autoclose" id="12525" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="0" id="12526" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="12527" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12528">
-                                        <attributelist id="12529" addr="0x7f99f1e99850" >
-                                            <attribute name="name" value="preselect" id="12530" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="-1" id="12531" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="12532" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12529" addr="0x7fca469e7850" >
+                                            <attribute name="name" value="preselect" id="12530" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="-1" id="12531" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="12532" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12533">
-                                        <attributelist id="12534" addr="0x7f99f1e99990" >
-                                            <attribute name="name" value="useDetails" id="12535" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="false" id="12536" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="12537" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12534" addr="0x7fca469e7990" >
+                                            <attribute name="name" value="useDetails" id="12535" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="false" id="12536" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="12537" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="int" id="12538" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="12539" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="int" id="12538" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="12539" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="12540" addr="0x7f99f1e99db0" >
-                            <attributelist id="12541" addr="0x7f99f1e99db0" >
-                                <attribute name="name" value="select" id="12542" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="12543" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="12544" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e99a50" id="12545" addr="0x7f99f1e99a50" />
-                                <attribute name="kind" value="function" id="12546" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="select" id="12547" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e9a070" id="12548" addr="0x7f99f1e9a070" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e9a070" id="12549" addr="0x7f99f1e9a070" />
-                                <attribute name="defaultargs" value="0x7f99f1e99a50" id="12550" addr="0x7f99f1e99a50" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>,int,int)." id="12551" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="12552" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e99a50" id="12553" addr="0x7f99f1e99a50" />
-                                <parmlist id="12554" addr="0x7f99f1e99af0" >
+                        <cdecl id="12540" addr="0x7fca469e7db0" >
+                            <attributelist id="12541" addr="0x7fca469e7db0" >
+                                <attribute name="name" value="select" id="12542" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="12543" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="12544" addr="0x7fca469e4af0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469e7a50" id="12545" addr="0x7fca469e7a50" />
+                                <attribute name="kind" value="function" id="12546" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="select" id="12547" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469e8070" id="12548" addr="0x7fca469e8070" />
+                                <attribute name="sym_nextSibling" value="0x7fca469e8070" id="12549" addr="0x7fca469e8070" />
+                                <attribute name="defaultargs" value="0x7fca469e7a50" id="12550" addr="0x7fca469e7a50" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>,int,int)." id="12551" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="12552" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469e7a50" id="12553" addr="0x7fca469e7a50" />
+                                <parmlist id="12554" addr="0x7fca469e7af0" >
                                     <parm id="12555">
-                                        <attributelist id="12556" addr="0x7f99f1e99af0" >
-                                            <attribute name="name" value="heading" id="12557" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12558" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12556" addr="0x7fca469e7af0" >
+                                            <attribute name="name" value="heading" id="12557" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12558" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12559">
-                                        <attributelist id="12560" addr="0x7f99f1e99bd0" >
-                                            <attribute name="name" value="list" id="12561" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>" id="12562" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12560" addr="0x7fca469e7bd0" >
+                                            <attribute name="name" value="list" id="12561" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>" id="12562" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12563">
-                                        <attributelist id="12564" addr="0x7f99f1e99c50" >
-                                            <attribute name="name" value="autoclose" id="12565" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="0" id="12566" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="12567" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12564" addr="0x7fca469e7c50" >
+                                            <attribute name="name" value="autoclose" id="12565" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="0" id="12566" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="12567" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12568">
-                                        <attributelist id="12569" addr="0x7f99f1e99cf0" >
-                                            <attribute name="name" value="preselect" id="12570" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="-1" id="12571" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="12572" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12569" addr="0x7fca469e7cf0" >
+                                            <attribute name="name" value="preselect" id="12570" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="-1" id="12571" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="12572" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="int" id="12573" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="12574" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="int" id="12573" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="12574" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="12575" addr="0x7f99f1e9a070" >
-                            <attributelist id="12576" addr="0x7f99f1e9a070" >
-                                <attribute name="name" value="select" id="12577" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="12578" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="12579" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e99db0" id="12580" addr="0x7f99f1e99db0" />
-                                <attribute name="kind" value="function" id="12581" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="select" id="12582" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e9a290" id="12583" addr="0x7f99f1e9a290" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e9a290" id="12584" addr="0x7f99f1e9a290" />
-                                <attribute name="defaultargs" value="0x7f99f1e99a50" id="12585" addr="0x7f99f1e99a50" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>,int)." id="12586" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="12587" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e99a50" id="12588" addr="0x7f99f1e99a50" />
-                                <parmlist id="12589" addr="0x7f99f1e99e50" >
+                        <cdecl id="12575" addr="0x7fca469e8070" >
+                            <attributelist id="12576" addr="0x7fca469e8070" >
+                                <attribute name="name" value="select" id="12577" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="12578" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="12579" addr="0x7fca469e4af0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469e7db0" id="12580" addr="0x7fca469e7db0" />
+                                <attribute name="kind" value="function" id="12581" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="select" id="12582" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469e8290" id="12583" addr="0x7fca469e8290" />
+                                <attribute name="sym_nextSibling" value="0x7fca469e8290" id="12584" addr="0x7fca469e8290" />
+                                <attribute name="defaultargs" value="0x7fca469e7a50" id="12585" addr="0x7fca469e7a50" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>,int)." id="12586" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="12587" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469e7a50" id="12588" addr="0x7fca469e7a50" />
+                                <parmlist id="12589" addr="0x7fca469e7e50" >
                                     <parm id="12590">
-                                        <attributelist id="12591" addr="0x7f99f1e99e50" >
-                                            <attribute name="name" value="heading" id="12592" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12593" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12591" addr="0x7fca469e7e50" >
+                                            <attribute name="name" value="heading" id="12592" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12593" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12594">
-                                        <attributelist id="12595" addr="0x7f99f1e99f30" >
-                                            <attribute name="name" value="list" id="12596" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>" id="12597" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12595" addr="0x7fca469e7f30" >
+                                            <attribute name="name" value="list" id="12596" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>" id="12597" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12598">
-                                        <attributelist id="12599" addr="0x7f99f1e99fb0" >
-                                            <attribute name="name" value="autoclose" id="12600" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="0" id="12601" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="12602" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12599" addr="0x7fca469e7fb0" >
+                                            <attribute name="name" value="autoclose" id="12600" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="0" id="12601" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="12602" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="int" id="12603" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_2" id="12604" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="int" id="12603" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_2" id="12604" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="12605" addr="0x7f99f1e9a290" >
-                            <attributelist id="12606" addr="0x7f99f1e9a290" >
-                                <attribute name="name" value="select" id="12607" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="12608" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="12609" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e9a070" id="12610" addr="0x7f99f1e9a070" />
-                                <attribute name="kind" value="function" id="12611" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="select" id="12612" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e99a50" id="12613" addr="0x7f99f1e99a50" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>)." id="12614" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="12615" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e99a50" id="12616" addr="0x7f99f1e99a50" />
-                                <parmlist id="12617" addr="0x7f99f1e9a110" >
+                        <cdecl id="12605" addr="0x7fca469e8290" >
+                            <attributelist id="12606" addr="0x7fca469e8290" >
+                                <attribute name="name" value="select" id="12607" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="12608" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="12609" addr="0x7fca469e4af0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469e8070" id="12610" addr="0x7fca469e8070" />
+                                <attribute name="kind" value="function" id="12611" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="select" id="12612" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469e7a50" id="12613" addr="0x7fca469e7a50" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>)." id="12614" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="12615" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469e7a50" id="12616" addr="0x7fca469e7a50" />
+                                <parmlist id="12617" addr="0x7fca469e8110" >
                                     <parm id="12618">
-                                        <attributelist id="12619" addr="0x7f99f1e9a110" >
-                                            <attribute name="name" value="heading" id="12620" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12621" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12619" addr="0x7fca469e8110" >
+                                            <attribute name="name" value="heading" id="12620" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12621" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12622">
-                                        <attributelist id="12623" addr="0x7f99f1e9a1f0" >
-                                            <attribute name="name" value="list" id="12624" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>" id="12625" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12623" addr="0x7fca469e81f0" >
+                                            <attribute name="name" value="list" id="12624" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>" id="12625" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="int" id="12626" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_3" id="12627" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="int" id="12626" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_3" id="12627" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="12628" addr="0x7f99f1e9a690" >
-                            <attributelist id="12629" addr="0x7f99f1e9a690" >
-                                <attribute name="name" value="contextmenu" id="12630" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="12631" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="12632" addr="0x7f99f1e96af0" />
-                                <attribute name="kind" value="function" id="12633" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="contextmenu" id="12634" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).std::vector&lt;(XBMCAddon::String)>)." id="12635" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="12636" addr="0x7f99f1de6c90" />
-                                <parmlist id="12637" addr="0x7f99f1e9a5d0" >
+                        <cdecl id="12628" addr="0x7fca469e8690" >
+                            <attributelist id="12629" addr="0x7fca469e8690" >
+                                <attribute name="name" value="contextmenu" id="12630" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="12631" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="12632" addr="0x7fca469e4af0" />
+                                <attribute name="kind" value="function" id="12633" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="contextmenu" id="12634" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).std::vector&lt;(XBMCAddon::String)>)." id="12635" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="12636" addr="0x7fca46934c90" />
+                                <parmlist id="12637" addr="0x7fca469e85d0" >
                                     <parm id="12638">
-                                        <attributelist id="12639" addr="0x7f99f1e9a5d0" >
-                                            <attribute name="name" value="list" id="12640" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).std::vector&lt;(XBMCAddon::String)>" id="12641" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12639" addr="0x7fca469e85d0" >
+                                            <attribute name="name" value="list" id="12640" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).std::vector&lt;(XBMCAddon::String)>" id="12641" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="int" id="12642" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="12643" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="int" id="12642" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="12643" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="12644" addr="0x7f99f1e9b710" >
-                            <attributelist id="12645" addr="0x7f99f1e9b710" >
-                                <attribute name="name" value="multiselect" id="12646" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="12647" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="12648" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e9ba70" id="12649" addr="0x7f99f1e9ba70" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e9ba70" id="12650" addr="0x7f99f1e9ba70" />
-                                <attribute name="kind" value="function" id="12651" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="multiselect" id="12652" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>,int,r.q(const).std::vector&lt;(int)>,bool)." id="12653" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="12654" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e9b710" id="12655" addr="0x7f99f1e9b710" />
-                                <parmlist id="12656" addr="0x7f99f1e9aa30" >
+                        <cdecl id="12644" addr="0x7fca469e9710" >
+                            <attributelist id="12645" addr="0x7fca469e9710" >
+                                <attribute name="name" value="multiselect" id="12646" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="12647" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="12648" addr="0x7fca469e4af0" />
+                                <attribute name="sym_nextSibling" value="0x7fca469e9a70" id="12649" addr="0x7fca469e9a70" />
+                                <attribute name="csym_nextSibling" value="0x7fca469e9a70" id="12650" addr="0x7fca469e9a70" />
+                                <attribute name="kind" value="function" id="12651" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="multiselect" id="12652" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>,int,r.q(const).std::vector&lt;(int)>,bool)." id="12653" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="12654" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469e9710" id="12655" addr="0x7fca469e9710" />
+                                <parmlist id="12656" addr="0x7fca469e8a30" >
                                     <parm id="12657">
-                                        <attributelist id="12658" addr="0x7f99f1e9aa30" >
-                                            <attribute name="name" value="heading" id="12659" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12660" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12658" addr="0x7fca469e8a30" >
+                                            <attribute name="name" value="heading" id="12659" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12660" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12661">
-                                        <attributelist id="12662" addr="0x7f99f1e9afd0" >
-                                            <attribute name="name" value="options" id="12663" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>" id="12664" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12662" addr="0x7fca469e8fd0" >
+                                            <attribute name="name" value="options" id="12663" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>" id="12664" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12665">
-                                        <attributelist id="12666" addr="0x7f99f1e9b130" >
-                                            <attribute name="name" value="autoclose" id="12667" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="0" id="12668" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="12669" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12666" addr="0x7fca469e9130" >
+                                            <attribute name="name" value="autoclose" id="12667" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="0" id="12668" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="12669" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12670">
-                                        <attributelist id="12671" addr="0x7f99f1e9b4d0" >
-                                            <attribute name="name" value="preselect" id="12672" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="std::vector&lt; int >()" id="12673" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).std::vector&lt;(int)>" id="12674" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12671" addr="0x7fca469e94d0" >
+                                            <attribute name="name" value="preselect" id="12672" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="std::vector&lt; int >()" id="12673" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).std::vector&lt;(int)>" id="12674" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12675">
-                                        <attributelist id="12676" addr="0x7f99f1e9b650" >
-                                            <attribute name="name" value="useDetails" id="12677" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="false" id="12678" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="12679" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12676" addr="0x7fca469e9650" >
+                                            <attribute name="name" value="useDetails" id="12677" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="false" id="12678" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="12679" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="std::unique_ptr&lt;(std::vector&lt;(int)>)>" id="12680" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="12681" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="std::unique_ptr&lt;(std::vector&lt;(int)>)>" id="12680" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="12681" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="12682" addr="0x7f99f1e9ba70" >
-                            <attributelist id="12683" addr="0x7f99f1e9ba70" >
-                                <attribute name="name" value="multiselect" id="12684" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="12685" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="12686" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e9b710" id="12687" addr="0x7f99f1e9b710" />
-                                <attribute name="kind" value="function" id="12688" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="multiselect" id="12689" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e9bd30" id="12690" addr="0x7f99f1e9bd30" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e9bd30" id="12691" addr="0x7f99f1e9bd30" />
-                                <attribute name="defaultargs" value="0x7f99f1e9b710" id="12692" addr="0x7f99f1e9b710" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>,int,r.q(const).std::vector&lt;(int)>)." id="12693" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="12694" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e9b710" id="12695" addr="0x7f99f1e9b710" />
-                                <parmlist id="12696" addr="0x7f99f1e9b7b0" >
+                        <cdecl id="12682" addr="0x7fca469e9a70" >
+                            <attributelist id="12683" addr="0x7fca469e9a70" >
+                                <attribute name="name" value="multiselect" id="12684" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="12685" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="12686" addr="0x7fca469e4af0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469e9710" id="12687" addr="0x7fca469e9710" />
+                                <attribute name="kind" value="function" id="12688" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="multiselect" id="12689" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469e9d30" id="12690" addr="0x7fca469e9d30" />
+                                <attribute name="sym_nextSibling" value="0x7fca469e9d30" id="12691" addr="0x7fca469e9d30" />
+                                <attribute name="defaultargs" value="0x7fca469e9710" id="12692" addr="0x7fca469e9710" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>,int,r.q(const).std::vector&lt;(int)>)." id="12693" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="12694" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469e9710" id="12695" addr="0x7fca469e9710" />
+                                <parmlist id="12696" addr="0x7fca469e97b0" >
                                     <parm id="12697">
-                                        <attributelist id="12698" addr="0x7f99f1e9b7b0" >
-                                            <attribute name="name" value="heading" id="12699" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12700" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12698" addr="0x7fca469e97b0" >
+                                            <attribute name="name" value="heading" id="12699" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12700" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12701">
-                                        <attributelist id="12702" addr="0x7f99f1e9b890" >
-                                            <attribute name="name" value="options" id="12703" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>" id="12704" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12702" addr="0x7fca469e9890" >
+                                            <attribute name="name" value="options" id="12703" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>" id="12704" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12705">
-                                        <attributelist id="12706" addr="0x7f99f1e9b910" >
-                                            <attribute name="name" value="autoclose" id="12707" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="0" id="12708" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="12709" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12706" addr="0x7fca469e9910" >
+                                            <attribute name="name" value="autoclose" id="12707" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="0" id="12708" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="12709" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12710">
-                                        <attributelist id="12711" addr="0x7f99f1e9b9b0" >
-                                            <attribute name="name" value="preselect" id="12712" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="std::vector&lt; int >()" id="12713" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).std::vector&lt;(int)>" id="12714" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12711" addr="0x7fca469e99b0" >
+                                            <attribute name="name" value="preselect" id="12712" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="std::vector&lt; int >()" id="12713" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).std::vector&lt;(int)>" id="12714" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="std::unique_ptr&lt;(std::vector&lt;(int)>)>" id="12715" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="12716" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="std::unique_ptr&lt;(std::vector&lt;(int)>)>" id="12715" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="12716" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="12717" addr="0x7f99f1e9bd30" >
-                            <attributelist id="12718" addr="0x7f99f1e9bd30" >
-                                <attribute name="name" value="multiselect" id="12719" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="12720" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="12721" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e9ba70" id="12722" addr="0x7f99f1e9ba70" />
-                                <attribute name="kind" value="function" id="12723" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="multiselect" id="12724" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e9bf50" id="12725" addr="0x7f99f1e9bf50" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e9bf50" id="12726" addr="0x7f99f1e9bf50" />
-                                <attribute name="defaultargs" value="0x7f99f1e9b710" id="12727" addr="0x7f99f1e9b710" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>,int)." id="12728" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="12729" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e9b710" id="12730" addr="0x7f99f1e9b710" />
-                                <parmlist id="12731" addr="0x7f99f1e9bb10" >
+                        <cdecl id="12717" addr="0x7fca469e9d30" >
+                            <attributelist id="12718" addr="0x7fca469e9d30" >
+                                <attribute name="name" value="multiselect" id="12719" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="12720" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="12721" addr="0x7fca469e4af0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469e9a70" id="12722" addr="0x7fca469e9a70" />
+                                <attribute name="kind" value="function" id="12723" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="multiselect" id="12724" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469e9f50" id="12725" addr="0x7fca469e9f50" />
+                                <attribute name="sym_nextSibling" value="0x7fca469e9f50" id="12726" addr="0x7fca469e9f50" />
+                                <attribute name="defaultargs" value="0x7fca469e9710" id="12727" addr="0x7fca469e9710" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>,int)." id="12728" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="12729" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469e9710" id="12730" addr="0x7fca469e9710" />
+                                <parmlist id="12731" addr="0x7fca469e9b10" >
                                     <parm id="12732">
-                                        <attributelist id="12733" addr="0x7f99f1e9bb10" >
-                                            <attribute name="name" value="heading" id="12734" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12735" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12733" addr="0x7fca469e9b10" >
+                                            <attribute name="name" value="heading" id="12734" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12735" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12736">
-                                        <attributelist id="12737" addr="0x7f99f1e9bbf0" >
-                                            <attribute name="name" value="options" id="12738" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>" id="12739" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12737" addr="0x7fca469e9bf0" >
+                                            <attribute name="name" value="options" id="12738" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>" id="12739" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12740">
-                                        <attributelist id="12741" addr="0x7f99f1e9bc70" >
-                                            <attribute name="name" value="autoclose" id="12742" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="0" id="12743" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="12744" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12741" addr="0x7fca469e9c70" >
+                                            <attribute name="name" value="autoclose" id="12742" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="0" id="12743" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="12744" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="std::unique_ptr&lt;(std::vector&lt;(int)>)>" id="12745" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_2" id="12746" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="std::unique_ptr&lt;(std::vector&lt;(int)>)>" id="12745" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_2" id="12746" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="12747" addr="0x7f99f1e9bf50" >
-                            <attributelist id="12748" addr="0x7f99f1e9bf50" >
-                                <attribute name="name" value="multiselect" id="12749" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="12750" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="12751" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e9bd30" id="12752" addr="0x7f99f1e9bd30" />
-                                <attribute name="kind" value="function" id="12753" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="multiselect" id="12754" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e9b710" id="12755" addr="0x7f99f1e9b710" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>)." id="12756" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="12757" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e9b710" id="12758" addr="0x7f99f1e9b710" />
-                                <parmlist id="12759" addr="0x7f99f1e9bdd0" >
+                        <cdecl id="12747" addr="0x7fca469e9f50" >
+                            <attributelist id="12748" addr="0x7fca469e9f50" >
+                                <attribute name="name" value="multiselect" id="12749" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="12750" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="12751" addr="0x7fca469e4af0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469e9d30" id="12752" addr="0x7fca469e9d30" />
+                                <attribute name="kind" value="function" id="12753" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="multiselect" id="12754" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469e9710" id="12755" addr="0x7fca469e9710" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>)." id="12756" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="12757" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469e9710" id="12758" addr="0x7fca469e9710" />
+                                <parmlist id="12759" addr="0x7fca469e9dd0" >
                                     <parm id="12760">
-                                        <attributelist id="12761" addr="0x7f99f1e9bdd0" >
-                                            <attribute name="name" value="heading" id="12762" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12763" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12761" addr="0x7fca469e9dd0" >
+                                            <attribute name="name" value="heading" id="12762" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12763" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12764">
-                                        <attributelist id="12765" addr="0x7f99f1e9beb0" >
-                                            <attribute name="name" value="options" id="12766" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>" id="12767" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12765" addr="0x7fca469e9eb0" >
+                                            <attribute name="name" value="options" id="12766" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>" id="12767" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="std::unique_ptr&lt;(std::vector&lt;(int)>)>" id="12768" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_3" id="12769" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="std::unique_ptr&lt;(std::vector&lt;(int)>)>" id="12768" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_3" id="12769" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="12770" addr="0x7f99f1e9c6d0" >
-                            <attributelist id="12771" addr="0x7f99f1e9c6d0" >
-                                <attribute name="name" value="ok" id="12772" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="12773" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="12774" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e9c990" id="12775" addr="0x7f99f1e9c990" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e9c990" id="12776" addr="0x7f99f1e9c990" />
-                                <attribute name="kind" value="function" id="12777" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="ok" id="12778" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="12779" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="12780" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e9c6d0" id="12781" addr="0x7f99f1e9c6d0" />
-                                <parmlist id="12782" addr="0x7f99f1e9c190" >
+                        <cdecl id="12770" addr="0x7fca469ea6d0" >
+                            <attributelist id="12771" addr="0x7fca469ea6d0" >
+                                <attribute name="name" value="ok" id="12772" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="12773" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="12774" addr="0x7fca469e4af0" />
+                                <attribute name="sym_nextSibling" value="0x7fca469ea990" id="12775" addr="0x7fca469ea990" />
+                                <attribute name="csym_nextSibling" value="0x7fca469ea990" id="12776" addr="0x7fca469ea990" />
+                                <attribute name="kind" value="function" id="12777" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="ok" id="12778" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="12779" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="12780" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469ea6d0" id="12781" addr="0x7fca469ea6d0" />
+                                <parmlist id="12782" addr="0x7fca469ea190" >
                                     <parm id="12783">
-                                        <attributelist id="12784" addr="0x7f99f1e9c190" >
-                                            <attribute name="name" value="heading" id="12785" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12786" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12784" addr="0x7fca469ea190" >
+                                            <attribute name="name" value="heading" id="12785" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12786" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12787">
-                                        <attributelist id="12788" addr="0x7f99f1e9c2d0" >
-                                            <attribute name="name" value="line1" id="12789" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12790" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12788" addr="0x7fca469ea2d0" >
+                                            <attribute name="name" value="line1" id="12789" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12790" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12791">
-                                        <attributelist id="12792" addr="0x7f99f1e9c470" >
-                                            <attribute name="name" value="line2" id="12793" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="12794" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12795" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12792" addr="0x7fca469ea470" >
+                                            <attribute name="name" value="line2" id="12793" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="12794" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12795" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12796">
-                                        <attributelist id="12797" addr="0x7f99f1e9c610" >
-                                            <attribute name="name" value="line3" id="12798" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="12799" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12800" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12797" addr="0x7fca469ea610" >
+                                            <attribute name="name" value="line3" id="12798" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="12799" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12800" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="bool" id="12801" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="12802" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="bool" id="12801" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="12802" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="12803" addr="0x7f99f1e9c990" >
-                            <attributelist id="12804" addr="0x7f99f1e9c990" >
-                                <attribute name="name" value="ok" id="12805" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="12806" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="12807" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e9c6d0" id="12808" addr="0x7f99f1e9c6d0" />
-                                <attribute name="kind" value="function" id="12809" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="ok" id="12810" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1e9cbb0" id="12811" addr="0x7f99f1e9cbb0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1e9cbb0" id="12812" addr="0x7f99f1e9cbb0" />
-                                <attribute name="defaultargs" value="0x7f99f1e9c6d0" id="12813" addr="0x7f99f1e9c6d0" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="12814" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="12815" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e9c6d0" id="12816" addr="0x7f99f1e9c6d0" />
-                                <parmlist id="12817" addr="0x7f99f1e9c770" >
+                        <cdecl id="12803" addr="0x7fca469ea990" >
+                            <attributelist id="12804" addr="0x7fca469ea990" >
+                                <attribute name="name" value="ok" id="12805" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="12806" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="12807" addr="0x7fca469e4af0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469ea6d0" id="12808" addr="0x7fca469ea6d0" />
+                                <attribute name="kind" value="function" id="12809" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="ok" id="12810" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469eabb0" id="12811" addr="0x7fca469eabb0" />
+                                <attribute name="sym_nextSibling" value="0x7fca469eabb0" id="12812" addr="0x7fca469eabb0" />
+                                <attribute name="defaultargs" value="0x7fca469ea6d0" id="12813" addr="0x7fca469ea6d0" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="12814" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="12815" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469ea6d0" id="12816" addr="0x7fca469ea6d0" />
+                                <parmlist id="12817" addr="0x7fca469ea770" >
                                     <parm id="12818">
-                                        <attributelist id="12819" addr="0x7f99f1e9c770" >
-                                            <attribute name="name" value="heading" id="12820" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12821" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12819" addr="0x7fca469ea770" >
+                                            <attribute name="name" value="heading" id="12820" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12821" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12822">
-                                        <attributelist id="12823" addr="0x7f99f1e9c850" >
-                                            <attribute name="name" value="line1" id="12824" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12825" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12823" addr="0x7fca469ea850" >
+                                            <attribute name="name" value="line1" id="12824" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12825" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12826">
-                                        <attributelist id="12827" addr="0x7f99f1e9c8d0" >
-                                            <attribute name="name" value="line2" id="12828" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="12829" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12830" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12827" addr="0x7fca469ea8d0" >
+                                            <attribute name="name" value="line2" id="12828" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="12829" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12830" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="bool" id="12831" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="12832" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="bool" id="12831" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="12832" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="12833" addr="0x7f99f1e9cbb0" >
-                            <attributelist id="12834" addr="0x7f99f1e9cbb0" >
-                                <attribute name="name" value="ok" id="12835" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="12836" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="12837" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1e9c990" id="12838" addr="0x7f99f1e9c990" />
-                                <attribute name="kind" value="function" id="12839" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="ok" id="12840" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1e9c6d0" id="12841" addr="0x7f99f1e9c6d0" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="12842" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="12843" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1e9c6d0" id="12844" addr="0x7f99f1e9c6d0" />
-                                <parmlist id="12845" addr="0x7f99f1e9ca30" >
+                        <cdecl id="12833" addr="0x7fca469eabb0" >
+                            <attributelist id="12834" addr="0x7fca469eabb0" >
+                                <attribute name="name" value="ok" id="12835" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="12836" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="12837" addr="0x7fca469e4af0" />
+                                <attribute name="sym_previousSibling" value="0x7fca469ea990" id="12838" addr="0x7fca469ea990" />
+                                <attribute name="kind" value="function" id="12839" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="ok" id="12840" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469ea6d0" id="12841" addr="0x7fca469ea6d0" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="12842" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="12843" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469ea6d0" id="12844" addr="0x7fca469ea6d0" />
+                                <parmlist id="12845" addr="0x7fca469eaa30" >
                                     <parm id="12846">
-                                        <attributelist id="12847" addr="0x7f99f1e9ca30" >
-                                            <attribute name="name" value="heading" id="12848" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12849" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12847" addr="0x7fca469eaa30" >
+                                            <attribute name="name" value="heading" id="12848" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12849" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12850">
-                                        <attributelist id="12851" addr="0x7f99f1e9cb10" >
-                                            <attribute name="name" value="line1" id="12852" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12853" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12851" addr="0x7fca469eab10" >
+                                            <attribute name="name" value="line1" id="12852" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12853" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="bool" id="12854" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_2" id="12855" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="bool" id="12854" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_2" id="12855" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="12856" addr="0x7f99f1d9c130" >
-                            <attributelist id="12857" addr="0x7f99f1d9c130" >
-                                <attribute name="name" value="textviewer" id="12858" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="12859" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="12860" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1d9c350" id="12861" addr="0x7f99f1d9c350" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1d9c350" id="12862" addr="0x7f99f1d9c350" />
-                                <attribute name="kind" value="function" id="12863" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="textviewer" id="12864" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,bool)." id="12865" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="12866" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1d9c130" id="12867" addr="0x7f99f1d9c130" />
-                                <parmlist id="12868" addr="0x7f99f1e9cdf0" >
+                        <cdecl id="12856" addr="0x7fca468ea130" >
+                            <attributelist id="12857" addr="0x7fca468ea130" >
+                                <attribute name="name" value="textviewer" id="12858" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="12859" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="12860" addr="0x7fca469e4af0" />
+                                <attribute name="sym_nextSibling" value="0x7fca468ea350" id="12861" addr="0x7fca468ea350" />
+                                <attribute name="csym_nextSibling" value="0x7fca468ea350" id="12862" addr="0x7fca468ea350" />
+                                <attribute name="kind" value="function" id="12863" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="textviewer" id="12864" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,bool)." id="12865" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="12866" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468ea130" id="12867" addr="0x7fca468ea130" />
+                                <parmlist id="12868" addr="0x7fca469eadf0" >
                                     <parm id="12869">
-                                        <attributelist id="12870" addr="0x7f99f1e9cdf0" >
-                                            <attribute name="name" value="heading" id="12871" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12872" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12870" addr="0x7fca469eadf0" >
+                                            <attribute name="name" value="heading" id="12871" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12872" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12873">
-                                        <attributelist id="12874" addr="0x7f99f1e9cf30" >
-                                            <attribute name="name" value="text" id="12875" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12876" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12874" addr="0x7fca469eaf30" >
+                                            <attribute name="name" value="text" id="12875" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12876" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12877">
-                                        <attributelist id="12878" addr="0x7f99f1d9c070" >
-                                            <attribute name="name" value="usemono" id="12879" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="false" id="12880" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="12881" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12878" addr="0x7fca468ea070" >
+                                            <attribute name="name" value="usemono" id="12879" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="false" id="12880" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="12881" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="12882" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="12883" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="12882" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="12883" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="12884" addr="0x7f99f1d9c350" >
-                            <attributelist id="12885" addr="0x7f99f1d9c350" >
-                                <attribute name="name" value="textviewer" id="12886" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="12887" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="12888" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1d9c130" id="12889" addr="0x7f99f1d9c130" />
-                                <attribute name="kind" value="function" id="12890" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="textviewer" id="12891" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1d9c130" id="12892" addr="0x7f99f1d9c130" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="12893" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="12894" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1d9c130" id="12895" addr="0x7f99f1d9c130" />
-                                <parmlist id="12896" addr="0x7f99f1d9c1d0" >
+                        <cdecl id="12884" addr="0x7fca468ea350" >
+                            <attributelist id="12885" addr="0x7fca468ea350" >
+                                <attribute name="name" value="textviewer" id="12886" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="12887" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="12888" addr="0x7fca469e4af0" />
+                                <attribute name="sym_previousSibling" value="0x7fca468ea130" id="12889" addr="0x7fca468ea130" />
+                                <attribute name="kind" value="function" id="12890" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="textviewer" id="12891" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca468ea130" id="12892" addr="0x7fca468ea130" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="12893" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="12894" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468ea130" id="12895" addr="0x7fca468ea130" />
+                                <parmlist id="12896" addr="0x7fca468ea1d0" >
                                     <parm id="12897">
-                                        <attributelist id="12898" addr="0x7f99f1d9c1d0" >
-                                            <attribute name="name" value="heading" id="12899" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12900" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12898" addr="0x7fca468ea1d0" >
+                                            <attribute name="name" value="heading" id="12899" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12900" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12901">
-                                        <attributelist id="12902" addr="0x7f99f1d9c2b0" >
-                                            <attribute name="name" value="text" id="12903" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12904" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12902" addr="0x7fca468ea2b0" >
+                                            <attribute name="name" value="text" id="12903" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12904" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="12905" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="12906" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="12905" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="12906" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="12907" addr="0x7f99f1d9d270" >
-                            <attributelist id="12908" addr="0x7f99f1d9d270" >
-                                <attribute name="name" value="browse" id="12909" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="12910" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="12911" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1d9d790" id="12912" addr="0x7f99f1d9d790" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1d9d790" id="12913" addr="0x7f99f1d9d790" />
-                                <attribute name="kind" value="function" id="12914" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="browse" id="12915" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,bool,bool,r.q(const).XBMCAddon::String,bool)." id="12916" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="12917" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1d9d270" id="12918" addr="0x7f99f1d9d270" />
-                                <parmlist id="12919" addr="0x7f99f1d9c790" >
+                        <cdecl id="12907" addr="0x7fca468eb270" >
+                            <attributelist id="12908" addr="0x7fca468eb270" >
+                                <attribute name="name" value="browse" id="12909" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="12910" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="12911" addr="0x7fca469e4af0" />
+                                <attribute name="sym_nextSibling" value="0x7fca468eb790" id="12912" addr="0x7fca468eb790" />
+                                <attribute name="csym_nextSibling" value="0x7fca468eb790" id="12913" addr="0x7fca468eb790" />
+                                <attribute name="kind" value="function" id="12914" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="browse" id="12915" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,bool,bool,r.q(const).XBMCAddon::String,bool)." id="12916" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="12917" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468eb270" id="12918" addr="0x7fca468eb270" />
+                                <parmlist id="12919" addr="0x7fca468ea790" >
                                     <parm id="12920">
-                                        <attributelist id="12921" addr="0x7f99f1d9c790" >
-                                            <attribute name="name" value="type" id="12922" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="12923" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12921" addr="0x7fca468ea790" >
+                                            <attribute name="name" value="type" id="12922" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="12923" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12924">
-                                        <attributelist id="12925" addr="0x7f99f1d9c970" >
-                                            <attribute name="name" value="heading" id="12926" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12927" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12925" addr="0x7fca468ea970" >
+                                            <attribute name="name" value="heading" id="12926" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12927" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12928">
-                                        <attributelist id="12929" addr="0x7f99f1d9cab0" >
-                                            <attribute name="name" value="shares" id="12930" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12931" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12929" addr="0x7fca468eaab0" >
+                                            <attribute name="name" value="shares" id="12930" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12931" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12932">
-                                        <attributelist id="12933" addr="0x7f99f1d9cc50" >
-                                            <attribute name="name" value="mask" id="12934" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="12935" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12936" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12933" addr="0x7fca468eac50" >
+                                            <attribute name="name" value="mask" id="12934" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="12935" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12936" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12937">
-                                        <attributelist id="12938" addr="0x7f99f1d9cd90" >
-                                            <attribute name="name" value="useThumbs" id="12939" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="false" id="12940" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="12941" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12938" addr="0x7fca468ead90" >
+                                            <attribute name="name" value="useThumbs" id="12939" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="false" id="12940" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="12941" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12942">
-                                        <attributelist id="12943" addr="0x7f99f1d9ced0" >
-                                            <attribute name="name" value="treatAsFolder" id="12944" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="false" id="12945" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="12946" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12943" addr="0x7fca468eaed0" >
+                                            <attribute name="name" value="treatAsFolder" id="12944" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="false" id="12945" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="12946" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12947">
-                                        <attributelist id="12948" addr="0x7f99f1d9d070" >
-                                            <attribute name="name" value="defaultt" id="12949" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="12950" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12951" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12948" addr="0x7fca468eb070" >
+                                            <attribute name="name" value="defaultt" id="12949" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="12950" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12951" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12952">
-                                        <attributelist id="12953" addr="0x7f99f1d9d1b0" >
-                                            <attribute name="name" value="enableMultiple" id="12954" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="false" id="12955" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="12956" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12953" addr="0x7fca468eb1b0" >
+                                            <attribute name="name" value="enableMultiple" id="12954" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="false" id="12955" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="12956" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="Alternative&lt;(XBMCAddon::String,std::vector&lt;(XBMCAddon::String)>)>" id="12957" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="12958" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="Alternative&lt;(XBMCAddon::String,std::vector&lt;(XBMCAddon::String)>)>" id="12957" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="12958" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="12959" addr="0x7f99f1d9d790" >
-                            <attributelist id="12960" addr="0x7f99f1d9d790" >
-                                <attribute name="name" value="browse" id="12961" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="12962" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="12963" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1d9d270" id="12964" addr="0x7f99f1d9d270" />
-                                <attribute name="kind" value="function" id="12965" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="browse" id="12966" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1d9dc10" id="12967" addr="0x7f99f1d9dc10" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1d9dc10" id="12968" addr="0x7f99f1d9dc10" />
-                                <attribute name="defaultargs" value="0x7f99f1d9d270" id="12969" addr="0x7f99f1d9d270" />
-                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,bool,bool,r.q(const).XBMCAddon::String)." id="12970" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="12971" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1d9d270" id="12972" addr="0x7f99f1d9d270" />
-                                <parmlist id="12973" addr="0x7f99f1d9d310" >
+                        <cdecl id="12959" addr="0x7fca468eb790" >
+                            <attributelist id="12960" addr="0x7fca468eb790" >
+                                <attribute name="name" value="browse" id="12961" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="12962" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="12963" addr="0x7fca469e4af0" />
+                                <attribute name="sym_previousSibling" value="0x7fca468eb270" id="12964" addr="0x7fca468eb270" />
+                                <attribute name="kind" value="function" id="12965" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="browse" id="12966" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca468ebc10" id="12967" addr="0x7fca468ebc10" />
+                                <attribute name="sym_nextSibling" value="0x7fca468ebc10" id="12968" addr="0x7fca468ebc10" />
+                                <attribute name="defaultargs" value="0x7fca468eb270" id="12969" addr="0x7fca468eb270" />
+                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,bool,bool,r.q(const).XBMCAddon::String)." id="12970" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="12971" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468eb270" id="12972" addr="0x7fca468eb270" />
+                                <parmlist id="12973" addr="0x7fca468eb310" >
                                     <parm id="12974">
-                                        <attributelist id="12975" addr="0x7f99f1d9d310" >
-                                            <attribute name="name" value="type" id="12976" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="12977" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12975" addr="0x7fca468eb310" >
+                                            <attribute name="name" value="type" id="12976" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="12977" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12978">
-                                        <attributelist id="12979" addr="0x7f99f1d9d3f0" >
-                                            <attribute name="name" value="heading" id="12980" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12981" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12979" addr="0x7fca468eb3f0" >
+                                            <attribute name="name" value="heading" id="12980" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12981" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12982">
-                                        <attributelist id="12983" addr="0x7f99f1d9d470" >
-                                            <attribute name="name" value="shares" id="12984" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12985" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12983" addr="0x7fca468eb470" >
+                                            <attribute name="name" value="shares" id="12984" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12985" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12986">
-                                        <attributelist id="12987" addr="0x7f99f1d9d4f0" >
-                                            <attribute name="name" value="mask" id="12988" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="12989" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12990" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12987" addr="0x7fca468eb4f0" >
+                                            <attribute name="name" value="mask" id="12988" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="12989" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="12990" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12991">
-                                        <attributelist id="12992" addr="0x7f99f1d9d590" >
-                                            <attribute name="name" value="useThumbs" id="12993" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="false" id="12994" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="12995" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12992" addr="0x7fca468eb590" >
+                                            <attribute name="name" value="useThumbs" id="12993" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="false" id="12994" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="12995" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="12996">
-                                        <attributelist id="12997" addr="0x7f99f1d9d630" >
-                                            <attribute name="name" value="treatAsFolder" id="12998" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="false" id="12999" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="13000" addr="0x7f99f1de6c90" />
+                                        <attributelist id="12997" addr="0x7fca468eb630" >
+                                            <attribute name="name" value="treatAsFolder" id="12998" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="false" id="12999" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="13000" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13001">
-                                        <attributelist id="13002" addr="0x7f99f1d9d6d0" >
-                                            <attribute name="name" value="defaultt" id="13003" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="13004" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13005" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13002" addr="0x7fca468eb6d0" >
+                                            <attribute name="name" value="defaultt" id="13003" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="13004" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13005" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="Alternative&lt;(XBMCAddon::String,std::vector&lt;(XBMCAddon::String)>)>" id="13006" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="13007" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="Alternative&lt;(XBMCAddon::String,std::vector&lt;(XBMCAddon::String)>)>" id="13006" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="13007" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="13008" addr="0x7f99f1d9dc10" >
-                            <attributelist id="13009" addr="0x7f99f1d9dc10" >
-                                <attribute name="name" value="browse" id="13010" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="13011" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="13012" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1d9d790" id="13013" addr="0x7f99f1d9d790" />
-                                <attribute name="kind" value="function" id="13014" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="browse" id="13015" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1d9dff0" id="13016" addr="0x7f99f1d9dff0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1d9dff0" id="13017" addr="0x7f99f1d9dff0" />
-                                <attribute name="defaultargs" value="0x7f99f1d9d270" id="13018" addr="0x7f99f1d9d270" />
-                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,bool,bool)." id="13019" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="13020" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1d9d270" id="13021" addr="0x7f99f1d9d270" />
-                                <parmlist id="13022" addr="0x7f99f1d9d830" >
+                        <cdecl id="13008" addr="0x7fca468ebc10" >
+                            <attributelist id="13009" addr="0x7fca468ebc10" >
+                                <attribute name="name" value="browse" id="13010" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="13011" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="13012" addr="0x7fca469e4af0" />
+                                <attribute name="sym_previousSibling" value="0x7fca468eb790" id="13013" addr="0x7fca468eb790" />
+                                <attribute name="kind" value="function" id="13014" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="browse" id="13015" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca468ebff0" id="13016" addr="0x7fca468ebff0" />
+                                <attribute name="sym_nextSibling" value="0x7fca468ebff0" id="13017" addr="0x7fca468ebff0" />
+                                <attribute name="defaultargs" value="0x7fca468eb270" id="13018" addr="0x7fca468eb270" />
+                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,bool,bool)." id="13019" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="13020" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468eb270" id="13021" addr="0x7fca468eb270" />
+                                <parmlist id="13022" addr="0x7fca468eb830" >
                                     <parm id="13023">
-                                        <attributelist id="13024" addr="0x7f99f1d9d830" >
-                                            <attribute name="name" value="type" id="13025" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="13026" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13024" addr="0x7fca468eb830" >
+                                            <attribute name="name" value="type" id="13025" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="13026" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13027">
-                                        <attributelist id="13028" addr="0x7f99f1d9d910" >
-                                            <attribute name="name" value="heading" id="13029" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13030" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13028" addr="0x7fca468eb910" >
+                                            <attribute name="name" value="heading" id="13029" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13030" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13031">
-                                        <attributelist id="13032" addr="0x7f99f1d9d990" >
-                                            <attribute name="name" value="shares" id="13033" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13034" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13032" addr="0x7fca468eb990" >
+                                            <attribute name="name" value="shares" id="13033" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13034" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13035">
-                                        <attributelist id="13036" addr="0x7f99f1d9da10" >
-                                            <attribute name="name" value="mask" id="13037" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="13038" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13039" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13036" addr="0x7fca468eba10" >
+                                            <attribute name="name" value="mask" id="13037" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="13038" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13039" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13040">
-                                        <attributelist id="13041" addr="0x7f99f1d9dab0" >
-                                            <attribute name="name" value="useThumbs" id="13042" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="false" id="13043" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="13044" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13041" addr="0x7fca468ebab0" >
+                                            <attribute name="name" value="useThumbs" id="13042" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="false" id="13043" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="13044" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13045">
-                                        <attributelist id="13046" addr="0x7f99f1d9db50" >
-                                            <attribute name="name" value="treatAsFolder" id="13047" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="false" id="13048" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="13049" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13046" addr="0x7fca468ebb50" >
+                                            <attribute name="name" value="treatAsFolder" id="13047" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="false" id="13048" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="13049" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="Alternative&lt;(XBMCAddon::String,std::vector&lt;(XBMCAddon::String)>)>" id="13050" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_2" id="13051" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="Alternative&lt;(XBMCAddon::String,std::vector&lt;(XBMCAddon::String)>)>" id="13050" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_2" id="13051" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="13052" addr="0x7f99f1d9dff0" >
-                            <attributelist id="13053" addr="0x7f99f1d9dff0" >
-                                <attribute name="name" value="browse" id="13054" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="13055" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="13056" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1d9dc10" id="13057" addr="0x7f99f1d9dc10" />
-                                <attribute name="kind" value="function" id="13058" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="browse" id="13059" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1d9e330" id="13060" addr="0x7f99f1d9e330" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1d9e330" id="13061" addr="0x7f99f1d9e330" />
-                                <attribute name="defaultargs" value="0x7f99f1d9d270" id="13062" addr="0x7f99f1d9d270" />
-                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,bool)." id="13063" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="13064" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1d9d270" id="13065" addr="0x7f99f1d9d270" />
-                                <parmlist id="13066" addr="0x7f99f1d9dcb0" >
+                        <cdecl id="13052" addr="0x7fca468ebff0" >
+                            <attributelist id="13053" addr="0x7fca468ebff0" >
+                                <attribute name="name" value="browse" id="13054" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="13055" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="13056" addr="0x7fca469e4af0" />
+                                <attribute name="sym_previousSibling" value="0x7fca468ebc10" id="13057" addr="0x7fca468ebc10" />
+                                <attribute name="kind" value="function" id="13058" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="browse" id="13059" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca468ec330" id="13060" addr="0x7fca468ec330" />
+                                <attribute name="sym_nextSibling" value="0x7fca468ec330" id="13061" addr="0x7fca468ec330" />
+                                <attribute name="defaultargs" value="0x7fca468eb270" id="13062" addr="0x7fca468eb270" />
+                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,bool)." id="13063" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="13064" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468eb270" id="13065" addr="0x7fca468eb270" />
+                                <parmlist id="13066" addr="0x7fca468ebcb0" >
                                     <parm id="13067">
-                                        <attributelist id="13068" addr="0x7f99f1d9dcb0" >
-                                            <attribute name="name" value="type" id="13069" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="13070" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13068" addr="0x7fca468ebcb0" >
+                                            <attribute name="name" value="type" id="13069" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="13070" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13071">
-                                        <attributelist id="13072" addr="0x7f99f1d9dd90" >
-                                            <attribute name="name" value="heading" id="13073" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13074" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13072" addr="0x7fca468ebd90" >
+                                            <attribute name="name" value="heading" id="13073" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13074" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13075">
-                                        <attributelist id="13076" addr="0x7f99f1d9de10" >
-                                            <attribute name="name" value="shares" id="13077" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13078" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13076" addr="0x7fca468ebe10" >
+                                            <attribute name="name" value="shares" id="13077" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13078" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13079">
-                                        <attributelist id="13080" addr="0x7f99f1d9de90" >
-                                            <attribute name="name" value="mask" id="13081" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="13082" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13083" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13080" addr="0x7fca468ebe90" >
+                                            <attribute name="name" value="mask" id="13081" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="13082" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13083" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13084">
-                                        <attributelist id="13085" addr="0x7f99f1d9df30" >
-                                            <attribute name="name" value="useThumbs" id="13086" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="false" id="13087" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="13088" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13085" addr="0x7fca468ebf30" >
+                                            <attribute name="name" value="useThumbs" id="13086" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="false" id="13087" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="13088" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="Alternative&lt;(XBMCAddon::String,std::vector&lt;(XBMCAddon::String)>)>" id="13089" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_3" id="13090" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="Alternative&lt;(XBMCAddon::String,std::vector&lt;(XBMCAddon::String)>)>" id="13089" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_3" id="13090" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="13091" addr="0x7f99f1d9e330" >
-                            <attributelist id="13092" addr="0x7f99f1d9e330" >
-                                <attribute name="name" value="browse" id="13093" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="13094" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="13095" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1d9dff0" id="13096" addr="0x7f99f1d9dff0" />
-                                <attribute name="kind" value="function" id="13097" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="browse" id="13098" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1d9e5d0" id="13099" addr="0x7f99f1d9e5d0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1d9e5d0" id="13100" addr="0x7f99f1d9e5d0" />
-                                <attribute name="defaultargs" value="0x7f99f1d9d270" id="13101" addr="0x7f99f1d9d270" />
-                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="13102" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="13103" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1d9d270" id="13104" addr="0x7f99f1d9d270" />
-                                <parmlist id="13105" addr="0x7f99f1d9e090" >
+                        <cdecl id="13091" addr="0x7fca468ec330" >
+                            <attributelist id="13092" addr="0x7fca468ec330" >
+                                <attribute name="name" value="browse" id="13093" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="13094" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="13095" addr="0x7fca469e4af0" />
+                                <attribute name="sym_previousSibling" value="0x7fca468ebff0" id="13096" addr="0x7fca468ebff0" />
+                                <attribute name="kind" value="function" id="13097" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="browse" id="13098" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca468ec5d0" id="13099" addr="0x7fca468ec5d0" />
+                                <attribute name="sym_nextSibling" value="0x7fca468ec5d0" id="13100" addr="0x7fca468ec5d0" />
+                                <attribute name="defaultargs" value="0x7fca468eb270" id="13101" addr="0x7fca468eb270" />
+                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="13102" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="13103" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468eb270" id="13104" addr="0x7fca468eb270" />
+                                <parmlist id="13105" addr="0x7fca468ec090" >
                                     <parm id="13106">
-                                        <attributelist id="13107" addr="0x7f99f1d9e090" >
-                                            <attribute name="name" value="type" id="13108" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="13109" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13107" addr="0x7fca468ec090" >
+                                            <attribute name="name" value="type" id="13108" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="13109" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13110">
-                                        <attributelist id="13111" addr="0x7f99f1d9e170" >
-                                            <attribute name="name" value="heading" id="13112" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13113" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13111" addr="0x7fca468ec170" >
+                                            <attribute name="name" value="heading" id="13112" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13113" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13114">
-                                        <attributelist id="13115" addr="0x7f99f1d9e1f0" >
-                                            <attribute name="name" value="shares" id="13116" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13117" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13115" addr="0x7fca468ec1f0" >
+                                            <attribute name="name" value="shares" id="13116" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13117" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13118">
-                                        <attributelist id="13119" addr="0x7f99f1d9e270" >
-                                            <attribute name="name" value="mask" id="13120" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="13121" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13122" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13119" addr="0x7fca468ec270" >
+                                            <attribute name="name" value="mask" id="13120" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="13121" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13122" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="Alternative&lt;(XBMCAddon::String,std::vector&lt;(XBMCAddon::String)>)>" id="13123" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_4" id="13124" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="Alternative&lt;(XBMCAddon::String,std::vector&lt;(XBMCAddon::String)>)>" id="13123" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_4" id="13124" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="13125" addr="0x7f99f1d9e5d0" >
-                            <attributelist id="13126" addr="0x7f99f1d9e5d0" >
-                                <attribute name="name" value="browse" id="13127" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="13128" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="13129" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1d9e330" id="13130" addr="0x7f99f1d9e330" />
-                                <attribute name="kind" value="function" id="13131" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="browse" id="13132" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1d9d270" id="13133" addr="0x7f99f1d9d270" />
-                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="13134" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="13135" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1d9d270" id="13136" addr="0x7f99f1d9d270" />
-                                <parmlist id="13137" addr="0x7f99f1d9e3d0" >
+                        <cdecl id="13125" addr="0x7fca468ec5d0" >
+                            <attributelist id="13126" addr="0x7fca468ec5d0" >
+                                <attribute name="name" value="browse" id="13127" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="13128" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="13129" addr="0x7fca469e4af0" />
+                                <attribute name="sym_previousSibling" value="0x7fca468ec330" id="13130" addr="0x7fca468ec330" />
+                                <attribute name="kind" value="function" id="13131" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="browse" id="13132" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca468eb270" id="13133" addr="0x7fca468eb270" />
+                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="13134" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="13135" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468eb270" id="13136" addr="0x7fca468eb270" />
+                                <parmlist id="13137" addr="0x7fca468ec3d0" >
                                     <parm id="13138">
-                                        <attributelist id="13139" addr="0x7f99f1d9e3d0" >
-                                            <attribute name="name" value="type" id="13140" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="13141" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13139" addr="0x7fca468ec3d0" >
+                                            <attribute name="name" value="type" id="13140" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="13141" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13142">
-                                        <attributelist id="13143" addr="0x7f99f1d9e4b0" >
-                                            <attribute name="name" value="heading" id="13144" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13145" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13143" addr="0x7fca468ec4b0" >
+                                            <attribute name="name" value="heading" id="13144" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13145" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13146">
-                                        <attributelist id="13147" addr="0x7f99f1d9e530" >
-                                            <attribute name="name" value="shares" id="13148" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13149" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13147" addr="0x7fca468ec530" >
+                                            <attribute name="name" value="shares" id="13148" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13149" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="Alternative&lt;(XBMCAddon::String,std::vector&lt;(XBMCAddon::String)>)>" id="13150" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_5" id="13151" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="Alternative&lt;(XBMCAddon::String,std::vector&lt;(XBMCAddon::String)>)>" id="13150" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_5" id="13151" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="13152" addr="0x7f99f1d9f110" >
-                            <attributelist id="13153" addr="0x7f99f1d9f110" >
-                                <attribute name="name" value="browseSingle" id="13154" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="13155" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="13156" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1d9f590" id="13157" addr="0x7f99f1d9f590" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1d9f590" id="13158" addr="0x7f99f1d9f590" />
-                                <attribute name="kind" value="function" id="13159" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="browseSingle" id="13160" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,bool,bool,r.q(const).XBMCAddon::String)." id="13161" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="13162" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1d9f110" id="13163" addr="0x7f99f1d9f110" />
-                                <parmlist id="13164" addr="0x7f99f1d9e810" >
+                        <cdecl id="13152" addr="0x7fca468ed110" >
+                            <attributelist id="13153" addr="0x7fca468ed110" >
+                                <attribute name="name" value="browseSingle" id="13154" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="13155" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="13156" addr="0x7fca469e4af0" />
+                                <attribute name="sym_nextSibling" value="0x7fca468ed590" id="13157" addr="0x7fca468ed590" />
+                                <attribute name="csym_nextSibling" value="0x7fca468ed590" id="13158" addr="0x7fca468ed590" />
+                                <attribute name="kind" value="function" id="13159" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="browseSingle" id="13160" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,bool,bool,r.q(const).XBMCAddon::String)." id="13161" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="13162" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468ed110" id="13163" addr="0x7fca468ed110" />
+                                <parmlist id="13164" addr="0x7fca468ec810" >
                                     <parm id="13165">
-                                        <attributelist id="13166" addr="0x7f99f1d9e810" >
-                                            <attribute name="name" value="type" id="13167" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="13168" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13166" addr="0x7fca468ec810" >
+                                            <attribute name="name" value="type" id="13167" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="13168" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13169">
-                                        <attributelist id="13170" addr="0x7f99f1d9e950" >
-                                            <attribute name="name" value="heading" id="13171" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13172" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13170" addr="0x7fca468ec950" >
+                                            <attribute name="name" value="heading" id="13171" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13172" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13173">
-                                        <attributelist id="13174" addr="0x7f99f1d9ea90" >
-                                            <attribute name="name" value="shares" id="13175" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13176" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13174" addr="0x7fca468eca90" >
+                                            <attribute name="name" value="shares" id="13175" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13176" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13177">
-                                        <attributelist id="13178" addr="0x7f99f1d9ec30" >
-                                            <attribute name="name" value="mask" id="13179" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="13180" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13181" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13178" addr="0x7fca468ecc30" >
+                                            <attribute name="name" value="mask" id="13179" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="13180" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13181" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13182">
-                                        <attributelist id="13183" addr="0x7f99f1d9ed70" >
-                                            <attribute name="name" value="useThumbs" id="13184" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="false" id="13185" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="13186" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13183" addr="0x7fca468ecd70" >
+                                            <attribute name="name" value="useThumbs" id="13184" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="false" id="13185" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="13186" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13187">
-                                        <attributelist id="13188" addr="0x7f99f1d9eeb0" >
-                                            <attribute name="name" value="treatAsFolder" id="13189" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="false" id="13190" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="13191" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13188" addr="0x7fca468eceb0" >
+                                            <attribute name="name" value="treatAsFolder" id="13189" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="false" id="13190" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="13191" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13192">
-                                        <attributelist id="13193" addr="0x7f99f1d9f050" >
-                                            <attribute name="name" value="defaultt" id="13194" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="13195" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13196" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13193" addr="0x7fca468ed050" >
+                                            <attribute name="name" value="defaultt" id="13194" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="13195" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13196" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="XBMCAddon::String" id="13197" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="13198" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="XBMCAddon::String" id="13197" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="13198" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="13199" addr="0x7f99f1d9f590" >
-                            <attributelist id="13200" addr="0x7f99f1d9f590" >
-                                <attribute name="name" value="browseSingle" id="13201" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="13202" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="13203" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1d9f110" id="13204" addr="0x7f99f1d9f110" />
-                                <attribute name="kind" value="function" id="13205" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="browseSingle" id="13206" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1d9f970" id="13207" addr="0x7f99f1d9f970" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1d9f970" id="13208" addr="0x7f99f1d9f970" />
-                                <attribute name="defaultargs" value="0x7f99f1d9f110" id="13209" addr="0x7f99f1d9f110" />
-                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,bool,bool)." id="13210" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="13211" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1d9f110" id="13212" addr="0x7f99f1d9f110" />
-                                <parmlist id="13213" addr="0x7f99f1d9f1b0" >
+                        <cdecl id="13199" addr="0x7fca468ed590" >
+                            <attributelist id="13200" addr="0x7fca468ed590" >
+                                <attribute name="name" value="browseSingle" id="13201" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="13202" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="13203" addr="0x7fca469e4af0" />
+                                <attribute name="sym_previousSibling" value="0x7fca468ed110" id="13204" addr="0x7fca468ed110" />
+                                <attribute name="kind" value="function" id="13205" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="browseSingle" id="13206" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca468ed970" id="13207" addr="0x7fca468ed970" />
+                                <attribute name="sym_nextSibling" value="0x7fca468ed970" id="13208" addr="0x7fca468ed970" />
+                                <attribute name="defaultargs" value="0x7fca468ed110" id="13209" addr="0x7fca468ed110" />
+                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,bool,bool)." id="13210" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="13211" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468ed110" id="13212" addr="0x7fca468ed110" />
+                                <parmlist id="13213" addr="0x7fca468ed1b0" >
                                     <parm id="13214">
-                                        <attributelist id="13215" addr="0x7f99f1d9f1b0" >
-                                            <attribute name="name" value="type" id="13216" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="13217" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13215" addr="0x7fca468ed1b0" >
+                                            <attribute name="name" value="type" id="13216" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="13217" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13218">
-                                        <attributelist id="13219" addr="0x7f99f1d9f290" >
-                                            <attribute name="name" value="heading" id="13220" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13221" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13219" addr="0x7fca468ed290" >
+                                            <attribute name="name" value="heading" id="13220" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13221" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13222">
-                                        <attributelist id="13223" addr="0x7f99f1d9f310" >
-                                            <attribute name="name" value="shares" id="13224" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13225" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13223" addr="0x7fca468ed310" >
+                                            <attribute name="name" value="shares" id="13224" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13225" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13226">
-                                        <attributelist id="13227" addr="0x7f99f1d9f390" >
-                                            <attribute name="name" value="mask" id="13228" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="13229" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13230" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13227" addr="0x7fca468ed390" >
+                                            <attribute name="name" value="mask" id="13228" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="13229" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13230" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13231">
-                                        <attributelist id="13232" addr="0x7f99f1d9f430" >
-                                            <attribute name="name" value="useThumbs" id="13233" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="false" id="13234" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="13235" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13232" addr="0x7fca468ed430" >
+                                            <attribute name="name" value="useThumbs" id="13233" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="false" id="13234" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="13235" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13236">
-                                        <attributelist id="13237" addr="0x7f99f1d9f4d0" >
-                                            <attribute name="name" value="treatAsFolder" id="13238" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="false" id="13239" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="13240" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13237" addr="0x7fca468ed4d0" >
+                                            <attribute name="name" value="treatAsFolder" id="13238" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="false" id="13239" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="13240" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="XBMCAddon::String" id="13241" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="13242" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="XBMCAddon::String" id="13241" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="13242" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="13243" addr="0x7f99f1d9f970" >
-                            <attributelist id="13244" addr="0x7f99f1d9f970" >
-                                <attribute name="name" value="browseSingle" id="13245" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="13246" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="13247" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1d9f590" id="13248" addr="0x7f99f1d9f590" />
-                                <attribute name="kind" value="function" id="13249" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="browseSingle" id="13250" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1d9fcb0" id="13251" addr="0x7f99f1d9fcb0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1d9fcb0" id="13252" addr="0x7f99f1d9fcb0" />
-                                <attribute name="defaultargs" value="0x7f99f1d9f110" id="13253" addr="0x7f99f1d9f110" />
-                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,bool)." id="13254" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="13255" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1d9f110" id="13256" addr="0x7f99f1d9f110" />
-                                <parmlist id="13257" addr="0x7f99f1d9f630" >
+                        <cdecl id="13243" addr="0x7fca468ed970" >
+                            <attributelist id="13244" addr="0x7fca468ed970" >
+                                <attribute name="name" value="browseSingle" id="13245" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="13246" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="13247" addr="0x7fca469e4af0" />
+                                <attribute name="sym_previousSibling" value="0x7fca468ed590" id="13248" addr="0x7fca468ed590" />
+                                <attribute name="kind" value="function" id="13249" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="browseSingle" id="13250" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca468edcb0" id="13251" addr="0x7fca468edcb0" />
+                                <attribute name="sym_nextSibling" value="0x7fca468edcb0" id="13252" addr="0x7fca468edcb0" />
+                                <attribute name="defaultargs" value="0x7fca468ed110" id="13253" addr="0x7fca468ed110" />
+                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,bool)." id="13254" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="13255" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468ed110" id="13256" addr="0x7fca468ed110" />
+                                <parmlist id="13257" addr="0x7fca468ed630" >
                                     <parm id="13258">
-                                        <attributelist id="13259" addr="0x7f99f1d9f630" >
-                                            <attribute name="name" value="type" id="13260" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="13261" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13259" addr="0x7fca468ed630" >
+                                            <attribute name="name" value="type" id="13260" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="13261" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13262">
-                                        <attributelist id="13263" addr="0x7f99f1d9f710" >
-                                            <attribute name="name" value="heading" id="13264" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13265" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13263" addr="0x7fca468ed710" >
+                                            <attribute name="name" value="heading" id="13264" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13265" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13266">
-                                        <attributelist id="13267" addr="0x7f99f1d9f790" >
-                                            <attribute name="name" value="shares" id="13268" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13269" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13267" addr="0x7fca468ed790" >
+                                            <attribute name="name" value="shares" id="13268" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13269" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13270">
-                                        <attributelist id="13271" addr="0x7f99f1d9f810" >
-                                            <attribute name="name" value="mask" id="13272" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="13273" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13274" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13271" addr="0x7fca468ed810" >
+                                            <attribute name="name" value="mask" id="13272" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="13273" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13274" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13275">
-                                        <attributelist id="13276" addr="0x7f99f1d9f8b0" >
-                                            <attribute name="name" value="useThumbs" id="13277" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="false" id="13278" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="13279" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13276" addr="0x7fca468ed8b0" >
+                                            <attribute name="name" value="useThumbs" id="13277" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="false" id="13278" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="13279" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="XBMCAddon::String" id="13280" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_2" id="13281" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="XBMCAddon::String" id="13280" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_2" id="13281" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="13282" addr="0x7f99f1d9fcb0" >
-                            <attributelist id="13283" addr="0x7f99f1d9fcb0" >
-                                <attribute name="name" value="browseSingle" id="13284" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="13285" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="13286" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1d9f970" id="13287" addr="0x7f99f1d9f970" />
-                                <attribute name="kind" value="function" id="13288" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="browseSingle" id="13289" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1d9ff50" id="13290" addr="0x7f99f1d9ff50" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1d9ff50" id="13291" addr="0x7f99f1d9ff50" />
-                                <attribute name="defaultargs" value="0x7f99f1d9f110" id="13292" addr="0x7f99f1d9f110" />
-                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="13293" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="13294" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1d9f110" id="13295" addr="0x7f99f1d9f110" />
-                                <parmlist id="13296" addr="0x7f99f1d9fa10" >
+                        <cdecl id="13282" addr="0x7fca468edcb0" >
+                            <attributelist id="13283" addr="0x7fca468edcb0" >
+                                <attribute name="name" value="browseSingle" id="13284" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="13285" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="13286" addr="0x7fca469e4af0" />
+                                <attribute name="sym_previousSibling" value="0x7fca468ed970" id="13287" addr="0x7fca468ed970" />
+                                <attribute name="kind" value="function" id="13288" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="browseSingle" id="13289" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca468edf50" id="13290" addr="0x7fca468edf50" />
+                                <attribute name="sym_nextSibling" value="0x7fca468edf50" id="13291" addr="0x7fca468edf50" />
+                                <attribute name="defaultargs" value="0x7fca468ed110" id="13292" addr="0x7fca468ed110" />
+                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="13293" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="13294" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468ed110" id="13295" addr="0x7fca468ed110" />
+                                <parmlist id="13296" addr="0x7fca468eda10" >
                                     <parm id="13297">
-                                        <attributelist id="13298" addr="0x7f99f1d9fa10" >
-                                            <attribute name="name" value="type" id="13299" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="13300" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13298" addr="0x7fca468eda10" >
+                                            <attribute name="name" value="type" id="13299" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="13300" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13301">
-                                        <attributelist id="13302" addr="0x7f99f1d9faf0" >
-                                            <attribute name="name" value="heading" id="13303" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13304" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13302" addr="0x7fca468edaf0" >
+                                            <attribute name="name" value="heading" id="13303" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13304" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13305">
-                                        <attributelist id="13306" addr="0x7f99f1d9fb70" >
-                                            <attribute name="name" value="shares" id="13307" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13308" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13306" addr="0x7fca468edb70" >
+                                            <attribute name="name" value="shares" id="13307" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13308" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13309">
-                                        <attributelist id="13310" addr="0x7f99f1d9fbf0" >
-                                            <attribute name="name" value="mask" id="13311" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="13312" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13313" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13310" addr="0x7fca468edbf0" >
+                                            <attribute name="name" value="mask" id="13311" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="13312" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13313" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="XBMCAddon::String" id="13314" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_3" id="13315" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="XBMCAddon::String" id="13314" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_3" id="13315" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="13316" addr="0x7f99f1d9ff50" >
-                            <attributelist id="13317" addr="0x7f99f1d9ff50" >
-                                <attribute name="name" value="browseSingle" id="13318" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="13319" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="13320" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1d9fcb0" id="13321" addr="0x7f99f1d9fcb0" />
-                                <attribute name="kind" value="function" id="13322" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="browseSingle" id="13323" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1d9f110" id="13324" addr="0x7f99f1d9f110" />
-                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="13325" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="13326" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1d9f110" id="13327" addr="0x7f99f1d9f110" />
-                                <parmlist id="13328" addr="0x7f99f1d9fd50" >
+                        <cdecl id="13316" addr="0x7fca468edf50" >
+                            <attributelist id="13317" addr="0x7fca468edf50" >
+                                <attribute name="name" value="browseSingle" id="13318" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="13319" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="13320" addr="0x7fca469e4af0" />
+                                <attribute name="sym_previousSibling" value="0x7fca468edcb0" id="13321" addr="0x7fca468edcb0" />
+                                <attribute name="kind" value="function" id="13322" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="browseSingle" id="13323" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca468ed110" id="13324" addr="0x7fca468ed110" />
+                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="13325" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="13326" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468ed110" id="13327" addr="0x7fca468ed110" />
+                                <parmlist id="13328" addr="0x7fca468edd50" >
                                     <parm id="13329">
-                                        <attributelist id="13330" addr="0x7f99f1d9fd50" >
-                                            <attribute name="name" value="type" id="13331" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="13332" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13330" addr="0x7fca468edd50" >
+                                            <attribute name="name" value="type" id="13331" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="13332" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13333">
-                                        <attributelist id="13334" addr="0x7f99f1d9fe30" >
-                                            <attribute name="name" value="heading" id="13335" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13336" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13334" addr="0x7fca468ede30" >
+                                            <attribute name="name" value="heading" id="13335" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13336" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13337">
-                                        <attributelist id="13338" addr="0x7f99f1d9feb0" >
-                                            <attribute name="name" value="shares" id="13339" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13340" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13338" addr="0x7fca468edeb0" >
+                                            <attribute name="name" value="shares" id="13339" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13340" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="XBMCAddon::String" id="13341" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_4" id="13342" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="XBMCAddon::String" id="13341" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_4" id="13342" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="13343" addr="0x7f99f1da0b70" >
-                            <attributelist id="13344" addr="0x7f99f1da0b70" >
-                                <attribute name="name" value="browseMultiple" id="13345" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="13346" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="13347" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1da0ff0" id="13348" addr="0x7f99f1da0ff0" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1da0ff0" id="13349" addr="0x7f99f1da0ff0" />
-                                <attribute name="kind" value="function" id="13350" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="browseMultiple" id="13351" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,bool,bool,r.q(const).XBMCAddon::String)." id="13352" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="13353" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1da0b70" id="13354" addr="0x7f99f1da0b70" />
-                                <parmlist id="13355" addr="0x7f99f1da0270" >
+                        <cdecl id="13343" addr="0x7fca468eeb70" >
+                            <attributelist id="13344" addr="0x7fca468eeb70" >
+                                <attribute name="name" value="browseMultiple" id="13345" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="13346" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="13347" addr="0x7fca469e4af0" />
+                                <attribute name="sym_nextSibling" value="0x7fca468eeff0" id="13348" addr="0x7fca468eeff0" />
+                                <attribute name="csym_nextSibling" value="0x7fca468eeff0" id="13349" addr="0x7fca468eeff0" />
+                                <attribute name="kind" value="function" id="13350" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="browseMultiple" id="13351" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,bool,bool,r.q(const).XBMCAddon::String)." id="13352" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="13353" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468eeb70" id="13354" addr="0x7fca468eeb70" />
+                                <parmlist id="13355" addr="0x7fca468ee270" >
                                     <parm id="13356">
-                                        <attributelist id="13357" addr="0x7f99f1da0270" >
-                                            <attribute name="name" value="type" id="13358" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="13359" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13357" addr="0x7fca468ee270" >
+                                            <attribute name="name" value="type" id="13358" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="13359" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13360">
-                                        <attributelist id="13361" addr="0x7f99f1da03b0" >
-                                            <attribute name="name" value="heading" id="13362" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13363" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13361" addr="0x7fca468ee3b0" >
+                                            <attribute name="name" value="heading" id="13362" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13363" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13364">
-                                        <attributelist id="13365" addr="0x7f99f1da04f0" >
-                                            <attribute name="name" value="shares" id="13366" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13367" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13365" addr="0x7fca468ee4f0" >
+                                            <attribute name="name" value="shares" id="13366" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13367" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13368">
-                                        <attributelist id="13369" addr="0x7f99f1da0690" >
-                                            <attribute name="name" value="mask" id="13370" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="13371" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13372" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13369" addr="0x7fca468ee690" >
+                                            <attribute name="name" value="mask" id="13370" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="13371" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13372" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13373">
-                                        <attributelist id="13374" addr="0x7f99f1da07d0" >
-                                            <attribute name="name" value="useThumbs" id="13375" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="false" id="13376" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="13377" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13374" addr="0x7fca468ee7d0" >
+                                            <attribute name="name" value="useThumbs" id="13375" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="false" id="13376" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="13377" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13378">
-                                        <attributelist id="13379" addr="0x7f99f1da0910" >
-                                            <attribute name="name" value="treatAsFolder" id="13380" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="false" id="13381" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="13382" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13379" addr="0x7fca468ee910" >
+                                            <attribute name="name" value="treatAsFolder" id="13380" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="false" id="13381" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="13382" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13383">
-                                        <attributelist id="13384" addr="0x7f99f1da0ab0" >
-                                            <attribute name="name" value="defaultt" id="13385" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="13386" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13387" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13384" addr="0x7fca468eeab0" >
+                                            <attribute name="name" value="defaultt" id="13385" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="13386" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13387" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="std::vector&lt;(XBMCAddon::String)>" id="13388" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="13389" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="std::vector&lt;(XBMCAddon::String)>" id="13388" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="13389" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="13390" addr="0x7f99f1da0ff0" >
-                            <attributelist id="13391" addr="0x7f99f1da0ff0" >
-                                <attribute name="name" value="browseMultiple" id="13392" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="13393" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="13394" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1da0b70" id="13395" addr="0x7f99f1da0b70" />
-                                <attribute name="kind" value="function" id="13396" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="browseMultiple" id="13397" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1da13d0" id="13398" addr="0x7f99f1da13d0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1da13d0" id="13399" addr="0x7f99f1da13d0" />
-                                <attribute name="defaultargs" value="0x7f99f1da0b70" id="13400" addr="0x7f99f1da0b70" />
-                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,bool,bool)." id="13401" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="13402" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1da0b70" id="13403" addr="0x7f99f1da0b70" />
-                                <parmlist id="13404" addr="0x7f99f1da0c10" >
+                        <cdecl id="13390" addr="0x7fca468eeff0" >
+                            <attributelist id="13391" addr="0x7fca468eeff0" >
+                                <attribute name="name" value="browseMultiple" id="13392" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="13393" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="13394" addr="0x7fca469e4af0" />
+                                <attribute name="sym_previousSibling" value="0x7fca468eeb70" id="13395" addr="0x7fca468eeb70" />
+                                <attribute name="kind" value="function" id="13396" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="browseMultiple" id="13397" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca468ef3d0" id="13398" addr="0x7fca468ef3d0" />
+                                <attribute name="sym_nextSibling" value="0x7fca468ef3d0" id="13399" addr="0x7fca468ef3d0" />
+                                <attribute name="defaultargs" value="0x7fca468eeb70" id="13400" addr="0x7fca468eeb70" />
+                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,bool,bool)." id="13401" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="13402" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468eeb70" id="13403" addr="0x7fca468eeb70" />
+                                <parmlist id="13404" addr="0x7fca468eec10" >
                                     <parm id="13405">
-                                        <attributelist id="13406" addr="0x7f99f1da0c10" >
-                                            <attribute name="name" value="type" id="13407" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="13408" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13406" addr="0x7fca468eec10" >
+                                            <attribute name="name" value="type" id="13407" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="13408" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13409">
-                                        <attributelist id="13410" addr="0x7f99f1da0cf0" >
-                                            <attribute name="name" value="heading" id="13411" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13412" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13410" addr="0x7fca468eecf0" >
+                                            <attribute name="name" value="heading" id="13411" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13412" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13413">
-                                        <attributelist id="13414" addr="0x7f99f1da0d70" >
-                                            <attribute name="name" value="shares" id="13415" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13416" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13414" addr="0x7fca468eed70" >
+                                            <attribute name="name" value="shares" id="13415" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13416" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13417">
-                                        <attributelist id="13418" addr="0x7f99f1da0df0" >
-                                            <attribute name="name" value="mask" id="13419" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="13420" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13421" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13418" addr="0x7fca468eedf0" >
+                                            <attribute name="name" value="mask" id="13419" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="13420" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13421" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13422">
-                                        <attributelist id="13423" addr="0x7f99f1da0e90" >
-                                            <attribute name="name" value="useThumbs" id="13424" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="false" id="13425" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="13426" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13423" addr="0x7fca468eee90" >
+                                            <attribute name="name" value="useThumbs" id="13424" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="false" id="13425" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="13426" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13427">
-                                        <attributelist id="13428" addr="0x7f99f1da0f30" >
-                                            <attribute name="name" value="treatAsFolder" id="13429" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="false" id="13430" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="13431" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13428" addr="0x7fca468eef30" >
+                                            <attribute name="name" value="treatAsFolder" id="13429" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="false" id="13430" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="13431" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="std::vector&lt;(XBMCAddon::String)>" id="13432" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="13433" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="std::vector&lt;(XBMCAddon::String)>" id="13432" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="13433" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="13434" addr="0x7f99f1da13d0" >
-                            <attributelist id="13435" addr="0x7f99f1da13d0" >
-                                <attribute name="name" value="browseMultiple" id="13436" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="13437" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="13438" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1da0ff0" id="13439" addr="0x7f99f1da0ff0" />
-                                <attribute name="kind" value="function" id="13440" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="browseMultiple" id="13441" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1da1710" id="13442" addr="0x7f99f1da1710" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1da1710" id="13443" addr="0x7f99f1da1710" />
-                                <attribute name="defaultargs" value="0x7f99f1da0b70" id="13444" addr="0x7f99f1da0b70" />
-                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,bool)." id="13445" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="13446" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1da0b70" id="13447" addr="0x7f99f1da0b70" />
-                                <parmlist id="13448" addr="0x7f99f1da1090" >
+                        <cdecl id="13434" addr="0x7fca468ef3d0" >
+                            <attributelist id="13435" addr="0x7fca468ef3d0" >
+                                <attribute name="name" value="browseMultiple" id="13436" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="13437" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="13438" addr="0x7fca469e4af0" />
+                                <attribute name="sym_previousSibling" value="0x7fca468eeff0" id="13439" addr="0x7fca468eeff0" />
+                                <attribute name="kind" value="function" id="13440" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="browseMultiple" id="13441" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca468ef710" id="13442" addr="0x7fca468ef710" />
+                                <attribute name="sym_nextSibling" value="0x7fca468ef710" id="13443" addr="0x7fca468ef710" />
+                                <attribute name="defaultargs" value="0x7fca468eeb70" id="13444" addr="0x7fca468eeb70" />
+                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,bool)." id="13445" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="13446" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468eeb70" id="13447" addr="0x7fca468eeb70" />
+                                <parmlist id="13448" addr="0x7fca468ef090" >
                                     <parm id="13449">
-                                        <attributelist id="13450" addr="0x7f99f1da1090" >
-                                            <attribute name="name" value="type" id="13451" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="13452" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13450" addr="0x7fca468ef090" >
+                                            <attribute name="name" value="type" id="13451" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="13452" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13453">
-                                        <attributelist id="13454" addr="0x7f99f1da1170" >
-                                            <attribute name="name" value="heading" id="13455" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13456" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13454" addr="0x7fca468ef170" >
+                                            <attribute name="name" value="heading" id="13455" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13456" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13457">
-                                        <attributelist id="13458" addr="0x7f99f1da11f0" >
-                                            <attribute name="name" value="shares" id="13459" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13460" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13458" addr="0x7fca468ef1f0" >
+                                            <attribute name="name" value="shares" id="13459" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13460" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13461">
-                                        <attributelist id="13462" addr="0x7f99f1da1270" >
-                                            <attribute name="name" value="mask" id="13463" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="13464" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13465" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13462" addr="0x7fca468ef270" >
+                                            <attribute name="name" value="mask" id="13463" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="13464" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13465" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13466">
-                                        <attributelist id="13467" addr="0x7f99f1da1310" >
-                                            <attribute name="name" value="useThumbs" id="13468" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="false" id="13469" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="13470" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13467" addr="0x7fca468ef310" >
+                                            <attribute name="name" value="useThumbs" id="13468" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="false" id="13469" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="13470" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="std::vector&lt;(XBMCAddon::String)>" id="13471" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_2" id="13472" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="std::vector&lt;(XBMCAddon::String)>" id="13471" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_2" id="13472" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="13473" addr="0x7f99f1da1710" >
-                            <attributelist id="13474" addr="0x7f99f1da1710" >
-                                <attribute name="name" value="browseMultiple" id="13475" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="13476" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="13477" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1da13d0" id="13478" addr="0x7f99f1da13d0" />
-                                <attribute name="kind" value="function" id="13479" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="browseMultiple" id="13480" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1da19b0" id="13481" addr="0x7f99f1da19b0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1da19b0" id="13482" addr="0x7f99f1da19b0" />
-                                <attribute name="defaultargs" value="0x7f99f1da0b70" id="13483" addr="0x7f99f1da0b70" />
-                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="13484" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="13485" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1da0b70" id="13486" addr="0x7f99f1da0b70" />
-                                <parmlist id="13487" addr="0x7f99f1da1470" >
+                        <cdecl id="13473" addr="0x7fca468ef710" >
+                            <attributelist id="13474" addr="0x7fca468ef710" >
+                                <attribute name="name" value="browseMultiple" id="13475" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="13476" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="13477" addr="0x7fca469e4af0" />
+                                <attribute name="sym_previousSibling" value="0x7fca468ef3d0" id="13478" addr="0x7fca468ef3d0" />
+                                <attribute name="kind" value="function" id="13479" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="browseMultiple" id="13480" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca468ef9b0" id="13481" addr="0x7fca468ef9b0" />
+                                <attribute name="sym_nextSibling" value="0x7fca468ef9b0" id="13482" addr="0x7fca468ef9b0" />
+                                <attribute name="defaultargs" value="0x7fca468eeb70" id="13483" addr="0x7fca468eeb70" />
+                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="13484" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="13485" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468eeb70" id="13486" addr="0x7fca468eeb70" />
+                                <parmlist id="13487" addr="0x7fca468ef470" >
                                     <parm id="13488">
-                                        <attributelist id="13489" addr="0x7f99f1da1470" >
-                                            <attribute name="name" value="type" id="13490" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="13491" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13489" addr="0x7fca468ef470" >
+                                            <attribute name="name" value="type" id="13490" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="13491" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13492">
-                                        <attributelist id="13493" addr="0x7f99f1da1550" >
-                                            <attribute name="name" value="heading" id="13494" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13495" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13493" addr="0x7fca468ef550" >
+                                            <attribute name="name" value="heading" id="13494" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13495" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13496">
-                                        <attributelist id="13497" addr="0x7f99f1da15d0" >
-                                            <attribute name="name" value="shares" id="13498" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13499" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13497" addr="0x7fca468ef5d0" >
+                                            <attribute name="name" value="shares" id="13498" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13499" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13500">
-                                        <attributelist id="13501" addr="0x7f99f1da1650" >
-                                            <attribute name="name" value="mask" id="13502" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="13503" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13504" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13501" addr="0x7fca468ef650" >
+                                            <attribute name="name" value="mask" id="13502" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="13503" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13504" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="std::vector&lt;(XBMCAddon::String)>" id="13505" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_3" id="13506" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="std::vector&lt;(XBMCAddon::String)>" id="13505" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_3" id="13506" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="13507" addr="0x7f99f1da19b0" >
-                            <attributelist id="13508" addr="0x7f99f1da19b0" >
-                                <attribute name="name" value="browseMultiple" id="13509" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="13510" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="13511" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1da1710" id="13512" addr="0x7f99f1da1710" />
-                                <attribute name="kind" value="function" id="13513" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="browseMultiple" id="13514" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1da0b70" id="13515" addr="0x7f99f1da0b70" />
-                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="13516" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="13517" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1da0b70" id="13518" addr="0x7f99f1da0b70" />
-                                <parmlist id="13519" addr="0x7f99f1da17b0" >
+                        <cdecl id="13507" addr="0x7fca468ef9b0" >
+                            <attributelist id="13508" addr="0x7fca468ef9b0" >
+                                <attribute name="name" value="browseMultiple" id="13509" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="13510" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="13511" addr="0x7fca469e4af0" />
+                                <attribute name="sym_previousSibling" value="0x7fca468ef710" id="13512" addr="0x7fca468ef710" />
+                                <attribute name="kind" value="function" id="13513" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="browseMultiple" id="13514" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca468eeb70" id="13515" addr="0x7fca468eeb70" />
+                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="13516" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="13517" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468eeb70" id="13518" addr="0x7fca468eeb70" />
+                                <parmlist id="13519" addr="0x7fca468ef7b0" >
                                     <parm id="13520">
-                                        <attributelist id="13521" addr="0x7f99f1da17b0" >
-                                            <attribute name="name" value="type" id="13522" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="13523" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13521" addr="0x7fca468ef7b0" >
+                                            <attribute name="name" value="type" id="13522" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="13523" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13524">
-                                        <attributelist id="13525" addr="0x7f99f1da1890" >
-                                            <attribute name="name" value="heading" id="13526" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13527" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13525" addr="0x7fca468ef890" >
+                                            <attribute name="name" value="heading" id="13526" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13527" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13528">
-                                        <attributelist id="13529" addr="0x7f99f1da1910" >
-                                            <attribute name="name" value="shares" id="13530" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13531" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13529" addr="0x7fca468ef910" >
+                                            <attribute name="name" value="shares" id="13530" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13531" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="std::vector&lt;(XBMCAddon::String)>" id="13532" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_4" id="13533" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="std::vector&lt;(XBMCAddon::String)>" id="13532" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_4" id="13533" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="13534" addr="0x7f99f1da1f90" >
-                            <attributelist id="13535" addr="0x7f99f1da1f90" >
-                                <attribute name="name" value="numeric" id="13536" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="13537" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="13538" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1da21b0" id="13539" addr="0x7f99f1da21b0" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1da21b0" id="13540" addr="0x7f99f1da21b0" />
-                                <attribute name="kind" value="function" id="13541" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="numeric" id="13542" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="13543" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="13544" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1da1f90" id="13545" addr="0x7f99f1da1f90" />
-                                <parmlist id="13546" addr="0x7f99f1da1bf0" >
+                        <cdecl id="13534" addr="0x7fca468eff90" >
+                            <attributelist id="13535" addr="0x7fca468eff90" >
+                                <attribute name="name" value="numeric" id="13536" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="13537" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="13538" addr="0x7fca469e4af0" />
+                                <attribute name="sym_nextSibling" value="0x7fca468f01b0" id="13539" addr="0x7fca468f01b0" />
+                                <attribute name="csym_nextSibling" value="0x7fca468f01b0" id="13540" addr="0x7fca468f01b0" />
+                                <attribute name="kind" value="function" id="13541" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="numeric" id="13542" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="13543" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="13544" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468eff90" id="13545" addr="0x7fca468eff90" />
+                                <parmlist id="13546" addr="0x7fca468efbf0" >
                                     <parm id="13547">
-                                        <attributelist id="13548" addr="0x7f99f1da1bf0" >
-                                            <attribute name="name" value="type" id="13549" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="13550" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13548" addr="0x7fca468efbf0" >
+                                            <attribute name="name" value="type" id="13549" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="13550" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13551">
-                                        <attributelist id="13552" addr="0x7f99f1da1d30" >
-                                            <attribute name="name" value="heading" id="13553" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13554" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13552" addr="0x7fca468efd30" >
+                                            <attribute name="name" value="heading" id="13553" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13554" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13555">
-                                        <attributelist id="13556" addr="0x7f99f1da1ed0" >
-                                            <attribute name="name" value="defaultt" id="13557" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="13558" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13559" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13556" addr="0x7fca468efed0" >
+                                            <attribute name="name" value="defaultt" id="13557" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="13558" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13559" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="XBMCAddon::String" id="13560" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="13561" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="XBMCAddon::String" id="13560" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="13561" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="13562" addr="0x7f99f1da21b0" >
-                            <attributelist id="13563" addr="0x7f99f1da21b0" >
-                                <attribute name="name" value="numeric" id="13564" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="13565" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="13566" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1da1f90" id="13567" addr="0x7f99f1da1f90" />
-                                <attribute name="kind" value="function" id="13568" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="numeric" id="13569" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1da1f90" id="13570" addr="0x7f99f1da1f90" />
-                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String)." id="13571" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="13572" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1da1f90" id="13573" addr="0x7f99f1da1f90" />
-                                <parmlist id="13574" addr="0x7f99f1da2030" >
+                        <cdecl id="13562" addr="0x7fca468f01b0" >
+                            <attributelist id="13563" addr="0x7fca468f01b0" >
+                                <attribute name="name" value="numeric" id="13564" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="13565" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="13566" addr="0x7fca469e4af0" />
+                                <attribute name="sym_previousSibling" value="0x7fca468eff90" id="13567" addr="0x7fca468eff90" />
+                                <attribute name="kind" value="function" id="13568" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="numeric" id="13569" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca468eff90" id="13570" addr="0x7fca468eff90" />
+                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String)." id="13571" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="13572" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468eff90" id="13573" addr="0x7fca468eff90" />
+                                <parmlist id="13574" addr="0x7fca468f0030" >
                                     <parm id="13575">
-                                        <attributelist id="13576" addr="0x7f99f1da2030" >
-                                            <attribute name="name" value="type" id="13577" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="13578" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13576" addr="0x7fca468f0030" >
+                                            <attribute name="name" value="type" id="13577" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="13578" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13579">
-                                        <attributelist id="13580" addr="0x7f99f1da2110" >
-                                            <attribute name="name" value="heading" id="13581" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13582" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13580" addr="0x7fca468f0110" >
+                                            <attribute name="name" value="heading" id="13581" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13582" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="XBMCAddon::String" id="13583" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="13584" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="XBMCAddon::String" id="13583" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="13584" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="13585" addr="0x7f99f1da2a30" >
-                            <attributelist id="13586" addr="0x7f99f1da2a30" >
-                                <attribute name="name" value="notification" id="13587" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="13588" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="13589" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1da2d90" id="13590" addr="0x7f99f1da2d90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1da2d90" id="13591" addr="0x7f99f1da2d90" />
-                                <attribute name="kind" value="function" id="13592" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="notification" id="13593" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,int,bool)." id="13594" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="13595" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1da2a30" id="13596" addr="0x7f99f1da2a30" />
-                                <parmlist id="13597" addr="0x7f99f1da23f0" >
+                        <cdecl id="13585" addr="0x7fca468f0a30" >
+                            <attributelist id="13586" addr="0x7fca468f0a30" >
+                                <attribute name="name" value="notification" id="13587" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="13588" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="13589" addr="0x7fca469e4af0" />
+                                <attribute name="sym_nextSibling" value="0x7fca468f0d90" id="13590" addr="0x7fca468f0d90" />
+                                <attribute name="csym_nextSibling" value="0x7fca468f0d90" id="13591" addr="0x7fca468f0d90" />
+                                <attribute name="kind" value="function" id="13592" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="notification" id="13593" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,int,bool)." id="13594" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="13595" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468f0a30" id="13596" addr="0x7fca468f0a30" />
+                                <parmlist id="13597" addr="0x7fca468f03f0" >
                                     <parm id="13598">
-                                        <attributelist id="13599" addr="0x7f99f1da23f0" >
-                                            <attribute name="name" value="heading" id="13600" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13601" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13599" addr="0x7fca468f03f0" >
+                                            <attribute name="name" value="heading" id="13600" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13601" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13602">
-                                        <attributelist id="13603" addr="0x7f99f1da2530" >
-                                            <attribute name="name" value="message" id="13604" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13605" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13603" addr="0x7fca468f0530" >
+                                            <attribute name="name" value="message" id="13604" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13605" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13606">
-                                        <attributelist id="13607" addr="0x7f99f1da26d0" >
-                                            <attribute name="name" value="icon" id="13608" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="13609" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13610" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13607" addr="0x7fca468f06d0" >
+                                            <attribute name="name" value="icon" id="13608" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="13609" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13610" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13611">
-                                        <attributelist id="13612" addr="0x7f99f1da2830" >
-                                            <attribute name="name" value="time" id="13613" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="0" id="13614" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="13615" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13612" addr="0x7fca468f0830" >
+                                            <attribute name="name" value="time" id="13613" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="0" id="13614" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="13615" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13616">
-                                        <attributelist id="13617" addr="0x7f99f1da2970" >
-                                            <attribute name="name" value="sound" id="13618" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="true" id="13619" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="13620" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13617" addr="0x7fca468f0970" >
+                                            <attribute name="name" value="sound" id="13618" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="true" id="13619" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="13620" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="13621" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="13622" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="13621" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="13622" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="13623" addr="0x7f99f1da2d90" >
-                            <attributelist id="13624" addr="0x7f99f1da2d90" >
-                                <attribute name="name" value="notification" id="13625" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="13626" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="13627" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1da2a30" id="13628" addr="0x7f99f1da2a30" />
-                                <attribute name="kind" value="function" id="13629" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="notification" id="13630" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1da3050" id="13631" addr="0x7f99f1da3050" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1da3050" id="13632" addr="0x7f99f1da3050" />
-                                <attribute name="defaultargs" value="0x7f99f1da2a30" id="13633" addr="0x7f99f1da2a30" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,int)." id="13634" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="13635" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1da2a30" id="13636" addr="0x7f99f1da2a30" />
-                                <parmlist id="13637" addr="0x7f99f1da2ad0" >
+                        <cdecl id="13623" addr="0x7fca468f0d90" >
+                            <attributelist id="13624" addr="0x7fca468f0d90" >
+                                <attribute name="name" value="notification" id="13625" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="13626" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="13627" addr="0x7fca469e4af0" />
+                                <attribute name="sym_previousSibling" value="0x7fca468f0a30" id="13628" addr="0x7fca468f0a30" />
+                                <attribute name="kind" value="function" id="13629" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="notification" id="13630" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca468f1050" id="13631" addr="0x7fca468f1050" />
+                                <attribute name="sym_nextSibling" value="0x7fca468f1050" id="13632" addr="0x7fca468f1050" />
+                                <attribute name="defaultargs" value="0x7fca468f0a30" id="13633" addr="0x7fca468f0a30" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,int)." id="13634" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="13635" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468f0a30" id="13636" addr="0x7fca468f0a30" />
+                                <parmlist id="13637" addr="0x7fca468f0ad0" >
                                     <parm id="13638">
-                                        <attributelist id="13639" addr="0x7f99f1da2ad0" >
-                                            <attribute name="name" value="heading" id="13640" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13641" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13639" addr="0x7fca468f0ad0" >
+                                            <attribute name="name" value="heading" id="13640" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13641" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13642">
-                                        <attributelist id="13643" addr="0x7f99f1da2bb0" >
-                                            <attribute name="name" value="message" id="13644" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13645" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13643" addr="0x7fca468f0bb0" >
+                                            <attribute name="name" value="message" id="13644" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13645" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13646">
-                                        <attributelist id="13647" addr="0x7f99f1da2c30" >
-                                            <attribute name="name" value="icon" id="13648" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="13649" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13650" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13647" addr="0x7fca468f0c30" >
+                                            <attribute name="name" value="icon" id="13648" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="13649" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13650" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13651">
-                                        <attributelist id="13652" addr="0x7f99f1da2cd0" >
-                                            <attribute name="name" value="time" id="13653" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="0" id="13654" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="13655" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13652" addr="0x7fca468f0cd0" >
+                                            <attribute name="name" value="time" id="13653" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="0" id="13654" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="13655" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="13656" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="13657" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="13656" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="13657" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="13658" addr="0x7f99f1da3050" >
-                            <attributelist id="13659" addr="0x7f99f1da3050" >
-                                <attribute name="name" value="notification" id="13660" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="13661" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="13662" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1da2d90" id="13663" addr="0x7f99f1da2d90" />
-                                <attribute name="kind" value="function" id="13664" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="notification" id="13665" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1da3270" id="13666" addr="0x7f99f1da3270" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1da3270" id="13667" addr="0x7f99f1da3270" />
-                                <attribute name="defaultargs" value="0x7f99f1da2a30" id="13668" addr="0x7f99f1da2a30" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="13669" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="13670" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1da2a30" id="13671" addr="0x7f99f1da2a30" />
-                                <parmlist id="13672" addr="0x7f99f1da2e30" >
+                        <cdecl id="13658" addr="0x7fca468f1050" >
+                            <attributelist id="13659" addr="0x7fca468f1050" >
+                                <attribute name="name" value="notification" id="13660" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="13661" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="13662" addr="0x7fca469e4af0" />
+                                <attribute name="sym_previousSibling" value="0x7fca468f0d90" id="13663" addr="0x7fca468f0d90" />
+                                <attribute name="kind" value="function" id="13664" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="notification" id="13665" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca468f1270" id="13666" addr="0x7fca468f1270" />
+                                <attribute name="sym_nextSibling" value="0x7fca468f1270" id="13667" addr="0x7fca468f1270" />
+                                <attribute name="defaultargs" value="0x7fca468f0a30" id="13668" addr="0x7fca468f0a30" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="13669" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="13670" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468f0a30" id="13671" addr="0x7fca468f0a30" />
+                                <parmlist id="13672" addr="0x7fca468f0e30" >
                                     <parm id="13673">
-                                        <attributelist id="13674" addr="0x7f99f1da2e30" >
-                                            <attribute name="name" value="heading" id="13675" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13676" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13674" addr="0x7fca468f0e30" >
+                                            <attribute name="name" value="heading" id="13675" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13676" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13677">
-                                        <attributelist id="13678" addr="0x7f99f1da2f10" >
-                                            <attribute name="name" value="message" id="13679" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13680" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13678" addr="0x7fca468f0f10" >
+                                            <attribute name="name" value="message" id="13679" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13680" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13681">
-                                        <attributelist id="13682" addr="0x7f99f1da2f90" >
-                                            <attribute name="name" value="icon" id="13683" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="13684" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13685" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13682" addr="0x7fca468f0f90" >
+                                            <attribute name="name" value="icon" id="13683" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="13684" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13685" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="13686" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_2" id="13687" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="13686" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_2" id="13687" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="13688" addr="0x7f99f1da3270" >
-                            <attributelist id="13689" addr="0x7f99f1da3270" >
-                                <attribute name="name" value="notification" id="13690" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="13691" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="13692" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1da3050" id="13693" addr="0x7f99f1da3050" />
-                                <attribute name="kind" value="function" id="13694" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="notification" id="13695" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1da2a30" id="13696" addr="0x7f99f1da2a30" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="13697" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="13698" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1da2a30" id="13699" addr="0x7f99f1da2a30" />
-                                <parmlist id="13700" addr="0x7f99f1da30f0" >
+                        <cdecl id="13688" addr="0x7fca468f1270" >
+                            <attributelist id="13689" addr="0x7fca468f1270" >
+                                <attribute name="name" value="notification" id="13690" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="13691" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="13692" addr="0x7fca469e4af0" />
+                                <attribute name="sym_previousSibling" value="0x7fca468f1050" id="13693" addr="0x7fca468f1050" />
+                                <attribute name="kind" value="function" id="13694" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="notification" id="13695" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca468f0a30" id="13696" addr="0x7fca468f0a30" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="13697" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="13698" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468f0a30" id="13699" addr="0x7fca468f0a30" />
+                                <parmlist id="13700" addr="0x7fca468f10f0" >
                                     <parm id="13701">
-                                        <attributelist id="13702" addr="0x7f99f1da30f0" >
-                                            <attribute name="name" value="heading" id="13703" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13704" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13702" addr="0x7fca468f10f0" >
+                                            <attribute name="name" value="heading" id="13703" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13704" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13705">
-                                        <attributelist id="13706" addr="0x7f99f1da31d0" >
-                                            <attribute name="name" value="message" id="13707" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13708" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13706" addr="0x7fca468f11d0" >
+                                            <attribute name="name" value="message" id="13707" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13708" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="13709" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_3" id="13710" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="13709" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_3" id="13710" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="13711" addr="0x7f99f1da3b50" >
-                            <attributelist id="13712" addr="0x7f99f1da3b50" >
-                                <attribute name="name" value="input" id="13713" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="13714" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="13715" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1da3ed0" id="13716" addr="0x7f99f1da3ed0" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1da3ed0" id="13717" addr="0x7f99f1da3ed0" />
-                                <attribute name="kind" value="function" id="13718" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="input" id="13719" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,int,int,int)." id="13720" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="13721" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1da3b50" id="13722" addr="0x7f99f1da3b50" />
-                                <parmlist id="13723" addr="0x7f99f1da34d0" >
+                        <cdecl id="13711" addr="0x7fca468f1b50" >
+                            <attributelist id="13712" addr="0x7fca468f1b50" >
+                                <attribute name="name" value="input" id="13713" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="13714" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="13715" addr="0x7fca469e4af0" />
+                                <attribute name="sym_nextSibling" value="0x7fca468f1ed0" id="13716" addr="0x7fca468f1ed0" />
+                                <attribute name="csym_nextSibling" value="0x7fca468f1ed0" id="13717" addr="0x7fca468f1ed0" />
+                                <attribute name="kind" value="function" id="13718" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="input" id="13719" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,int,int,int)." id="13720" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="13721" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468f1b50" id="13722" addr="0x7fca468f1b50" />
+                                <parmlist id="13723" addr="0x7fca468f14d0" >
                                     <parm id="13724">
-                                        <attributelist id="13725" addr="0x7f99f1da34d0" >
-                                            <attribute name="name" value="heading" id="13726" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13727" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13725" addr="0x7fca468f14d0" >
+                                            <attribute name="name" value="heading" id="13726" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13727" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13728">
-                                        <attributelist id="13729" addr="0x7f99f1da3670" >
-                                            <attribute name="name" value="defaultt" id="13730" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="13731" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13732" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13729" addr="0x7fca468f1670" >
+                                            <attribute name="name" value="defaultt" id="13730" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="13731" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13732" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13733">
-                                        <attributelist id="13734" addr="0x7f99f1da37d0" >
-                                            <attribute name="name" value="type" id="13735" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="0" id="13736" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="13737" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13734" addr="0x7fca468f17d0" >
+                                            <attribute name="name" value="type" id="13735" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="0" id="13736" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="13737" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13738">
-                                        <attributelist id="13739" addr="0x7f99f1da3930" >
-                                            <attribute name="name" value="option" id="13740" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="0" id="13741" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="13742" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13739" addr="0x7fca468f1930" >
+                                            <attribute name="name" value="option" id="13740" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="0" id="13741" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="13742" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13743">
-                                        <attributelist id="13744" addr="0x7f99f1da3a90" >
-                                            <attribute name="name" value="autoclose" id="13745" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="0" id="13746" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="13747" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13744" addr="0x7fca468f1a90" >
+                                            <attribute name="name" value="autoclose" id="13745" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="0" id="13746" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="13747" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="XBMCAddon::String" id="13748" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="13749" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="XBMCAddon::String" id="13748" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="13749" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="13750" addr="0x7f99f1da3ed0" >
-                            <attributelist id="13751" addr="0x7f99f1da3ed0" >
-                                <attribute name="name" value="input" id="13752" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="13753" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="13754" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1da3b50" id="13755" addr="0x7f99f1da3b50" />
-                                <attribute name="kind" value="function" id="13756" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="input" id="13757" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1da41b0" id="13758" addr="0x7f99f1da41b0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1da41b0" id="13759" addr="0x7f99f1da41b0" />
-                                <attribute name="defaultargs" value="0x7f99f1da3b50" id="13760" addr="0x7f99f1da3b50" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,int,int)." id="13761" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="13762" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1da3b50" id="13763" addr="0x7f99f1da3b50" />
-                                <parmlist id="13764" addr="0x7f99f1da3bf0" >
+                        <cdecl id="13750" addr="0x7fca468f1ed0" >
+                            <attributelist id="13751" addr="0x7fca468f1ed0" >
+                                <attribute name="name" value="input" id="13752" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="13753" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="13754" addr="0x7fca469e4af0" />
+                                <attribute name="sym_previousSibling" value="0x7fca468f1b50" id="13755" addr="0x7fca468f1b50" />
+                                <attribute name="kind" value="function" id="13756" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="input" id="13757" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca468f21b0" id="13758" addr="0x7fca468f21b0" />
+                                <attribute name="sym_nextSibling" value="0x7fca468f21b0" id="13759" addr="0x7fca468f21b0" />
+                                <attribute name="defaultargs" value="0x7fca468f1b50" id="13760" addr="0x7fca468f1b50" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,int,int)." id="13761" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="13762" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468f1b50" id="13763" addr="0x7fca468f1b50" />
+                                <parmlist id="13764" addr="0x7fca468f1bf0" >
                                     <parm id="13765">
-                                        <attributelist id="13766" addr="0x7f99f1da3bf0" >
-                                            <attribute name="name" value="heading" id="13767" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13768" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13766" addr="0x7fca468f1bf0" >
+                                            <attribute name="name" value="heading" id="13767" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13768" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13769">
-                                        <attributelist id="13770" addr="0x7f99f1da3cd0" >
-                                            <attribute name="name" value="defaultt" id="13771" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="13772" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13773" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13770" addr="0x7fca468f1cd0" >
+                                            <attribute name="name" value="defaultt" id="13771" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="13772" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13773" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13774">
-                                        <attributelist id="13775" addr="0x7f99f1da3d70" >
-                                            <attribute name="name" value="type" id="13776" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="0" id="13777" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="13778" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13775" addr="0x7fca468f1d70" >
+                                            <attribute name="name" value="type" id="13776" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="0" id="13777" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="13778" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13779">
-                                        <attributelist id="13780" addr="0x7f99f1da3e10" >
-                                            <attribute name="name" value="option" id="13781" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="0" id="13782" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="13783" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13780" addr="0x7fca468f1e10" >
+                                            <attribute name="name" value="option" id="13781" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="0" id="13782" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="13783" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="XBMCAddon::String" id="13784" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="13785" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="XBMCAddon::String" id="13784" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="13785" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="13786" addr="0x7f99f1da41b0" >
-                            <attributelist id="13787" addr="0x7f99f1da41b0" >
-                                <attribute name="name" value="input" id="13788" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="13789" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="13790" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1da3ed0" id="13791" addr="0x7f99f1da3ed0" />
-                                <attribute name="kind" value="function" id="13792" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="input" id="13793" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1da43f0" id="13794" addr="0x7f99f1da43f0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1da43f0" id="13795" addr="0x7f99f1da43f0" />
-                                <attribute name="defaultargs" value="0x7f99f1da3b50" id="13796" addr="0x7f99f1da3b50" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,int)." id="13797" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="13798" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1da3b50" id="13799" addr="0x7f99f1da3b50" />
-                                <parmlist id="13800" addr="0x7f99f1da3f70" >
+                        <cdecl id="13786" addr="0x7fca468f21b0" >
+                            <attributelist id="13787" addr="0x7fca468f21b0" >
+                                <attribute name="name" value="input" id="13788" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="13789" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="13790" addr="0x7fca469e4af0" />
+                                <attribute name="sym_previousSibling" value="0x7fca468f1ed0" id="13791" addr="0x7fca468f1ed0" />
+                                <attribute name="kind" value="function" id="13792" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="input" id="13793" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca468f23f0" id="13794" addr="0x7fca468f23f0" />
+                                <attribute name="sym_nextSibling" value="0x7fca468f23f0" id="13795" addr="0x7fca468f23f0" />
+                                <attribute name="defaultargs" value="0x7fca468f1b50" id="13796" addr="0x7fca468f1b50" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,int)." id="13797" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="13798" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468f1b50" id="13799" addr="0x7fca468f1b50" />
+                                <parmlist id="13800" addr="0x7fca468f1f70" >
                                     <parm id="13801">
-                                        <attributelist id="13802" addr="0x7f99f1da3f70" >
-                                            <attribute name="name" value="heading" id="13803" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13804" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13802" addr="0x7fca468f1f70" >
+                                            <attribute name="name" value="heading" id="13803" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13804" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13805">
-                                        <attributelist id="13806" addr="0x7f99f1da4050" >
-                                            <attribute name="name" value="defaultt" id="13807" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="13808" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13809" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13806" addr="0x7fca468f2050" >
+                                            <attribute name="name" value="defaultt" id="13807" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="13808" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13809" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13810">
-                                        <attributelist id="13811" addr="0x7f99f1da40f0" >
-                                            <attribute name="name" value="type" id="13812" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="0" id="13813" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="13814" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13811" addr="0x7fca468f20f0" >
+                                            <attribute name="name" value="type" id="13812" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="0" id="13813" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="13814" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="XBMCAddon::String" id="13815" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_2" id="13816" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="XBMCAddon::String" id="13815" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_2" id="13816" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="13817" addr="0x7f99f1da43f0" >
-                            <attributelist id="13818" addr="0x7f99f1da43f0" >
-                                <attribute name="name" value="input" id="13819" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="13820" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="13821" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1da41b0" id="13822" addr="0x7f99f1da41b0" />
-                                <attribute name="kind" value="function" id="13823" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="input" id="13824" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1da4590" id="13825" addr="0x7f99f1da4590" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1da4590" id="13826" addr="0x7f99f1da4590" />
-                                <attribute name="defaultargs" value="0x7f99f1da3b50" id="13827" addr="0x7f99f1da3b50" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="13828" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="13829" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1da3b50" id="13830" addr="0x7f99f1da3b50" />
-                                <parmlist id="13831" addr="0x7f99f1da4250" >
+                        <cdecl id="13817" addr="0x7fca468f23f0" >
+                            <attributelist id="13818" addr="0x7fca468f23f0" >
+                                <attribute name="name" value="input" id="13819" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="13820" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="13821" addr="0x7fca469e4af0" />
+                                <attribute name="sym_previousSibling" value="0x7fca468f21b0" id="13822" addr="0x7fca468f21b0" />
+                                <attribute name="kind" value="function" id="13823" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="input" id="13824" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca468f2590" id="13825" addr="0x7fca468f2590" />
+                                <attribute name="sym_nextSibling" value="0x7fca468f2590" id="13826" addr="0x7fca468f2590" />
+                                <attribute name="defaultargs" value="0x7fca468f1b50" id="13827" addr="0x7fca468f1b50" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="13828" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="13829" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468f1b50" id="13830" addr="0x7fca468f1b50" />
+                                <parmlist id="13831" addr="0x7fca468f2250" >
                                     <parm id="13832">
-                                        <attributelist id="13833" addr="0x7f99f1da4250" >
-                                            <attribute name="name" value="heading" id="13834" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13835" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13833" addr="0x7fca468f2250" >
+                                            <attribute name="name" value="heading" id="13834" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13835" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="13836">
-                                        <attributelist id="13837" addr="0x7f99f1da4330" >
-                                            <attribute name="name" value="defaultt" id="13838" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="13839" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13840" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13837" addr="0x7fca468f2330" >
+                                            <attribute name="name" value="defaultt" id="13838" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="13839" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13840" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="XBMCAddon::String" id="13841" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_3" id="13842" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="XBMCAddon::String" id="13841" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_3" id="13842" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="13843" addr="0x7f99f1da4590" >
-                            <attributelist id="13844" addr="0x7f99f1da4590" >
-                                <attribute name="name" value="input" id="13845" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="13846" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1e96af0" id="13847" addr="0x7f99f1e96af0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1da43f0" id="13848" addr="0x7f99f1da43f0" />
-                                <attribute name="kind" value="function" id="13849" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="input" id="13850" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1da3b50" id="13851" addr="0x7f99f1da3b50" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="13852" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="13853" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1da3b50" id="13854" addr="0x7f99f1da3b50" />
-                                <parmlist id="13855" addr="0x7f99f1da4490" >
+                        <cdecl id="13843" addr="0x7fca468f2590" >
+                            <attributelist id="13844" addr="0x7fca468f2590" >
+                                <attribute name="name" value="input" id="13845" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="13846" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca469e4af0" id="13847" addr="0x7fca469e4af0" />
+                                <attribute name="sym_previousSibling" value="0x7fca468f23f0" id="13848" addr="0x7fca468f23f0" />
+                                <attribute name="kind" value="function" id="13849" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="input" id="13850" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca468f1b50" id="13851" addr="0x7fca468f1b50" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="13852" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="13853" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468f1b50" id="13854" addr="0x7fca468f1b50" />
+                                <parmlist id="13855" addr="0x7fca468f2490" >
                                     <parm id="13856">
-                                        <attributelist id="13857" addr="0x7f99f1da4490" >
-                                            <attribute name="name" value="heading" id="13858" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13859" addr="0x7f99f1de6c90" />
+                                        <attributelist id="13857" addr="0x7fca468f2490" >
+                                            <attribute name="name" value="heading" id="13858" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="13859" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="XBMCAddon::String" id="13860" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_4" id="13861" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="XBMCAddon::String" id="13860" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_4" id="13861" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
                     </class >
-                    <class id="13862" addr="0x7f99f1da4850" >
-                        <attributelist id="13863" addr="0x7f99f1da4850" >
-                            <attribute name="name" value="XBMCAddon::xbmcgui::DialogProgress" id="13864" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="13865" addr="0x7f99f1e40fb0" />
-                            <attribute name="symtab" value="0x7f99f1da4990" id="13866" addr="0x7f99f1da4990" />
-                            <attribute name="allows_typedef" value="1" id="13867" addr="0x7f99f1de6c90" />
-                            <attribute name="typepass_visit" value="1" id="13868" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_visit" value="1" id="13869" addr="0x7f99f1de6c90" />
-                            <attribute name="kind" value="class" id="13870" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_name" value="DialogProgress" id="13871" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_default_constructor" value="1" id="13872" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_has_constructor" value="1" id="13873" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_public_constructor" value="1" id="13874" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_has_destructor" value="1" id="13875" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_default_destructor" value="1" id="13876" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_copy_constructor" value="1" id="13877" addr="0x7f99f1de6c90" />
-                            <attribute name="privatebaselist" value="0x7f99f1da4830" id="13878" addr="0x7f99f1da4830" />
-                            <attribute name="protectedbaselist" value="0x7f99f1da4810" id="13879" addr="0x7f99f1da4810" />
-                            <baselist id="13880" addr="0x7f99f1da47f0" >
-                                <base name="AddonClass" id="13881" addr="0x7f99f1da4770" />
+                    <class id="13862" addr="0x7fca468f2850" >
+                        <attributelist id="13863" addr="0x7fca468f2850" >
+                            <attribute name="name" value="XBMCAddon::xbmcgui::DialogProgress" id="13864" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="13865" addr="0x7fca4698efb0" />
+                            <attribute name="symtab" value="0x7fca468f2990" id="13866" addr="0x7fca468f2990" />
+                            <attribute name="allows_typedef" value="1" id="13867" addr="0x7fca46934c90" />
+                            <attribute name="typepass_visit" value="1" id="13868" addr="0x7fca46934c90" />
+                            <attribute name="allocate_visit" value="1" id="13869" addr="0x7fca46934c90" />
+                            <attribute name="kind" value="class" id="13870" addr="0x7fca46934c90" />
+                            <attribute name="sym_name" value="DialogProgress" id="13871" addr="0x7fca46934c90" />
+                            <attribute name="allocate_default_constructor" value="1" id="13872" addr="0x7fca46934c90" />
+                            <attribute name="allocate_has_constructor" value="1" id="13873" addr="0x7fca46934c90" />
+                            <attribute name="allocate_public_constructor" value="1" id="13874" addr="0x7fca46934c90" />
+                            <attribute name="allocate_has_destructor" value="1" id="13875" addr="0x7fca46934c90" />
+                            <attribute name="allocate_default_destructor" value="1" id="13876" addr="0x7fca46934c90" />
+                            <attribute name="allocate_copy_constructor" value="1" id="13877" addr="0x7fca46934c90" />
+                            <attribute name="privatebaselist" value="0x7fca468f2830" id="13878" addr="0x7fca468f2830" />
+                            <attribute name="protectedbaselist" value="0x7fca468f2810" id="13879" addr="0x7fca468f2810" />
+                            <baselist id="13880" addr="0x7fca468f27f0" >
+                                <base name="AddonClass" id="13881" addr="0x7fca468f2770" />
                             </baselist >
-                            <attribute name="module" value="xbmcgui" id="13882" addr="0x7f99f1e402f0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="13883" addr="0x7f99f1de6c90" />
-                            <typescope id="13884" addr="0x7f99f1de0810" >
-                                <attributelist id="13885" addr="0x7f99f1de0810" >
-                                    <attribute name="name" value="DialogProgress" id="13886" addr="0x7f99f1de6c90" />
-                                    <typetab id="13887" addr="0x7f99f1de0830" >
-                                        <attributelist id="13888" addr="0x7f99f1de0830" >
+                            <attribute name="module" value="xbmcgui" id="13882" addr="0x7fca4698e2f0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="13883" addr="0x7fca46934c90" />
+                            <typescope id="13884" addr="0x7fca4692e810" >
+                                <attributelist id="13885" addr="0x7fca4692e810" >
+                                    <attribute name="name" value="DialogProgress" id="13886" addr="0x7fca46934c90" />
+                                    <typetab id="13887" addr="0x7fca4692e830" >
+                                        <attributelist id="13888" addr="0x7fca4692e830" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f99f1dd2150" id="13889" addr="0x7f99f1dd2150" />
-                                    <attribute name="qname" value="XBMCAddon::xbmcgui::DialogProgress" id="13890" addr="0x7f99f1de6c90" />
-                                    <attribute name="symtab" value="0x7f99f1da4990" id="13891" addr="0x7f99f1da4990" />
+                                    <attribute name="parent" value="0x7fca46920150" id="13889" addr="0x7fca46920150" />
+                                    <attribute name="qname" value="XBMCAddon::xbmcgui::DialogProgress" id="13890" addr="0x7fca46934c90" />
+                                    <attribute name="symtab" value="0x7fca468f2990" id="13891" addr="0x7fca468f2990" />
                                 </attributelist >
-                                <typescopesitem id="13892" addr="0x7f99f1de07b0" >
-                                    <attributelist id="13893" addr="0x7f99f1de07b0" >
+                                <typescopesitem id="13892" addr="0x7fca4692e7b0" >
+                                    <attributelist id="13893" addr="0x7fca4692e7b0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="13894" addr="0x7f99f1de0830" >
-                                    <attributelist id="13895" addr="0x7f99f1de0830" >
+                                <typescopesitem id="13894" addr="0x7fca4692e830" >
+                                    <attributelist id="13895" addr="0x7fca4692e830" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="13896" addr="0x7f99f1dd2150" >
-                                    <attributelist id="13897" addr="0x7f99f1dd2150" >
-                                        <attribute name="name" value="xbmcgui" id="13898" addr="0x7f99f1de6c90" />
-                                        <typetab id="13899" addr="0x7f99f1dd2170" >
-                                            <attributelist id="13900" addr="0x7f99f1dd2170" >
-                                                <attribute name="InterceptorBase" value="InterceptorBase" id="13901" addr="0x7f99f1de6c90" />
-                                                <attribute name="Dialog" value="Dialog" id="13902" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="13903" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="13904" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlTextBox" value="ControlTextBox" id="13905" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="13906" addr="0x7f99f1de6c90" />
-                                                <attribute name="Window" value="Window" id="13907" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="13908" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlList" value="ControlList" id="13909" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="13910" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlImage" value="ControlImage" id="13911" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlButton" value="ControlButton" id="13912" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlGroup" value="ControlGroup" id="13913" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogBusy" value="DialogBusy" id="13914" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="13915" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSpin" value="ControlSpin" id="13916" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlEdit" value="ControlEdit" id="13917" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="13918" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="13919" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlLabel" value="ControlLabel" id="13920" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlProgress" value="ControlProgress" id="13921" addr="0x7f99f1de6c90" />
-                                                <attribute name="Control" value="Control" id="13922" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSlider" value="ControlSlider" id="13923" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgress" value="DialogProgress" id="13924" addr="0x7f99f1de6c90" />
-                                                <attribute name="Action" value="Action" id="13925" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowDialog" value="WindowDialog" id="13926" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXML" value="WindowXML" id="13927" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItem" value="ListItem" id="13928" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="13929" addr="0x7f99f1de6c90" />
+                                <typescopesitem id="13896" addr="0x7fca46920150" >
+                                    <attributelist id="13897" addr="0x7fca46920150" >
+                                        <attribute name="name" value="xbmcgui" id="13898" addr="0x7fca46934c90" />
+                                        <typetab id="13899" addr="0x7fca46920170" >
+                                            <attributelist id="13900" addr="0x7fca46920170" >
+                                                <attribute name="InterceptorBase" value="InterceptorBase" id="13901" addr="0x7fca46934c90" />
+                                                <attribute name="Dialog" value="Dialog" id="13902" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="13903" addr="0x7fca46934c90" />
+                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="13904" addr="0x7fca46934c90" />
+                                                <attribute name="ControlTextBox" value="ControlTextBox" id="13905" addr="0x7fca46934c90" />
+                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="13906" addr="0x7fca46934c90" />
+                                                <attribute name="Window" value="Window" id="13907" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="13908" addr="0x7fca46934c90" />
+                                                <attribute name="ControlList" value="ControlList" id="13909" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="13910" addr="0x7fca46934c90" />
+                                                <attribute name="ControlImage" value="ControlImage" id="13911" addr="0x7fca46934c90" />
+                                                <attribute name="ControlButton" value="ControlButton" id="13912" addr="0x7fca46934c90" />
+                                                <attribute name="ControlGroup" value="ControlGroup" id="13913" addr="0x7fca46934c90" />
+                                                <attribute name="DialogBusy" value="DialogBusy" id="13914" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="13915" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSpin" value="ControlSpin" id="13916" addr="0x7fca46934c90" />
+                                                <attribute name="ControlEdit" value="ControlEdit" id="13917" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="13918" addr="0x7fca46934c90" />
+                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="13919" addr="0x7fca46934c90" />
+                                                <attribute name="ControlLabel" value="ControlLabel" id="13920" addr="0x7fca46934c90" />
+                                                <attribute name="ControlProgress" value="ControlProgress" id="13921" addr="0x7fca46934c90" />
+                                                <attribute name="Control" value="Control" id="13922" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSlider" value="ControlSlider" id="13923" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgress" value="DialogProgress" id="13924" addr="0x7fca46934c90" />
+                                                <attribute name="Action" value="Action" id="13925" addr="0x7fca46934c90" />
+                                                <attribute name="WindowDialog" value="WindowDialog" id="13926" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXML" value="WindowXML" id="13927" addr="0x7fca46934c90" />
+                                                <attribute name="ListItem" value="ListItem" id="13928" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="13929" addr="0x7fca46934c90" />
                                             </attributelist >
-                                            <typetabsitem id="13930" addr="0x7f99f1de1dd0" >
-                                                <attributelist id="13931" addr="0x7f99f1de1dd0" >
+                                            <typetabsitem id="13930" addr="0x7fca4692fdd0" >
+                                                <attributelist id="13931" addr="0x7fca4692fdd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="13932" addr="0x7f99f1dde790" >
-                                                <attributelist id="13933" addr="0x7f99f1dde790" >
+                                            <typetabsitem id="13932" addr="0x7fca4692c790" >
+                                                <attributelist id="13933" addr="0x7fca4692c790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="13934" addr="0x7f99f1de3f10" >
-                                                <attributelist id="13935" addr="0x7f99f1de3f10" >
+                                            <typetabsitem id="13934" addr="0x7fca46931f10" >
+                                                <attributelist id="13935" addr="0x7fca46931f10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="13936" addr="0x7f99f1dd67b0" >
-                                                <attributelist id="13937" addr="0x7f99f1dd67b0" >
+                                            <typetabsitem id="13936" addr="0x7fca469247b0" >
+                                                <attributelist id="13937" addr="0x7fca469247b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="13938" addr="0x7f99f1ddafd0" >
-                                                <attributelist id="13939" addr="0x7f99f1ddafd0" >
+                                            <typetabsitem id="13938" addr="0x7fca46928fd0" >
+                                                <attributelist id="13939" addr="0x7fca46928fd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="13940" addr="0x7f99f1ddd430" >
-                                                <attributelist id="13941" addr="0x7f99f1ddd430" >
+                                            <typetabsitem id="13940" addr="0x7fca4692b430" >
+                                                <attributelist id="13941" addr="0x7fca4692b430" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="13942" addr="0x7f99f1de2130" >
-                                                <attributelist id="13943" addr="0x7f99f1de2130" >
+                                            <typetabsitem id="13942" addr="0x7fca46930130" >
+                                                <attributelist id="13943" addr="0x7fca46930130" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="13944" addr="0x7f99f1dd2f50" >
-                                                <attributelist id="13945" addr="0x7f99f1dd2f50" >
+                                            <typetabsitem id="13944" addr="0x7fca46920f50" >
+                                                <attributelist id="13945" addr="0x7fca46920f50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="13946" addr="0x7f99f1dd9650" >
-                                                <attributelist id="13947" addr="0x7f99f1dd9650" >
+                                            <typetabsitem id="13946" addr="0x7fca46927650" >
+                                                <attributelist id="13947" addr="0x7fca46927650" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="13948" addr="0x7f99f1de3390" >
-                                                <attributelist id="13949" addr="0x7f99f1de3390" >
+                                            <typetabsitem id="13948" addr="0x7fca46931390" >
+                                                <attributelist id="13949" addr="0x7fca46931390" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="13950" addr="0x7f99f1ddb7b0" >
-                                                <attributelist id="13951" addr="0x7f99f1ddb7b0" >
+                                            <typetabsitem id="13950" addr="0x7fca469297b0" >
+                                                <attributelist id="13951" addr="0x7fca469297b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="13952" addr="0x7f99f1ddc4b0" >
-                                                <attributelist id="13953" addr="0x7f99f1ddc4b0" >
+                                            <typetabsitem id="13952" addr="0x7fca4692a4b0" >
+                                                <attributelist id="13953" addr="0x7fca4692a4b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="13954" addr="0x7f99f1ddcf90" >
-                                                <attributelist id="13955" addr="0x7f99f1ddcf90" >
+                                            <typetabsitem id="13954" addr="0x7fca4692af90" >
+                                                <attributelist id="13955" addr="0x7fca4692af90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="13956" addr="0x7f99f1de11b0" >
-                                                <attributelist id="13957" addr="0x7f99f1de11b0" >
+                                            <typetabsitem id="13956" addr="0x7fca4692f1b0" >
+                                                <attributelist id="13957" addr="0x7fca4692f1b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="13958" addr="0x7f99f1de15b0" >
-                                                <attributelist id="13959" addr="0x7f99f1de15b0" >
+                                            <typetabsitem id="13958" addr="0x7fca4692f5b0" >
+                                                <attributelist id="13959" addr="0x7fca4692f5b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="13960" addr="0x7f99f1dd77f0" >
-                                                <attributelist id="13961" addr="0x7f99f1dd77f0" >
+                                            <typetabsitem id="13960" addr="0x7fca469257f0" >
+                                                <attributelist id="13961" addr="0x7fca469257f0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="13962" addr="0x7f99f1dd8b30" >
-                                                <attributelist id="13963" addr="0x7f99f1dd8b30" >
+                                            <typetabsitem id="13962" addr="0x7fca46926b30" >
+                                                <attributelist id="13963" addr="0x7fca46926b30" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="13964" addr="0x7f99f1dd2c50" >
-                                                <attributelist id="13965" addr="0x7f99f1dd2c50" >
+                                            <typetabsitem id="13964" addr="0x7fca46920c50" >
+                                                <attributelist id="13965" addr="0x7fca46920c50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="13966" addr="0x7f99f1dda790" >
-                                                <attributelist id="13967" addr="0x7f99f1dda790" >
+                                            <typetabsitem id="13966" addr="0x7fca46928790" >
+                                                <attributelist id="13967" addr="0x7fca46928790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="13968" addr="0x7f99f1dd8030" >
-                                                <attributelist id="13969" addr="0x7f99f1dd8030" >
+                                            <typetabsitem id="13968" addr="0x7fca46926030" >
+                                                <attributelist id="13969" addr="0x7fca46926030" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="13970" addr="0x7f99f1ddbe10" >
-                                                <attributelist id="13971" addr="0x7f99f1ddbe10" >
+                                            <typetabsitem id="13970" addr="0x7fca46929e10" >
+                                                <attributelist id="13971" addr="0x7fca46929e10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="13972" addr="0x7f99f1dd6b10" >
-                                                <attributelist id="13973" addr="0x7f99f1dd6b10" >
+                                            <typetabsitem id="13972" addr="0x7fca46924b10" >
+                                                <attributelist id="13973" addr="0x7fca46924b10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="13974" addr="0x7f99f1dddf90" >
-                                                <attributelist id="13975" addr="0x7f99f1dddf90" >
+                                            <typetabsitem id="13974" addr="0x7fca4692bf90" >
+                                                <attributelist id="13975" addr="0x7fca4692bf90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="13976" addr="0x7f99f1de0530" >
-                                                <attributelist id="13977" addr="0x7f99f1de0530" >
+                                            <typetabsitem id="13976" addr="0x7fca4692e530" >
+                                                <attributelist id="13977" addr="0x7fca4692e530" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="13978" addr="0x7f99f1de1e50" >
-                                                <attributelist id="13979" addr="0x7f99f1de1e50" >
+                                            <typetabsitem id="13978" addr="0x7fca4692fe50" >
+                                                <attributelist id="13979" addr="0x7fca4692fe50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="13980" addr="0x7f99f1de2d90" >
-                                                <attributelist id="13981" addr="0x7f99f1de2d90" >
+                                            <typetabsitem id="13980" addr="0x7fca46930d90" >
+                                                <attributelist id="13981" addr="0x7fca46930d90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="13982" addr="0x7f99f1de3410" >
-                                                <attributelist id="13983" addr="0x7f99f1de3410" >
+                                            <typetabsitem id="13982" addr="0x7fca46931410" >
+                                                <attributelist id="13983" addr="0x7fca46931410" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="13984" addr="0x7f99f1dd3590" >
-                                                <attributelist id="13985" addr="0x7f99f1dd3590" >
+                                            <typetabsitem id="13984" addr="0x7fca46921590" >
+                                                <attributelist id="13985" addr="0x7fca46921590" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="13986" addr="0x7f99f1dd3390" >
-                                                <attributelist id="13987" addr="0x7f99f1dd3390" >
+                                            <typetabsitem id="13986" addr="0x7fca46921390" >
+                                                <attributelist id="13987" addr="0x7fca46921390" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7f99f1dd1d70" id="13988" addr="0x7f99f1dd1d70" />
-                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="13989" addr="0x7f99f1de6c90" />
-                                        <attribute name="symtab" value="0x7f99f1e40fb0" id="13990" addr="0x7f99f1e40fb0" />
+                                        <attribute name="parent" value="0x7fca4691fd70" id="13988" addr="0x7fca4691fd70" />
+                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="13989" addr="0x7fca46934c90" />
+                                        <attribute name="symtab" value="0x7fca4698efb0" id="13990" addr="0x7fca4698efb0" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="13991" addr="0x7f99f1de0850" >
-                                    <attributelist id="13992" addr="0x7f99f1de0850" >
+                                <typescopesitem id="13991" addr="0x7fca4692e850" >
+                                    <attributelist id="13992" addr="0x7fca4692e850" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="13993" addr="0x7f99f1da4990" >
-                                    <attributelist id="13994" addr="0x7f99f1da4990" >
-                                        <attribute name="name" value="DialogProgress" id="13995" addr="0x7f99f1de6c90" />
-                                        <attribute name="csymtab" value="0x7f99f1da49b0" id="13996" addr="0x7f99f1da49b0" />
-                                        <attribute name="symtab" value="0x7f99f1da4950" id="13997" addr="0x7f99f1da4950" />
+                                <typescopesitem id="13993" addr="0x7fca468f2990" >
+                                    <attributelist id="13994" addr="0x7fca468f2990" >
+                                        <attribute name="name" value="DialogProgress" id="13995" addr="0x7fca46934c90" />
+                                        <attribute name="csymtab" value="0x7fca468f29b0" id="13996" addr="0x7fca468f29b0" />
+                                        <attribute name="symtab" value="0x7fca468f2950" id="13997" addr="0x7fca468f2950" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <cdecl id="13998" addr="0x7f99f1da4af0" >
-                            <attributelist id="13999" addr="0x7f99f1da4af0" >
-                                <attribute name="ismember" value="1" id="14000" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="dlg" id="14001" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="p." id="14002" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="private" id="14003" addr="0x7f99f1de6c90" />
-                                <attribute name="value" value="nullptr" id="14004" addr="0x7f99f1de6c90" />
-                                <attribute name="valuetype" value="int" id="14005" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="variable" id="14006" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="CGUIDialogProgress" id="14007" addr="0x7f99f1de6c90" />
-                                <attribute name="hasvalue" value="1" id="14008" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1da4990" id="14009" addr="0x7f99f1da4990" />
+                        <cdecl id="13998" addr="0x7fca468f2af0" >
+                            <attributelist id="13999" addr="0x7fca468f2af0" >
+                                <attribute name="ismember" value="1" id="14000" addr="0x7fca46934c90" />
+                                <attribute name="name" value="dlg" id="14001" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="p." id="14002" addr="0x7fca46934c90" />
+                                <attribute name="access" value="private" id="14003" addr="0x7fca46934c90" />
+                                <attribute name="value" value="nullptr" id="14004" addr="0x7fca46934c90" />
+                                <attribute name="valuetype" value="int" id="14005" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="variable" id="14006" addr="0x7fca46934c90" />
+                                <attribute name="type" value="CGUIDialogProgress" id="14007" addr="0x7fca46934c90" />
+                                <attribute name="hasvalue" value="1" id="14008" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468f2990" id="14009" addr="0x7fca468f2990" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="14010" addr="0x7f99f1da4d50" >
-                            <attributelist id="14011" addr="0x7f99f1da4d50" >
-                                <attribute name="value" value="false" id="14012" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="open" id="14013" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="14014" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1da4990" id="14015" addr="0x7f99f1da4990" />
-                                <attribute name="hasvalue" value="1" id="14016" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="variable" id="14017" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="" id="14018" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="private" id="14019" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="bool" id="14020" addr="0x7f99f1de6c90" />
-                                <attribute name="valuetype" value="bool" id="14021" addr="0x7f99f1de6c90" />
+                        <cdecl id="14010" addr="0x7fca468f2d50" >
+                            <attributelist id="14011" addr="0x7fca468f2d50" >
+                                <attribute name="value" value="false" id="14012" addr="0x7fca46934c90" />
+                                <attribute name="name" value="open" id="14013" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="14014" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468f2990" id="14015" addr="0x7fca468f2990" />
+                                <attribute name="hasvalue" value="1" id="14016" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="variable" id="14017" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="" id="14018" addr="0x7fca46934c90" />
+                                <attribute name="access" value="private" id="14019" addr="0x7fca46934c90" />
+                                <attribute name="type" value="bool" id="14020" addr="0x7fca46934c90" />
+                                <attribute name="valuetype" value="bool" id="14021" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <access id="14022" addr="0x7f99f1da4e70" >
-                            <attributelist id="14023" addr="0x7f99f1da4e70" >
-                                <attribute name="kind" value="protected" id="14024" addr="0x7f99f1de6c90" />
+                        <access id="14022" addr="0x7fca468f2e70" >
+                            <attributelist id="14023" addr="0x7fca468f2e70" >
+                                <attribute name="kind" value="protected" id="14024" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </access >
-                        <cdecl id="14025" addr="0x7f99f1da4fb0" >
-                            <attributelist id="14026" addr="0x7f99f1da4fb0" >
-                                <attribute name="ismember" value="1" id="14027" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="deallocating" id="14028" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="deallocating" id="14029" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="14030" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="protected" id="14031" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="14032" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="void" id="14033" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1da4990" id="14034" addr="0x7f99f1da4990" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="14035" addr="0x7f99f1de6c90" />
+                        <cdecl id="14025" addr="0x7fca468f2fb0" >
+                            <attributelist id="14026" addr="0x7fca468f2fb0" >
+                                <attribute name="ismember" value="1" id="14027" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="deallocating" id="14028" addr="0x7fca46934c90" />
+                                <attribute name="name" value="deallocating" id="14029" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="14030" addr="0x7fca46934c90" />
+                                <attribute name="access" value="protected" id="14031" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="14032" addr="0x7fca46934c90" />
+                                <attribute name="type" value="void" id="14033" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468f2990" id="14034" addr="0x7fca468f2990" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="14035" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <access id="14036" addr="0x7f99f1da5050" >
-                            <attributelist id="14037" addr="0x7f99f1da5050" >
-                                <attribute name="kind" value="public" id="14038" addr="0x7f99f1de6c90" />
+                        <access id="14036" addr="0x7fca468f3050" >
+                            <attributelist id="14037" addr="0x7fca468f3050" >
+                                <attribute name="kind" value="public" id="14038" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="14039" addr="0x7f99f1da51d0" >
-                            <attributelist id="14040" addr="0x7f99f1da51d0" >
-                                <attribute name="ismember" value="1" id="14041" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="DialogProgress" id="14042" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="DialogProgress" id="14043" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="14044" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="14045" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="14046" addr="0x7f99f1de6c90" />
-                                <attribute name="value" value="default" id="14047" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1da4990" id="14048" addr="0x7f99f1da4990" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="14049" addr="0x7f99f1de6c90" />
+                        <constructor id="14039" addr="0x7fca468f31d0" >
+                            <attributelist id="14040" addr="0x7fca468f31d0" >
+                                <attribute name="ismember" value="1" id="14041" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="DialogProgress" id="14042" addr="0x7fca46934c90" />
+                                <attribute name="name" value="DialogProgress" id="14043" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="14044" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="14045" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="14046" addr="0x7fca46934c90" />
+                                <attribute name="value" value="default" id="14047" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468f2990" id="14048" addr="0x7fca468f2990" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="14049" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <destructor id="14050" addr="0x7f99f1da5330" >
-                            <attributelist id="14051" addr="0x7f99f1da5330" >
-                                <attribute name="ismember" value="1" id="14052" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="~DialogProgress" id="14053" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="~DialogProgress" id="14054" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="14055" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="14056" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1da4990" id="14057" addr="0x7f99f1da4990" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="14058" addr="0x7f99f1de6c90" />
+                        <destructor id="14050" addr="0x7fca468f3330" >
+                            <attributelist id="14051" addr="0x7fca468f3330" >
+                                <attribute name="ismember" value="1" id="14052" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="~DialogProgress" id="14053" addr="0x7fca46934c90" />
+                                <attribute name="name" value="~DialogProgress" id="14054" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="14055" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="14056" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468f2990" id="14057" addr="0x7fca468f2990" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="14058" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </destructor >
-                        <cdecl id="14059" addr="0x7f99f1da5af0" >
-                            <attributelist id="14060" addr="0x7f99f1da5af0" >
-                                <attribute name="name" value="create" id="14061" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="14062" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1da4990" id="14063" addr="0x7f99f1da4990" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1da5dd0" id="14064" addr="0x7f99f1da5dd0" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1da5dd0" id="14065" addr="0x7f99f1da5dd0" />
-                                <attribute name="kind" value="function" id="14066" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="create" id="14067" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="14068" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="14069" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1da5af0" id="14070" addr="0x7f99f1da5af0" />
-                                <parmlist id="14071" addr="0x7f99f1da5550" >
+                        <cdecl id="14059" addr="0x7fca468f3af0" >
+                            <attributelist id="14060" addr="0x7fca468f3af0" >
+                                <attribute name="name" value="create" id="14061" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="14062" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468f2990" id="14063" addr="0x7fca468f2990" />
+                                <attribute name="sym_nextSibling" value="0x7fca468f3dd0" id="14064" addr="0x7fca468f3dd0" />
+                                <attribute name="csym_nextSibling" value="0x7fca468f3dd0" id="14065" addr="0x7fca468f3dd0" />
+                                <attribute name="kind" value="function" id="14066" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="create" id="14067" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="14068" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="14069" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468f3af0" id="14070" addr="0x7fca468f3af0" />
+                                <parmlist id="14071" addr="0x7fca468f3550" >
                                     <parm id="14072">
-                                        <attributelist id="14073" addr="0x7f99f1da5550" >
-                                            <attribute name="name" value="heading" id="14074" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14075" addr="0x7f99f1de6c90" />
+                                        <attributelist id="14073" addr="0x7fca468f3550" >
+                                            <attribute name="name" value="heading" id="14074" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14075" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="14076">
-                                        <attributelist id="14077" addr="0x7f99f1da56f0" >
-                                            <attribute name="name" value="line1" id="14078" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="14079" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14080" addr="0x7f99f1de6c90" />
+                                        <attributelist id="14077" addr="0x7fca468f36f0" >
+                                            <attribute name="name" value="line1" id="14078" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="14079" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14080" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="14081">
-                                        <attributelist id="14082" addr="0x7f99f1da5890" >
-                                            <attribute name="name" value="line2" id="14083" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="14084" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14085" addr="0x7f99f1de6c90" />
+                                        <attributelist id="14082" addr="0x7fca468f3890" >
+                                            <attribute name="name" value="line2" id="14083" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="14084" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14085" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="14086">
-                                        <attributelist id="14087" addr="0x7f99f1da5a30" >
-                                            <attribute name="name" value="line3" id="14088" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="14089" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14090" addr="0x7f99f1de6c90" />
+                                        <attributelist id="14087" addr="0x7fca468f3a30" >
+                                            <attribute name="name" value="line3" id="14088" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="14089" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14090" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="14091" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="14092" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="14091" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="14092" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="14093" addr="0x7f99f1da5dd0" >
-                            <attributelist id="14094" addr="0x7f99f1da5dd0" >
-                                <attribute name="name" value="create" id="14095" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="14096" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1da4990" id="14097" addr="0x7f99f1da4990" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1da5af0" id="14098" addr="0x7f99f1da5af0" />
-                                <attribute name="kind" value="function" id="14099" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="create" id="14100" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1da6010" id="14101" addr="0x7f99f1da6010" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1da6010" id="14102" addr="0x7f99f1da6010" />
-                                <attribute name="defaultargs" value="0x7f99f1da5af0" id="14103" addr="0x7f99f1da5af0" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="14104" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="14105" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1da5af0" id="14106" addr="0x7f99f1da5af0" />
-                                <parmlist id="14107" addr="0x7f99f1da5b90" >
+                        <cdecl id="14093" addr="0x7fca468f3dd0" >
+                            <attributelist id="14094" addr="0x7fca468f3dd0" >
+                                <attribute name="name" value="create" id="14095" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="14096" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468f2990" id="14097" addr="0x7fca468f2990" />
+                                <attribute name="sym_previousSibling" value="0x7fca468f3af0" id="14098" addr="0x7fca468f3af0" />
+                                <attribute name="kind" value="function" id="14099" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="create" id="14100" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca468f4010" id="14101" addr="0x7fca468f4010" />
+                                <attribute name="sym_nextSibling" value="0x7fca468f4010" id="14102" addr="0x7fca468f4010" />
+                                <attribute name="defaultargs" value="0x7fca468f3af0" id="14103" addr="0x7fca468f3af0" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="14104" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="14105" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468f3af0" id="14106" addr="0x7fca468f3af0" />
+                                <parmlist id="14107" addr="0x7fca468f3b90" >
                                     <parm id="14108">
-                                        <attributelist id="14109" addr="0x7f99f1da5b90" >
-                                            <attribute name="name" value="heading" id="14110" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14111" addr="0x7f99f1de6c90" />
+                                        <attributelist id="14109" addr="0x7fca468f3b90" >
+                                            <attribute name="name" value="heading" id="14110" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14111" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="14112">
-                                        <attributelist id="14113" addr="0x7f99f1da5c70" >
-                                            <attribute name="name" value="line1" id="14114" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="14115" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14116" addr="0x7f99f1de6c90" />
+                                        <attributelist id="14113" addr="0x7fca468f3c70" >
+                                            <attribute name="name" value="line1" id="14114" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="14115" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14116" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="14117">
-                                        <attributelist id="14118" addr="0x7f99f1da5d10" >
-                                            <attribute name="name" value="line2" id="14119" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="14120" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14121" addr="0x7f99f1de6c90" />
+                                        <attributelist id="14118" addr="0x7fca468f3d10" >
+                                            <attribute name="name" value="line2" id="14119" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="14120" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14121" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="14122" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="14123" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="14122" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="14123" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="14124" addr="0x7f99f1da6010" >
-                            <attributelist id="14125" addr="0x7f99f1da6010" >
-                                <attribute name="name" value="create" id="14126" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="14127" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1da4990" id="14128" addr="0x7f99f1da4990" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1da5dd0" id="14129" addr="0x7f99f1da5dd0" />
-                                <attribute name="kind" value="function" id="14130" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="create" id="14131" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1da61b0" id="14132" addr="0x7f99f1da61b0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1da61b0" id="14133" addr="0x7f99f1da61b0" />
-                                <attribute name="defaultargs" value="0x7f99f1da5af0" id="14134" addr="0x7f99f1da5af0" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="14135" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="14136" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1da5af0" id="14137" addr="0x7f99f1da5af0" />
-                                <parmlist id="14138" addr="0x7f99f1da5e70" >
+                        <cdecl id="14124" addr="0x7fca468f4010" >
+                            <attributelist id="14125" addr="0x7fca468f4010" >
+                                <attribute name="name" value="create" id="14126" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="14127" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468f2990" id="14128" addr="0x7fca468f2990" />
+                                <attribute name="sym_previousSibling" value="0x7fca468f3dd0" id="14129" addr="0x7fca468f3dd0" />
+                                <attribute name="kind" value="function" id="14130" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="create" id="14131" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca468f41b0" id="14132" addr="0x7fca468f41b0" />
+                                <attribute name="sym_nextSibling" value="0x7fca468f41b0" id="14133" addr="0x7fca468f41b0" />
+                                <attribute name="defaultargs" value="0x7fca468f3af0" id="14134" addr="0x7fca468f3af0" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="14135" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="14136" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468f3af0" id="14137" addr="0x7fca468f3af0" />
+                                <parmlist id="14138" addr="0x7fca468f3e70" >
                                     <parm id="14139">
-                                        <attributelist id="14140" addr="0x7f99f1da5e70" >
-                                            <attribute name="name" value="heading" id="14141" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14142" addr="0x7f99f1de6c90" />
+                                        <attributelist id="14140" addr="0x7fca468f3e70" >
+                                            <attribute name="name" value="heading" id="14141" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14142" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="14143">
-                                        <attributelist id="14144" addr="0x7f99f1da5f50" >
-                                            <attribute name="name" value="line1" id="14145" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="14146" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14147" addr="0x7f99f1de6c90" />
+                                        <attributelist id="14144" addr="0x7fca468f3f50" >
+                                            <attribute name="name" value="line1" id="14145" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="14146" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14147" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="14148" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_2" id="14149" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="14148" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_2" id="14149" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="14150" addr="0x7f99f1da61b0" >
-                            <attributelist id="14151" addr="0x7f99f1da61b0" >
-                                <attribute name="name" value="create" id="14152" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="14153" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1da4990" id="14154" addr="0x7f99f1da4990" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1da6010" id="14155" addr="0x7f99f1da6010" />
-                                <attribute name="kind" value="function" id="14156" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="create" id="14157" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1da5af0" id="14158" addr="0x7f99f1da5af0" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="14159" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="14160" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1da5af0" id="14161" addr="0x7f99f1da5af0" />
-                                <parmlist id="14162" addr="0x7f99f1da60b0" >
+                        <cdecl id="14150" addr="0x7fca468f41b0" >
+                            <attributelist id="14151" addr="0x7fca468f41b0" >
+                                <attribute name="name" value="create" id="14152" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="14153" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468f2990" id="14154" addr="0x7fca468f2990" />
+                                <attribute name="sym_previousSibling" value="0x7fca468f4010" id="14155" addr="0x7fca468f4010" />
+                                <attribute name="kind" value="function" id="14156" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="create" id="14157" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca468f3af0" id="14158" addr="0x7fca468f3af0" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="14159" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="14160" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468f3af0" id="14161" addr="0x7fca468f3af0" />
+                                <parmlist id="14162" addr="0x7fca468f40b0" >
                                     <parm id="14163">
-                                        <attributelist id="14164" addr="0x7f99f1da60b0" >
-                                            <attribute name="name" value="heading" id="14165" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14166" addr="0x7f99f1de6c90" />
+                                        <attributelist id="14164" addr="0x7fca468f40b0" >
+                                            <attribute name="name" value="heading" id="14165" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14166" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="14167" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_3" id="14168" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="14167" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_3" id="14168" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="14169" addr="0x7f99f1da6970" >
-                            <attributelist id="14170" addr="0x7f99f1da6970" >
-                                <attribute name="name" value="update" id="14171" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="14172" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1da4990" id="14173" addr="0x7f99f1da4990" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1da6c50" id="14174" addr="0x7f99f1da6c50" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1da6c50" id="14175" addr="0x7f99f1da6c50" />
-                                <attribute name="kind" value="function" id="14176" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="update" id="14177" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="14178" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="14179" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1da6970" id="14180" addr="0x7f99f1da6970" />
-                                <parmlist id="14181" addr="0x7f99f1da63d0" >
+                        <cdecl id="14169" addr="0x7fca468f4970" >
+                            <attributelist id="14170" addr="0x7fca468f4970" >
+                                <attribute name="name" value="update" id="14171" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="14172" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468f2990" id="14173" addr="0x7fca468f2990" />
+                                <attribute name="sym_nextSibling" value="0x7fca468f4c50" id="14174" addr="0x7fca468f4c50" />
+                                <attribute name="csym_nextSibling" value="0x7fca468f4c50" id="14175" addr="0x7fca468f4c50" />
+                                <attribute name="kind" value="function" id="14176" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="update" id="14177" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="14178" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="14179" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468f4970" id="14180" addr="0x7fca468f4970" />
+                                <parmlist id="14181" addr="0x7fca468f43d0" >
                                     <parm id="14182">
-                                        <attributelist id="14183" addr="0x7f99f1da63d0" >
-                                            <attribute name="name" value="percent" id="14184" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="14185" addr="0x7f99f1de6c90" />
+                                        <attributelist id="14183" addr="0x7fca468f43d0" >
+                                            <attribute name="name" value="percent" id="14184" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="14185" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="14186">
-                                        <attributelist id="14187" addr="0x7f99f1da6570" >
-                                            <attribute name="name" value="line1" id="14188" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="14189" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14190" addr="0x7f99f1de6c90" />
+                                        <attributelist id="14187" addr="0x7fca468f4570" >
+                                            <attribute name="name" value="line1" id="14188" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="14189" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14190" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="14191">
-                                        <attributelist id="14192" addr="0x7f99f1da6710" >
-                                            <attribute name="name" value="line2" id="14193" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="14194" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14195" addr="0x7f99f1de6c90" />
+                                        <attributelist id="14192" addr="0x7fca468f4710" >
+                                            <attribute name="name" value="line2" id="14193" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="14194" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14195" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="14196">
-                                        <attributelist id="14197" addr="0x7f99f1da68b0" >
-                                            <attribute name="name" value="line3" id="14198" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="14199" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14200" addr="0x7f99f1de6c90" />
+                                        <attributelist id="14197" addr="0x7fca468f48b0" >
+                                            <attribute name="name" value="line3" id="14198" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="14199" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14200" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="14201" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="14202" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="14201" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="14202" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="14203" addr="0x7f99f1da6c50" >
-                            <attributelist id="14204" addr="0x7f99f1da6c50" >
-                                <attribute name="name" value="update" id="14205" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="14206" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1da4990" id="14207" addr="0x7f99f1da4990" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1da6970" id="14208" addr="0x7f99f1da6970" />
-                                <attribute name="kind" value="function" id="14209" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="update" id="14210" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1da6e90" id="14211" addr="0x7f99f1da6e90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1da6e90" id="14212" addr="0x7f99f1da6e90" />
-                                <attribute name="defaultargs" value="0x7f99f1da6970" id="14213" addr="0x7f99f1da6970" />
-                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="14214" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="14215" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1da6970" id="14216" addr="0x7f99f1da6970" />
-                                <parmlist id="14217" addr="0x7f99f1da6a10" >
+                        <cdecl id="14203" addr="0x7fca468f4c50" >
+                            <attributelist id="14204" addr="0x7fca468f4c50" >
+                                <attribute name="name" value="update" id="14205" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="14206" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468f2990" id="14207" addr="0x7fca468f2990" />
+                                <attribute name="sym_previousSibling" value="0x7fca468f4970" id="14208" addr="0x7fca468f4970" />
+                                <attribute name="kind" value="function" id="14209" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="update" id="14210" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca468f4e90" id="14211" addr="0x7fca468f4e90" />
+                                <attribute name="sym_nextSibling" value="0x7fca468f4e90" id="14212" addr="0x7fca468f4e90" />
+                                <attribute name="defaultargs" value="0x7fca468f4970" id="14213" addr="0x7fca468f4970" />
+                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="14214" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="14215" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468f4970" id="14216" addr="0x7fca468f4970" />
+                                <parmlist id="14217" addr="0x7fca468f4a10" >
                                     <parm id="14218">
-                                        <attributelist id="14219" addr="0x7f99f1da6a10" >
-                                            <attribute name="name" value="percent" id="14220" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="14221" addr="0x7f99f1de6c90" />
+                                        <attributelist id="14219" addr="0x7fca468f4a10" >
+                                            <attribute name="name" value="percent" id="14220" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="14221" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="14222">
-                                        <attributelist id="14223" addr="0x7f99f1da6af0" >
-                                            <attribute name="name" value="line1" id="14224" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="14225" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14226" addr="0x7f99f1de6c90" />
+                                        <attributelist id="14223" addr="0x7fca468f4af0" >
+                                            <attribute name="name" value="line1" id="14224" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="14225" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14226" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="14227">
-                                        <attributelist id="14228" addr="0x7f99f1da6b90" >
-                                            <attribute name="name" value="line2" id="14229" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="14230" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14231" addr="0x7f99f1de6c90" />
+                                        <attributelist id="14228" addr="0x7fca468f4b90" >
+                                            <attribute name="name" value="line2" id="14229" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="14230" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14231" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="14232" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="14233" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="14232" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="14233" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="14234" addr="0x7f99f1da6e90" >
-                            <attributelist id="14235" addr="0x7f99f1da6e90" >
-                                <attribute name="name" value="update" id="14236" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="14237" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1da4990" id="14238" addr="0x7f99f1da4990" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1da6c50" id="14239" addr="0x7f99f1da6c50" />
-                                <attribute name="kind" value="function" id="14240" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="update" id="14241" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1da7030" id="14242" addr="0x7f99f1da7030" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1da7030" id="14243" addr="0x7f99f1da7030" />
-                                <attribute name="defaultargs" value="0x7f99f1da6970" id="14244" addr="0x7f99f1da6970" />
-                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String)." id="14245" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="14246" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1da6970" id="14247" addr="0x7f99f1da6970" />
-                                <parmlist id="14248" addr="0x7f99f1da6cf0" >
+                        <cdecl id="14234" addr="0x7fca468f4e90" >
+                            <attributelist id="14235" addr="0x7fca468f4e90" >
+                                <attribute name="name" value="update" id="14236" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="14237" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468f2990" id="14238" addr="0x7fca468f2990" />
+                                <attribute name="sym_previousSibling" value="0x7fca468f4c50" id="14239" addr="0x7fca468f4c50" />
+                                <attribute name="kind" value="function" id="14240" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="update" id="14241" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca468f5030" id="14242" addr="0x7fca468f5030" />
+                                <attribute name="sym_nextSibling" value="0x7fca468f5030" id="14243" addr="0x7fca468f5030" />
+                                <attribute name="defaultargs" value="0x7fca468f4970" id="14244" addr="0x7fca468f4970" />
+                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String)." id="14245" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="14246" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468f4970" id="14247" addr="0x7fca468f4970" />
+                                <parmlist id="14248" addr="0x7fca468f4cf0" >
                                     <parm id="14249">
-                                        <attributelist id="14250" addr="0x7f99f1da6cf0" >
-                                            <attribute name="name" value="percent" id="14251" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="14252" addr="0x7f99f1de6c90" />
+                                        <attributelist id="14250" addr="0x7fca468f4cf0" >
+                                            <attribute name="name" value="percent" id="14251" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="14252" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="14253">
-                                        <attributelist id="14254" addr="0x7f99f1da6dd0" >
-                                            <attribute name="name" value="line1" id="14255" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="14256" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14257" addr="0x7f99f1de6c90" />
+                                        <attributelist id="14254" addr="0x7fca468f4dd0" >
+                                            <attribute name="name" value="line1" id="14255" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="14256" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14257" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="14258" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_2" id="14259" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="14258" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_2" id="14259" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="14260" addr="0x7f99f1da7030" >
-                            <attributelist id="14261" addr="0x7f99f1da7030" >
-                                <attribute name="name" value="update" id="14262" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="14263" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1da4990" id="14264" addr="0x7f99f1da4990" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1da6e90" id="14265" addr="0x7f99f1da6e90" />
-                                <attribute name="kind" value="function" id="14266" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="update" id="14267" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1da6970" id="14268" addr="0x7f99f1da6970" />
-                                <attribute name="decl" value="f(int)." id="14269" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="14270" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1da6970" id="14271" addr="0x7f99f1da6970" />
-                                <parmlist id="14272" addr="0x7f99f1da6f30" >
+                        <cdecl id="14260" addr="0x7fca468f5030" >
+                            <attributelist id="14261" addr="0x7fca468f5030" >
+                                <attribute name="name" value="update" id="14262" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="14263" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468f2990" id="14264" addr="0x7fca468f2990" />
+                                <attribute name="sym_previousSibling" value="0x7fca468f4e90" id="14265" addr="0x7fca468f4e90" />
+                                <attribute name="kind" value="function" id="14266" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="update" id="14267" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca468f4970" id="14268" addr="0x7fca468f4970" />
+                                <attribute name="decl" value="f(int)." id="14269" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="14270" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468f4970" id="14271" addr="0x7fca468f4970" />
+                                <parmlist id="14272" addr="0x7fca468f4f30" >
                                     <parm id="14273">
-                                        <attributelist id="14274" addr="0x7f99f1da6f30" >
-                                            <attribute name="name" value="percent" id="14275" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="14276" addr="0x7f99f1de6c90" />
+                                        <attributelist id="14274" addr="0x7fca468f4f30" >
+                                            <attribute name="name" value="percent" id="14275" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="14276" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="14277" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_3" id="14278" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="14277" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_3" id="14278" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="14279" addr="0x7f99f1da71f0" >
-                            <attributelist id="14280" addr="0x7f99f1da71f0" >
-                                <attribute name="ismember" value="1" id="14281" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="close" id="14282" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="close" id="14283" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="14284" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="14285" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="14286" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="void" id="14287" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1da4990" id="14288" addr="0x7f99f1da4990" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="14289" addr="0x7f99f1de6c90" />
+                        <cdecl id="14279" addr="0x7fca468f51f0" >
+                            <attributelist id="14280" addr="0x7fca468f51f0" >
+                                <attribute name="ismember" value="1" id="14281" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="close" id="14282" addr="0x7fca46934c90" />
+                                <attribute name="name" value="close" id="14283" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="14284" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="14285" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="14286" addr="0x7fca46934c90" />
+                                <attribute name="type" value="void" id="14287" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468f2990" id="14288" addr="0x7fca468f2990" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="14289" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="14290" addr="0x7f99f1da73b0" >
-                            <attributelist id="14291" addr="0x7f99f1da73b0" >
-                                <attribute name="ismember" value="1" id="14292" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="iscanceled" id="14293" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="iscanceled" id="14294" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="14295" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="14296" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="14297" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="bool" id="14298" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1da4990" id="14299" addr="0x7f99f1da4990" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="14300" addr="0x7f99f1de6c90" />
+                        <cdecl id="14290" addr="0x7fca468f53b0" >
+                            <attributelist id="14291" addr="0x7fca468f53b0" >
+                                <attribute name="ismember" value="1" id="14292" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="iscanceled" id="14293" addr="0x7fca46934c90" />
+                                <attribute name="name" value="iscanceled" id="14294" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="14295" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="14296" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="14297" addr="0x7fca46934c90" />
+                                <attribute name="type" value="bool" id="14298" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468f2990" id="14299" addr="0x7fca468f2990" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="14300" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
                     </class >
-                    <class id="14301" addr="0x7f99f1da7670" >
-                        <attributelist id="14302" addr="0x7f99f1da7670" >
-                            <attribute name="name" value="XBMCAddon::xbmcgui::DialogBusy" id="14303" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="14304" addr="0x7f99f1e40fb0" />
-                            <attribute name="symtab" value="0x7f99f1da77b0" id="14305" addr="0x7f99f1da77b0" />
-                            <attribute name="allows_typedef" value="1" id="14306" addr="0x7f99f1de6c90" />
-                            <attribute name="typepass_visit" value="1" id="14307" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_visit" value="1" id="14308" addr="0x7f99f1de6c90" />
-                            <attribute name="kind" value="class" id="14309" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_name" value="DialogBusy" id="14310" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_default_constructor" value="1" id="14311" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_has_constructor" value="1" id="14312" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_public_constructor" value="1" id="14313" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_has_destructor" value="1" id="14314" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_default_destructor" value="1" id="14315" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_copy_constructor" value="1" id="14316" addr="0x7f99f1de6c90" />
-                            <attribute name="privatebaselist" value="0x7f99f1da7650" id="14317" addr="0x7f99f1da7650" />
-                            <attribute name="protectedbaselist" value="0x7f99f1da7630" id="14318" addr="0x7f99f1da7630" />
-                            <baselist id="14319" addr="0x7f99f1da7610" >
-                                <base name="AddonClass" id="14320" addr="0x7f99f1da7590" />
+                    <class id="14301" addr="0x7fca468f5670" >
+                        <attributelist id="14302" addr="0x7fca468f5670" >
+                            <attribute name="name" value="XBMCAddon::xbmcgui::DialogBusy" id="14303" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="14304" addr="0x7fca4698efb0" />
+                            <attribute name="symtab" value="0x7fca468f57b0" id="14305" addr="0x7fca468f57b0" />
+                            <attribute name="allows_typedef" value="1" id="14306" addr="0x7fca46934c90" />
+                            <attribute name="typepass_visit" value="1" id="14307" addr="0x7fca46934c90" />
+                            <attribute name="allocate_visit" value="1" id="14308" addr="0x7fca46934c90" />
+                            <attribute name="kind" value="class" id="14309" addr="0x7fca46934c90" />
+                            <attribute name="sym_name" value="DialogBusy" id="14310" addr="0x7fca46934c90" />
+                            <attribute name="allocate_default_constructor" value="1" id="14311" addr="0x7fca46934c90" />
+                            <attribute name="allocate_has_constructor" value="1" id="14312" addr="0x7fca46934c90" />
+                            <attribute name="allocate_public_constructor" value="1" id="14313" addr="0x7fca46934c90" />
+                            <attribute name="allocate_has_destructor" value="1" id="14314" addr="0x7fca46934c90" />
+                            <attribute name="allocate_default_destructor" value="1" id="14315" addr="0x7fca46934c90" />
+                            <attribute name="allocate_copy_constructor" value="1" id="14316" addr="0x7fca46934c90" />
+                            <attribute name="privatebaselist" value="0x7fca468f5650" id="14317" addr="0x7fca468f5650" />
+                            <attribute name="protectedbaselist" value="0x7fca468f5630" id="14318" addr="0x7fca468f5630" />
+                            <baselist id="14319" addr="0x7fca468f5610" >
+                                <base name="AddonClass" id="14320" addr="0x7fca468f5590" />
                             </baselist >
-                            <attribute name="module" value="xbmcgui" id="14321" addr="0x7f99f1e402f0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="14322" addr="0x7f99f1de6c90" />
-                            <typescope id="14323" addr="0x7f99f1de1270" >
-                                <attributelist id="14324" addr="0x7f99f1de1270" >
-                                    <attribute name="name" value="DialogBusy" id="14325" addr="0x7f99f1de6c90" />
-                                    <typetab id="14326" addr="0x7f99f1de1290" >
-                                        <attributelist id="14327" addr="0x7f99f1de1290" >
+                            <attribute name="module" value="xbmcgui" id="14321" addr="0x7fca4698e2f0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="14322" addr="0x7fca46934c90" />
+                            <typescope id="14323" addr="0x7fca4692f270" >
+                                <attributelist id="14324" addr="0x7fca4692f270" >
+                                    <attribute name="name" value="DialogBusy" id="14325" addr="0x7fca46934c90" />
+                                    <typetab id="14326" addr="0x7fca4692f290" >
+                                        <attributelist id="14327" addr="0x7fca4692f290" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f99f1dd2150" id="14328" addr="0x7f99f1dd2150" />
-                                    <attribute name="qname" value="XBMCAddon::xbmcgui::DialogBusy" id="14329" addr="0x7f99f1de6c90" />
-                                    <attribute name="symtab" value="0x7f99f1da77b0" id="14330" addr="0x7f99f1da77b0" />
+                                    <attribute name="parent" value="0x7fca46920150" id="14328" addr="0x7fca46920150" />
+                                    <attribute name="qname" value="XBMCAddon::xbmcgui::DialogBusy" id="14329" addr="0x7fca46934c90" />
+                                    <attribute name="symtab" value="0x7fca468f57b0" id="14330" addr="0x7fca468f57b0" />
                                 </attributelist >
-                                <typescopesitem id="14331" addr="0x7f99f1de1210" >
-                                    <attributelist id="14332" addr="0x7f99f1de1210" >
+                                <typescopesitem id="14331" addr="0x7fca4692f210" >
+                                    <attributelist id="14332" addr="0x7fca4692f210" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="14333" addr="0x7f99f1de1290" >
-                                    <attributelist id="14334" addr="0x7f99f1de1290" >
+                                <typescopesitem id="14333" addr="0x7fca4692f290" >
+                                    <attributelist id="14334" addr="0x7fca4692f290" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="14335" addr="0x7f99f1dd2150" >
-                                    <attributelist id="14336" addr="0x7f99f1dd2150" >
-                                        <attribute name="name" value="xbmcgui" id="14337" addr="0x7f99f1de6c90" />
-                                        <typetab id="14338" addr="0x7f99f1dd2170" >
-                                            <attributelist id="14339" addr="0x7f99f1dd2170" >
-                                                <attribute name="InterceptorBase" value="InterceptorBase" id="14340" addr="0x7f99f1de6c90" />
-                                                <attribute name="Dialog" value="Dialog" id="14341" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="14342" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="14343" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlTextBox" value="ControlTextBox" id="14344" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="14345" addr="0x7f99f1de6c90" />
-                                                <attribute name="Window" value="Window" id="14346" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="14347" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlList" value="ControlList" id="14348" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="14349" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlImage" value="ControlImage" id="14350" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlButton" value="ControlButton" id="14351" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlGroup" value="ControlGroup" id="14352" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogBusy" value="DialogBusy" id="14353" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="14354" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSpin" value="ControlSpin" id="14355" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlEdit" value="ControlEdit" id="14356" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="14357" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="14358" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlLabel" value="ControlLabel" id="14359" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlProgress" value="ControlProgress" id="14360" addr="0x7f99f1de6c90" />
-                                                <attribute name="Control" value="Control" id="14361" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSlider" value="ControlSlider" id="14362" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgress" value="DialogProgress" id="14363" addr="0x7f99f1de6c90" />
-                                                <attribute name="Action" value="Action" id="14364" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowDialog" value="WindowDialog" id="14365" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXML" value="WindowXML" id="14366" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItem" value="ListItem" id="14367" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="14368" addr="0x7f99f1de6c90" />
+                                <typescopesitem id="14335" addr="0x7fca46920150" >
+                                    <attributelist id="14336" addr="0x7fca46920150" >
+                                        <attribute name="name" value="xbmcgui" id="14337" addr="0x7fca46934c90" />
+                                        <typetab id="14338" addr="0x7fca46920170" >
+                                            <attributelist id="14339" addr="0x7fca46920170" >
+                                                <attribute name="InterceptorBase" value="InterceptorBase" id="14340" addr="0x7fca46934c90" />
+                                                <attribute name="Dialog" value="Dialog" id="14341" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="14342" addr="0x7fca46934c90" />
+                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="14343" addr="0x7fca46934c90" />
+                                                <attribute name="ControlTextBox" value="ControlTextBox" id="14344" addr="0x7fca46934c90" />
+                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="14345" addr="0x7fca46934c90" />
+                                                <attribute name="Window" value="Window" id="14346" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="14347" addr="0x7fca46934c90" />
+                                                <attribute name="ControlList" value="ControlList" id="14348" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="14349" addr="0x7fca46934c90" />
+                                                <attribute name="ControlImage" value="ControlImage" id="14350" addr="0x7fca46934c90" />
+                                                <attribute name="ControlButton" value="ControlButton" id="14351" addr="0x7fca46934c90" />
+                                                <attribute name="ControlGroup" value="ControlGroup" id="14352" addr="0x7fca46934c90" />
+                                                <attribute name="DialogBusy" value="DialogBusy" id="14353" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="14354" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSpin" value="ControlSpin" id="14355" addr="0x7fca46934c90" />
+                                                <attribute name="ControlEdit" value="ControlEdit" id="14356" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="14357" addr="0x7fca46934c90" />
+                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="14358" addr="0x7fca46934c90" />
+                                                <attribute name="ControlLabel" value="ControlLabel" id="14359" addr="0x7fca46934c90" />
+                                                <attribute name="ControlProgress" value="ControlProgress" id="14360" addr="0x7fca46934c90" />
+                                                <attribute name="Control" value="Control" id="14361" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSlider" value="ControlSlider" id="14362" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgress" value="DialogProgress" id="14363" addr="0x7fca46934c90" />
+                                                <attribute name="Action" value="Action" id="14364" addr="0x7fca46934c90" />
+                                                <attribute name="WindowDialog" value="WindowDialog" id="14365" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXML" value="WindowXML" id="14366" addr="0x7fca46934c90" />
+                                                <attribute name="ListItem" value="ListItem" id="14367" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="14368" addr="0x7fca46934c90" />
                                             </attributelist >
-                                            <typetabsitem id="14369" addr="0x7f99f1de1dd0" >
-                                                <attributelist id="14370" addr="0x7f99f1de1dd0" >
+                                            <typetabsitem id="14369" addr="0x7fca4692fdd0" >
+                                                <attributelist id="14370" addr="0x7fca4692fdd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14371" addr="0x7f99f1dde790" >
-                                                <attributelist id="14372" addr="0x7f99f1dde790" >
+                                            <typetabsitem id="14371" addr="0x7fca4692c790" >
+                                                <attributelist id="14372" addr="0x7fca4692c790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14373" addr="0x7f99f1de3f10" >
-                                                <attributelist id="14374" addr="0x7f99f1de3f10" >
+                                            <typetabsitem id="14373" addr="0x7fca46931f10" >
+                                                <attributelist id="14374" addr="0x7fca46931f10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14375" addr="0x7f99f1dd67b0" >
-                                                <attributelist id="14376" addr="0x7f99f1dd67b0" >
+                                            <typetabsitem id="14375" addr="0x7fca469247b0" >
+                                                <attributelist id="14376" addr="0x7fca469247b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14377" addr="0x7f99f1ddafd0" >
-                                                <attributelist id="14378" addr="0x7f99f1ddafd0" >
+                                            <typetabsitem id="14377" addr="0x7fca46928fd0" >
+                                                <attributelist id="14378" addr="0x7fca46928fd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14379" addr="0x7f99f1ddd430" >
-                                                <attributelist id="14380" addr="0x7f99f1ddd430" >
+                                            <typetabsitem id="14379" addr="0x7fca4692b430" >
+                                                <attributelist id="14380" addr="0x7fca4692b430" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14381" addr="0x7f99f1de2130" >
-                                                <attributelist id="14382" addr="0x7f99f1de2130" >
+                                            <typetabsitem id="14381" addr="0x7fca46930130" >
+                                                <attributelist id="14382" addr="0x7fca46930130" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14383" addr="0x7f99f1dd2f50" >
-                                                <attributelist id="14384" addr="0x7f99f1dd2f50" >
+                                            <typetabsitem id="14383" addr="0x7fca46920f50" >
+                                                <attributelist id="14384" addr="0x7fca46920f50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14385" addr="0x7f99f1dd9650" >
-                                                <attributelist id="14386" addr="0x7f99f1dd9650" >
+                                            <typetabsitem id="14385" addr="0x7fca46927650" >
+                                                <attributelist id="14386" addr="0x7fca46927650" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14387" addr="0x7f99f1de3390" >
-                                                <attributelist id="14388" addr="0x7f99f1de3390" >
+                                            <typetabsitem id="14387" addr="0x7fca46931390" >
+                                                <attributelist id="14388" addr="0x7fca46931390" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14389" addr="0x7f99f1ddb7b0" >
-                                                <attributelist id="14390" addr="0x7f99f1ddb7b0" >
+                                            <typetabsitem id="14389" addr="0x7fca469297b0" >
+                                                <attributelist id="14390" addr="0x7fca469297b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14391" addr="0x7f99f1ddc4b0" >
-                                                <attributelist id="14392" addr="0x7f99f1ddc4b0" >
+                                            <typetabsitem id="14391" addr="0x7fca4692a4b0" >
+                                                <attributelist id="14392" addr="0x7fca4692a4b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14393" addr="0x7f99f1ddcf90" >
-                                                <attributelist id="14394" addr="0x7f99f1ddcf90" >
+                                            <typetabsitem id="14393" addr="0x7fca4692af90" >
+                                                <attributelist id="14394" addr="0x7fca4692af90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14395" addr="0x7f99f1de11b0" >
-                                                <attributelist id="14396" addr="0x7f99f1de11b0" >
+                                            <typetabsitem id="14395" addr="0x7fca4692f1b0" >
+                                                <attributelist id="14396" addr="0x7fca4692f1b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14397" addr="0x7f99f1de15b0" >
-                                                <attributelist id="14398" addr="0x7f99f1de15b0" >
+                                            <typetabsitem id="14397" addr="0x7fca4692f5b0" >
+                                                <attributelist id="14398" addr="0x7fca4692f5b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14399" addr="0x7f99f1dd77f0" >
-                                                <attributelist id="14400" addr="0x7f99f1dd77f0" >
+                                            <typetabsitem id="14399" addr="0x7fca469257f0" >
+                                                <attributelist id="14400" addr="0x7fca469257f0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14401" addr="0x7f99f1dd8b30" >
-                                                <attributelist id="14402" addr="0x7f99f1dd8b30" >
+                                            <typetabsitem id="14401" addr="0x7fca46926b30" >
+                                                <attributelist id="14402" addr="0x7fca46926b30" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14403" addr="0x7f99f1dd2c50" >
-                                                <attributelist id="14404" addr="0x7f99f1dd2c50" >
+                                            <typetabsitem id="14403" addr="0x7fca46920c50" >
+                                                <attributelist id="14404" addr="0x7fca46920c50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14405" addr="0x7f99f1dda790" >
-                                                <attributelist id="14406" addr="0x7f99f1dda790" >
+                                            <typetabsitem id="14405" addr="0x7fca46928790" >
+                                                <attributelist id="14406" addr="0x7fca46928790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14407" addr="0x7f99f1dd8030" >
-                                                <attributelist id="14408" addr="0x7f99f1dd8030" >
+                                            <typetabsitem id="14407" addr="0x7fca46926030" >
+                                                <attributelist id="14408" addr="0x7fca46926030" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14409" addr="0x7f99f1ddbe10" >
-                                                <attributelist id="14410" addr="0x7f99f1ddbe10" >
+                                            <typetabsitem id="14409" addr="0x7fca46929e10" >
+                                                <attributelist id="14410" addr="0x7fca46929e10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14411" addr="0x7f99f1dd6b10" >
-                                                <attributelist id="14412" addr="0x7f99f1dd6b10" >
+                                            <typetabsitem id="14411" addr="0x7fca46924b10" >
+                                                <attributelist id="14412" addr="0x7fca46924b10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14413" addr="0x7f99f1dddf90" >
-                                                <attributelist id="14414" addr="0x7f99f1dddf90" >
+                                            <typetabsitem id="14413" addr="0x7fca4692bf90" >
+                                                <attributelist id="14414" addr="0x7fca4692bf90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14415" addr="0x7f99f1de0530" >
-                                                <attributelist id="14416" addr="0x7f99f1de0530" >
+                                            <typetabsitem id="14415" addr="0x7fca4692e530" >
+                                                <attributelist id="14416" addr="0x7fca4692e530" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14417" addr="0x7f99f1de1e50" >
-                                                <attributelist id="14418" addr="0x7f99f1de1e50" >
+                                            <typetabsitem id="14417" addr="0x7fca4692fe50" >
+                                                <attributelist id="14418" addr="0x7fca4692fe50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14419" addr="0x7f99f1de2d90" >
-                                                <attributelist id="14420" addr="0x7f99f1de2d90" >
+                                            <typetabsitem id="14419" addr="0x7fca46930d90" >
+                                                <attributelist id="14420" addr="0x7fca46930d90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14421" addr="0x7f99f1de3410" >
-                                                <attributelist id="14422" addr="0x7f99f1de3410" >
+                                            <typetabsitem id="14421" addr="0x7fca46931410" >
+                                                <attributelist id="14422" addr="0x7fca46931410" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14423" addr="0x7f99f1dd3590" >
-                                                <attributelist id="14424" addr="0x7f99f1dd3590" >
+                                            <typetabsitem id="14423" addr="0x7fca46921590" >
+                                                <attributelist id="14424" addr="0x7fca46921590" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14425" addr="0x7f99f1dd3390" >
-                                                <attributelist id="14426" addr="0x7f99f1dd3390" >
+                                            <typetabsitem id="14425" addr="0x7fca46921390" >
+                                                <attributelist id="14426" addr="0x7fca46921390" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7f99f1dd1d70" id="14427" addr="0x7f99f1dd1d70" />
-                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="14428" addr="0x7f99f1de6c90" />
-                                        <attribute name="symtab" value="0x7f99f1e40fb0" id="14429" addr="0x7f99f1e40fb0" />
+                                        <attribute name="parent" value="0x7fca4691fd70" id="14427" addr="0x7fca4691fd70" />
+                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="14428" addr="0x7fca46934c90" />
+                                        <attribute name="symtab" value="0x7fca4698efb0" id="14429" addr="0x7fca4698efb0" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="14430" addr="0x7f99f1de12b0" >
-                                    <attributelist id="14431" addr="0x7f99f1de12b0" >
+                                <typescopesitem id="14430" addr="0x7fca4692f2b0" >
+                                    <attributelist id="14431" addr="0x7fca4692f2b0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="14432" addr="0x7f99f1da77b0" >
-                                    <attributelist id="14433" addr="0x7f99f1da77b0" >
-                                        <attribute name="name" value="DialogBusy" id="14434" addr="0x7f99f1de6c90" />
-                                        <attribute name="csymtab" value="0x7f99f1da77d0" id="14435" addr="0x7f99f1da77d0" />
-                                        <attribute name="symtab" value="0x7f99f1da7770" id="14436" addr="0x7f99f1da7770" />
+                                <typescopesitem id="14432" addr="0x7fca468f57b0" >
+                                    <attributelist id="14433" addr="0x7fca468f57b0" >
+                                        <attribute name="name" value="DialogBusy" id="14434" addr="0x7fca46934c90" />
+                                        <attribute name="csymtab" value="0x7fca468f57d0" id="14435" addr="0x7fca468f57d0" />
+                                        <attribute name="symtab" value="0x7fca468f5770" id="14436" addr="0x7fca468f5770" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <access id="14437" addr="0x7f99f1da7730" >
-                            <attributelist id="14438" addr="0x7f99f1da7730" >
-                                <attribute name="kind" value="protected" id="14439" addr="0x7f99f1de6c90" />
+                        <access id="14437" addr="0x7fca468f5730" >
+                            <attributelist id="14438" addr="0x7fca468f5730" >
+                                <attribute name="kind" value="protected" id="14439" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </access >
-                        <cdecl id="14440" addr="0x7f99f1da7910" >
-                            <attributelist id="14441" addr="0x7f99f1da7910" >
-                                <attribute name="ismember" value="1" id="14442" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="deallocating" id="14443" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="deallocating" id="14444" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="14445" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="protected" id="14446" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="14447" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="void" id="14448" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1da77b0" id="14449" addr="0x7f99f1da77b0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="14450" addr="0x7f99f1de6c90" />
+                        <cdecl id="14440" addr="0x7fca468f5910" >
+                            <attributelist id="14441" addr="0x7fca468f5910" >
+                                <attribute name="ismember" value="1" id="14442" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="deallocating" id="14443" addr="0x7fca46934c90" />
+                                <attribute name="name" value="deallocating" id="14444" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="14445" addr="0x7fca46934c90" />
+                                <attribute name="access" value="protected" id="14446" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="14447" addr="0x7fca46934c90" />
+                                <attribute name="type" value="void" id="14448" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468f57b0" id="14449" addr="0x7fca468f57b0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="14450" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <access id="14451" addr="0x7f99f1da79b0" >
-                            <attributelist id="14452" addr="0x7f99f1da79b0" >
-                                <attribute name="kind" value="public" id="14453" addr="0x7f99f1de6c90" />
+                        <access id="14451" addr="0x7fca468f59b0" >
+                            <attributelist id="14452" addr="0x7fca468f59b0" >
+                                <attribute name="kind" value="public" id="14453" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="14454" addr="0x7f99f1da7af0" >
-                            <attributelist id="14455" addr="0x7f99f1da7af0" >
-                                <attribute name="ismember" value="1" id="14456" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="DialogBusy" id="14457" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="DialogBusy" id="14458" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="14459" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="14460" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="14461" addr="0x7f99f1de6c90" />
-                                <attribute name="code" value="{}" id="14462" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1da77b0" id="14463" addr="0x7f99f1da77b0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="14464" addr="0x7f99f1de6c90" />
+                        <constructor id="14454" addr="0x7fca468f5af0" >
+                            <attributelist id="14455" addr="0x7fca468f5af0" >
+                                <attribute name="ismember" value="1" id="14456" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="DialogBusy" id="14457" addr="0x7fca46934c90" />
+                                <attribute name="name" value="DialogBusy" id="14458" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="14459" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="14460" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="14461" addr="0x7fca46934c90" />
+                                <attribute name="code" value="{}" id="14462" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468f57b0" id="14463" addr="0x7fca468f57b0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="14464" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <destructor id="14465" addr="0x7f99f1da7c70" >
-                            <attributelist id="14466" addr="0x7f99f1da7c70" >
-                                <attribute name="ismember" value="1" id="14467" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="~DialogBusy" id="14468" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="~DialogBusy" id="14469" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="14470" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="14471" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1da77b0" id="14472" addr="0x7f99f1da77b0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="14473" addr="0x7f99f1de6c90" />
+                        <destructor id="14465" addr="0x7fca468f5c70" >
+                            <attributelist id="14466" addr="0x7fca468f5c70" >
+                                <attribute name="ismember" value="1" id="14467" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="~DialogBusy" id="14468" addr="0x7fca46934c90" />
+                                <attribute name="name" value="~DialogBusy" id="14469" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="14470" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="14471" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468f57b0" id="14472" addr="0x7fca468f57b0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="14473" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </destructor >
-                        <cdecl id="14474" addr="0x7f99f1da7e10" >
-                            <attributelist id="14475" addr="0x7f99f1da7e10" >
-                                <attribute name="ismember" value="1" id="14476" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="create" id="14477" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="create" id="14478" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="14479" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="14480" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="14481" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="void" id="14482" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1da77b0" id="14483" addr="0x7f99f1da77b0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="14484" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="14485" addr="0x7f99f1da8110" >
-                            <attributelist id="14486" addr="0x7f99f1da8110" >
-                                <attribute name="name" value="update" id="14487" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="14488" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1da77b0" id="14489" addr="0x7f99f1da77b0" />
-                                <attribute name="kind" value="function" id="14490" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="update" id="14491" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="q(const).f(int)." id="14492" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="14493" addr="0x7f99f1de6c90" />
-                                <parmlist id="14494" addr="0x7f99f1da8030" >
+                        <cdecl id="14474" addr="0x7fca468f5e10" >
+                            <attributelist id="14475" addr="0x7fca468f5e10" >
+                                <attribute name="ismember" value="1" id="14476" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="create" id="14477" addr="0x7fca46934c90" />
+                                <attribute name="name" value="create" id="14478" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="14479" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="14480" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="14481" addr="0x7fca46934c90" />
+                                <attribute name="type" value="void" id="14482" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468f57b0" id="14483" addr="0x7fca468f57b0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="14484" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="14485" addr="0x7fca468f6110" >
+                            <attributelist id="14486" addr="0x7fca468f6110" >
+                                <attribute name="name" value="update" id="14487" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="14488" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468f57b0" id="14489" addr="0x7fca468f57b0" />
+                                <attribute name="kind" value="function" id="14490" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="update" id="14491" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="q(const).f(int)." id="14492" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="14493" addr="0x7fca46934c90" />
+                                <parmlist id="14494" addr="0x7fca468f6030" >
                                     <parm id="14495">
-                                        <attributelist id="14496" addr="0x7f99f1da8030" >
-                                            <attribute name="name" value="percent" id="14497" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="14498" addr="0x7f99f1de6c90" />
+                                        <attributelist id="14496" addr="0x7fca468f6030" >
+                                            <attribute name="name" value="percent" id="14497" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="14498" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="14499" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="14500" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="14499" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="14500" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="14501" addr="0x7f99f1da82d0" >
-                            <attributelist id="14502" addr="0x7f99f1da82d0" >
-                                <attribute name="ismember" value="1" id="14503" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="close" id="14504" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="close" id="14505" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="14506" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="14507" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="14508" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="void" id="14509" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1da77b0" id="14510" addr="0x7f99f1da77b0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="14511" addr="0x7f99f1de6c90" />
+                        <cdecl id="14501" addr="0x7fca468f62d0" >
+                            <attributelist id="14502" addr="0x7fca468f62d0" >
+                                <attribute name="ismember" value="1" id="14503" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="close" id="14504" addr="0x7fca46934c90" />
+                                <attribute name="name" value="close" id="14505" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="14506" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="14507" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="14508" addr="0x7fca46934c90" />
+                                <attribute name="type" value="void" id="14509" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468f57b0" id="14510" addr="0x7fca468f57b0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="14511" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="14512" addr="0x7f99f1da84b0" >
-                            <attributelist id="14513" addr="0x7f99f1da84b0" >
-                                <attribute name="ismember" value="1" id="14514" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="iscanceled" id="14515" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="iscanceled" id="14516" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="q(const).f()." id="14517" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="14518" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="14519" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="bool" id="14520" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1da77b0" id="14521" addr="0x7f99f1da77b0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="14522" addr="0x7f99f1de6c90" />
+                        <cdecl id="14512" addr="0x7fca468f64b0" >
+                            <attributelist id="14513" addr="0x7fca468f64b0" >
+                                <attribute name="ismember" value="1" id="14514" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="iscanceled" id="14515" addr="0x7fca46934c90" />
+                                <attribute name="name" value="iscanceled" id="14516" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="q(const).f()." id="14517" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="14518" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="14519" addr="0x7fca46934c90" />
+                                <attribute name="type" value="bool" id="14520" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468f57b0" id="14521" addr="0x7fca468f57b0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="14522" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
                     </class >
-                    <class id="14523" addr="0x7f99f1da8770" >
-                        <attributelist id="14524" addr="0x7f99f1da8770" >
-                            <attribute name="name" value="XBMCAddon::xbmcgui::DialogProgressBG" id="14525" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="14526" addr="0x7f99f1e40fb0" />
-                            <attribute name="symtab" value="0x7f99f1da88b0" id="14527" addr="0x7f99f1da88b0" />
-                            <attribute name="allows_typedef" value="1" id="14528" addr="0x7f99f1de6c90" />
-                            <attribute name="typepass_visit" value="1" id="14529" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_visit" value="1" id="14530" addr="0x7f99f1de6c90" />
-                            <attribute name="kind" value="class" id="14531" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_name" value="DialogProgressBG" id="14532" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_default_constructor" value="1" id="14533" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_has_constructor" value="1" id="14534" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_public_constructor" value="1" id="14535" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_has_destructor" value="1" id="14536" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_default_destructor" value="1" id="14537" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_copy_constructor" value="1" id="14538" addr="0x7f99f1de6c90" />
-                            <attribute name="privatebaselist" value="0x7f99f1da8750" id="14539" addr="0x7f99f1da8750" />
-                            <attribute name="protectedbaselist" value="0x7f99f1da8730" id="14540" addr="0x7f99f1da8730" />
-                            <baselist id="14541" addr="0x7f99f1da8710" >
-                                <base name="AddonClass" id="14542" addr="0x7f99f1da8690" />
+                    <class id="14523" addr="0x7fca468f6770" >
+                        <attributelist id="14524" addr="0x7fca468f6770" >
+                            <attribute name="name" value="XBMCAddon::xbmcgui::DialogProgressBG" id="14525" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="14526" addr="0x7fca4698efb0" />
+                            <attribute name="symtab" value="0x7fca468f68b0" id="14527" addr="0x7fca468f68b0" />
+                            <attribute name="allows_typedef" value="1" id="14528" addr="0x7fca46934c90" />
+                            <attribute name="typepass_visit" value="1" id="14529" addr="0x7fca46934c90" />
+                            <attribute name="allocate_visit" value="1" id="14530" addr="0x7fca46934c90" />
+                            <attribute name="kind" value="class" id="14531" addr="0x7fca46934c90" />
+                            <attribute name="sym_name" value="DialogProgressBG" id="14532" addr="0x7fca46934c90" />
+                            <attribute name="allocate_default_constructor" value="1" id="14533" addr="0x7fca46934c90" />
+                            <attribute name="allocate_has_constructor" value="1" id="14534" addr="0x7fca46934c90" />
+                            <attribute name="allocate_public_constructor" value="1" id="14535" addr="0x7fca46934c90" />
+                            <attribute name="allocate_has_destructor" value="1" id="14536" addr="0x7fca46934c90" />
+                            <attribute name="allocate_default_destructor" value="1" id="14537" addr="0x7fca46934c90" />
+                            <attribute name="allocate_copy_constructor" value="1" id="14538" addr="0x7fca46934c90" />
+                            <attribute name="privatebaselist" value="0x7fca468f6750" id="14539" addr="0x7fca468f6750" />
+                            <attribute name="protectedbaselist" value="0x7fca468f6730" id="14540" addr="0x7fca468f6730" />
+                            <baselist id="14541" addr="0x7fca468f6710" >
+                                <base name="AddonClass" id="14542" addr="0x7fca468f6690" />
                             </baselist >
-                            <attribute name="module" value="xbmcgui" id="14543" addr="0x7f99f1e402f0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="14544" addr="0x7f99f1de6c90" />
-                            <typescope id="14545" addr="0x7f99f1de1690" >
-                                <attributelist id="14546" addr="0x7f99f1de1690" >
-                                    <attribute name="name" value="DialogProgressBG" id="14547" addr="0x7f99f1de6c90" />
-                                    <typetab id="14548" addr="0x7f99f1de16b0" >
-                                        <attributelist id="14549" addr="0x7f99f1de16b0" >
+                            <attribute name="module" value="xbmcgui" id="14543" addr="0x7fca4698e2f0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="14544" addr="0x7fca46934c90" />
+                            <typescope id="14545" addr="0x7fca4692f690" >
+                                <attributelist id="14546" addr="0x7fca4692f690" >
+                                    <attribute name="name" value="DialogProgressBG" id="14547" addr="0x7fca46934c90" />
+                                    <typetab id="14548" addr="0x7fca4692f6b0" >
+                                        <attributelist id="14549" addr="0x7fca4692f6b0" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f99f1dd2150" id="14550" addr="0x7f99f1dd2150" />
-                                    <attribute name="qname" value="XBMCAddon::xbmcgui::DialogProgressBG" id="14551" addr="0x7f99f1de6c90" />
-                                    <attribute name="symtab" value="0x7f99f1da88b0" id="14552" addr="0x7f99f1da88b0" />
+                                    <attribute name="parent" value="0x7fca46920150" id="14550" addr="0x7fca46920150" />
+                                    <attribute name="qname" value="XBMCAddon::xbmcgui::DialogProgressBG" id="14551" addr="0x7fca46934c90" />
+                                    <attribute name="symtab" value="0x7fca468f68b0" id="14552" addr="0x7fca468f68b0" />
                                 </attributelist >
-                                <typescopesitem id="14553" addr="0x7f99f1de1630" >
-                                    <attributelist id="14554" addr="0x7f99f1de1630" >
+                                <typescopesitem id="14553" addr="0x7fca4692f630" >
+                                    <attributelist id="14554" addr="0x7fca4692f630" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="14555" addr="0x7f99f1de16b0" >
-                                    <attributelist id="14556" addr="0x7f99f1de16b0" >
+                                <typescopesitem id="14555" addr="0x7fca4692f6b0" >
+                                    <attributelist id="14556" addr="0x7fca4692f6b0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="14557" addr="0x7f99f1dd2150" >
-                                    <attributelist id="14558" addr="0x7f99f1dd2150" >
-                                        <attribute name="name" value="xbmcgui" id="14559" addr="0x7f99f1de6c90" />
-                                        <typetab id="14560" addr="0x7f99f1dd2170" >
-                                            <attributelist id="14561" addr="0x7f99f1dd2170" >
-                                                <attribute name="InterceptorBase" value="InterceptorBase" id="14562" addr="0x7f99f1de6c90" />
-                                                <attribute name="Dialog" value="Dialog" id="14563" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="14564" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="14565" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlTextBox" value="ControlTextBox" id="14566" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="14567" addr="0x7f99f1de6c90" />
-                                                <attribute name="Window" value="Window" id="14568" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="14569" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlList" value="ControlList" id="14570" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="14571" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlImage" value="ControlImage" id="14572" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlButton" value="ControlButton" id="14573" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlGroup" value="ControlGroup" id="14574" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogBusy" value="DialogBusy" id="14575" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="14576" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSpin" value="ControlSpin" id="14577" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlEdit" value="ControlEdit" id="14578" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="14579" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="14580" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlLabel" value="ControlLabel" id="14581" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlProgress" value="ControlProgress" id="14582" addr="0x7f99f1de6c90" />
-                                                <attribute name="Control" value="Control" id="14583" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSlider" value="ControlSlider" id="14584" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgress" value="DialogProgress" id="14585" addr="0x7f99f1de6c90" />
-                                                <attribute name="Action" value="Action" id="14586" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowDialog" value="WindowDialog" id="14587" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXML" value="WindowXML" id="14588" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItem" value="ListItem" id="14589" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="14590" addr="0x7f99f1de6c90" />
+                                <typescopesitem id="14557" addr="0x7fca46920150" >
+                                    <attributelist id="14558" addr="0x7fca46920150" >
+                                        <attribute name="name" value="xbmcgui" id="14559" addr="0x7fca46934c90" />
+                                        <typetab id="14560" addr="0x7fca46920170" >
+                                            <attributelist id="14561" addr="0x7fca46920170" >
+                                                <attribute name="InterceptorBase" value="InterceptorBase" id="14562" addr="0x7fca46934c90" />
+                                                <attribute name="Dialog" value="Dialog" id="14563" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="14564" addr="0x7fca46934c90" />
+                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="14565" addr="0x7fca46934c90" />
+                                                <attribute name="ControlTextBox" value="ControlTextBox" id="14566" addr="0x7fca46934c90" />
+                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="14567" addr="0x7fca46934c90" />
+                                                <attribute name="Window" value="Window" id="14568" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="14569" addr="0x7fca46934c90" />
+                                                <attribute name="ControlList" value="ControlList" id="14570" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="14571" addr="0x7fca46934c90" />
+                                                <attribute name="ControlImage" value="ControlImage" id="14572" addr="0x7fca46934c90" />
+                                                <attribute name="ControlButton" value="ControlButton" id="14573" addr="0x7fca46934c90" />
+                                                <attribute name="ControlGroup" value="ControlGroup" id="14574" addr="0x7fca46934c90" />
+                                                <attribute name="DialogBusy" value="DialogBusy" id="14575" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="14576" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSpin" value="ControlSpin" id="14577" addr="0x7fca46934c90" />
+                                                <attribute name="ControlEdit" value="ControlEdit" id="14578" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="14579" addr="0x7fca46934c90" />
+                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="14580" addr="0x7fca46934c90" />
+                                                <attribute name="ControlLabel" value="ControlLabel" id="14581" addr="0x7fca46934c90" />
+                                                <attribute name="ControlProgress" value="ControlProgress" id="14582" addr="0x7fca46934c90" />
+                                                <attribute name="Control" value="Control" id="14583" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSlider" value="ControlSlider" id="14584" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgress" value="DialogProgress" id="14585" addr="0x7fca46934c90" />
+                                                <attribute name="Action" value="Action" id="14586" addr="0x7fca46934c90" />
+                                                <attribute name="WindowDialog" value="WindowDialog" id="14587" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXML" value="WindowXML" id="14588" addr="0x7fca46934c90" />
+                                                <attribute name="ListItem" value="ListItem" id="14589" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="14590" addr="0x7fca46934c90" />
                                             </attributelist >
-                                            <typetabsitem id="14591" addr="0x7f99f1de1dd0" >
-                                                <attributelist id="14592" addr="0x7f99f1de1dd0" >
+                                            <typetabsitem id="14591" addr="0x7fca4692fdd0" >
+                                                <attributelist id="14592" addr="0x7fca4692fdd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14593" addr="0x7f99f1dde790" >
-                                                <attributelist id="14594" addr="0x7f99f1dde790" >
+                                            <typetabsitem id="14593" addr="0x7fca4692c790" >
+                                                <attributelist id="14594" addr="0x7fca4692c790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14595" addr="0x7f99f1de3f10" >
-                                                <attributelist id="14596" addr="0x7f99f1de3f10" >
+                                            <typetabsitem id="14595" addr="0x7fca46931f10" >
+                                                <attributelist id="14596" addr="0x7fca46931f10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14597" addr="0x7f99f1dd67b0" >
-                                                <attributelist id="14598" addr="0x7f99f1dd67b0" >
+                                            <typetabsitem id="14597" addr="0x7fca469247b0" >
+                                                <attributelist id="14598" addr="0x7fca469247b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14599" addr="0x7f99f1ddafd0" >
-                                                <attributelist id="14600" addr="0x7f99f1ddafd0" >
+                                            <typetabsitem id="14599" addr="0x7fca46928fd0" >
+                                                <attributelist id="14600" addr="0x7fca46928fd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14601" addr="0x7f99f1ddd430" >
-                                                <attributelist id="14602" addr="0x7f99f1ddd430" >
+                                            <typetabsitem id="14601" addr="0x7fca4692b430" >
+                                                <attributelist id="14602" addr="0x7fca4692b430" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14603" addr="0x7f99f1de2130" >
-                                                <attributelist id="14604" addr="0x7f99f1de2130" >
+                                            <typetabsitem id="14603" addr="0x7fca46930130" >
+                                                <attributelist id="14604" addr="0x7fca46930130" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14605" addr="0x7f99f1dd2f50" >
-                                                <attributelist id="14606" addr="0x7f99f1dd2f50" >
+                                            <typetabsitem id="14605" addr="0x7fca46920f50" >
+                                                <attributelist id="14606" addr="0x7fca46920f50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14607" addr="0x7f99f1dd9650" >
-                                                <attributelist id="14608" addr="0x7f99f1dd9650" >
+                                            <typetabsitem id="14607" addr="0x7fca46927650" >
+                                                <attributelist id="14608" addr="0x7fca46927650" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14609" addr="0x7f99f1de3390" >
-                                                <attributelist id="14610" addr="0x7f99f1de3390" >
+                                            <typetabsitem id="14609" addr="0x7fca46931390" >
+                                                <attributelist id="14610" addr="0x7fca46931390" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14611" addr="0x7f99f1ddb7b0" >
-                                                <attributelist id="14612" addr="0x7f99f1ddb7b0" >
+                                            <typetabsitem id="14611" addr="0x7fca469297b0" >
+                                                <attributelist id="14612" addr="0x7fca469297b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14613" addr="0x7f99f1ddc4b0" >
-                                                <attributelist id="14614" addr="0x7f99f1ddc4b0" >
+                                            <typetabsitem id="14613" addr="0x7fca4692a4b0" >
+                                                <attributelist id="14614" addr="0x7fca4692a4b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14615" addr="0x7f99f1ddcf90" >
-                                                <attributelist id="14616" addr="0x7f99f1ddcf90" >
+                                            <typetabsitem id="14615" addr="0x7fca4692af90" >
+                                                <attributelist id="14616" addr="0x7fca4692af90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14617" addr="0x7f99f1de11b0" >
-                                                <attributelist id="14618" addr="0x7f99f1de11b0" >
+                                            <typetabsitem id="14617" addr="0x7fca4692f1b0" >
+                                                <attributelist id="14618" addr="0x7fca4692f1b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14619" addr="0x7f99f1de15b0" >
-                                                <attributelist id="14620" addr="0x7f99f1de15b0" >
+                                            <typetabsitem id="14619" addr="0x7fca4692f5b0" >
+                                                <attributelist id="14620" addr="0x7fca4692f5b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14621" addr="0x7f99f1dd77f0" >
-                                                <attributelist id="14622" addr="0x7f99f1dd77f0" >
+                                            <typetabsitem id="14621" addr="0x7fca469257f0" >
+                                                <attributelist id="14622" addr="0x7fca469257f0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14623" addr="0x7f99f1dd8b30" >
-                                                <attributelist id="14624" addr="0x7f99f1dd8b30" >
+                                            <typetabsitem id="14623" addr="0x7fca46926b30" >
+                                                <attributelist id="14624" addr="0x7fca46926b30" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14625" addr="0x7f99f1dd2c50" >
-                                                <attributelist id="14626" addr="0x7f99f1dd2c50" >
+                                            <typetabsitem id="14625" addr="0x7fca46920c50" >
+                                                <attributelist id="14626" addr="0x7fca46920c50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14627" addr="0x7f99f1dda790" >
-                                                <attributelist id="14628" addr="0x7f99f1dda790" >
+                                            <typetabsitem id="14627" addr="0x7fca46928790" >
+                                                <attributelist id="14628" addr="0x7fca46928790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14629" addr="0x7f99f1dd8030" >
-                                                <attributelist id="14630" addr="0x7f99f1dd8030" >
+                                            <typetabsitem id="14629" addr="0x7fca46926030" >
+                                                <attributelist id="14630" addr="0x7fca46926030" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14631" addr="0x7f99f1ddbe10" >
-                                                <attributelist id="14632" addr="0x7f99f1ddbe10" >
+                                            <typetabsitem id="14631" addr="0x7fca46929e10" >
+                                                <attributelist id="14632" addr="0x7fca46929e10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14633" addr="0x7f99f1dd6b10" >
-                                                <attributelist id="14634" addr="0x7f99f1dd6b10" >
+                                            <typetabsitem id="14633" addr="0x7fca46924b10" >
+                                                <attributelist id="14634" addr="0x7fca46924b10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14635" addr="0x7f99f1dddf90" >
-                                                <attributelist id="14636" addr="0x7f99f1dddf90" >
+                                            <typetabsitem id="14635" addr="0x7fca4692bf90" >
+                                                <attributelist id="14636" addr="0x7fca4692bf90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14637" addr="0x7f99f1de0530" >
-                                                <attributelist id="14638" addr="0x7f99f1de0530" >
+                                            <typetabsitem id="14637" addr="0x7fca4692e530" >
+                                                <attributelist id="14638" addr="0x7fca4692e530" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14639" addr="0x7f99f1de1e50" >
-                                                <attributelist id="14640" addr="0x7f99f1de1e50" >
+                                            <typetabsitem id="14639" addr="0x7fca4692fe50" >
+                                                <attributelist id="14640" addr="0x7fca4692fe50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14641" addr="0x7f99f1de2d90" >
-                                                <attributelist id="14642" addr="0x7f99f1de2d90" >
+                                            <typetabsitem id="14641" addr="0x7fca46930d90" >
+                                                <attributelist id="14642" addr="0x7fca46930d90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14643" addr="0x7f99f1de3410" >
-                                                <attributelist id="14644" addr="0x7f99f1de3410" >
+                                            <typetabsitem id="14643" addr="0x7fca46931410" >
+                                                <attributelist id="14644" addr="0x7fca46931410" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14645" addr="0x7f99f1dd3590" >
-                                                <attributelist id="14646" addr="0x7f99f1dd3590" >
+                                            <typetabsitem id="14645" addr="0x7fca46921590" >
+                                                <attributelist id="14646" addr="0x7fca46921590" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="14647" addr="0x7f99f1dd3390" >
-                                                <attributelist id="14648" addr="0x7f99f1dd3390" >
+                                            <typetabsitem id="14647" addr="0x7fca46921390" >
+                                                <attributelist id="14648" addr="0x7fca46921390" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7f99f1dd1d70" id="14649" addr="0x7f99f1dd1d70" />
-                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="14650" addr="0x7f99f1de6c90" />
-                                        <attribute name="symtab" value="0x7f99f1e40fb0" id="14651" addr="0x7f99f1e40fb0" />
+                                        <attribute name="parent" value="0x7fca4691fd70" id="14649" addr="0x7fca4691fd70" />
+                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="14650" addr="0x7fca46934c90" />
+                                        <attribute name="symtab" value="0x7fca4698efb0" id="14651" addr="0x7fca4698efb0" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="14652" addr="0x7f99f1de16d0" >
-                                    <attributelist id="14653" addr="0x7f99f1de16d0" >
+                                <typescopesitem id="14652" addr="0x7fca4692f6d0" >
+                                    <attributelist id="14653" addr="0x7fca4692f6d0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="14654" addr="0x7f99f1da88b0" >
-                                    <attributelist id="14655" addr="0x7f99f1da88b0" >
-                                        <attribute name="name" value="DialogProgressBG" id="14656" addr="0x7f99f1de6c90" />
-                                        <attribute name="csymtab" value="0x7f99f1da88d0" id="14657" addr="0x7f99f1da88d0" />
-                                        <attribute name="symtab" value="0x7f99f1da8870" id="14658" addr="0x7f99f1da8870" />
+                                <typescopesitem id="14654" addr="0x7fca468f68b0" >
+                                    <attributelist id="14655" addr="0x7fca468f68b0" >
+                                        <attribute name="name" value="DialogProgressBG" id="14656" addr="0x7fca46934c90" />
+                                        <attribute name="csymtab" value="0x7fca468f68d0" id="14657" addr="0x7fca468f68d0" />
+                                        <attribute name="symtab" value="0x7fca468f6870" id="14658" addr="0x7fca468f6870" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <cdecl id="14659" addr="0x7f99f1da8a10" >
-                            <attributelist id="14660" addr="0x7f99f1da8a10" >
-                                <attribute name="ismember" value="1" id="14661" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="dlg" id="14662" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="p." id="14663" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="private" id="14664" addr="0x7f99f1de6c90" />
-                                <attribute name="value" value="nullptr" id="14665" addr="0x7f99f1de6c90" />
-                                <attribute name="valuetype" value="int" id="14666" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="variable" id="14667" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="CGUIDialogExtendedProgressBar" id="14668" addr="0x7f99f1de6c90" />
-                                <attribute name="hasvalue" value="1" id="14669" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1da88b0" id="14670" addr="0x7f99f1da88b0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="14671" addr="0x7f99f1da8c70" >
-                            <attributelist id="14672" addr="0x7f99f1da8c70" >
-                                <attribute name="value" value="nullptr" id="14673" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="handle" id="14674" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="14675" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1da88b0" id="14676" addr="0x7f99f1da88b0" />
-                                <attribute name="hasvalue" value="1" id="14677" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="variable" id="14678" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="p." id="14679" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="private" id="14680" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="CGUIDialogProgressBarHandle" id="14681" addr="0x7f99f1de6c90" />
-                                <attribute name="valuetype" value="int" id="14682" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="14683" addr="0x7f99f1da8e90" >
-                            <attributelist id="14684" addr="0x7f99f1da8e90" >
-                                <attribute name="value" value="false" id="14685" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="open" id="14686" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="14687" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1da88b0" id="14688" addr="0x7f99f1da88b0" />
-                                <attribute name="hasvalue" value="1" id="14689" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="variable" id="14690" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="" id="14691" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="private" id="14692" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="bool" id="14693" addr="0x7f99f1de6c90" />
-                                <attribute name="valuetype" value="bool" id="14694" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <access id="14695" addr="0x7f99f1da8fb0" >
-                            <attributelist id="14696" addr="0x7f99f1da8fb0" >
-                                <attribute name="kind" value="protected" id="14697" addr="0x7f99f1de6c90" />
+                        <cdecl id="14659" addr="0x7fca468f6a10" >
+                            <attributelist id="14660" addr="0x7fca468f6a10" >
+                                <attribute name="ismember" value="1" id="14661" addr="0x7fca46934c90" />
+                                <attribute name="name" value="dlg" id="14662" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="p." id="14663" addr="0x7fca46934c90" />
+                                <attribute name="access" value="private" id="14664" addr="0x7fca46934c90" />
+                                <attribute name="value" value="nullptr" id="14665" addr="0x7fca46934c90" />
+                                <attribute name="valuetype" value="int" id="14666" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="variable" id="14667" addr="0x7fca46934c90" />
+                                <attribute name="type" value="CGUIDialogExtendedProgressBar" id="14668" addr="0x7fca46934c90" />
+                                <attribute name="hasvalue" value="1" id="14669" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468f68b0" id="14670" addr="0x7fca468f68b0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="14671" addr="0x7fca468f6c70" >
+                            <attributelist id="14672" addr="0x7fca468f6c70" >
+                                <attribute name="value" value="nullptr" id="14673" addr="0x7fca46934c90" />
+                                <attribute name="name" value="handle" id="14674" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="14675" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468f68b0" id="14676" addr="0x7fca468f68b0" />
+                                <attribute name="hasvalue" value="1" id="14677" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="variable" id="14678" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="p." id="14679" addr="0x7fca46934c90" />
+                                <attribute name="access" value="private" id="14680" addr="0x7fca46934c90" />
+                                <attribute name="type" value="CGUIDialogProgressBarHandle" id="14681" addr="0x7fca46934c90" />
+                                <attribute name="valuetype" value="int" id="14682" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="14683" addr="0x7fca468f6e90" >
+                            <attributelist id="14684" addr="0x7fca468f6e90" >
+                                <attribute name="value" value="false" id="14685" addr="0x7fca46934c90" />
+                                <attribute name="name" value="open" id="14686" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="14687" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468f68b0" id="14688" addr="0x7fca468f68b0" />
+                                <attribute name="hasvalue" value="1" id="14689" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="variable" id="14690" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="" id="14691" addr="0x7fca46934c90" />
+                                <attribute name="access" value="private" id="14692" addr="0x7fca46934c90" />
+                                <attribute name="type" value="bool" id="14693" addr="0x7fca46934c90" />
+                                <attribute name="valuetype" value="bool" id="14694" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <access id="14695" addr="0x7fca468f6fb0" >
+                            <attributelist id="14696" addr="0x7fca468f6fb0" >
+                                <attribute name="kind" value="protected" id="14697" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </access >
-                        <cdecl id="14698" addr="0x7f99f1da90b0" >
-                            <attributelist id="14699" addr="0x7f99f1da90b0" >
-                                <attribute name="ismember" value="1" id="14700" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="deallocating" id="14701" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="deallocating" id="14702" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="14703" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="protected" id="14704" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="14705" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="void" id="14706" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1da88b0" id="14707" addr="0x7f99f1da88b0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="14708" addr="0x7f99f1de6c90" />
+                        <cdecl id="14698" addr="0x7fca468f70b0" >
+                            <attributelist id="14699" addr="0x7fca468f70b0" >
+                                <attribute name="ismember" value="1" id="14700" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="deallocating" id="14701" addr="0x7fca46934c90" />
+                                <attribute name="name" value="deallocating" id="14702" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="14703" addr="0x7fca46934c90" />
+                                <attribute name="access" value="protected" id="14704" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="14705" addr="0x7fca46934c90" />
+                                <attribute name="type" value="void" id="14706" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468f68b0" id="14707" addr="0x7fca468f68b0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="14708" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <access id="14709" addr="0x7f99f1da9150" >
-                            <attributelist id="14710" addr="0x7f99f1da9150" >
-                                <attribute name="kind" value="public" id="14711" addr="0x7f99f1de6c90" />
+                        <access id="14709" addr="0x7fca468f7150" >
+                            <attributelist id="14710" addr="0x7fca468f7150" >
+                                <attribute name="kind" value="public" id="14711" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="14712" addr="0x7f99f1da92d0" >
-                            <attributelist id="14713" addr="0x7f99f1da92d0" >
-                                <attribute name="ismember" value="1" id="14714" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="DialogProgressBG" id="14715" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="DialogProgressBG" id="14716" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="14717" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="14718" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="14719" addr="0x7f99f1de6c90" />
-                                <attribute name="value" value="default" id="14720" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1da88b0" id="14721" addr="0x7f99f1da88b0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="14722" addr="0x7f99f1de6c90" />
+                        <constructor id="14712" addr="0x7fca468f72d0" >
+                            <attributelist id="14713" addr="0x7fca468f72d0" >
+                                <attribute name="ismember" value="1" id="14714" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="DialogProgressBG" id="14715" addr="0x7fca46934c90" />
+                                <attribute name="name" value="DialogProgressBG" id="14716" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="14717" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="14718" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="14719" addr="0x7fca46934c90" />
+                                <attribute name="value" value="default" id="14720" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468f68b0" id="14721" addr="0x7fca468f68b0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="14722" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <destructor id="14723" addr="0x7f99f1da9430" >
-                            <attributelist id="14724" addr="0x7f99f1da9430" >
-                                <attribute name="ismember" value="1" id="14725" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="~DialogProgressBG" id="14726" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="~DialogProgressBG" id="14727" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="14728" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="14729" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1da88b0" id="14730" addr="0x7f99f1da88b0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="14731" addr="0x7f99f1de6c90" />
+                        <destructor id="14723" addr="0x7fca468f7430" >
+                            <attributelist id="14724" addr="0x7fca468f7430" >
+                                <attribute name="ismember" value="1" id="14725" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="~DialogProgressBG" id="14726" addr="0x7fca46934c90" />
+                                <attribute name="name" value="~DialogProgressBG" id="14727" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="14728" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="14729" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468f68b0" id="14730" addr="0x7fca468f68b0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="14731" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </destructor >
-                        <cdecl id="14732" addr="0x7f99f1da98b0" >
-                            <attributelist id="14733" addr="0x7f99f1da98b0" >
-                                <attribute name="name" value="create" id="14734" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="14735" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1da88b0" id="14736" addr="0x7f99f1da88b0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1da9a50" id="14737" addr="0x7f99f1da9a50" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1da9a50" id="14738" addr="0x7f99f1da9a50" />
-                                <attribute name="kind" value="function" id="14739" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="create" id="14740" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="14741" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="14742" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1da98b0" id="14743" addr="0x7f99f1da98b0" />
-                                <parmlist id="14744" addr="0x7f99f1da9650" >
+                        <cdecl id="14732" addr="0x7fca468f78b0" >
+                            <attributelist id="14733" addr="0x7fca468f78b0" >
+                                <attribute name="name" value="create" id="14734" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="14735" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468f68b0" id="14736" addr="0x7fca468f68b0" />
+                                <attribute name="sym_nextSibling" value="0x7fca468f7a50" id="14737" addr="0x7fca468f7a50" />
+                                <attribute name="csym_nextSibling" value="0x7fca468f7a50" id="14738" addr="0x7fca468f7a50" />
+                                <attribute name="kind" value="function" id="14739" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="create" id="14740" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="14741" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="14742" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468f78b0" id="14743" addr="0x7fca468f78b0" />
+                                <parmlist id="14744" addr="0x7fca468f7650" >
                                     <parm id="14745">
-                                        <attributelist id="14746" addr="0x7f99f1da9650" >
-                                            <attribute name="name" value="heading" id="14747" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14748" addr="0x7f99f1de6c90" />
+                                        <attributelist id="14746" addr="0x7fca468f7650" >
+                                            <attribute name="name" value="heading" id="14747" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14748" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="14749">
-                                        <attributelist id="14750" addr="0x7f99f1da97f0" >
-                                            <attribute name="name" value="message" id="14751" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="14752" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14753" addr="0x7f99f1de6c90" />
+                                        <attributelist id="14750" addr="0x7fca468f77f0" >
+                                            <attribute name="name" value="message" id="14751" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="14752" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14753" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="14754" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="14755" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="14754" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="14755" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="14756" addr="0x7f99f1da9a50" >
-                            <attributelist id="14757" addr="0x7f99f1da9a50" >
-                                <attribute name="name" value="create" id="14758" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="14759" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1da88b0" id="14760" addr="0x7f99f1da88b0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1da98b0" id="14761" addr="0x7f99f1da98b0" />
-                                <attribute name="kind" value="function" id="14762" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="create" id="14763" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1da98b0" id="14764" addr="0x7f99f1da98b0" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="14765" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="14766" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1da98b0" id="14767" addr="0x7f99f1da98b0" />
-                                <parmlist id="14768" addr="0x7f99f1da9950" >
+                        <cdecl id="14756" addr="0x7fca468f7a50" >
+                            <attributelist id="14757" addr="0x7fca468f7a50" >
+                                <attribute name="name" value="create" id="14758" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="14759" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468f68b0" id="14760" addr="0x7fca468f68b0" />
+                                <attribute name="sym_previousSibling" value="0x7fca468f78b0" id="14761" addr="0x7fca468f78b0" />
+                                <attribute name="kind" value="function" id="14762" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="create" id="14763" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca468f78b0" id="14764" addr="0x7fca468f78b0" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="14765" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="14766" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468f78b0" id="14767" addr="0x7fca468f78b0" />
+                                <parmlist id="14768" addr="0x7fca468f7950" >
                                     <parm id="14769">
-                                        <attributelist id="14770" addr="0x7f99f1da9950" >
-                                            <attribute name="name" value="heading" id="14771" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14772" addr="0x7f99f1de6c90" />
+                                        <attributelist id="14770" addr="0x7fca468f7950" >
+                                            <attribute name="name" value="heading" id="14771" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14772" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="14773" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="14774" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="14773" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="14774" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="14775" addr="0x7f99f1daa0b0" >
-                            <attributelist id="14776" addr="0x7f99f1daa0b0" >
-                                <attribute name="name" value="update" id="14777" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="14778" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1da88b0" id="14779" addr="0x7f99f1da88b0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1daa310" id="14780" addr="0x7f99f1daa310" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1daa310" id="14781" addr="0x7f99f1daa310" />
-                                <attribute name="kind" value="function" id="14782" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="update" id="14783" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="14784" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="14785" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1daa0b0" id="14786" addr="0x7f99f1daa0b0" />
-                                <parmlist id="14787" addr="0x7f99f1da9cb0" >
+                        <cdecl id="14775" addr="0x7fca468f80b0" >
+                            <attributelist id="14776" addr="0x7fca468f80b0" >
+                                <attribute name="name" value="update" id="14777" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="14778" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468f68b0" id="14779" addr="0x7fca468f68b0" />
+                                <attribute name="sym_nextSibling" value="0x7fca468f8310" id="14780" addr="0x7fca468f8310" />
+                                <attribute name="csym_nextSibling" value="0x7fca468f8310" id="14781" addr="0x7fca468f8310" />
+                                <attribute name="kind" value="function" id="14782" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="update" id="14783" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="14784" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="14785" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468f80b0" id="14786" addr="0x7fca468f80b0" />
+                                <parmlist id="14787" addr="0x7fca468f7cb0" >
                                     <parm id="14788">
-                                        <attributelist id="14789" addr="0x7f99f1da9cb0" >
-                                            <attribute name="name" value="percent" id="14790" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="0" id="14791" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="14792" addr="0x7f99f1de6c90" />
+                                        <attributelist id="14789" addr="0x7fca468f7cb0" >
+                                            <attribute name="name" value="percent" id="14790" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="0" id="14791" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="14792" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="14793">
-                                        <attributelist id="14794" addr="0x7f99f1da9e50" >
-                                            <attribute name="name" value="heading" id="14795" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="14796" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14797" addr="0x7f99f1de6c90" />
+                                        <attributelist id="14794" addr="0x7fca468f7e50" >
+                                            <attribute name="name" value="heading" id="14795" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="14796" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14797" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="14798">
-                                        <attributelist id="14799" addr="0x7f99f1da9ff0" >
-                                            <attribute name="name" value="message" id="14800" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="14801" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14802" addr="0x7f99f1de6c90" />
+                                        <attributelist id="14799" addr="0x7fca468f7ff0" >
+                                            <attribute name="name" value="message" id="14800" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="14801" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14802" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="14803" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="14804" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="14803" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="14804" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="14805" addr="0x7f99f1daa310" >
-                            <attributelist id="14806" addr="0x7f99f1daa310" >
-                                <attribute name="name" value="update" id="14807" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="14808" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1da88b0" id="14809" addr="0x7f99f1da88b0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1daa0b0" id="14810" addr="0x7f99f1daa0b0" />
-                                <attribute name="kind" value="function" id="14811" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="update" id="14812" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1daa4d0" id="14813" addr="0x7f99f1daa4d0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1daa4d0" id="14814" addr="0x7f99f1daa4d0" />
-                                <attribute name="defaultargs" value="0x7f99f1daa0b0" id="14815" addr="0x7f99f1daa0b0" />
-                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String)." id="14816" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="14817" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1daa0b0" id="14818" addr="0x7f99f1daa0b0" />
-                                <parmlist id="14819" addr="0x7f99f1daa150" >
+                        <cdecl id="14805" addr="0x7fca468f8310" >
+                            <attributelist id="14806" addr="0x7fca468f8310" >
+                                <attribute name="name" value="update" id="14807" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="14808" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468f68b0" id="14809" addr="0x7fca468f68b0" />
+                                <attribute name="sym_previousSibling" value="0x7fca468f80b0" id="14810" addr="0x7fca468f80b0" />
+                                <attribute name="kind" value="function" id="14811" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="update" id="14812" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca468f84d0" id="14813" addr="0x7fca468f84d0" />
+                                <attribute name="sym_nextSibling" value="0x7fca468f84d0" id="14814" addr="0x7fca468f84d0" />
+                                <attribute name="defaultargs" value="0x7fca468f80b0" id="14815" addr="0x7fca468f80b0" />
+                                <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String)." id="14816" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="14817" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468f80b0" id="14818" addr="0x7fca468f80b0" />
+                                <parmlist id="14819" addr="0x7fca468f8150" >
                                     <parm id="14820">
-                                        <attributelist id="14821" addr="0x7f99f1daa150" >
-                                            <attribute name="name" value="percent" id="14822" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="0" id="14823" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="14824" addr="0x7f99f1de6c90" />
+                                        <attributelist id="14821" addr="0x7fca468f8150" >
+                                            <attribute name="name" value="percent" id="14822" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="0" id="14823" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="14824" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="14825">
-                                        <attributelist id="14826" addr="0x7f99f1daa250" >
-                                            <attribute name="name" value="heading" id="14827" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="XBMCAddon::emptyString" id="14828" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14829" addr="0x7f99f1de6c90" />
+                                        <attributelist id="14826" addr="0x7fca468f8250" >
+                                            <attribute name="name" value="heading" id="14827" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="XBMCAddon::emptyString" id="14828" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="14829" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="14830" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="14831" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="14830" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="14831" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="14832" addr="0x7f99f1daa4d0" >
-                            <attributelist id="14833" addr="0x7f99f1daa4d0" >
-                                <attribute name="name" value="update" id="14834" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="14835" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1da88b0" id="14836" addr="0x7f99f1da88b0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1daa310" id="14837" addr="0x7f99f1daa310" />
-                                <attribute name="kind" value="function" id="14838" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="update" id="14839" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1daa5d0" id="14840" addr="0x7f99f1daa5d0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1daa5d0" id="14841" addr="0x7f99f1daa5d0" />
-                                <attribute name="defaultargs" value="0x7f99f1daa0b0" id="14842" addr="0x7f99f1daa0b0" />
-                                <attribute name="decl" value="f(int)." id="14843" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="14844" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1daa0b0" id="14845" addr="0x7f99f1daa0b0" />
-                                <parmlist id="14846" addr="0x7f99f1daa3b0" >
+                        <cdecl id="14832" addr="0x7fca468f84d0" >
+                            <attributelist id="14833" addr="0x7fca468f84d0" >
+                                <attribute name="name" value="update" id="14834" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="14835" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468f68b0" id="14836" addr="0x7fca468f68b0" />
+                                <attribute name="sym_previousSibling" value="0x7fca468f8310" id="14837" addr="0x7fca468f8310" />
+                                <attribute name="kind" value="function" id="14838" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="update" id="14839" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca468f85d0" id="14840" addr="0x7fca468f85d0" />
+                                <attribute name="sym_nextSibling" value="0x7fca468f85d0" id="14841" addr="0x7fca468f85d0" />
+                                <attribute name="defaultargs" value="0x7fca468f80b0" id="14842" addr="0x7fca468f80b0" />
+                                <attribute name="decl" value="f(int)." id="14843" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="14844" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468f80b0" id="14845" addr="0x7fca468f80b0" />
+                                <parmlist id="14846" addr="0x7fca468f83b0" >
                                     <parm id="14847">
-                                        <attributelist id="14848" addr="0x7f99f1daa3b0" >
-                                            <attribute name="name" value="percent" id="14849" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="0" id="14850" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="14851" addr="0x7f99f1de6c90" />
+                                        <attributelist id="14848" addr="0x7fca468f83b0" >
+                                            <attribute name="name" value="percent" id="14849" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="0" id="14850" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="14851" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="14852" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_2" id="14853" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="14852" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_2" id="14853" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="14854" addr="0x7f99f1daa5d0" >
-                            <attributelist id="14855" addr="0x7f99f1daa5d0" >
-                                <attribute name="name" value="update" id="14856" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="14857" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1da88b0" id="14858" addr="0x7f99f1da88b0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1daa4d0" id="14859" addr="0x7f99f1daa4d0" />
-                                <attribute name="kind" value="function" id="14860" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="update" id="14861" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1daa0b0" id="14862" addr="0x7f99f1daa0b0" />
-                                <attribute name="decl" value="f()." id="14863" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="14864" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1daa0b0" id="14865" addr="0x7f99f1daa0b0" />
-                                <attribute name="type" value="void" id="14866" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_3" id="14867" addr="0x7f99f1de6c90" />
+                        <cdecl id="14854" addr="0x7fca468f85d0" >
+                            <attributelist id="14855" addr="0x7fca468f85d0" >
+                                <attribute name="name" value="update" id="14856" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="14857" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468f68b0" id="14858" addr="0x7fca468f68b0" />
+                                <attribute name="sym_previousSibling" value="0x7fca468f84d0" id="14859" addr="0x7fca468f84d0" />
+                                <attribute name="kind" value="function" id="14860" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="update" id="14861" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca468f80b0" id="14862" addr="0x7fca468f80b0" />
+                                <attribute name="decl" value="f()." id="14863" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="14864" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468f80b0" id="14865" addr="0x7fca468f80b0" />
+                                <attribute name="type" value="void" id="14866" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_3" id="14867" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="14868" addr="0x7f99f1daa7b0" >
-                            <attributelist id="14869" addr="0x7f99f1daa7b0" >
-                                <attribute name="ismember" value="1" id="14870" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="close" id="14871" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="close" id="14872" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="14873" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="14874" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="14875" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="void" id="14876" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1da88b0" id="14877" addr="0x7f99f1da88b0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="14878" addr="0x7f99f1de6c90" />
+                        <cdecl id="14868" addr="0x7fca468f87b0" >
+                            <attributelist id="14869" addr="0x7fca468f87b0" >
+                                <attribute name="ismember" value="1" id="14870" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="close" id="14871" addr="0x7fca46934c90" />
+                                <attribute name="name" value="close" id="14872" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="14873" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="14874" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="14875" addr="0x7fca46934c90" />
+                                <attribute name="type" value="void" id="14876" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468f68b0" id="14877" addr="0x7fca468f68b0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="14878" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="14879" addr="0x7f99f1daa970" >
-                            <attributelist id="14880" addr="0x7f99f1daa970" >
-                                <attribute name="ismember" value="1" id="14881" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="isFinished" id="14882" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="isFinished" id="14883" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="14884" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="14885" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="14886" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="bool" id="14887" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1da88b0" id="14888" addr="0x7f99f1da88b0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="14889" addr="0x7f99f1de6c90" />
+                        <cdecl id="14879" addr="0x7fca468f8970" >
+                            <attributelist id="14880" addr="0x7fca468f8970" >
+                                <attribute name="ismember" value="1" id="14881" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="isFinished" id="14882" addr="0x7fca46934c90" />
+                                <attribute name="name" value="isFinished" id="14883" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="14884" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="14885" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="14886" addr="0x7fca46934c90" />
+                                <attribute name="type" value="bool" id="14887" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468f68b0" id="14888" addr="0x7fca468f68b0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="14889" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
@@ -21082,1507 +21082,1507 @@
                 </namespace >
             </namespace >
         </include >
-        <include id="14890" addr="0x7f99f1dabcb0" >
-            <attributelist id="14891" addr="0x7f99f1dabcb0" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/Window.h" id="14892" addr="0x7f99f1de6c90" />
+        <include id="14890" addr="0x7fca468f9cb0" >
+            <attributelist id="14891" addr="0x7fca468f9cb0" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/Window.h" id="14892" addr="0x7fca46934c90" />
             </attributelist >
 
-            <namespace id="14893" addr="0x7f99f1dabd50" >
-                <attributelist id="14894" addr="0x7f99f1dabd50" >
-                    <attribute name="sym_name" value="XBMCAddon" id="14895" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="XBMCAddon" id="14896" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_previousSibling" value="0x7f99f1e967b0" id="14897" addr="0x7f99f1e967b0" />
-                    <attribute name="csym_nextSibling" value="0x7f99f1db2850" id="14898" addr="0x7f99f1db2850" />
-                    <attribute name="sym_nextSibling" value="0x7f99f1db2850" id="14899" addr="0x7f99f1db2850" />
-                    <typescope id="14900" addr="0x7f99f1dd1d70" >
-                        <attributelist id="14901" addr="0x7f99f1dd1d70" >
-                            <attribute name="name" value="XBMCAddon" id="14902" addr="0x7f99f1de6c90" />
-                            <typetab id="14903" addr="0x7f99f1dd1db0" >
-                                <attributelist id="14904" addr="0x7f99f1dd1db0" >
-                                    <attribute name="Dictionary" value="Dictionary" id="14905" addr="0x7f99f1de6c90" />
-                                    <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="14906" addr="0x7f99f1de6c90" />
-                                    <attribute name="String" value="std::string" id="14907" addr="0x7f99f1de6c90" />
-                                    <attribute name="StringOrInt" value="XBMCAddon::String" id="14908" addr="0x7f99f1de6c90" />
+            <namespace id="14893" addr="0x7fca468f9d50" >
+                <attributelist id="14894" addr="0x7fca468f9d50" >
+                    <attribute name="sym_name" value="XBMCAddon" id="14895" addr="0x7fca46934c90" />
+                    <attribute name="name" value="XBMCAddon" id="14896" addr="0x7fca46934c90" />
+                    <attribute name="sym_previousSibling" value="0x7fca469e47b0" id="14897" addr="0x7fca469e47b0" />
+                    <attribute name="csym_nextSibling" value="0x7fca46900850" id="14898" addr="0x7fca46900850" />
+                    <attribute name="sym_nextSibling" value="0x7fca46900850" id="14899" addr="0x7fca46900850" />
+                    <typescope id="14900" addr="0x7fca4691fd70" >
+                        <attributelist id="14901" addr="0x7fca4691fd70" >
+                            <attribute name="name" value="XBMCAddon" id="14902" addr="0x7fca46934c90" />
+                            <typetab id="14903" addr="0x7fca4691fdb0" >
+                                <attributelist id="14904" addr="0x7fca4691fdb0" >
+                                    <attribute name="Dictionary" value="Dictionary" id="14905" addr="0x7fca46934c90" />
+                                    <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="14906" addr="0x7fca46934c90" />
+                                    <attribute name="String" value="std::string" id="14907" addr="0x7fca46934c90" />
+                                    <attribute name="StringOrInt" value="XBMCAddon::String" id="14908" addr="0x7fca46934c90" />
                                 </attributelist >
-                                <typetabsitem id="14909" addr="0x7f99f1dd28b0" >
-                                    <attributelist id="14910" addr="0x7f99f1dd28b0" >
+                                <typetabsitem id="14909" addr="0x7fca469208b0" >
+                                    <attributelist id="14910" addr="0x7fca469208b0" >
                                     </attributelist >
                                 </typetabsitem >
-                                <typetabsitem id="14911" addr="0x7f99f1dd2910" >
-                                    <attributelist id="14912" addr="0x7f99f1dd2910" >
+                                <typetabsitem id="14911" addr="0x7fca46920910" >
+                                    <attributelist id="14912" addr="0x7fca46920910" >
                                     </attributelist >
                                 </typetabsitem >
-                                <typetabsitem id="14913" addr="0x7f99f1dd1f90" >
-                                    <attributelist id="14914" addr="0x7f99f1dd1f90" >
+                                <typetabsitem id="14913" addr="0x7fca4691ff90" >
+                                    <attributelist id="14914" addr="0x7fca4691ff90" >
                                     </attributelist >
                                 </typetabsitem >
-                                <typetabsitem id="14915" addr="0x7f99f1dd2710" >
-                                    <attributelist id="14916" addr="0x7f99f1dd2710" >
+                                <typetabsitem id="14915" addr="0x7fca46920710" >
+                                    <attributelist id="14916" addr="0x7fca46920710" >
                                     </attributelist >
                                 </typetabsitem >
                             </typetab >
-                            <attribute name="parent" value="0x7f99f1e1da30" id="14917" addr="0x7f99f1e1da30" />
-                            <attribute name="qname" value="XBMCAddon" id="14918" addr="0x7f99f1de6c90" />
-                            <attribute name="symtab" value="0x7f99f1e408b0" id="14919" addr="0x7f99f1e408b0" />
+                            <attribute name="parent" value="0x7fca4696ba30" id="14917" addr="0x7fca4696ba30" />
+                            <attribute name="qname" value="XBMCAddon" id="14918" addr="0x7fca46934c90" />
+                            <attribute name="symtab" value="0x7fca4698e8b0" id="14919" addr="0x7fca4698e8b0" />
                         </attributelist >
-                        <typescopesitem id="14920" addr="0x7f99f1e40870" >
-                            <attributelist id="14921" addr="0x7f99f1e40870" >
+                        <typescopesitem id="14920" addr="0x7fca4698e870" >
+                            <attributelist id="14921" addr="0x7fca4698e870" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="14922" addr="0x7f99f1dd1db0" >
-                            <attributelist id="14923" addr="0x7f99f1dd1db0" >
-                                <attribute name="Dictionary" value="Dictionary" id="14924" addr="0x7f99f1de6c90" />
-                                <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="14925" addr="0x7f99f1de6c90" />
-                                <attribute name="String" value="std::string" id="14926" addr="0x7f99f1de6c90" />
-                                <attribute name="StringOrInt" value="XBMCAddon::String" id="14927" addr="0x7f99f1de6c90" />
+                        <typescopesitem id="14922" addr="0x7fca4691fdb0" >
+                            <attributelist id="14923" addr="0x7fca4691fdb0" >
+                                <attribute name="Dictionary" value="Dictionary" id="14924" addr="0x7fca46934c90" />
+                                <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="14925" addr="0x7fca46934c90" />
+                                <attribute name="String" value="std::string" id="14926" addr="0x7fca46934c90" />
+                                <attribute name="StringOrInt" value="XBMCAddon::String" id="14927" addr="0x7fca46934c90" />
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="14928" addr="0x7f99f1e1da30" >
-                            <attributelist id="14929" addr="0x7f99f1e1da30" >
-                                <attribute name="name" value="" id="14930" addr="0x7f99f1de6c90" />
-                                <typetab id="14931" addr="0x7f99f1e1da90" >
-                                    <attributelist id="14932" addr="0x7f99f1e1da90" >
+                        <typescopesitem id="14928" addr="0x7fca4696ba30" >
+                            <attributelist id="14929" addr="0x7fca4696ba30" >
+                                <attribute name="name" value="" id="14930" addr="0x7fca46934c90" />
+                                <typetab id="14931" addr="0x7fca4696ba90" >
+                                    <attributelist id="14932" addr="0x7fca4696ba90" >
                                     </attributelist >
                                 </typetab >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="14933" addr="0x7f99f1dd1eb0" >
-                            <attributelist id="14934" addr="0x7f99f1dd1eb0" >
+                        <typescopesitem id="14933" addr="0x7fca4691feb0" >
+                            <attributelist id="14934" addr="0x7fca4691feb0" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="14935" addr="0x7f99f1e408b0" >
-                            <attributelist id="14936" addr="0x7f99f1e408b0" >
-                                <attribute name="name" value="XBMCAddon" id="14937" addr="0x7f99f1de6c90" />
-                                <attribute name="csymtab" value="0x7f99f1e408f0" id="14938" addr="0x7f99f1e408f0" />
-                                <attribute name="symtab" value="0x7f99f1e40890" id="14939" addr="0x7f99f1e40890" />
+                        <typescopesitem id="14935" addr="0x7fca4698e8b0" >
+                            <attributelist id="14936" addr="0x7fca4698e8b0" >
+                                <attribute name="name" value="XBMCAddon" id="14937" addr="0x7fca46934c90" />
+                                <attribute name="csymtab" value="0x7fca4698e8f0" id="14938" addr="0x7fca4698e8f0" />
+                                <attribute name="symtab" value="0x7fca4698e890" id="14939" addr="0x7fca4698e890" />
                             </attributelist >
                         </typescopesitem >
                     </typescope >
-                    <attribute name="symtab" value="0x7f99f1e408b0" id="14940" addr="0x7f99f1e408b0" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="14941" addr="0x7f99f1e1d950" />
+                    <attribute name="symtab" value="0x7fca4698e8b0" id="14940" addr="0x7fca4698e8b0" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="14941" addr="0x7fca4696b950" />
                 </attributelist >
 
-                <namespace id="14942" addr="0x7f99f1dabdd0" >
-                    <attributelist id="14943" addr="0x7f99f1dabdd0" >
-                        <attribute name="feature_knownbasetypes" value="AddonClass,AddonCallback" id="14944" addr="0x7f99f1de6c90" />
-                        <attribute name="name" value="xbmcgui" id="14945" addr="0x7f99f1de6c90" />
-                        <attribute name="sym_symtab" value="0x7f99f1e408b0" id="14946" addr="0x7f99f1e408b0" />
-                        <attribute name="symtab" value="0x7f99f1e40fb0" id="14947" addr="0x7f99f1e40fb0" />
-                        <attribute name="sym_nextSibling" value="0x7f99f1db28d0" id="14948" addr="0x7f99f1db28d0" />
-                        <attribute name="csym_nextSibling" value="0x7f99f1db28d0" id="14949" addr="0x7f99f1db28d0" />
-                        <attribute name="sym_previousSibling" value="0x7f99f1e96830" id="14950" addr="0x7f99f1e96830" />
-                        <attribute name="feature_knownapitypes" value="XBMCAddon::xbmc::InfoTagVideo,xbmc::InfoTagMusic" id="14951" addr="0x7f99f1de6c90" />
-                        <attribute name="sym_name" value="xbmcgui" id="14952" addr="0x7f99f1de6c90" />
-                        <typescope id="14953" addr="0x7f99f1dd2150" >
-                            <attributelist id="14954" addr="0x7f99f1dd2150" >
-                                <attribute name="name" value="xbmcgui" id="14955" addr="0x7f99f1de6c90" />
-                                <typetab id="14956" addr="0x7f99f1dd2170" >
-                                    <attributelist id="14957" addr="0x7f99f1dd2170" >
-                                        <attribute name="InterceptorBase" value="InterceptorBase" id="14958" addr="0x7f99f1de6c90" />
-                                        <attribute name="Dialog" value="Dialog" id="14959" addr="0x7f99f1de6c90" />
-                                        <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="14960" addr="0x7f99f1de6c90" />
-                                        <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="14961" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlTextBox" value="ControlTextBox" id="14962" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlRadioButton" value="ControlRadioButton" id="14963" addr="0x7f99f1de6c90" />
-                                        <attribute name="Window" value="Window" id="14964" addr="0x7f99f1de6c90" />
-                                        <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="14965" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlList" value="ControlList" id="14966" addr="0x7f99f1de6c90" />
-                                        <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="14967" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlImage" value="ControlImage" id="14968" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlButton" value="ControlButton" id="14969" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlGroup" value="ControlGroup" id="14970" addr="0x7f99f1de6c90" />
-                                        <attribute name="DialogBusy" value="DialogBusy" id="14971" addr="0x7f99f1de6c90" />
-                                        <attribute name="DialogProgressBG" value="DialogProgressBG" id="14972" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlSpin" value="ControlSpin" id="14973" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlEdit" value="ControlEdit" id="14974" addr="0x7f99f1de6c90" />
-                                        <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="14975" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="14976" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlLabel" value="ControlLabel" id="14977" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlProgress" value="ControlProgress" id="14978" addr="0x7f99f1de6c90" />
-                                        <attribute name="Control" value="Control" id="14979" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlSlider" value="ControlSlider" id="14980" addr="0x7f99f1de6c90" />
-                                        <attribute name="DialogProgress" value="DialogProgress" id="14981" addr="0x7f99f1de6c90" />
-                                        <attribute name="Action" value="Action" id="14982" addr="0x7f99f1de6c90" />
-                                        <attribute name="WindowDialog" value="WindowDialog" id="14983" addr="0x7f99f1de6c90" />
-                                        <attribute name="WindowXML" value="WindowXML" id="14984" addr="0x7f99f1de6c90" />
-                                        <attribute name="ListItem" value="ListItem" id="14985" addr="0x7f99f1de6c90" />
-                                        <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="14986" addr="0x7f99f1de6c90" />
+                <namespace id="14942" addr="0x7fca468f9dd0" >
+                    <attributelist id="14943" addr="0x7fca468f9dd0" >
+                        <attribute name="feature_knownbasetypes" value="AddonClass,AddonCallback" id="14944" addr="0x7fca46934c90" />
+                        <attribute name="name" value="xbmcgui" id="14945" addr="0x7fca46934c90" />
+                        <attribute name="sym_symtab" value="0x7fca4698e8b0" id="14946" addr="0x7fca4698e8b0" />
+                        <attribute name="symtab" value="0x7fca4698efb0" id="14947" addr="0x7fca4698efb0" />
+                        <attribute name="sym_nextSibling" value="0x7fca469008d0" id="14948" addr="0x7fca469008d0" />
+                        <attribute name="csym_nextSibling" value="0x7fca469008d0" id="14949" addr="0x7fca469008d0" />
+                        <attribute name="sym_previousSibling" value="0x7fca469e4830" id="14950" addr="0x7fca469e4830" />
+                        <attribute name="feature_knownapitypes" value="XBMCAddon::xbmc::InfoTagVideo,xbmc::InfoTagMusic" id="14951" addr="0x7fca46934c90" />
+                        <attribute name="sym_name" value="xbmcgui" id="14952" addr="0x7fca46934c90" />
+                        <typescope id="14953" addr="0x7fca46920150" >
+                            <attributelist id="14954" addr="0x7fca46920150" >
+                                <attribute name="name" value="xbmcgui" id="14955" addr="0x7fca46934c90" />
+                                <typetab id="14956" addr="0x7fca46920170" >
+                                    <attributelist id="14957" addr="0x7fca46920170" >
+                                        <attribute name="InterceptorBase" value="InterceptorBase" id="14958" addr="0x7fca46934c90" />
+                                        <attribute name="Dialog" value="Dialog" id="14959" addr="0x7fca46934c90" />
+                                        <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="14960" addr="0x7fca46934c90" />
+                                        <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="14961" addr="0x7fca46934c90" />
+                                        <attribute name="ControlTextBox" value="ControlTextBox" id="14962" addr="0x7fca46934c90" />
+                                        <attribute name="ControlRadioButton" value="ControlRadioButton" id="14963" addr="0x7fca46934c90" />
+                                        <attribute name="Window" value="Window" id="14964" addr="0x7fca46934c90" />
+                                        <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="14965" addr="0x7fca46934c90" />
+                                        <attribute name="ControlList" value="ControlList" id="14966" addr="0x7fca46934c90" />
+                                        <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="14967" addr="0x7fca46934c90" />
+                                        <attribute name="ControlImage" value="ControlImage" id="14968" addr="0x7fca46934c90" />
+                                        <attribute name="ControlButton" value="ControlButton" id="14969" addr="0x7fca46934c90" />
+                                        <attribute name="ControlGroup" value="ControlGroup" id="14970" addr="0x7fca46934c90" />
+                                        <attribute name="DialogBusy" value="DialogBusy" id="14971" addr="0x7fca46934c90" />
+                                        <attribute name="DialogProgressBG" value="DialogProgressBG" id="14972" addr="0x7fca46934c90" />
+                                        <attribute name="ControlSpin" value="ControlSpin" id="14973" addr="0x7fca46934c90" />
+                                        <attribute name="ControlEdit" value="ControlEdit" id="14974" addr="0x7fca46934c90" />
+                                        <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="14975" addr="0x7fca46934c90" />
+                                        <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="14976" addr="0x7fca46934c90" />
+                                        <attribute name="ControlLabel" value="ControlLabel" id="14977" addr="0x7fca46934c90" />
+                                        <attribute name="ControlProgress" value="ControlProgress" id="14978" addr="0x7fca46934c90" />
+                                        <attribute name="Control" value="Control" id="14979" addr="0x7fca46934c90" />
+                                        <attribute name="ControlSlider" value="ControlSlider" id="14980" addr="0x7fca46934c90" />
+                                        <attribute name="DialogProgress" value="DialogProgress" id="14981" addr="0x7fca46934c90" />
+                                        <attribute name="Action" value="Action" id="14982" addr="0x7fca46934c90" />
+                                        <attribute name="WindowDialog" value="WindowDialog" id="14983" addr="0x7fca46934c90" />
+                                        <attribute name="WindowXML" value="WindowXML" id="14984" addr="0x7fca46934c90" />
+                                        <attribute name="ListItem" value="ListItem" id="14985" addr="0x7fca46934c90" />
+                                        <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="14986" addr="0x7fca46934c90" />
                                     </attributelist >
-                                    <typetabsitem id="14987" addr="0x7f99f1de1dd0" >
-                                        <attributelist id="14988" addr="0x7f99f1de1dd0" >
+                                    <typetabsitem id="14987" addr="0x7fca4692fdd0" >
+                                        <attributelist id="14988" addr="0x7fca4692fdd0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="14989" addr="0x7f99f1dde790" >
-                                        <attributelist id="14990" addr="0x7f99f1dde790" >
+                                    <typetabsitem id="14989" addr="0x7fca4692c790" >
+                                        <attributelist id="14990" addr="0x7fca4692c790" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="14991" addr="0x7f99f1de3f10" >
-                                        <attributelist id="14992" addr="0x7f99f1de3f10" >
+                                    <typetabsitem id="14991" addr="0x7fca46931f10" >
+                                        <attributelist id="14992" addr="0x7fca46931f10" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="14993" addr="0x7f99f1dd67b0" >
-                                        <attributelist id="14994" addr="0x7f99f1dd67b0" >
+                                    <typetabsitem id="14993" addr="0x7fca469247b0" >
+                                        <attributelist id="14994" addr="0x7fca469247b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="14995" addr="0x7f99f1ddafd0" >
-                                        <attributelist id="14996" addr="0x7f99f1ddafd0" >
+                                    <typetabsitem id="14995" addr="0x7fca46928fd0" >
+                                        <attributelist id="14996" addr="0x7fca46928fd0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="14997" addr="0x7f99f1ddd430" >
-                                        <attributelist id="14998" addr="0x7f99f1ddd430" >
+                                    <typetabsitem id="14997" addr="0x7fca4692b430" >
+                                        <attributelist id="14998" addr="0x7fca4692b430" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="14999" addr="0x7f99f1de2130" >
-                                        <attributelist id="15000" addr="0x7f99f1de2130" >
+                                    <typetabsitem id="14999" addr="0x7fca46930130" >
+                                        <attributelist id="15000" addr="0x7fca46930130" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="15001" addr="0x7f99f1dd2f50" >
-                                        <attributelist id="15002" addr="0x7f99f1dd2f50" >
+                                    <typetabsitem id="15001" addr="0x7fca46920f50" >
+                                        <attributelist id="15002" addr="0x7fca46920f50" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="15003" addr="0x7f99f1dd9650" >
-                                        <attributelist id="15004" addr="0x7f99f1dd9650" >
+                                    <typetabsitem id="15003" addr="0x7fca46927650" >
+                                        <attributelist id="15004" addr="0x7fca46927650" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="15005" addr="0x7f99f1de3390" >
-                                        <attributelist id="15006" addr="0x7f99f1de3390" >
+                                    <typetabsitem id="15005" addr="0x7fca46931390" >
+                                        <attributelist id="15006" addr="0x7fca46931390" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="15007" addr="0x7f99f1ddb7b0" >
-                                        <attributelist id="15008" addr="0x7f99f1ddb7b0" >
+                                    <typetabsitem id="15007" addr="0x7fca469297b0" >
+                                        <attributelist id="15008" addr="0x7fca469297b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="15009" addr="0x7f99f1ddc4b0" >
-                                        <attributelist id="15010" addr="0x7f99f1ddc4b0" >
+                                    <typetabsitem id="15009" addr="0x7fca4692a4b0" >
+                                        <attributelist id="15010" addr="0x7fca4692a4b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="15011" addr="0x7f99f1ddcf90" >
-                                        <attributelist id="15012" addr="0x7f99f1ddcf90" >
+                                    <typetabsitem id="15011" addr="0x7fca4692af90" >
+                                        <attributelist id="15012" addr="0x7fca4692af90" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="15013" addr="0x7f99f1de11b0" >
-                                        <attributelist id="15014" addr="0x7f99f1de11b0" >
+                                    <typetabsitem id="15013" addr="0x7fca4692f1b0" >
+                                        <attributelist id="15014" addr="0x7fca4692f1b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="15015" addr="0x7f99f1de15b0" >
-                                        <attributelist id="15016" addr="0x7f99f1de15b0" >
+                                    <typetabsitem id="15015" addr="0x7fca4692f5b0" >
+                                        <attributelist id="15016" addr="0x7fca4692f5b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="15017" addr="0x7f99f1dd77f0" >
-                                        <attributelist id="15018" addr="0x7f99f1dd77f0" >
+                                    <typetabsitem id="15017" addr="0x7fca469257f0" >
+                                        <attributelist id="15018" addr="0x7fca469257f0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="15019" addr="0x7f99f1dd8b30" >
-                                        <attributelist id="15020" addr="0x7f99f1dd8b30" >
+                                    <typetabsitem id="15019" addr="0x7fca46926b30" >
+                                        <attributelist id="15020" addr="0x7fca46926b30" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="15021" addr="0x7f99f1dd2c50" >
-                                        <attributelist id="15022" addr="0x7f99f1dd2c50" >
+                                    <typetabsitem id="15021" addr="0x7fca46920c50" >
+                                        <attributelist id="15022" addr="0x7fca46920c50" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="15023" addr="0x7f99f1dda790" >
-                                        <attributelist id="15024" addr="0x7f99f1dda790" >
+                                    <typetabsitem id="15023" addr="0x7fca46928790" >
+                                        <attributelist id="15024" addr="0x7fca46928790" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="15025" addr="0x7f99f1dd8030" >
-                                        <attributelist id="15026" addr="0x7f99f1dd8030" >
+                                    <typetabsitem id="15025" addr="0x7fca46926030" >
+                                        <attributelist id="15026" addr="0x7fca46926030" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="15027" addr="0x7f99f1ddbe10" >
-                                        <attributelist id="15028" addr="0x7f99f1ddbe10" >
+                                    <typetabsitem id="15027" addr="0x7fca46929e10" >
+                                        <attributelist id="15028" addr="0x7fca46929e10" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="15029" addr="0x7f99f1dd6b10" >
-                                        <attributelist id="15030" addr="0x7f99f1dd6b10" >
+                                    <typetabsitem id="15029" addr="0x7fca46924b10" >
+                                        <attributelist id="15030" addr="0x7fca46924b10" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="15031" addr="0x7f99f1dddf90" >
-                                        <attributelist id="15032" addr="0x7f99f1dddf90" >
+                                    <typetabsitem id="15031" addr="0x7fca4692bf90" >
+                                        <attributelist id="15032" addr="0x7fca4692bf90" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="15033" addr="0x7f99f1de0530" >
-                                        <attributelist id="15034" addr="0x7f99f1de0530" >
+                                    <typetabsitem id="15033" addr="0x7fca4692e530" >
+                                        <attributelist id="15034" addr="0x7fca4692e530" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="15035" addr="0x7f99f1de1e50" >
-                                        <attributelist id="15036" addr="0x7f99f1de1e50" >
+                                    <typetabsitem id="15035" addr="0x7fca4692fe50" >
+                                        <attributelist id="15036" addr="0x7fca4692fe50" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="15037" addr="0x7f99f1de2d90" >
-                                        <attributelist id="15038" addr="0x7f99f1de2d90" >
+                                    <typetabsitem id="15037" addr="0x7fca46930d90" >
+                                        <attributelist id="15038" addr="0x7fca46930d90" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="15039" addr="0x7f99f1de3410" >
-                                        <attributelist id="15040" addr="0x7f99f1de3410" >
+                                    <typetabsitem id="15039" addr="0x7fca46931410" >
+                                        <attributelist id="15040" addr="0x7fca46931410" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="15041" addr="0x7f99f1dd3590" >
-                                        <attributelist id="15042" addr="0x7f99f1dd3590" >
+                                    <typetabsitem id="15041" addr="0x7fca46921590" >
+                                        <attributelist id="15042" addr="0x7fca46921590" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="15043" addr="0x7f99f1dd3390" >
-                                        <attributelist id="15044" addr="0x7f99f1dd3390" >
+                                    <typetabsitem id="15043" addr="0x7fca46921390" >
+                                        <attributelist id="15044" addr="0x7fca46921390" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
-                                <attribute name="parent" value="0x7f99f1dd1d70" id="15045" addr="0x7f99f1dd1d70" />
-                                <attribute name="qname" value="XBMCAddon::xbmcgui" id="15046" addr="0x7f99f1de6c90" />
-                                <attribute name="symtab" value="0x7f99f1e40fb0" id="15047" addr="0x7f99f1e40fb0" />
+                                <attribute name="parent" value="0x7fca4691fd70" id="15045" addr="0x7fca4691fd70" />
+                                <attribute name="qname" value="XBMCAddon::xbmcgui" id="15046" addr="0x7fca46934c90" />
+                                <attribute name="symtab" value="0x7fca4698efb0" id="15047" addr="0x7fca4698efb0" />
                             </attributelist >
-                            <typescopesitem id="15048" addr="0x7f99f1e40f70" >
-                                <attributelist id="15049" addr="0x7f99f1e40f70" >
+                            <typescopesitem id="15048" addr="0x7fca4698ef70" >
+                                <attributelist id="15049" addr="0x7fca4698ef70" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="15050" addr="0x7f99f1dd2170" >
-                                <attributelist id="15051" addr="0x7f99f1dd2170" >
-                                    <attribute name="InterceptorBase" value="InterceptorBase" id="15052" addr="0x7f99f1de6c90" />
-                                    <attribute name="Dialog" value="Dialog" id="15053" addr="0x7f99f1de6c90" />
-                                    <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="15054" addr="0x7f99f1de6c90" />
-                                    <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="15055" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlTextBox" value="ControlTextBox" id="15056" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlRadioButton" value="ControlRadioButton" id="15057" addr="0x7f99f1de6c90" />
-                                    <attribute name="Window" value="Window" id="15058" addr="0x7f99f1de6c90" />
-                                    <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="15059" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlList" value="ControlList" id="15060" addr="0x7f99f1de6c90" />
-                                    <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="15061" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlImage" value="ControlImage" id="15062" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlButton" value="ControlButton" id="15063" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlGroup" value="ControlGroup" id="15064" addr="0x7f99f1de6c90" />
-                                    <attribute name="DialogBusy" value="DialogBusy" id="15065" addr="0x7f99f1de6c90" />
-                                    <attribute name="DialogProgressBG" value="DialogProgressBG" id="15066" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlSpin" value="ControlSpin" id="15067" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlEdit" value="ControlEdit" id="15068" addr="0x7f99f1de6c90" />
-                                    <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="15069" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="15070" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlLabel" value="ControlLabel" id="15071" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlProgress" value="ControlProgress" id="15072" addr="0x7f99f1de6c90" />
-                                    <attribute name="Control" value="Control" id="15073" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlSlider" value="ControlSlider" id="15074" addr="0x7f99f1de6c90" />
-                                    <attribute name="DialogProgress" value="DialogProgress" id="15075" addr="0x7f99f1de6c90" />
-                                    <attribute name="Action" value="Action" id="15076" addr="0x7f99f1de6c90" />
-                                    <attribute name="WindowDialog" value="WindowDialog" id="15077" addr="0x7f99f1de6c90" />
-                                    <attribute name="WindowXML" value="WindowXML" id="15078" addr="0x7f99f1de6c90" />
-                                    <attribute name="ListItem" value="ListItem" id="15079" addr="0x7f99f1de6c90" />
-                                    <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="15080" addr="0x7f99f1de6c90" />
+                            <typescopesitem id="15050" addr="0x7fca46920170" >
+                                <attributelist id="15051" addr="0x7fca46920170" >
+                                    <attribute name="InterceptorBase" value="InterceptorBase" id="15052" addr="0x7fca46934c90" />
+                                    <attribute name="Dialog" value="Dialog" id="15053" addr="0x7fca46934c90" />
+                                    <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="15054" addr="0x7fca46934c90" />
+                                    <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="15055" addr="0x7fca46934c90" />
+                                    <attribute name="ControlTextBox" value="ControlTextBox" id="15056" addr="0x7fca46934c90" />
+                                    <attribute name="ControlRadioButton" value="ControlRadioButton" id="15057" addr="0x7fca46934c90" />
+                                    <attribute name="Window" value="Window" id="15058" addr="0x7fca46934c90" />
+                                    <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="15059" addr="0x7fca46934c90" />
+                                    <attribute name="ControlList" value="ControlList" id="15060" addr="0x7fca46934c90" />
+                                    <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="15061" addr="0x7fca46934c90" />
+                                    <attribute name="ControlImage" value="ControlImage" id="15062" addr="0x7fca46934c90" />
+                                    <attribute name="ControlButton" value="ControlButton" id="15063" addr="0x7fca46934c90" />
+                                    <attribute name="ControlGroup" value="ControlGroup" id="15064" addr="0x7fca46934c90" />
+                                    <attribute name="DialogBusy" value="DialogBusy" id="15065" addr="0x7fca46934c90" />
+                                    <attribute name="DialogProgressBG" value="DialogProgressBG" id="15066" addr="0x7fca46934c90" />
+                                    <attribute name="ControlSpin" value="ControlSpin" id="15067" addr="0x7fca46934c90" />
+                                    <attribute name="ControlEdit" value="ControlEdit" id="15068" addr="0x7fca46934c90" />
+                                    <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="15069" addr="0x7fca46934c90" />
+                                    <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="15070" addr="0x7fca46934c90" />
+                                    <attribute name="ControlLabel" value="ControlLabel" id="15071" addr="0x7fca46934c90" />
+                                    <attribute name="ControlProgress" value="ControlProgress" id="15072" addr="0x7fca46934c90" />
+                                    <attribute name="Control" value="Control" id="15073" addr="0x7fca46934c90" />
+                                    <attribute name="ControlSlider" value="ControlSlider" id="15074" addr="0x7fca46934c90" />
+                                    <attribute name="DialogProgress" value="DialogProgress" id="15075" addr="0x7fca46934c90" />
+                                    <attribute name="Action" value="Action" id="15076" addr="0x7fca46934c90" />
+                                    <attribute name="WindowDialog" value="WindowDialog" id="15077" addr="0x7fca46934c90" />
+                                    <attribute name="WindowXML" value="WindowXML" id="15078" addr="0x7fca46934c90" />
+                                    <attribute name="ListItem" value="ListItem" id="15079" addr="0x7fca46934c90" />
+                                    <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="15080" addr="0x7fca46934c90" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="15081" addr="0x7f99f1dd1d70" >
-                                <attributelist id="15082" addr="0x7f99f1dd1d70" >
-                                    <attribute name="name" value="XBMCAddon" id="15083" addr="0x7f99f1de6c90" />
-                                    <typetab id="15084" addr="0x7f99f1dd1db0" >
-                                        <attributelist id="15085" addr="0x7f99f1dd1db0" >
-                                            <attribute name="Dictionary" value="Dictionary" id="15086" addr="0x7f99f1de6c90" />
-                                            <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="15087" addr="0x7f99f1de6c90" />
-                                            <attribute name="String" value="std::string" id="15088" addr="0x7f99f1de6c90" />
-                                            <attribute name="StringOrInt" value="XBMCAddon::String" id="15089" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                        <typetabsitem id="15090" addr="0x7f99f1dd28b0" >
-                                            <attributelist id="15091" addr="0x7f99f1dd28b0" >
+                            <typescopesitem id="15081" addr="0x7fca4691fd70" >
+                                <attributelist id="15082" addr="0x7fca4691fd70" >
+                                    <attribute name="name" value="XBMCAddon" id="15083" addr="0x7fca46934c90" />
+                                    <typetab id="15084" addr="0x7fca4691fdb0" >
+                                        <attributelist id="15085" addr="0x7fca4691fdb0" >
+                                            <attribute name="Dictionary" value="Dictionary" id="15086" addr="0x7fca46934c90" />
+                                            <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="15087" addr="0x7fca46934c90" />
+                                            <attribute name="String" value="std::string" id="15088" addr="0x7fca46934c90" />
+                                            <attribute name="StringOrInt" value="XBMCAddon::String" id="15089" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                        <typetabsitem id="15090" addr="0x7fca469208b0" >
+                                            <attributelist id="15091" addr="0x7fca469208b0" >
                                             </attributelist >
                                         </typetabsitem >
-                                        <typetabsitem id="15092" addr="0x7f99f1dd2910" >
-                                            <attributelist id="15093" addr="0x7f99f1dd2910" >
+                                        <typetabsitem id="15092" addr="0x7fca46920910" >
+                                            <attributelist id="15093" addr="0x7fca46920910" >
                                             </attributelist >
                                         </typetabsitem >
-                                        <typetabsitem id="15094" addr="0x7f99f1dd1f90" >
-                                            <attributelist id="15095" addr="0x7f99f1dd1f90" >
+                                        <typetabsitem id="15094" addr="0x7fca4691ff90" >
+                                            <attributelist id="15095" addr="0x7fca4691ff90" >
                                             </attributelist >
                                         </typetabsitem >
-                                        <typetabsitem id="15096" addr="0x7f99f1dd2710" >
-                                            <attributelist id="15097" addr="0x7f99f1dd2710" >
+                                        <typetabsitem id="15096" addr="0x7fca46920710" >
+                                            <attributelist id="15097" addr="0x7fca46920710" >
                                             </attributelist >
                                         </typetabsitem >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f99f1e1da30" id="15098" addr="0x7f99f1e1da30" />
-                                    <attribute name="qname" value="XBMCAddon" id="15099" addr="0x7f99f1de6c90" />
-                                    <attribute name="symtab" value="0x7f99f1e408b0" id="15100" addr="0x7f99f1e408b0" />
+                                    <attribute name="parent" value="0x7fca4696ba30" id="15098" addr="0x7fca4696ba30" />
+                                    <attribute name="qname" value="XBMCAddon" id="15099" addr="0x7fca46934c90" />
+                                    <attribute name="symtab" value="0x7fca4698e8b0" id="15100" addr="0x7fca4698e8b0" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="15101" addr="0x7f99f1dd2190" >
-                                <attributelist id="15102" addr="0x7f99f1dd2190" >
+                            <typescopesitem id="15101" addr="0x7fca46920190" >
+                                <attributelist id="15102" addr="0x7fca46920190" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="15103" addr="0x7f99f1e40fb0" >
-                                <attributelist id="15104" addr="0x7f99f1e40fb0" >
-                                    <attribute name="name" value="xbmcgui" id="15105" addr="0x7f99f1de6c90" />
-                                    <attribute name="csymtab" value="0x7f99f1e40ff0" id="15106" addr="0x7f99f1e40ff0" />
-                                    <attribute name="symtab" value="0x7f99f1e40f90" id="15107" addr="0x7f99f1e40f90" />
+                            <typescopesitem id="15103" addr="0x7fca4698efb0" >
+                                <attributelist id="15104" addr="0x7fca4698efb0" >
+                                    <attribute name="name" value="xbmcgui" id="15105" addr="0x7fca46934c90" />
+                                    <attribute name="csymtab" value="0x7fca4698eff0" id="15106" addr="0x7fca4698eff0" />
+                                    <attribute name="symtab" value="0x7fca4698ef90" id="15107" addr="0x7fca4698ef90" />
                                 </attributelist >
                             </typescopesitem >
                         </typescope >
                     </attributelist >
 
-                    <classforward id="15108" addr="0x7f99f1dabe70" >
-                        <attributelist id="15109" addr="0x7f99f1dabe70" >
-                            <attribute name="sym_name" value="InterceptorBase" id="15110" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="InterceptorBase" id="15111" addr="0x7f99f1de6c90" />
-                            <attribute name="kind" value="class" id="15112" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_weak" value="1" id="15113" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="15114" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="15115" addr="0x7f99f1de6c90" />
+                    <classforward id="15108" addr="0x7fca468f9e70" >
+                        <attributelist id="15109" addr="0x7fca468f9e70" >
+                            <attribute name="sym_name" value="InterceptorBase" id="15110" addr="0x7fca46934c90" />
+                            <attribute name="name" value="InterceptorBase" id="15111" addr="0x7fca46934c90" />
+                            <attribute name="kind" value="class" id="15112" addr="0x7fca46934c90" />
+                            <attribute name="sym_weak" value="1" id="15113" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="15114" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="15115" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </classforward >
-                    <class id="15116" addr="0x7f99f1dac070" >
-                        <attributelist id="15117" addr="0x7f99f1dac070" >
-                            <attribute name="name" value="XBMCAddon::xbmcgui::Action" id="15118" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="15119" addr="0x7f99f1e40fb0" />
-                            <attribute name="symtab" value="0x7f99f1dac1d0" id="15120" addr="0x7f99f1dac1d0" />
-                            <attribute name="allows_typedef" value="1" id="15121" addr="0x7f99f1de6c90" />
-                            <attribute name="typepass_visit" value="1" id="15122" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_visit" value="1" id="15123" addr="0x7f99f1de6c90" />
-                            <attribute name="kind" value="class" id="15124" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_name" value="Action" id="15125" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_default_constructor" value="1" id="15126" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_has_constructor" value="1" id="15127" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_public_constructor" value="1" id="15128" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_copy_constructor" value="1" id="15129" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_default_destructor" value="1" id="15130" addr="0x7f99f1de6c90" />
-                            <attribute name="privatebaselist" value="0x7f99f1dac050" id="15131" addr="0x7f99f1dac050" />
-                            <attribute name="protectedbaselist" value="0x7f99f1dac030" id="15132" addr="0x7f99f1dac030" />
-                            <baselist id="15133" addr="0x7f99f1dac010" >
-                                <base name="AddonClass" id="15134" addr="0x7f99f1dabf90" />
+                    <class id="15116" addr="0x7fca468fa070" >
+                        <attributelist id="15117" addr="0x7fca468fa070" >
+                            <attribute name="name" value="XBMCAddon::xbmcgui::Action" id="15118" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="15119" addr="0x7fca4698efb0" />
+                            <attribute name="symtab" value="0x7fca468fa1d0" id="15120" addr="0x7fca468fa1d0" />
+                            <attribute name="allows_typedef" value="1" id="15121" addr="0x7fca46934c90" />
+                            <attribute name="typepass_visit" value="1" id="15122" addr="0x7fca46934c90" />
+                            <attribute name="allocate_visit" value="1" id="15123" addr="0x7fca46934c90" />
+                            <attribute name="kind" value="class" id="15124" addr="0x7fca46934c90" />
+                            <attribute name="sym_name" value="Action" id="15125" addr="0x7fca46934c90" />
+                            <attribute name="allocate_default_constructor" value="1" id="15126" addr="0x7fca46934c90" />
+                            <attribute name="allocate_has_constructor" value="1" id="15127" addr="0x7fca46934c90" />
+                            <attribute name="allocate_public_constructor" value="1" id="15128" addr="0x7fca46934c90" />
+                            <attribute name="allocate_copy_constructor" value="1" id="15129" addr="0x7fca46934c90" />
+                            <attribute name="allocate_default_destructor" value="1" id="15130" addr="0x7fca46934c90" />
+                            <attribute name="privatebaselist" value="0x7fca468fa050" id="15131" addr="0x7fca468fa050" />
+                            <attribute name="protectedbaselist" value="0x7fca468fa030" id="15132" addr="0x7fca468fa030" />
+                            <baselist id="15133" addr="0x7fca468fa010" >
+                                <base name="AddonClass" id="15134" addr="0x7fca468f9f90" />
                             </baselist >
-                            <attribute name="module" value="xbmcgui" id="15135" addr="0x7f99f1e402f0" />
-                            <attribute name="feature_python_rcmp" value="{ XBMC_TRACE;&#10;    if (method == Py_EQ)&#10;    {&#10;      XBMCAddon::xbmcgui::Action* a1 = (Action*)retrieveApiInstance(obj1,&amp;TyXBMCAddon_xbmcgui_Action_Type,&quot;rcmp&quot;,&quot;XBMCAddon::xbmcgui::Action&quot;);&#10;      if (PyObject_TypeCheck(obj2, &amp;(TyXBMCAddon_xbmcgui_Action_Type.pythonType)))&#10;      {&#10;        // both are Action objects&#10;        XBMCAddon::xbmcgui::Action* a2 = (Action*)retrieveApiInstance(obj2,&amp;TyXBMCAddon_xbmcgui_Action_Type,&quot;rcmp&quot;,&quot;XBMCAddon::xbmcgui::Action&quot;);&#10;&#10;        if (a1->id == a2->id &amp;&amp;&#10;            a1->buttonCode == a2->buttonCode &amp;&amp;&#10;            a1->fAmount1 == a2->fAmount1 &amp;&amp;&#10;            a1->fAmount2 == a2->fAmount2 &amp;&amp;&#10;            a1->fRepeat == a2->fRepeat &amp;&amp;&#10;            a1->strAction == a2->strAction)&#10;        {&#10;          Py_RETURN_TRUE;&#10;        }&#10;        else&#10;        {&#10;          Py_RETURN_FALSE;&#10;        }&#10;      }&#10;      else&#10;      {&#10;        // for backwards compatability in python scripts&#10;        PyObject* o1 = PyLong_FromLong(a1->id);&#10;        return PyObject_RichCompare(o1, obj2, method);&#10;      }&#10;    }&#10;    Py_INCREF(Py_NotImplemented);&#10;    return Py_NotImplemented;&#10;  }" id="15136" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="15137" addr="0x7f99f1de6c90" />
-                            <typescope id="15138" addr="0x7f99f1de1f10" >
-                                <attributelist id="15139" addr="0x7f99f1de1f10" >
-                                    <attribute name="name" value="Action" id="15140" addr="0x7f99f1de6c90" />
-                                    <typetab id="15141" addr="0x7f99f1de1f30" >
-                                        <attributelist id="15142" addr="0x7f99f1de1f30" >
+                            <attribute name="module" value="xbmcgui" id="15135" addr="0x7fca4698e2f0" />
+                            <attribute name="feature_python_rcmp" value="{ XBMC_TRACE;&#10;    if (method == Py_EQ)&#10;    {&#10;      XBMCAddon::xbmcgui::Action* a1 = (Action*)retrieveApiInstance(obj1,&amp;TyXBMCAddon_xbmcgui_Action_Type,&quot;rcmp&quot;,&quot;XBMCAddon::xbmcgui::Action&quot;);&#10;      if (PyObject_TypeCheck(obj2, &amp;(TyXBMCAddon_xbmcgui_Action_Type.pythonType)))&#10;      {&#10;        // both are Action objects&#10;        XBMCAddon::xbmcgui::Action* a2 = (Action*)retrieveApiInstance(obj2,&amp;TyXBMCAddon_xbmcgui_Action_Type,&quot;rcmp&quot;,&quot;XBMCAddon::xbmcgui::Action&quot;);&#10;&#10;        if (a1->id == a2->id &amp;&amp;&#10;            a1->buttonCode == a2->buttonCode &amp;&amp;&#10;            a1->fAmount1 == a2->fAmount1 &amp;&amp;&#10;            a1->fAmount2 == a2->fAmount2 &amp;&amp;&#10;            a1->fRepeat == a2->fRepeat &amp;&amp;&#10;            a1->strAction == a2->strAction)&#10;        {&#10;          Py_RETURN_TRUE;&#10;        }&#10;        else&#10;        {&#10;          Py_RETURN_FALSE;&#10;        }&#10;      }&#10;      else&#10;      {&#10;        // for backwards compatability in python scripts&#10;        PyObject* o1 = PyLong_FromLong(a1->id);&#10;        return PyObject_RichCompare(o1, obj2, method);&#10;      }&#10;    }&#10;    Py_INCREF(Py_NotImplemented);&#10;    return Py_NotImplemented;&#10;  }" id="15136" addr="0x7fca46934c90" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="15137" addr="0x7fca46934c90" />
+                            <typescope id="15138" addr="0x7fca4692ff10" >
+                                <attributelist id="15139" addr="0x7fca4692ff10" >
+                                    <attribute name="name" value="Action" id="15140" addr="0x7fca46934c90" />
+                                    <typetab id="15141" addr="0x7fca4692ff30" >
+                                        <attributelist id="15142" addr="0x7fca4692ff30" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f99f1dd2150" id="15143" addr="0x7f99f1dd2150" />
-                                    <attribute name="qname" value="XBMCAddon::xbmcgui::Action" id="15144" addr="0x7f99f1de6c90" />
-                                    <attribute name="symtab" value="0x7f99f1dac1d0" id="15145" addr="0x7f99f1dac1d0" />
+                                    <attribute name="parent" value="0x7fca46920150" id="15143" addr="0x7fca46920150" />
+                                    <attribute name="qname" value="XBMCAddon::xbmcgui::Action" id="15144" addr="0x7fca46934c90" />
+                                    <attribute name="symtab" value="0x7fca468fa1d0" id="15145" addr="0x7fca468fa1d0" />
                                 </attributelist >
-                                <typescopesitem id="15146" addr="0x7f99f1de1eb0" >
-                                    <attributelist id="15147" addr="0x7f99f1de1eb0" >
+                                <typescopesitem id="15146" addr="0x7fca4692feb0" >
+                                    <attributelist id="15147" addr="0x7fca4692feb0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="15148" addr="0x7f99f1de1f30" >
-                                    <attributelist id="15149" addr="0x7f99f1de1f30" >
+                                <typescopesitem id="15148" addr="0x7fca4692ff30" >
+                                    <attributelist id="15149" addr="0x7fca4692ff30" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="15150" addr="0x7f99f1dd2150" >
-                                    <attributelist id="15151" addr="0x7f99f1dd2150" >
-                                        <attribute name="name" value="xbmcgui" id="15152" addr="0x7f99f1de6c90" />
-                                        <typetab id="15153" addr="0x7f99f1dd2170" >
-                                            <attributelist id="15154" addr="0x7f99f1dd2170" >
-                                                <attribute name="InterceptorBase" value="InterceptorBase" id="15155" addr="0x7f99f1de6c90" />
-                                                <attribute name="Dialog" value="Dialog" id="15156" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="15157" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="15158" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlTextBox" value="ControlTextBox" id="15159" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="15160" addr="0x7f99f1de6c90" />
-                                                <attribute name="Window" value="Window" id="15161" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="15162" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlList" value="ControlList" id="15163" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="15164" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlImage" value="ControlImage" id="15165" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlButton" value="ControlButton" id="15166" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlGroup" value="ControlGroup" id="15167" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogBusy" value="DialogBusy" id="15168" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="15169" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSpin" value="ControlSpin" id="15170" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlEdit" value="ControlEdit" id="15171" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="15172" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="15173" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlLabel" value="ControlLabel" id="15174" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlProgress" value="ControlProgress" id="15175" addr="0x7f99f1de6c90" />
-                                                <attribute name="Control" value="Control" id="15176" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSlider" value="ControlSlider" id="15177" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgress" value="DialogProgress" id="15178" addr="0x7f99f1de6c90" />
-                                                <attribute name="Action" value="Action" id="15179" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowDialog" value="WindowDialog" id="15180" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXML" value="WindowXML" id="15181" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItem" value="ListItem" id="15182" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="15183" addr="0x7f99f1de6c90" />
+                                <typescopesitem id="15150" addr="0x7fca46920150" >
+                                    <attributelist id="15151" addr="0x7fca46920150" >
+                                        <attribute name="name" value="xbmcgui" id="15152" addr="0x7fca46934c90" />
+                                        <typetab id="15153" addr="0x7fca46920170" >
+                                            <attributelist id="15154" addr="0x7fca46920170" >
+                                                <attribute name="InterceptorBase" value="InterceptorBase" id="15155" addr="0x7fca46934c90" />
+                                                <attribute name="Dialog" value="Dialog" id="15156" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="15157" addr="0x7fca46934c90" />
+                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="15158" addr="0x7fca46934c90" />
+                                                <attribute name="ControlTextBox" value="ControlTextBox" id="15159" addr="0x7fca46934c90" />
+                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="15160" addr="0x7fca46934c90" />
+                                                <attribute name="Window" value="Window" id="15161" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="15162" addr="0x7fca46934c90" />
+                                                <attribute name="ControlList" value="ControlList" id="15163" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="15164" addr="0x7fca46934c90" />
+                                                <attribute name="ControlImage" value="ControlImage" id="15165" addr="0x7fca46934c90" />
+                                                <attribute name="ControlButton" value="ControlButton" id="15166" addr="0x7fca46934c90" />
+                                                <attribute name="ControlGroup" value="ControlGroup" id="15167" addr="0x7fca46934c90" />
+                                                <attribute name="DialogBusy" value="DialogBusy" id="15168" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="15169" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSpin" value="ControlSpin" id="15170" addr="0x7fca46934c90" />
+                                                <attribute name="ControlEdit" value="ControlEdit" id="15171" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="15172" addr="0x7fca46934c90" />
+                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="15173" addr="0x7fca46934c90" />
+                                                <attribute name="ControlLabel" value="ControlLabel" id="15174" addr="0x7fca46934c90" />
+                                                <attribute name="ControlProgress" value="ControlProgress" id="15175" addr="0x7fca46934c90" />
+                                                <attribute name="Control" value="Control" id="15176" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSlider" value="ControlSlider" id="15177" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgress" value="DialogProgress" id="15178" addr="0x7fca46934c90" />
+                                                <attribute name="Action" value="Action" id="15179" addr="0x7fca46934c90" />
+                                                <attribute name="WindowDialog" value="WindowDialog" id="15180" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXML" value="WindowXML" id="15181" addr="0x7fca46934c90" />
+                                                <attribute name="ListItem" value="ListItem" id="15182" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="15183" addr="0x7fca46934c90" />
                                             </attributelist >
-                                            <typetabsitem id="15184" addr="0x7f99f1de1dd0" >
-                                                <attributelist id="15185" addr="0x7f99f1de1dd0" >
+                                            <typetabsitem id="15184" addr="0x7fca4692fdd0" >
+                                                <attributelist id="15185" addr="0x7fca4692fdd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15186" addr="0x7f99f1dde790" >
-                                                <attributelist id="15187" addr="0x7f99f1dde790" >
+                                            <typetabsitem id="15186" addr="0x7fca4692c790" >
+                                                <attributelist id="15187" addr="0x7fca4692c790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15188" addr="0x7f99f1de3f10" >
-                                                <attributelist id="15189" addr="0x7f99f1de3f10" >
+                                            <typetabsitem id="15188" addr="0x7fca46931f10" >
+                                                <attributelist id="15189" addr="0x7fca46931f10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15190" addr="0x7f99f1dd67b0" >
-                                                <attributelist id="15191" addr="0x7f99f1dd67b0" >
+                                            <typetabsitem id="15190" addr="0x7fca469247b0" >
+                                                <attributelist id="15191" addr="0x7fca469247b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15192" addr="0x7f99f1ddafd0" >
-                                                <attributelist id="15193" addr="0x7f99f1ddafd0" >
+                                            <typetabsitem id="15192" addr="0x7fca46928fd0" >
+                                                <attributelist id="15193" addr="0x7fca46928fd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15194" addr="0x7f99f1ddd430" >
-                                                <attributelist id="15195" addr="0x7f99f1ddd430" >
+                                            <typetabsitem id="15194" addr="0x7fca4692b430" >
+                                                <attributelist id="15195" addr="0x7fca4692b430" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15196" addr="0x7f99f1de2130" >
-                                                <attributelist id="15197" addr="0x7f99f1de2130" >
+                                            <typetabsitem id="15196" addr="0x7fca46930130" >
+                                                <attributelist id="15197" addr="0x7fca46930130" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15198" addr="0x7f99f1dd2f50" >
-                                                <attributelist id="15199" addr="0x7f99f1dd2f50" >
+                                            <typetabsitem id="15198" addr="0x7fca46920f50" >
+                                                <attributelist id="15199" addr="0x7fca46920f50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15200" addr="0x7f99f1dd9650" >
-                                                <attributelist id="15201" addr="0x7f99f1dd9650" >
+                                            <typetabsitem id="15200" addr="0x7fca46927650" >
+                                                <attributelist id="15201" addr="0x7fca46927650" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15202" addr="0x7f99f1de3390" >
-                                                <attributelist id="15203" addr="0x7f99f1de3390" >
+                                            <typetabsitem id="15202" addr="0x7fca46931390" >
+                                                <attributelist id="15203" addr="0x7fca46931390" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15204" addr="0x7f99f1ddb7b0" >
-                                                <attributelist id="15205" addr="0x7f99f1ddb7b0" >
+                                            <typetabsitem id="15204" addr="0x7fca469297b0" >
+                                                <attributelist id="15205" addr="0x7fca469297b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15206" addr="0x7f99f1ddc4b0" >
-                                                <attributelist id="15207" addr="0x7f99f1ddc4b0" >
+                                            <typetabsitem id="15206" addr="0x7fca4692a4b0" >
+                                                <attributelist id="15207" addr="0x7fca4692a4b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15208" addr="0x7f99f1ddcf90" >
-                                                <attributelist id="15209" addr="0x7f99f1ddcf90" >
+                                            <typetabsitem id="15208" addr="0x7fca4692af90" >
+                                                <attributelist id="15209" addr="0x7fca4692af90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15210" addr="0x7f99f1de11b0" >
-                                                <attributelist id="15211" addr="0x7f99f1de11b0" >
+                                            <typetabsitem id="15210" addr="0x7fca4692f1b0" >
+                                                <attributelist id="15211" addr="0x7fca4692f1b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15212" addr="0x7f99f1de15b0" >
-                                                <attributelist id="15213" addr="0x7f99f1de15b0" >
+                                            <typetabsitem id="15212" addr="0x7fca4692f5b0" >
+                                                <attributelist id="15213" addr="0x7fca4692f5b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15214" addr="0x7f99f1dd77f0" >
-                                                <attributelist id="15215" addr="0x7f99f1dd77f0" >
+                                            <typetabsitem id="15214" addr="0x7fca469257f0" >
+                                                <attributelist id="15215" addr="0x7fca469257f0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15216" addr="0x7f99f1dd8b30" >
-                                                <attributelist id="15217" addr="0x7f99f1dd8b30" >
+                                            <typetabsitem id="15216" addr="0x7fca46926b30" >
+                                                <attributelist id="15217" addr="0x7fca46926b30" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15218" addr="0x7f99f1dd2c50" >
-                                                <attributelist id="15219" addr="0x7f99f1dd2c50" >
+                                            <typetabsitem id="15218" addr="0x7fca46920c50" >
+                                                <attributelist id="15219" addr="0x7fca46920c50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15220" addr="0x7f99f1dda790" >
-                                                <attributelist id="15221" addr="0x7f99f1dda790" >
+                                            <typetabsitem id="15220" addr="0x7fca46928790" >
+                                                <attributelist id="15221" addr="0x7fca46928790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15222" addr="0x7f99f1dd8030" >
-                                                <attributelist id="15223" addr="0x7f99f1dd8030" >
+                                            <typetabsitem id="15222" addr="0x7fca46926030" >
+                                                <attributelist id="15223" addr="0x7fca46926030" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15224" addr="0x7f99f1ddbe10" >
-                                                <attributelist id="15225" addr="0x7f99f1ddbe10" >
+                                            <typetabsitem id="15224" addr="0x7fca46929e10" >
+                                                <attributelist id="15225" addr="0x7fca46929e10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15226" addr="0x7f99f1dd6b10" >
-                                                <attributelist id="15227" addr="0x7f99f1dd6b10" >
+                                            <typetabsitem id="15226" addr="0x7fca46924b10" >
+                                                <attributelist id="15227" addr="0x7fca46924b10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15228" addr="0x7f99f1dddf90" >
-                                                <attributelist id="15229" addr="0x7f99f1dddf90" >
+                                            <typetabsitem id="15228" addr="0x7fca4692bf90" >
+                                                <attributelist id="15229" addr="0x7fca4692bf90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15230" addr="0x7f99f1de0530" >
-                                                <attributelist id="15231" addr="0x7f99f1de0530" >
+                                            <typetabsitem id="15230" addr="0x7fca4692e530" >
+                                                <attributelist id="15231" addr="0x7fca4692e530" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15232" addr="0x7f99f1de1e50" >
-                                                <attributelist id="15233" addr="0x7f99f1de1e50" >
+                                            <typetabsitem id="15232" addr="0x7fca4692fe50" >
+                                                <attributelist id="15233" addr="0x7fca4692fe50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15234" addr="0x7f99f1de2d90" >
-                                                <attributelist id="15235" addr="0x7f99f1de2d90" >
+                                            <typetabsitem id="15234" addr="0x7fca46930d90" >
+                                                <attributelist id="15235" addr="0x7fca46930d90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15236" addr="0x7f99f1de3410" >
-                                                <attributelist id="15237" addr="0x7f99f1de3410" >
+                                            <typetabsitem id="15236" addr="0x7fca46931410" >
+                                                <attributelist id="15237" addr="0x7fca46931410" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15238" addr="0x7f99f1dd3590" >
-                                                <attributelist id="15239" addr="0x7f99f1dd3590" >
+                                            <typetabsitem id="15238" addr="0x7fca46921590" >
+                                                <attributelist id="15239" addr="0x7fca46921590" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15240" addr="0x7f99f1dd3390" >
-                                                <attributelist id="15241" addr="0x7f99f1dd3390" >
+                                            <typetabsitem id="15240" addr="0x7fca46921390" >
+                                                <attributelist id="15241" addr="0x7fca46921390" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7f99f1dd1d70" id="15242" addr="0x7f99f1dd1d70" />
-                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="15243" addr="0x7f99f1de6c90" />
-                                        <attribute name="symtab" value="0x7f99f1e40fb0" id="15244" addr="0x7f99f1e40fb0" />
+                                        <attribute name="parent" value="0x7fca4691fd70" id="15242" addr="0x7fca4691fd70" />
+                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="15243" addr="0x7fca46934c90" />
+                                        <attribute name="symtab" value="0x7fca4698efb0" id="15244" addr="0x7fca4698efb0" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="15245" addr="0x7f99f1de1f50" >
-                                    <attributelist id="15246" addr="0x7f99f1de1f50" >
+                                <typescopesitem id="15245" addr="0x7fca4692ff50" >
+                                    <attributelist id="15246" addr="0x7fca4692ff50" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="15247" addr="0x7f99f1dac1d0" >
-                                    <attributelist id="15248" addr="0x7f99f1dac1d0" >
-                                        <attribute name="name" value="Action" id="15249" addr="0x7f99f1de6c90" />
-                                        <attribute name="csymtab" value="0x7f99f1dac1f0" id="15250" addr="0x7f99f1dac1f0" />
-                                        <attribute name="symtab" value="0x7f99f1dac190" id="15251" addr="0x7f99f1dac190" />
+                                <typescopesitem id="15247" addr="0x7fca468fa1d0" >
+                                    <attributelist id="15248" addr="0x7fca468fa1d0" >
+                                        <attribute name="name" value="Action" id="15249" addr="0x7fca46934c90" />
+                                        <attribute name="csymtab" value="0x7fca468fa1f0" id="15250" addr="0x7fca468fa1f0" />
+                                        <attribute name="symtab" value="0x7fca468fa190" id="15251" addr="0x7fca468fa190" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <access id="15252" addr="0x7f99f1dac150" >
-                            <attributelist id="15253" addr="0x7f99f1dac150" >
-                                <attribute name="kind" value="public" id="15254" addr="0x7f99f1de6c90" />
+                        <access id="15252" addr="0x7fca468fa150" >
+                            <attributelist id="15253" addr="0x7fca468fa150" >
+                                <attribute name="kind" value="public" id="15254" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="15255" addr="0x7f99f1dac330" >
-                            <attributelist id="15256" addr="0x7f99f1dac330" >
-                                <attribute name="value" value="default" id="15257" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="Action" id="15258" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="15259" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1dac1d0" id="15260" addr="0x7f99f1dac1d0" />
-                                <attribute name="sym_name" value="Action" id="15261" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="15262" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="15263" addr="0x7f99f1de6c90" />
-                                <attribute name="code" value="{ XBMC_TRACE;&#10;    if (method == Py_EQ)&#10;    {&#10;      XBMCAddon::xbmcgui::Action* a1 = (Action*)retrieveApiInstance(obj1,&amp;TyXBMCAddon_xbmcgui_Action_Type,&quot;rcmp&quot;,&quot;XBMCAddon::xbmcgui::Action&quot;);&#10;      if (PyObject_TypeCheck(obj2, &amp;(TyXBMCAddon_xbmcgui_Action_Type.pythonType)))&#10;      {&#10;        // both are Action objects&#10;        XBMCAddon::xbmcgui::Action* a2 = (Action*)retrieveApiInstance(obj2,&amp;TyXBMCAddon_xbmcgui_Action_Type,&quot;rcmp&quot;,&quot;XBMCAddon::xbmcgui::Action&quot;);&#10;&#10;        if (a1->id == a2->id &amp;&amp;&#10;            a1->buttonCode == a2->buttonCode &amp;&amp;&#10;            a1->fAmount1 == a2->fAmount1 &amp;&amp;&#10;            a1->fAmount2 == a2->fAmount2 &amp;&amp;&#10;            a1->fRepeat == a2->fRepeat &amp;&amp;&#10;            a1->strAction == a2->strAction)&#10;        {&#10;          Py_RETURN_TRUE;&#10;        }&#10;        else&#10;        {&#10;          Py_RETURN_FALSE;&#10;        }&#10;      }&#10;      else&#10;      {&#10;        // for backwards compatability in python scripts&#10;        PyObject* o1 = PyLong_FromLong(a1->id);&#10;        return PyObject_RichCompare(o1, obj2, method);&#10;      }&#10;    }&#10;    Py_INCREF(Py_NotImplemented);&#10;    return Py_NotImplemented;&#10;  }" id="15264" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="15265" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="15266" addr="0x7f99f1de6c90" />
+                        <constructor id="15255" addr="0x7fca468fa330" >
+                            <attributelist id="15256" addr="0x7fca468fa330" >
+                                <attribute name="value" value="default" id="15257" addr="0x7fca46934c90" />
+                                <attribute name="name" value="Action" id="15258" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="15259" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468fa1d0" id="15260" addr="0x7fca468fa1d0" />
+                                <attribute name="sym_name" value="Action" id="15261" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="15262" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="15263" addr="0x7fca46934c90" />
+                                <attribute name="code" value="{ XBMC_TRACE;&#10;    if (method == Py_EQ)&#10;    {&#10;      XBMCAddon::xbmcgui::Action* a1 = (Action*)retrieveApiInstance(obj1,&amp;TyXBMCAddon_xbmcgui_Action_Type,&quot;rcmp&quot;,&quot;XBMCAddon::xbmcgui::Action&quot;);&#10;      if (PyObject_TypeCheck(obj2, &amp;(TyXBMCAddon_xbmcgui_Action_Type.pythonType)))&#10;      {&#10;        // both are Action objects&#10;        XBMCAddon::xbmcgui::Action* a2 = (Action*)retrieveApiInstance(obj2,&amp;TyXBMCAddon_xbmcgui_Action_Type,&quot;rcmp&quot;,&quot;XBMCAddon::xbmcgui::Action&quot;);&#10;&#10;        if (a1->id == a2->id &amp;&amp;&#10;            a1->buttonCode == a2->buttonCode &amp;&amp;&#10;            a1->fAmount1 == a2->fAmount1 &amp;&amp;&#10;            a1->fAmount2 == a2->fAmount2 &amp;&amp;&#10;            a1->fRepeat == a2->fRepeat &amp;&amp;&#10;            a1->strAction == a2->strAction)&#10;        {&#10;          Py_RETURN_TRUE;&#10;        }&#10;        else&#10;        {&#10;          Py_RETURN_FALSE;&#10;        }&#10;      }&#10;      else&#10;      {&#10;        // for backwards compatability in python scripts&#10;        PyObject* o1 = PyLong_FromLong(a1->id);&#10;        return PyObject_RichCompare(o1, obj2, method);&#10;      }&#10;    }&#10;    Py_INCREF(Py_NotImplemented);&#10;    return Py_NotImplemented;&#10;  }" id="15264" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="15265" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="15266" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <cdecl id="15267" addr="0x7f99f1dac4f0" >
-                            <attributelist id="15268" addr="0x7f99f1dac4f0" >
-                                <attribute name="name" value="getId" id="15269" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="15270" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1dac1d0" id="15271" addr="0x7f99f1dac1d0" />
-                                <attribute name="kind" value="function" id="15272" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getId" id="15273" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="15274" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="15275" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="long" id="15276" addr="0x7f99f1de6c90" />
-                                <attribute name="code" value="{ XBMC_TRACE; return id; }" id="15277" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="15278" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="15279" addr="0x7f99f1dac6d0" >
-                            <attributelist id="15280" addr="0x7f99f1dac6d0" >
-                                <attribute name="name" value="getButtonCode" id="15281" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="15282" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1dac1d0" id="15283" addr="0x7f99f1dac1d0" />
-                                <attribute name="kind" value="function" id="15284" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getButtonCode" id="15285" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="15286" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="15287" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="long" id="15288" addr="0x7f99f1de6c90" />
-                                <attribute name="code" value="{ XBMC_TRACE; return buttonCode; }" id="15289" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="15290" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="15291" addr="0x7f99f1dac8b0" >
-                            <attributelist id="15292" addr="0x7f99f1dac8b0" >
-                                <attribute name="name" value="getAmount1" id="15293" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="15294" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1dac1d0" id="15295" addr="0x7f99f1dac1d0" />
-                                <attribute name="kind" value="function" id="15296" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getAmount1" id="15297" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="15298" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="15299" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="float" id="15300" addr="0x7f99f1de6c90" />
-                                <attribute name="code" value="{ XBMC_TRACE; return fAmount1; }" id="15301" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="15302" addr="0x7f99f1de6c90" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="15303" addr="0x7f99f1daca90" >
-                            <attributelist id="15304" addr="0x7f99f1daca90" >
-                                <attribute name="ismember" value="1" id="15305" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getAmount2" id="15306" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="getAmount2" id="15307" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="15308" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="15309" addr="0x7f99f1de6c90" />
-                                <attribute name="code" value="{ XBMC_TRACE; return fAmount2; }" id="15310" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="15311" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="float" id="15312" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1dac1d0" id="15313" addr="0x7f99f1dac1d0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="15314" addr="0x7f99f1de6c90" />
+                        <cdecl id="15267" addr="0x7fca468fa4f0" >
+                            <attributelist id="15268" addr="0x7fca468fa4f0" >
+                                <attribute name="name" value="getId" id="15269" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="15270" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468fa1d0" id="15271" addr="0x7fca468fa1d0" />
+                                <attribute name="kind" value="function" id="15272" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getId" id="15273" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="15274" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="15275" addr="0x7fca46934c90" />
+                                <attribute name="type" value="long" id="15276" addr="0x7fca46934c90" />
+                                <attribute name="code" value="{ XBMC_TRACE; return id; }" id="15277" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="15278" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="15279" addr="0x7fca468fa6d0" >
+                            <attributelist id="15280" addr="0x7fca468fa6d0" >
+                                <attribute name="name" value="getButtonCode" id="15281" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="15282" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468fa1d0" id="15283" addr="0x7fca468fa1d0" />
+                                <attribute name="kind" value="function" id="15284" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getButtonCode" id="15285" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="15286" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="15287" addr="0x7fca46934c90" />
+                                <attribute name="type" value="long" id="15288" addr="0x7fca46934c90" />
+                                <attribute name="code" value="{ XBMC_TRACE; return buttonCode; }" id="15289" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="15290" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="15291" addr="0x7fca468fa8b0" >
+                            <attributelist id="15292" addr="0x7fca468fa8b0" >
+                                <attribute name="name" value="getAmount1" id="15293" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="15294" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468fa1d0" id="15295" addr="0x7fca468fa1d0" />
+                                <attribute name="kind" value="function" id="15296" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getAmount1" id="15297" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="15298" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="15299" addr="0x7fca46934c90" />
+                                <attribute name="type" value="float" id="15300" addr="0x7fca46934c90" />
+                                <attribute name="code" value="{ XBMC_TRACE; return fAmount1; }" id="15301" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="15302" addr="0x7fca46934c90" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="15303" addr="0x7fca468faa90" >
+                            <attributelist id="15304" addr="0x7fca468faa90" >
+                                <attribute name="ismember" value="1" id="15305" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getAmount2" id="15306" addr="0x7fca46934c90" />
+                                <attribute name="name" value="getAmount2" id="15307" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="15308" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="15309" addr="0x7fca46934c90" />
+                                <attribute name="code" value="{ XBMC_TRACE; return fAmount2; }" id="15310" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="15311" addr="0x7fca46934c90" />
+                                <attribute name="type" value="float" id="15312" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468fa1d0" id="15313" addr="0x7fca468fa1d0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="15314" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
                     </class >
-                    <class id="15315" addr="0x7f99f1dacd70" >
-                        <attributelist id="15316" addr="0x7f99f1dacd70" >
-                            <attribute name="name" value="XBMCAddon::xbmcgui::Window" id="15317" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="15318" addr="0x7f99f1e40fb0" />
-                            <attribute name="symtab" value="0x7f99f1daced0" id="15319" addr="0x7f99f1daced0" />
-                            <attribute name="allows_typedef" value="1" id="15320" addr="0x7f99f1de6c90" />
-                            <attribute name="typepass_visit" value="1" id="15321" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_visit" value="1" id="15322" addr="0x7f99f1de6c90" />
-                            <attribute name="kind" value="class" id="15323" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_name" value="Window" id="15324" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_default_constructor" value="1" id="15325" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_has_constructor" value="1" id="15326" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_public_constructor" value="1" id="15327" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_has_destructor" value="1" id="15328" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_default_destructor" value="1" id="15329" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_copy_constructor" value="1" id="15330" addr="0x7f99f1de6c90" />
-                            <attribute name="privatebaselist" value="0x7f99f1dacd50" id="15331" addr="0x7f99f1dacd50" />
-                            <attribute name="protectedbaselist" value="0x7f99f1dacd30" id="15332" addr="0x7f99f1dacd30" />
-                            <baselist id="15333" addr="0x7f99f1dacd10" >
-                                <base name="AddonCallback" id="15334" addr="0x7f99f1dacc90" />
+                    <class id="15315" addr="0x7fca468fad70" >
+                        <attributelist id="15316" addr="0x7fca468fad70" >
+                            <attribute name="name" value="XBMCAddon::xbmcgui::Window" id="15317" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="15318" addr="0x7fca4698efb0" />
+                            <attribute name="symtab" value="0x7fca468faed0" id="15319" addr="0x7fca468faed0" />
+                            <attribute name="allows_typedef" value="1" id="15320" addr="0x7fca46934c90" />
+                            <attribute name="typepass_visit" value="1" id="15321" addr="0x7fca46934c90" />
+                            <attribute name="allocate_visit" value="1" id="15322" addr="0x7fca46934c90" />
+                            <attribute name="kind" value="class" id="15323" addr="0x7fca46934c90" />
+                            <attribute name="sym_name" value="Window" id="15324" addr="0x7fca46934c90" />
+                            <attribute name="allocate_default_constructor" value="1" id="15325" addr="0x7fca46934c90" />
+                            <attribute name="allocate_has_constructor" value="1" id="15326" addr="0x7fca46934c90" />
+                            <attribute name="allocate_public_constructor" value="1" id="15327" addr="0x7fca46934c90" />
+                            <attribute name="allocate_has_destructor" value="1" id="15328" addr="0x7fca46934c90" />
+                            <attribute name="allocate_default_destructor" value="1" id="15329" addr="0x7fca46934c90" />
+                            <attribute name="allocate_copy_constructor" value="1" id="15330" addr="0x7fca46934c90" />
+                            <attribute name="privatebaselist" value="0x7fca468fad50" id="15331" addr="0x7fca468fad50" />
+                            <attribute name="protectedbaselist" value="0x7fca468fad30" id="15332" addr="0x7fca468fad30" />
+                            <baselist id="15333" addr="0x7fca468fad10" >
+                                <base name="AddonCallback" id="15334" addr="0x7fca468fac90" />
                             </baselist >
-                            <attribute name="module" value="xbmcgui" id="15335" addr="0x7f99f1e402f0" />
-                            <attribute name="feature_director" value="1" id="15336" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="15337" addr="0x7f99f1de6c90" />
-                            <typescope id="15338" addr="0x7f99f1de21f0" >
-                                <attributelist id="15339" addr="0x7f99f1de21f0" >
-                                    <attribute name="name" value="Window" id="15340" addr="0x7f99f1de6c90" />
-                                    <typetab id="15341" addr="0x7f99f1de2210" >
-                                        <attributelist id="15342" addr="0x7f99f1de2210" >
+                            <attribute name="module" value="xbmcgui" id="15335" addr="0x7fca4698e2f0" />
+                            <attribute name="feature_director" value="1" id="15336" addr="0x7fca46934c90" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="15337" addr="0x7fca46934c90" />
+                            <typescope id="15338" addr="0x7fca469301f0" >
+                                <attributelist id="15339" addr="0x7fca469301f0" >
+                                    <attribute name="name" value="Window" id="15340" addr="0x7fca46934c90" />
+                                    <typetab id="15341" addr="0x7fca46930210" >
+                                        <attributelist id="15342" addr="0x7fca46930210" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f99f1dd2150" id="15343" addr="0x7f99f1dd2150" />
-                                    <attribute name="qname" value="XBMCAddon::xbmcgui::Window" id="15344" addr="0x7f99f1de6c90" />
-                                    <attribute name="symtab" value="0x7f99f1daced0" id="15345" addr="0x7f99f1daced0" />
+                                    <attribute name="parent" value="0x7fca46920150" id="15343" addr="0x7fca46920150" />
+                                    <attribute name="qname" value="XBMCAddon::xbmcgui::Window" id="15344" addr="0x7fca46934c90" />
+                                    <attribute name="symtab" value="0x7fca468faed0" id="15345" addr="0x7fca468faed0" />
                                 </attributelist >
-                                <typescopesitem id="15346" addr="0x7f99f1de2190" >
-                                    <attributelist id="15347" addr="0x7f99f1de2190" >
+                                <typescopesitem id="15346" addr="0x7fca46930190" >
+                                    <attributelist id="15347" addr="0x7fca46930190" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="15348" addr="0x7f99f1de2210" >
-                                    <attributelist id="15349" addr="0x7f99f1de2210" >
+                                <typescopesitem id="15348" addr="0x7fca46930210" >
+                                    <attributelist id="15349" addr="0x7fca46930210" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="15350" addr="0x7f99f1dd2150" >
-                                    <attributelist id="15351" addr="0x7f99f1dd2150" >
-                                        <attribute name="name" value="xbmcgui" id="15352" addr="0x7f99f1de6c90" />
-                                        <typetab id="15353" addr="0x7f99f1dd2170" >
-                                            <attributelist id="15354" addr="0x7f99f1dd2170" >
-                                                <attribute name="InterceptorBase" value="InterceptorBase" id="15355" addr="0x7f99f1de6c90" />
-                                                <attribute name="Dialog" value="Dialog" id="15356" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="15357" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="15358" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlTextBox" value="ControlTextBox" id="15359" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="15360" addr="0x7f99f1de6c90" />
-                                                <attribute name="Window" value="Window" id="15361" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="15362" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlList" value="ControlList" id="15363" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="15364" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlImage" value="ControlImage" id="15365" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlButton" value="ControlButton" id="15366" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlGroup" value="ControlGroup" id="15367" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogBusy" value="DialogBusy" id="15368" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="15369" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSpin" value="ControlSpin" id="15370" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlEdit" value="ControlEdit" id="15371" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="15372" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="15373" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlLabel" value="ControlLabel" id="15374" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlProgress" value="ControlProgress" id="15375" addr="0x7f99f1de6c90" />
-                                                <attribute name="Control" value="Control" id="15376" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSlider" value="ControlSlider" id="15377" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgress" value="DialogProgress" id="15378" addr="0x7f99f1de6c90" />
-                                                <attribute name="Action" value="Action" id="15379" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowDialog" value="WindowDialog" id="15380" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXML" value="WindowXML" id="15381" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItem" value="ListItem" id="15382" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="15383" addr="0x7f99f1de6c90" />
+                                <typescopesitem id="15350" addr="0x7fca46920150" >
+                                    <attributelist id="15351" addr="0x7fca46920150" >
+                                        <attribute name="name" value="xbmcgui" id="15352" addr="0x7fca46934c90" />
+                                        <typetab id="15353" addr="0x7fca46920170" >
+                                            <attributelist id="15354" addr="0x7fca46920170" >
+                                                <attribute name="InterceptorBase" value="InterceptorBase" id="15355" addr="0x7fca46934c90" />
+                                                <attribute name="Dialog" value="Dialog" id="15356" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="15357" addr="0x7fca46934c90" />
+                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="15358" addr="0x7fca46934c90" />
+                                                <attribute name="ControlTextBox" value="ControlTextBox" id="15359" addr="0x7fca46934c90" />
+                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="15360" addr="0x7fca46934c90" />
+                                                <attribute name="Window" value="Window" id="15361" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="15362" addr="0x7fca46934c90" />
+                                                <attribute name="ControlList" value="ControlList" id="15363" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="15364" addr="0x7fca46934c90" />
+                                                <attribute name="ControlImage" value="ControlImage" id="15365" addr="0x7fca46934c90" />
+                                                <attribute name="ControlButton" value="ControlButton" id="15366" addr="0x7fca46934c90" />
+                                                <attribute name="ControlGroup" value="ControlGroup" id="15367" addr="0x7fca46934c90" />
+                                                <attribute name="DialogBusy" value="DialogBusy" id="15368" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="15369" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSpin" value="ControlSpin" id="15370" addr="0x7fca46934c90" />
+                                                <attribute name="ControlEdit" value="ControlEdit" id="15371" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="15372" addr="0x7fca46934c90" />
+                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="15373" addr="0x7fca46934c90" />
+                                                <attribute name="ControlLabel" value="ControlLabel" id="15374" addr="0x7fca46934c90" />
+                                                <attribute name="ControlProgress" value="ControlProgress" id="15375" addr="0x7fca46934c90" />
+                                                <attribute name="Control" value="Control" id="15376" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSlider" value="ControlSlider" id="15377" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgress" value="DialogProgress" id="15378" addr="0x7fca46934c90" />
+                                                <attribute name="Action" value="Action" id="15379" addr="0x7fca46934c90" />
+                                                <attribute name="WindowDialog" value="WindowDialog" id="15380" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXML" value="WindowXML" id="15381" addr="0x7fca46934c90" />
+                                                <attribute name="ListItem" value="ListItem" id="15382" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="15383" addr="0x7fca46934c90" />
                                             </attributelist >
-                                            <typetabsitem id="15384" addr="0x7f99f1de1dd0" >
-                                                <attributelist id="15385" addr="0x7f99f1de1dd0" >
+                                            <typetabsitem id="15384" addr="0x7fca4692fdd0" >
+                                                <attributelist id="15385" addr="0x7fca4692fdd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15386" addr="0x7f99f1dde790" >
-                                                <attributelist id="15387" addr="0x7f99f1dde790" >
+                                            <typetabsitem id="15386" addr="0x7fca4692c790" >
+                                                <attributelist id="15387" addr="0x7fca4692c790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15388" addr="0x7f99f1de3f10" >
-                                                <attributelist id="15389" addr="0x7f99f1de3f10" >
+                                            <typetabsitem id="15388" addr="0x7fca46931f10" >
+                                                <attributelist id="15389" addr="0x7fca46931f10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15390" addr="0x7f99f1dd67b0" >
-                                                <attributelist id="15391" addr="0x7f99f1dd67b0" >
+                                            <typetabsitem id="15390" addr="0x7fca469247b0" >
+                                                <attributelist id="15391" addr="0x7fca469247b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15392" addr="0x7f99f1ddafd0" >
-                                                <attributelist id="15393" addr="0x7f99f1ddafd0" >
+                                            <typetabsitem id="15392" addr="0x7fca46928fd0" >
+                                                <attributelist id="15393" addr="0x7fca46928fd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15394" addr="0x7f99f1ddd430" >
-                                                <attributelist id="15395" addr="0x7f99f1ddd430" >
+                                            <typetabsitem id="15394" addr="0x7fca4692b430" >
+                                                <attributelist id="15395" addr="0x7fca4692b430" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15396" addr="0x7f99f1de2130" >
-                                                <attributelist id="15397" addr="0x7f99f1de2130" >
+                                            <typetabsitem id="15396" addr="0x7fca46930130" >
+                                                <attributelist id="15397" addr="0x7fca46930130" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15398" addr="0x7f99f1dd2f50" >
-                                                <attributelist id="15399" addr="0x7f99f1dd2f50" >
+                                            <typetabsitem id="15398" addr="0x7fca46920f50" >
+                                                <attributelist id="15399" addr="0x7fca46920f50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15400" addr="0x7f99f1dd9650" >
-                                                <attributelist id="15401" addr="0x7f99f1dd9650" >
+                                            <typetabsitem id="15400" addr="0x7fca46927650" >
+                                                <attributelist id="15401" addr="0x7fca46927650" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15402" addr="0x7f99f1de3390" >
-                                                <attributelist id="15403" addr="0x7f99f1de3390" >
+                                            <typetabsitem id="15402" addr="0x7fca46931390" >
+                                                <attributelist id="15403" addr="0x7fca46931390" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15404" addr="0x7f99f1ddb7b0" >
-                                                <attributelist id="15405" addr="0x7f99f1ddb7b0" >
+                                            <typetabsitem id="15404" addr="0x7fca469297b0" >
+                                                <attributelist id="15405" addr="0x7fca469297b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15406" addr="0x7f99f1ddc4b0" >
-                                                <attributelist id="15407" addr="0x7f99f1ddc4b0" >
+                                            <typetabsitem id="15406" addr="0x7fca4692a4b0" >
+                                                <attributelist id="15407" addr="0x7fca4692a4b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15408" addr="0x7f99f1ddcf90" >
-                                                <attributelist id="15409" addr="0x7f99f1ddcf90" >
+                                            <typetabsitem id="15408" addr="0x7fca4692af90" >
+                                                <attributelist id="15409" addr="0x7fca4692af90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15410" addr="0x7f99f1de11b0" >
-                                                <attributelist id="15411" addr="0x7f99f1de11b0" >
+                                            <typetabsitem id="15410" addr="0x7fca4692f1b0" >
+                                                <attributelist id="15411" addr="0x7fca4692f1b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15412" addr="0x7f99f1de15b0" >
-                                                <attributelist id="15413" addr="0x7f99f1de15b0" >
+                                            <typetabsitem id="15412" addr="0x7fca4692f5b0" >
+                                                <attributelist id="15413" addr="0x7fca4692f5b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15414" addr="0x7f99f1dd77f0" >
-                                                <attributelist id="15415" addr="0x7f99f1dd77f0" >
+                                            <typetabsitem id="15414" addr="0x7fca469257f0" >
+                                                <attributelist id="15415" addr="0x7fca469257f0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15416" addr="0x7f99f1dd8b30" >
-                                                <attributelist id="15417" addr="0x7f99f1dd8b30" >
+                                            <typetabsitem id="15416" addr="0x7fca46926b30" >
+                                                <attributelist id="15417" addr="0x7fca46926b30" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15418" addr="0x7f99f1dd2c50" >
-                                                <attributelist id="15419" addr="0x7f99f1dd2c50" >
+                                            <typetabsitem id="15418" addr="0x7fca46920c50" >
+                                                <attributelist id="15419" addr="0x7fca46920c50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15420" addr="0x7f99f1dda790" >
-                                                <attributelist id="15421" addr="0x7f99f1dda790" >
+                                            <typetabsitem id="15420" addr="0x7fca46928790" >
+                                                <attributelist id="15421" addr="0x7fca46928790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15422" addr="0x7f99f1dd8030" >
-                                                <attributelist id="15423" addr="0x7f99f1dd8030" >
+                                            <typetabsitem id="15422" addr="0x7fca46926030" >
+                                                <attributelist id="15423" addr="0x7fca46926030" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15424" addr="0x7f99f1ddbe10" >
-                                                <attributelist id="15425" addr="0x7f99f1ddbe10" >
+                                            <typetabsitem id="15424" addr="0x7fca46929e10" >
+                                                <attributelist id="15425" addr="0x7fca46929e10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15426" addr="0x7f99f1dd6b10" >
-                                                <attributelist id="15427" addr="0x7f99f1dd6b10" >
+                                            <typetabsitem id="15426" addr="0x7fca46924b10" >
+                                                <attributelist id="15427" addr="0x7fca46924b10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15428" addr="0x7f99f1dddf90" >
-                                                <attributelist id="15429" addr="0x7f99f1dddf90" >
+                                            <typetabsitem id="15428" addr="0x7fca4692bf90" >
+                                                <attributelist id="15429" addr="0x7fca4692bf90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15430" addr="0x7f99f1de0530" >
-                                                <attributelist id="15431" addr="0x7f99f1de0530" >
+                                            <typetabsitem id="15430" addr="0x7fca4692e530" >
+                                                <attributelist id="15431" addr="0x7fca4692e530" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15432" addr="0x7f99f1de1e50" >
-                                                <attributelist id="15433" addr="0x7f99f1de1e50" >
+                                            <typetabsitem id="15432" addr="0x7fca4692fe50" >
+                                                <attributelist id="15433" addr="0x7fca4692fe50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15434" addr="0x7f99f1de2d90" >
-                                                <attributelist id="15435" addr="0x7f99f1de2d90" >
+                                            <typetabsitem id="15434" addr="0x7fca46930d90" >
+                                                <attributelist id="15435" addr="0x7fca46930d90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15436" addr="0x7f99f1de3410" >
-                                                <attributelist id="15437" addr="0x7f99f1de3410" >
+                                            <typetabsitem id="15436" addr="0x7fca46931410" >
+                                                <attributelist id="15437" addr="0x7fca46931410" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15438" addr="0x7f99f1dd3590" >
-                                                <attributelist id="15439" addr="0x7f99f1dd3590" >
+                                            <typetabsitem id="15438" addr="0x7fca46921590" >
+                                                <attributelist id="15439" addr="0x7fca46921590" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="15440" addr="0x7f99f1dd3390" >
-                                                <attributelist id="15441" addr="0x7f99f1dd3390" >
+                                            <typetabsitem id="15440" addr="0x7fca46921390" >
+                                                <attributelist id="15441" addr="0x7fca46921390" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7f99f1dd1d70" id="15442" addr="0x7f99f1dd1d70" />
-                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="15443" addr="0x7f99f1de6c90" />
-                                        <attribute name="symtab" value="0x7f99f1e40fb0" id="15444" addr="0x7f99f1e40fb0" />
+                                        <attribute name="parent" value="0x7fca4691fd70" id="15442" addr="0x7fca4691fd70" />
+                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="15443" addr="0x7fca46934c90" />
+                                        <attribute name="symtab" value="0x7fca4698efb0" id="15444" addr="0x7fca4698efb0" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="15445" addr="0x7f99f1de2230" >
-                                    <attributelist id="15446" addr="0x7f99f1de2230" >
+                                <typescopesitem id="15445" addr="0x7fca46930230" >
+                                    <attributelist id="15446" addr="0x7fca46930230" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="15447" addr="0x7f99f1daced0" >
-                                    <attributelist id="15448" addr="0x7f99f1daced0" >
-                                        <attribute name="name" value="Window" id="15449" addr="0x7f99f1de6c90" />
-                                        <attribute name="csymtab" value="0x7f99f1dacef0" id="15450" addr="0x7f99f1dacef0" />
-                                        <attribute name="symtab" value="0x7f99f1dace90" id="15451" addr="0x7f99f1dace90" />
+                                <typescopesitem id="15447" addr="0x7fca468faed0" >
+                                    <attributelist id="15448" addr="0x7fca468faed0" >
+                                        <attribute name="name" value="Window" id="15449" addr="0x7fca46934c90" />
+                                        <attribute name="csymtab" value="0x7fca468faef0" id="15450" addr="0x7fca468faef0" />
+                                        <attribute name="symtab" value="0x7fca468fae90" id="15451" addr="0x7fca468fae90" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <cdecl id="15452" addr="0x7f99f1dad050" >
-                            <attributelist id="15453" addr="0x7f99f1dad050" >
-                                <attribute name="ismember" value="1" id="15454" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="isDisposed" id="15455" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="" id="15456" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="private" id="15457" addr="0x7f99f1de6c90" />
-                                <attribute name="value" value="false" id="15458" addr="0x7f99f1de6c90" />
-                                <attribute name="valuetype" value="bool" id="15459" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="variable" id="15460" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="bool" id="15461" addr="0x7f99f1de6c90" />
-                                <attribute name="hasvalue" value="1" id="15462" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1daced0" id="15463" addr="0x7f99f1daced0" />
-                            </attributelist >
-                         
-                        </cdecl >
-                        <cdecl id="15464" addr="0x7f99f1dad550" >
-                            <attributelist id="15465" addr="0x7f99f1dad550" >
-                                <attribute name="ismember" value="1" id="15466" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="doAddControl" id="15467" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(p.XBMCAddon::xbmcgui::Control,p.CCriticalSection,bool)." id="15468" addr="0x7f99f1de6c90" />
-                                <parmlist id="15469" addr="0x7f99f1dad270" >
+                        <cdecl id="15452" addr="0x7fca468fb050" >
+                            <attributelist id="15453" addr="0x7fca468fb050" >
+                                <attribute name="ismember" value="1" id="15454" addr="0x7fca46934c90" />
+                                <attribute name="name" value="isDisposed" id="15455" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="" id="15456" addr="0x7fca46934c90" />
+                                <attribute name="access" value="private" id="15457" addr="0x7fca46934c90" />
+                                <attribute name="value" value="false" id="15458" addr="0x7fca46934c90" />
+                                <attribute name="valuetype" value="bool" id="15459" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="variable" id="15460" addr="0x7fca46934c90" />
+                                <attribute name="type" value="bool" id="15461" addr="0x7fca46934c90" />
+                                <attribute name="hasvalue" value="1" id="15462" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468faed0" id="15463" addr="0x7fca468faed0" />
+                            </attributelist >
+                         
+                        </cdecl >
+                        <cdecl id="15464" addr="0x7fca468fb550" >
+                            <attributelist id="15465" addr="0x7fca468fb550" >
+                                <attribute name="ismember" value="1" id="15466" addr="0x7fca46934c90" />
+                                <attribute name="name" value="doAddControl" id="15467" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(p.XBMCAddon::xbmcgui::Control,p.CCriticalSection,bool)." id="15468" addr="0x7fca46934c90" />
+                                <parmlist id="15469" addr="0x7fca468fb270" >
                                     <parm id="15470">
-                                        <attributelist id="15471" addr="0x7f99f1dad270" >
-                                            <attribute name="name" value="pControl" id="15472" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.XBMCAddon::xbmcgui::Control" id="15473" addr="0x7f99f1de6c90" />
+                                        <attributelist id="15471" addr="0x7fca468fb270" >
+                                            <attribute name="name" value="pControl" id="15472" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.XBMCAddon::xbmcgui::Control" id="15473" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="15474">
-                                        <attributelist id="15475" addr="0x7f99f1dad390" >
-                                            <attribute name="name" value="gcontext" id="15476" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.CCriticalSection" id="15477" addr="0x7f99f1de6c90" />
+                                        <attributelist id="15475" addr="0x7fca468fb390" >
+                                            <attribute name="name" value="gcontext" id="15476" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.CCriticalSection" id="15477" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="15478">
-                                        <attributelist id="15479" addr="0x7f99f1dad490" >
-                                            <attribute name="name" value="wait" id="15480" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="15481" addr="0x7f99f1de6c90" />
+                                        <attributelist id="15479" addr="0x7fca468fb490" >
+                                            <attribute name="name" value="wait" id="15480" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="15481" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="access" value="private" id="15482" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="15483" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="void" id="15484" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1daced0" id="15485" addr="0x7f99f1daced0" />
+                                <attribute name="access" value="private" id="15482" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="15483" addr="0x7fca46934c90" />
+                                <attribute name="type" value="void" id="15484" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468faed0" id="15485" addr="0x7fca468faed0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="15486" addr="0x7f99f1dada10" >
-                            <attributelist id="15487" addr="0x7f99f1dada10" >
-                                <attribute name="ismember" value="1" id="15488" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="doRemoveControl" id="15489" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(p.XBMCAddon::xbmcgui::Control,p.CCriticalSection,bool)." id="15490" addr="0x7f99f1de6c90" />
-                                <parmlist id="15491" addr="0x7f99f1dad730" >
+                        <cdecl id="15486" addr="0x7fca468fba10" >
+                            <attributelist id="15487" addr="0x7fca468fba10" >
+                                <attribute name="ismember" value="1" id="15488" addr="0x7fca46934c90" />
+                                <attribute name="name" value="doRemoveControl" id="15489" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(p.XBMCAddon::xbmcgui::Control,p.CCriticalSection,bool)." id="15490" addr="0x7fca46934c90" />
+                                <parmlist id="15491" addr="0x7fca468fb730" >
                                     <parm id="15492">
-                                        <attributelist id="15493" addr="0x7f99f1dad730" >
-                                            <attribute name="name" value="pControl" id="15494" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.XBMCAddon::xbmcgui::Control" id="15495" addr="0x7f99f1de6c90" />
+                                        <attributelist id="15493" addr="0x7fca468fb730" >
+                                            <attribute name="name" value="pControl" id="15494" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.XBMCAddon::xbmcgui::Control" id="15495" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="15496">
-                                        <attributelist id="15497" addr="0x7f99f1dad850" >
-                                            <attribute name="name" value="gcontext" id="15498" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.CCriticalSection" id="15499" addr="0x7f99f1de6c90" />
+                                        <attributelist id="15497" addr="0x7fca468fb850" >
+                                            <attribute name="name" value="gcontext" id="15498" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.CCriticalSection" id="15499" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="15500">
-                                        <attributelist id="15501" addr="0x7f99f1dad950" >
-                                            <attribute name="name" value="wait" id="15502" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="15503" addr="0x7f99f1de6c90" />
+                                        <attributelist id="15501" addr="0x7fca468fb950" >
+                                            <attribute name="name" value="wait" id="15502" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="15503" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="access" value="private" id="15504" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="15505" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="void" id="15506" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1daced0" id="15507" addr="0x7f99f1daced0" />
+                                <attribute name="access" value="private" id="15504" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="15505" addr="0x7fca46934c90" />
+                                <attribute name="type" value="void" id="15506" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468faed0" id="15507" addr="0x7fca468faed0" />
                             </attributelist >
                          
                         </cdecl >
-                        <access id="15508" addr="0x7f99f1dadb30" >
-                            <attributelist id="15509" addr="0x7f99f1dadb30" >
-                                <attribute name="kind" value="protected" id="15510" addr="0x7f99f1de6c90" />
+                        <access id="15508" addr="0x7fca468fbb30" >
+                            <attributelist id="15509" addr="0x7fca468fbb30" >
+                                <attribute name="kind" value="protected" id="15510" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </access >
-                        <access id="15511" addr="0x7f99f1dadb10" >
-                            <attributelist id="15512" addr="0x7f99f1dadb10" >
-                                <attribute name="kind" value="public" id="15513" addr="0x7f99f1de6c90" />
+                        <access id="15511" addr="0x7fca468fbb10" >
+                            <attributelist id="15512" addr="0x7fca468fbb10" >
+                                <attribute name="kind" value="public" id="15513" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="15514" addr="0x7f99f1daddb0" >
-                            <attributelist id="15515" addr="0x7f99f1daddb0" >
-                                <attribute name="name" value="Window" id="15516" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="15517" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1daced0" id="15518" addr="0x7f99f1daced0" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1dadeb0" id="15519" addr="0x7f99f1dadeb0" />
-                                <attribute name="sym_name" value="Window" id="15520" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1dadeb0" id="15521" addr="0x7f99f1dadeb0" />
-                                <attribute name="decl" value="f(int)." id="15522" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="15523" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_director" value="1" id="15524" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_python_nokwds" value="true" id="15525" addr="0x7f99f1de6c90" />
-                                <parmlist id="15526" addr="0x7f99f1dadcf0" >
+                        <constructor id="15514" addr="0x7fca468fbdb0" >
+                            <attributelist id="15515" addr="0x7fca468fbdb0" >
+                                <attribute name="name" value="Window" id="15516" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="15517" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468faed0" id="15518" addr="0x7fca468faed0" />
+                                <attribute name="csym_nextSibling" value="0x7fca468fbeb0" id="15519" addr="0x7fca468fbeb0" />
+                                <attribute name="sym_name" value="Window" id="15520" addr="0x7fca46934c90" />
+                                <attribute name="sym_nextSibling" value="0x7fca468fbeb0" id="15521" addr="0x7fca468fbeb0" />
+                                <attribute name="decl" value="f(int)." id="15522" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="15523" addr="0x7fca46934c90" />
+                                <attribute name="feature_director" value="1" id="15524" addr="0x7fca46934c90" />
+                                <attribute name="feature_python_nokwds" value="true" id="15525" addr="0x7fca46934c90" />
+                                <parmlist id="15526" addr="0x7fca468fbcf0" >
                                     <parm id="15527">
-                                        <attributelist id="15528" addr="0x7f99f1dadcf0" >
-                                            <attribute name="name" value="existingWindowId" id="15529" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="-1" id="15530" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="15531" addr="0x7f99f1de6c90" />
+                                        <attributelist id="15528" addr="0x7fca468fbcf0" >
+                                            <attribute name="name" value="existingWindowId" id="15529" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="-1" id="15530" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="15531" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overloaded" value="0x7f99f1daddb0" id="15532" addr="0x7f99f1daddb0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="15533" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="explicit" id="15534" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="15535" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468fbdb0" id="15532" addr="0x7fca468fbdb0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="15533" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="explicit" id="15534" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="15535" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="15536" addr="0x7f99f1dadeb0" >
-                            <attributelist id="15537" addr="0x7f99f1dadeb0" >
-                                <attribute name="name" value="Window" id="15538" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="15539" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1daced0" id="15540" addr="0x7f99f1daced0" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1daddb0" id="15541" addr="0x7f99f1daddb0" />
-                                <attribute name="sym_name" value="Window" id="15542" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="15543" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1daddb0" id="15544" addr="0x7f99f1daddb0" />
-                                <attribute name="access" value="public" id="15545" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_director" value="1" id="15546" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1daddb0" id="15547" addr="0x7f99f1daddb0" />
-                                <attribute name="feature_python_nokwds" value="true" id="15548" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="15549" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="explicit" id="15550" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="15551" addr="0x7f99f1de6c90" />
+                        <constructor id="15536" addr="0x7fca468fbeb0" >
+                            <attributelist id="15537" addr="0x7fca468fbeb0" >
+                                <attribute name="name" value="Window" id="15538" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="15539" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468faed0" id="15540" addr="0x7fca468faed0" />
+                                <attribute name="sym_previousSibling" value="0x7fca468fbdb0" id="15541" addr="0x7fca468fbdb0" />
+                                <attribute name="sym_name" value="Window" id="15542" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="15543" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca468fbdb0" id="15544" addr="0x7fca468fbdb0" />
+                                <attribute name="access" value="public" id="15545" addr="0x7fca46934c90" />
+                                <attribute name="feature_director" value="1" id="15546" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca468fbdb0" id="15547" addr="0x7fca468fbdb0" />
+                                <attribute name="feature_python_nokwds" value="true" id="15548" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="15549" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="explicit" id="15550" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="15551" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <destructor id="15552" addr="0x7f99f1dae0d0" >
-                            <attributelist id="15553" addr="0x7f99f1dae0d0" >
-                                <attribute name="ismember" value="1" id="15554" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="~Window" id="15555" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="~Window" id="15556" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="15557" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="15558" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1daced0" id="15559" addr="0x7f99f1daced0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="15560" addr="0x7f99f1de6c90" />
+                        <destructor id="15552" addr="0x7fca468fc0d0" >
+                            <attributelist id="15553" addr="0x7fca468fc0d0" >
+                                <attribute name="ismember" value="1" id="15554" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="~Window" id="15555" addr="0x7fca46934c90" />
+                                <attribute name="name" value="~Window" id="15556" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="15557" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="15558" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468faed0" id="15559" addr="0x7fca468faed0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="15560" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </destructor >
-                        <cdecl id="15561" addr="0x7f99f1dae390" >
-                            <attributelist id="15562" addr="0x7f99f1dae390" >
-                                <attribute name="name" value="onAction" id="15563" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="15564" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1daced0" id="15565" addr="0x7f99f1daced0" />
-                                <attribute name="kind" value="function" id="15566" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="onAction" id="15567" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(p.XBMCAddon::xbmcgui::Action)." id="15568" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="15569" addr="0x7f99f1de6c90" />
-                                <parmlist id="15570" addr="0x7f99f1dae2d0" >
+                        <cdecl id="15561" addr="0x7fca468fc390" >
+                            <attributelist id="15562" addr="0x7fca468fc390" >
+                                <attribute name="name" value="onAction" id="15563" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="15564" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468faed0" id="15565" addr="0x7fca468faed0" />
+                                <attribute name="kind" value="function" id="15566" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="onAction" id="15567" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(p.XBMCAddon::xbmcgui::Action)." id="15568" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="15569" addr="0x7fca46934c90" />
+                                <parmlist id="15570" addr="0x7fca468fc2d0" >
                                     <parm id="15571">
-                                        <attributelist id="15572" addr="0x7f99f1dae2d0" >
-                                            <attribute name="name" value="action" id="15573" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.XBMCAddon::xbmcgui::Action" id="15574" addr="0x7f99f1de6c90" />
+                                        <attributelist id="15572" addr="0x7fca468fc2d0" >
+                                            <attribute name="name" value="action" id="15573" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.XBMCAddon::xbmcgui::Action" id="15574" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="15575" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="15576" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="15577" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="15575" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="15576" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="15577" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="15578" addr="0x7f99f1dae6b0" >
-                            <attributelist id="15579" addr="0x7f99f1dae6b0" >
-                                <attribute name="name" value="onControl" id="15580" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="15581" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1daced0" id="15582" addr="0x7f99f1daced0" />
-                                <attribute name="kind" value="function" id="15583" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="onControl" id="15584" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(p.XBMCAddon::xbmcgui::Control)." id="15585" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="15586" addr="0x7f99f1de6c90" />
-                                <parmlist id="15587" addr="0x7f99f1dae5f0" >
+                        <cdecl id="15578" addr="0x7fca468fc6b0" >
+                            <attributelist id="15579" addr="0x7fca468fc6b0" >
+                                <attribute name="name" value="onControl" id="15580" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="15581" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468faed0" id="15582" addr="0x7fca468faed0" />
+                                <attribute name="kind" value="function" id="15583" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="onControl" id="15584" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(p.XBMCAddon::xbmcgui::Control)." id="15585" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="15586" addr="0x7fca46934c90" />
+                                <parmlist id="15587" addr="0x7fca468fc5f0" >
                                     <parm id="15588">
-                                        <attributelist id="15589" addr="0x7f99f1dae5f0" >
-                                            <attribute name="name" value="control" id="15590" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.XBMCAddon::xbmcgui::Control" id="15591" addr="0x7f99f1de6c90" />
+                                        <attributelist id="15589" addr="0x7fca468fc5f0" >
+                                            <attribute name="name" value="control" id="15590" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.XBMCAddon::xbmcgui::Control" id="15591" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="15592" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="15593" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="15594" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="15592" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="15593" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="15594" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="15595" addr="0x7f99f1dae9b0" >
-                            <attributelist id="15596" addr="0x7f99f1dae9b0" >
-                                <attribute name="name" value="onClick" id="15597" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="15598" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1daced0" id="15599" addr="0x7f99f1daced0" />
-                                <attribute name="kind" value="function" id="15600" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="onClick" id="15601" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(int)." id="15602" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="15603" addr="0x7f99f1de6c90" />
-                                <parmlist id="15604" addr="0x7f99f1dae8f0" >
+                        <cdecl id="15595" addr="0x7fca468fc9b0" >
+                            <attributelist id="15596" addr="0x7fca468fc9b0" >
+                                <attribute name="name" value="onClick" id="15597" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="15598" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468faed0" id="15599" addr="0x7fca468faed0" />
+                                <attribute name="kind" value="function" id="15600" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="onClick" id="15601" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(int)." id="15602" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="15603" addr="0x7fca46934c90" />
+                                <parmlist id="15604" addr="0x7fca468fc8f0" >
                                     <parm id="15605">
-                                        <attributelist id="15606" addr="0x7f99f1dae8f0" >
-                                            <attribute name="name" value="controlId" id="15607" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="15608" addr="0x7f99f1de6c90" />
+                                        <attributelist id="15606" addr="0x7fca468fc8f0" >
+                                            <attribute name="name" value="controlId" id="15607" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="15608" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="15609" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="15610" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="15611" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="15609" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="15610" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="15611" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="15612" addr="0x7f99f1daecb0" >
-                            <attributelist id="15613" addr="0x7f99f1daecb0" >
-                                <attribute name="name" value="onDoubleClick" id="15614" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="15615" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1daced0" id="15616" addr="0x7f99f1daced0" />
-                                <attribute name="kind" value="function" id="15617" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="onDoubleClick" id="15618" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(int)." id="15619" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="15620" addr="0x7f99f1de6c90" />
-                                <parmlist id="15621" addr="0x7f99f1daebf0" >
+                        <cdecl id="15612" addr="0x7fca468fccb0" >
+                            <attributelist id="15613" addr="0x7fca468fccb0" >
+                                <attribute name="name" value="onDoubleClick" id="15614" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="15615" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468faed0" id="15616" addr="0x7fca468faed0" />
+                                <attribute name="kind" value="function" id="15617" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="onDoubleClick" id="15618" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(int)." id="15619" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="15620" addr="0x7fca46934c90" />
+                                <parmlist id="15621" addr="0x7fca468fcbf0" >
                                     <parm id="15622">
-                                        <attributelist id="15623" addr="0x7f99f1daebf0" >
-                                            <attribute name="name" value="controlId" id="15624" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="15625" addr="0x7f99f1de6c90" />
+                                        <attributelist id="15623" addr="0x7fca468fcbf0" >
+                                            <attribute name="name" value="controlId" id="15624" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="15625" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="15626" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="15627" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="15628" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="15626" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="15627" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="15628" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="15629" addr="0x7f99f1daefb0" >
-                            <attributelist id="15630" addr="0x7f99f1daefb0" >
-                                <attribute name="name" value="onFocus" id="15631" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="15632" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1daced0" id="15633" addr="0x7f99f1daced0" />
-                                <attribute name="kind" value="function" id="15634" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="onFocus" id="15635" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(int)." id="15636" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="15637" addr="0x7f99f1de6c90" />
-                                <parmlist id="15638" addr="0x7f99f1daeef0" >
+                        <cdecl id="15629" addr="0x7fca468fcfb0" >
+                            <attributelist id="15630" addr="0x7fca468fcfb0" >
+                                <attribute name="name" value="onFocus" id="15631" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="15632" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468faed0" id="15633" addr="0x7fca468faed0" />
+                                <attribute name="kind" value="function" id="15634" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="onFocus" id="15635" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(int)." id="15636" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="15637" addr="0x7fca46934c90" />
+                                <parmlist id="15638" addr="0x7fca468fcef0" >
                                     <parm id="15639">
-                                        <attributelist id="15640" addr="0x7f99f1daeef0" >
-                                            <attribute name="name" value="controlId" id="15641" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="15642" addr="0x7f99f1de6c90" />
+                                        <attributelist id="15640" addr="0x7fca468fcef0" >
+                                            <attribute name="name" value="controlId" id="15641" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="15642" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="15643" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="15644" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="15645" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="15643" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="15644" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="15645" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="15646" addr="0x7f99f1daf190" >
-                            <attributelist id="15647" addr="0x7f99f1daf190" >
-                                <attribute name="name" value="onInit" id="15648" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="15649" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1daced0" id="15650" addr="0x7f99f1daced0" />
-                                <attribute name="kind" value="function" id="15651" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="onInit" id="15652" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="15653" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="15654" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="void" id="15655" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="15656" addr="0x7f99f1de6c90" />
-                                <attribute name="storage" value="virtual" id="15657" addr="0x7f99f1de6c90" />
+                        <cdecl id="15646" addr="0x7fca468fd190" >
+                            <attributelist id="15647" addr="0x7fca468fd190" >
+                                <attribute name="name" value="onInit" id="15648" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="15649" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468faed0" id="15650" addr="0x7fca468faed0" />
+                                <attribute name="kind" value="function" id="15651" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="onInit" id="15652" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="15653" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="15654" addr="0x7fca46934c90" />
+                                <attribute name="type" value="void" id="15655" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="15656" addr="0x7fca46934c90" />
+                                <attribute name="storage" value="virtual" id="15657" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="15658" addr="0x7f99f1daf370" >
-                            <attributelist id="15659" addr="0x7f99f1daf370" >
-                                <attribute name="ismember" value="1" id="15660" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="show" id="15661" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="show" id="15662" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="15663" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="15664" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="15665" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="void" id="15666" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1daced0" id="15667" addr="0x7f99f1daced0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="15668" addr="0x7f99f1de6c90" />
+                        <cdecl id="15658" addr="0x7fca468fd370" >
+                            <attributelist id="15659" addr="0x7fca468fd370" >
+                                <attribute name="ismember" value="1" id="15660" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="show" id="15661" addr="0x7fca46934c90" />
+                                <attribute name="name" value="show" id="15662" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="15663" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="15664" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="15665" addr="0x7fca46934c90" />
+                                <attribute name="type" value="void" id="15666" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468faed0" id="15667" addr="0x7fca468faed0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="15668" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="15669" addr="0x7f99f1daf650" >
-                            <attributelist id="15670" addr="0x7f99f1daf650" >
-                                <attribute name="name" value="setFocus" id="15671" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="15672" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1daced0" id="15673" addr="0x7f99f1daced0" />
-                                <attribute name="kind" value="function" id="15674" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setFocus" id="15675" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(p.XBMCAddon::xbmcgui::Control)." id="15676" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="15677" addr="0x7f99f1de6c90" />
-                                <parmlist id="15678" addr="0x7f99f1daf590" >
+                        <cdecl id="15669" addr="0x7fca468fd650" >
+                            <attributelist id="15670" addr="0x7fca468fd650" >
+                                <attribute name="name" value="setFocus" id="15671" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="15672" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468faed0" id="15673" addr="0x7fca468faed0" />
+                                <attribute name="kind" value="function" id="15674" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setFocus" id="15675" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(p.XBMCAddon::xbmcgui::Control)." id="15676" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="15677" addr="0x7fca46934c90" />
+                                <parmlist id="15678" addr="0x7fca468fd590" >
                                     <parm id="15679">
-                                        <attributelist id="15680" addr="0x7f99f1daf590" >
-                                            <attribute name="name" value="pControl" id="15681" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.XBMCAddon::xbmcgui::Control" id="15682" addr="0x7f99f1de6c90" />
+                                        <attributelist id="15680" addr="0x7fca468fd590" >
+                                            <attribute name="name" value="pControl" id="15681" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.XBMCAddon::xbmcgui::Control" id="15682" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="15683" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="15684" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="15683" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="15684" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="15685" addr="0x7f99f1daf930" >
-                            <attributelist id="15686" addr="0x7f99f1daf930" >
-                                <attribute name="name" value="setFocusId" id="15687" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="15688" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1daced0" id="15689" addr="0x7f99f1daced0" />
-                                <attribute name="kind" value="function" id="15690" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setFocusId" id="15691" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(int)." id="15692" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="15693" addr="0x7f99f1de6c90" />
-                                <parmlist id="15694" addr="0x7f99f1daf870" >
+                        <cdecl id="15685" addr="0x7fca468fd930" >
+                            <attributelist id="15686" addr="0x7fca468fd930" >
+                                <attribute name="name" value="setFocusId" id="15687" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="15688" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468faed0" id="15689" addr="0x7fca468faed0" />
+                                <attribute name="kind" value="function" id="15690" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setFocusId" id="15691" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(int)." id="15692" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="15693" addr="0x7fca46934c90" />
+                                <parmlist id="15694" addr="0x7fca468fd870" >
                                     <parm id="15695">
-                                        <attributelist id="15696" addr="0x7f99f1daf870" >
-                                            <attribute name="name" value="iControlId" id="15697" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="15698" addr="0x7f99f1de6c90" />
+                                        <attributelist id="15696" addr="0x7fca468fd870" >
+                                            <attribute name="name" value="iControlId" id="15697" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="15698" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="15699" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="15700" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="15699" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="15700" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="15701" addr="0x7f99f1dafaf0" >
-                            <attributelist id="15702" addr="0x7f99f1dafaf0" >
-                                <attribute name="ismember" value="1" id="15703" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getFocus" id="15704" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="getFocus" id="15705" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f().p." id="15706" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="15707" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="15708" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="XBMCAddon::xbmcgui::Control" id="15709" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1daced0" id="15710" addr="0x7f99f1daced0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="15711" addr="0x7f99f1de6c90" />
+                        <cdecl id="15701" addr="0x7fca468fdaf0" >
+                            <attributelist id="15702" addr="0x7fca468fdaf0" >
+                                <attribute name="ismember" value="1" id="15703" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getFocus" id="15704" addr="0x7fca46934c90" />
+                                <attribute name="name" value="getFocus" id="15705" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f().p." id="15706" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="15707" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="15708" addr="0x7fca46934c90" />
+                                <attribute name="type" value="XBMCAddon::xbmcgui::Control" id="15709" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468faed0" id="15710" addr="0x7fca468faed0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="15711" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="15712" addr="0x7f99f1dafcf0" >
-                            <attributelist id="15713" addr="0x7f99f1dafcf0" >
-                                <attribute name="ismember" value="1" id="15714" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getFocusId" id="15715" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="getFocusId" id="15716" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="15717" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="15718" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="15719" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="long" id="15720" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1daced0" id="15721" addr="0x7f99f1daced0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="15722" addr="0x7f99f1de6c90" />
+                        <cdecl id="15712" addr="0x7fca468fdcf0" >
+                            <attributelist id="15713" addr="0x7fca468fdcf0" >
+                                <attribute name="ismember" value="1" id="15714" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getFocusId" id="15715" addr="0x7fca46934c90" />
+                                <attribute name="name" value="getFocusId" id="15716" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="15717" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="15718" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="15719" addr="0x7fca46934c90" />
+                                <attribute name="type" value="long" id="15720" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468faed0" id="15721" addr="0x7fca468faed0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="15722" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="15723" addr="0x7f99f1daffd0" >
-                            <attributelist id="15724" addr="0x7f99f1daffd0" >
-                                <attribute name="name" value="removeControl" id="15725" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="15726" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1daced0" id="15727" addr="0x7f99f1daced0" />
-                                <attribute name="kind" value="function" id="15728" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="removeControl" id="15729" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(p.XBMCAddon::xbmcgui::Control)." id="15730" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="15731" addr="0x7f99f1de6c90" />
-                                <parmlist id="15732" addr="0x7f99f1daff10" >
+                        <cdecl id="15723" addr="0x7fca468fdfd0" >
+                            <attributelist id="15724" addr="0x7fca468fdfd0" >
+                                <attribute name="name" value="removeControl" id="15725" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="15726" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468faed0" id="15727" addr="0x7fca468faed0" />
+                                <attribute name="kind" value="function" id="15728" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="removeControl" id="15729" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(p.XBMCAddon::xbmcgui::Control)." id="15730" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="15731" addr="0x7fca46934c90" />
+                                <parmlist id="15732" addr="0x7fca468fdf10" >
                                     <parm id="15733">
-                                        <attributelist id="15734" addr="0x7f99f1daff10" >
-                                            <attribute name="name" value="pControl" id="15735" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.XBMCAddon::xbmcgui::Control" id="15736" addr="0x7f99f1de6c90" />
+                                        <attributelist id="15734" addr="0x7fca468fdf10" >
+                                            <attribute name="name" value="pControl" id="15735" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.XBMCAddon::xbmcgui::Control" id="15736" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="15737" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="15738" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="15737" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="15738" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="15739" addr="0x7f99f1db03b0" >
-                            <attributelist id="15740" addr="0x7f99f1db03b0" >
-                                <attribute name="name" value="removeControls" id="15741" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="15742" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1daced0" id="15743" addr="0x7f99f1daced0" />
-                                <attribute name="kind" value="function" id="15744" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="removeControls" id="15745" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(std::vector&lt;(p.XBMCAddon::xbmcgui::Control)>)." id="15746" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="15747" addr="0x7f99f1de6c90" />
-                                <parmlist id="15748" addr="0x7f99f1db02f0" >
+                        <cdecl id="15739" addr="0x7fca468fe3b0" >
+                            <attributelist id="15740" addr="0x7fca468fe3b0" >
+                                <attribute name="name" value="removeControls" id="15741" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="15742" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468faed0" id="15743" addr="0x7fca468faed0" />
+                                <attribute name="kind" value="function" id="15744" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="removeControls" id="15745" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(std::vector&lt;(p.XBMCAddon::xbmcgui::Control)>)." id="15746" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="15747" addr="0x7fca46934c90" />
+                                <parmlist id="15748" addr="0x7fca468fe2f0" >
                                     <parm id="15749">
-                                        <attributelist id="15750" addr="0x7f99f1db02f0" >
-                                            <attribute name="name" value="pControls" id="15751" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="std::vector&lt;(p.XBMCAddon::xbmcgui::Control)>" id="15752" addr="0x7f99f1de6c90" />
+                                        <attributelist id="15750" addr="0x7fca468fe2f0" >
+                                            <attribute name="name" value="pControls" id="15751" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="std::vector&lt;(p.XBMCAddon::xbmcgui::Control)>" id="15752" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="15753" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="15754" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="15753" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="15754" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="15755" addr="0x7f99f1db0590" >
-                            <attributelist id="15756" addr="0x7f99f1db0590" >
-                                <attribute name="ismember" value="1" id="15757" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getHeight" id="15758" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="getHeight" id="15759" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="15760" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="15761" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="15762" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="long" id="15763" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1daced0" id="15764" addr="0x7f99f1daced0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="15765" addr="0x7f99f1de6c90" />
+                        <cdecl id="15755" addr="0x7fca468fe590" >
+                            <attributelist id="15756" addr="0x7fca468fe590" >
+                                <attribute name="ismember" value="1" id="15757" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getHeight" id="15758" addr="0x7fca46934c90" />
+                                <attribute name="name" value="getHeight" id="15759" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="15760" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="15761" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="15762" addr="0x7fca46934c90" />
+                                <attribute name="type" value="long" id="15763" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468faed0" id="15764" addr="0x7fca468faed0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="15765" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="15766" addr="0x7f99f1db0770" >
-                            <attributelist id="15767" addr="0x7f99f1db0770" >
-                                <attribute name="ismember" value="1" id="15768" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getWidth" id="15769" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="getWidth" id="15770" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="15771" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="15772" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="15773" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="long" id="15774" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1daced0" id="15775" addr="0x7f99f1daced0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="15776" addr="0x7f99f1de6c90" />
+                        <cdecl id="15766" addr="0x7fca468fe770" >
+                            <attributelist id="15767" addr="0x7fca468fe770" >
+                                <attribute name="ismember" value="1" id="15768" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getWidth" id="15769" addr="0x7fca46934c90" />
+                                <attribute name="name" value="getWidth" id="15770" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="15771" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="15772" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="15773" addr="0x7fca46934c90" />
+                                <attribute name="type" value="long" id="15774" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468faed0" id="15775" addr="0x7fca468faed0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="15776" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="15777" addr="0x7f99f1db0950" >
-                            <attributelist id="15778" addr="0x7f99f1db0950" >
-                                <attribute name="ismember" value="1" id="15779" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getResolution" id="15780" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="getResolution" id="15781" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="15782" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="15783" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="15784" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="long" id="15785" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1daced0" id="15786" addr="0x7f99f1daced0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="15787" addr="0x7f99f1de6c90" />
+                        <cdecl id="15777" addr="0x7fca468fe950" >
+                            <attributelist id="15778" addr="0x7fca468fe950" >
+                                <attribute name="ismember" value="1" id="15779" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getResolution" id="15780" addr="0x7fca46934c90" />
+                                <attribute name="name" value="getResolution" id="15781" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="15782" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="15783" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="15784" addr="0x7fca46934c90" />
+                                <attribute name="type" value="long" id="15785" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468faed0" id="15786" addr="0x7fca468faed0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="15787" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="15788" addr="0x7f99f1db0c30" >
-                            <attributelist id="15789" addr="0x7f99f1db0c30" >
-                                <attribute name="name" value="setCoordinateResolution" id="15790" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="15791" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1daced0" id="15792" addr="0x7f99f1daced0" />
-                                <attribute name="kind" value="function" id="15793" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setCoordinateResolution" id="15794" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(long)." id="15795" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="15796" addr="0x7f99f1de6c90" />
-                                <parmlist id="15797" addr="0x7f99f1db0b70" >
+                        <cdecl id="15788" addr="0x7fca468fec30" >
+                            <attributelist id="15789" addr="0x7fca468fec30" >
+                                <attribute name="name" value="setCoordinateResolution" id="15790" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="15791" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468faed0" id="15792" addr="0x7fca468faed0" />
+                                <attribute name="kind" value="function" id="15793" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setCoordinateResolution" id="15794" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(long)." id="15795" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="15796" addr="0x7fca46934c90" />
+                                <parmlist id="15797" addr="0x7fca468feb70" >
                                     <parm id="15798">
-                                        <attributelist id="15799" addr="0x7f99f1db0b70" >
-                                            <attribute name="name" value="res" id="15800" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="long" id="15801" addr="0x7f99f1de6c90" />
+                                        <attributelist id="15799" addr="0x7fca468feb70" >
+                                            <attribute name="name" value="res" id="15800" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="long" id="15801" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="15802" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="15803" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="15802" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="15803" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="15804" addr="0x7f99f1db1070" >
-                            <attributelist id="15805" addr="0x7f99f1db1070" >
-                                <attribute name="name" value="setProperty" id="15806" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="15807" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1daced0" id="15808" addr="0x7f99f1daced0" />
-                                <attribute name="kind" value="function" id="15809" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setProperty" id="15810" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(p.q(const).char,r.q(const).XBMCAddon::String)." id="15811" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="15812" addr="0x7f99f1de6c90" />
-                                <parmlist id="15813" addr="0x7f99f1db0e70" >
+                        <cdecl id="15804" addr="0x7fca468ff070" >
+                            <attributelist id="15805" addr="0x7fca468ff070" >
+                                <attribute name="name" value="setProperty" id="15806" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="15807" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468faed0" id="15808" addr="0x7fca468faed0" />
+                                <attribute name="kind" value="function" id="15809" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setProperty" id="15810" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(p.q(const).char,r.q(const).XBMCAddon::String)." id="15811" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="15812" addr="0x7fca46934c90" />
+                                <parmlist id="15813" addr="0x7fca468fee70" >
                                     <parm id="15814">
-                                        <attributelist id="15815" addr="0x7f99f1db0e70" >
-                                            <attribute name="name" value="key" id="15816" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="15817" addr="0x7f99f1de6c90" />
+                                        <attributelist id="15815" addr="0x7fca468fee70" >
+                                            <attribute name="name" value="key" id="15816" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="15817" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="15818">
-                                        <attributelist id="15819" addr="0x7f99f1db0fb0" >
-                                            <attribute name="name" value="value" id="15820" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="15821" addr="0x7f99f1de6c90" />
+                                        <attributelist id="15819" addr="0x7fca468fefb0" >
+                                            <attribute name="name" value="value" id="15820" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="15821" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="15822" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="15823" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="15822" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="15823" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="15824" addr="0x7f99f1db1390" >
-                            <attributelist id="15825" addr="0x7f99f1db1390" >
-                                <attribute name="name" value="getProperty" id="15826" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="15827" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1daced0" id="15828" addr="0x7f99f1daced0" />
-                                <attribute name="kind" value="function" id="15829" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getProperty" id="15830" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(p.q(const).char)." id="15831" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="15832" addr="0x7f99f1de6c90" />
-                                <parmlist id="15833" addr="0x7f99f1db12d0" >
+                        <cdecl id="15824" addr="0x7fca468ff390" >
+                            <attributelist id="15825" addr="0x7fca468ff390" >
+                                <attribute name="name" value="getProperty" id="15826" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="15827" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468faed0" id="15828" addr="0x7fca468faed0" />
+                                <attribute name="kind" value="function" id="15829" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getProperty" id="15830" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(p.q(const).char)." id="15831" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="15832" addr="0x7fca46934c90" />
+                                <parmlist id="15833" addr="0x7fca468ff2d0" >
                                     <parm id="15834">
-                                        <attributelist id="15835" addr="0x7f99f1db12d0" >
-                                            <attribute name="name" value="key" id="15836" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="15837" addr="0x7f99f1de6c90" />
+                                        <attributelist id="15835" addr="0x7fca468ff2d0" >
+                                            <attribute name="name" value="key" id="15836" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="15837" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="XBMCAddon::String" id="15838" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="15839" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="XBMCAddon::String" id="15838" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="15839" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="15840" addr="0x7f99f1db1690" >
-                            <attributelist id="15841" addr="0x7f99f1db1690" >
-                                <attribute name="name" value="clearProperty" id="15842" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="15843" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1daced0" id="15844" addr="0x7f99f1daced0" />
-                                <attribute name="kind" value="function" id="15845" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="clearProperty" id="15846" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(p.q(const).char)." id="15847" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="15848" addr="0x7f99f1de6c90" />
-                                <parmlist id="15849" addr="0x7f99f1db15d0" >
+                        <cdecl id="15840" addr="0x7fca468ff690" >
+                            <attributelist id="15841" addr="0x7fca468ff690" >
+                                <attribute name="name" value="clearProperty" id="15842" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="15843" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468faed0" id="15844" addr="0x7fca468faed0" />
+                                <attribute name="kind" value="function" id="15845" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="clearProperty" id="15846" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(p.q(const).char)." id="15847" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="15848" addr="0x7fca46934c90" />
+                                <parmlist id="15849" addr="0x7fca468ff5d0" >
                                     <parm id="15850">
-                                        <attributelist id="15851" addr="0x7f99f1db15d0" >
-                                            <attribute name="name" value="key" id="15852" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.q(const).char" id="15853" addr="0x7f99f1de6c90" />
+                                        <attributelist id="15851" addr="0x7fca468ff5d0" >
+                                            <attribute name="name" value="key" id="15852" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.q(const).char" id="15853" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="15854" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="15855" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="15854" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="15855" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="15856" addr="0x7f99f1db1850" >
-                            <attributelist id="15857" addr="0x7f99f1db1850" >
-                                <attribute name="ismember" value="1" id="15858" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="clearProperties" id="15859" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="clearProperties" id="15860" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="15861" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="15862" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="15863" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="void" id="15864" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1daced0" id="15865" addr="0x7f99f1daced0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="15866" addr="0x7f99f1de6c90" />
+                        <cdecl id="15856" addr="0x7fca468ff850" >
+                            <attributelist id="15857" addr="0x7fca468ff850" >
+                                <attribute name="ismember" value="1" id="15858" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="clearProperties" id="15859" addr="0x7fca46934c90" />
+                                <attribute name="name" value="clearProperties" id="15860" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="15861" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="15862" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="15863" addr="0x7fca46934c90" />
+                                <attribute name="type" value="void" id="15864" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468faed0" id="15865" addr="0x7fca468faed0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="15866" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="15867" addr="0x7f99f1db1a10" >
-                            <attributelist id="15868" addr="0x7f99f1db1a10" >
-                                <attribute name="ismember" value="1" id="15869" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="close" id="15870" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="close" id="15871" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="15872" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="15873" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="15874" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="void" id="15875" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1daced0" id="15876" addr="0x7f99f1daced0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="15877" addr="0x7f99f1de6c90" />
+                        <cdecl id="15867" addr="0x7fca468ffa10" >
+                            <attributelist id="15868" addr="0x7fca468ffa10" >
+                                <attribute name="ismember" value="1" id="15869" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="close" id="15870" addr="0x7fca46934c90" />
+                                <attribute name="name" value="close" id="15871" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="15872" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="15873" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="15874" addr="0x7fca46934c90" />
+                                <attribute name="type" value="void" id="15875" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468faed0" id="15876" addr="0x7fca468faed0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="15877" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="15878" addr="0x7f99f1db1bd0" >
-                            <attributelist id="15879" addr="0x7f99f1db1bd0" >
-                                <attribute name="ismember" value="1" id="15880" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="doModal" id="15881" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="doModal" id="15882" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="15883" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="15884" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="15885" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="void" id="15886" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1daced0" id="15887" addr="0x7f99f1daced0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="15888" addr="0x7f99f1de6c90" />
+                        <cdecl id="15878" addr="0x7fca468ffbd0" >
+                            <attributelist id="15879" addr="0x7fca468ffbd0" >
+                                <attribute name="ismember" value="1" id="15880" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="doModal" id="15881" addr="0x7fca46934c90" />
+                                <attribute name="name" value="doModal" id="15882" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="15883" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="15884" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="15885" addr="0x7fca46934c90" />
+                                <attribute name="type" value="void" id="15886" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468faed0" id="15887" addr="0x7fca468faed0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="15888" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="15889" addr="0x7f99f1db1eb0" >
-                            <attributelist id="15890" addr="0x7f99f1db1eb0" >
-                                <attribute name="name" value="addControl" id="15891" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="15892" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1daced0" id="15893" addr="0x7f99f1daced0" />
-                                <attribute name="kind" value="function" id="15894" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="addControl" id="15895" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(p.XBMCAddon::xbmcgui::Control)." id="15896" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="15897" addr="0x7f99f1de6c90" />
-                                <parmlist id="15898" addr="0x7f99f1db1df0" >
+                        <cdecl id="15889" addr="0x7fca468ffeb0" >
+                            <attributelist id="15890" addr="0x7fca468ffeb0" >
+                                <attribute name="name" value="addControl" id="15891" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="15892" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468faed0" id="15893" addr="0x7fca468faed0" />
+                                <attribute name="kind" value="function" id="15894" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="addControl" id="15895" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(p.XBMCAddon::xbmcgui::Control)." id="15896" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="15897" addr="0x7fca46934c90" />
+                                <parmlist id="15898" addr="0x7fca468ffdf0" >
                                     <parm id="15899">
-                                        <attributelist id="15900" addr="0x7f99f1db1df0" >
-                                            <attribute name="name" value="pControl" id="15901" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="p.XBMCAddon::xbmcgui::Control" id="15902" addr="0x7f99f1de6c90" />
+                                        <attributelist id="15900" addr="0x7fca468ffdf0" >
+                                            <attribute name="name" value="pControl" id="15901" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="p.XBMCAddon::xbmcgui::Control" id="15902" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="15903" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="15904" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="15903" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="15904" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="15905" addr="0x7f99f1db2290" >
-                            <attributelist id="15906" addr="0x7f99f1db2290" >
-                                <attribute name="name" value="addControls" id="15907" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="15908" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1daced0" id="15909" addr="0x7f99f1daced0" />
-                                <attribute name="kind" value="function" id="15910" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="addControls" id="15911" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(std::vector&lt;(p.XBMCAddon::xbmcgui::Control)>)." id="15912" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="15913" addr="0x7f99f1de6c90" />
-                                <parmlist id="15914" addr="0x7f99f1db21d0" >
+                        <cdecl id="15905" addr="0x7fca46900290" >
+                            <attributelist id="15906" addr="0x7fca46900290" >
+                                <attribute name="name" value="addControls" id="15907" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="15908" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468faed0" id="15909" addr="0x7fca468faed0" />
+                                <attribute name="kind" value="function" id="15910" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="addControls" id="15911" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(std::vector&lt;(p.XBMCAddon::xbmcgui::Control)>)." id="15912" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="15913" addr="0x7fca46934c90" />
+                                <parmlist id="15914" addr="0x7fca469001d0" >
                                     <parm id="15915">
-                                        <attributelist id="15916" addr="0x7f99f1db21d0" >
-                                            <attribute name="name" value="pControls" id="15917" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="std::vector&lt;(p.XBMCAddon::xbmcgui::Control)>" id="15918" addr="0x7f99f1de6c90" />
+                                        <attributelist id="15916" addr="0x7fca469001d0" >
+                                            <attribute name="name" value="pControls" id="15917" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="std::vector&lt;(p.XBMCAddon::xbmcgui::Control)>" id="15918" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="15919" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="15920" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="15919" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="15920" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="15921" addr="0x7f99f1db2570" >
-                            <attributelist id="15922" addr="0x7f99f1db2570" >
-                                <attribute name="ismember" value="1" id="15923" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getControl" id="15924" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="getControl" id="15925" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(int).p." id="15926" addr="0x7f99f1de6c90" />
-                                <parmlist id="15927" addr="0x7f99f1db24f0" >
+                        <cdecl id="15921" addr="0x7fca46900570" >
+                            <attributelist id="15922" addr="0x7fca46900570" >
+                                <attribute name="ismember" value="1" id="15923" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getControl" id="15924" addr="0x7fca46934c90" />
+                                <attribute name="name" value="getControl" id="15925" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(int).p." id="15926" addr="0x7fca46934c90" />
+                                <parmlist id="15927" addr="0x7fca469004f0" >
                                     <parm id="15928">
-                                        <attributelist id="15929" addr="0x7f99f1db24f0" >
-                                            <attribute name="name" value="iControlId" id="15930" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="15931" addr="0x7f99f1de6c90" />
+                                        <attributelist id="15929" addr="0x7fca469004f0" >
+                                            <attribute name="name" value="iControlId" id="15930" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="15931" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="access" value="public" id="15932" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="15933" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="XBMCAddon::xbmcgui::Control" id="15934" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1daced0" id="15935" addr="0x7f99f1daced0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="15936" addr="0x7f99f1de6c90" />
+                                <attribute name="access" value="public" id="15932" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="15933" addr="0x7fca46934c90" />
+                                <attribute name="type" value="XBMCAddon::xbmcgui::Control" id="15934" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca468faed0" id="15935" addr="0x7fca468faed0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="15936" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
@@ -22590,588 +22590,588 @@
                 </namespace >
             </namespace >
         </include >
-        <include id="15937" addr="0x7f99f1db27b0" >
-            <attributelist id="15938" addr="0x7f99f1db27b0" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/WindowDialog.h" id="15939" addr="0x7f99f1de6c90" />
+        <include id="15937" addr="0x7fca469007b0" >
+            <attributelist id="15938" addr="0x7fca469007b0" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/WindowDialog.h" id="15939" addr="0x7fca46934c90" />
             </attributelist >
 
-            <namespace id="15940" addr="0x7f99f1db2850" >
-                <attributelist id="15941" addr="0x7f99f1db2850" >
-                    <attribute name="sym_name" value="XBMCAddon" id="15942" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="XBMCAddon" id="15943" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_previousSibling" value="0x7f99f1dabd50" id="15944" addr="0x7f99f1dabd50" />
-                    <attribute name="csym_nextSibling" value="0x7f99f1db3250" id="15945" addr="0x7f99f1db3250" />
-                    <attribute name="sym_nextSibling" value="0x7f99f1db3250" id="15946" addr="0x7f99f1db3250" />
-                    <typescope id="15947" addr="0x7f99f1dd1d70" >
-                        <attributelist id="15948" addr="0x7f99f1dd1d70" >
-                            <attribute name="name" value="XBMCAddon" id="15949" addr="0x7f99f1de6c90" />
-                            <typetab id="15950" addr="0x7f99f1dd1db0" >
-                                <attributelist id="15951" addr="0x7f99f1dd1db0" >
-                                    <attribute name="Dictionary" value="Dictionary" id="15952" addr="0x7f99f1de6c90" />
-                                    <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="15953" addr="0x7f99f1de6c90" />
-                                    <attribute name="String" value="std::string" id="15954" addr="0x7f99f1de6c90" />
-                                    <attribute name="StringOrInt" value="XBMCAddon::String" id="15955" addr="0x7f99f1de6c90" />
+            <namespace id="15940" addr="0x7fca46900850" >
+                <attributelist id="15941" addr="0x7fca46900850" >
+                    <attribute name="sym_name" value="XBMCAddon" id="15942" addr="0x7fca46934c90" />
+                    <attribute name="name" value="XBMCAddon" id="15943" addr="0x7fca46934c90" />
+                    <attribute name="sym_previousSibling" value="0x7fca468f9d50" id="15944" addr="0x7fca468f9d50" />
+                    <attribute name="csym_nextSibling" value="0x7fca46901250" id="15945" addr="0x7fca46901250" />
+                    <attribute name="sym_nextSibling" value="0x7fca46901250" id="15946" addr="0x7fca46901250" />
+                    <typescope id="15947" addr="0x7fca4691fd70" >
+                        <attributelist id="15948" addr="0x7fca4691fd70" >
+                            <attribute name="name" value="XBMCAddon" id="15949" addr="0x7fca46934c90" />
+                            <typetab id="15950" addr="0x7fca4691fdb0" >
+                                <attributelist id="15951" addr="0x7fca4691fdb0" >
+                                    <attribute name="Dictionary" value="Dictionary" id="15952" addr="0x7fca46934c90" />
+                                    <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="15953" addr="0x7fca46934c90" />
+                                    <attribute name="String" value="std::string" id="15954" addr="0x7fca46934c90" />
+                                    <attribute name="StringOrInt" value="XBMCAddon::String" id="15955" addr="0x7fca46934c90" />
                                 </attributelist >
-                                <typetabsitem id="15956" addr="0x7f99f1dd28b0" >
-                                    <attributelist id="15957" addr="0x7f99f1dd28b0" >
+                                <typetabsitem id="15956" addr="0x7fca469208b0" >
+                                    <attributelist id="15957" addr="0x7fca469208b0" >
                                     </attributelist >
                                 </typetabsitem >
-                                <typetabsitem id="15958" addr="0x7f99f1dd2910" >
-                                    <attributelist id="15959" addr="0x7f99f1dd2910" >
+                                <typetabsitem id="15958" addr="0x7fca46920910" >
+                                    <attributelist id="15959" addr="0x7fca46920910" >
                                     </attributelist >
                                 </typetabsitem >
-                                <typetabsitem id="15960" addr="0x7f99f1dd1f90" >
-                                    <attributelist id="15961" addr="0x7f99f1dd1f90" >
+                                <typetabsitem id="15960" addr="0x7fca4691ff90" >
+                                    <attributelist id="15961" addr="0x7fca4691ff90" >
                                     </attributelist >
                                 </typetabsitem >
-                                <typetabsitem id="15962" addr="0x7f99f1dd2710" >
-                                    <attributelist id="15963" addr="0x7f99f1dd2710" >
+                                <typetabsitem id="15962" addr="0x7fca46920710" >
+                                    <attributelist id="15963" addr="0x7fca46920710" >
                                     </attributelist >
                                 </typetabsitem >
                             </typetab >
-                            <attribute name="parent" value="0x7f99f1e1da30" id="15964" addr="0x7f99f1e1da30" />
-                            <attribute name="qname" value="XBMCAddon" id="15965" addr="0x7f99f1de6c90" />
-                            <attribute name="symtab" value="0x7f99f1e408b0" id="15966" addr="0x7f99f1e408b0" />
+                            <attribute name="parent" value="0x7fca4696ba30" id="15964" addr="0x7fca4696ba30" />
+                            <attribute name="qname" value="XBMCAddon" id="15965" addr="0x7fca46934c90" />
+                            <attribute name="symtab" value="0x7fca4698e8b0" id="15966" addr="0x7fca4698e8b0" />
                         </attributelist >
-                        <typescopesitem id="15967" addr="0x7f99f1e40870" >
-                            <attributelist id="15968" addr="0x7f99f1e40870" >
+                        <typescopesitem id="15967" addr="0x7fca4698e870" >
+                            <attributelist id="15968" addr="0x7fca4698e870" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="15969" addr="0x7f99f1dd1db0" >
-                            <attributelist id="15970" addr="0x7f99f1dd1db0" >
-                                <attribute name="Dictionary" value="Dictionary" id="15971" addr="0x7f99f1de6c90" />
-                                <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="15972" addr="0x7f99f1de6c90" />
-                                <attribute name="String" value="std::string" id="15973" addr="0x7f99f1de6c90" />
-                                <attribute name="StringOrInt" value="XBMCAddon::String" id="15974" addr="0x7f99f1de6c90" />
+                        <typescopesitem id="15969" addr="0x7fca4691fdb0" >
+                            <attributelist id="15970" addr="0x7fca4691fdb0" >
+                                <attribute name="Dictionary" value="Dictionary" id="15971" addr="0x7fca46934c90" />
+                                <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="15972" addr="0x7fca46934c90" />
+                                <attribute name="String" value="std::string" id="15973" addr="0x7fca46934c90" />
+                                <attribute name="StringOrInt" value="XBMCAddon::String" id="15974" addr="0x7fca46934c90" />
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="15975" addr="0x7f99f1e1da30" >
-                            <attributelist id="15976" addr="0x7f99f1e1da30" >
-                                <attribute name="name" value="" id="15977" addr="0x7f99f1de6c90" />
-                                <typetab id="15978" addr="0x7f99f1e1da90" >
-                                    <attributelist id="15979" addr="0x7f99f1e1da90" >
+                        <typescopesitem id="15975" addr="0x7fca4696ba30" >
+                            <attributelist id="15976" addr="0x7fca4696ba30" >
+                                <attribute name="name" value="" id="15977" addr="0x7fca46934c90" />
+                                <typetab id="15978" addr="0x7fca4696ba90" >
+                                    <attributelist id="15979" addr="0x7fca4696ba90" >
                                     </attributelist >
                                 </typetab >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="15980" addr="0x7f99f1dd1eb0" >
-                            <attributelist id="15981" addr="0x7f99f1dd1eb0" >
+                        <typescopesitem id="15980" addr="0x7fca4691feb0" >
+                            <attributelist id="15981" addr="0x7fca4691feb0" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="15982" addr="0x7f99f1e408b0" >
-                            <attributelist id="15983" addr="0x7f99f1e408b0" >
-                                <attribute name="name" value="XBMCAddon" id="15984" addr="0x7f99f1de6c90" />
-                                <attribute name="csymtab" value="0x7f99f1e408f0" id="15985" addr="0x7f99f1e408f0" />
-                                <attribute name="symtab" value="0x7f99f1e40890" id="15986" addr="0x7f99f1e40890" />
+                        <typescopesitem id="15982" addr="0x7fca4698e8b0" >
+                            <attributelist id="15983" addr="0x7fca4698e8b0" >
+                                <attribute name="name" value="XBMCAddon" id="15984" addr="0x7fca46934c90" />
+                                <attribute name="csymtab" value="0x7fca4698e8f0" id="15985" addr="0x7fca4698e8f0" />
+                                <attribute name="symtab" value="0x7fca4698e890" id="15986" addr="0x7fca4698e890" />
                             </attributelist >
                         </typescopesitem >
                     </typescope >
-                    <attribute name="symtab" value="0x7f99f1e408b0" id="15987" addr="0x7f99f1e408b0" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="15988" addr="0x7f99f1e1d950" />
+                    <attribute name="symtab" value="0x7fca4698e8b0" id="15987" addr="0x7fca4698e8b0" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="15988" addr="0x7fca4696b950" />
                 </attributelist >
 
-                <namespace id="15989" addr="0x7f99f1db28d0" >
-                    <attributelist id="15990" addr="0x7f99f1db28d0" >
-                        <attribute name="feature_knownbasetypes" value="AddonClass,AddonCallback" id="15991" addr="0x7f99f1de6c90" />
-                        <attribute name="name" value="xbmcgui" id="15992" addr="0x7f99f1de6c90" />
-                        <attribute name="sym_symtab" value="0x7f99f1e408b0" id="15993" addr="0x7f99f1e408b0" />
-                        <attribute name="symtab" value="0x7f99f1e40fb0" id="15994" addr="0x7f99f1e40fb0" />
-                        <attribute name="sym_nextSibling" value="0x7f99f1db32d0" id="15995" addr="0x7f99f1db32d0" />
-                        <attribute name="csym_nextSibling" value="0x7f99f1db32d0" id="15996" addr="0x7f99f1db32d0" />
-                        <attribute name="sym_previousSibling" value="0x7f99f1dabdd0" id="15997" addr="0x7f99f1dabdd0" />
-                        <attribute name="feature_knownapitypes" value="XBMCAddon::xbmc::InfoTagVideo,xbmc::InfoTagMusic" id="15998" addr="0x7f99f1de6c90" />
-                        <attribute name="sym_name" value="xbmcgui" id="15999" addr="0x7f99f1de6c90" />
-                        <typescope id="16000" addr="0x7f99f1dd2150" >
-                            <attributelist id="16001" addr="0x7f99f1dd2150" >
-                                <attribute name="name" value="xbmcgui" id="16002" addr="0x7f99f1de6c90" />
-                                <typetab id="16003" addr="0x7f99f1dd2170" >
-                                    <attributelist id="16004" addr="0x7f99f1dd2170" >
-                                        <attribute name="InterceptorBase" value="InterceptorBase" id="16005" addr="0x7f99f1de6c90" />
-                                        <attribute name="Dialog" value="Dialog" id="16006" addr="0x7f99f1de6c90" />
-                                        <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="16007" addr="0x7f99f1de6c90" />
-                                        <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="16008" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlTextBox" value="ControlTextBox" id="16009" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlRadioButton" value="ControlRadioButton" id="16010" addr="0x7f99f1de6c90" />
-                                        <attribute name="Window" value="Window" id="16011" addr="0x7f99f1de6c90" />
-                                        <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="16012" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlList" value="ControlList" id="16013" addr="0x7f99f1de6c90" />
-                                        <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="16014" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlImage" value="ControlImage" id="16015" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlButton" value="ControlButton" id="16016" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlGroup" value="ControlGroup" id="16017" addr="0x7f99f1de6c90" />
-                                        <attribute name="DialogBusy" value="DialogBusy" id="16018" addr="0x7f99f1de6c90" />
-                                        <attribute name="DialogProgressBG" value="DialogProgressBG" id="16019" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlSpin" value="ControlSpin" id="16020" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlEdit" value="ControlEdit" id="16021" addr="0x7f99f1de6c90" />
-                                        <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="16022" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="16023" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlLabel" value="ControlLabel" id="16024" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlProgress" value="ControlProgress" id="16025" addr="0x7f99f1de6c90" />
-                                        <attribute name="Control" value="Control" id="16026" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlSlider" value="ControlSlider" id="16027" addr="0x7f99f1de6c90" />
-                                        <attribute name="DialogProgress" value="DialogProgress" id="16028" addr="0x7f99f1de6c90" />
-                                        <attribute name="Action" value="Action" id="16029" addr="0x7f99f1de6c90" />
-                                        <attribute name="WindowDialog" value="WindowDialog" id="16030" addr="0x7f99f1de6c90" />
-                                        <attribute name="WindowXML" value="WindowXML" id="16031" addr="0x7f99f1de6c90" />
-                                        <attribute name="ListItem" value="ListItem" id="16032" addr="0x7f99f1de6c90" />
-                                        <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="16033" addr="0x7f99f1de6c90" />
+                <namespace id="15989" addr="0x7fca469008d0" >
+                    <attributelist id="15990" addr="0x7fca469008d0" >
+                        <attribute name="feature_knownbasetypes" value="AddonClass,AddonCallback" id="15991" addr="0x7fca46934c90" />
+                        <attribute name="name" value="xbmcgui" id="15992" addr="0x7fca46934c90" />
+                        <attribute name="sym_symtab" value="0x7fca4698e8b0" id="15993" addr="0x7fca4698e8b0" />
+                        <attribute name="symtab" value="0x7fca4698efb0" id="15994" addr="0x7fca4698efb0" />
+                        <attribute name="sym_nextSibling" value="0x7fca469012d0" id="15995" addr="0x7fca469012d0" />
+                        <attribute name="csym_nextSibling" value="0x7fca469012d0" id="15996" addr="0x7fca469012d0" />
+                        <attribute name="sym_previousSibling" value="0x7fca468f9dd0" id="15997" addr="0x7fca468f9dd0" />
+                        <attribute name="feature_knownapitypes" value="XBMCAddon::xbmc::InfoTagVideo,xbmc::InfoTagMusic" id="15998" addr="0x7fca46934c90" />
+                        <attribute name="sym_name" value="xbmcgui" id="15999" addr="0x7fca46934c90" />
+                        <typescope id="16000" addr="0x7fca46920150" >
+                            <attributelist id="16001" addr="0x7fca46920150" >
+                                <attribute name="name" value="xbmcgui" id="16002" addr="0x7fca46934c90" />
+                                <typetab id="16003" addr="0x7fca46920170" >
+                                    <attributelist id="16004" addr="0x7fca46920170" >
+                                        <attribute name="InterceptorBase" value="InterceptorBase" id="16005" addr="0x7fca46934c90" />
+                                        <attribute name="Dialog" value="Dialog" id="16006" addr="0x7fca46934c90" />
+                                        <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="16007" addr="0x7fca46934c90" />
+                                        <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="16008" addr="0x7fca46934c90" />
+                                        <attribute name="ControlTextBox" value="ControlTextBox" id="16009" addr="0x7fca46934c90" />
+                                        <attribute name="ControlRadioButton" value="ControlRadioButton" id="16010" addr="0x7fca46934c90" />
+                                        <attribute name="Window" value="Window" id="16011" addr="0x7fca46934c90" />
+                                        <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="16012" addr="0x7fca46934c90" />
+                                        <attribute name="ControlList" value="ControlList" id="16013" addr="0x7fca46934c90" />
+                                        <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="16014" addr="0x7fca46934c90" />
+                                        <attribute name="ControlImage" value="ControlImage" id="16015" addr="0x7fca46934c90" />
+                                        <attribute name="ControlButton" value="ControlButton" id="16016" addr="0x7fca46934c90" />
+                                        <attribute name="ControlGroup" value="ControlGroup" id="16017" addr="0x7fca46934c90" />
+                                        <attribute name="DialogBusy" value="DialogBusy" id="16018" addr="0x7fca46934c90" />
+                                        <attribute name="DialogProgressBG" value="DialogProgressBG" id="16019" addr="0x7fca46934c90" />
+                                        <attribute name="ControlSpin" value="ControlSpin" id="16020" addr="0x7fca46934c90" />
+                                        <attribute name="ControlEdit" value="ControlEdit" id="16021" addr="0x7fca46934c90" />
+                                        <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="16022" addr="0x7fca46934c90" />
+                                        <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="16023" addr="0x7fca46934c90" />
+                                        <attribute name="ControlLabel" value="ControlLabel" id="16024" addr="0x7fca46934c90" />
+                                        <attribute name="ControlProgress" value="ControlProgress" id="16025" addr="0x7fca46934c90" />
+                                        <attribute name="Control" value="Control" id="16026" addr="0x7fca46934c90" />
+                                        <attribute name="ControlSlider" value="ControlSlider" id="16027" addr="0x7fca46934c90" />
+                                        <attribute name="DialogProgress" value="DialogProgress" id="16028" addr="0x7fca46934c90" />
+                                        <attribute name="Action" value="Action" id="16029" addr="0x7fca46934c90" />
+                                        <attribute name="WindowDialog" value="WindowDialog" id="16030" addr="0x7fca46934c90" />
+                                        <attribute name="WindowXML" value="WindowXML" id="16031" addr="0x7fca46934c90" />
+                                        <attribute name="ListItem" value="ListItem" id="16032" addr="0x7fca46934c90" />
+                                        <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="16033" addr="0x7fca46934c90" />
                                     </attributelist >
-                                    <typetabsitem id="16034" addr="0x7f99f1de1dd0" >
-                                        <attributelist id="16035" addr="0x7f99f1de1dd0" >
+                                    <typetabsitem id="16034" addr="0x7fca4692fdd0" >
+                                        <attributelist id="16035" addr="0x7fca4692fdd0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16036" addr="0x7f99f1dde790" >
-                                        <attributelist id="16037" addr="0x7f99f1dde790" >
+                                    <typetabsitem id="16036" addr="0x7fca4692c790" >
+                                        <attributelist id="16037" addr="0x7fca4692c790" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16038" addr="0x7f99f1de3f10" >
-                                        <attributelist id="16039" addr="0x7f99f1de3f10" >
+                                    <typetabsitem id="16038" addr="0x7fca46931f10" >
+                                        <attributelist id="16039" addr="0x7fca46931f10" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16040" addr="0x7f99f1dd67b0" >
-                                        <attributelist id="16041" addr="0x7f99f1dd67b0" >
+                                    <typetabsitem id="16040" addr="0x7fca469247b0" >
+                                        <attributelist id="16041" addr="0x7fca469247b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16042" addr="0x7f99f1ddafd0" >
-                                        <attributelist id="16043" addr="0x7f99f1ddafd0" >
+                                    <typetabsitem id="16042" addr="0x7fca46928fd0" >
+                                        <attributelist id="16043" addr="0x7fca46928fd0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16044" addr="0x7f99f1ddd430" >
-                                        <attributelist id="16045" addr="0x7f99f1ddd430" >
+                                    <typetabsitem id="16044" addr="0x7fca4692b430" >
+                                        <attributelist id="16045" addr="0x7fca4692b430" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16046" addr="0x7f99f1de2130" >
-                                        <attributelist id="16047" addr="0x7f99f1de2130" >
+                                    <typetabsitem id="16046" addr="0x7fca46930130" >
+                                        <attributelist id="16047" addr="0x7fca46930130" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16048" addr="0x7f99f1dd2f50" >
-                                        <attributelist id="16049" addr="0x7f99f1dd2f50" >
+                                    <typetabsitem id="16048" addr="0x7fca46920f50" >
+                                        <attributelist id="16049" addr="0x7fca46920f50" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16050" addr="0x7f99f1dd9650" >
-                                        <attributelist id="16051" addr="0x7f99f1dd9650" >
+                                    <typetabsitem id="16050" addr="0x7fca46927650" >
+                                        <attributelist id="16051" addr="0x7fca46927650" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16052" addr="0x7f99f1de3390" >
-                                        <attributelist id="16053" addr="0x7f99f1de3390" >
+                                    <typetabsitem id="16052" addr="0x7fca46931390" >
+                                        <attributelist id="16053" addr="0x7fca46931390" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16054" addr="0x7f99f1ddb7b0" >
-                                        <attributelist id="16055" addr="0x7f99f1ddb7b0" >
+                                    <typetabsitem id="16054" addr="0x7fca469297b0" >
+                                        <attributelist id="16055" addr="0x7fca469297b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16056" addr="0x7f99f1ddc4b0" >
-                                        <attributelist id="16057" addr="0x7f99f1ddc4b0" >
+                                    <typetabsitem id="16056" addr="0x7fca4692a4b0" >
+                                        <attributelist id="16057" addr="0x7fca4692a4b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16058" addr="0x7f99f1ddcf90" >
-                                        <attributelist id="16059" addr="0x7f99f1ddcf90" >
+                                    <typetabsitem id="16058" addr="0x7fca4692af90" >
+                                        <attributelist id="16059" addr="0x7fca4692af90" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16060" addr="0x7f99f1de11b0" >
-                                        <attributelist id="16061" addr="0x7f99f1de11b0" >
+                                    <typetabsitem id="16060" addr="0x7fca4692f1b0" >
+                                        <attributelist id="16061" addr="0x7fca4692f1b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16062" addr="0x7f99f1de15b0" >
-                                        <attributelist id="16063" addr="0x7f99f1de15b0" >
+                                    <typetabsitem id="16062" addr="0x7fca4692f5b0" >
+                                        <attributelist id="16063" addr="0x7fca4692f5b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16064" addr="0x7f99f1dd77f0" >
-                                        <attributelist id="16065" addr="0x7f99f1dd77f0" >
+                                    <typetabsitem id="16064" addr="0x7fca469257f0" >
+                                        <attributelist id="16065" addr="0x7fca469257f0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16066" addr="0x7f99f1dd8b30" >
-                                        <attributelist id="16067" addr="0x7f99f1dd8b30" >
+                                    <typetabsitem id="16066" addr="0x7fca46926b30" >
+                                        <attributelist id="16067" addr="0x7fca46926b30" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16068" addr="0x7f99f1dd2c50" >
-                                        <attributelist id="16069" addr="0x7f99f1dd2c50" >
+                                    <typetabsitem id="16068" addr="0x7fca46920c50" >
+                                        <attributelist id="16069" addr="0x7fca46920c50" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16070" addr="0x7f99f1dda790" >
-                                        <attributelist id="16071" addr="0x7f99f1dda790" >
+                                    <typetabsitem id="16070" addr="0x7fca46928790" >
+                                        <attributelist id="16071" addr="0x7fca46928790" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16072" addr="0x7f99f1dd8030" >
-                                        <attributelist id="16073" addr="0x7f99f1dd8030" >
+                                    <typetabsitem id="16072" addr="0x7fca46926030" >
+                                        <attributelist id="16073" addr="0x7fca46926030" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16074" addr="0x7f99f1ddbe10" >
-                                        <attributelist id="16075" addr="0x7f99f1ddbe10" >
+                                    <typetabsitem id="16074" addr="0x7fca46929e10" >
+                                        <attributelist id="16075" addr="0x7fca46929e10" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16076" addr="0x7f99f1dd6b10" >
-                                        <attributelist id="16077" addr="0x7f99f1dd6b10" >
+                                    <typetabsitem id="16076" addr="0x7fca46924b10" >
+                                        <attributelist id="16077" addr="0x7fca46924b10" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16078" addr="0x7f99f1dddf90" >
-                                        <attributelist id="16079" addr="0x7f99f1dddf90" >
+                                    <typetabsitem id="16078" addr="0x7fca4692bf90" >
+                                        <attributelist id="16079" addr="0x7fca4692bf90" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16080" addr="0x7f99f1de0530" >
-                                        <attributelist id="16081" addr="0x7f99f1de0530" >
+                                    <typetabsitem id="16080" addr="0x7fca4692e530" >
+                                        <attributelist id="16081" addr="0x7fca4692e530" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16082" addr="0x7f99f1de1e50" >
-                                        <attributelist id="16083" addr="0x7f99f1de1e50" >
+                                    <typetabsitem id="16082" addr="0x7fca4692fe50" >
+                                        <attributelist id="16083" addr="0x7fca4692fe50" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16084" addr="0x7f99f1de2d90" >
-                                        <attributelist id="16085" addr="0x7f99f1de2d90" >
+                                    <typetabsitem id="16084" addr="0x7fca46930d90" >
+                                        <attributelist id="16085" addr="0x7fca46930d90" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16086" addr="0x7f99f1de3410" >
-                                        <attributelist id="16087" addr="0x7f99f1de3410" >
+                                    <typetabsitem id="16086" addr="0x7fca46931410" >
+                                        <attributelist id="16087" addr="0x7fca46931410" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16088" addr="0x7f99f1dd3590" >
-                                        <attributelist id="16089" addr="0x7f99f1dd3590" >
+                                    <typetabsitem id="16088" addr="0x7fca46921590" >
+                                        <attributelist id="16089" addr="0x7fca46921590" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16090" addr="0x7f99f1dd3390" >
-                                        <attributelist id="16091" addr="0x7f99f1dd3390" >
+                                    <typetabsitem id="16090" addr="0x7fca46921390" >
+                                        <attributelist id="16091" addr="0x7fca46921390" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
-                                <attribute name="parent" value="0x7f99f1dd1d70" id="16092" addr="0x7f99f1dd1d70" />
-                                <attribute name="qname" value="XBMCAddon::xbmcgui" id="16093" addr="0x7f99f1de6c90" />
-                                <attribute name="symtab" value="0x7f99f1e40fb0" id="16094" addr="0x7f99f1e40fb0" />
+                                <attribute name="parent" value="0x7fca4691fd70" id="16092" addr="0x7fca4691fd70" />
+                                <attribute name="qname" value="XBMCAddon::xbmcgui" id="16093" addr="0x7fca46934c90" />
+                                <attribute name="symtab" value="0x7fca4698efb0" id="16094" addr="0x7fca4698efb0" />
                             </attributelist >
-                            <typescopesitem id="16095" addr="0x7f99f1e40f70" >
-                                <attributelist id="16096" addr="0x7f99f1e40f70" >
+                            <typescopesitem id="16095" addr="0x7fca4698ef70" >
+                                <attributelist id="16096" addr="0x7fca4698ef70" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="16097" addr="0x7f99f1dd2170" >
-                                <attributelist id="16098" addr="0x7f99f1dd2170" >
-                                    <attribute name="InterceptorBase" value="InterceptorBase" id="16099" addr="0x7f99f1de6c90" />
-                                    <attribute name="Dialog" value="Dialog" id="16100" addr="0x7f99f1de6c90" />
-                                    <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="16101" addr="0x7f99f1de6c90" />
-                                    <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="16102" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlTextBox" value="ControlTextBox" id="16103" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlRadioButton" value="ControlRadioButton" id="16104" addr="0x7f99f1de6c90" />
-                                    <attribute name="Window" value="Window" id="16105" addr="0x7f99f1de6c90" />
-                                    <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="16106" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlList" value="ControlList" id="16107" addr="0x7f99f1de6c90" />
-                                    <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="16108" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlImage" value="ControlImage" id="16109" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlButton" value="ControlButton" id="16110" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlGroup" value="ControlGroup" id="16111" addr="0x7f99f1de6c90" />
-                                    <attribute name="DialogBusy" value="DialogBusy" id="16112" addr="0x7f99f1de6c90" />
-                                    <attribute name="DialogProgressBG" value="DialogProgressBG" id="16113" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlSpin" value="ControlSpin" id="16114" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlEdit" value="ControlEdit" id="16115" addr="0x7f99f1de6c90" />
-                                    <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="16116" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="16117" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlLabel" value="ControlLabel" id="16118" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlProgress" value="ControlProgress" id="16119" addr="0x7f99f1de6c90" />
-                                    <attribute name="Control" value="Control" id="16120" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlSlider" value="ControlSlider" id="16121" addr="0x7f99f1de6c90" />
-                                    <attribute name="DialogProgress" value="DialogProgress" id="16122" addr="0x7f99f1de6c90" />
-                                    <attribute name="Action" value="Action" id="16123" addr="0x7f99f1de6c90" />
-                                    <attribute name="WindowDialog" value="WindowDialog" id="16124" addr="0x7f99f1de6c90" />
-                                    <attribute name="WindowXML" value="WindowXML" id="16125" addr="0x7f99f1de6c90" />
-                                    <attribute name="ListItem" value="ListItem" id="16126" addr="0x7f99f1de6c90" />
-                                    <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="16127" addr="0x7f99f1de6c90" />
+                            <typescopesitem id="16097" addr="0x7fca46920170" >
+                                <attributelist id="16098" addr="0x7fca46920170" >
+                                    <attribute name="InterceptorBase" value="InterceptorBase" id="16099" addr="0x7fca46934c90" />
+                                    <attribute name="Dialog" value="Dialog" id="16100" addr="0x7fca46934c90" />
+                                    <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="16101" addr="0x7fca46934c90" />
+                                    <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="16102" addr="0x7fca46934c90" />
+                                    <attribute name="ControlTextBox" value="ControlTextBox" id="16103" addr="0x7fca46934c90" />
+                                    <attribute name="ControlRadioButton" value="ControlRadioButton" id="16104" addr="0x7fca46934c90" />
+                                    <attribute name="Window" value="Window" id="16105" addr="0x7fca46934c90" />
+                                    <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="16106" addr="0x7fca46934c90" />
+                                    <attribute name="ControlList" value="ControlList" id="16107" addr="0x7fca46934c90" />
+                                    <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="16108" addr="0x7fca46934c90" />
+                                    <attribute name="ControlImage" value="ControlImage" id="16109" addr="0x7fca46934c90" />
+                                    <attribute name="ControlButton" value="ControlButton" id="16110" addr="0x7fca46934c90" />
+                                    <attribute name="ControlGroup" value="ControlGroup" id="16111" addr="0x7fca46934c90" />
+                                    <attribute name="DialogBusy" value="DialogBusy" id="16112" addr="0x7fca46934c90" />
+                                    <attribute name="DialogProgressBG" value="DialogProgressBG" id="16113" addr="0x7fca46934c90" />
+                                    <attribute name="ControlSpin" value="ControlSpin" id="16114" addr="0x7fca46934c90" />
+                                    <attribute name="ControlEdit" value="ControlEdit" id="16115" addr="0x7fca46934c90" />
+                                    <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="16116" addr="0x7fca46934c90" />
+                                    <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="16117" addr="0x7fca46934c90" />
+                                    <attribute name="ControlLabel" value="ControlLabel" id="16118" addr="0x7fca46934c90" />
+                                    <attribute name="ControlProgress" value="ControlProgress" id="16119" addr="0x7fca46934c90" />
+                                    <attribute name="Control" value="Control" id="16120" addr="0x7fca46934c90" />
+                                    <attribute name="ControlSlider" value="ControlSlider" id="16121" addr="0x7fca46934c90" />
+                                    <attribute name="DialogProgress" value="DialogProgress" id="16122" addr="0x7fca46934c90" />
+                                    <attribute name="Action" value="Action" id="16123" addr="0x7fca46934c90" />
+                                    <attribute name="WindowDialog" value="WindowDialog" id="16124" addr="0x7fca46934c90" />
+                                    <attribute name="WindowXML" value="WindowXML" id="16125" addr="0x7fca46934c90" />
+                                    <attribute name="ListItem" value="ListItem" id="16126" addr="0x7fca46934c90" />
+                                    <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="16127" addr="0x7fca46934c90" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="16128" addr="0x7f99f1dd1d70" >
-                                <attributelist id="16129" addr="0x7f99f1dd1d70" >
-                                    <attribute name="name" value="XBMCAddon" id="16130" addr="0x7f99f1de6c90" />
-                                    <typetab id="16131" addr="0x7f99f1dd1db0" >
-                                        <attributelist id="16132" addr="0x7f99f1dd1db0" >
-                                            <attribute name="Dictionary" value="Dictionary" id="16133" addr="0x7f99f1de6c90" />
-                                            <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="16134" addr="0x7f99f1de6c90" />
-                                            <attribute name="String" value="std::string" id="16135" addr="0x7f99f1de6c90" />
-                                            <attribute name="StringOrInt" value="XBMCAddon::String" id="16136" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                        <typetabsitem id="16137" addr="0x7f99f1dd28b0" >
-                                            <attributelist id="16138" addr="0x7f99f1dd28b0" >
+                            <typescopesitem id="16128" addr="0x7fca4691fd70" >
+                                <attributelist id="16129" addr="0x7fca4691fd70" >
+                                    <attribute name="name" value="XBMCAddon" id="16130" addr="0x7fca46934c90" />
+                                    <typetab id="16131" addr="0x7fca4691fdb0" >
+                                        <attributelist id="16132" addr="0x7fca4691fdb0" >
+                                            <attribute name="Dictionary" value="Dictionary" id="16133" addr="0x7fca46934c90" />
+                                            <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="16134" addr="0x7fca46934c90" />
+                                            <attribute name="String" value="std::string" id="16135" addr="0x7fca46934c90" />
+                                            <attribute name="StringOrInt" value="XBMCAddon::String" id="16136" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                        <typetabsitem id="16137" addr="0x7fca469208b0" >
+                                            <attributelist id="16138" addr="0x7fca469208b0" >
                                             </attributelist >
                                         </typetabsitem >
-                                        <typetabsitem id="16139" addr="0x7f99f1dd2910" >
-                                            <attributelist id="16140" addr="0x7f99f1dd2910" >
+                                        <typetabsitem id="16139" addr="0x7fca46920910" >
+                                            <attributelist id="16140" addr="0x7fca46920910" >
                                             </attributelist >
                                         </typetabsitem >
-                                        <typetabsitem id="16141" addr="0x7f99f1dd1f90" >
-                                            <attributelist id="16142" addr="0x7f99f1dd1f90" >
+                                        <typetabsitem id="16141" addr="0x7fca4691ff90" >
+                                            <attributelist id="16142" addr="0x7fca4691ff90" >
                                             </attributelist >
                                         </typetabsitem >
-                                        <typetabsitem id="16143" addr="0x7f99f1dd2710" >
-                                            <attributelist id="16144" addr="0x7f99f1dd2710" >
+                                        <typetabsitem id="16143" addr="0x7fca46920710" >
+                                            <attributelist id="16144" addr="0x7fca46920710" >
                                             </attributelist >
                                         </typetabsitem >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f99f1e1da30" id="16145" addr="0x7f99f1e1da30" />
-                                    <attribute name="qname" value="XBMCAddon" id="16146" addr="0x7f99f1de6c90" />
-                                    <attribute name="symtab" value="0x7f99f1e408b0" id="16147" addr="0x7f99f1e408b0" />
+                                    <attribute name="parent" value="0x7fca4696ba30" id="16145" addr="0x7fca4696ba30" />
+                                    <attribute name="qname" value="XBMCAddon" id="16146" addr="0x7fca46934c90" />
+                                    <attribute name="symtab" value="0x7fca4698e8b0" id="16147" addr="0x7fca4698e8b0" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="16148" addr="0x7f99f1dd2190" >
-                                <attributelist id="16149" addr="0x7f99f1dd2190" >
+                            <typescopesitem id="16148" addr="0x7fca46920190" >
+                                <attributelist id="16149" addr="0x7fca46920190" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="16150" addr="0x7f99f1e40fb0" >
-                                <attributelist id="16151" addr="0x7f99f1e40fb0" >
-                                    <attribute name="name" value="xbmcgui" id="16152" addr="0x7f99f1de6c90" />
-                                    <attribute name="csymtab" value="0x7f99f1e40ff0" id="16153" addr="0x7f99f1e40ff0" />
-                                    <attribute name="symtab" value="0x7f99f1e40f90" id="16154" addr="0x7f99f1e40f90" />
+                            <typescopesitem id="16150" addr="0x7fca4698efb0" >
+                                <attributelist id="16151" addr="0x7fca4698efb0" >
+                                    <attribute name="name" value="xbmcgui" id="16152" addr="0x7fca46934c90" />
+                                    <attribute name="csymtab" value="0x7fca4698eff0" id="16153" addr="0x7fca4698eff0" />
+                                    <attribute name="symtab" value="0x7fca4698ef90" id="16154" addr="0x7fca4698ef90" />
                                 </attributelist >
                             </typescopesitem >
                         </typescope >
                     </attributelist >
 
-                    <class id="16155" addr="0x7f99f1db2af0" >
-                        <attributelist id="16156" addr="0x7f99f1db2af0" >
-                            <attribute name="name" value="XBMCAddon::xbmcgui::WindowDialog" id="16157" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="16158" addr="0x7f99f1e40fb0" />
-                            <attribute name="symtab" value="0x7f99f1db2c90" id="16159" addr="0x7f99f1db2c90" />
-                            <attribute name="allows_typedef" value="1" id="16160" addr="0x7f99f1de6c90" />
-                            <attribute name="typepass_visit" value="1" id="16161" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_visit" value="1" id="16162" addr="0x7f99f1de6c90" />
-                            <attribute name="kind" value="class" id="16163" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_name" value="WindowDialog" id="16164" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_default_constructor" value="1" id="16165" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_has_constructor" value="1" id="16166" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_public_constructor" value="1" id="16167" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_has_destructor" value="1" id="16168" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_default_destructor" value="1" id="16169" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_copy_constructor" value="1" id="16170" addr="0x7f99f1de6c90" />
-                            <attribute name="privatebaselist" value="0x7f99f1db2a30" id="16171" addr="0x7f99f1db2a30" />
-                            <attribute name="protectedbaselist" value="0x7f99f1db2a10" id="16172" addr="0x7f99f1db2a10" />
-                            <baselist id="16173" addr="0x7f99f1db29f0" >
-                                <base name="Window" id="16174" addr="0x7f99f1db2970" />
+                    <class id="16155" addr="0x7fca46900af0" >
+                        <attributelist id="16156" addr="0x7fca46900af0" >
+                            <attribute name="name" value="XBMCAddon::xbmcgui::WindowDialog" id="16157" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="16158" addr="0x7fca4698efb0" />
+                            <attribute name="symtab" value="0x7fca46900c90" id="16159" addr="0x7fca46900c90" />
+                            <attribute name="allows_typedef" value="1" id="16160" addr="0x7fca46934c90" />
+                            <attribute name="typepass_visit" value="1" id="16161" addr="0x7fca46934c90" />
+                            <attribute name="allocate_visit" value="1" id="16162" addr="0x7fca46934c90" />
+                            <attribute name="kind" value="class" id="16163" addr="0x7fca46934c90" />
+                            <attribute name="sym_name" value="WindowDialog" id="16164" addr="0x7fca46934c90" />
+                            <attribute name="allocate_default_constructor" value="1" id="16165" addr="0x7fca46934c90" />
+                            <attribute name="allocate_has_constructor" value="1" id="16166" addr="0x7fca46934c90" />
+                            <attribute name="allocate_public_constructor" value="1" id="16167" addr="0x7fca46934c90" />
+                            <attribute name="allocate_has_destructor" value="1" id="16168" addr="0x7fca46934c90" />
+                            <attribute name="allocate_default_destructor" value="1" id="16169" addr="0x7fca46934c90" />
+                            <attribute name="allocate_copy_constructor" value="1" id="16170" addr="0x7fca46934c90" />
+                            <attribute name="privatebaselist" value="0x7fca46900a30" id="16171" addr="0x7fca46900a30" />
+                            <attribute name="protectedbaselist" value="0x7fca46900a10" id="16172" addr="0x7fca46900a10" />
+                            <baselist id="16173" addr="0x7fca469009f0" >
+                                <base name="Window" id="16174" addr="0x7fca46900970" />
                             </baselist >
-                            <attribute name="module" value="xbmcgui" id="16175" addr="0x7f99f1e402f0" />
-                            <attribute name="feature_director" value="1" id="16176" addr="0x7f99f1de6c90" />
-                            <attribute name="bases" value="0x7f99f1de2ed0" id="16177" addr="0x7f99f1de2ed0" />
-                            <attribute name="allbases" value="0x7f99f1de3330" id="16178" addr="0x7f99f1de3330" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="16179" addr="0x7f99f1de6c90" />
-                            <typescope id="16180" addr="0x7f99f1de2e50" >
-                                <attributelist id="16181" addr="0x7f99f1de2e50" >
-                                    <attribute name="inherit" value="0x7f99f1de2f70" id="16182" addr="0x7f99f1de2f70" />
-                                    <attribute name="name" value="WindowDialog" id="16183" addr="0x7f99f1de6c90" />
-                                    <typetab id="16184" addr="0x7f99f1de2e70" >
-                                        <attributelist id="16185" addr="0x7f99f1de2e70" >
+                            <attribute name="module" value="xbmcgui" id="16175" addr="0x7fca4698e2f0" />
+                            <attribute name="feature_director" value="1" id="16176" addr="0x7fca46934c90" />
+                            <attribute name="bases" value="0x7fca46930ed0" id="16177" addr="0x7fca46930ed0" />
+                            <attribute name="allbases" value="0x7fca46931330" id="16178" addr="0x7fca46931330" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="16179" addr="0x7fca46934c90" />
+                            <typescope id="16180" addr="0x7fca46930e50" >
+                                <attributelist id="16181" addr="0x7fca46930e50" >
+                                    <attribute name="inherit" value="0x7fca46930f70" id="16182" addr="0x7fca46930f70" />
+                                    <attribute name="name" value="WindowDialog" id="16183" addr="0x7fca46934c90" />
+                                    <typetab id="16184" addr="0x7fca46930e70" >
+                                        <attributelist id="16185" addr="0x7fca46930e70" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f99f1dd2150" id="16186" addr="0x7f99f1dd2150" />
-                                    <attribute name="qname" value="XBMCAddon::xbmcgui::WindowDialog" id="16187" addr="0x7f99f1de6c90" />
-                                    <attribute name="symtab" value="0x7f99f1db2c90" id="16188" addr="0x7f99f1db2c90" />
+                                    <attribute name="parent" value="0x7fca46920150" id="16186" addr="0x7fca46920150" />
+                                    <attribute name="qname" value="XBMCAddon::xbmcgui::WindowDialog" id="16187" addr="0x7fca46934c90" />
+                                    <attribute name="symtab" value="0x7fca46900c90" id="16188" addr="0x7fca46900c90" />
                                 </attributelist >
-                                <typescopesitem id="16189" addr="0x7f99f1de2f70" >
-                                    <attributelist id="16190" addr="0x7f99f1de2f70" >
+                                <typescopesitem id="16189" addr="0x7fca46930f70" >
+                                    <attributelist id="16190" addr="0x7fca46930f70" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="16191" addr="0x7f99f1de2df0" >
-                                    <attributelist id="16192" addr="0x7f99f1de2df0" >
+                                <typescopesitem id="16191" addr="0x7fca46930df0" >
+                                    <attributelist id="16192" addr="0x7fca46930df0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="16193" addr="0x7f99f1de2e70" >
-                                    <attributelist id="16194" addr="0x7f99f1de2e70" >
+                                <typescopesitem id="16193" addr="0x7fca46930e70" >
+                                    <attributelist id="16194" addr="0x7fca46930e70" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="16195" addr="0x7f99f1dd2150" >
-                                    <attributelist id="16196" addr="0x7f99f1dd2150" >
-                                        <attribute name="name" value="xbmcgui" id="16197" addr="0x7f99f1de6c90" />
-                                        <typetab id="16198" addr="0x7f99f1dd2170" >
-                                            <attributelist id="16199" addr="0x7f99f1dd2170" >
-                                                <attribute name="InterceptorBase" value="InterceptorBase" id="16200" addr="0x7f99f1de6c90" />
-                                                <attribute name="Dialog" value="Dialog" id="16201" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="16202" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="16203" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlTextBox" value="ControlTextBox" id="16204" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="16205" addr="0x7f99f1de6c90" />
-                                                <attribute name="Window" value="Window" id="16206" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="16207" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlList" value="ControlList" id="16208" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="16209" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlImage" value="ControlImage" id="16210" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlButton" value="ControlButton" id="16211" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlGroup" value="ControlGroup" id="16212" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogBusy" value="DialogBusy" id="16213" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="16214" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSpin" value="ControlSpin" id="16215" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlEdit" value="ControlEdit" id="16216" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="16217" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="16218" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlLabel" value="ControlLabel" id="16219" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlProgress" value="ControlProgress" id="16220" addr="0x7f99f1de6c90" />
-                                                <attribute name="Control" value="Control" id="16221" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSlider" value="ControlSlider" id="16222" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgress" value="DialogProgress" id="16223" addr="0x7f99f1de6c90" />
-                                                <attribute name="Action" value="Action" id="16224" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowDialog" value="WindowDialog" id="16225" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXML" value="WindowXML" id="16226" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItem" value="ListItem" id="16227" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="16228" addr="0x7f99f1de6c90" />
+                                <typescopesitem id="16195" addr="0x7fca46920150" >
+                                    <attributelist id="16196" addr="0x7fca46920150" >
+                                        <attribute name="name" value="xbmcgui" id="16197" addr="0x7fca46934c90" />
+                                        <typetab id="16198" addr="0x7fca46920170" >
+                                            <attributelist id="16199" addr="0x7fca46920170" >
+                                                <attribute name="InterceptorBase" value="InterceptorBase" id="16200" addr="0x7fca46934c90" />
+                                                <attribute name="Dialog" value="Dialog" id="16201" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="16202" addr="0x7fca46934c90" />
+                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="16203" addr="0x7fca46934c90" />
+                                                <attribute name="ControlTextBox" value="ControlTextBox" id="16204" addr="0x7fca46934c90" />
+                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="16205" addr="0x7fca46934c90" />
+                                                <attribute name="Window" value="Window" id="16206" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="16207" addr="0x7fca46934c90" />
+                                                <attribute name="ControlList" value="ControlList" id="16208" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="16209" addr="0x7fca46934c90" />
+                                                <attribute name="ControlImage" value="ControlImage" id="16210" addr="0x7fca46934c90" />
+                                                <attribute name="ControlButton" value="ControlButton" id="16211" addr="0x7fca46934c90" />
+                                                <attribute name="ControlGroup" value="ControlGroup" id="16212" addr="0x7fca46934c90" />
+                                                <attribute name="DialogBusy" value="DialogBusy" id="16213" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="16214" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSpin" value="ControlSpin" id="16215" addr="0x7fca46934c90" />
+                                                <attribute name="ControlEdit" value="ControlEdit" id="16216" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="16217" addr="0x7fca46934c90" />
+                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="16218" addr="0x7fca46934c90" />
+                                                <attribute name="ControlLabel" value="ControlLabel" id="16219" addr="0x7fca46934c90" />
+                                                <attribute name="ControlProgress" value="ControlProgress" id="16220" addr="0x7fca46934c90" />
+                                                <attribute name="Control" value="Control" id="16221" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSlider" value="ControlSlider" id="16222" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgress" value="DialogProgress" id="16223" addr="0x7fca46934c90" />
+                                                <attribute name="Action" value="Action" id="16224" addr="0x7fca46934c90" />
+                                                <attribute name="WindowDialog" value="WindowDialog" id="16225" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXML" value="WindowXML" id="16226" addr="0x7fca46934c90" />
+                                                <attribute name="ListItem" value="ListItem" id="16227" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="16228" addr="0x7fca46934c90" />
                                             </attributelist >
-                                            <typetabsitem id="16229" addr="0x7f99f1de1dd0" >
-                                                <attributelist id="16230" addr="0x7f99f1de1dd0" >
+                                            <typetabsitem id="16229" addr="0x7fca4692fdd0" >
+                                                <attributelist id="16230" addr="0x7fca4692fdd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16231" addr="0x7f99f1dde790" >
-                                                <attributelist id="16232" addr="0x7f99f1dde790" >
+                                            <typetabsitem id="16231" addr="0x7fca4692c790" >
+                                                <attributelist id="16232" addr="0x7fca4692c790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16233" addr="0x7f99f1de3f10" >
-                                                <attributelist id="16234" addr="0x7f99f1de3f10" >
+                                            <typetabsitem id="16233" addr="0x7fca46931f10" >
+                                                <attributelist id="16234" addr="0x7fca46931f10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16235" addr="0x7f99f1dd67b0" >
-                                                <attributelist id="16236" addr="0x7f99f1dd67b0" >
+                                            <typetabsitem id="16235" addr="0x7fca469247b0" >
+                                                <attributelist id="16236" addr="0x7fca469247b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16237" addr="0x7f99f1ddafd0" >
-                                                <attributelist id="16238" addr="0x7f99f1ddafd0" >
+                                            <typetabsitem id="16237" addr="0x7fca46928fd0" >
+                                                <attributelist id="16238" addr="0x7fca46928fd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16239" addr="0x7f99f1ddd430" >
-                                                <attributelist id="16240" addr="0x7f99f1ddd430" >
+                                            <typetabsitem id="16239" addr="0x7fca4692b430" >
+                                                <attributelist id="16240" addr="0x7fca4692b430" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16241" addr="0x7f99f1de2130" >
-                                                <attributelist id="16242" addr="0x7f99f1de2130" >
+                                            <typetabsitem id="16241" addr="0x7fca46930130" >
+                                                <attributelist id="16242" addr="0x7fca46930130" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16243" addr="0x7f99f1dd2f50" >
-                                                <attributelist id="16244" addr="0x7f99f1dd2f50" >
+                                            <typetabsitem id="16243" addr="0x7fca46920f50" >
+                                                <attributelist id="16244" addr="0x7fca46920f50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16245" addr="0x7f99f1dd9650" >
-                                                <attributelist id="16246" addr="0x7f99f1dd9650" >
+                                            <typetabsitem id="16245" addr="0x7fca46927650" >
+                                                <attributelist id="16246" addr="0x7fca46927650" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16247" addr="0x7f99f1de3390" >
-                                                <attributelist id="16248" addr="0x7f99f1de3390" >
+                                            <typetabsitem id="16247" addr="0x7fca46931390" >
+                                                <attributelist id="16248" addr="0x7fca46931390" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16249" addr="0x7f99f1ddb7b0" >
-                                                <attributelist id="16250" addr="0x7f99f1ddb7b0" >
+                                            <typetabsitem id="16249" addr="0x7fca469297b0" >
+                                                <attributelist id="16250" addr="0x7fca469297b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16251" addr="0x7f99f1ddc4b0" >
-                                                <attributelist id="16252" addr="0x7f99f1ddc4b0" >
+                                            <typetabsitem id="16251" addr="0x7fca4692a4b0" >
+                                                <attributelist id="16252" addr="0x7fca4692a4b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16253" addr="0x7f99f1ddcf90" >
-                                                <attributelist id="16254" addr="0x7f99f1ddcf90" >
+                                            <typetabsitem id="16253" addr="0x7fca4692af90" >
+                                                <attributelist id="16254" addr="0x7fca4692af90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16255" addr="0x7f99f1de11b0" >
-                                                <attributelist id="16256" addr="0x7f99f1de11b0" >
+                                            <typetabsitem id="16255" addr="0x7fca4692f1b0" >
+                                                <attributelist id="16256" addr="0x7fca4692f1b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16257" addr="0x7f99f1de15b0" >
-                                                <attributelist id="16258" addr="0x7f99f1de15b0" >
+                                            <typetabsitem id="16257" addr="0x7fca4692f5b0" >
+                                                <attributelist id="16258" addr="0x7fca4692f5b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16259" addr="0x7f99f1dd77f0" >
-                                                <attributelist id="16260" addr="0x7f99f1dd77f0" >
+                                            <typetabsitem id="16259" addr="0x7fca469257f0" >
+                                                <attributelist id="16260" addr="0x7fca469257f0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16261" addr="0x7f99f1dd8b30" >
-                                                <attributelist id="16262" addr="0x7f99f1dd8b30" >
+                                            <typetabsitem id="16261" addr="0x7fca46926b30" >
+                                                <attributelist id="16262" addr="0x7fca46926b30" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16263" addr="0x7f99f1dd2c50" >
-                                                <attributelist id="16264" addr="0x7f99f1dd2c50" >
+                                            <typetabsitem id="16263" addr="0x7fca46920c50" >
+                                                <attributelist id="16264" addr="0x7fca46920c50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16265" addr="0x7f99f1dda790" >
-                                                <attributelist id="16266" addr="0x7f99f1dda790" >
+                                            <typetabsitem id="16265" addr="0x7fca46928790" >
+                                                <attributelist id="16266" addr="0x7fca46928790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16267" addr="0x7f99f1dd8030" >
-                                                <attributelist id="16268" addr="0x7f99f1dd8030" >
+                                            <typetabsitem id="16267" addr="0x7fca46926030" >
+                                                <attributelist id="16268" addr="0x7fca46926030" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16269" addr="0x7f99f1ddbe10" >
-                                                <attributelist id="16270" addr="0x7f99f1ddbe10" >
+                                            <typetabsitem id="16269" addr="0x7fca46929e10" >
+                                                <attributelist id="16270" addr="0x7fca46929e10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16271" addr="0x7f99f1dd6b10" >
-                                                <attributelist id="16272" addr="0x7f99f1dd6b10" >
+                                            <typetabsitem id="16271" addr="0x7fca46924b10" >
+                                                <attributelist id="16272" addr="0x7fca46924b10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16273" addr="0x7f99f1dddf90" >
-                                                <attributelist id="16274" addr="0x7f99f1dddf90" >
+                                            <typetabsitem id="16273" addr="0x7fca4692bf90" >
+                                                <attributelist id="16274" addr="0x7fca4692bf90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16275" addr="0x7f99f1de0530" >
-                                                <attributelist id="16276" addr="0x7f99f1de0530" >
+                                            <typetabsitem id="16275" addr="0x7fca4692e530" >
+                                                <attributelist id="16276" addr="0x7fca4692e530" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16277" addr="0x7f99f1de1e50" >
-                                                <attributelist id="16278" addr="0x7f99f1de1e50" >
+                                            <typetabsitem id="16277" addr="0x7fca4692fe50" >
+                                                <attributelist id="16278" addr="0x7fca4692fe50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16279" addr="0x7f99f1de2d90" >
-                                                <attributelist id="16280" addr="0x7f99f1de2d90" >
+                                            <typetabsitem id="16279" addr="0x7fca46930d90" >
+                                                <attributelist id="16280" addr="0x7fca46930d90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16281" addr="0x7f99f1de3410" >
-                                                <attributelist id="16282" addr="0x7f99f1de3410" >
+                                            <typetabsitem id="16281" addr="0x7fca46931410" >
+                                                <attributelist id="16282" addr="0x7fca46931410" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16283" addr="0x7f99f1dd3590" >
-                                                <attributelist id="16284" addr="0x7f99f1dd3590" >
+                                            <typetabsitem id="16283" addr="0x7fca46921590" >
+                                                <attributelist id="16284" addr="0x7fca46921590" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16285" addr="0x7f99f1dd3390" >
-                                                <attributelist id="16286" addr="0x7f99f1dd3390" >
+                                            <typetabsitem id="16285" addr="0x7fca46921390" >
+                                                <attributelist id="16286" addr="0x7fca46921390" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7f99f1dd1d70" id="16287" addr="0x7f99f1dd1d70" />
-                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="16288" addr="0x7f99f1de6c90" />
-                                        <attribute name="symtab" value="0x7f99f1e40fb0" id="16289" addr="0x7f99f1e40fb0" />
+                                        <attribute name="parent" value="0x7fca4691fd70" id="16287" addr="0x7fca4691fd70" />
+                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="16288" addr="0x7fca46934c90" />
+                                        <attribute name="symtab" value="0x7fca4698efb0" id="16289" addr="0x7fca4698efb0" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="16290" addr="0x7f99f1de2e90" >
-                                    <attributelist id="16291" addr="0x7f99f1de2e90" >
+                                <typescopesitem id="16290" addr="0x7fca46930e90" >
+                                    <attributelist id="16291" addr="0x7fca46930e90" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="16292" addr="0x7f99f1db2c90" >
-                                    <attributelist id="16293" addr="0x7f99f1db2c90" >
-                                        <attribute name="inherit" value="0x7f99f1db2d10" id="16294" addr="0x7f99f1db2d10" />
-                                        <attribute name="name" value="WindowDialog" id="16295" addr="0x7f99f1de6c90" />
-                                        <attribute name="csymtab" value="0x7f99f1db2c10" id="16296" addr="0x7f99f1db2c10" />
-                                        <attribute name="symtab" value="0x7f99f1db2c30" id="16297" addr="0x7f99f1db2c30" />
+                                <typescopesitem id="16292" addr="0x7fca46900c90" >
+                                    <attributelist id="16293" addr="0x7fca46900c90" >
+                                        <attribute name="inherit" value="0x7fca46900d10" id="16294" addr="0x7fca46900d10" />
+                                        <attribute name="name" value="WindowDialog" id="16295" addr="0x7fca46934c90" />
+                                        <attribute name="csymtab" value="0x7fca46900c10" id="16296" addr="0x7fca46900c10" />
+                                        <attribute name="symtab" value="0x7fca46900c30" id="16297" addr="0x7fca46900c30" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <access id="16298" addr="0x7f99f1db2bd0" >
-                            <attributelist id="16299" addr="0x7f99f1db2bd0" >
-                                <attribute name="kind" value="public" id="16300" addr="0x7f99f1de6c90" />
+                        <access id="16298" addr="0x7fca46900bd0" >
+                            <attributelist id="16299" addr="0x7fca46900bd0" >
+                                <attribute name="kind" value="public" id="16300" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="16301" addr="0x7f99f1db2e10" >
-                            <attributelist id="16302" addr="0x7f99f1db2e10" >
-                                <attribute name="name" value="WindowDialog" id="16303" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="16304" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1db2c90" id="16305" addr="0x7f99f1db2c90" />
-                                <attribute name="sym_name" value="WindowDialog" id="16306" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="16307" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="16308" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_director" value="1" id="16309" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_python_nokwds" value="true" id="16310" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="16311" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="16312" addr="0x7f99f1de6c90" />
+                        <constructor id="16301" addr="0x7fca46900e10" >
+                            <attributelist id="16302" addr="0x7fca46900e10" >
+                                <attribute name="name" value="WindowDialog" id="16303" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="16304" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca46900c90" id="16305" addr="0x7fca46900c90" />
+                                <attribute name="sym_name" value="WindowDialog" id="16306" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="16307" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="16308" addr="0x7fca46934c90" />
+                                <attribute name="feature_director" value="1" id="16309" addr="0x7fca46934c90" />
+                                <attribute name="feature_python_nokwds" value="true" id="16310" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="16311" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="16312" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <destructor id="16313" addr="0x7f99f1db2fb0" >
-                            <attributelist id="16314" addr="0x7f99f1db2fb0" >
-                                <attribute name="ismember" value="1" id="16315" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="~WindowDialog" id="16316" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="~WindowDialog" id="16317" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="16318" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="16319" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1db2c90" id="16320" addr="0x7f99f1db2c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="16321" addr="0x7f99f1de6c90" />
+                        <destructor id="16313" addr="0x7fca46900fb0" >
+                            <attributelist id="16314" addr="0x7fca46900fb0" >
+                                <attribute name="ismember" value="1" id="16315" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="~WindowDialog" id="16316" addr="0x7fca46934c90" />
+                                <attribute name="name" value="~WindowDialog" id="16317" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="16318" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="16319" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca46900c90" id="16320" addr="0x7fca46900c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="16321" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </destructor >
@@ -23179,1390 +23179,1390 @@
                 </namespace >
             </namespace >
         </include >
-        <include id="16322" addr="0x7f99f1db31b0" >
-            <attributelist id="16323" addr="0x7f99f1db31b0" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/WindowXML.h" id="16324" addr="0x7f99f1de6c90" />
+        <include id="16322" addr="0x7fca469011b0" >
+            <attributelist id="16323" addr="0x7fca469011b0" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/WindowXML.h" id="16324" addr="0x7fca46934c90" />
             </attributelist >
 
-            <namespace id="16325" addr="0x7f99f1db3250" >
-                <attributelist id="16326" addr="0x7f99f1db3250" >
-                    <attribute name="sym_name" value="XBMCAddon" id="16327" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="XBMCAddon" id="16328" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_previousSibling" value="0x7f99f1db2850" id="16329" addr="0x7f99f1db2850" />
-                    <typescope id="16330" addr="0x7f99f1dd1d70" >
-                        <attributelist id="16331" addr="0x7f99f1dd1d70" >
-                            <attribute name="name" value="XBMCAddon" id="16332" addr="0x7f99f1de6c90" />
-                            <typetab id="16333" addr="0x7f99f1dd1db0" >
-                                <attributelist id="16334" addr="0x7f99f1dd1db0" >
-                                    <attribute name="Dictionary" value="Dictionary" id="16335" addr="0x7f99f1de6c90" />
-                                    <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="16336" addr="0x7f99f1de6c90" />
-                                    <attribute name="String" value="std::string" id="16337" addr="0x7f99f1de6c90" />
-                                    <attribute name="StringOrInt" value="XBMCAddon::String" id="16338" addr="0x7f99f1de6c90" />
+            <namespace id="16325" addr="0x7fca46901250" >
+                <attributelist id="16326" addr="0x7fca46901250" >
+                    <attribute name="sym_name" value="XBMCAddon" id="16327" addr="0x7fca46934c90" />
+                    <attribute name="name" value="XBMCAddon" id="16328" addr="0x7fca46934c90" />
+                    <attribute name="sym_previousSibling" value="0x7fca46900850" id="16329" addr="0x7fca46900850" />
+                    <typescope id="16330" addr="0x7fca4691fd70" >
+                        <attributelist id="16331" addr="0x7fca4691fd70" >
+                            <attribute name="name" value="XBMCAddon" id="16332" addr="0x7fca46934c90" />
+                            <typetab id="16333" addr="0x7fca4691fdb0" >
+                                <attributelist id="16334" addr="0x7fca4691fdb0" >
+                                    <attribute name="Dictionary" value="Dictionary" id="16335" addr="0x7fca46934c90" />
+                                    <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="16336" addr="0x7fca46934c90" />
+                                    <attribute name="String" value="std::string" id="16337" addr="0x7fca46934c90" />
+                                    <attribute name="StringOrInt" value="XBMCAddon::String" id="16338" addr="0x7fca46934c90" />
                                 </attributelist >
-                                <typetabsitem id="16339" addr="0x7f99f1dd28b0" >
-                                    <attributelist id="16340" addr="0x7f99f1dd28b0" >
+                                <typetabsitem id="16339" addr="0x7fca469208b0" >
+                                    <attributelist id="16340" addr="0x7fca469208b0" >
                                     </attributelist >
                                 </typetabsitem >
-                                <typetabsitem id="16341" addr="0x7f99f1dd2910" >
-                                    <attributelist id="16342" addr="0x7f99f1dd2910" >
+                                <typetabsitem id="16341" addr="0x7fca46920910" >
+                                    <attributelist id="16342" addr="0x7fca46920910" >
                                     </attributelist >
                                 </typetabsitem >
-                                <typetabsitem id="16343" addr="0x7f99f1dd1f90" >
-                                    <attributelist id="16344" addr="0x7f99f1dd1f90" >
+                                <typetabsitem id="16343" addr="0x7fca4691ff90" >
+                                    <attributelist id="16344" addr="0x7fca4691ff90" >
                                     </attributelist >
                                 </typetabsitem >
-                                <typetabsitem id="16345" addr="0x7f99f1dd2710" >
-                                    <attributelist id="16346" addr="0x7f99f1dd2710" >
+                                <typetabsitem id="16345" addr="0x7fca46920710" >
+                                    <attributelist id="16346" addr="0x7fca46920710" >
                                     </attributelist >
                                 </typetabsitem >
                             </typetab >
-                            <attribute name="parent" value="0x7f99f1e1da30" id="16347" addr="0x7f99f1e1da30" />
-                            <attribute name="qname" value="XBMCAddon" id="16348" addr="0x7f99f1de6c90" />
-                            <attribute name="symtab" value="0x7f99f1e408b0" id="16349" addr="0x7f99f1e408b0" />
+                            <attribute name="parent" value="0x7fca4696ba30" id="16347" addr="0x7fca4696ba30" />
+                            <attribute name="qname" value="XBMCAddon" id="16348" addr="0x7fca46934c90" />
+                            <attribute name="symtab" value="0x7fca4698e8b0" id="16349" addr="0x7fca4698e8b0" />
                         </attributelist >
-                        <typescopesitem id="16350" addr="0x7f99f1e40870" >
-                            <attributelist id="16351" addr="0x7f99f1e40870" >
+                        <typescopesitem id="16350" addr="0x7fca4698e870" >
+                            <attributelist id="16351" addr="0x7fca4698e870" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="16352" addr="0x7f99f1dd1db0" >
-                            <attributelist id="16353" addr="0x7f99f1dd1db0" >
-                                <attribute name="Dictionary" value="Dictionary" id="16354" addr="0x7f99f1de6c90" />
-                                <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="16355" addr="0x7f99f1de6c90" />
-                                <attribute name="String" value="std::string" id="16356" addr="0x7f99f1de6c90" />
-                                <attribute name="StringOrInt" value="XBMCAddon::String" id="16357" addr="0x7f99f1de6c90" />
+                        <typescopesitem id="16352" addr="0x7fca4691fdb0" >
+                            <attributelist id="16353" addr="0x7fca4691fdb0" >
+                                <attribute name="Dictionary" value="Dictionary" id="16354" addr="0x7fca46934c90" />
+                                <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="16355" addr="0x7fca46934c90" />
+                                <attribute name="String" value="std::string" id="16356" addr="0x7fca46934c90" />
+                                <attribute name="StringOrInt" value="XBMCAddon::String" id="16357" addr="0x7fca46934c90" />
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="16358" addr="0x7f99f1e1da30" >
-                            <attributelist id="16359" addr="0x7f99f1e1da30" >
-                                <attribute name="name" value="" id="16360" addr="0x7f99f1de6c90" />
-                                <typetab id="16361" addr="0x7f99f1e1da90" >
-                                    <attributelist id="16362" addr="0x7f99f1e1da90" >
+                        <typescopesitem id="16358" addr="0x7fca4696ba30" >
+                            <attributelist id="16359" addr="0x7fca4696ba30" >
+                                <attribute name="name" value="" id="16360" addr="0x7fca46934c90" />
+                                <typetab id="16361" addr="0x7fca4696ba90" >
+                                    <attributelist id="16362" addr="0x7fca4696ba90" >
                                     </attributelist >
                                 </typetab >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="16363" addr="0x7f99f1dd1eb0" >
-                            <attributelist id="16364" addr="0x7f99f1dd1eb0" >
+                        <typescopesitem id="16363" addr="0x7fca4691feb0" >
+                            <attributelist id="16364" addr="0x7fca4691feb0" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="16365" addr="0x7f99f1e408b0" >
-                            <attributelist id="16366" addr="0x7f99f1e408b0" >
-                                <attribute name="name" value="XBMCAddon" id="16367" addr="0x7f99f1de6c90" />
-                                <attribute name="csymtab" value="0x7f99f1e408f0" id="16368" addr="0x7f99f1e408f0" />
-                                <attribute name="symtab" value="0x7f99f1e40890" id="16369" addr="0x7f99f1e40890" />
+                        <typescopesitem id="16365" addr="0x7fca4698e8b0" >
+                            <attributelist id="16366" addr="0x7fca4698e8b0" >
+                                <attribute name="name" value="XBMCAddon" id="16367" addr="0x7fca46934c90" />
+                                <attribute name="csymtab" value="0x7fca4698e8f0" id="16368" addr="0x7fca4698e8f0" />
+                                <attribute name="symtab" value="0x7fca4698e890" id="16369" addr="0x7fca4698e890" />
                             </attributelist >
                         </typescopesitem >
                     </typescope >
-                    <attribute name="symtab" value="0x7f99f1e408b0" id="16370" addr="0x7f99f1e408b0" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="16371" addr="0x7f99f1e1d950" />
+                    <attribute name="symtab" value="0x7fca4698e8b0" id="16370" addr="0x7fca4698e8b0" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="16371" addr="0x7fca4696b950" />
                 </attributelist >
 
-                <namespace id="16372" addr="0x7f99f1db32d0" >
-                    <attributelist id="16373" addr="0x7f99f1db32d0" >
-                        <attribute name="sym_name" value="xbmcgui" id="16374" addr="0x7f99f1de6c90" />
-                        <attribute name="name" value="xbmcgui" id="16375" addr="0x7f99f1de6c90" />
-                        <attribute name="feature_knownbasetypes" value="AddonClass,AddonCallback" id="16376" addr="0x7f99f1de6c90" />
-                        <attribute name="feature_knownapitypes" value="XBMCAddon::xbmc::InfoTagVideo,xbmc::InfoTagMusic" id="16377" addr="0x7f99f1de6c90" />
-                        <attribute name="sym_previousSibling" value="0x7f99f1db28d0" id="16378" addr="0x7f99f1db28d0" />
-                        <typescope id="16379" addr="0x7f99f1dd2150" >
-                            <attributelist id="16380" addr="0x7f99f1dd2150" >
-                                <attribute name="name" value="xbmcgui" id="16381" addr="0x7f99f1de6c90" />
-                                <typetab id="16382" addr="0x7f99f1dd2170" >
-                                    <attributelist id="16383" addr="0x7f99f1dd2170" >
-                                        <attribute name="InterceptorBase" value="InterceptorBase" id="16384" addr="0x7f99f1de6c90" />
-                                        <attribute name="Dialog" value="Dialog" id="16385" addr="0x7f99f1de6c90" />
-                                        <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="16386" addr="0x7f99f1de6c90" />
-                                        <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="16387" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlTextBox" value="ControlTextBox" id="16388" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlRadioButton" value="ControlRadioButton" id="16389" addr="0x7f99f1de6c90" />
-                                        <attribute name="Window" value="Window" id="16390" addr="0x7f99f1de6c90" />
-                                        <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="16391" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlList" value="ControlList" id="16392" addr="0x7f99f1de6c90" />
-                                        <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="16393" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlImage" value="ControlImage" id="16394" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlButton" value="ControlButton" id="16395" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlGroup" value="ControlGroup" id="16396" addr="0x7f99f1de6c90" />
-                                        <attribute name="DialogBusy" value="DialogBusy" id="16397" addr="0x7f99f1de6c90" />
-                                        <attribute name="DialogProgressBG" value="DialogProgressBG" id="16398" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlSpin" value="ControlSpin" id="16399" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlEdit" value="ControlEdit" id="16400" addr="0x7f99f1de6c90" />
-                                        <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="16401" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="16402" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlLabel" value="ControlLabel" id="16403" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlProgress" value="ControlProgress" id="16404" addr="0x7f99f1de6c90" />
-                                        <attribute name="Control" value="Control" id="16405" addr="0x7f99f1de6c90" />
-                                        <attribute name="ControlSlider" value="ControlSlider" id="16406" addr="0x7f99f1de6c90" />
-                                        <attribute name="DialogProgress" value="DialogProgress" id="16407" addr="0x7f99f1de6c90" />
-                                        <attribute name="Action" value="Action" id="16408" addr="0x7f99f1de6c90" />
-                                        <attribute name="WindowDialog" value="WindowDialog" id="16409" addr="0x7f99f1de6c90" />
-                                        <attribute name="WindowXML" value="WindowXML" id="16410" addr="0x7f99f1de6c90" />
-                                        <attribute name="ListItem" value="ListItem" id="16411" addr="0x7f99f1de6c90" />
-                                        <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="16412" addr="0x7f99f1de6c90" />
+                <namespace id="16372" addr="0x7fca469012d0" >
+                    <attributelist id="16373" addr="0x7fca469012d0" >
+                        <attribute name="sym_name" value="xbmcgui" id="16374" addr="0x7fca46934c90" />
+                        <attribute name="name" value="xbmcgui" id="16375" addr="0x7fca46934c90" />
+                        <attribute name="feature_knownbasetypes" value="AddonClass,AddonCallback" id="16376" addr="0x7fca46934c90" />
+                        <attribute name="feature_knownapitypes" value="XBMCAddon::xbmc::InfoTagVideo,xbmc::InfoTagMusic" id="16377" addr="0x7fca46934c90" />
+                        <attribute name="sym_previousSibling" value="0x7fca469008d0" id="16378" addr="0x7fca469008d0" />
+                        <typescope id="16379" addr="0x7fca46920150" >
+                            <attributelist id="16380" addr="0x7fca46920150" >
+                                <attribute name="name" value="xbmcgui" id="16381" addr="0x7fca46934c90" />
+                                <typetab id="16382" addr="0x7fca46920170" >
+                                    <attributelist id="16383" addr="0x7fca46920170" >
+                                        <attribute name="InterceptorBase" value="InterceptorBase" id="16384" addr="0x7fca46934c90" />
+                                        <attribute name="Dialog" value="Dialog" id="16385" addr="0x7fca46934c90" />
+                                        <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="16386" addr="0x7fca46934c90" />
+                                        <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="16387" addr="0x7fca46934c90" />
+                                        <attribute name="ControlTextBox" value="ControlTextBox" id="16388" addr="0x7fca46934c90" />
+                                        <attribute name="ControlRadioButton" value="ControlRadioButton" id="16389" addr="0x7fca46934c90" />
+                                        <attribute name="Window" value="Window" id="16390" addr="0x7fca46934c90" />
+                                        <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="16391" addr="0x7fca46934c90" />
+                                        <attribute name="ControlList" value="ControlList" id="16392" addr="0x7fca46934c90" />
+                                        <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="16393" addr="0x7fca46934c90" />
+                                        <attribute name="ControlImage" value="ControlImage" id="16394" addr="0x7fca46934c90" />
+                                        <attribute name="ControlButton" value="ControlButton" id="16395" addr="0x7fca46934c90" />
+                                        <attribute name="ControlGroup" value="ControlGroup" id="16396" addr="0x7fca46934c90" />
+                                        <attribute name="DialogBusy" value="DialogBusy" id="16397" addr="0x7fca46934c90" />
+                                        <attribute name="DialogProgressBG" value="DialogProgressBG" id="16398" addr="0x7fca46934c90" />
+                                        <attribute name="ControlSpin" value="ControlSpin" id="16399" addr="0x7fca46934c90" />
+                                        <attribute name="ControlEdit" value="ControlEdit" id="16400" addr="0x7fca46934c90" />
+                                        <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="16401" addr="0x7fca46934c90" />
+                                        <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="16402" addr="0x7fca46934c90" />
+                                        <attribute name="ControlLabel" value="ControlLabel" id="16403" addr="0x7fca46934c90" />
+                                        <attribute name="ControlProgress" value="ControlProgress" id="16404" addr="0x7fca46934c90" />
+                                        <attribute name="Control" value="Control" id="16405" addr="0x7fca46934c90" />
+                                        <attribute name="ControlSlider" value="ControlSlider" id="16406" addr="0x7fca46934c90" />
+                                        <attribute name="DialogProgress" value="DialogProgress" id="16407" addr="0x7fca46934c90" />
+                                        <attribute name="Action" value="Action" id="16408" addr="0x7fca46934c90" />
+                                        <attribute name="WindowDialog" value="WindowDialog" id="16409" addr="0x7fca46934c90" />
+                                        <attribute name="WindowXML" value="WindowXML" id="16410" addr="0x7fca46934c90" />
+                                        <attribute name="ListItem" value="ListItem" id="16411" addr="0x7fca46934c90" />
+                                        <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="16412" addr="0x7fca46934c90" />
                                     </attributelist >
-                                    <typetabsitem id="16413" addr="0x7f99f1de1dd0" >
-                                        <attributelist id="16414" addr="0x7f99f1de1dd0" >
+                                    <typetabsitem id="16413" addr="0x7fca4692fdd0" >
+                                        <attributelist id="16414" addr="0x7fca4692fdd0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16415" addr="0x7f99f1dde790" >
-                                        <attributelist id="16416" addr="0x7f99f1dde790" >
+                                    <typetabsitem id="16415" addr="0x7fca4692c790" >
+                                        <attributelist id="16416" addr="0x7fca4692c790" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16417" addr="0x7f99f1de3f10" >
-                                        <attributelist id="16418" addr="0x7f99f1de3f10" >
+                                    <typetabsitem id="16417" addr="0x7fca46931f10" >
+                                        <attributelist id="16418" addr="0x7fca46931f10" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16419" addr="0x7f99f1dd67b0" >
-                                        <attributelist id="16420" addr="0x7f99f1dd67b0" >
+                                    <typetabsitem id="16419" addr="0x7fca469247b0" >
+                                        <attributelist id="16420" addr="0x7fca469247b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16421" addr="0x7f99f1ddafd0" >
-                                        <attributelist id="16422" addr="0x7f99f1ddafd0" >
+                                    <typetabsitem id="16421" addr="0x7fca46928fd0" >
+                                        <attributelist id="16422" addr="0x7fca46928fd0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16423" addr="0x7f99f1ddd430" >
-                                        <attributelist id="16424" addr="0x7f99f1ddd430" >
+                                    <typetabsitem id="16423" addr="0x7fca4692b430" >
+                                        <attributelist id="16424" addr="0x7fca4692b430" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16425" addr="0x7f99f1de2130" >
-                                        <attributelist id="16426" addr="0x7f99f1de2130" >
+                                    <typetabsitem id="16425" addr="0x7fca46930130" >
+                                        <attributelist id="16426" addr="0x7fca46930130" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16427" addr="0x7f99f1dd2f50" >
-                                        <attributelist id="16428" addr="0x7f99f1dd2f50" >
+                                    <typetabsitem id="16427" addr="0x7fca46920f50" >
+                                        <attributelist id="16428" addr="0x7fca46920f50" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16429" addr="0x7f99f1dd9650" >
-                                        <attributelist id="16430" addr="0x7f99f1dd9650" >
+                                    <typetabsitem id="16429" addr="0x7fca46927650" >
+                                        <attributelist id="16430" addr="0x7fca46927650" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16431" addr="0x7f99f1de3390" >
-                                        <attributelist id="16432" addr="0x7f99f1de3390" >
+                                    <typetabsitem id="16431" addr="0x7fca46931390" >
+                                        <attributelist id="16432" addr="0x7fca46931390" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16433" addr="0x7f99f1ddb7b0" >
-                                        <attributelist id="16434" addr="0x7f99f1ddb7b0" >
+                                    <typetabsitem id="16433" addr="0x7fca469297b0" >
+                                        <attributelist id="16434" addr="0x7fca469297b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16435" addr="0x7f99f1ddc4b0" >
-                                        <attributelist id="16436" addr="0x7f99f1ddc4b0" >
+                                    <typetabsitem id="16435" addr="0x7fca4692a4b0" >
+                                        <attributelist id="16436" addr="0x7fca4692a4b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16437" addr="0x7f99f1ddcf90" >
-                                        <attributelist id="16438" addr="0x7f99f1ddcf90" >
+                                    <typetabsitem id="16437" addr="0x7fca4692af90" >
+                                        <attributelist id="16438" addr="0x7fca4692af90" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16439" addr="0x7f99f1de11b0" >
-                                        <attributelist id="16440" addr="0x7f99f1de11b0" >
+                                    <typetabsitem id="16439" addr="0x7fca4692f1b0" >
+                                        <attributelist id="16440" addr="0x7fca4692f1b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16441" addr="0x7f99f1de15b0" >
-                                        <attributelist id="16442" addr="0x7f99f1de15b0" >
+                                    <typetabsitem id="16441" addr="0x7fca4692f5b0" >
+                                        <attributelist id="16442" addr="0x7fca4692f5b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16443" addr="0x7f99f1dd77f0" >
-                                        <attributelist id="16444" addr="0x7f99f1dd77f0" >
+                                    <typetabsitem id="16443" addr="0x7fca469257f0" >
+                                        <attributelist id="16444" addr="0x7fca469257f0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16445" addr="0x7f99f1dd8b30" >
-                                        <attributelist id="16446" addr="0x7f99f1dd8b30" >
+                                    <typetabsitem id="16445" addr="0x7fca46926b30" >
+                                        <attributelist id="16446" addr="0x7fca46926b30" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16447" addr="0x7f99f1dd2c50" >
-                                        <attributelist id="16448" addr="0x7f99f1dd2c50" >
+                                    <typetabsitem id="16447" addr="0x7fca46920c50" >
+                                        <attributelist id="16448" addr="0x7fca46920c50" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16449" addr="0x7f99f1dda790" >
-                                        <attributelist id="16450" addr="0x7f99f1dda790" >
+                                    <typetabsitem id="16449" addr="0x7fca46928790" >
+                                        <attributelist id="16450" addr="0x7fca46928790" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16451" addr="0x7f99f1dd8030" >
-                                        <attributelist id="16452" addr="0x7f99f1dd8030" >
+                                    <typetabsitem id="16451" addr="0x7fca46926030" >
+                                        <attributelist id="16452" addr="0x7fca46926030" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16453" addr="0x7f99f1ddbe10" >
-                                        <attributelist id="16454" addr="0x7f99f1ddbe10" >
+                                    <typetabsitem id="16453" addr="0x7fca46929e10" >
+                                        <attributelist id="16454" addr="0x7fca46929e10" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16455" addr="0x7f99f1dd6b10" >
-                                        <attributelist id="16456" addr="0x7f99f1dd6b10" >
+                                    <typetabsitem id="16455" addr="0x7fca46924b10" >
+                                        <attributelist id="16456" addr="0x7fca46924b10" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16457" addr="0x7f99f1dddf90" >
-                                        <attributelist id="16458" addr="0x7f99f1dddf90" >
+                                    <typetabsitem id="16457" addr="0x7fca4692bf90" >
+                                        <attributelist id="16458" addr="0x7fca4692bf90" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16459" addr="0x7f99f1de0530" >
-                                        <attributelist id="16460" addr="0x7f99f1de0530" >
+                                    <typetabsitem id="16459" addr="0x7fca4692e530" >
+                                        <attributelist id="16460" addr="0x7fca4692e530" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16461" addr="0x7f99f1de1e50" >
-                                        <attributelist id="16462" addr="0x7f99f1de1e50" >
+                                    <typetabsitem id="16461" addr="0x7fca4692fe50" >
+                                        <attributelist id="16462" addr="0x7fca4692fe50" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16463" addr="0x7f99f1de2d90" >
-                                        <attributelist id="16464" addr="0x7f99f1de2d90" >
+                                    <typetabsitem id="16463" addr="0x7fca46930d90" >
+                                        <attributelist id="16464" addr="0x7fca46930d90" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16465" addr="0x7f99f1de3410" >
-                                        <attributelist id="16466" addr="0x7f99f1de3410" >
+                                    <typetabsitem id="16465" addr="0x7fca46931410" >
+                                        <attributelist id="16466" addr="0x7fca46931410" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16467" addr="0x7f99f1dd3590" >
-                                        <attributelist id="16468" addr="0x7f99f1dd3590" >
+                                    <typetabsitem id="16467" addr="0x7fca46921590" >
+                                        <attributelist id="16468" addr="0x7fca46921590" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="16469" addr="0x7f99f1dd3390" >
-                                        <attributelist id="16470" addr="0x7f99f1dd3390" >
+                                    <typetabsitem id="16469" addr="0x7fca46921390" >
+                                        <attributelist id="16470" addr="0x7fca46921390" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
-                                <attribute name="parent" value="0x7f99f1dd1d70" id="16471" addr="0x7f99f1dd1d70" />
-                                <attribute name="qname" value="XBMCAddon::xbmcgui" id="16472" addr="0x7f99f1de6c90" />
-                                <attribute name="symtab" value="0x7f99f1e40fb0" id="16473" addr="0x7f99f1e40fb0" />
+                                <attribute name="parent" value="0x7fca4691fd70" id="16471" addr="0x7fca4691fd70" />
+                                <attribute name="qname" value="XBMCAddon::xbmcgui" id="16472" addr="0x7fca46934c90" />
+                                <attribute name="symtab" value="0x7fca4698efb0" id="16473" addr="0x7fca4698efb0" />
                             </attributelist >
-                            <typescopesitem id="16474" addr="0x7f99f1e40f70" >
-                                <attributelist id="16475" addr="0x7f99f1e40f70" >
+                            <typescopesitem id="16474" addr="0x7fca4698ef70" >
+                                <attributelist id="16475" addr="0x7fca4698ef70" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="16476" addr="0x7f99f1dd2170" >
-                                <attributelist id="16477" addr="0x7f99f1dd2170" >
-                                    <attribute name="InterceptorBase" value="InterceptorBase" id="16478" addr="0x7f99f1de6c90" />
-                                    <attribute name="Dialog" value="Dialog" id="16479" addr="0x7f99f1de6c90" />
-                                    <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="16480" addr="0x7f99f1de6c90" />
-                                    <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="16481" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlTextBox" value="ControlTextBox" id="16482" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlRadioButton" value="ControlRadioButton" id="16483" addr="0x7f99f1de6c90" />
-                                    <attribute name="Window" value="Window" id="16484" addr="0x7f99f1de6c90" />
-                                    <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="16485" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlList" value="ControlList" id="16486" addr="0x7f99f1de6c90" />
-                                    <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="16487" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlImage" value="ControlImage" id="16488" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlButton" value="ControlButton" id="16489" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlGroup" value="ControlGroup" id="16490" addr="0x7f99f1de6c90" />
-                                    <attribute name="DialogBusy" value="DialogBusy" id="16491" addr="0x7f99f1de6c90" />
-                                    <attribute name="DialogProgressBG" value="DialogProgressBG" id="16492" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlSpin" value="ControlSpin" id="16493" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlEdit" value="ControlEdit" id="16494" addr="0x7f99f1de6c90" />
-                                    <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="16495" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="16496" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlLabel" value="ControlLabel" id="16497" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlProgress" value="ControlProgress" id="16498" addr="0x7f99f1de6c90" />
-                                    <attribute name="Control" value="Control" id="16499" addr="0x7f99f1de6c90" />
-                                    <attribute name="ControlSlider" value="ControlSlider" id="16500" addr="0x7f99f1de6c90" />
-                                    <attribute name="DialogProgress" value="DialogProgress" id="16501" addr="0x7f99f1de6c90" />
-                                    <attribute name="Action" value="Action" id="16502" addr="0x7f99f1de6c90" />
-                                    <attribute name="WindowDialog" value="WindowDialog" id="16503" addr="0x7f99f1de6c90" />
-                                    <attribute name="WindowXML" value="WindowXML" id="16504" addr="0x7f99f1de6c90" />
-                                    <attribute name="ListItem" value="ListItem" id="16505" addr="0x7f99f1de6c90" />
-                                    <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="16506" addr="0x7f99f1de6c90" />
+                            <typescopesitem id="16476" addr="0x7fca46920170" >
+                                <attributelist id="16477" addr="0x7fca46920170" >
+                                    <attribute name="InterceptorBase" value="InterceptorBase" id="16478" addr="0x7fca46934c90" />
+                                    <attribute name="Dialog" value="Dialog" id="16479" addr="0x7fca46934c90" />
+                                    <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="16480" addr="0x7fca46934c90" />
+                                    <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="16481" addr="0x7fca46934c90" />
+                                    <attribute name="ControlTextBox" value="ControlTextBox" id="16482" addr="0x7fca46934c90" />
+                                    <attribute name="ControlRadioButton" value="ControlRadioButton" id="16483" addr="0x7fca46934c90" />
+                                    <attribute name="Window" value="Window" id="16484" addr="0x7fca46934c90" />
+                                    <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="16485" addr="0x7fca46934c90" />
+                                    <attribute name="ControlList" value="ControlList" id="16486" addr="0x7fca46934c90" />
+                                    <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="16487" addr="0x7fca46934c90" />
+                                    <attribute name="ControlImage" value="ControlImage" id="16488" addr="0x7fca46934c90" />
+                                    <attribute name="ControlButton" value="ControlButton" id="16489" addr="0x7fca46934c90" />
+                                    <attribute name="ControlGroup" value="ControlGroup" id="16490" addr="0x7fca46934c90" />
+                                    <attribute name="DialogBusy" value="DialogBusy" id="16491" addr="0x7fca46934c90" />
+                                    <attribute name="DialogProgressBG" value="DialogProgressBG" id="16492" addr="0x7fca46934c90" />
+                                    <attribute name="ControlSpin" value="ControlSpin" id="16493" addr="0x7fca46934c90" />
+                                    <attribute name="ControlEdit" value="ControlEdit" id="16494" addr="0x7fca46934c90" />
+                                    <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="16495" addr="0x7fca46934c90" />
+                                    <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="16496" addr="0x7fca46934c90" />
+                                    <attribute name="ControlLabel" value="ControlLabel" id="16497" addr="0x7fca46934c90" />
+                                    <attribute name="ControlProgress" value="ControlProgress" id="16498" addr="0x7fca46934c90" />
+                                    <attribute name="Control" value="Control" id="16499" addr="0x7fca46934c90" />
+                                    <attribute name="ControlSlider" value="ControlSlider" id="16500" addr="0x7fca46934c90" />
+                                    <attribute name="DialogProgress" value="DialogProgress" id="16501" addr="0x7fca46934c90" />
+                                    <attribute name="Action" value="Action" id="16502" addr="0x7fca46934c90" />
+                                    <attribute name="WindowDialog" value="WindowDialog" id="16503" addr="0x7fca46934c90" />
+                                    <attribute name="WindowXML" value="WindowXML" id="16504" addr="0x7fca46934c90" />
+                                    <attribute name="ListItem" value="ListItem" id="16505" addr="0x7fca46934c90" />
+                                    <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="16506" addr="0x7fca46934c90" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="16507" addr="0x7f99f1dd1d70" >
-                                <attributelist id="16508" addr="0x7f99f1dd1d70" >
-                                    <attribute name="name" value="XBMCAddon" id="16509" addr="0x7f99f1de6c90" />
-                                    <typetab id="16510" addr="0x7f99f1dd1db0" >
-                                        <attributelist id="16511" addr="0x7f99f1dd1db0" >
-                                            <attribute name="Dictionary" value="Dictionary" id="16512" addr="0x7f99f1de6c90" />
-                                            <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="16513" addr="0x7f99f1de6c90" />
-                                            <attribute name="String" value="std::string" id="16514" addr="0x7f99f1de6c90" />
-                                            <attribute name="StringOrInt" value="XBMCAddon::String" id="16515" addr="0x7f99f1de6c90" />
-                                        </attributelist >
-                                        <typetabsitem id="16516" addr="0x7f99f1dd28b0" >
-                                            <attributelist id="16517" addr="0x7f99f1dd28b0" >
+                            <typescopesitem id="16507" addr="0x7fca4691fd70" >
+                                <attributelist id="16508" addr="0x7fca4691fd70" >
+                                    <attribute name="name" value="XBMCAddon" id="16509" addr="0x7fca46934c90" />
+                                    <typetab id="16510" addr="0x7fca4691fdb0" >
+                                        <attributelist id="16511" addr="0x7fca4691fdb0" >
+                                            <attribute name="Dictionary" value="Dictionary" id="16512" addr="0x7fca46934c90" />
+                                            <attribute name="Properties" value="XBMCAddon::Dictionary&lt;(XBMCAddon::StringOrInt)>" id="16513" addr="0x7fca46934c90" />
+                                            <attribute name="String" value="std::string" id="16514" addr="0x7fca46934c90" />
+                                            <attribute name="StringOrInt" value="XBMCAddon::String" id="16515" addr="0x7fca46934c90" />
+                                        </attributelist >
+                                        <typetabsitem id="16516" addr="0x7fca469208b0" >
+                                            <attributelist id="16517" addr="0x7fca469208b0" >
                                             </attributelist >
                                         </typetabsitem >
-                                        <typetabsitem id="16518" addr="0x7f99f1dd2910" >
-                                            <attributelist id="16519" addr="0x7f99f1dd2910" >
+                                        <typetabsitem id="16518" addr="0x7fca46920910" >
+                                            <attributelist id="16519" addr="0x7fca46920910" >
                                             </attributelist >
                                         </typetabsitem >
-                                        <typetabsitem id="16520" addr="0x7f99f1dd1f90" >
-                                            <attributelist id="16521" addr="0x7f99f1dd1f90" >
+                                        <typetabsitem id="16520" addr="0x7fca4691ff90" >
+                                            <attributelist id="16521" addr="0x7fca4691ff90" >
                                             </attributelist >
                                         </typetabsitem >
-                                        <typetabsitem id="16522" addr="0x7f99f1dd2710" >
-                                            <attributelist id="16523" addr="0x7f99f1dd2710" >
+                                        <typetabsitem id="16522" addr="0x7fca46920710" >
+                                            <attributelist id="16523" addr="0x7fca46920710" >
                                             </attributelist >
                                         </typetabsitem >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f99f1e1da30" id="16524" addr="0x7f99f1e1da30" />
-                                    <attribute name="qname" value="XBMCAddon" id="16525" addr="0x7f99f1de6c90" />
-                                    <attribute name="symtab" value="0x7f99f1e408b0" id="16526" addr="0x7f99f1e408b0" />
+                                    <attribute name="parent" value="0x7fca4696ba30" id="16524" addr="0x7fca4696ba30" />
+                                    <attribute name="qname" value="XBMCAddon" id="16525" addr="0x7fca46934c90" />
+                                    <attribute name="symtab" value="0x7fca4698e8b0" id="16526" addr="0x7fca4698e8b0" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="16527" addr="0x7f99f1dd2190" >
-                                <attributelist id="16528" addr="0x7f99f1dd2190" >
+                            <typescopesitem id="16527" addr="0x7fca46920190" >
+                                <attributelist id="16528" addr="0x7fca46920190" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="16529" addr="0x7f99f1e40fb0" >
-                                <attributelist id="16530" addr="0x7f99f1e40fb0" >
-                                    <attribute name="name" value="xbmcgui" id="16531" addr="0x7f99f1de6c90" />
-                                    <attribute name="csymtab" value="0x7f99f1e40ff0" id="16532" addr="0x7f99f1e40ff0" />
-                                    <attribute name="symtab" value="0x7f99f1e40f90" id="16533" addr="0x7f99f1e40f90" />
+                            <typescopesitem id="16529" addr="0x7fca4698efb0" >
+                                <attributelist id="16530" addr="0x7fca4698efb0" >
+                                    <attribute name="name" value="xbmcgui" id="16531" addr="0x7fca46934c90" />
+                                    <attribute name="csymtab" value="0x7fca4698eff0" id="16532" addr="0x7fca4698eff0" />
+                                    <attribute name="symtab" value="0x7fca4698ef90" id="16533" addr="0x7fca4698ef90" />
                                 </attributelist >
                             </typescopesitem >
                         </typescope >
-                        <attribute name="symtab" value="0x7f99f1e40fb0" id="16534" addr="0x7f99f1e40fb0" />
-                        <attribute name="sym_symtab" value="0x7f99f1e408b0" id="16535" addr="0x7f99f1e408b0" />
+                        <attribute name="symtab" value="0x7fca4698efb0" id="16534" addr="0x7fca4698efb0" />
+                        <attribute name="sym_symtab" value="0x7fca4698e8b0" id="16535" addr="0x7fca4698e8b0" />
                     </attributelist >
 
-                    <classforward id="16536" addr="0x7f99f1db3370" >
-                        <attributelist id="16537" addr="0x7f99f1db3370" >
-                            <attribute name="sym_name" value="ListItem" id="16538" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="ListItem" id="16539" addr="0x7f99f1de6c90" />
-                            <attribute name="kind" value="class" id="16540" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_weak" value="1" id="16541" addr="0x7f99f1de6c90" />
+                    <classforward id="16536" addr="0x7fca46901370" >
+                        <attributelist id="16537" addr="0x7fca46901370" >
+                            <attribute name="sym_name" value="ListItem" id="16538" addr="0x7fca46934c90" />
+                            <attribute name="name" value="ListItem" id="16539" addr="0x7fca46934c90" />
+                            <attribute name="kind" value="class" id="16540" addr="0x7fca46934c90" />
+                            <attribute name="sym_weak" value="1" id="16541" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </classforward >
-                    <classforward id="16542" addr="0x7f99f1db3470" >
-                        <attributelist id="16543" addr="0x7f99f1db3470" >
-                            <attribute name="sym_name" value="WindowXMLInterceptor" id="16544" addr="0x7f99f1de6c90" />
-                            <attribute name="name" value="WindowXMLInterceptor" id="16545" addr="0x7f99f1de6c90" />
-                            <attribute name="kind" value="class" id="16546" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_weak" value="1" id="16547" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="16548" addr="0x7f99f1e40fb0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="16549" addr="0x7f99f1de6c90" />
+                    <classforward id="16542" addr="0x7fca46901470" >
+                        <attributelist id="16543" addr="0x7fca46901470" >
+                            <attribute name="sym_name" value="WindowXMLInterceptor" id="16544" addr="0x7fca46934c90" />
+                            <attribute name="name" value="WindowXMLInterceptor" id="16545" addr="0x7fca46934c90" />
+                            <attribute name="kind" value="class" id="16546" addr="0x7fca46934c90" />
+                            <attribute name="sym_weak" value="1" id="16547" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="16548" addr="0x7fca4698efb0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="16549" addr="0x7fca46934c90" />
                         </attributelist >
                      
                     </classforward >
-                    <class id="16550" addr="0x7f99f1db3670" >
-                        <attributelist id="16551" addr="0x7f99f1db3670" >
-                            <attribute name="name" value="XBMCAddon::xbmcgui::WindowXML" id="16552" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="16553" addr="0x7f99f1e40fb0" />
-                            <attribute name="symtab" value="0x7f99f1db3810" id="16554" addr="0x7f99f1db3810" />
-                            <attribute name="allows_typedef" value="1" id="16555" addr="0x7f99f1de6c90" />
-                            <attribute name="typepass_visit" value="1" id="16556" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_visit" value="1" id="16557" addr="0x7f99f1de6c90" />
-                            <attribute name="kind" value="class" id="16558" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_name" value="WindowXML" id="16559" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_has_constructor" value="1" id="16560" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_public_constructor" value="1" id="16561" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_has_destructor" value="1" id="16562" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_default_destructor" value="1" id="16563" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_copy_constructor" value="1" id="16564" addr="0x7f99f1de6c90" />
-                            <attribute name="privatebaselist" value="0x7f99f1db3650" id="16565" addr="0x7f99f1db3650" />
-                            <attribute name="protectedbaselist" value="0x7f99f1db3630" id="16566" addr="0x7f99f1db3630" />
-                            <baselist id="16567" addr="0x7f99f1db3610" >
-                                <base name="Window" id="16568" addr="0x7f99f1db3590" />
+                    <class id="16550" addr="0x7fca46901670" >
+                        <attributelist id="16551" addr="0x7fca46901670" >
+                            <attribute name="name" value="XBMCAddon::xbmcgui::WindowXML" id="16552" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="16553" addr="0x7fca4698efb0" />
+                            <attribute name="symtab" value="0x7fca46901810" id="16554" addr="0x7fca46901810" />
+                            <attribute name="allows_typedef" value="1" id="16555" addr="0x7fca46934c90" />
+                            <attribute name="typepass_visit" value="1" id="16556" addr="0x7fca46934c90" />
+                            <attribute name="allocate_visit" value="1" id="16557" addr="0x7fca46934c90" />
+                            <attribute name="kind" value="class" id="16558" addr="0x7fca46934c90" />
+                            <attribute name="sym_name" value="WindowXML" id="16559" addr="0x7fca46934c90" />
+                            <attribute name="allocate_has_constructor" value="1" id="16560" addr="0x7fca46934c90" />
+                            <attribute name="allocate_public_constructor" value="1" id="16561" addr="0x7fca46934c90" />
+                            <attribute name="allocate_has_destructor" value="1" id="16562" addr="0x7fca46934c90" />
+                            <attribute name="allocate_default_destructor" value="1" id="16563" addr="0x7fca46934c90" />
+                            <attribute name="allocate_copy_constructor" value="1" id="16564" addr="0x7fca46934c90" />
+                            <attribute name="privatebaselist" value="0x7fca46901650" id="16565" addr="0x7fca46901650" />
+                            <attribute name="protectedbaselist" value="0x7fca46901630" id="16566" addr="0x7fca46901630" />
+                            <baselist id="16567" addr="0x7fca46901610" >
+                                <base name="Window" id="16568" addr="0x7fca46901590" />
                             </baselist >
-                            <attribute name="module" value="xbmcgui" id="16569" addr="0x7f99f1e402f0" />
-                            <attribute name="feature_director" value="1" id="16570" addr="0x7f99f1de6c90" />
-                            <attribute name="bases" value="0x7f99f1de3550" id="16571" addr="0x7f99f1de3550" />
-                            <attribute name="allbases" value="0x7f99f1de37f0" id="16572" addr="0x7f99f1de37f0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="16573" addr="0x7f99f1de6c90" />
-                            <typescope id="16574" addr="0x7f99f1de34d0" >
-                                <attributelist id="16575" addr="0x7f99f1de34d0" >
-                                    <attribute name="inherit" value="0x7f99f1de35d0" id="16576" addr="0x7f99f1de35d0" />
-                                    <attribute name="name" value="WindowXML" id="16577" addr="0x7f99f1de6c90" />
-                                    <typetab id="16578" addr="0x7f99f1de34f0" >
-                                        <attributelist id="16579" addr="0x7f99f1de34f0" >
+                            <attribute name="module" value="xbmcgui" id="16569" addr="0x7fca4698e2f0" />
+                            <attribute name="feature_director" value="1" id="16570" addr="0x7fca46934c90" />
+                            <attribute name="bases" value="0x7fca46931550" id="16571" addr="0x7fca46931550" />
+                            <attribute name="allbases" value="0x7fca469317f0" id="16572" addr="0x7fca469317f0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="16573" addr="0x7fca46934c90" />
+                            <typescope id="16574" addr="0x7fca469314d0" >
+                                <attributelist id="16575" addr="0x7fca469314d0" >
+                                    <attribute name="inherit" value="0x7fca469315d0" id="16576" addr="0x7fca469315d0" />
+                                    <attribute name="name" value="WindowXML" id="16577" addr="0x7fca46934c90" />
+                                    <typetab id="16578" addr="0x7fca469314f0" >
+                                        <attributelist id="16579" addr="0x7fca469314f0" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f99f1dd2150" id="16580" addr="0x7f99f1dd2150" />
-                                    <attribute name="qname" value="XBMCAddon::xbmcgui::WindowXML" id="16581" addr="0x7f99f1de6c90" />
-                                    <attribute name="symtab" value="0x7f99f1db3810" id="16582" addr="0x7f99f1db3810" />
+                                    <attribute name="parent" value="0x7fca46920150" id="16580" addr="0x7fca46920150" />
+                                    <attribute name="qname" value="XBMCAddon::xbmcgui::WindowXML" id="16581" addr="0x7fca46934c90" />
+                                    <attribute name="symtab" value="0x7fca46901810" id="16582" addr="0x7fca46901810" />
                                 </attributelist >
-                                <typescopesitem id="16583" addr="0x7f99f1de35d0" >
-                                    <attributelist id="16584" addr="0x7f99f1de35d0" >
+                                <typescopesitem id="16583" addr="0x7fca469315d0" >
+                                    <attributelist id="16584" addr="0x7fca469315d0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="16585" addr="0x7f99f1de3470" >
-                                    <attributelist id="16586" addr="0x7f99f1de3470" >
+                                <typescopesitem id="16585" addr="0x7fca46931470" >
+                                    <attributelist id="16586" addr="0x7fca46931470" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="16587" addr="0x7f99f1de34f0" >
-                                    <attributelist id="16588" addr="0x7f99f1de34f0" >
+                                <typescopesitem id="16587" addr="0x7fca469314f0" >
+                                    <attributelist id="16588" addr="0x7fca469314f0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="16589" addr="0x7f99f1dd2150" >
-                                    <attributelist id="16590" addr="0x7f99f1dd2150" >
-                                        <attribute name="name" value="xbmcgui" id="16591" addr="0x7f99f1de6c90" />
-                                        <typetab id="16592" addr="0x7f99f1dd2170" >
-                                            <attributelist id="16593" addr="0x7f99f1dd2170" >
-                                                <attribute name="InterceptorBase" value="InterceptorBase" id="16594" addr="0x7f99f1de6c90" />
-                                                <attribute name="Dialog" value="Dialog" id="16595" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="16596" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="16597" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlTextBox" value="ControlTextBox" id="16598" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="16599" addr="0x7f99f1de6c90" />
-                                                <attribute name="Window" value="Window" id="16600" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="16601" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlList" value="ControlList" id="16602" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="16603" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlImage" value="ControlImage" id="16604" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlButton" value="ControlButton" id="16605" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlGroup" value="ControlGroup" id="16606" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogBusy" value="DialogBusy" id="16607" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="16608" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSpin" value="ControlSpin" id="16609" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlEdit" value="ControlEdit" id="16610" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="16611" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="16612" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlLabel" value="ControlLabel" id="16613" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlProgress" value="ControlProgress" id="16614" addr="0x7f99f1de6c90" />
-                                                <attribute name="Control" value="Control" id="16615" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSlider" value="ControlSlider" id="16616" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgress" value="DialogProgress" id="16617" addr="0x7f99f1de6c90" />
-                                                <attribute name="Action" value="Action" id="16618" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowDialog" value="WindowDialog" id="16619" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXML" value="WindowXML" id="16620" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItem" value="ListItem" id="16621" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="16622" addr="0x7f99f1de6c90" />
+                                <typescopesitem id="16589" addr="0x7fca46920150" >
+                                    <attributelist id="16590" addr="0x7fca46920150" >
+                                        <attribute name="name" value="xbmcgui" id="16591" addr="0x7fca46934c90" />
+                                        <typetab id="16592" addr="0x7fca46920170" >
+                                            <attributelist id="16593" addr="0x7fca46920170" >
+                                                <attribute name="InterceptorBase" value="InterceptorBase" id="16594" addr="0x7fca46934c90" />
+                                                <attribute name="Dialog" value="Dialog" id="16595" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="16596" addr="0x7fca46934c90" />
+                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="16597" addr="0x7fca46934c90" />
+                                                <attribute name="ControlTextBox" value="ControlTextBox" id="16598" addr="0x7fca46934c90" />
+                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="16599" addr="0x7fca46934c90" />
+                                                <attribute name="Window" value="Window" id="16600" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="16601" addr="0x7fca46934c90" />
+                                                <attribute name="ControlList" value="ControlList" id="16602" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="16603" addr="0x7fca46934c90" />
+                                                <attribute name="ControlImage" value="ControlImage" id="16604" addr="0x7fca46934c90" />
+                                                <attribute name="ControlButton" value="ControlButton" id="16605" addr="0x7fca46934c90" />
+                                                <attribute name="ControlGroup" value="ControlGroup" id="16606" addr="0x7fca46934c90" />
+                                                <attribute name="DialogBusy" value="DialogBusy" id="16607" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="16608" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSpin" value="ControlSpin" id="16609" addr="0x7fca46934c90" />
+                                                <attribute name="ControlEdit" value="ControlEdit" id="16610" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="16611" addr="0x7fca46934c90" />
+                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="16612" addr="0x7fca46934c90" />
+                                                <attribute name="ControlLabel" value="ControlLabel" id="16613" addr="0x7fca46934c90" />
+                                                <attribute name="ControlProgress" value="ControlProgress" id="16614" addr="0x7fca46934c90" />
+                                                <attribute name="Control" value="Control" id="16615" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSlider" value="ControlSlider" id="16616" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgress" value="DialogProgress" id="16617" addr="0x7fca46934c90" />
+                                                <attribute name="Action" value="Action" id="16618" addr="0x7fca46934c90" />
+                                                <attribute name="WindowDialog" value="WindowDialog" id="16619" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXML" value="WindowXML" id="16620" addr="0x7fca46934c90" />
+                                                <attribute name="ListItem" value="ListItem" id="16621" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="16622" addr="0x7fca46934c90" />
                                             </attributelist >
-                                            <typetabsitem id="16623" addr="0x7f99f1de1dd0" >
-                                                <attributelist id="16624" addr="0x7f99f1de1dd0" >
+                                            <typetabsitem id="16623" addr="0x7fca4692fdd0" >
+                                                <attributelist id="16624" addr="0x7fca4692fdd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16625" addr="0x7f99f1dde790" >
-                                                <attributelist id="16626" addr="0x7f99f1dde790" >
+                                            <typetabsitem id="16625" addr="0x7fca4692c790" >
+                                                <attributelist id="16626" addr="0x7fca4692c790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16627" addr="0x7f99f1de3f10" >
-                                                <attributelist id="16628" addr="0x7f99f1de3f10" >
+                                            <typetabsitem id="16627" addr="0x7fca46931f10" >
+                                                <attributelist id="16628" addr="0x7fca46931f10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16629" addr="0x7f99f1dd67b0" >
-                                                <attributelist id="16630" addr="0x7f99f1dd67b0" >
+                                            <typetabsitem id="16629" addr="0x7fca469247b0" >
+                                                <attributelist id="16630" addr="0x7fca469247b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16631" addr="0x7f99f1ddafd0" >
-                                                <attributelist id="16632" addr="0x7f99f1ddafd0" >
+                                            <typetabsitem id="16631" addr="0x7fca46928fd0" >
+                                                <attributelist id="16632" addr="0x7fca46928fd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16633" addr="0x7f99f1ddd430" >
-                                                <attributelist id="16634" addr="0x7f99f1ddd430" >
+                                            <typetabsitem id="16633" addr="0x7fca4692b430" >
+                                                <attributelist id="16634" addr="0x7fca4692b430" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16635" addr="0x7f99f1de2130" >
-                                                <attributelist id="16636" addr="0x7f99f1de2130" >
+                                            <typetabsitem id="16635" addr="0x7fca46930130" >
+                                                <attributelist id="16636" addr="0x7fca46930130" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16637" addr="0x7f99f1dd2f50" >
-                                                <attributelist id="16638" addr="0x7f99f1dd2f50" >
+                                            <typetabsitem id="16637" addr="0x7fca46920f50" >
+                                                <attributelist id="16638" addr="0x7fca46920f50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16639" addr="0x7f99f1dd9650" >
-                                                <attributelist id="16640" addr="0x7f99f1dd9650" >
+                                            <typetabsitem id="16639" addr="0x7fca46927650" >
+                                                <attributelist id="16640" addr="0x7fca46927650" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16641" addr="0x7f99f1de3390" >
-                                                <attributelist id="16642" addr="0x7f99f1de3390" >
+                                            <typetabsitem id="16641" addr="0x7fca46931390" >
+                                                <attributelist id="16642" addr="0x7fca46931390" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16643" addr="0x7f99f1ddb7b0" >
-                                                <attributelist id="16644" addr="0x7f99f1ddb7b0" >
+                                            <typetabsitem id="16643" addr="0x7fca469297b0" >
+                                                <attributelist id="16644" addr="0x7fca469297b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16645" addr="0x7f99f1ddc4b0" >
-                                                <attributelist id="16646" addr="0x7f99f1ddc4b0" >
+                                            <typetabsitem id="16645" addr="0x7fca4692a4b0" >
+                                                <attributelist id="16646" addr="0x7fca4692a4b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16647" addr="0x7f99f1ddcf90" >
-                                                <attributelist id="16648" addr="0x7f99f1ddcf90" >
+                                            <typetabsitem id="16647" addr="0x7fca4692af90" >
+                                                <attributelist id="16648" addr="0x7fca4692af90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16649" addr="0x7f99f1de11b0" >
-                                                <attributelist id="16650" addr="0x7f99f1de11b0" >
+                                            <typetabsitem id="16649" addr="0x7fca4692f1b0" >
+                                                <attributelist id="16650" addr="0x7fca4692f1b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16651" addr="0x7f99f1de15b0" >
-                                                <attributelist id="16652" addr="0x7f99f1de15b0" >
+                                            <typetabsitem id="16651" addr="0x7fca4692f5b0" >
+                                                <attributelist id="16652" addr="0x7fca4692f5b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16653" addr="0x7f99f1dd77f0" >
-                                                <attributelist id="16654" addr="0x7f99f1dd77f0" >
+                                            <typetabsitem id="16653" addr="0x7fca469257f0" >
+                                                <attributelist id="16654" addr="0x7fca469257f0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16655" addr="0x7f99f1dd8b30" >
-                                                <attributelist id="16656" addr="0x7f99f1dd8b30" >
+                                            <typetabsitem id="16655" addr="0x7fca46926b30" >
+                                                <attributelist id="16656" addr="0x7fca46926b30" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16657" addr="0x7f99f1dd2c50" >
-                                                <attributelist id="16658" addr="0x7f99f1dd2c50" >
+                                            <typetabsitem id="16657" addr="0x7fca46920c50" >
+                                                <attributelist id="16658" addr="0x7fca46920c50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16659" addr="0x7f99f1dda790" >
-                                                <attributelist id="16660" addr="0x7f99f1dda790" >
+                                            <typetabsitem id="16659" addr="0x7fca46928790" >
+                                                <attributelist id="16660" addr="0x7fca46928790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16661" addr="0x7f99f1dd8030" >
-                                                <attributelist id="16662" addr="0x7f99f1dd8030" >
+                                            <typetabsitem id="16661" addr="0x7fca46926030" >
+                                                <attributelist id="16662" addr="0x7fca46926030" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16663" addr="0x7f99f1ddbe10" >
-                                                <attributelist id="16664" addr="0x7f99f1ddbe10" >
+                                            <typetabsitem id="16663" addr="0x7fca46929e10" >
+                                                <attributelist id="16664" addr="0x7fca46929e10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16665" addr="0x7f99f1dd6b10" >
-                                                <attributelist id="16666" addr="0x7f99f1dd6b10" >
+                                            <typetabsitem id="16665" addr="0x7fca46924b10" >
+                                                <attributelist id="16666" addr="0x7fca46924b10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16667" addr="0x7f99f1dddf90" >
-                                                <attributelist id="16668" addr="0x7f99f1dddf90" >
+                                            <typetabsitem id="16667" addr="0x7fca4692bf90" >
+                                                <attributelist id="16668" addr="0x7fca4692bf90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16669" addr="0x7f99f1de0530" >
-                                                <attributelist id="16670" addr="0x7f99f1de0530" >
+                                            <typetabsitem id="16669" addr="0x7fca4692e530" >
+                                                <attributelist id="16670" addr="0x7fca4692e530" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16671" addr="0x7f99f1de1e50" >
-                                                <attributelist id="16672" addr="0x7f99f1de1e50" >
+                                            <typetabsitem id="16671" addr="0x7fca4692fe50" >
+                                                <attributelist id="16672" addr="0x7fca4692fe50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16673" addr="0x7f99f1de2d90" >
-                                                <attributelist id="16674" addr="0x7f99f1de2d90" >
+                                            <typetabsitem id="16673" addr="0x7fca46930d90" >
+                                                <attributelist id="16674" addr="0x7fca46930d90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16675" addr="0x7f99f1de3410" >
-                                                <attributelist id="16676" addr="0x7f99f1de3410" >
+                                            <typetabsitem id="16675" addr="0x7fca46931410" >
+                                                <attributelist id="16676" addr="0x7fca46931410" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16677" addr="0x7f99f1dd3590" >
-                                                <attributelist id="16678" addr="0x7f99f1dd3590" >
+                                            <typetabsitem id="16677" addr="0x7fca46921590" >
+                                                <attributelist id="16678" addr="0x7fca46921590" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="16679" addr="0x7f99f1dd3390" >
-                                                <attributelist id="16680" addr="0x7f99f1dd3390" >
+                                            <typetabsitem id="16679" addr="0x7fca46921390" >
+                                                <attributelist id="16680" addr="0x7fca46921390" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7f99f1dd1d70" id="16681" addr="0x7f99f1dd1d70" />
-                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="16682" addr="0x7f99f1de6c90" />
-                                        <attribute name="symtab" value="0x7f99f1e40fb0" id="16683" addr="0x7f99f1e40fb0" />
+                                        <attribute name="parent" value="0x7fca4691fd70" id="16681" addr="0x7fca4691fd70" />
+                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="16682" addr="0x7fca46934c90" />
+                                        <attribute name="symtab" value="0x7fca4698efb0" id="16683" addr="0x7fca4698efb0" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="16684" addr="0x7f99f1de3510" >
-                                    <attributelist id="16685" addr="0x7f99f1de3510" >
+                                <typescopesitem id="16684" addr="0x7fca46931510" >
+                                    <attributelist id="16685" addr="0x7fca46931510" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="16686" addr="0x7f99f1db3810" >
-                                    <attributelist id="16687" addr="0x7f99f1db3810" >
-                                        <attribute name="inherit" value="0x7f99f1db3890" id="16688" addr="0x7f99f1db3890" />
-                                        <attribute name="name" value="WindowXML" id="16689" addr="0x7f99f1de6c90" />
-                                        <attribute name="csymtab" value="0x7f99f1db3790" id="16690" addr="0x7f99f1db3790" />
-                                        <attribute name="symtab" value="0x7f99f1db37b0" id="16691" addr="0x7f99f1db37b0" />
+                                <typescopesitem id="16686" addr="0x7fca46901810" >
+                                    <attributelist id="16687" addr="0x7fca46901810" >
+                                        <attribute name="inherit" value="0x7fca46901890" id="16688" addr="0x7fca46901890" />
+                                        <attribute name="name" value="WindowXML" id="16689" addr="0x7fca46934c90" />
+                                        <attribute name="csymtab" value="0x7fca46901790" id="16690" addr="0x7fca46901790" />
+                                        <attribute name="symtab" value="0x7fca469017b0" id="16691" addr="0x7fca469017b0" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <cdecl id="16692" addr="0x7f99f1db3970" >
-                            <attributelist id="16693" addr="0x7f99f1db3970" >
-                                <attribute name="ismember" value="1" id="16694" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="sFallBackPath" id="16695" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="" id="16696" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="private" id="16697" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="variable" id="16698" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="std::string" id="16699" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1db3810" id="16700" addr="0x7f99f1db3810" />
+                        <cdecl id="16692" addr="0x7fca46901970" >
+                            <attributelist id="16693" addr="0x7fca46901970" >
+                                <attribute name="ismember" value="1" id="16694" addr="0x7fca46934c90" />
+                                <attribute name="name" value="sFallBackPath" id="16695" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="" id="16696" addr="0x7fca46934c90" />
+                                <attribute name="access" value="private" id="16697" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="variable" id="16698" addr="0x7fca46934c90" />
+                                <attribute name="type" value="std::string" id="16699" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca46901810" id="16700" addr="0x7fca46901810" />
                             </attributelist >
                          
                         </cdecl >
-                        <access id="16701" addr="0x7f99f1db3a50" >
-                            <attributelist id="16702" addr="0x7f99f1db3a50" >
-                                <attribute name="kind" value="protected" id="16703" addr="0x7f99f1de6c90" />
+                        <access id="16701" addr="0x7fca46901a50" >
+                            <attributelist id="16702" addr="0x7fca46901a50" >
+                                <attribute name="kind" value="protected" id="16703" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </access >
-                        <access id="16704" addr="0x7f99f1db3af0" >
-                            <attributelist id="16705" addr="0x7f99f1db3af0" >
-                                <attribute name="kind" value="public" id="16706" addr="0x7f99f1de6c90" />
+                        <access id="16704" addr="0x7fca46901af0" >
+                            <attributelist id="16705" addr="0x7fca46901af0" >
+                                <attribute name="kind" value="public" id="16706" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="16707" addr="0x7f99f1db4290" >
-                            <attributelist id="16708" addr="0x7f99f1db4290" >
-                                <attribute name="name" value="WindowXML" id="16709" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="16710" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1db3810" id="16711" addr="0x7f99f1db3810" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1db4610" id="16712" addr="0x7f99f1db4610" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1db4610" id="16713" addr="0x7f99f1db4610" />
-                                <attribute name="sym_name" value="WindowXML" id="16714" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).String,r.q(const).String,r.q(const).String,r.q(const).String,bool)." id="16715" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="16716" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_director" value="1" id="16717" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_python_nokwds" value="true" id="16718" addr="0x7f99f1de6c90" />
-                                <parmlist id="16719" addr="0x7f99f1db3c50" >
+                        <constructor id="16707" addr="0x7fca46902290" >
+                            <attributelist id="16708" addr="0x7fca46902290" >
+                                <attribute name="name" value="WindowXML" id="16709" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="16710" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca46901810" id="16711" addr="0x7fca46901810" />
+                                <attribute name="sym_nextSibling" value="0x7fca46902610" id="16712" addr="0x7fca46902610" />
+                                <attribute name="csym_nextSibling" value="0x7fca46902610" id="16713" addr="0x7fca46902610" />
+                                <attribute name="sym_name" value="WindowXML" id="16714" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).String,r.q(const).String,r.q(const).String,r.q(const).String,bool)." id="16715" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="16716" addr="0x7fca46934c90" />
+                                <attribute name="feature_director" value="1" id="16717" addr="0x7fca46934c90" />
+                                <attribute name="feature_python_nokwds" value="true" id="16718" addr="0x7fca46934c90" />
+                                <parmlist id="16719" addr="0x7fca46901c50" >
                                     <parm id="16720">
-                                        <attributelist id="16721" addr="0x7f99f1db3c50" >
-                                            <attribute name="name" value="xmlFilename" id="16722" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="16723" addr="0x7f99f1de6c90" />
+                                        <attributelist id="16721" addr="0x7fca46901c50" >
+                                            <attribute name="name" value="xmlFilename" id="16722" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="16723" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="16724">
-                                        <attributelist id="16725" addr="0x7f99f1db3d90" >
-                                            <attribute name="name" value="scriptPath" id="16726" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="16727" addr="0x7f99f1de6c90" />
+                                        <attributelist id="16725" addr="0x7fca46901d90" >
+                                            <attribute name="name" value="scriptPath" id="16726" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="16727" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="16728">
-                                        <attributelist id="16729" addr="0x7f99f1db3f10" >
-                                            <attribute name="name" value="defaultSkin" id="16730" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="&quot;Default&quot;" id="16731" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="16732" addr="0x7f99f1de6c90" />
+                                        <attributelist id="16729" addr="0x7fca46901f10" >
+                                            <attribute name="name" value="defaultSkin" id="16730" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="&quot;Default&quot;" id="16731" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="16732" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="16733">
-                                        <attributelist id="16734" addr="0x7f99f1db4090" >
-                                            <attribute name="name" value="defaultRes" id="16735" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="&quot;720p&quot;" id="16736" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="16737" addr="0x7f99f1de6c90" />
+                                        <attributelist id="16734" addr="0x7fca46902090" >
+                                            <attribute name="name" value="defaultRes" id="16735" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="&quot;720p&quot;" id="16736" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="16737" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="16738">
-                                        <attributelist id="16739" addr="0x7f99f1db41d0" >
-                                            <attribute name="name" value="isMedia" id="16740" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="false" id="16741" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="bool" id="16742" addr="0x7f99f1de6c90" />
+                                        <attributelist id="16739" addr="0x7fca469021d0" >
+                                            <attribute name="name" value="isMedia" id="16740" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="false" id="16741" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="bool" id="16742" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overloaded" value="0x7f99f1db4290" id="16743" addr="0x7f99f1db4290" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="16744" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="16745" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overloaded" value="0x7fca46902290" id="16743" addr="0x7fca46902290" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="16744" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="16745" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="16746" addr="0x7f99f1db4610" >
-                            <attributelist id="16747" addr="0x7f99f1db4610" >
-                                <attribute name="name" value="WindowXML" id="16748" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="16749" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1db3810" id="16750" addr="0x7f99f1db3810" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1db4290" id="16751" addr="0x7f99f1db4290" />
-                                <attribute name="sym_name" value="WindowXML" id="16752" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1db48f0" id="16753" addr="0x7f99f1db48f0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1db48f0" id="16754" addr="0x7f99f1db48f0" />
-                                <attribute name="decl" value="f(r.q(const).String,r.q(const).String,r.q(const).String,r.q(const).String)." id="16755" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1db4290" id="16756" addr="0x7f99f1db4290" />
-                                <attribute name="access" value="public" id="16757" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_director" value="1" id="16758" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1db4290" id="16759" addr="0x7f99f1db4290" />
-                                <attribute name="feature_python_nokwds" value="true" id="16760" addr="0x7f99f1de6c90" />
-                                <parmlist id="16761" addr="0x7f99f1db4330" >
+                        <constructor id="16746" addr="0x7fca46902610" >
+                            <attributelist id="16747" addr="0x7fca46902610" >
+                                <attribute name="name" value="WindowXML" id="16748" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="16749" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca46901810" id="16750" addr="0x7fca46901810" />
+                                <attribute name="sym_previousSibling" value="0x7fca46902290" id="16751" addr="0x7fca46902290" />
+                                <attribute name="sym_name" value="WindowXML" id="16752" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469028f0" id="16753" addr="0x7fca469028f0" />
+                                <attribute name="sym_nextSibling" value="0x7fca469028f0" id="16754" addr="0x7fca469028f0" />
+                                <attribute name="decl" value="f(r.q(const).String,r.q(const).String,r.q(const).String,r.q(const).String)." id="16755" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca46902290" id="16756" addr="0x7fca46902290" />
+                                <attribute name="access" value="public" id="16757" addr="0x7fca46934c90" />
+                                <attribute name="feature_director" value="1" id="16758" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca46902290" id="16759" addr="0x7fca46902290" />
+                                <attribute name="feature_python_nokwds" value="true" id="16760" addr="0x7fca46934c90" />
+                                <parmlist id="16761" addr="0x7fca46902330" >
                                     <parm id="16762">
-                                        <attributelist id="16763" addr="0x7f99f1db4330" >
-                                            <attribute name="name" value="xmlFilename" id="16764" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="16765" addr="0x7f99f1de6c90" />
+                                        <attributelist id="16763" addr="0x7fca46902330" >
+                                            <attribute name="name" value="xmlFilename" id="16764" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="16765" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="16766">
-                                        <attributelist id="16767" addr="0x7f99f1db4430" >
-                                            <attribute name="name" value="scriptPath" id="16768" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="16769" addr="0x7f99f1de6c90" />
+                                        <attributelist id="16767" addr="0x7fca46902430" >
+                                            <attribute name="name" value="scriptPath" id="16768" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="16769" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="16770">
-                                        <attributelist id="16771" addr="0x7f99f1db44b0" >
-                                            <attribute name="name" value="defaultSkin" id="16772" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="&quot;Default&quot;" id="16773" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="16774" addr="0x7f99f1de6c90" />
+                                        <attributelist id="16771" addr="0x7fca469024b0" >
+                                            <attribute name="name" value="defaultSkin" id="16772" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="&quot;Default&quot;" id="16773" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="16774" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="16775">
-                                        <attributelist id="16776" addr="0x7f99f1db4550" >
-                                            <attribute name="name" value="defaultRes" id="16777" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="&quot;720p&quot;" id="16778" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="16779" addr="0x7f99f1de6c90" />
+                                        <attributelist id="16776" addr="0x7fca46902550" >
+                                            <attribute name="name" value="defaultRes" id="16777" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="&quot;720p&quot;" id="16778" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="16779" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_1" id="16780" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="16781" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="16780" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="16781" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="16782" addr="0x7f99f1db48f0" >
-                            <attributelist id="16783" addr="0x7f99f1db48f0" >
-                                <attribute name="name" value="WindowXML" id="16784" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="16785" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1db3810" id="16786" addr="0x7f99f1db3810" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1db4610" id="16787" addr="0x7f99f1db4610" />
-                                <attribute name="sym_name" value="WindowXML" id="16788" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1db4b30" id="16789" addr="0x7f99f1db4b30" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1db4b30" id="16790" addr="0x7f99f1db4b30" />
-                                <attribute name="decl" value="f(r.q(const).String,r.q(const).String,r.q(const).String)." id="16791" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1db4290" id="16792" addr="0x7f99f1db4290" />
-                                <attribute name="access" value="public" id="16793" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_director" value="1" id="16794" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1db4290" id="16795" addr="0x7f99f1db4290" />
-                                <attribute name="feature_python_nokwds" value="true" id="16796" addr="0x7f99f1de6c90" />
-                                <parmlist id="16797" addr="0x7f99f1db46b0" >
+                        <constructor id="16782" addr="0x7fca469028f0" >
+                            <attributelist id="16783" addr="0x7fca469028f0" >
+                                <attribute name="name" value="WindowXML" id="16784" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="16785" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca46901810" id="16786" addr="0x7fca46901810" />
+                                <attribute name="sym_previousSibling" value="0x7fca46902610" id="16787" addr="0x7fca46902610" />
+                                <attribute name="sym_name" value="WindowXML" id="16788" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca46902b30" id="16789" addr="0x7fca46902b30" />
+                                <attribute name="sym_nextSibling" value="0x7fca46902b30" id="16790" addr="0x7fca46902b30" />
+                                <attribute name="decl" value="f(r.q(const).String,r.q(const).String,r.q(const).String)." id="16791" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca46902290" id="16792" addr="0x7fca46902290" />
+                                <attribute name="access" value="public" id="16793" addr="0x7fca46934c90" />
+                                <attribute name="feature_director" value="1" id="16794" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca46902290" id="16795" addr="0x7fca46902290" />
+                                <attribute name="feature_python_nokwds" value="true" id="16796" addr="0x7fca46934c90" />
+                                <parmlist id="16797" addr="0x7fca469026b0" >
                                     <parm id="16798">
-                                        <attributelist id="16799" addr="0x7f99f1db46b0" >
-                                            <attribute name="name" value="xmlFilename" id="16800" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="16801" addr="0x7f99f1de6c90" />
+                                        <attributelist id="16799" addr="0x7fca469026b0" >
+                                            <attribute name="name" value="xmlFilename" id="16800" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="16801" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="16802">
-                                        <attributelist id="16803" addr="0x7f99f1db47b0" >
-                                            <attribute name="name" value="scriptPath" id="16804" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="16805" addr="0x7f99f1de6c90" />
+                                        <attributelist id="16803" addr="0x7fca469027b0" >
+                                            <attribute name="name" value="scriptPath" id="16804" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="16805" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="16806">
-                                        <attributelist id="16807" addr="0x7f99f1db4830" >
-                                            <attribute name="name" value="defaultSkin" id="16808" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="&quot;Default&quot;" id="16809" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="16810" addr="0x7f99f1de6c90" />
+                                        <attributelist id="16807" addr="0x7fca46902830" >
+                                            <attribute name="name" value="defaultSkin" id="16808" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="&quot;Default&quot;" id="16809" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="16810" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_2" id="16811" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="16812" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_2" id="16811" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="16812" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="16813" addr="0x7f99f1db4b30" >
-                            <attributelist id="16814" addr="0x7f99f1db4b30" >
-                                <attribute name="name" value="WindowXML" id="16815" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="16816" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1db3810" id="16817" addr="0x7f99f1db3810" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1db48f0" id="16818" addr="0x7f99f1db48f0" />
-                                <attribute name="sym_name" value="WindowXML" id="16819" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).String,r.q(const).String)." id="16820" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1db4290" id="16821" addr="0x7f99f1db4290" />
-                                <attribute name="access" value="public" id="16822" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_director" value="1" id="16823" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1db4290" id="16824" addr="0x7f99f1db4290" />
-                                <attribute name="feature_python_nokwds" value="true" id="16825" addr="0x7f99f1de6c90" />
-                                <parmlist id="16826" addr="0x7f99f1db4990" >
+                        <constructor id="16813" addr="0x7fca46902b30" >
+                            <attributelist id="16814" addr="0x7fca46902b30" >
+                                <attribute name="name" value="WindowXML" id="16815" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="16816" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca46901810" id="16817" addr="0x7fca46901810" />
+                                <attribute name="sym_previousSibling" value="0x7fca469028f0" id="16818" addr="0x7fca469028f0" />
+                                <attribute name="sym_name" value="WindowXML" id="16819" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).String,r.q(const).String)." id="16820" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca46902290" id="16821" addr="0x7fca46902290" />
+                                <attribute name="access" value="public" id="16822" addr="0x7fca46934c90" />
+                                <attribute name="feature_director" value="1" id="16823" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca46902290" id="16824" addr="0x7fca46902290" />
+                                <attribute name="feature_python_nokwds" value="true" id="16825" addr="0x7fca46934c90" />
+                                <parmlist id="16826" addr="0x7fca46902990" >
                                     <parm id="16827">
-                                        <attributelist id="16828" addr="0x7f99f1db4990" >
-                                            <attribute name="name" value="xmlFilename" id="16829" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="16830" addr="0x7f99f1de6c90" />
+                                        <attributelist id="16828" addr="0x7fca46902990" >
+                                            <attribute name="name" value="xmlFilename" id="16829" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="16830" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="16831">
-                                        <attributelist id="16832" addr="0x7f99f1db4a90" >
-                                            <attribute name="name" value="scriptPath" id="16833" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="16834" addr="0x7f99f1de6c90" />
+                                        <attributelist id="16832" addr="0x7fca46902a90" >
+                                            <attribute name="name" value="scriptPath" id="16833" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="16834" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_3" id="16835" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="16836" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_3" id="16835" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="16836" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <destructor id="16837" addr="0x7f99f1db4cd0" >
-                            <attributelist id="16838" addr="0x7f99f1db4cd0" >
-                                <attribute name="ismember" value="1" id="16839" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="~WindowXML" id="16840" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="~WindowXML" id="16841" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="16842" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="16843" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1db3810" id="16844" addr="0x7f99f1db3810" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="16845" addr="0x7f99f1de6c90" />
+                        <destructor id="16837" addr="0x7fca46902cd0" >
+                            <attributelist id="16838" addr="0x7fca46902cd0" >
+                                <attribute name="ismember" value="1" id="16839" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="~WindowXML" id="16840" addr="0x7fca46934c90" />
+                                <attribute name="name" value="~WindowXML" id="16841" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="16842" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="16843" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca46901810" id="16844" addr="0x7fca46901810" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="16845" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </destructor >
-                        <cdecl id="16846" addr="0x7f99f1db52d0" >
-                            <attributelist id="16847" addr="0x7f99f1db52d0" >
-                                <attribute name="name" value="addItem" id="16848" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="16849" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1db3810" id="16850" addr="0x7f99f1db3810" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1db5470" id="16851" addr="0x7f99f1db5470" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1db5470" id="16852" addr="0x7f99f1db5470" />
-                                <attribute name="kind" value="function" id="16853" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="addItem" id="16854" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>,int)." id="16855" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="16856" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1db52d0" id="16857" addr="0x7f99f1db52d0" />
-                                <parmlist id="16858" addr="0x7f99f1db5090" >
+                        <cdecl id="16846" addr="0x7fca469032d0" >
+                            <attributelist id="16847" addr="0x7fca469032d0" >
+                                <attribute name="name" value="addItem" id="16848" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="16849" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca46901810" id="16850" addr="0x7fca46901810" />
+                                <attribute name="sym_nextSibling" value="0x7fca46903470" id="16851" addr="0x7fca46903470" />
+                                <attribute name="csym_nextSibling" value="0x7fca46903470" id="16852" addr="0x7fca46903470" />
+                                <attribute name="kind" value="function" id="16853" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="addItem" id="16854" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>,int)." id="16855" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="16856" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469032d0" id="16857" addr="0x7fca469032d0" />
+                                <parmlist id="16858" addr="0x7fca46903090" >
                                     <parm id="16859">
-                                        <attributelist id="16860" addr="0x7f99f1db5090" >
-                                            <attribute name="name" value="item" id="16861" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>" id="16862" addr="0x7f99f1de6c90" />
+                                        <attributelist id="16860" addr="0x7fca46903090" >
+                                            <attribute name="name" value="item" id="16861" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>" id="16862" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="16863">
-                                        <attributelist id="16864" addr="0x7f99f1db5210" >
-                                            <attribute name="name" value="position" id="16865" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="INT_MAX" id="16866" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="16867" addr="0x7f99f1de6c90" />
+                                        <attributelist id="16864" addr="0x7fca46903210" >
+                                            <attribute name="name" value="position" id="16865" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="INT_MAX" id="16866" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="16867" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="16868" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="16869" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="16868" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="16869" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="16870" addr="0x7f99f1db5470" >
-                            <attributelist id="16871" addr="0x7f99f1db5470" >
-                                <attribute name="name" value="addItem" id="16872" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="16873" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1db3810" id="16874" addr="0x7f99f1db3810" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1db52d0" id="16875" addr="0x7f99f1db52d0" />
-                                <attribute name="kind" value="function" id="16876" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="addItem" id="16877" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1db52d0" id="16878" addr="0x7f99f1db52d0" />
-                                <attribute name="decl" value="f(r.q(const).Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)." id="16879" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="16880" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1db52d0" id="16881" addr="0x7f99f1db52d0" />
-                                <parmlist id="16882" addr="0x7f99f1db5370" >
+                        <cdecl id="16870" addr="0x7fca46903470" >
+                            <attributelist id="16871" addr="0x7fca46903470" >
+                                <attribute name="name" value="addItem" id="16872" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="16873" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca46901810" id="16874" addr="0x7fca46901810" />
+                                <attribute name="sym_previousSibling" value="0x7fca469032d0" id="16875" addr="0x7fca469032d0" />
+                                <attribute name="kind" value="function" id="16876" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="addItem" id="16877" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca469032d0" id="16878" addr="0x7fca469032d0" />
+                                <attribute name="decl" value="f(r.q(const).Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)." id="16879" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="16880" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca469032d0" id="16881" addr="0x7fca469032d0" />
+                                <parmlist id="16882" addr="0x7fca46903370" >
                                     <parm id="16883">
-                                        <attributelist id="16884" addr="0x7f99f1db5370" >
-                                            <attribute name="name" value="item" id="16885" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>" id="16886" addr="0x7f99f1de6c90" />
+                                        <attributelist id="16884" addr="0x7fca46903370" >
+                                            <attribute name="name" value="item" id="16885" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>" id="16886" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="16887" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="16888" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="16887" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="16888" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="16889" addr="0x7f99f1db5bf0" >
-                            <attributelist id="16890" addr="0x7f99f1db5bf0" >
-                                <attribute name="name" value="addItems" id="16891" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="16892" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1db3810" id="16893" addr="0x7f99f1db3810" />
-                                <attribute name="kind" value="function" id="16894" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="addItems" id="16895" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>)." id="16896" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="16897" addr="0x7f99f1de6c90" />
-                                <parmlist id="16898" addr="0x7f99f1db5b10" >
+                        <cdecl id="16889" addr="0x7fca46903bf0" >
+                            <attributelist id="16890" addr="0x7fca46903bf0" >
+                                <attribute name="name" value="addItems" id="16891" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="16892" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca46901810" id="16893" addr="0x7fca46901810" />
+                                <attribute name="kind" value="function" id="16894" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="addItems" id="16895" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>)." id="16896" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="16897" addr="0x7fca46934c90" />
+                                <parmlist id="16898" addr="0x7fca46903b10" >
                                     <parm id="16899">
-                                        <attributelist id="16900" addr="0x7f99f1db5b10" >
-                                            <attribute name="name" value="items" id="16901" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>" id="16902" addr="0x7f99f1de6c90" />
+                                        <attributelist id="16900" addr="0x7fca46903b10" >
+                                            <attribute name="name" value="items" id="16901" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).std::vector&lt;(Alternative&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)>)>" id="16902" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="16903" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="16904" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="16903" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="16904" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="16905" addr="0x7f99f1db5ed0" >
-                            <attributelist id="16906" addr="0x7f99f1db5ed0" >
-                                <attribute name="name" value="removeItem" id="16907" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="16908" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1db3810" id="16909" addr="0x7f99f1db3810" />
-                                <attribute name="kind" value="function" id="16910" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="removeItem" id="16911" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(int)." id="16912" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="16913" addr="0x7f99f1de6c90" />
-                                <parmlist id="16914" addr="0x7f99f1db5e10" >
+                        <cdecl id="16905" addr="0x7fca46903ed0" >
+                            <attributelist id="16906" addr="0x7fca46903ed0" >
+                                <attribute name="name" value="removeItem" id="16907" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="16908" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca46901810" id="16909" addr="0x7fca46901810" />
+                                <attribute name="kind" value="function" id="16910" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="removeItem" id="16911" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(int)." id="16912" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="16913" addr="0x7fca46934c90" />
+                                <parmlist id="16914" addr="0x7fca46903e10" >
                                     <parm id="16915">
-                                        <attributelist id="16916" addr="0x7f99f1db5e10" >
-                                            <attribute name="name" value="position" id="16917" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="16918" addr="0x7f99f1de6c90" />
+                                        <attributelist id="16916" addr="0x7fca46903e10" >
+                                            <attribute name="name" value="position" id="16917" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="16918" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="16919" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="16920" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="16919" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="16920" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="16921" addr="0x7f99f1db60b0" >
-                            <attributelist id="16922" addr="0x7f99f1db60b0" >
-                                <attribute name="ismember" value="1" id="16923" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getCurrentListPosition" id="16924" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="getCurrentListPosition" id="16925" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="16926" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="16927" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="16928" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="int" id="16929" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1db3810" id="16930" addr="0x7f99f1db3810" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="16931" addr="0x7f99f1de6c90" />
+                        <cdecl id="16921" addr="0x7fca469040b0" >
+                            <attributelist id="16922" addr="0x7fca469040b0" >
+                                <attribute name="ismember" value="1" id="16923" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getCurrentListPosition" id="16924" addr="0x7fca46934c90" />
+                                <attribute name="name" value="getCurrentListPosition" id="16925" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="16926" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="16927" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="16928" addr="0x7fca46934c90" />
+                                <attribute name="type" value="int" id="16929" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca46901810" id="16930" addr="0x7fca46901810" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="16931" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="16932" addr="0x7f99f1db6390" >
-                            <attributelist id="16933" addr="0x7f99f1db6390" >
-                                <attribute name="name" value="setCurrentListPosition" id="16934" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="16935" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1db3810" id="16936" addr="0x7f99f1db3810" />
-                                <attribute name="kind" value="function" id="16937" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setCurrentListPosition" id="16938" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(int)." id="16939" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="16940" addr="0x7f99f1de6c90" />
-                                <parmlist id="16941" addr="0x7f99f1db62d0" >
+                        <cdecl id="16932" addr="0x7fca46904390" >
+                            <attributelist id="16933" addr="0x7fca46904390" >
+                                <attribute name="name" value="setCurrentListPosition" id="16934" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="16935" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca46901810" id="16936" addr="0x7fca46901810" />
+                                <attribute name="kind" value="function" id="16937" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setCurrentListPosition" id="16938" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(int)." id="16939" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="16940" addr="0x7fca46934c90" />
+                                <parmlist id="16941" addr="0x7fca469042d0" >
                                     <parm id="16942">
-                                        <attributelist id="16943" addr="0x7f99f1db62d0" >
-                                            <attribute name="name" value="position" id="16944" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="16945" addr="0x7f99f1de6c90" />
+                                        <attributelist id="16943" addr="0x7fca469042d0" >
+                                            <attribute name="name" value="position" id="16944" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="16945" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="16946" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="16947" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="16946" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="16947" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="16948" addr="0x7f99f1db6670" >
-                            <attributelist id="16949" addr="0x7f99f1db6670" >
-                                <attribute name="name" value="getListItem" id="16950" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="16951" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1db3810" id="16952" addr="0x7f99f1db3810" />
-                                <attribute name="kind" value="function" id="16953" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getListItem" id="16954" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(int).p." id="16955" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="16956" addr="0x7f99f1de6c90" />
-                                <parmlist id="16957" addr="0x7f99f1db65f0" >
+                        <cdecl id="16948" addr="0x7fca46904670" >
+                            <attributelist id="16949" addr="0x7fca46904670" >
+                                <attribute name="name" value="getListItem" id="16950" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="16951" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca46901810" id="16952" addr="0x7fca46901810" />
+                                <attribute name="kind" value="function" id="16953" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getListItem" id="16954" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(int).p." id="16955" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="16956" addr="0x7fca46934c90" />
+                                <parmlist id="16957" addr="0x7fca469045f0" >
                                     <parm id="16958">
-                                        <attributelist id="16959" addr="0x7f99f1db65f0" >
-                                            <attribute name="name" value="position" id="16960" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="int" id="16961" addr="0x7f99f1de6c90" />
+                                        <attributelist id="16959" addr="0x7fca469045f0" >
+                                            <attribute name="name" value="position" id="16960" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="int" id="16961" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="XBMCAddon::xbmcgui::ListItem" id="16962" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="16963" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="XBMCAddon::xbmcgui::ListItem" id="16962" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="16963" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="16964" addr="0x7f99f1db6870" >
-                            <attributelist id="16965" addr="0x7f99f1db6870" >
-                                <attribute name="ismember" value="1" id="16966" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getListSize" id="16967" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="getListSize" id="16968" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="16969" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="16970" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="16971" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="int" id="16972" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1db3810" id="16973" addr="0x7f99f1db3810" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="16974" addr="0x7f99f1de6c90" />
+                        <cdecl id="16964" addr="0x7fca46904870" >
+                            <attributelist id="16965" addr="0x7fca46904870" >
+                                <attribute name="ismember" value="1" id="16966" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getListSize" id="16967" addr="0x7fca46934c90" />
+                                <attribute name="name" value="getListSize" id="16968" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="16969" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="16970" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="16971" addr="0x7fca46934c90" />
+                                <attribute name="type" value="int" id="16972" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca46901810" id="16973" addr="0x7fca46901810" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="16974" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="16975" addr="0x7f99f1db6a30" >
-                            <attributelist id="16976" addr="0x7f99f1db6a30" >
-                                <attribute name="ismember" value="1" id="16977" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="clearList" id="16978" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="clearList" id="16979" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="16980" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="16981" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="16982" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="void" id="16983" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1db3810" id="16984" addr="0x7f99f1db3810" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="16985" addr="0x7f99f1de6c90" />
+                        <cdecl id="16975" addr="0x7fca46904a30" >
+                            <attributelist id="16976" addr="0x7fca46904a30" >
+                                <attribute name="ismember" value="1" id="16977" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="clearList" id="16978" addr="0x7fca46934c90" />
+                                <attribute name="name" value="clearList" id="16979" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="16980" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="16981" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="16982" addr="0x7fca46934c90" />
+                                <attribute name="type" value="void" id="16983" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca46901810" id="16984" addr="0x7fca46901810" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="16985" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="16986" addr="0x7f99f1db6e70" >
-                            <attributelist id="16987" addr="0x7f99f1db6e70" >
-                                <attribute name="name" value="setContainerProperty" id="16988" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="16989" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1db3810" id="16990" addr="0x7f99f1db3810" />
-                                <attribute name="kind" value="function" id="16991" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setContainerProperty" id="16992" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="16993" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="16994" addr="0x7f99f1de6c90" />
-                                <parmlist id="16995" addr="0x7f99f1db6c70" >
+                        <cdecl id="16986" addr="0x7fca46904e70" >
+                            <attributelist id="16987" addr="0x7fca46904e70" >
+                                <attribute name="name" value="setContainerProperty" id="16988" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="16989" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca46901810" id="16990" addr="0x7fca46901810" />
+                                <attribute name="kind" value="function" id="16991" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setContainerProperty" id="16992" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="16993" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="16994" addr="0x7fca46934c90" />
+                                <parmlist id="16995" addr="0x7fca46904c70" >
                                     <parm id="16996">
-                                        <attributelist id="16997" addr="0x7f99f1db6c70" >
-                                            <attribute name="name" value="strProperty" id="16998" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="16999" addr="0x7f99f1de6c90" />
+                                        <attributelist id="16997" addr="0x7fca46904c70" >
+                                            <attribute name="name" value="strProperty" id="16998" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="16999" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="17000">
-                                        <attributelist id="17001" addr="0x7f99f1db6db0" >
-                                            <attribute name="name" value="strValue" id="17002" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="17003" addr="0x7f99f1de6c90" />
+                                        <attributelist id="17001" addr="0x7fca46904db0" >
+                                            <attribute name="name" value="strValue" id="17002" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="17003" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="17004" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="17005" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="17004" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="17005" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="17006" addr="0x7f99f1db7170" >
-                            <attributelist id="17007" addr="0x7f99f1db7170" >
-                                <attribute name="name" value="setContent" id="17008" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="17009" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1db3810" id="17010" addr="0x7f99f1db3810" />
-                                <attribute name="kind" value="function" id="17011" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="setContent" id="17012" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="17013" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="17014" addr="0x7f99f1de6c90" />
-                                <parmlist id="17015" addr="0x7f99f1db70b0" >
+                        <cdecl id="17006" addr="0x7fca46905170" >
+                            <attributelist id="17007" addr="0x7fca46905170" >
+                                <attribute name="name" value="setContent" id="17008" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="17009" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca46901810" id="17010" addr="0x7fca46901810" />
+                                <attribute name="kind" value="function" id="17011" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="setContent" id="17012" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="17013" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="17014" addr="0x7fca46934c90" />
+                                <parmlist id="17015" addr="0x7fca469050b0" >
                                     <parm id="17016">
-                                        <attributelist id="17017" addr="0x7f99f1db70b0" >
-                                            <attribute name="name" value="strValue" id="17018" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="17019" addr="0x7f99f1de6c90" />
+                                        <attributelist id="17017" addr="0x7fca469050b0" >
+                                            <attribute name="name" value="strValue" id="17018" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="17019" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="17020" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="17021" addr="0x7f99f1de6c90" />
+                                <attribute name="type" value="void" id="17020" addr="0x7fca46934c90" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="17021" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="17022" addr="0x7f99f1db7350" >
-                            <attributelist id="17023" addr="0x7f99f1db7350" >
-                                <attribute name="ismember" value="1" id="17024" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="getCurrentContainerId" id="17025" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="getCurrentContainerId" id="17026" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="17027" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="17028" addr="0x7f99f1de6c90" />
-                                <attribute name="kind" value="function" id="17029" addr="0x7f99f1de6c90" />
-                                <attribute name="type" value="int" id="17030" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1db3810" id="17031" addr="0x7f99f1db3810" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="17032" addr="0x7f99f1de6c90" />
+                        <cdecl id="17022" addr="0x7fca46905350" >
+                            <attributelist id="17023" addr="0x7fca46905350" >
+                                <attribute name="ismember" value="1" id="17024" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="getCurrentContainerId" id="17025" addr="0x7fca46934c90" />
+                                <attribute name="name" value="getCurrentContainerId" id="17026" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="17027" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="17028" addr="0x7fca46934c90" />
+                                <attribute name="kind" value="function" id="17029" addr="0x7fca46934c90" />
+                                <attribute name="type" value="int" id="17030" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca46901810" id="17031" addr="0x7fca46901810" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="17032" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </cdecl >
                     </class >
-                    <class id="17033" addr="0x7f99f1db76b0" >
-                        <attributelist id="17034" addr="0x7f99f1db76b0" >
-                            <attribute name="name" value="XBMCAddon::xbmcgui::WindowXMLDialog" id="17035" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_symtab" value="0x7f99f1e40fb0" id="17036" addr="0x7f99f1e40fb0" />
-                            <attribute name="symtab" value="0x7f99f1db7850" id="17037" addr="0x7f99f1db7850" />
-                            <attribute name="allows_typedef" value="1" id="17038" addr="0x7f99f1de6c90" />
-                            <attribute name="typepass_visit" value="1" id="17039" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_visit" value="1" id="17040" addr="0x7f99f1de6c90" />
-                            <attribute name="kind" value="class" id="17041" addr="0x7f99f1de6c90" />
-                            <attribute name="sym_name" value="WindowXMLDialog" id="17042" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_has_constructor" value="1" id="17043" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_public_constructor" value="1" id="17044" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_has_destructor" value="1" id="17045" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_default_destructor" value="1" id="17046" addr="0x7f99f1de6c90" />
-                            <attribute name="allocate_copy_constructor" value="1" id="17047" addr="0x7f99f1de6c90" />
-                            <attribute name="privatebaselist" value="0x7f99f1db75f0" id="17048" addr="0x7f99f1db75f0" />
-                            <attribute name="protectedbaselist" value="0x7f99f1db75d0" id="17049" addr="0x7f99f1db75d0" />
-                            <baselist id="17050" addr="0x7f99f1db75b0" >
-                                <base name="WindowXML" id="17051" addr="0x7f99f1db7530" />
+                    <class id="17033" addr="0x7fca469056b0" >
+                        <attributelist id="17034" addr="0x7fca469056b0" >
+                            <attribute name="name" value="XBMCAddon::xbmcgui::WindowXMLDialog" id="17035" addr="0x7fca46934c90" />
+                            <attribute name="sym_symtab" value="0x7fca4698efb0" id="17036" addr="0x7fca4698efb0" />
+                            <attribute name="symtab" value="0x7fca46905850" id="17037" addr="0x7fca46905850" />
+                            <attribute name="allows_typedef" value="1" id="17038" addr="0x7fca46934c90" />
+                            <attribute name="typepass_visit" value="1" id="17039" addr="0x7fca46934c90" />
+                            <attribute name="allocate_visit" value="1" id="17040" addr="0x7fca46934c90" />
+                            <attribute name="kind" value="class" id="17041" addr="0x7fca46934c90" />
+                            <attribute name="sym_name" value="WindowXMLDialog" id="17042" addr="0x7fca46934c90" />
+                            <attribute name="allocate_has_constructor" value="1" id="17043" addr="0x7fca46934c90" />
+                            <attribute name="allocate_public_constructor" value="1" id="17044" addr="0x7fca46934c90" />
+                            <attribute name="allocate_has_destructor" value="1" id="17045" addr="0x7fca46934c90" />
+                            <attribute name="allocate_default_destructor" value="1" id="17046" addr="0x7fca46934c90" />
+                            <attribute name="allocate_copy_constructor" value="1" id="17047" addr="0x7fca46934c90" />
+                            <attribute name="privatebaselist" value="0x7fca469055f0" id="17048" addr="0x7fca469055f0" />
+                            <attribute name="protectedbaselist" value="0x7fca469055d0" id="17049" addr="0x7fca469055d0" />
+                            <baselist id="17050" addr="0x7fca469055b0" >
+                                <base name="WindowXML" id="17051" addr="0x7fca46905530" />
                             </baselist >
-                            <attribute name="module" value="xbmcgui" id="17052" addr="0x7f99f1e402f0" />
-                            <attribute name="feature_director" value="1" id="17053" addr="0x7f99f1de6c90" />
-                            <attribute name="bases" value="0x7f99f1de43f0" id="17054" addr="0x7f99f1de43f0" />
-                            <attribute name="allbases" value="0x7f99f1de4930" id="17055" addr="0x7f99f1de4930" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="17056" addr="0x7f99f1de6c90" />
-                            <typescope id="17057" addr="0x7f99f1de4370" >
-                                <attributelist id="17058" addr="0x7f99f1de4370" >
-                                    <attribute name="inherit" value="0x7f99f1de4490" id="17059" addr="0x7f99f1de4490" />
-                                    <attribute name="name" value="WindowXMLDialog" id="17060" addr="0x7f99f1de6c90" />
-                                    <typetab id="17061" addr="0x7f99f1de4390" >
-                                        <attributelist id="17062" addr="0x7f99f1de4390" >
+                            <attribute name="module" value="xbmcgui" id="17052" addr="0x7fca4698e2f0" />
+                            <attribute name="feature_director" value="1" id="17053" addr="0x7fca46934c90" />
+                            <attribute name="bases" value="0x7fca469323f0" id="17054" addr="0x7fca469323f0" />
+                            <attribute name="allbases" value="0x7fca46932930" id="17055" addr="0x7fca46932930" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="17056" addr="0x7fca46934c90" />
+                            <typescope id="17057" addr="0x7fca46932370" >
+                                <attributelist id="17058" addr="0x7fca46932370" >
+                                    <attribute name="inherit" value="0x7fca46932490" id="17059" addr="0x7fca46932490" />
+                                    <attribute name="name" value="WindowXMLDialog" id="17060" addr="0x7fca46934c90" />
+                                    <typetab id="17061" addr="0x7fca46932390" >
+                                        <attributelist id="17062" addr="0x7fca46932390" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f99f1dd2150" id="17063" addr="0x7f99f1dd2150" />
-                                    <attribute name="qname" value="XBMCAddon::xbmcgui::WindowXMLDialog" id="17064" addr="0x7f99f1de6c90" />
-                                    <attribute name="symtab" value="0x7f99f1db7850" id="17065" addr="0x7f99f1db7850" />
+                                    <attribute name="parent" value="0x7fca46920150" id="17063" addr="0x7fca46920150" />
+                                    <attribute name="qname" value="XBMCAddon::xbmcgui::WindowXMLDialog" id="17064" addr="0x7fca46934c90" />
+                                    <attribute name="symtab" value="0x7fca46905850" id="17065" addr="0x7fca46905850" />
                                 </attributelist >
-                                <typescopesitem id="17066" addr="0x7f99f1de4490" >
-                                    <attributelist id="17067" addr="0x7f99f1de4490" >
+                                <typescopesitem id="17066" addr="0x7fca46932490" >
+                                    <attributelist id="17067" addr="0x7fca46932490" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="17068" addr="0x7f99f1de4310" >
-                                    <attributelist id="17069" addr="0x7f99f1de4310" >
+                                <typescopesitem id="17068" addr="0x7fca46932310" >
+                                    <attributelist id="17069" addr="0x7fca46932310" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="17070" addr="0x7f99f1de4390" >
-                                    <attributelist id="17071" addr="0x7f99f1de4390" >
+                                <typescopesitem id="17070" addr="0x7fca46932390" >
+                                    <attributelist id="17071" addr="0x7fca46932390" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="17072" addr="0x7f99f1dd2150" >
-                                    <attributelist id="17073" addr="0x7f99f1dd2150" >
-                                        <attribute name="name" value="xbmcgui" id="17074" addr="0x7f99f1de6c90" />
-                                        <typetab id="17075" addr="0x7f99f1dd2170" >
-                                            <attributelist id="17076" addr="0x7f99f1dd2170" >
-                                                <attribute name="InterceptorBase" value="InterceptorBase" id="17077" addr="0x7f99f1de6c90" />
-                                                <attribute name="Dialog" value="Dialog" id="17078" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="17079" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="17080" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlTextBox" value="ControlTextBox" id="17081" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="17082" addr="0x7f99f1de6c90" />
-                                                <attribute name="Window" value="Window" id="17083" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="17084" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlList" value="ControlList" id="17085" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="17086" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlImage" value="ControlImage" id="17087" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlButton" value="ControlButton" id="17088" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlGroup" value="ControlGroup" id="17089" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogBusy" value="DialogBusy" id="17090" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="17091" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSpin" value="ControlSpin" id="17092" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlEdit" value="ControlEdit" id="17093" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="17094" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="17095" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlLabel" value="ControlLabel" id="17096" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlProgress" value="ControlProgress" id="17097" addr="0x7f99f1de6c90" />
-                                                <attribute name="Control" value="Control" id="17098" addr="0x7f99f1de6c90" />
-                                                <attribute name="ControlSlider" value="ControlSlider" id="17099" addr="0x7f99f1de6c90" />
-                                                <attribute name="DialogProgress" value="DialogProgress" id="17100" addr="0x7f99f1de6c90" />
-                                                <attribute name="Action" value="Action" id="17101" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowDialog" value="WindowDialog" id="17102" addr="0x7f99f1de6c90" />
-                                                <attribute name="WindowXML" value="WindowXML" id="17103" addr="0x7f99f1de6c90" />
-                                                <attribute name="ListItem" value="ListItem" id="17104" addr="0x7f99f1de6c90" />
-                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="17105" addr="0x7f99f1de6c90" />
+                                <typescopesitem id="17072" addr="0x7fca46920150" >
+                                    <attributelist id="17073" addr="0x7fca46920150" >
+                                        <attribute name="name" value="xbmcgui" id="17074" addr="0x7fca46934c90" />
+                                        <typetab id="17075" addr="0x7fca46920170" >
+                                            <attributelist id="17076" addr="0x7fca46920170" >
+                                                <attribute name="InterceptorBase" value="InterceptorBase" id="17077" addr="0x7fca46934c90" />
+                                                <attribute name="Dialog" value="Dialog" id="17078" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLDialog" value="WindowXMLDialog" id="17079" addr="0x7fca46934c90" />
+                                                <attribute name="ListItemList" value="std::vector&lt;(p.XBMCAddon::xbmcgui::ListItem)>" id="17080" addr="0x7fca46934c90" />
+                                                <attribute name="ControlTextBox" value="ControlTextBox" id="17081" addr="0x7fca46934c90" />
+                                                <attribute name="ControlRadioButton" value="ControlRadioButton" id="17082" addr="0x7fca46934c90" />
+                                                <attribute name="Window" value="Window" id="17083" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelValue" value="Alternative&lt;(XBMCAddon::StringOrInt,std::vector&lt;(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>)>" id="17084" addr="0x7fca46934c90" />
+                                                <attribute name="ControlList" value="ControlList" id="17085" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXMLInterceptor" value="WindowXMLInterceptor" id="17086" addr="0x7fca46934c90" />
+                                                <attribute name="ControlImage" value="ControlImage" id="17087" addr="0x7fca46934c90" />
+                                                <attribute name="ControlButton" value="ControlButton" id="17088" addr="0x7fca46934c90" />
+                                                <attribute name="ControlGroup" value="ControlGroup" id="17089" addr="0x7fca46934c90" />
+                                                <attribute name="DialogBusy" value="DialogBusy" id="17090" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgressBG" value="DialogProgressBG" id="17091" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSpin" value="ControlSpin" id="17092" addr="0x7fca46934c90" />
+                                                <attribute name="ControlEdit" value="ControlEdit" id="17093" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelStringOrTuple" value="Alternative&lt;(XBMCAddon::StringOrInt,Tuple&lt;(XBMCAddon::String,XBMCAddon::StringOrInt)>)>" id="17094" addr="0x7fca46934c90" />
+                                                <attribute name="ControlFadeLabel" value="ControlFadeLabel" id="17095" addr="0x7fca46934c90" />
+                                                <attribute name="ControlLabel" value="ControlLabel" id="17096" addr="0x7fca46934c90" />
+                                                <attribute name="ControlProgress" value="ControlProgress" id="17097" addr="0x7fca46934c90" />
+                                                <attribute name="Control" value="Control" id="17098" addr="0x7fca46934c90" />
+                                                <attribute name="ControlSlider" value="ControlSlider" id="17099" addr="0x7fca46934c90" />
+                                                <attribute name="DialogProgress" value="DialogProgress" id="17100" addr="0x7fca46934c90" />
+                                                <attribute name="Action" value="Action" id="17101" addr="0x7fca46934c90" />
+                                                <attribute name="WindowDialog" value="WindowDialog" id="17102" addr="0x7fca46934c90" />
+                                                <attribute name="WindowXML" value="WindowXML" id="17103" addr="0x7fca46934c90" />
+                                                <attribute name="ListItem" value="ListItem" id="17104" addr="0x7fca46934c90" />
+                                                <attribute name="InfoLabelDict" value="XBMCAddon::Dictionary&lt;(XBMCAddon::xbmcgui::InfoLabelValue)>" id="17105" addr="0x7fca46934c90" />
                                             </attributelist >
-                                            <typetabsitem id="17106" addr="0x7f99f1de1dd0" >
-                                                <attributelist id="17107" addr="0x7f99f1de1dd0" >
+                                            <typetabsitem id="17106" addr="0x7fca4692fdd0" >
+                                                <attributelist id="17107" addr="0x7fca4692fdd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="17108" addr="0x7f99f1dde790" >
-                                                <attributelist id="17109" addr="0x7f99f1dde790" >
+                                            <typetabsitem id="17108" addr="0x7fca4692c790" >
+                                                <attributelist id="17109" addr="0x7fca4692c790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="17110" addr="0x7f99f1de3f10" >
-                                                <attributelist id="17111" addr="0x7f99f1de3f10" >
+                                            <typetabsitem id="17110" addr="0x7fca46931f10" >
+                                                <attributelist id="17111" addr="0x7fca46931f10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="17112" addr="0x7f99f1dd67b0" >
-                                                <attributelist id="17113" addr="0x7f99f1dd67b0" >
+                                            <typetabsitem id="17112" addr="0x7fca469247b0" >
+                                                <attributelist id="17113" addr="0x7fca469247b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="17114" addr="0x7f99f1ddafd0" >
-                                                <attributelist id="17115" addr="0x7f99f1ddafd0" >
+                                            <typetabsitem id="17114" addr="0x7fca46928fd0" >
+                                                <attributelist id="17115" addr="0x7fca46928fd0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="17116" addr="0x7f99f1ddd430" >
-                                                <attributelist id="17117" addr="0x7f99f1ddd430" >
+                                            <typetabsitem id="17116" addr="0x7fca4692b430" >
+                                                <attributelist id="17117" addr="0x7fca4692b430" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="17118" addr="0x7f99f1de2130" >
-                                                <attributelist id="17119" addr="0x7f99f1de2130" >
+                                            <typetabsitem id="17118" addr="0x7fca46930130" >
+                                                <attributelist id="17119" addr="0x7fca46930130" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="17120" addr="0x7f99f1dd2f50" >
-                                                <attributelist id="17121" addr="0x7f99f1dd2f50" >
+                                            <typetabsitem id="17120" addr="0x7fca46920f50" >
+                                                <attributelist id="17121" addr="0x7fca46920f50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="17122" addr="0x7f99f1dd9650" >
-                                                <attributelist id="17123" addr="0x7f99f1dd9650" >
+                                            <typetabsitem id="17122" addr="0x7fca46927650" >
+                                                <attributelist id="17123" addr="0x7fca46927650" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="17124" addr="0x7f99f1de3390" >
-                                                <attributelist id="17125" addr="0x7f99f1de3390" >
+                                            <typetabsitem id="17124" addr="0x7fca46931390" >
+                                                <attributelist id="17125" addr="0x7fca46931390" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="17126" addr="0x7f99f1ddb7b0" >
-                                                <attributelist id="17127" addr="0x7f99f1ddb7b0" >
+                                            <typetabsitem id="17126" addr="0x7fca469297b0" >
+                                                <attributelist id="17127" addr="0x7fca469297b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="17128" addr="0x7f99f1ddc4b0" >
-                                                <attributelist id="17129" addr="0x7f99f1ddc4b0" >
+                                            <typetabsitem id="17128" addr="0x7fca4692a4b0" >
+                                                <attributelist id="17129" addr="0x7fca4692a4b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="17130" addr="0x7f99f1ddcf90" >
-                                                <attributelist id="17131" addr="0x7f99f1ddcf90" >
+                                            <typetabsitem id="17130" addr="0x7fca4692af90" >
+                                                <attributelist id="17131" addr="0x7fca4692af90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="17132" addr="0x7f99f1de11b0" >
-                                                <attributelist id="17133" addr="0x7f99f1de11b0" >
+                                            <typetabsitem id="17132" addr="0x7fca4692f1b0" >
+                                                <attributelist id="17133" addr="0x7fca4692f1b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="17134" addr="0x7f99f1de15b0" >
-                                                <attributelist id="17135" addr="0x7f99f1de15b0" >
+                                            <typetabsitem id="17134" addr="0x7fca4692f5b0" >
+                                                <attributelist id="17135" addr="0x7fca4692f5b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="17136" addr="0x7f99f1dd77f0" >
-                                                <attributelist id="17137" addr="0x7f99f1dd77f0" >
+                                            <typetabsitem id="17136" addr="0x7fca469257f0" >
+                                                <attributelist id="17137" addr="0x7fca469257f0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="17138" addr="0x7f99f1dd8b30" >
-                                                <attributelist id="17139" addr="0x7f99f1dd8b30" >
+                                            <typetabsitem id="17138" addr="0x7fca46926b30" >
+                                                <attributelist id="17139" addr="0x7fca46926b30" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="17140" addr="0x7f99f1dd2c50" >
-                                                <attributelist id="17141" addr="0x7f99f1dd2c50" >
+                                            <typetabsitem id="17140" addr="0x7fca46920c50" >
+                                                <attributelist id="17141" addr="0x7fca46920c50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="17142" addr="0x7f99f1dda790" >
-                                                <attributelist id="17143" addr="0x7f99f1dda790" >
+                                            <typetabsitem id="17142" addr="0x7fca46928790" >
+                                                <attributelist id="17143" addr="0x7fca46928790" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="17144" addr="0x7f99f1dd8030" >
-                                                <attributelist id="17145" addr="0x7f99f1dd8030" >
+                                            <typetabsitem id="17144" addr="0x7fca46926030" >
+                                                <attributelist id="17145" addr="0x7fca46926030" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="17146" addr="0x7f99f1ddbe10" >
-                                                <attributelist id="17147" addr="0x7f99f1ddbe10" >
+                                            <typetabsitem id="17146" addr="0x7fca46929e10" >
+                                                <attributelist id="17147" addr="0x7fca46929e10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="17148" addr="0x7f99f1dd6b10" >
-                                                <attributelist id="17149" addr="0x7f99f1dd6b10" >
+                                            <typetabsitem id="17148" addr="0x7fca46924b10" >
+                                                <attributelist id="17149" addr="0x7fca46924b10" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="17150" addr="0x7f99f1dddf90" >
-                                                <attributelist id="17151" addr="0x7f99f1dddf90" >
+                                            <typetabsitem id="17150" addr="0x7fca4692bf90" >
+                                                <attributelist id="17151" addr="0x7fca4692bf90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="17152" addr="0x7f99f1de0530" >
-                                                <attributelist id="17153" addr="0x7f99f1de0530" >
+                                            <typetabsitem id="17152" addr="0x7fca4692e530" >
+                                                <attributelist id="17153" addr="0x7fca4692e530" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="17154" addr="0x7f99f1de1e50" >
-                                                <attributelist id="17155" addr="0x7f99f1de1e50" >
+                                            <typetabsitem id="17154" addr="0x7fca4692fe50" >
+                                                <attributelist id="17155" addr="0x7fca4692fe50" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="17156" addr="0x7f99f1de2d90" >
-                                                <attributelist id="17157" addr="0x7f99f1de2d90" >
+                                            <typetabsitem id="17156" addr="0x7fca46930d90" >
+                                                <attributelist id="17157" addr="0x7fca46930d90" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="17158" addr="0x7f99f1de3410" >
-                                                <attributelist id="17159" addr="0x7f99f1de3410" >
+                                            <typetabsitem id="17158" addr="0x7fca46931410" >
+                                                <attributelist id="17159" addr="0x7fca46931410" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="17160" addr="0x7f99f1dd3590" >
-                                                <attributelist id="17161" addr="0x7f99f1dd3590" >
+                                            <typetabsitem id="17160" addr="0x7fca46921590" >
+                                                <attributelist id="17161" addr="0x7fca46921590" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="17162" addr="0x7f99f1dd3390" >
-                                                <attributelist id="17163" addr="0x7f99f1dd3390" >
+                                            <typetabsitem id="17162" addr="0x7fca46921390" >
+                                                <attributelist id="17163" addr="0x7fca46921390" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7f99f1dd1d70" id="17164" addr="0x7f99f1dd1d70" />
-                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="17165" addr="0x7f99f1de6c90" />
-                                        <attribute name="symtab" value="0x7f99f1e40fb0" id="17166" addr="0x7f99f1e40fb0" />
+                                        <attribute name="parent" value="0x7fca4691fd70" id="17164" addr="0x7fca4691fd70" />
+                                        <attribute name="qname" value="XBMCAddon::xbmcgui" id="17165" addr="0x7fca46934c90" />
+                                        <attribute name="symtab" value="0x7fca4698efb0" id="17166" addr="0x7fca4698efb0" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="17167" addr="0x7f99f1de43b0" >
-                                    <attributelist id="17168" addr="0x7f99f1de43b0" >
+                                <typescopesitem id="17167" addr="0x7fca469323b0" >
+                                    <attributelist id="17168" addr="0x7fca469323b0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="17169" addr="0x7f99f1db7850" >
-                                    <attributelist id="17170" addr="0x7f99f1db7850" >
-                                        <attribute name="inherit" value="0x7f99f1db7930" id="17171" addr="0x7f99f1db7930" />
-                                        <attribute name="name" value="WindowXMLDialog" id="17172" addr="0x7f99f1de6c90" />
-                                        <attribute name="csymtab" value="0x7f99f1db77d0" id="17173" addr="0x7f99f1db77d0" />
-                                        <attribute name="symtab" value="0x7f99f1db77f0" id="17174" addr="0x7f99f1db77f0" />
+                                <typescopesitem id="17169" addr="0x7fca46905850" >
+                                    <attributelist id="17170" addr="0x7fca46905850" >
+                                        <attribute name="inherit" value="0x7fca46905930" id="17171" addr="0x7fca46905930" />
+                                        <attribute name="name" value="WindowXMLDialog" id="17172" addr="0x7fca46934c90" />
+                                        <attribute name="csymtab" value="0x7fca469057d0" id="17173" addr="0x7fca469057d0" />
+                                        <attribute name="symtab" value="0x7fca469057f0" id="17174" addr="0x7fca469057f0" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <access id="17175" addr="0x7f99f1db7790" >
-                            <attributelist id="17176" addr="0x7f99f1db7790" >
-                                <attribute name="kind" value="public" id="17177" addr="0x7f99f1de6c90" />
+                        <access id="17175" addr="0x7fca46905790" >
+                            <attributelist id="17176" addr="0x7fca46905790" >
+                                <attribute name="kind" value="public" id="17177" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="17178" addr="0x7f99f1db7fb0" >
-                            <attributelist id="17179" addr="0x7f99f1db7fb0" >
-                                <attribute name="name" value="WindowXMLDialog" id="17180" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="17181" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1db7850" id="17182" addr="0x7f99f1db7850" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1db8290" id="17183" addr="0x7f99f1db8290" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1db8290" id="17184" addr="0x7f99f1db8290" />
-                                <attribute name="sym_name" value="WindowXMLDialog" id="17185" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).String,r.q(const).String,r.q(const).String,r.q(const).String)." id="17186" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="17187" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_director" value="1" id="17188" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_python_nokwds" value="true" id="17189" addr="0x7f99f1de6c90" />
-                                <parmlist id="17190" addr="0x7f99f1db7ab0" >
+                        <constructor id="17178" addr="0x7fca46905fb0" >
+                            <attributelist id="17179" addr="0x7fca46905fb0" >
+                                <attribute name="name" value="WindowXMLDialog" id="17180" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="17181" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca46905850" id="17182" addr="0x7fca46905850" />
+                                <attribute name="sym_nextSibling" value="0x7fca46906290" id="17183" addr="0x7fca46906290" />
+                                <attribute name="csym_nextSibling" value="0x7fca46906290" id="17184" addr="0x7fca46906290" />
+                                <attribute name="sym_name" value="WindowXMLDialog" id="17185" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).String,r.q(const).String,r.q(const).String,r.q(const).String)." id="17186" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="17187" addr="0x7fca46934c90" />
+                                <attribute name="feature_director" value="1" id="17188" addr="0x7fca46934c90" />
+                                <attribute name="feature_python_nokwds" value="true" id="17189" addr="0x7fca46934c90" />
+                                <parmlist id="17190" addr="0x7fca46905ab0" >
                                     <parm id="17191">
-                                        <attributelist id="17192" addr="0x7f99f1db7ab0" >
-                                            <attribute name="name" value="xmlFilename" id="17193" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="17194" addr="0x7f99f1de6c90" />
+                                        <attributelist id="17192" addr="0x7fca46905ab0" >
+                                            <attribute name="name" value="xmlFilename" id="17193" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="17194" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="17195">
-                                        <attributelist id="17196" addr="0x7f99f1db7bf0" >
-                                            <attribute name="name" value="scriptPath" id="17197" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="17198" addr="0x7f99f1de6c90" />
+                                        <attributelist id="17196" addr="0x7fca46905bf0" >
+                                            <attribute name="name" value="scriptPath" id="17197" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="17198" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="17199">
-                                        <attributelist id="17200" addr="0x7f99f1db7d70" >
-                                            <attribute name="name" value="defaultSkin" id="17201" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="&quot;Default&quot;" id="17202" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="17203" addr="0x7f99f1de6c90" />
+                                        <attributelist id="17200" addr="0x7fca46905d70" >
+                                            <attribute name="name" value="defaultSkin" id="17201" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="&quot;Default&quot;" id="17202" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="17203" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="17204">
-                                        <attributelist id="17205" addr="0x7f99f1db7ef0" >
-                                            <attribute name="name" value="defaultRes" id="17206" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="&quot;720p&quot;" id="17207" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="17208" addr="0x7f99f1de6c90" />
+                                        <attributelist id="17205" addr="0x7fca46905ef0" >
+                                            <attribute name="name" value="defaultRes" id="17206" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="&quot;720p&quot;" id="17207" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="17208" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overloaded" value="0x7f99f1db7fb0" id="17209" addr="0x7f99f1db7fb0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="17210" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="17211" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overloaded" value="0x7fca46905fb0" id="17209" addr="0x7fca46905fb0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="17210" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="17211" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="17212" addr="0x7f99f1db8290" >
-                            <attributelist id="17213" addr="0x7f99f1db8290" >
-                                <attribute name="name" value="WindowXMLDialog" id="17214" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="17215" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1db7850" id="17216" addr="0x7f99f1db7850" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1db7fb0" id="17217" addr="0x7f99f1db7fb0" />
-                                <attribute name="sym_name" value="WindowXMLDialog" id="17218" addr="0x7f99f1de6c90" />
-                                <attribute name="csym_nextSibling" value="0x7f99f1db84d0" id="17219" addr="0x7f99f1db84d0" />
-                                <attribute name="sym_nextSibling" value="0x7f99f1db84d0" id="17220" addr="0x7f99f1db84d0" />
-                                <attribute name="decl" value="f(r.q(const).String,r.q(const).String,r.q(const).String)." id="17221" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1db7fb0" id="17222" addr="0x7f99f1db7fb0" />
-                                <attribute name="access" value="public" id="17223" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_director" value="1" id="17224" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1db7fb0" id="17225" addr="0x7f99f1db7fb0" />
-                                <attribute name="feature_python_nokwds" value="true" id="17226" addr="0x7f99f1de6c90" />
-                                <parmlist id="17227" addr="0x7f99f1db8050" >
+                        <constructor id="17212" addr="0x7fca46906290" >
+                            <attributelist id="17213" addr="0x7fca46906290" >
+                                <attribute name="name" value="WindowXMLDialog" id="17214" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="17215" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca46905850" id="17216" addr="0x7fca46905850" />
+                                <attribute name="sym_previousSibling" value="0x7fca46905fb0" id="17217" addr="0x7fca46905fb0" />
+                                <attribute name="sym_name" value="WindowXMLDialog" id="17218" addr="0x7fca46934c90" />
+                                <attribute name="csym_nextSibling" value="0x7fca469064d0" id="17219" addr="0x7fca469064d0" />
+                                <attribute name="sym_nextSibling" value="0x7fca469064d0" id="17220" addr="0x7fca469064d0" />
+                                <attribute name="decl" value="f(r.q(const).String,r.q(const).String,r.q(const).String)." id="17221" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca46905fb0" id="17222" addr="0x7fca46905fb0" />
+                                <attribute name="access" value="public" id="17223" addr="0x7fca46934c90" />
+                                <attribute name="feature_director" value="1" id="17224" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca46905fb0" id="17225" addr="0x7fca46905fb0" />
+                                <attribute name="feature_python_nokwds" value="true" id="17226" addr="0x7fca46934c90" />
+                                <parmlist id="17227" addr="0x7fca46906050" >
                                     <parm id="17228">
-                                        <attributelist id="17229" addr="0x7f99f1db8050" >
-                                            <attribute name="name" value="xmlFilename" id="17230" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="17231" addr="0x7f99f1de6c90" />
+                                        <attributelist id="17229" addr="0x7fca46906050" >
+                                            <attribute name="name" value="xmlFilename" id="17230" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="17231" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="17232">
-                                        <attributelist id="17233" addr="0x7f99f1db8150" >
-                                            <attribute name="name" value="scriptPath" id="17234" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="17235" addr="0x7f99f1de6c90" />
+                                        <attributelist id="17233" addr="0x7fca46906150" >
+                                            <attribute name="name" value="scriptPath" id="17234" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="17235" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="17236">
-                                        <attributelist id="17237" addr="0x7f99f1db81d0" >
-                                            <attribute name="name" value="defaultSkin" id="17238" addr="0x7f99f1de6c90" />
-                                            <attribute name="value" value="&quot;Default&quot;" id="17239" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="17240" addr="0x7f99f1de6c90" />
+                                        <attributelist id="17237" addr="0x7fca469061d0" >
+                                            <attribute name="name" value="defaultSkin" id="17238" addr="0x7fca46934c90" />
+                                            <attribute name="value" value="&quot;Default&quot;" id="17239" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="17240" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_1" id="17241" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="17242" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="17241" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="17242" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="17243" addr="0x7f99f1db84d0" >
-                            <attributelist id="17244" addr="0x7f99f1db84d0" >
-                                <attribute name="name" value="WindowXMLDialog" id="17245" addr="0x7f99f1de6c90" />
-                                <attribute name="ismember" value="1" id="17246" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1db7850" id="17247" addr="0x7f99f1db7850" />
-                                <attribute name="sym_previousSibling" value="0x7f99f1db8290" id="17248" addr="0x7f99f1db8290" />
-                                <attribute name="sym_name" value="WindowXMLDialog" id="17249" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f(r.q(const).String,r.q(const).String)." id="17250" addr="0x7f99f1de6c90" />
-                                <attribute name="defaultargs" value="0x7f99f1db7fb0" id="17251" addr="0x7f99f1db7fb0" />
-                                <attribute name="access" value="public" id="17252" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_director" value="1" id="17253" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_overloaded" value="0x7f99f1db7fb0" id="17254" addr="0x7f99f1db7fb0" />
-                                <attribute name="feature_python_nokwds" value="true" id="17255" addr="0x7f99f1de6c90" />
-                                <parmlist id="17256" addr="0x7f99f1db8330" >
+                        <constructor id="17243" addr="0x7fca469064d0" >
+                            <attributelist id="17244" addr="0x7fca469064d0" >
+                                <attribute name="name" value="WindowXMLDialog" id="17245" addr="0x7fca46934c90" />
+                                <attribute name="ismember" value="1" id="17246" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca46905850" id="17247" addr="0x7fca46905850" />
+                                <attribute name="sym_previousSibling" value="0x7fca46906290" id="17248" addr="0x7fca46906290" />
+                                <attribute name="sym_name" value="WindowXMLDialog" id="17249" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f(r.q(const).String,r.q(const).String)." id="17250" addr="0x7fca46934c90" />
+                                <attribute name="defaultargs" value="0x7fca46905fb0" id="17251" addr="0x7fca46905fb0" />
+                                <attribute name="access" value="public" id="17252" addr="0x7fca46934c90" />
+                                <attribute name="feature_director" value="1" id="17253" addr="0x7fca46934c90" />
+                                <attribute name="sym_overloaded" value="0x7fca46905fb0" id="17254" addr="0x7fca46905fb0" />
+                                <attribute name="feature_python_nokwds" value="true" id="17255" addr="0x7fca46934c90" />
+                                <parmlist id="17256" addr="0x7fca46906330" >
                                     <parm id="17257">
-                                        <attributelist id="17258" addr="0x7f99f1db8330" >
-                                            <attribute name="name" value="xmlFilename" id="17259" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="17260" addr="0x7f99f1de6c90" />
+                                        <attributelist id="17258" addr="0x7fca46906330" >
+                                            <attribute name="name" value="xmlFilename" id="17259" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="17260" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                     <parm id="17261">
-                                        <attributelist id="17262" addr="0x7f99f1db8430" >
-                                            <attribute name="name" value="scriptPath" id="17263" addr="0x7f99f1de6c90" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="17264" addr="0x7f99f1de6c90" />
+                                        <attributelist id="17262" addr="0x7fca46906430" >
+                                            <attribute name="name" value="scriptPath" id="17263" addr="0x7fca46934c90" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="17264" addr="0x7fca46934c90" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overname" value="__SWIG_2" id="17265" addr="0x7f99f1de6c90" />
-                                <attribute name="feature_new" value="1" id="17266" addr="0x7f99f1de6c90" />
+                                <attribute name="sym_overname" value="__SWIG_2" id="17265" addr="0x7fca46934c90" />
+                                <attribute name="feature_new" value="1" id="17266" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </constructor >
-                        <destructor id="17267" addr="0x7f99f1db8670" >
-                            <attributelist id="17268" addr="0x7f99f1db8670" >
-                                <attribute name="ismember" value="1" id="17269" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_name" value="~WindowXMLDialog" id="17270" addr="0x7f99f1de6c90" />
-                                <attribute name="name" value="~WindowXMLDialog" id="17271" addr="0x7f99f1de6c90" />
-                                <attribute name="decl" value="f()." id="17272" addr="0x7f99f1de6c90" />
-                                <attribute name="access" value="public" id="17273" addr="0x7f99f1de6c90" />
-                                <attribute name="sym_symtab" value="0x7f99f1db7850" id="17274" addr="0x7f99f1db7850" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="17275" addr="0x7f99f1de6c90" />
+                        <destructor id="17267" addr="0x7fca46906670" >
+                            <attributelist id="17268" addr="0x7fca46906670" >
+                                <attribute name="ismember" value="1" id="17269" addr="0x7fca46934c90" />
+                                <attribute name="sym_name" value="~WindowXMLDialog" id="17270" addr="0x7fca46934c90" />
+                                <attribute name="name" value="~WindowXMLDialog" id="17271" addr="0x7fca46934c90" />
+                                <attribute name="decl" value="f()." id="17272" addr="0x7fca46934c90" />
+                                <attribute name="access" value="public" id="17273" addr="0x7fca46934c90" />
+                                <attribute name="sym_symtab" value="0x7fca46905850" id="17274" addr="0x7fca46905850" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="17275" addr="0x7fca46934c90" />
                             </attributelist >
                          
                         </destructor >
@@ -24570,4116 +24570,4116 @@
                 </namespace >
             </namespace >
         </include >
-        <include id="17276" addr="0x7f99f1db8870" >
-            <attributelist id="17277" addr="0x7f99f1db8870" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/input/actions/ActionIDs.h" id="17278" addr="0x7f99f1de6c90" />
+        <include id="17276" addr="0x7fca46906870" >
+            <attributelist id="17277" addr="0x7fca46906870" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/input/actions/ActionIDs.h" id="17278" addr="0x7fca46934c90" />
             </attributelist >
 
-            <constant id="17279" addr="0x7f99f1db8930" >
-                <attributelist id="17280" addr="0x7f99f1db8930" >
-                    <attribute name="sym_name" value="ACTION_NONE" id="17281" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_NONE" id="17282" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="0" id="17283" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17284" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="0" id="17285" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17286" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17287" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17288" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17289" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17290" addr="0x7f99f1db8a90" >
-                <attributelist id="17291" addr="0x7f99f1db8a90" >
-                    <attribute name="sym_name" value="ACTION_MOVE_LEFT" id="17292" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_MOVE_LEFT" id="17293" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="1" id="17294" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17295" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="1" id="17296" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17297" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17298" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17299" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17300" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17301" addr="0x7f99f1db8bf0" >
-                <attributelist id="17302" addr="0x7f99f1db8bf0" >
-                    <attribute name="sym_name" value="ACTION_MOVE_RIGHT" id="17303" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_MOVE_RIGHT" id="17304" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="2" id="17305" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17306" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="2" id="17307" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17308" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17309" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17310" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17311" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17312" addr="0x7f99f1db8d50" >
-                <attributelist id="17313" addr="0x7f99f1db8d50" >
-                    <attribute name="sym_name" value="ACTION_MOVE_UP" id="17314" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_MOVE_UP" id="17315" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="3" id="17316" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17317" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="3" id="17318" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17319" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17320" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17321" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17322" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17323" addr="0x7f99f1db8eb0" >
-                <attributelist id="17324" addr="0x7f99f1db8eb0" >
-                    <attribute name="sym_name" value="ACTION_MOVE_DOWN" id="17325" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_MOVE_DOWN" id="17326" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="4" id="17327" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17328" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="4" id="17329" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17330" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17331" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17332" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17333" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17334" addr="0x7f99f1db9010" >
-                <attributelist id="17335" addr="0x7f99f1db9010" >
-                    <attribute name="sym_name" value="ACTION_PAGE_UP" id="17336" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_PAGE_UP" id="17337" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="5" id="17338" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17339" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="5" id="17340" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17341" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17342" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17343" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17344" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17345" addr="0x7f99f1db9170" >
-                <attributelist id="17346" addr="0x7f99f1db9170" >
-                    <attribute name="sym_name" value="ACTION_PAGE_DOWN" id="17347" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_PAGE_DOWN" id="17348" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="6" id="17349" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17350" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="6" id="17351" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17352" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17353" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17354" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17355" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17356" addr="0x7f99f1db92d0" >
-                <attributelist id="17357" addr="0x7f99f1db92d0" >
-                    <attribute name="sym_name" value="ACTION_SELECT_ITEM" id="17358" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_SELECT_ITEM" id="17359" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="7" id="17360" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17361" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="7" id="17362" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17363" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17364" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17365" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17366" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17367" addr="0x7f99f1db9430" >
-                <attributelist id="17368" addr="0x7f99f1db9430" >
-                    <attribute name="sym_name" value="ACTION_HIGHLIGHT_ITEM" id="17369" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_HIGHLIGHT_ITEM" id="17370" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="8" id="17371" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17372" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="8" id="17373" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17374" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17375" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17376" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17377" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17378" addr="0x7f99f1db9590" >
-                <attributelist id="17379" addr="0x7f99f1db9590" >
-                    <attribute name="sym_name" value="ACTION_PARENT_DIR" id="17380" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_PARENT_DIR" id="17381" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="9" id="17382" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17383" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="9" id="17384" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17385" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17386" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17387" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17388" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17389" addr="0x7f99f1db96f0" >
-                <attributelist id="17390" addr="0x7f99f1db96f0" >
-                    <attribute name="sym_name" value="ACTION_PREVIOUS_MENU" id="17391" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_PREVIOUS_MENU" id="17392" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="10" id="17393" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17394" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="10" id="17395" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17396" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17397" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17398" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17399" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17400" addr="0x7f99f1db9850" >
-                <attributelist id="17401" addr="0x7f99f1db9850" >
-                    <attribute name="sym_name" value="ACTION_SHOW_INFO" id="17402" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_SHOW_INFO" id="17403" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="11" id="17404" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17405" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="11" id="17406" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17407" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17408" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17409" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17410" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17411" addr="0x7f99f1db99b0" >
-                <attributelist id="17412" addr="0x7f99f1db99b0" >
-                    <attribute name="sym_name" value="ACTION_PAUSE" id="17413" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_PAUSE" id="17414" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="12" id="17415" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17416" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="12" id="17417" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17418" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17419" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17420" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17421" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17422" addr="0x7f99f1db9b10" >
-                <attributelist id="17423" addr="0x7f99f1db9b10" >
-                    <attribute name="sym_name" value="ACTION_STOP" id="17424" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_STOP" id="17425" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="13" id="17426" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17427" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="13" id="17428" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17429" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17430" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17431" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17432" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17433" addr="0x7f99f1db9c70" >
-                <attributelist id="17434" addr="0x7f99f1db9c70" >
-                    <attribute name="sym_name" value="ACTION_NEXT_ITEM" id="17435" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_NEXT_ITEM" id="17436" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="14" id="17437" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17438" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="14" id="17439" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17440" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17441" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17442" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17443" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17444" addr="0x7f99f1db9dd0" >
-                <attributelist id="17445" addr="0x7f99f1db9dd0" >
-                    <attribute name="sym_name" value="ACTION_PREV_ITEM" id="17446" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_PREV_ITEM" id="17447" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="15" id="17448" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17449" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="15" id="17450" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17451" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17452" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17453" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17454" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17455" addr="0x7f99f1db9f30" >
-                <attributelist id="17456" addr="0x7f99f1db9f30" >
-                    <attribute name="sym_name" value="ACTION_FORWARD" id="17457" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_FORWARD" id="17458" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="16" id="17459" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17460" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="16" id="17461" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17462" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17463" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17464" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17465" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17466" addr="0x7f99f1dba090" >
-                <attributelist id="17467" addr="0x7f99f1dba090" >
-                    <attribute name="sym_name" value="ACTION_REWIND" id="17468" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_REWIND" id="17469" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="17" id="17470" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17471" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="17" id="17472" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17473" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17474" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17475" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17476" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17477" addr="0x7f99f1dba1f0" >
-                <attributelist id="17478" addr="0x7f99f1dba1f0" >
-                    <attribute name="sym_name" value="ACTION_SHOW_GUI" id="17479" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_SHOW_GUI" id="17480" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="18" id="17481" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17482" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="18" id="17483" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17484" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17485" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17486" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17487" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17488" addr="0x7f99f1dba350" >
-                <attributelist id="17489" addr="0x7f99f1dba350" >
-                    <attribute name="sym_name" value="ACTION_ASPECT_RATIO" id="17490" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_ASPECT_RATIO" id="17491" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="19" id="17492" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17493" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="19" id="17494" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17495" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17496" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17497" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17498" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17499" addr="0x7f99f1dba4b0" >
-                <attributelist id="17500" addr="0x7f99f1dba4b0" >
-                    <attribute name="sym_name" value="ACTION_STEP_FORWARD" id="17501" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_STEP_FORWARD" id="17502" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="20" id="17503" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17504" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="20" id="17505" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17506" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17507" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17508" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17509" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17510" addr="0x7f99f1dba610" >
-                <attributelist id="17511" addr="0x7f99f1dba610" >
-                    <attribute name="sym_name" value="ACTION_STEP_BACK" id="17512" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_STEP_BACK" id="17513" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="21" id="17514" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17515" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="21" id="17516" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17517" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17518" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17519" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17520" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17521" addr="0x7f99f1dba770" >
-                <attributelist id="17522" addr="0x7f99f1dba770" >
-                    <attribute name="sym_name" value="ACTION_BIG_STEP_FORWARD" id="17523" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_BIG_STEP_FORWARD" id="17524" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="22" id="17525" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17526" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="22" id="17527" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17528" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17529" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17530" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17531" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17532" addr="0x7f99f1dba8d0" >
-                <attributelist id="17533" addr="0x7f99f1dba8d0" >
-                    <attribute name="sym_name" value="ACTION_BIG_STEP_BACK" id="17534" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_BIG_STEP_BACK" id="17535" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="23" id="17536" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17537" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="23" id="17538" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17539" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17540" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17541" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17542" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17543" addr="0x7f99f1dbaa30" >
-                <attributelist id="17544" addr="0x7f99f1dbaa30" >
-                    <attribute name="sym_name" value="ACTION_SHOW_OSD" id="17545" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_SHOW_OSD" id="17546" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="24" id="17547" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17548" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="24" id="17549" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17550" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17551" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17552" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17553" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17554" addr="0x7f99f1dbab90" >
-                <attributelist id="17555" addr="0x7f99f1dbab90" >
-                    <attribute name="sym_name" value="ACTION_SHOW_SUBTITLES" id="17556" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_SHOW_SUBTITLES" id="17557" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="25" id="17558" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17559" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="25" id="17560" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17561" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17562" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17563" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17564" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17565" addr="0x7f99f1dbacf0" >
-                <attributelist id="17566" addr="0x7f99f1dbacf0" >
-                    <attribute name="sym_name" value="ACTION_NEXT_SUBTITLE" id="17567" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_NEXT_SUBTITLE" id="17568" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="26" id="17569" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17570" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="26" id="17571" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17572" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17573" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17574" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17575" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17576" addr="0x7f99f1dbae50" >
-                <attributelist id="17577" addr="0x7f99f1dbae50" >
-                    <attribute name="sym_name" value="ACTION_BROWSE_SUBTITLE" id="17578" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_BROWSE_SUBTITLE" id="17579" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="247" id="17580" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17581" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="247" id="17582" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17583" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17584" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17585" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17586" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17587" addr="0x7f99f1dbafb0" >
-                <attributelist id="17588" addr="0x7f99f1dbafb0" >
-                    <attribute name="sym_name" value="ACTION_PLAYER_DEBUG" id="17589" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_PLAYER_DEBUG" id="17590" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="27" id="17591" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17592" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="27" id="17593" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17594" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17595" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17596" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17597" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17598" addr="0x7f99f1dbb110" >
-                <attributelist id="17599" addr="0x7f99f1dbb110" >
-                    <attribute name="sym_name" value="ACTION_NEXT_PICTURE" id="17600" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_NEXT_PICTURE" id="17601" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="28" id="17602" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17603" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="28" id="17604" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17605" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17606" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17607" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17608" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17609" addr="0x7f99f1dbb270" >
-                <attributelist id="17610" addr="0x7f99f1dbb270" >
-                    <attribute name="sym_name" value="ACTION_PREV_PICTURE" id="17611" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_PREV_PICTURE" id="17612" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="29" id="17613" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17614" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="29" id="17615" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17616" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17617" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17618" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17619" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17620" addr="0x7f99f1dbb3d0" >
-                <attributelist id="17621" addr="0x7f99f1dbb3d0" >
-                    <attribute name="sym_name" value="ACTION_ZOOM_OUT" id="17622" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_ZOOM_OUT" id="17623" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="30" id="17624" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17625" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="30" id="17626" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17627" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17628" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17629" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17630" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17631" addr="0x7f99f1dbb530" >
-                <attributelist id="17632" addr="0x7f99f1dbb530" >
-                    <attribute name="sym_name" value="ACTION_ZOOM_IN" id="17633" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_ZOOM_IN" id="17634" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="31" id="17635" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17636" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="31" id="17637" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17638" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17639" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17640" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17641" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17642" addr="0x7f99f1dbb690" >
-                <attributelist id="17643" addr="0x7f99f1dbb690" >
-                    <attribute name="sym_name" value="ACTION_TOGGLE_SOURCE_DEST" id="17644" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_TOGGLE_SOURCE_DEST" id="17645" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="32" id="17646" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17647" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="32" id="17648" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17649" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17650" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17651" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17652" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17653" addr="0x7f99f1dbb7f0" >
-                <attributelist id="17654" addr="0x7f99f1dbb7f0" >
-                    <attribute name="sym_name" value="ACTION_SHOW_PLAYLIST" id="17655" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_SHOW_PLAYLIST" id="17656" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="33" id="17657" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17658" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="33" id="17659" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17660" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17661" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17662" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17663" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17664" addr="0x7f99f1dbb950" >
-                <attributelist id="17665" addr="0x7f99f1dbb950" >
-                    <attribute name="sym_name" value="ACTION_QUEUE_ITEM" id="17666" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_QUEUE_ITEM" id="17667" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="34" id="17668" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17669" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="34" id="17670" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17671" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17672" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17673" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17674" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17675" addr="0x7f99f1dbbab0" >
-                <attributelist id="17676" addr="0x7f99f1dbbab0" >
-                    <attribute name="sym_name" value="ACTION_REMOVE_ITEM" id="17677" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_REMOVE_ITEM" id="17678" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="35" id="17679" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17680" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="35" id="17681" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17682" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17683" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17684" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17685" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17686" addr="0x7f99f1dbbc10" >
-                <attributelist id="17687" addr="0x7f99f1dbbc10" >
-                    <attribute name="sym_name" value="ACTION_SHOW_FULLSCREEN" id="17688" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_SHOW_FULLSCREEN" id="17689" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="36" id="17690" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17691" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="36" id="17692" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17693" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17694" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17695" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17696" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17697" addr="0x7f99f1dbbd70" >
-                <attributelist id="17698" addr="0x7f99f1dbbd70" >
-                    <attribute name="sym_name" value="ACTION_ZOOM_LEVEL_NORMAL" id="17699" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_ZOOM_LEVEL_NORMAL" id="17700" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="37" id="17701" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17702" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="37" id="17703" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17704" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17705" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17706" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17707" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17708" addr="0x7f99f1dbbed0" >
-                <attributelist id="17709" addr="0x7f99f1dbbed0" >
-                    <attribute name="sym_name" value="ACTION_ZOOM_LEVEL_1" id="17710" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_ZOOM_LEVEL_1" id="17711" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="38" id="17712" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17713" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="38" id="17714" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17715" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17716" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17717" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17718" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17719" addr="0x7f99f1dbc030" >
-                <attributelist id="17720" addr="0x7f99f1dbc030" >
-                    <attribute name="sym_name" value="ACTION_ZOOM_LEVEL_2" id="17721" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_ZOOM_LEVEL_2" id="17722" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="39" id="17723" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17724" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="39" id="17725" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17726" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17727" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17728" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17729" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17730" addr="0x7f99f1dbc190" >
-                <attributelist id="17731" addr="0x7f99f1dbc190" >
-                    <attribute name="sym_name" value="ACTION_ZOOM_LEVEL_3" id="17732" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_ZOOM_LEVEL_3" id="17733" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="40" id="17734" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17735" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="40" id="17736" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17737" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17738" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17739" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17740" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17741" addr="0x7f99f1dbc2f0" >
-                <attributelist id="17742" addr="0x7f99f1dbc2f0" >
-                    <attribute name="sym_name" value="ACTION_ZOOM_LEVEL_4" id="17743" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_ZOOM_LEVEL_4" id="17744" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="41" id="17745" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17746" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="41" id="17747" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17748" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17749" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17750" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17751" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17752" addr="0x7f99f1dbc450" >
-                <attributelist id="17753" addr="0x7f99f1dbc450" >
-                    <attribute name="sym_name" value="ACTION_ZOOM_LEVEL_5" id="17754" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_ZOOM_LEVEL_5" id="17755" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="42" id="17756" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17757" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="42" id="17758" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17759" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17760" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17761" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17762" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17763" addr="0x7f99f1dbc5b0" >
-                <attributelist id="17764" addr="0x7f99f1dbc5b0" >
-                    <attribute name="sym_name" value="ACTION_ZOOM_LEVEL_6" id="17765" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_ZOOM_LEVEL_6" id="17766" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="43" id="17767" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17768" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="43" id="17769" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17770" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17771" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17772" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17773" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17774" addr="0x7f99f1dbc710" >
-                <attributelist id="17775" addr="0x7f99f1dbc710" >
-                    <attribute name="sym_name" value="ACTION_ZOOM_LEVEL_7" id="17776" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_ZOOM_LEVEL_7" id="17777" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="44" id="17778" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17779" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="44" id="17780" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17781" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17782" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17783" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17784" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17785" addr="0x7f99f1dbc870" >
-                <attributelist id="17786" addr="0x7f99f1dbc870" >
-                    <attribute name="sym_name" value="ACTION_ZOOM_LEVEL_8" id="17787" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_ZOOM_LEVEL_8" id="17788" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="45" id="17789" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17790" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="45" id="17791" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17792" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17793" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17794" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17795" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17796" addr="0x7f99f1dbc9d0" >
-                <attributelist id="17797" addr="0x7f99f1dbc9d0" >
-                    <attribute name="sym_name" value="ACTION_ZOOM_LEVEL_9" id="17798" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_ZOOM_LEVEL_9" id="17799" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="46" id="17800" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17801" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="46" id="17802" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17803" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17804" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17805" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17806" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17807" addr="0x7f99f1dbcb30" >
-                <attributelist id="17808" addr="0x7f99f1dbcb30" >
-                    <attribute name="sym_name" value="ACTION_CALIBRATE_SWAP_ARROWS" id="17809" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_CALIBRATE_SWAP_ARROWS" id="17810" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="47" id="17811" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17812" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="47" id="17813" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17814" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17815" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17816" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17817" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17818" addr="0x7f99f1dbcc90" >
-                <attributelist id="17819" addr="0x7f99f1dbcc90" >
-                    <attribute name="sym_name" value="ACTION_CALIBRATE_RESET" id="17820" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_CALIBRATE_RESET" id="17821" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="48" id="17822" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17823" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="48" id="17824" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17825" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17826" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17827" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17828" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17829" addr="0x7f99f1dbcdf0" >
-                <attributelist id="17830" addr="0x7f99f1dbcdf0" >
-                    <attribute name="sym_name" value="ACTION_ANALOG_MOVE" id="17831" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_ANALOG_MOVE" id="17832" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="49" id="17833" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17834" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="49" id="17835" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17836" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17837" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17838" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17839" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17840" addr="0x7f99f1dbcf50" >
-                <attributelist id="17841" addr="0x7f99f1dbcf50" >
-                    <attribute name="sym_name" value="ACTION_ROTATE_PICTURE_CW" id="17842" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_ROTATE_PICTURE_CW" id="17843" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="50" id="17844" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17845" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="50" id="17846" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17847" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17848" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17849" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17850" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17851" addr="0x7f99f1dbd0b0" >
-                <attributelist id="17852" addr="0x7f99f1dbd0b0" >
-                    <attribute name="sym_name" value="ACTION_ROTATE_PICTURE_CCW" id="17853" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_ROTATE_PICTURE_CCW" id="17854" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="51" id="17855" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17856" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="51" id="17857" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17858" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17859" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17860" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17861" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17862" addr="0x7f99f1dbd210" >
-                <attributelist id="17863" addr="0x7f99f1dbd210" >
-                    <attribute name="sym_name" value="ACTION_SUBTITLE_DELAY_MIN" id="17864" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_SUBTITLE_DELAY_MIN" id="17865" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="52" id="17866" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17867" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="52" id="17868" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17869" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17870" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17871" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17872" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17873" addr="0x7f99f1dbd370" >
-                <attributelist id="17874" addr="0x7f99f1dbd370" >
-                    <attribute name="sym_name" value="ACTION_SUBTITLE_DELAY_PLUS" id="17875" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_SUBTITLE_DELAY_PLUS" id="17876" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="53" id="17877" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17878" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="53" id="17879" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17880" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17881" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17882" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17883" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17884" addr="0x7f99f1dbd4d0" >
-                <attributelist id="17885" addr="0x7f99f1dbd4d0" >
-                    <attribute name="sym_name" value="ACTION_AUDIO_DELAY_MIN" id="17886" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_AUDIO_DELAY_MIN" id="17887" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="54" id="17888" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17889" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="54" id="17890" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17891" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17892" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17893" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17894" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17895" addr="0x7f99f1dbd630" >
-                <attributelist id="17896" addr="0x7f99f1dbd630" >
-                    <attribute name="sym_name" value="ACTION_AUDIO_DELAY_PLUS" id="17897" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_AUDIO_DELAY_PLUS" id="17898" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="55" id="17899" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17900" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="55" id="17901" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17902" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17903" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17904" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17905" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17906" addr="0x7f99f1dbd790" >
-                <attributelist id="17907" addr="0x7f99f1dbd790" >
-                    <attribute name="sym_name" value="ACTION_AUDIO_NEXT_LANGUAGE" id="17908" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_AUDIO_NEXT_LANGUAGE" id="17909" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="56" id="17910" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17911" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="56" id="17912" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17913" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17914" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17915" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17916" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17917" addr="0x7f99f1dbd8f0" >
-                <attributelist id="17918" addr="0x7f99f1dbd8f0" >
-                    <attribute name="sym_name" value="ACTION_CHANGE_RESOLUTION" id="17919" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_CHANGE_RESOLUTION" id="17920" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="57" id="17921" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17922" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="57" id="17923" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17924" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17925" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17926" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17927" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17928" addr="0x7f99f1dbda50" >
-                <attributelist id="17929" addr="0x7f99f1dbda50" >
-                    <attribute name="sym_name" value="REMOTE_0" id="17930" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="REMOTE_0" id="17931" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="58" id="17932" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17933" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="58" id="17934" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17935" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17936" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17937" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17938" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17939" addr="0x7f99f1dbdbb0" >
-                <attributelist id="17940" addr="0x7f99f1dbdbb0" >
-                    <attribute name="sym_name" value="REMOTE_1" id="17941" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="REMOTE_1" id="17942" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="59" id="17943" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17944" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="59" id="17945" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17946" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17947" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17948" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17949" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17950" addr="0x7f99f1dbdd10" >
-                <attributelist id="17951" addr="0x7f99f1dbdd10" >
-                    <attribute name="sym_name" value="REMOTE_2" id="17952" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="REMOTE_2" id="17953" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="60" id="17954" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17955" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="60" id="17956" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17957" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17958" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17959" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17960" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17961" addr="0x7f99f1dbde70" >
-                <attributelist id="17962" addr="0x7f99f1dbde70" >
-                    <attribute name="sym_name" value="REMOTE_3" id="17963" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="REMOTE_3" id="17964" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="61" id="17965" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17966" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="61" id="17967" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17968" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17969" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17970" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17971" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17972" addr="0x7f99f1dbdfd0" >
-                <attributelist id="17973" addr="0x7f99f1dbdfd0" >
-                    <attribute name="sym_name" value="REMOTE_4" id="17974" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="REMOTE_4" id="17975" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="62" id="17976" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17977" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="62" id="17978" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17979" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17980" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17981" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17982" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17983" addr="0x7f99f1dbe130" >
-                <attributelist id="17984" addr="0x7f99f1dbe130" >
-                    <attribute name="sym_name" value="REMOTE_5" id="17985" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="REMOTE_5" id="17986" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="63" id="17987" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17988" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="63" id="17989" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="17990" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="17991" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="17992" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="17993" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="17994" addr="0x7f99f1dbe290" >
-                <attributelist id="17995" addr="0x7f99f1dbe290" >
-                    <attribute name="sym_name" value="REMOTE_6" id="17996" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="REMOTE_6" id="17997" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="64" id="17998" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="17999" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="64" id="18000" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18001" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18002" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18003" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18004" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18005" addr="0x7f99f1dbe3f0" >
-                <attributelist id="18006" addr="0x7f99f1dbe3f0" >
-                    <attribute name="sym_name" value="REMOTE_7" id="18007" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="REMOTE_7" id="18008" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="65" id="18009" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18010" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="65" id="18011" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18012" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18013" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18014" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18015" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18016" addr="0x7f99f1dbe550" >
-                <attributelist id="18017" addr="0x7f99f1dbe550" >
-                    <attribute name="sym_name" value="REMOTE_8" id="18018" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="REMOTE_8" id="18019" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="66" id="18020" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18021" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="66" id="18022" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18023" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18024" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18025" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18026" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18027" addr="0x7f99f1dbe6b0" >
-                <attributelist id="18028" addr="0x7f99f1dbe6b0" >
-                    <attribute name="sym_name" value="REMOTE_9" id="18029" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="REMOTE_9" id="18030" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="67" id="18031" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18032" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="67" id="18033" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18034" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18035" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18036" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18037" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18038" addr="0x7f99f1dbe810" >
-                <attributelist id="18039" addr="0x7f99f1dbe810" >
-                    <attribute name="sym_name" value="ACTION_PLAYER_PROCESS_INFO" id="18040" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_PLAYER_PROCESS_INFO" id="18041" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="69" id="18042" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18043" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="69" id="18044" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18045" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18046" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18047" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18048" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18049" addr="0x7f99f1dbe970" >
-                <attributelist id="18050" addr="0x7f99f1dbe970" >
-                    <attribute name="sym_name" value="ACTION_PLAYER_PROGRAM_SELECT" id="18051" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_PLAYER_PROGRAM_SELECT" id="18052" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="70" id="18053" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18054" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="70" id="18055" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18056" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18057" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18058" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18059" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18060" addr="0x7f99f1dbead0" >
-                <attributelist id="18061" addr="0x7f99f1dbead0" >
-                    <attribute name="sym_name" value="ACTION_PLAYER_RESOLUTION_SELECT" id="18062" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_PLAYER_RESOLUTION_SELECT" id="18063" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="71" id="18064" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18065" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="71" id="18066" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18067" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18068" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18069" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18070" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18071" addr="0x7f99f1dbec30" >
-                <attributelist id="18072" addr="0x7f99f1dbec30" >
-                    <attribute name="sym_name" value="ACTION_SMALL_STEP_BACK" id="18073" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_SMALL_STEP_BACK" id="18074" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="76" id="18075" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18076" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="76" id="18077" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18078" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18079" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18080" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18081" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18082" addr="0x7f99f1dbed90" >
-                <attributelist id="18083" addr="0x7f99f1dbed90" >
-                    <attribute name="sym_name" value="ACTION_PLAYER_FORWARD" id="18084" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_PLAYER_FORWARD" id="18085" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="77" id="18086" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18087" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="77" id="18088" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18089" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18090" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18091" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18092" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18093" addr="0x7f99f1dbeef0" >
-                <attributelist id="18094" addr="0x7f99f1dbeef0" >
-                    <attribute name="sym_name" value="ACTION_PLAYER_REWIND" id="18095" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_PLAYER_REWIND" id="18096" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="78" id="18097" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18098" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="78" id="18099" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18100" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18101" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18102" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18103" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18104" addr="0x7f99f1dbf050" >
-                <attributelist id="18105" addr="0x7f99f1dbf050" >
-                    <attribute name="sym_name" value="ACTION_PLAYER_PLAY" id="18106" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_PLAYER_PLAY" id="18107" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="79" id="18108" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18109" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="79" id="18110" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18111" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18112" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18113" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18114" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18115" addr="0x7f99f1dbf1b0" >
-                <attributelist id="18116" addr="0x7f99f1dbf1b0" >
-                    <attribute name="sym_name" value="ACTION_DELETE_ITEM" id="18117" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_DELETE_ITEM" id="18118" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="80" id="18119" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18120" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="80" id="18121" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18122" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18123" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18124" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18125" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18126" addr="0x7f99f1dbf310" >
-                <attributelist id="18127" addr="0x7f99f1dbf310" >
-                    <attribute name="sym_name" value="ACTION_COPY_ITEM" id="18128" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_COPY_ITEM" id="18129" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="81" id="18130" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18131" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="81" id="18132" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18133" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18134" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18135" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18136" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18137" addr="0x7f99f1dbf470" >
-                <attributelist id="18138" addr="0x7f99f1dbf470" >
-                    <attribute name="sym_name" value="ACTION_MOVE_ITEM" id="18139" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_MOVE_ITEM" id="18140" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="82" id="18141" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18142" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="82" id="18143" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18144" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18145" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18146" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18147" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18148" addr="0x7f99f1dbf5d0" >
-                <attributelist id="18149" addr="0x7f99f1dbf5d0" >
-                    <attribute name="sym_name" value="ACTION_TAKE_SCREENSHOT" id="18150" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_TAKE_SCREENSHOT" id="18151" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="85" id="18152" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18153" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="85" id="18154" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18155" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18156" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18157" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18158" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18159" addr="0x7f99f1dbf730" >
-                <attributelist id="18160" addr="0x7f99f1dbf730" >
-                    <attribute name="sym_name" value="ACTION_RENAME_ITEM" id="18161" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_RENAME_ITEM" id="18162" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="87" id="18163" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18164" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="87" id="18165" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18166" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18167" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18168" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18169" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18170" addr="0x7f99f1dbf890" >
-                <attributelist id="18171" addr="0x7f99f1dbf890" >
-                    <attribute name="sym_name" value="ACTION_VOLUME_UP" id="18172" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_VOLUME_UP" id="18173" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="88" id="18174" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18175" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="88" id="18176" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18177" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18178" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18179" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18180" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18181" addr="0x7f99f1dbf9f0" >
-                <attributelist id="18182" addr="0x7f99f1dbf9f0" >
-                    <attribute name="sym_name" value="ACTION_VOLUME_DOWN" id="18183" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_VOLUME_DOWN" id="18184" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="89" id="18185" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18186" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="89" id="18187" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18188" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18189" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18190" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18191" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18192" addr="0x7f99f1dbfb50" >
-                <attributelist id="18193" addr="0x7f99f1dbfb50" >
-                    <attribute name="sym_name" value="ACTION_VOLAMP" id="18194" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_VOLAMP" id="18195" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="90" id="18196" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18197" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="90" id="18198" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18199" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18200" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18201" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18202" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18203" addr="0x7f99f1dbfcb0" >
-                <attributelist id="18204" addr="0x7f99f1dbfcb0" >
-                    <attribute name="sym_name" value="ACTION_MUTE" id="18205" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_MUTE" id="18206" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="91" id="18207" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18208" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="91" id="18209" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18210" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18211" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18212" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18213" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18214" addr="0x7f99f1dbfe10" >
-                <attributelist id="18215" addr="0x7f99f1dbfe10" >
-                    <attribute name="sym_name" value="ACTION_NAV_BACK" id="18216" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_NAV_BACK" id="18217" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="92" id="18218" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18219" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="92" id="18220" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18221" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18222" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18223" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18224" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18225" addr="0x7f99f1dbff70" >
-                <attributelist id="18226" addr="0x7f99f1dbff70" >
-                    <attribute name="sym_name" value="ACTION_VOLAMP_UP" id="18227" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_VOLAMP_UP" id="18228" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="93" id="18229" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18230" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="93" id="18231" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18232" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18233" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18234" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18235" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18236" addr="0x7f99f1dc00d0" >
-                <attributelist id="18237" addr="0x7f99f1dc00d0" >
-                    <attribute name="sym_name" value="ACTION_VOLAMP_DOWN" id="18238" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_VOLAMP_DOWN" id="18239" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="94" id="18240" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18241" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="94" id="18242" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18243" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18244" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18245" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18246" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18247" addr="0x7f99f1dc0230" >
-                <attributelist id="18248" addr="0x7f99f1dc0230" >
-                    <attribute name="sym_name" value="ACTION_CREATE_EPISODE_BOOKMARK" id="18249" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_CREATE_EPISODE_BOOKMARK" id="18250" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="95" id="18251" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18252" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="95" id="18253" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18254" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18255" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18256" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18257" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18258" addr="0x7f99f1dc0390" >
-                <attributelist id="18259" addr="0x7f99f1dc0390" >
-                    <attribute name="sym_name" value="ACTION_CREATE_BOOKMARK" id="18260" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_CREATE_BOOKMARK" id="18261" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="96" id="18262" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18263" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="96" id="18264" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18265" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18266" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18267" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18268" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18269" addr="0x7f99f1dc04f0" >
-                <attributelist id="18270" addr="0x7f99f1dc04f0" >
-                    <attribute name="sym_name" value="ACTION_CHAPTER_OR_BIG_STEP_FORWARD" id="18271" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_CHAPTER_OR_BIG_STEP_FORWARD" id="18272" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="97" id="18273" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18274" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="97" id="18275" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18276" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18277" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18278" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18279" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18280" addr="0x7f99f1dc0650" >
-                <attributelist id="18281" addr="0x7f99f1dc0650" >
-                    <attribute name="sym_name" value="ACTION_CHAPTER_OR_BIG_STEP_BACK" id="18282" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_CHAPTER_OR_BIG_STEP_BACK" id="18283" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="98" id="18284" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18285" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="98" id="18286" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18287" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18288" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18289" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18290" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18291" addr="0x7f99f1dc07b0" >
-                <attributelist id="18292" addr="0x7f99f1dc07b0" >
-                    <attribute name="sym_name" value="ACTION_CYCLE_SUBTITLE" id="18293" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_CYCLE_SUBTITLE" id="18294" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="99" id="18295" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18296" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="99" id="18297" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18298" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18299" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18300" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18301" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18302" addr="0x7f99f1dc0910" >
-                <attributelist id="18303" addr="0x7f99f1dc0910" >
-                    <attribute name="sym_name" value="ACTION_MOUSE_START" id="18304" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_MOUSE_START" id="18305" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="100" id="18306" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18307" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="100" id="18308" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18309" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18310" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18311" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18312" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18313" addr="0x7f99f1dc0a70" >
-                <attributelist id="18314" addr="0x7f99f1dc0a70" >
-                    <attribute name="sym_name" value="ACTION_MOUSE_LEFT_CLICK" id="18315" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_MOUSE_LEFT_CLICK" id="18316" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="100" id="18317" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18318" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="100" id="18319" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18320" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18321" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18322" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18323" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18324" addr="0x7f99f1dc0bd0" >
-                <attributelist id="18325" addr="0x7f99f1dc0bd0" >
-                    <attribute name="sym_name" value="ACTION_MOUSE_RIGHT_CLICK" id="18326" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_MOUSE_RIGHT_CLICK" id="18327" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="101" id="18328" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18329" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="101" id="18330" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18331" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18332" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18333" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18334" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18335" addr="0x7f99f1dc0d30" >
-                <attributelist id="18336" addr="0x7f99f1dc0d30" >
-                    <attribute name="sym_name" value="ACTION_MOUSE_MIDDLE_CLICK" id="18337" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_MOUSE_MIDDLE_CLICK" id="18338" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="102" id="18339" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18340" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="102" id="18341" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18342" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18343" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18344" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18345" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18346" addr="0x7f99f1dc0e90" >
-                <attributelist id="18347" addr="0x7f99f1dc0e90" >
-                    <attribute name="sym_name" value="ACTION_MOUSE_DOUBLE_CLICK" id="18348" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_MOUSE_DOUBLE_CLICK" id="18349" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="103" id="18350" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18351" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="103" id="18352" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18353" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18354" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18355" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18356" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18357" addr="0x7f99f1dc0ff0" >
-                <attributelist id="18358" addr="0x7f99f1dc0ff0" >
-                    <attribute name="sym_name" value="ACTION_MOUSE_WHEEL_UP" id="18359" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_MOUSE_WHEEL_UP" id="18360" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="104" id="18361" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18362" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="104" id="18363" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18364" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18365" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18366" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18367" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18368" addr="0x7f99f1dc1150" >
-                <attributelist id="18369" addr="0x7f99f1dc1150" >
-                    <attribute name="sym_name" value="ACTION_MOUSE_WHEEL_DOWN" id="18370" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_MOUSE_WHEEL_DOWN" id="18371" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="105" id="18372" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18373" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="105" id="18374" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18375" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18376" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18377" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18378" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18379" addr="0x7f99f1dc12b0" >
-                <attributelist id="18380" addr="0x7f99f1dc12b0" >
-                    <attribute name="sym_name" value="ACTION_MOUSE_DRAG" id="18381" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_MOUSE_DRAG" id="18382" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="106" id="18383" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18384" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="106" id="18385" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18386" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18387" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18388" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18389" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18390" addr="0x7f99f1dc1410" >
-                <attributelist id="18391" addr="0x7f99f1dc1410" >
-                    <attribute name="sym_name" value="ACTION_MOUSE_MOVE" id="18392" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_MOUSE_MOVE" id="18393" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="107" id="18394" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18395" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="107" id="18396" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18397" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18398" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18399" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18400" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18401" addr="0x7f99f1dc1570" >
-                <attributelist id="18402" addr="0x7f99f1dc1570" >
-                    <attribute name="sym_name" value="ACTION_MOUSE_LONG_CLICK" id="18403" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_MOUSE_LONG_CLICK" id="18404" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="108" id="18405" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18406" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="108" id="18407" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18408" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18409" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18410" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18411" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18412" addr="0x7f99f1dc16d0" >
-                <attributelist id="18413" addr="0x7f99f1dc16d0" >
-                    <attribute name="sym_name" value="ACTION_MOUSE_END" id="18414" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_MOUSE_END" id="18415" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="109" id="18416" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18417" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="109" id="18418" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18419" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18420" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18421" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18422" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18423" addr="0x7f99f1dc1830" >
-                <attributelist id="18424" addr="0x7f99f1dc1830" >
-                    <attribute name="sym_name" value="ACTION_BACKSPACE" id="18425" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_BACKSPACE" id="18426" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="110" id="18427" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18428" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="110" id="18429" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18430" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18431" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18432" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18433" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18434" addr="0x7f99f1dc1990" >
-                <attributelist id="18435" addr="0x7f99f1dc1990" >
-                    <attribute name="sym_name" value="ACTION_SCROLL_UP" id="18436" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_SCROLL_UP" id="18437" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="111" id="18438" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18439" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="111" id="18440" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18441" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18442" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18443" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18444" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18445" addr="0x7f99f1dc1af0" >
-                <attributelist id="18446" addr="0x7f99f1dc1af0" >
-                    <attribute name="sym_name" value="ACTION_SCROLL_DOWN" id="18447" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_SCROLL_DOWN" id="18448" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="112" id="18449" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18450" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="112" id="18451" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18452" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18453" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18454" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18455" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18456" addr="0x7f99f1dc1c50" >
-                <attributelist id="18457" addr="0x7f99f1dc1c50" >
-                    <attribute name="sym_name" value="ACTION_ANALOG_FORWARD" id="18458" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_ANALOG_FORWARD" id="18459" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="113" id="18460" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18461" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="113" id="18462" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18463" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18464" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18465" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18466" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18467" addr="0x7f99f1dc1db0" >
-                <attributelist id="18468" addr="0x7f99f1dc1db0" >
-                    <attribute name="sym_name" value="ACTION_ANALOG_REWIND" id="18469" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_ANALOG_REWIND" id="18470" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="114" id="18471" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18472" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="114" id="18473" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18474" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18475" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18476" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18477" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18478" addr="0x7f99f1dc1f10" >
-                <attributelist id="18479" addr="0x7f99f1dc1f10" >
-                    <attribute name="sym_name" value="ACTION_MOVE_ITEM_UP" id="18480" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_MOVE_ITEM_UP" id="18481" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="115" id="18482" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18483" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="115" id="18484" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18485" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18486" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18487" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18488" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18489" addr="0x7f99f1dc2070" >
-                <attributelist id="18490" addr="0x7f99f1dc2070" >
-                    <attribute name="sym_name" value="ACTION_MOVE_ITEM_DOWN" id="18491" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_MOVE_ITEM_DOWN" id="18492" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="116" id="18493" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18494" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="116" id="18495" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18496" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18497" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18498" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18499" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18500" addr="0x7f99f1dc21d0" >
-                <attributelist id="18501" addr="0x7f99f1dc21d0" >
-                    <attribute name="sym_name" value="ACTION_CONTEXT_MENU" id="18502" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_CONTEXT_MENU" id="18503" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="117" id="18504" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18505" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="117" id="18506" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18507" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18508" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18509" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18510" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18511" addr="0x7f99f1dc2330" >
-                <attributelist id="18512" addr="0x7f99f1dc2330" >
-                    <attribute name="sym_name" value="ACTION_SHIFT" id="18513" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_SHIFT" id="18514" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="118" id="18515" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18516" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="118" id="18517" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18518" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18519" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18520" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18521" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18522" addr="0x7f99f1dc2490" >
-                <attributelist id="18523" addr="0x7f99f1dc2490" >
-                    <attribute name="sym_name" value="ACTION_SYMBOLS" id="18524" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_SYMBOLS" id="18525" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="119" id="18526" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18527" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="119" id="18528" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18529" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18530" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18531" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18532" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18533" addr="0x7f99f1dc25f0" >
-                <attributelist id="18534" addr="0x7f99f1dc25f0" >
-                    <attribute name="sym_name" value="ACTION_CURSOR_LEFT" id="18535" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_CURSOR_LEFT" id="18536" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="120" id="18537" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18538" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="120" id="18539" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18540" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18541" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18542" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18543" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18544" addr="0x7f99f1dc2750" >
-                <attributelist id="18545" addr="0x7f99f1dc2750" >
-                    <attribute name="sym_name" value="ACTION_CURSOR_RIGHT" id="18546" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_CURSOR_RIGHT" id="18547" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="121" id="18548" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18549" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="121" id="18550" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18551" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18552" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18553" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18554" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18555" addr="0x7f99f1dc28b0" >
-                <attributelist id="18556" addr="0x7f99f1dc28b0" >
-                    <attribute name="sym_name" value="ACTION_BUILT_IN_FUNCTION" id="18557" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_BUILT_IN_FUNCTION" id="18558" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="122" id="18559" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18560" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="122" id="18561" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18562" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18563" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18564" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18565" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18566" addr="0x7f99f1dc2a10" >
-                <attributelist id="18567" addr="0x7f99f1dc2a10" >
-                    <attribute name="sym_name" value="ACTION_SHOW_OSD_TIME" id="18568" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_SHOW_OSD_TIME" id="18569" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="123" id="18570" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18571" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="123" id="18572" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18573" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18574" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18575" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18576" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18577" addr="0x7f99f1dc2b70" >
-                <attributelist id="18578" addr="0x7f99f1dc2b70" >
-                    <attribute name="sym_name" value="ACTION_ANALOG_SEEK_FORWARD" id="18579" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_ANALOG_SEEK_FORWARD" id="18580" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="124" id="18581" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18582" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="124" id="18583" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18584" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18585" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18586" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18587" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18588" addr="0x7f99f1dc2cd0" >
-                <attributelist id="18589" addr="0x7f99f1dc2cd0" >
-                    <attribute name="sym_name" value="ACTION_ANALOG_SEEK_BACK" id="18590" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_ANALOG_SEEK_BACK" id="18591" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="125" id="18592" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18593" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="125" id="18594" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18595" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18596" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18597" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18598" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18599" addr="0x7f99f1dc2e30" >
-                <attributelist id="18600" addr="0x7f99f1dc2e30" >
-                    <attribute name="sym_name" value="ACTION_VIS_PRESET_SHOW" id="18601" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_VIS_PRESET_SHOW" id="18602" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="126" id="18603" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18604" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="126" id="18605" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18606" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18607" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18608" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18609" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18610" addr="0x7f99f1dc2f90" >
-                <attributelist id="18611" addr="0x7f99f1dc2f90" >
-                    <attribute name="sym_name" value="ACTION_VIS_PRESET_NEXT" id="18612" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_VIS_PRESET_NEXT" id="18613" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="128" id="18614" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18615" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="128" id="18616" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18617" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18618" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18619" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18620" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18621" addr="0x7f99f1dc30f0" >
-                <attributelist id="18622" addr="0x7f99f1dc30f0" >
-                    <attribute name="sym_name" value="ACTION_VIS_PRESET_PREV" id="18623" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_VIS_PRESET_PREV" id="18624" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="129" id="18625" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18626" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="129" id="18627" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18628" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18629" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18630" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18631" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18632" addr="0x7f99f1dc3250" >
-                <attributelist id="18633" addr="0x7f99f1dc3250" >
-                    <attribute name="sym_name" value="ACTION_VIS_PRESET_LOCK" id="18634" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_VIS_PRESET_LOCK" id="18635" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="130" id="18636" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18637" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="130" id="18638" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18639" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18640" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18641" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18642" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18643" addr="0x7f99f1dc33b0" >
-                <attributelist id="18644" addr="0x7f99f1dc33b0" >
-                    <attribute name="sym_name" value="ACTION_VIS_PRESET_RANDOM" id="18645" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_VIS_PRESET_RANDOM" id="18646" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="131" id="18647" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18648" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="131" id="18649" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18650" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18651" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18652" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18653" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18654" addr="0x7f99f1dc3510" >
-                <attributelist id="18655" addr="0x7f99f1dc3510" >
-                    <attribute name="sym_name" value="ACTION_VIS_RATE_PRESET_PLUS" id="18656" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_VIS_RATE_PRESET_PLUS" id="18657" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="132" id="18658" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18659" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="132" id="18660" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18661" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18662" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18663" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18664" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18665" addr="0x7f99f1dc3670" >
-                <attributelist id="18666" addr="0x7f99f1dc3670" >
-                    <attribute name="sym_name" value="ACTION_VIS_RATE_PRESET_MINUS" id="18667" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_VIS_RATE_PRESET_MINUS" id="18668" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="133" id="18669" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18670" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="133" id="18671" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18672" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18673" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18674" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18675" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18676" addr="0x7f99f1dc37d0" >
-                <attributelist id="18677" addr="0x7f99f1dc37d0" >
-                    <attribute name="sym_name" value="ACTION_SHOW_VIDEOMENU" id="18678" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_SHOW_VIDEOMENU" id="18679" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="134" id="18680" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18681" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="134" id="18682" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18683" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18684" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18685" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18686" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18687" addr="0x7f99f1dc3930" >
-                <attributelist id="18688" addr="0x7f99f1dc3930" >
-                    <attribute name="sym_name" value="ACTION_ENTER" id="18689" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_ENTER" id="18690" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="135" id="18691" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18692" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="135" id="18693" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18694" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18695" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18696" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18697" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18698" addr="0x7f99f1dc3a90" >
-                <attributelist id="18699" addr="0x7f99f1dc3a90" >
-                    <attribute name="sym_name" value="ACTION_INCREASE_RATING" id="18700" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_INCREASE_RATING" id="18701" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="136" id="18702" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18703" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="136" id="18704" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18705" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18706" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18707" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18708" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18709" addr="0x7f99f1dc3bf0" >
-                <attributelist id="18710" addr="0x7f99f1dc3bf0" >
-                    <attribute name="sym_name" value="ACTION_DECREASE_RATING" id="18711" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_DECREASE_RATING" id="18712" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="137" id="18713" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18714" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="137" id="18715" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18716" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18717" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18718" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18719" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18720" addr="0x7f99f1dc3d50" >
-                <attributelist id="18721" addr="0x7f99f1dc3d50" >
-                    <attribute name="sym_name" value="ACTION_NEXT_SCENE" id="18722" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_NEXT_SCENE" id="18723" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="138" id="18724" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18725" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="138" id="18726" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18727" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18728" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18729" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18730" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18731" addr="0x7f99f1dc3eb0" >
-                <attributelist id="18732" addr="0x7f99f1dc3eb0" >
-                    <attribute name="sym_name" value="ACTION_PREV_SCENE" id="18733" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_PREV_SCENE" id="18734" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="139" id="18735" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18736" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="139" id="18737" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18738" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18739" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18740" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18741" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18742" addr="0x7f99f1dc4010" >
-                <attributelist id="18743" addr="0x7f99f1dc4010" >
-                    <attribute name="sym_name" value="ACTION_NEXT_LETTER" id="18744" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_NEXT_LETTER" id="18745" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="140" id="18746" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18747" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="140" id="18748" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18749" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18750" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18751" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18752" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18753" addr="0x7f99f1dc4170" >
-                <attributelist id="18754" addr="0x7f99f1dc4170" >
-                    <attribute name="sym_name" value="ACTION_PREV_LETTER" id="18755" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_PREV_LETTER" id="18756" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="141" id="18757" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18758" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="141" id="18759" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18760" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18761" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18762" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18763" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18764" addr="0x7f99f1dc42d0" >
-                <attributelist id="18765" addr="0x7f99f1dc42d0" >
-                    <attribute name="sym_name" value="ACTION_JUMP_SMS2" id="18766" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_JUMP_SMS2" id="18767" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="142" id="18768" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18769" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="142" id="18770" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18771" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18772" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18773" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18774" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18775" addr="0x7f99f1dc4430" >
-                <attributelist id="18776" addr="0x7f99f1dc4430" >
-                    <attribute name="sym_name" value="ACTION_JUMP_SMS3" id="18777" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_JUMP_SMS3" id="18778" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="143" id="18779" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18780" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="143" id="18781" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18782" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18783" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18784" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18785" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18786" addr="0x7f99f1dc4590" >
-                <attributelist id="18787" addr="0x7f99f1dc4590" >
-                    <attribute name="sym_name" value="ACTION_JUMP_SMS4" id="18788" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_JUMP_SMS4" id="18789" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="144" id="18790" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18791" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="144" id="18792" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18793" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18794" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18795" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18796" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18797" addr="0x7f99f1dc46f0" >
-                <attributelist id="18798" addr="0x7f99f1dc46f0" >
-                    <attribute name="sym_name" value="ACTION_JUMP_SMS5" id="18799" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_JUMP_SMS5" id="18800" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="145" id="18801" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18802" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="145" id="18803" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18804" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18805" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18806" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18807" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18808" addr="0x7f99f1dc4850" >
-                <attributelist id="18809" addr="0x7f99f1dc4850" >
-                    <attribute name="sym_name" value="ACTION_JUMP_SMS6" id="18810" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_JUMP_SMS6" id="18811" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="146" id="18812" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18813" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="146" id="18814" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18815" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18816" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18817" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18818" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18819" addr="0x7f99f1dc49b0" >
-                <attributelist id="18820" addr="0x7f99f1dc49b0" >
-                    <attribute name="sym_name" value="ACTION_JUMP_SMS7" id="18821" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_JUMP_SMS7" id="18822" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="147" id="18823" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18824" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="147" id="18825" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18826" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18827" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18828" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18829" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18830" addr="0x7f99f1dc4b10" >
-                <attributelist id="18831" addr="0x7f99f1dc4b10" >
-                    <attribute name="sym_name" value="ACTION_JUMP_SMS8" id="18832" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_JUMP_SMS8" id="18833" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="148" id="18834" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18835" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="148" id="18836" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18837" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18838" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18839" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18840" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18841" addr="0x7f99f1dc4c70" >
-                <attributelist id="18842" addr="0x7f99f1dc4c70" >
-                    <attribute name="sym_name" value="ACTION_JUMP_SMS9" id="18843" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_JUMP_SMS9" id="18844" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="149" id="18845" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18846" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="149" id="18847" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18848" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18849" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18850" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18851" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18852" addr="0x7f99f1dc4dd0" >
-                <attributelist id="18853" addr="0x7f99f1dc4dd0" >
-                    <attribute name="sym_name" value="ACTION_FILTER_CLEAR" id="18854" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_FILTER_CLEAR" id="18855" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="150" id="18856" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18857" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="150" id="18858" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18859" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18860" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18861" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18862" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18863" addr="0x7f99f1dc4f30" >
-                <attributelist id="18864" addr="0x7f99f1dc4f30" >
-                    <attribute name="sym_name" value="ACTION_FILTER_SMS2" id="18865" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_FILTER_SMS2" id="18866" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="151" id="18867" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18868" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="151" id="18869" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18870" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18871" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18872" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18873" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18874" addr="0x7f99f1dc5090" >
-                <attributelist id="18875" addr="0x7f99f1dc5090" >
-                    <attribute name="sym_name" value="ACTION_FILTER_SMS3" id="18876" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_FILTER_SMS3" id="18877" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="152" id="18878" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18879" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="152" id="18880" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18881" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18882" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18883" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18884" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18885" addr="0x7f99f1dc51f0" >
-                <attributelist id="18886" addr="0x7f99f1dc51f0" >
-                    <attribute name="sym_name" value="ACTION_FILTER_SMS4" id="18887" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_FILTER_SMS4" id="18888" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="153" id="18889" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18890" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="153" id="18891" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18892" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18893" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18894" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18895" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18896" addr="0x7f99f1dc5350" >
-                <attributelist id="18897" addr="0x7f99f1dc5350" >
-                    <attribute name="sym_name" value="ACTION_FILTER_SMS5" id="18898" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_FILTER_SMS5" id="18899" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="154" id="18900" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18901" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="154" id="18902" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18903" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18904" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18905" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18906" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18907" addr="0x7f99f1dc54b0" >
-                <attributelist id="18908" addr="0x7f99f1dc54b0" >
-                    <attribute name="sym_name" value="ACTION_FILTER_SMS6" id="18909" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_FILTER_SMS6" id="18910" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="155" id="18911" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18912" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="155" id="18913" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18914" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18915" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18916" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18917" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18918" addr="0x7f99f1dc5610" >
-                <attributelist id="18919" addr="0x7f99f1dc5610" >
-                    <attribute name="sym_name" value="ACTION_FILTER_SMS7" id="18920" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_FILTER_SMS7" id="18921" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="156" id="18922" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18923" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="156" id="18924" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18925" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18926" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18927" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18928" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18929" addr="0x7f99f1dc5770" >
-                <attributelist id="18930" addr="0x7f99f1dc5770" >
-                    <attribute name="sym_name" value="ACTION_FILTER_SMS8" id="18931" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_FILTER_SMS8" id="18932" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="157" id="18933" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18934" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="157" id="18935" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18936" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18937" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18938" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18939" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18940" addr="0x7f99f1dc58d0" >
-                <attributelist id="18941" addr="0x7f99f1dc58d0" >
-                    <attribute name="sym_name" value="ACTION_FILTER_SMS9" id="18942" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_FILTER_SMS9" id="18943" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="158" id="18944" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18945" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="158" id="18946" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18947" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18948" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18949" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18950" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18951" addr="0x7f99f1dc5a30" >
-                <attributelist id="18952" addr="0x7f99f1dc5a30" >
-                    <attribute name="sym_name" value="ACTION_FIRST_PAGE" id="18953" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_FIRST_PAGE" id="18954" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="159" id="18955" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18956" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="159" id="18957" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18958" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18959" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18960" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18961" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18962" addr="0x7f99f1dc5b90" >
-                <attributelist id="18963" addr="0x7f99f1dc5b90" >
-                    <attribute name="sym_name" value="ACTION_LAST_PAGE" id="18964" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_LAST_PAGE" id="18965" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="160" id="18966" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18967" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="160" id="18968" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18969" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18970" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18971" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18972" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18973" addr="0x7f99f1dc5cf0" >
-                <attributelist id="18974" addr="0x7f99f1dc5cf0" >
-                    <attribute name="sym_name" value="ACTION_AUDIO_DELAY" id="18975" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_AUDIO_DELAY" id="18976" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="161" id="18977" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18978" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="161" id="18979" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18980" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18981" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18982" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18983" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18984" addr="0x7f99f1dc5e50" >
-                <attributelist id="18985" addr="0x7f99f1dc5e50" >
-                    <attribute name="sym_name" value="ACTION_SUBTITLE_DELAY" id="18986" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_SUBTITLE_DELAY" id="18987" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="162" id="18988" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="18989" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="162" id="18990" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="18991" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="18992" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="18993" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="18994" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="18995" addr="0x7f99f1dc5fb0" >
-                <attributelist id="18996" addr="0x7f99f1dc5fb0" >
-                    <attribute name="sym_name" value="ACTION_MENU" id="18997" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_MENU" id="18998" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="163" id="18999" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19000" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="163" id="19001" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19002" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19003" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19004" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19005" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19006" addr="0x7f99f1dc6110" >
-                <attributelist id="19007" addr="0x7f99f1dc6110" >
-                    <attribute name="sym_name" value="ACTION_SET_RATING" id="19008" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_SET_RATING" id="19009" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="164" id="19010" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19011" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="164" id="19012" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19013" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19014" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19015" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19016" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19017" addr="0x7f99f1dc6270" >
-                <attributelist id="19018" addr="0x7f99f1dc6270" >
-                    <attribute name="sym_name" value="ACTION_RECORD" id="19019" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_RECORD" id="19020" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="170" id="19021" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19022" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="170" id="19023" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19024" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19025" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19026" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19027" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19028" addr="0x7f99f1dc63d0" >
-                <attributelist id="19029" addr="0x7f99f1dc63d0" >
-                    <attribute name="sym_name" value="ACTION_PASTE" id="19030" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_PASTE" id="19031" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="180" id="19032" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19033" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="180" id="19034" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19035" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19036" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19037" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19038" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19039" addr="0x7f99f1dc6530" >
-                <attributelist id="19040" addr="0x7f99f1dc6530" >
-                    <attribute name="sym_name" value="ACTION_NEXT_CONTROL" id="19041" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_NEXT_CONTROL" id="19042" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="181" id="19043" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19044" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="181" id="19045" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19046" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19047" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19048" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19049" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19050" addr="0x7f99f1dc6690" >
-                <attributelist id="19051" addr="0x7f99f1dc6690" >
-                    <attribute name="sym_name" value="ACTION_PREV_CONTROL" id="19052" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_PREV_CONTROL" id="19053" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="182" id="19054" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19055" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="182" id="19056" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19057" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19058" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19059" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19060" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19061" addr="0x7f99f1dc67f0" >
-                <attributelist id="19062" addr="0x7f99f1dc67f0" >
-                    <attribute name="sym_name" value="ACTION_CHANNEL_SWITCH" id="19063" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_CHANNEL_SWITCH" id="19064" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="183" id="19065" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19066" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="183" id="19067" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19068" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19069" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19070" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19071" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19072" addr="0x7f99f1dc6950" >
-                <attributelist id="19073" addr="0x7f99f1dc6950" >
-                    <attribute name="sym_name" value="ACTION_CHANNEL_UP" id="19074" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_CHANNEL_UP" id="19075" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="184" id="19076" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19077" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="184" id="19078" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19079" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19080" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19081" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19082" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19083" addr="0x7f99f1dc6ab0" >
-                <attributelist id="19084" addr="0x7f99f1dc6ab0" >
-                    <attribute name="sym_name" value="ACTION_CHANNEL_DOWN" id="19085" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_CHANNEL_DOWN" id="19086" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="185" id="19087" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19088" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="185" id="19089" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19090" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19091" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19092" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19093" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19094" addr="0x7f99f1dc6c10" >
-                <attributelist id="19095" addr="0x7f99f1dc6c10" >
-                    <attribute name="sym_name" value="ACTION_NEXT_CHANNELGROUP" id="19096" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_NEXT_CHANNELGROUP" id="19097" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="186" id="19098" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19099" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="186" id="19100" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19101" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19102" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19103" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19104" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19105" addr="0x7f99f1dc6d70" >
-                <attributelist id="19106" addr="0x7f99f1dc6d70" >
-                    <attribute name="sym_name" value="ACTION_PREVIOUS_CHANNELGROUP" id="19107" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_PREVIOUS_CHANNELGROUP" id="19108" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="187" id="19109" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19110" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="187" id="19111" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19112" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19113" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19114" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19115" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19116" addr="0x7f99f1dc6ed0" >
-                <attributelist id="19117" addr="0x7f99f1dc6ed0" >
-                    <attribute name="sym_name" value="ACTION_PVR_PLAY" id="19118" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_PVR_PLAY" id="19119" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="188" id="19120" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19121" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="188" id="19122" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19123" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19124" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19125" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19126" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19127" addr="0x7f99f1dc7030" >
-                <attributelist id="19128" addr="0x7f99f1dc7030" >
-                    <attribute name="sym_name" value="ACTION_PVR_PLAY_TV" id="19129" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_PVR_PLAY_TV" id="19130" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="189" id="19131" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19132" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="189" id="19133" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19134" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19135" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19136" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19137" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19138" addr="0x7f99f1dc7190" >
-                <attributelist id="19139" addr="0x7f99f1dc7190" >
-                    <attribute name="sym_name" value="ACTION_PVR_PLAY_RADIO" id="19140" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_PVR_PLAY_RADIO" id="19141" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="190" id="19142" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19143" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="190" id="19144" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19145" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19146" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19147" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19148" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19149" addr="0x7f99f1dc72f0" >
-                <attributelist id="19150" addr="0x7f99f1dc72f0" >
-                    <attribute name="sym_name" value="ACTION_PVR_SHOW_TIMER_RULE" id="19151" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_PVR_SHOW_TIMER_RULE" id="19152" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="191" id="19153" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19154" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="191" id="19155" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19156" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19157" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19158" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19159" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19160" addr="0x7f99f1dc7450" >
-                <attributelist id="19161" addr="0x7f99f1dc7450" >
-                    <attribute name="sym_name" value="ACTION_CHANNEL_NUMBER_SEP" id="19162" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_CHANNEL_NUMBER_SEP" id="19163" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="192" id="19164" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19165" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="192" id="19166" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19167" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19168" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19169" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19170" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19171" addr="0x7f99f1dc75b0" >
-                <attributelist id="19172" addr="0x7f99f1dc75b0" >
-                    <attribute name="sym_name" value="ACTION_TOGGLE_FULLSCREEN" id="19173" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_TOGGLE_FULLSCREEN" id="19174" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="199" id="19175" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19176" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="199" id="19177" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19178" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19179" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19180" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19181" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19182" addr="0x7f99f1dc7710" >
-                <attributelist id="19183" addr="0x7f99f1dc7710" >
-                    <attribute name="sym_name" value="ACTION_TOGGLE_WATCHED" id="19184" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_TOGGLE_WATCHED" id="19185" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="200" id="19186" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19187" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="200" id="19188" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19189" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19190" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19191" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19192" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19193" addr="0x7f99f1dc7870" >
-                <attributelist id="19194" addr="0x7f99f1dc7870" >
-                    <attribute name="sym_name" value="ACTION_SCAN_ITEM" id="19195" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_SCAN_ITEM" id="19196" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="201" id="19197" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19198" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="201" id="19199" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19200" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19201" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19202" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19203" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19204" addr="0x7f99f1dc79d0" >
-                <attributelist id="19205" addr="0x7f99f1dc79d0" >
-                    <attribute name="sym_name" value="ACTION_TOGGLE_DIGITAL_ANALOG" id="19206" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_TOGGLE_DIGITAL_ANALOG" id="19207" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="202" id="19208" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19209" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="202" id="19210" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19211" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19212" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19213" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19214" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19215" addr="0x7f99f1dc7b30" >
-                <attributelist id="19216" addr="0x7f99f1dc7b30" >
-                    <attribute name="sym_name" value="ACTION_RELOAD_KEYMAPS" id="19217" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_RELOAD_KEYMAPS" id="19218" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="203" id="19219" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19220" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="203" id="19221" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19222" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19223" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19224" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19225" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19226" addr="0x7f99f1dc7c90" >
-                <attributelist id="19227" addr="0x7f99f1dc7c90" >
-                    <attribute name="sym_name" value="ACTION_GUIPROFILE_BEGIN" id="19228" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_GUIPROFILE_BEGIN" id="19229" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="204" id="19230" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19231" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="204" id="19232" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19233" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19234" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19235" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19236" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19237" addr="0x7f99f1dc7df0" >
-                <attributelist id="19238" addr="0x7f99f1dc7df0" >
-                    <attribute name="sym_name" value="ACTION_TELETEXT_RED" id="19239" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_TELETEXT_RED" id="19240" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="215" id="19241" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19242" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="215" id="19243" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19244" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19245" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19246" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19247" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19248" addr="0x7f99f1dc7f50" >
-                <attributelist id="19249" addr="0x7f99f1dc7f50" >
-                    <attribute name="sym_name" value="ACTION_TELETEXT_GREEN" id="19250" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_TELETEXT_GREEN" id="19251" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="216" id="19252" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19253" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="216" id="19254" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19255" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19256" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19257" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19258" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19259" addr="0x7f99f1dc80b0" >
-                <attributelist id="19260" addr="0x7f99f1dc80b0" >
-                    <attribute name="sym_name" value="ACTION_TELETEXT_YELLOW" id="19261" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_TELETEXT_YELLOW" id="19262" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="217" id="19263" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19264" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="217" id="19265" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19266" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19267" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19268" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19269" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19270" addr="0x7f99f1dc8210" >
-                <attributelist id="19271" addr="0x7f99f1dc8210" >
-                    <attribute name="sym_name" value="ACTION_TELETEXT_BLUE" id="19272" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_TELETEXT_BLUE" id="19273" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="218" id="19274" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19275" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="218" id="19276" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19277" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19278" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19279" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19280" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19281" addr="0x7f99f1dc8370" >
-                <attributelist id="19282" addr="0x7f99f1dc8370" >
-                    <attribute name="sym_name" value="ACTION_INCREASE_PAR" id="19283" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_INCREASE_PAR" id="19284" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="219" id="19285" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19286" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="219" id="19287" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19288" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19289" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19290" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19291" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19292" addr="0x7f99f1dc84d0" >
-                <attributelist id="19293" addr="0x7f99f1dc84d0" >
-                    <attribute name="sym_name" value="ACTION_DECREASE_PAR" id="19294" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_DECREASE_PAR" id="19295" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="220" id="19296" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19297" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="220" id="19298" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19299" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19300" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19301" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19302" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19303" addr="0x7f99f1dc8630" >
-                <attributelist id="19304" addr="0x7f99f1dc8630" >
-                    <attribute name="sym_name" value="ACTION_VSHIFT_UP" id="19305" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_VSHIFT_UP" id="19306" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="227" id="19307" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19308" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="227" id="19309" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19310" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19311" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19312" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19313" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19314" addr="0x7f99f1dc8790" >
-                <attributelist id="19315" addr="0x7f99f1dc8790" >
-                    <attribute name="sym_name" value="ACTION_VSHIFT_DOWN" id="19316" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_VSHIFT_DOWN" id="19317" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="228" id="19318" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19319" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="228" id="19320" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19321" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19322" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19323" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19324" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19325" addr="0x7f99f1dc88f0" >
-                <attributelist id="19326" addr="0x7f99f1dc88f0" >
-                    <attribute name="sym_name" value="ACTION_PLAYER_PLAYPAUSE" id="19327" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_PLAYER_PLAYPAUSE" id="19328" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="229" id="19329" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19330" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="229" id="19331" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19332" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19333" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19334" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19335" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19336" addr="0x7f99f1dc8a50" >
-                <attributelist id="19337" addr="0x7f99f1dc8a50" >
-                    <attribute name="sym_name" value="ACTION_SUBTITLE_VSHIFT_UP" id="19338" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_SUBTITLE_VSHIFT_UP" id="19339" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="230" id="19340" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19341" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="230" id="19342" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19343" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19344" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19345" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19346" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19347" addr="0x7f99f1dc8bb0" >
-                <attributelist id="19348" addr="0x7f99f1dc8bb0" >
-                    <attribute name="sym_name" value="ACTION_SUBTITLE_VSHIFT_DOWN" id="19349" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_SUBTITLE_VSHIFT_DOWN" id="19350" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="231" id="19351" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19352" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="231" id="19353" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19354" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19355" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19356" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19357" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19358" addr="0x7f99f1dc8d10" >
-                <attributelist id="19359" addr="0x7f99f1dc8d10" >
-                    <attribute name="sym_name" value="ACTION_SUBTITLE_ALIGN" id="19360" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_SUBTITLE_ALIGN" id="19361" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="232" id="19362" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19363" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="232" id="19364" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19365" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19366" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19367" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19368" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19369" addr="0x7f99f1dc8e70" >
-                <attributelist id="19370" addr="0x7f99f1dc8e70" >
-                    <attribute name="sym_name" value="ACTION_FILTER" id="19371" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_FILTER" id="19372" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="233" id="19373" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19374" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="233" id="19375" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19376" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19377" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19378" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19379" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19380" addr="0x7f99f1dc8fd0" >
-                <attributelist id="19381" addr="0x7f99f1dc8fd0" >
-                    <attribute name="sym_name" value="ACTION_SWITCH_PLAYER" id="19382" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_SWITCH_PLAYER" id="19383" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="234" id="19384" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19385" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="234" id="19386" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19387" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19388" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19389" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19390" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19391" addr="0x7f99f1dc9130" >
-                <attributelist id="19392" addr="0x7f99f1dc9130" >
-                    <attribute name="sym_name" value="ACTION_STEREOMODE_NEXT" id="19393" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_STEREOMODE_NEXT" id="19394" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="235" id="19395" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19396" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="235" id="19397" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19398" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19399" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19400" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19401" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19402" addr="0x7f99f1dc9290" >
-                <attributelist id="19403" addr="0x7f99f1dc9290" >
-                    <attribute name="sym_name" value="ACTION_STEREOMODE_PREVIOUS" id="19404" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_STEREOMODE_PREVIOUS" id="19405" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="236" id="19406" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19407" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="236" id="19408" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19409" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19410" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19411" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19412" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19413" addr="0x7f99f1dc93f0" >
-                <attributelist id="19414" addr="0x7f99f1dc93f0" >
-                    <attribute name="sym_name" value="ACTION_STEREOMODE_TOGGLE" id="19415" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_STEREOMODE_TOGGLE" id="19416" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="237" id="19417" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19418" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="237" id="19419" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19420" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19421" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19422" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19423" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19424" addr="0x7f99f1dc9550" >
-                <attributelist id="19425" addr="0x7f99f1dc9550" >
-                    <attribute name="sym_name" value="ACTION_STEREOMODE_SELECT" id="19426" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_STEREOMODE_SELECT" id="19427" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="238" id="19428" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19429" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="238" id="19430" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19431" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19432" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19433" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19434" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19435" addr="0x7f99f1dc96b0" >
-                <attributelist id="19436" addr="0x7f99f1dc96b0" >
-                    <attribute name="sym_name" value="ACTION_STEREOMODE_TOMONO" id="19437" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_STEREOMODE_TOMONO" id="19438" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="239" id="19439" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19440" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="239" id="19441" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19442" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19443" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19444" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19445" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19446" addr="0x7f99f1dc9810" >
-                <attributelist id="19447" addr="0x7f99f1dc9810" >
-                    <attribute name="sym_name" value="ACTION_STEREOMODE_SET" id="19448" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_STEREOMODE_SET" id="19449" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="240" id="19450" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19451" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="240" id="19452" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19453" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19454" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19455" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19456" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19457" addr="0x7f99f1dc9970" >
-                <attributelist id="19458" addr="0x7f99f1dc9970" >
-                    <attribute name="sym_name" value="ACTION_SETTINGS_RESET" id="19459" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_SETTINGS_RESET" id="19460" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="241" id="19461" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19462" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="241" id="19463" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19464" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19465" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19466" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19467" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19468" addr="0x7f99f1dc9ad0" >
-                <attributelist id="19469" addr="0x7f99f1dc9ad0" >
-                    <attribute name="sym_name" value="ACTION_SETTINGS_LEVEL_CHANGE" id="19470" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_SETTINGS_LEVEL_CHANGE" id="19471" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="242" id="19472" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19473" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="242" id="19474" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19475" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19476" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19477" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19478" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19479" addr="0x7f99f1dc9c30" >
-                <attributelist id="19480" addr="0x7f99f1dc9c30" >
-                    <attribute name="sym_name" value="ACTION_TRIGGER_OSD" id="19481" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_TRIGGER_OSD" id="19482" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="243" id="19483" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19484" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="243" id="19485" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19486" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19487" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19488" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19489" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19490" addr="0x7f99f1dc9d90" >
-                <attributelist id="19491" addr="0x7f99f1dc9d90" >
-                    <attribute name="sym_name" value="ACTION_INPUT_TEXT" id="19492" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_INPUT_TEXT" id="19493" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="244" id="19494" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19495" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="244" id="19496" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19497" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19498" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19499" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19500" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19501" addr="0x7f99f1dc9ef0" >
-                <attributelist id="19502" addr="0x7f99f1dc9ef0" >
-                    <attribute name="sym_name" value="ACTION_VOLUME_SET" id="19503" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_VOLUME_SET" id="19504" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="245" id="19505" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19506" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="245" id="19507" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19508" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19509" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19510" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19511" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19512" addr="0x7f99f1dca050" >
-                <attributelist id="19513" addr="0x7f99f1dca050" >
-                    <attribute name="sym_name" value="ACTION_TOGGLE_COMMSKIP" id="19514" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_TOGGLE_COMMSKIP" id="19515" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="246" id="19516" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19517" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="246" id="19518" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19519" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19520" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19521" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19522" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19523" addr="0x7f99f1dca1b0" >
-                <attributelist id="19524" addr="0x7f99f1dca1b0" >
-                    <attribute name="sym_name" value="ACTION_PLAYER_RESET" id="19525" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_PLAYER_RESET" id="19526" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="248" id="19527" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19528" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="248" id="19529" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19530" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19531" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19532" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19533" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19534" addr="0x7f99f1dca310" >
-                <attributelist id="19535" addr="0x7f99f1dca310" >
-                    <attribute name="sym_name" value="ACTION_TOGGLE_FONT" id="19536" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_TOGGLE_FONT" id="19537" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="249" id="19538" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19539" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="249" id="19540" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19541" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19542" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19543" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19544" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19545" addr="0x7f99f1dca470" >
-                <attributelist id="19546" addr="0x7f99f1dca470" >
-                    <attribute name="sym_name" value="ACTION_VIDEO_NEXT_STREAM" id="19547" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_VIDEO_NEXT_STREAM" id="19548" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="250" id="19549" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19550" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="250" id="19551" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19552" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19553" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19554" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19555" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19556" addr="0x7f99f1dca5d0" >
-                <attributelist id="19557" addr="0x7f99f1dca5d0" >
-                    <attribute name="sym_name" value="ACTION_QUEUE_ITEM_NEXT" id="19558" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_QUEUE_ITEM_NEXT" id="19559" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="251" id="19560" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19561" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="251" id="19562" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19563" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19564" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19565" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19566" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19567" addr="0x7f99f1dca730" >
-                <attributelist id="19568" addr="0x7f99f1dca730" >
-                    <attribute name="sym_name" value="ACTION_VOICE_RECOGNIZE" id="19569" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_VOICE_RECOGNIZE" id="19570" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="300" id="19571" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19572" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="300" id="19573" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19574" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19575" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19576" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19577" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19578" addr="0x7f99f1dca890" >
-                <attributelist id="19579" addr="0x7f99f1dca890" >
-                    <attribute name="sym_name" value="ACTION_TOUCH_TAP" id="19580" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_TOUCH_TAP" id="19581" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="401" id="19582" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19583" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="401" id="19584" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19585" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19586" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19587" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19588" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19589" addr="0x7f99f1dca9f0" >
-                <attributelist id="19590" addr="0x7f99f1dca9f0" >
-                    <attribute name="sym_name" value="ACTION_TOUCH_TAP_TEN" id="19591" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_TOUCH_TAP_TEN" id="19592" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="410" id="19593" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19594" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="410" id="19595" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19596" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19597" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19598" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19599" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19600" addr="0x7f99f1dcab50" >
-                <attributelist id="19601" addr="0x7f99f1dcab50" >
-                    <attribute name="sym_name" value="ACTION_TOUCH_LONGPRESS" id="19602" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_TOUCH_LONGPRESS" id="19603" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="411" id="19604" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19605" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="411" id="19606" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19607" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19608" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19609" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19610" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19611" addr="0x7f99f1dcacb0" >
-                <attributelist id="19612" addr="0x7f99f1dcacb0" >
-                    <attribute name="sym_name" value="ACTION_TOUCH_LONGPRESS_TEN" id="19613" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_TOUCH_LONGPRESS_TEN" id="19614" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="420" id="19615" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19616" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="420" id="19617" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19618" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19619" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19620" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19621" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19622" addr="0x7f99f1dcae10" >
-                <attributelist id="19623" addr="0x7f99f1dcae10" >
-                    <attribute name="sym_name" value="ACTION_GESTURE_NOTIFY" id="19624" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_GESTURE_NOTIFY" id="19625" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="500" id="19626" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19627" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="500" id="19628" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19629" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19630" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19631" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19632" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19633" addr="0x7f99f1dcaf70" >
-                <attributelist id="19634" addr="0x7f99f1dcaf70" >
-                    <attribute name="sym_name" value="ACTION_GESTURE_BEGIN" id="19635" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_GESTURE_BEGIN" id="19636" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="501" id="19637" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19638" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="501" id="19639" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19640" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19641" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19642" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19643" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19644" addr="0x7f99f1dcb0d0" >
-                <attributelist id="19645" addr="0x7f99f1dcb0d0" >
-                    <attribute name="sym_name" value="ACTION_GESTURE_ZOOM" id="19646" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_GESTURE_ZOOM" id="19647" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="502" id="19648" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19649" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="502" id="19650" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19651" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19652" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19653" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19654" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19655" addr="0x7f99f1dcb230" >
-                <attributelist id="19656" addr="0x7f99f1dcb230" >
-                    <attribute name="sym_name" value="ACTION_GESTURE_ROTATE" id="19657" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_GESTURE_ROTATE" id="19658" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="503" id="19659" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19660" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="503" id="19661" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19662" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19663" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19664" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19665" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19666" addr="0x7f99f1dcb390" >
-                <attributelist id="19667" addr="0x7f99f1dcb390" >
-                    <attribute name="sym_name" value="ACTION_GESTURE_PAN" id="19668" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_GESTURE_PAN" id="19669" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="504" id="19670" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19671" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="504" id="19672" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19673" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19674" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19675" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19676" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19677" addr="0x7f99f1dcb4f0" >
-                <attributelist id="19678" addr="0x7f99f1dcb4f0" >
-                    <attribute name="sym_name" value="ACTION_GESTURE_ABORT" id="19679" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_GESTURE_ABORT" id="19680" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="505" id="19681" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19682" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="505" id="19683" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19684" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19685" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19686" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19687" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19688" addr="0x7f99f1dcb650" >
-                <attributelist id="19689" addr="0x7f99f1dcb650" >
-                    <attribute name="sym_name" value="ACTION_GESTURE_SWIPE_LEFT" id="19690" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_GESTURE_SWIPE_LEFT" id="19691" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="511" id="19692" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19693" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="511" id="19694" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19695" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19696" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19697" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19698" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19699" addr="0x7f99f1dcb7b0" >
-                <attributelist id="19700" addr="0x7f99f1dcb7b0" >
-                    <attribute name="sym_name" value="ACTION_GESTURE_SWIPE_LEFT_TEN" id="19701" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_GESTURE_SWIPE_LEFT_TEN" id="19702" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="520" id="19703" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19704" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="520" id="19705" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19706" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19707" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19708" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19709" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19710" addr="0x7f99f1dcb910" >
-                <attributelist id="19711" addr="0x7f99f1dcb910" >
-                    <attribute name="sym_name" value="ACTION_GESTURE_SWIPE_RIGHT" id="19712" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_GESTURE_SWIPE_RIGHT" id="19713" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="521" id="19714" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19715" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="521" id="19716" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19717" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19718" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19719" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19720" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19721" addr="0x7f99f1dcba70" >
-                <attributelist id="19722" addr="0x7f99f1dcba70" >
-                    <attribute name="sym_name" value="ACTION_GESTURE_SWIPE_RIGHT_TEN" id="19723" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_GESTURE_SWIPE_RIGHT_TEN" id="19724" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="530" id="19725" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19726" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="530" id="19727" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19728" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19729" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19730" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19731" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19732" addr="0x7f99f1dcbbd0" >
-                <attributelist id="19733" addr="0x7f99f1dcbbd0" >
-                    <attribute name="sym_name" value="ACTION_GESTURE_SWIPE_UP" id="19734" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_GESTURE_SWIPE_UP" id="19735" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="531" id="19736" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19737" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="531" id="19738" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19739" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19740" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19741" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19742" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19743" addr="0x7f99f1dcbd30" >
-                <attributelist id="19744" addr="0x7f99f1dcbd30" >
-                    <attribute name="sym_name" value="ACTION_GESTURE_SWIPE_UP_TEN" id="19745" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_GESTURE_SWIPE_UP_TEN" id="19746" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="540" id="19747" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19748" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="540" id="19749" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19750" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19751" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19752" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19753" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19754" addr="0x7f99f1dcbe90" >
-                <attributelist id="19755" addr="0x7f99f1dcbe90" >
-                    <attribute name="sym_name" value="ACTION_GESTURE_SWIPE_DOWN" id="19756" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_GESTURE_SWIPE_DOWN" id="19757" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="541" id="19758" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19759" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="541" id="19760" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19761" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19762" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19763" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19764" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19765" addr="0x7f99f1dcbff0" >
-                <attributelist id="19766" addr="0x7f99f1dcbff0" >
-                    <attribute name="sym_name" value="ACTION_GESTURE_SWIPE_DOWN_TEN" id="19767" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_GESTURE_SWIPE_DOWN_TEN" id="19768" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="550" id="19769" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19770" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="550" id="19771" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19772" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19773" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19774" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19775" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19776" addr="0x7f99f1dcc150" >
-                <attributelist id="19777" addr="0x7f99f1dcc150" >
-                    <attribute name="sym_name" value="ACTION_GESTURE_END" id="19778" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_GESTURE_END" id="19779" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="599" id="19780" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19781" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="599" id="19782" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19783" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19784" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19785" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19786" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19787" addr="0x7f99f1dcc2b0" >
-                <attributelist id="19788" addr="0x7f99f1dcc2b0" >
-                    <attribute name="sym_name" value="ACTION_ANALOG_MOVE_X_LEFT" id="19789" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_ANALOG_MOVE_X_LEFT" id="19790" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="601" id="19791" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19792" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="601" id="19793" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19794" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19795" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19796" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19797" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19798" addr="0x7f99f1dcc410" >
-                <attributelist id="19799" addr="0x7f99f1dcc410" >
-                    <attribute name="sym_name" value="ACTION_ANALOG_MOVE_X_RIGHT" id="19800" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_ANALOG_MOVE_X_RIGHT" id="19801" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="602" id="19802" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19803" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="602" id="19804" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19805" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19806" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19807" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19808" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19809" addr="0x7f99f1dcc570" >
-                <attributelist id="19810" addr="0x7f99f1dcc570" >
-                    <attribute name="sym_name" value="ACTION_ANALOG_MOVE_Y_UP" id="19811" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_ANALOG_MOVE_Y_UP" id="19812" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="603" id="19813" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19814" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="603" id="19815" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19816" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19817" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19818" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19819" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19820" addr="0x7f99f1dcc6d0" >
-                <attributelist id="19821" addr="0x7f99f1dcc6d0" >
-                    <attribute name="sym_name" value="ACTION_ANALOG_MOVE_Y_DOWN" id="19822" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_ANALOG_MOVE_Y_DOWN" id="19823" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="604" id="19824" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19825" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="604" id="19826" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19827" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19828" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19829" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19830" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19831" addr="0x7f99f1dcc830" >
-                <attributelist id="19832" addr="0x7f99f1dcc830" >
-                    <attribute name="sym_name" value="ACTION_ERROR" id="19833" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_ERROR" id="19834" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="998" id="19835" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19836" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="998" id="19837" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19838" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19839" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19840" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19841" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19842" addr="0x7f99f1dcc990" >
-                <attributelist id="19843" addr="0x7f99f1dcc990" >
-                    <attribute name="sym_name" value="ACTION_NOOP" id="19844" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ACTION_NOOP" id="19845" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="999" id="19846" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19847" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="999" id="19848" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19849" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19850" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19851" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19852" addr="0x7f99f1de6c90" />
+            <constant id="17279" addr="0x7fca46906930" >
+                <attributelist id="17280" addr="0x7fca46906930" >
+                    <attribute name="sym_name" value="ACTION_NONE" id="17281" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_NONE" id="17282" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="0" id="17283" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17284" addr="0x7fca46934c90" />
+                    <attribute name="value" value="0" id="17285" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17286" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17287" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17288" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17289" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17290" addr="0x7fca46906a90" >
+                <attributelist id="17291" addr="0x7fca46906a90" >
+                    <attribute name="sym_name" value="ACTION_MOVE_LEFT" id="17292" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_MOVE_LEFT" id="17293" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="1" id="17294" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17295" addr="0x7fca46934c90" />
+                    <attribute name="value" value="1" id="17296" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17297" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17298" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17299" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17300" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17301" addr="0x7fca46906bf0" >
+                <attributelist id="17302" addr="0x7fca46906bf0" >
+                    <attribute name="sym_name" value="ACTION_MOVE_RIGHT" id="17303" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_MOVE_RIGHT" id="17304" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="2" id="17305" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17306" addr="0x7fca46934c90" />
+                    <attribute name="value" value="2" id="17307" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17308" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17309" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17310" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17311" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17312" addr="0x7fca46906d50" >
+                <attributelist id="17313" addr="0x7fca46906d50" >
+                    <attribute name="sym_name" value="ACTION_MOVE_UP" id="17314" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_MOVE_UP" id="17315" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="3" id="17316" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17317" addr="0x7fca46934c90" />
+                    <attribute name="value" value="3" id="17318" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17319" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17320" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17321" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17322" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17323" addr="0x7fca46906eb0" >
+                <attributelist id="17324" addr="0x7fca46906eb0" >
+                    <attribute name="sym_name" value="ACTION_MOVE_DOWN" id="17325" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_MOVE_DOWN" id="17326" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="4" id="17327" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17328" addr="0x7fca46934c90" />
+                    <attribute name="value" value="4" id="17329" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17330" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17331" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17332" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17333" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17334" addr="0x7fca46907010" >
+                <attributelist id="17335" addr="0x7fca46907010" >
+                    <attribute name="sym_name" value="ACTION_PAGE_UP" id="17336" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_PAGE_UP" id="17337" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="5" id="17338" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17339" addr="0x7fca46934c90" />
+                    <attribute name="value" value="5" id="17340" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17341" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17342" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17343" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17344" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17345" addr="0x7fca46907170" >
+                <attributelist id="17346" addr="0x7fca46907170" >
+                    <attribute name="sym_name" value="ACTION_PAGE_DOWN" id="17347" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_PAGE_DOWN" id="17348" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="6" id="17349" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17350" addr="0x7fca46934c90" />
+                    <attribute name="value" value="6" id="17351" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17352" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17353" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17354" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17355" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17356" addr="0x7fca469072d0" >
+                <attributelist id="17357" addr="0x7fca469072d0" >
+                    <attribute name="sym_name" value="ACTION_SELECT_ITEM" id="17358" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_SELECT_ITEM" id="17359" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="7" id="17360" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17361" addr="0x7fca46934c90" />
+                    <attribute name="value" value="7" id="17362" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17363" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17364" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17365" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17366" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17367" addr="0x7fca46907430" >
+                <attributelist id="17368" addr="0x7fca46907430" >
+                    <attribute name="sym_name" value="ACTION_HIGHLIGHT_ITEM" id="17369" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_HIGHLIGHT_ITEM" id="17370" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="8" id="17371" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17372" addr="0x7fca46934c90" />
+                    <attribute name="value" value="8" id="17373" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17374" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17375" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17376" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17377" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17378" addr="0x7fca46907590" >
+                <attributelist id="17379" addr="0x7fca46907590" >
+                    <attribute name="sym_name" value="ACTION_PARENT_DIR" id="17380" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_PARENT_DIR" id="17381" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="9" id="17382" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17383" addr="0x7fca46934c90" />
+                    <attribute name="value" value="9" id="17384" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17385" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17386" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17387" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17388" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17389" addr="0x7fca469076f0" >
+                <attributelist id="17390" addr="0x7fca469076f0" >
+                    <attribute name="sym_name" value="ACTION_PREVIOUS_MENU" id="17391" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_PREVIOUS_MENU" id="17392" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="10" id="17393" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17394" addr="0x7fca46934c90" />
+                    <attribute name="value" value="10" id="17395" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17396" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17397" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17398" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17399" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17400" addr="0x7fca46907850" >
+                <attributelist id="17401" addr="0x7fca46907850" >
+                    <attribute name="sym_name" value="ACTION_SHOW_INFO" id="17402" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_SHOW_INFO" id="17403" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="11" id="17404" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17405" addr="0x7fca46934c90" />
+                    <attribute name="value" value="11" id="17406" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17407" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17408" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17409" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17410" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17411" addr="0x7fca469079b0" >
+                <attributelist id="17412" addr="0x7fca469079b0" >
+                    <attribute name="sym_name" value="ACTION_PAUSE" id="17413" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_PAUSE" id="17414" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="12" id="17415" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17416" addr="0x7fca46934c90" />
+                    <attribute name="value" value="12" id="17417" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17418" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17419" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17420" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17421" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17422" addr="0x7fca46907b10" >
+                <attributelist id="17423" addr="0x7fca46907b10" >
+                    <attribute name="sym_name" value="ACTION_STOP" id="17424" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_STOP" id="17425" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="13" id="17426" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17427" addr="0x7fca46934c90" />
+                    <attribute name="value" value="13" id="17428" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17429" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17430" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17431" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17432" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17433" addr="0x7fca46907c70" >
+                <attributelist id="17434" addr="0x7fca46907c70" >
+                    <attribute name="sym_name" value="ACTION_NEXT_ITEM" id="17435" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_NEXT_ITEM" id="17436" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="14" id="17437" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17438" addr="0x7fca46934c90" />
+                    <attribute name="value" value="14" id="17439" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17440" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17441" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17442" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17443" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17444" addr="0x7fca46907dd0" >
+                <attributelist id="17445" addr="0x7fca46907dd0" >
+                    <attribute name="sym_name" value="ACTION_PREV_ITEM" id="17446" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_PREV_ITEM" id="17447" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="15" id="17448" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17449" addr="0x7fca46934c90" />
+                    <attribute name="value" value="15" id="17450" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17451" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17452" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17453" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17454" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17455" addr="0x7fca46907f30" >
+                <attributelist id="17456" addr="0x7fca46907f30" >
+                    <attribute name="sym_name" value="ACTION_FORWARD" id="17457" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_FORWARD" id="17458" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="16" id="17459" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17460" addr="0x7fca46934c90" />
+                    <attribute name="value" value="16" id="17461" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17462" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17463" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17464" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17465" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17466" addr="0x7fca46908090" >
+                <attributelist id="17467" addr="0x7fca46908090" >
+                    <attribute name="sym_name" value="ACTION_REWIND" id="17468" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_REWIND" id="17469" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="17" id="17470" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17471" addr="0x7fca46934c90" />
+                    <attribute name="value" value="17" id="17472" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17473" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17474" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17475" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17476" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17477" addr="0x7fca469081f0" >
+                <attributelist id="17478" addr="0x7fca469081f0" >
+                    <attribute name="sym_name" value="ACTION_SHOW_GUI" id="17479" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_SHOW_GUI" id="17480" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="18" id="17481" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17482" addr="0x7fca46934c90" />
+                    <attribute name="value" value="18" id="17483" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17484" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17485" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17486" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17487" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17488" addr="0x7fca46908350" >
+                <attributelist id="17489" addr="0x7fca46908350" >
+                    <attribute name="sym_name" value="ACTION_ASPECT_RATIO" id="17490" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_ASPECT_RATIO" id="17491" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="19" id="17492" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17493" addr="0x7fca46934c90" />
+                    <attribute name="value" value="19" id="17494" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17495" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17496" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17497" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17498" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17499" addr="0x7fca469084b0" >
+                <attributelist id="17500" addr="0x7fca469084b0" >
+                    <attribute name="sym_name" value="ACTION_STEP_FORWARD" id="17501" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_STEP_FORWARD" id="17502" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="20" id="17503" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17504" addr="0x7fca46934c90" />
+                    <attribute name="value" value="20" id="17505" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17506" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17507" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17508" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17509" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17510" addr="0x7fca46908610" >
+                <attributelist id="17511" addr="0x7fca46908610" >
+                    <attribute name="sym_name" value="ACTION_STEP_BACK" id="17512" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_STEP_BACK" id="17513" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="21" id="17514" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17515" addr="0x7fca46934c90" />
+                    <attribute name="value" value="21" id="17516" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17517" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17518" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17519" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17520" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17521" addr="0x7fca46908770" >
+                <attributelist id="17522" addr="0x7fca46908770" >
+                    <attribute name="sym_name" value="ACTION_BIG_STEP_FORWARD" id="17523" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_BIG_STEP_FORWARD" id="17524" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="22" id="17525" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17526" addr="0x7fca46934c90" />
+                    <attribute name="value" value="22" id="17527" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17528" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17529" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17530" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17531" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17532" addr="0x7fca469088d0" >
+                <attributelist id="17533" addr="0x7fca469088d0" >
+                    <attribute name="sym_name" value="ACTION_BIG_STEP_BACK" id="17534" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_BIG_STEP_BACK" id="17535" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="23" id="17536" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17537" addr="0x7fca46934c90" />
+                    <attribute name="value" value="23" id="17538" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17539" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17540" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17541" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17542" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17543" addr="0x7fca46908a30" >
+                <attributelist id="17544" addr="0x7fca46908a30" >
+                    <attribute name="sym_name" value="ACTION_SHOW_OSD" id="17545" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_SHOW_OSD" id="17546" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="24" id="17547" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17548" addr="0x7fca46934c90" />
+                    <attribute name="value" value="24" id="17549" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17550" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17551" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17552" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17553" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17554" addr="0x7fca46908b90" >
+                <attributelist id="17555" addr="0x7fca46908b90" >
+                    <attribute name="sym_name" value="ACTION_SHOW_SUBTITLES" id="17556" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_SHOW_SUBTITLES" id="17557" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="25" id="17558" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17559" addr="0x7fca46934c90" />
+                    <attribute name="value" value="25" id="17560" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17561" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17562" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17563" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17564" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17565" addr="0x7fca46908cf0" >
+                <attributelist id="17566" addr="0x7fca46908cf0" >
+                    <attribute name="sym_name" value="ACTION_NEXT_SUBTITLE" id="17567" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_NEXT_SUBTITLE" id="17568" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="26" id="17569" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17570" addr="0x7fca46934c90" />
+                    <attribute name="value" value="26" id="17571" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17572" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17573" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17574" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17575" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17576" addr="0x7fca46908e50" >
+                <attributelist id="17577" addr="0x7fca46908e50" >
+                    <attribute name="sym_name" value="ACTION_BROWSE_SUBTITLE" id="17578" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_BROWSE_SUBTITLE" id="17579" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="247" id="17580" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17581" addr="0x7fca46934c90" />
+                    <attribute name="value" value="247" id="17582" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17583" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17584" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17585" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17586" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17587" addr="0x7fca46908fb0" >
+                <attributelist id="17588" addr="0x7fca46908fb0" >
+                    <attribute name="sym_name" value="ACTION_PLAYER_DEBUG" id="17589" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_PLAYER_DEBUG" id="17590" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="27" id="17591" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17592" addr="0x7fca46934c90" />
+                    <attribute name="value" value="27" id="17593" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17594" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17595" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17596" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17597" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17598" addr="0x7fca46909110" >
+                <attributelist id="17599" addr="0x7fca46909110" >
+                    <attribute name="sym_name" value="ACTION_NEXT_PICTURE" id="17600" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_NEXT_PICTURE" id="17601" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="28" id="17602" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17603" addr="0x7fca46934c90" />
+                    <attribute name="value" value="28" id="17604" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17605" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17606" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17607" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17608" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17609" addr="0x7fca46909270" >
+                <attributelist id="17610" addr="0x7fca46909270" >
+                    <attribute name="sym_name" value="ACTION_PREV_PICTURE" id="17611" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_PREV_PICTURE" id="17612" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="29" id="17613" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17614" addr="0x7fca46934c90" />
+                    <attribute name="value" value="29" id="17615" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17616" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17617" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17618" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17619" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17620" addr="0x7fca469093d0" >
+                <attributelist id="17621" addr="0x7fca469093d0" >
+                    <attribute name="sym_name" value="ACTION_ZOOM_OUT" id="17622" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_ZOOM_OUT" id="17623" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="30" id="17624" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17625" addr="0x7fca46934c90" />
+                    <attribute name="value" value="30" id="17626" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17627" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17628" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17629" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17630" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17631" addr="0x7fca46909530" >
+                <attributelist id="17632" addr="0x7fca46909530" >
+                    <attribute name="sym_name" value="ACTION_ZOOM_IN" id="17633" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_ZOOM_IN" id="17634" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="31" id="17635" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17636" addr="0x7fca46934c90" />
+                    <attribute name="value" value="31" id="17637" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17638" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17639" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17640" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17641" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17642" addr="0x7fca46909690" >
+                <attributelist id="17643" addr="0x7fca46909690" >
+                    <attribute name="sym_name" value="ACTION_TOGGLE_SOURCE_DEST" id="17644" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_TOGGLE_SOURCE_DEST" id="17645" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="32" id="17646" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17647" addr="0x7fca46934c90" />
+                    <attribute name="value" value="32" id="17648" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17649" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17650" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17651" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17652" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17653" addr="0x7fca469097f0" >
+                <attributelist id="17654" addr="0x7fca469097f0" >
+                    <attribute name="sym_name" value="ACTION_SHOW_PLAYLIST" id="17655" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_SHOW_PLAYLIST" id="17656" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="33" id="17657" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17658" addr="0x7fca46934c90" />
+                    <attribute name="value" value="33" id="17659" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17660" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17661" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17662" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17663" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17664" addr="0x7fca46909950" >
+                <attributelist id="17665" addr="0x7fca46909950" >
+                    <attribute name="sym_name" value="ACTION_QUEUE_ITEM" id="17666" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_QUEUE_ITEM" id="17667" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="34" id="17668" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17669" addr="0x7fca46934c90" />
+                    <attribute name="value" value="34" id="17670" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17671" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17672" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17673" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17674" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17675" addr="0x7fca46909ab0" >
+                <attributelist id="17676" addr="0x7fca46909ab0" >
+                    <attribute name="sym_name" value="ACTION_REMOVE_ITEM" id="17677" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_REMOVE_ITEM" id="17678" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="35" id="17679" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17680" addr="0x7fca46934c90" />
+                    <attribute name="value" value="35" id="17681" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17682" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17683" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17684" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17685" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17686" addr="0x7fca46909c10" >
+                <attributelist id="17687" addr="0x7fca46909c10" >
+                    <attribute name="sym_name" value="ACTION_SHOW_FULLSCREEN" id="17688" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_SHOW_FULLSCREEN" id="17689" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="36" id="17690" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17691" addr="0x7fca46934c90" />
+                    <attribute name="value" value="36" id="17692" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17693" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17694" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17695" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17696" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17697" addr="0x7fca46909d70" >
+                <attributelist id="17698" addr="0x7fca46909d70" >
+                    <attribute name="sym_name" value="ACTION_ZOOM_LEVEL_NORMAL" id="17699" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_ZOOM_LEVEL_NORMAL" id="17700" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="37" id="17701" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17702" addr="0x7fca46934c90" />
+                    <attribute name="value" value="37" id="17703" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17704" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17705" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17706" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17707" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17708" addr="0x7fca46909ed0" >
+                <attributelist id="17709" addr="0x7fca46909ed0" >
+                    <attribute name="sym_name" value="ACTION_ZOOM_LEVEL_1" id="17710" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_ZOOM_LEVEL_1" id="17711" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="38" id="17712" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17713" addr="0x7fca46934c90" />
+                    <attribute name="value" value="38" id="17714" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17715" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17716" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17717" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17718" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17719" addr="0x7fca4690a030" >
+                <attributelist id="17720" addr="0x7fca4690a030" >
+                    <attribute name="sym_name" value="ACTION_ZOOM_LEVEL_2" id="17721" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_ZOOM_LEVEL_2" id="17722" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="39" id="17723" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17724" addr="0x7fca46934c90" />
+                    <attribute name="value" value="39" id="17725" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17726" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17727" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17728" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17729" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17730" addr="0x7fca4690a190" >
+                <attributelist id="17731" addr="0x7fca4690a190" >
+                    <attribute name="sym_name" value="ACTION_ZOOM_LEVEL_3" id="17732" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_ZOOM_LEVEL_3" id="17733" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="40" id="17734" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17735" addr="0x7fca46934c90" />
+                    <attribute name="value" value="40" id="17736" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17737" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17738" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17739" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17740" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17741" addr="0x7fca4690a2f0" >
+                <attributelist id="17742" addr="0x7fca4690a2f0" >
+                    <attribute name="sym_name" value="ACTION_ZOOM_LEVEL_4" id="17743" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_ZOOM_LEVEL_4" id="17744" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="41" id="17745" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17746" addr="0x7fca46934c90" />
+                    <attribute name="value" value="41" id="17747" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17748" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17749" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17750" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17751" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17752" addr="0x7fca4690a450" >
+                <attributelist id="17753" addr="0x7fca4690a450" >
+                    <attribute name="sym_name" value="ACTION_ZOOM_LEVEL_5" id="17754" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_ZOOM_LEVEL_5" id="17755" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="42" id="17756" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17757" addr="0x7fca46934c90" />
+                    <attribute name="value" value="42" id="17758" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17759" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17760" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17761" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17762" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17763" addr="0x7fca4690a5b0" >
+                <attributelist id="17764" addr="0x7fca4690a5b0" >
+                    <attribute name="sym_name" value="ACTION_ZOOM_LEVEL_6" id="17765" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_ZOOM_LEVEL_6" id="17766" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="43" id="17767" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17768" addr="0x7fca46934c90" />
+                    <attribute name="value" value="43" id="17769" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17770" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17771" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17772" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17773" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17774" addr="0x7fca4690a710" >
+                <attributelist id="17775" addr="0x7fca4690a710" >
+                    <attribute name="sym_name" value="ACTION_ZOOM_LEVEL_7" id="17776" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_ZOOM_LEVEL_7" id="17777" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="44" id="17778" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17779" addr="0x7fca46934c90" />
+                    <attribute name="value" value="44" id="17780" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17781" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17782" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17783" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17784" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17785" addr="0x7fca4690a870" >
+                <attributelist id="17786" addr="0x7fca4690a870" >
+                    <attribute name="sym_name" value="ACTION_ZOOM_LEVEL_8" id="17787" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_ZOOM_LEVEL_8" id="17788" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="45" id="17789" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17790" addr="0x7fca46934c90" />
+                    <attribute name="value" value="45" id="17791" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17792" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17793" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17794" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17795" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17796" addr="0x7fca4690a9d0" >
+                <attributelist id="17797" addr="0x7fca4690a9d0" >
+                    <attribute name="sym_name" value="ACTION_ZOOM_LEVEL_9" id="17798" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_ZOOM_LEVEL_9" id="17799" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="46" id="17800" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17801" addr="0x7fca46934c90" />
+                    <attribute name="value" value="46" id="17802" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17803" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17804" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17805" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17806" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17807" addr="0x7fca4690ab30" >
+                <attributelist id="17808" addr="0x7fca4690ab30" >
+                    <attribute name="sym_name" value="ACTION_CALIBRATE_SWAP_ARROWS" id="17809" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_CALIBRATE_SWAP_ARROWS" id="17810" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="47" id="17811" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17812" addr="0x7fca46934c90" />
+                    <attribute name="value" value="47" id="17813" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17814" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17815" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17816" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17817" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17818" addr="0x7fca4690ac90" >
+                <attributelist id="17819" addr="0x7fca4690ac90" >
+                    <attribute name="sym_name" value="ACTION_CALIBRATE_RESET" id="17820" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_CALIBRATE_RESET" id="17821" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="48" id="17822" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17823" addr="0x7fca46934c90" />
+                    <attribute name="value" value="48" id="17824" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17825" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17826" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17827" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17828" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17829" addr="0x7fca4690adf0" >
+                <attributelist id="17830" addr="0x7fca4690adf0" >
+                    <attribute name="sym_name" value="ACTION_ANALOG_MOVE" id="17831" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_ANALOG_MOVE" id="17832" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="49" id="17833" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17834" addr="0x7fca46934c90" />
+                    <attribute name="value" value="49" id="17835" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17836" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17837" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17838" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17839" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17840" addr="0x7fca4690af50" >
+                <attributelist id="17841" addr="0x7fca4690af50" >
+                    <attribute name="sym_name" value="ACTION_ROTATE_PICTURE_CW" id="17842" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_ROTATE_PICTURE_CW" id="17843" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="50" id="17844" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17845" addr="0x7fca46934c90" />
+                    <attribute name="value" value="50" id="17846" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17847" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17848" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17849" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17850" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17851" addr="0x7fca4690b0b0" >
+                <attributelist id="17852" addr="0x7fca4690b0b0" >
+                    <attribute name="sym_name" value="ACTION_ROTATE_PICTURE_CCW" id="17853" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_ROTATE_PICTURE_CCW" id="17854" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="51" id="17855" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17856" addr="0x7fca46934c90" />
+                    <attribute name="value" value="51" id="17857" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17858" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17859" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17860" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17861" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17862" addr="0x7fca4690b210" >
+                <attributelist id="17863" addr="0x7fca4690b210" >
+                    <attribute name="sym_name" value="ACTION_SUBTITLE_DELAY_MIN" id="17864" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_SUBTITLE_DELAY_MIN" id="17865" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="52" id="17866" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17867" addr="0x7fca46934c90" />
+                    <attribute name="value" value="52" id="17868" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17869" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17870" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17871" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17872" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17873" addr="0x7fca4690b370" >
+                <attributelist id="17874" addr="0x7fca4690b370" >
+                    <attribute name="sym_name" value="ACTION_SUBTITLE_DELAY_PLUS" id="17875" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_SUBTITLE_DELAY_PLUS" id="17876" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="53" id="17877" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17878" addr="0x7fca46934c90" />
+                    <attribute name="value" value="53" id="17879" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17880" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17881" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17882" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17883" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17884" addr="0x7fca4690b4d0" >
+                <attributelist id="17885" addr="0x7fca4690b4d0" >
+                    <attribute name="sym_name" value="ACTION_AUDIO_DELAY_MIN" id="17886" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_AUDIO_DELAY_MIN" id="17887" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="54" id="17888" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17889" addr="0x7fca46934c90" />
+                    <attribute name="value" value="54" id="17890" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17891" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17892" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17893" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17894" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17895" addr="0x7fca4690b630" >
+                <attributelist id="17896" addr="0x7fca4690b630" >
+                    <attribute name="sym_name" value="ACTION_AUDIO_DELAY_PLUS" id="17897" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_AUDIO_DELAY_PLUS" id="17898" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="55" id="17899" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17900" addr="0x7fca46934c90" />
+                    <attribute name="value" value="55" id="17901" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17902" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17903" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17904" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17905" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17906" addr="0x7fca4690b790" >
+                <attributelist id="17907" addr="0x7fca4690b790" >
+                    <attribute name="sym_name" value="ACTION_AUDIO_NEXT_LANGUAGE" id="17908" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_AUDIO_NEXT_LANGUAGE" id="17909" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="56" id="17910" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17911" addr="0x7fca46934c90" />
+                    <attribute name="value" value="56" id="17912" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17913" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17914" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17915" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17916" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17917" addr="0x7fca4690b8f0" >
+                <attributelist id="17918" addr="0x7fca4690b8f0" >
+                    <attribute name="sym_name" value="ACTION_CHANGE_RESOLUTION" id="17919" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_CHANGE_RESOLUTION" id="17920" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="57" id="17921" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17922" addr="0x7fca46934c90" />
+                    <attribute name="value" value="57" id="17923" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17924" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17925" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17926" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17927" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17928" addr="0x7fca4690ba50" >
+                <attributelist id="17929" addr="0x7fca4690ba50" >
+                    <attribute name="sym_name" value="REMOTE_0" id="17930" addr="0x7fca46934c90" />
+                    <attribute name="name" value="REMOTE_0" id="17931" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="58" id="17932" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17933" addr="0x7fca46934c90" />
+                    <attribute name="value" value="58" id="17934" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17935" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17936" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17937" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17938" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17939" addr="0x7fca4690bbb0" >
+                <attributelist id="17940" addr="0x7fca4690bbb0" >
+                    <attribute name="sym_name" value="REMOTE_1" id="17941" addr="0x7fca46934c90" />
+                    <attribute name="name" value="REMOTE_1" id="17942" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="59" id="17943" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17944" addr="0x7fca46934c90" />
+                    <attribute name="value" value="59" id="17945" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17946" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17947" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17948" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17949" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17950" addr="0x7fca4690bd10" >
+                <attributelist id="17951" addr="0x7fca4690bd10" >
+                    <attribute name="sym_name" value="REMOTE_2" id="17952" addr="0x7fca46934c90" />
+                    <attribute name="name" value="REMOTE_2" id="17953" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="60" id="17954" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17955" addr="0x7fca46934c90" />
+                    <attribute name="value" value="60" id="17956" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17957" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17958" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17959" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17960" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17961" addr="0x7fca4690be70" >
+                <attributelist id="17962" addr="0x7fca4690be70" >
+                    <attribute name="sym_name" value="REMOTE_3" id="17963" addr="0x7fca46934c90" />
+                    <attribute name="name" value="REMOTE_3" id="17964" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="61" id="17965" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17966" addr="0x7fca46934c90" />
+                    <attribute name="value" value="61" id="17967" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17968" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17969" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17970" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17971" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17972" addr="0x7fca4690bfd0" >
+                <attributelist id="17973" addr="0x7fca4690bfd0" >
+                    <attribute name="sym_name" value="REMOTE_4" id="17974" addr="0x7fca46934c90" />
+                    <attribute name="name" value="REMOTE_4" id="17975" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="62" id="17976" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17977" addr="0x7fca46934c90" />
+                    <attribute name="value" value="62" id="17978" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17979" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17980" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17981" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17982" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17983" addr="0x7fca4690c130" >
+                <attributelist id="17984" addr="0x7fca4690c130" >
+                    <attribute name="sym_name" value="REMOTE_5" id="17985" addr="0x7fca46934c90" />
+                    <attribute name="name" value="REMOTE_5" id="17986" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="63" id="17987" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17988" addr="0x7fca46934c90" />
+                    <attribute name="value" value="63" id="17989" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="17990" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="17991" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="17992" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="17993" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="17994" addr="0x7fca4690c290" >
+                <attributelist id="17995" addr="0x7fca4690c290" >
+                    <attribute name="sym_name" value="REMOTE_6" id="17996" addr="0x7fca46934c90" />
+                    <attribute name="name" value="REMOTE_6" id="17997" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="64" id="17998" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="17999" addr="0x7fca46934c90" />
+                    <attribute name="value" value="64" id="18000" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18001" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18002" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18003" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18004" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18005" addr="0x7fca4690c3f0" >
+                <attributelist id="18006" addr="0x7fca4690c3f0" >
+                    <attribute name="sym_name" value="REMOTE_7" id="18007" addr="0x7fca46934c90" />
+                    <attribute name="name" value="REMOTE_7" id="18008" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="65" id="18009" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18010" addr="0x7fca46934c90" />
+                    <attribute name="value" value="65" id="18011" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18012" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18013" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18014" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18015" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18016" addr="0x7fca4690c550" >
+                <attributelist id="18017" addr="0x7fca4690c550" >
+                    <attribute name="sym_name" value="REMOTE_8" id="18018" addr="0x7fca46934c90" />
+                    <attribute name="name" value="REMOTE_8" id="18019" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="66" id="18020" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18021" addr="0x7fca46934c90" />
+                    <attribute name="value" value="66" id="18022" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18023" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18024" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18025" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18026" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18027" addr="0x7fca4690c6b0" >
+                <attributelist id="18028" addr="0x7fca4690c6b0" >
+                    <attribute name="sym_name" value="REMOTE_9" id="18029" addr="0x7fca46934c90" />
+                    <attribute name="name" value="REMOTE_9" id="18030" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="67" id="18031" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18032" addr="0x7fca46934c90" />
+                    <attribute name="value" value="67" id="18033" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18034" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18035" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18036" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18037" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18038" addr="0x7fca4690c810" >
+                <attributelist id="18039" addr="0x7fca4690c810" >
+                    <attribute name="sym_name" value="ACTION_PLAYER_PROCESS_INFO" id="18040" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_PLAYER_PROCESS_INFO" id="18041" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="69" id="18042" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18043" addr="0x7fca46934c90" />
+                    <attribute name="value" value="69" id="18044" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18045" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18046" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18047" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18048" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18049" addr="0x7fca4690c970" >
+                <attributelist id="18050" addr="0x7fca4690c970" >
+                    <attribute name="sym_name" value="ACTION_PLAYER_PROGRAM_SELECT" id="18051" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_PLAYER_PROGRAM_SELECT" id="18052" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="70" id="18053" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18054" addr="0x7fca46934c90" />
+                    <attribute name="value" value="70" id="18055" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18056" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18057" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18058" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18059" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18060" addr="0x7fca4690cad0" >
+                <attributelist id="18061" addr="0x7fca4690cad0" >
+                    <attribute name="sym_name" value="ACTION_PLAYER_RESOLUTION_SELECT" id="18062" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_PLAYER_RESOLUTION_SELECT" id="18063" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="71" id="18064" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18065" addr="0x7fca46934c90" />
+                    <attribute name="value" value="71" id="18066" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18067" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18068" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18069" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18070" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18071" addr="0x7fca4690cc30" >
+                <attributelist id="18072" addr="0x7fca4690cc30" >
+                    <attribute name="sym_name" value="ACTION_SMALL_STEP_BACK" id="18073" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_SMALL_STEP_BACK" id="18074" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="76" id="18075" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18076" addr="0x7fca46934c90" />
+                    <attribute name="value" value="76" id="18077" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18078" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18079" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18080" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18081" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18082" addr="0x7fca4690cd90" >
+                <attributelist id="18083" addr="0x7fca4690cd90" >
+                    <attribute name="sym_name" value="ACTION_PLAYER_FORWARD" id="18084" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_PLAYER_FORWARD" id="18085" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="77" id="18086" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18087" addr="0x7fca46934c90" />
+                    <attribute name="value" value="77" id="18088" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18089" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18090" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18091" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18092" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18093" addr="0x7fca4690cef0" >
+                <attributelist id="18094" addr="0x7fca4690cef0" >
+                    <attribute name="sym_name" value="ACTION_PLAYER_REWIND" id="18095" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_PLAYER_REWIND" id="18096" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="78" id="18097" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18098" addr="0x7fca46934c90" />
+                    <attribute name="value" value="78" id="18099" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18100" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18101" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18102" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18103" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18104" addr="0x7fca4690d050" >
+                <attributelist id="18105" addr="0x7fca4690d050" >
+                    <attribute name="sym_name" value="ACTION_PLAYER_PLAY" id="18106" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_PLAYER_PLAY" id="18107" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="79" id="18108" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18109" addr="0x7fca46934c90" />
+                    <attribute name="value" value="79" id="18110" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18111" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18112" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18113" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18114" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18115" addr="0x7fca4690d1b0" >
+                <attributelist id="18116" addr="0x7fca4690d1b0" >
+                    <attribute name="sym_name" value="ACTION_DELETE_ITEM" id="18117" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_DELETE_ITEM" id="18118" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="80" id="18119" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18120" addr="0x7fca46934c90" />
+                    <attribute name="value" value="80" id="18121" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18122" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18123" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18124" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18125" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18126" addr="0x7fca4690d310" >
+                <attributelist id="18127" addr="0x7fca4690d310" >
+                    <attribute name="sym_name" value="ACTION_COPY_ITEM" id="18128" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_COPY_ITEM" id="18129" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="81" id="18130" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18131" addr="0x7fca46934c90" />
+                    <attribute name="value" value="81" id="18132" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18133" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18134" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18135" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18136" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18137" addr="0x7fca4690d470" >
+                <attributelist id="18138" addr="0x7fca4690d470" >
+                    <attribute name="sym_name" value="ACTION_MOVE_ITEM" id="18139" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_MOVE_ITEM" id="18140" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="82" id="18141" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18142" addr="0x7fca46934c90" />
+                    <attribute name="value" value="82" id="18143" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18144" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18145" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18146" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18147" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18148" addr="0x7fca4690d5d0" >
+                <attributelist id="18149" addr="0x7fca4690d5d0" >
+                    <attribute name="sym_name" value="ACTION_TAKE_SCREENSHOT" id="18150" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_TAKE_SCREENSHOT" id="18151" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="85" id="18152" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18153" addr="0x7fca46934c90" />
+                    <attribute name="value" value="85" id="18154" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18155" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18156" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18157" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18158" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18159" addr="0x7fca4690d730" >
+                <attributelist id="18160" addr="0x7fca4690d730" >
+                    <attribute name="sym_name" value="ACTION_RENAME_ITEM" id="18161" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_RENAME_ITEM" id="18162" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="87" id="18163" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18164" addr="0x7fca46934c90" />
+                    <attribute name="value" value="87" id="18165" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18166" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18167" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18168" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18169" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18170" addr="0x7fca4690d890" >
+                <attributelist id="18171" addr="0x7fca4690d890" >
+                    <attribute name="sym_name" value="ACTION_VOLUME_UP" id="18172" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_VOLUME_UP" id="18173" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="88" id="18174" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18175" addr="0x7fca46934c90" />
+                    <attribute name="value" value="88" id="18176" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18177" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18178" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18179" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18180" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18181" addr="0x7fca4690d9f0" >
+                <attributelist id="18182" addr="0x7fca4690d9f0" >
+                    <attribute name="sym_name" value="ACTION_VOLUME_DOWN" id="18183" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_VOLUME_DOWN" id="18184" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="89" id="18185" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18186" addr="0x7fca46934c90" />
+                    <attribute name="value" value="89" id="18187" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18188" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18189" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18190" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18191" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18192" addr="0x7fca4690db50" >
+                <attributelist id="18193" addr="0x7fca4690db50" >
+                    <attribute name="sym_name" value="ACTION_VOLAMP" id="18194" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_VOLAMP" id="18195" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="90" id="18196" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18197" addr="0x7fca46934c90" />
+                    <attribute name="value" value="90" id="18198" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18199" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18200" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18201" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18202" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18203" addr="0x7fca4690dcb0" >
+                <attributelist id="18204" addr="0x7fca4690dcb0" >
+                    <attribute name="sym_name" value="ACTION_MUTE" id="18205" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_MUTE" id="18206" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="91" id="18207" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18208" addr="0x7fca46934c90" />
+                    <attribute name="value" value="91" id="18209" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18210" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18211" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18212" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18213" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18214" addr="0x7fca4690de10" >
+                <attributelist id="18215" addr="0x7fca4690de10" >
+                    <attribute name="sym_name" value="ACTION_NAV_BACK" id="18216" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_NAV_BACK" id="18217" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="92" id="18218" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18219" addr="0x7fca46934c90" />
+                    <attribute name="value" value="92" id="18220" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18221" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18222" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18223" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18224" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18225" addr="0x7fca4690df70" >
+                <attributelist id="18226" addr="0x7fca4690df70" >
+                    <attribute name="sym_name" value="ACTION_VOLAMP_UP" id="18227" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_VOLAMP_UP" id="18228" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="93" id="18229" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18230" addr="0x7fca46934c90" />
+                    <attribute name="value" value="93" id="18231" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18232" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18233" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18234" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18235" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18236" addr="0x7fca4690e0d0" >
+                <attributelist id="18237" addr="0x7fca4690e0d0" >
+                    <attribute name="sym_name" value="ACTION_VOLAMP_DOWN" id="18238" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_VOLAMP_DOWN" id="18239" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="94" id="18240" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18241" addr="0x7fca46934c90" />
+                    <attribute name="value" value="94" id="18242" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18243" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18244" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18245" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18246" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18247" addr="0x7fca4690e230" >
+                <attributelist id="18248" addr="0x7fca4690e230" >
+                    <attribute name="sym_name" value="ACTION_CREATE_EPISODE_BOOKMARK" id="18249" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_CREATE_EPISODE_BOOKMARK" id="18250" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="95" id="18251" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18252" addr="0x7fca46934c90" />
+                    <attribute name="value" value="95" id="18253" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18254" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18255" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18256" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18257" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18258" addr="0x7fca4690e390" >
+                <attributelist id="18259" addr="0x7fca4690e390" >
+                    <attribute name="sym_name" value="ACTION_CREATE_BOOKMARK" id="18260" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_CREATE_BOOKMARK" id="18261" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="96" id="18262" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18263" addr="0x7fca46934c90" />
+                    <attribute name="value" value="96" id="18264" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18265" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18266" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18267" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18268" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18269" addr="0x7fca4690e4f0" >
+                <attributelist id="18270" addr="0x7fca4690e4f0" >
+                    <attribute name="sym_name" value="ACTION_CHAPTER_OR_BIG_STEP_FORWARD" id="18271" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_CHAPTER_OR_BIG_STEP_FORWARD" id="18272" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="97" id="18273" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18274" addr="0x7fca46934c90" />
+                    <attribute name="value" value="97" id="18275" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18276" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18277" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18278" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18279" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18280" addr="0x7fca4690e650" >
+                <attributelist id="18281" addr="0x7fca4690e650" >
+                    <attribute name="sym_name" value="ACTION_CHAPTER_OR_BIG_STEP_BACK" id="18282" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_CHAPTER_OR_BIG_STEP_BACK" id="18283" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="98" id="18284" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18285" addr="0x7fca46934c90" />
+                    <attribute name="value" value="98" id="18286" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18287" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18288" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18289" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18290" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18291" addr="0x7fca4690e7b0" >
+                <attributelist id="18292" addr="0x7fca4690e7b0" >
+                    <attribute name="sym_name" value="ACTION_CYCLE_SUBTITLE" id="18293" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_CYCLE_SUBTITLE" id="18294" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="99" id="18295" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18296" addr="0x7fca46934c90" />
+                    <attribute name="value" value="99" id="18297" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18298" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18299" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18300" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18301" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18302" addr="0x7fca4690e910" >
+                <attributelist id="18303" addr="0x7fca4690e910" >
+                    <attribute name="sym_name" value="ACTION_MOUSE_START" id="18304" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_MOUSE_START" id="18305" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="100" id="18306" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18307" addr="0x7fca46934c90" />
+                    <attribute name="value" value="100" id="18308" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18309" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18310" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18311" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18312" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18313" addr="0x7fca4690ea70" >
+                <attributelist id="18314" addr="0x7fca4690ea70" >
+                    <attribute name="sym_name" value="ACTION_MOUSE_LEFT_CLICK" id="18315" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_MOUSE_LEFT_CLICK" id="18316" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="100" id="18317" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18318" addr="0x7fca46934c90" />
+                    <attribute name="value" value="100" id="18319" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18320" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18321" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18322" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18323" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18324" addr="0x7fca4690ebd0" >
+                <attributelist id="18325" addr="0x7fca4690ebd0" >
+                    <attribute name="sym_name" value="ACTION_MOUSE_RIGHT_CLICK" id="18326" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_MOUSE_RIGHT_CLICK" id="18327" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="101" id="18328" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18329" addr="0x7fca46934c90" />
+                    <attribute name="value" value="101" id="18330" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18331" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18332" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18333" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18334" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18335" addr="0x7fca4690ed30" >
+                <attributelist id="18336" addr="0x7fca4690ed30" >
+                    <attribute name="sym_name" value="ACTION_MOUSE_MIDDLE_CLICK" id="18337" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_MOUSE_MIDDLE_CLICK" id="18338" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="102" id="18339" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18340" addr="0x7fca46934c90" />
+                    <attribute name="value" value="102" id="18341" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18342" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18343" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18344" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18345" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18346" addr="0x7fca4690ee90" >
+                <attributelist id="18347" addr="0x7fca4690ee90" >
+                    <attribute name="sym_name" value="ACTION_MOUSE_DOUBLE_CLICK" id="18348" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_MOUSE_DOUBLE_CLICK" id="18349" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="103" id="18350" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18351" addr="0x7fca46934c90" />
+                    <attribute name="value" value="103" id="18352" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18353" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18354" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18355" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18356" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18357" addr="0x7fca4690eff0" >
+                <attributelist id="18358" addr="0x7fca4690eff0" >
+                    <attribute name="sym_name" value="ACTION_MOUSE_WHEEL_UP" id="18359" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_MOUSE_WHEEL_UP" id="18360" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="104" id="18361" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18362" addr="0x7fca46934c90" />
+                    <attribute name="value" value="104" id="18363" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18364" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18365" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18366" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18367" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18368" addr="0x7fca4690f150" >
+                <attributelist id="18369" addr="0x7fca4690f150" >
+                    <attribute name="sym_name" value="ACTION_MOUSE_WHEEL_DOWN" id="18370" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_MOUSE_WHEEL_DOWN" id="18371" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="105" id="18372" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18373" addr="0x7fca46934c90" />
+                    <attribute name="value" value="105" id="18374" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18375" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18376" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18377" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18378" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18379" addr="0x7fca4690f2b0" >
+                <attributelist id="18380" addr="0x7fca4690f2b0" >
+                    <attribute name="sym_name" value="ACTION_MOUSE_DRAG" id="18381" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_MOUSE_DRAG" id="18382" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="106" id="18383" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18384" addr="0x7fca46934c90" />
+                    <attribute name="value" value="106" id="18385" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18386" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18387" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18388" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18389" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18390" addr="0x7fca4690f410" >
+                <attributelist id="18391" addr="0x7fca4690f410" >
+                    <attribute name="sym_name" value="ACTION_MOUSE_MOVE" id="18392" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_MOUSE_MOVE" id="18393" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="107" id="18394" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18395" addr="0x7fca46934c90" />
+                    <attribute name="value" value="107" id="18396" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18397" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18398" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18399" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18400" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18401" addr="0x7fca4690f570" >
+                <attributelist id="18402" addr="0x7fca4690f570" >
+                    <attribute name="sym_name" value="ACTION_MOUSE_LONG_CLICK" id="18403" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_MOUSE_LONG_CLICK" id="18404" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="108" id="18405" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18406" addr="0x7fca46934c90" />
+                    <attribute name="value" value="108" id="18407" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18408" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18409" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18410" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18411" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18412" addr="0x7fca4690f6d0" >
+                <attributelist id="18413" addr="0x7fca4690f6d0" >
+                    <attribute name="sym_name" value="ACTION_MOUSE_END" id="18414" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_MOUSE_END" id="18415" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="109" id="18416" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18417" addr="0x7fca46934c90" />
+                    <attribute name="value" value="109" id="18418" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18419" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18420" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18421" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18422" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18423" addr="0x7fca4690f830" >
+                <attributelist id="18424" addr="0x7fca4690f830" >
+                    <attribute name="sym_name" value="ACTION_BACKSPACE" id="18425" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_BACKSPACE" id="18426" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="110" id="18427" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18428" addr="0x7fca46934c90" />
+                    <attribute name="value" value="110" id="18429" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18430" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18431" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18432" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18433" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18434" addr="0x7fca4690f990" >
+                <attributelist id="18435" addr="0x7fca4690f990" >
+                    <attribute name="sym_name" value="ACTION_SCROLL_UP" id="18436" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_SCROLL_UP" id="18437" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="111" id="18438" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18439" addr="0x7fca46934c90" />
+                    <attribute name="value" value="111" id="18440" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18441" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18442" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18443" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18444" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18445" addr="0x7fca4690faf0" >
+                <attributelist id="18446" addr="0x7fca4690faf0" >
+                    <attribute name="sym_name" value="ACTION_SCROLL_DOWN" id="18447" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_SCROLL_DOWN" id="18448" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="112" id="18449" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18450" addr="0x7fca46934c90" />
+                    <attribute name="value" value="112" id="18451" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18452" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18453" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18454" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18455" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18456" addr="0x7fca4690fc50" >
+                <attributelist id="18457" addr="0x7fca4690fc50" >
+                    <attribute name="sym_name" value="ACTION_ANALOG_FORWARD" id="18458" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_ANALOG_FORWARD" id="18459" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="113" id="18460" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18461" addr="0x7fca46934c90" />
+                    <attribute name="value" value="113" id="18462" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18463" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18464" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18465" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18466" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18467" addr="0x7fca4690fdb0" >
+                <attributelist id="18468" addr="0x7fca4690fdb0" >
+                    <attribute name="sym_name" value="ACTION_ANALOG_REWIND" id="18469" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_ANALOG_REWIND" id="18470" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="114" id="18471" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18472" addr="0x7fca46934c90" />
+                    <attribute name="value" value="114" id="18473" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18474" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18475" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18476" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18477" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18478" addr="0x7fca4690ff10" >
+                <attributelist id="18479" addr="0x7fca4690ff10" >
+                    <attribute name="sym_name" value="ACTION_MOVE_ITEM_UP" id="18480" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_MOVE_ITEM_UP" id="18481" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="115" id="18482" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18483" addr="0x7fca46934c90" />
+                    <attribute name="value" value="115" id="18484" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18485" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18486" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18487" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18488" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18489" addr="0x7fca46910070" >
+                <attributelist id="18490" addr="0x7fca46910070" >
+                    <attribute name="sym_name" value="ACTION_MOVE_ITEM_DOWN" id="18491" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_MOVE_ITEM_DOWN" id="18492" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="116" id="18493" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18494" addr="0x7fca46934c90" />
+                    <attribute name="value" value="116" id="18495" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18496" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18497" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18498" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18499" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18500" addr="0x7fca469101d0" >
+                <attributelist id="18501" addr="0x7fca469101d0" >
+                    <attribute name="sym_name" value="ACTION_CONTEXT_MENU" id="18502" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_CONTEXT_MENU" id="18503" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="117" id="18504" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18505" addr="0x7fca46934c90" />
+                    <attribute name="value" value="117" id="18506" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18507" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18508" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18509" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18510" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18511" addr="0x7fca46910330" >
+                <attributelist id="18512" addr="0x7fca46910330" >
+                    <attribute name="sym_name" value="ACTION_SHIFT" id="18513" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_SHIFT" id="18514" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="118" id="18515" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18516" addr="0x7fca46934c90" />
+                    <attribute name="value" value="118" id="18517" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18518" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18519" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18520" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18521" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18522" addr="0x7fca46910490" >
+                <attributelist id="18523" addr="0x7fca46910490" >
+                    <attribute name="sym_name" value="ACTION_SYMBOLS" id="18524" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_SYMBOLS" id="18525" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="119" id="18526" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18527" addr="0x7fca46934c90" />
+                    <attribute name="value" value="119" id="18528" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18529" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18530" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18531" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18532" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18533" addr="0x7fca469105f0" >
+                <attributelist id="18534" addr="0x7fca469105f0" >
+                    <attribute name="sym_name" value="ACTION_CURSOR_LEFT" id="18535" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_CURSOR_LEFT" id="18536" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="120" id="18537" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18538" addr="0x7fca46934c90" />
+                    <attribute name="value" value="120" id="18539" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18540" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18541" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18542" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18543" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18544" addr="0x7fca46910750" >
+                <attributelist id="18545" addr="0x7fca46910750" >
+                    <attribute name="sym_name" value="ACTION_CURSOR_RIGHT" id="18546" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_CURSOR_RIGHT" id="18547" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="121" id="18548" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18549" addr="0x7fca46934c90" />
+                    <attribute name="value" value="121" id="18550" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18551" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18552" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18553" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18554" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18555" addr="0x7fca469108b0" >
+                <attributelist id="18556" addr="0x7fca469108b0" >
+                    <attribute name="sym_name" value="ACTION_BUILT_IN_FUNCTION" id="18557" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_BUILT_IN_FUNCTION" id="18558" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="122" id="18559" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18560" addr="0x7fca46934c90" />
+                    <attribute name="value" value="122" id="18561" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18562" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18563" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18564" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18565" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18566" addr="0x7fca46910a10" >
+                <attributelist id="18567" addr="0x7fca46910a10" >
+                    <attribute name="sym_name" value="ACTION_SHOW_OSD_TIME" id="18568" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_SHOW_OSD_TIME" id="18569" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="123" id="18570" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18571" addr="0x7fca46934c90" />
+                    <attribute name="value" value="123" id="18572" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18573" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18574" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18575" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18576" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18577" addr="0x7fca46910b70" >
+                <attributelist id="18578" addr="0x7fca46910b70" >
+                    <attribute name="sym_name" value="ACTION_ANALOG_SEEK_FORWARD" id="18579" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_ANALOG_SEEK_FORWARD" id="18580" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="124" id="18581" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18582" addr="0x7fca46934c90" />
+                    <attribute name="value" value="124" id="18583" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18584" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18585" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18586" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18587" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18588" addr="0x7fca46910cd0" >
+                <attributelist id="18589" addr="0x7fca46910cd0" >
+                    <attribute name="sym_name" value="ACTION_ANALOG_SEEK_BACK" id="18590" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_ANALOG_SEEK_BACK" id="18591" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="125" id="18592" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18593" addr="0x7fca46934c90" />
+                    <attribute name="value" value="125" id="18594" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18595" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18596" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18597" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18598" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18599" addr="0x7fca46910e30" >
+                <attributelist id="18600" addr="0x7fca46910e30" >
+                    <attribute name="sym_name" value="ACTION_VIS_PRESET_SHOW" id="18601" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_VIS_PRESET_SHOW" id="18602" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="126" id="18603" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18604" addr="0x7fca46934c90" />
+                    <attribute name="value" value="126" id="18605" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18606" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18607" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18608" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18609" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18610" addr="0x7fca46910f90" >
+                <attributelist id="18611" addr="0x7fca46910f90" >
+                    <attribute name="sym_name" value="ACTION_VIS_PRESET_NEXT" id="18612" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_VIS_PRESET_NEXT" id="18613" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="128" id="18614" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18615" addr="0x7fca46934c90" />
+                    <attribute name="value" value="128" id="18616" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18617" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18618" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18619" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18620" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18621" addr="0x7fca469110f0" >
+                <attributelist id="18622" addr="0x7fca469110f0" >
+                    <attribute name="sym_name" value="ACTION_VIS_PRESET_PREV" id="18623" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_VIS_PRESET_PREV" id="18624" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="129" id="18625" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18626" addr="0x7fca46934c90" />
+                    <attribute name="value" value="129" id="18627" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18628" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18629" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18630" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18631" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18632" addr="0x7fca46911250" >
+                <attributelist id="18633" addr="0x7fca46911250" >
+                    <attribute name="sym_name" value="ACTION_VIS_PRESET_LOCK" id="18634" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_VIS_PRESET_LOCK" id="18635" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="130" id="18636" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18637" addr="0x7fca46934c90" />
+                    <attribute name="value" value="130" id="18638" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18639" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18640" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18641" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18642" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18643" addr="0x7fca469113b0" >
+                <attributelist id="18644" addr="0x7fca469113b0" >
+                    <attribute name="sym_name" value="ACTION_VIS_PRESET_RANDOM" id="18645" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_VIS_PRESET_RANDOM" id="18646" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="131" id="18647" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18648" addr="0x7fca46934c90" />
+                    <attribute name="value" value="131" id="18649" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18650" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18651" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18652" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18653" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18654" addr="0x7fca46911510" >
+                <attributelist id="18655" addr="0x7fca46911510" >
+                    <attribute name="sym_name" value="ACTION_VIS_RATE_PRESET_PLUS" id="18656" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_VIS_RATE_PRESET_PLUS" id="18657" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="132" id="18658" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18659" addr="0x7fca46934c90" />
+                    <attribute name="value" value="132" id="18660" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18661" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18662" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18663" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18664" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18665" addr="0x7fca46911670" >
+                <attributelist id="18666" addr="0x7fca46911670" >
+                    <attribute name="sym_name" value="ACTION_VIS_RATE_PRESET_MINUS" id="18667" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_VIS_RATE_PRESET_MINUS" id="18668" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="133" id="18669" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18670" addr="0x7fca46934c90" />
+                    <attribute name="value" value="133" id="18671" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18672" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18673" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18674" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18675" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18676" addr="0x7fca469117d0" >
+                <attributelist id="18677" addr="0x7fca469117d0" >
+                    <attribute name="sym_name" value="ACTION_SHOW_VIDEOMENU" id="18678" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_SHOW_VIDEOMENU" id="18679" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="134" id="18680" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18681" addr="0x7fca46934c90" />
+                    <attribute name="value" value="134" id="18682" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18683" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18684" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18685" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18686" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18687" addr="0x7fca46911930" >
+                <attributelist id="18688" addr="0x7fca46911930" >
+                    <attribute name="sym_name" value="ACTION_ENTER" id="18689" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_ENTER" id="18690" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="135" id="18691" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18692" addr="0x7fca46934c90" />
+                    <attribute name="value" value="135" id="18693" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18694" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18695" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18696" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18697" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18698" addr="0x7fca46911a90" >
+                <attributelist id="18699" addr="0x7fca46911a90" >
+                    <attribute name="sym_name" value="ACTION_INCREASE_RATING" id="18700" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_INCREASE_RATING" id="18701" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="136" id="18702" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18703" addr="0x7fca46934c90" />
+                    <attribute name="value" value="136" id="18704" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18705" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18706" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18707" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18708" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18709" addr="0x7fca46911bf0" >
+                <attributelist id="18710" addr="0x7fca46911bf0" >
+                    <attribute name="sym_name" value="ACTION_DECREASE_RATING" id="18711" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_DECREASE_RATING" id="18712" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="137" id="18713" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18714" addr="0x7fca46934c90" />
+                    <attribute name="value" value="137" id="18715" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18716" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18717" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18718" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18719" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18720" addr="0x7fca46911d50" >
+                <attributelist id="18721" addr="0x7fca46911d50" >
+                    <attribute name="sym_name" value="ACTION_NEXT_SCENE" id="18722" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_NEXT_SCENE" id="18723" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="138" id="18724" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18725" addr="0x7fca46934c90" />
+                    <attribute name="value" value="138" id="18726" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18727" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18728" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18729" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18730" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18731" addr="0x7fca46911eb0" >
+                <attributelist id="18732" addr="0x7fca46911eb0" >
+                    <attribute name="sym_name" value="ACTION_PREV_SCENE" id="18733" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_PREV_SCENE" id="18734" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="139" id="18735" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18736" addr="0x7fca46934c90" />
+                    <attribute name="value" value="139" id="18737" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18738" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18739" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18740" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18741" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18742" addr="0x7fca46912010" >
+                <attributelist id="18743" addr="0x7fca46912010" >
+                    <attribute name="sym_name" value="ACTION_NEXT_LETTER" id="18744" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_NEXT_LETTER" id="18745" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="140" id="18746" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18747" addr="0x7fca46934c90" />
+                    <attribute name="value" value="140" id="18748" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18749" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18750" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18751" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18752" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18753" addr="0x7fca46912170" >
+                <attributelist id="18754" addr="0x7fca46912170" >
+                    <attribute name="sym_name" value="ACTION_PREV_LETTER" id="18755" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_PREV_LETTER" id="18756" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="141" id="18757" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18758" addr="0x7fca46934c90" />
+                    <attribute name="value" value="141" id="18759" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18760" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18761" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18762" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18763" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18764" addr="0x7fca469122d0" >
+                <attributelist id="18765" addr="0x7fca469122d0" >
+                    <attribute name="sym_name" value="ACTION_JUMP_SMS2" id="18766" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_JUMP_SMS2" id="18767" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="142" id="18768" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18769" addr="0x7fca46934c90" />
+                    <attribute name="value" value="142" id="18770" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18771" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18772" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18773" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18774" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18775" addr="0x7fca46912430" >
+                <attributelist id="18776" addr="0x7fca46912430" >
+                    <attribute name="sym_name" value="ACTION_JUMP_SMS3" id="18777" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_JUMP_SMS3" id="18778" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="143" id="18779" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18780" addr="0x7fca46934c90" />
+                    <attribute name="value" value="143" id="18781" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18782" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18783" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18784" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18785" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18786" addr="0x7fca46912590" >
+                <attributelist id="18787" addr="0x7fca46912590" >
+                    <attribute name="sym_name" value="ACTION_JUMP_SMS4" id="18788" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_JUMP_SMS4" id="18789" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="144" id="18790" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18791" addr="0x7fca46934c90" />
+                    <attribute name="value" value="144" id="18792" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18793" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18794" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18795" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18796" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18797" addr="0x7fca469126f0" >
+                <attributelist id="18798" addr="0x7fca469126f0" >
+                    <attribute name="sym_name" value="ACTION_JUMP_SMS5" id="18799" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_JUMP_SMS5" id="18800" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="145" id="18801" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18802" addr="0x7fca46934c90" />
+                    <attribute name="value" value="145" id="18803" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18804" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18805" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18806" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18807" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18808" addr="0x7fca46912850" >
+                <attributelist id="18809" addr="0x7fca46912850" >
+                    <attribute name="sym_name" value="ACTION_JUMP_SMS6" id="18810" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_JUMP_SMS6" id="18811" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="146" id="18812" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18813" addr="0x7fca46934c90" />
+                    <attribute name="value" value="146" id="18814" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18815" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18816" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18817" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18818" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18819" addr="0x7fca469129b0" >
+                <attributelist id="18820" addr="0x7fca469129b0" >
+                    <attribute name="sym_name" value="ACTION_JUMP_SMS7" id="18821" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_JUMP_SMS7" id="18822" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="147" id="18823" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18824" addr="0x7fca46934c90" />
+                    <attribute name="value" value="147" id="18825" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18826" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18827" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18828" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18829" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18830" addr="0x7fca46912b10" >
+                <attributelist id="18831" addr="0x7fca46912b10" >
+                    <attribute name="sym_name" value="ACTION_JUMP_SMS8" id="18832" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_JUMP_SMS8" id="18833" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="148" id="18834" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18835" addr="0x7fca46934c90" />
+                    <attribute name="value" value="148" id="18836" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18837" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18838" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18839" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18840" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18841" addr="0x7fca46912c70" >
+                <attributelist id="18842" addr="0x7fca46912c70" >
+                    <attribute name="sym_name" value="ACTION_JUMP_SMS9" id="18843" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_JUMP_SMS9" id="18844" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="149" id="18845" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18846" addr="0x7fca46934c90" />
+                    <attribute name="value" value="149" id="18847" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18848" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18849" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18850" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18851" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18852" addr="0x7fca46912dd0" >
+                <attributelist id="18853" addr="0x7fca46912dd0" >
+                    <attribute name="sym_name" value="ACTION_FILTER_CLEAR" id="18854" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_FILTER_CLEAR" id="18855" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="150" id="18856" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18857" addr="0x7fca46934c90" />
+                    <attribute name="value" value="150" id="18858" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18859" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18860" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18861" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18862" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18863" addr="0x7fca46912f30" >
+                <attributelist id="18864" addr="0x7fca46912f30" >
+                    <attribute name="sym_name" value="ACTION_FILTER_SMS2" id="18865" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_FILTER_SMS2" id="18866" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="151" id="18867" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18868" addr="0x7fca46934c90" />
+                    <attribute name="value" value="151" id="18869" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18870" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18871" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18872" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18873" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18874" addr="0x7fca46913090" >
+                <attributelist id="18875" addr="0x7fca46913090" >
+                    <attribute name="sym_name" value="ACTION_FILTER_SMS3" id="18876" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_FILTER_SMS3" id="18877" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="152" id="18878" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18879" addr="0x7fca46934c90" />
+                    <attribute name="value" value="152" id="18880" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18881" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18882" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18883" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18884" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18885" addr="0x7fca469131f0" >
+                <attributelist id="18886" addr="0x7fca469131f0" >
+                    <attribute name="sym_name" value="ACTION_FILTER_SMS4" id="18887" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_FILTER_SMS4" id="18888" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="153" id="18889" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18890" addr="0x7fca46934c90" />
+                    <attribute name="value" value="153" id="18891" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18892" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18893" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18894" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18895" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18896" addr="0x7fca46913350" >
+                <attributelist id="18897" addr="0x7fca46913350" >
+                    <attribute name="sym_name" value="ACTION_FILTER_SMS5" id="18898" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_FILTER_SMS5" id="18899" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="154" id="18900" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18901" addr="0x7fca46934c90" />
+                    <attribute name="value" value="154" id="18902" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18903" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18904" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18905" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18906" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18907" addr="0x7fca469134b0" >
+                <attributelist id="18908" addr="0x7fca469134b0" >
+                    <attribute name="sym_name" value="ACTION_FILTER_SMS6" id="18909" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_FILTER_SMS6" id="18910" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="155" id="18911" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18912" addr="0x7fca46934c90" />
+                    <attribute name="value" value="155" id="18913" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18914" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18915" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18916" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18917" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18918" addr="0x7fca46913610" >
+                <attributelist id="18919" addr="0x7fca46913610" >
+                    <attribute name="sym_name" value="ACTION_FILTER_SMS7" id="18920" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_FILTER_SMS7" id="18921" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="156" id="18922" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18923" addr="0x7fca46934c90" />
+                    <attribute name="value" value="156" id="18924" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18925" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18926" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18927" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18928" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18929" addr="0x7fca46913770" >
+                <attributelist id="18930" addr="0x7fca46913770" >
+                    <attribute name="sym_name" value="ACTION_FILTER_SMS8" id="18931" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_FILTER_SMS8" id="18932" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="157" id="18933" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18934" addr="0x7fca46934c90" />
+                    <attribute name="value" value="157" id="18935" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18936" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18937" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18938" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18939" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18940" addr="0x7fca469138d0" >
+                <attributelist id="18941" addr="0x7fca469138d0" >
+                    <attribute name="sym_name" value="ACTION_FILTER_SMS9" id="18942" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_FILTER_SMS9" id="18943" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="158" id="18944" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18945" addr="0x7fca46934c90" />
+                    <attribute name="value" value="158" id="18946" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18947" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18948" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18949" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18950" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18951" addr="0x7fca46913a30" >
+                <attributelist id="18952" addr="0x7fca46913a30" >
+                    <attribute name="sym_name" value="ACTION_FIRST_PAGE" id="18953" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_FIRST_PAGE" id="18954" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="159" id="18955" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18956" addr="0x7fca46934c90" />
+                    <attribute name="value" value="159" id="18957" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18958" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18959" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18960" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18961" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18962" addr="0x7fca46913b90" >
+                <attributelist id="18963" addr="0x7fca46913b90" >
+                    <attribute name="sym_name" value="ACTION_LAST_PAGE" id="18964" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_LAST_PAGE" id="18965" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="160" id="18966" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18967" addr="0x7fca46934c90" />
+                    <attribute name="value" value="160" id="18968" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18969" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18970" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18971" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18972" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18973" addr="0x7fca46913cf0" >
+                <attributelist id="18974" addr="0x7fca46913cf0" >
+                    <attribute name="sym_name" value="ACTION_AUDIO_DELAY" id="18975" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_AUDIO_DELAY" id="18976" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="161" id="18977" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18978" addr="0x7fca46934c90" />
+                    <attribute name="value" value="161" id="18979" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18980" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18981" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18982" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18983" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18984" addr="0x7fca46913e50" >
+                <attributelist id="18985" addr="0x7fca46913e50" >
+                    <attribute name="sym_name" value="ACTION_SUBTITLE_DELAY" id="18986" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_SUBTITLE_DELAY" id="18987" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="162" id="18988" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="18989" addr="0x7fca46934c90" />
+                    <attribute name="value" value="162" id="18990" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="18991" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="18992" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="18993" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="18994" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="18995" addr="0x7fca46913fb0" >
+                <attributelist id="18996" addr="0x7fca46913fb0" >
+                    <attribute name="sym_name" value="ACTION_MENU" id="18997" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_MENU" id="18998" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="163" id="18999" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19000" addr="0x7fca46934c90" />
+                    <attribute name="value" value="163" id="19001" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19002" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19003" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19004" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19005" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19006" addr="0x7fca46914110" >
+                <attributelist id="19007" addr="0x7fca46914110" >
+                    <attribute name="sym_name" value="ACTION_SET_RATING" id="19008" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_SET_RATING" id="19009" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="164" id="19010" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19011" addr="0x7fca46934c90" />
+                    <attribute name="value" value="164" id="19012" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19013" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19014" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19015" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19016" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19017" addr="0x7fca46914270" >
+                <attributelist id="19018" addr="0x7fca46914270" >
+                    <attribute name="sym_name" value="ACTION_RECORD" id="19019" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_RECORD" id="19020" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="170" id="19021" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19022" addr="0x7fca46934c90" />
+                    <attribute name="value" value="170" id="19023" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19024" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19025" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19026" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19027" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19028" addr="0x7fca469143d0" >
+                <attributelist id="19029" addr="0x7fca469143d0" >
+                    <attribute name="sym_name" value="ACTION_PASTE" id="19030" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_PASTE" id="19031" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="180" id="19032" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19033" addr="0x7fca46934c90" />
+                    <attribute name="value" value="180" id="19034" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19035" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19036" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19037" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19038" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19039" addr="0x7fca46914530" >
+                <attributelist id="19040" addr="0x7fca46914530" >
+                    <attribute name="sym_name" value="ACTION_NEXT_CONTROL" id="19041" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_NEXT_CONTROL" id="19042" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="181" id="19043" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19044" addr="0x7fca46934c90" />
+                    <attribute name="value" value="181" id="19045" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19046" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19047" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19048" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19049" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19050" addr="0x7fca46914690" >
+                <attributelist id="19051" addr="0x7fca46914690" >
+                    <attribute name="sym_name" value="ACTION_PREV_CONTROL" id="19052" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_PREV_CONTROL" id="19053" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="182" id="19054" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19055" addr="0x7fca46934c90" />
+                    <attribute name="value" value="182" id="19056" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19057" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19058" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19059" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19060" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19061" addr="0x7fca469147f0" >
+                <attributelist id="19062" addr="0x7fca469147f0" >
+                    <attribute name="sym_name" value="ACTION_CHANNEL_SWITCH" id="19063" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_CHANNEL_SWITCH" id="19064" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="183" id="19065" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19066" addr="0x7fca46934c90" />
+                    <attribute name="value" value="183" id="19067" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19068" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19069" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19070" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19071" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19072" addr="0x7fca46914950" >
+                <attributelist id="19073" addr="0x7fca46914950" >
+                    <attribute name="sym_name" value="ACTION_CHANNEL_UP" id="19074" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_CHANNEL_UP" id="19075" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="184" id="19076" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19077" addr="0x7fca46934c90" />
+                    <attribute name="value" value="184" id="19078" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19079" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19080" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19081" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19082" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19083" addr="0x7fca46914ab0" >
+                <attributelist id="19084" addr="0x7fca46914ab0" >
+                    <attribute name="sym_name" value="ACTION_CHANNEL_DOWN" id="19085" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_CHANNEL_DOWN" id="19086" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="185" id="19087" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19088" addr="0x7fca46934c90" />
+                    <attribute name="value" value="185" id="19089" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19090" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19091" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19092" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19093" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19094" addr="0x7fca46914c10" >
+                <attributelist id="19095" addr="0x7fca46914c10" >
+                    <attribute name="sym_name" value="ACTION_NEXT_CHANNELGROUP" id="19096" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_NEXT_CHANNELGROUP" id="19097" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="186" id="19098" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19099" addr="0x7fca46934c90" />
+                    <attribute name="value" value="186" id="19100" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19101" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19102" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19103" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19104" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19105" addr="0x7fca46914d70" >
+                <attributelist id="19106" addr="0x7fca46914d70" >
+                    <attribute name="sym_name" value="ACTION_PREVIOUS_CHANNELGROUP" id="19107" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_PREVIOUS_CHANNELGROUP" id="19108" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="187" id="19109" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19110" addr="0x7fca46934c90" />
+                    <attribute name="value" value="187" id="19111" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19112" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19113" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19114" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19115" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19116" addr="0x7fca46914ed0" >
+                <attributelist id="19117" addr="0x7fca46914ed0" >
+                    <attribute name="sym_name" value="ACTION_PVR_PLAY" id="19118" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_PVR_PLAY" id="19119" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="188" id="19120" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19121" addr="0x7fca46934c90" />
+                    <attribute name="value" value="188" id="19122" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19123" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19124" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19125" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19126" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19127" addr="0x7fca46915030" >
+                <attributelist id="19128" addr="0x7fca46915030" >
+                    <attribute name="sym_name" value="ACTION_PVR_PLAY_TV" id="19129" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_PVR_PLAY_TV" id="19130" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="189" id="19131" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19132" addr="0x7fca46934c90" />
+                    <attribute name="value" value="189" id="19133" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19134" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19135" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19136" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19137" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19138" addr="0x7fca46915190" >
+                <attributelist id="19139" addr="0x7fca46915190" >
+                    <attribute name="sym_name" value="ACTION_PVR_PLAY_RADIO" id="19140" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_PVR_PLAY_RADIO" id="19141" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="190" id="19142" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19143" addr="0x7fca46934c90" />
+                    <attribute name="value" value="190" id="19144" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19145" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19146" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19147" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19148" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19149" addr="0x7fca469152f0" >
+                <attributelist id="19150" addr="0x7fca469152f0" >
+                    <attribute name="sym_name" value="ACTION_PVR_SHOW_TIMER_RULE" id="19151" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_PVR_SHOW_TIMER_RULE" id="19152" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="191" id="19153" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19154" addr="0x7fca46934c90" />
+                    <attribute name="value" value="191" id="19155" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19156" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19157" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19158" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19159" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19160" addr="0x7fca46915450" >
+                <attributelist id="19161" addr="0x7fca46915450" >
+                    <attribute name="sym_name" value="ACTION_CHANNEL_NUMBER_SEP" id="19162" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_CHANNEL_NUMBER_SEP" id="19163" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="192" id="19164" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19165" addr="0x7fca46934c90" />
+                    <attribute name="value" value="192" id="19166" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19167" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19168" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19169" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19170" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19171" addr="0x7fca469155b0" >
+                <attributelist id="19172" addr="0x7fca469155b0" >
+                    <attribute name="sym_name" value="ACTION_TOGGLE_FULLSCREEN" id="19173" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_TOGGLE_FULLSCREEN" id="19174" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="199" id="19175" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19176" addr="0x7fca46934c90" />
+                    <attribute name="value" value="199" id="19177" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19178" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19179" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19180" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19181" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19182" addr="0x7fca46915710" >
+                <attributelist id="19183" addr="0x7fca46915710" >
+                    <attribute name="sym_name" value="ACTION_TOGGLE_WATCHED" id="19184" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_TOGGLE_WATCHED" id="19185" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="200" id="19186" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19187" addr="0x7fca46934c90" />
+                    <attribute name="value" value="200" id="19188" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19189" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19190" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19191" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19192" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19193" addr="0x7fca46915870" >
+                <attributelist id="19194" addr="0x7fca46915870" >
+                    <attribute name="sym_name" value="ACTION_SCAN_ITEM" id="19195" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_SCAN_ITEM" id="19196" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="201" id="19197" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19198" addr="0x7fca46934c90" />
+                    <attribute name="value" value="201" id="19199" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19200" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19201" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19202" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19203" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19204" addr="0x7fca469159d0" >
+                <attributelist id="19205" addr="0x7fca469159d0" >
+                    <attribute name="sym_name" value="ACTION_TOGGLE_DIGITAL_ANALOG" id="19206" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_TOGGLE_DIGITAL_ANALOG" id="19207" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="202" id="19208" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19209" addr="0x7fca46934c90" />
+                    <attribute name="value" value="202" id="19210" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19211" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19212" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19213" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19214" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19215" addr="0x7fca46915b30" >
+                <attributelist id="19216" addr="0x7fca46915b30" >
+                    <attribute name="sym_name" value="ACTION_RELOAD_KEYMAPS" id="19217" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_RELOAD_KEYMAPS" id="19218" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="203" id="19219" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19220" addr="0x7fca46934c90" />
+                    <attribute name="value" value="203" id="19221" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19222" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19223" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19224" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19225" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19226" addr="0x7fca46915c90" >
+                <attributelist id="19227" addr="0x7fca46915c90" >
+                    <attribute name="sym_name" value="ACTION_GUIPROFILE_BEGIN" id="19228" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_GUIPROFILE_BEGIN" id="19229" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="204" id="19230" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19231" addr="0x7fca46934c90" />
+                    <attribute name="value" value="204" id="19232" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19233" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19234" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19235" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19236" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19237" addr="0x7fca46915df0" >
+                <attributelist id="19238" addr="0x7fca46915df0" >
+                    <attribute name="sym_name" value="ACTION_TELETEXT_RED" id="19239" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_TELETEXT_RED" id="19240" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="215" id="19241" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19242" addr="0x7fca46934c90" />
+                    <attribute name="value" value="215" id="19243" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19244" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19245" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19246" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19247" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19248" addr="0x7fca46915f50" >
+                <attributelist id="19249" addr="0x7fca46915f50" >
+                    <attribute name="sym_name" value="ACTION_TELETEXT_GREEN" id="19250" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_TELETEXT_GREEN" id="19251" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="216" id="19252" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19253" addr="0x7fca46934c90" />
+                    <attribute name="value" value="216" id="19254" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19255" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19256" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19257" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19258" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19259" addr="0x7fca469160b0" >
+                <attributelist id="19260" addr="0x7fca469160b0" >
+                    <attribute name="sym_name" value="ACTION_TELETEXT_YELLOW" id="19261" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_TELETEXT_YELLOW" id="19262" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="217" id="19263" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19264" addr="0x7fca46934c90" />
+                    <attribute name="value" value="217" id="19265" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19266" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19267" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19268" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19269" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19270" addr="0x7fca46916210" >
+                <attributelist id="19271" addr="0x7fca46916210" >
+                    <attribute name="sym_name" value="ACTION_TELETEXT_BLUE" id="19272" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_TELETEXT_BLUE" id="19273" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="218" id="19274" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19275" addr="0x7fca46934c90" />
+                    <attribute name="value" value="218" id="19276" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19277" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19278" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19279" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19280" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19281" addr="0x7fca46916370" >
+                <attributelist id="19282" addr="0x7fca46916370" >
+                    <attribute name="sym_name" value="ACTION_INCREASE_PAR" id="19283" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_INCREASE_PAR" id="19284" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="219" id="19285" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19286" addr="0x7fca46934c90" />
+                    <attribute name="value" value="219" id="19287" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19288" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19289" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19290" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19291" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19292" addr="0x7fca469164d0" >
+                <attributelist id="19293" addr="0x7fca469164d0" >
+                    <attribute name="sym_name" value="ACTION_DECREASE_PAR" id="19294" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_DECREASE_PAR" id="19295" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="220" id="19296" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19297" addr="0x7fca46934c90" />
+                    <attribute name="value" value="220" id="19298" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19299" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19300" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19301" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19302" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19303" addr="0x7fca46916630" >
+                <attributelist id="19304" addr="0x7fca46916630" >
+                    <attribute name="sym_name" value="ACTION_VSHIFT_UP" id="19305" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_VSHIFT_UP" id="19306" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="227" id="19307" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19308" addr="0x7fca46934c90" />
+                    <attribute name="value" value="227" id="19309" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19310" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19311" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19312" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19313" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19314" addr="0x7fca46916790" >
+                <attributelist id="19315" addr="0x7fca46916790" >
+                    <attribute name="sym_name" value="ACTION_VSHIFT_DOWN" id="19316" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_VSHIFT_DOWN" id="19317" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="228" id="19318" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19319" addr="0x7fca46934c90" />
+                    <attribute name="value" value="228" id="19320" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19321" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19322" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19323" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19324" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19325" addr="0x7fca469168f0" >
+                <attributelist id="19326" addr="0x7fca469168f0" >
+                    <attribute name="sym_name" value="ACTION_PLAYER_PLAYPAUSE" id="19327" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_PLAYER_PLAYPAUSE" id="19328" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="229" id="19329" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19330" addr="0x7fca46934c90" />
+                    <attribute name="value" value="229" id="19331" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19332" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19333" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19334" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19335" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19336" addr="0x7fca46916a50" >
+                <attributelist id="19337" addr="0x7fca46916a50" >
+                    <attribute name="sym_name" value="ACTION_SUBTITLE_VSHIFT_UP" id="19338" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_SUBTITLE_VSHIFT_UP" id="19339" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="230" id="19340" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19341" addr="0x7fca46934c90" />
+                    <attribute name="value" value="230" id="19342" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19343" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19344" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19345" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19346" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19347" addr="0x7fca46916bb0" >
+                <attributelist id="19348" addr="0x7fca46916bb0" >
+                    <attribute name="sym_name" value="ACTION_SUBTITLE_VSHIFT_DOWN" id="19349" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_SUBTITLE_VSHIFT_DOWN" id="19350" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="231" id="19351" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19352" addr="0x7fca46934c90" />
+                    <attribute name="value" value="231" id="19353" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19354" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19355" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19356" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19357" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19358" addr="0x7fca46916d10" >
+                <attributelist id="19359" addr="0x7fca46916d10" >
+                    <attribute name="sym_name" value="ACTION_SUBTITLE_ALIGN" id="19360" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_SUBTITLE_ALIGN" id="19361" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="232" id="19362" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19363" addr="0x7fca46934c90" />
+                    <attribute name="value" value="232" id="19364" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19365" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19366" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19367" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19368" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19369" addr="0x7fca46916e70" >
+                <attributelist id="19370" addr="0x7fca46916e70" >
+                    <attribute name="sym_name" value="ACTION_FILTER" id="19371" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_FILTER" id="19372" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="233" id="19373" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19374" addr="0x7fca46934c90" />
+                    <attribute name="value" value="233" id="19375" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19376" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19377" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19378" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19379" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19380" addr="0x7fca46916fd0" >
+                <attributelist id="19381" addr="0x7fca46916fd0" >
+                    <attribute name="sym_name" value="ACTION_SWITCH_PLAYER" id="19382" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_SWITCH_PLAYER" id="19383" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="234" id="19384" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19385" addr="0x7fca46934c90" />
+                    <attribute name="value" value="234" id="19386" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19387" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19388" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19389" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19390" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19391" addr="0x7fca46917130" >
+                <attributelist id="19392" addr="0x7fca46917130" >
+                    <attribute name="sym_name" value="ACTION_STEREOMODE_NEXT" id="19393" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_STEREOMODE_NEXT" id="19394" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="235" id="19395" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19396" addr="0x7fca46934c90" />
+                    <attribute name="value" value="235" id="19397" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19398" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19399" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19400" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19401" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19402" addr="0x7fca46917290" >
+                <attributelist id="19403" addr="0x7fca46917290" >
+                    <attribute name="sym_name" value="ACTION_STEREOMODE_PREVIOUS" id="19404" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_STEREOMODE_PREVIOUS" id="19405" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="236" id="19406" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19407" addr="0x7fca46934c90" />
+                    <attribute name="value" value="236" id="19408" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19409" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19410" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19411" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19412" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19413" addr="0x7fca469173f0" >
+                <attributelist id="19414" addr="0x7fca469173f0" >
+                    <attribute name="sym_name" value="ACTION_STEREOMODE_TOGGLE" id="19415" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_STEREOMODE_TOGGLE" id="19416" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="237" id="19417" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19418" addr="0x7fca46934c90" />
+                    <attribute name="value" value="237" id="19419" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19420" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19421" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19422" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19423" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19424" addr="0x7fca46917550" >
+                <attributelist id="19425" addr="0x7fca46917550" >
+                    <attribute name="sym_name" value="ACTION_STEREOMODE_SELECT" id="19426" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_STEREOMODE_SELECT" id="19427" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="238" id="19428" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19429" addr="0x7fca46934c90" />
+                    <attribute name="value" value="238" id="19430" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19431" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19432" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19433" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19434" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19435" addr="0x7fca469176b0" >
+                <attributelist id="19436" addr="0x7fca469176b0" >
+                    <attribute name="sym_name" value="ACTION_STEREOMODE_TOMONO" id="19437" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_STEREOMODE_TOMONO" id="19438" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="239" id="19439" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19440" addr="0x7fca46934c90" />
+                    <attribute name="value" value="239" id="19441" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19442" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19443" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19444" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19445" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19446" addr="0x7fca46917810" >
+                <attributelist id="19447" addr="0x7fca46917810" >
+                    <attribute name="sym_name" value="ACTION_STEREOMODE_SET" id="19448" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_STEREOMODE_SET" id="19449" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="240" id="19450" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19451" addr="0x7fca46934c90" />
+                    <attribute name="value" value="240" id="19452" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19453" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19454" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19455" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19456" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19457" addr="0x7fca46917970" >
+                <attributelist id="19458" addr="0x7fca46917970" >
+                    <attribute name="sym_name" value="ACTION_SETTINGS_RESET" id="19459" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_SETTINGS_RESET" id="19460" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="241" id="19461" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19462" addr="0x7fca46934c90" />
+                    <attribute name="value" value="241" id="19463" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19464" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19465" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19466" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19467" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19468" addr="0x7fca46917ad0" >
+                <attributelist id="19469" addr="0x7fca46917ad0" >
+                    <attribute name="sym_name" value="ACTION_SETTINGS_LEVEL_CHANGE" id="19470" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_SETTINGS_LEVEL_CHANGE" id="19471" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="242" id="19472" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19473" addr="0x7fca46934c90" />
+                    <attribute name="value" value="242" id="19474" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19475" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19476" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19477" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19478" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19479" addr="0x7fca46917c30" >
+                <attributelist id="19480" addr="0x7fca46917c30" >
+                    <attribute name="sym_name" value="ACTION_TRIGGER_OSD" id="19481" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_TRIGGER_OSD" id="19482" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="243" id="19483" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19484" addr="0x7fca46934c90" />
+                    <attribute name="value" value="243" id="19485" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19486" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19487" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19488" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19489" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19490" addr="0x7fca46917d90" >
+                <attributelist id="19491" addr="0x7fca46917d90" >
+                    <attribute name="sym_name" value="ACTION_INPUT_TEXT" id="19492" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_INPUT_TEXT" id="19493" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="244" id="19494" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19495" addr="0x7fca46934c90" />
+                    <attribute name="value" value="244" id="19496" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19497" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19498" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19499" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19500" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19501" addr="0x7fca46917ef0" >
+                <attributelist id="19502" addr="0x7fca46917ef0" >
+                    <attribute name="sym_name" value="ACTION_VOLUME_SET" id="19503" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_VOLUME_SET" id="19504" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="245" id="19505" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19506" addr="0x7fca46934c90" />
+                    <attribute name="value" value="245" id="19507" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19508" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19509" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19510" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19511" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19512" addr="0x7fca46918050" >
+                <attributelist id="19513" addr="0x7fca46918050" >
+                    <attribute name="sym_name" value="ACTION_TOGGLE_COMMSKIP" id="19514" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_TOGGLE_COMMSKIP" id="19515" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="246" id="19516" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19517" addr="0x7fca46934c90" />
+                    <attribute name="value" value="246" id="19518" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19519" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19520" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19521" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19522" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19523" addr="0x7fca469181b0" >
+                <attributelist id="19524" addr="0x7fca469181b0" >
+                    <attribute name="sym_name" value="ACTION_PLAYER_RESET" id="19525" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_PLAYER_RESET" id="19526" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="248" id="19527" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19528" addr="0x7fca46934c90" />
+                    <attribute name="value" value="248" id="19529" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19530" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19531" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19532" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19533" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19534" addr="0x7fca46918310" >
+                <attributelist id="19535" addr="0x7fca46918310" >
+                    <attribute name="sym_name" value="ACTION_TOGGLE_FONT" id="19536" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_TOGGLE_FONT" id="19537" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="249" id="19538" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19539" addr="0x7fca46934c90" />
+                    <attribute name="value" value="249" id="19540" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19541" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19542" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19543" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19544" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19545" addr="0x7fca46918470" >
+                <attributelist id="19546" addr="0x7fca46918470" >
+                    <attribute name="sym_name" value="ACTION_VIDEO_NEXT_STREAM" id="19547" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_VIDEO_NEXT_STREAM" id="19548" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="250" id="19549" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19550" addr="0x7fca46934c90" />
+                    <attribute name="value" value="250" id="19551" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19552" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19553" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19554" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19555" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19556" addr="0x7fca469185d0" >
+                <attributelist id="19557" addr="0x7fca469185d0" >
+                    <attribute name="sym_name" value="ACTION_QUEUE_ITEM_NEXT" id="19558" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_QUEUE_ITEM_NEXT" id="19559" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="251" id="19560" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19561" addr="0x7fca46934c90" />
+                    <attribute name="value" value="251" id="19562" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19563" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19564" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19565" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19566" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19567" addr="0x7fca46918730" >
+                <attributelist id="19568" addr="0x7fca46918730" >
+                    <attribute name="sym_name" value="ACTION_VOICE_RECOGNIZE" id="19569" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_VOICE_RECOGNIZE" id="19570" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="300" id="19571" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19572" addr="0x7fca46934c90" />
+                    <attribute name="value" value="300" id="19573" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19574" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19575" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19576" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19577" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19578" addr="0x7fca46918890" >
+                <attributelist id="19579" addr="0x7fca46918890" >
+                    <attribute name="sym_name" value="ACTION_TOUCH_TAP" id="19580" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_TOUCH_TAP" id="19581" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="401" id="19582" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19583" addr="0x7fca46934c90" />
+                    <attribute name="value" value="401" id="19584" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19585" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19586" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19587" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19588" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19589" addr="0x7fca469189f0" >
+                <attributelist id="19590" addr="0x7fca469189f0" >
+                    <attribute name="sym_name" value="ACTION_TOUCH_TAP_TEN" id="19591" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_TOUCH_TAP_TEN" id="19592" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="410" id="19593" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19594" addr="0x7fca46934c90" />
+                    <attribute name="value" value="410" id="19595" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19596" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19597" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19598" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19599" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19600" addr="0x7fca46918b50" >
+                <attributelist id="19601" addr="0x7fca46918b50" >
+                    <attribute name="sym_name" value="ACTION_TOUCH_LONGPRESS" id="19602" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_TOUCH_LONGPRESS" id="19603" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="411" id="19604" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19605" addr="0x7fca46934c90" />
+                    <attribute name="value" value="411" id="19606" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19607" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19608" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19609" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19610" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19611" addr="0x7fca46918cb0" >
+                <attributelist id="19612" addr="0x7fca46918cb0" >
+                    <attribute name="sym_name" value="ACTION_TOUCH_LONGPRESS_TEN" id="19613" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_TOUCH_LONGPRESS_TEN" id="19614" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="420" id="19615" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19616" addr="0x7fca46934c90" />
+                    <attribute name="value" value="420" id="19617" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19618" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19619" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19620" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19621" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19622" addr="0x7fca46918e10" >
+                <attributelist id="19623" addr="0x7fca46918e10" >
+                    <attribute name="sym_name" value="ACTION_GESTURE_NOTIFY" id="19624" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_GESTURE_NOTIFY" id="19625" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="500" id="19626" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19627" addr="0x7fca46934c90" />
+                    <attribute name="value" value="500" id="19628" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19629" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19630" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19631" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19632" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19633" addr="0x7fca46918f70" >
+                <attributelist id="19634" addr="0x7fca46918f70" >
+                    <attribute name="sym_name" value="ACTION_GESTURE_BEGIN" id="19635" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_GESTURE_BEGIN" id="19636" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="501" id="19637" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19638" addr="0x7fca46934c90" />
+                    <attribute name="value" value="501" id="19639" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19640" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19641" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19642" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19643" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19644" addr="0x7fca469190d0" >
+                <attributelist id="19645" addr="0x7fca469190d0" >
+                    <attribute name="sym_name" value="ACTION_GESTURE_ZOOM" id="19646" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_GESTURE_ZOOM" id="19647" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="502" id="19648" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19649" addr="0x7fca46934c90" />
+                    <attribute name="value" value="502" id="19650" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19651" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19652" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19653" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19654" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19655" addr="0x7fca46919230" >
+                <attributelist id="19656" addr="0x7fca46919230" >
+                    <attribute name="sym_name" value="ACTION_GESTURE_ROTATE" id="19657" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_GESTURE_ROTATE" id="19658" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="503" id="19659" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19660" addr="0x7fca46934c90" />
+                    <attribute name="value" value="503" id="19661" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19662" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19663" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19664" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19665" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19666" addr="0x7fca46919390" >
+                <attributelist id="19667" addr="0x7fca46919390" >
+                    <attribute name="sym_name" value="ACTION_GESTURE_PAN" id="19668" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_GESTURE_PAN" id="19669" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="504" id="19670" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19671" addr="0x7fca46934c90" />
+                    <attribute name="value" value="504" id="19672" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19673" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19674" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19675" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19676" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19677" addr="0x7fca469194f0" >
+                <attributelist id="19678" addr="0x7fca469194f0" >
+                    <attribute name="sym_name" value="ACTION_GESTURE_ABORT" id="19679" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_GESTURE_ABORT" id="19680" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="505" id="19681" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19682" addr="0x7fca46934c90" />
+                    <attribute name="value" value="505" id="19683" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19684" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19685" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19686" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19687" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19688" addr="0x7fca46919650" >
+                <attributelist id="19689" addr="0x7fca46919650" >
+                    <attribute name="sym_name" value="ACTION_GESTURE_SWIPE_LEFT" id="19690" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_GESTURE_SWIPE_LEFT" id="19691" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="511" id="19692" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19693" addr="0x7fca46934c90" />
+                    <attribute name="value" value="511" id="19694" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19695" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19696" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19697" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19698" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19699" addr="0x7fca469197b0" >
+                <attributelist id="19700" addr="0x7fca469197b0" >
+                    <attribute name="sym_name" value="ACTION_GESTURE_SWIPE_LEFT_TEN" id="19701" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_GESTURE_SWIPE_LEFT_TEN" id="19702" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="520" id="19703" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19704" addr="0x7fca46934c90" />
+                    <attribute name="value" value="520" id="19705" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19706" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19707" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19708" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19709" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19710" addr="0x7fca46919910" >
+                <attributelist id="19711" addr="0x7fca46919910" >
+                    <attribute name="sym_name" value="ACTION_GESTURE_SWIPE_RIGHT" id="19712" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_GESTURE_SWIPE_RIGHT" id="19713" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="521" id="19714" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19715" addr="0x7fca46934c90" />
+                    <attribute name="value" value="521" id="19716" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19717" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19718" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19719" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19720" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19721" addr="0x7fca46919a70" >
+                <attributelist id="19722" addr="0x7fca46919a70" >
+                    <attribute name="sym_name" value="ACTION_GESTURE_SWIPE_RIGHT_TEN" id="19723" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_GESTURE_SWIPE_RIGHT_TEN" id="19724" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="530" id="19725" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19726" addr="0x7fca46934c90" />
+                    <attribute name="value" value="530" id="19727" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19728" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19729" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19730" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19731" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19732" addr="0x7fca46919bd0" >
+                <attributelist id="19733" addr="0x7fca46919bd0" >
+                    <attribute name="sym_name" value="ACTION_GESTURE_SWIPE_UP" id="19734" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_GESTURE_SWIPE_UP" id="19735" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="531" id="19736" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19737" addr="0x7fca46934c90" />
+                    <attribute name="value" value="531" id="19738" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19739" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19740" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19741" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19742" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19743" addr="0x7fca46919d30" >
+                <attributelist id="19744" addr="0x7fca46919d30" >
+                    <attribute name="sym_name" value="ACTION_GESTURE_SWIPE_UP_TEN" id="19745" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_GESTURE_SWIPE_UP_TEN" id="19746" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="540" id="19747" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19748" addr="0x7fca46934c90" />
+                    <attribute name="value" value="540" id="19749" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19750" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19751" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19752" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19753" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19754" addr="0x7fca46919e90" >
+                <attributelist id="19755" addr="0x7fca46919e90" >
+                    <attribute name="sym_name" value="ACTION_GESTURE_SWIPE_DOWN" id="19756" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_GESTURE_SWIPE_DOWN" id="19757" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="541" id="19758" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19759" addr="0x7fca46934c90" />
+                    <attribute name="value" value="541" id="19760" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19761" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19762" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19763" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19764" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19765" addr="0x7fca46919ff0" >
+                <attributelist id="19766" addr="0x7fca46919ff0" >
+                    <attribute name="sym_name" value="ACTION_GESTURE_SWIPE_DOWN_TEN" id="19767" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_GESTURE_SWIPE_DOWN_TEN" id="19768" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="550" id="19769" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19770" addr="0x7fca46934c90" />
+                    <attribute name="value" value="550" id="19771" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19772" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19773" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19774" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19775" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19776" addr="0x7fca4691a150" >
+                <attributelist id="19777" addr="0x7fca4691a150" >
+                    <attribute name="sym_name" value="ACTION_GESTURE_END" id="19778" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_GESTURE_END" id="19779" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="599" id="19780" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19781" addr="0x7fca46934c90" />
+                    <attribute name="value" value="599" id="19782" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19783" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19784" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19785" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19786" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19787" addr="0x7fca4691a2b0" >
+                <attributelist id="19788" addr="0x7fca4691a2b0" >
+                    <attribute name="sym_name" value="ACTION_ANALOG_MOVE_X_LEFT" id="19789" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_ANALOG_MOVE_X_LEFT" id="19790" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="601" id="19791" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19792" addr="0x7fca46934c90" />
+                    <attribute name="value" value="601" id="19793" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19794" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19795" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19796" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19797" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19798" addr="0x7fca4691a410" >
+                <attributelist id="19799" addr="0x7fca4691a410" >
+                    <attribute name="sym_name" value="ACTION_ANALOG_MOVE_X_RIGHT" id="19800" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_ANALOG_MOVE_X_RIGHT" id="19801" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="602" id="19802" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19803" addr="0x7fca46934c90" />
+                    <attribute name="value" value="602" id="19804" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19805" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19806" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19807" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19808" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19809" addr="0x7fca4691a570" >
+                <attributelist id="19810" addr="0x7fca4691a570" >
+                    <attribute name="sym_name" value="ACTION_ANALOG_MOVE_Y_UP" id="19811" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_ANALOG_MOVE_Y_UP" id="19812" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="603" id="19813" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19814" addr="0x7fca46934c90" />
+                    <attribute name="value" value="603" id="19815" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19816" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19817" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19818" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19819" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19820" addr="0x7fca4691a6d0" >
+                <attributelist id="19821" addr="0x7fca4691a6d0" >
+                    <attribute name="sym_name" value="ACTION_ANALOG_MOVE_Y_DOWN" id="19822" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_ANALOG_MOVE_Y_DOWN" id="19823" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="604" id="19824" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19825" addr="0x7fca46934c90" />
+                    <attribute name="value" value="604" id="19826" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19827" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19828" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19829" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19830" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19831" addr="0x7fca4691a830" >
+                <attributelist id="19832" addr="0x7fca4691a830" >
+                    <attribute name="sym_name" value="ACTION_ERROR" id="19833" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_ERROR" id="19834" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="998" id="19835" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19836" addr="0x7fca46934c90" />
+                    <attribute name="value" value="998" id="19837" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19838" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19839" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19840" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19841" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19842" addr="0x7fca4691a990" >
+                <attributelist id="19843" addr="0x7fca4691a990" >
+                    <attribute name="sym_name" value="ACTION_NOOP" id="19844" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ACTION_NOOP" id="19845" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="999" id="19846" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19847" addr="0x7fca46934c90" />
+                    <attribute name="value" value="999" id="19848" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19849" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19850" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19851" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19852" addr="0x7fca46934c90" />
                 </attributelist >
              
             </constant >
         </include >
-        <include id="19853" addr="0x7f99f1dccab0" >
-            <attributelist id="19854" addr="0x7f99f1dccab0" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/input/Key.h" id="19855" addr="0x7f99f1de6c90" />
+        <include id="19853" addr="0x7fca4691aab0" >
+            <attributelist id="19854" addr="0x7fca4691aab0" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/input/Key.h" id="19855" addr="0x7fca46934c90" />
             </attributelist >
 
-            <constant id="19856" addr="0x7f99f1dccb70" >
-                <attributelist id="19857" addr="0x7f99f1dccb70" >
-                    <attribute name="sym_name" value="KEY_BUTTON_A" id="19858" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_BUTTON_A" id="19859" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="256" id="19860" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19861" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="256" id="19862" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19863" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19864" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19865" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19866" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19867" addr="0x7f99f1dcccd0" >
-                <attributelist id="19868" addr="0x7f99f1dcccd0" >
-                    <attribute name="sym_name" value="KEY_BUTTON_B" id="19869" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_BUTTON_B" id="19870" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="257" id="19871" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19872" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="257" id="19873" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19874" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19875" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19876" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19877" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19878" addr="0x7f99f1dcce30" >
-                <attributelist id="19879" addr="0x7f99f1dcce30" >
-                    <attribute name="sym_name" value="KEY_BUTTON_X" id="19880" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_BUTTON_X" id="19881" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="258" id="19882" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19883" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="258" id="19884" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19885" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19886" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19887" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19888" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19889" addr="0x7f99f1dccf90" >
-                <attributelist id="19890" addr="0x7f99f1dccf90" >
-                    <attribute name="sym_name" value="KEY_BUTTON_Y" id="19891" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_BUTTON_Y" id="19892" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="259" id="19893" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19894" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="259" id="19895" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19896" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19897" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19898" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19899" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19900" addr="0x7f99f1dcd0f0" >
-                <attributelist id="19901" addr="0x7f99f1dcd0f0" >
-                    <attribute name="sym_name" value="KEY_BUTTON_BLACK" id="19902" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_BUTTON_BLACK" id="19903" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="260" id="19904" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19905" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="260" id="19906" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19907" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19908" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19909" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19910" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19911" addr="0x7f99f1dcd250" >
-                <attributelist id="19912" addr="0x7f99f1dcd250" >
-                    <attribute name="sym_name" value="KEY_BUTTON_WHITE" id="19913" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_BUTTON_WHITE" id="19914" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="261" id="19915" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19916" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="261" id="19917" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19918" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19919" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19920" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19921" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19922" addr="0x7f99f1dcd3b0" >
-                <attributelist id="19923" addr="0x7f99f1dcd3b0" >
-                    <attribute name="sym_name" value="KEY_BUTTON_LEFT_TRIGGER" id="19924" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_BUTTON_LEFT_TRIGGER" id="19925" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="262" id="19926" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19927" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="262" id="19928" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19929" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19930" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19931" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19932" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19933" addr="0x7f99f1dcd510" >
-                <attributelist id="19934" addr="0x7f99f1dcd510" >
-                    <attribute name="sym_name" value="KEY_BUTTON_RIGHT_TRIGGER" id="19935" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_BUTTON_RIGHT_TRIGGER" id="19936" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="263" id="19937" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19938" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="263" id="19939" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19940" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19941" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19942" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19943" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19944" addr="0x7f99f1dcd670" >
-                <attributelist id="19945" addr="0x7f99f1dcd670" >
-                    <attribute name="sym_name" value="KEY_BUTTON_LEFT_THUMB_STICK" id="19946" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_BUTTON_LEFT_THUMB_STICK" id="19947" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="264" id="19948" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19949" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="264" id="19950" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19951" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19952" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19953" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19954" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19955" addr="0x7f99f1dcd7d0" >
-                <attributelist id="19956" addr="0x7f99f1dcd7d0" >
-                    <attribute name="sym_name" value="KEY_BUTTON_RIGHT_THUMB_STICK" id="19957" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_BUTTON_RIGHT_THUMB_STICK" id="19958" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="265" id="19959" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19960" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="265" id="19961" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19962" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19963" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19964" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19965" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19966" addr="0x7f99f1dcd930" >
-                <attributelist id="19967" addr="0x7f99f1dcd930" >
-                    <attribute name="sym_name" value="KEY_BUTTON_RIGHT_THUMB_STICK_UP" id="19968" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_BUTTON_RIGHT_THUMB_STICK_UP" id="19969" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="266" id="19970" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19971" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="266" id="19972" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19973" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19974" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19975" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19976" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19977" addr="0x7f99f1dcda90" >
-                <attributelist id="19978" addr="0x7f99f1dcda90" >
-                    <attribute name="sym_name" value="KEY_BUTTON_RIGHT_THUMB_STICK_DOWN" id="19979" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_BUTTON_RIGHT_THUMB_STICK_DOWN" id="19980" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="267" id="19981" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19982" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="267" id="19983" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19984" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19985" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19986" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19987" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19988" addr="0x7f99f1dcdbf0" >
-                <attributelist id="19989" addr="0x7f99f1dcdbf0" >
-                    <attribute name="sym_name" value="KEY_BUTTON_RIGHT_THUMB_STICK_LEFT" id="19990" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_BUTTON_RIGHT_THUMB_STICK_LEFT" id="19991" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="268" id="19992" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="19993" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="268" id="19994" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="19995" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="19996" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="19997" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="19998" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="19999" addr="0x7f99f1dcdd50" >
-                <attributelist id="20000" addr="0x7f99f1dcdd50" >
-                    <attribute name="sym_name" value="KEY_BUTTON_RIGHT_THUMB_STICK_RIGHT" id="20001" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_BUTTON_RIGHT_THUMB_STICK_RIGHT" id="20002" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="269" id="20003" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20004" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="269" id="20005" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20006" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20007" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20008" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20009" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20010" addr="0x7f99f1dcdeb0" >
-                <attributelist id="20011" addr="0x7f99f1dcdeb0" >
-                    <attribute name="sym_name" value="KEY_BUTTON_DPAD_UP" id="20012" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_BUTTON_DPAD_UP" id="20013" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="270" id="20014" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20015" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="270" id="20016" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20017" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20018" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20019" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20020" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20021" addr="0x7f99f1dce010" >
-                <attributelist id="20022" addr="0x7f99f1dce010" >
-                    <attribute name="sym_name" value="KEY_BUTTON_DPAD_DOWN" id="20023" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_BUTTON_DPAD_DOWN" id="20024" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="271" id="20025" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20026" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="271" id="20027" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20028" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20029" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20030" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20031" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20032" addr="0x7f99f1dce170" >
-                <attributelist id="20033" addr="0x7f99f1dce170" >
-                    <attribute name="sym_name" value="KEY_BUTTON_DPAD_LEFT" id="20034" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_BUTTON_DPAD_LEFT" id="20035" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="272" id="20036" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20037" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="272" id="20038" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20039" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20040" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20041" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20042" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20043" addr="0x7f99f1dce2d0" >
-                <attributelist id="20044" addr="0x7f99f1dce2d0" >
-                    <attribute name="sym_name" value="KEY_BUTTON_DPAD_RIGHT" id="20045" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_BUTTON_DPAD_RIGHT" id="20046" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="273" id="20047" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20048" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="273" id="20049" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20050" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20051" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20052" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20053" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20054" addr="0x7f99f1dce430" >
-                <attributelist id="20055" addr="0x7f99f1dce430" >
-                    <attribute name="sym_name" value="KEY_BUTTON_START" id="20056" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_BUTTON_START" id="20057" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="274" id="20058" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20059" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="274" id="20060" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20061" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20062" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20063" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20064" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20065" addr="0x7f99f1dce590" >
-                <attributelist id="20066" addr="0x7f99f1dce590" >
-                    <attribute name="sym_name" value="KEY_BUTTON_BACK" id="20067" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_BUTTON_BACK" id="20068" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="275" id="20069" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20070" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="275" id="20071" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20072" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20073" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20074" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20075" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20076" addr="0x7f99f1dce6f0" >
-                <attributelist id="20077" addr="0x7f99f1dce6f0" >
-                    <attribute name="sym_name" value="KEY_BUTTON_LEFT_THUMB_BUTTON" id="20078" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_BUTTON_LEFT_THUMB_BUTTON" id="20079" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="276" id="20080" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20081" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="276" id="20082" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20083" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20084" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20085" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20086" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20087" addr="0x7f99f1dce850" >
-                <attributelist id="20088" addr="0x7f99f1dce850" >
-                    <attribute name="sym_name" value="KEY_BUTTON_RIGHT_THUMB_BUTTON" id="20089" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_BUTTON_RIGHT_THUMB_BUTTON" id="20090" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="277" id="20091" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20092" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="277" id="20093" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20094" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20095" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20096" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20097" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20098" addr="0x7f99f1dce9b0" >
-                <attributelist id="20099" addr="0x7f99f1dce9b0" >
-                    <attribute name="sym_name" value="KEY_BUTTON_LEFT_ANALOG_TRIGGER" id="20100" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_BUTTON_LEFT_ANALOG_TRIGGER" id="20101" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="278" id="20102" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20103" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="278" id="20104" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20105" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20106" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20107" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20108" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20109" addr="0x7f99f1dceb10" >
-                <attributelist id="20110" addr="0x7f99f1dceb10" >
-                    <attribute name="sym_name" value="KEY_BUTTON_RIGHT_ANALOG_TRIGGER" id="20111" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_BUTTON_RIGHT_ANALOG_TRIGGER" id="20112" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="279" id="20113" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20114" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="279" id="20115" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20116" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20117" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20118" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20119" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20120" addr="0x7f99f1dcec70" >
-                <attributelist id="20121" addr="0x7f99f1dcec70" >
-                    <attribute name="sym_name" value="KEY_BUTTON_LEFT_THUMB_STICK_UP" id="20122" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_BUTTON_LEFT_THUMB_STICK_UP" id="20123" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="280" id="20124" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20125" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="280" id="20126" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20127" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20128" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20129" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20130" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20131" addr="0x7f99f1dcedd0" >
-                <attributelist id="20132" addr="0x7f99f1dcedd0" >
-                    <attribute name="sym_name" value="KEY_BUTTON_LEFT_THUMB_STICK_DOWN" id="20133" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_BUTTON_LEFT_THUMB_STICK_DOWN" id="20134" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="281" id="20135" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20136" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="281" id="20137" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20138" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20139" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20140" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20141" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20142" addr="0x7f99f1dcef30" >
-                <attributelist id="20143" addr="0x7f99f1dcef30" >
-                    <attribute name="sym_name" value="KEY_BUTTON_LEFT_THUMB_STICK_LEFT" id="20144" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_BUTTON_LEFT_THUMB_STICK_LEFT" id="20145" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="282" id="20146" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20147" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="282" id="20148" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20149" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20150" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20151" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20152" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20153" addr="0x7f99f1dcf090" >
-                <attributelist id="20154" addr="0x7f99f1dcf090" >
-                    <attribute name="sym_name" value="KEY_BUTTON_LEFT_THUMB_STICK_RIGHT" id="20155" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_BUTTON_LEFT_THUMB_STICK_RIGHT" id="20156" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="283" id="20157" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20158" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="283" id="20159" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20160" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20161" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20162" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20163" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20164" addr="0x7f99f1dcf1f0" >
-                <attributelist id="20165" addr="0x7f99f1dcf1f0" >
-                    <attribute name="sym_name" value="KEY_VKEY" id="20166" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_VKEY" id="20167" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="0xF000" id="20168" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20169" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="0xF000" id="20170" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20171" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20172" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20173" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20174" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20175" addr="0x7f99f1dcf350" >
-                <attributelist id="20176" addr="0x7f99f1dcf350" >
-                    <attribute name="sym_name" value="KEY_ASCII" id="20177" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_ASCII" id="20178" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="0xF100" id="20179" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20180" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="0xF100" id="20181" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20182" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20183" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20184" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20185" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20186" addr="0x7f99f1dcf4b0" >
-                <attributelist id="20187" addr="0x7f99f1dcf4b0" >
-                    <attribute name="sym_name" value="KEY_UNICODE" id="20188" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_UNICODE" id="20189" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="0xF200" id="20190" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20191" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="0xF200" id="20192" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20193" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20194" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20195" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20196" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20197" addr="0x7f99f1dcf610" >
-                <attributelist id="20198" addr="0x7f99f1dcf610" >
-                    <attribute name="sym_name" value="KEY_VMOUSE" id="20199" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_VMOUSE" id="20200" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="0xEFFF" id="20201" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20202" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="0xEFFF" id="20203" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20204" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20205" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20206" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20207" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20208" addr="0x7f99f1dcf770" >
-                <attributelist id="20209" addr="0x7f99f1dcf770" >
-                    <attribute name="sym_name" value="KEY_MOUSE_START" id="20210" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_MOUSE_START" id="20211" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="0xE000" id="20212" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20213" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="0xE000" id="20214" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20215" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20216" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20217" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20218" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20219" addr="0x7f99f1dcf8d0" >
-                <attributelist id="20220" addr="0x7f99f1dcf8d0" >
-                    <attribute name="sym_name" value="KEY_MOUSE_CLICK" id="20221" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_MOUSE_CLICK" id="20222" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="0xE000" id="20223" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20224" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="0xE000" id="20225" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20226" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20227" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20228" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20229" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20230" addr="0x7f99f1dcfa30" >
-                <attributelist id="20231" addr="0x7f99f1dcfa30" >
-                    <attribute name="sym_name" value="KEY_MOUSE_RIGHTCLICK" id="20232" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_MOUSE_RIGHTCLICK" id="20233" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="0xE001" id="20234" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20235" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="0xE001" id="20236" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20237" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20238" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20239" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20240" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20241" addr="0x7f99f1dcfb90" >
-                <attributelist id="20242" addr="0x7f99f1dcfb90" >
-                    <attribute name="sym_name" value="KEY_MOUSE_MIDDLECLICK" id="20243" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_MOUSE_MIDDLECLICK" id="20244" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="0xE002" id="20245" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20246" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="0xE002" id="20247" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20248" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20249" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20250" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20251" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20252" addr="0x7f99f1dcfcf0" >
-                <attributelist id="20253" addr="0x7f99f1dcfcf0" >
-                    <attribute name="sym_name" value="KEY_MOUSE_DOUBLE_CLICK" id="20254" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_MOUSE_DOUBLE_CLICK" id="20255" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="0xE010" id="20256" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20257" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="0xE010" id="20258" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20259" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20260" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20261" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20262" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20263" addr="0x7f99f1dcfe50" >
-                <attributelist id="20264" addr="0x7f99f1dcfe50" >
-                    <attribute name="sym_name" value="KEY_MOUSE_LONG_CLICK" id="20265" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_MOUSE_LONG_CLICK" id="20266" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="0xE020" id="20267" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20268" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="0xE020" id="20269" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20270" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20271" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20272" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20273" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20274" addr="0x7f99f1dcffb0" >
-                <attributelist id="20275" addr="0x7f99f1dcffb0" >
-                    <attribute name="sym_name" value="KEY_MOUSE_WHEEL_UP" id="20276" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_MOUSE_WHEEL_UP" id="20277" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="0xE101" id="20278" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20279" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="0xE101" id="20280" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20281" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20282" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20283" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20284" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20285" addr="0x7f99f1dd0110" >
-                <attributelist id="20286" addr="0x7f99f1dd0110" >
-                    <attribute name="sym_name" value="KEY_MOUSE_WHEEL_DOWN" id="20287" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_MOUSE_WHEEL_DOWN" id="20288" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="0xE102" id="20289" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20290" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="0xE102" id="20291" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20292" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20293" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20294" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20295" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20296" addr="0x7f99f1dd0270" >
-                <attributelist id="20297" addr="0x7f99f1dd0270" >
-                    <attribute name="sym_name" value="KEY_MOUSE_MOVE" id="20298" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_MOUSE_MOVE" id="20299" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="0xE103" id="20300" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20301" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="0xE103" id="20302" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20303" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20304" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20305" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20306" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20307" addr="0x7f99f1dd03d0" >
-                <attributelist id="20308" addr="0x7f99f1dd03d0" >
-                    <attribute name="sym_name" value="KEY_MOUSE_DRAG" id="20309" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_MOUSE_DRAG" id="20310" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="0xE104" id="20311" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20312" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="0xE104" id="20313" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20314" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20315" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20316" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20317" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20318" addr="0x7f99f1dd0530" >
-                <attributelist id="20319" addr="0x7f99f1dd0530" >
-                    <attribute name="sym_name" value="KEY_MOUSE_DRAG_START" id="20320" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_MOUSE_DRAG_START" id="20321" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="0xE105" id="20322" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20323" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="0xE105" id="20324" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20325" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20326" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20327" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20328" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20329" addr="0x7f99f1dd0690" >
-                <attributelist id="20330" addr="0x7f99f1dd0690" >
-                    <attribute name="sym_name" value="KEY_MOUSE_DRAG_END" id="20331" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_MOUSE_DRAG_END" id="20332" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="0xE106" id="20333" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20334" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="0xE106" id="20335" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20336" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20337" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20338" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20339" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20340" addr="0x7f99f1dd07f0" >
-                <attributelist id="20341" addr="0x7f99f1dd07f0" >
-                    <attribute name="sym_name" value="KEY_MOUSE_RDRAG" id="20342" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_MOUSE_RDRAG" id="20343" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="0xE107" id="20344" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20345" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="0xE107" id="20346" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20347" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20348" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20349" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20350" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20351" addr="0x7f99f1dd0950" >
-                <attributelist id="20352" addr="0x7f99f1dd0950" >
-                    <attribute name="sym_name" value="KEY_MOUSE_RDRAG_START" id="20353" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_MOUSE_RDRAG_START" id="20354" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="0xE108" id="20355" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20356" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="0xE108" id="20357" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20358" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20359" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20360" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20361" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20362" addr="0x7f99f1dd0ab0" >
-                <attributelist id="20363" addr="0x7f99f1dd0ab0" >
-                    <attribute name="sym_name" value="KEY_MOUSE_RDRAG_END" id="20364" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_MOUSE_RDRAG_END" id="20365" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="0xE109" id="20366" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20367" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="0xE109" id="20368" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20369" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20370" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20371" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20372" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20373" addr="0x7f99f1dd0c10" >
-                <attributelist id="20374" addr="0x7f99f1dd0c10" >
-                    <attribute name="sym_name" value="KEY_MOUSE_NOOP" id="20375" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_MOUSE_NOOP" id="20376" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="0xEFFF" id="20377" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20378" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="0xEFFF" id="20379" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20380" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20381" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20382" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20383" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20384" addr="0x7f99f1dd0d70" >
-                <attributelist id="20385" addr="0x7f99f1dd0d70" >
-                    <attribute name="sym_name" value="KEY_MOUSE_END" id="20386" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_MOUSE_END" id="20387" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="0xEFFF" id="20388" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20389" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="0xEFFF" id="20390" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20391" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20392" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20393" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20394" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20395" addr="0x7f99f1dd0ed0" >
-                <attributelist id="20396" addr="0x7f99f1dd0ed0" >
-                    <attribute name="sym_name" value="KEY_APPCOMMAND" id="20397" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_APPCOMMAND" id="20398" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="0xD000" id="20399" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20400" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="0xD000" id="20401" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20402" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20403" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20404" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20405" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20406" addr="0x7f99f1dd1030" >
-                <attributelist id="20407" addr="0x7f99f1dd1030" >
-                    <attribute name="sym_name" value="KEY_INVALID" id="20408" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="KEY_INVALID" id="20409" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="0xFFFF" id="20410" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20411" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="0xFFFF" id="20412" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20413" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20414" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20415" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20416" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20417" addr="0x7f99f1dd1190" >
-                <attributelist id="20418" addr="0x7f99f1dd1190" >
-                    <attribute name="sym_name" value="ICON_TYPE_NONE" id="20419" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ICON_TYPE_NONE" id="20420" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="101" id="20421" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20422" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="101" id="20423" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20424" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20425" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20426" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20427" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20428" addr="0x7f99f1dd12f0" >
-                <attributelist id="20429" addr="0x7f99f1dd12f0" >
-                    <attribute name="sym_name" value="ICON_TYPE_PROGRAMS" id="20430" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ICON_TYPE_PROGRAMS" id="20431" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="102" id="20432" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20433" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="102" id="20434" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20435" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20436" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20437" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20438" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20439" addr="0x7f99f1dd1450" >
-                <attributelist id="20440" addr="0x7f99f1dd1450" >
-                    <attribute name="sym_name" value="ICON_TYPE_MUSIC" id="20441" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ICON_TYPE_MUSIC" id="20442" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="103" id="20443" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20444" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="103" id="20445" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20446" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20447" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20448" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20449" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20450" addr="0x7f99f1dd15b0" >
-                <attributelist id="20451" addr="0x7f99f1dd15b0" >
-                    <attribute name="sym_name" value="ICON_TYPE_PICTURES" id="20452" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ICON_TYPE_PICTURES" id="20453" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="104" id="20454" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20455" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="104" id="20456" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20457" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20458" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20459" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20460" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20461" addr="0x7f99f1dd1710" >
-                <attributelist id="20462" addr="0x7f99f1dd1710" >
-                    <attribute name="sym_name" value="ICON_TYPE_VIDEOS" id="20463" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ICON_TYPE_VIDEOS" id="20464" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="105" id="20465" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20466" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="105" id="20467" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20468" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20469" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20470" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20471" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20472" addr="0x7f99f1dd1870" >
-                <attributelist id="20473" addr="0x7f99f1dd1870" >
-                    <attribute name="sym_name" value="ICON_TYPE_FILES" id="20474" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ICON_TYPE_FILES" id="20475" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="106" id="20476" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20477" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="106" id="20478" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20479" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20480" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20481" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20482" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20483" addr="0x7f99f1dd19d0" >
-                <attributelist id="20484" addr="0x7f99f1dd19d0" >
-                    <attribute name="sym_name" value="ICON_TYPE_WEATHER" id="20485" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ICON_TYPE_WEATHER" id="20486" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="107" id="20487" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20488" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="107" id="20489" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20490" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20491" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20492" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20493" addr="0x7f99f1de6c90" />
-                </attributelist >
-             
-            </constant >
-            <constant id="20494" addr="0x7f99f1dd1b30" >
-                <attributelist id="20495" addr="0x7f99f1dd1b30" >
-                    <attribute name="sym_name" value="ICON_TYPE_SETTINGS" id="20496" addr="0x7f99f1de6c90" />
-                    <attribute name="name" value="ICON_TYPE_SETTINGS" id="20497" addr="0x7f99f1de6c90" />
-                    <attribute name="rawval" value="109" id="20498" addr="0x7f99f1de6c90" />
-                    <attribute name="feature_immutable" value="1" id="20499" addr="0x7f99f1de6c90" />
-                    <attribute name="value" value="109" id="20500" addr="0x7f99f1de6c90" />
-                    <attribute name="storage" value="%constant" id="20501" addr="0x7f99f1de6c90" />
-                    <attribute name="type" value="int" id="20502" addr="0x7f99f1de6c90" />
-                    <attribute name="sym_symtab" value="0x7f99f1e1d950" id="20503" addr="0x7f99f1e1d950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="20504" addr="0x7f99f1de6c90" />
+            <constant id="19856" addr="0x7fca4691ab70" >
+                <attributelist id="19857" addr="0x7fca4691ab70" >
+                    <attribute name="sym_name" value="KEY_BUTTON_A" id="19858" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_BUTTON_A" id="19859" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="256" id="19860" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19861" addr="0x7fca46934c90" />
+                    <attribute name="value" value="256" id="19862" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19863" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19864" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19865" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19866" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19867" addr="0x7fca4691acd0" >
+                <attributelist id="19868" addr="0x7fca4691acd0" >
+                    <attribute name="sym_name" value="KEY_BUTTON_B" id="19869" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_BUTTON_B" id="19870" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="257" id="19871" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19872" addr="0x7fca46934c90" />
+                    <attribute name="value" value="257" id="19873" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19874" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19875" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19876" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19877" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19878" addr="0x7fca4691ae30" >
+                <attributelist id="19879" addr="0x7fca4691ae30" >
+                    <attribute name="sym_name" value="KEY_BUTTON_X" id="19880" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_BUTTON_X" id="19881" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="258" id="19882" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19883" addr="0x7fca46934c90" />
+                    <attribute name="value" value="258" id="19884" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19885" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19886" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19887" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19888" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19889" addr="0x7fca4691af90" >
+                <attributelist id="19890" addr="0x7fca4691af90" >
+                    <attribute name="sym_name" value="KEY_BUTTON_Y" id="19891" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_BUTTON_Y" id="19892" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="259" id="19893" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19894" addr="0x7fca46934c90" />
+                    <attribute name="value" value="259" id="19895" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19896" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19897" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19898" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19899" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19900" addr="0x7fca4691b0f0" >
+                <attributelist id="19901" addr="0x7fca4691b0f0" >
+                    <attribute name="sym_name" value="KEY_BUTTON_BLACK" id="19902" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_BUTTON_BLACK" id="19903" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="260" id="19904" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19905" addr="0x7fca46934c90" />
+                    <attribute name="value" value="260" id="19906" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19907" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19908" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19909" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19910" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19911" addr="0x7fca4691b250" >
+                <attributelist id="19912" addr="0x7fca4691b250" >
+                    <attribute name="sym_name" value="KEY_BUTTON_WHITE" id="19913" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_BUTTON_WHITE" id="19914" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="261" id="19915" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19916" addr="0x7fca46934c90" />
+                    <attribute name="value" value="261" id="19917" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19918" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19919" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19920" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19921" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19922" addr="0x7fca4691b3b0" >
+                <attributelist id="19923" addr="0x7fca4691b3b0" >
+                    <attribute name="sym_name" value="KEY_BUTTON_LEFT_TRIGGER" id="19924" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_BUTTON_LEFT_TRIGGER" id="19925" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="262" id="19926" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19927" addr="0x7fca46934c90" />
+                    <attribute name="value" value="262" id="19928" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19929" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19930" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19931" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19932" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19933" addr="0x7fca4691b510" >
+                <attributelist id="19934" addr="0x7fca4691b510" >
+                    <attribute name="sym_name" value="KEY_BUTTON_RIGHT_TRIGGER" id="19935" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_BUTTON_RIGHT_TRIGGER" id="19936" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="263" id="19937" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19938" addr="0x7fca46934c90" />
+                    <attribute name="value" value="263" id="19939" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19940" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19941" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19942" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19943" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19944" addr="0x7fca4691b670" >
+                <attributelist id="19945" addr="0x7fca4691b670" >
+                    <attribute name="sym_name" value="KEY_BUTTON_LEFT_THUMB_STICK" id="19946" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_BUTTON_LEFT_THUMB_STICK" id="19947" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="264" id="19948" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19949" addr="0x7fca46934c90" />
+                    <attribute name="value" value="264" id="19950" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19951" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19952" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19953" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19954" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19955" addr="0x7fca4691b7d0" >
+                <attributelist id="19956" addr="0x7fca4691b7d0" >
+                    <attribute name="sym_name" value="KEY_BUTTON_RIGHT_THUMB_STICK" id="19957" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_BUTTON_RIGHT_THUMB_STICK" id="19958" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="265" id="19959" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19960" addr="0x7fca46934c90" />
+                    <attribute name="value" value="265" id="19961" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19962" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19963" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19964" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19965" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19966" addr="0x7fca4691b930" >
+                <attributelist id="19967" addr="0x7fca4691b930" >
+                    <attribute name="sym_name" value="KEY_BUTTON_RIGHT_THUMB_STICK_UP" id="19968" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_BUTTON_RIGHT_THUMB_STICK_UP" id="19969" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="266" id="19970" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19971" addr="0x7fca46934c90" />
+                    <attribute name="value" value="266" id="19972" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19973" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19974" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19975" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19976" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19977" addr="0x7fca4691ba90" >
+                <attributelist id="19978" addr="0x7fca4691ba90" >
+                    <attribute name="sym_name" value="KEY_BUTTON_RIGHT_THUMB_STICK_DOWN" id="19979" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_BUTTON_RIGHT_THUMB_STICK_DOWN" id="19980" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="267" id="19981" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19982" addr="0x7fca46934c90" />
+                    <attribute name="value" value="267" id="19983" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19984" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19985" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19986" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19987" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19988" addr="0x7fca4691bbf0" >
+                <attributelist id="19989" addr="0x7fca4691bbf0" >
+                    <attribute name="sym_name" value="KEY_BUTTON_RIGHT_THUMB_STICK_LEFT" id="19990" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_BUTTON_RIGHT_THUMB_STICK_LEFT" id="19991" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="268" id="19992" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="19993" addr="0x7fca46934c90" />
+                    <attribute name="value" value="268" id="19994" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="19995" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="19996" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="19997" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="19998" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="19999" addr="0x7fca4691bd50" >
+                <attributelist id="20000" addr="0x7fca4691bd50" >
+                    <attribute name="sym_name" value="KEY_BUTTON_RIGHT_THUMB_STICK_RIGHT" id="20001" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_BUTTON_RIGHT_THUMB_STICK_RIGHT" id="20002" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="269" id="20003" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20004" addr="0x7fca46934c90" />
+                    <attribute name="value" value="269" id="20005" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20006" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20007" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20008" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20009" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20010" addr="0x7fca4691beb0" >
+                <attributelist id="20011" addr="0x7fca4691beb0" >
+                    <attribute name="sym_name" value="KEY_BUTTON_DPAD_UP" id="20012" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_BUTTON_DPAD_UP" id="20013" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="270" id="20014" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20015" addr="0x7fca46934c90" />
+                    <attribute name="value" value="270" id="20016" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20017" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20018" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20019" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20020" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20021" addr="0x7fca4691c010" >
+                <attributelist id="20022" addr="0x7fca4691c010" >
+                    <attribute name="sym_name" value="KEY_BUTTON_DPAD_DOWN" id="20023" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_BUTTON_DPAD_DOWN" id="20024" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="271" id="20025" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20026" addr="0x7fca46934c90" />
+                    <attribute name="value" value="271" id="20027" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20028" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20029" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20030" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20031" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20032" addr="0x7fca4691c170" >
+                <attributelist id="20033" addr="0x7fca4691c170" >
+                    <attribute name="sym_name" value="KEY_BUTTON_DPAD_LEFT" id="20034" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_BUTTON_DPAD_LEFT" id="20035" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="272" id="20036" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20037" addr="0x7fca46934c90" />
+                    <attribute name="value" value="272" id="20038" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20039" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20040" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20041" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20042" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20043" addr="0x7fca4691c2d0" >
+                <attributelist id="20044" addr="0x7fca4691c2d0" >
+                    <attribute name="sym_name" value="KEY_BUTTON_DPAD_RIGHT" id="20045" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_BUTTON_DPAD_RIGHT" id="20046" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="273" id="20047" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20048" addr="0x7fca46934c90" />
+                    <attribute name="value" value="273" id="20049" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20050" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20051" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20052" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20053" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20054" addr="0x7fca4691c430" >
+                <attributelist id="20055" addr="0x7fca4691c430" >
+                    <attribute name="sym_name" value="KEY_BUTTON_START" id="20056" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_BUTTON_START" id="20057" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="274" id="20058" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20059" addr="0x7fca46934c90" />
+                    <attribute name="value" value="274" id="20060" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20061" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20062" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20063" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20064" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20065" addr="0x7fca4691c590" >
+                <attributelist id="20066" addr="0x7fca4691c590" >
+                    <attribute name="sym_name" value="KEY_BUTTON_BACK" id="20067" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_BUTTON_BACK" id="20068" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="275" id="20069" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20070" addr="0x7fca46934c90" />
+                    <attribute name="value" value="275" id="20071" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20072" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20073" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20074" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20075" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20076" addr="0x7fca4691c6f0" >
+                <attributelist id="20077" addr="0x7fca4691c6f0" >
+                    <attribute name="sym_name" value="KEY_BUTTON_LEFT_THUMB_BUTTON" id="20078" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_BUTTON_LEFT_THUMB_BUTTON" id="20079" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="276" id="20080" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20081" addr="0x7fca46934c90" />
+                    <attribute name="value" value="276" id="20082" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20083" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20084" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20085" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20086" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20087" addr="0x7fca4691c850" >
+                <attributelist id="20088" addr="0x7fca4691c850" >
+                    <attribute name="sym_name" value="KEY_BUTTON_RIGHT_THUMB_BUTTON" id="20089" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_BUTTON_RIGHT_THUMB_BUTTON" id="20090" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="277" id="20091" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20092" addr="0x7fca46934c90" />
+                    <attribute name="value" value="277" id="20093" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20094" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20095" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20096" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20097" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20098" addr="0x7fca4691c9b0" >
+                <attributelist id="20099" addr="0x7fca4691c9b0" >
+                    <attribute name="sym_name" value="KEY_BUTTON_LEFT_ANALOG_TRIGGER" id="20100" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_BUTTON_LEFT_ANALOG_TRIGGER" id="20101" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="278" id="20102" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20103" addr="0x7fca46934c90" />
+                    <attribute name="value" value="278" id="20104" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20105" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20106" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20107" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20108" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20109" addr="0x7fca4691cb10" >
+                <attributelist id="20110" addr="0x7fca4691cb10" >
+                    <attribute name="sym_name" value="KEY_BUTTON_RIGHT_ANALOG_TRIGGER" id="20111" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_BUTTON_RIGHT_ANALOG_TRIGGER" id="20112" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="279" id="20113" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20114" addr="0x7fca46934c90" />
+                    <attribute name="value" value="279" id="20115" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20116" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20117" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20118" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20119" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20120" addr="0x7fca4691cc70" >
+                <attributelist id="20121" addr="0x7fca4691cc70" >
+                    <attribute name="sym_name" value="KEY_BUTTON_LEFT_THUMB_STICK_UP" id="20122" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_BUTTON_LEFT_THUMB_STICK_UP" id="20123" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="280" id="20124" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20125" addr="0x7fca46934c90" />
+                    <attribute name="value" value="280" id="20126" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20127" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20128" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20129" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20130" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20131" addr="0x7fca4691cdd0" >
+                <attributelist id="20132" addr="0x7fca4691cdd0" >
+                    <attribute name="sym_name" value="KEY_BUTTON_LEFT_THUMB_STICK_DOWN" id="20133" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_BUTTON_LEFT_THUMB_STICK_DOWN" id="20134" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="281" id="20135" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20136" addr="0x7fca46934c90" />
+                    <attribute name="value" value="281" id="20137" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20138" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20139" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20140" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20141" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20142" addr="0x7fca4691cf30" >
+                <attributelist id="20143" addr="0x7fca4691cf30" >
+                    <attribute name="sym_name" value="KEY_BUTTON_LEFT_THUMB_STICK_LEFT" id="20144" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_BUTTON_LEFT_THUMB_STICK_LEFT" id="20145" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="282" id="20146" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20147" addr="0x7fca46934c90" />
+                    <attribute name="value" value="282" id="20148" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20149" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20150" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20151" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20152" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20153" addr="0x7fca4691d090" >
+                <attributelist id="20154" addr="0x7fca4691d090" >
+                    <attribute name="sym_name" value="KEY_BUTTON_LEFT_THUMB_STICK_RIGHT" id="20155" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_BUTTON_LEFT_THUMB_STICK_RIGHT" id="20156" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="283" id="20157" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20158" addr="0x7fca46934c90" />
+                    <attribute name="value" value="283" id="20159" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20160" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20161" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20162" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20163" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20164" addr="0x7fca4691d1f0" >
+                <attributelist id="20165" addr="0x7fca4691d1f0" >
+                    <attribute name="sym_name" value="KEY_VKEY" id="20166" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_VKEY" id="20167" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="0xF000" id="20168" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20169" addr="0x7fca46934c90" />
+                    <attribute name="value" value="0xF000" id="20170" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20171" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20172" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20173" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20174" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20175" addr="0x7fca4691d350" >
+                <attributelist id="20176" addr="0x7fca4691d350" >
+                    <attribute name="sym_name" value="KEY_ASCII" id="20177" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_ASCII" id="20178" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="0xF100" id="20179" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20180" addr="0x7fca46934c90" />
+                    <attribute name="value" value="0xF100" id="20181" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20182" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20183" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20184" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20185" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20186" addr="0x7fca4691d4b0" >
+                <attributelist id="20187" addr="0x7fca4691d4b0" >
+                    <attribute name="sym_name" value="KEY_UNICODE" id="20188" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_UNICODE" id="20189" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="0xF200" id="20190" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20191" addr="0x7fca46934c90" />
+                    <attribute name="value" value="0xF200" id="20192" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20193" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20194" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20195" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20196" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20197" addr="0x7fca4691d610" >
+                <attributelist id="20198" addr="0x7fca4691d610" >
+                    <attribute name="sym_name" value="KEY_VMOUSE" id="20199" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_VMOUSE" id="20200" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="0xEFFF" id="20201" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20202" addr="0x7fca46934c90" />
+                    <attribute name="value" value="0xEFFF" id="20203" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20204" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20205" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20206" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20207" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20208" addr="0x7fca4691d770" >
+                <attributelist id="20209" addr="0x7fca4691d770" >
+                    <attribute name="sym_name" value="KEY_MOUSE_START" id="20210" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_MOUSE_START" id="20211" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="0xE000" id="20212" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20213" addr="0x7fca46934c90" />
+                    <attribute name="value" value="0xE000" id="20214" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20215" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20216" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20217" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20218" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20219" addr="0x7fca4691d8d0" >
+                <attributelist id="20220" addr="0x7fca4691d8d0" >
+                    <attribute name="sym_name" value="KEY_MOUSE_CLICK" id="20221" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_MOUSE_CLICK" id="20222" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="0xE000" id="20223" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20224" addr="0x7fca46934c90" />
+                    <attribute name="value" value="0xE000" id="20225" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20226" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20227" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20228" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20229" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20230" addr="0x7fca4691da30" >
+                <attributelist id="20231" addr="0x7fca4691da30" >
+                    <attribute name="sym_name" value="KEY_MOUSE_RIGHTCLICK" id="20232" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_MOUSE_RIGHTCLICK" id="20233" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="0xE001" id="20234" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20235" addr="0x7fca46934c90" />
+                    <attribute name="value" value="0xE001" id="20236" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20237" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20238" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20239" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20240" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20241" addr="0x7fca4691db90" >
+                <attributelist id="20242" addr="0x7fca4691db90" >
+                    <attribute name="sym_name" value="KEY_MOUSE_MIDDLECLICK" id="20243" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_MOUSE_MIDDLECLICK" id="20244" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="0xE002" id="20245" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20246" addr="0x7fca46934c90" />
+                    <attribute name="value" value="0xE002" id="20247" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20248" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20249" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20250" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20251" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20252" addr="0x7fca4691dcf0" >
+                <attributelist id="20253" addr="0x7fca4691dcf0" >
+                    <attribute name="sym_name" value="KEY_MOUSE_DOUBLE_CLICK" id="20254" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_MOUSE_DOUBLE_CLICK" id="20255" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="0xE010" id="20256" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20257" addr="0x7fca46934c90" />
+                    <attribute name="value" value="0xE010" id="20258" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20259" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20260" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20261" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20262" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20263" addr="0x7fca4691de50" >
+                <attributelist id="20264" addr="0x7fca4691de50" >
+                    <attribute name="sym_name" value="KEY_MOUSE_LONG_CLICK" id="20265" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_MOUSE_LONG_CLICK" id="20266" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="0xE020" id="20267" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20268" addr="0x7fca46934c90" />
+                    <attribute name="value" value="0xE020" id="20269" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20270" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20271" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20272" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20273" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20274" addr="0x7fca4691dfb0" >
+                <attributelist id="20275" addr="0x7fca4691dfb0" >
+                    <attribute name="sym_name" value="KEY_MOUSE_WHEEL_UP" id="20276" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_MOUSE_WHEEL_UP" id="20277" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="0xE101" id="20278" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20279" addr="0x7fca46934c90" />
+                    <attribute name="value" value="0xE101" id="20280" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20281" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20282" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20283" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20284" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20285" addr="0x7fca4691e110" >
+                <attributelist id="20286" addr="0x7fca4691e110" >
+                    <attribute name="sym_name" value="KEY_MOUSE_WHEEL_DOWN" id="20287" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_MOUSE_WHEEL_DOWN" id="20288" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="0xE102" id="20289" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20290" addr="0x7fca46934c90" />
+                    <attribute name="value" value="0xE102" id="20291" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20292" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20293" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20294" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20295" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20296" addr="0x7fca4691e270" >
+                <attributelist id="20297" addr="0x7fca4691e270" >
+                    <attribute name="sym_name" value="KEY_MOUSE_MOVE" id="20298" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_MOUSE_MOVE" id="20299" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="0xE103" id="20300" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20301" addr="0x7fca46934c90" />
+                    <attribute name="value" value="0xE103" id="20302" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20303" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20304" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20305" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20306" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20307" addr="0x7fca4691e3d0" >
+                <attributelist id="20308" addr="0x7fca4691e3d0" >
+                    <attribute name="sym_name" value="KEY_MOUSE_DRAG" id="20309" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_MOUSE_DRAG" id="20310" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="0xE104" id="20311" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20312" addr="0x7fca46934c90" />
+                    <attribute name="value" value="0xE104" id="20313" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20314" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20315" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20316" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20317" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20318" addr="0x7fca4691e530" >
+                <attributelist id="20319" addr="0x7fca4691e530" >
+                    <attribute name="sym_name" value="KEY_MOUSE_DRAG_START" id="20320" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_MOUSE_DRAG_START" id="20321" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="0xE105" id="20322" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20323" addr="0x7fca46934c90" />
+                    <attribute name="value" value="0xE105" id="20324" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20325" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20326" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20327" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20328" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20329" addr="0x7fca4691e690" >
+                <attributelist id="20330" addr="0x7fca4691e690" >
+                    <attribute name="sym_name" value="KEY_MOUSE_DRAG_END" id="20331" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_MOUSE_DRAG_END" id="20332" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="0xE106" id="20333" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20334" addr="0x7fca46934c90" />
+                    <attribute name="value" value="0xE106" id="20335" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20336" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20337" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20338" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20339" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20340" addr="0x7fca4691e7f0" >
+                <attributelist id="20341" addr="0x7fca4691e7f0" >
+                    <attribute name="sym_name" value="KEY_MOUSE_RDRAG" id="20342" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_MOUSE_RDRAG" id="20343" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="0xE107" id="20344" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20345" addr="0x7fca46934c90" />
+                    <attribute name="value" value="0xE107" id="20346" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20347" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20348" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20349" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20350" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20351" addr="0x7fca4691e950" >
+                <attributelist id="20352" addr="0x7fca4691e950" >
+                    <attribute name="sym_name" value="KEY_MOUSE_RDRAG_START" id="20353" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_MOUSE_RDRAG_START" id="20354" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="0xE108" id="20355" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20356" addr="0x7fca46934c90" />
+                    <attribute name="value" value="0xE108" id="20357" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20358" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20359" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20360" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20361" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20362" addr="0x7fca4691eab0" >
+                <attributelist id="20363" addr="0x7fca4691eab0" >
+                    <attribute name="sym_name" value="KEY_MOUSE_RDRAG_END" id="20364" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_MOUSE_RDRAG_END" id="20365" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="0xE109" id="20366" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20367" addr="0x7fca46934c90" />
+                    <attribute name="value" value="0xE109" id="20368" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20369" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20370" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20371" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20372" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20373" addr="0x7fca4691ec10" >
+                <attributelist id="20374" addr="0x7fca4691ec10" >
+                    <attribute name="sym_name" value="KEY_MOUSE_NOOP" id="20375" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_MOUSE_NOOP" id="20376" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="0xEFFF" id="20377" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20378" addr="0x7fca46934c90" />
+                    <attribute name="value" value="0xEFFF" id="20379" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20380" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20381" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20382" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20383" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20384" addr="0x7fca4691ed70" >
+                <attributelist id="20385" addr="0x7fca4691ed70" >
+                    <attribute name="sym_name" value="KEY_MOUSE_END" id="20386" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_MOUSE_END" id="20387" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="0xEFFF" id="20388" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20389" addr="0x7fca46934c90" />
+                    <attribute name="value" value="0xEFFF" id="20390" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20391" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20392" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20393" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20394" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20395" addr="0x7fca4691eed0" >
+                <attributelist id="20396" addr="0x7fca4691eed0" >
+                    <attribute name="sym_name" value="KEY_APPCOMMAND" id="20397" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_APPCOMMAND" id="20398" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="0xD000" id="20399" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20400" addr="0x7fca46934c90" />
+                    <attribute name="value" value="0xD000" id="20401" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20402" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20403" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20404" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20405" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20406" addr="0x7fca4691f030" >
+                <attributelist id="20407" addr="0x7fca4691f030" >
+                    <attribute name="sym_name" value="KEY_INVALID" id="20408" addr="0x7fca46934c90" />
+                    <attribute name="name" value="KEY_INVALID" id="20409" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="0xFFFF" id="20410" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20411" addr="0x7fca46934c90" />
+                    <attribute name="value" value="0xFFFF" id="20412" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20413" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20414" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20415" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20416" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20417" addr="0x7fca4691f190" >
+                <attributelist id="20418" addr="0x7fca4691f190" >
+                    <attribute name="sym_name" value="ICON_TYPE_NONE" id="20419" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ICON_TYPE_NONE" id="20420" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="101" id="20421" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20422" addr="0x7fca46934c90" />
+                    <attribute name="value" value="101" id="20423" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20424" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20425" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20426" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20427" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20428" addr="0x7fca4691f2f0" >
+                <attributelist id="20429" addr="0x7fca4691f2f0" >
+                    <attribute name="sym_name" value="ICON_TYPE_PROGRAMS" id="20430" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ICON_TYPE_PROGRAMS" id="20431" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="102" id="20432" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20433" addr="0x7fca46934c90" />
+                    <attribute name="value" value="102" id="20434" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20435" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20436" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20437" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20438" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20439" addr="0x7fca4691f450" >
+                <attributelist id="20440" addr="0x7fca4691f450" >
+                    <attribute name="sym_name" value="ICON_TYPE_MUSIC" id="20441" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ICON_TYPE_MUSIC" id="20442" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="103" id="20443" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20444" addr="0x7fca46934c90" />
+                    <attribute name="value" value="103" id="20445" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20446" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20447" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20448" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20449" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20450" addr="0x7fca4691f5b0" >
+                <attributelist id="20451" addr="0x7fca4691f5b0" >
+                    <attribute name="sym_name" value="ICON_TYPE_PICTURES" id="20452" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ICON_TYPE_PICTURES" id="20453" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="104" id="20454" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20455" addr="0x7fca46934c90" />
+                    <attribute name="value" value="104" id="20456" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20457" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20458" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20459" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20460" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20461" addr="0x7fca4691f710" >
+                <attributelist id="20462" addr="0x7fca4691f710" >
+                    <attribute name="sym_name" value="ICON_TYPE_VIDEOS" id="20463" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ICON_TYPE_VIDEOS" id="20464" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="105" id="20465" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20466" addr="0x7fca46934c90" />
+                    <attribute name="value" value="105" id="20467" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20468" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20469" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20470" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20471" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20472" addr="0x7fca4691f870" >
+                <attributelist id="20473" addr="0x7fca4691f870" >
+                    <attribute name="sym_name" value="ICON_TYPE_FILES" id="20474" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ICON_TYPE_FILES" id="20475" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="106" id="20476" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20477" addr="0x7fca46934c90" />
+                    <attribute name="value" value="106" id="20478" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20479" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20480" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20481" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20482" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20483" addr="0x7fca4691f9d0" >
+                <attributelist id="20484" addr="0x7fca4691f9d0" >
+                    <attribute name="sym_name" value="ICON_TYPE_WEATHER" id="20485" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ICON_TYPE_WEATHER" id="20486" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="107" id="20487" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20488" addr="0x7fca46934c90" />
+                    <attribute name="value" value="107" id="20489" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20490" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20491" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20492" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20493" addr="0x7fca46934c90" />
+                </attributelist >
+             
+            </constant >
+            <constant id="20494" addr="0x7fca4691fb30" >
+                <attributelist id="20495" addr="0x7fca4691fb30" >
+                    <attribute name="sym_name" value="ICON_TYPE_SETTINGS" id="20496" addr="0x7fca46934c90" />
+                    <attribute name="name" value="ICON_TYPE_SETTINGS" id="20497" addr="0x7fca46934c90" />
+                    <attribute name="rawval" value="109" id="20498" addr="0x7fca46934c90" />
+                    <attribute name="feature_immutable" value="1" id="20499" addr="0x7fca46934c90" />
+                    <attribute name="value" value="109" id="20500" addr="0x7fca46934c90" />
+                    <attribute name="storage" value="%constant" id="20501" addr="0x7fca46934c90" />
+                    <attribute name="type" value="int" id="20502" addr="0x7fca46934c90" />
+                    <attribute name="sym_symtab" value="0x7fca4696b950" id="20503" addr="0x7fca4696b950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="20504" addr="0x7fca46934c90" />
                 </attributelist >
              
             </constant >
diff --git a/srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmcplugin.i.cpp b/srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmcplugin.i.cpp
similarity index 99%
rename from srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmcplugin.i.cpp
rename to srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmcplugin.i.cpp
index 2d1b00d0b78..c85af24f4fc 100644
--- a/srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmcplugin.i.cpp
+++ b/srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmcplugin.i.cpp
@@ -849,7 +849,7 @@ namespace PythonBindings
 
    // constants
    PyModule_AddStringConstant(module, "__author__", "Team Kodi <http://kodi.tv>");
-   PyModule_AddStringConstant(module, "__date__", "Wed Jun 19 18:36:50 GMT 2019");
+   PyModule_AddStringConstant(module, "__date__", "Sun Sep 01 10:46:59 GMT 2019");
    PyModule_AddStringConstant(module, "__version__", "2.26.0");
    PyModule_AddStringConstant(module, "__credits__", "Team Kodi");
    PyModule_AddStringConstant(module, "__platform__", "ALL");
diff --git a/srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmcplugin.i.xml b/srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmcplugin.i.xml
similarity index 59%
rename from srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmcplugin.i.xml
rename to srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmcplugin.i.xml
index 1c1828a07d7..f4128e7c44b 100644
--- a/srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmcplugin.i.xml
+++ b/srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmcplugin.i.xml
@@ -1,141 +1,141 @@
 <?xml version="1.0" ?> 
-<top id="1" addr="0x7f8396ae7b30" >
-    <attributelist id="2" addr="0x7f8396ae7b30" >
-        <attribute name="outfile" value="AddonModuleXbmcplugin.i.xml" id="3" addr="0x7f8396b0aa10" />
-        <attribute name="name" value="xbmcplugin" id="4" addr="0x7f8396b0aa10" />
-        <attribute name="module" value="xbmcplugin" id="5" addr="0x7f8396afcfd0" />
-        <attribute name="inputfile" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmcplugin.i" id="6" addr="0x7f8396b0aa10" />
-        <attribute name="classes" value="0x7f8396afa590" id="7" addr="0x7f8396afa590" />
-        <attribute name="infile" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmcplugin.i" id="8" addr="0x7f8396b0aa10" />
-        <attribute name="outfile_h" value="AddonModuleXbmcplugin.i.h" id="9" addr="0x7f8396b0aa10" />
+<top id="1" addr="0x7f390a855b30" >
+    <attributelist id="2" addr="0x7f390a855b30" >
+        <attribute name="outfile" value="AddonModuleXbmcplugin.i.xml" id="3" addr="0x7f390a878a10" />
+        <attribute name="name" value="xbmcplugin" id="4" addr="0x7f390a878a10" />
+        <attribute name="module" value="xbmcplugin" id="5" addr="0x7f390a86afd0" />
+        <attribute name="inputfile" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmcplugin.i" id="6" addr="0x7f390a878a10" />
+        <attribute name="classes" value="0x7f390a868590" id="7" addr="0x7f390a868590" />
+        <attribute name="infile" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmcplugin.i" id="8" addr="0x7f390a878a10" />
+        <attribute name="outfile_h" value="AddonModuleXbmcplugin.i.h" id="9" addr="0x7f390a878a10" />
     </attributelist >
 
-    <include id="10" addr="0x7f8396af7ed0" >
-        <attributelist id="11" addr="0x7f8396af7ed0" >
-            <attribute name="name" value="/usr/share/swig/3.0.12/swig.swg" id="12" addr="0x7f8396b0aa10" />
+    <include id="10" addr="0x7f390a865ed0" >
+        <attributelist id="11" addr="0x7f390a865ed0" >
+            <attribute name="name" value="/usr/share/swig/3.0.12/swig.swg" id="12" addr="0x7f390a878a10" />
         </attributelist >
 
-        <include id="13" addr="0x7f8396af7f30" >
-            <attributelist id="14" addr="0x7f8396af7f30" >
-                <attribute name="name" value="/usr/share/swig/3.0.12/swigwarnings.swg" id="15" addr="0x7f8396b0aa10" />
+        <include id="13" addr="0x7f390a865f30" >
+            <attributelist id="14" addr="0x7f390a865f30" >
+                <attribute name="name" value="/usr/share/swig/3.0.12/swigwarnings.swg" id="15" addr="0x7f390a878a10" />
             </attributelist >
 
-            <include id="16" addr="0x7f8396af8050" >
-                <attributelist id="17" addr="0x7f8396af8050" >
-                    <attribute name="name" value="/usr/share/swig/3.0.12/swigwarn.swg" id="18" addr="0x7f8396b0aa10" />
+            <include id="16" addr="0x7f390a866050" >
+                <attributelist id="17" addr="0x7f390a866050" >
+                    <attribute name="name" value="/usr/share/swig/3.0.12/swigwarn.swg" id="18" addr="0x7f390a878a10" />
                 </attributelist >
              
             </include >
         </include >
-        <namespace id="19" addr="0x7f8396afa0b0" >
-            <attributelist id="20" addr="0x7f8396afa0b0" >
-                <attribute name="sym_name" value="std" id="21" addr="0x7f8396b0aa10" />
-                <attribute name="name" value="std" id="22" addr="0x7f8396b0aa10" />
-                <typescope id="23" addr="0x7f8396b08df0" >
-                    <attributelist id="24" addr="0x7f8396b08df0" >
-                        <attribute name="name" value="std" id="25" addr="0x7f8396b0aa10" />
-                        <typetab id="26" addr="0x7f8396b08e10" >
-                            <attributelist id="27" addr="0x7f8396b08e10" >
-                                <attribute name="initializer_list" value="initializer_list" id="28" addr="0x7f8396b0aa10" />
+        <namespace id="19" addr="0x7f390a8680b0" >
+            <attributelist id="20" addr="0x7f390a8680b0" >
+                <attribute name="sym_name" value="std" id="21" addr="0x7f390a878a10" />
+                <attribute name="name" value="std" id="22" addr="0x7f390a878a10" />
+                <typescope id="23" addr="0x7f390a876df0" >
+                    <attributelist id="24" addr="0x7f390a876df0" >
+                        <attribute name="name" value="std" id="25" addr="0x7f390a878a10" />
+                        <typetab id="26" addr="0x7f390a876e10" >
+                            <attributelist id="27" addr="0x7f390a876e10" >
+                                <attribute name="initializer_list" value="initializer_list" id="28" addr="0x7f390a878a10" />
                             </attributelist >
-                            <typetabsitem id="29" addr="0x7f8396b08f50" >
-                                <attributelist id="30" addr="0x7f8396b08f50" >
+                            <typetabsitem id="29" addr="0x7f390a876f50" >
+                                <attributelist id="30" addr="0x7f390a876f50" >
                                 </attributelist >
                             </typetabsitem >
                         </typetab >
-                        <attribute name="parent" value="0x7f8396ae6a30" id="31" addr="0x7f8396ae6a30" />
-                        <attribute name="qname" value="std" id="32" addr="0x7f8396b0aa10" />
-                        <attribute name="symtab" value="0x7f8396afa010" id="33" addr="0x7f8396afa010" />
+                        <attribute name="parent" value="0x7f390a854a30" id="31" addr="0x7f390a854a30" />
+                        <attribute name="qname" value="std" id="32" addr="0x7f390a878a10" />
+                        <attribute name="symtab" value="0x7f390a868010" id="33" addr="0x7f390a868010" />
                     </attributelist >
-                    <typescopesitem id="34" addr="0x7f8396af9f70" >
-                        <attributelist id="35" addr="0x7f8396af9f70" >
+                    <typescopesitem id="34" addr="0x7f390a867f70" >
+                        <attributelist id="35" addr="0x7f390a867f70" >
                         </attributelist >
                     </typescopesitem >
-                    <typescopesitem id="36" addr="0x7f8396b08e10" >
-                        <attributelist id="37" addr="0x7f8396b08e10" >
-                            <attribute name="initializer_list" value="initializer_list" id="38" addr="0x7f8396b0aa10" />
+                    <typescopesitem id="36" addr="0x7f390a876e10" >
+                        <attributelist id="37" addr="0x7f390a876e10" >
+                            <attribute name="initializer_list" value="initializer_list" id="38" addr="0x7f390a878a10" />
                         </attributelist >
                     </typescopesitem >
-                    <typescopesitem id="39" addr="0x7f8396ae6a30" >
-                        <attributelist id="40" addr="0x7f8396ae6a30" >
-                            <attribute name="name" value="" id="41" addr="0x7f8396b0aa10" />
-                            <typetab id="42" addr="0x7f8396ae6a90" >
-                                <attributelist id="43" addr="0x7f8396ae6a90" >
+                    <typescopesitem id="39" addr="0x7f390a854a30" >
+                        <attributelist id="40" addr="0x7f390a854a30" >
+                            <attribute name="name" value="" id="41" addr="0x7f390a878a10" />
+                            <typetab id="42" addr="0x7f390a854a90" >
+                                <attributelist id="43" addr="0x7f390a854a90" >
                                 </attributelist >
                             </typetab >
                         </attributelist >
                     </typescopesitem >
-                    <typescopesitem id="44" addr="0x7f8396b08e30" >
-                        <attributelist id="45" addr="0x7f8396b08e30" >
+                    <typescopesitem id="44" addr="0x7f390a876e30" >
+                        <attributelist id="45" addr="0x7f390a876e30" >
                         </attributelist >
                     </typescopesitem >
-                    <typescopesitem id="46" addr="0x7f8396afa010" >
-                        <attributelist id="47" addr="0x7f8396afa010" >
-                            <attribute name="name" value="std" id="48" addr="0x7f8396b0aa10" />
-                            <attribute name="csymtab" value="0x7f8396afa050" id="49" addr="0x7f8396afa050" />
-                            <attribute name="symtab" value="0x7f8396af9ff0" id="50" addr="0x7f8396af9ff0" />
+                    <typescopesitem id="46" addr="0x7f390a868010" >
+                        <attributelist id="47" addr="0x7f390a868010" >
+                            <attribute name="name" value="std" id="48" addr="0x7f390a878a10" />
+                            <attribute name="csymtab" value="0x7f390a868050" id="49" addr="0x7f390a868050" />
+                            <attribute name="symtab" value="0x7f390a867ff0" id="50" addr="0x7f390a867ff0" />
                         </attributelist >
                     </typescopesitem >
                 </typescope >
-                <attribute name="symtab" value="0x7f8396afa010" id="51" addr="0x7f8396afa010" />
-                <attribute name="sym_symtab" value="0x7f8396ae6950" id="52" addr="0x7f8396ae6950" />
-                <attribute name="sym_overname" value="__SWIG_0" id="53" addr="0x7f8396b0aa10" />
+                <attribute name="symtab" value="0x7f390a868010" id="51" addr="0x7f390a868010" />
+                <attribute name="sym_symtab" value="0x7f390a854950" id="52" addr="0x7f390a854950" />
+                <attribute name="sym_overname" value="__SWIG_0" id="53" addr="0x7f390a878a10" />
             </attributelist >
 
-            <template id="54" addr="0x7f8396afa230" >
-                <attributelist id="55" addr="0x7f8396afa230" >
-                    <attribute name="templatetype" value="class" id="56" addr="0x7f8396b0aa10" />
-                    <attribute name="sym_typename" value="1" id="57" addr="0x7f8396b0aa10" />
-                    <attribute name="name" value="initializer_list" id="58" addr="0x7f8396b0aa10" />
-                    <attribute name="sym_symtab" value="0x7f8396afa010" id="59" addr="0x7f8396afa010" />
-                    <attribute name="symtab" value="0x7f8396afa450" id="60" addr="0x7f8396afa450" />
-                    <attribute name="allows_typedef" value="1" id="61" addr="0x7f8396b0aa10" />
-                    <attribute name="kind" value="class" id="62" addr="0x7f8396b0aa10" />
-                    <attribute name="sym_name" value="initializer_list" id="63" addr="0x7f8396b0aa10" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="64" addr="0x7f8396b0aa10" />
-                    <templateparms id="65" addr="0x7f8396afa150" >
+            <template id="54" addr="0x7f390a868230" >
+                <attributelist id="55" addr="0x7f390a868230" >
+                    <attribute name="templatetype" value="class" id="56" addr="0x7f390a878a10" />
+                    <attribute name="sym_typename" value="1" id="57" addr="0x7f390a878a10" />
+                    <attribute name="name" value="initializer_list" id="58" addr="0x7f390a878a10" />
+                    <attribute name="sym_symtab" value="0x7f390a868010" id="59" addr="0x7f390a868010" />
+                    <attribute name="symtab" value="0x7f390a868450" id="60" addr="0x7f390a868450" />
+                    <attribute name="allows_typedef" value="1" id="61" addr="0x7f390a878a10" />
+                    <attribute name="kind" value="class" id="62" addr="0x7f390a878a10" />
+                    <attribute name="sym_name" value="initializer_list" id="63" addr="0x7f390a878a10" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="64" addr="0x7f390a878a10" />
+                    <templateparms id="65" addr="0x7f390a868150" >
                         <parm id="66">
-                            <attributelist id="67" addr="0x7f8396afa150" >
-                                <attribute name="name" value="T" id="68" addr="0x7f8396b0aa10" />
-                                <attribute name="type" value="typename T" id="69" addr="0x7f8396b0aa10" />
+                            <attributelist id="67" addr="0x7f390a868150" >
+                                <attribute name="name" value="T" id="68" addr="0x7f390a878a10" />
+                                <attribute name="type" value="typename T" id="69" addr="0x7f390a878a10" />
                             </attributelist >
                         </parm >
                     </templateparms >
                 </attributelist >
 
-                <access id="70" addr="0x7f8396afa610" >
-                    <attributelist id="71" addr="0x7f8396afa610" >
-                        <attribute name="kind" value="public" id="72" addr="0x7f8396b0aa10" />
+                <access id="70" addr="0x7f390a868610" >
+                    <attributelist id="71" addr="0x7f390a868610" >
+                        <attribute name="kind" value="public" id="72" addr="0x7f390a878a10" />
                     </attributelist >
                  
                 </access >
             </template >
-            <typemap id="73" addr="0x7f8396afac70" >
-                <attributelist id="74" addr="0x7f8396afac70" >
-                    <kwargs id="75" addr="0x7f8396afa970" >
-                        <attributelist id="76" addr="0x7f8396afa970" >
-                            <attribute name="name" value="warning" id="77" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="476:Initialization using std::initializer_list." id="78" addr="0x7f8396b0aa10" />
-                        </attributelist >
-                        <kwargssitem id="79" addr="0x7f8396afaaf0" >
-                            <attributelist id="80" addr="0x7f8396afaaf0" >
+            <typemap id="73" addr="0x7f390a868c70" >
+                <attributelist id="74" addr="0x7f390a868c70" >
+                    <kwargs id="75" addr="0x7f390a868970" >
+                        <attributelist id="76" addr="0x7f390a868970" >
+                            <attribute name="name" value="warning" id="77" addr="0x7f390a878a10" />
+                            <attribute name="value" value="476:Initialization using std::initializer_list." id="78" addr="0x7f390a878a10" />
+                        </attributelist >
+                        <kwargssitem id="79" addr="0x7f390a868af0" >
+                            <attributelist id="80" addr="0x7f390a868af0" >
                             </attributelist >
                         </kwargssitem >
-                        <kwargssitem id="81" addr="0x7f8396afa950" >
-                            <attributelist id="82" addr="0x7f8396afa950" >
+                        <kwargssitem id="81" addr="0x7f390a868950" >
+                            <attributelist id="82" addr="0x7f390a868950" >
                             </attributelist >
                         </kwargssitem >
                     </kwargs >
-                    <attribute name="code" value="" id="83" addr="0x7f8396b0aa10" />
-                    <attribute name="method" value="in" id="84" addr="0x7f8396b0aa10" />
+                    <attribute name="code" value="" id="83" addr="0x7f390a878a10" />
+                    <attribute name="method" value="in" id="84" addr="0x7f390a878a10" />
                 </attributelist >
 
-                <typemapitem id="85" addr="0x7f8396afab90" >
-                    <attributelist id="86" addr="0x7f8396afab90" >
-                        <parmlist id="87" addr="0x7f8396afabd0" >
+                <typemapitem id="85" addr="0x7f390a868b90" >
+                    <attributelist id="86" addr="0x7f390a868b90" >
+                        <parmlist id="87" addr="0x7f390a868bd0" >
                             <parm id="88">
-                                <attributelist id="89" addr="0x7f8396afabd0" >
-                                    <attribute name="type" value="std::initializer_list&lt;(T)>" id="90" addr="0x7f8396b0aa10" />
+                                <attributelist id="89" addr="0x7f390a868bd0" >
+                                    <attribute name="type" value="std::initializer_list&lt;(T)>" id="90" addr="0x7f390a878a10" />
                                 </attributelist >
                             </parm >
                         </parmlist >
@@ -143,32 +143,32 @@
                  
                 </typemapitem >
             </typemap >
-            <typemap id="91" addr="0x7f8396afaff0" >
-                <attributelist id="92" addr="0x7f8396afaff0" >
-                    <kwargs id="93" addr="0x7f8396afad90" >
-                        <attributelist id="94" addr="0x7f8396afad90" >
-                            <attribute name="name" value="precedence" id="95" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="0" id="96" addr="0x7f8396b0aa10" />
-                        </attributelist >
-                        <kwargssitem id="97" addr="0x7f8396afadb0" >
-                            <attributelist id="98" addr="0x7f8396afadb0" >
+            <typemap id="91" addr="0x7f390a868ff0" >
+                <attributelist id="92" addr="0x7f390a868ff0" >
+                    <kwargs id="93" addr="0x7f390a868d90" >
+                        <attributelist id="94" addr="0x7f390a868d90" >
+                            <attribute name="name" value="precedence" id="95" addr="0x7f390a878a10" />
+                            <attribute name="value" value="0" id="96" addr="0x7f390a878a10" />
+                        </attributelist >
+                        <kwargssitem id="97" addr="0x7f390a868db0" >
+                            <attributelist id="98" addr="0x7f390a868db0" >
                             </attributelist >
                         </kwargssitem >
-                        <kwargssitem id="99" addr="0x7f8396afadd0" >
-                            <attributelist id="100" addr="0x7f8396afadd0" >
+                        <kwargssitem id="99" addr="0x7f390a868dd0" >
+                            <attributelist id="100" addr="0x7f390a868dd0" >
                             </attributelist >
                         </kwargssitem >
                     </kwargs >
-                    <attribute name="code" value="" id="101" addr="0x7f8396b0aa10" />
-                    <attribute name="method" value="typecheck" id="102" addr="0x7f8396b0aa10" />
+                    <attribute name="code" value="" id="101" addr="0x7f390a878a10" />
+                    <attribute name="method" value="typecheck" id="102" addr="0x7f390a878a10" />
                 </attributelist >
 
-                <typemapitem id="103" addr="0x7f8396afaf30" >
-                    <attributelist id="104" addr="0x7f8396afaf30" >
-                        <parmlist id="105" addr="0x7f8396afaf70" >
+                <typemapitem id="103" addr="0x7f390a868f30" >
+                    <attributelist id="104" addr="0x7f390a868f30" >
+                        <parmlist id="105" addr="0x7f390a868f70" >
                             <parm id="106">
-                                <attributelist id="107" addr="0x7f8396afaf70" >
-                                    <attribute name="type" value="std::initializer_list&lt;(T)>" id="108" addr="0x7f8396b0aa10" />
+                                <attributelist id="107" addr="0x7f390a868f70" >
+                                    <attribute name="type" value="std::initializer_list&lt;(T)>" id="108" addr="0x7f390a878a10" />
                                 </attributelist >
                             </parm >
                         </parmlist >
@@ -177,18 +177,18 @@
                 </typemapitem >
             </typemap >
         </namespace >
-        <typemap id="109" addr="0x7f8396afb210" >
-            <attributelist id="110" addr="0x7f8396afb210" >
-                <attribute name="code" value="delete [] $1;" id="111" addr="0x7f8396b0aa10" />
-                <attribute name="method" value="newfree" id="112" addr="0x7f8396b0aa10" />
+        <typemap id="109" addr="0x7f390a869210" >
+            <attributelist id="110" addr="0x7f390a869210" >
+                <attribute name="code" value="delete [] $1;" id="111" addr="0x7f390a878a10" />
+                <attribute name="method" value="newfree" id="112" addr="0x7f390a878a10" />
             </attributelist >
 
-            <typemapitem id="113" addr="0x7f8396afb130" >
-                <attributelist id="114" addr="0x7f8396afb130" >
-                    <parmlist id="115" addr="0x7f8396afb170" >
+            <typemapitem id="113" addr="0x7f390a869130" >
+                <attributelist id="114" addr="0x7f390a869130" >
+                    <parmlist id="115" addr="0x7f390a869170" >
                         <parm id="116">
-                            <attributelist id="117" addr="0x7f8396afb170" >
-                                <attribute name="type" value="p.char" id="118" addr="0x7f8396b0aa10" />
+                            <attributelist id="117" addr="0x7f390a869170" >
+                                <attribute name="type" value="p.char" id="118" addr="0x7f390a878a10" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -196,18 +196,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="119" addr="0x7f8396afb3f0" >
-            <attributelist id="120" addr="0x7f8396afb3f0" >
-                <attribute name="code" value="{&#10;  delete [] $1;&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="121" addr="0x7f8396b0aa10" />
-                <attribute name="method" value="memberin" id="122" addr="0x7f8396b0aa10" />
+        <typemap id="119" addr="0x7f390a8693f0" >
+            <attributelist id="120" addr="0x7f390a8693f0" >
+                <attribute name="code" value="{&#10;  delete [] $1;&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="121" addr="0x7f390a878a10" />
+                <attribute name="method" value="memberin" id="122" addr="0x7f390a878a10" />
             </attributelist >
 
-            <typemapitem id="123" addr="0x7f8396afb330" >
-                <attributelist id="124" addr="0x7f8396afb330" >
-                    <parmlist id="125" addr="0x7f8396afb370" >
+            <typemapitem id="123" addr="0x7f390a869330" >
+                <attributelist id="124" addr="0x7f390a869330" >
+                    <parmlist id="125" addr="0x7f390a869370" >
                         <parm id="126">
-                            <attributelist id="127" addr="0x7f8396afb370" >
-                                <attribute name="type" value="p.char" id="128" addr="0x7f8396b0aa10" />
+                            <attributelist id="127" addr="0x7f390a869370" >
+                                <attribute name="type" value="p.char" id="128" addr="0x7f390a878a10" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -215,32 +215,32 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="129" addr="0x7f8396afb650" >
-            <attributelist id="130" addr="0x7f8396afb650" >
-                <kwargs id="131" addr="0x7f8396afb490" >
-                    <attributelist id="132" addr="0x7f8396afb490" >
-                        <attribute name="name" value="warning" id="133" addr="0x7f8396b0aa10" />
-                        <attribute name="value" value="451:Setting a const char * variable may leak memory." id="134" addr="0x7f8396b0aa10" />
+        <typemap id="129" addr="0x7f390a869650" >
+            <attributelist id="130" addr="0x7f390a869650" >
+                <kwargs id="131" addr="0x7f390a869490" >
+                    <attributelist id="132" addr="0x7f390a869490" >
+                        <attribute name="name" value="warning" id="133" addr="0x7f390a878a10" />
+                        <attribute name="value" value="451:Setting a const char * variable may leak memory." id="134" addr="0x7f390a878a10" />
                     </attributelist >
-                    <kwargssitem id="135" addr="0x7f8396afb4b0" >
-                        <attributelist id="136" addr="0x7f8396afb4b0" >
+                    <kwargssitem id="135" addr="0x7f390a8694b0" >
+                        <attributelist id="136" addr="0x7f390a8694b0" >
                         </attributelist >
                     </kwargssitem >
-                    <kwargssitem id="137" addr="0x7f8396afb470" >
-                        <attributelist id="138" addr="0x7f8396afb470" >
+                    <kwargssitem id="137" addr="0x7f390a869470" >
+                        <attributelist id="138" addr="0x7f390a869470" >
                         </attributelist >
                     </kwargssitem >
                 </kwargs >
-                <attribute name="code" value="{&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="139" addr="0x7f8396b0aa10" />
-                <attribute name="method" value="memberin" id="140" addr="0x7f8396b0aa10" />
+                <attribute name="code" value="{&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="139" addr="0x7f390a878a10" />
+                <attribute name="method" value="memberin" id="140" addr="0x7f390a878a10" />
             </attributelist >
 
-            <typemapitem id="141" addr="0x7f8396afb590" >
-                <attributelist id="142" addr="0x7f8396afb590" >
-                    <parmlist id="143" addr="0x7f8396afb5d0" >
+            <typemapitem id="141" addr="0x7f390a869590" >
+                <attributelist id="142" addr="0x7f390a869590" >
+                    <parmlist id="143" addr="0x7f390a8695d0" >
                         <parm id="144">
-                            <attributelist id="145" addr="0x7f8396afb5d0" >
-                                <attribute name="type" value="p.q(const).char" id="146" addr="0x7f8396b0aa10" />
+                            <attributelist id="145" addr="0x7f390a8695d0" >
+                                <attribute name="type" value="p.q(const).char" id="146" addr="0x7f390a878a10" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -248,18 +248,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="147" addr="0x7f8396afb830" >
-            <attributelist id="148" addr="0x7f8396afb830" >
-                <attribute name="code" value="{&#10;  delete [] $1;&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="149" addr="0x7f8396b0aa10" />
-                <attribute name="method" value="globalin" id="150" addr="0x7f8396b0aa10" />
+        <typemap id="147" addr="0x7f390a869830" >
+            <attributelist id="148" addr="0x7f390a869830" >
+                <attribute name="code" value="{&#10;  delete [] $1;&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="149" addr="0x7f390a878a10" />
+                <attribute name="method" value="globalin" id="150" addr="0x7f390a878a10" />
             </attributelist >
 
-            <typemapitem id="151" addr="0x7f8396afb770" >
-                <attributelist id="152" addr="0x7f8396afb770" >
-                    <parmlist id="153" addr="0x7f8396afb7b0" >
+            <typemapitem id="151" addr="0x7f390a869770" >
+                <attributelist id="152" addr="0x7f390a869770" >
+                    <parmlist id="153" addr="0x7f390a8697b0" >
                         <parm id="154">
-                            <attributelist id="155" addr="0x7f8396afb7b0" >
-                                <attribute name="type" value="p.char" id="156" addr="0x7f8396b0aa10" />
+                            <attributelist id="155" addr="0x7f390a8697b0" >
+                                <attribute name="type" value="p.char" id="156" addr="0x7f390a878a10" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -267,32 +267,32 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="157" addr="0x7f8396afba90" >
-            <attributelist id="158" addr="0x7f8396afba90" >
-                <kwargs id="159" addr="0x7f8396afb8d0" >
-                    <attributelist id="160" addr="0x7f8396afb8d0" >
-                        <attribute name="name" value="warning" id="161" addr="0x7f8396b0aa10" />
-                        <attribute name="value" value="451:Setting a const char * variable may leak memory." id="162" addr="0x7f8396b0aa10" />
+        <typemap id="157" addr="0x7f390a869a90" >
+            <attributelist id="158" addr="0x7f390a869a90" >
+                <kwargs id="159" addr="0x7f390a8698d0" >
+                    <attributelist id="160" addr="0x7f390a8698d0" >
+                        <attribute name="name" value="warning" id="161" addr="0x7f390a878a10" />
+                        <attribute name="value" value="451:Setting a const char * variable may leak memory." id="162" addr="0x7f390a878a10" />
                     </attributelist >
-                    <kwargssitem id="163" addr="0x7f8396afb8f0" >
-                        <attributelist id="164" addr="0x7f8396afb8f0" >
+                    <kwargssitem id="163" addr="0x7f390a8698f0" >
+                        <attributelist id="164" addr="0x7f390a8698f0" >
                         </attributelist >
                     </kwargssitem >
-                    <kwargssitem id="165" addr="0x7f8396afb8b0" >
-                        <attributelist id="166" addr="0x7f8396afb8b0" >
+                    <kwargssitem id="165" addr="0x7f390a8698b0" >
+                        <attributelist id="166" addr="0x7f390a8698b0" >
                         </attributelist >
                     </kwargssitem >
                 </kwargs >
-                <attribute name="code" value="{&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="167" addr="0x7f8396b0aa10" />
-                <attribute name="method" value="globalin" id="168" addr="0x7f8396b0aa10" />
+                <attribute name="code" value="{&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="167" addr="0x7f390a878a10" />
+                <attribute name="method" value="globalin" id="168" addr="0x7f390a878a10" />
             </attributelist >
 
-            <typemapitem id="169" addr="0x7f8396afb9d0" >
-                <attributelist id="170" addr="0x7f8396afb9d0" >
-                    <parmlist id="171" addr="0x7f8396afba10" >
+            <typemapitem id="169" addr="0x7f390a8699d0" >
+                <attributelist id="170" addr="0x7f390a8699d0" >
+                    <parmlist id="171" addr="0x7f390a869a10" >
                         <parm id="172">
-                            <attributelist id="173" addr="0x7f8396afba10" >
-                                <attribute name="type" value="p.q(const).char" id="174" addr="0x7f8396b0aa10" />
+                            <attributelist id="173" addr="0x7f390a869a10" >
+                                <attribute name="type" value="p.q(const).char" id="174" addr="0x7f390a878a10" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -300,18 +300,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="175" addr="0x7f8396afbcb0" >
-            <attributelist id="176" addr="0x7f8396afbcb0" >
-                <attribute name="code" value="{&#10;  if($input) {&#10;    strncpy((char*)$1, (const char *)$input, $1_dim0-1);&#10;    $1[$1_dim0-1] = 0;&#10;  } else {&#10;    $1[0] = 0;&#10;  }&#10;}" id="177" addr="0x7f8396b0aa10" />
-                <attribute name="method" value="memberin" id="178" addr="0x7f8396b0aa10" />
+        <typemap id="175" addr="0x7f390a869cb0" >
+            <attributelist id="176" addr="0x7f390a869cb0" >
+                <attribute name="code" value="{&#10;  if($input) {&#10;    strncpy((char*)$1, (const char *)$input, $1_dim0-1);&#10;    $1[$1_dim0-1] = 0;&#10;  } else {&#10;    $1[0] = 0;&#10;  }&#10;}" id="177" addr="0x7f390a878a10" />
+                <attribute name="method" value="memberin" id="178" addr="0x7f390a878a10" />
             </attributelist >
 
-            <typemapitem id="179" addr="0x7f8396afbbf0" >
-                <attributelist id="180" addr="0x7f8396afbbf0" >
-                    <parmlist id="181" addr="0x7f8396afbc30" >
+            <typemapitem id="179" addr="0x7f390a869bf0" >
+                <attributelist id="180" addr="0x7f390a869bf0" >
+                    <parmlist id="181" addr="0x7f390a869c30" >
                         <parm id="182">
-                            <attributelist id="183" addr="0x7f8396afbc30" >
-                                <attribute name="type" value="a(ANY).char" id="184" addr="0x7f8396b0aa10" />
+                            <attributelist id="183" addr="0x7f390a869c30" >
+                                <attribute name="type" value="a(ANY).char" id="184" addr="0x7f390a878a10" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -319,18 +319,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="185" addr="0x7f8396afbed0" >
-            <attributelist id="186" addr="0x7f8396afbed0" >
-                <attribute name="code" value="{&#10;  if($input) {&#10;    strncpy((char*)$1, (const char *)$input, $1_dim0-1);&#10;    $1[$1_dim0-1] = 0;&#10;  } else {&#10;    $1[0] = 0;&#10;  }&#10;}" id="187" addr="0x7f8396b0aa10" />
-                <attribute name="method" value="globalin" id="188" addr="0x7f8396b0aa10" />
+        <typemap id="185" addr="0x7f390a869ed0" >
+            <attributelist id="186" addr="0x7f390a869ed0" >
+                <attribute name="code" value="{&#10;  if($input) {&#10;    strncpy((char*)$1, (const char *)$input, $1_dim0-1);&#10;    $1[$1_dim0-1] = 0;&#10;  } else {&#10;    $1[0] = 0;&#10;  }&#10;}" id="187" addr="0x7f390a878a10" />
+                <attribute name="method" value="globalin" id="188" addr="0x7f390a878a10" />
             </attributelist >
 
-            <typemapitem id="189" addr="0x7f8396afbe10" >
-                <attributelist id="190" addr="0x7f8396afbe10" >
-                    <parmlist id="191" addr="0x7f8396afbe50" >
+            <typemapitem id="189" addr="0x7f390a869e10" >
+                <attributelist id="190" addr="0x7f390a869e10" >
+                    <parmlist id="191" addr="0x7f390a869e50" >
                         <parm id="192">
-                            <attributelist id="193" addr="0x7f8396afbe50" >
-                                <attribute name="type" value="a(ANY).char" id="194" addr="0x7f8396b0aa10" />
+                            <attributelist id="193" addr="0x7f390a869e50" >
+                                <attribute name="type" value="a(ANY).char" id="194" addr="0x7f390a878a10" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -338,18 +338,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="195" addr="0x7f8396afc0b0" >
-            <attributelist id="196" addr="0x7f8396afc0b0" >
-                <attribute name="code" value="{&#10;  if ($input) strcpy((char *)$1, (const char *)$input);&#10;  else $1[0] = 0;&#10;}" id="197" addr="0x7f8396b0aa10" />
-                <attribute name="method" value="memberin" id="198" addr="0x7f8396b0aa10" />
+        <typemap id="195" addr="0x7f390a86a0b0" >
+            <attributelist id="196" addr="0x7f390a86a0b0" >
+                <attribute name="code" value="{&#10;  if ($input) strcpy((char *)$1, (const char *)$input);&#10;  else $1[0] = 0;&#10;}" id="197" addr="0x7f390a878a10" />
+                <attribute name="method" value="memberin" id="198" addr="0x7f390a878a10" />
             </attributelist >
 
-            <typemapitem id="199" addr="0x7f8396afbff0" >
-                <attributelist id="200" addr="0x7f8396afbff0" >
-                    <parmlist id="201" addr="0x7f8396afc030" >
+            <typemapitem id="199" addr="0x7f390a869ff0" >
+                <attributelist id="200" addr="0x7f390a869ff0" >
+                    <parmlist id="201" addr="0x7f390a86a030" >
                         <parm id="202">
-                            <attributelist id="203" addr="0x7f8396afc030" >
-                                <attribute name="type" value="a().char" id="204" addr="0x7f8396b0aa10" />
+                            <attributelist id="203" addr="0x7f390a86a030" >
+                                <attribute name="type" value="a().char" id="204" addr="0x7f390a878a10" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -357,18 +357,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="205" addr="0x7f8396afc290" >
-            <attributelist id="206" addr="0x7f8396afc290" >
-                <attribute name="code" value="{&#10;  if ($input) strcpy((char *)$1, (const char *)$input);&#10;  else $1[0] = 0;&#10;}" id="207" addr="0x7f8396b0aa10" />
-                <attribute name="method" value="globalin" id="208" addr="0x7f8396b0aa10" />
+        <typemap id="205" addr="0x7f390a86a290" >
+            <attributelist id="206" addr="0x7f390a86a290" >
+                <attribute name="code" value="{&#10;  if ($input) strcpy((char *)$1, (const char *)$input);&#10;  else $1[0] = 0;&#10;}" id="207" addr="0x7f390a878a10" />
+                <attribute name="method" value="globalin" id="208" addr="0x7f390a878a10" />
             </attributelist >
 
-            <typemapitem id="209" addr="0x7f8396afc1d0" >
-                <attributelist id="210" addr="0x7f8396afc1d0" >
-                    <parmlist id="211" addr="0x7f8396afc210" >
+            <typemapitem id="209" addr="0x7f390a86a1d0" >
+                <attributelist id="210" addr="0x7f390a86a1d0" >
+                    <parmlist id="211" addr="0x7f390a86a210" >
                         <parm id="212">
-                            <attributelist id="213" addr="0x7f8396afc210" >
-                                <attribute name="type" value="a().char" id="214" addr="0x7f8396b0aa10" />
+                            <attributelist id="213" addr="0x7f390a86a210" >
+                                <attribute name="type" value="a().char" id="214" addr="0x7f390a878a10" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -376,18 +376,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="215" addr="0x7f8396afc4b0" >
-            <attributelist id="216" addr="0x7f8396afc4b0" >
-                <attribute name="code" value="{&#10;  size_t ii;&#10;  $1_basetype *b = ($1_basetype *) $1;&#10;  for (ii = 0; ii &lt; (size_t)$1_size; ii++) b[ii] = *(($1_basetype *) $input + ii);&#10;}" id="217" addr="0x7f8396b0aa10" />
-                <attribute name="method" value="memberin" id="218" addr="0x7f8396b0aa10" />
+        <typemap id="215" addr="0x7f390a86a4b0" >
+            <attributelist id="216" addr="0x7f390a86a4b0" >
+                <attribute name="code" value="{&#10;  size_t ii;&#10;  $1_basetype *b = ($1_basetype *) $1;&#10;  for (ii = 0; ii &lt; (size_t)$1_size; ii++) b[ii] = *(($1_basetype *) $input + ii);&#10;}" id="217" addr="0x7f390a878a10" />
+                <attribute name="method" value="memberin" id="218" addr="0x7f390a878a10" />
             </attributelist >
 
-            <typemapitem id="219" addr="0x7f8396afc3f0" >
-                <attributelist id="220" addr="0x7f8396afc3f0" >
-                    <parmlist id="221" addr="0x7f8396afc430" >
+            <typemapitem id="219" addr="0x7f390a86a3f0" >
+                <attributelist id="220" addr="0x7f390a86a3f0" >
+                    <parmlist id="221" addr="0x7f390a86a430" >
                         <parm id="222">
-                            <attributelist id="223" addr="0x7f8396afc430" >
-                                <attribute name="type" value="a(ANY).SWIGTYPE" id="224" addr="0x7f8396b0aa10" />
+                            <attributelist id="223" addr="0x7f390a86a430" >
+                                <attribute name="type" value="a(ANY).SWIGTYPE" id="224" addr="0x7f390a878a10" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -395,18 +395,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="225" addr="0x7f8396afc6d0" >
-            <attributelist id="226" addr="0x7f8396afc6d0" >
-                <attribute name="code" value="{&#10;  size_t ii;&#10;  $1_basetype *b = ($1_basetype *) $1;&#10;  for (ii = 0; ii &lt; (size_t)$1_size; ii++) b[ii] = *(($1_basetype *) $input + ii);&#10;}" id="227" addr="0x7f8396b0aa10" />
-                <attribute name="method" value="globalin" id="228" addr="0x7f8396b0aa10" />
+        <typemap id="225" addr="0x7f390a86a6d0" >
+            <attributelist id="226" addr="0x7f390a86a6d0" >
+                <attribute name="code" value="{&#10;  size_t ii;&#10;  $1_basetype *b = ($1_basetype *) $1;&#10;  for (ii = 0; ii &lt; (size_t)$1_size; ii++) b[ii] = *(($1_basetype *) $input + ii);&#10;}" id="227" addr="0x7f390a878a10" />
+                <attribute name="method" value="globalin" id="228" addr="0x7f390a878a10" />
             </attributelist >
 
-            <typemapitem id="229" addr="0x7f8396afc610" >
-                <attributelist id="230" addr="0x7f8396afc610" >
-                    <parmlist id="231" addr="0x7f8396afc650" >
+            <typemapitem id="229" addr="0x7f390a86a610" >
+                <attributelist id="230" addr="0x7f390a86a610" >
+                    <parmlist id="231" addr="0x7f390a86a650" >
                         <parm id="232">
-                            <attributelist id="233" addr="0x7f8396afc650" >
-                                <attribute name="type" value="a(ANY).SWIGTYPE" id="234" addr="0x7f8396b0aa10" />
+                            <attributelist id="233" addr="0x7f390a86a650" >
+                                <attribute name="type" value="a(ANY).SWIGTYPE" id="234" addr="0x7f390a878a10" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -414,18 +414,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="235" addr="0x7f8396afc930" >
-            <attributelist id="236" addr="0x7f8396afc930" >
-                <attribute name="code" value="{&#10;  $basetype (*inp)[$1_dim1] = ($basetype (*)[$1_dim1])($input);&#10;  $basetype (*dest)[$1_dim1] = ($basetype (*)[$1_dim1])($1);&#10;  size_t ii = 0;&#10;  for (; ii &lt; $1_dim0; ++ii) {&#10;    $basetype *ip = inp[ii];&#10;    $basetype *dp = dest[ii];&#10;    size_t jj = 0;&#10;    for (; jj &lt; $1_dim1; ++jj) dp[jj] = ip[jj];&#10;  }&#10;}" id="237" addr="0x7f8396b0aa10" />
-                <attribute name="method" value="memberin" id="238" addr="0x7f8396b0aa10" />
+        <typemap id="235" addr="0x7f390a86a930" >
+            <attributelist id="236" addr="0x7f390a86a930" >
+                <attribute name="code" value="{&#10;  $basetype (*inp)[$1_dim1] = ($basetype (*)[$1_dim1])($input);&#10;  $basetype (*dest)[$1_dim1] = ($basetype (*)[$1_dim1])($1);&#10;  size_t ii = 0;&#10;  for (; ii &lt; $1_dim0; ++ii) {&#10;    $basetype *ip = inp[ii];&#10;    $basetype *dp = dest[ii];&#10;    size_t jj = 0;&#10;    for (; jj &lt; $1_dim1; ++jj) dp[jj] = ip[jj];&#10;  }&#10;}" id="237" addr="0x7f390a878a10" />
+                <attribute name="method" value="memberin" id="238" addr="0x7f390a878a10" />
             </attributelist >
 
-            <typemapitem id="239" addr="0x7f8396afc810" >
-                <attributelist id="240" addr="0x7f8396afc810" >
-                    <parmlist id="241" addr="0x7f8396afc8b0" >
+            <typemapitem id="239" addr="0x7f390a86a810" >
+                <attributelist id="240" addr="0x7f390a86a810" >
+                    <parmlist id="241" addr="0x7f390a86a8b0" >
                         <parm id="242">
-                            <attributelist id="243" addr="0x7f8396afc8b0" >
-                                <attribute name="type" value="a(ANY).a(ANY).SWIGTYPE" id="244" addr="0x7f8396b0aa10" />
+                            <attributelist id="243" addr="0x7f390a86a8b0" >
+                                <attribute name="type" value="a(ANY).a(ANY).SWIGTYPE" id="244" addr="0x7f390a878a10" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -433,18 +433,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="245" addr="0x7f8396afcb90" >
-            <attributelist id="246" addr="0x7f8396afcb90" >
-                <attribute name="code" value="{&#10;  $basetype (*inp)[$1_dim1] = ($basetype (*)[$1_dim1])($input);&#10;  $basetype (*dest)[$1_dim1] = ($basetype (*)[$1_dim1])($1);&#10;  size_t ii = 0;&#10;  for (; ii &lt; $1_dim0; ++ii) {&#10;    $basetype *ip = inp[ii];&#10;    $basetype *dp = dest[ii];&#10;    size_t jj = 0;&#10;    for (; jj &lt; $1_dim1; ++jj) dp[jj] = ip[jj];&#10;  }&#10;}" id="247" addr="0x7f8396b0aa10" />
-                <attribute name="method" value="globalin" id="248" addr="0x7f8396b0aa10" />
+        <typemap id="245" addr="0x7f390a86ab90" >
+            <attributelist id="246" addr="0x7f390a86ab90" >
+                <attribute name="code" value="{&#10;  $basetype (*inp)[$1_dim1] = ($basetype (*)[$1_dim1])($input);&#10;  $basetype (*dest)[$1_dim1] = ($basetype (*)[$1_dim1])($1);&#10;  size_t ii = 0;&#10;  for (; ii &lt; $1_dim0; ++ii) {&#10;    $basetype *ip = inp[ii];&#10;    $basetype *dp = dest[ii];&#10;    size_t jj = 0;&#10;    for (; jj &lt; $1_dim1; ++jj) dp[jj] = ip[jj];&#10;  }&#10;}" id="247" addr="0x7f390a878a10" />
+                <attribute name="method" value="globalin" id="248" addr="0x7f390a878a10" />
             </attributelist >
 
-            <typemapitem id="249" addr="0x7f8396afca70" >
-                <attributelist id="250" addr="0x7f8396afca70" >
-                    <parmlist id="251" addr="0x7f8396afcb10" >
+            <typemapitem id="249" addr="0x7f390a86aa70" >
+                <attributelist id="250" addr="0x7f390a86aa70" >
+                    <parmlist id="251" addr="0x7f390a86ab10" >
                         <parm id="252">
-                            <attributelist id="253" addr="0x7f8396afcb10" >
-                                <attribute name="type" value="a(ANY).a(ANY).SWIGTYPE" id="254" addr="0x7f8396b0aa10" />
+                            <attributelist id="253" addr="0x7f390a86ab10" >
+                                <attribute name="type" value="a(ANY).a(ANY).SWIGTYPE" id="254" addr="0x7f390a878a10" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -452,1621 +452,1621 @@
              
             </typemapitem >
         </typemap >
-        <insert id="255" addr="0x7f8396afcc50" >
-            <attributelist id="256" addr="0x7f8396afcc50" >
-                <attribute name="code" value="&#10;#ifdef __cplusplus&#10;/* SwigValueWrapper is described in swig.swg */&#10;template&lt;typename T> class SwigValueWrapper {&#10;  struct SwigMovePointer {&#10;    T *ptr;&#10;    SwigMovePointer(T *p) : ptr(p) { }&#10;    ~SwigMovePointer() { delete ptr; }&#10;    SwigMovePointer&amp; operator=(SwigMovePointer&amp; rhs) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = rhs.ptr; rhs.ptr = 0; return *this; }&#10;  } pointer;&#10;  SwigValueWrapper&amp; operator=(const SwigValueWrapper&lt;T>&amp; rhs);&#10;  SwigValueWrapper(const SwigValueWrapper&lt;T>&amp; rhs);&#10;public:&#10;  SwigValueWrapper() : pointer(0) { }&#10;  SwigValueWrapper&amp; operator=(const T&amp; t) { SwigMovePointer tmp(new T(t)); pointer = tmp; return *this; }&#10;  operator T&amp;() const { return *pointer.ptr; }&#10;  T *operator&amp;() { return pointer.ptr; }&#10;};" id="257" addr="0x7f8396b0aa10" />
-                <attribute name="section" value="runtime" id="258" addr="0x7f8396b0aa10" />
+        <insert id="255" addr="0x7f390a86ac50" >
+            <attributelist id="256" addr="0x7f390a86ac50" >
+                <attribute name="code" value="&#10;#ifdef __cplusplus&#10;/* SwigValueWrapper is described in swig.swg */&#10;template&lt;typename T> class SwigValueWrapper {&#10;  struct SwigMovePointer {&#10;    T *ptr;&#10;    SwigMovePointer(T *p) : ptr(p) { }&#10;    ~SwigMovePointer() { delete ptr; }&#10;    SwigMovePointer&amp; operator=(SwigMovePointer&amp; rhs) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = rhs.ptr; rhs.ptr = 0; return *this; }&#10;  } pointer;&#10;  SwigValueWrapper&amp; operator=(const SwigValueWrapper&lt;T>&amp; rhs);&#10;  SwigValueWrapper(const SwigValueWrapper&lt;T>&amp; rhs);&#10;public:&#10;  SwigValueWrapper() : pointer(0) { }&#10;  SwigValueWrapper&amp; operator=(const T&amp; t) { SwigMovePointer tmp(new T(t)); pointer = tmp; return *this; }&#10;  operator T&amp;() const { return *pointer.ptr; }&#10;  T *operator&amp;() { return pointer.ptr; }&#10;};" id="257" addr="0x7f390a878a10" />
+                <attribute name="section" value="runtime" id="258" addr="0x7f390a878a10" />
             </attributelist >
          
         </insert >
-        <insert id="259" addr="0x7f8396afcd30" >
-            <attributelist id="260" addr="0x7f8396afcd30" >
-                <attribute name="code" value="&#10;template &lt;typename T> T SwigValueInit() {&#10;  return T();&#10;}&#10;#endif&#10;" id="261" addr="0x7f8396b0aa10" />
-                <attribute name="section" value="runtime" id="262" addr="0x7f8396b0aa10" />
+        <insert id="259" addr="0x7f390a86ad30" >
+            <attributelist id="260" addr="0x7f390a86ad30" >
+                <attribute name="code" value="&#10;template &lt;typename T> T SwigValueInit() {&#10;  return T();&#10;}&#10;#endif&#10;" id="261" addr="0x7f390a878a10" />
+                <attribute name="section" value="runtime" id="262" addr="0x7f390a878a10" />
             </attributelist >
          
         </insert >
-        <insert id="263" addr="0x7f8396afce10" >
-            <attributelist id="264" addr="0x7f8396afce10" >
-                <attribute name="code" value="/* -----------------------------------------------------------------------------&#10; *  This section contains generic SWIG labels for method/variable&#10; *  declarations/attributes, and other compiler dependent labels.&#10; * ----------------------------------------------------------------------------- */&#10;&#10;/* template workaround for compilers that cannot correctly implement the C++ standard */&#10;#ifndef SWIGTEMPLATEDISAMBIGUATOR&#10;# if defined(__SUNPRO_CC) &amp;&amp; (__SUNPRO_CC &lt;= 0x560)&#10;#  define SWIGTEMPLATEDISAMBIGUATOR template&#10;# elif defined(__HP_aCC)&#10;/* Needed even with `aCC -AA' when `aCC -V' reports HP ANSI C++ B3910B A.03.55 */&#10;/* If we find a maximum version that requires this, the test would be __HP_aCC &lt;= 35500 for A.03.55 */&#10;#  define SWIGTEMPLATEDISAMBIGUATOR template&#10;# else&#10;#  define SWIGTEMPLATEDISAMBIGUATOR&#10;# endif&#10;#endif&#10;&#10;/* inline attribute */&#10;#ifndef SWIGINLINE&#10;# if defined(__cplusplus) || (defined(__GNUC__) &amp;&amp; !defined(__STRICT_ANSI__))&#10;#   define SWIGINLINE inline&#10;# else&#10;#   define SWIGINLINE&#10;# endif&#10;#endif&#10;&#10;/* attribute recognised by some compilers to avoid 'unused' warnings */&#10;#ifndef SWIGUNUSED&#10;# if defined(__GNUC__)&#10;#   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 &amp;&amp; __GNUC_MINOR__ >= 4))&#10;#     define SWIGUNUSED __attribute__ ((__unused__))&#10;#   else&#10;#     define SWIGUNUSED&#10;#   endif&#10;# elif defined(__ICC)&#10;#   define SWIGUNUSED __attribute__ ((__unused__))&#10;# else&#10;#   define SWIGUNUSED&#10;# endif&#10;#endif&#10;&#10;#ifndef SWIG_MSC_UNSUPPRESS_4505&#10;# if defined(_MSC_VER)&#10;#   pragma warning(disable : 4505) /* unreferenced local function has been removed */&#10;# endif&#10;#endif&#10;&#10;#ifndef SWIGUNUSEDPARM&#10;# ifdef __cplusplus&#10;#   define SWIGUNUSEDPARM(p)&#10;# else&#10;#   define SWIGUNUSEDPARM(p) p SWIGUNUSED&#10;# endif&#10;#endif&#10;&#10;/* internal SWIG method */&#10;#ifndef SWIGINTERN&#10;# define SWIGINTERN static SWIGUNUSED&#10;#endif&#10;&#10;/* internal inline SWIG method */&#10;#ifndef SWIGINTERNINLINE&#10;# define SWIGINTERNINLINE SWIGINTERN SWIGINLINE&#10;#endif&#10;&#10;/* exporting methods */&#10;#if defined(__GNUC__)&#10;#  if (__GNUC__ >= 4) || (__GNUC__ == 3 &amp;&amp; __GNUC_MINOR__ >= 4)&#10;#    ifndef GCC_HASCLASSVISIBILITY&#10;#      define GCC_HASCLASSVISIBILITY&#10;#    endif&#10;#  endif&#10;#endif&#10;&#10;#ifndef SWIGEXPORT&#10;# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)&#10;#   if defined(STATIC_LINKED)&#10;#     define SWIGEXPORT&#10;#   else&#10;#     define SWIGEXPORT __declspec(dllexport)&#10;#   endif&#10;# else&#10;#   if defined(__GNUC__) &amp;&amp; defined(GCC_HASCLASSVISIBILITY)&#10;#     define SWIGEXPORT __attribute__ ((visibility(&quot;default&quot;)))&#10;#   else&#10;#     define SWIGEXPORT&#10;#   endif&#10;# endif&#10;#endif&#10;&#10;/* calling conventions for Windows */&#10;#ifndef SWIGSTDCALL&#10;# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)&#10;#   define SWIGSTDCALL __stdcall&#10;# else&#10;#   define SWIGSTDCALL&#10;# endif&#10;#endif&#10;&#10;/* Deal with Microsoft's attempt at deprecating C standard runtime functions */&#10;#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) &amp;&amp; defined(_MSC_VER) &amp;&amp; !defined(_CRT_SECURE_NO_DEPRECATE)&#10;# define _CRT_SECURE_NO_DEPRECATE&#10;#endif&#10;&#10;/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */&#10;#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) &amp;&amp; defined(_MSC_VER) &amp;&amp; !defined(_SCL_SECURE_NO_DEPRECATE)&#10;# define _SCL_SECURE_NO_DEPRECATE&#10;#endif&#10;&#10;/* Deal with Apple's deprecated 'AssertMacros.h' from Carbon-framework */&#10;#if defined(__APPLE__) &amp;&amp; !defined(__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES)&#10;# define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0&#10;#endif&#10;&#10;/* Intel's compiler complains if a variable which was never initialised is&#10; * cast to void, which is a common idiom which we use to indicate that we&#10; * are aware a variable isn't used.  So we just silence that warning.&#10; * See: https://github.com/swig/swig/issues/192 for more discussion.&#10; */&#10;#ifdef __INTEL_COMPILER&#10;# pragma warning disable 592&#10;#endif&#10;" id="265" addr="0x7f8396b0aa10" />
-                <attribute name="section" value="runtime" id="266" addr="0x7f8396b0aa10" />
+        <insert id="263" addr="0x7f390a86ae10" >
+            <attributelist id="264" addr="0x7f390a86ae10" >
+                <attribute name="code" value="/* -----------------------------------------------------------------------------&#10; *  This section contains generic SWIG labels for method/variable&#10; *  declarations/attributes, and other compiler dependent labels.&#10; * ----------------------------------------------------------------------------- */&#10;&#10;/* template workaround for compilers that cannot correctly implement the C++ standard */&#10;#ifndef SWIGTEMPLATEDISAMBIGUATOR&#10;# if defined(__SUNPRO_CC) &amp;&amp; (__SUNPRO_CC &lt;= 0x560)&#10;#  define SWIGTEMPLATEDISAMBIGUATOR template&#10;# elif defined(__HP_aCC)&#10;/* Needed even with `aCC -AA' when `aCC -V' reports HP ANSI C++ B3910B A.03.55 */&#10;/* If we find a maximum version that requires this, the test would be __HP_aCC &lt;= 35500 for A.03.55 */&#10;#  define SWIGTEMPLATEDISAMBIGUATOR template&#10;# else&#10;#  define SWIGTEMPLATEDISAMBIGUATOR&#10;# endif&#10;#endif&#10;&#10;/* inline attribute */&#10;#ifndef SWIGINLINE&#10;# if defined(__cplusplus) || (defined(__GNUC__) &amp;&amp; !defined(__STRICT_ANSI__))&#10;#   define SWIGINLINE inline&#10;# else&#10;#   define SWIGINLINE&#10;# endif&#10;#endif&#10;&#10;/* attribute recognised by some compilers to avoid 'unused' warnings */&#10;#ifndef SWIGUNUSED&#10;# if defined(__GNUC__)&#10;#   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 &amp;&amp; __GNUC_MINOR__ >= 4))&#10;#     define SWIGUNUSED __attribute__ ((__unused__))&#10;#   else&#10;#     define SWIGUNUSED&#10;#   endif&#10;# elif defined(__ICC)&#10;#   define SWIGUNUSED __attribute__ ((__unused__))&#10;# else&#10;#   define SWIGUNUSED&#10;# endif&#10;#endif&#10;&#10;#ifndef SWIG_MSC_UNSUPPRESS_4505&#10;# if defined(_MSC_VER)&#10;#   pragma warning(disable : 4505) /* unreferenced local function has been removed */&#10;# endif&#10;#endif&#10;&#10;#ifndef SWIGUNUSEDPARM&#10;# ifdef __cplusplus&#10;#   define SWIGUNUSEDPARM(p)&#10;# else&#10;#   define SWIGUNUSEDPARM(p) p SWIGUNUSED&#10;# endif&#10;#endif&#10;&#10;/* internal SWIG method */&#10;#ifndef SWIGINTERN&#10;# define SWIGINTERN static SWIGUNUSED&#10;#endif&#10;&#10;/* internal inline SWIG method */&#10;#ifndef SWIGINTERNINLINE&#10;# define SWIGINTERNINLINE SWIGINTERN SWIGINLINE&#10;#endif&#10;&#10;/* exporting methods */&#10;#if defined(__GNUC__)&#10;#  if (__GNUC__ >= 4) || (__GNUC__ == 3 &amp;&amp; __GNUC_MINOR__ >= 4)&#10;#    ifndef GCC_HASCLASSVISIBILITY&#10;#      define GCC_HASCLASSVISIBILITY&#10;#    endif&#10;#  endif&#10;#endif&#10;&#10;#ifndef SWIGEXPORT&#10;# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)&#10;#   if defined(STATIC_LINKED)&#10;#     define SWIGEXPORT&#10;#   else&#10;#     define SWIGEXPORT __declspec(dllexport)&#10;#   endif&#10;# else&#10;#   if defined(__GNUC__) &amp;&amp; defined(GCC_HASCLASSVISIBILITY)&#10;#     define SWIGEXPORT __attribute__ ((visibility(&quot;default&quot;)))&#10;#   else&#10;#     define SWIGEXPORT&#10;#   endif&#10;# endif&#10;#endif&#10;&#10;/* calling conventions for Windows */&#10;#ifndef SWIGSTDCALL&#10;# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)&#10;#   define SWIGSTDCALL __stdcall&#10;# else&#10;#   define SWIGSTDCALL&#10;# endif&#10;#endif&#10;&#10;/* Deal with Microsoft's attempt at deprecating C standard runtime functions */&#10;#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) &amp;&amp; defined(_MSC_VER) &amp;&amp; !defined(_CRT_SECURE_NO_DEPRECATE)&#10;# define _CRT_SECURE_NO_DEPRECATE&#10;#endif&#10;&#10;/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */&#10;#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) &amp;&amp; defined(_MSC_VER) &amp;&amp; !defined(_SCL_SECURE_NO_DEPRECATE)&#10;# define _SCL_SECURE_NO_DEPRECATE&#10;#endif&#10;&#10;/* Deal with Apple's deprecated 'AssertMacros.h' from Carbon-framework */&#10;#if defined(__APPLE__) &amp;&amp; !defined(__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES)&#10;# define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0&#10;#endif&#10;&#10;/* Intel's compiler complains if a variable which was never initialised is&#10; * cast to void, which is a common idiom which we use to indicate that we&#10; * are aware a variable isn't used.  So we just silence that warning.&#10; * See: https://github.com/swig/swig/issues/192 for more discussion.&#10; */&#10;#ifdef __INTEL_COMPILER&#10;# pragma warning disable 592&#10;#endif&#10;" id="265" addr="0x7f390a878a10" />
+                <attribute name="section" value="runtime" id="266" addr="0x7f390a878a10" />
             </attributelist >
          
         </insert >
     </include >
-    <include id="267" addr="0x7f8396afcf90" >
-        <attributelist id="268" addr="0x7f8396afcf90" >
-            <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmcplugin.i" id="269" addr="0x7f8396b0aa10" />
-            <attribute name="module" value="" id="270" addr="0x7f8396afd030" />
-            <attribute name="options" value="0x7f8396afcf10" id="271" addr="0x7f8396afcf10" />
+    <include id="267" addr="0x7f390a86af90" >
+        <attributelist id="268" addr="0x7f390a86af90" >
+            <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmcplugin.i" id="269" addr="0x7f390a878a10" />
+            <attribute name="module" value="" id="270" addr="0x7f390a86b030" />
+            <attribute name="options" value="0x7f390a86af10" id="271" addr="0x7f390a86af10" />
         </attributelist >
 
-        <module id="272" addr="0x7f8396afcfd0" >
-            <attributelist id="273" addr="0x7f8396afcfd0" >
-                <attribute name="name" value="xbmcplugin" id="274" addr="0x7f8396b0aa10" />
+        <module id="272" addr="0x7f390a86afd0" >
+            <attributelist id="273" addr="0x7f390a86afd0" >
+                <attribute name="name" value="xbmcplugin" id="274" addr="0x7f390a878a10" />
             </attributelist >
          
         </module >
-        <insert id="275" addr="0x7f8396afd070" >
-            <attributelist id="276" addr="0x7f8396afd070" >
-                <attribute name="code" value="&#10;#if defined(TARGET_WINDOWS)&#10;#  include &lt;windows.h>&#10;#endif&#10;&#10;#include &quot;interfaces/legacy/ModuleXbmcplugin.h&quot;&#10;&#10;using namespace XBMCAddon;&#10;using namespace xbmcplugin;&#10;&#10;#if defined(__GNUG__)&#10;#pragma GCC diagnostic ignored &quot;-Wstrict-aliasing&quot;&#10;#endif&#10;&#10;" id="277" addr="0x7f8396b0aa10" />
+        <insert id="275" addr="0x7f390a86b070" >
+            <attributelist id="276" addr="0x7f390a86b070" >
+                <attribute name="code" value="&#10;#if defined(TARGET_WINDOWS)&#10;#  include &lt;windows.h>&#10;#endif&#10;&#10;#include &quot;interfaces/legacy/ModuleXbmcplugin.h&quot;&#10;&#10;using namespace XBMCAddon;&#10;using namespace xbmcplugin;&#10;&#10;#if defined(__GNUG__)&#10;#pragma GCC diagnostic ignored &quot;-Wstrict-aliasing&quot;&#10;#endif&#10;&#10;" id="277" addr="0x7f390a878a10" />
             </attributelist >
          
         </insert >
-        <include id="278" addr="0x7f8396afd290" >
-            <attributelist id="279" addr="0x7f8396afd290" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/swighelper.h" id="280" addr="0x7f8396b0aa10" />
+        <include id="278" addr="0x7f390a86b290" >
+            <attributelist id="279" addr="0x7f390a86b290" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/swighelper.h" id="280" addr="0x7f390a878a10" />
             </attributelist >
          
         </include >
-        <include id="281" addr="0x7f8396afd310" >
-            <attributelist id="282" addr="0x7f8396afd310" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/AddonString.h" id="283" addr="0x7f8396b0aa10" />
+        <include id="281" addr="0x7f390a86b310" >
+            <attributelist id="282" addr="0x7f390a86b310" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/AddonString.h" id="283" addr="0x7f390a878a10" />
             </attributelist >
 
-            <namespace id="284" addr="0x7f8396afd450" >
-                <attributelist id="285" addr="0x7f8396afd450" >
-                    <attribute name="sym_name" value="XBMCAddon" id="286" addr="0x7f8396b0aa10" />
-                    <attribute name="name" value="XBMCAddon" id="287" addr="0x7f8396b0aa10" />
-                    <attribute name="csym_nextSibling" value="0x7f8396afda10" id="288" addr="0x7f8396afda10" />
-                    <attribute name="sym_nextSibling" value="0x7f8396afda10" id="289" addr="0x7f8396afda10" />
-                    <typescope id="290" addr="0x7f8396b08e90" >
-                        <attributelist id="291" addr="0x7f8396b08e90" >
-                            <attribute name="name" value="XBMCAddon" id="292" addr="0x7f8396b0aa10" />
-                            <typetab id="293" addr="0x7f8396b08ed0" >
-                                <attributelist id="294" addr="0x7f8396b08ed0" >
-                                    <attribute name="String" value="std::string" id="295" addr="0x7f8396b0aa10" />
+            <namespace id="284" addr="0x7f390a86b450" >
+                <attributelist id="285" addr="0x7f390a86b450" >
+                    <attribute name="sym_name" value="XBMCAddon" id="286" addr="0x7f390a878a10" />
+                    <attribute name="name" value="XBMCAddon" id="287" addr="0x7f390a878a10" />
+                    <attribute name="csym_nextSibling" value="0x7f390a86ba10" id="288" addr="0x7f390a86ba10" />
+                    <attribute name="sym_nextSibling" value="0x7f390a86ba10" id="289" addr="0x7f390a86ba10" />
+                    <typescope id="290" addr="0x7f390a876e90" >
+                        <attributelist id="291" addr="0x7f390a876e90" >
+                            <attribute name="name" value="XBMCAddon" id="292" addr="0x7f390a878a10" />
+                            <typetab id="293" addr="0x7f390a876ed0" >
+                                <attributelist id="294" addr="0x7f390a876ed0" >
+                                    <attribute name="String" value="std::string" id="295" addr="0x7f390a878a10" />
                                 </attributelist >
-                                <typetabsitem id="296" addr="0x7f8396b090b0" >
-                                    <attributelist id="297" addr="0x7f8396b090b0" >
+                                <typetabsitem id="296" addr="0x7f390a8770b0" >
+                                    <attributelist id="297" addr="0x7f390a8770b0" >
                                     </attributelist >
                                 </typetabsitem >
                             </typetab >
-                            <attribute name="parent" value="0x7f8396ae6a30" id="298" addr="0x7f8396ae6a30" />
-                            <attribute name="qname" value="XBMCAddon" id="299" addr="0x7f8396b0aa10" />
-                            <attribute name="symtab" value="0x7f8396afd3b0" id="300" addr="0x7f8396afd3b0" />
+                            <attribute name="parent" value="0x7f390a854a30" id="298" addr="0x7f390a854a30" />
+                            <attribute name="qname" value="XBMCAddon" id="299" addr="0x7f390a878a10" />
+                            <attribute name="symtab" value="0x7f390a86b3b0" id="300" addr="0x7f390a86b3b0" />
                         </attributelist >
-                        <typescopesitem id="301" addr="0x7f8396afd370" >
-                            <attributelist id="302" addr="0x7f8396afd370" >
+                        <typescopesitem id="301" addr="0x7f390a86b370" >
+                            <attributelist id="302" addr="0x7f390a86b370" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="303" addr="0x7f8396b08ed0" >
-                            <attributelist id="304" addr="0x7f8396b08ed0" >
-                                <attribute name="String" value="std::string" id="305" addr="0x7f8396b0aa10" />
+                        <typescopesitem id="303" addr="0x7f390a876ed0" >
+                            <attributelist id="304" addr="0x7f390a876ed0" >
+                                <attribute name="String" value="std::string" id="305" addr="0x7f390a878a10" />
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="306" addr="0x7f8396ae6a30" >
-                            <attributelist id="307" addr="0x7f8396ae6a30" >
-                                <attribute name="name" value="" id="308" addr="0x7f8396b0aa10" />
-                                <typetab id="309" addr="0x7f8396ae6a90" >
-                                    <attributelist id="310" addr="0x7f8396ae6a90" >
+                        <typescopesitem id="306" addr="0x7f390a854a30" >
+                            <attributelist id="307" addr="0x7f390a854a30" >
+                                <attribute name="name" value="" id="308" addr="0x7f390a878a10" />
+                                <typetab id="309" addr="0x7f390a854a90" >
+                                    <attributelist id="310" addr="0x7f390a854a90" >
                                     </attributelist >
                                 </typetab >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="311" addr="0x7f8396b08fd0" >
-                            <attributelist id="312" addr="0x7f8396b08fd0" >
+                        <typescopesitem id="311" addr="0x7f390a876fd0" >
+                            <attributelist id="312" addr="0x7f390a876fd0" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="313" addr="0x7f8396afd3b0" >
-                            <attributelist id="314" addr="0x7f8396afd3b0" >
-                                <attribute name="name" value="XBMCAddon" id="315" addr="0x7f8396b0aa10" />
-                                <attribute name="csymtab" value="0x7f8396afd3f0" id="316" addr="0x7f8396afd3f0" />
-                                <attribute name="symtab" value="0x7f8396afd390" id="317" addr="0x7f8396afd390" />
+                        <typescopesitem id="313" addr="0x7f390a86b3b0" >
+                            <attributelist id="314" addr="0x7f390a86b3b0" >
+                                <attribute name="name" value="XBMCAddon" id="315" addr="0x7f390a878a10" />
+                                <attribute name="csymtab" value="0x7f390a86b3f0" id="316" addr="0x7f390a86b3f0" />
+                                <attribute name="symtab" value="0x7f390a86b390" id="317" addr="0x7f390a86b390" />
                             </attributelist >
                         </typescopesitem >
                     </typescope >
-                    <attribute name="symtab" value="0x7f8396afd3b0" id="318" addr="0x7f8396afd3b0" />
-                    <attribute name="sym_symtab" value="0x7f8396ae6950" id="319" addr="0x7f8396ae6950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="320" addr="0x7f8396b0aa10" />
+                    <attribute name="symtab" value="0x7f390a86b3b0" id="318" addr="0x7f390a86b3b0" />
+                    <attribute name="sym_symtab" value="0x7f390a854950" id="319" addr="0x7f390a854950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="320" addr="0x7f390a878a10" />
                 </attributelist >
 
-                <cdecl id="321" addr="0x7f8396afd570" >
-                    <attributelist id="322" addr="0x7f8396afd570" >
-                        <attribute name="sym_name" value="String" id="323" addr="0x7f8396b0aa10" />
-                        <attribute name="name" value="XBMCAddon::String" id="324" addr="0x7f8396b0aa10" />
-                        <attribute name="decl" value="" id="325" addr="0x7f8396b0aa10" />
-                        <attribute name="storage" value="typedef" id="326" addr="0x7f8396b0aa10" />
-                        <attribute name="kind" value="typedef" id="327" addr="0x7f8396b0aa10" />
-                        <attribute name="type" value="std::string" id="328" addr="0x7f8396b0aa10" />
-                        <attribute name="sym_symtab" value="0x7f8396afd3b0" id="329" addr="0x7f8396afd3b0" />
-                        <attribute name="sym_overname" value="__SWIG_0" id="330" addr="0x7f8396b0aa10" />
+                <cdecl id="321" addr="0x7f390a86b570" >
+                    <attributelist id="322" addr="0x7f390a86b570" >
+                        <attribute name="sym_name" value="String" id="323" addr="0x7f390a878a10" />
+                        <attribute name="name" value="XBMCAddon::String" id="324" addr="0x7f390a878a10" />
+                        <attribute name="decl" value="" id="325" addr="0x7f390a878a10" />
+                        <attribute name="storage" value="typedef" id="326" addr="0x7f390a878a10" />
+                        <attribute name="kind" value="typedef" id="327" addr="0x7f390a878a10" />
+                        <attribute name="type" value="std::string" id="328" addr="0x7f390a878a10" />
+                        <attribute name="sym_symtab" value="0x7f390a86b3b0" id="329" addr="0x7f390a86b3b0" />
+                        <attribute name="sym_overname" value="__SWIG_0" id="330" addr="0x7f390a878a10" />
                     </attributelist >
                  
                 </cdecl >
-                <cdecl id="331" addr="0x7f8396afd770" >
-                    <attributelist id="332" addr="0x7f8396afd770" >
-                        <attribute name="sym_name" value="emptyString" id="333" addr="0x7f8396b0aa10" />
-                        <attribute name="name" value="XBMCAddon::emptyString" id="334" addr="0x7f8396b0aa10" />
-                        <attribute name="decl" value="" id="335" addr="0x7f8396b0aa10" />
-                        <attribute name="storage" value="extern" id="336" addr="0x7f8396b0aa10" />
-                        <attribute name="kind" value="variable" id="337" addr="0x7f8396b0aa10" />
-                        <attribute name="type" value="XBMCAddon::String" id="338" addr="0x7f8396b0aa10" />
-                        <attribute name="sym_symtab" value="0x7f8396afd3b0" id="339" addr="0x7f8396afd3b0" />
-                        <attribute name="sym_overname" value="__SWIG_0" id="340" addr="0x7f8396b0aa10" />
+                <cdecl id="331" addr="0x7f390a86b770" >
+                    <attributelist id="332" addr="0x7f390a86b770" >
+                        <attribute name="sym_name" value="emptyString" id="333" addr="0x7f390a878a10" />
+                        <attribute name="name" value="XBMCAddon::emptyString" id="334" addr="0x7f390a878a10" />
+                        <attribute name="decl" value="" id="335" addr="0x7f390a878a10" />
+                        <attribute name="storage" value="extern" id="336" addr="0x7f390a878a10" />
+                        <attribute name="kind" value="variable" id="337" addr="0x7f390a878a10" />
+                        <attribute name="type" value="XBMCAddon::String" id="338" addr="0x7f390a878a10" />
+                        <attribute name="sym_symtab" value="0x7f390a86b3b0" id="339" addr="0x7f390a86b3b0" />
+                        <attribute name="sym_overname" value="__SWIG_0" id="340" addr="0x7f390a878a10" />
                     </attributelist >
                  
                 </cdecl >
             </namespace >
         </include >
-        <include id="341" addr="0x7f8396afd950" >
-            <attributelist id="342" addr="0x7f8396afd950" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/ModuleXbmcplugin.h" id="343" addr="0x7f8396b0aa10" />
+        <include id="341" addr="0x7f390a86b950" >
+            <attributelist id="342" addr="0x7f390a86b950" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/ModuleXbmcplugin.h" id="343" addr="0x7f390a878a10" />
             </attributelist >
 
-            <namespace id="344" addr="0x7f8396afda10" >
-                <attributelist id="345" addr="0x7f8396afda10" >
-                    <attribute name="sym_name" value="XBMCAddon" id="346" addr="0x7f8396b0aa10" />
-                    <attribute name="name" value="XBMCAddon" id="347" addr="0x7f8396b0aa10" />
-                    <attribute name="sym_previousSibling" value="0x7f8396afd450" id="348" addr="0x7f8396afd450" />
-                    <typescope id="349" addr="0x7f8396b08e90" >
-                        <attributelist id="350" addr="0x7f8396b08e90" >
-                            <attribute name="name" value="XBMCAddon" id="351" addr="0x7f8396b0aa10" />
-                            <typetab id="352" addr="0x7f8396b08ed0" >
-                                <attributelist id="353" addr="0x7f8396b08ed0" >
-                                    <attribute name="String" value="std::string" id="354" addr="0x7f8396b0aa10" />
+            <namespace id="344" addr="0x7f390a86ba10" >
+                <attributelist id="345" addr="0x7f390a86ba10" >
+                    <attribute name="sym_name" value="XBMCAddon" id="346" addr="0x7f390a878a10" />
+                    <attribute name="name" value="XBMCAddon" id="347" addr="0x7f390a878a10" />
+                    <attribute name="sym_previousSibling" value="0x7f390a86b450" id="348" addr="0x7f390a86b450" />
+                    <typescope id="349" addr="0x7f390a876e90" >
+                        <attributelist id="350" addr="0x7f390a876e90" >
+                            <attribute name="name" value="XBMCAddon" id="351" addr="0x7f390a878a10" />
+                            <typetab id="352" addr="0x7f390a876ed0" >
+                                <attributelist id="353" addr="0x7f390a876ed0" >
+                                    <attribute name="String" value="std::string" id="354" addr="0x7f390a878a10" />
                                 </attributelist >
-                                <typetabsitem id="355" addr="0x7f8396b090b0" >
-                                    <attributelist id="356" addr="0x7f8396b090b0" >
+                                <typetabsitem id="355" addr="0x7f390a8770b0" >
+                                    <attributelist id="356" addr="0x7f390a8770b0" >
                                     </attributelist >
                                 </typetabsitem >
                             </typetab >
-                            <attribute name="parent" value="0x7f8396ae6a30" id="357" addr="0x7f8396ae6a30" />
-                            <attribute name="qname" value="XBMCAddon" id="358" addr="0x7f8396b0aa10" />
-                            <attribute name="symtab" value="0x7f8396afd3b0" id="359" addr="0x7f8396afd3b0" />
+                            <attribute name="parent" value="0x7f390a854a30" id="357" addr="0x7f390a854a30" />
+                            <attribute name="qname" value="XBMCAddon" id="358" addr="0x7f390a878a10" />
+                            <attribute name="symtab" value="0x7f390a86b3b0" id="359" addr="0x7f390a86b3b0" />
                         </attributelist >
-                        <typescopesitem id="360" addr="0x7f8396afd370" >
-                            <attributelist id="361" addr="0x7f8396afd370" >
+                        <typescopesitem id="360" addr="0x7f390a86b370" >
+                            <attributelist id="361" addr="0x7f390a86b370" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="362" addr="0x7f8396b08ed0" >
-                            <attributelist id="363" addr="0x7f8396b08ed0" >
-                                <attribute name="String" value="std::string" id="364" addr="0x7f8396b0aa10" />
+                        <typescopesitem id="362" addr="0x7f390a876ed0" >
+                            <attributelist id="363" addr="0x7f390a876ed0" >
+                                <attribute name="String" value="std::string" id="364" addr="0x7f390a878a10" />
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="365" addr="0x7f8396ae6a30" >
-                            <attributelist id="366" addr="0x7f8396ae6a30" >
-                                <attribute name="name" value="" id="367" addr="0x7f8396b0aa10" />
-                                <typetab id="368" addr="0x7f8396ae6a90" >
-                                    <attributelist id="369" addr="0x7f8396ae6a90" >
+                        <typescopesitem id="365" addr="0x7f390a854a30" >
+                            <attributelist id="366" addr="0x7f390a854a30" >
+                                <attribute name="name" value="" id="367" addr="0x7f390a878a10" />
+                                <typetab id="368" addr="0x7f390a854a90" >
+                                    <attributelist id="369" addr="0x7f390a854a90" >
                                     </attributelist >
                                 </typetab >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="370" addr="0x7f8396b08fd0" >
-                            <attributelist id="371" addr="0x7f8396b08fd0" >
+                        <typescopesitem id="370" addr="0x7f390a876fd0" >
+                            <attributelist id="371" addr="0x7f390a876fd0" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="372" addr="0x7f8396afd3b0" >
-                            <attributelist id="373" addr="0x7f8396afd3b0" >
-                                <attribute name="name" value="XBMCAddon" id="374" addr="0x7f8396b0aa10" />
-                                <attribute name="csymtab" value="0x7f8396afd3f0" id="375" addr="0x7f8396afd3f0" />
-                                <attribute name="symtab" value="0x7f8396afd390" id="376" addr="0x7f8396afd390" />
+                        <typescopesitem id="372" addr="0x7f390a86b3b0" >
+                            <attributelist id="373" addr="0x7f390a86b3b0" >
+                                <attribute name="name" value="XBMCAddon" id="374" addr="0x7f390a878a10" />
+                                <attribute name="csymtab" value="0x7f390a86b3f0" id="375" addr="0x7f390a86b3f0" />
+                                <attribute name="symtab" value="0x7f390a86b390" id="376" addr="0x7f390a86b390" />
                             </attributelist >
                         </typescopesitem >
                     </typescope >
-                    <attribute name="symtab" value="0x7f8396afd3b0" id="377" addr="0x7f8396afd3b0" />
-                    <attribute name="sym_symtab" value="0x7f8396ae6950" id="378" addr="0x7f8396ae6950" />
+                    <attribute name="symtab" value="0x7f390a86b3b0" id="377" addr="0x7f390a86b3b0" />
+                    <attribute name="sym_symtab" value="0x7f390a854950" id="378" addr="0x7f390a854950" />
                 </attributelist >
 
-                <namespace id="379" addr="0x7f8396afdb30" >
-                    <attributelist id="380" addr="0x7f8396afdb30" >
-                        <attribute name="sym_name" value="xbmcplugin" id="381" addr="0x7f8396b0aa10" />
-                        <attribute name="name" value="xbmcplugin" id="382" addr="0x7f8396b0aa10" />
-                        <attribute name="feature_knownapitypes" value="XBMCAddon::xbmcgui::ListItem" id="383" addr="0x7f8396b0aa10" />
-                        <typescope id="384" addr="0x7f8396b09290" >
-                            <attributelist id="385" addr="0x7f8396b09290" >
-                                <attribute name="name" value="xbmcplugin" id="386" addr="0x7f8396b0aa10" />
-                                <typetab id="387" addr="0x7f8396b092b0" >
-                                    <attributelist id="388" addr="0x7f8396b092b0" >
+                <namespace id="379" addr="0x7f390a86bb30" >
+                    <attributelist id="380" addr="0x7f390a86bb30" >
+                        <attribute name="sym_name" value="xbmcplugin" id="381" addr="0x7f390a878a10" />
+                        <attribute name="name" value="xbmcplugin" id="382" addr="0x7f390a878a10" />
+                        <attribute name="feature_knownapitypes" value="XBMCAddon::xbmcgui::ListItem" id="383" addr="0x7f390a878a10" />
+                        <typescope id="384" addr="0x7f390a877290" >
+                            <attributelist id="385" addr="0x7f390a877290" >
+                                <attribute name="name" value="xbmcplugin" id="386" addr="0x7f390a878a10" />
+                                <typetab id="387" addr="0x7f390a8772b0" >
+                                    <attributelist id="388" addr="0x7f390a8772b0" >
                                     </attributelist >
                                 </typetab >
-                                <attribute name="parent" value="0x7f8396b08e90" id="389" addr="0x7f8396b08e90" />
-                                <attribute name="qname" value="XBMCAddon::xbmcplugin" id="390" addr="0x7f8396b0aa10" />
-                                <attribute name="symtab" value="0x7f8396afdab0" id="391" addr="0x7f8396afdab0" />
+                                <attribute name="parent" value="0x7f390a876e90" id="389" addr="0x7f390a876e90" />
+                                <attribute name="qname" value="XBMCAddon::xbmcplugin" id="390" addr="0x7f390a878a10" />
+                                <attribute name="symtab" value="0x7f390a86bab0" id="391" addr="0x7f390a86bab0" />
                             </attributelist >
-                            <typescopesitem id="392" addr="0x7f8396afda70" >
-                                <attributelist id="393" addr="0x7f8396afda70" >
+                            <typescopesitem id="392" addr="0x7f390a86ba70" >
+                                <attributelist id="393" addr="0x7f390a86ba70" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="394" addr="0x7f8396b092b0" >
-                                <attributelist id="395" addr="0x7f8396b092b0" >
+                            <typescopesitem id="394" addr="0x7f390a8772b0" >
+                                <attributelist id="395" addr="0x7f390a8772b0" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="396" addr="0x7f8396b08e90" >
-                                <attributelist id="397" addr="0x7f8396b08e90" >
-                                    <attribute name="name" value="XBMCAddon" id="398" addr="0x7f8396b0aa10" />
-                                    <typetab id="399" addr="0x7f8396b08ed0" >
-                                        <attributelist id="400" addr="0x7f8396b08ed0" >
-                                            <attribute name="String" value="std::string" id="401" addr="0x7f8396b0aa10" />
+                            <typescopesitem id="396" addr="0x7f390a876e90" >
+                                <attributelist id="397" addr="0x7f390a876e90" >
+                                    <attribute name="name" value="XBMCAddon" id="398" addr="0x7f390a878a10" />
+                                    <typetab id="399" addr="0x7f390a876ed0" >
+                                        <attributelist id="400" addr="0x7f390a876ed0" >
+                                            <attribute name="String" value="std::string" id="401" addr="0x7f390a878a10" />
                                         </attributelist >
-                                        <typetabsitem id="402" addr="0x7f8396b090b0" >
-                                            <attributelist id="403" addr="0x7f8396b090b0" >
+                                        <typetabsitem id="402" addr="0x7f390a8770b0" >
+                                            <attributelist id="403" addr="0x7f390a8770b0" >
                                             </attributelist >
                                         </typetabsitem >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f8396ae6a30" id="404" addr="0x7f8396ae6a30" />
-                                    <attribute name="qname" value="XBMCAddon" id="405" addr="0x7f8396b0aa10" />
-                                    <attribute name="symtab" value="0x7f8396afd3b0" id="406" addr="0x7f8396afd3b0" />
+                                    <attribute name="parent" value="0x7f390a854a30" id="404" addr="0x7f390a854a30" />
+                                    <attribute name="qname" value="XBMCAddon" id="405" addr="0x7f390a878a10" />
+                                    <attribute name="symtab" value="0x7f390a86b3b0" id="406" addr="0x7f390a86b3b0" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="407" addr="0x7f8396b092d0" >
-                                <attributelist id="408" addr="0x7f8396b092d0" >
+                            <typescopesitem id="407" addr="0x7f390a8772d0" >
+                                <attributelist id="408" addr="0x7f390a8772d0" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="409" addr="0x7f8396afdab0" >
-                                <attributelist id="410" addr="0x7f8396afdab0" >
-                                    <attribute name="name" value="xbmcplugin" id="411" addr="0x7f8396b0aa10" />
-                                    <attribute name="csymtab" value="0x7f8396afdaf0" id="412" addr="0x7f8396afdaf0" />
-                                    <attribute name="symtab" value="0x7f8396afda90" id="413" addr="0x7f8396afda90" />
+                            <typescopesitem id="409" addr="0x7f390a86bab0" >
+                                <attributelist id="410" addr="0x7f390a86bab0" >
+                                    <attribute name="name" value="xbmcplugin" id="411" addr="0x7f390a878a10" />
+                                    <attribute name="csymtab" value="0x7f390a86baf0" id="412" addr="0x7f390a86baf0" />
+                                    <attribute name="symtab" value="0x7f390a86ba90" id="413" addr="0x7f390a86ba90" />
                                 </attributelist >
                             </typescopesitem >
                         </typescope >
-                        <attribute name="symtab" value="0x7f8396afdab0" id="414" addr="0x7f8396afdab0" />
-                        <attribute name="sym_symtab" value="0x7f8396afd3b0" id="415" addr="0x7f8396afd3b0" />
-                        <attribute name="sym_overname" value="__SWIG_0" id="416" addr="0x7f8396b0aa10" />
+                        <attribute name="symtab" value="0x7f390a86bab0" id="414" addr="0x7f390a86bab0" />
+                        <attribute name="sym_symtab" value="0x7f390a86b3b0" id="415" addr="0x7f390a86b3b0" />
+                        <attribute name="sym_overname" value="__SWIG_0" id="416" addr="0x7f390a878a10" />
                     </attributelist >
 
-                    <cdecl id="417" addr="0x7f8396afe2b0" >
-                        <attributelist id="418" addr="0x7f8396afe2b0" >
-                            <attribute name="name" value="XBMCAddon::xbmcplugin::addDirectoryItem" id="419" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="420" addr="0x7f8396afdab0" />
-                            <attribute name="sym_nextSibling" value="0x7f8396afe5b0" id="421" addr="0x7f8396afe5b0" />
-                            <attribute name="csym_nextSibling" value="0x7f8396afe5b0" id="422" addr="0x7f8396afe5b0" />
-                            <attribute name="kind" value="function" id="423" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_name" value="addDirectoryItem" id="424" addr="0x7f8396b0aa10" />
-                            <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem,bool,int)." id="425" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_overloaded" value="0x7f8396afe2b0" id="426" addr="0x7f8396afe2b0" />
-                            <parmlist id="427" addr="0x7f8396afdc90" >
+                    <cdecl id="417" addr="0x7f390a86c2b0" >
+                        <attributelist id="418" addr="0x7f390a86c2b0" >
+                            <attribute name="name" value="XBMCAddon::xbmcplugin::addDirectoryItem" id="419" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="420" addr="0x7f390a86bab0" />
+                            <attribute name="sym_nextSibling" value="0x7f390a86c5b0" id="421" addr="0x7f390a86c5b0" />
+                            <attribute name="csym_nextSibling" value="0x7f390a86c5b0" id="422" addr="0x7f390a86c5b0" />
+                            <attribute name="kind" value="function" id="423" addr="0x7f390a878a10" />
+                            <attribute name="sym_name" value="addDirectoryItem" id="424" addr="0x7f390a878a10" />
+                            <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem,bool,int)." id="425" addr="0x7f390a878a10" />
+                            <attribute name="sym_overloaded" value="0x7f390a86c2b0" id="426" addr="0x7f390a86c2b0" />
+                            <parmlist id="427" addr="0x7f390a86bc90" >
                                 <parm id="428">
-                                    <attributelist id="429" addr="0x7f8396afdc90" >
-                                        <attribute name="name" value="handle" id="430" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="int" id="431" addr="0x7f8396b0aa10" />
+                                    <attributelist id="429" addr="0x7f390a86bc90" >
+                                        <attribute name="name" value="handle" id="430" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="int" id="431" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="432">
-                                    <attributelist id="433" addr="0x7f8396afddd0" >
-                                        <attribute name="name" value="url" id="434" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="435" addr="0x7f8396b0aa10" />
+                                    <attributelist id="433" addr="0x7f390a86bdd0" >
+                                        <attribute name="name" value="url" id="434" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="435" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="436">
-                                    <attributelist id="437" addr="0x7f8396afdf50" >
-                                        <attribute name="name" value="listitem" id="438" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::ListItem" id="439" addr="0x7f8396b0aa10" />
+                                    <attributelist id="437" addr="0x7f390a86bf50" >
+                                        <attribute name="name" value="listitem" id="438" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::ListItem" id="439" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="440">
-                                    <attributelist id="441" addr="0x7f8396afe090" >
-                                        <attribute name="name" value="isFolder" id="442" addr="0x7f8396b0aa10" />
-                                        <attribute name="value" value="false" id="443" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="bool" id="444" addr="0x7f8396b0aa10" />
+                                    <attributelist id="441" addr="0x7f390a86c090" >
+                                        <attribute name="name" value="isFolder" id="442" addr="0x7f390a878a10" />
+                                        <attribute name="value" value="false" id="443" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="bool" id="444" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="445">
-                                    <attributelist id="446" addr="0x7f8396afe1f0" >
-                                        <attribute name="name" value="totalItems" id="447" addr="0x7f8396b0aa10" />
-                                        <attribute name="value" value="0" id="448" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="int" id="449" addr="0x7f8396b0aa10" />
+                                    <attributelist id="446" addr="0x7f390a86c1f0" >
+                                        <attribute name="name" value="totalItems" id="447" addr="0x7f390a878a10" />
+                                        <attribute name="value" value="0" id="448" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="int" id="449" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="type" value="bool" id="450" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="451" addr="0x7f8396b0aa10" />
+                            <attribute name="type" value="bool" id="450" addr="0x7f390a878a10" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="451" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="452" addr="0x7f8396afe5b0" >
-                        <attributelist id="453" addr="0x7f8396afe5b0" >
-                            <attribute name="name" value="XBMCAddon::xbmcplugin::addDirectoryItem" id="454" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="455" addr="0x7f8396afdab0" />
-                            <attribute name="sym_nextSibling" value="0x7f8396afe8b0" id="456" addr="0x7f8396afe8b0" />
-                            <attribute name="csym_nextSibling" value="0x7f8396afe8b0" id="457" addr="0x7f8396afe8b0" />
-                            <attribute name="sym_previousSibling" value="0x7f8396afe2b0" id="458" addr="0x7f8396afe2b0" />
-                            <attribute name="kind" value="function" id="459" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_name" value="addDirectoryItem" id="460" addr="0x7f8396b0aa10" />
-                            <attribute name="defaultargs" value="0x7f8396afe2b0" id="461" addr="0x7f8396afe2b0" />
-                            <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem,bool)." id="462" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_overloaded" value="0x7f8396afe2b0" id="463" addr="0x7f8396afe2b0" />
-                            <parmlist id="464" addr="0x7f8396afe310" >
+                    <cdecl id="452" addr="0x7f390a86c5b0" >
+                        <attributelist id="453" addr="0x7f390a86c5b0" >
+                            <attribute name="name" value="XBMCAddon::xbmcplugin::addDirectoryItem" id="454" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="455" addr="0x7f390a86bab0" />
+                            <attribute name="sym_nextSibling" value="0x7f390a86c8b0" id="456" addr="0x7f390a86c8b0" />
+                            <attribute name="csym_nextSibling" value="0x7f390a86c8b0" id="457" addr="0x7f390a86c8b0" />
+                            <attribute name="sym_previousSibling" value="0x7f390a86c2b0" id="458" addr="0x7f390a86c2b0" />
+                            <attribute name="kind" value="function" id="459" addr="0x7f390a878a10" />
+                            <attribute name="sym_name" value="addDirectoryItem" id="460" addr="0x7f390a878a10" />
+                            <attribute name="defaultargs" value="0x7f390a86c2b0" id="461" addr="0x7f390a86c2b0" />
+                            <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem,bool)." id="462" addr="0x7f390a878a10" />
+                            <attribute name="sym_overloaded" value="0x7f390a86c2b0" id="463" addr="0x7f390a86c2b0" />
+                            <parmlist id="464" addr="0x7f390a86c310" >
                                 <parm id="465">
-                                    <attributelist id="466" addr="0x7f8396afe310" >
-                                        <attribute name="name" value="handle" id="467" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="int" id="468" addr="0x7f8396b0aa10" />
+                                    <attributelist id="466" addr="0x7f390a86c310" >
+                                        <attribute name="name" value="handle" id="467" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="int" id="468" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="469">
-                                    <attributelist id="470" addr="0x7f8396afe3f0" >
-                                        <attribute name="name" value="url" id="471" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="472" addr="0x7f8396b0aa10" />
+                                    <attributelist id="470" addr="0x7f390a86c3f0" >
+                                        <attribute name="name" value="url" id="471" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="472" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="473">
-                                    <attributelist id="474" addr="0x7f8396afe470" >
-                                        <attribute name="name" value="listitem" id="475" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::ListItem" id="476" addr="0x7f8396b0aa10" />
+                                    <attributelist id="474" addr="0x7f390a86c470" >
+                                        <attribute name="name" value="listitem" id="475" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::ListItem" id="476" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="477">
-                                    <attributelist id="478" addr="0x7f8396afe4f0" >
-                                        <attribute name="name" value="isFolder" id="479" addr="0x7f8396b0aa10" />
-                                        <attribute name="value" value="false" id="480" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="bool" id="481" addr="0x7f8396b0aa10" />
+                                    <attributelist id="478" addr="0x7f390a86c4f0" >
+                                        <attribute name="name" value="isFolder" id="479" addr="0x7f390a878a10" />
+                                        <attribute name="value" value="false" id="480" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="bool" id="481" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="type" value="bool" id="482" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_overname" value="__SWIG_1" id="483" addr="0x7f8396b0aa10" />
+                            <attribute name="type" value="bool" id="482" addr="0x7f390a878a10" />
+                            <attribute name="sym_overname" value="__SWIG_1" id="483" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="484" addr="0x7f8396afe8b0" >
-                        <attributelist id="485" addr="0x7f8396afe8b0" >
-                            <attribute name="name" value="XBMCAddon::xbmcplugin::addDirectoryItem" id="486" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="487" addr="0x7f8396afdab0" />
-                            <attribute name="sym_previousSibling" value="0x7f8396afe5b0" id="488" addr="0x7f8396afe5b0" />
-                            <attribute name="kind" value="function" id="489" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_name" value="addDirectoryItem" id="490" addr="0x7f8396b0aa10" />
-                            <attribute name="defaultargs" value="0x7f8396afe2b0" id="491" addr="0x7f8396afe2b0" />
-                            <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)." id="492" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_overloaded" value="0x7f8396afe2b0" id="493" addr="0x7f8396afe2b0" />
-                            <parmlist id="494" addr="0x7f8396afe710" >
+                    <cdecl id="484" addr="0x7f390a86c8b0" >
+                        <attributelist id="485" addr="0x7f390a86c8b0" >
+                            <attribute name="name" value="XBMCAddon::xbmcplugin::addDirectoryItem" id="486" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="487" addr="0x7f390a86bab0" />
+                            <attribute name="sym_previousSibling" value="0x7f390a86c5b0" id="488" addr="0x7f390a86c5b0" />
+                            <attribute name="kind" value="function" id="489" addr="0x7f390a878a10" />
+                            <attribute name="sym_name" value="addDirectoryItem" id="490" addr="0x7f390a878a10" />
+                            <attribute name="defaultargs" value="0x7f390a86c2b0" id="491" addr="0x7f390a86c2b0" />
+                            <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem)." id="492" addr="0x7f390a878a10" />
+                            <attribute name="sym_overloaded" value="0x7f390a86c2b0" id="493" addr="0x7f390a86c2b0" />
+                            <parmlist id="494" addr="0x7f390a86c710" >
                                 <parm id="495">
-                                    <attributelist id="496" addr="0x7f8396afe710" >
-                                        <attribute name="name" value="handle" id="497" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="int" id="498" addr="0x7f8396b0aa10" />
+                                    <attributelist id="496" addr="0x7f390a86c710" >
+                                        <attribute name="name" value="handle" id="497" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="int" id="498" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="499">
-                                    <attributelist id="500" addr="0x7f8396afe790" >
-                                        <attribute name="name" value="url" id="501" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="502" addr="0x7f8396b0aa10" />
+                                    <attributelist id="500" addr="0x7f390a86c790" >
+                                        <attribute name="name" value="url" id="501" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="502" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="503">
-                                    <attributelist id="504" addr="0x7f8396afe810" >
-                                        <attribute name="name" value="listitem" id="505" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::ListItem" id="506" addr="0x7f8396b0aa10" />
+                                    <attributelist id="504" addr="0x7f390a86c810" >
+                                        <attribute name="name" value="listitem" id="505" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::ListItem" id="506" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="type" value="bool" id="507" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_overname" value="__SWIG_2" id="508" addr="0x7f8396b0aa10" />
+                            <attribute name="type" value="bool" id="507" addr="0x7f390a878a10" />
+                            <attribute name="sym_overname" value="__SWIG_2" id="508" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="509" addr="0x7f8396aff2b0" >
-                        <attributelist id="510" addr="0x7f8396aff2b0" >
-                            <attribute name="name" value="XBMCAddon::xbmcplugin::addDirectoryItems" id="511" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="512" addr="0x7f8396afdab0" />
-                            <attribute name="sym_nextSibling" value="0x7f8396aff490" id="513" addr="0x7f8396aff490" />
-                            <attribute name="csym_nextSibling" value="0x7f8396aff490" id="514" addr="0x7f8396aff490" />
-                            <attribute name="kind" value="function" id="515" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_name" value="addDirectoryItems" id="516" addr="0x7f8396b0aa10" />
-                            <attribute name="decl" value="f(int,r.q(const).std::vector&lt;(Tuple&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem,bool)>)>,int)." id="517" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_overloaded" value="0x7f8396aff2b0" id="518" addr="0x7f8396aff2b0" />
-                            <parmlist id="519" addr="0x7f8396afea90" >
+                    <cdecl id="509" addr="0x7f390a86d2b0" >
+                        <attributelist id="510" addr="0x7f390a86d2b0" >
+                            <attribute name="name" value="XBMCAddon::xbmcplugin::addDirectoryItems" id="511" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="512" addr="0x7f390a86bab0" />
+                            <attribute name="sym_nextSibling" value="0x7f390a86d490" id="513" addr="0x7f390a86d490" />
+                            <attribute name="csym_nextSibling" value="0x7f390a86d490" id="514" addr="0x7f390a86d490" />
+                            <attribute name="kind" value="function" id="515" addr="0x7f390a878a10" />
+                            <attribute name="sym_name" value="addDirectoryItems" id="516" addr="0x7f390a878a10" />
+                            <attribute name="decl" value="f(int,r.q(const).std::vector&lt;(Tuple&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem,bool)>)>,int)." id="517" addr="0x7f390a878a10" />
+                            <attribute name="sym_overloaded" value="0x7f390a86d2b0" id="518" addr="0x7f390a86d2b0" />
+                            <parmlist id="519" addr="0x7f390a86ca90" >
                                 <parm id="520">
-                                    <attributelist id="521" addr="0x7f8396afea90" >
-                                        <attribute name="name" value="handle" id="522" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="int" id="523" addr="0x7f8396b0aa10" />
+                                    <attributelist id="521" addr="0x7f390a86ca90" >
+                                        <attribute name="name" value="handle" id="522" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="int" id="523" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="524">
-                                    <attributelist id="525" addr="0x7f8396aff1f0" >
-                                        <attribute name="name" value="items" id="526" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="r.q(const).std::vector&lt;(Tuple&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem,bool)>)>" id="527" addr="0x7f8396b0aa10" />
+                                    <attributelist id="525" addr="0x7f390a86d1f0" >
+                                        <attribute name="name" value="items" id="526" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="r.q(const).std::vector&lt;(Tuple&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem,bool)>)>" id="527" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="528">
-                                    <attributelist id="529" addr="0x7f8396aff110" >
-                                        <attribute name="name" value="totalItems" id="530" addr="0x7f8396b0aa10" />
-                                        <attribute name="value" value="0" id="531" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="int" id="532" addr="0x7f8396b0aa10" />
+                                    <attributelist id="529" addr="0x7f390a86d110" >
+                                        <attribute name="name" value="totalItems" id="530" addr="0x7f390a878a10" />
+                                        <attribute name="value" value="0" id="531" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="int" id="532" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="type" value="bool" id="533" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="534" addr="0x7f8396b0aa10" />
+                            <attribute name="type" value="bool" id="533" addr="0x7f390a878a10" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="534" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="535" addr="0x7f8396aff490" >
-                        <attributelist id="536" addr="0x7f8396aff490" >
-                            <attribute name="name" value="XBMCAddon::xbmcplugin::addDirectoryItems" id="537" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="538" addr="0x7f8396afdab0" />
-                            <attribute name="sym_previousSibling" value="0x7f8396aff2b0" id="539" addr="0x7f8396aff2b0" />
-                            <attribute name="kind" value="function" id="540" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_name" value="addDirectoryItems" id="541" addr="0x7f8396b0aa10" />
-                            <attribute name="defaultargs" value="0x7f8396aff2b0" id="542" addr="0x7f8396aff2b0" />
-                            <attribute name="decl" value="f(int,r.q(const).std::vector&lt;(Tuple&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem,bool)>)>)." id="543" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_overloaded" value="0x7f8396aff2b0" id="544" addr="0x7f8396aff2b0" />
-                            <parmlist id="545" addr="0x7f8396aff310" >
+                    <cdecl id="535" addr="0x7f390a86d490" >
+                        <attributelist id="536" addr="0x7f390a86d490" >
+                            <attribute name="name" value="XBMCAddon::xbmcplugin::addDirectoryItems" id="537" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="538" addr="0x7f390a86bab0" />
+                            <attribute name="sym_previousSibling" value="0x7f390a86d2b0" id="539" addr="0x7f390a86d2b0" />
+                            <attribute name="kind" value="function" id="540" addr="0x7f390a878a10" />
+                            <attribute name="sym_name" value="addDirectoryItems" id="541" addr="0x7f390a878a10" />
+                            <attribute name="defaultargs" value="0x7f390a86d2b0" id="542" addr="0x7f390a86d2b0" />
+                            <attribute name="decl" value="f(int,r.q(const).std::vector&lt;(Tuple&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem,bool)>)>)." id="543" addr="0x7f390a878a10" />
+                            <attribute name="sym_overloaded" value="0x7f390a86d2b0" id="544" addr="0x7f390a86d2b0" />
+                            <parmlist id="545" addr="0x7f390a86d310" >
                                 <parm id="546">
-                                    <attributelist id="547" addr="0x7f8396aff310" >
-                                        <attribute name="name" value="handle" id="548" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="int" id="549" addr="0x7f8396b0aa10" />
+                                    <attributelist id="547" addr="0x7f390a86d310" >
+                                        <attribute name="name" value="handle" id="548" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="int" id="549" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="550">
-                                    <attributelist id="551" addr="0x7f8396aff3f0" >
-                                        <attribute name="name" value="items" id="552" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="r.q(const).std::vector&lt;(Tuple&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem,bool)>)>" id="553" addr="0x7f8396b0aa10" />
+                                    <attributelist id="551" addr="0x7f390a86d3f0" >
+                                        <attribute name="name" value="items" id="552" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="r.q(const).std::vector&lt;(Tuple&lt;(XBMCAddon::String,p.q(const).XBMCAddon::xbmcgui::ListItem,bool)>)>" id="553" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="type" value="bool" id="554" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_overname" value="__SWIG_1" id="555" addr="0x7f8396b0aa10" />
+                            <attribute name="type" value="bool" id="554" addr="0x7f390a878a10" />
+                            <attribute name="sym_overname" value="__SWIG_1" id="555" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="556" addr="0x7f8396affaf0" >
-                        <attributelist id="557" addr="0x7f8396affaf0" >
-                            <attribute name="name" value="XBMCAddon::xbmcplugin::endOfDirectory" id="558" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="559" addr="0x7f8396afdab0" />
-                            <attribute name="sym_nextSibling" value="0x7f8396affd90" id="560" addr="0x7f8396affd90" />
-                            <attribute name="csym_nextSibling" value="0x7f8396affd90" id="561" addr="0x7f8396affd90" />
-                            <attribute name="kind" value="function" id="562" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_name" value="endOfDirectory" id="563" addr="0x7f8396b0aa10" />
-                            <attribute name="decl" value="f(int,bool,bool,bool)." id="564" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_overloaded" value="0x7f8396affaf0" id="565" addr="0x7f8396affaf0" />
-                            <parmlist id="566" addr="0x7f8396aff670" >
+                    <cdecl id="556" addr="0x7f390a86daf0" >
+                        <attributelist id="557" addr="0x7f390a86daf0" >
+                            <attribute name="name" value="XBMCAddon::xbmcplugin::endOfDirectory" id="558" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="559" addr="0x7f390a86bab0" />
+                            <attribute name="sym_nextSibling" value="0x7f390a86dd90" id="560" addr="0x7f390a86dd90" />
+                            <attribute name="csym_nextSibling" value="0x7f390a86dd90" id="561" addr="0x7f390a86dd90" />
+                            <attribute name="kind" value="function" id="562" addr="0x7f390a878a10" />
+                            <attribute name="sym_name" value="endOfDirectory" id="563" addr="0x7f390a878a10" />
+                            <attribute name="decl" value="f(int,bool,bool,bool)." id="564" addr="0x7f390a878a10" />
+                            <attribute name="sym_overloaded" value="0x7f390a86daf0" id="565" addr="0x7f390a86daf0" />
+                            <parmlist id="566" addr="0x7f390a86d670" >
                                 <parm id="567">
-                                    <attributelist id="568" addr="0x7f8396aff670" >
-                                        <attribute name="name" value="handle" id="569" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="int" id="570" addr="0x7f8396b0aa10" />
+                                    <attributelist id="568" addr="0x7f390a86d670" >
+                                        <attribute name="name" value="handle" id="569" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="int" id="570" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="571">
-                                    <attributelist id="572" addr="0x7f8396aff7b0" >
-                                        <attribute name="name" value="succeeded" id="573" addr="0x7f8396b0aa10" />
-                                        <attribute name="value" value="true" id="574" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="bool" id="575" addr="0x7f8396b0aa10" />
+                                    <attributelist id="572" addr="0x7f390a86d7b0" >
+                                        <attribute name="name" value="succeeded" id="573" addr="0x7f390a878a10" />
+                                        <attribute name="value" value="true" id="574" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="bool" id="575" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="576">
-                                    <attributelist id="577" addr="0x7f8396aff8f0" >
-                                        <attribute name="name" value="updateListing" id="578" addr="0x7f8396b0aa10" />
-                                        <attribute name="value" value="false" id="579" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="bool" id="580" addr="0x7f8396b0aa10" />
+                                    <attributelist id="577" addr="0x7f390a86d8f0" >
+                                        <attribute name="name" value="updateListing" id="578" addr="0x7f390a878a10" />
+                                        <attribute name="value" value="false" id="579" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="bool" id="580" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="581">
-                                    <attributelist id="582" addr="0x7f8396affa30" >
-                                        <attribute name="name" value="cacheToDisc" id="583" addr="0x7f8396b0aa10" />
-                                        <attribute name="value" value="true" id="584" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="bool" id="585" addr="0x7f8396b0aa10" />
+                                    <attributelist id="582" addr="0x7f390a86da30" >
+                                        <attribute name="name" value="cacheToDisc" id="583" addr="0x7f390a878a10" />
+                                        <attribute name="value" value="true" id="584" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="bool" id="585" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="type" value="void" id="586" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="587" addr="0x7f8396b0aa10" />
+                            <attribute name="type" value="void" id="586" addr="0x7f390a878a10" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="587" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="588" addr="0x7f8396affd90" >
-                        <attributelist id="589" addr="0x7f8396affd90" >
-                            <attribute name="name" value="XBMCAddon::xbmcplugin::endOfDirectory" id="590" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="591" addr="0x7f8396afdab0" />
-                            <attribute name="sym_nextSibling" value="0x7f8396afff90" id="592" addr="0x7f8396afff90" />
-                            <attribute name="csym_nextSibling" value="0x7f8396afff90" id="593" addr="0x7f8396afff90" />
-                            <attribute name="sym_previousSibling" value="0x7f8396affaf0" id="594" addr="0x7f8396affaf0" />
-                            <attribute name="kind" value="function" id="595" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_name" value="endOfDirectory" id="596" addr="0x7f8396b0aa10" />
-                            <attribute name="defaultargs" value="0x7f8396affaf0" id="597" addr="0x7f8396affaf0" />
-                            <attribute name="decl" value="f(int,bool,bool)." id="598" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_overloaded" value="0x7f8396affaf0" id="599" addr="0x7f8396affaf0" />
-                            <parmlist id="600" addr="0x7f8396affb50" >
+                    <cdecl id="588" addr="0x7f390a86dd90" >
+                        <attributelist id="589" addr="0x7f390a86dd90" >
+                            <attribute name="name" value="XBMCAddon::xbmcplugin::endOfDirectory" id="590" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="591" addr="0x7f390a86bab0" />
+                            <attribute name="sym_nextSibling" value="0x7f390a86df90" id="592" addr="0x7f390a86df90" />
+                            <attribute name="csym_nextSibling" value="0x7f390a86df90" id="593" addr="0x7f390a86df90" />
+                            <attribute name="sym_previousSibling" value="0x7f390a86daf0" id="594" addr="0x7f390a86daf0" />
+                            <attribute name="kind" value="function" id="595" addr="0x7f390a878a10" />
+                            <attribute name="sym_name" value="endOfDirectory" id="596" addr="0x7f390a878a10" />
+                            <attribute name="defaultargs" value="0x7f390a86daf0" id="597" addr="0x7f390a86daf0" />
+                            <attribute name="decl" value="f(int,bool,bool)." id="598" addr="0x7f390a878a10" />
+                            <attribute name="sym_overloaded" value="0x7f390a86daf0" id="599" addr="0x7f390a86daf0" />
+                            <parmlist id="600" addr="0x7f390a86db50" >
                                 <parm id="601">
-                                    <attributelist id="602" addr="0x7f8396affb50" >
-                                        <attribute name="name" value="handle" id="603" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="int" id="604" addr="0x7f8396b0aa10" />
+                                    <attributelist id="602" addr="0x7f390a86db50" >
+                                        <attribute name="name" value="handle" id="603" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="int" id="604" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="605">
-                                    <attributelist id="606" addr="0x7f8396affc30" >
-                                        <attribute name="name" value="succeeded" id="607" addr="0x7f8396b0aa10" />
-                                        <attribute name="value" value="true" id="608" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="bool" id="609" addr="0x7f8396b0aa10" />
+                                    <attributelist id="606" addr="0x7f390a86dc30" >
+                                        <attribute name="name" value="succeeded" id="607" addr="0x7f390a878a10" />
+                                        <attribute name="value" value="true" id="608" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="bool" id="609" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="610">
-                                    <attributelist id="611" addr="0x7f8396affcd0" >
-                                        <attribute name="name" value="updateListing" id="612" addr="0x7f8396b0aa10" />
-                                        <attribute name="value" value="false" id="613" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="bool" id="614" addr="0x7f8396b0aa10" />
+                                    <attributelist id="611" addr="0x7f390a86dcd0" >
+                                        <attribute name="name" value="updateListing" id="612" addr="0x7f390a878a10" />
+                                        <attribute name="value" value="false" id="613" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="bool" id="614" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="type" value="void" id="615" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_overname" value="__SWIG_1" id="616" addr="0x7f8396b0aa10" />
+                            <attribute name="type" value="void" id="615" addr="0x7f390a878a10" />
+                            <attribute name="sym_overname" value="__SWIG_1" id="616" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="617" addr="0x7f8396afff90" >
-                        <attributelist id="618" addr="0x7f8396afff90" >
-                            <attribute name="name" value="XBMCAddon::xbmcplugin::endOfDirectory" id="619" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="620" addr="0x7f8396afdab0" />
-                            <attribute name="sym_nextSibling" value="0x7f8396b000f0" id="621" addr="0x7f8396b000f0" />
-                            <attribute name="csym_nextSibling" value="0x7f8396b000f0" id="622" addr="0x7f8396b000f0" />
-                            <attribute name="sym_previousSibling" value="0x7f8396affd90" id="623" addr="0x7f8396affd90" />
-                            <attribute name="kind" value="function" id="624" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_name" value="endOfDirectory" id="625" addr="0x7f8396b0aa10" />
-                            <attribute name="defaultargs" value="0x7f8396affaf0" id="626" addr="0x7f8396affaf0" />
-                            <attribute name="decl" value="f(int,bool)." id="627" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_overloaded" value="0x7f8396affaf0" id="628" addr="0x7f8396affaf0" />
-                            <parmlist id="629" addr="0x7f8396affdf0" >
+                    <cdecl id="617" addr="0x7f390a86df90" >
+                        <attributelist id="618" addr="0x7f390a86df90" >
+                            <attribute name="name" value="XBMCAddon::xbmcplugin::endOfDirectory" id="619" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="620" addr="0x7f390a86bab0" />
+                            <attribute name="sym_nextSibling" value="0x7f390a86e0f0" id="621" addr="0x7f390a86e0f0" />
+                            <attribute name="csym_nextSibling" value="0x7f390a86e0f0" id="622" addr="0x7f390a86e0f0" />
+                            <attribute name="sym_previousSibling" value="0x7f390a86dd90" id="623" addr="0x7f390a86dd90" />
+                            <attribute name="kind" value="function" id="624" addr="0x7f390a878a10" />
+                            <attribute name="sym_name" value="endOfDirectory" id="625" addr="0x7f390a878a10" />
+                            <attribute name="defaultargs" value="0x7f390a86daf0" id="626" addr="0x7f390a86daf0" />
+                            <attribute name="decl" value="f(int,bool)." id="627" addr="0x7f390a878a10" />
+                            <attribute name="sym_overloaded" value="0x7f390a86daf0" id="628" addr="0x7f390a86daf0" />
+                            <parmlist id="629" addr="0x7f390a86ddf0" >
                                 <parm id="630">
-                                    <attributelist id="631" addr="0x7f8396affdf0" >
-                                        <attribute name="name" value="handle" id="632" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="int" id="633" addr="0x7f8396b0aa10" />
+                                    <attributelist id="631" addr="0x7f390a86ddf0" >
+                                        <attribute name="name" value="handle" id="632" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="int" id="633" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="634">
-                                    <attributelist id="635" addr="0x7f8396affed0" >
-                                        <attribute name="name" value="succeeded" id="636" addr="0x7f8396b0aa10" />
-                                        <attribute name="value" value="true" id="637" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="bool" id="638" addr="0x7f8396b0aa10" />
+                                    <attributelist id="635" addr="0x7f390a86ded0" >
+                                        <attribute name="name" value="succeeded" id="636" addr="0x7f390a878a10" />
+                                        <attribute name="value" value="true" id="637" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="bool" id="638" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="type" value="void" id="639" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_overname" value="__SWIG_2" id="640" addr="0x7f8396b0aa10" />
+                            <attribute name="type" value="void" id="639" addr="0x7f390a878a10" />
+                            <attribute name="sym_overname" value="__SWIG_2" id="640" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="641" addr="0x7f8396b000f0" >
-                        <attributelist id="642" addr="0x7f8396b000f0" >
-                            <attribute name="name" value="XBMCAddon::xbmcplugin::endOfDirectory" id="643" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="644" addr="0x7f8396afdab0" />
-                            <attribute name="sym_previousSibling" value="0x7f8396afff90" id="645" addr="0x7f8396afff90" />
-                            <attribute name="kind" value="function" id="646" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_name" value="endOfDirectory" id="647" addr="0x7f8396b0aa10" />
-                            <attribute name="defaultargs" value="0x7f8396affaf0" id="648" addr="0x7f8396affaf0" />
-                            <attribute name="decl" value="f(int)." id="649" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_overloaded" value="0x7f8396affaf0" id="650" addr="0x7f8396affaf0" />
-                            <parmlist id="651" addr="0x7f8396affff0" >
+                    <cdecl id="641" addr="0x7f390a86e0f0" >
+                        <attributelist id="642" addr="0x7f390a86e0f0" >
+                            <attribute name="name" value="XBMCAddon::xbmcplugin::endOfDirectory" id="643" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="644" addr="0x7f390a86bab0" />
+                            <attribute name="sym_previousSibling" value="0x7f390a86df90" id="645" addr="0x7f390a86df90" />
+                            <attribute name="kind" value="function" id="646" addr="0x7f390a878a10" />
+                            <attribute name="sym_name" value="endOfDirectory" id="647" addr="0x7f390a878a10" />
+                            <attribute name="defaultargs" value="0x7f390a86daf0" id="648" addr="0x7f390a86daf0" />
+                            <attribute name="decl" value="f(int)." id="649" addr="0x7f390a878a10" />
+                            <attribute name="sym_overloaded" value="0x7f390a86daf0" id="650" addr="0x7f390a86daf0" />
+                            <parmlist id="651" addr="0x7f390a86dff0" >
                                 <parm id="652">
-                                    <attributelist id="653" addr="0x7f8396affff0" >
-                                        <attribute name="name" value="handle" id="654" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="int" id="655" addr="0x7f8396b0aa10" />
+                                    <attributelist id="653" addr="0x7f390a86dff0" >
+                                        <attribute name="name" value="handle" id="654" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="int" id="655" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="type" value="void" id="656" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_overname" value="__SWIG_3" id="657" addr="0x7f8396b0aa10" />
+                            <attribute name="type" value="void" id="656" addr="0x7f390a878a10" />
+                            <attribute name="sym_overname" value="__SWIG_3" id="657" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="658" addr="0x7f8396b00610" >
-                        <attributelist id="659" addr="0x7f8396b00610" >
-                            <attribute name="sym_name" value="setResolvedUrl" id="660" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="XBMCAddon::xbmcplugin::setResolvedUrl" id="661" addr="0x7f8396b0aa10" />
-                            <attribute name="decl" value="f(int,bool,p.q(const).XBMCAddon::xbmcgui::ListItem)." id="662" addr="0x7f8396b0aa10" />
-                            <parmlist id="663" addr="0x7f8396b002d0" >
+                    <cdecl id="658" addr="0x7f390a86e610" >
+                        <attributelist id="659" addr="0x7f390a86e610" >
+                            <attribute name="sym_name" value="setResolvedUrl" id="660" addr="0x7f390a878a10" />
+                            <attribute name="name" value="XBMCAddon::xbmcplugin::setResolvedUrl" id="661" addr="0x7f390a878a10" />
+                            <attribute name="decl" value="f(int,bool,p.q(const).XBMCAddon::xbmcgui::ListItem)." id="662" addr="0x7f390a878a10" />
+                            <parmlist id="663" addr="0x7f390a86e2d0" >
                                 <parm id="664">
-                                    <attributelist id="665" addr="0x7f8396b002d0" >
-                                        <attribute name="name" value="handle" id="666" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="int" id="667" addr="0x7f8396b0aa10" />
+                                    <attributelist id="665" addr="0x7f390a86e2d0" >
+                                        <attribute name="name" value="handle" id="666" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="int" id="667" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="668">
-                                    <attributelist id="669" addr="0x7f8396b003d0" >
-                                        <attribute name="name" value="succeeded" id="670" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="bool" id="671" addr="0x7f8396b0aa10" />
+                                    <attributelist id="669" addr="0x7f390a86e3d0" >
+                                        <attribute name="name" value="succeeded" id="670" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="bool" id="671" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="672">
-                                    <attributelist id="673" addr="0x7f8396b00550" >
-                                        <attribute name="name" value="listitem" id="674" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::ListItem" id="675" addr="0x7f8396b0aa10" />
+                                    <attributelist id="673" addr="0x7f390a86e550" >
+                                        <attribute name="name" value="listitem" id="674" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="p.q(const).XBMCAddon::xbmcgui::ListItem" id="675" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="kind" value="function" id="676" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="void" id="677" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="678" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="679" addr="0x7f8396b0aa10" />
+                            <attribute name="kind" value="function" id="676" addr="0x7f390a878a10" />
+                            <attribute name="type" value="void" id="677" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="678" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="679" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="680" addr="0x7f8396b00b70" >
-                        <attributelist id="681" addr="0x7f8396b00b70" >
-                            <attribute name="name" value="XBMCAddon::xbmcplugin::addSortMethod" id="682" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="683" addr="0x7f8396afdab0" />
-                            <attribute name="sym_nextSibling" value="0x7f8396b00d50" id="684" addr="0x7f8396b00d50" />
-                            <attribute name="csym_nextSibling" value="0x7f8396b00d50" id="685" addr="0x7f8396b00d50" />
-                            <attribute name="kind" value="function" id="686" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_name" value="addSortMethod" id="687" addr="0x7f8396b0aa10" />
-                            <attribute name="decl" value="f(int,int,r.q(const).XBMCAddon::String)." id="688" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_overloaded" value="0x7f8396b00b70" id="689" addr="0x7f8396b00b70" />
-                            <parmlist id="690" addr="0x7f8396b007f0" >
+                    <cdecl id="680" addr="0x7f390a86eb70" >
+                        <attributelist id="681" addr="0x7f390a86eb70" >
+                            <attribute name="name" value="XBMCAddon::xbmcplugin::addSortMethod" id="682" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="683" addr="0x7f390a86bab0" />
+                            <attribute name="sym_nextSibling" value="0x7f390a86ed50" id="684" addr="0x7f390a86ed50" />
+                            <attribute name="csym_nextSibling" value="0x7f390a86ed50" id="685" addr="0x7f390a86ed50" />
+                            <attribute name="kind" value="function" id="686" addr="0x7f390a878a10" />
+                            <attribute name="sym_name" value="addSortMethod" id="687" addr="0x7f390a878a10" />
+                            <attribute name="decl" value="f(int,int,r.q(const).XBMCAddon::String)." id="688" addr="0x7f390a878a10" />
+                            <attribute name="sym_overloaded" value="0x7f390a86eb70" id="689" addr="0x7f390a86eb70" />
+                            <parmlist id="690" addr="0x7f390a86e7f0" >
                                 <parm id="691">
-                                    <attributelist id="692" addr="0x7f8396b007f0" >
-                                        <attribute name="name" value="handle" id="693" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="int" id="694" addr="0x7f8396b0aa10" />
+                                    <attributelist id="692" addr="0x7f390a86e7f0" >
+                                        <attribute name="name" value="handle" id="693" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="int" id="694" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="695">
-                                    <attributelist id="696" addr="0x7f8396b00910" >
-                                        <attribute name="name" value="sortMethod" id="697" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="int" id="698" addr="0x7f8396b0aa10" />
+                                    <attributelist id="696" addr="0x7f390a86e910" >
+                                        <attribute name="name" value="sortMethod" id="697" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="int" id="698" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="699">
-                                    <attributelist id="700" addr="0x7f8396b00ab0" >
-                                        <attribute name="name" value="label2Mask" id="701" addr="0x7f8396b0aa10" />
-                                        <attribute name="value" value="XBMCAddon::emptyString" id="702" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="703" addr="0x7f8396b0aa10" />
+                                    <attributelist id="700" addr="0x7f390a86eab0" >
+                                        <attribute name="name" value="label2Mask" id="701" addr="0x7f390a878a10" />
+                                        <attribute name="value" value="XBMCAddon::emptyString" id="702" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="703" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="type" value="void" id="704" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="705" addr="0x7f8396b0aa10" />
+                            <attribute name="type" value="void" id="704" addr="0x7f390a878a10" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="705" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="706" addr="0x7f8396b00d50" >
-                        <attributelist id="707" addr="0x7f8396b00d50" >
-                            <attribute name="name" value="XBMCAddon::xbmcplugin::addSortMethod" id="708" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="709" addr="0x7f8396afdab0" />
-                            <attribute name="sym_previousSibling" value="0x7f8396b00b70" id="710" addr="0x7f8396b00b70" />
-                            <attribute name="kind" value="function" id="711" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_name" value="addSortMethod" id="712" addr="0x7f8396b0aa10" />
-                            <attribute name="defaultargs" value="0x7f8396b00b70" id="713" addr="0x7f8396b00b70" />
-                            <attribute name="decl" value="f(int,int)." id="714" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_overloaded" value="0x7f8396b00b70" id="715" addr="0x7f8396b00b70" />
-                            <parmlist id="716" addr="0x7f8396b00bd0" >
+                    <cdecl id="706" addr="0x7f390a86ed50" >
+                        <attributelist id="707" addr="0x7f390a86ed50" >
+                            <attribute name="name" value="XBMCAddon::xbmcplugin::addSortMethod" id="708" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="709" addr="0x7f390a86bab0" />
+                            <attribute name="sym_previousSibling" value="0x7f390a86eb70" id="710" addr="0x7f390a86eb70" />
+                            <attribute name="kind" value="function" id="711" addr="0x7f390a878a10" />
+                            <attribute name="sym_name" value="addSortMethod" id="712" addr="0x7f390a878a10" />
+                            <attribute name="defaultargs" value="0x7f390a86eb70" id="713" addr="0x7f390a86eb70" />
+                            <attribute name="decl" value="f(int,int)." id="714" addr="0x7f390a878a10" />
+                            <attribute name="sym_overloaded" value="0x7f390a86eb70" id="715" addr="0x7f390a86eb70" />
+                            <parmlist id="716" addr="0x7f390a86ebd0" >
                                 <parm id="717">
-                                    <attributelist id="718" addr="0x7f8396b00bd0" >
-                                        <attribute name="name" value="handle" id="719" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="int" id="720" addr="0x7f8396b0aa10" />
+                                    <attributelist id="718" addr="0x7f390a86ebd0" >
+                                        <attribute name="name" value="handle" id="719" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="int" id="720" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="721">
-                                    <attributelist id="722" addr="0x7f8396b00cb0" >
-                                        <attribute name="name" value="sortMethod" id="723" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="int" id="724" addr="0x7f8396b0aa10" />
+                                    <attributelist id="722" addr="0x7f390a86ecb0" >
+                                        <attribute name="name" value="sortMethod" id="723" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="int" id="724" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="type" value="void" id="725" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_overname" value="__SWIG_1" id="726" addr="0x7f8396b0aa10" />
+                            <attribute name="type" value="void" id="725" addr="0x7f390a878a10" />
+                            <attribute name="sym_overname" value="__SWIG_1" id="726" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="727" addr="0x7f8396b01150" >
-                        <attributelist id="728" addr="0x7f8396b01150" >
-                            <attribute name="sym_name" value="getSetting" id="729" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="XBMCAddon::xbmcplugin::getSetting" id="730" addr="0x7f8396b0aa10" />
-                            <attribute name="decl" value="f(int,p.q(const).char)." id="731" addr="0x7f8396b0aa10" />
-                            <parmlist id="732" addr="0x7f8396b00f50" >
+                    <cdecl id="727" addr="0x7f390a86f150" >
+                        <attributelist id="728" addr="0x7f390a86f150" >
+                            <attribute name="sym_name" value="getSetting" id="729" addr="0x7f390a878a10" />
+                            <attribute name="name" value="XBMCAddon::xbmcplugin::getSetting" id="730" addr="0x7f390a878a10" />
+                            <attribute name="decl" value="f(int,p.q(const).char)." id="731" addr="0x7f390a878a10" />
+                            <parmlist id="732" addr="0x7f390a86ef50" >
                                 <parm id="733">
-                                    <attributelist id="734" addr="0x7f8396b00f50" >
-                                        <attribute name="name" value="handle" id="735" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="int" id="736" addr="0x7f8396b0aa10" />
+                                    <attributelist id="734" addr="0x7f390a86ef50" >
+                                        <attribute name="name" value="handle" id="735" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="int" id="736" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="737">
-                                    <attributelist id="738" addr="0x7f8396b01090" >
-                                        <attribute name="name" value="id" id="739" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="p.q(const).char" id="740" addr="0x7f8396b0aa10" />
+                                    <attributelist id="738" addr="0x7f390a86f090" >
+                                        <attribute name="name" value="id" id="739" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="p.q(const).char" id="740" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="kind" value="function" id="741" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="XBMCAddon::String" id="742" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="743" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="744" addr="0x7f8396b0aa10" />
+                            <attribute name="kind" value="function" id="741" addr="0x7f390a878a10" />
+                            <attribute name="type" value="XBMCAddon::String" id="742" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="743" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="744" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="745" addr="0x7f8396b01670" >
-                        <attributelist id="746" addr="0x7f8396b01670" >
-                            <attribute name="sym_name" value="setSetting" id="747" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="XBMCAddon::xbmcplugin::setSetting" id="748" addr="0x7f8396b0aa10" />
-                            <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="749" addr="0x7f8396b0aa10" />
-                            <parmlist id="750" addr="0x7f8396b01330" >
+                    <cdecl id="745" addr="0x7f390a86f670" >
+                        <attributelist id="746" addr="0x7f390a86f670" >
+                            <attribute name="sym_name" value="setSetting" id="747" addr="0x7f390a878a10" />
+                            <attribute name="name" value="XBMCAddon::xbmcplugin::setSetting" id="748" addr="0x7f390a878a10" />
+                            <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="749" addr="0x7f390a878a10" />
+                            <parmlist id="750" addr="0x7f390a86f330" >
                                 <parm id="751">
-                                    <attributelist id="752" addr="0x7f8396b01330" >
-                                        <attribute name="name" value="handle" id="753" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="int" id="754" addr="0x7f8396b0aa10" />
+                                    <attributelist id="752" addr="0x7f390a86f330" >
+                                        <attribute name="name" value="handle" id="753" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="int" id="754" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="755">
-                                    <attributelist id="756" addr="0x7f8396b01470" >
-                                        <attribute name="name" value="id" id="757" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="758" addr="0x7f8396b0aa10" />
+                                    <attributelist id="756" addr="0x7f390a86f470" >
+                                        <attribute name="name" value="id" id="757" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="758" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="759">
-                                    <attributelist id="760" addr="0x7f8396b015b0" >
-                                        <attribute name="name" value="value" id="761" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="762" addr="0x7f8396b0aa10" />
+                                    <attributelist id="760" addr="0x7f390a86f5b0" >
+                                        <attribute name="name" value="value" id="761" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="762" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="kind" value="function" id="763" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="void" id="764" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="765" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="766" addr="0x7f8396b0aa10" />
+                            <attribute name="kind" value="function" id="763" addr="0x7f390a878a10" />
+                            <attribute name="type" value="void" id="764" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="765" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="766" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="767" addr="0x7f8396b01a50" >
-                        <attributelist id="768" addr="0x7f8396b01a50" >
-                            <attribute name="sym_name" value="setContent" id="769" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="XBMCAddon::xbmcplugin::setContent" id="770" addr="0x7f8396b0aa10" />
-                            <attribute name="decl" value="f(int,p.q(const).char)." id="771" addr="0x7f8396b0aa10" />
-                            <parmlist id="772" addr="0x7f8396b01850" >
+                    <cdecl id="767" addr="0x7f390a86fa50" >
+                        <attributelist id="768" addr="0x7f390a86fa50" >
+                            <attribute name="sym_name" value="setContent" id="769" addr="0x7f390a878a10" />
+                            <attribute name="name" value="XBMCAddon::xbmcplugin::setContent" id="770" addr="0x7f390a878a10" />
+                            <attribute name="decl" value="f(int,p.q(const).char)." id="771" addr="0x7f390a878a10" />
+                            <parmlist id="772" addr="0x7f390a86f850" >
                                 <parm id="773">
-                                    <attributelist id="774" addr="0x7f8396b01850" >
-                                        <attribute name="name" value="handle" id="775" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="int" id="776" addr="0x7f8396b0aa10" />
+                                    <attributelist id="774" addr="0x7f390a86f850" >
+                                        <attribute name="name" value="handle" id="775" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="int" id="776" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="777">
-                                    <attributelist id="778" addr="0x7f8396b01990" >
-                                        <attribute name="name" value="content" id="779" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="p.q(const).char" id="780" addr="0x7f8396b0aa10" />
+                                    <attributelist id="778" addr="0x7f390a86f990" >
+                                        <attribute name="name" value="content" id="779" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="p.q(const).char" id="780" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="kind" value="function" id="781" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="void" id="782" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="783" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="784" addr="0x7f8396b0aa10" />
+                            <attribute name="kind" value="function" id="781" addr="0x7f390a878a10" />
+                            <attribute name="type" value="void" id="782" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="783" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="784" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="785" addr="0x7f8396b01e30" >
-                        <attributelist id="786" addr="0x7f8396b01e30" >
-                            <attribute name="sym_name" value="setPluginCategory" id="787" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="XBMCAddon::xbmcplugin::setPluginCategory" id="788" addr="0x7f8396b0aa10" />
-                            <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String)." id="789" addr="0x7f8396b0aa10" />
-                            <parmlist id="790" addr="0x7f8396b01c30" >
+                    <cdecl id="785" addr="0x7f390a86fe30" >
+                        <attributelist id="786" addr="0x7f390a86fe30" >
+                            <attribute name="sym_name" value="setPluginCategory" id="787" addr="0x7f390a878a10" />
+                            <attribute name="name" value="XBMCAddon::xbmcplugin::setPluginCategory" id="788" addr="0x7f390a878a10" />
+                            <attribute name="decl" value="f(int,r.q(const).XBMCAddon::String)." id="789" addr="0x7f390a878a10" />
+                            <parmlist id="790" addr="0x7f390a86fc30" >
                                 <parm id="791">
-                                    <attributelist id="792" addr="0x7f8396b01c30" >
-                                        <attribute name="name" value="handle" id="793" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="int" id="794" addr="0x7f8396b0aa10" />
+                                    <attributelist id="792" addr="0x7f390a86fc30" >
+                                        <attribute name="name" value="handle" id="793" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="int" id="794" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="795">
-                                    <attributelist id="796" addr="0x7f8396b01d70" >
-                                        <attribute name="name" value="category" id="797" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="798" addr="0x7f8396b0aa10" />
+                                    <attributelist id="796" addr="0x7f390a86fd70" >
+                                        <attribute name="name" value="category" id="797" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="798" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="kind" value="function" id="799" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="void" id="800" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="801" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="802" addr="0x7f8396b0aa10" />
+                            <attribute name="kind" value="function" id="799" addr="0x7f390a878a10" />
+                            <attribute name="type" value="void" id="800" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="801" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="802" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="803" addr="0x7f8396b02750" >
-                        <attributelist id="804" addr="0x7f8396b02750" >
-                            <attribute name="name" value="XBMCAddon::xbmcplugin::setPluginFanart" id="805" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="806" addr="0x7f8396afdab0" />
-                            <attribute name="sym_nextSibling" value="0x7f8396b02a90" id="807" addr="0x7f8396b02a90" />
-                            <attribute name="csym_nextSibling" value="0x7f8396b02a90" id="808" addr="0x7f8396b02a90" />
-                            <attribute name="kind" value="function" id="809" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_name" value="setPluginFanart" id="810" addr="0x7f8396b0aa10" />
-                            <attribute name="decl" value="f(int,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char)." id="811" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_overloaded" value="0x7f8396b02750" id="812" addr="0x7f8396b02750" />
-                            <parmlist id="813" addr="0x7f8396b02010" >
+                    <cdecl id="803" addr="0x7f390a870750" >
+                        <attributelist id="804" addr="0x7f390a870750" >
+                            <attribute name="name" value="XBMCAddon::xbmcplugin::setPluginFanart" id="805" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="806" addr="0x7f390a86bab0" />
+                            <attribute name="sym_nextSibling" value="0x7f390a870a90" id="807" addr="0x7f390a870a90" />
+                            <attribute name="csym_nextSibling" value="0x7f390a870a90" id="808" addr="0x7f390a870a90" />
+                            <attribute name="kind" value="function" id="809" addr="0x7f390a878a10" />
+                            <attribute name="sym_name" value="setPluginFanart" id="810" addr="0x7f390a878a10" />
+                            <attribute name="decl" value="f(int,p.q(const).char,p.q(const).char,p.q(const).char,p.q(const).char)." id="811" addr="0x7f390a878a10" />
+                            <attribute name="sym_overloaded" value="0x7f390a870750" id="812" addr="0x7f390a870750" />
+                            <parmlist id="813" addr="0x7f390a870010" >
                                 <parm id="814">
-                                    <attributelist id="815" addr="0x7f8396b02010" >
-                                        <attribute name="name" value="handle" id="816" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="int" id="817" addr="0x7f8396b0aa10" />
+                                    <attributelist id="815" addr="0x7f390a870010" >
+                                        <attribute name="name" value="handle" id="816" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="int" id="817" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="818">
-                                    <attributelist id="819" addr="0x7f8396b021b0" >
-                                        <attribute name="name" value="image" id="820" addr="0x7f8396b0aa10" />
-                                        <attribute name="value" value="NULL" id="821" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="p.q(const).char" id="822" addr="0x7f8396b0aa10" />
+                                    <attributelist id="819" addr="0x7f390a8701b0" >
+                                        <attribute name="name" value="image" id="820" addr="0x7f390a878a10" />
+                                        <attribute name="value" value="NULL" id="821" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="p.q(const).char" id="822" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="823">
-                                    <attributelist id="824" addr="0x7f8396b02350" >
-                                        <attribute name="name" value="color1" id="825" addr="0x7f8396b0aa10" />
-                                        <attribute name="value" value="NULL" id="826" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="p.q(const).char" id="827" addr="0x7f8396b0aa10" />
+                                    <attributelist id="824" addr="0x7f390a870350" >
+                                        <attribute name="name" value="color1" id="825" addr="0x7f390a878a10" />
+                                        <attribute name="value" value="NULL" id="826" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="p.q(const).char" id="827" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="828">
-                                    <attributelist id="829" addr="0x7f8396b024f0" >
-                                        <attribute name="name" value="color2" id="830" addr="0x7f8396b0aa10" />
-                                        <attribute name="value" value="NULL" id="831" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="p.q(const).char" id="832" addr="0x7f8396b0aa10" />
+                                    <attributelist id="829" addr="0x7f390a8704f0" >
+                                        <attribute name="name" value="color2" id="830" addr="0x7f390a878a10" />
+                                        <attribute name="value" value="NULL" id="831" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="p.q(const).char" id="832" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="833">
-                                    <attributelist id="834" addr="0x7f8396b02690" >
-                                        <attribute name="name" value="color3" id="835" addr="0x7f8396b0aa10" />
-                                        <attribute name="value" value="NULL" id="836" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="p.q(const).char" id="837" addr="0x7f8396b0aa10" />
+                                    <attributelist id="834" addr="0x7f390a870690" >
+                                        <attribute name="name" value="color3" id="835" addr="0x7f390a878a10" />
+                                        <attribute name="value" value="NULL" id="836" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="p.q(const).char" id="837" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="type" value="void" id="838" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="839" addr="0x7f8396b0aa10" />
+                            <attribute name="type" value="void" id="838" addr="0x7f390a878a10" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="839" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="840" addr="0x7f8396b02a90" >
-                        <attributelist id="841" addr="0x7f8396b02a90" >
-                            <attribute name="name" value="XBMCAddon::xbmcplugin::setPluginFanart" id="842" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="843" addr="0x7f8396afdab0" />
-                            <attribute name="sym_nextSibling" value="0x7f8396b02d30" id="844" addr="0x7f8396b02d30" />
-                            <attribute name="csym_nextSibling" value="0x7f8396b02d30" id="845" addr="0x7f8396b02d30" />
-                            <attribute name="sym_previousSibling" value="0x7f8396b02750" id="846" addr="0x7f8396b02750" />
-                            <attribute name="kind" value="function" id="847" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_name" value="setPluginFanart" id="848" addr="0x7f8396b0aa10" />
-                            <attribute name="defaultargs" value="0x7f8396b02750" id="849" addr="0x7f8396b02750" />
-                            <attribute name="decl" value="f(int,p.q(const).char,p.q(const).char,p.q(const).char)." id="850" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_overloaded" value="0x7f8396b02750" id="851" addr="0x7f8396b02750" />
-                            <parmlist id="852" addr="0x7f8396b027b0" >
+                    <cdecl id="840" addr="0x7f390a870a90" >
+                        <attributelist id="841" addr="0x7f390a870a90" >
+                            <attribute name="name" value="XBMCAddon::xbmcplugin::setPluginFanart" id="842" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="843" addr="0x7f390a86bab0" />
+                            <attribute name="sym_nextSibling" value="0x7f390a870d30" id="844" addr="0x7f390a870d30" />
+                            <attribute name="csym_nextSibling" value="0x7f390a870d30" id="845" addr="0x7f390a870d30" />
+                            <attribute name="sym_previousSibling" value="0x7f390a870750" id="846" addr="0x7f390a870750" />
+                            <attribute name="kind" value="function" id="847" addr="0x7f390a878a10" />
+                            <attribute name="sym_name" value="setPluginFanart" id="848" addr="0x7f390a878a10" />
+                            <attribute name="defaultargs" value="0x7f390a870750" id="849" addr="0x7f390a870750" />
+                            <attribute name="decl" value="f(int,p.q(const).char,p.q(const).char,p.q(const).char)." id="850" addr="0x7f390a878a10" />
+                            <attribute name="sym_overloaded" value="0x7f390a870750" id="851" addr="0x7f390a870750" />
+                            <parmlist id="852" addr="0x7f390a8707b0" >
                                 <parm id="853">
-                                    <attributelist id="854" addr="0x7f8396b027b0" >
-                                        <attribute name="name" value="handle" id="855" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="int" id="856" addr="0x7f8396b0aa10" />
+                                    <attributelist id="854" addr="0x7f390a8707b0" >
+                                        <attribute name="name" value="handle" id="855" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="int" id="856" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="857">
-                                    <attributelist id="858" addr="0x7f8396b02890" >
-                                        <attribute name="name" value="image" id="859" addr="0x7f8396b0aa10" />
-                                        <attribute name="value" value="NULL" id="860" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="p.q(const).char" id="861" addr="0x7f8396b0aa10" />
+                                    <attributelist id="858" addr="0x7f390a870890" >
+                                        <attribute name="name" value="image" id="859" addr="0x7f390a878a10" />
+                                        <attribute name="value" value="NULL" id="860" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="p.q(const).char" id="861" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="862">
-                                    <attributelist id="863" addr="0x7f8396b02930" >
-                                        <attribute name="name" value="color1" id="864" addr="0x7f8396b0aa10" />
-                                        <attribute name="value" value="NULL" id="865" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="p.q(const).char" id="866" addr="0x7f8396b0aa10" />
+                                    <attributelist id="863" addr="0x7f390a870930" >
+                                        <attribute name="name" value="color1" id="864" addr="0x7f390a878a10" />
+                                        <attribute name="value" value="NULL" id="865" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="p.q(const).char" id="866" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="867">
-                                    <attributelist id="868" addr="0x7f8396b029d0" >
-                                        <attribute name="name" value="color2" id="869" addr="0x7f8396b0aa10" />
-                                        <attribute name="value" value="NULL" id="870" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="p.q(const).char" id="871" addr="0x7f8396b0aa10" />
+                                    <attributelist id="868" addr="0x7f390a8709d0" >
+                                        <attribute name="name" value="color2" id="869" addr="0x7f390a878a10" />
+                                        <attribute name="value" value="NULL" id="870" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="p.q(const).char" id="871" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="type" value="void" id="872" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_overname" value="__SWIG_1" id="873" addr="0x7f8396b0aa10" />
+                            <attribute name="type" value="void" id="872" addr="0x7f390a878a10" />
+                            <attribute name="sym_overname" value="__SWIG_1" id="873" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="874" addr="0x7f8396b02d30" >
-                        <attributelist id="875" addr="0x7f8396b02d30" >
-                            <attribute name="name" value="XBMCAddon::xbmcplugin::setPluginFanart" id="876" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="877" addr="0x7f8396afdab0" />
-                            <attribute name="sym_nextSibling" value="0x7f8396b02f30" id="878" addr="0x7f8396b02f30" />
-                            <attribute name="csym_nextSibling" value="0x7f8396b02f30" id="879" addr="0x7f8396b02f30" />
-                            <attribute name="sym_previousSibling" value="0x7f8396b02a90" id="880" addr="0x7f8396b02a90" />
-                            <attribute name="kind" value="function" id="881" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_name" value="setPluginFanart" id="882" addr="0x7f8396b0aa10" />
-                            <attribute name="defaultargs" value="0x7f8396b02750" id="883" addr="0x7f8396b02750" />
-                            <attribute name="decl" value="f(int,p.q(const).char,p.q(const).char)." id="884" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_overloaded" value="0x7f8396b02750" id="885" addr="0x7f8396b02750" />
-                            <parmlist id="886" addr="0x7f8396b02af0" >
+                    <cdecl id="874" addr="0x7f390a870d30" >
+                        <attributelist id="875" addr="0x7f390a870d30" >
+                            <attribute name="name" value="XBMCAddon::xbmcplugin::setPluginFanart" id="876" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="877" addr="0x7f390a86bab0" />
+                            <attribute name="sym_nextSibling" value="0x7f390a870f30" id="878" addr="0x7f390a870f30" />
+                            <attribute name="csym_nextSibling" value="0x7f390a870f30" id="879" addr="0x7f390a870f30" />
+                            <attribute name="sym_previousSibling" value="0x7f390a870a90" id="880" addr="0x7f390a870a90" />
+                            <attribute name="kind" value="function" id="881" addr="0x7f390a878a10" />
+                            <attribute name="sym_name" value="setPluginFanart" id="882" addr="0x7f390a878a10" />
+                            <attribute name="defaultargs" value="0x7f390a870750" id="883" addr="0x7f390a870750" />
+                            <attribute name="decl" value="f(int,p.q(const).char,p.q(const).char)." id="884" addr="0x7f390a878a10" />
+                            <attribute name="sym_overloaded" value="0x7f390a870750" id="885" addr="0x7f390a870750" />
+                            <parmlist id="886" addr="0x7f390a870af0" >
                                 <parm id="887">
-                                    <attributelist id="888" addr="0x7f8396b02af0" >
-                                        <attribute name="name" value="handle" id="889" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="int" id="890" addr="0x7f8396b0aa10" />
+                                    <attributelist id="888" addr="0x7f390a870af0" >
+                                        <attribute name="name" value="handle" id="889" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="int" id="890" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="891">
-                                    <attributelist id="892" addr="0x7f8396b02bd0" >
-                                        <attribute name="name" value="image" id="893" addr="0x7f8396b0aa10" />
-                                        <attribute name="value" value="NULL" id="894" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="p.q(const).char" id="895" addr="0x7f8396b0aa10" />
+                                    <attributelist id="892" addr="0x7f390a870bd0" >
+                                        <attribute name="name" value="image" id="893" addr="0x7f390a878a10" />
+                                        <attribute name="value" value="NULL" id="894" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="p.q(const).char" id="895" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="896">
-                                    <attributelist id="897" addr="0x7f8396b02c70" >
-                                        <attribute name="name" value="color1" id="898" addr="0x7f8396b0aa10" />
-                                        <attribute name="value" value="NULL" id="899" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="p.q(const).char" id="900" addr="0x7f8396b0aa10" />
+                                    <attributelist id="897" addr="0x7f390a870c70" >
+                                        <attribute name="name" value="color1" id="898" addr="0x7f390a878a10" />
+                                        <attribute name="value" value="NULL" id="899" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="p.q(const).char" id="900" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="type" value="void" id="901" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_overname" value="__SWIG_2" id="902" addr="0x7f8396b0aa10" />
+                            <attribute name="type" value="void" id="901" addr="0x7f390a878a10" />
+                            <attribute name="sym_overname" value="__SWIG_2" id="902" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="903" addr="0x7f8396b02f30" >
-                        <attributelist id="904" addr="0x7f8396b02f30" >
-                            <attribute name="name" value="XBMCAddon::xbmcplugin::setPluginFanart" id="905" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="906" addr="0x7f8396afdab0" />
-                            <attribute name="sym_nextSibling" value="0x7f8396b03090" id="907" addr="0x7f8396b03090" />
-                            <attribute name="csym_nextSibling" value="0x7f8396b03090" id="908" addr="0x7f8396b03090" />
-                            <attribute name="sym_previousSibling" value="0x7f8396b02d30" id="909" addr="0x7f8396b02d30" />
-                            <attribute name="kind" value="function" id="910" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_name" value="setPluginFanart" id="911" addr="0x7f8396b0aa10" />
-                            <attribute name="defaultargs" value="0x7f8396b02750" id="912" addr="0x7f8396b02750" />
-                            <attribute name="decl" value="f(int,p.q(const).char)." id="913" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_overloaded" value="0x7f8396b02750" id="914" addr="0x7f8396b02750" />
-                            <parmlist id="915" addr="0x7f8396b02d90" >
+                    <cdecl id="903" addr="0x7f390a870f30" >
+                        <attributelist id="904" addr="0x7f390a870f30" >
+                            <attribute name="name" value="XBMCAddon::xbmcplugin::setPluginFanart" id="905" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="906" addr="0x7f390a86bab0" />
+                            <attribute name="sym_nextSibling" value="0x7f390a871090" id="907" addr="0x7f390a871090" />
+                            <attribute name="csym_nextSibling" value="0x7f390a871090" id="908" addr="0x7f390a871090" />
+                            <attribute name="sym_previousSibling" value="0x7f390a870d30" id="909" addr="0x7f390a870d30" />
+                            <attribute name="kind" value="function" id="910" addr="0x7f390a878a10" />
+                            <attribute name="sym_name" value="setPluginFanart" id="911" addr="0x7f390a878a10" />
+                            <attribute name="defaultargs" value="0x7f390a870750" id="912" addr="0x7f390a870750" />
+                            <attribute name="decl" value="f(int,p.q(const).char)." id="913" addr="0x7f390a878a10" />
+                            <attribute name="sym_overloaded" value="0x7f390a870750" id="914" addr="0x7f390a870750" />
+                            <parmlist id="915" addr="0x7f390a870d90" >
                                 <parm id="916">
-                                    <attributelist id="917" addr="0x7f8396b02d90" >
-                                        <attribute name="name" value="handle" id="918" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="int" id="919" addr="0x7f8396b0aa10" />
+                                    <attributelist id="917" addr="0x7f390a870d90" >
+                                        <attribute name="name" value="handle" id="918" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="int" id="919" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="920">
-                                    <attributelist id="921" addr="0x7f8396b02e70" >
-                                        <attribute name="name" value="image" id="922" addr="0x7f8396b0aa10" />
-                                        <attribute name="value" value="NULL" id="923" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="p.q(const).char" id="924" addr="0x7f8396b0aa10" />
+                                    <attributelist id="921" addr="0x7f390a870e70" >
+                                        <attribute name="name" value="image" id="922" addr="0x7f390a878a10" />
+                                        <attribute name="value" value="NULL" id="923" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="p.q(const).char" id="924" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="type" value="void" id="925" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_overname" value="__SWIG_3" id="926" addr="0x7f8396b0aa10" />
+                            <attribute name="type" value="void" id="925" addr="0x7f390a878a10" />
+                            <attribute name="sym_overname" value="__SWIG_3" id="926" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="927" addr="0x7f8396b03090" >
-                        <attributelist id="928" addr="0x7f8396b03090" >
-                            <attribute name="name" value="XBMCAddon::xbmcplugin::setPluginFanart" id="929" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="930" addr="0x7f8396afdab0" />
-                            <attribute name="sym_previousSibling" value="0x7f8396b02f30" id="931" addr="0x7f8396b02f30" />
-                            <attribute name="kind" value="function" id="932" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_name" value="setPluginFanart" id="933" addr="0x7f8396b0aa10" />
-                            <attribute name="defaultargs" value="0x7f8396b02750" id="934" addr="0x7f8396b02750" />
-                            <attribute name="decl" value="f(int)." id="935" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_overloaded" value="0x7f8396b02750" id="936" addr="0x7f8396b02750" />
-                            <parmlist id="937" addr="0x7f8396b02f90" >
+                    <cdecl id="927" addr="0x7f390a871090" >
+                        <attributelist id="928" addr="0x7f390a871090" >
+                            <attribute name="name" value="XBMCAddon::xbmcplugin::setPluginFanart" id="929" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="930" addr="0x7f390a86bab0" />
+                            <attribute name="sym_previousSibling" value="0x7f390a870f30" id="931" addr="0x7f390a870f30" />
+                            <attribute name="kind" value="function" id="932" addr="0x7f390a878a10" />
+                            <attribute name="sym_name" value="setPluginFanart" id="933" addr="0x7f390a878a10" />
+                            <attribute name="defaultargs" value="0x7f390a870750" id="934" addr="0x7f390a870750" />
+                            <attribute name="decl" value="f(int)." id="935" addr="0x7f390a878a10" />
+                            <attribute name="sym_overloaded" value="0x7f390a870750" id="936" addr="0x7f390a870750" />
+                            <parmlist id="937" addr="0x7f390a870f90" >
                                 <parm id="938">
-                                    <attributelist id="939" addr="0x7f8396b02f90" >
-                                        <attribute name="name" value="handle" id="940" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="int" id="941" addr="0x7f8396b0aa10" />
+                                    <attributelist id="939" addr="0x7f390a870f90" >
+                                        <attribute name="name" value="handle" id="940" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="int" id="941" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="type" value="void" id="942" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_overname" value="__SWIG_4" id="943" addr="0x7f8396b0aa10" />
+                            <attribute name="type" value="void" id="942" addr="0x7f390a878a10" />
+                            <attribute name="sym_overname" value="__SWIG_4" id="943" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="944" addr="0x7f8396b035b0" >
-                        <attributelist id="945" addr="0x7f8396b035b0" >
-                            <attribute name="sym_name" value="setProperty" id="946" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="XBMCAddon::xbmcplugin::setProperty" id="947" addr="0x7f8396b0aa10" />
-                            <attribute name="decl" value="f(int,p.q(const).char,r.q(const).XBMCAddon::String)." id="948" addr="0x7f8396b0aa10" />
-                            <parmlist id="949" addr="0x7f8396b03270" >
+                    <cdecl id="944" addr="0x7f390a8715b0" >
+                        <attributelist id="945" addr="0x7f390a8715b0" >
+                            <attribute name="sym_name" value="setProperty" id="946" addr="0x7f390a878a10" />
+                            <attribute name="name" value="XBMCAddon::xbmcplugin::setProperty" id="947" addr="0x7f390a878a10" />
+                            <attribute name="decl" value="f(int,p.q(const).char,r.q(const).XBMCAddon::String)." id="948" addr="0x7f390a878a10" />
+                            <parmlist id="949" addr="0x7f390a871270" >
                                 <parm id="950">
-                                    <attributelist id="951" addr="0x7f8396b03270" >
-                                        <attribute name="name" value="handle" id="952" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="int" id="953" addr="0x7f8396b0aa10" />
+                                    <attributelist id="951" addr="0x7f390a871270" >
+                                        <attribute name="name" value="handle" id="952" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="int" id="953" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="954">
-                                    <attributelist id="955" addr="0x7f8396b033b0" >
-                                        <attribute name="name" value="key" id="956" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="p.q(const).char" id="957" addr="0x7f8396b0aa10" />
+                                    <attributelist id="955" addr="0x7f390a8713b0" >
+                                        <attribute name="name" value="key" id="956" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="p.q(const).char" id="957" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                                 <parm id="958">
-                                    <attributelist id="959" addr="0x7f8396b034f0" >
-                                        <attribute name="name" value="value" id="960" addr="0x7f8396b0aa10" />
-                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="961" addr="0x7f8396b0aa10" />
+                                    <attributelist id="959" addr="0x7f390a8714f0" >
+                                        <attribute name="name" value="value" id="960" addr="0x7f390a878a10" />
+                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="961" addr="0x7f390a878a10" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="kind" value="function" id="962" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="void" id="963" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="964" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="965" addr="0x7f8396b0aa10" />
+                            <attribute name="kind" value="function" id="962" addr="0x7f390a878a10" />
+                            <attribute name="type" value="void" id="963" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="964" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="965" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </cdecl >
-                    <constant id="966" addr="0x7f8396b03790" >
-                        <attributelist id="967" addr="0x7f8396b03790" >
-                            <attribute name="sym_name" value="SORT_METHOD_NONE" id="968" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_NONE" id="969" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_NONE" id="970" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="971" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_NONE" id="972" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="973" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="974" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="975" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="976" addr="0x7f8396b0aa10" />
+                    <constant id="966" addr="0x7f390a871790" >
+                        <attributelist id="967" addr="0x7f390a871790" >
+                            <attribute name="sym_name" value="SORT_METHOD_NONE" id="968" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_NONE" id="969" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_NONE" id="970" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="971" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_NONE" id="972" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="973" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="974" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="975" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="976" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="977" addr="0x7f8396b039d0" >
-                        <attributelist id="978" addr="0x7f8396b039d0" >
-                            <attribute name="sym_name" value="SORT_METHOD_LABEL" id="979" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_LABEL" id="980" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_LABEL" id="981" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="982" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_LABEL" id="983" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="984" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="985" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="986" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="987" addr="0x7f8396b0aa10" />
+                    <constant id="977" addr="0x7f390a8719d0" >
+                        <attributelist id="978" addr="0x7f390a8719d0" >
+                            <attribute name="sym_name" value="SORT_METHOD_LABEL" id="979" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_LABEL" id="980" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_LABEL" id="981" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="982" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_LABEL" id="983" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="984" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="985" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="986" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="987" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="988" addr="0x7f8396b03bd0" >
-                        <attributelist id="989" addr="0x7f8396b03bd0" >
-                            <attribute name="sym_name" value="SORT_METHOD_LABEL_IGNORE_THE" id="990" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_LABEL_IGNORE_THE" id="991" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_LABEL_IGNORE_THE" id="992" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="993" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_LABEL_IGNORE_THE" id="994" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="995" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="996" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="997" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="998" addr="0x7f8396b0aa10" />
+                    <constant id="988" addr="0x7f390a871bd0" >
+                        <attributelist id="989" addr="0x7f390a871bd0" >
+                            <attribute name="sym_name" value="SORT_METHOD_LABEL_IGNORE_THE" id="990" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_LABEL_IGNORE_THE" id="991" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_LABEL_IGNORE_THE" id="992" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="993" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_LABEL_IGNORE_THE" id="994" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="995" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="996" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="997" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="998" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="999" addr="0x7f8396b03dd0" >
-                        <attributelist id="1000" addr="0x7f8396b03dd0" >
-                            <attribute name="sym_name" value="SORT_METHOD_DATE" id="1001" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_DATE" id="1002" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_DATE" id="1003" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1004" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_DATE" id="1005" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1006" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1007" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1008" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1009" addr="0x7f8396b0aa10" />
+                    <constant id="999" addr="0x7f390a871dd0" >
+                        <attributelist id="1000" addr="0x7f390a871dd0" >
+                            <attribute name="sym_name" value="SORT_METHOD_DATE" id="1001" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_DATE" id="1002" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_DATE" id="1003" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1004" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_DATE" id="1005" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1006" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1007" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1008" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1009" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1010" addr="0x7f8396b03fd0" >
-                        <attributelist id="1011" addr="0x7f8396b03fd0" >
-                            <attribute name="sym_name" value="SORT_METHOD_SIZE" id="1012" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_SIZE" id="1013" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_SIZE" id="1014" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1015" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_SIZE" id="1016" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1017" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1018" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1019" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1020" addr="0x7f8396b0aa10" />
+                    <constant id="1010" addr="0x7f390a871fd0" >
+                        <attributelist id="1011" addr="0x7f390a871fd0" >
+                            <attribute name="sym_name" value="SORT_METHOD_SIZE" id="1012" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_SIZE" id="1013" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_SIZE" id="1014" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1015" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_SIZE" id="1016" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1017" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1018" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1019" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1020" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1021" addr="0x7f8396b041d0" >
-                        <attributelist id="1022" addr="0x7f8396b041d0" >
-                            <attribute name="sym_name" value="SORT_METHOD_FILE" id="1023" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_FILE" id="1024" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_FILE" id="1025" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1026" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_FILE" id="1027" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1028" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1029" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1030" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1031" addr="0x7f8396b0aa10" />
+                    <constant id="1021" addr="0x7f390a8721d0" >
+                        <attributelist id="1022" addr="0x7f390a8721d0" >
+                            <attribute name="sym_name" value="SORT_METHOD_FILE" id="1023" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_FILE" id="1024" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_FILE" id="1025" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1026" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_FILE" id="1027" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1028" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1029" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1030" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1031" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1032" addr="0x7f8396b043d0" >
-                        <attributelist id="1033" addr="0x7f8396b043d0" >
-                            <attribute name="sym_name" value="SORT_METHOD_DRIVE_TYPE" id="1034" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_DRIVE_TYPE" id="1035" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_DRIVE_TYPE" id="1036" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1037" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_DRIVE_TYPE" id="1038" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1039" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1040" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1041" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1042" addr="0x7f8396b0aa10" />
+                    <constant id="1032" addr="0x7f390a8723d0" >
+                        <attributelist id="1033" addr="0x7f390a8723d0" >
+                            <attribute name="sym_name" value="SORT_METHOD_DRIVE_TYPE" id="1034" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_DRIVE_TYPE" id="1035" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_DRIVE_TYPE" id="1036" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1037" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_DRIVE_TYPE" id="1038" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1039" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1040" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1041" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1042" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1043" addr="0x7f8396b045d0" >
-                        <attributelist id="1044" addr="0x7f8396b045d0" >
-                            <attribute name="sym_name" value="SORT_METHOD_TRACKNUM" id="1045" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_TRACKNUM" id="1046" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_TRACKNUM" id="1047" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1048" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_TRACKNUM" id="1049" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1050" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1051" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1052" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1053" addr="0x7f8396b0aa10" />
+                    <constant id="1043" addr="0x7f390a8725d0" >
+                        <attributelist id="1044" addr="0x7f390a8725d0" >
+                            <attribute name="sym_name" value="SORT_METHOD_TRACKNUM" id="1045" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_TRACKNUM" id="1046" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_TRACKNUM" id="1047" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1048" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_TRACKNUM" id="1049" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1050" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1051" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1052" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1053" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1054" addr="0x7f8396b047d0" >
-                        <attributelist id="1055" addr="0x7f8396b047d0" >
-                            <attribute name="sym_name" value="SORT_METHOD_DURATION" id="1056" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_DURATION" id="1057" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_DURATION" id="1058" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1059" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_DURATION" id="1060" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1061" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1062" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1063" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1064" addr="0x7f8396b0aa10" />
+                    <constant id="1054" addr="0x7f390a8727d0" >
+                        <attributelist id="1055" addr="0x7f390a8727d0" >
+                            <attribute name="sym_name" value="SORT_METHOD_DURATION" id="1056" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_DURATION" id="1057" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_DURATION" id="1058" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1059" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_DURATION" id="1060" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1061" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1062" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1063" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1064" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1065" addr="0x7f8396b049d0" >
-                        <attributelist id="1066" addr="0x7f8396b049d0" >
-                            <attribute name="sym_name" value="SORT_METHOD_TITLE" id="1067" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_TITLE" id="1068" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_TITLE" id="1069" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1070" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_TITLE" id="1071" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1072" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1073" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1074" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1075" addr="0x7f8396b0aa10" />
+                    <constant id="1065" addr="0x7f390a8729d0" >
+                        <attributelist id="1066" addr="0x7f390a8729d0" >
+                            <attribute name="sym_name" value="SORT_METHOD_TITLE" id="1067" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_TITLE" id="1068" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_TITLE" id="1069" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1070" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_TITLE" id="1071" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1072" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1073" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1074" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1075" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1076" addr="0x7f8396b04bd0" >
-                        <attributelist id="1077" addr="0x7f8396b04bd0" >
-                            <attribute name="sym_name" value="SORT_METHOD_TITLE_IGNORE_THE" id="1078" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_TITLE_IGNORE_THE" id="1079" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_TITLE_IGNORE_THE" id="1080" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1081" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_TITLE_IGNORE_THE" id="1082" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1083" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1084" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1085" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1086" addr="0x7f8396b0aa10" />
+                    <constant id="1076" addr="0x7f390a872bd0" >
+                        <attributelist id="1077" addr="0x7f390a872bd0" >
+                            <attribute name="sym_name" value="SORT_METHOD_TITLE_IGNORE_THE" id="1078" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_TITLE_IGNORE_THE" id="1079" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_TITLE_IGNORE_THE" id="1080" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1081" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_TITLE_IGNORE_THE" id="1082" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1083" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1084" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1085" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1086" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1087" addr="0x7f8396b04dd0" >
-                        <attributelist id="1088" addr="0x7f8396b04dd0" >
-                            <attribute name="sym_name" value="SORT_METHOD_ARTIST" id="1089" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_ARTIST" id="1090" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_ARTIST" id="1091" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1092" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_ARTIST" id="1093" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1094" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1095" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1096" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1097" addr="0x7f8396b0aa10" />
+                    <constant id="1087" addr="0x7f390a872dd0" >
+                        <attributelist id="1088" addr="0x7f390a872dd0" >
+                            <attribute name="sym_name" value="SORT_METHOD_ARTIST" id="1089" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_ARTIST" id="1090" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_ARTIST" id="1091" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1092" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_ARTIST" id="1093" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1094" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1095" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1096" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1097" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1098" addr="0x7f8396b04fd0" >
-                        <attributelist id="1099" addr="0x7f8396b04fd0" >
-                            <attribute name="sym_name" value="SORT_METHOD_ARTIST_IGNORE_THE" id="1100" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_ARTIST_IGNORE_THE" id="1101" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_ARTIST_IGNORE_THE" id="1102" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1103" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_ARTIST_IGNORE_THE" id="1104" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1105" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1106" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1107" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1108" addr="0x7f8396b0aa10" />
+                    <constant id="1098" addr="0x7f390a872fd0" >
+                        <attributelist id="1099" addr="0x7f390a872fd0" >
+                            <attribute name="sym_name" value="SORT_METHOD_ARTIST_IGNORE_THE" id="1100" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_ARTIST_IGNORE_THE" id="1101" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_ARTIST_IGNORE_THE" id="1102" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1103" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_ARTIST_IGNORE_THE" id="1104" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1105" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1106" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1107" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1108" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1109" addr="0x7f8396b051d0" >
-                        <attributelist id="1110" addr="0x7f8396b051d0" >
-                            <attribute name="sym_name" value="SORT_METHOD_ALBUM" id="1111" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_ALBUM" id="1112" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_ALBUM" id="1113" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1114" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_ALBUM" id="1115" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1116" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1117" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1118" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1119" addr="0x7f8396b0aa10" />
+                    <constant id="1109" addr="0x7f390a8731d0" >
+                        <attributelist id="1110" addr="0x7f390a8731d0" >
+                            <attribute name="sym_name" value="SORT_METHOD_ALBUM" id="1111" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_ALBUM" id="1112" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_ALBUM" id="1113" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1114" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_ALBUM" id="1115" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1116" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1117" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1118" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1119" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1120" addr="0x7f8396b053d0" >
-                        <attributelist id="1121" addr="0x7f8396b053d0" >
-                            <attribute name="sym_name" value="SORT_METHOD_ALBUM_IGNORE_THE" id="1122" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_ALBUM_IGNORE_THE" id="1123" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_ALBUM_IGNORE_THE" id="1124" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1125" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_ALBUM_IGNORE_THE" id="1126" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1127" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1128" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1129" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1130" addr="0x7f8396b0aa10" />
+                    <constant id="1120" addr="0x7f390a8733d0" >
+                        <attributelist id="1121" addr="0x7f390a8733d0" >
+                            <attribute name="sym_name" value="SORT_METHOD_ALBUM_IGNORE_THE" id="1122" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_ALBUM_IGNORE_THE" id="1123" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_ALBUM_IGNORE_THE" id="1124" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1125" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_ALBUM_IGNORE_THE" id="1126" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1127" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1128" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1129" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1130" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1131" addr="0x7f8396b055d0" >
-                        <attributelist id="1132" addr="0x7f8396b055d0" >
-                            <attribute name="sym_name" value="SORT_METHOD_GENRE" id="1133" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_GENRE" id="1134" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_GENRE" id="1135" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1136" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_GENRE" id="1137" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1138" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1139" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1140" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1141" addr="0x7f8396b0aa10" />
+                    <constant id="1131" addr="0x7f390a8735d0" >
+                        <attributelist id="1132" addr="0x7f390a8735d0" >
+                            <attribute name="sym_name" value="SORT_METHOD_GENRE" id="1133" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_GENRE" id="1134" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_GENRE" id="1135" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1136" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_GENRE" id="1137" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1138" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1139" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1140" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1141" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1142" addr="0x7f8396b057d0" >
-                        <attributelist id="1143" addr="0x7f8396b057d0" >
-                            <attribute name="sym_name" value="SORT_METHOD_VIDEO_YEAR" id="1144" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_VIDEO_YEAR" id="1145" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_YEAR" id="1146" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1147" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_YEAR" id="1148" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1149" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1150" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1151" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1152" addr="0x7f8396b0aa10" />
+                    <constant id="1142" addr="0x7f390a8737d0" >
+                        <attributelist id="1143" addr="0x7f390a8737d0" >
+                            <attribute name="sym_name" value="SORT_METHOD_VIDEO_YEAR" id="1144" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_VIDEO_YEAR" id="1145" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_YEAR" id="1146" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1147" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_YEAR" id="1148" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1149" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1150" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1151" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1152" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1153" addr="0x7f8396b059d0" >
-                        <attributelist id="1154" addr="0x7f8396b059d0" >
-                            <attribute name="sym_name" value="SORT_METHOD_VIDEO_RATING" id="1155" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_VIDEO_RATING" id="1156" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_VIDEO_RATING" id="1157" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1158" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_VIDEO_RATING" id="1159" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1160" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1161" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1162" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1163" addr="0x7f8396b0aa10" />
+                    <constant id="1153" addr="0x7f390a8739d0" >
+                        <attributelist id="1154" addr="0x7f390a8739d0" >
+                            <attribute name="sym_name" value="SORT_METHOD_VIDEO_RATING" id="1155" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_VIDEO_RATING" id="1156" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_VIDEO_RATING" id="1157" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1158" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_VIDEO_RATING" id="1159" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1160" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1161" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1162" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1163" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1164" addr="0x7f8396b05bd0" >
-                        <attributelist id="1165" addr="0x7f8396b05bd0" >
-                            <attribute name="sym_name" value="SORT_METHOD_PROGRAM_COUNT" id="1166" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_PROGRAM_COUNT" id="1167" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_PROGRAM_COUNT" id="1168" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1169" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_PROGRAM_COUNT" id="1170" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1171" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1172" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1173" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1174" addr="0x7f8396b0aa10" />
+                    <constant id="1164" addr="0x7f390a873bd0" >
+                        <attributelist id="1165" addr="0x7f390a873bd0" >
+                            <attribute name="sym_name" value="SORT_METHOD_PROGRAM_COUNT" id="1166" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_PROGRAM_COUNT" id="1167" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_PROGRAM_COUNT" id="1168" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1169" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_PROGRAM_COUNT" id="1170" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1171" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1172" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1173" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1174" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1175" addr="0x7f8396b05dd0" >
-                        <attributelist id="1176" addr="0x7f8396b05dd0" >
-                            <attribute name="sym_name" value="SORT_METHOD_PLAYLIST_ORDER" id="1177" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_PLAYLIST_ORDER" id="1178" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_PLAYLIST_ORDER" id="1179" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1180" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_PLAYLIST_ORDER" id="1181" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1182" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1183" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1184" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1185" addr="0x7f8396b0aa10" />
+                    <constant id="1175" addr="0x7f390a873dd0" >
+                        <attributelist id="1176" addr="0x7f390a873dd0" >
+                            <attribute name="sym_name" value="SORT_METHOD_PLAYLIST_ORDER" id="1177" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_PLAYLIST_ORDER" id="1178" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_PLAYLIST_ORDER" id="1179" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1180" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_PLAYLIST_ORDER" id="1181" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1182" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1183" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1184" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1185" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1186" addr="0x7f8396b05fd0" >
-                        <attributelist id="1187" addr="0x7f8396b05fd0" >
-                            <attribute name="sym_name" value="SORT_METHOD_EPISODE" id="1188" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_EPISODE" id="1189" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_EPISODE" id="1190" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1191" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_EPISODE" id="1192" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1193" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1194" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1195" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1196" addr="0x7f8396b0aa10" />
+                    <constant id="1186" addr="0x7f390a873fd0" >
+                        <attributelist id="1187" addr="0x7f390a873fd0" >
+                            <attribute name="sym_name" value="SORT_METHOD_EPISODE" id="1188" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_EPISODE" id="1189" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_EPISODE" id="1190" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1191" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_EPISODE" id="1192" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1193" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1194" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1195" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1196" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1197" addr="0x7f8396b061d0" >
-                        <attributelist id="1198" addr="0x7f8396b061d0" >
-                            <attribute name="sym_name" value="SORT_METHOD_VIDEO_TITLE" id="1199" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_VIDEO_TITLE" id="1200" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_VIDEO_TITLE" id="1201" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1202" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_VIDEO_TITLE" id="1203" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1204" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1205" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1206" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1207" addr="0x7f8396b0aa10" />
+                    <constant id="1197" addr="0x7f390a8741d0" >
+                        <attributelist id="1198" addr="0x7f390a8741d0" >
+                            <attribute name="sym_name" value="SORT_METHOD_VIDEO_TITLE" id="1199" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_VIDEO_TITLE" id="1200" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_VIDEO_TITLE" id="1201" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1202" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_VIDEO_TITLE" id="1203" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1204" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1205" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1206" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1207" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1208" addr="0x7f8396b063d0" >
-                        <attributelist id="1209" addr="0x7f8396b063d0" >
-                            <attribute name="sym_name" value="SORT_METHOD_VIDEO_SORT_TITLE" id="1210" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_VIDEO_SORT_TITLE" id="1211" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_VIDEO_SORT_TITLE" id="1212" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1213" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_VIDEO_SORT_TITLE" id="1214" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1215" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1216" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1217" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1218" addr="0x7f8396b0aa10" />
+                    <constant id="1208" addr="0x7f390a8743d0" >
+                        <attributelist id="1209" addr="0x7f390a8743d0" >
+                            <attribute name="sym_name" value="SORT_METHOD_VIDEO_SORT_TITLE" id="1210" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_VIDEO_SORT_TITLE" id="1211" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_VIDEO_SORT_TITLE" id="1212" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1213" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_VIDEO_SORT_TITLE" id="1214" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1215" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1216" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1217" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1218" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1219" addr="0x7f8396b065d0" >
-                        <attributelist id="1220" addr="0x7f8396b065d0" >
-                            <attribute name="sym_name" value="SORT_METHOD_VIDEO_SORT_TITLE_IGNORE_THE" id="1221" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_VIDEO_SORT_TITLE_IGNORE_THE" id="1222" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_VIDEO_SORT_TITLE_IGNORE_THE" id="1223" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1224" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_VIDEO_SORT_TITLE_IGNORE_THE" id="1225" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1226" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1227" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1228" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1229" addr="0x7f8396b0aa10" />
+                    <constant id="1219" addr="0x7f390a8745d0" >
+                        <attributelist id="1220" addr="0x7f390a8745d0" >
+                            <attribute name="sym_name" value="SORT_METHOD_VIDEO_SORT_TITLE_IGNORE_THE" id="1221" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_VIDEO_SORT_TITLE_IGNORE_THE" id="1222" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_VIDEO_SORT_TITLE_IGNORE_THE" id="1223" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1224" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_VIDEO_SORT_TITLE_IGNORE_THE" id="1225" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1226" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1227" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1228" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1229" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1230" addr="0x7f8396b067d0" >
-                        <attributelist id="1231" addr="0x7f8396b067d0" >
-                            <attribute name="sym_name" value="SORT_METHOD_PRODUCTIONCODE" id="1232" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_PRODUCTIONCODE" id="1233" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_PRODUCTIONCODE" id="1234" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1235" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_PRODUCTIONCODE" id="1236" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1237" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1238" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1239" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1240" addr="0x7f8396b0aa10" />
+                    <constant id="1230" addr="0x7f390a8747d0" >
+                        <attributelist id="1231" addr="0x7f390a8747d0" >
+                            <attribute name="sym_name" value="SORT_METHOD_PRODUCTIONCODE" id="1232" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_PRODUCTIONCODE" id="1233" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_PRODUCTIONCODE" id="1234" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1235" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_PRODUCTIONCODE" id="1236" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1237" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1238" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1239" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1240" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1241" addr="0x7f8396b069d0" >
-                        <attributelist id="1242" addr="0x7f8396b069d0" >
-                            <attribute name="sym_name" value="SORT_METHOD_SONG_RATING" id="1243" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_SONG_RATING" id="1244" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_SONG_RATING" id="1245" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1246" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_SONG_RATING" id="1247" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1248" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1249" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1250" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1251" addr="0x7f8396b0aa10" />
+                    <constant id="1241" addr="0x7f390a8749d0" >
+                        <attributelist id="1242" addr="0x7f390a8749d0" >
+                            <attribute name="sym_name" value="SORT_METHOD_SONG_RATING" id="1243" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_SONG_RATING" id="1244" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_SONG_RATING" id="1245" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1246" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_SONG_RATING" id="1247" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1248" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1249" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1250" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1251" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1252" addr="0x7f8396b06bd0" >
-                        <attributelist id="1253" addr="0x7f8396b06bd0" >
-                            <attribute name="sym_name" value="SORT_METHOD_MPAA_RATING" id="1254" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_MPAA_RATING" id="1255" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_MPAA_RATING" id="1256" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1257" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_MPAA_RATING" id="1258" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1259" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1260" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1261" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1262" addr="0x7f8396b0aa10" />
+                    <constant id="1252" addr="0x7f390a874bd0" >
+                        <attributelist id="1253" addr="0x7f390a874bd0" >
+                            <attribute name="sym_name" value="SORT_METHOD_MPAA_RATING" id="1254" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_MPAA_RATING" id="1255" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_MPAA_RATING" id="1256" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1257" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_MPAA_RATING" id="1258" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1259" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1260" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1261" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1262" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1263" addr="0x7f8396b06dd0" >
-                        <attributelist id="1264" addr="0x7f8396b06dd0" >
-                            <attribute name="sym_name" value="SORT_METHOD_VIDEO_RUNTIME" id="1265" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_VIDEO_RUNTIME" id="1266" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_VIDEO_RUNTIME" id="1267" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1268" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_VIDEO_RUNTIME" id="1269" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1270" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1271" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1272" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1273" addr="0x7f8396b0aa10" />
+                    <constant id="1263" addr="0x7f390a874dd0" >
+                        <attributelist id="1264" addr="0x7f390a874dd0" >
+                            <attribute name="sym_name" value="SORT_METHOD_VIDEO_RUNTIME" id="1265" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_VIDEO_RUNTIME" id="1266" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_VIDEO_RUNTIME" id="1267" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1268" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_VIDEO_RUNTIME" id="1269" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1270" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1271" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1272" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1273" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1274" addr="0x7f8396b06fd0" >
-                        <attributelist id="1275" addr="0x7f8396b06fd0" >
-                            <attribute name="sym_name" value="SORT_METHOD_STUDIO" id="1276" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_STUDIO" id="1277" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_STUDIO" id="1278" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1279" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_STUDIO" id="1280" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1281" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1282" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1283" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1284" addr="0x7f8396b0aa10" />
+                    <constant id="1274" addr="0x7f390a874fd0" >
+                        <attributelist id="1275" addr="0x7f390a874fd0" >
+                            <attribute name="sym_name" value="SORT_METHOD_STUDIO" id="1276" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_STUDIO" id="1277" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_STUDIO" id="1278" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1279" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_STUDIO" id="1280" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1281" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1282" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1283" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1284" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1285" addr="0x7f8396b071d0" >
-                        <attributelist id="1286" addr="0x7f8396b071d0" >
-                            <attribute name="sym_name" value="SORT_METHOD_STUDIO_IGNORE_THE" id="1287" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_STUDIO_IGNORE_THE" id="1288" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_STUDIO_IGNORE_THE" id="1289" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1290" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_STUDIO_IGNORE_THE" id="1291" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1292" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1293" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1294" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1295" addr="0x7f8396b0aa10" />
+                    <constant id="1285" addr="0x7f390a8751d0" >
+                        <attributelist id="1286" addr="0x7f390a8751d0" >
+                            <attribute name="sym_name" value="SORT_METHOD_STUDIO_IGNORE_THE" id="1287" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_STUDIO_IGNORE_THE" id="1288" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_STUDIO_IGNORE_THE" id="1289" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1290" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_STUDIO_IGNORE_THE" id="1291" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1292" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1293" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1294" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1295" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1296" addr="0x7f8396b073d0" >
-                        <attributelist id="1297" addr="0x7f8396b073d0" >
-                            <attribute name="sym_name" value="SORT_METHOD_UNSORTED" id="1298" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_UNSORTED" id="1299" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_UNSORTED" id="1300" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1301" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_UNSORTED" id="1302" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1303" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1304" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1305" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1306" addr="0x7f8396b0aa10" />
+                    <constant id="1296" addr="0x7f390a8753d0" >
+                        <attributelist id="1297" addr="0x7f390a8753d0" >
+                            <attribute name="sym_name" value="SORT_METHOD_UNSORTED" id="1298" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_UNSORTED" id="1299" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_UNSORTED" id="1300" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1301" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_UNSORTED" id="1302" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1303" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1304" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1305" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1306" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1307" addr="0x7f8396b075d0" >
-                        <attributelist id="1308" addr="0x7f8396b075d0" >
-                            <attribute name="sym_name" value="SORT_METHOD_BITRATE" id="1309" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_BITRATE" id="1310" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_BITRATE" id="1311" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1312" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_BITRATE" id="1313" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1314" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1315" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1316" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1317" addr="0x7f8396b0aa10" />
+                    <constant id="1307" addr="0x7f390a8755d0" >
+                        <attributelist id="1308" addr="0x7f390a8755d0" >
+                            <attribute name="sym_name" value="SORT_METHOD_BITRATE" id="1309" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_BITRATE" id="1310" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_BITRATE" id="1311" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1312" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_BITRATE" id="1313" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1314" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1315" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1316" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1317" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1318" addr="0x7f8396b077d0" >
-                        <attributelist id="1319" addr="0x7f8396b077d0" >
-                            <attribute name="sym_name" value="SORT_METHOD_LISTENERS" id="1320" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_LISTENERS" id="1321" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_LISTENERS" id="1322" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1323" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_LISTENERS" id="1324" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1325" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1326" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1327" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1328" addr="0x7f8396b0aa10" />
+                    <constant id="1318" addr="0x7f390a8757d0" >
+                        <attributelist id="1319" addr="0x7f390a8757d0" >
+                            <attribute name="sym_name" value="SORT_METHOD_LISTENERS" id="1320" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_LISTENERS" id="1321" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_LISTENERS" id="1322" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1323" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_LISTENERS" id="1324" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1325" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1326" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1327" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1328" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1329" addr="0x7f8396b079d0" >
-                        <attributelist id="1330" addr="0x7f8396b079d0" >
-                            <attribute name="sym_name" value="SORT_METHOD_COUNTRY" id="1331" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_COUNTRY" id="1332" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_COUNTRY" id="1333" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1334" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_COUNTRY" id="1335" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1336" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1337" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1338" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1339" addr="0x7f8396b0aa10" />
+                    <constant id="1329" addr="0x7f390a8759d0" >
+                        <attributelist id="1330" addr="0x7f390a8759d0" >
+                            <attribute name="sym_name" value="SORT_METHOD_COUNTRY" id="1331" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_COUNTRY" id="1332" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_COUNTRY" id="1333" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1334" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_COUNTRY" id="1335" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1336" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1337" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1338" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1339" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1340" addr="0x7f8396b07bd0" >
-                        <attributelist id="1341" addr="0x7f8396b07bd0" >
-                            <attribute name="sym_name" value="SORT_METHOD_DATEADDED" id="1342" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_DATEADDED" id="1343" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_DATEADDED" id="1344" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1345" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_DATEADDED" id="1346" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1347" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1348" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1349" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1350" addr="0x7f8396b0aa10" />
+                    <constant id="1340" addr="0x7f390a875bd0" >
+                        <attributelist id="1341" addr="0x7f390a875bd0" >
+                            <attribute name="sym_name" value="SORT_METHOD_DATEADDED" id="1342" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_DATEADDED" id="1343" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_DATEADDED" id="1344" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1345" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_DATEADDED" id="1346" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1347" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1348" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1349" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1350" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1351" addr="0x7f8396b07dd0" >
-                        <attributelist id="1352" addr="0x7f8396b07dd0" >
-                            <attribute name="sym_name" value="SORT_METHOD_FULLPATH" id="1353" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_FULLPATH" id="1354" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_FULLPATH" id="1355" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1356" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_FULLPATH" id="1357" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1358" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1359" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1360" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1361" addr="0x7f8396b0aa10" />
+                    <constant id="1351" addr="0x7f390a875dd0" >
+                        <attributelist id="1352" addr="0x7f390a875dd0" >
+                            <attribute name="sym_name" value="SORT_METHOD_FULLPATH" id="1353" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_FULLPATH" id="1354" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_FULLPATH" id="1355" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1356" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_FULLPATH" id="1357" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1358" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1359" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1360" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1361" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1362" addr="0x7f8396b07fd0" >
-                        <attributelist id="1363" addr="0x7f8396b07fd0" >
-                            <attribute name="sym_name" value="SORT_METHOD_LABEL_IGNORE_FOLDERS" id="1364" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_LABEL_IGNORE_FOLDERS" id="1365" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_LABEL_IGNORE_FOLDERS" id="1366" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1367" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_LABEL_IGNORE_FOLDERS" id="1368" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1369" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1370" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1371" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1372" addr="0x7f8396b0aa10" />
+                    <constant id="1362" addr="0x7f390a875fd0" >
+                        <attributelist id="1363" addr="0x7f390a875fd0" >
+                            <attribute name="sym_name" value="SORT_METHOD_LABEL_IGNORE_FOLDERS" id="1364" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_LABEL_IGNORE_FOLDERS" id="1365" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_LABEL_IGNORE_FOLDERS" id="1366" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1367" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_LABEL_IGNORE_FOLDERS" id="1368" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1369" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1370" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1371" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1372" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1373" addr="0x7f8396b081d0" >
-                        <attributelist id="1374" addr="0x7f8396b081d0" >
-                            <attribute name="sym_name" value="SORT_METHOD_LASTPLAYED" id="1375" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_LASTPLAYED" id="1376" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_LASTPLAYED" id="1377" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1378" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_LASTPLAYED" id="1379" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1380" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1381" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1382" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1383" addr="0x7f8396b0aa10" />
+                    <constant id="1373" addr="0x7f390a8761d0" >
+                        <attributelist id="1374" addr="0x7f390a8761d0" >
+                            <attribute name="sym_name" value="SORT_METHOD_LASTPLAYED" id="1375" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_LASTPLAYED" id="1376" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_LASTPLAYED" id="1377" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1378" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_LASTPLAYED" id="1379" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1380" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1381" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1382" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1383" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1384" addr="0x7f8396b083d0" >
-                        <attributelist id="1385" addr="0x7f8396b083d0" >
-                            <attribute name="sym_name" value="SORT_METHOD_PLAYCOUNT" id="1386" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_PLAYCOUNT" id="1387" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_PLAYCOUNT" id="1388" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1389" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_PLAYCOUNT" id="1390" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1391" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1392" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1393" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1394" addr="0x7f8396b0aa10" />
+                    <constant id="1384" addr="0x7f390a8763d0" >
+                        <attributelist id="1385" addr="0x7f390a8763d0" >
+                            <attribute name="sym_name" value="SORT_METHOD_PLAYCOUNT" id="1386" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_PLAYCOUNT" id="1387" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_PLAYCOUNT" id="1388" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1389" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_PLAYCOUNT" id="1390" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1391" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1392" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1393" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1394" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1395" addr="0x7f8396b085d0" >
-                        <attributelist id="1396" addr="0x7f8396b085d0" >
-                            <attribute name="sym_name" value="SORT_METHOD_CHANNEL" id="1397" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_CHANNEL" id="1398" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_CHANNEL" id="1399" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1400" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_CHANNEL" id="1401" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1402" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1403" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1404" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1405" addr="0x7f8396b0aa10" />
+                    <constant id="1395" addr="0x7f390a8765d0" >
+                        <attributelist id="1396" addr="0x7f390a8765d0" >
+                            <attribute name="sym_name" value="SORT_METHOD_CHANNEL" id="1397" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_CHANNEL" id="1398" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_CHANNEL" id="1399" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1400" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_CHANNEL" id="1401" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1402" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1403" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1404" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1405" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1406" addr="0x7f8396b087d0" >
-                        <attributelist id="1407" addr="0x7f8396b087d0" >
-                            <attribute name="sym_name" value="SORT_METHOD_DATE_TAKEN" id="1408" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_DATE_TAKEN" id="1409" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_DATE_TAKEN" id="1410" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1411" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_DATE_TAKEN" id="1412" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1413" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1414" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1415" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1416" addr="0x7f8396b0aa10" />
+                    <constant id="1406" addr="0x7f390a8767d0" >
+                        <attributelist id="1407" addr="0x7f390a8767d0" >
+                            <attribute name="sym_name" value="SORT_METHOD_DATE_TAKEN" id="1408" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_DATE_TAKEN" id="1409" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_DATE_TAKEN" id="1410" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1411" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_DATE_TAKEN" id="1412" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1413" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1414" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1415" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1416" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1417" addr="0x7f8396b089d0" >
-                        <attributelist id="1418" addr="0x7f8396b089d0" >
-                            <attribute name="sym_name" value="SORT_METHOD_VIDEO_USER_RATING" id="1419" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_VIDEO_USER_RATING" id="1420" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_VIDEO_USER_RATING" id="1421" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1422" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_VIDEO_USER_RATING" id="1423" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1424" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1425" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1426" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1427" addr="0x7f8396b0aa10" />
+                    <constant id="1417" addr="0x7f390a8769d0" >
+                        <attributelist id="1418" addr="0x7f390a8769d0" >
+                            <attribute name="sym_name" value="SORT_METHOD_VIDEO_USER_RATING" id="1419" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_VIDEO_USER_RATING" id="1420" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_VIDEO_USER_RATING" id="1421" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1422" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_VIDEO_USER_RATING" id="1423" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1424" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1425" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1426" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1427" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
-                    <constant id="1428" addr="0x7f8396b08bd0" >
-                        <attributelist id="1429" addr="0x7f8396b08bd0" >
-                            <attribute name="sym_name" value="SORT_METHOD_SONG_USER_RATING" id="1430" addr="0x7f8396b0aa10" />
-                            <attribute name="name" value="SORT_METHOD_SONG_USER_RATING" id="1431" addr="0x7f8396b0aa10" />
-                            <attribute name="rawval" value="SORT_METHOD_SONG_USER_RATING" id="1432" addr="0x7f8396b0aa10" />
-                            <attribute name="feature_immutable" value="1" id="1433" addr="0x7f8396b0aa10" />
-                            <attribute name="value" value="SORT_METHOD_SONG_USER_RATING" id="1434" addr="0x7f8396b0aa10" />
-                            <attribute name="storage" value="%constant" id="1435" addr="0x7f8396b0aa10" />
-                            <attribute name="type" value="int" id="1436" addr="0x7f8396b0aa10" />
-                            <attribute name="sym_symtab" value="0x7f8396afdab0" id="1437" addr="0x7f8396afdab0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1438" addr="0x7f8396b0aa10" />
+                    <constant id="1428" addr="0x7f390a876bd0" >
+                        <attributelist id="1429" addr="0x7f390a876bd0" >
+                            <attribute name="sym_name" value="SORT_METHOD_SONG_USER_RATING" id="1430" addr="0x7f390a878a10" />
+                            <attribute name="name" value="SORT_METHOD_SONG_USER_RATING" id="1431" addr="0x7f390a878a10" />
+                            <attribute name="rawval" value="SORT_METHOD_SONG_USER_RATING" id="1432" addr="0x7f390a878a10" />
+                            <attribute name="feature_immutable" value="1" id="1433" addr="0x7f390a878a10" />
+                            <attribute name="value" value="SORT_METHOD_SONG_USER_RATING" id="1434" addr="0x7f390a878a10" />
+                            <attribute name="storage" value="%constant" id="1435" addr="0x7f390a878a10" />
+                            <attribute name="type" value="int" id="1436" addr="0x7f390a878a10" />
+                            <attribute name="sym_symtab" value="0x7f390a86bab0" id="1437" addr="0x7f390a86bab0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1438" addr="0x7f390a878a10" />
                         </attributelist >
                      
                     </constant >
diff --git a/srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmcvfs.i.cpp b/srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmcvfs.i.cpp
similarity index 99%
rename from srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmcvfs.i.cpp
rename to srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmcvfs.i.cpp
index 332776462db..7f812820c6e 100644
--- a/srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmcvfs.i.cpp
+++ b/srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmcvfs.i.cpp
@@ -1575,7 +1575,7 @@ namespace PythonBindings
 
    // constants
    PyModule_AddStringConstant(module, "__author__", "Team Kodi <http://kodi.tv>");
-   PyModule_AddStringConstant(module, "__date__", "Wed Jun 19 18:36:52 GMT 2019");
+   PyModule_AddStringConstant(module, "__date__", "Sun Sep 01 10:46:59 GMT 2019");
    PyModule_AddStringConstant(module, "__version__", "2.26.0");
    PyModule_AddStringConstant(module, "__credits__", "Team Kodi");
    PyModule_AddStringConstant(module, "__platform__", "ALL");
diff --git a/srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmcvfs.i.xml b/srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmcvfs.i.xml
similarity index 59%
rename from srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmcvfs.i.xml
rename to srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmcvfs.i.xml
index f2f53954482..c6fb95bf1f8 100644
--- a/srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmcvfs.i.xml
+++ b/srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmcvfs.i.xml
@@ -1,141 +1,141 @@
 <?xml version="1.0" ?> 
-<top id="1" addr="0x7f20c7094b30" >
-    <attributelist id="2" addr="0x7f20c7094b30" >
-        <attribute name="outfile" value="AddonModuleXbmcvfs.i.xml" id="3" addr="0x7f20c70b39f0" />
-        <attribute name="name" value="xbmcvfs" id="4" addr="0x7f20c70b39f0" />
-        <attribute name="module" value="xbmcvfs" id="5" addr="0x7f20c70aa090" />
-        <attribute name="inputfile" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmcvfs.i" id="6" addr="0x7f20c70b39f0" />
-        <attribute name="classes" value="0x7f20c70a7650" id="7" addr="0x7f20c70a7650" />
-        <attribute name="infile" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmcvfs.i" id="8" addr="0x7f20c70b39f0" />
-        <attribute name="outfile_h" value="AddonModuleXbmcvfs.i.h" id="9" addr="0x7f20c70b39f0" />
+<top id="1" addr="0x7f658f81fb30" >
+    <attributelist id="2" addr="0x7f658f81fb30" >
+        <attribute name="outfile" value="AddonModuleXbmcvfs.i.xml" id="3" addr="0x7f658f83e9f0" />
+        <attribute name="name" value="xbmcvfs" id="4" addr="0x7f658f83e9f0" />
+        <attribute name="module" value="xbmcvfs" id="5" addr="0x7f658f835090" />
+        <attribute name="inputfile" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmcvfs.i" id="6" addr="0x7f658f83e9f0" />
+        <attribute name="classes" value="0x7f658f832650" id="7" addr="0x7f658f832650" />
+        <attribute name="infile" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmcvfs.i" id="8" addr="0x7f658f83e9f0" />
+        <attribute name="outfile_h" value="AddonModuleXbmcvfs.i.h" id="9" addr="0x7f658f83e9f0" />
     </attributelist >
 
-    <include id="10" addr="0x7f20c70a4ed0" >
-        <attributelist id="11" addr="0x7f20c70a4ed0" >
-            <attribute name="name" value="/usr/share/swig/3.0.12/swig.swg" id="12" addr="0x7f20c70b39f0" />
+    <include id="10" addr="0x7f658f82fed0" >
+        <attributelist id="11" addr="0x7f658f82fed0" >
+            <attribute name="name" value="/usr/share/swig/3.0.12/swig.swg" id="12" addr="0x7f658f83e9f0" />
         </attributelist >
 
-        <include id="13" addr="0x7f20c70a4f30" >
-            <attributelist id="14" addr="0x7f20c70a4f30" >
-                <attribute name="name" value="/usr/share/swig/3.0.12/swigwarnings.swg" id="15" addr="0x7f20c70b39f0" />
+        <include id="13" addr="0x7f658f82ff30" >
+            <attributelist id="14" addr="0x7f658f82ff30" >
+                <attribute name="name" value="/usr/share/swig/3.0.12/swigwarnings.swg" id="15" addr="0x7f658f83e9f0" />
             </attributelist >
 
-            <include id="16" addr="0x7f20c70a54f0" >
-                <attributelist id="17" addr="0x7f20c70a54f0" >
-                    <attribute name="name" value="/usr/share/swig/3.0.12/swigwarn.swg" id="18" addr="0x7f20c70b39f0" />
+            <include id="16" addr="0x7f658f8304f0" >
+                <attributelist id="17" addr="0x7f658f8304f0" >
+                    <attribute name="name" value="/usr/share/swig/3.0.12/swigwarn.swg" id="18" addr="0x7f658f83e9f0" />
                 </attributelist >
              
             </include >
         </include >
-        <namespace id="19" addr="0x7f20c70a7170" >
-            <attributelist id="20" addr="0x7f20c70a7170" >
-                <attribute name="sym_name" value="std" id="21" addr="0x7f20c70b39f0" />
-                <attribute name="name" value="std" id="22" addr="0x7f20c70b39f0" />
-                <typescope id="23" addr="0x7f20c70b19f0" >
-                    <attributelist id="24" addr="0x7f20c70b19f0" >
-                        <attribute name="name" value="std" id="25" addr="0x7f20c70b39f0" />
-                        <typetab id="26" addr="0x7f20c70b1a10" >
-                            <attributelist id="27" addr="0x7f20c70b1a10" >
-                                <attribute name="initializer_list" value="initializer_list" id="28" addr="0x7f20c70b39f0" />
-                            </attributelist >
-                            <typetabsitem id="29" addr="0x7f20c70b1b30" >
-                                <attributelist id="30" addr="0x7f20c70b1b30" >
+        <namespace id="19" addr="0x7f658f832170" >
+            <attributelist id="20" addr="0x7f658f832170" >
+                <attribute name="sym_name" value="std" id="21" addr="0x7f658f83e9f0" />
+                <attribute name="name" value="std" id="22" addr="0x7f658f83e9f0" />
+                <typescope id="23" addr="0x7f658f83c9f0" >
+                    <attributelist id="24" addr="0x7f658f83c9f0" >
+                        <attribute name="name" value="std" id="25" addr="0x7f658f83e9f0" />
+                        <typetab id="26" addr="0x7f658f83ca10" >
+                            <attributelist id="27" addr="0x7f658f83ca10" >
+                                <attribute name="initializer_list" value="initializer_list" id="28" addr="0x7f658f83e9f0" />
+                            </attributelist >
+                            <typetabsitem id="29" addr="0x7f658f83cb30" >
+                                <attributelist id="30" addr="0x7f658f83cb30" >
                                 </attributelist >
                             </typetabsitem >
                         </typetab >
-                        <attribute name="parent" value="0x7f20c7093a30" id="31" addr="0x7f20c7093a30" />
-                        <attribute name="qname" value="std" id="32" addr="0x7f20c70b39f0" />
-                        <attribute name="symtab" value="0x7f20c70a70d0" id="33" addr="0x7f20c70a70d0" />
+                        <attribute name="parent" value="0x7f658f81ea30" id="31" addr="0x7f658f81ea30" />
+                        <attribute name="qname" value="std" id="32" addr="0x7f658f83e9f0" />
+                        <attribute name="symtab" value="0x7f658f8320d0" id="33" addr="0x7f658f8320d0" />
                     </attributelist >
-                    <typescopesitem id="34" addr="0x7f20c70a7030" >
-                        <attributelist id="35" addr="0x7f20c70a7030" >
+                    <typescopesitem id="34" addr="0x7f658f832030" >
+                        <attributelist id="35" addr="0x7f658f832030" >
                         </attributelist >
                     </typescopesitem >
-                    <typescopesitem id="36" addr="0x7f20c70b1a10" >
-                        <attributelist id="37" addr="0x7f20c70b1a10" >
-                            <attribute name="initializer_list" value="initializer_list" id="38" addr="0x7f20c70b39f0" />
+                    <typescopesitem id="36" addr="0x7f658f83ca10" >
+                        <attributelist id="37" addr="0x7f658f83ca10" >
+                            <attribute name="initializer_list" value="initializer_list" id="38" addr="0x7f658f83e9f0" />
                         </attributelist >
                     </typescopesitem >
-                    <typescopesitem id="39" addr="0x7f20c7093a30" >
-                        <attributelist id="40" addr="0x7f20c7093a30" >
-                            <attribute name="name" value="" id="41" addr="0x7f20c70b39f0" />
-                            <typetab id="42" addr="0x7f20c7093a90" >
-                                <attributelist id="43" addr="0x7f20c7093a90" >
+                    <typescopesitem id="39" addr="0x7f658f81ea30" >
+                        <attributelist id="40" addr="0x7f658f81ea30" >
+                            <attribute name="name" value="" id="41" addr="0x7f658f83e9f0" />
+                            <typetab id="42" addr="0x7f658f81ea90" >
+                                <attributelist id="43" addr="0x7f658f81ea90" >
                                 </attributelist >
                             </typetab >
                         </attributelist >
                     </typescopesitem >
-                    <typescopesitem id="44" addr="0x7f20c70b1a30" >
-                        <attributelist id="45" addr="0x7f20c70b1a30" >
+                    <typescopesitem id="44" addr="0x7f658f83ca30" >
+                        <attributelist id="45" addr="0x7f658f83ca30" >
                         </attributelist >
                     </typescopesitem >
-                    <typescopesitem id="46" addr="0x7f20c70a70d0" >
-                        <attributelist id="47" addr="0x7f20c70a70d0" >
-                            <attribute name="name" value="std" id="48" addr="0x7f20c70b39f0" />
-                            <attribute name="csymtab" value="0x7f20c70a7110" id="49" addr="0x7f20c70a7110" />
-                            <attribute name="symtab" value="0x7f20c70a70b0" id="50" addr="0x7f20c70a70b0" />
+                    <typescopesitem id="46" addr="0x7f658f8320d0" >
+                        <attributelist id="47" addr="0x7f658f8320d0" >
+                            <attribute name="name" value="std" id="48" addr="0x7f658f83e9f0" />
+                            <attribute name="csymtab" value="0x7f658f832110" id="49" addr="0x7f658f832110" />
+                            <attribute name="symtab" value="0x7f658f8320b0" id="50" addr="0x7f658f8320b0" />
                         </attributelist >
                     </typescopesitem >
                 </typescope >
-                <attribute name="symtab" value="0x7f20c70a70d0" id="51" addr="0x7f20c70a70d0" />
-                <attribute name="sym_symtab" value="0x7f20c7093950" id="52" addr="0x7f20c7093950" />
-                <attribute name="sym_overname" value="__SWIG_0" id="53" addr="0x7f20c70b39f0" />
+                <attribute name="symtab" value="0x7f658f8320d0" id="51" addr="0x7f658f8320d0" />
+                <attribute name="sym_symtab" value="0x7f658f81e950" id="52" addr="0x7f658f81e950" />
+                <attribute name="sym_overname" value="__SWIG_0" id="53" addr="0x7f658f83e9f0" />
             </attributelist >
 
-            <template id="54" addr="0x7f20c70a72f0" >
-                <attributelist id="55" addr="0x7f20c70a72f0" >
-                    <attribute name="templatetype" value="class" id="56" addr="0x7f20c70b39f0" />
-                    <attribute name="sym_typename" value="1" id="57" addr="0x7f20c70b39f0" />
-                    <attribute name="name" value="initializer_list" id="58" addr="0x7f20c70b39f0" />
-                    <attribute name="sym_symtab" value="0x7f20c70a70d0" id="59" addr="0x7f20c70a70d0" />
-                    <attribute name="symtab" value="0x7f20c70a7510" id="60" addr="0x7f20c70a7510" />
-                    <attribute name="allows_typedef" value="1" id="61" addr="0x7f20c70b39f0" />
-                    <attribute name="kind" value="class" id="62" addr="0x7f20c70b39f0" />
-                    <attribute name="sym_name" value="initializer_list" id="63" addr="0x7f20c70b39f0" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="64" addr="0x7f20c70b39f0" />
-                    <templateparms id="65" addr="0x7f20c70a7210" >
+            <template id="54" addr="0x7f658f8322f0" >
+                <attributelist id="55" addr="0x7f658f8322f0" >
+                    <attribute name="templatetype" value="class" id="56" addr="0x7f658f83e9f0" />
+                    <attribute name="sym_typename" value="1" id="57" addr="0x7f658f83e9f0" />
+                    <attribute name="name" value="initializer_list" id="58" addr="0x7f658f83e9f0" />
+                    <attribute name="sym_symtab" value="0x7f658f8320d0" id="59" addr="0x7f658f8320d0" />
+                    <attribute name="symtab" value="0x7f658f832510" id="60" addr="0x7f658f832510" />
+                    <attribute name="allows_typedef" value="1" id="61" addr="0x7f658f83e9f0" />
+                    <attribute name="kind" value="class" id="62" addr="0x7f658f83e9f0" />
+                    <attribute name="sym_name" value="initializer_list" id="63" addr="0x7f658f83e9f0" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="64" addr="0x7f658f83e9f0" />
+                    <templateparms id="65" addr="0x7f658f832210" >
                         <parm id="66">
-                            <attributelist id="67" addr="0x7f20c70a7210" >
-                                <attribute name="name" value="T" id="68" addr="0x7f20c70b39f0" />
-                                <attribute name="type" value="typename T" id="69" addr="0x7f20c70b39f0" />
+                            <attributelist id="67" addr="0x7f658f832210" >
+                                <attribute name="name" value="T" id="68" addr="0x7f658f83e9f0" />
+                                <attribute name="type" value="typename T" id="69" addr="0x7f658f83e9f0" />
                             </attributelist >
                         </parm >
                     </templateparms >
                 </attributelist >
 
-                <access id="70" addr="0x7f20c70a76d0" >
-                    <attributelist id="71" addr="0x7f20c70a76d0" >
-                        <attribute name="kind" value="public" id="72" addr="0x7f20c70b39f0" />
+                <access id="70" addr="0x7f658f8326d0" >
+                    <attributelist id="71" addr="0x7f658f8326d0" >
+                        <attribute name="kind" value="public" id="72" addr="0x7f658f83e9f0" />
                     </attributelist >
                  
                 </access >
             </template >
-            <typemap id="73" addr="0x7f20c70a7d30" >
-                <attributelist id="74" addr="0x7f20c70a7d30" >
-                    <kwargs id="75" addr="0x7f20c70a7a30" >
-                        <attributelist id="76" addr="0x7f20c70a7a30" >
-                            <attribute name="name" value="warning" id="77" addr="0x7f20c70b39f0" />
-                            <attribute name="value" value="476:Initialization using std::initializer_list." id="78" addr="0x7f20c70b39f0" />
+            <typemap id="73" addr="0x7f658f832d30" >
+                <attributelist id="74" addr="0x7f658f832d30" >
+                    <kwargs id="75" addr="0x7f658f832a30" >
+                        <attributelist id="76" addr="0x7f658f832a30" >
+                            <attribute name="name" value="warning" id="77" addr="0x7f658f83e9f0" />
+                            <attribute name="value" value="476:Initialization using std::initializer_list." id="78" addr="0x7f658f83e9f0" />
                         </attributelist >
-                        <kwargssitem id="79" addr="0x7f20c70a7bb0" >
-                            <attributelist id="80" addr="0x7f20c70a7bb0" >
+                        <kwargssitem id="79" addr="0x7f658f832bb0" >
+                            <attributelist id="80" addr="0x7f658f832bb0" >
                             </attributelist >
                         </kwargssitem >
-                        <kwargssitem id="81" addr="0x7f20c70a7a10" >
-                            <attributelist id="82" addr="0x7f20c70a7a10" >
+                        <kwargssitem id="81" addr="0x7f658f832a10" >
+                            <attributelist id="82" addr="0x7f658f832a10" >
                             </attributelist >
                         </kwargssitem >
                     </kwargs >
-                    <attribute name="code" value="" id="83" addr="0x7f20c70b39f0" />
-                    <attribute name="method" value="in" id="84" addr="0x7f20c70b39f0" />
+                    <attribute name="code" value="" id="83" addr="0x7f658f83e9f0" />
+                    <attribute name="method" value="in" id="84" addr="0x7f658f83e9f0" />
                 </attributelist >
 
-                <typemapitem id="85" addr="0x7f20c70a7c50" >
-                    <attributelist id="86" addr="0x7f20c70a7c50" >
-                        <parmlist id="87" addr="0x7f20c70a7c90" >
+                <typemapitem id="85" addr="0x7f658f832c50" >
+                    <attributelist id="86" addr="0x7f658f832c50" >
+                        <parmlist id="87" addr="0x7f658f832c90" >
                             <parm id="88">
-                                <attributelist id="89" addr="0x7f20c70a7c90" >
-                                    <attribute name="type" value="std::initializer_list&lt;(T)>" id="90" addr="0x7f20c70b39f0" />
+                                <attributelist id="89" addr="0x7f658f832c90" >
+                                    <attribute name="type" value="std::initializer_list&lt;(T)>" id="90" addr="0x7f658f83e9f0" />
                                 </attributelist >
                             </parm >
                         </parmlist >
@@ -143,32 +143,32 @@
                  
                 </typemapitem >
             </typemap >
-            <typemap id="91" addr="0x7f20c70a80b0" >
-                <attributelist id="92" addr="0x7f20c70a80b0" >
-                    <kwargs id="93" addr="0x7f20c70a7e50" >
-                        <attributelist id="94" addr="0x7f20c70a7e50" >
-                            <attribute name="name" value="precedence" id="95" addr="0x7f20c70b39f0" />
-                            <attribute name="value" value="0" id="96" addr="0x7f20c70b39f0" />
+            <typemap id="91" addr="0x7f658f8330b0" >
+                <attributelist id="92" addr="0x7f658f8330b0" >
+                    <kwargs id="93" addr="0x7f658f832e50" >
+                        <attributelist id="94" addr="0x7f658f832e50" >
+                            <attribute name="name" value="precedence" id="95" addr="0x7f658f83e9f0" />
+                            <attribute name="value" value="0" id="96" addr="0x7f658f83e9f0" />
                         </attributelist >
-                        <kwargssitem id="97" addr="0x7f20c70a7e70" >
-                            <attributelist id="98" addr="0x7f20c70a7e70" >
+                        <kwargssitem id="97" addr="0x7f658f832e70" >
+                            <attributelist id="98" addr="0x7f658f832e70" >
                             </attributelist >
                         </kwargssitem >
-                        <kwargssitem id="99" addr="0x7f20c70a7e90" >
-                            <attributelist id="100" addr="0x7f20c70a7e90" >
+                        <kwargssitem id="99" addr="0x7f658f832e90" >
+                            <attributelist id="100" addr="0x7f658f832e90" >
                             </attributelist >
                         </kwargssitem >
                     </kwargs >
-                    <attribute name="code" value="" id="101" addr="0x7f20c70b39f0" />
-                    <attribute name="method" value="typecheck" id="102" addr="0x7f20c70b39f0" />
+                    <attribute name="code" value="" id="101" addr="0x7f658f83e9f0" />
+                    <attribute name="method" value="typecheck" id="102" addr="0x7f658f83e9f0" />
                 </attributelist >
 
-                <typemapitem id="103" addr="0x7f20c70a7ff0" >
-                    <attributelist id="104" addr="0x7f20c70a7ff0" >
-                        <parmlist id="105" addr="0x7f20c70a8030" >
+                <typemapitem id="103" addr="0x7f658f832ff0" >
+                    <attributelist id="104" addr="0x7f658f832ff0" >
+                        <parmlist id="105" addr="0x7f658f833030" >
                             <parm id="106">
-                                <attributelist id="107" addr="0x7f20c70a8030" >
-                                    <attribute name="type" value="std::initializer_list&lt;(T)>" id="108" addr="0x7f20c70b39f0" />
+                                <attributelist id="107" addr="0x7f658f833030" >
+                                    <attribute name="type" value="std::initializer_list&lt;(T)>" id="108" addr="0x7f658f83e9f0" />
                                 </attributelist >
                             </parm >
                         </parmlist >
@@ -177,18 +177,18 @@
                 </typemapitem >
             </typemap >
         </namespace >
-        <typemap id="109" addr="0x7f20c70a82d0" >
-            <attributelist id="110" addr="0x7f20c70a82d0" >
-                <attribute name="code" value="delete [] $1;" id="111" addr="0x7f20c70b39f0" />
-                <attribute name="method" value="newfree" id="112" addr="0x7f20c70b39f0" />
+        <typemap id="109" addr="0x7f658f8332d0" >
+            <attributelist id="110" addr="0x7f658f8332d0" >
+                <attribute name="code" value="delete [] $1;" id="111" addr="0x7f658f83e9f0" />
+                <attribute name="method" value="newfree" id="112" addr="0x7f658f83e9f0" />
             </attributelist >
 
-            <typemapitem id="113" addr="0x7f20c70a81f0" >
-                <attributelist id="114" addr="0x7f20c70a81f0" >
-                    <parmlist id="115" addr="0x7f20c70a8230" >
+            <typemapitem id="113" addr="0x7f658f8331f0" >
+                <attributelist id="114" addr="0x7f658f8331f0" >
+                    <parmlist id="115" addr="0x7f658f833230" >
                         <parm id="116">
-                            <attributelist id="117" addr="0x7f20c70a8230" >
-                                <attribute name="type" value="p.char" id="118" addr="0x7f20c70b39f0" />
+                            <attributelist id="117" addr="0x7f658f833230" >
+                                <attribute name="type" value="p.char" id="118" addr="0x7f658f83e9f0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -196,18 +196,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="119" addr="0x7f20c70a84b0" >
-            <attributelist id="120" addr="0x7f20c70a84b0" >
-                <attribute name="code" value="{&#10;  delete [] $1;&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="121" addr="0x7f20c70b39f0" />
-                <attribute name="method" value="memberin" id="122" addr="0x7f20c70b39f0" />
+        <typemap id="119" addr="0x7f658f8334b0" >
+            <attributelist id="120" addr="0x7f658f8334b0" >
+                <attribute name="code" value="{&#10;  delete [] $1;&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="121" addr="0x7f658f83e9f0" />
+                <attribute name="method" value="memberin" id="122" addr="0x7f658f83e9f0" />
             </attributelist >
 
-            <typemapitem id="123" addr="0x7f20c70a83f0" >
-                <attributelist id="124" addr="0x7f20c70a83f0" >
-                    <parmlist id="125" addr="0x7f20c70a8430" >
+            <typemapitem id="123" addr="0x7f658f8333f0" >
+                <attributelist id="124" addr="0x7f658f8333f0" >
+                    <parmlist id="125" addr="0x7f658f833430" >
                         <parm id="126">
-                            <attributelist id="127" addr="0x7f20c70a8430" >
-                                <attribute name="type" value="p.char" id="128" addr="0x7f20c70b39f0" />
+                            <attributelist id="127" addr="0x7f658f833430" >
+                                <attribute name="type" value="p.char" id="128" addr="0x7f658f83e9f0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -215,32 +215,32 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="129" addr="0x7f20c70a8710" >
-            <attributelist id="130" addr="0x7f20c70a8710" >
-                <kwargs id="131" addr="0x7f20c70a8550" >
-                    <attributelist id="132" addr="0x7f20c70a8550" >
-                        <attribute name="name" value="warning" id="133" addr="0x7f20c70b39f0" />
-                        <attribute name="value" value="451:Setting a const char * variable may leak memory." id="134" addr="0x7f20c70b39f0" />
+        <typemap id="129" addr="0x7f658f833710" >
+            <attributelist id="130" addr="0x7f658f833710" >
+                <kwargs id="131" addr="0x7f658f833550" >
+                    <attributelist id="132" addr="0x7f658f833550" >
+                        <attribute name="name" value="warning" id="133" addr="0x7f658f83e9f0" />
+                        <attribute name="value" value="451:Setting a const char * variable may leak memory." id="134" addr="0x7f658f83e9f0" />
                     </attributelist >
-                    <kwargssitem id="135" addr="0x7f20c70a8570" >
-                        <attributelist id="136" addr="0x7f20c70a8570" >
+                    <kwargssitem id="135" addr="0x7f658f833570" >
+                        <attributelist id="136" addr="0x7f658f833570" >
                         </attributelist >
                     </kwargssitem >
-                    <kwargssitem id="137" addr="0x7f20c70a8530" >
-                        <attributelist id="138" addr="0x7f20c70a8530" >
+                    <kwargssitem id="137" addr="0x7f658f833530" >
+                        <attributelist id="138" addr="0x7f658f833530" >
                         </attributelist >
                     </kwargssitem >
                 </kwargs >
-                <attribute name="code" value="{&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="139" addr="0x7f20c70b39f0" />
-                <attribute name="method" value="memberin" id="140" addr="0x7f20c70b39f0" />
+                <attribute name="code" value="{&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="139" addr="0x7f658f83e9f0" />
+                <attribute name="method" value="memberin" id="140" addr="0x7f658f83e9f0" />
             </attributelist >
 
-            <typemapitem id="141" addr="0x7f20c70a8650" >
-                <attributelist id="142" addr="0x7f20c70a8650" >
-                    <parmlist id="143" addr="0x7f20c70a8690" >
+            <typemapitem id="141" addr="0x7f658f833650" >
+                <attributelist id="142" addr="0x7f658f833650" >
+                    <parmlist id="143" addr="0x7f658f833690" >
                         <parm id="144">
-                            <attributelist id="145" addr="0x7f20c70a8690" >
-                                <attribute name="type" value="p.q(const).char" id="146" addr="0x7f20c70b39f0" />
+                            <attributelist id="145" addr="0x7f658f833690" >
+                                <attribute name="type" value="p.q(const).char" id="146" addr="0x7f658f83e9f0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -248,18 +248,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="147" addr="0x7f20c70a88f0" >
-            <attributelist id="148" addr="0x7f20c70a88f0" >
-                <attribute name="code" value="{&#10;  delete [] $1;&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="149" addr="0x7f20c70b39f0" />
-                <attribute name="method" value="globalin" id="150" addr="0x7f20c70b39f0" />
+        <typemap id="147" addr="0x7f658f8338f0" >
+            <attributelist id="148" addr="0x7f658f8338f0" >
+                <attribute name="code" value="{&#10;  delete [] $1;&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="149" addr="0x7f658f83e9f0" />
+                <attribute name="method" value="globalin" id="150" addr="0x7f658f83e9f0" />
             </attributelist >
 
-            <typemapitem id="151" addr="0x7f20c70a8830" >
-                <attributelist id="152" addr="0x7f20c70a8830" >
-                    <parmlist id="153" addr="0x7f20c70a8870" >
+            <typemapitem id="151" addr="0x7f658f833830" >
+                <attributelist id="152" addr="0x7f658f833830" >
+                    <parmlist id="153" addr="0x7f658f833870" >
                         <parm id="154">
-                            <attributelist id="155" addr="0x7f20c70a8870" >
-                                <attribute name="type" value="p.char" id="156" addr="0x7f20c70b39f0" />
+                            <attributelist id="155" addr="0x7f658f833870" >
+                                <attribute name="type" value="p.char" id="156" addr="0x7f658f83e9f0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -267,32 +267,32 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="157" addr="0x7f20c70a8b50" >
-            <attributelist id="158" addr="0x7f20c70a8b50" >
-                <kwargs id="159" addr="0x7f20c70a8990" >
-                    <attributelist id="160" addr="0x7f20c70a8990" >
-                        <attribute name="name" value="warning" id="161" addr="0x7f20c70b39f0" />
-                        <attribute name="value" value="451:Setting a const char * variable may leak memory." id="162" addr="0x7f20c70b39f0" />
+        <typemap id="157" addr="0x7f658f833b50" >
+            <attributelist id="158" addr="0x7f658f833b50" >
+                <kwargs id="159" addr="0x7f658f833990" >
+                    <attributelist id="160" addr="0x7f658f833990" >
+                        <attribute name="name" value="warning" id="161" addr="0x7f658f83e9f0" />
+                        <attribute name="value" value="451:Setting a const char * variable may leak memory." id="162" addr="0x7f658f83e9f0" />
                     </attributelist >
-                    <kwargssitem id="163" addr="0x7f20c70a89b0" >
-                        <attributelist id="164" addr="0x7f20c70a89b0" >
+                    <kwargssitem id="163" addr="0x7f658f8339b0" >
+                        <attributelist id="164" addr="0x7f658f8339b0" >
                         </attributelist >
                     </kwargssitem >
-                    <kwargssitem id="165" addr="0x7f20c70a8970" >
-                        <attributelist id="166" addr="0x7f20c70a8970" >
+                    <kwargssitem id="165" addr="0x7f658f833970" >
+                        <attributelist id="166" addr="0x7f658f833970" >
                         </attributelist >
                     </kwargssitem >
                 </kwargs >
-                <attribute name="code" value="{&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="167" addr="0x7f20c70b39f0" />
-                <attribute name="method" value="globalin" id="168" addr="0x7f20c70b39f0" />
+                <attribute name="code" value="{&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="167" addr="0x7f658f83e9f0" />
+                <attribute name="method" value="globalin" id="168" addr="0x7f658f83e9f0" />
             </attributelist >
 
-            <typemapitem id="169" addr="0x7f20c70a8a90" >
-                <attributelist id="170" addr="0x7f20c70a8a90" >
-                    <parmlist id="171" addr="0x7f20c70a8ad0" >
+            <typemapitem id="169" addr="0x7f658f833a90" >
+                <attributelist id="170" addr="0x7f658f833a90" >
+                    <parmlist id="171" addr="0x7f658f833ad0" >
                         <parm id="172">
-                            <attributelist id="173" addr="0x7f20c70a8ad0" >
-                                <attribute name="type" value="p.q(const).char" id="174" addr="0x7f20c70b39f0" />
+                            <attributelist id="173" addr="0x7f658f833ad0" >
+                                <attribute name="type" value="p.q(const).char" id="174" addr="0x7f658f83e9f0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -300,18 +300,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="175" addr="0x7f20c70a8d70" >
-            <attributelist id="176" addr="0x7f20c70a8d70" >
-                <attribute name="code" value="{&#10;  if($input) {&#10;    strncpy((char*)$1, (const char *)$input, $1_dim0-1);&#10;    $1[$1_dim0-1] = 0;&#10;  } else {&#10;    $1[0] = 0;&#10;  }&#10;}" id="177" addr="0x7f20c70b39f0" />
-                <attribute name="method" value="memberin" id="178" addr="0x7f20c70b39f0" />
+        <typemap id="175" addr="0x7f658f833d70" >
+            <attributelist id="176" addr="0x7f658f833d70" >
+                <attribute name="code" value="{&#10;  if($input) {&#10;    strncpy((char*)$1, (const char *)$input, $1_dim0-1);&#10;    $1[$1_dim0-1] = 0;&#10;  } else {&#10;    $1[0] = 0;&#10;  }&#10;}" id="177" addr="0x7f658f83e9f0" />
+                <attribute name="method" value="memberin" id="178" addr="0x7f658f83e9f0" />
             </attributelist >
 
-            <typemapitem id="179" addr="0x7f20c70a8cb0" >
-                <attributelist id="180" addr="0x7f20c70a8cb0" >
-                    <parmlist id="181" addr="0x7f20c70a8cf0" >
+            <typemapitem id="179" addr="0x7f658f833cb0" >
+                <attributelist id="180" addr="0x7f658f833cb0" >
+                    <parmlist id="181" addr="0x7f658f833cf0" >
                         <parm id="182">
-                            <attributelist id="183" addr="0x7f20c70a8cf0" >
-                                <attribute name="type" value="a(ANY).char" id="184" addr="0x7f20c70b39f0" />
+                            <attributelist id="183" addr="0x7f658f833cf0" >
+                                <attribute name="type" value="a(ANY).char" id="184" addr="0x7f658f83e9f0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -319,18 +319,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="185" addr="0x7f20c70a8f90" >
-            <attributelist id="186" addr="0x7f20c70a8f90" >
-                <attribute name="code" value="{&#10;  if($input) {&#10;    strncpy((char*)$1, (const char *)$input, $1_dim0-1);&#10;    $1[$1_dim0-1] = 0;&#10;  } else {&#10;    $1[0] = 0;&#10;  }&#10;}" id="187" addr="0x7f20c70b39f0" />
-                <attribute name="method" value="globalin" id="188" addr="0x7f20c70b39f0" />
+        <typemap id="185" addr="0x7f658f833f90" >
+            <attributelist id="186" addr="0x7f658f833f90" >
+                <attribute name="code" value="{&#10;  if($input) {&#10;    strncpy((char*)$1, (const char *)$input, $1_dim0-1);&#10;    $1[$1_dim0-1] = 0;&#10;  } else {&#10;    $1[0] = 0;&#10;  }&#10;}" id="187" addr="0x7f658f83e9f0" />
+                <attribute name="method" value="globalin" id="188" addr="0x7f658f83e9f0" />
             </attributelist >
 
-            <typemapitem id="189" addr="0x7f20c70a8ed0" >
-                <attributelist id="190" addr="0x7f20c70a8ed0" >
-                    <parmlist id="191" addr="0x7f20c70a8f10" >
+            <typemapitem id="189" addr="0x7f658f833ed0" >
+                <attributelist id="190" addr="0x7f658f833ed0" >
+                    <parmlist id="191" addr="0x7f658f833f10" >
                         <parm id="192">
-                            <attributelist id="193" addr="0x7f20c70a8f10" >
-                                <attribute name="type" value="a(ANY).char" id="194" addr="0x7f20c70b39f0" />
+                            <attributelist id="193" addr="0x7f658f833f10" >
+                                <attribute name="type" value="a(ANY).char" id="194" addr="0x7f658f83e9f0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -338,18 +338,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="195" addr="0x7f20c70a9170" >
-            <attributelist id="196" addr="0x7f20c70a9170" >
-                <attribute name="code" value="{&#10;  if ($input) strcpy((char *)$1, (const char *)$input);&#10;  else $1[0] = 0;&#10;}" id="197" addr="0x7f20c70b39f0" />
-                <attribute name="method" value="memberin" id="198" addr="0x7f20c70b39f0" />
+        <typemap id="195" addr="0x7f658f834170" >
+            <attributelist id="196" addr="0x7f658f834170" >
+                <attribute name="code" value="{&#10;  if ($input) strcpy((char *)$1, (const char *)$input);&#10;  else $1[0] = 0;&#10;}" id="197" addr="0x7f658f83e9f0" />
+                <attribute name="method" value="memberin" id="198" addr="0x7f658f83e9f0" />
             </attributelist >
 
-            <typemapitem id="199" addr="0x7f20c70a90b0" >
-                <attributelist id="200" addr="0x7f20c70a90b0" >
-                    <parmlist id="201" addr="0x7f20c70a90f0" >
+            <typemapitem id="199" addr="0x7f658f8340b0" >
+                <attributelist id="200" addr="0x7f658f8340b0" >
+                    <parmlist id="201" addr="0x7f658f8340f0" >
                         <parm id="202">
-                            <attributelist id="203" addr="0x7f20c70a90f0" >
-                                <attribute name="type" value="a().char" id="204" addr="0x7f20c70b39f0" />
+                            <attributelist id="203" addr="0x7f658f8340f0" >
+                                <attribute name="type" value="a().char" id="204" addr="0x7f658f83e9f0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -357,18 +357,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="205" addr="0x7f20c70a9350" >
-            <attributelist id="206" addr="0x7f20c70a9350" >
-                <attribute name="code" value="{&#10;  if ($input) strcpy((char *)$1, (const char *)$input);&#10;  else $1[0] = 0;&#10;}" id="207" addr="0x7f20c70b39f0" />
-                <attribute name="method" value="globalin" id="208" addr="0x7f20c70b39f0" />
+        <typemap id="205" addr="0x7f658f834350" >
+            <attributelist id="206" addr="0x7f658f834350" >
+                <attribute name="code" value="{&#10;  if ($input) strcpy((char *)$1, (const char *)$input);&#10;  else $1[0] = 0;&#10;}" id="207" addr="0x7f658f83e9f0" />
+                <attribute name="method" value="globalin" id="208" addr="0x7f658f83e9f0" />
             </attributelist >
 
-            <typemapitem id="209" addr="0x7f20c70a9290" >
-                <attributelist id="210" addr="0x7f20c70a9290" >
-                    <parmlist id="211" addr="0x7f20c70a92d0" >
+            <typemapitem id="209" addr="0x7f658f834290" >
+                <attributelist id="210" addr="0x7f658f834290" >
+                    <parmlist id="211" addr="0x7f658f8342d0" >
                         <parm id="212">
-                            <attributelist id="213" addr="0x7f20c70a92d0" >
-                                <attribute name="type" value="a().char" id="214" addr="0x7f20c70b39f0" />
+                            <attributelist id="213" addr="0x7f658f8342d0" >
+                                <attribute name="type" value="a().char" id="214" addr="0x7f658f83e9f0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -376,18 +376,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="215" addr="0x7f20c70a9570" >
-            <attributelist id="216" addr="0x7f20c70a9570" >
-                <attribute name="code" value="{&#10;  size_t ii;&#10;  $1_basetype *b = ($1_basetype *) $1;&#10;  for (ii = 0; ii &lt; (size_t)$1_size; ii++) b[ii] = *(($1_basetype *) $input + ii);&#10;}" id="217" addr="0x7f20c70b39f0" />
-                <attribute name="method" value="memberin" id="218" addr="0x7f20c70b39f0" />
+        <typemap id="215" addr="0x7f658f834570" >
+            <attributelist id="216" addr="0x7f658f834570" >
+                <attribute name="code" value="{&#10;  size_t ii;&#10;  $1_basetype *b = ($1_basetype *) $1;&#10;  for (ii = 0; ii &lt; (size_t)$1_size; ii++) b[ii] = *(($1_basetype *) $input + ii);&#10;}" id="217" addr="0x7f658f83e9f0" />
+                <attribute name="method" value="memberin" id="218" addr="0x7f658f83e9f0" />
             </attributelist >
 
-            <typemapitem id="219" addr="0x7f20c70a94b0" >
-                <attributelist id="220" addr="0x7f20c70a94b0" >
-                    <parmlist id="221" addr="0x7f20c70a94f0" >
+            <typemapitem id="219" addr="0x7f658f8344b0" >
+                <attributelist id="220" addr="0x7f658f8344b0" >
+                    <parmlist id="221" addr="0x7f658f8344f0" >
                         <parm id="222">
-                            <attributelist id="223" addr="0x7f20c70a94f0" >
-                                <attribute name="type" value="a(ANY).SWIGTYPE" id="224" addr="0x7f20c70b39f0" />
+                            <attributelist id="223" addr="0x7f658f8344f0" >
+                                <attribute name="type" value="a(ANY).SWIGTYPE" id="224" addr="0x7f658f83e9f0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -395,18 +395,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="225" addr="0x7f20c70a9790" >
-            <attributelist id="226" addr="0x7f20c70a9790" >
-                <attribute name="code" value="{&#10;  size_t ii;&#10;  $1_basetype *b = ($1_basetype *) $1;&#10;  for (ii = 0; ii &lt; (size_t)$1_size; ii++) b[ii] = *(($1_basetype *) $input + ii);&#10;}" id="227" addr="0x7f20c70b39f0" />
-                <attribute name="method" value="globalin" id="228" addr="0x7f20c70b39f0" />
+        <typemap id="225" addr="0x7f658f834790" >
+            <attributelist id="226" addr="0x7f658f834790" >
+                <attribute name="code" value="{&#10;  size_t ii;&#10;  $1_basetype *b = ($1_basetype *) $1;&#10;  for (ii = 0; ii &lt; (size_t)$1_size; ii++) b[ii] = *(($1_basetype *) $input + ii);&#10;}" id="227" addr="0x7f658f83e9f0" />
+                <attribute name="method" value="globalin" id="228" addr="0x7f658f83e9f0" />
             </attributelist >
 
-            <typemapitem id="229" addr="0x7f20c70a96d0" >
-                <attributelist id="230" addr="0x7f20c70a96d0" >
-                    <parmlist id="231" addr="0x7f20c70a9710" >
+            <typemapitem id="229" addr="0x7f658f8346d0" >
+                <attributelist id="230" addr="0x7f658f8346d0" >
+                    <parmlist id="231" addr="0x7f658f834710" >
                         <parm id="232">
-                            <attributelist id="233" addr="0x7f20c70a9710" >
-                                <attribute name="type" value="a(ANY).SWIGTYPE" id="234" addr="0x7f20c70b39f0" />
+                            <attributelist id="233" addr="0x7f658f834710" >
+                                <attribute name="type" value="a(ANY).SWIGTYPE" id="234" addr="0x7f658f83e9f0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -414,18 +414,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="235" addr="0x7f20c70a99f0" >
-            <attributelist id="236" addr="0x7f20c70a99f0" >
-                <attribute name="code" value="{&#10;  $basetype (*inp)[$1_dim1] = ($basetype (*)[$1_dim1])($input);&#10;  $basetype (*dest)[$1_dim1] = ($basetype (*)[$1_dim1])($1);&#10;  size_t ii = 0;&#10;  for (; ii &lt; $1_dim0; ++ii) {&#10;    $basetype *ip = inp[ii];&#10;    $basetype *dp = dest[ii];&#10;    size_t jj = 0;&#10;    for (; jj &lt; $1_dim1; ++jj) dp[jj] = ip[jj];&#10;  }&#10;}" id="237" addr="0x7f20c70b39f0" />
-                <attribute name="method" value="memberin" id="238" addr="0x7f20c70b39f0" />
+        <typemap id="235" addr="0x7f658f8349f0" >
+            <attributelist id="236" addr="0x7f658f8349f0" >
+                <attribute name="code" value="{&#10;  $basetype (*inp)[$1_dim1] = ($basetype (*)[$1_dim1])($input);&#10;  $basetype (*dest)[$1_dim1] = ($basetype (*)[$1_dim1])($1);&#10;  size_t ii = 0;&#10;  for (; ii &lt; $1_dim0; ++ii) {&#10;    $basetype *ip = inp[ii];&#10;    $basetype *dp = dest[ii];&#10;    size_t jj = 0;&#10;    for (; jj &lt; $1_dim1; ++jj) dp[jj] = ip[jj];&#10;  }&#10;}" id="237" addr="0x7f658f83e9f0" />
+                <attribute name="method" value="memberin" id="238" addr="0x7f658f83e9f0" />
             </attributelist >
 
-            <typemapitem id="239" addr="0x7f20c70a98d0" >
-                <attributelist id="240" addr="0x7f20c70a98d0" >
-                    <parmlist id="241" addr="0x7f20c70a9970" >
+            <typemapitem id="239" addr="0x7f658f8348d0" >
+                <attributelist id="240" addr="0x7f658f8348d0" >
+                    <parmlist id="241" addr="0x7f658f834970" >
                         <parm id="242">
-                            <attributelist id="243" addr="0x7f20c70a9970" >
-                                <attribute name="type" value="a(ANY).a(ANY).SWIGTYPE" id="244" addr="0x7f20c70b39f0" />
+                            <attributelist id="243" addr="0x7f658f834970" >
+                                <attribute name="type" value="a(ANY).a(ANY).SWIGTYPE" id="244" addr="0x7f658f83e9f0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -433,18 +433,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="245" addr="0x7f20c70a9c50" >
-            <attributelist id="246" addr="0x7f20c70a9c50" >
-                <attribute name="code" value="{&#10;  $basetype (*inp)[$1_dim1] = ($basetype (*)[$1_dim1])($input);&#10;  $basetype (*dest)[$1_dim1] = ($basetype (*)[$1_dim1])($1);&#10;  size_t ii = 0;&#10;  for (; ii &lt; $1_dim0; ++ii) {&#10;    $basetype *ip = inp[ii];&#10;    $basetype *dp = dest[ii];&#10;    size_t jj = 0;&#10;    for (; jj &lt; $1_dim1; ++jj) dp[jj] = ip[jj];&#10;  }&#10;}" id="247" addr="0x7f20c70b39f0" />
-                <attribute name="method" value="globalin" id="248" addr="0x7f20c70b39f0" />
+        <typemap id="245" addr="0x7f658f834c50" >
+            <attributelist id="246" addr="0x7f658f834c50" >
+                <attribute name="code" value="{&#10;  $basetype (*inp)[$1_dim1] = ($basetype (*)[$1_dim1])($input);&#10;  $basetype (*dest)[$1_dim1] = ($basetype (*)[$1_dim1])($1);&#10;  size_t ii = 0;&#10;  for (; ii &lt; $1_dim0; ++ii) {&#10;    $basetype *ip = inp[ii];&#10;    $basetype *dp = dest[ii];&#10;    size_t jj = 0;&#10;    for (; jj &lt; $1_dim1; ++jj) dp[jj] = ip[jj];&#10;  }&#10;}" id="247" addr="0x7f658f83e9f0" />
+                <attribute name="method" value="globalin" id="248" addr="0x7f658f83e9f0" />
             </attributelist >
 
-            <typemapitem id="249" addr="0x7f20c70a9b30" >
-                <attributelist id="250" addr="0x7f20c70a9b30" >
-                    <parmlist id="251" addr="0x7f20c70a9bd0" >
+            <typemapitem id="249" addr="0x7f658f834b30" >
+                <attributelist id="250" addr="0x7f658f834b30" >
+                    <parmlist id="251" addr="0x7f658f834bd0" >
                         <parm id="252">
-                            <attributelist id="253" addr="0x7f20c70a9bd0" >
-                                <attribute name="type" value="a(ANY).a(ANY).SWIGTYPE" id="254" addr="0x7f20c70b39f0" />
+                            <attributelist id="253" addr="0x7f658f834bd0" >
+                                <attribute name="type" value="a(ANY).a(ANY).SWIGTYPE" id="254" addr="0x7f658f83e9f0" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -452,607 +452,607 @@
              
             </typemapitem >
         </typemap >
-        <insert id="255" addr="0x7f20c70a9d10" >
-            <attributelist id="256" addr="0x7f20c70a9d10" >
-                <attribute name="code" value="&#10;#ifdef __cplusplus&#10;/* SwigValueWrapper is described in swig.swg */&#10;template&lt;typename T> class SwigValueWrapper {&#10;  struct SwigMovePointer {&#10;    T *ptr;&#10;    SwigMovePointer(T *p) : ptr(p) { }&#10;    ~SwigMovePointer() { delete ptr; }&#10;    SwigMovePointer&amp; operator=(SwigMovePointer&amp; rhs) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = rhs.ptr; rhs.ptr = 0; return *this; }&#10;  } pointer;&#10;  SwigValueWrapper&amp; operator=(const SwigValueWrapper&lt;T>&amp; rhs);&#10;  SwigValueWrapper(const SwigValueWrapper&lt;T>&amp; rhs);&#10;public:&#10;  SwigValueWrapper() : pointer(0) { }&#10;  SwigValueWrapper&amp; operator=(const T&amp; t) { SwigMovePointer tmp(new T(t)); pointer = tmp; return *this; }&#10;  operator T&amp;() const { return *pointer.ptr; }&#10;  T *operator&amp;() { return pointer.ptr; }&#10;};" id="257" addr="0x7f20c70b39f0" />
-                <attribute name="section" value="runtime" id="258" addr="0x7f20c70b39f0" />
+        <insert id="255" addr="0x7f658f834d10" >
+            <attributelist id="256" addr="0x7f658f834d10" >
+                <attribute name="code" value="&#10;#ifdef __cplusplus&#10;/* SwigValueWrapper is described in swig.swg */&#10;template&lt;typename T> class SwigValueWrapper {&#10;  struct SwigMovePointer {&#10;    T *ptr;&#10;    SwigMovePointer(T *p) : ptr(p) { }&#10;    ~SwigMovePointer() { delete ptr; }&#10;    SwigMovePointer&amp; operator=(SwigMovePointer&amp; rhs) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = rhs.ptr; rhs.ptr = 0; return *this; }&#10;  } pointer;&#10;  SwigValueWrapper&amp; operator=(const SwigValueWrapper&lt;T>&amp; rhs);&#10;  SwigValueWrapper(const SwigValueWrapper&lt;T>&amp; rhs);&#10;public:&#10;  SwigValueWrapper() : pointer(0) { }&#10;  SwigValueWrapper&amp; operator=(const T&amp; t) { SwigMovePointer tmp(new T(t)); pointer = tmp; return *this; }&#10;  operator T&amp;() const { return *pointer.ptr; }&#10;  T *operator&amp;() { return pointer.ptr; }&#10;};" id="257" addr="0x7f658f83e9f0" />
+                <attribute name="section" value="runtime" id="258" addr="0x7f658f83e9f0" />
             </attributelist >
          
         </insert >
-        <insert id="259" addr="0x7f20c70a9df0" >
-            <attributelist id="260" addr="0x7f20c70a9df0" >
-                <attribute name="code" value="&#10;template &lt;typename T> T SwigValueInit() {&#10;  return T();&#10;}&#10;#endif&#10;" id="261" addr="0x7f20c70b39f0" />
-                <attribute name="section" value="runtime" id="262" addr="0x7f20c70b39f0" />
+        <insert id="259" addr="0x7f658f834df0" >
+            <attributelist id="260" addr="0x7f658f834df0" >
+                <attribute name="code" value="&#10;template &lt;typename T> T SwigValueInit() {&#10;  return T();&#10;}&#10;#endif&#10;" id="261" addr="0x7f658f83e9f0" />
+                <attribute name="section" value="runtime" id="262" addr="0x7f658f83e9f0" />
             </attributelist >
          
         </insert >
-        <insert id="263" addr="0x7f20c70a9ed0" >
-            <attributelist id="264" addr="0x7f20c70a9ed0" >
-                <attribute name="code" value="/* -----------------------------------------------------------------------------&#10; *  This section contains generic SWIG labels for method/variable&#10; *  declarations/attributes, and other compiler dependent labels.&#10; * ----------------------------------------------------------------------------- */&#10;&#10;/* template workaround for compilers that cannot correctly implement the C++ standard */&#10;#ifndef SWIGTEMPLATEDISAMBIGUATOR&#10;# if defined(__SUNPRO_CC) &amp;&amp; (__SUNPRO_CC &lt;= 0x560)&#10;#  define SWIGTEMPLATEDISAMBIGUATOR template&#10;# elif defined(__HP_aCC)&#10;/* Needed even with `aCC -AA' when `aCC -V' reports HP ANSI C++ B3910B A.03.55 */&#10;/* If we find a maximum version that requires this, the test would be __HP_aCC &lt;= 35500 for A.03.55 */&#10;#  define SWIGTEMPLATEDISAMBIGUATOR template&#10;# else&#10;#  define SWIGTEMPLATEDISAMBIGUATOR&#10;# endif&#10;#endif&#10;&#10;/* inline attribute */&#10;#ifndef SWIGINLINE&#10;# if defined(__cplusplus) || (defined(__GNUC__) &amp;&amp; !defined(__STRICT_ANSI__))&#10;#   define SWIGINLINE inline&#10;# else&#10;#   define SWIGINLINE&#10;# endif&#10;#endif&#10;&#10;/* attribute recognised by some compilers to avoid 'unused' warnings */&#10;#ifndef SWIGUNUSED&#10;# if defined(__GNUC__)&#10;#   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 &amp;&amp; __GNUC_MINOR__ >= 4))&#10;#     define SWIGUNUSED __attribute__ ((__unused__))&#10;#   else&#10;#     define SWIGUNUSED&#10;#   endif&#10;# elif defined(__ICC)&#10;#   define SWIGUNUSED __attribute__ ((__unused__))&#10;# else&#10;#   define SWIGUNUSED&#10;# endif&#10;#endif&#10;&#10;#ifndef SWIG_MSC_UNSUPPRESS_4505&#10;# if defined(_MSC_VER)&#10;#   pragma warning(disable : 4505) /* unreferenced local function has been removed */&#10;# endif&#10;#endif&#10;&#10;#ifndef SWIGUNUSEDPARM&#10;# ifdef __cplusplus&#10;#   define SWIGUNUSEDPARM(p)&#10;# else&#10;#   define SWIGUNUSEDPARM(p) p SWIGUNUSED&#10;# endif&#10;#endif&#10;&#10;/* internal SWIG method */&#10;#ifndef SWIGINTERN&#10;# define SWIGINTERN static SWIGUNUSED&#10;#endif&#10;&#10;/* internal inline SWIG method */&#10;#ifndef SWIGINTERNINLINE&#10;# define SWIGINTERNINLINE SWIGINTERN SWIGINLINE&#10;#endif&#10;&#10;/* exporting methods */&#10;#if defined(__GNUC__)&#10;#  if (__GNUC__ >= 4) || (__GNUC__ == 3 &amp;&amp; __GNUC_MINOR__ >= 4)&#10;#    ifndef GCC_HASCLASSVISIBILITY&#10;#      define GCC_HASCLASSVISIBILITY&#10;#    endif&#10;#  endif&#10;#endif&#10;&#10;#ifndef SWIGEXPORT&#10;# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)&#10;#   if defined(STATIC_LINKED)&#10;#     define SWIGEXPORT&#10;#   else&#10;#     define SWIGEXPORT __declspec(dllexport)&#10;#   endif&#10;# else&#10;#   if defined(__GNUC__) &amp;&amp; defined(GCC_HASCLASSVISIBILITY)&#10;#     define SWIGEXPORT __attribute__ ((visibility(&quot;default&quot;)))&#10;#   else&#10;#     define SWIGEXPORT&#10;#   endif&#10;# endif&#10;#endif&#10;&#10;/* calling conventions for Windows */&#10;#ifndef SWIGSTDCALL&#10;# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)&#10;#   define SWIGSTDCALL __stdcall&#10;# else&#10;#   define SWIGSTDCALL&#10;# endif&#10;#endif&#10;&#10;/* Deal with Microsoft's attempt at deprecating C standard runtime functions */&#10;#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) &amp;&amp; defined(_MSC_VER) &amp;&amp; !defined(_CRT_SECURE_NO_DEPRECATE)&#10;# define _CRT_SECURE_NO_DEPRECATE&#10;#endif&#10;&#10;/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */&#10;#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) &amp;&amp; defined(_MSC_VER) &amp;&amp; !defined(_SCL_SECURE_NO_DEPRECATE)&#10;# define _SCL_SECURE_NO_DEPRECATE&#10;#endif&#10;&#10;/* Deal with Apple's deprecated 'AssertMacros.h' from Carbon-framework */&#10;#if defined(__APPLE__) &amp;&amp; !defined(__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES)&#10;# define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0&#10;#endif&#10;&#10;/* Intel's compiler complains if a variable which was never initialised is&#10; * cast to void, which is a common idiom which we use to indicate that we&#10; * are aware a variable isn't used.  So we just silence that warning.&#10; * See: https://github.com/swig/swig/issues/192 for more discussion.&#10; */&#10;#ifdef __INTEL_COMPILER&#10;# pragma warning disable 592&#10;#endif&#10;" id="265" addr="0x7f20c70b39f0" />
-                <attribute name="section" value="runtime" id="266" addr="0x7f20c70b39f0" />
+        <insert id="263" addr="0x7f658f834ed0" >
+            <attributelist id="264" addr="0x7f658f834ed0" >
+                <attribute name="code" value="/* -----------------------------------------------------------------------------&#10; *  This section contains generic SWIG labels for method/variable&#10; *  declarations/attributes, and other compiler dependent labels.&#10; * ----------------------------------------------------------------------------- */&#10;&#10;/* template workaround for compilers that cannot correctly implement the C++ standard */&#10;#ifndef SWIGTEMPLATEDISAMBIGUATOR&#10;# if defined(__SUNPRO_CC) &amp;&amp; (__SUNPRO_CC &lt;= 0x560)&#10;#  define SWIGTEMPLATEDISAMBIGUATOR template&#10;# elif defined(__HP_aCC)&#10;/* Needed even with `aCC -AA' when `aCC -V' reports HP ANSI C++ B3910B A.03.55 */&#10;/* If we find a maximum version that requires this, the test would be __HP_aCC &lt;= 35500 for A.03.55 */&#10;#  define SWIGTEMPLATEDISAMBIGUATOR template&#10;# else&#10;#  define SWIGTEMPLATEDISAMBIGUATOR&#10;# endif&#10;#endif&#10;&#10;/* inline attribute */&#10;#ifndef SWIGINLINE&#10;# if defined(__cplusplus) || (defined(__GNUC__) &amp;&amp; !defined(__STRICT_ANSI__))&#10;#   define SWIGINLINE inline&#10;# else&#10;#   define SWIGINLINE&#10;# endif&#10;#endif&#10;&#10;/* attribute recognised by some compilers to avoid 'unused' warnings */&#10;#ifndef SWIGUNUSED&#10;# if defined(__GNUC__)&#10;#   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 &amp;&amp; __GNUC_MINOR__ >= 4))&#10;#     define SWIGUNUSED __attribute__ ((__unused__))&#10;#   else&#10;#     define SWIGUNUSED&#10;#   endif&#10;# elif defined(__ICC)&#10;#   define SWIGUNUSED __attribute__ ((__unused__))&#10;# else&#10;#   define SWIGUNUSED&#10;# endif&#10;#endif&#10;&#10;#ifndef SWIG_MSC_UNSUPPRESS_4505&#10;# if defined(_MSC_VER)&#10;#   pragma warning(disable : 4505) /* unreferenced local function has been removed */&#10;# endif&#10;#endif&#10;&#10;#ifndef SWIGUNUSEDPARM&#10;# ifdef __cplusplus&#10;#   define SWIGUNUSEDPARM(p)&#10;# else&#10;#   define SWIGUNUSEDPARM(p) p SWIGUNUSED&#10;# endif&#10;#endif&#10;&#10;/* internal SWIG method */&#10;#ifndef SWIGINTERN&#10;# define SWIGINTERN static SWIGUNUSED&#10;#endif&#10;&#10;/* internal inline SWIG method */&#10;#ifndef SWIGINTERNINLINE&#10;# define SWIGINTERNINLINE SWIGINTERN SWIGINLINE&#10;#endif&#10;&#10;/* exporting methods */&#10;#if defined(__GNUC__)&#10;#  if (__GNUC__ >= 4) || (__GNUC__ == 3 &amp;&amp; __GNUC_MINOR__ >= 4)&#10;#    ifndef GCC_HASCLASSVISIBILITY&#10;#      define GCC_HASCLASSVISIBILITY&#10;#    endif&#10;#  endif&#10;#endif&#10;&#10;#ifndef SWIGEXPORT&#10;# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)&#10;#   if defined(STATIC_LINKED)&#10;#     define SWIGEXPORT&#10;#   else&#10;#     define SWIGEXPORT __declspec(dllexport)&#10;#   endif&#10;# else&#10;#   if defined(__GNUC__) &amp;&amp; defined(GCC_HASCLASSVISIBILITY)&#10;#     define SWIGEXPORT __attribute__ ((visibility(&quot;default&quot;)))&#10;#   else&#10;#     define SWIGEXPORT&#10;#   endif&#10;# endif&#10;#endif&#10;&#10;/* calling conventions for Windows */&#10;#ifndef SWIGSTDCALL&#10;# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)&#10;#   define SWIGSTDCALL __stdcall&#10;# else&#10;#   define SWIGSTDCALL&#10;# endif&#10;#endif&#10;&#10;/* Deal with Microsoft's attempt at deprecating C standard runtime functions */&#10;#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) &amp;&amp; defined(_MSC_VER) &amp;&amp; !defined(_CRT_SECURE_NO_DEPRECATE)&#10;# define _CRT_SECURE_NO_DEPRECATE&#10;#endif&#10;&#10;/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */&#10;#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) &amp;&amp; defined(_MSC_VER) &amp;&amp; !defined(_SCL_SECURE_NO_DEPRECATE)&#10;# define _SCL_SECURE_NO_DEPRECATE&#10;#endif&#10;&#10;/* Deal with Apple's deprecated 'AssertMacros.h' from Carbon-framework */&#10;#if defined(__APPLE__) &amp;&amp; !defined(__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES)&#10;# define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0&#10;#endif&#10;&#10;/* Intel's compiler complains if a variable which was never initialised is&#10; * cast to void, which is a common idiom which we use to indicate that we&#10; * are aware a variable isn't used.  So we just silence that warning.&#10; * See: https://github.com/swig/swig/issues/192 for more discussion.&#10; */&#10;#ifdef __INTEL_COMPILER&#10;# pragma warning disable 592&#10;#endif&#10;" id="265" addr="0x7f658f83e9f0" />
+                <attribute name="section" value="runtime" id="266" addr="0x7f658f83e9f0" />
             </attributelist >
          
         </insert >
     </include >
-    <include id="267" addr="0x7f20c70aa050" >
-        <attributelist id="268" addr="0x7f20c70aa050" >
-            <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmcvfs.i" id="269" addr="0x7f20c70b39f0" />
-            <attribute name="module" value="" id="270" addr="0x7f20c70aa0f0" />
-            <attribute name="options" value="0x7f20c70a9fd0" id="271" addr="0x7f20c70a9fd0" />
+    <include id="267" addr="0x7f658f835050" >
+        <attributelist id="268" addr="0x7f658f835050" >
+            <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmcvfs.i" id="269" addr="0x7f658f83e9f0" />
+            <attribute name="module" value="" id="270" addr="0x7f658f8350f0" />
+            <attribute name="options" value="0x7f658f834fd0" id="271" addr="0x7f658f834fd0" />
         </attributelist >
 
-        <module id="272" addr="0x7f20c70aa090" >
-            <attributelist id="273" addr="0x7f20c70aa090" >
-                <attribute name="name" value="xbmcvfs" id="274" addr="0x7f20c70b39f0" />
+        <module id="272" addr="0x7f658f835090" >
+            <attributelist id="273" addr="0x7f658f835090" >
+                <attribute name="name" value="xbmcvfs" id="274" addr="0x7f658f83e9f0" />
             </attributelist >
          
         </module >
-        <insert id="275" addr="0x7f20c70aa130" >
-            <attributelist id="276" addr="0x7f20c70aa130" >
-                <attribute name="code" value="&#10;#if defined(TARGET_WINDOWS)&#10;#  include &lt;windows.h>&#10;#endif&#10;&#10;#include &quot;interfaces/legacy/ModuleXbmcvfs.h&quot;&#10;#include &quot;interfaces/legacy/File.h&quot;&#10;#include &quot;interfaces/legacy/Stat.h&quot;&#10;#include &quot;utils/log.h&quot;&#10;&#10;using namespace XBMCAddon;&#10;using namespace xbmcvfs;&#10;&#10;#if defined(__GNUG__)&#10;#pragma GCC diagnostic ignored &quot;-Wstrict-aliasing&quot;&#10;#endif&#10;&#10;" id="277" addr="0x7f20c70b39f0" />
+        <insert id="275" addr="0x7f658f835130" >
+            <attributelist id="276" addr="0x7f658f835130" >
+                <attribute name="code" value="&#10;#if defined(TARGET_WINDOWS)&#10;#  include &lt;windows.h>&#10;#endif&#10;&#10;#include &quot;interfaces/legacy/ModuleXbmcvfs.h&quot;&#10;#include &quot;interfaces/legacy/File.h&quot;&#10;#include &quot;interfaces/legacy/Stat.h&quot;&#10;#include &quot;utils/log.h&quot;&#10;&#10;using namespace XBMCAddon;&#10;using namespace xbmcvfs;&#10;&#10;#if defined(__GNUG__)&#10;#pragma GCC diagnostic ignored &quot;-Wstrict-aliasing&quot;&#10;#endif&#10;&#10;" id="277" addr="0x7f658f83e9f0" />
             </attributelist >
          
         </insert >
-        <include id="278" addr="0x7f20c70aa1b0" >
-            <attributelist id="279" addr="0x7f20c70aa1b0" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/swighelper.h" id="280" addr="0x7f20c70b39f0" />
+        <include id="278" addr="0x7f658f8351b0" >
+            <attributelist id="279" addr="0x7f658f8351b0" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/swighelper.h" id="280" addr="0x7f658f83e9f0" />
             </attributelist >
          
         </include >
-        <include id="281" addr="0x7f20c70aa230" >
-            <attributelist id="282" addr="0x7f20c70aa230" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/AddonString.h" id="283" addr="0x7f20c70b39f0" />
+        <include id="281" addr="0x7f658f835230" >
+            <attributelist id="282" addr="0x7f658f835230" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/AddonString.h" id="283" addr="0x7f658f83e9f0" />
             </attributelist >
 
-            <namespace id="284" addr="0x7f20c70aa370" >
-                <attributelist id="285" addr="0x7f20c70aa370" >
-                    <attribute name="sym_name" value="XBMCAddon" id="286" addr="0x7f20c70b39f0" />
-                    <attribute name="name" value="XBMCAddon" id="287" addr="0x7f20c70b39f0" />
-                    <attribute name="csym_nextSibling" value="0x7f20c70aa930" id="288" addr="0x7f20c70aa930" />
-                    <attribute name="sym_nextSibling" value="0x7f20c70aa930" id="289" addr="0x7f20c70aa930" />
-                    <typescope id="290" addr="0x7f20c70b1a70" >
-                        <attributelist id="291" addr="0x7f20c70b1a70" >
-                            <attribute name="name" value="XBMCAddon" id="292" addr="0x7f20c70b39f0" />
-                            <typetab id="293" addr="0x7f20c70b1ab0" >
-                                <attributelist id="294" addr="0x7f20c70b1ab0" >
-                                    <attribute name="String" value="std::string" id="295" addr="0x7f20c70b39f0" />
+            <namespace id="284" addr="0x7f658f835370" >
+                <attributelist id="285" addr="0x7f658f835370" >
+                    <attribute name="sym_name" value="XBMCAddon" id="286" addr="0x7f658f83e9f0" />
+                    <attribute name="name" value="XBMCAddon" id="287" addr="0x7f658f83e9f0" />
+                    <attribute name="csym_nextSibling" value="0x7f658f835930" id="288" addr="0x7f658f835930" />
+                    <attribute name="sym_nextSibling" value="0x7f658f835930" id="289" addr="0x7f658f835930" />
+                    <typescope id="290" addr="0x7f658f83ca70" >
+                        <attributelist id="291" addr="0x7f658f83ca70" >
+                            <attribute name="name" value="XBMCAddon" id="292" addr="0x7f658f83e9f0" />
+                            <typetab id="293" addr="0x7f658f83cab0" >
+                                <attributelist id="294" addr="0x7f658f83cab0" >
+                                    <attribute name="String" value="std::string" id="295" addr="0x7f658f83e9f0" />
                                 </attributelist >
-                                <typetabsitem id="296" addr="0x7f20c70b1c90" >
-                                    <attributelist id="297" addr="0x7f20c70b1c90" >
+                                <typetabsitem id="296" addr="0x7f658f83cc90" >
+                                    <attributelist id="297" addr="0x7f658f83cc90" >
                                     </attributelist >
                                 </typetabsitem >
                             </typetab >
-                            <attribute name="parent" value="0x7f20c7093a30" id="298" addr="0x7f20c7093a30" />
-                            <attribute name="qname" value="XBMCAddon" id="299" addr="0x7f20c70b39f0" />
-                            <attribute name="symtab" value="0x7f20c70aa2d0" id="300" addr="0x7f20c70aa2d0" />
+                            <attribute name="parent" value="0x7f658f81ea30" id="298" addr="0x7f658f81ea30" />
+                            <attribute name="qname" value="XBMCAddon" id="299" addr="0x7f658f83e9f0" />
+                            <attribute name="symtab" value="0x7f658f8352d0" id="300" addr="0x7f658f8352d0" />
                         </attributelist >
-                        <typescopesitem id="301" addr="0x7f20c70aa290" >
-                            <attributelist id="302" addr="0x7f20c70aa290" >
+                        <typescopesitem id="301" addr="0x7f658f835290" >
+                            <attributelist id="302" addr="0x7f658f835290" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="303" addr="0x7f20c70b1ab0" >
-                            <attributelist id="304" addr="0x7f20c70b1ab0" >
-                                <attribute name="String" value="std::string" id="305" addr="0x7f20c70b39f0" />
+                        <typescopesitem id="303" addr="0x7f658f83cab0" >
+                            <attributelist id="304" addr="0x7f658f83cab0" >
+                                <attribute name="String" value="std::string" id="305" addr="0x7f658f83e9f0" />
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="306" addr="0x7f20c7093a30" >
-                            <attributelist id="307" addr="0x7f20c7093a30" >
-                                <attribute name="name" value="" id="308" addr="0x7f20c70b39f0" />
-                                <typetab id="309" addr="0x7f20c7093a90" >
-                                    <attributelist id="310" addr="0x7f20c7093a90" >
+                        <typescopesitem id="306" addr="0x7f658f81ea30" >
+                            <attributelist id="307" addr="0x7f658f81ea30" >
+                                <attribute name="name" value="" id="308" addr="0x7f658f83e9f0" />
+                                <typetab id="309" addr="0x7f658f81ea90" >
+                                    <attributelist id="310" addr="0x7f658f81ea90" >
                                     </attributelist >
                                 </typetab >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="311" addr="0x7f20c70b1bb0" >
-                            <attributelist id="312" addr="0x7f20c70b1bb0" >
+                        <typescopesitem id="311" addr="0x7f658f83cbb0" >
+                            <attributelist id="312" addr="0x7f658f83cbb0" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="313" addr="0x7f20c70aa2d0" >
-                            <attributelist id="314" addr="0x7f20c70aa2d0" >
-                                <attribute name="name" value="XBMCAddon" id="315" addr="0x7f20c70b39f0" />
-                                <attribute name="csymtab" value="0x7f20c70aa310" id="316" addr="0x7f20c70aa310" />
-                                <attribute name="symtab" value="0x7f20c70aa2b0" id="317" addr="0x7f20c70aa2b0" />
+                        <typescopesitem id="313" addr="0x7f658f8352d0" >
+                            <attributelist id="314" addr="0x7f658f8352d0" >
+                                <attribute name="name" value="XBMCAddon" id="315" addr="0x7f658f83e9f0" />
+                                <attribute name="csymtab" value="0x7f658f835310" id="316" addr="0x7f658f835310" />
+                                <attribute name="symtab" value="0x7f658f8352b0" id="317" addr="0x7f658f8352b0" />
                             </attributelist >
                         </typescopesitem >
                     </typescope >
-                    <attribute name="symtab" value="0x7f20c70aa2d0" id="318" addr="0x7f20c70aa2d0" />
-                    <attribute name="sym_symtab" value="0x7f20c7093950" id="319" addr="0x7f20c7093950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="320" addr="0x7f20c70b39f0" />
+                    <attribute name="symtab" value="0x7f658f8352d0" id="318" addr="0x7f658f8352d0" />
+                    <attribute name="sym_symtab" value="0x7f658f81e950" id="319" addr="0x7f658f81e950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="320" addr="0x7f658f83e9f0" />
                 </attributelist >
 
-                <cdecl id="321" addr="0x7f20c70aa490" >
-                    <attributelist id="322" addr="0x7f20c70aa490" >
-                        <attribute name="sym_name" value="String" id="323" addr="0x7f20c70b39f0" />
-                        <attribute name="name" value="XBMCAddon::String" id="324" addr="0x7f20c70b39f0" />
-                        <attribute name="decl" value="" id="325" addr="0x7f20c70b39f0" />
-                        <attribute name="storage" value="typedef" id="326" addr="0x7f20c70b39f0" />
-                        <attribute name="kind" value="typedef" id="327" addr="0x7f20c70b39f0" />
-                        <attribute name="type" value="std::string" id="328" addr="0x7f20c70b39f0" />
-                        <attribute name="sym_symtab" value="0x7f20c70aa2d0" id="329" addr="0x7f20c70aa2d0" />
-                        <attribute name="sym_overname" value="__SWIG_0" id="330" addr="0x7f20c70b39f0" />
+                <cdecl id="321" addr="0x7f658f835490" >
+                    <attributelist id="322" addr="0x7f658f835490" >
+                        <attribute name="sym_name" value="String" id="323" addr="0x7f658f83e9f0" />
+                        <attribute name="name" value="XBMCAddon::String" id="324" addr="0x7f658f83e9f0" />
+                        <attribute name="decl" value="" id="325" addr="0x7f658f83e9f0" />
+                        <attribute name="storage" value="typedef" id="326" addr="0x7f658f83e9f0" />
+                        <attribute name="kind" value="typedef" id="327" addr="0x7f658f83e9f0" />
+                        <attribute name="type" value="std::string" id="328" addr="0x7f658f83e9f0" />
+                        <attribute name="sym_symtab" value="0x7f658f8352d0" id="329" addr="0x7f658f8352d0" />
+                        <attribute name="sym_overname" value="__SWIG_0" id="330" addr="0x7f658f83e9f0" />
                     </attributelist >
                  
                 </cdecl >
-                <cdecl id="331" addr="0x7f20c70aa690" >
-                    <attributelist id="332" addr="0x7f20c70aa690" >
-                        <attribute name="sym_name" value="emptyString" id="333" addr="0x7f20c70b39f0" />
-                        <attribute name="name" value="XBMCAddon::emptyString" id="334" addr="0x7f20c70b39f0" />
-                        <attribute name="decl" value="" id="335" addr="0x7f20c70b39f0" />
-                        <attribute name="storage" value="extern" id="336" addr="0x7f20c70b39f0" />
-                        <attribute name="kind" value="variable" id="337" addr="0x7f20c70b39f0" />
-                        <attribute name="type" value="XBMCAddon::String" id="338" addr="0x7f20c70b39f0" />
-                        <attribute name="sym_symtab" value="0x7f20c70aa2d0" id="339" addr="0x7f20c70aa2d0" />
-                        <attribute name="sym_overname" value="__SWIG_0" id="340" addr="0x7f20c70b39f0" />
+                <cdecl id="331" addr="0x7f658f835690" >
+                    <attributelist id="332" addr="0x7f658f835690" >
+                        <attribute name="sym_name" value="emptyString" id="333" addr="0x7f658f83e9f0" />
+                        <attribute name="name" value="XBMCAddon::emptyString" id="334" addr="0x7f658f83e9f0" />
+                        <attribute name="decl" value="" id="335" addr="0x7f658f83e9f0" />
+                        <attribute name="storage" value="extern" id="336" addr="0x7f658f83e9f0" />
+                        <attribute name="kind" value="variable" id="337" addr="0x7f658f83e9f0" />
+                        <attribute name="type" value="XBMCAddon::String" id="338" addr="0x7f658f83e9f0" />
+                        <attribute name="sym_symtab" value="0x7f658f8352d0" id="339" addr="0x7f658f8352d0" />
+                        <attribute name="sym_overname" value="__SWIG_0" id="340" addr="0x7f658f83e9f0" />
                     </attributelist >
                  
                 </cdecl >
             </namespace >
         </include >
-        <include id="341" addr="0x7f20c70aa870" >
-            <attributelist id="342" addr="0x7f20c70aa870" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/File.h" id="343" addr="0x7f20c70b39f0" />
+        <include id="341" addr="0x7f658f835870" >
+            <attributelist id="342" addr="0x7f658f835870" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/File.h" id="343" addr="0x7f658f83e9f0" />
             </attributelist >
 
-            <namespace id="344" addr="0x7f20c70aa930" >
-                <attributelist id="345" addr="0x7f20c70aa930" >
-                    <attribute name="sym_name" value="XBMCAddon" id="346" addr="0x7f20c70b39f0" />
-                    <attribute name="name" value="XBMCAddon" id="347" addr="0x7f20c70b39f0" />
-                    <attribute name="sym_previousSibling" value="0x7f20c70aa370" id="348" addr="0x7f20c70aa370" />
-                    <attribute name="csym_nextSibling" value="0x7f20c70ad5d0" id="349" addr="0x7f20c70ad5d0" />
-                    <attribute name="sym_nextSibling" value="0x7f20c70ad5d0" id="350" addr="0x7f20c70ad5d0" />
-                    <typescope id="351" addr="0x7f20c70b1a70" >
-                        <attributelist id="352" addr="0x7f20c70b1a70" >
-                            <attribute name="name" value="XBMCAddon" id="353" addr="0x7f20c70b39f0" />
-                            <typetab id="354" addr="0x7f20c70b1ab0" >
-                                <attributelist id="355" addr="0x7f20c70b1ab0" >
-                                    <attribute name="String" value="std::string" id="356" addr="0x7f20c70b39f0" />
+            <namespace id="344" addr="0x7f658f835930" >
+                <attributelist id="345" addr="0x7f658f835930" >
+                    <attribute name="sym_name" value="XBMCAddon" id="346" addr="0x7f658f83e9f0" />
+                    <attribute name="name" value="XBMCAddon" id="347" addr="0x7f658f83e9f0" />
+                    <attribute name="sym_previousSibling" value="0x7f658f835370" id="348" addr="0x7f658f835370" />
+                    <attribute name="csym_nextSibling" value="0x7f658f8385d0" id="349" addr="0x7f658f8385d0" />
+                    <attribute name="sym_nextSibling" value="0x7f658f8385d0" id="350" addr="0x7f658f8385d0" />
+                    <typescope id="351" addr="0x7f658f83ca70" >
+                        <attributelist id="352" addr="0x7f658f83ca70" >
+                            <attribute name="name" value="XBMCAddon" id="353" addr="0x7f658f83e9f0" />
+                            <typetab id="354" addr="0x7f658f83cab0" >
+                                <attributelist id="355" addr="0x7f658f83cab0" >
+                                    <attribute name="String" value="std::string" id="356" addr="0x7f658f83e9f0" />
                                 </attributelist >
-                                <typetabsitem id="357" addr="0x7f20c70b1c90" >
-                                    <attributelist id="358" addr="0x7f20c70b1c90" >
+                                <typetabsitem id="357" addr="0x7f658f83cc90" >
+                                    <attributelist id="358" addr="0x7f658f83cc90" >
                                     </attributelist >
                                 </typetabsitem >
                             </typetab >
-                            <attribute name="parent" value="0x7f20c7093a30" id="359" addr="0x7f20c7093a30" />
-                            <attribute name="qname" value="XBMCAddon" id="360" addr="0x7f20c70b39f0" />
-                            <attribute name="symtab" value="0x7f20c70aa2d0" id="361" addr="0x7f20c70aa2d0" />
+                            <attribute name="parent" value="0x7f658f81ea30" id="359" addr="0x7f658f81ea30" />
+                            <attribute name="qname" value="XBMCAddon" id="360" addr="0x7f658f83e9f0" />
+                            <attribute name="symtab" value="0x7f658f8352d0" id="361" addr="0x7f658f8352d0" />
                         </attributelist >
-                        <typescopesitem id="362" addr="0x7f20c70aa290" >
-                            <attributelist id="363" addr="0x7f20c70aa290" >
+                        <typescopesitem id="362" addr="0x7f658f835290" >
+                            <attributelist id="363" addr="0x7f658f835290" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="364" addr="0x7f20c70b1ab0" >
-                            <attributelist id="365" addr="0x7f20c70b1ab0" >
-                                <attribute name="String" value="std::string" id="366" addr="0x7f20c70b39f0" />
+                        <typescopesitem id="364" addr="0x7f658f83cab0" >
+                            <attributelist id="365" addr="0x7f658f83cab0" >
+                                <attribute name="String" value="std::string" id="366" addr="0x7f658f83e9f0" />
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="367" addr="0x7f20c7093a30" >
-                            <attributelist id="368" addr="0x7f20c7093a30" >
-                                <attribute name="name" value="" id="369" addr="0x7f20c70b39f0" />
-                                <typetab id="370" addr="0x7f20c7093a90" >
-                                    <attributelist id="371" addr="0x7f20c7093a90" >
+                        <typescopesitem id="367" addr="0x7f658f81ea30" >
+                            <attributelist id="368" addr="0x7f658f81ea30" >
+                                <attribute name="name" value="" id="369" addr="0x7f658f83e9f0" />
+                                <typetab id="370" addr="0x7f658f81ea90" >
+                                    <attributelist id="371" addr="0x7f658f81ea90" >
                                     </attributelist >
                                 </typetab >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="372" addr="0x7f20c70b1bb0" >
-                            <attributelist id="373" addr="0x7f20c70b1bb0" >
+                        <typescopesitem id="372" addr="0x7f658f83cbb0" >
+                            <attributelist id="373" addr="0x7f658f83cbb0" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="374" addr="0x7f20c70aa2d0" >
-                            <attributelist id="375" addr="0x7f20c70aa2d0" >
-                                <attribute name="name" value="XBMCAddon" id="376" addr="0x7f20c70b39f0" />
-                                <attribute name="csymtab" value="0x7f20c70aa310" id="377" addr="0x7f20c70aa310" />
-                                <attribute name="symtab" value="0x7f20c70aa2b0" id="378" addr="0x7f20c70aa2b0" />
+                        <typescopesitem id="374" addr="0x7f658f8352d0" >
+                            <attributelist id="375" addr="0x7f658f8352d0" >
+                                <attribute name="name" value="XBMCAddon" id="376" addr="0x7f658f83e9f0" />
+                                <attribute name="csymtab" value="0x7f658f835310" id="377" addr="0x7f658f835310" />
+                                <attribute name="symtab" value="0x7f658f8352b0" id="378" addr="0x7f658f8352b0" />
                             </attributelist >
                         </typescopesitem >
                     </typescope >
-                    <attribute name="symtab" value="0x7f20c70aa2d0" id="379" addr="0x7f20c70aa2d0" />
-                    <attribute name="sym_symtab" value="0x7f20c7093950" id="380" addr="0x7f20c7093950" />
+                    <attribute name="symtab" value="0x7f658f8352d0" id="379" addr="0x7f658f8352d0" />
+                    <attribute name="sym_symtab" value="0x7f658f81e950" id="380" addr="0x7f658f81e950" />
                 </attributelist >
 
-                <namespace id="381" addr="0x7f20c70aaa50" >
-                    <attributelist id="382" addr="0x7f20c70aaa50" >
-                        <attribute name="sym_name" value="xbmcvfs" id="383" addr="0x7f20c70b39f0" />
-                        <attribute name="name" value="xbmcvfs" id="384" addr="0x7f20c70b39f0" />
-                        <attribute name="csym_nextSibling" value="0x7f20c70ad650" id="385" addr="0x7f20c70ad650" />
-                        <attribute name="sym_nextSibling" value="0x7f20c70ad650" id="386" addr="0x7f20c70ad650" />
-                        <typescope id="387" addr="0x7f20c70b1e50" >
-                            <attributelist id="388" addr="0x7f20c70b1e50" >
-                                <attribute name="name" value="xbmcvfs" id="389" addr="0x7f20c70b39f0" />
-                                <typetab id="390" addr="0x7f20c70b1e70" >
-                                    <attributelist id="391" addr="0x7f20c70b1e70" >
-                                        <attribute name="Stat" value="Stat" id="392" addr="0x7f20c70b39f0" />
-                                        <attribute name="File" value="File" id="393" addr="0x7f20c70b39f0" />
+                <namespace id="381" addr="0x7f658f835a50" >
+                    <attributelist id="382" addr="0x7f658f835a50" >
+                        <attribute name="sym_name" value="xbmcvfs" id="383" addr="0x7f658f83e9f0" />
+                        <attribute name="name" value="xbmcvfs" id="384" addr="0x7f658f83e9f0" />
+                        <attribute name="csym_nextSibling" value="0x7f658f838650" id="385" addr="0x7f658f838650" />
+                        <attribute name="sym_nextSibling" value="0x7f658f838650" id="386" addr="0x7f658f838650" />
+                        <typescope id="387" addr="0x7f658f83ce50" >
+                            <attributelist id="388" addr="0x7f658f83ce50" >
+                                <attribute name="name" value="xbmcvfs" id="389" addr="0x7f658f83e9f0" />
+                                <typetab id="390" addr="0x7f658f83ce70" >
+                                    <attributelist id="391" addr="0x7f658f83ce70" >
+                                        <attribute name="Stat" value="Stat" id="392" addr="0x7f658f83e9f0" />
+                                        <attribute name="File" value="File" id="393" addr="0x7f658f83e9f0" />
                                     </attributelist >
-                                    <typetabsitem id="394" addr="0x7f20c70b29b0" >
-                                        <attributelist id="395" addr="0x7f20c70b29b0" >
+                                    <typetabsitem id="394" addr="0x7f658f83d9b0" >
+                                        <attributelist id="395" addr="0x7f658f83d9b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="396" addr="0x7f20c70b1f50" >
-                                        <attributelist id="397" addr="0x7f20c70b1f50" >
+                                    <typetabsitem id="396" addr="0x7f658f83cf50" >
+                                        <attributelist id="397" addr="0x7f658f83cf50" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
-                                <attribute name="parent" value="0x7f20c70b1a70" id="398" addr="0x7f20c70b1a70" />
-                                <attribute name="qname" value="XBMCAddon::xbmcvfs" id="399" addr="0x7f20c70b39f0" />
-                                <attribute name="symtab" value="0x7f20c70aa9d0" id="400" addr="0x7f20c70aa9d0" />
+                                <attribute name="parent" value="0x7f658f83ca70" id="398" addr="0x7f658f83ca70" />
+                                <attribute name="qname" value="XBMCAddon::xbmcvfs" id="399" addr="0x7f658f83e9f0" />
+                                <attribute name="symtab" value="0x7f658f8359d0" id="400" addr="0x7f658f8359d0" />
                             </attributelist >
-                            <typescopesitem id="401" addr="0x7f20c70aa990" >
-                                <attributelist id="402" addr="0x7f20c70aa990" >
+                            <typescopesitem id="401" addr="0x7f658f835990" >
+                                <attributelist id="402" addr="0x7f658f835990" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="403" addr="0x7f20c70b1e70" >
-                                <attributelist id="404" addr="0x7f20c70b1e70" >
-                                    <attribute name="Stat" value="Stat" id="405" addr="0x7f20c70b39f0" />
-                                    <attribute name="File" value="File" id="406" addr="0x7f20c70b39f0" />
+                            <typescopesitem id="403" addr="0x7f658f83ce70" >
+                                <attributelist id="404" addr="0x7f658f83ce70" >
+                                    <attribute name="Stat" value="Stat" id="405" addr="0x7f658f83e9f0" />
+                                    <attribute name="File" value="File" id="406" addr="0x7f658f83e9f0" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="407" addr="0x7f20c70b1a70" >
-                                <attributelist id="408" addr="0x7f20c70b1a70" >
-                                    <attribute name="name" value="XBMCAddon" id="409" addr="0x7f20c70b39f0" />
-                                    <typetab id="410" addr="0x7f20c70b1ab0" >
-                                        <attributelist id="411" addr="0x7f20c70b1ab0" >
-                                            <attribute name="String" value="std::string" id="412" addr="0x7f20c70b39f0" />
+                            <typescopesitem id="407" addr="0x7f658f83ca70" >
+                                <attributelist id="408" addr="0x7f658f83ca70" >
+                                    <attribute name="name" value="XBMCAddon" id="409" addr="0x7f658f83e9f0" />
+                                    <typetab id="410" addr="0x7f658f83cab0" >
+                                        <attributelist id="411" addr="0x7f658f83cab0" >
+                                            <attribute name="String" value="std::string" id="412" addr="0x7f658f83e9f0" />
                                         </attributelist >
-                                        <typetabsitem id="413" addr="0x7f20c70b1c90" >
-                                            <attributelist id="414" addr="0x7f20c70b1c90" >
+                                        <typetabsitem id="413" addr="0x7f658f83cc90" >
+                                            <attributelist id="414" addr="0x7f658f83cc90" >
                                             </attributelist >
                                         </typetabsitem >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f20c7093a30" id="415" addr="0x7f20c7093a30" />
-                                    <attribute name="qname" value="XBMCAddon" id="416" addr="0x7f20c70b39f0" />
-                                    <attribute name="symtab" value="0x7f20c70aa2d0" id="417" addr="0x7f20c70aa2d0" />
+                                    <attribute name="parent" value="0x7f658f81ea30" id="415" addr="0x7f658f81ea30" />
+                                    <attribute name="qname" value="XBMCAddon" id="416" addr="0x7f658f83e9f0" />
+                                    <attribute name="symtab" value="0x7f658f8352d0" id="417" addr="0x7f658f8352d0" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="418" addr="0x7f20c70b1e90" >
-                                <attributelist id="419" addr="0x7f20c70b1e90" >
+                            <typescopesitem id="418" addr="0x7f658f83ce90" >
+                                <attributelist id="419" addr="0x7f658f83ce90" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="420" addr="0x7f20c70aa9d0" >
-                                <attributelist id="421" addr="0x7f20c70aa9d0" >
-                                    <attribute name="name" value="xbmcvfs" id="422" addr="0x7f20c70b39f0" />
-                                    <attribute name="csymtab" value="0x7f20c70aaa10" id="423" addr="0x7f20c70aaa10" />
-                                    <attribute name="symtab" value="0x7f20c70aa9b0" id="424" addr="0x7f20c70aa9b0" />
+                            <typescopesitem id="420" addr="0x7f658f8359d0" >
+                                <attributelist id="421" addr="0x7f658f8359d0" >
+                                    <attribute name="name" value="xbmcvfs" id="422" addr="0x7f658f83e9f0" />
+                                    <attribute name="csymtab" value="0x7f658f835a10" id="423" addr="0x7f658f835a10" />
+                                    <attribute name="symtab" value="0x7f658f8359b0" id="424" addr="0x7f658f8359b0" />
                                 </attributelist >
                             </typescopesitem >
                         </typescope >
-                        <attribute name="symtab" value="0x7f20c70aa9d0" id="425" addr="0x7f20c70aa9d0" />
-                        <attribute name="sym_symtab" value="0x7f20c70aa2d0" id="426" addr="0x7f20c70aa2d0" />
-                        <attribute name="sym_overname" value="__SWIG_0" id="427" addr="0x7f20c70b39f0" />
+                        <attribute name="symtab" value="0x7f658f8359d0" id="425" addr="0x7f658f8359d0" />
+                        <attribute name="sym_symtab" value="0x7f658f8352d0" id="426" addr="0x7f658f8352d0" />
+                        <attribute name="sym_overname" value="__SWIG_0" id="427" addr="0x7f658f83e9f0" />
                     </attributelist >
 
-                    <class id="428" addr="0x7f20c70aac50" >
-                        <attributelist id="429" addr="0x7f20c70aac50" >
-                            <attribute name="name" value="XBMCAddon::xbmcvfs::File" id="430" addr="0x7f20c70b39f0" />
-                            <attribute name="sym_symtab" value="0x7f20c70aa9d0" id="431" addr="0x7f20c70aa9d0" />
-                            <attribute name="symtab" value="0x7f20c70aadd0" id="432" addr="0x7f20c70aadd0" />
-                            <attribute name="allows_typedef" value="1" id="433" addr="0x7f20c70b39f0" />
-                            <attribute name="typepass_visit" value="1" id="434" addr="0x7f20c70b39f0" />
-                            <attribute name="allocate_visit" value="1" id="435" addr="0x7f20c70b39f0" />
-                            <attribute name="kind" value="class" id="436" addr="0x7f20c70b39f0" />
-                            <attribute name="sym_name" value="File" id="437" addr="0x7f20c70b39f0" />
-                            <attribute name="allocate_has_constructor" value="1" id="438" addr="0x7f20c70b39f0" />
-                            <attribute name="allocate_public_constructor" value="1" id="439" addr="0x7f20c70b39f0" />
-                            <attribute name="allocate_has_destructor" value="1" id="440" addr="0x7f20c70b39f0" />
-                            <attribute name="allocate_default_destructor" value="1" id="441" addr="0x7f20c70b39f0" />
-                            <attribute name="allocate_copy_constructor" value="1" id="442" addr="0x7f20c70b39f0" />
-                            <attribute name="privatebaselist" value="0x7f20c70aabd0" id="443" addr="0x7f20c70aabd0" />
-                            <attribute name="protectedbaselist" value="0x7f20c70aabb0" id="444" addr="0x7f20c70aabb0" />
-                            <baselist id="445" addr="0x7f20c70aab90" >
-                                <base name="AddonClass" id="446" addr="0x7f20c70aaaf0" />
+                    <class id="428" addr="0x7f658f835c50" >
+                        <attributelist id="429" addr="0x7f658f835c50" >
+                            <attribute name="name" value="XBMCAddon::xbmcvfs::File" id="430" addr="0x7f658f83e9f0" />
+                            <attribute name="sym_symtab" value="0x7f658f8359d0" id="431" addr="0x7f658f8359d0" />
+                            <attribute name="symtab" value="0x7f658f835dd0" id="432" addr="0x7f658f835dd0" />
+                            <attribute name="allows_typedef" value="1" id="433" addr="0x7f658f83e9f0" />
+                            <attribute name="typepass_visit" value="1" id="434" addr="0x7f658f83e9f0" />
+                            <attribute name="allocate_visit" value="1" id="435" addr="0x7f658f83e9f0" />
+                            <attribute name="kind" value="class" id="436" addr="0x7f658f83e9f0" />
+                            <attribute name="sym_name" value="File" id="437" addr="0x7f658f83e9f0" />
+                            <attribute name="allocate_has_constructor" value="1" id="438" addr="0x7f658f83e9f0" />
+                            <attribute name="allocate_public_constructor" value="1" id="439" addr="0x7f658f83e9f0" />
+                            <attribute name="allocate_has_destructor" value="1" id="440" addr="0x7f658f83e9f0" />
+                            <attribute name="allocate_default_destructor" value="1" id="441" addr="0x7f658f83e9f0" />
+                            <attribute name="allocate_copy_constructor" value="1" id="442" addr="0x7f658f83e9f0" />
+                            <attribute name="privatebaselist" value="0x7f658f835bd0" id="443" addr="0x7f658f835bd0" />
+                            <attribute name="protectedbaselist" value="0x7f658f835bb0" id="444" addr="0x7f658f835bb0" />
+                            <baselist id="445" addr="0x7f658f835b90" >
+                                <base name="AddonClass" id="446" addr="0x7f658f835af0" />
                             </baselist >
-                            <attribute name="module" value="xbmcvfs" id="447" addr="0x7f20c70aa090" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="448" addr="0x7f20c70b39f0" />
-                            <typescope id="449" addr="0x7f20c70b2050" >
-                                <attributelist id="450" addr="0x7f20c70b2050" >
-                                    <attribute name="name" value="File" id="451" addr="0x7f20c70b39f0" />
-                                    <typetab id="452" addr="0x7f20c70b2070" >
-                                        <attributelist id="453" addr="0x7f20c70b2070" >
+                            <attribute name="module" value="xbmcvfs" id="447" addr="0x7f658f835090" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="448" addr="0x7f658f83e9f0" />
+                            <typescope id="449" addr="0x7f658f83d050" >
+                                <attributelist id="450" addr="0x7f658f83d050" >
+                                    <attribute name="name" value="File" id="451" addr="0x7f658f83e9f0" />
+                                    <typetab id="452" addr="0x7f658f83d070" >
+                                        <attributelist id="453" addr="0x7f658f83d070" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f20c70b1e50" id="454" addr="0x7f20c70b1e50" />
-                                    <attribute name="qname" value="XBMCAddon::xbmcvfs::File" id="455" addr="0x7f20c70b39f0" />
-                                    <attribute name="symtab" value="0x7f20c70aadd0" id="456" addr="0x7f20c70aadd0" />
+                                    <attribute name="parent" value="0x7f658f83ce50" id="454" addr="0x7f658f83ce50" />
+                                    <attribute name="qname" value="XBMCAddon::xbmcvfs::File" id="455" addr="0x7f658f83e9f0" />
+                                    <attribute name="symtab" value="0x7f658f835dd0" id="456" addr="0x7f658f835dd0" />
                                 </attributelist >
-                                <typescopesitem id="457" addr="0x7f20c70b1fb0" >
-                                    <attributelist id="458" addr="0x7f20c70b1fb0" >
+                                <typescopesitem id="457" addr="0x7f658f83cfb0" >
+                                    <attributelist id="458" addr="0x7f658f83cfb0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="459" addr="0x7f20c70b2070" >
-                                    <attributelist id="460" addr="0x7f20c70b2070" >
+                                <typescopesitem id="459" addr="0x7f658f83d070" >
+                                    <attributelist id="460" addr="0x7f658f83d070" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="461" addr="0x7f20c70b1e50" >
-                                    <attributelist id="462" addr="0x7f20c70b1e50" >
-                                        <attribute name="name" value="xbmcvfs" id="463" addr="0x7f20c70b39f0" />
-                                        <typetab id="464" addr="0x7f20c70b1e70" >
-                                            <attributelist id="465" addr="0x7f20c70b1e70" >
-                                                <attribute name="Stat" value="Stat" id="466" addr="0x7f20c70b39f0" />
-                                                <attribute name="File" value="File" id="467" addr="0x7f20c70b39f0" />
+                                <typescopesitem id="461" addr="0x7f658f83ce50" >
+                                    <attributelist id="462" addr="0x7f658f83ce50" >
+                                        <attribute name="name" value="xbmcvfs" id="463" addr="0x7f658f83e9f0" />
+                                        <typetab id="464" addr="0x7f658f83ce70" >
+                                            <attributelist id="465" addr="0x7f658f83ce70" >
+                                                <attribute name="Stat" value="Stat" id="466" addr="0x7f658f83e9f0" />
+                                                <attribute name="File" value="File" id="467" addr="0x7f658f83e9f0" />
                                             </attributelist >
-                                            <typetabsitem id="468" addr="0x7f20c70b29b0" >
-                                                <attributelist id="469" addr="0x7f20c70b29b0" >
+                                            <typetabsitem id="468" addr="0x7f658f83d9b0" >
+                                                <attributelist id="469" addr="0x7f658f83d9b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="470" addr="0x7f20c70b1f50" >
-                                                <attributelist id="471" addr="0x7f20c70b1f50" >
+                                            <typetabsitem id="470" addr="0x7f658f83cf50" >
+                                                <attributelist id="471" addr="0x7f658f83cf50" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7f20c70b1a70" id="472" addr="0x7f20c70b1a70" />
-                                        <attribute name="qname" value="XBMCAddon::xbmcvfs" id="473" addr="0x7f20c70b39f0" />
-                                        <attribute name="symtab" value="0x7f20c70aa9d0" id="474" addr="0x7f20c70aa9d0" />
+                                        <attribute name="parent" value="0x7f658f83ca70" id="472" addr="0x7f658f83ca70" />
+                                        <attribute name="qname" value="XBMCAddon::xbmcvfs" id="473" addr="0x7f658f83e9f0" />
+                                        <attribute name="symtab" value="0x7f658f8359d0" id="474" addr="0x7f658f8359d0" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="475" addr="0x7f20c70b2090" >
-                                    <attributelist id="476" addr="0x7f20c70b2090" >
+                                <typescopesitem id="475" addr="0x7f658f83d090" >
+                                    <attributelist id="476" addr="0x7f658f83d090" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="477" addr="0x7f20c70aadd0" >
-                                    <attributelist id="478" addr="0x7f20c70aadd0" >
-                                        <attribute name="name" value="File" id="479" addr="0x7f20c70b39f0" />
-                                        <attribute name="csymtab" value="0x7f20c70aae30" id="480" addr="0x7f20c70aae30" />
-                                        <attribute name="symtab" value="0x7f20c70aadb0" id="481" addr="0x7f20c70aadb0" />
+                                <typescopesitem id="477" addr="0x7f658f835dd0" >
+                                    <attributelist id="478" addr="0x7f658f835dd0" >
+                                        <attribute name="name" value="File" id="479" addr="0x7f658f83e9f0" />
+                                        <attribute name="csymtab" value="0x7f658f835e30" id="480" addr="0x7f658f835e30" />
+                                        <attribute name="symtab" value="0x7f658f835db0" id="481" addr="0x7f658f835db0" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <cdecl id="482" addr="0x7f20c70aaf30" >
-                            <attributelist id="483" addr="0x7f20c70aaf30" >
-                                <attribute name="ismember" value="1" id="484" addr="0x7f20c70b39f0" />
-                                <attribute name="name" value="file" id="485" addr="0x7f20c70b39f0" />
-                                <attribute name="decl" value="p." id="486" addr="0x7f20c70b39f0" />
-                                <attribute name="access" value="private" id="487" addr="0x7f20c70b39f0" />
-                                <attribute name="kind" value="variable" id="488" addr="0x7f20c70b39f0" />
-                                <attribute name="type" value="XFILE::CFile" id="489" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_symtab" value="0x7f20c70aadd0" id="490" addr="0x7f20c70aadd0" />
+                        <cdecl id="482" addr="0x7f658f835f30" >
+                            <attributelist id="483" addr="0x7f658f835f30" >
+                                <attribute name="ismember" value="1" id="484" addr="0x7f658f83e9f0" />
+                                <attribute name="name" value="file" id="485" addr="0x7f658f83e9f0" />
+                                <attribute name="decl" value="p." id="486" addr="0x7f658f83e9f0" />
+                                <attribute name="access" value="private" id="487" addr="0x7f658f83e9f0" />
+                                <attribute name="kind" value="variable" id="488" addr="0x7f658f83e9f0" />
+                                <attribute name="type" value="XFILE::CFile" id="489" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_symtab" value="0x7f658f835dd0" id="490" addr="0x7f658f835dd0" />
                             </attributelist >
                          
                         </cdecl >
-                        <access id="491" addr="0x7f20c70ab0f0" >
-                            <attributelist id="492" addr="0x7f20c70ab0f0" >
-                                <attribute name="kind" value="public" id="493" addr="0x7f20c70b39f0" />
+                        <access id="491" addr="0x7f658f8360f0" >
+                            <attributelist id="492" addr="0x7f658f8360f0" >
+                                <attribute name="kind" value="public" id="493" addr="0x7f658f83e9f0" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="494" addr="0x7f20c70ab4f0" >
-                            <attributelist id="495" addr="0x7f20c70ab4f0" >
-                                <attribute name="name" value="File" id="496" addr="0x7f20c70b39f0" />
-                                <attribute name="ismember" value="1" id="497" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_symtab" value="0x7f20c70aadd0" id="498" addr="0x7f20c70aadd0" />
-                                <attribute name="sym_nextSibling" value="0x7f20c70ab6d0" id="499" addr="0x7f20c70ab6d0" />
-                                <attribute name="csym_nextSibling" value="0x7f20c70ab6d0" id="500" addr="0x7f20c70ab6d0" />
-                                <attribute name="sym_name" value="File" id="501" addr="0x7f20c70b39f0" />
-                                <attribute name="decl" value="f(r.q(const).String,p.q(const).char)." id="502" addr="0x7f20c70b39f0" />
-                                <attribute name="access" value="public" id="503" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_overloaded" value="0x7f20c70ab4f0" id="504" addr="0x7f20c70ab4f0" />
-                                <parmlist id="505" addr="0x7f20c70ab250" >
+                        <constructor id="494" addr="0x7f658f8364f0" >
+                            <attributelist id="495" addr="0x7f658f8364f0" >
+                                <attribute name="name" value="File" id="496" addr="0x7f658f83e9f0" />
+                                <attribute name="ismember" value="1" id="497" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_symtab" value="0x7f658f835dd0" id="498" addr="0x7f658f835dd0" />
+                                <attribute name="sym_nextSibling" value="0x7f658f8366d0" id="499" addr="0x7f658f8366d0" />
+                                <attribute name="csym_nextSibling" value="0x7f658f8366d0" id="500" addr="0x7f658f8366d0" />
+                                <attribute name="sym_name" value="File" id="501" addr="0x7f658f83e9f0" />
+                                <attribute name="decl" value="f(r.q(const).String,p.q(const).char)." id="502" addr="0x7f658f83e9f0" />
+                                <attribute name="access" value="public" id="503" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_overloaded" value="0x7f658f8364f0" id="504" addr="0x7f658f8364f0" />
+                                <parmlist id="505" addr="0x7f658f836250" >
                                     <parm id="506">
-                                        <attributelist id="507" addr="0x7f20c70ab250" >
-                                            <attribute name="name" value="filepath" id="508" addr="0x7f20c70b39f0" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="509" addr="0x7f20c70b39f0" />
+                                        <attributelist id="507" addr="0x7f658f836250" >
+                                            <attribute name="name" value="filepath" id="508" addr="0x7f658f83e9f0" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="509" addr="0x7f658f83e9f0" />
                                         </attributelist >
                                     </parm >
                                     <parm id="510">
-                                        <attributelist id="511" addr="0x7f20c70ab3f0" >
-                                            <attribute name="name" value="mode" id="512" addr="0x7f20c70b39f0" />
-                                            <attribute name="value" value="NULL" id="513" addr="0x7f20c70b39f0" />
-                                            <attribute name="type" value="p.q(const).char" id="514" addr="0x7f20c70b39f0" />
+                                        <attributelist id="511" addr="0x7f658f8363f0" >
+                                            <attribute name="name" value="mode" id="512" addr="0x7f658f83e9f0" />
+                                            <attribute name="value" value="NULL" id="513" addr="0x7f658f83e9f0" />
+                                            <attribute name="type" value="p.q(const).char" id="514" addr="0x7f658f83e9f0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="code" value="{&#10;        DelayedCallGuard dg(languageHook);&#10;        if (mode &amp;&amp; strncmp(mode, &quot;w&quot;, 1) == 0)&#10;          file->OpenForWrite(filepath,true);&#10;        else&#10;          file->Open(filepath, XFILE::READ_NO_CACHE);&#10;      }" id="515" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="516" addr="0x7f20c70b39f0" />
-                                <attribute name="feature_new" value="1" id="517" addr="0x7f20c70b39f0" />
+                                <attribute name="code" value="{&#10;        DelayedCallGuard dg(languageHook);&#10;        if (mode &amp;&amp; strncmp(mode, &quot;w&quot;, 1) == 0)&#10;          file->OpenForWrite(filepath,true);&#10;        else&#10;          file->Open(filepath, XFILE::READ_NO_CACHE);&#10;      }" id="515" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="516" addr="0x7f658f83e9f0" />
+                                <attribute name="feature_new" value="1" id="517" addr="0x7f658f83e9f0" />
                             </attributelist >
                          
                         </constructor >
-                        <constructor id="518" addr="0x7f20c70ab6d0" >
-                            <attributelist id="519" addr="0x7f20c70ab6d0" >
-                                <attribute name="name" value="File" id="520" addr="0x7f20c70b39f0" />
-                                <attribute name="ismember" value="1" id="521" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_symtab" value="0x7f20c70aadd0" id="522" addr="0x7f20c70aadd0" />
-                                <attribute name="sym_previousSibling" value="0x7f20c70ab4f0" id="523" addr="0x7f20c70ab4f0" />
-                                <attribute name="sym_name" value="File" id="524" addr="0x7f20c70b39f0" />
-                                <attribute name="defaultargs" value="0x7f20c70ab4f0" id="525" addr="0x7f20c70ab4f0" />
-                                <attribute name="decl" value="f(r.q(const).String)." id="526" addr="0x7f20c70b39f0" />
-                                <attribute name="access" value="public" id="527" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_overloaded" value="0x7f20c70ab4f0" id="528" addr="0x7f20c70ab4f0" />
-                                <parmlist id="529" addr="0x7f20c70ab5d0" >
+                        <constructor id="518" addr="0x7f658f8366d0" >
+                            <attributelist id="519" addr="0x7f658f8366d0" >
+                                <attribute name="name" value="File" id="520" addr="0x7f658f83e9f0" />
+                                <attribute name="ismember" value="1" id="521" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_symtab" value="0x7f658f835dd0" id="522" addr="0x7f658f835dd0" />
+                                <attribute name="sym_previousSibling" value="0x7f658f8364f0" id="523" addr="0x7f658f8364f0" />
+                                <attribute name="sym_name" value="File" id="524" addr="0x7f658f83e9f0" />
+                                <attribute name="defaultargs" value="0x7f658f8364f0" id="525" addr="0x7f658f8364f0" />
+                                <attribute name="decl" value="f(r.q(const).String)." id="526" addr="0x7f658f83e9f0" />
+                                <attribute name="access" value="public" id="527" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_overloaded" value="0x7f658f8364f0" id="528" addr="0x7f658f8364f0" />
+                                <parmlist id="529" addr="0x7f658f8365d0" >
                                     <parm id="530">
-                                        <attributelist id="531" addr="0x7f20c70ab5d0" >
-                                            <attribute name="name" value="filepath" id="532" addr="0x7f20c70b39f0" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="533" addr="0x7f20c70b39f0" />
+                                        <attributelist id="531" addr="0x7f658f8365d0" >
+                                            <attribute name="name" value="filepath" id="532" addr="0x7f658f83e9f0" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="533" addr="0x7f658f83e9f0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="code" value="{&#10;        DelayedCallGuard dg(languageHook);&#10;        if (mode &amp;&amp; strncmp(mode, &quot;w&quot;, 1) == 0)&#10;          file->OpenForWrite(filepath,true);&#10;        else&#10;          file->Open(filepath, XFILE::READ_NO_CACHE);&#10;      }" id="534" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="535" addr="0x7f20c70b39f0" />
-                                <attribute name="feature_new" value="1" id="536" addr="0x7f20c70b39f0" />
+                                <attribute name="code" value="{&#10;        DelayedCallGuard dg(languageHook);&#10;        if (mode &amp;&amp; strncmp(mode, &quot;w&quot;, 1) == 0)&#10;          file->OpenForWrite(filepath,true);&#10;        else&#10;          file->Open(filepath, XFILE::READ_NO_CACHE);&#10;      }" id="534" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="535" addr="0x7f658f83e9f0" />
+                                <attribute name="feature_new" value="1" id="536" addr="0x7f658f83e9f0" />
                             </attributelist >
                          
                         </constructor >
-                        <destructor id="537" addr="0x7f20c70ab8d0" >
-                            <attributelist id="538" addr="0x7f20c70ab8d0" >
-                                <attribute name="ismember" value="1" id="539" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_name" value="~File" id="540" addr="0x7f20c70b39f0" />
-                                <attribute name="name" value="~File" id="541" addr="0x7f20c70b39f0" />
-                                <attribute name="decl" value="f()." id="542" addr="0x7f20c70b39f0" />
-                                <attribute name="access" value="public" id="543" addr="0x7f20c70b39f0" />
-                                <attribute name="code" value="{ delete file; }" id="544" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_symtab" value="0x7f20c70aadd0" id="545" addr="0x7f20c70aadd0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="546" addr="0x7f20c70b39f0" />
+                        <destructor id="537" addr="0x7f658f8368d0" >
+                            <attributelist id="538" addr="0x7f658f8368d0" >
+                                <attribute name="ismember" value="1" id="539" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_name" value="~File" id="540" addr="0x7f658f83e9f0" />
+                                <attribute name="name" value="~File" id="541" addr="0x7f658f83e9f0" />
+                                <attribute name="decl" value="f()." id="542" addr="0x7f658f83e9f0" />
+                                <attribute name="access" value="public" id="543" addr="0x7f658f83e9f0" />
+                                <attribute name="code" value="{ delete file; }" id="544" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_symtab" value="0x7f658f835dd0" id="545" addr="0x7f658f835dd0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="546" addr="0x7f658f83e9f0" />
                             </attributelist >
                          
                         </destructor >
-                        <cdecl id="547" addr="0x7f20c70abc10" >
-                            <attributelist id="548" addr="0x7f20c70abc10" >
-                                <attribute name="name" value="read" id="549" addr="0x7f20c70b39f0" />
-                                <attribute name="ismember" value="1" id="550" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_symtab" value="0x7f20c70aadd0" id="551" addr="0x7f20c70aadd0" />
-                                <attribute name="sym_nextSibling" value="0x7f20c70abd30" id="552" addr="0x7f20c70abd30" />
-                                <attribute name="csym_nextSibling" value="0x7f20c70abd30" id="553" addr="0x7f20c70abd30" />
-                                <attribute name="kind" value="function" id="554" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_name" value="read" id="555" addr="0x7f20c70b39f0" />
-                                <attribute name="decl" value="f(unsigned long)." id="556" addr="0x7f20c70b39f0" />
-                                <attribute name="access" value="public" id="557" addr="0x7f20c70b39f0" />
-                                <parmlist id="558" addr="0x7f20c70abb70" >
+                        <cdecl id="547" addr="0x7f658f836c10" >
+                            <attributelist id="548" addr="0x7f658f836c10" >
+                                <attribute name="name" value="read" id="549" addr="0x7f658f83e9f0" />
+                                <attribute name="ismember" value="1" id="550" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_symtab" value="0x7f658f835dd0" id="551" addr="0x7f658f835dd0" />
+                                <attribute name="sym_nextSibling" value="0x7f658f836d30" id="552" addr="0x7f658f836d30" />
+                                <attribute name="csym_nextSibling" value="0x7f658f836d30" id="553" addr="0x7f658f836d30" />
+                                <attribute name="kind" value="function" id="554" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_name" value="read" id="555" addr="0x7f658f83e9f0" />
+                                <attribute name="decl" value="f(unsigned long)." id="556" addr="0x7f658f83e9f0" />
+                                <attribute name="access" value="public" id="557" addr="0x7f658f83e9f0" />
+                                <parmlist id="558" addr="0x7f658f836b70" >
                                     <parm id="559">
-                                        <attributelist id="560" addr="0x7f20c70abb70" >
-                                            <attribute name="name" value="numBytes" id="561" addr="0x7f20c70b39f0" />
-                                            <attribute name="value" value="0" id="562" addr="0x7f20c70b39f0" />
-                                            <attribute name="type" value="unsigned long" id="563" addr="0x7f20c70b39f0" />
+                                        <attributelist id="560" addr="0x7f658f836b70" >
+                                            <attribute name="name" value="numBytes" id="561" addr="0x7f658f83e9f0" />
+                                            <attribute name="value" value="0" id="562" addr="0x7f658f83e9f0" />
+                                            <attribute name="type" value="unsigned long" id="563" addr="0x7f658f83e9f0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="sym_overloaded" value="0x7f20c70abc10" id="564" addr="0x7f20c70abc10" />
-                                <attribute name="type" value="XBMCAddon::String" id="565" addr="0x7f20c70b39f0" />
-                                <attribute name="code" value="{&#10;        XbmcCommons::Buffer b = readBytes(numBytes);&#10;        return b.getString(numBytes == 0 ? b.remaining() : std::min((unsigned long)b.remaining(),numBytes));&#10;      }" id="566" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="567" addr="0x7f20c70b39f0" />
+                                <attribute name="sym_overloaded" value="0x7f658f836c10" id="564" addr="0x7f658f836c10" />
+                                <attribute name="type" value="XBMCAddon::String" id="565" addr="0x7f658f83e9f0" />
+                                <attribute name="code" value="{&#10;        XbmcCommons::Buffer b = readBytes(numBytes);&#10;        return b.getString(numBytes == 0 ? b.remaining() : std::min((unsigned long)b.remaining(),numBytes));&#10;      }" id="566" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="567" addr="0x7f658f83e9f0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="568" addr="0x7f20c70abd30" >
-                            <attributelist id="569" addr="0x7f20c70abd30" >
-                                <attribute name="name" value="read" id="570" addr="0x7f20c70b39f0" />
-                                <attribute name="ismember" value="1" id="571" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_symtab" value="0x7f20c70aadd0" id="572" addr="0x7f20c70aadd0" />
-                                <attribute name="sym_previousSibling" value="0x7f20c70abc10" id="573" addr="0x7f20c70abc10" />
-                                <attribute name="kind" value="function" id="574" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_name" value="read" id="575" addr="0x7f20c70b39f0" />
-                                <attribute name="defaultargs" value="0x7f20c70abc10" id="576" addr="0x7f20c70abc10" />
-                                <attribute name="decl" value="f()." id="577" addr="0x7f20c70b39f0" />
-                                <attribute name="access" value="public" id="578" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_overloaded" value="0x7f20c70abc10" id="579" addr="0x7f20c70abc10" />
-                                <attribute name="type" value="XBMCAddon::String" id="580" addr="0x7f20c70b39f0" />
-                                <attribute name="code" value="{&#10;        XbmcCommons::Buffer b = readBytes(numBytes);&#10;        return b.getString(numBytes == 0 ? b.remaining() : std::min((unsigned long)b.remaining(),numBytes));&#10;      }" id="581" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="582" addr="0x7f20c70b39f0" />
+                        <cdecl id="568" addr="0x7f658f836d30" >
+                            <attributelist id="569" addr="0x7f658f836d30" >
+                                <attribute name="name" value="read" id="570" addr="0x7f658f83e9f0" />
+                                <attribute name="ismember" value="1" id="571" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_symtab" value="0x7f658f835dd0" id="572" addr="0x7f658f835dd0" />
+                                <attribute name="sym_previousSibling" value="0x7f658f836c10" id="573" addr="0x7f658f836c10" />
+                                <attribute name="kind" value="function" id="574" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_name" value="read" id="575" addr="0x7f658f83e9f0" />
+                                <attribute name="defaultargs" value="0x7f658f836c10" id="576" addr="0x7f658f836c10" />
+                                <attribute name="decl" value="f()." id="577" addr="0x7f658f83e9f0" />
+                                <attribute name="access" value="public" id="578" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_overloaded" value="0x7f658f836c10" id="579" addr="0x7f658f836c10" />
+                                <attribute name="type" value="XBMCAddon::String" id="580" addr="0x7f658f83e9f0" />
+                                <attribute name="code" value="{&#10;        XbmcCommons::Buffer b = readBytes(numBytes);&#10;        return b.getString(numBytes == 0 ? b.remaining() : std::min((unsigned long)b.remaining(),numBytes));&#10;      }" id="581" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="582" addr="0x7f658f83e9f0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="583" addr="0x7f20c70ac0f0" >
-                            <attributelist id="584" addr="0x7f20c70ac0f0" >
-                                <attribute name="name" value="readBytes" id="585" addr="0x7f20c70b39f0" />
-                                <attribute name="ismember" value="1" id="586" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_symtab" value="0x7f20c70aadd0" id="587" addr="0x7f20c70aadd0" />
-                                <attribute name="sym_nextSibling" value="0x7f20c70ac1f0" id="588" addr="0x7f20c70ac1f0" />
-                                <attribute name="csym_nextSibling" value="0x7f20c70ac1f0" id="589" addr="0x7f20c70ac1f0" />
-                                <attribute name="kind" value="function" id="590" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_name" value="readBytes" id="591" addr="0x7f20c70b39f0" />
-                                <attribute name="decl" value="f(unsigned long)." id="592" addr="0x7f20c70b39f0" />
-                                <attribute name="access" value="public" id="593" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_overloaded" value="0x7f20c70ac0f0" id="594" addr="0x7f20c70ac0f0" />
-                                <parmlist id="595" addr="0x7f20c70ac030" >
+                        <cdecl id="583" addr="0x7f658f8370f0" >
+                            <attributelist id="584" addr="0x7f658f8370f0" >
+                                <attribute name="name" value="readBytes" id="585" addr="0x7f658f83e9f0" />
+                                <attribute name="ismember" value="1" id="586" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_symtab" value="0x7f658f835dd0" id="587" addr="0x7f658f835dd0" />
+                                <attribute name="sym_nextSibling" value="0x7f658f8371f0" id="588" addr="0x7f658f8371f0" />
+                                <attribute name="csym_nextSibling" value="0x7f658f8371f0" id="589" addr="0x7f658f8371f0" />
+                                <attribute name="kind" value="function" id="590" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_name" value="readBytes" id="591" addr="0x7f658f83e9f0" />
+                                <attribute name="decl" value="f(unsigned long)." id="592" addr="0x7f658f83e9f0" />
+                                <attribute name="access" value="public" id="593" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_overloaded" value="0x7f658f8370f0" id="594" addr="0x7f658f8370f0" />
+                                <parmlist id="595" addr="0x7f658f837030" >
                                     <parm id="596">
-                                        <attributelist id="597" addr="0x7f20c70ac030" >
-                                            <attribute name="name" value="numBytes" id="598" addr="0x7f20c70b39f0" />
-                                            <attribute name="value" value="0" id="599" addr="0x7f20c70b39f0" />
-                                            <attribute name="type" value="unsigned long" id="600" addr="0x7f20c70b39f0" />
+                                        <attributelist id="597" addr="0x7f658f837030" >
+                                            <attribute name="name" value="numBytes" id="598" addr="0x7f658f83e9f0" />
+                                            <attribute name="value" value="0" id="599" addr="0x7f658f83e9f0" />
+                                            <attribute name="type" value="unsigned long" id="600" addr="0x7f658f83e9f0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="XbmcCommons::Buffer" id="601" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="602" addr="0x7f20c70b39f0" />
+                                <attribute name="type" value="XbmcCommons::Buffer" id="601" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="602" addr="0x7f658f83e9f0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="603" addr="0x7f20c70ac1f0" >
-                            <attributelist id="604" addr="0x7f20c70ac1f0" >
-                                <attribute name="name" value="readBytes" id="605" addr="0x7f20c70b39f0" />
-                                <attribute name="ismember" value="1" id="606" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_symtab" value="0x7f20c70aadd0" id="607" addr="0x7f20c70aadd0" />
-                                <attribute name="sym_previousSibling" value="0x7f20c70ac0f0" id="608" addr="0x7f20c70ac0f0" />
-                                <attribute name="kind" value="function" id="609" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_name" value="readBytes" id="610" addr="0x7f20c70b39f0" />
-                                <attribute name="defaultargs" value="0x7f20c70ac0f0" id="611" addr="0x7f20c70ac0f0" />
-                                <attribute name="decl" value="f()." id="612" addr="0x7f20c70b39f0" />
-                                <attribute name="access" value="public" id="613" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_overloaded" value="0x7f20c70ac0f0" id="614" addr="0x7f20c70ac0f0" />
-                                <attribute name="type" value="XbmcCommons::Buffer" id="615" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="616" addr="0x7f20c70b39f0" />
+                        <cdecl id="603" addr="0x7f658f8371f0" >
+                            <attributelist id="604" addr="0x7f658f8371f0" >
+                                <attribute name="name" value="readBytes" id="605" addr="0x7f658f83e9f0" />
+                                <attribute name="ismember" value="1" id="606" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_symtab" value="0x7f658f835dd0" id="607" addr="0x7f658f835dd0" />
+                                <attribute name="sym_previousSibling" value="0x7f658f8370f0" id="608" addr="0x7f658f8370f0" />
+                                <attribute name="kind" value="function" id="609" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_name" value="readBytes" id="610" addr="0x7f658f83e9f0" />
+                                <attribute name="defaultargs" value="0x7f658f8370f0" id="611" addr="0x7f658f8370f0" />
+                                <attribute name="decl" value="f()." id="612" addr="0x7f658f83e9f0" />
+                                <attribute name="access" value="public" id="613" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_overloaded" value="0x7f658f8370f0" id="614" addr="0x7f658f8370f0" />
+                                <attribute name="type" value="XbmcCommons::Buffer" id="615" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="616" addr="0x7f658f83e9f0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="617" addr="0x7f20c70ac510" >
-                            <attributelist id="618" addr="0x7f20c70ac510" >
-                                <attribute name="name" value="write" id="619" addr="0x7f20c70b39f0" />
-                                <attribute name="ismember" value="1" id="620" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_symtab" value="0x7f20c70aadd0" id="621" addr="0x7f20c70aadd0" />
-                                <attribute name="kind" value="function" id="622" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_name" value="write" id="623" addr="0x7f20c70b39f0" />
-                                <attribute name="decl" value="f(r.XbmcCommons::Buffer)." id="624" addr="0x7f20c70b39f0" />
-                                <attribute name="access" value="public" id="625" addr="0x7f20c70b39f0" />
-                                <parmlist id="626" addr="0x7f20c70ac450" >
+                        <cdecl id="617" addr="0x7f658f837510" >
+                            <attributelist id="618" addr="0x7f658f837510" >
+                                <attribute name="name" value="write" id="619" addr="0x7f658f83e9f0" />
+                                <attribute name="ismember" value="1" id="620" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_symtab" value="0x7f658f835dd0" id="621" addr="0x7f658f835dd0" />
+                                <attribute name="kind" value="function" id="622" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_name" value="write" id="623" addr="0x7f658f83e9f0" />
+                                <attribute name="decl" value="f(r.XbmcCommons::Buffer)." id="624" addr="0x7f658f83e9f0" />
+                                <attribute name="access" value="public" id="625" addr="0x7f658f83e9f0" />
+                                <parmlist id="626" addr="0x7f658f837450" >
                                     <parm id="627">
-                                        <attributelist id="628" addr="0x7f20c70ac450" >
-                                            <attribute name="name" value="buffer" id="629" addr="0x7f20c70b39f0" />
-                                            <attribute name="type" value="r.XbmcCommons::Buffer" id="630" addr="0x7f20c70b39f0" />
+                                        <attributelist id="628" addr="0x7f658f837450" >
+                                            <attribute name="name" value="buffer" id="629" addr="0x7f658f83e9f0" />
+                                            <attribute name="type" value="r.XbmcCommons::Buffer" id="630" addr="0x7f658f83e9f0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="bool" id="631" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="632" addr="0x7f20c70b39f0" />
+                                <attribute name="type" value="bool" id="631" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="632" addr="0x7f658f83e9f0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="633" addr="0x7f20c70ac730" >
-                            <attributelist id="634" addr="0x7f20c70ac730" >
-                                <attribute name="name" value="size" id="635" addr="0x7f20c70b39f0" />
-                                <attribute name="ismember" value="1" id="636" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_symtab" value="0x7f20c70aadd0" id="637" addr="0x7f20c70aadd0" />
-                                <attribute name="kind" value="function" id="638" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_name" value="size" id="639" addr="0x7f20c70b39f0" />
-                                <attribute name="decl" value="f()." id="640" addr="0x7f20c70b39f0" />
-                                <attribute name="access" value="public" id="641" addr="0x7f20c70b39f0" />
-                                <attribute name="type" value="long long" id="642" addr="0x7f20c70b39f0" />
-                                <attribute name="code" value="{ DelayedCallGuard dg(languageHook); return file->GetLength(); }" id="643" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="644" addr="0x7f20c70b39f0" />
+                        <cdecl id="633" addr="0x7f658f837730" >
+                            <attributelist id="634" addr="0x7f658f837730" >
+                                <attribute name="name" value="size" id="635" addr="0x7f658f83e9f0" />
+                                <attribute name="ismember" value="1" id="636" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_symtab" value="0x7f658f835dd0" id="637" addr="0x7f658f835dd0" />
+                                <attribute name="kind" value="function" id="638" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_name" value="size" id="639" addr="0x7f658f83e9f0" />
+                                <attribute name="decl" value="f()." id="640" addr="0x7f658f83e9f0" />
+                                <attribute name="access" value="public" id="641" addr="0x7f658f83e9f0" />
+                                <attribute name="type" value="long long" id="642" addr="0x7f658f83e9f0" />
+                                <attribute name="code" value="{ DelayedCallGuard dg(languageHook); return file->GetLength(); }" id="643" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="644" addr="0x7f658f83e9f0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="645" addr="0x7f20c70acc10" >
-                            <attributelist id="646" addr="0x7f20c70acc10" >
-                                <attribute name="name" value="seek" id="647" addr="0x7f20c70b39f0" />
-                                <attribute name="ismember" value="1" id="648" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_symtab" value="0x7f20c70aadd0" id="649" addr="0x7f20c70aadd0" />
-                                <attribute name="kind" value="function" id="650" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_name" value="seek" id="651" addr="0x7f20c70b39f0" />
-                                <attribute name="decl" value="f(long long,int)." id="652" addr="0x7f20c70b39f0" />
-                                <attribute name="access" value="public" id="653" addr="0x7f20c70b39f0" />
-                                <parmlist id="654" addr="0x7f20c70aca50" >
+                        <cdecl id="645" addr="0x7f658f837c10" >
+                            <attributelist id="646" addr="0x7f658f837c10" >
+                                <attribute name="name" value="seek" id="647" addr="0x7f658f83e9f0" />
+                                <attribute name="ismember" value="1" id="648" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_symtab" value="0x7f658f835dd0" id="649" addr="0x7f658f835dd0" />
+                                <attribute name="kind" value="function" id="650" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_name" value="seek" id="651" addr="0x7f658f83e9f0" />
+                                <attribute name="decl" value="f(long long,int)." id="652" addr="0x7f658f83e9f0" />
+                                <attribute name="access" value="public" id="653" addr="0x7f658f83e9f0" />
+                                <parmlist id="654" addr="0x7f658f837a50" >
                                     <parm id="655">
-                                        <attributelist id="656" addr="0x7f20c70aca50" >
-                                            <attribute name="name" value="seekBytes" id="657" addr="0x7f20c70b39f0" />
-                                            <attribute name="type" value="long long" id="658" addr="0x7f20c70b39f0" />
+                                        <attributelist id="656" addr="0x7f658f837a50" >
+                                            <attribute name="name" value="seekBytes" id="657" addr="0x7f658f83e9f0" />
+                                            <attribute name="type" value="long long" id="658" addr="0x7f658f83e9f0" />
                                         </attributelist >
                                     </parm >
                                     <parm id="659">
-                                        <attributelist id="660" addr="0x7f20c70acb70" >
-                                            <attribute name="name" value="iWhence" id="661" addr="0x7f20c70b39f0" />
-                                            <attribute name="type" value="int" id="662" addr="0x7f20c70b39f0" />
+                                        <attributelist id="660" addr="0x7f658f837b70" >
+                                            <attribute name="name" value="iWhence" id="661" addr="0x7f658f83e9f0" />
+                                            <attribute name="type" value="int" id="662" addr="0x7f658f83e9f0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="long long" id="663" addr="0x7f20c70b39f0" />
-                                <attribute name="code" value="{ DelayedCallGuard dg(languageHook); return file->Seek(seekBytes,iWhence); }" id="664" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="665" addr="0x7f20c70b39f0" />
+                                <attribute name="type" value="long long" id="663" addr="0x7f658f83e9f0" />
+                                <attribute name="code" value="{ DelayedCallGuard dg(languageHook); return file->Seek(seekBytes,iWhence); }" id="664" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="665" addr="0x7f658f83e9f0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="666" addr="0x7f20c70acdd0" >
-                            <attributelist id="667" addr="0x7f20c70acdd0" >
-                                <attribute name="ismember" value="1" id="668" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_name" value="close" id="669" addr="0x7f20c70b39f0" />
-                                <attribute name="name" value="close" id="670" addr="0x7f20c70b39f0" />
-                                <attribute name="decl" value="f()." id="671" addr="0x7f20c70b39f0" />
-                                <attribute name="access" value="public" id="672" addr="0x7f20c70b39f0" />
-                                <attribute name="code" value="{ DelayedCallGuard dg(languageHook); file->Close(); }" id="673" addr="0x7f20c70b39f0" />
-                                <attribute name="kind" value="function" id="674" addr="0x7f20c70b39f0" />
-                                <attribute name="type" value="void" id="675" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_symtab" value="0x7f20c70aadd0" id="676" addr="0x7f20c70aadd0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="677" addr="0x7f20c70b39f0" />
+                        <cdecl id="666" addr="0x7f658f837dd0" >
+                            <attributelist id="667" addr="0x7f658f837dd0" >
+                                <attribute name="ismember" value="1" id="668" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_name" value="close" id="669" addr="0x7f658f83e9f0" />
+                                <attribute name="name" value="close" id="670" addr="0x7f658f83e9f0" />
+                                <attribute name="decl" value="f()." id="671" addr="0x7f658f83e9f0" />
+                                <attribute name="access" value="public" id="672" addr="0x7f658f83e9f0" />
+                                <attribute name="code" value="{ DelayedCallGuard dg(languageHook); file->Close(); }" id="673" addr="0x7f658f83e9f0" />
+                                <attribute name="kind" value="function" id="674" addr="0x7f658f83e9f0" />
+                                <attribute name="type" value="void" id="675" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_symtab" value="0x7f658f835dd0" id="676" addr="0x7f658f835dd0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="677" addr="0x7f658f83e9f0" />
                             </attributelist >
                          
                         </cdecl >
@@ -1060,402 +1060,402 @@
                 </namespace >
             </namespace >
         </include >
-        <include id="678" addr="0x7f20c70ad530" >
-            <attributelist id="679" addr="0x7f20c70ad530" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/Stat.h" id="680" addr="0x7f20c70b39f0" />
+        <include id="678" addr="0x7f658f838530" >
+            <attributelist id="679" addr="0x7f658f838530" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/Stat.h" id="680" addr="0x7f658f83e9f0" />
             </attributelist >
 
-            <namespace id="681" addr="0x7f20c70ad5d0" >
-                <attributelist id="682" addr="0x7f20c70ad5d0" >
-                    <attribute name="sym_name" value="XBMCAddon" id="683" addr="0x7f20c70b39f0" />
-                    <attribute name="name" value="XBMCAddon" id="684" addr="0x7f20c70b39f0" />
-                    <attribute name="sym_previousSibling" value="0x7f20c70aa930" id="685" addr="0x7f20c70aa930" />
-                    <attribute name="csym_nextSibling" value="0x7f20c70af930" id="686" addr="0x7f20c70af930" />
-                    <attribute name="sym_nextSibling" value="0x7f20c70af930" id="687" addr="0x7f20c70af930" />
-                    <typescope id="688" addr="0x7f20c70b1a70" >
-                        <attributelist id="689" addr="0x7f20c70b1a70" >
-                            <attribute name="name" value="XBMCAddon" id="690" addr="0x7f20c70b39f0" />
-                            <typetab id="691" addr="0x7f20c70b1ab0" >
-                                <attributelist id="692" addr="0x7f20c70b1ab0" >
-                                    <attribute name="String" value="std::string" id="693" addr="0x7f20c70b39f0" />
+            <namespace id="681" addr="0x7f658f8385d0" >
+                <attributelist id="682" addr="0x7f658f8385d0" >
+                    <attribute name="sym_name" value="XBMCAddon" id="683" addr="0x7f658f83e9f0" />
+                    <attribute name="name" value="XBMCAddon" id="684" addr="0x7f658f83e9f0" />
+                    <attribute name="sym_previousSibling" value="0x7f658f835930" id="685" addr="0x7f658f835930" />
+                    <attribute name="csym_nextSibling" value="0x7f658f83a930" id="686" addr="0x7f658f83a930" />
+                    <attribute name="sym_nextSibling" value="0x7f658f83a930" id="687" addr="0x7f658f83a930" />
+                    <typescope id="688" addr="0x7f658f83ca70" >
+                        <attributelist id="689" addr="0x7f658f83ca70" >
+                            <attribute name="name" value="XBMCAddon" id="690" addr="0x7f658f83e9f0" />
+                            <typetab id="691" addr="0x7f658f83cab0" >
+                                <attributelist id="692" addr="0x7f658f83cab0" >
+                                    <attribute name="String" value="std::string" id="693" addr="0x7f658f83e9f0" />
                                 </attributelist >
-                                <typetabsitem id="694" addr="0x7f20c70b1c90" >
-                                    <attributelist id="695" addr="0x7f20c70b1c90" >
+                                <typetabsitem id="694" addr="0x7f658f83cc90" >
+                                    <attributelist id="695" addr="0x7f658f83cc90" >
                                     </attributelist >
                                 </typetabsitem >
                             </typetab >
-                            <attribute name="parent" value="0x7f20c7093a30" id="696" addr="0x7f20c7093a30" />
-                            <attribute name="qname" value="XBMCAddon" id="697" addr="0x7f20c70b39f0" />
-                            <attribute name="symtab" value="0x7f20c70aa2d0" id="698" addr="0x7f20c70aa2d0" />
+                            <attribute name="parent" value="0x7f658f81ea30" id="696" addr="0x7f658f81ea30" />
+                            <attribute name="qname" value="XBMCAddon" id="697" addr="0x7f658f83e9f0" />
+                            <attribute name="symtab" value="0x7f658f8352d0" id="698" addr="0x7f658f8352d0" />
                         </attributelist >
-                        <typescopesitem id="699" addr="0x7f20c70aa290" >
-                            <attributelist id="700" addr="0x7f20c70aa290" >
+                        <typescopesitem id="699" addr="0x7f658f835290" >
+                            <attributelist id="700" addr="0x7f658f835290" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="701" addr="0x7f20c70b1ab0" >
-                            <attributelist id="702" addr="0x7f20c70b1ab0" >
-                                <attribute name="String" value="std::string" id="703" addr="0x7f20c70b39f0" />
+                        <typescopesitem id="701" addr="0x7f658f83cab0" >
+                            <attributelist id="702" addr="0x7f658f83cab0" >
+                                <attribute name="String" value="std::string" id="703" addr="0x7f658f83e9f0" />
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="704" addr="0x7f20c7093a30" >
-                            <attributelist id="705" addr="0x7f20c7093a30" >
-                                <attribute name="name" value="" id="706" addr="0x7f20c70b39f0" />
-                                <typetab id="707" addr="0x7f20c7093a90" >
-                                    <attributelist id="708" addr="0x7f20c7093a90" >
+                        <typescopesitem id="704" addr="0x7f658f81ea30" >
+                            <attributelist id="705" addr="0x7f658f81ea30" >
+                                <attribute name="name" value="" id="706" addr="0x7f658f83e9f0" />
+                                <typetab id="707" addr="0x7f658f81ea90" >
+                                    <attributelist id="708" addr="0x7f658f81ea90" >
                                     </attributelist >
                                 </typetab >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="709" addr="0x7f20c70b1bb0" >
-                            <attributelist id="710" addr="0x7f20c70b1bb0" >
+                        <typescopesitem id="709" addr="0x7f658f83cbb0" >
+                            <attributelist id="710" addr="0x7f658f83cbb0" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="711" addr="0x7f20c70aa2d0" >
-                            <attributelist id="712" addr="0x7f20c70aa2d0" >
-                                <attribute name="name" value="XBMCAddon" id="713" addr="0x7f20c70b39f0" />
-                                <attribute name="csymtab" value="0x7f20c70aa310" id="714" addr="0x7f20c70aa310" />
-                                <attribute name="symtab" value="0x7f20c70aa2b0" id="715" addr="0x7f20c70aa2b0" />
+                        <typescopesitem id="711" addr="0x7f658f8352d0" >
+                            <attributelist id="712" addr="0x7f658f8352d0" >
+                                <attribute name="name" value="XBMCAddon" id="713" addr="0x7f658f83e9f0" />
+                                <attribute name="csymtab" value="0x7f658f835310" id="714" addr="0x7f658f835310" />
+                                <attribute name="symtab" value="0x7f658f8352b0" id="715" addr="0x7f658f8352b0" />
                             </attributelist >
                         </typescopesitem >
                     </typescope >
-                    <attribute name="symtab" value="0x7f20c70aa2d0" id="716" addr="0x7f20c70aa2d0" />
-                    <attribute name="sym_symtab" value="0x7f20c7093950" id="717" addr="0x7f20c7093950" />
+                    <attribute name="symtab" value="0x7f658f8352d0" id="716" addr="0x7f658f8352d0" />
+                    <attribute name="sym_symtab" value="0x7f658f81e950" id="717" addr="0x7f658f81e950" />
                 </attributelist >
 
-                <namespace id="718" addr="0x7f20c70ad650" >
-                    <attributelist id="719" addr="0x7f20c70ad650" >
-                        <attribute name="sym_name" value="xbmcvfs" id="720" addr="0x7f20c70b39f0" />
-                        <attribute name="name" value="xbmcvfs" id="721" addr="0x7f20c70b39f0" />
-                        <attribute name="sym_previousSibling" value="0x7f20c70aaa50" id="722" addr="0x7f20c70aaa50" />
-                        <attribute name="csym_nextSibling" value="0x7f20c70af9b0" id="723" addr="0x7f20c70af9b0" />
-                        <attribute name="sym_nextSibling" value="0x7f20c70af9b0" id="724" addr="0x7f20c70af9b0" />
-                        <typescope id="725" addr="0x7f20c70b1e50" >
-                            <attributelist id="726" addr="0x7f20c70b1e50" >
-                                <attribute name="name" value="xbmcvfs" id="727" addr="0x7f20c70b39f0" />
-                                <typetab id="728" addr="0x7f20c70b1e70" >
-                                    <attributelist id="729" addr="0x7f20c70b1e70" >
-                                        <attribute name="Stat" value="Stat" id="730" addr="0x7f20c70b39f0" />
-                                        <attribute name="File" value="File" id="731" addr="0x7f20c70b39f0" />
+                <namespace id="718" addr="0x7f658f838650" >
+                    <attributelist id="719" addr="0x7f658f838650" >
+                        <attribute name="sym_name" value="xbmcvfs" id="720" addr="0x7f658f83e9f0" />
+                        <attribute name="name" value="xbmcvfs" id="721" addr="0x7f658f83e9f0" />
+                        <attribute name="sym_previousSibling" value="0x7f658f835a50" id="722" addr="0x7f658f835a50" />
+                        <attribute name="csym_nextSibling" value="0x7f658f83a9b0" id="723" addr="0x7f658f83a9b0" />
+                        <attribute name="sym_nextSibling" value="0x7f658f83a9b0" id="724" addr="0x7f658f83a9b0" />
+                        <typescope id="725" addr="0x7f658f83ce50" >
+                            <attributelist id="726" addr="0x7f658f83ce50" >
+                                <attribute name="name" value="xbmcvfs" id="727" addr="0x7f658f83e9f0" />
+                                <typetab id="728" addr="0x7f658f83ce70" >
+                                    <attributelist id="729" addr="0x7f658f83ce70" >
+                                        <attribute name="Stat" value="Stat" id="730" addr="0x7f658f83e9f0" />
+                                        <attribute name="File" value="File" id="731" addr="0x7f658f83e9f0" />
                                     </attributelist >
-                                    <typetabsitem id="732" addr="0x7f20c70b29b0" >
-                                        <attributelist id="733" addr="0x7f20c70b29b0" >
+                                    <typetabsitem id="732" addr="0x7f658f83d9b0" >
+                                        <attributelist id="733" addr="0x7f658f83d9b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="734" addr="0x7f20c70b1f50" >
-                                        <attributelist id="735" addr="0x7f20c70b1f50" >
+                                    <typetabsitem id="734" addr="0x7f658f83cf50" >
+                                        <attributelist id="735" addr="0x7f658f83cf50" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
-                                <attribute name="parent" value="0x7f20c70b1a70" id="736" addr="0x7f20c70b1a70" />
-                                <attribute name="qname" value="XBMCAddon::xbmcvfs" id="737" addr="0x7f20c70b39f0" />
-                                <attribute name="symtab" value="0x7f20c70aa9d0" id="738" addr="0x7f20c70aa9d0" />
+                                <attribute name="parent" value="0x7f658f83ca70" id="736" addr="0x7f658f83ca70" />
+                                <attribute name="qname" value="XBMCAddon::xbmcvfs" id="737" addr="0x7f658f83e9f0" />
+                                <attribute name="symtab" value="0x7f658f8359d0" id="738" addr="0x7f658f8359d0" />
                             </attributelist >
-                            <typescopesitem id="739" addr="0x7f20c70aa990" >
-                                <attributelist id="740" addr="0x7f20c70aa990" >
+                            <typescopesitem id="739" addr="0x7f658f835990" >
+                                <attributelist id="740" addr="0x7f658f835990" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="741" addr="0x7f20c70b1e70" >
-                                <attributelist id="742" addr="0x7f20c70b1e70" >
-                                    <attribute name="Stat" value="Stat" id="743" addr="0x7f20c70b39f0" />
-                                    <attribute name="File" value="File" id="744" addr="0x7f20c70b39f0" />
+                            <typescopesitem id="741" addr="0x7f658f83ce70" >
+                                <attributelist id="742" addr="0x7f658f83ce70" >
+                                    <attribute name="Stat" value="Stat" id="743" addr="0x7f658f83e9f0" />
+                                    <attribute name="File" value="File" id="744" addr="0x7f658f83e9f0" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="745" addr="0x7f20c70b1a70" >
-                                <attributelist id="746" addr="0x7f20c70b1a70" >
-                                    <attribute name="name" value="XBMCAddon" id="747" addr="0x7f20c70b39f0" />
-                                    <typetab id="748" addr="0x7f20c70b1ab0" >
-                                        <attributelist id="749" addr="0x7f20c70b1ab0" >
-                                            <attribute name="String" value="std::string" id="750" addr="0x7f20c70b39f0" />
+                            <typescopesitem id="745" addr="0x7f658f83ca70" >
+                                <attributelist id="746" addr="0x7f658f83ca70" >
+                                    <attribute name="name" value="XBMCAddon" id="747" addr="0x7f658f83e9f0" />
+                                    <typetab id="748" addr="0x7f658f83cab0" >
+                                        <attributelist id="749" addr="0x7f658f83cab0" >
+                                            <attribute name="String" value="std::string" id="750" addr="0x7f658f83e9f0" />
                                         </attributelist >
-                                        <typetabsitem id="751" addr="0x7f20c70b1c90" >
-                                            <attributelist id="752" addr="0x7f20c70b1c90" >
+                                        <typetabsitem id="751" addr="0x7f658f83cc90" >
+                                            <attributelist id="752" addr="0x7f658f83cc90" >
                                             </attributelist >
                                         </typetabsitem >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f20c7093a30" id="753" addr="0x7f20c7093a30" />
-                                    <attribute name="qname" value="XBMCAddon" id="754" addr="0x7f20c70b39f0" />
-                                    <attribute name="symtab" value="0x7f20c70aa2d0" id="755" addr="0x7f20c70aa2d0" />
+                                    <attribute name="parent" value="0x7f658f81ea30" id="753" addr="0x7f658f81ea30" />
+                                    <attribute name="qname" value="XBMCAddon" id="754" addr="0x7f658f83e9f0" />
+                                    <attribute name="symtab" value="0x7f658f8352d0" id="755" addr="0x7f658f8352d0" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="756" addr="0x7f20c70b1e90" >
-                                <attributelist id="757" addr="0x7f20c70b1e90" >
+                            <typescopesitem id="756" addr="0x7f658f83ce90" >
+                                <attributelist id="757" addr="0x7f658f83ce90" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="758" addr="0x7f20c70aa9d0" >
-                                <attributelist id="759" addr="0x7f20c70aa9d0" >
-                                    <attribute name="name" value="xbmcvfs" id="760" addr="0x7f20c70b39f0" />
-                                    <attribute name="csymtab" value="0x7f20c70aaa10" id="761" addr="0x7f20c70aaa10" />
-                                    <attribute name="symtab" value="0x7f20c70aa9b0" id="762" addr="0x7f20c70aa9b0" />
+                            <typescopesitem id="758" addr="0x7f658f8359d0" >
+                                <attributelist id="759" addr="0x7f658f8359d0" >
+                                    <attribute name="name" value="xbmcvfs" id="760" addr="0x7f658f83e9f0" />
+                                    <attribute name="csymtab" value="0x7f658f835a10" id="761" addr="0x7f658f835a10" />
+                                    <attribute name="symtab" value="0x7f658f8359b0" id="762" addr="0x7f658f8359b0" />
                                 </attributelist >
                             </typescopesitem >
                         </typescope >
-                        <attribute name="symtab" value="0x7f20c70aa9d0" id="763" addr="0x7f20c70aa9d0" />
-                        <attribute name="sym_symtab" value="0x7f20c70aa2d0" id="764" addr="0x7f20c70aa2d0" />
+                        <attribute name="symtab" value="0x7f658f8359d0" id="763" addr="0x7f658f8359d0" />
+                        <attribute name="sym_symtab" value="0x7f658f8352d0" id="764" addr="0x7f658f8352d0" />
                     </attributelist >
 
-                    <class id="765" addr="0x7f20c70ad7d0" >
-                        <attributelist id="766" addr="0x7f20c70ad7d0" >
-                            <attribute name="name" value="XBMCAddon::xbmcvfs::Stat" id="767" addr="0x7f20c70b39f0" />
-                            <attribute name="sym_symtab" value="0x7f20c70aa9d0" id="768" addr="0x7f20c70aa9d0" />
-                            <attribute name="symtab" value="0x7f20c70ad910" id="769" addr="0x7f20c70ad910" />
-                            <attribute name="allows_typedef" value="1" id="770" addr="0x7f20c70b39f0" />
-                            <attribute name="typepass_visit" value="1" id="771" addr="0x7f20c70b39f0" />
-                            <attribute name="allocate_visit" value="1" id="772" addr="0x7f20c70b39f0" />
-                            <attribute name="kind" value="class" id="773" addr="0x7f20c70b39f0" />
-                            <attribute name="sym_name" value="Stat" id="774" addr="0x7f20c70b39f0" />
-                            <attribute name="allocate_has_constructor" value="1" id="775" addr="0x7f20c70b39f0" />
-                            <attribute name="allocate_public_constructor" value="1" id="776" addr="0x7f20c70b39f0" />
-                            <attribute name="allocate_copy_constructor" value="1" id="777" addr="0x7f20c70b39f0" />
-                            <attribute name="allocate_default_destructor" value="1" id="778" addr="0x7f20c70b39f0" />
-                            <attribute name="privatebaselist" value="0x7f20c70ad7b0" id="779" addr="0x7f20c70ad7b0" />
-                            <attribute name="protectedbaselist" value="0x7f20c70ad790" id="780" addr="0x7f20c70ad790" />
-                            <baselist id="781" addr="0x7f20c70ad770" >
-                                <base name="AddonClass" id="782" addr="0x7f20c70ad6f0" />
+                    <class id="765" addr="0x7f658f8387d0" >
+                        <attributelist id="766" addr="0x7f658f8387d0" >
+                            <attribute name="name" value="XBMCAddon::xbmcvfs::Stat" id="767" addr="0x7f658f83e9f0" />
+                            <attribute name="sym_symtab" value="0x7f658f8359d0" id="768" addr="0x7f658f8359d0" />
+                            <attribute name="symtab" value="0x7f658f838910" id="769" addr="0x7f658f838910" />
+                            <attribute name="allows_typedef" value="1" id="770" addr="0x7f658f83e9f0" />
+                            <attribute name="typepass_visit" value="1" id="771" addr="0x7f658f83e9f0" />
+                            <attribute name="allocate_visit" value="1" id="772" addr="0x7f658f83e9f0" />
+                            <attribute name="kind" value="class" id="773" addr="0x7f658f83e9f0" />
+                            <attribute name="sym_name" value="Stat" id="774" addr="0x7f658f83e9f0" />
+                            <attribute name="allocate_has_constructor" value="1" id="775" addr="0x7f658f83e9f0" />
+                            <attribute name="allocate_public_constructor" value="1" id="776" addr="0x7f658f83e9f0" />
+                            <attribute name="allocate_copy_constructor" value="1" id="777" addr="0x7f658f83e9f0" />
+                            <attribute name="allocate_default_destructor" value="1" id="778" addr="0x7f658f83e9f0" />
+                            <attribute name="privatebaselist" value="0x7f658f8387b0" id="779" addr="0x7f658f8387b0" />
+                            <attribute name="protectedbaselist" value="0x7f658f838790" id="780" addr="0x7f658f838790" />
+                            <baselist id="781" addr="0x7f658f838770" >
+                                <base name="AddonClass" id="782" addr="0x7f658f8386f0" />
                             </baselist >
-                            <attribute name="module" value="xbmcvfs" id="783" addr="0x7f20c70aa090" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="784" addr="0x7f20c70b39f0" />
-                            <typescope id="785" addr="0x7f20c70b2a70" >
-                                <attributelist id="786" addr="0x7f20c70b2a70" >
-                                    <attribute name="name" value="Stat" id="787" addr="0x7f20c70b39f0" />
-                                    <typetab id="788" addr="0x7f20c70b2a90" >
-                                        <attributelist id="789" addr="0x7f20c70b2a90" >
+                            <attribute name="module" value="xbmcvfs" id="783" addr="0x7f658f835090" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="784" addr="0x7f658f83e9f0" />
+                            <typescope id="785" addr="0x7f658f83da70" >
+                                <attributelist id="786" addr="0x7f658f83da70" >
+                                    <attribute name="name" value="Stat" id="787" addr="0x7f658f83e9f0" />
+                                    <typetab id="788" addr="0x7f658f83da90" >
+                                        <attributelist id="789" addr="0x7f658f83da90" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f20c70b1e50" id="790" addr="0x7f20c70b1e50" />
-                                    <attribute name="qname" value="XBMCAddon::xbmcvfs::Stat" id="791" addr="0x7f20c70b39f0" />
-                                    <attribute name="symtab" value="0x7f20c70ad910" id="792" addr="0x7f20c70ad910" />
+                                    <attribute name="parent" value="0x7f658f83ce50" id="790" addr="0x7f658f83ce50" />
+                                    <attribute name="qname" value="XBMCAddon::xbmcvfs::Stat" id="791" addr="0x7f658f83e9f0" />
+                                    <attribute name="symtab" value="0x7f658f838910" id="792" addr="0x7f658f838910" />
                                 </attributelist >
-                                <typescopesitem id="793" addr="0x7f20c70b2a10" >
-                                    <attributelist id="794" addr="0x7f20c70b2a10" >
+                                <typescopesitem id="793" addr="0x7f658f83da10" >
+                                    <attributelist id="794" addr="0x7f658f83da10" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="795" addr="0x7f20c70b2a90" >
-                                    <attributelist id="796" addr="0x7f20c70b2a90" >
+                                <typescopesitem id="795" addr="0x7f658f83da90" >
+                                    <attributelist id="796" addr="0x7f658f83da90" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="797" addr="0x7f20c70b1e50" >
-                                    <attributelist id="798" addr="0x7f20c70b1e50" >
-                                        <attribute name="name" value="xbmcvfs" id="799" addr="0x7f20c70b39f0" />
-                                        <typetab id="800" addr="0x7f20c70b1e70" >
-                                            <attributelist id="801" addr="0x7f20c70b1e70" >
-                                                <attribute name="Stat" value="Stat" id="802" addr="0x7f20c70b39f0" />
-                                                <attribute name="File" value="File" id="803" addr="0x7f20c70b39f0" />
+                                <typescopesitem id="797" addr="0x7f658f83ce50" >
+                                    <attributelist id="798" addr="0x7f658f83ce50" >
+                                        <attribute name="name" value="xbmcvfs" id="799" addr="0x7f658f83e9f0" />
+                                        <typetab id="800" addr="0x7f658f83ce70" >
+                                            <attributelist id="801" addr="0x7f658f83ce70" >
+                                                <attribute name="Stat" value="Stat" id="802" addr="0x7f658f83e9f0" />
+                                                <attribute name="File" value="File" id="803" addr="0x7f658f83e9f0" />
                                             </attributelist >
-                                            <typetabsitem id="804" addr="0x7f20c70b29b0" >
-                                                <attributelist id="805" addr="0x7f20c70b29b0" >
+                                            <typetabsitem id="804" addr="0x7f658f83d9b0" >
+                                                <attributelist id="805" addr="0x7f658f83d9b0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="806" addr="0x7f20c70b1f50" >
-                                                <attributelist id="807" addr="0x7f20c70b1f50" >
+                                            <typetabsitem id="806" addr="0x7f658f83cf50" >
+                                                <attributelist id="807" addr="0x7f658f83cf50" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7f20c70b1a70" id="808" addr="0x7f20c70b1a70" />
-                                        <attribute name="qname" value="XBMCAddon::xbmcvfs" id="809" addr="0x7f20c70b39f0" />
-                                        <attribute name="symtab" value="0x7f20c70aa9d0" id="810" addr="0x7f20c70aa9d0" />
+                                        <attribute name="parent" value="0x7f658f83ca70" id="808" addr="0x7f658f83ca70" />
+                                        <attribute name="qname" value="XBMCAddon::xbmcvfs" id="809" addr="0x7f658f83e9f0" />
+                                        <attribute name="symtab" value="0x7f658f8359d0" id="810" addr="0x7f658f8359d0" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="811" addr="0x7f20c70b2ab0" >
-                                    <attributelist id="812" addr="0x7f20c70b2ab0" >
+                                <typescopesitem id="811" addr="0x7f658f83dab0" >
+                                    <attributelist id="812" addr="0x7f658f83dab0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="813" addr="0x7f20c70ad910" >
-                                    <attributelist id="814" addr="0x7f20c70ad910" >
-                                        <attribute name="name" value="Stat" id="815" addr="0x7f20c70b39f0" />
-                                        <attribute name="csymtab" value="0x7f20c70ad930" id="816" addr="0x7f20c70ad930" />
-                                        <attribute name="symtab" value="0x7f20c70ad8d0" id="817" addr="0x7f20c70ad8d0" />
+                                <typescopesitem id="813" addr="0x7f658f838910" >
+                                    <attributelist id="814" addr="0x7f658f838910" >
+                                        <attribute name="name" value="Stat" id="815" addr="0x7f658f83e9f0" />
+                                        <attribute name="csymtab" value="0x7f658f838930" id="816" addr="0x7f658f838930" />
+                                        <attribute name="symtab" value="0x7f658f8388d0" id="817" addr="0x7f658f8388d0" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <cdecl id="818" addr="0x7f20c70ada30" >
-                            <attributelist id="819" addr="0x7f20c70ada30" >
-                                <attribute name="ismember" value="1" id="820" addr="0x7f20c70b39f0" />
-                                <attribute name="name" value="st" id="821" addr="0x7f20c70b39f0" />
-                                <attribute name="decl" value="" id="822" addr="0x7f20c70b39f0" />
-                                <attribute name="access" value="private" id="823" addr="0x7f20c70b39f0" />
-                                <attribute name="kind" value="variable" id="824" addr="0x7f20c70b39f0" />
-                                <attribute name="type" value="__stat64" id="825" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_symtab" value="0x7f20c70ad910" id="826" addr="0x7f20c70ad910" />
+                        <cdecl id="818" addr="0x7f658f838a30" >
+                            <attributelist id="819" addr="0x7f658f838a30" >
+                                <attribute name="ismember" value="1" id="820" addr="0x7f658f83e9f0" />
+                                <attribute name="name" value="st" id="821" addr="0x7f658f83e9f0" />
+                                <attribute name="decl" value="" id="822" addr="0x7f658f83e9f0" />
+                                <attribute name="access" value="private" id="823" addr="0x7f658f83e9f0" />
+                                <attribute name="kind" value="variable" id="824" addr="0x7f658f83e9f0" />
+                                <attribute name="type" value="__stat64" id="825" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_symtab" value="0x7f658f838910" id="826" addr="0x7f658f838910" />
                             </attributelist >
                          
                         </cdecl >
-                        <access id="827" addr="0x7f20c70adb10" >
-                            <attributelist id="828" addr="0x7f20c70adb10" >
-                                <attribute name="kind" value="public" id="829" addr="0x7f20c70b39f0" />
+                        <access id="827" addr="0x7f658f838b10" >
+                            <attributelist id="828" addr="0x7f658f838b10" >
+                                <attribute name="kind" value="public" id="829" addr="0x7f658f83e9f0" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="830" addr="0x7f20c70add50" >
-                            <attributelist id="831" addr="0x7f20c70add50" >
-                                <attribute name="name" value="Stat" id="832" addr="0x7f20c70b39f0" />
-                                <attribute name="ismember" value="1" id="833" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_symtab" value="0x7f20c70ad910" id="834" addr="0x7f20c70ad910" />
-                                <attribute name="sym_name" value="Stat" id="835" addr="0x7f20c70b39f0" />
-                                <attribute name="decl" value="f(r.q(const).String)." id="836" addr="0x7f20c70b39f0" />
-                                <attribute name="access" value="public" id="837" addr="0x7f20c70b39f0" />
-                                <parmlist id="838" addr="0x7f20c70adcb0" >
+                        <constructor id="830" addr="0x7f658f838d50" >
+                            <attributelist id="831" addr="0x7f658f838d50" >
+                                <attribute name="name" value="Stat" id="832" addr="0x7f658f83e9f0" />
+                                <attribute name="ismember" value="1" id="833" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_symtab" value="0x7f658f838910" id="834" addr="0x7f658f838910" />
+                                <attribute name="sym_name" value="Stat" id="835" addr="0x7f658f83e9f0" />
+                                <attribute name="decl" value="f(r.q(const).String)." id="836" addr="0x7f658f83e9f0" />
+                                <attribute name="access" value="public" id="837" addr="0x7f658f83e9f0" />
+                                <parmlist id="838" addr="0x7f658f838cb0" >
                                     <parm id="839">
-                                        <attributelist id="840" addr="0x7f20c70adcb0" >
-                                            <attribute name="name" value="path" id="841" addr="0x7f20c70b39f0" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="842" addr="0x7f20c70b39f0" />
+                                        <attributelist id="840" addr="0x7f658f838cb0" >
+                                            <attribute name="name" value="path" id="841" addr="0x7f658f83e9f0" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="842" addr="0x7f658f83e9f0" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="code" value="{&#10;        DelayedCallGuard dg;&#10;        XFILE::CFile::Stat(path, &amp;st);&#10;      }" id="843" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="844" addr="0x7f20c70b39f0" />
-                                <attribute name="feature_new" value="1" id="845" addr="0x7f20c70b39f0" />
+                                <attribute name="code" value="{&#10;        DelayedCallGuard dg;&#10;        XFILE::CFile::Stat(path, &amp;st);&#10;      }" id="843" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="844" addr="0x7f658f83e9f0" />
+                                <attribute name="feature_new" value="1" id="845" addr="0x7f658f83e9f0" />
                             </attributelist >
                          
                         </constructor >
-                        <cdecl id="846" addr="0x7f20c70adf70" >
-                            <attributelist id="847" addr="0x7f20c70adf70" >
-                                <attribute name="name" value="st_mode" id="848" addr="0x7f20c70b39f0" />
-                                <attribute name="ismember" value="1" id="849" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_symtab" value="0x7f20c70ad910" id="850" addr="0x7f20c70ad910" />
-                                <attribute name="kind" value="function" id="851" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_name" value="st_mode" id="852" addr="0x7f20c70b39f0" />
-                                <attribute name="decl" value="f()." id="853" addr="0x7f20c70b39f0" />
-                                <attribute name="access" value="public" id="854" addr="0x7f20c70b39f0" />
-                                <attribute name="type" value="long long" id="855" addr="0x7f20c70b39f0" />
-                                <attribute name="code" value="{ return st.st_mode; }" id="856" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="857" addr="0x7f20c70b39f0" />
+                        <cdecl id="846" addr="0x7f658f838f70" >
+                            <attributelist id="847" addr="0x7f658f838f70" >
+                                <attribute name="name" value="st_mode" id="848" addr="0x7f658f83e9f0" />
+                                <attribute name="ismember" value="1" id="849" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_symtab" value="0x7f658f838910" id="850" addr="0x7f658f838910" />
+                                <attribute name="kind" value="function" id="851" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_name" value="st_mode" id="852" addr="0x7f658f83e9f0" />
+                                <attribute name="decl" value="f()." id="853" addr="0x7f658f83e9f0" />
+                                <attribute name="access" value="public" id="854" addr="0x7f658f83e9f0" />
+                                <attribute name="type" value="long long" id="855" addr="0x7f658f83e9f0" />
+                                <attribute name="code" value="{ return st.st_mode; }" id="856" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="857" addr="0x7f658f83e9f0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="858" addr="0x7f20c70ae1d0" >
-                            <attributelist id="859" addr="0x7f20c70ae1d0" >
-                                <attribute name="name" value="st_ino" id="860" addr="0x7f20c70b39f0" />
-                                <attribute name="ismember" value="1" id="861" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_symtab" value="0x7f20c70ad910" id="862" addr="0x7f20c70ad910" />
-                                <attribute name="kind" value="function" id="863" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_name" value="st_ino" id="864" addr="0x7f20c70b39f0" />
-                                <attribute name="decl" value="f()." id="865" addr="0x7f20c70b39f0" />
-                                <attribute name="access" value="public" id="866" addr="0x7f20c70b39f0" />
-                                <attribute name="type" value="long long" id="867" addr="0x7f20c70b39f0" />
-                                <attribute name="code" value="{ return st.st_ino; }" id="868" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="869" addr="0x7f20c70b39f0" />
+                        <cdecl id="858" addr="0x7f658f8391d0" >
+                            <attributelist id="859" addr="0x7f658f8391d0" >
+                                <attribute name="name" value="st_ino" id="860" addr="0x7f658f83e9f0" />
+                                <attribute name="ismember" value="1" id="861" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_symtab" value="0x7f658f838910" id="862" addr="0x7f658f838910" />
+                                <attribute name="kind" value="function" id="863" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_name" value="st_ino" id="864" addr="0x7f658f83e9f0" />
+                                <attribute name="decl" value="f()." id="865" addr="0x7f658f83e9f0" />
+                                <attribute name="access" value="public" id="866" addr="0x7f658f83e9f0" />
+                                <attribute name="type" value="long long" id="867" addr="0x7f658f83e9f0" />
+                                <attribute name="code" value="{ return st.st_ino; }" id="868" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="869" addr="0x7f658f83e9f0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="870" addr="0x7f20c70ae430" >
-                            <attributelist id="871" addr="0x7f20c70ae430" >
-                                <attribute name="name" value="st_dev" id="872" addr="0x7f20c70b39f0" />
-                                <attribute name="ismember" value="1" id="873" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_symtab" value="0x7f20c70ad910" id="874" addr="0x7f20c70ad910" />
-                                <attribute name="kind" value="function" id="875" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_name" value="st_dev" id="876" addr="0x7f20c70b39f0" />
-                                <attribute name="decl" value="f()." id="877" addr="0x7f20c70b39f0" />
-                                <attribute name="access" value="public" id="878" addr="0x7f20c70b39f0" />
-                                <attribute name="type" value="long long" id="879" addr="0x7f20c70b39f0" />
-                                <attribute name="code" value="{ return st.st_dev; }" id="880" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="881" addr="0x7f20c70b39f0" />
+                        <cdecl id="870" addr="0x7f658f839430" >
+                            <attributelist id="871" addr="0x7f658f839430" >
+                                <attribute name="name" value="st_dev" id="872" addr="0x7f658f83e9f0" />
+                                <attribute name="ismember" value="1" id="873" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_symtab" value="0x7f658f838910" id="874" addr="0x7f658f838910" />
+                                <attribute name="kind" value="function" id="875" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_name" value="st_dev" id="876" addr="0x7f658f83e9f0" />
+                                <attribute name="decl" value="f()." id="877" addr="0x7f658f83e9f0" />
+                                <attribute name="access" value="public" id="878" addr="0x7f658f83e9f0" />
+                                <attribute name="type" value="long long" id="879" addr="0x7f658f83e9f0" />
+                                <attribute name="code" value="{ return st.st_dev; }" id="880" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="881" addr="0x7f658f83e9f0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="882" addr="0x7f20c70ae690" >
-                            <attributelist id="883" addr="0x7f20c70ae690" >
-                                <attribute name="name" value="st_nlink" id="884" addr="0x7f20c70b39f0" />
-                                <attribute name="ismember" value="1" id="885" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_symtab" value="0x7f20c70ad910" id="886" addr="0x7f20c70ad910" />
-                                <attribute name="kind" value="function" id="887" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_name" value="st_nlink" id="888" addr="0x7f20c70b39f0" />
-                                <attribute name="decl" value="f()." id="889" addr="0x7f20c70b39f0" />
-                                <attribute name="access" value="public" id="890" addr="0x7f20c70b39f0" />
-                                <attribute name="type" value="long long" id="891" addr="0x7f20c70b39f0" />
-                                <attribute name="code" value="{ return st.st_nlink; }" id="892" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="893" addr="0x7f20c70b39f0" />
+                        <cdecl id="882" addr="0x7f658f839690" >
+                            <attributelist id="883" addr="0x7f658f839690" >
+                                <attribute name="name" value="st_nlink" id="884" addr="0x7f658f83e9f0" />
+                                <attribute name="ismember" value="1" id="885" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_symtab" value="0x7f658f838910" id="886" addr="0x7f658f838910" />
+                                <attribute name="kind" value="function" id="887" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_name" value="st_nlink" id="888" addr="0x7f658f83e9f0" />
+                                <attribute name="decl" value="f()." id="889" addr="0x7f658f83e9f0" />
+                                <attribute name="access" value="public" id="890" addr="0x7f658f83e9f0" />
+                                <attribute name="type" value="long long" id="891" addr="0x7f658f83e9f0" />
+                                <attribute name="code" value="{ return st.st_nlink; }" id="892" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="893" addr="0x7f658f83e9f0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="894" addr="0x7f20c70ae8f0" >
-                            <attributelist id="895" addr="0x7f20c70ae8f0" >
-                                <attribute name="name" value="st_uid" id="896" addr="0x7f20c70b39f0" />
-                                <attribute name="ismember" value="1" id="897" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_symtab" value="0x7f20c70ad910" id="898" addr="0x7f20c70ad910" />
-                                <attribute name="kind" value="function" id="899" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_name" value="st_uid" id="900" addr="0x7f20c70b39f0" />
-                                <attribute name="decl" value="f()." id="901" addr="0x7f20c70b39f0" />
-                                <attribute name="access" value="public" id="902" addr="0x7f20c70b39f0" />
-                                <attribute name="type" value="long long" id="903" addr="0x7f20c70b39f0" />
-                                <attribute name="code" value="{ return st.st_uid; }" id="904" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="905" addr="0x7f20c70b39f0" />
+                        <cdecl id="894" addr="0x7f658f8398f0" >
+                            <attributelist id="895" addr="0x7f658f8398f0" >
+                                <attribute name="name" value="st_uid" id="896" addr="0x7f658f83e9f0" />
+                                <attribute name="ismember" value="1" id="897" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_symtab" value="0x7f658f838910" id="898" addr="0x7f658f838910" />
+                                <attribute name="kind" value="function" id="899" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_name" value="st_uid" id="900" addr="0x7f658f83e9f0" />
+                                <attribute name="decl" value="f()." id="901" addr="0x7f658f83e9f0" />
+                                <attribute name="access" value="public" id="902" addr="0x7f658f83e9f0" />
+                                <attribute name="type" value="long long" id="903" addr="0x7f658f83e9f0" />
+                                <attribute name="code" value="{ return st.st_uid; }" id="904" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="905" addr="0x7f658f83e9f0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="906" addr="0x7f20c70aeb50" >
-                            <attributelist id="907" addr="0x7f20c70aeb50" >
-                                <attribute name="name" value="st_gid" id="908" addr="0x7f20c70b39f0" />
-                                <attribute name="ismember" value="1" id="909" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_symtab" value="0x7f20c70ad910" id="910" addr="0x7f20c70ad910" />
-                                <attribute name="kind" value="function" id="911" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_name" value="st_gid" id="912" addr="0x7f20c70b39f0" />
-                                <attribute name="decl" value="f()." id="913" addr="0x7f20c70b39f0" />
-                                <attribute name="access" value="public" id="914" addr="0x7f20c70b39f0" />
-                                <attribute name="type" value="long long" id="915" addr="0x7f20c70b39f0" />
-                                <attribute name="code" value="{ return st.st_gid; }" id="916" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="917" addr="0x7f20c70b39f0" />
+                        <cdecl id="906" addr="0x7f658f839b50" >
+                            <attributelist id="907" addr="0x7f658f839b50" >
+                                <attribute name="name" value="st_gid" id="908" addr="0x7f658f83e9f0" />
+                                <attribute name="ismember" value="1" id="909" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_symtab" value="0x7f658f838910" id="910" addr="0x7f658f838910" />
+                                <attribute name="kind" value="function" id="911" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_name" value="st_gid" id="912" addr="0x7f658f83e9f0" />
+                                <attribute name="decl" value="f()." id="913" addr="0x7f658f83e9f0" />
+                                <attribute name="access" value="public" id="914" addr="0x7f658f83e9f0" />
+                                <attribute name="type" value="long long" id="915" addr="0x7f658f83e9f0" />
+                                <attribute name="code" value="{ return st.st_gid; }" id="916" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="917" addr="0x7f658f83e9f0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="918" addr="0x7f20c70aedb0" >
-                            <attributelist id="919" addr="0x7f20c70aedb0" >
-                                <attribute name="name" value="st_size" id="920" addr="0x7f20c70b39f0" />
-                                <attribute name="ismember" value="1" id="921" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_symtab" value="0x7f20c70ad910" id="922" addr="0x7f20c70ad910" />
-                                <attribute name="kind" value="function" id="923" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_name" value="st_size" id="924" addr="0x7f20c70b39f0" />
-                                <attribute name="decl" value="f()." id="925" addr="0x7f20c70b39f0" />
-                                <attribute name="access" value="public" id="926" addr="0x7f20c70b39f0" />
-                                <attribute name="type" value="long long" id="927" addr="0x7f20c70b39f0" />
-                                <attribute name="code" value="{ return st.st_size; }" id="928" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="929" addr="0x7f20c70b39f0" />
+                        <cdecl id="918" addr="0x7f658f839db0" >
+                            <attributelist id="919" addr="0x7f658f839db0" >
+                                <attribute name="name" value="st_size" id="920" addr="0x7f658f83e9f0" />
+                                <attribute name="ismember" value="1" id="921" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_symtab" value="0x7f658f838910" id="922" addr="0x7f658f838910" />
+                                <attribute name="kind" value="function" id="923" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_name" value="st_size" id="924" addr="0x7f658f83e9f0" />
+                                <attribute name="decl" value="f()." id="925" addr="0x7f658f83e9f0" />
+                                <attribute name="access" value="public" id="926" addr="0x7f658f83e9f0" />
+                                <attribute name="type" value="long long" id="927" addr="0x7f658f83e9f0" />
+                                <attribute name="code" value="{ return st.st_size; }" id="928" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="929" addr="0x7f658f83e9f0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="930" addr="0x7f20c70af010" >
-                            <attributelist id="931" addr="0x7f20c70af010" >
-                                <attribute name="name" value="atime" id="932" addr="0x7f20c70b39f0" />
-                                <attribute name="ismember" value="1" id="933" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_symtab" value="0x7f20c70ad910" id="934" addr="0x7f20c70ad910" />
-                                <attribute name="kind" value="function" id="935" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_name" value="st_atime" id="936" addr="0x7f20c70b39f0" />
-                                <attribute name="decl" value="f()." id="937" addr="0x7f20c70b39f0" />
-                                <attribute name="access" value="public" id="938" addr="0x7f20c70b39f0" />
-                                <attribute name="type" value="long long" id="939" addr="0x7f20c70b39f0" />
-                                <attribute name="code" value="{ return st.st_atime; }" id="940" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="941" addr="0x7f20c70b39f0" />
+                        <cdecl id="930" addr="0x7f658f83a010" >
+                            <attributelist id="931" addr="0x7f658f83a010" >
+                                <attribute name="name" value="atime" id="932" addr="0x7f658f83e9f0" />
+                                <attribute name="ismember" value="1" id="933" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_symtab" value="0x7f658f838910" id="934" addr="0x7f658f838910" />
+                                <attribute name="kind" value="function" id="935" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_name" value="st_atime" id="936" addr="0x7f658f83e9f0" />
+                                <attribute name="decl" value="f()." id="937" addr="0x7f658f83e9f0" />
+                                <attribute name="access" value="public" id="938" addr="0x7f658f83e9f0" />
+                                <attribute name="type" value="long long" id="939" addr="0x7f658f83e9f0" />
+                                <attribute name="code" value="{ return st.st_atime; }" id="940" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="941" addr="0x7f658f83e9f0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="942" addr="0x7f20c70af270" >
-                            <attributelist id="943" addr="0x7f20c70af270" >
-                                <attribute name="name" value="mtime" id="944" addr="0x7f20c70b39f0" />
-                                <attribute name="ismember" value="1" id="945" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_symtab" value="0x7f20c70ad910" id="946" addr="0x7f20c70ad910" />
-                                <attribute name="kind" value="function" id="947" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_name" value="st_mtime" id="948" addr="0x7f20c70b39f0" />
-                                <attribute name="decl" value="f()." id="949" addr="0x7f20c70b39f0" />
-                                <attribute name="access" value="public" id="950" addr="0x7f20c70b39f0" />
-                                <attribute name="type" value="long long" id="951" addr="0x7f20c70b39f0" />
-                                <attribute name="code" value="{ return st.st_mtime; }" id="952" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="953" addr="0x7f20c70b39f0" />
+                        <cdecl id="942" addr="0x7f658f83a270" >
+                            <attributelist id="943" addr="0x7f658f83a270" >
+                                <attribute name="name" value="mtime" id="944" addr="0x7f658f83e9f0" />
+                                <attribute name="ismember" value="1" id="945" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_symtab" value="0x7f658f838910" id="946" addr="0x7f658f838910" />
+                                <attribute name="kind" value="function" id="947" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_name" value="st_mtime" id="948" addr="0x7f658f83e9f0" />
+                                <attribute name="decl" value="f()." id="949" addr="0x7f658f83e9f0" />
+                                <attribute name="access" value="public" id="950" addr="0x7f658f83e9f0" />
+                                <attribute name="type" value="long long" id="951" addr="0x7f658f83e9f0" />
+                                <attribute name="code" value="{ return st.st_mtime; }" id="952" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="953" addr="0x7f658f83e9f0" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="954" addr="0x7f20c70af4d0" >
-                            <attributelist id="955" addr="0x7f20c70af4d0" >
-                                <attribute name="ismember" value="1" id="956" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_name" value="st_ctime" id="957" addr="0x7f20c70b39f0" />
-                                <attribute name="name" value="ctime" id="958" addr="0x7f20c70b39f0" />
-                                <attribute name="decl" value="f()." id="959" addr="0x7f20c70b39f0" />
-                                <attribute name="access" value="public" id="960" addr="0x7f20c70b39f0" />
-                                <attribute name="code" value="{ return st.st_ctime; }" id="961" addr="0x7f20c70b39f0" />
-                                <attribute name="kind" value="function" id="962" addr="0x7f20c70b39f0" />
-                                <attribute name="type" value="long long" id="963" addr="0x7f20c70b39f0" />
-                                <attribute name="sym_symtab" value="0x7f20c70ad910" id="964" addr="0x7f20c70ad910" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="965" addr="0x7f20c70b39f0" />
+                        <cdecl id="954" addr="0x7f658f83a4d0" >
+                            <attributelist id="955" addr="0x7f658f83a4d0" >
+                                <attribute name="ismember" value="1" id="956" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_name" value="st_ctime" id="957" addr="0x7f658f83e9f0" />
+                                <attribute name="name" value="ctime" id="958" addr="0x7f658f83e9f0" />
+                                <attribute name="decl" value="f()." id="959" addr="0x7f658f83e9f0" />
+                                <attribute name="access" value="public" id="960" addr="0x7f658f83e9f0" />
+                                <attribute name="code" value="{ return st.st_ctime; }" id="961" addr="0x7f658f83e9f0" />
+                                <attribute name="kind" value="function" id="962" addr="0x7f658f83e9f0" />
+                                <attribute name="type" value="long long" id="963" addr="0x7f658f83e9f0" />
+                                <attribute name="sym_symtab" value="0x7f658f838910" id="964" addr="0x7f658f838910" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="965" addr="0x7f658f83e9f0" />
                             </attributelist >
                          
                         </cdecl >
@@ -1463,337 +1463,337 @@
                 </namespace >
             </namespace >
         </include >
-        <include id="966" addr="0x7f20c70af890" >
-            <attributelist id="967" addr="0x7f20c70af890" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/ModuleXbmcvfs.h" id="968" addr="0x7f20c70b39f0" />
+        <include id="966" addr="0x7f658f83a890" >
+            <attributelist id="967" addr="0x7f658f83a890" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/ModuleXbmcvfs.h" id="968" addr="0x7f658f83e9f0" />
             </attributelist >
 
-            <namespace id="969" addr="0x7f20c70af930" >
-                <attributelist id="970" addr="0x7f20c70af930" >
-                    <attribute name="sym_name" value="XBMCAddon" id="971" addr="0x7f20c70b39f0" />
-                    <attribute name="name" value="XBMCAddon" id="972" addr="0x7f20c70b39f0" />
-                    <attribute name="sym_previousSibling" value="0x7f20c70ad5d0" id="973" addr="0x7f20c70ad5d0" />
-                    <typescope id="974" addr="0x7f20c70b1a70" >
-                        <attributelist id="975" addr="0x7f20c70b1a70" >
-                            <attribute name="name" value="XBMCAddon" id="976" addr="0x7f20c70b39f0" />
-                            <typetab id="977" addr="0x7f20c70b1ab0" >
-                                <attributelist id="978" addr="0x7f20c70b1ab0" >
-                                    <attribute name="String" value="std::string" id="979" addr="0x7f20c70b39f0" />
+            <namespace id="969" addr="0x7f658f83a930" >
+                <attributelist id="970" addr="0x7f658f83a930" >
+                    <attribute name="sym_name" value="XBMCAddon" id="971" addr="0x7f658f83e9f0" />
+                    <attribute name="name" value="XBMCAddon" id="972" addr="0x7f658f83e9f0" />
+                    <attribute name="sym_previousSibling" value="0x7f658f8385d0" id="973" addr="0x7f658f8385d0" />
+                    <typescope id="974" addr="0x7f658f83ca70" >
+                        <attributelist id="975" addr="0x7f658f83ca70" >
+                            <attribute name="name" value="XBMCAddon" id="976" addr="0x7f658f83e9f0" />
+                            <typetab id="977" addr="0x7f658f83cab0" >
+                                <attributelist id="978" addr="0x7f658f83cab0" >
+                                    <attribute name="String" value="std::string" id="979" addr="0x7f658f83e9f0" />
                                 </attributelist >
-                                <typetabsitem id="980" addr="0x7f20c70b1c90" >
-                                    <attributelist id="981" addr="0x7f20c70b1c90" >
+                                <typetabsitem id="980" addr="0x7f658f83cc90" >
+                                    <attributelist id="981" addr="0x7f658f83cc90" >
                                     </attributelist >
                                 </typetabsitem >
                             </typetab >
-                            <attribute name="parent" value="0x7f20c7093a30" id="982" addr="0x7f20c7093a30" />
-                            <attribute name="qname" value="XBMCAddon" id="983" addr="0x7f20c70b39f0" />
-                            <attribute name="symtab" value="0x7f20c70aa2d0" id="984" addr="0x7f20c70aa2d0" />
+                            <attribute name="parent" value="0x7f658f81ea30" id="982" addr="0x7f658f81ea30" />
+                            <attribute name="qname" value="XBMCAddon" id="983" addr="0x7f658f83e9f0" />
+                            <attribute name="symtab" value="0x7f658f8352d0" id="984" addr="0x7f658f8352d0" />
                         </attributelist >
-                        <typescopesitem id="985" addr="0x7f20c70aa290" >
-                            <attributelist id="986" addr="0x7f20c70aa290" >
+                        <typescopesitem id="985" addr="0x7f658f835290" >
+                            <attributelist id="986" addr="0x7f658f835290" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="987" addr="0x7f20c70b1ab0" >
-                            <attributelist id="988" addr="0x7f20c70b1ab0" >
-                                <attribute name="String" value="std::string" id="989" addr="0x7f20c70b39f0" />
+                        <typescopesitem id="987" addr="0x7f658f83cab0" >
+                            <attributelist id="988" addr="0x7f658f83cab0" >
+                                <attribute name="String" value="std::string" id="989" addr="0x7f658f83e9f0" />
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="990" addr="0x7f20c7093a30" >
-                            <attributelist id="991" addr="0x7f20c7093a30" >
-                                <attribute name="name" value="" id="992" addr="0x7f20c70b39f0" />
-                                <typetab id="993" addr="0x7f20c7093a90" >
-                                    <attributelist id="994" addr="0x7f20c7093a90" >
+                        <typescopesitem id="990" addr="0x7f658f81ea30" >
+                            <attributelist id="991" addr="0x7f658f81ea30" >
+                                <attribute name="name" value="" id="992" addr="0x7f658f83e9f0" />
+                                <typetab id="993" addr="0x7f658f81ea90" >
+                                    <attributelist id="994" addr="0x7f658f81ea90" >
                                     </attributelist >
                                 </typetab >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="995" addr="0x7f20c70b1bb0" >
-                            <attributelist id="996" addr="0x7f20c70b1bb0" >
+                        <typescopesitem id="995" addr="0x7f658f83cbb0" >
+                            <attributelist id="996" addr="0x7f658f83cbb0" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="997" addr="0x7f20c70aa2d0" >
-                            <attributelist id="998" addr="0x7f20c70aa2d0" >
-                                <attribute name="name" value="XBMCAddon" id="999" addr="0x7f20c70b39f0" />
-                                <attribute name="csymtab" value="0x7f20c70aa310" id="1000" addr="0x7f20c70aa310" />
-                                <attribute name="symtab" value="0x7f20c70aa2b0" id="1001" addr="0x7f20c70aa2b0" />
+                        <typescopesitem id="997" addr="0x7f658f8352d0" >
+                            <attributelist id="998" addr="0x7f658f8352d0" >
+                                <attribute name="name" value="XBMCAddon" id="999" addr="0x7f658f83e9f0" />
+                                <attribute name="csymtab" value="0x7f658f835310" id="1000" addr="0x7f658f835310" />
+                                <attribute name="symtab" value="0x7f658f8352b0" id="1001" addr="0x7f658f8352b0" />
                             </attributelist >
                         </typescopesitem >
                     </typescope >
-                    <attribute name="symtab" value="0x7f20c70aa2d0" id="1002" addr="0x7f20c70aa2d0" />
-                    <attribute name="sym_symtab" value="0x7f20c7093950" id="1003" addr="0x7f20c7093950" />
+                    <attribute name="symtab" value="0x7f658f8352d0" id="1002" addr="0x7f658f8352d0" />
+                    <attribute name="sym_symtab" value="0x7f658f81e950" id="1003" addr="0x7f658f81e950" />
                 </attributelist >
 
-                <namespace id="1004" addr="0x7f20c70af9b0" >
-                    <attributelist id="1005" addr="0x7f20c70af9b0" >
-                        <attribute name="sym_name" value="xbmcvfs" id="1006" addr="0x7f20c70b39f0" />
-                        <attribute name="name" value="xbmcvfs" id="1007" addr="0x7f20c70b39f0" />
-                        <attribute name="sym_previousSibling" value="0x7f20c70ad650" id="1008" addr="0x7f20c70ad650" />
-                        <typescope id="1009" addr="0x7f20c70b1e50" >
-                            <attributelist id="1010" addr="0x7f20c70b1e50" >
-                                <attribute name="name" value="xbmcvfs" id="1011" addr="0x7f20c70b39f0" />
-                                <typetab id="1012" addr="0x7f20c70b1e70" >
-                                    <attributelist id="1013" addr="0x7f20c70b1e70" >
-                                        <attribute name="Stat" value="Stat" id="1014" addr="0x7f20c70b39f0" />
-                                        <attribute name="File" value="File" id="1015" addr="0x7f20c70b39f0" />
+                <namespace id="1004" addr="0x7f658f83a9b0" >
+                    <attributelist id="1005" addr="0x7f658f83a9b0" >
+                        <attribute name="sym_name" value="xbmcvfs" id="1006" addr="0x7f658f83e9f0" />
+                        <attribute name="name" value="xbmcvfs" id="1007" addr="0x7f658f83e9f0" />
+                        <attribute name="sym_previousSibling" value="0x7f658f838650" id="1008" addr="0x7f658f838650" />
+                        <typescope id="1009" addr="0x7f658f83ce50" >
+                            <attributelist id="1010" addr="0x7f658f83ce50" >
+                                <attribute name="name" value="xbmcvfs" id="1011" addr="0x7f658f83e9f0" />
+                                <typetab id="1012" addr="0x7f658f83ce70" >
+                                    <attributelist id="1013" addr="0x7f658f83ce70" >
+                                        <attribute name="Stat" value="Stat" id="1014" addr="0x7f658f83e9f0" />
+                                        <attribute name="File" value="File" id="1015" addr="0x7f658f83e9f0" />
                                     </attributelist >
-                                    <typetabsitem id="1016" addr="0x7f20c70b29b0" >
-                                        <attributelist id="1017" addr="0x7f20c70b29b0" >
+                                    <typetabsitem id="1016" addr="0x7f658f83d9b0" >
+                                        <attributelist id="1017" addr="0x7f658f83d9b0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1018" addr="0x7f20c70b1f50" >
-                                        <attributelist id="1019" addr="0x7f20c70b1f50" >
+                                    <typetabsitem id="1018" addr="0x7f658f83cf50" >
+                                        <attributelist id="1019" addr="0x7f658f83cf50" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
-                                <attribute name="parent" value="0x7f20c70b1a70" id="1020" addr="0x7f20c70b1a70" />
-                                <attribute name="qname" value="XBMCAddon::xbmcvfs" id="1021" addr="0x7f20c70b39f0" />
-                                <attribute name="symtab" value="0x7f20c70aa9d0" id="1022" addr="0x7f20c70aa9d0" />
+                                <attribute name="parent" value="0x7f658f83ca70" id="1020" addr="0x7f658f83ca70" />
+                                <attribute name="qname" value="XBMCAddon::xbmcvfs" id="1021" addr="0x7f658f83e9f0" />
+                                <attribute name="symtab" value="0x7f658f8359d0" id="1022" addr="0x7f658f8359d0" />
                             </attributelist >
-                            <typescopesitem id="1023" addr="0x7f20c70aa990" >
-                                <attributelist id="1024" addr="0x7f20c70aa990" >
+                            <typescopesitem id="1023" addr="0x7f658f835990" >
+                                <attributelist id="1024" addr="0x7f658f835990" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="1025" addr="0x7f20c70b1e70" >
-                                <attributelist id="1026" addr="0x7f20c70b1e70" >
-                                    <attribute name="Stat" value="Stat" id="1027" addr="0x7f20c70b39f0" />
-                                    <attribute name="File" value="File" id="1028" addr="0x7f20c70b39f0" />
+                            <typescopesitem id="1025" addr="0x7f658f83ce70" >
+                                <attributelist id="1026" addr="0x7f658f83ce70" >
+                                    <attribute name="Stat" value="Stat" id="1027" addr="0x7f658f83e9f0" />
+                                    <attribute name="File" value="File" id="1028" addr="0x7f658f83e9f0" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="1029" addr="0x7f20c70b1a70" >
-                                <attributelist id="1030" addr="0x7f20c70b1a70" >
-                                    <attribute name="name" value="XBMCAddon" id="1031" addr="0x7f20c70b39f0" />
-                                    <typetab id="1032" addr="0x7f20c70b1ab0" >
-                                        <attributelist id="1033" addr="0x7f20c70b1ab0" >
-                                            <attribute name="String" value="std::string" id="1034" addr="0x7f20c70b39f0" />
+                            <typescopesitem id="1029" addr="0x7f658f83ca70" >
+                                <attributelist id="1030" addr="0x7f658f83ca70" >
+                                    <attribute name="name" value="XBMCAddon" id="1031" addr="0x7f658f83e9f0" />
+                                    <typetab id="1032" addr="0x7f658f83cab0" >
+                                        <attributelist id="1033" addr="0x7f658f83cab0" >
+                                            <attribute name="String" value="std::string" id="1034" addr="0x7f658f83e9f0" />
                                         </attributelist >
-                                        <typetabsitem id="1035" addr="0x7f20c70b1c90" >
-                                            <attributelist id="1036" addr="0x7f20c70b1c90" >
+                                        <typetabsitem id="1035" addr="0x7f658f83cc90" >
+                                            <attributelist id="1036" addr="0x7f658f83cc90" >
                                             </attributelist >
                                         </typetabsitem >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f20c7093a30" id="1037" addr="0x7f20c7093a30" />
-                                    <attribute name="qname" value="XBMCAddon" id="1038" addr="0x7f20c70b39f0" />
-                                    <attribute name="symtab" value="0x7f20c70aa2d0" id="1039" addr="0x7f20c70aa2d0" />
+                                    <attribute name="parent" value="0x7f658f81ea30" id="1037" addr="0x7f658f81ea30" />
+                                    <attribute name="qname" value="XBMCAddon" id="1038" addr="0x7f658f83e9f0" />
+                                    <attribute name="symtab" value="0x7f658f8352d0" id="1039" addr="0x7f658f8352d0" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="1040" addr="0x7f20c70b1e90" >
-                                <attributelist id="1041" addr="0x7f20c70b1e90" >
+                            <typescopesitem id="1040" addr="0x7f658f83ce90" >
+                                <attributelist id="1041" addr="0x7f658f83ce90" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="1042" addr="0x7f20c70aa9d0" >
-                                <attributelist id="1043" addr="0x7f20c70aa9d0" >
-                                    <attribute name="name" value="xbmcvfs" id="1044" addr="0x7f20c70b39f0" />
-                                    <attribute name="csymtab" value="0x7f20c70aaa10" id="1045" addr="0x7f20c70aaa10" />
-                                    <attribute name="symtab" value="0x7f20c70aa9b0" id="1046" addr="0x7f20c70aa9b0" />
+                            <typescopesitem id="1042" addr="0x7f658f8359d0" >
+                                <attributelist id="1043" addr="0x7f658f8359d0" >
+                                    <attribute name="name" value="xbmcvfs" id="1044" addr="0x7f658f83e9f0" />
+                                    <attribute name="csymtab" value="0x7f658f835a10" id="1045" addr="0x7f658f835a10" />
+                                    <attribute name="symtab" value="0x7f658f8359b0" id="1046" addr="0x7f658f8359b0" />
                                 </attributelist >
                             </typescopesitem >
                         </typescope >
-                        <attribute name="symtab" value="0x7f20c70aa9d0" id="1047" addr="0x7f20c70aa9d0" />
-                        <attribute name="sym_symtab" value="0x7f20c70aa2d0" id="1048" addr="0x7f20c70aa2d0" />
+                        <attribute name="symtab" value="0x7f658f8359d0" id="1047" addr="0x7f658f8359d0" />
+                        <attribute name="sym_symtab" value="0x7f658f8352d0" id="1048" addr="0x7f658f8352d0" />
                     </attributelist >
 
-                    <cdecl id="1049" addr="0x7f20c70afd30" >
-                        <attributelist id="1050" addr="0x7f20c70afd30" >
-                            <attribute name="sym_name" value="copy" id="1051" addr="0x7f20c70b39f0" />
-                            <attribute name="name" value="XBMCAddon::xbmcvfs::copy" id="1052" addr="0x7f20c70b39f0" />
-                            <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="1053" addr="0x7f20c70b39f0" />
-                            <parmlist id="1054" addr="0x7f20c70afb30" >
+                    <cdecl id="1049" addr="0x7f658f83ad30" >
+                        <attributelist id="1050" addr="0x7f658f83ad30" >
+                            <attribute name="sym_name" value="copy" id="1051" addr="0x7f658f83e9f0" />
+                            <attribute name="name" value="XBMCAddon::xbmcvfs::copy" id="1052" addr="0x7f658f83e9f0" />
+                            <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="1053" addr="0x7f658f83e9f0" />
+                            <parmlist id="1054" addr="0x7f658f83ab30" >
                                 <parm id="1055">
-                                    <attributelist id="1056" addr="0x7f20c70afb30" >
-                                        <attribute name="name" value="strSource" id="1057" addr="0x7f20c70b39f0" />
-                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="1058" addr="0x7f20c70b39f0" />
+                                    <attributelist id="1056" addr="0x7f658f83ab30" >
+                                        <attribute name="name" value="strSource" id="1057" addr="0x7f658f83e9f0" />
+                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="1058" addr="0x7f658f83e9f0" />
                                     </attributelist >
                                 </parm >
                                 <parm id="1059">
-                                    <attributelist id="1060" addr="0x7f20c70afc70" >
-                                        <attribute name="name" value="strDestination" id="1061" addr="0x7f20c70b39f0" />
-                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="1062" addr="0x7f20c70b39f0" />
+                                    <attributelist id="1060" addr="0x7f658f83ac70" >
+                                        <attribute name="name" value="strDestination" id="1061" addr="0x7f658f83e9f0" />
+                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="1062" addr="0x7f658f83e9f0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="kind" value="function" id="1063" addr="0x7f20c70b39f0" />
-                            <attribute name="type" value="bool" id="1064" addr="0x7f20c70b39f0" />
-                            <attribute name="sym_symtab" value="0x7f20c70aa9d0" id="1065" addr="0x7f20c70aa9d0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1066" addr="0x7f20c70b39f0" />
+                            <attribute name="kind" value="function" id="1063" addr="0x7f658f83e9f0" />
+                            <attribute name="type" value="bool" id="1064" addr="0x7f658f83e9f0" />
+                            <attribute name="sym_symtab" value="0x7f658f8359d0" id="1065" addr="0x7f658f8359d0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1066" addr="0x7f658f83e9f0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="1067" addr="0x7f20c70afff0" >
-                        <attributelist id="1068" addr="0x7f20c70afff0" >
-                            <attribute name="sym_name" value="delete" id="1069" addr="0x7f20c70b39f0" />
-                            <attribute name="name" value="XBMCAddon::xbmcvfs::deleteFile" id="1070" addr="0x7f20c70b39f0" />
-                            <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="1071" addr="0x7f20c70b39f0" />
-                            <parmlist id="1072" addr="0x7f20c70aff30" >
+                    <cdecl id="1067" addr="0x7f658f83aff0" >
+                        <attributelist id="1068" addr="0x7f658f83aff0" >
+                            <attribute name="sym_name" value="delete" id="1069" addr="0x7f658f83e9f0" />
+                            <attribute name="name" value="XBMCAddon::xbmcvfs::deleteFile" id="1070" addr="0x7f658f83e9f0" />
+                            <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="1071" addr="0x7f658f83e9f0" />
+                            <parmlist id="1072" addr="0x7f658f83af30" >
                                 <parm id="1073">
-                                    <attributelist id="1074" addr="0x7f20c70aff30" >
-                                        <attribute name="name" value="file" id="1075" addr="0x7f20c70b39f0" />
-                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="1076" addr="0x7f20c70b39f0" />
+                                    <attributelist id="1074" addr="0x7f658f83af30" >
+                                        <attribute name="name" value="file" id="1075" addr="0x7f658f83e9f0" />
+                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="1076" addr="0x7f658f83e9f0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="kind" value="function" id="1077" addr="0x7f20c70b39f0" />
-                            <attribute name="type" value="bool" id="1078" addr="0x7f20c70b39f0" />
-                            <attribute name="sym_symtab" value="0x7f20c70aa9d0" id="1079" addr="0x7f20c70aa9d0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1080" addr="0x7f20c70b39f0" />
+                            <attribute name="kind" value="function" id="1077" addr="0x7f658f83e9f0" />
+                            <attribute name="type" value="bool" id="1078" addr="0x7f658f83e9f0" />
+                            <attribute name="sym_symtab" value="0x7f658f8359d0" id="1079" addr="0x7f658f8359d0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1080" addr="0x7f658f83e9f0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="1081" addr="0x7f20c70b03f0" >
-                        <attributelist id="1082" addr="0x7f20c70b03f0" >
-                            <attribute name="sym_name" value="rename" id="1083" addr="0x7f20c70b39f0" />
-                            <attribute name="name" value="XBMCAddon::xbmcvfs::rename" id="1084" addr="0x7f20c70b39f0" />
-                            <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="1085" addr="0x7f20c70b39f0" />
-                            <parmlist id="1086" addr="0x7f20c70b01f0" >
+                    <cdecl id="1081" addr="0x7f658f83b3f0" >
+                        <attributelist id="1082" addr="0x7f658f83b3f0" >
+                            <attribute name="sym_name" value="rename" id="1083" addr="0x7f658f83e9f0" />
+                            <attribute name="name" value="XBMCAddon::xbmcvfs::rename" id="1084" addr="0x7f658f83e9f0" />
+                            <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).XBMCAddon::String)." id="1085" addr="0x7f658f83e9f0" />
+                            <parmlist id="1086" addr="0x7f658f83b1f0" >
                                 <parm id="1087">
-                                    <attributelist id="1088" addr="0x7f20c70b01f0" >
-                                        <attribute name="name" value="file" id="1089" addr="0x7f20c70b39f0" />
-                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="1090" addr="0x7f20c70b39f0" />
+                                    <attributelist id="1088" addr="0x7f658f83b1f0" >
+                                        <attribute name="name" value="file" id="1089" addr="0x7f658f83e9f0" />
+                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="1090" addr="0x7f658f83e9f0" />
                                     </attributelist >
                                 </parm >
                                 <parm id="1091">
-                                    <attributelist id="1092" addr="0x7f20c70b0330" >
-                                        <attribute name="name" value="newFile" id="1093" addr="0x7f20c70b39f0" />
-                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="1094" addr="0x7f20c70b39f0" />
+                                    <attributelist id="1092" addr="0x7f658f83b330" >
+                                        <attribute name="name" value="newFile" id="1093" addr="0x7f658f83e9f0" />
+                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="1094" addr="0x7f658f83e9f0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="kind" value="function" id="1095" addr="0x7f20c70b39f0" />
-                            <attribute name="type" value="bool" id="1096" addr="0x7f20c70b39f0" />
-                            <attribute name="sym_symtab" value="0x7f20c70aa9d0" id="1097" addr="0x7f20c70aa9d0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1098" addr="0x7f20c70b39f0" />
+                            <attribute name="kind" value="function" id="1095" addr="0x7f658f83e9f0" />
+                            <attribute name="type" value="bool" id="1096" addr="0x7f658f83e9f0" />
+                            <attribute name="sym_symtab" value="0x7f658f8359d0" id="1097" addr="0x7f658f8359d0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1098" addr="0x7f658f83e9f0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="1099" addr="0x7f20c70b06b0" >
-                        <attributelist id="1100" addr="0x7f20c70b06b0" >
-                            <attribute name="sym_name" value="exists" id="1101" addr="0x7f20c70b39f0" />
-                            <attribute name="name" value="XBMCAddon::xbmcvfs::exists" id="1102" addr="0x7f20c70b39f0" />
-                            <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="1103" addr="0x7f20c70b39f0" />
-                            <parmlist id="1104" addr="0x7f20c70b05f0" >
+                    <cdecl id="1099" addr="0x7f658f83b6b0" >
+                        <attributelist id="1100" addr="0x7f658f83b6b0" >
+                            <attribute name="sym_name" value="exists" id="1101" addr="0x7f658f83e9f0" />
+                            <attribute name="name" value="XBMCAddon::xbmcvfs::exists" id="1102" addr="0x7f658f83e9f0" />
+                            <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="1103" addr="0x7f658f83e9f0" />
+                            <parmlist id="1104" addr="0x7f658f83b5f0" >
                                 <parm id="1105">
-                                    <attributelist id="1106" addr="0x7f20c70b05f0" >
-                                        <attribute name="name" value="path" id="1107" addr="0x7f20c70b39f0" />
-                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="1108" addr="0x7f20c70b39f0" />
+                                    <attributelist id="1106" addr="0x7f658f83b5f0" >
+                                        <attribute name="name" value="path" id="1107" addr="0x7f658f83e9f0" />
+                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="1108" addr="0x7f658f83e9f0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="kind" value="function" id="1109" addr="0x7f20c70b39f0" />
-                            <attribute name="type" value="bool" id="1110" addr="0x7f20c70b39f0" />
-                            <attribute name="sym_symtab" value="0x7f20c70aa9d0" id="1111" addr="0x7f20c70aa9d0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1112" addr="0x7f20c70b39f0" />
+                            <attribute name="kind" value="function" id="1109" addr="0x7f658f83e9f0" />
+                            <attribute name="type" value="bool" id="1110" addr="0x7f658f83e9f0" />
+                            <attribute name="sym_symtab" value="0x7f658f8359d0" id="1111" addr="0x7f658f8359d0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1112" addr="0x7f658f83e9f0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="1113" addr="0x7f20c70b0970" >
-                        <attributelist id="1114" addr="0x7f20c70b0970" >
-                            <attribute name="sym_name" value="mkdir" id="1115" addr="0x7f20c70b39f0" />
-                            <attribute name="name" value="XBMCAddon::xbmcvfs::mkdir" id="1116" addr="0x7f20c70b39f0" />
-                            <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="1117" addr="0x7f20c70b39f0" />
-                            <parmlist id="1118" addr="0x7f20c70b08b0" >
+                    <cdecl id="1113" addr="0x7f658f83b970" >
+                        <attributelist id="1114" addr="0x7f658f83b970" >
+                            <attribute name="sym_name" value="mkdir" id="1115" addr="0x7f658f83e9f0" />
+                            <attribute name="name" value="XBMCAddon::xbmcvfs::mkdir" id="1116" addr="0x7f658f83e9f0" />
+                            <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="1117" addr="0x7f658f83e9f0" />
+                            <parmlist id="1118" addr="0x7f658f83b8b0" >
                                 <parm id="1119">
-                                    <attributelist id="1120" addr="0x7f20c70b08b0" >
-                                        <attribute name="name" value="path" id="1121" addr="0x7f20c70b39f0" />
-                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="1122" addr="0x7f20c70b39f0" />
+                                    <attributelist id="1120" addr="0x7f658f83b8b0" >
+                                        <attribute name="name" value="path" id="1121" addr="0x7f658f83e9f0" />
+                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="1122" addr="0x7f658f83e9f0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="kind" value="function" id="1123" addr="0x7f20c70b39f0" />
-                            <attribute name="type" value="bool" id="1124" addr="0x7f20c70b39f0" />
-                            <attribute name="sym_symtab" value="0x7f20c70aa9d0" id="1125" addr="0x7f20c70aa9d0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1126" addr="0x7f20c70b39f0" />
+                            <attribute name="kind" value="function" id="1123" addr="0x7f658f83e9f0" />
+                            <attribute name="type" value="bool" id="1124" addr="0x7f658f83e9f0" />
+                            <attribute name="sym_symtab" value="0x7f658f8359d0" id="1125" addr="0x7f658f8359d0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1126" addr="0x7f658f83e9f0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="1127" addr="0x7f20c70b0c30" >
-                        <attributelist id="1128" addr="0x7f20c70b0c30" >
-                            <attribute name="sym_name" value="mkdirs" id="1129" addr="0x7f20c70b39f0" />
-                            <attribute name="name" value="XBMCAddon::xbmcvfs::mkdirs" id="1130" addr="0x7f20c70b39f0" />
-                            <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="1131" addr="0x7f20c70b39f0" />
-                            <parmlist id="1132" addr="0x7f20c70b0b70" >
+                    <cdecl id="1127" addr="0x7f658f83bc30" >
+                        <attributelist id="1128" addr="0x7f658f83bc30" >
+                            <attribute name="sym_name" value="mkdirs" id="1129" addr="0x7f658f83e9f0" />
+                            <attribute name="name" value="XBMCAddon::xbmcvfs::mkdirs" id="1130" addr="0x7f658f83e9f0" />
+                            <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="1131" addr="0x7f658f83e9f0" />
+                            <parmlist id="1132" addr="0x7f658f83bb70" >
                                 <parm id="1133">
-                                    <attributelist id="1134" addr="0x7f20c70b0b70" >
-                                        <attribute name="name" value="path" id="1135" addr="0x7f20c70b39f0" />
-                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="1136" addr="0x7f20c70b39f0" />
+                                    <attributelist id="1134" addr="0x7f658f83bb70" >
+                                        <attribute name="name" value="path" id="1135" addr="0x7f658f83e9f0" />
+                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="1136" addr="0x7f658f83e9f0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="kind" value="function" id="1137" addr="0x7f20c70b39f0" />
-                            <attribute name="type" value="bool" id="1138" addr="0x7f20c70b39f0" />
-                            <attribute name="sym_symtab" value="0x7f20c70aa9d0" id="1139" addr="0x7f20c70aa9d0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1140" addr="0x7f20c70b39f0" />
+                            <attribute name="kind" value="function" id="1137" addr="0x7f658f83e9f0" />
+                            <attribute name="type" value="bool" id="1138" addr="0x7f658f83e9f0" />
+                            <attribute name="sym_symtab" value="0x7f658f8359d0" id="1139" addr="0x7f658f8359d0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1140" addr="0x7f658f83e9f0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="1141" addr="0x7f20c70b1030" >
-                        <attributelist id="1142" addr="0x7f20c70b1030" >
-                            <attribute name="name" value="XBMCAddon::xbmcvfs::rmdir" id="1143" addr="0x7f20c70b39f0" />
-                            <attribute name="sym_symtab" value="0x7f20c70aa9d0" id="1144" addr="0x7f20c70aa9d0" />
-                            <attribute name="sym_nextSibling" value="0x7f20c70b1190" id="1145" addr="0x7f20c70b1190" />
-                            <attribute name="csym_nextSibling" value="0x7f20c70b1190" id="1146" addr="0x7f20c70b1190" />
-                            <attribute name="kind" value="function" id="1147" addr="0x7f20c70b39f0" />
-                            <attribute name="sym_name" value="rmdir" id="1148" addr="0x7f20c70b39f0" />
-                            <attribute name="decl" value="f(r.q(const).XBMCAddon::String,bool)." id="1149" addr="0x7f20c70b39f0" />
-                            <attribute name="sym_overloaded" value="0x7f20c70b1030" id="1150" addr="0x7f20c70b1030" />
-                            <parmlist id="1151" addr="0x7f20c70b0e30" >
+                    <cdecl id="1141" addr="0x7f658f83c030" >
+                        <attributelist id="1142" addr="0x7f658f83c030" >
+                            <attribute name="name" value="XBMCAddon::xbmcvfs::rmdir" id="1143" addr="0x7f658f83e9f0" />
+                            <attribute name="sym_symtab" value="0x7f658f8359d0" id="1144" addr="0x7f658f8359d0" />
+                            <attribute name="sym_nextSibling" value="0x7f658f83c190" id="1145" addr="0x7f658f83c190" />
+                            <attribute name="csym_nextSibling" value="0x7f658f83c190" id="1146" addr="0x7f658f83c190" />
+                            <attribute name="kind" value="function" id="1147" addr="0x7f658f83e9f0" />
+                            <attribute name="sym_name" value="rmdir" id="1148" addr="0x7f658f83e9f0" />
+                            <attribute name="decl" value="f(r.q(const).XBMCAddon::String,bool)." id="1149" addr="0x7f658f83e9f0" />
+                            <attribute name="sym_overloaded" value="0x7f658f83c030" id="1150" addr="0x7f658f83c030" />
+                            <parmlist id="1151" addr="0x7f658f83be30" >
                                 <parm id="1152">
-                                    <attributelist id="1153" addr="0x7f20c70b0e30" >
-                                        <attribute name="name" value="path" id="1154" addr="0x7f20c70b39f0" />
-                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="1155" addr="0x7f20c70b39f0" />
+                                    <attributelist id="1153" addr="0x7f658f83be30" >
+                                        <attribute name="name" value="path" id="1154" addr="0x7f658f83e9f0" />
+                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="1155" addr="0x7f658f83e9f0" />
                                     </attributelist >
                                 </parm >
                                 <parm id="1156">
-                                    <attributelist id="1157" addr="0x7f20c70b0f70" >
-                                        <attribute name="name" value="force" id="1158" addr="0x7f20c70b39f0" />
-                                        <attribute name="value" value="false" id="1159" addr="0x7f20c70b39f0" />
-                                        <attribute name="type" value="bool" id="1160" addr="0x7f20c70b39f0" />
+                                    <attributelist id="1157" addr="0x7f658f83bf70" >
+                                        <attribute name="name" value="force" id="1158" addr="0x7f658f83e9f0" />
+                                        <attribute name="value" value="false" id="1159" addr="0x7f658f83e9f0" />
+                                        <attribute name="type" value="bool" id="1160" addr="0x7f658f83e9f0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="type" value="bool" id="1161" addr="0x7f20c70b39f0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1162" addr="0x7f20c70b39f0" />
+                            <attribute name="type" value="bool" id="1161" addr="0x7f658f83e9f0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1162" addr="0x7f658f83e9f0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="1163" addr="0x7f20c70b1190" >
-                        <attributelist id="1164" addr="0x7f20c70b1190" >
-                            <attribute name="name" value="XBMCAddon::xbmcvfs::rmdir" id="1165" addr="0x7f20c70b39f0" />
-                            <attribute name="sym_symtab" value="0x7f20c70aa9d0" id="1166" addr="0x7f20c70aa9d0" />
-                            <attribute name="sym_previousSibling" value="0x7f20c70b1030" id="1167" addr="0x7f20c70b1030" />
-                            <attribute name="kind" value="function" id="1168" addr="0x7f20c70b39f0" />
-                            <attribute name="sym_name" value="rmdir" id="1169" addr="0x7f20c70b39f0" />
-                            <attribute name="defaultargs" value="0x7f20c70b1030" id="1170" addr="0x7f20c70b1030" />
-                            <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="1171" addr="0x7f20c70b39f0" />
-                            <attribute name="sym_overloaded" value="0x7f20c70b1030" id="1172" addr="0x7f20c70b1030" />
-                            <parmlist id="1173" addr="0x7f20c70b1090" >
+                    <cdecl id="1163" addr="0x7f658f83c190" >
+                        <attributelist id="1164" addr="0x7f658f83c190" >
+                            <attribute name="name" value="XBMCAddon::xbmcvfs::rmdir" id="1165" addr="0x7f658f83e9f0" />
+                            <attribute name="sym_symtab" value="0x7f658f8359d0" id="1166" addr="0x7f658f8359d0" />
+                            <attribute name="sym_previousSibling" value="0x7f658f83c030" id="1167" addr="0x7f658f83c030" />
+                            <attribute name="kind" value="function" id="1168" addr="0x7f658f83e9f0" />
+                            <attribute name="sym_name" value="rmdir" id="1169" addr="0x7f658f83e9f0" />
+                            <attribute name="defaultargs" value="0x7f658f83c030" id="1170" addr="0x7f658f83c030" />
+                            <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="1171" addr="0x7f658f83e9f0" />
+                            <attribute name="sym_overloaded" value="0x7f658f83c030" id="1172" addr="0x7f658f83c030" />
+                            <parmlist id="1173" addr="0x7f658f83c090" >
                                 <parm id="1174">
-                                    <attributelist id="1175" addr="0x7f20c70b1090" >
-                                        <attribute name="name" value="path" id="1176" addr="0x7f20c70b39f0" />
-                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="1177" addr="0x7f20c70b39f0" />
+                                    <attributelist id="1175" addr="0x7f658f83c090" >
+                                        <attribute name="name" value="path" id="1176" addr="0x7f658f83e9f0" />
+                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="1177" addr="0x7f658f83e9f0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="type" value="bool" id="1178" addr="0x7f20c70b39f0" />
-                            <attribute name="sym_overname" value="__SWIG_1" id="1179" addr="0x7f20c70b39f0" />
+                            <attribute name="type" value="bool" id="1178" addr="0x7f658f83e9f0" />
+                            <attribute name="sym_overname" value="__SWIG_1" id="1179" addr="0x7f658f83e9f0" />
                         </attributelist >
                      
                     </cdecl >
-                    <cdecl id="1180" addr="0x7f20c70b1830" >
-                        <attributelist id="1181" addr="0x7f20c70b1830" >
-                            <attribute name="sym_name" value="listdir" id="1182" addr="0x7f20c70b39f0" />
-                            <attribute name="name" value="XBMCAddon::xbmcvfs::listdir" id="1183" addr="0x7f20c70b39f0" />
-                            <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="1184" addr="0x7f20c70b39f0" />
-                            <parmlist id="1185" addr="0x7f20c70b1770" >
+                    <cdecl id="1180" addr="0x7f658f83c830" >
+                        <attributelist id="1181" addr="0x7f658f83c830" >
+                            <attribute name="sym_name" value="listdir" id="1182" addr="0x7f658f83e9f0" />
+                            <attribute name="name" value="XBMCAddon::xbmcvfs::listdir" id="1183" addr="0x7f658f83e9f0" />
+                            <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="1184" addr="0x7f658f83e9f0" />
+                            <parmlist id="1185" addr="0x7f658f83c770" >
                                 <parm id="1186">
-                                    <attributelist id="1187" addr="0x7f20c70b1770" >
-                                        <attribute name="name" value="path" id="1188" addr="0x7f20c70b39f0" />
-                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="1189" addr="0x7f20c70b39f0" />
+                                    <attributelist id="1187" addr="0x7f658f83c770" >
+                                        <attribute name="name" value="path" id="1188" addr="0x7f658f83e9f0" />
+                                        <attribute name="type" value="r.q(const).XBMCAddon::String" id="1189" addr="0x7f658f83e9f0" />
                                     </attributelist >
                                 </parm >
                             </parmlist >
-                            <attribute name="kind" value="function" id="1190" addr="0x7f20c70b39f0" />
-                            <attribute name="type" value="Tuple&lt;(std::vector&lt;(XBMCAddon::String)>,std::vector&lt;(XBMCAddon::String)>)>" id="1191" addr="0x7f20c70b39f0" />
-                            <attribute name="sym_symtab" value="0x7f20c70aa9d0" id="1192" addr="0x7f20c70aa9d0" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1193" addr="0x7f20c70b39f0" />
+                            <attribute name="kind" value="function" id="1190" addr="0x7f658f83e9f0" />
+                            <attribute name="type" value="Tuple&lt;(std::vector&lt;(XBMCAddon::String)>,std::vector&lt;(XBMCAddon::String)>)>" id="1191" addr="0x7f658f83e9f0" />
+                            <attribute name="sym_symtab" value="0x7f658f8359d0" id="1192" addr="0x7f658f8359d0" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1193" addr="0x7f658f83e9f0" />
                         </attributelist >
                      
                     </cdecl >
diff --git a/srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmcwsgi.i.cpp b/srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmcwsgi.i.cpp
similarity index 99%
rename from srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmcwsgi.i.cpp
rename to srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmcwsgi.i.cpp
index 33a94d530bf..02911664b92 100644
--- a/srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmcwsgi.i.cpp
+++ b/srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmcwsgi.i.cpp
@@ -1259,7 +1259,7 @@ namespace PythonBindings
 
    // constants
    PyModule_AddStringConstant(module, "__author__", "Team Kodi <http://kodi.tv>");
-   PyModule_AddStringConstant(module, "__date__", "Wed Jun 19 18:36:44 GMT 2019");
+   PyModule_AddStringConstant(module, "__date__", "Sun Sep 01 10:46:49 GMT 2019");
    PyModule_AddStringConstant(module, "__version__", "2.26.0");
    PyModule_AddStringConstant(module, "__credits__", "Team Kodi");
    PyModule_AddStringConstant(module, "__platform__", "ALL");
diff --git a/srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmcwsgi.i.xml b/srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmcwsgi.i.xml
similarity index 61%
rename from srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmcwsgi.i.xml
rename to srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmcwsgi.i.xml
index b94f0b8905c..2d03f4dffa3 100644
--- a/srcpkgs/kodi/files/swig.nojava-18.3/AddonModuleXbmcwsgi.i.xml
+++ b/srcpkgs/kodi/files/swig.nojava-18.4/AddonModuleXbmcwsgi.i.xml
@@ -1,146 +1,146 @@
 <?xml version="1.0" ?> 
-<top id="1" addr="0x7f1a04090b30" >
-    <attributelist id="2" addr="0x7f1a04090b30" >
-        <attribute name="outfile" value="AddonModuleXbmcwsgi.i.xml" id="3" addr="0x7f1a040af550" />
-        <attribute name="name" value="xbmcwsgi" id="4" addr="0x7f1a040af550" />
-        <attribute name="module" value="xbmcwsgi" id="5" addr="0x7f1a040a6270" />
-        <attribute name="inputfile" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmcwsgi.i" id="6" addr="0x7f1a040af550" />
-        <attribute name="classes" value="0x7f1a040a3770" id="7" addr="0x7f1a040a3770" />
-        <attribute name="infile" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmcwsgi.i" id="8" addr="0x7f1a040af550" />
-        <attribute name="outfile_h" value="AddonModuleXbmcwsgi.i.h" id="9" addr="0x7f1a040af550" />
+<top id="1" addr="0x7fb6eb3d7b30" >
+    <attributelist id="2" addr="0x7fb6eb3d7b30" >
+        <attribute name="outfile" value="AddonModuleXbmcwsgi.i.xml" id="3" addr="0x7fb6eb3f6550" />
+        <attribute name="name" value="xbmcwsgi" id="4" addr="0x7fb6eb3f6550" />
+        <attribute name="module" value="xbmcwsgi" id="5" addr="0x7fb6eb3ed270" />
+        <attribute name="inputfile" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmcwsgi.i" id="6" addr="0x7fb6eb3f6550" />
+        <attribute name="classes" value="0x7fb6eb3ea770" id="7" addr="0x7fb6eb3ea770" />
+        <attribute name="infile" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmcwsgi.i" id="8" addr="0x7fb6eb3f6550" />
+        <attribute name="outfile_h" value="AddonModuleXbmcwsgi.i.h" id="9" addr="0x7fb6eb3f6550" />
     </attributelist >
 
-    <include id="10" addr="0x7f1a040a0ed0" >
-        <attributelist id="11" addr="0x7f1a040a0ed0" >
-            <attribute name="name" value="/usr/share/swig/3.0.12/swig.swg" id="12" addr="0x7f1a040af550" />
+    <include id="10" addr="0x7fb6eb3e7ed0" >
+        <attributelist id="11" addr="0x7fb6eb3e7ed0" >
+            <attribute name="name" value="/usr/share/swig/3.0.12/swig.swg" id="12" addr="0x7fb6eb3f6550" />
         </attributelist >
 
-        <include id="13" addr="0x7f1a040a0f30" >
-            <attributelist id="14" addr="0x7f1a040a0f30" >
-                <attribute name="name" value="/usr/share/swig/3.0.12/swigwarnings.swg" id="15" addr="0x7f1a040af550" />
+        <include id="13" addr="0x7fb6eb3e7f30" >
+            <attributelist id="14" addr="0x7fb6eb3e7f30" >
+                <attribute name="name" value="/usr/share/swig/3.0.12/swigwarnings.swg" id="15" addr="0x7fb6eb3f6550" />
             </attributelist >
 
-            <include id="16" addr="0x7f1a040a1550" >
-                <attributelist id="17" addr="0x7f1a040a1550" >
-                    <attribute name="name" value="/usr/share/swig/3.0.12/swigwarn.swg" id="18" addr="0x7f1a040af550" />
+            <include id="16" addr="0x7fb6eb3e8550" >
+                <attributelist id="17" addr="0x7fb6eb3e8550" >
+                    <attribute name="name" value="/usr/share/swig/3.0.12/swigwarn.swg" id="18" addr="0x7fb6eb3f6550" />
                 </attributelist >
              
             </include >
         </include >
-        <namespace id="19" addr="0x7f1a040a3290" >
-            <attributelist id="20" addr="0x7f1a040a3290" >
-                <attribute name="sym_name" value="std" id="21" addr="0x7f1a040af550" />
-                <attribute name="name" value="std" id="22" addr="0x7f1a040af550" />
-                <typescope id="23" addr="0x7f1a040ac5b0" >
-                    <attributelist id="24" addr="0x7f1a040ac5b0" >
-                        <attribute name="name" value="std" id="25" addr="0x7f1a040af550" />
-                        <typetab id="26" addr="0x7f1a040ac5d0" >
-                            <attributelist id="27" addr="0x7f1a040ac5d0" >
-                                <attribute name="initializer_list" value="initializer_list" id="28" addr="0x7f1a040af550" />
-                            </attributelist >
-                            <typetabsitem id="29" addr="0x7f1a040ac710" >
-                                <attributelist id="30" addr="0x7f1a040ac710" >
+        <namespace id="19" addr="0x7fb6eb3ea290" >
+            <attributelist id="20" addr="0x7fb6eb3ea290" >
+                <attribute name="sym_name" value="std" id="21" addr="0x7fb6eb3f6550" />
+                <attribute name="name" value="std" id="22" addr="0x7fb6eb3f6550" />
+                <typescope id="23" addr="0x7fb6eb3f35b0" >
+                    <attributelist id="24" addr="0x7fb6eb3f35b0" >
+                        <attribute name="name" value="std" id="25" addr="0x7fb6eb3f6550" />
+                        <typetab id="26" addr="0x7fb6eb3f35d0" >
+                            <attributelist id="27" addr="0x7fb6eb3f35d0" >
+                                <attribute name="initializer_list" value="initializer_list" id="28" addr="0x7fb6eb3f6550" />
+                            </attributelist >
+                            <typetabsitem id="29" addr="0x7fb6eb3f3710" >
+                                <attributelist id="30" addr="0x7fb6eb3f3710" >
                                 </attributelist >
                             </typetabsitem >
                         </typetab >
-                        <attribute name="parent" value="0x7f1a0408fa30" id="31" addr="0x7f1a0408fa30" />
-                        <attribute name="qname" value="std" id="32" addr="0x7f1a040af550" />
-                        <attribute name="symtab" value="0x7f1a040a31f0" id="33" addr="0x7f1a040a31f0" />
+                        <attribute name="parent" value="0x7fb6eb3d6a30" id="31" addr="0x7fb6eb3d6a30" />
+                        <attribute name="qname" value="std" id="32" addr="0x7fb6eb3f6550" />
+                        <attribute name="symtab" value="0x7fb6eb3ea1f0" id="33" addr="0x7fb6eb3ea1f0" />
                     </attributelist >
-                    <typescopesitem id="34" addr="0x7f1a040a3150" >
-                        <attributelist id="35" addr="0x7f1a040a3150" >
+                    <typescopesitem id="34" addr="0x7fb6eb3ea150" >
+                        <attributelist id="35" addr="0x7fb6eb3ea150" >
                         </attributelist >
                     </typescopesitem >
-                    <typescopesitem id="36" addr="0x7f1a040ac5d0" >
-                        <attributelist id="37" addr="0x7f1a040ac5d0" >
-                            <attribute name="initializer_list" value="initializer_list" id="38" addr="0x7f1a040af550" />
+                    <typescopesitem id="36" addr="0x7fb6eb3f35d0" >
+                        <attributelist id="37" addr="0x7fb6eb3f35d0" >
+                            <attribute name="initializer_list" value="initializer_list" id="38" addr="0x7fb6eb3f6550" />
                         </attributelist >
                     </typescopesitem >
-                    <typescopesitem id="39" addr="0x7f1a0408fa30" >
-                        <attributelist id="40" addr="0x7f1a0408fa30" >
-                            <attribute name="name" value="" id="41" addr="0x7f1a040af550" />
-                            <typetab id="42" addr="0x7f1a0408fa90" >
-                                <attributelist id="43" addr="0x7f1a0408fa90" >
-                                    <attribute name="HTTPPythonRequest" value="HTTPPythonRequest" id="44" addr="0x7f1a040af550" />
+                    <typescopesitem id="39" addr="0x7fb6eb3d6a30" >
+                        <attributelist id="40" addr="0x7fb6eb3d6a30" >
+                            <attribute name="name" value="" id="41" addr="0x7fb6eb3f6550" />
+                            <typetab id="42" addr="0x7fb6eb3d6a90" >
+                                <attributelist id="43" addr="0x7fb6eb3d6a90" >
+                                    <attribute name="HTTPPythonRequest" value="HTTPPythonRequest" id="44" addr="0x7fb6eb3f6550" />
                                 </attributelist >
-                                <typetabsitem id="45" addr="0x7f1a040ac7b0" >
-                                    <attributelist id="46" addr="0x7f1a040ac7b0" >
+                                <typetabsitem id="45" addr="0x7fb6eb3f37b0" >
+                                    <attributelist id="46" addr="0x7fb6eb3f37b0" >
                                     </attributelist >
                                 </typetabsitem >
                             </typetab >
                         </attributelist >
                     </typescopesitem >
-                    <typescopesitem id="47" addr="0x7f1a040ac5f0" >
-                        <attributelist id="48" addr="0x7f1a040ac5f0" >
+                    <typescopesitem id="47" addr="0x7fb6eb3f35f0" >
+                        <attributelist id="48" addr="0x7fb6eb3f35f0" >
                         </attributelist >
                     </typescopesitem >
-                    <typescopesitem id="49" addr="0x7f1a040a31f0" >
-                        <attributelist id="50" addr="0x7f1a040a31f0" >
-                            <attribute name="name" value="std" id="51" addr="0x7f1a040af550" />
-                            <attribute name="csymtab" value="0x7f1a040a3230" id="52" addr="0x7f1a040a3230" />
-                            <attribute name="symtab" value="0x7f1a040a31d0" id="53" addr="0x7f1a040a31d0" />
+                    <typescopesitem id="49" addr="0x7fb6eb3ea1f0" >
+                        <attributelist id="50" addr="0x7fb6eb3ea1f0" >
+                            <attribute name="name" value="std" id="51" addr="0x7fb6eb3f6550" />
+                            <attribute name="csymtab" value="0x7fb6eb3ea230" id="52" addr="0x7fb6eb3ea230" />
+                            <attribute name="symtab" value="0x7fb6eb3ea1d0" id="53" addr="0x7fb6eb3ea1d0" />
                         </attributelist >
                     </typescopesitem >
                 </typescope >
-                <attribute name="symtab" value="0x7f1a040a31f0" id="54" addr="0x7f1a040a31f0" />
-                <attribute name="sym_symtab" value="0x7f1a0408f950" id="55" addr="0x7f1a0408f950" />
-                <attribute name="sym_overname" value="__SWIG_0" id="56" addr="0x7f1a040af550" />
+                <attribute name="symtab" value="0x7fb6eb3ea1f0" id="54" addr="0x7fb6eb3ea1f0" />
+                <attribute name="sym_symtab" value="0x7fb6eb3d6950" id="55" addr="0x7fb6eb3d6950" />
+                <attribute name="sym_overname" value="__SWIG_0" id="56" addr="0x7fb6eb3f6550" />
             </attributelist >
 
-            <template id="57" addr="0x7f1a040a3410" >
-                <attributelist id="58" addr="0x7f1a040a3410" >
-                    <attribute name="templatetype" value="class" id="59" addr="0x7f1a040af550" />
-                    <attribute name="sym_typename" value="1" id="60" addr="0x7f1a040af550" />
-                    <attribute name="name" value="initializer_list" id="61" addr="0x7f1a040af550" />
-                    <attribute name="sym_symtab" value="0x7f1a040a31f0" id="62" addr="0x7f1a040a31f0" />
-                    <attribute name="symtab" value="0x7f1a040a3630" id="63" addr="0x7f1a040a3630" />
-                    <attribute name="allows_typedef" value="1" id="64" addr="0x7f1a040af550" />
-                    <attribute name="kind" value="class" id="65" addr="0x7f1a040af550" />
-                    <attribute name="sym_name" value="initializer_list" id="66" addr="0x7f1a040af550" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="67" addr="0x7f1a040af550" />
-                    <templateparms id="68" addr="0x7f1a040a3330" >
+            <template id="57" addr="0x7fb6eb3ea410" >
+                <attributelist id="58" addr="0x7fb6eb3ea410" >
+                    <attribute name="templatetype" value="class" id="59" addr="0x7fb6eb3f6550" />
+                    <attribute name="sym_typename" value="1" id="60" addr="0x7fb6eb3f6550" />
+                    <attribute name="name" value="initializer_list" id="61" addr="0x7fb6eb3f6550" />
+                    <attribute name="sym_symtab" value="0x7fb6eb3ea1f0" id="62" addr="0x7fb6eb3ea1f0" />
+                    <attribute name="symtab" value="0x7fb6eb3ea630" id="63" addr="0x7fb6eb3ea630" />
+                    <attribute name="allows_typedef" value="1" id="64" addr="0x7fb6eb3f6550" />
+                    <attribute name="kind" value="class" id="65" addr="0x7fb6eb3f6550" />
+                    <attribute name="sym_name" value="initializer_list" id="66" addr="0x7fb6eb3f6550" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="67" addr="0x7fb6eb3f6550" />
+                    <templateparms id="68" addr="0x7fb6eb3ea330" >
                         <parm id="69">
-                            <attributelist id="70" addr="0x7f1a040a3330" >
-                                <attribute name="name" value="T" id="71" addr="0x7f1a040af550" />
-                                <attribute name="type" value="typename T" id="72" addr="0x7f1a040af550" />
+                            <attributelist id="70" addr="0x7fb6eb3ea330" >
+                                <attribute name="name" value="T" id="71" addr="0x7fb6eb3f6550" />
+                                <attribute name="type" value="typename T" id="72" addr="0x7fb6eb3f6550" />
                             </attributelist >
                         </parm >
                     </templateparms >
                 </attributelist >
 
-                <access id="73" addr="0x7f1a040a37f0" >
-                    <attributelist id="74" addr="0x7f1a040a37f0" >
-                        <attribute name="kind" value="public" id="75" addr="0x7f1a040af550" />
+                <access id="73" addr="0x7fb6eb3ea7f0" >
+                    <attributelist id="74" addr="0x7fb6eb3ea7f0" >
+                        <attribute name="kind" value="public" id="75" addr="0x7fb6eb3f6550" />
                     </attributelist >
                  
                 </access >
             </template >
-            <typemap id="76" addr="0x7f1a040a3e50" >
-                <attributelist id="77" addr="0x7f1a040a3e50" >
-                    <kwargs id="78" addr="0x7f1a040a3b50" >
-                        <attributelist id="79" addr="0x7f1a040a3b50" >
-                            <attribute name="name" value="warning" id="80" addr="0x7f1a040af550" />
-                            <attribute name="value" value="476:Initialization using std::initializer_list." id="81" addr="0x7f1a040af550" />
+            <typemap id="76" addr="0x7fb6eb3eae50" >
+                <attributelist id="77" addr="0x7fb6eb3eae50" >
+                    <kwargs id="78" addr="0x7fb6eb3eab50" >
+                        <attributelist id="79" addr="0x7fb6eb3eab50" >
+                            <attribute name="name" value="warning" id="80" addr="0x7fb6eb3f6550" />
+                            <attribute name="value" value="476:Initialization using std::initializer_list." id="81" addr="0x7fb6eb3f6550" />
                         </attributelist >
-                        <kwargssitem id="82" addr="0x7f1a040a3cd0" >
-                            <attributelist id="83" addr="0x7f1a040a3cd0" >
+                        <kwargssitem id="82" addr="0x7fb6eb3eacd0" >
+                            <attributelist id="83" addr="0x7fb6eb3eacd0" >
                             </attributelist >
                         </kwargssitem >
-                        <kwargssitem id="84" addr="0x7f1a040a3b30" >
-                            <attributelist id="85" addr="0x7f1a040a3b30" >
+                        <kwargssitem id="84" addr="0x7fb6eb3eab30" >
+                            <attributelist id="85" addr="0x7fb6eb3eab30" >
                             </attributelist >
                         </kwargssitem >
                     </kwargs >
-                    <attribute name="code" value="" id="86" addr="0x7f1a040af550" />
-                    <attribute name="method" value="in" id="87" addr="0x7f1a040af550" />
+                    <attribute name="code" value="" id="86" addr="0x7fb6eb3f6550" />
+                    <attribute name="method" value="in" id="87" addr="0x7fb6eb3f6550" />
                 </attributelist >
 
-                <typemapitem id="88" addr="0x7f1a040a3d70" >
-                    <attributelist id="89" addr="0x7f1a040a3d70" >
-                        <parmlist id="90" addr="0x7f1a040a3db0" >
+                <typemapitem id="88" addr="0x7fb6eb3ead70" >
+                    <attributelist id="89" addr="0x7fb6eb3ead70" >
+                        <parmlist id="90" addr="0x7fb6eb3eadb0" >
                             <parm id="91">
-                                <attributelist id="92" addr="0x7f1a040a3db0" >
-                                    <attribute name="type" value="std::initializer_list&lt;(T)>" id="93" addr="0x7f1a040af550" />
+                                <attributelist id="92" addr="0x7fb6eb3eadb0" >
+                                    <attribute name="type" value="std::initializer_list&lt;(T)>" id="93" addr="0x7fb6eb3f6550" />
                                 </attributelist >
                             </parm >
                         </parmlist >
@@ -148,32 +148,32 @@
                  
                 </typemapitem >
             </typemap >
-            <typemap id="94" addr="0x7f1a040a41d0" >
-                <attributelist id="95" addr="0x7f1a040a41d0" >
-                    <kwargs id="96" addr="0x7f1a040a3f70" >
-                        <attributelist id="97" addr="0x7f1a040a3f70" >
-                            <attribute name="name" value="precedence" id="98" addr="0x7f1a040af550" />
-                            <attribute name="value" value="0" id="99" addr="0x7f1a040af550" />
+            <typemap id="94" addr="0x7fb6eb3eb1d0" >
+                <attributelist id="95" addr="0x7fb6eb3eb1d0" >
+                    <kwargs id="96" addr="0x7fb6eb3eaf70" >
+                        <attributelist id="97" addr="0x7fb6eb3eaf70" >
+                            <attribute name="name" value="precedence" id="98" addr="0x7fb6eb3f6550" />
+                            <attribute name="value" value="0" id="99" addr="0x7fb6eb3f6550" />
                         </attributelist >
-                        <kwargssitem id="100" addr="0x7f1a040a3f90" >
-                            <attributelist id="101" addr="0x7f1a040a3f90" >
+                        <kwargssitem id="100" addr="0x7fb6eb3eaf90" >
+                            <attributelist id="101" addr="0x7fb6eb3eaf90" >
                             </attributelist >
                         </kwargssitem >
-                        <kwargssitem id="102" addr="0x7f1a040a3fb0" >
-                            <attributelist id="103" addr="0x7f1a040a3fb0" >
+                        <kwargssitem id="102" addr="0x7fb6eb3eafb0" >
+                            <attributelist id="103" addr="0x7fb6eb3eafb0" >
                             </attributelist >
                         </kwargssitem >
                     </kwargs >
-                    <attribute name="code" value="" id="104" addr="0x7f1a040af550" />
-                    <attribute name="method" value="typecheck" id="105" addr="0x7f1a040af550" />
+                    <attribute name="code" value="" id="104" addr="0x7fb6eb3f6550" />
+                    <attribute name="method" value="typecheck" id="105" addr="0x7fb6eb3f6550" />
                 </attributelist >
 
-                <typemapitem id="106" addr="0x7f1a040a4110" >
-                    <attributelist id="107" addr="0x7f1a040a4110" >
-                        <parmlist id="108" addr="0x7f1a040a4150" >
+                <typemapitem id="106" addr="0x7fb6eb3eb110" >
+                    <attributelist id="107" addr="0x7fb6eb3eb110" >
+                        <parmlist id="108" addr="0x7fb6eb3eb150" >
                             <parm id="109">
-                                <attributelist id="110" addr="0x7f1a040a4150" >
-                                    <attribute name="type" value="std::initializer_list&lt;(T)>" id="111" addr="0x7f1a040af550" />
+                                <attributelist id="110" addr="0x7fb6eb3eb150" >
+                                    <attribute name="type" value="std::initializer_list&lt;(T)>" id="111" addr="0x7fb6eb3f6550" />
                                 </attributelist >
                             </parm >
                         </parmlist >
@@ -182,18 +182,18 @@
                 </typemapitem >
             </typemap >
         </namespace >
-        <typemap id="112" addr="0x7f1a040a43f0" >
-            <attributelist id="113" addr="0x7f1a040a43f0" >
-                <attribute name="code" value="delete [] $1;" id="114" addr="0x7f1a040af550" />
-                <attribute name="method" value="newfree" id="115" addr="0x7f1a040af550" />
+        <typemap id="112" addr="0x7fb6eb3eb3f0" >
+            <attributelist id="113" addr="0x7fb6eb3eb3f0" >
+                <attribute name="code" value="delete [] $1;" id="114" addr="0x7fb6eb3f6550" />
+                <attribute name="method" value="newfree" id="115" addr="0x7fb6eb3f6550" />
             </attributelist >
 
-            <typemapitem id="116" addr="0x7f1a040a4310" >
-                <attributelist id="117" addr="0x7f1a040a4310" >
-                    <parmlist id="118" addr="0x7f1a040a4350" >
+            <typemapitem id="116" addr="0x7fb6eb3eb310" >
+                <attributelist id="117" addr="0x7fb6eb3eb310" >
+                    <parmlist id="118" addr="0x7fb6eb3eb350" >
                         <parm id="119">
-                            <attributelist id="120" addr="0x7f1a040a4350" >
-                                <attribute name="type" value="p.char" id="121" addr="0x7f1a040af550" />
+                            <attributelist id="120" addr="0x7fb6eb3eb350" >
+                                <attribute name="type" value="p.char" id="121" addr="0x7fb6eb3f6550" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -201,18 +201,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="122" addr="0x7f1a040a45d0" >
-            <attributelist id="123" addr="0x7f1a040a45d0" >
-                <attribute name="code" value="{&#10;  delete [] $1;&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="124" addr="0x7f1a040af550" />
-                <attribute name="method" value="memberin" id="125" addr="0x7f1a040af550" />
+        <typemap id="122" addr="0x7fb6eb3eb5d0" >
+            <attributelist id="123" addr="0x7fb6eb3eb5d0" >
+                <attribute name="code" value="{&#10;  delete [] $1;&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="124" addr="0x7fb6eb3f6550" />
+                <attribute name="method" value="memberin" id="125" addr="0x7fb6eb3f6550" />
             </attributelist >
 
-            <typemapitem id="126" addr="0x7f1a040a4510" >
-                <attributelist id="127" addr="0x7f1a040a4510" >
-                    <parmlist id="128" addr="0x7f1a040a4550" >
+            <typemapitem id="126" addr="0x7fb6eb3eb510" >
+                <attributelist id="127" addr="0x7fb6eb3eb510" >
+                    <parmlist id="128" addr="0x7fb6eb3eb550" >
                         <parm id="129">
-                            <attributelist id="130" addr="0x7f1a040a4550" >
-                                <attribute name="type" value="p.char" id="131" addr="0x7f1a040af550" />
+                            <attributelist id="130" addr="0x7fb6eb3eb550" >
+                                <attribute name="type" value="p.char" id="131" addr="0x7fb6eb3f6550" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -220,32 +220,32 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="132" addr="0x7f1a040a4830" >
-            <attributelist id="133" addr="0x7f1a040a4830" >
-                <kwargs id="134" addr="0x7f1a040a4670" >
-                    <attributelist id="135" addr="0x7f1a040a4670" >
-                        <attribute name="name" value="warning" id="136" addr="0x7f1a040af550" />
-                        <attribute name="value" value="451:Setting a const char * variable may leak memory." id="137" addr="0x7f1a040af550" />
+        <typemap id="132" addr="0x7fb6eb3eb830" >
+            <attributelist id="133" addr="0x7fb6eb3eb830" >
+                <kwargs id="134" addr="0x7fb6eb3eb670" >
+                    <attributelist id="135" addr="0x7fb6eb3eb670" >
+                        <attribute name="name" value="warning" id="136" addr="0x7fb6eb3f6550" />
+                        <attribute name="value" value="451:Setting a const char * variable may leak memory." id="137" addr="0x7fb6eb3f6550" />
                     </attributelist >
-                    <kwargssitem id="138" addr="0x7f1a040a4690" >
-                        <attributelist id="139" addr="0x7f1a040a4690" >
+                    <kwargssitem id="138" addr="0x7fb6eb3eb690" >
+                        <attributelist id="139" addr="0x7fb6eb3eb690" >
                         </attributelist >
                     </kwargssitem >
-                    <kwargssitem id="140" addr="0x7f1a040a4650" >
-                        <attributelist id="141" addr="0x7f1a040a4650" >
+                    <kwargssitem id="140" addr="0x7fb6eb3eb650" >
+                        <attributelist id="141" addr="0x7fb6eb3eb650" >
                         </attributelist >
                     </kwargssitem >
                 </kwargs >
-                <attribute name="code" value="{&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="142" addr="0x7f1a040af550" />
-                <attribute name="method" value="memberin" id="143" addr="0x7f1a040af550" />
+                <attribute name="code" value="{&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="142" addr="0x7fb6eb3f6550" />
+                <attribute name="method" value="memberin" id="143" addr="0x7fb6eb3f6550" />
             </attributelist >
 
-            <typemapitem id="144" addr="0x7f1a040a4770" >
-                <attributelist id="145" addr="0x7f1a040a4770" >
-                    <parmlist id="146" addr="0x7f1a040a47b0" >
+            <typemapitem id="144" addr="0x7fb6eb3eb770" >
+                <attributelist id="145" addr="0x7fb6eb3eb770" >
+                    <parmlist id="146" addr="0x7fb6eb3eb7b0" >
                         <parm id="147">
-                            <attributelist id="148" addr="0x7f1a040a47b0" >
-                                <attribute name="type" value="p.q(const).char" id="149" addr="0x7f1a040af550" />
+                            <attributelist id="148" addr="0x7fb6eb3eb7b0" >
+                                <attribute name="type" value="p.q(const).char" id="149" addr="0x7fb6eb3f6550" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -253,18 +253,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="150" addr="0x7f1a040a4a10" >
-            <attributelist id="151" addr="0x7f1a040a4a10" >
-                <attribute name="code" value="{&#10;  delete [] $1;&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="152" addr="0x7f1a040af550" />
-                <attribute name="method" value="globalin" id="153" addr="0x7f1a040af550" />
+        <typemap id="150" addr="0x7fb6eb3eba10" >
+            <attributelist id="151" addr="0x7fb6eb3eba10" >
+                <attribute name="code" value="{&#10;  delete [] $1;&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="152" addr="0x7fb6eb3f6550" />
+                <attribute name="method" value="globalin" id="153" addr="0x7fb6eb3f6550" />
             </attributelist >
 
-            <typemapitem id="154" addr="0x7f1a040a4950" >
-                <attributelist id="155" addr="0x7f1a040a4950" >
-                    <parmlist id="156" addr="0x7f1a040a4990" >
+            <typemapitem id="154" addr="0x7fb6eb3eb950" >
+                <attributelist id="155" addr="0x7fb6eb3eb950" >
+                    <parmlist id="156" addr="0x7fb6eb3eb990" >
                         <parm id="157">
-                            <attributelist id="158" addr="0x7f1a040a4990" >
-                                <attribute name="type" value="p.char" id="159" addr="0x7f1a040af550" />
+                            <attributelist id="158" addr="0x7fb6eb3eb990" >
+                                <attribute name="type" value="p.char" id="159" addr="0x7fb6eb3f6550" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -272,32 +272,32 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="160" addr="0x7f1a040a4c70" >
-            <attributelist id="161" addr="0x7f1a040a4c70" >
-                <kwargs id="162" addr="0x7f1a040a4ab0" >
-                    <attributelist id="163" addr="0x7f1a040a4ab0" >
-                        <attribute name="name" value="warning" id="164" addr="0x7f1a040af550" />
-                        <attribute name="value" value="451:Setting a const char * variable may leak memory." id="165" addr="0x7f1a040af550" />
+        <typemap id="160" addr="0x7fb6eb3ebc70" >
+            <attributelist id="161" addr="0x7fb6eb3ebc70" >
+                <kwargs id="162" addr="0x7fb6eb3ebab0" >
+                    <attributelist id="163" addr="0x7fb6eb3ebab0" >
+                        <attribute name="name" value="warning" id="164" addr="0x7fb6eb3f6550" />
+                        <attribute name="value" value="451:Setting a const char * variable may leak memory." id="165" addr="0x7fb6eb3f6550" />
                     </attributelist >
-                    <kwargssitem id="166" addr="0x7f1a040a4ad0" >
-                        <attributelist id="167" addr="0x7f1a040a4ad0" >
+                    <kwargssitem id="166" addr="0x7fb6eb3ebad0" >
+                        <attributelist id="167" addr="0x7fb6eb3ebad0" >
                         </attributelist >
                     </kwargssitem >
-                    <kwargssitem id="168" addr="0x7f1a040a4a90" >
-                        <attributelist id="169" addr="0x7f1a040a4a90" >
+                    <kwargssitem id="168" addr="0x7fb6eb3eba90" >
+                        <attributelist id="169" addr="0x7fb6eb3eba90" >
                         </attributelist >
                     </kwargssitem >
                 </kwargs >
-                <attribute name="code" value="{&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="170" addr="0x7f1a040af550" />
-                <attribute name="method" value="globalin" id="171" addr="0x7f1a040af550" />
+                <attribute name="code" value="{&#10;  if ($input) {&#10;     $1 = ($1_type) (new char[strlen((const char *)$input)+1]);&#10;     strcpy((char *)$1, (const char *)$input);&#10;  } else {&#10;     $1 = 0;&#10;  }&#10;}" id="170" addr="0x7fb6eb3f6550" />
+                <attribute name="method" value="globalin" id="171" addr="0x7fb6eb3f6550" />
             </attributelist >
 
-            <typemapitem id="172" addr="0x7f1a040a4bb0" >
-                <attributelist id="173" addr="0x7f1a040a4bb0" >
-                    <parmlist id="174" addr="0x7f1a040a4bf0" >
+            <typemapitem id="172" addr="0x7fb6eb3ebbb0" >
+                <attributelist id="173" addr="0x7fb6eb3ebbb0" >
+                    <parmlist id="174" addr="0x7fb6eb3ebbf0" >
                         <parm id="175">
-                            <attributelist id="176" addr="0x7f1a040a4bf0" >
-                                <attribute name="type" value="p.q(const).char" id="177" addr="0x7f1a040af550" />
+                            <attributelist id="176" addr="0x7fb6eb3ebbf0" >
+                                <attribute name="type" value="p.q(const).char" id="177" addr="0x7fb6eb3f6550" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -305,18 +305,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="178" addr="0x7f1a040a4e90" >
-            <attributelist id="179" addr="0x7f1a040a4e90" >
-                <attribute name="code" value="{&#10;  if($input) {&#10;    strncpy((char*)$1, (const char *)$input, $1_dim0-1);&#10;    $1[$1_dim0-1] = 0;&#10;  } else {&#10;    $1[0] = 0;&#10;  }&#10;}" id="180" addr="0x7f1a040af550" />
-                <attribute name="method" value="memberin" id="181" addr="0x7f1a040af550" />
+        <typemap id="178" addr="0x7fb6eb3ebe90" >
+            <attributelist id="179" addr="0x7fb6eb3ebe90" >
+                <attribute name="code" value="{&#10;  if($input) {&#10;    strncpy((char*)$1, (const char *)$input, $1_dim0-1);&#10;    $1[$1_dim0-1] = 0;&#10;  } else {&#10;    $1[0] = 0;&#10;  }&#10;}" id="180" addr="0x7fb6eb3f6550" />
+                <attribute name="method" value="memberin" id="181" addr="0x7fb6eb3f6550" />
             </attributelist >
 
-            <typemapitem id="182" addr="0x7f1a040a4dd0" >
-                <attributelist id="183" addr="0x7f1a040a4dd0" >
-                    <parmlist id="184" addr="0x7f1a040a4e10" >
+            <typemapitem id="182" addr="0x7fb6eb3ebdd0" >
+                <attributelist id="183" addr="0x7fb6eb3ebdd0" >
+                    <parmlist id="184" addr="0x7fb6eb3ebe10" >
                         <parm id="185">
-                            <attributelist id="186" addr="0x7f1a040a4e10" >
-                                <attribute name="type" value="a(ANY).char" id="187" addr="0x7f1a040af550" />
+                            <attributelist id="186" addr="0x7fb6eb3ebe10" >
+                                <attribute name="type" value="a(ANY).char" id="187" addr="0x7fb6eb3f6550" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -324,18 +324,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="188" addr="0x7f1a040a50b0" >
-            <attributelist id="189" addr="0x7f1a040a50b0" >
-                <attribute name="code" value="{&#10;  if($input) {&#10;    strncpy((char*)$1, (const char *)$input, $1_dim0-1);&#10;    $1[$1_dim0-1] = 0;&#10;  } else {&#10;    $1[0] = 0;&#10;  }&#10;}" id="190" addr="0x7f1a040af550" />
-                <attribute name="method" value="globalin" id="191" addr="0x7f1a040af550" />
+        <typemap id="188" addr="0x7fb6eb3ec0b0" >
+            <attributelist id="189" addr="0x7fb6eb3ec0b0" >
+                <attribute name="code" value="{&#10;  if($input) {&#10;    strncpy((char*)$1, (const char *)$input, $1_dim0-1);&#10;    $1[$1_dim0-1] = 0;&#10;  } else {&#10;    $1[0] = 0;&#10;  }&#10;}" id="190" addr="0x7fb6eb3f6550" />
+                <attribute name="method" value="globalin" id="191" addr="0x7fb6eb3f6550" />
             </attributelist >
 
-            <typemapitem id="192" addr="0x7f1a040a4ff0" >
-                <attributelist id="193" addr="0x7f1a040a4ff0" >
-                    <parmlist id="194" addr="0x7f1a040a5030" >
+            <typemapitem id="192" addr="0x7fb6eb3ebff0" >
+                <attributelist id="193" addr="0x7fb6eb3ebff0" >
+                    <parmlist id="194" addr="0x7fb6eb3ec030" >
                         <parm id="195">
-                            <attributelist id="196" addr="0x7f1a040a5030" >
-                                <attribute name="type" value="a(ANY).char" id="197" addr="0x7f1a040af550" />
+                            <attributelist id="196" addr="0x7fb6eb3ec030" >
+                                <attribute name="type" value="a(ANY).char" id="197" addr="0x7fb6eb3f6550" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -343,18 +343,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="198" addr="0x7f1a040a5290" >
-            <attributelist id="199" addr="0x7f1a040a5290" >
-                <attribute name="code" value="{&#10;  if ($input) strcpy((char *)$1, (const char *)$input);&#10;  else $1[0] = 0;&#10;}" id="200" addr="0x7f1a040af550" />
-                <attribute name="method" value="memberin" id="201" addr="0x7f1a040af550" />
+        <typemap id="198" addr="0x7fb6eb3ec290" >
+            <attributelist id="199" addr="0x7fb6eb3ec290" >
+                <attribute name="code" value="{&#10;  if ($input) strcpy((char *)$1, (const char *)$input);&#10;  else $1[0] = 0;&#10;}" id="200" addr="0x7fb6eb3f6550" />
+                <attribute name="method" value="memberin" id="201" addr="0x7fb6eb3f6550" />
             </attributelist >
 
-            <typemapitem id="202" addr="0x7f1a040a51d0" >
-                <attributelist id="203" addr="0x7f1a040a51d0" >
-                    <parmlist id="204" addr="0x7f1a040a5210" >
+            <typemapitem id="202" addr="0x7fb6eb3ec1d0" >
+                <attributelist id="203" addr="0x7fb6eb3ec1d0" >
+                    <parmlist id="204" addr="0x7fb6eb3ec210" >
                         <parm id="205">
-                            <attributelist id="206" addr="0x7f1a040a5210" >
-                                <attribute name="type" value="a().char" id="207" addr="0x7f1a040af550" />
+                            <attributelist id="206" addr="0x7fb6eb3ec210" >
+                                <attribute name="type" value="a().char" id="207" addr="0x7fb6eb3f6550" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -362,18 +362,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="208" addr="0x7f1a040a5470" >
-            <attributelist id="209" addr="0x7f1a040a5470" >
-                <attribute name="code" value="{&#10;  if ($input) strcpy((char *)$1, (const char *)$input);&#10;  else $1[0] = 0;&#10;}" id="210" addr="0x7f1a040af550" />
-                <attribute name="method" value="globalin" id="211" addr="0x7f1a040af550" />
+        <typemap id="208" addr="0x7fb6eb3ec470" >
+            <attributelist id="209" addr="0x7fb6eb3ec470" >
+                <attribute name="code" value="{&#10;  if ($input) strcpy((char *)$1, (const char *)$input);&#10;  else $1[0] = 0;&#10;}" id="210" addr="0x7fb6eb3f6550" />
+                <attribute name="method" value="globalin" id="211" addr="0x7fb6eb3f6550" />
             </attributelist >
 
-            <typemapitem id="212" addr="0x7f1a040a53b0" >
-                <attributelist id="213" addr="0x7f1a040a53b0" >
-                    <parmlist id="214" addr="0x7f1a040a53f0" >
+            <typemapitem id="212" addr="0x7fb6eb3ec3b0" >
+                <attributelist id="213" addr="0x7fb6eb3ec3b0" >
+                    <parmlist id="214" addr="0x7fb6eb3ec3f0" >
                         <parm id="215">
-                            <attributelist id="216" addr="0x7f1a040a53f0" >
-                                <attribute name="type" value="a().char" id="217" addr="0x7f1a040af550" />
+                            <attributelist id="216" addr="0x7fb6eb3ec3f0" >
+                                <attribute name="type" value="a().char" id="217" addr="0x7fb6eb3f6550" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -381,18 +381,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="218" addr="0x7f1a040a5690" >
-            <attributelist id="219" addr="0x7f1a040a5690" >
-                <attribute name="code" value="{&#10;  size_t ii;&#10;  $1_basetype *b = ($1_basetype *) $1;&#10;  for (ii = 0; ii &lt; (size_t)$1_size; ii++) b[ii] = *(($1_basetype *) $input + ii);&#10;}" id="220" addr="0x7f1a040af550" />
-                <attribute name="method" value="memberin" id="221" addr="0x7f1a040af550" />
+        <typemap id="218" addr="0x7fb6eb3ec690" >
+            <attributelist id="219" addr="0x7fb6eb3ec690" >
+                <attribute name="code" value="{&#10;  size_t ii;&#10;  $1_basetype *b = ($1_basetype *) $1;&#10;  for (ii = 0; ii &lt; (size_t)$1_size; ii++) b[ii] = *(($1_basetype *) $input + ii);&#10;}" id="220" addr="0x7fb6eb3f6550" />
+                <attribute name="method" value="memberin" id="221" addr="0x7fb6eb3f6550" />
             </attributelist >
 
-            <typemapitem id="222" addr="0x7f1a040a55d0" >
-                <attributelist id="223" addr="0x7f1a040a55d0" >
-                    <parmlist id="224" addr="0x7f1a040a5610" >
+            <typemapitem id="222" addr="0x7fb6eb3ec5d0" >
+                <attributelist id="223" addr="0x7fb6eb3ec5d0" >
+                    <parmlist id="224" addr="0x7fb6eb3ec610" >
                         <parm id="225">
-                            <attributelist id="226" addr="0x7f1a040a5610" >
-                                <attribute name="type" value="a(ANY).SWIGTYPE" id="227" addr="0x7f1a040af550" />
+                            <attributelist id="226" addr="0x7fb6eb3ec610" >
+                                <attribute name="type" value="a(ANY).SWIGTYPE" id="227" addr="0x7fb6eb3f6550" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -400,18 +400,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="228" addr="0x7f1a040a58b0" >
-            <attributelist id="229" addr="0x7f1a040a58b0" >
-                <attribute name="code" value="{&#10;  size_t ii;&#10;  $1_basetype *b = ($1_basetype *) $1;&#10;  for (ii = 0; ii &lt; (size_t)$1_size; ii++) b[ii] = *(($1_basetype *) $input + ii);&#10;}" id="230" addr="0x7f1a040af550" />
-                <attribute name="method" value="globalin" id="231" addr="0x7f1a040af550" />
+        <typemap id="228" addr="0x7fb6eb3ec8b0" >
+            <attributelist id="229" addr="0x7fb6eb3ec8b0" >
+                <attribute name="code" value="{&#10;  size_t ii;&#10;  $1_basetype *b = ($1_basetype *) $1;&#10;  for (ii = 0; ii &lt; (size_t)$1_size; ii++) b[ii] = *(($1_basetype *) $input + ii);&#10;}" id="230" addr="0x7fb6eb3f6550" />
+                <attribute name="method" value="globalin" id="231" addr="0x7fb6eb3f6550" />
             </attributelist >
 
-            <typemapitem id="232" addr="0x7f1a040a57f0" >
-                <attributelist id="233" addr="0x7f1a040a57f0" >
-                    <parmlist id="234" addr="0x7f1a040a5830" >
+            <typemapitem id="232" addr="0x7fb6eb3ec7f0" >
+                <attributelist id="233" addr="0x7fb6eb3ec7f0" >
+                    <parmlist id="234" addr="0x7fb6eb3ec830" >
                         <parm id="235">
-                            <attributelist id="236" addr="0x7f1a040a5830" >
-                                <attribute name="type" value="a(ANY).SWIGTYPE" id="237" addr="0x7f1a040af550" />
+                            <attributelist id="236" addr="0x7fb6eb3ec830" >
+                                <attribute name="type" value="a(ANY).SWIGTYPE" id="237" addr="0x7fb6eb3f6550" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -419,18 +419,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="238" addr="0x7f1a040a5b10" >
-            <attributelist id="239" addr="0x7f1a040a5b10" >
-                <attribute name="code" value="{&#10;  $basetype (*inp)[$1_dim1] = ($basetype (*)[$1_dim1])($input);&#10;  $basetype (*dest)[$1_dim1] = ($basetype (*)[$1_dim1])($1);&#10;  size_t ii = 0;&#10;  for (; ii &lt; $1_dim0; ++ii) {&#10;    $basetype *ip = inp[ii];&#10;    $basetype *dp = dest[ii];&#10;    size_t jj = 0;&#10;    for (; jj &lt; $1_dim1; ++jj) dp[jj] = ip[jj];&#10;  }&#10;}" id="240" addr="0x7f1a040af550" />
-                <attribute name="method" value="memberin" id="241" addr="0x7f1a040af550" />
+        <typemap id="238" addr="0x7fb6eb3ecb10" >
+            <attributelist id="239" addr="0x7fb6eb3ecb10" >
+                <attribute name="code" value="{&#10;  $basetype (*inp)[$1_dim1] = ($basetype (*)[$1_dim1])($input);&#10;  $basetype (*dest)[$1_dim1] = ($basetype (*)[$1_dim1])($1);&#10;  size_t ii = 0;&#10;  for (; ii &lt; $1_dim0; ++ii) {&#10;    $basetype *ip = inp[ii];&#10;    $basetype *dp = dest[ii];&#10;    size_t jj = 0;&#10;    for (; jj &lt; $1_dim1; ++jj) dp[jj] = ip[jj];&#10;  }&#10;}" id="240" addr="0x7fb6eb3f6550" />
+                <attribute name="method" value="memberin" id="241" addr="0x7fb6eb3f6550" />
             </attributelist >
 
-            <typemapitem id="242" addr="0x7f1a040a59f0" >
-                <attributelist id="243" addr="0x7f1a040a59f0" >
-                    <parmlist id="244" addr="0x7f1a040a5a90" >
+            <typemapitem id="242" addr="0x7fb6eb3ec9f0" >
+                <attributelist id="243" addr="0x7fb6eb3ec9f0" >
+                    <parmlist id="244" addr="0x7fb6eb3eca90" >
                         <parm id="245">
-                            <attributelist id="246" addr="0x7f1a040a5a90" >
-                                <attribute name="type" value="a(ANY).a(ANY).SWIGTYPE" id="247" addr="0x7f1a040af550" />
+                            <attributelist id="246" addr="0x7fb6eb3eca90" >
+                                <attribute name="type" value="a(ANY).a(ANY).SWIGTYPE" id="247" addr="0x7fb6eb3f6550" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -438,18 +438,18 @@
              
             </typemapitem >
         </typemap >
-        <typemap id="248" addr="0x7f1a040a5d70" >
-            <attributelist id="249" addr="0x7f1a040a5d70" >
-                <attribute name="code" value="{&#10;  $basetype (*inp)[$1_dim1] = ($basetype (*)[$1_dim1])($input);&#10;  $basetype (*dest)[$1_dim1] = ($basetype (*)[$1_dim1])($1);&#10;  size_t ii = 0;&#10;  for (; ii &lt; $1_dim0; ++ii) {&#10;    $basetype *ip = inp[ii];&#10;    $basetype *dp = dest[ii];&#10;    size_t jj = 0;&#10;    for (; jj &lt; $1_dim1; ++jj) dp[jj] = ip[jj];&#10;  }&#10;}" id="250" addr="0x7f1a040af550" />
-                <attribute name="method" value="globalin" id="251" addr="0x7f1a040af550" />
+        <typemap id="248" addr="0x7fb6eb3ecd70" >
+            <attributelist id="249" addr="0x7fb6eb3ecd70" >
+                <attribute name="code" value="{&#10;  $basetype (*inp)[$1_dim1] = ($basetype (*)[$1_dim1])($input);&#10;  $basetype (*dest)[$1_dim1] = ($basetype (*)[$1_dim1])($1);&#10;  size_t ii = 0;&#10;  for (; ii &lt; $1_dim0; ++ii) {&#10;    $basetype *ip = inp[ii];&#10;    $basetype *dp = dest[ii];&#10;    size_t jj = 0;&#10;    for (; jj &lt; $1_dim1; ++jj) dp[jj] = ip[jj];&#10;  }&#10;}" id="250" addr="0x7fb6eb3f6550" />
+                <attribute name="method" value="globalin" id="251" addr="0x7fb6eb3f6550" />
             </attributelist >
 
-            <typemapitem id="252" addr="0x7f1a040a5c50" >
-                <attributelist id="253" addr="0x7f1a040a5c50" >
-                    <parmlist id="254" addr="0x7f1a040a5cf0" >
+            <typemapitem id="252" addr="0x7fb6eb3ecc50" >
+                <attributelist id="253" addr="0x7fb6eb3ecc50" >
+                    <parmlist id="254" addr="0x7fb6eb3eccf0" >
                         <parm id="255">
-                            <attributelist id="256" addr="0x7f1a040a5cf0" >
-                                <attribute name="type" value="a(ANY).a(ANY).SWIGTYPE" id="257" addr="0x7f1a040af550" />
+                            <attributelist id="256" addr="0x7fb6eb3eccf0" >
+                                <attribute name="type" value="a(ANY).a(ANY).SWIGTYPE" id="257" addr="0x7fb6eb3f6550" />
                             </attributelist >
                         </parm >
                     </parmlist >
@@ -457,513 +457,513 @@
              
             </typemapitem >
         </typemap >
-        <insert id="258" addr="0x7f1a040a5e30" >
-            <attributelist id="259" addr="0x7f1a040a5e30" >
-                <attribute name="code" value="&#10;#ifdef __cplusplus&#10;/* SwigValueWrapper is described in swig.swg */&#10;template&lt;typename T> class SwigValueWrapper {&#10;  struct SwigMovePointer {&#10;    T *ptr;&#10;    SwigMovePointer(T *p) : ptr(p) { }&#10;    ~SwigMovePointer() { delete ptr; }&#10;    SwigMovePointer&amp; operator=(SwigMovePointer&amp; rhs) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = rhs.ptr; rhs.ptr = 0; return *this; }&#10;  } pointer;&#10;  SwigValueWrapper&amp; operator=(const SwigValueWrapper&lt;T>&amp; rhs);&#10;  SwigValueWrapper(const SwigValueWrapper&lt;T>&amp; rhs);&#10;public:&#10;  SwigValueWrapper() : pointer(0) { }&#10;  SwigValueWrapper&amp; operator=(const T&amp; t) { SwigMovePointer tmp(new T(t)); pointer = tmp; return *this; }&#10;  operator T&amp;() const { return *pointer.ptr; }&#10;  T *operator&amp;() { return pointer.ptr; }&#10;};" id="260" addr="0x7f1a040af550" />
-                <attribute name="section" value="runtime" id="261" addr="0x7f1a040af550" />
+        <insert id="258" addr="0x7fb6eb3ece30" >
+            <attributelist id="259" addr="0x7fb6eb3ece30" >
+                <attribute name="code" value="&#10;#ifdef __cplusplus&#10;/* SwigValueWrapper is described in swig.swg */&#10;template&lt;typename T> class SwigValueWrapper {&#10;  struct SwigMovePointer {&#10;    T *ptr;&#10;    SwigMovePointer(T *p) : ptr(p) { }&#10;    ~SwigMovePointer() { delete ptr; }&#10;    SwigMovePointer&amp; operator=(SwigMovePointer&amp; rhs) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = rhs.ptr; rhs.ptr = 0; return *this; }&#10;  } pointer;&#10;  SwigValueWrapper&amp; operator=(const SwigValueWrapper&lt;T>&amp; rhs);&#10;  SwigValueWrapper(const SwigValueWrapper&lt;T>&amp; rhs);&#10;public:&#10;  SwigValueWrapper() : pointer(0) { }&#10;  SwigValueWrapper&amp; operator=(const T&amp; t) { SwigMovePointer tmp(new T(t)); pointer = tmp; return *this; }&#10;  operator T&amp;() const { return *pointer.ptr; }&#10;  T *operator&amp;() { return pointer.ptr; }&#10;};" id="260" addr="0x7fb6eb3f6550" />
+                <attribute name="section" value="runtime" id="261" addr="0x7fb6eb3f6550" />
             </attributelist >
          
         </insert >
-        <insert id="262" addr="0x7f1a040a5f10" >
-            <attributelist id="263" addr="0x7f1a040a5f10" >
-                <attribute name="code" value="&#10;template &lt;typename T> T SwigValueInit() {&#10;  return T();&#10;}&#10;#endif&#10;" id="264" addr="0x7f1a040af550" />
-                <attribute name="section" value="runtime" id="265" addr="0x7f1a040af550" />
+        <insert id="262" addr="0x7fb6eb3ecf10" >
+            <attributelist id="263" addr="0x7fb6eb3ecf10" >
+                <attribute name="code" value="&#10;template &lt;typename T> T SwigValueInit() {&#10;  return T();&#10;}&#10;#endif&#10;" id="264" addr="0x7fb6eb3f6550" />
+                <attribute name="section" value="runtime" id="265" addr="0x7fb6eb3f6550" />
             </attributelist >
          
         </insert >
-        <insert id="266" addr="0x7f1a040a5ff0" >
-            <attributelist id="267" addr="0x7f1a040a5ff0" >
-                <attribute name="code" value="/* -----------------------------------------------------------------------------&#10; *  This section contains generic SWIG labels for method/variable&#10; *  declarations/attributes, and other compiler dependent labels.&#10; * ----------------------------------------------------------------------------- */&#10;&#10;/* template workaround for compilers that cannot correctly implement the C++ standard */&#10;#ifndef SWIGTEMPLATEDISAMBIGUATOR&#10;# if defined(__SUNPRO_CC) &amp;&amp; (__SUNPRO_CC &lt;= 0x560)&#10;#  define SWIGTEMPLATEDISAMBIGUATOR template&#10;# elif defined(__HP_aCC)&#10;/* Needed even with `aCC -AA' when `aCC -V' reports HP ANSI C++ B3910B A.03.55 */&#10;/* If we find a maximum version that requires this, the test would be __HP_aCC &lt;= 35500 for A.03.55 */&#10;#  define SWIGTEMPLATEDISAMBIGUATOR template&#10;# else&#10;#  define SWIGTEMPLATEDISAMBIGUATOR&#10;# endif&#10;#endif&#10;&#10;/* inline attribute */&#10;#ifndef SWIGINLINE&#10;# if defined(__cplusplus) || (defined(__GNUC__) &amp;&amp; !defined(__STRICT_ANSI__))&#10;#   define SWIGINLINE inline&#10;# else&#10;#   define SWIGINLINE&#10;# endif&#10;#endif&#10;&#10;/* attribute recognised by some compilers to avoid 'unused' warnings */&#10;#ifndef SWIGUNUSED&#10;# if defined(__GNUC__)&#10;#   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 &amp;&amp; __GNUC_MINOR__ >= 4))&#10;#     define SWIGUNUSED __attribute__ ((__unused__))&#10;#   else&#10;#     define SWIGUNUSED&#10;#   endif&#10;# elif defined(__ICC)&#10;#   define SWIGUNUSED __attribute__ ((__unused__))&#10;# else&#10;#   define SWIGUNUSED&#10;# endif&#10;#endif&#10;&#10;#ifndef SWIG_MSC_UNSUPPRESS_4505&#10;# if defined(_MSC_VER)&#10;#   pragma warning(disable : 4505) /* unreferenced local function has been removed */&#10;# endif&#10;#endif&#10;&#10;#ifndef SWIGUNUSEDPARM&#10;# ifdef __cplusplus&#10;#   define SWIGUNUSEDPARM(p)&#10;# else&#10;#   define SWIGUNUSEDPARM(p) p SWIGUNUSED&#10;# endif&#10;#endif&#10;&#10;/* internal SWIG method */&#10;#ifndef SWIGINTERN&#10;# define SWIGINTERN static SWIGUNUSED&#10;#endif&#10;&#10;/* internal inline SWIG method */&#10;#ifndef SWIGINTERNINLINE&#10;# define SWIGINTERNINLINE SWIGINTERN SWIGINLINE&#10;#endif&#10;&#10;/* exporting methods */&#10;#if defined(__GNUC__)&#10;#  if (__GNUC__ >= 4) || (__GNUC__ == 3 &amp;&amp; __GNUC_MINOR__ >= 4)&#10;#    ifndef GCC_HASCLASSVISIBILITY&#10;#      define GCC_HASCLASSVISIBILITY&#10;#    endif&#10;#  endif&#10;#endif&#10;&#10;#ifndef SWIGEXPORT&#10;# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)&#10;#   if defined(STATIC_LINKED)&#10;#     define SWIGEXPORT&#10;#   else&#10;#     define SWIGEXPORT __declspec(dllexport)&#10;#   endif&#10;# else&#10;#   if defined(__GNUC__) &amp;&amp; defined(GCC_HASCLASSVISIBILITY)&#10;#     define SWIGEXPORT __attribute__ ((visibility(&quot;default&quot;)))&#10;#   else&#10;#     define SWIGEXPORT&#10;#   endif&#10;# endif&#10;#endif&#10;&#10;/* calling conventions for Windows */&#10;#ifndef SWIGSTDCALL&#10;# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)&#10;#   define SWIGSTDCALL __stdcall&#10;# else&#10;#   define SWIGSTDCALL&#10;# endif&#10;#endif&#10;&#10;/* Deal with Microsoft's attempt at deprecating C standard runtime functions */&#10;#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) &amp;&amp; defined(_MSC_VER) &amp;&amp; !defined(_CRT_SECURE_NO_DEPRECATE)&#10;# define _CRT_SECURE_NO_DEPRECATE&#10;#endif&#10;&#10;/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */&#10;#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) &amp;&amp; defined(_MSC_VER) &amp;&amp; !defined(_SCL_SECURE_NO_DEPRECATE)&#10;# define _SCL_SECURE_NO_DEPRECATE&#10;#endif&#10;&#10;/* Deal with Apple's deprecated 'AssertMacros.h' from Carbon-framework */&#10;#if defined(__APPLE__) &amp;&amp; !defined(__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES)&#10;# define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0&#10;#endif&#10;&#10;/* Intel's compiler complains if a variable which was never initialised is&#10; * cast to void, which is a common idiom which we use to indicate that we&#10; * are aware a variable isn't used.  So we just silence that warning.&#10; * See: https://github.com/swig/swig/issues/192 for more discussion.&#10; */&#10;#ifdef __INTEL_COMPILER&#10;# pragma warning disable 592&#10;#endif&#10;" id="268" addr="0x7f1a040af550" />
-                <attribute name="section" value="runtime" id="269" addr="0x7f1a040af550" />
+        <insert id="266" addr="0x7fb6eb3ecff0" >
+            <attributelist id="267" addr="0x7fb6eb3ecff0" >
+                <attribute name="code" value="/* -----------------------------------------------------------------------------&#10; *  This section contains generic SWIG labels for method/variable&#10; *  declarations/attributes, and other compiler dependent labels.&#10; * ----------------------------------------------------------------------------- */&#10;&#10;/* template workaround for compilers that cannot correctly implement the C++ standard */&#10;#ifndef SWIGTEMPLATEDISAMBIGUATOR&#10;# if defined(__SUNPRO_CC) &amp;&amp; (__SUNPRO_CC &lt;= 0x560)&#10;#  define SWIGTEMPLATEDISAMBIGUATOR template&#10;# elif defined(__HP_aCC)&#10;/* Needed even with `aCC -AA' when `aCC -V' reports HP ANSI C++ B3910B A.03.55 */&#10;/* If we find a maximum version that requires this, the test would be __HP_aCC &lt;= 35500 for A.03.55 */&#10;#  define SWIGTEMPLATEDISAMBIGUATOR template&#10;# else&#10;#  define SWIGTEMPLATEDISAMBIGUATOR&#10;# endif&#10;#endif&#10;&#10;/* inline attribute */&#10;#ifndef SWIGINLINE&#10;# if defined(__cplusplus) || (defined(__GNUC__) &amp;&amp; !defined(__STRICT_ANSI__))&#10;#   define SWIGINLINE inline&#10;# else&#10;#   define SWIGINLINE&#10;# endif&#10;#endif&#10;&#10;/* attribute recognised by some compilers to avoid 'unused' warnings */&#10;#ifndef SWIGUNUSED&#10;# if defined(__GNUC__)&#10;#   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 &amp;&amp; __GNUC_MINOR__ >= 4))&#10;#     define SWIGUNUSED __attribute__ ((__unused__))&#10;#   else&#10;#     define SWIGUNUSED&#10;#   endif&#10;# elif defined(__ICC)&#10;#   define SWIGUNUSED __attribute__ ((__unused__))&#10;# else&#10;#   define SWIGUNUSED&#10;# endif&#10;#endif&#10;&#10;#ifndef SWIG_MSC_UNSUPPRESS_4505&#10;# if defined(_MSC_VER)&#10;#   pragma warning(disable : 4505) /* unreferenced local function has been removed */&#10;# endif&#10;#endif&#10;&#10;#ifndef SWIGUNUSEDPARM&#10;# ifdef __cplusplus&#10;#   define SWIGUNUSEDPARM(p)&#10;# else&#10;#   define SWIGUNUSEDPARM(p) p SWIGUNUSED&#10;# endif&#10;#endif&#10;&#10;/* internal SWIG method */&#10;#ifndef SWIGINTERN&#10;# define SWIGINTERN static SWIGUNUSED&#10;#endif&#10;&#10;/* internal inline SWIG method */&#10;#ifndef SWIGINTERNINLINE&#10;# define SWIGINTERNINLINE SWIGINTERN SWIGINLINE&#10;#endif&#10;&#10;/* exporting methods */&#10;#if defined(__GNUC__)&#10;#  if (__GNUC__ >= 4) || (__GNUC__ == 3 &amp;&amp; __GNUC_MINOR__ >= 4)&#10;#    ifndef GCC_HASCLASSVISIBILITY&#10;#      define GCC_HASCLASSVISIBILITY&#10;#    endif&#10;#  endif&#10;#endif&#10;&#10;#ifndef SWIGEXPORT&#10;# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)&#10;#   if defined(STATIC_LINKED)&#10;#     define SWIGEXPORT&#10;#   else&#10;#     define SWIGEXPORT __declspec(dllexport)&#10;#   endif&#10;# else&#10;#   if defined(__GNUC__) &amp;&amp; defined(GCC_HASCLASSVISIBILITY)&#10;#     define SWIGEXPORT __attribute__ ((visibility(&quot;default&quot;)))&#10;#   else&#10;#     define SWIGEXPORT&#10;#   endif&#10;# endif&#10;#endif&#10;&#10;/* calling conventions for Windows */&#10;#ifndef SWIGSTDCALL&#10;# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)&#10;#   define SWIGSTDCALL __stdcall&#10;# else&#10;#   define SWIGSTDCALL&#10;# endif&#10;#endif&#10;&#10;/* Deal with Microsoft's attempt at deprecating C standard runtime functions */&#10;#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) &amp;&amp; defined(_MSC_VER) &amp;&amp; !defined(_CRT_SECURE_NO_DEPRECATE)&#10;# define _CRT_SECURE_NO_DEPRECATE&#10;#endif&#10;&#10;/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */&#10;#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) &amp;&amp; defined(_MSC_VER) &amp;&amp; !defined(_SCL_SECURE_NO_DEPRECATE)&#10;# define _SCL_SECURE_NO_DEPRECATE&#10;#endif&#10;&#10;/* Deal with Apple's deprecated 'AssertMacros.h' from Carbon-framework */&#10;#if defined(__APPLE__) &amp;&amp; !defined(__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES)&#10;# define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0&#10;#endif&#10;&#10;/* Intel's compiler complains if a variable which was never initialised is&#10; * cast to void, which is a common idiom which we use to indicate that we&#10; * are aware a variable isn't used.  So we just silence that warning.&#10; * See: https://github.com/swig/swig/issues/192 for more discussion.&#10; */&#10;#ifdef __INTEL_COMPILER&#10;# pragma warning disable 592&#10;#endif&#10;" id="268" addr="0x7fb6eb3f6550" />
+                <attribute name="section" value="runtime" id="269" addr="0x7fb6eb3f6550" />
             </attributelist >
          
         </insert >
     </include >
-    <include id="270" addr="0x7f1a040a6170" >
-        <attributelist id="271" addr="0x7f1a040a6170" >
-            <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmcwsgi.i" id="272" addr="0x7f1a040af550" />
-            <attribute name="module" value="" id="273" addr="0x7f1a040a62d0" />
-            <attribute name="options" value="0x7f1a040a60f0" id="274" addr="0x7f1a040a60f0" />
+    <include id="270" addr="0x7fb6eb3ed170" >
+        <attributelist id="271" addr="0x7fb6eb3ed170" >
+            <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/swig/../swig/AddonModuleXbmcwsgi.i" id="272" addr="0x7fb6eb3f6550" />
+            <attribute name="module" value="" id="273" addr="0x7fb6eb3ed2d0" />
+            <attribute name="options" value="0x7fb6eb3ed0f0" id="274" addr="0x7fb6eb3ed0f0" />
         </attributelist >
 
-        <insert id="275" addr="0x7f1a040a6210" >
-            <attributelist id="276" addr="0x7f1a040a6210" >
-                <attribute name="code" value="&#10;#if defined(TARGET_WINDOWS)&#10;#  include &lt;windows.h>&#10;#endif&#10;&#10;#ifdef HAS_WEB_SERVER&#10;" id="277" addr="0x7f1a040af550" />
-                <attribute name="section" value="begin" id="278" addr="0x7f1a040af550" />
+        <insert id="275" addr="0x7fb6eb3ed210" >
+            <attributelist id="276" addr="0x7fb6eb3ed210" >
+                <attribute name="code" value="&#10;#if defined(TARGET_WINDOWS)&#10;#  include &lt;windows.h>&#10;#endif&#10;&#10;#ifdef HAS_WEB_SERVER&#10;" id="277" addr="0x7fb6eb3f6550" />
+                <attribute name="section" value="begin" id="278" addr="0x7fb6eb3f6550" />
             </attributelist >
          
         </insert >
-        <module id="279" addr="0x7f1a040a6270" >
-            <attributelist id="280" addr="0x7f1a040a6270" >
-                <attribute name="name" value="xbmcwsgi" id="281" addr="0x7f1a040af550" />
+        <module id="279" addr="0x7fb6eb3ed270" >
+            <attributelist id="280" addr="0x7fb6eb3ed270" >
+                <attribute name="name" value="xbmcwsgi" id="281" addr="0x7fb6eb3f6550" />
             </attributelist >
          
         </module >
-        <insert id="282" addr="0x7f1a040a6310" >
-            <attributelist id="283" addr="0x7f1a040a6310" >
-                <attribute name="code" value="&#10;#include &quot;interfaces/legacy/wsgi/WsgiErrorStream.h&quot;&#10;#include &quot;interfaces/legacy/wsgi/WsgiInputStream.h&quot;&#10;#include &quot;interfaces/legacy/wsgi/WsgiResponse.h&quot;&#10;#include &quot;interfaces/legacy/wsgi/WsgiResponseBody.h&quot;&#10;&#10;using namespace XBMCAddon;&#10;using namespace xbmcwsgi;&#10;&#10;#if defined(__GNUG__)&#10;#pragma GCC diagnostic ignored &quot;-Wstrict-aliasing&quot;&#10;#endif&#10;&#10;" id="284" addr="0x7f1a040af550" />
+        <insert id="282" addr="0x7fb6eb3ed310" >
+            <attributelist id="283" addr="0x7fb6eb3ed310" >
+                <attribute name="code" value="&#10;#include &quot;interfaces/legacy/wsgi/WsgiErrorStream.h&quot;&#10;#include &quot;interfaces/legacy/wsgi/WsgiInputStream.h&quot;&#10;#include &quot;interfaces/legacy/wsgi/WsgiResponse.h&quot;&#10;#include &quot;interfaces/legacy/wsgi/WsgiResponseBody.h&quot;&#10;&#10;using namespace XBMCAddon;&#10;using namespace xbmcwsgi;&#10;&#10;#if defined(__GNUG__)&#10;#pragma GCC diagnostic ignored &quot;-Wstrict-aliasing&quot;&#10;#endif&#10;&#10;" id="284" addr="0x7fb6eb3f6550" />
             </attributelist >
          
         </insert >
-        <include id="285" addr="0x7f1a040a6830" >
-            <attributelist id="286" addr="0x7f1a040a6830" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/swighelper.h" id="287" addr="0x7f1a040af550" />
+        <include id="285" addr="0x7fb6eb3ed830" >
+            <attributelist id="286" addr="0x7fb6eb3ed830" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/swighelper.h" id="287" addr="0x7fb6eb3f6550" />
             </attributelist >
          
         </include >
-        <include id="288" addr="0x7f1a040a68b0" >
-            <attributelist id="289" addr="0x7f1a040a68b0" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/AddonString.h" id="290" addr="0x7f1a040af550" />
+        <include id="288" addr="0x7fb6eb3ed8b0" >
+            <attributelist id="289" addr="0x7fb6eb3ed8b0" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/AddonString.h" id="290" addr="0x7fb6eb3f6550" />
             </attributelist >
 
-            <namespace id="291" addr="0x7f1a040a69f0" >
-                <attributelist id="292" addr="0x7f1a040a69f0" >
-                    <attribute name="sym_name" value="XBMCAddon" id="293" addr="0x7f1a040af550" />
-                    <attribute name="name" value="XBMCAddon" id="294" addr="0x7f1a040af550" />
-                    <attribute name="csym_nextSibling" value="0x7f1a040a70d0" id="295" addr="0x7f1a040a70d0" />
-                    <attribute name="sym_nextSibling" value="0x7f1a040a70d0" id="296" addr="0x7f1a040a70d0" />
-                    <typescope id="297" addr="0x7f1a040ac650" >
-                        <attributelist id="298" addr="0x7f1a040ac650" >
-                            <attribute name="name" value="XBMCAddon" id="299" addr="0x7f1a040af550" />
-                            <typetab id="300" addr="0x7f1a040ac690" >
-                                <attributelist id="301" addr="0x7f1a040ac690" >
-                                    <attribute name="String" value="std::string" id="302" addr="0x7f1a040af550" />
+            <namespace id="291" addr="0x7fb6eb3ed9f0" >
+                <attributelist id="292" addr="0x7fb6eb3ed9f0" >
+                    <attribute name="sym_name" value="XBMCAddon" id="293" addr="0x7fb6eb3f6550" />
+                    <attribute name="name" value="XBMCAddon" id="294" addr="0x7fb6eb3f6550" />
+                    <attribute name="csym_nextSibling" value="0x7fb6eb3ee0d0" id="295" addr="0x7fb6eb3ee0d0" />
+                    <attribute name="sym_nextSibling" value="0x7fb6eb3ee0d0" id="296" addr="0x7fb6eb3ee0d0" />
+                    <typescope id="297" addr="0x7fb6eb3f3650" >
+                        <attributelist id="298" addr="0x7fb6eb3f3650" >
+                            <attribute name="name" value="XBMCAddon" id="299" addr="0x7fb6eb3f6550" />
+                            <typetab id="300" addr="0x7fb6eb3f3690" >
+                                <attributelist id="301" addr="0x7fb6eb3f3690" >
+                                    <attribute name="String" value="std::string" id="302" addr="0x7fb6eb3f6550" />
                                 </attributelist >
-                                <typetabsitem id="303" addr="0x7f1a040ac870" >
-                                    <attributelist id="304" addr="0x7f1a040ac870" >
+                                <typetabsitem id="303" addr="0x7fb6eb3f3870" >
+                                    <attributelist id="304" addr="0x7fb6eb3f3870" >
                                     </attributelist >
                                 </typetabsitem >
                             </typetab >
-                            <attribute name="parent" value="0x7f1a0408fa30" id="305" addr="0x7f1a0408fa30" />
-                            <attribute name="qname" value="XBMCAddon" id="306" addr="0x7f1a040af550" />
-                            <attribute name="symtab" value="0x7f1a040a6950" id="307" addr="0x7f1a040a6950" />
+                            <attribute name="parent" value="0x7fb6eb3d6a30" id="305" addr="0x7fb6eb3d6a30" />
+                            <attribute name="qname" value="XBMCAddon" id="306" addr="0x7fb6eb3f6550" />
+                            <attribute name="symtab" value="0x7fb6eb3ed950" id="307" addr="0x7fb6eb3ed950" />
                         </attributelist >
-                        <typescopesitem id="308" addr="0x7f1a040a6910" >
-                            <attributelist id="309" addr="0x7f1a040a6910" >
+                        <typescopesitem id="308" addr="0x7fb6eb3ed910" >
+                            <attributelist id="309" addr="0x7fb6eb3ed910" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="310" addr="0x7f1a040ac690" >
-                            <attributelist id="311" addr="0x7f1a040ac690" >
-                                <attribute name="String" value="std::string" id="312" addr="0x7f1a040af550" />
+                        <typescopesitem id="310" addr="0x7fb6eb3f3690" >
+                            <attributelist id="311" addr="0x7fb6eb3f3690" >
+                                <attribute name="String" value="std::string" id="312" addr="0x7fb6eb3f6550" />
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="313" addr="0x7f1a0408fa30" >
-                            <attributelist id="314" addr="0x7f1a0408fa30" >
-                                <attribute name="name" value="" id="315" addr="0x7f1a040af550" />
-                                <typetab id="316" addr="0x7f1a0408fa90" >
-                                    <attributelist id="317" addr="0x7f1a0408fa90" >
-                                        <attribute name="HTTPPythonRequest" value="HTTPPythonRequest" id="318" addr="0x7f1a040af550" />
+                        <typescopesitem id="313" addr="0x7fb6eb3d6a30" >
+                            <attributelist id="314" addr="0x7fb6eb3d6a30" >
+                                <attribute name="name" value="" id="315" addr="0x7fb6eb3f6550" />
+                                <typetab id="316" addr="0x7fb6eb3d6a90" >
+                                    <attributelist id="317" addr="0x7fb6eb3d6a90" >
+                                        <attribute name="HTTPPythonRequest" value="HTTPPythonRequest" id="318" addr="0x7fb6eb3f6550" />
                                     </attributelist >
-                                    <typetabsitem id="319" addr="0x7f1a040ac7b0" >
-                                        <attributelist id="320" addr="0x7f1a040ac7b0" >
+                                    <typetabsitem id="319" addr="0x7fb6eb3f37b0" >
+                                        <attributelist id="320" addr="0x7fb6eb3f37b0" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="321" addr="0x7f1a040ac790" >
-                            <attributelist id="322" addr="0x7f1a040ac790" >
+                        <typescopesitem id="321" addr="0x7fb6eb3f3790" >
+                            <attributelist id="322" addr="0x7fb6eb3f3790" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="323" addr="0x7f1a040a6950" >
-                            <attributelist id="324" addr="0x7f1a040a6950" >
-                                <attribute name="name" value="XBMCAddon" id="325" addr="0x7f1a040af550" />
-                                <attribute name="csymtab" value="0x7f1a040a6990" id="326" addr="0x7f1a040a6990" />
-                                <attribute name="symtab" value="0x7f1a040a6930" id="327" addr="0x7f1a040a6930" />
+                        <typescopesitem id="323" addr="0x7fb6eb3ed950" >
+                            <attributelist id="324" addr="0x7fb6eb3ed950" >
+                                <attribute name="name" value="XBMCAddon" id="325" addr="0x7fb6eb3f6550" />
+                                <attribute name="csymtab" value="0x7fb6eb3ed990" id="326" addr="0x7fb6eb3ed990" />
+                                <attribute name="symtab" value="0x7fb6eb3ed930" id="327" addr="0x7fb6eb3ed930" />
                             </attributelist >
                         </typescopesitem >
                     </typescope >
-                    <attribute name="symtab" value="0x7f1a040a6950" id="328" addr="0x7f1a040a6950" />
-                    <attribute name="sym_symtab" value="0x7f1a0408f950" id="329" addr="0x7f1a0408f950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="330" addr="0x7f1a040af550" />
+                    <attribute name="symtab" value="0x7fb6eb3ed950" id="328" addr="0x7fb6eb3ed950" />
+                    <attribute name="sym_symtab" value="0x7fb6eb3d6950" id="329" addr="0x7fb6eb3d6950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="330" addr="0x7fb6eb3f6550" />
                 </attributelist >
 
-                <cdecl id="331" addr="0x7f1a040a6b10" >
-                    <attributelist id="332" addr="0x7f1a040a6b10" >
-                        <attribute name="sym_name" value="String" id="333" addr="0x7f1a040af550" />
-                        <attribute name="name" value="XBMCAddon::String" id="334" addr="0x7f1a040af550" />
-                        <attribute name="decl" value="" id="335" addr="0x7f1a040af550" />
-                        <attribute name="storage" value="typedef" id="336" addr="0x7f1a040af550" />
-                        <attribute name="kind" value="typedef" id="337" addr="0x7f1a040af550" />
-                        <attribute name="type" value="std::string" id="338" addr="0x7f1a040af550" />
-                        <attribute name="sym_symtab" value="0x7f1a040a6950" id="339" addr="0x7f1a040a6950" />
-                        <attribute name="sym_overname" value="__SWIG_0" id="340" addr="0x7f1a040af550" />
+                <cdecl id="331" addr="0x7fb6eb3edb10" >
+                    <attributelist id="332" addr="0x7fb6eb3edb10" >
+                        <attribute name="sym_name" value="String" id="333" addr="0x7fb6eb3f6550" />
+                        <attribute name="name" value="XBMCAddon::String" id="334" addr="0x7fb6eb3f6550" />
+                        <attribute name="decl" value="" id="335" addr="0x7fb6eb3f6550" />
+                        <attribute name="storage" value="typedef" id="336" addr="0x7fb6eb3f6550" />
+                        <attribute name="kind" value="typedef" id="337" addr="0x7fb6eb3f6550" />
+                        <attribute name="type" value="std::string" id="338" addr="0x7fb6eb3f6550" />
+                        <attribute name="sym_symtab" value="0x7fb6eb3ed950" id="339" addr="0x7fb6eb3ed950" />
+                        <attribute name="sym_overname" value="__SWIG_0" id="340" addr="0x7fb6eb3f6550" />
                     </attributelist >
                  
                 </cdecl >
-                <cdecl id="341" addr="0x7f1a040a6d10" >
-                    <attributelist id="342" addr="0x7f1a040a6d10" >
-                        <attribute name="sym_name" value="emptyString" id="343" addr="0x7f1a040af550" />
-                        <attribute name="name" value="XBMCAddon::emptyString" id="344" addr="0x7f1a040af550" />
-                        <attribute name="decl" value="" id="345" addr="0x7f1a040af550" />
-                        <attribute name="storage" value="extern" id="346" addr="0x7f1a040af550" />
-                        <attribute name="kind" value="variable" id="347" addr="0x7f1a040af550" />
-                        <attribute name="type" value="XBMCAddon::String" id="348" addr="0x7f1a040af550" />
-                        <attribute name="sym_symtab" value="0x7f1a040a6950" id="349" addr="0x7f1a040a6950" />
-                        <attribute name="sym_overname" value="__SWIG_0" id="350" addr="0x7f1a040af550" />
+                <cdecl id="341" addr="0x7fb6eb3edd10" >
+                    <attributelist id="342" addr="0x7fb6eb3edd10" >
+                        <attribute name="sym_name" value="emptyString" id="343" addr="0x7fb6eb3f6550" />
+                        <attribute name="name" value="XBMCAddon::emptyString" id="344" addr="0x7fb6eb3f6550" />
+                        <attribute name="decl" value="" id="345" addr="0x7fb6eb3f6550" />
+                        <attribute name="storage" value="extern" id="346" addr="0x7fb6eb3f6550" />
+                        <attribute name="kind" value="variable" id="347" addr="0x7fb6eb3f6550" />
+                        <attribute name="type" value="XBMCAddon::String" id="348" addr="0x7fb6eb3f6550" />
+                        <attribute name="sym_symtab" value="0x7fb6eb3ed950" id="349" addr="0x7fb6eb3ed950" />
+                        <attribute name="sym_overname" value="__SWIG_0" id="350" addr="0x7fb6eb3f6550" />
                     </attributelist >
                  
                 </cdecl >
             </namespace >
         </include >
-        <include id="351" addr="0x7f1a040a6ef0" >
-            <attributelist id="352" addr="0x7f1a040a6ef0" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/wsgi/WsgiErrorStream.h" id="353" addr="0x7f1a040af550" />
+        <include id="351" addr="0x7fb6eb3edef0" >
+            <attributelist id="352" addr="0x7fb6eb3edef0" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/wsgi/WsgiErrorStream.h" id="353" addr="0x7fb6eb3f6550" />
             </attributelist >
 
-            <classforward id="354" addr="0x7f1a040a6f90" >
-                <attributelist id="355" addr="0x7f1a040a6f90" >
-                    <attribute name="sym_name" value="HTTPPythonRequest" id="356" addr="0x7f1a040af550" />
-                    <attribute name="name" value="HTTPPythonRequest" id="357" addr="0x7f1a040af550" />
-                    <attribute name="kind" value="struct" id="358" addr="0x7f1a040af550" />
-                    <attribute name="sym_weak" value="1" id="359" addr="0x7f1a040af550" />
-                    <attribute name="sym_symtab" value="0x7f1a0408f950" id="360" addr="0x7f1a0408f950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="361" addr="0x7f1a040af550" />
+            <classforward id="354" addr="0x7fb6eb3edf90" >
+                <attributelist id="355" addr="0x7fb6eb3edf90" >
+                    <attribute name="sym_name" value="HTTPPythonRequest" id="356" addr="0x7fb6eb3f6550" />
+                    <attribute name="name" value="HTTPPythonRequest" id="357" addr="0x7fb6eb3f6550" />
+                    <attribute name="kind" value="struct" id="358" addr="0x7fb6eb3f6550" />
+                    <attribute name="sym_weak" value="1" id="359" addr="0x7fb6eb3f6550" />
+                    <attribute name="sym_symtab" value="0x7fb6eb3d6950" id="360" addr="0x7fb6eb3d6950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="361" addr="0x7fb6eb3f6550" />
                 </attributelist >
              
             </classforward >
-            <namespace id="362" addr="0x7f1a040a70d0" >
-                <attributelist id="363" addr="0x7f1a040a70d0" >
-                    <attribute name="sym_name" value="XBMCAddon" id="364" addr="0x7f1a040af550" />
-                    <attribute name="name" value="XBMCAddon" id="365" addr="0x7f1a040af550" />
-                    <attribute name="sym_previousSibling" value="0x7f1a040a69f0" id="366" addr="0x7f1a040a69f0" />
-                    <attribute name="csym_nextSibling" value="0x7f1a040a8590" id="367" addr="0x7f1a040a8590" />
-                    <attribute name="sym_nextSibling" value="0x7f1a040a8590" id="368" addr="0x7f1a040a8590" />
-                    <typescope id="369" addr="0x7f1a040ac650" >
-                        <attributelist id="370" addr="0x7f1a040ac650" >
-                            <attribute name="name" value="XBMCAddon" id="371" addr="0x7f1a040af550" />
-                            <typetab id="372" addr="0x7f1a040ac690" >
-                                <attributelist id="373" addr="0x7f1a040ac690" >
-                                    <attribute name="String" value="std::string" id="374" addr="0x7f1a040af550" />
+            <namespace id="362" addr="0x7fb6eb3ee0d0" >
+                <attributelist id="363" addr="0x7fb6eb3ee0d0" >
+                    <attribute name="sym_name" value="XBMCAddon" id="364" addr="0x7fb6eb3f6550" />
+                    <attribute name="name" value="XBMCAddon" id="365" addr="0x7fb6eb3f6550" />
+                    <attribute name="sym_previousSibling" value="0x7fb6eb3ed9f0" id="366" addr="0x7fb6eb3ed9f0" />
+                    <attribute name="csym_nextSibling" value="0x7fb6eb3ef590" id="367" addr="0x7fb6eb3ef590" />
+                    <attribute name="sym_nextSibling" value="0x7fb6eb3ef590" id="368" addr="0x7fb6eb3ef590" />
+                    <typescope id="369" addr="0x7fb6eb3f3650" >
+                        <attributelist id="370" addr="0x7fb6eb3f3650" >
+                            <attribute name="name" value="XBMCAddon" id="371" addr="0x7fb6eb3f6550" />
+                            <typetab id="372" addr="0x7fb6eb3f3690" >
+                                <attributelist id="373" addr="0x7fb6eb3f3690" >
+                                    <attribute name="String" value="std::string" id="374" addr="0x7fb6eb3f6550" />
                                 </attributelist >
-                                <typetabsitem id="375" addr="0x7f1a040ac870" >
-                                    <attributelist id="376" addr="0x7f1a040ac870" >
+                                <typetabsitem id="375" addr="0x7fb6eb3f3870" >
+                                    <attributelist id="376" addr="0x7fb6eb3f3870" >
                                     </attributelist >
                                 </typetabsitem >
                             </typetab >
-                            <attribute name="parent" value="0x7f1a0408fa30" id="377" addr="0x7f1a0408fa30" />
-                            <attribute name="qname" value="XBMCAddon" id="378" addr="0x7f1a040af550" />
-                            <attribute name="symtab" value="0x7f1a040a6950" id="379" addr="0x7f1a040a6950" />
+                            <attribute name="parent" value="0x7fb6eb3d6a30" id="377" addr="0x7fb6eb3d6a30" />
+                            <attribute name="qname" value="XBMCAddon" id="378" addr="0x7fb6eb3f6550" />
+                            <attribute name="symtab" value="0x7fb6eb3ed950" id="379" addr="0x7fb6eb3ed950" />
                         </attributelist >
-                        <typescopesitem id="380" addr="0x7f1a040a6910" >
-                            <attributelist id="381" addr="0x7f1a040a6910" >
+                        <typescopesitem id="380" addr="0x7fb6eb3ed910" >
+                            <attributelist id="381" addr="0x7fb6eb3ed910" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="382" addr="0x7f1a040ac690" >
-                            <attributelist id="383" addr="0x7f1a040ac690" >
-                                <attribute name="String" value="std::string" id="384" addr="0x7f1a040af550" />
+                        <typescopesitem id="382" addr="0x7fb6eb3f3690" >
+                            <attributelist id="383" addr="0x7fb6eb3f3690" >
+                                <attribute name="String" value="std::string" id="384" addr="0x7fb6eb3f6550" />
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="385" addr="0x7f1a0408fa30" >
-                            <attributelist id="386" addr="0x7f1a0408fa30" >
-                                <attribute name="name" value="" id="387" addr="0x7f1a040af550" />
-                                <typetab id="388" addr="0x7f1a0408fa90" >
-                                    <attributelist id="389" addr="0x7f1a0408fa90" >
-                                        <attribute name="HTTPPythonRequest" value="HTTPPythonRequest" id="390" addr="0x7f1a040af550" />
+                        <typescopesitem id="385" addr="0x7fb6eb3d6a30" >
+                            <attributelist id="386" addr="0x7fb6eb3d6a30" >
+                                <attribute name="name" value="" id="387" addr="0x7fb6eb3f6550" />
+                                <typetab id="388" addr="0x7fb6eb3d6a90" >
+                                    <attributelist id="389" addr="0x7fb6eb3d6a90" >
+                                        <attribute name="HTTPPythonRequest" value="HTTPPythonRequest" id="390" addr="0x7fb6eb3f6550" />
                                     </attributelist >
-                                    <typetabsitem id="391" addr="0x7f1a040ac7b0" >
-                                        <attributelist id="392" addr="0x7f1a040ac7b0" >
+                                    <typetabsitem id="391" addr="0x7fb6eb3f37b0" >
+                                        <attributelist id="392" addr="0x7fb6eb3f37b0" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="393" addr="0x7f1a040ac790" >
-                            <attributelist id="394" addr="0x7f1a040ac790" >
+                        <typescopesitem id="393" addr="0x7fb6eb3f3790" >
+                            <attributelist id="394" addr="0x7fb6eb3f3790" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="395" addr="0x7f1a040a6950" >
-                            <attributelist id="396" addr="0x7f1a040a6950" >
-                                <attribute name="name" value="XBMCAddon" id="397" addr="0x7f1a040af550" />
-                                <attribute name="csymtab" value="0x7f1a040a6990" id="398" addr="0x7f1a040a6990" />
-                                <attribute name="symtab" value="0x7f1a040a6930" id="399" addr="0x7f1a040a6930" />
+                        <typescopesitem id="395" addr="0x7fb6eb3ed950" >
+                            <attributelist id="396" addr="0x7fb6eb3ed950" >
+                                <attribute name="name" value="XBMCAddon" id="397" addr="0x7fb6eb3f6550" />
+                                <attribute name="csymtab" value="0x7fb6eb3ed990" id="398" addr="0x7fb6eb3ed990" />
+                                <attribute name="symtab" value="0x7fb6eb3ed930" id="399" addr="0x7fb6eb3ed930" />
                             </attributelist >
                         </typescopesitem >
                     </typescope >
-                    <attribute name="symtab" value="0x7f1a040a6950" id="400" addr="0x7f1a040a6950" />
-                    <attribute name="sym_symtab" value="0x7f1a0408f950" id="401" addr="0x7f1a0408f950" />
+                    <attribute name="symtab" value="0x7fb6eb3ed950" id="400" addr="0x7fb6eb3ed950" />
+                    <attribute name="sym_symtab" value="0x7fb6eb3d6950" id="401" addr="0x7fb6eb3d6950" />
                 </attributelist >
 
-                <namespace id="402" addr="0x7f1a040a71f0" >
-                    <attributelist id="403" addr="0x7f1a040a71f0" >
-                        <attribute name="sym_name" value="xbmcwsgi" id="404" addr="0x7f1a040af550" />
-                        <attribute name="name" value="xbmcwsgi" id="405" addr="0x7f1a040af550" />
-                        <attribute name="csym_nextSibling" value="0x7f1a040a8610" id="406" addr="0x7f1a040a8610" />
-                        <attribute name="sym_nextSibling" value="0x7f1a040a8610" id="407" addr="0x7f1a040a8610" />
-                        <typescope id="408" addr="0x7f1a040acab0" >
-                            <attributelist id="409" addr="0x7f1a040acab0" >
-                                <attribute name="name" value="xbmcwsgi" id="410" addr="0x7f1a040af550" />
-                                <typetab id="411" addr="0x7f1a040acad0" >
-                                    <attributelist id="412" addr="0x7f1a040acad0" >
-                                        <attribute name="WsgiInputStreamIterator" value="WsgiInputStreamIterator" id="413" addr="0x7f1a040af550" />
-                                        <attribute name="WsgiHttpHeader" value="Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>" id="414" addr="0x7f1a040af550" />
-                                        <attribute name="WsgiErrorStream" value="WsgiErrorStream" id="415" addr="0x7f1a040af550" />
-                                        <attribute name="WsgiInputStream" value="WsgiInputStream" id="416" addr="0x7f1a040af550" />
-                                        <attribute name="WsgiResponse" value="WsgiResponse" id="417" addr="0x7f1a040af550" />
-                                        <attribute name="WsgiResponseBody" value="WsgiResponseBody" id="418" addr="0x7f1a040af550" />
+                <namespace id="402" addr="0x7fb6eb3ee1f0" >
+                    <attributelist id="403" addr="0x7fb6eb3ee1f0" >
+                        <attribute name="sym_name" value="xbmcwsgi" id="404" addr="0x7fb6eb3f6550" />
+                        <attribute name="name" value="xbmcwsgi" id="405" addr="0x7fb6eb3f6550" />
+                        <attribute name="csym_nextSibling" value="0x7fb6eb3ef610" id="406" addr="0x7fb6eb3ef610" />
+                        <attribute name="sym_nextSibling" value="0x7fb6eb3ef610" id="407" addr="0x7fb6eb3ef610" />
+                        <typescope id="408" addr="0x7fb6eb3f3ab0" >
+                            <attributelist id="409" addr="0x7fb6eb3f3ab0" >
+                                <attribute name="name" value="xbmcwsgi" id="410" addr="0x7fb6eb3f6550" />
+                                <typetab id="411" addr="0x7fb6eb3f3ad0" >
+                                    <attributelist id="412" addr="0x7fb6eb3f3ad0" >
+                                        <attribute name="WsgiInputStreamIterator" value="WsgiInputStreamIterator" id="413" addr="0x7fb6eb3f6550" />
+                                        <attribute name="WsgiHttpHeader" value="Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>" id="414" addr="0x7fb6eb3f6550" />
+                                        <attribute name="WsgiErrorStream" value="WsgiErrorStream" id="415" addr="0x7fb6eb3f6550" />
+                                        <attribute name="WsgiInputStream" value="WsgiInputStream" id="416" addr="0x7fb6eb3f6550" />
+                                        <attribute name="WsgiResponse" value="WsgiResponse" id="417" addr="0x7fb6eb3f6550" />
+                                        <attribute name="WsgiResponseBody" value="WsgiResponseBody" id="418" addr="0x7fb6eb3f6550" />
                                     </attributelist >
-                                    <typetabsitem id="419" addr="0x7f1a040ad450" >
-                                        <attributelist id="420" addr="0x7f1a040ad450" >
+                                    <typetabsitem id="419" addr="0x7fb6eb3f4450" >
+                                        <attributelist id="420" addr="0x7fb6eb3f4450" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="421" addr="0x7f1a040adff0" >
-                                        <attributelist id="422" addr="0x7f1a040adff0" >
+                                    <typetabsitem id="421" addr="0x7fb6eb3f4ff0" >
+                                        <attributelist id="422" addr="0x7fb6eb3f4ff0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="423" addr="0x7f1a040acbb0" >
-                                        <attributelist id="424" addr="0x7f1a040acbb0" >
+                                    <typetabsitem id="423" addr="0x7fb6eb3f3bb0" >
+                                        <attributelist id="424" addr="0x7fb6eb3f3bb0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="425" addr="0x7f1a040ad830" >
-                                        <attributelist id="426" addr="0x7f1a040ad830" >
+                                    <typetabsitem id="425" addr="0x7fb6eb3f4830" >
+                                        <attributelist id="426" addr="0x7fb6eb3f4830" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="427" addr="0x7f1a040ae250" >
-                                        <attributelist id="428" addr="0x7f1a040ae250" >
+                                    <typetabsitem id="427" addr="0x7fb6eb3f5250" >
+                                        <attributelist id="428" addr="0x7fb6eb3f5250" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="429" addr="0x7f1a040aebb0" >
-                                        <attributelist id="430" addr="0x7f1a040aebb0" >
+                                    <typetabsitem id="429" addr="0x7fb6eb3f5bb0" >
+                                        <attributelist id="430" addr="0x7fb6eb3f5bb0" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
-                                <attribute name="parent" value="0x7f1a040ac650" id="431" addr="0x7f1a040ac650" />
-                                <attribute name="qname" value="XBMCAddon::xbmcwsgi" id="432" addr="0x7f1a040af550" />
-                                <attribute name="symtab" value="0x7f1a040a7170" id="433" addr="0x7f1a040a7170" />
+                                <attribute name="parent" value="0x7fb6eb3f3650" id="431" addr="0x7fb6eb3f3650" />
+                                <attribute name="qname" value="XBMCAddon::xbmcwsgi" id="432" addr="0x7fb6eb3f6550" />
+                                <attribute name="symtab" value="0x7fb6eb3ee170" id="433" addr="0x7fb6eb3ee170" />
                             </attributelist >
-                            <typescopesitem id="434" addr="0x7f1a040a7130" >
-                                <attributelist id="435" addr="0x7f1a040a7130" >
+                            <typescopesitem id="434" addr="0x7fb6eb3ee130" >
+                                <attributelist id="435" addr="0x7fb6eb3ee130" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="436" addr="0x7f1a040acad0" >
-                                <attributelist id="437" addr="0x7f1a040acad0" >
-                                    <attribute name="WsgiInputStreamIterator" value="WsgiInputStreamIterator" id="438" addr="0x7f1a040af550" />
-                                    <attribute name="WsgiHttpHeader" value="Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>" id="439" addr="0x7f1a040af550" />
-                                    <attribute name="WsgiErrorStream" value="WsgiErrorStream" id="440" addr="0x7f1a040af550" />
-                                    <attribute name="WsgiInputStream" value="WsgiInputStream" id="441" addr="0x7f1a040af550" />
-                                    <attribute name="WsgiResponse" value="WsgiResponse" id="442" addr="0x7f1a040af550" />
-                                    <attribute name="WsgiResponseBody" value="WsgiResponseBody" id="443" addr="0x7f1a040af550" />
+                            <typescopesitem id="436" addr="0x7fb6eb3f3ad0" >
+                                <attributelist id="437" addr="0x7fb6eb3f3ad0" >
+                                    <attribute name="WsgiInputStreamIterator" value="WsgiInputStreamIterator" id="438" addr="0x7fb6eb3f6550" />
+                                    <attribute name="WsgiHttpHeader" value="Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>" id="439" addr="0x7fb6eb3f6550" />
+                                    <attribute name="WsgiErrorStream" value="WsgiErrorStream" id="440" addr="0x7fb6eb3f6550" />
+                                    <attribute name="WsgiInputStream" value="WsgiInputStream" id="441" addr="0x7fb6eb3f6550" />
+                                    <attribute name="WsgiResponse" value="WsgiResponse" id="442" addr="0x7fb6eb3f6550" />
+                                    <attribute name="WsgiResponseBody" value="WsgiResponseBody" id="443" addr="0x7fb6eb3f6550" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="444" addr="0x7f1a040ac650" >
-                                <attributelist id="445" addr="0x7f1a040ac650" >
-                                    <attribute name="name" value="XBMCAddon" id="446" addr="0x7f1a040af550" />
-                                    <typetab id="447" addr="0x7f1a040ac690" >
-                                        <attributelist id="448" addr="0x7f1a040ac690" >
-                                            <attribute name="String" value="std::string" id="449" addr="0x7f1a040af550" />
+                            <typescopesitem id="444" addr="0x7fb6eb3f3650" >
+                                <attributelist id="445" addr="0x7fb6eb3f3650" >
+                                    <attribute name="name" value="XBMCAddon" id="446" addr="0x7fb6eb3f6550" />
+                                    <typetab id="447" addr="0x7fb6eb3f3690" >
+                                        <attributelist id="448" addr="0x7fb6eb3f3690" >
+                                            <attribute name="String" value="std::string" id="449" addr="0x7fb6eb3f6550" />
                                         </attributelist >
-                                        <typetabsitem id="450" addr="0x7f1a040ac870" >
-                                            <attributelist id="451" addr="0x7f1a040ac870" >
+                                        <typetabsitem id="450" addr="0x7fb6eb3f3870" >
+                                            <attributelist id="451" addr="0x7fb6eb3f3870" >
                                             </attributelist >
                                         </typetabsitem >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f1a0408fa30" id="452" addr="0x7f1a0408fa30" />
-                                    <attribute name="qname" value="XBMCAddon" id="453" addr="0x7f1a040af550" />
-                                    <attribute name="symtab" value="0x7f1a040a6950" id="454" addr="0x7f1a040a6950" />
+                                    <attribute name="parent" value="0x7fb6eb3d6a30" id="452" addr="0x7fb6eb3d6a30" />
+                                    <attribute name="qname" value="XBMCAddon" id="453" addr="0x7fb6eb3f6550" />
+                                    <attribute name="symtab" value="0x7fb6eb3ed950" id="454" addr="0x7fb6eb3ed950" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="455" addr="0x7f1a040acaf0" >
-                                <attributelist id="456" addr="0x7f1a040acaf0" >
+                            <typescopesitem id="455" addr="0x7fb6eb3f3af0" >
+                                <attributelist id="456" addr="0x7fb6eb3f3af0" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="457" addr="0x7f1a040a7170" >
-                                <attributelist id="458" addr="0x7f1a040a7170" >
-                                    <attribute name="name" value="xbmcwsgi" id="459" addr="0x7f1a040af550" />
-                                    <attribute name="csymtab" value="0x7f1a040a71b0" id="460" addr="0x7f1a040a71b0" />
-                                    <attribute name="symtab" value="0x7f1a040a7150" id="461" addr="0x7f1a040a7150" />
+                            <typescopesitem id="457" addr="0x7fb6eb3ee170" >
+                                <attributelist id="458" addr="0x7fb6eb3ee170" >
+                                    <attribute name="name" value="xbmcwsgi" id="459" addr="0x7fb6eb3f6550" />
+                                    <attribute name="csymtab" value="0x7fb6eb3ee1b0" id="460" addr="0x7fb6eb3ee1b0" />
+                                    <attribute name="symtab" value="0x7fb6eb3ee150" id="461" addr="0x7fb6eb3ee150" />
                                 </attributelist >
                             </typescopesitem >
                         </typescope >
-                        <attribute name="symtab" value="0x7f1a040a7170" id="462" addr="0x7f1a040a7170" />
-                        <attribute name="sym_symtab" value="0x7f1a040a6950" id="463" addr="0x7f1a040a6950" />
-                        <attribute name="sym_overname" value="__SWIG_0" id="464" addr="0x7f1a040af550" />
+                        <attribute name="symtab" value="0x7fb6eb3ee170" id="462" addr="0x7fb6eb3ee170" />
+                        <attribute name="sym_symtab" value="0x7fb6eb3ed950" id="463" addr="0x7fb6eb3ed950" />
+                        <attribute name="sym_overname" value="__SWIG_0" id="464" addr="0x7fb6eb3f6550" />
                     </attributelist >
 
-                    <class id="465" addr="0x7f1a040a73f0" >
-                        <attributelist id="466" addr="0x7f1a040a73f0" >
-                            <attribute name="name" value="XBMCAddon::xbmcwsgi::WsgiErrorStream" id="467" addr="0x7f1a040af550" />
-                            <attribute name="sym_symtab" value="0x7f1a040a7170" id="468" addr="0x7f1a040a7170" />
-                            <attribute name="symtab" value="0x7f1a040a7570" id="469" addr="0x7f1a040a7570" />
-                            <attribute name="allows_typedef" value="1" id="470" addr="0x7f1a040af550" />
-                            <attribute name="typepass_visit" value="1" id="471" addr="0x7f1a040af550" />
-                            <attribute name="allocate_visit" value="1" id="472" addr="0x7f1a040af550" />
-                            <attribute name="kind" value="class" id="473" addr="0x7f1a040af550" />
-                            <attribute name="sym_name" value="WsgiErrorStream" id="474" addr="0x7f1a040af550" />
-                            <attribute name="allocate_default_constructor" value="1" id="475" addr="0x7f1a040af550" />
-                            <attribute name="allocate_has_constructor" value="1" id="476" addr="0x7f1a040af550" />
-                            <attribute name="allocate_public_constructor" value="1" id="477" addr="0x7f1a040af550" />
-                            <attribute name="allocate_has_destructor" value="1" id="478" addr="0x7f1a040af550" />
-                            <attribute name="allocate_default_destructor" value="1" id="479" addr="0x7f1a040af550" />
-                            <attribute name="allocate_copy_constructor" value="1" id="480" addr="0x7f1a040af550" />
-                            <attribute name="privatebaselist" value="0x7f1a040a7370" id="481" addr="0x7f1a040a7370" />
-                            <attribute name="protectedbaselist" value="0x7f1a040a7350" id="482" addr="0x7f1a040a7350" />
-                            <baselist id="483" addr="0x7f1a040a7330" >
-                                <base name="AddonClass" id="484" addr="0x7f1a040a7290" />
+                    <class id="465" addr="0x7fb6eb3ee3f0" >
+                        <attributelist id="466" addr="0x7fb6eb3ee3f0" >
+                            <attribute name="name" value="XBMCAddon::xbmcwsgi::WsgiErrorStream" id="467" addr="0x7fb6eb3f6550" />
+                            <attribute name="sym_symtab" value="0x7fb6eb3ee170" id="468" addr="0x7fb6eb3ee170" />
+                            <attribute name="symtab" value="0x7fb6eb3ee570" id="469" addr="0x7fb6eb3ee570" />
+                            <attribute name="allows_typedef" value="1" id="470" addr="0x7fb6eb3f6550" />
+                            <attribute name="typepass_visit" value="1" id="471" addr="0x7fb6eb3f6550" />
+                            <attribute name="allocate_visit" value="1" id="472" addr="0x7fb6eb3f6550" />
+                            <attribute name="kind" value="class" id="473" addr="0x7fb6eb3f6550" />
+                            <attribute name="sym_name" value="WsgiErrorStream" id="474" addr="0x7fb6eb3f6550" />
+                            <attribute name="allocate_default_constructor" value="1" id="475" addr="0x7fb6eb3f6550" />
+                            <attribute name="allocate_has_constructor" value="1" id="476" addr="0x7fb6eb3f6550" />
+                            <attribute name="allocate_public_constructor" value="1" id="477" addr="0x7fb6eb3f6550" />
+                            <attribute name="allocate_has_destructor" value="1" id="478" addr="0x7fb6eb3f6550" />
+                            <attribute name="allocate_default_destructor" value="1" id="479" addr="0x7fb6eb3f6550" />
+                            <attribute name="allocate_copy_constructor" value="1" id="480" addr="0x7fb6eb3f6550" />
+                            <attribute name="privatebaselist" value="0x7fb6eb3ee370" id="481" addr="0x7fb6eb3ee370" />
+                            <attribute name="protectedbaselist" value="0x7fb6eb3ee350" id="482" addr="0x7fb6eb3ee350" />
+                            <baselist id="483" addr="0x7fb6eb3ee330" >
+                                <base name="AddonClass" id="484" addr="0x7fb6eb3ee290" />
                             </baselist >
-                            <attribute name="module" value="xbmcwsgi" id="485" addr="0x7f1a040a6270" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="486" addr="0x7f1a040af550" />
-                            <typescope id="487" addr="0x7f1a040accb0" >
-                                <attributelist id="488" addr="0x7f1a040accb0" >
-                                    <attribute name="name" value="WsgiErrorStream" id="489" addr="0x7f1a040af550" />
-                                    <typetab id="490" addr="0x7f1a040accd0" >
-                                        <attributelist id="491" addr="0x7f1a040accd0" >
+                            <attribute name="module" value="xbmcwsgi" id="485" addr="0x7fb6eb3ed270" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="486" addr="0x7fb6eb3f6550" />
+                            <typescope id="487" addr="0x7fb6eb3f3cb0" >
+                                <attributelist id="488" addr="0x7fb6eb3f3cb0" >
+                                    <attribute name="name" value="WsgiErrorStream" id="489" addr="0x7fb6eb3f6550" />
+                                    <typetab id="490" addr="0x7fb6eb3f3cd0" >
+                                        <attributelist id="491" addr="0x7fb6eb3f3cd0" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f1a040acab0" id="492" addr="0x7f1a040acab0" />
-                                    <attribute name="qname" value="XBMCAddon::xbmcwsgi::WsgiErrorStream" id="493" addr="0x7f1a040af550" />
-                                    <attribute name="symtab" value="0x7f1a040a7570" id="494" addr="0x7f1a040a7570" />
+                                    <attribute name="parent" value="0x7fb6eb3f3ab0" id="492" addr="0x7fb6eb3f3ab0" />
+                                    <attribute name="qname" value="XBMCAddon::xbmcwsgi::WsgiErrorStream" id="493" addr="0x7fb6eb3f6550" />
+                                    <attribute name="symtab" value="0x7fb6eb3ee570" id="494" addr="0x7fb6eb3ee570" />
                                 </attributelist >
-                                <typescopesitem id="495" addr="0x7f1a040acc10" >
-                                    <attributelist id="496" addr="0x7f1a040acc10" >
+                                <typescopesitem id="495" addr="0x7fb6eb3f3c10" >
+                                    <attributelist id="496" addr="0x7fb6eb3f3c10" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="497" addr="0x7f1a040accd0" >
-                                    <attributelist id="498" addr="0x7f1a040accd0" >
+                                <typescopesitem id="497" addr="0x7fb6eb3f3cd0" >
+                                    <attributelist id="498" addr="0x7fb6eb3f3cd0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="499" addr="0x7f1a040acab0" >
-                                    <attributelist id="500" addr="0x7f1a040acab0" >
-                                        <attribute name="name" value="xbmcwsgi" id="501" addr="0x7f1a040af550" />
-                                        <typetab id="502" addr="0x7f1a040acad0" >
-                                            <attributelist id="503" addr="0x7f1a040acad0" >
-                                                <attribute name="WsgiInputStreamIterator" value="WsgiInputStreamIterator" id="504" addr="0x7f1a040af550" />
-                                                <attribute name="WsgiHttpHeader" value="Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>" id="505" addr="0x7f1a040af550" />
-                                                <attribute name="WsgiErrorStream" value="WsgiErrorStream" id="506" addr="0x7f1a040af550" />
-                                                <attribute name="WsgiInputStream" value="WsgiInputStream" id="507" addr="0x7f1a040af550" />
-                                                <attribute name="WsgiResponse" value="WsgiResponse" id="508" addr="0x7f1a040af550" />
-                                                <attribute name="WsgiResponseBody" value="WsgiResponseBody" id="509" addr="0x7f1a040af550" />
+                                <typescopesitem id="499" addr="0x7fb6eb3f3ab0" >
+                                    <attributelist id="500" addr="0x7fb6eb3f3ab0" >
+                                        <attribute name="name" value="xbmcwsgi" id="501" addr="0x7fb6eb3f6550" />
+                                        <typetab id="502" addr="0x7fb6eb3f3ad0" >
+                                            <attributelist id="503" addr="0x7fb6eb3f3ad0" >
+                                                <attribute name="WsgiInputStreamIterator" value="WsgiInputStreamIterator" id="504" addr="0x7fb6eb3f6550" />
+                                                <attribute name="WsgiHttpHeader" value="Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>" id="505" addr="0x7fb6eb3f6550" />
+                                                <attribute name="WsgiErrorStream" value="WsgiErrorStream" id="506" addr="0x7fb6eb3f6550" />
+                                                <attribute name="WsgiInputStream" value="WsgiInputStream" id="507" addr="0x7fb6eb3f6550" />
+                                                <attribute name="WsgiResponse" value="WsgiResponse" id="508" addr="0x7fb6eb3f6550" />
+                                                <attribute name="WsgiResponseBody" value="WsgiResponseBody" id="509" addr="0x7fb6eb3f6550" />
                                             </attributelist >
-                                            <typetabsitem id="510" addr="0x7f1a040ad450" >
-                                                <attributelist id="511" addr="0x7f1a040ad450" >
+                                            <typetabsitem id="510" addr="0x7fb6eb3f4450" >
+                                                <attributelist id="511" addr="0x7fb6eb3f4450" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="512" addr="0x7f1a040adff0" >
-                                                <attributelist id="513" addr="0x7f1a040adff0" >
+                                            <typetabsitem id="512" addr="0x7fb6eb3f4ff0" >
+                                                <attributelist id="513" addr="0x7fb6eb3f4ff0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="514" addr="0x7f1a040acbb0" >
-                                                <attributelist id="515" addr="0x7f1a040acbb0" >
+                                            <typetabsitem id="514" addr="0x7fb6eb3f3bb0" >
+                                                <attributelist id="515" addr="0x7fb6eb3f3bb0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="516" addr="0x7f1a040ad830" >
-                                                <attributelist id="517" addr="0x7f1a040ad830" >
+                                            <typetabsitem id="516" addr="0x7fb6eb3f4830" >
+                                                <attributelist id="517" addr="0x7fb6eb3f4830" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="518" addr="0x7f1a040ae250" >
-                                                <attributelist id="519" addr="0x7f1a040ae250" >
+                                            <typetabsitem id="518" addr="0x7fb6eb3f5250" >
+                                                <attributelist id="519" addr="0x7fb6eb3f5250" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="520" addr="0x7f1a040aebb0" >
-                                                <attributelist id="521" addr="0x7f1a040aebb0" >
+                                            <typetabsitem id="520" addr="0x7fb6eb3f5bb0" >
+                                                <attributelist id="521" addr="0x7fb6eb3f5bb0" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7f1a040ac650" id="522" addr="0x7f1a040ac650" />
-                                        <attribute name="qname" value="XBMCAddon::xbmcwsgi" id="523" addr="0x7f1a040af550" />
-                                        <attribute name="symtab" value="0x7f1a040a7170" id="524" addr="0x7f1a040a7170" />
+                                        <attribute name="parent" value="0x7fb6eb3f3650" id="522" addr="0x7fb6eb3f3650" />
+                                        <attribute name="qname" value="XBMCAddon::xbmcwsgi" id="523" addr="0x7fb6eb3f6550" />
+                                        <attribute name="symtab" value="0x7fb6eb3ee170" id="524" addr="0x7fb6eb3ee170" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="525" addr="0x7f1a040accf0" >
-                                    <attributelist id="526" addr="0x7f1a040accf0" >
+                                <typescopesitem id="525" addr="0x7fb6eb3f3cf0" >
+                                    <attributelist id="526" addr="0x7fb6eb3f3cf0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="527" addr="0x7f1a040a7570" >
-                                    <attributelist id="528" addr="0x7f1a040a7570" >
-                                        <attribute name="name" value="WsgiErrorStream" id="529" addr="0x7f1a040af550" />
-                                        <attribute name="csymtab" value="0x7f1a040a75d0" id="530" addr="0x7f1a040a75d0" />
-                                        <attribute name="symtab" value="0x7f1a040a7550" id="531" addr="0x7f1a040a7550" />
+                                <typescopesitem id="527" addr="0x7fb6eb3ee570" >
+                                    <attributelist id="528" addr="0x7fb6eb3ee570" >
+                                        <attribute name="name" value="WsgiErrorStream" id="529" addr="0x7fb6eb3f6550" />
+                                        <attribute name="csymtab" value="0x7fb6eb3ee5d0" id="530" addr="0x7fb6eb3ee5d0" />
+                                        <attribute name="symtab" value="0x7fb6eb3ee550" id="531" addr="0x7fb6eb3ee550" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <access id="532" addr="0x7f1a040a7510" >
-                            <attributelist id="533" addr="0x7f1a040a7510" >
-                                <attribute name="kind" value="public" id="534" addr="0x7f1a040af550" />
+                        <access id="532" addr="0x7fb6eb3ee510" >
+                            <attributelist id="533" addr="0x7fb6eb3ee510" >
+                                <attribute name="kind" value="public" id="534" addr="0x7fb6eb3f6550" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="535" addr="0x7f1a040a76f0" >
-                            <attributelist id="536" addr="0x7f1a040a76f0" >
-                                <attribute name="ismember" value="1" id="537" addr="0x7f1a040af550" />
-                                <attribute name="sym_name" value="WsgiErrorStream" id="538" addr="0x7f1a040af550" />
-                                <attribute name="name" value="WsgiErrorStream" id="539" addr="0x7f1a040af550" />
-                                <attribute name="decl" value="f()." id="540" addr="0x7f1a040af550" />
-                                <attribute name="access" value="public" id="541" addr="0x7f1a040af550" />
-                                <attribute name="feature_new" value="1" id="542" addr="0x7f1a040af550" />
-                                <attribute name="sym_symtab" value="0x7f1a040a7570" id="543" addr="0x7f1a040a7570" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="544" addr="0x7f1a040af550" />
+                        <constructor id="535" addr="0x7fb6eb3ee6f0" >
+                            <attributelist id="536" addr="0x7fb6eb3ee6f0" >
+                                <attribute name="ismember" value="1" id="537" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_name" value="WsgiErrorStream" id="538" addr="0x7fb6eb3f6550" />
+                                <attribute name="name" value="WsgiErrorStream" id="539" addr="0x7fb6eb3f6550" />
+                                <attribute name="decl" value="f()." id="540" addr="0x7fb6eb3f6550" />
+                                <attribute name="access" value="public" id="541" addr="0x7fb6eb3f6550" />
+                                <attribute name="feature_new" value="1" id="542" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_symtab" value="0x7fb6eb3ee570" id="543" addr="0x7fb6eb3ee570" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="544" addr="0x7fb6eb3f6550" />
                             </attributelist >
                          
                         </constructor >
-                        <destructor id="545" addr="0x7f1a040a78f0" >
-                            <attributelist id="546" addr="0x7f1a040a78f0" >
-                                <attribute name="ismember" value="1" id="547" addr="0x7f1a040af550" />
-                                <attribute name="sym_name" value="~WsgiErrorStream" id="548" addr="0x7f1a040af550" />
-                                <attribute name="name" value="~WsgiErrorStream" id="549" addr="0x7f1a040af550" />
-                                <attribute name="decl" value="f()." id="550" addr="0x7f1a040af550" />
-                                <attribute name="access" value="public" id="551" addr="0x7f1a040af550" />
-                                <attribute name="sym_symtab" value="0x7f1a040a7570" id="552" addr="0x7f1a040a7570" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="553" addr="0x7f1a040af550" />
+                        <destructor id="545" addr="0x7fb6eb3ee8f0" >
+                            <attributelist id="546" addr="0x7fb6eb3ee8f0" >
+                                <attribute name="ismember" value="1" id="547" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_name" value="~WsgiErrorStream" id="548" addr="0x7fb6eb3f6550" />
+                                <attribute name="name" value="~WsgiErrorStream" id="549" addr="0x7fb6eb3f6550" />
+                                <attribute name="decl" value="f()." id="550" addr="0x7fb6eb3f6550" />
+                                <attribute name="access" value="public" id="551" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_symtab" value="0x7fb6eb3ee570" id="552" addr="0x7fb6eb3ee570" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="553" addr="0x7fb6eb3f6550" />
                             </attributelist >
                          
                         </destructor >
-                        <cdecl id="554" addr="0x7f1a040a7a70" >
-                            <attributelist id="555" addr="0x7f1a040a7a70" >
-                                <attribute name="name" value="flush" id="556" addr="0x7f1a040af550" />
-                                <attribute name="ismember" value="1" id="557" addr="0x7f1a040af550" />
-                                <attribute name="sym_symtab" value="0x7f1a040a7570" id="558" addr="0x7f1a040a7570" />
-                                <attribute name="kind" value="function" id="559" addr="0x7f1a040af550" />
-                                <attribute name="sym_name" value="flush" id="560" addr="0x7f1a040af550" />
-                                <attribute name="decl" value="f()." id="561" addr="0x7f1a040af550" />
-                                <attribute name="access" value="public" id="562" addr="0x7f1a040af550" />
-                                <attribute name="type" value="void" id="563" addr="0x7f1a040af550" />
-                                <attribute name="code" value="{ }" id="564" addr="0x7f1a040af550" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="565" addr="0x7f1a040af550" />
+                        <cdecl id="554" addr="0x7fb6eb3eea70" >
+                            <attributelist id="555" addr="0x7fb6eb3eea70" >
+                                <attribute name="name" value="flush" id="556" addr="0x7fb6eb3f6550" />
+                                <attribute name="ismember" value="1" id="557" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_symtab" value="0x7fb6eb3ee570" id="558" addr="0x7fb6eb3ee570" />
+                                <attribute name="kind" value="function" id="559" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_name" value="flush" id="560" addr="0x7fb6eb3f6550" />
+                                <attribute name="decl" value="f()." id="561" addr="0x7fb6eb3f6550" />
+                                <attribute name="access" value="public" id="562" addr="0x7fb6eb3f6550" />
+                                <attribute name="type" value="void" id="563" addr="0x7fb6eb3f6550" />
+                                <attribute name="code" value="{ }" id="564" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="565" addr="0x7fb6eb3f6550" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="566" addr="0x7f1a040a7d90" >
-                            <attributelist id="567" addr="0x7f1a040a7d90" >
-                                <attribute name="name" value="write" id="568" addr="0x7f1a040af550" />
-                                <attribute name="ismember" value="1" id="569" addr="0x7f1a040af550" />
-                                <attribute name="sym_symtab" value="0x7f1a040a7570" id="570" addr="0x7f1a040a7570" />
-                                <attribute name="kind" value="function" id="571" addr="0x7f1a040af550" />
-                                <attribute name="sym_name" value="write" id="572" addr="0x7f1a040af550" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="573" addr="0x7f1a040af550" />
-                                <attribute name="access" value="public" id="574" addr="0x7f1a040af550" />
-                                <parmlist id="575" addr="0x7f1a040a7cd0" >
+                        <cdecl id="566" addr="0x7fb6eb3eed90" >
+                            <attributelist id="567" addr="0x7fb6eb3eed90" >
+                                <attribute name="name" value="write" id="568" addr="0x7fb6eb3f6550" />
+                                <attribute name="ismember" value="1" id="569" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_symtab" value="0x7fb6eb3ee570" id="570" addr="0x7fb6eb3ee570" />
+                                <attribute name="kind" value="function" id="571" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_name" value="write" id="572" addr="0x7fb6eb3f6550" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="573" addr="0x7fb6eb3f6550" />
+                                <attribute name="access" value="public" id="574" addr="0x7fb6eb3f6550" />
+                                <parmlist id="575" addr="0x7fb6eb3eecd0" >
                                     <parm id="576">
-                                        <attributelist id="577" addr="0x7f1a040a7cd0" >
-                                            <attribute name="name" value="str" id="578" addr="0x7f1a040af550" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="579" addr="0x7f1a040af550" />
+                                        <attributelist id="577" addr="0x7fb6eb3eecd0" >
+                                            <attribute name="name" value="str" id="578" addr="0x7fb6eb3f6550" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="579" addr="0x7fb6eb3f6550" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="void" id="580" addr="0x7f1a040af550" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="581" addr="0x7f1a040af550" />
+                                <attribute name="type" value="void" id="580" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="581" addr="0x7fb6eb3f6550" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="582" addr="0x7f1a040a8170" >
-                            <attributelist id="583" addr="0x7f1a040a8170" >
-                                <attribute name="ismember" value="1" id="584" addr="0x7f1a040af550" />
-                                <attribute name="sym_name" value="writelines" id="585" addr="0x7f1a040af550" />
-                                <attribute name="name" value="writelines" id="586" addr="0x7f1a040af550" />
-                                <attribute name="decl" value="f(r.q(const).std::vector&lt;(XBMCAddon::String)>)." id="587" addr="0x7f1a040af550" />
-                                <parmlist id="588" addr="0x7f1a040a80b0" >
+                        <cdecl id="582" addr="0x7fb6eb3ef170" >
+                            <attributelist id="583" addr="0x7fb6eb3ef170" >
+                                <attribute name="ismember" value="1" id="584" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_name" value="writelines" id="585" addr="0x7fb6eb3f6550" />
+                                <attribute name="name" value="writelines" id="586" addr="0x7fb6eb3f6550" />
+                                <attribute name="decl" value="f(r.q(const).std::vector&lt;(XBMCAddon::String)>)." id="587" addr="0x7fb6eb3f6550" />
+                                <parmlist id="588" addr="0x7fb6eb3ef0b0" >
                                     <parm id="589">
-                                        <attributelist id="590" addr="0x7f1a040a80b0" >
-                                            <attribute name="name" value="seq" id="591" addr="0x7f1a040af550" />
-                                            <attribute name="type" value="r.q(const).std::vector&lt;(XBMCAddon::String)>" id="592" addr="0x7f1a040af550" />
+                                        <attributelist id="590" addr="0x7fb6eb3ef0b0" >
+                                            <attribute name="name" value="seq" id="591" addr="0x7fb6eb3f6550" />
+                                            <attribute name="type" value="r.q(const).std::vector&lt;(XBMCAddon::String)>" id="592" addr="0x7fb6eb3f6550" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="access" value="public" id="593" addr="0x7f1a040af550" />
-                                <attribute name="kind" value="function" id="594" addr="0x7f1a040af550" />
-                                <attribute name="type" value="void" id="595" addr="0x7f1a040af550" />
-                                <attribute name="sym_symtab" value="0x7f1a040a7570" id="596" addr="0x7f1a040a7570" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="597" addr="0x7f1a040af550" />
+                                <attribute name="access" value="public" id="593" addr="0x7fb6eb3f6550" />
+                                <attribute name="kind" value="function" id="594" addr="0x7fb6eb3f6550" />
+                                <attribute name="type" value="void" id="595" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_symtab" value="0x7fb6eb3ee570" id="596" addr="0x7fb6eb3ee570" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="597" addr="0x7fb6eb3f6550" />
                             </attributelist >
                          
                         </cdecl >
@@ -971,576 +971,576 @@
                 </namespace >
             </namespace >
         </include >
-        <include id="598" addr="0x7f1a040a83d0" >
-            <attributelist id="599" addr="0x7f1a040a83d0" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/wsgi/WsgiInputStream.h" id="600" addr="0x7f1a040af550" />
+        <include id="598" addr="0x7fb6eb3ef3d0" >
+            <attributelist id="599" addr="0x7fb6eb3ef3d0" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/wsgi/WsgiInputStream.h" id="600" addr="0x7fb6eb3f6550" />
             </attributelist >
 
-            <classforward id="601" addr="0x7f1a040a8470" >
-                <attributelist id="602" addr="0x7f1a040a8470" >
-                    <attribute name="sym_name" value="HTTPPythonRequest" id="603" addr="0x7f1a040af550" />
-                    <attribute name="name" value="HTTPPythonRequest" id="604" addr="0x7f1a040af550" />
-                    <attribute name="kind" value="struct" id="605" addr="0x7f1a040af550" />
-                    <attribute name="sym_weak" value="1" id="606" addr="0x7f1a040af550" />
-                    <attribute name="sym_symtab" value="0x7f1a0408f950" id="607" addr="0x7f1a0408f950" />
-                    <attribute name="sym_overname" value="__SWIG_0" id="608" addr="0x7f1a040af550" />
+            <classforward id="601" addr="0x7fb6eb3ef470" >
+                <attributelist id="602" addr="0x7fb6eb3ef470" >
+                    <attribute name="sym_name" value="HTTPPythonRequest" id="603" addr="0x7fb6eb3f6550" />
+                    <attribute name="name" value="HTTPPythonRequest" id="604" addr="0x7fb6eb3f6550" />
+                    <attribute name="kind" value="struct" id="605" addr="0x7fb6eb3f6550" />
+                    <attribute name="sym_weak" value="1" id="606" addr="0x7fb6eb3f6550" />
+                    <attribute name="sym_symtab" value="0x7fb6eb3d6950" id="607" addr="0x7fb6eb3d6950" />
+                    <attribute name="sym_overname" value="__SWIG_0" id="608" addr="0x7fb6eb3f6550" />
                 </attributelist >
              
             </classforward >
-            <namespace id="609" addr="0x7f1a040a8590" >
-                <attributelist id="610" addr="0x7f1a040a8590" >
-                    <attribute name="sym_name" value="XBMCAddon" id="611" addr="0x7f1a040af550" />
-                    <attribute name="name" value="XBMCAddon" id="612" addr="0x7f1a040af550" />
-                    <attribute name="sym_previousSibling" value="0x7f1a040a70d0" id="613" addr="0x7f1a040a70d0" />
-                    <attribute name="csym_nextSibling" value="0x7f1a040aa3f0" id="614" addr="0x7f1a040aa3f0" />
-                    <attribute name="sym_nextSibling" value="0x7f1a040aa3f0" id="615" addr="0x7f1a040aa3f0" />
-                    <typescope id="616" addr="0x7f1a040ac650" >
-                        <attributelist id="617" addr="0x7f1a040ac650" >
-                            <attribute name="name" value="XBMCAddon" id="618" addr="0x7f1a040af550" />
-                            <typetab id="619" addr="0x7f1a040ac690" >
-                                <attributelist id="620" addr="0x7f1a040ac690" >
-                                    <attribute name="String" value="std::string" id="621" addr="0x7f1a040af550" />
+            <namespace id="609" addr="0x7fb6eb3ef590" >
+                <attributelist id="610" addr="0x7fb6eb3ef590" >
+                    <attribute name="sym_name" value="XBMCAddon" id="611" addr="0x7fb6eb3f6550" />
+                    <attribute name="name" value="XBMCAddon" id="612" addr="0x7fb6eb3f6550" />
+                    <attribute name="sym_previousSibling" value="0x7fb6eb3ee0d0" id="613" addr="0x7fb6eb3ee0d0" />
+                    <attribute name="csym_nextSibling" value="0x7fb6eb3f13f0" id="614" addr="0x7fb6eb3f13f0" />
+                    <attribute name="sym_nextSibling" value="0x7fb6eb3f13f0" id="615" addr="0x7fb6eb3f13f0" />
+                    <typescope id="616" addr="0x7fb6eb3f3650" >
+                        <attributelist id="617" addr="0x7fb6eb3f3650" >
+                            <attribute name="name" value="XBMCAddon" id="618" addr="0x7fb6eb3f6550" />
+                            <typetab id="619" addr="0x7fb6eb3f3690" >
+                                <attributelist id="620" addr="0x7fb6eb3f3690" >
+                                    <attribute name="String" value="std::string" id="621" addr="0x7fb6eb3f6550" />
                                 </attributelist >
-                                <typetabsitem id="622" addr="0x7f1a040ac870" >
-                                    <attributelist id="623" addr="0x7f1a040ac870" >
+                                <typetabsitem id="622" addr="0x7fb6eb3f3870" >
+                                    <attributelist id="623" addr="0x7fb6eb3f3870" >
                                     </attributelist >
                                 </typetabsitem >
                             </typetab >
-                            <attribute name="parent" value="0x7f1a0408fa30" id="624" addr="0x7f1a0408fa30" />
-                            <attribute name="qname" value="XBMCAddon" id="625" addr="0x7f1a040af550" />
-                            <attribute name="symtab" value="0x7f1a040a6950" id="626" addr="0x7f1a040a6950" />
+                            <attribute name="parent" value="0x7fb6eb3d6a30" id="624" addr="0x7fb6eb3d6a30" />
+                            <attribute name="qname" value="XBMCAddon" id="625" addr="0x7fb6eb3f6550" />
+                            <attribute name="symtab" value="0x7fb6eb3ed950" id="626" addr="0x7fb6eb3ed950" />
                         </attributelist >
-                        <typescopesitem id="627" addr="0x7f1a040a6910" >
-                            <attributelist id="628" addr="0x7f1a040a6910" >
+                        <typescopesitem id="627" addr="0x7fb6eb3ed910" >
+                            <attributelist id="628" addr="0x7fb6eb3ed910" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="629" addr="0x7f1a040ac690" >
-                            <attributelist id="630" addr="0x7f1a040ac690" >
-                                <attribute name="String" value="std::string" id="631" addr="0x7f1a040af550" />
+                        <typescopesitem id="629" addr="0x7fb6eb3f3690" >
+                            <attributelist id="630" addr="0x7fb6eb3f3690" >
+                                <attribute name="String" value="std::string" id="631" addr="0x7fb6eb3f6550" />
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="632" addr="0x7f1a0408fa30" >
-                            <attributelist id="633" addr="0x7f1a0408fa30" >
-                                <attribute name="name" value="" id="634" addr="0x7f1a040af550" />
-                                <typetab id="635" addr="0x7f1a0408fa90" >
-                                    <attributelist id="636" addr="0x7f1a0408fa90" >
-                                        <attribute name="HTTPPythonRequest" value="HTTPPythonRequest" id="637" addr="0x7f1a040af550" />
+                        <typescopesitem id="632" addr="0x7fb6eb3d6a30" >
+                            <attributelist id="633" addr="0x7fb6eb3d6a30" >
+                                <attribute name="name" value="" id="634" addr="0x7fb6eb3f6550" />
+                                <typetab id="635" addr="0x7fb6eb3d6a90" >
+                                    <attributelist id="636" addr="0x7fb6eb3d6a90" >
+                                        <attribute name="HTTPPythonRequest" value="HTTPPythonRequest" id="637" addr="0x7fb6eb3f6550" />
                                     </attributelist >
-                                    <typetabsitem id="638" addr="0x7f1a040ac7b0" >
-                                        <attributelist id="639" addr="0x7f1a040ac7b0" >
+                                    <typetabsitem id="638" addr="0x7fb6eb3f37b0" >
+                                        <attributelist id="639" addr="0x7fb6eb3f37b0" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="640" addr="0x7f1a040ac790" >
-                            <attributelist id="641" addr="0x7f1a040ac790" >
+                        <typescopesitem id="640" addr="0x7fb6eb3f3790" >
+                            <attributelist id="641" addr="0x7fb6eb3f3790" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="642" addr="0x7f1a040a6950" >
-                            <attributelist id="643" addr="0x7f1a040a6950" >
-                                <attribute name="name" value="XBMCAddon" id="644" addr="0x7f1a040af550" />
-                                <attribute name="csymtab" value="0x7f1a040a6990" id="645" addr="0x7f1a040a6990" />
-                                <attribute name="symtab" value="0x7f1a040a6930" id="646" addr="0x7f1a040a6930" />
+                        <typescopesitem id="642" addr="0x7fb6eb3ed950" >
+                            <attributelist id="643" addr="0x7fb6eb3ed950" >
+                                <attribute name="name" value="XBMCAddon" id="644" addr="0x7fb6eb3f6550" />
+                                <attribute name="csymtab" value="0x7fb6eb3ed990" id="645" addr="0x7fb6eb3ed990" />
+                                <attribute name="symtab" value="0x7fb6eb3ed930" id="646" addr="0x7fb6eb3ed930" />
                             </attributelist >
                         </typescopesitem >
                     </typescope >
-                    <attribute name="symtab" value="0x7f1a040a6950" id="647" addr="0x7f1a040a6950" />
-                    <attribute name="sym_symtab" value="0x7f1a0408f950" id="648" addr="0x7f1a0408f950" />
+                    <attribute name="symtab" value="0x7fb6eb3ed950" id="647" addr="0x7fb6eb3ed950" />
+                    <attribute name="sym_symtab" value="0x7fb6eb3d6950" id="648" addr="0x7fb6eb3d6950" />
                 </attributelist >
 
-                <namespace id="649" addr="0x7f1a040a8610" >
-                    <attributelist id="650" addr="0x7f1a040a8610" >
-                        <attribute name="sym_name" value="xbmcwsgi" id="651" addr="0x7f1a040af550" />
-                        <attribute name="name" value="xbmcwsgi" id="652" addr="0x7f1a040af550" />
-                        <attribute name="sym_previousSibling" value="0x7f1a040a71f0" id="653" addr="0x7f1a040a71f0" />
-                        <attribute name="csym_nextSibling" value="0x7f1a040aa470" id="654" addr="0x7f1a040aa470" />
-                        <attribute name="sym_nextSibling" value="0x7f1a040aa470" id="655" addr="0x7f1a040aa470" />
-                        <typescope id="656" addr="0x7f1a040acab0" >
-                            <attributelist id="657" addr="0x7f1a040acab0" >
-                                <attribute name="name" value="xbmcwsgi" id="658" addr="0x7f1a040af550" />
-                                <typetab id="659" addr="0x7f1a040acad0" >
-                                    <attributelist id="660" addr="0x7f1a040acad0" >
-                                        <attribute name="WsgiInputStreamIterator" value="WsgiInputStreamIterator" id="661" addr="0x7f1a040af550" />
-                                        <attribute name="WsgiHttpHeader" value="Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>" id="662" addr="0x7f1a040af550" />
-                                        <attribute name="WsgiErrorStream" value="WsgiErrorStream" id="663" addr="0x7f1a040af550" />
-                                        <attribute name="WsgiInputStream" value="WsgiInputStream" id="664" addr="0x7f1a040af550" />
-                                        <attribute name="WsgiResponse" value="WsgiResponse" id="665" addr="0x7f1a040af550" />
-                                        <attribute name="WsgiResponseBody" value="WsgiResponseBody" id="666" addr="0x7f1a040af550" />
+                <namespace id="649" addr="0x7fb6eb3ef610" >
+                    <attributelist id="650" addr="0x7fb6eb3ef610" >
+                        <attribute name="sym_name" value="xbmcwsgi" id="651" addr="0x7fb6eb3f6550" />
+                        <attribute name="name" value="xbmcwsgi" id="652" addr="0x7fb6eb3f6550" />
+                        <attribute name="sym_previousSibling" value="0x7fb6eb3ee1f0" id="653" addr="0x7fb6eb3ee1f0" />
+                        <attribute name="csym_nextSibling" value="0x7fb6eb3f1470" id="654" addr="0x7fb6eb3f1470" />
+                        <attribute name="sym_nextSibling" value="0x7fb6eb3f1470" id="655" addr="0x7fb6eb3f1470" />
+                        <typescope id="656" addr="0x7fb6eb3f3ab0" >
+                            <attributelist id="657" addr="0x7fb6eb3f3ab0" >
+                                <attribute name="name" value="xbmcwsgi" id="658" addr="0x7fb6eb3f6550" />
+                                <typetab id="659" addr="0x7fb6eb3f3ad0" >
+                                    <attributelist id="660" addr="0x7fb6eb3f3ad0" >
+                                        <attribute name="WsgiInputStreamIterator" value="WsgiInputStreamIterator" id="661" addr="0x7fb6eb3f6550" />
+                                        <attribute name="WsgiHttpHeader" value="Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>" id="662" addr="0x7fb6eb3f6550" />
+                                        <attribute name="WsgiErrorStream" value="WsgiErrorStream" id="663" addr="0x7fb6eb3f6550" />
+                                        <attribute name="WsgiInputStream" value="WsgiInputStream" id="664" addr="0x7fb6eb3f6550" />
+                                        <attribute name="WsgiResponse" value="WsgiResponse" id="665" addr="0x7fb6eb3f6550" />
+                                        <attribute name="WsgiResponseBody" value="WsgiResponseBody" id="666" addr="0x7fb6eb3f6550" />
                                     </attributelist >
-                                    <typetabsitem id="667" addr="0x7f1a040ad450" >
-                                        <attributelist id="668" addr="0x7f1a040ad450" >
+                                    <typetabsitem id="667" addr="0x7fb6eb3f4450" >
+                                        <attributelist id="668" addr="0x7fb6eb3f4450" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="669" addr="0x7f1a040adff0" >
-                                        <attributelist id="670" addr="0x7f1a040adff0" >
+                                    <typetabsitem id="669" addr="0x7fb6eb3f4ff0" >
+                                        <attributelist id="670" addr="0x7fb6eb3f4ff0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="671" addr="0x7f1a040acbb0" >
-                                        <attributelist id="672" addr="0x7f1a040acbb0" >
+                                    <typetabsitem id="671" addr="0x7fb6eb3f3bb0" >
+                                        <attributelist id="672" addr="0x7fb6eb3f3bb0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="673" addr="0x7f1a040ad830" >
-                                        <attributelist id="674" addr="0x7f1a040ad830" >
+                                    <typetabsitem id="673" addr="0x7fb6eb3f4830" >
+                                        <attributelist id="674" addr="0x7fb6eb3f4830" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="675" addr="0x7f1a040ae250" >
-                                        <attributelist id="676" addr="0x7f1a040ae250" >
+                                    <typetabsitem id="675" addr="0x7fb6eb3f5250" >
+                                        <attributelist id="676" addr="0x7fb6eb3f5250" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="677" addr="0x7f1a040aebb0" >
-                                        <attributelist id="678" addr="0x7f1a040aebb0" >
+                                    <typetabsitem id="677" addr="0x7fb6eb3f5bb0" >
+                                        <attributelist id="678" addr="0x7fb6eb3f5bb0" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
-                                <attribute name="parent" value="0x7f1a040ac650" id="679" addr="0x7f1a040ac650" />
-                                <attribute name="qname" value="XBMCAddon::xbmcwsgi" id="680" addr="0x7f1a040af550" />
-                                <attribute name="symtab" value="0x7f1a040a7170" id="681" addr="0x7f1a040a7170" />
+                                <attribute name="parent" value="0x7fb6eb3f3650" id="679" addr="0x7fb6eb3f3650" />
+                                <attribute name="qname" value="XBMCAddon::xbmcwsgi" id="680" addr="0x7fb6eb3f6550" />
+                                <attribute name="symtab" value="0x7fb6eb3ee170" id="681" addr="0x7fb6eb3ee170" />
                             </attributelist >
-                            <typescopesitem id="682" addr="0x7f1a040a7130" >
-                                <attributelist id="683" addr="0x7f1a040a7130" >
+                            <typescopesitem id="682" addr="0x7fb6eb3ee130" >
+                                <attributelist id="683" addr="0x7fb6eb3ee130" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="684" addr="0x7f1a040acad0" >
-                                <attributelist id="685" addr="0x7f1a040acad0" >
-                                    <attribute name="WsgiInputStreamIterator" value="WsgiInputStreamIterator" id="686" addr="0x7f1a040af550" />
-                                    <attribute name="WsgiHttpHeader" value="Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>" id="687" addr="0x7f1a040af550" />
-                                    <attribute name="WsgiErrorStream" value="WsgiErrorStream" id="688" addr="0x7f1a040af550" />
-                                    <attribute name="WsgiInputStream" value="WsgiInputStream" id="689" addr="0x7f1a040af550" />
-                                    <attribute name="WsgiResponse" value="WsgiResponse" id="690" addr="0x7f1a040af550" />
-                                    <attribute name="WsgiResponseBody" value="WsgiResponseBody" id="691" addr="0x7f1a040af550" />
+                            <typescopesitem id="684" addr="0x7fb6eb3f3ad0" >
+                                <attributelist id="685" addr="0x7fb6eb3f3ad0" >
+                                    <attribute name="WsgiInputStreamIterator" value="WsgiInputStreamIterator" id="686" addr="0x7fb6eb3f6550" />
+                                    <attribute name="WsgiHttpHeader" value="Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>" id="687" addr="0x7fb6eb3f6550" />
+                                    <attribute name="WsgiErrorStream" value="WsgiErrorStream" id="688" addr="0x7fb6eb3f6550" />
+                                    <attribute name="WsgiInputStream" value="WsgiInputStream" id="689" addr="0x7fb6eb3f6550" />
+                                    <attribute name="WsgiResponse" value="WsgiResponse" id="690" addr="0x7fb6eb3f6550" />
+                                    <attribute name="WsgiResponseBody" value="WsgiResponseBody" id="691" addr="0x7fb6eb3f6550" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="692" addr="0x7f1a040ac650" >
-                                <attributelist id="693" addr="0x7f1a040ac650" >
-                                    <attribute name="name" value="XBMCAddon" id="694" addr="0x7f1a040af550" />
-                                    <typetab id="695" addr="0x7f1a040ac690" >
-                                        <attributelist id="696" addr="0x7f1a040ac690" >
-                                            <attribute name="String" value="std::string" id="697" addr="0x7f1a040af550" />
+                            <typescopesitem id="692" addr="0x7fb6eb3f3650" >
+                                <attributelist id="693" addr="0x7fb6eb3f3650" >
+                                    <attribute name="name" value="XBMCAddon" id="694" addr="0x7fb6eb3f6550" />
+                                    <typetab id="695" addr="0x7fb6eb3f3690" >
+                                        <attributelist id="696" addr="0x7fb6eb3f3690" >
+                                            <attribute name="String" value="std::string" id="697" addr="0x7fb6eb3f6550" />
                                         </attributelist >
-                                        <typetabsitem id="698" addr="0x7f1a040ac870" >
-                                            <attributelist id="699" addr="0x7f1a040ac870" >
+                                        <typetabsitem id="698" addr="0x7fb6eb3f3870" >
+                                            <attributelist id="699" addr="0x7fb6eb3f3870" >
                                             </attributelist >
                                         </typetabsitem >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f1a0408fa30" id="700" addr="0x7f1a0408fa30" />
-                                    <attribute name="qname" value="XBMCAddon" id="701" addr="0x7f1a040af550" />
-                                    <attribute name="symtab" value="0x7f1a040a6950" id="702" addr="0x7f1a040a6950" />
+                                    <attribute name="parent" value="0x7fb6eb3d6a30" id="700" addr="0x7fb6eb3d6a30" />
+                                    <attribute name="qname" value="XBMCAddon" id="701" addr="0x7fb6eb3f6550" />
+                                    <attribute name="symtab" value="0x7fb6eb3ed950" id="702" addr="0x7fb6eb3ed950" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="703" addr="0x7f1a040acaf0" >
-                                <attributelist id="704" addr="0x7f1a040acaf0" >
+                            <typescopesitem id="703" addr="0x7fb6eb3f3af0" >
+                                <attributelist id="704" addr="0x7fb6eb3f3af0" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="705" addr="0x7f1a040a7170" >
-                                <attributelist id="706" addr="0x7f1a040a7170" >
-                                    <attribute name="name" value="xbmcwsgi" id="707" addr="0x7f1a040af550" />
-                                    <attribute name="csymtab" value="0x7f1a040a71b0" id="708" addr="0x7f1a040a71b0" />
-                                    <attribute name="symtab" value="0x7f1a040a7150" id="709" addr="0x7f1a040a7150" />
+                            <typescopesitem id="705" addr="0x7fb6eb3ee170" >
+                                <attributelist id="706" addr="0x7fb6eb3ee170" >
+                                    <attribute name="name" value="xbmcwsgi" id="707" addr="0x7fb6eb3f6550" />
+                                    <attribute name="csymtab" value="0x7fb6eb3ee1b0" id="708" addr="0x7fb6eb3ee1b0" />
+                                    <attribute name="symtab" value="0x7fb6eb3ee150" id="709" addr="0x7fb6eb3ee150" />
                                 </attributelist >
                             </typescopesitem >
                         </typescope >
-                        <attribute name="symtab" value="0x7f1a040a7170" id="710" addr="0x7f1a040a7170" />
-                        <attribute name="sym_symtab" value="0x7f1a040a6950" id="711" addr="0x7f1a040a6950" />
+                        <attribute name="symtab" value="0x7fb6eb3ee170" id="710" addr="0x7fb6eb3ee170" />
+                        <attribute name="sym_symtab" value="0x7fb6eb3ed950" id="711" addr="0x7fb6eb3ed950" />
                     </attributelist >
 
-                    <class id="712" addr="0x7f1a040a8790" >
-                        <attributelist id="713" addr="0x7f1a040a8790" >
-                            <attribute name="name" value="XBMCAddon::xbmcwsgi::WsgiInputStreamIterator" id="714" addr="0x7f1a040af550" />
-                            <attribute name="sym_symtab" value="0x7f1a040a7170" id="715" addr="0x7f1a040a7170" />
-                            <attribute name="symtab" value="0x7f1a040a88f0" id="716" addr="0x7f1a040a88f0" />
-                            <attribute name="allows_typedef" value="1" id="717" addr="0x7f1a040af550" />
-                            <attribute name="typepass_visit" value="1" id="718" addr="0x7f1a040af550" />
-                            <attribute name="allocate_visit" value="1" id="719" addr="0x7f1a040af550" />
-                            <attribute name="kind" value="class" id="720" addr="0x7f1a040af550" />
-                            <attribute name="sym_name" value="WsgiInputStreamIterator" id="721" addr="0x7f1a040af550" />
-                            <attribute name="allocate_default_constructor" value="1" id="722" addr="0x7f1a040af550" />
-                            <attribute name="allocate_has_constructor" value="1" id="723" addr="0x7f1a040af550" />
-                            <attribute name="allocate_public_constructor" value="1" id="724" addr="0x7f1a040af550" />
-                            <attribute name="allocate_has_destructor" value="1" id="725" addr="0x7f1a040af550" />
-                            <attribute name="allocate_default_destructor" value="1" id="726" addr="0x7f1a040af550" />
-                            <attribute name="allocate_copy_constructor" value="1" id="727" addr="0x7f1a040af550" />
-                            <attribute name="privatebaselist" value="0x7f1a040a8770" id="728" addr="0x7f1a040a8770" />
-                            <attribute name="protectedbaselist" value="0x7f1a040a8750" id="729" addr="0x7f1a040a8750" />
-                            <baselist id="730" addr="0x7f1a040a8730" >
-                                <base name="AddonClass" id="731" addr="0x7f1a040a86b0" />
+                    <class id="712" addr="0x7fb6eb3ef790" >
+                        <attributelist id="713" addr="0x7fb6eb3ef790" >
+                            <attribute name="name" value="XBMCAddon::xbmcwsgi::WsgiInputStreamIterator" id="714" addr="0x7fb6eb3f6550" />
+                            <attribute name="sym_symtab" value="0x7fb6eb3ee170" id="715" addr="0x7fb6eb3ee170" />
+                            <attribute name="symtab" value="0x7fb6eb3ef8f0" id="716" addr="0x7fb6eb3ef8f0" />
+                            <attribute name="allows_typedef" value="1" id="717" addr="0x7fb6eb3f6550" />
+                            <attribute name="typepass_visit" value="1" id="718" addr="0x7fb6eb3f6550" />
+                            <attribute name="allocate_visit" value="1" id="719" addr="0x7fb6eb3f6550" />
+                            <attribute name="kind" value="class" id="720" addr="0x7fb6eb3f6550" />
+                            <attribute name="sym_name" value="WsgiInputStreamIterator" id="721" addr="0x7fb6eb3f6550" />
+                            <attribute name="allocate_default_constructor" value="1" id="722" addr="0x7fb6eb3f6550" />
+                            <attribute name="allocate_has_constructor" value="1" id="723" addr="0x7fb6eb3f6550" />
+                            <attribute name="allocate_public_constructor" value="1" id="724" addr="0x7fb6eb3f6550" />
+                            <attribute name="allocate_has_destructor" value="1" id="725" addr="0x7fb6eb3f6550" />
+                            <attribute name="allocate_default_destructor" value="1" id="726" addr="0x7fb6eb3f6550" />
+                            <attribute name="allocate_copy_constructor" value="1" id="727" addr="0x7fb6eb3f6550" />
+                            <attribute name="privatebaselist" value="0x7fb6eb3ef770" id="728" addr="0x7fb6eb3ef770" />
+                            <attribute name="protectedbaselist" value="0x7fb6eb3ef750" id="729" addr="0x7fb6eb3ef750" />
+                            <baselist id="730" addr="0x7fb6eb3ef730" >
+                                <base name="AddonClass" id="731" addr="0x7fb6eb3ef6b0" />
                             </baselist >
-                            <attribute name="module" value="xbmcwsgi" id="732" addr="0x7f1a040a6270" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="733" addr="0x7f1a040af550" />
-                            <typescope id="734" addr="0x7f1a040ad4f0" >
-                                <attributelist id="735" addr="0x7f1a040ad4f0" >
-                                    <attribute name="name" value="WsgiInputStreamIterator" id="736" addr="0x7f1a040af550" />
-                                    <typetab id="737" addr="0x7f1a040ad510" >
-                                        <attributelist id="738" addr="0x7f1a040ad510" >
+                            <attribute name="module" value="xbmcwsgi" id="732" addr="0x7fb6eb3ed270" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="733" addr="0x7fb6eb3f6550" />
+                            <typescope id="734" addr="0x7fb6eb3f44f0" >
+                                <attributelist id="735" addr="0x7fb6eb3f44f0" >
+                                    <attribute name="name" value="WsgiInputStreamIterator" id="736" addr="0x7fb6eb3f6550" />
+                                    <typetab id="737" addr="0x7fb6eb3f4510" >
+                                        <attributelist id="738" addr="0x7fb6eb3f4510" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f1a040acab0" id="739" addr="0x7f1a040acab0" />
-                                    <attribute name="qname" value="XBMCAddon::xbmcwsgi::WsgiInputStreamIterator" id="740" addr="0x7f1a040af550" />
-                                    <attribute name="symtab" value="0x7f1a040a88f0" id="741" addr="0x7f1a040a88f0" />
+                                    <attribute name="parent" value="0x7fb6eb3f3ab0" id="739" addr="0x7fb6eb3f3ab0" />
+                                    <attribute name="qname" value="XBMCAddon::xbmcwsgi::WsgiInputStreamIterator" id="740" addr="0x7fb6eb3f6550" />
+                                    <attribute name="symtab" value="0x7fb6eb3ef8f0" id="741" addr="0x7fb6eb3ef8f0" />
                                 </attributelist >
-                                <typescopesitem id="742" addr="0x7f1a040ad490" >
-                                    <attributelist id="743" addr="0x7f1a040ad490" >
+                                <typescopesitem id="742" addr="0x7fb6eb3f4490" >
+                                    <attributelist id="743" addr="0x7fb6eb3f4490" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="744" addr="0x7f1a040ad510" >
-                                    <attributelist id="745" addr="0x7f1a040ad510" >
+                                <typescopesitem id="744" addr="0x7fb6eb3f4510" >
+                                    <attributelist id="745" addr="0x7fb6eb3f4510" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="746" addr="0x7f1a040acab0" >
-                                    <attributelist id="747" addr="0x7f1a040acab0" >
-                                        <attribute name="name" value="xbmcwsgi" id="748" addr="0x7f1a040af550" />
-                                        <typetab id="749" addr="0x7f1a040acad0" >
-                                            <attributelist id="750" addr="0x7f1a040acad0" >
-                                                <attribute name="WsgiInputStreamIterator" value="WsgiInputStreamIterator" id="751" addr="0x7f1a040af550" />
-                                                <attribute name="WsgiHttpHeader" value="Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>" id="752" addr="0x7f1a040af550" />
-                                                <attribute name="WsgiErrorStream" value="WsgiErrorStream" id="753" addr="0x7f1a040af550" />
-                                                <attribute name="WsgiInputStream" value="WsgiInputStream" id="754" addr="0x7f1a040af550" />
-                                                <attribute name="WsgiResponse" value="WsgiResponse" id="755" addr="0x7f1a040af550" />
-                                                <attribute name="WsgiResponseBody" value="WsgiResponseBody" id="756" addr="0x7f1a040af550" />
+                                <typescopesitem id="746" addr="0x7fb6eb3f3ab0" >
+                                    <attributelist id="747" addr="0x7fb6eb3f3ab0" >
+                                        <attribute name="name" value="xbmcwsgi" id="748" addr="0x7fb6eb3f6550" />
+                                        <typetab id="749" addr="0x7fb6eb3f3ad0" >
+                                            <attributelist id="750" addr="0x7fb6eb3f3ad0" >
+                                                <attribute name="WsgiInputStreamIterator" value="WsgiInputStreamIterator" id="751" addr="0x7fb6eb3f6550" />
+                                                <attribute name="WsgiHttpHeader" value="Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>" id="752" addr="0x7fb6eb3f6550" />
+                                                <attribute name="WsgiErrorStream" value="WsgiErrorStream" id="753" addr="0x7fb6eb3f6550" />
+                                                <attribute name="WsgiInputStream" value="WsgiInputStream" id="754" addr="0x7fb6eb3f6550" />
+                                                <attribute name="WsgiResponse" value="WsgiResponse" id="755" addr="0x7fb6eb3f6550" />
+                                                <attribute name="WsgiResponseBody" value="WsgiResponseBody" id="756" addr="0x7fb6eb3f6550" />
                                             </attributelist >
-                                            <typetabsitem id="757" addr="0x7f1a040ad450" >
-                                                <attributelist id="758" addr="0x7f1a040ad450" >
+                                            <typetabsitem id="757" addr="0x7fb6eb3f4450" >
+                                                <attributelist id="758" addr="0x7fb6eb3f4450" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="759" addr="0x7f1a040adff0" >
-                                                <attributelist id="760" addr="0x7f1a040adff0" >
+                                            <typetabsitem id="759" addr="0x7fb6eb3f4ff0" >
+                                                <attributelist id="760" addr="0x7fb6eb3f4ff0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="761" addr="0x7f1a040acbb0" >
-                                                <attributelist id="762" addr="0x7f1a040acbb0" >
+                                            <typetabsitem id="761" addr="0x7fb6eb3f3bb0" >
+                                                <attributelist id="762" addr="0x7fb6eb3f3bb0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="763" addr="0x7f1a040ad830" >
-                                                <attributelist id="764" addr="0x7f1a040ad830" >
+                                            <typetabsitem id="763" addr="0x7fb6eb3f4830" >
+                                                <attributelist id="764" addr="0x7fb6eb3f4830" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="765" addr="0x7f1a040ae250" >
-                                                <attributelist id="766" addr="0x7f1a040ae250" >
+                                            <typetabsitem id="765" addr="0x7fb6eb3f5250" >
+                                                <attributelist id="766" addr="0x7fb6eb3f5250" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="767" addr="0x7f1a040aebb0" >
-                                                <attributelist id="768" addr="0x7f1a040aebb0" >
+                                            <typetabsitem id="767" addr="0x7fb6eb3f5bb0" >
+                                                <attributelist id="768" addr="0x7fb6eb3f5bb0" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7f1a040ac650" id="769" addr="0x7f1a040ac650" />
-                                        <attribute name="qname" value="XBMCAddon::xbmcwsgi" id="770" addr="0x7f1a040af550" />
-                                        <attribute name="symtab" value="0x7f1a040a7170" id="771" addr="0x7f1a040a7170" />
+                                        <attribute name="parent" value="0x7fb6eb3f3650" id="769" addr="0x7fb6eb3f3650" />
+                                        <attribute name="qname" value="XBMCAddon::xbmcwsgi" id="770" addr="0x7fb6eb3f6550" />
+                                        <attribute name="symtab" value="0x7fb6eb3ee170" id="771" addr="0x7fb6eb3ee170" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="772" addr="0x7f1a040ad530" >
-                                    <attributelist id="773" addr="0x7f1a040ad530" >
+                                <typescopesitem id="772" addr="0x7fb6eb3f4530" >
+                                    <attributelist id="773" addr="0x7fb6eb3f4530" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="774" addr="0x7f1a040a88f0" >
-                                    <attributelist id="775" addr="0x7f1a040a88f0" >
-                                        <attribute name="name" value="WsgiInputStreamIterator" id="776" addr="0x7f1a040af550" />
-                                        <attribute name="csymtab" value="0x7f1a040a8910" id="777" addr="0x7f1a040a8910" />
-                                        <attribute name="symtab" value="0x7f1a040a88b0" id="778" addr="0x7f1a040a88b0" />
+                                <typescopesitem id="774" addr="0x7fb6eb3ef8f0" >
+                                    <attributelist id="775" addr="0x7fb6eb3ef8f0" >
+                                        <attribute name="name" value="WsgiInputStreamIterator" id="776" addr="0x7fb6eb3f6550" />
+                                        <attribute name="csymtab" value="0x7fb6eb3ef910" id="777" addr="0x7fb6eb3ef910" />
+                                        <attribute name="symtab" value="0x7fb6eb3ef8b0" id="778" addr="0x7fb6eb3ef8b0" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
-                            <attribute name="feature_iterator" value="std::string" id="779" addr="0x7f1a040af550" />
+                            <attribute name="feature_iterator" value="std::string" id="779" addr="0x7fb6eb3f6550" />
                         </attributelist >
 
-                        <access id="780" addr="0x7f1a040a8870" >
-                            <attributelist id="781" addr="0x7f1a040a8870" >
-                                <attribute name="kind" value="public" id="782" addr="0x7f1a040af550" />
+                        <access id="780" addr="0x7fb6eb3ef870" >
+                            <attributelist id="781" addr="0x7fb6eb3ef870" >
+                                <attribute name="kind" value="public" id="782" addr="0x7fb6eb3f6550" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="783" addr="0x7f1a040a8a30" >
-                            <attributelist id="784" addr="0x7f1a040a8a30" >
-                                <attribute name="ismember" value="1" id="785" addr="0x7f1a040af550" />
-                                <attribute name="sym_name" value="WsgiInputStreamIterator" id="786" addr="0x7f1a040af550" />
-                                <attribute name="name" value="WsgiInputStreamIterator" id="787" addr="0x7f1a040af550" />
-                                <attribute name="decl" value="f()." id="788" addr="0x7f1a040af550" />
-                                <attribute name="access" value="public" id="789" addr="0x7f1a040af550" />
-                                <attribute name="feature_new" value="1" id="790" addr="0x7f1a040af550" />
-                                <attribute name="feature_iterator" value="std::string" id="791" addr="0x7f1a040af550" />
-                                <attribute name="sym_symtab" value="0x7f1a040a88f0" id="792" addr="0x7f1a040a88f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="793" addr="0x7f1a040af550" />
+                        <constructor id="783" addr="0x7fb6eb3efa30" >
+                            <attributelist id="784" addr="0x7fb6eb3efa30" >
+                                <attribute name="ismember" value="1" id="785" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_name" value="WsgiInputStreamIterator" id="786" addr="0x7fb6eb3f6550" />
+                                <attribute name="name" value="WsgiInputStreamIterator" id="787" addr="0x7fb6eb3f6550" />
+                                <attribute name="decl" value="f()." id="788" addr="0x7fb6eb3f6550" />
+                                <attribute name="access" value="public" id="789" addr="0x7fb6eb3f6550" />
+                                <attribute name="feature_new" value="1" id="790" addr="0x7fb6eb3f6550" />
+                                <attribute name="feature_iterator" value="std::string" id="791" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_symtab" value="0x7fb6eb3ef8f0" id="792" addr="0x7fb6eb3ef8f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="793" addr="0x7fb6eb3f6550" />
                             </attributelist >
                          
                         </constructor >
-                        <destructor id="794" addr="0x7f1a040a8bb0" >
-                            <attributelist id="795" addr="0x7f1a040a8bb0" >
-                                <attribute name="ismember" value="1" id="796" addr="0x7f1a040af550" />
-                                <attribute name="sym_name" value="~WsgiInputStreamIterator" id="797" addr="0x7f1a040af550" />
-                                <attribute name="name" value="~WsgiInputStreamIterator" id="798" addr="0x7f1a040af550" />
-                                <attribute name="decl" value="f()." id="799" addr="0x7f1a040af550" />
-                                <attribute name="access" value="public" id="800" addr="0x7f1a040af550" />
-                                <attribute name="sym_symtab" value="0x7f1a040a88f0" id="801" addr="0x7f1a040a88f0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="802" addr="0x7f1a040af550" />
+                        <destructor id="794" addr="0x7fb6eb3efbb0" >
+                            <attributelist id="795" addr="0x7fb6eb3efbb0" >
+                                <attribute name="ismember" value="1" id="796" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_name" value="~WsgiInputStreamIterator" id="797" addr="0x7fb6eb3f6550" />
+                                <attribute name="name" value="~WsgiInputStreamIterator" id="798" addr="0x7fb6eb3f6550" />
+                                <attribute name="decl" value="f()." id="799" addr="0x7fb6eb3f6550" />
+                                <attribute name="access" value="public" id="800" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_symtab" value="0x7fb6eb3ef8f0" id="801" addr="0x7fb6eb3ef8f0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="802" addr="0x7fb6eb3f6550" />
                             </attributelist >
                          
                         </destructor >
-                        <cdecl id="803" addr="0x7f1a040a8f10" >
-                            <attributelist id="804" addr="0x7f1a040a8f10" >
-                                <attribute name="name" value="read" id="805" addr="0x7f1a040af550" />
-                                <attribute name="ismember" value="1" id="806" addr="0x7f1a040af550" />
-                                <attribute name="sym_symtab" value="0x7f1a040a88f0" id="807" addr="0x7f1a040a88f0" />
-                                <attribute name="sym_nextSibling" value="0x7f1a040a9010" id="808" addr="0x7f1a040a9010" />
-                                <attribute name="csym_nextSibling" value="0x7f1a040a9010" id="809" addr="0x7f1a040a9010" />
-                                <attribute name="kind" value="function" id="810" addr="0x7f1a040af550" />
-                                <attribute name="sym_name" value="read" id="811" addr="0x7f1a040af550" />
-                                <attribute name="decl" value="q(const).f(unsigned long)." id="812" addr="0x7f1a040af550" />
-                                <attribute name="access" value="public" id="813" addr="0x7f1a040af550" />
-                                <attribute name="sym_overloaded" value="0x7f1a040a8f10" id="814" addr="0x7f1a040a8f10" />
-                                <parmlist id="815" addr="0x7f1a040a8e30" >
+                        <cdecl id="803" addr="0x7fb6eb3eff10" >
+                            <attributelist id="804" addr="0x7fb6eb3eff10" >
+                                <attribute name="name" value="read" id="805" addr="0x7fb6eb3f6550" />
+                                <attribute name="ismember" value="1" id="806" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_symtab" value="0x7fb6eb3ef8f0" id="807" addr="0x7fb6eb3ef8f0" />
+                                <attribute name="sym_nextSibling" value="0x7fb6eb3f0010" id="808" addr="0x7fb6eb3f0010" />
+                                <attribute name="csym_nextSibling" value="0x7fb6eb3f0010" id="809" addr="0x7fb6eb3f0010" />
+                                <attribute name="kind" value="function" id="810" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_name" value="read" id="811" addr="0x7fb6eb3f6550" />
+                                <attribute name="decl" value="q(const).f(unsigned long)." id="812" addr="0x7fb6eb3f6550" />
+                                <attribute name="access" value="public" id="813" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_overloaded" value="0x7fb6eb3eff10" id="814" addr="0x7fb6eb3eff10" />
+                                <parmlist id="815" addr="0x7fb6eb3efe30" >
                                     <parm id="816">
-                                        <attributelist id="817" addr="0x7f1a040a8e30" >
-                                            <attribute name="name" value="size" id="818" addr="0x7f1a040af550" />
-                                            <attribute name="value" value="0" id="819" addr="0x7f1a040af550" />
-                                            <attribute name="type" value="unsigned long" id="820" addr="0x7f1a040af550" />
+                                        <attributelist id="817" addr="0x7fb6eb3efe30" >
+                                            <attribute name="name" value="size" id="818" addr="0x7fb6eb3f6550" />
+                                            <attribute name="value" value="0" id="819" addr="0x7fb6eb3f6550" />
+                                            <attribute name="type" value="unsigned long" id="820" addr="0x7fb6eb3f6550" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="XBMCAddon::String" id="821" addr="0x7f1a040af550" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="822" addr="0x7f1a040af550" />
+                                <attribute name="type" value="XBMCAddon::String" id="821" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="822" addr="0x7fb6eb3f6550" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="823" addr="0x7f1a040a9010" >
-                            <attributelist id="824" addr="0x7f1a040a9010" >
-                                <attribute name="name" value="read" id="825" addr="0x7f1a040af550" />
-                                <attribute name="ismember" value="1" id="826" addr="0x7f1a040af550" />
-                                <attribute name="sym_symtab" value="0x7f1a040a88f0" id="827" addr="0x7f1a040a88f0" />
-                                <attribute name="sym_previousSibling" value="0x7f1a040a8f10" id="828" addr="0x7f1a040a8f10" />
-                                <attribute name="kind" value="function" id="829" addr="0x7f1a040af550" />
-                                <attribute name="sym_name" value="read" id="830" addr="0x7f1a040af550" />
-                                <attribute name="defaultargs" value="0x7f1a040a8f10" id="831" addr="0x7f1a040a8f10" />
-                                <attribute name="decl" value="q(const).f()." id="832" addr="0x7f1a040af550" />
-                                <attribute name="access" value="public" id="833" addr="0x7f1a040af550" />
-                                <attribute name="sym_overloaded" value="0x7f1a040a8f10" id="834" addr="0x7f1a040a8f10" />
-                                <attribute name="type" value="XBMCAddon::String" id="835" addr="0x7f1a040af550" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="836" addr="0x7f1a040af550" />
+                        <cdecl id="823" addr="0x7fb6eb3f0010" >
+                            <attributelist id="824" addr="0x7fb6eb3f0010" >
+                                <attribute name="name" value="read" id="825" addr="0x7fb6eb3f6550" />
+                                <attribute name="ismember" value="1" id="826" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_symtab" value="0x7fb6eb3ef8f0" id="827" addr="0x7fb6eb3ef8f0" />
+                                <attribute name="sym_previousSibling" value="0x7fb6eb3eff10" id="828" addr="0x7fb6eb3eff10" />
+                                <attribute name="kind" value="function" id="829" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_name" value="read" id="830" addr="0x7fb6eb3f6550" />
+                                <attribute name="defaultargs" value="0x7fb6eb3eff10" id="831" addr="0x7fb6eb3eff10" />
+                                <attribute name="decl" value="q(const).f()." id="832" addr="0x7fb6eb3f6550" />
+                                <attribute name="access" value="public" id="833" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_overloaded" value="0x7fb6eb3eff10" id="834" addr="0x7fb6eb3eff10" />
+                                <attribute name="type" value="XBMCAddon::String" id="835" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="836" addr="0x7fb6eb3f6550" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="837" addr="0x7f1a040a93f0" >
-                            <attributelist id="838" addr="0x7f1a040a93f0" >
-                                <attribute name="name" value="readline" id="839" addr="0x7f1a040af550" />
-                                <attribute name="ismember" value="1" id="840" addr="0x7f1a040af550" />
-                                <attribute name="sym_symtab" value="0x7f1a040a88f0" id="841" addr="0x7f1a040a88f0" />
-                                <attribute name="sym_nextSibling" value="0x7f1a040a94f0" id="842" addr="0x7f1a040a94f0" />
-                                <attribute name="csym_nextSibling" value="0x7f1a040a94f0" id="843" addr="0x7f1a040a94f0" />
-                                <attribute name="kind" value="function" id="844" addr="0x7f1a040af550" />
-                                <attribute name="sym_name" value="readline" id="845" addr="0x7f1a040af550" />
-                                <attribute name="decl" value="q(const).f(unsigned long)." id="846" addr="0x7f1a040af550" />
-                                <attribute name="access" value="public" id="847" addr="0x7f1a040af550" />
-                                <attribute name="sym_overloaded" value="0x7f1a040a93f0" id="848" addr="0x7f1a040a93f0" />
-                                <parmlist id="849" addr="0x7f1a040a9310" >
+                        <cdecl id="837" addr="0x7fb6eb3f03f0" >
+                            <attributelist id="838" addr="0x7fb6eb3f03f0" >
+                                <attribute name="name" value="readline" id="839" addr="0x7fb6eb3f6550" />
+                                <attribute name="ismember" value="1" id="840" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_symtab" value="0x7fb6eb3ef8f0" id="841" addr="0x7fb6eb3ef8f0" />
+                                <attribute name="sym_nextSibling" value="0x7fb6eb3f04f0" id="842" addr="0x7fb6eb3f04f0" />
+                                <attribute name="csym_nextSibling" value="0x7fb6eb3f04f0" id="843" addr="0x7fb6eb3f04f0" />
+                                <attribute name="kind" value="function" id="844" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_name" value="readline" id="845" addr="0x7fb6eb3f6550" />
+                                <attribute name="decl" value="q(const).f(unsigned long)." id="846" addr="0x7fb6eb3f6550" />
+                                <attribute name="access" value="public" id="847" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_overloaded" value="0x7fb6eb3f03f0" id="848" addr="0x7fb6eb3f03f0" />
+                                <parmlist id="849" addr="0x7fb6eb3f0310" >
                                     <parm id="850">
-                                        <attributelist id="851" addr="0x7f1a040a9310" >
-                                            <attribute name="name" value="size" id="852" addr="0x7f1a040af550" />
-                                            <attribute name="value" value="0" id="853" addr="0x7f1a040af550" />
-                                            <attribute name="type" value="unsigned long" id="854" addr="0x7f1a040af550" />
+                                        <attributelist id="851" addr="0x7fb6eb3f0310" >
+                                            <attribute name="name" value="size" id="852" addr="0x7fb6eb3f6550" />
+                                            <attribute name="value" value="0" id="853" addr="0x7fb6eb3f6550" />
+                                            <attribute name="type" value="unsigned long" id="854" addr="0x7fb6eb3f6550" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="XBMCAddon::String" id="855" addr="0x7f1a040af550" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="856" addr="0x7f1a040af550" />
+                                <attribute name="type" value="XBMCAddon::String" id="855" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="856" addr="0x7fb6eb3f6550" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="857" addr="0x7f1a040a94f0" >
-                            <attributelist id="858" addr="0x7f1a040a94f0" >
-                                <attribute name="name" value="readline" id="859" addr="0x7f1a040af550" />
-                                <attribute name="ismember" value="1" id="860" addr="0x7f1a040af550" />
-                                <attribute name="sym_symtab" value="0x7f1a040a88f0" id="861" addr="0x7f1a040a88f0" />
-                                <attribute name="sym_previousSibling" value="0x7f1a040a93f0" id="862" addr="0x7f1a040a93f0" />
-                                <attribute name="kind" value="function" id="863" addr="0x7f1a040af550" />
-                                <attribute name="sym_name" value="readline" id="864" addr="0x7f1a040af550" />
-                                <attribute name="defaultargs" value="0x7f1a040a93f0" id="865" addr="0x7f1a040a93f0" />
-                                <attribute name="decl" value="q(const).f()." id="866" addr="0x7f1a040af550" />
-                                <attribute name="access" value="public" id="867" addr="0x7f1a040af550" />
-                                <attribute name="sym_overloaded" value="0x7f1a040a93f0" id="868" addr="0x7f1a040a93f0" />
-                                <attribute name="type" value="XBMCAddon::String" id="869" addr="0x7f1a040af550" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="870" addr="0x7f1a040af550" />
+                        <cdecl id="857" addr="0x7fb6eb3f04f0" >
+                            <attributelist id="858" addr="0x7fb6eb3f04f0" >
+                                <attribute name="name" value="readline" id="859" addr="0x7fb6eb3f6550" />
+                                <attribute name="ismember" value="1" id="860" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_symtab" value="0x7fb6eb3ef8f0" id="861" addr="0x7fb6eb3ef8f0" />
+                                <attribute name="sym_previousSibling" value="0x7fb6eb3f03f0" id="862" addr="0x7fb6eb3f03f0" />
+                                <attribute name="kind" value="function" id="863" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_name" value="readline" id="864" addr="0x7fb6eb3f6550" />
+                                <attribute name="defaultargs" value="0x7fb6eb3f03f0" id="865" addr="0x7fb6eb3f03f0" />
+                                <attribute name="decl" value="q(const).f()." id="866" addr="0x7fb6eb3f6550" />
+                                <attribute name="access" value="public" id="867" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_overloaded" value="0x7fb6eb3f03f0" id="868" addr="0x7fb6eb3f03f0" />
+                                <attribute name="type" value="XBMCAddon::String" id="869" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="870" addr="0x7fb6eb3f6550" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="871" addr="0x7f1a040a9970" >
-                            <attributelist id="872" addr="0x7f1a040a9970" >
-                                <attribute name="name" value="readlines" id="873" addr="0x7f1a040af550" />
-                                <attribute name="ismember" value="1" id="874" addr="0x7f1a040af550" />
-                                <attribute name="sym_symtab" value="0x7f1a040a88f0" id="875" addr="0x7f1a040a88f0" />
-                                <attribute name="sym_nextSibling" value="0x7f1a040a9a70" id="876" addr="0x7f1a040a9a70" />
-                                <attribute name="csym_nextSibling" value="0x7f1a040a9a70" id="877" addr="0x7f1a040a9a70" />
-                                <attribute name="kind" value="function" id="878" addr="0x7f1a040af550" />
-                                <attribute name="sym_name" value="readlines" id="879" addr="0x7f1a040af550" />
-                                <attribute name="decl" value="q(const).f(unsigned long)." id="880" addr="0x7f1a040af550" />
-                                <attribute name="access" value="public" id="881" addr="0x7f1a040af550" />
-                                <attribute name="sym_overloaded" value="0x7f1a040a9970" id="882" addr="0x7f1a040a9970" />
-                                <parmlist id="883" addr="0x7f1a040a9890" >
+                        <cdecl id="871" addr="0x7fb6eb3f0970" >
+                            <attributelist id="872" addr="0x7fb6eb3f0970" >
+                                <attribute name="name" value="readlines" id="873" addr="0x7fb6eb3f6550" />
+                                <attribute name="ismember" value="1" id="874" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_symtab" value="0x7fb6eb3ef8f0" id="875" addr="0x7fb6eb3ef8f0" />
+                                <attribute name="sym_nextSibling" value="0x7fb6eb3f0a70" id="876" addr="0x7fb6eb3f0a70" />
+                                <attribute name="csym_nextSibling" value="0x7fb6eb3f0a70" id="877" addr="0x7fb6eb3f0a70" />
+                                <attribute name="kind" value="function" id="878" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_name" value="readlines" id="879" addr="0x7fb6eb3f6550" />
+                                <attribute name="decl" value="q(const).f(unsigned long)." id="880" addr="0x7fb6eb3f6550" />
+                                <attribute name="access" value="public" id="881" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_overloaded" value="0x7fb6eb3f0970" id="882" addr="0x7fb6eb3f0970" />
+                                <parmlist id="883" addr="0x7fb6eb3f0890" >
                                     <parm id="884">
-                                        <attributelist id="885" addr="0x7f1a040a9890" >
-                                            <attribute name="name" value="sizehint" id="886" addr="0x7f1a040af550" />
-                                            <attribute name="value" value="0" id="887" addr="0x7f1a040af550" />
-                                            <attribute name="type" value="unsigned long" id="888" addr="0x7f1a040af550" />
+                                        <attributelist id="885" addr="0x7fb6eb3f0890" >
+                                            <attribute name="name" value="sizehint" id="886" addr="0x7fb6eb3f6550" />
+                                            <attribute name="value" value="0" id="887" addr="0x7fb6eb3f6550" />
+                                            <attribute name="type" value="unsigned long" id="888" addr="0x7fb6eb3f6550" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="std::vector&lt;(XBMCAddon::String)>" id="889" addr="0x7f1a040af550" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="890" addr="0x7f1a040af550" />
+                                <attribute name="type" value="std::vector&lt;(XBMCAddon::String)>" id="889" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="890" addr="0x7fb6eb3f6550" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="891" addr="0x7f1a040a9a70" >
-                            <attributelist id="892" addr="0x7f1a040a9a70" >
-                                <attribute name="name" value="readlines" id="893" addr="0x7f1a040af550" />
-                                <attribute name="ismember" value="1" id="894" addr="0x7f1a040af550" />
-                                <attribute name="sym_symtab" value="0x7f1a040a88f0" id="895" addr="0x7f1a040a88f0" />
-                                <attribute name="sym_previousSibling" value="0x7f1a040a9970" id="896" addr="0x7f1a040a9970" />
-                                <attribute name="kind" value="function" id="897" addr="0x7f1a040af550" />
-                                <attribute name="sym_name" value="readlines" id="898" addr="0x7f1a040af550" />
-                                <attribute name="defaultargs" value="0x7f1a040a9970" id="899" addr="0x7f1a040a9970" />
-                                <attribute name="decl" value="q(const).f()." id="900" addr="0x7f1a040af550" />
-                                <attribute name="access" value="public" id="901" addr="0x7f1a040af550" />
-                                <attribute name="sym_overloaded" value="0x7f1a040a9970" id="902" addr="0x7f1a040a9970" />
-                                <attribute name="type" value="std::vector&lt;(XBMCAddon::String)>" id="903" addr="0x7f1a040af550" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="904" addr="0x7f1a040af550" />
+                        <cdecl id="891" addr="0x7fb6eb3f0a70" >
+                            <attributelist id="892" addr="0x7fb6eb3f0a70" >
+                                <attribute name="name" value="readlines" id="893" addr="0x7fb6eb3f6550" />
+                                <attribute name="ismember" value="1" id="894" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_symtab" value="0x7fb6eb3ef8f0" id="895" addr="0x7fb6eb3ef8f0" />
+                                <attribute name="sym_previousSibling" value="0x7fb6eb3f0970" id="896" addr="0x7fb6eb3f0970" />
+                                <attribute name="kind" value="function" id="897" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_name" value="readlines" id="898" addr="0x7fb6eb3f6550" />
+                                <attribute name="defaultargs" value="0x7fb6eb3f0970" id="899" addr="0x7fb6eb3f0970" />
+                                <attribute name="decl" value="q(const).f()." id="900" addr="0x7fb6eb3f6550" />
+                                <attribute name="access" value="public" id="901" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_overloaded" value="0x7fb6eb3f0970" id="902" addr="0x7fb6eb3f0970" />
+                                <attribute name="type" value="std::vector&lt;(XBMCAddon::String)>" id="903" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="904" addr="0x7fb6eb3f6550" />
                             </attributelist >
                          
                         </cdecl >
                     </class >
-                    <class id="905" addr="0x7f1a040a9d50" >
-                        <attributelist id="906" addr="0x7f1a040a9d50" >
-                            <attribute name="name" value="XBMCAddon::xbmcwsgi::WsgiInputStream" id="907" addr="0x7f1a040af550" />
-                            <attribute name="sym_symtab" value="0x7f1a040a7170" id="908" addr="0x7f1a040a7170" />
-                            <attribute name="symtab" value="0x7f1a040a9eb0" id="909" addr="0x7f1a040a9eb0" />
-                            <attribute name="allows_typedef" value="1" id="910" addr="0x7f1a040af550" />
-                            <attribute name="typepass_visit" value="1" id="911" addr="0x7f1a040af550" />
-                            <attribute name="allocate_visit" value="1" id="912" addr="0x7f1a040af550" />
-                            <attribute name="feature_iterable" value="XBMCAddon::xbmcwsgi::WsgiInputStreamIterator" id="913" addr="0x7f1a040af550" />
-                            <attribute name="kind" value="class" id="914" addr="0x7f1a040af550" />
-                            <attribute name="sym_name" value="WsgiInputStream" id="915" addr="0x7f1a040af550" />
-                            <attribute name="allocate_default_constructor" value="1" id="916" addr="0x7f1a040af550" />
-                            <attribute name="allocate_has_constructor" value="1" id="917" addr="0x7f1a040af550" />
-                            <attribute name="allocate_public_constructor" value="1" id="918" addr="0x7f1a040af550" />
-                            <attribute name="allocate_has_destructor" value="1" id="919" addr="0x7f1a040af550" />
-                            <attribute name="allocate_default_destructor" value="1" id="920" addr="0x7f1a040af550" />
-                            <attribute name="allocate_copy_constructor" value="1" id="921" addr="0x7f1a040af550" />
-                            <attribute name="privatebaselist" value="0x7f1a040a9d30" id="922" addr="0x7f1a040a9d30" />
-                            <attribute name="protectedbaselist" value="0x7f1a040a9d10" id="923" addr="0x7f1a040a9d10" />
-                            <baselist id="924" addr="0x7f1a040a9cf0" >
-                                <base name="WsgiInputStreamIterator" id="925" addr="0x7f1a040a9c70" />
+                    <class id="905" addr="0x7fb6eb3f0d50" >
+                        <attributelist id="906" addr="0x7fb6eb3f0d50" >
+                            <attribute name="name" value="XBMCAddon::xbmcwsgi::WsgiInputStream" id="907" addr="0x7fb6eb3f6550" />
+                            <attribute name="sym_symtab" value="0x7fb6eb3ee170" id="908" addr="0x7fb6eb3ee170" />
+                            <attribute name="symtab" value="0x7fb6eb3f0eb0" id="909" addr="0x7fb6eb3f0eb0" />
+                            <attribute name="allows_typedef" value="1" id="910" addr="0x7fb6eb3f6550" />
+                            <attribute name="typepass_visit" value="1" id="911" addr="0x7fb6eb3f6550" />
+                            <attribute name="allocate_visit" value="1" id="912" addr="0x7fb6eb3f6550" />
+                            <attribute name="feature_iterable" value="XBMCAddon::xbmcwsgi::WsgiInputStreamIterator" id="913" addr="0x7fb6eb3f6550" />
+                            <attribute name="kind" value="class" id="914" addr="0x7fb6eb3f6550" />
+                            <attribute name="sym_name" value="WsgiInputStream" id="915" addr="0x7fb6eb3f6550" />
+                            <attribute name="allocate_default_constructor" value="1" id="916" addr="0x7fb6eb3f6550" />
+                            <attribute name="allocate_has_constructor" value="1" id="917" addr="0x7fb6eb3f6550" />
+                            <attribute name="allocate_public_constructor" value="1" id="918" addr="0x7fb6eb3f6550" />
+                            <attribute name="allocate_has_destructor" value="1" id="919" addr="0x7fb6eb3f6550" />
+                            <attribute name="allocate_default_destructor" value="1" id="920" addr="0x7fb6eb3f6550" />
+                            <attribute name="allocate_copy_constructor" value="1" id="921" addr="0x7fb6eb3f6550" />
+                            <attribute name="privatebaselist" value="0x7fb6eb3f0d30" id="922" addr="0x7fb6eb3f0d30" />
+                            <attribute name="protectedbaselist" value="0x7fb6eb3f0d10" id="923" addr="0x7fb6eb3f0d10" />
+                            <baselist id="924" addr="0x7fb6eb3f0cf0" >
+                                <base name="WsgiInputStreamIterator" id="925" addr="0x7fb6eb3f0c70" />
                             </baselist >
-                            <attribute name="module" value="xbmcwsgi" id="926" addr="0x7f1a040a6270" />
-                            <attribute name="bases" value="0x7f1a040adab0" id="927" addr="0x7f1a040adab0" />
-                            <attribute name="allbases" value="0x7f1a040adf50" id="928" addr="0x7f1a040adf50" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="929" addr="0x7f1a040af550" />
-                            <typescope id="930" addr="0x7f1a040ad8d0" >
-                                <attributelist id="931" addr="0x7f1a040ad8d0" >
-                                    <attribute name="inherit" value="0x7f1a040adb30" id="932" addr="0x7f1a040adb30" />
-                                    <attribute name="name" value="WsgiInputStream" id="933" addr="0x7f1a040af550" />
-                                    <typetab id="934" addr="0x7f1a040ad910" >
-                                        <attributelist id="935" addr="0x7f1a040ad910" >
+                            <attribute name="module" value="xbmcwsgi" id="926" addr="0x7fb6eb3ed270" />
+                            <attribute name="bases" value="0x7fb6eb3f4ab0" id="927" addr="0x7fb6eb3f4ab0" />
+                            <attribute name="allbases" value="0x7fb6eb3f4f50" id="928" addr="0x7fb6eb3f4f50" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="929" addr="0x7fb6eb3f6550" />
+                            <typescope id="930" addr="0x7fb6eb3f48d0" >
+                                <attributelist id="931" addr="0x7fb6eb3f48d0" >
+                                    <attribute name="inherit" value="0x7fb6eb3f4b30" id="932" addr="0x7fb6eb3f4b30" />
+                                    <attribute name="name" value="WsgiInputStream" id="933" addr="0x7fb6eb3f6550" />
+                                    <typetab id="934" addr="0x7fb6eb3f4910" >
+                                        <attributelist id="935" addr="0x7fb6eb3f4910" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f1a040acab0" id="936" addr="0x7f1a040acab0" />
-                                    <attribute name="qname" value="XBMCAddon::xbmcwsgi::WsgiInputStream" id="937" addr="0x7f1a040af550" />
-                                    <attribute name="symtab" value="0x7f1a040a9eb0" id="938" addr="0x7f1a040a9eb0" />
+                                    <attribute name="parent" value="0x7fb6eb3f3ab0" id="936" addr="0x7fb6eb3f3ab0" />
+                                    <attribute name="qname" value="XBMCAddon::xbmcwsgi::WsgiInputStream" id="937" addr="0x7fb6eb3f6550" />
+                                    <attribute name="symtab" value="0x7fb6eb3f0eb0" id="938" addr="0x7fb6eb3f0eb0" />
                                 </attributelist >
-                                <typescopesitem id="939" addr="0x7f1a040adb30" >
-                                    <attributelist id="940" addr="0x7f1a040adb30" >
+                                <typescopesitem id="939" addr="0x7fb6eb3f4b30" >
+                                    <attributelist id="940" addr="0x7fb6eb3f4b30" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="941" addr="0x7f1a040ad9b0" >
-                                    <attributelist id="942" addr="0x7f1a040ad9b0" >
+                                <typescopesitem id="941" addr="0x7fb6eb3f49b0" >
+                                    <attributelist id="942" addr="0x7fb6eb3f49b0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="943" addr="0x7f1a040ad910" >
-                                    <attributelist id="944" addr="0x7f1a040ad910" >
+                                <typescopesitem id="943" addr="0x7fb6eb3f4910" >
+                                    <attributelist id="944" addr="0x7fb6eb3f4910" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="945" addr="0x7f1a040acab0" >
-                                    <attributelist id="946" addr="0x7f1a040acab0" >
-                                        <attribute name="name" value="xbmcwsgi" id="947" addr="0x7f1a040af550" />
-                                        <typetab id="948" addr="0x7f1a040acad0" >
-                                            <attributelist id="949" addr="0x7f1a040acad0" >
-                                                <attribute name="WsgiInputStreamIterator" value="WsgiInputStreamIterator" id="950" addr="0x7f1a040af550" />
-                                                <attribute name="WsgiHttpHeader" value="Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>" id="951" addr="0x7f1a040af550" />
-                                                <attribute name="WsgiErrorStream" value="WsgiErrorStream" id="952" addr="0x7f1a040af550" />
-                                                <attribute name="WsgiInputStream" value="WsgiInputStream" id="953" addr="0x7f1a040af550" />
-                                                <attribute name="WsgiResponse" value="WsgiResponse" id="954" addr="0x7f1a040af550" />
-                                                <attribute name="WsgiResponseBody" value="WsgiResponseBody" id="955" addr="0x7f1a040af550" />
+                                <typescopesitem id="945" addr="0x7fb6eb3f3ab0" >
+                                    <attributelist id="946" addr="0x7fb6eb3f3ab0" >
+                                        <attribute name="name" value="xbmcwsgi" id="947" addr="0x7fb6eb3f6550" />
+                                        <typetab id="948" addr="0x7fb6eb3f3ad0" >
+                                            <attributelist id="949" addr="0x7fb6eb3f3ad0" >
+                                                <attribute name="WsgiInputStreamIterator" value="WsgiInputStreamIterator" id="950" addr="0x7fb6eb3f6550" />
+                                                <attribute name="WsgiHttpHeader" value="Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>" id="951" addr="0x7fb6eb3f6550" />
+                                                <attribute name="WsgiErrorStream" value="WsgiErrorStream" id="952" addr="0x7fb6eb3f6550" />
+                                                <attribute name="WsgiInputStream" value="WsgiInputStream" id="953" addr="0x7fb6eb3f6550" />
+                                                <attribute name="WsgiResponse" value="WsgiResponse" id="954" addr="0x7fb6eb3f6550" />
+                                                <attribute name="WsgiResponseBody" value="WsgiResponseBody" id="955" addr="0x7fb6eb3f6550" />
                                             </attributelist >
-                                            <typetabsitem id="956" addr="0x7f1a040ad450" >
-                                                <attributelist id="957" addr="0x7f1a040ad450" >
+                                            <typetabsitem id="956" addr="0x7fb6eb3f4450" >
+                                                <attributelist id="957" addr="0x7fb6eb3f4450" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="958" addr="0x7f1a040adff0" >
-                                                <attributelist id="959" addr="0x7f1a040adff0" >
+                                            <typetabsitem id="958" addr="0x7fb6eb3f4ff0" >
+                                                <attributelist id="959" addr="0x7fb6eb3f4ff0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="960" addr="0x7f1a040acbb0" >
-                                                <attributelist id="961" addr="0x7f1a040acbb0" >
+                                            <typetabsitem id="960" addr="0x7fb6eb3f3bb0" >
+                                                <attributelist id="961" addr="0x7fb6eb3f3bb0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="962" addr="0x7f1a040ad830" >
-                                                <attributelist id="963" addr="0x7f1a040ad830" >
+                                            <typetabsitem id="962" addr="0x7fb6eb3f4830" >
+                                                <attributelist id="963" addr="0x7fb6eb3f4830" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="964" addr="0x7f1a040ae250" >
-                                                <attributelist id="965" addr="0x7f1a040ae250" >
+                                            <typetabsitem id="964" addr="0x7fb6eb3f5250" >
+                                                <attributelist id="965" addr="0x7fb6eb3f5250" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="966" addr="0x7f1a040aebb0" >
-                                                <attributelist id="967" addr="0x7f1a040aebb0" >
+                                            <typetabsitem id="966" addr="0x7fb6eb3f5bb0" >
+                                                <attributelist id="967" addr="0x7fb6eb3f5bb0" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7f1a040ac650" id="968" addr="0x7f1a040ac650" />
-                                        <attribute name="qname" value="XBMCAddon::xbmcwsgi" id="969" addr="0x7f1a040af550" />
-                                        <attribute name="symtab" value="0x7f1a040a7170" id="970" addr="0x7f1a040a7170" />
+                                        <attribute name="parent" value="0x7fb6eb3f3650" id="968" addr="0x7fb6eb3f3650" />
+                                        <attribute name="qname" value="XBMCAddon::xbmcwsgi" id="969" addr="0x7fb6eb3f6550" />
+                                        <attribute name="symtab" value="0x7fb6eb3ee170" id="970" addr="0x7fb6eb3ee170" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="971" addr="0x7f1a040ada10" >
-                                    <attributelist id="972" addr="0x7f1a040ada10" >
+                                <typescopesitem id="971" addr="0x7fb6eb3f4a10" >
+                                    <attributelist id="972" addr="0x7fb6eb3f4a10" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="973" addr="0x7f1a040a9eb0" >
-                                    <attributelist id="974" addr="0x7f1a040a9eb0" >
-                                        <attribute name="inherit" value="0x7f1a040a9f10" id="975" addr="0x7f1a040a9f10" />
-                                        <attribute name="name" value="WsgiInputStream" id="976" addr="0x7f1a040af550" />
-                                        <attribute name="csymtab" value="0x7f1a040a9ed0" id="977" addr="0x7f1a040a9ed0" />
-                                        <attribute name="symtab" value="0x7f1a040a9e90" id="978" addr="0x7f1a040a9e90" />
+                                <typescopesitem id="973" addr="0x7fb6eb3f0eb0" >
+                                    <attributelist id="974" addr="0x7fb6eb3f0eb0" >
+                                        <attribute name="inherit" value="0x7fb6eb3f0f10" id="975" addr="0x7fb6eb3f0f10" />
+                                        <attribute name="name" value="WsgiInputStream" id="976" addr="0x7fb6eb3f6550" />
+                                        <attribute name="csymtab" value="0x7fb6eb3f0ed0" id="977" addr="0x7fb6eb3f0ed0" />
+                                        <attribute name="symtab" value="0x7fb6eb3f0e90" id="978" addr="0x7fb6eb3f0e90" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <access id="979" addr="0x7f1a040a9e30" >
-                            <attributelist id="980" addr="0x7f1a040a9e30" >
-                                <attribute name="kind" value="public" id="981" addr="0x7f1a040af550" />
+                        <access id="979" addr="0x7fb6eb3f0e30" >
+                            <attributelist id="980" addr="0x7fb6eb3f0e30" >
+                                <attribute name="kind" value="public" id="981" addr="0x7fb6eb3f6550" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="982" addr="0x7f1a040aa010" >
-                            <attributelist id="983" addr="0x7f1a040aa010" >
-                                <attribute name="ismember" value="1" id="984" addr="0x7f1a040af550" />
-                                <attribute name="sym_name" value="WsgiInputStream" id="985" addr="0x7f1a040af550" />
-                                <attribute name="name" value="WsgiInputStream" id="986" addr="0x7f1a040af550" />
-                                <attribute name="decl" value="f()." id="987" addr="0x7f1a040af550" />
-                                <attribute name="access" value="public" id="988" addr="0x7f1a040af550" />
-                                <attribute name="feature_new" value="1" id="989" addr="0x7f1a040af550" />
-                                <attribute name="feature_iterable" value="XBMCAddon::xbmcwsgi::WsgiInputStreamIterator" id="990" addr="0x7f1a040af550" />
-                                <attribute name="sym_symtab" value="0x7f1a040a9eb0" id="991" addr="0x7f1a040a9eb0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="992" addr="0x7f1a040af550" />
+                        <constructor id="982" addr="0x7fb6eb3f1010" >
+                            <attributelist id="983" addr="0x7fb6eb3f1010" >
+                                <attribute name="ismember" value="1" id="984" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_name" value="WsgiInputStream" id="985" addr="0x7fb6eb3f6550" />
+                                <attribute name="name" value="WsgiInputStream" id="986" addr="0x7fb6eb3f6550" />
+                                <attribute name="decl" value="f()." id="987" addr="0x7fb6eb3f6550" />
+                                <attribute name="access" value="public" id="988" addr="0x7fb6eb3f6550" />
+                                <attribute name="feature_new" value="1" id="989" addr="0x7fb6eb3f6550" />
+                                <attribute name="feature_iterable" value="XBMCAddon::xbmcwsgi::WsgiInputStreamIterator" id="990" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_symtab" value="0x7fb6eb3f0eb0" id="991" addr="0x7fb6eb3f0eb0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="992" addr="0x7fb6eb3f6550" />
                             </attributelist >
                          
                         </constructor >
-                        <destructor id="993" addr="0x7f1a040aa190" >
-                            <attributelist id="994" addr="0x7f1a040aa190" >
-                                <attribute name="ismember" value="1" id="995" addr="0x7f1a040af550" />
-                                <attribute name="sym_name" value="~WsgiInputStream" id="996" addr="0x7f1a040af550" />
-                                <attribute name="name" value="~WsgiInputStream" id="997" addr="0x7f1a040af550" />
-                                <attribute name="decl" value="f()." id="998" addr="0x7f1a040af550" />
-                                <attribute name="access" value="public" id="999" addr="0x7f1a040af550" />
-                                <attribute name="sym_symtab" value="0x7f1a040a9eb0" id="1000" addr="0x7f1a040a9eb0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="1001" addr="0x7f1a040af550" />
+                        <destructor id="993" addr="0x7fb6eb3f1190" >
+                            <attributelist id="994" addr="0x7fb6eb3f1190" >
+                                <attribute name="ismember" value="1" id="995" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_name" value="~WsgiInputStream" id="996" addr="0x7fb6eb3f6550" />
+                                <attribute name="name" value="~WsgiInputStream" id="997" addr="0x7fb6eb3f6550" />
+                                <attribute name="decl" value="f()." id="998" addr="0x7fb6eb3f6550" />
+                                <attribute name="access" value="public" id="999" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_symtab" value="0x7fb6eb3f0eb0" id="1000" addr="0x7fb6eb3f0eb0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="1001" addr="0x7fb6eb3f6550" />
                             </attributelist >
                          
                         </destructor >
@@ -1548,376 +1548,376 @@
                 </namespace >
             </namespace >
         </include >
-        <include id="1002" addr="0x7f1a040aa350" >
-            <attributelist id="1003" addr="0x7f1a040aa350" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/wsgi/WsgiResponse.h" id="1004" addr="0x7f1a040af550" />
+        <include id="1002" addr="0x7fb6eb3f1350" >
+            <attributelist id="1003" addr="0x7fb6eb3f1350" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/wsgi/WsgiResponse.h" id="1004" addr="0x7fb6eb3f6550" />
             </attributelist >
 
-            <namespace id="1005" addr="0x7f1a040aa3f0" >
-                <attributelist id="1006" addr="0x7f1a040aa3f0" >
-                    <attribute name="sym_name" value="XBMCAddon" id="1007" addr="0x7f1a040af550" />
-                    <attribute name="name" value="XBMCAddon" id="1008" addr="0x7f1a040af550" />
-                    <attribute name="sym_previousSibling" value="0x7f1a040a8590" id="1009" addr="0x7f1a040a8590" />
-                    <attribute name="csym_nextSibling" value="0x7f1a040ab990" id="1010" addr="0x7f1a040ab990" />
-                    <attribute name="sym_nextSibling" value="0x7f1a040ab990" id="1011" addr="0x7f1a040ab990" />
-                    <typescope id="1012" addr="0x7f1a040ac650" >
-                        <attributelist id="1013" addr="0x7f1a040ac650" >
-                            <attribute name="name" value="XBMCAddon" id="1014" addr="0x7f1a040af550" />
-                            <typetab id="1015" addr="0x7f1a040ac690" >
-                                <attributelist id="1016" addr="0x7f1a040ac690" >
-                                    <attribute name="String" value="std::string" id="1017" addr="0x7f1a040af550" />
+            <namespace id="1005" addr="0x7fb6eb3f13f0" >
+                <attributelist id="1006" addr="0x7fb6eb3f13f0" >
+                    <attribute name="sym_name" value="XBMCAddon" id="1007" addr="0x7fb6eb3f6550" />
+                    <attribute name="name" value="XBMCAddon" id="1008" addr="0x7fb6eb3f6550" />
+                    <attribute name="sym_previousSibling" value="0x7fb6eb3ef590" id="1009" addr="0x7fb6eb3ef590" />
+                    <attribute name="csym_nextSibling" value="0x7fb6eb3f2990" id="1010" addr="0x7fb6eb3f2990" />
+                    <attribute name="sym_nextSibling" value="0x7fb6eb3f2990" id="1011" addr="0x7fb6eb3f2990" />
+                    <typescope id="1012" addr="0x7fb6eb3f3650" >
+                        <attributelist id="1013" addr="0x7fb6eb3f3650" >
+                            <attribute name="name" value="XBMCAddon" id="1014" addr="0x7fb6eb3f6550" />
+                            <typetab id="1015" addr="0x7fb6eb3f3690" >
+                                <attributelist id="1016" addr="0x7fb6eb3f3690" >
+                                    <attribute name="String" value="std::string" id="1017" addr="0x7fb6eb3f6550" />
                                 </attributelist >
-                                <typetabsitem id="1018" addr="0x7f1a040ac870" >
-                                    <attributelist id="1019" addr="0x7f1a040ac870" >
+                                <typetabsitem id="1018" addr="0x7fb6eb3f3870" >
+                                    <attributelist id="1019" addr="0x7fb6eb3f3870" >
                                     </attributelist >
                                 </typetabsitem >
                             </typetab >
-                            <attribute name="parent" value="0x7f1a0408fa30" id="1020" addr="0x7f1a0408fa30" />
-                            <attribute name="qname" value="XBMCAddon" id="1021" addr="0x7f1a040af550" />
-                            <attribute name="symtab" value="0x7f1a040a6950" id="1022" addr="0x7f1a040a6950" />
+                            <attribute name="parent" value="0x7fb6eb3d6a30" id="1020" addr="0x7fb6eb3d6a30" />
+                            <attribute name="qname" value="XBMCAddon" id="1021" addr="0x7fb6eb3f6550" />
+                            <attribute name="symtab" value="0x7fb6eb3ed950" id="1022" addr="0x7fb6eb3ed950" />
                         </attributelist >
-                        <typescopesitem id="1023" addr="0x7f1a040a6910" >
-                            <attributelist id="1024" addr="0x7f1a040a6910" >
+                        <typescopesitem id="1023" addr="0x7fb6eb3ed910" >
+                            <attributelist id="1024" addr="0x7fb6eb3ed910" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="1025" addr="0x7f1a040ac690" >
-                            <attributelist id="1026" addr="0x7f1a040ac690" >
-                                <attribute name="String" value="std::string" id="1027" addr="0x7f1a040af550" />
+                        <typescopesitem id="1025" addr="0x7fb6eb3f3690" >
+                            <attributelist id="1026" addr="0x7fb6eb3f3690" >
+                                <attribute name="String" value="std::string" id="1027" addr="0x7fb6eb3f6550" />
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="1028" addr="0x7f1a0408fa30" >
-                            <attributelist id="1029" addr="0x7f1a0408fa30" >
-                                <attribute name="name" value="" id="1030" addr="0x7f1a040af550" />
-                                <typetab id="1031" addr="0x7f1a0408fa90" >
-                                    <attributelist id="1032" addr="0x7f1a0408fa90" >
-                                        <attribute name="HTTPPythonRequest" value="HTTPPythonRequest" id="1033" addr="0x7f1a040af550" />
+                        <typescopesitem id="1028" addr="0x7fb6eb3d6a30" >
+                            <attributelist id="1029" addr="0x7fb6eb3d6a30" >
+                                <attribute name="name" value="" id="1030" addr="0x7fb6eb3f6550" />
+                                <typetab id="1031" addr="0x7fb6eb3d6a90" >
+                                    <attributelist id="1032" addr="0x7fb6eb3d6a90" >
+                                        <attribute name="HTTPPythonRequest" value="HTTPPythonRequest" id="1033" addr="0x7fb6eb3f6550" />
                                     </attributelist >
-                                    <typetabsitem id="1034" addr="0x7f1a040ac7b0" >
-                                        <attributelist id="1035" addr="0x7f1a040ac7b0" >
+                                    <typetabsitem id="1034" addr="0x7fb6eb3f37b0" >
+                                        <attributelist id="1035" addr="0x7fb6eb3f37b0" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="1036" addr="0x7f1a040ac790" >
-                            <attributelist id="1037" addr="0x7f1a040ac790" >
+                        <typescopesitem id="1036" addr="0x7fb6eb3f3790" >
+                            <attributelist id="1037" addr="0x7fb6eb3f3790" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="1038" addr="0x7f1a040a6950" >
-                            <attributelist id="1039" addr="0x7f1a040a6950" >
-                                <attribute name="name" value="XBMCAddon" id="1040" addr="0x7f1a040af550" />
-                                <attribute name="csymtab" value="0x7f1a040a6990" id="1041" addr="0x7f1a040a6990" />
-                                <attribute name="symtab" value="0x7f1a040a6930" id="1042" addr="0x7f1a040a6930" />
+                        <typescopesitem id="1038" addr="0x7fb6eb3ed950" >
+                            <attributelist id="1039" addr="0x7fb6eb3ed950" >
+                                <attribute name="name" value="XBMCAddon" id="1040" addr="0x7fb6eb3f6550" />
+                                <attribute name="csymtab" value="0x7fb6eb3ed990" id="1041" addr="0x7fb6eb3ed990" />
+                                <attribute name="symtab" value="0x7fb6eb3ed930" id="1042" addr="0x7fb6eb3ed930" />
                             </attributelist >
                         </typescopesitem >
                     </typescope >
-                    <attribute name="symtab" value="0x7f1a040a6950" id="1043" addr="0x7f1a040a6950" />
-                    <attribute name="sym_symtab" value="0x7f1a0408f950" id="1044" addr="0x7f1a0408f950" />
+                    <attribute name="symtab" value="0x7fb6eb3ed950" id="1043" addr="0x7fb6eb3ed950" />
+                    <attribute name="sym_symtab" value="0x7fb6eb3d6950" id="1044" addr="0x7fb6eb3d6950" />
                 </attributelist >
 
-                <namespace id="1045" addr="0x7f1a040aa470" >
-                    <attributelist id="1046" addr="0x7f1a040aa470" >
-                        <attribute name="sym_name" value="xbmcwsgi" id="1047" addr="0x7f1a040af550" />
-                        <attribute name="name" value="xbmcwsgi" id="1048" addr="0x7f1a040af550" />
-                        <attribute name="sym_previousSibling" value="0x7f1a040a8610" id="1049" addr="0x7f1a040a8610" />
-                        <attribute name="csym_nextSibling" value="0x7f1a040aba10" id="1050" addr="0x7f1a040aba10" />
-                        <attribute name="sym_nextSibling" value="0x7f1a040aba10" id="1051" addr="0x7f1a040aba10" />
-                        <typescope id="1052" addr="0x7f1a040acab0" >
-                            <attributelist id="1053" addr="0x7f1a040acab0" >
-                                <attribute name="name" value="xbmcwsgi" id="1054" addr="0x7f1a040af550" />
-                                <typetab id="1055" addr="0x7f1a040acad0" >
-                                    <attributelist id="1056" addr="0x7f1a040acad0" >
-                                        <attribute name="WsgiInputStreamIterator" value="WsgiInputStreamIterator" id="1057" addr="0x7f1a040af550" />
-                                        <attribute name="WsgiHttpHeader" value="Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>" id="1058" addr="0x7f1a040af550" />
-                                        <attribute name="WsgiErrorStream" value="WsgiErrorStream" id="1059" addr="0x7f1a040af550" />
-                                        <attribute name="WsgiInputStream" value="WsgiInputStream" id="1060" addr="0x7f1a040af550" />
-                                        <attribute name="WsgiResponse" value="WsgiResponse" id="1061" addr="0x7f1a040af550" />
-                                        <attribute name="WsgiResponseBody" value="WsgiResponseBody" id="1062" addr="0x7f1a040af550" />
+                <namespace id="1045" addr="0x7fb6eb3f1470" >
+                    <attributelist id="1046" addr="0x7fb6eb3f1470" >
+                        <attribute name="sym_name" value="xbmcwsgi" id="1047" addr="0x7fb6eb3f6550" />
+                        <attribute name="name" value="xbmcwsgi" id="1048" addr="0x7fb6eb3f6550" />
+                        <attribute name="sym_previousSibling" value="0x7fb6eb3ef610" id="1049" addr="0x7fb6eb3ef610" />
+                        <attribute name="csym_nextSibling" value="0x7fb6eb3f2a10" id="1050" addr="0x7fb6eb3f2a10" />
+                        <attribute name="sym_nextSibling" value="0x7fb6eb3f2a10" id="1051" addr="0x7fb6eb3f2a10" />
+                        <typescope id="1052" addr="0x7fb6eb3f3ab0" >
+                            <attributelist id="1053" addr="0x7fb6eb3f3ab0" >
+                                <attribute name="name" value="xbmcwsgi" id="1054" addr="0x7fb6eb3f6550" />
+                                <typetab id="1055" addr="0x7fb6eb3f3ad0" >
+                                    <attributelist id="1056" addr="0x7fb6eb3f3ad0" >
+                                        <attribute name="WsgiInputStreamIterator" value="WsgiInputStreamIterator" id="1057" addr="0x7fb6eb3f6550" />
+                                        <attribute name="WsgiHttpHeader" value="Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>" id="1058" addr="0x7fb6eb3f6550" />
+                                        <attribute name="WsgiErrorStream" value="WsgiErrorStream" id="1059" addr="0x7fb6eb3f6550" />
+                                        <attribute name="WsgiInputStream" value="WsgiInputStream" id="1060" addr="0x7fb6eb3f6550" />
+                                        <attribute name="WsgiResponse" value="WsgiResponse" id="1061" addr="0x7fb6eb3f6550" />
+                                        <attribute name="WsgiResponseBody" value="WsgiResponseBody" id="1062" addr="0x7fb6eb3f6550" />
                                     </attributelist >
-                                    <typetabsitem id="1063" addr="0x7f1a040ad450" >
-                                        <attributelist id="1064" addr="0x7f1a040ad450" >
+                                    <typetabsitem id="1063" addr="0x7fb6eb3f4450" >
+                                        <attributelist id="1064" addr="0x7fb6eb3f4450" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1065" addr="0x7f1a040adff0" >
-                                        <attributelist id="1066" addr="0x7f1a040adff0" >
+                                    <typetabsitem id="1065" addr="0x7fb6eb3f4ff0" >
+                                        <attributelist id="1066" addr="0x7fb6eb3f4ff0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1067" addr="0x7f1a040acbb0" >
-                                        <attributelist id="1068" addr="0x7f1a040acbb0" >
+                                    <typetabsitem id="1067" addr="0x7fb6eb3f3bb0" >
+                                        <attributelist id="1068" addr="0x7fb6eb3f3bb0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1069" addr="0x7f1a040ad830" >
-                                        <attributelist id="1070" addr="0x7f1a040ad830" >
+                                    <typetabsitem id="1069" addr="0x7fb6eb3f4830" >
+                                        <attributelist id="1070" addr="0x7fb6eb3f4830" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1071" addr="0x7f1a040ae250" >
-                                        <attributelist id="1072" addr="0x7f1a040ae250" >
+                                    <typetabsitem id="1071" addr="0x7fb6eb3f5250" >
+                                        <attributelist id="1072" addr="0x7fb6eb3f5250" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1073" addr="0x7f1a040aebb0" >
-                                        <attributelist id="1074" addr="0x7f1a040aebb0" >
+                                    <typetabsitem id="1073" addr="0x7fb6eb3f5bb0" >
+                                        <attributelist id="1074" addr="0x7fb6eb3f5bb0" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
-                                <attribute name="parent" value="0x7f1a040ac650" id="1075" addr="0x7f1a040ac650" />
-                                <attribute name="qname" value="XBMCAddon::xbmcwsgi" id="1076" addr="0x7f1a040af550" />
-                                <attribute name="symtab" value="0x7f1a040a7170" id="1077" addr="0x7f1a040a7170" />
+                                <attribute name="parent" value="0x7fb6eb3f3650" id="1075" addr="0x7fb6eb3f3650" />
+                                <attribute name="qname" value="XBMCAddon::xbmcwsgi" id="1076" addr="0x7fb6eb3f6550" />
+                                <attribute name="symtab" value="0x7fb6eb3ee170" id="1077" addr="0x7fb6eb3ee170" />
                             </attributelist >
-                            <typescopesitem id="1078" addr="0x7f1a040a7130" >
-                                <attributelist id="1079" addr="0x7f1a040a7130" >
+                            <typescopesitem id="1078" addr="0x7fb6eb3ee130" >
+                                <attributelist id="1079" addr="0x7fb6eb3ee130" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="1080" addr="0x7f1a040acad0" >
-                                <attributelist id="1081" addr="0x7f1a040acad0" >
-                                    <attribute name="WsgiInputStreamIterator" value="WsgiInputStreamIterator" id="1082" addr="0x7f1a040af550" />
-                                    <attribute name="WsgiHttpHeader" value="Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>" id="1083" addr="0x7f1a040af550" />
-                                    <attribute name="WsgiErrorStream" value="WsgiErrorStream" id="1084" addr="0x7f1a040af550" />
-                                    <attribute name="WsgiInputStream" value="WsgiInputStream" id="1085" addr="0x7f1a040af550" />
-                                    <attribute name="WsgiResponse" value="WsgiResponse" id="1086" addr="0x7f1a040af550" />
-                                    <attribute name="WsgiResponseBody" value="WsgiResponseBody" id="1087" addr="0x7f1a040af550" />
+                            <typescopesitem id="1080" addr="0x7fb6eb3f3ad0" >
+                                <attributelist id="1081" addr="0x7fb6eb3f3ad0" >
+                                    <attribute name="WsgiInputStreamIterator" value="WsgiInputStreamIterator" id="1082" addr="0x7fb6eb3f6550" />
+                                    <attribute name="WsgiHttpHeader" value="Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>" id="1083" addr="0x7fb6eb3f6550" />
+                                    <attribute name="WsgiErrorStream" value="WsgiErrorStream" id="1084" addr="0x7fb6eb3f6550" />
+                                    <attribute name="WsgiInputStream" value="WsgiInputStream" id="1085" addr="0x7fb6eb3f6550" />
+                                    <attribute name="WsgiResponse" value="WsgiResponse" id="1086" addr="0x7fb6eb3f6550" />
+                                    <attribute name="WsgiResponseBody" value="WsgiResponseBody" id="1087" addr="0x7fb6eb3f6550" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="1088" addr="0x7f1a040ac650" >
-                                <attributelist id="1089" addr="0x7f1a040ac650" >
-                                    <attribute name="name" value="XBMCAddon" id="1090" addr="0x7f1a040af550" />
-                                    <typetab id="1091" addr="0x7f1a040ac690" >
-                                        <attributelist id="1092" addr="0x7f1a040ac690" >
-                                            <attribute name="String" value="std::string" id="1093" addr="0x7f1a040af550" />
+                            <typescopesitem id="1088" addr="0x7fb6eb3f3650" >
+                                <attributelist id="1089" addr="0x7fb6eb3f3650" >
+                                    <attribute name="name" value="XBMCAddon" id="1090" addr="0x7fb6eb3f6550" />
+                                    <typetab id="1091" addr="0x7fb6eb3f3690" >
+                                        <attributelist id="1092" addr="0x7fb6eb3f3690" >
+                                            <attribute name="String" value="std::string" id="1093" addr="0x7fb6eb3f6550" />
                                         </attributelist >
-                                        <typetabsitem id="1094" addr="0x7f1a040ac870" >
-                                            <attributelist id="1095" addr="0x7f1a040ac870" >
+                                        <typetabsitem id="1094" addr="0x7fb6eb3f3870" >
+                                            <attributelist id="1095" addr="0x7fb6eb3f3870" >
                                             </attributelist >
                                         </typetabsitem >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f1a0408fa30" id="1096" addr="0x7f1a0408fa30" />
-                                    <attribute name="qname" value="XBMCAddon" id="1097" addr="0x7f1a040af550" />
-                                    <attribute name="symtab" value="0x7f1a040a6950" id="1098" addr="0x7f1a040a6950" />
+                                    <attribute name="parent" value="0x7fb6eb3d6a30" id="1096" addr="0x7fb6eb3d6a30" />
+                                    <attribute name="qname" value="XBMCAddon" id="1097" addr="0x7fb6eb3f6550" />
+                                    <attribute name="symtab" value="0x7fb6eb3ed950" id="1098" addr="0x7fb6eb3ed950" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="1099" addr="0x7f1a040acaf0" >
-                                <attributelist id="1100" addr="0x7f1a040acaf0" >
+                            <typescopesitem id="1099" addr="0x7fb6eb3f3af0" >
+                                <attributelist id="1100" addr="0x7fb6eb3f3af0" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="1101" addr="0x7f1a040a7170" >
-                                <attributelist id="1102" addr="0x7f1a040a7170" >
-                                    <attribute name="name" value="xbmcwsgi" id="1103" addr="0x7f1a040af550" />
-                                    <attribute name="csymtab" value="0x7f1a040a71b0" id="1104" addr="0x7f1a040a71b0" />
-                                    <attribute name="symtab" value="0x7f1a040a7150" id="1105" addr="0x7f1a040a7150" />
+                            <typescopesitem id="1101" addr="0x7fb6eb3ee170" >
+                                <attributelist id="1102" addr="0x7fb6eb3ee170" >
+                                    <attribute name="name" value="xbmcwsgi" id="1103" addr="0x7fb6eb3f6550" />
+                                    <attribute name="csymtab" value="0x7fb6eb3ee1b0" id="1104" addr="0x7fb6eb3ee1b0" />
+                                    <attribute name="symtab" value="0x7fb6eb3ee150" id="1105" addr="0x7fb6eb3ee150" />
                                 </attributelist >
                             </typescopesitem >
                         </typescope >
-                        <attribute name="symtab" value="0x7f1a040a7170" id="1106" addr="0x7f1a040a7170" />
-                        <attribute name="sym_symtab" value="0x7f1a040a6950" id="1107" addr="0x7f1a040a6950" />
+                        <attribute name="symtab" value="0x7fb6eb3ee170" id="1106" addr="0x7fb6eb3ee170" />
+                        <attribute name="sym_symtab" value="0x7fb6eb3ed950" id="1107" addr="0x7fb6eb3ed950" />
                     </attributelist >
 
-                    <cdecl id="1108" addr="0x7f1a040aa6d0" >
-                        <attributelist id="1109" addr="0x7f1a040aa6d0" >
-                            <attribute name="sym_name" value="WsgiHttpHeader" id="1110" addr="0x7f1a040af550" />
-                            <attribute name="name" value="XBMCAddon::xbmcwsgi::WsgiHttpHeader" id="1111" addr="0x7f1a040af550" />
-                            <attribute name="decl" value="" id="1112" addr="0x7f1a040af550" />
-                            <attribute name="storage" value="typedef" id="1113" addr="0x7f1a040af550" />
-                            <attribute name="kind" value="typedef" id="1114" addr="0x7f1a040af550" />
-                            <attribute name="type" value="Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>" id="1115" addr="0x7f1a040af550" />
-                            <attribute name="sym_symtab" value="0x7f1a040a7170" id="1116" addr="0x7f1a040a7170" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1117" addr="0x7f1a040af550" />
+                    <cdecl id="1108" addr="0x7fb6eb3f16d0" >
+                        <attributelist id="1109" addr="0x7fb6eb3f16d0" >
+                            <attribute name="sym_name" value="WsgiHttpHeader" id="1110" addr="0x7fb6eb3f6550" />
+                            <attribute name="name" value="XBMCAddon::xbmcwsgi::WsgiHttpHeader" id="1111" addr="0x7fb6eb3f6550" />
+                            <attribute name="decl" value="" id="1112" addr="0x7fb6eb3f6550" />
+                            <attribute name="storage" value="typedef" id="1113" addr="0x7fb6eb3f6550" />
+                            <attribute name="kind" value="typedef" id="1114" addr="0x7fb6eb3f6550" />
+                            <attribute name="type" value="Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>" id="1115" addr="0x7fb6eb3f6550" />
+                            <attribute name="sym_symtab" value="0x7fb6eb3ee170" id="1116" addr="0x7fb6eb3ee170" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1117" addr="0x7fb6eb3f6550" />
                         </attributelist >
                      
                     </cdecl >
-                    <class id="1118" addr="0x7f1a040aa8f0" >
-                        <attributelist id="1119" addr="0x7f1a040aa8f0" >
-                            <attribute name="name" value="XBMCAddon::xbmcwsgi::WsgiResponse" id="1120" addr="0x7f1a040af550" />
-                            <attribute name="sym_symtab" value="0x7f1a040a7170" id="1121" addr="0x7f1a040a7170" />
-                            <attribute name="symtab" value="0x7f1a040aabb0" id="1122" addr="0x7f1a040aabb0" />
-                            <attribute name="allows_typedef" value="1" id="1123" addr="0x7f1a040af550" />
-                            <attribute name="typepass_visit" value="1" id="1124" addr="0x7f1a040af550" />
-                            <attribute name="allocate_visit" value="1" id="1125" addr="0x7f1a040af550" />
-                            <attribute name="kind" value="class" id="1126" addr="0x7f1a040af550" />
-                            <attribute name="sym_name" value="WsgiResponse" id="1127" addr="0x7f1a040af550" />
-                            <attribute name="allocate_default_constructor" value="1" id="1128" addr="0x7f1a040af550" />
-                            <attribute name="allocate_has_constructor" value="1" id="1129" addr="0x7f1a040af550" />
-                            <attribute name="allocate_public_constructor" value="1" id="1130" addr="0x7f1a040af550" />
-                            <attribute name="allocate_has_destructor" value="1" id="1131" addr="0x7f1a040af550" />
-                            <attribute name="allocate_default_destructor" value="1" id="1132" addr="0x7f1a040af550" />
-                            <attribute name="allocate_copy_constructor" value="1" id="1133" addr="0x7f1a040af550" />
-                            <attribute name="privatebaselist" value="0x7f1a040aa8d0" id="1134" addr="0x7f1a040aa8d0" />
-                            <attribute name="protectedbaselist" value="0x7f1a040aa8b0" id="1135" addr="0x7f1a040aa8b0" />
-                            <baselist id="1136" addr="0x7f1a040aaab0" >
-                                <base name="AddonClass" id="1137" addr="0x7f1a040aa870" />
+                    <class id="1118" addr="0x7fb6eb3f18f0" >
+                        <attributelist id="1119" addr="0x7fb6eb3f18f0" >
+                            <attribute name="name" value="XBMCAddon::xbmcwsgi::WsgiResponse" id="1120" addr="0x7fb6eb3f6550" />
+                            <attribute name="sym_symtab" value="0x7fb6eb3ee170" id="1121" addr="0x7fb6eb3ee170" />
+                            <attribute name="symtab" value="0x7fb6eb3f1bb0" id="1122" addr="0x7fb6eb3f1bb0" />
+                            <attribute name="allows_typedef" value="1" id="1123" addr="0x7fb6eb3f6550" />
+                            <attribute name="typepass_visit" value="1" id="1124" addr="0x7fb6eb3f6550" />
+                            <attribute name="allocate_visit" value="1" id="1125" addr="0x7fb6eb3f6550" />
+                            <attribute name="kind" value="class" id="1126" addr="0x7fb6eb3f6550" />
+                            <attribute name="sym_name" value="WsgiResponse" id="1127" addr="0x7fb6eb3f6550" />
+                            <attribute name="allocate_default_constructor" value="1" id="1128" addr="0x7fb6eb3f6550" />
+                            <attribute name="allocate_has_constructor" value="1" id="1129" addr="0x7fb6eb3f6550" />
+                            <attribute name="allocate_public_constructor" value="1" id="1130" addr="0x7fb6eb3f6550" />
+                            <attribute name="allocate_has_destructor" value="1" id="1131" addr="0x7fb6eb3f6550" />
+                            <attribute name="allocate_default_destructor" value="1" id="1132" addr="0x7fb6eb3f6550" />
+                            <attribute name="allocate_copy_constructor" value="1" id="1133" addr="0x7fb6eb3f6550" />
+                            <attribute name="privatebaselist" value="0x7fb6eb3f18d0" id="1134" addr="0x7fb6eb3f18d0" />
+                            <attribute name="protectedbaselist" value="0x7fb6eb3f18b0" id="1135" addr="0x7fb6eb3f18b0" />
+                            <baselist id="1136" addr="0x7fb6eb3f1ab0" >
+                                <base name="AddonClass" id="1137" addr="0x7fb6eb3f1870" />
                             </baselist >
-                            <attribute name="module" value="xbmcwsgi" id="1138" addr="0x7f1a040a6270" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1139" addr="0x7f1a040af550" />
-                            <typescope id="1140" addr="0x7f1a040ae2d0" >
-                                <attributelist id="1141" addr="0x7f1a040ae2d0" >
-                                    <attribute name="name" value="WsgiResponse" id="1142" addr="0x7f1a040af550" />
-                                    <typetab id="1143" addr="0x7f1a040ae2f0" >
-                                        <attributelist id="1144" addr="0x7f1a040ae2f0" >
+                            <attribute name="module" value="xbmcwsgi" id="1138" addr="0x7fb6eb3ed270" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1139" addr="0x7fb6eb3f6550" />
+                            <typescope id="1140" addr="0x7fb6eb3f52d0" >
+                                <attributelist id="1141" addr="0x7fb6eb3f52d0" >
+                                    <attribute name="name" value="WsgiResponse" id="1142" addr="0x7fb6eb3f6550" />
+                                    <typetab id="1143" addr="0x7fb6eb3f52f0" >
+                                        <attributelist id="1144" addr="0x7fb6eb3f52f0" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f1a040acab0" id="1145" addr="0x7f1a040acab0" />
-                                    <attribute name="qname" value="XBMCAddon::xbmcwsgi::WsgiResponse" id="1146" addr="0x7f1a040af550" />
-                                    <attribute name="symtab" value="0x7f1a040aabb0" id="1147" addr="0x7f1a040aabb0" />
+                                    <attribute name="parent" value="0x7fb6eb3f3ab0" id="1145" addr="0x7fb6eb3f3ab0" />
+                                    <attribute name="qname" value="XBMCAddon::xbmcwsgi::WsgiResponse" id="1146" addr="0x7fb6eb3f6550" />
+                                    <attribute name="symtab" value="0x7fb6eb3f1bb0" id="1147" addr="0x7fb6eb3f1bb0" />
                                 </attributelist >
-                                <typescopesitem id="1148" addr="0x7f1a040ae2b0" >
-                                    <attributelist id="1149" addr="0x7f1a040ae2b0" >
+                                <typescopesitem id="1148" addr="0x7fb6eb3f52b0" >
+                                    <attributelist id="1149" addr="0x7fb6eb3f52b0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="1150" addr="0x7f1a040ae2f0" >
-                                    <attributelist id="1151" addr="0x7f1a040ae2f0" >
+                                <typescopesitem id="1150" addr="0x7fb6eb3f52f0" >
+                                    <attributelist id="1151" addr="0x7fb6eb3f52f0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="1152" addr="0x7f1a040acab0" >
-                                    <attributelist id="1153" addr="0x7f1a040acab0" >
-                                        <attribute name="name" value="xbmcwsgi" id="1154" addr="0x7f1a040af550" />
-                                        <typetab id="1155" addr="0x7f1a040acad0" >
-                                            <attributelist id="1156" addr="0x7f1a040acad0" >
-                                                <attribute name="WsgiInputStreamIterator" value="WsgiInputStreamIterator" id="1157" addr="0x7f1a040af550" />
-                                                <attribute name="WsgiHttpHeader" value="Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>" id="1158" addr="0x7f1a040af550" />
-                                                <attribute name="WsgiErrorStream" value="WsgiErrorStream" id="1159" addr="0x7f1a040af550" />
-                                                <attribute name="WsgiInputStream" value="WsgiInputStream" id="1160" addr="0x7f1a040af550" />
-                                                <attribute name="WsgiResponse" value="WsgiResponse" id="1161" addr="0x7f1a040af550" />
-                                                <attribute name="WsgiResponseBody" value="WsgiResponseBody" id="1162" addr="0x7f1a040af550" />
+                                <typescopesitem id="1152" addr="0x7fb6eb3f3ab0" >
+                                    <attributelist id="1153" addr="0x7fb6eb3f3ab0" >
+                                        <attribute name="name" value="xbmcwsgi" id="1154" addr="0x7fb6eb3f6550" />
+                                        <typetab id="1155" addr="0x7fb6eb3f3ad0" >
+                                            <attributelist id="1156" addr="0x7fb6eb3f3ad0" >
+                                                <attribute name="WsgiInputStreamIterator" value="WsgiInputStreamIterator" id="1157" addr="0x7fb6eb3f6550" />
+                                                <attribute name="WsgiHttpHeader" value="Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>" id="1158" addr="0x7fb6eb3f6550" />
+                                                <attribute name="WsgiErrorStream" value="WsgiErrorStream" id="1159" addr="0x7fb6eb3f6550" />
+                                                <attribute name="WsgiInputStream" value="WsgiInputStream" id="1160" addr="0x7fb6eb3f6550" />
+                                                <attribute name="WsgiResponse" value="WsgiResponse" id="1161" addr="0x7fb6eb3f6550" />
+                                                <attribute name="WsgiResponseBody" value="WsgiResponseBody" id="1162" addr="0x7fb6eb3f6550" />
                                             </attributelist >
-                                            <typetabsitem id="1163" addr="0x7f1a040ad450" >
-                                                <attributelist id="1164" addr="0x7f1a040ad450" >
+                                            <typetabsitem id="1163" addr="0x7fb6eb3f4450" >
+                                                <attributelist id="1164" addr="0x7fb6eb3f4450" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1165" addr="0x7f1a040adff0" >
-                                                <attributelist id="1166" addr="0x7f1a040adff0" >
+                                            <typetabsitem id="1165" addr="0x7fb6eb3f4ff0" >
+                                                <attributelist id="1166" addr="0x7fb6eb3f4ff0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1167" addr="0x7f1a040acbb0" >
-                                                <attributelist id="1168" addr="0x7f1a040acbb0" >
+                                            <typetabsitem id="1167" addr="0x7fb6eb3f3bb0" >
+                                                <attributelist id="1168" addr="0x7fb6eb3f3bb0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1169" addr="0x7f1a040ad830" >
-                                                <attributelist id="1170" addr="0x7f1a040ad830" >
+                                            <typetabsitem id="1169" addr="0x7fb6eb3f4830" >
+                                                <attributelist id="1170" addr="0x7fb6eb3f4830" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1171" addr="0x7f1a040ae250" >
-                                                <attributelist id="1172" addr="0x7f1a040ae250" >
+                                            <typetabsitem id="1171" addr="0x7fb6eb3f5250" >
+                                                <attributelist id="1172" addr="0x7fb6eb3f5250" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1173" addr="0x7f1a040aebb0" >
-                                                <attributelist id="1174" addr="0x7f1a040aebb0" >
+                                            <typetabsitem id="1173" addr="0x7fb6eb3f5bb0" >
+                                                <attributelist id="1174" addr="0x7fb6eb3f5bb0" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7f1a040ac650" id="1175" addr="0x7f1a040ac650" />
-                                        <attribute name="qname" value="XBMCAddon::xbmcwsgi" id="1176" addr="0x7f1a040af550" />
-                                        <attribute name="symtab" value="0x7f1a040a7170" id="1177" addr="0x7f1a040a7170" />
+                                        <attribute name="parent" value="0x7fb6eb3f3650" id="1175" addr="0x7fb6eb3f3650" />
+                                        <attribute name="qname" value="XBMCAddon::xbmcwsgi" id="1176" addr="0x7fb6eb3f6550" />
+                                        <attribute name="symtab" value="0x7fb6eb3ee170" id="1177" addr="0x7fb6eb3ee170" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="1178" addr="0x7f1a040ae310" >
-                                    <attributelist id="1179" addr="0x7f1a040ae310" >
+                                <typescopesitem id="1178" addr="0x7fb6eb3f5310" >
+                                    <attributelist id="1179" addr="0x7fb6eb3f5310" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="1180" addr="0x7f1a040aabb0" >
-                                    <attributelist id="1181" addr="0x7f1a040aabb0" >
-                                        <attribute name="name" value="WsgiResponse" id="1182" addr="0x7f1a040af550" />
-                                        <attribute name="csymtab" value="0x7f1a040aabd0" id="1183" addr="0x7f1a040aabd0" />
-                                        <attribute name="symtab" value="0x7f1a040aab70" id="1184" addr="0x7f1a040aab70" />
+                                <typescopesitem id="1180" addr="0x7fb6eb3f1bb0" >
+                                    <attributelist id="1181" addr="0x7fb6eb3f1bb0" >
+                                        <attribute name="name" value="WsgiResponse" id="1182" addr="0x7fb6eb3f6550" />
+                                        <attribute name="csymtab" value="0x7fb6eb3f1bd0" id="1183" addr="0x7fb6eb3f1bd0" />
+                                        <attribute name="symtab" value="0x7fb6eb3f1b70" id="1184" addr="0x7fb6eb3f1b70" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <access id="1185" addr="0x7f1a040aab30" >
-                            <attributelist id="1186" addr="0x7f1a040aab30" >
-                                <attribute name="kind" value="public" id="1187" addr="0x7f1a040af550" />
+                        <access id="1185" addr="0x7fb6eb3f1b30" >
+                            <attributelist id="1186" addr="0x7fb6eb3f1b30" >
+                                <attribute name="kind" value="public" id="1187" addr="0x7fb6eb3f6550" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="1188" addr="0x7f1a040aacf0" >
-                            <attributelist id="1189" addr="0x7f1a040aacf0" >
-                                <attribute name="ismember" value="1" id="1190" addr="0x7f1a040af550" />
-                                <attribute name="sym_name" value="WsgiResponse" id="1191" addr="0x7f1a040af550" />
-                                <attribute name="name" value="WsgiResponse" id="1192" addr="0x7f1a040af550" />
-                                <attribute name="decl" value="f()." id="1193" addr="0x7f1a040af550" />
-                                <attribute name="access" value="public" id="1194" addr="0x7f1a040af550" />
-                                <attribute name="feature_new" value="1" id="1195" addr="0x7f1a040af550" />
-                                <attribute name="sym_symtab" value="0x7f1a040aabb0" id="1196" addr="0x7f1a040aabb0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="1197" addr="0x7f1a040af550" />
+                        <constructor id="1188" addr="0x7fb6eb3f1cf0" >
+                            <attributelist id="1189" addr="0x7fb6eb3f1cf0" >
+                                <attribute name="ismember" value="1" id="1190" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_name" value="WsgiResponse" id="1191" addr="0x7fb6eb3f6550" />
+                                <attribute name="name" value="WsgiResponse" id="1192" addr="0x7fb6eb3f6550" />
+                                <attribute name="decl" value="f()." id="1193" addr="0x7fb6eb3f6550" />
+                                <attribute name="access" value="public" id="1194" addr="0x7fb6eb3f6550" />
+                                <attribute name="feature_new" value="1" id="1195" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_symtab" value="0x7fb6eb3f1bb0" id="1196" addr="0x7fb6eb3f1bb0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="1197" addr="0x7fb6eb3f6550" />
                             </attributelist >
                          
                         </constructor >
-                        <destructor id="1198" addr="0x7f1a040aae50" >
-                            <attributelist id="1199" addr="0x7f1a040aae50" >
-                                <attribute name="ismember" value="1" id="1200" addr="0x7f1a040af550" />
-                                <attribute name="sym_name" value="~WsgiResponse" id="1201" addr="0x7f1a040af550" />
-                                <attribute name="name" value="~WsgiResponse" id="1202" addr="0x7f1a040af550" />
-                                <attribute name="decl" value="f()." id="1203" addr="0x7f1a040af550" />
-                                <attribute name="access" value="public" id="1204" addr="0x7f1a040af550" />
-                                <attribute name="sym_symtab" value="0x7f1a040aabb0" id="1205" addr="0x7f1a040aabb0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="1206" addr="0x7f1a040af550" />
+                        <destructor id="1198" addr="0x7fb6eb3f1e50" >
+                            <attributelist id="1199" addr="0x7fb6eb3f1e50" >
+                                <attribute name="ismember" value="1" id="1200" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_name" value="~WsgiResponse" id="1201" addr="0x7fb6eb3f6550" />
+                                <attribute name="name" value="~WsgiResponse" id="1202" addr="0x7fb6eb3f6550" />
+                                <attribute name="decl" value="f()." id="1203" addr="0x7fb6eb3f6550" />
+                                <attribute name="access" value="public" id="1204" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_symtab" value="0x7fb6eb3f1bb0" id="1205" addr="0x7fb6eb3f1bb0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="1206" addr="0x7fb6eb3f6550" />
                             </attributelist >
                          
                         </destructor >
-                        <cdecl id="1207" addr="0x7f1a040ab4d0" >
-                            <attributelist id="1208" addr="0x7f1a040ab4d0" >
-                                <attribute name="name" value="operator ()" id="1209" addr="0x7f1a040af550" />
-                                <attribute name="ismember" value="1" id="1210" addr="0x7f1a040af550" />
-                                <attribute name="sym_symtab" value="0x7f1a040aabb0" id="1211" addr="0x7f1a040aabb0" />
-                                <attribute name="sym_nextSibling" value="0x7f1a040ab710" id="1212" addr="0x7f1a040ab710" />
-                                <attribute name="csym_nextSibling" value="0x7f1a040ab710" id="1213" addr="0x7f1a040ab710" />
-                                <attribute name="kind" value="function" id="1214" addr="0x7f1a040af550" />
-                                <attribute name="sym_name" value="operator ()" id="1215" addr="0x7f1a040af550" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).std::vector&lt;(XBMCAddon::xbmcwsgi::WsgiHttpHeader)>,p.void).p." id="1216" addr="0x7f1a040af550" />
-                                <attribute name="access" value="public" id="1217" addr="0x7f1a040af550" />
-                                <attribute name="sym_overloaded" value="0x7f1a040ab4d0" id="1218" addr="0x7f1a040ab4d0" />
-                                <parmlist id="1219" addr="0x7f1a040ab0d0" >
+                        <cdecl id="1207" addr="0x7fb6eb3f24d0" >
+                            <attributelist id="1208" addr="0x7fb6eb3f24d0" >
+                                <attribute name="name" value="operator ()" id="1209" addr="0x7fb6eb3f6550" />
+                                <attribute name="ismember" value="1" id="1210" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_symtab" value="0x7fb6eb3f1bb0" id="1211" addr="0x7fb6eb3f1bb0" />
+                                <attribute name="sym_nextSibling" value="0x7fb6eb3f2710" id="1212" addr="0x7fb6eb3f2710" />
+                                <attribute name="csym_nextSibling" value="0x7fb6eb3f2710" id="1213" addr="0x7fb6eb3f2710" />
+                                <attribute name="kind" value="function" id="1214" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_name" value="operator ()" id="1215" addr="0x7fb6eb3f6550" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).std::vector&lt;(XBMCAddon::xbmcwsgi::WsgiHttpHeader)>,p.void).p." id="1216" addr="0x7fb6eb3f6550" />
+                                <attribute name="access" value="public" id="1217" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_overloaded" value="0x7fb6eb3f24d0" id="1218" addr="0x7fb6eb3f24d0" />
+                                <parmlist id="1219" addr="0x7fb6eb3f20d0" >
                                     <parm id="1220">
-                                        <attributelist id="1221" addr="0x7f1a040ab0d0" >
-                                            <attribute name="name" value="status" id="1222" addr="0x7f1a040af550" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1223" addr="0x7f1a040af550" />
+                                        <attributelist id="1221" addr="0x7fb6eb3f20d0" >
+                                            <attribute name="name" value="status" id="1222" addr="0x7fb6eb3f6550" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1223" addr="0x7fb6eb3f6550" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1224">
-                                        <attributelist id="1225" addr="0x7f1a040ab2f0" >
-                                            <attribute name="name" value="response_headers" id="1226" addr="0x7f1a040af550" />
-                                            <attribute name="type" value="r.q(const).std::vector&lt;(XBMCAddon::xbmcwsgi::WsgiHttpHeader)>" id="1227" addr="0x7f1a040af550" />
+                                        <attributelist id="1225" addr="0x7fb6eb3f22f0" >
+                                            <attribute name="name" value="response_headers" id="1226" addr="0x7fb6eb3f6550" />
+                                            <attribute name="type" value="r.q(const).std::vector&lt;(XBMCAddon::xbmcwsgi::WsgiHttpHeader)>" id="1227" addr="0x7fb6eb3f6550" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1228">
-                                        <attributelist id="1229" addr="0x7f1a040ab450" >
-                                            <attribute name="name" value="exc_info" id="1230" addr="0x7f1a040af550" />
-                                            <attribute name="value" value="NULL" id="1231" addr="0x7f1a040af550" />
-                                            <attribute name="type" value="p.void" id="1232" addr="0x7f1a040af550" />
+                                        <attributelist id="1229" addr="0x7fb6eb3f2450" >
+                                            <attribute name="name" value="exc_info" id="1230" addr="0x7fb6eb3f6550" />
+                                            <attribute name="value" value="NULL" id="1231" addr="0x7fb6eb3f6550" />
+                                            <attribute name="type" value="p.void" id="1232" addr="0x7fb6eb3f6550" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="WsgiResponseBody" id="1233" addr="0x7f1a040af550" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="1234" addr="0x7f1a040af550" />
+                                <attribute name="type" value="WsgiResponseBody" id="1233" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="1234" addr="0x7fb6eb3f6550" />
                             </attributelist >
                          
                         </cdecl >
-                        <cdecl id="1235" addr="0x7f1a040ab710" >
-                            <attributelist id="1236" addr="0x7f1a040ab710" >
-                                <attribute name="name" value="operator ()" id="1237" addr="0x7f1a040af550" />
-                                <attribute name="ismember" value="1" id="1238" addr="0x7f1a040af550" />
-                                <attribute name="sym_symtab" value="0x7f1a040aabb0" id="1239" addr="0x7f1a040aabb0" />
-                                <attribute name="sym_previousSibling" value="0x7f1a040ab4d0" id="1240" addr="0x7f1a040ab4d0" />
-                                <attribute name="kind" value="function" id="1241" addr="0x7f1a040af550" />
-                                <attribute name="sym_name" value="operator ()" id="1242" addr="0x7f1a040af550" />
-                                <attribute name="defaultargs" value="0x7f1a040ab4d0" id="1243" addr="0x7f1a040ab4d0" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).std::vector&lt;(XBMCAddon::xbmcwsgi::WsgiHttpHeader)>).p." id="1244" addr="0x7f1a040af550" />
-                                <attribute name="access" value="public" id="1245" addr="0x7f1a040af550" />
-                                <attribute name="sym_overloaded" value="0x7f1a040ab4d0" id="1246" addr="0x7f1a040ab4d0" />
-                                <parmlist id="1247" addr="0x7f1a040ab590" >
+                        <cdecl id="1235" addr="0x7fb6eb3f2710" >
+                            <attributelist id="1236" addr="0x7fb6eb3f2710" >
+                                <attribute name="name" value="operator ()" id="1237" addr="0x7fb6eb3f6550" />
+                                <attribute name="ismember" value="1" id="1238" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_symtab" value="0x7fb6eb3f1bb0" id="1239" addr="0x7fb6eb3f1bb0" />
+                                <attribute name="sym_previousSibling" value="0x7fb6eb3f24d0" id="1240" addr="0x7fb6eb3f24d0" />
+                                <attribute name="kind" value="function" id="1241" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_name" value="operator ()" id="1242" addr="0x7fb6eb3f6550" />
+                                <attribute name="defaultargs" value="0x7fb6eb3f24d0" id="1243" addr="0x7fb6eb3f24d0" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String,r.q(const).std::vector&lt;(XBMCAddon::xbmcwsgi::WsgiHttpHeader)>).p." id="1244" addr="0x7fb6eb3f6550" />
+                                <attribute name="access" value="public" id="1245" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_overloaded" value="0x7fb6eb3f24d0" id="1246" addr="0x7fb6eb3f24d0" />
+                                <parmlist id="1247" addr="0x7fb6eb3f2590" >
                                     <parm id="1248">
-                                        <attributelist id="1249" addr="0x7f1a040ab590" >
-                                            <attribute name="name" value="status" id="1250" addr="0x7f1a040af550" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1251" addr="0x7f1a040af550" />
+                                        <attributelist id="1249" addr="0x7fb6eb3f2590" >
+                                            <attribute name="name" value="status" id="1250" addr="0x7fb6eb3f6550" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1251" addr="0x7fb6eb3f6550" />
                                         </attributelist >
                                     </parm >
                                     <parm id="1252">
-                                        <attributelist id="1253" addr="0x7f1a040ab670" >
-                                            <attribute name="name" value="response_headers" id="1254" addr="0x7f1a040af550" />
-                                            <attribute name="type" value="r.q(const).std::vector&lt;(XBMCAddon::xbmcwsgi::WsgiHttpHeader)>" id="1255" addr="0x7f1a040af550" />
+                                        <attributelist id="1253" addr="0x7fb6eb3f2670" >
+                                            <attribute name="name" value="response_headers" id="1254" addr="0x7fb6eb3f6550" />
+                                            <attribute name="type" value="r.q(const).std::vector&lt;(XBMCAddon::xbmcwsgi::WsgiHttpHeader)>" id="1255" addr="0x7fb6eb3f6550" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="type" value="WsgiResponseBody" id="1256" addr="0x7f1a040af550" />
-                                <attribute name="sym_overname" value="__SWIG_1" id="1257" addr="0x7f1a040af550" />
+                                <attribute name="type" value="WsgiResponseBody" id="1256" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_overname" value="__SWIG_1" id="1257" addr="0x7fb6eb3f6550" />
                             </attributelist >
                          
                         </cdecl >
@@ -1925,312 +1925,312 @@
                 </namespace >
             </namespace >
         </include >
-        <include id="1258" addr="0x7f1a040ab8f0" >
-            <attributelist id="1259" addr="0x7f1a040ab8f0" >
-                <attribute name="name" value="/builddir/xbmc-18.3-Leia/xbmc/interfaces/legacy/wsgi/WsgiResponseBody.h" id="1260" addr="0x7f1a040af550" />
+        <include id="1258" addr="0x7fb6eb3f28f0" >
+            <attributelist id="1259" addr="0x7fb6eb3f28f0" >
+                <attribute name="name" value="/builddir/xbmc-18.4-Leia/xbmc/interfaces/legacy/wsgi/WsgiResponseBody.h" id="1260" addr="0x7fb6eb3f6550" />
             </attributelist >
 
-            <namespace id="1261" addr="0x7f1a040ab990" >
-                <attributelist id="1262" addr="0x7f1a040ab990" >
-                    <attribute name="sym_name" value="XBMCAddon" id="1263" addr="0x7f1a040af550" />
-                    <attribute name="name" value="XBMCAddon" id="1264" addr="0x7f1a040af550" />
-                    <attribute name="sym_previousSibling" value="0x7f1a040aa3f0" id="1265" addr="0x7f1a040aa3f0" />
-                    <typescope id="1266" addr="0x7f1a040ac650" >
-                        <attributelist id="1267" addr="0x7f1a040ac650" >
-                            <attribute name="name" value="XBMCAddon" id="1268" addr="0x7f1a040af550" />
-                            <typetab id="1269" addr="0x7f1a040ac690" >
-                                <attributelist id="1270" addr="0x7f1a040ac690" >
-                                    <attribute name="String" value="std::string" id="1271" addr="0x7f1a040af550" />
+            <namespace id="1261" addr="0x7fb6eb3f2990" >
+                <attributelist id="1262" addr="0x7fb6eb3f2990" >
+                    <attribute name="sym_name" value="XBMCAddon" id="1263" addr="0x7fb6eb3f6550" />
+                    <attribute name="name" value="XBMCAddon" id="1264" addr="0x7fb6eb3f6550" />
+                    <attribute name="sym_previousSibling" value="0x7fb6eb3f13f0" id="1265" addr="0x7fb6eb3f13f0" />
+                    <typescope id="1266" addr="0x7fb6eb3f3650" >
+                        <attributelist id="1267" addr="0x7fb6eb3f3650" >
+                            <attribute name="name" value="XBMCAddon" id="1268" addr="0x7fb6eb3f6550" />
+                            <typetab id="1269" addr="0x7fb6eb3f3690" >
+                                <attributelist id="1270" addr="0x7fb6eb3f3690" >
+                                    <attribute name="String" value="std::string" id="1271" addr="0x7fb6eb3f6550" />
                                 </attributelist >
-                                <typetabsitem id="1272" addr="0x7f1a040ac870" >
-                                    <attributelist id="1273" addr="0x7f1a040ac870" >
+                                <typetabsitem id="1272" addr="0x7fb6eb3f3870" >
+                                    <attributelist id="1273" addr="0x7fb6eb3f3870" >
                                     </attributelist >
                                 </typetabsitem >
                             </typetab >
-                            <attribute name="parent" value="0x7f1a0408fa30" id="1274" addr="0x7f1a0408fa30" />
-                            <attribute name="qname" value="XBMCAddon" id="1275" addr="0x7f1a040af550" />
-                            <attribute name="symtab" value="0x7f1a040a6950" id="1276" addr="0x7f1a040a6950" />
+                            <attribute name="parent" value="0x7fb6eb3d6a30" id="1274" addr="0x7fb6eb3d6a30" />
+                            <attribute name="qname" value="XBMCAddon" id="1275" addr="0x7fb6eb3f6550" />
+                            <attribute name="symtab" value="0x7fb6eb3ed950" id="1276" addr="0x7fb6eb3ed950" />
                         </attributelist >
-                        <typescopesitem id="1277" addr="0x7f1a040a6910" >
-                            <attributelist id="1278" addr="0x7f1a040a6910" >
+                        <typescopesitem id="1277" addr="0x7fb6eb3ed910" >
+                            <attributelist id="1278" addr="0x7fb6eb3ed910" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="1279" addr="0x7f1a040ac690" >
-                            <attributelist id="1280" addr="0x7f1a040ac690" >
-                                <attribute name="String" value="std::string" id="1281" addr="0x7f1a040af550" />
+                        <typescopesitem id="1279" addr="0x7fb6eb3f3690" >
+                            <attributelist id="1280" addr="0x7fb6eb3f3690" >
+                                <attribute name="String" value="std::string" id="1281" addr="0x7fb6eb3f6550" />
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="1282" addr="0x7f1a0408fa30" >
-                            <attributelist id="1283" addr="0x7f1a0408fa30" >
-                                <attribute name="name" value="" id="1284" addr="0x7f1a040af550" />
-                                <typetab id="1285" addr="0x7f1a0408fa90" >
-                                    <attributelist id="1286" addr="0x7f1a0408fa90" >
-                                        <attribute name="HTTPPythonRequest" value="HTTPPythonRequest" id="1287" addr="0x7f1a040af550" />
+                        <typescopesitem id="1282" addr="0x7fb6eb3d6a30" >
+                            <attributelist id="1283" addr="0x7fb6eb3d6a30" >
+                                <attribute name="name" value="" id="1284" addr="0x7fb6eb3f6550" />
+                                <typetab id="1285" addr="0x7fb6eb3d6a90" >
+                                    <attributelist id="1286" addr="0x7fb6eb3d6a90" >
+                                        <attribute name="HTTPPythonRequest" value="HTTPPythonRequest" id="1287" addr="0x7fb6eb3f6550" />
                                     </attributelist >
-                                    <typetabsitem id="1288" addr="0x7f1a040ac7b0" >
-                                        <attributelist id="1289" addr="0x7f1a040ac7b0" >
+                                    <typetabsitem id="1288" addr="0x7fb6eb3f37b0" >
+                                        <attributelist id="1289" addr="0x7fb6eb3f37b0" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="1290" addr="0x7f1a040ac790" >
-                            <attributelist id="1291" addr="0x7f1a040ac790" >
+                        <typescopesitem id="1290" addr="0x7fb6eb3f3790" >
+                            <attributelist id="1291" addr="0x7fb6eb3f3790" >
                             </attributelist >
                         </typescopesitem >
-                        <typescopesitem id="1292" addr="0x7f1a040a6950" >
-                            <attributelist id="1293" addr="0x7f1a040a6950" >
-                                <attribute name="name" value="XBMCAddon" id="1294" addr="0x7f1a040af550" />
-                                <attribute name="csymtab" value="0x7f1a040a6990" id="1295" addr="0x7f1a040a6990" />
-                                <attribute name="symtab" value="0x7f1a040a6930" id="1296" addr="0x7f1a040a6930" />
+                        <typescopesitem id="1292" addr="0x7fb6eb3ed950" >
+                            <attributelist id="1293" addr="0x7fb6eb3ed950" >
+                                <attribute name="name" value="XBMCAddon" id="1294" addr="0x7fb6eb3f6550" />
+                                <attribute name="csymtab" value="0x7fb6eb3ed990" id="1295" addr="0x7fb6eb3ed990" />
+                                <attribute name="symtab" value="0x7fb6eb3ed930" id="1296" addr="0x7fb6eb3ed930" />
                             </attributelist >
                         </typescopesitem >
                     </typescope >
-                    <attribute name="symtab" value="0x7f1a040a6950" id="1297" addr="0x7f1a040a6950" />
-                    <attribute name="sym_symtab" value="0x7f1a0408f950" id="1298" addr="0x7f1a0408f950" />
+                    <attribute name="symtab" value="0x7fb6eb3ed950" id="1297" addr="0x7fb6eb3ed950" />
+                    <attribute name="sym_symtab" value="0x7fb6eb3d6950" id="1298" addr="0x7fb6eb3d6950" />
                 </attributelist >
 
-                <namespace id="1299" addr="0x7f1a040aba10" >
-                    <attributelist id="1300" addr="0x7f1a040aba10" >
-                        <attribute name="sym_name" value="xbmcwsgi" id="1301" addr="0x7f1a040af550" />
-                        <attribute name="name" value="xbmcwsgi" id="1302" addr="0x7f1a040af550" />
-                        <attribute name="sym_previousSibling" value="0x7f1a040aa470" id="1303" addr="0x7f1a040aa470" />
-                        <typescope id="1304" addr="0x7f1a040acab0" >
-                            <attributelist id="1305" addr="0x7f1a040acab0" >
-                                <attribute name="name" value="xbmcwsgi" id="1306" addr="0x7f1a040af550" />
-                                <typetab id="1307" addr="0x7f1a040acad0" >
-                                    <attributelist id="1308" addr="0x7f1a040acad0" >
-                                        <attribute name="WsgiInputStreamIterator" value="WsgiInputStreamIterator" id="1309" addr="0x7f1a040af550" />
-                                        <attribute name="WsgiHttpHeader" value="Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>" id="1310" addr="0x7f1a040af550" />
-                                        <attribute name="WsgiErrorStream" value="WsgiErrorStream" id="1311" addr="0x7f1a040af550" />
-                                        <attribute name="WsgiInputStream" value="WsgiInputStream" id="1312" addr="0x7f1a040af550" />
-                                        <attribute name="WsgiResponse" value="WsgiResponse" id="1313" addr="0x7f1a040af550" />
-                                        <attribute name="WsgiResponseBody" value="WsgiResponseBody" id="1314" addr="0x7f1a040af550" />
+                <namespace id="1299" addr="0x7fb6eb3f2a10" >
+                    <attributelist id="1300" addr="0x7fb6eb3f2a10" >
+                        <attribute name="sym_name" value="xbmcwsgi" id="1301" addr="0x7fb6eb3f6550" />
+                        <attribute name="name" value="xbmcwsgi" id="1302" addr="0x7fb6eb3f6550" />
+                        <attribute name="sym_previousSibling" value="0x7fb6eb3f1470" id="1303" addr="0x7fb6eb3f1470" />
+                        <typescope id="1304" addr="0x7fb6eb3f3ab0" >
+                            <attributelist id="1305" addr="0x7fb6eb3f3ab0" >
+                                <attribute name="name" value="xbmcwsgi" id="1306" addr="0x7fb6eb3f6550" />
+                                <typetab id="1307" addr="0x7fb6eb3f3ad0" >
+                                    <attributelist id="1308" addr="0x7fb6eb3f3ad0" >
+                                        <attribute name="WsgiInputStreamIterator" value="WsgiInputStreamIterator" id="1309" addr="0x7fb6eb3f6550" />
+                                        <attribute name="WsgiHttpHeader" value="Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>" id="1310" addr="0x7fb6eb3f6550" />
+                                        <attribute name="WsgiErrorStream" value="WsgiErrorStream" id="1311" addr="0x7fb6eb3f6550" />
+                                        <attribute name="WsgiInputStream" value="WsgiInputStream" id="1312" addr="0x7fb6eb3f6550" />
+                                        <attribute name="WsgiResponse" value="WsgiResponse" id="1313" addr="0x7fb6eb3f6550" />
+                                        <attribute name="WsgiResponseBody" value="WsgiResponseBody" id="1314" addr="0x7fb6eb3f6550" />
                                     </attributelist >
-                                    <typetabsitem id="1315" addr="0x7f1a040ad450" >
-                                        <attributelist id="1316" addr="0x7f1a040ad450" >
+                                    <typetabsitem id="1315" addr="0x7fb6eb3f4450" >
+                                        <attributelist id="1316" addr="0x7fb6eb3f4450" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1317" addr="0x7f1a040adff0" >
-                                        <attributelist id="1318" addr="0x7f1a040adff0" >
+                                    <typetabsitem id="1317" addr="0x7fb6eb3f4ff0" >
+                                        <attributelist id="1318" addr="0x7fb6eb3f4ff0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1319" addr="0x7f1a040acbb0" >
-                                        <attributelist id="1320" addr="0x7f1a040acbb0" >
+                                    <typetabsitem id="1319" addr="0x7fb6eb3f3bb0" >
+                                        <attributelist id="1320" addr="0x7fb6eb3f3bb0" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1321" addr="0x7f1a040ad830" >
-                                        <attributelist id="1322" addr="0x7f1a040ad830" >
+                                    <typetabsitem id="1321" addr="0x7fb6eb3f4830" >
+                                        <attributelist id="1322" addr="0x7fb6eb3f4830" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1323" addr="0x7f1a040ae250" >
-                                        <attributelist id="1324" addr="0x7f1a040ae250" >
+                                    <typetabsitem id="1323" addr="0x7fb6eb3f5250" >
+                                        <attributelist id="1324" addr="0x7fb6eb3f5250" >
                                         </attributelist >
                                     </typetabsitem >
-                                    <typetabsitem id="1325" addr="0x7f1a040aebb0" >
-                                        <attributelist id="1326" addr="0x7f1a040aebb0" >
+                                    <typetabsitem id="1325" addr="0x7fb6eb3f5bb0" >
+                                        <attributelist id="1326" addr="0x7fb6eb3f5bb0" >
                                         </attributelist >
                                     </typetabsitem >
                                 </typetab >
-                                <attribute name="parent" value="0x7f1a040ac650" id="1327" addr="0x7f1a040ac650" />
-                                <attribute name="qname" value="XBMCAddon::xbmcwsgi" id="1328" addr="0x7f1a040af550" />
-                                <attribute name="symtab" value="0x7f1a040a7170" id="1329" addr="0x7f1a040a7170" />
+                                <attribute name="parent" value="0x7fb6eb3f3650" id="1327" addr="0x7fb6eb3f3650" />
+                                <attribute name="qname" value="XBMCAddon::xbmcwsgi" id="1328" addr="0x7fb6eb3f6550" />
+                                <attribute name="symtab" value="0x7fb6eb3ee170" id="1329" addr="0x7fb6eb3ee170" />
                             </attributelist >
-                            <typescopesitem id="1330" addr="0x7f1a040a7130" >
-                                <attributelist id="1331" addr="0x7f1a040a7130" >
+                            <typescopesitem id="1330" addr="0x7fb6eb3ee130" >
+                                <attributelist id="1331" addr="0x7fb6eb3ee130" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="1332" addr="0x7f1a040acad0" >
-                                <attributelist id="1333" addr="0x7f1a040acad0" >
-                                    <attribute name="WsgiInputStreamIterator" value="WsgiInputStreamIterator" id="1334" addr="0x7f1a040af550" />
-                                    <attribute name="WsgiHttpHeader" value="Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>" id="1335" addr="0x7f1a040af550" />
-                                    <attribute name="WsgiErrorStream" value="WsgiErrorStream" id="1336" addr="0x7f1a040af550" />
-                                    <attribute name="WsgiInputStream" value="WsgiInputStream" id="1337" addr="0x7f1a040af550" />
-                                    <attribute name="WsgiResponse" value="WsgiResponse" id="1338" addr="0x7f1a040af550" />
-                                    <attribute name="WsgiResponseBody" value="WsgiResponseBody" id="1339" addr="0x7f1a040af550" />
+                            <typescopesitem id="1332" addr="0x7fb6eb3f3ad0" >
+                                <attributelist id="1333" addr="0x7fb6eb3f3ad0" >
+                                    <attribute name="WsgiInputStreamIterator" value="WsgiInputStreamIterator" id="1334" addr="0x7fb6eb3f6550" />
+                                    <attribute name="WsgiHttpHeader" value="Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>" id="1335" addr="0x7fb6eb3f6550" />
+                                    <attribute name="WsgiErrorStream" value="WsgiErrorStream" id="1336" addr="0x7fb6eb3f6550" />
+                                    <attribute name="WsgiInputStream" value="WsgiInputStream" id="1337" addr="0x7fb6eb3f6550" />
+                                    <attribute name="WsgiResponse" value="WsgiResponse" id="1338" addr="0x7fb6eb3f6550" />
+                                    <attribute name="WsgiResponseBody" value="WsgiResponseBody" id="1339" addr="0x7fb6eb3f6550" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="1340" addr="0x7f1a040ac650" >
-                                <attributelist id="1341" addr="0x7f1a040ac650" >
-                                    <attribute name="name" value="XBMCAddon" id="1342" addr="0x7f1a040af550" />
-                                    <typetab id="1343" addr="0x7f1a040ac690" >
-                                        <attributelist id="1344" addr="0x7f1a040ac690" >
-                                            <attribute name="String" value="std::string" id="1345" addr="0x7f1a040af550" />
+                            <typescopesitem id="1340" addr="0x7fb6eb3f3650" >
+                                <attributelist id="1341" addr="0x7fb6eb3f3650" >
+                                    <attribute name="name" value="XBMCAddon" id="1342" addr="0x7fb6eb3f6550" />
+                                    <typetab id="1343" addr="0x7fb6eb3f3690" >
+                                        <attributelist id="1344" addr="0x7fb6eb3f3690" >
+                                            <attribute name="String" value="std::string" id="1345" addr="0x7fb6eb3f6550" />
                                         </attributelist >
-                                        <typetabsitem id="1346" addr="0x7f1a040ac870" >
-                                            <attributelist id="1347" addr="0x7f1a040ac870" >
+                                        <typetabsitem id="1346" addr="0x7fb6eb3f3870" >
+                                            <attributelist id="1347" addr="0x7fb6eb3f3870" >
                                             </attributelist >
                                         </typetabsitem >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f1a0408fa30" id="1348" addr="0x7f1a0408fa30" />
-                                    <attribute name="qname" value="XBMCAddon" id="1349" addr="0x7f1a040af550" />
-                                    <attribute name="symtab" value="0x7f1a040a6950" id="1350" addr="0x7f1a040a6950" />
+                                    <attribute name="parent" value="0x7fb6eb3d6a30" id="1348" addr="0x7fb6eb3d6a30" />
+                                    <attribute name="qname" value="XBMCAddon" id="1349" addr="0x7fb6eb3f6550" />
+                                    <attribute name="symtab" value="0x7fb6eb3ed950" id="1350" addr="0x7fb6eb3ed950" />
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="1351" addr="0x7f1a040acaf0" >
-                                <attributelist id="1352" addr="0x7f1a040acaf0" >
+                            <typescopesitem id="1351" addr="0x7fb6eb3f3af0" >
+                                <attributelist id="1352" addr="0x7fb6eb3f3af0" >
                                 </attributelist >
                             </typescopesitem >
-                            <typescopesitem id="1353" addr="0x7f1a040a7170" >
-                                <attributelist id="1354" addr="0x7f1a040a7170" >
-                                    <attribute name="name" value="xbmcwsgi" id="1355" addr="0x7f1a040af550" />
-                                    <attribute name="csymtab" value="0x7f1a040a71b0" id="1356" addr="0x7f1a040a71b0" />
-                                    <attribute name="symtab" value="0x7f1a040a7150" id="1357" addr="0x7f1a040a7150" />
+                            <typescopesitem id="1353" addr="0x7fb6eb3ee170" >
+                                <attributelist id="1354" addr="0x7fb6eb3ee170" >
+                                    <attribute name="name" value="xbmcwsgi" id="1355" addr="0x7fb6eb3f6550" />
+                                    <attribute name="csymtab" value="0x7fb6eb3ee1b0" id="1356" addr="0x7fb6eb3ee1b0" />
+                                    <attribute name="symtab" value="0x7fb6eb3ee150" id="1357" addr="0x7fb6eb3ee150" />
                                 </attributelist >
                             </typescopesitem >
                         </typescope >
-                        <attribute name="symtab" value="0x7f1a040a7170" id="1358" addr="0x7f1a040a7170" />
-                        <attribute name="sym_symtab" value="0x7f1a040a6950" id="1359" addr="0x7f1a040a6950" />
+                        <attribute name="symtab" value="0x7fb6eb3ee170" id="1358" addr="0x7fb6eb3ee170" />
+                        <attribute name="sym_symtab" value="0x7fb6eb3ed950" id="1359" addr="0x7fb6eb3ed950" />
                     </attributelist >
 
-                    <class id="1360" addr="0x7f1a040abb90" >
-                        <attributelist id="1361" addr="0x7f1a040abb90" >
-                            <attribute name="name" value="XBMCAddon::xbmcwsgi::WsgiResponseBody" id="1362" addr="0x7f1a040af550" />
-                            <attribute name="sym_symtab" value="0x7f1a040a7170" id="1363" addr="0x7f1a040a7170" />
-                            <attribute name="symtab" value="0x7f1a040abcd0" id="1364" addr="0x7f1a040abcd0" />
-                            <attribute name="allows_typedef" value="1" id="1365" addr="0x7f1a040af550" />
-                            <attribute name="typepass_visit" value="1" id="1366" addr="0x7f1a040af550" />
-                            <attribute name="allocate_visit" value="1" id="1367" addr="0x7f1a040af550" />
-                            <attribute name="kind" value="class" id="1368" addr="0x7f1a040af550" />
-                            <attribute name="sym_name" value="WsgiResponseBody" id="1369" addr="0x7f1a040af550" />
-                            <attribute name="allocate_default_constructor" value="1" id="1370" addr="0x7f1a040af550" />
-                            <attribute name="allocate_has_constructor" value="1" id="1371" addr="0x7f1a040af550" />
-                            <attribute name="allocate_public_constructor" value="1" id="1372" addr="0x7f1a040af550" />
-                            <attribute name="allocate_has_destructor" value="1" id="1373" addr="0x7f1a040af550" />
-                            <attribute name="allocate_default_destructor" value="1" id="1374" addr="0x7f1a040af550" />
-                            <attribute name="allocate_copy_constructor" value="1" id="1375" addr="0x7f1a040af550" />
-                            <attribute name="privatebaselist" value="0x7f1a040abb70" id="1376" addr="0x7f1a040abb70" />
-                            <attribute name="protectedbaselist" value="0x7f1a040abb50" id="1377" addr="0x7f1a040abb50" />
-                            <baselist id="1378" addr="0x7f1a040abb30" >
-                                <base name="AddonClass" id="1379" addr="0x7f1a040abab0" />
+                    <class id="1360" addr="0x7fb6eb3f2b90" >
+                        <attributelist id="1361" addr="0x7fb6eb3f2b90" >
+                            <attribute name="name" value="XBMCAddon::xbmcwsgi::WsgiResponseBody" id="1362" addr="0x7fb6eb3f6550" />
+                            <attribute name="sym_symtab" value="0x7fb6eb3ee170" id="1363" addr="0x7fb6eb3ee170" />
+                            <attribute name="symtab" value="0x7fb6eb3f2cd0" id="1364" addr="0x7fb6eb3f2cd0" />
+                            <attribute name="allows_typedef" value="1" id="1365" addr="0x7fb6eb3f6550" />
+                            <attribute name="typepass_visit" value="1" id="1366" addr="0x7fb6eb3f6550" />
+                            <attribute name="allocate_visit" value="1" id="1367" addr="0x7fb6eb3f6550" />
+                            <attribute name="kind" value="class" id="1368" addr="0x7fb6eb3f6550" />
+                            <attribute name="sym_name" value="WsgiResponseBody" id="1369" addr="0x7fb6eb3f6550" />
+                            <attribute name="allocate_default_constructor" value="1" id="1370" addr="0x7fb6eb3f6550" />
+                            <attribute name="allocate_has_constructor" value="1" id="1371" addr="0x7fb6eb3f6550" />
+                            <attribute name="allocate_public_constructor" value="1" id="1372" addr="0x7fb6eb3f6550" />
+                            <attribute name="allocate_has_destructor" value="1" id="1373" addr="0x7fb6eb3f6550" />
+                            <attribute name="allocate_default_destructor" value="1" id="1374" addr="0x7fb6eb3f6550" />
+                            <attribute name="allocate_copy_constructor" value="1" id="1375" addr="0x7fb6eb3f6550" />
+                            <attribute name="privatebaselist" value="0x7fb6eb3f2b70" id="1376" addr="0x7fb6eb3f2b70" />
+                            <attribute name="protectedbaselist" value="0x7fb6eb3f2b50" id="1377" addr="0x7fb6eb3f2b50" />
+                            <baselist id="1378" addr="0x7fb6eb3f2b30" >
+                                <base name="AddonClass" id="1379" addr="0x7fb6eb3f2ab0" />
                             </baselist >
-                            <attribute name="module" value="xbmcwsgi" id="1380" addr="0x7f1a040a6270" />
-                            <attribute name="sym_overname" value="__SWIG_0" id="1381" addr="0x7f1a040af550" />
-                            <typescope id="1382" addr="0x7f1a040aec30" >
-                                <attributelist id="1383" addr="0x7f1a040aec30" >
-                                    <attribute name="name" value="WsgiResponseBody" id="1384" addr="0x7f1a040af550" />
-                                    <typetab id="1385" addr="0x7f1a040aec50" >
-                                        <attributelist id="1386" addr="0x7f1a040aec50" >
+                            <attribute name="module" value="xbmcwsgi" id="1380" addr="0x7fb6eb3ed270" />
+                            <attribute name="sym_overname" value="__SWIG_0" id="1381" addr="0x7fb6eb3f6550" />
+                            <typescope id="1382" addr="0x7fb6eb3f5c30" >
+                                <attributelist id="1383" addr="0x7fb6eb3f5c30" >
+                                    <attribute name="name" value="WsgiResponseBody" id="1384" addr="0x7fb6eb3f6550" />
+                                    <typetab id="1385" addr="0x7fb6eb3f5c50" >
+                                        <attributelist id="1386" addr="0x7fb6eb3f5c50" >
                                         </attributelist >
                                     </typetab >
-                                    <attribute name="parent" value="0x7f1a040acab0" id="1387" addr="0x7f1a040acab0" />
-                                    <attribute name="qname" value="XBMCAddon::xbmcwsgi::WsgiResponseBody" id="1388" addr="0x7f1a040af550" />
-                                    <attribute name="symtab" value="0x7f1a040abcd0" id="1389" addr="0x7f1a040abcd0" />
+                                    <attribute name="parent" value="0x7fb6eb3f3ab0" id="1387" addr="0x7fb6eb3f3ab0" />
+                                    <attribute name="qname" value="XBMCAddon::xbmcwsgi::WsgiResponseBody" id="1388" addr="0x7fb6eb3f6550" />
+                                    <attribute name="symtab" value="0x7fb6eb3f2cd0" id="1389" addr="0x7fb6eb3f2cd0" />
                                 </attributelist >
-                                <typescopesitem id="1390" addr="0x7f1a040aebd0" >
-                                    <attributelist id="1391" addr="0x7f1a040aebd0" >
+                                <typescopesitem id="1390" addr="0x7fb6eb3f5bd0" >
+                                    <attributelist id="1391" addr="0x7fb6eb3f5bd0" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="1392" addr="0x7f1a040aec50" >
-                                    <attributelist id="1393" addr="0x7f1a040aec50" >
+                                <typescopesitem id="1392" addr="0x7fb6eb3f5c50" >
+                                    <attributelist id="1393" addr="0x7fb6eb3f5c50" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="1394" addr="0x7f1a040acab0" >
-                                    <attributelist id="1395" addr="0x7f1a040acab0" >
-                                        <attribute name="name" value="xbmcwsgi" id="1396" addr="0x7f1a040af550" />
-                                        <typetab id="1397" addr="0x7f1a040acad0" >
-                                            <attributelist id="1398" addr="0x7f1a040acad0" >
-                                                <attribute name="WsgiInputStreamIterator" value="WsgiInputStreamIterator" id="1399" addr="0x7f1a040af550" />
-                                                <attribute name="WsgiHttpHeader" value="Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>" id="1400" addr="0x7f1a040af550" />
-                                                <attribute name="WsgiErrorStream" value="WsgiErrorStream" id="1401" addr="0x7f1a040af550" />
-                                                <attribute name="WsgiInputStream" value="WsgiInputStream" id="1402" addr="0x7f1a040af550" />
-                                                <attribute name="WsgiResponse" value="WsgiResponse" id="1403" addr="0x7f1a040af550" />
-                                                <attribute name="WsgiResponseBody" value="WsgiResponseBody" id="1404" addr="0x7f1a040af550" />
+                                <typescopesitem id="1394" addr="0x7fb6eb3f3ab0" >
+                                    <attributelist id="1395" addr="0x7fb6eb3f3ab0" >
+                                        <attribute name="name" value="xbmcwsgi" id="1396" addr="0x7fb6eb3f6550" />
+                                        <typetab id="1397" addr="0x7fb6eb3f3ad0" >
+                                            <attributelist id="1398" addr="0x7fb6eb3f3ad0" >
+                                                <attribute name="WsgiInputStreamIterator" value="WsgiInputStreamIterator" id="1399" addr="0x7fb6eb3f6550" />
+                                                <attribute name="WsgiHttpHeader" value="Tuple&lt;(XBMCAddon::String,XBMCAddon::String)>" id="1400" addr="0x7fb6eb3f6550" />
+                                                <attribute name="WsgiErrorStream" value="WsgiErrorStream" id="1401" addr="0x7fb6eb3f6550" />
+                                                <attribute name="WsgiInputStream" value="WsgiInputStream" id="1402" addr="0x7fb6eb3f6550" />
+                                                <attribute name="WsgiResponse" value="WsgiResponse" id="1403" addr="0x7fb6eb3f6550" />
+                                                <attribute name="WsgiResponseBody" value="WsgiResponseBody" id="1404" addr="0x7fb6eb3f6550" />
                                             </attributelist >
-                                            <typetabsitem id="1405" addr="0x7f1a040ad450" >
-                                                <attributelist id="1406" addr="0x7f1a040ad450" >
+                                            <typetabsitem id="1405" addr="0x7fb6eb3f4450" >
+                                                <attributelist id="1406" addr="0x7fb6eb3f4450" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1407" addr="0x7f1a040adff0" >
-                                                <attributelist id="1408" addr="0x7f1a040adff0" >
+                                            <typetabsitem id="1407" addr="0x7fb6eb3f4ff0" >
+                                                <attributelist id="1408" addr="0x7fb6eb3f4ff0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1409" addr="0x7f1a040acbb0" >
-                                                <attributelist id="1410" addr="0x7f1a040acbb0" >
+                                            <typetabsitem id="1409" addr="0x7fb6eb3f3bb0" >
+                                                <attributelist id="1410" addr="0x7fb6eb3f3bb0" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1411" addr="0x7f1a040ad830" >
-                                                <attributelist id="1412" addr="0x7f1a040ad830" >
+                                            <typetabsitem id="1411" addr="0x7fb6eb3f4830" >
+                                                <attributelist id="1412" addr="0x7fb6eb3f4830" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1413" addr="0x7f1a040ae250" >
-                                                <attributelist id="1414" addr="0x7f1a040ae250" >
+                                            <typetabsitem id="1413" addr="0x7fb6eb3f5250" >
+                                                <attributelist id="1414" addr="0x7fb6eb3f5250" >
                                                 </attributelist >
                                             </typetabsitem >
-                                            <typetabsitem id="1415" addr="0x7f1a040aebb0" >
-                                                <attributelist id="1416" addr="0x7f1a040aebb0" >
+                                            <typetabsitem id="1415" addr="0x7fb6eb3f5bb0" >
+                                                <attributelist id="1416" addr="0x7fb6eb3f5bb0" >
                                                 </attributelist >
                                             </typetabsitem >
                                         </typetab >
-                                        <attribute name="parent" value="0x7f1a040ac650" id="1417" addr="0x7f1a040ac650" />
-                                        <attribute name="qname" value="XBMCAddon::xbmcwsgi" id="1418" addr="0x7f1a040af550" />
-                                        <attribute name="symtab" value="0x7f1a040a7170" id="1419" addr="0x7f1a040a7170" />
+                                        <attribute name="parent" value="0x7fb6eb3f3650" id="1417" addr="0x7fb6eb3f3650" />
+                                        <attribute name="qname" value="XBMCAddon::xbmcwsgi" id="1418" addr="0x7fb6eb3f6550" />
+                                        <attribute name="symtab" value="0x7fb6eb3ee170" id="1419" addr="0x7fb6eb3ee170" />
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="1420" addr="0x7f1a040aec70" >
-                                    <attributelist id="1421" addr="0x7f1a040aec70" >
+                                <typescopesitem id="1420" addr="0x7fb6eb3f5c70" >
+                                    <attributelist id="1421" addr="0x7fb6eb3f5c70" >
                                     </attributelist >
                                 </typescopesitem >
-                                <typescopesitem id="1422" addr="0x7f1a040abcd0" >
-                                    <attributelist id="1423" addr="0x7f1a040abcd0" >
-                                        <attribute name="name" value="WsgiResponseBody" id="1424" addr="0x7f1a040af550" />
-                                        <attribute name="csymtab" value="0x7f1a040abcf0" id="1425" addr="0x7f1a040abcf0" />
-                                        <attribute name="symtab" value="0x7f1a040abc90" id="1426" addr="0x7f1a040abc90" />
+                                <typescopesitem id="1422" addr="0x7fb6eb3f2cd0" >
+                                    <attributelist id="1423" addr="0x7fb6eb3f2cd0" >
+                                        <attribute name="name" value="WsgiResponseBody" id="1424" addr="0x7fb6eb3f6550" />
+                                        <attribute name="csymtab" value="0x7fb6eb3f2cf0" id="1425" addr="0x7fb6eb3f2cf0" />
+                                        <attribute name="symtab" value="0x7fb6eb3f2c90" id="1426" addr="0x7fb6eb3f2c90" />
                                     </attributelist >
                                 </typescopesitem >
                             </typescope >
                         </attributelist >
 
-                        <access id="1427" addr="0x7f1a040abc50" >
-                            <attributelist id="1428" addr="0x7f1a040abc50" >
-                                <attribute name="kind" value="public" id="1429" addr="0x7f1a040af550" />
+                        <access id="1427" addr="0x7fb6eb3f2c50" >
+                            <attributelist id="1428" addr="0x7fb6eb3f2c50" >
+                                <attribute name="kind" value="public" id="1429" addr="0x7fb6eb3f6550" />
                             </attributelist >
                          
                         </access >
-                        <constructor id="1430" addr="0x7f1a040abe10" >
-                            <attributelist id="1431" addr="0x7f1a040abe10" >
-                                <attribute name="ismember" value="1" id="1432" addr="0x7f1a040af550" />
-                                <attribute name="sym_name" value="WsgiResponseBody" id="1433" addr="0x7f1a040af550" />
-                                <attribute name="name" value="WsgiResponseBody" id="1434" addr="0x7f1a040af550" />
-                                <attribute name="decl" value="f()." id="1435" addr="0x7f1a040af550" />
-                                <attribute name="access" value="public" id="1436" addr="0x7f1a040af550" />
-                                <attribute name="feature_new" value="1" id="1437" addr="0x7f1a040af550" />
-                                <attribute name="sym_symtab" value="0x7f1a040abcd0" id="1438" addr="0x7f1a040abcd0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="1439" addr="0x7f1a040af550" />
+                        <constructor id="1430" addr="0x7fb6eb3f2e10" >
+                            <attributelist id="1431" addr="0x7fb6eb3f2e10" >
+                                <attribute name="ismember" value="1" id="1432" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_name" value="WsgiResponseBody" id="1433" addr="0x7fb6eb3f6550" />
+                                <attribute name="name" value="WsgiResponseBody" id="1434" addr="0x7fb6eb3f6550" />
+                                <attribute name="decl" value="f()." id="1435" addr="0x7fb6eb3f6550" />
+                                <attribute name="access" value="public" id="1436" addr="0x7fb6eb3f6550" />
+                                <attribute name="feature_new" value="1" id="1437" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_symtab" value="0x7fb6eb3f2cd0" id="1438" addr="0x7fb6eb3f2cd0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="1439" addr="0x7fb6eb3f6550" />
                             </attributelist >
                          
                         </constructor >
-                        <destructor id="1440" addr="0x7f1a040abf70" >
-                            <attributelist id="1441" addr="0x7f1a040abf70" >
-                                <attribute name="ismember" value="1" id="1442" addr="0x7f1a040af550" />
-                                <attribute name="sym_name" value="~WsgiResponseBody" id="1443" addr="0x7f1a040af550" />
-                                <attribute name="name" value="~WsgiResponseBody" id="1444" addr="0x7f1a040af550" />
-                                <attribute name="decl" value="f()." id="1445" addr="0x7f1a040af550" />
-                                <attribute name="access" value="public" id="1446" addr="0x7f1a040af550" />
-                                <attribute name="sym_symtab" value="0x7f1a040abcd0" id="1447" addr="0x7f1a040abcd0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="1448" addr="0x7f1a040af550" />
+                        <destructor id="1440" addr="0x7fb6eb3f2f70" >
+                            <attributelist id="1441" addr="0x7fb6eb3f2f70" >
+                                <attribute name="ismember" value="1" id="1442" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_name" value="~WsgiResponseBody" id="1443" addr="0x7fb6eb3f6550" />
+                                <attribute name="name" value="~WsgiResponseBody" id="1444" addr="0x7fb6eb3f6550" />
+                                <attribute name="decl" value="f()." id="1445" addr="0x7fb6eb3f6550" />
+                                <attribute name="access" value="public" id="1446" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_symtab" value="0x7fb6eb3f2cd0" id="1447" addr="0x7fb6eb3f2cd0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="1448" addr="0x7fb6eb3f6550" />
                             </attributelist >
                          
                         </destructor >
-                        <cdecl id="1449" addr="0x7f1a040ac270" >
-                            <attributelist id="1450" addr="0x7f1a040ac270" >
-                                <attribute name="ismember" value="1" id="1451" addr="0x7f1a040af550" />
-                                <attribute name="sym_name" value="operator ()" id="1452" addr="0x7f1a040af550" />
-                                <attribute name="name" value="operator ()" id="1453" addr="0x7f1a040af550" />
-                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="1454" addr="0x7f1a040af550" />
-                                <parmlist id="1455" addr="0x7f1a040ac1b0" >
+                        <cdecl id="1449" addr="0x7fb6eb3f3270" >
+                            <attributelist id="1450" addr="0x7fb6eb3f3270" >
+                                <attribute name="ismember" value="1" id="1451" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_name" value="operator ()" id="1452" addr="0x7fb6eb3f6550" />
+                                <attribute name="name" value="operator ()" id="1453" addr="0x7fb6eb3f6550" />
+                                <attribute name="decl" value="f(r.q(const).XBMCAddon::String)." id="1454" addr="0x7fb6eb3f6550" />
+                                <parmlist id="1455" addr="0x7fb6eb3f31b0" >
                                     <parm id="1456">
-                                        <attributelist id="1457" addr="0x7f1a040ac1b0" >
-                                            <attribute name="name" value="data" id="1458" addr="0x7f1a040af550" />
-                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1459" addr="0x7f1a040af550" />
+                                        <attributelist id="1457" addr="0x7fb6eb3f31b0" >
+                                            <attribute name="name" value="data" id="1458" addr="0x7fb6eb3f6550" />
+                                            <attribute name="type" value="r.q(const).XBMCAddon::String" id="1459" addr="0x7fb6eb3f6550" />
                                         </attributelist >
                                     </parm >
                                 </parmlist >
-                                <attribute name="access" value="public" id="1460" addr="0x7f1a040af550" />
-                                <attribute name="kind" value="function" id="1461" addr="0x7f1a040af550" />
-                                <attribute name="type" value="void" id="1462" addr="0x7f1a040af550" />
-                                <attribute name="sym_symtab" value="0x7f1a040abcd0" id="1463" addr="0x7f1a040abcd0" />
-                                <attribute name="sym_overname" value="__SWIG_0" id="1464" addr="0x7f1a040af550" />
+                                <attribute name="access" value="public" id="1460" addr="0x7fb6eb3f6550" />
+                                <attribute name="kind" value="function" id="1461" addr="0x7fb6eb3f6550" />
+                                <attribute name="type" value="void" id="1462" addr="0x7fb6eb3f6550" />
+                                <attribute name="sym_symtab" value="0x7fb6eb3f2cd0" id="1463" addr="0x7fb6eb3f2cd0" />
+                                <attribute name="sym_overname" value="__SWIG_0" id="1464" addr="0x7fb6eb3f6550" />
                             </attributelist >
                          
                         </cdecl >
@@ -2238,10 +2238,10 @@
                 </namespace >
             </namespace >
         </include >
-        <insert id="1465" addr="0x7f1a040ac470" >
-            <attributelist id="1466" addr="0x7f1a040ac470" >
-                <attribute name="code" value="&#10;#endif&#10;" id="1467" addr="0x7f1a040af550" />
-                <attribute name="section" value="footer" id="1468" addr="0x7f1a040af550" />
+        <insert id="1465" addr="0x7fb6eb3f3470" >
+            <attributelist id="1466" addr="0x7fb6eb3f3470" >
+                <attribute name="code" value="&#10;#endif&#10;" id="1467" addr="0x7fb6eb3f6550" />
+                <attribute name="section" value="footer" id="1468" addr="0x7fb6eb3f6550" />
             </attributelist >
          
         </insert >
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index ce7c880920a..e419b16dc1d 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,6 +1,6 @@
 # Template file for 'kodi'
 pkgname=kodi
-version=18.3
+version=18.4
 revision=1
 _codename="Leia"
 wrksrc="xbmc-${version}-${_codename}"
@@ -11,7 +11,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://www.kodi.tv"
 distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz"
-checksum=4f265901c00f582beb8d6ad96c9c303e5ab82611e828c7121ae822b07c0915cc
+checksum=bf2be186d8ae5b5377e43c06a538012bb9f51a0e98f8244b70a401006861d110
 patch_args="-Np1"
 LDFLAGS+=" -Wl,-z,stack-size=1048576"
 
diff --git a/srcpkgs/kolourpaint/template b/srcpkgs/kolourpaint/template
index 6af501c8730..d1a1847c168 100644
--- a/srcpkgs/kolourpaint/template
+++ b/srcpkgs/kolourpaint/template
@@ -1,20 +1,16 @@
 # Template file for 'kolourpaint'
 pkgname=kolourpaint
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules kcoreaddons"
+hostmakedepends="extra-cmake-modules kcoreaddons kdoctools qt5-host-tools qt5-qmake"
 makedepends="kdelibs4support-devel kparts-devel libksane-devel qt5-devel"
 short_desc="Free, easy-to-use paint program for KDE"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="BSD-2-Clause, GPL-2.0-or-later, LGPL-2.1-only, GFDL-1.2-only"
 homepage="http://www.kolourpaint.org/"
 distfiles="${KDE_SITE}/applications/${version}/src/kolourpaint-${version}.tar.xz"
-checksum=00596d813eff27e45de7f51ae411b144ee21a7ae2baf576e248046dbd97e097d
-
-if [ -n "$CROSS_BUILD" ]; then
-	hostmakedepends+=" python qt5-host-tools qt5-qmake kconfig kdoctools"
-fi
+checksum=e8bde8d516159ae93dfe56565eea2919d2154606fd1814202f30caf21f659cda
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/kompare/template b/srcpkgs/kompare/template
index a49d43aaf40..0940f11d1da 100644
--- a/srcpkgs/kompare/template
+++ b/srcpkgs/kompare/template
@@ -1,9 +1,9 @@
 # Template file for 'kompare'
 pkgname=kompare
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python
+hostmakedepends="extra-cmake-modules kcoreaddons kdoctools
  qt5-host-tools qt5-qmake"
 makedepends="ktexteditor-devel libkomparediff2-devel"
 short_desc="File difference viewer"
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/development/kompare/"
 distfiles="${KDE_SITE}/applications/${version}/src/kompare-${version}.tar.xz"
-checksum=695c4096c3ac15ab38e5cfb4114f9425c8ccb2f618a65b5f36f3ddee5edec212
+checksum=b14f23ac6eb72622a06e2e489fc2d684124f520ad13e032338397fef342659eb
diff --git a/srcpkgs/konqueror/template b/srcpkgs/konqueror/template
index d07cd3eff27..91acdcbfe85 100644
--- a/srcpkgs/konqueror/template
+++ b/srcpkgs/konqueror/template
@@ -1,6 +1,6 @@
 # Template file for 'konqueror'
 pkgname=konqueror
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -14,10 +14,10 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://konqueror.org"
 distfiles="${KDE_SITE}/applications/${version}/src/konqueror-${version}.tar.xz"
-checksum=cc37709dcf183c68effb5332c29527b13fe7aae78216b84680ef6cc73192f971
+checksum=336da877ea44fb100ca5396bc843994d77d0939fe3c969ad8fa85f0e1644d111
 
 case "$XBPS_TARGET_MACHINE" in
-        arm*) broken="depends on qt5-webengine";;
+	arm*) broken="depends on qt5-webengine";;
 esac
 
 konqueror-devel_package() {
@@ -28,4 +28,3 @@ konqueror-devel_package() {
 		vmove usr/lib/cmake
 	}
 }
-
diff --git a/srcpkgs/konquest/template b/srcpkgs/konquest/template
index c0b650eb2e3..8a21e7999b1 100644
--- a/srcpkgs/konquest/template
+++ b/srcpkgs/konquest/template
@@ -1,6 +1,6 @@
 # Template file for 'konquest'
 pkgname=konquest
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kcoreaddons kdoctools"
@@ -11,4 +11,4 @@ maintainer="Olga Ustuzhanina <me@laserbat.pw>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/games/konquest/"
 distfiles="${KDE_SITE}/applications/${version}/src/konquest-${version}.tar.xz"
-checksum=94919dce58182859f7e720ece73be81b5bafc359afdc1c29f4f45a3b24155e60
+checksum=3dda62a480e37d97aabdc4670a8ac1cf209605ed274c872ee3575ff1ecff6936
diff --git a/srcpkgs/konsole/template b/srcpkgs/konsole/template
index 9dc40652103..c8c5886fa6b 100644
--- a/srcpkgs/konsole/template
+++ b/srcpkgs/konsole/template
@@ -1,6 +1,6 @@
 # Template file for 'konsole'
 pkgname=konsole
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://www.kde.org/applications/system/konsole/"
 distfiles="${KDE_SITE}/applications/${version}/src/konsole-${version}.tar.xz"
-checksum=4d495bf42fad1f457282a57f19fe2aece1ddbc88239352f0ebadfbcebf52ad6e
+checksum=4702fe52279c99e7d8da313285ace26955776669a78bdcb6dac7aec76cabe5ed
 replaces="konsole5>=0"
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/kontact/template b/srcpkgs/kontact/template
index d1993b539f0..41d3f4dcaa2 100644
--- a/srcpkgs/kontact/template
+++ b/srcpkgs/kontact/template
@@ -1,6 +1,6 @@
 # Template file for 'kontact'
 pkgname=kontact
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kdoctools
@@ -12,7 +12,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/office/kontact"
 distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=e47d3b4133e24b1c90a3a15f99a77cef442eefa0f2570dd34d5a9e302e845d9b
+checksum=d24023381304fbe388a0840921599d13c86912a1285acfc0a7d607962e37c5cf
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*) broken="depends on qt5-webengine";;
diff --git a/srcpkgs/kontactinterface/template b/srcpkgs/kontactinterface/template
index e81c8c458f9..0124aa7c65b 100644
--- a/srcpkgs/kontactinterface/template
+++ b/srcpkgs/kontactinterface/template
@@ -1,6 +1,6 @@
 # Template file for 'kontactinterface'
 pkgname=kontactinterface
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://kontact.kde.org"
 distfiles="${KDE_SITE}/applications/${version}/src/kontactinterface-${version}.tar.xz"
-checksum=e490fb4dc0e762d4f12a837ecbddc2f14276672d8f46d10029987222b372f3bc
+checksum=cbd34915ddf6fbcf02395f7c876050f2b732f3769627489f04979e419cfdc869
 
 kontactinterface-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/korganizer/template b/srcpkgs/korganizer/template
index e02249f923c..b8e16241e0e 100644
--- a/srcpkgs/korganizer/template
+++ b/srcpkgs/korganizer/template
@@ -1,7 +1,7 @@
 # Template file for 'korganizer'
 pkgname=korganizer
-version=19.08.0
-revision=1
+version=19.08.2
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kdoctools
  kcoreaddons kconfig"
@@ -12,4 +12,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/office/korganizer"
 distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=fbb6db9e517f7065ed978c6356989a38cea0c9520693d5e67fa04d8cfa625722
+checksum=969930b66a445873a28bfe2e67876388259e35e89ffce45607583b4a668d9194
diff --git a/srcpkgs/kpackage/template b/srcpkgs/kpackage/template
index 9a986b6fcf4..30227c8f014 100644
--- a/srcpkgs/kpackage/template
+++ b/srcpkgs/kpackage/template
@@ -1,6 +1,6 @@
 # Template file for 'kpackage'
 pkgname=kpackage
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kpackage"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8ff82d14fe0dd92ac774d5cd9cd6334b01574f0f5c584266f97359dde5db9a5f
+checksum=050b7f942ef0ce8ea99c1bddb119ee41905a70c2a5d52a9af63a4ea9599ca7c0
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"
diff --git a/srcpkgs/kparts/template b/srcpkgs/kparts/template
index 1a3d4eea5fb..522cae7772a 100644
--- a/srcpkgs/kparts/template
+++ b/srcpkgs/kparts/template
@@ -1,6 +1,6 @@
 # Template file for 'kparts'
 pkgname=kparts
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kparts"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f223b38f34f009bb25511ce7d97c607102cbb0a1bd0253ec1b7d1fe1b7c81436
+checksum=dc269356119c396ceea7a8fc3932209cec13eabb43974b4016b555921319a055
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python"
diff --git a/srcpkgs/kpartx/template b/srcpkgs/kpartx/template
index f73aa91f340..9281b1bfb77 100644
--- a/srcpkgs/kpartx/template
+++ b/srcpkgs/kpartx/template
@@ -1,6 +1,6 @@
 # Template file for 'kpartx'
 pkgname=kpartx
-version=0.8.2
+version=0.8.3
 revision=1
 wrksrc="multipath-tools-${version}"
 build_wrksrc=kpartx
@@ -12,11 +12,11 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://christophe.varoqui.free.fr/"
 distfiles="https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=refs/tags/${version}>kpartx-${version}.tar.gz"
-checksum=ba58d81bf6fc5ed30bbe278ec02bf63f59f3f121dbec32b1ba35cb9a1695cc74
+checksum=08c77873181832e4b5684bad5d08199602e6a708f43987fa459d054827f5f2d5
 LDFLAGS="-ldevmapper"
 CFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DLIBDM_API_COOKIE -I../libmultipath"
 
 post_extract() {
-	sed -i 's/daddr_t/uint32_t/g' kpartx/solaris.c
+	sed -i 's/__kernel_uint32_t/uint32_t/g' kpartx/solaris.c
 	sed -i 's,<sysmacros.h>,<sys/sysmacros.h>,g' kpartx/lopart.c
 }
diff --git a/srcpkgs/kpat/template b/srcpkgs/kpat/template
index 3ba58a18ae3..0785ce9134c 100644
--- a/srcpkgs/kpat/template
+++ b/srcpkgs/kpat/template
@@ -1,6 +1,6 @@
 # Template file for 'kpat'
 pkgname=kpat
-version=19.04.3
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kcoreaddons kdoctools
@@ -12,4 +12,8 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/games/kpatience/"
 distfiles="${KDE_SITE}/applications/${version}/src/kpat-${version}.tar.xz"
-checksum=ca9d53d400a2be3ca421d6d916cafeff3b9dcf220e627a1762f96817e952e8e2
+checksum=6322d86e12996da3d95f6d4afd1d2e70cfd1771698bab393aaf987fd4fe0ef67
+
+pre_check() {
+	export QT_QPA_PLATFORM=offscreen
+}
diff --git a/srcpkgs/kpeople/template b/srcpkgs/kpeople/template
index 6b4fed3f22c..ab3a49d4455 100644
--- a/srcpkgs/kpeople/template
+++ b/srcpkgs/kpeople/template
@@ -1,6 +1,6 @@
 # Template file for 'kpeople'
 pkgname=kpeople
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kpeople"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=549edacd7b63d704dd165bc803ae03f8d9e8c1ba31f8dbaea3f7e12c466b4298
+checksum=d43d6229a4963ff631d5b0b690bc1230d55e7bcb1abc03d245c33488a28050e0
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python"
diff --git a/srcpkgs/kpimtextedit/template b/srcpkgs/kpimtextedit/template
index cc55c716533..8b4297059d0 100644
--- a/srcpkgs/kpimtextedit/template
+++ b/srcpkgs/kpimtextedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kpimtextedit'
 pkgname=kpimtextedit
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python qt5-qmake qt5-host-tools
@@ -13,7 +13,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/applications/kpimtextedit"
 distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=45fcc5898e921c41eb28bb64ddd6d8240f4261360b9149a149ae4c281844dfcb
+checksum=e565774d77f310165fc44c8b109ef835aae82a2f763d89d1ffb6e5b820cd850d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-tools-devel"
diff --git a/srcpkgs/kplotting/template b/srcpkgs/kplotting/template
index 558d9b25220..417a284cd5d 100644
--- a/srcpkgs/kplotting/template
+++ b/srcpkgs/kplotting/template
@@ -1,17 +1,17 @@
 # Template file for 'kplotting'
 pkgname=kplotting
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
-makedepends="qt5-devel"
+makedepends="qt5-devel qt5-tools-devel"
 short_desc="QWidget-derived class for easy data-plotting"
 maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kplotting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=95781b50bef0e081e48b472b4fcbbcd3301ec45245498261e4a3ec8e42b892ba
+checksum=2957b8c5262e717950771a4f7bace00ff115069bb0db22b77e819d21c9c07786
 
 kplotting-devel_package() {
 	short_desc+=" - development"
@@ -19,6 +19,7 @@ kplotting-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/qt5/mkspecs
+		vmove usr/lib/qt5/plugins/designer
 		vmove usr/lib/cmake
 		vmove "usr/lib/*.so"
 	}
diff --git a/srcpkgs/kpty/template b/srcpkgs/kpty/template
index 19762ebd58d..52b79a6a717 100644
--- a/srcpkgs/kpty/template
+++ b/srcpkgs/kpty/template
@@ -1,6 +1,6 @@
 # Template file for 'kpty'
 pkgname=kpty
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kpty"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b91a88c00d3387927d1f6886a04e6e5bcc615ee1d0e72f647d51320ebf73471c
+checksum=79d2a9969cf2c20b41b701145f223151f618b50d4cf1466c2038b46902086683
 
 kpty-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kqtquickcharts/template b/srcpkgs/kqtquickcharts/template
index ceac9d10c2c..db13d938b0a 100644
--- a/srcpkgs/kqtquickcharts/template
+++ b/srcpkgs/kqtquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kqtquickcharts'
 pkgname=kqtquickcharts
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://edu.kde.org/"
 distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=6b25edca7643287acaf436ba58124077b89d067e2881a5dbfbd8833b68f3cb05
+checksum=3341f99ba3a35e9c4fd70911faebaf4312d7700a342edd242de2118f9a77c9fb
 
 kqtquickcharts-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/krdc/template b/srcpkgs/krdc/template
index f7cd2ff95cb..f6adfb75eaa 100644
--- a/srcpkgs/krdc/template
+++ b/srcpkgs/krdc/template
@@ -1,6 +1,6 @@
 # Template file for 'krdc'
 pkgname=krdc
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,10 +13,10 @@ makedepends="kconfig-devel kcmutils-devel kdnssd-devel knotifyconfig-devel
 depends="freerdp"
 short_desc="Remote Desktop Client supporting VNC and RDP"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
-license="GPL-2.0-or-later, GFDL-2.1, LGPL-2.1-or-later"
+license="GPL-2.0-or-later, GFDL-1.2-only, LGPL-2.1-or-later"
 homepage="https://kde.org/applications/internet/krdc/"
 distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=62c995dc1b6eabf2486d475ad089cb3e286d37c6927e4c5bd2455489f52a3e75
+checksum=c5e6193115afe742f25365bacb55aea21428acf38407659f77636217c589d8ff
 
 krdc-devel_package() {
 	short_desc+=" - development files"
@@ -26,4 +26,3 @@ krdc-devel_package() {
 		vmove "usr/lib/*.so"
 	}
 }
-
diff --git a/srcpkgs/krfb/template b/srcpkgs/krfb/template
index 8e570b88cf7..2afb73fd176 100644
--- a/srcpkgs/krfb/template
+++ b/srcpkgs/krfb/template
@@ -1,6 +1,6 @@
 # Template file for 'krfb'
 pkgname=krfb
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python kdoctools
@@ -11,7 +11,7 @@ makedepends="qt5-devel qt5-x11extras-devel ki18n-devel kcompletion-devel
  kxmlgui-devel libvncserver-devel libXtst-devel xcb-util-image-devel"
 short_desc="KDE Desktop Sharing"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
-license="GPL-2.0-or-later, GFDL-2.1, LGPL-2.1-or-later"
+license="GPL-2.0-or-later, GFDL-1.2-only, LGPL-2.1-or-later"
 homepage="https://www.kde.org/applications/system/krfb"
 distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=1142e493a37ce867b069ac278215377b56061b2412ee2dd46b0db456fb1419d4
+checksum=08877020abf6b7ac38e393443c34e7791456fc5bea8c43c552551148fd67b67e
diff --git a/srcpkgs/krita/patches/musl.patch b/srcpkgs/krita/patches/musl.patch
new file mode 100644
index 00000000000..fc87b4a9aea
--- /dev/null
+++ b/srcpkgs/krita/patches/musl.patch
@@ -0,0 +1,11 @@
+--- libs/image/tests/kis_paint_device_test.cpp	2019-09-30 15:18:28.000000000 +0200
++++ -	2019-10-01 16:45:18.829596521 +0200
+@@ -2354,7 +2354,7 @@
+ 
+         qDebug() << "Iteration:" << i;
+ 
+-#ifdef Q_OS_LINUX
++#ifdef __GLIBC__ 
+         struct mallinfo info = mallinfo();
+         qDebug() << "Allocated on heap:" << (info.arena >> 20) << "MiB";
+         qDebug() << "Mmaped regions:" << info.hblks << (info.hblkhd >> 20) << "MiB";
diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index 8c9a5671bb6..7a59fc9ac58 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,6 +1,6 @@
 # Template file for 'krita'
 pkgname=krita
-version=4.2.5
+version=4.2.7.1
 revision=1
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
@@ -16,7 +16,8 @@ short_desc="Painting and image editing program"
 maintainer="John <johnz@posteo.net>"
 license="GPL-3.0-only"
 homepage="https://krita.org/"
+KDE_SITE="http://ftp5.gwdg.de/pub/linux/kde/stable/"
 distfiles="${KDE_SITE}/krita/${version}/krita-${version}.tar.gz"
-checksum=fce4342ae54f7c9b2a318d49d678699d760485ef406b3db235542b9cabc824b8
+checksum=28218030edca9dfa1c7e255401ca6fc8fe0e5329f7611cfc196e35746d312086
 nocross=yes
 replaces="calligra-krita>=0"
diff --git a/srcpkgs/kross/template b/srcpkgs/kross/template
index c36dee6d3c0..9e02a2cf17c 100644
--- a/srcpkgs/kross/template
+++ b/srcpkgs/kross/template
@@ -1,6 +1,6 @@
 # Template file for 'kross'
 pkgname=kross
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,13 +11,17 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kross"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=103837799febbd62365a6445db046a2ee4add13d7d250abf925872cac642986e
+checksum=ecc1f2ac39b4d9d53e52b30aca40cfc1d5b7cfc834a321f1e3dbd4d5e7bb515d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools-devel"
 	configure_args+=" -DMEINPROC5_EXECUTABLE=/usr/bin/meinproc5"
 fi
 
+case "$XBPS_TARGET_MACHINE" in
+	armv6l-musl) makedepends+=" libatomic-devel";;
+esac
+
 kross-devel_package() {
 	short_desc+=" - development"
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kruler/template b/srcpkgs/kruler/template
index a35ebf3f80d..35c32e99b84 100644
--- a/srcpkgs/kruler/template
+++ b/srcpkgs/kruler/template
@@ -1,17 +1,14 @@
 # Template file for 'kruler'
 pkgname=kruler
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules kcoreaddons pkg-config"
+hostmakedepends="extra-cmake-modules kconfig kcoreaddons kdoctools
+ pkg-config qt5-host-tools qt5-qmake"
 makedepends="kparts-devel"
 short_desc="Screen Ruler"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/kruler/"
 distfiles="${KDE_SITE}/applications/${version}/src/kruler-${version}.tar.xz"
-checksum=a78d054359b559b612dd1dac8f0974f554fb7a52bd8de7152de88866719f9226
-
-if [ -n "$CROSS_BUILD" ]; then
-	hostmakedepends+=" kconfig kdoctools python qt5-host-tools qt5-qmake"
-fi
+checksum=2a3c51a60f503807694cf49796b3bf82c6992ec4c0c15cf38adae92a8dbc24cc
diff --git a/srcpkgs/krunner/template b/srcpkgs/krunner/template
index de0a5a2dafa..80d859ee981 100644
--- a/srcpkgs/krunner/template
+++ b/srcpkgs/krunner/template
@@ -1,6 +1,6 @@
 # Template file for 'krunner'
 pkgname=krunner
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/frameworks/krunner"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f32ea603a9bcb9c2e39231f99bfc6079d118eebbf2c72e0818e2a9cd060543be
+checksum=aa58b6301de114e7f0a420982f1387dfadac2112aac1339182af18f4f4e7583e
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/krusader/template b/srcpkgs/krusader/template
index 957b09c7517..9f184d53be8 100644
--- a/srcpkgs/krusader/template
+++ b/srcpkgs/krusader/template
@@ -1,7 +1,7 @@
 # Template file for 'krusader'
 pkgname=krusader
-version=2.7.1
-revision=2
+version=2.7.2
+revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config kdoctools qt5-qmake qt5-host-tools kcoreaddons"
 makedepends="kparts-devel plasma-framework-devel ksolid-devel"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.krusader.org/"
 distfiles="${KDE_SITE}/krusader/${version}/krusader-${version}.tar.xz"
-checksum=d5c14d7e0698b84a1285efe7058074f760924d13d0823e1b5123fbe771907deb
+checksum=41a39a43b3c42dd1d1ecaea86df30caff6a061fecc1d66f60859b2a3ca976109
diff --git a/srcpkgs/kscreen/template b/srcpkgs/kscreen/template
index 83f1b8e3f95..76fcf23a625 100644
--- a/srcpkgs/kscreen/template
+++ b/srcpkgs/kscreen/template
@@ -1,18 +1,20 @@
 # Template file for 'kscreen'
 pkgname=kscreen
-version=5.16.4
+version=5.17.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
-hostmakedepends="extra-cmake-modules qt5-devel qt5-qmake kcoreaddons"
-makedepends="kxmlgui-devel libkscreen-devel plasma-framework-devel"
+hostmakedepends="extra-cmake-modules qt5-devel qt5-qmake
+ kcmutils kcoreaddons"
+makedepends="kxmlgui-devel libkscreen-devel plasma-framework-devel
+ kcmutils-devel"
 depends="hicolor-icon-theme"
 short_desc="KDE screen management software"
 maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/plasma/kscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=40c29ad2236459a267eed3cad4a6fc64b5e3f12df8567fcf8869ba770c2e2328
+checksum=9a1e689f0b8ac69fd9c471a5f4f54a846c1ec8a1914ab9b71754a81cd4c5d6ee
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/kscreenlocker/template b/srcpkgs/kscreenlocker/template
index 5281af68768..1740e089354 100644
--- a/srcpkgs/kscreenlocker/template
+++ b/srcpkgs/kscreenlocker/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreenlocker'
 pkgname=kscreenlocker
-version=5.16.4
+version=5.17.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/plasma/kscreenlocker"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=92a858f1f4bd6f209f328ca6456dfadc6b542e2a1e3d04ecdcc70f70c1cc2f6f
+checksum=2047e1dad90fd1c298ab23c7668fa60fd1189b1d232aca0ed5976d086ac1f3cb
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wayland-devel"
diff --git a/srcpkgs/kservice/template b/srcpkgs/kservice/template
index 9985a75d774..f85e659236f 100644
--- a/srcpkgs/kservice/template
+++ b/srcpkgs/kservice/template
@@ -1,6 +1,6 @@
 # Template file for 'kservice'
 pkgname=kservice
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kservice"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4489ac4553522bb76604e284338ab37a7a2369eea45dadd96a955fedf8ca99f9
+checksum=93ff8eef9bafccec78fe972aefd8d839086c9e3e13a8affc35d8e5c813bfaae5
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel kcoreaddons kdoctools"
diff --git a/srcpkgs/ksh/files/LICENSE b/srcpkgs/ksh/files/LICENSE
deleted file mode 100644
index ebd0b184eff..00000000000
--- a/srcpkgs/ksh/files/LICENSE
+++ /dev/null
@@ -1,229 +0,0 @@
-Copyright:
-
-  Copyright (c) 1982-2012 AT&T Intellectual Property
-
-Upstream Author: David Korn <dgk@research.att.com>
-
-License:
-
-+------------------------------------------------------------------------------+
-|          This license covers all software that refers to the URL             |
-|             http://www.eclipse.org/org/documents/epl-v10.html                |
-+------------------------------------------------------------------------------+
-
-Eclipse Public License - v 1.0
-
-   THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
-   LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
-   CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-   1. DEFINITIONS
-
-   "Contribution" means:
-
-   a)  in  the  case  of  the  initial  Contributor, the initial code and
-   documentation distributed under this Agreement, and
-
-   b) in the case of each subsequent Contributor:
-
-   i) changes to the Program, and
-
-   ii) additions to the Program;
-
-   where such changes and/or additions to the Program originate from and are
-   distributed by that particular Contributor. A Contribution 'originates' from
-   a Contributor if it was added to the Program by such Contributor itself or
-   anyone acting on such Contributor's behalf. Contributions do not include
-   additions  to  the Program which: (i) are separate modules of software
-   distributed  in  conjunction  with the Program under their own license
-   agreement, and (ii) are not derivative works of the Program.
-
-   "Contributor" means any person or entity that distributes the Program.
-
-   "Licensed Patents" mean patent claims licensable by a Contributor which are
-   necessarily infringed by the use or sale of its Contribution alone or when
-   combined with the Program.
-
-   "Program"  means the Contributions distributed in accordance with this
-   Agreement.
-
-   "Recipient" means anyone who receives the Program under this Agreement,
-   including all Contributors.
-
-   2. GRANT OF RIGHTS
-
-   a) Subject to the terms of this Agreement, each Contributor hereby grants
-   Recipient a non-exclusive, worldwide, royalty-free copyright license to
-   reproduce, prepare derivative works of, publicly display, publicly perform,
-   distribute and sublicense the Contribution of such Contributor, if any, and
-   such derivative works, in source code and object code form.
-
-   b) Subject to the terms of this Agreement, each Contributor hereby grants
-   Recipient a non-exclusive, worldwide, royalty-free patent license under
-   Licensed Patents to make, use, sell, offer to sell, import and otherwise
-   transfer the Contribution of such Contributor, if any, in source code and
-   object code form. This patent license shall apply to the combination of the
-   Contribution and the Program if, at the time the Contribution is added by
-   the Contributor, such addition of the Contribution causes such combination
-   to be covered by the Licensed Patents. The patent license shall not apply to
-   any other combinations which include the Contribution. No hardware per se is
-   licensed hereunder.
-
-   c) Recipient understands that although each Contributor grants the licenses
-   to its Contributions set forth herein, no assurances are provided by any
-   Contributor  that  the  Program  does not infringe the patent or other
-   intellectual property rights of any other entity. Each Contributor disclaims
-   any liability to Recipient for claims brought by any other entity based on
-   infringement of intellectual property rights or otherwise. As a condition to
-   exercising the rights and licenses granted hereunder, each Recipient hereby
-   assumes sole responsibility to secure any other intellectual property rights
-   needed, if any. For example, if a third party patent license is required to
-   allow Recipient to distribute the Program, it is Recipient's responsibility
-   to acquire that license before distributing the Program.
-
-   d) Each Contributor represents that to its knowledge it has sufficient
-   copyright rights in its Contribution, if any, to grant the copyright license
-   set forth in this Agreement.
-
-   3. REQUIREMENTS
-
-   A Contributor may choose to distribute the Program in object code form under
-   its own license agreement, provided that:
-
-   a) it complies with the terms and conditions of this Agreement; and
-
-   b) its license agreement:
-
-   i) effectively disclaims on behalf of all Contributors all warranties and
-   conditions, express and implied, including warranties or conditions of title
-   and   non-infringement,   and  implied  warranties  or  conditions  of
-   merchantability and fitness for a particular purpose;
-
-   ii) effectively excludes on behalf of all Contributors all liability for
-   damages, including direct, indirect, special, incidental and consequential
-   damages, such as lost profits;
-
-   iii) states that any provisions which differ from this Agreement are offered
-   by that Contributor alone and not by any other party; and
-
-   iv)  states  that  source  code for the Program is available from such
-   Contributor, and informs licensees how to obtain it in a reasonable manner
-   on or through a medium customarily used for software exchange.
-
-   When the Program is made available in source code form:
-
-   a) it must be made available under this Agreement; and
-
-   b) a copy of this Agreement must be included with each copy of the Program.
-
-   Contributors may not remove or alter any copyright notices contained within
-   the Program.
-
-   Each Contributor must identify itself as the originator of its Contribution,
-   if any, in a manner that reasonably allows subsequent Recipients to identify
-   the originator of the Contribution.
-
-   4. COMMERCIAL DISTRIBUTION
-
-   Commercial distributors of software may accept certain responsibilities with
-   respect to end users, business partners and the like. While this license is
-   intended to facilitate the commercial use of the Program, the Contributor
-   who includes the Program in a commercial product offering should do so in a
-   manner which does not create potential liability for other Contributors.
-   Therefore, if a Contributor includes the Program in a commercial product
-   offering, such Contributor ("Commercial Contributor") hereby agrees to
-   defend and indemnify every other Contributor ("Indemnified Contributor")
-   against any losses, damages and costs (collectively "Losses") arising from
-   claims, lawsuits and other legal actions brought by a third party against
-   the Indemnified Contributor to the extent caused by the acts or omissions of
-   such Commercial Contributor in connection with its distribution of the
-   Program in a commercial product offering. The obligations in this section do
-   not  apply  to  any claims or Losses relating to any actual or alleged
-   intellectual property infringement. In order to qualify, an Indemnified
-   Contributor must: a) promptly notify the Commercial Contributor in writing
-   of such claim, and b) allow the Commercial Contributor to control, and
-   cooperate with the Commercial Contributor in, the defense and any related
-   settlement negotiations. The Indemnified Contributor may participate in any
-   such claim at its own expense.
-
-   For example, a Contributor might include the Program in a commercial product
-   offering, Product X. That Contributor is then a Commercial Contributor. If
-   that  Commercial  Contributor then makes performance claims, or offers
-   warranties related to Product X, those performance claims and warranties are
-   such Commercial Contributor's responsibility alone. Under this section, the
-   Commercial  Contributor  would have to defend claims against the other
-   Contributors related to those performance claims and warranties, and if a
-   court requires any other Contributor to pay any damages as a result, the
-   Commercial Contributor must pay those damages.
-
-   5. NO WARRANTY
-
-   EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON
-   AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER
-   EXPRESS  OR  IMPLIED  INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR
-   CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A
-   PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the
-   appropriateness of using and distributing the Program and assumes all risks
-   associated with its exercise of rights under this Agreement , including but
-   not  limited to the risks and costs of program errors, compliance with
-   applicable laws, damage to or loss of data, programs or equipment, and
-   unavailability or interruption of operations.
-
-   6. DISCLAIMER OF LIABILITY
-
-   EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
-   CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION
-   LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-   ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
-   EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY
-   OF SUCH DAMAGES.
-
-   7. GENERAL
-
-   If  any  provision of this Agreement is invalid or unenforceable under
-   applicable law, it shall not affect the validity or enforceability of the
-   remainder of the terms of this Agreement, and without further action by the
-   parties hereto, such provision shall be reformed to the minimum extent
-   necessary to make such provision valid and enforceable.
-
-   If Recipient institutes patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Program itself
-   (excluding combinations of the Program with other software or hardware)
-   infringes such Recipient's patent(s), then such Recipient's rights granted
-   under Section 2(b) shall terminate as of the date such litigation is filed.
-
-   All Recipient's rights under this Agreement shall terminate if it fails to
-   comply with any of the material terms or conditions of this Agreement and
-   does not cure such failure in a reasonable period of time after becoming
-   aware of such noncompliance. If all Recipient's rights under this Agreement
-   terminate, Recipient agrees to cease use and distribution of the Program as
-   soon as reasonably practicable. However, Recipient's obligations under this
-   Agreement and any licenses granted by Recipient relating to the Program
-   shall continue and survive.
-
-   Everyone is permitted to copy and distribute copies of this Agreement, but
-   in order to avoid inconsistency the Agreement is copyrighted and may only be
-   modified in the following manner. The Agreement Steward reserves the right
-   to publish new versions (including revisions) of this Agreement from time to
-   time. No one other than the Agreement Steward has the right to modify this
-   Agreement. The Eclipse Foundation is the initial Agreement Steward. The
-   Eclipse Foundation may assign the responsibility to serve as the Agreement
-   Steward to a suitable separate entity. Each new version of the Agreement
-   will  be given a distinguishing version number. The Program (including
-   Contributions) may always be distributed subject to the version of the
-   Agreement under which it was received. In addition, after a new version of
-   the Agreement is published, Contributor may elect to distribute the Program
-   (including its Contributions) under the new version. Except as expressly
-   stated in Sections 2(a) and 2(b) above, Recipient receives no rights or
-   licenses  to  the  intellectual property of any Contributor under this
-   Agreement, whether expressly, by implication, estoppel or otherwise. All
-   rights  in  the Program not expressly granted under this Agreement are
-   reserved.
-
-   This Agreement is governed by the laws of the State of New York and the
-   intellectual property laws of the United States of America. No party to this
-   Agreement will bring a legal action under this Agreement more than one year
-   after the cause of action arose. Each party waives its rights to a jury
-   trial in any resulting litigation.
diff --git a/srcpkgs/ksh/template b/srcpkgs/ksh/template
index 711d70d8a0a..2709dacc0b0 100644
--- a/srcpkgs/ksh/template
+++ b/srcpkgs/ksh/template
@@ -1,19 +1,19 @@
 # Template file for 'ksh'
 pkgname=ksh
-version=2018.01.19
-revision=2
-_githash=0280d4fdadd3ad690c7b69b795a2f0621b29c445
-wrksrc="ast-${_githash}"
+version=2020.0.0
+revision=1
+wrksrc="ast-${version}"
 build_style=meson
-register_shell="/bin/ksh"
+configure_args="-Dbuild-api-tests=false -Dbuild-api-tests-only=true"
 short_desc="AT&T's Korn shell (ksh93)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
 homepage="http://www.kornshell.com/"
-distfiles="https://github.com/att/ast/archive/${_githash}.tar.gz"
-checksum=5088ec1a726180e28ffbce5a6c31489100c37d913fd381e534db2607117fc3f7
+distfiles="https://github.com/att/ast/archive/${version}.tar.gz"
+checksum=76597c96c4f94423b9225b5de50ea54be08d5bbaa1e0e594a7eec603bd60ecaf
 nocross=yes
 
+register_shell="/bin/ksh"
 alternatives="
  ksh:ksh:/usr/bin/ksh93
  ksh:ksh.1:/usr/share/man/man1/ksh93.1
@@ -24,14 +24,25 @@ if [ "$build_option_static" ]; then
 	LDFLAGS+=" -static"
 fi
 
+case "$XBPS_TARGET_MACHINE" in
+*-musl)
+	makedepends+=" musl-fts-devel"
+esac
+
 post_extract() {
 	sed -i -e 's/= library/= static_library/'  \
 		-e 's/install: true/install: false/' src/lib/*/meson.build
+	sed -i 's/vpoi/void*/g' src/cmd/ksh93/include/name.h
+	if [ "$build_option_static" ]; then
+		# Drop tests that use .so
+		sed -i '/some tests/,$d' src/cmd/ksh93/meson.build
+		sed -i '/libsample_files/,$d' src/lib/libdll/meson.build
+	fi
 }
 post_install() {
 	mv ${DESTDIR}/usr/bin/ksh ${DESTDIR}/usr/bin/ksh93
 	mv ${DESTDIR}/usr/share/man/man1/ksh.1 ${DESTDIR}/usr/share/man/man1/ksh93.1
 	vmkdir usr/share/ksh
 	vcopy src/cmd/ksh93/fun usr/share/ksh/functions
-	vlicense ${FILESDIR}/LICENSE
+	vlicense LICENSE
 }
diff --git a/srcpkgs/ksmtp/template b/srcpkgs/ksmtp/template
index bc0882d3ef2..8d17864269b 100644
--- a/srcpkgs/ksmtp/template
+++ b/srcpkgs/ksmtp/template
@@ -1,6 +1,6 @@
 # Template file for 'ksmtp'
 pkgname=ksmtp
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/applications/${version}/src/ksmtp-${version}.tar.xz"
-checksum=2947d49f183fe25dc340dd3fa6145c85b1896c8adb08bab9966e1f99a927a003
+checksum=0d1308fd01f7261e78bedb465983be2ccf5a1514cfa31125e0a3488f67ab6590
 
 ksmtp-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/ksnip/patches/useGNUInstallDirs.patch b/srcpkgs/ksnip/patches/useGNUInstallDirs.patch
new file mode 100644
index 00000000000..dc0f9bc685c
--- /dev/null
+++ b/srcpkgs/ksnip/patches/useGNUInstallDirs.patch
@@ -0,0 +1,10 @@
+--- src/CMakeLists.txt	2019-03-14 18:04:48.000000000 +0100
++++ -	2019-08-29 21:09:44.259815517 +0200
+@@ -109,5 +109,6 @@
+ endif ()
+ 
+ if (UNIX AND NOT APPLE)
+-	install(TARGETS ksnip RUNTIME DESTINATION /bin)
++	include (GNUInstallDirs)
++	install(TARGETS ksnip RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+ endif ()
diff --git a/srcpkgs/ksnip/template b/srcpkgs/ksnip/template
new file mode 100644
index 00000000000..25614b21e68
--- /dev/null
+++ b/srcpkgs/ksnip/template
@@ -0,0 +1,14 @@
+# Template file for 'ksnip'
+pkgname=ksnip
+version=1.5.0
+revision=2
+build_style=cmake
+hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools"
+makedepends="qt5-x11extras-devel qt5-tools-devel libXfixes-devel
+ kImageAnnotator-devel kColorPicker-devel"
+short_desc="Qt based cross-platform screenshot tool with annotation features"
+maintainer="John <johnz@posteo.net>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/DamirPorobic/ksnip"
+distfiles="https://github.com/DamirPorobic/ksnip/archive/v${version}.tar.gz"
+checksum=d235b201717b0a058f93ebfb592140b0eb36a2222f7a21cc0694c50fd215c6ca
diff --git a/srcpkgs/ksolid/template b/srcpkgs/ksolid/template
index ca15e11587b..f7b56dc8079 100644
--- a/srcpkgs/ksolid/template
+++ b/srcpkgs/ksolid/template
@@ -1,6 +1,6 @@
 # Template file for 'ksolid'
 pkgname=ksolid
-version=5.61.0
+version=5.63.0
 revision=1
 wrksrc="${pkgname#k}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/frameworks/solid"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#k}-${version}.tar.xz"
-checksum=c3a032086eacbb836fc102bd77236285ad5a808c0537ff55dbacda539ba3eacf
+checksum=d4729dca2d6775e897612f8d0f0c5c23335f86aad84270a5b20e8606fd242244
 
 libksolid_package() {
 	short_desc+=" - runtime library"
diff --git a/srcpkgs/ksshaskpass/template b/srcpkgs/ksshaskpass/template
index 73d72970768..35a22e99420 100644
--- a/srcpkgs/ksshaskpass/template
+++ b/srcpkgs/ksshaskpass/template
@@ -1,6 +1,6 @@
 # Template file for 'ksshaskpass'
 pkgname=ksshaskpass
-version=5.16.4
+version=5.17.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/plasma/ksshaskpass"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e3ff91e5c160b8e83b48215fca5d70f4baeef95b6c3b32e8cfc749183b0ec97c
+checksum=75ed318ebac038b6309b78f10dd1ef6e23935e93f7575372e2c2c4bbe607febb
diff --git a/srcpkgs/ksysguard/template b/srcpkgs/ksysguard/template
index bf1a37a184e..993a03235bc 100644
--- a/srcpkgs/ksysguard/template
+++ b/srcpkgs/ksysguard/template
@@ -1,6 +1,6 @@
 # Template file for 'ksysguard'
 pkgname=ksysguard
-version=5.16.4
+version=5.17.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later, GFDL-1.2"
 homepage="https://projects.kde.org/projects/plasma/ksysguard"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=10abf3bfa676275b6fded5e49979466a011e0552b9357c1b8923f01184c029d5
+checksum=4181535cc74f73c0a75fcf7a377595bd0381125a6f5537b116327b94402013d5
diff --git a/srcpkgs/ksystemlog/template b/srcpkgs/ksystemlog/template
index e7f0f5f575e..5b94cb45174 100644
--- a/srcpkgs/ksystemlog/template
+++ b/srcpkgs/ksystemlog/template
@@ -1,22 +1,17 @@
 # Template file for 'ksystemlog'
 pkgname=ksystemlog
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules kcoreaddons pkg-config"
+hostmakedepends="extra-cmake-modules kconfig kcoreaddons kdoctools pkg-config qt5-host-tools qt5-qmake"
 makedepends="kparts-devel qt5-devel"
 short_desc="KDE System log viewer tool"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/system/ksystemlog/"
 distfiles="${KDE_SITE}/applications/${version}/src/ksystemlog-${version}.tar.xz"
-checksum=1231a9dd9a697fe2379a93a3a4d5c026aedf70a8f7e14d8a626ef6b782fb4259
+checksum=742bff9c71cc42d7a57a7732f039a944f60fe4dd70cf71c32f37ba914b57b5de
 
-if [ -n "$CROSS_BUILD" ]; then
-	hostmakedepends+=" kconfig kdoctools python qt5-host-tools qt5-qmake"
-fi
-
-do_check() {
-	# Requires xserver running
-	:
+pre_check() {
+	export QT_QPA_PLATFORM=offscreen
 }
diff --git a/srcpkgs/kteatime/template b/srcpkgs/kteatime/template
index 80f41a87ffe..9e83e8e4d57 100644
--- a/srcpkgs/kteatime/template
+++ b/srcpkgs/kteatime/template
@@ -1,17 +1,14 @@
 # Template file for 'kteatime'
 pkgname=kteatime
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules kcoreaddons pkg-config"
+hostmakedepends="extra-cmake-modules kcoreaddons kdoctools
+ pkg-config qt5-host-tools qt5-qmake"
 makedepends="kparts-devel knotifyconfig-devel"
 short_desc="Handy timer for steeping tea"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/games/kteatime/"
 distfiles="${KDE_SITE}/applications/${version}/src/kteatime-${version}.tar.xz"
-checksum=3be9667867ef41a638c8f97fefb213b078b0ba3171add881438588bc8afba342
-
-if [ -n "$CROSS_BUILD" ]; then
-	hostmakedepends+=" kdoctools python qt5-host-tools qt5-qmake"
-fi
+checksum=075470af370b7913fdb085dd6984da91f863b6c03a4b713854e85437e6f9cdbe
diff --git a/srcpkgs/ktexteditor/template b/srcpkgs/ktexteditor/template
index 45e2d5636c4..1f74c78469d 100644
--- a/srcpkgs/ktexteditor/template
+++ b/srcpkgs/ktexteditor/template
@@ -1,6 +1,6 @@
 # Template file for 'ktexteditor'
 pkgname=ktexteditor
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/frameworks/ktexteditor"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ae99eacb445f8bc27af379d1ec54e8df4d25f601fc12053bc2928a8c639ad0cb
+checksum=0abbefbad6d66da767b99621f1dc2c4e1568012bff809fc4469608337236d46d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kauth kparts"
diff --git a/srcpkgs/ktextwidgets/template b/srcpkgs/ktextwidgets/template
index 6e8f5214751..d91182727ec 100644
--- a/srcpkgs/ktextwidgets/template
+++ b/srcpkgs/ktextwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'ktextwidgets'
 pkgname=ktextwidgets
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/frameworks/ktextwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a2fddad3dda750ea6bdb104c460e50586946ded3e1f46a8729dbd304016a0b5a
+checksum=0a62b21fc2fc94984d89da81372551b380a2c71293df3f3def29bc559aaa61e1
 
 ktextwidgets-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/ktnef/template b/srcpkgs/ktnef/template
index b6719ae0551..b2f95634a2e 100644
--- a/srcpkgs/ktnef/template
+++ b/srcpkgs/ktnef/template
@@ -1,7 +1,7 @@
 # Template file for 'ktnef'
 pkgname=ktnef
-version=19.08.0
-revision=1
+version=19.08.2
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python
  kcoreaddons"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/applications/${version}/src/ktnef-${version}.tar.xz"
-checksum=54b2e09a872e8f8e4e8a1ef77975b1d063ef0d07999b1bf2a696675659e6d52f
+checksum=d8efabe72eedd5e89f3de9637a1a6d68ce670ec071e031470aa6852f9ad8561d
 
 ktnef-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/ktouch/template b/srcpkgs/ktouch/template
index 3998be000ae..6b91895d660 100644
--- a/srcpkgs/ktouch/template
+++ b/srcpkgs/ktouch/template
@@ -1,6 +1,6 @@
 # Template file for 'ktouch'
 pkgname=ktouch
-version=19.04.3
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kcoreaddons kdoctools
@@ -15,7 +15,7 @@ maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/education/ktouch"
 distfiles="${KDE_SITE}/applications/${version}/src/ktouch-${version}.tar.xz"
-checksum=dce3f72204f43ddde109a39fca65f2936e9d9db686e6b3edf8ae04bc9c1c0e55
+checksum=d36659c21d05465c7a77330dbfbbab09946093eac1db6c02147d81a838eba636
 
 post_configure() {
 	sed -e 's|/usr/bin/qmlcachegen|/usr/bin/qmlcachegen-qt5|g' \
diff --git a/srcpkgs/ktuberling/template b/srcpkgs/ktuberling/template
index 60182b0d972..a0f8028ad94 100644
--- a/srcpkgs/ktuberling/template
+++ b/srcpkgs/ktuberling/template
@@ -1,6 +1,6 @@
 # Template file for 'ktuberling'
 pkgname=ktuberling
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake kdoctools
@@ -12,4 +12,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-3.0-or-later"
 homepage="https://www.kde.org/applications/games/ktuberling"
 distfiles="${KDE_SITE}/applications/${version}/src/ktuberling-${version}.tar.xz"
-checksum=ca751ad3cc06475955fa9cb037a1a60539f59b7e3d22aa7d47e9fd4f2771cd5f
+checksum=e6cfcd7175c7ed081ecd743c2fdd845f88b25d6cb4d46f9e6d58e35eb11c66ad
diff --git a/srcpkgs/kturtle/template b/srcpkgs/kturtle/template
index 5f584c978be..915b8d66be5 100644
--- a/srcpkgs/kturtle/template
+++ b/srcpkgs/kturtle/template
@@ -1,14 +1,14 @@
 # Template file for 'kturtle'
 pkgname=kturtle
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools
- pkg-config python qt5-host-tools qt5-qmake"
+ pkg-config qt5-host-tools qt5-qmake"
 makedepends="kparts-devel knewstuff-devel knotifyconfig-devel"
 short_desc="Educational Programming Environment"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/education/kturtle/"
 distfiles="${KDE_SITE}/applications/${version}/src/kturtle-${version}.tar.xz"
-checksum=0e7453e785344a792747b5d51d2c4a190d41e87ddf7e0a9ea49d107a2dd03db8
+checksum=1f1245c444aba511aea0630f80953171dd11334f55f6b9547a844e25293cf833
diff --git a/srcpkgs/kubecfg/template b/srcpkgs/kubecfg/template
index f7d77867b47..27b7bbd6e4f 100644
--- a/srcpkgs/kubecfg/template
+++ b/srcpkgs/kubecfg/template
@@ -1,6 +1,6 @@
 # Template file for 'kubecfg'
 pkgname=kubecfg
-version=0.12.4
+version=0.13.1
 revision=1
 build_style=go
 go_import_path="github.com/bitnami/kubecfg"
@@ -10,4 +10,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://github.com/bitnami/kubecfg"
 distfiles="https://github.com/bitnami/kubecfg/archive/v${version}.tar.gz"
-checksum=0d38cecc0e1737d2d27c0ce31e1d36b3c5cdc19f4c2ab77d254229ab9685d915
+checksum=1ebed3c7d815bbc8fcfcd3b49f7dd75f725167f7129f5acd9b66f9eb8a98ac5d
diff --git a/srcpkgs/kubernetes/template b/srcpkgs/kubernetes/template
index 4069ad34f4c..a62969210af 100644
--- a/srcpkgs/kubernetes/template
+++ b/srcpkgs/kubernetes/template
@@ -1,6 +1,6 @@
 # Template file for 'kubernetes'
 pkgname=kubernetes
-version=1.15.2
+version=1.16.0
 revision=1
 build_style=go
 nocross=yes
@@ -13,7 +13,7 @@ license="Apache-2.0"
 go_import_path="github.com/kubernetes/kubernetes"
 homepage="http://kubernetes.io"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=05362a263bdc6329accd11efd1de6ce94b9612ff6570e5faf3ab90730510171b
+checksum=a8b2ee84ce38fa14404d7e56daa87aa2f2fb13e0114fb1150f294c992ab3f36c
 system_accounts="kube"
 make_dirs="/var/lib/kubelet 0755 kube kube"
 conf_files="/etc/kubernetes/*"
diff --git a/srcpkgs/kunitconversion/template b/srcpkgs/kunitconversion/template
index 14caf321b10..17982bdda18 100644
--- a/srcpkgs/kunitconversion/template
+++ b/srcpkgs/kunitconversion/template
@@ -1,6 +1,6 @@
 # Template file for 'kunitconversion'
 pkgname=kunitconversion
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools ki18n-devel"
@@ -10,7 +10,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kunitconversion"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e5ffa3ff954c46b2416823467fcecd37c6ddb8304529703bc9cc3a24b74b6c24
+checksum=ffe759050f0ac56d26049906b7beb5be8bc16d15917a16d287962725bb14f87b
 
 kunitconversion-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kvantum/template b/srcpkgs/kvantum/template
index f696bb3005f..70f28253833 100644
--- a/srcpkgs/kvantum/template
+++ b/srcpkgs/kvantum/template
@@ -1,6 +1,6 @@
 # Template file for 'kvantum'
 pkgname=kvantum
-version=0.11.1
+version=0.12.1
 revision=1
 wrksrc="Kvantum-${version}"
 build_wrksrc=Kvantum
@@ -13,7 +13,7 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/tsujan/Kvantum"
 distfiles="https://github.com/tsujan/Kvantum/archive/V${version}.tar.gz"
-checksum=c91101157873803e3365607d83d31a02e17364390f074d7defd6860ae01bdd51
+checksum=a12cc341eb5fd75cf592d1e99623ad0692d96b1ab22c2e52260f978524a12358
 nocross="https://build.voidlinux.org/builders/aarch64-musl_builder/builds/21436/steps/shell_3/logs/stdio"
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/kvirc/template b/srcpkgs/kvirc/template
index 022c1d46baf..c10c2dc7e0e 100644
--- a/srcpkgs/kvirc/template
+++ b/srcpkgs/kvirc/template
@@ -1,7 +1,7 @@
 # Template file for 'kvirc'
 pkgname=kvirc
 version=5.0.0
-revision=2
+revision=3
 wrksrc="KVIrc-$version"
 build_style=cmake
 configure_args="-DWANT_ENV_FLAGS=1 -DWANT_KDE=0"
diff --git a/srcpkgs/kwallet-pam/template b/srcpkgs/kwallet-pam/template
index 9880e6299d0..53241183580 100644
--- a/srcpkgs/kwallet-pam/template
+++ b/srcpkgs/kwallet-pam/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet-pam'
 pkgname=kwallet-pam
-version=5.16.4
+version=5.17.0
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -11,4 +11,4 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/plasma/kwallet-pam"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=7332dd9729c55f4b24260b3ec1266f72284f834eed66ce76badd4ac5af3dd429
+checksum=224af4870be35075f4aec8bf9984eff7ef65d1656a2c5ca2ba1fdb5efcc574bc
diff --git a/srcpkgs/kwallet/template b/srcpkgs/kwallet/template
index cf0d635b41d..c5c8bb2e79e 100644
--- a/srcpkgs/kwallet/template
+++ b/srcpkgs/kwallet/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet'
 pkgname=kwallet
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kwallet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=628ded35a8f44750a770bf10bba9a763994660923a689eee05f8dfb7e92baec8
+checksum=0f094d52f1a14f04006dcbec4c8bcd7972a6e6b6fb62c6c9c5dc40405faee3b6
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"
diff --git a/srcpkgs/kwalletmanager/template b/srcpkgs/kwalletmanager/template
index 4f5373e9d7d..8e49ab6d314 100644
--- a/srcpkgs/kwalletmanager/template
+++ b/srcpkgs/kwalletmanager/template
@@ -1,17 +1,14 @@
 # Template file for 'kwalletmanager'
 pkgname=kwalletmanager
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules pkg-config kauth"
+hostmakedepends="extra-cmake-modules kauth kdoctools pkg-config
+ qt5-host-tools qt5-qmake"
 makedepends="kcmutils-devel kparts-devel qt5-devel"
 short_desc="KDE Wallet Management Tools"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://www.kde.org/applications/system/kwalletmanager/"
 distfiles="${KDE_SITE}/applications/${version}/src/kwalletmanager-${version}.tar.xz"
-checksum=aaf6c646cc8e7387dc034636fb94029fc0fda3c7fc89b6b633dc42349fd0a471
-
-if [ -n "$CROSS_BUILD" ]; then
-	hostmakedepends+=" kconfig kdoctools python qt5-host-tools qt5-qmake"
-fi
+checksum=5c0cd648d6bf4515cd71b4575ab8051004dcf505c2bfe502fb42b7ba01cb51b2
diff --git a/srcpkgs/kwayland-integration/template b/srcpkgs/kwayland-integration/template
index b27441c0cd6..c41abc036ef 100644
--- a/srcpkgs/kwayland-integration/template
+++ b/srcpkgs/kwayland-integration/template
@@ -1,14 +1,14 @@
 # Template file for 'kwayland-integration'
 pkgname=kwayland-integration
-version=5.16.4
+version=5.17.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules qt5-devel qt5-qmake"
-makedepends="kidletime-devel kwayland-devel kwindowsystem-devel"
+makedepends="kidletime-devel kwayland-devel kwindowsystem-devel kguiaddons-devel"
 short_desc="Integration plugins for Kwayland"
 maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/plasma/kwayland-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=f15ae33af1d9ff999ec45d00752f202242f71fc022ae72b9522e5bf3a20edace
+checksum=6cf410dd8286e9d6b26e10d8ba297d36d13c93a329c463326b47f0bffeb3c4c2
diff --git a/srcpkgs/kwayland/template b/srcpkgs/kwayland/template
index 1014df3c3ff..06a59d9b1e8 100644
--- a/srcpkgs/kwayland/template
+++ b/srcpkgs/kwayland/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland'
 pkgname=kwayland
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kwayland"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=42d3bc629710e09074006af288986b00683853660648c9364fb09d49db3f0e07
+checksum=afcd39152c364a44c85c78e56bcaa5bb70c0a221ecfae3811b14e60a7884e80f
 
 kwayland-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kwidgetsaddons/template b/srcpkgs/kwidgetsaddons/template
index 106a71b09a2..6062876e94e 100644
--- a/srcpkgs/kwidgetsaddons/template
+++ b/srcpkgs/kwidgetsaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kwidgetsaddons'
 pkgname=kwidgetsaddons
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kwidgetsaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5abc169f431fba18418f23ff1749414d8318baff868a7b821916cc44508c6891
+checksum=cce332723324bf3991dc6e6ad8994ff96aae243631f7b4449505fb39f6d8efdb
 
 kwidgetsaddons-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template
index 23f32f2649b..a12e2083e98 100644
--- a/srcpkgs/kwin/template
+++ b/srcpkgs/kwin/template
@@ -1,6 +1,6 @@
 # Template file for 'kwin'
 pkgname=kwin
-version=5.16.4
+version=5.17.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -15,13 +15,17 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/plasma/kwin"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=71b96f1efef0b3f4974900373285a08d425a63628404fe9e89c27f61119383e6
+checksum=d99443978a0f5f12d93d1d877312144d9387762933e12ac614992ae6e92daed7
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-qmake qt5-host-tools kcoreaddons kconfig"
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
 fi
 
+case "$XBPS_TARGET_MACHINE" in
+	armv6l-musl) makedepends+=" libatomic-devel";;
+esac
+
 kwin-devel_package() {
 	short_desc+=" - development"
 	depends="${makedepends} ${sourcepkg}-${version}_${revision}"
diff --git a/srcpkgs/kwindowsystem/template b/srcpkgs/kwindowsystem/template
index 755ed4bde6a..77d7786a0b7 100644
--- a/srcpkgs/kwindowsystem/template
+++ b/srcpkgs/kwindowsystem/template
@@ -1,6 +1,6 @@
 # Template file for 'kwindowsystem'
 pkgname=kwindowsystem
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kwindowsystem"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=17958b612e751e838aa7a0d4f8c7a8a8d83d3f4ace5498fe1f2b8650a2d8f984
+checksum=e8e7eebe02d17c9cc17a2b4e44f8ed78c4fca782bf5991900e77ad3c2f5a7359
 
 kwindowsystem-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kwrited/template b/srcpkgs/kwrited/template
index 04b10dea089..43c544387de 100644
--- a/srcpkgs/kwrited/template
+++ b/srcpkgs/kwrited/template
@@ -1,6 +1,6 @@
 # Template file for 'kwrited'
 pkgname=kwrited
-version=5.16.4
+version=5.17.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/plasma/kwrited"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=c3011ee1c7a431b25797e12fa0b16e6d92277c8fe5dc1e656121a135ad156c0f
+checksum=514bbfbd3e4ab1ea764eb61b5f62606f6359d74d55908ee7296ad8491fc6e361
diff --git a/srcpkgs/kxmlgui/template b/srcpkgs/kxmlgui/template
index 1bb61b1fe80..3e37301c8aa 100644
--- a/srcpkgs/kxmlgui/template
+++ b/srcpkgs/kxmlgui/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlgui'
 pkgname=kxmlgui
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/frameworks/kxmlgui"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=867ff1c3ad464bb6268d00ca290569ef1da7659d3fd2f6349015bc3e2562836b
+checksum=f1a0b8e72da813251f22b675e5f1596d2675c41eb02a8aa8ea8423faae721574
 
 kxmlgui-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kxmlrpcclient/template b/srcpkgs/kxmlrpcclient/template
index 0b386cb6c18..7c5ca929c8a 100644
--- a/srcpkgs/kxmlrpcclient/template
+++ b/srcpkgs/kxmlrpcclient/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlrpcclient'
 pkgname=kxmlrpcclient
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later, BSD-2-Clause"
 homepage="https://projects.kde.org/projects/frameworks/kxmlrpcclient"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=382b4730e4b32c1d300f8fdb6269e40995ec282ebe1cbb044ab1a2b2b68c3a1a
+checksum=2c215687514d0c2f71f4fcf25d9a104e1ab6822eeb03fd8e9f17df28bb67024d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python"
diff --git a/srcpkgs/latte-dock/template b/srcpkgs/latte-dock/template
index e89e335a6d1..c33a4d86976 100644
--- a/srcpkgs/latte-dock/template
+++ b/srcpkgs/latte-dock/template
@@ -1,6 +1,6 @@
 # Template file for 'latte-dock'
 pkgname=latte-dock
-version=0.9.0
+version=0.9.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DENABLE_MAKE_UNIQUE=OFF"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://phabricator.kde.org/source/latte-dock/"
 changelog="https://phabricator.kde.org/source/latte-dock/browse/master/CHANGELOG.md"
 distfiles="${KDE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=d7233401d535474b1834a55a5103e744958abbe0a0aa1a48aa29ee3788ccb424
+checksum=30232ce9b0fe8f5338c924a4f2d1661c8c3f3b221ccfcaf69d09160f31599447
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kconfig-devel kcoreaddons-devel kpackage-devel"
diff --git a/srcpkgs/lazarus/template b/srcpkgs/lazarus/template
index fe0f677c762..42f49b6415e 100644
--- a/srcpkgs/lazarus/template
+++ b/srcpkgs/lazarus/template
@@ -8,7 +8,7 @@ hostmakedepends="fpc rsync"
 makedepends="fpc-src qt5pas-devel"
 depends="fpc-src fpc gdb perl"
 short_desc="Delphi-like IDE for FreePascal"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, MPL-2.0, LGPL-2.0-or-later"
 homepage="http://www.lazarus.freepascal.org"
 distfiles="${SOURCEFORGE_SITE}/project/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20${version}/lazarus-${version}.tar.gz"
diff --git a/srcpkgs/lazydocker/template b/srcpkgs/lazydocker/template
index 18a26c428d0..8891289c480 100644
--- a/srcpkgs/lazydocker/template
+++ b/srcpkgs/lazydocker/template
@@ -1,6 +1,6 @@
 # Template file for 'lazydocker'
 pkgname=lazydocker
-version=0.7
+version=0.7.4
 revision=1
 wrksrc="lazydocker-${version}"
 build_style=go
@@ -11,7 +11,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"
 homepage="https://github.com/jesseduffield/lazydocker"
 distfiles="https://github.com/jesseduffield/lazydocker/archive/v${version}.tar.gz"
-checksum=902ca698e1de8cb700266b4e19c5321d4fafa65b3e22d32df0e02ca89ca921f0
+checksum=537f0dfdd4a425b326c10233c1f9ab0189d4d706a68ba756ff9921efc6cccef5
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/lazygit/template b/srcpkgs/lazygit/template
index 30e865f0ac2..359de11e955 100644
--- a/srcpkgs/lazygit/template
+++ b/srcpkgs/lazygit/template
@@ -1,17 +1,17 @@
 # Template file for 'lazygit'
 pkgname=lazygit
-version=0.8.1
+version=0.8.2
 revision=1
 build_style=go
 go_import_path=github.com/jesseduffield/lazygit
 hostmakedepends="git"
 depends="git"
 short_desc="Simple terminal UI for git commands"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/jesseduffield/lazygit"
 distfiles="https://github.com/jesseduffield/lazygit/archive/v${version}.tar.gz"
-checksum=274ba05573b38cccc56cb63053eec0972535979b95f1f30b6ca318d991f2c14c
+checksum=aaaa4cb789d387a08eb46ca95159561cdb4a2f4e70315ce68ed61bbd30fe24ee
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/lbreakouthd/template b/srcpkgs/lbreakouthd/template
index 3eb55d309f6..4c92d60ad52 100644
--- a/srcpkgs/lbreakouthd/template
+++ b/srcpkgs/lbreakouthd/template
@@ -1,6 +1,6 @@
 # Template file for 'lbreakouthd'
 pkgname=lbreakouthd
-version=1.0.4
+version=1.0.5
 revision=1
 build_style=gnu-configure
 configure_args="--localstatedir=/var/${pkgname}"
@@ -10,4 +10,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://lgames.sourceforge.net/LBreakoutHD/"
 distfiles="${SOURCEFORGE_SITE}/lgames/$pkgname-$version.tar.gz"
-checksum=43d2c268b0494d72816e9f106fae17b311fa665a153377e2f0cc0e0362aa30af
+checksum=f3296ecdfe8e860ce30c7262d370b5725745847a131b582902cbfbcbb73c84a1
diff --git a/srcpkgs/lego/template b/srcpkgs/lego/template
index 298c4500093..cb146a55cf9 100644
--- a/srcpkgs/lego/template
+++ b/srcpkgs/lego/template
@@ -1,16 +1,17 @@
 # Template file for 'lego'
 pkgname=lego
-version=2.7.2
+version=3.0.2
 revision=1
 build_style=go
-go_import_path="github.com/go-acme/${pkgname}"
+go_import_path="github.com/go-acme/${pkgname}/v3"
 go_package="${go_import_path}/cmd/${pkgname}"
+hostmakedepends="git"
 short_desc="Let's Encrypt client and ACME library written in Go"
 maintainer="Anachron <gith@cron.world>"
 license="MIT"
 homepage="https://go-acme.github.io/lego"
 distfiles="https://github.com/go-acme/lego/archive/v${version}.tar.gz"
-checksum=eb585fe8cd23671bea4b09c8f03d7a331f5b734aa652210f8cec897a6d6b8dbc
+checksum=a5389cc39f4fb70fb0f550436ddacb6d524ab6056815d2d2df0ecbfefa053a25
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/lesspipe/template b/srcpkgs/lesspipe/template
index 1e3aa32bd9d..40ee9a36cf1 100644
--- a/srcpkgs/lesspipe/template
+++ b/srcpkgs/lesspipe/template
@@ -1,15 +1,15 @@
 # Template file for 'lesspipe'
 pkgname=lesspipe
-version=1.83
+version=1.84
 revision=1
 archs=noarch
 depends="less"
-short_desc="An input filter for the pager less"
+short_desc="Input filter for the pager less"
 maintainer="Olga Ustuzhanina <me@laserbat.pw>"
 license="GPL-2.0-only"
 homepage="http://www-zeuthen.desy.de/~friebel/unix/lesspipe.html"
-distfiles="https://www-zeuthen.desy.de/~friebel/unix/less/lesspipe-${version}.tar.gz"
-checksum=d616f0d51852e60fb0d0801eec9c31b10e0acc6fdfdc62ec46ef7bfd60ce675e
+distfiles="https://github.com/wofr06/lesspipe/archive/${version}.tar.gz"
+checksum=5eb4811cc8ded108e98448bd83057e730906f643ad689ccd695828f2a46c4410
 
 do_install() {
 	vbin code2color
diff --git a/srcpkgs/libArcus/template b/srcpkgs/libArcus/template
index c0c44d46916..8e6c97ada21 100644
--- a/srcpkgs/libArcus/template
+++ b/srcpkgs/libArcus/template
@@ -1,6 +1,6 @@
 # Template file for 'libArcus'
 pkgname=libArcus
-version=4.2.0
+version=4.3.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_EXAMPLES=OFF"
@@ -12,7 +12,7 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/Ultimaker/libArcus"
 distfiles="https://github.com/Ultimaker/libArcus/archive/${version}.tar.gz"
-checksum=f355ae80a7d219013bba14ec8f50a411345c00a6e974b4649db3c5322fa9b28a
+checksum=8f3211a76d352db5b508772abad41b7d223af22d174807f05f9be34ddaa7f268
 
 libArcus-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libGL/patches/add-glx-use-tls.patch b/srcpkgs/libGL/patches/add-glx-use-tls.patch
deleted file mode 100644
index 7ded1a1b2ee..00000000000
--- a/srcpkgs/libGL/patches/add-glx-use-tls.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From f895a39b7437381a86383dd97250aa2cc7393bff Mon Sep 17 00:00:00 2001
-From: maxice8 <thinkabit.ukim@gmail.com>
-Date: Thu, 9 Aug 2018 18:37:30 -0300
-Subject: [PATCH] meson: add glx-use-tls option.
-
----
- meson.build       | 6 +++++-
- meson_options.txt | 6 ++++++
- 2 files changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 5dbb786..1ab3092 100644
---- meson.build
-+++ meson.build
-@@ -340,7 +340,11 @@ if with_egl and not (with_platform_drm or with_platform_surfaceless)
-   endif
- endif
- 
--pre_args += '-DGLX_USE_TLS'
-+with_glx_use_tls = get_option('glx-use-tls')
-+if with_glx_use_tls
-+  pre_args += '-DGLX_USE_TLS'
-+endif
-+
- if with_glx != 'disabled'
-   if not (with_platform_x11 and with_any_opengl)
-     if with_glx == 'auto'
-diff --git a/meson_options.txt b/meson_options.txt
-index 496fe38..12981dd 100644
---- meson_options.txt
-+++ meson_options.txt
-@@ -195,6 +195,12 @@ option(
-   choices : ['auto', 'disabled', 'dri', 'xlib', 'gallium-xlib'],
-   description : 'Build support for GLX platform'
- )
-+option(
-+  'glx-use-tls',
-+  type : 'boolean',
-+  value : true,
-+  description : 'Build support for initial-exec TLS model on GLX platform'
-+)
- option(
-   'egl',
-   type : 'combo',
--- 
-2.18.0
-
diff --git a/srcpkgs/libGL/patches/add-use-elf-tls.patch b/srcpkgs/libGL/patches/add-use-elf-tls.patch
new file mode 100644
index 00000000000..b922d8601e7
--- /dev/null
+++ b/srcpkgs/libGL/patches/add-use-elf-tls.patch
@@ -0,0 +1,28 @@
+diff --git meson.build meson.build
+index 4afd8ca..ab9b365 100644
+--- meson.build
++++ meson.build
+@@ -378,7 +378,8 @@ if with_egl and not (with_platform_drm or with_platform_surfaceless or with_plat
+ endif
+ 
+ # Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS.
+-if not with_platform_android or get_option('platform-sdk-version') >= 29
++with_use_elf_tls = get_option('use-elf-tls')
++if with_use_elf_tls and not with_platform_android or get_option('platform-sdk-version') >= 29
+   pre_args += '-DUSE_ELF_TLS'
+ endif
+ 
+diff --git meson_options.txt meson_options.txt
+index b768c15..2533220 100644
+--- meson_options.txt
++++ meson_options.txt
+@@ -358,3 +358,9 @@ option(
+   value : 25,
+   description : 'Android Platform SDK version. Default: Nougat version.'
+ )
++option(
++  'use-elf-tls',
++  type : 'boolean',
++  value : true,
++  description : 'Build support for initial-exec TLS model'
++)
diff --git a/srcpkgs/libGL/patches/musl.patch b/srcpkgs/libGL/patches/musl.patch
index dc71d18c3d8..92a37bd577c 100644
--- a/srcpkgs/libGL/patches/musl.patch
+++ b/srcpkgs/libGL/patches/musl.patch
@@ -32,44 +32,6 @@
  #include <unistd.h>
  #include <fcntl.h>
  #else
---- src/gallium/state_trackers/nine/nine_debug.c
-+++ src/gallium/state_trackers/nine/nine_debug.c
-@@ -73,8 +73,8 @@
-     }
- 
- #if defined(HAVE_PTHREAD)
--#  if defined(__GNU_LIBRARY__) && defined(__GLIBC__) && defined(__GLIBC_MINOR__) && \
--      (__GLIBC__ >= 3 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 12))
-+#  if defined(__linux__) && !(defined(__GLIBC__) || \
-+      (__GLIBC__ < 3 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 12)))
-     if (dbg_flags & DBG_TID)
-         tid = pthread_self();
- #  endif
---- src/util/u_thread.h
-+++ src/util/u_thread.h
-@@ -61,9 +61,8 @@
- static inline void u_thread_setname( const char *name )
- {
- #if defined(HAVE_PTHREAD)
--#  if defined(__GNU_LIBRARY__) && defined(__GLIBC__) && defined(__GLIBC_MINOR__) && \
--      (__GLIBC__ >= 3 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 12)) && \
--      defined(__linux__)
-+#  if defined(__linux__) && !(defined(__GLIBC__) || \
-+      (__GLIBC__ < 3 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 12)))
-    pthread_setname_np(pthread_self(), name);
- #  endif
- #endif
-@@ -93,8 +92,8 @@
- static inline bool u_thread_is_self(thrd_t thread)
- {
- #if defined(HAVE_PTHREAD)
--#  if defined(__GNU_LIBRARY__) && defined(__GLIBC__) && defined(__GLIBC_MINOR__) && \
--      (__GLIBC__ >= 3 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 12))
-+#  if defined(__linux__) && !(defined(__GLIBC__) || \
-+      (__GLIBC__ < 3 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 12)))
-    return pthread_equal(pthread_self(), thread);
- #  endif
- #endif
 --- src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
 +++ src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
 @@ -28,6 +28,8 @@
@@ -80,4 +42,4 @@
 +
  #include "radv_radeon_winsys.h"
  #include "ac_gpu_info.h"
- #include "addrlib/addrinterface.h"<Paste>
+ #include "addrlib/addrinterface.h"
diff --git a/srcpkgs/libGL/patches/ppc-auxval.patch b/srcpkgs/libGL/patches/ppc-auxval.patch
new file mode 100644
index 00000000000..3fe2725eb45
--- /dev/null
+++ b/srcpkgs/libGL/patches/ppc-auxval.patch
@@ -0,0 +1,55 @@
+Upstream: https://gitlab.freedesktop.org/mesa/mesa/merge_requests/1785
+Status: Merged
+
+--- src/util/u_cpu_detect.c
++++ src/util/u_cpu_detect.c
+@@ -92,7 +92,7 @@ static int has_cpuid(void);
+ #endif
+ 
+ 
+-#if defined(PIPE_ARCH_PPC) && !defined(PIPE_OS_APPLE)
++#if defined(PIPE_ARCH_PPC) && !defined(PIPE_OS_APPLE) && !defined(PIPE_OS_LINUX)
+ static jmp_buf  __lv_powerpc_jmpbuf;
+ static volatile sig_atomic_t __lv_powerpc_canjump = 0;
+ 
+@@ -126,8 +126,29 @@ check_os_altivec_support(void)
+          util_cpu_caps.has_altivec = 1;
+       }
+    }
+-#else /* !PIPE_OS_APPLE */
+-   /* not on Apple/Darwin, do it the brute-force way */
++#elif defined(PIPE_OS_LINUX) /* !PIPE_OS_APPLE */
++#if defined(PIPE_ARCH_PPC_64)
++    Elf64_auxv_t aux;
++#else
++    Elf32_auxv_t aux;
++#endif
++    int fd = open("/proc/self/auxv", O_RDONLY | O_CLOEXEC);
++    if (fd >= 0) {
++       while (read(fd, &aux, sizeof(aux)) == sizeof(aux)) {
++          if (aux.a_type == AT_HWCAP) {
++             char *env_vsx = getenv("GALLIVM_VSX");
++             uint64_t hwcap = aux.a_un.a_val;
++             util_cpu_caps.has_altivec = (hwcap >> 28) & 1;
++             if (!env_vsx || env_vsx[0] != '0') {
++                util_cpu_caps.has_vsx  = (hwcap >>  7) & 1;
++             }
++             break;
++          }
++       }
++       close(fd);
++    }
++#else /* !PIPE_OS_APPLE && !PIPE_OS_LINUX */
++   /* not on Apple/Darwin or Linux, do it the brute-force way */
+    /* this is borrowed from the libmpeg2 library */
+    signal(SIGILL, sigill_handler);
+    if (setjmp(__lv_powerpc_jmpbuf)) {
+@@ -171,7 +192,7 @@ check_os_altivec_support(void)
+          util_cpu_caps.has_altivec = 0;
+       }
+    }
+-#endif /* !PIPE_OS_APPLE */
++#endif /* !PIPE_OS_APPLE && !PIPE_OS_LINUX */
+ }
+ #endif /* PIPE_ARCH_PPC */
+ 
diff --git a/srcpkgs/libGL/template b/srcpkgs/libGL/template
index 23b4f47aaef..3ce62fe073f 100644
--- a/srcpkgs/libGL/template
+++ b/srcpkgs/libGL/template
@@ -1,27 +1,31 @@
 # Template file for 'libGL'
 pkgname=libGL
-version=19.1.4
+version=19.2.1
 revision=1
 wrksrc="mesa-${version}"
 build_style=meson
 configure_args="-Dshared-glapi=true -Dgbm=true -Degl=true
  -Dgallium-vdpau=true -Dgallium-xvmc=true -Dosmesa=gallium
  -Dgles1=true -Dgles2=true -Dgallium-va=true -Dlmsensors=true
- -Dplatforms=x11,drm,wayland,surfaceless -Dllvm=true
+ -Dplatforms=x11,drm,$(vopt_if wayland wayland,)surfaceless -Dllvm=true
  -Db_lto=false"
 hostmakedepends="flex libxml2-python llvm pkg-config
- python3-Mako wayland-protocols wayland-devel"
+ python3-Mako $(vopt_if wayland 'wayland-protocols wayland-devel')"
 makedepends="elfutils-devel expat-devel libXdamage-devel libXvMC-devel
  libXxf86vm-devel libatomic-devel libdrm-devel libffi-devel libva-devel
  libvdpau-devel libxshmfence-devel ncurses-devel talloc-devel zlib-devel
- wayland-devel wayland-protocols llvm libsensors-devel libXrandr-devel"
+ $(vopt_if wayland 'wayland-devel wayland-protocols') llvm
+ libsensors-devel libXrandr-devel"
 short_desc="Graphics library similar to SGI's OpenGL"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT, LGPL-2.1-or-later"
 homepage="https://www.mesa3d.org/"
 changelog="https://www.mesa3d.org/relnotes/${version}.html"
 distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=a6d268a7d9edcfd92b6da80f2e34e6e0a7baaa442efbeba2fc66c404943c6bfb
+checksum=4cc53ca1a8d12c6ff0e5ea44a5213c05c88447ab50d7e28bb350cd29199f01e9
+
+build_options="wayland"
+build_options_default="wayland"
 
 # Set subpackages manually to set proper rdeps in 32bit pkgs.
 subpackages="libglapi libgbm libEGL libGLES libOSMesa"
@@ -44,14 +48,21 @@ ppc*)
 	configure_args+=" -Dgallium-drivers=r300,r600,radeonsi,swrast,nouveau,virgl"
 	configure_args+=" -Ddri-drivers=r100,r200,nouveau"
 	configure_args+=" -Dvulkan-drivers=amd"
-	configure_args+=" -Ddri3=true"
+	configure_args+=" -Dgallium-xa=false -Ddri3=true -Dgallium-opencl=icd"
+	# Explicitly control power8 feature usage, disable on BE
+	case "$XBPS_TARGET_MACHINE" in
+		ppc64le*) configure_args+=" -Dpower8=true";;
+		*) configure_args+=" -Dpower8=false";;
+	esac
 	hostmakedepends+=" clang"
+	makedepends+=" libclc-git"
 	subpackages+=" mesa-ati-dri mesa-nouveau-dri"
+	subpackages+=" mesa-opencl"
 	;;
 aarch64*)
 	configure_args+=" -Dgallium-drivers=nouveau,tegra,swrast,vc4"
 	configure_args+=" -Dvulkan-drivers= -Ddri-drivers="
-	configure_args+=" -Ddri3=true"
+	configure_args+=" -Dgallium-xa=false -Ddri3=true"
 	subpackages+=" mesa-tegra-dri mesa-nouveau-dri mesa-vc4-dri"
 	;;
 armv7l*)
@@ -88,7 +99,7 @@ esac
 
 case "$XBPS_TARGET_MACHINE" in
 	# Disable TLS with musl: https://bugs.freedesktop.org/show_bug.cgi?id=35268
-	*-musl) configure_args+=" -Dglx-use-tls=false";;
+	*-musl) configure_args+=" -Duse-elf-tls=false";;
 	*) configure_args+=" -Dglx=dri";;
 esac
 
@@ -176,13 +187,8 @@ mesa-ati-dri_package() {
 		vmove usr/lib/dri/r*
 		vmove "usr/share/vulkan/icd.d/radeon_icd*.json"
 		vmove "usr/lib/libvulkan_radeon.so"
-		case "$XBPS_TARGET_MACHINE" in
-			ppc*) ;;
-			*)
-				vmove "usr/lib/gallium-pipe/pipe_r[36]00.so"
-				vmove usr/lib/gallium-pipe/pipe_radeonsi.so
-			;;
-		esac
+		vmove "usr/lib/gallium-pipe/pipe_r[36]00.so"
+		vmove usr/lib/gallium-pipe/pipe_radeonsi.so
 	}
 }
 
@@ -204,7 +210,7 @@ mesa-nouveau-dri_package() {
 		vmove "usr/lib/xorg/modules/drivers/nouveau*"
 		vmove "usr/lib/dri/nouveau*"
 		case "$XBPS_TARGET_MACHINE" in
-			aarch64*|ppc*) ;;
+			aarch64*) ;;
 			*) vmove usr/lib/gallium-pipe/pipe_nouveau.so ;;
 		esac
 	}
diff --git a/srcpkgs/libICE/template b/srcpkgs/libICE/template
index 30e281586a1..a22ef076799 100644
--- a/srcpkgs/libICE/template
+++ b/srcpkgs/libICE/template
@@ -1,13 +1,12 @@
 # Template file for 'libICE'
 pkgname=libICE
 version=1.0.10
-revision=1
-patch_args="-Np1"
+revision=2
 build_style=gnu-configure
-hostmakedepends="pkg-config automake libtool xorg-util-macros"
+hostmakedepends="automake libtool pkg-config xorg-util-macros xtrans"
 makedepends="xtrans xorgproto"
 short_desc="Inter Client Exchange (ICE) library for X"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org/"
 distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
diff --git a/srcpkgs/libSM/template b/srcpkgs/libSM/template
index a34c3cb2d35..8ed244b8a46 100644
--- a/srcpkgs/libSM/template
+++ b/srcpkgs/libSM/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libuuid-devel libICE-devel"
 short_desc="X Session Management Library"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org/"
 distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
diff --git a/srcpkgs/libSavitar/template b/srcpkgs/libSavitar/template
index e93c00ce82d..a9d3020158f 100644
--- a/srcpkgs/libSavitar/template
+++ b/srcpkgs/libSavitar/template
@@ -1,16 +1,16 @@
 # Template file for 'libSavitar'
 pkgname=libSavitar
-version=4.2.0
+version=4.3.0
 revision=1
 build_style=cmake
 hostmakedepends="python3"
 makedepends="python3-sip-devel python3-devel pugixml-devel"
 short_desc="C++ implementation of 3mf loading"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/Ultimaker/libSavitar"
 distfiles="https://github.com/Ultimaker/libSavitar/archive/${version}.tar.gz"
-checksum=6a77df183fef2ddaeb8de26f69315e1868ee722844f4c1fbb9cd5a054805d1a1
+checksum=b7f34e10c705082a6d7bcf8599efece8491f9c8e45eb603f761a0e56b64d5236
 nocross="can't find sip on cross environment"
 
 libSavitar-devel_package() {
diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template
index 37109ba0260..9a5799e66f6 100644
--- a/srcpkgs/libX11/template
+++ b/srcpkgs/libX11/template
@@ -1,6 +1,6 @@
 # Template file for 'libX11'
 pkgname=libX11
-version=1.6.8
+version=1.6.9
 revision=1
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-xlocaledir --without-xmlto
@@ -12,7 +12,7 @@ maintainer="maxice8 <thinkbit.ukim@gmail.com>"
 license="MIT"
 homepage="http://xorg.freedesktop.org/"
 distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
-checksum=b289a845c189e251e0e884cc0f9269bbe97c238df3741e854ec4c17c21e473d5
+checksum=9cc7e8d000d6193fa5af580d50d689380b8287052270f5bb26a5fb6b58b2bed1
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" libtool automake xorgproto xtrans"
diff --git a/srcpkgs/libXau/template b/srcpkgs/libXau/template
index 71664e0728f..cb5d513754e 100644
--- a/srcpkgs/libXau/template
+++ b/srcpkgs/libXau/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="xorgproto"
 short_desc="Authorization Protocol for X"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="$XORG_SITE"
 distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
diff --git a/srcpkgs/libXcomposite/template b/srcpkgs/libXcomposite/template
index dfac74be5d1..d015a9ed734 100644
--- a/srcpkgs/libXcomposite/template
+++ b/srcpkgs/libXcomposite/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="xorgproto libXfixes-devel"
 short_desc="X Composite Library"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="X11"
 homepage="https://wiki.freedesktop.org/xorg/"
 distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
diff --git a/srcpkgs/libXcursor/template b/srcpkgs/libXcursor/template
index ae59ca8e708..9d785a99bd0 100644
--- a/srcpkgs/libXcursor/template
+++ b/srcpkgs/libXcursor/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="xorgproto libXfixes-devel libXrender-devel"
 short_desc="Client-side cursor loading library for X"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://wiki.freedesktop.org/xorg/"
 distfiles="${XORG_SITE}/lib/libXcursor-${version}.tar.bz2"
diff --git a/srcpkgs/libXdamage/template b/srcpkgs/libXdamage/template
index ea68281cf5c..7626b8cfba6 100644
--- a/srcpkgs/libXdamage/template
+++ b/srcpkgs/libXdamage/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="xorgproto libXfixes-devel"
 short_desc="Xdamage extension Library"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="X11"
 homepage="https://wiki.freedesktop.org/xorg/"
 distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
diff --git a/srcpkgs/libXext/template b/srcpkgs/libXext/template
index 22fa3d5216b..50ebe66644b 100644
--- a/srcpkgs/libXext/template
+++ b/srcpkgs/libXext/template
@@ -7,7 +7,7 @@ configure_args="--enable-malloc0returnsnull"
 hostmakedepends="pkg-config"
 makedepends="xorgproto libX11-devel"
 short_desc="X Extension library"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="$XORG_SITE"
 distfiles="${XORG_SITE}/lib/libXext-${version}.tar.bz2"
diff --git a/srcpkgs/libXfont2/template b/srcpkgs/libXfont2/template
index 0d32a2f9731..8164b2b239b 100644
--- a/srcpkgs/libXfont2/template
+++ b/srcpkgs/libXfont2/template
@@ -1,7 +1,7 @@
 # Template file for 'libXfont2'
 pkgname=libXfont2
-version=2.0.3
-revision=2
+version=2.0.4
+revision=1
 hostmakedepends="pkg-config"
 makedepends="xorgproto xtrans freetype-devel libfontenc-devel"
 build_style=gnu-configure
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 homepage="http://xorg.freedesktop.org/"
 license="MIT"
 distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
-checksum=0e8ab7fd737ccdfe87e1f02b55f221f0bd4503a1c5f28be4ed6a54586bac9c4e
+checksum=6d151b3368e5035efede4b6264c0fdc6662c1c99dbc2de425e3480cababc69e6
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/libXft/template b/srcpkgs/libXft/template
index cfeaf7e68ed..dd6263d3a42 100644
--- a/srcpkgs/libXft/template
+++ b/srcpkgs/libXft/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="xorgproto libXrender-devel freetype-devel fontconfig-devel"
 short_desc="Library for configuring and customizing font access"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="$XORG_SITE"
 distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
diff --git a/srcpkgs/libXmu/template b/srcpkgs/libXmu/template
index da7db8a4770..ab0687cc764 100644
--- a/srcpkgs/libXmu/template
+++ b/srcpkgs/libXmu/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libXext-devel libXt-devel"
 short_desc="X Miscellaneous Utilities library"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://wiki.freedesktop.org/xorg/"
 distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
diff --git a/srcpkgs/libXpresent/template b/srcpkgs/libXpresent/template
index bcd86a9fa97..201b01a1843 100644
--- a/srcpkgs/libXpresent/template
+++ b/srcpkgs/libXpresent/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="pkg-config xorg-util-macros"
 makedepends="libXfixes-devel libXrandr-devel"
 short_desc="XPresent extension C library"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="X11"
 homepage="https://cgit.freedesktop.org/xorg/lib/libXpresent/"
 distfiles="${XORG_SITE}/lib/libXpresent-${version}.tar.gz"
diff --git a/srcpkgs/libXrandr/template b/srcpkgs/libXrandr/template
index 923923990ae..c5a7b2c2f2c 100644
--- a/srcpkgs/libXrandr/template
+++ b/srcpkgs/libXrandr/template
@@ -7,7 +7,7 @@ configure_args="--enable-malloc0returnsnull"
 hostmakedepends="pkg-config"
 makedepends="xorgproto libXext-devel libXrender-devel"
 short_desc="X RandR Library from X.org"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="$XORG_SITE"
 distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
diff --git a/srcpkgs/libXvMC/template b/srcpkgs/libXvMC/template
index 04b8abb1e83..5d635e6e3d0 100644
--- a/srcpkgs/libXvMC/template
+++ b/srcpkgs/libXvMC/template
@@ -7,7 +7,7 @@ configure_args="--enable-malloc0returnsnull"
 hostmakedepends="pkg-config"
 makedepends="xorgproto libX11-devel libXext-devel libXv-devel"
 short_desc="XVideo Motion Compensation Library"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://wiki.freedesktop.org/xorg/"
 distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
diff --git a/srcpkgs/libXxf86dga/template b/srcpkgs/libXxf86dga/template
index 59ba465d119..fe22492d3a2 100644
--- a/srcpkgs/libXxf86dga/template
+++ b/srcpkgs/libXxf86dga/template
@@ -7,7 +7,7 @@ configure_args="--enable-malloc0returnsnull"
 hostmakedepends="pkg-config"
 makedepends="xorgproto libXext-devel"
 short_desc="Library for the XFree86-DGA X extension"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="$XORG_SITE"
 distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
diff --git a/srcpkgs/libaacs/template b/srcpkgs/libaacs/template
index 2e2ef4b538f..15e2650c2d6 100644
--- a/srcpkgs/libaacs/template
+++ b/srcpkgs/libaacs/template
@@ -7,7 +7,7 @@ configure_args="--disable-static"
 hostmakedepends="flex pkg-config"
 makedepends="libgcrypt-devel"
 short_desc="Open implementation of AACS specification"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.videolan.org/developers/libaacs.html"
 distfiles="http://ftp.videolan.org/pub/videolan/libaacs/${version}/libaacs-${version}.tar.bz2"
diff --git a/srcpkgs/libabw/template b/srcpkgs/libabw/template
index c2b71bbca97..e617508a0b3 100644
--- a/srcpkgs/libabw/template
+++ b/srcpkgs/libabw/template
@@ -1,7 +1,7 @@
 # Template file for 'libabw'
 pkgname=libabw
-version=0.1.2
-revision=2
+version=0.1.3
+revision=1
 build_style=gnu-configure
 short_desc="Library that parses the file format of AbiWord documents"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -10,7 +10,7 @@ homepage="https://wiki.documentfoundation.org/DLP/Libraries/libabw"
 distfiles="http://dev-www.libreoffice.org/src/${pkgname}/${pkgname}-${version}.tar.xz"
 makedepends="librevenge-devel boost-devel libxml2-devel"
 hostmakedepends="automake libtool pkg-config perl gperf"
-checksum=0b72944d5af81dda0a5c5803ee84cbac4b81441a4d767aa57029adc6744c2485
+checksum=e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed
 
 CXXFLAGS="-Wno-deprecated-copy"
 
diff --git a/srcpkgs/libaom/template b/srcpkgs/libaom/template
index a5cc3f2f24c..7cb2fcf07db 100644
--- a/srcpkgs/libaom/template
+++ b/srcpkgs/libaom/template
@@ -7,7 +7,7 @@ build_style=cmake
 configure_args="-DENABLE_DOCS=OFF -DBUILD_SHARED_LIBS=ON -DENABLE_TESTS=OFF"
 hostmakedepends="yasm doxygen perl python"
 short_desc="AV1 Codec library implementation"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://aomedia.org/"
 changelog="https://aomedia.googlesource.com/aom/+/master/CHANGELOG"
diff --git a/srcpkgs/libappindicator/template b/srcpkgs/libappindicator/template
index e5ee82c85ef..aea3a8752fd 100644
--- a/srcpkgs/libappindicator/template
+++ b/srcpkgs/libappindicator/template
@@ -1,7 +1,7 @@
 # Template file for 'libappindicator'
 pkgname=libappindicator
 version=12.10.0
-revision=2
+revision=3
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--with-gtk=3"
@@ -29,7 +29,7 @@ pre_configure() {
 
 libappindicator-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision} gtk+3-devel libdbusmenu-glib-devel"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
diff --git a/srcpkgs/libassuan/template b/srcpkgs/libassuan/template
index b0cbc600bf8..5a0daa6c247 100644
--- a/srcpkgs/libassuan/template
+++ b/srcpkgs/libassuan/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="--with-libgpg-error-prefix=${XBPS_CROSS_BASE}/usr"
 makedepends="libgpg-error-devel"
 short_desc="IPC library used by some GnuPG related software"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnupg.org/related_software/libassuan"
 distfiles="https://www.gnupg.org/ftp/gcrypt/libassuan/libassuan-${version}.tar.bz2"
diff --git a/srcpkgs/libbaseencode/template b/srcpkgs/libbaseencode/template
index c12e9485f1b..384a189224d 100644
--- a/srcpkgs/libbaseencode/template
+++ b/srcpkgs/libbaseencode/template
@@ -4,7 +4,7 @@ version=1.0.9
 revision=1
 build_style=cmake
 short_desc="Library for encoding decoding data use base32 or base64"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/paolostivanin/libbaseencode"
 distfiles="https://github.com/paolostivanin/libbaseencode/archive/v${version}.tar.gz"
diff --git a/srcpkgs/libblockdev/template b/srcpkgs/libblockdev/template
index 431d40f6505..1df156e3c5b 100644
--- a/srcpkgs/libblockdev/template
+++ b/srcpkgs/libblockdev/template
@@ -8,7 +8,7 @@ makedepends="cryptsetup-devel device-mapper-devel dmraid-devel libbytesize-devel
  libglib-devel libkmod-devel libparted-devel nss-devel
  volume_key-devel libyaml-devel"
 short_desc="Library for manipulating block devices"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/storaged-project/libblockdev"
 changelog="https://raw.githubusercontent.com/storaged-project/libblockdev/master/NEWS.rst"
diff --git a/srcpkgs/libbsd/template b/srcpkgs/libbsd/template
index 59a6ed9781e..1600ec38023 100644
--- a/srcpkgs/libbsd/template
+++ b/srcpkgs/libbsd/template
@@ -1,19 +1,20 @@
 # Template file for 'libbsd'
 pkgname=libbsd
-version=0.9.1
+version=0.10.0
 revision=1
 build_style=gnu-configure
 makedepends="libressl-devel"
 short_desc="Provides useful functions commonly found on BSD system"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="ISC, MIT, Beerware, BSD-2-Clause, BSD-3-Clause, BSD-4-Clause"
 homepage="https://libbsd.freedesktop.org/"
 distfiles="https://libbsd.freedesktop.org/releases/libbsd-${version}.tar.xz"
-checksum=56d835742327d69faccd16955a60b6dcf30684a8da518c4eca0ac713b9e0a7a4
+checksum=34b8adc726883d0e85b3118fa13605e179a62b31ba51f676136ecb2d0bc1a887
 
 post_install() {
 	vlicense COPYING
 }
+
 libbsd-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
@@ -22,6 +23,6 @@ libbsd-devel_package() {
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
-		vmove usr/share
+		vmove usr/share/man
 	}
 }
diff --git a/srcpkgs/libbytesize/template b/srcpkgs/libbytesize/template
index 497444b5fa7..ee1862d889d 100644
--- a/srcpkgs/libbytesize/template
+++ b/srcpkgs/libbytesize/template
@@ -7,7 +7,7 @@ hostmakedepends="python3"
 makedepends="mpfr-devel pcre-devel"
 checkdepends="python3-six python-six"
 short_desc="A library for operations with sizes in bytes"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/storaged-project/libbytesize"
 changelog="https://raw.githubusercontent.com/storaged-project/libbytesize/master/NEWS.rst"
diff --git a/srcpkgs/libcacard/template b/srcpkgs/libcacard/template
index ff0a0692bbb..4b6ccc3e9e6 100644
--- a/srcpkgs/libcacard/template
+++ b/srcpkgs/libcacard/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="nss-devel libglib-devel pcsclite-devel"
 short_desc="Library to provide emulation of smart cards to a virtual card reader"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://cgit.freedesktop.org/spice/libcacard/"
 distfiles="https://www.spice-space.org/download/libcacard/libcacard-${version}.tar.xz"
diff --git a/srcpkgs/libcap-ng/template b/srcpkgs/libcap-ng/template
index fc82ca857e7..f462636c4c1 100644
--- a/srcpkgs/libcap-ng/template
+++ b/srcpkgs/libcap-ng/template
@@ -1,15 +1,15 @@
 # Template file for 'libcap-ng'
 pkgname=libcap-ng
-version=0.7.9
+version=0.7.10
 revision=1
 build_style=gnu-configure
 configure_args="--without-python --without-python3"
-short_desc="An alternate POSIX capabilities library"
+short_desc="Alternate POSIX capabilities library"
 maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://people.redhat.com/sgrubb/libcap-ng/"
-license="GPL-2, LGPL-2.1"
 distfiles="http://people.redhat.com/sgrubb/$pkgname/$pkgname-$version.tar.gz"
-checksum=4a1532bcf3731aade40936f6d6a586ed5a66ca4c7455e1338d1f6c3e09221328
+checksum=a84ca7b4e0444283ed269b7a29f5b6187f647c82e2b876636b49b9a744f0ffbf
 
 subpackages="libcap-ng-devel libcap-ng-progs"
 
diff --git a/srcpkgs/libclc-git/template b/srcpkgs/libclc-git/template
index 20ee5f6b589..40c42db08ed 100644
--- a/srcpkgs/libclc-git/template
+++ b/srcpkgs/libclc-git/template
@@ -1,7 +1,7 @@
 # Template file for 'libclc-git'
 pkgname=libclc-git
 version=20181127
-revision=1
+revision=2
 _git_hash=1ecb16dd7d8b8e9151027faab996f27b2ac508e3
 wrksrc="libclc-${_git_hash}"
 build_style=configure
diff --git a/srcpkgs/libcloudproviders/template b/srcpkgs/libcloudproviders/template
index 2718d70e276..624c29bdea2 100644
--- a/srcpkgs/libcloudproviders/template
+++ b/srcpkgs/libcloudproviders/template
@@ -9,7 +9,7 @@ configure_args="-Dintrospection=$(vopt_if gir true false)
 hostmakedepends="pkg-config glib-devel $(vopt_if vala 'vala-devel')"
 makedepends="libglib-devel"
 short_desc="DBus API for cloud storage sync clients to expose their services"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/Incubator/libcloudproviders"
 distfiles="${homepage}/-/archive/${version}/libcloudproviders-${version}.tar.gz"
diff --git a/srcpkgs/libcmis/patches/no-include-cxx-headers-from-extern-c.patch b/srcpkgs/libcmis/patches/no-include-cxx-headers-from-extern-c.patch
new file mode 100644
index 00000000000..c82cf900561
--- /dev/null
+++ b/srcpkgs/libcmis/patches/no-include-cxx-headers-from-extern-c.patch
@@ -0,0 +1,19 @@
+FTBFS: /usr/include/c++/9.2/memory:146:1: error: template with C linkage
+
+--- inc/libcmis-c/repository.h
++++ inc/libcmis-c/repository.h
+@@ -28,12 +28,12 @@
+ #ifndef _REPOSITORY_H_
+ #define _REPOSITORY_H_
+ 
++#include <libxml/tree.h>
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+ 
+-#include <libxml/tree.h>
+-
+ #include "libcmis-c/libcmis-c-api.h"
+ #include "libcmis-c/types.h"
+ 
diff --git a/srcpkgs/libcmis/template b/srcpkgs/libcmis/template
index 9913168a635..eaf3215cff9 100644
--- a/srcpkgs/libcmis/template
+++ b/srcpkgs/libcmis/template
@@ -1,7 +1,7 @@
 # Template file for 'libcmis'
 pkgname=libcmis
 version=0.5.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="DOCBOOK2MAN=docbook2man --disable-werror"
 hostmakedepends="pkg-config docbook2x"
diff --git a/srcpkgs/libcotp/template b/srcpkgs/libcotp/template
index e779793cb4a..9e147ff7deb 100644
--- a/srcpkgs/libcotp/template
+++ b/srcpkgs/libcotp/template
@@ -6,7 +6,7 @@ build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="libbaseencode-devel libgcrypt-devel"
 short_desc="Library for generating TOTP and HOTP"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/paolostivanin/libcotp"
 distfiles="https://github.com/paolostivanin/libcotp/archive/v${version}.tar.gz"
diff --git a/srcpkgs/libcxx/patches/ppc.patch b/srcpkgs/libcxx/patches/ppc.patch
new file mode 100644
index 00000000000..adcb0c57b0d
--- /dev/null
+++ b/srcpkgs/libcxx/patches/ppc.patch
@@ -0,0 +1,22 @@
+This ensures `is_iec559` is defined correctly under all long double ABIs,
+including musl and its 64-bit long double. Also, `__ppc__` or `__ppc64__`
+is not defined on gcc.
+
+--- include/limits
++++ include/limits
+@@ -426,8 +426,14 @@ protected:
+     _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type signaling_NaN() _NOEXCEPT {return __builtin_nansl("");}
+     _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type denorm_min() _NOEXCEPT {return __LDBL_DENORM_MIN__;}
+ 
+-#if (defined(__ppc__) || defined(__ppc64__))
++#if defined(__powerpc__) || defined(__powerpc64__)
++#if (__LDBL_MAX_EXP__ > __DBL_MAX_EXP__) || (__LDBL_MANT_DIG__ == __DBL_MANT_DIG__)
++    /* IEEE 754 quadruple or double precision */
++    static _LIBCPP_CONSTEXPR const bool is_iec559 = true;
++#else
++    /* 128-bit IBM double-double */
+     static _LIBCPP_CONSTEXPR const bool is_iec559 = false;
++#endif
+ #else
+     static _LIBCPP_CONSTEXPR const bool is_iec559 = true;
+ #endif
diff --git a/srcpkgs/libcxx/template b/srcpkgs/libcxx/template
index 81de61b9f30..58af53e149e 100644
--- a/srcpkgs/libcxx/template
+++ b/srcpkgs/libcxx/template
@@ -1,41 +1,26 @@
 # Template file for 'libcxx'
 pkgname=libcxx
-version=7.0.1
+version=9.0.0
 revision=1
 wrksrc="${pkgname}-${version}.src"
 build_style=cmake
 configure_args+=" -DLIBCXX_CXX_ABI=libcxxabi -DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=ON
  -DLIBCXX_CXX_ABI_LIBRARY_PATH=${XBPS_CROSS_BASE}/usr/lib
  -DLIBCXXABI_USE_LLVM_UNWINDER=1"
-hostmakedepends="llvm7 python"
+hostmakedepends="llvm9 python3"
 makedepends="libcxxabi-devel llvm llvm-libunwind-devel"
 make_build_args="VERBOSE=1"
-short_desc="New implementation of the C++ standard library, targeting C++11"
+short_desc="New implementation of the C++ standard library, targeting C++11, C++14 and above"
 maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="https://libcxx.llvm.org"
 license="NCSA, MIT"
+homepage="https://libcxx.llvm.org"
 distfiles="https://www.llvm.org/releases/${version}/${pkgname}-${version}.src.tar.xz"
-checksum=020002618b319dc2a8ba1f2cba88b8cc6a209005ed8ad29f9de0c562c6ebb9f1
+checksum=3c4162972b5d3204ba47ac384aa456855a17b5e97422723d4758251acf1ed28c
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) configure_args+=" -DLIBCXX_HAS_MUSL_LIBC=YES"
 esac
 
-# Doesn't build on AArch64 with GCC
-case "$XBPS_TARGET_MACHINE" in
-	aarch64*)
-		hostmakedepends+=" clang"
-		pre_configure() {
-			export CC="clang"
-			export CXX="clang++"
-
-			CFLAGS+=" --target=$XBPS_CROSS_TRIPLET --sysroot=${XBPS_CROSS_BASE}"
-			CXXFLAGS+=" --target=${XBPS_CROSS_TRIPLET} --sysroot=${XBPS_CROSS_BASE}"
-		}
-	;;
-esac
-
-
 post_extract() {
 	case "$XBPS_TARGET_MACHINE" in
 	*-musl) patch -Np1 <${FILESDIR}/libcxx-0001-musl-hacks.patch
diff --git a/srcpkgs/libcxxabi/template b/srcpkgs/libcxxabi/template
index 258ce27f382..03b9424deee 100644
--- a/srcpkgs/libcxxabi/template
+++ b/srcpkgs/libcxxabi/template
@@ -1,6 +1,6 @@
 # Template file for 'libcxxabi'
 pkgname=libcxxabi
-version=7.0.1
+version=9.0.0
 revision=1
 wrksrc="${pkgname}-${version}.src"
 build_style=cmake
@@ -8,33 +8,21 @@ configure_args="-DLIBCXXABI_LIBCXX_INCLUDES=../libcxx/include
  -DLIBCXXABI_USE_LLVM_UNWINDER=1
  -DLLVM_DEFAULT_TARGET_TRIPLE=${XBPS_CROSS_TRIPLET:-$XBPS_TRIPLET}"
 make_build_args="VERBOSE=1"
-hostmakedepends="llvm7"
-makedepends="llvm7 llvm-libunwind-devel"
+hostmakedepends="llvm9"
+makedepends="llvm9 llvm-libunwind-devel"
 short_desc="Low-level support for libc++ standard library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="NCSA, MIT"
 homepage="https://libcxxabi.llvm.org"
 distfiles="https://www.llvm.org/releases/${version}/${pkgname}-${version}.src.tar.xz
  https://www.llvm.org/releases/${version}/libcxx-${version}.src.tar.xz"
-checksum="8168903a157ca7ab8423d3b974eaa497230b1564ceb57260be2bd14412e8ded8
- 020002618b319dc2a8ba1f2cba88b8cc6a209005ed8ad29f9de0c562c6ebb9f1"
+checksum="675041783565c906ac2f7f8b2bc5c40f14d871ecfa8ade34855aa18de95530e9
+ 3c4162972b5d3204ba47ac384aa456855a17b5e97422723d4758251acf1ed28c"
 
-# Aarch64 fails to build with gcc
 case "$XBPS_TARGET_MACHINE" in
 	armv[67]l)
 		broken="invalid operands of types 'char [8]' and 'const uint64_t' to binary 'operator&'"
 	;;
-	aarch64*)
-		hostmakedepends+=" clang"
-		configure_args+=" -DLIBCXXABI_TARGET_TRIPLE=${XBPS_CROSS_TRIPLET}"
-		pre_configure() {
-			export CC="clang"
-			export CXX="clang++"
-
-			CFLAGS+=" --target=${XBPS_CROSS_TRIPLET} --sysroot=${XBPS_CROSS_BASE}"
-			CXXFLAGS+=" --target=${XBPS_CROSS_TRIPLET} --sysroot=${XBPS_CROSS_BASE} -I$(ls -d ${XBPS_CROSS_BASE}/usr/include/c++/*/${XBPS_CROSS_TRIPLET} | head -n1)"
-		}
-	;;
 esac
 
 post_extract() {
diff --git a/srcpkgs/libdazzle/template b/srcpkgs/libdazzle/template
index 3ce55a10ff5..70bdd3558fd 100644
--- a/srcpkgs/libdazzle/template
+++ b/srcpkgs/libdazzle/template
@@ -1,6 +1,6 @@
 # Template file for 'libdazzle'
 pkgname=libdazzle
-version=3.32.3
+version=3.34.1
 revision=1
 build_style=meson
 build_helper="gir"
@@ -14,7 +14,7 @@ license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/libdazzle"
 changelog="https://raw.githubusercontent.com/GNOME/libdazzle/libdazzle-3-32/NEWS"
 distfiles="${GNOME_SITE}/libdazzle/${version%.*}/libdazzle-${version}.tar.xz"
-checksum=6c8d9b1514b5f6422107596f4145b89b8f2a99abef6383e086dfcd28c28667e8
+checksum=3d981cbb9d9bb87bfaff7bfd44d9847223b3ef81e69225e4d1f6ac725a669505
 
 build_options="gir vala"
 build_options_default="gir vala"
diff --git a/srcpkgs/libdrm/template b/srcpkgs/libdrm/template
index b1accf70d4c..77318b0b4c4 100644
--- a/srcpkgs/libdrm/template
+++ b/srcpkgs/libdrm/template
@@ -8,7 +8,7 @@ configure_args="-Dudev=true -Dvalgrind=false"
 hostmakedepends="pkg-config"
 makedepends="eudev-libudev-devel libpciaccess-devel"
 short_desc="Userspace interface to kernel DRM services"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://dri.freedesktop.org/"
 distfiles="https://gitlab.freedesktop.org/mesa/drm/-/archive/libdrm-${version}/drm-libdrm-${version}.tar.gz"
diff --git a/srcpkgs/libdwarf/template b/srcpkgs/libdwarf/template
index 8e280c25c89..e7a757ce85c 100644
--- a/srcpkgs/libdwarf/template
+++ b/srcpkgs/libdwarf/template
@@ -1,6 +1,6 @@
 # Template file for 'libdwarf'
 pkgname=libdwarf
-version=20190529
+version=20191002
 revision=1
 build_style=gnu-configure
 configure_args="--prefix=/usr --enable-shared"
@@ -10,7 +10,7 @@ maintainer="John Regan <john@jrjrtech.com>"
 license="LGPL-2.1-only"
 homepage="https://www.prevanders.net/dwarf.html"
 distfiles="https://prevanders.net/${pkgname}-${version}.tar.gz"
-checksum=b414c3bff758df211d972de72df1da9f496224da3f649b950b7d7239ec69172c
+checksum=c1594995813653e7ce6dabc36f86b2074598fedacf8b789ada6c0f47a5f12f49
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" elfutils-devel"
diff --git a/srcpkgs/libebml/template b/srcpkgs/libebml/template
index 0f99d3d8c0c..4b3e5bef448 100644
--- a/srcpkgs/libebml/template
+++ b/srcpkgs/libebml/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
 short_desc="Extensible Binary Meta Language library"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://dl.matroska.org/downloads/libebml/"
 distfiles="https://dl.matroska.org/downloads/libebml/libebml-${version}.tar.xz"
diff --git a/srcpkgs/libfakekey/template b/srcpkgs/libfakekey/template
index b312a2d17a5..17df937adc3 100644
--- a/srcpkgs/libfakekey/template
+++ b/srcpkgs/libfakekey/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="libXtst-devel"
 short_desc="X virtual keyboard library"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.yoctoproject.org/tools-resources/projects/matchbox"
 distfiles="https://git.yoctoproject.org/cgit/cgit.cgi/libfakekey/snapshot/libfakekey-${version}.tar.gz"
diff --git a/srcpkgs/libfilezilla/template b/srcpkgs/libfilezilla/template
index cf2f937389e..ea03f727cb9 100644
--- a/srcpkgs/libfilezilla/template
+++ b/srcpkgs/libfilezilla/template
@@ -1,7 +1,7 @@
 # Template file for 'libfilezilla'
 # filezilla needs to be rebuilt when libfilezilla version changes, ABI is not stable
 pkgname=libfilezilla
-version=0.18.1
+version=0.18.2
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://lib.filezilla-project.org/"
 changelog="https://svn.filezilla-project.org/filezilla/libfilezilla/trunk/NEWS?view=co"
 distfiles="https://download.filezilla-project.org/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=cb7bae8a27a6ff7ea37c89a0ed4347d5c7b0c847473b29894dcadc154b8a7f97
+checksum=40d86929b486a6809c4b52d607f21a00e634e0b9b792504fe2964c117b522dc9
 
 case "$XBPS_TARGET_MACHINE" in
 	armv[56]*|ppc|ppc-musl*)
diff --git a/srcpkgs/libfontenc/template b/srcpkgs/libfontenc/template
index ccdce031345..02e28e72510 100644
--- a/srcpkgs/libfontenc/template
+++ b/srcpkgs/libfontenc/template
@@ -7,7 +7,7 @@ configure_args="--with-fontrootdir=/usr/share/fonts/X11"
 hostmakedepends="pkg-config"
 makedepends="xorgproto zlib-devel"
 short_desc="Fontenc Library from X.org"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org/"
 distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
diff --git a/srcpkgs/libgcrypt/template b/srcpkgs/libgcrypt/template
index fbe8669d903..1a8e3c67ba7 100644
--- a/srcpkgs/libgcrypt/template
+++ b/srcpkgs/libgcrypt/template
@@ -1,7 +1,7 @@
 # Template file for 'libgcrypt'
 pkgname=libgcrypt
-version=1.8.4
-revision=2
+version=1.8.5
+revision=1
 build_style=gnu-configure
 configure_args="--enable-static --without-capabilities"
 makedepends="libgpg-error-devel"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.gnupg.org"
 distfiles="https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-${version}.tar.bz2"
-checksum=f638143a0672628fde0cad745e9b14deb85dffb175709cacc1f4fe24b93f2227
+checksum=3b4a2a94cb637eff5bdebbcaf46f4d95c4f25206f459809339cdada0eb577ac3
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc|ppc-musl) configure_args+=" ac_cv_sys_symbol_underscore=no" ;;
@@ -31,6 +31,7 @@ libgcrypt-devel_package() {
 	pkg_install() {
 		vmove usr/bin/libgcrypt-config
 		vmove usr/include
+		vmove usr/lib/pkgconfig
 		vmove usr/share
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.a"
diff --git a/srcpkgs/libgdiplus/template b/srcpkgs/libgdiplus/template
index 36b62972714..214ea493907 100644
--- a/srcpkgs/libgdiplus/template
+++ b/srcpkgs/libgdiplus/template
@@ -1,6 +1,6 @@
 # Template file for 'libgdiplus'
 pkgname=libgdiplus
-version=5.6.1
+version=6.0.4
 revision=1
 build_style=gnu-configure
 configure_args="--with-cairo=system"
@@ -8,11 +8,11 @@ hostmakedepends="pkg-config automake libtool"
 makedepends="tiff-devel cairo-devel giflib-devel glib-devel libexif-devel
  libpng-devel"
 short_desc="Open Source Implementation of the GDI+ API"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1, MPL-1.1, MIT"
+maintainer="Helmut Pozimski <helmut@pozimski.eu>"
+license="MIT"
 homepage="http://www.mono-project.com/"
 distfiles="https://github.com/mono/${pkgname}/archive/${version}.tar.gz"
-checksum=deff863023950b1d1de7e47e44fc31c8ba39cfc06334737261965f697b2ad312
+checksum=9a5e3f98018116f99361520348e9713cd05680c231d689a83d87acfaf237d3a8
 
 pre_configure() {
 	autoreconf -fiv
@@ -31,4 +31,3 @@ libgdiplus-devel_package() {
 		vmove usr/lib/pkgconfig
 	}
 }
-
diff --git a/srcpkgs/libgit2-0.27/template b/srcpkgs/libgit2-0.27/template
deleted file mode 100644
index c76c0d3ba1a..00000000000
--- a/srcpkgs/libgit2-0.27/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'libgit2-0.27'
-pkgname=libgit2-0.27
-version=0.27.8
-revision=2
-wrksrc="libgit2-${version}"
-build_style=cmake
-configure_args="-DTHREADSAFE=ON"
-hostmakedepends="python git pkg-config"
-makedepends="zlib-devel libressl-devel http-parser-devel libssh2-devel libuv-devel"
-short_desc="Git linkable library"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later WITH GCC-exception-2.0"
-homepage="https://libgit2.org"
-distfiles="https://github.com/libgit2/libgit2/archive/v${version}.tar.gz"
-checksum=8313873d49dc01e8b880ec334d7430ae67496a89aaa8c6e7bbd3affb47a00c76
-
-case "$XBPS_TARGET_MACHINE" in
-	*-musl)
-		# Don't use qsort_r, see src/util.c
-		CFLAGS="-D__ANDROID_API__"
-		;;
-esac
-
-post_install() {
-	rm -rf ${DESTDIR}/usr/include
-	rm -rf ${DESTDIR}/usr/lib/libgit2.so
-	rm -rf ${DESTDIR}/usr/lib/pkgconfig
-}
diff --git a/srcpkgs/libgit2-0.27/update b/srcpkgs/libgit2-0.27/update
deleted file mode 100644
index e80c8970aed..00000000000
--- a/srcpkgs/libgit2-0.27/update
+++ /dev/null
@@ -1,3 +0,0 @@
-site="https://github.com/libgit2/libgit2/tags"
-pattern='archive/v?\K[\d.]+(?=\.tar\.gz)'
-ignore="0.[123456789][12345689]*"
diff --git a/srcpkgs/libgnome-games-support/template b/srcpkgs/libgnome-games-support/template
index bdf2a3b9068..abe3af0ff4d 100644
--- a/srcpkgs/libgnome-games-support/template
+++ b/srcpkgs/libgnome-games-support/template
@@ -1,6 +1,6 @@
 # Template file for 'libgnome-games-support'
 pkgname=libgnome-games-support
-version=1.4.3
+version=1.4.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config gobject-introspection vala"
@@ -10,7 +10,7 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-3.0-or-later"
 homepage="https://git.gnome.org/browse/libgnome-games-support/"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=704a7a93aa5066f84738b60d696cf393dfbbf1a3e339f9adbb40af0cf70eca3c
+checksum=f8a6ae569868abb4e90cf48e505dff527a635cb21a4af33039379860b3ad6bfe
 
 libgnome-games-support-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/libgravatar/template b/srcpkgs/libgravatar/template
index 972fab026ca..875e8a86243 100644
--- a/srcpkgs/libgravatar/template
+++ b/srcpkgs/libgravatar/template
@@ -1,6 +1,6 @@
 # Template file for 'libgravatar'
 pkgname=libgravatar
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python kcoreaddons kconfig"
@@ -10,7 +10,7 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/applications/${version}/src/libgravatar-${version}.tar.xz"
-checksum=f8dd753abdc868623b878433c0b2ed53d4d4ab2cb62c69cb94c433e51cb713a9
+checksum=393370a9d7d4a74627469b2e67bb3f7a0ef73dac8b11a3ab5af6c384c20a0de5
 
 libgravatar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libgta/template b/srcpkgs/libgta/template
index 60258e70e74..8249797ef9f 100644
--- a/srcpkgs/libgta/template
+++ b/srcpkgs/libgta/template
@@ -1,6 +1,6 @@
 # Template file for 'libgta'
 pkgname=libgta
-version=1.0.9
+version=1.2.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
@@ -10,7 +10,7 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="LGPL-2.1-or-later"
 homepage="https://marlam.de/gta/"
 distfiles="https://marlam.de/gta/releases/libgta-${version}.tar.xz"
-checksum=4618028869f39202565722a514777d611f041700a15a8f4bdbec201c3a099892
+checksum=5a41a71b009b7ea6b425e94d9e2949c560b4fb26f57ba6104b9de9e2e0566b68
 
 post_install() {
 	#examples only
@@ -25,6 +25,5 @@ libgta-devel_package() {
 		vmove usr/lib/pkgconfig
 		vmove usr/lib/*.a
 		vmove usr/lib/*.so
-		vmove usr/share/libgta/cmake
 	}
 }
diff --git a/srcpkgs/libgusb/template b/srcpkgs/libgusb/template
index 95bcccd7111..44970c06c2f 100644
--- a/srcpkgs/libgusb/template
+++ b/srcpkgs/libgusb/template
@@ -10,7 +10,7 @@ hostmakedepends="pkg-config $(vopt_if vala vala)"
 makedepends="libglib-devel libusb-devel libgudev-devel $(vopt_if vala vala-devel)
  usbutils"
 short_desc="GLib wrapper around libusb1"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/hughsie/libgusb"
 distfiles="http://people.freedesktop.org/~hughsient/releases/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/libgweather/patches/conditionalize-gir.patch b/srcpkgs/libgweather/patches/conditionalize-gir.patch
deleted file mode 100644
index 2d134bf88f6..00000000000
--- a/srcpkgs/libgweather/patches/conditionalize-gir.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-diff --git libgweather/meson.build libgweather/meson.build
-index 301e7e8..7da6a4e 100644
---- libgweather/meson.build
-+++ libgweather/meson.build
-@@ -65,29 +65,31 @@ lib_libgweather = shared_library('gweather-3',
-   install: true,
- )
- 
--gweather_gir = gnome.generate_gir(lib_libgweather,
--  sources: introspection_sources,
--  dependencies: deps_libgweather,
--  nsversion: '3.0',
--  namespace: 'GWeather',
--  includes: ['GObject-2.0', 'Gtk-3.0'],
--  symbol_prefix: 'gweather',
--  identifier_prefix: 'GWeather',
--  export_packages: 'gweather-3.0',
--  header: 'libgweather/gweather.h',
--  extra_args: [
--    '--warn-all',
--    '-DGWEATHER_COMPILATION',
--  ],
--  install: true,
--)
-+if get_option('introspection')
-+  gweather_gir = gnome.generate_gir(lib_libgweather,
-+    sources: introspection_sources,
-+    dependencies: deps_libgweather,
-+    nsversion: '3.0',
-+    namespace: 'GWeather',
-+    includes: ['GObject-2.0', 'Gtk-3.0'],
-+    symbol_prefix: 'gweather',
-+    identifier_prefix: 'GWeather',
-+    export_packages: 'gweather-3.0',
-+    header: 'libgweather/gweather.h',
-+    extra_args: [
-+      '--warn-all',
-+      '-DGWEATHER_COMPILATION',
-+    ],
-+    install: true,
-+  )
- 
--libgweather_dep = declare_dependency(
--  sources: [gweather_enum_types[1], gweather_gir],
--  dependencies: deps_libgweather,
--  link_with: lib_libgweather,
--  include_directories: root_inc,
--)
-+  libgweather_dep = declare_dependency(
-+    sources: [gweather_enum_types[1], gweather_gir],
-+    dependencies: deps_libgweather,
-+    link_with: lib_libgweather,
-+    include_directories: root_inc,
-+  )
-+endif
- 
- if enable_vala
-   gnome.generate_vapi('gweather-3.0',
-@@ -102,31 +104,33 @@ test_cargs = ['-DTEST_SRCDIR="@0@/"'.format(meson.current_source_dir()),
-               '-DSCHEMASDIR="@0@/schemas"'.format(meson.source_root()),
-               '-DSCHEMAS_BUILDDIR="@0@/schemas"'.format(meson.build_root())]
- 
--executable('test_locations',
--  ['test_locations.c'],
--  c_args: test_cargs,
--  dependencies: libgweather_dep,
--  install: false)
--executable('test_locations_utc',
--  ['test_locations_utc.c'],
--  c_args: test_cargs,
--  dependencies: libgweather_dep,
--  install: false)
-+if get_option('test')
-+  executable('test_locations',
-+    ['test_locations.c'],
-+    c_args: test_cargs,
-+    dependencies: libgweather_dep,
-+    install: false)
-+  executable('test_locations_utc',
-+    ['test_locations_utc.c'],
-+    c_args: test_cargs,
-+    dependencies: libgweather_dep,
-+    install: false)
- 
--exe = executable('test_libgweather',
--  ['test_libgweather.c'],
--  c_args: test_cargs,
--  dependencies: libgweather_dep,
--  install: false)
--test('test_named_timezones', exe)
-+  exe = executable('test_libgweather',
-+    ['test_libgweather.c'],
-+    c_args: test_cargs,
-+    dependencies: libgweather_dep,
-+    install: false)
-+  test('test_named_timezones', exe)
- 
--executable('test_metar',
--  ['test_metar.c', gweather_c_sources],
--  c_args: test_cargs,
--  dependencies: libgweather_dep,
--  install: false)
--executable('test_sun_moon',
--  ['test_sun_moon.c', 'weather-sun.c', 'weather-moon.c'],
--  c_args: test_cargs,
--  dependencies: libgweather_dep,
--  install: false)
-+  executable('test_metar',
-+    ['test_metar.c', gweather_c_sources],
-+    c_args: test_cargs,
-+    dependencies: libgweather_dep,
-+    install: false)
-+  executable('test_sun_moon',
-+    ['test_sun_moon.c', 'weather-sun.c', 'weather-moon.c'],
-+    c_args: test_cargs,
-+    dependencies: libgweather_dep,
-+    install: false)
-+endif
-diff --git meson_options.txt meson_options.txt
-index 19b2c6a..3025a5f 100644
---- meson_options.txt
-+++ meson_options.txt
-@@ -8,3 +8,7 @@ option('enable_vala', type: 'combo', choices : ['true', 'false', 'auto'], value
-        description: 'Install vala bindings')
- option('gtk_doc', type: 'boolean', value: false,
-        description: 'Whether to generate the API reference')
-+option('introspection', type: 'boolean', value: false,
-+       description: 'Whether to generate gobject introspection data')
-+option('test', type: 'boolean', value: false,
-+       description: 'Whether to build test executables')
diff --git a/srcpkgs/libgweather/template b/srcpkgs/libgweather/template
index 25f1cd3aee0..45a4f54e370 100644
--- a/srcpkgs/libgweather/template
+++ b/srcpkgs/libgweather/template
@@ -1,6 +1,6 @@
 # Template file for 'libgweather'
 pkgname=libgweather
-version=3.32.2
+version=3.34.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -15,7 +15,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/LibGWeather"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=28ed5ff00d6faf1dc885c4252a538e43ff3f614fcf6a0f20c3b63604295d3c02
+checksum=02245395d639d9749fe2d19b7e66b64a152b9509ab0e5aad92514538b9c6f1b9
 
 build_options="gir vala"
 build_options_default="gir vala"
diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template
index 1f55582449f..7a34bee0e77 100644
--- a/srcpkgs/libheif/template
+++ b/srcpkgs/libheif/template
@@ -1,6 +1,6 @@
 # Template file for 'libheif'
 pkgname=libheif
-version=1.4.0
+version=1.5.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake autoconf pkg-config libtool"
@@ -9,7 +9,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="LGPL-3.0-or-later"
 homepage="http://www.libheif.org"
 distfiles="https://github.com/strukturag/libheif/archive/v${version}.tar.gz"
-checksum=3b7cead51077ee42e687248b8cd9269fda95a5f7ef4e502c54d08d189e395368
+checksum=87e3febd4d97fb483e3ac7b5399547bdc3093476058594e379bb075866d4eaf1
 
 pre_configure() {
 	./autogen.sh
diff --git a/srcpkgs/libhtp/template b/srcpkgs/libhtp/template
index 762c5ebd042..3d69926f865 100644
--- a/srcpkgs/libhtp/template
+++ b/srcpkgs/libhtp/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="automake libtool"
 makedepends="zlib-devel"
 short_desc="Security-aware parser for HTTP"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/OISF/libhtp"
 distfiles="https://github.com/OISF/libhtp/archive/${version}.tar.gz"
diff --git a/srcpkgs/libical/template b/srcpkgs/libical/template
index 40f24327ef4..39580e43de5 100644
--- a/srcpkgs/libical/template
+++ b/srcpkgs/libical/template
@@ -1,18 +1,26 @@
 # Template file for 'libical'
 pkgname=libical
-version=3.0.4
+version=3.0.6
 revision=2
 build_style=cmake
-hostmakedepends="libglib-devel libxml2-devel perl pkg-config"
-makedepends="libglib-devel libxml2-devel"
+build_helper="gir"
+configure_args="-DICAL_BUILD_DOCS=false
+ $(vopt_if gir '-DGOBJECT_INTROSPECTION=true -DICAL_GLIB_VAPI=true')"
+hostmakedepends="libglib-devel libxml2-devel perl pkg-config $(vopt_if gir vala)"
+makedepends="libglib-devel libxml2-devel $(vopt_if gir vala-devel)"
 checkdepends="tzdata"
 short_desc="Reference implementation of the iCalendar data type and format"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1, MPL-1"
+license="LGPL-2.1-only, MPL-2.0"
 homepage="http://libical.github.io/libical/"
 distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz"
-checksum=20f39343701ccd3ad896a9f9e982fdf85c1d3a35572e9d962216b69a64aef2ae
+checksum=fd2404a3df42390268e9fb804ef9f235e429b6f0da8992a148cbb3614946d99b
 patch_args="-Np1"
+disable_parallel_build=y
+build_options="gir"
+if [ -z "$CROSS_BUILD" ]; then
+	build_options_default="gir"
+fi
 
 libical-devel_package() {
 	depends="icu-devel ${sourcepkg}>=${version}_${revision}"
@@ -22,6 +30,10 @@ libical-devel_package() {
 		vmove usr/lib/pkgconfig
 		vmove usr/lib/*.a
 		vmove usr/lib/*.so
+		if [ "$build_option_gir" ]; then
+			vmove usr/share/gir-1.0
+			vmove usr/share/vala
+		fi
 		vmove usr/lib/cmake
 	}
 }
diff --git a/srcpkgs/libinput/template b/srcpkgs/libinput/template
index 34ee0a6e26b..c316ad8c060 100644
--- a/srcpkgs/libinput/template
+++ b/srcpkgs/libinput/template
@@ -1,6 +1,6 @@
 # Template file for 'libinput'
 pkgname=libinput
-version=1.14.0
+version=1.14.1
 revision=1
 build_style=meson
 configure_args="-Ddebug-gui=false -Ddocumentation=false -Dtests=false"
@@ -8,11 +8,11 @@ hostmakedepends="pkg-config"
 makedepends="libevdev-devel libwacom-devel mtdev-devel eudev-libudev-devel"
 checkdepends="valgrind check-devel"
 short_desc="Provides handling input devices in Wayland compositors and X"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="bra1nwave <brainwave@openmailbox.org>"
 license="MIT"
 homepage="https://www.freedesktop.org/wiki/Software/libinput"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=7cb85c24f8920b81bc5360220107e267ab4e0e718704c7690a8c7b03fa14fc67
+checksum=e333a3242835c019ca37d2cef8b51a87d3138eb47444119c0153dc7a8656ee70
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -Dtests=true"
diff --git a/srcpkgs/libite/template b/srcpkgs/libite/template
index fc17d3c6ca1..a673e5e4b24 100644
--- a/srcpkgs/libite/template
+++ b/srcpkgs/libite/template
@@ -1,16 +1,16 @@
 # Template file for 'libite'
 pkgname=libite
-version=2.0.2
+version=2.1.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool"
 short_desc="Lightweight library of frog DNA"
 maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT, ISC, BSD"
+license="MIT, ISC, BSD-2-Clause, BSD-3-Clause"
 homepage="https://github.com/troglobit/libite"
 #changelog="https://raw.githubusercontent.com/troglobit/libite/master/ChangeLog.md"
 distfiles="https://github.com/troglobit/libite/archive/v${version}.tar.gz"
-checksum=bd5d08066f3e53cc8967beb6f0620286aad7a24d49fb730caa1c6d09a26bb705
+checksum=fa441c6de3add45e66e842db0b0001fa978e3b3708f3dd1831fbd6bc7e9c07f7
 
 pre_configure() {
 	./autogen.sh
diff --git a/srcpkgs/libjpeg-turbo/template b/srcpkgs/libjpeg-turbo/template
index 8d3cfc1212a..d8af7da8d38 100644
--- a/srcpkgs/libjpeg-turbo/template
+++ b/srcpkgs/libjpeg-turbo/template
@@ -1,6 +1,6 @@
 # Template file for 'libjpeg-turbo'
 pkgname=libjpeg-turbo
-version=2.0.2
+version=2.0.3
 revision=1
 build_style=cmake
 configure_args="-DWITH_JPEG8=1 -DCMAKE_INSTALL_LIBDIR=/usr/lib"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="IJG, BSD-3-Clause, Zlib"
 homepage="https://libjpeg-turbo.org/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=acb8599fe5399af114287ee5907aea4456f8f2c1cc96d26c28aebfdf5ee82fed
+checksum=4246de500544d4ee408ee57048aa4aadc6f165fc17f141da87669f20ed3241b7
 
 provides="jpeg-8_1"
 replaces="jpeg>=0"
diff --git a/srcpkgs/libkcddb/template b/srcpkgs/libkcddb/template
index c5b7e39f080..9ef6dadc564 100644
--- a/srcpkgs/libkcddb/template
+++ b/srcpkgs/libkcddb/template
@@ -1,10 +1,9 @@
 # Template file for 'libkcddb'
 pkgname=libkcddb
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
-configure_args="-DBUILD_TESTING=OFF"
-hostmakedepends="extra-cmake-modules kconfig kcoreaddons kdoctools python
+hostmakedepends="extra-cmake-modules kconfig kcoreaddons kdoctools
  qt5-host-tools qt5-qmake"
 makedepends="kio-devel libmusicbrainz5-devel"
 short_desc="KDE CDDB library"
@@ -12,7 +11,11 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, BSD-3-Clause, GFDL-1.2-only"
 homepage="https://projects.kde.org/projects/kde/kdemultimedia/libkcddb"
 distfiles="${KDE_SITE}/applications/${version}/src/libkcddb-${version}.tar.xz"
-checksum=f97b90660bfd403aa64be8e6221a89087f74ab443431a9f692fe14cc90d82151
+checksum=f3e4c650b0abe10f281037bd6c805243a656fecdfc046a8586324c760ba90e48
+
+pre_check() {
+	export QT_QPA_PLATFORM=offscreen
+}
 
 libkcddb-devel_package() {
 	depends="libkcddb>=${version}_${revision}"
diff --git a/srcpkgs/libkdcraw5/template b/srcpkgs/libkdcraw5/template
index dbf8111374a..3088ede258b 100644
--- a/srcpkgs/libkdcraw5/template
+++ b/srcpkgs/libkdcraw5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdcraw5'
 pkgname=libkdcraw5
-version=19.08.0
+version=19.08.2
 revision=1
 wrksrc="libkdcraw-${version}"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/"
 distfiles="${KDE_SITE}/applications/${version}/src/libkdcraw-${version}.tar.xz"
-checksum=5c00a6f28445ba5a45284c3cee0ee3f158ad9e184fea5ee8adc83ac3000b26b1
+checksum=735ab40633efec394c6265d83f86ad7caf278f63d1dd33cc6edf572da4925fcb
 
 libkdcraw5-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libkdegames/template b/srcpkgs/libkdegames/template
index f0a6682f021..e8c5f09334d 100644
--- a/srcpkgs/libkdegames/template
+++ b/srcpkgs/libkdegames/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdegames'
 pkgname=libkdegames
-version=19.04.3
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/games/"
 distfiles="${KDE_SITE}/applications/${version}/src/libkdegames-${version}.tar.xz"
-checksum=187aa81539113bc6786d861e1f5302fa17533ae1108299bbd1a86be18accfbc4
+checksum=83456cec44502a1f79c0be00c983090e32fd8aea5fec1461fbfbd37b5f8866ac
 
 do_check() {
 	: # requires xserver
diff --git a/srcpkgs/libkdepim/template b/srcpkgs/libkdepim/template
index 59cfcd321d9..952a646c28d 100644
--- a/srcpkgs/libkdepim/template
+++ b/srcpkgs/libkdepim/template
@@ -1,7 +1,7 @@
 # Template file for 'libkdepim'
 pkgname=libkdepim
-version=19.08.0
-revision=1
+version=19.08.2
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python kcoreaddons"
 makedepends="akonadi5-devel akonadi-contacts-devel kcmutils-devel kldap-devel akonadi-search-devel"
@@ -10,7 +10,7 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/applications/${version}/src/libkdepim-${version}.tar.xz"
-checksum=4ff394bda799ebe700d12d60ab8171c64e054c6acb105870cd955b5ddce42eab
+checksum=67578e4c98e7e5d94249144e3720ae5fbc17231d4ecc46cb0e1be6e7ced4a71b
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/libkexiv25/template b/srcpkgs/libkexiv25/template
index 29acf0d26b8..d8f84c03e56 100644
--- a/srcpkgs/libkexiv25/template
+++ b/srcpkgs/libkexiv25/template
@@ -1,6 +1,6 @@
 # Template file for 'libkexiv25'
 pkgname=libkexiv25
-version=19.08.0
+version=19.08.2
 revision=1
 wrksrc="libkexiv2-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Denis Revin <denis.revin@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/kde/kdegraphics/libs/libkexiv2"
 distfiles="${KDE_SITE}/applications/${version}/src/libkexiv2-${version}.tar.xz"
-checksum=42bb1a8b69efbb4ab8b1d939279d3eb02b2d8030bcb917739f4f61fb5a10db15
+checksum=abdafabe834862e157356f2686ae871f00302d82ae639dbf89030d19ccc54b1b
 
 libkexiv25-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/libkgapi/template b/srcpkgs/libkgapi/template
index 9e88e9570d3..acd3495a396 100644
--- a/srcpkgs/libkgapi/template
+++ b/srcpkgs/libkgapi/template
@@ -1,7 +1,7 @@
 # Template file for 'libkgapi'
 pkgname=libkgapi
-version=19.08.0
-revision=1
+version=19.08.2
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake python3
  kcoreaddons"
@@ -12,7 +12,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/extragear/libs/libkgapi"
 distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=bc8a54e0997f4e3e0e840e350c6a9dee26582028415c5e9863d53a3280faa9f6
+checksum=b220908dd4a21e589a25b964b7786f1154f63ca98bf90c43ced3120adf4fb0a6
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*) broken="depends on qt5-webengine";;
diff --git a/srcpkgs/libkipi5/template b/srcpkgs/libkipi5/template
index d77e1bfcd75..ab69e110e77 100644
--- a/srcpkgs/libkipi5/template
+++ b/srcpkgs/libkipi5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkipi5'
 pkgname=libkipi5
-version=19.08.0
+version=19.08.2
 revision=1
 wrksrc="libkipi-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/kde/kdegraphics/libs/libkipi"
 distfiles="${KDE_SITE}/applications/${version}/src/libkipi-${version}.tar.xz"
-checksum=94b184c3128fe7ded9e816e2a6124ee0dcf016b1325636dd41b157866b461989
+checksum=fcaf576afb961d9a36c1f69c034c43b9f0991cbd0726ea684c2c49096f36d5c6
 conflicts="libkipi"
 
 libkipi5-devel_package() {
diff --git a/srcpkgs/libkleo/template b/srcpkgs/libkleo/template
index 771f5b52e97..e3c3c48c5d0 100644
--- a/srcpkgs/libkleo/template
+++ b/srcpkgs/libkleo/template
@@ -1,6 +1,6 @@
 # Template file for 'libkleo'
 pkgname=libkleo
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/applications/${version}/src/libkleo-${version}.tar.xz"
-checksum=a0a022f3da4d8f73c020ab55221c74d5c1590b2cbdb3b754218be17622a59cc6
+checksum=0acf296ffb0144096071e47ce1365b9e5b07b59cad4700f89c875c7bee4573bd
 
 libkleo-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/libknet1-devel b/srcpkgs/libknet1-devel
new file mode 120000
index 00000000000..0dca2d60545
--- /dev/null
+++ b/srcpkgs/libknet1-devel
@@ -0,0 +1 @@
+libknet1
\ No newline at end of file
diff --git a/srcpkgs/libknet1/patches/01_musl_fix.diff b/srcpkgs/libknet1/patches/01_musl_fix.diff
new file mode 100644
index 00000000000..f636c79bb8d
--- /dev/null
+++ b/srcpkgs/libknet1/patches/01_musl_fix.diff
@@ -0,0 +1,210 @@
+https://github.com/kronosnet/kronosnet/commit/512e433b0b3d8bf14818dcb8c8eb7748d7e899be
+
+diff --git a/configure.ac b/configure.ac
+index 778b12a5..e430aeb8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -205,6 +205,10 @@ AC_SEARCH_LIBS([dlopen], [dl dld], , [AC_MSG_ERROR([dlopen not found])])
+ AC_SUBST([dl_LIBS], [$LIBS])
+ LIBS="$saved_LIBS"
+ 
++# Check RTLD_DI_ORIGIN (not decalred by musl. glibc has it as an enum so cannot use ifdef)
++AC_CHECK_DECL([RTLD_DI_ORIGIN], [AC_DEFINE([HAVE_RTLD_DI_ORIGIN], 1,
++    [define when RTLD_DI_ORIGIN is declared])], ,[[#include <dlfcn.h>]])
++
+ # OS detection
+ 
+ AC_MSG_CHECKING([for os in ${host_os}])
+diff --git a/libknet/common.c b/libknet/common.c
+index 00907c91..ed8ac899 100644
+--- a/libknet/common.c
++++ b/libknet/common.c
+@@ -12,6 +12,8 @@
+ #include <fcntl.h>
+ #include <dlfcn.h>
+ #include <errno.h>
++#include <libgen.h>
++#include <link.h>
+ #include <string.h>
+ #include <sys/param.h>
+ #include <sys/types.h>
+@@ -54,6 +56,30 @@ int _fdset_nonblock(int fd)
+ 	return 0;
+ }
+ 
++static int get_lib_dir(void *lib_handle, char dir[MAXPATHLEN])
++{
++	int res;
++#ifndef HAVE_RTLD_DI_ORIGIN
++	struct link_map *lm;
++	char l_name[MAXPATHLEN];
++#endif
++
++#ifdef HAVE_RTLD_DI_ORIGIN
++	res = dlinfo(lib_handle, RTLD_DI_ORIGIN, dir);
++#else
++	/*
++	 * musl libc doesn't support RTLD_DI_ORIGIN
++	 */
++	res = dlinfo(lib_handle, RTLD_DI_LINKMAP, &lm);
++	if (res == 0) {
++		snprintf(l_name, sizeof(l_name), "%s", lm->l_name);
++		snprintf(dir, MAXPATHLEN, "%s", dirname(l_name));
++	}
++#endif
++
++	return res;
++}
++
+ static void *open_lib(knet_handle_t knet_h, const char *libname, int extra_flags)
+ {
+ 	void *ret = NULL;
+@@ -81,7 +107,7 @@ static void *open_lib(knet_handle_t knet_h, const char *libname, int extra_flags
+ 	memset(dir, 0, sizeof(dir));
+ 	memset(link, 0, sizeof(link));
+ 	memset(path, 0, sizeof(path));
+-	if (dlinfo(ret, RTLD_DI_ORIGIN, &dir) < 0) {
++	if (get_lib_dir(ret, dir) < 0) {
+ 		/*
+ 		 * should we dlclose and return error?
+ 		 */
+diff --git a/libknet/compat.c b/libknet/compat.c
+index e808f332..2e73c9fc 100644
+--- a/libknet/compat.c
++++ b/libknet/compat.c
+@@ -22,7 +22,7 @@
+ #include <sys/types.h>
+ #include <sys/event.h>
+ #include <sys/time.h>
+-#include <sys/errno.h>
++#include <errno.h>
+ 
+ static int32_t
+ _poll_to_filter_(int32_t event)
+diff --git a/libknet/crypto.c b/libknet/crypto.c
+index afa4f88c..2c4d5f5c 100644
+--- a/libknet/crypto.c
++++ b/libknet/crypto.c
+@@ -8,7 +8,7 @@
+ 
+ #include "config.h"
+ 
+-#include <sys/errno.h>
++#include <errno.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <pthread.h>
+diff --git a/libknet/handle.c b/libknet/handle.c
+index fcb129a7..6ecc91f7 100644
+--- a/libknet/handle.c
++++ b/libknet/handle.c
+@@ -456,9 +456,24 @@ static void _close_epolls(knet_handle_t knet_h)
+ static int _start_threads(knet_handle_t knet_h)
+ {
+ 	int savederrno = 0;
++	pthread_attr_t attr;
+ 
+ 	set_thread_status(knet_h, KNET_THREAD_PMTUD, KNET_THREAD_REGISTERED);
+-	savederrno = pthread_create(&knet_h->pmtud_link_handler_thread, 0,
++
++	savederrno = pthread_attr_init(&attr);
++	if (savederrno) {
++		log_err(knet_h, KNET_SUB_HANDLE, "Unable to init pthread attributes: %s",
++			strerror(savederrno));
++		goto exit_fail;
++	}
++	savederrno = pthread_attr_setstacksize(&attr, KNET_THREAD_STACK_SIZE);
++	if (savederrno) {
++		log_err(knet_h, KNET_SUB_HANDLE, "Unable to set stack size attribute: %s",
++			strerror(savederrno));
++		goto exit_fail;
++	}
++
++	savederrno = pthread_create(&knet_h->pmtud_link_handler_thread, &attr,
+ 				    _handle_pmtud_link_thread, (void *) knet_h);
+ 	if (savederrno) {
+ 		log_err(knet_h, KNET_SUB_HANDLE, "Unable to start pmtud link thread: %s",
+@@ -467,7 +482,7 @@ static int _start_threads(knet_handle_t knet_h)
+ 	}
+ 
+ 	set_thread_status(knet_h, KNET_THREAD_DST_LINK, KNET_THREAD_REGISTERED);
+-	savederrno = pthread_create(&knet_h->dst_link_handler_thread, 0,
++	savederrno = pthread_create(&knet_h->dst_link_handler_thread, &attr,
+ 				    _handle_dst_link_handler_thread, (void *) knet_h);
+ 	if (savederrno) {
+ 		log_err(knet_h, KNET_SUB_HANDLE, "Unable to start dst cache thread: %s",
+@@ -476,7 +491,7 @@ static int _start_threads(knet_handle_t knet_h)
+ 	}
+ 
+ 	set_thread_status(knet_h, KNET_THREAD_TX, KNET_THREAD_REGISTERED);
+-	savederrno = pthread_create(&knet_h->send_to_links_thread, 0,
++	savederrno = pthread_create(&knet_h->send_to_links_thread, &attr,
+ 				    _handle_send_to_links_thread, (void *) knet_h);
+ 	if (savederrno) {
+ 		log_err(knet_h, KNET_SUB_HANDLE, "Unable to start datafd to link thread: %s",
+@@ -485,7 +500,7 @@ static int _start_threads(knet_handle_t knet_h)
+ 	}
+ 
+ 	set_thread_status(knet_h, KNET_THREAD_RX, KNET_THREAD_REGISTERED);
+-	savederrno = pthread_create(&knet_h->recv_from_links_thread, 0,
++	savederrno = pthread_create(&knet_h->recv_from_links_thread, &attr,
+ 				    _handle_recv_from_links_thread, (void *) knet_h);
+ 	if (savederrno) {
+ 		log_err(knet_h, KNET_SUB_HANDLE, "Unable to start link to datafd thread: %s",
+@@ -494,7 +509,7 @@ static int _start_threads(knet_handle_t knet_h)
+ 	}
+ 
+ 	set_thread_status(knet_h, KNET_THREAD_HB, KNET_THREAD_REGISTERED);
+-	savederrno = pthread_create(&knet_h->heartbt_thread, 0,
++	savederrno = pthread_create(&knet_h->heartbt_thread, &attr,
+ 				    _handle_heartbt_thread, (void *) knet_h);
+ 	if (savederrno) {
+ 		log_err(knet_h, KNET_SUB_HANDLE, "Unable to start heartbeat thread: %s",
+@@ -502,6 +517,15 @@ static int _start_threads(knet_handle_t knet_h)
+ 		goto exit_fail;
+ 	}
+ 
++	savederrno = pthread_attr_destroy(&attr);
++	if (savederrno) {
++		log_err(knet_h, KNET_SUB_HANDLE, "Unable to destroy pthread attributes: %s",
++			strerror(savederrno));
++		/*
++		 * Do not return error code. Error is not critical.
++		 */
++	}
++
+ 	return 0;
+ 
+ exit_fail:
+diff --git a/libknet/internals.h b/libknet/internals.h
+index 3911b847..13530687 100644
+--- a/libknet/internals.h
++++ b/libknet/internals.h
+@@ -37,6 +37,14 @@
+ 
+ #define KNET_INTERNAL_DATA_CHANNEL KNET_DATAFD_MAX
+ 
++/*
++ * Size of threads stack. Value is choosen by experimenting, how much is needed
++ * to sucesfully finish test suite, and at the time of writing patch it was
++ * ~300KiB. To have some room for future enhancement it is increased
++ * by factor of 3 and rounded.
++ */
++#define KNET_THREAD_STACK_SIZE (1024 * 1024)
++
+ typedef void *knet_transport_link_t; /* per link transport handle */
+ typedef void *knet_transport_t;      /* per knet_h transport handle */
+ struct  knet_transport_ops;          /* Forward because of circular dependancy */
+diff --git a/libknet/onwire.c b/libknet/onwire.c
+index 143ac4b7..e3fd293b 100644
+--- a/libknet/onwire.c
++++ b/libknet/onwire.c
+@@ -8,7 +8,7 @@
+ 
+ #include "config.h"
+ 
+-#include <sys/errno.h>
++#include <errno.h>
+ #include <stdlib.h>
+ #include <string.h>
+ 
diff --git a/srcpkgs/libknet1/template b/srcpkgs/libknet1/template
new file mode 100644
index 00000000000..cb2b377182e
--- /dev/null
+++ b/srcpkgs/libknet1/template
@@ -0,0 +1,58 @@
+# Template file for 'libknet1'
+# only libraries and development files now, if interested in kronosnetd update!
+pkgname=libknet1
+version=1.11
+revision=2
+wrksrc=kronosnet-${version}
+build_style=gnu-configure
+configure_args="--disable-dependency-tracking --disable-libknet-sctp
+ --disable-kronosnetd --disable-poc --disable-static"
+hostmakedepends="automake doxygen libtool libxml2-devel pkg-config libqb-devel"
+makedepends="bzip2-devel liblz4-devel liblzma-devel libnl3-devel libqb-devel
+ libressl-devel libxml2-devel libzstd-devel lzo-devel nss-devel zlib-devel"
+short_desc="Kronosnet core switching implementation (libraries)"
+maintainer="Jiří Bělka <jirib79@gmail.com>"
+license="GPL-2.0-or-later, LGPL-2.1-only"
+homepage="https://www.kronosnet.org"
+distfiles="https://kronosnet.org/releases/kronosnet-${version}.tar.bz2"
+checksum=c2ee20a9b5b0791ed5379b38b0b51d549603933925a839f045455553f03e6114
+
+patch_args='-Np1'
+
+pre_configure() {
+	autoreconf -fi
+}
+
+post_install() {
+	rm -rf ${DESTDIR}/usr/share/doc/kronosnet
+	vdoc README
+}
+
+libknet1-devel_package() {
+	depends="libknet1>=${version}_${revision}"
+	short_desc="Kronosnet core switching implementation (development files)"
+	pkg_install() {
+		vmove usr/include/libknet.h
+		vmove usr/lib/libknet.so
+		vmove usr/lib/pkgconfig/libknet.pc
+		vmove "usr/share/man/man3/knet*"
+	}
+}
+
+libnozzle1_package() {
+	short_desc="Userland wrapper around kernel tap devices"
+	pkg_install() {
+		vmove "usr/lib/libnozzle.so.*"
+	}
+}
+
+libnozzle1-devel_package() {
+	depends="libnozzle1>=${version}_${revision}"
+	short_desc="Userland wrapper around kernel tap devices (development files)"
+	pkg_install() {
+		vmove usr/include/libnozzle.h
+		vmove usr/lib/libnozzle.so
+		vmove usr/lib/pkgconfig/libnozzle.pc
+		vmove "usr/share/man/man3/nozzle*"
+	}
+}
diff --git a/srcpkgs/libkomparediff2/template b/srcpkgs/libkomparediff2/template
index 6bce0931217..910c497cfce 100644
--- a/srcpkgs/libkomparediff2/template
+++ b/srcpkgs/libkomparediff2/template
@@ -1,20 +1,16 @@
 # Template file for 'libkomparediff2'
 pkgname=libkomparediff2
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules kcoreaddons"
+hostmakedepends="extra-cmake-modules kcoreaddons qt5-host-tools qt5-qmake"
 makedepends="kparts-devel"
 short_desc="Library to compare files and strings"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://www.kde.org/"
 distfiles="${KDE_SITE}/applications/${version}/src/libkomparediff2-${version}.tar.xz"
-checksum=d86765e6514bdcf838ed36ae5968f9b2b7cb2e74f4fe884ae87f58b9bcc963fe
-
-if [ -n "$CROSS_BUILD" ]; then
-	hostmakedepends+=" python qt5-host-tools qt5-qmake"
-fi
+checksum=c5738f96dbda3d7272ad08ff9518722ae9b7ee737ab7e27c9e88cedb418371d7
 
 libkomparediff2-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libksane/template b/srcpkgs/libksane/template
index ddd0352f5a1..6fde743ddc3 100644
--- a/srcpkgs/libksane/template
+++ b/srcpkgs/libksane/template
@@ -1,6 +1,6 @@
 # Template file for 'libksane'
 pkgname=libksane
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="travankor <travankor@tuta.io>"
 license="LGPL-2.1-or-later"
 homepage="https://www.kde.org/applications/graphics/"
 distfiles="${KDE_SITE}/applications/${version}/src/libksane-${version}.tar.xz"
-checksum=62c670c316a47facbd0beedb0fcc35247fbbd285892a90ab06ebb8f74b8a6329
+checksum=97e05423f4a9205b9db0bbce5111615d6bf8e8d53a391d3398275babccd91aa0
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"
diff --git a/srcpkgs/libkscreen/template b/srcpkgs/libkscreen/template
index f2fe25cf4f5..7680e0cbcf0 100644
--- a/srcpkgs/libkscreen/template
+++ b/srcpkgs/libkscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'libkscreen'
 pkgname=libkscreen
-version=5.16.4
+version=5.17.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/extragear/libs/libkscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=f20f33a2f32b3db39e94ca9d10e240591650357d03c1a2f8eb6c5faa4d1bf723
+checksum=80f72afc9a2409dfe80853c007b596e4c1bcc92bee95741b894646ef3176dd7e
 
 libkscreen-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/libksieve/template b/srcpkgs/libksieve/template
index caaef566ac4..492e9e5f931 100644
--- a/srcpkgs/libksieve/template
+++ b/srcpkgs/libksieve/template
@@ -1,6 +1,6 @@
 # Template file for 'libksieve'
 pkgname=libksieve
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python
@@ -12,7 +12,7 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/applications/${version}/src/libksieve-${version}.tar.xz"
-checksum=48d0925a8dd0adfa6ccd4945b14e2e562b8855faa6bed43de0442a273fd41966
+checksum=5c5bb9182e53a2a928d70985f6dd514c8b308891c4899b942784e80d221318f6
 
 libksieve-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/libksysguard/template b/srcpkgs/libksysguard/template
index 5aad6f6ff5f..a848c5421ca 100644
--- a/srcpkgs/libksysguard/template
+++ b/srcpkgs/libksysguard/template
@@ -1,6 +1,6 @@
 # Template file for 'libksysguard'
 pkgname=libksysguard
-version=5.16.4
+version=5.17.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/plasma/libksysguard"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=b9a8166bf808a54dd80eb8f760047c63989f1f10a9a7f649c8298c9a5031368f
+checksum=87370f4c16ba489e988f39e53015a677b1e30070e79888b07f9826695ec7e9ac
 
 libksysguard-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/liblastfm-qt5/template b/srcpkgs/liblastfm-qt5/template
index 13335612e9f..abb7eacc8d4 100644
--- a/srcpkgs/liblastfm-qt5/template
+++ b/srcpkgs/liblastfm-qt5/template
@@ -1,7 +1,7 @@
 # Template file for 'liblastfm-qt5'
 pkgname=liblastfm-qt5
-version=1.0.9
-revision=4
+version=1.1.0
+revision=1
 wrksrc=${pkgname%-*}-${version}
 build_style=cmake
 makedepends="qt5-devel qt5-plugin-pgsql qt5-plugin-mysql qt5-plugin-sqlite
@@ -11,7 +11,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/lastfm/liblastfm"
 distfiles="https://github.com/lastfm/${pkgname%-*}/archive/${version}.tar.gz"
-checksum=5276b5fe00932479ce6fe370ba3213f3ab842d70a7d55e4bead6e26738425f7b
+checksum=f61f0daa384e081a8f2bd2f7a2148babff22696e5b72ecdac86940a10100b1c8
 
 if [ -n "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel"
diff --git a/srcpkgs/libllvm9 b/srcpkgs/libllvm9
new file mode 120000
index 00000000000..14540d7bad2
--- /dev/null
+++ b/srcpkgs/libllvm9
@@ -0,0 +1 @@
+llvm9
\ No newline at end of file
diff --git a/srcpkgs/libluv-devel b/srcpkgs/libluv-devel
new file mode 120000
index 00000000000..26d5f9b015d
--- /dev/null
+++ b/srcpkgs/libluv-devel
@@ -0,0 +1 @@
+libluv
\ No newline at end of file
diff --git a/srcpkgs/libluv/template b/srcpkgs/libluv/template
new file mode 100644
index 00000000000..9cc67b6d4e0
--- /dev/null
+++ b/srcpkgs/libluv/template
@@ -0,0 +1,37 @@
+# Template file for 'libluv'
+pkgname=libluv
+version=1.30.1.0
+revision=1
+_distver="${version%.*}-${version##*.}"
+wrksrc=luv-${_distver}
+build_style=cmake
+configure_args="-DLUA_BUILD_TYPE=System -DBUILD_MODULE=OFF -DBUILD_SHARED_LIBS=ON"
+makedepends="libuv-devel LuaJIT-devel"
+depends="lua libuv LuaJIT"
+short_desc="Bare libuv bindings for lua"
+maintainer="andry-dev <peketribal2@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/luvit/luv"
+distfiles="https://github.com/luvit/luv/releases/download/${_distver}/luv-${_distver}.tar.gz
+			https://raw.githubusercontent.com/luvit/luv/${_distver}/libluv.pc.in"
+checksum="420fc299f3b25aff55b839e9fe590982f45045b3e53ebeab2449eca7e23a106a
+			be2a4909c724e09a50de42b1caa3c82c1b1afee8b80abf20c6944f1df1c7fd0e"
+skip_extraction="libluv.pc.in"
+
+if [ "$CROSS_BUILD" -a "$XBPS_MACHINE" = "x86_64" ]; then
+	hostmakedepends+=" gcc-multilib"
+fi
+
+post_extract() {
+	cp ${XBPS_SRCDISTDIR}/libluv-${version}/libluv.pc.in ${wrksrc}/libluv.pc.in
+}
+
+libluv-devel_package() {
+	depends="${makedepends} libluv>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/libmatroska/template b/srcpkgs/libmatroska/template
index 8afd80e7084..2af96c75bd6 100644
--- a/srcpkgs/libmatroska/template
+++ b/srcpkgs/libmatroska/template
@@ -6,7 +6,7 @@ build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
 makedepends="libebml-devel"
 short_desc="Extensible open standard Audio/Video container format"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://dl.matroska.org/downloads/libmatroska/"
 distfiles="https://dl.matroska.org/downloads/libmatroska/libmatroska-${version}.tar.xz"
diff --git a/srcpkgs/libmediainfo/template b/srcpkgs/libmediainfo/template
index ab11a9b9815..bbf21cbd5d4 100644
--- a/srcpkgs/libmediainfo/template
+++ b/srcpkgs/libmediainfo/template
@@ -1,6 +1,6 @@
 # Template file for 'libmediainfo'
 pkgname=libmediainfo
-version=19.07
+version=19.09
 revision=1
 wrksrc=MediaInfoLib
 build_wrksrc=Project/GNU/Library
@@ -13,7 +13,7 @@ maintainer="John <johnz@posteo.net>"
 license="BSD-2-Clause"
 homepage="https://mediaarea.net/MediaInfo"
 distfiles="https://mediaarea.net/download/source/libmediainfo/${version}/${pkgname}_${version}.tar.xz"
-checksum=5acbe3f0a48e10cacb588381454f30149c947ffa89659680165ed1a0603d6d4c
+checksum=ff06e1a449dfbe6f2c51f27ae1187d3e72386cb54476fbb189ffaacf845f478e
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/libmicrodns/template b/srcpkgs/libmicrodns/template
index abe44a57a94..efcbce9fd37 100644
--- a/srcpkgs/libmicrodns/template
+++ b/srcpkgs/libmicrodns/template
@@ -1,6 +1,6 @@
 # Template file for 'libmicrodns'
 pkgname=libmicrodns
-version=0.0.10
+version=0.1.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="autoconf automake libtool pkg-config"
@@ -9,7 +9,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="LGPL-2.1-only"
 homepage="https://github.com/videolabs/libmicrodns"
 distfiles="https://github.com/videolabs/libmicrodns/archive/${version}.tar.gz"
-checksum=623e3077bd940816215d9707c217dc8f957d3dee9b7fd3ea7aaa4de0cd881833
+checksum=aa16c9863962f54db991a0176ae75e60b9ab83f63c3b436806682c8a66443444
 
 pre_configure() {
 	./bootstrap
diff --git a/srcpkgs/libmirage/template b/srcpkgs/libmirage/template
index 41b9001ede9..4938bff24cf 100644
--- a/srcpkgs/libmirage/template
+++ b/srcpkgs/libmirage/template
@@ -1,7 +1,7 @@
 # Template file for 'libmirage'
 pkgname=libmirage
-version=3.2.2
-revision=2
+version=3.2.3
+revision=1
 build_style=cmake
 build_helper="gir"
 configure_args="-DPOST_INSTALL_HOOKS=OFF"
@@ -12,7 +12,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://cdemu.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/cdemu/libmirage-${version}.tar.bz2"
-checksum=f1f2d2b1eaa42f2cb1c6edbeefb4c76031c7f2f6de5d71c702117a075474993f
+checksum=ce93d053850936eee981a6ce1484cf85e77aef90241ed29c9e63a0313ddeae22
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/libmpack/template b/srcpkgs/libmpack/template
index d96dd3b358e..8672ebeb54d 100644
--- a/srcpkgs/libmpack/template
+++ b/srcpkgs/libmpack/template
@@ -7,7 +7,7 @@ make_build_args="LIBTOOL=${XBPS_CROSS_BASE}/usr/bin/libtool"
 make_install_args="LIBTOOL=${XBPS_CROSS_BASE}/usr/bin/libtool"
 makedepends="libtool"
 short_desc="Simple implementation of msgpack in C"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MTI"
 homepage="https://github.com/libmpack/libmpack"
 distfiles="https://github.com/libmpack/libmpack/archive/${version}.tar.gz"
diff --git a/srcpkgs/libnftnl/template b/srcpkgs/libnftnl/template
index 688d6be3d48..9c07119c7f1 100644
--- a/srcpkgs/libnftnl/template
+++ b/srcpkgs/libnftnl/template
@@ -1,6 +1,6 @@
 # Template file for 'libnftnl'
 pkgname=libnftnl
-version=1.1.3
+version=1.1.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.netfilter.org/projects/libnftnl/"
 distfiles="https://www.netfilter.org/projects/${pkgname}/files/${pkgname}-${version}.tar.bz2"
-checksum=22dd97d3b06ae8c67499506e2bfd6803ce116479076ec3700e7a4c7cd9fcba0f
+checksum=c8c7988347adf261efac5bba59f8e5f995ffb65f247a88cc144e69620573ed20
 
 libnftnl-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libnl3/patches/musl.patch b/srcpkgs/libnl3/patches/musl.patch
deleted file mode 100644
index 3d4481729ca..00000000000
--- a/srcpkgs/libnl3/patches/musl.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- include/linux-private/linux/ipv6.h	2016-12-10 08:04:32.000000000 -0700
-+++ include/linux-private/linux/ipv6.h	2017-07-03 06:45:50.412094448 -0600
-@@ -2,7 +2,9 @@
- #define _IPV6_H
- 
- #include <asm/byteorder.h>
-+#if defined(__GLIBC__)
- #include <linux/in6.h>
-+#endif
- 
- /* The latest drafts declared increase in minimal mtu up to 1280. */
- 
diff --git a/srcpkgs/libnl3/template b/srcpkgs/libnl3/template
index 0223bca7e16..2530d4f12a7 100644
--- a/srcpkgs/libnl3/template
+++ b/srcpkgs/libnl3/template
@@ -1,6 +1,6 @@
 # Template file for 'libnl3'
 pkgname=libnl3
-version=3.4.0
+version=3.5.0
 revision=1
 wrksrc="libnl-${version}"
 build_style=gnu-configure
@@ -8,11 +8,11 @@ configure_args="--disable-static"
 hostmakedepends="automake flex libtool pkg-config"
 conf_files="/etc/libnl/pktloc /etc/libnl/classid"
 short_desc="Netlink Protocol Library Suite"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
+maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
+license="LGPL-2.1-only"
 homepage="https://github.com/thom311/libnl"
 distfiles="https://github.com/thom311/libnl/releases/download/libnl${version//./_}/libnl-${version}.tar.gz"
-checksum=b7287637ae71c6db6f89e1422c995f0407ff2fe50cecd61a312b6a9b0921f5bf
+checksum=352133ec9545da76f77e70ccb48c9d7e5324d67f6474744647a7ed382b5e05fa
 
 pre_configure() {
 	autoreconf -fi
@@ -28,6 +28,7 @@ libnl3-devel_package() {
 		vmove usr/lib/*.so
 	}
 }
+
 libnl3-progs_package() {
 	short_desc+=" - cli utilities"
 	pkg_install() {
diff --git a/srcpkgs/libnotify/template b/srcpkgs/libnotify/template
index 99ba36df8a0..4f482ae9f82 100644
--- a/srcpkgs/libnotify/template
+++ b/srcpkgs/libnotify/template
@@ -1,23 +1,21 @@
 # Template file for 'libnotify'
 pkgname=libnotify
-version=0.7.8
-revision=1
-build_style=meson
+version=0.7.7
+revision=3
+build_style=gnu-configure
 build_helper="gir"
-configure_args="-Dc_args=-O2 -Dintrospection=$(vopt_if gir enabled disabled)
- -Dgtk_doc=false -Ddocbook_docs=$(vopt_if docbook enabled disabled)"
+configure_args="--disable-static $(vopt_enable gir introspection)"
 hostmakedepends="pkg-config glib-devel"
-makedepends="libglib-devel libpng-devel gdk-pixbuf-devel gtk+3-devel
- $(vopt_if gtk_doc gtk-doc) $(vopt_if docbook 'xmlto docbook-xsl')"
+makedepends="libglib-devel libpng-devel gdk-pixbuf-devel gtk+3-devel"
 short_desc="Desktop notification library"
-maintainer="biopsin <biopsin@yahoo.no>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="http://library.gnome.org/devel/notification-spec/"
 distfiles="${GNOME_SITE}/${pkgname}/0.7/${pkgname}-${version}.tar.xz"
-checksum=69209e0b663776a00c7b6c0e560302a8dbf66b2551d55616304f240bba66e18c
+checksum=9cb4ce315b2655860c524d46b56010874214ec27e854086c1a1d0260137efc04
 
 # Package build options
-build_options="gir docbook"
+build_options="gir"
 build_options_default="gir"
 
 libnotify-devel_package() {
diff --git a/srcpkgs/libnozzle1 b/srcpkgs/libnozzle1
new file mode 120000
index 00000000000..0dca2d60545
--- /dev/null
+++ b/srcpkgs/libnozzle1
@@ -0,0 +1 @@
+libknet1
\ No newline at end of file
diff --git a/srcpkgs/libnozzle1-devel b/srcpkgs/libnozzle1-devel
new file mode 120000
index 00000000000..0dca2d60545
--- /dev/null
+++ b/srcpkgs/libnozzle1-devel
@@ -0,0 +1 @@
+libknet1
\ No newline at end of file
diff --git a/srcpkgs/libogg/template b/srcpkgs/libogg/template
index 5ba98b4258b..ec29abc33c1 100644
--- a/srcpkgs/libogg/template
+++ b/srcpkgs/libogg/template
@@ -1,14 +1,18 @@
-# Template file for 'libogg'.
+# Template file for 'libogg'
 pkgname=libogg
-version=1.3.3
+version=1.3.4
 revision=1
 build_style=gnu-configure
-short_desc="The Ogg bitstream file format library"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD"
+short_desc="Ogg bitstream file format library"
+maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
+license="BSD-3-Clause"
 homepage="http://www.xiph.org/ogg/"
 distfiles="http://downloads.xiph.org/releases/ogg/$pkgname-$version.tar.xz"
-checksum=4f3fc6178a533d392064f14776b23c397ed4b9f48f5de297aba73b643f955c08
+checksum=c163bc12bc300c401b6aa35907ac682671ea376f13ae0969a220f7ddf71893fe
+
+post_install() {
+	vlicense COPYING LICENSE
+}
 
 libogg-devel_package() {
 	depends="libogg>=${version}_${revision}"
diff --git a/srcpkgs/liboping/template b/srcpkgs/liboping/template
index 44b9e705044..8ebdebef50d 100644
--- a/srcpkgs/liboping/template
+++ b/srcpkgs/liboping/template
@@ -1,7 +1,7 @@
 # Template file for 'liboping'
 pkgname=liboping
 version=1.10.0
-revision=6
+revision=7
 build_style=gnu-configure
 hostmakedepends="perl"
 makedepends="ncurses-devel"
@@ -38,7 +38,7 @@ liboping-devel_package() {
 }
 liboping-perl_package() {
 	short_desc+=" - perl bindings"
-	shlib_requires="libperl.so.5.28"
+	shlib_requires="libperl.so.5.30"
 	depends="perl"
 	pkg_install() {
 		vmove usr/share/man/man3/Net::Oping.3p
diff --git a/srcpkgs/libopusenc/template b/srcpkgs/libopusenc/template
index 22970fb9495..cc34301b252 100644
--- a/srcpkgs/libopusenc/template
+++ b/srcpkgs/libopusenc/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="opus-devel"
 short_desc="Library for encoding .opus files"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://git.xiph.org/?p=libopusenc.git"
 distfiles="https://archive.mozilla.org/pub/opus/libopusenc-${version}.tar.gz"
diff --git a/srcpkgs/libosinfo/template b/srcpkgs/libosinfo/template
index d3bc1ab4c9f..afaa912941b 100644
--- a/srcpkgs/libosinfo/template
+++ b/srcpkgs/libosinfo/template
@@ -1,22 +1,22 @@
 # Template file for 'libosinfo'
 pkgname=libosinfo
-version=1.5.0
+version=1.6.0
 revision=1
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-static $(vopt_enable gir introspection)"
 hostmakedepends="glib-devel intltool pkg-config wget
  $(vopt_if vala vala)"
-makedepends="libxslt-devel libglib-devel"
+makedepends="libxslt-devel libglib-devel libsoup-devel"
 depends="osinfo-db"
 checkdepends="libosinfo"
 short_desc="GObject based library API for managing info about operating systems"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://libosinfo.org/"
 changelog="https://gitlab.com/libosinfo/libosinfo/raw/master/NEWS"
 distfiles="https://releases.pagure.org/libosinfo/${pkgname}-${version}.tar.gz"
-checksum=bf692567983478c92bde78d454c18d6196abb032b5a77f430b09a7ef92ec6089
+checksum=3c385c1cceb46301fdc79115e7b28e3df7aa26fafce0a787a60132a86a1990c7
 
 # Package build options
 build_options="gir vala"
diff --git a/srcpkgs/libpcap/patches/fix-musl.patch b/srcpkgs/libpcap/patches/fix-musl.patch
deleted file mode 100644
index 15a0dcad7e4..00000000000
--- a/srcpkgs/libpcap/patches/fix-musl.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- pcap-usb-linux.c
-+++ pcap-usb-linux.c
-@@ -50,6 +50,7 @@
- #include <stdlib.h>
- #include <unistd.h>
- #include <fcntl.h>
-+#include <limits.h>
- #include <string.h>
- #include <dirent.h>
- #include <byteswap.h>
diff --git a/srcpkgs/libpcap/template b/srcpkgs/libpcap/template
index 0f0183ebfe2..e0d42dfa0a1 100644
--- a/srcpkgs/libpcap/template
+++ b/srcpkgs/libpcap/template
@@ -1,6 +1,6 @@
 # Template file for 'libpcap'
 pkgname=libpcap
-version=1.9.0
+version=1.9.1
 revision=1
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-libnl --with-pcap=linux
@@ -9,11 +9,11 @@ hostmakedepends="pkg-config flex"
 makedepends="libnl3-devel $(vopt_if bluetooth libbluetooth-devel)
  $(vopt_if dbus dbus-devel) $(vopt_if usb libusb-devel)"
 short_desc="System-independent interface for user-level packet capture"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="BSD-3-Clause"
 homepage="https://www.tcpdump.org/"
 distfiles="https://www.tcpdump.org/release/${pkgname}-${version}.tar.gz"
-checksum=2edb88808e5913fdaa8e9c1fcaf272e19b2485338742b5074b9fe44d68f37019
+checksum=635237637c5b619bcceba91900666b64d56ecb7be63f298f601ec786ce087094
 
 build_options="bluetooth dbus usb"
 build_options_default="usb"
diff --git a/srcpkgs/libpipeline/template b/srcpkgs/libpipeline/template
index 826a9efe693..b1ffab2d00c 100644
--- a/srcpkgs/libpipeline/template
+++ b/srcpkgs/libpipeline/template
@@ -5,8 +5,8 @@ revision=1
 build_style=gnu-configure
 checkdepends="check-devel pkg-config"
 short_desc="Pipeline manipulation library"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
-license="GPL-3.0-or-alter"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-3.0-or-later"
 homepage="http://libpipeline.nongnu.org/"
 distfiles="https://download-mirror.savannah.gnu.org/releases/libpipeline/libpipeline-${version}.tar.gz"
 checksum=d633706b7d845f08b42bc66ddbe845d57e726bf89298e2cee29f09577e2f902f
diff --git a/srcpkgs/libplacebo/template b/srcpkgs/libplacebo/template
index b1b89537d11..ae932e0f323 100644
--- a/srcpkgs/libplacebo/template
+++ b/srcpkgs/libplacebo/template
@@ -7,7 +7,7 @@ configure_args="-Dvulkan=enabled -Dglslang=enabled -Dshaderc=enabled"
 hostmakedepends="pkg-config"
 makedepends="vulkan-loader glslang-devel shaderc Vulkan-Headers lcms2-devel"
 short_desc="Reusable library for GPU-accelerated video/image rendering"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/haasn/libplacebo"
 distfiles="https://github.com/haasn/libplacebo/archive/v${version}.tar.gz"
diff --git a/srcpkgs/libpsl/template b/srcpkgs/libpsl/template
index f7a3826f97a..cbdd6ba99fd 100644
--- a/srcpkgs/libpsl/template
+++ b/srcpkgs/libpsl/template
@@ -1,11 +1,12 @@
 # Template file for 'libpsl'
 pkgname=libpsl
 version=0.21.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config python"
+makedepends="icu-devel"
 short_desc="Public Suffix List library functions"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://rockdaboot.github.io/libpsl/"
 distfiles="https://github.com/rockdaboot/libpsl/releases/download/libpsl-${version}/libpsl-${version}.tar.gz"
diff --git a/srcpkgs/libpwquality-python3 b/srcpkgs/libpwquality-python3
new file mode 120000
index 00000000000..db26e623f28
--- /dev/null
+++ b/srcpkgs/libpwquality-python3
@@ -0,0 +1 @@
+libpwquality
\ No newline at end of file
diff --git a/srcpkgs/libpwquality/template b/srcpkgs/libpwquality/template
index 3093808c526..e5a656236d7 100644
--- a/srcpkgs/libpwquality/template
+++ b/srcpkgs/libpwquality/template
@@ -1,22 +1,28 @@
 # Template file for 'libpwquality'
 pkgname=libpwquality
-version=1.4.0
+version=1.4.1
 revision=1
 build_style=gnu-configure
-configure_args="--disable-static --enable-pam --disable-python-bindings
- --with-securedir=/usr/lib/security"
+configure_args="--disable-static --enable-pam --with-securedir=/usr/lib/security"
 hostmakedepends="libtool automake gettext-devel"
-makedepends="cracklib-devel pam-devel"
+makedepends="cracklib-devel pam-devel python3-devel"
 conf_files="/etc/security/pwquality.conf"
 short_desc="Library for password quality checking and generating random passwords"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="bra1nwave <brainwave@openmailbox.org>"
+license="GPL-2.0-or-later"
 homepage="https://github.com/libpwquality/libpwquality"
-license="GPL-2"
+changelog="https://raw.githubusercontent.com/libpwquality/libpwquality/master/NEWS"
 distfiles="${homepage}/releases/download/libpwquality-${version}/libpwquality-${version}.tar.bz2"
-checksum=1de6ff046cf2172d265a2cb6f8da439d894f3e4e8157b056c515515232fade6b
+checksum=a97d72b5c56b7e279c6e86dad70c1493ea5796f00a596fb9f3173b96f9bf5e46
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" python3"
+	CFLAGS+=" -I${XBPS_CROSS_BASE}/${py3_inc}"
+fi
 
 pre_configure() {
 	autoreconf -fi
+	vsed -i python/Makefile.am -e 's|CFLAGS=.*|LDSHARED="${CC} -pthread -shared" &|g'
 }
 
 libpwquality-devel_package() {
@@ -26,5 +32,14 @@ libpwquality-devel_package() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
+		vmove usr/share/man/man3
+	}
+}
+
+libpwquality-python3_package() {
+	lib32disabled=yes
+	short_desc+=" - Python3 bindings"
+	pkg_install() {
+		vmove "usr/lib/python3*"
 	}
 }
diff --git a/srcpkgs/libqmatrixclient/template b/srcpkgs/libqmatrixclient/template
index 7b6f01f5b84..cb5854c4d71 100644
--- a/srcpkgs/libqmatrixclient/template
+++ b/srcpkgs/libqmatrixclient/template
@@ -1,17 +1,18 @@
 # Template file for 'libqmatrixclient'
 pkgname=libqmatrixclient
-version=0.5.1.2
+version=0.5.2
 revision=1
+wrksrc="libQuotient-${version}"
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=1 -DQMATRIXCLIENT_INSTALL_EXAMPLE=0"
 hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-devel qt5-multimedia-devel"
-short_desc="Qt5 library to write cross-platfrom clients for Matrix"
+short_desc="Qt5 library to write cross-platform clients for Matrix"
 maintainer="Karol Kosek <krkkx@protonmail.com>"
 license="LGPL-2.1-or-later"
-homepage="https://matrix.org/docs/projects/sdk/libqmatrixclient.html"
-distfiles="https://github.com/QMatrixClient/libqmatrixclient/archive/${version}.tar.gz"
-checksum=c5de2aaef010a1d4d1d81c711bc983366d41c482487c828db3f0e6fa7a6e050d
+homepage="https://matrix.org/docs/projects/sdk/quotient"
+distfiles="https://github.com/quotient-im/libQuotient/archive/${version}.tar.gz"
+checksum=1848bc0af53ce42c2b1a1a4fdeccb054af1f9e0f765cadf609f62727ce23dfd2
 
 libqmatrixclient-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libqtxdg/template b/srcpkgs/libqtxdg/template
index b6efb58ac2e..6e50997334b 100644
--- a/srcpkgs/libqtxdg/template
+++ b/srcpkgs/libqtxdg/template
@@ -1,7 +1,7 @@
 # Template file for 'libqtxdg'
 pkgname=libqtxdg
 version=3.3.1
-revision=2
+revision=3
 build_style=cmake
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools lxqt-build-tools"
 makedepends="qt5-svg-devel"
diff --git a/srcpkgs/libratbag/template b/srcpkgs/libratbag/template
index c1a053d981a..71b280cf705 100644
--- a/srcpkgs/libratbag/template
+++ b/srcpkgs/libratbag/template
@@ -10,7 +10,7 @@ makedepends="elogind-devel eudev-libudev-devel libglib-devel libevdev-devel
  python3-devel"
 depends="dbus python3-evdev python3-gobject"
 short_desc="DBus daemon to configure gaming mice"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/libratbag/libratbag"
 distfiles="https://github.com/libratbag/libratbag/archive/v${version}.tar.gz"
@@ -18,12 +18,6 @@ checksum=d8a9a4b90025456700336c4e84a06edfce8deffeb71779ea22e00c27b0fda244
 
 LDFLAGS="-lm"
 
-case "$XBPS_TARGET_MACHINE" in
-	x86_64*|i686*) ;;
-	*-musl) broken="Requires gobject introspection" ;;
-	* ) ;;
-esac
-
 post_install() {
 	vsv ratbagd
 	vlicense COPYING
diff --git a/srcpkgs/libraw/template b/srcpkgs/libraw/template
index 748ae0111ba..20f1b5e343d 100644
--- a/srcpkgs/libraw/template
+++ b/srcpkgs/libraw/template
@@ -1,6 +1,6 @@
 # Template file for 'libraw'
 pkgname=libraw
-version=0.19.3
+version=0.19.5
 revision=1
 wrksrc="LibRaw-${version}"
 build_style=gnu-configure
@@ -12,7 +12,7 @@ license="LGPL-2.1-only, CDDL-1.0"
 homepage="https://www.libraw.org"
 changelog="https://github.com/LibRaw/LibRaw/raw/${version%.*}-stable/Changelog.txt"
 distfiles="https://www.libraw.org/data/LibRaw-${version}.tar.gz"
-checksum=fd96d6188b8539e0724c89cfa9de392eb28ea71db117ef0661846d76cdc24177
+checksum=40a262d7cc71702711a0faec106118ee004f86c86cc228281d12d16da03e02f5
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/librdkafka/template b/srcpkgs/librdkafka/template
index fafd4daab4f..e38a6fa505e 100644
--- a/srcpkgs/librdkafka/template
+++ b/srcpkgs/librdkafka/template
@@ -1,6 +1,6 @@
 # Template file for 'librdkafka'
 pkgname=librdkafka
-version=1.1.0
+version=1.2.0
 revision=1
 build_style=configure
 configure_args="--prefix=/usr"
@@ -10,7 +10,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/edenhill/librdkafka"
 distfiles="https://github.com/edenhill/librdkafka/archive/v${version}.tar.gz"
-checksum=123b47404c16bcde194b4bd1221c21fdce832ad12912bd8074f88f64b2b86f2b
+checksum=eedde1c96104e4ac2d22a4230e34f35dd60d53976ae2563e3dd7c27190a96859
 
 librdkafka-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 7973ff6974d..6e8685ac0fd 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -254,6 +254,11 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 esac
 
+case "$XBPS_TARGET_MACHINE" in
+	ppc64*) ;;
+	ppc*) makedepends+=" libatomic-devel";;
+esac
+
 CXXFLAGS+=" -DGLM_ENABLE_EXPERIMENTAL -DU_USING_ICU_NAMESPACE=1"
 
 # Move files listed in a <name>_list.txt into $PKGDESTDIR
diff --git a/srcpkgs/librime/template b/srcpkgs/librime/template
index e3fbd400460..540bcfb4e98 100644
--- a/srcpkgs/librime/template
+++ b/srcpkgs/librime/template
@@ -1,6 +1,6 @@
 # Template file for 'librime'
 pkgname=librime
-version=1.4.0
+version=1.5.3
 revision=1
 build_style=cmake
 configure_args="-DENABLE_LOGGING=OFF -DBUILD_TEST=OFF"
@@ -10,7 +10,7 @@ maintainer="Yuxuan Shui <yshuiv7@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/rime/librime"
 distfiles="https://github.com/rime/librime/archive/${version}.tar.gz"
-checksum=26963d9d8b0024ba8d53acbe02d6456d60a8ec506717383995699e0c0063d456
+checksum=df4279df6bc0419c18d9325e7d76dfdab8f91f0ee00a954f19a27f66dd99f503
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/libsass/template b/srcpkgs/libsass/template
index a49c4268253..da214bca923 100644
--- a/srcpkgs/libsass/template
+++ b/srcpkgs/libsass/template
@@ -1,7 +1,8 @@
 # Template file for 'libsass'
 pkgname=libsass
+reverts="3.6.2_1"
 version=3.6.1
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool"
 short_desc="C implementation of Sass CSS preprocessor"
diff --git a/srcpkgs/libsidplayfp/template b/srcpkgs/libsidplayfp/template
index b75d0846a12..c7e831ec584 100644
--- a/srcpkgs/libsidplayfp/template
+++ b/srcpkgs/libsidplayfp/template
@@ -1,6 +1,6 @@
 # Template file for 'libsidplayfp'
 pkgname=libsidplayfp
-version=2.0.0
+version=2.0.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="autoconf"
@@ -9,7 +9,7 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"
 homepage="https://sourceforge.net/projects/sidplay-residfp/"
 distfiles="${SOURCEFORGE_SITE}/sidplay-residfp/${pkgname}/${version%.*}/${pkgname}-${version}.tar.gz"
-checksum=94a2d9f80e71ac1c8328e38ae675e0a0f3806a8ede80510ffa22e16b07045f51
+checksum=7655218ce256694a3b14eeba939d4f2b61bbe0d6a94ebe4ad185b85b13b6989b
 
 libsidplayfp-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/libsigsegv/patches/ppc-musl.patch b/srcpkgs/libsigsegv/patches/ppc-musl.patch
new file mode 100644
index 00000000000..fa04a36f2e7
--- /dev/null
+++ b/srcpkgs/libsigsegv/patches/ppc-musl.patch
@@ -0,0 +1,16 @@
+This fixes build on 32-bit ppc with musl.
+
+--- src/fault-linux-powerpc.h
++++ src/fault-linux-powerpc.h
+@@ -29,9 +29,8 @@
+ #if defined(__powerpc64__) || defined(_ARCH_PPC64) /* 64-bit */
+ # define SIGSEGV_FAULT_STACKPOINTER  ((ucontext_t *) ucp)->uc_mcontext.gp_regs[1]
+ #else /* 32-bit */
+-/* both should be equivalent */
+-# if 0
+-#  define SIGSEGV_FAULT_STACKPOINTER  ((ucontext_t *) ucp)->uc_mcontext.regs->gpr[1]
++# if !defined(__GLIBC__)
++#  define SIGSEGV_FAULT_STACKPOINTER  ((ucontext_t *) ucp)->uc_regs->gregs[1]
+ # else
+ #  define SIGSEGV_FAULT_STACKPOINTER  ((ucontext_t *) ucp)->uc_mcontext.uc_regs->gregs[1]
+ # endif
diff --git a/srcpkgs/libsmbios/template b/srcpkgs/libsmbios/template
index 642a40c867b..31d8ffda65f 100644
--- a/srcpkgs/libsmbios/template
+++ b/srcpkgs/libsmbios/template
@@ -8,7 +8,7 @@ hostmakedepends="automake doxygen gettext-devel help2man libtool pkg-config"
 makedepends="libxml2-devel python3-devel"
 checkdepends="python3"
 short_desc="Library for SMBIOS access"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, OLS-2.1"
 homepage="https://github.com/dell/libsmbios"
 distfiles="https://github.com/dell/libsmbios/archive/v${version}.tar.gz"
diff --git a/srcpkgs/libtickit/template b/srcpkgs/libtickit/template
index c4fb3dd6588..fe57eb13541 100644
--- a/srcpkgs/libtickit/template
+++ b/srcpkgs/libtickit/template
@@ -10,7 +10,7 @@ hostmakedepends="pkg-config"
 makedepends="unibilium-devel libtermkey-devel libtool"
 checkdepends="perl"
 short_desc="Library for building interactive full-screen terminal programs"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://www.leonerd.org.uk/code/libtickit/"
 distfiles="http://www.leonerd.org.uk/code/libtickit/libtickit-${version}.tar.gz"
diff --git a/srcpkgs/libu2f-host/template b/srcpkgs/libu2f-host/template
index f14e04b8ba3..0942b9d03d8 100644
--- a/srcpkgs/libu2f-host/template
+++ b/srcpkgs/libu2f-host/template
@@ -1,7 +1,7 @@
 # Template file for 'libu2f-host'
 pkgname=libu2f-host
-version=1.1.9
-revision=2
+version=1.1.10
+revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl=yes --with-udevrulesdir=/usr/lib/udev/rules.d"
@@ -9,11 +9,11 @@ hostmakedepends="automake gengetopt libtool pkg-config"
 makedepends="hidapi-devel json-c-devel libressl-devel"
 short_desc="C library and tool that implements the host-side of the U2F protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1-or-later, GPL-3-or-later"
+license="LGPL-2.1-or-later, GPL-3.0-or-later"
 homepage="https://developers.yubico.com/libu2f-host/"
 #changelog="https://raw.githubusercontent.com/Yubico/libu2f-host/master/NEWS"
 distfiles="https://github.com/Yubico/libu2f-host/archive/libu2f-host-${version}.tar.gz"
-checksum=f2d9ac7d0bb448d213a81aa3c2e97ae48b277144040c74b5c4f33d871338e93c
+checksum=45937c6c04349f865d9f047d3a68cc50ea24e9085d18ac2c7d31fa38eb749303
 conf_files="/usr/lib/udev/rules.d/70-u2f.rules"
 
 pre_configure() {
@@ -21,7 +21,7 @@ pre_configure() {
 }
 
 post_install() {
-	vsed -e 's:TAG+="uaccess":TAG+="uaccess", MODE="0660", GROUP="users":' \
+	vsed -e 's:GROUP="plugdev":GROUP="users":' \
 		 -i ${DESTDIR}/usr/lib/udev/rules.d/70-u2f.rules
 }
 
diff --git a/srcpkgs/liburcu/template b/srcpkgs/liburcu/template
index 39f6ae05fd5..cad447027e1 100644
--- a/srcpkgs/liburcu/template
+++ b/srcpkgs/liburcu/template
@@ -1,6 +1,6 @@
 # Template file for 'liburcu'
 pkgname=liburcu
-version=0.10.2
+version=0.11.1
 revision=1
 wrksrc="userspace-rcu-${version}"
 build_style=gnu-configure
@@ -10,7 +10,7 @@ maintainer="Simon Thoby <simonthoby@live.fr>"
 license="LGPL-2.1-or-later"
 homepage="https://liburcu.org"
 distfiles="https://www.lttng.org/files/urcu/userspace-rcu-${version}.tar.bz2"
-checksum=b3f6888daf6fe02c1f8097f4a0898e41b5fe9975e121dc792b9ddef4b17261cc
+checksum=92b9971bf3f1c443edd6c09e7bf5ff3b43531e778841f16377a812c8feeb3350
 
 liburcu-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/liburing-devel b/srcpkgs/liburing-devel
new file mode 120000
index 00000000000..84e26155468
--- /dev/null
+++ b/srcpkgs/liburing-devel
@@ -0,0 +1 @@
+liburing
\ No newline at end of file
diff --git a/srcpkgs/liburing/template b/srcpkgs/liburing/template
new file mode 100644
index 00000000000..061f29d1525
--- /dev/null
+++ b/srcpkgs/liburing/template
@@ -0,0 +1,25 @@
+# Template file for 'liburing'
+pkgname=liburing
+version=0.1
+revision=1
+archs="i686* x86_64*"
+build_style=configure
+configure_args="--mandir=/usr/share/man"
+short_desc="Linux-native io_uring I/O access library"
+maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
+license="LGPL-2.1-only"
+homepage="http://git.kernel.dk/cgit/liburing/"
+distfiles="${homepage}/snapshot/${pkgname}-${version}.tar.xz"
+checksum=a018ca58d38d5d4b544bfaa539f8dba60ed30e74ffae91ffbc8bea70d304fc5e
+
+liburing-devel_package() {
+	short_desc+=" - development files"
+	depends="liburing-${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove usr/share/man
+	}
+}
diff --git a/srcpkgs/libuv/template b/srcpkgs/libuv/template
index b3e8d99a126..80b3c0fb6d9 100644
--- a/srcpkgs/libuv/template
+++ b/srcpkgs/libuv/template
@@ -1,6 +1,6 @@
 # Template file for 'libuv'
 pkgname=libuv
-version=1.31.0
+version=1.32.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
@@ -10,7 +10,7 @@ license="MIT, CC-BY-SA-4.0"
 homepage="https://libuv.org/"
 changelog="https://raw.githubusercontent.com/libuv/libuv/v1.x/ChangeLog"
 distfiles="https://github.com/libuv/libuv/archive/v${version}.tar.gz"
-checksum=ab041ea5d1965a33d4e03ea87718b8922ba4e54abb46c71cf9e040edef2556c0
+checksum=c9818f38eee79d4e56f3ae55320d207ab183c5d4aff0fb148b5d6f5702f371cd
 
 LDFLAGS="-pthread"
 
diff --git a/srcpkgs/libva/template b/srcpkgs/libva/template
index 9e38a090ece..dec3914117d 100644
--- a/srcpkgs/libva/template
+++ b/srcpkgs/libva/template
@@ -3,9 +3,11 @@ pkgname=libva
 version=2.5.0
 revision=1
 build_style=meson
-configure_args="-Dwith_glx=no -Dwith_wayland=yes -Dwith_egl=yes"
-hostmakedepends="pkg-config wayland-devel"
-makedepends="libXfixes-devel libXext-devel libdrm-devel wayland-devel"
+configure_args="-Dwith_glx=no $(vopt_if wayland -Dwith_wayland=yes)
+ -Dwith_egl=yes"
+hostmakedepends="pkg-config $(vopt_if wayland wayland-devel)"
+makedepends="libXfixes-devel libXext-devel libdrm-devel
+ $(vopt_if wayland wayland-devel)"
 short_desc="Video Acceleration (VA) API"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
@@ -14,12 +16,15 @@ changelog="https://raw.githubusercontent.com/intel/libva/master/NEWS"
 distfiles="https://github.com/intel/libva/archive/${version}.tar.gz"
 checksum=9b6264dade6b6d3edb59c6c4f3c9217d1d5a195635fc07da875d565f58624418
 
+build_options="wayland"
+build_options_default="wayland"
+
 post_install() {
 	vlicense COPYING
 }
 
 libva-devel_package() {
-	depends="wayland-devel ${sourcepkg}>=${version}_${revision}"
+	depends="$(vopt_if wayland wayland-devel) ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
diff --git a/srcpkgs/libvarnishapi b/srcpkgs/libvarnishapi
new file mode 120000
index 00000000000..1605f8f84bb
--- /dev/null
+++ b/srcpkgs/libvarnishapi
@@ -0,0 +1 @@
+varnish
\ No newline at end of file
diff --git a/srcpkgs/libvarnishapi-devel b/srcpkgs/libvarnishapi-devel
new file mode 120000
index 00000000000..1605f8f84bb
--- /dev/null
+++ b/srcpkgs/libvarnishapi-devel
@@ -0,0 +1 @@
+varnish
\ No newline at end of file
diff --git a/srcpkgs/libversion/template b/srcpkgs/libversion/template
index f2453f4486a..5a2bb2d33c8 100644
--- a/srcpkgs/libversion/template
+++ b/srcpkgs/libversion/template
@@ -1,14 +1,14 @@
 # Template file for 'libversion'
 pkgname=libversion
-version=2.9.0
+version=3.0.0
 revision=1
 build_style=cmake
 short_desc="Advanced version string comparison library"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/repology/libversion"
 distfiles="https://github.com/repology/libversion/archive/${version}.tar.gz"
-checksum=ab95e62759a53c2ea2428b39d2e864589f64137c1150f56d166a4754b34736ea
+checksum=e7e576de4044dd186f642132ee3fec5392d909f69fc8e26590f4c372f92adee0
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/libvirt-python/template b/srcpkgs/libvirt-python/template
index bfdf3e351a1..a2f0e038166 100644
--- a/srcpkgs/libvirt-python/template
+++ b/srcpkgs/libvirt-python/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt-python'
 pkgname=libvirt-python
-version=5.6.0
+version=5.8.0
 revision=1
 build_style=python-module
 pycompile_module="libvirt.py libvirt_lxc.py libvirt_qemu.py"
@@ -10,8 +10,8 @@ short_desc="Libvirt virtualization API Python2 binding"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://pypi.org/project/libvirt-python/"
-distfiles="${PYPI_SITE}/l/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=4df13fed9528a7eec153ab70196dcd481f6377ae5bf9ef84e07dfa1515202486
+distfiles="https://libvirt.org/sources/python/libvirt-python-${version}.tar.gz"
+checksum=4617fa535364a155425dc99f639b3a0fe9f703eb36feb56b3917b5443a1ddf4f
 
 libvirt-python3_package() {
 	short_desc="${short_desc/Python2/Python3}"
diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template
index be48c124409..4468112a048 100644
--- a/srcpkgs/libvirt/template
+++ b/srcpkgs/libvirt/template
@@ -1,7 +1,7 @@
 # Template file for 'libvirt'
 pkgname=libvirt
-version=5.6.0
-revision=1
+version=5.8.0
+revision=2
 build_style=gnu-configure
 configure_args="--without-hal --with-storage-lvm --with-qemu
  --with-qemu-user=libvirt --with-qemu-group=libvirt --without-netcf
@@ -13,19 +13,19 @@ license="LGPL-2.1-or-later"
 homepage="https://libvirt.org"
 changelog="https://libvirt.org/news.html"
 distfiles="https://libvirt.org/sources/${pkgname}-${version}.tar.xz"
-checksum=65f4f9924e10135aa694ca8bcb0b55725883d08e0b32c42111603d573aabb9b4
+checksum=e23328289b18bdedc1e966f6c26402b2983149c660ed8bd52cda6feab0c20c55
 
 # FIX https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=701649
 system_accounts="libvirt"
 libvirt_groups="disk,kvm"
 
 hostmakedepends="automake libtool perl pkg-config lvm2 parted gettext-devel
- iptables libxslt docbook-xsl dnsmasq python"
+ iptables libxslt docbook-xsl dnsmasq python3"
 makedepends="readline-devel libcap-ng-devel libnl3-devel attr-devel
  gnutls-devel libsasl-devel libcurl-devel libpcap-devel libxml2-devel
  libparted-devel device-mapper-devel dbus-devel eudev-libudev-devel libblkid-devel
  libpciaccess-devel avahi-libs-devel polkit-devel yajl-devel jansson-devel
- python-devel libssh2-devel fuse-devel libtirpc-devel
+ python3-devel libssh2-devel fuse-devel libtirpc-devel
  libapparmor-devel"
 depends="iptables dnsmasq"
 
@@ -56,6 +56,7 @@ make_dirs="
 pre_configure() {
 	autoreconf -fi
 }
+
 post_install() {
 	# runit services
 	vsv libvirtd
@@ -65,6 +66,12 @@ post_install() {
 	rm -rf ${DESTDIR}/etc/sysconfig
 	# Remove unused stuff.
 	rm -rf ${DESTDIR}/var/log
+
+	# workaround for musl not providing an utmpx implementation
+	if [ "$XBPS_TARGET_LIBC" = "musl" ];
+	then
+		echo "remember_owner = 0" >> ${DESTDIR}/etc/libvirt/qemu.conf
+	fi
 }
 
 libvirt-devel_package() {
@@ -74,6 +81,6 @@ libvirt-devel_package() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
-		vmove usr/share/gtk-doc
+		vmove usr/share/doc
 	}
 }
diff --git a/srcpkgs/libvoikko/template b/srcpkgs/libvoikko/template
index 1ad274550fc..8d21b0f9c71 100644
--- a/srcpkgs/libvoikko/template
+++ b/srcpkgs/libvoikko/template
@@ -7,7 +7,7 @@ configure_args="--enable-hfst=false --with-dictionary-path=/usr/share/voikko"
 pycompile_module="libvoikko.py"
 hostmakedepends="python3"
 short_desc="Free linguistic software and data for Finnish"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://voikko.puimula.org/"
 distfiles="https://www.puimula.org/voikko-sources/libvoikko/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/libvpx5/template b/srcpkgs/libvpx5/template
index 9aae59228ea..d6ce843134a 100644
--- a/srcpkgs/libvpx5/template
+++ b/srcpkgs/libvpx5/template
@@ -20,6 +20,12 @@ do_configure() {
 			armv7*) _cross="--target=armv7-linux-gcc";;
 			*) _cross="--target=generic-gnu";;
 		esac
+	else
+		# ppc32 is not a supported config, force generic-gnu
+		case "$XBPS_TARGET_MACHINE" in
+			ppc64*) ;;
+			ppc*) _cross="--target=generic-gnu";;
+		esac
 	fi
 	CFLAGS+=" -fPIC"
 
diff --git a/srcpkgs/libvterm/template b/srcpkgs/libvterm/template
index 33cd7b58192..c203793c157 100644
--- a/srcpkgs/libvterm/template
+++ b/srcpkgs/libvterm/template
@@ -1,9 +1,7 @@
 # Template file for 'libvterm'
 pkgname=libvterm
-version=0.0.20151229
-revision=2
-_commit=04c0777b139cfbddb057c0cbfc007677dd9f1b4f
-wrksrc="${pkgname}-${_commit}"
+version=0.1.1
+revision=1
 build_style=gnu-makefile
 make_install_target="install-lib install-inc"
 hostmakedepends="libtool perl pkg-config"
@@ -11,8 +9,8 @@ short_desc="Abstract VT220/xterm/ECMA-48 emulation library"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="MIT"
 homepage="http://www.leonerd.org.uk/code/libvterm"
-distfiles="https://github.com/neovim/${pkgname}/archive/${_commit}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=01a28630fd46fa78b8c05e6caecc9139ef43bc40ff9f225e634326265dfcd4f4
+distfiles="https://launchpad.net/libvterm/trunk/v${version%.*}/+download/libvterm-${version}.tar.gz"
+checksum=9bb88e7c67ea0ac5a0f8d1df3f432d3865e5ff36a778e9a2b34a58aba857b5d8
 
 post_extract() {
 	if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/libwaylandpp/template b/srcpkgs/libwaylandpp/template
index 476c1e1eba8..4aba7b67e68 100644
--- a/srcpkgs/libwaylandpp/template
+++ b/srcpkgs/libwaylandpp/template
@@ -10,7 +10,7 @@ configure_args="-DBUILD_SCANNER=TRUE -DBUILD_LIBRARIES=TRUE
 hostmakedepends="pkg-config doxygen graphviz"
 makedepends="wayland-devel MesaLib-devel pugixml-devel"
 short_desc="Wayland C++ bindings"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/NilsBrause/waylandpp"
 distfiles="https://github.com/NilsBrause/waylandpp/archive/${version}.tar.gz"
diff --git a/srcpkgs/libwebp/template b/srcpkgs/libwebp/template
index e84fd5f7fc9..a8ff2161763 100644
--- a/srcpkgs/libwebp/template
+++ b/srcpkgs/libwebp/template
@@ -8,7 +8,7 @@ configure_args="--disable-static --enable-libwebpmux
 hostmakedepends="pkg-config"
 makedepends="giflib-devel libfreeglut-devel libpng-devel tiff-devel"
 short_desc="WebP image format"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://developers.google.com/speed/webp/"
 distfiles="http://downloads.webmproject.org/releases/webp/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/libxcb/template b/srcpkgs/libxcb/template
index 2a4ea6fb572..8e82e0588b3 100644
--- a/srcpkgs/libxcb/template
+++ b/srcpkgs/libxcb/template
@@ -7,7 +7,7 @@ configure_args="--disable-build-docs --disable-static --enable-xinput --enable-x
 hostmakedepends="automake libtool pkg-config xorg-util-macros xcb-proto"
 makedepends="xcb-proto libXdmcp-devel libXau-devel"
 short_desc="X protocol C-language Binding"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://xcb.freedesktop.org"
 distfiles="${homepage}/dist/${pkgname}-${version}.tar.bz2"
diff --git a/srcpkgs/libxfce4panel b/srcpkgs/libxfce4panel
new file mode 120000
index 00000000000..36ca0abaa74
--- /dev/null
+++ b/srcpkgs/libxfce4panel
@@ -0,0 +1 @@
+xfce4-panel
\ No newline at end of file
diff --git a/srcpkgs/libxkbcommon/template b/srcpkgs/libxkbcommon/template
index 3e7ea0c7d75..332834bbe6c 100644
--- a/srcpkgs/libxkbcommon/template
+++ b/srcpkgs/libxkbcommon/template
@@ -9,7 +9,7 @@ hostmakedepends="pkg-config bison wayland-protocols"
 makedepends="xkeyboard-config libxcb-devel wayland-devel"
 depends="xkeyboard-config"
 short_desc="Library to handle keyboard descriptions"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://xkbcommon.org/"
 distfiles="https://github.com/xkbcommon/libxkbcommon/archive/xkbcommon-${version}.tar.gz"
diff --git a/srcpkgs/libxmlb/template b/srcpkgs/libxmlb/template
index 544f2c54efe..0abddd71a4d 100644
--- a/srcpkgs/libxmlb/template
+++ b/srcpkgs/libxmlb/template
@@ -9,7 +9,7 @@ configure_args="-Dgtkdoc=false -Dtests=false -Dstemmer=false
 hostmakedepends="pkg-config python3"
 makedepends="libglib-devel libuuid-devel"
 short_desc="Library to help create and query binary XML blobs"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/hughsie/libxmlb"
 distfiles="https://github.com/hughsie/libxmlb/archive/${version}.tar.gz"
diff --git a/srcpkgs/libxo/template b/srcpkgs/libxo/template
index cd7baa252aa..a19ed2c80ed 100644
--- a/srcpkgs/libxo/template
+++ b/srcpkgs/libxo/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
 short_desc="Library for programs to output XML, JSON and HTML"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://juniper.github.io/libxo/libxo-manual.html"
 distfiles="https://github.com/Juniper/libxo/releases/download/${version}/libxo-${version}.tar.gz"
diff --git a/srcpkgs/libyaml/template b/srcpkgs/libyaml/template
index 291c57a7b1f..c5cc5a672f6 100644
--- a/srcpkgs/libyaml/template
+++ b/srcpkgs/libyaml/template
@@ -5,7 +5,7 @@ revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool"
 short_desc="Fast YAML 1.1 parser and emitter library"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://pyyaml.org/wiki/LibYAML"
 distfiles="https://github.com/yaml/libyaml/archive/${version}.tar.gz"
diff --git a/srcpkgs/libzim/template b/srcpkgs/libzim/template
index 3cba5ebd729..dd93ba5a4bd 100644
--- a/srcpkgs/libzim/template
+++ b/srcpkgs/libzim/template
@@ -1,6 +1,6 @@
 # Template file for 'libzim'
 pkgname=libzim
-version=5.0.2
+version=6.0.2
 revision=1
 build_style=meson
 hostmakedepends="pkg-config git"
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.openzim.org/wiki/OpenZIM"
 changelog="https://github.com/openzim/libzim/blob/${version}/ChangeLog"
 distfiles="https://github.com/openzim/libzim/archive/${version}.tar.gz"
-checksum=f6106515950433491bd1981abce0c565e86ec70c32b3afdb286a6cb8b8c120e8
+checksum=993b6885b18e54b3df1493895e61f05e525d846f17d0d3cea57fb74f6415b457
 replaces="libzim-tools>=0"
 
 build_options="zlib xapian"
diff --git a/srcpkgs/libzip/template b/srcpkgs/libzip/template
index 1bdca94a900..d2acb87c54f 100644
--- a/srcpkgs/libzip/template
+++ b/srcpkgs/libzip/template
@@ -6,7 +6,7 @@ build_style=cmake
 hostmakedepends="perl groff"
 makedepends="bzip2-devel libressl-devel zlib-devel"
 short_desc="C library for reading, creating, and modifying zip archives"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://libzip.org/"
 distfiles="https://libzip.org/download/libzip-${version}.tar.gz"
diff --git a/srcpkgs/licensechecker/template b/srcpkgs/licensechecker/template
index 83a5089ba49..ec09ba9751f 100644
--- a/srcpkgs/licensechecker/template
+++ b/srcpkgs/licensechecker/template
@@ -7,7 +7,7 @@ build_style=go
 go_import_path=github.com/boyter/lc
 hostmakedepends="git"
 short_desc="Identify software licenses used on a source tree"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/boyter/lc"
 distfiles="https://github.com/boyter/lc/archive/v${version}.tar.gz"
diff --git a/srcpkgs/licensor/template b/srcpkgs/licensor/template
new file mode 100644
index 00000000000..44335c296eb
--- /dev/null
+++ b/srcpkgs/licensor/template
@@ -0,0 +1,15 @@
+# Template file for 'licensor'
+pkgname=licensor
+version=2.0.0
+revision=1
+build_style=cargo
+short_desc="Write licenses to stdout"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="MIT"
+homepage="https://github.com/raftario/licensor"
+distfiles="https://github.com/raftario/licensor/archive/v${version}.tar.gz"
+checksum=9c9b93ac68bd48f62ab31079acd131b71ff96a0a60caf2811bf2670e016fdd1f
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/lightsoff/template b/srcpkgs/lightsoff/template
index 8b74964142c..a817b4185dc 100644
--- a/srcpkgs/lightsoff/template
+++ b/srcpkgs/lightsoff/template
@@ -1,7 +1,7 @@
 # Template file for 'lightsoff'
 pkgname=lightsoff
-version=3.32.0
-revision=2
+version=3.34.0
+revision=1
 build_style=meson
 hostmakedepends="glib-devel itstool pkg-config vala"
 makedepends="clutter-gtk-devel librsvg-devel"
@@ -10,4 +10,4 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Lightsoff"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2e699608163cedcafbf2ea7962ed16a26b7be5b11142da1fa8d6faa4e58a836d
+checksum=daba8cd7950f4258105ebb78c7764f31de479cd205533596ca266c274c02d8fb
diff --git a/srcpkgs/lightzone/template b/srcpkgs/lightzone/template
index 05444b796aa..b1ae0abe33a 100644
--- a/srcpkgs/lightzone/template
+++ b/srcpkgs/lightzone/template
@@ -11,7 +11,7 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="BSD-3-clause"
 homepage="http://www.lightzoneproject.org/"
 distfiles="https://github.com/ktgw0316/LightZone/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=b8e022bc565acdd91ca617cf38098109c9a33febc45641aaf55be7458761a21a
+checksum=b7400ccee7554bc563b47c02af28a0abd4840efa6502984fd83b18bfd337e0f6
 nocross="Cross building dcraw_lz is not supported"
 # JNI binaries are not PIE
 nopie=yes
diff --git a/srcpkgs/links-x11/template b/srcpkgs/links-x11/template
index aee66abbb0d..c5b95549301 100644
--- a/srcpkgs/links-x11/template
+++ b/srcpkgs/links-x11/template
@@ -1,7 +1,7 @@
 # Template file for 'links-x11'
 pkgname=links-x11
-version=2.19
-revision=2
+version=2.20.2
+revision=1
 wrksrc="${pkgname%-x11}-${version}"
 build_style=gnu-configure
 configure_args="--with-ssl --enable-graphics --enable-x"
@@ -13,7 +13,7 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
 license="GPL-2.0-or-later"
 homepage="http://links.twibright.com/"
 distfiles="http://links.twibright.com/download/links-${version}.tar.bz2"
-checksum=70758c7dd9bb70f045407900e0a90f1114947fce832c2f9bdefd5c0158089a0a
+checksum=4b4f07d0e6261118d1365a5a5bfa31e1eafdbd280cfae6f0e9eedfea51a2f424
 conflicts="links"
 
 post_install() {
diff --git a/srcpkgs/links/template b/srcpkgs/links/template
index 06e2249ac96..078442df00f 100644
--- a/srcpkgs/links/template
+++ b/srcpkgs/links/template
@@ -1,7 +1,7 @@
 # Template file for 'links'
 pkgname=links
-version=2.19
-revision=2
+version=2.20.2
+revision=1
 build_style=gnu-configure
 configure_args="--with-ssl --enable-graphics"
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://links.twibright.com/"
 distfiles="http://links.twibright.com/download/links-${version}.tar.bz2"
-checksum=70758c7dd9bb70f045407900e0a90f1114947fce832c2f9bdefd5c0158089a0a
+checksum=4b4f07d0e6261118d1365a5a5bfa31e1eafdbd280cfae6f0e9eedfea51a2f424
 
 post_install() {
 	mkdir -p ${DESTDIR}/usr/share/doc/
diff --git a/srcpkgs/linux-driver-management/template b/srcpkgs/linux-driver-management/template
index d712ca0f834..b110b1d1c3b 100644
--- a/srcpkgs/linux-driver-management/template
+++ b/srcpkgs/linux-driver-management/template
@@ -12,7 +12,7 @@ makedepends="libusb-devel libglib-devel eudev-libudev-devel libgirepository-deve
  xorg-server-devel libkmod-devel gobject-introspection"
 checkdepends="check-devel"
 short_desc="Distro agnostic Plug'n'Play system for Linux"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1"
 homepage="https://github.com/solus-project/linux-driver-management"
 distfiles="https://github.com/solus-project/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/linux-firmware/template b/srcpkgs/linux-firmware/template
index b342b3de9f9..85fa4950879 100644
--- a/srcpkgs/linux-firmware/template
+++ b/srcpkgs/linux-firmware/template
@@ -1,8 +1,8 @@
 # Template file for 'linux-firmware'
 pkgname=linux-firmware
-version=20190717
+version=20190923
 revision=1
-_githash=bf13a71b18af229b4c900b321ef1f8443028ded8
+_githash=417a9c6e197a8d3eec792494efc87a2b42f76324
 archs=noarch
 wrksrc="${pkgname}-${_githash}"
 depends="${pkgname}-amd-${version}_${revision} ${pkgname}-network-${version}_${revision}"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="See /usr/share/licenses/${pkgname}"
 homepage="https://www.kernel.org/"
 distfiles="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/${pkgname}-${_githash}.tar.gz"
-checksum=306b4cbd4237d2cf013e27923df2b721d5d570882a6bf27782c03429be244887
+checksum=42960270d2523266c1ae7bc27d093e94fa5c262b07a2ee5bb7900aff3a41b6b3
 
 do_install() {
 	vmkdir usr/lib/firmware
@@ -72,5 +72,6 @@ linux-firmware-network_package() {
 		vmove usr/lib/firmware/mrvl
 		vmove usr/lib/firmware/ueagle-atm
 		vmove usr/lib/firmware/ti-connectivity
+		vmove usr/lib/firmware/dpaa2
 	}
 }
diff --git a/srcpkgs/linux-tools/patches/musl.patch b/srcpkgs/linux-tools/patches/musl.patch
index 740607a8f7e..d43f29ae2ed 100644
--- a/srcpkgs/linux-tools/patches/musl.patch
+++ b/srcpkgs/linux-tools/patches/musl.patch
@@ -10,10 +10,11 @@
  #include <asm/byteorder.h>
 --- tools/power/x86/turbostat/turbostat.c.orig
 +++ tools/power/x86/turbostat/turbostat.c
-@@ -43,6 +43,7 @@
+@@ -43,7 +43,8 @@
  #include <cpuid.h>
  #include <linux/capability.h>
  #include <errno.h>
+ #include <math.h>
 +#include <limits.h>
  
  char *proc_stat = "/proc/stat";
diff --git a/srcpkgs/linux-tools/patches/turbostat.patch b/srcpkgs/linux-tools/patches/turbostat.patch
deleted file mode 100644
index a060eaa1cd7..00000000000
--- a/srcpkgs/linux-tools/patches/turbostat.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- tools/power/x86/turbostat/Makefile.orig
-+++ tools/power/x86/turbostat/Makefile
-@@ -8,13 +8,13 @@
- endif
- 
- turbostat : turbostat.c
--CFLAGS +=	-Wall
--CFLAGS +=	-DMSRHEADER='"../../../../arch/x86/include/asm/msr-index.h"'
--CFLAGS +=	-DINTEL_FAMILY_HEADER='"../../../../arch/x86/include/asm/intel-family.h"'
-+override CFLAGS +=	-Wall
-+override CFLAGS +=	-DMSRHEADER='"../../../../arch/x86/include/asm/msr-index.h"'
-+override CFLAGS +=	-DINTEL_FAMILY_HEADER='"../../../../arch/x86/include/asm/intel-family.h"'
- 
- %: %.c
- 	@mkdir -p $(BUILD_OUTPUT)
--	$(CC) $(CFLAGS) $< -o $(BUILD_OUTPUT)/$@
-+	$(CC) $(CFLAGS) $< -o $(BUILD_OUTPUT)/$@ $(LDFLAGS)
- 
- .PHONY : clean
- clean :
diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index 5b33eae81a7..6c177c8b580 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'linux-tools'
 pkgname=linux-tools
-version=4.20
+version=5.3.1
 revision=1
 wrksrc="linux-${version}"
 build_style=meta
@@ -13,8 +13,8 @@ short_desc="Linux kernel tools meta-pkg"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
-distfiles="${KERNEL_SITE}/kernel/v4.x/linux-${version}.tar.xz"
-checksum=ad0823183522e743972382df0aa08fb5ae3077f662b125f1e599b0b2aaa12438
+distfiles="${KERNEL_SITE}/kernel/v5.x/linux-${version}.tar.xz"
+checksum=9890b5a909d316211d045a95f5f0680e39749f2319cb26d7cd067efaa692f858
 
 subpackages="cpupower libcpupower libcpupower-devel libusbip libusbip-devel usbip perf freefall tmon"
 
diff --git a/srcpkgs/linux/template b/srcpkgs/linux/template
index 144705af252..84485c2eebc 100644
--- a/srcpkgs/linux/template
+++ b/srcpkgs/linux/template
@@ -1,11 +1,11 @@
 # Template file for 'linux'
 pkgname=linux
-version=4.19
-revision=2
+version=5.2
+revision=1
 build_style=meta
 homepage="http://www.voidlinux.org/"
 short_desc="The Linux kernel meta package"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Lean Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 
 case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/linux3.16/template b/srcpkgs/linux3.16/template
index ad95b8ff1ee..f7a731f7825 100644
--- a/srcpkgs/linux3.16/template
+++ b/srcpkgs/linux3.16/template
@@ -1,6 +1,6 @@
 # Template file for 'linux3.16'
 pkgname=linux3.16
-version=3.16.72
+version=3.16.75
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="${KERNEL_SITE}/kernel/v3.x/linux-${version}.tar.xz"
-checksum=c8ba0f3afd9bce85064ed780d3be7a443c894798b5ac6acfbbd607027180dd82
+checksum=ed1bd5e5e0fc50139b687be27f6847cddc9d759a780b8545bb0b8cb63301211c
 patch_args="-Np1"
 
 _kernver="${version}_${revision}"
diff --git a/srcpkgs/linux4.14/template b/srcpkgs/linux4.14/template
index 725d41ac501..d87edbbf86f 100644
--- a/srcpkgs/linux4.14/template
+++ b/srcpkgs/linux4.14/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.14'
 pkgname=linux4.14
-version=4.14.139
+version=4.14.149
 revision=1
 patch_args="-Np1"
 wrksrc="linux-${version}"
@@ -9,7 +9,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel and modules (${version%.*} series)"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=8c62d495444dba90200740ec770d274780b010e957cfc447f07999d717e37042
+checksum=e69dabd2368440ce1650cda0cf043e1ba3f3343f940a43b68e761739fcb3f296
 
 nodebug=yes  # -dbg package is generated below manually
 nostrip=yes
diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index 948381bee85..be0ee554735 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
-version=4.19.67
+version=4.19.80
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=5a1c3d60c38a7a0a086fcd6fdce5603c31c487852b1b64c071ee6de62c98a502
+checksum=80a9ba764e088aa7fddfef5a97c0236905e291468a37832243b6f3828d36e7ec
 patch_args="-Np1"
 
 nodebug=yes  # -dbg package is generated below manually
diff --git a/srcpkgs/linux4.4/files/i386-dotconfig b/srcpkgs/linux4.4/files/i386-dotconfig
index 6063db86127..55830056944 100644
--- a/srcpkgs/linux4.4/files/i386-dotconfig
+++ b/srcpkgs/linux4.4/files/i386-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 4.4.179 Kernel Configuration
+# Linux/i386 4.4.191 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -7176,6 +7176,7 @@ CONFIG_TEST_STRING_HELPERS=m
 CONFIG_TEST_KSTRTOX=m
 CONFIG_TEST_PRINTF=m
 # CONFIG_TEST_RHASHTABLE is not set
+# CONFIG_TEST_HASH is not set
 # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
 # CONFIG_DMA_API_DEBUG is not set
 # CONFIG_TEST_LKM is not set
diff --git a/srcpkgs/linux4.4/files/x86_64-dotconfig b/srcpkgs/linux4.4/files/x86_64-dotconfig
index 9be64cc009e..aaef40c9351 100644
--- a/srcpkgs/linux4.4/files/x86_64-dotconfig
+++ b/srcpkgs/linux4.4/files/x86_64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 4.4.179 Kernel Configuration
+# Linux/x86_64 4.4.191 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -7256,6 +7256,7 @@ CONFIG_TEST_STRING_HELPERS=m
 CONFIG_TEST_KSTRTOX=m
 CONFIG_TEST_PRINTF=m
 # CONFIG_TEST_RHASHTABLE is not set
+# CONFIG_TEST_HASH is not set
 # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
 # CONFIG_DMA_API_DEBUG is not set
 # CONFIG_TEST_LKM is not set
diff --git a/srcpkgs/linux4.4/patches/gcc9.patch b/srcpkgs/linux4.4/patches/gcc9.patch
deleted file mode 100644
index e367f0c0347..00000000000
--- a/srcpkgs/linux4.4/patches/gcc9.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- include/linux/module.h	2019-06-27 02:13:33.000000000 +0200
-+++ include/linux/module.h	2019-06-29 15:05:26.469682800 +0200
-@@ -127,13 +127,13 @@
- #define module_init(initfn)					\
- 	static inline initcall_t __maybe_unused __inittest(void)		\
- 	{ return initfn; }					\
--	int init_module(void) __attribute__((alias(#initfn)));
-+	int init_module(void) __attribute((__copy__(initfn))) __attribute__((alias(#initfn)));
- 
- /* This is only required if you want to be unloadable. */
- #define module_exit(exitfn)					\
- 	static inline exitcall_t __maybe_unused __exittest(void)		\
- 	{ return exitfn; }					\
--	void cleanup_module(void) __attribute__((alias(#exitfn)));
-+	void cleanup_module(void) __attribute((__copy__(exitfn))) __attribute__((alias(#exitfn)));
- 
- #endif
- 
diff --git a/srcpkgs/linux4.4/template b/srcpkgs/linux4.4/template
index 7bec5788871..a0adea6b297 100644
--- a/srcpkgs/linux4.4/template
+++ b/srcpkgs/linux4.4/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.4'
 pkgname=linux4.4
-version=4.4.189
+version=4.4.196
 revision=1
 wrksrc="linux-${version}"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -8,7 +8,7 @@ homepage="https://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="The Linux kernel and modules (${version%.*} series)"
 distfiles="${KERNEL_SITE}/kernel/v4.x/linux-${version}.tar.xz"
-checksum=974239a3b7713de2ed46da06446cf0a87e97c871d89a87a71f3521fe84d98859
+checksum=169e3f07701336138905bdedd22a0089b45e2e53b9aa6d2ed6c44f215476a76d
 
 nocross=yes
 nodebug=yes
diff --git a/srcpkgs/linux4.9/files/arm64-dotconfig b/srcpkgs/linux4.9/files/arm64-dotconfig
index 20a7ba616be..1e26d295bb1 100644
--- a/srcpkgs/linux4.9/files/arm64-dotconfig
+++ b/srcpkgs/linux4.9/files/arm64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.9.169 Kernel Configuration
+# Linux/arm64 4.9.190 Kernel Configuration
 #
 CONFIG_ARM64=y
 CONFIG_64BIT=y
@@ -6598,6 +6598,7 @@ CONFIG_ARM_SCPI_POWER_DOMAIN=y
 # CONFIG_FIRMWARE_MEMMAP is not set
 CONFIG_DMIID=y
 CONFIG_DMI_SYSFS=y
+CONFIG_ISCSI_IBFT=m
 CONFIG_RASPBERRYPI_FIRMWARE=y
 # CONFIG_FW_CFG_SYSFS is not set
 CONFIG_QCOM_SCM=y
diff --git a/srcpkgs/linux4.9/template b/srcpkgs/linux4.9/template
index fadc53383e8..5fbd7f49484 100644
--- a/srcpkgs/linux4.9/template
+++ b/srcpkgs/linux4.9/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.9'
 pkgname=linux4.9
-version=4.9.189
+version=4.9.196
 revision=1
 patch_args="-Np1"
 wrksrc="linux-${version}"
@@ -9,7 +9,7 @@ homepage="https://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel and modules (${version%.*} series)"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=93d945661246f726b694455c80c140717d2beff5a718445a51183439bbe5d0b3
+checksum=e0ab12b04a975630ece2142a1ac15cfe45140b8c3359226b035c15ca7c92c6ef
 
 nodebug=yes  # -dbg package is generated below manually
 nostrip=yes
diff --git a/srcpkgs/linux5.1-dbg b/srcpkgs/linux5.1-dbg
deleted file mode 120000
index c81974f85e6..00000000000
--- a/srcpkgs/linux5.1-dbg
+++ /dev/null
@@ -1 +0,0 @@
-linux5.1
\ No newline at end of file
diff --git a/srcpkgs/linux5.1-headers b/srcpkgs/linux5.1-headers
deleted file mode 120000
index c81974f85e6..00000000000
--- a/srcpkgs/linux5.1-headers
+++ /dev/null
@@ -1 +0,0 @@
-linux5.1
\ No newline at end of file
diff --git a/srcpkgs/linux5.2/files/x86_64-dotconfig b/srcpkgs/linux5.2/files/x86_64-dotconfig
index b9609bb0ca9..a8eca2f5a15 100644
--- a/srcpkgs/linux5.2/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.2/files/x86_64-dotconfig
@@ -355,7 +355,7 @@ CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y
 CONFIG_NR_CPUS_RANGE_BEGIN=2
 CONFIG_NR_CPUS_RANGE_END=512
 CONFIG_NR_CPUS_DEFAULT=64
-CONFIG_NR_CPUS=64
+CONFIG_NR_CPUS=256
 CONFIG_SCHED_SMT=y
 CONFIG_SCHED_MC=y
 CONFIG_SCHED_MC_PRIO=y
diff --git a/srcpkgs/linux5.2/template b/srcpkgs/linux5.2/template
index ab84f9f24bf..2e9e9ab9185 100644
--- a/srcpkgs/linux5.2/template
+++ b/srcpkgs/linux5.2/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.2'
 pkgname=linux5.2
-version=5.2.9
+version=5.2.21
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=b6f02a4b306ca5cd314d72615bfc2650166969613135da202630e6c4e1b5d4e6
+checksum=9a8ee3ff75dabffa76141c8dc7529dfbb3ca07888a3708a13f15b412268b3538
 patch_args="-Np1"
 
 nodebug=yes  # -dbg package is generated below manually
diff --git a/srcpkgs/linux5.3-dbg b/srcpkgs/linux5.3-dbg
new file mode 120000
index 00000000000..fdc7705758b
--- /dev/null
+++ b/srcpkgs/linux5.3-dbg
@@ -0,0 +1 @@
+linux5.3
\ No newline at end of file
diff --git a/srcpkgs/linux5.3-headers b/srcpkgs/linux5.3-headers
new file mode 120000
index 00000000000..fdc7705758b
--- /dev/null
+++ b/srcpkgs/linux5.3-headers
@@ -0,0 +1 @@
+linux5.3
\ No newline at end of file
diff --git a/srcpkgs/linux5.1/files/DocBook/Makefile b/srcpkgs/linux5.3/files/DocBook/Makefile
similarity index 100%
rename from srcpkgs/linux5.1/files/DocBook/Makefile
rename to srcpkgs/linux5.3/files/DocBook/Makefile
diff --git a/srcpkgs/linux5.1/files/arm-dotconfig b/srcpkgs/linux5.3/files/arm-dotconfig
similarity index 91%
rename from srcpkgs/linux5.1/files/arm-dotconfig
rename to srcpkgs/linux5.3/files/arm-dotconfig
index c74059779f6..953e48769aa 100644
--- a/srcpkgs/linux5.1/files/arm-dotconfig
+++ b/srcpkgs/linux5.3/files/arm-dotconfig
@@ -1,14 +1,15 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 5.1.18 Kernel Configuration
+# Linux/arm 5.3.0 Kernel Configuration
 #
 
 #
-# Compiler: arm-linux-gnueabihf-gcc (GCC) 9.1.0
+# Compiler: armv7l-linux-gnueabihf-gcc (GCC) 9.2.0
 #
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=90100
+CONFIG_GCC_VERSION=90200
 CONFIG_CLANG_VERSION=0
+CONFIG_CC_CAN_LINK=y
 CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y
 CONFIG_CC_DISABLE_WARN_MAYBE_UNINITIALIZED=y
@@ -21,6 +22,7 @@ CONFIG_BUILDTIME_EXTABLE_SORT=y
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 # CONFIG_COMPILE_TEST is not set
+# CONFIG_HEADER_TEST is not set
 CONFIG_LOCALVERSION="_1"
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_BUILD_SALT=""
@@ -58,6 +60,8 @@ CONFIG_HANDLE_DOMAIN_IRQ=y
 CONFIG_IRQ_FORCED_THREADING=y
 CONFIG_SPARSE_IRQ=y
 # CONFIG_GENERIC_IRQ_DEBUGFS is not set
+# end of IRQ subsystem
+
 CONFIG_GENERIC_IRQ_MULTI_HANDLER=y
 CONFIG_ARCH_CLOCKSOURCE_DATA=y
 CONFIG_GENERIC_CLOCKEVENTS=y
@@ -71,10 +75,13 @@ CONFIG_NO_HZ_COMMON=y
 CONFIG_NO_HZ_IDLE=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
+# end of Timers subsystem
+
 # CONFIG_PREEMPT_NONE is not set
 # CONFIG_PREEMPT_VOLUNTARY is not set
 CONFIG_PREEMPT=y
 CONFIG_PREEMPT_COUNT=y
+CONFIG_PREEMPTION=y
 
 #
 # CPU/Task time and stats accounting
@@ -88,7 +95,9 @@ CONFIG_TASKSTATS=y
 CONFIG_TASK_DELAY_ACCT=y
 CONFIG_TASK_XACCT=y
 CONFIG_TASK_IO_ACCOUNTING=y
-# CONFIG_PSI is not set
+CONFIG_PSI=y
+CONFIG_PSI_DEFAULT_DISABLED=y
+# end of CPU/Task time and stats accounting
 
 #
 # RCU Subsystem
@@ -100,15 +109,23 @@ CONFIG_TREE_SRCU=y
 CONFIG_TASKS_RCU=y
 CONFIG_RCU_STALL_COMMON=y
 CONFIG_RCU_NEED_SEGCBLIST=y
+# end of RCU Subsystem
+
 CONFIG_BUILD_BIN2C=y
 # CONFIG_IKCONFIG is not set
+CONFIG_IKHEADERS=m
 CONFIG_LOG_BUF_SHIFT=17
 CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
 CONFIG_GENERIC_SCHED_CLOCK=y
+
+#
+# Scheduler features
+#
+# end of Scheduler features
+
 CONFIG_CGROUPS=y
 # CONFIG_MEMCG is not set
 CONFIG_BLK_CGROUP=y
-# CONFIG_DEBUG_BLK_CGROUP is not set
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
 # CONFIG_CFS_BANDWIDTH is not set
@@ -143,7 +160,6 @@ CONFIG_RD_LZ4=y
 # CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_SYSCTL=y
-CONFIG_ANON_INODES=y
 CONFIG_HAVE_UID16=y
 CONFIG_BPF=y
 CONFIG_EXPERT=y
@@ -188,6 +204,8 @@ CONFIG_PERF_USE_VMALLOC=y
 #
 CONFIG_PERF_EVENTS=y
 # CONFIG_DEBUG_PERF_USE_VMALLOC is not set
+# end of Kernel Performance Events And Counters
+
 CONFIG_VM_EVENT_COUNTERS=y
 # CONFIG_COMPAT_BRK is not set
 CONFIG_SLAB=y
@@ -195,9 +213,12 @@ CONFIG_SLAB=y
 # CONFIG_SLOB is not set
 CONFIG_SLAB_MERGE_DEFAULT=y
 CONFIG_SLAB_FREELIST_RANDOM=y
+CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
 CONFIG_SYSTEM_DATA_VERIFICATION=y
 CONFIG_PROFILING=y
 CONFIG_TRACEPOINTS=y
+# end of General setup
+
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -205,7 +226,6 @@ CONFIG_HAVE_PROC_CPU=y
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 CONFIG_FIX_EARLYCON_MEM=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
@@ -224,7 +244,6 @@ CONFIG_ARCH_MULTIPLATFORM=y
 # CONFIG_ARCH_EBSA110 is not set
 # CONFIG_ARCH_EP93XX is not set
 # CONFIG_ARCH_FOOTBRIDGE is not set
-# CONFIG_ARCH_NETX is not set
 # CONFIG_ARCH_IOP13XX is not set
 # CONFIG_ARCH_IOP32X is not set
 # CONFIG_ARCH_IOP33X is not set
@@ -254,6 +273,8 @@ CONFIG_ARCH_MULTI_V4_V5=y
 # CONFIG_ARCH_MULTI_V6 is not set
 # CONFIG_ARCH_MULTI_V7 is not set
 CONFIG_ARCH_MULTI_CPU_AUTO=y
+# end of Multiple platform selection
+
 # CONFIG_MACH_ASM9260 is not set
 # CONFIG_ARCH_ASPEED is not set
 # CONFIG_ARCH_AT91 is not set
@@ -309,10 +330,12 @@ CONFIG_CACHE_FEROCEON_L2=y
 CONFIG_ARM_L1_CACHE_SHIFT=5
 CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y
 CONFIG_DEBUG_ALIGN_RODATA=y
+# end of System Type
 
 #
 # Bus support
 #
+# end of Bus support
 
 #
 # Kernel Features
@@ -346,6 +369,7 @@ CONFIG_UACCESS_WITH_MEMCPY=y
 # CONFIG_SECCOMP is not set
 CONFIG_PARAVIRT=y
 # CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
+# end of Kernel Features
 
 #
 # Boot options
@@ -365,6 +389,7 @@ CONFIG_ATAGS_PROC=y
 # CONFIG_CRASH_DUMP is not set
 CONFIG_AUTO_ZRELADDR=y
 # CONFIG_EFI is not set
+# end of Boot options
 
 #
 # CPU Power Management
@@ -394,6 +419,7 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
 # CONFIG_CPUFREQ_DT is not set
 CONFIG_ARM_KIRKWOOD_CPUFREQ=y
 # CONFIG_QORIQ_CPUFREQ is not set
+# end of CPU Frequency scaling
 
 #
 # CPU Idle
@@ -409,6 +435,9 @@ CONFIG_CPU_IDLE_GOV_TEO=y
 # CONFIG_ARM_CPUIDLE is not set
 CONFIG_ARM_KIRKWOOD_CPUIDLE=y
 # CONFIG_ARM_MVEBU_V7_CPUIDLE is not set
+# end of ARM CPU Idle Drivers
+# end of CPU Idle
+# end of CPU Power Management
 
 #
 # Floating point emulation
@@ -421,6 +450,7 @@ CONFIG_FPE_NWFPE=y
 # CONFIG_FPE_NWFPE_XP is not set
 # CONFIG_FPE_FASTFPE is not set
 # CONFIG_VFP is not set
+# end of Floating point emulation
 
 #
 # Power management options
@@ -448,6 +478,7 @@ CONFIG_CPU_PM=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ARM_CPU_SUSPEND=y
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+# end of Power management options
 
 #
 # Firmware Drivers
@@ -459,6 +490,9 @@ CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 #
 # Tegra firmware driver
 #
+# end of Tegra firmware driver
+# end of Firmware Drivers
+
 # CONFIG_ARM_CRYPTO is not set
 # CONFIG_VIRTUALIZATION is not set
 
@@ -482,6 +516,7 @@ CONFIG_HAVE_DMA_CONTIGUOUS=y
 CONFIG_GENERIC_SMP_IDLE_THREAD=y
 CONFIG_GENERIC_IDLE_POLL_SETUP=y
 CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
+CONFIG_ARCH_HAS_KEEPINITRD=y
 CONFIG_ARCH_HAS_SET_MEMORY=y
 CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y
 CONFIG_ARCH_32BIT_OFF_T=y
@@ -517,19 +552,28 @@ CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
 CONFIG_STRICT_MODULE_RWX=y
 CONFIG_ARCH_HAS_PHYS_TO_DMA=y
 CONFIG_REFCOUNT_FULL=y
+# CONFIG_LOCK_EVENT_COUNTS is not set
 
 #
 # GCOV-based kernel profiling
 #
 # CONFIG_GCOV_KERNEL is not set
 CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
+# end of GCOV-based kernel profiling
+
 CONFIG_PLUGIN_HOSTCC="g++"
 CONFIG_HAVE_GCC_PLUGINS=y
 CONFIG_GCC_PLUGINS=y
+
+#
+# GCC plugins
+#
 # CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set
-CONFIG_GCC_PLUGIN_LATENT_ENTROPY=y
-# CONFIG_GCC_PLUGIN_STRUCTLEAK is not set
+# CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
 # CONFIG_GCC_PLUGIN_RANDSTRUCT is not set
+# end of GCC plugins
+# end of General architecture-dependent options
+
 CONFIG_RT_MUTEXES=y
 CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
@@ -542,7 +586,6 @@ CONFIG_MODVERSIONS=y
 # CONFIG_MODULE_COMPRESS is not set
 CONFIG_MODULES_TREE_LOOKUP=y
 CONFIG_BLOCK=y
-CONFIG_LBDAF=y
 CONFIG_BLK_SCSI_REQUEST=y
 CONFIG_BLK_DEV_BSG=y
 CONFIG_BLK_DEV_BSGLIB=y
@@ -585,6 +628,8 @@ CONFIG_KARMA_PARTITION=y
 CONFIG_EFI_PARTITION=y
 # CONFIG_SYSV68_PARTITION is not set
 # CONFIG_CMDLINE_PARTITION is not set
+# end of Partition Types
+
 CONFIG_BLK_MQ_PCI=y
 CONFIG_BLK_MQ_VIRTIO=y
 CONFIG_BLK_PM=y
@@ -596,6 +641,9 @@ CONFIG_MQ_IOSCHED_DEADLINE=m
 CONFIG_MQ_IOSCHED_KYBER=m
 CONFIG_IOSCHED_BFQ=m
 CONFIG_BFQ_GROUP_IOSCHED=y
+# CONFIG_BFQ_CGROUP_DEBUG is not set
+# end of IO Schedulers
+
 CONFIG_ASN1=y
 CONFIG_UNINLINE_SPIN_UNLOCK=y
 CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
@@ -609,15 +657,19 @@ CONFIG_BINFMT_ELF_FDPIC=y
 CONFIG_ELFCORE=y
 CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 CONFIG_BINFMT_SCRIPT=y
+CONFIG_ARCH_HAS_BINFMT_FLAT=y
 # CONFIG_BINFMT_FLAT is not set
+CONFIG_BINFMT_FLAT_ARGVP_ENVP_ON_STACK=y
 CONFIG_BINFMT_MISC=m
 CONFIG_COREDUMP=y
+# end of Executable file formats
 
 #
 # Memory Management options
 #
 CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
+CONFIG_ARCH_KEEP_MEMBLOCK=y
 CONFIG_SPLIT_PTLOCK_CPUS=999999
 CONFIG_MEMORY_BALLOON=y
 CONFIG_BALLOON_COMPACTION=y
@@ -641,6 +693,8 @@ CONFIG_GENERIC_EARLY_IOREMAP=y
 CONFIG_FRAME_VECTOR=y
 # CONFIG_PERCPU_STATS is not set
 # CONFIG_GUP_BENCHMARK is not set
+# end of Memory Management options
+
 CONFIG_NET=y
 CONFIG_NET_INGRESS=y
 CONFIG_NET_EGRESS=y
@@ -701,9 +755,6 @@ CONFIG_INET_ESP_OFFLOAD=m
 CONFIG_INET_IPCOMP=m
 CONFIG_INET_XFRM_TUNNEL=m
 CONFIG_INET_TUNNEL=m
-CONFIG_INET_XFRM_MODE_TRANSPORT=m
-CONFIG_INET_XFRM_MODE_TUNNEL=m
-CONFIG_INET_XFRM_MODE_BEET=m
 CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 CONFIG_INET_UDP_DIAG=m
@@ -742,10 +793,6 @@ CONFIG_IPV6_MIP6=m
 # CONFIG_IPV6_ILA is not set
 CONFIG_INET6_XFRM_TUNNEL=m
 CONFIG_INET6_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-CONFIG_INET6_XFRM_MODE_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_BEET=m
-CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
 CONFIG_IPV6_VTI=m
 CONFIG_IPV6_SIT=m
 CONFIG_IPV6_SIT_6RD=y
@@ -811,7 +858,6 @@ CONFIG_NF_CT_NETLINK=m
 CONFIG_NF_CT_NETLINK_TIMEOUT=m
 # CONFIG_NETFILTER_NETLINK_GLUE_CT is not set
 CONFIG_NF_NAT=m
-CONFIG_NF_NAT_NEEDED=y
 CONFIG_NF_NAT_AMANDA=m
 CONFIG_NF_NAT_FTP=m
 CONFIG_NF_NAT_IRC=m
@@ -846,6 +892,7 @@ CONFIG_NFT_XFRM=m
 CONFIG_NFT_SOCKET=m
 CONFIG_NFT_OSF=m
 CONFIG_NFT_TPROXY=m
+# CONFIG_NFT_SYNPROXY is not set
 CONFIG_NF_FLOW_TABLE_INET=m
 CONFIG_NF_FLOW_TABLE=m
 CONFIG_NETFILTER_XTABLES=m
@@ -880,6 +927,7 @@ CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
 CONFIG_NETFILTER_XT_TARGET_RATEEST=m
 CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
+CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m
 CONFIG_NETFILTER_XT_TARGET_TEE=m
 CONFIG_NETFILTER_XT_TARGET_TPROXY=m
 CONFIG_NETFILTER_XT_TARGET_TRACE=m
@@ -936,6 +984,8 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m
 CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
 CONFIG_NETFILTER_XT_MATCH_TIME=m
 CONFIG_NETFILTER_XT_MATCH_U32=m
+# end of Core Netfilter Configuration
+
 CONFIG_IP_SET=m
 CONFIG_IP_SET_MAX=256
 CONFIG_IP_SET_BITMAP_IP=m
@@ -1010,7 +1060,6 @@ CONFIG_NF_DEFRAG_IPV4=m
 CONFIG_NF_SOCKET_IPV4=m
 CONFIG_NF_TPROXY_IPV4=m
 CONFIG_NF_TABLES_IPV4=y
-CONFIG_NFT_CHAIN_ROUTE_IPV4=m
 CONFIG_NFT_REJECT_IPV4=m
 CONFIG_NFT_DUP_IPV4=m
 CONFIG_NFT_FIB_IPV4=m
@@ -1044,6 +1093,7 @@ CONFIG_IP_NF_SECURITY=m
 CONFIG_IP_NF_ARPTABLES=m
 CONFIG_IP_NF_ARPFILTER=m
 CONFIG_IP_NF_ARP_MANGLE=m
+# end of IP: Netfilter Configuration
 
 #
 # IPv6: Netfilter Configuration
@@ -1051,7 +1101,6 @@ CONFIG_IP_NF_ARP_MANGLE=m
 CONFIG_NF_SOCKET_IPV6=m
 CONFIG_NF_TPROXY_IPV6=m
 CONFIG_NF_TABLES_IPV6=y
-CONFIG_NFT_CHAIN_ROUTE_IPV6=m
 CONFIG_NFT_REJECT_IPV6=m
 CONFIG_NFT_DUP_IPV6=m
 CONFIG_NFT_FIB_IPV6=m
@@ -1080,8 +1129,11 @@ CONFIG_IP6_NF_SECURITY=m
 CONFIG_IP6_NF_NAT=m
 CONFIG_IP6_NF_TARGET_MASQUERADE=m
 CONFIG_IP6_NF_TARGET_NPT=m
+# end of IPv6: Netfilter Configuration
+
 CONFIG_NF_DEFRAG_IPV6=m
 # CONFIG_NF_TABLES_BRIDGE is not set
+# CONFIG_NF_CONNTRACK_BRIDGE is not set
 CONFIG_BRIDGE_NF_EBTABLES=m
 CONFIG_BRIDGE_EBT_BROUTE=m
 CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -1114,11 +1166,14 @@ CONFIG_INET_DCCP_DIAG=m
 CONFIG_IP_DCCP_CCID3=y
 # CONFIG_IP_DCCP_CCID3_DEBUG is not set
 CONFIG_IP_DCCP_TFRC_LIB=y
+# end of DCCP CCIDs Configuration
 
 #
 # DCCP Kernel Hacking
 #
 # CONFIG_IP_DCCP_DEBUG is not set
+# end of DCCP Kernel Hacking
+
 CONFIG_IP_SCTP=m
 # CONFIG_SCTP_DBG_OBJCNT is not set
 CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5=y
@@ -1152,17 +1207,21 @@ CONFIG_BRIDGE_IGMP_SNOOPING=y
 # CONFIG_BRIDGE_VLAN_FILTERING is not set
 CONFIG_HAVE_NET_DSA=y
 CONFIG_NET_DSA=m
-CONFIG_NET_DSA_LEGACY=y
-CONFIG_NET_DSA_TAG_BRCM=y
-CONFIG_NET_DSA_TAG_BRCM_PREPEND=y
-CONFIG_NET_DSA_TAG_DSA=y
-CONFIG_NET_DSA_TAG_EDSA=y
-CONFIG_NET_DSA_TAG_GSWIP=y
-CONFIG_NET_DSA_TAG_KSZ=y
-CONFIG_NET_DSA_TAG_KSZ9477=y
-CONFIG_NET_DSA_TAG_MTK=y
-CONFIG_NET_DSA_TAG_TRAILER=y
-CONFIG_NET_DSA_TAG_QCA=y
+CONFIG_NET_DSA_TAG_8021Q=m
+CONFIG_NET_DSA_TAG_BRCM_COMMON=m
+CONFIG_NET_DSA_TAG_BRCM=m
+CONFIG_NET_DSA_TAG_BRCM_PREPEND=m
+CONFIG_NET_DSA_TAG_GSWIP=m
+CONFIG_NET_DSA_TAG_DSA=m
+CONFIG_NET_DSA_TAG_EDSA=m
+CONFIG_NET_DSA_TAG_MTK=m
+CONFIG_NET_DSA_TAG_KSZ_COMMON=m
+CONFIG_NET_DSA_TAG_KSZ=m
+CONFIG_NET_DSA_TAG_KSZ9477=m
+CONFIG_NET_DSA_TAG_QCA=m
+CONFIG_NET_DSA_TAG_LAN9303=m
+CONFIG_NET_DSA_TAG_SJA1105=m
+CONFIG_NET_DSA_TAG_TRAILER=m
 CONFIG_VLAN_8021Q=m
 CONFIG_VLAN_8021Q_GVRP=y
 # CONFIG_VLAN_8021Q_MVRP is not set
@@ -1274,16 +1333,18 @@ CONFIG_NET_ACT_PEDIT=m
 CONFIG_NET_ACT_SIMP=m
 CONFIG_NET_ACT_SKBEDIT=m
 CONFIG_NET_ACT_CSUM=m
+# CONFIG_NET_ACT_MPLS is not set
 CONFIG_NET_ACT_VLAN=m
 CONFIG_NET_ACT_BPF=m
 CONFIG_NET_ACT_CONNMARK=m
+# CONFIG_NET_ACT_CTINFO is not set
 # CONFIG_NET_ACT_SKBMOD is not set
 CONFIG_NET_ACT_IFE=m
 CONFIG_NET_ACT_TUNNEL_KEY=m
+# CONFIG_NET_ACT_CT is not set
 CONFIG_NET_IFE_SKBMARK=m
 CONFIG_NET_IFE_SKBPRIO=m
 CONFIG_NET_IFE_SKBTCINDEX=m
-CONFIG_NET_CLS_IND=y
 CONFIG_NET_SCH_FIFO=y
 CONFIG_DCB=y
 CONFIG_DNS_RESOLVER=y
@@ -1295,6 +1356,7 @@ CONFIG_BATMAN_ADV_BLA=y
 # CONFIG_BATMAN_ADV_MCAST is not set
 CONFIG_BATMAN_ADV_DEBUGFS=y
 # CONFIG_BATMAN_ADV_DEBUG is not set
+CONFIG_BATMAN_ADV_SYSFS=y
 # CONFIG_BATMAN_ADV_TRACING is not set
 # CONFIG_OPENVSWITCH is not set
 # CONFIG_VSOCKETS is not set
@@ -1317,6 +1379,9 @@ CONFIG_BQL=y
 #
 CONFIG_NET_PKTGEN=m
 CONFIG_NET_DROP_MONITOR=y
+# end of Network testing
+# end of Networking options
+
 CONFIG_HAMRADIO=y
 
 #
@@ -1338,6 +1403,8 @@ CONFIG_BAYCOM_SER_HDX=m
 CONFIG_BAYCOM_PAR=m
 CONFIG_BAYCOM_EPP=m
 CONFIG_YAM=m
+# end of AX.25 network device drivers
+
 CONFIG_CAN=m
 CONFIG_CAN_RAW=m
 CONFIG_CAN_BCM=m
@@ -1375,6 +1442,7 @@ CONFIG_CAN_SOFTING=m
 #
 # CONFIG_CAN_HI311X is not set
 CONFIG_CAN_MCP251X=m
+# end of CAN SPI interfaces
 
 #
 # CAN USB interfaces
@@ -1387,7 +1455,11 @@ CONFIG_CAN_ESD_USB2=m
 CONFIG_CAN_MCBA_USB=m
 # CONFIG_CAN_PEAK_USB is not set
 CONFIG_CAN_UCAN=m
+# end of CAN USB interfaces
+
 # CONFIG_CAN_DEBUG_DEVICES is not set
+# end of CAN Device Drivers
+
 CONFIG_BT=m
 CONFIG_BT_BREDR=y
 CONFIG_BT_RFCOMM=m
@@ -1413,6 +1485,7 @@ CONFIG_BT_RTL=m
 CONFIG_BT_HCIBTUSB=m
 CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
 CONFIG_BT_HCIBTUSB_BCM=y
+# CONFIG_BT_HCIBTUSB_MTK is not set
 CONFIG_BT_HCIBTUSB_RTL=y
 CONFIG_BT_HCIBTSDIO=m
 CONFIG_BT_HCIUART=m
@@ -1436,7 +1509,10 @@ CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
 CONFIG_BT_ATH3K=m
 # CONFIG_BT_WILINK is not set
+CONFIG_BT_MTKSDIO=m
 CONFIG_BT_MTKUART=m
+# end of Bluetooth device drivers
+
 CONFIG_AF_RXRPC=m
 CONFIG_AF_RXRPC_IPV6=y
 # CONFIG_AF_RXRPC_INJECT_LOSS is not set
@@ -1546,6 +1622,8 @@ CONFIG_PCI_MVEBU=y
 # Cadence PCIe controllers support
 #
 # CONFIG_PCIE_CADENCE_HOST is not set
+# end of Cadence PCIe controllers support
+
 # CONFIG_PCI_FTPCI100 is not set
 # CONFIG_PCI_HOST_GENERIC is not set
 CONFIG_PCIE_XILINX=y
@@ -1555,16 +1633,21 @@ CONFIG_PCIE_XILINX=y
 #
 # DesignWare PCI Core Support
 #
+# end of DesignWare PCI Core Support
+# end of PCI controller drivers
 
 #
 # PCI Endpoint
 #
 # CONFIG_PCI_ENDPOINT is not set
+# end of PCI Endpoint
 
 #
 # PCI switch controller drivers
 #
 # CONFIG_PCI_SW_SWITCHTEC is not set
+# end of PCI switch controller drivers
+
 # CONFIG_PCCARD is not set
 CONFIG_RAPIDIO=m
 CONFIG_RAPIDIO_TSI721=m
@@ -1584,6 +1667,7 @@ CONFIG_RAPIDIO_CPS_XX=m
 CONFIG_RAPIDIO_TSI568=m
 CONFIG_RAPIDIO_CPS_GEN2=m
 CONFIG_RAPIDIO_RXS_GEN3=m
+# end of RapidIO Switch drivers
 
 #
 # Generic Driver Options
@@ -1601,6 +1685,9 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
 CONFIG_EXTRA_FIRMWARE=""
 # CONFIG_FW_LOADER_USER_HELPER is not set
+# CONFIG_FW_LOADER_COMPRESS is not set
+# end of Firmware loader
+
 CONFIG_WANT_DEV_COREDUMP=y
 CONFIG_ALLOW_DEV_COREDUMP=y
 CONFIG_DEV_COREDUMP=y
@@ -1617,6 +1704,7 @@ CONFIG_REGMAP_MMIO=y
 CONFIG_REGMAP_IRQ=y
 CONFIG_DMA_SHARED_BUFFER=y
 # CONFIG_DMA_FENCE_TRACE is not set
+# end of Generic Driver Options
 
 #
 # Bus devices
@@ -1627,6 +1715,8 @@ CONFIG_MVEBU_MBUS=y
 # CONFIG_SUN50I_DE2_BUS is not set
 CONFIG_SUNXI_RSB=m
 # CONFIG_VEXPRESS_CONFIG is not set
+# end of Bus devices
+
 CONFIG_CONNECTOR=m
 CONFIG_GNSS=m
 CONFIG_GNSS_SERIAL=m
@@ -1636,14 +1726,15 @@ CONFIG_GNSS_UBX_SERIAL=m
 CONFIG_MTD=y
 # CONFIG_MTD_TESTS is not set
 CONFIG_MTD_CMDLINE_PARTS=y
-# CONFIG_MTD_AFS_PARTS is not set
 CONFIG_MTD_OF_PARTS=y
 CONFIG_MTD_AR7_PARTS=m
 
 #
 # Partition parsers
 #
+# CONFIG_MTD_AFS_PARTS is not set
 # CONFIG_MTD_REDBOOT_PARTS is not set
+# end of Partition parsers
 
 #
 # User Modules And Translation Layers
@@ -1690,6 +1781,7 @@ CONFIG_MTD_CFI_UTIL=y
 # CONFIG_MTD_RAM is not set
 # CONFIG_MTD_ROM is not set
 # CONFIG_MTD_ABSENT is not set
+# end of RAM/ROM/Flash chip drivers
 
 #
 # Mapping drivers for chip access
@@ -1701,6 +1793,7 @@ CONFIG_MTD_PHYSMAP=y
 # CONFIG_MTD_IMPA7 is not set
 # CONFIG_MTD_INTEL_VR_NOR is not set
 # CONFIG_MTD_PLATRAM is not set
+# end of Mapping drivers for chip access
 
 #
 # Self-contained MTD device drivers
@@ -1721,25 +1814,35 @@ CONFIG_MTD_SST25L=m
 # Disk-On-Chip Device Drivers
 #
 # CONFIG_MTD_DOCG3 is not set
+# end of Self-contained MTD device drivers
+
 CONFIG_MTD_NAND_CORE=m
 # CONFIG_MTD_ONENAND is not set
-CONFIG_MTD_NAND_ECC=y
-# CONFIG_MTD_NAND_ECC_SMC is not set
-CONFIG_MTD_NAND=y
-# CONFIG_MTD_NAND_ECC_BCH is not set
-CONFIG_MTD_SM_COMMON=m
+CONFIG_MTD_NAND_ECC_SW_HAMMING=m
+# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
+CONFIG_MTD_RAW_NAND=m
+CONFIG_MTD_NAND_ECC_SW_BCH=y
+
+#
+# Raw/parallel NAND flash controllers
+#
 # CONFIG_MTD_NAND_DENALI_PCI is not set
 # CONFIG_MTD_NAND_DENALI_DT is not set
-# CONFIG_MTD_NAND_GPIO is not set
-CONFIG_MTD_NAND_RICOH=m
-# CONFIG_MTD_NAND_DISKONCHIP is not set
 # CONFIG_MTD_NAND_CAFE is not set
+CONFIG_MTD_NAND_ORION=m
 # CONFIG_MTD_NAND_MARVELL is not set
-CONFIG_MTD_NAND_NANDSIM=m
 # CONFIG_MTD_NAND_BRCMNAND is not set
-# CONFIG_MTD_NAND_PLATFORM is not set
-CONFIG_MTD_NAND_ORION=y
 CONFIG_MTD_NAND_SUNXI=m
+# CONFIG_MTD_NAND_GPIO is not set
+# CONFIG_MTD_NAND_PLATFORM is not set
+
+#
+# Misc
+#
+CONFIG_MTD_SM_COMMON=m
+CONFIG_MTD_NAND_NANDSIM=m
+CONFIG_MTD_NAND_RICOH=m
+# CONFIG_MTD_NAND_DISKONCHIP is not set
 CONFIG_MTD_SPI_NAND=m
 
 #
@@ -1747,6 +1850,8 @@ CONFIG_MTD_SPI_NAND=m
 #
 # CONFIG_MTD_LPDDR is not set
 # CONFIG_MTD_LPDDR2_NVM is not set
+# end of LPDDR & LPDDR2 PCM memory drivers
+
 CONFIG_MTD_SPI_NOR=y
 CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y
 CONFIG_SPI_CADENCE_QUADSPI=m
@@ -1757,6 +1862,7 @@ CONFIG_MTD_UBI_BEB_LIMIT=20
 # CONFIG_MTD_UBI_FASTMAP is not set
 # CONFIG_MTD_UBI_GLUEBI is not set
 CONFIG_MTD_UBI_BLOCK=y
+# CONFIG_MTD_HYPERBUS is not set
 CONFIG_DTC=y
 CONFIG_OF=y
 # CONFIG_OF_UNITTEST is not set
@@ -1808,6 +1914,7 @@ CONFIG_BLK_DEV_RBD=m
 # CONFIG_BLK_DEV_NVME is not set
 # CONFIG_NVME_FC is not set
 # CONFIG_NVME_TARGET is not set
+# end of NVME Support
 
 #
 # Misc devices
@@ -1832,11 +1939,11 @@ CONFIG_SENSORS_BH1770=m
 CONFIG_SENSORS_APDS990X=m
 CONFIG_HMC6352=m
 CONFIG_DS1682=m
-# CONFIG_USB_SWITCH_FSA9480 is not set
 # CONFIG_LATTICE_ECP3_CONFIG is not set
 CONFIG_SRAM=y
 CONFIG_SRAM_EXEC=y
 # CONFIG_PCI_ENDPOINT_TEST is not set
+# CONFIG_XILINX_SDFEC is not set
 CONFIG_MISC_RTSX=m
 CONFIG_PVPANIC=m
 CONFIG_C2PORT=m
@@ -1852,6 +1959,8 @@ CONFIG_EEPROM_93CX6=m
 # CONFIG_EEPROM_93XX46 is not set
 # CONFIG_EEPROM_IDT_89HPESX is not set
 CONFIG_EEPROM_EE1004=m
+# end of EEPROM support
+
 CONFIG_CB710_CORE=m
 # CONFIG_CB710_DEBUG is not set
 CONFIG_CB710_DEBUG_ASSUMPTIONS=y
@@ -1860,6 +1969,8 @@ CONFIG_CB710_DEBUG_ASSUMPTIONS=y
 # Texas Instruments shared transport line discipline
 #
 CONFIG_TI_ST=m
+# end of Texas Instruments shared transport line discipline
+
 # CONFIG_SENSORS_LIS3_SPI is not set
 CONFIG_SENSORS_LIS3_I2C=m
 # CONFIG_ALTERA_STAPL is not set
@@ -1902,11 +2013,15 @@ CONFIG_VOP_BUS=m
 #
 CONFIG_VOP=m
 CONFIG_VHOST_RING=m
+# end of Intel MIC & related support
+
 # CONFIG_ECHO is not set
 CONFIG_MISC_ALCOR_PCI=m
 CONFIG_MISC_RTSX_PCI=m
 CONFIG_MISC_RTSX_USB=m
 CONFIG_HABANA_AI=m
+# end of Misc devices
+
 CONFIG_HAVE_IDE=y
 # CONFIG_IDE is not set
 
@@ -1925,7 +2040,6 @@ CONFIG_SCSI_NETLINK=y
 #
 CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_ST=m
-CONFIG_CHR_DEV_OSST=m
 CONFIG_BLK_DEV_SR=m
 CONFIG_BLK_DEV_SR_VENDOR=y
 CONFIG_CHR_DEV_SG=m
@@ -1946,6 +2060,8 @@ CONFIG_SCSI_SAS_LIBSAS=m
 CONFIG_SCSI_SAS_ATA=y
 CONFIG_SCSI_SAS_HOST_SMP=y
 CONFIG_SCSI_SRP_ATTRS=m
+# end of SCSI Transports
+
 CONFIG_SCSI_LOWLEVEL=y
 CONFIG_ISCSI_TCP=m
 CONFIG_ISCSI_BOOT_SYSFS=m
@@ -1983,6 +2099,7 @@ CONFIG_LIBFCOE=m
 CONFIG_FCOE=m
 # CONFIG_SCSI_SNIC is not set
 # CONFIG_SCSI_DMX3191D is not set
+# CONFIG_SCSI_FDOMAIN_PCI is not set
 CONFIG_SCSI_GDTH=m
 # CONFIG_SCSI_IPS is not set
 # CONFIG_SCSI_INITIO is not set
@@ -2005,6 +2122,8 @@ CONFIG_SCSI_PM8001=m
 CONFIG_SCSI_VIRTIO=m
 # CONFIG_SCSI_CHELSIO_FCOE is not set
 # CONFIG_SCSI_DH is not set
+# end of SCSI device support
+
 CONFIG_ATA=y
 CONFIG_ATA_VERBOSE_ERROR=y
 CONFIG_SATA_PMP=y
@@ -2132,6 +2251,7 @@ CONFIG_DM_MULTIPATH=m
 CONFIG_DM_MULTIPATH_QL=m
 CONFIG_DM_MULTIPATH_ST=m
 CONFIG_DM_DELAY=m
+CONFIG_DM_DUST=m
 CONFIG_DM_UEVENT=y
 CONFIG_DM_FLAKEY=m
 # CONFIG_DM_VERITY is not set
@@ -2163,6 +2283,8 @@ CONFIG_FIREWIRE_OHCI=m
 CONFIG_FIREWIRE_SBP2=m
 CONFIG_FIREWIRE_NET=m
 CONFIG_FIREWIRE_NOSY=m
+# end of IEEE 1394 (FireWire) support
+
 CONFIG_NETDEVICES=y
 CONFIG_MII=y
 CONFIG_NET_CORE=y
@@ -2235,11 +2357,16 @@ CONFIG_NET_DSA_MICROCHIP_KSZ9477_SPI=m
 CONFIG_NET_DSA_MV88E6XXX=m
 CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y
 # CONFIG_NET_DSA_MV88E6XXX_PTP is not set
+CONFIG_NET_DSA_SJA1105=m
+# CONFIG_NET_DSA_SJA1105_PTP is not set
 CONFIG_NET_DSA_QCA8K=m
 # CONFIG_NET_DSA_REALTEK_SMI is not set
 # CONFIG_NET_DSA_SMSC_LAN9303_I2C is not set
 # CONFIG_NET_DSA_SMSC_LAN9303_MDIO is not set
-# CONFIG_NET_DSA_VITESSE_VSC73XX is not set
+# CONFIG_NET_DSA_VITESSE_VSC73XX_SPI is not set
+# CONFIG_NET_DSA_VITESSE_VSC73XX_PLATFORM is not set
+# end of Distributed Switch Architecture drivers
+
 CONFIG_ETHERNET=y
 CONFIG_MDIO=m
 CONFIG_NET_VENDOR_3COM=y
@@ -2310,6 +2437,7 @@ CONFIG_EZCHIP_NPS_MANAGEMENT_ENET=m
 CONFIG_NET_VENDOR_FARADAY=y
 # CONFIG_FTMAC100 is not set
 # CONFIG_FTGMAC100 is not set
+CONFIG_NET_VENDOR_GOOGLE=y
 # CONFIG_NET_VENDOR_HISILICON is not set
 CONFIG_NET_VENDOR_HP=y
 # CONFIG_HP100 is not set
@@ -2419,7 +2547,6 @@ CONFIG_NET_VENDOR_TEHUTI=y
 # CONFIG_TEHUTI is not set
 CONFIG_NET_VENDOR_TI=y
 # CONFIG_TI_CPSW_PHY_SEL is not set
-# CONFIG_TI_CPSW_ALE is not set
 # CONFIG_TLAN is not set
 CONFIG_NET_VENDOR_VIA=y
 # CONFIG_VIA_RHINE is not set
@@ -2427,6 +2554,8 @@ CONFIG_NET_VENDOR_VIA=y
 CONFIG_NET_VENDOR_WIZNET=y
 # CONFIG_WIZNET_W5100 is not set
 # CONFIG_WIZNET_W5300 is not set
+CONFIG_NET_VENDOR_XILINX=y
+# CONFIG_XILINX_AXI_EMAC is not set
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
 CONFIG_MDIO_DEVICE=y
@@ -2477,6 +2606,7 @@ CONFIG_MICROCHIP_PHY=m
 # CONFIG_MICROCHIP_T1_PHY is not set
 CONFIG_MICROSEMI_PHY=m
 CONFIG_NATIONAL_PHY=m
+# CONFIG_NXP_TJA11XX_PHY is not set
 CONFIG_QSEMI_PHY=m
 CONFIG_REALTEK_PHY=m
 CONFIG_RENESAS_PHY=m
@@ -2650,6 +2780,8 @@ CONFIG_IWL3945=m
 # iwl3945 / iwl4965 Debugging Options
 #
 # CONFIG_IWLEGACY_DEBUG is not set
+# end of iwl3945 / iwl4965 Debugging Options
+
 CONFIG_IWLWIFI=m
 CONFIG_IWLWIFI_LEDS=y
 CONFIG_IWLDVM=m
@@ -2661,6 +2793,8 @@ CONFIG_IWLWIFI_OPMODE_MODULAR=y
 #
 # CONFIG_IWLWIFI_DEBUG is not set
 # CONFIG_IWLWIFI_DEVICE_TRACING is not set
+# end of Debugging Options
+
 # CONFIG_WLAN_VENDOR_INTERSIL is not set
 CONFIG_WLAN_VENDOR_MARVELL=y
 CONFIG_LIBERTAS=m
@@ -2691,6 +2825,7 @@ CONFIG_MT76x2_COMMON=m
 # CONFIG_MT76x2E is not set
 CONFIG_MT76x2U=m
 CONFIG_MT7603E=m
+CONFIG_MT7615E=m
 CONFIG_WLAN_VENDOR_RALINK=y
 CONFIG_RT2X00=m
 CONFIG_RT2400PCI=m
@@ -2742,6 +2877,13 @@ CONFIG_RTL8192C_COMMON=m
 CONFIG_RTL8723_COMMON=m
 CONFIG_RTLBTCOEXIST=m
 # CONFIG_RTL8XXXU is not set
+CONFIG_RTW88=m
+CONFIG_RTW88_CORE=m
+CONFIG_RTW88_PCI=m
+CONFIG_RTW88_8822BE=y
+CONFIG_RTW88_8822CE=y
+# CONFIG_RTW88_DEBUG is not set
+# CONFIG_RTW88_DEBUGFS is not set
 # CONFIG_WLAN_VENDOR_RSI is not set
 CONFIG_WLAN_VENDOR_ST=y
 # CONFIG_CW1200 is not set
@@ -2760,34 +2902,18 @@ CONFIG_VIRT_WIFI=m
 CONFIG_WIMAX_I2400M=m
 CONFIG_WIMAX_I2400M_USB=m
 CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
+# end of WiMAX Wireless Broadband devices
+
 # CONFIG_WAN is not set
 CONFIG_IEEE802154_DRIVERS=m
 CONFIG_VMXNET3=m
 # CONFIG_NETDEVSIM is not set
 CONFIG_NET_FAILOVER=m
 CONFIG_ISDN=y
-# CONFIG_ISDN_I4L is not set
 CONFIG_ISDN_CAPI=m
 CONFIG_CAPI_TRACE=y
 CONFIG_ISDN_CAPI_CAPI20=m
 CONFIG_ISDN_CAPI_MIDDLEWARE=y
-
-#
-# CAPI hardware drivers
-#
-CONFIG_CAPI_AVM=y
-CONFIG_ISDN_DRV_AVMB1_B1PCI=m
-CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
-CONFIG_ISDN_DRV_AVMB1_T1PCI=m
-CONFIG_ISDN_DRV_AVMB1_C4=m
-CONFIG_ISDN_DRV_GIGASET=m
-CONFIG_GIGASET_CAPI=y
-CONFIG_GIGASET_BASE=m
-CONFIG_GIGASET_M105=m
-CONFIG_GIGASET_M101=m
-# CONFIG_GIGASET_DEBUG is not set
-CONFIG_HYSDN=m
-CONFIG_HYSDN_CAPI=y
 CONFIG_MISDN=m
 CONFIG_MISDN_DSP=m
 CONFIG_MISDN_L1OIP=m
@@ -2835,6 +2961,7 @@ CONFIG_INPUT_KEYBOARD=y
 CONFIG_KEYBOARD_ADP5588=m
 # CONFIG_KEYBOARD_ADP5589 is not set
 CONFIG_KEYBOARD_ATKBD=y
+CONFIG_KEYBOARD_QT1050=m
 # CONFIG_KEYBOARD_QT1070 is not set
 CONFIG_KEYBOARD_QT2160=m
 CONFIG_KEYBOARD_DLINK_DIR685=m
@@ -2886,8 +3013,8 @@ CONFIG_JOYSTICK_INTERACT=m
 CONFIG_JOYSTICK_SIDEWINDER=m
 CONFIG_JOYSTICK_TMDC=m
 CONFIG_JOYSTICK_IFORCE=m
-CONFIG_JOYSTICK_IFORCE_USB=y
-CONFIG_JOYSTICK_IFORCE_232=y
+CONFIG_JOYSTICK_IFORCE_USB=m
+CONFIG_JOYSTICK_IFORCE_232=m
 CONFIG_JOYSTICK_WARRIOR=m
 CONFIG_JOYSTICK_MAGELLAN=m
 CONFIG_JOYSTICK_SPACEORB=m
@@ -3003,16 +3130,19 @@ CONFIG_TOUCHSCREEN_TPS6507X=m
 # CONFIG_TOUCHSCREEN_ZET6223 is not set
 # CONFIG_TOUCHSCREEN_ZFORCE is not set
 # CONFIG_TOUCHSCREEN_ROHM_BU21023 is not set
+CONFIG_TOUCHSCREEN_IQS5XX=m
 CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_AD714X is not set
 # CONFIG_INPUT_ATMEL_CAPTOUCH is not set
 # CONFIG_INPUT_BMA150 is not set
 # CONFIG_INPUT_E3X0_BUTTON is not set
 CONFIG_INPUT_MSM_VIBRATOR=m
+CONFIG_INPUT_MAX77650_ONKEY=m
 # CONFIG_INPUT_MMA8450 is not set
 # CONFIG_INPUT_GP2A is not set
 CONFIG_INPUT_GPIO_BEEPER=m
 CONFIG_INPUT_GPIO_DECODER=m
+CONFIG_INPUT_GPIO_VIBRA=m
 CONFIG_INPUT_ATI_REMOTE2=m
 CONFIG_INPUT_KEYSPAN_REMOTE=m
 # CONFIG_INPUT_KXTJ9 is not set
@@ -3047,7 +3177,6 @@ CONFIG_SERIO_LIBPS2=y
 # CONFIG_SERIO_PS2MULT is not set
 # CONFIG_SERIO_ARC_PS2 is not set
 # CONFIG_SERIO_APBPS2 is not set
-CONFIG_SERIO_OLPC_APSP=m
 CONFIG_SERIO_SUN4I_PS2=m
 CONFIG_SERIO_GPIO_PS2=m
 # CONFIG_USERIO is not set
@@ -3056,6 +3185,8 @@ CONFIG_GAMEPORT=m
 # CONFIG_GAMEPORT_L4 is not set
 # CONFIG_GAMEPORT_EMU10K1 is not set
 # CONFIG_GAMEPORT_FM801 is not set
+# end of Hardware I/O ports
+# end of Input device support
 
 #
 # Character devices
@@ -3073,6 +3204,7 @@ CONFIG_UNIX98_PTYS=y
 CONFIG_NOZOMI=m
 CONFIG_N_GSM=m
 # CONFIG_TRACE_SINK is not set
+CONFIG_NULL_TTY=m
 CONFIG_LDISC_AUTOLOAD=y
 CONFIG_DEVMEM=y
 # CONFIG_DEVKMEM is not set
@@ -3109,6 +3241,7 @@ CONFIG_SERIAL_MAX3100=m
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_SERIAL_JSM is not set
+CONFIG_SERIAL_SIFIVE=m
 # CONFIG_SERIAL_SCCNXP is not set
 # CONFIG_SERIAL_SC16IS7XX is not set
 # CONFIG_SERIAL_BCM63XX is not set
@@ -3123,6 +3256,9 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_SERIAL_ST_ASC is not set
 CONFIG_SERIAL_MVEBU_UART=y
 CONFIG_SERIAL_MVEBU_CONSOLE=y
+# end of Serial drivers
+
+CONFIG_SERIAL_MCTRL_GPIO=y
 CONFIG_SERIAL_DEV_BUS=m
 # CONFIG_TTY_PRINTK is not set
 # CONFIG_PRINTER is not set
@@ -3131,6 +3267,7 @@ CONFIG_HVC_DRIVER=y
 # CONFIG_HVC_DCC is not set
 CONFIG_VIRTIO_CONSOLE=m
 # CONFIG_IPMI_HANDLER is not set
+# CONFIG_IPMB_DEVICE_INTERFACE is not set
 CONFIG_HW_RANDOM=m
 CONFIG_HW_RANDOM_TIMERIOMEM=m
 CONFIG_HW_RANDOM_OMAP=m
@@ -3140,6 +3277,7 @@ CONFIG_HW_RANDOM_VIRTIO=m
 # CONFIG_TCG_TPM is not set
 CONFIG_DEVPORT=y
 # CONFIG_XILLYBUS is not set
+# end of Character devices
 
 #
 # I2C support
@@ -3163,6 +3301,8 @@ CONFIG_I2C_MUX_PINCTRL=m
 CONFIG_I2C_MUX_REG=m
 # CONFIG_I2C_DEMUX_PINCTRL is not set
 CONFIG_I2C_MUX_MLXCPLD=m
+# end of Multiplexer I2C Chip support
+
 CONFIG_I2C_HELPER_AUTO=y
 CONFIG_I2C_SMBUS=m
 CONFIG_I2C_ALGOBIT=m
@@ -3220,12 +3360,16 @@ CONFIG_I2C_TINY_USB=m
 #
 # Other I2C/SMBus bus drivers
 #
+# end of I2C Hardware Bus support
+
 # CONFIG_I2C_STUB is not set
 CONFIG_I2C_SLAVE=y
 CONFIG_I2C_SLAVE_EEPROM=m
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
+# end of I2C support
+
 CONFIG_I3C=m
 CONFIG_CDNS_I3C_MASTER=m
 CONFIG_DW_I3C_MASTER=m
@@ -3293,6 +3437,8 @@ CONFIG_PTP_1588_CLOCK=m
 #
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
+# end of PTP clock support
+
 CONFIG_PINCTRL=y
 CONFIG_PINMUX=y
 CONFIG_PINCONF=y
@@ -3302,11 +3448,31 @@ CONFIG_GENERIC_PINCONF=y
 CONFIG_PINCTRL_MCP23S08=m
 # CONFIG_PINCTRL_SINGLE is not set
 # CONFIG_PINCTRL_SX150X is not set
+CONFIG_PINCTRL_STMFX=m
 # CONFIG_PINCTRL_OCELOT is not set
 CONFIG_PINCTRL_MVEBU=y
 CONFIG_PINCTRL_KIRKWOOD=y
 CONFIG_PINCTRL_SUNXI=y
 CONFIG_PINCTRL_SUNIV_F1C100S=y
+# CONFIG_PINCTRL_SUN4I_A10 is not set
+# CONFIG_PINCTRL_SUN5I is not set
+# CONFIG_PINCTRL_SUN6I_A31 is not set
+# CONFIG_PINCTRL_SUN6I_A31_R is not set
+# CONFIG_PINCTRL_SUN8I_A23 is not set
+# CONFIG_PINCTRL_SUN8I_A33 is not set
+# CONFIG_PINCTRL_SUN8I_A83T is not set
+# CONFIG_PINCTRL_SUN8I_A83T_R is not set
+# CONFIG_PINCTRL_SUN8I_A23_R is not set
+# CONFIG_PINCTRL_SUN8I_H3 is not set
+# CONFIG_PINCTRL_SUN8I_H3_R is not set
+# CONFIG_PINCTRL_SUN8I_V3S is not set
+# CONFIG_PINCTRL_SUN9I_A80 is not set
+# CONFIG_PINCTRL_SUN9I_A80_R is not set
+# CONFIG_PINCTRL_SUN50I_A64 is not set
+# CONFIG_PINCTRL_SUN50I_A64_R is not set
+# CONFIG_PINCTRL_SUN50I_H5 is not set
+# CONFIG_PINCTRL_SUN50I_H6 is not set
+# CONFIG_PINCTRL_SUN50I_H6_R is not set
 CONFIG_PINCTRL_MADERA=m
 CONFIG_PINCTRL_CS47L35=y
 CONFIG_PINCTRL_CS47L85=y
@@ -3333,7 +3499,6 @@ CONFIG_GPIO_CADENCE=m
 # CONFIG_GPIO_GRGPIO is not set
 # CONFIG_GPIO_HLWD is not set
 CONFIG_GPIO_MB86S7X=m
-CONFIG_GPIO_MOCKUP=m
 # CONFIG_GPIO_MPC8XXX is not set
 CONFIG_GPIO_MVEBU=y
 CONFIG_GPIO_SAMA5D2_PIOBU=m
@@ -3341,6 +3506,7 @@ CONFIG_GPIO_SYSCON=m
 # CONFIG_GPIO_XILINX is not set
 # CONFIG_GPIO_ZEVIO is not set
 CONFIG_GPIO_AMD_FCH=m
+# end of Memory mapped GPIO drivers
 
 #
 # I2C GPIO expanders
@@ -3353,13 +3519,16 @@ CONFIG_GPIO_GW_PLD=m
 # CONFIG_GPIO_PCA953X is not set
 # CONFIG_GPIO_PCF857X is not set
 # CONFIG_GPIO_TPIC2810 is not set
+# end of I2C GPIO expanders
 
 #
 # MFD GPIO expanders
 #
 # CONFIG_HTC_EGPIO is not set
 CONFIG_GPIO_MADERA=m
+CONFIG_GPIO_MAX77650=m
 CONFIG_GPIO_TQMX86=m
+# end of MFD GPIO expanders
 
 #
 # PCI GPIO expanders
@@ -3368,6 +3537,7 @@ CONFIG_GPIO_TQMX86=m
 # CONFIG_GPIO_PCI_IDIO_16 is not set
 # CONFIG_GPIO_PCIE_IDIO_24 is not set
 # CONFIG_GPIO_RDC321X is not set
+# end of PCI GPIO expanders
 
 #
 # SPI GPIO expanders
@@ -3378,10 +3548,14 @@ CONFIG_GPIO_MAX3191X=m
 # CONFIG_GPIO_MC33880 is not set
 # CONFIG_GPIO_PISOSR is not set
 # CONFIG_GPIO_XRA1403 is not set
+# end of SPI GPIO expanders
 
 #
 # USB GPIO expanders
 #
+# end of USB GPIO expanders
+
+CONFIG_GPIO_MOCKUP=m
 CONFIG_W1=m
 CONFIG_W1_CON=y
 
@@ -3393,6 +3567,7 @@ CONFIG_W1_MASTER_DS2490=m
 CONFIG_W1_MASTER_DS2482=m
 # CONFIG_W1_MASTER_DS1WM is not set
 # CONFIG_W1_MASTER_GPIO is not set
+# end of 1-wire Bus Masters
 
 #
 # 1-wire Slaves
@@ -3413,6 +3588,8 @@ CONFIG_W1_SLAVE_DS2438=m
 # CONFIG_W1_SLAVE_DS2781 is not set
 # CONFIG_W1_SLAVE_DS28E04 is not set
 # CONFIG_W1_SLAVE_DS28E17 is not set
+# end of 1-wire Slaves
+
 # CONFIG_POWER_AVS is not set
 CONFIG_POWER_RESET=y
 # CONFIG_POWER_RESET_BRCMKONA is not set
@@ -3426,8 +3603,10 @@ CONFIG_POWER_RESET_GPIO_RESTART=y
 # CONFIG_POWER_RESET_SYSCON is not set
 # CONFIG_POWER_RESET_SYSCON_POWEROFF is not set
 # CONFIG_SYSCON_REBOOT_MODE is not set
+# CONFIG_NVMEM_REBOOT_MODE is not set
 CONFIG_POWER_SUPPLY=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
+CONFIG_POWER_SUPPLY_HWMON=y
 # CONFIG_PDA_POWER is not set
 # CONFIG_TEST_POWER is not set
 CONFIG_CHARGER_ADP5061=m
@@ -3447,8 +3626,9 @@ CONFIG_CHARGER_PCF50633=m
 # CONFIG_CHARGER_LP8727 is not set
 # CONFIG_CHARGER_GPIO is not set
 # CONFIG_CHARGER_MANAGER is not set
-# CONFIG_CHARGER_LTC3651 is not set
+CONFIG_CHARGER_LT3651=m
 # CONFIG_CHARGER_DETECTOR_MAX14656 is not set
+CONFIG_CHARGER_MAX77650=m
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_BQ24257 is not set
 # CONFIG_CHARGER_BQ24735 is not set
@@ -3456,6 +3636,7 @@ CONFIG_CHARGER_PCF50633=m
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
 # CONFIG_CHARGER_RT9455 is not set
+CONFIG_CHARGER_UCS1002=m
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
@@ -3613,6 +3794,7 @@ CONFIG_THERMAL_GOV_STEP_WISE=y
 # CONFIG_CPU_THERMAL is not set
 # CONFIG_CLOCK_THERMAL is not set
 # CONFIG_THERMAL_EMULATION is not set
+CONFIG_THERMAL_MMIO=m
 # CONFIG_QORIQ_THERMAL is not set
 CONFIG_KIRKWOOD_THERMAL=m
 # CONFIG_ARMADA_THERMAL is not set
@@ -3620,8 +3802,14 @@ CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_CORE=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
 CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
+CONFIG_WATCHDOG_OPEN_TIMEOUT=0
 # CONFIG_WATCHDOG_SYSFS is not set
 
+#
+# Watchdog Pretimeout Governors
+#
+# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
+
 #
 # Watchdog Device Drivers
 #
@@ -3651,11 +3839,6 @@ CONFIG_STPMIC1_WATCHDOG=m
 # USB-based Watchdog Cards
 #
 # CONFIG_USBPCWATCHDOG is not set
-
-#
-# Watchdog Pretimeout Governors
-#
-# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
 CONFIG_SSB_POSSIBLE=y
 CONFIG_SSB=m
 CONFIG_SSB_SPROM=y
@@ -3700,9 +3883,11 @@ CONFIG_MFD_SUN4I_GPADC=m
 CONFIG_MFD_MADERA=m
 CONFIG_MFD_MADERA_I2C=m
 CONFIG_MFD_MADERA_SPI=m
+# CONFIG_MFD_CS47L15 is not set
 CONFIG_MFD_CS47L35=y
 CONFIG_MFD_CS47L85=y
 CONFIG_MFD_CS47L90=y
+# CONFIG_MFD_CS47L92 is not set
 # CONFIG_MFD_ASIC3 is not set
 # CONFIG_PMIC_DA903X is not set
 # CONFIG_MFD_DA9052_SPI is not set
@@ -3726,6 +3911,7 @@ CONFIG_LPC_SCH=m
 # CONFIG_MFD_88PM860X is not set
 # CONFIG_MFD_MAX14577 is not set
 # CONFIG_MFD_MAX77620 is not set
+CONFIG_MFD_MAX77650=m
 # CONFIG_MFD_MAX77686 is not set
 # CONFIG_MFD_MAX77693 is not set
 # CONFIG_MFD_MAX77843 is not set
@@ -3757,7 +3943,7 @@ CONFIG_MFD_SM501=m
 # CONFIG_MFD_SMSC is not set
 # CONFIG_ABX500_CORE is not set
 # CONFIG_MFD_STMPE is not set
-# CONFIG_MFD_SUN6I_PRCM is not set
+CONFIG_MFD_SUN6I_PRCM=y
 CONFIG_MFD_SYSCON=y
 CONFIG_MFD_TI_AM335X_TSCADC=m
 # CONFIG_MFD_LP3943 is not set
@@ -3797,8 +3983,12 @@ CONFIG_MFD_TQMX86=m
 # CONFIG_MFD_WM8350_I2C is not set
 # CONFIG_MFD_WM8994 is not set
 # CONFIG_MFD_ROHM_BD718XX is not set
+# CONFIG_MFD_ROHM_BD70528 is not set
 CONFIG_MFD_STPMIC1=m
+CONFIG_MFD_STMFX=m
 # CONFIG_RAVE_SP_CORE is not set
+# end of Multifunction device drivers
+
 CONFIG_REGULATOR=y
 # CONFIG_REGULATOR_DEBUG is not set
 CONFIG_REGULATOR_FIXED_VOLTAGE=m
@@ -3808,6 +3998,8 @@ CONFIG_REGULATOR_USERSPACE_CONSUMER=m
 CONFIG_REGULATOR_ACT8865=m
 # CONFIG_REGULATOR_AD5398 is not set
 # CONFIG_REGULATOR_ANATOP is not set
+# CONFIG_REGULATOR_ARIZONA_LDO1 is not set
+# CONFIG_REGULATOR_ARIZONA_MICSUPP is not set
 # CONFIG_REGULATOR_DA9210 is not set
 # CONFIG_REGULATOR_DA9211 is not set
 # CONFIG_REGULATOR_FAN53555 is not set
@@ -3821,6 +4013,7 @@ CONFIG_REGULATOR_LP3971=m
 # CONFIG_REGULATOR_LTC3589 is not set
 # CONFIG_REGULATOR_LTC3676 is not set
 CONFIG_REGULATOR_MAX1586=m
+CONFIG_REGULATOR_MAX77650=m
 CONFIG_REGULATOR_MAX8649=m
 CONFIG_REGULATOR_MAX8660=m
 # CONFIG_REGULATOR_MAX8952 is not set
@@ -3833,6 +4026,7 @@ CONFIG_REGULATOR_PCF50633=m
 # CONFIG_REGULATOR_PV88080 is not set
 # CONFIG_REGULATOR_PV88090 is not set
 # CONFIG_REGULATOR_QCOM_SPMI is not set
+# CONFIG_REGULATOR_SLG51000 is not set
 CONFIG_REGULATOR_STPMIC1=m
 # CONFIG_REGULATOR_SY8106A is not set
 # CONFIG_REGULATOR_TPS51632 is not set
@@ -4016,6 +4210,7 @@ CONFIG_DVB_USB_DIBUSB_MC=m
 CONFIG_DVB_USB_DIB0700=m
 CONFIG_DVB_USB_UMT_010=m
 CONFIG_DVB_USB_CXUSB=m
+# CONFIG_DVB_USB_CXUSB_ANALOG is not set
 CONFIG_DVB_USB_M920X=m
 CONFIG_DVB_USB_DIGITV=m
 CONFIG_DVB_USB_VP7045=m
@@ -4154,6 +4349,7 @@ CONFIG_RADIO_WL1273=m
 # Texas Instruments WL128x FM driver (ST based)
 #
 CONFIG_RADIO_WL128X=m
+# end of Texas Instruments WL128x FM driver (ST based)
 
 #
 # Supported FireWire (IEEE 1394) Adapters
@@ -4187,47 +4383,154 @@ CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
 CONFIG_MEDIA_ATTACH=y
 CONFIG_VIDEO_IR_I2C=m
 
+#
+# I2C Encoders, decoders, sensors and other helper chips
+#
+
 #
 # Audio decoders, processors and mixers
 #
+# CONFIG_VIDEO_TVAUDIO is not set
+# CONFIG_VIDEO_TDA7432 is not set
+# CONFIG_VIDEO_TDA9840 is not set
+# CONFIG_VIDEO_TDA1997X is not set
+# CONFIG_VIDEO_TEA6415C is not set
+# CONFIG_VIDEO_TEA6420 is not set
 CONFIG_VIDEO_MSP3400=m
+# CONFIG_VIDEO_CS3308 is not set
+# CONFIG_VIDEO_CS5345 is not set
 CONFIG_VIDEO_CS53L32A=m
+# CONFIG_VIDEO_TLV320AIC23B is not set
+# CONFIG_VIDEO_UDA1342 is not set
 CONFIG_VIDEO_WM8775=m
+# CONFIG_VIDEO_WM8739 is not set
+# CONFIG_VIDEO_VP27SMPX is not set
+# CONFIG_VIDEO_SONY_BTF_MPX is not set
 
 #
 # RDS decoders
 #
+# CONFIG_VIDEO_SAA6588 is not set
 
 #
 # Video decoders
 #
+# CONFIG_VIDEO_ADV7180 is not set
+# CONFIG_VIDEO_ADV7183 is not set
+# CONFIG_VIDEO_ADV748X is not set
+# CONFIG_VIDEO_ADV7604 is not set
+# CONFIG_VIDEO_ADV7842 is not set
+# CONFIG_VIDEO_BT819 is not set
+# CONFIG_VIDEO_BT856 is not set
+# CONFIG_VIDEO_BT866 is not set
+# CONFIG_VIDEO_KS0127 is not set
+# CONFIG_VIDEO_ML86V7667 is not set
+# CONFIG_VIDEO_SAA7110 is not set
 CONFIG_VIDEO_SAA711X=m
+# CONFIG_VIDEO_TC358743 is not set
+# CONFIG_VIDEO_TVP514X is not set
+# CONFIG_VIDEO_TVP5150 is not set
+# CONFIG_VIDEO_TVP7002 is not set
+# CONFIG_VIDEO_TW2804 is not set
+# CONFIG_VIDEO_TW9903 is not set
+# CONFIG_VIDEO_TW9906 is not set
+# CONFIG_VIDEO_TW9910 is not set
+# CONFIG_VIDEO_VPX3220 is not set
 
 #
 # Video and audio decoders
 #
+# CONFIG_VIDEO_SAA717X is not set
 CONFIG_VIDEO_CX25840=m
 
 #
 # Video encoders
 #
+# CONFIG_VIDEO_SAA7127 is not set
+# CONFIG_VIDEO_SAA7185 is not set
+# CONFIG_VIDEO_ADV7170 is not set
+# CONFIG_VIDEO_ADV7175 is not set
+# CONFIG_VIDEO_ADV7343 is not set
+# CONFIG_VIDEO_ADV7393 is not set
+# CONFIG_VIDEO_ADV7511 is not set
+# CONFIG_VIDEO_AD9389B is not set
+# CONFIG_VIDEO_AK881X is not set
+# CONFIG_VIDEO_THS8200 is not set
 
 #
 # Camera sensor devices
 #
+# CONFIG_VIDEO_IMX214 is not set
+# CONFIG_VIDEO_IMX258 is not set
+# CONFIG_VIDEO_IMX274 is not set
+# CONFIG_VIDEO_IMX319 is not set
+# CONFIG_VIDEO_IMX355 is not set
+# CONFIG_VIDEO_OV2640 is not set
+# CONFIG_VIDEO_OV2659 is not set
+# CONFIG_VIDEO_OV2680 is not set
+# CONFIG_VIDEO_OV2685 is not set
+# CONFIG_VIDEO_OV5640 is not set
+# CONFIG_VIDEO_OV5645 is not set
+# CONFIG_VIDEO_OV5647 is not set
+# CONFIG_VIDEO_OV6650 is not set
+# CONFIG_VIDEO_OV5670 is not set
+# CONFIG_VIDEO_OV5695 is not set
+# CONFIG_VIDEO_OV7251 is not set
+# CONFIG_VIDEO_OV772X is not set
+# CONFIG_VIDEO_OV7640 is not set
 CONFIG_VIDEO_OV7670=m
+# CONFIG_VIDEO_OV7740 is not set
+# CONFIG_VIDEO_OV8856 is not set
+# CONFIG_VIDEO_OV9640 is not set
+# CONFIG_VIDEO_OV9650 is not set
+# CONFIG_VIDEO_OV13858 is not set
+# CONFIG_VIDEO_VS6624 is not set
+# CONFIG_VIDEO_MT9M001 is not set
+# CONFIG_VIDEO_MT9M032 is not set
+# CONFIG_VIDEO_MT9M111 is not set
+# CONFIG_VIDEO_MT9P031 is not set
+# CONFIG_VIDEO_MT9T001 is not set
+# CONFIG_VIDEO_MT9T112 is not set
+# CONFIG_VIDEO_MT9V011 is not set
+# CONFIG_VIDEO_MT9V032 is not set
+# CONFIG_VIDEO_MT9V111 is not set
+# CONFIG_VIDEO_SR030PC30 is not set
+# CONFIG_VIDEO_NOON010PC30 is not set
+# CONFIG_VIDEO_M5MOLS is not set
+# CONFIG_VIDEO_RJ54N1 is not set
+# CONFIG_VIDEO_S5K6AA is not set
+# CONFIG_VIDEO_S5K6A3 is not set
+# CONFIG_VIDEO_S5K4ECGX is not set
+# CONFIG_VIDEO_S5K5BAF is not set
+# CONFIG_VIDEO_SMIAPP is not set
+# CONFIG_VIDEO_ET8EK8 is not set
+# CONFIG_VIDEO_S5C73M3 is not set
+
+#
+# Lens drivers
+#
+# CONFIG_VIDEO_AD5820 is not set
+# CONFIG_VIDEO_AK7375 is not set
+# CONFIG_VIDEO_DW9714 is not set
+# CONFIG_VIDEO_DW9807_VCM is not set
 
 #
 # Flash devices
 #
+# CONFIG_VIDEO_ADP1653 is not set
+# CONFIG_VIDEO_LM3560 is not set
+# CONFIG_VIDEO_LM3646 is not set
 
 #
 # Video improvement chips
 #
+# CONFIG_VIDEO_UPD64031A is not set
+# CONFIG_VIDEO_UPD64083 is not set
 
 #
 # Audio/Video compression chips
 #
+# CONFIG_VIDEO_SAA6752HS is not set
 
 #
 # SDR tuner chips
@@ -4236,12 +4539,29 @@ CONFIG_VIDEO_OV7670=m
 #
 # Miscellaneous helper chips
 #
+# CONFIG_VIDEO_THS7303 is not set
+# CONFIG_VIDEO_M52790 is not set
+# CONFIG_VIDEO_I2C is not set
+# CONFIG_VIDEO_ST_MIPID02 is not set
+# end of I2C Encoders, decoders, sensors and other helper chips
+
+#
+# SPI helper chips
+#
+# CONFIG_VIDEO_GS1662 is not set
+# end of SPI helper chips
 
 #
 # Media SPI Adapters
 #
 # CONFIG_CXD2880_SPI_DRV is not set
+# end of Media SPI Adapters
+
 CONFIG_MEDIA_TUNER=m
+
+#
+# Customize TV tuners
+#
 CONFIG_MEDIA_TUNER_SIMPLE=m
 CONFIG_MEDIA_TUNER_TDA18250=m
 CONFIG_MEDIA_TUNER_TDA8290=m
@@ -4250,10 +4570,12 @@ CONFIG_MEDIA_TUNER_TDA18271=m
 CONFIG_MEDIA_TUNER_TDA9887=m
 CONFIG_MEDIA_TUNER_TEA5761=m
 CONFIG_MEDIA_TUNER_TEA5767=m
+# CONFIG_MEDIA_TUNER_MSI001 is not set
 CONFIG_MEDIA_TUNER_MT20XX=m
 CONFIG_MEDIA_TUNER_MT2060=m
 CONFIG_MEDIA_TUNER_MT2063=m
 CONFIG_MEDIA_TUNER_MT2266=m
+# CONFIG_MEDIA_TUNER_MT2131 is not set
 CONFIG_MEDIA_TUNER_QT1010=m
 CONFIG_MEDIA_TUNER_XC2028=m
 CONFIG_MEDIA_TUNER_XC5000=m
@@ -4276,6 +4598,12 @@ CONFIG_MEDIA_TUNER_IT913X=m
 CONFIG_MEDIA_TUNER_R820T=m
 CONFIG_MEDIA_TUNER_MXL301RF=m
 CONFIG_MEDIA_TUNER_QM1D1C0042=m
+# CONFIG_MEDIA_TUNER_QM1D1B0004 is not set
+# end of Customize TV tuners
+
+#
+# Customise DVB Frontends
+#
 
 #
 # Multistandard (satellite) frontends
@@ -4283,7 +4611,10 @@ CONFIG_MEDIA_TUNER_QM1D1C0042=m
 CONFIG_DVB_STB0899=m
 CONFIG_DVB_STB6100=m
 CONFIG_DVB_STV090x=m
+# CONFIG_DVB_STV0910 is not set
 CONFIG_DVB_STV6110x=m
+# CONFIG_DVB_STV6111 is not set
+# CONFIG_DVB_MXL5XX is not set
 CONFIG_DVB_M88DS3103=m
 
 #
@@ -4298,8 +4629,10 @@ CONFIG_DVB_MN88473=m
 #
 # DVB-S (satellite) frontends
 #
+# CONFIG_DVB_CX24110 is not set
 CONFIG_DVB_CX24123=m
 CONFIG_DVB_MT312=m
+# CONFIG_DVB_ZL10036 is not set
 CONFIG_DVB_ZL10039=m
 CONFIG_DVB_S5H1420=m
 CONFIG_DVB_STV0288=m
@@ -4309,22 +4642,31 @@ CONFIG_DVB_STV6110=m
 CONFIG_DVB_STV0900=m
 CONFIG_DVB_TDA8083=m
 CONFIG_DVB_TDA10086=m
+# CONFIG_DVB_TDA8261 is not set
+# CONFIG_DVB_VES1X93 is not set
 CONFIG_DVB_TUNER_ITD1000=m
 CONFIG_DVB_TUNER_CX24113=m
 CONFIG_DVB_TDA826X=m
+# CONFIG_DVB_TUA6100 is not set
 CONFIG_DVB_CX24116=m
+# CONFIG_DVB_CX24117 is not set
 CONFIG_DVB_CX24120=m
 CONFIG_DVB_SI21XX=m
 CONFIG_DVB_TS2020=m
 CONFIG_DVB_DS3000=m
+# CONFIG_DVB_MB86A16 is not set
 CONFIG_DVB_TDA10071=m
 
 #
 # DVB-T (terrestrial) frontends
 #
+# CONFIG_DVB_SP8870 is not set
+# CONFIG_DVB_SP887X is not set
 CONFIG_DVB_CX22700=m
 CONFIG_DVB_CX22702=m
+# CONFIG_DVB_S5H1432 is not set
 CONFIG_DVB_DRXD=m
+# CONFIG_DVB_L64781 is not set
 CONFIG_DVB_TDA1004X=m
 CONFIG_DVB_NXT6000=m
 CONFIG_DVB_MT352=m
@@ -4333,21 +4675,26 @@ CONFIG_DVB_DIB3000MB=m
 CONFIG_DVB_DIB3000MC=m
 CONFIG_DVB_DIB7000M=m
 CONFIG_DVB_DIB7000P=m
+# CONFIG_DVB_DIB9000 is not set
 CONFIG_DVB_TDA10048=m
 CONFIG_DVB_AF9013=m
 CONFIG_DVB_EC100=m
+# CONFIG_DVB_STV0367 is not set
 CONFIG_DVB_CXD2820R=m
 CONFIG_DVB_CXD2841ER=m
 CONFIG_DVB_RTL2830=m
 CONFIG_DVB_RTL2832=m
 CONFIG_DVB_SI2168=m
 CONFIG_DVB_AS102_FE=m
+# CONFIG_DVB_ZD1301_DEMOD is not set
 CONFIG_DVB_GP8PSK_FE=m
+# CONFIG_DVB_CXD2880 is not set
 
 #
 # DVB-C (cable) frontends
 #
 CONFIG_DVB_VES1820=m
+# CONFIG_DVB_TDA10021 is not set
 CONFIG_DVB_TDA10023=m
 CONFIG_DVB_STV0297=m
 
@@ -4355,6 +4702,8 @@ CONFIG_DVB_STV0297=m
 # ATSC (North American/Korean Terrestrial/Cable DTV) frontends
 #
 CONFIG_DVB_NXT200X=m
+# CONFIG_DVB_OR51211 is not set
+# CONFIG_DVB_OR51132 is not set
 CONFIG_DVB_BCM3510=m
 CONFIG_DVB_LGDT330X=m
 CONFIG_DVB_LGDT3305=m
@@ -4377,6 +4726,7 @@ CONFIG_DVB_MB86A20S=m
 # ISDB-S (satellite) & ISDB-T (terrestrial) frontends
 #
 CONFIG_DVB_TC90522=m
+# CONFIG_DVB_MN88443X is not set
 
 #
 # Digital terrestrial only tuners/PLL
@@ -4390,13 +4740,17 @@ CONFIG_DVB_TUNER_DIB0090=m
 #
 CONFIG_DVB_DRX39XYJ=m
 CONFIG_DVB_LNBH25=m
+# CONFIG_DVB_LNBH29 is not set
 CONFIG_DVB_LNBP21=m
 CONFIG_DVB_LNBP22=m
+# CONFIG_DVB_ISL6405 is not set
 CONFIG_DVB_ISL6421=m
 CONFIG_DVB_ISL6423=m
 CONFIG_DVB_A8293=m
+# CONFIG_DVB_LGS8GL5 is not set
 CONFIG_DVB_LGS8GXX=m
 CONFIG_DVB_ATBM8830=m
+# CONFIG_DVB_TDA665x is not set
 CONFIG_DVB_IX2505V=m
 CONFIG_DVB_M88RS2000=m
 CONFIG_DVB_AF9033=m
@@ -4407,11 +4761,14 @@ CONFIG_DVB_HELENE=m
 #
 # Common Interface (EN50221) controller drivers
 #
+# CONFIG_DVB_CXD2099 is not set
 CONFIG_DVB_SP2=m
 
 #
 # Tools to develop new frontends
 #
+# CONFIG_DVB_DUMMY_FE is not set
+# end of Customise DVB Frontends
 
 #
 # Graphics support
@@ -4425,14 +4782,12 @@ CONFIG_DRM_DP_CEC=y
 #
 # ARM devices
 #
+# end of ARM devices
 
 #
 # ACP (Audio CoProcessor) Configuration
 #
-
-#
-# AMD Library routines
-#
+# end of ACP (Audio CoProcessor) Configuration
 
 #
 # Frame buffer Devices
@@ -4498,7 +4853,11 @@ CONFIG_FB_MB862XX_PCI_GDC=y
 CONFIG_FB_MB862XX_I2C=y
 # CONFIG_FB_SSD1307 is not set
 # CONFIG_FB_SM712 is not set
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
+# end of Frame buffer Devices
+
+#
+# Backlight & LCD device support
+#
 # CONFIG_LCD_CLASS_DEVICE is not set
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # CONFIG_BACKLIGHT_GENERIC is not set
@@ -4511,6 +4870,8 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # CONFIG_BACKLIGHT_LV5207LP is not set
 # CONFIG_BACKLIGHT_BD6107 is not set
 # CONFIG_BACKLIGHT_ARCXCNN is not set
+# end of Backlight & LCD device support
+
 CONFIG_VGASTATE=m
 
 #
@@ -4520,7 +4881,11 @@ CONFIG_DUMMY_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
+# end of Console display driver support
+
 # CONFIG_LOGO is not set
+# end of Graphics support
+
 CONFIG_SOUND=m
 CONFIG_SOUND_OSS_CORE=y
 # CONFIG_SOUND_OSS_CORE_PRECLAIM is not set
@@ -4627,11 +4992,14 @@ CONFIG_SND_VIRTUOSO=m
 # HD-Audio
 #
 # CONFIG_SND_HDA_INTEL is not set
+# end of HD-Audio
+
 CONFIG_SND_HDA_PREALLOC_SIZE=64
 CONFIG_SND_ARM=y
 CONFIG_SND_SPI=y
 CONFIG_SND_USB=y
 CONFIG_SND_USB_AUDIO=m
+CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER=y
 CONFIG_SND_USB_UA101=m
 CONFIG_SND_USB_CAIAQ=m
 CONFIG_SND_USB_CAIAQ_INPUT=y
@@ -4657,6 +5025,7 @@ CONFIG_SND_ISIGHT=m
 CONFIG_SND_SOC=m
 CONFIG_SND_SOC_AC97_BUS=y
 CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
+CONFIG_SND_SOC_TOPOLOGY=y
 CONFIG_SND_SOC_AMD_ACP=m
 # CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH is not set
 CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m
@@ -4674,11 +5043,14 @@ CONFIG_SND_DESIGNWARE_I2S=m
 #
 # CONFIG_SND_SOC_FSL_ASRC is not set
 # CONFIG_SND_SOC_FSL_SAI is not set
+CONFIG_SND_SOC_FSL_AUDMIX=m
 # CONFIG_SND_SOC_FSL_SSI is not set
 # CONFIG_SND_SOC_FSL_SPDIF is not set
 # CONFIG_SND_SOC_FSL_ESAI is not set
 CONFIG_SND_SOC_FSL_MICFIL=m
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
+# end of SoC Audio for Freescale CPUs
+
 CONFIG_SND_I2S_HI6210_I2S=m
 CONFIG_SND_KIRKWOOD_SOC=m
 CONFIG_SND_KIRKWOOD_SOC_ARMADA370_DB=m
@@ -4690,10 +5062,19 @@ CONFIG_SND_SOC_IMG_SPDIF_IN=m
 CONFIG_SND_SOC_IMG_SPDIF_OUT=m
 CONFIG_SND_SOC_IMG_PISTACHIO_INTERNAL_DAC=m
 CONFIG_SND_SOC_MTK_BTCVSD=m
+CONFIG_SND_SOC_SOF_TOPLEVEL=y
+CONFIG_SND_SOC_SOF_PCI=m
+CONFIG_SND_SOC_SOF_OPTIONS=m
+CONFIG_SND_SOC_SOF_NOCODEC=m
+CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT=y
+CONFIG_SND_SOC_SOF_STRICT_ABI_CHECKS=y
+# CONFIG_SND_SOC_SOF_DEBUG is not set
+CONFIG_SND_SOC_SOF=m
 
 #
 # STMicroelectronics STM32 SOC audio support
 #
+# end of STMicroelectronics STM32 SOC audio support
 
 #
 # Allwinner SoC Audio support
@@ -4701,6 +5082,8 @@ CONFIG_SND_SOC_MTK_BTCVSD=m
 CONFIG_SND_SUN4I_CODEC=m
 CONFIG_SND_SUN4I_I2S=m
 CONFIG_SND_SUN4I_SPDIF=m
+# end of Allwinner SoC Audio support
+
 CONFIG_SND_SOC_XILINX_I2S=m
 CONFIG_SND_SOC_XILINX_AUDIO_FORMATTER=m
 CONFIG_SND_SOC_XILINX_SPDIF=m
@@ -4752,6 +5135,7 @@ CONFIG_SND_SOC_CS43130=m
 CONFIG_SND_SOC_CS4341=m
 CONFIG_SND_SOC_CS4349=m
 CONFIG_SND_SOC_CS53L30=m
+# CONFIG_SND_SOC_CX2072X is not set
 CONFIG_SND_SOC_DMIC=m
 CONFIG_SND_SOC_ES7134=m
 # CONFIG_SND_SOC_ES7241 is not set
@@ -4762,6 +5146,7 @@ CONFIG_SND_SOC_ES8328_SPI=m
 CONFIG_SND_SOC_GTM601=m
 CONFIG_SND_SOC_INNO_RK3036=m
 CONFIG_SND_SOC_MAX98088=m
+# CONFIG_SND_SOC_MAX98357A is not set
 CONFIG_SND_SOC_MAX98504=m
 # CONFIG_SND_SOC_MAX9867 is not set
 CONFIG_SND_SOC_MAX98927=m
@@ -4854,6 +5239,8 @@ CONFIG_SND_SOC_NAU8810=m
 CONFIG_SND_SOC_NAU8822=m
 CONFIG_SND_SOC_NAU8824=m
 CONFIG_SND_SOC_TPA6130A2=m
+# end of CODEC drivers
+
 CONFIG_SND_SIMPLE_CARD_UTILS=m
 CONFIG_SND_SIMPLE_CARD=m
 CONFIG_SND_AUDIO_GRAPH_CARD=m
@@ -4886,6 +5273,7 @@ CONFIG_HID_CHERRY=m
 CONFIG_HID_CHICONY=m
 # CONFIG_HID_CORSAIR is not set
 CONFIG_HID_COUGAR=m
+CONFIG_HID_MACALLY=m
 CONFIG_HID_PRODIKEYS=m
 # CONFIG_HID_CMEDIA is not set
 # CONFIG_HID_CP2112 is not set
@@ -4964,6 +5352,7 @@ CONFIG_HID_TOPSEED=m
 CONFIG_HID_THRUSTMASTER=m
 CONFIG_THRUSTMASTER_FF=y
 # CONFIG_HID_UDRAW_PS3 is not set
+CONFIG_HID_U2FZERO=m
 CONFIG_HID_WACOM=m
 # CONFIG_HID_WIIMOTE is not set
 # CONFIG_HID_XINMO is not set
@@ -4973,6 +5362,7 @@ CONFIG_HID_ZYDACRON=m
 CONFIG_HID_SENSOR_HUB=y
 # CONFIG_HID_SENSOR_CUSTOM_SENSOR is not set
 # CONFIG_HID_ALPS is not set
+# end of Special HID drivers
 
 #
 # USB HID support
@@ -4986,11 +5376,16 @@ CONFIG_USB_HIDDEV=y
 #
 CONFIG_USB_KBD=m
 CONFIG_USB_MOUSE=m
+# end of USB HID Boot Protocol drivers
+# end of USB HID support
 
 #
 # I2C HID support
 #
 CONFIG_I2C_HID=m
+# end of I2C HID support
+# end of HID support
+
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 CONFIG_USB_SUPPORT=y
 CONFIG_USB_COMMON=y
@@ -5200,6 +5595,8 @@ CONFIG_USB_XUSBATM=m
 # CONFIG_USB_GPIO_VBUS is not set
 # CONFIG_USB_ISP1301 is not set
 # CONFIG_USB_ULPI is not set
+# end of USB Physical Layer drivers
+
 # CONFIG_USB_GADGET is not set
 CONFIG_TYPEC=y
 CONFIG_TYPEC_TCPM=y
@@ -5213,11 +5610,15 @@ CONFIG_TYPEC_TPS6598X=m
 # USB Type-C Multiplexer/DeMultiplexer Switch support
 #
 # CONFIG_TYPEC_MUX_PI3USB30532 is not set
+# end of USB Type-C Multiplexer/DeMultiplexer Switch support
 
 #
 # USB Type-C Alternate Mode drivers
 #
 CONFIG_TYPEC_DP_ALTMODE=m
+CONFIG_TYPEC_NVIDIA_ALTMODE=m
+# end of USB Type-C Alternate Mode drivers
+
 CONFIG_USB_ROLE_SWITCH=y
 CONFIG_USB_LED_TRIG=y
 # CONFIG_USB_ULPI_BUS is not set
@@ -5239,6 +5640,7 @@ CONFIG_SDIO_UART=m
 #
 # CONFIG_MMC_DEBUG is not set
 CONFIG_MMC_SDHCI=m
+CONFIG_MMC_SDHCI_IO_ACCESSORS=y
 CONFIG_MMC_SDHCI_PCI=m
 CONFIG_MMC_RICOH_MMC=y
 CONFIG_MMC_SDHCI_PLTFM=m
@@ -5300,6 +5702,7 @@ CONFIG_LEDS_AN30259A=m
 # CONFIG_LEDS_BCM6358 is not set
 # CONFIG_LEDS_CR0014114 is not set
 # CONFIG_LEDS_LM3530 is not set
+CONFIG_LEDS_LM3532=m
 # CONFIG_LEDS_LM3642 is not set
 # CONFIG_LEDS_LM3692X is not set
 # CONFIG_LEDS_LM3601X is not set
@@ -5324,6 +5727,7 @@ CONFIG_LEDS_LT3593=m
 # CONFIG_LEDS_NETXBIG is not set
 # CONFIG_LEDS_TCA6507 is not set
 # CONFIG_LEDS_TLC591XX is not set
+CONFIG_LEDS_MAX77650=m
 # CONFIG_LEDS_LM355x is not set
 # CONFIG_LEDS_KTD2692 is not set
 # CONFIG_LEDS_IS31FL319X is not set
@@ -5336,6 +5740,8 @@ CONFIG_LEDS_LT3593=m
 # CONFIG_LEDS_SYSCON is not set
 # CONFIG_LEDS_MLXREG is not set
 # CONFIG_LEDS_USER is not set
+# CONFIG_LEDS_SPI_BYTE is not set
+# CONFIG_LEDS_TI_LMU_COMMON is not set
 
 #
 # LED Triggers
@@ -5411,6 +5817,7 @@ CONFIG_RTC_DRV_PCF8563=y
 CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_M41T80=m
 # CONFIG_RTC_DRV_M41T80_WDT is not set
+# CONFIG_RTC_DRV_BD70528 is not set
 CONFIG_RTC_DRV_BQ32K=m
 CONFIG_RTC_DRV_S35390A=y
 CONFIG_RTC_DRV_FM3130=m
@@ -5518,6 +5925,8 @@ CONFIG_DMA_ENGINE_RAID=y
 #
 # CONFIG_SYNC_FILE is not set
 CONFIG_UDMABUF=y
+# end of DMABUF options
+
 # CONFIG_AUXDISPLAY is not set
 # CONFIG_PANEL is not set
 CONFIG_UIO=m
@@ -5541,6 +5950,8 @@ CONFIG_VIRTIO_INPUT=m
 #
 # Microsoft Hyper-V guest support
 #
+# end of Microsoft Hyper-V guest support
+
 CONFIG_STAGING=y
 # CONFIG_PRISM2_USB is not set
 # CONFIG_COMEDI is not set
@@ -5554,8 +5965,6 @@ CONFIG_RTL8723BS=m
 # CONFIG_R8712U is not set
 CONFIG_R8188EU=m
 # CONFIG_88EU_AP_MODE is not set
-CONFIG_R8822BE=m
-CONFIG_RTLWIFI_DEBUG_ST=y
 CONFIG_RTS5208=m
 # CONFIG_VT6655 is not set
 # CONFIG_VT6656 is not set
@@ -5576,11 +5985,15 @@ CONFIG_SPEAKUP_SYNTH_SOFT=m
 CONFIG_SPEAKUP_SYNTH_SPKOUT=m
 CONFIG_SPEAKUP_SYNTH_TXPRT=m
 CONFIG_SPEAKUP_SYNTH_DUMMY=m
+# end of Speakup console speech
+
 # CONFIG_STAGING_MEDIA is not set
 
 #
 # Android
 #
+# end of Android
+
 # CONFIG_STAGING_BOARD is not set
 CONFIG_LTE_GDM724X=m
 # CONFIG_FIREWIRE_SERIAL is not set
@@ -5633,6 +6046,8 @@ CONFIG_PI433=m
 #
 # Gasket devices
 #
+# end of Gasket devices
+
 CONFIG_XIL_AXIS_FIFO=m
 CONFIG_EROFS_FS=m
 # CONFIG_EROFS_FS_DEBUG is not set
@@ -5643,6 +6058,27 @@ CONFIG_EROFS_FS_SECURITY=y
 # CONFIG_EROFS_FAULT_INJECTION is not set
 CONFIG_EROFS_FS_IO_MAX_RETRIES=5
 # CONFIG_EROFS_FS_ZIP is not set
+# CONFIG_FIELDBUS_DEV is not set
+# CONFIG_KPC2000 is not set
+
+#
+# ISDN CAPI drivers
+#
+CONFIG_CAPI_AVM=y
+CONFIG_ISDN_DRV_AVMB1_B1PCI=m
+CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
+CONFIG_ISDN_DRV_AVMB1_T1PCI=m
+CONFIG_ISDN_DRV_AVMB1_C4=m
+CONFIG_ISDN_DRV_GIGASET=m
+CONFIG_GIGASET_CAPI=y
+CONFIG_GIGASET_BASE=m
+CONFIG_GIGASET_M105=m
+CONFIG_GIGASET_M101=m
+# CONFIG_GIGASET_DEBUG is not set
+CONFIG_HYSDN=m
+CONFIG_HYSDN_CAPI=y
+# end of ISDN CAPI drivers
+
 # CONFIG_GOLDFISH is not set
 # CONFIG_CHROME_PLATFORMS is not set
 # CONFIG_MELLANOX_PLATFORM is not set
@@ -5655,6 +6091,7 @@ CONFIG_COMMON_CLK=y
 #
 # CONFIG_CLK_HSDK is not set
 # CONFIG_COMMON_CLK_MAX9485 is not set
+# CONFIG_COMMON_CLK_SI5341 is not set
 # CONFIG_COMMON_CLK_SI5351 is not set
 # CONFIG_COMMON_CLK_SI514 is not set
 # CONFIG_COMMON_CLK_SI544 is not set
@@ -5667,11 +6104,18 @@ CONFIG_COMMON_CLK_CS2000_CP=m
 # CONFIG_COMMON_CLK_FIXED_MMIO is not set
 CONFIG_MVEBU_CLK_COMMON=y
 CONFIG_KIRKWOOD_CLK=y
+CONFIG_CLK_SUNXI=y
+CONFIG_CLK_SUNXI_CLOCKS=y
+CONFIG_CLK_SUNXI_PRCM_SUN6I=y
+CONFIG_CLK_SUNXI_PRCM_SUN8I=y
+CONFIG_CLK_SUNXI_PRCM_SUN9I=y
 CONFIG_SUNXI_CCU=y
 CONFIG_SUNIV_F1C100S_CCU=y
 # CONFIG_SUN8I_A83T_CCU is not set
 # CONFIG_SUN8I_DE2_CCU is not set
 # CONFIG_SUN8I_R_CCU is not set
+# end of Common Clock Framework
+
 # CONFIG_HWSPINLOCK is not set
 
 #
@@ -5682,7 +6126,8 @@ CONFIG_TIMER_PROBE=y
 CONFIG_CLKSRC_MMIO=y
 CONFIG_ORION_TIMER=y
 CONFIG_SUN4I_TIMER=y
-# CONFIG_ARM_TIMER_SP804 is not set
+# end of Clock Source drivers
+
 # CONFIG_MAILBOX is not set
 CONFIG_IOMMU_SUPPORT=y
 
@@ -5691,6 +6136,8 @@ CONFIG_IOMMU_SUPPORT=y
 #
 # CONFIG_IOMMU_IO_PGTABLE_LPAE is not set
 # CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set
+# end of Generic IOMMU Pagetable Support
+
 # CONFIG_IOMMU_DEBUGFS is not set
 # CONFIG_ARM_SMMU is not set
 
@@ -5698,11 +6145,14 @@ CONFIG_IOMMU_SUPPORT=y
 # Remoteproc drivers
 #
 # CONFIG_REMOTEPROC is not set
+# end of Remoteproc drivers
 
 #
 # Rpmsg drivers
 #
 # CONFIG_RPMSG_VIRTIO is not set
+# end of Rpmsg drivers
+
 # CONFIG_SOUNDWIRE is not set
 
 #
@@ -5712,23 +6162,34 @@ CONFIG_IOMMU_SUPPORT=y
 #
 # Amlogic SoC drivers
 #
+# end of Amlogic SoC drivers
+
+#
+# Aspeed SoC drivers
+#
+# end of Aspeed SoC drivers
 
 #
 # Broadcom SoC drivers
 #
 # CONFIG_SOC_BRCMSTB is not set
+# end of Broadcom SoC drivers
 
 #
 # NXP/Freescale QorIQ SoC drivers
 #
+# end of NXP/Freescale QorIQ SoC drivers
 
 #
 # i.MX SoC drivers
 #
+# end of i.MX SoC drivers
 
 #
 # Qualcomm SoC drivers
 #
+# end of Qualcomm SoC drivers
+
 CONFIG_SUNXI_SRAM=y
 # CONFIG_SOC_TI is not set
 
@@ -5736,6 +6197,9 @@ CONFIG_SUNXI_SRAM=y
 # Xilinx SoC drivers
 #
 # CONFIG_XILINX_VCU is not set
+# end of Xilinx SoC drivers
+# end of SOC (System On Chip) specific Drivers
+
 # CONFIG_PM_DEVFREQ is not set
 # CONFIG_EXTCON is not set
 # CONFIG_MEMORY is not set
@@ -5748,16 +6212,17 @@ CONFIG_SUNXI_SRAM=y
 # IRQ chip support
 #
 CONFIG_IRQCHIP=y
-CONFIG_ARM_GIC_MAX_NR=1
+# CONFIG_AL_FIC is not set
 CONFIG_MADERA_IRQ=m
 CONFIG_ORION_IRQCHIP=y
+# end of IRQ chip support
+
 # CONFIG_IPACK_BUS is not set
 CONFIG_ARCH_HAS_RESET_CONTROLLER=y
 CONFIG_RESET_CONTROLLER=y
 CONFIG_RESET_SIMPLE=y
 CONFIG_RESET_SUNXI=y
 CONFIG_RESET_TI_SYSCON=m
-# CONFIG_FMC is not set
 
 #
 # PHY Subsystem
@@ -5771,6 +6236,7 @@ CONFIG_PHY_CADENCE_DP=m
 CONFIG_PHY_CADENCE_DPHY=m
 CONFIG_PHY_CADENCE_SIERRA=m
 CONFIG_PHY_FSL_IMX8MQ_USB=m
+# CONFIG_PHY_MIXEL_MIPI_DPHY is not set
 CONFIG_PHY_MVEBU_A3700_UTMI=y
 # CONFIG_PHY_MVEBU_A38X_COMPHY is not set
 # CONFIG_PHY_MVEBU_CP110_COMPHY is not set
@@ -5779,6 +6245,8 @@ CONFIG_PHY_PXA_28NM_HSIC=m
 CONFIG_PHY_PXA_28NM_USB2=m
 # CONFIG_PHY_MAPPHONE_MDM6600 is not set
 CONFIG_PHY_OCELOT_SERDES=m
+# end of PHY Subsystem
+
 # CONFIG_POWERCAP is not set
 # CONFIG_MCB is not set
 
@@ -5787,14 +6255,19 @@ CONFIG_PHY_OCELOT_SERDES=m
 #
 # CONFIG_ARM_CCN is not set
 CONFIG_ARM_PMU=y
+# end of Performance monitor support
+
 CONFIG_RAS=y
 
 #
 # Android
 #
 # CONFIG_ANDROID is not set
+# end of Android
+
 CONFIG_DAX=m
 CONFIG_NVMEM=y
+CONFIG_NVMEM_SYSFS=y
 CONFIG_NVMEM_SUNXI_SID=m
 
 #
@@ -5802,6 +6275,8 @@ CONFIG_NVMEM_SUNXI_SID=m
 #
 # CONFIG_STM is not set
 # CONFIG_INTEL_TH is not set
+# end of HW tracing support
+
 # CONFIG_FPGA is not set
 # CONFIG_FSI is not set
 CONFIG_MULTIPLEXER=m
@@ -5813,10 +6288,14 @@ CONFIG_MULTIPLEXER=m
 # CONFIG_MUX_ADGS1408 is not set
 # CONFIG_MUX_GPIO is not set
 # CONFIG_MUX_MMIO is not set
+# end of Multiplexer drivers
+
 CONFIG_PM_OPP=y
 # CONFIG_SIOX is not set
 # CONFIG_SLIMBUS is not set
 CONFIG_INTERCONNECT=m
+# CONFIG_COUNTER is not set
+# end of Device Drivers
 
 #
 # File systems
@@ -5916,6 +6395,7 @@ CONFIG_FSCACHE_STATS=y
 CONFIG_CACHEFILES=m
 # CONFIG_CACHEFILES_DEBUG is not set
 # CONFIG_CACHEFILES_HISTOGRAM is not set
+# end of Caches
 
 #
 # CD-ROM/DVD Filesystems
@@ -5924,6 +6404,7 @@ CONFIG_ISO9660_FS=m
 CONFIG_JOLIET=y
 CONFIG_ZISOFS=y
 CONFIG_UDF_FS=m
+# end of CD-ROM/DVD Filesystems
 
 #
 # DOS/FAT/NT Filesystems
@@ -5937,6 +6418,7 @@ CONFIG_FAT_DEFAULT_UTF8=y
 CONFIG_NTFS_FS=m
 # CONFIG_NTFS_DEBUG is not set
 CONFIG_NTFS_RW=y
+# end of DOS/FAT/NT Filesystems
 
 #
 # Pseudo filesystems
@@ -5952,6 +6434,8 @@ CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_TMPFS_XATTR=y
 CONFIG_MEMFD_CREATE=y
 CONFIG_CONFIGFS_FS=m
+# end of Pseudo filesystems
+
 CONFIG_MISC_FILESYSTEMS=y
 CONFIG_ORANGEFS_FS=y
 CONFIG_ADFS_FS=m
@@ -5986,6 +6470,7 @@ CONFIG_UBIFS_FS=y
 CONFIG_UBIFS_FS_ADVANCED_COMPR=y
 CONFIG_UBIFS_FS_LZO=y
 CONFIG_UBIFS_FS_ZLIB=y
+CONFIG_UBIFS_FS_ZSTD=y
 # CONFIG_UBIFS_ATIME_SUPPORT is not set
 CONFIG_UBIFS_FS_XATTR=y
 CONFIG_UBIFS_FS_SECURITY=y
@@ -6065,11 +6550,12 @@ CONFIG_SUNRPC_GSS=y
 CONFIG_SUNRPC_BACKCHANNEL=y
 CONFIG_SUNRPC_SWAP=y
 CONFIG_RPCSEC_GSS_KRB5=m
-CONFIG_CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y
+# CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES is not set
 CONFIG_SUNRPC_DEBUG=y
 CONFIG_CEPH_FS=m
 # CONFIG_CEPH_FSCACHE is not set
 # CONFIG_CEPH_FS_POSIX_ACL is not set
+# CONFIG_CEPH_FS_SECURITY_LABEL is not set
 CONFIG_CIFS=m
 CONFIG_CIFS_STATS2=y
 CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
@@ -6077,7 +6563,6 @@ CONFIG_CIFS_WEAK_PW_HASH=y
 CONFIG_CIFS_UPCALL=y
 CONFIG_CIFS_XATTR=y
 CONFIG_CIFS_POSIX=y
-CONFIG_CIFS_ACL=y
 CONFIG_CIFS_DEBUG=y
 # CONFIG_CIFS_DEBUG2 is not set
 # CONFIG_CIFS_DEBUG_DUMP_KEYS is not set
@@ -6141,11 +6626,15 @@ CONFIG_NLS_KOI8_U=m
 CONFIG_NLS_UTF8=y
 CONFIG_DLM=m
 CONFIG_DLM_DEBUG=y
+CONFIG_UNICODE=y
+# CONFIG_UNICODE_NORMALIZATION_SELFTEST is not set
+# end of File systems
 
 #
 # Security options
 #
 CONFIG_KEYS=y
+# CONFIG_KEYS_REQUEST_CACHE is not set
 CONFIG_PERSISTENT_KEYRINGS=y
 CONFIG_BIG_KEYS=y
 CONFIG_ENCRYPTED_KEYS=y
@@ -6176,6 +6665,7 @@ CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024
 # CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set
 CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init"
 CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/sbin/init"
+# CONFIG_SECURITY_TOMOYO_INSECURE_BUILTIN_SETTING is not set
 CONFIG_SECURITY_APPARMOR=y
 CONFIG_SECURITY_APPARMOR_HASH=y
 CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y
@@ -6187,6 +6677,7 @@ CONFIG_INTEGRITY=y
 CONFIG_INTEGRITY_SIGNATURE=y
 CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y
 CONFIG_INTEGRITY_TRUSTED_KEYRING=y
+# CONFIG_INTEGRITY_PLATFORM_KEYRING is not set
 CONFIG_INTEGRITY_AUDIT=y
 # CONFIG_IMA is not set
 # CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set
@@ -6196,6 +6687,24 @@ CONFIG_INTEGRITY_AUDIT=y
 # CONFIG_DEFAULT_SECURITY_APPARMOR is not set
 CONFIG_DEFAULT_SECURITY_DAC=y
 CONFIG_LSM="yama,loadpin,safesetid,integrity"
+
+#
+# Kernel hardening options
+#
+
+#
+# Memory initialization
+#
+CONFIG_INIT_STACK_NONE=y
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_USER is not set
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL is not set
+# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
+# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
+# end of Memory initialization
+# end of Kernel hardening options
+# end of Security options
+
 CONFIG_XOR_BLOCKS=m
 CONFIG_ASYNC_CORE=m
 CONFIG_ASYNC_MEMCPY=m
@@ -6223,9 +6732,6 @@ CONFIG_CRYPTO_AKCIPHER=y
 CONFIG_CRYPTO_KPP2=y
 CONFIG_CRYPTO_KPP=y
 CONFIG_CRYPTO_ACOMP2=y
-CONFIG_CRYPTO_RSA=y
-CONFIG_CRYPTO_DH=y
-CONFIG_CRYPTO_ECDH=m
 CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MANAGER2=y
 # CONFIG_CRYPTO_USER is not set
@@ -6234,12 +6740,20 @@ CONFIG_CRYPTO_MANAGER2=y
 CONFIG_CRYPTO_GF128MUL=y
 CONFIG_CRYPTO_NULL=y
 CONFIG_CRYPTO_NULL2=y
-CONFIG_CRYPTO_WORKQUEUE=y
 # CONFIG_CRYPTO_CRYPTD is not set
 CONFIG_CRYPTO_AUTHENC=m
 CONFIG_CRYPTO_TEST=m
 CONFIG_CRYPTO_ENGINE=m
 
+#
+# Public-key cryptography
+#
+CONFIG_CRYPTO_RSA=y
+CONFIG_CRYPTO_DH=y
+CONFIG_CRYPTO_ECC=m
+CONFIG_CRYPTO_ECDH=m
+CONFIG_CRYPTO_ECRDSA=m
+
 #
 # Authenticated Encryption with Associated Data
 #
@@ -6283,6 +6797,7 @@ CONFIG_CRYPTO_VMAC=m
 #
 CONFIG_CRYPTO_CRC32C=y
 CONFIG_CRYPTO_CRC32=y
+# CONFIG_CRYPTO_XXHASH is not set
 CONFIG_CRYPTO_CRCT10DIF=y
 CONFIG_CRYPTO_GHASH=y
 CONFIG_CRYPTO_POLY1305=m
@@ -6298,7 +6813,7 @@ CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA512=m
 CONFIG_CRYPTO_SHA3=m
 CONFIG_CRYPTO_SM3=m
-# CONFIG_CRYPTO_STREEBOG is not set
+CONFIG_CRYPTO_STREEBOG=m
 CONFIG_CRYPTO_TGR192=m
 CONFIG_CRYPTO_WP512=m
 
@@ -6308,6 +6823,7 @@ CONFIG_CRYPTO_WP512=m
 CONFIG_CRYPTO_AES=y
 CONFIG_CRYPTO_AES_TI=m
 CONFIG_CRYPTO_ANUBIS=m
+CONFIG_CRYPTO_LIB_ARC4=y
 CONFIG_CRYPTO_ARC4=y
 CONFIG_CRYPTO_BLOWFISH=m
 CONFIG_CRYPTO_BLOWFISH_COMMON=m
@@ -6335,7 +6851,7 @@ CONFIG_CRYPTO_LZO=y
 CONFIG_CRYPTO_842=m
 CONFIG_CRYPTO_LZ4=m
 CONFIG_CRYPTO_LZ4HC=m
-# CONFIG_CRYPTO_ZSTD is not set
+CONFIG_CRYPTO_ZSTD=y
 
 #
 # Random Number Generation
@@ -6357,6 +6873,8 @@ CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_MARVELL_CESA=m
 CONFIG_CRYPTO_DEV_HIFN_795X=m
 CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
+# CONFIG_CRYPTO_DEV_ATMEL_ECC is not set
+# CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set
 CONFIG_CRYPTO_DEV_SUN4I_SS=m
 # CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG is not set
 CONFIG_CRYPTO_DEV_CHELSIO=m
@@ -6381,6 +6899,8 @@ CONFIG_SYSTEM_TRUSTED_KEYS=""
 CONFIG_SECONDARY_TRUSTED_KEYRING=y
 CONFIG_SYSTEM_BLACKLIST_KEYRING=y
 CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
+# end of Certificates for signature checking
+
 CONFIG_BINARY_PRINTF=y
 
 #
@@ -6388,11 +6908,13 @@ CONFIG_BINARY_PRINTF=y
 #
 CONFIG_RAID6_PQ=m
 CONFIG_RAID6_PQ_BENCHMARK=y
+CONFIG_PACKING=y
 CONFIG_BITREVERSE=y
-CONFIG_RATIONAL=y
 CONFIG_GENERIC_STRNCPY_FROM_USER=y
 CONFIG_GENERIC_STRNLEN_USER=y
 CONFIG_GENERIC_NET_UTILS=y
+CONFIG_CORDIC=m
+CONFIG_RATIONAL=y
 CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
 CONFIG_CRC_CCITT=m
@@ -6422,8 +6944,8 @@ CONFIG_LZO_DECOMPRESS=y
 CONFIG_LZ4_COMPRESS=m
 CONFIG_LZ4HC_COMPRESS=m
 CONFIG_LZ4_DECOMPRESS=y
-CONFIG_ZSTD_COMPRESS=m
-CONFIG_ZSTD_DECOMPRESS=m
+CONFIG_ZSTD_COMPRESS=y
+CONFIG_ZSTD_DECOMPRESS=y
 CONFIG_XZ_DEC=y
 CONFIG_XZ_DEC_X86=y
 CONFIG_XZ_DEC_POWERPC=y
@@ -6440,6 +6962,7 @@ CONFIG_DECOMPRESS_XZ=y
 CONFIG_DECOMPRESS_LZO=y
 CONFIG_DECOMPRESS_LZ4=y
 CONFIG_GENERIC_ALLOCATOR=y
+CONFIG_BCH=m
 CONFIG_TEXTSEARCH=y
 CONFIG_TEXTSEARCH_KMP=m
 CONFIG_TEXTSEARCH_BM=m
@@ -6463,11 +6986,10 @@ CONFIG_NLATTR=y
 CONFIG_GENERIC_ATOMIC64=y
 CONFIG_LRU_CACHE=m
 CONFIG_CLZ_TAB=y
-CONFIG_CORDIC=m
-# CONFIG_DDR is not set
 CONFIG_IRQ_POLL=y
 CONFIG_MPILIB=y
 CONFIG_SIGNATURE=y
+CONFIG_DIMLIB=y
 CONFIG_LIBFDT=y
 CONFIG_OID_REGISTRY=y
 CONFIG_FONT_SUPPORT=m
@@ -6477,6 +6999,7 @@ CONFIG_FONT_8x16=y
 CONFIG_SG_POOL=y
 CONFIG_SBITMAP=y
 # CONFIG_STRING_SELFTEST is not set
+# end of Library routines
 
 #
 # Kernel hacking
@@ -6492,6 +7015,7 @@ CONFIG_CONSOLE_LOGLEVEL_QUIET=4
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 CONFIG_BOOT_PRINTK_DELAY=y
 CONFIG_DYNAMIC_DEBUG=y
+# end of printk and dmesg options
 
 #
 # Compile-time checks and compiler options
@@ -6503,14 +7027,18 @@ CONFIG_STRIP_ASM_SYMS=y
 # CONFIG_READABLE_ASM is not set
 CONFIG_UNUSED_SYMBOLS=y
 CONFIG_DEBUG_FS=y
-# CONFIG_HEADERS_CHECK is not set
+# CONFIG_HEADERS_INSTALL is not set
+# CONFIG_OPTIMIZE_INLINING is not set
 # CONFIG_DEBUG_SECTION_MISMATCH is not set
 CONFIG_SECTION_MISMATCH_WARN_ONLY=y
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+# end of Compile-time checks and compiler options
+
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
 CONFIG_MAGIC_SYSRQ_SERIAL=y
 CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_MISC=y
 
 #
 # Memory Debugging
@@ -6531,6 +7059,8 @@ CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
 CONFIG_DEBUG_MEMORY_INIT=y
 CONFIG_CC_HAS_KASAN_GENERIC=y
 CONFIG_KASAN_STACK=1
+# end of Memory Debugging
+
 CONFIG_ARCH_HAS_KCOV=y
 CONFIG_CC_HAS_SANCOV_TRACE_PC=y
 # CONFIG_KCOV is not set
@@ -6545,6 +7075,8 @@ CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
 CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
 # CONFIG_WQ_WATCHDOG is not set
+# end of Debug Lockups and Hangs
+
 # CONFIG_PANIC_ON_OOPS is not set
 CONFIG_PANIC_ON_OOPS_VALUE=0
 CONFIG_PANIC_TIMEOUT=0
@@ -6565,17 +7097,20 @@ CONFIG_LOCK_DEBUGGING_SUPPORT=y
 # CONFIG_DEBUG_SPINLOCK is not set
 # CONFIG_DEBUG_MUTEXES is not set
 # CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
+# CONFIG_DEBUG_RWSEMS is not set
 # CONFIG_DEBUG_LOCK_ALLOC is not set
 # CONFIG_DEBUG_ATOMIC_SLEEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_LOCK_TORTURE_TEST is not set
 # CONFIG_WW_MUTEX_SELFTEST is not set
+# end of Lock Debugging (spinlocks, mutexes, etc...)
+
 CONFIG_STACKTRACE=y
 # CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
 # CONFIG_DEBUG_KOBJECT is not set
 CONFIG_DEBUG_BUGVERBOSE=y
 CONFIG_DEBUG_LIST=y
-# CONFIG_DEBUG_PI_LIST is not set
+# CONFIG_DEBUG_PLIST is not set
 CONFIG_DEBUG_SG=y
 # CONFIG_DEBUG_NOTIFIERS is not set
 # CONFIG_DEBUG_CREDENTIALS is not set
@@ -6589,6 +7124,8 @@ CONFIG_RCU_PERF_TEST=m
 CONFIG_RCU_CPU_STALL_TIMEOUT=21
 # CONFIG_RCU_TRACE is not set
 # CONFIG_RCU_EQS_DEBUG is not set
+# end of RCU Debugging
+
 # CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
 # CONFIG_NOTIFIER_ERROR_INJECTION is not set
@@ -6633,19 +7170,20 @@ CONFIG_PROBE_EVENTS=y
 # CONFIG_RING_BUFFER_STARTUP_TEST is not set
 CONFIG_PREEMPTIRQ_DELAY_TEST=m
 # CONFIG_TRACE_EVAL_MAP_FILE is not set
-CONFIG_TRACING_EVENTS_GPIO=y
 CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_LKDTM is not set
 # CONFIG_TEST_LIST_SORT is not set
 # CONFIG_TEST_SORT is not set
 # CONFIG_BACKTRACE_SELF_TEST is not set
 # CONFIG_RBTREE_TEST is not set
+# CONFIG_REED_SOLOMON_TEST is not set
 # CONFIG_INTERVAL_TREE_TEST is not set
 # CONFIG_PERCPU_TEST is not set
 # CONFIG_ATOMIC64_SELFTEST is not set
 # CONFIG_ASYNC_RAID6_TEST is not set
 # CONFIG_TEST_HEXDUMP is not set
 # CONFIG_TEST_STRING_HELPERS is not set
+# CONFIG_TEST_STRSCPY is not set
 # CONFIG_TEST_KSTRTOX is not set
 # CONFIG_TEST_PRINTF is not set
 # CONFIG_TEST_BITMAP is not set
@@ -6660,6 +7198,7 @@ CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_TEST_VMALLOC is not set
 # CONFIG_TEST_USER_COPY is not set
 # CONFIG_TEST_BPF is not set
+# CONFIG_TEST_BLACKHOLE_DEV is not set
 # CONFIG_FIND_BIT_BENCHMARK is not set
 # CONFIG_TEST_FIRMWARE is not set
 # CONFIG_TEST_SYSCTL is not set
@@ -6668,6 +7207,7 @@ CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_TEST_KMOD is not set
 # CONFIG_TEST_MEMCAT_P is not set
 # CONFIG_TEST_STACKINIT is not set
+# CONFIG_TEST_MEMINIT is not set
 # CONFIG_MEMTEST is not set
 CONFIG_BUG_ON_DATA_CORRUPTION=y
 # CONFIG_SAMPLES is not set
@@ -6703,3 +7243,4 @@ CONFIG_DEBUG_UNCOMPRESS=y
 CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
 CONFIG_EARLY_PRINTK=y
 # CONFIG_CORESIGHT is not set
+# end of Kernel hacking
diff --git a/srcpkgs/linux5.1/files/arm64-dotconfig b/srcpkgs/linux5.3/files/arm64-dotconfig
similarity index 91%
rename from srcpkgs/linux5.1/files/arm64-dotconfig
rename to srcpkgs/linux5.3/files/arm64-dotconfig
index 173df8dea8c..1ebc514bfc4 100644
--- a/srcpkgs/linux5.1/files/arm64-dotconfig
+++ b/srcpkgs/linux5.3/files/arm64-dotconfig
@@ -1,14 +1,15 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.1.18 Kernel Configuration
+# Linux/arm64 5.3.0 Kernel Configuration
 #
 
 #
-# Compiler: aarch64-linux-gnu-gcc (GCC) 9.1.0
+# Compiler: aarch64-linux-gnu-gcc (GCC) 9.2.0
 #
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=90100
+CONFIG_GCC_VERSION=90200
 CONFIG_CLANG_VERSION=0
+CONFIG_CC_CAN_LINK=y
 CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y
 CONFIG_IRQ_WORK=y
@@ -20,6 +21,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
 #
 CONFIG_INIT_ENV_ARG_LIMIT=32
 # CONFIG_COMPILE_TEST is not set
+# CONFIG_HEADER_TEST is not set
 CONFIG_LOCALVERSION="_1"
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_BUILD_SALT=""
@@ -50,10 +52,13 @@ CONFIG_IRQ_DOMAIN_HIERARCHY=y
 CONFIG_IRQ_FASTEOI_HIERARCHY_HANDLERS=y
 CONFIG_GENERIC_MSI_IRQ=y
 CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
+CONFIG_IRQ_MSI_IOMMU=y
 CONFIG_HANDLE_DOMAIN_IRQ=y
 CONFIG_IRQ_FORCED_THREADING=y
 CONFIG_SPARSE_IRQ=y
 # CONFIG_GENERIC_IRQ_DEBUGFS is not set
+# end of IRQ subsystem
+
 CONFIG_GENERIC_IRQ_MULTI_HANDLER=y
 CONFIG_ARCH_CLOCKSOURCE_DATA=y
 CONFIG_GENERIC_TIME_VSYSCALL=y
@@ -71,6 +76,8 @@ CONFIG_NO_HZ_IDLE=y
 # CONFIG_NO_HZ_FULL is not set
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
+# end of Timers subsystem
+
 # CONFIG_PREEMPT_NONE is not set
 CONFIG_PREEMPT_VOLUNTARY=y
 # CONFIG_PREEMPT is not set
@@ -88,7 +95,10 @@ CONFIG_TASKSTATS=y
 CONFIG_TASK_DELAY_ACCT=y
 CONFIG_TASK_XACCT=y
 CONFIG_TASK_IO_ACCOUNTING=y
-# CONFIG_PSI is not set
+CONFIG_PSI=y
+CONFIG_PSI_DEFAULT_DISABLED=y
+# end of CPU/Task time and stats accounting
+
 CONFIG_CPU_ISOLATION=y
 
 #
@@ -101,13 +111,22 @@ CONFIG_TREE_SRCU=y
 CONFIG_TASKS_RCU=y
 CONFIG_RCU_STALL_COMMON=y
 CONFIG_RCU_NEED_SEGCBLIST=y
-CONFIG_BUILD_BIN2C=y
+# end of RCU Subsystem
+
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
+CONFIG_IKHEADERS=m
 CONFIG_LOG_BUF_SHIFT=18
 CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
 CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
 CONFIG_GENERIC_SCHED_CLOCK=y
+
+#
+# Scheduler features
+#
+# CONFIG_UCLAMP_TASK is not set
+# end of Scheduler features
+
 CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
 CONFIG_ARCH_SUPPORTS_INT128=y
 CONFIG_CGROUPS=y
@@ -117,7 +136,6 @@ CONFIG_MEMCG_SWAP=y
 CONFIG_MEMCG_SWAP_ENABLED=y
 CONFIG_MEMCG_KMEM=y
 CONFIG_BLK_CGROUP=y
-# CONFIG_DEBUG_BLK_CGROUP is not set
 CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
@@ -156,7 +174,6 @@ CONFIG_RD_LZ4=y
 CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
-CONFIG_ANON_INODES=y
 CONFIG_HAVE_UID16=y
 CONFIG_SYSCTL_EXCEPTION_TRACE=y
 CONFIG_BPF=y
@@ -202,6 +219,8 @@ CONFIG_HAVE_PERF_EVENTS=y
 #
 CONFIG_PERF_EVENTS=y
 # CONFIG_DEBUG_PERF_USE_VMALLOC is not set
+# end of Kernel Performance Events And Counters
+
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_SLUB_DEBUG=y
 # CONFIG_SLUB_MEMCG_SYSFS_ON is not set
@@ -212,10 +231,13 @@ CONFIG_SLUB=y
 CONFIG_SLAB_MERGE_DEFAULT=y
 CONFIG_SLAB_FREELIST_RANDOM=y
 # CONFIG_SLAB_FREELIST_HARDENED is not set
+CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
 CONFIG_SLUB_CPU_PARTIAL=y
 CONFIG_SYSTEM_DATA_VERIFICATION=y
 CONFIG_PROFILING=y
 CONFIG_TRACEPOINTS=y
+# end of General setup
+
 CONFIG_ARM64=y
 CONFIG_64BIT=y
 CONFIG_MMU=y
@@ -229,14 +251,12 @@ CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
 CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CSUM=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_ZONE_DMA32=y
-CONFIG_HAVE_GENERIC_GUP=y
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 CONFIG_SMP=y
 CONFIG_KERNEL_MODE_NEON=y
@@ -249,6 +269,7 @@ CONFIG_ARCH_PROC_KCORE_TEXT=y
 # Platform selection
 #
 CONFIG_ARCH_ACTIONS=y
+# CONFIG_ARCH_AGILEX is not set
 CONFIG_ARCH_SUNXI=y
 CONFIG_ARCH_ALPINE=y
 CONFIG_ARCH_BCM2835=y
@@ -281,6 +302,7 @@ CONFIG_ARCH_VEXPRESS=y
 CONFIG_ARCH_XGENE=y
 CONFIG_ARCH_ZX=y
 CONFIG_ARCH_ZYNQMP=y
+# end of Platform selection
 
 #
 # Kernel Features
@@ -299,7 +321,7 @@ CONFIG_ARM64_ERRATUM_834220=y
 CONFIG_ARM64_ERRATUM_845719=y
 CONFIG_ARM64_ERRATUM_843419=y
 CONFIG_ARM64_ERRATUM_1024718=y
-CONFIG_ARM64_ERRATUM_1188873=y
+CONFIG_ARM64_ERRATUM_1418040=y
 CONFIG_ARM64_ERRATUM_1165522=y
 CONFIG_ARM64_ERRATUM_1286807=y
 CONFIG_ARM64_ERRATUM_1463225=y
@@ -315,6 +337,8 @@ CONFIG_SOCIONEXT_SYNQUACER_PREITS=y
 CONFIG_HISILICON_ERRATUM_161600802=y
 CONFIG_QCOM_FALKOR_ERRATUM_E1041=y
 CONFIG_FUJITSU_ERRATUM_010001=y
+# end of ARM errata workarounds via the alternatives framework
+
 # CONFIG_ARM64_4K_PAGES is not set
 # CONFIG_ARM64_16K_PAGES is not set
 CONFIG_ARM64_64K_PAGES=y
@@ -347,6 +371,7 @@ CONFIG_HAVE_ARCH_PFN_VALID=y
 CONFIG_HW_PERF_EVENTS=y
 CONFIG_SYS_SUPPORTS_HUGETLBFS=y
 CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
+CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
 CONFIG_SECCOMP=y
 CONFIG_PARAVIRT=y
 CONFIG_PARAVIRT_TIME_ACCOUNTING=y
@@ -361,8 +386,10 @@ CONFIG_HARDEN_BRANCH_PREDICTOR=y
 CONFIG_HARDEN_EL2_VECTORS=y
 CONFIG_ARM64_SSBD=y
 CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
-# CONFIG_ARMV8_DEPRECATED is not set
 CONFIG_ARM64_SW_TTBR0_PAN=y
+CONFIG_COMPAT=y
+CONFIG_KUSER_HELPERS=y
+# CONFIG_ARMV8_DEPRECATED is not set
 
 #
 # ARMv8.1 architectural features
@@ -371,6 +398,7 @@ CONFIG_ARM64_HW_AFDBM=y
 CONFIG_ARM64_PAN=y
 # CONFIG_ARM64_LSE_ATOMICS is not set
 CONFIG_ARM64_VHE=y
+# end of ARMv8.1 architectural features
 
 #
 # ARMv8.2 architectural features
@@ -379,18 +407,23 @@ CONFIG_ARM64_UAO=y
 CONFIG_ARM64_PMEM=y
 CONFIG_ARM64_RAS_EXTN=y
 CONFIG_ARM64_CNP=y
+# end of ARMv8.2 architectural features
 
 #
 # ARMv8.3 architectural features
 #
 CONFIG_ARM64_PTR_AUTH=y
+# end of ARMv8.3 architectural features
+
 CONFIG_ARM64_SVE=y
 CONFIG_ARM64_MODULE_PLTS=y
+# CONFIG_ARM64_PSEUDO_NMI is not set
 CONFIG_RELOCATABLE=y
 CONFIG_RANDOMIZE_BASE=y
 CONFIG_RANDOMIZE_MODULE_REGION_FULL=y
 CONFIG_CC_HAVE_STACKPROTECTOR_SYSREG=y
 CONFIG_STACKPROTECTOR_PER_TASK=y
+# end of Kernel Features
 
 #
 # Boot options
@@ -401,7 +434,8 @@ CONFIG_CMDLINE="console=ttyAMA0"
 CONFIG_EFI_STUB=y
 CONFIG_EFI=y
 CONFIG_DMI=y
-CONFIG_COMPAT=y
+# end of Boot options
+
 CONFIG_SYSVIPC_COMPAT=y
 CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y
 
@@ -431,6 +465,7 @@ CONFIG_CPU_PM=y
 CONFIG_ENERGY_MODEL=y
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
+# end of Power management options
 
 #
 # CPU Power Management
@@ -450,6 +485,8 @@ CONFIG_DT_IDLE_STATES=y
 # ARM CPU Idle Drivers
 #
 CONFIG_ARM_CPUIDLE=y
+# end of ARM CPU Idle Drivers
+# end of CPU Idle
 
 #
 # CPU Frequency scaling
@@ -481,6 +518,7 @@ CONFIG_ACPI_CPPC_CPUFREQ=y
 CONFIG_ARM_ARMADA_8K_CPUFREQ=m
 CONFIG_ARM_SCPI_CPUFREQ=y
 CONFIG_ARM_BRCMSTB_AVS_CPUFREQ=y
+# CONFIG_ARM_IMX_CPUFREQ_DT is not set
 CONFIG_ARM_MEDIATEK_CPUFREQ=m
 # CONFIG_ARM_QCOM_CPUFREQ_KRYO is not set
 CONFIG_ARM_QCOM_CPUFREQ_HW=m
@@ -488,12 +526,12 @@ CONFIG_ARM_TEGRA20_CPUFREQ=y
 CONFIG_ARM_TEGRA124_CPUFREQ=y
 CONFIG_ARM_TEGRA186_CPUFREQ=y
 # CONFIG_QORIQ_CPUFREQ is not set
+# end of CPU Frequency scaling
+# end of CPU Power Management
 
 #
 # Firmware Drivers
 #
-CONFIG_ARM_PSCI_FW=y
-# CONFIG_ARM_PSCI_CHECKER is not set
 # CONFIG_ARM_SCMI_PROTOCOL is not set
 CONFIG_ARM_SCPI_PROTOCOL=y
 CONFIG_ARM_SCPI_POWER_DOMAIN=y
@@ -501,6 +539,7 @@ CONFIG_ARM_SCPI_POWER_DOMAIN=y
 # CONFIG_FIRMWARE_MEMMAP is not set
 CONFIG_DMIID=y
 CONFIG_DMI_SYSFS=y
+# CONFIG_ISCSI_IBFT is not set
 CONFIG_RASPBERRYPI_FIRMWARE=y
 # CONFIG_FW_CFG_SYSFS is not set
 CONFIG_INTEL_STRATIX10_SERVICE=m
@@ -508,6 +547,8 @@ CONFIG_QCOM_SCM=y
 CONFIG_QCOM_SCM_64=y
 # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
 CONFIG_HAVE_ARM_SMCCC=y
+CONFIG_ARM_PSCI_FW=y
+# CONFIG_ARM_PSCI_CHECKER is not set
 # CONFIG_GOOGLE_FIRMWARE is not set
 
 #
@@ -525,6 +566,8 @@ CONFIG_EFI_BOOTLOADER_CONTROL=y
 # CONFIG_EFI_CAPSULE_LOADER is not set
 # CONFIG_EFI_TEST is not set
 CONFIG_RESET_ATTACK_MITIGATION=y
+# end of EFI (Extensible Firmware Interface) Support
+
 CONFIG_UEFI_CPER=y
 CONFIG_UEFI_CPER_ARM=y
 CONFIG_EFI_EARLYCON=y
@@ -536,12 +579,16 @@ CONFIG_IMX_SCU=y
 #
 CONFIG_TEGRA_IVC=y
 CONFIG_TEGRA_BPMP=y
+# end of Tegra firmware driver
 
 #
 # Zynq MPSoC Firmware Drivers
 #
 CONFIG_ZYNQMP_FIRMWARE=y
 # CONFIG_ZYNQMP_FIRMWARE_DEBUG is not set
+# end of Zynq MPSoC Firmware Drivers
+# end of Firmware Drivers
+
 CONFIG_ARCH_SUPPORTS_ACPI=y
 CONFIG_ACPI=y
 CONFIG_ACPI_GENERIC_GSI=y
@@ -549,6 +596,8 @@ CONFIG_ACPI_CCA_REQUIRED=y
 # CONFIG_ACPI_DEBUGGER is not set
 CONFIG_ACPI_SPCR_TABLE=y
 CONFIG_ACPI_EC_DEBUGFS=y
+CONFIG_ACPI_AC=y
+CONFIG_ACPI_BATTERY=y
 CONFIG_ACPI_BUTTON=y
 CONFIG_ACPI_FAN=y
 # CONFIG_ACPI_TAD is not set
@@ -644,10 +693,13 @@ CONFIG_HAVE_DMA_CONTIGUOUS=y
 CONFIG_GENERIC_SMP_IDLE_THREAD=y
 CONFIG_GENERIC_IDLE_POLL_SETUP=y
 CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
+CONFIG_ARCH_HAS_KEEPINITRD=y
 CONFIG_ARCH_HAS_SET_MEMORY=y
+CONFIG_ARCH_HAS_SET_DIRECT_MAP=y
 CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y
 CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
 CONFIG_HAVE_RSEQ=y
+CONFIG_HAVE_FUNCTION_ARG_ACCESS_API=y
 CONFIG_HAVE_CLK=y
 CONFIG_HAVE_HW_BREAKPOINT=y
 CONFIG_HAVE_PERF_REGS=y
@@ -655,7 +707,6 @@ CONFIG_HAVE_PERF_USER_STACK_DUMP=y
 CONFIG_HAVE_ARCH_JUMP_LABEL=y
 CONFIG_HAVE_ARCH_JUMP_LABEL_RELATIVE=y
 CONFIG_HAVE_RCU_TABLE_FREE=y
-CONFIG_HAVE_RCU_TABLE_INVALIDATE=y
 CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
 CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
 CONFIG_HAVE_CMPXCHG_LOCAL=y
@@ -694,20 +745,28 @@ CONFIG_STRICT_MODULE_RWX=y
 CONFIG_REFCOUNT_FULL=y
 CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y
 CONFIG_ARCH_USE_MEMREMAP_PROT=y
+# CONFIG_LOCK_EVENT_COUNTS is not set
 
 #
 # GCOV-based kernel profiling
 #
 # CONFIG_GCOV_KERNEL is not set
 CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
+# end of GCOV-based kernel profiling
+
 CONFIG_PLUGIN_HOSTCC="g++"
 CONFIG_HAVE_GCC_PLUGINS=y
 CONFIG_GCC_PLUGINS=y
+
+#
+# GCC plugins
+#
 # CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set
-CONFIG_GCC_PLUGIN_LATENT_ENTROPY=y
-# CONFIG_GCC_PLUGIN_STRUCTLEAK is not set
+# CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
 # CONFIG_GCC_PLUGIN_RANDSTRUCT is not set
-# CONFIG_GCC_PLUGIN_STACKLEAK is not set
+# end of GCC plugins
+# end of General architecture-dependent options
+
 CONFIG_RT_MUTEXES=y
 CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
@@ -759,6 +818,8 @@ CONFIG_KARMA_PARTITION=y
 CONFIG_EFI_PARTITION=y
 # CONFIG_SYSV68_PARTITION is not set
 # CONFIG_CMDLINE_PARTITION is not set
+# end of Partition Types
+
 CONFIG_BLOCK_COMPAT=y
 CONFIG_BLK_MQ_PCI=y
 CONFIG_BLK_MQ_VIRTIO=y
@@ -771,6 +832,9 @@ CONFIG_MQ_IOSCHED_DEADLINE=y
 CONFIG_MQ_IOSCHED_KYBER=y
 CONFIG_IOSCHED_BFQ=y
 CONFIG_BFQ_GROUP_IOSCHED=y
+# CONFIG_BFQ_CGROUP_DEBUG is not set
+# end of IO Schedulers
+
 CONFIG_PREEMPT_NOTIFIERS=y
 CONFIG_PADATA=y
 CONFIG_ASN1=y
@@ -846,6 +910,7 @@ CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 CONFIG_BINFMT_SCRIPT=y
 CONFIG_BINFMT_MISC=y
 CONFIG_COREDUMP=y
+# end of Executable file formats
 
 #
 # Memory Management options
@@ -858,6 +923,8 @@ CONFIG_HAVE_MEMORY_PRESENT=y
 CONFIG_SPARSEMEM_EXTREME=y
 CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
 CONFIG_SPARSEMEM_VMEMMAP=y
+CONFIG_HAVE_FAST_GUP=y
+CONFIG_ARCH_KEEP_MEMBLOCK=y
 CONFIG_MEMORY_ISOLATION=y
 # CONFIG_MEMORY_HOTPLUG is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
@@ -865,6 +932,7 @@ CONFIG_MEMORY_BALLOON=y
 CONFIG_BALLOON_COMPACTION=y
 CONFIG_COMPACTION=y
 CONFIG_MIGRATION=y
+CONFIG_CONTIG_ALLOC=y
 CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_MMU_NOTIFIER=y
 CONFIG_KSM=y
@@ -888,10 +956,13 @@ CONFIG_ZSMALLOC=y
 CONFIG_GENERIC_EARLY_IOREMAP=y
 # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
 # CONFIG_IDLE_PAGE_TRACKING is not set
+CONFIG_ARCH_HAS_PTE_DEVMAP=y
 CONFIG_FRAME_VECTOR=y
 # CONFIG_PERCPU_STATS is not set
 # CONFIG_GUP_BENCHMARK is not set
 CONFIG_ARCH_HAS_PTE_SPECIAL=y
+# end of Memory Management options
+
 CONFIG_NET=y
 CONFIG_COMPAT_NETLINK_MESSAGES=y
 CONFIG_NET_INGRESS=y
@@ -948,9 +1019,6 @@ CONFIG_INET_ESP=m
 CONFIG_INET_IPCOMP=m
 CONFIG_INET_XFRM_TUNNEL=m
 CONFIG_INET_TUNNEL=m
-CONFIG_INET_XFRM_MODE_TRANSPORT=m
-CONFIG_INET_XFRM_MODE_TUNNEL=m
-CONFIG_INET_XFRM_MODE_BEET=m
 CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 CONFIG_INET_UDP_DIAG=m
@@ -989,10 +1057,6 @@ CONFIG_IPV6_MIP6=y
 CONFIG_IPV6_ILA=m
 CONFIG_INET6_XFRM_TUNNEL=m
 CONFIG_INET6_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-CONFIG_INET6_XFRM_MODE_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_BEET=m
-CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
 CONFIG_IPV6_VTI=m
 CONFIG_IPV6_SIT=m
 CONFIG_IPV6_SIT_6RD=y
@@ -1060,7 +1124,6 @@ CONFIG_NF_CT_NETLINK_TIMEOUT=m
 CONFIG_NF_CT_NETLINK_HELPER=m
 CONFIG_NETFILTER_NETLINK_GLUE_CT=y
 CONFIG_NF_NAT=m
-CONFIG_NF_NAT_NEEDED=y
 CONFIG_NF_NAT_AMANDA=m
 CONFIG_NF_NAT_FTP=m
 CONFIG_NF_NAT_IRC=m
@@ -1097,6 +1160,7 @@ CONFIG_NFT_XFRM=m
 CONFIG_NFT_SOCKET=m
 CONFIG_NFT_OSF=m
 CONFIG_NFT_TPROXY=m
+# CONFIG_NFT_SYNPROXY is not set
 CONFIG_NF_DUP_NETDEV=m
 CONFIG_NFT_DUP_NETDEV=m
 CONFIG_NFT_FWD_NETDEV=m
@@ -1135,6 +1199,7 @@ CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
 CONFIG_NETFILTER_XT_TARGET_RATEEST=m
 CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
+CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m
 CONFIG_NETFILTER_XT_TARGET_TEE=m
 CONFIG_NETFILTER_XT_TARGET_TPROXY=m
 CONFIG_NETFILTER_XT_TARGET_TRACE=m
@@ -1191,6 +1256,8 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m
 CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
 CONFIG_NETFILTER_XT_MATCH_TIME=m
 CONFIG_NETFILTER_XT_MATCH_U32=m
+# end of Core Netfilter Configuration
+
 CONFIG_IP_SET=m
 CONFIG_IP_SET_MAX=256
 CONFIG_IP_SET_BITMAP_IP=m
@@ -1265,7 +1332,6 @@ CONFIG_NF_DEFRAG_IPV4=m
 CONFIG_NF_SOCKET_IPV4=m
 CONFIG_NF_TPROXY_IPV4=m
 CONFIG_NF_TABLES_IPV4=y
-CONFIG_NFT_CHAIN_ROUTE_IPV4=m
 CONFIG_NFT_REJECT_IPV4=m
 CONFIG_NFT_DUP_IPV4=m
 CONFIG_NFT_FIB_IPV4=m
@@ -1299,6 +1365,7 @@ CONFIG_IP_NF_SECURITY=m
 CONFIG_IP_NF_ARPTABLES=m
 CONFIG_IP_NF_ARPFILTER=m
 CONFIG_IP_NF_ARP_MANGLE=m
+# end of IP: Netfilter Configuration
 
 #
 # IPv6: Netfilter Configuration
@@ -1306,7 +1373,6 @@ CONFIG_IP_NF_ARP_MANGLE=m
 CONFIG_NF_SOCKET_IPV6=m
 CONFIG_NF_TPROXY_IPV6=m
 CONFIG_NF_TABLES_IPV6=y
-CONFIG_NFT_CHAIN_ROUTE_IPV6=m
 CONFIG_NFT_REJECT_IPV6=m
 CONFIG_NFT_DUP_IPV6=m
 CONFIG_NFT_FIB_IPV6=m
@@ -1335,8 +1401,11 @@ CONFIG_IP6_NF_SECURITY=m
 CONFIG_IP6_NF_NAT=m
 CONFIG_IP6_NF_TARGET_MASQUERADE=m
 CONFIG_IP6_NF_TARGET_NPT=m
+# end of IPv6: Netfilter Configuration
+
 CONFIG_NF_DEFRAG_IPV6=m
 # CONFIG_NF_TABLES_BRIDGE is not set
+# CONFIG_NF_CONNTRACK_BRIDGE is not set
 CONFIG_BRIDGE_NF_EBTABLES=m
 CONFIG_BRIDGE_EBT_BROUTE=m
 CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -1369,11 +1438,14 @@ CONFIG_INET_DCCP_DIAG=m
 CONFIG_IP_DCCP_CCID3=y
 # CONFIG_IP_DCCP_CCID3_DEBUG is not set
 CONFIG_IP_DCCP_TFRC_LIB=y
+# end of DCCP CCIDs Configuration
 
 #
 # DCCP Kernel Hacking
 #
 # CONFIG_IP_DCCP_DEBUG is not set
+# end of DCCP Kernel Hacking
+
 CONFIG_IP_SCTP=m
 # CONFIG_SCTP_DBG_OBJCNT is not set
 # CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5 is not set
@@ -1408,16 +1480,21 @@ CONFIG_BRIDGE_IGMP_SNOOPING=y
 CONFIG_BRIDGE_VLAN_FILTERING=y
 CONFIG_HAVE_NET_DSA=y
 CONFIG_NET_DSA=m
-CONFIG_NET_DSA_LEGACY=y
-CONFIG_NET_DSA_TAG_BRCM=y
-CONFIG_NET_DSA_TAG_BRCM_PREPEND=y
-CONFIG_NET_DSA_TAG_DSA=y
-CONFIG_NET_DSA_TAG_EDSA=y
-CONFIG_NET_DSA_TAG_GSWIP=y
-CONFIG_NET_DSA_TAG_KSZ=y
-CONFIG_NET_DSA_TAG_KSZ9477=y
-CONFIG_NET_DSA_TAG_TRAILER=y
-CONFIG_NET_DSA_TAG_QCA=y
+CONFIG_NET_DSA_TAG_8021Q=m
+CONFIG_NET_DSA_TAG_BRCM_COMMON=m
+CONFIG_NET_DSA_TAG_BRCM=m
+CONFIG_NET_DSA_TAG_BRCM_PREPEND=m
+CONFIG_NET_DSA_TAG_GSWIP=m
+CONFIG_NET_DSA_TAG_DSA=m
+CONFIG_NET_DSA_TAG_EDSA=m
+CONFIG_NET_DSA_TAG_MTK=m
+CONFIG_NET_DSA_TAG_KSZ_COMMON=m
+CONFIG_NET_DSA_TAG_KSZ=m
+CONFIG_NET_DSA_TAG_KSZ9477=m
+CONFIG_NET_DSA_TAG_QCA=m
+CONFIG_NET_DSA_TAG_LAN9303=m
+CONFIG_NET_DSA_TAG_SJA1105=m
+CONFIG_NET_DSA_TAG_TRAILER=m
 CONFIG_VLAN_8021Q=m
 CONFIG_VLAN_8021Q_GVRP=y
 CONFIG_VLAN_8021Q_MVRP=y
@@ -1529,16 +1606,18 @@ CONFIG_NET_ACT_PEDIT=m
 CONFIG_NET_ACT_SIMP=m
 CONFIG_NET_ACT_SKBEDIT=m
 CONFIG_NET_ACT_CSUM=m
+# CONFIG_NET_ACT_MPLS is not set
 CONFIG_NET_ACT_VLAN=m
 CONFIG_NET_ACT_BPF=m
 CONFIG_NET_ACT_CONNMARK=m
+# CONFIG_NET_ACT_CTINFO is not set
 CONFIG_NET_ACT_SKBMOD=m
 CONFIG_NET_ACT_IFE=m
 CONFIG_NET_ACT_TUNNEL_KEY=m
+# CONFIG_NET_ACT_CT is not set
 CONFIG_NET_IFE_SKBMARK=m
 CONFIG_NET_IFE_SKBPRIO=m
 CONFIG_NET_IFE_SKBTCINDEX=m
-CONFIG_NET_CLS_IND=y
 CONFIG_NET_SCH_FIFO=y
 CONFIG_DCB=y
 CONFIG_DNS_RESOLVER=y
@@ -1550,6 +1629,7 @@ CONFIG_BATMAN_ADV_NC=y
 CONFIG_BATMAN_ADV_MCAST=y
 CONFIG_BATMAN_ADV_DEBUGFS=y
 # CONFIG_BATMAN_ADV_DEBUG is not set
+CONFIG_BATMAN_ADV_SYSFS=y
 # CONFIG_BATMAN_ADV_TRACING is not set
 CONFIG_OPENVSWITCH=m
 CONFIG_OPENVSWITCH_GRE=m
@@ -1588,6 +1668,9 @@ CONFIG_NET_FLOW_LIMIT=y
 #
 CONFIG_NET_PKTGEN=m
 CONFIG_NET_DROP_MONITOR=y
+# end of Network testing
+# end of Networking options
+
 CONFIG_HAMRADIO=y
 
 #
@@ -1607,6 +1690,8 @@ CONFIG_BPQETHER=m
 CONFIG_BAYCOM_SER_FDX=m
 CONFIG_BAYCOM_SER_HDX=m
 CONFIG_YAM=m
+# end of AX.25 network device drivers
+
 CONFIG_CAN=m
 CONFIG_CAN_RAW=m
 CONFIG_CAN_BCM=m
@@ -1649,6 +1734,7 @@ CONFIG_CAN_SOFTING=m
 #
 # CONFIG_CAN_HI311X is not set
 # CONFIG_CAN_MCP251X is not set
+# end of CAN SPI interfaces
 
 #
 # CAN USB interfaces
@@ -1661,7 +1747,11 @@ CONFIG_CAN_KVASER_USB=m
 # CONFIG_CAN_MCBA_USB is not set
 CONFIG_CAN_PEAK_USB=m
 CONFIG_CAN_UCAN=m
+# end of CAN USB interfaces
+
 # CONFIG_CAN_DEBUG_DEVICES is not set
+# end of CAN Device Drivers
+
 CONFIG_BT=m
 CONFIG_BT_BREDR=y
 CONFIG_BT_RFCOMM=m
@@ -1687,6 +1777,7 @@ CONFIG_BT_QCA=m
 CONFIG_BT_HCIBTUSB=m
 CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
 CONFIG_BT_HCIBTUSB_BCM=y
+# CONFIG_BT_HCIBTUSB_MTK is not set
 CONFIG_BT_HCIBTUSB_RTL=y
 CONFIG_BT_HCIBTSDIO=m
 CONFIG_BT_HCIUART=m
@@ -1695,7 +1786,6 @@ CONFIG_BT_HCIUART_BCSP=y
 CONFIG_BT_HCIUART_ATH3K=y
 CONFIG_BT_HCIUART_INTEL=y
 # CONFIG_BT_HCIUART_AG6XX is not set
-CONFIG_BT_HCIUART_MRVL=y
 CONFIG_BT_HCIBCM203X=m
 CONFIG_BT_HCIBPA10X=m
 CONFIG_BT_HCIBFUSB=m
@@ -1703,8 +1793,11 @@ CONFIG_BT_HCIVHCI=m
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
 CONFIG_BT_ATH3K=m
+CONFIG_BT_MTKSDIO=m
 CONFIG_BT_QCOMSMD=m
 CONFIG_BT_HCIRSI=m
+# end of Bluetooth device drivers
+
 # CONFIG_AF_RXRPC is not set
 # CONFIG_AF_KCM is not set
 CONFIG_STREAM_PARSER=y
@@ -1785,6 +1878,8 @@ CONFIG_NFC_ST21NFCA_I2C=m
 # CONFIG_NFC_NXP_NCI is not set
 # CONFIG_NFC_S3FWRN5_I2C is not set
 # CONFIG_NFC_ST95HF is not set
+# end of Near Field Communication (NFC) devices
+
 # CONFIG_PSAMPLE is not set
 CONFIG_NET_IFE=m
 CONFIG_LWTUNNEL=y
@@ -1792,7 +1887,8 @@ CONFIG_LWTUNNEL_BPF=y
 CONFIG_DST_CACHE=y
 CONFIG_GRO_CELLS=y
 CONFIG_NET_SOCK_MSG=y
-# CONFIG_NET_DEVLINK is not set
+CONFIG_NET_DEVLINK=y
+CONFIG_PAGE_POOL=y
 CONFIG_FAILOVER=m
 CONFIG_HAVE_EBPF_JIT=y
 
@@ -1850,6 +1946,8 @@ CONFIG_PCI_AARDVARK=y
 # Cadence PCIe controllers support
 #
 # CONFIG_PCIE_CADENCE_HOST is not set
+# end of Cadence PCIe controllers support
+
 # CONFIG_PCIE_XILINX_NWL is not set
 # CONFIG_PCI_FTPCI100 is not set
 CONFIG_PCI_TEGRA=y
@@ -1885,16 +1983,21 @@ CONFIG_PCIE_QCOM=y
 CONFIG_PCIE_HISI_STB=y
 CONFIG_PCI_MESON=y
 CONFIG_PCIE_UNIPHIER=y
+# end of DesignWare PCI Core Support
+# end of PCI controller drivers
 
 #
 # PCI Endpoint
 #
 # CONFIG_PCI_ENDPOINT is not set
+# end of PCI Endpoint
 
 #
 # PCI switch controller drivers
 #
 # CONFIG_PCI_SW_SWITCHTEC is not set
+# end of PCI switch controller drivers
+
 # CONFIG_PCCARD is not set
 CONFIG_RAPIDIO=m
 CONFIG_RAPIDIO_TSI721=m
@@ -1914,6 +2017,7 @@ CONFIG_RAPIDIO_MPORT_CDEV=m
 # CONFIG_RAPIDIO_TSI568 is not set
 # CONFIG_RAPIDIO_CPS_GEN2 is not set
 # CONFIG_RAPIDIO_RXS_GEN3 is not set
+# end of RapidIO Switch drivers
 
 #
 # Generic Driver Options
@@ -1930,6 +2034,9 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
 CONFIG_EXTRA_FIRMWARE=""
 # CONFIG_FW_LOADER_USER_HELPER is not set
+# CONFIG_FW_LOADER_COMPRESS is not set
+# end of Firmware loader
+
 CONFIG_WANT_DEV_COREDUMP=y
 CONFIG_ALLOW_DEV_COREDUMP=y
 CONFIG_DEV_COREDUMP=y
@@ -1938,6 +2045,7 @@ CONFIG_DEBUG_DEVRES=y
 # CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
 CONFIG_TEST_ASYNC_DRIVER_PROBE=m
 CONFIG_GENERIC_CPU_AUTOPROBE=y
+CONFIG_GENERIC_CPU_VULNERABILITIES=y
 CONFIG_SOC_BUS=y
 CONFIG_REGMAP=y
 CONFIG_REGMAP_I2C=y
@@ -1949,6 +2057,7 @@ CONFIG_REGMAP_IRQ=y
 CONFIG_DMA_SHARED_BUFFER=y
 # CONFIG_DMA_FENCE_TRACE is not set
 CONFIG_GENERIC_ARCH_TOPOLOGY=y
+# end of Generic Driver Options
 
 #
 # Bus devices
@@ -1967,20 +2076,23 @@ CONFIG_TEGRA_GMI=m
 CONFIG_UNIPHIER_SYSTEM_BUS=y
 CONFIG_VEXPRESS_CONFIG=y
 # CONFIG_FSL_MC_BUS is not set
+# end of Bus devices
+
 CONFIG_CONNECTOR=y
 CONFIG_PROC_EVENTS=y
 CONFIG_GNSS=m
 CONFIG_MTD=y
 # CONFIG_MTD_TESTS is not set
 # CONFIG_MTD_CMDLINE_PARTS is not set
-# CONFIG_MTD_AFS_PARTS is not set
 CONFIG_MTD_OF_PARTS=m
 # CONFIG_MTD_AR7_PARTS is not set
 
 #
 # Partition parsers
 #
+# CONFIG_MTD_AFS_PARTS is not set
 # CONFIG_MTD_REDBOOT_PARTS is not set
+# end of Partition parsers
 
 #
 # User Modules And Translation Layers
@@ -2017,6 +2129,7 @@ CONFIG_MTD_CFI_UTIL=m
 # CONFIG_MTD_RAM is not set
 # CONFIG_MTD_ROM is not set
 # CONFIG_MTD_ABSENT is not set
+# end of RAM/ROM/Flash chip drivers
 
 #
 # Mapping drivers for chip access
@@ -2027,6 +2140,7 @@ CONFIG_MTD_PHYSMAP=m
 # CONFIG_MTD_PHYSMAP_OF is not set
 # CONFIG_MTD_INTEL_VR_NOR is not set
 # CONFIG_MTD_PLATRAM is not set
+# end of Mapping drivers for chip access
 
 #
 # Self-contained MTD device drivers
@@ -2045,15 +2159,54 @@ CONFIG_MTD_M25P80=y
 # Disk-On-Chip Device Drivers
 #
 # CONFIG_MTD_DOCG3 is not set
+# end of Self-contained MTD device drivers
+
 CONFIG_MTD_NAND_CORE=m
 # CONFIG_MTD_ONENAND is not set
-# CONFIG_MTD_NAND is not set
+CONFIG_MTD_NAND_ECC_SW_HAMMING=m
+# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
+CONFIG_MTD_RAW_NAND=m
+CONFIG_MTD_NAND_ECC_SW_BCH=y
+
+#
+# Raw/parallel NAND flash controllers
+#
+CONFIG_MTD_NAND_DENALI=m
+CONFIG_MTD_NAND_DENALI_PCI=m
+CONFIG_MTD_NAND_DENALI_DT=m
+CONFIG_MTD_NAND_CAFE=m
+CONFIG_MTD_NAND_MARVELL=m
+CONFIG_MTD_NAND_BRCMNAND=m
+CONFIG_MTD_NAND_FSL_IFC=m
+CONFIG_MTD_NAND_MXC=m
+CONFIG_MTD_NAND_SUNXI=m
+CONFIG_MTD_NAND_HISI504=m
+CONFIG_MTD_NAND_QCOM=m
+CONFIG_MTD_NAND_MTK=m
+CONFIG_MTD_NAND_TEGRA=m
+CONFIG_MTD_NAND_MESON=m
+CONFIG_MTD_NAND_GPIO=m
+CONFIG_MTD_NAND_PLATFORM=m
+
+#
+# Misc
+#
+CONFIG_MTD_SM_COMMON=m
+CONFIG_MTD_NAND_NANDSIM=m
+CONFIG_MTD_NAND_RICOH=m
+CONFIG_MTD_NAND_DISKONCHIP=m
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED=y
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0x0
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_HIGH=y
+# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set
 CONFIG_MTD_SPI_NAND=m
 
 #
 # LPDDR & LPDDR2 PCM memory drivers
 #
 # CONFIG_MTD_LPDDR is not set
+# end of LPDDR & LPDDR2 PCM memory drivers
+
 CONFIG_MTD_SPI_NOR=y
 CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y
 CONFIG_SPI_CADENCE_QUADSPI=m
@@ -2065,6 +2218,7 @@ CONFIG_MTD_UBI_BEB_LIMIT=20
 # CONFIG_MTD_UBI_FASTMAP is not set
 # CONFIG_MTD_UBI_GLUEBI is not set
 # CONFIG_MTD_UBI_BLOCK is not set
+# CONFIG_MTD_HYPERBUS is not set
 CONFIG_DTC=y
 CONFIG_OF=y
 # CONFIG_OF_UNITTEST is not set
@@ -2125,6 +2279,7 @@ CONFIG_NVME_FABRICS=m
 CONFIG_NVME_FC=m
 CONFIG_NVME_TCP=m
 # CONFIG_NVME_TARGET is not set
+# end of NVME Support
 
 #
 # Misc devices
@@ -2149,11 +2304,11 @@ CONFIG_SENSORS_BH1770=m
 CONFIG_SENSORS_APDS990X=m
 # CONFIG_HMC6352 is not set
 # CONFIG_DS1682 is not set
-# CONFIG_USB_SWITCH_FSA9480 is not set
 # CONFIG_LATTICE_ECP3_CONFIG is not set
 CONFIG_SRAM=y
 CONFIG_VEXPRESS_SYSCFG=y
 # CONFIG_PCI_ENDPOINT_TEST is not set
+# CONFIG_XILINX_SDFEC is not set
 CONFIG_MISC_RTSX=m
 CONFIG_PVPANIC=m
 # CONFIG_C2PORT is not set
@@ -2169,6 +2324,8 @@ CONFIG_EEPROM_93CX6=m
 # CONFIG_EEPROM_93XX46 is not set
 # CONFIG_EEPROM_IDT_89HPESX is not set
 CONFIG_EEPROM_EE1004=m
+# end of EEPROM support
+
 CONFIG_CB710_CORE=y
 # CONFIG_CB710_DEBUG is not set
 CONFIG_CB710_DEBUG_ASSUMPTIONS=y
@@ -2177,6 +2334,8 @@ CONFIG_CB710_DEBUG_ASSUMPTIONS=y
 # Texas Instruments shared transport line discipline
 #
 # CONFIG_TI_ST is not set
+# end of Texas Instruments shared transport line discipline
+
 CONFIG_SENSORS_LIS3_I2C=m
 CONFIG_ALTERA_STAPL=m
 
@@ -2218,12 +2377,15 @@ CONFIG_VOP_BUS=m
 #
 CONFIG_VOP=m
 CONFIG_VHOST_RING=m
+# end of Intel MIC & related support
+
 # CONFIG_GENWQE is not set
 CONFIG_ECHO=m
 CONFIG_MISC_ALCOR_PCI=m
 CONFIG_MISC_RTSX_PCI=m
 CONFIG_MISC_RTSX_USB=m
 CONFIG_HABANA_AI=m
+# end of Misc devices
 
 #
 # SCSI device support
@@ -2240,7 +2402,6 @@ CONFIG_SCSI_PROC_FS=y
 #
 CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_ST=m
-CONFIG_CHR_DEV_OSST=m
 CONFIG_BLK_DEV_SR=y
 CONFIG_BLK_DEV_SR_VENDOR=y
 CONFIG_CHR_DEV_SG=y
@@ -2261,6 +2422,8 @@ CONFIG_SCSI_SAS_LIBSAS=m
 CONFIG_SCSI_SAS_ATA=y
 CONFIG_SCSI_SAS_HOST_SMP=y
 CONFIG_SCSI_SRP_ATTRS=m
+# end of SCSI Transports
+
 CONFIG_SCSI_LOWLEVEL=y
 CONFIG_ISCSI_TCP=m
 CONFIG_ISCSI_BOOT_SYSFS=m
@@ -2301,6 +2464,7 @@ CONFIG_SCSI_UFSHCD_PLATFORM=m
 CONFIG_SCSI_UFS_CDNS_PLATFORM=m
 # CONFIG_SCSI_UFS_DWC_TC_PLATFORM is not set
 CONFIG_SCSI_UFS_QCOM=m
+CONFIG_SCSI_UFS_MEDIATEK=m
 # CONFIG_SCSI_UFS_HISI is not set
 CONFIG_SCSI_UFS_BSG=y
 CONFIG_SCSI_HPTIOP=m
@@ -2312,6 +2476,7 @@ CONFIG_FCOE=m
 CONFIG_SCSI_SNIC=m
 # CONFIG_SCSI_SNIC_DEBUG_FS is not set
 CONFIG_SCSI_DMX3191D=m
+# CONFIG_SCSI_FDOMAIN_PCI is not set
 CONFIG_SCSI_GDTH=m
 # CONFIG_SCSI_IPS is not set
 CONFIG_SCSI_INITIO=m
@@ -2346,6 +2511,8 @@ CONFIG_SCSI_DH_RDAC=m
 CONFIG_SCSI_DH_HP_SW=m
 CONFIG_SCSI_DH_EMC=m
 CONFIG_SCSI_DH_ALUA=m
+# end of SCSI device support
+
 CONFIG_HAVE_PATA_PLATFORM=y
 CONFIG_ATA=y
 CONFIG_ATA_VERBOSE_ERROR=y
@@ -2491,6 +2658,7 @@ CONFIG_DM_MULTIPATH=m
 CONFIG_DM_MULTIPATH_QL=m
 CONFIG_DM_MULTIPATH_ST=m
 CONFIG_DM_DELAY=m
+CONFIG_DM_DUST=m
 CONFIG_DM_INIT=y
 CONFIG_DM_UEVENT=y
 CONFIG_DM_FLAKEY=m
@@ -2515,6 +2683,8 @@ CONFIG_ISCSI_TARGET=m
 #
 # CONFIG_FIREWIRE is not set
 CONFIG_FIREWIRE_NOSY=m
+# end of IEEE 1394 (FireWire) support
+
 CONFIG_NETDEVICES=y
 CONFIG_MII=m
 CONFIG_NET_CORE=y
@@ -2580,11 +2750,16 @@ CONFIG_NET_DSA_MICROCHIP_KSZ9477_SPI=m
 CONFIG_NET_DSA_MV88E6XXX=m
 CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y
 # CONFIG_NET_DSA_MV88E6XXX_PTP is not set
+CONFIG_NET_DSA_SJA1105=m
+# CONFIG_NET_DSA_SJA1105_PTP is not set
 CONFIG_NET_DSA_QCA8K=m
 # CONFIG_NET_DSA_REALTEK_SMI is not set
 # CONFIG_NET_DSA_SMSC_LAN9303_I2C is not set
 # CONFIG_NET_DSA_SMSC_LAN9303_MDIO is not set
-# CONFIG_NET_DSA_VITESSE_VSC73XX is not set
+# CONFIG_NET_DSA_VITESSE_VSC73XX_SPI is not set
+# CONFIG_NET_DSA_VITESSE_VSC73XX_PLATFORM is not set
+# end of Distributed Switch Architecture drivers
+
 CONFIG_ETHERNET=y
 CONFIG_MDIO=m
 # CONFIG_NET_VENDOR_3COM is not set
@@ -2609,6 +2784,7 @@ CONFIG_AMD_XGBE_DCB=y
 CONFIG_NET_XGENE=y
 CONFIG_NET_XGENE_V2=y
 CONFIG_NET_VENDOR_AQUANTIA=y
+CONFIG_AQTION=m
 CONFIG_NET_VENDOR_ARC=y
 CONFIG_ARC_EMAC_CORE=m
 CONFIG_EMAC_ROCKCHIP=m
@@ -2662,10 +2838,14 @@ CONFIG_FEC=m
 CONFIG_FSL_ENETC=m
 CONFIG_FSL_ENETC_VF=m
 CONFIG_FSL_ENETC_PTP_CLOCK=m
+# CONFIG_FSL_ENETC_HW_TIMESTAMPING is not set
+CONFIG_NET_VENDOR_GOOGLE=y
+# CONFIG_GVE is not set
 CONFIG_NET_VENDOR_HISILICON=y
 CONFIG_HIX5HD2_GMAC=m
 # CONFIG_HISI_FEMAC is not set
 CONFIG_HIP04_ETH=m
+# CONFIG_HI13X1_GMAC is not set
 CONFIG_HNS_MDIO=m
 CONFIG_HNS=m
 CONFIG_HNS_DSAF=m
@@ -2791,6 +2971,7 @@ CONFIG_NET_VENDOR_SOCIONEXT=y
 # CONFIG_SNI_NETSEC is not set
 CONFIG_NET_VENDOR_STMICRO=y
 CONFIG_STMMAC_ETH=m
+# CONFIG_STMMAC_SELFTESTS is not set
 CONFIG_STMMAC_PLATFORM=m
 # CONFIG_DWMAC_DWC_QOS_ETH is not set
 CONFIG_DWMAC_GENERIC=m
@@ -2811,7 +2992,6 @@ CONFIG_NET_VENDOR_TEHUTI=y
 CONFIG_TEHUTI=m
 CONFIG_NET_VENDOR_TI=y
 # CONFIG_TI_CPSW_PHY_SEL is not set
-# CONFIG_TI_CPSW_ALE is not set
 # CONFIG_TLAN is not set
 CONFIG_NET_VENDOR_VIA=y
 CONFIG_VIA_RHINE=m
@@ -2829,6 +3009,7 @@ CONFIG_MDIO_BITBANG=m
 CONFIG_MDIO_BUS_MUX=y
 CONFIG_MDIO_BUS_MUX_BCM_IPROC=y
 # CONFIG_MDIO_BUS_MUX_GPIO is not set
+CONFIG_MDIO_BUS_MUX_MESON_G12A=m
 CONFIG_MDIO_BUS_MUX_MMIOREG=y
 CONFIG_MDIO_BUS_MUX_MULTIPLEXER=m
 # CONFIG_MDIO_GPIO is not set
@@ -2875,6 +3056,7 @@ CONFIG_MICROCHIP_PHY=m
 # CONFIG_MICROCHIP_T1_PHY is not set
 CONFIG_MICROSEMI_PHY=m
 CONFIG_NATIONAL_PHY=m
+# CONFIG_NXP_TJA11XX_PHY is not set
 CONFIG_QSEMI_PHY=m
 CONFIG_REALTEK_PHY=m
 CONFIG_RENESAS_PHY=m
@@ -3069,6 +3251,8 @@ CONFIG_IWL3945=m
 #
 CONFIG_IWLEGACY_DEBUG=y
 CONFIG_IWLEGACY_DEBUGFS=y
+# end of iwl3945 / iwl4965 Debugging Options
+
 CONFIG_IWLWIFI=m
 CONFIG_IWLWIFI_LEDS=y
 CONFIG_IWLDVM=m
@@ -3083,6 +3267,8 @@ CONFIG_IWLWIFI_OPMODE_MODULAR=y
 CONFIG_IWLWIFI_DEBUG=y
 CONFIG_IWLWIFI_DEBUGFS=y
 # CONFIG_IWLWIFI_DEVICE_TRACING is not set
+# end of Debugging Options
+
 CONFIG_WLAN_VENDOR_INTERSIL=y
 CONFIG_HOSTAP=m
 CONFIG_HOSTAP_FIRMWARE=y
@@ -3132,6 +3318,7 @@ CONFIG_MT76x2_COMMON=m
 # CONFIG_MT76x2E is not set
 CONFIG_MT76x2U=m
 CONFIG_MT7603E=m
+CONFIG_MT7615E=m
 CONFIG_WLAN_VENDOR_RALINK=y
 CONFIG_RT2X00=m
 CONFIG_RT2400PCI=m
@@ -3185,6 +3372,13 @@ CONFIG_RTL8723_COMMON=m
 CONFIG_RTLBTCOEXIST=m
 CONFIG_RTL8XXXU=m
 # CONFIG_RTL8XXXU_UNTESTED is not set
+CONFIG_RTW88=m
+CONFIG_RTW88_CORE=m
+CONFIG_RTW88_PCI=m
+CONFIG_RTW88_8822BE=y
+CONFIG_RTW88_8822CE=y
+# CONFIG_RTW88_DEBUG is not set
+# CONFIG_RTW88_DEBUGFS is not set
 CONFIG_WLAN_VENDOR_RSI=y
 CONFIG_RSI_91X=m
 CONFIG_RSI_DEBUGFS=y
@@ -3266,6 +3460,7 @@ CONFIG_INPUT_KEYBOARD=y
 # CONFIG_KEYBOARD_ADP5588 is not set
 # CONFIG_KEYBOARD_ADP5589 is not set
 CONFIG_KEYBOARD_ATKBD=y
+CONFIG_KEYBOARD_QT1050=m
 # CONFIG_KEYBOARD_QT1070 is not set
 # CONFIG_KEYBOARD_QT2160 is not set
 # CONFIG_KEYBOARD_DLINK_DIR685 is not set
@@ -3334,8 +3529,8 @@ CONFIG_JOYSTICK_INTERACT=m
 CONFIG_JOYSTICK_SIDEWINDER=m
 CONFIG_JOYSTICK_TMDC=m
 CONFIG_JOYSTICK_IFORCE=m
-CONFIG_JOYSTICK_IFORCE_USB=y
-CONFIG_JOYSTICK_IFORCE_232=y
+CONFIG_JOYSTICK_IFORCE_USB=m
+CONFIG_JOYSTICK_IFORCE_232=m
 CONFIG_JOYSTICK_WARRIOR=m
 CONFIG_JOYSTICK_MAGELLAN=m
 CONFIG_JOYSTICK_SPACEORB=m
@@ -3448,6 +3643,7 @@ CONFIG_TOUCHSCREEN_ST1232=m
 CONFIG_TOUCHSCREEN_ZFORCE=m
 # CONFIG_TOUCHSCREEN_COLIBRI_VF50 is not set
 # CONFIG_TOUCHSCREEN_ROHM_BU21023 is not set
+CONFIG_TOUCHSCREEN_IQS5XX=m
 CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_AD714X is not set
 # CONFIG_INPUT_ATMEL_CAPTOUCH is not set
@@ -3456,10 +3652,12 @@ CONFIG_INPUT_E3X0_BUTTON=m
 CONFIG_INPUT_MSM_VIBRATOR=m
 CONFIG_INPUT_PM8941_PWRKEY=y
 # CONFIG_INPUT_PM8XXX_VIBRATOR is not set
+CONFIG_INPUT_MAX77650_ONKEY=m
 CONFIG_INPUT_MMA8450=m
 CONFIG_INPUT_GP2A=m
 # CONFIG_INPUT_GPIO_BEEPER is not set
 # CONFIG_INPUT_GPIO_DECODER is not set
+CONFIG_INPUT_GPIO_VIBRA=m
 CONFIG_INPUT_ATI_REMOTE2=m
 CONFIG_INPUT_KEYSPAN_REMOTE=m
 CONFIG_INPUT_KXTJ9=m
@@ -3511,7 +3709,6 @@ CONFIG_SERIO_ALTERA_PS2=m
 # CONFIG_SERIO_PS2MULT is not set
 CONFIG_SERIO_ARC_PS2=m
 # CONFIG_SERIO_APBPS2 is not set
-CONFIG_SERIO_OLPC_APSP=m
 # CONFIG_SERIO_SUN4I_PS2 is not set
 CONFIG_SERIO_GPIO_PS2=m
 # CONFIG_USERIO is not set
@@ -3520,6 +3717,8 @@ CONFIG_GAMEPORT_NS558=m
 CONFIG_GAMEPORT_L4=m
 CONFIG_GAMEPORT_EMU10K1=m
 CONFIG_GAMEPORT_FM801=m
+# end of Hardware I/O ports
+# end of Input device support
 
 #
 # Character devices
@@ -3546,6 +3745,7 @@ CONFIG_NOZOMI=m
 CONFIG_N_HDLC=m
 CONFIG_N_GSM=m
 # CONFIG_TRACE_SINK is not set
+CONFIG_NULL_TTY=m
 CONFIG_LDISC_AUTOLOAD=y
 CONFIG_DEVMEM=y
 
@@ -3605,6 +3805,7 @@ CONFIG_CONSOLE_POLL=y
 CONFIG_SERIAL_JSM=m
 CONFIG_SERIAL_MSM=y
 CONFIG_SERIAL_MSM_CONSOLE=y
+CONFIG_SERIAL_SIFIVE=m
 # CONFIG_SERIAL_SCCNXP is not set
 # CONFIG_SERIAL_SC16IS7XX is not set
 # CONFIG_SERIAL_ALTERA_JTAGUART is not set
@@ -3621,7 +3822,9 @@ CONFIG_SERIAL_ARC_NR_PORTS=1
 CONFIG_SERIAL_MVEBU_UART=y
 CONFIG_SERIAL_MVEBU_CONSOLE=y
 # CONFIG_SERIAL_OWL is not set
-CONFIG_SERIAL_MCTRL_GPIO=m
+# end of Serial drivers
+
+CONFIG_SERIAL_MCTRL_GPIO=y
 # CONFIG_SERIAL_DEV_BUS is not set
 # CONFIG_TTY_PRINTK is not set
 CONFIG_HVC_DRIVER=y
@@ -3636,6 +3839,7 @@ CONFIG_IPMI_SI=m
 CONFIG_IPMI_SSIF=m
 CONFIG_IPMI_WATCHDOG=m
 CONFIG_IPMI_POWEROFF=m
+# CONFIG_IPMB_DEVICE_INTERFACE is not set
 CONFIG_HW_RANDOM=y
 CONFIG_HW_RANDOM_TIMERIOMEM=m
 CONFIG_HW_RANDOM_BCM2835=y
@@ -3668,6 +3872,7 @@ CONFIG_TCG_ATMEL=m
 # CONFIG_TCG_TIS_ST33ZP24_SPI is not set
 CONFIG_DEVPORT=y
 # CONFIG_XILLYBUS is not set
+# end of Character devices
 
 #
 # I2C support
@@ -3692,6 +3897,8 @@ CONFIG_I2C_MUX_PINCTRL=m
 CONFIG_I2C_MUX_REG=m
 CONFIG_I2C_DEMUX_PINCTRL=m
 CONFIG_I2C_MUX_MLXCPLD=m
+# end of Multiplexer I2C Chip support
+
 CONFIG_I2C_HELPER_AUTO=y
 CONFIG_I2C_SMBUS=m
 CONFIG_I2C_ALGOBIT=m
@@ -3709,6 +3916,7 @@ CONFIG_I2C_ALGOPCA=m
 # CONFIG_I2C_ALI15X3 is not set
 # CONFIG_I2C_AMD756 is not set
 # CONFIG_I2C_AMD8111 is not set
+CONFIG_I2C_AMD_MP2=m
 # CONFIG_I2C_HIX5HD2 is not set
 # CONFIG_I2C_I801 is not set
 # CONFIG_I2C_ISCH is not set
@@ -3786,12 +3994,16 @@ CONFIG_I2C_VIPERBOARD=m
 CONFIG_I2C_CROS_EC_TUNNEL=y
 CONFIG_I2C_XGENE_SLIMPRO=m
 CONFIG_I2C_ZX2967=y
+# end of I2C Hardware Bus support
+
 CONFIG_I2C_STUB=m
 CONFIG_I2C_SLAVE=y
 CONFIG_I2C_SLAVE_EEPROM=m
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
+# end of I2C support
+
 CONFIG_I3C=m
 CONFIG_CDNS_I3C_MASTER=m
 CONFIG_DW_I3C_MASTER=m
@@ -3839,6 +4051,7 @@ CONFIG_SPI_SPRD=m
 CONFIG_SPI_SPRD_ADI=m
 # CONFIG_SPI_SUN4I is not set
 # CONFIG_SPI_SUN6I is not set
+# CONFIG_SPI_SYNQUACER is not set
 CONFIG_SPI_MXIC=m
 # CONFIG_SPI_TEGRA114 is not set
 # CONFIG_SPI_TEGRA20_SFLASH is not set
@@ -3881,6 +4094,8 @@ CONFIG_PTP_1588_CLOCK=m
 CONFIG_PTP_1588_CLOCK_DTE=m
 CONFIG_PTP_1588_CLOCK_QORIQ=m
 CONFIG_DP83640_PHY=m
+# end of PTP clock support
+
 CONFIG_PINCTRL=y
 CONFIG_GENERIC_PINCTRL_GROUPS=y
 CONFIG_PINMUX=y
@@ -3889,10 +4104,12 @@ CONFIG_PINCONF=y
 CONFIG_GENERIC_PINCONF=y
 # CONFIG_DEBUG_PINCTRL is not set
 CONFIG_PINCTRL_AMD=y
+CONFIG_PINCTRL_BM1880=y
 # CONFIG_PINCTRL_MCP23S08 is not set
 CONFIG_PINCTRL_ROCKCHIP=y
 CONFIG_PINCTRL_SINGLE=y
 CONFIG_PINCTRL_SX150X=y
+CONFIG_PINCTRL_STMFX=m
 CONFIG_PINCTRL_OCELOT=y
 # CONFIG_PINCTRL_OWL is not set
 CONFIG_PINCTRL_BCM2835=y
@@ -3903,6 +4120,7 @@ CONFIG_PINCTRL_NS2_MUX=y
 CONFIG_PINCTRL_IMX=y
 CONFIG_PINCTRL_IMX_SCU=y
 # CONFIG_PINCTRL_IMX8MM is not set
+# CONFIG_PINCTRL_IMX8MN is not set
 CONFIG_PINCTRL_IMX8MQ=y
 # CONFIG_PINCTRL_IMX8QM is not set
 CONFIG_PINCTRL_IMX8QXP=y
@@ -3930,6 +4148,7 @@ CONFIG_PINCTRL_QCOM_SPMI_PMIC=y
 CONFIG_PINCTRL_QCOM_SSBI_PMIC=y
 CONFIG_PINCTRL_SDM660=m
 # CONFIG_PINCTRL_SDM845 is not set
+# CONFIG_PINCTRL_SM8150 is not set
 CONFIG_PINCTRL_SAMSUNG=y
 CONFIG_PINCTRL_EXYNOS=y
 CONFIG_PINCTRL_EXYNOS_ARM64=y
@@ -3942,7 +4161,20 @@ CONFIG_PINCTRL_PFC_R8A77970=y
 CONFIG_PINCTRL_PFC_R8A77995=y
 # CONFIG_PINCTRL_SPRD is not set
 CONFIG_PINCTRL_SUNXI=y
+# CONFIG_PINCTRL_SUN4I_A10 is not set
+# CONFIG_PINCTRL_SUN5I is not set
+# CONFIG_PINCTRL_SUN6I_A31 is not set
+# CONFIG_PINCTRL_SUN6I_A31_R is not set
+# CONFIG_PINCTRL_SUN8I_A23 is not set
+# CONFIG_PINCTRL_SUN8I_A33 is not set
+# CONFIG_PINCTRL_SUN8I_A83T is not set
+# CONFIG_PINCTRL_SUN8I_A83T_R is not set
+# CONFIG_PINCTRL_SUN8I_A23_R is not set
+# CONFIG_PINCTRL_SUN8I_H3 is not set
 CONFIG_PINCTRL_SUN8I_H3_R=y
+# CONFIG_PINCTRL_SUN8I_V3S is not set
+# CONFIG_PINCTRL_SUN9I_A80 is not set
+# CONFIG_PINCTRL_SUN9I_A80_R is not set
 CONFIG_PINCTRL_SUN50I_A64=y
 CONFIG_PINCTRL_SUN50I_A64_R=y
 CONFIG_PINCTRL_SUN50I_H5=y
@@ -3976,6 +4208,9 @@ CONFIG_PINCTRL_MT6797=y
 CONFIG_PINCTRL_MT7622=y
 CONFIG_PINCTRL_MT8173=y
 CONFIG_PINCTRL_MT8183=y
+CONFIG_PINCTRL_MT8516=y
+# end of MediaTek pinctrl drivers
+
 # CONFIG_PINCTRL_ZX296718 is not set
 CONFIG_PINCTRL_MESON=y
 CONFIG_PINCTRL_MESON_GXBB=y
@@ -4014,7 +4249,6 @@ CONFIG_GPIO_GENERIC_PLATFORM=y
 # CONFIG_GPIO_GRGPIO is not set
 # CONFIG_GPIO_HLWD is not set
 CONFIG_GPIO_MB86S7X=m
-# CONFIG_GPIO_MOCKUP is not set
 # CONFIG_GPIO_MPC8XXX is not set
 CONFIG_GPIO_MVEBU=y
 CONFIG_GPIO_MXC=y
@@ -4035,6 +4269,7 @@ CONFIG_GPIO_XGENE_SB=m
 # CONFIG_GPIO_ZYNQ is not set
 # CONFIG_GPIO_ZX is not set
 CONFIG_GPIO_AMD_FCH=m
+# end of Memory mapped GPIO drivers
 
 #
 # I2C GPIO expanders
@@ -4048,13 +4283,16 @@ CONFIG_GPIO_PCA953X=y
 CONFIG_GPIO_PCA953X_IRQ=y
 # CONFIG_GPIO_PCF857X is not set
 # CONFIG_GPIO_TPIC2810 is not set
+# end of I2C GPIO expanders
 
 #
 # MFD GPIO expanders
 #
 CONFIG_GPIO_BD9571MWV=m
 CONFIG_GPIO_MADERA=m
+CONFIG_GPIO_MAX77650=m
 CONFIG_GPIO_TQMX86=m
+# end of MFD GPIO expanders
 
 #
 # PCI GPIO expanders
@@ -4062,6 +4300,7 @@ CONFIG_GPIO_TQMX86=m
 # CONFIG_GPIO_PCI_IDIO_16 is not set
 # CONFIG_GPIO_PCIE_IDIO_24 is not set
 # CONFIG_GPIO_RDC321X is not set
+# end of PCI GPIO expanders
 
 #
 # SPI GPIO expanders
@@ -4072,11 +4311,15 @@ CONFIG_GPIO_MAX3191X=m
 # CONFIG_GPIO_MC33880 is not set
 # CONFIG_GPIO_PISOSR is not set
 # CONFIG_GPIO_XRA1403 is not set
+# end of SPI GPIO expanders
 
 #
 # USB GPIO expanders
 #
 CONFIG_GPIO_VIPERBOARD=m
+# end of USB GPIO expanders
+
+# CONFIG_GPIO_MOCKUP is not set
 CONFIG_W1=m
 CONFIG_W1_CON=y
 
@@ -4089,6 +4332,7 @@ CONFIG_W1_MASTER_DS2482=m
 CONFIG_W1_MASTER_MXC=m
 CONFIG_W1_MASTER_DS1WM=m
 # CONFIG_W1_MASTER_GPIO is not set
+# end of 1-wire Bus Masters
 
 #
 # 1-wire Slaves
@@ -4110,6 +4354,8 @@ CONFIG_W1_SLAVE_DS2780=m
 CONFIG_W1_SLAVE_DS2781=m
 CONFIG_W1_SLAVE_DS28E04=m
 CONFIG_W1_SLAVE_DS28E17=m
+# end of 1-wire Slaves
+
 # CONFIG_POWER_AVS is not set
 CONFIG_POWER_RESET=y
 # CONFIG_POWER_RESET_BRCMSTB is not set
@@ -4128,8 +4374,10 @@ CONFIG_POWER_RESET_SYSCON_POWEROFF=y
 CONFIG_REBOOT_MODE=y
 CONFIG_SYSCON_REBOOT_MODE=y
 # CONFIG_POWER_RESET_SC27XX is not set
+# CONFIG_NVMEM_REBOOT_MODE is not set
 CONFIG_POWER_SUPPLY=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
+CONFIG_POWER_SUPPLY_HWMON=y
 # CONFIG_PDA_POWER is not set
 # CONFIG_GENERIC_ADC_BATTERY is not set
 # CONFIG_TEST_POWER is not set
@@ -4151,8 +4399,9 @@ CONFIG_BATTERY_MAX1721X=m
 # CONFIG_CHARGER_LP8727 is not set
 # CONFIG_CHARGER_GPIO is not set
 # CONFIG_CHARGER_MANAGER is not set
-# CONFIG_CHARGER_LTC3651 is not set
+CONFIG_CHARGER_LT3651=m
 # CONFIG_CHARGER_DETECTOR_MAX14656 is not set
+CONFIG_CHARGER_MAX77650=m
 CONFIG_CHARGER_QCOM_SMBB=m
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_BQ24190 is not set
@@ -4165,6 +4414,7 @@ CONFIG_CHARGER_SMB347=m
 CONFIG_CHARGER_CROS_USBPD=m
 # CONFIG_CHARGER_SC2731 is not set
 CONFIG_FUEL_GAUGE_SC27XX=m
+CONFIG_CHARGER_UCS1002=m
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
@@ -4266,6 +4516,9 @@ CONFIG_SENSORS_PMBUS=m
 CONFIG_SENSORS_ADM1275=m
 CONFIG_SENSORS_IBM_CFFPS=m
 # CONFIG_SENSORS_IR35221 is not set
+CONFIG_SENSORS_IR38064=m
+# CONFIG_SENSORS_IRPS5401 is not set
+CONFIG_SENSORS_ISL68137=m
 CONFIG_SENSORS_LM25066=m
 CONFIG_SENSORS_LTC2978=m
 # CONFIG_SENSORS_LTC2978_REGULATOR is not set
@@ -4275,6 +4528,7 @@ CONFIG_SENSORS_MAX16064=m
 CONFIG_SENSORS_MAX31785=m
 CONFIG_SENSORS_MAX34440=m
 CONFIG_SENSORS_MAX8688=m
+# CONFIG_SENSORS_PXE1610 is not set
 CONFIG_SENSORS_TPS40422=m
 CONFIG_SENSORS_TPS53679=m
 CONFIG_SENSORS_UCD9000=m
@@ -4354,6 +4608,7 @@ CONFIG_CPU_THERMAL=y
 # CONFIG_CLOCK_THERMAL is not set
 # CONFIG_DEVFREQ_THERMAL is not set
 CONFIG_THERMAL_EMULATION=y
+CONFIG_THERMAL_MMIO=m
 CONFIG_HISI_THERMAL=y
 CONFIG_IMX_THERMAL=m
 # CONFIG_QORIQ_THERMAL is not set
@@ -4370,17 +4625,21 @@ CONFIG_BCM2835_THERMAL=m
 CONFIG_BRCMSTB_THERMAL=m
 CONFIG_BCM_NS_THERMAL=m
 CONFIG_BCM_SR_THERMAL=y
+# end of Broadcom thermal drivers
 
 #
 # Samsung thermal drivers
 #
 # CONFIG_EXYNOS_THERMAL is not set
+# end of Samsung thermal drivers
 
 #
 # NVIDIA Tegra thermal drivers
 #
 # CONFIG_TEGRA_SOCTHERM is not set
 CONFIG_TEGRA_BPMP_THERMAL=m
+# end of NVIDIA Tegra thermal drivers
+
 # CONFIG_GENERIC_ADC_THERMAL is not set
 
 #
@@ -4388,14 +4647,22 @@ CONFIG_TEGRA_BPMP_THERMAL=m
 #
 # CONFIG_QCOM_TSENS is not set
 CONFIG_QCOM_SPMI_TEMP_ALARM=y
+# end of Qualcomm thermal drivers
+
 # CONFIG_ZX2967_THERMAL is not set
 CONFIG_UNIPHIER_THERMAL=m
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_CORE=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
 CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
+CONFIG_WATCHDOG_OPEN_TIMEOUT=0
 # CONFIG_WATCHDOG_SYSFS is not set
 
+#
+# Watchdog Pretimeout Governors
+#
+# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
+
 #
 # Watchdog Device Drivers
 #
@@ -4414,6 +4681,7 @@ CONFIG_DW_WATCHDOG=m
 CONFIG_SUNXI_WATCHDOG=m
 # CONFIG_MAX63XX_WATCHDOG is not set
 # CONFIG_IMX2_WDT is not set
+CONFIG_IMX_SC_WDT=m
 # CONFIG_TEGRA_WATCHDOG is not set
 CONFIG_QCOM_WDT=m
 CONFIG_MESON_GXBB_WATCHDOG=m
@@ -4443,11 +4711,6 @@ CONFIG_WDTPCI=m
 # USB-based Watchdog Cards
 #
 CONFIG_USBPCWATCHDOG=m
-
-#
-# Watchdog Pretimeout Governors
-#
-# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
 CONFIG_SSB_POSSIBLE=y
 CONFIG_SSB=m
 CONFIG_SSB_SPROM=y
@@ -4475,6 +4738,7 @@ CONFIG_BCMA_DRIVER_GPIO=y
 # Multifunction device drivers
 #
 CONFIG_MFD_CORE=y
+# CONFIG_MFD_ALTERA_SYSMGR is not set
 # CONFIG_MFD_ACT8945A is not set
 CONFIG_MFD_SUN4I_GPADC=m
 # CONFIG_MFD_AS3711 is not set
@@ -4493,9 +4757,11 @@ CONFIG_MFD_CROS_EC=y
 CONFIG_MFD_MADERA=m
 CONFIG_MFD_MADERA_I2C=m
 CONFIG_MFD_MADERA_SPI=m
+# CONFIG_MFD_CS47L15 is not set
 CONFIG_MFD_CS47L35=y
 CONFIG_MFD_CS47L85=y
 CONFIG_MFD_CS47L90=y
+# CONFIG_MFD_CS47L92 is not set
 # CONFIG_PMIC_DA903X is not set
 # CONFIG_MFD_DA9052_SPI is not set
 # CONFIG_MFD_DA9052_I2C is not set
@@ -4520,6 +4786,7 @@ CONFIG_MFD_HI655X_PMIC=y
 # CONFIG_MFD_88PM860X is not set
 # CONFIG_MFD_MAX14577 is not set
 # CONFIG_MFD_MAX77620 is not set
+CONFIG_MFD_MAX77650=m
 # CONFIG_MFD_MAX77686 is not set
 # CONFIG_MFD_MAX77693 is not set
 # CONFIG_MFD_MAX77843 is not set
@@ -4551,7 +4818,7 @@ CONFIG_MFD_SM501_GPIO=y
 CONFIG_MFD_SC27XX_PMIC=m
 # CONFIG_ABX500_CORE is not set
 # CONFIG_MFD_STMPE is not set
-# CONFIG_MFD_SUN6I_PRCM is not set
+CONFIG_MFD_SUN6I_PRCM=y
 CONFIG_MFD_SYSCON=y
 # CONFIG_MFD_TI_AM335X_TSCADC is not set
 # CONFIG_MFD_LP3943 is not set
@@ -4589,8 +4856,12 @@ CONFIG_MFD_VX855=m
 # CONFIG_MFD_WM8350_I2C is not set
 # CONFIG_MFD_WM8994 is not set
 # CONFIG_MFD_ROHM_BD718XX is not set
+# CONFIG_MFD_ROHM_BD70528 is not set
 CONFIG_MFD_STPMIC1=m
+CONFIG_MFD_STMFX=m
 CONFIG_MFD_VEXPRESS_SYSREG=y
+# end of Multifunction device drivers
+
 CONFIG_REGULATOR=y
 # CONFIG_REGULATOR_DEBUG is not set
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
@@ -4600,6 +4871,8 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y
 # CONFIG_REGULATOR_ACT8865 is not set
 # CONFIG_REGULATOR_AD5398 is not set
 # CONFIG_REGULATOR_ANATOP is not set
+# CONFIG_REGULATOR_ARIZONA_LDO1 is not set
+# CONFIG_REGULATOR_ARIZONA_MICSUPP is not set
 # CONFIG_REGULATOR_BD9571MWV is not set
 # CONFIG_REGULATOR_DA9210 is not set
 # CONFIG_REGULATOR_DA9211 is not set
@@ -4615,6 +4888,7 @@ CONFIG_REGULATOR_HI655X=y
 # CONFIG_REGULATOR_LTC3589 is not set
 # CONFIG_REGULATOR_LTC3676 is not set
 # CONFIG_REGULATOR_MAX1586 is not set
+CONFIG_REGULATOR_MAX77650=m
 # CONFIG_REGULATOR_MAX8649 is not set
 # CONFIG_REGULATOR_MAX8660 is not set
 # CONFIG_REGULATOR_MAX8952 is not set
@@ -4634,6 +4908,7 @@ CONFIG_REGULATOR_QCOM_SPMI=y
 CONFIG_REGULATOR_S2MPS11=y
 # CONFIG_REGULATOR_S5M8767 is not set
 # CONFIG_REGULATOR_SC2731 is not set
+# CONFIG_REGULATOR_SLG51000 is not set
 CONFIG_REGULATOR_STPMIC1=m
 # CONFIG_REGULATOR_SY8106A is not set
 # CONFIG_REGULATOR_TPS51632 is not set
@@ -4702,7 +4977,7 @@ CONFIG_MEDIA_RADIO_SUPPORT=y
 CONFIG_MEDIA_SDR_SUPPORT=y
 CONFIG_MEDIA_CEC_SUPPORT=y
 CONFIG_MEDIA_CONTROLLER=y
-# CONFIG_MEDIA_CONTROLLER_DVB is not set
+CONFIG_MEDIA_CONTROLLER_DVB=y
 # CONFIG_MEDIA_CONTROLLER_REQUEST_API is not set
 CONFIG_VIDEO_DEV=m
 CONFIG_VIDEO_V4L2_SUBDEV_API=y
@@ -4837,6 +5112,7 @@ CONFIG_DVB_USB_DIBUSB_MC=m
 CONFIG_DVB_USB_DIB0700=m
 CONFIG_DVB_USB_UMT_010=m
 CONFIG_DVB_USB_CXUSB=m
+# CONFIG_DVB_USB_CXUSB_ANALOG is not set
 CONFIG_DVB_USB_M920X=m
 CONFIG_DVB_USB_DIGITV=m
 CONFIG_DVB_USB_VP7045=m
@@ -5019,6 +5295,8 @@ CONFIG_RADIO_WL1273=m
 #
 # Texas Instruments WL128x FM driver (ST based)
 #
+# end of Texas Instruments WL128x FM driver (ST based)
+
 CONFIG_MEDIA_COMMON_OPTIONS=y
 
 #
@@ -5048,18 +5326,24 @@ CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
 CONFIG_MEDIA_ATTACH=y
 CONFIG_VIDEO_IR_I2C=m
 
+#
+# I2C Encoders, decoders, sensors and other helper chips
+#
+
 #
 # Audio decoders, processors and mixers
 #
 CONFIG_VIDEO_TVAUDIO=m
 CONFIG_VIDEO_TDA7432=m
 CONFIG_VIDEO_TDA9840=m
+# CONFIG_VIDEO_TDA1997X is not set
 CONFIG_VIDEO_TEA6415C=m
 CONFIG_VIDEO_TEA6420=m
 CONFIG_VIDEO_MSP3400=m
 CONFIG_VIDEO_CS3308=m
 CONFIG_VIDEO_CS5345=m
 CONFIG_VIDEO_CS53L32A=m
+# CONFIG_VIDEO_TLV320AIC23B is not set
 CONFIG_VIDEO_UDA1342=m
 CONFIG_VIDEO_WM8775=m
 CONFIG_VIDEO_WM8739=m
@@ -5074,11 +5358,27 @@ CONFIG_VIDEO_SAA6588=m
 #
 # Video decoders
 #
+# CONFIG_VIDEO_ADV7180 is not set
+# CONFIG_VIDEO_ADV7183 is not set
+# CONFIG_VIDEO_ADV748X is not set
+# CONFIG_VIDEO_ADV7604 is not set
+# CONFIG_VIDEO_ADV7842 is not set
+# CONFIG_VIDEO_BT819 is not set
+# CONFIG_VIDEO_BT856 is not set
+# CONFIG_VIDEO_BT866 is not set
+# CONFIG_VIDEO_KS0127 is not set
+# CONFIG_VIDEO_ML86V7667 is not set
+# CONFIG_VIDEO_SAA7110 is not set
 CONFIG_VIDEO_SAA711X=m
+# CONFIG_VIDEO_TC358743 is not set
+# CONFIG_VIDEO_TVP514X is not set
 CONFIG_VIDEO_TVP5150=m
+# CONFIG_VIDEO_TVP7002 is not set
 CONFIG_VIDEO_TW2804=m
 CONFIG_VIDEO_TW9903=m
 CONFIG_VIDEO_TW9906=m
+# CONFIG_VIDEO_TW9910 is not set
+# CONFIG_VIDEO_VPX3220 is not set
 
 #
 # Video and audio decoders
@@ -5090,17 +5390,78 @@ CONFIG_VIDEO_CX25840=m
 # Video encoders
 #
 CONFIG_VIDEO_SAA7127=m
+# CONFIG_VIDEO_SAA7185 is not set
+# CONFIG_VIDEO_ADV7170 is not set
+# CONFIG_VIDEO_ADV7175 is not set
+# CONFIG_VIDEO_ADV7343 is not set
+# CONFIG_VIDEO_ADV7393 is not set
+# CONFIG_VIDEO_AD9389B is not set
+# CONFIG_VIDEO_AK881X is not set
+# CONFIG_VIDEO_THS8200 is not set
 
 #
 # Camera sensor devices
 #
+# CONFIG_VIDEO_IMX214 is not set
+# CONFIG_VIDEO_IMX258 is not set
+# CONFIG_VIDEO_IMX274 is not set
+# CONFIG_VIDEO_IMX319 is not set
+# CONFIG_VIDEO_IMX355 is not set
 CONFIG_VIDEO_OV2640=m
+# CONFIG_VIDEO_OV2659 is not set
+# CONFIG_VIDEO_OV2680 is not set
+# CONFIG_VIDEO_OV2685 is not set
+# CONFIG_VIDEO_OV5640 is not set
+# CONFIG_VIDEO_OV5645 is not set
+# CONFIG_VIDEO_OV5647 is not set
+# CONFIG_VIDEO_OV6650 is not set
+# CONFIG_VIDEO_OV5670 is not set
+# CONFIG_VIDEO_OV5695 is not set
+# CONFIG_VIDEO_OV7251 is not set
+# CONFIG_VIDEO_OV772X is not set
 CONFIG_VIDEO_OV7640=m
+# CONFIG_VIDEO_OV7670 is not set
+# CONFIG_VIDEO_OV7740 is not set
+# CONFIG_VIDEO_OV8856 is not set
+# CONFIG_VIDEO_OV9640 is not set
+# CONFIG_VIDEO_OV9650 is not set
+# CONFIG_VIDEO_OV13858 is not set
+# CONFIG_VIDEO_VS6624 is not set
+# CONFIG_VIDEO_MT9M001 is not set
+# CONFIG_VIDEO_MT9M032 is not set
+# CONFIG_VIDEO_MT9M111 is not set
+# CONFIG_VIDEO_MT9P031 is not set
+# CONFIG_VIDEO_MT9T001 is not set
+# CONFIG_VIDEO_MT9T112 is not set
 CONFIG_VIDEO_MT9V011=m
+# CONFIG_VIDEO_MT9V032 is not set
+# CONFIG_VIDEO_MT9V111 is not set
+# CONFIG_VIDEO_SR030PC30 is not set
+# CONFIG_VIDEO_NOON010PC30 is not set
+# CONFIG_VIDEO_M5MOLS is not set
+# CONFIG_VIDEO_RJ54N1 is not set
+# CONFIG_VIDEO_S5K6AA is not set
+# CONFIG_VIDEO_S5K6A3 is not set
+# CONFIG_VIDEO_S5K4ECGX is not set
+# CONFIG_VIDEO_S5K5BAF is not set
+# CONFIG_VIDEO_SMIAPP is not set
+# CONFIG_VIDEO_ET8EK8 is not set
+# CONFIG_VIDEO_S5C73M3 is not set
+
+#
+# Lens drivers
+#
+# CONFIG_VIDEO_AD5820 is not set
+# CONFIG_VIDEO_AK7375 is not set
+# CONFIG_VIDEO_DW9714 is not set
+# CONFIG_VIDEO_DW9807_VCM is not set
 
 #
 # Flash devices
 #
+# CONFIG_VIDEO_ADP1653 is not set
+# CONFIG_VIDEO_LM3560 is not set
+# CONFIG_VIDEO_LM3646 is not set
 
 #
 # Video improvement chips
@@ -5116,17 +5477,34 @@ CONFIG_VIDEO_SAA6752HS=m
 #
 # SDR tuner chips
 #
+# CONFIG_SDR_MAX2175 is not set
 
 #
 # Miscellaneous helper chips
 #
+# CONFIG_VIDEO_THS7303 is not set
 CONFIG_VIDEO_M52790=m
+# CONFIG_VIDEO_I2C is not set
+# CONFIG_VIDEO_ST_MIPID02 is not set
+# end of I2C Encoders, decoders, sensors and other helper chips
+
+#
+# SPI helper chips
+#
+# CONFIG_VIDEO_GS1662 is not set
+# end of SPI helper chips
 
 #
 # Media SPI Adapters
 #
 # CONFIG_CXD2880_SPI_DRV is not set
+# end of Media SPI Adapters
+
 CONFIG_MEDIA_TUNER=m
+
+#
+# Customize TV tuners
+#
 CONFIG_MEDIA_TUNER_SIMPLE=m
 CONFIG_MEDIA_TUNER_TDA18250=m
 CONFIG_MEDIA_TUNER_TDA8290=m
@@ -5135,6 +5513,7 @@ CONFIG_MEDIA_TUNER_TDA18271=m
 CONFIG_MEDIA_TUNER_TDA9887=m
 CONFIG_MEDIA_TUNER_TEA5761=m
 CONFIG_MEDIA_TUNER_TEA5767=m
+# CONFIG_MEDIA_TUNER_MSI001 is not set
 CONFIG_MEDIA_TUNER_MT20XX=m
 CONFIG_MEDIA_TUNER_MT2060=m
 CONFIG_MEDIA_TUNER_MT2063=m
@@ -5163,6 +5542,11 @@ CONFIG_MEDIA_TUNER_R820T=m
 CONFIG_MEDIA_TUNER_MXL301RF=m
 CONFIG_MEDIA_TUNER_QM1D1C0042=m
 CONFIG_MEDIA_TUNER_QM1D1B0004=m
+# end of Customize TV tuners
+
+#
+# Customise DVB Frontends
+#
 
 #
 # Multistandard (satellite) frontends
@@ -5223,6 +5607,7 @@ CONFIG_DVB_SP8870=m
 CONFIG_DVB_SP887X=m
 CONFIG_DVB_CX22700=m
 CONFIG_DVB_CX22702=m
+# CONFIG_DVB_S5H1432 is not set
 CONFIG_DVB_DRXD=m
 CONFIG_DVB_L64781=m
 CONFIG_DVB_TDA1004X=m
@@ -5233,6 +5618,7 @@ CONFIG_DVB_DIB3000MB=m
 CONFIG_DVB_DIB3000MC=m
 CONFIG_DVB_DIB7000M=m
 CONFIG_DVB_DIB7000P=m
+# CONFIG_DVB_DIB9000 is not set
 CONFIG_DVB_TDA10048=m
 CONFIG_DVB_AF9013=m
 CONFIG_DVB_EC100=m
@@ -5244,7 +5630,9 @@ CONFIG_DVB_RTL2832=m
 CONFIG_DVB_RTL2832_SDR=m
 CONFIG_DVB_SI2168=m
 CONFIG_DVB_AS102_FE=m
+# CONFIG_DVB_ZD1301_DEMOD is not set
 CONFIG_DVB_GP8PSK_FE=m
+# CONFIG_DVB_CXD2880 is not set
 
 #
 # DVB-C (cable) frontends
@@ -5282,6 +5670,7 @@ CONFIG_DVB_MB86A20S=m
 # ISDB-S (satellite) & ISDB-T (terrestrial) frontends
 #
 CONFIG_DVB_TC90522=m
+# CONFIG_DVB_MN88443X is not set
 
 #
 # Digital terrestrial only tuners/PLL
@@ -5295,18 +5684,23 @@ CONFIG_DVB_TUNER_DIB0090=m
 #
 CONFIG_DVB_DRX39XYJ=m
 CONFIG_DVB_LNBH25=m
+# CONFIG_DVB_LNBH29 is not set
 CONFIG_DVB_LNBP21=m
 CONFIG_DVB_LNBP22=m
 CONFIG_DVB_ISL6405=m
 CONFIG_DVB_ISL6421=m
 CONFIG_DVB_ISL6423=m
 CONFIG_DVB_A8293=m
+# CONFIG_DVB_LGS8GL5 is not set
 CONFIG_DVB_LGS8GXX=m
 CONFIG_DVB_ATBM8830=m
 CONFIG_DVB_TDA665x=m
 CONFIG_DVB_IX2505V=m
 CONFIG_DVB_M88RS2000=m
 CONFIG_DVB_AF9033=m
+# CONFIG_DVB_HORUS3A is not set
+# CONFIG_DVB_ASCOT2E is not set
+# CONFIG_DVB_HELENE is not set
 
 #
 # Common Interface (EN50221) controller drivers
@@ -5318,6 +5712,7 @@ CONFIG_DVB_SP2=m
 # Tools to develop new frontends
 #
 CONFIG_DVB_DUMMY_FE=m
+# end of Customise DVB Frontends
 
 #
 # Graphics support
@@ -5338,8 +5733,10 @@ CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 CONFIG_DRM_DP_CEC=y
 CONFIG_DRM_TTM=m
+CONFIG_DRM_VRAM_HELPER=m
 CONFIG_DRM_GEM_CMA_HELPER=y
 CONFIG_DRM_KMS_CMA_HELPER=y
+CONFIG_DRM_GEM_SHMEM_HELPER=y
 CONFIG_DRM_VM=y
 CONFIG_DRM_SCHED=m
 
@@ -5350,6 +5747,7 @@ CONFIG_DRM_I2C_CH7006=m
 CONFIG_DRM_I2C_SIL164=m
 CONFIG_DRM_I2C_NXP_TDA998X=m
 # CONFIG_DRM_I2C_NXP_TDA9950 is not set
+# end of I2C encoder or helper chips
 
 #
 # ARM devices
@@ -5358,32 +5756,29 @@ CONFIG_DRM_HDLCD=m
 # CONFIG_DRM_HDLCD_SHOW_UNDERRUN is not set
 CONFIG_DRM_MALI_DISPLAY=m
 CONFIG_DRM_KOMEDA=m
+# end of ARM devices
+
 CONFIG_DRM_RADEON=m
 CONFIG_DRM_RADEON_USERPTR=y
 CONFIG_DRM_AMDGPU=m
 # CONFIG_DRM_AMDGPU_SI is not set
 # CONFIG_DRM_AMDGPU_CIK is not set
-CONFIG_DRM_AMDGPU_USERPTR=y
 # CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set
 
 #
 # ACP (Audio CoProcessor) Configuration
 #
 # CONFIG_DRM_AMD_ACP is not set
+# end of ACP (Audio CoProcessor) Configuration
 
 #
 # Display Engine Configuration
 #
 CONFIG_DRM_AMD_DC=y
 # CONFIG_DEBUG_KERNEL_DC is not set
-# CONFIG_HSA_AMD is not set
+# end of Display Engine Configuration
 
-#
-# AMD Library routines
-#
-CONFIG_CHASH=m
-# CONFIG_CHASH_STATS is not set
-# CONFIG_CHASH_SELFTEST is not set
+# CONFIG_HSA_AMD is not set
 CONFIG_DRM_NOUVEAU=m
 CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT=y
 CONFIG_NOUVEAU_PLATFORM_DRIVER=y
@@ -5393,6 +5788,7 @@ CONFIG_NOUVEAU_DEBUG_DEFAULT=3
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 CONFIG_DRM_VGEM=m
 # CONFIG_DRM_VKMS is not set
+CONFIG_DRM_ATI_PCIGART=y
 # CONFIG_DRM_EXYNOS is not set
 CONFIG_DRM_UDL=m
 CONFIG_DRM_AST=m
@@ -5401,11 +5797,13 @@ CONFIG_DRM_CIRRUS_QEMU=m
 # CONFIG_DRM_RCAR_DU is not set
 # CONFIG_DRM_RCAR_DW_HDMI is not set
 # CONFIG_DRM_RCAR_LVDS is not set
+CONFIG_DRM_RCAR_WRITEBACK=y
 # CONFIG_DRM_SUN4I is not set
 CONFIG_DRM_QXL=m
 CONFIG_DRM_BOCHS=m
 CONFIG_DRM_VIRTIO_GPU=m
 CONFIG_DRM_MSM=m
+CONFIG_DRM_MSM_GPU_STATE=y
 # CONFIG_DRM_MSM_REGISTER_LOGGING is not set
 # CONFIG_DRM_MSM_GPU_SUDO is not set
 CONFIG_DRM_MSM_HDMI_HDCP=y
@@ -5427,6 +5825,7 @@ CONFIG_DRM_PANEL=y
 # CONFIG_DRM_PANEL_ARM_VERSATILE is not set
 # CONFIG_DRM_PANEL_LVDS is not set
 CONFIG_DRM_PANEL_SIMPLE=m
+CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D=m
 # CONFIG_DRM_PANEL_ILITEK_IL9322 is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9881C is not set
 # CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
@@ -5436,12 +5835,16 @@ CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04=m
 # CONFIG_DRM_PANEL_LG_LG4573 is not set
 CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO=m
 CONFIG_DRM_PANEL_ORISETECH_OTM8009A=m
+# CONFIG_DRM_PANEL_OSD_OSD101T2587_53TS is not set
 # CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00 is not set
 CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m
 # CONFIG_DRM_PANEL_RAYDIUM_RM68200 is not set
+CONFIG_DRM_PANEL_ROCKTECH_JH057N00900=m
+CONFIG_DRM_PANEL_RONBO_RB070D30=m
 CONFIG_DRM_PANEL_SAMSUNG_S6D16D0=m
 # CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set
 CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03=m
+# CONFIG_DRM_PANEL_SAMSUNG_S6E63M0 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set
 CONFIG_DRM_PANEL_SEIKO_43WVF1G=m
 # CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 is not set
@@ -5450,6 +5853,8 @@ CONFIG_DRM_PANEL_SITRONIX_ST7701=m
 # CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
 CONFIG_DRM_PANEL_TPO_TPG110=m
 CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA=m
+# end of Display Panels
+
 CONFIG_DRM_BRIDGE=y
 CONFIG_DRM_PANEL_BRIDGE=y
 
@@ -5479,6 +5884,8 @@ CONFIG_DRM_DW_HDMI=m
 # CONFIG_DRM_DW_HDMI_AHB_AUDIO is not set
 # CONFIG_DRM_DW_HDMI_I2S_AUDIO is not set
 CONFIG_DRM_DW_HDMI_CEC=m
+# end of Display Interface Bridges
+
 CONFIG_DRM_VC4=m
 CONFIG_DRM_VC4_HDMI_CEC=y
 CONFIG_DRM_ETNAVIV=m
@@ -5496,7 +5903,14 @@ CONFIG_DRM_MESON=m
 CONFIG_DRM_MESON_DW_HDMI=m
 # CONFIG_DRM_TINYDRM is not set
 # CONFIG_DRM_PL111 is not set
-# CONFIG_DRM_LEGACY is not set
+CONFIG_DRM_LIMA=m
+CONFIG_DRM_PANFROST=m
+CONFIG_DRM_LEGACY=y
+CONFIG_DRM_TDFX=m
+CONFIG_DRM_R128=m
+CONFIG_DRM_MGA=m
+CONFIG_DRM_VIA=m
+CONFIG_DRM_SAVAGE=m
 CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=m
 
 #
@@ -5562,11 +5976,14 @@ CONFIG_FB_VIRTUAL=m
 # CONFIG_FB_METRONOME is not set
 # CONFIG_FB_MB862XX is not set
 CONFIG_FB_MX3=y
-CONFIG_FB_MXS=m
 CONFIG_FB_SIMPLE=y
 CONFIG_FB_SSD1307=m
 # CONFIG_FB_SM712 is not set
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
+# end of Frame buffer Devices
+
+#
+# Backlight & LCD device support
+#
 CONFIG_LCD_CLASS_DEVICE=m
 # CONFIG_LCD_L4F00242T03 is not set
 # CONFIG_LCD_LMS283GF05 is not set
@@ -5593,6 +6010,8 @@ CONFIG_BACKLIGHT_GPIO=m
 # CONFIG_BACKLIGHT_LV5207LP is not set
 # CONFIG_BACKLIGHT_BD6107 is not set
 # CONFIG_BACKLIGHT_ARCXCNN is not set
+# end of Backlight & LCD device support
+
 CONFIG_VIDEOMODE_HELPERS=y
 CONFIG_HDMI=y
 
@@ -5606,10 +6025,14 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y
+# end of Console display driver support
+
 CONFIG_LOGO=y
 # CONFIG_LOGO_LINUX_MONO is not set
 # CONFIG_LOGO_LINUX_VGA16 is not set
 CONFIG_LOGO_LINUX_CLUT224=y
+# end of Graphics support
+
 CONFIG_SOUND=m
 CONFIG_SOUND_OSS_CORE=y
 CONFIG_SOUND_OSS_CORE_PRECLAIM=y
@@ -5622,6 +6045,7 @@ CONFIG_SND_DMAENGINE_PCM=m
 CONFIG_SND_HWDEP=m
 CONFIG_SND_SEQ_DEVICE=m
 CONFIG_SND_RAWMIDI=m
+CONFIG_SND_COMPRESS_OFFLOAD=m
 CONFIG_SND_JACK=y
 CONFIG_SND_JACK_INPUT_DEV=y
 CONFIG_SND_OSSEMUL=y
@@ -5742,12 +6166,16 @@ CONFIG_SND_HDA_CODEC_CMEDIA=m
 CONFIG_SND_HDA_CODEC_SI3054=m
 CONFIG_SND_HDA_GENERIC=m
 CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
+# end of HD-Audio
+
 CONFIG_SND_HDA_CORE=m
 CONFIG_SND_HDA_DSP_LOADER=y
+CONFIG_SND_HDA_COMPONENT=y
 CONFIG_SND_HDA_PREALLOC_SIZE=4096
 CONFIG_SND_SPI=y
 CONFIG_SND_USB=y
 CONFIG_SND_USB_AUDIO=m
+CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER=y
 CONFIG_SND_USB_UA101=m
 CONFIG_SND_USB_CAIAQ=m
 CONFIG_SND_USB_CAIAQ_INPUT=y
@@ -5761,6 +6189,9 @@ CONFIG_SND_USB_TONEPORT=m
 CONFIG_SND_USB_VARIAX=m
 CONFIG_SND_SOC=m
 CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
+CONFIG_SND_SOC_COMPRESS=y
+CONFIG_SND_SOC_TOPOLOGY=y
+CONFIG_SND_SOC_ACPI=m
 CONFIG_SND_SOC_AMD_ACP=m
 # CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH is not set
 CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m
@@ -5777,6 +6208,7 @@ CONFIG_SND_BCM2835_SOC_I2S=m
 #
 # CONFIG_SND_SOC_FSL_ASRC is not set
 CONFIG_SND_SOC_FSL_SAI=m
+CONFIG_SND_SOC_FSL_AUDMIX=m
 CONFIG_SND_SOC_FSL_SSI=m
 CONFIG_SND_SOC_FSL_SPDIF=m
 CONFIG_SND_SOC_FSL_ESAI=m
@@ -5792,6 +6224,9 @@ CONFIG_SND_SOC_IMX_ES8328=m
 CONFIG_SND_SOC_IMX_SGTL5000=m
 CONFIG_SND_SOC_IMX_SPDIF=m
 CONFIG_SND_SOC_FSL_ASOC_CARD=m
+CONFIG_SND_SOC_IMX_AUDMIX=m
+# end of SoC Audio for Freescale CPUs
+
 # CONFIG_SND_I2S_HI6210_I2S is not set
 # CONFIG_SND_KIRKWOOD_SOC is not set
 # CONFIG_SND_SOC_IMG is not set
@@ -5804,6 +6239,8 @@ CONFIG_SND_SOC_MT8173_RT5650=m
 CONFIG_SND_SOC_MT8173_RT5650_RT5514=m
 CONFIG_SND_SOC_MT8173_RT5650_RT5676=m
 CONFIG_SND_SOC_MT8183=m
+CONFIG_SND_SOC_MT8183_MT6358_TS3A227E_MAX98357A=m
+CONFIG_SND_SOC_MT8183_DA7219_MAX98357A=m
 CONFIG_SND_SOC_MTK_BTCVSD=m
 
 #
@@ -5817,6 +6254,9 @@ CONFIG_SND_SOC_MTK_BTCVSD=m
 # CONFIG_SND_MESON_AXG_SPDIFOUT is not set
 CONFIG_SND_MESON_AXG_SPDIFIN=m
 CONFIG_SND_MESON_AXG_PDM=m
+# CONFIG_SND_MESON_G12A_TOHDMITX is not set
+# end of ASoC support for Amlogic platforms
+
 CONFIG_SND_SOC_QCOM=m
 CONFIG_SND_SOC_LPASS_CPU=m
 CONFIG_SND_SOC_LPASS_PLATFORM=m
@@ -5831,11 +6271,23 @@ CONFIG_SND_SOC_APQ8016_SBC=m
 #
 # CONFIG_SND_SOC_SH4_FSI is not set
 # CONFIG_SND_SOC_RCAR is not set
+# end of SoC Audio support for Renesas SoCs
+
+CONFIG_SND_SOC_SOF_TOPLEVEL=y
+CONFIG_SND_SOC_SOF_PCI=m
+CONFIG_SND_SOC_SOF_ACPI=m
+CONFIG_SND_SOC_SOF_OPTIONS=m
+# CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT is not set
+# CONFIG_SND_SOC_SOF_STRICT_ABI_CHECKS is not set
+# CONFIG_SND_SOC_SOF_DEBUG is not set
+CONFIG_SND_SOC_SOF=m
 CONFIG_SND_SOC_SPRD=m
+# CONFIG_SND_SOC_SPRD_MCDT is not set
 
 #
 # STMicroelectronics STM32 SOC audio support
 #
+# end of STMicroelectronics STM32 SOC audio support
 
 #
 # Allwinner SoC Audio support
@@ -5847,6 +6299,8 @@ CONFIG_SND_SUN50I_CODEC_ANALOG=m
 # CONFIG_SND_SUN4I_I2S is not set
 # CONFIG_SND_SUN4I_SPDIF is not set
 CONFIG_SND_SUN8I_ADDA_PR_REGMAP=m
+# end of Allwinner SoC Audio support
+
 # CONFIG_SND_SOC_TEGRA is not set
 # CONFIG_SND_SOC_UNIPHIER is not set
 CONFIG_SND_SOC_XILINX_I2S=m
@@ -5876,7 +6330,7 @@ CONFIG_SND_SOC_AK4118=m
 # CONFIG_SND_SOC_AK5558 is not set
 # CONFIG_SND_SOC_ALC5623 is not set
 # CONFIG_SND_SOC_BD28623 is not set
-# CONFIG_SND_SOC_BT_SCO is not set
+CONFIG_SND_SOC_BT_SCO=m
 CONFIG_SND_SOC_CROS_EC_CODEC=m
 # CONFIG_SND_SOC_CS35L32 is not set
 # CONFIG_SND_SOC_CS35L33 is not set
@@ -5897,6 +6351,8 @@ CONFIG_SND_SOC_CS43130=m
 CONFIG_SND_SOC_CS4341=m
 # CONFIG_SND_SOC_CS4349 is not set
 # CONFIG_SND_SOC_CS53L30 is not set
+# CONFIG_SND_SOC_CX2072X is not set
+CONFIG_SND_SOC_DA7219=m
 CONFIG_SND_SOC_DMIC=m
 CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_ES7134 is not set
@@ -5909,6 +6365,7 @@ CONFIG_SND_SOC_ES8328_SPI=m
 # CONFIG_SND_SOC_INNO_RK3036 is not set
 CONFIG_SND_SOC_MAX98088=m
 CONFIG_SND_SOC_MAX98090=m
+CONFIG_SND_SOC_MAX98357A=m
 # CONFIG_SND_SOC_MAX98504 is not set
 # CONFIG_SND_SOC_MAX9867 is not set
 # CONFIG_SND_SOC_MAX98927 is not set
@@ -5961,7 +6418,7 @@ CONFIG_SND_SOC_SGTL5000=m
 # CONFIG_SND_SOC_TLV320AIC32X4_I2C is not set
 # CONFIG_SND_SOC_TLV320AIC32X4_SPI is not set
 # CONFIG_SND_SOC_TLV320AIC3X is not set
-# CONFIG_SND_SOC_TS3A227E is not set
+CONFIG_SND_SOC_TS3A227E=m
 # CONFIG_SND_SOC_TSCS42XX is not set
 # CONFIG_SND_SOC_TSCS454 is not set
 # CONFIG_SND_SOC_WM8510 is not set
@@ -5996,6 +6453,8 @@ CONFIG_SND_SOC_MT6358=m
 CONFIG_SND_SOC_NAU8822=m
 # CONFIG_SND_SOC_NAU8824 is not set
 # CONFIG_SND_SOC_TPA6130A2 is not set
+# end of CODEC drivers
+
 CONFIG_SND_SIMPLE_CARD_UTILS=m
 CONFIG_SND_SIMPLE_CARD=m
 # CONFIG_SND_AUDIO_GRAPH_CARD is not set
@@ -6028,6 +6487,7 @@ CONFIG_HID_CHERRY=m
 CONFIG_HID_CHICONY=m
 CONFIG_HID_CORSAIR=m
 CONFIG_HID_COUGAR=m
+CONFIG_HID_MACALLY=m
 CONFIG_HID_PRODIKEYS=m
 CONFIG_HID_CMEDIA=m
 CONFIG_HID_CP2112=m
@@ -6109,6 +6569,7 @@ CONFIG_HID_THINGM=m
 CONFIG_HID_THRUSTMASTER=m
 CONFIG_THRUSTMASTER_FF=y
 CONFIG_HID_UDRAW_PS3=m
+CONFIG_HID_U2FZERO=m
 CONFIG_HID_WACOM=m
 CONFIG_HID_WIIMOTE=m
 CONFIG_HID_XINMO=m
@@ -6118,6 +6579,7 @@ CONFIG_HID_ZYDACRON=m
 CONFIG_HID_SENSOR_HUB=m
 CONFIG_HID_SENSOR_CUSTOM_SENSOR=m
 # CONFIG_HID_ALPS is not set
+# end of Special HID drivers
 
 #
 # USB HID support
@@ -6125,11 +6587,15 @@ CONFIG_HID_SENSOR_CUSTOM_SENSOR=m
 CONFIG_USB_HID=y
 CONFIG_HID_PID=y
 CONFIG_USB_HIDDEV=y
+# end of USB HID support
 
 #
 # I2C HID support
 #
 CONFIG_I2C_HID=m
+# end of I2C HID support
+# end of HID support
+
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 CONFIG_USB_SUPPORT=y
 CONFIG_USB_COMMON=y
@@ -6270,6 +6736,7 @@ CONFIG_USB_DWC3_HOST=y
 CONFIG_USB_DWC3_EXYNOS=y
 CONFIG_USB_DWC3_PCI=y
 CONFIG_USB_DWC3_HAPS=y
+CONFIG_USB_DWC3_MESON_G12A=m
 CONFIG_USB_DWC3_OF_SIMPLE=y
 CONFIG_USB_DWC3_QCOM=y
 CONFIG_USB_DWC2=y
@@ -6401,6 +6868,8 @@ CONFIG_USB_MXS_PHY=m
 CONFIG_USB_TEGRA_PHY=y
 CONFIG_USB_ULPI=y
 CONFIG_USB_ULPI_VIEWPORT=y
+# end of USB Physical Layer drivers
+
 CONFIG_USB_GADGET=y
 # CONFIG_USB_GADGET_DEBUG is not set
 # CONFIG_USB_GADGET_DEBUG_FILES is not set
@@ -6430,6 +6899,8 @@ CONFIG_USB_FSL_USB2=m
 # CONFIG_USB_EG20T is not set
 # CONFIG_USB_GADGET_XILINX is not set
 # CONFIG_USB_DUMMY_HCD is not set
+# end of USB Peripheral Controller
+
 CONFIG_USB_LIBCOMPOSITE=m
 CONFIG_USB_F_ACM=m
 CONFIG_USB_U_SERIAL=m
@@ -6477,11 +6948,15 @@ CONFIG_TYPEC_TPS6598X=m
 # USB Type-C Multiplexer/DeMultiplexer Switch support
 #
 # CONFIG_TYPEC_MUX_PI3USB30532 is not set
+# end of USB Type-C Multiplexer/DeMultiplexer Switch support
 
 #
 # USB Type-C Alternate Mode drivers
 #
 CONFIG_TYPEC_DP_ALTMODE=m
+CONFIG_TYPEC_NVIDIA_ALTMODE=m
+# end of USB Type-C Alternate Mode drivers
+
 CONFIG_USB_ROLE_SWITCH=m
 CONFIG_USB_LED_TRIG=y
 CONFIG_USB_ULPI_BUS=y
@@ -6592,6 +7067,7 @@ CONFIG_LEDS_AS3645A=m
 # CONFIG_LEDS_BCM6358 is not set
 # CONFIG_LEDS_CR0014114 is not set
 CONFIG_LEDS_LM3530=m
+CONFIG_LEDS_LM3532=m
 # CONFIG_LEDS_LM3642 is not set
 # CONFIG_LEDS_LM3692X is not set
 # CONFIG_LEDS_LM3601X is not set
@@ -6614,6 +7090,7 @@ CONFIG_LEDS_PWM=m
 CONFIG_LEDS_LT3593=m
 # CONFIG_LEDS_TCA6507 is not set
 # CONFIG_LEDS_TLC591XX is not set
+CONFIG_LEDS_MAX77650=m
 # CONFIG_LEDS_LM355x is not set
 # CONFIG_LEDS_KTD2692 is not set
 # CONFIG_LEDS_IS31FL319X is not set
@@ -6627,6 +7104,8 @@ CONFIG_LEDS_BLINKM=m
 # CONFIG_LEDS_SYSCON is not set
 # CONFIG_LEDS_MLXREG is not set
 CONFIG_LEDS_USER=m
+# CONFIG_LEDS_SPI_BYTE is not set
+# CONFIG_LEDS_TI_LMU_COMMON is not set
 
 #
 # LED Triggers
@@ -6707,6 +7186,7 @@ CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_M41T80=m
 CONFIG_RTC_DRV_M41T80_WDT=y
+# CONFIG_RTC_DRV_BD70528 is not set
 CONFIG_RTC_DRV_BQ32K=m
 # CONFIG_RTC_DRV_S35390A is not set
 CONFIG_RTC_DRV_FM3130=m
@@ -6817,6 +7297,7 @@ CONFIG_DMA_ACPI=y
 CONFIG_DMA_OF=y
 CONFIG_ALTERA_MSGDMA=m
 # CONFIG_AMBA_PL08X is not set
+CONFIG_AXI_DMAC=m
 # CONFIG_BCM_SBA_RAID is not set
 CONFIG_DMA_BCM2835=y
 # CONFIG_DMA_SUN6I is not set
@@ -6850,6 +7331,8 @@ CONFIG_QCOM_HIDMA=y
 CONFIG_DW_DMAC_CORE=m
 CONFIG_DW_DMAC=m
 CONFIG_DW_DMAC_PCI=m
+# CONFIG_DW_EDMA is not set
+# CONFIG_DW_EDMA_PCIE is not set
 # CONFIG_RCAR_DMAC is not set
 # CONFIG_RENESAS_USB_DMAC is not set
 
@@ -6866,6 +7349,8 @@ CONFIG_DMA_ENGINE_RAID=y
 CONFIG_SYNC_FILE=y
 # CONFIG_SW_SYNC is not set
 CONFIG_UDMABUF=y
+# end of DMABUF options
+
 CONFIG_AUXDISPLAY=y
 # CONFIG_HD44780 is not set
 # CONFIG_IMG_ASCII_LCD is not set
@@ -6902,6 +7387,7 @@ CONFIG_VIRTIO=y
 CONFIG_VIRTIO_MENU=y
 CONFIG_VIRTIO_PCI=y
 CONFIG_VIRTIO_PCI_LEGACY=y
+# CONFIG_VIRTIO_PMEM is not set
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_INPUT=m
 CONFIG_VIRTIO_MMIO=m
@@ -6910,6 +7396,8 @@ CONFIG_VIRTIO_MMIO=m
 #
 # Microsoft Hyper-V guest support
 #
+# end of Microsoft Hyper-V guest support
+
 CONFIG_STAGING=y
 CONFIG_PRISM2_USB=m
 # CONFIG_COMEDI is not set
@@ -6923,8 +7411,6 @@ CONFIG_RTL8723BS=m
 CONFIG_R8712U=m
 CONFIG_R8188EU=m
 CONFIG_88EU_AP_MODE=y
-CONFIG_R8822BE=m
-CONFIG_RTLWIFI_DEBUG_ST=y
 # CONFIG_RTS5208 is not set
 # CONFIG_VT6655 is not set
 # CONFIG_VT6656 is not set
@@ -6938,14 +7424,15 @@ CONFIG_RTLWIFI_DEBUG_ST=y
 #
 CONFIG_ADIS16203=m
 CONFIG_ADIS16240=m
+# end of Accelerometers
 
 #
 # Analog to digital converters
 #
-CONFIG_AD7780=m
 CONFIG_AD7816=m
 CONFIG_AD7192=m
 CONFIG_AD7280=m
+# end of Analog to digital converters
 
 #
 # Analog digital bi-direction converters
@@ -6953,23 +7440,27 @@ CONFIG_AD7280=m
 CONFIG_ADT7316=m
 CONFIG_ADT7316_SPI=m
 CONFIG_ADT7316_I2C=m
+# end of Analog digital bi-direction converters
 
 #
 # Capacitance to digital converters
 #
 CONFIG_AD7150=m
 CONFIG_AD7746=m
+# end of Capacitance to digital converters
 
 #
 # Direct Digital Synthesis
 #
 CONFIG_AD9832=m
 CONFIG_AD9834=m
+# end of Direct Digital Synthesis
 
 #
 # Network Analyzer, Impedance Converters
 #
 CONFIG_AD5933=m
+# end of Network Analyzer, Impedance Converters
 
 #
 # Active energy metering IC
@@ -6977,11 +7468,15 @@ CONFIG_AD5933=m
 CONFIG_ADE7854=m
 CONFIG_ADE7854_I2C=m
 CONFIG_ADE7854_SPI=m
+# end of Active energy metering IC
 
 #
 # Resolver to digital converters
 #
 CONFIG_AD2S1210=m
+# end of Resolver to digital converters
+# end of IIO staging drivers
+
 # CONFIG_FB_SM750 is not set
 # CONFIG_USB_EMXX is not set
 
@@ -6989,10 +7484,13 @@ CONFIG_AD2S1210=m
 # Speakup console speech
 #
 # CONFIG_SPEAKUP is not set
+# end of Speakup console speech
+
 # CONFIG_MFD_NVEC is not set
 CONFIG_STAGING_MEDIA=y
+# CONFIG_VIDEO_ALLEGRO_DVT is not set
 # CONFIG_I2C_BCM2048 is not set
-CONFIG_VIDEO_ROCKCHIP_VPU=m
+# CONFIG_VIDEO_MESON_VDEC is not set
 # CONFIG_VIDEO_SUNXI is not set
 # CONFIG_TEGRA_VDE is not set
 
@@ -7003,6 +7501,8 @@ CONFIG_VIDEO_ROCKCHIP_VPU=m
 #
 # Android
 #
+# end of Android
+
 # CONFIG_STAGING_BOARD is not set
 # CONFIG_LTE_GDM724X is not set
 # CONFIG_GS_FPGABOOT is not set
@@ -7057,6 +7557,8 @@ CONFIG_PI433=m
 # Gasket devices
 #
 # CONFIG_STAGING_GASKET_FRAMEWORK is not set
+# end of Gasket devices
+
 CONFIG_XIL_AXIS_FIFO=m
 CONFIG_EROFS_FS=m
 # CONFIG_EROFS_FS_DEBUG is not set
@@ -7067,13 +7569,18 @@ CONFIG_EROFS_FS_POSIX_ACL=y
 # CONFIG_EROFS_FAULT_INJECTION is not set
 CONFIG_EROFS_FS_IO_MAX_RETRIES=5
 # CONFIG_EROFS_FS_ZIP is not set
+# CONFIG_FIELDBUS_DEV is not set
+# CONFIG_KPC2000 is not set
 # CONFIG_GOLDFISH is not set
 CONFIG_CHROME_PLATFORMS=y
 # CONFIG_CHROMEOS_TBMC is not set
 CONFIG_CROS_EC_I2C=m
+CONFIG_CROS_EC_RPMSG=m
 CONFIG_CROS_EC_SPI=m
 CONFIG_CROS_EC_PROTO=y
 CONFIG_CROS_KBD_LED_BACKLIGHT=y
+CONFIG_CROS_USBPD_LOGGER=m
+# CONFIG_MELLANOX_PLATFORM is not set
 CONFIG_CLKDEV_LOOKUP=y
 CONFIG_HAVE_CLK_PREPARE=y
 CONFIG_COMMON_CLK=y
@@ -7088,6 +7595,7 @@ CONFIG_CLK_VEXPRESS_OSC=y
 # CONFIG_COMMON_CLK_MAX9485 is not set
 CONFIG_COMMON_CLK_HI655X=m
 CONFIG_COMMON_CLK_SCPI=y
+# CONFIG_COMMON_CLK_SI5341 is not set
 # CONFIG_COMMON_CLK_SI5351 is not set
 # CONFIG_COMMON_CLK_SI514 is not set
 # CONFIG_COMMON_CLK_SI544 is not set
@@ -7105,9 +7613,11 @@ CONFIG_CLK_ACTIONS=y
 CONFIG_CLK_OWL_S500=y
 CONFIG_CLK_OWL_S700=y
 CONFIG_CLK_OWL_S900=y
+CONFIG_CLK_BCM2835=y
 CONFIG_COMMON_CLK_IPROC=y
 CONFIG_CLK_BCM_NS2=y
 CONFIG_CLK_BCM_SR=y
+# CONFIG_CLK_RASPBERRYPI is not set
 CONFIG_COMMON_CLK_HI3516CV300=m
 CONFIG_COMMON_CLK_HI3519=y
 CONFIG_COMMON_CLK_HI3660=y
@@ -7144,6 +7654,22 @@ CONFIG_COMMON_CLK_MT7622_ETHSYS=y
 CONFIG_COMMON_CLK_MT7622_HIFSYS=y
 CONFIG_COMMON_CLK_MT7622_AUDSYS=y
 CONFIG_COMMON_CLK_MT8173=y
+CONFIG_COMMON_CLK_MT8183=y
+# CONFIG_COMMON_CLK_MT8183_AUDIOSYS is not set
+# CONFIG_COMMON_CLK_MT8183_CAMSYS is not set
+# CONFIG_COMMON_CLK_MT8183_IMGSYS is not set
+# CONFIG_COMMON_CLK_MT8183_IPU_CORE0 is not set
+# CONFIG_COMMON_CLK_MT8183_IPU_CORE1 is not set
+# CONFIG_COMMON_CLK_MT8183_IPU_ADL is not set
+# CONFIG_COMMON_CLK_MT8183_IPU_CONN is not set
+# CONFIG_COMMON_CLK_MT8183_MFGCFG is not set
+# CONFIG_COMMON_CLK_MT8183_MMSYS is not set
+# CONFIG_COMMON_CLK_MT8183_VDECSYS is not set
+# CONFIG_COMMON_CLK_MT8183_VENCSYS is not set
+CONFIG_COMMON_CLK_MT8516=y
+# CONFIG_COMMON_CLK_MT8516_AUDSYS is not set
+# end of Clock driver for MediaTek SoC
+
 CONFIG_COMMON_CLK_MESON_INPUT=y
 CONFIG_COMMON_CLK_MESON_REGMAP=y
 CONFIG_COMMON_CLK_MESON_DUALDIV=y
@@ -7187,6 +7713,7 @@ CONFIG_MSM_MMCC_8996=y
 CONFIG_QCS_GCC_404=m
 CONFIG_SDM_CAMCC_845=m
 CONFIG_SDM_GCC_660=m
+# CONFIG_QCS_TURING_404 is not set
 CONFIG_SDM_GCC_845=m
 CONFIG_SDM_GPUCC_845=m
 # CONFIG_SDM_VIDEOCC_845 is not set
@@ -7212,6 +7739,11 @@ CONFIG_EXYNOS_ARM64_COMMON_CLK=y
 CONFIG_EXYNOS_AUDSS_CLK_CON=y
 CONFIG_SPRD_COMMON_CLK=y
 CONFIG_SPRD_SC9860_CLK=y
+CONFIG_CLK_SUNXI=y
+CONFIG_CLK_SUNXI_CLOCKS=y
+CONFIG_CLK_SUNXI_PRCM_SUN6I=y
+CONFIG_CLK_SUNXI_PRCM_SUN8I=y
+CONFIG_CLK_SUNXI_PRCM_SUN9I=y
 CONFIG_SUNXI_CCU=y
 CONFIG_SUN50I_A64_CCU=y
 CONFIG_SUN50I_H6_CCU=y
@@ -7224,6 +7756,8 @@ CONFIG_CLK_TEGRA_BPMP=y
 CONFIG_TEGRA_CLK_DFLL=y
 CONFIG_CLK_UNIPHIER=y
 # CONFIG_COMMON_CLK_ZYNQMP is not set
+# end of Common Clock Framework
+
 CONFIG_HWSPINLOCK=y
 CONFIG_HWSPINLOCK_QCOM=y
 # CONFIG_HWSPINLOCK_SPRD is not set
@@ -7253,11 +7787,14 @@ CONFIG_SYS_SUPPORTS_SH_TMU=y
 CONFIG_SH_TIMER_CMT=y
 CONFIG_SH_TIMER_TMU=y
 CONFIG_CLKSRC_VERSATILE=y
+# end of Clock Source drivers
+
 CONFIG_MAILBOX=y
 CONFIG_ARM_MHU=y
 CONFIG_IMX_MBOX=m
 # CONFIG_PLATFORM_MHU is not set
 # CONFIG_PL320_MBOX is not set
+CONFIG_ARMADA_37XX_RWTM_MBOX=m
 # CONFIG_ROCKCHIP_MBOX is not set
 CONFIG_PCC=y
 # CONFIG_ALTERA_MBOX is not set
@@ -7284,6 +7821,8 @@ CONFIG_IOMMU_IO_PGTABLE_LPAE=y
 # CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set
 CONFIG_IOMMU_IO_PGTABLE_ARMV7S=y
 # CONFIG_IOMMU_IO_PGTABLE_ARMV7S_SELFTEST is not set
+# end of Generic IOMMU Pagetable Support
+
 # CONFIG_IOMMU_DEBUGFS is not set
 # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
 CONFIG_OF_IOMMU=y
@@ -7293,14 +7832,17 @@ CONFIG_IOMMU_DMA=y
 # CONFIG_EXYNOS_IOMMU is not set
 # CONFIG_IPMMU_VMSA is not set
 CONFIG_ARM_SMMU=y
+CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT=y
 CONFIG_ARM_SMMU_V3=y
 CONFIG_MTK_IOMMU=y
 CONFIG_QCOM_IOMMU=y
+# CONFIG_VIRTIO_IOMMU is not set
 
 #
 # Remoteproc drivers
 #
 CONFIG_REMOTEPROC=y
+# CONFIG_IMX_REMOTEPROC is not set
 CONFIG_QCOM_RPROC_COMMON=m
 CONFIG_QCOM_Q6V5_COMMON=m
 CONFIG_QCOM_Q6V5_ADSP=m
@@ -7309,6 +7851,7 @@ CONFIG_QCOM_Q6V5_PAS=m
 # CONFIG_QCOM_Q6V5_WCSS is not set
 # CONFIG_QCOM_SYSMON is not set
 CONFIG_QCOM_WCNSS_PIL=m
+# end of Remoteproc drivers
 
 #
 # Rpmsg drivers
@@ -7320,6 +7863,8 @@ CONFIG_RPMSG_QCOM_GLINK_NATIVE=m
 CONFIG_RPMSG_QCOM_GLINK_SMEM=m
 CONFIG_RPMSG_QCOM_SMD=m
 CONFIG_RPMSG_VIRTIO=m
+# end of Rpmsg drivers
+
 # CONFIG_SOUNDWIRE is not set
 
 #
@@ -7335,6 +7880,12 @@ CONFIG_MESON_CLK_MEASURE=y
 CONFIG_MESON_GX_SOCINFO=y
 CONFIG_MESON_GX_PM_DOMAINS=y
 CONFIG_MESON_MX_SOCINFO=y
+# end of Amlogic SoC drivers
+
+#
+# Aspeed SoC drivers
+#
+# end of Aspeed SoC drivers
 
 #
 # Broadcom SoC drivers
@@ -7343,6 +7894,7 @@ CONFIG_BCM2835_POWER=y
 CONFIG_RASPBERRYPI_POWER=y
 CONFIG_SOC_BRCMSTB=y
 CONFIG_BRCMSTB_PM=y
+# end of Broadcom SoC drivers
 
 #
 # NXP/Freescale QorIQ SoC drivers
@@ -7351,11 +7903,15 @@ CONFIG_FSL_DPAA=y
 # CONFIG_FSL_DPAA_CHECKING is not set
 # CONFIG_FSL_BMAN_TEST is not set
 # CONFIG_FSL_QMAN_TEST is not set
+CONFIG_DPAA2_CONSOLE=y
+# end of NXP/Freescale QorIQ SoC drivers
 
 #
 # i.MX SoC drivers
 #
 CONFIG_IMX_GPCV2_PM_DOMAINS=y
+# CONFIG_IMX_SCU_SOC is not set
+# end of i.MX SoC drivers
 
 #
 # MediaTek SoC drivers
@@ -7364,10 +7920,12 @@ CONFIG_MTK_CMDQ=m
 CONFIG_MTK_INFRACFG=y
 CONFIG_MTK_PMIC_WRAP=y
 CONFIG_MTK_SCPSYS=y
+# end of MediaTek SoC drivers
 
 #
 # Qualcomm SoC drivers
 #
+# CONFIG_QCOM_AOSS_QMP is not set
 # CONFIG_QCOM_COMMAND_DB is not set
 # CONFIG_QCOM_GENI_SE is not set
 CONFIG_QCOM_GLINK_SSR=m
@@ -7383,6 +7941,8 @@ CONFIG_QCOM_SMP2P=y
 CONFIG_QCOM_SMSM=y
 CONFIG_QCOM_WCNSS_CTRL=m
 # CONFIG_QCOM_APR is not set
+# end of Qualcomm SoC drivers
+
 CONFIG_SOC_RENESAS=y
 CONFIG_ARCH_RCAR_GEN3=y
 CONFIG_ARCH_R8A774A1=y
@@ -7424,7 +7984,11 @@ CONFIG_SOC_TEGRA_POWERGATE_BPMP=y
 # CONFIG_XILINX_VCU is not set
 CONFIG_ZYNQMP_POWER=y
 CONFIG_ZYNQMP_PM_DOMAINS=y
+# end of Xilinx SoC drivers
+
 # CONFIG_SOC_ZTE is not set
+# end of SOC (System On Chip) specific Drivers
+
 CONFIG_PM_DEVFREQ=y
 
 #
@@ -7448,6 +8012,7 @@ CONFIG_EXTCON=y
 # Extcon Device Drivers
 #
 CONFIG_EXTCON_ADC_JACK=m
+# CONFIG_EXTCON_FSA9480 is not set
 CONFIG_EXTCON_GPIO=y
 # CONFIG_EXTCON_MAX3355 is not set
 CONFIG_EXTCON_PTN5150=m
@@ -7458,6 +8023,7 @@ CONFIG_EXTCON_USB_GPIO=y
 CONFIG_EXTCON_USBC_CROS_EC=m
 CONFIG_MEMORY=y
 # CONFIG_ARM_PL172_MPMC is not set
+CONFIG_FSL_IFC=y
 CONFIG_MTK_SMI=y
 CONFIG_TEGRA_MC=y
 CONFIG_IIO=y
@@ -7517,6 +8083,7 @@ CONFIG_MXC6255=m
 CONFIG_SCA3000=m
 CONFIG_STK8312=m
 CONFIG_STK8BA50=m
+# end of Accelerometers
 
 #
 # Analog to digital converters
@@ -7532,6 +8099,7 @@ CONFIG_AD7606_IFACE_PARALLEL=m
 CONFIG_AD7606_IFACE_SPI=m
 CONFIG_AD7766=m
 CONFIG_AD7768_1=m
+CONFIG_AD7780=m
 CONFIG_AD7791=m
 CONFIG_AD7793=m
 CONFIG_AD7887=m
@@ -7578,21 +8146,26 @@ CONFIG_TI_ADC128S052=m
 CONFIG_TI_ADC161S626=m
 CONFIG_TI_ADS1015=m
 # CONFIG_TI_ADS7950 is not set
+CONFIG_TI_ADS8344=m
 CONFIG_TI_ADS8688=m
 CONFIG_TI_ADS124S08=m
 # CONFIG_TI_TLC4541 is not set
 CONFIG_VF610_ADC=m
 CONFIG_VIPERBOARD_ADC=m
+# CONFIG_XILINX_XADC is not set
+# end of Analog to digital converters
 
 #
 # Analog Front Ends
 #
 # CONFIG_IIO_RESCALE is not set
+# end of Analog Front Ends
 
 #
 # Amplifiers
 #
 CONFIG_AD8366=m
+# end of Amplifiers
 
 #
 # Chemical Sensors
@@ -7606,28 +8179,31 @@ CONFIG_IAQCORE=m
 CONFIG_SENSIRION_SGP30=m
 CONFIG_SPS30=m
 CONFIG_VZ89X=m
+# end of Chemical Sensors
+
 CONFIG_IIO_CROS_EC_SENSORS_CORE=m
 CONFIG_IIO_CROS_EC_SENSORS=m
+# CONFIG_IIO_CROS_EC_SENSORS_LID_ANGLE is not set
 
 #
 # Hid Sensor IIO Common
 #
 CONFIG_HID_SENSOR_IIO_COMMON=m
 CONFIG_HID_SENSOR_IIO_TRIGGER=m
+# end of Hid Sensor IIO Common
+
 CONFIG_IIO_MS_SENSORS_I2C=m
 
 #
 # SSP Sensor Common
 #
 # CONFIG_IIO_SSP_SENSORHUB is not set
+# end of SSP Sensor Common
+
 CONFIG_IIO_ST_SENSORS_I2C=m
 CONFIG_IIO_ST_SENSORS_SPI=m
 CONFIG_IIO_ST_SENSORS_CORE=m
 
-#
-# Counters
-#
-
 #
 # Digital to analog converters
 #
@@ -7665,11 +8241,13 @@ CONFIG_TI_DAC082S085=m
 CONFIG_TI_DAC7311=m
 CONFIG_TI_DAC7612=m
 CONFIG_VF610_DAC=m
+# end of Digital to analog converters
 
 #
 # IIO dummy driver
 #
 # CONFIG_IIO_SIMPLE_DUMMY is not set
+# end of IIO dummy driver
 
 #
 # Frequency Synthesizers DDS/PLL
@@ -7679,11 +8257,15 @@ CONFIG_VF610_DAC=m
 # Clock Generator/Distribution
 #
 CONFIG_AD9523=m
+# end of Clock Generator/Distribution
 
 #
 # Phase-Locked Loop (PLL) frequency synthesizers
 #
 CONFIG_ADF4350=m
+# CONFIG_ADF4371 is not set
+# end of Phase-Locked Loop (PLL) frequency synthesizers
+# end of Frequency Synthesizers DDS/PLL
 
 #
 # Digital gyroscope sensors
@@ -7696,12 +8278,16 @@ CONFIG_ADXRS450=m
 CONFIG_BMG160=m
 CONFIG_BMG160_I2C=m
 CONFIG_BMG160_SPI=m
+CONFIG_FXAS21002C=m
+CONFIG_FXAS21002C_I2C=m
+CONFIG_FXAS21002C_SPI=m
 CONFIG_HID_SENSOR_GYRO_3D=m
 # CONFIG_MPU3050_I2C is not set
 CONFIG_IIO_ST_GYRO_3AXIS=m
 CONFIG_IIO_ST_GYRO_I2C_3AXIS=m
 CONFIG_IIO_ST_GYRO_SPI_3AXIS=m
 CONFIG_ITG3200=m
+# end of Digital gyroscope sensors
 
 #
 # Health Sensors
@@ -7714,6 +8300,8 @@ CONFIG_AFE4403=m
 CONFIG_AFE4404=m
 CONFIG_MAX30100=m
 CONFIG_MAX30102=m
+# end of Heart Rate Monitors
+# end of Health Sensors
 
 #
 # Humidity sensors
@@ -7728,6 +8316,7 @@ CONFIG_HTS221_SPI=m
 CONFIG_HTU21=m
 CONFIG_SI7005=m
 CONFIG_SI7020=m
+# end of Humidity sensors
 
 #
 # Inertial measurement units
@@ -7742,6 +8331,8 @@ CONFIG_INV_MPU6050_IIO=m
 CONFIG_INV_MPU6050_I2C=m
 CONFIG_INV_MPU6050_SPI=m
 # CONFIG_IIO_ST_LSM6DSX is not set
+# end of Inertial measurement units
+
 CONFIG_IIO_ADIS_LIB=m
 CONFIG_IIO_ADIS_LIB_BUFFER=y
 
@@ -7791,6 +8382,7 @@ CONFIG_VCNL4035=m
 CONFIG_VEML6070=m
 CONFIG_VL6180=m
 # CONFIG_ZOPT2201 is not set
+# end of Light sensors
 
 #
 # Magnetometer sensors
@@ -7813,17 +8405,20 @@ CONFIG_SENSORS_HMC5843_SPI=m
 CONFIG_SENSORS_RM3100=m
 CONFIG_SENSORS_RM3100_I2C=m
 CONFIG_SENSORS_RM3100_SPI=m
+# end of Magnetometer sensors
 
 #
 # Multiplexers
 #
 # CONFIG_IIO_MUX is not set
+# end of Multiplexers
 
 #
 # Inclinometer sensors
 #
 CONFIG_HID_SENSOR_INCLINOMETER_3D=m
 CONFIG_HID_SENSOR_DEVICE_ROTATION=m
+# end of Inclinometer sensors
 
 #
 # Triggers - standalone
@@ -7832,6 +8427,7 @@ CONFIG_IIO_HRTIMER_TRIGGER=m
 CONFIG_IIO_INTERRUPT_TRIGGER=m
 CONFIG_IIO_TIGHTLOOP_TRIGGER=m
 CONFIG_IIO_SYSFS_TRIGGER=m
+# end of Triggers - standalone
 
 #
 # Digital potentiometers
@@ -7845,11 +8441,13 @@ CONFIG_MCP4131=m
 CONFIG_MCP4531=m
 CONFIG_MCP41010=m
 CONFIG_TPL0102=m
+# end of Digital potentiometers
 
 #
 # Digital potentiostats
 #
 CONFIG_LMP91000=m
+# end of Digital potentiostats
 
 #
 # Pressure sensors
@@ -7859,6 +8457,7 @@ CONFIG_BMP280=m
 CONFIG_BMP280_I2C=m
 CONFIG_BMP280_SPI=m
 # CONFIG_IIO_CROS_EC_BARO is not set
+# CONFIG_DPS310 is not set
 CONFIG_HID_SENSOR_PRESS=m
 CONFIG_HP03=m
 CONFIG_MPL115=m
@@ -7877,28 +8476,33 @@ CONFIG_HP206C=m
 CONFIG_ZPA2326=m
 CONFIG_ZPA2326_I2C=m
 CONFIG_ZPA2326_SPI=m
+# end of Pressure sensors
 
 #
 # Lightning sensors
 #
 CONFIG_AS3935=m
+# end of Lightning sensors
 
 #
 # Proximity and distance sensors
 #
 # CONFIG_ISL29501 is not set
 CONFIG_LIDAR_LITE_V2=m
+CONFIG_MB1232=m
 CONFIG_RFD77402=m
 CONFIG_SRF04=m
 CONFIG_SX9500=m
 # CONFIG_SRF08 is not set
 CONFIG_VL53L0X_I2C=m
+# end of Proximity and distance sensors
 
 #
 # Resolver to digital converters
 #
 CONFIG_AD2S90=m
 CONFIG_AD2S1200=m
+# end of Resolver to digital converters
 
 #
 # Temperature sensors
@@ -7911,6 +8515,9 @@ CONFIG_TMP006=m
 # CONFIG_TMP007 is not set
 CONFIG_TSYS01=m
 CONFIG_TSYS02D=m
+CONFIG_MAX31856=m
+# end of Temperature sensors
+
 # CONFIG_NTB is not set
 # CONFIG_VME_BUS is not set
 CONFIG_PWM=y
@@ -7924,6 +8531,7 @@ CONFIG_PWM_CROS_EC=m
 CONFIG_PWM_HIBVT=m
 CONFIG_PWM_IMX1=m
 CONFIG_PWM_IMX27=m
+CONFIG_PWM_IMX_TPM=m
 CONFIG_PWM_MESON=m
 CONFIG_PWM_MTK_DISP=m
 CONFIG_PWM_MEDIATEK=m
@@ -7941,12 +8549,15 @@ CONFIG_PWM_ZX=m
 #
 CONFIG_IRQCHIP=y
 CONFIG_ARM_GIC=y
+CONFIG_ARM_GIC_PM=y
 CONFIG_ARM_GIC_MAX_NR=1
 CONFIG_ARM_GIC_V2M=y
 CONFIG_ARM_GIC_V3=y
 CONFIG_ARM_GIC_V3_ITS=y
 CONFIG_ARM_GIC_V3_ITS_PCI=y
 CONFIG_ALPINE_MSI=y
+# CONFIG_AL_FIC is not set
+CONFIG_BCM7038_L1_IRQ=y
 CONFIG_BRCMSTB_L2_IRQ=y
 CONFIG_DW_APB_ICTL=y
 CONFIG_HISILICON_IRQ_MBIGEN=y
@@ -7965,6 +8576,8 @@ CONFIG_IRQ_UNIPHIER_AIDET=y
 CONFIG_MESON_IRQ_GPIO=y
 # CONFIG_QCOM_PDC is not set
 CONFIG_IMX_IRQSTEER=y
+# end of IRQ chip support
+
 # CONFIG_IPACK_BUS is not set
 CONFIG_ARCH_HAS_RESET_CONTROLLER=y
 CONFIG_RESET_CONTROLLER=y
@@ -7983,11 +8596,6 @@ CONFIG_RESET_UNIPHIER_GLUE=y
 CONFIG_COMMON_RESET_HI3660=y
 CONFIG_COMMON_RESET_HI6220=y
 CONFIG_RESET_TEGRA_BPMP=y
-CONFIG_FMC=m
-CONFIG_FMC_FAKEDEV=m
-CONFIG_FMC_TRIVIAL=m
-CONFIG_FMC_WRITE_EEPROM=m
-CONFIG_FMC_CHARDEV=m
 
 #
 # PHY Subsystem
@@ -8001,6 +8609,9 @@ CONFIG_PHY_SUN6I_MIPI_DPHY=m
 CONFIG_PHY_MESON8B_USB2=y
 CONFIG_PHY_MESON_GXL_USB2=y
 CONFIG_PHY_MESON_GXL_USB3=y
+CONFIG_PHY_MESON_G12A_USB2=m
+CONFIG_PHY_MESON_G12A_USB3_PCIE=y
+CONFIG_PHY_BCM_SR_USB=y
 # CONFIG_BCM_KONA_USB2_PHY is not set
 # CONFIG_PHY_BCM_NS_USB2 is not set
 # CONFIG_PHY_BCM_NS_USB3 is not set
@@ -8013,7 +8624,9 @@ CONFIG_PHY_CADENCE_DP=m
 CONFIG_PHY_CADENCE_DPHY=m
 CONFIG_PHY_CADENCE_SIERRA=m
 CONFIG_PHY_FSL_IMX8MQ_USB=m
+# CONFIG_PHY_MIXEL_MIPI_DPHY is not set
 CONFIG_PHY_HI6220_USB=y
+CONFIG_PHY_HI3660_USB=m
 # CONFIG_PHY_HISTB_COMBPHY is not set
 # CONFIG_PHY_HISI_INNO_USB2 is not set
 # CONFIG_PHY_BERLIN_SATA is not set
@@ -8025,12 +8638,14 @@ CONFIG_PHY_MVEBU_CP110_COMPHY=m
 # CONFIG_PHY_PXA_28NM_HSIC is not set
 # CONFIG_PHY_PXA_28NM_USB2 is not set
 CONFIG_PHY_MTK_TPHY=m
+CONFIG_PHY_MTK_UFS=m
 # CONFIG_PHY_MTK_XSPHY is not set
 # CONFIG_PHY_CPCAP_USB is not set
 # CONFIG_PHY_MAPPHONE_MDM6600 is not set
 CONFIG_PHY_OCELOT_SERDES=m
 # CONFIG_PHY_QCOM_APQ8064_SATA is not set
 # CONFIG_PHY_QCOM_IPQ806X_SATA is not set
+# CONFIG_PHY_QCOM_PCIE2 is not set
 CONFIG_PHY_QCOM_QMP=m
 CONFIG_PHY_QCOM_QUSB2=m
 CONFIG_PHY_QCOM_UFS=y
@@ -8058,6 +8673,8 @@ CONFIG_PHY_UNIPHIER_USB3=m
 CONFIG_PHY_UNIPHIER_PCIE=m
 # CONFIG_PHY_TEGRA_XUSB is not set
 # CONFIG_PHY_TUSB1210 is not set
+# end of PHY Subsystem
+
 CONFIG_POWERCAP=y
 CONFIG_IDLE_INJECT=y
 # CONFIG_MCB is not set
@@ -8071,18 +8688,24 @@ CONFIG_ARM_CCI400_PMU=y
 CONFIG_ARM_CCN=y
 CONFIG_ARM_PMU=y
 CONFIG_ARM_PMU_ACPI=y
+CONFIG_ARM_SMMU_V3_PMU=m
 # CONFIG_ARM_DSU_PMU is not set
+# CONFIG_FSL_IMX8_DDR_PMU is not set
 CONFIG_HISI_PMU=y
 # CONFIG_QCOM_L2_PMU is not set
 # CONFIG_QCOM_L3_PMU is not set
 # CONFIG_XGENE_PMU is not set
 CONFIG_ARM_SPE_PMU=m
+# end of Performance monitor support
+
 CONFIG_RAS=y
 
 #
 # Android
 #
 # CONFIG_ANDROID is not set
+# end of Android
+
 CONFIG_LIBNVDIMM=y
 CONFIG_BLK_DEV_PMEM=m
 CONFIG_ND_BLK=m
@@ -8094,7 +8717,10 @@ CONFIG_NVDIMM_KEYS=y
 CONFIG_DAX_DRIVER=y
 CONFIG_DAX=y
 CONFIG_NVMEM=y
+CONFIG_NVMEM_SYSFS=y
 CONFIG_NVMEM_IMX_IIM=m
+CONFIG_NVMEM_IMX_OCOTP=m
+# CONFIG_NVMEM_IMX_OCOTP_SCU is not set
 CONFIG_MTK_EFUSE=m
 CONFIG_QCOM_QFPROM=m
 # CONFIG_ROCKCHIP_EFUSE is not set
@@ -8102,6 +8728,7 @@ CONFIG_NVMEM_BCM_OCOTP=y
 CONFIG_NVMEM_SUNXI_SID=m
 CONFIG_UNIPHIER_EFUSE=m
 CONFIG_MESON_MX_EFUSE=m
+# CONFIG_NVMEM_SNVS_LPGPR is not set
 # CONFIG_SC27XX_EFUSE is not set
 # CONFIG_NVMEM_ZYNQMP is not set
 
@@ -8110,6 +8737,8 @@ CONFIG_MESON_MX_EFUSE=m
 #
 # CONFIG_STM is not set
 # CONFIG_INTEL_TH is not set
+# end of HW tracing support
+
 # CONFIG_FPGA is not set
 # CONFIG_FSI is not set
 # CONFIG_TEE is not set
@@ -8122,11 +8751,15 @@ CONFIG_MUX_ADG792A=m
 CONFIG_MUX_ADGS1408=m
 CONFIG_MUX_GPIO=m
 CONFIG_MUX_MMIO=m
+# end of Multiplexer drivers
+
 CONFIG_PM_OPP=y
 # CONFIG_SIOX is not set
 # CONFIG_SLIMBUS is not set
 CONFIG_INTERCONNECT=m
 # CONFIG_INTERCONNECT_QCOM is not set
+# CONFIG_COUNTER is not set
+# end of Device Drivers
 
 #
 # File systems
@@ -8228,6 +8861,7 @@ CONFIG_FSCACHE_OBJECT_LIST=y
 CONFIG_CACHEFILES=m
 # CONFIG_CACHEFILES_DEBUG is not set
 # CONFIG_CACHEFILES_HISTOGRAM is not set
+# end of Caches
 
 #
 # CD-ROM/DVD Filesystems
@@ -8236,6 +8870,7 @@ CONFIG_ISO9660_FS=m
 CONFIG_JOLIET=y
 CONFIG_ZISOFS=y
 CONFIG_UDF_FS=m
+# end of CD-ROM/DVD Filesystems
 
 #
 # DOS/FAT/NT Filesystems
@@ -8249,6 +8884,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
 CONFIG_NTFS_FS=m
 # CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
+# end of DOS/FAT/NT Filesystems
 
 #
 # Pseudo filesystems
@@ -8269,6 +8905,8 @@ CONFIG_MEMFD_CREATE=y
 CONFIG_ARCH_HAS_GIGANTIC_PAGE=y
 CONFIG_CONFIGFS_FS=y
 CONFIG_EFIVAR_FS=y
+# end of Pseudo filesystems
+
 CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_ORANGEFS_FS is not set
 # CONFIG_ADFS_FS is not set
@@ -8286,6 +8924,7 @@ CONFIG_UBIFS_FS=m
 # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
 CONFIG_UBIFS_FS_LZO=y
 CONFIG_UBIFS_FS_ZLIB=y
+CONFIG_UBIFS_FS_ZSTD=y
 # CONFIG_UBIFS_ATIME_SUPPORT is not set
 CONFIG_UBIFS_FS_XATTR=y
 CONFIG_UBIFS_FS_SECURITY=y
@@ -8377,11 +9016,12 @@ CONFIG_SUNRPC_GSS=y
 CONFIG_SUNRPC_BACKCHANNEL=y
 CONFIG_SUNRPC_SWAP=y
 CONFIG_RPCSEC_GSS_KRB5=m
-CONFIG_CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y
+# CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES is not set
 CONFIG_SUNRPC_DEBUG=y
 CONFIG_CEPH_FS=m
 CONFIG_CEPH_FSCACHE=y
 CONFIG_CEPH_FS_POSIX_ACL=y
+# CONFIG_CEPH_FS_SECURITY_LABEL is not set
 CONFIG_CIFS=m
 # CONFIG_CIFS_STATS2 is not set
 CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
@@ -8389,7 +9029,6 @@ CONFIG_CIFS_WEAK_PW_HASH=y
 CONFIG_CIFS_UPCALL=y
 CONFIG_CIFS_XATTR=y
 CONFIG_CIFS_POSIX=y
-CONFIG_CIFS_ACL=y
 CONFIG_CIFS_DEBUG=y
 # CONFIG_CIFS_DEBUG2 is not set
 # CONFIG_CIFS_DEBUG_DUMP_KEYS is not set
@@ -8454,12 +9093,16 @@ CONFIG_NLS_MAC_TURKISH=m
 CONFIG_NLS_UTF8=m
 CONFIG_DLM=m
 CONFIG_DLM_DEBUG=y
+CONFIG_UNICODE=y
+# CONFIG_UNICODE_NORMALIZATION_SELFTEST is not set
+# end of File systems
 
 #
 # Security options
 #
 CONFIG_KEYS=y
 CONFIG_KEYS_COMPAT=y
+# CONFIG_KEYS_REQUEST_CACHE is not set
 CONFIG_PERSISTENT_KEYRINGS=y
 CONFIG_BIG_KEYS=y
 CONFIG_TRUSTED_KEYS=m
@@ -8498,6 +9141,25 @@ CONFIG_SECURITY_YAMA=y
 # CONFIG_DEFAULT_SECURITY_APPARMOR is not set
 CONFIG_DEFAULT_SECURITY_DAC=y
 CONFIG_LSM="yama,loadpin,safesetid,integrity"
+
+#
+# Kernel hardening options
+#
+
+#
+# Memory initialization
+#
+CONFIG_INIT_STACK_NONE=y
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_USER is not set
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL is not set
+# CONFIG_GCC_PLUGIN_STACKLEAK is not set
+# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
+# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
+# end of Memory initialization
+# end of Kernel hardening options
+# end of Security options
+
 CONFIG_XOR_BLOCKS=m
 CONFIG_ASYNC_CORE=m
 CONFIG_ASYNC_MEMCPY=m
@@ -8525,9 +9187,6 @@ CONFIG_CRYPTO_AKCIPHER=y
 CONFIG_CRYPTO_KPP2=y
 CONFIG_CRYPTO_KPP=y
 CONFIG_CRYPTO_ACOMP2=y
-CONFIG_CRYPTO_RSA=y
-CONFIG_CRYPTO_DH=y
-CONFIG_CRYPTO_ECDH=m
 CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MANAGER2=y
 CONFIG_CRYPTO_USER=m
@@ -8537,13 +9196,21 @@ CONFIG_CRYPTO_GF128MUL=y
 CONFIG_CRYPTO_NULL=y
 CONFIG_CRYPTO_NULL2=y
 CONFIG_CRYPTO_PCRYPT=m
-CONFIG_CRYPTO_WORKQUEUE=y
 CONFIG_CRYPTO_CRYPTD=y
 CONFIG_CRYPTO_AUTHENC=m
 # CONFIG_CRYPTO_TEST is not set
 CONFIG_CRYPTO_SIMD=y
 CONFIG_CRYPTO_ENGINE=m
 
+#
+# Public-key cryptography
+#
+CONFIG_CRYPTO_RSA=y
+CONFIG_CRYPTO_DH=y
+CONFIG_CRYPTO_ECC=m
+CONFIG_CRYPTO_ECDH=m
+CONFIG_CRYPTO_ECRDSA=m
+
 #
 # Authenticated Encryption with Associated Data
 #
@@ -8587,6 +9254,7 @@ CONFIG_CRYPTO_VMAC=m
 #
 CONFIG_CRYPTO_CRC32C=y
 CONFIG_CRYPTO_CRC32=y
+# CONFIG_CRYPTO_XXHASH is not set
 CONFIG_CRYPTO_CRCT10DIF=y
 CONFIG_CRYPTO_GHASH=y
 CONFIG_CRYPTO_POLY1305=m
@@ -8602,7 +9270,7 @@ CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA512=m
 CONFIG_CRYPTO_SHA3=m
 CONFIG_CRYPTO_SM3=m
-# CONFIG_CRYPTO_STREEBOG is not set
+CONFIG_CRYPTO_STREEBOG=m
 CONFIG_CRYPTO_TGR192=m
 CONFIG_CRYPTO_WP512=m
 
@@ -8612,6 +9280,7 @@ CONFIG_CRYPTO_WP512=m
 CONFIG_CRYPTO_AES=y
 CONFIG_CRYPTO_AES_TI=m
 CONFIG_CRYPTO_ANUBIS=m
+CONFIG_CRYPTO_LIB_ARC4=m
 CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_BLOWFISH=m
 CONFIG_CRYPTO_BLOWFISH_COMMON=m
@@ -8662,9 +9331,10 @@ CONFIG_CRYPTO_HW=y
 # CONFIG_CRYPTO_DEV_MARVELL_CESA is not set
 # CONFIG_CRYPTO_DEV_FSL_CAAM is not set
 CONFIG_CRYPTO_DEV_SAHARA=m
-# CONFIG_CRYPTO_DEV_MXC_SCC is not set
 # CONFIG_CRYPTO_DEV_EXYNOS_RNG is not set
 # CONFIG_CRYPTO_DEV_S5P is not set
+# CONFIG_CRYPTO_DEV_ATMEL_ECC is not set
+# CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set
 CONFIG_CRYPTO_DEV_CCP=y
 CONFIG_CRYPTO_DEV_CCP_DD=m
 CONFIG_CRYPTO_DEV_SP_CCP=y
@@ -8699,6 +9369,8 @@ CONFIG_SYSTEM_TRUSTED_KEYS=""
 # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
 # CONFIG_SECONDARY_TRUSTED_KEYRING is not set
 # CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
+# end of Certificates for signature checking
+
 CONFIG_BINARY_PRINTF=y
 
 #
@@ -8706,12 +9378,14 @@ CONFIG_BINARY_PRINTF=y
 #
 CONFIG_RAID6_PQ=m
 CONFIG_RAID6_PQ_BENCHMARK=y
+CONFIG_PACKING=y
 CONFIG_BITREVERSE=y
 CONFIG_HAVE_ARCH_BITREVERSE=y
-CONFIG_RATIONAL=y
 CONFIG_GENERIC_STRNCPY_FROM_USER=y
 CONFIG_GENERIC_STRNLEN_USER=y
 CONFIG_GENERIC_NET_UTILS=y
+CONFIG_CORDIC=m
+CONFIG_RATIONAL=y
 CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_STMP_DEVICE=y
 CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
@@ -8767,6 +9441,8 @@ CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_REED_SOLOMON=m
 CONFIG_REED_SOLOMON_ENC8=y
 CONFIG_REED_SOLOMON_DEC8=y
+CONFIG_REED_SOLOMON_DEC16=y
+CONFIG_BCH=m
 CONFIG_TEXTSEARCH=y
 CONFIG_TEXTSEARCH_KMP=m
 CONFIG_TEXTSEARCH_BM=m
@@ -8785,6 +9461,7 @@ CONFIG_ARCH_HAS_SETUP_DMA_OPS=y
 CONFIG_ARCH_HAS_TEARDOWN_DMA_OPS=y
 CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE=y
 CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU=y
+CONFIG_ARCH_HAS_DMA_PREP_COHERENT=y
 CONFIG_ARCH_HAS_DMA_COHERENT_TO_PFN=y
 CONFIG_ARCH_HAS_DMA_MMAP_PGPROT=y
 CONFIG_SWIOTLB=y
@@ -8811,13 +9488,16 @@ CONFIG_GLOB=y
 CONFIG_NLATTR=y
 CONFIG_LRU_CACHE=m
 CONFIG_CLZ_TAB=y
-CONFIG_CORDIC=m
-# CONFIG_DDR is not set
 CONFIG_IRQ_POLL=y
 CONFIG_MPILIB=y
+CONFIG_DIMLIB=y
 CONFIG_LIBFDT=y
 CONFIG_OID_REGISTRY=y
 CONFIG_UCS2_STRING=y
+CONFIG_HAVE_GENERIC_VDSO=y
+CONFIG_GENERIC_GETTIMEOFDAY=y
+CONFIG_GENERIC_COMPAT_VDSO=y
+CONFIG_CROSS_COMPILE_COMPAT_VDSO=""
 CONFIG_FONT_SUPPORT=y
 # CONFIG_FONTS is not set
 CONFIG_FONT_8x8=y
@@ -8827,6 +9507,7 @@ CONFIG_ARCH_HAS_PMEM_API=y
 CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y
 CONFIG_SBITMAP=y
 # CONFIG_STRING_SELFTEST is not set
+# end of Library routines
 
 #
 # Kernel hacking
@@ -8842,6 +9523,7 @@ CONFIG_CONSOLE_LOGLEVEL_QUIET=4
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 CONFIG_BOOT_PRINTK_DELAY=y
 CONFIG_DYNAMIC_DEBUG=y
+# end of printk and dmesg options
 
 #
 # Compile-time checks and compiler options
@@ -8850,6 +9532,7 @@ CONFIG_DEBUG_INFO=y
 # CONFIG_DEBUG_INFO_REDUCED is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
 # CONFIG_DEBUG_INFO_DWARF4 is not set
+# CONFIG_DEBUG_INFO_BTF is not set
 # CONFIG_GDB_SCRIPTS is not set
 CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_FRAME_WARN=1024
@@ -8857,16 +9540,20 @@ CONFIG_STRIP_ASM_SYMS=y
 # CONFIG_READABLE_ASM is not set
 CONFIG_UNUSED_SYMBOLS=y
 CONFIG_DEBUG_FS=y
-CONFIG_HEADERS_CHECK=y
+# CONFIG_HEADERS_INSTALL is not set
+# CONFIG_OPTIMIZE_INLINING is not set
 CONFIG_DEBUG_SECTION_MISMATCH=y
 CONFIG_SECTION_MISMATCH_WARN_ONLY=y
 CONFIG_ARCH_WANT_FRAME_POINTERS=y
 CONFIG_FRAME_POINTER=y
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+# end of Compile-time checks and compiler options
+
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x0
 CONFIG_MAGIC_SYSRQ_SERIAL=y
 CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_MISC=y
 
 #
 # Memory Debugging
@@ -8895,6 +9582,8 @@ CONFIG_HAVE_ARCH_KASAN_SW_TAGS=y
 CONFIG_CC_HAS_KASAN_GENERIC=y
 # CONFIG_KASAN is not set
 CONFIG_KASAN_STACK=1
+# end of Memory Debugging
+
 CONFIG_ARCH_HAS_KCOV=y
 CONFIG_CC_HAS_SANCOV_TRACE_PC=y
 # CONFIG_KCOV is not set
@@ -8909,6 +9598,8 @@ CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
 CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
 # CONFIG_WQ_WATCHDOG is not set
+# end of Debug Lockups and Hangs
+
 # CONFIG_PANIC_ON_OOPS is not set
 CONFIG_PANIC_ON_OOPS_VALUE=0
 CONFIG_PANIC_TIMEOUT=0
@@ -8934,13 +9625,15 @@ CONFIG_LOCK_DEBUGGING_SUPPORT=y
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_LOCK_TORTURE_TEST is not set
 # CONFIG_WW_MUTEX_SELFTEST is not set
+# end of Lock Debugging (spinlocks, mutexes, etc...)
+
 CONFIG_STACKTRACE=y
 # CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
 # CONFIG_DEBUG_KOBJECT is not set
 CONFIG_HAVE_DEBUG_BUGVERBOSE=y
 CONFIG_DEBUG_BUGVERBOSE=y
 CONFIG_DEBUG_LIST=y
-# CONFIG_DEBUG_PI_LIST is not set
+# CONFIG_DEBUG_PLIST is not set
 CONFIG_DEBUG_SG=y
 CONFIG_DEBUG_NOTIFIERS=y
 CONFIG_DEBUG_CREDENTIALS=y
@@ -8954,6 +9647,8 @@ CONFIG_RCU_TORTURE_TEST=m
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
 # CONFIG_RCU_TRACE is not set
 # CONFIG_RCU_EQS_DEBUG is not set
+# end of RCU Debugging
+
 # CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
 # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
@@ -9004,7 +9699,6 @@ CONFIG_RING_BUFFER_BENCHMARK=m
 # CONFIG_RING_BUFFER_STARTUP_TEST is not set
 CONFIG_PREEMPTIRQ_DELAY_TEST=m
 # CONFIG_TRACE_EVAL_MAP_FILE is not set
-CONFIG_TRACING_EVENTS_GPIO=y
 CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_LKDTM is not set
 # CONFIG_TEST_LIST_SORT is not set
@@ -9012,12 +9706,14 @@ CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_KPROBES_SANITY_TEST is not set
 # CONFIG_BACKTRACE_SELF_TEST is not set
 # CONFIG_RBTREE_TEST is not set
+# CONFIG_REED_SOLOMON_TEST is not set
 # CONFIG_INTERVAL_TREE_TEST is not set
 # CONFIG_PERCPU_TEST is not set
 CONFIG_ATOMIC64_SELFTEST=y
 CONFIG_ASYNC_RAID6_TEST=m
 # CONFIG_TEST_HEXDUMP is not set
 # CONFIG_TEST_STRING_HELPERS is not set
+# CONFIG_TEST_STRSCPY is not set
 CONFIG_TEST_KSTRTOX=y
 # CONFIG_TEST_PRINTF is not set
 # CONFIG_TEST_BITMAP is not set
@@ -9032,6 +9728,7 @@ CONFIG_TEST_KSTRTOX=y
 # CONFIG_TEST_VMALLOC is not set
 # CONFIG_TEST_USER_COPY is not set
 # CONFIG_TEST_BPF is not set
+# CONFIG_TEST_BLACKHOLE_DEV is not set
 # CONFIG_FIND_BIT_BENCHMARK is not set
 # CONFIG_TEST_FIRMWARE is not set
 # CONFIG_TEST_SYSCTL is not set
@@ -9040,6 +9737,7 @@ CONFIG_TEST_KSTRTOX=y
 # CONFIG_TEST_KMOD is not set
 # CONFIG_TEST_MEMCAT_P is not set
 # CONFIG_TEST_STACKINIT is not set
+# CONFIG_TEST_MEMINIT is not set
 # CONFIG_MEMTEST is not set
 CONFIG_BUG_ON_DATA_CORRUPTION=y
 # CONFIG_SAMPLES is not set
@@ -9064,3 +9762,4 @@ CONFIG_DEBUG_WX=y
 # CONFIG_DEBUG_EFI is not set
 # CONFIG_ARM64_RELOC_TEST is not set
 # CONFIG_CORESIGHT is not set
+# end of Kernel hacking
diff --git a/srcpkgs/linux5.1/files/i386-dotconfig b/srcpkgs/linux5.3/files/i386-dotconfig
similarity index 92%
rename from srcpkgs/linux5.1/files/i386-dotconfig
rename to srcpkgs/linux5.3/files/i386-dotconfig
index 103d3305a3e..7f3df1b4d27 100644
--- a/srcpkgs/linux5.1/files/i386-dotconfig
+++ b/srcpkgs/linux5.3/files/i386-dotconfig
@@ -1,13 +1,13 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 5.1.18 Kernel Configuration
+# Linux/i386 5.3.0 Kernel Configuration
 #
 
 #
-# Compiler: gcc (GCC) 8.3.0
+# Compiler: i686-pc-linux-gnu-gcc (GCC) 9.2.0
 #
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=80300
+CONFIG_GCC_VERSION=90200
 CONFIG_CLANG_VERSION=0
 CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y
@@ -20,6 +20,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
 #
 CONFIG_INIT_ENV_ARG_LIMIT=32
 # CONFIG_COMPILE_TEST is not set
+# CONFIG_HEADER_TEST is not set
 CONFIG_LOCALVERSION="_1"
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_BUILD_SALT=""
@@ -66,6 +67,8 @@ CONFIG_GENERIC_IRQ_RESERVATION_MODE=y
 CONFIG_IRQ_FORCED_THREADING=y
 CONFIG_SPARSE_IRQ=y
 # CONFIG_GENERIC_IRQ_DEBUGFS is not set
+# end of IRQ subsystem
+
 CONFIG_CLOCKSOURCE_WATCHDOG=y
 CONFIG_ARCH_CLOCKSOURCE_DATA=y
 CONFIG_ARCH_CLOCKSOURCE_INIT=y
@@ -85,10 +88,13 @@ CONFIG_NO_HZ_COMMON=y
 CONFIG_NO_HZ_IDLE=y
 # CONFIG_NO_HZ is not set
 CONFIG_HIGH_RES_TIMERS=y
+# end of Timers subsystem
+
 # CONFIG_PREEMPT_NONE is not set
 # CONFIG_PREEMPT_VOLUNTARY is not set
 CONFIG_PREEMPT=y
 CONFIG_PREEMPT_COUNT=y
+CONFIG_PREEMPTION=y
 
 #
 # CPU/Task time and stats accounting
@@ -102,7 +108,10 @@ CONFIG_TASKSTATS=y
 CONFIG_TASK_DELAY_ACCT=y
 CONFIG_TASK_XACCT=y
 CONFIG_TASK_IO_ACCOUNTING=y
-# CONFIG_PSI is not set
+CONFIG_PSI=y
+CONFIG_PSI_DEFAULT_DISABLED=y
+# end of CPU/Task time and stats accounting
+
 CONFIG_CPU_ISOLATION=y
 
 #
@@ -115,13 +124,22 @@ CONFIG_TREE_SRCU=y
 CONFIG_TASKS_RCU=y
 CONFIG_RCU_STALL_COMMON=y
 CONFIG_RCU_NEED_SEGCBLIST=y
-CONFIG_BUILD_BIN2C=y
+# end of RCU Subsystem
+
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
+CONFIG_IKHEADERS=m
 CONFIG_LOG_BUF_SHIFT=19
 CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
 CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
+
+#
+# Scheduler features
+#
+# CONFIG_UCLAMP_TASK is not set
+# end of Scheduler features
+
 CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
 CONFIG_CGROUPS=y
 CONFIG_PAGE_COUNTER=y
@@ -130,7 +148,6 @@ CONFIG_MEMCG_SWAP=y
 CONFIG_MEMCG_SWAP_ENABLED=y
 CONFIG_MEMCG_KMEM=y
 CONFIG_BLK_CGROUP=y
-# CONFIG_DEBUG_BLK_CGROUP is not set
 CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
@@ -169,7 +186,6 @@ CONFIG_RD_LZ4=y
 CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
-CONFIG_ANON_INODES=y
 CONFIG_HAVE_UID16=y
 CONFIG_SYSCTL_EXCEPTION_TRACE=y
 CONFIG_HAVE_PCSPKR_PLATFORM=y
@@ -216,6 +232,8 @@ CONFIG_HAVE_PERF_EVENTS=y
 #
 CONFIG_PERF_EVENTS=y
 # CONFIG_DEBUG_PERF_USE_VMALLOC is not set
+# end of Kernel Performance Events And Counters
+
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_SLUB_DEBUG=y
 # CONFIG_SLUB_MEMCG_SYSFS_ON is not set
@@ -226,9 +244,12 @@ CONFIG_SLUB=y
 CONFIG_SLAB_MERGE_DEFAULT=y
 CONFIG_SLAB_FREELIST_RANDOM=y
 CONFIG_SLAB_FREELIST_HARDENED=y
+CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
 CONFIG_SLUB_CPU_PARTIAL=y
 CONFIG_SYSTEM_DATA_VERIFICATION=y
 CONFIG_PROFILING=y
+# end of General setup
+
 CONFIG_X86_32=y
 CONFIG_X86=y
 CONFIG_INSTRUCTION_DECODER=y
@@ -243,9 +264,7 @@ CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8
 CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_GENERIC_BUG=y
-CONFIG_GENERIC_HWEIGHT=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_ARCH_HAS_CPU_RELAX=y
 CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
@@ -255,9 +274,7 @@ CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
 CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
 CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
-CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 CONFIG_HAVE_INTEL_TXT=y
 CONFIG_X86_32_SMP=y
@@ -288,6 +305,7 @@ CONFIG_HYPERVISOR_GUEST=y
 CONFIG_PARAVIRT=y
 # CONFIG_PARAVIRT_DEBUG is not set
 # CONFIG_PARAVIRT_SPINLOCKS is not set
+CONFIG_X86_HV_CALLBACK_VECTOR=y
 # CONFIG_XEN is not set
 CONFIG_KVM_GUEST=y
 # CONFIG_PVH is not set
@@ -335,6 +353,7 @@ CONFIG_CPU_SUP_HYGON=y
 CONFIG_CPU_SUP_CENTAUR=y
 CONFIG_CPU_SUP_TRANSMETA_32=y
 CONFIG_CPU_SUP_UMC_32=y
+CONFIG_CPU_SUP_ZHAOXIN=y
 CONFIG_HPET_TIMER=y
 CONFIG_HPET_EMULATE_RTC=y
 CONFIG_DMI=y
@@ -364,6 +383,8 @@ CONFIG_PERF_EVENTS_INTEL_UNCORE=y
 CONFIG_PERF_EVENTS_INTEL_RAPL=m
 CONFIG_PERF_EVENTS_INTEL_CSTATE=m
 CONFIG_PERF_EVENTS_AMD_POWER=m
+# end of Performance monitoring
+
 # CONFIG_X86_LEGACY_VM86 is not set
 CONFIG_X86_16BIT=y
 CONFIG_X86_ESPFIX32=y
@@ -429,6 +450,8 @@ CONFIG_HOTPLUG_CPU=y
 # CONFIG_COMPAT_VDSO is not set
 # CONFIG_CMDLINE_BOOL is not set
 CONFIG_MODIFY_LDT_SYSCALL=y
+# end of Processor type and features
+
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
 CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
@@ -553,6 +576,7 @@ CONFIG_X86_P4_CLOCKMOD=m
 # shared options
 #
 CONFIG_X86_SPEEDSTEP_LIB=m
+# end of CPU Frequency scaling
 
 #
 # CPU Idle
@@ -561,7 +585,10 @@ CONFIG_CPU_IDLE=y
 CONFIG_CPU_IDLE_GOV_LADDER=y
 CONFIG_CPU_IDLE_GOV_MENU=y
 CONFIG_CPU_IDLE_GOV_TEO=y
+# end of CPU Idle
+
 CONFIG_INTEL_IDLE=y
+# end of Power management and ACPI options
 
 #
 # Bus options (PCI etc.)
@@ -583,13 +610,15 @@ CONFIG_ISA_DMA_API=y
 # CONFIG_GEOS is not set
 CONFIG_AMD_NB=y
 # CONFIG_X86_SYSFB is not set
+# end of Bus options (PCI etc.)
 
 #
 # Binary Emulations
 #
 CONFIG_COMPAT_32=y
+# end of Binary Emulations
+
 CONFIG_HAVE_ATOMIC_IOMAP=y
-CONFIG_HAVE_GENERIC_GUP=y
 
 #
 # Firmware Drivers
@@ -622,6 +651,8 @@ CONFIG_EFI_CAPSULE_QUIRK_QUARK_CSH=y
 CONFIG_EFI_TEST=m
 CONFIG_APPLE_PROPERTIES=y
 CONFIG_RESET_ATTACK_MITIGATION=y
+# end of EFI (Extensible Firmware Interface) Support
+
 CONFIG_UEFI_CPER=y
 CONFIG_UEFI_CPER_X86=y
 CONFIG_EFI_DEV_PATH_PARSER=y
@@ -630,6 +661,9 @@ CONFIG_EFI_EARLYCON=y
 #
 # Tegra firmware driver
 #
+# end of Tegra firmware driver
+# end of Firmware Drivers
+
 CONFIG_HAVE_KVM=y
 CONFIG_HAVE_KVM_IRQCHIP=y
 CONFIG_HAVE_KVM_IRQFD=y
@@ -642,6 +676,7 @@ CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
 CONFIG_KVM_VFIO=y
 CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
 CONFIG_HAVE_KVM_IRQ_BYPASS=y
+CONFIG_HAVE_KVM_NO_POLL=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_KVM=m
 CONFIG_KVM_INTEL=m
@@ -681,6 +716,7 @@ CONFIG_HAVE_DMA_CONTIGUOUS=y
 CONFIG_GENERIC_SMP_IDLE_THREAD=y
 CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
 CONFIG_ARCH_HAS_SET_MEMORY=y
+CONFIG_ARCH_HAS_SET_DIRECT_MAP=y
 CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y
 CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y
 CONFIG_ARCH_32BIT_OFF_T=y
@@ -698,7 +734,6 @@ CONFIG_HAVE_PERF_USER_STACK_DUMP=y
 CONFIG_HAVE_ARCH_JUMP_LABEL=y
 CONFIG_HAVE_ARCH_JUMP_LABEL_RELATIVE=y
 CONFIG_HAVE_RCU_TABLE_FREE=y
-CONFIG_HAVE_RCU_TABLE_INVALIDATE=y
 CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
 CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
 CONFIG_HAVE_CMPXCHG_LOCAL=y
@@ -716,6 +751,7 @@ CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
 CONFIG_HAVE_MOVE_PMD=y
 CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
 CONFIG_HAVE_ARCH_HUGE_VMAP=y
+CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
 CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
 CONFIG_MODULES_USE_ELF_REL=y
 CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
@@ -736,15 +772,28 @@ CONFIG_ARCH_HAS_REFCOUNT=y
 CONFIG_REFCOUNT_FULL=y
 CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y
 CONFIG_ARCH_USE_MEMREMAP_PROT=y
+# CONFIG_LOCK_EVENT_COUNTS is not set
 
 #
 # GCOV-based kernel profiling
 #
 # CONFIG_GCOV_KERNEL is not set
 CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
+# end of GCOV-based kernel profiling
+
 CONFIG_PLUGIN_HOSTCC="g++"
 CONFIG_HAVE_GCC_PLUGINS=y
-# CONFIG_GCC_PLUGINS is not set
+CONFIG_GCC_PLUGINS=y
+
+#
+# GCC plugins
+#
+# CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set
+# CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
+# CONFIG_GCC_PLUGIN_RANDSTRUCT is not set
+# end of GCC plugins
+# end of General architecture-dependent options
+
 CONFIG_RT_MUTEXES=y
 CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
@@ -758,7 +807,6 @@ CONFIG_MODVERSIONS=y
 # CONFIG_TRIM_UNUSED_KSYMS is not set
 CONFIG_MODULES_TREE_LOOKUP=y
 CONFIG_BLOCK=y
-CONFIG_LBDAF=y
 CONFIG_BLK_SCSI_REQUEST=y
 CONFIG_BLK_DEV_BSG=y
 CONFIG_BLK_DEV_BSGLIB=y
@@ -798,6 +846,8 @@ CONFIG_LDM_PARTITION=y
 CONFIG_EFI_PARTITION=y
 # CONFIG_SYSV68_PARTITION is not set
 CONFIG_CMDLINE_PARTITION=y
+# end of Partition Types
+
 CONFIG_BLK_MQ_PCI=y
 CONFIG_BLK_MQ_VIRTIO=y
 CONFIG_BLK_MQ_RDMA=y
@@ -810,6 +860,9 @@ CONFIG_MQ_IOSCHED_DEADLINE=y
 CONFIG_MQ_IOSCHED_KYBER=y
 CONFIG_IOSCHED_BFQ=y
 CONFIG_BFQ_GROUP_IOSCHED=y
+# CONFIG_BFQ_CGROUP_DEBUG is not set
+# end of IO Schedulers
+
 CONFIG_PREEMPT_NOTIFIERS=y
 CONFIG_PADATA=y
 CONFIG_ASN1=y
@@ -834,6 +887,7 @@ CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 CONFIG_BINFMT_SCRIPT=y
 CONFIG_BINFMT_MISC=m
 CONFIG_COREDUMP=y
+# end of Executable file formats
 
 #
 # Memory Management options
@@ -845,7 +899,7 @@ CONFIG_SPARSEMEM=y
 CONFIG_HAVE_MEMORY_PRESENT=y
 CONFIG_SPARSEMEM_STATIC=y
 CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
-CONFIG_ARCH_DISCARD_MEMBLOCK=y
+CONFIG_HAVE_FAST_GUP=y
 CONFIG_MEMORY_ISOLATION=y
 CONFIG_MEMORY_HOTPLUG=y
 CONFIG_MEMORY_HOTPLUG_SPARSE=y
@@ -856,6 +910,7 @@ CONFIG_MEMORY_BALLOON=y
 CONFIG_BALLOON_COMPACTION=y
 CONFIG_COMPACTION=y
 CONFIG_MIGRATION=y
+CONFIG_CONTIG_ALLOC=y
 CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_BOUNCE=y
 CONFIG_VIRT_TO_BUS=y
@@ -881,7 +936,10 @@ CONFIG_IDLE_PAGE_TRACKING=y
 CONFIG_FRAME_VECTOR=y
 # CONFIG_PERCPU_STATS is not set
 # CONFIG_GUP_BENCHMARK is not set
+CONFIG_GUP_GET_PTE_LOW_HIGH=y
 CONFIG_ARCH_HAS_PTE_SPECIAL=y
+# end of Memory Management options
+
 CONFIG_NET=y
 CONFIG_NET_INGRESS=y
 CONFIG_NET_EGRESS=y
@@ -940,9 +998,6 @@ CONFIG_INET_ESP_OFFLOAD=m
 CONFIG_INET_IPCOMP=m
 CONFIG_INET_XFRM_TUNNEL=m
 CONFIG_INET_TUNNEL=m
-CONFIG_INET_XFRM_MODE_TRANSPORT=m
-CONFIG_INET_XFRM_MODE_TUNNEL=m
-CONFIG_INET_XFRM_MODE_BEET=m
 CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 CONFIG_INET_UDP_DIAG=y
@@ -980,10 +1035,6 @@ CONFIG_IPV6_MIP6=m
 CONFIG_IPV6_ILA=m
 CONFIG_INET6_XFRM_TUNNEL=m
 CONFIG_INET6_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-CONFIG_INET6_XFRM_MODE_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_BEET=m
-CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
 CONFIG_IPV6_VTI=m
 CONFIG_IPV6_SIT=m
 CONFIG_IPV6_SIT_6RD=y
@@ -1048,7 +1099,6 @@ CONFIG_NF_CT_NETLINK_TIMEOUT=m
 CONFIG_NF_CT_NETLINK_HELPER=m
 CONFIG_NETFILTER_NETLINK_GLUE_CT=y
 CONFIG_NF_NAT=m
-CONFIG_NF_NAT_NEEDED=y
 CONFIG_NF_NAT_AMANDA=m
 CONFIG_NF_NAT_FTP=m
 CONFIG_NF_NAT_IRC=m
@@ -1085,6 +1135,7 @@ CONFIG_NFT_XFRM=m
 CONFIG_NFT_SOCKET=m
 CONFIG_NFT_OSF=m
 CONFIG_NFT_TPROXY=m
+# CONFIG_NFT_SYNPROXY is not set
 CONFIG_NF_DUP_NETDEV=m
 CONFIG_NFT_DUP_NETDEV=m
 CONFIG_NFT_FWD_NETDEV=m
@@ -1123,6 +1174,7 @@ CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
 CONFIG_NETFILTER_XT_TARGET_RATEEST=m
 CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
+CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m
 CONFIG_NETFILTER_XT_TARGET_TEE=m
 CONFIG_NETFILTER_XT_TARGET_TPROXY=m
 CONFIG_NETFILTER_XT_TARGET_TRACE=m
@@ -1179,6 +1231,8 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m
 CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
 CONFIG_NETFILTER_XT_MATCH_TIME=m
 CONFIG_NETFILTER_XT_MATCH_U32=m
+# end of Core Netfilter Configuration
+
 CONFIG_IP_SET=m
 CONFIG_IP_SET_MAX=256
 CONFIG_IP_SET_BITMAP_IP=m
@@ -1253,7 +1307,6 @@ CONFIG_NF_DEFRAG_IPV4=m
 CONFIG_NF_SOCKET_IPV4=m
 CONFIG_NF_TPROXY_IPV4=m
 CONFIG_NF_TABLES_IPV4=y
-CONFIG_NFT_CHAIN_ROUTE_IPV4=m
 CONFIG_NFT_REJECT_IPV4=m
 CONFIG_NFT_DUP_IPV4=m
 CONFIG_NFT_FIB_IPV4=m
@@ -1287,6 +1340,7 @@ CONFIG_IP_NF_RAW=m
 CONFIG_IP_NF_ARPTABLES=m
 CONFIG_IP_NF_ARPFILTER=m
 CONFIG_IP_NF_ARP_MANGLE=m
+# end of IP: Netfilter Configuration
 
 #
 # IPv6: Netfilter Configuration
@@ -1294,7 +1348,6 @@ CONFIG_IP_NF_ARP_MANGLE=m
 CONFIG_NF_SOCKET_IPV6=m
 CONFIG_NF_TPROXY_IPV6=m
 CONFIG_NF_TABLES_IPV6=y
-CONFIG_NFT_CHAIN_ROUTE_IPV6=m
 CONFIG_NFT_REJECT_IPV6=m
 CONFIG_NFT_DUP_IPV6=m
 CONFIG_NFT_FIB_IPV6=m
@@ -1323,8 +1376,11 @@ CONFIG_IP6_NF_RAW=m
 CONFIG_IP6_NF_NAT=m
 CONFIG_IP6_NF_TARGET_MASQUERADE=m
 CONFIG_IP6_NF_TARGET_NPT=m
+# end of IPv6: Netfilter Configuration
+
 CONFIG_NF_DEFRAG_IPV6=m
 # CONFIG_NF_TABLES_BRIDGE is not set
+# CONFIG_NF_CONNTRACK_BRIDGE is not set
 CONFIG_BRIDGE_NF_EBTABLES=m
 CONFIG_BRIDGE_EBT_BROUTE=m
 CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -1357,11 +1413,14 @@ CONFIG_INET_DCCP_DIAG=m
 CONFIG_IP_DCCP_CCID3=y
 # CONFIG_IP_DCCP_CCID3_DEBUG is not set
 CONFIG_IP_DCCP_TFRC_LIB=y
+# end of DCCP CCIDs Configuration
 
 #
 # DCCP Kernel Hacking
 #
 # CONFIG_IP_DCCP_DEBUG is not set
+# end of DCCP Kernel Hacking
+
 CONFIG_IP_SCTP=m
 # CONFIG_SCTP_DBG_OBJCNT is not set
 # CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5 is not set
@@ -1398,16 +1457,21 @@ CONFIG_BRIDGE_IGMP_SNOOPING=y
 CONFIG_BRIDGE_VLAN_FILTERING=y
 CONFIG_HAVE_NET_DSA=y
 CONFIG_NET_DSA=m
-CONFIG_NET_DSA_LEGACY=y
-CONFIG_NET_DSA_TAG_BRCM=y
-CONFIG_NET_DSA_TAG_BRCM_PREPEND=y
-CONFIG_NET_DSA_TAG_DSA=y
-CONFIG_NET_DSA_TAG_EDSA=y
-CONFIG_NET_DSA_TAG_GSWIP=y
-CONFIG_NET_DSA_TAG_KSZ=y
-CONFIG_NET_DSA_TAG_KSZ9477=y
-CONFIG_NET_DSA_TAG_TRAILER=y
-CONFIG_NET_DSA_TAG_QCA=y
+CONFIG_NET_DSA_TAG_8021Q=m
+CONFIG_NET_DSA_TAG_BRCM_COMMON=m
+CONFIG_NET_DSA_TAG_BRCM=m
+CONFIG_NET_DSA_TAG_BRCM_PREPEND=m
+CONFIG_NET_DSA_TAG_GSWIP=m
+CONFIG_NET_DSA_TAG_DSA=m
+CONFIG_NET_DSA_TAG_EDSA=m
+CONFIG_NET_DSA_TAG_MTK=m
+CONFIG_NET_DSA_TAG_KSZ_COMMON=m
+CONFIG_NET_DSA_TAG_KSZ=m
+CONFIG_NET_DSA_TAG_KSZ9477=m
+CONFIG_NET_DSA_TAG_QCA=m
+CONFIG_NET_DSA_TAG_LAN9303=m
+CONFIG_NET_DSA_TAG_SJA1105=m
+CONFIG_NET_DSA_TAG_TRAILER=m
 CONFIG_VLAN_8021Q=m
 CONFIG_VLAN_8021Q_GVRP=y
 CONFIG_VLAN_8021Q_MVRP=y
@@ -1494,16 +1558,18 @@ CONFIG_NET_ACT_PEDIT=m
 CONFIG_NET_ACT_SIMP=m
 CONFIG_NET_ACT_SKBEDIT=m
 CONFIG_NET_ACT_CSUM=m
+# CONFIG_NET_ACT_MPLS is not set
 CONFIG_NET_ACT_VLAN=m
 CONFIG_NET_ACT_BPF=m
 CONFIG_NET_ACT_CONNMARK=m
+# CONFIG_NET_ACT_CTINFO is not set
 CONFIG_NET_ACT_SKBMOD=m
 CONFIG_NET_ACT_IFE=m
 CONFIG_NET_ACT_TUNNEL_KEY=m
+# CONFIG_NET_ACT_CT is not set
 CONFIG_NET_IFE_SKBMARK=m
 CONFIG_NET_IFE_SKBPRIO=m
 CONFIG_NET_IFE_SKBTCINDEX=m
-CONFIG_NET_CLS_IND=y
 CONFIG_NET_SCH_FIFO=y
 CONFIG_DCB=y
 CONFIG_DNS_RESOLVER=y
@@ -1515,6 +1581,7 @@ CONFIG_BATMAN_ADV_NC=y
 CONFIG_BATMAN_ADV_MCAST=y
 CONFIG_BATMAN_ADV_DEBUGFS=y
 # CONFIG_BATMAN_ADV_DEBUG is not set
+CONFIG_BATMAN_ADV_SYSFS=y
 CONFIG_OPENVSWITCH=m
 CONFIG_OPENVSWITCH_GRE=m
 CONFIG_OPENVSWITCH_VXLAN=m
@@ -1550,6 +1617,9 @@ CONFIG_NET_FLOW_LIMIT=y
 # Network testing
 #
 # CONFIG_NET_PKTGEN is not set
+# end of Network testing
+# end of Networking options
+
 # CONFIG_HAMRADIO is not set
 CONFIG_CAN=m
 CONFIG_CAN_RAW=m
@@ -1583,6 +1653,7 @@ CONFIG_CAN_SOFTING=m
 #
 # CONFIG_CAN_HI311X is not set
 CONFIG_CAN_MCP251X=m
+# end of CAN SPI interfaces
 
 #
 # CAN USB interfaces
@@ -1595,7 +1666,11 @@ CONFIG_CAN_KVASER_USB=m
 # CONFIG_CAN_MCBA_USB is not set
 CONFIG_CAN_PEAK_USB=m
 CONFIG_CAN_UCAN=m
+# end of CAN USB interfaces
+
 CONFIG_CAN_DEBUG_DEVICES=y
+# end of CAN Device Drivers
+
 CONFIG_BT=m
 CONFIG_BT_BREDR=y
 CONFIG_BT_RFCOMM=m
@@ -1620,6 +1695,7 @@ CONFIG_BT_QCA=m
 CONFIG_BT_HCIBTUSB=m
 CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
 CONFIG_BT_HCIBTUSB_BCM=y
+# CONFIG_BT_HCIBTUSB_MTK is not set
 CONFIG_BT_HCIBTUSB_RTL=y
 CONFIG_BT_HCIBTSDIO=m
 CONFIG_BT_HCIUART=m
@@ -1643,8 +1719,11 @@ CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
 CONFIG_BT_ATH3K=m
 CONFIG_BT_WILINK=m
+CONFIG_BT_MTKSDIO=m
 CONFIG_BT_MTKUART=m
 CONFIG_BT_HCIRSI=m
+# end of Bluetooth device drivers
+
 CONFIG_AF_RXRPC=m
 # CONFIG_AF_RXRPC_IPV6 is not set
 # CONFIG_AF_RXRPC_INJECT_LOSS is not set
@@ -1740,6 +1819,8 @@ CONFIG_NFC_NXP_NCI_I2C=m
 CONFIG_NFC_S3FWRN5=m
 CONFIG_NFC_S3FWRN5_I2C=m
 CONFIG_NFC_ST95HF=m
+# end of Near Field Communication (NFC) devices
+
 CONFIG_PSAMPLE=m
 CONFIG_NET_IFE=m
 CONFIG_LWTUNNEL=y
@@ -1805,6 +1886,7 @@ CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
 #
 # Cadence PCIe controllers support
 #
+# end of Cadence PCIe controllers support
 
 #
 # DesignWare PCI Core Support
@@ -1813,16 +1895,21 @@ CONFIG_PCIE_DW=y
 CONFIG_PCIE_DW_HOST=y
 # CONFIG_PCIE_DW_PLAT_HOST is not set
 CONFIG_PCI_MESON=y
+# end of DesignWare PCI Core Support
+# end of PCI controller drivers
 
 #
 # PCI Endpoint
 #
 # CONFIG_PCI_ENDPOINT is not set
+# end of PCI Endpoint
 
 #
 # PCI switch controller drivers
 #
 CONFIG_PCI_SW_SWITCHTEC=m
+# end of PCI switch controller drivers
+
 CONFIG_PCCARD=m
 # CONFIG_PCMCIA is not set
 CONFIG_CARDBUS=y
@@ -1854,6 +1941,7 @@ CONFIG_RAPIDIO_CPS_XX=m
 CONFIG_RAPIDIO_TSI568=m
 CONFIG_RAPIDIO_CPS_GEN2=m
 CONFIG_RAPIDIO_RXS_GEN3=m
+# end of RapidIO Switch drivers
 
 #
 # Generic Driver Options
@@ -1868,9 +1956,13 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 # Firmware loader
 #
 CONFIG_FW_LOADER=y
+CONFIG_FW_LOADER_PAGED_BUF=y
 CONFIG_EXTRA_FIRMWARE=""
 CONFIG_FW_LOADER_USER_HELPER=y
 # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
+# CONFIG_FW_LOADER_COMPRESS is not set
+# end of Firmware loader
+
 CONFIG_WANT_DEV_COREDUMP=y
 CONFIG_ALLOW_DEV_COREDUMP=y
 CONFIG_DEV_COREDUMP=y
@@ -1889,10 +1981,13 @@ CONFIG_REGMAP_MMIO=y
 CONFIG_REGMAP_IRQ=y
 CONFIG_DMA_SHARED_BUFFER=y
 # CONFIG_DMA_FENCE_TRACE is not set
+# end of Generic Driver Options
 
 #
 # Bus devices
 #
+# end of Bus devices
+
 CONFIG_CONNECTOR=y
 CONFIG_PROC_EVENTS=y
 CONFIG_GNSS=m
@@ -1912,6 +2007,7 @@ CONFIG_MTD_REDBOOT_PARTS=m
 CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
 # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
 # CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
+# end of Partition parsers
 
 #
 # User Modules And Translation Layers
@@ -1942,6 +2038,7 @@ CONFIG_MTD_CFI_I2=y
 # CONFIG_MTD_RAM is not set
 # CONFIG_MTD_ROM is not set
 # CONFIG_MTD_ABSENT is not set
+# end of RAM/ROM/Flash chip drivers
 
 #
 # Mapping drivers for chip access
@@ -1949,6 +2046,7 @@ CONFIG_MTD_CFI_I2=y
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
 # CONFIG_MTD_INTEL_VR_NOR is not set
 # CONFIG_MTD_PLATRAM is not set
+# end of Mapping drivers for chip access
 
 #
 # Self-contained MTD device drivers
@@ -1968,17 +2066,47 @@ CONFIG_MTD_PHRAM=m
 CONFIG_MTD_DOCG3=m
 CONFIG_BCH_CONST_M=14
 CONFIG_BCH_CONST_T=4
+# end of Self-contained MTD device drivers
+
 CONFIG_MTD_NAND_CORE=m
 # CONFIG_MTD_ONENAND is not set
-# CONFIG_MTD_NAND is not set
+CONFIG_MTD_NAND_ECC_SW_HAMMING=m
+# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
+CONFIG_MTD_RAW_NAND=m
+CONFIG_MTD_NAND_ECC_SW_BCH=y
+
+#
+# Raw/parallel NAND flash controllers
+#
+CONFIG_MTD_NAND_DENALI=m
+CONFIG_MTD_NAND_DENALI_PCI=m
+CONFIG_MTD_NAND_CAFE=m
+CONFIG_MTD_NAND_CS553X=m
+CONFIG_MTD_NAND_GPIO=m
+CONFIG_MTD_NAND_PLATFORM=m
+
+#
+# Misc
+#
+CONFIG_MTD_SM_COMMON=m
+CONFIG_MTD_NAND_NANDSIM=m
+CONFIG_MTD_NAND_RICOH=m
+CONFIG_MTD_NAND_DISKONCHIP=m
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED=y
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0x0
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_HIGH=y
+CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE=y
 CONFIG_MTD_SPI_NAND=m
 
 #
 # LPDDR & LPDDR2 PCM memory drivers
 #
 # CONFIG_MTD_LPDDR is not set
+# end of LPDDR & LPDDR2 PCM memory drivers
+
 # CONFIG_MTD_SPI_NOR is not set
 # CONFIG_MTD_UBI is not set
+# CONFIG_MTD_HYPERBUS is not set
 # CONFIG_OF is not set
 CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
 CONFIG_PARPORT=m
@@ -2041,6 +2169,7 @@ CONFIG_NVME_TARGET_RDMA=m
 CONFIG_NVME_TARGET_FC=m
 CONFIG_NVME_TARGET_FCLOOP=m
 CONFIG_NVME_TARGET_TCP=m
+# end of NVME Support
 
 #
 # Misc devices
@@ -2071,10 +2200,10 @@ CONFIG_HMC6352=m
 CONFIG_DS1682=m
 CONFIG_VMWARE_BALLOON=m
 CONFIG_PCH_PHUB=m
-CONFIG_USB_SWITCH_FSA9480=m
 CONFIG_LATTICE_ECP3_CONFIG=m
 CONFIG_SRAM=y
 # CONFIG_PCI_ENDPOINT_TEST is not set
+# CONFIG_XILINX_SDFEC is not set
 CONFIG_MISC_RTSX=m
 CONFIG_PVPANIC=m
 CONFIG_C2PORT=m
@@ -2091,6 +2220,8 @@ CONFIG_EEPROM_93CX6=m
 CONFIG_EEPROM_93XX46=m
 CONFIG_EEPROM_IDT_89HPESX=m
 CONFIG_EEPROM_EE1004=m
+# end of EEPROM support
+
 CONFIG_CB710_CORE=m
 # CONFIG_CB710_DEBUG is not set
 CONFIG_CB710_DEBUG_ASSUMPTIONS=y
@@ -2099,6 +2230,8 @@ CONFIG_CB710_DEBUG_ASSUMPTIONS=y
 # Texas Instruments shared transport line discipline
 #
 CONFIG_TI_ST=m
+# end of Texas Instruments shared transport line discipline
+
 CONFIG_SENSORS_LIS3_I2C=m
 CONFIG_ALTERA_STAPL=m
 CONFIG_INTEL_MEI=m
@@ -2145,11 +2278,15 @@ CONFIG_VOP_BUS=m
 #
 CONFIG_VOP=m
 CONFIG_VHOST_RING=m
+# end of Intel MIC & related support
+
 CONFIG_ECHO=m
 CONFIG_MISC_ALCOR_PCI=m
 CONFIG_MISC_RTSX_PCI=m
 CONFIG_MISC_RTSX_USB=m
 CONFIG_HABANA_AI=m
+# end of Misc devices
+
 CONFIG_HAVE_IDE=y
 # CONFIG_IDE is not set
 
@@ -2168,7 +2305,6 @@ CONFIG_SCSI_PROC_FS=y
 #
 CONFIG_BLK_DEV_SD=m
 CONFIG_CHR_DEV_ST=m
-CONFIG_CHR_DEV_OSST=m
 CONFIG_BLK_DEV_SR=m
 CONFIG_BLK_DEV_SR_VENDOR=y
 CONFIG_CHR_DEV_SG=m
@@ -2189,6 +2325,8 @@ CONFIG_SCSI_SAS_LIBSAS=m
 CONFIG_SCSI_SAS_ATA=y
 CONFIG_SCSI_SAS_HOST_SMP=y
 CONFIG_SCSI_SRP_ATTRS=m
+# end of SCSI Transports
+
 CONFIG_SCSI_LOWLEVEL=y
 CONFIG_ISCSI_TCP=m
 CONFIG_ISCSI_BOOT_SYSFS=m
@@ -2256,6 +2394,7 @@ CONFIG_FCOE_FNIC=m
 CONFIG_SCSI_SNIC=m
 # CONFIG_SCSI_SNIC_DEBUG_FS is not set
 CONFIG_SCSI_DMX3191D=m
+# CONFIG_SCSI_FDOMAIN_PCI is not set
 CONFIG_SCSI_GDTH=m
 CONFIG_SCSI_ISCI=m
 CONFIG_SCSI_IPS=m
@@ -2298,6 +2437,8 @@ CONFIG_SCSI_DH_RDAC=m
 CONFIG_SCSI_DH_HP_SW=m
 CONFIG_SCSI_DH_EMC=m
 CONFIG_SCSI_DH_ALUA=m
+# end of SCSI device support
+
 CONFIG_ATA=m
 CONFIG_ATA_VERBOSE_ERROR=y
 CONFIG_ATA_ACPI=y
@@ -2436,6 +2577,7 @@ CONFIG_DM_MULTIPATH=m
 CONFIG_DM_MULTIPATH_QL=m
 CONFIG_DM_MULTIPATH_ST=m
 CONFIG_DM_DELAY=m
+CONFIG_DM_DUST=m
 CONFIG_DM_UEVENT=y
 CONFIG_DM_FLAKEY=m
 CONFIG_DM_VERITY=m
@@ -2471,6 +2613,8 @@ CONFIG_FIREWIRE_OHCI=m
 CONFIG_FIREWIRE_SBP2=m
 CONFIG_FIREWIRE_NET=m
 CONFIG_FIREWIRE_NOSY=m
+# end of IEEE 1394 (FireWire) support
+
 CONFIG_MACINTOSH_DRIVERS=y
 CONFIG_MAC_EMUMOUSEBTN=m
 CONFIG_NETDEVICES=y
@@ -2574,10 +2718,14 @@ CONFIG_NET_DSA_MICROCHIP_KSZ9477_SPI=m
 CONFIG_NET_DSA_MV88E6XXX=m
 CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y
 # CONFIG_NET_DSA_MV88E6XXX_PTP is not set
+CONFIG_NET_DSA_SJA1105=m
+# CONFIG_NET_DSA_SJA1105_PTP is not set
 CONFIG_NET_DSA_QCA8K=m
 # CONFIG_NET_DSA_REALTEK_SMI is not set
 # CONFIG_NET_DSA_SMSC_LAN9303_I2C is not set
 # CONFIG_NET_DSA_SMSC_LAN9303_MDIO is not set
+# end of Distributed Switch Architecture drivers
+
 CONFIG_ETHERNET=y
 CONFIG_MDIO=m
 CONFIG_NET_VENDOR_3COM=y
@@ -2674,6 +2822,8 @@ CONFIG_BE2NET_BE3=y
 CONFIG_BE2NET_LANCER=y
 CONFIG_BE2NET_SKYHAWK=y
 CONFIG_NET_VENDOR_EZCHIP=y
+CONFIG_NET_VENDOR_GOOGLE=y
+# CONFIG_GVE is not set
 CONFIG_NET_VENDOR_HP=y
 CONFIG_HP100=m
 CONFIG_NET_VENDOR_HUAWEI=y
@@ -2829,6 +2979,7 @@ CONFIG_SMSC9420=m
 CONFIG_NET_VENDOR_SOCIONEXT=y
 CONFIG_NET_VENDOR_STMICRO=y
 CONFIG_STMMAC_ETH=m
+# CONFIG_STMMAC_SELFTESTS is not set
 CONFIG_STMMAC_PLATFORM=m
 CONFIG_DWMAC_GENERIC=m
 CONFIG_STMMAC_PCI=m
@@ -2843,7 +2994,6 @@ CONFIG_NET_VENDOR_TEHUTI=y
 CONFIG_TEHUTI=m
 CONFIG_NET_VENDOR_TI=y
 # CONFIG_TI_CPSW_PHY_SEL is not set
-CONFIG_TI_CPSW_ALE=m
 CONFIG_TLAN=m
 CONFIG_NET_VENDOR_VIA=y
 CONFIG_VIA_RHINE=m
@@ -2856,6 +3006,9 @@ CONFIG_WIZNET_W5300=m
 # CONFIG_WIZNET_BUS_INDIRECT is not set
 CONFIG_WIZNET_BUS_ANY=y
 CONFIG_WIZNET_W5100_SPI=m
+CONFIG_NET_VENDOR_XILINX=y
+# CONFIG_XILINX_AXI_EMAC is not set
+CONFIG_XILINX_LL_TEMAC=m
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
 CONFIG_NET_SB1000=m
@@ -2901,6 +3054,7 @@ CONFIG_MICROCHIP_PHY=m
 # CONFIG_MICROCHIP_T1_PHY is not set
 CONFIG_MICROSEMI_PHY=m
 CONFIG_NATIONAL_PHY=m
+# CONFIG_NXP_TJA11XX_PHY is not set
 CONFIG_QSEMI_PHY=m
 CONFIG_REALTEK_PHY=m
 CONFIG_RENESAS_PHY=m
@@ -3090,6 +3244,8 @@ CONFIG_IWL3945=m
 # iwl3945 / iwl4965 Debugging Options
 #
 # CONFIG_IWLEGACY_DEBUG is not set
+# end of iwl3945 / iwl4965 Debugging Options
+
 CONFIG_IWLWIFI=m
 CONFIG_IWLWIFI_LEDS=y
 CONFIG_IWLDVM=m
@@ -3102,6 +3258,8 @@ CONFIG_IWLWIFI_PCIE_RTPM=y
 # Debugging Options
 #
 # CONFIG_IWLWIFI_DEBUG is not set
+# end of Debugging Options
+
 CONFIG_WLAN_VENDOR_INTERSIL=y
 CONFIG_HOSTAP=m
 CONFIG_HOSTAP_FIRMWARE=y
@@ -3152,6 +3310,7 @@ CONFIG_MT76x2_COMMON=m
 # CONFIG_MT76x2E is not set
 CONFIG_MT76x2U=m
 CONFIG_MT7603E=m
+CONFIG_MT7615E=m
 CONFIG_WLAN_VENDOR_RALINK=y
 CONFIG_RT2X00=m
 CONFIG_RT2400PCI=m
@@ -3204,6 +3363,13 @@ CONFIG_RTL8723_COMMON=m
 CONFIG_RTLBTCOEXIST=m
 CONFIG_RTL8XXXU=m
 # CONFIG_RTL8XXXU_UNTESTED is not set
+CONFIG_RTW88=m
+CONFIG_RTW88_CORE=m
+CONFIG_RTW88_PCI=m
+CONFIG_RTW88_8822BE=y
+CONFIG_RTW88_8822CE=y
+# CONFIG_RTW88_DEBUG is not set
+# CONFIG_RTW88_DEBUGFS is not set
 CONFIG_WLAN_VENDOR_RSI=y
 CONFIG_RSI_91X=m
 CONFIG_RSI_DEBUGFS=y
@@ -3240,6 +3406,8 @@ CONFIG_VIRT_WIFI=m
 CONFIG_WIMAX_I2400M=m
 CONFIG_WIMAX_I2400M_USB=m
 CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
+# end of WiMAX Wireless Broadband devices
+
 # CONFIG_WAN is not set
 CONFIG_IEEE802154_DRIVERS=m
 CONFIG_IEEE802154_FAKELB=m
@@ -3290,7 +3458,9 @@ CONFIG_INPUT_KEYBOARD=y
 CONFIG_KEYBOARD_ADC=m
 CONFIG_KEYBOARD_ADP5588=m
 CONFIG_KEYBOARD_ADP5589=m
+# CONFIG_KEYBOARD_APPLESPI is not set
 CONFIG_KEYBOARD_ATKBD=y
+CONFIG_KEYBOARD_QT1050=m
 CONFIG_KEYBOARD_QT1070=m
 CONFIG_KEYBOARD_QT2160=m
 # CONFIG_KEYBOARD_DLINK_DIR685 is not set
@@ -3355,8 +3525,8 @@ CONFIG_JOYSTICK_INTERACT=m
 CONFIG_JOYSTICK_SIDEWINDER=m
 CONFIG_JOYSTICK_TMDC=m
 CONFIG_JOYSTICK_IFORCE=m
-CONFIG_JOYSTICK_IFORCE_USB=y
-CONFIG_JOYSTICK_IFORCE_232=y
+CONFIG_JOYSTICK_IFORCE_USB=m
+CONFIG_JOYSTICK_IFORCE_232=m
 CONFIG_JOYSTICK_WARRIOR=m
 CONFIG_JOYSTICK_MAGELLAN=m
 CONFIG_JOYSTICK_SPACEORB=m
@@ -3481,6 +3651,7 @@ CONFIG_TOUCHSCREEN_TPS6507X=m
 CONFIG_TOUCHSCREEN_ZET6223=m
 CONFIG_TOUCHSCREEN_ZFORCE=m
 CONFIG_TOUCHSCREEN_ROHM_BU21023=m
+CONFIG_TOUCHSCREEN_IQS5XX=m
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_AD714X=m
 CONFIG_INPUT_AD714X_I2C=m
@@ -3497,6 +3668,7 @@ CONFIG_INPUT_APANEL=m
 CONFIG_INPUT_GP2A=m
 # CONFIG_INPUT_GPIO_BEEPER is not set
 CONFIG_INPUT_GPIO_DECODER=m
+CONFIG_INPUT_GPIO_VIBRA=m
 # CONFIG_INPUT_WISTRON_BTNS is not set
 CONFIG_INPUT_ATLAS_BTNS=m
 CONFIG_INPUT_ATI_REMOTE2=m
@@ -3558,7 +3730,6 @@ CONFIG_SERIO_RAW=m
 CONFIG_SERIO_ALTERA_PS2=m
 CONFIG_SERIO_PS2MULT=m
 CONFIG_SERIO_ARC_PS2=m
-CONFIG_SERIO_OLPC_APSP=m
 CONFIG_HYPERV_KEYBOARD=m
 CONFIG_SERIO_GPIO_PS2=m
 CONFIG_USERIO=m
@@ -3567,6 +3738,8 @@ CONFIG_GAMEPORT_NS558=m
 CONFIG_GAMEPORT_L4=m
 CONFIG_GAMEPORT_EMU10K1=m
 CONFIG_GAMEPORT_FM801=m
+# end of Hardware I/O ports
+# end of Input device support
 
 #
 # Character devices
@@ -3595,6 +3768,7 @@ CONFIG_N_HDLC=m
 CONFIG_N_GSM=m
 CONFIG_TRACE_ROUTER=m
 CONFIG_TRACE_SINK=m
+CONFIG_NULL_TTY=m
 CONFIG_LDISC_AUTOLOAD=y
 CONFIG_DEVMEM=y
 # CONFIG_DEVKMEM is not set
@@ -3651,6 +3825,9 @@ CONFIG_SERIAL_RP2=m
 CONFIG_SERIAL_RP2_NR_UARTS=32
 CONFIG_SERIAL_FSL_LPUART=m
 # CONFIG_SERIAL_MEN_Z135 is not set
+# end of Serial drivers
+
+CONFIG_SERIAL_MCTRL_GPIO=y
 CONFIG_SERIAL_DEV_BUS=m
 CONFIG_TTY_PRINTK=m
 CONFIG_TTY_PRINTK_LEVEL=6
@@ -3668,6 +3845,7 @@ CONFIG_IPMI_SI=m
 CONFIG_IPMI_SSIF=m
 CONFIG_IPMI_WATCHDOG=m
 CONFIG_IPMI_POWEROFF=m
+# CONFIG_IPMB_DEVICE_INTERFACE is not set
 CONFIG_HW_RANDOM=m
 CONFIG_HW_RANDOM_TIMERIOMEM=m
 CONFIG_HW_RANDOM_INTEL=m
@@ -3707,6 +3885,8 @@ CONFIG_TELCLOCK=m
 CONFIG_DEVPORT=y
 CONFIG_XILLYBUS=m
 CONFIG_XILLYBUS_PCIE=m
+# end of Character devices
+
 # CONFIG_RANDOM_TRUST_CPU is not set
 
 #
@@ -3728,6 +3908,8 @@ CONFIG_I2C_MUX_PCA9541=m
 CONFIG_I2C_MUX_PCA954x=m
 CONFIG_I2C_MUX_REG=m
 CONFIG_I2C_MUX_MLXCPLD=m
+# end of Multiplexer I2C Chip support
+
 CONFIG_I2C_HELPER_AUTO=y
 CONFIG_I2C_SMBUS=m
 CONFIG_I2C_ALGOBIT=m
@@ -3746,6 +3928,7 @@ CONFIG_I2C_ALI15X3=m
 CONFIG_I2C_AMD756=m
 CONFIG_I2C_AMD756_S4882=m
 CONFIG_I2C_AMD8111=m
+CONFIG_I2C_AMD_MP2=m
 CONFIG_I2C_I801=m
 CONFIG_I2C_ISCH=m
 CONFIG_I2C_ISMT=m
@@ -3800,12 +3983,16 @@ CONFIG_I2C_VIPERBOARD=m
 #
 # CONFIG_I2C_CROS_EC_TUNNEL is not set
 # CONFIG_SCx200_ACB is not set
+# end of I2C Hardware Bus support
+
 # CONFIG_I2C_STUB is not set
 CONFIG_I2C_SLAVE=y
 CONFIG_I2C_SLAVE_EEPROM=m
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
+# end of I2C support
+
 CONFIG_I3C=m
 CONFIG_CDNS_I3C_MASTER=m
 CONFIG_DW_I3C_MASTER=m
@@ -3886,6 +4073,8 @@ CONFIG_PTP_1588_CLOCK=y
 #
 CONFIG_PTP_1588_CLOCK_PCH=m
 CONFIG_PTP_1588_CLOCK_KVM=y
+# end of PTP clock support
+
 CONFIG_PINCTRL=y
 CONFIG_PINMUX=y
 CONFIG_PINCONF=y
@@ -3929,9 +4118,10 @@ CONFIG_GPIO_ICH=m
 CONFIG_GPIO_LYNXPOINT=y
 CONFIG_GPIO_MB86S7X=m
 CONFIG_GPIO_MENZ127=m
-CONFIG_GPIO_MOCKUP=m
 CONFIG_GPIO_VX855=m
+# CONFIG_GPIO_XILINX is not set
 CONFIG_GPIO_AMD_FCH=m
+# end of Memory mapped GPIO drivers
 
 #
 # Port-mapped I/O GPIO drivers
@@ -3942,6 +4132,7 @@ CONFIG_GPIO_SCH=m
 CONFIG_GPIO_SCH311X=m
 # CONFIG_GPIO_WINBOND is not set
 # CONFIG_GPIO_WS16C48 is not set
+# end of Port-mapped I/O GPIO drivers
 
 #
 # I2C GPIO expanders
@@ -3952,6 +4143,7 @@ CONFIG_GPIO_MAX732X=m
 CONFIG_GPIO_PCA953X=m
 CONFIG_GPIO_PCF857X=m
 CONFIG_GPIO_TPIC2810=m
+# end of I2C GPIO expanders
 
 #
 # MFD GPIO expanders
@@ -3972,6 +4164,7 @@ CONFIG_GPIO_TPS65086=m
 CONFIG_GPIO_TQMX86=m
 CONFIG_GPIO_UCB1400=m
 # CONFIG_GPIO_WM831X is not set
+# end of MFD GPIO expanders
 
 #
 # PCI GPIO expanders
@@ -3982,6 +4175,7 @@ CONFIG_GPIO_PCH=m
 CONFIG_GPIO_PCI_IDIO_16=m
 # CONFIG_GPIO_PCIE_IDIO_24 is not set
 CONFIG_GPIO_RDC321X=m
+# end of PCI GPIO expanders
 
 #
 # SPI GPIO expanders
@@ -3991,11 +4185,15 @@ CONFIG_GPIO_MAX7301=m
 CONFIG_GPIO_MC33880=m
 CONFIG_GPIO_PISOSR=m
 # CONFIG_GPIO_XRA1403 is not set
+# end of SPI GPIO expanders
 
 #
 # USB GPIO expanders
 #
 CONFIG_GPIO_VIPERBOARD=m
+# end of USB GPIO expanders
+
+CONFIG_GPIO_MOCKUP=m
 CONFIG_W1=m
 CONFIG_W1_CON=y
 
@@ -4007,6 +4205,7 @@ CONFIG_W1_MASTER_DS2490=m
 CONFIG_W1_MASTER_DS2482=m
 CONFIG_W1_MASTER_DS1WM=m
 CONFIG_W1_MASTER_GPIO=m
+# end of 1-wire Bus Masters
 
 #
 # 1-wire Slaves
@@ -4028,6 +4227,8 @@ CONFIG_W1_SLAVE_DS2780=m
 CONFIG_W1_SLAVE_DS2781=m
 CONFIG_W1_SLAVE_DS28E04=m
 CONFIG_W1_SLAVE_DS28E17=m
+# end of 1-wire Slaves
+
 CONFIG_POWER_AVS=y
 # CONFIG_POWER_RESET is not set
 CONFIG_POWER_SUPPLY=y
@@ -4064,7 +4265,7 @@ CONFIG_CHARGER_MAX8903=m
 CONFIG_CHARGER_LP8727=m
 CONFIG_CHARGER_GPIO=m
 CONFIG_CHARGER_MANAGER=y
-# CONFIG_CHARGER_LTC3651 is not set
+CONFIG_CHARGER_LT3651=m
 CONFIG_CHARGER_BQ2415X=m
 CONFIG_CHARGER_BQ24190=m
 CONFIG_CHARGER_BQ24257=m
@@ -4181,13 +4382,15 @@ CONFIG_SENSORS_NCT6775=m
 CONFIG_SENSORS_NCT7802=m
 CONFIG_SENSORS_NCT7904=m
 CONFIG_SENSORS_NPCM7XX=m
-# CONFIG_SENSORS_OCC_P8_I2C is not set
 CONFIG_SENSORS_PCF8591=m
 CONFIG_PMBUS=m
 CONFIG_SENSORS_PMBUS=m
 CONFIG_SENSORS_ADM1275=m
 CONFIG_SENSORS_IBM_CFFPS=m
 # CONFIG_SENSORS_IR35221 is not set
+CONFIG_SENSORS_IR38064=m
+# CONFIG_SENSORS_IRPS5401 is not set
+CONFIG_SENSORS_ISL68137=m
 CONFIG_SENSORS_LM25066=m
 CONFIG_SENSORS_LTC2978=m
 # CONFIG_SENSORS_LTC2978_REGULATOR is not set
@@ -4197,6 +4400,7 @@ CONFIG_SENSORS_MAX20751=m
 CONFIG_SENSORS_MAX31785=m
 CONFIG_SENSORS_MAX34440=m
 CONFIG_SENSORS_MAX8688=m
+# CONFIG_SENSORS_PXE1610 is not set
 # CONFIG_SENSORS_TPS40422 is not set
 CONFIG_SENSORS_TPS53679=m
 CONFIG_SENSORS_UCD9000=m
@@ -4287,14 +4491,24 @@ CONFIG_INTEL_SOC_DTS_IOSF_CORE=m
 CONFIG_INT340X_THERMAL=m
 CONFIG_ACPI_THERMAL_REL=m
 CONFIG_INT3406_THERMAL=m
+# end of ACPI INT340X thermal drivers
+
 CONFIG_INTEL_PCH_THERMAL=m
+# end of Intel thermal drivers
+
 CONFIG_GENERIC_ADC_THERMAL=m
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_CORE=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
 CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
+CONFIG_WATCHDOG_OPEN_TIMEOUT=0
 CONFIG_WATCHDOG_SYSFS=y
 
+#
+# Watchdog Pretimeout Governors
+#
+# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
+
 #
 # Watchdog Device Drivers
 #
@@ -4331,8 +4545,8 @@ CONFIG_ITCO_VENDOR_SUPPORT=y
 CONFIG_IT8712F_WDT=m
 CONFIG_IT87_WDT=m
 CONFIG_HP_WATCHDOG=m
-CONFIG_KEMPLD_WDT=m
 CONFIG_HPWDT_NMI_DECODING=y
+CONFIG_KEMPLD_WDT=m
 CONFIG_SC1200_WDT=m
 CONFIG_PC87413_WDT=m
 CONFIG_NV_TCO=m
@@ -4364,11 +4578,6 @@ CONFIG_WDTPCI=m
 # USB-based Watchdog Cards
 #
 CONFIG_USBPCWATCHDOG=m
-
-#
-# Watchdog Pretimeout Governors
-#
-# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
 CONFIG_SSB_POSSIBLE=y
 CONFIG_SSB=m
 CONFIG_SSB_SPROM=y
@@ -4410,9 +4619,11 @@ CONFIG_MFD_CROS_EC=m
 CONFIG_MFD_MADERA=m
 CONFIG_MFD_MADERA_I2C=m
 CONFIG_MFD_MADERA_SPI=m
+# CONFIG_MFD_CS47L15 is not set
 CONFIG_MFD_CS47L35=y
 CONFIG_MFD_CS47L85=y
 CONFIG_MFD_CS47L90=y
+# CONFIG_MFD_CS47L92 is not set
 # CONFIG_PMIC_DA903X is not set
 CONFIG_PMIC_DA9052=y
 CONFIG_MFD_DA9052_SPI=y
@@ -4507,6 +4718,8 @@ CONFIG_MFD_WM831X_SPI=y
 # CONFIG_MFD_WM8350_I2C is not set
 # CONFIG_MFD_WM8994 is not set
 # CONFIG_RAVE_SP_CORE is not set
+# end of Multifunction device drivers
+
 CONFIG_REGULATOR=y
 # CONFIG_REGULATOR_DEBUG is not set
 CONFIG_REGULATOR_FIXED_VOLTAGE=m
@@ -4556,6 +4769,7 @@ CONFIG_REGULATOR_PWM=m
 CONFIG_REGULATOR_QCOM_SPMI=m
 CONFIG_REGULATOR_RT5033=m
 CONFIG_REGULATOR_SKY81452=m
+# CONFIG_REGULATOR_SLG51000 is not set
 CONFIG_REGULATOR_TPS51632=m
 CONFIG_REGULATOR_TPS6105X=m
 CONFIG_REGULATOR_TPS62360=m
@@ -4749,6 +4963,7 @@ CONFIG_DVB_USB_DIBUSB_MC=m
 CONFIG_DVB_USB_DIB0700=m
 CONFIG_DVB_USB_UMT_010=m
 CONFIG_DVB_USB_CXUSB=m
+# CONFIG_DVB_USB_CXUSB_ANALOG is not set
 CONFIG_DVB_USB_M920X=m
 CONFIG_DVB_USB_DIGITV=m
 CONFIG_DVB_USB_VP7045=m
@@ -4920,6 +5135,7 @@ CONFIG_RADIO_WL1273=m
 # Texas Instruments WL128x FM driver (ST based)
 #
 CONFIG_RADIO_WL128X=m
+# end of Texas Instruments WL128x FM driver (ST based)
 
 #
 # Supported FireWire (IEEE 1394) Adapters
@@ -4954,18 +5170,24 @@ CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
 CONFIG_MEDIA_ATTACH=y
 CONFIG_VIDEO_IR_I2C=m
 
+#
+# I2C Encoders, decoders, sensors and other helper chips
+#
+
 #
 # Audio decoders, processors and mixers
 #
 CONFIG_VIDEO_TVAUDIO=m
 CONFIG_VIDEO_TDA7432=m
 CONFIG_VIDEO_TDA9840=m
+# CONFIG_VIDEO_TDA1997X is not set
 CONFIG_VIDEO_TEA6415C=m
 CONFIG_VIDEO_TEA6420=m
 CONFIG_VIDEO_MSP3400=m
 CONFIG_VIDEO_CS3308=m
 CONFIG_VIDEO_CS5345=m
 CONFIG_VIDEO_CS53L32A=m
+# CONFIG_VIDEO_TLV320AIC23B is not set
 CONFIG_VIDEO_UDA1342=m
 CONFIG_VIDEO_WM8775=m
 CONFIG_VIDEO_WM8739=m
@@ -4980,17 +5202,26 @@ CONFIG_VIDEO_SAA6588=m
 #
 # Video decoders
 #
-CONFIG_VIDEO_BT819=m
-CONFIG_VIDEO_BT856=m
-CONFIG_VIDEO_BT866=m
-CONFIG_VIDEO_KS0127=m
-CONFIG_VIDEO_SAA7110=m
+# CONFIG_VIDEO_ADV7180 is not set
+# CONFIG_VIDEO_ADV7183 is not set
+# CONFIG_VIDEO_ADV7604 is not set
+# CONFIG_VIDEO_ADV7842 is not set
+# CONFIG_VIDEO_BT819 is not set
+# CONFIG_VIDEO_BT856 is not set
+# CONFIG_VIDEO_BT866 is not set
+# CONFIG_VIDEO_KS0127 is not set
+# CONFIG_VIDEO_ML86V7667 is not set
+# CONFIG_VIDEO_SAA7110 is not set
 CONFIG_VIDEO_SAA711X=m
+# CONFIG_VIDEO_TC358743 is not set
+# CONFIG_VIDEO_TVP514X is not set
 CONFIG_VIDEO_TVP5150=m
+# CONFIG_VIDEO_TVP7002 is not set
 CONFIG_VIDEO_TW2804=m
 CONFIG_VIDEO_TW9903=m
 CONFIG_VIDEO_TW9906=m
-CONFIG_VIDEO_VPX3220=m
+# CONFIG_VIDEO_TW9910 is not set
+# CONFIG_VIDEO_VPX3220 is not set
 
 #
 # Video and audio decoders
@@ -5002,21 +5233,77 @@ CONFIG_VIDEO_CX25840=m
 # Video encoders
 #
 CONFIG_VIDEO_SAA7127=m
-CONFIG_VIDEO_SAA7185=m
-CONFIG_VIDEO_ADV7170=m
-CONFIG_VIDEO_ADV7175=m
+# CONFIG_VIDEO_SAA7185 is not set
+# CONFIG_VIDEO_ADV7170 is not set
+# CONFIG_VIDEO_ADV7175 is not set
+# CONFIG_VIDEO_ADV7343 is not set
+# CONFIG_VIDEO_ADV7393 is not set
+# CONFIG_VIDEO_ADV7511 is not set
+# CONFIG_VIDEO_AD9389B is not set
+# CONFIG_VIDEO_AK881X is not set
+# CONFIG_VIDEO_THS8200 is not set
 
 #
 # Camera sensor devices
 #
+# CONFIG_VIDEO_IMX214 is not set
+# CONFIG_VIDEO_IMX258 is not set
+# CONFIG_VIDEO_IMX274 is not set
+# CONFIG_VIDEO_IMX319 is not set
+# CONFIG_VIDEO_IMX355 is not set
 CONFIG_VIDEO_OV2640=m
+# CONFIG_VIDEO_OV2659 is not set
+# CONFIG_VIDEO_OV2680 is not set
+# CONFIG_VIDEO_OV2685 is not set
+# CONFIG_VIDEO_OV5647 is not set
+# CONFIG_VIDEO_OV6650 is not set
+# CONFIG_VIDEO_OV5670 is not set
+# CONFIG_VIDEO_OV5695 is not set
+# CONFIG_VIDEO_OV7251 is not set
+# CONFIG_VIDEO_OV772X is not set
 CONFIG_VIDEO_OV7640=m
 CONFIG_VIDEO_OV7670=m
+# CONFIG_VIDEO_OV7740 is not set
+# CONFIG_VIDEO_OV8856 is not set
+# CONFIG_VIDEO_OV9640 is not set
+# CONFIG_VIDEO_OV9650 is not set
+# CONFIG_VIDEO_OV13858 is not set
+# CONFIG_VIDEO_VS6624 is not set
+# CONFIG_VIDEO_MT9M001 is not set
+# CONFIG_VIDEO_MT9M032 is not set
+# CONFIG_VIDEO_MT9M111 is not set
+# CONFIG_VIDEO_MT9P031 is not set
+# CONFIG_VIDEO_MT9T001 is not set
+# CONFIG_VIDEO_MT9T112 is not set
 CONFIG_VIDEO_MT9V011=m
+# CONFIG_VIDEO_MT9V032 is not set
+# CONFIG_VIDEO_MT9V111 is not set
+# CONFIG_VIDEO_SR030PC30 is not set
+# CONFIG_VIDEO_NOON010PC30 is not set
+# CONFIG_VIDEO_M5MOLS is not set
+# CONFIG_VIDEO_RJ54N1 is not set
+# CONFIG_VIDEO_S5K6AA is not set
+# CONFIG_VIDEO_S5K6A3 is not set
+# CONFIG_VIDEO_S5K4ECGX is not set
+# CONFIG_VIDEO_S5K5BAF is not set
+# CONFIG_VIDEO_SMIAPP is not set
+# CONFIG_VIDEO_ET8EK8 is not set
+# CONFIG_VIDEO_S5C73M3 is not set
+
+#
+# Lens drivers
+#
+# CONFIG_VIDEO_AD5820 is not set
+# CONFIG_VIDEO_AK7375 is not set
+# CONFIG_VIDEO_DW9714 is not set
+# CONFIG_VIDEO_DW9807_VCM is not set
 
 #
 # Flash devices
 #
+# CONFIG_VIDEO_ADP1653 is not set
+# CONFIG_VIDEO_LM3560 is not set
+# CONFIG_VIDEO_LM3646 is not set
 
 #
 # Video improvement chips
@@ -5036,13 +5323,29 @@ CONFIG_VIDEO_SAA6752HS=m
 #
 # Miscellaneous helper chips
 #
+# CONFIG_VIDEO_THS7303 is not set
 CONFIG_VIDEO_M52790=m
+# CONFIG_VIDEO_I2C is not set
+# CONFIG_VIDEO_ST_MIPID02 is not set
+# end of I2C Encoders, decoders, sensors and other helper chips
+
+#
+# SPI helper chips
+#
+# CONFIG_VIDEO_GS1662 is not set
+# end of SPI helper chips
 
 #
 # Media SPI Adapters
 #
 # CONFIG_CXD2880_SPI_DRV is not set
+# end of Media SPI Adapters
+
 CONFIG_MEDIA_TUNER=m
+
+#
+# Customize TV tuners
+#
 CONFIG_MEDIA_TUNER_SIMPLE=m
 CONFIG_MEDIA_TUNER_TDA18250=m
 CONFIG_MEDIA_TUNER_TDA8290=m
@@ -5051,6 +5354,7 @@ CONFIG_MEDIA_TUNER_TDA18271=m
 CONFIG_MEDIA_TUNER_TDA9887=m
 CONFIG_MEDIA_TUNER_TEA5761=m
 CONFIG_MEDIA_TUNER_TEA5767=m
+# CONFIG_MEDIA_TUNER_MSI001 is not set
 CONFIG_MEDIA_TUNER_MT20XX=m
 CONFIG_MEDIA_TUNER_MT2060=m
 CONFIG_MEDIA_TUNER_MT2063=m
@@ -5079,6 +5383,11 @@ CONFIG_MEDIA_TUNER_R820T=m
 CONFIG_MEDIA_TUNER_MXL301RF=m
 CONFIG_MEDIA_TUNER_QM1D1C0042=m
 CONFIG_MEDIA_TUNER_QM1D1B0004=m
+# end of Customize TV tuners
+
+#
+# Customise DVB Frontends
+#
 
 #
 # Multistandard (satellite) frontends
@@ -5139,6 +5448,7 @@ CONFIG_DVB_SP8870=m
 CONFIG_DVB_SP887X=m
 CONFIG_DVB_CX22700=m
 CONFIG_DVB_CX22702=m
+# CONFIG_DVB_S5H1432 is not set
 CONFIG_DVB_DRXD=m
 CONFIG_DVB_L64781=m
 CONFIG_DVB_TDA1004X=m
@@ -5149,6 +5459,7 @@ CONFIG_DVB_DIB3000MB=m
 CONFIG_DVB_DIB3000MC=m
 CONFIG_DVB_DIB7000M=m
 CONFIG_DVB_DIB7000P=m
+# CONFIG_DVB_DIB9000 is not set
 CONFIG_DVB_TDA10048=m
 CONFIG_DVB_AF9013=m
 CONFIG_DVB_EC100=m
@@ -5161,6 +5472,7 @@ CONFIG_DVB_SI2168=m
 CONFIG_DVB_AS102_FE=m
 CONFIG_DVB_ZD1301_DEMOD=m
 CONFIG_DVB_GP8PSK_FE=m
+# CONFIG_DVB_CXD2880 is not set
 
 #
 # DVB-C (cable) frontends
@@ -5198,6 +5510,7 @@ CONFIG_DVB_MB86A20S=m
 # ISDB-S (satellite) & ISDB-T (terrestrial) frontends
 #
 CONFIG_DVB_TC90522=m
+# CONFIG_DVB_MN88443X is not set
 
 #
 # Digital terrestrial only tuners/PLL
@@ -5211,12 +5524,14 @@ CONFIG_DVB_TUNER_DIB0090=m
 #
 CONFIG_DVB_DRX39XYJ=m
 CONFIG_DVB_LNBH25=m
+# CONFIG_DVB_LNBH29 is not set
 CONFIG_DVB_LNBP21=m
 CONFIG_DVB_LNBP22=m
 CONFIG_DVB_ISL6405=m
 CONFIG_DVB_ISL6421=m
 CONFIG_DVB_ISL6423=m
 CONFIG_DVB_A8293=m
+# CONFIG_DVB_LGS8GL5 is not set
 CONFIG_DVB_LGS8GXX=m
 CONFIG_DVB_ATBM8830=m
 CONFIG_DVB_TDA665x=m
@@ -5237,6 +5552,7 @@ CONFIG_DVB_SP2=m
 # Tools to develop new frontends
 #
 CONFIG_DVB_DUMMY_FE=m
+# end of Customise DVB Frontends
 
 #
 # Graphics support
@@ -5268,8 +5584,10 @@ CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 CONFIG_DRM_DP_CEC=y
 CONFIG_DRM_TTM=m
+CONFIG_DRM_VRAM_HELPER=m
 CONFIG_DRM_GEM_CMA_HELPER=y
 CONFIG_DRM_KMS_CMA_HELPER=y
+CONFIG_DRM_GEM_SHMEM_HELPER=y
 CONFIG_DRM_VM=y
 CONFIG_DRM_SCHED=m
 
@@ -5280,37 +5598,36 @@ CONFIG_DRM_I2C_CH7006=m
 CONFIG_DRM_I2C_SIL164=m
 CONFIG_DRM_I2C_NXP_TDA998X=m
 # CONFIG_DRM_I2C_NXP_TDA9950 is not set
+# end of I2C encoder or helper chips
 
 #
 # ARM devices
 #
+# end of ARM devices
+
 CONFIG_DRM_RADEON=m
 CONFIG_DRM_RADEON_USERPTR=y
 CONFIG_DRM_AMDGPU=m
 CONFIG_DRM_AMDGPU_SI=y
 CONFIG_DRM_AMDGPU_CIK=y
-CONFIG_DRM_AMDGPU_USERPTR=y
 # CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set
 
 #
 # ACP (Audio CoProcessor) Configuration
 #
 CONFIG_DRM_AMD_ACP=y
+# end of ACP (Audio CoProcessor) Configuration
 
 #
 # Display Engine Configuration
 #
 CONFIG_DRM_AMD_DC=y
 CONFIG_DRM_AMD_DC_DCN1_0=y
-CONFIG_DRM_AMD_DC_DCN1_01=y
+CONFIG_DRM_AMD_DC_DCN2_0=y
+CONFIG_DRM_AMD_DC_DSC_SUPPORT=y
 # CONFIG_DEBUG_KERNEL_DC is not set
+# end of Display Engine Configuration
 
-#
-# AMD Library routines
-#
-CONFIG_CHASH=m
-# CONFIG_CHASH_STATS is not set
-# CONFIG_CHASH_SELFTEST is not set
 CONFIG_DRM_NOUVEAU=m
 CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT=y
 CONFIG_NOUVEAU_DEBUG=5
@@ -5319,6 +5636,7 @@ CONFIG_NOUVEAU_DEBUG_DEFAULT=3
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 CONFIG_DRM_I915=m
 # CONFIG_DRM_I915_ALPHA_SUPPORT is not set
+CONFIG_DRM_I915_FORCE_PROBE=""
 CONFIG_DRM_I915_CAPTURE_ERROR=y
 CONFIG_DRM_I915_COMPRESS_ERROR=y
 CONFIG_DRM_I915_USERPTR=y
@@ -5328,6 +5646,7 @@ CONFIG_DRM_I915_USERPTR=y
 #
 # CONFIG_DRM_I915_WERROR is not set
 # CONFIG_DRM_I915_DEBUG is not set
+# CONFIG_DRM_I915_DEBUG_MMIO is not set
 # CONFIG_DRM_I915_SW_FENCE_DEBUG_OBJECTS is not set
 # CONFIG_DRM_I915_SW_FENCE_CHECK_DAG is not set
 # CONFIG_DRM_I915_DEBUG_GUC is not set
@@ -5335,8 +5654,18 @@ CONFIG_DRM_I915_USERPTR=y
 # CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS is not set
 # CONFIG_DRM_I915_DEBUG_VBLANK_EVADE is not set
 # CONFIG_DRM_I915_DEBUG_RUNTIME_PM is not set
+# end of drm/i915 Debugging
+
+#
+# drm/i915 Profile Guided Optimisation
+#
+CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND=250
+CONFIG_DRM_I915_SPIN_REQUEST=5
+# end of drm/i915 Profile Guided Optimisation
+
 CONFIG_DRM_VGEM=m
 CONFIG_DRM_VKMS=m
+CONFIG_DRM_ATI_PCIGART=y
 CONFIG_DRM_VMWGFX=m
 CONFIG_DRM_VMWGFX_FBCON=y
 CONFIG_DRM_GMA500=m
@@ -5355,6 +5684,8 @@ CONFIG_DRM_PANEL=y
 # Display Panels
 #
 CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m
+# end of Display Panels
+
 CONFIG_DRM_BRIDGE=y
 CONFIG_DRM_PANEL_BRIDGE=y
 
@@ -5362,6 +5693,8 @@ CONFIG_DRM_PANEL_BRIDGE=y
 # Display Interface Bridges
 #
 CONFIG_DRM_ANALOGIX_ANX78XX=m
+# end of Display Interface Bridges
+
 # CONFIG_DRM_ETNAVIV is not set
 CONFIG_DRM_HISI_HIBMC=m
 CONFIG_DRM_TINYDRM=m
@@ -5373,7 +5706,14 @@ CONFIG_TINYDRM_MI0283QT=m
 CONFIG_TINYDRM_REPAPER=m
 CONFIG_TINYDRM_ST7586=m
 # CONFIG_TINYDRM_ST7735R is not set
-# CONFIG_DRM_LEGACY is not set
+CONFIG_DRM_VBOXVIDEO=m
+CONFIG_DRM_LEGACY=y
+CONFIG_DRM_TDFX=m
+CONFIG_DRM_R128=m
+CONFIG_DRM_MGA=m
+CONFIG_DRM_SIS=m
+CONFIG_DRM_VIA=m
+CONFIG_DRM_SAVAGE=m
 CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
 
 #
@@ -5453,7 +5793,11 @@ CONFIG_FB_IBM_GXT4500=m
 CONFIG_FB_HYPERV=m
 # CONFIG_FB_SIMPLE is not set
 CONFIG_FB_SM712=m
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
+# end of Frame buffer Devices
+
+#
+# Backlight & LCD device support
+#
 CONFIG_LCD_CLASS_DEVICE=m
 CONFIG_LCD_L4F00242T03=m
 CONFIG_LCD_LMS283GF05=m
@@ -5488,6 +5832,8 @@ CONFIG_BACKLIGHT_GPIO=m
 CONFIG_BACKLIGHT_LV5207LP=m
 CONFIG_BACKLIGHT_BD6107=m
 # CONFIG_BACKLIGHT_ARCXCNN is not set
+# end of Backlight & LCD device support
+
 CONFIG_VGASTATE=m
 CONFIG_HDMI=y
 
@@ -5505,7 +5851,11 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y
+# end of Console display driver support
+
 # CONFIG_LOGO is not set
+# end of Graphics support
+
 CONFIG_SOUND=m
 CONFIG_SOUND_OSS_CORE=y
 CONFIG_SOUND_OSS_CORE_PRECLAIM=y
@@ -5664,6 +6014,8 @@ CONFIG_SND_HDA_CODEC_CMEDIA=m
 CONFIG_SND_HDA_CODEC_SI3054=m
 CONFIG_SND_HDA_GENERIC=m
 CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1
+# end of HD-Audio
+
 CONFIG_SND_HDA_CORE=m
 CONFIG_SND_HDA_DSP_LOADER=y
 CONFIG_SND_HDA_COMPONENT=y
@@ -5673,6 +6025,7 @@ CONFIG_SND_HDA_PREALLOC_SIZE=64
 CONFIG_SND_SPI=y
 CONFIG_SND_USB=y
 CONFIG_SND_USB_AUDIO=m
+CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER=y
 CONFIG_SND_USB_UA101=m
 CONFIG_SND_USB_USX2Y=m
 CONFIG_SND_USB_CAIAQ=m
@@ -5720,11 +6073,14 @@ CONFIG_SND_DESIGNWARE_I2S=m
 #
 # CONFIG_SND_SOC_FSL_ASRC is not set
 # CONFIG_SND_SOC_FSL_SAI is not set
+CONFIG_SND_SOC_FSL_AUDMIX=m
 # CONFIG_SND_SOC_FSL_SSI is not set
 # CONFIG_SND_SOC_FSL_SPDIF is not set
 # CONFIG_SND_SOC_FSL_ESAI is not set
 CONFIG_SND_SOC_FSL_MICFIL=m
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
+# end of SoC Audio for Freescale CPUs
+
 # CONFIG_SND_I2S_HI6210_I2S is not set
 CONFIG_SND_SOC_IMG=y
 CONFIG_SND_SOC_IMG_I2S_IN=m
@@ -5750,6 +6106,8 @@ CONFIG_SND_SOC_INTEL_KBL=m
 CONFIG_SND_SOC_INTEL_GLK=m
 CONFIG_SND_SOC_INTEL_CNL=m
 CONFIG_SND_SOC_INTEL_CFL=m
+# CONFIG_SND_SOC_INTEL_CML_H is not set
+# CONFIG_SND_SOC_INTEL_CML_LP is not set
 CONFIG_SND_SOC_INTEL_SKYLAKE_FAMILY=m
 CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
 CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
@@ -5764,6 +6122,7 @@ CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m
 # CONFIG_SND_SOC_INTEL_CHT_BSW_NAU8824_MACH is not set
+# CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH is not set
 # CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH is not set
 # CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH is not set
 # CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH is not set
@@ -5779,11 +6138,53 @@ CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98927_MACH=m
 CONFIG_SND_SOC_INTEL_KBL_RT5660_MACH=m
 CONFIG_SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH=m
+CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH=m
 CONFIG_SND_SOC_MTK_BTCVSD=m
+CONFIG_SND_SOC_SOF_TOPLEVEL=y
+CONFIG_SND_SOC_SOF_PCI=m
+CONFIG_SND_SOC_SOF_ACPI=m
+CONFIG_SND_SOC_SOF_OPTIONS=m
+# CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT is not set
+# CONFIG_SND_SOC_SOF_STRICT_ABI_CHECKS is not set
+# CONFIG_SND_SOC_SOF_DEBUG is not set
+CONFIG_SND_SOC_SOF=m
+CONFIG_SND_SOC_SOF_PROBE_WORK_QUEUE=y
+CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL=y
+CONFIG_SND_SOC_SOF_INTEL_ACPI=m
+CONFIG_SND_SOC_SOF_INTEL_PCI=m
+CONFIG_SND_SOC_SOF_INTEL_HIFI_EP_IPC=m
+CONFIG_SND_SOC_SOF_INTEL_ATOM_HIFI_EP=m
+CONFIG_SND_SOC_SOF_INTEL_COMMON=m
+CONFIG_SND_SOC_SOF_BAYTRAIL_SUPPORT=y
+CONFIG_SND_SOC_SOF_BAYTRAIL=m
+CONFIG_SND_SOC_SOF_BROADWELL_SUPPORT=y
+CONFIG_SND_SOC_SOF_BROADWELL=m
+CONFIG_SND_SOC_SOF_MERRIFIELD_SUPPORT=y
+CONFIG_SND_SOC_SOF_MERRIFIELD=m
+CONFIG_SND_SOC_SOF_APOLLOLAKE_SUPPORT=y
+CONFIG_SND_SOC_SOF_APOLLOLAKE=m
+CONFIG_SND_SOC_SOF_GEMINILAKE_SUPPORT=y
+CONFIG_SND_SOC_SOF_GEMINILAKE=m
+CONFIG_SND_SOC_SOF_CANNONLAKE_SUPPORT=y
+CONFIG_SND_SOC_SOF_CANNONLAKE=m
+CONFIG_SND_SOC_SOF_COFFEELAKE_SUPPORT=y
+CONFIG_SND_SOC_SOF_COFFEELAKE=m
+CONFIG_SND_SOC_SOF_ICELAKE_SUPPORT=y
+CONFIG_SND_SOC_SOF_ICELAKE=m
+# CONFIG_SND_SOC_SOF_COMETLAKE_LP_SUPPORT is not set
+# CONFIG_SND_SOC_SOF_COMETLAKE_H_SUPPORT is not set
+CONFIG_SND_SOC_SOF_HDA_COMMON=m
+CONFIG_SND_SOC_SOF_HDA_LINK=y
+CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC=y
+CONFIG_SND_SOC_SOF_HDA_LINK_BASELINE=m
+CONFIG_SND_SOC_SOF_HDA=m
+CONFIG_SND_SOC_SOF_XTENSA=m
 
 #
 # STMicroelectronics STM32 SOC audio support
 #
+# end of STMicroelectronics STM32 SOC audio support
+
 CONFIG_SND_SOC_XILINX_I2S=m
 CONFIG_SND_SOC_XILINX_AUDIO_FORMATTER=m
 CONFIG_SND_SOC_XILINX_SPDIF=m
@@ -5833,6 +6234,7 @@ CONFIG_SND_SOC_CS43130=m
 CONFIG_SND_SOC_CS4341=m
 CONFIG_SND_SOC_CS4349=m
 CONFIG_SND_SOC_CS53L30=m
+# CONFIG_SND_SOC_CX2072X is not set
 CONFIG_SND_SOC_DA7219=m
 CONFIG_SND_SOC_DMIC=m
 CONFIG_SND_SOC_HDMI_CODEC=m
@@ -5953,6 +6355,8 @@ CONFIG_SND_SOC_NAU8822=m
 # CONFIG_SND_SOC_NAU8824 is not set
 CONFIG_SND_SOC_NAU8825=m
 CONFIG_SND_SOC_TPA6130A2=m
+# end of CODEC drivers
+
 CONFIG_SND_SIMPLE_CARD_UTILS=m
 CONFIG_SND_SIMPLE_CARD=m
 CONFIG_SND_X86=y
@@ -5987,6 +6391,7 @@ CONFIG_HID_CHERRY=m
 CONFIG_HID_CHICONY=m
 CONFIG_HID_CORSAIR=m
 CONFIG_HID_COUGAR=m
+CONFIG_HID_MACALLY=m
 CONFIG_HID_PRODIKEYS=m
 CONFIG_HID_CMEDIA=m
 CONFIG_HID_CP2112=m
@@ -6069,6 +6474,7 @@ CONFIG_HID_THINGM=m
 CONFIG_HID_THRUSTMASTER=m
 CONFIG_THRUSTMASTER_FF=y
 CONFIG_HID_UDRAW_PS3=m
+CONFIG_HID_U2FZERO=m
 CONFIG_HID_WACOM=m
 CONFIG_HID_WIIMOTE=m
 CONFIG_HID_XINMO=m
@@ -6078,6 +6484,7 @@ CONFIG_HID_ZYDACRON=m
 CONFIG_HID_SENSOR_HUB=m
 CONFIG_HID_SENSOR_CUSTOM_SENSOR=m
 CONFIG_HID_ALPS=m
+# end of Special HID drivers
 
 #
 # USB HID support
@@ -6091,11 +6498,16 @@ CONFIG_USB_HIDDEV=y
 #
 CONFIG_USB_KBD=m
 CONFIG_USB_MOUSE=m
+# end of USB HID Boot Protocol drivers
+# end of USB HID support
 
 #
 # I2C HID support
 #
 CONFIG_I2C_HID=m
+# end of I2C HID support
+# end of HID support
+
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 CONFIG_USB_SUPPORT=y
 CONFIG_USB_COMMON=y
@@ -6339,6 +6751,8 @@ CONFIG_USB_GPIO_VBUS=m
 CONFIG_TAHVO_USB=m
 # CONFIG_TAHVO_USB_HOST_BY_DEFAULT is not set
 CONFIG_USB_ISP1301=m
+# end of USB Physical Layer drivers
+
 CONFIG_USB_GADGET=m
 # CONFIG_USB_GADGET_DEBUG is not set
 # CONFIG_USB_GADGET_DEBUG_FILES is not set
@@ -6371,6 +6785,8 @@ CONFIG_USB_NET2280=m
 CONFIG_USB_GOKU=m
 CONFIG_USB_EG20T=m
 CONFIG_USB_DUMMY_HCD=m
+# end of USB Peripheral Controller
+
 CONFIG_USB_LIBCOMPOSITE=m
 CONFIG_USB_F_ACM=m
 CONFIG_USB_U_SERIAL=m
@@ -6451,11 +6867,15 @@ CONFIG_TYPEC_TPS6598X=m
 # USB Type-C Multiplexer/DeMultiplexer Switch support
 #
 # CONFIG_TYPEC_MUX_PI3USB30532 is not set
+# end of USB Type-C Multiplexer/DeMultiplexer Switch support
 
 #
 # USB Type-C Alternate Mode drivers
 #
 CONFIG_TYPEC_DP_ALTMODE=m
+CONFIG_TYPEC_NVIDIA_ALTMODE=m
+# end of USB Type-C Alternate Mode drivers
+
 CONFIG_USB_ROLE_SWITCH=m
 # CONFIG_USB_ROLES_INTEL_XHCI is not set
 CONFIG_USB_LED_TRIG=y
@@ -6524,6 +6944,7 @@ CONFIG_LEDS_CLASS_FLASH=m
 CONFIG_LEDS_APU=m
 CONFIG_LEDS_AS3645A=m
 CONFIG_LEDS_LM3530=m
+CONFIG_LEDS_LM3532=m
 CONFIG_LEDS_LM3533=m
 CONFIG_LEDS_LM3642=m
 # CONFIG_LEDS_LM3601X is not set
@@ -6549,7 +6970,6 @@ CONFIG_LEDS_PWM=m
 CONFIG_LEDS_REGULATOR=m
 CONFIG_LEDS_BD2802=m
 CONFIG_LEDS_INTEL_SS4200=m
-CONFIG_LEDS_LT3593=m
 CONFIG_LEDS_MC13783=m
 CONFIG_LEDS_TCA6507=m
 CONFIG_LEDS_TLC591XX=m
@@ -6565,6 +6985,7 @@ CONFIG_LEDS_BLINKM=m
 # CONFIG_LEDS_MLXREG is not set
 CONFIG_LEDS_USER=m
 CONFIG_LEDS_NIC78BX=m
+# CONFIG_LEDS_TI_LMU_COMMON is not set
 
 #
 # LED Triggers
@@ -6606,12 +7027,11 @@ CONFIG_INFINIBAND_CXGB4=m
 CONFIG_INFINIBAND_I40IW=m
 CONFIG_MLX4_INFINIBAND=m
 CONFIG_MLX5_INFINIBAND=m
-CONFIG_INFINIBAND_NES=m
-# CONFIG_INFINIBAND_NES_DEBUG is not set
 CONFIG_INFINIBAND_OCRDMA=m
 CONFIG_INFINIBAND_VMWARE_PVRDMA=m
 CONFIG_INFINIBAND_USNIC=m
 CONFIG_RDMA_RXE=m
+# CONFIG_RDMA_SIW is not set
 CONFIG_INFINIBAND_IPOIB=m
 CONFIG_INFINIBAND_IPOIB_CM=y
 CONFIG_INFINIBAND_IPOIB_DEBUG=y
@@ -6687,6 +7107,7 @@ CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_M41T80=m
 CONFIG_RTC_DRV_M41T80_WDT=y
+# CONFIG_RTC_DRV_BD70528 is not set
 CONFIG_RTC_DRV_BQ32K=m
 CONFIG_RTC_DRV_S35390A=m
 CONFIG_RTC_DRV_FM3130=m
@@ -6786,6 +7207,8 @@ CONFIG_QCOM_HIDMA=m
 CONFIG_DW_DMAC_CORE=m
 CONFIG_DW_DMAC=m
 CONFIG_DW_DMAC_PCI=m
+# CONFIG_DW_EDMA is not set
+# CONFIG_DW_EDMA_PCIE is not set
 CONFIG_HSU_DMA=m
 
 #
@@ -6800,6 +7223,8 @@ CONFIG_ASYNC_TX_DMA=y
 CONFIG_SYNC_FILE=y
 # CONFIG_SW_SYNC is not set
 CONFIG_UDMABUF=y
+# end of DMABUF options
+
 CONFIG_AUXDISPLAY=y
 # CONFIG_HD44780 is not set
 CONFIG_KS0108=m
@@ -6855,8 +7280,11 @@ CONFIG_VIRTIO_MMIO=m
 # Microsoft Hyper-V guest support
 #
 CONFIG_HYPERV=m
+CONFIG_HYPERV_TIMER=y
 CONFIG_HYPERV_UTILS=m
 CONFIG_HYPERV_BALLOON=m
+# end of Microsoft Hyper-V guest support
+
 CONFIG_STAGING=y
 CONFIG_PRISM2_USB=m
 CONFIG_COMEDI=m
@@ -6953,8 +7381,6 @@ CONFIG_RTL8723BS=m
 CONFIG_R8712U=m
 CONFIG_R8188EU=m
 CONFIG_88EU_AP_MODE=y
-CONFIG_R8822BE=m
-CONFIG_RTLWIFI_DEBUG_ST=y
 CONFIG_RTS5208=m
 CONFIG_VT6655=m
 CONFIG_VT6656=m
@@ -6968,14 +7394,15 @@ CONFIG_VT6656=m
 #
 CONFIG_ADIS16203=m
 CONFIG_ADIS16240=m
+# end of Accelerometers
 
 #
 # Analog to digital converters
 #
-CONFIG_AD7780=m
 CONFIG_AD7816=m
 CONFIG_AD7192=m
 CONFIG_AD7280=m
+# end of Analog to digital converters
 
 #
 # Analog digital bi-direction converters
@@ -6983,23 +7410,27 @@ CONFIG_AD7280=m
 CONFIG_ADT7316=m
 CONFIG_ADT7316_SPI=m
 CONFIG_ADT7316_I2C=m
+# end of Analog digital bi-direction converters
 
 #
 # Capacitance to digital converters
 #
 CONFIG_AD7150=m
 CONFIG_AD7746=m
+# end of Capacitance to digital converters
 
 #
 # Direct Digital Synthesis
 #
 CONFIG_AD9832=m
 CONFIG_AD9834=m
+# end of Direct Digital Synthesis
 
 #
 # Network Analyzer, Impedance Converters
 #
 CONFIG_AD5933=m
+# end of Network Analyzer, Impedance Converters
 
 #
 # Active energy metering IC
@@ -7007,11 +7438,15 @@ CONFIG_AD5933=m
 CONFIG_ADE7854=m
 CONFIG_ADE7854_I2C=m
 CONFIG_ADE7854_SPI=m
+# end of Active energy metering IC
 
 #
 # Resolver to digital converters
 #
 CONFIG_AD2S1210=m
+# end of Resolver to digital converters
+# end of IIO staging drivers
+
 CONFIG_FB_SM750=m
 
 #
@@ -7029,16 +7464,10 @@ CONFIG_SPEAKUP_SYNTH_SOFT=m
 CONFIG_SPEAKUP_SYNTH_SPKOUT=m
 CONFIG_SPEAKUP_SYNTH_TXPRT=m
 CONFIG_SPEAKUP_SYNTH_DUMMY=m
+# end of Speakup console speech
+
 CONFIG_STAGING_MEDIA=y
 CONFIG_I2C_BCM2048=m
-CONFIG_VIDEO_ZORAN=m
-CONFIG_VIDEO_ZORAN_DC30=m
-CONFIG_VIDEO_ZORAN_ZR36060=m
-CONFIG_VIDEO_ZORAN_BUZ=m
-CONFIG_VIDEO_ZORAN_DC10=m
-CONFIG_VIDEO_ZORAN_LML33=m
-CONFIG_VIDEO_ZORAN_LML33R10=m
-CONFIG_VIDEO_ZORAN_AVS6EYES=m
 CONFIG_VIDEO_IPU3_IMGU=m
 
 #
@@ -7048,6 +7477,8 @@ CONFIG_VIDEO_IPU3_IMGU=m
 #
 # Android
 #
+# end of Android
+
 CONFIG_LTE_GDM724X=m
 CONFIG_FIREWIRE_SERIAL=m
 CONFIG_FWTTY_MAX_TOTAL_PORTS=64
@@ -7120,12 +7551,13 @@ CONFIG_GREYBUS_SDIO=m
 CONFIG_GREYBUS_SPI=m
 CONFIG_GREYBUS_UART=m
 CONFIG_GREYBUS_USB=m
-CONFIG_DRM_VBOXVIDEO=m
 CONFIG_PI433=m
 
 #
 # Gasket devices
 #
+# end of Gasket devices
+
 CONFIG_EROFS_FS=m
 # CONFIG_EROFS_FS_DEBUG is not set
 CONFIG_EROFS_FS_XATTR=y
@@ -7135,6 +7567,8 @@ CONFIG_EROFS_FS_SECURITY=y
 # CONFIG_EROFS_FAULT_INJECTION is not set
 CONFIG_EROFS_FS_IO_MAX_RETRIES=5
 # CONFIG_EROFS_FS_ZIP is not set
+# CONFIG_FIELDBUS_DEV is not set
+# CONFIG_KPC2000 is not set
 CONFIG_X86_PLATFORM_DEVICES=y
 CONFIG_ACER_WMI=m
 # CONFIG_ACER_WIRELESS is not set
@@ -7186,6 +7620,7 @@ CONFIG_ASUS_WIRELESS=m
 CONFIG_ACPI_WMI=m
 CONFIG_WMI_BMOF=m
 CONFIG_INTEL_WMI_THUNDERBOLT=m
+# CONFIG_XIAOMI_WMI is not set
 CONFIG_MSI_WMI=m
 CONFIG_PEAQ_WMI=m
 CONFIG_TOPSTAR_LAPTOP=m
@@ -7193,7 +7628,7 @@ CONFIG_ACPI_TOSHIBA=m
 CONFIG_TOSHIBA_BT_RFKILL=m
 CONFIG_TOSHIBA_HAPS=m
 CONFIG_TOSHIBA_WMI=m
-CONFIG_ACPI_CMPC=m
+# CONFIG_ACPI_CMPC is not set
 # CONFIG_INTEL_INT0002_VGPIO is not set
 CONFIG_INTEL_HID_EVENT=m
 CONFIG_INTEL_VBTN=m
@@ -7203,7 +7638,7 @@ CONFIG_IBM_RTL=m
 CONFIG_SAMSUNG_LAPTOP=m
 CONFIG_MXM_WMI=m
 CONFIG_INTEL_OAKTRAIL=m
-CONFIG_SAMSUNG_Q10=m
+# CONFIG_SAMSUNG_Q10 is not set
 CONFIG_APPLE_GMUX=m
 CONFIG_INTEL_RST=m
 CONFIG_INTEL_SMARTCONNECT=m
@@ -7225,9 +7660,10 @@ CONFIG_CHROMEOS_PSTORE=m
 CONFIG_CROS_EC_I2C=m
 CONFIG_CROS_EC_SPI=m
 CONFIG_CROS_EC_LPC=m
-# CONFIG_CROS_EC_LPC_MEC is not set
 CONFIG_CROS_EC_PROTO=y
 CONFIG_CROS_KBD_LED_BACKLIGHT=m
+CONFIG_CROS_USBPD_LOGGER=m
+# CONFIG_WILCO_EC is not set
 # CONFIG_MELLANOX_PLATFORM is not set
 CONFIG_CLKDEV_LOOKUP=y
 CONFIG_HAVE_CLK_PREPARE=y
@@ -7238,11 +7674,14 @@ CONFIG_COMMON_CLK=y
 #
 CONFIG_COMMON_CLK_WM831X=m
 # CONFIG_COMMON_CLK_MAX9485 is not set
+# CONFIG_COMMON_CLK_SI5341 is not set
 CONFIG_COMMON_CLK_SI5351=m
 # CONFIG_COMMON_CLK_SI544 is not set
 CONFIG_COMMON_CLK_CDCE706=m
 CONFIG_COMMON_CLK_CS2000_CP=m
 CONFIG_COMMON_CLK_PWM=m
+# end of Common Clock Framework
+
 # CONFIG_HWSPINLOCK is not set
 
 #
@@ -7252,6 +7691,8 @@ CONFIG_CLKSRC_I8253=y
 CONFIG_CLKEVT_I8253=y
 CONFIG_I8253_LOCK=y
 CONFIG_CLKBLD_I8253=y
+# end of Clock Source drivers
+
 CONFIG_MAILBOX=y
 # CONFIG_PCC is not set
 CONFIG_ALTERA_MBOX=m
@@ -7262,6 +7703,8 @@ CONFIG_IOMMU_SUPPORT=y
 #
 # Generic IOMMU Pagetable Support
 #
+# end of Generic IOMMU Pagetable Support
+
 # CONFIG_IOMMU_DEBUGFS is not set
 # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
 CONFIG_DMAR_TABLE=y
@@ -7275,6 +7718,7 @@ CONFIG_HYPERV_IOMMU=y
 # Remoteproc drivers
 #
 CONFIG_REMOTEPROC=m
+# end of Remoteproc drivers
 
 #
 # Rpmsg drivers
@@ -7283,6 +7727,8 @@ CONFIG_RPMSG=m
 CONFIG_RPMSG_CHAR=m
 # CONFIG_RPMSG_QCOM_GLINK_RPM is not set
 CONFIG_RPMSG_VIRTIO=m
+# end of Rpmsg drivers
+
 # CONFIG_SOUNDWIRE is not set
 
 #
@@ -7292,28 +7738,42 @@ CONFIG_RPMSG_VIRTIO=m
 #
 # Amlogic SoC drivers
 #
+# end of Amlogic SoC drivers
+
+#
+# Aspeed SoC drivers
+#
+# end of Aspeed SoC drivers
 
 #
 # Broadcom SoC drivers
 #
+# end of Broadcom SoC drivers
 
 #
 # NXP/Freescale QorIQ SoC drivers
 #
+# end of NXP/Freescale QorIQ SoC drivers
 
 #
 # i.MX SoC drivers
 #
+# end of i.MX SoC drivers
 
 #
 # Qualcomm SoC drivers
 #
+# end of Qualcomm SoC drivers
+
 # CONFIG_SOC_TI is not set
 
 #
 # Xilinx SoC drivers
 #
 # CONFIG_XILINX_VCU is not set
+# end of Xilinx SoC drivers
+# end of SOC (System On Chip) specific Drivers
+
 CONFIG_PM_DEVFREQ=y
 
 #
@@ -7337,6 +7797,7 @@ CONFIG_EXTCON=y
 CONFIG_EXTCON_ADC_JACK=m
 CONFIG_EXTCON_ARIZONA=m
 CONFIG_EXTCON_AXP288=m
+# CONFIG_EXTCON_FSA9480 is not set
 CONFIG_EXTCON_GPIO=m
 CONFIG_EXTCON_INTEL_INT3496=m
 CONFIG_EXTCON_MAX3355=m
@@ -7400,6 +7861,7 @@ CONFIG_MXC6255=m
 CONFIG_SCA3000=m
 CONFIG_STK8312=m
 CONFIG_STK8BA50=m
+# end of Accelerometers
 
 #
 # Analog to digital converters
@@ -7415,6 +7877,7 @@ CONFIG_AD7606_IFACE_PARALLEL=m
 CONFIG_AD7606_IFACE_SPI=m
 CONFIG_AD7766=m
 CONFIG_AD7768_1=m
+CONFIG_AD7780=m
 CONFIG_AD7791=m
 CONFIG_AD7793=m
 CONFIG_AD7887=m
@@ -7458,15 +7921,19 @@ CONFIG_TI_ADS7950=m
 CONFIG_TI_AM335X_ADC=m
 CONFIG_TI_TLC4541=m
 CONFIG_VIPERBOARD_ADC=m
+# CONFIG_XILINX_XADC is not set
+# end of Analog to digital converters
 
 #
 # Analog Front Ends
 #
+# end of Analog Front Ends
 
 #
 # Amplifiers
 #
 CONFIG_AD8366=m
+# end of Amplifiers
 
 #
 # Chemical Sensors
@@ -7481,14 +7948,19 @@ CONFIG_PMS7003=m
 CONFIG_SENSIRION_SGP30=m
 CONFIG_SPS30=m
 CONFIG_VZ89X=m
+# end of Chemical Sensors
+
 CONFIG_IIO_CROS_EC_SENSORS_CORE=m
 CONFIG_IIO_CROS_EC_SENSORS=m
+# CONFIG_IIO_CROS_EC_SENSORS_LID_ANGLE is not set
 
 #
 # Hid Sensor IIO Common
 #
 CONFIG_HID_SENSOR_IIO_COMMON=m
 CONFIG_HID_SENSOR_IIO_TRIGGER=m
+# end of Hid Sensor IIO Common
+
 CONFIG_IIO_MS_SENSORS_I2C=m
 
 #
@@ -7496,14 +7968,12 @@ CONFIG_IIO_MS_SENSORS_I2C=m
 #
 CONFIG_IIO_SSP_SENSORS_COMMONS=m
 CONFIG_IIO_SSP_SENSORHUB=m
+# end of SSP Sensor Common
+
 CONFIG_IIO_ST_SENSORS_I2C=m
 CONFIG_IIO_ST_SENSORS_SPI=m
 CONFIG_IIO_ST_SENSORS_CORE=m
 
-#
-# Counters
-#
-
 #
 # Digital to analog converters
 #
@@ -7538,6 +8008,7 @@ CONFIG_TI_DAC082S085=m
 # CONFIG_TI_DAC5571 is not set
 CONFIG_TI_DAC7311=m
 CONFIG_TI_DAC7612=m
+# end of Digital to analog converters
 
 #
 # IIO dummy driver
@@ -7545,6 +8016,7 @@ CONFIG_TI_DAC7612=m
 CONFIG_IIO_SIMPLE_DUMMY=m
 # CONFIG_IIO_SIMPLE_DUMMY_EVENTS is not set
 # CONFIG_IIO_SIMPLE_DUMMY_BUFFER is not set
+# end of IIO dummy driver
 
 #
 # Frequency Synthesizers DDS/PLL
@@ -7554,11 +8026,15 @@ CONFIG_IIO_SIMPLE_DUMMY=m
 # Clock Generator/Distribution
 #
 CONFIG_AD9523=m
+# end of Clock Generator/Distribution
 
 #
 # Phase-Locked Loop (PLL) frequency synthesizers
 #
 CONFIG_ADF4350=m
+# CONFIG_ADF4371 is not set
+# end of Phase-Locked Loop (PLL) frequency synthesizers
+# end of Frequency Synthesizers DDS/PLL
 
 #
 # Digital gyroscope sensors
@@ -7571,6 +8047,9 @@ CONFIG_ADXRS450=m
 CONFIG_BMG160=m
 CONFIG_BMG160_I2C=m
 CONFIG_BMG160_SPI=m
+CONFIG_FXAS21002C=m
+CONFIG_FXAS21002C_I2C=m
+CONFIG_FXAS21002C_SPI=m
 CONFIG_HID_SENSOR_GYRO_3D=m
 CONFIG_MPU3050=m
 CONFIG_MPU3050_I2C=m
@@ -7578,6 +8057,7 @@ CONFIG_IIO_ST_GYRO_3AXIS=m
 CONFIG_IIO_ST_GYRO_I2C_3AXIS=m
 CONFIG_IIO_ST_GYRO_SPI_3AXIS=m
 CONFIG_ITG3200=m
+# end of Digital gyroscope sensors
 
 #
 # Health Sensors
@@ -7590,6 +8070,8 @@ CONFIG_AFE4403=m
 CONFIG_AFE4404=m
 CONFIG_MAX30100=m
 # CONFIG_MAX30102 is not set
+# end of Heart Rate Monitors
+# end of Health Sensors
 
 #
 # Humidity sensors
@@ -7604,6 +8086,7 @@ CONFIG_HTS221_SPI=m
 CONFIG_HTU21=m
 CONFIG_SI7005=m
 CONFIG_SI7020=m
+# end of Humidity sensors
 
 #
 # Inertial measurement units
@@ -7620,6 +8103,8 @@ CONFIG_INV_MPU6050_SPI=m
 CONFIG_IIO_ST_LSM6DSX=m
 CONFIG_IIO_ST_LSM6DSX_I2C=m
 CONFIG_IIO_ST_LSM6DSX_SPI=m
+# end of Inertial measurement units
+
 CONFIG_IIO_ADIS_LIB=m
 CONFIG_IIO_ADIS_LIB_BUFFER=y
 
@@ -7669,6 +8154,7 @@ CONFIG_VCNL4035=m
 CONFIG_VEML6070=m
 # CONFIG_VL6180 is not set
 # CONFIG_ZOPT2201 is not set
+# end of Light sensors
 
 #
 # Magnetometer sensors
@@ -7689,16 +8175,19 @@ CONFIG_IIO_ST_MAGN_SPI_3AXIS=m
 CONFIG_SENSORS_RM3100=m
 CONFIG_SENSORS_RM3100_I2C=m
 CONFIG_SENSORS_RM3100_SPI=m
+# end of Magnetometer sensors
 
 #
 # Multiplexers
 #
+# end of Multiplexers
 
 #
 # Inclinometer sensors
 #
 CONFIG_HID_SENSOR_INCLINOMETER_3D=m
 # CONFIG_HID_SENSOR_DEVICE_ROTATION is not set
+# end of Inclinometer sensors
 
 #
 # Triggers - standalone
@@ -7707,6 +8196,7 @@ CONFIG_IIO_HRTIMER_TRIGGER=m
 CONFIG_IIO_INTERRUPT_TRIGGER=m
 CONFIG_IIO_TIGHTLOOP_TRIGGER=m
 CONFIG_IIO_SYSFS_TRIGGER=m
+# end of Triggers - standalone
 
 #
 # Digital potentiometers
@@ -7720,11 +8210,13 @@ CONFIG_MCP4131=m
 CONFIG_MCP4531=m
 CONFIG_MCP41010=m
 CONFIG_TPL0102=m
+# end of Digital potentiometers
 
 #
 # Digital potentiostats
 #
 CONFIG_LMP91000=m
+# end of Digital potentiostats
 
 #
 # Pressure sensors
@@ -7734,6 +8226,7 @@ CONFIG_BMP280=m
 CONFIG_BMP280_I2C=m
 CONFIG_BMP280_SPI=m
 CONFIG_IIO_CROS_EC_BARO=m
+# CONFIG_DPS310 is not set
 CONFIG_HID_SENSOR_PRESS=m
 CONFIG_HP03=m
 CONFIG_MPL115=m
@@ -7752,28 +8245,33 @@ CONFIG_HP206C=m
 CONFIG_ZPA2326=m
 CONFIG_ZPA2326_I2C=m
 CONFIG_ZPA2326_SPI=m
+# end of Pressure sensors
 
 #
 # Lightning sensors
 #
 # CONFIG_AS3935 is not set
+# end of Lightning sensors
 
 #
 # Proximity and distance sensors
 #
 CONFIG_ISL29501=m
 CONFIG_LIDAR_LITE_V2=m
+CONFIG_MB1232=m
 CONFIG_RFD77402=m
 # CONFIG_SRF04 is not set
 CONFIG_SX9500=m
 CONFIG_SRF08=m
 CONFIG_VL53L0X_I2C=m
+# end of Proximity and distance sensors
 
 #
 # Resolver to digital converters
 #
 CONFIG_AD2S90=m
 CONFIG_AD2S1200=m
+# end of Resolver to digital converters
 
 #
 # Temperature sensors
@@ -7786,7 +8284,11 @@ CONFIG_TMP006=m
 CONFIG_TMP007=m
 CONFIG_TSYS01=m
 CONFIG_TSYS02D=m
+CONFIG_MAX31856=m
+# end of Temperature sensors
+
 CONFIG_NTB=m
+# CONFIG_NTB_MSI is not set
 # CONFIG_NTB_IDT is not set
 CONFIG_NTB_SWITCHTEC=m
 CONFIG_NTB_PINGPONG=m
@@ -7806,18 +8308,14 @@ CONFIG_PWM_PCA9685=m
 #
 # IRQ chip support
 #
-CONFIG_ARM_GIC_MAX_NR=1
 CONFIG_MADERA_IRQ=m
+# end of IRQ chip support
+
 CONFIG_IPACK_BUS=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_SERIAL_IPOCTAL=m
 CONFIG_RESET_CONTROLLER=y
 # CONFIG_RESET_TI_SYSCON is not set
-CONFIG_FMC=m
-CONFIG_FMC_FAKEDEV=m
-CONFIG_FMC_TRIVIAL=m
-CONFIG_FMC_WRITE_EEPROM=m
-CONFIG_FMC_CHARDEV=m
 
 #
 # PHY Subsystem
@@ -7830,7 +8328,10 @@ CONFIG_PHY_PXA_28NM_USB2=m
 CONFIG_PHY_QCOM_USB_HS=m
 CONFIG_PHY_QCOM_USB_HSIC=m
 CONFIG_PHY_TUSB1210=m
+# end of PHY Subsystem
+
 CONFIG_POWERCAP=y
+CONFIG_INTEL_RAPL_CORE=m
 CONFIG_INTEL_RAPL=m
 CONFIG_IDLE_INJECT=y
 CONFIG_MCB=m
@@ -7840,6 +8341,8 @@ CONFIG_MCB_LPC=m
 #
 # Performance monitor support
 #
+# end of Performance monitor support
+
 CONFIG_RAS=y
 CONFIG_THUNDERBOLT=m
 
@@ -7847,11 +8350,14 @@ CONFIG_THUNDERBOLT=m
 # Android
 #
 # CONFIG_ANDROID is not set
+# end of Android
+
 # CONFIG_LIBNVDIMM is not set
 CONFIG_DAX=y
 CONFIG_DEV_DAX=m
 CONFIG_DEV_DAX_KMEM=m
 CONFIG_NVMEM=y
+CONFIG_NVMEM_SYSFS=y
 
 #
 # HW tracing support
@@ -7870,6 +8376,8 @@ CONFIG_INTEL_TH_STH=m
 CONFIG_INTEL_TH_MSU=m
 CONFIG_INTEL_TH_PTI=m
 # CONFIG_INTEL_TH_DEBUG is not set
+# end of HW tracing support
+
 CONFIG_FPGA=m
 # CONFIG_ALTERA_PR_IP_CORE is not set
 CONFIG_FPGA_MGR_ALTERA_PS_SPI=m
@@ -7891,6 +8399,8 @@ CONFIG_PM_OPP=y
 # CONFIG_SIOX is not set
 # CONFIG_SLIMBUS is not set
 CONFIG_INTERCONNECT=m
+# CONFIG_COUNTER is not set
+# end of Device Drivers
 
 #
 # File systems
@@ -7991,6 +8501,7 @@ CONFIG_FSCACHE=m
 CONFIG_CACHEFILES=m
 # CONFIG_CACHEFILES_DEBUG is not set
 # CONFIG_CACHEFILES_HISTOGRAM is not set
+# end of Caches
 
 #
 # CD-ROM/DVD Filesystems
@@ -7999,6 +8510,7 @@ CONFIG_ISO9660_FS=m
 CONFIG_JOLIET=y
 CONFIG_ZISOFS=y
 CONFIG_UDF_FS=m
+# end of CD-ROM/DVD Filesystems
 
 #
 # DOS/FAT/NT Filesystems
@@ -8012,6 +8524,7 @@ CONFIG_FAT_DEFAULT_UTF8=y
 CONFIG_NTFS_FS=m
 # CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
+# end of DOS/FAT/NT Filesystems
 
 #
 # Pseudo filesystems
@@ -8023,6 +8536,7 @@ CONFIG_PROC_VMCORE=y
 CONFIG_PROC_SYSCTL=y
 CONFIG_PROC_PAGE_MONITOR=y
 CONFIG_PROC_CHILDREN=y
+CONFIG_PROC_PID_ARCH_STATUS=y
 CONFIG_KERNFS=y
 CONFIG_SYSFS=y
 CONFIG_TMPFS=y
@@ -8033,6 +8547,8 @@ CONFIG_HUGETLB_PAGE=y
 CONFIG_MEMFD_CREATE=y
 CONFIG_CONFIGFS_FS=m
 CONFIG_EFIVAR_FS=y
+# end of Pseudo filesystems
+
 CONFIG_MISC_FILESYSTEMS=y
 CONFIG_ORANGEFS_FS=m
 CONFIG_ADFS_FS=m
@@ -8042,7 +8558,8 @@ CONFIG_ECRYPT_FS=m
 # CONFIG_ECRYPT_FS_MESSAGING is not set
 CONFIG_HFS_FS=m
 CONFIG_HFSPLUS_FS=m
-# CONFIG_BEFS_FS is not set
+CONFIG_BEFS_FS=m
+# CONFIG_BEFS_DEBUG is not set
 # CONFIG_BFS_FS is not set
 # CONFIG_EFS_FS is not set
 # CONFIG_JFFS2_FS is not set
@@ -8129,12 +8646,13 @@ CONFIG_SUNRPC_GSS=m
 CONFIG_SUNRPC_BACKCHANNEL=y
 CONFIG_SUNRPC_SWAP=y
 CONFIG_RPCSEC_GSS_KRB5=m
-CONFIG_CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y
+# CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES is not set
 # CONFIG_SUNRPC_DEBUG is not set
 CONFIG_SUNRPC_XPRT_RDMA=m
 CONFIG_CEPH_FS=m
 CONFIG_CEPH_FSCACHE=y
 CONFIG_CEPH_FS_POSIX_ACL=y
+# CONFIG_CEPH_FS_SECURITY_LABEL is not set
 CONFIG_CIFS=m
 # CONFIG_CIFS_STATS2 is not set
 CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
@@ -8142,7 +8660,6 @@ CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
 # CONFIG_CIFS_UPCALL is not set
 CONFIG_CIFS_XATTR=y
 CONFIG_CIFS_POSIX=y
-CONFIG_CIFS_ACL=y
 # CONFIG_CIFS_DEBUG is not set
 CONFIG_CIFS_DFS_UPCALL=y
 # CONFIG_CIFS_SMB_DIRECT is not set
@@ -8209,11 +8726,15 @@ CONFIG_NLS_MAC_TURKISH=m
 CONFIG_NLS_UTF8=m
 CONFIG_DLM=m
 # CONFIG_DLM_DEBUG is not set
+CONFIG_UNICODE=y
+# CONFIG_UNICODE_NORMALIZATION_SELFTEST is not set
+# end of File systems
 
 #
 # Security options
 #
 CONFIG_KEYS=y
+# CONFIG_KEYS_REQUEST_CACHE is not set
 # CONFIG_PERSISTENT_KEYRINGS is not set
 # CONFIG_BIG_KEYS is not set
 CONFIG_TRUSTED_KEYS=m
@@ -8259,6 +8780,25 @@ CONFIG_INTEGRITY_AUDIT=y
 # CONFIG_DEFAULT_SECURITY_APPARMOR is not set
 CONFIG_DEFAULT_SECURITY_DAC=y
 CONFIG_LSM="yama,loadpin,safesetid,integrity"
+
+#
+# Kernel hardening options
+#
+
+#
+# Memory initialization
+#
+CONFIG_INIT_STACK_NONE=y
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_USER is not set
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL is not set
+# CONFIG_GCC_PLUGIN_STACKLEAK is not set
+# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
+# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
+# end of Memory initialization
+# end of Kernel hardening options
+# end of Security options
+
 CONFIG_XOR_BLOCKS=m
 CONFIG_ASYNC_CORE=m
 CONFIG_ASYNC_MEMCPY=m
@@ -8286,9 +8826,6 @@ CONFIG_CRYPTO_AKCIPHER=y
 CONFIG_CRYPTO_KPP2=y
 CONFIG_CRYPTO_KPP=y
 CONFIG_CRYPTO_ACOMP2=y
-CONFIG_CRYPTO_RSA=y
-CONFIG_CRYPTO_DH=y
-CONFIG_CRYPTO_ECDH=m
 CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MANAGER2=y
 CONFIG_CRYPTO_USER=m
@@ -8297,7 +8834,6 @@ CONFIG_CRYPTO_GF128MUL=y
 CONFIG_CRYPTO_NULL=m
 CONFIG_CRYPTO_NULL2=y
 CONFIG_CRYPTO_PCRYPT=m
-CONFIG_CRYPTO_WORKQUEUE=y
 CONFIG_CRYPTO_CRYPTD=y
 CONFIG_CRYPTO_AUTHENC=m
 CONFIG_CRYPTO_TEST=m
@@ -8305,6 +8841,15 @@ CONFIG_CRYPTO_SIMD=y
 CONFIG_CRYPTO_GLUE_HELPER_X86=y
 CONFIG_CRYPTO_ENGINE=m
 
+#
+# Public-key cryptography
+#
+CONFIG_CRYPTO_RSA=y
+CONFIG_CRYPTO_DH=y
+CONFIG_CRYPTO_ECC=m
+CONFIG_CRYPTO_ECDH=m
+CONFIG_CRYPTO_ECRDSA=m
+
 #
 # Authenticated Encryption with Associated Data
 #
@@ -8350,6 +8895,7 @@ CONFIG_CRYPTO_CRC32C=m
 CONFIG_CRYPTO_CRC32C_INTEL=m
 CONFIG_CRYPTO_CRC32=m
 CONFIG_CRYPTO_CRC32_PCLMUL=m
+# CONFIG_CRYPTO_XXHASH is not set
 CONFIG_CRYPTO_CRCT10DIF=y
 CONFIG_CRYPTO_GHASH=m
 CONFIG_CRYPTO_POLY1305=m
@@ -8365,7 +8911,7 @@ CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA512=y
 CONFIG_CRYPTO_SHA3=m
 # CONFIG_CRYPTO_SM3 is not set
-# CONFIG_CRYPTO_STREEBOG is not set
+CONFIG_CRYPTO_STREEBOG=m
 CONFIG_CRYPTO_TGR192=m
 CONFIG_CRYPTO_WP512=m
 
@@ -8377,6 +8923,7 @@ CONFIG_CRYPTO_AES_TI=m
 CONFIG_CRYPTO_AES_586=m
 CONFIG_CRYPTO_AES_NI_INTEL=m
 CONFIG_CRYPTO_ANUBIS=m
+CONFIG_CRYPTO_LIB_ARC4=m
 CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_BLOWFISH=m
 CONFIG_CRYPTO_BLOWFISH_COMMON=m
@@ -8430,6 +8977,8 @@ CONFIG_CRYPTO_DEV_PADLOCK=m
 CONFIG_CRYPTO_DEV_PADLOCK_AES=m
 CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
 CONFIG_CRYPTO_DEV_GEODE=m
+# CONFIG_CRYPTO_DEV_ATMEL_ECC is not set
+# CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set
 CONFIG_CRYPTO_DEV_CCP=y
 CONFIG_CRYPTO_DEV_CCP_DD=m
 CONFIG_CRYPTO_DEV_SP_CCP=y
@@ -8462,18 +9011,21 @@ CONFIG_SYSTEM_TRUSTED_KEYS=""
 # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
 # CONFIG_SECONDARY_TRUSTED_KEYRING is not set
 # CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
+# end of Certificates for signature checking
 
 #
 # Library routines
 #
 CONFIG_RAID6_PQ=m
 CONFIG_RAID6_PQ_BENCHMARK=y
+CONFIG_PACKING=y
 CONFIG_BITREVERSE=y
-CONFIG_RATIONAL=y
 CONFIG_GENERIC_STRNCPY_FROM_USER=y
 CONFIG_GENERIC_STRNLEN_USER=y
 CONFIG_GENERIC_NET_UTILS=y
 CONFIG_GENERIC_FIND_FIRST_BIT=y
+CONFIG_CORDIC=m
+CONFIG_RATIONAL=y
 CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_GENERIC_IOMAP=y
 CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
@@ -8525,8 +9077,8 @@ CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_REED_SOLOMON=m
 CONFIG_REED_SOLOMON_ENC8=y
 CONFIG_REED_SOLOMON_DEC8=y
+CONFIG_REED_SOLOMON_DEC16=y
 CONFIG_BCH=m
-CONFIG_BCH_CONST_PARAMS=y
 CONFIG_TEXTSEARCH=y
 CONFIG_TEXTSEARCH_KMP=m
 CONFIG_TEXTSEARCH_BM=m
@@ -8554,12 +9106,14 @@ CONFIG_GLOB=y
 CONFIG_NLATTR=y
 CONFIG_LRU_CACHE=m
 CONFIG_CLZ_TAB=y
-CONFIG_CORDIC=m
-CONFIG_DDR=y
 CONFIG_IRQ_POLL=y
 CONFIG_MPILIB=y
+CONFIG_DIMLIB=y
 CONFIG_OID_REGISTRY=y
 CONFIG_UCS2_STRING=y
+CONFIG_HAVE_GENERIC_VDSO=y
+CONFIG_GENERIC_GETTIMEOFDAY=y
+CONFIG_GENERIC_VDSO_32=y
 CONFIG_FONT_SUPPORT=y
 CONFIG_FONTS=y
 # CONFIG_FONT_8x8 is not set
@@ -8576,10 +9130,12 @@ CONFIG_FONT_8x16=y
 # CONFIG_FONT_TER16x32 is not set
 CONFIG_FONT_AUTOSELECT=y
 CONFIG_SG_POOL=y
+CONFIG_ARCH_STACKWALK=y
 CONFIG_SBITMAP=y
 CONFIG_PARMAN=m
-# CONFIG_STRING_SELFTEST is not set
 CONFIG_OBJAGG=m
+# CONFIG_STRING_SELFTEST is not set
+# end of Library routines
 
 #
 # Kernel hacking
@@ -8595,6 +9151,7 @@ CONFIG_CONSOLE_LOGLEVEL_QUIET=4
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_BOOT_PRINTK_DELAY is not set
 CONFIG_DYNAMIC_DEBUG=y
+# end of printk and dmesg options
 
 #
 # Compile-time checks and compiler options
@@ -8603,6 +9160,7 @@ CONFIG_DEBUG_INFO=y
 # CONFIG_DEBUG_INFO_REDUCED is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
 # CONFIG_DEBUG_INFO_DWARF4 is not set
+# CONFIG_DEBUG_INFO_BTF is not set
 # CONFIG_GDB_SCRIPTS is not set
 # CONFIG_ENABLE_MUST_CHECK is not set
 CONFIG_FRAME_WARN=1024
@@ -8610,15 +9168,19 @@ CONFIG_STRIP_ASM_SYMS=y
 # CONFIG_READABLE_ASM is not set
 # CONFIG_UNUSED_SYMBOLS is not set
 CONFIG_DEBUG_FS=y
-# CONFIG_HEADERS_CHECK is not set
+# CONFIG_HEADERS_INSTALL is not set
+# CONFIG_OPTIMIZE_INLINING is not set
 # CONFIG_DEBUG_SECTION_MISMATCH is not set
 CONFIG_SECTION_MISMATCH_WARN_ONLY=y
 CONFIG_FRAME_POINTER=y
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+# end of Compile-time checks and compiler options
+
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
 CONFIG_MAGIC_SYSRQ_SERIAL=y
 CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_MISC=y
 
 #
 # Memory Debugging
@@ -8646,6 +9208,8 @@ CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
 # CONFIG_DEBUG_STACKOVERFLOW is not set
 CONFIG_CC_HAS_KASAN_GENERIC=y
 CONFIG_KASAN_STACK=1
+# end of Memory Debugging
+
 CONFIG_CC_HAS_SANCOV_TRACE_PC=y
 # CONFIG_DEBUG_SHIRQ is not set
 
@@ -8662,6 +9226,8 @@ CONFIG_BOOTPARAM_HARDLOCKUP_PANIC=y
 CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=1
 # CONFIG_DETECT_HUNG_TASK is not set
 # CONFIG_WQ_WATCHDOG is not set
+# end of Debug Lockups and Hangs
+
 # CONFIG_PANIC_ON_OOPS is not set
 CONFIG_PANIC_ON_OOPS_VALUE=0
 CONFIG_PANIC_TIMEOUT=0
@@ -8688,12 +9254,14 @@ CONFIG_LOCK_DEBUGGING_SUPPORT=y
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_LOCK_TORTURE_TEST is not set
 CONFIG_WW_MUTEX_SELFTEST=m
+# end of Lock Debugging (spinlocks, mutexes, etc...)
+
 CONFIG_STACKTRACE=y
 # CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
 # CONFIG_DEBUG_KOBJECT is not set
 CONFIG_DEBUG_BUGVERBOSE=y
 CONFIG_DEBUG_LIST=y
-# CONFIG_DEBUG_PI_LIST is not set
+# CONFIG_DEBUG_PLIST is not set
 CONFIG_DEBUG_SG=y
 CONFIG_DEBUG_NOTIFIERS=y
 CONFIG_DEBUG_CREDENTIALS=y
@@ -8707,6 +9275,8 @@ CONFIG_RCU_PERF_TEST=m
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
 # CONFIG_RCU_TRACE is not set
 # CONFIG_RCU_EQS_DEBUG is not set
+# end of RCU Debugging
+
 # CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
 # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
@@ -8735,12 +9305,14 @@ CONFIG_LKDTM=m
 # CONFIG_KPROBES_SANITY_TEST is not set
 # CONFIG_BACKTRACE_SELF_TEST is not set
 # CONFIG_RBTREE_TEST is not set
+# CONFIG_REED_SOLOMON_TEST is not set
 # CONFIG_INTERVAL_TREE_TEST is not set
 # CONFIG_PERCPU_TEST is not set
 # CONFIG_ATOMIC64_SELFTEST is not set
 CONFIG_ASYNC_RAID6_TEST=m
 CONFIG_TEST_HEXDUMP=m
 CONFIG_TEST_STRING_HELPERS=m
+# CONFIG_TEST_STRSCPY is not set
 CONFIG_TEST_KSTRTOX=m
 CONFIG_TEST_PRINTF=m
 CONFIG_TEST_BITMAP=m
@@ -8756,6 +9328,7 @@ CONFIG_TEST_PARMAN=m
 # CONFIG_TEST_VMALLOC is not set
 # CONFIG_TEST_USER_COPY is not set
 # CONFIG_TEST_BPF is not set
+# CONFIG_TEST_BLACKHOLE_DEV is not set
 # CONFIG_FIND_BIT_BENCHMARK is not set
 # CONFIG_TEST_FIRMWARE is not set
 # CONFIG_TEST_SYSCTL is not set
@@ -8765,6 +9338,7 @@ CONFIG_TEST_STATIC_KEYS=m
 # CONFIG_TEST_MEMCAT_P is not set
 # CONFIG_TEST_OBJAGG is not set
 # CONFIG_TEST_STACKINIT is not set
+# CONFIG_TEST_MEMINIT is not set
 # CONFIG_MEMTEST is not set
 CONFIG_BUG_ON_DATA_CORRUPTION=y
 # CONFIG_SAMPLES is not set
@@ -8789,21 +9363,16 @@ CONFIG_DOUBLEFAULT=y
 # CONFIG_DEBUG_TLBFLUSH is not set
 CONFIG_HAVE_MMIOTRACE_SUPPORT=y
 # CONFIG_X86_DECODER_SELFTEST is not set
-CONFIG_IO_DELAY_TYPE_0X80=0
-CONFIG_IO_DELAY_TYPE_0XED=1
-CONFIG_IO_DELAY_TYPE_UDELAY=2
-CONFIG_IO_DELAY_TYPE_NONE=3
 CONFIG_IO_DELAY_0X80=y
 # CONFIG_IO_DELAY_0XED is not set
 # CONFIG_IO_DELAY_UDELAY is not set
 # CONFIG_IO_DELAY_NONE is not set
-CONFIG_DEFAULT_IO_DELAY_TYPE=0
 # CONFIG_DEBUG_BOOT_PARAMS is not set
 # CONFIG_CPA_DEBUG is not set
-# CONFIG_OPTIMIZE_INLINING is not set
 # CONFIG_DEBUG_ENTRY is not set
 # CONFIG_DEBUG_NMI_SELFTEST is not set
 CONFIG_X86_DEBUG_FPU=y
 CONFIG_PUNIT_ATOM_DEBUG=m
 CONFIG_UNWINDER_FRAME_POINTER=y
 # CONFIG_UNWINDER_GUESS is not set
+# end of Kernel hacking
diff --git a/srcpkgs/linux5.1/files/mv-debug b/srcpkgs/linux5.3/files/mv-debug
similarity index 100%
rename from srcpkgs/linux5.1/files/mv-debug
rename to srcpkgs/linux5.3/files/mv-debug
diff --git a/srcpkgs/linux5.1/files/ppc-dotconfig b/srcpkgs/linux5.3/files/ppc-dotconfig
similarity index 93%
rename from srcpkgs/linux5.1/files/ppc-dotconfig
rename to srcpkgs/linux5.3/files/ppc-dotconfig
index d8d37b70a45..e6ab7a55c16 100644
--- a/srcpkgs/linux5.1/files/ppc-dotconfig
+++ b/srcpkgs/linux5.3/files/ppc-dotconfig
@@ -1,14 +1,15 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.1.18 Kernel Configuration
+# Linux/powerpc 5.3.0 Kernel Configuration
 #
 
 #
-# Compiler: powerpc-linux-gnu-gcc (GCC) 9.1.0
+# Compiler: powerpc-linux-gnu-gcc (GCC) 9.2.0
 #
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=90100
+CONFIG_GCC_VERSION=90200
 CONFIG_CLANG_VERSION=0
+CONFIG_CC_CAN_LINK=y
 CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y
 CONFIG_IRQ_WORK=y
@@ -20,6 +21,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
 #
 CONFIG_INIT_ENV_ARG_LIMIT=32
 # CONFIG_COMPILE_TEST is not set
+# CONFIG_HEADER_TEST is not set
 CONFIG_LOCALVERSION="_1"
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_BUILD_SALT=""
@@ -50,6 +52,8 @@ CONFIG_GENERIC_MSI_IRQ=y
 CONFIG_IRQ_FORCED_THREADING=y
 CONFIG_SPARSE_IRQ=y
 # CONFIG_GENERIC_IRQ_DEBUGFS is not set
+# end of IRQ subsystem
+
 CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_ARCH_HAS_TICK_BROADCAST=y
@@ -65,6 +69,8 @@ CONFIG_NO_HZ_COMMON=y
 CONFIG_NO_HZ_IDLE=y
 # CONFIG_NO_HZ is not set
 CONFIG_HIGH_RES_TIMERS=y
+# end of Timers subsystem
+
 # CONFIG_PREEMPT_NONE is not set
 CONFIG_PREEMPT_VOLUNTARY=y
 # CONFIG_PREEMPT is not set
@@ -81,7 +87,10 @@ CONFIG_TASKSTATS=y
 CONFIG_TASK_DELAY_ACCT=y
 CONFIG_TASK_XACCT=y
 CONFIG_TASK_IO_ACCOUNTING=y
-# CONFIG_PSI is not set
+CONFIG_PSI=y
+CONFIG_PSI_DEFAULT_DISABLED=y
+# end of CPU/Task time and stats accounting
+
 CONFIG_CPU_ISOLATION=y
 
 #
@@ -93,12 +102,20 @@ CONFIG_SRCU=y
 CONFIG_TREE_SRCU=y
 CONFIG_RCU_STALL_COMMON=y
 CONFIG_RCU_NEED_SEGCBLIST=y
-CONFIG_BUILD_BIN2C=y
+# end of RCU Subsystem
+
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
+CONFIG_IKHEADERS=m
 CONFIG_LOG_BUF_SHIFT=17
 CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
 CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
+
+#
+# Scheduler features
+#
+# end of Scheduler features
+
 CONFIG_CGROUPS=y
 CONFIG_PAGE_COUNTER=y
 CONFIG_MEMCG=y
@@ -106,7 +123,6 @@ CONFIG_MEMCG_SWAP=y
 # CONFIG_MEMCG_SWAP_ENABLED is not set
 CONFIG_MEMCG_KMEM=y
 CONFIG_BLK_CGROUP=y
-# CONFIG_DEBUG_BLK_CGROUP is not set
 CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
@@ -145,7 +161,6 @@ CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
 CONFIG_HAVE_LD_DEAD_CODE_DATA_ELIMINATION=y
 # CONFIG_LD_DEAD_CODE_DATA_ELIMINATION is not set
 CONFIG_SYSCTL=y
-CONFIG_ANON_INODES=y
 CONFIG_SYSCTL_EXCEPTION_TRACE=y
 CONFIG_HAVE_PCSPKR_PLATFORM=y
 CONFIG_BPF=y
@@ -189,6 +204,8 @@ CONFIG_HAVE_PERF_EVENTS=y
 # Kernel Performance Events And Counters
 #
 CONFIG_PERF_EVENTS=y
+# end of Kernel Performance Events And Counters
+
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_SLUB_DEBUG=y
 # CONFIG_SLUB_MEMCG_SYSFS_ON is not set
@@ -199,10 +216,13 @@ CONFIG_SLUB=y
 CONFIG_SLAB_MERGE_DEFAULT=y
 CONFIG_SLAB_FREELIST_RANDOM=y
 CONFIG_SLAB_FREELIST_HARDENED=y
+CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
 CONFIG_SLUB_CPU_PARTIAL=y
 CONFIG_SYSTEM_DATA_VERIFICATION=y
 CONFIG_PROFILING=y
 CONFIG_TRACEPOINTS=y
+# end of General setup
+
 # CONFIG_PPC64 is not set
 
 #
@@ -221,10 +241,16 @@ CONFIG_GENERIC_CPU=y
 CONFIG_PPC_BOOK3S=y
 CONFIG_PPC_FPU=y
 CONFIG_ALTIVEC=y
+CONFIG_PPC_HAVE_KUEP=y
+CONFIG_PPC_KUEP=y
+CONFIG_PPC_HAVE_KUAP=y
+CONFIG_PPC_KUAP=y
 CONFIG_PPC_HAVE_PMU_SUPPORT=y
 CONFIG_PPC_PERF_CTRS=y
 CONFIG_SMP=y
 CONFIG_NR_CPUS=2048
+# end of Processor support
+
 CONFIG_VDSO32=y
 CONFIG_CPU_BIG_ENDIAN=y
 CONFIG_PPC32=y
@@ -239,7 +265,6 @@ CONFIG_NMI_IPI=y
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_PPC=y
 CONFIG_EARLY_PRINTK=y
@@ -315,6 +340,7 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
 #
 # CONFIG_CPUFREQ_DT is not set
 CONFIG_CPU_FREQ_PMAC=y
+# end of CPU Frequency scaling
 
 #
 # CPUIdle driver
@@ -324,12 +350,16 @@ CONFIG_CPU_FREQ_PMAC=y
 # CPU Idle
 #
 # CONFIG_CPU_IDLE is not set
+# end of CPU Idle
+# end of CPUIdle driver
+
 CONFIG_PPC601_SYNC_FIX=y
 CONFIG_TAU=y
 # CONFIG_TAU_INT is not set
 # CONFIG_TAU_AVERAGE is not set
 # CONFIG_GEN_RTC is not set
 # CONFIG_SIMPLE_GPIO is not set
+# end of Platform support
 
 #
 # Kernel options
@@ -357,6 +387,7 @@ CONFIG_ETEXT_SHIFT=12
 CONFIG_DATA_SHIFT=12
 CONFIG_FORCE_MAX_ZONEORDER=11
 # CONFIG_CMDLINE_BOOL is not set
+CONFIG_CMDLINE=""
 CONFIG_EXTRA_TARGETS=""
 CONFIG_ARCH_WANTS_FREEZER_CONTROL=y
 CONFIG_SUSPEND=y
@@ -379,6 +410,8 @@ CONFIG_PM_CLK=y
 # CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
 CONFIG_ENERGY_MODEL=y
 CONFIG_SECCOMP=y
+# end of Kernel options
+
 CONFIG_ISA_DMA_API=y
 
 #
@@ -388,6 +421,7 @@ CONFIG_ISA_DMA_API=y
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_PPC_INDIRECT_PCI=y
 # CONFIG_FSL_LBC is not set
+# end of Bus options
 
 #
 # Advanced setup
@@ -402,6 +436,8 @@ CONFIG_PAGE_OFFSET=0xc0000000
 CONFIG_KERNEL_START=0xc0000000
 CONFIG_PHYSICAL_START=0x00000000
 CONFIG_TASK_SIZE=0xc0000000
+# end of Advanced setup
+
 CONFIG_PPC_LIB_RHEAP=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_VHOST_NET=m
@@ -442,6 +478,8 @@ CONFIG_HAVE_PERF_REGS=y
 CONFIG_HAVE_PERF_USER_STACK_DUMP=y
 CONFIG_HAVE_ARCH_JUMP_LABEL=y
 CONFIG_HAVE_RCU_TABLE_FREE=y
+CONFIG_HAVE_RCU_TABLE_NO_INVALIDATE=y
+CONFIG_HAVE_MMU_GATHER_PAGE_SIZE=y
 CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
 CONFIG_ARCH_WEAK_RELEASE_ACQUIRE=y
 CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
@@ -467,15 +505,28 @@ CONFIG_64BIT_TIME=y
 CONFIG_COMPAT_32BIT_TIME=y
 CONFIG_ARCH_HAS_PHYS_TO_DMA=y
 # CONFIG_REFCOUNT_FULL is not set
+# CONFIG_LOCK_EVENT_COUNTS is not set
 
 #
 # GCOV-based kernel profiling
 #
 # CONFIG_GCOV_KERNEL is not set
 CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
+# end of GCOV-based kernel profiling
+
 CONFIG_PLUGIN_HOSTCC="g++"
 CONFIG_HAVE_GCC_PLUGINS=y
-# CONFIG_GCC_PLUGINS is not set
+CONFIG_GCC_PLUGINS=y
+
+#
+# GCC plugins
+#
+# CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set
+# CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
+# CONFIG_GCC_PLUGIN_RANDSTRUCT is not set
+# end of GCC plugins
+# end of General architecture-dependent options
+
 CONFIG_RT_MUTEXES=y
 CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
@@ -489,7 +540,6 @@ CONFIG_MODVERSIONS=y
 # CONFIG_TRIM_UNUSED_KSYMS is not set
 CONFIG_MODULES_TREE_LOOKUP=y
 CONFIG_BLOCK=y
-CONFIG_LBDAF=y
 CONFIG_BLK_SCSI_REQUEST=y
 CONFIG_BLK_DEV_BSG=y
 CONFIG_BLK_DEV_BSGLIB=y
@@ -529,6 +579,8 @@ CONFIG_LDM_PARTITION=y
 CONFIG_EFI_PARTITION=y
 # CONFIG_SYSV68_PARTITION is not set
 CONFIG_CMDLINE_PARTITION=y
+# end of Partition Types
+
 CONFIG_BLK_MQ_PCI=y
 CONFIG_BLK_MQ_VIRTIO=y
 CONFIG_BLK_MQ_RDMA=y
@@ -541,6 +593,9 @@ CONFIG_MQ_IOSCHED_DEADLINE=y
 CONFIG_MQ_IOSCHED_KYBER=y
 CONFIG_IOSCHED_BFQ=y
 CONFIG_BFQ_GROUP_IOSCHED=y
+# CONFIG_BFQ_CGROUP_DEBUG is not set
+# end of IO Schedulers
+
 CONFIG_ASN1=y
 CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
 CONFIG_INLINE_READ_UNLOCK=y
@@ -562,6 +617,7 @@ CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 CONFIG_BINFMT_SCRIPT=y
 CONFIG_BINFMT_MISC=m
 CONFIG_COREDUMP=y
+# end of Executable file formats
 
 #
 # Memory Management options
@@ -569,7 +625,8 @@ CONFIG_COREDUMP=y
 CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
-CONFIG_HAVE_GENERIC_GUP=y
+CONFIG_HAVE_FAST_GUP=y
+CONFIG_ARCH_KEEP_MEMBLOCK=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_MEMORY_BALLOON=y
 CONFIG_BALLOON_COMPACTION=y
@@ -593,6 +650,8 @@ CONFIG_FRAME_VECTOR=y
 # CONFIG_PERCPU_STATS is not set
 # CONFIG_GUP_BENCHMARK is not set
 CONFIG_ARCH_HAS_PTE_SPECIAL=y
+# end of Memory Management options
+
 CONFIG_NET=y
 CONFIG_NET_INGRESS=y
 CONFIG_NET_EGRESS=y
@@ -652,9 +711,6 @@ CONFIG_INET_ESP_OFFLOAD=m
 CONFIG_INET_IPCOMP=m
 CONFIG_INET_XFRM_TUNNEL=m
 CONFIG_INET_TUNNEL=m
-CONFIG_INET_XFRM_MODE_TRANSPORT=m
-CONFIG_INET_XFRM_MODE_TUNNEL=m
-CONFIG_INET_XFRM_MODE_BEET=m
 CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 CONFIG_INET_UDP_DIAG=m
@@ -693,10 +749,6 @@ CONFIG_IPV6_MIP6=y
 CONFIG_IPV6_ILA=m
 CONFIG_INET6_XFRM_TUNNEL=m
 CONFIG_INET6_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-CONFIG_INET6_XFRM_MODE_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_BEET=m
-CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
 CONFIG_IPV6_VTI=m
 CONFIG_IPV6_SIT=m
 CONFIG_IPV6_SIT_6RD=y
@@ -764,7 +816,6 @@ CONFIG_NF_CT_NETLINK_TIMEOUT=m
 CONFIG_NF_CT_NETLINK_HELPER=m
 CONFIG_NETFILTER_NETLINK_GLUE_CT=y
 CONFIG_NF_NAT=m
-CONFIG_NF_NAT_NEEDED=y
 CONFIG_NF_NAT_AMANDA=m
 CONFIG_NF_NAT_FTP=m
 CONFIG_NF_NAT_IRC=m
@@ -801,6 +852,7 @@ CONFIG_NFT_XFRM=m
 CONFIG_NFT_SOCKET=m
 CONFIG_NFT_OSF=m
 CONFIG_NFT_TPROXY=m
+# CONFIG_NFT_SYNPROXY is not set
 CONFIG_NF_DUP_NETDEV=m
 CONFIG_NFT_DUP_NETDEV=m
 CONFIG_NFT_FWD_NETDEV=m
@@ -839,6 +891,7 @@ CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 # CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
 CONFIG_NETFILTER_XT_TARGET_RATEEST=m
 CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
+CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m
 CONFIG_NETFILTER_XT_TARGET_TEE=m
 CONFIG_NETFILTER_XT_TARGET_TPROXY=m
 CONFIG_NETFILTER_XT_TARGET_TRACE=m
@@ -895,6 +948,8 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m
 CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
 CONFIG_NETFILTER_XT_MATCH_TIME=m
 CONFIG_NETFILTER_XT_MATCH_U32=m
+# end of Core Netfilter Configuration
+
 CONFIG_IP_SET=m
 CONFIG_IP_SET_MAX=256
 CONFIG_IP_SET_BITMAP_IP=m
@@ -969,7 +1024,6 @@ CONFIG_NF_DEFRAG_IPV4=m
 CONFIG_NF_SOCKET_IPV4=m
 CONFIG_NF_TPROXY_IPV4=m
 CONFIG_NF_TABLES_IPV4=y
-CONFIG_NFT_CHAIN_ROUTE_IPV4=m
 CONFIG_NFT_REJECT_IPV4=m
 CONFIG_NFT_DUP_IPV4=m
 CONFIG_NFT_FIB_IPV4=m
@@ -1003,6 +1057,7 @@ CONFIG_IP_NF_SECURITY=m
 CONFIG_IP_NF_ARPTABLES=m
 CONFIG_IP_NF_ARPFILTER=m
 CONFIG_IP_NF_ARP_MANGLE=m
+# end of IP: Netfilter Configuration
 
 #
 # IPv6: Netfilter Configuration
@@ -1010,7 +1065,6 @@ CONFIG_IP_NF_ARP_MANGLE=m
 CONFIG_NF_SOCKET_IPV6=m
 CONFIG_NF_TPROXY_IPV6=m
 CONFIG_NF_TABLES_IPV6=y
-CONFIG_NFT_CHAIN_ROUTE_IPV6=m
 CONFIG_NFT_REJECT_IPV6=m
 CONFIG_NFT_DUP_IPV6=m
 CONFIG_NFT_FIB_IPV6=m
@@ -1039,15 +1093,21 @@ CONFIG_IP6_NF_SECURITY=m
 CONFIG_IP6_NF_NAT=m
 CONFIG_IP6_NF_TARGET_MASQUERADE=m
 CONFIG_IP6_NF_TARGET_NPT=m
+# end of IPv6: Netfilter Configuration
+
 CONFIG_NF_DEFRAG_IPV6=m
 
 #
 # DECnet: Netfilter Configuration
 #
 CONFIG_DECNET_NF_GRABULATOR=m
-CONFIG_NF_TABLES_BRIDGE=y
+# end of DECnet: Netfilter Configuration
+
+CONFIG_NF_TABLES_BRIDGE=m
+# CONFIG_NFT_BRIDGE_META is not set
 CONFIG_NFT_BRIDGE_REJECT=m
 CONFIG_NF_LOG_BRIDGE=m
+# CONFIG_NF_CONNTRACK_BRIDGE is not set
 CONFIG_BRIDGE_NF_EBTABLES=m
 CONFIG_BRIDGE_EBT_BROUTE=m
 CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -1080,11 +1140,14 @@ CONFIG_INET_DCCP_DIAG=m
 CONFIG_IP_DCCP_CCID3=y
 # CONFIG_IP_DCCP_CCID3_DEBUG is not set
 CONFIG_IP_DCCP_TFRC_LIB=y
+# end of DCCP CCIDs Configuration
 
 #
 # DCCP Kernel Hacking
 #
 # CONFIG_IP_DCCP_DEBUG is not set
+# end of DCCP Kernel Hacking
+
 CONFIG_IP_SCTP=m
 # CONFIG_SCTP_DBG_OBJCNT is not set
 CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5=y
@@ -1233,16 +1296,18 @@ CONFIG_NET_ACT_PEDIT=m
 CONFIG_NET_ACT_SIMP=m
 CONFIG_NET_ACT_SKBEDIT=m
 CONFIG_NET_ACT_CSUM=m
+# CONFIG_NET_ACT_MPLS is not set
 CONFIG_NET_ACT_VLAN=m
 CONFIG_NET_ACT_BPF=m
 CONFIG_NET_ACT_CONNMARK=m
+# CONFIG_NET_ACT_CTINFO is not set
 CONFIG_NET_ACT_SKBMOD=m
 CONFIG_NET_ACT_IFE=m
 CONFIG_NET_ACT_TUNNEL_KEY=m
+# CONFIG_NET_ACT_CT is not set
 CONFIG_NET_IFE_SKBMARK=m
 CONFIG_NET_IFE_SKBPRIO=m
 CONFIG_NET_IFE_SKBTCINDEX=m
-CONFIG_NET_CLS_IND=y
 CONFIG_NET_SCH_FIFO=y
 CONFIG_DCB=y
 CONFIG_DNS_RESOLVER=m
@@ -1254,6 +1319,7 @@ CONFIG_BATMAN_ADV_NC=y
 CONFIG_BATMAN_ADV_MCAST=y
 CONFIG_BATMAN_ADV_DEBUGFS=y
 # CONFIG_BATMAN_ADV_DEBUG is not set
+CONFIG_BATMAN_ADV_SYSFS=y
 # CONFIG_BATMAN_ADV_TRACING is not set
 CONFIG_OPENVSWITCH=m
 CONFIG_OPENVSWITCH_GRE=m
@@ -1289,6 +1355,9 @@ CONFIG_NET_FLOW_LIMIT=y
 #
 CONFIG_NET_PKTGEN=m
 CONFIG_NET_DROP_MONITOR=m
+# end of Network testing
+# end of Networking options
+
 CONFIG_HAMRADIO=y
 
 #
@@ -1310,6 +1379,8 @@ CONFIG_BAYCOM_SER_HDX=m
 CONFIG_BAYCOM_PAR=m
 CONFIG_BAYCOM_EPP=m
 CONFIG_YAM=m
+# end of AX.25 network device drivers
+
 CONFIG_CAN=m
 CONFIG_CAN_RAW=m
 CONFIG_CAN_BCM=m
@@ -1349,6 +1420,7 @@ CONFIG_CAN_SOFTING_CS=m
 #
 # CONFIG_CAN_HI311X is not set
 # CONFIG_CAN_MCP251X is not set
+# end of CAN SPI interfaces
 
 #
 # CAN USB interfaces
@@ -1361,7 +1433,11 @@ CONFIG_CAN_KVASER_USB=m
 CONFIG_CAN_MCBA_USB=m
 CONFIG_CAN_PEAK_USB=m
 CONFIG_CAN_UCAN=m
+# end of CAN USB interfaces
+
 # CONFIG_CAN_DEBUG_DEVICES is not set
+# end of CAN Device Drivers
+
 CONFIG_BT=m
 CONFIG_BT_BREDR=y
 CONFIG_BT_RFCOMM=m
@@ -1388,6 +1464,7 @@ CONFIG_BT_QCA=m
 CONFIG_BT_HCIBTUSB=m
 CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
 CONFIG_BT_HCIBTUSB_BCM=y
+# CONFIG_BT_HCIBTUSB_MTK is not set
 CONFIG_BT_HCIBTUSB_RTL=y
 CONFIG_BT_HCIBTSDIO=m
 CONFIG_BT_HCIUART=m
@@ -1410,8 +1487,11 @@ CONFIG_BT_HCIVHCI=m
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
 CONFIG_BT_ATH3K=m
+CONFIG_BT_MTKSDIO=m
 CONFIG_BT_MTKUART=m
 CONFIG_BT_HCIRSI=m
+# end of Bluetooth device drivers
+
 CONFIG_AF_RXRPC=m
 CONFIG_AF_RXRPC_IPV6=y
 # CONFIG_AF_RXRPC_INJECT_LOSS is not set
@@ -1483,6 +1563,8 @@ CONFIG_NFC_PN533=m
 CONFIG_NFC_PN533_USB=m
 # CONFIG_NFC_PN533_I2C is not set
 # CONFIG_NFC_ST95HF is not set
+# end of Near Field Communication (NFC) devices
+
 CONFIG_PSAMPLE=m
 CONFIG_NET_IFE=m
 CONFIG_LWTUNNEL=y
@@ -1537,6 +1619,8 @@ CONFIG_PCI_IOV=y
 # Cadence PCIe controllers support
 #
 # CONFIG_PCIE_CADENCE_HOST is not set
+# end of Cadence PCIe controllers support
+
 # CONFIG_PCI_FTPCI100 is not set
 # CONFIG_PCI_HOST_GENERIC is not set
 # CONFIG_PCIE_XILINX is not set
@@ -1544,16 +1628,21 @@ CONFIG_PCI_IOV=y
 #
 # DesignWare PCI Core Support
 #
+# end of DesignWare PCI Core Support
+# end of PCI controller drivers
 
 #
 # PCI Endpoint
 #
 # CONFIG_PCI_ENDPOINT is not set
+# end of PCI Endpoint
 
 #
 # PCI switch controller drivers
 #
 # CONFIG_PCI_SW_SWITCHTEC is not set
+# end of PCI switch controller drivers
+
 CONFIG_PCCARD=m
 CONFIG_PCMCIA=m
 CONFIG_PCMCIA_LOAD_CIS=y
@@ -1588,6 +1677,9 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
 CONFIG_EXTRA_FIRMWARE=""
 # CONFIG_FW_LOADER_USER_HELPER is not set
+# CONFIG_FW_LOADER_COMPRESS is not set
+# end of Firmware loader
+
 CONFIG_WANT_DEV_COREDUMP=y
 CONFIG_ALLOW_DEV_COREDUMP=y
 CONFIG_DEV_COREDUMP=y
@@ -1602,11 +1694,14 @@ CONFIG_REGMAP_SPI=y
 CONFIG_REGMAP_IRQ=y
 CONFIG_DMA_SHARED_BUFFER=y
 # CONFIG_DMA_FENCE_TRACE is not set
+# end of Generic Driver Options
 
 #
 # Bus devices
 #
 # CONFIG_SIMPLE_PM_BUS is not set
+# end of Bus devices
+
 CONFIG_CONNECTOR=y
 CONFIG_PROC_EVENTS=y
 CONFIG_GNSS=m
@@ -1680,6 +1775,7 @@ CONFIG_NVME_TARGET_RDMA=m
 CONFIG_NVME_TARGET_FC=m
 # CONFIG_NVME_TARGET_FCLOOP is not set
 CONFIG_NVME_TARGET_TCP=m
+# end of NVME Support
 
 #
 # Misc devices
@@ -1704,10 +1800,10 @@ CONFIG_SENSORS_BH1770=m
 CONFIG_SENSORS_APDS990X=m
 CONFIG_HMC6352=m
 CONFIG_DS1682=m
-# CONFIG_USB_SWITCH_FSA9480 is not set
 # CONFIG_LATTICE_ECP3_CONFIG is not set
 # CONFIG_SRAM is not set
 # CONFIG_PCI_ENDPOINT_TEST is not set
+# CONFIG_XILINX_SDFEC is not set
 CONFIG_MISC_RTSX=m
 CONFIG_PVPANIC=m
 CONFIG_C2PORT=m
@@ -1723,6 +1819,8 @@ CONFIG_EEPROM_93CX6=m
 # CONFIG_EEPROM_93XX46 is not set
 # CONFIG_EEPROM_IDT_89HPESX is not set
 CONFIG_EEPROM_EE1004=m
+# end of EEPROM support
+
 CONFIG_CB710_CORE=m
 # CONFIG_CB710_DEBUG is not set
 CONFIG_CB710_DEBUG_ASSUMPTIONS=y
@@ -1730,6 +1828,8 @@ CONFIG_CB710_DEBUG_ASSUMPTIONS=y
 #
 # Texas Instruments shared transport line discipline
 #
+# end of Texas Instruments shared transport line discipline
+
 # CONFIG_SENSORS_LIS3_SPI is not set
 CONFIG_SENSORS_LIS3_I2C=m
 CONFIG_ALTERA_STAPL=m
@@ -1772,11 +1872,15 @@ CONFIG_VOP_BUS=m
 #
 CONFIG_VOP=m
 CONFIG_VHOST_RING=m
+# end of Intel MIC & related support
+
 # CONFIG_ECHO is not set
 CONFIG_MISC_ALCOR_PCI=m
 CONFIG_MISC_RTSX_PCI=m
 CONFIG_MISC_RTSX_USB=m
 CONFIG_HABANA_AI=m
+# end of Misc devices
+
 CONFIG_HAVE_IDE=y
 # CONFIG_IDE is not set
 
@@ -1795,7 +1899,6 @@ CONFIG_SCSI_NETLINK=y
 #
 CONFIG_BLK_DEV_SD=m
 CONFIG_CHR_DEV_ST=m
-CONFIG_CHR_DEV_OSST=m
 CONFIG_BLK_DEV_SR=m
 CONFIG_BLK_DEV_SR_VENDOR=y
 CONFIG_CHR_DEV_SG=m
@@ -1816,6 +1919,8 @@ CONFIG_SCSI_SAS_LIBSAS=m
 CONFIG_SCSI_SAS_ATA=y
 CONFIG_SCSI_SAS_HOST_SMP=y
 CONFIG_SCSI_SRP_ATTRS=m
+# end of SCSI Transports
+
 CONFIG_SCSI_LOWLEVEL=y
 CONFIG_ISCSI_TCP=m
 CONFIG_ISCSI_BOOT_SYSFS=m
@@ -1877,6 +1982,7 @@ CONFIG_FCOE=m
 CONFIG_SCSI_SNIC=m
 # CONFIG_SCSI_SNIC_DEBUG_FS is not set
 CONFIG_SCSI_DMX3191D=m
+# CONFIG_SCSI_FDOMAIN_PCI is not set
 # CONFIG_SCSI_GDTH is not set
 CONFIG_SCSI_IPS=m
 # CONFIG_SCSI_INITIO is not set
@@ -1917,6 +2023,7 @@ CONFIG_SCSI_VIRTIO=m
 CONFIG_SCSI_CHELSIO_FCOE=m
 CONFIG_SCSI_LOWLEVEL_PCMCIA=y
 CONFIG_PCMCIA_AHA152X=m
+# CONFIG_PCMCIA_FDOMAIN is not set
 CONFIG_PCMCIA_NINJA_SCSI=m
 CONFIG_PCMCIA_QLOGIC=m
 CONFIG_PCMCIA_SYM53C500=m
@@ -1925,6 +2032,8 @@ CONFIG_SCSI_DH_RDAC=m
 CONFIG_SCSI_DH_HP_SW=m
 CONFIG_SCSI_DH_EMC=m
 CONFIG_SCSI_DH_ALUA=m
+# end of SCSI device support
+
 CONFIG_ATA=m
 CONFIG_ATA_VERBOSE_ERROR=y
 CONFIG_SATA_PMP=y
@@ -2056,6 +2165,7 @@ CONFIG_DM_MULTIPATH=m
 CONFIG_DM_MULTIPATH_QL=m
 CONFIG_DM_MULTIPATH_ST=m
 CONFIG_DM_DELAY=m
+CONFIG_DM_DUST=m
 CONFIG_DM_UEVENT=y
 CONFIG_DM_FLAKEY=m
 CONFIG_DM_VERITY=m
@@ -2091,6 +2201,8 @@ CONFIG_FIREWIRE_OHCI=m
 CONFIG_FIREWIRE_SBP2=m
 CONFIG_FIREWIRE_NET=m
 CONFIG_FIREWIRE_NOSY=m
+# end of IEEE 1394 (FireWire) support
+
 CONFIG_MACINTOSH_DRIVERS=y
 CONFIG_ADB=y
 CONFIG_ADB_CUDA=y
@@ -2201,6 +2313,8 @@ CONFIG_ATM_SOLOS=m
 #
 # Distributed Switch Architecture drivers
 #
+# end of Distributed Switch Architecture drivers
+
 CONFIG_ETHERNET=y
 CONFIG_MDIO=m
 CONFIG_NET_VENDOR_3COM=y
@@ -2308,6 +2422,8 @@ CONFIG_FEC_MPC52xx_MDIO=y
 # CONFIG_GIANFAR is not set
 CONFIG_NET_VENDOR_FUJITSU=y
 CONFIG_PCMCIA_FMVJ18X=m
+CONFIG_NET_VENDOR_GOOGLE=y
+# CONFIG_GVE is not set
 CONFIG_NET_VENDOR_HP=y
 # CONFIG_HP100 is not set
 CONFIG_NET_VENDOR_HUAWEI=y
@@ -2357,7 +2473,7 @@ CONFIG_MLX5_EN_RXNFC=y
 CONFIG_MLX5_MPFS=y
 CONFIG_MLX5_CORE_EN_DCB=y
 CONFIG_MLX5_CORE_IPOIB=y
-# CONFIG_MLX5_EN_IPSEC is not set
+# CONFIG_MLX5_FPGA_IPSEC is not set
 # CONFIG_MLXSW_CORE is not set
 CONFIG_MLXFW=m
 CONFIG_NET_VENDOR_MICREL=y
@@ -2461,7 +2577,6 @@ CONFIG_NET_VENDOR_TEHUTI=y
 CONFIG_TEHUTI=m
 CONFIG_NET_VENDOR_TI=y
 # CONFIG_TI_CPSW_PHY_SEL is not set
-# CONFIG_TI_CPSW_ALE is not set
 CONFIG_TLAN=m
 CONFIG_NET_VENDOR_VIA=y
 CONFIG_VIA_RHINE=m
@@ -2524,6 +2639,7 @@ CONFIG_MICROCHIP_PHY=m
 CONFIG_MICROCHIP_T1_PHY=m
 CONFIG_MICROSEMI_PHY=m
 CONFIG_NATIONAL_PHY=m
+# CONFIG_NXP_TJA11XX_PHY is not set
 CONFIG_QSEMI_PHY=m
 CONFIG_REALTEK_PHY=m
 CONFIG_RENESAS_PHY=m
@@ -2716,6 +2832,8 @@ CONFIG_IWL3945=m
 # iwl3945 / iwl4965 Debugging Options
 #
 # CONFIG_IWLEGACY_DEBUG is not set
+# end of iwl3945 / iwl4965 Debugging Options
+
 CONFIG_IWLWIFI=m
 CONFIG_IWLWIFI_LEDS=y
 CONFIG_IWLDVM=m
@@ -2729,6 +2847,8 @@ CONFIG_IWLWIFI_OPMODE_MODULAR=y
 #
 # CONFIG_IWLWIFI_DEBUG is not set
 # CONFIG_IWLWIFI_DEVICE_TRACING is not set
+# end of Debugging Options
+
 CONFIG_WLAN_VENDOR_INTERSIL=y
 CONFIG_HOSTAP=m
 CONFIG_HOSTAP_FIRMWARE=y
@@ -2782,6 +2902,7 @@ CONFIG_MT76x2_COMMON=m
 CONFIG_MT76x2E=m
 CONFIG_MT76x2U=m
 CONFIG_MT7603E=m
+CONFIG_MT7615E=m
 CONFIG_WLAN_VENDOR_RALINK=y
 CONFIG_RT2X00=m
 CONFIG_RT2400PCI=m
@@ -2834,6 +2955,13 @@ CONFIG_RTL8723_COMMON=m
 CONFIG_RTLBTCOEXIST=m
 CONFIG_RTL8XXXU=m
 # CONFIG_RTL8XXXU_UNTESTED is not set
+CONFIG_RTW88=m
+CONFIG_RTW88_CORE=m
+CONFIG_RTW88_PCI=m
+CONFIG_RTW88_8822BE=y
+CONFIG_RTW88_8822CE=y
+# CONFIG_RTW88_DEBUG is not set
+# CONFIG_RTW88_DEBUGFS is not set
 CONFIG_WLAN_VENDOR_RSI=y
 CONFIG_RSI_91X=m
 CONFIG_RSI_DEBUGFS=y
@@ -2862,6 +2990,8 @@ CONFIG_VIRT_WIFI=m
 CONFIG_WIMAX_I2400M=m
 CONFIG_WIMAX_I2400M_USB=m
 CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
+# end of WiMAX Wireless Broadband devices
+
 CONFIG_WAN=y
 CONFIG_LANMEDIA=m
 CONFIG_HDLC=m
@@ -2895,30 +3025,10 @@ CONFIG_IEEE802154_HWSIM=m
 # CONFIG_NETDEVSIM is not set
 CONFIG_NET_FAILOVER=m
 CONFIG_ISDN=y
-# CONFIG_ISDN_I4L is not set
 CONFIG_ISDN_CAPI=m
 CONFIG_CAPI_TRACE=y
 CONFIG_ISDN_CAPI_CAPI20=m
 CONFIG_ISDN_CAPI_MIDDLEWARE=y
-
-#
-# CAPI hardware drivers
-#
-CONFIG_CAPI_AVM=y
-CONFIG_ISDN_DRV_AVMB1_B1PCI=m
-CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
-CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
-CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
-CONFIG_ISDN_DRV_AVMB1_T1PCI=m
-CONFIG_ISDN_DRV_AVMB1_C4=m
-CONFIG_ISDN_DRV_GIGASET=m
-CONFIG_GIGASET_CAPI=y
-CONFIG_GIGASET_BASE=m
-CONFIG_GIGASET_M105=m
-CONFIG_GIGASET_M101=m
-# CONFIG_GIGASET_DEBUG is not set
-CONFIG_HYSDN=m
-CONFIG_HYSDN_CAPI=y
 CONFIG_MISDN=m
 CONFIG_MISDN_DSP=m
 CONFIG_MISDN_L1OIP=m
@@ -2967,6 +3077,7 @@ CONFIG_INPUT_KEYBOARD=y
 CONFIG_KEYBOARD_ADP5588=m
 # CONFIG_KEYBOARD_ADP5589 is not set
 CONFIG_KEYBOARD_ATKBD=m
+CONFIG_KEYBOARD_QT1050=m
 # CONFIG_KEYBOARD_QT1070 is not set
 CONFIG_KEYBOARD_QT2160=m
 # CONFIG_KEYBOARD_DLINK_DIR685 is not set
@@ -3024,8 +3135,8 @@ CONFIG_JOYSTICK_INTERACT=m
 CONFIG_JOYSTICK_SIDEWINDER=m
 CONFIG_JOYSTICK_TMDC=m
 CONFIG_JOYSTICK_IFORCE=m
-CONFIG_JOYSTICK_IFORCE_USB=y
-CONFIG_JOYSTICK_IFORCE_232=y
+CONFIG_JOYSTICK_IFORCE_USB=m
+CONFIG_JOYSTICK_IFORCE_232=m
 CONFIG_JOYSTICK_WARRIOR=m
 CONFIG_JOYSTICK_MAGELLAN=m
 CONFIG_JOYSTICK_SPACEORB=m
@@ -3133,6 +3244,7 @@ CONFIG_TOUCHSCREEN_SUR40=m
 CONFIG_TOUCHSCREEN_TPS6507X=m
 # CONFIG_TOUCHSCREEN_ZET6223 is not set
 # CONFIG_TOUCHSCREEN_ROHM_BU21023 is not set
+CONFIG_TOUCHSCREEN_IQS5XX=m
 CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_AD714X is not set
 # CONFIG_INPUT_ATMEL_CAPTOUCH is not set
@@ -3140,6 +3252,7 @@ CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_E3X0_BUTTON is not set
 CONFIG_INPUT_MSM_VIBRATOR=m
 CONFIG_INPUT_PCSPKR=m
+CONFIG_INPUT_MAX77650_ONKEY=m
 # CONFIG_INPUT_MMA8450 is not set
 CONFIG_INPUT_ATI_REMOTE2=m
 CONFIG_INPUT_KEYSPAN_REMOTE=m
@@ -3186,13 +3299,14 @@ CONFIG_SERIO_ALTERA_PS2=m
 # CONFIG_SERIO_PS2MULT is not set
 # CONFIG_SERIO_ARC_PS2 is not set
 # CONFIG_SERIO_APBPS2 is not set
-CONFIG_SERIO_OLPC_APSP=m
 # CONFIG_USERIO is not set
 CONFIG_GAMEPORT=m
 CONFIG_GAMEPORT_NS558=m
 CONFIG_GAMEPORT_L4=m
 CONFIG_GAMEPORT_EMU10K1=m
 CONFIG_GAMEPORT_FM801=m
+# end of Hardware I/O ports
+# end of Input device support
 
 #
 # Character devices
@@ -3211,6 +3325,7 @@ CONFIG_NOZOMI=m
 CONFIG_N_GSM=m
 # CONFIG_TRACE_SINK is not set
 # CONFIG_PPC_EPAPR_HV_BYTECHAN is not set
+CONFIG_NULL_TTY=m
 CONFIG_LDISC_AUTOLOAD=y
 CONFIG_DEVMEM=y
 # CONFIG_DEVKMEM is not set
@@ -3252,6 +3367,7 @@ CONFIG_SERIAL_MPC52xx=y
 CONFIG_SERIAL_MPC52xx_CONSOLE=y
 CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200
 CONFIG_SERIAL_JSM=m
+CONFIG_SERIAL_SIFIVE=m
 # CONFIG_SERIAL_SCCNXP is not set
 # CONFIG_SERIAL_SC16IS7XX is not set
 # CONFIG_SERIAL_ALTERA_JTAGUART is not set
@@ -3262,6 +3378,8 @@ CONFIG_SERIAL_RP2=m
 CONFIG_SERIAL_RP2_NR_UARTS=32
 # CONFIG_SERIAL_FSL_LPUART is not set
 # CONFIG_SERIAL_CONEXANT_DIGICOLOR is not set
+# end of Serial drivers
+
 CONFIG_SERIAL_DEV_BUS=y
 CONFIG_SERIAL_DEV_CTRL_TTYPORT=y
 CONFIG_TTY_PRINTK=m
@@ -3295,10 +3413,14 @@ CONFIG_CARDMAN_4000=m
 CONFIG_CARDMAN_4040=m
 CONFIG_SCR24X=m
 CONFIG_IPWIRELESS=m
+# end of PCMCIA character devices
+
 # CONFIG_RAW_DRIVER is not set
 # CONFIG_TCG_TPM is not set
 CONFIG_DEVPORT=y
 # CONFIG_XILLYBUS is not set
+# end of Character devices
+
 CONFIG_RANDOM_TRUST_CPU=y
 
 #
@@ -3318,6 +3440,8 @@ CONFIG_I2C_MUX=m
 # CONFIG_I2C_MUX_PCA9541 is not set
 # CONFIG_I2C_MUX_REG is not set
 # CONFIG_I2C_MUX_MLXCPLD is not set
+# end of Multiplexer I2C Chip support
+
 CONFIG_I2C_HELPER_AUTO=y
 CONFIG_I2C_SMBUS=m
 CONFIG_I2C_ALGOBIT=y
@@ -3379,11 +3503,15 @@ CONFIG_I2C_VIPERBOARD=m
 #
 # Other I2C/SMBus bus drivers
 #
+# end of I2C Hardware Bus support
+
 # CONFIG_I2C_STUB is not set
 # CONFIG_I2C_SLAVE is not set
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
+# end of I2C support
+
 CONFIG_I3C=m
 CONFIG_CDNS_I3C_MASTER=m
 CONFIG_DW_I3C_MASTER=m
@@ -3447,6 +3575,8 @@ CONFIG_PTP_1588_CLOCK=m
 #
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
+# end of PTP clock support
+
 # CONFIG_PINCTRL is not set
 # CONFIG_GPIOLIB is not set
 CONFIG_W1=m
@@ -3459,6 +3589,7 @@ CONFIG_W1_CON=y
 CONFIG_W1_MASTER_DS2490=m
 CONFIG_W1_MASTER_DS2482=m
 # CONFIG_W1_MASTER_DS1WM is not set
+# end of 1-wire Bus Masters
 
 #
 # 1-wire Slaves
@@ -3480,10 +3611,13 @@ CONFIG_W1_SLAVE_DS2780=m
 CONFIG_W1_SLAVE_DS2781=m
 CONFIG_W1_SLAVE_DS28E04=m
 CONFIG_W1_SLAVE_DS28E17=m
+# end of 1-wire Slaves
+
 # CONFIG_POWER_AVS is not set
 # CONFIG_POWER_RESET is not set
 CONFIG_POWER_SUPPLY=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
+CONFIG_POWER_SUPPLY_HWMON=y
 # CONFIG_PDA_POWER is not set
 # CONFIG_GENERIC_ADC_BATTERY is not set
 # CONFIG_TEST_POWER is not set
@@ -3504,6 +3638,7 @@ CONFIG_BATTERY_BQ27XXX_HDQ=m
 # CONFIG_CHARGER_MAX8903 is not set
 # CONFIG_CHARGER_LP8727 is not set
 # CONFIG_CHARGER_DETECTOR_MAX14656 is not set
+CONFIG_CHARGER_MAX77650=m
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
@@ -3591,7 +3726,6 @@ CONFIG_SENSORS_NTC_THERMISTOR=m
 CONFIG_SENSORS_NCT7802=m
 CONFIG_SENSORS_NCT7904=m
 CONFIG_SENSORS_NPCM7XX=m
-# CONFIG_SENSORS_OCC_P8_I2C is not set
 CONFIG_SENSORS_PCF8591=m
 # CONFIG_PMBUS is not set
 CONFIG_SENSORS_SHT21=m
@@ -3630,7 +3764,7 @@ CONFIG_SENSORS_W83795=m
 # CONFIG_SENSORS_W83795_FANCTRL is not set
 CONFIG_SENSORS_W83L785TS=m
 CONFIG_SENSORS_W83L786NG=m
-CONFIG_THERMAL=m
+CONFIG_THERMAL=y
 CONFIG_THERMAL_STATISTICS=y
 CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
 CONFIG_THERMAL_HWMON=y
@@ -3645,17 +3779,30 @@ CONFIG_THERMAL_GOV_STEP_WISE=y
 # CONFIG_THERMAL_GOV_BANG_BANG is not set
 # CONFIG_THERMAL_GOV_USER_SPACE is not set
 # CONFIG_THERMAL_GOV_POWER_ALLOCATOR is not set
+CONFIG_CPU_THERMAL=y
 # CONFIG_CLOCK_THERMAL is not set
 CONFIG_DEVFREQ_THERMAL=y
 # CONFIG_THERMAL_EMULATION is not set
+CONFIG_THERMAL_MMIO=m
 # CONFIG_QORIQ_THERMAL is not set
 # CONFIG_GENERIC_ADC_THERMAL is not set
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_CORE=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
 CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
+CONFIG_WATCHDOG_OPEN_TIMEOUT=0
 CONFIG_WATCHDOG_SYSFS=y
 
+#
+# Watchdog Pretimeout Governors
+#
+CONFIG_WATCHDOG_PRETIMEOUT_GOV=y
+CONFIG_WATCHDOG_PRETIMEOUT_GOV_SEL=m
+CONFIG_WATCHDOG_PRETIMEOUT_GOV_NOOP=y
+CONFIG_WATCHDOG_PRETIMEOUT_GOV_PANIC=m
+CONFIG_WATCHDOG_PRETIMEOUT_DEFAULT_GOV_NOOP=y
+# CONFIG_WATCHDOG_PRETIMEOUT_DEFAULT_GOV_PANIC is not set
+
 #
 # Watchdog Device Drivers
 #
@@ -3682,15 +3829,6 @@ CONFIG_WDTPCI=m
 # USB-based Watchdog Cards
 #
 CONFIG_USBPCWATCHDOG=m
-
-#
-# Watchdog Pretimeout Governors
-#
-CONFIG_WATCHDOG_PRETIMEOUT_GOV=y
-CONFIG_WATCHDOG_PRETIMEOUT_DEFAULT_GOV_NOOP=y
-# CONFIG_WATCHDOG_PRETIMEOUT_DEFAULT_GOV_PANIC is not set
-CONFIG_WATCHDOG_PRETIMEOUT_GOV_NOOP=y
-CONFIG_WATCHDOG_PRETIMEOUT_GOV_PANIC=m
 CONFIG_SSB_POSSIBLE=y
 CONFIG_SSB=m
 CONFIG_SSB_SPROM=y
@@ -3749,6 +3887,7 @@ CONFIG_LPC_SCH=m
 # CONFIG_MFD_88PM860X is not set
 # CONFIG_MFD_MAX14577 is not set
 # CONFIG_MFD_MAX77620 is not set
+CONFIG_MFD_MAX77650=m
 # CONFIG_MFD_MAX77686 is not set
 # CONFIG_MFD_MAX77693 is not set
 # CONFIG_MFD_MAX77843 is not set
@@ -3809,8 +3948,12 @@ CONFIG_MFD_TQMX86=m
 # CONFIG_MFD_WM8350_I2C is not set
 # CONFIG_MFD_WM8994 is not set
 # CONFIG_MFD_ROHM_BD718XX is not set
+# CONFIG_MFD_ROHM_BD70528 is not set
 CONFIG_MFD_STPMIC1=m
+CONFIG_MFD_STMFX=m
 # CONFIG_RAVE_SP_CORE is not set
+# end of Multifunction device drivers
+
 # CONFIG_REGULATOR is not set
 CONFIG_CEC_CORE=m
 CONFIG_RC_CORE=m
@@ -3857,7 +4000,7 @@ CONFIG_MEDIA_SDR_SUPPORT=y
 CONFIG_MEDIA_CEC_SUPPORT=y
 # CONFIG_MEDIA_CEC_RC is not set
 CONFIG_MEDIA_CONTROLLER=y
-# CONFIG_MEDIA_CONTROLLER_DVB is not set
+CONFIG_MEDIA_CONTROLLER_DVB=y
 CONFIG_VIDEO_DEV=m
 # CONFIG_VIDEO_V4L2_SUBDEV_API is not set
 CONFIG_VIDEO_V4L2=m
@@ -3987,6 +4130,7 @@ CONFIG_DVB_USB_DIBUSB_MC=m
 CONFIG_DVB_USB_DIB0700=m
 CONFIG_DVB_USB_UMT_010=m
 CONFIG_DVB_USB_CXUSB=m
+# CONFIG_DVB_USB_CXUSB_ANALOG is not set
 CONFIG_DVB_USB_M920X=m
 CONFIG_DVB_USB_DIGITV=m
 CONFIG_DVB_USB_VP7045=m
@@ -4160,6 +4304,7 @@ CONFIG_USB_MA901=m
 #
 # Texas Instruments WL128x FM driver (ST based)
 #
+# end of Texas Instruments WL128x FM driver (ST based)
 
 #
 # Supported FireWire (IEEE 1394) Adapters
@@ -4196,6 +4341,10 @@ CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
 CONFIG_MEDIA_ATTACH=y
 CONFIG_VIDEO_IR_I2C=m
 
+#
+# I2C Encoders, decoders, sensors and other helper chips
+#
+
 #
 # Audio decoders, processors and mixers
 #
@@ -4208,6 +4357,7 @@ CONFIG_VIDEO_MSP3400=m
 CONFIG_VIDEO_CS3308=m
 CONFIG_VIDEO_CS5345=m
 CONFIG_VIDEO_CS53L32A=m
+# CONFIG_VIDEO_TLV320AIC23B is not set
 CONFIG_VIDEO_UDA1342=m
 CONFIG_VIDEO_WM8775=m
 CONFIG_VIDEO_WM8739=m
@@ -4222,11 +4372,22 @@ CONFIG_VIDEO_SAA6588=m
 #
 # Video decoders
 #
+# CONFIG_VIDEO_ADV7183 is not set
+# CONFIG_VIDEO_BT819 is not set
+# CONFIG_VIDEO_BT856 is not set
+# CONFIG_VIDEO_BT866 is not set
+# CONFIG_VIDEO_KS0127 is not set
+# CONFIG_VIDEO_ML86V7667 is not set
+# CONFIG_VIDEO_SAA7110 is not set
 CONFIG_VIDEO_SAA711X=m
+# CONFIG_VIDEO_TVP514X is not set
 CONFIG_VIDEO_TVP5150=m
+# CONFIG_VIDEO_TVP7002 is not set
 CONFIG_VIDEO_TW2804=m
 CONFIG_VIDEO_TW9903=m
 CONFIG_VIDEO_TW9906=m
+# CONFIG_VIDEO_TW9910 is not set
+# CONFIG_VIDEO_VPX3220 is not set
 
 #
 # Video and audio decoders
@@ -4238,18 +4399,47 @@ CONFIG_VIDEO_CX25840=m
 # Video encoders
 #
 CONFIG_VIDEO_SAA7127=m
+# CONFIG_VIDEO_SAA7185 is not set
+# CONFIG_VIDEO_ADV7170 is not set
+# CONFIG_VIDEO_ADV7175 is not set
+# CONFIG_VIDEO_ADV7343 is not set
+# CONFIG_VIDEO_ADV7393 is not set
+# CONFIG_VIDEO_AK881X is not set
+# CONFIG_VIDEO_THS8200 is not set
 
 #
 # Camera sensor devices
 #
 CONFIG_VIDEO_OV2640=m
+# CONFIG_VIDEO_OV2659 is not set
+# CONFIG_VIDEO_OV2680 is not set
+# CONFIG_VIDEO_OV2685 is not set
+# CONFIG_VIDEO_OV6650 is not set
+# CONFIG_VIDEO_OV5695 is not set
+# CONFIG_VIDEO_OV772X is not set
 CONFIG_VIDEO_OV7640=m
 CONFIG_VIDEO_OV7670=m
+# CONFIG_VIDEO_OV7740 is not set
+# CONFIG_VIDEO_OV9640 is not set
+# CONFIG_VIDEO_VS6624 is not set
+# CONFIG_VIDEO_MT9M111 is not set
+# CONFIG_VIDEO_MT9T112 is not set
 CONFIG_VIDEO_MT9V011=m
+# CONFIG_VIDEO_MT9V111 is not set
+# CONFIG_VIDEO_SR030PC30 is not set
+# CONFIG_VIDEO_RJ54N1 is not set
+
+#
+# Lens drivers
+#
+# CONFIG_VIDEO_AD5820 is not set
 
 #
 # Flash devices
 #
+# CONFIG_VIDEO_ADP1653 is not set
+# CONFIG_VIDEO_LM3560 is not set
+# CONFIG_VIDEO_LM3646 is not set
 
 #
 # Video improvement chips
@@ -4265,17 +4455,32 @@ CONFIG_VIDEO_SAA6752HS=m
 #
 # SDR tuner chips
 #
+# CONFIG_SDR_MAX2175 is not set
 
 #
 # Miscellaneous helper chips
 #
+# CONFIG_VIDEO_THS7303 is not set
 CONFIG_VIDEO_M52790=m
+# CONFIG_VIDEO_I2C is not set
+# end of I2C Encoders, decoders, sensors and other helper chips
+
+#
+# SPI helper chips
+#
+# end of SPI helper chips
 
 #
 # Media SPI Adapters
 #
 # CONFIG_CXD2880_SPI_DRV is not set
+# end of Media SPI Adapters
+
 CONFIG_MEDIA_TUNER=m
+
+#
+# Customize TV tuners
+#
 CONFIG_MEDIA_TUNER_SIMPLE=m
 CONFIG_MEDIA_TUNER_TDA18250=m
 CONFIG_MEDIA_TUNER_TDA8290=m
@@ -4313,6 +4518,11 @@ CONFIG_MEDIA_TUNER_R820T=m
 CONFIG_MEDIA_TUNER_MXL301RF=m
 CONFIG_MEDIA_TUNER_QM1D1C0042=m
 CONFIG_MEDIA_TUNER_QM1D1B0004=m
+# end of Customize TV tuners
+
+#
+# Customise DVB Frontends
+#
 
 #
 # Multistandard (satellite) frontends
@@ -4373,6 +4583,7 @@ CONFIG_DVB_SP8870=m
 CONFIG_DVB_SP887X=m
 CONFIG_DVB_CX22700=m
 CONFIG_DVB_CX22702=m
+# CONFIG_DVB_S5H1432 is not set
 CONFIG_DVB_DRXD=m
 CONFIG_DVB_L64781=m
 CONFIG_DVB_TDA1004X=m
@@ -4383,6 +4594,7 @@ CONFIG_DVB_DIB3000MB=m
 CONFIG_DVB_DIB3000MC=m
 CONFIG_DVB_DIB7000M=m
 CONFIG_DVB_DIB7000P=m
+# CONFIG_DVB_DIB9000 is not set
 CONFIG_DVB_TDA10048=m
 CONFIG_DVB_AF9013=m
 CONFIG_DVB_EC100=m
@@ -4396,6 +4608,7 @@ CONFIG_DVB_SI2168=m
 CONFIG_DVB_AS102_FE=m
 CONFIG_DVB_ZD1301_DEMOD=m
 CONFIG_DVB_GP8PSK_FE=m
+# CONFIG_DVB_CXD2880 is not set
 
 #
 # DVB-C (cable) frontends
@@ -4433,6 +4646,7 @@ CONFIG_DVB_MB86A20S=m
 # ISDB-S (satellite) & ISDB-T (terrestrial) frontends
 #
 CONFIG_DVB_TC90522=m
+# CONFIG_DVB_MN88443X is not set
 
 #
 # Digital terrestrial only tuners/PLL
@@ -4446,12 +4660,14 @@ CONFIG_DVB_TUNER_DIB0090=m
 #
 CONFIG_DVB_DRX39XYJ=m
 CONFIG_DVB_LNBH25=m
+# CONFIG_DVB_LNBH29 is not set
 CONFIG_DVB_LNBP21=m
 CONFIG_DVB_LNBP22=m
 CONFIG_DVB_ISL6405=m
 CONFIG_DVB_ISL6421=m
 CONFIG_DVB_ISL6423=m
 CONFIG_DVB_A8293=m
+# CONFIG_DVB_LGS8GL5 is not set
 CONFIG_DVB_LGS8GXX=m
 CONFIG_DVB_ATBM8830=m
 CONFIG_DVB_TDA665x=m
@@ -4472,6 +4688,7 @@ CONFIG_DVB_SP2=m
 # Tools to develop new frontends
 #
 CONFIG_DVB_DUMMY_FE=m
+# end of Customise DVB Frontends
 
 #
 # Graphics support
@@ -4491,8 +4708,10 @@ CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 # CONFIG_DRM_DP_CEC is not set
 CONFIG_DRM_TTM=m
+CONFIG_DRM_VRAM_HELPER=m
 CONFIG_DRM_GEM_CMA_HELPER=y
 CONFIG_DRM_KMS_CMA_HELPER=y
+CONFIG_DRM_GEM_SHMEM_HELPER=y
 CONFIG_DRM_VM=y
 CONFIG_DRM_SCHED=m
 
@@ -4503,11 +4722,14 @@ CONFIG_DRM_I2C_CH7006=m
 CONFIG_DRM_I2C_SIL164=m
 # CONFIG_DRM_I2C_NXP_TDA998X is not set
 # CONFIG_DRM_I2C_NXP_TDA9950 is not set
+# end of I2C encoder or helper chips
 
 #
 # ARM devices
 #
 CONFIG_DRM_KOMEDA=m
+# end of ARM devices
+
 CONFIG_DRM_RADEON=m
 CONFIG_DRM_RADEON_USERPTR=y
 # CONFIG_DRM_AMDGPU is not set
@@ -4515,10 +4737,8 @@ CONFIG_DRM_RADEON_USERPTR=y
 #
 # ACP (Audio CoProcessor) Configuration
 #
+# end of ACP (Audio CoProcessor) Configuration
 
-#
-# AMD Library routines
-#
 CONFIG_DRM_NOUVEAU=m
 CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT=y
 CONFIG_NOUVEAU_DEBUG=5
@@ -4527,6 +4747,7 @@ CONFIG_NOUVEAU_DEBUG_DEFAULT=3
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 CONFIG_DRM_VGEM=m
 # CONFIG_DRM_VKMS is not set
+CONFIG_DRM_ATI_PCIGART=y
 CONFIG_DRM_UDL=m
 # CONFIG_DRM_AST is not set
 # CONFIG_DRM_MGAG200 is not set
@@ -4547,9 +4768,12 @@ CONFIG_DRM_PANEL=y
 # CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set
 # CONFIG_DRM_PANEL_LG_LG4573 is not set
 # CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6E63M0 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set
 # CONFIG_DRM_PANEL_SEIKO_43WVF1G is not set
 # CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
+# end of Display Panels
+
 CONFIG_DRM_BRIDGE=y
 CONFIG_DRM_PANEL_BRIDGE=y
 
@@ -4572,6 +4796,8 @@ CONFIG_DRM_PANEL_BRIDGE=y
 # CONFIG_DRM_TI_TFP410 is not set
 # CONFIG_DRM_TI_SN65DSI86 is not set
 # CONFIG_DRM_I2C_ADV7511 is not set
+# end of Display Interface Bridges
+
 CONFIG_DRM_ETNAVIV=m
 CONFIG_DRM_ETNAVIV_THERMAL=y
 # CONFIG_DRM_ARCPGU is not set
@@ -4678,7 +4904,11 @@ CONFIG_FB_MB862XX_PCI_GDC=y
 CONFIG_FB_MB862XX_I2C=y
 # CONFIG_FB_SIMPLE is not set
 # CONFIG_FB_SM712 is not set
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
+# end of Frame buffer Devices
+
+#
+# Backlight & LCD device support
+#
 # CONFIG_LCD_CLASS_DEVICE is not set
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # CONFIG_BACKLIGHT_GENERIC is not set
@@ -4689,6 +4919,8 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # CONFIG_BACKLIGHT_LV5207LP is not set
 # CONFIG_BACKLIGHT_BD6107 is not set
 # CONFIG_BACKLIGHT_ARCXCNN is not set
+# end of Backlight & LCD device support
+
 CONFIG_VGASTATE=m
 CONFIG_VIDEOMODE_HELPERS=y
 CONFIG_HDMI=y
@@ -4705,7 +4937,11 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 # CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set
+# end of Console display driver support
+
 # CONFIG_LOGO is not set
+# end of Graphics support
+
 CONFIG_SOUND=m
 CONFIG_SOUND_OSS_CORE=y
 # CONFIG_SOUND_OSS_CORE_PRECLAIM is not set
@@ -4799,8 +5035,8 @@ CONFIG_SND_ENS1370=m
 CONFIG_SND_ENS1371=m
 CONFIG_SND_ES1938=m
 CONFIG_SND_ES1968=m
-CONFIG_SND_ES1968_INPUT=y
-CONFIG_SND_ES1968_RADIO=y
+# CONFIG_SND_ES1968_INPUT is not set
+# CONFIG_SND_ES1968_RADIO is not set
 CONFIG_SND_FM801=m
 CONFIG_SND_FM801_TEA575X_BOOL=y
 CONFIG_SND_HDSP=m
@@ -4813,7 +5049,7 @@ CONFIG_SND_KORG1212=m
 CONFIG_SND_LOLA=m
 CONFIG_SND_LX6464ES=m
 CONFIG_SND_MAESTRO3=m
-CONFIG_SND_MAESTRO3_INPUT=y
+# CONFIG_SND_MAESTRO3_INPUT is not set
 CONFIG_SND_MIXART=m
 CONFIG_SND_NM256=m
 CONFIG_SND_PCXHR=m
@@ -4853,6 +5089,8 @@ CONFIG_SND_HDA_CODEC_CMEDIA=m
 CONFIG_SND_HDA_CODEC_SI3054=m
 CONFIG_SND_HDA_GENERIC=m
 CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1
+# end of HD-Audio
+
 CONFIG_SND_HDA_CORE=m
 CONFIG_SND_HDA_DSP_LOADER=y
 CONFIG_SND_HDA_PREALLOC_SIZE=2048
@@ -4869,6 +5107,7 @@ CONFIG_SND_AOA_SOUNDBUS_I2S=m
 CONFIG_SND_SPI=y
 CONFIG_SND_USB=y
 CONFIG_SND_USB_AUDIO=m
+CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER=y
 CONFIG_SND_USB_UA101=m
 CONFIG_SND_USB_USX2Y=m
 CONFIG_SND_USB_CAIAQ=m
@@ -4926,6 +5165,7 @@ CONFIG_HID_CHERRY=m
 CONFIG_HID_CHICONY=m
 CONFIG_HID_CORSAIR=m
 CONFIG_HID_COUGAR=m
+CONFIG_HID_MACALLY=m
 CONFIG_HID_PRODIKEYS=m
 CONFIG_HID_CMEDIA=m
 CONFIG_HID_CYPRESS=m
@@ -5004,6 +5244,7 @@ CONFIG_HID_THINGM=m
 CONFIG_HID_THRUSTMASTER=m
 CONFIG_THRUSTMASTER_FF=y
 CONFIG_HID_UDRAW_PS3=m
+CONFIG_HID_U2FZERO=m
 CONFIG_HID_WACOM=m
 CONFIG_HID_WIIMOTE=m
 CONFIG_HID_XINMO=m
@@ -5013,6 +5254,7 @@ CONFIG_HID_ZYDACRON=m
 CONFIG_HID_SENSOR_HUB=m
 CONFIG_HID_SENSOR_CUSTOM_SENSOR=m
 CONFIG_HID_ALPS=m
+# end of Special HID drivers
 
 #
 # USB HID support
@@ -5026,11 +5268,16 @@ CONFIG_USB_HIDDEV=y
 #
 # CONFIG_USB_KBD is not set
 # CONFIG_USB_MOUSE is not set
+# end of USB HID Boot Protocol drivers
+# end of USB HID support
 
 #
 # I2C HID support
 #
 # CONFIG_I2C_HID is not set
+# end of I2C HID support
+# end of HID support
+
 CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y
 CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
@@ -5247,6 +5494,8 @@ CONFIG_USB_XUSBATM=m
 #
 # CONFIG_NOP_USB_XCEIV is not set
 # CONFIG_USB_ISP1301 is not set
+# end of USB Physical Layer drivers
+
 # CONFIG_USB_GADGET is not set
 # CONFIG_TYPEC is not set
 # CONFIG_USB_ROLE_SWITCH is not set
@@ -5319,6 +5568,7 @@ CONFIG_LEDS_BRIGHTNESS_HW_CHANGED=y
 # CONFIG_LEDS_BCM6358 is not set
 # CONFIG_LEDS_CR0014114 is not set
 # CONFIG_LEDS_LM3530 is not set
+CONFIG_LEDS_LM3532=m
 # CONFIG_LEDS_LM3642 is not set
 # CONFIG_LEDS_LM3692X is not set
 # CONFIG_LEDS_PCA9532 is not set
@@ -5334,6 +5584,7 @@ CONFIG_LEDS_DAC124S085=m
 CONFIG_LEDS_BD2802=m
 # CONFIG_LEDS_TCA6507 is not set
 # CONFIG_LEDS_TLC591XX is not set
+CONFIG_LEDS_MAX77650=m
 # CONFIG_LEDS_LM355x is not set
 # CONFIG_LEDS_IS31FL319X is not set
 # CONFIG_LEDS_IS31FL32XX is not set
@@ -5344,6 +5595,8 @@ CONFIG_LEDS_BD2802=m
 # CONFIG_LEDS_BLINKM is not set
 # CONFIG_LEDS_MLXREG is not set
 # CONFIG_LEDS_USER is not set
+# CONFIG_LEDS_SPI_BYTE is not set
+# CONFIG_LEDS_TI_LMU_COMMON is not set
 
 #
 # LED Triggers
@@ -5384,10 +5637,9 @@ CONFIG_INFINIBAND_CXGB4=m
 CONFIG_INFINIBAND_I40IW=m
 CONFIG_MLX4_INFINIBAND=m
 CONFIG_MLX5_INFINIBAND=m
-CONFIG_INFINIBAND_NES=m
-# CONFIG_INFINIBAND_NES_DEBUG is not set
 CONFIG_INFINIBAND_OCRDMA=m
 CONFIG_RDMA_RXE=m
+# CONFIG_RDMA_SIW is not set
 CONFIG_INFINIBAND_IPOIB=m
 CONFIG_INFINIBAND_IPOIB_CM=y
 CONFIG_INFINIBAND_IPOIB_DEBUG=y
@@ -5440,6 +5692,7 @@ CONFIG_RTC_DRV_ABEOZ9=m
 # CONFIG_RTC_DRV_PCF8563 is not set
 # CONFIG_RTC_DRV_PCF8583 is not set
 # CONFIG_RTC_DRV_M41T80 is not set
+# CONFIG_RTC_DRV_BD70528 is not set
 # CONFIG_RTC_DRV_BQ32K is not set
 # CONFIG_RTC_DRV_S35390A is not set
 # CONFIG_RTC_DRV_FM3130 is not set
@@ -5531,6 +5784,8 @@ CONFIG_PPC_BESTCOMM_FEC=m
 # CONFIG_QCOM_HIDMA is not set
 # CONFIG_DW_DMAC is not set
 # CONFIG_DW_DMAC_PCI is not set
+# CONFIG_DW_EDMA is not set
+# CONFIG_DW_EDMA_PCIE is not set
 
 #
 # DMA Clients
@@ -5544,6 +5799,8 @@ CONFIG_ASYNC_TX_DMA=y
 CONFIG_SYNC_FILE=y
 # CONFIG_SW_SYNC is not set
 CONFIG_UDMABUF=y
+# end of DMABUF options
+
 # CONFIG_AUXDISPLAY is not set
 # CONFIG_PANEL is not set
 CONFIG_UIO=m
@@ -5569,6 +5826,8 @@ CONFIG_VIRTIO_MMIO=m
 #
 # Microsoft Hyper-V guest support
 #
+# end of Microsoft Hyper-V guest support
+
 CONFIG_STAGING=y
 # CONFIG_PRISM2_USB is not set
 # CONFIG_COMEDI is not set
@@ -5578,7 +5837,6 @@ CONFIG_STAGING=y
 CONFIG_R8712U=m
 CONFIG_R8188EU=m
 CONFIG_88EU_AP_MODE=y
-# CONFIG_R8822BE is not set
 # CONFIG_RTS5208 is not set
 # CONFIG_VT6655 is not set
 # CONFIG_VT6656 is not set
@@ -5592,42 +5850,52 @@ CONFIG_88EU_AP_MODE=y
 #
 # CONFIG_ADIS16203 is not set
 # CONFIG_ADIS16240 is not set
+# end of Accelerometers
 
 #
 # Analog to digital converters
 #
 # CONFIG_AD7192 is not set
 # CONFIG_AD7280 is not set
+# end of Analog to digital converters
 
 #
 # Analog digital bi-direction converters
 #
+# end of Analog digital bi-direction converters
 
 #
 # Capacitance to digital converters
 #
 # CONFIG_AD7150 is not set
 # CONFIG_AD7746 is not set
+# end of Capacitance to digital converters
 
 #
 # Direct Digital Synthesis
 #
 # CONFIG_AD9832 is not set
 # CONFIG_AD9834 is not set
+# end of Direct Digital Synthesis
 
 #
 # Network Analyzer, Impedance Converters
 #
 # CONFIG_AD5933 is not set
+# end of Network Analyzer, Impedance Converters
 
 #
 # Active energy metering IC
 #
 # CONFIG_ADE7854 is not set
+# end of Active energy metering IC
 
 #
 # Resolver to digital converters
 #
+# end of Resolver to digital converters
+# end of IIO staging drivers
+
 # CONFIG_FB_SM750 is not set
 
 #
@@ -5645,11 +5913,15 @@ CONFIG_SPEAKUP_SYNTH_SOFT=m
 CONFIG_SPEAKUP_SYNTH_SPKOUT=m
 CONFIG_SPEAKUP_SYNTH_TXPRT=m
 CONFIG_SPEAKUP_SYNTH_DUMMY=m
+# end of Speakup console speech
+
 # CONFIG_STAGING_MEDIA is not set
 
 #
 # Android
 #
+# end of Android
+
 # CONFIG_STAGING_BOARD is not set
 # CONFIG_LTE_GDM724X is not set
 # CONFIG_FIREWIRE_SERIAL is not set
@@ -5666,8 +5938,33 @@ CONFIG_SPEAKUP_SYNTH_DUMMY=m
 #
 # Gasket devices
 #
+# end of Gasket devices
+
 # CONFIG_XIL_AXIS_FIFO is not set
 # CONFIG_EROFS_FS is not set
+# CONFIG_FIELDBUS_DEV is not set
+# CONFIG_KPC2000 is not set
+
+#
+# ISDN CAPI drivers
+#
+CONFIG_CAPI_AVM=y
+CONFIG_ISDN_DRV_AVMB1_B1PCI=m
+CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
+CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
+CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
+CONFIG_ISDN_DRV_AVMB1_T1PCI=m
+CONFIG_ISDN_DRV_AVMB1_C4=m
+CONFIG_ISDN_DRV_GIGASET=m
+CONFIG_GIGASET_CAPI=y
+CONFIG_GIGASET_BASE=m
+CONFIG_GIGASET_M105=m
+CONFIG_GIGASET_M101=m
+# CONFIG_GIGASET_DEBUG is not set
+CONFIG_HYSDN=m
+CONFIG_HYSDN_CAPI=y
+# end of ISDN CAPI drivers
+
 CONFIG_CLKDEV_LOOKUP=y
 CONFIG_HAVE_CLK_PREPARE=y
 CONFIG_COMMON_CLK=y
@@ -5677,6 +5974,7 @@ CONFIG_COMMON_CLK=y
 #
 # CONFIG_CLK_HSDK is not set
 # CONFIG_COMMON_CLK_MAX9485 is not set
+# CONFIG_COMMON_CLK_SI5341 is not set
 # CONFIG_COMMON_CLK_SI5351 is not set
 # CONFIG_COMMON_CLK_SI514 is not set
 # CONFIG_COMMON_CLK_SI544 is not set
@@ -5686,6 +5984,8 @@ CONFIG_COMMON_CLK=y
 # CONFIG_COMMON_CLK_CS2000_CP is not set
 # CONFIG_COMMON_CLK_VC5 is not set
 # CONFIG_COMMON_CLK_FIXED_MMIO is not set
+# end of Common Clock Framework
+
 # CONFIG_HWSPINLOCK is not set
 
 #
@@ -5693,23 +5993,30 @@ CONFIG_COMMON_CLK=y
 #
 CONFIG_I8253_LOCK=y
 CONFIG_CLKBLD_I8253=y
+# end of Clock Source drivers
+
 # CONFIG_MAILBOX is not set
 CONFIG_IOMMU_SUPPORT=y
 
 #
 # Generic IOMMU Pagetable Support
 #
+# end of Generic IOMMU Pagetable Support
+
 # CONFIG_IOMMU_DEBUGFS is not set
 
 #
 # Remoteproc drivers
 #
 # CONFIG_REMOTEPROC is not set
+# end of Remoteproc drivers
 
 #
 # Rpmsg drivers
 #
 # CONFIG_RPMSG_VIRTIO is not set
+# end of Rpmsg drivers
+
 # CONFIG_SOUNDWIRE is not set
 
 #
@@ -5719,28 +6026,42 @@ CONFIG_IOMMU_SUPPORT=y
 #
 # Amlogic SoC drivers
 #
+# end of Amlogic SoC drivers
+
+#
+# Aspeed SoC drivers
+#
+# end of Aspeed SoC drivers
 
 #
 # Broadcom SoC drivers
 #
+# end of Broadcom SoC drivers
 
 #
 # NXP/Freescale QorIQ SoC drivers
 #
+# end of NXP/Freescale QorIQ SoC drivers
 
 #
 # i.MX SoC drivers
 #
+# end of i.MX SoC drivers
 
 #
 # Qualcomm SoC drivers
 #
+# end of Qualcomm SoC drivers
+
 # CONFIG_SOC_TI is not set
 
 #
 # Xilinx SoC drivers
 #
 # CONFIG_XILINX_VCU is not set
+# end of Xilinx SoC drivers
+# end of SOC (System On Chip) specific Drivers
+
 CONFIG_PM_DEVFREQ=y
 
 #
@@ -5805,6 +6126,7 @@ CONFIG_HID_SENSOR_ACCEL_3D=m
 # CONFIG_SCA3000 is not set
 # CONFIG_STK8312 is not set
 # CONFIG_STK8BA50 is not set
+# end of Accelerometers
 
 #
 # Analog to digital converters
@@ -5850,22 +6172,25 @@ CONFIG_MCP3911=m
 # CONFIG_TI_ADC128S052 is not set
 # CONFIG_TI_ADC161S626 is not set
 # CONFIG_TI_ADS1015 is not set
-# CONFIG_TI_ADS7950 is not set
+CONFIG_TI_ADS8344=m
 # CONFIG_TI_ADS8688 is not set
 CONFIG_TI_ADS124S08=m
 # CONFIG_TI_TLC4541 is not set
 # CONFIG_VF610_ADC is not set
 CONFIG_VIPERBOARD_ADC=m
+# CONFIG_XILINX_XADC is not set
+# end of Analog to digital converters
 
 #
 # Analog Front Ends
 #
 # CONFIG_IIO_RESCALE is not set
+# end of Analog Front Ends
 
 #
 # Amplifiers
 #
-# CONFIG_AD8366 is not set
+# end of Amplifiers
 
 #
 # Chemical Sensors
@@ -5878,21 +6203,20 @@ CONFIG_PMS7003=m
 CONFIG_SENSIRION_SGP30=m
 CONFIG_SPS30=m
 # CONFIG_VZ89X is not set
+# end of Chemical Sensors
 
 #
 # Hid Sensor IIO Common
 #
 CONFIG_HID_SENSOR_IIO_COMMON=m
 CONFIG_HID_SENSOR_IIO_TRIGGER=m
+# end of Hid Sensor IIO Common
 
 #
 # SSP Sensor Common
 #
 # CONFIG_IIO_SSP_SENSORHUB is not set
-
-#
-# Counters
-#
+# end of SSP Sensor Common
 
 #
 # Digital to analog converters
@@ -5929,10 +6253,12 @@ CONFIG_LTC1660=m
 # CONFIG_TI_DAC5571 is not set
 CONFIG_TI_DAC7311=m
 # CONFIG_VF610_DAC is not set
+# end of Digital to analog converters
 
 #
 # IIO dummy driver
 #
+# end of IIO dummy driver
 
 #
 # Frequency Synthesizers DDS/PLL
@@ -5942,11 +6268,15 @@ CONFIG_TI_DAC7311=m
 # Clock Generator/Distribution
 #
 # CONFIG_AD9523 is not set
+# end of Clock Generator/Distribution
 
 #
 # Phase-Locked Loop (PLL) frequency synthesizers
 #
 # CONFIG_ADF4350 is not set
+# CONFIG_ADF4371 is not set
+# end of Phase-Locked Loop (PLL) frequency synthesizers
+# end of Frequency Synthesizers DDS/PLL
 
 #
 # Digital gyroscope sensors
@@ -5957,10 +6287,14 @@ CONFIG_TI_DAC7311=m
 # CONFIG_ADIS16260 is not set
 # CONFIG_ADXRS450 is not set
 # CONFIG_BMG160 is not set
+CONFIG_FXAS21002C=m
+CONFIG_FXAS21002C_I2C=m
+CONFIG_FXAS21002C_SPI=m
 CONFIG_HID_SENSOR_GYRO_3D=m
 # CONFIG_MPU3050_I2C is not set
 # CONFIG_IIO_ST_GYRO_3AXIS is not set
 # CONFIG_ITG3200 is not set
+# end of Digital gyroscope sensors
 
 #
 # Health Sensors
@@ -5973,6 +6307,8 @@ CONFIG_HID_SENSOR_GYRO_3D=m
 # CONFIG_AFE4404 is not set
 # CONFIG_MAX30100 is not set
 # CONFIG_MAX30102 is not set
+# end of Heart Rate Monitors
+# end of Health Sensors
 
 #
 # Humidity sensors
@@ -5984,6 +6320,7 @@ CONFIG_HID_SENSOR_GYRO_3D=m
 # CONFIG_HTU21 is not set
 # CONFIG_SI7005 is not set
 # CONFIG_SI7020 is not set
+# end of Humidity sensors
 
 #
 # Inertial measurement units
@@ -5996,6 +6333,7 @@ CONFIG_HID_SENSOR_GYRO_3D=m
 # CONFIG_INV_MPU6050_I2C is not set
 # CONFIG_INV_MPU6050_SPI is not set
 # CONFIG_IIO_ST_LSM6DSX is not set
+# end of Inertial measurement units
 
 #
 # Light sensors
@@ -6041,6 +6379,7 @@ CONFIG_VCNL4035=m
 # CONFIG_VEML6070 is not set
 # CONFIG_VL6180 is not set
 # CONFIG_ZOPT2201 is not set
+# end of Light sensors
 
 #
 # Magnetometer sensors
@@ -6057,23 +6396,27 @@ CONFIG_HID_SENSOR_MAGNETOMETER_3D=m
 CONFIG_SENSORS_RM3100=m
 CONFIG_SENSORS_RM3100_I2C=m
 CONFIG_SENSORS_RM3100_SPI=m
+# end of Magnetometer sensors
 
 #
 # Multiplexers
 #
 # CONFIG_IIO_MUX is not set
+# end of Multiplexers
 
 #
 # Inclinometer sensors
 #
 CONFIG_HID_SENSOR_INCLINOMETER_3D=m
 CONFIG_HID_SENSOR_DEVICE_ROTATION=m
+# end of Inclinometer sensors
 
 #
 # Triggers - standalone
 #
 # CONFIG_IIO_INTERRUPT_TRIGGER is not set
 # CONFIG_IIO_SYSFS_TRIGGER is not set
+# end of Triggers - standalone
 
 #
 # Digital potentiometers
@@ -6087,17 +6430,20 @@ CONFIG_HID_SENSOR_DEVICE_ROTATION=m
 # CONFIG_MCP4531 is not set
 CONFIG_MCP41010=m
 # CONFIG_TPL0102 is not set
+# end of Digital potentiometers
 
 #
 # Digital potentiostats
 #
 # CONFIG_LMP91000 is not set
+# end of Digital potentiostats
 
 #
 # Pressure sensors
 #
 # CONFIG_ABP060MG is not set
 # CONFIG_BMP280 is not set
+# CONFIG_DPS310 is not set
 CONFIG_HID_SENSOR_PRESS=m
 # CONFIG_HP03 is not set
 # CONFIG_MPL115_I2C is not set
@@ -6109,26 +6455,31 @@ CONFIG_HID_SENSOR_PRESS=m
 # CONFIG_T5403 is not set
 # CONFIG_HP206C is not set
 # CONFIG_ZPA2326 is not set
+# end of Pressure sensors
 
 #
 # Lightning sensors
 #
 # CONFIG_AS3935 is not set
+# end of Lightning sensors
 
 #
 # Proximity and distance sensors
 #
 # CONFIG_ISL29501 is not set
 # CONFIG_LIDAR_LITE_V2 is not set
+CONFIG_MB1232=m
 # CONFIG_RFD77402 is not set
 # CONFIG_SX9500 is not set
 # CONFIG_SRF08 is not set
 CONFIG_VL53L0X_I2C=m
+# end of Proximity and distance sensors
 
 #
 # Resolver to digital converters
 #
 # CONFIG_AD2S90 is not set
+# end of Resolver to digital converters
 
 #
 # Temperature sensors
@@ -6141,6 +6492,9 @@ CONFIG_VL53L0X_I2C=m
 # CONFIG_TMP007 is not set
 # CONFIG_TSYS01 is not set
 # CONFIG_TSYS02D is not set
+CONFIG_MAX31856=m
+# end of Temperature sensors
+
 # CONFIG_NTB is not set
 # CONFIG_VME_BUS is not set
 # CONFIG_PWM is not set
@@ -6149,10 +6503,11 @@ CONFIG_VL53L0X_I2C=m
 # IRQ chip support
 #
 CONFIG_IRQCHIP=y
-CONFIG_ARM_GIC_MAX_NR=1
+# CONFIG_AL_FIC is not set
+# end of IRQ chip support
+
 # CONFIG_IPACK_BUS is not set
 # CONFIG_RESET_CONTROLLER is not set
-# CONFIG_FMC is not set
 
 #
 # PHY Subsystem
@@ -6163,29 +6518,39 @@ CONFIG_GENERIC_PHY_MIPI_DPHY=y
 # CONFIG_PHY_CADENCE_DP is not set
 CONFIG_PHY_CADENCE_DPHY=m
 # CONFIG_PHY_FSL_IMX8MQ_USB is not set
+# CONFIG_PHY_MIXEL_MIPI_DPHY is not set
 # CONFIG_PHY_PXA_28NM_HSIC is not set
 # CONFIG_PHY_PXA_28NM_USB2 is not set
 # CONFIG_PHY_CPCAP_USB is not set
+# end of PHY Subsystem
+
 # CONFIG_POWERCAP is not set
 # CONFIG_MCB is not set
 
 #
 # Performance monitor support
 #
+# end of Performance monitor support
+
 CONFIG_RAS=y
 
 #
 # Android
 #
 # CONFIG_ANDROID is not set
+# end of Android
+
 CONFIG_DAX=y
 CONFIG_NVMEM=y
+CONFIG_NVMEM_SYSFS=y
 
 #
 # HW tracing support
 #
 # CONFIG_STM is not set
 # CONFIG_INTEL_TH is not set
+# end of HW tracing support
+
 # CONFIG_FPGA is not set
 # CONFIG_FSI is not set
 CONFIG_MULTIPLEXER=m
@@ -6195,10 +6560,15 @@ CONFIG_MULTIPLEXER=m
 #
 CONFIG_MUX_ADG792A=m
 CONFIG_MUX_ADGS1408=m
+# CONFIG_MUX_MMIO is not set
+# end of Multiplexer drivers
+
 CONFIG_PM_OPP=y
 # CONFIG_SIOX is not set
 # CONFIG_SLIMBUS is not set
 CONFIG_INTERCONNECT=m
+# CONFIG_COUNTER is not set
+# end of Device Drivers
 
 #
 # File systems
@@ -6299,6 +6669,7 @@ CONFIG_FSCACHE=m
 CONFIG_CACHEFILES=m
 # CONFIG_CACHEFILES_DEBUG is not set
 # CONFIG_CACHEFILES_HISTOGRAM is not set
+# end of Caches
 
 #
 # CD-ROM/DVD Filesystems
@@ -6307,6 +6678,7 @@ CONFIG_ISO9660_FS=m
 CONFIG_JOLIET=y
 CONFIG_ZISOFS=y
 CONFIG_UDF_FS=m
+# end of CD-ROM/DVD Filesystems
 
 #
 # DOS/FAT/NT Filesystems
@@ -6320,6 +6692,7 @@ CONFIG_FAT_DEFAULT_UTF8=y
 CONFIG_NTFS_FS=m
 # CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
+# end of DOS/FAT/NT Filesystems
 
 #
 # Pseudo filesystems
@@ -6336,6 +6709,8 @@ CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_TMPFS_XATTR=y
 CONFIG_MEMFD_CREATE=y
 CONFIG_CONFIGFS_FS=y
+# end of Pseudo filesystems
+
 CONFIG_MISC_FILESYSTEMS=y
 CONFIG_ORANGEFS_FS=m
 CONFIG_ADFS_FS=m
@@ -6345,7 +6720,8 @@ CONFIG_ECRYPT_FS=m
 # CONFIG_ECRYPT_FS_MESSAGING is not set
 CONFIG_HFS_FS=m
 CONFIG_HFSPLUS_FS=m
-# CONFIG_BEFS_FS is not set
+CONFIG_BEFS_FS=m
+# CONFIG_BEFS_DEBUG is not set
 # CONFIG_BFS_FS is not set
 # CONFIG_EFS_FS is not set
 CONFIG_CRAMFS=m
@@ -6432,12 +6808,13 @@ CONFIG_SUNRPC_GSS=m
 CONFIG_SUNRPC_BACKCHANNEL=y
 CONFIG_SUNRPC_SWAP=y
 CONFIG_RPCSEC_GSS_KRB5=m
-CONFIG_CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y
+# CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES is not set
 # CONFIG_SUNRPC_DEBUG is not set
 CONFIG_SUNRPC_XPRT_RDMA=m
 CONFIG_CEPH_FS=m
 CONFIG_CEPH_FSCACHE=y
 CONFIG_CEPH_FS_POSIX_ACL=y
+# CONFIG_CEPH_FS_SECURITY_LABEL is not set
 CONFIG_CIFS=m
 # CONFIG_CIFS_STATS2 is not set
 CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
@@ -6445,7 +6822,6 @@ CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
 CONFIG_CIFS_UPCALL=y
 CONFIG_CIFS_XATTR=y
 CONFIG_CIFS_POSIX=y
-CONFIG_CIFS_ACL=y
 # CONFIG_CIFS_DEBUG is not set
 CONFIG_CIFS_DFS_UPCALL=y
 # CONFIG_CIFS_SMB_DIRECT is not set
@@ -6512,11 +6888,15 @@ CONFIG_NLS_MAC_TURKISH=m
 CONFIG_NLS_UTF8=m
 CONFIG_DLM=m
 # CONFIG_DLM_DEBUG is not set
+CONFIG_UNICODE=y
+# CONFIG_UNICODE_NORMALIZATION_SELFTEST is not set
+# end of File systems
 
 #
 # Security options
 #
 CONFIG_KEYS=y
+# CONFIG_KEYS_REQUEST_CACHE is not set
 # CONFIG_PERSISTENT_KEYRINGS is not set
 # CONFIG_BIG_KEYS is not set
 CONFIG_ENCRYPTED_KEYS=m
@@ -6559,6 +6939,24 @@ CONFIG_INTEGRITY_AUDIT=y
 CONFIG_DEFAULT_SECURITY_APPARMOR=y
 # CONFIG_DEFAULT_SECURITY_DAC is not set
 CONFIG_LSM="yama,loadpin,safesetid,integrity,apparmor,selinux,smack,tomoyo"
+
+#
+# Kernel hardening options
+#
+
+#
+# Memory initialization
+#
+CONFIG_INIT_STACK_NONE=y
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_USER is not set
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL is not set
+# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
+# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
+# end of Memory initialization
+# end of Kernel hardening options
+# end of Security options
+
 CONFIG_XOR_BLOCKS=m
 CONFIG_ASYNC_CORE=m
 CONFIG_ASYNC_MEMCPY=m
@@ -6586,9 +6984,6 @@ CONFIG_CRYPTO_AKCIPHER=y
 CONFIG_CRYPTO_KPP2=y
 CONFIG_CRYPTO_KPP=y
 CONFIG_CRYPTO_ACOMP2=y
-CONFIG_CRYPTO_RSA=y
-CONFIG_CRYPTO_DH=y
-CONFIG_CRYPTO_ECDH=m
 CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MANAGER2=y
 CONFIG_CRYPTO_USER=m
@@ -6598,12 +6993,20 @@ CONFIG_CRYPTO_GF128MUL=m
 CONFIG_CRYPTO_NULL=m
 CONFIG_CRYPTO_NULL2=y
 # CONFIG_CRYPTO_PCRYPT is not set
-CONFIG_CRYPTO_WORKQUEUE=y
 # CONFIG_CRYPTO_CRYPTD is not set
 CONFIG_CRYPTO_AUTHENC=m
 CONFIG_CRYPTO_TEST=m
 CONFIG_CRYPTO_ENGINE=m
 
+#
+# Public-key cryptography
+#
+CONFIG_CRYPTO_RSA=y
+CONFIG_CRYPTO_DH=y
+CONFIG_CRYPTO_ECC=m
+CONFIG_CRYPTO_ECDH=m
+CONFIG_CRYPTO_ECRDSA=m
+
 #
 # Authenticated Encryption with Associated Data
 #
@@ -6647,6 +7050,7 @@ CONFIG_CRYPTO_VMAC=m
 #
 CONFIG_CRYPTO_CRC32C=m
 CONFIG_CRYPTO_CRC32=m
+# CONFIG_CRYPTO_XXHASH is not set
 CONFIG_CRYPTO_CRCT10DIF=y
 CONFIG_CRYPTO_GHASH=m
 CONFIG_CRYPTO_POLY1305=m
@@ -6664,7 +7068,7 @@ CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA512=m
 CONFIG_CRYPTO_SHA3=m
 # CONFIG_CRYPTO_SM3 is not set
-# CONFIG_CRYPTO_STREEBOG is not set
+CONFIG_CRYPTO_STREEBOG=m
 CONFIG_CRYPTO_TGR192=m
 CONFIG_CRYPTO_WP512=m
 
@@ -6674,6 +7078,7 @@ CONFIG_CRYPTO_WP512=m
 CONFIG_CRYPTO_AES=y
 # CONFIG_CRYPTO_AES_TI is not set
 CONFIG_CRYPTO_ANUBIS=m
+CONFIG_CRYPTO_LIB_ARC4=m
 CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_BLOWFISH=m
 CONFIG_CRYPTO_BLOWFISH_COMMON=m
@@ -6723,6 +7128,8 @@ CONFIG_CRYPTO_HASH_INFO=y
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_HIFN_795X=m
 CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
+# CONFIG_CRYPTO_DEV_ATMEL_ECC is not set
+# CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set
 CONFIG_CRYPTO_DEV_CHELSIO=m
 # CONFIG_CHELSIO_IPSEC_INLINE is not set
 CONFIG_CRYPTO_DEV_VIRTIO=m
@@ -6743,6 +7150,8 @@ CONFIG_SYSTEM_TRUSTED_KEYS=""
 # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
 # CONFIG_SECONDARY_TRUSTED_KEYRING is not set
 # CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
+# end of Certificates for signature checking
+
 CONFIG_BINARY_PRINTF=y
 
 #
@@ -6750,11 +7159,13 @@ CONFIG_BINARY_PRINTF=y
 #
 CONFIG_RAID6_PQ=m
 CONFIG_RAID6_PQ_BENCHMARK=y
+# CONFIG_PACKING is not set
 CONFIG_BITREVERSE=y
-CONFIG_RATIONAL=y
 CONFIG_GENERIC_STRNCPY_FROM_USER=y
 CONFIG_GENERIC_STRNLEN_USER=y
 CONFIG_GENERIC_NET_UTILS=y
+CONFIG_CORDIC=m
+CONFIG_RATIONAL=y
 CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_CRC_CCITT=m
 CONFIG_CRC16=m
@@ -6825,10 +7236,9 @@ CONFIG_NLATTR=y
 CONFIG_GENERIC_ATOMIC64=y
 CONFIG_LRU_CACHE=m
 CONFIG_CLZ_TAB=y
-CONFIG_CORDIC=m
-# CONFIG_DDR is not set
 CONFIG_IRQ_POLL=y
 CONFIG_MPILIB=y
+CONFIG_DIMLIB=y
 CONFIG_LIBFDT=y
 CONFIG_OID_REGISTRY=y
 CONFIG_FONT_SUPPORT=y
@@ -6838,6 +7248,7 @@ CONFIG_FONT_8x16=y
 CONFIG_SG_POOL=y
 CONFIG_SBITMAP=y
 # CONFIG_STRING_SELFTEST is not set
+# end of Library routines
 
 #
 # Kernel hacking
@@ -6852,6 +7263,7 @@ CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
 CONFIG_CONSOLE_LOGLEVEL_QUIET=4
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 CONFIG_DYNAMIC_DEBUG=y
+# end of printk and dmesg options
 
 #
 # Compile-time checks and compiler options
@@ -6860,6 +7272,7 @@ CONFIG_DEBUG_INFO=y
 # CONFIG_DEBUG_INFO_REDUCED is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
 # CONFIG_DEBUG_INFO_DWARF4 is not set
+# CONFIG_DEBUG_INFO_BTF is not set
 # CONFIG_GDB_SCRIPTS is not set
 CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_FRAME_WARN=1024
@@ -6867,14 +7280,18 @@ CONFIG_STRIP_ASM_SYMS=y
 # CONFIG_READABLE_ASM is not set
 # CONFIG_UNUSED_SYMBOLS is not set
 CONFIG_DEBUG_FS=y
-# CONFIG_HEADERS_CHECK is not set
+# CONFIG_HEADERS_INSTALL is not set
+# CONFIG_OPTIMIZE_INLINING is not set
 # CONFIG_DEBUG_SECTION_MISMATCH is not set
 CONFIG_SECTION_MISMATCH_WARN_ONLY=y
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+# end of Compile-time checks and compiler options
+
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x01b6
 CONFIG_MAGIC_SYSRQ_SERIAL=y
 CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_MISC=y
 
 #
 # Memory Debugging
@@ -6899,8 +7316,12 @@ CONFIG_DEBUG_MEMORY_INIT=y
 # CONFIG_DEBUG_HIGHMEM is not set
 CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
 # CONFIG_DEBUG_STACKOVERFLOW is not set
+CONFIG_HAVE_ARCH_KASAN=y
 CONFIG_CC_HAS_KASAN_GENERIC=y
+# CONFIG_KASAN is not set
 CONFIG_KASAN_STACK=1
+# end of Memory Debugging
+
 CONFIG_ARCH_HAS_KCOV=y
 CONFIG_CC_HAS_SANCOV_TRACE_PC=y
 # CONFIG_KCOV is not set
@@ -6918,6 +7339,8 @@ CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
 CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
 # CONFIG_WQ_WATCHDOG is not set
+# end of Debug Lockups and Hangs
+
 # CONFIG_PANIC_ON_OOPS is not set
 CONFIG_PANIC_ON_OOPS_VALUE=0
 CONFIG_SCHED_DEBUG=y
@@ -6942,12 +7365,14 @@ CONFIG_LOCK_DEBUGGING_SUPPORT=y
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_LOCK_TORTURE_TEST is not set
 # CONFIG_WW_MUTEX_SELFTEST is not set
+# end of Lock Debugging (spinlocks, mutexes, etc...)
+
 CONFIG_STACKTRACE=y
 # CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
 # CONFIG_DEBUG_KOBJECT is not set
 CONFIG_DEBUG_BUGVERBOSE=y
 CONFIG_DEBUG_LIST=y
-# CONFIG_DEBUG_PI_LIST is not set
+# CONFIG_DEBUG_PLIST is not set
 # CONFIG_DEBUG_SG is not set
 # CONFIG_DEBUG_NOTIFIERS is not set
 # CONFIG_DEBUG_CREDENTIALS is not set
@@ -6960,6 +7385,8 @@ CONFIG_DEBUG_LIST=y
 CONFIG_RCU_CPU_STALL_TIMEOUT=21
 # CONFIG_RCU_TRACE is not set
 # CONFIG_RCU_EQS_DEBUG is not set
+# end of RCU Debugging
+
 # CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
 # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
@@ -6975,6 +7402,7 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
 CONFIG_HAVE_DYNAMIC_FTRACE=y
 CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
 CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
+CONFIG_HAVE_C_RECORDMCOUNT=y
 CONFIG_TRACER_MAX_TRACE=y
 CONFIG_TRACE_CLOCK=y
 CONFIG_RING_BUFFER=y
@@ -7021,12 +7449,14 @@ CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_KPROBES_SANITY_TEST is not set
 # CONFIG_BACKTRACE_SELF_TEST is not set
 # CONFIG_RBTREE_TEST is not set
+# CONFIG_REED_SOLOMON_TEST is not set
 # CONFIG_INTERVAL_TREE_TEST is not set
 # CONFIG_PERCPU_TEST is not set
 # CONFIG_ATOMIC64_SELFTEST is not set
 # CONFIG_ASYNC_RAID6_TEST is not set
 # CONFIG_TEST_HEXDUMP is not set
 # CONFIG_TEST_STRING_HELPERS is not set
+# CONFIG_TEST_STRSCPY is not set
 # CONFIG_TEST_KSTRTOX is not set
 # CONFIG_TEST_PRINTF is not set
 # CONFIG_TEST_BITMAP is not set
@@ -7041,6 +7471,7 @@ CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_TEST_VMALLOC is not set
 CONFIG_TEST_USER_COPY=m
 CONFIG_TEST_BPF=m
+# CONFIG_TEST_BLACKHOLE_DEV is not set
 # CONFIG_FIND_BIT_BENCHMARK is not set
 CONFIG_TEST_FIRMWARE=m
 # CONFIG_TEST_SYSCTL is not set
@@ -7049,6 +7480,7 @@ CONFIG_TEST_STATIC_KEYS=m
 # CONFIG_TEST_KMOD is not set
 # CONFIG_TEST_MEMCAT_P is not set
 # CONFIG_TEST_STACKINIT is not set
+# CONFIG_TEST_MEMINIT is not set
 # CONFIG_MEMTEST is not set
 CONFIG_BUG_ON_DATA_CORRUPTION=y
 # CONFIG_SAMPLES is not set
@@ -7072,8 +7504,10 @@ CONFIG_JUMP_LABEL_FEATURE_CHECKS=y
 CONFIG_XMON=y
 # CONFIG_XMON_DEFAULT is not set
 CONFIG_XMON_DISASSEMBLY=y
+CONFIG_XMON_DEFAULT_RO_MODE=y
 CONFIG_DEBUGGER=y
 # CONFIG_BDI_SWITCH is not set
 CONFIG_BOOTX_TEXT=y
 # CONFIG_PPC_EARLY_DEBUG is not set
 # CONFIG_PPC_PTDUMP is not set
+# end of Kernel hacking
diff --git a/srcpkgs/linux5.1/files/ppc64-dotconfig b/srcpkgs/linux5.3/files/ppc64-dotconfig
similarity index 92%
rename from srcpkgs/linux5.1/files/ppc64-dotconfig
rename to srcpkgs/linux5.3/files/ppc64-dotconfig
index 7dcd051bda6..4c6282ffdf5 100644
--- a/srcpkgs/linux5.1/files/ppc64-dotconfig
+++ b/srcpkgs/linux5.3/files/ppc64-dotconfig
@@ -1,14 +1,15 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.1.18 Kernel Configuration
+# Linux/powerpc 5.3.0 Kernel Configuration
 #
 
 #
-# Compiler: powerpc64-linux-gnu-gcc (GCC) 9.1.0
+# Compiler: powerpc64-linux-gnu-gcc (GCC) 9.2.0
 #
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=90100
+CONFIG_GCC_VERSION=90200
 CONFIG_CLANG_VERSION=0
+CONFIG_CC_CAN_LINK=y
 CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y
 CONFIG_IRQ_WORK=y
@@ -20,6 +21,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
 #
 CONFIG_INIT_ENV_ARG_LIMIT=32
 # CONFIG_COMPILE_TEST is not set
+# CONFIG_HEADER_TEST is not set
 CONFIG_LOCALVERSION="_1"
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_BUILD_SALT=""
@@ -54,6 +56,8 @@ CONFIG_GENERIC_MSI_IRQ=y
 CONFIG_IRQ_FORCED_THREADING=y
 CONFIG_SPARSE_IRQ=y
 # CONFIG_GENERIC_IRQ_DEBUGFS is not set
+# end of IRQ subsystem
+
 CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_ARCH_HAS_TICK_BROADCAST=y
@@ -70,6 +74,8 @@ CONFIG_NO_HZ_IDLE=y
 # CONFIG_NO_HZ_FULL is not set
 # CONFIG_NO_HZ is not set
 CONFIG_HIGH_RES_TIMERS=y
+# end of Timers subsystem
+
 # CONFIG_PREEMPT_NONE is not set
 CONFIG_PREEMPT_VOLUNTARY=y
 # CONFIG_PREEMPT is not set
@@ -88,7 +94,10 @@ CONFIG_TASKSTATS=y
 CONFIG_TASK_DELAY_ACCT=y
 CONFIG_TASK_XACCT=y
 CONFIG_TASK_IO_ACCOUNTING=y
-# CONFIG_PSI is not set
+CONFIG_PSI=y
+CONFIG_PSI_DEFAULT_DISABLED=y
+# end of CPU/Task time and stats accounting
+
 CONFIG_CPU_ISOLATION=y
 
 #
@@ -101,12 +110,22 @@ CONFIG_TREE_SRCU=y
 CONFIG_TASKS_RCU=y
 CONFIG_RCU_STALL_COMMON=y
 CONFIG_RCU_NEED_SEGCBLIST=y
+# end of RCU Subsystem
+
 CONFIG_BUILD_BIN2C=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
+CONFIG_IKHEADERS=m
 CONFIG_LOG_BUF_SHIFT=19
 CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
 CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
+
+#
+# Scheduler features
+#
+# CONFIG_UCLAMP_TASK is not set
+# end of Scheduler features
+
 CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
 CONFIG_NUMA_BALANCING=y
 CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
@@ -117,7 +136,6 @@ CONFIG_MEMCG_SWAP=y
 CONFIG_MEMCG_SWAP_ENABLED=y
 CONFIG_MEMCG_KMEM=y
 CONFIG_BLK_CGROUP=y
-# CONFIG_DEBUG_BLK_CGROUP is not set
 CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
@@ -158,7 +176,6 @@ CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
 CONFIG_HAVE_LD_DEAD_CODE_DATA_ELIMINATION=y
 # CONFIG_LD_DEAD_CODE_DATA_ELIMINATION is not set
 CONFIG_SYSCTL=y
-CONFIG_ANON_INODES=y
 CONFIG_SYSCTL_EXCEPTION_TRACE=y
 CONFIG_HAVE_PCSPKR_PLATFORM=y
 CONFIG_BPF=y
@@ -203,6 +220,8 @@ CONFIG_HAVE_PERF_EVENTS=y
 # Kernel Performance Events And Counters
 #
 CONFIG_PERF_EVENTS=y
+# end of Kernel Performance Events And Counters
+
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_SLUB_DEBUG=y
 # CONFIG_SLUB_MEMCG_SYSFS_ON is not set
@@ -213,10 +232,13 @@ CONFIG_SLUB=y
 CONFIG_SLAB_MERGE_DEFAULT=y
 CONFIG_SLAB_FREELIST_RANDOM=y
 CONFIG_SLAB_FREELIST_HARDENED=y
+CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
 CONFIG_SLUB_CPU_PARTIAL=y
 CONFIG_SYSTEM_DATA_VERIFICATION=y
 CONFIG_PROFILING=y
 CONFIG_TRACEPOINTS=y
+# end of General setup
+
 CONFIG_PPC64=y
 
 #
@@ -238,6 +260,11 @@ CONFIG_VSX=y
 CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
 CONFIG_PPC_RADIX_MMU=y
 CONFIG_PPC_RADIX_MMU_DEFAULT=y
+CONFIG_PPC_HAVE_KUEP=y
+CONFIG_PPC_KUEP=y
+CONFIG_PPC_HAVE_KUAP=y
+CONFIG_PPC_KUAP=y
+# CONFIG_PPC_KUAP_DEBUG is not set
 CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y
 CONFIG_PPC_MM_SLICES=y
 CONFIG_PPC_HAVE_PMU_SUPPORT=y
@@ -246,6 +273,8 @@ CONFIG_FORCE_SMP=y
 CONFIG_SMP=y
 CONFIG_NR_CPUS=2048
 CONFIG_PPC_DOORBELL=y
+# end of Processor support
+
 CONFIG_VDSO32=y
 CONFIG_CPU_BIG_ENDIAN=y
 # CONFIG_CPU_LITTLE_ENDIAN is not set
@@ -263,7 +292,6 @@ CONFIG_PPC_WATCHDOG=y
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_PPC=y
 CONFIG_PPC_BARRIER_NOSPEC=y
@@ -280,11 +308,13 @@ CONFIG_GENERIC_BUG=y
 CONFIG_EPAPR_BOOT=y
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_ARCH_SUSPEND_NONZERO_CPU=y
 CONFIG_PPC_DCR_MMIO=y
 CONFIG_PPC_DCR=y
 CONFIG_PPC_OF_PLATFORM_PCI=y
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 CONFIG_ARCH_SUPPORTS_UPROBES=y
+CONFIG_PPC_DAWR=y
 CONFIG_PGTABLE_LEVELS=4
 CONFIG_PPC_MSI_BITMAP=y
 CONFIG_PPC_XICS=y
@@ -327,6 +357,8 @@ CONFIG_PPC_PASEMI=y
 # CONFIG_PPC_PASEMI_NEMO is not set
 # CONFIG_PPC_PASEMI_IOMMU is not set
 CONFIG_PPC_PASEMI_MDIO=m
+# end of PA Semi PWRficient options
+
 CONFIG_PPC_PS3=y
 
 #
@@ -345,6 +377,8 @@ CONFIG_PS3_ROM=m
 CONFIG_PS3_FLASH=m
 CONFIG_PS3_LPM=m
 # CONFIG_PS3GELIC_UDBG is not set
+# end of PS3 Platform Options
+
 CONFIG_PPC_CELL=y
 CONFIG_PPC_CELL_COMMON=y
 CONFIG_PPC_CELL_NATIVE=y
@@ -362,6 +396,8 @@ CONFIG_PPC_IBM_CELL_POWERBUTTON=m
 CONFIG_CBE_THERM=m
 CONFIG_PPC_PMI=y
 CONFIG_CBE_CPUFREQ_SPU_GOVERNOR=m
+# end of Cell Broadband Engine options
+
 CONFIG_OPROFILE_CELL=y
 CONFIG_KVM_GUEST=y
 CONFIG_EPAPR_PARAVIRT=y
@@ -418,6 +454,7 @@ CONFIG_CPU_FREQ_MAPLE=y
 CONFIG_CPU_FREQ_PMAC64=y
 CONFIG_PPC_PASEMI_CPUFREQ=y
 CONFIG_POWERNV_CPUFREQ=y
+# end of CPU Frequency scaling
 
 #
 # CPUIdle driver
@@ -436,8 +473,13 @@ CONFIG_CPU_IDLE_GOV_TEO=y
 #
 CONFIG_PSERIES_CPUIDLE=y
 CONFIG_POWERNV_CPUIDLE=y
+# end of POWERPC CPU Idle Drivers
+# end of CPU Idle
+# end of CPUIdle driver
+
 # CONFIG_GEN_RTC is not set
 # CONFIG_SIMPLE_GPIO is not set
+# end of Platform support
 
 #
 # Kernel options
@@ -498,6 +540,7 @@ CONFIG_HIBERNATION=y
 CONFIG_PM_STD_PARTITION=""
 CONFIG_PM_SLEEP=y
 CONFIG_PM_SLEEP_SMP=y
+CONFIG_PM_SLEEP_SMP_NONZERO_CPU=y
 # CONFIG_PM_AUTOSLEEP is not set
 # CONFIG_PM_WAKELOCKS is not set
 CONFIG_PM=y
@@ -513,6 +556,8 @@ CONFIG_PM_GENERIC_DOMAINS_OF=y
 CONFIG_ENERGY_MODEL=y
 CONFIG_SECCOMP=y
 CONFIG_PPC_MEM_KEYS=y
+# end of Kernel options
+
 CONFIG_ISA_DMA_API=y
 
 #
@@ -520,6 +565,8 @@ CONFIG_ISA_DMA_API=y
 #
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_FSL_LBC=y
+# end of Bus options
+
 CONFIG_NONSTATIC_KERNEL=y
 CONFIG_PAGE_OFFSET=0xc000000000000000
 CONFIG_KERNEL_START=0xc000000000000000
@@ -587,6 +634,8 @@ CONFIG_HAVE_PERF_REGS=y
 CONFIG_HAVE_PERF_USER_STACK_DUMP=y
 CONFIG_HAVE_ARCH_JUMP_LABEL=y
 CONFIG_HAVE_RCU_TABLE_FREE=y
+CONFIG_HAVE_RCU_TABLE_NO_INVALIDATE=y
+CONFIG_HAVE_MMU_GATHER_PAGE_SIZE=y
 CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
 CONFIG_ARCH_WEAK_RELEASE_ACQUIRE=y
 CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
@@ -603,6 +652,7 @@ CONFIG_HAVE_VIRT_CPU_ACCOUNTING=y
 CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
 CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
 CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
+CONFIG_HAVE_ARCH_HUGE_VMAP=y
 CONFIG_HAVE_ARCH_SOFT_DIRTY=y
 CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
 CONFIG_MODULES_USE_ELF_RELA=y
@@ -620,15 +670,28 @@ CONFIG_64BIT_TIME=y
 CONFIG_COMPAT_32BIT_TIME=y
 CONFIG_ARCH_HAS_PHYS_TO_DMA=y
 CONFIG_REFCOUNT_FULL=y
+# CONFIG_LOCK_EVENT_COUNTS is not set
 
 #
 # GCOV-based kernel profiling
 #
 # CONFIG_GCOV_KERNEL is not set
 CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
+# end of GCOV-based kernel profiling
+
 CONFIG_PLUGIN_HOSTCC="g++"
 CONFIG_HAVE_GCC_PLUGINS=y
-# CONFIG_GCC_PLUGINS is not set
+CONFIG_GCC_PLUGINS=y
+
+#
+# GCC plugins
+#
+# CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set
+# CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
+# CONFIG_GCC_PLUGIN_RANDSTRUCT is not set
+# end of GCC plugins
+# end of General architecture-dependent options
+
 CONFIG_RT_MUTEXES=y
 CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
@@ -682,6 +745,8 @@ CONFIG_LDM_PARTITION=y
 CONFIG_EFI_PARTITION=y
 # CONFIG_SYSV68_PARTITION is not set
 CONFIG_CMDLINE_PARTITION=y
+# end of Partition Types
+
 CONFIG_BLOCK_COMPAT=y
 CONFIG_BLK_MQ_PCI=y
 CONFIG_BLK_MQ_VIRTIO=y
@@ -695,6 +760,9 @@ CONFIG_MQ_IOSCHED_DEADLINE=y
 CONFIG_MQ_IOSCHED_KYBER=y
 CONFIG_IOSCHED_BFQ=y
 CONFIG_BFQ_GROUP_IOSCHED=y
+# CONFIG_BFQ_CGROUP_DEBUG is not set
+# end of IO Schedulers
+
 CONFIG_PREEMPT_NOTIFIERS=y
 CONFIG_PADATA=y
 CONFIG_ASN1=y
@@ -707,6 +775,8 @@ CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
 CONFIG_MUTEX_SPIN_ON_OWNER=y
 CONFIG_RWSEM_SPIN_ON_OWNER=y
 CONFIG_LOCK_SPIN_ON_OWNER=y
+CONFIG_ARCH_HAS_MMIOWB=y
+CONFIG_MMIOWB=y
 CONFIG_FREEZER=y
 
 #
@@ -719,6 +789,7 @@ CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 CONFIG_BINFMT_SCRIPT=y
 CONFIG_BINFMT_MISC=m
 CONFIG_COREDUMP=y
+# end of Executable file formats
 
 #
 # Memory Management options
@@ -732,7 +803,8 @@ CONFIG_SPARSEMEM_EXTREME=y
 CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
 CONFIG_SPARSEMEM_VMEMMAP=y
 CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
-CONFIG_HAVE_GENERIC_GUP=y
+CONFIG_HAVE_FAST_GUP=y
+CONFIG_ARCH_KEEP_MEMBLOCK=y
 CONFIG_MEMORY_ISOLATION=y
 CONFIG_HAVE_BOOTMEM_INFO_NODE=y
 CONFIG_MEMORY_HOTPLUG=y
@@ -745,6 +817,7 @@ CONFIG_BALLOON_COMPACTION=y
 CONFIG_COMPACTION=y
 CONFIG_MIGRATION=y
 CONFIG_ARCH_ENABLE_THP_MIGRATION=y
+CONFIG_CONTIG_ALLOC=y
 CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_MMU_NOTIFIER=y
 CONFIG_KSM=y
@@ -772,21 +845,20 @@ CONFIG_PGTABLE_MAPPING=y
 # CONFIG_ZSMALLOC_STAT is not set
 # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
 CONFIG_IDLE_PAGE_TRACKING=y
-CONFIG_ARCH_HAS_ZONE_DEVICE=y
+CONFIG_ARCH_HAS_PTE_DEVMAP=y
 CONFIG_ZONE_DEVICE=y
-CONFIG_ARCH_HAS_HMM=y
-CONFIG_MIGRATE_VMA_HELPER=y
 CONFIG_DEV_PAGEMAP_OPS=y
-CONFIG_HMM=y
 CONFIG_HMM_MIRROR=y
 CONFIG_DEVICE_PRIVATE=y
-CONFIG_DEVICE_PUBLIC=y
 CONFIG_FRAME_VECTOR=y
 CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
 CONFIG_ARCH_HAS_PKEYS=y
 # CONFIG_PERCPU_STATS is not set
 # CONFIG_GUP_BENCHMARK is not set
 CONFIG_ARCH_HAS_PTE_SPECIAL=y
+CONFIG_ARCH_HAS_HUGEPD=y
+# end of Memory Management options
+
 CONFIG_NET=y
 CONFIG_COMPAT_NETLINK_MESSAGES=y
 CONFIG_NET_INGRESS=y
@@ -847,9 +919,6 @@ CONFIG_INET_ESP_OFFLOAD=m
 CONFIG_INET_IPCOMP=m
 CONFIG_INET_XFRM_TUNNEL=m
 CONFIG_INET_TUNNEL=m
-CONFIG_INET_XFRM_MODE_TRANSPORT=m
-CONFIG_INET_XFRM_MODE_TUNNEL=m
-CONFIG_INET_XFRM_MODE_BEET=m
 CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 CONFIG_INET_UDP_DIAG=y
@@ -887,10 +956,6 @@ CONFIG_IPV6_MIP6=m
 CONFIG_IPV6_ILA=m
 CONFIG_INET6_XFRM_TUNNEL=m
 CONFIG_INET6_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-CONFIG_INET6_XFRM_MODE_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_BEET=m
-CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
 CONFIG_IPV6_VTI=m
 CONFIG_IPV6_SIT=m
 CONFIG_IPV6_SIT_6RD=y
@@ -955,7 +1020,6 @@ CONFIG_NF_CT_NETLINK_TIMEOUT=m
 CONFIG_NF_CT_NETLINK_HELPER=m
 CONFIG_NETFILTER_NETLINK_GLUE_CT=y
 CONFIG_NF_NAT=m
-CONFIG_NF_NAT_NEEDED=y
 CONFIG_NF_NAT_AMANDA=m
 CONFIG_NF_NAT_FTP=m
 CONFIG_NF_NAT_IRC=m
@@ -992,6 +1056,7 @@ CONFIG_NFT_XFRM=m
 CONFIG_NFT_SOCKET=m
 CONFIG_NFT_OSF=m
 CONFIG_NFT_TPROXY=m
+# CONFIG_NFT_SYNPROXY is not set
 CONFIG_NF_DUP_NETDEV=m
 CONFIG_NFT_DUP_NETDEV=m
 CONFIG_NFT_FWD_NETDEV=m
@@ -1030,6 +1095,7 @@ CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
 CONFIG_NETFILTER_XT_TARGET_RATEEST=m
 CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
+CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m
 CONFIG_NETFILTER_XT_TARGET_TEE=m
 CONFIG_NETFILTER_XT_TARGET_TPROXY=m
 CONFIG_NETFILTER_XT_TARGET_TRACE=m
@@ -1086,6 +1152,8 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m
 CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
 CONFIG_NETFILTER_XT_MATCH_TIME=m
 CONFIG_NETFILTER_XT_MATCH_U32=m
+# end of Core Netfilter Configuration
+
 CONFIG_IP_SET=m
 CONFIG_IP_SET_MAX=256
 CONFIG_IP_SET_BITMAP_IP=m
@@ -1160,7 +1228,6 @@ CONFIG_NF_DEFRAG_IPV4=m
 CONFIG_NF_SOCKET_IPV4=m
 CONFIG_NF_TPROXY_IPV4=m
 CONFIG_NF_TABLES_IPV4=y
-CONFIG_NFT_CHAIN_ROUTE_IPV4=m
 CONFIG_NFT_REJECT_IPV4=m
 CONFIG_NFT_DUP_IPV4=m
 CONFIG_NFT_FIB_IPV4=m
@@ -1194,6 +1261,7 @@ CONFIG_IP_NF_RAW=m
 CONFIG_IP_NF_ARPTABLES=m
 CONFIG_IP_NF_ARPFILTER=m
 CONFIG_IP_NF_ARP_MANGLE=m
+# end of IP: Netfilter Configuration
 
 #
 # IPv6: Netfilter Configuration
@@ -1201,7 +1269,6 @@ CONFIG_IP_NF_ARP_MANGLE=m
 CONFIG_NF_SOCKET_IPV6=m
 CONFIG_NF_TPROXY_IPV6=m
 CONFIG_NF_TABLES_IPV6=y
-CONFIG_NFT_CHAIN_ROUTE_IPV6=m
 CONFIG_NFT_REJECT_IPV6=m
 CONFIG_NFT_DUP_IPV6=m
 CONFIG_NFT_FIB_IPV6=m
@@ -1230,10 +1297,14 @@ CONFIG_IP6_NF_RAW=m
 CONFIG_IP6_NF_NAT=m
 CONFIG_IP6_NF_TARGET_MASQUERADE=m
 CONFIG_IP6_NF_TARGET_NPT=m
+# end of IPv6: Netfilter Configuration
+
 CONFIG_NF_DEFRAG_IPV6=m
-CONFIG_NF_TABLES_BRIDGE=y
+CONFIG_NF_TABLES_BRIDGE=m
+# CONFIG_NFT_BRIDGE_META is not set
 CONFIG_NFT_BRIDGE_REJECT=m
 CONFIG_NF_LOG_BRIDGE=m
+# CONFIG_NF_CONNTRACK_BRIDGE is not set
 CONFIG_BRIDGE_NF_EBTABLES=m
 CONFIG_BRIDGE_EBT_BROUTE=m
 CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -1266,11 +1337,14 @@ CONFIG_INET_DCCP_DIAG=m
 CONFIG_IP_DCCP_CCID3=y
 # CONFIG_IP_DCCP_CCID3_DEBUG is not set
 CONFIG_IP_DCCP_TFRC_LIB=y
+# end of DCCP CCIDs Configuration
 
 #
 # DCCP Kernel Hacking
 #
 # CONFIG_IP_DCCP_DEBUG is not set
+# end of DCCP Kernel Hacking
+
 CONFIG_IP_SCTP=m
 # CONFIG_SCTP_DBG_OBJCNT is not set
 # CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5 is not set
@@ -1307,14 +1381,21 @@ CONFIG_BRIDGE_IGMP_SNOOPING=y
 CONFIG_BRIDGE_VLAN_FILTERING=y
 CONFIG_HAVE_NET_DSA=y
 CONFIG_NET_DSA=m
-CONFIG_NET_DSA_LEGACY=y
-CONFIG_NET_DSA_TAG_BRCM=y
-CONFIG_NET_DSA_TAG_BRCM_PREPEND=y
-CONFIG_NET_DSA_TAG_DSA=y
-CONFIG_NET_DSA_TAG_EDSA=y
-CONFIG_NET_DSA_TAG_GSWIP=y
-CONFIG_NET_DSA_TAG_TRAILER=y
-CONFIG_NET_DSA_TAG_QCA=y
+CONFIG_NET_DSA_TAG_8021Q=m
+CONFIG_NET_DSA_TAG_BRCM_COMMON=m
+CONFIG_NET_DSA_TAG_BRCM=m
+CONFIG_NET_DSA_TAG_BRCM_PREPEND=m
+CONFIG_NET_DSA_TAG_GSWIP=m
+CONFIG_NET_DSA_TAG_DSA=m
+CONFIG_NET_DSA_TAG_EDSA=m
+CONFIG_NET_DSA_TAG_MTK=m
+CONFIG_NET_DSA_TAG_KSZ_COMMON=m
+CONFIG_NET_DSA_TAG_KSZ=m
+CONFIG_NET_DSA_TAG_KSZ9477=m
+CONFIG_NET_DSA_TAG_QCA=m
+CONFIG_NET_DSA_TAG_LAN9303=m
+CONFIG_NET_DSA_TAG_SJA1105=m
+CONFIG_NET_DSA_TAG_TRAILER=m
 CONFIG_VLAN_8021Q=m
 CONFIG_VLAN_8021Q_GVRP=y
 CONFIG_VLAN_8021Q_MVRP=y
@@ -1417,16 +1498,18 @@ CONFIG_NET_ACT_PEDIT=m
 CONFIG_NET_ACT_SIMP=m
 CONFIG_NET_ACT_SKBEDIT=m
 CONFIG_NET_ACT_CSUM=m
+# CONFIG_NET_ACT_MPLS is not set
 CONFIG_NET_ACT_VLAN=m
 CONFIG_NET_ACT_BPF=m
 CONFIG_NET_ACT_CONNMARK=m
+# CONFIG_NET_ACT_CTINFO is not set
 CONFIG_NET_ACT_SKBMOD=m
 CONFIG_NET_ACT_IFE=m
 CONFIG_NET_ACT_TUNNEL_KEY=m
+# CONFIG_NET_ACT_CT is not set
 CONFIG_NET_IFE_SKBMARK=m
 CONFIG_NET_IFE_SKBPRIO=m
 CONFIG_NET_IFE_SKBTCINDEX=m
-CONFIG_NET_CLS_IND=y
 CONFIG_NET_SCH_FIFO=y
 CONFIG_DCB=y
 CONFIG_DNS_RESOLVER=y
@@ -1438,6 +1521,7 @@ CONFIG_BATMAN_ADV_NC=y
 CONFIG_BATMAN_ADV_MCAST=y
 CONFIG_BATMAN_ADV_DEBUGFS=y
 # CONFIG_BATMAN_ADV_DEBUG is not set
+CONFIG_BATMAN_ADV_SYSFS=y
 # CONFIG_BATMAN_ADV_TRACING is not set
 CONFIG_OPENVSWITCH=m
 CONFIG_OPENVSWITCH_GRE=m
@@ -1473,6 +1557,9 @@ CONFIG_NET_FLOW_LIMIT=y
 #
 # CONFIG_NET_PKTGEN is not set
 # CONFIG_NET_DROP_MONITOR is not set
+# end of Network testing
+# end of Networking options
+
 CONFIG_HAMRADIO=y
 
 #
@@ -1493,6 +1580,8 @@ CONFIG_BAYCOM_SER_FDX=m
 CONFIG_BAYCOM_SER_HDX=m
 CONFIG_BAYCOM_PAR=m
 CONFIG_YAM=m
+# end of AX.25 network device drivers
+
 CONFIG_CAN=m
 CONFIG_CAN_RAW=m
 CONFIG_CAN_BCM=m
@@ -1528,6 +1617,7 @@ CONFIG_CAN_SOFTING_CS=m
 #
 # CONFIG_CAN_HI311X is not set
 CONFIG_CAN_MCP251X=m
+# end of CAN SPI interfaces
 
 #
 # CAN USB interfaces
@@ -1540,7 +1630,11 @@ CONFIG_CAN_KVASER_USB=m
 # CONFIG_CAN_MCBA_USB is not set
 CONFIG_CAN_PEAK_USB=m
 CONFIG_CAN_UCAN=m
+# end of CAN USB interfaces
+
 CONFIG_CAN_DEBUG_DEVICES=y
+# end of CAN Device Drivers
+
 CONFIG_BT=m
 CONFIG_BT_BREDR=y
 CONFIG_BT_RFCOMM=m
@@ -1566,6 +1660,7 @@ CONFIG_BT_QCA=m
 CONFIG_BT_HCIBTUSB=m
 CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
 CONFIG_BT_HCIBTUSB_BCM=y
+# CONFIG_BT_HCIBTUSB_MTK is not set
 CONFIG_BT_HCIBTUSB_RTL=y
 CONFIG_BT_HCIBTSDIO=m
 CONFIG_BT_HCIUART=m
@@ -1592,8 +1687,11 @@ CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
 CONFIG_BT_ATH3K=m
 CONFIG_BT_WILINK=m
+CONFIG_BT_MTKSDIO=m
 CONFIG_BT_MTKUART=m
 CONFIG_BT_HCIRSI=m
+# end of Bluetooth device drivers
+
 CONFIG_AF_RXRPC=m
 CONFIG_AF_RXRPC_IPV6=y
 # CONFIG_AF_RXRPC_INJECT_LOSS is not set
@@ -1690,6 +1788,8 @@ CONFIG_NFC_NXP_NCI_I2C=m
 CONFIG_NFC_S3FWRN5=m
 CONFIG_NFC_S3FWRN5_I2C=m
 CONFIG_NFC_ST95HF=m
+# end of Near Field Communication (NFC) devices
+
 CONFIG_PSAMPLE=m
 CONFIG_NET_IFE=m
 CONFIG_LWTUNNEL=y
@@ -1754,6 +1854,8 @@ CONFIG_HOTPLUG_PCI_RPA_DLPAR=m
 CONFIG_PCIE_CADENCE=y
 CONFIG_PCIE_CADENCE_HOST=y
 CONFIG_PCIE_CADENCE_EP=y
+# end of Cadence PCIe controllers support
+
 CONFIG_PCI_FTPCI100=y
 CONFIG_PCI_HOST_COMMON=y
 CONFIG_PCI_HOST_GENERIC=y
@@ -1762,6 +1864,8 @@ CONFIG_PCIE_XILINX=y
 #
 # DesignWare PCI Core Support
 #
+# end of DesignWare PCI Core Support
+# end of PCI controller drivers
 
 #
 # PCI Endpoint
@@ -1769,11 +1873,14 @@ CONFIG_PCIE_XILINX=y
 CONFIG_PCI_ENDPOINT=y
 CONFIG_PCI_ENDPOINT_CONFIGFS=y
 # CONFIG_PCI_EPF_TEST is not set
+# end of PCI Endpoint
 
 #
 # PCI switch controller drivers
 #
 CONFIG_PCI_SW_SWITCHTEC=m
+# end of PCI switch controller drivers
+
 CONFIG_PCCARD=m
 CONFIG_PCMCIA=m
 CONFIG_PCMCIA_LOAD_CIS=y
@@ -1810,6 +1917,7 @@ CONFIG_RAPIDIO_CPS_XX=m
 CONFIG_RAPIDIO_TSI568=m
 CONFIG_RAPIDIO_CPS_GEN2=m
 CONFIG_RAPIDIO_RXS_GEN3=m
+# end of RapidIO Switch drivers
 
 #
 # Generic Driver Options
@@ -1824,9 +1932,13 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 # Firmware loader
 #
 CONFIG_FW_LOADER=y
+CONFIG_FW_LOADER_PAGED_BUF=y
 CONFIG_EXTRA_FIRMWARE=""
 CONFIG_FW_LOADER_USER_HELPER=y
 # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
+# CONFIG_FW_LOADER_COMPRESS is not set
+# end of Firmware loader
+
 CONFIG_WANT_DEV_COREDUMP=y
 CONFIG_ALLOW_DEV_COREDUMP=y
 CONFIG_DEV_COREDUMP=y
@@ -1846,11 +1958,14 @@ CONFIG_REGMAP_MMIO=y
 CONFIG_REGMAP_IRQ=y
 CONFIG_DMA_SHARED_BUFFER=y
 # CONFIG_DMA_FENCE_TRACE is not set
+# end of Generic Driver Options
 
 #
 # Bus devices
 #
 CONFIG_SIMPLE_PM_BUS=y
+# end of Bus devices
+
 CONFIG_CONNECTOR=y
 CONFIG_PROC_EVENTS=y
 CONFIG_GNSS=m
@@ -1871,6 +1986,7 @@ CONFIG_MTD_REDBOOT_PARTS=m
 CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
 # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
 # CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
+# end of Partition parsers
 
 #
 # User Modules And Translation Layers
@@ -1901,6 +2017,7 @@ CONFIG_MTD_CFI_I2=y
 CONFIG_MTD_RAM=m
 CONFIG_MTD_ROM=m
 CONFIG_MTD_ABSENT=m
+# end of RAM/ROM/Flash chip drivers
 
 #
 # Mapping drivers for chip access
@@ -1916,6 +2033,7 @@ CONFIG_MTD_PCI=m
 # CONFIG_MTD_PCMCIA is not set
 # CONFIG_MTD_INTEL_VR_NOR is not set
 CONFIG_MTD_PLATRAM=m
+# end of Mapping drivers for chip access
 
 #
 # Self-contained MTD device drivers
@@ -1939,30 +2057,39 @@ CONFIG_MTD_POWERNV_FLASH=m
 # Disk-On-Chip Device Drivers
 #
 # CONFIG_MTD_DOCG3 is not set
+# end of Self-contained MTD device drivers
+
 CONFIG_MTD_NAND_CORE=m
 CONFIG_MTD_ONENAND=m
 CONFIG_MTD_ONENAND_VERIFY_WRITE=y
 CONFIG_MTD_ONENAND_GENERIC=m
 # CONFIG_MTD_ONENAND_OTP is not set
 CONFIG_MTD_ONENAND_2X_PROGRAM=y
-CONFIG_MTD_NAND_ECC=m
-# CONFIG_MTD_NAND_ECC_SMC is not set
-CONFIG_MTD_NAND=m
-CONFIG_MTD_NAND_BCH=m
-CONFIG_MTD_NAND_ECC_BCH=y
-CONFIG_MTD_SM_COMMON=m
+CONFIG_MTD_NAND_ECC_SW_HAMMING=m
+# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
+CONFIG_MTD_RAW_NAND=m
+CONFIG_MTD_NAND_ECC_SW_BCH=y
+
+#
+# Raw/parallel NAND flash controllers
+#
 CONFIG_MTD_NAND_DENALI=m
 CONFIG_MTD_NAND_DENALI_PCI=m
+CONFIG_MTD_NAND_CAFE=m
+# CONFIG_MTD_NAND_PASEMI is not set
 CONFIG_MTD_NAND_GPIO=m
+CONFIG_MTD_NAND_PLATFORM=m
+
+#
+# Misc
+#
+CONFIG_MTD_SM_COMMON=m
+CONFIG_MTD_NAND_NANDSIM=m
 CONFIG_MTD_NAND_RICOH=m
 CONFIG_MTD_NAND_DISKONCHIP=m
 # CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set
 CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
 # CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set
-CONFIG_MTD_NAND_CAFE=m
-# CONFIG_MTD_NAND_PASEMI is not set
-CONFIG_MTD_NAND_NANDSIM=m
-CONFIG_MTD_NAND_PLATFORM=m
 CONFIG_MTD_SPI_NAND=m
 
 #
@@ -1970,6 +2097,8 @@ CONFIG_MTD_SPI_NAND=m
 #
 CONFIG_MTD_LPDDR=m
 CONFIG_MTD_QINFO_PROBE=m
+# end of LPDDR & LPDDR2 PCM memory drivers
+
 CONFIG_MTD_SPI_NOR=m
 CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y
 CONFIG_SPI_MTK_QUADSPI=m
@@ -1979,6 +2108,7 @@ CONFIG_MTD_UBI_BEB_LIMIT=20
 CONFIG_MTD_UBI_FASTMAP=y
 CONFIG_MTD_UBI_GLUEBI=m
 CONFIG_MTD_UBI_BLOCK=y
+# CONFIG_MTD_HYPERBUS is not set
 CONFIG_DTC=y
 CONFIG_OF=y
 # CONFIG_OF_UNITTEST is not set
@@ -2049,6 +2179,7 @@ CONFIG_NVME_TARGET_RDMA=m
 CONFIG_NVME_TARGET_FC=m
 CONFIG_NVME_TARGET_FCLOOP=m
 CONFIG_NVME_TARGET_TCP=m
+# end of NVME Support
 
 #
 # Misc devices
@@ -2074,10 +2205,10 @@ CONFIG_SENSORS_BH1770=m
 CONFIG_SENSORS_APDS990X=m
 CONFIG_HMC6352=m
 CONFIG_DS1682=m
-CONFIG_USB_SWITCH_FSA9480=m
 CONFIG_LATTICE_ECP3_CONFIG=m
 CONFIG_SRAM=y
 # CONFIG_PCI_ENDPOINT_TEST is not set
+# CONFIG_XILINX_SDFEC is not set
 CONFIG_MISC_RTSX=m
 CONFIG_PVPANIC=m
 CONFIG_C2PORT=m
@@ -2093,6 +2224,8 @@ CONFIG_EEPROM_93CX6=m
 CONFIG_EEPROM_93XX46=m
 CONFIG_EEPROM_IDT_89HPESX=m
 CONFIG_EEPROM_EE1004=m
+# end of EEPROM support
+
 CONFIG_CB710_CORE=m
 # CONFIG_CB710_DEBUG is not set
 CONFIG_CB710_DEBUG_ASSUMPTIONS=y
@@ -2101,6 +2234,8 @@ CONFIG_CB710_DEBUG_ASSUMPTIONS=y
 # Texas Instruments shared transport line discipline
 #
 CONFIG_TI_ST=m
+# end of Texas Instruments shared transport line discipline
+
 CONFIG_SENSORS_LIS3_SPI=m
 CONFIG_SENSORS_LIS3_I2C=m
 CONFIG_ALTERA_STAPL=m
@@ -2143,6 +2278,8 @@ CONFIG_VOP_BUS=m
 #
 CONFIG_VOP=m
 CONFIG_VHOST_RING=m
+# end of Intel MIC & related support
+
 CONFIG_GENWQE=m
 CONFIG_GENWQE_PLATFORM_ERROR_RECOVERY=0
 CONFIG_ECHO=m
@@ -2156,6 +2293,8 @@ CONFIG_MISC_ALCOR_PCI=m
 CONFIG_MISC_RTSX_PCI=m
 CONFIG_MISC_RTSX_USB=m
 CONFIG_HABANA_AI=m
+# end of Misc devices
+
 CONFIG_HAVE_IDE=y
 # CONFIG_IDE is not set
 
@@ -2174,7 +2313,6 @@ CONFIG_SCSI_PROC_FS=y
 #
 CONFIG_BLK_DEV_SD=m
 CONFIG_CHR_DEV_ST=m
-CONFIG_CHR_DEV_OSST=m
 CONFIG_BLK_DEV_SR=m
 CONFIG_BLK_DEV_SR_VENDOR=y
 CONFIG_CHR_DEV_SG=m
@@ -2195,6 +2333,8 @@ CONFIG_SCSI_SAS_LIBSAS=m
 CONFIG_SCSI_SAS_ATA=y
 CONFIG_SCSI_SAS_HOST_SMP=y
 CONFIG_SCSI_SRP_ATTRS=m
+# end of SCSI Transports
+
 CONFIG_SCSI_LOWLEVEL=y
 CONFIG_ISCSI_TCP=m
 CONFIG_ISCSI_BOOT_SYSFS=m
@@ -2256,6 +2396,7 @@ CONFIG_FCOE=m
 CONFIG_SCSI_SNIC=m
 # CONFIG_SCSI_SNIC_DEBUG_FS is not set
 CONFIG_SCSI_DMX3191D=m
+# CONFIG_SCSI_FDOMAIN_PCI is not set
 CONFIG_SCSI_GDTH=m
 CONFIG_SCSI_IPS=m
 CONFIG_SCSI_IBMVSCSI=m
@@ -2297,6 +2438,7 @@ CONFIG_SCSI_VIRTIO=m
 CONFIG_SCSI_CHELSIO_FCOE=m
 CONFIG_SCSI_LOWLEVEL_PCMCIA=y
 CONFIG_PCMCIA_AHA152X=m
+# CONFIG_PCMCIA_FDOMAIN is not set
 CONFIG_PCMCIA_QLOGIC=m
 CONFIG_PCMCIA_SYM53C500=m
 CONFIG_SCSI_DH=y
@@ -2304,6 +2446,8 @@ CONFIG_SCSI_DH_RDAC=m
 CONFIG_SCSI_DH_HP_SW=m
 CONFIG_SCSI_DH_EMC=m
 CONFIG_SCSI_DH_ALUA=m
+# end of SCSI device support
+
 CONFIG_ATA=m
 CONFIG_ATA_NONSTANDARD=y
 CONFIG_ATA_VERBOSE_ERROR=y
@@ -2439,6 +2583,7 @@ CONFIG_DM_MULTIPATH=m
 CONFIG_DM_MULTIPATH_QL=m
 CONFIG_DM_MULTIPATH_ST=m
 CONFIG_DM_DELAY=m
+CONFIG_DM_DUST=m
 CONFIG_DM_UEVENT=y
 CONFIG_DM_FLAKEY=m
 CONFIG_DM_VERITY=m
@@ -2474,6 +2619,8 @@ CONFIG_FIREWIRE_OHCI=m
 CONFIG_FIREWIRE_SBP2=m
 CONFIG_FIREWIRE_NET=m
 CONFIG_FIREWIRE_NOSY=m
+# end of IEEE 1394 (FireWire) support
+
 CONFIG_MACINTOSH_DRIVERS=y
 CONFIG_ADB_PMU=y
 CONFIG_ADB_PMU_LED=y
@@ -2580,11 +2727,16 @@ CONFIG_NET_DSA_MV88E6060=m
 CONFIG_NET_DSA_MV88E6XXX=m
 CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y
 CONFIG_NET_DSA_MV88E6XXX_PTP=y
+CONFIG_NET_DSA_SJA1105=m
+# CONFIG_NET_DSA_SJA1105_PTP is not set
 CONFIG_NET_DSA_QCA8K=m
 # CONFIG_NET_DSA_REALTEK_SMI is not set
 # CONFIG_NET_DSA_SMSC_LAN9303_I2C is not set
 # CONFIG_NET_DSA_SMSC_LAN9303_MDIO is not set
-# CONFIG_NET_DSA_VITESSE_VSC73XX is not set
+# CONFIG_NET_DSA_VITESSE_VSC73XX_SPI is not set
+# CONFIG_NET_DSA_VITESSE_VSC73XX_PLATFORM is not set
+# end of Distributed Switch Architecture drivers
+
 CONFIG_ETHERNET=y
 CONFIG_MDIO=m
 CONFIG_NET_VENDOR_3COM=y
@@ -2638,8 +2790,6 @@ CONFIG_BNXT_HWMON=y
 CONFIG_NET_VENDOR_BROCADE=y
 CONFIG_BNA=m
 CONFIG_NET_VENDOR_CADENCE=y
-CONFIG_MACB=m
-CONFIG_MACB_USE_HWSTAMP=y
 CONFIG_NET_VENDOR_CAVIUM=y
 CONFIG_THUNDER_NIC_PF=m
 CONFIG_THUNDER_NIC_VF=m
@@ -2689,6 +2839,8 @@ CONFIG_NET_VENDOR_EZCHIP=y
 CONFIG_EZCHIP_NPS_MANAGEMENT_ENET=m
 CONFIG_NET_VENDOR_FUJITSU=y
 CONFIG_PCMCIA_FMVJ18X=m
+CONFIG_NET_VENDOR_GOOGLE=y
+# CONFIG_GVE is not set
 CONFIG_NET_VENDOR_HP=y
 CONFIG_HP100=m
 CONFIG_NET_VENDOR_HUAWEI=y
@@ -2862,6 +3014,7 @@ CONFIG_SMSC9420=m
 CONFIG_NET_VENDOR_SOCIONEXT=y
 CONFIG_NET_VENDOR_STMICRO=y
 CONFIG_STMMAC_ETH=m
+# CONFIG_STMMAC_SELFTESTS is not set
 CONFIG_STMMAC_PLATFORM=m
 # CONFIG_DWMAC_DWC_QOS_ETH is not set
 CONFIG_DWMAC_GENERIC=m
@@ -2877,7 +3030,6 @@ CONFIG_NET_VENDOR_TEHUTI=y
 CONFIG_TEHUTI=m
 CONFIG_NET_VENDOR_TI=y
 # CONFIG_TI_CPSW_PHY_SEL is not set
-CONFIG_TI_CPSW_ALE=m
 CONFIG_TLAN=m
 CONFIG_NET_VENDOR_TOSHIBA=y
 # CONFIG_GELIC_NET is not set
@@ -2894,6 +3046,7 @@ CONFIG_WIZNET_W5300=m
 CONFIG_WIZNET_BUS_ANY=y
 CONFIG_WIZNET_W5100_SPI=m
 CONFIG_NET_VENDOR_XILINX=y
+CONFIG_XILINX_LL_TEMAC=m
 CONFIG_NET_VENDOR_XIRCOM=y
 CONFIG_PCMCIA_XIRC2PS=m
 CONFIG_FDDI=y
@@ -2952,6 +3105,7 @@ CONFIG_MICROCHIP_PHY=m
 CONFIG_MICROCHIP_T1_PHY=m
 CONFIG_MICROSEMI_PHY=m
 CONFIG_NATIONAL_PHY=m
+# CONFIG_NXP_TJA11XX_PHY is not set
 CONFIG_QSEMI_PHY=m
 CONFIG_REALTEK_PHY=m
 CONFIG_RENESAS_PHY=m
@@ -3150,6 +3304,8 @@ CONFIG_IWL3945=m
 #
 # CONFIG_IWLEGACY_DEBUG is not set
 CONFIG_IWLEGACY_DEBUGFS=y
+# end of iwl3945 / iwl4965 Debugging Options
+
 CONFIG_IWLWIFI=m
 CONFIG_IWLWIFI_LEDS=y
 CONFIG_IWLDVM=m
@@ -3164,6 +3320,8 @@ CONFIG_IWLWIFI_PCIE_RTPM=y
 # CONFIG_IWLWIFI_DEBUG is not set
 # CONFIG_IWLWIFI_DEBUGFS is not set
 # CONFIG_IWLWIFI_DEVICE_TRACING is not set
+# end of Debugging Options
+
 CONFIG_WLAN_VENDOR_INTERSIL=y
 CONFIG_HOSTAP=m
 CONFIG_HOSTAP_FIRMWARE=y
@@ -3219,6 +3377,7 @@ CONFIG_MT76x2_COMMON=m
 CONFIG_MT76x2E=m
 CONFIG_MT76x2U=m
 CONFIG_MT7603E=m
+CONFIG_MT7615E=m
 CONFIG_WLAN_VENDOR_RALINK=y
 CONFIG_RT2X00=m
 CONFIG_RT2400PCI=m
@@ -3272,6 +3431,13 @@ CONFIG_RTL8723_COMMON=m
 CONFIG_RTLBTCOEXIST=m
 CONFIG_RTL8XXXU=m
 # CONFIG_RTL8XXXU_UNTESTED is not set
+CONFIG_RTW88=m
+CONFIG_RTW88_CORE=m
+CONFIG_RTW88_PCI=m
+CONFIG_RTW88_8822BE=y
+CONFIG_RTW88_8822CE=y
+# CONFIG_RTW88_DEBUG is not set
+# CONFIG_RTW88_DEBUGFS is not set
 CONFIG_WLAN_VENDOR_RSI=y
 CONFIG_RSI_91X=m
 CONFIG_RSI_DEBUGFS=y
@@ -3311,6 +3477,8 @@ CONFIG_VIRT_WIFI=m
 CONFIG_WIMAX_I2400M=m
 CONFIG_WIMAX_I2400M_USB=m
 CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
+# end of WiMAX Wireless Broadband devices
+
 # CONFIG_WAN is not set
 CONFIG_IEEE802154_DRIVERS=m
 CONFIG_IEEE802154_FAKELB=m
@@ -3359,6 +3527,7 @@ CONFIG_KEYBOARD_ADC=m
 CONFIG_KEYBOARD_ADP5588=m
 CONFIG_KEYBOARD_ADP5589=m
 CONFIG_KEYBOARD_ATKBD=y
+CONFIG_KEYBOARD_QT1050=m
 CONFIG_KEYBOARD_QT1070=m
 CONFIG_KEYBOARD_QT2160=m
 # CONFIG_KEYBOARD_DLINK_DIR685 is not set
@@ -3424,8 +3593,8 @@ CONFIG_JOYSTICK_INTERACT=m
 CONFIG_JOYSTICK_SIDEWINDER=m
 CONFIG_JOYSTICK_TMDC=m
 CONFIG_JOYSTICK_IFORCE=m
-CONFIG_JOYSTICK_IFORCE_USB=y
-CONFIG_JOYSTICK_IFORCE_232=y
+CONFIG_JOYSTICK_IFORCE_USB=m
+CONFIG_JOYSTICK_IFORCE_232=m
 CONFIG_JOYSTICK_WARRIOR=m
 CONFIG_JOYSTICK_MAGELLAN=m
 CONFIG_JOYSTICK_SPACEORB=m
@@ -3557,6 +3726,7 @@ CONFIG_TOUCHSCREEN_ZET6223=m
 CONFIG_TOUCHSCREEN_ZFORCE=m
 CONFIG_TOUCHSCREEN_COLIBRI_VF50=m
 CONFIG_TOUCHSCREEN_ROHM_BU21023=m
+CONFIG_TOUCHSCREEN_IQS5XX=m
 CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_88PM860X_ONKEY is not set
 # CONFIG_INPUT_88PM80X_ONKEY is not set
@@ -3569,6 +3739,7 @@ CONFIG_INPUT_BMA150=m
 CONFIG_INPUT_E3X0_BUTTON=m
 CONFIG_INPUT_MSM_VIBRATOR=m
 CONFIG_INPUT_PCSPKR=m
+CONFIG_INPUT_MAX77650_ONKEY=m
 CONFIG_INPUT_MAX77693_HAPTIC=m
 # CONFIG_INPUT_MAX8925_ONKEY is not set
 # CONFIG_INPUT_MAX8997_HAPTIC is not set
@@ -3577,6 +3748,7 @@ CONFIG_INPUT_MMA8450=m
 CONFIG_INPUT_GP2A=m
 CONFIG_INPUT_GPIO_BEEPER=m
 CONFIG_INPUT_GPIO_DECODER=m
+CONFIG_INPUT_GPIO_VIBRA=m
 CONFIG_INPUT_CPCAP_PWRBUTTON=m
 CONFIG_INPUT_ATI_REMOTE2=m
 CONFIG_INPUT_KEYSPAN_REMOTE=m
@@ -3647,7 +3819,6 @@ CONFIG_SERIO_ALTERA_PS2=m
 CONFIG_SERIO_PS2MULT=m
 CONFIG_SERIO_ARC_PS2=m
 CONFIG_SERIO_APBPS2=m
-CONFIG_SERIO_OLPC_APSP=m
 CONFIG_SERIO_GPIO_PS2=m
 CONFIG_USERIO=m
 CONFIG_GAMEPORT=m
@@ -3655,6 +3826,8 @@ CONFIG_GAMEPORT_NS558=m
 CONFIG_GAMEPORT_L4=m
 CONFIG_GAMEPORT_EMU10K1=m
 CONFIG_GAMEPORT_FM801=m
+# end of Hardware I/O ports
+# end of Input device support
 
 #
 # Character devices
@@ -3684,6 +3857,7 @@ CONFIG_N_GSM=m
 CONFIG_TRACE_ROUTER=m
 CONFIG_TRACE_SINK=m
 # CONFIG_PPC_EPAPR_HV_BYTECHAN is not set
+CONFIG_NULL_TTY=m
 CONFIG_LDISC_AUTOLOAD=y
 CONFIG_DEVMEM=y
 # CONFIG_DEVKMEM is not set
@@ -3725,6 +3899,7 @@ CONFIG_SERIAL_PMACZILOG=m
 CONFIG_SERIAL_PMACZILOG_TTYS=y
 CONFIG_SERIAL_ICOM=m
 CONFIG_SERIAL_JSM=m
+CONFIG_SERIAL_SIFIVE=m
 CONFIG_SERIAL_SCCNXP=y
 CONFIG_SERIAL_SCCNXP_CONSOLE=y
 # CONFIG_SERIAL_SC16IS7XX is not set
@@ -3741,6 +3916,9 @@ CONFIG_SERIAL_RP2_NR_UARTS=32
 CONFIG_SERIAL_FSL_LPUART=m
 CONFIG_SERIAL_CONEXANT_DIGICOLOR=m
 # CONFIG_SERIAL_MEN_Z135 is not set
+# end of Serial drivers
+
+CONFIG_SERIAL_MCTRL_GPIO=m
 CONFIG_SERIAL_DEV_BUS=m
 CONFIG_TTY_PRINTK=m
 CONFIG_TTY_PRINTK_LEVEL=6
@@ -3767,6 +3945,7 @@ CONFIG_IPMI_SSIF=m
 CONFIG_IPMI_POWERNV=m
 CONFIG_IPMI_WATCHDOG=m
 CONFIG_IPMI_POWEROFF=m
+# CONFIG_IPMB_DEVICE_INTERFACE is not set
 CONFIG_HW_RANDOM=m
 CONFIG_HW_RANDOM_TIMERIOMEM=m
 CONFIG_HW_RANDOM_AMD=m
@@ -3785,6 +3964,8 @@ CONFIG_CARDMAN_4000=m
 CONFIG_CARDMAN_4040=m
 CONFIG_SCR24X=m
 CONFIG_IPWIRELESS=m
+# end of PCMCIA character devices
+
 CONFIG_RAW_DRIVER=m
 CONFIG_MAX_RAW_DEVS=256
 CONFIG_HANGCHECK_TIMER=m
@@ -3806,6 +3987,8 @@ CONFIG_DEVPORT=y
 CONFIG_XILLYBUS=m
 CONFIG_XILLYBUS_PCIE=m
 CONFIG_XILLYBUS_OF=m
+# end of Character devices
+
 # CONFIG_RANDOM_TRUST_CPU is not set
 
 #
@@ -3830,6 +4013,8 @@ CONFIG_I2C_MUX_PINCTRL=m
 CONFIG_I2C_MUX_REG=m
 CONFIG_I2C_DEMUX_PINCTRL=m
 CONFIG_I2C_MUX_MLXCPLD=m
+# end of Multiplexer I2C Chip support
+
 CONFIG_I2C_HELPER_AUTO=y
 CONFIG_I2C_SMBUS=m
 CONFIG_I2C_ALGOBIT=m
@@ -3898,12 +4083,16 @@ CONFIG_I2C_VIPERBOARD=m
 #
 CONFIG_I2C_OPAL=y
 CONFIG_I2C_FSI=m
+# end of I2C Hardware Bus support
+
 # CONFIG_I2C_STUB is not set
 CONFIG_I2C_SLAVE=y
 CONFIG_I2C_SLAVE_EEPROM=m
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
+# end of I2C support
+
 CONFIG_I3C=m
 CONFIG_CDNS_I3C_MASTER=m
 CONFIG_DW_I3C_MASTER=m
@@ -3984,6 +4173,8 @@ CONFIG_PTP_1588_CLOCK=y
 #
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
+# end of PTP clock support
+
 CONFIG_PINCTRL=y
 CONFIG_GENERIC_PINCTRL_GROUPS=y
 CONFIG_PINMUX=y
@@ -3997,6 +4188,7 @@ CONFIG_PINCTRL_AMD=y
 CONFIG_PINCTRL_MCP23S08=m
 CONFIG_PINCTRL_SINGLE=y
 CONFIG_PINCTRL_SX150X=y
+CONFIG_PINCTRL_STMFX=m
 CONFIG_PINCTRL_MAX77620=m
 CONFIG_PINCTRL_PALMAS=m
 CONFIG_PINCTRL_RK805=m
@@ -4028,11 +4220,11 @@ CONFIG_GPIO_GRGPIO=m
 CONFIG_GPIO_HLWD=m
 CONFIG_GPIO_MB86S7X=m
 CONFIG_GPIO_MENZ127=m
-CONFIG_GPIO_MOCKUP=m
 CONFIG_GPIO_SAMA5D2_PIOBU=m
 CONFIG_GPIO_SYSCON=m
 CONFIG_GPIO_XILINX=y
 CONFIG_GPIO_AMD_FCH=m
+# end of Memory mapped GPIO drivers
 
 #
 # I2C GPIO expanders
@@ -4045,6 +4237,7 @@ CONFIG_GPIO_MAX732X=m
 CONFIG_GPIO_PCA953X=m
 CONFIG_GPIO_PCF857X=m
 CONFIG_GPIO_TPIC2810=m
+# end of I2C GPIO expanders
 
 #
 # MFD GPIO expanders
@@ -4062,6 +4255,7 @@ CONFIG_GPIO_LP873X=m
 CONFIG_GPIO_LP87565=m
 CONFIG_GPIO_MADERA=m
 CONFIG_GPIO_MAX77620=m
+CONFIG_GPIO_MAX77650=m
 CONFIG_GPIO_PALMAS=y
 CONFIG_GPIO_RC5T583=y
 CONFIG_GPIO_STMPE=y
@@ -4078,6 +4272,7 @@ CONFIG_GPIO_UCB1400=m
 CONFIG_GPIO_WM831X=m
 CONFIG_GPIO_WM8350=m
 CONFIG_GPIO_WM8994=m
+# end of MFD GPIO expanders
 
 #
 # PCI GPIO expanders
@@ -4085,6 +4280,7 @@ CONFIG_GPIO_WM8994=m
 CONFIG_GPIO_PCI_IDIO_16=m
 CONFIG_GPIO_PCIE_IDIO_24=m
 CONFIG_GPIO_RDC321X=m
+# end of PCI GPIO expanders
 
 #
 # SPI GPIO expanders
@@ -4095,11 +4291,15 @@ CONFIG_GPIO_MAX7301=m
 CONFIG_GPIO_MC33880=m
 CONFIG_GPIO_PISOSR=m
 CONFIG_GPIO_XRA1403=m
+# end of SPI GPIO expanders
 
 #
 # USB GPIO expanders
 #
 CONFIG_GPIO_VIPERBOARD=m
+# end of USB GPIO expanders
+
+CONFIG_GPIO_MOCKUP=m
 CONFIG_W1=m
 CONFIG_W1_CON=y
 
@@ -4111,6 +4311,7 @@ CONFIG_W1_MASTER_DS2490=m
 CONFIG_W1_MASTER_DS2482=m
 CONFIG_W1_MASTER_DS1WM=m
 CONFIG_W1_MASTER_GPIO=m
+# end of 1-wire Bus Masters
 
 #
 # 1-wire Slaves
@@ -4132,6 +4333,8 @@ CONFIG_W1_SLAVE_DS2780=m
 CONFIG_W1_SLAVE_DS2781=m
 CONFIG_W1_SLAVE_DS28E04=m
 CONFIG_W1_SLAVE_DS28E17=m
+# end of 1-wire Slaves
+
 CONFIG_POWER_AVS=y
 CONFIG_POWER_RESET=y
 CONFIG_POWER_RESET_AS3722=y
@@ -4143,8 +4346,10 @@ CONFIG_POWER_RESET_SYSCON=y
 CONFIG_POWER_RESET_SYSCON_POWEROFF=y
 CONFIG_REBOOT_MODE=m
 CONFIG_SYSCON_REBOOT_MODE=m
+# CONFIG_NVMEM_REBOOT_MODE is not set
 CONFIG_POWER_SUPPLY=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
+CONFIG_POWER_SUPPLY_HWMON=y
 CONFIG_PDA_POWER=m
 CONFIG_GENERIC_ADC_BATTERY=m
 # CONFIG_MAX8925_POWER is not set
@@ -4186,9 +4391,10 @@ CONFIG_CHARGER_MAX8903=m
 CONFIG_CHARGER_LP8727=m
 CONFIG_CHARGER_GPIO=m
 CONFIG_CHARGER_MANAGER=y
-# CONFIG_CHARGER_LTC3651 is not set
+CONFIG_CHARGER_LT3651=m
 # CONFIG_CHARGER_MAX14577 is not set
 CONFIG_CHARGER_DETECTOR_MAX14656=m
+CONFIG_CHARGER_MAX77650=m
 # CONFIG_CHARGER_MAX77693 is not set
 # CONFIG_CHARGER_MAX8997 is not set
 # CONFIG_CHARGER_MAX8998 is not set
@@ -4202,6 +4408,7 @@ CONFIG_CHARGER_SMB347=m
 CONFIG_BATTERY_GAUGE_LTC2941=m
 CONFIG_BATTERY_RT5033=m
 CONFIG_CHARGER_RT9455=m
+CONFIG_CHARGER_UCS1002=m
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
@@ -4293,15 +4500,15 @@ CONFIG_SENSORS_NTC_THERMISTOR=m
 CONFIG_SENSORS_NCT7802=m
 CONFIG_SENSORS_NCT7904=m
 CONFIG_SENSORS_NPCM7XX=m
-CONFIG_SENSORS_OCC_P8_I2C=m
-CONFIG_SENSORS_OCC_P9_SBE=m
-CONFIG_SENSORS_OCC=y
 CONFIG_SENSORS_PCF8591=m
 CONFIG_PMBUS=m
 CONFIG_SENSORS_PMBUS=m
 CONFIG_SENSORS_ADM1275=m
 CONFIG_SENSORS_IBM_CFFPS=m
 # CONFIG_SENSORS_IR35221 is not set
+CONFIG_SENSORS_IR38064=m
+# CONFIG_SENSORS_IRPS5401 is not set
+CONFIG_SENSORS_ISL68137=m
 CONFIG_SENSORS_LM25066=m
 # CONFIG_SENSORS_LTC2978 is not set
 CONFIG_SENSORS_LTC3815=m
@@ -4310,6 +4517,7 @@ CONFIG_SENSORS_MAX20751=m
 CONFIG_SENSORS_MAX31785=m
 CONFIG_SENSORS_MAX34440=m
 CONFIG_SENSORS_MAX8688=m
+# CONFIG_SENSORS_PXE1610 is not set
 # CONFIG_SENSORS_TPS40422 is not set
 CONFIG_SENSORS_TPS53679=m
 CONFIG_SENSORS_UCD9000=m
@@ -4373,6 +4581,7 @@ CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
 CONFIG_CPU_THERMAL=y
 CONFIG_DEVFREQ_THERMAL=y
 CONFIG_THERMAL_EMULATION=y
+CONFIG_THERMAL_MMIO=m
 CONFIG_MAX77620_THERMAL=m
 CONFIG_QORIQ_THERMAL=m
 CONFIG_DA9062_THERMAL=m
@@ -4381,8 +4590,14 @@ CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_CORE=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
 CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
+CONFIG_WATCHDOG_OPEN_TIMEOUT=0
 CONFIG_WATCHDOG_SYSFS=y
 
+#
+# Watchdog Pretimeout Governors
+#
+# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
+
 #
 # Watchdog Device Drivers
 #
@@ -4422,11 +4637,6 @@ CONFIG_WDTPCI=m
 # USB-based Watchdog Cards
 #
 CONFIG_USBPCWATCHDOG=m
-
-#
-# Watchdog Pretimeout Governors
-#
-# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
 CONFIG_SSB_POSSIBLE=y
 CONFIG_SSB=m
 CONFIG_SSB_SPROM=y
@@ -4471,9 +4681,11 @@ CONFIG_MFD_AXP20X_I2C=m
 CONFIG_MFD_MADERA=m
 CONFIG_MFD_MADERA_I2C=m
 CONFIG_MFD_MADERA_SPI=m
+# CONFIG_MFD_CS47L15 is not set
 CONFIG_MFD_CS47L35=y
 CONFIG_MFD_CS47L85=y
 CONFIG_MFD_CS47L90=y
+# CONFIG_MFD_CS47L92 is not set
 CONFIG_PMIC_DA903X=y
 CONFIG_PMIC_DA9052=y
 CONFIG_MFD_DA9052_SPI=y
@@ -4498,6 +4710,7 @@ CONFIG_MFD_88PM805=m
 CONFIG_MFD_88PM860X=y
 CONFIG_MFD_MAX14577=m
 CONFIG_MFD_MAX77620=y
+CONFIG_MFD_MAX77650=m
 CONFIG_MFD_MAX77686=y
 CONFIG_MFD_MAX77693=m
 CONFIG_MFD_MAX77843=y
@@ -4536,6 +4749,8 @@ CONFIG_MFD_STMPE=y
 #
 CONFIG_STMPE_I2C=y
 CONFIG_STMPE_SPI=y
+# end of STMicroelectronics STMPE Interface Drivers
+
 CONFIG_MFD_SYSCON=y
 CONFIG_MFD_TI_AM335X_TSCADC=m
 CONFIG_MFD_LP3943=m
@@ -4582,8 +4797,12 @@ CONFIG_MFD_WM8350=y
 CONFIG_MFD_WM8350_I2C=y
 CONFIG_MFD_WM8994=m
 # CONFIG_MFD_ROHM_BD718XX is not set
+# CONFIG_MFD_ROHM_BD70528 is not set
 CONFIG_MFD_STPMIC1=m
+CONFIG_MFD_STMFX=m
 # CONFIG_RAVE_SP_CORE is not set
+# end of Multifunction device drivers
+
 CONFIG_REGULATOR=y
 # CONFIG_REGULATOR_DEBUG is not set
 CONFIG_REGULATOR_FIXED_VOLTAGE=m
@@ -4632,6 +4851,7 @@ CONFIG_REGULATOR_LTC3676=m
 CONFIG_REGULATOR_MAX14577=m
 CONFIG_REGULATOR_MAX1586=m
 CONFIG_REGULATOR_MAX77620=m
+CONFIG_REGULATOR_MAX77650=m
 CONFIG_REGULATOR_MAX8649=m
 CONFIG_REGULATOR_MAX8660=m
 CONFIG_REGULATOR_MAX8907=m
@@ -4664,6 +4884,7 @@ CONFIG_REGULATOR_RK808=m
 CONFIG_REGULATOR_RN5T618=m
 CONFIG_REGULATOR_RT5033=m
 CONFIG_REGULATOR_SKY81452=m
+# CONFIG_REGULATOR_SLG51000 is not set
 CONFIG_REGULATOR_STPMIC1=m
 CONFIG_REGULATOR_SY8106A=m
 CONFIG_REGULATOR_TPS51632=m
@@ -4870,6 +5091,7 @@ CONFIG_DVB_USB_DIBUSB_MC=m
 CONFIG_DVB_USB_DIB0700=m
 CONFIG_DVB_USB_UMT_010=m
 CONFIG_DVB_USB_CXUSB=m
+# CONFIG_DVB_USB_CXUSB_ANALOG is not set
 CONFIG_DVB_USB_M920X=m
 CONFIG_DVB_USB_DIGITV=m
 CONFIG_DVB_USB_VP7045=m
@@ -4968,7 +5190,6 @@ CONFIG_VIDEO_SAA7134_RC=y
 CONFIG_VIDEO_SAA7134_DVB=m
 CONFIG_VIDEO_SAA7134_GO7007=m
 CONFIG_VIDEO_SAA7164=m
-# CONFIG_VIDEO_COBALT is not set
 
 #
 # Media digital TV PCI Adapters
@@ -4996,7 +5217,6 @@ CONFIG_DVB_DDBRIDGE=m
 CONFIG_DVB_SMIPCIE=m
 CONFIG_DVB_NETUP_UNIDVB=m
 CONFIG_V4L_PLATFORM_DRIVERS=y
-CONFIG_VIDEO_CAFE_CCIC=m
 # CONFIG_VIDEO_CADENCE is not set
 CONFIG_VIDEO_ASPEED=m
 CONFIG_VIDEO_MUX=m
@@ -5041,6 +5261,7 @@ CONFIG_RADIO_WL1273=m
 # Texas Instruments WL128x FM driver (ST based)
 #
 CONFIG_RADIO_WL128X=m
+# end of Texas Instruments WL128x FM driver (ST based)
 
 #
 # Supported FireWire (IEEE 1394) Adapters
@@ -5075,18 +5296,24 @@ CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
 CONFIG_MEDIA_ATTACH=y
 CONFIG_VIDEO_IR_I2C=m
 
+#
+# I2C Encoders, decoders, sensors and other helper chips
+#
+
 #
 # Audio decoders, processors and mixers
 #
 CONFIG_VIDEO_TVAUDIO=m
 CONFIG_VIDEO_TDA7432=m
 CONFIG_VIDEO_TDA9840=m
+# CONFIG_VIDEO_TDA1997X is not set
 CONFIG_VIDEO_TEA6415C=m
 CONFIG_VIDEO_TEA6420=m
 CONFIG_VIDEO_MSP3400=m
 CONFIG_VIDEO_CS3308=m
 CONFIG_VIDEO_CS5345=m
 CONFIG_VIDEO_CS53L32A=m
+# CONFIG_VIDEO_TLV320AIC23B is not set
 CONFIG_VIDEO_UDA1342=m
 CONFIG_VIDEO_WM8775=m
 CONFIG_VIDEO_WM8739=m
@@ -5101,11 +5328,27 @@ CONFIG_VIDEO_SAA6588=m
 #
 # Video decoders
 #
+# CONFIG_VIDEO_ADV7180 is not set
+# CONFIG_VIDEO_ADV7183 is not set
+# CONFIG_VIDEO_ADV748X is not set
+# CONFIG_VIDEO_ADV7604 is not set
+# CONFIG_VIDEO_ADV7842 is not set
+# CONFIG_VIDEO_BT819 is not set
+# CONFIG_VIDEO_BT856 is not set
+# CONFIG_VIDEO_BT866 is not set
+# CONFIG_VIDEO_KS0127 is not set
+# CONFIG_VIDEO_ML86V7667 is not set
+# CONFIG_VIDEO_SAA7110 is not set
 CONFIG_VIDEO_SAA711X=m
+# CONFIG_VIDEO_TC358743 is not set
+# CONFIG_VIDEO_TVP514X is not set
 CONFIG_VIDEO_TVP5150=m
+# CONFIG_VIDEO_TVP7002 is not set
 CONFIG_VIDEO_TW2804=m
 CONFIG_VIDEO_TW9903=m
 CONFIG_VIDEO_TW9906=m
+# CONFIG_VIDEO_TW9910 is not set
+# CONFIG_VIDEO_VPX3220 is not set
 
 #
 # Video and audio decoders
@@ -5117,18 +5360,77 @@ CONFIG_VIDEO_CX25840=m
 # Video encoders
 #
 CONFIG_VIDEO_SAA7127=m
+# CONFIG_VIDEO_SAA7185 is not set
+# CONFIG_VIDEO_ADV7170 is not set
+# CONFIG_VIDEO_ADV7175 is not set
+# CONFIG_VIDEO_ADV7343 is not set
+# CONFIG_VIDEO_ADV7393 is not set
+# CONFIG_VIDEO_AD9389B is not set
+# CONFIG_VIDEO_AK881X is not set
+# CONFIG_VIDEO_THS8200 is not set
 
 #
 # Camera sensor devices
 #
+# CONFIG_VIDEO_IMX214 is not set
+# CONFIG_VIDEO_IMX258 is not set
+# CONFIG_VIDEO_IMX274 is not set
+# CONFIG_VIDEO_IMX319 is not set
+# CONFIG_VIDEO_IMX355 is not set
 CONFIG_VIDEO_OV2640=m
+# CONFIG_VIDEO_OV2659 is not set
+# CONFIG_VIDEO_OV2680 is not set
+# CONFIG_VIDEO_OV2685 is not set
+# CONFIG_VIDEO_OV5640 is not set
+# CONFIG_VIDEO_OV5645 is not set
+# CONFIG_VIDEO_OV5647 is not set
+# CONFIG_VIDEO_OV6650 is not set
+# CONFIG_VIDEO_OV5670 is not set
+# CONFIG_VIDEO_OV5695 is not set
+# CONFIG_VIDEO_OV7251 is not set
+# CONFIG_VIDEO_OV772X is not set
 CONFIG_VIDEO_OV7640=m
 CONFIG_VIDEO_OV7670=m
+# CONFIG_VIDEO_OV7740 is not set
+# CONFIG_VIDEO_OV8856 is not set
+# CONFIG_VIDEO_OV9640 is not set
+# CONFIG_VIDEO_OV9650 is not set
+# CONFIG_VIDEO_OV13858 is not set
+# CONFIG_VIDEO_VS6624 is not set
+# CONFIG_VIDEO_MT9M001 is not set
+# CONFIG_VIDEO_MT9M032 is not set
+# CONFIG_VIDEO_MT9M111 is not set
+# CONFIG_VIDEO_MT9P031 is not set
+# CONFIG_VIDEO_MT9T001 is not set
+# CONFIG_VIDEO_MT9T112 is not set
 CONFIG_VIDEO_MT9V011=m
+# CONFIG_VIDEO_MT9V032 is not set
+# CONFIG_VIDEO_MT9V111 is not set
+# CONFIG_VIDEO_SR030PC30 is not set
+# CONFIG_VIDEO_NOON010PC30 is not set
+# CONFIG_VIDEO_M5MOLS is not set
+# CONFIG_VIDEO_RJ54N1 is not set
+# CONFIG_VIDEO_S5K6AA is not set
+# CONFIG_VIDEO_S5K6A3 is not set
+# CONFIG_VIDEO_S5K4ECGX is not set
+# CONFIG_VIDEO_S5K5BAF is not set
+# CONFIG_VIDEO_ET8EK8 is not set
+# CONFIG_VIDEO_S5C73M3 is not set
+
+#
+# Lens drivers
+#
+# CONFIG_VIDEO_AD5820 is not set
+# CONFIG_VIDEO_AK7375 is not set
+# CONFIG_VIDEO_DW9714 is not set
+# CONFIG_VIDEO_DW9807_VCM is not set
 
 #
 # Flash devices
 #
+# CONFIG_VIDEO_ADP1653 is not set
+# CONFIG_VIDEO_LM3560 is not set
+# CONFIG_VIDEO_LM3646 is not set
 
 #
 # Video improvement chips
@@ -5148,13 +5450,29 @@ CONFIG_VIDEO_SAA6752HS=m
 #
 # Miscellaneous helper chips
 #
+# CONFIG_VIDEO_THS7303 is not set
 CONFIG_VIDEO_M52790=m
+# CONFIG_VIDEO_I2C is not set
+# CONFIG_VIDEO_ST_MIPID02 is not set
+# end of I2C Encoders, decoders, sensors and other helper chips
+
+#
+# SPI helper chips
+#
+# CONFIG_VIDEO_GS1662 is not set
+# end of SPI helper chips
 
 #
 # Media SPI Adapters
 #
 # CONFIG_CXD2880_SPI_DRV is not set
+# end of Media SPI Adapters
+
 CONFIG_MEDIA_TUNER=m
+
+#
+# Customize TV tuners
+#
 CONFIG_MEDIA_TUNER_SIMPLE=m
 CONFIG_MEDIA_TUNER_TDA18250=m
 CONFIG_MEDIA_TUNER_TDA8290=m
@@ -5163,6 +5481,7 @@ CONFIG_MEDIA_TUNER_TDA18271=m
 CONFIG_MEDIA_TUNER_TDA9887=m
 CONFIG_MEDIA_TUNER_TEA5761=m
 CONFIG_MEDIA_TUNER_TEA5767=m
+# CONFIG_MEDIA_TUNER_MSI001 is not set
 CONFIG_MEDIA_TUNER_MT20XX=m
 CONFIG_MEDIA_TUNER_MT2060=m
 CONFIG_MEDIA_TUNER_MT2063=m
@@ -5191,6 +5510,11 @@ CONFIG_MEDIA_TUNER_R820T=m
 CONFIG_MEDIA_TUNER_MXL301RF=m
 CONFIG_MEDIA_TUNER_QM1D1C0042=m
 CONFIG_MEDIA_TUNER_QM1D1B0004=m
+# end of Customize TV tuners
+
+#
+# Customise DVB Frontends
+#
 
 #
 # Multistandard (satellite) frontends
@@ -5251,6 +5575,7 @@ CONFIG_DVB_SP8870=m
 CONFIG_DVB_SP887X=m
 CONFIG_DVB_CX22700=m
 CONFIG_DVB_CX22702=m
+# CONFIG_DVB_S5H1432 is not set
 CONFIG_DVB_DRXD=m
 CONFIG_DVB_L64781=m
 CONFIG_DVB_TDA1004X=m
@@ -5261,6 +5586,7 @@ CONFIG_DVB_DIB3000MB=m
 CONFIG_DVB_DIB3000MC=m
 CONFIG_DVB_DIB7000M=m
 CONFIG_DVB_DIB7000P=m
+# CONFIG_DVB_DIB9000 is not set
 CONFIG_DVB_TDA10048=m
 CONFIG_DVB_AF9013=m
 CONFIG_DVB_EC100=m
@@ -5273,6 +5599,7 @@ CONFIG_DVB_SI2168=m
 CONFIG_DVB_AS102_FE=m
 CONFIG_DVB_ZD1301_DEMOD=m
 CONFIG_DVB_GP8PSK_FE=m
+# CONFIG_DVB_CXD2880 is not set
 
 #
 # DVB-C (cable) frontends
@@ -5310,6 +5637,7 @@ CONFIG_DVB_MB86A20S=m
 # ISDB-S (satellite) & ISDB-T (terrestrial) frontends
 #
 CONFIG_DVB_TC90522=m
+# CONFIG_DVB_MN88443X is not set
 
 #
 # Digital terrestrial only tuners/PLL
@@ -5323,12 +5651,14 @@ CONFIG_DVB_TUNER_DIB0090=m
 #
 CONFIG_DVB_DRX39XYJ=m
 CONFIG_DVB_LNBH25=m
+# CONFIG_DVB_LNBH29 is not set
 CONFIG_DVB_LNBP21=m
 CONFIG_DVB_LNBP22=m
 CONFIG_DVB_ISL6405=m
 CONFIG_DVB_ISL6421=m
 CONFIG_DVB_ISL6423=m
 CONFIG_DVB_A8293=m
+# CONFIG_DVB_LGS8GL5 is not set
 CONFIG_DVB_LGS8GXX=m
 CONFIG_DVB_ATBM8830=m
 CONFIG_DVB_TDA665x=m
@@ -5349,6 +5679,7 @@ CONFIG_DVB_SP2=m
 # Tools to develop new frontends
 #
 CONFIG_DVB_DUMMY_FE=m
+# end of Customise DVB Frontends
 
 #
 # Graphics support
@@ -5369,8 +5700,10 @@ CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 CONFIG_DRM_DP_CEC=y
 CONFIG_DRM_TTM=m
+CONFIG_DRM_VRAM_HELPER=m
 CONFIG_DRM_GEM_CMA_HELPER=y
 CONFIG_DRM_KMS_CMA_HELPER=y
+CONFIG_DRM_GEM_SHMEM_HELPER=y
 CONFIG_DRM_VM=y
 CONFIG_DRM_SCHED=m
 
@@ -5381,10 +5714,13 @@ CONFIG_DRM_I2C_CH7006=m
 CONFIG_DRM_I2C_SIL164=m
 CONFIG_DRM_I2C_NXP_TDA998X=m
 # CONFIG_DRM_I2C_NXP_TDA9950 is not set
+# end of I2C encoder or helper chips
 
 #
 # ARM devices
 #
+# end of ARM devices
+
 CONFIG_DRM_RADEON=m
 CONFIG_DRM_RADEON_USERPTR=y
 CONFIG_DRM_AMDGPU=m
@@ -5397,19 +5733,15 @@ CONFIG_DRM_AMDGPU_USERPTR=y
 # ACP (Audio CoProcessor) Configuration
 #
 CONFIG_DRM_AMD_ACP=y
+# end of ACP (Audio CoProcessor) Configuration
 
 #
 # Display Engine Configuration
 #
 CONFIG_DRM_AMD_DC=y
 # CONFIG_DEBUG_KERNEL_DC is not set
+# end of Display Engine Configuration
 
-#
-# AMD Library routines
-#
-CONFIG_CHASH=m
-# CONFIG_CHASH_STATS is not set
-# CONFIG_CHASH_SELFTEST is not set
 CONFIG_DRM_NOUVEAU=m
 CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT=y
 CONFIG_NOUVEAU_DEBUG=5
@@ -5419,6 +5751,7 @@ CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 # CONFIG_DRM_NOUVEAU_SVM is not set
 CONFIG_DRM_VGEM=m
 CONFIG_DRM_VKMS=m
+CONFIG_DRM_ATI_PCIGART=y
 CONFIG_DRM_UDL=m
 CONFIG_DRM_AST=m
 CONFIG_DRM_MGAG200=m
@@ -5436,6 +5769,7 @@ CONFIG_DRM_PANEL=y
 CONFIG_DRM_PANEL_ARM_VERSATILE=m
 CONFIG_DRM_PANEL_LVDS=m
 CONFIG_DRM_PANEL_SIMPLE=m
+CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D=m
 CONFIG_DRM_PANEL_ILITEK_IL9322=m
 # CONFIG_DRM_PANEL_ILITEK_ILI9881C is not set
 CONFIG_DRM_PANEL_INNOLUX_P079ZCA=m
@@ -5445,12 +5779,16 @@ CONFIG_DRM_PANEL_SAMSUNG_LD9040=m
 CONFIG_DRM_PANEL_LG_LG4573=m
 CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO=m
 CONFIG_DRM_PANEL_ORISETECH_OTM8009A=m
+# CONFIG_DRM_PANEL_OSD_OSD101T2587_53TS is not set
 CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00=m
 CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m
 CONFIG_DRM_PANEL_RAYDIUM_RM68200=m
+CONFIG_DRM_PANEL_ROCKTECH_JH057N00900=m
+CONFIG_DRM_PANEL_RONBO_RB070D30=m
 CONFIG_DRM_PANEL_SAMSUNG_S6D16D0=m
 CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2=m
 CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03=m
+# CONFIG_DRM_PANEL_SAMSUNG_S6E63M0 is not set
 CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m
 CONFIG_DRM_PANEL_SEIKO_43WVF1G=m
 CONFIG_DRM_PANEL_SHARP_LQ101R1SX01=m
@@ -5459,6 +5797,8 @@ CONFIG_DRM_PANEL_SITRONIX_ST7701=m
 CONFIG_DRM_PANEL_SITRONIX_ST7789V=m
 CONFIG_DRM_PANEL_TPO_TPG110=m
 CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA=m
+# end of Display Panels
+
 CONFIG_DRM_BRIDGE=y
 CONFIG_DRM_PANEL_BRIDGE=y
 
@@ -5488,6 +5828,8 @@ CONFIG_DRM_DW_HDMI=m
 CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
 CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
 CONFIG_DRM_DW_HDMI_CEC=m
+# end of Display Interface Bridges
+
 CONFIG_DRM_ETNAVIV=m
 CONFIG_DRM_ETNAVIV_THERMAL=y
 CONFIG_DRM_ARCPGU=m
@@ -5501,7 +5843,13 @@ CONFIG_TINYDRM_MI0283QT=m
 CONFIG_TINYDRM_REPAPER=m
 CONFIG_TINYDRM_ST7586=m
 # CONFIG_TINYDRM_ST7735R is not set
-# CONFIG_DRM_LEGACY is not set
+CONFIG_DRM_LEGACY=y
+CONFIG_DRM_TDFX=m
+CONFIG_DRM_R128=m
+CONFIG_DRM_MGA=m
+CONFIG_DRM_SIS=m
+CONFIG_DRM_VIA=m
+CONFIG_DRM_SAVAGE=m
 CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=m
 
 #
@@ -5600,7 +5948,11 @@ CONFIG_FB_MB862XX_I2C=y
 CONFIG_FB_SIMPLE=y
 CONFIG_FB_SSD1307=m
 CONFIG_FB_SM712=m
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
+# end of Frame buffer Devices
+
+#
+# Backlight & LCD device support
+#
 CONFIG_LCD_CLASS_DEVICE=m
 CONFIG_LCD_L4F00242T03=m
 CONFIG_LCD_LMS283GF05=m
@@ -5640,6 +5992,8 @@ CONFIG_BACKLIGHT_GPIO=m
 CONFIG_BACKLIGHT_LV5207LP=m
 CONFIG_BACKLIGHT_BD6107=m
 # CONFIG_BACKLIGHT_ARCXCNN is not set
+# end of Backlight & LCD device support
+
 CONFIG_VGASTATE=m
 CONFIG_VIDEOMODE_HELPERS=y
 CONFIG_HDMI=y
@@ -5658,7 +6012,11 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y
+# end of Console display driver support
+
 # CONFIG_LOGO is not set
+# end of Graphics support
+
 CONFIG_SOUND=m
 CONFIG_SOUND_OSS_CORE=y
 CONFIG_SOUND_OSS_CORE_PRECLAIM=y
@@ -5794,8 +6152,11 @@ CONFIG_SND_HDA_CODEC_CMEDIA=m
 CONFIG_SND_HDA_CODEC_SI3054=m
 CONFIG_SND_HDA_GENERIC=m
 CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1
+# end of HD-Audio
+
 CONFIG_SND_HDA_CORE=m
 CONFIG_SND_HDA_DSP_LOADER=y
+CONFIG_SND_HDA_COMPONENT=y
 CONFIG_SND_HDA_PREALLOC_SIZE=64
 CONFIG_SND_PPC=y
 CONFIG_SND_POWERMAC=m
@@ -5812,6 +6173,7 @@ CONFIG_SND_AOA_SOUNDBUS_I2S=m
 CONFIG_SND_SPI=y
 CONFIG_SND_USB=y
 CONFIG_SND_USB_AUDIO=m
+CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER=y
 CONFIG_SND_USB_UA101=m
 CONFIG_SND_USB_USX2Y=m
 CONFIG_SND_USB_CAIAQ=m
@@ -5841,6 +6203,7 @@ CONFIG_SND_PDAUDIOCF=m
 CONFIG_SND_SOC=m
 CONFIG_SND_SOC_AC97_BUS=y
 CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
+CONFIG_SND_SOC_TOPOLOGY=y
 CONFIG_SND_SOC_AMD_ACP=m
 CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m
 CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m
@@ -5856,11 +6219,14 @@ CONFIG_SND_SOC_MIKROE_PROTO=m
 #
 CONFIG_SND_SOC_FSL_ASRC=m
 CONFIG_SND_SOC_FSL_SAI=m
+CONFIG_SND_SOC_FSL_AUDMIX=m
 CONFIG_SND_SOC_FSL_SSI=m
 CONFIG_SND_SOC_FSL_SPDIF=m
 CONFIG_SND_SOC_FSL_ESAI=m
 CONFIG_SND_SOC_FSL_MICFIL=m
 CONFIG_SND_SOC_IMX_AUDMUX=m
+# end of SoC Audio for Freescale CPUs
+
 CONFIG_SND_I2S_HI6210_I2S=m
 CONFIG_SND_SOC_IMG=y
 CONFIG_SND_SOC_IMG_I2S_IN=m
@@ -5870,10 +6236,20 @@ CONFIG_SND_SOC_IMG_SPDIF_IN=m
 CONFIG_SND_SOC_IMG_SPDIF_OUT=m
 CONFIG_SND_SOC_IMG_PISTACHIO_INTERNAL_DAC=m
 CONFIG_SND_SOC_MTK_BTCVSD=m
+CONFIG_SND_SOC_SOF_TOPLEVEL=y
+CONFIG_SND_SOC_SOF_PCI=m
+CONFIG_SND_SOC_SOF_OPTIONS=m
+CONFIG_SND_SOC_SOF_NOCODEC=m
+CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT=y
+CONFIG_SND_SOC_SOF_STRICT_ABI_CHECKS=y
+# CONFIG_SND_SOC_SOF_DEBUG is not set
+CONFIG_SND_SOC_SOF=m
 
 #
 # STMicroelectronics STM32 SOC audio support
 #
+# end of STMicroelectronics STM32 SOC audio support
+
 CONFIG_SND_SOC_XILINX_I2S=m
 CONFIG_SND_SOC_XILINX_AUDIO_FORMATTER=m
 CONFIG_SND_SOC_XILINX_SPDIF=m
@@ -5925,6 +6301,7 @@ CONFIG_SND_SOC_CS43130=m
 CONFIG_SND_SOC_CS4341=m
 CONFIG_SND_SOC_CS4349=m
 CONFIG_SND_SOC_CS53L30=m
+# CONFIG_SND_SOC_CX2072X is not set
 CONFIG_SND_SOC_DA7219=m
 CONFIG_SND_SOC_DMIC=m
 CONFIG_SND_SOC_HDMI_CODEC=m
@@ -5995,9 +6372,6 @@ CONFIG_SND_SOC_TLV320AIC23=m
 CONFIG_SND_SOC_TLV320AIC23_I2C=m
 CONFIG_SND_SOC_TLV320AIC23_SPI=m
 CONFIG_SND_SOC_TLV320AIC31XX=m
-CONFIG_SND_SOC_TLV320AIC32X4=m
-CONFIG_SND_SOC_TLV320AIC32X4_I2C=m
-CONFIG_SND_SOC_TLV320AIC32X4_SPI=m
 CONFIG_SND_SOC_TLV320AIC3X=m
 CONFIG_SND_SOC_TS3A227E=m
 CONFIG_SND_SOC_TSCS42XX=m
@@ -6035,6 +6409,8 @@ CONFIG_SND_SOC_NAU8810=m
 CONFIG_SND_SOC_NAU8822=m
 CONFIG_SND_SOC_NAU8824=m
 CONFIG_SND_SOC_TPA6130A2=m
+# end of CODEC drivers
+
 CONFIG_SND_SIMPLE_CARD_UTILS=m
 CONFIG_SND_SIMPLE_CARD=m
 CONFIG_SND_AUDIO_GRAPH_CARD=m
@@ -6067,6 +6443,7 @@ CONFIG_HID_CHERRY=m
 CONFIG_HID_CHICONY=m
 CONFIG_HID_CORSAIR=m
 CONFIG_HID_COUGAR=m
+CONFIG_HID_MACALLY=m
 CONFIG_HID_PRODIKEYS=m
 CONFIG_HID_CMEDIA=m
 CONFIG_HID_CP2112=m
@@ -6147,6 +6524,7 @@ CONFIG_HID_THINGM=m
 CONFIG_HID_THRUSTMASTER=m
 CONFIG_THRUSTMASTER_FF=y
 CONFIG_HID_UDRAW_PS3=m
+CONFIG_HID_U2FZERO=m
 CONFIG_HID_WACOM=m
 CONFIG_HID_WIIMOTE=m
 CONFIG_HID_XINMO=m
@@ -6156,6 +6534,7 @@ CONFIG_HID_ZYDACRON=m
 CONFIG_HID_SENSOR_HUB=m
 CONFIG_HID_SENSOR_CUSTOM_SENSOR=m
 CONFIG_HID_ALPS=m
+# end of Special HID drivers
 
 #
 # USB HID support
@@ -6169,11 +6548,16 @@ CONFIG_USB_HIDDEV=y
 #
 CONFIG_USB_KBD=m
 CONFIG_USB_MOUSE=m
+# end of USB HID Boot Protocol drivers
+# end of USB HID support
 
 #
 # I2C HID support
 #
 CONFIG_I2C_HID=m
+# end of I2C HID support
+# end of HID support
+
 CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y
 CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
@@ -6425,6 +6809,8 @@ CONFIG_USB_GPIO_VBUS=m
 CONFIG_TAHVO_USB=m
 # CONFIG_TAHVO_USB_HOST_BY_DEFAULT is not set
 CONFIG_USB_ISP1301=m
+# end of USB Physical Layer drivers
+
 CONFIG_USB_GADGET=m
 # CONFIG_USB_GADGET_DEBUG is not set
 # CONFIG_USB_GADGET_DEBUG_FILES is not set
@@ -6459,6 +6845,8 @@ CONFIG_USB_GOKU=m
 CONFIG_USB_EG20T=m
 CONFIG_USB_GADGET_XILINX=m
 CONFIG_USB_DUMMY_HCD=m
+# end of USB Peripheral Controller
+
 CONFIG_USB_LIBCOMPOSITE=m
 CONFIG_USB_F_ACM=m
 CONFIG_USB_U_SERIAL=m
@@ -6538,11 +6926,15 @@ CONFIG_TYPEC_TPS6598X=m
 # USB Type-C Multiplexer/DeMultiplexer Switch support
 #
 # CONFIG_TYPEC_MUX_PI3USB30532 is not set
+# end of USB Type-C Multiplexer/DeMultiplexer Switch support
 
 #
 # USB Type-C Alternate Mode drivers
 #
 CONFIG_TYPEC_DP_ALTMODE=m
+CONFIG_TYPEC_NVIDIA_ALTMODE=m
+# end of USB Type-C Alternate Mode drivers
+
 CONFIG_USB_ROLE_SWITCH=m
 CONFIG_USB_LED_TRIG=y
 CONFIG_USB_ULPI_BUS=m
@@ -6627,6 +7019,7 @@ CONFIG_LEDS_BCM6358=m
 CONFIG_LEDS_CPCAP=m
 CONFIG_LEDS_CR0014114=m
 CONFIG_LEDS_LM3530=m
+CONFIG_LEDS_LM3532=m
 CONFIG_LEDS_LM3533=m
 CONFIG_LEDS_LM3642=m
 CONFIG_LEDS_LM3692X=m
@@ -6660,6 +7053,7 @@ CONFIG_LEDS_LT3593=m
 CONFIG_LEDS_MC13783=m
 CONFIG_LEDS_TCA6507=m
 CONFIG_LEDS_TLC591XX=m
+CONFIG_LEDS_MAX77650=m
 # CONFIG_LEDS_MAX77693 is not set
 # CONFIG_LEDS_MAX8997 is not set
 CONFIG_LEDS_LM355x=m
@@ -6676,6 +7070,8 @@ CONFIG_LEDS_POWERNV=m
 CONFIG_LEDS_SYSCON=y
 CONFIG_LEDS_MLXREG=m
 CONFIG_LEDS_USER=m
+# CONFIG_LEDS_SPI_BYTE is not set
+# CONFIG_LEDS_TI_LMU_COMMON is not set
 
 #
 # LED Triggers
@@ -6717,12 +7113,11 @@ CONFIG_INFINIBAND_CXGB4=m
 CONFIG_INFINIBAND_I40IW=m
 CONFIG_MLX4_INFINIBAND=m
 CONFIG_MLX5_INFINIBAND=m
-CONFIG_INFINIBAND_NES=m
-# CONFIG_INFINIBAND_NES_DEBUG is not set
 CONFIG_INFINIBAND_OCRDMA=m
 CONFIG_INFINIBAND_BNXT_RE=m
 CONFIG_INFINIBAND_QEDR=m
 CONFIG_RDMA_RXE=m
+# CONFIG_RDMA_SIW is not set
 CONFIG_INFINIBAND_IPOIB=m
 CONFIG_INFINIBAND_IPOIB_CM=y
 CONFIG_INFINIBAND_IPOIB_DEBUG=y
@@ -6795,6 +7190,7 @@ CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_M41T80=m
 CONFIG_RTC_DRV_M41T80_WDT=y
+# CONFIG_RTC_DRV_BD70528 is not set
 CONFIG_RTC_DRV_BQ32K=m
 CONFIG_RTC_DRV_TWL4030=m
 CONFIG_RTC_DRV_PALMAS=m
@@ -6910,6 +7306,8 @@ CONFIG_QCOM_HIDMA=m
 CONFIG_DW_DMAC_CORE=m
 CONFIG_DW_DMAC=m
 CONFIG_DW_DMAC_PCI=m
+# CONFIG_DW_EDMA is not set
+# CONFIG_DW_EDMA_PCIE is not set
 
 #
 # DMA Clients
@@ -6924,6 +7322,8 @@ CONFIG_DMA_ENGINE_RAID=y
 CONFIG_SYNC_FILE=y
 # CONFIG_SW_SYNC is not set
 CONFIG_UDMABUF=y
+# end of DMABUF options
+
 CONFIG_AUXDISPLAY=y
 CONFIG_HD44780=m
 CONFIG_KS0108=m
@@ -6969,6 +7369,7 @@ CONFIG_VIRTIO=m
 CONFIG_VIRTIO_MENU=y
 CONFIG_VIRTIO_PCI=m
 CONFIG_VIRTIO_PCI_LEGACY=y
+# CONFIG_VIRTIO_PMEM is not set
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_INPUT=m
 CONFIG_VIRTIO_MMIO=m
@@ -6977,6 +7378,8 @@ CONFIG_VIRTIO_MMIO=m
 #
 # Microsoft Hyper-V guest support
 #
+# end of Microsoft Hyper-V guest support
+
 CONFIG_STAGING=y
 CONFIG_PRISM2_USB=m
 CONFIG_COMEDI=m
@@ -7080,8 +7483,6 @@ CONFIG_RTL8723BS=m
 CONFIG_R8712U=m
 CONFIG_R8188EU=m
 CONFIG_88EU_AP_MODE=y
-CONFIG_R8822BE=m
-CONFIG_RTLWIFI_DEBUG_ST=y
 CONFIG_RTS5208=m
 CONFIG_VT6655=m
 CONFIG_VT6656=m
@@ -7095,14 +7496,15 @@ CONFIG_VT6656=m
 #
 CONFIG_ADIS16203=m
 CONFIG_ADIS16240=m
+# end of Accelerometers
 
 #
 # Analog to digital converters
 #
-CONFIG_AD7780=m
 CONFIG_AD7816=m
 CONFIG_AD7192=m
 CONFIG_AD7280=m
+# end of Analog to digital converters
 
 #
 # Analog digital bi-direction converters
@@ -7110,23 +7512,27 @@ CONFIG_AD7280=m
 CONFIG_ADT7316=m
 CONFIG_ADT7316_SPI=m
 CONFIG_ADT7316_I2C=m
+# end of Analog digital bi-direction converters
 
 #
 # Capacitance to digital converters
 #
 CONFIG_AD7150=m
 CONFIG_AD7746=m
+# end of Capacitance to digital converters
 
 #
 # Direct Digital Synthesis
 #
 CONFIG_AD9832=m
 CONFIG_AD9834=m
+# end of Direct Digital Synthesis
 
 #
 # Network Analyzer, Impedance Converters
 #
 CONFIG_AD5933=m
+# end of Network Analyzer, Impedance Converters
 
 #
 # Active energy metering IC
@@ -7134,11 +7540,15 @@ CONFIG_AD5933=m
 CONFIG_ADE7854=m
 CONFIG_ADE7854_I2C=m
 CONFIG_ADE7854_SPI=m
+# end of Active energy metering IC
 
 #
 # Resolver to digital converters
 #
 CONFIG_AD2S1210=m
+# end of Resolver to digital converters
+# end of IIO staging drivers
+
 CONFIG_FB_SM750=m
 
 #
@@ -7156,6 +7566,8 @@ CONFIG_SPEAKUP_SYNTH_SOFT=m
 CONFIG_SPEAKUP_SYNTH_SPKOUT=m
 CONFIG_SPEAKUP_SYNTH_TXPRT=m
 CONFIG_SPEAKUP_SYNTH_DUMMY=m
+# end of Speakup console speech
+
 CONFIG_STAGING_MEDIA=y
 CONFIG_I2C_BCM2048=m
 
@@ -7166,6 +7578,8 @@ CONFIG_I2C_BCM2048=m
 #
 # Android
 #
+# end of Android
+
 CONFIG_LTE_GDM724X=m
 CONFIG_FIREWIRE_SERIAL=m
 CONFIG_FWTTY_MAX_TOTAL_PORTS=64
@@ -7244,6 +7658,8 @@ CONFIG_PI433=m
 #
 # Gasket devices
 #
+# end of Gasket devices
+
 CONFIG_XIL_AXIS_FIFO=m
 CONFIG_EROFS_FS=m
 # CONFIG_EROFS_FS_DEBUG is not set
@@ -7254,6 +7670,8 @@ CONFIG_EROFS_FS_SECURITY=y
 # CONFIG_EROFS_FAULT_INJECTION is not set
 CONFIG_EROFS_FS_IO_MAX_RETRIES=5
 # CONFIG_EROFS_FS_ZIP is not set
+# CONFIG_FIELDBUS_DEV is not set
+# CONFIG_KPC2000 is not set
 CONFIG_HWSPINLOCK=y
 
 #
@@ -7261,6 +7679,8 @@ CONFIG_HWSPINLOCK=y
 #
 CONFIG_I8253_LOCK=y
 CONFIG_CLKBLD_I8253=y
+# end of Clock Source drivers
+
 CONFIG_MAILBOX=y
 CONFIG_PLATFORM_MHU=m
 CONFIG_ALTERA_MBOX=m
@@ -7271,6 +7691,8 @@ CONFIG_IOMMU_SUPPORT=y
 #
 # Generic IOMMU Pagetable Support
 #
+# end of Generic IOMMU Pagetable Support
+
 # CONFIG_IOMMU_DEBUGFS is not set
 # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
 CONFIG_OF_IOMMU=y
@@ -7280,6 +7702,7 @@ CONFIG_SPAPR_TCE_IOMMU=y
 # Remoteproc drivers
 #
 CONFIG_REMOTEPROC=m
+# end of Remoteproc drivers
 
 #
 # Rpmsg drivers
@@ -7288,6 +7711,8 @@ CONFIG_RPMSG=m
 CONFIG_RPMSG_CHAR=m
 # CONFIG_RPMSG_QCOM_GLINK_RPM is not set
 CONFIG_RPMSG_VIRTIO=m
+# end of Rpmsg drivers
+
 # CONFIG_SOUNDWIRE is not set
 
 #
@@ -7297,29 +7722,43 @@ CONFIG_RPMSG_VIRTIO=m
 #
 # Amlogic SoC drivers
 #
+# end of Amlogic SoC drivers
+
+#
+# Aspeed SoC drivers
+#
+# end of Aspeed SoC drivers
 
 #
 # Broadcom SoC drivers
 #
+# end of Broadcom SoC drivers
 
 #
 # NXP/Freescale QorIQ SoC drivers
 #
 CONFIG_FSL_GUTS=y
+# end of NXP/Freescale QorIQ SoC drivers
 
 #
 # i.MX SoC drivers
 #
+# end of i.MX SoC drivers
 
 #
 # Qualcomm SoC drivers
 #
+# end of Qualcomm SoC drivers
+
 CONFIG_SOC_TI=y
 
 #
 # Xilinx SoC drivers
 #
 CONFIG_XILINX_VCU=m
+# end of Xilinx SoC drivers
+# end of SOC (System On Chip) specific Drivers
+
 CONFIG_PM_DEVFREQ=y
 
 #
@@ -7342,6 +7781,7 @@ CONFIG_EXTCON=y
 #
 CONFIG_EXTCON_ADC_JACK=m
 CONFIG_EXTCON_ARIZONA=m
+# CONFIG_EXTCON_FSA9480 is not set
 CONFIG_EXTCON_GPIO=m
 CONFIG_EXTCON_MAX14577=m
 CONFIG_EXTCON_MAX3355=m
@@ -7408,6 +7848,7 @@ CONFIG_MXC6255=m
 CONFIG_SCA3000=m
 CONFIG_STK8312=m
 CONFIG_STK8BA50=m
+# end of Accelerometers
 
 #
 # Analog to digital converters
@@ -7423,6 +7864,7 @@ CONFIG_AD7606_IFACE_PARALLEL=m
 CONFIG_AD7606_IFACE_SPI=m
 CONFIG_AD7766=m
 CONFIG_AD7768_1=m
+CONFIG_AD7780=m
 CONFIG_AD7791=m
 CONFIG_AD7793=m
 CONFIG_AD7887=m
@@ -7468,6 +7910,7 @@ CONFIG_TI_ADC128S052=m
 CONFIG_TI_ADC161S626=m
 CONFIG_TI_ADS1015=m
 CONFIG_TI_ADS7950=m
+CONFIG_TI_ADS8344=m
 CONFIG_TI_ADS8688=m
 CONFIG_TI_ADS124S08=m
 CONFIG_TI_AM335X_ADC=m
@@ -7476,16 +7919,20 @@ CONFIG_TI_TLC4541=m
 # CONFIG_TWL6030_GPADC is not set
 CONFIG_VF610_ADC=m
 CONFIG_VIPERBOARD_ADC=m
+# CONFIG_XILINX_XADC is not set
+# end of Analog to digital converters
 
 #
 # Analog Front Ends
 #
 CONFIG_IIO_RESCALE=m
+# end of Analog Front Ends
 
 #
 # Amplifiers
 #
 CONFIG_AD8366=m
+# end of Amplifiers
 
 #
 # Chemical Sensors
@@ -7500,12 +7947,15 @@ CONFIG_PMS7003=m
 CONFIG_SENSIRION_SGP30=m
 CONFIG_SPS30=m
 CONFIG_VZ89X=m
+# end of Chemical Sensors
 
 #
 # Hid Sensor IIO Common
 #
 CONFIG_HID_SENSOR_IIO_COMMON=m
 CONFIG_HID_SENSOR_IIO_TRIGGER=m
+# end of Hid Sensor IIO Common
+
 CONFIG_IIO_MS_SENSORS_I2C=m
 
 #
@@ -7513,14 +7963,12 @@ CONFIG_IIO_MS_SENSORS_I2C=m
 #
 CONFIG_IIO_SSP_SENSORS_COMMONS=m
 CONFIG_IIO_SSP_SENSORHUB=m
+# end of SSP Sensor Common
+
 CONFIG_IIO_ST_SENSORS_I2C=m
 CONFIG_IIO_ST_SENSORS_SPI=m
 CONFIG_IIO_ST_SENSORS_CORE=m
 
-#
-# Counters
-#
-
 #
 # Digital to analog converters
 #
@@ -7559,6 +8007,7 @@ CONFIG_TI_DAC5571=m
 CONFIG_TI_DAC7311=m
 CONFIG_TI_DAC7612=m
 CONFIG_VF610_DAC=m
+# end of Digital to analog converters
 
 #
 # IIO dummy driver
@@ -7566,6 +8015,7 @@ CONFIG_VF610_DAC=m
 CONFIG_IIO_SIMPLE_DUMMY=m
 # CONFIG_IIO_SIMPLE_DUMMY_EVENTS is not set
 # CONFIG_IIO_SIMPLE_DUMMY_BUFFER is not set
+# end of IIO dummy driver
 
 #
 # Frequency Synthesizers DDS/PLL
@@ -7575,11 +8025,15 @@ CONFIG_IIO_SIMPLE_DUMMY=m
 # Clock Generator/Distribution
 #
 CONFIG_AD9523=m
+# end of Clock Generator/Distribution
 
 #
 # Phase-Locked Loop (PLL) frequency synthesizers
 #
 CONFIG_ADF4350=m
+# CONFIG_ADF4371 is not set
+# end of Phase-Locked Loop (PLL) frequency synthesizers
+# end of Frequency Synthesizers DDS/PLL
 
 #
 # Digital gyroscope sensors
@@ -7592,6 +8046,9 @@ CONFIG_ADXRS450=m
 CONFIG_BMG160=m
 CONFIG_BMG160_I2C=m
 CONFIG_BMG160_SPI=m
+CONFIG_FXAS21002C=m
+CONFIG_FXAS21002C_I2C=m
+CONFIG_FXAS21002C_SPI=m
 CONFIG_HID_SENSOR_GYRO_3D=m
 CONFIG_MPU3050=m
 CONFIG_MPU3050_I2C=m
@@ -7599,6 +8056,7 @@ CONFIG_IIO_ST_GYRO_3AXIS=m
 CONFIG_IIO_ST_GYRO_I2C_3AXIS=m
 CONFIG_IIO_ST_GYRO_SPI_3AXIS=m
 CONFIG_ITG3200=m
+# end of Digital gyroscope sensors
 
 #
 # Health Sensors
@@ -7611,6 +8069,8 @@ CONFIG_AFE4403=m
 CONFIG_AFE4404=m
 CONFIG_MAX30100=m
 CONFIG_MAX30102=m
+# end of Heart Rate Monitors
+# end of Health Sensors
 
 #
 # Humidity sensors
@@ -7625,6 +8085,7 @@ CONFIG_HTS221_SPI=m
 CONFIG_HTU21=m
 CONFIG_SI7005=m
 CONFIG_SI7020=m
+# end of Humidity sensors
 
 #
 # Inertial measurement units
@@ -7641,6 +8102,8 @@ CONFIG_INV_MPU6050_SPI=m
 CONFIG_IIO_ST_LSM6DSX=m
 CONFIG_IIO_ST_LSM6DSX_I2C=m
 CONFIG_IIO_ST_LSM6DSX_SPI=m
+# end of Inertial measurement units
+
 CONFIG_IIO_ADIS_LIB=m
 CONFIG_IIO_ADIS_LIB_BUFFER=y
 
@@ -7691,6 +8154,7 @@ CONFIG_VCNL4035=m
 CONFIG_VEML6070=m
 CONFIG_VL6180=m
 CONFIG_ZOPT2201=m
+# end of Light sensors
 
 #
 # Magnetometer sensors
@@ -7713,17 +8177,20 @@ CONFIG_SENSORS_HMC5843_SPI=m
 CONFIG_SENSORS_RM3100=m
 CONFIG_SENSORS_RM3100_I2C=m
 CONFIG_SENSORS_RM3100_SPI=m
+# end of Magnetometer sensors
 
 #
 # Multiplexers
 #
 CONFIG_IIO_MUX=m
+# end of Multiplexers
 
 #
 # Inclinometer sensors
 #
 CONFIG_HID_SENSOR_INCLINOMETER_3D=m
 CONFIG_HID_SENSOR_DEVICE_ROTATION=m
+# end of Inclinometer sensors
 
 #
 # Triggers - standalone
@@ -7732,6 +8199,7 @@ CONFIG_IIO_HRTIMER_TRIGGER=m
 CONFIG_IIO_INTERRUPT_TRIGGER=m
 CONFIG_IIO_TIGHTLOOP_TRIGGER=m
 CONFIG_IIO_SYSFS_TRIGGER=m
+# end of Triggers - standalone
 
 #
 # Digital potentiometers
@@ -7745,11 +8213,13 @@ CONFIG_MCP4131=m
 CONFIG_MCP4531=m
 CONFIG_MCP41010=m
 CONFIG_TPL0102=m
+# end of Digital potentiometers
 
 #
 # Digital potentiostats
 #
 CONFIG_LMP91000=m
+# end of Digital potentiostats
 
 #
 # Pressure sensors
@@ -7758,6 +8228,7 @@ CONFIG_ABP060MG=m
 CONFIG_BMP280=m
 CONFIG_BMP280_I2C=m
 CONFIG_BMP280_SPI=m
+# CONFIG_DPS310 is not set
 CONFIG_HID_SENSOR_PRESS=m
 CONFIG_HP03=m
 CONFIG_MPL115=m
@@ -7776,28 +8247,33 @@ CONFIG_HP206C=m
 CONFIG_ZPA2326=m
 CONFIG_ZPA2326_I2C=m
 CONFIG_ZPA2326_SPI=m
+# end of Pressure sensors
 
 #
 # Lightning sensors
 #
 # CONFIG_AS3935 is not set
+# end of Lightning sensors
 
 #
 # Proximity and distance sensors
 #
 CONFIG_ISL29501=m
 CONFIG_LIDAR_LITE_V2=m
+CONFIG_MB1232=m
 CONFIG_RFD77402=m
 # CONFIG_SRF04 is not set
 CONFIG_SX9500=m
 CONFIG_SRF08=m
 CONFIG_VL53L0X_I2C=m
+# end of Proximity and distance sensors
 
 #
 # Resolver to digital converters
 #
 CONFIG_AD2S90=m
 CONFIG_AD2S1200=m
+# end of Resolver to digital converters
 
 #
 # Temperature sensors
@@ -7810,7 +8286,11 @@ CONFIG_TMP006=m
 CONFIG_TMP007=m
 CONFIG_TSYS01=m
 CONFIG_TSYS02D=m
+CONFIG_MAX31856=m
+# end of Temperature sensors
+
 CONFIG_NTB=m
+# CONFIG_NTB_MSI is not set
 CONFIG_NTB_IDT=m
 CONFIG_NTB_SWITCHTEC=m
 CONFIG_NTB_PINGPONG=m
@@ -7831,18 +8311,15 @@ CONFIG_PWM_STMPE=y
 # IRQ chip support
 #
 CONFIG_IRQCHIP=y
-CONFIG_ARM_GIC_MAX_NR=1
+# CONFIG_AL_FIC is not set
 CONFIG_MADERA_IRQ=m
+# end of IRQ chip support
+
 CONFIG_IPACK_BUS=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_SERIAL_IPOCTAL=m
 CONFIG_RESET_CONTROLLER=y
 # CONFIG_RESET_TI_SYSCON is not set
-CONFIG_FMC=m
-CONFIG_FMC_FAKEDEV=m
-CONFIG_FMC_TRIVIAL=m
-CONFIG_FMC_WRITE_EEPROM=m
-CONFIG_FMC_CHARDEV=m
 
 #
 # PHY Subsystem
@@ -7854,6 +8331,7 @@ CONFIG_PHY_CADENCE_DP=m
 CONFIG_PHY_CADENCE_DPHY=m
 CONFIG_PHY_CADENCE_SIERRA=m
 CONFIG_PHY_FSL_IMX8MQ_USB=m
+# CONFIG_PHY_MIXEL_MIPI_DPHY is not set
 CONFIG_PHY_PXA_28NM_HSIC=m
 CONFIG_PHY_PXA_28NM_USB2=m
 # CONFIG_PHY_CPCAP_USB is not set
@@ -7862,6 +8340,8 @@ CONFIG_PHY_OCELOT_SERDES=m
 CONFIG_PHY_QCOM_USB_HS=m
 CONFIG_PHY_QCOM_USB_HSIC=m
 CONFIG_PHY_TUSB1210=m
+# end of PHY Subsystem
+
 CONFIG_POWERCAP=y
 CONFIG_IDLE_INJECT=y
 CONFIG_MCB=m
@@ -7871,12 +8351,16 @@ CONFIG_MCB_LPC=m
 #
 # Performance monitor support
 #
+# end of Performance monitor support
+
 CONFIG_RAS=y
 
 #
 # Android
 #
 # CONFIG_ANDROID is not set
+# end of Android
+
 CONFIG_LIBNVDIMM=y
 CONFIG_BLK_DEV_PMEM=m
 CONFIG_ND_BLK=m
@@ -7894,6 +8378,7 @@ CONFIG_DEV_DAX_PMEM=m
 CONFIG_DEV_DAX_KMEM=m
 CONFIG_DEV_DAX_PMEM_COMPAT=m
 CONFIG_NVMEM=y
+CONFIG_NVMEM_SYSFS=y
 
 #
 # HW tracing support
@@ -7912,6 +8397,8 @@ CONFIG_INTEL_TH_STH=m
 CONFIG_INTEL_TH_MSU=m
 CONFIG_INTEL_TH_PTI=m
 # CONFIG_INTEL_TH_DEBUG is not set
+# end of HW tracing support
+
 CONFIG_FPGA=m
 CONFIG_ALTERA_PR_IP_CORE=m
 CONFIG_ALTERA_PR_IP_CORE_PLAT=m
@@ -7948,10 +8435,14 @@ CONFIG_MUX_ADG792A=m
 # CONFIG_MUX_ADGS1408 is not set
 CONFIG_MUX_GPIO=m
 CONFIG_MUX_MMIO=m
+# end of Multiplexer drivers
+
 CONFIG_PM_OPP=y
 # CONFIG_SIOX is not set
 # CONFIG_SLIMBUS is not set
 CONFIG_INTERCONNECT=m
+# CONFIG_COUNTER is not set
+# end of Device Drivers
 
 #
 # File systems
@@ -8053,6 +8544,7 @@ CONFIG_FSCACHE=m
 CONFIG_CACHEFILES=m
 # CONFIG_CACHEFILES_DEBUG is not set
 # CONFIG_CACHEFILES_HISTOGRAM is not set
+# end of Caches
 
 #
 # CD-ROM/DVD Filesystems
@@ -8061,6 +8553,7 @@ CONFIG_ISO9660_FS=m
 CONFIG_JOLIET=y
 CONFIG_ZISOFS=y
 CONFIG_UDF_FS=m
+# end of CD-ROM/DVD Filesystems
 
 #
 # DOS/FAT/NT Filesystems
@@ -8074,6 +8567,7 @@ CONFIG_FAT_DEFAULT_UTF8=y
 CONFIG_NTFS_FS=m
 # CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
+# end of DOS/FAT/NT Filesystems
 
 #
 # Pseudo filesystems
@@ -8095,6 +8589,8 @@ CONFIG_HUGETLB_PAGE=y
 CONFIG_MEMFD_CREATE=y
 CONFIG_ARCH_HAS_GIGANTIC_PAGE=y
 CONFIG_CONFIGFS_FS=y
+# end of Pseudo filesystems
+
 CONFIG_MISC_FILESYSTEMS=y
 CONFIG_ORANGEFS_FS=m
 CONFIG_ADFS_FS=m
@@ -8104,7 +8600,8 @@ CONFIG_ECRYPT_FS=m
 # CONFIG_ECRYPT_FS_MESSAGING is not set
 CONFIG_HFS_FS=m
 CONFIG_HFSPLUS_FS=m
-# CONFIG_BEFS_FS is not set
+CONFIG_BEFS_FS=m
+# CONFIG_BEFS_DEBUG is not set
 # CONFIG_BFS_FS is not set
 # CONFIG_EFS_FS is not set
 CONFIG_JFFS2_FS=m
@@ -8215,12 +8712,13 @@ CONFIG_SUNRPC_GSS=m
 CONFIG_SUNRPC_BACKCHANNEL=y
 CONFIG_SUNRPC_SWAP=y
 CONFIG_RPCSEC_GSS_KRB5=m
-CONFIG_CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y
+# CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES is not set
 # CONFIG_SUNRPC_DEBUG is not set
 CONFIG_SUNRPC_XPRT_RDMA=m
 CONFIG_CEPH_FS=m
 CONFIG_CEPH_FSCACHE=y
 CONFIG_CEPH_FS_POSIX_ACL=y
+# CONFIG_CEPH_FS_SECURITY_LABEL is not set
 CONFIG_CIFS=m
 # CONFIG_CIFS_STATS2 is not set
 CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
@@ -8228,7 +8726,6 @@ CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
 CONFIG_CIFS_UPCALL=y
 CONFIG_CIFS_XATTR=y
 CONFIG_CIFS_POSIX=y
-CONFIG_CIFS_ACL=y
 # CONFIG_CIFS_DEBUG is not set
 CONFIG_CIFS_DFS_UPCALL=y
 # CONFIG_CIFS_SMB_DIRECT is not set
@@ -8295,12 +8792,16 @@ CONFIG_NLS_MAC_TURKISH=m
 CONFIG_NLS_UTF8=m
 CONFIG_DLM=m
 # CONFIG_DLM_DEBUG is not set
+CONFIG_UNICODE=y
+# CONFIG_UNICODE_NORMALIZATION_SELFTEST is not set
+# end of File systems
 
 #
 # Security options
 #
 CONFIG_KEYS=y
 CONFIG_KEYS_COMPAT=y
+# CONFIG_KEYS_REQUEST_CACHE is not set
 # CONFIG_PERSISTENT_KEYRINGS is not set
 # CONFIG_BIG_KEYS is not set
 CONFIG_TRUSTED_KEYS=m
@@ -8344,6 +8845,24 @@ CONFIG_INTEGRITY_AUDIT=y
 # CONFIG_DEFAULT_SECURITY_APPARMOR is not set
 CONFIG_DEFAULT_SECURITY_DAC=y
 CONFIG_LSM="yama,loadpin,safesetid,integrity"
+
+#
+# Kernel hardening options
+#
+
+#
+# Memory initialization
+#
+CONFIG_INIT_STACK_NONE=y
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_USER is not set
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL is not set
+# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
+# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
+# end of Memory initialization
+# end of Kernel hardening options
+# end of Security options
+
 CONFIG_XOR_BLOCKS=m
 CONFIG_ASYNC_CORE=m
 CONFIG_ASYNC_MEMCPY=m
@@ -8371,9 +8890,6 @@ CONFIG_CRYPTO_AKCIPHER=y
 CONFIG_CRYPTO_KPP2=y
 CONFIG_CRYPTO_KPP=y
 CONFIG_CRYPTO_ACOMP2=y
-CONFIG_CRYPTO_RSA=y
-CONFIG_CRYPTO_DH=y
-CONFIG_CRYPTO_ECDH=m
 CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MANAGER2=y
 CONFIG_CRYPTO_USER=m
@@ -8382,12 +8898,20 @@ CONFIG_CRYPTO_GF128MUL=m
 CONFIG_CRYPTO_NULL=y
 CONFIG_CRYPTO_NULL2=y
 CONFIG_CRYPTO_PCRYPT=m
-CONFIG_CRYPTO_WORKQUEUE=y
 CONFIG_CRYPTO_CRYPTD=m
 CONFIG_CRYPTO_AUTHENC=m
 CONFIG_CRYPTO_TEST=m
 CONFIG_CRYPTO_ENGINE=m
 
+#
+# Public-key cryptography
+#
+CONFIG_CRYPTO_RSA=y
+CONFIG_CRYPTO_DH=y
+CONFIG_CRYPTO_ECC=m
+CONFIG_CRYPTO_ECDH=m
+CONFIG_CRYPTO_ECRDSA=m
+
 #
 # Authenticated Encryption with Associated Data
 #
@@ -8432,6 +8956,7 @@ CONFIG_CRYPTO_VMAC=m
 CONFIG_CRYPTO_CRC32C=m
 CONFIG_CRYPTO_CRC32C_VPMSUM=m
 CONFIG_CRYPTO_CRC32=m
+# CONFIG_CRYPTO_XXHASH is not set
 CONFIG_CRYPTO_CRCT10DIF=y
 CONFIG_CRYPTO_CRCT10DIF_VPMSUM=m
 CONFIG_CRYPTO_VPMSUM_TESTER=m
@@ -8451,7 +8976,7 @@ CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA512=y
 CONFIG_CRYPTO_SHA3=m
 CONFIG_CRYPTO_SM3=m
-# CONFIG_CRYPTO_STREEBOG is not set
+CONFIG_CRYPTO_STREEBOG=m
 CONFIG_CRYPTO_TGR192=m
 CONFIG_CRYPTO_WP512=m
 
@@ -8461,6 +8986,7 @@ CONFIG_CRYPTO_WP512=m
 CONFIG_CRYPTO_AES=y
 CONFIG_CRYPTO_AES_TI=m
 CONFIG_CRYPTO_ANUBIS=m
+CONFIG_CRYPTO_LIB_ARC4=m
 CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_BLOWFISH=m
 CONFIG_CRYPTO_BLOWFISH_COMMON=m
@@ -8512,6 +9038,8 @@ CONFIG_CRYPTO_DEV_NX=y
 CONFIG_CRYPTO_DEV_NX_ENCRYPT=y
 CONFIG_CRYPTO_DEV_NX_COMPRESS=m
 CONFIG_CRYPTO_DEV_NX_COMPRESS_PSERIES=m
+# CONFIG_CRYPTO_DEV_ATMEL_ECC is not set
+# CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set
 # CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set
 CONFIG_CRYPTO_DEV_VMX=y
 CONFIG_CRYPTO_DEV_VMX_ENCRYPT=m
@@ -8537,6 +9065,8 @@ CONFIG_SYSTEM_TRUSTED_KEYS=""
 # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
 # CONFIG_SECONDARY_TRUSTED_KEYRING is not set
 # CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
+# end of Certificates for signature checking
+
 CONFIG_BINARY_PRINTF=y
 
 #
@@ -8544,11 +9074,13 @@ CONFIG_BINARY_PRINTF=y
 #
 CONFIG_RAID6_PQ=m
 CONFIG_RAID6_PQ_BENCHMARK=y
+CONFIG_PACKING=y
 CONFIG_BITREVERSE=y
-CONFIG_RATIONAL=y
 CONFIG_GENERIC_STRNCPY_FROM_USER=y
 CONFIG_GENERIC_STRNLEN_USER=y
 CONFIG_GENERIC_NET_UTILS=y
+CONFIG_CORDIC=m
+CONFIG_RATIONAL=y
 CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_GENERIC_IOMAP=y
 CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
@@ -8617,6 +9149,7 @@ CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_ARCH_DMA_ADDR_T_64BIT=y
 CONFIG_DMA_DECLARE_COHERENT=y
 CONFIG_DMA_VIRT_OPS=y
+CONFIG_SWIOTLB=y
 # CONFIG_DMA_API_DEBUG is not set
 CONFIG_SGL_ALLOC=y
 CONFIG_IOMMU_HELPER=y
@@ -8628,10 +9161,9 @@ CONFIG_GLOB=y
 CONFIG_NLATTR=y
 CONFIG_LRU_CACHE=m
 CONFIG_CLZ_TAB=y
-CONFIG_CORDIC=m
-CONFIG_DDR=y
 CONFIG_IRQ_POLL=y
 CONFIG_MPILIB=y
+CONFIG_DIMLIB=y
 CONFIG_LIBFDT=y
 CONFIG_OID_REGISTRY=y
 CONFIG_FONT_SUPPORT=y
@@ -8654,8 +9186,9 @@ CONFIG_ARCH_HAS_PMEM_API=y
 CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y
 CONFIG_SBITMAP=y
 CONFIG_PARMAN=m
-# CONFIG_STRING_SELFTEST is not set
 CONFIG_OBJAGG=m
+# CONFIG_STRING_SELFTEST is not set
+# end of Library routines
 
 #
 # Kernel hacking
@@ -8670,6 +9203,7 @@ CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
 CONFIG_CONSOLE_LOGLEVEL_QUIET=4
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 CONFIG_DYNAMIC_DEBUG=y
+# end of printk and dmesg options
 
 #
 # Compile-time checks and compiler options
@@ -8678,6 +9212,7 @@ CONFIG_DEBUG_INFO=y
 # CONFIG_DEBUG_INFO_REDUCED is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
 # CONFIG_DEBUG_INFO_DWARF4 is not set
+# CONFIG_DEBUG_INFO_BTF is not set
 # CONFIG_GDB_SCRIPTS is not set
 # CONFIG_ENABLE_MUST_CHECK is not set
 CONFIG_FRAME_WARN=2048
@@ -8685,14 +9220,18 @@ CONFIG_STRIP_ASM_SYMS=y
 # CONFIG_READABLE_ASM is not set
 # CONFIG_UNUSED_SYMBOLS is not set
 CONFIG_DEBUG_FS=y
-# CONFIG_HEADERS_CHECK is not set
+# CONFIG_HEADERS_INSTALL is not set
+# CONFIG_OPTIMIZE_INLINING is not set
 # CONFIG_DEBUG_SECTION_MISMATCH is not set
 CONFIG_SECTION_MISMATCH_WARN_ONLY=y
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+# end of Compile-time checks and compiler options
+
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
 CONFIG_MAGIC_SYSRQ_SERIAL=y
 CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_MISC=y
 
 #
 # Memory Debugging
@@ -8718,6 +9257,8 @@ CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
 # CONFIG_DEBUG_STACKOVERFLOW is not set
 CONFIG_CC_HAS_KASAN_GENERIC=y
 CONFIG_KASAN_STACK=1
+# end of Memory Debugging
+
 CONFIG_ARCH_HAS_KCOV=y
 CONFIG_CC_HAS_SANCOV_TRACE_PC=y
 # CONFIG_KCOV is not set
@@ -8738,6 +9279,8 @@ CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
 CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
 # CONFIG_WQ_WATCHDOG is not set
+# end of Debug Lockups and Hangs
+
 # CONFIG_PANIC_ON_OOPS is not set
 CONFIG_PANIC_ON_OOPS_VALUE=0
 # CONFIG_SCHED_DEBUG is not set
@@ -8762,12 +9305,14 @@ CONFIG_LOCK_DEBUGGING_SUPPORT=y
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_LOCK_TORTURE_TEST is not set
 CONFIG_WW_MUTEX_SELFTEST=m
+# end of Lock Debugging (spinlocks, mutexes, etc...)
+
 CONFIG_STACKTRACE=y
 # CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
 # CONFIG_DEBUG_KOBJECT is not set
 CONFIG_DEBUG_BUGVERBOSE=y
 CONFIG_DEBUG_LIST=y
-# CONFIG_DEBUG_PI_LIST is not set
+# CONFIG_DEBUG_PLIST is not set
 # CONFIG_DEBUG_SG is not set
 CONFIG_DEBUG_NOTIFIERS=y
 CONFIG_DEBUG_CREDENTIALS=y
@@ -8781,6 +9326,8 @@ CONFIG_RCU_PERF_TEST=m
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
 # CONFIG_RCU_TRACE is not set
 # CONFIG_RCU_EQS_DEBUG is not set
+# end of RCU Debugging
+
 # CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
 # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
@@ -8794,6 +9341,7 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
 CONFIG_HAVE_DYNAMIC_FTRACE=y
 CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
 CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
+CONFIG_HAVE_C_RECORDMCOUNT=y
 CONFIG_TRACE_CLOCK=y
 CONFIG_RING_BUFFER=y
 CONFIG_EVENT_TRACING=y
@@ -8831,7 +9379,6 @@ CONFIG_FTRACE_MCOUNT_RECORD=y
 # CONFIG_RING_BUFFER_STARTUP_TEST is not set
 CONFIG_PREEMPTIRQ_DELAY_TEST=m
 # CONFIG_TRACE_EVAL_MAP_FILE is not set
-CONFIG_TRACING_EVENTS_GPIO=y
 CONFIG_RUNTIME_TESTING_MENU=y
 CONFIG_LKDTM=m
 # CONFIG_TEST_LIST_SORT is not set
@@ -8839,12 +9386,14 @@ CONFIG_LKDTM=m
 # CONFIG_KPROBES_SANITY_TEST is not set
 # CONFIG_BACKTRACE_SELF_TEST is not set
 # CONFIG_RBTREE_TEST is not set
+# CONFIG_REED_SOLOMON_TEST is not set
 # CONFIG_INTERVAL_TREE_TEST is not set
 # CONFIG_PERCPU_TEST is not set
 # CONFIG_ATOMIC64_SELFTEST is not set
 CONFIG_ASYNC_RAID6_TEST=m
 # CONFIG_TEST_HEXDUMP is not set
 CONFIG_TEST_STRING_HELPERS=m
+# CONFIG_TEST_STRSCPY is not set
 CONFIG_TEST_KSTRTOX=m
 CONFIG_TEST_PRINTF=m
 CONFIG_TEST_BITMAP=m
@@ -8860,6 +9409,7 @@ CONFIG_TEST_PARMAN=m
 # CONFIG_TEST_VMALLOC is not set
 # CONFIG_TEST_USER_COPY is not set
 # CONFIG_TEST_BPF is not set
+# CONFIG_TEST_BLACKHOLE_DEV is not set
 # CONFIG_FIND_BIT_BENCHMARK is not set
 # CONFIG_TEST_FIRMWARE is not set
 # CONFIG_TEST_SYSCTL is not set
@@ -8869,6 +9419,7 @@ CONFIG_TEST_STATIC_KEYS=m
 # CONFIG_TEST_MEMCAT_P is not set
 # CONFIG_TEST_OBJAGG is not set
 # CONFIG_TEST_STACKINIT is not set
+# CONFIG_TEST_MEMINIT is not set
 # CONFIG_MEMTEST is not set
 CONFIG_BUG_ON_DATA_CORRUPTION=y
 # CONFIG_SAMPLES is not set
@@ -8893,8 +9444,10 @@ CONFIG_PRINT_STACK_DEPTH=64
 CONFIG_XMON=y
 # CONFIG_XMON_DEFAULT is not set
 CONFIG_XMON_DISASSEMBLY=y
+CONFIG_XMON_DEFAULT_RO_MODE=y
 CONFIG_DEBUGGER=y
 CONFIG_BOOTX_TEXT=y
 # CONFIG_PPC_EARLY_DEBUG is not set
 # CONFIG_PPC_PTDUMP is not set
 # CONFIG_PPC_FAST_ENDIAN_SWITCH is not set
+# end of Kernel hacking
diff --git a/srcpkgs/linux5.1/files/ppc64le-dotconfig b/srcpkgs/linux5.3/files/ppc64le-dotconfig
similarity index 92%
rename from srcpkgs/linux5.1/files/ppc64le-dotconfig
rename to srcpkgs/linux5.3/files/ppc64le-dotconfig
index a6ac040b5bf..fb8c598df75 100644
--- a/srcpkgs/linux5.1/files/ppc64le-dotconfig
+++ b/srcpkgs/linux5.3/files/ppc64le-dotconfig
@@ -1,14 +1,15 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.1.18 Kernel Configuration
+# Linux/powerpc 5.3.0 Kernel Configuration
 #
 
 #
-# Compiler: powerpc64le-linux-gnu-gcc (GCC) 9.1.0
+# Compiler: powerpc64le-linux-gnu-gcc (GCC) 9.2.0
 #
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=90100
+CONFIG_GCC_VERSION=90200
 CONFIG_CLANG_VERSION=0
+CONFIG_CC_CAN_LINK=y
 CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y
 CONFIG_IRQ_WORK=y
@@ -20,6 +21,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
 #
 CONFIG_INIT_ENV_ARG_LIMIT=32
 # CONFIG_COMPILE_TEST is not set
+# CONFIG_HEADER_TEST is not set
 CONFIG_LOCALVERSION="_1"
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_BUILD_SALT=""
@@ -53,6 +55,8 @@ CONFIG_GENERIC_MSI_IRQ=y
 CONFIG_IRQ_FORCED_THREADING=y
 CONFIG_SPARSE_IRQ=y
 # CONFIG_GENERIC_IRQ_DEBUGFS is not set
+# end of IRQ subsystem
+
 CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_ARCH_HAS_TICK_BROADCAST=y
@@ -69,6 +73,8 @@ CONFIG_NO_HZ_IDLE=y
 # CONFIG_NO_HZ_FULL is not set
 # CONFIG_NO_HZ is not set
 CONFIG_HIGH_RES_TIMERS=y
+# end of Timers subsystem
+
 # CONFIG_PREEMPT_NONE is not set
 CONFIG_PREEMPT_VOLUNTARY=y
 # CONFIG_PREEMPT is not set
@@ -88,6 +94,8 @@ CONFIG_TASK_DELAY_ACCT=y
 CONFIG_TASK_XACCT=y
 CONFIG_TASK_IO_ACCOUNTING=y
 # CONFIG_PSI is not set
+# end of CPU/Task time and stats accounting
+
 CONFIG_CPU_ISOLATION=y
 
 #
@@ -100,12 +108,22 @@ CONFIG_TREE_SRCU=y
 CONFIG_TASKS_RCU=y
 CONFIG_RCU_STALL_COMMON=y
 CONFIG_RCU_NEED_SEGCBLIST=y
+# end of RCU Subsystem
+
 CONFIG_BUILD_BIN2C=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
+CONFIG_IKHEADERS=m
 CONFIG_LOG_BUF_SHIFT=19
 CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
 CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
+
+#
+# Scheduler features
+#
+# CONFIG_UCLAMP_TASK is not set
+# end of Scheduler features
+
 CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
 CONFIG_NUMA_BALANCING=y
 CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
@@ -116,7 +134,6 @@ CONFIG_MEMCG_SWAP=y
 CONFIG_MEMCG_SWAP_ENABLED=y
 CONFIG_MEMCG_KMEM=y
 CONFIG_BLK_CGROUP=y
-# CONFIG_DEBUG_BLK_CGROUP is not set
 CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
@@ -157,7 +174,6 @@ CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
 CONFIG_HAVE_LD_DEAD_CODE_DATA_ELIMINATION=y
 # CONFIG_LD_DEAD_CODE_DATA_ELIMINATION is not set
 CONFIG_SYSCTL=y
-CONFIG_ANON_INODES=y
 CONFIG_SYSCTL_EXCEPTION_TRACE=y
 CONFIG_HAVE_PCSPKR_PLATFORM=y
 CONFIG_BPF=y
@@ -202,6 +218,8 @@ CONFIG_HAVE_PERF_EVENTS=y
 # Kernel Performance Events And Counters
 #
 CONFIG_PERF_EVENTS=y
+# end of Kernel Performance Events And Counters
+
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_SLUB_DEBUG=y
 # CONFIG_SLUB_MEMCG_SYSFS_ON is not set
@@ -212,10 +230,13 @@ CONFIG_SLUB=y
 CONFIG_SLAB_MERGE_DEFAULT=y
 CONFIG_SLAB_FREELIST_RANDOM=y
 CONFIG_SLAB_FREELIST_HARDENED=y
+CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
 CONFIG_SLUB_CPU_PARTIAL=y
 CONFIG_SYSTEM_DATA_VERIFICATION=y
 CONFIG_PROFILING=y
 CONFIG_TRACEPOINTS=y
+# end of General setup
+
 CONFIG_PPC64=y
 
 #
@@ -234,6 +255,11 @@ CONFIG_VSX=y
 CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
 CONFIG_PPC_RADIX_MMU=y
 CONFIG_PPC_RADIX_MMU_DEFAULT=y
+CONFIG_PPC_HAVE_KUEP=y
+CONFIG_PPC_KUEP=y
+CONFIG_PPC_HAVE_KUAP=y
+CONFIG_PPC_KUAP=y
+# CONFIG_PPC_KUAP_DEBUG is not set
 CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y
 CONFIG_PPC_MM_SLICES=y
 CONFIG_PPC_HAVE_PMU_SUPPORT=y
@@ -242,6 +268,8 @@ CONFIG_FORCE_SMP=y
 CONFIG_SMP=y
 CONFIG_NR_CPUS=2048
 CONFIG_PPC_DOORBELL=y
+# end of Processor support
+
 # CONFIG_CPU_BIG_ENDIAN is not set
 CONFIG_CPU_LITTLE_ENDIAN=y
 CONFIG_PPC64_BOOT_WRAPPER=y
@@ -259,7 +287,6 @@ CONFIG_PPC_WATCHDOG=y
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_PPC=y
 CONFIG_PPC_BARRIER_NOSPEC=y
@@ -275,8 +302,10 @@ CONFIG_GENERIC_BUG=y
 CONFIG_EPAPR_BOOT=y
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_ARCH_SUSPEND_NONZERO_CPU=y
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 CONFIG_ARCH_SUPPORTS_UPROBES=y
+CONFIG_PPC_DAWR=y
 CONFIG_PGTABLE_LEVELS=4
 CONFIG_PPC_MSI_BITMAP=y
 CONFIG_PPC_XICS=y
@@ -350,6 +379,7 @@ CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
 # CPU frequency scaling drivers
 #
 CONFIG_POWERNV_CPUFREQ=y
+# end of CPU Frequency scaling
 
 #
 # CPUIdle driver
@@ -368,8 +398,13 @@ CONFIG_CPU_IDLE_GOV_TEO=y
 #
 CONFIG_PSERIES_CPUIDLE=y
 CONFIG_POWERNV_CPUIDLE=y
+# end of POWERPC CPU Idle Drivers
+# end of CPU Idle
+# end of CPUIdle driver
+
 # CONFIG_GEN_RTC is not set
 # CONFIG_SIMPLE_GPIO is not set
+# end of Platform support
 
 #
 # Kernel options
@@ -430,6 +465,7 @@ CONFIG_HIBERNATION=y
 CONFIG_PM_STD_PARTITION=""
 CONFIG_PM_SLEEP=y
 CONFIG_PM_SLEEP_SMP=y
+CONFIG_PM_SLEEP_SMP_NONZERO_CPU=y
 # CONFIG_PM_AUTOSLEEP is not set
 # CONFIG_PM_WAKELOCKS is not set
 CONFIG_PM=y
@@ -445,6 +481,8 @@ CONFIG_PM_GENERIC_DOMAINS_OF=y
 CONFIG_ENERGY_MODEL=y
 CONFIG_SECCOMP=y
 CONFIG_PPC_MEM_KEYS=y
+# end of Kernel options
+
 CONFIG_ISA_DMA_API=y
 
 #
@@ -452,6 +490,8 @@ CONFIG_ISA_DMA_API=y
 #
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_FSL_LBC=y
+# end of Bus options
+
 CONFIG_NONSTATIC_KERNEL=y
 CONFIG_PAGE_OFFSET=0xc000000000000000
 CONFIG_KERNEL_START=0xc000000000000000
@@ -521,6 +561,8 @@ CONFIG_HAVE_PERF_REGS=y
 CONFIG_HAVE_PERF_USER_STACK_DUMP=y
 CONFIG_HAVE_ARCH_JUMP_LABEL=y
 CONFIG_HAVE_RCU_TABLE_FREE=y
+CONFIG_HAVE_RCU_TABLE_NO_INVALIDATE=y
+CONFIG_HAVE_MMU_GATHER_PAGE_SIZE=y
 CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
 CONFIG_ARCH_WEAK_RELEASE_ACQUIRE=y
 CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
@@ -537,6 +579,7 @@ CONFIG_HAVE_VIRT_CPU_ACCOUNTING=y
 CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
 CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
 CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
+CONFIG_HAVE_ARCH_HUGE_VMAP=y
 CONFIG_HAVE_ARCH_SOFT_DIRTY=y
 CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
 CONFIG_MODULES_USE_ELF_RELA=y
@@ -555,15 +598,28 @@ CONFIG_64BIT_TIME=y
 CONFIG_COMPAT_32BIT_TIME=y
 CONFIG_ARCH_HAS_PHYS_TO_DMA=y
 CONFIG_REFCOUNT_FULL=y
+# CONFIG_LOCK_EVENT_COUNTS is not set
 
 #
 # GCOV-based kernel profiling
 #
 # CONFIG_GCOV_KERNEL is not set
 CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
+# end of GCOV-based kernel profiling
+
 CONFIG_PLUGIN_HOSTCC="g++"
 CONFIG_HAVE_GCC_PLUGINS=y
-# CONFIG_GCC_PLUGINS is not set
+CONFIG_GCC_PLUGINS=y
+
+#
+# GCC plugins
+#
+# CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set
+# CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
+# CONFIG_GCC_PLUGIN_RANDSTRUCT is not set
+# end of GCC plugins
+# end of General architecture-dependent options
+
 CONFIG_RT_MUTEXES=y
 CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
@@ -617,6 +673,8 @@ CONFIG_LDM_PARTITION=y
 CONFIG_EFI_PARTITION=y
 # CONFIG_SYSV68_PARTITION is not set
 CONFIG_CMDLINE_PARTITION=y
+# end of Partition Types
+
 CONFIG_BLOCK_COMPAT=y
 CONFIG_BLK_MQ_PCI=y
 CONFIG_BLK_MQ_VIRTIO=y
@@ -630,6 +688,9 @@ CONFIG_MQ_IOSCHED_DEADLINE=y
 CONFIG_MQ_IOSCHED_KYBER=y
 CONFIG_IOSCHED_BFQ=y
 CONFIG_BFQ_GROUP_IOSCHED=y
+# CONFIG_BFQ_CGROUP_DEBUG is not set
+# end of IO Schedulers
+
 CONFIG_PREEMPT_NOTIFIERS=y
 CONFIG_PADATA=y
 CONFIG_ASN1=y
@@ -642,6 +703,8 @@ CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
 CONFIG_MUTEX_SPIN_ON_OWNER=y
 CONFIG_RWSEM_SPIN_ON_OWNER=y
 CONFIG_LOCK_SPIN_ON_OWNER=y
+CONFIG_ARCH_HAS_MMIOWB=y
+CONFIG_MMIOWB=y
 CONFIG_FREEZER=y
 
 #
@@ -654,6 +717,7 @@ CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 CONFIG_BINFMT_SCRIPT=y
 CONFIG_BINFMT_MISC=m
 CONFIG_COREDUMP=y
+# end of Executable file formats
 
 #
 # Memory Management options
@@ -667,7 +731,8 @@ CONFIG_SPARSEMEM_EXTREME=y
 CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
 CONFIG_SPARSEMEM_VMEMMAP=y
 CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
-CONFIG_HAVE_GENERIC_GUP=y
+CONFIG_HAVE_FAST_GUP=y
+CONFIG_ARCH_KEEP_MEMBLOCK=y
 CONFIG_MEMORY_ISOLATION=y
 CONFIG_HAVE_BOOTMEM_INFO_NODE=y
 CONFIG_MEMORY_HOTPLUG=y
@@ -680,6 +745,7 @@ CONFIG_BALLOON_COMPACTION=y
 CONFIG_COMPACTION=y
 CONFIG_MIGRATION=y
 CONFIG_ARCH_ENABLE_THP_MIGRATION=y
+CONFIG_CONTIG_ALLOC=y
 CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_MMU_NOTIFIER=y
 CONFIG_KSM=y
@@ -707,21 +773,20 @@ CONFIG_PGTABLE_MAPPING=y
 # CONFIG_ZSMALLOC_STAT is not set
 # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
 CONFIG_IDLE_PAGE_TRACKING=y
-CONFIG_ARCH_HAS_ZONE_DEVICE=y
+CONFIG_ARCH_HAS_PTE_DEVMAP=y
 CONFIG_ZONE_DEVICE=y
-CONFIG_ARCH_HAS_HMM=y
-CONFIG_MIGRATE_VMA_HELPER=y
 CONFIG_DEV_PAGEMAP_OPS=y
-CONFIG_HMM=y
 CONFIG_HMM_MIRROR=y
 CONFIG_DEVICE_PRIVATE=y
-CONFIG_DEVICE_PUBLIC=y
 CONFIG_FRAME_VECTOR=y
 CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
 CONFIG_ARCH_HAS_PKEYS=y
 # CONFIG_PERCPU_STATS is not set
 # CONFIG_GUP_BENCHMARK is not set
 CONFIG_ARCH_HAS_PTE_SPECIAL=y
+CONFIG_ARCH_HAS_HUGEPD=y
+# end of Memory Management options
+
 CONFIG_NET=y
 CONFIG_COMPAT_NETLINK_MESSAGES=y
 CONFIG_NET_INGRESS=y
@@ -782,9 +847,6 @@ CONFIG_INET_ESP_OFFLOAD=m
 CONFIG_INET_IPCOMP=m
 CONFIG_INET_XFRM_TUNNEL=m
 CONFIG_INET_TUNNEL=m
-CONFIG_INET_XFRM_MODE_TRANSPORT=m
-CONFIG_INET_XFRM_MODE_TUNNEL=m
-CONFIG_INET_XFRM_MODE_BEET=m
 CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 CONFIG_INET_UDP_DIAG=y
@@ -822,10 +884,6 @@ CONFIG_IPV6_MIP6=m
 CONFIG_IPV6_ILA=m
 CONFIG_INET6_XFRM_TUNNEL=m
 CONFIG_INET6_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-CONFIG_INET6_XFRM_MODE_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_BEET=m
-CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
 CONFIG_IPV6_VTI=m
 CONFIG_IPV6_SIT=m
 CONFIG_IPV6_SIT_6RD=y
@@ -890,7 +948,6 @@ CONFIG_NF_CT_NETLINK_TIMEOUT=m
 CONFIG_NF_CT_NETLINK_HELPER=m
 CONFIG_NETFILTER_NETLINK_GLUE_CT=y
 CONFIG_NF_NAT=m
-CONFIG_NF_NAT_NEEDED=y
 CONFIG_NF_NAT_AMANDA=m
 CONFIG_NF_NAT_FTP=m
 CONFIG_NF_NAT_IRC=m
@@ -927,6 +984,7 @@ CONFIG_NFT_XFRM=m
 CONFIG_NFT_SOCKET=m
 CONFIG_NFT_OSF=m
 CONFIG_NFT_TPROXY=m
+# CONFIG_NFT_SYNPROXY is not set
 CONFIG_NF_DUP_NETDEV=m
 CONFIG_NFT_DUP_NETDEV=m
 CONFIG_NFT_FWD_NETDEV=m
@@ -965,6 +1023,7 @@ CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
 CONFIG_NETFILTER_XT_TARGET_RATEEST=m
 CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
+CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m
 CONFIG_NETFILTER_XT_TARGET_TEE=m
 CONFIG_NETFILTER_XT_TARGET_TPROXY=m
 CONFIG_NETFILTER_XT_TARGET_TRACE=m
@@ -1021,6 +1080,8 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m
 CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
 CONFIG_NETFILTER_XT_MATCH_TIME=m
 CONFIG_NETFILTER_XT_MATCH_U32=m
+# end of Core Netfilter Configuration
+
 CONFIG_IP_SET=m
 CONFIG_IP_SET_MAX=256
 CONFIG_IP_SET_BITMAP_IP=m
@@ -1095,7 +1156,6 @@ CONFIG_NF_DEFRAG_IPV4=m
 CONFIG_NF_SOCKET_IPV4=m
 CONFIG_NF_TPROXY_IPV4=m
 CONFIG_NF_TABLES_IPV4=y
-CONFIG_NFT_CHAIN_ROUTE_IPV4=m
 CONFIG_NFT_REJECT_IPV4=m
 CONFIG_NFT_DUP_IPV4=m
 CONFIG_NFT_FIB_IPV4=m
@@ -1129,6 +1189,7 @@ CONFIG_IP_NF_RAW=m
 CONFIG_IP_NF_ARPTABLES=m
 CONFIG_IP_NF_ARPFILTER=m
 CONFIG_IP_NF_ARP_MANGLE=m
+# end of IP: Netfilter Configuration
 
 #
 # IPv6: Netfilter Configuration
@@ -1136,7 +1197,6 @@ CONFIG_IP_NF_ARP_MANGLE=m
 CONFIG_NF_SOCKET_IPV6=m
 CONFIG_NF_TPROXY_IPV6=m
 CONFIG_NF_TABLES_IPV6=y
-CONFIG_NFT_CHAIN_ROUTE_IPV6=m
 CONFIG_NFT_REJECT_IPV6=m
 CONFIG_NFT_DUP_IPV6=m
 CONFIG_NFT_FIB_IPV6=m
@@ -1165,10 +1225,14 @@ CONFIG_IP6_NF_RAW=m
 CONFIG_IP6_NF_NAT=m
 CONFIG_IP6_NF_TARGET_MASQUERADE=m
 CONFIG_IP6_NF_TARGET_NPT=m
+# end of IPv6: Netfilter Configuration
+
 CONFIG_NF_DEFRAG_IPV6=m
-CONFIG_NF_TABLES_BRIDGE=y
+CONFIG_NF_TABLES_BRIDGE=m
+# CONFIG_NFT_BRIDGE_META is not set
 CONFIG_NFT_BRIDGE_REJECT=m
 CONFIG_NF_LOG_BRIDGE=m
+# CONFIG_NF_CONNTRACK_BRIDGE is not set
 CONFIG_BRIDGE_NF_EBTABLES=m
 CONFIG_BRIDGE_EBT_BROUTE=m
 CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -1201,11 +1265,14 @@ CONFIG_INET_DCCP_DIAG=m
 CONFIG_IP_DCCP_CCID3=y
 # CONFIG_IP_DCCP_CCID3_DEBUG is not set
 CONFIG_IP_DCCP_TFRC_LIB=y
+# end of DCCP CCIDs Configuration
 
 #
 # DCCP Kernel Hacking
 #
 # CONFIG_IP_DCCP_DEBUG is not set
+# end of DCCP Kernel Hacking
+
 CONFIG_IP_SCTP=m
 # CONFIG_SCTP_DBG_OBJCNT is not set
 # CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5 is not set
@@ -1242,16 +1309,21 @@ CONFIG_BRIDGE_IGMP_SNOOPING=y
 CONFIG_BRIDGE_VLAN_FILTERING=y
 CONFIG_HAVE_NET_DSA=y
 CONFIG_NET_DSA=m
-CONFIG_NET_DSA_LEGACY=y
-CONFIG_NET_DSA_TAG_BRCM=y
-CONFIG_NET_DSA_TAG_BRCM_PREPEND=y
-CONFIG_NET_DSA_TAG_DSA=y
-CONFIG_NET_DSA_TAG_EDSA=y
-CONFIG_NET_DSA_TAG_GSWIP=y
-CONFIG_NET_DSA_TAG_KSZ=y
-CONFIG_NET_DSA_TAG_KSZ9477=y
-CONFIG_NET_DSA_TAG_TRAILER=y
-CONFIG_NET_DSA_TAG_QCA=y
+CONFIG_NET_DSA_TAG_8021Q=m
+CONFIG_NET_DSA_TAG_BRCM_COMMON=m
+CONFIG_NET_DSA_TAG_BRCM=m
+CONFIG_NET_DSA_TAG_BRCM_PREPEND=m
+CONFIG_NET_DSA_TAG_GSWIP=m
+CONFIG_NET_DSA_TAG_DSA=m
+CONFIG_NET_DSA_TAG_EDSA=m
+CONFIG_NET_DSA_TAG_MTK=m
+CONFIG_NET_DSA_TAG_KSZ_COMMON=m
+CONFIG_NET_DSA_TAG_KSZ=m
+CONFIG_NET_DSA_TAG_KSZ9477=m
+CONFIG_NET_DSA_TAG_QCA=m
+CONFIG_NET_DSA_TAG_LAN9303=m
+CONFIG_NET_DSA_TAG_SJA1105=m
+CONFIG_NET_DSA_TAG_TRAILER=m
 CONFIG_VLAN_8021Q=m
 CONFIG_VLAN_8021Q_GVRP=y
 CONFIG_VLAN_8021Q_MVRP=y
@@ -1354,16 +1426,18 @@ CONFIG_NET_ACT_PEDIT=m
 CONFIG_NET_ACT_SIMP=m
 CONFIG_NET_ACT_SKBEDIT=m
 CONFIG_NET_ACT_CSUM=m
+# CONFIG_NET_ACT_MPLS is not set
 CONFIG_NET_ACT_VLAN=m
 CONFIG_NET_ACT_BPF=m
 CONFIG_NET_ACT_CONNMARK=m
+# CONFIG_NET_ACT_CTINFO is not set
 CONFIG_NET_ACT_SKBMOD=m
 CONFIG_NET_ACT_IFE=m
 CONFIG_NET_ACT_TUNNEL_KEY=m
+# CONFIG_NET_ACT_CT is not set
 CONFIG_NET_IFE_SKBMARK=m
 CONFIG_NET_IFE_SKBPRIO=m
 CONFIG_NET_IFE_SKBTCINDEX=m
-CONFIG_NET_CLS_IND=y
 CONFIG_NET_SCH_FIFO=y
 CONFIG_DCB=y
 CONFIG_DNS_RESOLVER=y
@@ -1375,6 +1449,7 @@ CONFIG_BATMAN_ADV_NC=y
 CONFIG_BATMAN_ADV_MCAST=y
 CONFIG_BATMAN_ADV_DEBUGFS=y
 # CONFIG_BATMAN_ADV_DEBUG is not set
+CONFIG_BATMAN_ADV_SYSFS=y
 # CONFIG_BATMAN_ADV_TRACING is not set
 CONFIG_OPENVSWITCH=m
 CONFIG_OPENVSWITCH_GRE=m
@@ -1410,6 +1485,9 @@ CONFIG_NET_FLOW_LIMIT=y
 #
 # CONFIG_NET_PKTGEN is not set
 # CONFIG_NET_DROP_MONITOR is not set
+# end of Network testing
+# end of Networking options
+
 CONFIG_HAMRADIO=y
 
 #
@@ -1430,6 +1508,8 @@ CONFIG_BAYCOM_SER_FDX=m
 CONFIG_BAYCOM_SER_HDX=m
 CONFIG_BAYCOM_PAR=m
 CONFIG_YAM=m
+# end of AX.25 network device drivers
+
 CONFIG_CAN=m
 CONFIG_CAN_RAW=m
 CONFIG_CAN_BCM=m
@@ -1464,6 +1544,7 @@ CONFIG_CAN_SOFTING=m
 #
 # CONFIG_CAN_HI311X is not set
 CONFIG_CAN_MCP251X=m
+# end of CAN SPI interfaces
 
 #
 # CAN USB interfaces
@@ -1476,7 +1557,11 @@ CONFIG_CAN_KVASER_USB=m
 # CONFIG_CAN_MCBA_USB is not set
 CONFIG_CAN_PEAK_USB=m
 CONFIG_CAN_UCAN=m
+# end of CAN USB interfaces
+
 CONFIG_CAN_DEBUG_DEVICES=y
+# end of CAN Device Drivers
+
 CONFIG_BT=m
 CONFIG_BT_BREDR=y
 CONFIG_BT_RFCOMM=m
@@ -1502,6 +1587,7 @@ CONFIG_BT_QCA=m
 CONFIG_BT_HCIBTUSB=m
 CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
 CONFIG_BT_HCIBTUSB_BCM=y
+# CONFIG_BT_HCIBTUSB_MTK is not set
 CONFIG_BT_HCIBTUSB_RTL=y
 CONFIG_BT_HCIBTSDIO=m
 CONFIG_BT_HCIUART=m
@@ -1525,8 +1611,11 @@ CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
 CONFIG_BT_ATH3K=m
 CONFIG_BT_WILINK=m
+CONFIG_BT_MTKSDIO=m
 CONFIG_BT_MTKUART=m
 CONFIG_BT_HCIRSI=m
+# end of Bluetooth device drivers
+
 CONFIG_AF_RXRPC=m
 CONFIG_AF_RXRPC_IPV6=y
 # CONFIG_AF_RXRPC_INJECT_LOSS is not set
@@ -1623,6 +1712,8 @@ CONFIG_NFC_NXP_NCI_I2C=m
 CONFIG_NFC_S3FWRN5=m
 CONFIG_NFC_S3FWRN5_I2C=m
 CONFIG_NFC_ST95HF=m
+# end of Near Field Communication (NFC) devices
+
 CONFIG_PSAMPLE=m
 CONFIG_NET_IFE=m
 CONFIG_LWTUNNEL=y
@@ -1687,6 +1778,8 @@ CONFIG_HOTPLUG_PCI_RPA_DLPAR=m
 CONFIG_PCIE_CADENCE=y
 CONFIG_PCIE_CADENCE_HOST=y
 CONFIG_PCIE_CADENCE_EP=y
+# end of Cadence PCIe controllers support
+
 CONFIG_PCI_FTPCI100=y
 CONFIG_PCI_HOST_COMMON=y
 CONFIG_PCI_HOST_GENERIC=y
@@ -1695,6 +1788,8 @@ CONFIG_PCIE_XILINX=y
 #
 # DesignWare PCI Core Support
 #
+# end of DesignWare PCI Core Support
+# end of PCI controller drivers
 
 #
 # PCI Endpoint
@@ -1702,11 +1797,14 @@ CONFIG_PCIE_XILINX=y
 CONFIG_PCI_ENDPOINT=y
 CONFIG_PCI_ENDPOINT_CONFIGFS=y
 # CONFIG_PCI_EPF_TEST is not set
+# end of PCI Endpoint
 
 #
 # PCI switch controller drivers
 #
 CONFIG_PCI_SW_SWITCHTEC=m
+# end of PCI switch controller drivers
+
 # CONFIG_PCCARD is not set
 CONFIG_RAPIDIO=m
 CONFIG_RAPIDIO_TSI721=m
@@ -1726,6 +1824,7 @@ CONFIG_RAPIDIO_CPS_XX=m
 CONFIG_RAPIDIO_TSI568=m
 CONFIG_RAPIDIO_CPS_GEN2=m
 CONFIG_RAPIDIO_RXS_GEN3=m
+# end of RapidIO Switch drivers
 
 #
 # Generic Driver Options
@@ -1740,9 +1839,13 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 # Firmware loader
 #
 CONFIG_FW_LOADER=y
+CONFIG_FW_LOADER_PAGED_BUF=y
 CONFIG_EXTRA_FIRMWARE=""
 CONFIG_FW_LOADER_USER_HELPER=y
 # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
+# CONFIG_FW_LOADER_COMPRESS is not set
+# end of Firmware loader
+
 CONFIG_WANT_DEV_COREDUMP=y
 CONFIG_ALLOW_DEV_COREDUMP=y
 CONFIG_DEV_COREDUMP=y
@@ -1762,11 +1865,14 @@ CONFIG_REGMAP_MMIO=y
 CONFIG_REGMAP_IRQ=y
 CONFIG_DMA_SHARED_BUFFER=y
 # CONFIG_DMA_FENCE_TRACE is not set
+# end of Generic Driver Options
 
 #
 # Bus devices
 #
 CONFIG_SIMPLE_PM_BUS=y
+# end of Bus devices
+
 CONFIG_CONNECTOR=y
 CONFIG_PROC_EVENTS=y
 CONFIG_GNSS=m
@@ -1787,6 +1893,7 @@ CONFIG_MTD_REDBOOT_PARTS=m
 CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
 # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
 # CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
+# end of Partition parsers
 
 #
 # User Modules And Translation Layers
@@ -1817,6 +1924,7 @@ CONFIG_MTD_CFI_I2=y
 CONFIG_MTD_RAM=m
 CONFIG_MTD_ROM=m
 CONFIG_MTD_ABSENT=m
+# end of RAM/ROM/Flash chip drivers
 
 #
 # Mapping drivers for chip access
@@ -1829,6 +1937,7 @@ CONFIG_MTD_PHYSMAP=m
 CONFIG_MTD_PCI=m
 # CONFIG_MTD_INTEL_VR_NOR is not set
 CONFIG_MTD_PLATRAM=m
+# end of Mapping drivers for chip access
 
 #
 # Self-contained MTD device drivers
@@ -1852,29 +1961,38 @@ CONFIG_MTD_POWERNV_FLASH=m
 # Disk-On-Chip Device Drivers
 #
 # CONFIG_MTD_DOCG3 is not set
+# end of Self-contained MTD device drivers
+
 CONFIG_MTD_NAND_CORE=m
 CONFIG_MTD_ONENAND=m
 CONFIG_MTD_ONENAND_VERIFY_WRITE=y
 CONFIG_MTD_ONENAND_GENERIC=m
 # CONFIG_MTD_ONENAND_OTP is not set
 CONFIG_MTD_ONENAND_2X_PROGRAM=y
-CONFIG_MTD_NAND_ECC=m
-# CONFIG_MTD_NAND_ECC_SMC is not set
-CONFIG_MTD_NAND=m
-CONFIG_MTD_NAND_BCH=m
-CONFIG_MTD_NAND_ECC_BCH=y
-CONFIG_MTD_SM_COMMON=m
+CONFIG_MTD_NAND_ECC_SW_HAMMING=m
+# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
+CONFIG_MTD_RAW_NAND=m
+CONFIG_MTD_NAND_ECC_SW_BCH=y
+
+#
+# Raw/parallel NAND flash controllers
+#
 CONFIG_MTD_NAND_DENALI=m
 CONFIG_MTD_NAND_DENALI_PCI=m
+CONFIG_MTD_NAND_CAFE=m
 CONFIG_MTD_NAND_GPIO=m
+CONFIG_MTD_NAND_PLATFORM=m
+
+#
+# Misc
+#
+CONFIG_MTD_SM_COMMON=m
+CONFIG_MTD_NAND_NANDSIM=m
 CONFIG_MTD_NAND_RICOH=m
 CONFIG_MTD_NAND_DISKONCHIP=m
 # CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set
 CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
 # CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set
-CONFIG_MTD_NAND_CAFE=m
-CONFIG_MTD_NAND_NANDSIM=m
-CONFIG_MTD_NAND_PLATFORM=m
 CONFIG_MTD_SPI_NAND=m
 
 #
@@ -1882,6 +2000,8 @@ CONFIG_MTD_SPI_NAND=m
 #
 CONFIG_MTD_LPDDR=m
 CONFIG_MTD_QINFO_PROBE=m
+# end of LPDDR & LPDDR2 PCM memory drivers
+
 CONFIG_MTD_SPI_NOR=m
 CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y
 CONFIG_SPI_MTK_QUADSPI=m
@@ -1891,6 +2011,7 @@ CONFIG_MTD_UBI_BEB_LIMIT=20
 CONFIG_MTD_UBI_FASTMAP=y
 CONFIG_MTD_UBI_GLUEBI=m
 CONFIG_MTD_UBI_BLOCK=y
+# CONFIG_MTD_HYPERBUS is not set
 CONFIG_DTC=y
 CONFIG_OF=y
 # CONFIG_OF_UNITTEST is not set
@@ -1960,6 +2081,7 @@ CONFIG_NVME_TARGET_RDMA=m
 CONFIG_NVME_TARGET_FC=m
 CONFIG_NVME_TARGET_FCLOOP=m
 CONFIG_NVME_TARGET_TCP=m
+# end of NVME Support
 
 #
 # Misc devices
@@ -1985,10 +2107,10 @@ CONFIG_SENSORS_BH1770=m
 CONFIG_SENSORS_APDS990X=m
 CONFIG_HMC6352=m
 CONFIG_DS1682=m
-CONFIG_USB_SWITCH_FSA9480=m
 CONFIG_LATTICE_ECP3_CONFIG=m
 CONFIG_SRAM=y
 # CONFIG_PCI_ENDPOINT_TEST is not set
+# CONFIG_XILINX_SDFEC is not set
 CONFIG_MISC_RTSX=m
 CONFIG_PVPANIC=m
 CONFIG_C2PORT=m
@@ -2004,6 +2126,8 @@ CONFIG_EEPROM_93CX6=m
 CONFIG_EEPROM_93XX46=m
 CONFIG_EEPROM_IDT_89HPESX=m
 CONFIG_EEPROM_EE1004=m
+# end of EEPROM support
+
 CONFIG_CB710_CORE=m
 # CONFIG_CB710_DEBUG is not set
 CONFIG_CB710_DEBUG_ASSUMPTIONS=y
@@ -2012,6 +2136,8 @@ CONFIG_CB710_DEBUG_ASSUMPTIONS=y
 # Texas Instruments shared transport line discipline
 #
 CONFIG_TI_ST=m
+# end of Texas Instruments shared transport line discipline
+
 CONFIG_SENSORS_LIS3_SPI=m
 CONFIG_SENSORS_LIS3_I2C=m
 CONFIG_ALTERA_STAPL=m
@@ -2054,6 +2180,8 @@ CONFIG_VOP_BUS=m
 #
 CONFIG_VOP=m
 CONFIG_VHOST_RING=m
+# end of Intel MIC & related support
+
 CONFIG_GENWQE=m
 CONFIG_GENWQE_PLATFORM_ERROR_RECOVERY=0
 CONFIG_ECHO=m
@@ -2067,6 +2195,8 @@ CONFIG_MISC_ALCOR_PCI=m
 CONFIG_MISC_RTSX_PCI=m
 CONFIG_MISC_RTSX_USB=m
 CONFIG_HABANA_AI=m
+# end of Misc devices
+
 CONFIG_HAVE_IDE=y
 # CONFIG_IDE is not set
 
@@ -2085,7 +2215,6 @@ CONFIG_SCSI_PROC_FS=y
 #
 CONFIG_BLK_DEV_SD=m
 CONFIG_CHR_DEV_ST=m
-CONFIG_CHR_DEV_OSST=m
 CONFIG_BLK_DEV_SR=m
 CONFIG_BLK_DEV_SR_VENDOR=y
 CONFIG_CHR_DEV_SG=m
@@ -2106,6 +2235,8 @@ CONFIG_SCSI_SAS_LIBSAS=m
 CONFIG_SCSI_SAS_ATA=y
 CONFIG_SCSI_SAS_HOST_SMP=y
 CONFIG_SCSI_SRP_ATTRS=m
+# end of SCSI Transports
+
 CONFIG_SCSI_LOWLEVEL=y
 CONFIG_ISCSI_TCP=m
 CONFIG_ISCSI_BOOT_SYSFS=m
@@ -2168,6 +2299,7 @@ CONFIG_FCOE=m
 CONFIG_SCSI_SNIC=m
 # CONFIG_SCSI_SNIC_DEBUG_FS is not set
 CONFIG_SCSI_DMX3191D=m
+# CONFIG_SCSI_FDOMAIN_PCI is not set
 CONFIG_SCSI_GDTH=m
 CONFIG_SCSI_IPS=m
 CONFIG_SCSI_IBMVSCSI=m
@@ -2212,6 +2344,8 @@ CONFIG_SCSI_DH_RDAC=m
 CONFIG_SCSI_DH_HP_SW=m
 CONFIG_SCSI_DH_EMC=m
 CONFIG_SCSI_DH_ALUA=m
+# end of SCSI device support
+
 CONFIG_ATA=m
 CONFIG_ATA_VERBOSE_ERROR=y
 CONFIG_SATA_PMP=y
@@ -2344,6 +2478,7 @@ CONFIG_DM_MULTIPATH=m
 CONFIG_DM_MULTIPATH_QL=m
 CONFIG_DM_MULTIPATH_ST=m
 CONFIG_DM_DELAY=m
+CONFIG_DM_DUST=m
 CONFIG_DM_UEVENT=y
 CONFIG_DM_FLAKEY=m
 CONFIG_DM_VERITY=m
@@ -2379,6 +2514,8 @@ CONFIG_FIREWIRE_OHCI=m
 CONFIG_FIREWIRE_SBP2=m
 CONFIG_FIREWIRE_NET=m
 CONFIG_FIREWIRE_NOSY=m
+# end of IEEE 1394 (FireWire) support
+
 CONFIG_MACINTOSH_DRIVERS=y
 CONFIG_MAC_EMUMOUSEBTN=m
 CONFIG_WINDFARM=m
@@ -2476,11 +2613,16 @@ CONFIG_NET_DSA_MICROCHIP_KSZ9477_SPI=m
 CONFIG_NET_DSA_MV88E6XXX=m
 CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y
 CONFIG_NET_DSA_MV88E6XXX_PTP=y
+CONFIG_NET_DSA_SJA1105=m
+# CONFIG_NET_DSA_SJA1105_PTP is not set
 CONFIG_NET_DSA_QCA8K=m
 # CONFIG_NET_DSA_REALTEK_SMI is not set
 # CONFIG_NET_DSA_SMSC_LAN9303_I2C is not set
 # CONFIG_NET_DSA_SMSC_LAN9303_MDIO is not set
-# CONFIG_NET_DSA_VITESSE_VSC73XX is not set
+# CONFIG_NET_DSA_VITESSE_VSC73XX_SPI is not set
+# CONFIG_NET_DSA_VITESSE_VSC73XX_PLATFORM is not set
+# end of Distributed Switch Architecture drivers
+
 CONFIG_ETHERNET=y
 CONFIG_MDIO=m
 CONFIG_NET_VENDOR_3COM=y
@@ -2532,8 +2674,6 @@ CONFIG_BNXT_HWMON=y
 CONFIG_NET_VENDOR_BROCADE=y
 CONFIG_BNA=m
 CONFIG_NET_VENDOR_CADENCE=y
-CONFIG_MACB=m
-CONFIG_MACB_USE_HWSTAMP=y
 CONFIG_NET_VENDOR_CAVIUM=y
 CONFIG_THUNDER_NIC_PF=m
 CONFIG_THUNDER_NIC_VF=m
@@ -2580,6 +2720,8 @@ CONFIG_BE2NET_LANCER=y
 CONFIG_BE2NET_SKYHAWK=y
 CONFIG_NET_VENDOR_EZCHIP=y
 CONFIG_EZCHIP_NPS_MANAGEMENT_ENET=m
+CONFIG_NET_VENDOR_GOOGLE=y
+# CONFIG_GVE is not set
 CONFIG_NET_VENDOR_HP=y
 CONFIG_HP100=m
 CONFIG_NET_VENDOR_HUAWEI=y
@@ -2737,6 +2879,7 @@ CONFIG_SMSC9420=m
 CONFIG_NET_VENDOR_SOCIONEXT=y
 CONFIG_NET_VENDOR_STMICRO=y
 CONFIG_STMMAC_ETH=m
+# CONFIG_STMMAC_SELFTESTS is not set
 CONFIG_STMMAC_PLATFORM=m
 # CONFIG_DWMAC_DWC_QOS_ETH is not set
 CONFIG_DWMAC_GENERIC=m
@@ -2752,7 +2895,6 @@ CONFIG_NET_VENDOR_TEHUTI=y
 CONFIG_TEHUTI=m
 CONFIG_NET_VENDOR_TI=y
 # CONFIG_TI_CPSW_PHY_SEL is not set
-CONFIG_TI_CPSW_ALE=m
 CONFIG_TLAN=m
 CONFIG_NET_VENDOR_VIA=y
 CONFIG_VIA_RHINE=m
@@ -2766,6 +2908,7 @@ CONFIG_WIZNET_W5300=m
 CONFIG_WIZNET_BUS_ANY=y
 CONFIG_WIZNET_W5100_SPI=m
 CONFIG_NET_VENDOR_XILINX=y
+CONFIG_XILINX_LL_TEMAC=m
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
 CONFIG_MDIO_DEVICE=y
@@ -2819,6 +2962,7 @@ CONFIG_MICROCHIP_PHY=m
 CONFIG_MICROCHIP_T1_PHY=m
 CONFIG_MICROSEMI_PHY=m
 CONFIG_NATIONAL_PHY=m
+# CONFIG_NXP_TJA11XX_PHY is not set
 CONFIG_QSEMI_PHY=m
 CONFIG_REALTEK_PHY=m
 CONFIG_RENESAS_PHY=m
@@ -3015,6 +3159,8 @@ CONFIG_IWL3945=m
 #
 # CONFIG_IWLEGACY_DEBUG is not set
 CONFIG_IWLEGACY_DEBUGFS=y
+# end of iwl3945 / iwl4965 Debugging Options
+
 CONFIG_IWLWIFI=m
 CONFIG_IWLWIFI_LEDS=y
 CONFIG_IWLDVM=m
@@ -3029,6 +3175,8 @@ CONFIG_IWLWIFI_PCIE_RTPM=y
 # CONFIG_IWLWIFI_DEBUG is not set
 # CONFIG_IWLWIFI_DEBUGFS is not set
 # CONFIG_IWLWIFI_DEVICE_TRACING is not set
+# end of Debugging Options
+
 CONFIG_WLAN_VENDOR_INTERSIL=y
 CONFIG_HOSTAP=m
 CONFIG_HOSTAP_FIRMWARE=y
@@ -3079,6 +3227,7 @@ CONFIG_MT76x2_COMMON=m
 # CONFIG_MT76x2E is not set
 CONFIG_MT76x2U=m
 CONFIG_MT7603E=m
+CONFIG_MT7615E=m
 CONFIG_WLAN_VENDOR_RALINK=y
 CONFIG_RT2X00=m
 CONFIG_RT2400PCI=m
@@ -3132,6 +3281,13 @@ CONFIG_RTL8723_COMMON=m
 CONFIG_RTLBTCOEXIST=m
 CONFIG_RTL8XXXU=m
 # CONFIG_RTL8XXXU_UNTESTED is not set
+CONFIG_RTW88=m
+CONFIG_RTW88_CORE=m
+CONFIG_RTW88_PCI=m
+CONFIG_RTW88_8822BE=y
+CONFIG_RTW88_8822CE=y
+# CONFIG_RTW88_DEBUG is not set
+# CONFIG_RTW88_DEBUGFS is not set
 CONFIG_WLAN_VENDOR_RSI=y
 CONFIG_RSI_91X=m
 CONFIG_RSI_DEBUGFS=y
@@ -3169,6 +3325,8 @@ CONFIG_VIRT_WIFI=m
 CONFIG_WIMAX_I2400M=m
 CONFIG_WIMAX_I2400M_USB=m
 CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
+# end of WiMAX Wireless Broadband devices
+
 # CONFIG_WAN is not set
 CONFIG_IEEE802154_DRIVERS=m
 CONFIG_IEEE802154_FAKELB=m
@@ -3217,6 +3375,7 @@ CONFIG_KEYBOARD_ADC=m
 CONFIG_KEYBOARD_ADP5588=m
 CONFIG_KEYBOARD_ADP5589=m
 CONFIG_KEYBOARD_ATKBD=y
+CONFIG_KEYBOARD_QT1050=m
 CONFIG_KEYBOARD_QT1070=m
 CONFIG_KEYBOARD_QT2160=m
 # CONFIG_KEYBOARD_DLINK_DIR685 is not set
@@ -3282,8 +3441,8 @@ CONFIG_JOYSTICK_INTERACT=m
 CONFIG_JOYSTICK_SIDEWINDER=m
 CONFIG_JOYSTICK_TMDC=m
 CONFIG_JOYSTICK_IFORCE=m
-CONFIG_JOYSTICK_IFORCE_USB=y
-CONFIG_JOYSTICK_IFORCE_232=y
+CONFIG_JOYSTICK_IFORCE_USB=m
+CONFIG_JOYSTICK_IFORCE_232=m
 CONFIG_JOYSTICK_WARRIOR=m
 CONFIG_JOYSTICK_MAGELLAN=m
 CONFIG_JOYSTICK_SPACEORB=m
@@ -3415,6 +3574,7 @@ CONFIG_TOUCHSCREEN_ZET6223=m
 CONFIG_TOUCHSCREEN_ZFORCE=m
 CONFIG_TOUCHSCREEN_COLIBRI_VF50=m
 CONFIG_TOUCHSCREEN_ROHM_BU21023=m
+CONFIG_TOUCHSCREEN_IQS5XX=m
 CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_88PM860X_ONKEY is not set
 # CONFIG_INPUT_88PM80X_ONKEY is not set
@@ -3427,6 +3587,7 @@ CONFIG_INPUT_BMA150=m
 CONFIG_INPUT_E3X0_BUTTON=m
 CONFIG_INPUT_MSM_VIBRATOR=m
 CONFIG_INPUT_PCSPKR=m
+CONFIG_INPUT_MAX77650_ONKEY=m
 CONFIG_INPUT_MAX77693_HAPTIC=m
 # CONFIG_INPUT_MAX8925_ONKEY is not set
 # CONFIG_INPUT_MAX8997_HAPTIC is not set
@@ -3435,6 +3596,7 @@ CONFIG_INPUT_MMA8450=m
 CONFIG_INPUT_GP2A=m
 CONFIG_INPUT_GPIO_BEEPER=m
 CONFIG_INPUT_GPIO_DECODER=m
+CONFIG_INPUT_GPIO_VIBRA=m
 CONFIG_INPUT_CPCAP_PWRBUTTON=m
 CONFIG_INPUT_ATI_REMOTE2=m
 CONFIG_INPUT_KEYSPAN_REMOTE=m
@@ -3505,7 +3667,6 @@ CONFIG_SERIO_ALTERA_PS2=m
 CONFIG_SERIO_PS2MULT=m
 CONFIG_SERIO_ARC_PS2=m
 CONFIG_SERIO_APBPS2=m
-CONFIG_SERIO_OLPC_APSP=m
 CONFIG_SERIO_GPIO_PS2=m
 CONFIG_USERIO=m
 CONFIG_GAMEPORT=m
@@ -3513,6 +3674,8 @@ CONFIG_GAMEPORT_NS558=m
 CONFIG_GAMEPORT_L4=m
 CONFIG_GAMEPORT_EMU10K1=m
 CONFIG_GAMEPORT_FM801=m
+# end of Hardware I/O ports
+# end of Input device support
 
 #
 # Character devices
@@ -3542,6 +3705,7 @@ CONFIG_N_GSM=m
 CONFIG_TRACE_ROUTER=m
 CONFIG_TRACE_SINK=m
 # CONFIG_PPC_EPAPR_HV_BYTECHAN is not set
+CONFIG_NULL_TTY=m
 CONFIG_LDISC_AUTOLOAD=y
 CONFIG_DEVMEM=y
 # CONFIG_DEVKMEM is not set
@@ -3583,6 +3747,7 @@ CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_SERIAL_ICOM=m
 CONFIG_SERIAL_JSM=m
+CONFIG_SERIAL_SIFIVE=m
 CONFIG_SERIAL_SCCNXP=y
 CONFIG_SERIAL_SCCNXP_CONSOLE=y
 # CONFIG_SERIAL_SC16IS7XX is not set
@@ -3599,6 +3764,9 @@ CONFIG_SERIAL_RP2_NR_UARTS=32
 CONFIG_SERIAL_FSL_LPUART=m
 CONFIG_SERIAL_CONEXANT_DIGICOLOR=m
 # CONFIG_SERIAL_MEN_Z135 is not set
+# end of Serial drivers
+
+CONFIG_SERIAL_MCTRL_GPIO=y
 CONFIG_SERIAL_DEV_BUS=m
 CONFIG_TTY_PRINTK=m
 CONFIG_TTY_PRINTK_LEVEL=6
@@ -3625,6 +3793,7 @@ CONFIG_IPMI_SSIF=m
 CONFIG_IPMI_POWERNV=m
 CONFIG_IPMI_WATCHDOG=m
 CONFIG_IPMI_POWEROFF=m
+# CONFIG_IPMB_DEVICE_INTERFACE is not set
 CONFIG_HW_RANDOM=m
 CONFIG_HW_RANDOM_TIMERIOMEM=m
 CONFIG_HW_RANDOM_VIRTIO=m
@@ -3653,6 +3822,8 @@ CONFIG_DEVPORT=y
 CONFIG_XILLYBUS=m
 CONFIG_XILLYBUS_PCIE=m
 CONFIG_XILLYBUS_OF=m
+# end of Character devices
+
 # CONFIG_RANDOM_TRUST_CPU is not set
 
 #
@@ -3677,6 +3848,8 @@ CONFIG_I2C_MUX_PINCTRL=m
 CONFIG_I2C_MUX_REG=m
 CONFIG_I2C_DEMUX_PINCTRL=m
 CONFIG_I2C_MUX_MLXCPLD=m
+# end of Multiplexer I2C Chip support
+
 CONFIG_I2C_HELPER_AUTO=y
 CONFIG_I2C_SMBUS=m
 CONFIG_I2C_ALGOBIT=m
@@ -3739,12 +3912,16 @@ CONFIG_I2C_VIPERBOARD=m
 #
 CONFIG_I2C_OPAL=y
 CONFIG_I2C_FSI=m
+# end of I2C Hardware Bus support
+
 # CONFIG_I2C_STUB is not set
 CONFIG_I2C_SLAVE=y
 CONFIG_I2C_SLAVE_EEPROM=m
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
+# end of I2C support
+
 CONFIG_I3C=m
 CONFIG_CDNS_I3C_MASTER=m
 CONFIG_DW_I3C_MASTER=m
@@ -3825,6 +4002,8 @@ CONFIG_PTP_1588_CLOCK=y
 #
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
+# end of PTP clock support
+
 CONFIG_PINCTRL=y
 CONFIG_GENERIC_PINCTRL_GROUPS=y
 CONFIG_PINMUX=y
@@ -3838,6 +4017,7 @@ CONFIG_PINCTRL_AMD=y
 CONFIG_PINCTRL_MCP23S08=m
 CONFIG_PINCTRL_SINGLE=y
 CONFIG_PINCTRL_SX150X=y
+CONFIG_PINCTRL_STMFX=m
 CONFIG_PINCTRL_MAX77620=m
 CONFIG_PINCTRL_PALMAS=m
 CONFIG_PINCTRL_RK805=m
@@ -3869,11 +4049,11 @@ CONFIG_GPIO_GRGPIO=m
 CONFIG_GPIO_HLWD=m
 CONFIG_GPIO_MB86S7X=m
 CONFIG_GPIO_MENZ127=m
-CONFIG_GPIO_MOCKUP=m
 CONFIG_GPIO_SAMA5D2_PIOBU=m
 CONFIG_GPIO_SYSCON=m
 CONFIG_GPIO_XILINX=y
 CONFIG_GPIO_AMD_FCH=m
+# end of Memory mapped GPIO drivers
 
 #
 # I2C GPIO expanders
@@ -3886,6 +4066,7 @@ CONFIG_GPIO_MAX732X=m
 CONFIG_GPIO_PCA953X=m
 CONFIG_GPIO_PCF857X=m
 CONFIG_GPIO_TPIC2810=m
+# end of I2C GPIO expanders
 
 #
 # MFD GPIO expanders
@@ -3903,6 +4084,7 @@ CONFIG_GPIO_LP873X=m
 CONFIG_GPIO_LP87565=m
 CONFIG_GPIO_MADERA=m
 CONFIG_GPIO_MAX77620=m
+CONFIG_GPIO_MAX77650=m
 CONFIG_GPIO_PALMAS=y
 CONFIG_GPIO_RC5T583=y
 CONFIG_GPIO_STMPE=y
@@ -3919,6 +4101,7 @@ CONFIG_GPIO_UCB1400=m
 CONFIG_GPIO_WM831X=m
 CONFIG_GPIO_WM8350=m
 CONFIG_GPIO_WM8994=m
+# end of MFD GPIO expanders
 
 #
 # PCI GPIO expanders
@@ -3926,6 +4109,7 @@ CONFIG_GPIO_WM8994=m
 CONFIG_GPIO_PCI_IDIO_16=m
 CONFIG_GPIO_PCIE_IDIO_24=m
 CONFIG_GPIO_RDC321X=m
+# end of PCI GPIO expanders
 
 #
 # SPI GPIO expanders
@@ -3936,11 +4120,15 @@ CONFIG_GPIO_MAX7301=m
 CONFIG_GPIO_MC33880=m
 CONFIG_GPIO_PISOSR=m
 CONFIG_GPIO_XRA1403=m
+# end of SPI GPIO expanders
 
 #
 # USB GPIO expanders
 #
 CONFIG_GPIO_VIPERBOARD=m
+# end of USB GPIO expanders
+
+CONFIG_GPIO_MOCKUP=m
 CONFIG_W1=m
 CONFIG_W1_CON=y
 
@@ -3952,6 +4140,7 @@ CONFIG_W1_MASTER_DS2490=m
 CONFIG_W1_MASTER_DS2482=m
 CONFIG_W1_MASTER_DS1WM=m
 CONFIG_W1_MASTER_GPIO=m
+# end of 1-wire Bus Masters
 
 #
 # 1-wire Slaves
@@ -3973,10 +4162,13 @@ CONFIG_W1_SLAVE_DS2780=m
 CONFIG_W1_SLAVE_DS2781=m
 CONFIG_W1_SLAVE_DS28E04=m
 CONFIG_W1_SLAVE_DS28E17=m
+# end of 1-wire Slaves
+
 CONFIG_POWER_AVS=y
 # CONFIG_POWER_RESET is not set
 CONFIG_POWER_SUPPLY=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
+CONFIG_POWER_SUPPLY_HWMON=y
 CONFIG_PDA_POWER=m
 CONFIG_GENERIC_ADC_BATTERY=m
 # CONFIG_MAX8925_POWER is not set
@@ -4018,9 +4210,10 @@ CONFIG_CHARGER_MAX8903=m
 CONFIG_CHARGER_LP8727=m
 CONFIG_CHARGER_GPIO=m
 CONFIG_CHARGER_MANAGER=y
-# CONFIG_CHARGER_LTC3651 is not set
+CONFIG_CHARGER_LT3651=m
 # CONFIG_CHARGER_MAX14577 is not set
 CONFIG_CHARGER_DETECTOR_MAX14656=m
+CONFIG_CHARGER_MAX77650=m
 # CONFIG_CHARGER_MAX77693 is not set
 # CONFIG_CHARGER_MAX8997 is not set
 # CONFIG_CHARGER_MAX8998 is not set
@@ -4034,6 +4227,7 @@ CONFIG_CHARGER_SMB347=m
 CONFIG_BATTERY_GAUGE_LTC2941=m
 CONFIG_BATTERY_RT5033=m
 CONFIG_CHARGER_RT9455=m
+CONFIG_CHARGER_UCS1002=m
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
@@ -4125,15 +4319,15 @@ CONFIG_SENSORS_NTC_THERMISTOR=m
 CONFIG_SENSORS_NCT7802=m
 CONFIG_SENSORS_NCT7904=m
 CONFIG_SENSORS_NPCM7XX=m
-CONFIG_SENSORS_OCC_P8_I2C=m
-CONFIG_SENSORS_OCC_P9_SBE=m
-CONFIG_SENSORS_OCC=y
 CONFIG_SENSORS_PCF8591=m
 CONFIG_PMBUS=m
 CONFIG_SENSORS_PMBUS=m
 CONFIG_SENSORS_ADM1275=m
 CONFIG_SENSORS_IBM_CFFPS=m
 # CONFIG_SENSORS_IR35221 is not set
+CONFIG_SENSORS_IR38064=m
+# CONFIG_SENSORS_IRPS5401 is not set
+CONFIG_SENSORS_ISL68137=m
 CONFIG_SENSORS_LM25066=m
 # CONFIG_SENSORS_LTC2978 is not set
 CONFIG_SENSORS_LTC3815=m
@@ -4142,6 +4336,7 @@ CONFIG_SENSORS_MAX20751=m
 CONFIG_SENSORS_MAX31785=m
 CONFIG_SENSORS_MAX34440=m
 CONFIG_SENSORS_MAX8688=m
+# CONFIG_SENSORS_PXE1610 is not set
 # CONFIG_SENSORS_TPS40422 is not set
 CONFIG_SENSORS_TPS53679=m
 CONFIG_SENSORS_UCD9000=m
@@ -4205,6 +4400,7 @@ CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
 CONFIG_CPU_THERMAL=y
 CONFIG_DEVFREQ_THERMAL=y
 CONFIG_THERMAL_EMULATION=y
+CONFIG_THERMAL_MMIO=m
 CONFIG_MAX77620_THERMAL=m
 CONFIG_QORIQ_THERMAL=m
 CONFIG_DA9062_THERMAL=m
@@ -4213,8 +4409,14 @@ CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_CORE=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
 CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
+CONFIG_WATCHDOG_OPEN_TIMEOUT=0
 CONFIG_WATCHDOG_SYSFS=y
 
+#
+# Watchdog Pretimeout Governors
+#
+# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
+
 #
 # Watchdog Device Drivers
 #
@@ -4254,11 +4456,6 @@ CONFIG_WDTPCI=m
 # USB-based Watchdog Cards
 #
 CONFIG_USBPCWATCHDOG=m
-
-#
-# Watchdog Pretimeout Governors
-#
-# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
 CONFIG_SSB_POSSIBLE=y
 CONFIG_SSB=m
 CONFIG_SSB_SPROM=y
@@ -4301,9 +4498,11 @@ CONFIG_MFD_AXP20X_I2C=m
 CONFIG_MFD_MADERA=m
 CONFIG_MFD_MADERA_I2C=m
 CONFIG_MFD_MADERA_SPI=m
+# CONFIG_MFD_CS47L15 is not set
 CONFIG_MFD_CS47L35=y
 CONFIG_MFD_CS47L85=y
 CONFIG_MFD_CS47L90=y
+# CONFIG_MFD_CS47L92 is not set
 CONFIG_PMIC_DA903X=y
 CONFIG_PMIC_DA9052=y
 CONFIG_MFD_DA9052_SPI=y
@@ -4328,6 +4527,7 @@ CONFIG_MFD_88PM805=m
 CONFIG_MFD_88PM860X=y
 CONFIG_MFD_MAX14577=m
 CONFIG_MFD_MAX77620=y
+CONFIG_MFD_MAX77650=m
 CONFIG_MFD_MAX77686=y
 CONFIG_MFD_MAX77693=m
 CONFIG_MFD_MAX77843=y
@@ -4366,6 +4566,8 @@ CONFIG_MFD_STMPE=y
 #
 CONFIG_STMPE_I2C=y
 CONFIG_STMPE_SPI=y
+# end of STMicroelectronics STMPE Interface Drivers
+
 CONFIG_MFD_SYSCON=y
 CONFIG_MFD_TI_AM335X_TSCADC=m
 CONFIG_MFD_LP3943=m
@@ -4412,8 +4614,12 @@ CONFIG_MFD_WM8350=y
 CONFIG_MFD_WM8350_I2C=y
 CONFIG_MFD_WM8994=m
 # CONFIG_MFD_ROHM_BD718XX is not set
+# CONFIG_MFD_ROHM_BD70528 is not set
 CONFIG_MFD_STPMIC1=m
+CONFIG_MFD_STMFX=m
 # CONFIG_RAVE_SP_CORE is not set
+# end of Multifunction device drivers
+
 CONFIG_REGULATOR=y
 # CONFIG_REGULATOR_DEBUG is not set
 CONFIG_REGULATOR_FIXED_VOLTAGE=m
@@ -4462,6 +4668,7 @@ CONFIG_REGULATOR_LTC3676=m
 CONFIG_REGULATOR_MAX14577=m
 CONFIG_REGULATOR_MAX1586=m
 CONFIG_REGULATOR_MAX77620=m
+CONFIG_REGULATOR_MAX77650=m
 CONFIG_REGULATOR_MAX8649=m
 CONFIG_REGULATOR_MAX8660=m
 CONFIG_REGULATOR_MAX8907=m
@@ -4494,6 +4701,7 @@ CONFIG_REGULATOR_RK808=m
 CONFIG_REGULATOR_RN5T618=m
 CONFIG_REGULATOR_RT5033=m
 CONFIG_REGULATOR_SKY81452=m
+# CONFIG_REGULATOR_SLG51000 is not set
 CONFIG_REGULATOR_STPMIC1=m
 CONFIG_REGULATOR_SY8106A=m
 CONFIG_REGULATOR_TPS51632=m
@@ -4700,6 +4908,7 @@ CONFIG_DVB_USB_DIBUSB_MC=m
 CONFIG_DVB_USB_DIB0700=m
 CONFIG_DVB_USB_UMT_010=m
 CONFIG_DVB_USB_CXUSB=m
+# CONFIG_DVB_USB_CXUSB_ANALOG is not set
 CONFIG_DVB_USB_M920X=m
 CONFIG_DVB_USB_DIGITV=m
 CONFIG_DVB_USB_VP7045=m
@@ -4798,7 +5007,6 @@ CONFIG_VIDEO_SAA7134_RC=y
 CONFIG_VIDEO_SAA7134_DVB=m
 CONFIG_VIDEO_SAA7134_GO7007=m
 CONFIG_VIDEO_SAA7164=m
-# CONFIG_VIDEO_COBALT is not set
 
 #
 # Media digital TV PCI Adapters
@@ -4826,7 +5034,6 @@ CONFIG_DVB_DDBRIDGE=m
 CONFIG_DVB_SMIPCIE=m
 CONFIG_DVB_NETUP_UNIDVB=m
 CONFIG_V4L_PLATFORM_DRIVERS=y
-CONFIG_VIDEO_CAFE_CCIC=m
 # CONFIG_VIDEO_CADENCE is not set
 CONFIG_VIDEO_ASPEED=m
 CONFIG_VIDEO_MUX=m
@@ -4871,6 +5078,7 @@ CONFIG_RADIO_WL1273=m
 # Texas Instruments WL128x FM driver (ST based)
 #
 CONFIG_RADIO_WL128X=m
+# end of Texas Instruments WL128x FM driver (ST based)
 
 #
 # Supported FireWire (IEEE 1394) Adapters
@@ -4905,18 +5113,24 @@ CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
 CONFIG_MEDIA_ATTACH=y
 CONFIG_VIDEO_IR_I2C=m
 
+#
+# I2C Encoders, decoders, sensors and other helper chips
+#
+
 #
 # Audio decoders, processors and mixers
 #
 CONFIG_VIDEO_TVAUDIO=m
 CONFIG_VIDEO_TDA7432=m
 CONFIG_VIDEO_TDA9840=m
+# CONFIG_VIDEO_TDA1997X is not set
 CONFIG_VIDEO_TEA6415C=m
 CONFIG_VIDEO_TEA6420=m
 CONFIG_VIDEO_MSP3400=m
 CONFIG_VIDEO_CS3308=m
 CONFIG_VIDEO_CS5345=m
 CONFIG_VIDEO_CS53L32A=m
+# CONFIG_VIDEO_TLV320AIC23B is not set
 CONFIG_VIDEO_UDA1342=m
 CONFIG_VIDEO_WM8775=m
 CONFIG_VIDEO_WM8739=m
@@ -4931,11 +5145,27 @@ CONFIG_VIDEO_SAA6588=m
 #
 # Video decoders
 #
+# CONFIG_VIDEO_ADV7180 is not set
+# CONFIG_VIDEO_ADV7183 is not set
+# CONFIG_VIDEO_ADV748X is not set
+# CONFIG_VIDEO_ADV7604 is not set
+# CONFIG_VIDEO_ADV7842 is not set
+# CONFIG_VIDEO_BT819 is not set
+# CONFIG_VIDEO_BT856 is not set
+# CONFIG_VIDEO_BT866 is not set
+# CONFIG_VIDEO_KS0127 is not set
+# CONFIG_VIDEO_ML86V7667 is not set
+# CONFIG_VIDEO_SAA7110 is not set
 CONFIG_VIDEO_SAA711X=m
+# CONFIG_VIDEO_TC358743 is not set
+# CONFIG_VIDEO_TVP514X is not set
 CONFIG_VIDEO_TVP5150=m
+# CONFIG_VIDEO_TVP7002 is not set
 CONFIG_VIDEO_TW2804=m
 CONFIG_VIDEO_TW9903=m
 CONFIG_VIDEO_TW9906=m
+# CONFIG_VIDEO_TW9910 is not set
+# CONFIG_VIDEO_VPX3220 is not set
 
 #
 # Video and audio decoders
@@ -4947,18 +5177,77 @@ CONFIG_VIDEO_CX25840=m
 # Video encoders
 #
 CONFIG_VIDEO_SAA7127=m
+# CONFIG_VIDEO_SAA7185 is not set
+# CONFIG_VIDEO_ADV7170 is not set
+# CONFIG_VIDEO_ADV7175 is not set
+# CONFIG_VIDEO_ADV7343 is not set
+# CONFIG_VIDEO_ADV7393 is not set
+# CONFIG_VIDEO_AD9389B is not set
+# CONFIG_VIDEO_AK881X is not set
+# CONFIG_VIDEO_THS8200 is not set
 
 #
 # Camera sensor devices
 #
+# CONFIG_VIDEO_IMX214 is not set
+# CONFIG_VIDEO_IMX258 is not set
+# CONFIG_VIDEO_IMX274 is not set
+# CONFIG_VIDEO_IMX319 is not set
+# CONFIG_VIDEO_IMX355 is not set
 CONFIG_VIDEO_OV2640=m
+# CONFIG_VIDEO_OV2659 is not set
+# CONFIG_VIDEO_OV2680 is not set
+# CONFIG_VIDEO_OV2685 is not set
+# CONFIG_VIDEO_OV5640 is not set
+# CONFIG_VIDEO_OV5645 is not set
+# CONFIG_VIDEO_OV5647 is not set
+# CONFIG_VIDEO_OV6650 is not set
+# CONFIG_VIDEO_OV5670 is not set
+# CONFIG_VIDEO_OV5695 is not set
+# CONFIG_VIDEO_OV7251 is not set
+# CONFIG_VIDEO_OV772X is not set
 CONFIG_VIDEO_OV7640=m
 CONFIG_VIDEO_OV7670=m
+# CONFIG_VIDEO_OV7740 is not set
+# CONFIG_VIDEO_OV8856 is not set
+# CONFIG_VIDEO_OV9640 is not set
+# CONFIG_VIDEO_OV9650 is not set
+# CONFIG_VIDEO_OV13858 is not set
+# CONFIG_VIDEO_VS6624 is not set
+# CONFIG_VIDEO_MT9M001 is not set
+# CONFIG_VIDEO_MT9M032 is not set
+# CONFIG_VIDEO_MT9M111 is not set
+# CONFIG_VIDEO_MT9P031 is not set
+# CONFIG_VIDEO_MT9T001 is not set
+# CONFIG_VIDEO_MT9T112 is not set
 CONFIG_VIDEO_MT9V011=m
+# CONFIG_VIDEO_MT9V032 is not set
+# CONFIG_VIDEO_MT9V111 is not set
+# CONFIG_VIDEO_SR030PC30 is not set
+# CONFIG_VIDEO_NOON010PC30 is not set
+# CONFIG_VIDEO_M5MOLS is not set
+# CONFIG_VIDEO_RJ54N1 is not set
+# CONFIG_VIDEO_S5K6AA is not set
+# CONFIG_VIDEO_S5K6A3 is not set
+# CONFIG_VIDEO_S5K4ECGX is not set
+# CONFIG_VIDEO_S5K5BAF is not set
+# CONFIG_VIDEO_ET8EK8 is not set
+# CONFIG_VIDEO_S5C73M3 is not set
+
+#
+# Lens drivers
+#
+# CONFIG_VIDEO_AD5820 is not set
+# CONFIG_VIDEO_AK7375 is not set
+# CONFIG_VIDEO_DW9714 is not set
+# CONFIG_VIDEO_DW9807_VCM is not set
 
 #
 # Flash devices
 #
+# CONFIG_VIDEO_ADP1653 is not set
+# CONFIG_VIDEO_LM3560 is not set
+# CONFIG_VIDEO_LM3646 is not set
 
 #
 # Video improvement chips
@@ -4978,13 +5267,29 @@ CONFIG_VIDEO_SAA6752HS=m
 #
 # Miscellaneous helper chips
 #
+# CONFIG_VIDEO_THS7303 is not set
 CONFIG_VIDEO_M52790=m
+# CONFIG_VIDEO_I2C is not set
+# CONFIG_VIDEO_ST_MIPID02 is not set
+# end of I2C Encoders, decoders, sensors and other helper chips
+
+#
+# SPI helper chips
+#
+# CONFIG_VIDEO_GS1662 is not set
+# end of SPI helper chips
 
 #
 # Media SPI Adapters
 #
 # CONFIG_CXD2880_SPI_DRV is not set
+# end of Media SPI Adapters
+
 CONFIG_MEDIA_TUNER=m
+
+#
+# Customize TV tuners
+#
 CONFIG_MEDIA_TUNER_SIMPLE=m
 CONFIG_MEDIA_TUNER_TDA18250=m
 CONFIG_MEDIA_TUNER_TDA8290=m
@@ -4993,6 +5298,7 @@ CONFIG_MEDIA_TUNER_TDA18271=m
 CONFIG_MEDIA_TUNER_TDA9887=m
 CONFIG_MEDIA_TUNER_TEA5761=m
 CONFIG_MEDIA_TUNER_TEA5767=m
+# CONFIG_MEDIA_TUNER_MSI001 is not set
 CONFIG_MEDIA_TUNER_MT20XX=m
 CONFIG_MEDIA_TUNER_MT2060=m
 CONFIG_MEDIA_TUNER_MT2063=m
@@ -5021,6 +5327,11 @@ CONFIG_MEDIA_TUNER_R820T=m
 CONFIG_MEDIA_TUNER_MXL301RF=m
 CONFIG_MEDIA_TUNER_QM1D1C0042=m
 CONFIG_MEDIA_TUNER_QM1D1B0004=m
+# end of Customize TV tuners
+
+#
+# Customise DVB Frontends
+#
 
 #
 # Multistandard (satellite) frontends
@@ -5081,6 +5392,7 @@ CONFIG_DVB_SP8870=m
 CONFIG_DVB_SP887X=m
 CONFIG_DVB_CX22700=m
 CONFIG_DVB_CX22702=m
+# CONFIG_DVB_S5H1432 is not set
 CONFIG_DVB_DRXD=m
 CONFIG_DVB_L64781=m
 CONFIG_DVB_TDA1004X=m
@@ -5091,6 +5403,7 @@ CONFIG_DVB_DIB3000MB=m
 CONFIG_DVB_DIB3000MC=m
 CONFIG_DVB_DIB7000M=m
 CONFIG_DVB_DIB7000P=m
+# CONFIG_DVB_DIB9000 is not set
 CONFIG_DVB_TDA10048=m
 CONFIG_DVB_AF9013=m
 CONFIG_DVB_EC100=m
@@ -5103,6 +5416,7 @@ CONFIG_DVB_SI2168=m
 CONFIG_DVB_AS102_FE=m
 CONFIG_DVB_ZD1301_DEMOD=m
 CONFIG_DVB_GP8PSK_FE=m
+# CONFIG_DVB_CXD2880 is not set
 
 #
 # DVB-C (cable) frontends
@@ -5140,6 +5454,7 @@ CONFIG_DVB_MB86A20S=m
 # ISDB-S (satellite) & ISDB-T (terrestrial) frontends
 #
 CONFIG_DVB_TC90522=m
+# CONFIG_DVB_MN88443X is not set
 
 #
 # Digital terrestrial only tuners/PLL
@@ -5153,12 +5468,14 @@ CONFIG_DVB_TUNER_DIB0090=m
 #
 CONFIG_DVB_DRX39XYJ=m
 CONFIG_DVB_LNBH25=m
+# CONFIG_DVB_LNBH29 is not set
 CONFIG_DVB_LNBP21=m
 CONFIG_DVB_LNBP22=m
 CONFIG_DVB_ISL6405=m
 CONFIG_DVB_ISL6421=m
 CONFIG_DVB_ISL6423=m
 CONFIG_DVB_A8293=m
+# CONFIG_DVB_LGS8GL5 is not set
 CONFIG_DVB_LGS8GXX=m
 CONFIG_DVB_ATBM8830=m
 CONFIG_DVB_TDA665x=m
@@ -5179,6 +5496,7 @@ CONFIG_DVB_SP2=m
 # Tools to develop new frontends
 #
 CONFIG_DVB_DUMMY_FE=m
+# end of Customise DVB Frontends
 
 #
 # Graphics support
@@ -5198,8 +5516,10 @@ CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 CONFIG_DRM_DP_CEC=y
 CONFIG_DRM_TTM=m
+CONFIG_DRM_VRAM_HELPER=m
 CONFIG_DRM_GEM_CMA_HELPER=y
 CONFIG_DRM_KMS_CMA_HELPER=y
+CONFIG_DRM_GEM_SHMEM_HELPER=y
 CONFIG_DRM_VM=y
 CONFIG_DRM_SCHED=m
 
@@ -5210,10 +5530,13 @@ CONFIG_DRM_I2C_CH7006=m
 CONFIG_DRM_I2C_SIL164=m
 CONFIG_DRM_I2C_NXP_TDA998X=m
 # CONFIG_DRM_I2C_NXP_TDA9950 is not set
+# end of I2C encoder or helper chips
 
 #
 # ARM devices
 #
+# end of ARM devices
+
 CONFIG_DRM_RADEON=m
 CONFIG_DRM_RADEON_USERPTR=y
 CONFIG_DRM_AMDGPU=m
@@ -5226,19 +5549,15 @@ CONFIG_DRM_AMDGPU_USERPTR=y
 # ACP (Audio CoProcessor) Configuration
 #
 CONFIG_DRM_AMD_ACP=y
+# end of ACP (Audio CoProcessor) Configuration
 
 #
 # Display Engine Configuration
 #
 CONFIG_DRM_AMD_DC=y
 # CONFIG_DEBUG_KERNEL_DC is not set
+# end of Display Engine Configuration
 
-#
-# AMD Library routines
-#
-CONFIG_CHASH=m
-# CONFIG_CHASH_STATS is not set
-# CONFIG_CHASH_SELFTEST is not set
 CONFIG_DRM_NOUVEAU=m
 CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT=y
 CONFIG_NOUVEAU_DEBUG=5
@@ -5248,6 +5567,7 @@ CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 # CONFIG_DRM_NOUVEAU_SVM is not set
 CONFIG_DRM_VGEM=m
 CONFIG_DRM_VKMS=m
+CONFIG_DRM_ATI_PCIGART=y
 CONFIG_DRM_UDL=m
 CONFIG_DRM_AST=m
 CONFIG_DRM_MGAG200=m
@@ -5265,6 +5585,7 @@ CONFIG_DRM_PANEL=y
 CONFIG_DRM_PANEL_ARM_VERSATILE=m
 CONFIG_DRM_PANEL_LVDS=m
 CONFIG_DRM_PANEL_SIMPLE=m
+CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D=m
 CONFIG_DRM_PANEL_ILITEK_IL9322=m
 # CONFIG_DRM_PANEL_ILITEK_ILI9881C is not set
 CONFIG_DRM_PANEL_INNOLUX_P079ZCA=m
@@ -5274,12 +5595,16 @@ CONFIG_DRM_PANEL_SAMSUNG_LD9040=m
 CONFIG_DRM_PANEL_LG_LG4573=m
 CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO=m
 CONFIG_DRM_PANEL_ORISETECH_OTM8009A=m
+# CONFIG_DRM_PANEL_OSD_OSD101T2587_53TS is not set
 CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00=m
 CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m
 CONFIG_DRM_PANEL_RAYDIUM_RM68200=m
+CONFIG_DRM_PANEL_ROCKTECH_JH057N00900=m
+CONFIG_DRM_PANEL_RONBO_RB070D30=m
 CONFIG_DRM_PANEL_SAMSUNG_S6D16D0=m
 CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2=m
 CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03=m
+# CONFIG_DRM_PANEL_SAMSUNG_S6E63M0 is not set
 CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m
 CONFIG_DRM_PANEL_SEIKO_43WVF1G=m
 CONFIG_DRM_PANEL_SHARP_LQ101R1SX01=m
@@ -5288,6 +5613,8 @@ CONFIG_DRM_PANEL_SITRONIX_ST7701=m
 CONFIG_DRM_PANEL_SITRONIX_ST7789V=m
 CONFIG_DRM_PANEL_TPO_TPG110=m
 CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA=m
+# end of Display Panels
+
 CONFIG_DRM_BRIDGE=y
 CONFIG_DRM_PANEL_BRIDGE=y
 
@@ -5317,6 +5644,8 @@ CONFIG_DRM_DW_HDMI=m
 CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
 CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
 CONFIG_DRM_DW_HDMI_CEC=m
+# end of Display Interface Bridges
+
 CONFIG_DRM_ETNAVIV=m
 CONFIG_DRM_ETNAVIV_THERMAL=y
 CONFIG_DRM_ARCPGU=m
@@ -5330,7 +5659,13 @@ CONFIG_TINYDRM_MI0283QT=m
 CONFIG_TINYDRM_REPAPER=m
 CONFIG_TINYDRM_ST7586=m
 # CONFIG_TINYDRM_ST7735R is not set
-# CONFIG_DRM_LEGACY is not set
+CONFIG_DRM_LEGACY=y
+CONFIG_DRM_TDFX=m
+CONFIG_DRM_R128=m
+CONFIG_DRM_MGA=m
+CONFIG_DRM_SIS=m
+CONFIG_DRM_VIA=m
+CONFIG_DRM_SAVAGE=m
 CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=m
 
 #
@@ -5396,7 +5731,11 @@ CONFIG_FB_IBM_GXT4500=m
 CONFIG_FB_SIMPLE=y
 CONFIG_FB_SSD1307=m
 CONFIG_FB_SM712=m
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
+# end of Frame buffer Devices
+
+#
+# Backlight & LCD device support
+#
 CONFIG_LCD_CLASS_DEVICE=m
 CONFIG_LCD_L4F00242T03=m
 CONFIG_LCD_LMS283GF05=m
@@ -5436,6 +5775,8 @@ CONFIG_BACKLIGHT_GPIO=m
 CONFIG_BACKLIGHT_LV5207LP=m
 CONFIG_BACKLIGHT_BD6107=m
 # CONFIG_BACKLIGHT_ARCXCNN is not set
+# end of Backlight & LCD device support
+
 CONFIG_VGASTATE=m
 CONFIG_VIDEOMODE_HELPERS=y
 CONFIG_HDMI=y
@@ -5454,7 +5795,11 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y
+# end of Console display driver support
+
 # CONFIG_LOGO is not set
+# end of Graphics support
+
 CONFIG_SOUND=m
 CONFIG_SOUND_OSS_CORE=y
 CONFIG_SOUND_OSS_CORE_PRECLAIM=y
@@ -5590,13 +5935,17 @@ CONFIG_SND_HDA_CODEC_CMEDIA=m
 CONFIG_SND_HDA_CODEC_SI3054=m
 CONFIG_SND_HDA_GENERIC=m
 CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1
+# end of HD-Audio
+
 CONFIG_SND_HDA_CORE=m
 CONFIG_SND_HDA_DSP_LOADER=y
+CONFIG_SND_HDA_COMPONENT=y
 CONFIG_SND_HDA_PREALLOC_SIZE=64
 CONFIG_SND_PPC=y
 CONFIG_SND_SPI=y
 CONFIG_SND_USB=y
 CONFIG_SND_USB_AUDIO=m
+CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER=y
 CONFIG_SND_USB_UA101=m
 CONFIG_SND_USB_USX2Y=m
 CONFIG_SND_USB_CAIAQ=m
@@ -5623,6 +5972,7 @@ CONFIG_SND_FIREFACE=m
 CONFIG_SND_SOC=m
 CONFIG_SND_SOC_AC97_BUS=y
 CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
+CONFIG_SND_SOC_TOPOLOGY=y
 CONFIG_SND_SOC_AMD_ACP=m
 CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m
 CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m
@@ -5638,11 +5988,14 @@ CONFIG_SND_SOC_MIKROE_PROTO=m
 #
 CONFIG_SND_SOC_FSL_ASRC=m
 CONFIG_SND_SOC_FSL_SAI=m
+CONFIG_SND_SOC_FSL_AUDMIX=m
 CONFIG_SND_SOC_FSL_SSI=m
 CONFIG_SND_SOC_FSL_SPDIF=m
 CONFIG_SND_SOC_FSL_ESAI=m
 CONFIG_SND_SOC_FSL_MICFIL=m
 CONFIG_SND_SOC_IMX_AUDMUX=m
+# end of SoC Audio for Freescale CPUs
+
 CONFIG_SND_I2S_HI6210_I2S=m
 CONFIG_SND_SOC_IMG=y
 CONFIG_SND_SOC_IMG_I2S_IN=m
@@ -5652,10 +6005,20 @@ CONFIG_SND_SOC_IMG_SPDIF_IN=m
 CONFIG_SND_SOC_IMG_SPDIF_OUT=m
 CONFIG_SND_SOC_IMG_PISTACHIO_INTERNAL_DAC=m
 CONFIG_SND_SOC_MTK_BTCVSD=m
+CONFIG_SND_SOC_SOF_TOPLEVEL=y
+CONFIG_SND_SOC_SOF_PCI=m
+CONFIG_SND_SOC_SOF_OPTIONS=m
+CONFIG_SND_SOC_SOF_NOCODEC=m
+CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT=y
+# CONFIG_SND_SOC_SOF_STRICT_ABI_CHECKS is not set
+# CONFIG_SND_SOC_SOF_DEBUG is not set
+CONFIG_SND_SOC_SOF=m
 
 #
 # STMicroelectronics STM32 SOC audio support
 #
+# end of STMicroelectronics STM32 SOC audio support
+
 CONFIG_SND_SOC_XILINX_I2S=m
 CONFIG_SND_SOC_XILINX_AUDIO_FORMATTER=m
 CONFIG_SND_SOC_XILINX_SPDIF=m
@@ -5707,6 +6070,7 @@ CONFIG_SND_SOC_CS43130=m
 CONFIG_SND_SOC_CS4341=m
 CONFIG_SND_SOC_CS4349=m
 CONFIG_SND_SOC_CS53L30=m
+# CONFIG_SND_SOC_CX2072X is not set
 CONFIG_SND_SOC_DA7219=m
 CONFIG_SND_SOC_DMIC=m
 CONFIG_SND_SOC_HDMI_CODEC=m
@@ -5777,9 +6141,6 @@ CONFIG_SND_SOC_TLV320AIC23=m
 CONFIG_SND_SOC_TLV320AIC23_I2C=m
 CONFIG_SND_SOC_TLV320AIC23_SPI=m
 CONFIG_SND_SOC_TLV320AIC31XX=m
-CONFIG_SND_SOC_TLV320AIC32X4=m
-CONFIG_SND_SOC_TLV320AIC32X4_I2C=m
-CONFIG_SND_SOC_TLV320AIC32X4_SPI=m
 CONFIG_SND_SOC_TLV320AIC3X=m
 CONFIG_SND_SOC_TS3A227E=m
 CONFIG_SND_SOC_TSCS42XX=m
@@ -5817,6 +6178,8 @@ CONFIG_SND_SOC_NAU8810=m
 CONFIG_SND_SOC_NAU8822=m
 CONFIG_SND_SOC_NAU8824=m
 CONFIG_SND_SOC_TPA6130A2=m
+# end of CODEC drivers
+
 CONFIG_SND_SIMPLE_CARD_UTILS=m
 CONFIG_SND_SIMPLE_CARD=m
 CONFIG_SND_AUDIO_GRAPH_CARD=m
@@ -5849,6 +6212,7 @@ CONFIG_HID_CHERRY=m
 CONFIG_HID_CHICONY=m
 CONFIG_HID_CORSAIR=m
 CONFIG_HID_COUGAR=m
+CONFIG_HID_MACALLY=m
 CONFIG_HID_PRODIKEYS=m
 CONFIG_HID_CMEDIA=m
 CONFIG_HID_CP2112=m
@@ -5929,6 +6293,7 @@ CONFIG_HID_THINGM=m
 CONFIG_HID_THRUSTMASTER=m
 CONFIG_THRUSTMASTER_FF=y
 CONFIG_HID_UDRAW_PS3=m
+CONFIG_HID_U2FZERO=m
 CONFIG_HID_WACOM=m
 CONFIG_HID_WIIMOTE=m
 CONFIG_HID_XINMO=m
@@ -5938,6 +6303,7 @@ CONFIG_HID_ZYDACRON=m
 CONFIG_HID_SENSOR_HUB=m
 CONFIG_HID_SENSOR_CUSTOM_SENSOR=m
 CONFIG_HID_ALPS=m
+# end of Special HID drivers
 
 #
 # USB HID support
@@ -5951,11 +6317,16 @@ CONFIG_USB_HIDDEV=y
 #
 CONFIG_USB_KBD=m
 CONFIG_USB_MOUSE=m
+# end of USB HID Boot Protocol drivers
+# end of USB HID support
 
 #
 # I2C HID support
 #
 CONFIG_I2C_HID=m
+# end of I2C HID support
+# end of HID support
+
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 CONFIG_USB_SUPPORT=y
 CONFIG_USB_COMMON=y
@@ -6202,6 +6573,8 @@ CONFIG_USB_GPIO_VBUS=m
 CONFIG_TAHVO_USB=m
 # CONFIG_TAHVO_USB_HOST_BY_DEFAULT is not set
 CONFIG_USB_ISP1301=m
+# end of USB Physical Layer drivers
+
 CONFIG_USB_GADGET=m
 # CONFIG_USB_GADGET_DEBUG is not set
 # CONFIG_USB_GADGET_DEBUG_FILES is not set
@@ -6236,6 +6609,8 @@ CONFIG_USB_GOKU=m
 CONFIG_USB_EG20T=m
 CONFIG_USB_GADGET_XILINX=m
 CONFIG_USB_DUMMY_HCD=m
+# end of USB Peripheral Controller
+
 CONFIG_USB_LIBCOMPOSITE=m
 CONFIG_USB_F_ACM=m
 CONFIG_USB_U_SERIAL=m
@@ -6316,11 +6691,15 @@ CONFIG_TYPEC_TPS6598X=m
 # USB Type-C Multiplexer/DeMultiplexer Switch support
 #
 # CONFIG_TYPEC_MUX_PI3USB30532 is not set
+# end of USB Type-C Multiplexer/DeMultiplexer Switch support
 
 #
 # USB Type-C Alternate Mode drivers
 #
 CONFIG_TYPEC_DP_ALTMODE=m
+CONFIG_TYPEC_NVIDIA_ALTMODE=m
+# end of USB Type-C Alternate Mode drivers
+
 CONFIG_USB_ROLE_SWITCH=m
 CONFIG_USB_LED_TRIG=y
 CONFIG_USB_ULPI_BUS=m
@@ -6404,6 +6783,7 @@ CONFIG_LEDS_BCM6358=m
 CONFIG_LEDS_CPCAP=m
 CONFIG_LEDS_CR0014114=m
 CONFIG_LEDS_LM3530=m
+CONFIG_LEDS_LM3532=m
 CONFIG_LEDS_LM3533=m
 CONFIG_LEDS_LM3642=m
 CONFIG_LEDS_LM3692X=m
@@ -6437,6 +6817,7 @@ CONFIG_LEDS_LT3593=m
 CONFIG_LEDS_MC13783=m
 CONFIG_LEDS_TCA6507=m
 CONFIG_LEDS_TLC591XX=m
+CONFIG_LEDS_MAX77650=m
 # CONFIG_LEDS_MAX77693 is not set
 # CONFIG_LEDS_MAX8997 is not set
 CONFIG_LEDS_LM355x=m
@@ -6453,6 +6834,8 @@ CONFIG_LEDS_POWERNV=m
 CONFIG_LEDS_SYSCON=y
 CONFIG_LEDS_MLXREG=m
 CONFIG_LEDS_USER=m
+# CONFIG_LEDS_SPI_BYTE is not set
+# CONFIG_LEDS_TI_LMU_COMMON is not set
 
 #
 # LED Triggers
@@ -6491,15 +6874,15 @@ CONFIG_INFINIBAND_MTHCA=m
 CONFIG_INFINIBAND_MTHCA_DEBUG=y
 CONFIG_INFINIBAND_CXGB3=m
 CONFIG_INFINIBAND_CXGB4=m
+CONFIG_INFINIBAND_EFA=m
 CONFIG_INFINIBAND_I40IW=m
 CONFIG_MLX4_INFINIBAND=m
 CONFIG_MLX5_INFINIBAND=m
-CONFIG_INFINIBAND_NES=m
-# CONFIG_INFINIBAND_NES_DEBUG is not set
 CONFIG_INFINIBAND_OCRDMA=m
 CONFIG_INFINIBAND_BNXT_RE=m
 CONFIG_INFINIBAND_QEDR=m
 CONFIG_RDMA_RXE=m
+# CONFIG_RDMA_SIW is not set
 CONFIG_INFINIBAND_IPOIB=m
 CONFIG_INFINIBAND_IPOIB_CM=y
 CONFIG_INFINIBAND_IPOIB_DEBUG=y
@@ -6568,6 +6951,7 @@ CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_M41T80=m
 CONFIG_RTC_DRV_M41T80_WDT=y
+# CONFIG_RTC_DRV_BD70528 is not set
 CONFIG_RTC_DRV_BQ32K=m
 CONFIG_RTC_DRV_TWL4030=m
 CONFIG_RTC_DRV_PALMAS=m
@@ -6682,6 +7066,8 @@ CONFIG_QCOM_HIDMA=m
 CONFIG_DW_DMAC_CORE=m
 CONFIG_DW_DMAC=m
 CONFIG_DW_DMAC_PCI=m
+# CONFIG_DW_EDMA is not set
+# CONFIG_DW_EDMA_PCIE is not set
 
 #
 # DMA Clients
@@ -6695,6 +7081,8 @@ CONFIG_ASYNC_TX_DMA=y
 CONFIG_SYNC_FILE=y
 # CONFIG_SW_SYNC is not set
 CONFIG_UDMABUF=y
+# end of DMABUF options
+
 CONFIG_AUXDISPLAY=y
 CONFIG_HD44780=m
 CONFIG_KS0108=m
@@ -6740,6 +7128,7 @@ CONFIG_VIRTIO=m
 CONFIG_VIRTIO_MENU=y
 CONFIG_VIRTIO_PCI=m
 CONFIG_VIRTIO_PCI_LEGACY=y
+# CONFIG_VIRTIO_PMEM is not set
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_INPUT=m
 CONFIG_VIRTIO_MMIO=m
@@ -6748,6 +7137,8 @@ CONFIG_VIRTIO_MMIO=m
 #
 # Microsoft Hyper-V guest support
 #
+# end of Microsoft Hyper-V guest support
+
 CONFIG_STAGING=y
 CONFIG_PRISM2_USB=m
 CONFIG_COMEDI=m
@@ -6843,8 +7234,6 @@ CONFIG_RTL8723BS=m
 CONFIG_R8712U=m
 CONFIG_R8188EU=m
 CONFIG_88EU_AP_MODE=y
-CONFIG_R8822BE=m
-CONFIG_RTLWIFI_DEBUG_ST=y
 CONFIG_RTS5208=m
 CONFIG_VT6655=m
 CONFIG_VT6656=m
@@ -6858,14 +7247,15 @@ CONFIG_VT6656=m
 #
 CONFIG_ADIS16203=m
 CONFIG_ADIS16240=m
+# end of Accelerometers
 
 #
 # Analog to digital converters
 #
-CONFIG_AD7780=m
 CONFIG_AD7816=m
 CONFIG_AD7192=m
 CONFIG_AD7280=m
+# end of Analog to digital converters
 
 #
 # Analog digital bi-direction converters
@@ -6873,23 +7263,27 @@ CONFIG_AD7280=m
 CONFIG_ADT7316=m
 CONFIG_ADT7316_SPI=m
 CONFIG_ADT7316_I2C=m
+# end of Analog digital bi-direction converters
 
 #
 # Capacitance to digital converters
 #
 CONFIG_AD7150=m
 CONFIG_AD7746=m
+# end of Capacitance to digital converters
 
 #
 # Direct Digital Synthesis
 #
 CONFIG_AD9832=m
 CONFIG_AD9834=m
+# end of Direct Digital Synthesis
 
 #
 # Network Analyzer, Impedance Converters
 #
 CONFIG_AD5933=m
+# end of Network Analyzer, Impedance Converters
 
 #
 # Active energy metering IC
@@ -6897,11 +7291,15 @@ CONFIG_AD5933=m
 CONFIG_ADE7854=m
 CONFIG_ADE7854_I2C=m
 CONFIG_ADE7854_SPI=m
+# end of Active energy metering IC
 
 #
 # Resolver to digital converters
 #
 CONFIG_AD2S1210=m
+# end of Resolver to digital converters
+# end of IIO staging drivers
+
 CONFIG_FB_SM750=m
 
 #
@@ -6919,6 +7317,8 @@ CONFIG_SPEAKUP_SYNTH_SOFT=m
 CONFIG_SPEAKUP_SYNTH_SPKOUT=m
 CONFIG_SPEAKUP_SYNTH_TXPRT=m
 CONFIG_SPEAKUP_SYNTH_DUMMY=m
+# end of Speakup console speech
+
 CONFIG_STAGING_MEDIA=y
 CONFIG_I2C_BCM2048=m
 
@@ -6929,6 +7329,8 @@ CONFIG_I2C_BCM2048=m
 #
 # Android
 #
+# end of Android
+
 CONFIG_LTE_GDM724X=m
 CONFIG_FIREWIRE_SERIAL=m
 CONFIG_FWTTY_MAX_TOTAL_PORTS=64
@@ -7007,6 +7409,8 @@ CONFIG_PI433=m
 #
 # Gasket devices
 #
+# end of Gasket devices
+
 CONFIG_XIL_AXIS_FIFO=m
 CONFIG_EROFS_FS=m
 # CONFIG_EROFS_FS_DEBUG is not set
@@ -7017,6 +7421,8 @@ CONFIG_EROFS_FS_SECURITY=y
 # CONFIG_EROFS_FAULT_INJECTION is not set
 CONFIG_EROFS_FS_IO_MAX_RETRIES=5
 # CONFIG_EROFS_FS_ZIP is not set
+# CONFIG_FIELDBUS_DEV is not set
+# CONFIG_KPC2000 is not set
 CONFIG_HWSPINLOCK=y
 
 #
@@ -7024,6 +7430,8 @@ CONFIG_HWSPINLOCK=y
 #
 CONFIG_I8253_LOCK=y
 CONFIG_CLKBLD_I8253=y
+# end of Clock Source drivers
+
 CONFIG_MAILBOX=y
 CONFIG_PLATFORM_MHU=m
 CONFIG_ALTERA_MBOX=m
@@ -7034,6 +7442,8 @@ CONFIG_IOMMU_SUPPORT=y
 #
 # Generic IOMMU Pagetable Support
 #
+# end of Generic IOMMU Pagetable Support
+
 # CONFIG_IOMMU_DEBUGFS is not set
 # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
 CONFIG_OF_IOMMU=y
@@ -7043,6 +7453,7 @@ CONFIG_SPAPR_TCE_IOMMU=y
 # Remoteproc drivers
 #
 CONFIG_REMOTEPROC=m
+# end of Remoteproc drivers
 
 #
 # Rpmsg drivers
@@ -7051,6 +7462,8 @@ CONFIG_RPMSG=m
 CONFIG_RPMSG_CHAR=m
 # CONFIG_RPMSG_QCOM_GLINK_RPM is not set
 CONFIG_RPMSG_VIRTIO=m
+# end of Rpmsg drivers
+
 # CONFIG_SOUNDWIRE is not set
 
 #
@@ -7060,29 +7473,43 @@ CONFIG_RPMSG_VIRTIO=m
 #
 # Amlogic SoC drivers
 #
+# end of Amlogic SoC drivers
+
+#
+# Aspeed SoC drivers
+#
+# end of Aspeed SoC drivers
 
 #
 # Broadcom SoC drivers
 #
+# end of Broadcom SoC drivers
 
 #
 # NXP/Freescale QorIQ SoC drivers
 #
 CONFIG_FSL_GUTS=y
+# end of NXP/Freescale QorIQ SoC drivers
 
 #
 # i.MX SoC drivers
 #
+# end of i.MX SoC drivers
 
 #
 # Qualcomm SoC drivers
 #
+# end of Qualcomm SoC drivers
+
 CONFIG_SOC_TI=y
 
 #
 # Xilinx SoC drivers
 #
 CONFIG_XILINX_VCU=m
+# end of Xilinx SoC drivers
+# end of SOC (System On Chip) specific Drivers
+
 CONFIG_PM_DEVFREQ=y
 
 #
@@ -7105,6 +7532,7 @@ CONFIG_EXTCON=y
 #
 CONFIG_EXTCON_ADC_JACK=m
 CONFIG_EXTCON_ARIZONA=m
+# CONFIG_EXTCON_FSA9480 is not set
 CONFIG_EXTCON_GPIO=m
 CONFIG_EXTCON_MAX14577=m
 CONFIG_EXTCON_MAX3355=m
@@ -7171,6 +7599,7 @@ CONFIG_MXC6255=m
 CONFIG_SCA3000=m
 CONFIG_STK8312=m
 CONFIG_STK8BA50=m
+# end of Accelerometers
 
 #
 # Analog to digital converters
@@ -7186,6 +7615,7 @@ CONFIG_AD7606_IFACE_PARALLEL=m
 CONFIG_AD7606_IFACE_SPI=m
 CONFIG_AD7766=m
 CONFIG_AD7768_1=m
+CONFIG_AD7780=m
 CONFIG_AD7791=m
 CONFIG_AD7793=m
 CONFIG_AD7887=m
@@ -7231,6 +7661,7 @@ CONFIG_TI_ADC128S052=m
 CONFIG_TI_ADC161S626=m
 CONFIG_TI_ADS1015=m
 CONFIG_TI_ADS7950=m
+CONFIG_TI_ADS8344=m
 CONFIG_TI_ADS8688=m
 CONFIG_TI_ADS124S08=m
 CONFIG_TI_AM335X_ADC=m
@@ -7239,16 +7670,20 @@ CONFIG_TI_TLC4541=m
 # CONFIG_TWL6030_GPADC is not set
 CONFIG_VF610_ADC=m
 CONFIG_VIPERBOARD_ADC=m
+# CONFIG_XILINX_XADC is not set
+# end of Analog to digital converters
 
 #
 # Analog Front Ends
 #
 CONFIG_IIO_RESCALE=m
+# end of Analog Front Ends
 
 #
 # Amplifiers
 #
 CONFIG_AD8366=m
+# end of Amplifiers
 
 #
 # Chemical Sensors
@@ -7263,12 +7698,15 @@ CONFIG_PMS7003=m
 CONFIG_SENSIRION_SGP30=m
 CONFIG_SPS30=m
 CONFIG_VZ89X=m
+# end of Chemical Sensors
 
 #
 # Hid Sensor IIO Common
 #
 CONFIG_HID_SENSOR_IIO_COMMON=m
 CONFIG_HID_SENSOR_IIO_TRIGGER=m
+# end of Hid Sensor IIO Common
+
 CONFIG_IIO_MS_SENSORS_I2C=m
 
 #
@@ -7276,14 +7714,12 @@ CONFIG_IIO_MS_SENSORS_I2C=m
 #
 CONFIG_IIO_SSP_SENSORS_COMMONS=m
 CONFIG_IIO_SSP_SENSORHUB=m
+# end of SSP Sensor Common
+
 CONFIG_IIO_ST_SENSORS_I2C=m
 CONFIG_IIO_ST_SENSORS_SPI=m
 CONFIG_IIO_ST_SENSORS_CORE=m
 
-#
-# Counters
-#
-
 #
 # Digital to analog converters
 #
@@ -7322,6 +7758,7 @@ CONFIG_TI_DAC5571=m
 CONFIG_TI_DAC7311=m
 CONFIG_TI_DAC7612=m
 CONFIG_VF610_DAC=m
+# end of Digital to analog converters
 
 #
 # IIO dummy driver
@@ -7329,6 +7766,7 @@ CONFIG_VF610_DAC=m
 CONFIG_IIO_SIMPLE_DUMMY=m
 # CONFIG_IIO_SIMPLE_DUMMY_EVENTS is not set
 # CONFIG_IIO_SIMPLE_DUMMY_BUFFER is not set
+# end of IIO dummy driver
 
 #
 # Frequency Synthesizers DDS/PLL
@@ -7338,11 +7776,15 @@ CONFIG_IIO_SIMPLE_DUMMY=m
 # Clock Generator/Distribution
 #
 CONFIG_AD9523=m
+# end of Clock Generator/Distribution
 
 #
 # Phase-Locked Loop (PLL) frequency synthesizers
 #
 CONFIG_ADF4350=m
+# CONFIG_ADF4371 is not set
+# end of Phase-Locked Loop (PLL) frequency synthesizers
+# end of Frequency Synthesizers DDS/PLL
 
 #
 # Digital gyroscope sensors
@@ -7355,6 +7797,9 @@ CONFIG_ADXRS450=m
 CONFIG_BMG160=m
 CONFIG_BMG160_I2C=m
 CONFIG_BMG160_SPI=m
+CONFIG_FXAS21002C=m
+CONFIG_FXAS21002C_I2C=m
+CONFIG_FXAS21002C_SPI=m
 CONFIG_HID_SENSOR_GYRO_3D=m
 CONFIG_MPU3050=m
 CONFIG_MPU3050_I2C=m
@@ -7362,6 +7807,7 @@ CONFIG_IIO_ST_GYRO_3AXIS=m
 CONFIG_IIO_ST_GYRO_I2C_3AXIS=m
 CONFIG_IIO_ST_GYRO_SPI_3AXIS=m
 CONFIG_ITG3200=m
+# end of Digital gyroscope sensors
 
 #
 # Health Sensors
@@ -7374,6 +7820,8 @@ CONFIG_AFE4403=m
 CONFIG_AFE4404=m
 CONFIG_MAX30100=m
 CONFIG_MAX30102=m
+# end of Heart Rate Monitors
+# end of Health Sensors
 
 #
 # Humidity sensors
@@ -7388,6 +7836,7 @@ CONFIG_HTS221_SPI=m
 CONFIG_HTU21=m
 CONFIG_SI7005=m
 CONFIG_SI7020=m
+# end of Humidity sensors
 
 #
 # Inertial measurement units
@@ -7404,6 +7853,8 @@ CONFIG_INV_MPU6050_SPI=m
 CONFIG_IIO_ST_LSM6DSX=m
 CONFIG_IIO_ST_LSM6DSX_I2C=m
 CONFIG_IIO_ST_LSM6DSX_SPI=m
+# end of Inertial measurement units
+
 CONFIG_IIO_ADIS_LIB=m
 CONFIG_IIO_ADIS_LIB_BUFFER=y
 
@@ -7454,6 +7905,7 @@ CONFIG_VCNL4035=m
 CONFIG_VEML6070=m
 CONFIG_VL6180=m
 CONFIG_ZOPT2201=m
+# end of Light sensors
 
 #
 # Magnetometer sensors
@@ -7476,17 +7928,20 @@ CONFIG_SENSORS_HMC5843_SPI=m
 CONFIG_SENSORS_RM3100=m
 CONFIG_SENSORS_RM3100_I2C=m
 CONFIG_SENSORS_RM3100_SPI=m
+# end of Magnetometer sensors
 
 #
 # Multiplexers
 #
 CONFIG_IIO_MUX=m
+# end of Multiplexers
 
 #
 # Inclinometer sensors
 #
 CONFIG_HID_SENSOR_INCLINOMETER_3D=m
 CONFIG_HID_SENSOR_DEVICE_ROTATION=m
+# end of Inclinometer sensors
 
 #
 # Triggers - standalone
@@ -7495,6 +7950,7 @@ CONFIG_IIO_HRTIMER_TRIGGER=m
 CONFIG_IIO_INTERRUPT_TRIGGER=m
 CONFIG_IIO_TIGHTLOOP_TRIGGER=m
 CONFIG_IIO_SYSFS_TRIGGER=m
+# end of Triggers - standalone
 
 #
 # Digital potentiometers
@@ -7508,11 +7964,13 @@ CONFIG_MCP4131=m
 CONFIG_MCP4531=m
 CONFIG_MCP41010=m
 CONFIG_TPL0102=m
+# end of Digital potentiometers
 
 #
 # Digital potentiostats
 #
 CONFIG_LMP91000=m
+# end of Digital potentiostats
 
 #
 # Pressure sensors
@@ -7521,6 +7979,7 @@ CONFIG_ABP060MG=m
 CONFIG_BMP280=m
 CONFIG_BMP280_I2C=m
 CONFIG_BMP280_SPI=m
+# CONFIG_DPS310 is not set
 CONFIG_HID_SENSOR_PRESS=m
 CONFIG_HP03=m
 CONFIG_MPL115=m
@@ -7539,28 +7998,33 @@ CONFIG_HP206C=m
 CONFIG_ZPA2326=m
 CONFIG_ZPA2326_I2C=m
 CONFIG_ZPA2326_SPI=m
+# end of Pressure sensors
 
 #
 # Lightning sensors
 #
 # CONFIG_AS3935 is not set
+# end of Lightning sensors
 
 #
 # Proximity and distance sensors
 #
 CONFIG_ISL29501=m
 CONFIG_LIDAR_LITE_V2=m
+CONFIG_MB1232=m
 CONFIG_RFD77402=m
 # CONFIG_SRF04 is not set
 CONFIG_SX9500=m
 CONFIG_SRF08=m
 CONFIG_VL53L0X_I2C=m
+# end of Proximity and distance sensors
 
 #
 # Resolver to digital converters
 #
 CONFIG_AD2S90=m
 CONFIG_AD2S1200=m
+# end of Resolver to digital converters
 
 #
 # Temperature sensors
@@ -7573,7 +8037,11 @@ CONFIG_TMP006=m
 CONFIG_TMP007=m
 CONFIG_TSYS01=m
 CONFIG_TSYS02D=m
+CONFIG_MAX31856=m
+# end of Temperature sensors
+
 CONFIG_NTB=m
+# CONFIG_NTB_MSI is not set
 CONFIG_NTB_IDT=m
 CONFIG_NTB_SWITCHTEC=m
 CONFIG_NTB_PINGPONG=m
@@ -7594,18 +8062,15 @@ CONFIG_PWM_STMPE=y
 # IRQ chip support
 #
 CONFIG_IRQCHIP=y
-CONFIG_ARM_GIC_MAX_NR=1
+# CONFIG_AL_FIC is not set
 CONFIG_MADERA_IRQ=m
+# end of IRQ chip support
+
 CONFIG_IPACK_BUS=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_SERIAL_IPOCTAL=m
 CONFIG_RESET_CONTROLLER=y
 # CONFIG_RESET_TI_SYSCON is not set
-CONFIG_FMC=m
-CONFIG_FMC_FAKEDEV=m
-CONFIG_FMC_TRIVIAL=m
-CONFIG_FMC_WRITE_EEPROM=m
-CONFIG_FMC_CHARDEV=m
 
 #
 # PHY Subsystem
@@ -7617,6 +8082,7 @@ CONFIG_PHY_CADENCE_DP=m
 CONFIG_PHY_CADENCE_DPHY=m
 CONFIG_PHY_CADENCE_SIERRA=m
 CONFIG_PHY_FSL_IMX8MQ_USB=m
+# CONFIG_PHY_MIXEL_MIPI_DPHY is not set
 CONFIG_PHY_PXA_28NM_HSIC=m
 CONFIG_PHY_PXA_28NM_USB2=m
 # CONFIG_PHY_CPCAP_USB is not set
@@ -7625,6 +8091,8 @@ CONFIG_PHY_OCELOT_SERDES=m
 CONFIG_PHY_QCOM_USB_HS=m
 CONFIG_PHY_QCOM_USB_HSIC=m
 CONFIG_PHY_TUSB1210=m
+# end of PHY Subsystem
+
 CONFIG_POWERCAP=y
 CONFIG_IDLE_INJECT=y
 CONFIG_MCB=m
@@ -7634,12 +8102,16 @@ CONFIG_MCB_LPC=m
 #
 # Performance monitor support
 #
+# end of Performance monitor support
+
 CONFIG_RAS=y
 
 #
 # Android
 #
 # CONFIG_ANDROID is not set
+# end of Android
+
 CONFIG_LIBNVDIMM=y
 CONFIG_BLK_DEV_PMEM=m
 CONFIG_ND_BLK=m
@@ -7657,6 +8129,7 @@ CONFIG_DEV_DAX_PMEM=m
 CONFIG_DEV_DAX_KMEM=m
 CONFIG_DEV_DAX_PMEM_COMPAT=m
 CONFIG_NVMEM=y
+CONFIG_NVMEM_SYSFS=y
 
 #
 # HW tracing support
@@ -7675,6 +8148,8 @@ CONFIG_INTEL_TH_STH=m
 CONFIG_INTEL_TH_MSU=m
 CONFIG_INTEL_TH_PTI=m
 # CONFIG_INTEL_TH_DEBUG is not set
+# end of HW tracing support
+
 CONFIG_FPGA=m
 CONFIG_ALTERA_PR_IP_CORE=m
 CONFIG_ALTERA_PR_IP_CORE_PLAT=m
@@ -7711,10 +8186,14 @@ CONFIG_MUX_ADG792A=m
 # CONFIG_MUX_ADGS1408 is not set
 CONFIG_MUX_GPIO=m
 CONFIG_MUX_MMIO=m
+# end of Multiplexer drivers
+
 CONFIG_PM_OPP=y
 # CONFIG_SIOX is not set
 # CONFIG_SLIMBUS is not set
 CONFIG_INTERCONNECT=m
+# CONFIG_COUNTER is not set
+# end of Device Drivers
 
 #
 # File systems
@@ -7817,6 +8296,7 @@ CONFIG_FSCACHE=m
 CONFIG_CACHEFILES=m
 # CONFIG_CACHEFILES_DEBUG is not set
 # CONFIG_CACHEFILES_HISTOGRAM is not set
+# end of Caches
 
 #
 # CD-ROM/DVD Filesystems
@@ -7825,6 +8305,7 @@ CONFIG_ISO9660_FS=m
 CONFIG_JOLIET=y
 CONFIG_ZISOFS=y
 CONFIG_UDF_FS=m
+# end of CD-ROM/DVD Filesystems
 
 #
 # DOS/FAT/NT Filesystems
@@ -7838,6 +8319,7 @@ CONFIG_FAT_DEFAULT_UTF8=y
 CONFIG_NTFS_FS=m
 # CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
+# end of DOS/FAT/NT Filesystems
 
 #
 # Pseudo filesystems
@@ -7859,6 +8341,8 @@ CONFIG_HUGETLB_PAGE=y
 CONFIG_MEMFD_CREATE=y
 CONFIG_ARCH_HAS_GIGANTIC_PAGE=y
 CONFIG_CONFIGFS_FS=y
+# end of Pseudo filesystems
+
 CONFIG_MISC_FILESYSTEMS=y
 CONFIG_ORANGEFS_FS=m
 CONFIG_ADFS_FS=m
@@ -7868,7 +8352,8 @@ CONFIG_ECRYPT_FS=m
 # CONFIG_ECRYPT_FS_MESSAGING is not set
 CONFIG_HFS_FS=m
 CONFIG_HFSPLUS_FS=m
-# CONFIG_BEFS_FS is not set
+CONFIG_BEFS_FS=m
+# CONFIG_BEFS_DEBUG is not set
 # CONFIG_BFS_FS is not set
 # CONFIG_EFS_FS is not set
 CONFIG_JFFS2_FS=m
@@ -7979,12 +8464,13 @@ CONFIG_SUNRPC_GSS=m
 CONFIG_SUNRPC_BACKCHANNEL=y
 CONFIG_SUNRPC_SWAP=y
 CONFIG_RPCSEC_GSS_KRB5=m
-CONFIG_CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y
+# CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES is not set
 # CONFIG_SUNRPC_DEBUG is not set
 CONFIG_SUNRPC_XPRT_RDMA=m
 CONFIG_CEPH_FS=m
 CONFIG_CEPH_FSCACHE=y
 CONFIG_CEPH_FS_POSIX_ACL=y
+# CONFIG_CEPH_FS_SECURITY_LABEL is not set
 CONFIG_CIFS=m
 # CONFIG_CIFS_STATS2 is not set
 CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
@@ -7992,7 +8478,6 @@ CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
 CONFIG_CIFS_UPCALL=y
 CONFIG_CIFS_XATTR=y
 CONFIG_CIFS_POSIX=y
-CONFIG_CIFS_ACL=y
 # CONFIG_CIFS_DEBUG is not set
 CONFIG_CIFS_DFS_UPCALL=y
 # CONFIG_CIFS_SMB_DIRECT is not set
@@ -8059,12 +8544,16 @@ CONFIG_NLS_MAC_TURKISH=m
 CONFIG_NLS_UTF8=m
 CONFIG_DLM=m
 # CONFIG_DLM_DEBUG is not set
+CONFIG_UNICODE=y
+# CONFIG_UNICODE_NORMALIZATION_SELFTEST is not set
+# end of File systems
 
 #
 # Security options
 #
 CONFIG_KEYS=y
 CONFIG_KEYS_COMPAT=y
+# CONFIG_KEYS_REQUEST_CACHE is not set
 # CONFIG_PERSISTENT_KEYRINGS is not set
 # CONFIG_BIG_KEYS is not set
 CONFIG_TRUSTED_KEYS=m
@@ -8108,6 +8597,24 @@ CONFIG_INTEGRITY_AUDIT=y
 # CONFIG_DEFAULT_SECURITY_APPARMOR is not set
 CONFIG_DEFAULT_SECURITY_DAC=y
 CONFIG_LSM="yama,loadpin,safesetid,integrity"
+
+#
+# Kernel hardening options
+#
+
+#
+# Memory initialization
+#
+CONFIG_INIT_STACK_NONE=y
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_USER is not set
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL is not set
+# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
+# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
+# end of Memory initialization
+# end of Kernel hardening options
+# end of Security options
+
 CONFIG_XOR_BLOCKS=m
 CONFIG_ASYNC_CORE=m
 CONFIG_ASYNC_MEMCPY=m
@@ -8135,9 +8642,6 @@ CONFIG_CRYPTO_AKCIPHER=y
 CONFIG_CRYPTO_KPP2=y
 CONFIG_CRYPTO_KPP=y
 CONFIG_CRYPTO_ACOMP2=y
-CONFIG_CRYPTO_RSA=y
-CONFIG_CRYPTO_DH=y
-CONFIG_CRYPTO_ECDH=m
 CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MANAGER2=y
 CONFIG_CRYPTO_USER=m
@@ -8146,12 +8650,20 @@ CONFIG_CRYPTO_GF128MUL=m
 CONFIG_CRYPTO_NULL=m
 CONFIG_CRYPTO_NULL2=y
 CONFIG_CRYPTO_PCRYPT=m
-CONFIG_CRYPTO_WORKQUEUE=y
 CONFIG_CRYPTO_CRYPTD=m
 CONFIG_CRYPTO_AUTHENC=m
 CONFIG_CRYPTO_TEST=m
 CONFIG_CRYPTO_ENGINE=m
 
+#
+# Public-key cryptography
+#
+CONFIG_CRYPTO_RSA=y
+CONFIG_CRYPTO_DH=y
+CONFIG_CRYPTO_ECC=m
+CONFIG_CRYPTO_ECDH=m
+CONFIG_CRYPTO_ECRDSA=m
+
 #
 # Authenticated Encryption with Associated Data
 #
@@ -8196,6 +8708,7 @@ CONFIG_CRYPTO_VMAC=m
 CONFIG_CRYPTO_CRC32C=m
 CONFIG_CRYPTO_CRC32C_VPMSUM=m
 CONFIG_CRYPTO_CRC32=m
+# CONFIG_CRYPTO_XXHASH is not set
 CONFIG_CRYPTO_CRCT10DIF=y
 CONFIG_CRYPTO_CRCT10DIF_VPMSUM=m
 CONFIG_CRYPTO_VPMSUM_TESTER=m
@@ -8215,7 +8728,7 @@ CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA512=y
 CONFIG_CRYPTO_SHA3=m
 CONFIG_CRYPTO_SM3=m
-# CONFIG_CRYPTO_STREEBOG is not set
+CONFIG_CRYPTO_STREEBOG=m
 CONFIG_CRYPTO_TGR192=m
 CONFIG_CRYPTO_WP512=m
 
@@ -8225,6 +8738,7 @@ CONFIG_CRYPTO_WP512=m
 CONFIG_CRYPTO_AES=y
 CONFIG_CRYPTO_AES_TI=m
 CONFIG_CRYPTO_ANUBIS=m
+CONFIG_CRYPTO_LIB_ARC4=m
 CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_BLOWFISH=m
 CONFIG_CRYPTO_BLOWFISH_COMMON=m
@@ -8275,6 +8789,8 @@ CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_NX=y
 CONFIG_CRYPTO_DEV_NX_COMPRESS=m
 CONFIG_CRYPTO_DEV_NX_COMPRESS_PSERIES=m
+# CONFIG_CRYPTO_DEV_ATMEL_ECC is not set
+# CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set
 # CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set
 CONFIG_CRYPTO_DEV_VMX=y
 CONFIG_CRYPTO_DEV_VMX_ENCRYPT=m
@@ -8300,6 +8816,8 @@ CONFIG_SYSTEM_TRUSTED_KEYS=""
 # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
 # CONFIG_SECONDARY_TRUSTED_KEYRING is not set
 # CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
+# end of Certificates for signature checking
+
 CONFIG_BINARY_PRINTF=y
 
 #
@@ -8307,11 +8825,13 @@ CONFIG_BINARY_PRINTF=y
 #
 CONFIG_RAID6_PQ=m
 CONFIG_RAID6_PQ_BENCHMARK=y
+CONFIG_PACKING=y
 CONFIG_BITREVERSE=y
-CONFIG_RATIONAL=y
 CONFIG_GENERIC_STRNCPY_FROM_USER=y
 CONFIG_GENERIC_STRNLEN_USER=y
 CONFIG_GENERIC_NET_UTILS=y
+CONFIG_CORDIC=m
+CONFIG_RATIONAL=y
 CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_GENERIC_IOMAP=y
 CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
@@ -8381,6 +8901,7 @@ CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_ARCH_DMA_ADDR_T_64BIT=y
 CONFIG_DMA_DECLARE_COHERENT=y
 CONFIG_DMA_VIRT_OPS=y
+CONFIG_SWIOTLB=y
 # CONFIG_DMA_API_DEBUG is not set
 CONFIG_SGL_ALLOC=y
 CONFIG_IOMMU_HELPER=y
@@ -8392,10 +8913,9 @@ CONFIG_GLOB=y
 CONFIG_NLATTR=y
 CONFIG_LRU_CACHE=m
 CONFIG_CLZ_TAB=y
-CONFIG_CORDIC=m
-CONFIG_DDR=y
 CONFIG_IRQ_POLL=y
 CONFIG_MPILIB=y
+CONFIG_DIMLIB=y
 CONFIG_LIBFDT=y
 CONFIG_OID_REGISTRY=y
 CONFIG_FONT_SUPPORT=y
@@ -8418,8 +8938,9 @@ CONFIG_ARCH_HAS_PMEM_API=y
 CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y
 CONFIG_SBITMAP=y
 CONFIG_PARMAN=m
-# CONFIG_STRING_SELFTEST is not set
 CONFIG_OBJAGG=m
+# CONFIG_STRING_SELFTEST is not set
+# end of Library routines
 
 #
 # Kernel hacking
@@ -8434,6 +8955,7 @@ CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
 CONFIG_CONSOLE_LOGLEVEL_QUIET=4
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 CONFIG_DYNAMIC_DEBUG=y
+# end of printk and dmesg options
 
 #
 # Compile-time checks and compiler options
@@ -8442,6 +8964,7 @@ CONFIG_DEBUG_INFO=y
 # CONFIG_DEBUG_INFO_REDUCED is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
 # CONFIG_DEBUG_INFO_DWARF4 is not set
+# CONFIG_DEBUG_INFO_BTF is not set
 # CONFIG_GDB_SCRIPTS is not set
 # CONFIG_ENABLE_MUST_CHECK is not set
 CONFIG_FRAME_WARN=2048
@@ -8449,14 +8972,18 @@ CONFIG_STRIP_ASM_SYMS=y
 # CONFIG_READABLE_ASM is not set
 # CONFIG_UNUSED_SYMBOLS is not set
 CONFIG_DEBUG_FS=y
-# CONFIG_HEADERS_CHECK is not set
+# CONFIG_HEADERS_INSTALL is not set
+# CONFIG_OPTIMIZE_INLINING is not set
 # CONFIG_DEBUG_SECTION_MISMATCH is not set
 CONFIG_SECTION_MISMATCH_WARN_ONLY=y
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+# end of Compile-time checks and compiler options
+
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
 CONFIG_MAGIC_SYSRQ_SERIAL=y
 CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_MISC=y
 
 #
 # Memory Debugging
@@ -8482,6 +9009,8 @@ CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
 # CONFIG_DEBUG_STACKOVERFLOW is not set
 CONFIG_CC_HAS_KASAN_GENERIC=y
 CONFIG_KASAN_STACK=1
+# end of Memory Debugging
+
 CONFIG_ARCH_HAS_KCOV=y
 CONFIG_CC_HAS_SANCOV_TRACE_PC=y
 # CONFIG_KCOV is not set
@@ -8502,6 +9031,8 @@ CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
 CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
 # CONFIG_WQ_WATCHDOG is not set
+# end of Debug Lockups and Hangs
+
 # CONFIG_PANIC_ON_OOPS is not set
 CONFIG_PANIC_ON_OOPS_VALUE=0
 # CONFIG_SCHED_DEBUG is not set
@@ -8526,12 +9057,14 @@ CONFIG_LOCK_DEBUGGING_SUPPORT=y
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_LOCK_TORTURE_TEST is not set
 CONFIG_WW_MUTEX_SELFTEST=m
+# end of Lock Debugging (spinlocks, mutexes, etc...)
+
 CONFIG_STACKTRACE=y
 # CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
 # CONFIG_DEBUG_KOBJECT is not set
 CONFIG_DEBUG_BUGVERBOSE=y
 CONFIG_DEBUG_LIST=y
-# CONFIG_DEBUG_PI_LIST is not set
+# CONFIG_DEBUG_PLIST is not set
 # CONFIG_DEBUG_SG is not set
 CONFIG_DEBUG_NOTIFIERS=y
 CONFIG_DEBUG_CREDENTIALS=y
@@ -8545,6 +9078,8 @@ CONFIG_RCU_PERF_TEST=m
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
 # CONFIG_RCU_TRACE is not set
 # CONFIG_RCU_EQS_DEBUG is not set
+# end of RCU Debugging
+
 # CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
 # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
@@ -8559,6 +9094,7 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
 CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y
 CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
 CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
+CONFIG_HAVE_C_RECORDMCOUNT=y
 CONFIG_TRACE_CLOCK=y
 CONFIG_RING_BUFFER=y
 CONFIG_EVENT_TRACING=y
@@ -8598,7 +9134,6 @@ CONFIG_FTRACE_MCOUNT_RECORD=y
 # CONFIG_RING_BUFFER_STARTUP_TEST is not set
 CONFIG_PREEMPTIRQ_DELAY_TEST=m
 # CONFIG_TRACE_EVAL_MAP_FILE is not set
-CONFIG_TRACING_EVENTS_GPIO=y
 CONFIG_RUNTIME_TESTING_MENU=y
 CONFIG_LKDTM=m
 # CONFIG_TEST_LIST_SORT is not set
@@ -8606,12 +9141,14 @@ CONFIG_LKDTM=m
 # CONFIG_KPROBES_SANITY_TEST is not set
 # CONFIG_BACKTRACE_SELF_TEST is not set
 # CONFIG_RBTREE_TEST is not set
+# CONFIG_REED_SOLOMON_TEST is not set
 # CONFIG_INTERVAL_TREE_TEST is not set
 # CONFIG_PERCPU_TEST is not set
 # CONFIG_ATOMIC64_SELFTEST is not set
 CONFIG_ASYNC_RAID6_TEST=m
 # CONFIG_TEST_HEXDUMP is not set
 CONFIG_TEST_STRING_HELPERS=m
+# CONFIG_TEST_STRSCPY is not set
 CONFIG_TEST_KSTRTOX=m
 CONFIG_TEST_PRINTF=m
 CONFIG_TEST_BITMAP=m
@@ -8627,6 +9164,7 @@ CONFIG_TEST_PARMAN=m
 # CONFIG_TEST_VMALLOC is not set
 # CONFIG_TEST_USER_COPY is not set
 # CONFIG_TEST_BPF is not set
+# CONFIG_TEST_BLACKHOLE_DEV is not set
 # CONFIG_FIND_BIT_BENCHMARK is not set
 # CONFIG_TEST_FIRMWARE is not set
 # CONFIG_TEST_SYSCTL is not set
@@ -8636,6 +9174,7 @@ CONFIG_TEST_STATIC_KEYS=m
 # CONFIG_TEST_MEMCAT_P is not set
 # CONFIG_TEST_OBJAGG is not set
 # CONFIG_TEST_STACKINIT is not set
+# CONFIG_TEST_MEMINIT is not set
 # CONFIG_MEMTEST is not set
 CONFIG_BUG_ON_DATA_CORRUPTION=y
 # CONFIG_SAMPLES is not set
@@ -8660,8 +9199,10 @@ CONFIG_PRINT_STACK_DEPTH=64
 CONFIG_XMON=y
 # CONFIG_XMON_DEFAULT is not set
 CONFIG_XMON_DISASSEMBLY=y
+CONFIG_XMON_DEFAULT_RO_MODE=y
 CONFIG_DEBUGGER=y
 CONFIG_BOOTX_TEXT=y
 # CONFIG_PPC_EARLY_DEBUG is not set
 # CONFIG_PPC_PTDUMP is not set
 # CONFIG_PPC_FAST_ENDIAN_SWITCH is not set
+# end of Kernel hacking
diff --git a/srcpkgs/linux5.1/files/x86_64-dotconfig b/srcpkgs/linux5.3/files/x86_64-dotconfig
similarity index 92%
rename from srcpkgs/linux5.1/files/x86_64-dotconfig
rename to srcpkgs/linux5.3/files/x86_64-dotconfig
index c668bd92087..ec0f9b76069 100644
--- a/srcpkgs/linux5.1/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.3/files/x86_64-dotconfig
@@ -1,14 +1,15 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 5.1.18 Kernel Configuration
+# Linux/x86_64 5.3.0 Kernel Configuration
 #
 
 #
-# Compiler: gcc (GCC) 9.1.0
+# Compiler: gcc (GCC) 9.2.0
 #
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=90100
+CONFIG_GCC_VERSION=90200
 CONFIG_CLANG_VERSION=0
+CONFIG_CC_CAN_LINK=y
 CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y
 CONFIG_IRQ_WORK=y
@@ -20,6 +21,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
 #
 CONFIG_INIT_ENV_ARG_LIMIT=32
 # CONFIG_COMPILE_TEST is not set
+# CONFIG_HEADER_TEST is not set
 CONFIG_LOCALVERSION="_1"
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_BUILD_SALT=""
@@ -66,6 +68,8 @@ CONFIG_GENERIC_IRQ_RESERVATION_MODE=y
 CONFIG_IRQ_FORCED_THREADING=y
 CONFIG_SPARSE_IRQ=y
 # CONFIG_GENERIC_IRQ_DEBUGFS is not set
+# end of IRQ subsystem
+
 CONFIG_CLOCKSOURCE_WATCHDOG=y
 CONFIG_ARCH_CLOCKSOURCE_DATA=y
 CONFIG_ARCH_CLOCKSOURCE_INIT=y
@@ -86,10 +90,13 @@ CONFIG_NO_HZ_IDLE=y
 # CONFIG_NO_HZ_FULL is not set
 # CONFIG_NO_HZ is not set
 CONFIG_HIGH_RES_TIMERS=y
+# end of Timers subsystem
+
 # CONFIG_PREEMPT_NONE is not set
 # CONFIG_PREEMPT_VOLUNTARY is not set
 CONFIG_PREEMPT=y
 CONFIG_PREEMPT_COUNT=y
+CONFIG_PREEMPTION=y
 
 #
 # CPU/Task time and stats accounting
@@ -104,7 +111,10 @@ CONFIG_TASKSTATS=y
 CONFIG_TASK_DELAY_ACCT=y
 CONFIG_TASK_XACCT=y
 CONFIG_TASK_IO_ACCOUNTING=y
-# CONFIG_PSI is not set
+CONFIG_PSI=y
+CONFIG_PSI_DEFAULT_DISABLED=y
+# end of CPU/Task time and stats accounting
+
 CONFIG_CPU_ISOLATION=y
 
 #
@@ -117,13 +127,22 @@ CONFIG_TREE_SRCU=y
 CONFIG_TASKS_RCU=y
 CONFIG_RCU_STALL_COMMON=y
 CONFIG_RCU_NEED_SEGCBLIST=y
-CONFIG_BUILD_BIN2C=y
+# end of RCU Subsystem
+
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
+CONFIG_IKHEADERS=m
 CONFIG_LOG_BUF_SHIFT=19
 CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
 CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
+
+#
+# Scheduler features
+#
+# CONFIG_UCLAMP_TASK is not set
+# end of Scheduler features
+
 CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
 CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
 CONFIG_ARCH_SUPPORTS_INT128=y
@@ -136,7 +155,6 @@ CONFIG_MEMCG_SWAP=y
 CONFIG_MEMCG_SWAP_ENABLED=y
 CONFIG_MEMCG_KMEM=y
 CONFIG_BLK_CGROUP=y
-# CONFIG_DEBUG_BLK_CGROUP is not set
 CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
@@ -175,7 +193,6 @@ CONFIG_RD_LZ4=y
 CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
-CONFIG_ANON_INODES=y
 CONFIG_HAVE_UID16=y
 CONFIG_SYSCTL_EXCEPTION_TRACE=y
 CONFIG_HAVE_PCSPKR_PLATFORM=y
@@ -224,6 +241,8 @@ CONFIG_HAVE_PERF_EVENTS=y
 #
 CONFIG_PERF_EVENTS=y
 # CONFIG_DEBUG_PERF_USE_VMALLOC is not set
+# end of Kernel Performance Events And Counters
+
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_SLUB_DEBUG=y
 # CONFIG_SLUB_MEMCG_SYSFS_ON is not set
@@ -234,10 +253,13 @@ CONFIG_SLUB=y
 CONFIG_SLAB_MERGE_DEFAULT=y
 CONFIG_SLAB_FREELIST_RANDOM=y
 CONFIG_SLAB_FREELIST_HARDENED=y
+CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
 CONFIG_SLUB_CPU_PARTIAL=y
 CONFIG_SYSTEM_DATA_VERIFICATION=y
 CONFIG_PROFILING=y
 CONFIG_TRACEPOINTS=y
+# end of General setup
+
 CONFIG_64BIT=y
 CONFIG_X86_64=y
 CONFIG_X86=y
@@ -254,9 +276,7 @@ CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
-CONFIG_GENERIC_HWEIGHT=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_ARCH_HAS_CPU_RELAX=y
 CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
@@ -266,11 +286,9 @@ CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
 CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
 CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
 CONFIG_ZONE_DMA32=y
 CONFIG_AUDIT_ARCH=y
-CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 CONFIG_HAVE_INTEL_TXT=y
 CONFIG_X86_64_SMP=y
@@ -302,6 +320,7 @@ CONFIG_PARAVIRT=y
 CONFIG_PARAVIRT_XXL=y
 # CONFIG_PARAVIRT_DEBUG is not set
 # CONFIG_PARAVIRT_SPINLOCKS is not set
+CONFIG_X86_HV_CALLBACK_VECTOR=y
 CONFIG_XEN=y
 CONFIG_XEN_PV=y
 CONFIG_XEN_PV_SMP=y
@@ -318,6 +337,7 @@ CONFIG_PVH=y
 CONFIG_PARAVIRT_TIME_ACCOUNTING=y
 CONFIG_PARAVIRT_CLOCK=y
 # CONFIG_JAILHOUSE_GUEST is not set
+# CONFIG_ACRN_GUEST is not set
 # CONFIG_MK8 is not set
 # CONFIG_MPSC is not set
 # CONFIG_MCORE2 is not set
@@ -335,6 +355,7 @@ CONFIG_CPU_SUP_INTEL=y
 CONFIG_CPU_SUP_AMD=y
 CONFIG_CPU_SUP_HYGON=y
 CONFIG_CPU_SUP_CENTAUR=y
+CONFIG_CPU_SUP_ZHAOXIN=y
 CONFIG_HPET_TIMER=y
 CONFIG_HPET_EMULATE_RTC=y
 CONFIG_DMI=y
@@ -345,7 +366,7 @@ CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y
 CONFIG_NR_CPUS_RANGE_BEGIN=2
 CONFIG_NR_CPUS_RANGE_END=512
 CONFIG_NR_CPUS_DEFAULT=64
-CONFIG_NR_CPUS=64
+CONFIG_NR_CPUS=256
 CONFIG_SCHED_SMT=y
 CONFIG_SCHED_MC=y
 CONFIG_SCHED_MC_PRIO=y
@@ -367,6 +388,8 @@ CONFIG_PERF_EVENTS_INTEL_UNCORE=y
 CONFIG_PERF_EVENTS_INTEL_RAPL=m
 CONFIG_PERF_EVENTS_INTEL_CSTATE=m
 CONFIG_PERF_EVENTS_AMD_POWER=m
+# end of Performance monitoring
+
 # CONFIG_X86_16BIT is not set
 CONFIG_X86_VSYSCALL_EMULATION=y
 CONFIG_I8K=m
@@ -436,10 +459,13 @@ CONFIG_HOTPLUG_CPU=y
 # CONFIG_DEBUG_HOTPLUG_CPU0 is not set
 # CONFIG_COMPAT_VDSO is not set
 # CONFIG_LEGACY_VSYSCALL_EMULATE is not set
+# CONFIG_LEGACY_VSYSCALL_XONLY is not set
 CONFIG_LEGACY_VSYSCALL_NONE=y
 # CONFIG_CMDLINE_BOOL is not set
 CONFIG_MODIFY_LDT_SYSCALL=y
 CONFIG_HAVE_LIVEPATCH=y
+# end of Processor type and features
+
 CONFIG_ARCH_HAS_ADD_PAGES=y
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
@@ -512,6 +538,7 @@ CONFIG_ACPI_BGRT=y
 # CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set
 CONFIG_ACPI_NFIT=m
 # CONFIG_NFIT_SECURITY_DEBUG is not set
+CONFIG_ACPI_HMAT=y
 CONFIG_HAVE_ACPI_APEI=y
 CONFIG_HAVE_ACPI_APEI_NMI=y
 CONFIG_ACPI_APEI=y
@@ -565,6 +592,7 @@ CONFIG_X86_P4_CLOCKMOD=m
 # shared options
 #
 CONFIG_X86_SPEEDSTEP_LIB=m
+# end of CPU Frequency scaling
 
 #
 # CPU Idle
@@ -573,7 +601,10 @@ CONFIG_CPU_IDLE=y
 CONFIG_CPU_IDLE_GOV_LADDER=y
 CONFIG_CPU_IDLE_GOV_MENU=y
 CONFIG_CPU_IDLE_GOV_TEO=y
+# end of CPU Idle
+
 CONFIG_INTEL_IDLE=y
+# end of Power management and ACPI options
 
 #
 # Bus options (PCI etc.)
@@ -587,6 +618,7 @@ CONFIG_MMCONF_FAM10H=y
 CONFIG_ISA_DMA_API=y
 CONFIG_AMD_NB=y
 # CONFIG_X86_SYSFB is not set
+# end of Bus options (PCI etc.)
 
 #
 # Binary Emulations
@@ -597,8 +629,9 @@ CONFIG_COMPAT_32=y
 CONFIG_COMPAT=y
 CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
 CONFIG_SYSVIPC_COMPAT=y
+# end of Binary Emulations
+
 CONFIG_X86_DEV_DMA_OPS=y
-CONFIG_HAVE_GENERIC_GUP=y
 
 #
 # Firmware Drivers
@@ -630,6 +663,8 @@ CONFIG_EFI_CAPSULE_LOADER=m
 CONFIG_EFI_TEST=m
 CONFIG_APPLE_PROPERTIES=y
 CONFIG_RESET_ATTACK_MITIGATION=y
+# end of EFI (Extensible Firmware Interface) Support
+
 CONFIG_UEFI_CPER=y
 CONFIG_UEFI_CPER_X86=y
 CONFIG_EFI_DEV_PATH_PARSER=y
@@ -638,6 +673,9 @@ CONFIG_EFI_EARLYCON=y
 #
 # Tegra firmware driver
 #
+# end of Tegra firmware driver
+# end of Firmware Drivers
+
 CONFIG_HAVE_KVM=y
 CONFIG_HAVE_KVM_IRQCHIP=y
 CONFIG_HAVE_KVM_IRQFD=y
@@ -651,6 +689,7 @@ CONFIG_KVM_VFIO=y
 CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
 CONFIG_KVM_COMPAT=y
 CONFIG_HAVE_KVM_IRQ_BYPASS=y
+CONFIG_HAVE_KVM_NO_POLL=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_KVM=m
 CONFIG_KVM_INTEL=m
@@ -694,6 +733,7 @@ CONFIG_HAVE_DMA_CONTIGUOUS=y
 CONFIG_GENERIC_SMP_IDLE_THREAD=y
 CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
 CONFIG_ARCH_HAS_SET_MEMORY=y
+CONFIG_ARCH_HAS_SET_DIRECT_MAP=y
 CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y
 CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y
 CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
@@ -710,7 +750,6 @@ CONFIG_HAVE_PERF_USER_STACK_DUMP=y
 CONFIG_HAVE_ARCH_JUMP_LABEL=y
 CONFIG_HAVE_ARCH_JUMP_LABEL_RELATIVE=y
 CONFIG_HAVE_RCU_TABLE_FREE=y
-CONFIG_HAVE_RCU_TABLE_INVALIDATE=y
 CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
 CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
 CONFIG_HAVE_CMPXCHG_LOCAL=y
@@ -732,6 +771,7 @@ CONFIG_HAVE_MOVE_PMD=y
 CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
 CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD=y
 CONFIG_HAVE_ARCH_HUGE_VMAP=y
+CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
 CONFIG_HAVE_ARCH_SOFT_DIRTY=y
 CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
 CONFIG_MODULES_USE_ELF_RELA=y
@@ -760,15 +800,28 @@ CONFIG_ARCH_HAS_REFCOUNT=y
 CONFIG_REFCOUNT_FULL=y
 CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y
 CONFIG_ARCH_USE_MEMREMAP_PROT=y
+# CONFIG_LOCK_EVENT_COUNTS is not set
 
 #
 # GCOV-based kernel profiling
 #
 # CONFIG_GCOV_KERNEL is not set
 CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
+# end of GCOV-based kernel profiling
+
 CONFIG_PLUGIN_HOSTCC="g++"
 CONFIG_HAVE_GCC_PLUGINS=y
-# CONFIG_GCC_PLUGINS is not set
+CONFIG_GCC_PLUGINS=y
+
+#
+# GCC plugins
+#
+# CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set
+# CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
+# CONFIG_GCC_PLUGIN_RANDSTRUCT is not set
+# end of GCC plugins
+# end of General architecture-dependent options
+
 CONFIG_RT_MUTEXES=y
 CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
@@ -821,6 +874,8 @@ CONFIG_LDM_PARTITION=y
 CONFIG_EFI_PARTITION=y
 # CONFIG_SYSV68_PARTITION is not set
 CONFIG_CMDLINE_PARTITION=y
+# end of Partition Types
+
 CONFIG_BLOCK_COMPAT=y
 CONFIG_BLK_MQ_PCI=y
 CONFIG_BLK_MQ_VIRTIO=y
@@ -834,6 +889,9 @@ CONFIG_MQ_IOSCHED_DEADLINE=y
 CONFIG_MQ_IOSCHED_KYBER=y
 CONFIG_IOSCHED_BFQ=y
 CONFIG_BFQ_GROUP_IOSCHED=y
+# CONFIG_BFQ_CGROUP_DEBUG is not set
+# end of IO Schedulers
+
 CONFIG_PREEMPT_NOTIFIERS=y
 CONFIG_PADATA=y
 CONFIG_ASN1=y
@@ -860,6 +918,7 @@ CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 CONFIG_BINFMT_SCRIPT=y
 CONFIG_BINFMT_MISC=m
 CONFIG_COREDUMP=y
+# end of Executable file formats
 
 #
 # Memory Management options
@@ -873,7 +932,7 @@ CONFIG_SPARSEMEM_EXTREME=y
 CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
 CONFIG_SPARSEMEM_VMEMMAP=y
 CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
-CONFIG_ARCH_DISCARD_MEMBLOCK=y
+CONFIG_HAVE_FAST_GUP=y
 CONFIG_MEMORY_ISOLATION=y
 CONFIG_HAVE_BOOTMEM_INFO_NODE=y
 CONFIG_MEMORY_HOTPLUG=y
@@ -885,6 +944,7 @@ CONFIG_MEMORY_BALLOON=y
 CONFIG_BALLOON_COMPACTION=y
 CONFIG_COMPACTION=y
 CONFIG_MIGRATION=y
+CONFIG_CONTIG_ALLOC=y
 CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_BOUNCE=y
 CONFIG_VIRT_TO_BUS=y
@@ -914,19 +974,19 @@ CONFIG_PGTABLE_MAPPING=y
 CONFIG_GENERIC_EARLY_IOREMAP=y
 # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
 CONFIG_IDLE_PAGE_TRACKING=y
-CONFIG_ARCH_HAS_ZONE_DEVICE=y
+CONFIG_ARCH_HAS_PTE_DEVMAP=y
 CONFIG_ZONE_DEVICE=y
-CONFIG_ARCH_HAS_HMM=y
 CONFIG_DEV_PAGEMAP_OPS=y
 # CONFIG_HMM_MIRROR is not set
 # CONFIG_DEVICE_PRIVATE is not set
-# CONFIG_DEVICE_PUBLIC is not set
 CONFIG_FRAME_VECTOR=y
 CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
 CONFIG_ARCH_HAS_PKEYS=y
 # CONFIG_PERCPU_STATS is not set
 # CONFIG_GUP_BENCHMARK is not set
 CONFIG_ARCH_HAS_PTE_SPECIAL=y
+# end of Memory Management options
+
 CONFIG_NET=y
 CONFIG_COMPAT_NETLINK_MESSAGES=y
 CONFIG_NET_INGRESS=y
@@ -986,9 +1046,6 @@ CONFIG_INET_ESP_OFFLOAD=m
 CONFIG_INET_IPCOMP=m
 CONFIG_INET_XFRM_TUNNEL=m
 CONFIG_INET_TUNNEL=m
-CONFIG_INET_XFRM_MODE_TRANSPORT=m
-CONFIG_INET_XFRM_MODE_TUNNEL=m
-CONFIG_INET_XFRM_MODE_BEET=m
 CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 CONFIG_INET_UDP_DIAG=y
@@ -1026,10 +1083,6 @@ CONFIG_IPV6_MIP6=m
 CONFIG_IPV6_ILA=m
 CONFIG_INET6_XFRM_TUNNEL=m
 CONFIG_INET6_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-CONFIG_INET6_XFRM_MODE_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_BEET=m
-CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
 CONFIG_IPV6_VTI=m
 CONFIG_IPV6_SIT=m
 CONFIG_IPV6_SIT_6RD=y
@@ -1094,7 +1147,6 @@ CONFIG_NF_CT_NETLINK_TIMEOUT=m
 CONFIG_NF_CT_NETLINK_HELPER=m
 CONFIG_NETFILTER_NETLINK_GLUE_CT=y
 CONFIG_NF_NAT=m
-CONFIG_NF_NAT_NEEDED=y
 CONFIG_NF_NAT_AMANDA=m
 CONFIG_NF_NAT_FTP=m
 CONFIG_NF_NAT_IRC=m
@@ -1131,6 +1183,7 @@ CONFIG_NFT_XFRM=m
 CONFIG_NFT_SOCKET=m
 CONFIG_NFT_OSF=m
 CONFIG_NFT_TPROXY=m
+# CONFIG_NFT_SYNPROXY is not set
 CONFIG_NF_DUP_NETDEV=m
 CONFIG_NFT_DUP_NETDEV=m
 CONFIG_NFT_FWD_NETDEV=m
@@ -1169,6 +1222,7 @@ CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
 CONFIG_NETFILTER_XT_TARGET_RATEEST=m
 CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
+CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m
 CONFIG_NETFILTER_XT_TARGET_TEE=m
 CONFIG_NETFILTER_XT_TARGET_TPROXY=m
 CONFIG_NETFILTER_XT_TARGET_TRACE=m
@@ -1225,6 +1279,8 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m
 CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
 CONFIG_NETFILTER_XT_MATCH_TIME=m
 CONFIG_NETFILTER_XT_MATCH_U32=m
+# end of Core Netfilter Configuration
+
 CONFIG_IP_SET=m
 CONFIG_IP_SET_MAX=256
 CONFIG_IP_SET_BITMAP_IP=m
@@ -1299,7 +1355,6 @@ CONFIG_NF_DEFRAG_IPV4=m
 CONFIG_NF_SOCKET_IPV4=m
 CONFIG_NF_TPROXY_IPV4=m
 CONFIG_NF_TABLES_IPV4=y
-CONFIG_NFT_CHAIN_ROUTE_IPV4=m
 CONFIG_NFT_REJECT_IPV4=m
 CONFIG_NFT_DUP_IPV4=m
 CONFIG_NFT_FIB_IPV4=m
@@ -1333,6 +1388,7 @@ CONFIG_IP_NF_RAW=m
 CONFIG_IP_NF_ARPTABLES=m
 CONFIG_IP_NF_ARPFILTER=m
 CONFIG_IP_NF_ARP_MANGLE=m
+# end of IP: Netfilter Configuration
 
 #
 # IPv6: Netfilter Configuration
@@ -1340,7 +1396,6 @@ CONFIG_IP_NF_ARP_MANGLE=m
 CONFIG_NF_SOCKET_IPV6=m
 CONFIG_NF_TPROXY_IPV6=m
 CONFIG_NF_TABLES_IPV6=y
-CONFIG_NFT_CHAIN_ROUTE_IPV6=m
 CONFIG_NFT_REJECT_IPV6=m
 CONFIG_NFT_DUP_IPV6=m
 CONFIG_NFT_FIB_IPV6=m
@@ -1369,10 +1424,14 @@ CONFIG_IP6_NF_RAW=m
 CONFIG_IP6_NF_NAT=m
 CONFIG_IP6_NF_TARGET_MASQUERADE=m
 CONFIG_IP6_NF_TARGET_NPT=m
+# end of IPv6: Netfilter Configuration
+
 CONFIG_NF_DEFRAG_IPV6=m
-CONFIG_NF_TABLES_BRIDGE=y
+CONFIG_NF_TABLES_BRIDGE=m
+# CONFIG_NFT_BRIDGE_META is not set
 CONFIG_NFT_BRIDGE_REJECT=m
 CONFIG_NF_LOG_BRIDGE=m
+# CONFIG_NF_CONNTRACK_BRIDGE is not set
 CONFIG_BRIDGE_NF_EBTABLES=m
 CONFIG_BRIDGE_EBT_BROUTE=m
 CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -1405,11 +1464,14 @@ CONFIG_INET_DCCP_DIAG=m
 CONFIG_IP_DCCP_CCID3=y
 # CONFIG_IP_DCCP_CCID3_DEBUG is not set
 CONFIG_IP_DCCP_TFRC_LIB=y
+# end of DCCP CCIDs Configuration
 
 #
 # DCCP Kernel Hacking
 #
 # CONFIG_IP_DCCP_DEBUG is not set
+# end of DCCP Kernel Hacking
+
 CONFIG_IP_SCTP=m
 # CONFIG_SCTP_DBG_OBJCNT is not set
 # CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5 is not set
@@ -1446,16 +1508,21 @@ CONFIG_BRIDGE_IGMP_SNOOPING=y
 CONFIG_BRIDGE_VLAN_FILTERING=y
 CONFIG_HAVE_NET_DSA=y
 CONFIG_NET_DSA=m
-CONFIG_NET_DSA_LEGACY=y
-CONFIG_NET_DSA_TAG_BRCM=y
-CONFIG_NET_DSA_TAG_BRCM_PREPEND=y
-CONFIG_NET_DSA_TAG_DSA=y
-CONFIG_NET_DSA_TAG_EDSA=y
-CONFIG_NET_DSA_TAG_GSWIP=y
-CONFIG_NET_DSA_TAG_KSZ=y
-CONFIG_NET_DSA_TAG_KSZ9477=y
-CONFIG_NET_DSA_TAG_TRAILER=y
-CONFIG_NET_DSA_TAG_QCA=y
+CONFIG_NET_DSA_TAG_8021Q=m
+CONFIG_NET_DSA_TAG_BRCM_COMMON=m
+CONFIG_NET_DSA_TAG_BRCM=m
+CONFIG_NET_DSA_TAG_BRCM_PREPEND=m
+CONFIG_NET_DSA_TAG_GSWIP=m
+CONFIG_NET_DSA_TAG_DSA=m
+CONFIG_NET_DSA_TAG_EDSA=m
+CONFIG_NET_DSA_TAG_MTK=m
+CONFIG_NET_DSA_TAG_KSZ_COMMON=m
+CONFIG_NET_DSA_TAG_KSZ=m
+CONFIG_NET_DSA_TAG_KSZ9477=m
+CONFIG_NET_DSA_TAG_QCA=m
+CONFIG_NET_DSA_TAG_LAN9303=m
+CONFIG_NET_DSA_TAG_SJA1105=m
+CONFIG_NET_DSA_TAG_TRAILER=m
 CONFIG_VLAN_8021Q=m
 CONFIG_VLAN_8021Q_GVRP=y
 CONFIG_VLAN_8021Q_MVRP=y
@@ -1542,16 +1609,18 @@ CONFIG_NET_ACT_PEDIT=m
 CONFIG_NET_ACT_SIMP=m
 CONFIG_NET_ACT_SKBEDIT=m
 CONFIG_NET_ACT_CSUM=m
+# CONFIG_NET_ACT_MPLS is not set
 CONFIG_NET_ACT_VLAN=m
 CONFIG_NET_ACT_BPF=m
 CONFIG_NET_ACT_CONNMARK=m
+# CONFIG_NET_ACT_CTINFO is not set
 CONFIG_NET_ACT_SKBMOD=m
 CONFIG_NET_ACT_IFE=m
 CONFIG_NET_ACT_TUNNEL_KEY=m
+# CONFIG_NET_ACT_CT is not set
 CONFIG_NET_IFE_SKBMARK=m
 CONFIG_NET_IFE_SKBPRIO=m
 CONFIG_NET_IFE_SKBTCINDEX=m
-CONFIG_NET_CLS_IND=y
 CONFIG_NET_SCH_FIFO=y
 CONFIG_DCB=y
 CONFIG_DNS_RESOLVER=y
@@ -1563,6 +1632,7 @@ CONFIG_BATMAN_ADV_NC=y
 CONFIG_BATMAN_ADV_MCAST=y
 CONFIG_BATMAN_ADV_DEBUGFS=y
 # CONFIG_BATMAN_ADV_DEBUG is not set
+CONFIG_BATMAN_ADV_SYSFS=y
 # CONFIG_BATMAN_ADV_TRACING is not set
 CONFIG_OPENVSWITCH=m
 CONFIG_OPENVSWITCH_GRE=m
@@ -1600,6 +1670,9 @@ CONFIG_NET_FLOW_LIMIT=y
 #
 # CONFIG_NET_PKTGEN is not set
 # CONFIG_NET_DROP_MONITOR is not set
+# end of Network testing
+# end of Networking options
+
 # CONFIG_HAMRADIO is not set
 CONFIG_CAN=m
 CONFIG_CAN_RAW=m
@@ -1632,6 +1705,7 @@ CONFIG_CAN_SOFTING=m
 #
 # CONFIG_CAN_HI311X is not set
 CONFIG_CAN_MCP251X=m
+# end of CAN SPI interfaces
 
 #
 # CAN USB interfaces
@@ -1644,7 +1718,11 @@ CONFIG_CAN_KVASER_USB=m
 # CONFIG_CAN_MCBA_USB is not set
 CONFIG_CAN_PEAK_USB=m
 CONFIG_CAN_UCAN=m
+# end of CAN USB interfaces
+
 CONFIG_CAN_DEBUG_DEVICES=y
+# end of CAN Device Drivers
+
 CONFIG_BT=m
 CONFIG_BT_BREDR=y
 CONFIG_BT_RFCOMM=m
@@ -1669,6 +1747,7 @@ CONFIG_BT_QCA=m
 CONFIG_BT_HCIBTUSB=m
 CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
 CONFIG_BT_HCIBTUSB_BCM=y
+# CONFIG_BT_HCIBTUSB_MTK is not set
 CONFIG_BT_HCIBTUSB_RTL=y
 CONFIG_BT_HCIBTSDIO=m
 CONFIG_BT_HCIUART=m
@@ -1692,8 +1771,11 @@ CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
 CONFIG_BT_ATH3K=m
 CONFIG_BT_WILINK=m
+CONFIG_BT_MTKSDIO=m
 CONFIG_BT_MTKUART=m
 CONFIG_BT_HCIRSI=m
+# end of Bluetooth device drivers
+
 CONFIG_AF_RXRPC=m
 # CONFIG_AF_RXRPC_IPV6 is not set
 # CONFIG_AF_RXRPC_INJECT_LOSS is not set
@@ -1790,6 +1872,8 @@ CONFIG_NFC_NXP_NCI_I2C=m
 CONFIG_NFC_S3FWRN5=m
 CONFIG_NFC_S3FWRN5_I2C=m
 CONFIG_NFC_ST95HF=m
+# end of Near Field Communication (NFC) devices
+
 CONFIG_PSAMPLE=m
 CONFIG_NET_IFE=m
 CONFIG_LWTUNNEL=y
@@ -1856,6 +1940,8 @@ CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
 #
 # Cadence PCIe controllers support
 #
+# end of Cadence PCIe controllers support
+
 CONFIG_VMD=m
 
 #
@@ -1865,16 +1951,21 @@ CONFIG_PCIE_DW=y
 CONFIG_PCIE_DW_HOST=y
 # CONFIG_PCIE_DW_PLAT_HOST is not set
 CONFIG_PCI_MESON=y
+# end of DesignWare PCI Core Support
+# end of PCI controller drivers
 
 #
 # PCI Endpoint
 #
 # CONFIG_PCI_ENDPOINT is not set
+# end of PCI Endpoint
 
 #
 # PCI switch controller drivers
 #
 CONFIG_PCI_SW_SWITCHTEC=m
+# end of PCI switch controller drivers
+
 CONFIG_PCCARD=m
 # CONFIG_PCMCIA is not set
 CONFIG_CARDBUS=y
@@ -1906,6 +1997,7 @@ CONFIG_RAPIDIO_CPS_XX=m
 CONFIG_RAPIDIO_TSI568=m
 CONFIG_RAPIDIO_CPS_GEN2=m
 CONFIG_RAPIDIO_RXS_GEN3=m
+# end of RapidIO Switch drivers
 
 #
 # Generic Driver Options
@@ -1920,15 +2012,20 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 # Firmware loader
 #
 CONFIG_FW_LOADER=y
+CONFIG_FW_LOADER_PAGED_BUF=y
 CONFIG_EXTRA_FIRMWARE=""
 CONFIG_FW_LOADER_USER_HELPER=y
 # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
+# CONFIG_FW_LOADER_COMPRESS is not set
+# end of Firmware loader
+
 CONFIG_WANT_DEV_COREDUMP=y
 CONFIG_ALLOW_DEV_COREDUMP=y
 CONFIG_DEV_COREDUMP=y
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
 # CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
+CONFIG_HMEM_REPORTING=y
 CONFIG_TEST_ASYNC_DRIVER_PROBE=m
 CONFIG_SYS_HYPERVISOR=y
 CONFIG_GENERIC_CPU_AUTOPROBE=y
@@ -1942,10 +2039,13 @@ CONFIG_REGMAP_MMIO=y
 CONFIG_REGMAP_IRQ=y
 CONFIG_DMA_SHARED_BUFFER=y
 # CONFIG_DMA_FENCE_TRACE is not set
+# end of Generic Driver Options
 
 #
 # Bus devices
 #
+# end of Bus devices
+
 CONFIG_CONNECTOR=y
 CONFIG_PROC_EVENTS=y
 CONFIG_GNSS=m
@@ -1965,6 +2065,7 @@ CONFIG_MTD_REDBOOT_PARTS=m
 CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
 # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
 # CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
+# end of Partition parsers
 
 #
 # User Modules And Translation Layers
@@ -1995,6 +2096,7 @@ CONFIG_MTD_CFI_I2=y
 # CONFIG_MTD_RAM is not set
 # CONFIG_MTD_ROM is not set
 # CONFIG_MTD_ABSENT is not set
+# end of RAM/ROM/Flash chip drivers
 
 #
 # Mapping drivers for chip access
@@ -2002,6 +2104,7 @@ CONFIG_MTD_CFI_I2=y
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
 # CONFIG_MTD_INTEL_VR_NOR is not set
 # CONFIG_MTD_PLATRAM is not set
+# end of Mapping drivers for chip access
 
 #
 # Self-contained MTD device drivers
@@ -2021,17 +2124,46 @@ CONFIG_MTD_PHRAM=m
 CONFIG_MTD_DOCG3=m
 CONFIG_BCH_CONST_M=14
 CONFIG_BCH_CONST_T=4
+# end of Self-contained MTD device drivers
+
 CONFIG_MTD_NAND_CORE=m
 # CONFIG_MTD_ONENAND is not set
-# CONFIG_MTD_NAND is not set
+CONFIG_MTD_NAND_ECC_SW_HAMMING=m
+# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
+CONFIG_MTD_RAW_NAND=m
+CONFIG_MTD_NAND_ECC_SW_BCH=y
+
+#
+# Raw/parallel NAND flash controllers
+#
+CONFIG_MTD_NAND_DENALI=m
+CONFIG_MTD_NAND_DENALI_PCI=m
+CONFIG_MTD_NAND_CAFE=m
+CONFIG_MTD_NAND_GPIO=m
+CONFIG_MTD_NAND_PLATFORM=m
+
+#
+# Misc
+#
+CONFIG_MTD_SM_COMMON=m
+CONFIG_MTD_NAND_NANDSIM=m
+CONFIG_MTD_NAND_RICOH=m
+CONFIG_MTD_NAND_DISKONCHIP=m
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED=y
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0x0
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_HIGH=y
+CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE=y
 CONFIG_MTD_SPI_NAND=m
 
 #
 # LPDDR & LPDDR2 PCM memory drivers
 #
 # CONFIG_MTD_LPDDR is not set
+# end of LPDDR & LPDDR2 PCM memory drivers
+
 # CONFIG_MTD_SPI_NOR is not set
 # CONFIG_MTD_UBI is not set
+# CONFIG_MTD_HYPERBUS is not set
 # CONFIG_OF is not set
 CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
 CONFIG_PARPORT=m
@@ -2097,6 +2229,7 @@ CONFIG_NVME_TARGET_RDMA=m
 CONFIG_NVME_TARGET_FC=m
 CONFIG_NVME_TARGET_FCLOOP=m
 CONFIG_NVME_TARGET_TCP=m
+# end of NVME Support
 
 #
 # Misc devices
@@ -2123,10 +2256,10 @@ CONFIG_SENSORS_APDS990X=m
 CONFIG_HMC6352=m
 CONFIG_DS1682=m
 CONFIG_VMWARE_BALLOON=m
-CONFIG_USB_SWITCH_FSA9480=m
 CONFIG_LATTICE_ECP3_CONFIG=m
 CONFIG_SRAM=y
 # CONFIG_PCI_ENDPOINT_TEST is not set
+# CONFIG_XILINX_SDFEC is not set
 CONFIG_MISC_RTSX=m
 CONFIG_PVPANIC=m
 CONFIG_C2PORT=m
@@ -2143,6 +2276,8 @@ CONFIG_EEPROM_93CX6=m
 CONFIG_EEPROM_93XX46=m
 CONFIG_EEPROM_IDT_89HPESX=m
 CONFIG_EEPROM_EE1004=m
+# end of EEPROM support
+
 CONFIG_CB710_CORE=m
 # CONFIG_CB710_DEBUG is not set
 CONFIG_CB710_DEBUG_ASSUMPTIONS=y
@@ -2151,6 +2286,8 @@ CONFIG_CB710_DEBUG_ASSUMPTIONS=y
 # Texas Instruments shared transport line discipline
 #
 CONFIG_TI_ST=m
+# end of Texas Instruments shared transport line discipline
+
 CONFIG_SENSORS_LIS3_I2C=m
 CONFIG_ALTERA_STAPL=m
 CONFIG_INTEL_MEI=m
@@ -2201,6 +2338,8 @@ CONFIG_MIC_COSM=m
 #
 CONFIG_VOP=m
 CONFIG_VHOST_RING=m
+# end of Intel MIC & related support
+
 CONFIG_GENWQE=m
 CONFIG_GENWQE_PLATFORM_ERROR_RECOVERY=0
 CONFIG_ECHO=m
@@ -2208,6 +2347,8 @@ CONFIG_MISC_ALCOR_PCI=m
 CONFIG_MISC_RTSX_PCI=m
 CONFIG_MISC_RTSX_USB=m
 CONFIG_HABANA_AI=m
+# end of Misc devices
+
 CONFIG_HAVE_IDE=y
 # CONFIG_IDE is not set
 
@@ -2226,7 +2367,6 @@ CONFIG_SCSI_PROC_FS=y
 #
 CONFIG_BLK_DEV_SD=m
 CONFIG_CHR_DEV_ST=m
-CONFIG_CHR_DEV_OSST=m
 CONFIG_BLK_DEV_SR=m
 CONFIG_BLK_DEV_SR_VENDOR=y
 CONFIG_CHR_DEV_SG=m
@@ -2247,6 +2387,8 @@ CONFIG_SCSI_SAS_LIBSAS=m
 CONFIG_SCSI_SAS_ATA=y
 CONFIG_SCSI_SAS_HOST_SMP=y
 CONFIG_SCSI_SRP_ATTRS=m
+# end of SCSI Transports
+
 CONFIG_SCSI_LOWLEVEL=y
 CONFIG_ISCSI_TCP=m
 CONFIG_ISCSI_BOOT_SYSFS=m
@@ -2315,6 +2457,7 @@ CONFIG_FCOE_FNIC=m
 CONFIG_SCSI_SNIC=m
 # CONFIG_SCSI_SNIC_DEBUG_FS is not set
 CONFIG_SCSI_DMX3191D=m
+# CONFIG_SCSI_FDOMAIN_PCI is not set
 CONFIG_SCSI_GDTH=m
 CONFIG_SCSI_ISCI=m
 CONFIG_SCSI_IPS=m
@@ -2356,6 +2499,8 @@ CONFIG_SCSI_DH_RDAC=m
 CONFIG_SCSI_DH_HP_SW=m
 CONFIG_SCSI_DH_EMC=m
 CONFIG_SCSI_DH_ALUA=m
+# end of SCSI device support
+
 CONFIG_ATA=m
 CONFIG_ATA_VERBOSE_ERROR=y
 CONFIG_ATA_ACPI=y
@@ -2488,6 +2633,7 @@ CONFIG_DM_MULTIPATH=m
 CONFIG_DM_MULTIPATH_QL=m
 CONFIG_DM_MULTIPATH_ST=m
 CONFIG_DM_DELAY=m
+CONFIG_DM_DUST=m
 CONFIG_DM_UEVENT=y
 CONFIG_DM_FLAKEY=m
 CONFIG_DM_VERITY=m
@@ -2523,6 +2669,8 @@ CONFIG_FIREWIRE_OHCI=m
 CONFIG_FIREWIRE_SBP2=m
 CONFIG_FIREWIRE_NET=m
 CONFIG_FIREWIRE_NOSY=m
+# end of IEEE 1394 (FireWire) support
+
 CONFIG_MACINTOSH_DRIVERS=y
 CONFIG_MAC_EMUMOUSEBTN=m
 CONFIG_NETDEVICES=y
@@ -2626,10 +2774,14 @@ CONFIG_NET_DSA_MICROCHIP_KSZ9477_SPI=m
 CONFIG_NET_DSA_MV88E6XXX=m
 CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y
 CONFIG_NET_DSA_MV88E6XXX_PTP=y
+CONFIG_NET_DSA_SJA1105=m
+# CONFIG_NET_DSA_SJA1105_PTP is not set
 CONFIG_NET_DSA_QCA8K=m
 # CONFIG_NET_DSA_REALTEK_SMI is not set
 # CONFIG_NET_DSA_SMSC_LAN9303_I2C is not set
 # CONFIG_NET_DSA_SMSC_LAN9303_MDIO is not set
+# end of Distributed Switch Architecture drivers
+
 CONFIG_ETHERNET=y
 CONFIG_MDIO=m
 CONFIG_NET_VENDOR_3COM=y
@@ -2734,6 +2886,8 @@ CONFIG_BE2NET_BE3=y
 CONFIG_BE2NET_LANCER=y
 CONFIG_BE2NET_SKYHAWK=y
 CONFIG_NET_VENDOR_EZCHIP=y
+CONFIG_NET_VENDOR_GOOGLE=y
+# CONFIG_GVE is not set
 CONFIG_NET_VENDOR_HP=y
 CONFIG_HP100=m
 CONFIG_NET_VENDOR_HUAWEI=y
@@ -2891,6 +3045,7 @@ CONFIG_SMSC9420=m
 CONFIG_NET_VENDOR_SOCIONEXT=y
 CONFIG_NET_VENDOR_STMICRO=y
 CONFIG_STMMAC_ETH=m
+# CONFIG_STMMAC_SELFTESTS is not set
 CONFIG_STMMAC_PLATFORM=m
 CONFIG_DWMAC_GENERIC=m
 CONFIG_STMMAC_PCI=m
@@ -2905,7 +3060,6 @@ CONFIG_NET_VENDOR_TEHUTI=y
 CONFIG_TEHUTI=m
 CONFIG_NET_VENDOR_TI=y
 # CONFIG_TI_CPSW_PHY_SEL is not set
-CONFIG_TI_CPSW_ALE=m
 CONFIG_TLAN=m
 CONFIG_NET_VENDOR_VIA=y
 CONFIG_VIA_RHINE=m
@@ -2918,6 +3072,9 @@ CONFIG_WIZNET_W5300=m
 # CONFIG_WIZNET_BUS_INDIRECT is not set
 CONFIG_WIZNET_BUS_ANY=y
 CONFIG_WIZNET_W5100_SPI=m
+CONFIG_NET_VENDOR_XILINX=y
+# CONFIG_XILINX_AXI_EMAC is not set
+CONFIG_XILINX_LL_TEMAC=m
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
 CONFIG_NET_SB1000=m
@@ -2965,6 +3122,7 @@ CONFIG_MICROCHIP_PHY=m
 # CONFIG_MICROCHIP_T1_PHY is not set
 CONFIG_MICROSEMI_PHY=m
 CONFIG_NATIONAL_PHY=m
+# CONFIG_NXP_TJA11XX_PHY is not set
 CONFIG_QSEMI_PHY=m
 CONFIG_REALTEK_PHY=m
 CONFIG_RENESAS_PHY=m
@@ -3158,6 +3316,8 @@ CONFIG_IWL3945=m
 # iwl3945 / iwl4965 Debugging Options
 #
 # CONFIG_IWLEGACY_DEBUG is not set
+# end of iwl3945 / iwl4965 Debugging Options
+
 CONFIG_IWLWIFI=m
 CONFIG_IWLWIFI_LEDS=y
 CONFIG_IWLDVM=m
@@ -3171,6 +3331,8 @@ CONFIG_IWLWIFI_PCIE_RTPM=y
 #
 # CONFIG_IWLWIFI_DEBUG is not set
 # CONFIG_IWLWIFI_DEVICE_TRACING is not set
+# end of Debugging Options
+
 CONFIG_WLAN_VENDOR_INTERSIL=y
 CONFIG_HOSTAP=m
 CONFIG_HOSTAP_FIRMWARE=y
@@ -3221,6 +3383,7 @@ CONFIG_MT76x2_COMMON=m
 # CONFIG_MT76x2E is not set
 CONFIG_MT76x2U=m
 CONFIG_MT7603E=m
+CONFIG_MT7615E=m
 CONFIG_WLAN_VENDOR_RALINK=y
 CONFIG_RT2X00=m
 CONFIG_RT2400PCI=m
@@ -3273,6 +3436,13 @@ CONFIG_RTL8723_COMMON=m
 CONFIG_RTLBTCOEXIST=m
 CONFIG_RTL8XXXU=m
 # CONFIG_RTL8XXXU_UNTESTED is not set
+CONFIG_RTW88=m
+CONFIG_RTW88_CORE=m
+CONFIG_RTW88_PCI=m
+CONFIG_RTW88_8822BE=y
+CONFIG_RTW88_8822CE=y
+# CONFIG_RTW88_DEBUG is not set
+# CONFIG_RTW88_DEBUGFS is not set
 CONFIG_WLAN_VENDOR_RSI=y
 CONFIG_RSI_91X=m
 CONFIG_RSI_DEBUGFS=y
@@ -3309,6 +3479,8 @@ CONFIG_VIRT_WIFI=m
 CONFIG_WIMAX_I2400M=m
 CONFIG_WIMAX_I2400M_USB=m
 CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
+# end of WiMAX Wireless Broadband devices
+
 # CONFIG_WAN is not set
 CONFIG_IEEE802154_DRIVERS=m
 CONFIG_IEEE802154_FAKELB=m
@@ -3361,7 +3533,9 @@ CONFIG_INPUT_KEYBOARD=y
 CONFIG_KEYBOARD_ADC=m
 CONFIG_KEYBOARD_ADP5588=m
 CONFIG_KEYBOARD_ADP5589=m
+# CONFIG_KEYBOARD_APPLESPI is not set
 CONFIG_KEYBOARD_ATKBD=y
+CONFIG_KEYBOARD_QT1050=m
 CONFIG_KEYBOARD_QT1070=m
 CONFIG_KEYBOARD_QT2160=m
 # CONFIG_KEYBOARD_DLINK_DIR685 is not set
@@ -3426,8 +3600,8 @@ CONFIG_JOYSTICK_INTERACT=m
 CONFIG_JOYSTICK_SIDEWINDER=m
 CONFIG_JOYSTICK_TMDC=m
 CONFIG_JOYSTICK_IFORCE=m
-CONFIG_JOYSTICK_IFORCE_USB=y
-CONFIG_JOYSTICK_IFORCE_232=y
+CONFIG_JOYSTICK_IFORCE_USB=m
+CONFIG_JOYSTICK_IFORCE_232=m
 CONFIG_JOYSTICK_WARRIOR=m
 CONFIG_JOYSTICK_MAGELLAN=m
 CONFIG_JOYSTICK_SPACEORB=m
@@ -3552,6 +3726,7 @@ CONFIG_TOUCHSCREEN_TPS6507X=m
 CONFIG_TOUCHSCREEN_ZET6223=m
 CONFIG_TOUCHSCREEN_ZFORCE=m
 CONFIG_TOUCHSCREEN_ROHM_BU21023=m
+CONFIG_TOUCHSCREEN_IQS5XX=m
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_AD714X=m
 CONFIG_INPUT_AD714X_I2C=m
@@ -3568,6 +3743,7 @@ CONFIG_INPUT_APANEL=m
 CONFIG_INPUT_GP2A=m
 # CONFIG_INPUT_GPIO_BEEPER is not set
 CONFIG_INPUT_GPIO_DECODER=m
+CONFIG_INPUT_GPIO_VIBRA=m
 CONFIG_INPUT_ATLAS_BTNS=m
 CONFIG_INPUT_ATI_REMOTE2=m
 CONFIG_INPUT_KEYSPAN_REMOTE=m
@@ -3629,7 +3805,6 @@ CONFIG_SERIO_RAW=m
 CONFIG_SERIO_ALTERA_PS2=m
 CONFIG_SERIO_PS2MULT=m
 CONFIG_SERIO_ARC_PS2=m
-CONFIG_SERIO_OLPC_APSP=m
 CONFIG_HYPERV_KEYBOARD=m
 CONFIG_SERIO_GPIO_PS2=m
 CONFIG_USERIO=m
@@ -3638,6 +3813,8 @@ CONFIG_GAMEPORT_NS558=m
 CONFIG_GAMEPORT_L4=m
 CONFIG_GAMEPORT_EMU10K1=m
 CONFIG_GAMEPORT_FM801=m
+# end of Hardware I/O ports
+# end of Input device support
 
 #
 # Character devices
@@ -3666,6 +3843,7 @@ CONFIG_N_HDLC=m
 CONFIG_N_GSM=m
 CONFIG_TRACE_ROUTER=m
 CONFIG_TRACE_SINK=m
+CONFIG_NULL_TTY=m
 CONFIG_LDISC_AUTOLOAD=y
 CONFIG_DEVMEM=y
 # CONFIG_DEVKMEM is not set
@@ -3720,6 +3898,9 @@ CONFIG_SERIAL_RP2=m
 CONFIG_SERIAL_RP2_NR_UARTS=32
 CONFIG_SERIAL_FSL_LPUART=m
 # CONFIG_SERIAL_MEN_Z135 is not set
+# end of Serial drivers
+
+CONFIG_SERIAL_MCTRL_GPIO=y
 CONFIG_SERIAL_DEV_BUS=m
 CONFIG_TTY_PRINTK=m
 CONFIG_TTY_PRINTK_LEVEL=6
@@ -3740,6 +3921,7 @@ CONFIG_IPMI_SI=m
 CONFIG_IPMI_SSIF=m
 CONFIG_IPMI_WATCHDOG=m
 CONFIG_IPMI_POWEROFF=m
+# CONFIG_IPMB_DEVICE_INTERFACE is not set
 CONFIG_HW_RANDOM=m
 CONFIG_HW_RANDOM_TIMERIOMEM=m
 CONFIG_HW_RANDOM_INTEL=m
@@ -3776,6 +3958,8 @@ CONFIG_TELCLOCK=m
 CONFIG_DEVPORT=y
 CONFIG_XILLYBUS=m
 CONFIG_XILLYBUS_PCIE=m
+# end of Character devices
+
 # CONFIG_RANDOM_TRUST_CPU is not set
 
 #
@@ -3797,6 +3981,8 @@ CONFIG_I2C_MUX_PCA9541=m
 CONFIG_I2C_MUX_PCA954x=m
 CONFIG_I2C_MUX_REG=m
 CONFIG_I2C_MUX_MLXCPLD=m
+# end of Multiplexer I2C Chip support
+
 CONFIG_I2C_HELPER_AUTO=y
 CONFIG_I2C_SMBUS=m
 CONFIG_I2C_ALGOBIT=m
@@ -3815,6 +4001,7 @@ CONFIG_I2C_ALI15X3=m
 CONFIG_I2C_AMD756=m
 CONFIG_I2C_AMD756_S4882=m
 CONFIG_I2C_AMD8111=m
+CONFIG_I2C_AMD_MP2=m
 CONFIG_I2C_I801=m
 CONFIG_I2C_ISCH=m
 CONFIG_I2C_ISMT=m
@@ -3868,12 +4055,16 @@ CONFIG_I2C_VIPERBOARD=m
 #
 CONFIG_I2C_MLXCPLD=m
 # CONFIG_I2C_CROS_EC_TUNNEL is not set
+# end of I2C Hardware Bus support
+
 # CONFIG_I2C_STUB is not set
 CONFIG_I2C_SLAVE=y
 CONFIG_I2C_SLAVE_EEPROM=m
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
+# end of I2C support
+
 CONFIG_I3C=m
 CONFIG_CDNS_I3C_MASTER=m
 CONFIG_DW_I3C_MASTER=m
@@ -3952,6 +4143,8 @@ CONFIG_PTP_1588_CLOCK=y
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
 CONFIG_PTP_1588_CLOCK_KVM=y
+# end of PTP clock support
+
 CONFIG_PINCTRL=y
 CONFIG_PINMUX=y
 CONFIG_PINCONF=y
@@ -3995,9 +4188,10 @@ CONFIG_GPIO_ICH=m
 CONFIG_GPIO_LYNXPOINT=y
 CONFIG_GPIO_MB86S7X=m
 CONFIG_GPIO_MENZ127=m
-CONFIG_GPIO_MOCKUP=m
 CONFIG_GPIO_VX855=m
+# CONFIG_GPIO_XILINX is not set
 CONFIG_GPIO_AMD_FCH=m
+# end of Memory mapped GPIO drivers
 
 #
 # Port-mapped I/O GPIO drivers
@@ -4008,6 +4202,7 @@ CONFIG_GPIO_SCH=m
 CONFIG_GPIO_SCH311X=m
 # CONFIG_GPIO_WINBOND is not set
 # CONFIG_GPIO_WS16C48 is not set
+# end of Port-mapped I/O GPIO drivers
 
 #
 # I2C GPIO expanders
@@ -4018,6 +4213,7 @@ CONFIG_GPIO_MAX732X=m
 CONFIG_GPIO_PCA953X=m
 CONFIG_GPIO_PCF857X=m
 CONFIG_GPIO_TPIC2810=m
+# end of I2C GPIO expanders
 
 #
 # MFD GPIO expanders
@@ -4036,6 +4232,7 @@ CONFIG_GPIO_TPS65086=m
 CONFIG_GPIO_TQMX86=m
 CONFIG_GPIO_UCB1400=m
 # CONFIG_GPIO_WM831X is not set
+# end of MFD GPIO expanders
 
 #
 # PCI GPIO expanders
@@ -4045,6 +4242,7 @@ CONFIG_GPIO_ML_IOH=m
 CONFIG_GPIO_PCI_IDIO_16=m
 # CONFIG_GPIO_PCIE_IDIO_24 is not set
 CONFIG_GPIO_RDC321X=m
+# end of PCI GPIO expanders
 
 #
 # SPI GPIO expanders
@@ -4054,11 +4252,15 @@ CONFIG_GPIO_MAX7301=m
 CONFIG_GPIO_MC33880=m
 CONFIG_GPIO_PISOSR=m
 # CONFIG_GPIO_XRA1403 is not set
+# end of SPI GPIO expanders
 
 #
 # USB GPIO expanders
 #
 CONFIG_GPIO_VIPERBOARD=m
+# end of USB GPIO expanders
+
+CONFIG_GPIO_MOCKUP=m
 CONFIG_W1=m
 CONFIG_W1_CON=y
 
@@ -4070,6 +4272,7 @@ CONFIG_W1_MASTER_DS2490=m
 CONFIG_W1_MASTER_DS2482=m
 CONFIG_W1_MASTER_DS1WM=m
 CONFIG_W1_MASTER_GPIO=m
+# end of 1-wire Bus Masters
 
 #
 # 1-wire Slaves
@@ -4091,6 +4294,8 @@ CONFIG_W1_SLAVE_DS2780=m
 CONFIG_W1_SLAVE_DS2781=m
 CONFIG_W1_SLAVE_DS28E04=m
 CONFIG_W1_SLAVE_DS28E17=m
+# end of 1-wire Slaves
+
 CONFIG_POWER_AVS=y
 # CONFIG_POWER_RESET is not set
 CONFIG_POWER_SUPPLY=y
@@ -4127,7 +4332,7 @@ CONFIG_CHARGER_MAX8903=m
 CONFIG_CHARGER_LP8727=m
 CONFIG_CHARGER_GPIO=m
 CONFIG_CHARGER_MANAGER=y
-# CONFIG_CHARGER_LTC3651 is not set
+CONFIG_CHARGER_LT3651=m
 CONFIG_CHARGER_BQ2415X=m
 CONFIG_CHARGER_BQ24190=m
 CONFIG_CHARGER_BQ24257=m
@@ -4244,13 +4449,15 @@ CONFIG_SENSORS_NCT6775=m
 CONFIG_SENSORS_NCT7802=m
 CONFIG_SENSORS_NCT7904=m
 CONFIG_SENSORS_NPCM7XX=m
-# CONFIG_SENSORS_OCC_P8_I2C is not set
 CONFIG_SENSORS_PCF8591=m
 CONFIG_PMBUS=m
 CONFIG_SENSORS_PMBUS=m
 CONFIG_SENSORS_ADM1275=m
 CONFIG_SENSORS_IBM_CFFPS=m
 # CONFIG_SENSORS_IR35221 is not set
+CONFIG_SENSORS_IR38064=m
+# CONFIG_SENSORS_IRPS5401 is not set
+CONFIG_SENSORS_ISL68137=m
 CONFIG_SENSORS_LM25066=m
 CONFIG_SENSORS_LTC2978=m
 # CONFIG_SENSORS_LTC2978_REGULATOR is not set
@@ -4260,6 +4467,7 @@ CONFIG_SENSORS_MAX20751=m
 CONFIG_SENSORS_MAX31785=m
 CONFIG_SENSORS_MAX34440=m
 CONFIG_SENSORS_MAX8688=m
+# CONFIG_SENSORS_PXE1610 is not set
 # CONFIG_SENSORS_TPS40422 is not set
 CONFIG_SENSORS_TPS53679=m
 CONFIG_SENSORS_UCD9000=m
@@ -4351,14 +4559,25 @@ CONFIG_INTEL_SOC_DTS_IOSF_CORE=m
 CONFIG_INT340X_THERMAL=m
 CONFIG_ACPI_THERMAL_REL=m
 CONFIG_INT3406_THERMAL=m
+CONFIG_PROC_THERMAL_MMIO_RAPL=y
+# end of ACPI INT340X thermal drivers
+
 CONFIG_INTEL_PCH_THERMAL=m
+# end of Intel thermal drivers
+
 CONFIG_GENERIC_ADC_THERMAL=m
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_CORE=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
 CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
+CONFIG_WATCHDOG_OPEN_TIMEOUT=0
 CONFIG_WATCHDOG_SYSFS=y
 
+#
+# Watchdog Pretimeout Governors
+#
+# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
+
 #
 # Watchdog Device Drivers
 #
@@ -4394,8 +4613,8 @@ CONFIG_ITCO_VENDOR_SUPPORT=y
 CONFIG_IT8712F_WDT=m
 CONFIG_IT87_WDT=m
 CONFIG_HP_WATCHDOG=m
-CONFIG_KEMPLD_WDT=m
 CONFIG_HPWDT_NMI_DECODING=y
+CONFIG_KEMPLD_WDT=m
 CONFIG_SC1200_WDT=m
 CONFIG_PC87413_WDT=m
 CONFIG_NV_TCO=m
@@ -4426,11 +4645,6 @@ CONFIG_WDTPCI=m
 # USB-based Watchdog Cards
 #
 CONFIG_USBPCWATCHDOG=m
-
-#
-# Watchdog Pretimeout Governors
-#
-# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
 CONFIG_SSB_POSSIBLE=y
 CONFIG_SSB=m
 CONFIG_SSB_SPROM=y
@@ -4471,9 +4685,11 @@ CONFIG_MFD_CROS_EC=m
 CONFIG_MFD_MADERA=m
 CONFIG_MFD_MADERA_I2C=m
 CONFIG_MFD_MADERA_SPI=m
+# CONFIG_MFD_CS47L15 is not set
 CONFIG_MFD_CS47L35=y
 CONFIG_MFD_CS47L85=y
 CONFIG_MFD_CS47L90=y
+# CONFIG_MFD_CS47L92 is not set
 # CONFIG_PMIC_DA903X is not set
 CONFIG_PMIC_DA9052=y
 CONFIG_MFD_DA9052_SPI=y
@@ -4567,6 +4783,8 @@ CONFIG_MFD_WM831X_SPI=y
 # CONFIG_MFD_WM8350_I2C is not set
 # CONFIG_MFD_WM8994 is not set
 # CONFIG_RAVE_SP_CORE is not set
+# end of Multifunction device drivers
+
 CONFIG_REGULATOR=y
 # CONFIG_REGULATOR_DEBUG is not set
 CONFIG_REGULATOR_FIXED_VOLTAGE=m
@@ -4616,6 +4834,7 @@ CONFIG_REGULATOR_PWM=m
 CONFIG_REGULATOR_QCOM_SPMI=m
 CONFIG_REGULATOR_RT5033=m
 CONFIG_REGULATOR_SKY81452=m
+# CONFIG_REGULATOR_SLG51000 is not set
 CONFIG_REGULATOR_TPS51632=m
 CONFIG_REGULATOR_TPS6105X=m
 CONFIG_REGULATOR_TPS62360=m
@@ -4812,6 +5031,7 @@ CONFIG_DVB_USB_DIBUSB_MC=m
 CONFIG_DVB_USB_DIB0700=m
 CONFIG_DVB_USB_UMT_010=m
 CONFIG_DVB_USB_CXUSB=m
+# CONFIG_DVB_USB_CXUSB_ANALOG is not set
 CONFIG_DVB_USB_M920X=m
 CONFIG_DVB_USB_DIGITV=m
 CONFIG_DVB_USB_VP7045=m
@@ -4986,6 +5206,7 @@ CONFIG_RADIO_WL1273=m
 # Texas Instruments WL128x FM driver (ST based)
 #
 CONFIG_RADIO_WL128X=m
+# end of Texas Instruments WL128x FM driver (ST based)
 
 #
 # Supported FireWire (IEEE 1394) Adapters
@@ -5020,18 +5241,24 @@ CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
 CONFIG_MEDIA_ATTACH=y
 CONFIG_VIDEO_IR_I2C=m
 
+#
+# I2C Encoders, decoders, sensors and other helper chips
+#
+
 #
 # Audio decoders, processors and mixers
 #
 CONFIG_VIDEO_TVAUDIO=m
 CONFIG_VIDEO_TDA7432=m
 CONFIG_VIDEO_TDA9840=m
+# CONFIG_VIDEO_TDA1997X is not set
 CONFIG_VIDEO_TEA6415C=m
 CONFIG_VIDEO_TEA6420=m
 CONFIG_VIDEO_MSP3400=m
 CONFIG_VIDEO_CS3308=m
 CONFIG_VIDEO_CS5345=m
 CONFIG_VIDEO_CS53L32A=m
+# CONFIG_VIDEO_TLV320AIC23B is not set
 CONFIG_VIDEO_UDA1342=m
 CONFIG_VIDEO_WM8775=m
 CONFIG_VIDEO_WM8739=m
@@ -5046,17 +5273,26 @@ CONFIG_VIDEO_SAA6588=m
 #
 # Video decoders
 #
-CONFIG_VIDEO_BT819=m
-CONFIG_VIDEO_BT856=m
-CONFIG_VIDEO_BT866=m
-CONFIG_VIDEO_KS0127=m
-CONFIG_VIDEO_SAA7110=m
+# CONFIG_VIDEO_ADV7180 is not set
+# CONFIG_VIDEO_ADV7183 is not set
+# CONFIG_VIDEO_ADV7604 is not set
+# CONFIG_VIDEO_ADV7842 is not set
+# CONFIG_VIDEO_BT819 is not set
+# CONFIG_VIDEO_BT856 is not set
+# CONFIG_VIDEO_BT866 is not set
+# CONFIG_VIDEO_KS0127 is not set
+# CONFIG_VIDEO_ML86V7667 is not set
+# CONFIG_VIDEO_SAA7110 is not set
 CONFIG_VIDEO_SAA711X=m
+# CONFIG_VIDEO_TC358743 is not set
+# CONFIG_VIDEO_TVP514X is not set
 CONFIG_VIDEO_TVP5150=m
+# CONFIG_VIDEO_TVP7002 is not set
 CONFIG_VIDEO_TW2804=m
 CONFIG_VIDEO_TW9903=m
 CONFIG_VIDEO_TW9906=m
-CONFIG_VIDEO_VPX3220=m
+# CONFIG_VIDEO_TW9910 is not set
+# CONFIG_VIDEO_VPX3220 is not set
 
 #
 # Video and audio decoders
@@ -5068,21 +5304,77 @@ CONFIG_VIDEO_CX25840=m
 # Video encoders
 #
 CONFIG_VIDEO_SAA7127=m
-CONFIG_VIDEO_SAA7185=m
-CONFIG_VIDEO_ADV7170=m
-CONFIG_VIDEO_ADV7175=m
+# CONFIG_VIDEO_SAA7185 is not set
+# CONFIG_VIDEO_ADV7170 is not set
+# CONFIG_VIDEO_ADV7175 is not set
+# CONFIG_VIDEO_ADV7343 is not set
+# CONFIG_VIDEO_ADV7393 is not set
+# CONFIG_VIDEO_ADV7511 is not set
+# CONFIG_VIDEO_AD9389B is not set
+# CONFIG_VIDEO_AK881X is not set
+# CONFIG_VIDEO_THS8200 is not set
 
 #
 # Camera sensor devices
 #
+# CONFIG_VIDEO_IMX214 is not set
+# CONFIG_VIDEO_IMX258 is not set
+# CONFIG_VIDEO_IMX274 is not set
+# CONFIG_VIDEO_IMX319 is not set
+# CONFIG_VIDEO_IMX355 is not set
 CONFIG_VIDEO_OV2640=m
+# CONFIG_VIDEO_OV2659 is not set
+# CONFIG_VIDEO_OV2680 is not set
+# CONFIG_VIDEO_OV2685 is not set
+# CONFIG_VIDEO_OV5647 is not set
+# CONFIG_VIDEO_OV6650 is not set
+# CONFIG_VIDEO_OV5670 is not set
+# CONFIG_VIDEO_OV5695 is not set
+# CONFIG_VIDEO_OV7251 is not set
+# CONFIG_VIDEO_OV772X is not set
 CONFIG_VIDEO_OV7640=m
 CONFIG_VIDEO_OV7670=m
+# CONFIG_VIDEO_OV7740 is not set
+# CONFIG_VIDEO_OV8856 is not set
+# CONFIG_VIDEO_OV9640 is not set
+# CONFIG_VIDEO_OV9650 is not set
+# CONFIG_VIDEO_OV13858 is not set
+# CONFIG_VIDEO_VS6624 is not set
+# CONFIG_VIDEO_MT9M001 is not set
+# CONFIG_VIDEO_MT9M032 is not set
+# CONFIG_VIDEO_MT9M111 is not set
+# CONFIG_VIDEO_MT9P031 is not set
+# CONFIG_VIDEO_MT9T001 is not set
+# CONFIG_VIDEO_MT9T112 is not set
 CONFIG_VIDEO_MT9V011=m
+# CONFIG_VIDEO_MT9V032 is not set
+# CONFIG_VIDEO_MT9V111 is not set
+# CONFIG_VIDEO_SR030PC30 is not set
+# CONFIG_VIDEO_NOON010PC30 is not set
+# CONFIG_VIDEO_M5MOLS is not set
+# CONFIG_VIDEO_RJ54N1 is not set
+# CONFIG_VIDEO_S5K6AA is not set
+# CONFIG_VIDEO_S5K6A3 is not set
+# CONFIG_VIDEO_S5K4ECGX is not set
+# CONFIG_VIDEO_S5K5BAF is not set
+# CONFIG_VIDEO_SMIAPP is not set
+# CONFIG_VIDEO_ET8EK8 is not set
+# CONFIG_VIDEO_S5C73M3 is not set
+
+#
+# Lens drivers
+#
+# CONFIG_VIDEO_AD5820 is not set
+# CONFIG_VIDEO_AK7375 is not set
+# CONFIG_VIDEO_DW9714 is not set
+# CONFIG_VIDEO_DW9807_VCM is not set
 
 #
 # Flash devices
 #
+# CONFIG_VIDEO_ADP1653 is not set
+# CONFIG_VIDEO_LM3560 is not set
+# CONFIG_VIDEO_LM3646 is not set
 
 #
 # Video improvement chips
@@ -5102,13 +5394,29 @@ CONFIG_VIDEO_SAA6752HS=m
 #
 # Miscellaneous helper chips
 #
+# CONFIG_VIDEO_THS7303 is not set
 CONFIG_VIDEO_M52790=m
+# CONFIG_VIDEO_I2C is not set
+# CONFIG_VIDEO_ST_MIPID02 is not set
+# end of I2C Encoders, decoders, sensors and other helper chips
+
+#
+# SPI helper chips
+#
+# CONFIG_VIDEO_GS1662 is not set
+# end of SPI helper chips
 
 #
 # Media SPI Adapters
 #
 # CONFIG_CXD2880_SPI_DRV is not set
+# end of Media SPI Adapters
+
 CONFIG_MEDIA_TUNER=m
+
+#
+# Customize TV tuners
+#
 CONFIG_MEDIA_TUNER_SIMPLE=m
 CONFIG_MEDIA_TUNER_TDA18250=m
 CONFIG_MEDIA_TUNER_TDA8290=m
@@ -5117,6 +5425,7 @@ CONFIG_MEDIA_TUNER_TDA18271=m
 CONFIG_MEDIA_TUNER_TDA9887=m
 CONFIG_MEDIA_TUNER_TEA5761=m
 CONFIG_MEDIA_TUNER_TEA5767=m
+# CONFIG_MEDIA_TUNER_MSI001 is not set
 CONFIG_MEDIA_TUNER_MT20XX=m
 CONFIG_MEDIA_TUNER_MT2060=m
 CONFIG_MEDIA_TUNER_MT2063=m
@@ -5145,6 +5454,11 @@ CONFIG_MEDIA_TUNER_R820T=m
 CONFIG_MEDIA_TUNER_MXL301RF=m
 CONFIG_MEDIA_TUNER_QM1D1C0042=m
 CONFIG_MEDIA_TUNER_QM1D1B0004=m
+# end of Customize TV tuners
+
+#
+# Customise DVB Frontends
+#
 
 #
 # Multistandard (satellite) frontends
@@ -5205,6 +5519,7 @@ CONFIG_DVB_SP8870=m
 CONFIG_DVB_SP887X=m
 CONFIG_DVB_CX22700=m
 CONFIG_DVB_CX22702=m
+# CONFIG_DVB_S5H1432 is not set
 CONFIG_DVB_DRXD=m
 CONFIG_DVB_L64781=m
 CONFIG_DVB_TDA1004X=m
@@ -5215,6 +5530,7 @@ CONFIG_DVB_DIB3000MB=m
 CONFIG_DVB_DIB3000MC=m
 CONFIG_DVB_DIB7000M=m
 CONFIG_DVB_DIB7000P=m
+# CONFIG_DVB_DIB9000 is not set
 CONFIG_DVB_TDA10048=m
 CONFIG_DVB_AF9013=m
 CONFIG_DVB_EC100=m
@@ -5227,6 +5543,7 @@ CONFIG_DVB_SI2168=m
 CONFIG_DVB_AS102_FE=m
 CONFIG_DVB_ZD1301_DEMOD=m
 CONFIG_DVB_GP8PSK_FE=m
+# CONFIG_DVB_CXD2880 is not set
 
 #
 # DVB-C (cable) frontends
@@ -5264,6 +5581,7 @@ CONFIG_DVB_MB86A20S=m
 # ISDB-S (satellite) & ISDB-T (terrestrial) frontends
 #
 CONFIG_DVB_TC90522=m
+# CONFIG_DVB_MN88443X is not set
 
 #
 # Digital terrestrial only tuners/PLL
@@ -5277,12 +5595,14 @@ CONFIG_DVB_TUNER_DIB0090=m
 #
 CONFIG_DVB_DRX39XYJ=m
 CONFIG_DVB_LNBH25=m
+# CONFIG_DVB_LNBH29 is not set
 CONFIG_DVB_LNBP21=m
 CONFIG_DVB_LNBP22=m
 CONFIG_DVB_ISL6405=m
 CONFIG_DVB_ISL6421=m
 CONFIG_DVB_ISL6423=m
 CONFIG_DVB_A8293=m
+# CONFIG_DVB_LGS8GL5 is not set
 CONFIG_DVB_LGS8GXX=m
 CONFIG_DVB_ATBM8830=m
 CONFIG_DVB_TDA665x=m
@@ -5303,6 +5623,7 @@ CONFIG_DVB_SP2=m
 # Tools to develop new frontends
 #
 CONFIG_DVB_DUMMY_FE=m
+# end of Customise DVB Frontends
 
 #
 # Graphics support
@@ -5328,8 +5649,10 @@ CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 CONFIG_DRM_DP_CEC=y
 CONFIG_DRM_TTM=m
+CONFIG_DRM_VRAM_HELPER=m
 CONFIG_DRM_GEM_CMA_HELPER=y
 CONFIG_DRM_KMS_CMA_HELPER=y
+CONFIG_DRM_GEM_SHMEM_HELPER=y
 CONFIG_DRM_VM=y
 CONFIG_DRM_SCHED=m
 
@@ -5340,47 +5663,46 @@ CONFIG_DRM_I2C_CH7006=m
 CONFIG_DRM_I2C_SIL164=m
 CONFIG_DRM_I2C_NXP_TDA998X=m
 # CONFIG_DRM_I2C_NXP_TDA9950 is not set
+# end of I2C encoder or helper chips
 
 #
 # ARM devices
 #
+# end of ARM devices
+
 CONFIG_DRM_RADEON=m
 CONFIG_DRM_RADEON_USERPTR=y
 CONFIG_DRM_AMDGPU=m
 CONFIG_DRM_AMDGPU_SI=y
 CONFIG_DRM_AMDGPU_CIK=y
-CONFIG_DRM_AMDGPU_USERPTR=y
 # CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set
 
 #
 # ACP (Audio CoProcessor) Configuration
 #
 CONFIG_DRM_AMD_ACP=y
+# end of ACP (Audio CoProcessor) Configuration
 
 #
 # Display Engine Configuration
 #
 CONFIG_DRM_AMD_DC=y
 CONFIG_DRM_AMD_DC_DCN1_0=y
-CONFIG_DRM_AMD_DC_DCN1_01=y
+CONFIG_DRM_AMD_DC_DCN2_0=y
+CONFIG_DRM_AMD_DC_DSC_SUPPORT=y
 # CONFIG_DEBUG_KERNEL_DC is not set
-CONFIG_HSA_AMD=y
+# end of Display Engine Configuration
 
-#
-# AMD Library routines
-#
-CONFIG_CHASH=m
-# CONFIG_CHASH_STATS is not set
-# CONFIG_CHASH_SELFTEST is not set
+CONFIG_HSA_AMD=y
 CONFIG_DRM_NOUVEAU=m
 CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT=y
 CONFIG_NOUVEAU_DEBUG=5
 CONFIG_NOUVEAU_DEBUG_DEFAULT=3
 # CONFIG_NOUVEAU_DEBUG_MMU is not set
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
-# CONFIG_DRM_NOUVEAU_SVM is not set
 CONFIG_DRM_I915=m
 # CONFIG_DRM_I915_ALPHA_SUPPORT is not set
+CONFIG_DRM_I915_FORCE_PROBE=""
 CONFIG_DRM_I915_CAPTURE_ERROR=y
 CONFIG_DRM_I915_COMPRESS_ERROR=y
 CONFIG_DRM_I915_USERPTR=y
@@ -5392,6 +5714,7 @@ CONFIG_DRM_I915_GVT_KVMGT=m
 #
 # CONFIG_DRM_I915_WERROR is not set
 # CONFIG_DRM_I915_DEBUG is not set
+# CONFIG_DRM_I915_DEBUG_MMIO is not set
 # CONFIG_DRM_I915_SW_FENCE_DEBUG_OBJECTS is not set
 # CONFIG_DRM_I915_SW_FENCE_CHECK_DAG is not set
 # CONFIG_DRM_I915_DEBUG_GUC is not set
@@ -5399,8 +5722,18 @@ CONFIG_DRM_I915_GVT_KVMGT=m
 # CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS is not set
 # CONFIG_DRM_I915_DEBUG_VBLANK_EVADE is not set
 # CONFIG_DRM_I915_DEBUG_RUNTIME_PM is not set
+# end of drm/i915 Debugging
+
+#
+# drm/i915 Profile Guided Optimisation
+#
+CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND=250
+CONFIG_DRM_I915_SPIN_REQUEST=5
+# end of drm/i915 Profile Guided Optimisation
+
 CONFIG_DRM_VGEM=m
 CONFIG_DRM_VKMS=m
+CONFIG_DRM_ATI_PCIGART=y
 CONFIG_DRM_VMWGFX=m
 CONFIG_DRM_VMWGFX_FBCON=y
 CONFIG_DRM_GMA500=m
@@ -5419,6 +5752,8 @@ CONFIG_DRM_PANEL=y
 # Display Panels
 #
 CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m
+# end of Display Panels
+
 CONFIG_DRM_BRIDGE=y
 CONFIG_DRM_PANEL_BRIDGE=y
 
@@ -5426,6 +5761,8 @@ CONFIG_DRM_PANEL_BRIDGE=y
 # Display Interface Bridges
 #
 CONFIG_DRM_ANALOGIX_ANX78XX=m
+# end of Display Interface Bridges
+
 # CONFIG_DRM_ETNAVIV is not set
 CONFIG_DRM_HISI_HIBMC=m
 CONFIG_DRM_TINYDRM=m
@@ -5438,7 +5775,14 @@ CONFIG_TINYDRM_REPAPER=m
 CONFIG_TINYDRM_ST7586=m
 # CONFIG_TINYDRM_ST7735R is not set
 # CONFIG_DRM_XEN is not set
-# CONFIG_DRM_LEGACY is not set
+CONFIG_DRM_VBOXVIDEO=m
+CONFIG_DRM_LEGACY=y
+CONFIG_DRM_TDFX=m
+CONFIG_DRM_R128=m
+CONFIG_DRM_MGA=m
+CONFIG_DRM_SIS=m
+CONFIG_DRM_VIA=m
+CONFIG_DRM_SAVAGE=m
 CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
 
 #
@@ -5517,7 +5861,11 @@ CONFIG_XEN_FBDEV_FRONTEND=m
 CONFIG_FB_HYPERV=m
 # CONFIG_FB_SIMPLE is not set
 CONFIG_FB_SM712=m
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
+# end of Frame buffer Devices
+
+#
+# Backlight & LCD device support
+#
 CONFIG_LCD_CLASS_DEVICE=m
 CONFIG_LCD_L4F00242T03=m
 CONFIG_LCD_LMS283GF05=m
@@ -5551,6 +5899,8 @@ CONFIG_BACKLIGHT_GPIO=m
 CONFIG_BACKLIGHT_LV5207LP=m
 CONFIG_BACKLIGHT_BD6107=m
 # CONFIG_BACKLIGHT_ARCXCNN is not set
+# end of Backlight & LCD device support
+
 CONFIG_VGASTATE=m
 CONFIG_HDMI=y
 
@@ -5568,7 +5918,11 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y
+# end of Console display driver support
+
 # CONFIG_LOGO is not set
+# end of Graphics support
+
 CONFIG_SOUND=m
 CONFIG_SOUND_OSS_CORE=y
 CONFIG_SOUND_OSS_CORE_PRECLAIM=y
@@ -5723,6 +6077,8 @@ CONFIG_SND_HDA_CODEC_CMEDIA=m
 CONFIG_SND_HDA_CODEC_SI3054=m
 CONFIG_SND_HDA_GENERIC=m
 CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1
+# end of HD-Audio
+
 CONFIG_SND_HDA_CORE=m
 CONFIG_SND_HDA_DSP_LOADER=y
 CONFIG_SND_HDA_COMPONENT=y
@@ -5732,6 +6088,7 @@ CONFIG_SND_HDA_PREALLOC_SIZE=64
 CONFIG_SND_SPI=y
 CONFIG_SND_USB=y
 CONFIG_SND_USB_AUDIO=m
+CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER=y
 CONFIG_SND_USB_UA101=m
 CONFIG_SND_USB_USX2Y=m
 CONFIG_SND_USB_CAIAQ=m
@@ -5779,11 +6136,14 @@ CONFIG_SND_DESIGNWARE_I2S=m
 #
 # CONFIG_SND_SOC_FSL_ASRC is not set
 # CONFIG_SND_SOC_FSL_SAI is not set
+CONFIG_SND_SOC_FSL_AUDMIX=m
 # CONFIG_SND_SOC_FSL_SSI is not set
 # CONFIG_SND_SOC_FSL_SPDIF is not set
 # CONFIG_SND_SOC_FSL_ESAI is not set
 CONFIG_SND_SOC_FSL_MICFIL=m
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
+# end of SoC Audio for Freescale CPUs
+
 # CONFIG_SND_I2S_HI6210_I2S is not set
 CONFIG_SND_SOC_IMG=y
 CONFIG_SND_SOC_IMG_I2S_IN=m
@@ -5810,6 +6170,8 @@ CONFIG_SND_SOC_INTEL_KBL=m
 CONFIG_SND_SOC_INTEL_GLK=m
 CONFIG_SND_SOC_INTEL_CNL=m
 CONFIG_SND_SOC_INTEL_CFL=m
+# CONFIG_SND_SOC_INTEL_CML_H is not set
+# CONFIG_SND_SOC_INTEL_CML_LP is not set
 CONFIG_SND_SOC_INTEL_SKYLAKE_FAMILY=m
 CONFIG_SND_SOC_INTEL_SKYLAKE_SSP_CLK=m
 CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
@@ -5825,6 +6187,7 @@ CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_NAU8824_MACH=m
+# CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH is not set
 CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
@@ -5840,11 +6203,53 @@ CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98927_MACH=m
 CONFIG_SND_SOC_INTEL_KBL_RT5660_MACH=m
 CONFIG_SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH=m
+CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH=m
 CONFIG_SND_SOC_MTK_BTCVSD=m
+CONFIG_SND_SOC_SOF_TOPLEVEL=y
+CONFIG_SND_SOC_SOF_PCI=m
+CONFIG_SND_SOC_SOF_ACPI=m
+CONFIG_SND_SOC_SOF_OPTIONS=m
+# CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT is not set
+# CONFIG_SND_SOC_SOF_STRICT_ABI_CHECKS is not set
+# CONFIG_SND_SOC_SOF_DEBUG is not set
+CONFIG_SND_SOC_SOF=m
+CONFIG_SND_SOC_SOF_PROBE_WORK_QUEUE=y
+CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL=y
+CONFIG_SND_SOC_SOF_INTEL_ACPI=m
+CONFIG_SND_SOC_SOF_INTEL_PCI=m
+CONFIG_SND_SOC_SOF_INTEL_HIFI_EP_IPC=m
+CONFIG_SND_SOC_SOF_INTEL_ATOM_HIFI_EP=m
+CONFIG_SND_SOC_SOF_INTEL_COMMON=m
+CONFIG_SND_SOC_SOF_BAYTRAIL_SUPPORT=y
+CONFIG_SND_SOC_SOF_BAYTRAIL=m
+CONFIG_SND_SOC_SOF_BROADWELL_SUPPORT=y
+CONFIG_SND_SOC_SOF_BROADWELL=m
+CONFIG_SND_SOC_SOF_MERRIFIELD_SUPPORT=y
+CONFIG_SND_SOC_SOF_MERRIFIELD=m
+CONFIG_SND_SOC_SOF_APOLLOLAKE_SUPPORT=y
+CONFIG_SND_SOC_SOF_APOLLOLAKE=m
+CONFIG_SND_SOC_SOF_GEMINILAKE_SUPPORT=y
+CONFIG_SND_SOC_SOF_GEMINILAKE=m
+CONFIG_SND_SOC_SOF_CANNONLAKE_SUPPORT=y
+CONFIG_SND_SOC_SOF_CANNONLAKE=m
+CONFIG_SND_SOC_SOF_COFFEELAKE_SUPPORT=y
+CONFIG_SND_SOC_SOF_COFFEELAKE=m
+CONFIG_SND_SOC_SOF_ICELAKE_SUPPORT=y
+CONFIG_SND_SOC_SOF_ICELAKE=m
+# CONFIG_SND_SOC_SOF_COMETLAKE_LP_SUPPORT is not set
+# CONFIG_SND_SOC_SOF_COMETLAKE_H_SUPPORT is not set
+CONFIG_SND_SOC_SOF_HDA_COMMON=m
+CONFIG_SND_SOC_SOF_HDA_LINK=y
+CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC=y
+CONFIG_SND_SOC_SOF_HDA_LINK_BASELINE=m
+CONFIG_SND_SOC_SOF_HDA=m
+CONFIG_SND_SOC_SOF_XTENSA=m
 
 #
 # STMicroelectronics STM32 SOC audio support
 #
+# end of STMicroelectronics STM32 SOC audio support
+
 CONFIG_SND_SOC_XILINX_I2S=m
 CONFIG_SND_SOC_XILINX_AUDIO_FORMATTER=m
 CONFIG_SND_SOC_XILINX_SPDIF=m
@@ -5894,6 +6299,7 @@ CONFIG_SND_SOC_CS43130=m
 CONFIG_SND_SOC_CS4341=m
 CONFIG_SND_SOC_CS4349=m
 CONFIG_SND_SOC_CS53L30=m
+# CONFIG_SND_SOC_CX2072X is not set
 CONFIG_SND_SOC_DA7213=m
 CONFIG_SND_SOC_DA7219=m
 CONFIG_SND_SOC_DMIC=m
@@ -6019,6 +6425,8 @@ CONFIG_SND_SOC_NAU8822=m
 CONFIG_SND_SOC_NAU8824=m
 CONFIG_SND_SOC_NAU8825=m
 CONFIG_SND_SOC_TPA6130A2=m
+# end of CODEC drivers
+
 CONFIG_SND_SIMPLE_CARD_UTILS=m
 CONFIG_SND_SIMPLE_CARD=m
 CONFIG_SND_X86=y
@@ -6054,6 +6462,7 @@ CONFIG_HID_CHERRY=m
 CONFIG_HID_CHICONY=m
 CONFIG_HID_CORSAIR=m
 CONFIG_HID_COUGAR=m
+CONFIG_HID_MACALLY=m
 CONFIG_HID_PRODIKEYS=m
 CONFIG_HID_CMEDIA=m
 CONFIG_HID_CP2112=m
@@ -6136,6 +6545,7 @@ CONFIG_HID_THINGM=m
 CONFIG_HID_THRUSTMASTER=m
 CONFIG_THRUSTMASTER_FF=y
 CONFIG_HID_UDRAW_PS3=m
+CONFIG_HID_U2FZERO=m
 CONFIG_HID_WACOM=m
 CONFIG_HID_WIIMOTE=m
 CONFIG_HID_XINMO=m
@@ -6145,6 +6555,7 @@ CONFIG_HID_ZYDACRON=m
 CONFIG_HID_SENSOR_HUB=m
 CONFIG_HID_SENSOR_CUSTOM_SENSOR=m
 CONFIG_HID_ALPS=m
+# end of Special HID drivers
 
 #
 # USB HID support
@@ -6158,16 +6569,23 @@ CONFIG_USB_HIDDEV=y
 #
 CONFIG_USB_KBD=m
 CONFIG_USB_MOUSE=m
+# end of USB HID Boot Protocol drivers
+# end of USB HID support
 
 #
 # I2C HID support
 #
 CONFIG_I2C_HID=m
+# end of I2C HID support
 
 #
 # Intel ISH HID support
 #
 CONFIG_INTEL_ISH_HID=m
+CONFIG_INTEL_ISH_FIRMWARE_DOWNLOADER=m
+# end of Intel ISH HID support
+# end of HID support
+
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 CONFIG_USB_SUPPORT=y
 CONFIG_USB_COMMON=y
@@ -6411,6 +6829,8 @@ CONFIG_USB_GPIO_VBUS=m
 CONFIG_TAHVO_USB=m
 # CONFIG_TAHVO_USB_HOST_BY_DEFAULT is not set
 CONFIG_USB_ISP1301=m
+# end of USB Physical Layer drivers
+
 CONFIG_USB_GADGET=m
 # CONFIG_USB_GADGET_DEBUG is not set
 # CONFIG_USB_GADGET_DEBUG_FILES is not set
@@ -6443,6 +6863,8 @@ CONFIG_USB_NET2280=m
 CONFIG_USB_GOKU=m
 CONFIG_USB_EG20T=m
 CONFIG_USB_DUMMY_HCD=m
+# end of USB Peripheral Controller
+
 CONFIG_USB_LIBCOMPOSITE=m
 CONFIG_USB_F_ACM=m
 CONFIG_USB_U_SERIAL=m
@@ -6523,11 +6945,15 @@ CONFIG_TYPEC_TPS6598X=m
 # USB Type-C Multiplexer/DeMultiplexer Switch support
 #
 # CONFIG_TYPEC_MUX_PI3USB30532 is not set
+# end of USB Type-C Multiplexer/DeMultiplexer Switch support
 
 #
 # USB Type-C Alternate Mode drivers
 #
 CONFIG_TYPEC_DP_ALTMODE=m
+CONFIG_TYPEC_NVIDIA_ALTMODE=m
+# end of USB Type-C Alternate Mode drivers
+
 CONFIG_USB_ROLE_SWITCH=m
 CONFIG_USB_ROLES_INTEL_XHCI=m
 CONFIG_USB_LED_TRIG=y
@@ -6596,6 +7022,7 @@ CONFIG_LEDS_CLASS_FLASH=m
 CONFIG_LEDS_APU=m
 CONFIG_LEDS_AS3645A=m
 CONFIG_LEDS_LM3530=m
+CONFIG_LEDS_LM3532=m
 CONFIG_LEDS_LM3533=m
 CONFIG_LEDS_LM3642=m
 # CONFIG_LEDS_LM3601X is not set
@@ -6621,7 +7048,6 @@ CONFIG_LEDS_PWM=m
 CONFIG_LEDS_REGULATOR=m
 CONFIG_LEDS_BD2802=m
 CONFIG_LEDS_INTEL_SS4200=m
-CONFIG_LEDS_LT3593=m
 CONFIG_LEDS_MC13783=m
 CONFIG_LEDS_TCA6507=m
 CONFIG_LEDS_TLC591XX=m
@@ -6636,6 +7062,7 @@ CONFIG_LEDS_MLXCPLD=m
 CONFIG_LEDS_MLXREG=m
 CONFIG_LEDS_USER=m
 CONFIG_LEDS_NIC78BX=m
+# CONFIG_LEDS_TI_LMU_COMMON is not set
 
 #
 # LED Triggers
@@ -6676,11 +7103,10 @@ CONFIG_INFINIBAND_QIB=m
 CONFIG_INFINIBAND_QIB_DCA=y
 CONFIG_INFINIBAND_CXGB3=m
 CONFIG_INFINIBAND_CXGB4=m
+CONFIG_INFINIBAND_EFA=m
 CONFIG_INFINIBAND_I40IW=m
 CONFIG_MLX4_INFINIBAND=m
 CONFIG_MLX5_INFINIBAND=m
-CONFIG_INFINIBAND_NES=m
-# CONFIG_INFINIBAND_NES_DEBUG is not set
 CONFIG_INFINIBAND_OCRDMA=m
 CONFIG_INFINIBAND_VMWARE_PVRDMA=m
 CONFIG_INFINIBAND_USNIC=m
@@ -6691,6 +7117,7 @@ CONFIG_INFINIBAND_HFI1=m
 CONFIG_INFINIBAND_QEDR=m
 CONFIG_INFINIBAND_RDMAVT=m
 CONFIG_RDMA_RXE=m
+# CONFIG_RDMA_SIW is not set
 CONFIG_INFINIBAND_IPOIB=m
 CONFIG_INFINIBAND_IPOIB_CM=y
 CONFIG_INFINIBAND_IPOIB_DEBUG=y
@@ -6766,6 +7193,7 @@ CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_M41T80=m
 CONFIG_RTC_DRV_M41T80_WDT=y
+# CONFIG_RTC_DRV_BD70528 is not set
 CONFIG_RTC_DRV_BQ32K=m
 CONFIG_RTC_DRV_S35390A=m
 CONFIG_RTC_DRV_FM3130=m
@@ -6864,6 +7292,8 @@ CONFIG_QCOM_HIDMA=m
 CONFIG_DW_DMAC_CORE=m
 CONFIG_DW_DMAC=m
 CONFIG_DW_DMAC_PCI=m
+# CONFIG_DW_EDMA is not set
+# CONFIG_DW_EDMA_PCIE is not set
 CONFIG_HSU_DMA=m
 
 #
@@ -6879,6 +7309,8 @@ CONFIG_DMA_ENGINE_RAID=y
 CONFIG_SYNC_FILE=y
 # CONFIG_SW_SYNC is not set
 CONFIG_UDMABUF=y
+# end of DMABUF options
+
 CONFIG_DCA=m
 CONFIG_AUXDISPLAY=y
 # CONFIG_HD44780 is not set
@@ -6926,6 +7358,7 @@ CONFIG_VIRTIO=m
 CONFIG_VIRTIO_MENU=y
 CONFIG_VIRTIO_PCI=m
 CONFIG_VIRTIO_PCI_LEGACY=y
+# CONFIG_VIRTIO_PMEM is not set
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_INPUT=m
 CONFIG_VIRTIO_MMIO=m
@@ -6935,15 +7368,16 @@ CONFIG_VIRTIO_MMIO=m
 # Microsoft Hyper-V guest support
 #
 CONFIG_HYPERV=m
+CONFIG_HYPERV_TIMER=y
 CONFIG_HYPERV_TSCPAGE=y
 CONFIG_HYPERV_UTILS=m
 CONFIG_HYPERV_BALLOON=m
+# end of Microsoft Hyper-V guest support
 
 #
 # Xen driver support
 #
 CONFIG_XEN_BALLOON=y
-# CONFIG_XEN_SELFBALLOONING is not set
 # CONFIG_XEN_BALLOON_MEMORY_HOTPLUG is not set
 CONFIG_XEN_SCRUB_PAGES_DEFAULT=y
 CONFIG_XEN_DEV_EVTCHN=m
@@ -6957,7 +7391,6 @@ CONFIG_XEN_GNTDEV_DMABUF=y
 CONFIG_XEN_GRANT_DEV_ALLOC=m
 CONFIG_XEN_GRANT_DMA_ALLOC=y
 CONFIG_SWIOTLB_XEN=y
-CONFIG_XEN_TMEM=m
 CONFIG_XEN_PCIDEV_BACKEND=m
 CONFIG_XEN_PVCALLS_FRONTEND=m
 # CONFIG_XEN_PVCALLS_BACKEND is not set
@@ -6971,6 +7404,8 @@ CONFIG_XEN_AUTO_XLATE=y
 CONFIG_XEN_ACPI=y
 CONFIG_XEN_SYMS=y
 CONFIG_XEN_HAVE_VPMU=y
+# end of Xen driver support
+
 CONFIG_STAGING=y
 CONFIG_PRISM2_USB=m
 CONFIG_COMEDI=m
@@ -7066,8 +7501,6 @@ CONFIG_RTL8723BS=m
 CONFIG_R8712U=m
 CONFIG_R8188EU=m
 CONFIG_88EU_AP_MODE=y
-CONFIG_R8822BE=m
-CONFIG_RTLWIFI_DEBUG_ST=y
 CONFIG_RTS5208=m
 CONFIG_VT6655=m
 CONFIG_VT6656=m
@@ -7081,14 +7514,15 @@ CONFIG_VT6656=m
 #
 CONFIG_ADIS16203=m
 CONFIG_ADIS16240=m
+# end of Accelerometers
 
 #
 # Analog to digital converters
 #
-CONFIG_AD7780=m
 CONFIG_AD7816=m
 CONFIG_AD7192=m
 CONFIG_AD7280=m
+# end of Analog to digital converters
 
 #
 # Analog digital bi-direction converters
@@ -7096,23 +7530,27 @@ CONFIG_AD7280=m
 CONFIG_ADT7316=m
 CONFIG_ADT7316_SPI=m
 CONFIG_ADT7316_I2C=m
+# end of Analog digital bi-direction converters
 
 #
 # Capacitance to digital converters
 #
 CONFIG_AD7150=m
 CONFIG_AD7746=m
+# end of Capacitance to digital converters
 
 #
 # Direct Digital Synthesis
 #
 CONFIG_AD9832=m
 CONFIG_AD9834=m
+# end of Direct Digital Synthesis
 
 #
 # Network Analyzer, Impedance Converters
 #
 CONFIG_AD5933=m
+# end of Network Analyzer, Impedance Converters
 
 #
 # Active energy metering IC
@@ -7120,11 +7558,15 @@ CONFIG_AD5933=m
 CONFIG_ADE7854=m
 CONFIG_ADE7854_I2C=m
 CONFIG_ADE7854_SPI=m
+# end of Active energy metering IC
 
 #
 # Resolver to digital converters
 #
 CONFIG_AD2S1210=m
+# end of Resolver to digital converters
+# end of IIO staging drivers
+
 CONFIG_FB_SM750=m
 
 #
@@ -7142,16 +7584,10 @@ CONFIG_SPEAKUP_SYNTH_SOFT=m
 CONFIG_SPEAKUP_SYNTH_SPKOUT=m
 CONFIG_SPEAKUP_SYNTH_TXPRT=m
 CONFIG_SPEAKUP_SYNTH_DUMMY=m
+# end of Speakup console speech
+
 CONFIG_STAGING_MEDIA=y
 CONFIG_I2C_BCM2048=m
-CONFIG_VIDEO_ZORAN=m
-CONFIG_VIDEO_ZORAN_DC30=m
-CONFIG_VIDEO_ZORAN_ZR36060=m
-CONFIG_VIDEO_ZORAN_BUZ=m
-CONFIG_VIDEO_ZORAN_DC10=m
-CONFIG_VIDEO_ZORAN_LML33=m
-CONFIG_VIDEO_ZORAN_LML33R10=m
-CONFIG_VIDEO_ZORAN_AVS6EYES=m
 CONFIG_VIDEO_IPU3_IMGU=m
 
 #
@@ -7161,6 +7597,8 @@ CONFIG_VIDEO_IPU3_IMGU=m
 #
 # Android
 #
+# end of Android
+
 CONFIG_LTE_GDM724X=m
 CONFIG_FIREWIRE_SERIAL=m
 CONFIG_FWTTY_MAX_TOTAL_PORTS=64
@@ -7233,7 +7671,6 @@ CONFIG_GREYBUS_SDIO=m
 CONFIG_GREYBUS_SPI=m
 CONFIG_GREYBUS_UART=m
 CONFIG_GREYBUS_USB=m
-CONFIG_DRM_VBOXVIDEO=m
 CONFIG_PI433=m
 
 #
@@ -7241,6 +7678,8 @@ CONFIG_PI433=m
 #
 CONFIG_STAGING_GASKET_FRAMEWORK=m
 CONFIG_STAGING_APEX_DRIVER=m
+# end of Gasket devices
+
 CONFIG_EROFS_FS=m
 # CONFIG_EROFS_FS_DEBUG is not set
 CONFIG_EROFS_FS_XATTR=y
@@ -7250,6 +7689,8 @@ CONFIG_EROFS_FS_SECURITY=y
 # CONFIG_EROFS_FAULT_INJECTION is not set
 CONFIG_EROFS_FS_IO_MAX_RETRIES=5
 # CONFIG_EROFS_FS_ZIP is not set
+# CONFIG_FIELDBUS_DEV is not set
+# CONFIG_KPC2000 is not set
 CONFIG_X86_PLATFORM_DEVICES=y
 CONFIG_ACER_WMI=m
 # CONFIG_ACER_WIRELESS is not set
@@ -7300,6 +7741,7 @@ CONFIG_ASUS_WIRELESS=m
 CONFIG_ACPI_WMI=m
 CONFIG_WMI_BMOF=m
 CONFIG_INTEL_WMI_THUNDERBOLT=m
+# CONFIG_XIAOMI_WMI is not set
 CONFIG_MSI_WMI=m
 CONFIG_PEAQ_WMI=m
 CONFIG_TOPSTAR_LAPTOP=m
@@ -7307,7 +7749,7 @@ CONFIG_ACPI_TOSHIBA=m
 CONFIG_TOSHIBA_BT_RFKILL=m
 CONFIG_TOSHIBA_HAPS=m
 CONFIG_TOSHIBA_WMI=m
-CONFIG_ACPI_CMPC=m
+# CONFIG_ACPI_CMPC is not set
 # CONFIG_INTEL_INT0002_VGPIO is not set
 CONFIG_INTEL_HID_EVENT=m
 CONFIG_INTEL_VBTN=m
@@ -7317,7 +7759,7 @@ CONFIG_IBM_RTL=m
 CONFIG_SAMSUNG_LAPTOP=m
 CONFIG_MXM_WMI=m
 CONFIG_INTEL_OAKTRAIL=m
-CONFIG_SAMSUNG_Q10=m
+# CONFIG_SAMSUNG_Q10 is not set
 CONFIG_APPLE_GMUX=m
 CONFIG_INTEL_RST=m
 CONFIG_INTEL_SMARTCONNECT=m
@@ -7333,17 +7775,26 @@ CONFIG_I2C_MULTI_INSTANTIATE=m
 CONFIG_INTEL_ATOMISP2_PM=m
 CONFIG_HUAWEI_WMI=m
 CONFIG_PCENGINES_APU2=m
+
+#
+# Intel Speed Select Technology interface support
+#
+# CONFIG_INTEL_SPEED_SELECT_INTERFACE is not set
+# end of Intel Speed Select Technology interface support
+
 CONFIG_PMC_ATOM=y
 CONFIG_CHROME_PLATFORMS=y
 CONFIG_CHROMEOS_LAPTOP=m
 CONFIG_CHROMEOS_PSTORE=m
 # CONFIG_CHROMEOS_TBMC is not set
 CONFIG_CROS_EC_I2C=m
+# CONFIG_CROS_EC_ISHTP is not set
 CONFIG_CROS_EC_SPI=m
 CONFIG_CROS_EC_LPC=m
-# CONFIG_CROS_EC_LPC_MEC is not set
 CONFIG_CROS_EC_PROTO=y
 CONFIG_CROS_KBD_LED_BACKLIGHT=m
+CONFIG_CROS_USBPD_LOGGER=m
+# CONFIG_WILCO_EC is not set
 # CONFIG_MELLANOX_PLATFORM is not set
 CONFIG_CLKDEV_LOOKUP=y
 CONFIG_HAVE_CLK_PREPARE=y
@@ -7354,11 +7805,14 @@ CONFIG_COMMON_CLK=y
 #
 CONFIG_COMMON_CLK_WM831X=m
 # CONFIG_COMMON_CLK_MAX9485 is not set
+# CONFIG_COMMON_CLK_SI5341 is not set
 CONFIG_COMMON_CLK_SI5351=m
 CONFIG_COMMON_CLK_SI544=m
 CONFIG_COMMON_CLK_CDCE706=m
 CONFIG_COMMON_CLK_CS2000_CP=m
 CONFIG_COMMON_CLK_PWM=m
+# end of Common Clock Framework
+
 # CONFIG_HWSPINLOCK is not set
 
 #
@@ -7367,6 +7821,8 @@ CONFIG_COMMON_CLK_PWM=m
 CONFIG_CLKEVT_I8253=y
 CONFIG_I8253_LOCK=y
 CONFIG_CLKBLD_I8253=y
+# end of Clock Source drivers
+
 CONFIG_MAILBOX=y
 CONFIG_PCC=y
 CONFIG_ALTERA_MBOX=m
@@ -7377,6 +7833,8 @@ CONFIG_IOMMU_SUPPORT=y
 #
 # Generic IOMMU Pagetable Support
 #
+# end of Generic IOMMU Pagetable Support
+
 # CONFIG_IOMMU_DEBUGFS is not set
 # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
 CONFIG_AMD_IOMMU=y
@@ -7393,6 +7851,7 @@ CONFIG_HYPERV_IOMMU=y
 # Remoteproc drivers
 #
 CONFIG_REMOTEPROC=m
+# end of Remoteproc drivers
 
 #
 # Rpmsg drivers
@@ -7401,6 +7860,8 @@ CONFIG_RPMSG=m
 CONFIG_RPMSG_CHAR=m
 # CONFIG_RPMSG_QCOM_GLINK_RPM is not set
 CONFIG_RPMSG_VIRTIO=m
+# end of Rpmsg drivers
+
 # CONFIG_SOUNDWIRE is not set
 
 #
@@ -7410,28 +7871,42 @@ CONFIG_RPMSG_VIRTIO=m
 #
 # Amlogic SoC drivers
 #
+# end of Amlogic SoC drivers
+
+#
+# Aspeed SoC drivers
+#
+# end of Aspeed SoC drivers
 
 #
 # Broadcom SoC drivers
 #
+# end of Broadcom SoC drivers
 
 #
 # NXP/Freescale QorIQ SoC drivers
 #
+# end of NXP/Freescale QorIQ SoC drivers
 
 #
 # i.MX SoC drivers
 #
+# end of i.MX SoC drivers
 
 #
 # Qualcomm SoC drivers
 #
+# end of Qualcomm SoC drivers
+
 # CONFIG_SOC_TI is not set
 
 #
 # Xilinx SoC drivers
 #
 # CONFIG_XILINX_VCU is not set
+# end of Xilinx SoC drivers
+# end of SOC (System On Chip) specific Drivers
+
 CONFIG_PM_DEVFREQ=y
 
 #
@@ -7455,6 +7930,7 @@ CONFIG_EXTCON=y
 CONFIG_EXTCON_ADC_JACK=m
 CONFIG_EXTCON_ARIZONA=m
 CONFIG_EXTCON_AXP288=m
+# CONFIG_EXTCON_FSA9480 is not set
 CONFIG_EXTCON_GPIO=m
 CONFIG_EXTCON_INTEL_INT3496=m
 CONFIG_EXTCON_MAX3355=m
@@ -7518,6 +7994,7 @@ CONFIG_MXC6255=m
 CONFIG_SCA3000=m
 CONFIG_STK8312=m
 CONFIG_STK8BA50=m
+# end of Accelerometers
 
 #
 # Analog to digital converters
@@ -7533,6 +8010,7 @@ CONFIG_AD7606_IFACE_PARALLEL=m
 CONFIG_AD7606_IFACE_SPI=m
 CONFIG_AD7766=m
 CONFIG_AD7768_1=m
+CONFIG_AD7780=m
 CONFIG_AD7791=m
 CONFIG_AD7793=m
 CONFIG_AD7887=m
@@ -7576,15 +8054,19 @@ CONFIG_TI_ADS7950=m
 CONFIG_TI_AM335X_ADC=m
 CONFIG_TI_TLC4541=m
 CONFIG_VIPERBOARD_ADC=m
+# CONFIG_XILINX_XADC is not set
+# end of Analog to digital converters
 
 #
 # Analog Front Ends
 #
+# end of Analog Front Ends
 
 #
 # Amplifiers
 #
 CONFIG_AD8366=m
+# end of Amplifiers
 
 #
 # Chemical Sensors
@@ -7599,14 +8081,19 @@ CONFIG_PMS7003=m
 CONFIG_SENSIRION_SGP30=m
 CONFIG_SPS30=m
 CONFIG_VZ89X=m
+# end of Chemical Sensors
+
 CONFIG_IIO_CROS_EC_SENSORS_CORE=m
 CONFIG_IIO_CROS_EC_SENSORS=m
+# CONFIG_IIO_CROS_EC_SENSORS_LID_ANGLE is not set
 
 #
 # Hid Sensor IIO Common
 #
 CONFIG_HID_SENSOR_IIO_COMMON=m
 CONFIG_HID_SENSOR_IIO_TRIGGER=m
+# end of Hid Sensor IIO Common
+
 CONFIG_IIO_MS_SENSORS_I2C=m
 
 #
@@ -7614,14 +8101,12 @@ CONFIG_IIO_MS_SENSORS_I2C=m
 #
 CONFIG_IIO_SSP_SENSORS_COMMONS=m
 CONFIG_IIO_SSP_SENSORHUB=m
+# end of SSP Sensor Common
+
 CONFIG_IIO_ST_SENSORS_I2C=m
 CONFIG_IIO_ST_SENSORS_SPI=m
 CONFIG_IIO_ST_SENSORS_CORE=m
 
-#
-# Counters
-#
-
 #
 # Digital to analog converters
 #
@@ -7656,6 +8141,7 @@ CONFIG_TI_DAC082S085=m
 # CONFIG_TI_DAC5571 is not set
 CONFIG_TI_DAC7311=m
 CONFIG_TI_DAC7612=m
+# end of Digital to analog converters
 
 #
 # IIO dummy driver
@@ -7663,6 +8149,7 @@ CONFIG_TI_DAC7612=m
 CONFIG_IIO_SIMPLE_DUMMY=m
 # CONFIG_IIO_SIMPLE_DUMMY_EVENTS is not set
 # CONFIG_IIO_SIMPLE_DUMMY_BUFFER is not set
+# end of IIO dummy driver
 
 #
 # Frequency Synthesizers DDS/PLL
@@ -7672,11 +8159,15 @@ CONFIG_IIO_SIMPLE_DUMMY=m
 # Clock Generator/Distribution
 #
 CONFIG_AD9523=m
+# end of Clock Generator/Distribution
 
 #
 # Phase-Locked Loop (PLL) frequency synthesizers
 #
 CONFIG_ADF4350=m
+# CONFIG_ADF4371 is not set
+# end of Phase-Locked Loop (PLL) frequency synthesizers
+# end of Frequency Synthesizers DDS/PLL
 
 #
 # Digital gyroscope sensors
@@ -7689,6 +8180,9 @@ CONFIG_ADXRS450=m
 CONFIG_BMG160=m
 CONFIG_BMG160_I2C=m
 CONFIG_BMG160_SPI=m
+CONFIG_FXAS21002C=m
+CONFIG_FXAS21002C_I2C=m
+CONFIG_FXAS21002C_SPI=m
 CONFIG_HID_SENSOR_GYRO_3D=m
 CONFIG_MPU3050=m
 CONFIG_MPU3050_I2C=m
@@ -7696,6 +8190,7 @@ CONFIG_IIO_ST_GYRO_3AXIS=m
 CONFIG_IIO_ST_GYRO_I2C_3AXIS=m
 CONFIG_IIO_ST_GYRO_SPI_3AXIS=m
 CONFIG_ITG3200=m
+# end of Digital gyroscope sensors
 
 #
 # Health Sensors
@@ -7708,6 +8203,8 @@ CONFIG_AFE4403=m
 CONFIG_AFE4404=m
 CONFIG_MAX30100=m
 # CONFIG_MAX30102 is not set
+# end of Heart Rate Monitors
+# end of Health Sensors
 
 #
 # Humidity sensors
@@ -7722,6 +8219,7 @@ CONFIG_HTS221_SPI=m
 CONFIG_HTU21=m
 CONFIG_SI7005=m
 CONFIG_SI7020=m
+# end of Humidity sensors
 
 #
 # Inertial measurement units
@@ -7738,6 +8236,8 @@ CONFIG_INV_MPU6050_SPI=m
 CONFIG_IIO_ST_LSM6DSX=m
 CONFIG_IIO_ST_LSM6DSX_I2C=m
 CONFIG_IIO_ST_LSM6DSX_SPI=m
+# end of Inertial measurement units
+
 CONFIG_IIO_ADIS_LIB=m
 CONFIG_IIO_ADIS_LIB_BUFFER=y
 
@@ -7787,6 +8287,7 @@ CONFIG_VCNL4035=m
 CONFIG_VEML6070=m
 # CONFIG_VL6180 is not set
 # CONFIG_ZOPT2201 is not set
+# end of Light sensors
 
 #
 # Magnetometer sensors
@@ -7807,16 +8308,19 @@ CONFIG_IIO_ST_MAGN_SPI_3AXIS=m
 CONFIG_SENSORS_RM3100=m
 CONFIG_SENSORS_RM3100_I2C=m
 CONFIG_SENSORS_RM3100_SPI=m
+# end of Magnetometer sensors
 
 #
 # Multiplexers
 #
+# end of Multiplexers
 
 #
 # Inclinometer sensors
 #
 CONFIG_HID_SENSOR_INCLINOMETER_3D=m
 # CONFIG_HID_SENSOR_DEVICE_ROTATION is not set
+# end of Inclinometer sensors
 
 #
 # Triggers - standalone
@@ -7825,6 +8329,7 @@ CONFIG_IIO_HRTIMER_TRIGGER=m
 CONFIG_IIO_INTERRUPT_TRIGGER=m
 CONFIG_IIO_TIGHTLOOP_TRIGGER=m
 CONFIG_IIO_SYSFS_TRIGGER=m
+# end of Triggers - standalone
 
 #
 # Digital potentiometers
@@ -7838,11 +8343,13 @@ CONFIG_MCP4131=m
 CONFIG_MCP4531=m
 CONFIG_MCP41010=m
 CONFIG_TPL0102=m
+# end of Digital potentiometers
 
 #
 # Digital potentiostats
 #
 CONFIG_LMP91000=m
+# end of Digital potentiostats
 
 #
 # Pressure sensors
@@ -7852,6 +8359,7 @@ CONFIG_BMP280=m
 CONFIG_BMP280_I2C=m
 CONFIG_BMP280_SPI=m
 CONFIG_IIO_CROS_EC_BARO=m
+# CONFIG_DPS310 is not set
 CONFIG_HID_SENSOR_PRESS=m
 CONFIG_HP03=m
 CONFIG_MPL115=m
@@ -7870,28 +8378,33 @@ CONFIG_HP206C=m
 CONFIG_ZPA2326=m
 CONFIG_ZPA2326_I2C=m
 CONFIG_ZPA2326_SPI=m
+# end of Pressure sensors
 
 #
 # Lightning sensors
 #
 # CONFIG_AS3935 is not set
+# end of Lightning sensors
 
 #
 # Proximity and distance sensors
 #
 CONFIG_ISL29501=m
 CONFIG_LIDAR_LITE_V2=m
+CONFIG_MB1232=m
 CONFIG_RFD77402=m
 # CONFIG_SRF04 is not set
 CONFIG_SX9500=m
 CONFIG_SRF08=m
 CONFIG_VL53L0X_I2C=m
+# end of Proximity and distance sensors
 
 #
 # Resolver to digital converters
 #
 CONFIG_AD2S90=m
 CONFIG_AD2S1200=m
+# end of Resolver to digital converters
 
 #
 # Temperature sensors
@@ -7904,7 +8417,11 @@ CONFIG_TMP006=m
 CONFIG_TMP007=m
 CONFIG_TSYS01=m
 CONFIG_TSYS02D=m
+CONFIG_MAX31856=m
+# end of Temperature sensors
+
 CONFIG_NTB=m
+# CONFIG_NTB_MSI is not set
 CONFIG_NTB_AMD=m
 # CONFIG_NTB_IDT is not set
 CONFIG_NTB_INTEL=m
@@ -7926,18 +8443,14 @@ CONFIG_PWM_PCA9685=m
 #
 # IRQ chip support
 #
-CONFIG_ARM_GIC_MAX_NR=1
 CONFIG_MADERA_IRQ=m
+# end of IRQ chip support
+
 CONFIG_IPACK_BUS=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_SERIAL_IPOCTAL=m
 CONFIG_RESET_CONTROLLER=y
 # CONFIG_RESET_TI_SYSCON is not set
-CONFIG_FMC=m
-CONFIG_FMC_FAKEDEV=m
-CONFIG_FMC_TRIVIAL=m
-CONFIG_FMC_WRITE_EEPROM=m
-CONFIG_FMC_CHARDEV=m
 
 #
 # PHY Subsystem
@@ -7950,7 +8463,10 @@ CONFIG_PHY_PXA_28NM_USB2=m
 CONFIG_PHY_QCOM_USB_HS=m
 CONFIG_PHY_QCOM_USB_HSIC=m
 CONFIG_PHY_TUSB1210=m
+# end of PHY Subsystem
+
 CONFIG_POWERCAP=y
+CONFIG_INTEL_RAPL_CORE=m
 CONFIG_INTEL_RAPL=m
 CONFIG_IDLE_INJECT=y
 CONFIG_MCB=m
@@ -7960,6 +8476,8 @@ CONFIG_MCB_LPC=m
 #
 # Performance monitor support
 #
+# end of Performance monitor support
+
 CONFIG_RAS=y
 # CONFIG_RAS_CEC is not set
 CONFIG_THUNDERBOLT=m
@@ -7968,6 +8486,8 @@ CONFIG_THUNDERBOLT=m
 # Android
 #
 # CONFIG_ANDROID is not set
+# end of Android
+
 CONFIG_LIBNVDIMM=y
 CONFIG_BLK_DEV_PMEM=m
 CONFIG_ND_BLK=m
@@ -7984,6 +8504,7 @@ CONFIG_DEV_DAX_PMEM=m
 CONFIG_DEV_DAX_KMEM=m
 CONFIG_DEV_DAX_PMEM_COMPAT=m
 CONFIG_NVMEM=y
+CONFIG_NVMEM_SYSFS=y
 
 #
 # HW tracing support
@@ -8003,6 +8524,8 @@ CONFIG_INTEL_TH_STH=m
 CONFIG_INTEL_TH_MSU=m
 CONFIG_INTEL_TH_PTI=m
 # CONFIG_INTEL_TH_DEBUG is not set
+# end of HW tracing support
+
 CONFIG_FPGA=m
 # CONFIG_ALTERA_PR_IP_CORE is not set
 CONFIG_FPGA_MGR_ALTERA_PS_SPI=m
@@ -8025,6 +8548,8 @@ CONFIG_PM_OPP=y
 # CONFIG_SIOX is not set
 # CONFIG_SLIMBUS is not set
 CONFIG_INTERCONNECT=m
+# CONFIG_COUNTER is not set
+# end of Device Drivers
 
 #
 # File systems
@@ -8128,6 +8653,7 @@ CONFIG_FSCACHE=m
 CONFIG_CACHEFILES=m
 # CONFIG_CACHEFILES_DEBUG is not set
 # CONFIG_CACHEFILES_HISTOGRAM is not set
+# end of Caches
 
 #
 # CD-ROM/DVD Filesystems
@@ -8136,6 +8662,7 @@ CONFIG_ISO9660_FS=m
 CONFIG_JOLIET=y
 CONFIG_ZISOFS=y
 CONFIG_UDF_FS=m
+# end of CD-ROM/DVD Filesystems
 
 #
 # DOS/FAT/NT Filesystems
@@ -8149,6 +8676,7 @@ CONFIG_FAT_DEFAULT_UTF8=y
 CONFIG_NTFS_FS=m
 # CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
+# end of DOS/FAT/NT Filesystems
 
 #
 # Pseudo filesystems
@@ -8160,6 +8688,7 @@ CONFIG_PROC_VMCORE=y
 CONFIG_PROC_SYSCTL=y
 CONFIG_PROC_PAGE_MONITOR=y
 CONFIG_PROC_CHILDREN=y
+CONFIG_PROC_PID_ARCH_STATUS=y
 CONFIG_KERNFS=y
 CONFIG_SYSFS=y
 CONFIG_TMPFS=y
@@ -8171,6 +8700,8 @@ CONFIG_MEMFD_CREATE=y
 CONFIG_ARCH_HAS_GIGANTIC_PAGE=y
 CONFIG_CONFIGFS_FS=m
 CONFIG_EFIVAR_FS=y
+# end of Pseudo filesystems
+
 CONFIG_MISC_FILESYSTEMS=y
 CONFIG_ORANGEFS_FS=m
 CONFIG_ADFS_FS=m
@@ -8180,7 +8711,8 @@ CONFIG_ECRYPT_FS=m
 # CONFIG_ECRYPT_FS_MESSAGING is not set
 CONFIG_HFS_FS=m
 CONFIG_HFSPLUS_FS=m
-# CONFIG_BEFS_FS is not set
+CONFIG_BEFS_FS=m
+# CONFIG_BEFS_DEBUG is not set
 # CONFIG_BFS_FS is not set
 # CONFIG_EFS_FS is not set
 # CONFIG_JFFS2_FS is not set
@@ -8269,12 +8801,13 @@ CONFIG_SUNRPC_GSS=m
 CONFIG_SUNRPC_BACKCHANNEL=y
 CONFIG_SUNRPC_SWAP=y
 CONFIG_RPCSEC_GSS_KRB5=m
-CONFIG_CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y
+# CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES is not set
 # CONFIG_SUNRPC_DEBUG is not set
 CONFIG_SUNRPC_XPRT_RDMA=m
 CONFIG_CEPH_FS=m
 CONFIG_CEPH_FSCACHE=y
 CONFIG_CEPH_FS_POSIX_ACL=y
+# CONFIG_CEPH_FS_SECURITY_LABEL is not set
 CONFIG_CIFS=m
 # CONFIG_CIFS_STATS2 is not set
 CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
@@ -8282,7 +8815,6 @@ CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
 CONFIG_CIFS_UPCALL=y
 CONFIG_CIFS_XATTR=y
 CONFIG_CIFS_POSIX=y
-CONFIG_CIFS_ACL=y
 # CONFIG_CIFS_DEBUG is not set
 CONFIG_CIFS_DFS_UPCALL=y
 # CONFIG_CIFS_SMB_DIRECT is not set
@@ -8349,12 +8881,16 @@ CONFIG_NLS_MAC_TURKISH=m
 CONFIG_NLS_UTF8=m
 CONFIG_DLM=m
 # CONFIG_DLM_DEBUG is not set
+CONFIG_UNICODE=y
+# CONFIG_UNICODE_NORMALIZATION_SELFTEST is not set
+# end of File systems
 
 #
 # Security options
 #
 CONFIG_KEYS=y
 CONFIG_KEYS_COMPAT=y
+# CONFIG_KEYS_REQUEST_CACHE is not set
 # CONFIG_PERSISTENT_KEYRINGS is not set
 # CONFIG_BIG_KEYS is not set
 CONFIG_TRUSTED_KEYS=m
@@ -8400,6 +8936,25 @@ CONFIG_INTEGRITY_AUDIT=y
 # CONFIG_DEFAULT_SECURITY_APPARMOR is not set
 CONFIG_DEFAULT_SECURITY_DAC=y
 CONFIG_LSM="yama,loadpin,safesetid,integrity"
+
+#
+# Kernel hardening options
+#
+
+#
+# Memory initialization
+#
+CONFIG_INIT_STACK_NONE=y
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_USER is not set
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL is not set
+# CONFIG_GCC_PLUGIN_STACKLEAK is not set
+# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
+# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
+# end of Memory initialization
+# end of Kernel hardening options
+# end of Security options
+
 CONFIG_XOR_BLOCKS=m
 CONFIG_ASYNC_CORE=m
 CONFIG_ASYNC_MEMCPY=m
@@ -8427,9 +8982,6 @@ CONFIG_CRYPTO_AKCIPHER=y
 CONFIG_CRYPTO_KPP2=y
 CONFIG_CRYPTO_KPP=y
 CONFIG_CRYPTO_ACOMP2=y
-CONFIG_CRYPTO_RSA=y
-CONFIG_CRYPTO_DH=y
-CONFIG_CRYPTO_ECDH=m
 CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MANAGER2=y
 CONFIG_CRYPTO_USER=m
@@ -8438,7 +8990,6 @@ CONFIG_CRYPTO_GF128MUL=m
 CONFIG_CRYPTO_NULL=m
 CONFIG_CRYPTO_NULL2=y
 CONFIG_CRYPTO_PCRYPT=m
-CONFIG_CRYPTO_WORKQUEUE=y
 CONFIG_CRYPTO_CRYPTD=m
 CONFIG_CRYPTO_AUTHENC=m
 CONFIG_CRYPTO_TEST=m
@@ -8446,6 +8997,15 @@ CONFIG_CRYPTO_SIMD=m
 CONFIG_CRYPTO_GLUE_HELPER_X86=m
 CONFIG_CRYPTO_ENGINE=m
 
+#
+# Public-key cryptography
+#
+CONFIG_CRYPTO_RSA=y
+CONFIG_CRYPTO_DH=y
+CONFIG_CRYPTO_ECC=m
+CONFIG_CRYPTO_ECDH=m
+CONFIG_CRYPTO_ECRDSA=m
+
 #
 # Authenticated Encryption with Associated Data
 #
@@ -8499,6 +9059,7 @@ CONFIG_CRYPTO_CRC32C=m
 CONFIG_CRYPTO_CRC32C_INTEL=m
 CONFIG_CRYPTO_CRC32=m
 CONFIG_CRYPTO_CRC32_PCLMUL=m
+# CONFIG_CRYPTO_XXHASH is not set
 CONFIG_CRYPTO_CRCT10DIF=y
 CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m
 CONFIG_CRYPTO_GHASH=m
@@ -8519,7 +9080,7 @@ CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA512=y
 CONFIG_CRYPTO_SHA3=m
 CONFIG_CRYPTO_SM3=m
-# CONFIG_CRYPTO_STREEBOG is not set
+CONFIG_CRYPTO_STREEBOG=m
 CONFIG_CRYPTO_TGR192=m
 CONFIG_CRYPTO_WP512=m
 CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
@@ -8532,6 +9093,7 @@ CONFIG_CRYPTO_AES_TI=m
 CONFIG_CRYPTO_AES_X86_64=m
 CONFIG_CRYPTO_AES_NI_INTEL=m
 CONFIG_CRYPTO_ANUBIS=m
+CONFIG_CRYPTO_LIB_ARC4=m
 CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_BLOWFISH=m
 CONFIG_CRYPTO_BLOWFISH_COMMON=m
@@ -8596,6 +9158,8 @@ CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_PADLOCK=m
 CONFIG_CRYPTO_DEV_PADLOCK_AES=m
 CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
+# CONFIG_CRYPTO_DEV_ATMEL_ECC is not set
+# CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set
 CONFIG_CRYPTO_DEV_CCP=y
 CONFIG_CRYPTO_DEV_CCP_DD=m
 CONFIG_CRYPTO_DEV_SP_CCP=y
@@ -8630,6 +9194,8 @@ CONFIG_SYSTEM_TRUSTED_KEYS=""
 # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
 # CONFIG_SECONDARY_TRUSTED_KEYRING is not set
 # CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
+# end of Certificates for signature checking
+
 CONFIG_BINARY_PRINTF=y
 
 #
@@ -8637,12 +9203,14 @@ CONFIG_BINARY_PRINTF=y
 #
 CONFIG_RAID6_PQ=m
 CONFIG_RAID6_PQ_BENCHMARK=y
+CONFIG_PACKING=y
 CONFIG_BITREVERSE=y
-CONFIG_RATIONAL=y
 CONFIG_GENERIC_STRNCPY_FROM_USER=y
 CONFIG_GENERIC_STRNLEN_USER=y
 CONFIG_GENERIC_NET_UTILS=y
 CONFIG_GENERIC_FIND_FIRST_BIT=y
+CONFIG_CORDIC=m
+CONFIG_RATIONAL=y
 CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_GENERIC_IOMAP=y
 CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
@@ -8694,8 +9262,8 @@ CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_REED_SOLOMON=m
 CONFIG_REED_SOLOMON_ENC8=y
 CONFIG_REED_SOLOMON_DEC8=y
+CONFIG_REED_SOLOMON_DEC16=y
 CONFIG_BCH=m
-CONFIG_BCH_CONST_PARAMS=y
 CONFIG_TEXTSEARCH=y
 CONFIG_TEXTSEARCH_KMP=m
 CONFIG_TEXTSEARCH_BM=m
@@ -8724,12 +9292,13 @@ CONFIG_GLOB=y
 CONFIG_NLATTR=y
 CONFIG_LRU_CACHE=m
 CONFIG_CLZ_TAB=y
-CONFIG_CORDIC=m
-CONFIG_DDR=y
 CONFIG_IRQ_POLL=y
 CONFIG_MPILIB=y
+CONFIG_DIMLIB=y
 CONFIG_OID_REGISTRY=y
 CONFIG_UCS2_STRING=y
+CONFIG_HAVE_GENERIC_VDSO=y
+CONFIG_GENERIC_GETTIMEOFDAY=y
 CONFIG_FONT_SUPPORT=y
 CONFIG_FONTS=y
 # CONFIG_FONT_8x8 is not set
@@ -8749,10 +9318,12 @@ CONFIG_SG_POOL=y
 CONFIG_ARCH_HAS_PMEM_API=y
 CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y
 CONFIG_ARCH_HAS_UACCESS_MCSAFE=y
+CONFIG_ARCH_STACKWALK=y
 CONFIG_SBITMAP=y
 CONFIG_PARMAN=m
-# CONFIG_STRING_SELFTEST is not set
 CONFIG_OBJAGG=m
+# CONFIG_STRING_SELFTEST is not set
+# end of Library routines
 
 #
 # Kernel hacking
@@ -8768,6 +9339,7 @@ CONFIG_CONSOLE_LOGLEVEL_QUIET=4
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_BOOT_PRINTK_DELAY is not set
 CONFIG_DYNAMIC_DEBUG=y
+# end of printk and dmesg options
 
 #
 # Compile-time checks and compiler options
@@ -8776,6 +9348,7 @@ CONFIG_DEBUG_INFO=y
 # CONFIG_DEBUG_INFO_REDUCED is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
 # CONFIG_DEBUG_INFO_DWARF4 is not set
+# CONFIG_DEBUG_INFO_BTF is not set
 # CONFIG_GDB_SCRIPTS is not set
 # CONFIG_ENABLE_MUST_CHECK is not set
 CONFIG_FRAME_WARN=1024
@@ -8783,15 +9356,19 @@ CONFIG_STRIP_ASM_SYMS=y
 # CONFIG_READABLE_ASM is not set
 # CONFIG_UNUSED_SYMBOLS is not set
 CONFIG_DEBUG_FS=y
-# CONFIG_HEADERS_CHECK is not set
+# CONFIG_HEADERS_INSTALL is not set
+# CONFIG_OPTIMIZE_INLINING is not set
 # CONFIG_DEBUG_SECTION_MISMATCH is not set
 CONFIG_SECTION_MISMATCH_WARN_ONLY=y
 CONFIG_STACK_VALIDATION=y
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+# end of Compile-time checks and compiler options
+
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
 CONFIG_MAGIC_SYSRQ_SERIAL=y
 CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_MISC=y
 
 #
 # Memory Debugging
@@ -8815,12 +9392,12 @@ CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
 # CONFIG_DEBUG_VIRTUAL is not set
 CONFIG_DEBUG_MEMORY_INIT=y
 # CONFIG_DEBUG_PER_CPU_MAPS is not set
-CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
-# CONFIG_DEBUG_STACKOVERFLOW is not set
 CONFIG_HAVE_ARCH_KASAN=y
 CONFIG_CC_HAS_KASAN_GENERIC=y
 # CONFIG_KASAN is not set
 CONFIG_KASAN_STACK=1
+# end of Memory Debugging
+
 CONFIG_ARCH_HAS_KCOV=y
 CONFIG_CC_HAS_SANCOV_TRACE_PC=y
 # CONFIG_KCOV is not set
@@ -8843,6 +9420,8 @@ CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
 CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
 # CONFIG_WQ_WATCHDOG is not set
+# end of Debug Lockups and Hangs
+
 # CONFIG_PANIC_ON_OOPS is not set
 CONFIG_PANIC_ON_OOPS_VALUE=0
 CONFIG_PANIC_TIMEOUT=0
@@ -8869,12 +9448,14 @@ CONFIG_LOCK_DEBUGGING_SUPPORT=y
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_LOCK_TORTURE_TEST is not set
 CONFIG_WW_MUTEX_SELFTEST=m
+# end of Lock Debugging (spinlocks, mutexes, etc...)
+
 CONFIG_STACKTRACE=y
 # CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
 # CONFIG_DEBUG_KOBJECT is not set
 CONFIG_DEBUG_BUGVERBOSE=y
 CONFIG_DEBUG_LIST=y
-# CONFIG_DEBUG_PI_LIST is not set
+# CONFIG_DEBUG_PLIST is not set
 # CONFIG_DEBUG_SG is not set
 CONFIG_DEBUG_NOTIFIERS=y
 CONFIG_DEBUG_CREDENTIALS=y
@@ -8888,6 +9469,8 @@ CONFIG_RCU_PERF_TEST=m
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
 # CONFIG_RCU_TRACE is not set
 # CONFIG_RCU_EQS_DEBUG is not set
+# end of RCU Debugging
+
 # CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
 # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
@@ -8946,7 +9529,6 @@ CONFIG_FTRACE_MCOUNT_RECORD=y
 # CONFIG_RING_BUFFER_STARTUP_TEST is not set
 CONFIG_PREEMPTIRQ_DELAY_TEST=m
 # CONFIG_TRACE_EVAL_MAP_FILE is not set
-CONFIG_TRACING_EVENTS_GPIO=y
 # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
 CONFIG_RUNTIME_TESTING_MENU=y
 CONFIG_LKDTM=m
@@ -8955,12 +9537,14 @@ CONFIG_LKDTM=m
 # CONFIG_KPROBES_SANITY_TEST is not set
 # CONFIG_BACKTRACE_SELF_TEST is not set
 # CONFIG_RBTREE_TEST is not set
+# CONFIG_REED_SOLOMON_TEST is not set
 # CONFIG_INTERVAL_TREE_TEST is not set
 # CONFIG_PERCPU_TEST is not set
 # CONFIG_ATOMIC64_SELFTEST is not set
 CONFIG_ASYNC_RAID6_TEST=m
 # CONFIG_TEST_HEXDUMP is not set
 CONFIG_TEST_STRING_HELPERS=m
+# CONFIG_TEST_STRSCPY is not set
 CONFIG_TEST_KSTRTOX=m
 CONFIG_TEST_PRINTF=m
 CONFIG_TEST_BITMAP=m
@@ -8976,6 +9560,7 @@ CONFIG_TEST_PARMAN=m
 # CONFIG_TEST_VMALLOC is not set
 # CONFIG_TEST_USER_COPY is not set
 # CONFIG_TEST_BPF is not set
+# CONFIG_TEST_BLACKHOLE_DEV is not set
 # CONFIG_FIND_BIT_BENCHMARK is not set
 # CONFIG_TEST_FIRMWARE is not set
 # CONFIG_TEST_SYSCTL is not set
@@ -8985,6 +9570,7 @@ CONFIG_TEST_STATIC_KEYS=m
 # CONFIG_TEST_MEMCAT_P is not set
 # CONFIG_TEST_OBJAGG is not set
 # CONFIG_TEST_STACKINIT is not set
+# CONFIG_TEST_MEMINIT is not set
 # CONFIG_MEMTEST is not set
 CONFIG_BUG_ON_DATA_CORRUPTION=y
 # CONFIG_SAMPLES is not set
@@ -9010,18 +9596,12 @@ CONFIG_DOUBLEFAULT=y
 # CONFIG_IOMMU_DEBUG is not set
 CONFIG_HAVE_MMIOTRACE_SUPPORT=y
 # CONFIG_X86_DECODER_SELFTEST is not set
-CONFIG_IO_DELAY_TYPE_0X80=0
-CONFIG_IO_DELAY_TYPE_0XED=1
-CONFIG_IO_DELAY_TYPE_UDELAY=2
-CONFIG_IO_DELAY_TYPE_NONE=3
 CONFIG_IO_DELAY_0X80=y
 # CONFIG_IO_DELAY_0XED is not set
 # CONFIG_IO_DELAY_UDELAY is not set
 # CONFIG_IO_DELAY_NONE is not set
-CONFIG_DEFAULT_IO_DELAY_TYPE=0
 # CONFIG_DEBUG_BOOT_PARAMS is not set
 # CONFIG_CPA_DEBUG is not set
-# CONFIG_OPTIMIZE_INLINING is not set
 # CONFIG_DEBUG_ENTRY is not set
 # CONFIG_DEBUG_NMI_SELFTEST is not set
 CONFIG_X86_DEBUG_FPU=y
@@ -9029,3 +9609,4 @@ CONFIG_X86_DEBUG_FPU=y
 CONFIG_UNWINDER_ORC=y
 # CONFIG_UNWINDER_FRAME_POINTER is not set
 # CONFIG_UNWINDER_GUESS is not set
+# end of Kernel hacking
diff --git a/srcpkgs/linux5.1/patches/ppc64-be-elfv2.patch b/srcpkgs/linux5.3/patches/ppc64-be-elfv2.patch
similarity index 100%
rename from srcpkgs/linux5.1/patches/ppc64-be-elfv2.patch
rename to srcpkgs/linux5.3/patches/ppc64-be-elfv2.patch
diff --git a/srcpkgs/linux5.1/patches/smsc95xx-mac.patch b/srcpkgs/linux5.3/patches/smsc95xx-mac.patch
similarity index 100%
rename from srcpkgs/linux5.1/patches/smsc95xx-mac.patch
rename to srcpkgs/linux5.3/patches/smsc95xx-mac.patch
diff --git a/srcpkgs/linux5.1/template b/srcpkgs/linux5.3/template
similarity index 96%
rename from srcpkgs/linux5.1/template
rename to srcpkgs/linux5.3/template
index 223c92a605d..895134128df 100644
--- a/srcpkgs/linux5.1/template
+++ b/srcpkgs/linux5.3/template
@@ -1,14 +1,14 @@
-# Template file for 'linux5.1'
-pkgname=linux5.1
-version=5.1.21
+# Template file for 'linux5.3'
+pkgname=linux5.3
+version=5.3.7
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
-maintainer="Helmut Pozimski <helmut@pozimski.eu>"
+maintainer="Foxlet <foxlet@furcode.co>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=56495f82314f0dfb84a3fe7fad78e17be69c4fd36ef46f2452458b2fa1e341f6
+checksum=c6c9714e21531c825c306b107bc6f6c7bfa2d5270a14bad170f8de5a73d34802
 patch_args="-Np1"
 
 nodebug=yes  # -dbg package is generated below manually
@@ -18,7 +18,8 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* armv5tel* armv6l* armv7l* aarch64* ppc*"
-hostmakedepends="bc elfutils-devel flex gmp-devel kmod libmpc-devel libressl-devel perl uboot-mkimage"
+hostmakedepends="bc elfutils-devel flex gmp-devel kmod libmpc-devel 
+ libressl-devel perl uboot-mkimage cpio"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"
@@ -37,7 +38,7 @@ mutable_files="
  /usr/lib/modules/${_kernver}/modules.devname"
 
 do_configure() {
-	# 5.1 misses Documentation/DocBook. We ship the directory from 4.12 here.
+	# 5.3 misses Documentation/DocBook. We ship the directory from 4.12 here.
 	cp -a $FILESDIR/DocBook -t Documentation
 
 	# If there's a file called <arch>-dotconfig, use it to
@@ -297,7 +298,7 @@ do_install() {
 	# ... and run depmod again.
 	depmod -b ${DESTDIR}/usr -F System.map ${_kernver}
 }
-linux5.1-headers_package() {
+linux5.3-headers_package() {
 	preserve=yes
 	nostrip=yes
 	noshlibprovides=yes
@@ -307,7 +308,7 @@ linux5.1-headers_package() {
 		vmove usr/lib/modules/${_kernver}/build
 	}
 }
-linux5.1-dbg_package() {
+linux5.3-dbg_package() {
 	preserve=yes
 	nostrip=yes
 	noverifyrdeps=yes
diff --git a/srcpkgs/lld b/srcpkgs/lld
index 8ec3476f9c1..14540d7bad2 120000
--- a/srcpkgs/lld
+++ b/srcpkgs/lld
@@ -1 +1 @@
-llvm8
\ No newline at end of file
+llvm9
\ No newline at end of file
diff --git a/srcpkgs/lld-devel b/srcpkgs/lld-devel
index 8ec3476f9c1..14540d7bad2 120000
--- a/srcpkgs/lld-devel
+++ b/srcpkgs/lld-devel
@@ -1 +1 @@
-llvm8
\ No newline at end of file
+llvm9
\ No newline at end of file
diff --git a/srcpkgs/lldb b/srcpkgs/lldb
index 8ec3476f9c1..14540d7bad2 120000
--- a/srcpkgs/lldb
+++ b/srcpkgs/lldb
@@ -1 +1 @@
-llvm8
\ No newline at end of file
+llvm9
\ No newline at end of file
diff --git a/srcpkgs/lldb-devel b/srcpkgs/lldb-devel
index 8ec3476f9c1..14540d7bad2 120000
--- a/srcpkgs/lldb-devel
+++ b/srcpkgs/lldb-devel
@@ -1 +1 @@
-llvm8
\ No newline at end of file
+llvm9
\ No newline at end of file
diff --git a/srcpkgs/llvm-libunwind/patches/ppc32.patch b/srcpkgs/llvm-libunwind/patches/ppc32.patch
new file mode 100644
index 00000000000..1408a0aafb0
--- /dev/null
+++ b/srcpkgs/llvm-libunwind/patches/ppc32.patch
@@ -0,0 +1,63 @@
+This fixes build at least with gcc9 which does not define `__ppc__`.
+
+--- include/__libunwind_config.h
++++ include/__libunwind_config.h
+@@ -49,7 +49,7 @@
+ #  define _LIBUNWIND_CONTEXT_SIZE 167
+ #  define _LIBUNWIND_CURSOR_SIZE 179
+ #  define _LIBUNWIND_HIGHEST_DWARF_REGISTER _LIBUNWIND_HIGHEST_DWARF_REGISTER_PPC64
+-# elif defined(__ppc__)
++# elif defined(__powerpc__)
+ #  define _LIBUNWIND_TARGET_PPC 1
+ #  define _LIBUNWIND_CONTEXT_SIZE 117
+ #  define _LIBUNWIND_CURSOR_SIZE 124
+--- src/UnwindRegistersRestore.S
++++ src/UnwindRegistersRestore.S
+@@ -392,7 +392,7 @@ Lnovec:
+   PPC64_LR(3)
+   bctr
+ 
+-#elif defined(__ppc__)
++#elif defined(__powerpc__)
+ 
+ DEFINE_LIBUNWIND_FUNCTION(_ZN9libunwind13Registers_ppc6jumptoEv)
+ //
+--- src/UnwindRegistersSave.S
++++ src/UnwindRegistersSave.S
+@@ -554,7 +554,7 @@ DEFINE_LIBUNWIND_FUNCTION(__unw_getcontext)
+   blr
+ 
+ 
+-#elif defined(__ppc__)
++#elif defined(__powerpc__)
+ 
+ //
+ // extern int unw_getcontext(unw_context_t* thread_state)
+--- src/config.h
++++ src/config.h
+@@ -95,12 +95,12 @@
+ #define _LIBUNWIND_BUILD_SJLJ_APIS
+ #endif
+ 
+-#if defined(__i386__) || defined(__x86_64__) || defined(__ppc__) || defined(__ppc64__) || defined(__powerpc64__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc__) || defined(__powerpc64__)
+ #define _LIBUNWIND_SUPPORT_FRAME_APIS
+ #endif
+ 
+ #if defined(__i386__) || defined(__x86_64__) ||                                \
+-    defined(__ppc__) || defined(__ppc64__) || defined(__powerpc64__) ||        \
++    defined(__powerpc__) || defined(__powerpc64__) ||                          \
+     (!defined(__APPLE__) && defined(__arm__)) ||                               \
+     (defined(__arm64__) || defined(__aarch64__)) ||                            \
+     defined(__mips__)
+--- src/libunwind.cpp
++++ src/libunwind.cpp
+@@ -42,7 +42,7 @@ _LIBUNWIND_HIDDEN int __unw_init_local(unw_cursor_t *cursor,
+ # define REGISTER_KIND Registers_x86_64
+ #elif defined(__powerpc64__)
+ # define REGISTER_KIND Registers_ppc64
+-#elif defined(__ppc__)
++#elif defined(__powerpc__)
+ # define REGISTER_KIND Registers_ppc
+ #elif defined(__aarch64__)
+ # define REGISTER_KIND Registers_arm64
diff --git a/srcpkgs/llvm-libunwind/template b/srcpkgs/llvm-libunwind/template
index e6d02df3b8f..c5dd2da671e 100644
--- a/srcpkgs/llvm-libunwind/template
+++ b/srcpkgs/llvm-libunwind/template
@@ -1,18 +1,18 @@
 # Template file for 'llvm-libunwind'
 pkgname=llvm-libunwind
-version=7.0.1
+version=9.0.0
 revision=1
 build_style=cmake
 wrksrc="libunwind-${version}.src"
-hostmakedepends="llvm7"
-makedepends="llvm7"
+hostmakedepends="llvm9"
+makedepends="llvm9"
 make_build_args="VERBOSE=1"
 short_desc="LLVM version of libunwind library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="NCSA, MIT"
 homepage="https://llvm.org"
 distfiles="https://www.llvm.org/releases/${version}/libunwind-${version}.src.tar.xz"
-checksum=89c852991dfd9279dbca9d5ac10b53c67ad7d0f54bbab7156e9f057a978b5912
+checksum=976a8d09e1424fb843210eecec00a506b956e6c31adda3b0d199e945be0d0db2
 
 post_install() {
 	vmkdir usr/include
diff --git a/srcpkgs/llvm/template b/srcpkgs/llvm/template
index bb84697f830..f596bf29b1b 100644
--- a/srcpkgs/llvm/template
+++ b/srcpkgs/llvm/template
@@ -1,9 +1,10 @@
 # Template file for 'llvm'
 pkgname=llvm
-version=8.0.0
-revision=1
+version=9.0.0
+revision=2
 build_style=meta
-depends="llvm8"
+depends="llvm9"
+replaces="llvm8>=0 llvm7>=0 llvm6.0>=0 llvm3.9>=0"
 short_desc="LLVM meta package"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Public Domain"
diff --git a/srcpkgs/llvm8/files/patches/llvm/llvm-003-secureplt.patch b/srcpkgs/llvm8/files/patches/llvm/llvm-003-secureplt.patch
index bfdc7d5557c..e05442c842b 100644
--- a/srcpkgs/llvm8/files/patches/llvm/llvm-003-secureplt.patch
+++ b/srcpkgs/llvm8/files/patches/llvm/llvm-003-secureplt.patch
@@ -1,10 +1,11 @@
-Partially taken from Adélie Linux, even-more-secure-plt.patch
---- a/lib/Target/PowerPC/PPCSubtarget.cpp
-+++ b/lib/Target/PowerPC/PPCSubtarget.cpp
+Taken from Adélie Linux.
+
+--- llvm/lib/Target/PowerPC/PPCSubtarget.cpp
++++ llvm/lib/Target/PowerPC/PPCSubtarget.cpp
 @@ -138,6 +138,10 @@ void PPCSubtarget::initSubtargetFeatures(StringRef CPU, StringRef FS) {
    if (isDarwin())
      HasLazyResolverStubs = true;
- 
+
 +  // Force SecurePlt for all 32-bit Linux targets
 +  if (isTargetLinux() && !IsPPC64)
 +    SecurePlt = true;
@@ -12,22 +13,141 @@ Partially taken from Adélie Linux, even-more-secure-plt.patch
    if (HasSPE && IsPPC64)
      report_fatal_error( "SPE is only supported for 32-bit targets.\n", false);
    if (HasSPE && (HasAltivec || HasQPX || HasVSX || HasFPU))
---- a/lib/Target/PowerPC/PPCTargetMachine.cpp
-+++ b/lib/Target/PowerPC/PPCTargetMachine.cpp
-@@ -218,6 +218,10 @@ static Reloc::Model getEffectiveRelocModel(const Triple &TT,
-   if (TT.getArch() == Triple::ppc64)
-     return Reloc::PIC_;
+--- llvm/lib/Target/PowerPC/PPCISelLowering.cpp
++++ llvm/lib/Target/PowerPC/PPCISelLowering.cpp
+@@ -2769,8 +2769,12 @@ SDValue PPCTargetLowering::LowerGlobalTLSAddress(SDValue Op,
+       SDValue GOTReg = DAG.getRegister(PPC::X2, MVT::i64);
+       GOTPtr = DAG.getNode(PPCISD::ADDIS_GOT_TPREL_HA, dl,
+                            PtrVT, GOTReg, TGA);
+-    } else
+-      GOTPtr = DAG.getNode(PPCISD::PPC32_GOT, dl, PtrVT);
++    } else {
++      if (isPositionIndependent())
++        GOTPtr = DAG.getNode(PPCISD::PPC32_PICGOT, dl, PtrVT);
++      else
++        GOTPtr = DAG.getNode(PPCISD::PPC32_GOT, dl, PtrVT);
++    }
+     SDValue TPOffset = DAG.getNode(PPCISD::LD_GOT_TPREL_L, dl,
+                                    PtrVT, TGA, GOTPtr);
+     return DAG.getNode(PPCISD::ADD_TLS, dl, PtrVT, TPOffset, TGATLS);
+@@ -4941,7 +4945,8 @@ PrepareCall(SelectionDAG &DAG, SDValue &Callee, SDValue &InFlag, SDValue &Chain,
+   if (auto *G = dyn_cast<GlobalAddressSDNode>(Callee))
+     GV = G->getGlobal();
+   bool Local = TM.shouldAssumeDSOLocal(*Mod, GV);
+-  bool UsePlt = !Local && Subtarget.isTargetELF() && !isPPC64;
++  bool UsePlt = !Local && Subtarget.isTargetELF() && !isPPC64 &&
++                TM.isPositionIndependent();
  
-+  // We force SecurePlt on 32-bit ppc linux which requires PIC
-+  if (TT.isOSLinux() && (TT.getArch() == Triple::ppc))
-+    return Reloc::PIC_;
-+
-   // Rest are static by default.
-   return Reloc::Static;
+   if (isFunctionGlobalAddress(Callee)) {
+     GlobalAddressSDNode *G = cast<GlobalAddressSDNode>(Callee);
+--- llvm/test/CodeGen/PowerPC/2008-10-28-f128-i32.ll
++++ llvm/test/CodeGen/PowerPC/2008-10-28-f128-i32.ll
+@@ -62,7 +62,7 @@ define i64 @__fixunstfdi(ppc_fp128 %a) nounwind readnone {
+ ; CHECK-NEXT:    lfd 4, 328(1)
+ ; CHECK-NEXT:    fmr 1, 31
+ ; CHECK-NEXT:    fmr 2, 30
+-; CHECK-NEXT:    bl __gcc_qmul@PLT
++; CHECK-NEXT:    bl __gcc_qmul
+ ; CHECK-NEXT:    lis 3, 16864
+ ; CHECK-NEXT:    stfd 1, 280(1)
+ ; CHECK-NEXT:    fmr 29, 1
+@@ -84,7 +84,7 @@ define i64 @__fixunstfdi(ppc_fp128 %a) nounwind readnone {
+ ; CHECK-NEXT:    lfd 4, 360(1)
+ ; CHECK-NEXT:    lfd 1, 352(1)
+ ; CHECK-NEXT:    lfd 2, 344(1)
+-; CHECK-NEXT:    bl __gcc_qsub@PLT
++; CHECK-NEXT:    bl __gcc_qsub
+ ; CHECK-NEXT:    mffs 0
+ ; CHECK-NEXT:    mtfsb1 31
+ ; CHECK-NEXT:    lis 3, .LCPI0_1@ha
+@@ -117,7 +117,7 @@ define i64 @__fixunstfdi(ppc_fp128 %a) nounwind readnone {
+ ; CHECK-NEXT:  .LBB0_5: # %bb1
+ ; CHECK-NEXT:    li 4, 0
+ ; CHECK-NEXT:    mr 3, 30
+-; CHECK-NEXT:    bl __floatditf@PLT
++; CHECK-NEXT:    bl __floatditf
+ ; CHECK-NEXT:    lis 3, 17392
+ ; CHECK-NEXT:    stfd 1, 208(1)
+ ; CHECK-NEXT:    fmr 29, 1
+@@ -140,7 +140,7 @@ define i64 @__fixunstfdi(ppc_fp128 %a) nounwind readnone {
+ ; CHECK-NEXT:    lfd 4, 232(1)
+ ; CHECK-NEXT:    lfd 1, 224(1)
+ ; CHECK-NEXT:    lfd 2, 216(1)
+-; CHECK-NEXT:    bl __gcc_qadd@PLT
++; CHECK-NEXT:    bl __gcc_qadd
+ ; CHECK-NEXT:    blt 2, .LBB0_7
+ ; CHECK-NEXT:  # %bb.6: # %bb1
+ ; CHECK-NEXT:    fmr 2, 28
+@@ -163,7 +163,7 @@ define i64 @__fixunstfdi(ppc_fp128 %a) nounwind readnone {
+ ; CHECK-NEXT:    stw 3, 248(1)
+ ; CHECK-NEXT:    lfd 3, 256(1)
+ ; CHECK-NEXT:    lfd 4, 248(1)
+-; CHECK-NEXT:    bl __gcc_qsub@PLT
++; CHECK-NEXT:    bl __gcc_qsub
+ ; CHECK-NEXT:    stfd 2, 176(1)
+ ; CHECK-NEXT:    fcmpu 0, 2, 27
+ ; CHECK-NEXT:    stfd 1, 168(1)
+@@ -205,7 +205,7 @@ define i64 @__fixunstfdi(ppc_fp128 %a) nounwind readnone {
+ ; CHECK-NEXT:    lfd 4, 72(1)
+ ; CHECK-NEXT:    lfd 1, 64(1)
+ ; CHECK-NEXT:    lfd 2, 56(1)
+-; CHECK-NEXT:    bl __gcc_qsub@PLT
++; CHECK-NEXT:    bl __gcc_qsub
+ ; CHECK-NEXT:    mffs 0
+ ; CHECK-NEXT:    mtfsb1 31
+ ; CHECK-NEXT:    lis 3, .LCPI0_2@ha
+@@ -260,7 +260,7 @@ define i64 @__fixunstfdi(ppc_fp128 %a) nounwind readnone {
+ ; CHECK-NEXT:    lfd 4, 136(1)
+ ; CHECK-NEXT:    lfd 1, 128(1)
+ ; CHECK-NEXT:    lfd 2, 120(1)
+-; CHECK-NEXT:    bl __gcc_qsub@PLT
++; CHECK-NEXT:    bl __gcc_qsub
+ ; CHECK-NEXT:    mffs 0
+ ; CHECK-NEXT:    mtfsb1 31
+ ; CHECK-NEXT:    lis 3, .LCPI0_0@ha
+--- llvm/test/CodeGen/PowerPC/2010-02-12-saveCR.ll
++++ llvm/test/CodeGen/PowerPC/2010-02-12-saveCR.ll
+@@ -11,7 +11,7 @@ entry:
+ ; CHECK-DAG: ori [[T2:[0-9]+]], [[T2]], 34492
+ ; CHECK-DAG: stwx [[T1]], 1, [[T2]]
+ ; CHECK-DAG: addi 3, 1, 28
+-; CHECK: bl bar@PLT
++; CHECK: bl bar
+   %x = alloca [100000 x i8]                       ; <[100000 x i8]*> [#uses=1]
+   %"alloca point" = bitcast i32 0 to i32          ; <i32> [#uses=0]
+   %x1 = bitcast [100000 x i8]* %x to i8*          ; <i8*> [#uses=1]
+--- llvm/test/CodeGen/PowerPC/available-externally.ll
++++ llvm/test/CodeGen/PowerPC/available-externally.ll
+@@ -14,7 +14,7 @@ target triple = "powerpc-unknown-linux-gnu"
+ define i32 @foo(i64 %x) nounwind {
+ entry:
+ ; STATIC: foo:
+-; STATIC: bl exact_log2@PLT
++; STATIC: bl exact_log2
+ ; STATIC: blr
+ 
+ ; PIC: foo:
+--- llvm/test/CodeGen/PowerPC/stubs.ll
++++ llvm/test/CodeGen/PowerPC/stubs.ll
+@@ -6,4 +6,4 @@ entry:
  }
-
---- a/lib/Target/PowerPC/InstPrinter/PPCInstPrinter.cpp
-+++ b/lib/Target/PowerPC/InstPrinter/PPCInstPrinter.cpp
+ 
+ ; CHECK: test1:
+-; CHECK: bl __floatditf@PLT
++; CHECK: bl __floatditf
+--- llvm/test/CodeGen/PowerPC/umulo-128-legalisation-lowering.ll
++++ llvm/test/CodeGen/PowerPC/umulo-128-legalisation-lowering.ll
+@@ -72,7 +72,7 @@ define { i128, i8 } @muloti_test(i128 %l, i128 %r) unnamed_addr #0 {
+ ; PPC32-NEXT: mr 28, 9
+ ; PPC32-NEXT: mr 23, 6
+ ; PPC32-NEXT: mr 24, 5
+-; PPC32-NEXT: bl __multi3@PLT
++; PPC32-NEXT: bl __multi3
+ ; PPC32-NEXT: mr 7, 4
+ ; PPC32-NEXT: mullw 4, 24, 30
+ ; PPC32-NEXT: mullw 8, 29, 23
+--- llvm/lib/Target/PowerPC/InstPrinter/PPCInstPrinter.cpp
++++ llvm/lib/Target/PowerPC/InstPrinter/PPCInstPrinter.cpp
 @@ -442,13 +442,22 @@
    // On PPC64, VariantKind is VK_None, but on PPC32, it's VK_PLT, and it must
    // come at the _end_ of the expression.
@@ -55,8 +175,8 @@ Partially taken from Adélie Linux, even-more-secure-plt.patch
  }
  
  /// showRegistersWithPercentPrefix - Check if this register name should be
---- a/lib/Target/PowerPC/PPCAsmPrinter.cpp
-+++ b/lib/Target/PowerPC/PPCAsmPrinter.cpp
+--- llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp
++++ llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp
 @@ -487,8 +487,14 @@
    if (!Subtarget->isPPC64() && !Subtarget->isDarwin() &&
        isPositionIndependent())
@@ -73,8 +193,8 @@ Partially taken from Adélie Linux, even-more-secure-plt.patch
    const MachineOperand &MO = MI->getOperand(2);
    const GlobalValue *GValue = MO.getGlobal();
    MCSymbol *MOSymbol = getSymbol(GValue);
---- a/lib/Target/PowerPC/PPCISelDAGToDAG.cpp
-+++ b/lib/Target/PowerPC/PPCISelDAGToDAG.cpp
+--- llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp
++++ llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp
 @@ -4054,7 +4054,20 @@
      if (trySETCC(N))
        return;
diff --git a/srcpkgs/llvm8/template b/srcpkgs/llvm8/template
index 0af2af6b9f9..dbbc273153f 100644
--- a/srcpkgs/llvm8/template
+++ b/srcpkgs/llvm8/template
@@ -1,7 +1,7 @@
 # Template file for 'llvm8'
 pkgname=llvm8
-version=8.0.0
-revision=7
+version=8.0.1
+revision=2
 wrksrc="llvm-${version}.src"
 build_style=cmake
 configure_args="
@@ -20,27 +20,15 @@ short_desc="Low Level Virtual Machine"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="NCSA"
 homepage="https://www.llvm.org"
-distfiles="https://releases.llvm.org/${version}/llvm-${version}.src.tar.xz
-https://releases.llvm.org/${version}/lldb-${version}.src.tar.xz
-https://releases.llvm.org/${version}/lld-${version}.src.tar.xz
- https://releases.llvm.org/${version}/cfe-${version}.src.tar.xz
- https://releases.llvm.org/${version}/clang-tools-extra-${version}.src.tar.xz
- https://releases.llvm.org/${version}/compiler-rt-${version}.src.tar.xz"
-checksum="8872be1b12c61450cacc82b3d153eab02be2546ef34fa3580ed14137bb26224c
- 49918b9f09816554a20ac44c5f85a32dc0a7a00759b3259e78064d674eac0373
- 9caec8ec922e32ffa130f0fb08e4c5a242d7e68ce757631e425e9eba2e1a6e37
- 084c115aab0084e63b23eee8c233abb6739c399e29966eaeccfc6e088e0b736b
- 4f00122be408a7482f2004bcf215720d2b88cf8dc78b824abb225da8ad359d4b
- b435c7474f459e71b2831f1a4e3f1d21203cb9c0172e94e9d9b69f50354f21b1"
+distfiles="https://github.com/llvm/llvm-project/releases/download/llvmorg-${version}/llvm-${version}.src.tar.xz"
+checksum="44787a6d02f7140f145e2250d56c9f849334e11f9ae379827510ed72f12b75e7"
 disable_parallel_builds=yes
 lib32disabled=yes
 
-subpackages="clang-tools-extra clang clang-analyzer libllvm8"
-if [ -z "$CROSS_BUILD" ]; then
-	# XXX fails to cross compile due to python
-	subpackages+=" lldb lldb-devel"
-fi
-subpackages+=" lld lld-devel"
+# all of these provide llvm-config
+conflicts="llvm>=0 llvm3.9>=0 llvm6.0>=0 llvm7>=0 llvm9>=0"
+
+subpackages="libllvm8"
 
 case "$XBPS_TARGET_MACHINE" in
 	armv5*) broken="Tries to assemble VFP instructions with armv5tel arch";;
@@ -53,51 +41,6 @@ post_patch() {
 		msg_normal "Applying $i to llvm\n"
 		patch -sNp1 -i ${i}
 	done
-
-	cd ${XBPS_BUILDDIR}/cfe-${version}.src
-	for i in ${FILESDIR}/patches/cfe/cfe-*.patch; do
-		msg_normal "Applying $i to cfe\n"
-		patch -sNp1 -i ${i}
-	done
-
-	if [ -z "$CROSS_BUILD" ]; then
-		cd ${XBPS_BUILDDIR}/lldb-${version}.src
-		for i in ${FILESDIR}/patches/lldb/*.patch; do
-			msg_normal "Applying $i to lldb\n"
-			patch -sNp1 -i ${i}
-		done
-		case "$XBPS_TARGET_MACHINE" in
-			*-musl) sed -i 's|__ptrace_request|int|g' source/Plugins/Process/Linux/NativeProcessLinux.cpp ;;
-		esac
-	fi
-
-	# Move clang files into the llvm source.
-	if [ -d ${XBPS_BUILDDIR}/cfe-${version}.src ]; then
-		mv ${XBPS_BUILDDIR}/cfe-${version}.src ${wrksrc}/tools/clang
-	fi
-	# Move clang-tools-extra files into llvm source.
-	if [ -d ${XBPS_BUILDDIR}/clang-tools-extra-${version}.src ]; then
-		mv ${XBPS_BUILDDIR}/clang-tools-extra-${version}.src ${wrksrc}/tools/clang/tools/extra
-	fi
-	# Move lld files into the llvm source.
-	if [ -d ${XBPS_BUILDDIR}/lld-${version}.src ]; then
-		mv ${XBPS_BUILDDIR}/lld-${version}.src ${wrksrc}/tools/lld
-	fi
-	# Move lldb files into the llvm source.
-	if [ -z "$CROSS_BUILD" -a -d ${XBPS_BUILDDIR}/lldb-${version}.src ]; then
-		mv ${XBPS_BUILDDIR}/lldb-${version}.src ${wrksrc}/tools/lldb
-	fi
-	# Move compiler-rt files into the llvm source.
-	if [ -d ${XBPS_BUILDDIR}/compiler-rt-${version}.src ]; then
-		mv ${XBPS_BUILDDIR}/compiler-rt-${version}.src ${wrksrc}/projects/compiler-rt
-	fi
-	case "$XBPS_TARGET_MACHINE" in
-		*-musl)
-			# Disable sanitizers
-			sed -i 's/set(COMPILER_RT_HAS_SANITIZER_COMMON TRUE)/set(COMPILER_RT_HAS_SANITIZER_COMMON FALSE)/' ${wrksrc}/projects/compiler-rt/cmake/config-ix.cmake
-			;;
-	esac
-
 }
 
 pre_configure() {
@@ -120,9 +63,7 @@ pre_configure() {
 			CXXFLAGS="$BUILD_CXXFLAGS" LDFLAGS="$BUILD_LDFLAGS" \
 			cmake ../.. -DCMAKE_BUILD_TYPE=Release
 		make ${makejobs} -C utils/TableGen
-		make ${makejobs} -C tools/clang/utils/TableGen
 		configure_args+=" -DLLVM_TABLEGEN=${wrksrc}/build/HOST/bin/llvm-tblgen"
-		configure_args+=" -DCLANG_TABLEGEN=${wrksrc}/build/HOST/bin/clang-tblgen"
 		cd ../..
 	fi
 
@@ -164,105 +105,6 @@ do_install() {
 	fi
 }
 
-clang-analyzer_package() {
-	archs=noarch
-	pycompile_dirs="usr/share/scan-view"
-	depends="clang-${version}_${revision} python"
-	short_desc+=" - A source code analysis framework"
-	homepage="https://clang-analyzer.llvm.org/"
-	pkg_install() {
-		vmove usr/share/man/man1/scan-build.1
-		vmove "/usr/bin/scan-*"
-		vmove "/usr/share/scan-*"
-		vmove "/usr/libexec/*analyzer"
-	}
-}
-
-clang-tools-extra_package() {
-	depends="clang-${version}_${revision} python"
-	short_desc+=" - Extra Clang tools"
-	homepage="https://clang.llvm.org/extra/"
-	pkg_install() {
-		vmove usr/bin/clang-apply-replacements
-		vmove usr/bin/clang-query
-		vmove usr/bin/clang-rename
-		vmove usr/bin/clang-tidy
-		vmove usr/bin/modularize
-		vmove "usr/lib/libclangApplyReplacements*"
-		vmove "usr/lib/libclangQuery*"
-		vmove "usr/lib/libclangTidy*"
-		vmove "usr/share/clang/*tidy*"
-	}
-}
-
-clang_package() {
-	lib32disabled=yes
-	depends="libstdc++-devel libgcc-devel binutils"
-	case "$XBPS_TARGET_MACHINE" in
-		*-musl) depends+=" musl-devel";;
-		*) depends+=" glibc-devel";;
-	esac
-	short_desc+=" - C language family frontend"
-	alternatives="cc:cc:/usr/bin/clang"
-	homepage="https://clang.llvm.org/"
-	pkg_install() {
-		vmove usr/include/clang
-		vmove usr/include/clang-c
-		vmove "usr/bin/*clang*"
-		vmove usr/bin/c-index-test
-		vmove usr/lib/clang
-		vmove usr/lib/cmake/clang
-		vmove "usr/lib/libclang*"
-		vmove "usr/share/clang"
-	}
-}
-
-lld_package() {
-	lib32disabled=yes
-	short_desc+=" - linker"
-	homepage="https://lld.llvm.org"
-	pkg_install() {
-		vmove usr/bin/lld*
-		vmove usr/bin/wasm-ld
-		vmove usr/bin/ld.lld*
-	}
-}
-
-lld-devel_package() {
-	lib32disabled=yes
-	short_desc+=" - linker - development files"
-	homepage="https://lld.llvm.org"
-	pkg_install() {
-		vmove usr/include/lld
-		vmove "usr/lib/liblld*a"
-	}
-}
-
-lldb_package() {
-	lib32disabled=yes
-	depends+=" python-six"
-	short_desc+=" - LLDB debugger"
-	homepage="https://lldb.llvm.org/"
-	pkg_install() {
-		vmove usr/bin/*lldb*
-		vmove usr/lib/liblldb*so.*
-		vman tools/lldb/docs/lldb.1
-		vmove /usr/lib/python*
-		# Depend on python-six instead of conflicting
-		rm "${PKGDESTDIR}/usr/lib/python2.7/site-packages/six.py"
-	}
-}
-
-lldb-devel_package() {
-	depends="lldb>=${version}_${revision}"
-	short_desc+=" - LLDB debugger - development files"
-	pkg_install() {
-		vmove usr/include/lldb
-		vmove "usr/lib/liblldb*.a"
-		vmove "usr/lib/liblldb*.so"
-	}
-}
-
 libllvm8_package() {
 	short_desc+=" - runtime library"
 	pkg_install() {
diff --git a/srcpkgs/llvm9/files/llvm-Config-config.h b/srcpkgs/llvm9/files/llvm-Config-config.h
new file mode 100644
index 00000000000..c369b4551f7
--- /dev/null
+++ b/srcpkgs/llvm9/files/llvm-Config-config.h
@@ -0,0 +1,9 @@
+#include <bits/wordsize.h>
+
+#if __WORDSIZE == 32
+#include "config-32.h"
+#elif __WORDSIZE == 64
+#include "config-64.h"
+#else
+#error "Unknown word size"
+#endif
diff --git a/srcpkgs/llvm9/files/llvm-Config-llvm-config.h b/srcpkgs/llvm9/files/llvm-Config-llvm-config.h
new file mode 100644
index 00000000000..2fa08c9be69
--- /dev/null
+++ b/srcpkgs/llvm9/files/llvm-Config-llvm-config.h
@@ -0,0 +1,9 @@
+#include <bits/wordsize.h>
+
+#if __WORDSIZE == 32
+#include "llvm-config-32.h"
+#elif __WORDSIZE == 64
+#include "llvm-config-64.h"
+#else
+#error "Unknown word size"
+#endif
diff --git a/srcpkgs/llvm9/files/patches/cfe/cfe-001-fix-unwind-chain-inclusion.patch b/srcpkgs/llvm9/files/patches/cfe/cfe-001-fix-unwind-chain-inclusion.patch
new file mode 100644
index 00000000000..04244bcc274
--- /dev/null
+++ b/srcpkgs/llvm9/files/patches/cfe/cfe-001-fix-unwind-chain-inclusion.patch
@@ -0,0 +1,44 @@
+From 352974169f0d2b5da3d5321f588f5e3b5941330e Mon Sep 17 00:00:00 2001
+From: Andrea Brancaleoni <miwaxe@gmail.com>
+Date: Tue, 8 Sep 2015 22:14:57 +0200
+Subject: [PATCH 2/7] fix unwind chain inclusion
+
+---
+ lib/Headers/unwind.h | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/lib/Headers/unwind.h b/lib/Headers/unwind.h
+index 303d792..44e10cc 100644
+--- a/lib/Headers/unwind.h
++++ b/lib/Headers/unwind.h
+@@ -9,9 +9,6 @@
+ 
+ /* See "Data Definitions for libgcc_s" in the Linux Standard Base.*/
+ 
+-#ifndef __CLANG_UNWIND_H
+-#define __CLANG_UNWIND_H
+-
+ #if defined(__APPLE__) && __has_include_next(<unwind.h>)
+ /* Darwin (from 11.x on) provide an unwind.h. If that's available,
+  * use it. libunwind wraps some of its definitions in #ifdef _GNU_SOURCE,
+@@ -39,6 +36,9 @@
+ # endif
+ #else
+ 
++#ifndef __CLANG_UNWIND_H
++#define __CLANG_UNWIND_H
++
+ #include <stdint.h>
+ 
+ #ifdef __cplusplus
+@@ -322,6 +322,7 @@ _Unwind_Ptr _Unwind_GetTextRelBase(struct _Unwind_Context *);
+ }
+ #endif
+ 
++#endif /* __CLANG_UNWIND_H */
++
+ #endif
+ 
+-#endif /* __CLANG_UNWIND_H */
+-- 
+2.5.1
diff --git a/srcpkgs/llvm9/files/patches/cfe/cfe-002-add-musl-triples.patch b/srcpkgs/llvm9/files/patches/cfe/cfe-002-add-musl-triples.patch
new file mode 100644
index 00000000000..aefc88d48f5
--- /dev/null
+++ b/srcpkgs/llvm9/files/patches/cfe/cfe-002-add-musl-triples.patch
@@ -0,0 +1,91 @@
+--- a/lib/Driver/ToolChains/Gnu.cpp
++++ b/lib/Driver/ToolChains/Gnu.cpp
+@@ -1938,7 +1938,8 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes(
+   static const char *const ARMHFTriples[] = {"arm-linux-gnueabihf",
+                                              "armv7hl-redhat-linux-gnueabi",
+                                              "armv6hl-suse-linux-gnueabi",
+-                                             "armv7hl-suse-linux-gnueabi"};
++                                             "armv7hl-suse-linux-gnueabi",
++                                             "armv7l-linux-gnueabihf"};
+   static const char *const ARMebLibDirs[] = {"/lib"};
+   static const char *const ARMebTriples[] = {"armeb-linux-gnueabi",
+                                              "armeb-linux-androideabi"};
+@@ -2077,6 +2078,78 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes(
+     return;
+   }
+ 
++  if (TargetTriple.isMusl()) {
++    static const char *const AArch64MuslTriples[] = {"aarch64-linux-musl"};
++    static const char *const ARMHFMuslTriples[] = {
++        "arm-linux-musleabihf", "armv7l-linux-musleabihf"
++    };
++    static const char *const ARMMuslTriples[] = {"arm-linux-musleabi"};
++    static const char *const X86_64MuslTriples[] = {"x86_64-linux-musl"};
++    static const char *const X86MuslTriples[] = {"i686-linux-musl"};
++    static const char *const MIPSMuslTriples[] = {
++        "mips-linux-musl", "mipsel-linux-musl",
++        "mipsel-linux-muslhf", "mips-linux-muslhf"
++    };
++    static const char *const PPCMuslTriples[] = {"powerpc-linux-musl"};
++    static const char *const PPC64MuslTriples[] = {"powerpc64-linux-musl"};
++    static const char *const PPC64LEMuslTriples[] = {"powerpc64le-linux-musl"};
++
++    switch (TargetTriple.getArch()) {
++    case llvm::Triple::aarch64:
++      LibDirs.append(begin(AArch64LibDirs), end(AArch64LibDirs));
++      TripleAliases.append(begin(AArch64MuslTriples), end(AArch64MuslTriples));
++      BiarchLibDirs.append(begin(AArch64LibDirs), end(AArch64LibDirs));
++      BiarchTripleAliases.append(begin(AArch64MuslTriples), end(AArch64MuslTriples));
++      break;
++    case llvm::Triple::arm:
++      LibDirs.append(begin(ARMLibDirs), end(ARMLibDirs));
++      if (TargetTriple.getEnvironment() == llvm::Triple::MuslEABIHF) {
++        TripleAliases.append(begin(ARMHFMuslTriples), end(ARMHFMuslTriples));
++      } else {
++        TripleAliases.append(begin(ARMMuslTriples), end(ARMMuslTriples));
++      }
++      break;
++    case llvm::Triple::x86_64:
++      LibDirs.append(begin(X86_64LibDirs), end(X86_64LibDirs));
++      TripleAliases.append(begin(X86_64MuslTriples), end(X86_64MuslTriples));
++      BiarchLibDirs.append(begin(X86LibDirs), end(X86LibDirs));
++      BiarchTripleAliases.append(begin(X86MuslTriples), end(X86MuslTriples));
++      break;
++    case llvm::Triple::x86:
++      LibDirs.append(begin(X86LibDirs), end(X86LibDirs));
++      TripleAliases.append(begin(X86MuslTriples), end(X86MuslTriples));
++      BiarchLibDirs.append(begin(X86_64LibDirs), end(X86_64LibDirs));
++      BiarchTripleAliases.append(begin(X86_64MuslTriples), end(X86_64MuslTriples));
++      break;
++    case llvm::Triple::mips:
++      LibDirs.append(begin(MIPSLibDirs), end(MIPSLibDirs));
++      TripleAliases.append(begin(MIPSMuslTriples), end(MIPSMuslTriples));
++      break;
++    case llvm::Triple::ppc:
++      LibDirs.append(begin(PPCLibDirs), end(PPCLibDirs));
++      TripleAliases.append(begin(PPCMuslTriples), end(PPCMuslTriples));
++      BiarchLibDirs.append(begin(PPC64LibDirs), end(PPC64LibDirs));
++      BiarchTripleAliases.append(begin(PPC64MuslTriples), end(PPC64MuslTriples));
++      break;
++    case llvm::Triple::ppc64:
++      LibDirs.append(begin(PPC64LibDirs), end(PPC64LibDirs));
++      TripleAliases.append(begin(PPC64MuslTriples), end(PPC64MuslTriples));
++      BiarchLibDirs.append(begin(PPCLibDirs), end(PPCLibDirs));
++      BiarchTripleAliases.append(begin(PPCMuslTriples), end(PPCMuslTriples));
++      break;
++    case llvm::Triple::ppc64le:
++      LibDirs.append(begin(PPC64LELibDirs), end(PPC64LELibDirs));
++      TripleAliases.append(begin(PPC64LEMuslTriples), end(PPC64LEMuslTriples));
++      break;
++    default:
++      break;
++    }
++    TripleAliases.push_back(TargetTriple.str());
++    if (TargetTriple.str() != BiarchTriple.str())
++      BiarchTripleAliases.push_back(BiarchTriple.str());
++    return;
++  }
++
+   // Android targets should not use GNU/Linux tools or libraries.
+   if (TargetTriple.isAndroid()) {
+     static const char *const AArch64AndroidTriples[] = {
diff --git a/srcpkgs/llvm9/files/patches/cfe/cfe-003-ppc64-dynamic-linker-path.patch b/srcpkgs/llvm9/files/patches/cfe/cfe-003-ppc64-dynamic-linker-path.patch
new file mode 100644
index 00000000000..4b9b0b891d5
--- /dev/null
+++ b/srcpkgs/llvm9/files/patches/cfe/cfe-003-ppc64-dynamic-linker-path.patch
@@ -0,0 +1,18 @@
+--- a/lib/Driver/ToolChains/Linux.cpp
++++ b/lib/Driver/ToolChains/Linux.cpp
+@@ -593,12 +593,12 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
+     Loader = "ld.so.1";
+     break;
+   case llvm::Triple::ppc64:
+-    LibDir = "lib64";
++    LibDir = "lib";
+     Loader =
+-        (tools::ppc::hasPPCAbiArg(Args, "elfv2")) ? "ld64.so.2" : "ld64.so.1";
++        (tools::ppc::hasPPCAbiArg(Args, "elfv1")) ? "ld64.so.1" : "ld64.so.2";
+     break;
+   case llvm::Triple::ppc64le:
+-    LibDir = "lib64";
++    LibDir = "lib";
+     Loader =
+         (tools::ppc::hasPPCAbiArg(Args, "elfv1")) ? "ld64.so.1" : "ld64.so.2";
+     break;
diff --git a/srcpkgs/llvm9/files/patches/cfe/cfe-004-ppc64-musl-elfv2.patch b/srcpkgs/llvm9/files/patches/cfe/cfe-004-ppc64-musl-elfv2.patch
new file mode 100644
index 00000000000..14dfc007ed3
--- /dev/null
+++ b/srcpkgs/llvm9/files/patches/cfe/cfe-004-ppc64-musl-elfv2.patch
@@ -0,0 +1,27 @@
+--- a/lib/Basic/Targets/PPC.h
++++ b/lib/Basic/Targets/PPC.h
+@@ -376,11 +376,11 @@ public:
+ 
+     if ((Triple.getArch() == llvm::Triple::ppc64le)) {
+       resetDataLayout("e-m:e-i64:64-n32:64");
+-      ABI = "elfv2";
+     } else {
+       resetDataLayout("E-m:e-i64:64-n32:64");
+-      ABI = Triple.getEnvironment() == llvm::Triple::ELFv2 ? "elfv2" : "elfv1";
+     }
++    /* default to elfv2 always, ignore llvm's elfv2 triples */
++    ABI = "elfv2";
+ 
+     if (Triple.getOS() == llvm::Triple::AIX)
+       SuitableAlign = 64;
+--- a/lib/Driver/ToolChains/Clang.cpp
++++ b/lib/Driver/ToolChains/Clang.cpp
+@@ -1804,7 +1804,7 @@ void Clang::AddPPCTargetArgs(const ArgList &Args,
+         break;
+       }
+ 
+-      ABIName = "elfv1";
++      ABIName = "elfv2";
+       break;
+     }
+     case llvm::Triple::ppc64le:
diff --git a/srcpkgs/llvm9/files/patches/cfe/cfe-005-gcc9.patch b/srcpkgs/llvm9/files/patches/cfe/cfe-005-gcc9.patch
new file mode 100644
index 00000000000..f600a6657ef
--- /dev/null
+++ b/srcpkgs/llvm9/files/patches/cfe/cfe-005-gcc9.patch
@@ -0,0 +1,40 @@
+From a1445cd0340006d7635101c4c2b27ae51328642c Mon Sep 17 00:00:00 2001
+From: Serge Guelton <sguelton@redhat.com>
+Date: Thu, 19 Sep 2019 00:54:40 +0000
+Subject: [PATCH] Initialize all fields in ABIArgInfo.
+
+Due to usage of an uninitialized fields, we end up with
+a Conditional jump or move depends on uninitialised value
+
+Fixes https://bugs.llvm.org/show_bug.cgi?id=40547
+
+Commited on behalf of Martin Liska <mliska@suse.cz>
+
+git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@372281 91177308-0d34-0410-b5e6-96231b3b80d8
+---
+ include/clang/CodeGen/CGFunctionInfo.h | 10 ++++------
+ 1 file changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/include/clang/CodeGen/CGFunctionInfo.h b/include/clang/CodeGen/CGFunctionInfo.h
+index 1f81072e23d0..5069d9af42a3 100644
+--- a/include/clang/CodeGen/CGFunctionInfo.h
++++ b/include/clang/CodeGen/CGFunctionInfo.h
+@@ -109,14 +109,12 @@ class ABIArgInfo {
+     UnpaddedCoerceAndExpandType = T;
+   }
+ 
+-  ABIArgInfo(Kind K)
+-      : TheKind(K), PaddingInReg(false), InReg(false) {
+-  }
+-
+ public:
+-  ABIArgInfo()
++  ABIArgInfo(Kind K = Direct)
+       : TypeData(nullptr), PaddingType(nullptr), DirectOffset(0),
+-        TheKind(Direct), PaddingInReg(false), InReg(false) {}
++        TheKind(K), PaddingInReg(false), InAllocaSRet(false),
++        IndirectByVal(false), IndirectRealign(false), SRetAfterThis(false),
++        InReg(false), CanBeFlattened(false), SignExt(false) {}
+ 
+   static ABIArgInfo getDirect(llvm::Type *T = nullptr, unsigned Offset = 0,
+                               llvm::Type *Padding = nullptr,
diff --git a/srcpkgs/llvm9/files/patches/lldb/musl.patch b/srcpkgs/llvm9/files/patches/lldb/musl.patch
new file mode 100644
index 00000000000..37416bb478d
--- /dev/null
+++ b/srcpkgs/llvm9/files/patches/lldb/musl.patch
@@ -0,0 +1,31 @@
+--- a/source/Plugins/Process/Linux/Procfs.h
++++ b/source/Plugins/Process/Linux/Procfs.h
+@@ -10,21 +10,12 @@
+ // sys/procfs.h on Android/Linux for all supported architectures.
+ 
+ #include <sys/ptrace.h>
++#include <asm/ptrace.h>
+ 
+-#ifdef __ANDROID__
+-#if defined(__arm64__) || defined(__aarch64__)
+-typedef unsigned long elf_greg_t;
+-typedef elf_greg_t
+-    elf_gregset_t[(sizeof(struct user_pt_regs) / sizeof(elf_greg_t))];
+-typedef struct user_fpsimd_state elf_fpregset_t;
+-#ifndef NT_FPREGSET
+-#define NT_FPREGSET NT_PRFPREG
+-#endif // NT_FPREGSET
+-#elif defined(__mips__)
+-#ifndef NT_FPREGSET
+-#define NT_FPREGSET NT_PRFPREG
+-#endif // NT_FPREGSET
+-#endif
+-#else // __ANDROID__
++#if !defined(__GLIBC__) && defined(__powerpc__)
++#define pt_regs musl_pt_regs
++#include <sys/procfs.h>
++#undef pt_regs
++#else
+ #include <sys/procfs.h>
+-#endif // __ANDROID__
++#endif
diff --git a/srcpkgs/llvm9/files/patches/llvm/llvm-001-musl.patch b/srcpkgs/llvm9/files/patches/llvm/llvm-001-musl.patch
new file mode 100644
index 00000000000..a0eddbf58be
--- /dev/null
+++ b/srcpkgs/llvm9/files/patches/llvm/llvm-001-musl.patch
@@ -0,0 +1,58 @@
+From faca3fbd15d0c3108493c3c54cd93138e049ac43 Mon Sep 17 00:00:00 2001
+From: Andrea Brancaleoni <miwaxe@gmail.com>
+Date: Tue, 8 Sep 2015 22:03:02 +0200
+Subject: [PATCH 3/3] musl
+
+---
+ include/llvm/Analysis/TargetLibraryInfo.h | 9 +++++++++
+ lib/Support/DynamicLibrary.cpp            | 2 +-
+ lib/Support/Unix/Signals.inc              | 6 +++---
+ utils/unittest/googletest/src/gtest.cc    | 1 +
+ 5 files changed, 17 insertions(+), 6 deletions(-)
+
+diff --git a/include/llvm/Analysis/TargetLibraryInfo.h b/include/llvm/Analysis/TargetLibraryInfo.h
+index e0a1ee3..465b65a 100644
+--- a/include/llvm/Analysis/TargetLibraryInfo.h
++++ b/include/llvm/Analysis/TargetLibraryInfo.h
+@@ -18,6 +18,15 @@
+ #include "llvm/IR/PassManager.h"
+ #include "llvm/Pass.h"
+ 
++#undef fopen64
++#undef fseeko64
++#undef fstat64
++#undef fstatvfs64
++#undef ftello64
++#undef lstat64
++#undef stat64
++#undef tmpfile64
++
+ namespace llvm {
+ template <typename T> class ArrayRef;
+ 
+diff --git a/utils/unittest/googletest/src/gtest.cc b/utils/unittest/googletest/src/gtest.cc
+index 5780764..1d548c1 100644
+--- a/utils/unittest/googletest/src/gtest.cc
++++ b/utils/unittest/googletest/src/gtest.cc
+@@ -128,6 +128,7 @@
+ 
+ #if GTEST_CAN_STREAM_RESULTS_
+ # include <arpa/inet.h>  // NOLINT
++# include <sys/socket.h>  // NOLINT
+ # include <netdb.h>  // NOLINT
+ # include <sys/socket.h>  // NOLINT
+ # include <sys/types.h>  // NOLINT
+-- 
+2.5.1
+
+--- a/lib/Support/Unix/DynamicLibrary.inc
++++ b/lib/Support/Unix/DynamicLibrary.inc
+@@ -102,7 +102,7 @@ static void *DoSearch(const char* SymbolName) {
+ 
+ // This macro returns the address of a well-known, explicit symbol
+ #define EXPLICIT_SYMBOL(SYM) \
+-   if (!strcmp(SymbolName, #SYM)) return &SYM
++   if (!strcmp(SymbolName, #SYM)) return (void *)&SYM
+ 
+ // Under glibc we have a weird situation. The stderr/out/in symbols are both
+ // macros and global variables because of standards requirements. So, we
diff --git a/srcpkgs/llvm9/files/patches/llvm/llvm-002-musl-ppc64-elfv2.patch b/srcpkgs/llvm9/files/patches/llvm/llvm-002-musl-ppc64-elfv2.patch
new file mode 100644
index 00000000000..955a9a94626
--- /dev/null
+++ b/srcpkgs/llvm9/files/patches/llvm/llvm-002-musl-ppc64-elfv2.patch
@@ -0,0 +1,31 @@
+This patches LLVM to use ELFv2 on ppc64 uncoditionally unless overridden. We
+need this because unlike most distros we use ELFv2 for both glibc and musl
+on big endian ppc64.
+
+--- a/lib/Target/PowerPC/PPCTargetMachine.cpp
++++ b/lib/Target/PowerPC/PPCTargetMachine.cpp
+@@ -211,11 +211,11 @@ static PPCTargetMachine::PPCABI computeTargetABI(const Triple &TT,
+ 
+   switch (TT.getArch()) {
+   case Triple::ppc64le:
+-    return PPCTargetMachine::PPC_ABI_ELFv2;
+   case Triple::ppc64:
+-    if (TT.getEnvironment() == llvm::Triple::ELFv2)
+-      return PPCTargetMachine::PPC_ABI_ELFv2;
+-    return PPCTargetMachine::PPC_ABI_ELFv1;
++    /* default to ELFv2 always, don't care about llvm's stupid broken suffix
++     * triples; people can override the default properly via -mabi like gcc
++     */
++    return PPCTargetMachine::PPC_ABI_ELFv2;
+   default:
+     return PPCTargetMachine::PPC_ABI_UNKNOWN;
+   }
+--- a/test/CodeGen/PowerPC/ppc64-elf-abi.ll
++++ b/test/CodeGen/PowerPC/ppc64-elf-abi.ll
+@@ -1,4 +1,5 @@
+-; RUN: llc -verify-machineinstrs -mtriple=powerpc64-unknown-linux-gnu < %s | FileCheck %s -check-prefix=CHECK-ELFv1
++; RUN: llc -verify-machineinstrs -mtriple=powerpc64-unknown-linux-gnu < %s | FileCheck %s -check-prefix=CHECK-ELFv2
++; RUN: llc -verify-machineinstrs -mtriple=powerpc64-unknown-linux-musl < %s | FileCheck %s -check-prefix=CHECK-ELFv2
+ ; RUN: llc -verify-machineinstrs -mtriple=powerpc64-unknown-linux-gnu -target-abi elfv1 < %s | FileCheck %s -check-prefix=CHECK-ELFv1
+ ; RUN: llc -verify-machineinstrs -mtriple=powerpc64-unknown-linux-gnu -target-abi elfv2 < %s | FileCheck %s -check-prefix=CHECK-ELFv2
+ ; RUN: llc -verify-machineinstrs -mtriple=powerpc64le-unknown-linux-gnu < %s | FileCheck %s -check-prefix=CHECK-ELFv2
diff --git a/srcpkgs/llvm9/files/patches/llvm/llvm-003-secureplt.patch b/srcpkgs/llvm9/files/patches/llvm/llvm-003-secureplt.patch
new file mode 100644
index 00000000000..bbb4ae4817f
--- /dev/null
+++ b/srcpkgs/llvm9/files/patches/llvm/llvm-003-secureplt.patch
@@ -0,0 +1,130 @@
+--- llvm/lib/Target/PowerPC/PPCSubtarget.cpp
++++ llvm/lib/Target/PowerPC/PPCSubtarget.cpp
+@@ -145,8 +145,7 @@ void PPCSubtarget::initSubtargetFeatures(StringRef CPU, StringRef FS) {
+   if (isDarwin())
+     HasLazyResolverStubs = true;
+
+-  if (TargetTriple.isOSNetBSD() || TargetTriple.isOSOpenBSD() ||
+-      TargetTriple.isMusl())
++  if (TargetTriple.isOSNetBSD() || TargetTriple.isOSOpenBSD() || isTargetLinux())
+     SecurePlt = true;
+
+   if (HasSPE && IsPPC64)
+--- llvm/lib/Target/PowerPC/PPCISelLowering.cpp
++++ llvm/lib/Target/PowerPC/PPCISelLowering.cpp
+@@ -4941,7 +4945,8 @@ PrepareCall(SelectionDAG &DAG, SDValue &Callee, SDValue &InFlag, SDValue &Chain,
+   if (auto *G = dyn_cast<GlobalAddressSDNode>(Callee))
+     GV = G->getGlobal();
+   bool Local = TM.shouldAssumeDSOLocal(*Mod, GV);
+-  bool UsePlt = !Local && Subtarget.isTargetELF() && !isPPC64;
++  bool UsePlt = !Local && Subtarget.isTargetELF() && !isPPC64 &&
++                TM.isPositionIndependent();
+ 
+   if (isFunctionGlobalAddress(Callee)) {
+     GlobalAddressSDNode *G = cast<GlobalAddressSDNode>(Callee);
+--- llvm/test/CodeGen/PowerPC/2008-10-28-f128-i32.ll
++++ llvm/test/CodeGen/PowerPC/2008-10-28-f128-i32.ll
+@@ -62,7 +62,7 @@ define i64 @__fixunstfdi(ppc_fp128 %a) nounwind readnone {
+ ; CHECK-NEXT:    lfd 4, 328(1)
+ ; CHECK-NEXT:    fmr 1, 31
+ ; CHECK-NEXT:    fmr 2, 30
+-; CHECK-NEXT:    bl __gcc_qmul@PLT
++; CHECK-NEXT:    bl __gcc_qmul
+ ; CHECK-NEXT:    lis 3, 16864
+ ; CHECK-NEXT:    stfd 1, 280(1)
+ ; CHECK-NEXT:    fmr 29, 1
+@@ -84,7 +84,7 @@ define i64 @__fixunstfdi(ppc_fp128 %a) nounwind readnone {
+ ; CHECK-NEXT:    lfd 4, 360(1)
+ ; CHECK-NEXT:    lfd 1, 352(1)
+ ; CHECK-NEXT:    lfd 2, 344(1)
+-; CHECK-NEXT:    bl __gcc_qsub@PLT
++; CHECK-NEXT:    bl __gcc_qsub
+ ; CHECK-NEXT:    mffs 0
+ ; CHECK-NEXT:    mtfsb1 31
+ ; CHECK-NEXT:    lis 3, .LCPI0_1@ha
+@@ -117,7 +117,7 @@ define i64 @__fixunstfdi(ppc_fp128 %a) nounwind readnone {
+ ; CHECK-NEXT:  .LBB0_5: # %bb1
+ ; CHECK-NEXT:    li 4, 0
+ ; CHECK-NEXT:    mr 3, 30
+-; CHECK-NEXT:    bl __floatditf@PLT
++; CHECK-NEXT:    bl __floatditf
+ ; CHECK-NEXT:    lis 3, 17392
+ ; CHECK-NEXT:    stfd 1, 208(1)
+ ; CHECK-NEXT:    fmr 29, 1
+@@ -140,7 +140,7 @@ define i64 @__fixunstfdi(ppc_fp128 %a) nounwind readnone {
+ ; CHECK-NEXT:    lfd 4, 232(1)
+ ; CHECK-NEXT:    lfd 1, 224(1)
+ ; CHECK-NEXT:    lfd 2, 216(1)
+-; CHECK-NEXT:    bl __gcc_qadd@PLT
++; CHECK-NEXT:    bl __gcc_qadd
+ ; CHECK-NEXT:    blt 2, .LBB0_7
+ ; CHECK-NEXT:  # %bb.6: # %bb1
+ ; CHECK-NEXT:    fmr 2, 28
+@@ -163,7 +163,7 @@ define i64 @__fixunstfdi(ppc_fp128 %a) nounwind readnone {
+ ; CHECK-NEXT:    stw 3, 248(1)
+ ; CHECK-NEXT:    lfd 3, 256(1)
+ ; CHECK-NEXT:    lfd 4, 248(1)
+-; CHECK-NEXT:    bl __gcc_qsub@PLT
++; CHECK-NEXT:    bl __gcc_qsub
+ ; CHECK-NEXT:    stfd 2, 176(1)
+ ; CHECK-NEXT:    fcmpu 0, 2, 27
+ ; CHECK-NEXT:    stfd 1, 168(1)
+@@ -205,7 +205,7 @@ define i64 @__fixunstfdi(ppc_fp128 %a) nounwind readnone {
+ ; CHECK-NEXT:    lfd 4, 72(1)
+ ; CHECK-NEXT:    lfd 1, 64(1)
+ ; CHECK-NEXT:    lfd 2, 56(1)
+-; CHECK-NEXT:    bl __gcc_qsub@PLT
++; CHECK-NEXT:    bl __gcc_qsub
+ ; CHECK-NEXT:    mffs 0
+ ; CHECK-NEXT:    mtfsb1 31
+ ; CHECK-NEXT:    lis 3, .LCPI0_2@ha
+@@ -260,7 +260,7 @@ define i64 @__fixunstfdi(ppc_fp128 %a) nounwind readnone {
+ ; CHECK-NEXT:    lfd 4, 136(1)
+ ; CHECK-NEXT:    lfd 1, 128(1)
+ ; CHECK-NEXT:    lfd 2, 120(1)
+-; CHECK-NEXT:    bl __gcc_qsub@PLT
++; CHECK-NEXT:    bl __gcc_qsub
+ ; CHECK-NEXT:    mffs 0
+ ; CHECK-NEXT:    mtfsb1 31
+ ; CHECK-NEXT:    lis 3, .LCPI0_0@ha
+--- llvm/test/CodeGen/PowerPC/2010-02-12-saveCR.ll
++++ llvm/test/CodeGen/PowerPC/2010-02-12-saveCR.ll
+@@ -11,7 +11,7 @@ entry:
+ ; CHECK-DAG: ori [[T2:[0-9]+]], [[T2]], 34492
+ ; CHECK-DAG: stwx [[T1]], 1, [[T2]]
+ ; CHECK-DAG: addi 3, 1, 28
+-; CHECK: bl bar@PLT
++; CHECK: bl bar
+   %x = alloca [100000 x i8]                       ; <[100000 x i8]*> [#uses=1]
+   %"alloca point" = bitcast i32 0 to i32          ; <i32> [#uses=0]
+   %x1 = bitcast [100000 x i8]* %x to i8*          ; <i8*> [#uses=1]
+--- llvm/test/CodeGen/PowerPC/available-externally.ll
++++ llvm/test/CodeGen/PowerPC/available-externally.ll
+@@ -14,7 +14,7 @@ target triple = "powerpc-unknown-linux-gnu"
+ define i32 @foo(i64 %x) nounwind {
+ entry:
+ ; STATIC: foo:
+-; STATIC: bl exact_log2@PLT
++; STATIC: bl exact_log2
+ ; STATIC: blr
+ 
+ ; PIC: foo:
+--- llvm/test/CodeGen/PowerPC/stubs.ll
++++ llvm/test/CodeGen/PowerPC/stubs.ll
+@@ -6,4 +6,4 @@ entry:
+ }
+ 
+ ; CHECK: test1:
+-; CHECK: bl __floatditf@PLT
++; CHECK: bl __floatditf
+--- llvm/test/CodeGen/PowerPC/umulo-128-legalisation-lowering.ll
++++ llvm/test/CodeGen/PowerPC/umulo-128-legalisation-lowering.ll
+@@ -72,7 +72,7 @@ define { i128, i8 } @muloti_test(i128 %l, i128 %r) unnamed_addr #0 {
+ ; PPC32-NEXT: mr 28, 9
+ ; PPC32-NEXT: mr 23, 6
+ ; PPC32-NEXT: mr 24, 5
+-; PPC32-NEXT: bl __multi3@PLT
++; PPC32-NEXT: bl __multi3
+ ; PPC32-NEXT: mr 7, 4
+ ; PPC32-NEXT: mullw 4, 24, 30
+ ; PPC32-NEXT: mullw 8, 29, 23
diff --git a/srcpkgs/llvm9/files/patches/llvm/llvm-004-override-opt.patch b/srcpkgs/llvm9/files/patches/llvm/llvm-004-override-opt.patch
new file mode 100644
index 00000000000..30d1e14e193
--- /dev/null
+++ b/srcpkgs/llvm9/files/patches/llvm/llvm-004-override-opt.patch
@@ -0,0 +1,18 @@
+This allows us to override the optimization level as not all platforms can
+deal with -O3.
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -893,6 +893,12 @@ if( MINGW AND NOT "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" )
+   llvm_replace_compiler_option(CMAKE_CXX_FLAGS_RELEASE "-O3" "-O2")
+ endif()
+ 
++set(VOID_CXX_OPT_FLAGS "" CACHE STRING "Optimization level to use")
++
++if(NOT VOID_CXX_OPT_FLAGS STREQUAL "")
++  llvm_replace_compiler_option(CMAKE_CXX_FLAGS_RELEASE "-O3" "${VOID_CXX_OPT_FLAGS}")
++endif()
++
+ # Put this before tblgen. Else we have a circular dependence.
+ add_subdirectory(lib/Demangle)
+ add_subdirectory(lib/Support)
diff --git a/srcpkgs/llvm9/template b/srcpkgs/llvm9/template
new file mode 100644
index 00000000000..3c1a1a3451b
--- /dev/null
+++ b/srcpkgs/llvm9/template
@@ -0,0 +1,283 @@
+# Template file for 'llvm9'
+pkgname=llvm9
+version=9.0.0
+revision=2
+wrksrc="llvm-${version}.src"
+build_style=cmake
+configure_args="
+ -DCMAKE_BUILD_TYPE=Release
+ -DLLVM_INSTALL_UTILS=ON
+ -DLLVM_BUILD_LLVM_DYLIB=ON
+ -DLLVM_LINK_LLVM_DYLIB=ON
+ -DLLVM_ENABLE_RTTI=ON
+ -DLLVM_ENABLE_FFI=ON
+ -DLLVM_BINUTILS_INCDIR=/usr/include"
+hostmakedepends="groff perl python3 zlib-devel libffi-devel swig"
+makedepends="python3-devel zlib-devel libffi-devel libedit-devel
+ libxml2-devel binutils-devel libatomic-devel"
+depends="libllvm9"
+short_desc="Low Level Virtual Machine"
+maintainer="q66 <daniel@octaforge.org>"
+license="NCSA"
+homepage="https://www.llvm.org"
+distfiles="https://releases.llvm.org/${version}/llvm-${version}.src.tar.xz
+ https://releases.llvm.org/${version}/lldb-${version}.src.tar.xz
+ https://releases.llvm.org/${version}/lld-${version}.src.tar.xz
+ https://releases.llvm.org/${version}/cfe-${version}.src.tar.xz
+ https://releases.llvm.org/${version}/clang-tools-extra-${version}.src.tar.xz
+ https://releases.llvm.org/${version}/compiler-rt-${version}.src.tar.xz"
+checksum="d6a0565cf21f22e9b4353b2eb92622e8365000a9e90a16b09b56f8157eabfe84
+ 1e4c2f6a1f153f4b8afa2470d2e99dab493034c1ba8b7ffbbd7600de016d0794
+ 31c6748b235d09723fb73fea0c816ed5a3fab0f96b66f8fbc546a0fcc8688f91
+ 7ba81eef7c22ca5da688fdf9d88c20934d2d6b40bfe150ffd338900890aa4610
+ ea1c86ce352992d7b6f6649bc622f6a2707b9f8b7153e9f9181a35c76aa3ac10
+ 56e4cd96dd1d8c346b07b4d6b255f976570c6f2389697347a6c3dcb9e820d10e"
+disable_parallel_builds=yes
+lib32disabled=yes
+# necessary to override auto default
+python_version=3
+
+_lldb_enable=yes
+
+if [ "$CROSS_BUILD" ]; then
+	_lldb_enable=no
+fi
+
+case "$XBPS_TARGET_MACHINE" in
+	ppc64le*) ;;
+	ppc*) _lldb_enable=no ;;
+esac
+
+subpackages="clang-tools-extra clang clang-analyzer libllvm9"
+if [ "$_lldb_enable" = "yes" ]; then
+	# XXX fails to cross compile due to python
+	subpackages+=" lldb lldb-devel"
+fi
+subpackages+=" lld lld-devel"
+
+case "$XBPS_TARGET_MACHINE" in
+	armv5*) broken="Tries to assemble VFP instructions with armv5tel arch";;
+esac
+
+post_patch() {
+	# patches
+	cd ${XBPS_BUILDDIR}/llvm-${version}.src
+	for i in ${FILESDIR}/patches/llvm/llvm-*.patch; do
+		msg_normal "Applying $i to llvm\n"
+		patch -sNp1 -i ${i}
+	done
+
+	cd ${XBPS_BUILDDIR}/cfe-${version}.src
+	for i in ${FILESDIR}/patches/cfe/cfe-*.patch; do
+		msg_normal "Applying $i to cfe\n"
+		patch -sNp1 -i ${i}
+	done
+
+	if [ "$_lldb_enable" = "yes" ]; then
+		cd ${XBPS_BUILDDIR}/lldb-${version}.src
+		for i in ${FILESDIR}/patches/lldb/*.patch; do
+			msg_normal "Applying $i to lldb\n"
+			patch -sNp1 -i ${i}
+		done
+		case "$XBPS_TARGET_MACHINE" in
+			*-musl) sed -i 's|__ptrace_request|int|g' source/Plugins/Process/Linux/NativeProcessLinux.cpp ;;
+		esac
+	fi
+
+	# Move clang files into the llvm source.
+	if [ -d ${XBPS_BUILDDIR}/cfe-${version}.src ]; then
+		mv ${XBPS_BUILDDIR}/cfe-${version}.src ${wrksrc}/tools/clang
+	fi
+	# Move clang-tools-extra files into llvm source.
+	if [ -d ${XBPS_BUILDDIR}/clang-tools-extra-${version}.src ]; then
+		mv ${XBPS_BUILDDIR}/clang-tools-extra-${version}.src ${wrksrc}/tools/clang/tools/extra
+	fi
+	# Move lld files into the llvm source.
+	if [ -d ${XBPS_BUILDDIR}/lld-${version}.src ]; then
+		mv ${XBPS_BUILDDIR}/lld-${version}.src ${wrksrc}/tools/lld
+	fi
+	# Move lldb files into the llvm source.
+	if [ "$_lldb_enable" = "yes" -a -d ${XBPS_BUILDDIR}/lldb-${version}.src ]; then
+		mv ${XBPS_BUILDDIR}/lldb-${version}.src ${wrksrc}/tools/lldb
+	fi
+	# Move compiler-rt files into the llvm source.
+	if [ -d ${XBPS_BUILDDIR}/compiler-rt-${version}.src ]; then
+		mv ${XBPS_BUILDDIR}/compiler-rt-${version}.src ${wrksrc}/projects/compiler-rt
+	fi
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl)
+			# Disable sanitizers
+			sed -i 's/set(COMPILER_RT_HAS_SANITIZER_COMMON TRUE)/set(COMPILER_RT_HAS_SANITIZER_COMMON FALSE)/' ${wrksrc}/projects/compiler-rt/cmake/config-ix.cmake
+			;;
+	esac
+
+}
+
+pre_configure() {
+	# Vastly reduce size of debugging symbols:
+	CFLAGS=${CFLAGS/ -g/ -g1}
+	CXXFLAGS=${CXXFLAGS/ -g/ -g1}
+
+	# since gcc9, the build likes to blow up for ppc32 apparently because
+	# of clang being too large for a 24-bit relative call to the PLT, so
+	# optimize for size instead
+	case "$XBPS_TARGET_MACHINE" in
+		ppc|ppc-musl) configure_args+=" -DVOID_CXX_OPT_FLAGS=-Os" ;;
+	esac
+
+	if [ "$CROSS_BUILD" ]; then
+		msg_normal "Building host tblgen\n"
+		mkdir -p build/HOST
+		cd build/HOST
+		CC="$BUILD_CC" CXX="$BUILD_CXX" CFLAGS="$BUILD_CFLAGS" \
+			CXXFLAGS="$BUILD_CXXFLAGS" LDFLAGS="$BUILD_LDFLAGS" \
+			cmake ../.. -DCMAKE_BUILD_TYPE=Release
+		make ${makejobs} -C utils/TableGen
+		make ${makejobs} -C tools/clang/utils/TableGen
+		configure_args+=" -DLLVM_TABLEGEN=${wrksrc}/build/HOST/bin/llvm-tblgen"
+		configure_args+=" -DCLANG_TABLEGEN=${wrksrc}/build/HOST/bin/clang-tblgen"
+		cd ../..
+	fi
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686*) _arch="X86";;
+		x86_64*) _arch="X86";;
+		armv5*) _arch="Armv5te";;
+		armv6*) _arch="Armv6";;
+		armv7*) _arch="Armv7";;
+		aarch64*) _arch="AArch64";;
+		mips*) _arch="Mips";;
+		ppc*) _arch="PowerPC";;
+	esac
+	configure_args+=" -DLLVM_TARGET_ARCH=${_arch}"
+	configure_args+=" -DLLVM_DEFAULT_TARGET_TRIPLE=${XBPS_CROSS_TRIPLET:-$XBPS_TRIPLET}"
+}
+
+do_install() {
+	vlicense LICENSE.TXT
+
+	cd build
+	cmake -DCMAKE_INSTALL_PREFIX=${DESTDIR}/usr -P cmake_install.cmake
+
+	# Fix permissions of static libs
+	chmod -x ${DESTDIR}/usr/lib/*.a
+
+	# Required for multilib.
+	if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
+		for _header in llvm-config; do
+			mv ${DESTDIR}/usr/include/llvm/Config/${_header}{,-64}.h
+			vinstall ${FILESDIR}/llvm-Config-${_header}.h 644 \
+				usr/include/llvm/Config ${_header}.h
+		done
+	fi
+
+	# Remove llvm-config-host in cross builds.
+	if [ "$CROSS_BUILD" ]; then
+		rm -f ${DESTDIR}/usr/bin/llvm-config-host
+	fi
+}
+
+clang-analyzer_package() {
+	archs=noarch
+	pycompile_dirs="usr/share/scan-view"
+	depends="clang-${version}_${revision} python3"
+	short_desc+=" - A source code analysis framework"
+	homepage="https://clang-analyzer.llvm.org/"
+	pkg_install() {
+		vmove usr/share/man/man1/scan-build.1
+		vmove "/usr/bin/scan-*"
+		vmove "/usr/share/scan-*"
+		vmove "/usr/libexec/*analyzer"
+	}
+}
+
+clang-tools-extra_package() {
+	depends="clang-${version}_${revision} python3"
+	short_desc+=" - Extra Clang tools"
+	homepage="https://clang.llvm.org/extra/"
+	pkg_install() {
+		vmove usr/bin/clang-apply-replacements
+		vmove usr/bin/clang-query
+		vmove usr/bin/clang-rename
+		vmove usr/bin/clang-tidy
+		vmove usr/bin/modularize
+		vmove "usr/lib/libclangApplyReplacements*"
+		vmove "usr/lib/libclangQuery*"
+		vmove "usr/lib/libclangTidy*"
+		vmove "usr/share/clang/*tidy*"
+	}
+}
+
+clang_package() {
+	lib32disabled=yes
+	depends="libstdc++-devel libgcc-devel binutils"
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl) depends+=" musl-devel";;
+		*) depends+=" glibc-devel";;
+	esac
+	short_desc+=" - C language family frontend"
+	alternatives="cc:cc:/usr/bin/clang"
+	homepage="https://clang.llvm.org/"
+	pkg_install() {
+		vmove usr/include/clang
+		vmove usr/include/clang-c
+		vmove "usr/bin/*clang*"
+		vmove usr/bin/c-index-test
+		vmove usr/lib/clang
+		vmove usr/lib/cmake/clang
+		vmove "usr/lib/libclang*"
+		vmove "usr/share/clang"
+	}
+}
+
+lld_package() {
+	lib32disabled=yes
+	short_desc+=" - linker"
+	homepage="https://lld.llvm.org"
+	pkg_install() {
+		vmove usr/bin/lld*
+		vmove usr/bin/wasm-ld
+		vmove usr/bin/ld.lld*
+	}
+}
+
+lld-devel_package() {
+	lib32disabled=yes
+	short_desc+=" - linker - development files"
+	homepage="https://lld.llvm.org"
+	pkg_install() {
+		vmove usr/include/lld
+		vmove "usr/lib/liblld*a"
+	}
+}
+
+lldb_package() {
+	lib32disabled=yes
+	depends+=" python3-six"
+	short_desc+=" - LLDB debugger"
+	homepage="https://lldb.llvm.org/"
+	pkg_install() {
+		vmove usr/bin/*lldb*
+		vmove usr/lib/liblldb*so.*
+		vman tools/lldb/docs/lldb.1
+		vmove /usr/lib/python*
+		# Depend on python3-six instead of conflicting
+		rm ${PKGDESTDIR}/usr/lib/python3*/site-packages/six.py
+	}
+}
+
+lldb-devel_package() {
+	depends="lldb>=${version}_${revision}"
+	short_desc+=" - LLDB debugger - development files"
+	pkg_install() {
+		vmove usr/include/lldb
+		vmove "usr/lib/liblldb*.so"
+	}
+}
+
+libllvm9_package() {
+	short_desc+=" - runtime library"
+	pkg_install() {
+		vmove "usr/lib/libLLVM-*.so*"
+	}
+}
diff --git a/srcpkgs/llvm9/update b/srcpkgs/llvm9/update
new file mode 100644
index 00000000000..3d09eaff373
--- /dev/null
+++ b/srcpkgs/llvm9/update
@@ -0,0 +1,2 @@
+site=https://releases.llvm.org/
+pattern="'\K[\d\.]*(?=')"
diff --git a/srcpkgs/logrotate/template b/srcpkgs/logrotate/template
index 6333fb2a3ae..d335e58547e 100644
--- a/srcpkgs/logrotate/template
+++ b/srcpkgs/logrotate/template
@@ -1,6 +1,6 @@
 # Template file for 'logrotate'
 pkgname=logrotate
-version=3.15.0
+version=3.15.1
 revision=1
 build_style=gnu-configure
 makedepends="acl-devel popt-devel"
@@ -10,7 +10,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/logrotate/logrotate"
 distfiles="${homepage}/releases/download/${version}/logrotate-${version}.tar.xz"
-checksum=313612c4776a305393454c874ef590d8acf84c9ffa648717731dfe902284ff8f
+checksum=491fec9e89f1372f02a0ab66579aa2e9d63cac5178dfa672c204c88e693a908b
+make_dirs="/etc/logrotate.d 0755 root root"
 
 post_install() {
 	vconf ${FILESDIR}/logrotate.conf
diff --git a/srcpkgs/lok/template b/srcpkgs/lok/template
index 9ceec331e63..bebc928ae57 100644
--- a/srcpkgs/lok/template
+++ b/srcpkgs/lok/template
@@ -4,7 +4,7 @@ version=6.2
 revision=1
 build_style=gnu-makefile
 short_desc="A Linux port of OpenBSD's awk"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="ISC"
 homepage="https://github.com/dimkr/lok"
 distfiles="https://github.com/dimkr/lok/archive/${version}.tar.gz"
diff --git a/srcpkgs/lollypop/template b/srcpkgs/lollypop/template
index 639fcc644d5..56ace773bf3 100644
--- a/srcpkgs/lollypop/template
+++ b/srcpkgs/lollypop/template
@@ -1,9 +1,9 @@
 # Template file for 'lollypop'
 pkgname=lollypop
-version=1.1.4.11
+version=1.1.4.16
 revision=1
 # Gitlab upload tag hash
-_uhash=1d87588d659e720e70d08e6e945fe317
+_uhash=6b4e4e7a2c17f0770c1e2b3354ae5a3a
 archs=noarch
 build_style=meson
 pycompile_module="lollypop"
@@ -16,4 +16,4 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Lollypop"
 distfiles="https://gitlab.gnome.org/World/${pkgname}/uploads/${_uhash}/${pkgname}-${version}.tar.xz"
-checksum=66ea9ec9749d17b953ee29276bb7a4dfbb452b8c519dcff5ad85b60668755d1e
+checksum=e3da74c32b2edebea29aced4bb00e2d62688298fa4872949b504edf8128b19eb
diff --git a/srcpkgs/lowdown/patches/stdint_h.patch b/srcpkgs/lowdown/patches/stdint_h.patch
index 1dd64684c3d..872830c1607 100644
--- a/srcpkgs/lowdown/patches/stdint_h.patch
+++ b/srcpkgs/lowdown/patches/stdint_h.patch
@@ -1,33 +1,3 @@
---- buffer.c.orig
-+++ buffer.c
-@@ -25,6 +25,7 @@
- 
- #include <assert.h>
- #include <stdarg.h>
-+#include <stdint.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
---- diff.c.orig
-+++ diff.c
-@@ -28,6 +28,7 @@
- #if HAVE_MD5
- # include <md5.h>
- #endif
-+#include <stdint.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
---- nroff_escape.c.orig
-+++ nroff_escape.c
-@@ -20,6 +20,7 @@
- # include <sys/queue.h>
- #endif
- 
-+#include <stdint.h>
- #include <stdio.h>
- 
- #include "lowdown.h"
 --- util.c.orig
 +++ util.c
 @@ -20,6 +20,7 @@
diff --git a/srcpkgs/lowdown/template b/srcpkgs/lowdown/template
index e4716c3f1b5..c2347a47fa4 100644
--- a/srcpkgs/lowdown/template
+++ b/srcpkgs/lowdown/template
@@ -1,6 +1,6 @@
 # Template file for 'lowdown'
 pkgname=lowdown
-version=0.4.4
+version=0.4.5
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -9,7 +9,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="ISC"
 homepage="https://kristaps.bsd.lv/lowdown/"
 distfiles="https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz"
-checksum=bd3acdef18ba68151dbbbe1eb68dd04f0368739fa306e4b888359f00c413ac44
+checksum=469f788d22a59370dd4d9d97ac03e61cb01aab735fc85ad67aa5e563a96e3f91
 
 post_install() {
 	vlicense LICENSE.md
diff --git a/srcpkgs/lprng/files/lprng/run b/srcpkgs/lprng/files/lprng/run
new file mode 100755
index 00000000000..1e8435ee9ff
--- /dev/null
+++ b/srcpkgs/lprng/files/lprng/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+exec 2>&1
+exec chpst -u :_lprng lpd -F
diff --git a/srcpkgs/lprng/template b/srcpkgs/lprng/template
new file mode 100644
index 00000000000..0be77d3cde6
--- /dev/null
+++ b/srcpkgs/lprng/template
@@ -0,0 +1,24 @@
+# Template file for 'lprng'
+pkgname=lprng
+version=3.8.C
+revision=1
+build_style=gnu-configure
+configure_args="--with-userid=_lprng --with-groupid=_lprng"
+short_desc="Enhanced Printer Spooler"
+maintainer="Andrew Benson <abenson+void@gmail.com>"
+license="GPL-2.0-only"
+homepage="http://lprng.sourceforge.net/"
+distfiles="${SOURCEFORGE_SITE}/lprng/lprng/lprng-${version}.tar.gz"
+checksum=694a1747a96385b89e93f43343bf35cee5c8c73353a83814106911c99f09de10
+system_accounts="_lprng"
+conflicts="cups>=0"
+conf_files="/etc/lpd/* /etc/printcap"
+
+export CLEAR=no
+
+post_install() {
+	mv ${DESTDIR}/etc/printcap{.sample,}
+	mv ${DESTDIR}/etc/lpd/lpd.conf{.sample,}
+	mv ${DESTDIR}/etc/lpd/lpd.perms{.sample,}
+	vsv lprng
+}
diff --git a/srcpkgs/lsd/template b/srcpkgs/lsd/template
new file mode 100644
index 00000000000..c977494442b
--- /dev/null
+++ b/srcpkgs/lsd/template
@@ -0,0 +1,12 @@
+# Template file for 'lsd'
+pkgname=lsd
+version=0.16.0
+revision=1
+build_style=cargo
+short_desc="Next gen ls command with lots of pretty colors and awesome icons"
+maintainer="Lugubris <lugubris@disroot.org>"
+license="Apache-2.0"
+homepage="https://github.com/Peltoche/lsd"
+changelog="https://raw.githubusercontent.com/Peltoche/${pkgname}/${version}/CHANGELOG.md"
+distfiles="https://github.com/Peltoche/${pkgname}/archive/${version}.tar.gz"
+checksum=e2406748d78431a1c03bdd2404a204a006c19905d926e41a36587b93a791e003
diff --git a/srcpkgs/lsyncd/files/lsyncd/log/run b/srcpkgs/lsyncd/files/lsyncd/log/run
new file mode 100755
index 00000000000..114c954f1d9
--- /dev/null
+++ b/srcpkgs/lsyncd/files/lsyncd/log/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec logger -t lsyncd -p 'daemon.info'
diff --git a/srcpkgs/lsyncd/files/lsyncd/run b/srcpkgs/lsyncd/files/lsyncd/run
index 1fdafa74033..c6baeb891c2 100644
--- a/srcpkgs/lsyncd/files/lsyncd/run
+++ b/srcpkgs/lsyncd/files/lsyncd/run
@@ -1,4 +1,3 @@
 #!/bin/sh
 [ -r ./conf ] && . ./conf
-exec 1>&2
-exec lsyncd "${CONF_FILE:-'/etc/lsyncd/lsyncd.conf.lua'}"
+exec lsyncd -nodaemon "${CONF_FILE:-/etc/lsyncd/lsyncd.conf.lua}"
diff --git a/srcpkgs/lsyncd/template b/srcpkgs/lsyncd/template
index a906c4e4b24..a6923503734 100644
--- a/srcpkgs/lsyncd/template
+++ b/srcpkgs/lsyncd/template
@@ -1,14 +1,14 @@
 # Template file for 'lsyncd'
 pkgname=lsyncd
 version=2.2.3
-revision=1
+revision=2
 wrksrc="${pkgname}-release-${version}"
 build_style=cmake
 hostmakedepends="asciidoc lua"
 makedepends="lua-devel"
 depends="rsync"
 short_desc="Syncing Daemon that synchronizes local directories with remote targets"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/axkibe/lsyncd"
 distfiles="https://github.com/axkibe/lsyncd/archive/release-${version}.tar.gz"
diff --git a/srcpkgs/lttng-modules-dkms/template b/srcpkgs/lttng-modules-dkms/template
index a41e8c9af5a..36256bebb80 100644
--- a/srcpkgs/lttng-modules-dkms/template
+++ b/srcpkgs/lttng-modules-dkms/template
@@ -1,7 +1,7 @@
 # Template file for 'lttng-modules-dkms'
 pkgname=lttng-modules-dkms
-version=2.10.9
-revision=2
+version=2.10.11
+revision=1
 wrksrc="lttng-modules-${version}"
 depends="dkms"
 short_desc="LTTng modules provide Linux kernel tracing capability"
@@ -9,7 +9,7 @@ maintainer="Alexander Egorenkov <egorenar-dev@posteo.net>"
 license="LGPL-2.1-only, GPL-2.0-only, MIT"
 homepage="https://lttng.org"
 distfiles="${homepage}/files/lttng-modules/lttng-modules-${version}.tar.bz2"
-checksum=a1855bbd02d0f71ebd180e9872309862036624f012442ab9cc5852eb60340145
+checksum=7f91e39b2e8e46d8bbba2b4c8c1614f1fb380611cd1a1fccc1d1859be26112f1
 
 dkms_modules="lttng-modules ${version}"
 
diff --git a/srcpkgs/lttng-tools/template b/srcpkgs/lttng-tools/template
index 3c43dcb68fe..8aa64f9a51f 100644
--- a/srcpkgs/lttng-tools/template
+++ b/srcpkgs/lttng-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'lttng-tools'
 pkgname=lttng-tools
-version=2.10.6
+version=2.10.8
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ maintainer="Alexander Egorenkov <egorenar-dev@posteo.net>"
 license="LGPL-2.1-only, GPL-2.0-only"
 homepage="https://lttng.org"
 distfiles="${homepage}/files/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=f05df52bbebf8ce88d1b29e9e98cfc957d2ed738a345118018237ebdb581537c
+checksum=664a1145f9fd7a574da18aa3dfbbe97983985a471ca2992d6b272f1cebe6b30d
 system_groups="tracing"
 
 lttng-tools-devel_package() {
diff --git a/srcpkgs/lttng-ust/template b/srcpkgs/lttng-ust/template
index d33c1863950..87c4ef5592e 100644
--- a/srcpkgs/lttng-ust/template
+++ b/srcpkgs/lttng-ust/template
@@ -1,6 +1,6 @@
 # Template file for 'lttng-ust'
 pkgname=lttng-ust
-version=2.10.3
+version=2.10.5
 revision=1
 build_style=gnu-configure
 makedepends="liburcu-devel"
@@ -10,7 +10,7 @@ license="LGPL-2.1-only"
 homepage="http://lttng.org"
 changelog="https://github.com/lttng/lttng-ust/raw/master/ChangeLog"
 distfiles="${homepage}/files/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=9e8420f90d5f963f7aa32bc6d44adc1e491136f687c69ffb7a3075d33b40852b
+checksum=06f9ed9b2198855b1c7fcbf15fe57297ee259409ffa1b3bad87321412d98bc35
 
 lttng-ust-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} liburcu-devel"
diff --git a/srcpkgs/luaposix/template b/srcpkgs/luaposix/template
index a94293160e6..0fbd9385409 100644
--- a/srcpkgs/luaposix/template
+++ b/srcpkgs/luaposix/template
@@ -1,18 +1,18 @@
 # Template file for 'luaposix'
 pkgname=luaposix
-version=34.0.4
-revision=2
-lib32disabled=yes
+version=34.1.1
+revision=1
 wrksrc="luaposix-release-v${version}"
 hostmakedepends="lua51-devel lua52-devel lua-devel"
 makedepends="lua51-devel lua52-devel lua-devel"
 depends="lua lua-stdlib-normalize"
-short_desc="A POSIX library for Lua programming language"
+short_desc="POSIX library for Lua programming language"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://luaforge.net/projects/luaposix/"
 distfiles="https://github.com/luaposix/luaposix/archive/release-v${version}.tar.gz"
-checksum=d0110e465fdaeedd6662e9fdd40ae88131f7380bd7e1335adac70c24bb70f718
+checksum=273df2dbd9581a2f22e4265f14d0d759c487c0c9830f94395d7d690474382810
+lib32disabled=yes
 
 post_extract() {
 	cd "${wrksrc}"
diff --git a/srcpkgs/luasec/template b/srcpkgs/luasec/template
index d8abffee3b7..be68fc3d8ee 100644
--- a/srcpkgs/luasec/template
+++ b/srcpkgs/luasec/template
@@ -1,6 +1,6 @@
 # Template file for 'luasec'
 pkgname=luasec
-version=0.7.1
+version=0.8.1
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-makefile
@@ -12,7 +12,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/brunoos/luasec"
 distfiles="https://github.com/brunoos/luasec/archive/${pkgname}-${version}.tar.gz"
-checksum=3dfc7ef3c20e3d57b1ff3aaee93e73e828cfb58cc92ad261c5fd08d08fedf7d1
+checksum=cc9fc92df3be56add5c9687319951f457c31f5d12ac19cfc09d53056dc24f04e
 
 do_build() {
 	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
diff --git a/srcpkgs/lutris/template b/srcpkgs/lutris/template
index 5da50a720e8..8f54d693a12 100644
--- a/srcpkgs/lutris/template
+++ b/srcpkgs/lutris/template
@@ -1,6 +1,6 @@
 # Template file for 'lutris'
 pkgname=lutris
-version=0.5.2.2
+version=0.5.3
 revision=1
 archs=noarch
 build_style=python3-module
@@ -15,4 +15,4 @@ license="GPL-3.0-or-later"
 homepage="https://lutris.net"
 changelog="https://raw.githubusercontent.com/lutris/lutris/master/debian/changelog"
 distfiles="https://github.com/lutris/lutris/archive/v${version}.tar.gz"
-checksum=09ed6bbc501610c4bdc3653b8b9f9bfde1ae797dae29e69a2f4a4b75da337376
+checksum=673d2cfae1f427ad87df0bd69decc1aab07f3cd22476f4b74501d88398b58687
diff --git a/srcpkgs/lxqt-themes/template b/srcpkgs/lxqt-themes/template
index f7d85335c85..e93fd5d86fa 100644
--- a/srcpkgs/lxqt-themes/template
+++ b/srcpkgs/lxqt-themes/template
@@ -6,7 +6,7 @@ build_style=cmake
 hostmakedepends="lxqt-build-tools"
 depends="hicolor-icon-theme"
 short_desc="Themes, graphics and icons for LXQt"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://lxqt.org/"
 distfiles="https://github.com/lxqt/lxqt-themes/releases/download/${version}/lxqt-themes-${version}.tar.xz"
diff --git a/srcpkgs/lyx/template b/srcpkgs/lyx/template
index 2bf4b88ef75..dfc3e0d3ff2 100644
--- a/srcpkgs/lyx/template
+++ b/srcpkgs/lyx/template
@@ -1,15 +1,15 @@
 # Template file for 'lyx'
 pkgname=lyx
-version=2.3.1
+version=2.3.3
 revision=1
 build_style=gnu-configure
 configure_args="--enable-qt5 --without-included-mythes --without-included-boost"
 hostmakedepends="pkg-config bc python qt5-devel"
 makedepends="file-devel boost-devel mythes-devel enchant-devel qt5-svg-devel"
 depends="virtual?texlive GraphicsMagick python"
-short_desc="The Document Processor WYSIWYM Editor & Latex frontend"
+short_desc="Document Processor WYSIWYM Editor & Latex frontend"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.lyx.org/Home"
-distfiles="ftp://ftp.lyx.org/pub/${pkgname}/stable/2.3.x/${pkgname}-${version}-2.tar.xz"
-checksum=f5c9450ba196ed9d49fbc573f65b10d1726d16a62453466957aba2a9f6d66f84
+distfiles="ftp://ftp.lyx.org/pub/${pkgname}/stable/2.3.x/${pkgname}-${version}.tar.xz"
+checksum=991eefebddb281d276a7693f8ac119bd971aab3fa9f554cd14e4b68b04284e39
diff --git a/srcpkgs/lz4/template b/srcpkgs/lz4/template
index 4507dca85be..8fb806e8ad7 100644
--- a/srcpkgs/lz4/template
+++ b/srcpkgs/lz4/template
@@ -1,7 +1,7 @@
 # Template file for 'lz4'
 pkgname=lz4
 reverts="131_1 130_1 129_1 128_1 127_1 126_1 125_1 124_1 123_1 122_1"
-version=1.9.1
+version=1.9.2
 revision=1
 bootstrap=yes
 build_style=gnu-makefile
@@ -12,7 +12,7 @@ license="BSD-2-Clause, GPL-2.0-or-later"
 homepage="https://lz4.github.io/lz4"
 changelog="https://raw.githubusercontent.com/lz4/lz4/master/NEWS"
 distfiles="https://github.com/lz4/lz4/archive/v${version}.tar.gz"
-checksum=f8377c89dad5c9f266edc0be9b73595296ecafd5bfa1000de148096c50052dc4
+checksum=658ba6191fa44c92280d4aa2c271b0f4fbc0e34d249578dd05e50e76d0e5efcc
 
 post_install() {
 	vlicense lib/LICENSE
diff --git a/srcpkgs/magic-wormhole/template b/srcpkgs/magic-wormhole/template
new file mode 100644
index 00000000000..c07753ce6ad
--- /dev/null
+++ b/srcpkgs/magic-wormhole/template
@@ -0,0 +1,21 @@
+# Template file for 'magic-wormhole'
+pkgname=magic-wormhole
+version=0.11.2
+revision=1
+archs=noarch
+build_style=python3-module
+pycompile_module="wormhole"
+hostmakedepends="python3 python3-setuptools"
+depends="python3-autobahn python3-cffi python3-click python3-humanize
+ python3-idna python3-pynacl python3-service_identity python3-spake2
+ python3-tqdm python3-txtorcon"
+short_desc="Get things from one computer to another, safely"
+maintainer="travankor <travankor@tuta.io>"
+license="MIT"
+homepage="https://magic-wormhole.readthedocs.io/en/latest/"
+distfiles="https://github.com/warner/magic-wormhole/archive/${version}.tar.gz"
+checksum=55fd24b8c148d0f2c12160040dd061a5749bcda269adf97de6a697c9416c1052
+
+post-install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/mailcommon/template b/srcpkgs/mailcommon/template
index 836eac6d7a4..0dc9885d5d4 100644
--- a/srcpkgs/mailcommon/template
+++ b/srcpkgs/mailcommon/template
@@ -1,18 +1,18 @@
 # Template file for 'mailcommon'
 pkgname=mailcommon
-version=19.08.0
-revision=1
+version=19.08.2
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig libxslt qt5-qmake
  qt5-host-tools python kgendesignerplugin"
 makedepends="mailimporter-devel messagelib-devel kdesignerplugin-devel
- pimcommon-devel libkleo-devel qt5-multimedia-devel"
+ pimcommon-devel libkleo-devel qt5-multimedia-devel kcontacts-devel"
 short_desc="KDE PIM library providing support for mail applications"
 maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/applications/${version}/src/mailcommon-${version}.tar.xz"
-checksum=6c69b70356d9d96578c3fd472aaa36e33feb0677d7e65c36981c0596daf3aea3
+checksum=39df1544c0278600d5a1a57697835828358ae44203087e29430ce1bd0c355e20
 
 mailcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"
diff --git a/srcpkgs/mailimporter/template b/srcpkgs/mailimporter/template
index 06b6aa85c39..f7b6d25f8b0 100644
--- a/srcpkgs/mailimporter/template
+++ b/srcpkgs/mailimporter/template
@@ -1,6 +1,6 @@
 # Template file for 'mailimporter'
 pkgname=mailimporter
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python"
@@ -10,7 +10,7 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/applications/${version}/src/mailimporter-${version}.tar.xz"
-checksum=242f1a93b3521abc68ca8e1abfc75acd0b59e1e2d553df80a057645102246dd7
+checksum=27780c381919ebc9e6fc0de7021cd03277dd3962d4c4c15770fcf44cd6126814
 
 mailimporter-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/maim/template b/srcpkgs/maim/template
index 65124692841..456a07c9c87 100644
--- a/srcpkgs/maim/template
+++ b/srcpkgs/maim/template
@@ -7,7 +7,7 @@ hostmakedepends="pkg-config"
 makedepends="MesaLib-devel glm icu-devel libXcomposite-devel libXrandr-devel
  libjpeg-turbo-devel libpng-devel slop-devel"
 short_desc="Desktop screenshot utility"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/naelstrof/maim"
 distfiles="https://github.com/naelstrof/maim/archive/v${version}.tar.gz"
diff --git a/srcpkgs/makedepend/template b/srcpkgs/makedepend/template
index 4ac390afeb0..eb22f9dddd6 100644
--- a/srcpkgs/makedepend/template
+++ b/srcpkgs/makedepend/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="xorgproto"
 short_desc="Dependency generator for makefiles"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://wiki.freedesktop.org/xorg/"
 distfiles="${XORG_SITE}/util/${pkgname}-${version}.tar.bz2"
diff --git a/srcpkgs/mame/template b/srcpkgs/mame/template
index 99dc801bc70..14e9374500c 100644
--- a/srcpkgs/mame/template
+++ b/srcpkgs/mame/template
@@ -1,6 +1,6 @@
 # Template file for 'mame'
 pkgname=mame
-version=0212
+version=0214
 revision=1
 wrksrc="mame-mame${version}"
 short_desc="Multiple Arcade Machine Emulator"
@@ -8,7 +8,7 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"
 homepage="http://mamedev.org"
 distfiles="https://github.com/mamedev/mame/archive/mame${version}.tar.gz"
-checksum=3d3599c49626b240e98b1433c0813e11e471846154e8d29261d345cc78fc9a21
+checksum=8ae24e3b1de33df33957c5f642bd98828842305bcb31da130b759ba7e88b36d2
 
 hostmakedepends="perl pkg-config python"
 makedepends="SDL2_ttf-devel glm libgomp-devel libjpeg-turbo-devel
diff --git a/srcpkgs/man-db/template b/srcpkgs/man-db/template
index a3cf6934df3..b6cf1489eca 100644
--- a/srcpkgs/man-db/template
+++ b/srcpkgs/man-db/template
@@ -1,24 +1,25 @@
 # Template file for 'man-db'
 pkgname=man-db
-version=2.8.6.1
-revision=1
+version=2.8.7
+revision=2
 build_style=gnu-configure
 configure_args="--with-db=db --with-pager=less --with-gzip=/usr/bin/gzip
  --with-bzip2=/usr/bin/bzip2 --disable-rpath --enable-threads=posix
  --with-lzma=/usr/bin/lzma --with-xz=/usr/bin/xz --disable-setuid
- --without-included-regex --enable-automatic-create
- --with-systemdsystemunitdir=no"
+ --without-included-regex --enable-automatic-create --with-libseccomp
+ --without-systemdsystemunitdir --without-systemdtmpfilesdir"
 hostmakedepends="groff pkg-config"
-makedepends="db-devel gettext-devel groff libpipeline-devel zlib-devel"
+makedepends="db-devel gettext-devel groff libpipeline-devel libseccomp-devel
+ zlib-devel"
 depends="bzip2 coreutils grep groff gzip less"
 conf_files="/etc/man_db.conf"
-provides="man-0_1"
-short_desc="The on-line manual database"
+short_desc="On-line manual database"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
-homepage="http://www.nongnu.org/man-db/"
+homepage="https://www.nongnu.org/man-db/"
 distfiles="${NONGNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=2c77a2bb9dbf06f72417a6f63063e204888a22a5020ff77334d304d55f813a28
+checksum=b9cd5bb996305d08bfe9e1114edc30b4c97be807093b88af8033ed1cf9beb326
+provides="man-0_1"
 lib32disabled=yes
 
 alternatives="
@@ -37,7 +38,6 @@ pre_configure() {
 }
 
 post_install() {
-	rm -r ${DESTDIR}/usr/lib/tmpfiles.d
 	# Rename files for alternatives
 	for f in apropos man whatis; do
 		mv ${DESTDIR}/usr/bin/{$f,mandb-$f}
diff --git a/srcpkgs/man-pages/template b/srcpkgs/man-pages/template
index edb73fc0370..8bee1534bef 100644
--- a/srcpkgs/man-pages/template
+++ b/srcpkgs/man-pages/template
@@ -1,6 +1,6 @@
 # Template file for 'man-pages'
 pkgname=man-pages
-version=5.02
+version=5.03
 revision=1
 archs=noarch
 short_desc="Linux Documentation Project (LDP) manual pages"
@@ -8,7 +8,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://man7.org/linux/man-pages/index.html"
 distfiles="${KERNEL_SITE}/docs/man-pages/${pkgname}-${version}.tar.xz"
-checksum=c2faa85e625cd7567dc1dec9f23d1af1f73e2ca6468bce1bdc13387ec56f97e8
+checksum=7fe13aeaf9081f4c134c711270a66e264dce24dae3df7e9fec3dd18c8a485120
 
 do_install() {
 	make all prefix=${DESTDIR}/usr
diff --git a/srcpkgs/manuskript/template b/srcpkgs/manuskript/template
index 026cdeb7ff9..4808856f2ad 100644
--- a/srcpkgs/manuskript/template
+++ b/srcpkgs/manuskript/template
@@ -1,6 +1,6 @@
 # Template file for 'manuskript'
 pkgname=manuskript
-version=0.9.0
+version=0.10.0
 revision=1
 archs=noarch
 pycompile_dirs="usr/share/${pkgname}"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="http://www.theologeek.ch/manuskript"
 distfiles="https://github.com/olivierkes/manuskript/archive/${version}.tar.gz"
-checksum=0143628462911683c744bccbb785279efcab87b4566ecccb1b5a401f68f747d1
+checksum=d60745b85e788b75f41d3d91cbe02cf90e34dbf9807aa7bed85c91e19215d821
 pycompile_version="$py3_ver"
 
 do_install() {
diff --git a/srcpkgs/marble5/template b/srcpkgs/marble5/template
index 9df06aaae45..fc901481689 100644
--- a/srcpkgs/marble5/template
+++ b/srcpkgs/marble5/template
@@ -1,6 +1,6 @@
 # Template file for 'marble5'
 pkgname=marble5
-version=19.08.0
+version=19.08.2
 revision=1
 wrksrc="marble-${version}"
 build_style=cmake
@@ -14,7 +14,11 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://marble.kde.org"
 distfiles="${KDE_SITE}/applications/${version}/src/marble-${version}.tar.xz"
-checksum=c1c951a1357c94a61b38f0ae8a1235d194150cd351dbf25d2db3508b22b44cc1
+checksum=4add63522a51fdea7b425f29bd3d35c558a0b881336ff6a90bfc07483acbf6a6
+
+pre_configure() {
+	vsed -i CMakeLists.txt -e 's/-Wcast-align//'
+}
 
 marble5-devel_package() {
 	short_desc+=" - development files"
@@ -24,5 +28,6 @@ marble5-devel_package() {
 		vmove usr/include
 		vmove "usr/lib/*.so"
 		vmove usr/lib/cmake
+		vmove usr/lib/qt5/mkspecs
 	}
 }
diff --git a/srcpkgs/marco/template b/srcpkgs/marco/template
index 57b45366c5a..55fe6a80905 100644
--- a/srcpkgs/marco/template
+++ b/srcpkgs/marco/template
@@ -1,19 +1,19 @@
 # Template file for 'marco'
 pkgname=marco
-version=1.22.1
+version=1.22.3
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --enable-startup-notification --disable-schemas-compile"
 hostmakedepends="gdk-pixbuf-devel mate-common zenity"
 makedepends="libXt-devel libcanberra-devel libgtop-devel
- libnotify-devel mate-desktop-devel"
+ libnotify-devel mate-desktop-devel libXpresent-devel"
 depends="zenity"
-short_desc="window manager for MATE"
+short_desc="Window manager for MATE"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://mate-desktop.org"
 distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4e20f5ea006142f3e5c8931e2b354e1838cb9291ba245825ea82fa6611def7c8
+checksum=0a3979f0ba9855a6dff5b889c619d07bcea52df29c354976f018d71093c45139
 
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh
diff --git a/srcpkgs/mariadb/patches/force-c11-atomics.patch b/srcpkgs/mariadb/patches/force-c11-atomics.patch
new file mode 100644
index 00000000000..9546798bf97
--- /dev/null
+++ b/srcpkgs/mariadb/patches/force-c11-atomics.patch
@@ -0,0 +1,294 @@
+--- include/my_atomic.h
++++ include/my_atomic.h
+@@ -104,217 +104,6 @@
+   but can be added, if necessary.
+ */
+ 
+-#define intptr         void *
+-/**
+-  Currently we don't support 8-bit and 16-bit operations.
+-  It can be added later if needed.
+-*/
+-#undef MY_ATOMIC_HAS_8_16
+-
+-/*
+- * Attempt to do atomic ops without locks
+- */
+-#include "atomic/nolock.h"
+-
+-#ifndef make_atomic_cas_body
+-/* nolock.h was not able to generate even a CAS function, fall back */
+-#error atomic ops for this platform are not implemented
+-#endif
+-
+-/* define missing functions by using the already generated ones */
+-#ifndef make_atomic_add_body
+-#define make_atomic_add_body(S)                                 \
+-  int ## S tmp=*a;                                              \
+-  while (!my_atomic_cas ## S(a, &tmp, tmp+v)) ;                 \
+-  v=tmp;
+-#endif
+-#ifndef make_atomic_fas_body
+-#define make_atomic_fas_body(S)                                 \
+-  int ## S tmp=*a;                                              \
+-  while (!my_atomic_cas ## S(a, &tmp, v)) ;                     \
+-  v=tmp;
+-#endif
+-#ifndef make_atomic_load_body
+-#define make_atomic_load_body(S)                                \
+-  ret= 0; /* avoid compiler warning */                          \
+-  (void)(my_atomic_cas ## S(a, &ret, ret));
+-#endif
+-#ifndef make_atomic_store_body
+-#define make_atomic_store_body(S)                               \
+-  (void)(my_atomic_fas ## S (a, v));
+-#endif
+-
+-/*
+-  transparent_union doesn't work in g++
+-  Bug ?
+-
+-  Darwin's gcc doesn't want to put pointers in a transparent_union
+-  when built with -arch ppc64. Complains:
+-  warning: 'transparent_union' attribute ignored
+-*/
+-#if defined(__GNUC__) && !defined(__cplusplus) && \
+-      ! (defined(__APPLE__) && (defined(_ARCH_PPC64) ||defined (_ARCH_PPC)))
+-/*
+-  we want to be able to use my_atomic_xxx functions with
+-  both signed and unsigned integers. But gcc will issue a warning
+-  "passing arg N of `my_atomic_XXX' as [un]signed due to prototype"
+-  if the signedness of the argument doesn't match the prototype, or
+-  "pointer targets in passing argument N of my_atomic_XXX differ in signedness"
+-  if int* is used where uint* is expected (or vice versa).
+-  Let's shut these warnings up
+-*/
+-#define make_transparent_unions(S)                              \
+-        typedef union {                                         \
+-          int  ## S  i;                                         \
+-          uint ## S  u;                                         \
+-        } U_ ## S   __attribute__ ((transparent_union));        \
+-        typedef union {                                         \
+-          int  ## S volatile *i;                                \
+-          uint ## S volatile *u;                                \
+-        } Uv_ ## S   __attribute__ ((transparent_union));
+-#define uintptr intptr
+-make_transparent_unions(8)
+-make_transparent_unions(16)
+-make_transparent_unions(32)
+-make_transparent_unions(64)
+-make_transparent_unions(ptr)
+-#undef uintptr
+-#undef make_transparent_unions
+-#define a       U_a.i
+-#define cmp     U_cmp.i
+-#define v       U_v.i
+-#define set     U_set.i
+-#else
+-#define U_8    int8
+-#define U_16   int16
+-#define U_32   int32
+-#define U_64   int64
+-#define U_ptr  intptr
+-#define Uv_8   int8
+-#define Uv_16  int16
+-#define Uv_32  int32
+-#define Uv_64  int64
+-#define Uv_ptr intptr
+-#define U_a    volatile *a
+-#define U_cmp  *cmp
+-#define U_v    v
+-#define U_set  set
+-#endif /* __GCC__ transparent_union magic */
+-
+-#define make_atomic_cas(S)                                      \
+-static inline int my_atomic_cas ## S(Uv_ ## S U_a,              \
+-                            Uv_ ## S U_cmp, U_ ## S U_set)      \
+-{                                                               \
+-  int8 ret;                                                     \
+-  make_atomic_cas_body(S);                                      \
+-  return ret;                                                   \
+-}
+-
+-#define make_atomic_add(S)                                      \
+-static inline int ## S my_atomic_add ## S(                      \
+-                        Uv_ ## S U_a, U_ ## S U_v)              \
+-{                                                               \
+-  make_atomic_add_body(S);                                      \
+-  return v;                                                     \
+-}
+-
+-#define make_atomic_fas(S)                                      \
+-static inline int ## S my_atomic_fas ## S(                      \
+-                         Uv_ ## S U_a, U_ ## S U_v)             \
+-{                                                               \
+-  make_atomic_fas_body(S);                                      \
+-  return v;                                                     \
+-}
+-
+-#define make_atomic_load(S)                                     \
+-static inline int ## S my_atomic_load ## S(Uv_ ## S U_a)        \
+-{                                                               \
+-  int ## S ret;                                                 \
+-  make_atomic_load_body(S);                                     \
+-  return ret;                                                   \
+-}
+-
+-#define make_atomic_store(S)                                    \
+-static inline void my_atomic_store ## S(                        \
+-                     Uv_ ## S U_a, U_ ## S U_v)                 \
+-{                                                               \
+-  make_atomic_store_body(S);                                    \
+-}
+-
+-#ifdef MY_ATOMIC_HAS_8_16
+-make_atomic_cas(8)
+-make_atomic_cas(16)
+-#endif
+-make_atomic_cas(32)
+-make_atomic_cas(64)
+-make_atomic_cas(ptr)
+-
+-#ifdef MY_ATOMIC_HAS_8_16
+-make_atomic_add(8)
+-make_atomic_add(16)
+-#endif
+-make_atomic_add(32)
+-make_atomic_add(64)
+-
+-#ifdef MY_ATOMIC_HAS_8_16
+-make_atomic_load(8)
+-make_atomic_load(16)
+-#endif
+-make_atomic_load(32)
+-make_atomic_load(64)
+-make_atomic_load(ptr)
+-
+-#ifdef MY_ATOMIC_HAS_8_16
+-make_atomic_fas(8)
+-make_atomic_fas(16)
+-#endif
+-make_atomic_fas(32)
+-make_atomic_fas(64)
+-make_atomic_fas(ptr)
+-
+-#ifdef MY_ATOMIC_HAS_8_16
+-make_atomic_store(8)
+-make_atomic_store(16)
+-#endif
+-make_atomic_store(32)
+-make_atomic_store(64)
+-make_atomic_store(ptr)
+-
+-#ifdef _atomic_h_cleanup_
+-#include _atomic_h_cleanup_
+-#undef _atomic_h_cleanup_
+-#endif
+-
+-#undef U_8
+-#undef U_16
+-#undef U_32
+-#undef U_64
+-#undef U_ptr
+-#undef Uv_8
+-#undef Uv_16
+-#undef Uv_32
+-#undef Uv_64
+-#undef Uv_ptr
+-#undef a
+-#undef cmp
+-#undef v
+-#undef set
+-#undef U_a
+-#undef U_cmp
+-#undef U_v
+-#undef U_set
+-#undef make_atomic_add
+-#undef make_atomic_cas
+-#undef make_atomic_load
+-#undef make_atomic_store
+-#undef make_atomic_fas
+-#undef make_atomic_add_body
+-#undef make_atomic_cas_body
+-#undef make_atomic_load_body
+-#undef make_atomic_store_body
+-#undef make_atomic_fas_body
+-#undef intptr
+-
+ /*
+   the macro below defines (as an expression) the code that
+   will be run in spin-loops. Intel manuals recummend to have PAUSE there.
+@@ -328,7 +117,8 @@ make_atomic_store(ptr)
+ #define MY_ATOMIC_NOT_1CPU 1
+ extern int my_atomic_initialize();
+ 
+-#ifdef __ATOMIC_SEQ_CST
++#define MY_ATOMIC_MODE "gcc-atomics-smp"
++
+ #define MY_MEMORY_ORDER_RELAXED __ATOMIC_RELAXED
+ #define MY_MEMORY_ORDER_CONSUME __ATOMIC_CONSUME
+ #define MY_MEMORY_ORDER_ACQUIRE __ATOMIC_ACQUIRE
+@@ -364,43 +154,27 @@ extern int my_atomic_initialize();
+   __atomic_compare_exchange_n((P), (E), (D), false, (S), (F))
+ #define my_atomic_casptr_strong_explicit(P, E, D, S, F) \
+   __atomic_compare_exchange_n((P), (E), (D), false, (S), (F))
+-#else
+-#define MY_MEMORY_ORDER_RELAXED
+-#define MY_MEMORY_ORDER_CONSUME
+-#define MY_MEMORY_ORDER_ACQUIRE
+-#define MY_MEMORY_ORDER_RELEASE
+-#define MY_MEMORY_ORDER_ACQ_REL
+-#define MY_MEMORY_ORDER_SEQ_CST
+-
+-#define my_atomic_store32_explicit(P, D, O) my_atomic_store32((P), (D))
+-#define my_atomic_store64_explicit(P, D, O) my_atomic_store64((P), (D))
+-#define my_atomic_storeptr_explicit(P, D, O) my_atomic_storeptr((P), (D))
+-
+-#define my_atomic_load32_explicit(P, O) my_atomic_load32((P))
+-#define my_atomic_load64_explicit(P, O) my_atomic_load64((P))
+-#define my_atomic_loadptr_explicit(P, O) my_atomic_loadptr((P))
+-
+-#define my_atomic_fas32_explicit(P, D, O) my_atomic_fas32((P), (D))
+-#define my_atomic_fas64_explicit(P, D, O) my_atomic_fas64((P), (D))
+-#define my_atomic_fasptr_explicit(P, D, O) my_atomic_fasptr((P), (D))
+-
+-#define my_atomic_add32_explicit(P, A, O) my_atomic_add32((P), (A))
+-#define my_atomic_add64_explicit(P, A, O) my_atomic_add64((P), (A))
+-#define my_atomic_addptr_explicit(P, A, O) my_atomic_addptr((P), (A))
+ 
+-#define my_atomic_cas32_weak_explicit(P, E, D, S, F) \
+-  my_atomic_cas32((P), (E), (D))
+-#define my_atomic_cas64_weak_explicit(P, E, D, S, F) \
+-  my_atomic_cas64((P), (E), (D))
+-#define my_atomic_casptr_weak_explicit(P, E, D, S, F) \
+-  my_atomic_casptr((P), (E), (D))
++#define my_atomic_store32(P, D) __atomic_store_n((P), (D), __ATOMIC_SEQ_CST)
++#define my_atomic_store64(P, D) __atomic_store_n((P), (D), __ATOMIC_SEQ_CST)
++#define my_atomic_storeptr(P, D) __atomic_store_n((P), (D), __ATOMIC_SEQ_CST)
+ 
+-#define my_atomic_cas32_strong_explicit(P, E, D, S, F) \
+-  my_atomic_cas32((P), (E), (D))
+-#define my_atomic_cas64_strong_explicit(P, E, D, S, F) \
+-  my_atomic_cas64((P), (E), (D))
+-#define my_atomic_casptr_strong_explicit(P, E, D, S, F) \
+-  my_atomic_casptr((P), (E), (D))
+-#endif
++#define my_atomic_load32(P) __atomic_load_n((P), __ATOMIC_SEQ_CST)
++#define my_atomic_load64(P) __atomic_load_n((P), __ATOMIC_SEQ_CST)
++#define my_atomic_loadptr(P) __atomic_load_n((P), __ATOMIC_SEQ_CST)
++
++#define my_atomic_fas32(P, D) __atomic_exchange_n((P), (D), __ATOMIC_SEQ_CST)
++#define my_atomic_fas64(P, D) __atomic_exchange_n((P), (D), __ATOMIC_SEQ_CST)
++#define my_atomic_fasptr(P, D) __atomic_exchange_n((P), (D), __ATOMIC_SEQ_CST)
++
++#define my_atomic_add32(P, A) __atomic_fetch_add((P), (A), __ATOMIC_SEQ_CST)
++#define my_atomic_add64(P, A) __atomic_fetch_add((P), (A), __ATOMIC_SEQ_CST)
++
++#define my_atomic_cas32(P, E, D) \
++  __atomic_compare_exchange_n((P), (E), (D), 0, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST)
++#define my_atomic_cas64(P, E, D) \
++  __atomic_compare_exchange_n((P), (E), (D), 0, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST)
++#define my_atomic_casptr(P, E, D) \
++  __atomic_compare_exchange_n((P), (E), (D), 0, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST)
+ 
+ #endif /* MY_ATOMIC_INCLUDED */
diff --git a/srcpkgs/mariadb/patches/libatomic.patch b/srcpkgs/mariadb/patches/libatomic.patch
new file mode 100644
index 00000000000..0e8e872d9c2
--- /dev/null
+++ b/srcpkgs/mariadb/patches/libatomic.patch
@@ -0,0 +1,103 @@
+Source: Debian, q66
+
+This ensures arches that need libatomic properly get it where necessary.
+It also removes the sync builtin checks that are not necessary when
+using C11 atomics (like we always are because we're on a modern gcc)
+that break build on e.g. ppc32 and mips.
+
+--- configure.cmake
++++ configure.cmake
+@@ -992,35 +992,19 @@ SET(SIGNAL_WITH_VIO_CLOSE 1)
+ 
+ MARK_AS_ADVANCED(NO_ALARM)
+ 
+-
+-IF(WITH_ATOMIC_OPS STREQUAL "up")
+-  SET(MY_ATOMIC_MODE_DUMMY 1 CACHE BOOL "Assume single-CPU mode, no concurrency")
+-ELSEIF(WITH_ATOMIC_OPS STREQUAL "smp")
+-ELSEIF(NOT WITH_ATOMIC_OPS)
+-  CHECK_CXX_SOURCE_COMPILES("
+-  int main()
+-  {
+-    int foo= -10; int bar= 10;
+-    long long int foo64= -10; long long int bar64= 10;
+-    if (!__sync_fetch_and_add(&foo, bar) || foo)
+-      return -1;
+-    bar= __sync_lock_test_and_set(&foo, bar);
+-    if (bar || foo != 10)
+-      return -1;
+-    bar= __sync_val_compare_and_swap(&bar, foo, 15);
+-    if (bar)
+-      return -1;
+-    if (!__sync_fetch_and_add(&foo64, bar64) || foo64)
+-      return -1;
+-    bar64= __sync_lock_test_and_set(&foo64, bar64);
+-    if (bar64 || foo64 != 10)
+-      return -1;
+-    bar64= __sync_val_compare_and_swap(&bar64, foo, 15);
+-    if (bar64)
+-      return -1;
+-    return 0;
+-  }"
+-  HAVE_GCC_ATOMIC_BUILTINS)
++CHECK_CXX_SOURCE_COMPILES("
++int main()
++{
++  long long int var= 1;
++  long long int *ptr= &var;
++  return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
++}"
++HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
++IF (HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
++  SET(HAVE_GCC_C11_ATOMICS True)
++ELSE()
++  SET(OLD_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
++  LIST(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
+   CHECK_CXX_SOURCE_COMPILES("
+   int main()
+   {
+@@ -1028,14 +1012,13 @@ ELSEIF(NOT WITH_ATOMIC_OPS)
+     long long int *ptr= &var;
+     return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
+   }"
+-  HAVE_GCC_C11_ATOMICS)
+-ELSE()
+-  MESSAGE(FATAL_ERROR "${WITH_ATOMIC_OPS} is not a valid value for WITH_ATOMIC_OPS!")
++  HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++  IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++    SET(HAVE_GCC_C11_ATOMICS True)
++  ENDIF()
++  SET(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQUIRED_LIBRARIES})
+ ENDIF()
+ 
+-SET(WITH_ATOMIC_OPS "${WITH_ATOMIC_OPS}" CACHE STRING "Implement atomic operations using atomic CPU instructions for multi-processor (smp) or uniprocessor (up) configuration. By default gcc built-in sync functions are used, if available and 'smp' configuration otherwise.")
+-MARK_AS_ADVANCED(WITH_ATOMIC_OPS MY_ATOMIC_MODE_DUMMY)
+-
+ IF(WITH_VALGRIND)
+   SET(HAVE_valgrind 1)
+ ENDIF()
+--- mysys/CMakeLists.txt
++++ mysys/CMakeLists.txt
+@@ -74,6 +74,10 @@ TARGET_LINK_LIBRARIES(mysys dbug strings mysys_ssl ${ZLIB_LIBRARY}
+  ${LIBNSL} ${LIBM} ${LIBRT} ${LIBDL} ${LIBSOCKET} ${LIBEXECINFO})
+ DTRACE_INSTRUMENT(mysys)
+ 
++IF (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++  TARGET_LINK_LIBRARIES(mysys atomic)
++ENDIF()
++
+ IF(HAVE_BFD_H)
+   TARGET_LINK_LIBRARIES(mysys bfd)  
+ ENDIF(HAVE_BFD_H)
+--- sql/CMakeLists.txt
++++ sql/CMakeLists.txt
+@@ -172,6 +172,9 @@ ELSE()
+   SET(MYSQLD_SOURCE main.cc ${DTRACE_PROBES_ALL})
+ ENDIF()
+ 
++IF (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++  TARGET_LINK_LIBRARIES(sql atomic)
++ENDIF()
+ 
+ IF(MSVC AND NOT WITHOUT_DYNAMIC_PLUGINS)
+ 
diff --git a/srcpkgs/mariadb/patches/musl-ppc.patch b/srcpkgs/mariadb/patches/musl-ppc.patch
new file mode 100644
index 00000000000..16cbac71a94
--- /dev/null
+++ b/srcpkgs/mariadb/patches/musl-ppc.patch
@@ -0,0 +1,27 @@
+This header does not exist on musl, but there has been a
+builtin for this in gcc for ages, so just use that instead.
+
+--- storage/innobase/include/ut0ut.h
++++ storage/innobase/include/ut0ut.h
+@@ -89,8 +89,7 @@ struct ut_when_dtor {
+    independent way by using YieldProcessor. */
+ #  define UT_RELAX_CPU() YieldProcessor()
+ # elif defined(__powerpc__)
+-#include <sys/platform/ppc.h>
+-#  define UT_RELAX_CPU() __ppc_get_timebase()
++#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
+ # else
+ #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
+ # endif
+--- storage/xtradb/include/ut0ut.h
++++ storage/xtradb/include/ut0ut.h
+@@ -86,8 +86,7 @@ struct ut_when_dtor {
+    independent way by using YieldProcessor. */
+ #  define UT_RELAX_CPU() YieldProcessor()
+ # elif defined(__powerpc__)
+-#include <sys/platform/ppc.h>
+-#  define UT_RELAX_CPU() __ppc_get_timebase()
++#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
+ # else
+ #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
+ # endif
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 848e5eacdd0..c0c44217b71 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,7 +1,7 @@
 # Template file for 'mariadb'
 pkgname=mariadb
 version=10.1.30
-revision=6
+revision=7
 build_style=cmake
 configure_args="-DMYSQL_DATADIR=/var/lib/mysql
  -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8
@@ -18,8 +18,9 @@ configure_args="-DMYSQL_DATADIR=/var/lib/mysql
  -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF -DSTACK_DIRECTION=1
  -DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_INNOBASE_STORAGE_ENGINE=1"
 lib32disabled=yes
-hostmakedepends="perl bison ncurses-devel libressl-devel"
-makedepends="zlib-devel ncurses-devel libressl-devel readline-devel pcre-devel"
+hostmakedepends="perl bison ncurses-devel libressl-devel libatomic-devel"
+makedepends="zlib-devel ncurses-devel libressl-devel readline-devel pcre-devel
+ libatomic-devel"
 depends="mariadb-client"
 provides="mysql-${version}_${revision}"
 replaces="mysql>=0"
@@ -34,19 +35,7 @@ distfiles="http://archive.mariadb.org/$pkgname-$version/source/$pkgname-$version
 checksum=173a5e5a24819e0a469c3bd09b5c98491676c37c6095882a2ea34c5af0996c88
 CFLAGS="-w"
 
-case "$XBPS_TARGET_MACHINE" in
-	armv[56]*|ppc|ppc-musl) LDFLAGS="-L${XBPS_CROSS_BASE}/usr/lib -latomic"
-		hostmakedepends+=" libatomic-devel"
-		makedepends+=" libatomic-devel"
-		;;
-esac
-
 pre_configure() {
-	case "$XBPS_TARGET_MACHINE" in
-		armv[56]*|ppc|ppc-musl) find -name CMakeLists.txt -exec sed -i "{}" \
-				-e "/TARGET_LINK_LIBRARIES/s;); atomic);" \;
-			;;
-	esac
 	# We need some host binaries before starting cross compilation.
 	if [ "$CROSS_BUILD" ]; then
 		# XXX still broken: jemalloc configure execs host bins.
diff --git a/srcpkgs/mate-control-center/template b/srcpkgs/mate-control-center/template
index c09a088114f..755ab2dcd86 100644
--- a/srcpkgs/mate-control-center/template
+++ b/srcpkgs/mate-control-center/template
@@ -1,7 +1,7 @@
 # Template file for 'mate-control-center'
 pkgname=mate-control-center
 version=1.22.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static --disable-schemas-compile --disable-update-mimedb"
 hostmakedepends="dbus-glib-devel desktop-file-utils glib-devel intltool itstool pkg-config"
diff --git a/srcpkgs/mate-menus/template b/srcpkgs/mate-menus/template
index 61f03dd746c..f83288d5129 100644
--- a/srcpkgs/mate-menus/template
+++ b/srcpkgs/mate-menus/template
@@ -1,26 +1,22 @@
 # Template file for 'mate-menus'
 pkgname=mate-menus
-version=1.22.0
+version=1.22.1
 revision=1
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--disable-static $(vopt_enable python)"
-hostmakedepends="pkg-config intltool itstool $(vopt_if gir gobject-introspection)
- $(vopt_if python python)"
-makedepends="libglib-devel $(vopt_if python python-devel)"
+configure_args="--disable-static"
+hostmakedepends="pkg-config intltool itstool
+ $(vopt_if gir gobject-introspection)"
+makedepends="libglib-devel"
 short_desc="MATE menu specifications"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://mate-desktop.org"
 distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=acec93a66154fdbd78404680fca5a99112085cb99d7c43022b010527dc9a6ad2
+checksum=800d26bdba7762660ec8513cf5bcc58ff173fa1ae96621b21d17e6e0ccf1064e
 
-build_options="gir python"
-build_options_default="gir python"
-
-pre_configure() {
-	export PYTHON=/usr/bin/python2
-}
+build_options="gir"
+build_options_default="gir"
 
 mate-menus-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/mate-panel/template b/srcpkgs/mate-panel/template
index a7837eeb673..fd5e59fbdc1 100644
--- a/srcpkgs/mate-panel/template
+++ b/srcpkgs/mate-panel/template
@@ -1,7 +1,7 @@
 # Template file for 'mate-panel'
 pkgname=mate-panel
-version=1.22.1
-revision=2
+version=1.22.2
+revision=1
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-static --disable-schemas-compile
@@ -17,7 +17,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://mate-desktop.org"
 distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aa36130b9ecf4f7527978cfc9a9593bbf521be144d91d7a87ee64aa7df6d695d
+checksum=fe2406c393a6eecef16658798ce5e801f3aad6190cc2a95646af33eea375a0ea
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/mate-screensaver/template b/srcpkgs/mate-screensaver/template
index 86e616a4a01..9d6c29a64c6 100644
--- a/srcpkgs/mate-screensaver/template
+++ b/srcpkgs/mate-screensaver/template
@@ -1,18 +1,20 @@
 # Template file for 'mate-screensaver'
 pkgname=mate-screensaver
-version=1.22.0
-revision=2
+version=1.22.1
+revision=1
 build_style=gnu-configure
+configure_args="--without-console-kit"
 hostmakedepends="pkg-config intltool itstool glib-devel"
 makedepends="dbus-glib-devel libnotify-devel libXScrnSaver-devel
- libmatekbd-devel mate-menus-devel mate-desktop-devel pam-devel"
+ libmatekbd-devel mate-menus-devel mate-desktop-devel pam-devel
+elogind-devel"
 depends="mate-desktop mate-session-manager"
 short_desc="Screensaver for MATE"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://mate-desktop.org"
 distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5e0b043570dfc1904e9892956ec8377261f94ed541b7dafde22010a619f3dd9d
+checksum=6cef439cb9885df08769500b87df441a0777a6f08bd6f920fad92dfd75c19830
 
 post_install() {
 	vinstall ${FILESDIR}/${pkgname}.pam 644 etc/pam.d ${pkgname}
diff --git a/srcpkgs/mate-tweak/template b/srcpkgs/mate-tweak/template
index 3c0f6ccdf73..85b829e85e8 100644
--- a/srcpkgs/mate-tweak/template
+++ b/srcpkgs/mate-tweak/template
@@ -1,14 +1,15 @@
 # Template file for 'mate-tweak'
 pkgname=mate-tweak
-version=18.10.2
+version=19.10.4
 revision=1
 archs=noarch
 build_style=python3-module
 hostmakedepends="intltool python3-distutils-extra python3-pbr python3-setuptools"
-depends="mate-panel python3-gobject python3-psutil python3-setproctitle"
+depends="mate-panel python3-gobject python3-psutil python3-setproctitle
+ python3-distro"
 short_desc="Tweak tool for MATE"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/ubuntu-mate/mate-tweak"
 distfiles="https://github.com/ubuntu-mate/mate-tweak/archive/${version}.tar.gz"
-checksum=1e5eea75339c1e45f3d643f7c0750fac1e1814958b1dd3f846f7a49faf1fabfb
+checksum=e4c3d75ce247ab9724ecbfbb3292dbadd523b01e06d435303f6da3af88b172a5
diff --git a/srcpkgs/mathcomp/template b/srcpkgs/mathcomp/template
index 417e7334191..bc714311a6d 100644
--- a/srcpkgs/mathcomp/template
+++ b/srcpkgs/mathcomp/template
@@ -1,7 +1,7 @@
 # Template file for 'mathcomp'
 pkgname=mathcomp
 version=1.9.0
-revision=2
+revision=4
 wrksrc="math-comp-mathcomp-${version}"
 build_wrksrc="mathcomp"
 build_style=gnu-makefile
diff --git a/srcpkgs/mathjax/template b/srcpkgs/mathjax/template
index ca55b2b551e..c1088202b51 100644
--- a/srcpkgs/mathjax/template
+++ b/srcpkgs/mathjax/template
@@ -1,17 +1,17 @@
 # Template file for 'mathjax'
 pkgname=mathjax
-version=2.7.5
+version=2.7.6
 revision=1
 archs=noarch
 wrksrc="MathJax-${version}"
 depends="font-util"
-font_dirs="/usr/share/fonts/mathjax"
 short_desc="JavaScript display engine for LaTeX, MathML and AsciiMath"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://www.mathjax.org/"
 license="Apache-2.0"
+homepage="https://www.mathjax.org/"
 distfiles="https://github.com/mathjax/MathJax/archive/${version}.tar.gz"
-checksum=a25e5736553eef7b05ba00df133ad36d8f7b3b967f1e32d2f7505ac77427946f
+checksum=51a529d3361aa5cb2e1d56a37b3ed9b08f061ddcc893084b3ecefbfa978895f5
+font_dirs="/usr/share/fonts/mathjax"
 
 do_install() {
 	vmkdir usr/share/mathjax
diff --git a/srcpkgs/maxima/template b/srcpkgs/maxima/template
index 7209c853639..06342f8298c 100644
--- a/srcpkgs/maxima/template
+++ b/srcpkgs/maxima/template
@@ -1,7 +1,7 @@
 # Template file for 'maxima'
 pkgname=maxima
-version=5.42.2
-revision=3
+version=5.43.0
+revision=1
 build_style=gnu-configure
 configure_args="$(vopt_enable clisp) $(vopt_enable sbcl)"
 hostmakedepends="python perl emacs"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="http://maxima.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/maxima/maxima-${version}.tar.gz"
-checksum=167e11d6513a65c829a35f24d4ba539bcd0a82fc3dc7a6721e4f9f118c67b64d
+checksum=dcfda54511035276fd074ac736e97d41905171e43a5802bb820914c3c885ca77
 
 nopie=yes
 build_options="clisp sbcl"
@@ -45,11 +45,8 @@ maxima-emacs_package() {
 	short_desc+=" - Emacs interface"
 	depends="${sourcepkg}-${version}_${revision} virtual?emacs"
 	pkg_install() {
-		vmove usr/share/maxima/${version}/emacs
-		vmkdir usr/share/emacs/site-lisp
-		ln -sf /usr/share/maxima/${version}/emacs \
-			${PKGDESTDIR}/usr/share/emacs/site-lisp/maxima
-	}
+		vmove usr/share/emacs
+		}
 }
 
 xmaxima_package() {
diff --git a/srcpkgs/mc/template b/srcpkgs/mc/template
index 214d66adfd1..7fe95681edf 100644
--- a/srcpkgs/mc/template
+++ b/srcpkgs/mc/template
@@ -7,7 +7,7 @@ configure_args="--with-screen=slang --without-x"
 hostmakedepends="perl pkg-config"
 makedepends="e2fsprogs-devel gpm-devel libglib-devel libssh2-devel slang-devel"
 short_desc="User-friendly file manager and visual shell"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Lugubris <lugubris@disroot.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.ibiblio.org/mc/"
 distfiles="http://www.midnight-commander.org/downloads/mc-${version}.tar.xz"
diff --git a/srcpkgs/mdevd/template b/srcpkgs/mdevd/template
index c2dbbcad1af..86ee1e3058a 100644
--- a/srcpkgs/mdevd/template
+++ b/srcpkgs/mdevd/template
@@ -1,6 +1,6 @@
 # Template file for 'mdevd'
 pkgname=mdevd
-version=0.1.0.3
+version=0.1.1.0
 revision=1
 build_style=configure
 configure_args="--includedir=/usr/include --bindir=/usr/bin --libdir=/usr/lib
@@ -8,12 +8,12 @@ configure_args="--includedir=/usr/include --bindir=/usr/bin --libdir=/usr/lib
  --with-lib=${XBPS_CROSS_BASE}/usr/lib"
 makedepends="skalibs-devel"
 short_desc="Small mdev-compatible kernel hotplug daemon similar to udevd"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="ISC"
 homepage="https://skarnet.org/software/mdevd/"
 changelog="https://skarnet.org/software/mdevd/upgrade.html"
 distfiles="https://skarnet.org/software/mdevd/mdevd-${version}.tar.gz"
-checksum=d5754695dcabaa3e68d1c2bd47390d5659484f8f2e36ca6b28aedd4b83d0c3ac
+checksum=302819dceb2400f299ef8f04828a4fe9156d7334e41ce34d61db37fbc2aa7e8f
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) makedepends+=" nsss-devel" configure_args+=" --enable-nsss" ;;
diff --git a/srcpkgs/mediainfo/template b/srcpkgs/mediainfo/template
index f6311cc2344..614f67aa9dd 100644
--- a/srcpkgs/mediainfo/template
+++ b/srcpkgs/mediainfo/template
@@ -1,6 +1,6 @@
 # Template file for 'mediainfo'
 pkgname=mediainfo
-version=19.07
+version=19.09
 revision=1
 wrksrc=MediaInfo
 configure_args="--with-wx-config=wx-config-gtk3"
@@ -12,7 +12,7 @@ maintainer="John <johnz@posteo.net>"
 license="BSD-2-Clause"
 homepage="https://mediaarea.net/MediaInfo"
 distfiles="https://mediaarea.net/download/source/${pkgname}/${version}/${pkgname}_${version}.tar.xz"
-checksum=84a8991cec4f11e580fb40e922ce3f422d95f1ab489889df2366177969bb5e2c
+checksum=02f5b0ae42825776b51500f023ff883fd632dc4cbe229f00d7528bf0e8d45aa8
 replaces="mediainfo-gui>=0"
 
 build_options="CLI GUI"
diff --git a/srcpkgs/megazeux/template b/srcpkgs/megazeux/template
index f8338a8238a..2702d09bacb 100644
--- a/srcpkgs/megazeux/template
+++ b/srcpkgs/megazeux/template
@@ -1,6 +1,6 @@
 # Template file for 'megazeux'
 pkgname=megazeux
-version=2.91j
+version=2.92b
 revision=1
 wrksrc="mzx${version/.}"
 build_style=configure
@@ -13,4 +13,4 @@ maintainer="Adrian Siekierka <kontakt@asie.pl>"
 license="GPL-2.0-or-later"
 homepage="http://www.digitalmzx.net/"
 distfiles="http://vault.digitalmzx.net/download.php?latest=src&ver=${version}>${pkgname}-${version}.tar.xz"
-checksum=c641a2550178667a559918b9ac686088f0a6c9788af1f573b767711f689f6a68
+checksum=1735c098de62d2b779e3150c94e7520d6e1fc1afb0624a77c5b4490a0935a88f
diff --git a/srcpkgs/menumaker/template b/srcpkgs/menumaker/template
index 368f454cdcb..a3f3b123525 100644
--- a/srcpkgs/menumaker/template
+++ b/srcpkgs/menumaker/template
@@ -1,19 +1,19 @@
 # Template file for 'menumaker'
 pkgname=menumaker
-version=0.99.10
-revision=2
+version=0.99.11
+revision=1
 archs=noarch
 build_style=gnu-configure
+pycompile_dirs="/usr/lib/menumaker"
 hostmakedepends="python"
 makedepends="python"
 depends="python"
-pycompile_dirs="/usr/lib/menumaker"
 short_desc="Menu generation utility"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD"
+license="BSD-2-Clause"
 homepage="http://menumaker.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
-checksum=7e22db0f0d937d33bb338e03f6eac9aa549b9a790c666e519b13de39de66a4d6
+checksum=9d831adbaef2101d8b8d82e48d764c2c1a80a38e97dcf90740eb540e6db3f936
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/menutray/template b/srcpkgs/menutray/template
index 3831e2967f0..6f06e21ff21 100644
--- a/srcpkgs/menutray/template
+++ b/srcpkgs/menutray/template
@@ -1,15 +1,15 @@
 # Template file for 'menutray'
 pkgname=menutray
-version=0.52
+version=0.53
 revision=1
 archs=noarch
 depends="perl-Data-Dump perl-Gtk2 perl-Linux-DesktopFiles"
 short_desc="Application menu through a GTK+ tray status icon"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="https://trizenx.blogspot.fr/2012/02/menutray.html"
 distfiles="https://github.com/trizen/menutray/archive/${version}.tar.gz"
-checksum=6622fff0074096dd332039ca90f083ca9e4e964dfda9f2a633b98198fc1e32d2
+checksum=5d3da38bf626f0969221ef5db1cbd7d49ab1c1506aa423967b6d59780ee3b360
 
 do_install() {
 	vbin menutray
diff --git a/srcpkgs/mercurial/template b/srcpkgs/mercurial/template
index 9ccfbf7a173..325b2c1e6b3 100644
--- a/srcpkgs/mercurial/template
+++ b/srcpkgs/mercurial/template
@@ -1,6 +1,6 @@
 # Template file for 'mercurial'
 pkgname=mercurial
-version=5.0.2
+version=5.1.2
 revision=1
 build_style=python2-module
 pycompile_module="hgdemandimport hgext hgext3rd mercurial"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.mercurial-scm.org/"
 distfiles="https://www.mercurial-scm.org/release/mercurial-${version}.tar.gz"
-checksum=29b850792f1f054cece5b8de8e815dbbe266e1d11814c3755290c0879883c0f8
+checksum=15af0b090b23649e0e53621a88dde97b55a734d7cb08b77d3df284db70d44e2e
 
 post_install() {
 	vmkdir usr/share/man/man1
diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index 81a9ab6b4f1..315a0f27a92 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,7 +1,8 @@
 # Template file for 'meson'
 pkgname=meson
-version=0.51.1
-revision=1
+reverts="0.52.0_1 0.52.0_2"
+version=0.51.2
+revision=2
 archs=noarch
 build_style=python3-module
 pycompile_module="mesonbuild"
@@ -12,10 +13,10 @@ checkdepends="glib-devel gobject-introspection libsanitizer-devel ninja
 short_desc="Super fast build system"
 maintainer="Dylan Katz <muddmaker.97@gmail.com>"
 license="Apache-2.0"
-homepage="http://mesonbuild.com"
+homepage="https://mesonbuild.com"
 changelog="https://raw.githubusercontent.com/mesonbuild/meson/master/docs/markdown/Release-notes-for-${version%.?}.0.md"
 distfiles="https://github.com/mesonbuild/meson/archive/${version}.tar.gz"
-checksum=92cf7f095fe2d1c3f23824805480c29eaa381e71ae0a90ac85949d1e10f9041c
+checksum=96871cf62c9cf2b212e2f38aa3e543323403b1314fd3835e14120ef837c00f01
 
 do_check() {
 	# meson depends on trillion of things to perform actual tests
diff --git a/srcpkgs/messagelib/template b/srcpkgs/messagelib/template
index 3a5f277e4ee..7f1dd0b1bb3 100644
--- a/srcpkgs/messagelib/template
+++ b/srcpkgs/messagelib/template
@@ -1,7 +1,7 @@
 # Template file for 'messagelib'
 pkgname=messagelib
-version=19.08.0
-revision=1
+version=19.08.2
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python
  kcoreaddons kconfig"
@@ -13,7 +13,7 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/applications/${version}/src/messagelib-${version}.tar.xz"
-checksum=0797b11452874a1d8264f92e8cc6d6977f3b0416dc66ff558b124bf2a52b118d
+checksum=d761e94d2fa71c2de6a52e0c1756f52f0006ada35711189b343eccdafe0a0390
 
 if [ "$CROSS_BUILD" ]; then
 	LDFLAGS=" -Wl,-rpath-link,../../bin"
diff --git a/srcpkgs/mftrace/patches/gf2pbm.1.patch b/srcpkgs/mftrace/patches/gf2pbm.1.patch
new file mode 100644
index 00000000000..0619ff9a2fb
--- /dev/null
+++ b/srcpkgs/mftrace/patches/gf2pbm.1.patch
@@ -0,0 +1,11 @@
+--- GNUmakefile.in
++++ GNUmakefile.in
+@@ -14,7 +14,7 @@ CFLAGS += -I.
+ srcdir=@srcdir@
+ VPATH=$(srcdir)
+ NAME=mftrace
+-MANPAGES=mftrace.1 gf2pbm.1
++MANPAGES=mftrace.1
+ VERSION=@VERSION@
+ distdir=$(NAME)-$(VERSION)
+ prefix=@prefix@
diff --git a/srcpkgs/mftrace/template b/srcpkgs/mftrace/template
index 5a87c17e73f..10f2c1ecfdc 100644
--- a/srcpkgs/mftrace/template
+++ b/srcpkgs/mftrace/template
@@ -1,13 +1,13 @@
 # Template file for 'mftrace'
 pkgname=mftrace
-version=1.2.19
+version=1.2.20
 revision=1
 build_style=gnu-configure
-depends="python potrace"
-hostmakedepends="${depends}"
+hostmakedepends="python3 potrace"
+depends="${hostmakedepends}"
 short_desc="Trace a TeX bitmap font into PFA/PFB/TTF"
 maintainer="svenper <svenper@tuta.io>"
 license="GPL-2.0-or-later"
 homepage="http://lilypond.org/mftrace"
 distfiles="http://lilypond.org/downloads/sources/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=778126f4220aa31fc91fa8baafd26aaf8be9c5e8fed5c0e92a61de04d32bbdb5
+checksum=626b7a9945a768c086195ba392632a68d6af5ea24ef525dcd0a4a8b199ea5f6f
diff --git a/srcpkgs/mgba/template b/srcpkgs/mgba/template
index a74d0e97f2f..9da8531da40 100644
--- a/srcpkgs/mgba/template
+++ b/srcpkgs/mgba/template
@@ -1,6 +1,6 @@
 # Template file for 'mgba'
 pkgname=mgba
-version=0.7.2
+version=0.7.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.mgba.io/"
 distfiles="https://github.com/mgba-emu/${pkgname}/archive/${version}.tar.gz"
-checksum=ed635e05798d3fa0d55e5abb439f6d1708d519e4ecd5ed10b9bc6e319ed9dba7
+checksum=6d5e8ab6f87d3d9fa85af2543db838568dbdfcecd6797f8153f1b3a10b4a8bdd
 
 libmgba_package() {
 	short_desc+=" - shared library"
diff --git a/srcpkgs/miller/template b/srcpkgs/miller/template
index 102f1ac490a..230f819180d 100644
--- a/srcpkgs/miller/template
+++ b/srcpkgs/miller/template
@@ -1,16 +1,16 @@
 # Template file for 'miller'
 pkgname=miller
-version=5.4.0
+version=5.6.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool flex asciidoc"
 short_desc="Tool like sed/awk/cut/join/sort for name-indexed data such as CSV"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="2-clause-BSD"
+license="BSD-2-Clause"
 homepage="http://johnkerl.org/miller/"
-distfiles="https://github.com/johnkerl/${pkgname}/archive/${version}.tar.gz"
 changelog="https://github.com/johnkerl/miller/releases"
-checksum=6a7d30884a8f4a97e07895b723be13764ff49251200b832385207c5efb9647d8
+distfiles="https://github.com/johnkerl/${pkgname}/archive/v${version}.tar.gz"
+checksum=4a02dad2ea545a8085aec7fcf79b3987ddd8ce9d111d5cede488692bb0f49731
 
 pre_configure() {
 	# Disable debugging and profiling versions, broken on musl.
diff --git a/srcpkgs/milou/template b/srcpkgs/milou/template
index 027d6566d9e..3993e313560 100644
--- a/srcpkgs/milou/template
+++ b/srcpkgs/milou/template
@@ -1,18 +1,18 @@
 # Template file for 'milou'
 pkgname=milou
-version=5.16.4
+version=5.17.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules kdoctools kpackage qt5-host-tools
  qt5-qmake"
-makedepends="krunner-devel"
+makedepends="krunner-devel kitemmodels-devel"
 short_desc="KDE dedicated search application built on top of Baloo"
 maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later, LPGL-2.1-or-later"
 homepage="https://projects.kde.org/projects/plasma/milou"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=de9addbc504135839b1735742938d340cb191827606aa390f4b6ce1625c1ed89
+checksum=d8e94ecf18f2f41e3bcb66ae324996dc1db6c3addc4a506e060c7874c2764107
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/miniflux/template b/srcpkgs/miniflux/template
index 5b7ab67797d..dac523a25f3 100644
--- a/srcpkgs/miniflux/template
+++ b/srcpkgs/miniflux/template
@@ -1,6 +1,6 @@
 # Template file for 'miniflux'
 pkgname=miniflux
-version=2.0.17
+version=2.0.18
 revision=1
 build_style=go
 go_import_path="github.com/miniflux/miniflux"
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://miniflux.app"
 changelog="https://raw.githubusercontent.com/miniflux/miniflux/2.0.16/ChangeLog"
 distfiles="https://github.com/miniflux/miniflux/archive/${version}.tar.gz"
-checksum=2d0cd7c5ec1b7a083c306902b56f63fd786ece675b2874f22df29d025a5e4cc9
+checksum=5ba9317f90166c39f36e6e1bede727fed2c971f8ba5d36111184694b5f9e4338
 system_accounts="_miniflux"
 
 post_install() {
diff --git a/srcpkgs/minify/template b/srcpkgs/minify/template
index a0a3bb2977b..cd600a94834 100644
--- a/srcpkgs/minify/template
+++ b/srcpkgs/minify/template
@@ -1,6 +1,6 @@
 # Template file for 'minify'
 pkgname=minify
-version=2.5.1
+version=2.5.2
 revision=1
 build_style=go
 go_import_path="github.com/tdewolff/minify"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/tdewolff/minify"
 distfiles="https://github.com/tdewolff/${pkgname}/archive/v${version}.tar.gz"
-checksum=7ddbf32e2d032cfd615d271b088767ca2f27fedcd33c478338dc784f48698aee
+checksum=cf9518548e16bfe546d03fbb004e665006888205ef58367b3240d1fd402b1025
 
 post_install() {
 	vlicense LICENSE.md LICENSE
diff --git a/srcpkgs/minijail/template b/srcpkgs/minijail/template
new file mode 100644
index 00000000000..e27ab8f0f28
--- /dev/null
+++ b/srcpkgs/minijail/template
@@ -0,0 +1,23 @@
+# Template file for 'minijail'
+pkgname=minijail
+version=10
+revision=1
+wrksrc="${pkgname}-linux-v${version}"
+build_style=gnu-makefile
+makedepends="libcap-devel"
+short_desc="Sandboxing and containment tool used in Chrome OS and Android"
+maintainer="Cameron Nemo <cnemo@tutanota.com>"
+license="BSD-3-Clause"
+homepage="https://android.googlesource.com/platform/external/minijail"
+distfiles="https://gitlab.com/chinstrap/minijail/-/archive/linux-v${version}/minijail-linux-v${version}.tar.gz"
+checksum=29334d1bcd16c1ea09e49cef3b47a000e98be7ffe7fa9a28c8cab81643033612
+
+do_install() {
+	vbin minijail0
+	vmkdir usr/lib
+	vcopy libminijail.so usr/lib
+	vcopy libminijailpreload.so usr/lib
+	vman minijail0.1
+	vman minijail0.5
+	vlicense LICENSE
+}
diff --git a/srcpkgs/minikube/template b/srcpkgs/minikube/template
index 9f0e89398f6..427152c0ef4 100644
--- a/srcpkgs/minikube/template
+++ b/srcpkgs/minikube/template
@@ -1,6 +1,6 @@
 # Template file for 'minikube'
 pkgname=minikube
-version=1.3.0
+version=1.4.0
 revision=1
 archs="x86_64* ppc64le*"
 build_wrksrc=src/k8s.io/minikube
diff --git a/srcpkgs/minio/template b/srcpkgs/minio/template
index 22e6a96aacc..53b44b361da 100644
--- a/srcpkgs/minio/template
+++ b/srcpkgs/minio/template
@@ -1,8 +1,8 @@
 # Template file for 'minio'
 pkgname=minio
-version=2019.08.07
+version=2019.10.12
 revision=1
-_version="${version//./-}T01-59-21Z"
+_version="${version//./-}T01-39-57Z"
 wrksrc=${pkgname}-RELEASE.${_version}
 build_style=go
 go_import_path="github.com/minio/minio"
@@ -16,7 +16,7 @@ maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/minio/minio"
 distfiles="${homepage}/archive/RELEASE.${_version}.tar.gz"
-checksum=7b30d246bf138cda06929cd97ea82394d287448ae8fa3f5ac5c6eedaf03fd4eb
+checksum=8cffc57c7e405ed0e312e48c8393b1ad4081de48a1a69caa23323051bfc14d7d
 system_accounts="_minio"
 
 do_check() {
@@ -25,7 +25,6 @@ do_check() {
 
 post_install() {
 	vdoc README.md
-	vlicense LICENSE
 	vinstall ${FILESDIR}/${pkgname}.confd 644 etc/default ${pkgname}
 	vinstall ${FILESDIR}/config.json 644 etc/minio config.json
 	vsv minio
diff --git a/srcpkgs/minitalk/template b/srcpkgs/minitalk/template
index 443606d28b6..0da6bf8e487 100644
--- a/srcpkgs/minitalk/template
+++ b/srcpkgs/minitalk/template
@@ -1,21 +1,15 @@
 # Template file for 'minitalk'
 pkgname=minitalk
-version=0.2.5
-revision=2
+version=0.3.0
+revision=1
 build_style=gnu-makefile
-make_build_args="LDFLAGS+=-lreadline PREFIX=/usr"
 makedepends="readline-devel"
-short_desc="A small chat system for multiple users on a UNIX-like host "
+short_desc="Small chat system for multiple users on a UNIX-like host "
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/abenson/minitalk"
 distfiles="https://github.com/abenson/minitalk/archive/v${version}.tar.gz"
-checksum=0a6541f7b1ad36063dae4e7f09a0c0d7ea1f71e2fe8be9797045d7736cf7fe4f
-
-do_install() {
-	vbin minitalk
-	vman minitalk.1
-}
+checksum=7ed213d8de21010d75c10936f29b2492b6b737a1955d4bf80452b4d8b3bfb800
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/mkchromecast/template b/srcpkgs/mkchromecast/template
index e14b2c5b15d..8617143838c 100644
--- a/srcpkgs/mkchromecast/template
+++ b/srcpkgs/mkchromecast/template
@@ -9,7 +9,7 @@ depends="python3-Flask python3-netifaces python3-setuptools python3-requests
  python3-mutagen python3-psutil python3-PyQt5 python3-SoCo python3-chromecast
  python3-gobject pulseaudio python3-youtube-dl ffmpeg"
 short_desc="Cast Linux Audio/Video to Google cast and Sonos devices"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://mkchromecast.com/"
 distfiles="https://github.com/muammar/mkchromecast/archive/${version}.tar.gz"
diff --git a/srcpkgs/mkfontscale/template b/srcpkgs/mkfontscale/template
index 655243480ac..dafbb915ca8 100644
--- a/srcpkgs/mkfontscale/template
+++ b/srcpkgs/mkfontscale/template
@@ -7,7 +7,7 @@ configure_args="--with-bzip2"
 hostmakedepends="pkg-config"
 makedepends="xorgproto zlib-devel bzip2-devel freetype-devel libfontenc-devel"
 short_desc="X11 Scalable Font Index Generator"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://www.x.org/wiki"
 distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2"
diff --git a/srcpkgs/mkinitcpio/template b/srcpkgs/mkinitcpio/template
index ee0e621baf7..b2b710649b1 100644
--- a/srcpkgs/mkinitcpio/template
+++ b/srcpkgs/mkinitcpio/template
@@ -1,7 +1,7 @@
 # Template file for 'mkinitcpio'
 pkgname=mkinitcpio
-version=25
-revision=2
+version=26
+revision=1
 archs=noarch
 build_style=gnu-makefile
 depends="busybox-static bsdtar bash"
@@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-only"
 homepage="https://wiki.archlinux.org/index.php/Mkinitcpio"
 distfiles="https://sources.archlinux.org/other/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=e14056a9c460d15652e99620bce4308d4dd9309f82c152c4b52287e697fab599
+checksum=d1c3038f538f8e2e57333050463b79884de6f29f4b4ec4f26d1bdeaa620215c1
 
 conf_files="/etc/mkinitcpio.conf"
 
diff --git a/srcpkgs/mkpasswd b/srcpkgs/mkpasswd
new file mode 120000
index 00000000000..2c656a9178a
--- /dev/null
+++ b/srcpkgs/mkpasswd
@@ -0,0 +1 @@
+whois
\ No newline at end of file
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index 285759aedfa..b334fa41482 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,6 +1,6 @@
 # Template file for 'mkvtoolnix'
 pkgname=mkvtoolnix
-version=36.0.0
+version=38.0.0
 revision=1
 build_style=gnu-configure
 configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt"
@@ -14,7 +14,7 @@ license="GPL-2.0-only"
 homepage="https://www.bunkus.org/videotools/mkvtoolnix/"
 changelog="https://mkvtoolnix.download/doc/NEWS.md"
 distfiles="https://www.bunkus.org/videotools/${pkgname}/sources/${pkgname}-${version}.tar.xz"
-checksum=2697321755a277fd499000b7888e6beced1a1d67230110f1d631b4b83922a704
+checksum=0e1db5b5af6147dec245744a0d403120e53a44f6b81aad0d26c0f5c0e5515d00
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-boost=${XBPS_CROSS_BASE}/usr"
diff --git a/srcpkgs/mmark/template b/srcpkgs/mmark/template
index fb0e3dd8851..346802b4ac9 100644
--- a/srcpkgs/mmark/template
+++ b/srcpkgs/mmark/template
@@ -1,6 +1,6 @@
 # Template file for 'mmark'
 pkgname=mmark
-version=2.1.0
+version=2.2.0
 revision=1
 build_style=go
 go_import_path=github.com/mmarkdown/mmark
@@ -10,7 +10,7 @@ maintainer="Robert Lowry <bobertlo@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://github.com/mmarkdown/mmark/"
 distfiles="https://github.com/mmarkdown/mmark/archive/v${version}.tar.gz"
-checksum=094b56539960890319c657a098248adba577c53ec5b703a5b2525b68d15c2048
+checksum=8a7b278b93b737daf46554fa83b86538b1f6eee02f8508eb08581aa578531f02
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/modemmanager-qt5/template b/srcpkgs/modemmanager-qt5/template
index e2a54403b84..e0e33e9c004 100644
--- a/srcpkgs/modemmanager-qt5/template
+++ b/srcpkgs/modemmanager-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'modemmanager-qt5'
 pkgname=modemmanager-qt5
-version=5.61.0
+version=5.63.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/frameworks/modemmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=c9883a3aac7415045a03f0bda435a2a5ff7523538868b72dffa8e4b40e88502a
+checksum=4d0153d89be703662c11839adc5f4883df32ecc9b4781b0a20c07bcfc2c1657b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/modsecurity/template b/srcpkgs/modsecurity/template
index f781732777b..6719ce2952e 100644
--- a/srcpkgs/modsecurity/template
+++ b/srcpkgs/modsecurity/template
@@ -10,7 +10,7 @@ makedepends="apache-devel gdbm-devel libcurl-devel libxml2-devel lua-devel
  pcre-devel yajl-devel lmdb-devel"
 depends="perl-LWP"
 short_desc="Rule based web application firwall (WAF)"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://www.modsecurity.org"
 distfiles="https://github.com/SpiderLabs/ModSecurity/releases/download/v${version}/modsecurity-v${version}.tar.gz"
diff --git a/srcpkgs/mongoose/template b/srcpkgs/mongoose/template
index 30317db3b3c..8603d44fcc5 100644
--- a/srcpkgs/mongoose/template
+++ b/srcpkgs/mongoose/template
@@ -1,7 +1,7 @@
 # Template file for 'mongoose'
 pkgname=mongoose
-version=6.14
-revision=2
+version=6.16
+revision=1
 build_style=gnu-makefile
 make_use_env=compliant
 makedepends="libressl-devel"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://cesanta.com/"
 distfiles="https://github.com/cesanta/mongoose/archive/${version}.tar.gz"
-checksum=f11d2fb23eec08ee5d95da600649177b9bdcf9eaa6be407d997b174e271e4d78
+checksum=1f20f2781862560ddf3203dfb0e6fcf248a68bf92aefbeafb9d2a629c4767c02
 
 mongoose-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/mono/patches/fix-heapviz-import.patch b/srcpkgs/mono/patches/fix-heapviz-import.patch
new file mode 100644
index 00000000000..1ab78851687
--- /dev/null
+++ b/srcpkgs/mono/patches/fix-heapviz-import.patch
@@ -0,0 +1,11 @@
+--- scripts/mono-heapviz.orig
++++ scripts/mono-heapviz
+@@ -7,7 +7,7 @@
+ 
+ from __future__ import print_function
+ import sys, os
+-import Image, ImageDraw
++from PIL import Image, ImageDraw
+ from xml.sax import ContentHandler, make_parser
+ from xml.sax.handler import feature_namespaces
+ from optparse import OptionParser
diff --git a/srcpkgs/mono/patches/musl.patch b/srcpkgs/mono/patches/musl.patch
new file mode 100644
index 00000000000..0c523eb9c25
--- /dev/null
+++ b/srcpkgs/mono/patches/musl.patch
@@ -0,0 +1,11 @@
+--- mono/utils/mono-os-mutex.h	2019-09-25 17:24:27.868901488 +0200
++++ mono/utils/mono-os-mutex.h	2019-09-25 17:24:46.344659000 +0200
+@@ -57,7 +57,7 @@
+ 	if (G_UNLIKELY (res != 0))
+ 		g_error ("%s: pthread_mutexattr_settype failed with \"%s\" (%d)", __func__, g_strerror (res), res);
+ 
+-#if defined (PTHREAD_PRIO_INHERIT) && HAVE_DECL_PTHREAD_MUTEXATTR_SETPROTOCOL
++#if defined (PTHREAD_PRIO_INHERIT) && HAVE_DECL_PTHREAD_MUTEXATTR_SETPROTOCOL && defined(__GLIBC__)
+ 	/* use PTHREAD_PRIO_INHERIT if possible */
+ 	res = pthread_mutexattr_setprotocol (&attr, PTHREAD_PRIO_INHERIT);
+ 	if (G_UNLIKELY (res != 0 && res != ENOTSUP))
diff --git a/srcpkgs/mono/template b/srcpkgs/mono/template
index 3f3808af84a..170438ae0dd 100644
--- a/srcpkgs/mono/template
+++ b/srcpkgs/mono/template
@@ -1,20 +1,21 @@
 # Template file for 'mono'
 pkgname=mono
-version=6.0.0.319
+version=6.4.0.198
 revision=1
 build_style=gnu-configure
 configure_args="--disable-system-aot"
 # XXX: figure out how to split this up into subpkgs.
-hostmakedepends="perl python cmake"
+hostmakedepends="perl python3 cmake"
 makedepends="zlib-devel libX11-devel libgdiplus-devel"
-depends="ca-certificates python"
+depends="ca-certificates python3-Pillow"
 short_desc="Free implementation of the .NET platform including runtime and compiler"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="MIT, BSD-3-Clause, GPL-2.0-or-later, LGPL-2.0-or-later, MPL-1.1"
 homepage="https://www.mono-project.com"
 distfiles="https://download.mono-project.com/sources/mono/${pkgname}-${version}.tar.xz"
-checksum=6b4c80b88bf7688178797bfecc681e3dbc4c6810413c97d6f3c476061a8d261a
+checksum=d00852822525e36f9f8b3e0f537d3a41c7a718cac22d06fc63ea64988877c2ea
 lib32disabled=yes
+python_version="3"
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) configure_args+=" --disable-boehm --without-sigaltstack" ;;
diff --git a/srcpkgs/monolith/template b/srcpkgs/monolith/template
new file mode 100644
index 00000000000..19e324995d2
--- /dev/null
+++ b/srcpkgs/monolith/template
@@ -0,0 +1,22 @@
+# Template file for 'monolith'
+pkgname=monolith
+version=2.0.16
+revision=1
+build_style=cargo
+hostmakedepends="pkg-config"
+makedepends="libressl-devel"
+short_desc="Save HTML pages with ease "
+maintainer="Benjamín Albiñana <benalb@gmail.com>"
+license="Unlicense"
+homepage="https://github.com/Y2Z/monolith"
+distfiles="https://github.com/Y2Z/monolith/archive/v${version}.tar.gz"
+checksum=b2f5cd1d95d4d2ccd06e7f44e88e43ff0f2ec5d73dabe93ca56bf22656b06a0e
+
+pre_build() {
+	cargo update --package openssl-sys --precise 0.9.48
+	cargo update --package openssl --precise 0.10.22
+}
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/moserial/template b/srcpkgs/moserial/template
new file mode 100644
index 00000000000..c82955bcd70
--- /dev/null
+++ b/srcpkgs/moserial/template
@@ -0,0 +1,14 @@
+# Template file for 'moserial'
+pkgname=moserial
+version=3.0.12
+revision=1
+_majver=3.0
+build_style=gnu-configure
+hostmakedepends="intltool itstool pkg-config"
+makedepends="gtk+3-devel"
+short_desc="Clean, friendly gtk-based serial terminal for the gnome desktop"
+maintainer="Robert Lowry <bobertlo@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://wiki.gnome.org/action/show/Apps/Moserial"
+distfiles="${GNOME_SITE}/moserial/${_majver}/moserial-${version}.tar.xz"
+checksum=de2448cd37bb64c43f5533913739cbfc2fe3261f6c6a5ea289f9c200f1e7fcc9
diff --git a/srcpkgs/mozo/template b/srcpkgs/mozo/template
index 3aec7299af5..041f2454c3d 100644
--- a/srcpkgs/mozo/template
+++ b/srcpkgs/mozo/template
@@ -1,17 +1,17 @@
 # Template file for 'mozo'
 pkgname=mozo
-version=1.22.1
+version=1.22.2
 revision=1
 archs=noarch
 build_style=gnu-configure
 pycompile_module="Mozo"
 hostmakedepends="intltool itstool pkg-config"
-makedepends="glib-devel mate-menus-devel python-gobject-devel"
-depends="desktop-file-utils gtk+3 mate-menus python-gobject"
+makedepends="glib-devel mate-menus-devel python3-gobject-devel"
+depends="desktop-file-utils gtk+3 mate-menus python3-gobject"
 short_desc="MATE menu editing tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://mate-desktop.org"
 distfiles="https://pub.mate-desktop.org/releases/${version%.*}/mozo-${version}.tar.xz"
-checksum=105368e49f62afdec2a950795b5519340178aaa73388c98ebbd69b35eeb9ce79
+checksum=3ac309dabeaa5d7a1bca27e3ed1e1b3d59152ef7177e9e1d0a620392bee6ecd3
 nocross=yes
diff --git a/srcpkgs/mpDris2/files/mpDris2/run b/srcpkgs/mpDris2/files/mpDris2/run
new file mode 100644
index 00000000000..a3cbb12868b
--- /dev/null
+++ b/srcpkgs/mpDris2/files/mpDris2/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec mpDris2
\ No newline at end of file
diff --git a/srcpkgs/mpDris2/template b/srcpkgs/mpDris2/template
new file mode 100644
index 00000000000..bd2a266cd51
--- /dev/null
+++ b/srcpkgs/mpDris2/template
@@ -0,0 +1,25 @@
+# Template file for 'mpDris2'
+pkgname=mpDris2
+version=0.8
+revision=1
+build_style=gnu-configure
+hostmakedepends="autoconf automake intltool gettext-devel"
+depends="python3 python3-dbus python3-gobject python3-mpd2 python3-mutagen"
+short_desc="Provides MPRIS 2 support to mpd (Music Player Daemon)"
+maintainer="Illia Shestakov <ishestakov@airmail.cc>"
+license="GPL-3.0-only"
+homepage="https://github.com/eonpatapon/mpDris2"
+distfiles="https://github.com/eonpatapon/mpDris2/archive/${version}.tar.gz"
+checksum=b6b15c1fdddf16a6d74485ad09f56ed353a317e149c37475c00a279186da4391
+
+pre_configure() {
+	NOCONFIGURE=1 ./autogen.sh
+}
+
+post_install() {
+	rm -f ${DESTDIR}/usr/lib/systemd/user/mpDris2.service
+	vsv mpDris2
+	vdoc README.md
+	vlicense COPYING
+	vsconf src/mpDris2.conf
+}
diff --git a/srcpkgs/mpc/template b/srcpkgs/mpc/template
index da58ccfb912..ec335e49ab6 100644
--- a/srcpkgs/mpc/template
+++ b/srcpkgs/mpc/template
@@ -7,7 +7,7 @@ configure_args="-Dtest=true -Ddocumentation=enabled"
 hostmakedepends="pkg-config python3-Sphinx"
 makedepends="libmpdclient-devel check-devel"
 short_desc="Minimalist command line interface to MPD"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.musicpd.org/clients/mpc/"
 #changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/mpc/master/NEWS"
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 3e5220781ea..9488dab5217 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,6 +1,6 @@
 # Template file for 'mpd'
 pkgname=mpd
-version=0.21.13
+version=0.21.16
 revision=1
 build_style=meson
 configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
@@ -9,6 +9,7 @@ configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
  -Dchromaprint=disabled -Dsoxr=enabled -Dshout=disabled -Dadplug=disabled
  -Dfluidsynth=disabled -Dgme=disabled -Dwildmidi=disabled -Dsidplay=disabled
  -Dshine=disabled -Ddocumentation=true -Daudiofile=enabled -Dtremor=disabled
+ -Dsolaris_output=disabled
  -Djack=$(vopt_if jack enabled disabled) -Dlame=$(vopt_if lame enabled disabled)
  -Dao=$(vopt_if libao enabled disabled) -Dmpcdec=$(vopt_if mpcdec enabled disabled)
  -Dsndio=$(vopt_if sndio enabled disabled) -Dpulse=$(vopt_if pulseaudio enabled disabled)
@@ -20,19 +21,19 @@ makedepends="avahi-glib-libs-devel boost-devel faad2-devel ffmpeg-devel
  libcurl-devel libid3tag-devel libmad-devel libmikmod-devel libmms-devel
  libmodplug-devel libmpdclient-devel libnfs-devel libsamplerate-devel
  libsoup-devel libupnp1.8-devel mpg123-devel opus-devel yajl-devel
- zziplib-devel libsoxr-devel audiofile-devel
- twolame-devel $(vopt_if cdio 'libcdio-paranoia-devel')
+ zziplib-devel libsoxr-devel audiofile-devel twolame-devel
+ $(vopt_if cdio 'libcdio-paranoia-devel')
  $(vopt_if jack 'jack-devel') $(vopt_if lame 'lame-devel')
  $(vopt_if libao 'libao-devel') $(vopt_if mpcdec 'libmpcdec-devel')
  $(vopt_if pulseaudio 'pulseaudio-devel') $(vopt_if sndio 'sndio-devel')
  $(vopt_if wavpack 'wavpack-devel') $(vopt_if openal 'libopenal-devel')"
 short_desc="Flexible, powerful, server-side application for playing music"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Daniel Eyßer <daniel.eysser@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://www.musicpd.org/"
 changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v${version}/NEWS"
 distfiles="https://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz"
-checksum=95b70b268406bde15bda4464ef768f7e773417a8c776d42a678c5a5070855eea
+checksum=30cf1bddf7d7388487276745ad3515f134e07f0c57f9f97cb2b5d3befd4a4d92
 LDFLAGS+=" -Wl,-z,stack-size=1048576"
 
 system_accounts="mpd"
diff --git a/srcpkgs/mpdcron/template b/srcpkgs/mpdcron/template
index ad8623f26f2..22e9dc4d7cc 100644
--- a/srcpkgs/mpdcron/template
+++ b/srcpkgs/mpdcron/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="pkg-config automake libtool"
 makedepends="libdaemon-devel libmpdclient-devel libglib-devel"
 short_desc="Program for mpd which can execute scripts based on idle events"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2"
 homepage="https://github.com/alip/mpdcron"
 distfiles="https://github.com/alip/mpdcron/archive/v${version}.tar.gz"
diff --git a/srcpkgs/mpg123/template b/srcpkgs/mpg123/template
index 9453f09afd2..379c8ac191b 100644
--- a/srcpkgs/mpg123/template
+++ b/srcpkgs/mpg123/template
@@ -1,6 +1,6 @@
 # Template file for 'mpg123'
 pkgname=mpg123
-version=1.25.11
+version=1.25.12
 revision=1
 build_style=gnu-configure
 configure_args="--with-optimization=0 --with-default-audio=alsa
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only"
 homepage="https://www.mpg123.org/"
 distfiles="${SOURCEFORGE_SITE}/mpg123/mpg123-${version}.tar.bz2"
-checksum=df063307faa27c7d9efe63d2139b1564cfc7cdbb7c6f449c89ef8faabfa0eab2
+checksum=1ffec7c9683dfb86ea9040d6a53d6ea819ecdda215df347f79def08f1fe731d1
 
 case "$XBPS_TARGET_MACHINE" in
 	# No LFS required with musl
diff --git a/srcpkgs/mplayer/template b/srcpkgs/mplayer/template
index 8b1acdaf6dc..1c603498eae 100644
--- a/srcpkgs/mplayer/template
+++ b/srcpkgs/mplayer/template
@@ -32,8 +32,10 @@ conf_files="
 do_configure() {
 	sed 's|-march=i486||g' -i configure
 
+	# we tried runtime cpudetection for ppc32 but stuff's broken
 	case "$XBPS_TARGET_MACHINE" in
 		i686*|x86_64*|ppc64*) configure_args+=" --enable-vdpau --enable-runtime-cpudetection";;
+		ppc*) configure_args+=" --enable-vdpau --disable-altivec";;
 	esac
 
 	./configure --prefix=/usr \
diff --git a/srcpkgs/mpop/template b/srcpkgs/mpop/template
index 005947be9f3..fb36c02a722 100644
--- a/srcpkgs/mpop/template
+++ b/srcpkgs/mpop/template
@@ -1,6 +1,6 @@
 # Template file for 'mpop'
 pkgname=mpop
-version=1.4.5
+version=1.4.6
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,4 +10,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="https://marlam.de/mpop/"
 distfiles="https://marlam.de/mpop/releases/mpop-${version}.tar.xz"
-checksum=5b69723b216d4330b93af81b487952e5897dcde782e3be65a4e79c87e420c7d4
+checksum=fba142b133662c4e1d5587c96ea7d024a754584df64c8cf16e96bd40f7779160
diff --git a/srcpkgs/msbuild-bin/template b/srcpkgs/msbuild-bin/template
index 877c8e37dbc..7c7bc413595 100644
--- a/srcpkgs/msbuild-bin/template
+++ b/srcpkgs/msbuild-bin/template
@@ -1,7 +1,7 @@
 # Template file for 'msbuild-bin'
-_xamarin_rel="xamarinxplat.2018.09.26.17.53-0xamarin3+ubuntu1804b1"
+_xamarin_rel="xamarinxplat.2019.09.09.15.03-0xamarin5+ubuntu1804b1"
 pkgname=msbuild-bin
-version=16.0
+version=16.4
 revision=1
 archs=noarch
 build_style=fetch
@@ -11,7 +11,7 @@ maintainer="Aloz1 <kno0001@gmail.com>"
 license="MIT"
 homepage="https://github.com/mono/msbuild"
 distfiles="http://download.mono-project.com/repo/ubuntu/pool/main/m/msbuild/msbuild_${version}+${_xamarin_rel}_all.deb"
-checksum=4f6d32a21dc78fd241fd7bfa1ece7a1b2c6e5a33ac3984a5d5fd29563fa01be6
+checksum=47804a0ff3b7531d3c5e1d7b733189354761e08593e6d927b868b3c3f219aef3
 
 do_extract() {
 	ar x ${XBPS_SRCDISTDIR}/msbuild-bin-${version}/msbuild_${version}+${_xamarin_rel}_all.deb
diff --git a/srcpkgs/msgpack/template b/srcpkgs/msgpack/template
index e4c7ce69bf6..a82d67f52b5 100644
--- a/srcpkgs/msgpack/template
+++ b/srcpkgs/msgpack/template
@@ -1,18 +1,18 @@
 # Template file for 'msgpack'
 pkgname=msgpack
-version=3.1.1
+version=3.2.0
 revision=1
 wrksrc="msgpack-c-cpp-${version}"
 build_style=cmake
 makedepends="zlib-devel"
 checkdepends="gtest-devel"
 short_desc="Binary-based efficient object serialization library"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://msgpack.org/"
 changelog="https://raw.githubusercontent.com/msgpack/msgpack-c/master/CHANGELOG.md"
 distfiles="https://github.com/msgpack/msgpack-c/archive/cpp-${version}.tar.gz"
-checksum=bda49f996a73d2c6080ff0523e7b535917cd28c8a79c3a5da54fc29332d61d1e
+checksum=ff865a36bad5c72b8e7ebc4b7cf5f27a820fce4faff9c571c1791e3728355a39
 
 msgpack-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/msmtp/template b/srcpkgs/msmtp/template
index d7e5276c9b5..efec5345a99 100644
--- a/srcpkgs/msmtp/template
+++ b/srcpkgs/msmtp/template
@@ -1,6 +1,6 @@
 # Template file for 'msmtp'
 pkgname=msmtp
-version=1.8.5
+version=1.8.6
 revision=1
 build_style=gnu-configure
 configure_args="$(vopt_with msmtpd)
@@ -13,11 +13,11 @@ makedepends="gnutls-devel
  $(vopt_if sasl gsasl-devel)
  $(vopt_if gnome libsecret-devel)"
 short_desc="Mini SMTP client"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Peter Bui <pbui@github.bx612.space>"
 license="GPL-3.0-or-later"
 homepage="https://marlam.de/msmtp/"
 distfiles="https://marlam.de/msmtp/releases/msmtp-${version}.tar.xz"
-checksum=1613daced9c47b8c028224fc076799c2a4d72923e242be4e9e5c984cbbbb9f39
+checksum=6625f147430c65ba8527f52c4fe5d4d33552d3c0fb6d793ba7df819a3b3042e1
 
 build_options="idn sasl gnome msmtpd"
 desc_option_msmtpd="Build minimal SMTP server"
diff --git a/srcpkgs/mtm/template b/srcpkgs/mtm/template
new file mode 100644
index 00000000000..66dfe25bb22
--- /dev/null
+++ b/srcpkgs/mtm/template
@@ -0,0 +1,23 @@
+# Template file for 'mtm'
+pkgname=mtm
+version=1.1.0
+revision=1
+build_style=gnu-makefile
+hostmakedepends="ncurses"
+makedepends="ncurses-devel ncurses-libs"
+short_desc="Micro Terminal Multiplexer"
+maintainer="travankor <travankor@tuta.io>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/deadpixi/mtm"
+distfiles="https://github.com/deadpixi/mtm/archive/${version}.tar.gz"
+checksum=3f3e723466f3bb88afb7a49b66a790f3aaf6786654e8f1f056edc09fa99abd85
+
+do_build() {
+	make HEADERS='-DNCURSESW_INCLUDE_H="<ncurses.h>"'
+}
+
+do_install() {
+	make install-terminfo
+	vbin mtm
+	vman mtm.1
+}
diff --git a/srcpkgs/muffin/template b/srcpkgs/muffin/template
index a64694bcb74..bbcec2ae72f 100644
--- a/srcpkgs/muffin/template
+++ b/srcpkgs/muffin/template
@@ -1,6 +1,6 @@
 # Template file for 'muffin'
 pkgname=muffin
-version=4.0.7
+version=4.2.2
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-schemas-compile --disable-gtk-doc
@@ -15,7 +15,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
 distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=e515c5d396c258b6b6c43c3b819cb170f057c90874ece943e31cb8c8f4ba3d10
+checksum=08c64a7a951fc526d96b4e3b6b53997328904ae2430aad4c2611a4f130a5bd16
 shlib_provides="libmuffin-clutter-0.so libmuffin-cogl-pango-0.so
  libmuffin-cogl-path-0.so libmuffin-cogl-0.so"
 nocross="gobject-introspection"
diff --git a/srcpkgs/mumble/patches/link-overlay-against-libGL.patch b/srcpkgs/mumble/patches/link-overlay-against-libGL.patch
index 3fb77d7b1c7..1c1f5010c82 100644
--- a/srcpkgs/mumble/patches/link-overlay-against-libGL.patch
+++ b/srcpkgs/mumble/patches/link-overlay-against-libGL.patch
@@ -1,11 +1,11 @@
---- overlay_gl/overlay_gl.pro	2017-01-29 23:44:01.966483578 +0100
-+++ overlay_gl/overlay_gl.pro	2017-01-29 23:44:24.487186063 +0100
-@@ -7,7 +7,7 @@
- TARGET = mumble$(TARGET_ADD)
- VERSION = 1.2.19
- SOURCES = overlay.c
--LIBS *= -lrt -ldl
-+LIBS *= -lGL -lrt -ldl
- QMAKE_CFLAGS *= -fvisibility=hidden $(CFLAGS_ADD)
- QMAKE_LFLAGS -= -Wl,--no-undefined
- QMAKE_LFLAGS *= $(LFLAGS_ADD)
+--- overlay_gl/overlay_gl.pro
++++ overlay_gl/overlay_gl.pro
+@@ -22,7 +22,7 @@ unix:!macx {
+ 
+   DEFINES += TARGET_UNIX
+   linux* {
+-    LIBS *= -lrt -ldl
++    LIBS *= -lGL -lrt -ldl
+   }
+   QMAKE_CFLAGS *= -fvisibility=hidden $(CFLAGS_ADD)
+   QMAKE_LFLAGS -= -Wl,--no-undefined
diff --git a/srcpkgs/mumble/patches/musl-dlsym.patch b/srcpkgs/mumble/patches/musl-dlsym.patch
deleted file mode 100644
index abb01c87d7d..00000000000
--- a/srcpkgs/mumble/patches/musl-dlsym.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- overlay_gl/overlay.c
-+++ overlay_gl/overlay.c
-@@ -690,19 +690,24 @@ static void initializeLibrary() {
-		int nchains = 0;
-		ElfW(Sym) *symtab = NULL;
-		const char *strtab = NULL;
-+#ifdef __GLIBC__
-+		const ElfW(Addr) base = 0;
-+#else
-+		const ElfW(Addr) base = lm->l_addr;
-+#endif
-
-		ElfW(Dyn) *dyn = lm->l_ld;
-
-		while (dyn->d_tag) {
-			switch (dyn->d_tag) {
-				case DT_HASH:
--					nchains = *(int *)(dyn->d_un.d_ptr + 4);
-+					nchains = *(int *)(base + dyn->d_un.d_ptr + 4);
-					break;
-				case DT_STRTAB:
--					strtab = (const char *) dyn->d_un.d_ptr;
-+					strtab = (const char *)(base + dyn->d_un.d_ptr);
-					break;
-				case DT_SYMTAB:
--					symtab = (ElfW(Sym) *) dyn->d_un.d_ptr;
-+					symtab = (ElfW(Sym) *)(base + dyn->d_un.d_ptr);
-					break;
-			}
-			dyn ++;
diff --git a/srcpkgs/mumble/patches/protobuf-370.patch b/srcpkgs/mumble/patches/protobuf-370.patch
deleted file mode 100644
index f3f650f16a4..00000000000
--- a/srcpkgs/mumble/patches/protobuf-370.patch
+++ /dev/null
@@ -1,758 +0,0 @@
-diff --git src/mumble/ACLEditor.cpp src/mumble/ACLEditor.cpp
-index c938ffc..bf321e7 100644
---- src/mumble/ACLEditor.cpp
-+++ src/mumble/ACLEditor.cpp
-@@ -37,11 +37,12 @@
- #include "Channel.h"
- #include "ClientUser.h"
- #include "Database.h"
--#include "Global.h"
- #include "Log.h"
- #include "ServerHandler.h"
- #include "User.h"
- 
-+#include "Global.h"
-+
- ACLGroup::ACLGroup(const QString &name) : Group(NULL, name) {
- 	bInherited = false;
- }
-diff --git src/mumble/About.cpp src/mumble/About.cpp
-index 4d2cf15..96db27a 100644
---- src/mumble/About.cpp
-+++ src/mumble/About.cpp
-@@ -32,10 +32,11 @@
- 
- #include "About.h"
- 
--#include "Global.h"
- #include "MainWindow.h"
- #include "licenses.h"
- 
-+#include "Global.h"
-+
- AboutDialog::AboutDialog(QWidget *p) : QDialog(p) {
- 	setWindowTitle(tr("About Mumble"));
- 
-diff --git src/mumble/AudioOutput.cpp src/mumble/AudioOutput.cpp
-index 0695488..a9a849d 100644
---- src/mumble/AudioOutput.cpp
-+++ src/mumble/AudioOutput.cpp
-@@ -37,13 +37,14 @@
- #include "AudioOutputSample.h"
- #include "AudioOutputSpeech.h"
- #include "User.h"
--#include "Global.h"
- #include "Message.h"
- #include "Plugins.h"
- #include "PacketDataStream.h"
- #include "ServerHandler.h"
- #include "VoiceRecorder.h"
- 
-+#include "Global.h"
-+
- // Remember that we cannot use static member classes that are not pointers, as the constructor
- // for AudioOutputRegistrar() might be called before they are initialized, as the constructor
- // is called from global initialization.
-diff --git src/mumble/AudioWizard.cpp src/mumble/AudioWizard.cpp
-index 511fd9b..25f7a33 100644
---- src/mumble/AudioWizard.cpp
-+++ src/mumble/AudioWizard.cpp
-@@ -34,10 +34,11 @@
- 
- #include "AudioInput.h"
- #include "AudioOutputSample.h"
--#include "Global.h"
- #include "Log.h"
- #include "MainWindow.h"
- 
-+#include "Global.h"
-+
- CompletablePage::CompletablePage(QWizard *p) : QWizardPage(p) {
- 	bComplete = true;
- }
-diff --git src/mumble/BanEditor.cpp src/mumble/BanEditor.cpp
-index 36dad74..2b222ed 100644
---- src/mumble/BanEditor.cpp
-+++ src/mumble/BanEditor.cpp
-@@ -33,10 +33,11 @@
- #include "BanEditor.h"
- 
- #include "Channel.h"
--#include "Global.h"
- #include "Net.h"
- #include "ServerHandler.h"
- 
-+#include "Global.h"
-+
- BanEditor::BanEditor(const MumbleProto::BanList &msg, QWidget *p) : QDialog(p) {
- 	setupUi(this);
- 
-diff --git src/mumble/ConnectDialog.cpp src/mumble/ConnectDialog.cpp
-index 17d57e8..d6d87aa 100644
---- src/mumble/ConnectDialog.cpp
-+++ src/mumble/ConnectDialog.cpp
-@@ -40,10 +40,11 @@
- 
- #include "Channel.h"
- #include "Database.h"
--#include "Global.h"
- #include "ServerHandler.h"
- #include "WebFetch.h"
- 
-+#include "Global.h"
-+
- QMap<QString, QIcon> ServerItem::qmIcons;
- QList<PublicInfo> ConnectDialog::qlPublicServers;
- QString ConnectDialog::qsUserCountry, ConnectDialog::qsUserCountryCode, ConnectDialog::qsUserContinentCode;
-diff --git src/mumble/CustomElements.cpp src/mumble/CustomElements.cpp
-index b43f215..9a11524 100644
---- src/mumble/CustomElements.cpp
-+++ src/mumble/CustomElements.cpp
-@@ -34,10 +34,10 @@
- #include "CustomElements.h"
- 
- #include "ClientUser.h"
--#include "Global.h"
- #include "MainWindow.h"
- #include "Log.h"
- 
-+#include "Global.h"
- 
- LogTextBrowser::LogTextBrowser(QWidget *p)
- 	: m_pos(0)
-diff --git src/mumble/DBus.cpp src/mumble/DBus.cpp
-index 1704395..3342f11 100644
---- src/mumble/DBus.cpp
-+++ src/mumble/DBus.cpp
-@@ -34,10 +34,10 @@
- 
- #include "Channel.h"
- #include "ClientUser.h"
--#include "Global.h"
- #include "MainWindow.h"
- #include "ServerHandler.h"
- 
-+#include "Global.h"
- 
- MumbleDBus::MumbleDBus(QObject *mw) : QDBusAbstractAdaptor(mw) {
- }
-diff --git src/mumble/GlobalShortcut.cpp src/mumble/GlobalShortcut.cpp
-index d35cf91..503a26c 100644
---- src/mumble/GlobalShortcut.cpp
-+++ src/mumble/GlobalShortcut.cpp
-@@ -36,9 +36,10 @@
- #include "ClientUser.h"
- #include "Channel.h"
- #include "Database.h"
--#include "Global.h"
- #include "MainWindow.h"
- 
-+#include "Global.h"
-+
- /*!
-   \class ShortcutKeyWidget
-   Widget used to define and key combination for a shortcut. Once it gains
-diff --git src/mumble/LCD.cpp src/mumble/LCD.cpp
-index e83f692..1435a1a 100644
---- src/mumble/LCD.cpp
-+++ src/mumble/LCD.cpp
-@@ -35,10 +35,11 @@
- 
- #include "ClientUser.h"
- #include "Channel.h"
--#include "Global.h"
- #include "Message.h"
- #include "ServerHandler.h"
- 
-+#include "Global.h"
-+
- QList<LCDEngineNew> *LCDEngineRegistrar::qlInitializers;
- 
- LCDEngineRegistrar::LCDEngineRegistrar(LCDEngineNew cons) {
-diff --git src/mumble/Log.cpp src/mumble/Log.cpp
-index 093f0b3..c6bdbd2 100644
---- src/mumble/Log.cpp
-+++ src/mumble/Log.cpp
-@@ -36,13 +36,14 @@
- #include "AudioOutput.h"
- #include "AudioOutputSample.h"
- #include "Channel.h"
--#include "Global.h"
- #include "MainWindow.h"
- #include "NetworkConfig.h"
- #include "RichTextEditor.h"
- #include "ServerHandler.h"
- #include "TextToSpeech.h"
- 
-+#include "Global.h"
-+
- static ConfigWidget *LogConfigDialogNew(Settings &st) {
- 	return new LogConfig(st);
- }
-diff --git src/mumble/Log_unix.cpp src/mumble/Log_unix.cpp
-index 0a18928..c64f3bf 100644
---- src/mumble/Log_unix.cpp
-+++ src/mumble/Log_unix.cpp
-@@ -32,10 +32,11 @@
- #include "mumble_pch.hpp"
- 
- #include "Log.h"
--#include "Global.h"
- #include "MainWindow.h"
- #include "Settings.h"
- 
-+#include "Global.h"
-+
- void Log::postNotification(MsgType mt, const QString &console, const QString &plain) {
- 	// Message notification with balloon tooltips
- 	QString qsIcon;
-@@ -92,4 +93,4 @@ void Log::postNotification(MsgType mt, const QString &console, const QString &pl
- #endif
- 		postQtNotification(mt, plain);
- 	}
--}
-\ No newline at end of file
-+}
-diff --git src/mumble/LookConfig.cpp src/mumble/LookConfig.cpp
-index 5d30a2d..cddd914 100644
---- src/mumble/LookConfig.cpp
-+++ src/mumble/LookConfig.cpp
-@@ -35,9 +35,10 @@
- 
- #include "AudioInput.h"
- #include "AudioOutput.h"
--#include "Global.h"
- #include "MainWindow.h"
- 
-+#include "Global.h"
-+
- static ConfigWidget *LookConfigNew(Settings &st) {
- 	return new LookConfig(st);
- }
-diff --git src/mumble/MainWindow.cpp src/mumble/MainWindow.cpp
-index eaa4573..65ab1bd 100644
---- src/mumble/MainWindow.cpp
-+++ src/mumble/MainWindow.cpp
-@@ -46,7 +46,6 @@
- #include "Connection.h"
- #include "ConnectDialog.h"
- #include "Database.h"
--#include "Global.h"
- #include "GlobalShortcut.h"
- #include "Log.h"
- #include "Net.h"
-@@ -75,6 +74,8 @@
- #include "ConfigDialog_macx.h"
- #endif
- 
-+#include "Global.h"
-+
- /*!
-   \fn void MainWindow::findDesiredChannel()
-   This function tries to join a desired channel on connect. It gets called
-diff --git src/mumble/Messages.cpp src/mumble/Messages.cpp
-index a9109bd..77d6a58 100644
---- src/mumble/Messages.cpp
-+++ src/mumble/Messages.cpp
-@@ -41,7 +41,6 @@
- #include "Connection.h"
- #include "ConnectDialog.h"
- #include "Database.h"
--#include "Global.h"
- #include "GlobalShortcut.h"
- #include "Log.h"
- #include "MainWindow.h"
-@@ -55,6 +54,8 @@
- #include "VersionCheck.h"
- #include "ViewCert.h"
- 
-+#include "Global.h"
-+
- #define ACTOR_INIT \
- 	ClientUser *pSrc=NULL; \
- 	if (msg.has_actor()) \
-diff --git src/mumble/NetworkConfig.cpp src/mumble/NetworkConfig.cpp
-index 5556e66..0cf14ac 100644
---- src/mumble/NetworkConfig.cpp
-+++ src/mumble/NetworkConfig.cpp
-@@ -34,10 +34,11 @@
- 
- #include "NetworkConfig.h"
- 
--#include "Global.h"
- #include "MainWindow.h"
- #include "OSInfo.h"
- 
-+#include "Global.h"
-+
- static ConfigWidget *NetworkConfigNew(Settings &st) {
- 	return new NetworkConfig(st);
- }
-diff --git src/mumble/OSS.cpp src/mumble/OSS.cpp
-index 4af1326..2611d8c 100644
---- src/mumble/OSS.cpp
-+++ src/mumble/OSS.cpp
-@@ -38,9 +38,10 @@
- #include <sys/ioctl.h>
- 
- #include "User.h"
--#include "Global.h"
- #include "MainWindow.h"
- 
-+#include "Global.h"
-+
- #define NBLOCKS 8
- 
- class OSSEnumerator {
-diff --git src/mumble/Overlay.cpp src/mumble/Overlay.cpp
-index 619dd2f..d6f2b79 100644
---- src/mumble/Overlay.cpp
-+++ src/mumble/Overlay.cpp
-@@ -35,7 +35,6 @@
- #include "Channel.h"
- #include "ClientUser.h"
- #include "Database.h"
--#include "Global.h"
- #include "GlobalShortcut.h"
- #include "MainWindow.h"
- #include "Message.h"
-@@ -45,6 +44,8 @@
- #include "User.h"
- #include "WebFetch.h"
- 
-+#include "Global.h"
-+
- OverlayAppInfo::OverlayAppInfo(QString name, QIcon icon) {
- 	qsDisplayName = name;
- 	qiIcon = icon;
-diff --git src/mumble/OverlayClient.cpp src/mumble/OverlayClient.cpp
-index c3c408d..82412d1 100644
---- src/mumble/OverlayClient.cpp
-+++ src/mumble/OverlayClient.cpp
-@@ -34,7 +34,6 @@
- #include "OverlayText.h"
- #include "User.h"
- #include "Channel.h"
--#include "Global.h"
- #include "Message.h"
- #include "Database.h"
- #include "NetworkConfig.h"
-@@ -42,6 +41,8 @@
- #include "MainWindow.h"
- #include "GlobalShortcut.h"
- 
-+#include "Global.h"
-+
- OverlayClient::OverlayClient(QLocalSocket *socket, QObject *p) :
- 		QObject(p),
- 		ougUsers(&g.s.os) {
-diff --git src/mumble/OverlayConfig.cpp src/mumble/OverlayConfig.cpp
-index 9a45da3..d1f6ea4 100644
---- src/mumble/OverlayConfig.cpp
-+++ src/mumble/OverlayConfig.cpp
-@@ -34,7 +34,6 @@
- #include "OverlayText.h"
- #include "User.h"
- #include "Channel.h"
--#include "Global.h"
- #include "Message.h"
- #include "Database.h"
- #include "NetworkConfig.h"
-@@ -42,6 +41,8 @@
- #include "MainWindow.h"
- #include "GlobalShortcut.h"
- 
-+#include "Global.h"
-+
- static ConfigWidget *OverlayConfigDialogNew(Settings &st) {
- 	return new OverlayConfig(st);
- }
-diff --git src/mumble/OverlayEditor.cpp src/mumble/OverlayEditor.cpp
-index 0263c1f..2d4dc2c 100644
---- src/mumble/OverlayEditor.cpp
-+++ src/mumble/OverlayEditor.cpp
-@@ -34,7 +34,6 @@
- #include "OverlayText.h"
- #include "User.h"
- #include "Channel.h"
--#include "Global.h"
- #include "Message.h"
- #include "Database.h"
- #include "NetworkConfig.h"
-@@ -42,6 +41,8 @@
- #include "MainWindow.h"
- #include "GlobalShortcut.h"
- 
-+#include "Global.h"
-+
- OverlayEditor::OverlayEditor(QWidget *p, QGraphicsItem *qgi, OverlaySettings *osptr) :
- 		QDialog(p),
- 		qgiPromote(qgi),
-diff --git src/mumble/OverlayEditorScene.cpp src/mumble/OverlayEditorScene.cpp
-index 95fe347..a2abb1a 100644
---- src/mumble/OverlayEditorScene.cpp
-+++ src/mumble/OverlayEditorScene.cpp
-@@ -34,7 +34,6 @@
- #include "OverlayText.h"
- #include "User.h"
- #include "Channel.h"
--#include "Global.h"
- #include "Message.h"
- #include "Database.h"
- #include "NetworkConfig.h"
-@@ -42,6 +41,8 @@
- #include "MainWindow.h"
- #include "GlobalShortcut.h"
- 
-+#include "Global.h"
-+
- OverlayEditorScene::OverlayEditorScene(const OverlaySettings &srcos, QObject *p) : QGraphicsScene(p), os(srcos) {
- 	tsColor = Settings::Talking;
- 	uiZoom = 2;
-diff --git src/mumble/OverlayUser.cpp src/mumble/OverlayUser.cpp
-index 979af17..5a4a4b9 100644
---- src/mumble/OverlayUser.cpp
-+++ src/mumble/OverlayUser.cpp
-@@ -35,7 +35,6 @@
- #include "User.h"
- #include "Channel.h"
- #include "ClientUser.h"
--#include "Global.h"
- #include "Message.h"
- #include "Database.h"
- #include "NetworkConfig.h"
-@@ -43,6 +42,8 @@
- #include "MainWindow.h"
- #include "GlobalShortcut.h"
- 
-+#include "Global.h"
-+
- OverlayUser::OverlayUser(ClientUser *cu, unsigned int height, OverlaySettings *osptr) : OverlayGroup(), os(osptr), uiSize(height), cuUser(cu), tsColor(Settings::Passive) {
- 	setup();
- 	updateLayout();
-diff --git src/mumble/OverlayUserGroup.cpp src/mumble/OverlayUserGroup.cpp
-index f8831d5..f12a113 100644
---- src/mumble/OverlayUserGroup.cpp
-+++ src/mumble/OverlayUserGroup.cpp
-@@ -35,7 +35,6 @@
- #include "User.h"
- #include "Channel.h"
- #include "ClientUser.h"
--#include "Global.h"
- #include "Message.h"
- #include "Database.h"
- #include "NetworkConfig.h"
-@@ -43,6 +42,8 @@
- #include "MainWindow.h"
- #include "GlobalShortcut.h"
- 
-+#include "Global.h"
-+
- template <typename T>
- QRectF OverlayGroup::boundingRect() const {
- 	QRectF qr;
-diff --git src/mumble/Overlay_macx.mm src/mumble/Overlay_macx.mm
-index dd2a82f..925a9be 100644
---- src/mumble/Overlay_macx.mm
-+++ src/mumble/Overlay_macx.mm
-@@ -33,9 +33,10 @@
- #import <ScriptingBridge/ScriptingBridge.h>
- #include <Carbon/Carbon.h>
- #include "Overlay.h"
--#include "Global.h"
- #include "MainWindow.h"
- 
-+#include "Global.h"
-+
- extern "C" {
- #include <xar/xar.h>
- }
-diff --git src/mumble/Plugins.cpp src/mumble/Plugins.cpp
-index 82b3ec6..568b9e7 100644
---- src/mumble/Plugins.cpp
-+++ src/mumble/Plugins.cpp
-@@ -32,7 +32,6 @@
- 
- #include "Plugins.h"
- 
--#include "Global.h"
- #include "Log.h"
- #include "MainWindow.h"
- #include "Message.h"
-@@ -40,6 +39,8 @@
- #include "../../plugins/mumble_plugin.h"
- #include "WebFetch.h"
- 
-+#include "Global.h"
-+
- static ConfigWidget *PluginConfigDialogNew(Settings &st) {
- 	return new PluginConfig(st);
- }
-diff --git src/mumble/PulseAudio.cpp src/mumble/PulseAudio.cpp
-index b1ea1c1..9c32207 100644
---- src/mumble/PulseAudio.cpp
-+++ src/mumble/PulseAudio.cpp
-@@ -37,11 +37,11 @@
- #include <errno.h>
- #include <sys/ioctl.h>
- 
--#include "Global.h"
- #include "MainWindow.h"
- #include "Timer.h"
- #include "User.h"
- 
-+#include "Global.h"
- 
- static const char *mumble_sink_input = "Mumble Speakers";
- static const char *mumble_echo = "Mumble Speakers (Echo)";
-diff --git src/mumble/RichTextEditor.cpp src/mumble/RichTextEditor.cpp
-index ca4baa6..4c7f545 100644
---- src/mumble/RichTextEditor.cpp
-+++ src/mumble/RichTextEditor.cpp
-@@ -32,10 +32,11 @@
- 
- #include "RichTextEditor.h"
- 
--#include "Global.h"
- #include "Log.h"
- #include "MainWindow.h"
- 
-+#include "Global.h"
-+
- RichTextHtmlEdit::RichTextHtmlEdit(QWidget *p) : QTextEdit(p) {
- 	m_document = new LogDocument(this);
- 	setDocument(m_document);
-diff --git src/mumble/ServerHandler.cpp src/mumble/ServerHandler.cpp
-index 60125c9..a7dfffc 100644
---- src/mumble/ServerHandler.cpp
-+++ src/mumble/ServerHandler.cpp
-@@ -37,7 +37,6 @@
- #include "Cert.h"
- #include "Connection.h"
- #include "Database.h"
--#include "Global.h"
- #include "MainWindow.h"
- #include "Message.h"
- #include "NetworkConfig.h"
-@@ -47,6 +46,8 @@
- #include "SSL.h"
- #include "User.h"
- 
-+#include "Global.h"
-+
- ServerHandlerMessageEvent::ServerHandlerMessageEvent(const QByteArray &msg, unsigned int mtype, bool flush) : QEvent(static_cast<QEvent::Type>(SERVERSEND_EVENT)) {
- 	qbaMsg = msg;
- 	uiType = mtype;
-diff --git src/mumble/SocketRPC.cpp src/mumble/SocketRPC.cpp
-index 928299a..d087e53 100644
---- src/mumble/SocketRPC.cpp
-+++ src/mumble/SocketRPC.cpp
-@@ -34,10 +34,11 @@
- 
- #include "Channel.h"
- #include "ClientUser.h"
--#include "Global.h"
- #include "MainWindow.h"
- #include "ServerHandler.h"
- 
-+#include "Global.h"
-+
- SocketRPCClient::SocketRPCClient(QLocalSocket *s, QObject *p) : QObject(p), qlsSocket(s), qbBuffer(NULL) {
- 	qlsSocket->setParent(this);
- 
-diff --git src/mumble/Tokens.cpp src/mumble/Tokens.cpp
-index 777ffc3..6446215 100644
---- src/mumble/Tokens.cpp
-+++ src/mumble/Tokens.cpp
-@@ -33,9 +33,10 @@
- #include "Tokens.h"
- 
- #include "Database.h"
--#include "Global.h"
- #include "ServerHandler.h"
- 
-+#include "Global.h"
-+
- Tokens::Tokens(QWidget *p) : QDialog(p) {
- 	setupUi(this);
- 
-diff --git src/mumble/UserEdit.cpp src/mumble/UserEdit.cpp
-index 9d7f456..4490047 100644
---- src/mumble/UserEdit.cpp
-+++ src/mumble/UserEdit.cpp
-@@ -32,10 +32,11 @@
- 
- #include "UserEdit.h"
- 
--#include "Global.h"
- #include "ServerHandler.h"
- #include "User.h"
- 
-+#include "Global.h"
-+
- UserEdit::UserEdit(const MumbleProto::UserList &msg, QWidget *p) : QDialog(p) {
- 	setupUi(this);
- 
-diff --git src/mumble/UserInformation.cpp src/mumble/UserInformation.cpp
-index 6da8b80..41ba46c 100644
---- src/mumble/UserInformation.cpp
-+++ src/mumble/UserInformation.cpp
-@@ -34,11 +34,12 @@
- 
- #include "Audio.h"
- #include "CELTCodec.h"
--#include "Global.h"
- #include "Net.h"
- #include "ServerHandler.h"
- #include "ViewCert.h"
- 
-+#include "Global.h"
-+
- static QString decode_utf8_qssl_string(const QString &input) {
- 	QString i = input;
- 	return QUrl::fromPercentEncoding(i.replace(QLatin1String("\\x"), QLatin1String("%")).toLatin1());
-diff --git src/mumble/UserModel.cpp src/mumble/UserModel.cpp
-index a702e9d..1393317 100644
---- src/mumble/UserModel.cpp
-+++ src/mumble/UserModel.cpp
-@@ -36,7 +36,6 @@
- #include "ClientUser.h"
- #include "Channel.h"
- #include "Database.h"
--#include "Global.h"
- #include "LCD.h"
- #include "Log.h"
- #include "MainWindow.h"
-@@ -46,6 +45,8 @@
- #include "Usage.h"
- #include "User.h"
- 
-+#include "Global.h"
-+
- QHash <Channel *, ModelItem *> ModelItem::c_qhChannels;
- QHash <ClientUser *, ModelItem *> ModelItem::c_qhUsers;
- bool ModelItem::bUsersTop = false;
-diff --git src/mumble/UserView.cpp src/mumble/UserView.cpp
-index c462bf6..738a7a9 100644
---- src/mumble/UserView.cpp
-+++ src/mumble/UserView.cpp
-@@ -35,11 +35,12 @@
- #include "Channel.h"
- #include "ClientUser.h"
- #include "Log.h"
--#include "Global.h"
- #include "MainWindow.h"
- #include "ServerHandler.h"
- #include "UserModel.h"
- 
-+#include "Global.h"
-+
- /*!
-   \fn bool UserView::event(QEvent *evt)
-   This implementation contains a special handler to display
-diff --git src/mumble/VersionCheck.cpp src/mumble/VersionCheck.cpp
-index e60a17a..58b3418 100644
---- src/mumble/VersionCheck.cpp
-+++ src/mumble/VersionCheck.cpp
-@@ -32,10 +32,11 @@
- 
- #include "VersionCheck.h"
- 
--#include "Global.h"
- #include "MainWindow.h"
- #include "WebFetch.h"
- 
-+#include "Global.h"
-+
- VersionCheck::VersionCheck(bool autocheck, QObject *p, bool focus) : QObject(p) {
- 	bSilent = autocheck;
- 
-diff --git src/mumble/VoiceRecorder.cpp src/mumble/VoiceRecorder.cpp
-index 996b32c..0a9003b 100644
---- src/mumble/VoiceRecorder.cpp
-+++ src/mumble/VoiceRecorder.cpp
-@@ -36,11 +36,12 @@
- 
- #include "AudioOutput.h"
- #include "ClientUser.h"
--#include "Global.h"
- #include "ServerHandler.h"
- 
- #include "../Timer.h"
- 
-+#include "Global.h"
-+
- VoiceRecorder::RecordBuffer::RecordBuffer(const ClientUser *cu,
-         boost::shared_array<float> buffer, int samples, quint64 timestamp) :
- 		cuUser(cu), fBuffer(buffer), iSamples(samples), uiTimestamp(timestamp) {
-diff --git src/mumble/VoiceRecorderDialog.cpp src/mumble/VoiceRecorderDialog.cpp
-index ecede42..045bd25 100644
---- src/mumble/VoiceRecorderDialog.cpp
-+++ src/mumble/VoiceRecorderDialog.cpp
-@@ -34,10 +34,11 @@
- #include "VoiceRecorderDialog.h"
- 
- #include "AudioOutput.h"
--#include "Global.h"
- #include "ServerHandler.h"
- #include "VoiceRecorder.h"
- 
-+#include "Global.h"
-+
- VoiceRecorderDialog::VoiceRecorderDialog(QWidget *p) : QDialog(p), qtTimer(new QTimer(this)) {
- 	qtTimer->setObjectName(QLatin1String("qtTimer"));
- 	qtTimer->setInterval(200);
-diff --git src/mumble/WASAPI.cpp src/mumble/WASAPI.cpp
-index 0e46871..abd59e7 100644
---- src/mumble/WASAPI.cpp
-+++ src/mumble/WASAPI.cpp
-@@ -32,10 +32,10 @@
- 
- #include "WASAPI.h"
- #include "WASAPINotificationClient.h"
--#include "Global.h"
- #include "Timer.h"
- #include "User.h"
- 
-+#include "Global.h"
- 
- // Now that Win7 is published, which includes public versions of these
- // interfaces, we simply inherit from those but use the "old" IIDs.
-diff --git src/mumble/WASAPINotificationClient.cpp src/mumble/WASAPINotificationClient.cpp
-index 4588778..a64ee71 100644
---- src/mumble/WASAPINotificationClient.cpp
-+++ src/mumble/WASAPINotificationClient.cpp
-@@ -29,13 +29,14 @@
- */
- 
- #include <initguid.h>
--#include <Global.h>
- #include <QMutexLocker>
- #include "MainWindow.h"
- #include <boost/thread/once.hpp>
- 
- #include "WASAPINotificationClient.h"
- 
-+#include <Global.h>
-+
- HRESULT STDMETHODCALLTYPE WASAPINotificationClient::OnDefaultDeviceChanged(EDataFlow flow, ERole role, LPCWSTR pwstrDefaultDevice) {
- 	const QString device = QString::fromWCharArray(pwstrDefaultDevice);
- 
-diff --git src/mumble/os_macx.mm src/mumble/os_macx.mm
-index aa3c2f4..428fa45 100644
---- src/mumble/os_macx.mm
-+++ src/mumble/os_macx.mm
-@@ -30,10 +30,11 @@
- */
- 
- #include "mumble_pch.hpp"
--#include "Global.h"
- #include "Overlay.h"
- #include "MainWindow.h"
- 
-+#include "Global.h"
-+
- char *os_lang = NULL;
- static FILE *fConsole = NULL;
- 
-
diff --git a/srcpkgs/mumble/patches/speech-dispatcher.patch b/srcpkgs/mumble/patches/speech-dispatcher.patch
deleted file mode 100644
index 7632c4d5416..00000000000
--- a/srcpkgs/mumble/patches/speech-dispatcher.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/mumble/TextToSpeech_unix.cpp.orig       2017-02-14 16:33:58.775742063 +0100
-+++ src/mumble/TextToSpeech_unix.cpp    2017-02-14 16:34:22.172484062 +0100
-@@ -33,7 +33,7 @@
- #include "TextToSpeech.h"
- 
- #ifdef USE_SPEECHD
--#include <libspeechd.h>
-+#include <speech-dispatcher/libspeechd.h>
- #endif
- 
- #include "Global.h"
diff --git a/srcpkgs/mumble/patches/std-float.patch b/srcpkgs/mumble/patches/std-float.patch
deleted file mode 100644
index 50199c9847d..00000000000
--- a/srcpkgs/mumble/patches/std-float.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/mumble/AudioOutput.cpp.orig    2018-10-29 00:43:02.953895662 +0100
-+++ src/mumble/AudioOutput.cpp 2018-10-29 00:43:49.407481605 +0100
-@@ -431,7 +431,7 @@
-                                        top[2] = 0.0f;
-                                }
-
--                               if (std::abs<float>(front[0] * top[0] + front[1] * top[1] + front[2] * top[2]) > 0.01f) {
-+                               if (std::abs(front[0] * top[0] + front[1] * top[1] + front[2] * top[2]) > 0.01f) {
-                                        // Not perpendicular. Assume Y up and rotate 90 degrees.
-
-                                        float azimuth = 0.0f;
diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index 14cda6dc360..31305a5601e 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -1,48 +1,26 @@
 # Template file for 'mumble'
 pkgname=mumble
-version=1.2.19
-revision=16
-hostmakedepends="Ice pkg-config protobuf qt-host-tools qt-qmake"
+version=1.3.0
+revision=1
+build_style=qmake
+configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update
+ CONFIG+=no-bundled-speex CONFIG+=no-g15 CONFIG+=no-xevie CONFIG+=pulseaudio
+ CONFIG+=no-embed-qt-translations CONFIG+=no-oss"
+hostmakedepends="Ice pkg-config protobuf qt5-host-tools qt5-qmake python3"
 makedepends="Ice-devel MesaLib-devel avahi-compat-libs-devel boost-devel
  libcap-devel libressl-devel libsndfile-devel opus-devel protobuf-devel
- pulseaudio-devel qt-devel speech-dispatcher-devel speex-devel"
-depends="desktop-file-utils qt-plugin-sqlite"
+ pulseaudio-devel qt5-devel qt5-svg-devel speech-dispatcher-devel speex-devel"
+depends="desktop-file-utils qt5-plugin-sqlite"
 short_desc="Open source, low-latency, high quality voice chat for gaming"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="BSD-3-Clause"
 homepage="http://mumble.sourceforge.net/"
 distfiles="https://github.com/mumble-voip/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.gz"
-checksum=f047fb707ad93948b0bc913ec0a89cd5480d87e840c4ff2519608fc8a2dac0e8
+checksum=9a8de2547344962a81c00c37b5d8bd5a371bb685fa36cf03a3f134e37c79b80d
 
-CXXFLAGS="-std=c++11"
-
-do_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		for i in ${XBPS_CROSS_BASE}/usr/include/Qt*; do
-			CXXFLAGS+=" -I$i"
-		done
-	fi
-	# Needs bundled celt for some reason
-	qmake-qt4 -recursive main.pro \
-		CONFIG+="bundled-celt no-bundled-opus no-update no-bundled-speex no-g15 \
-			no-xevie pulseaudio no-embed-qt-translations" \
-		DEFINES+="PLUGIN_PATH=/usr/lib/mumble" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" \
-		PREFIX=/usr \
-		LIB=/usr/lib \
-		QMAKE_CC=$CC QMAKE_CXX=$CXX QMAKE_LINK=$CXX \
-		QMAKE_CFLAGS="${CFLAGS}" \
-		QMAKE_CXXFLAGS="${CXXFLAGS}" \
-		QMAKE_LFLAGS="${LDFLAGS}"
-	# qmake-qt4 ignores CXXFLAGS and LDFLAGS thus patch the Makefiles
-	sed -i */Makefile* */*/Makefile* \
-		-e "s;^\(LFLAGS.*=.*\);& $LDFLAGS;" \
-		-e "s;^\(CXXFLAGS.*=.*\);& $CXXFLAGS;"
-}
-
-do_build() {
-	make ${makejobs} release \
-		CC="$CC" CXX="$CXX" LINK="$CXX"
-}
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt5-svg-devel"
+fi
 
 do_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index acfbe2bbf89..15831775950 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,6 +1,6 @@
 # Template file for 'musikcube'
 pkgname=musikcube
-version=0.65.0
+version=0.65.1
 revision=1
 build_style=cmake
 configure_args="-DNO_NCURSESW=1 -DENABLE_SNDIO=true"
@@ -13,7 +13,7 @@ maintainer="eater <=@eater.me>"
 license="BSD-3-Clause"
 homepage="https://musikcube.com/"
 distfiles="https://github.com/clangen/musikcube/archive/${version}.tar.gz"
-checksum=2c86400eeee38ecb9642e93cf043408c651466bf5859d70d831d27a962ac7006
+checksum=e847bd71d3852e83a50b6b0a796e88386f61f09f3fb6379c866616edba4c8b72
 
 case "${XBPS_TARGET_MACHINE}" in
 	armv[56]*|ppc|ppc-musl)
diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template
index 370aebd1d47..320e7be9d6a 100644
--- a/srcpkgs/mutt/template
+++ b/srcpkgs/mutt/template
@@ -1,7 +1,7 @@
 # Template file for 'mutt'
 pkgname=mutt
-version=1.12.1
-revision=2
+version=1.12.2
+revision=1
 build_style=gnu-configure
 configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
  --enable-gpgme --with-regex --with-idn2 --with-ssl --with-sasl --enable-sidebar
@@ -11,14 +11,14 @@ conf_files="/etc/${pkgname}/Muttrc"
 hostmakedepends="libidn2-devel perl pkg-config"
 makedepends="gdbm-devel gpgme-devel libidn2-devel libressl-devel libsasl-devel
  ncurses-devel"
-depends="mime-types"
+depends="cyrus-sasl-modules mime-types"
 short_desc="Mutt Mail Client"
 maintainer="Jan S. <jan.schreib@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://www.mutt.org"
 changelog="http://mutt.org/relnotes/1.12"
 distfiles="http://ftp.mutt.org/pub/mutt/${pkgname}-${version}.tar.gz"
-checksum=01c565406ec4ffa85db90b45ece2260b25fac3646cc063bbc20a242c6ed4210c
+checksum=bc42750ce8237742b9382f2148fc547a8d8601aa4a7cd28c55fe7ca045196882
 
 pre_build() {
 	make CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS -fPIC" CPPFLAGS= mutt_md5
diff --git a/srcpkgs/mutter/patches/meta-renderer-x11.patch b/srcpkgs/mutter/patches/meta-renderer-x11.patch
deleted file mode 100644
index 55df265e33d..00000000000
--- a/srcpkgs/mutter/patches/meta-renderer-x11.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/backends/x11/meta-renderer-x11.c	2019-03-11 16:01:02.000000000 -0700
-+++ src/backends/x11/meta-renderer-x11.c	2019-03-11 23:44:53.274968331 -0700
-@@ -85,14 +85,6 @@
-   cogl_xlib_renderer_set_foreign_display (cogl_renderer, xdisplay);
-   cogl_xlib_renderer_request_reset_on_video_memory_purge (cogl_renderer, TRUE);
- 
--  /* Set up things so that if the INTEL_swap_event extension is not present,
--   * but the driver is known to have good thread support, we use an extra
--   * thread and call glXWaitVideoSync() in the thread. This allows idles
--   * to work properly, even when Mutter is constantly redrawing new frames;
--   * otherwise, without INTEL_swap_event, we'll just block in glXSwapBuffers().
--   */
--  cogl_xlib_renderer_set_threaded_swap_wait_enabled (cogl_renderer, TRUE);
--
-   return cogl_renderer;
- }
- 
diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index d33535d2bcb..5c792515f2b 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,11 +1,11 @@
 # Template file for 'mutter'
 pkgname=mutter
-version=3.32.2
-revision=1
+version=3.34.1
+revision=2
 build_helper="gir"
 build_style=meson
 configure_args="-Degl_device=true -Dudev=true -Dnative_backend=true
- -Dintrospection=true -Dxwayland_path=/usr/bin/Xwayland"
+ -Dprofiler=false -Dintrospection=true -Dxwayland_path=/usr/bin/Xwayland"
 hostmakedepends="glib-devel pkg-config zenity wayland-devel xorg-server"
 makedepends="elogind-devel glib-devel gnome-desktop-devel json-glib-devel
  libglib-devel libSM-devel libXtst-devel libcanberra-devel libinput-devel
@@ -17,9 +17,9 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/Mutter/"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6ab3ec487228d3e6a12aa5eda719608c7d6bd8960184278377b79dab443ca7c0
-shlib_provides="libmutter-clutter-4.so libmutter-cogl-4.so
- libmutter-cogl-gles2-4.so libmutter-cogl-pango-4.so libmutter-cogl-path-4.so"
+checksum=ba1826cf88bdb81e63943cac014a8e8bcf35ec178c53264401f9c72fdeab758e
+shlib_provides="libmutter-clutter-5.so libmutter-cogl-5.so
+ libmutter-cogl-pango-5.so libmutter-cogl-path-5.so"
 
 mutter-devel_package() {
 	depends="gsettings-desktop-schemas gtk+3-devel clutter-devel libX11-devel
@@ -28,7 +28,7 @@ mutter-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		vmove "usr/lib/mutter-4/*.gir"
+		vmove "usr/lib/mutter-5/*.gir"
 		vmove "usr/lib/*.so"
 	}
 }
diff --git a/srcpkgs/mymcplus/template b/srcpkgs/mymcplus/template
new file mode 100644
index 00000000000..369ac8048ed
--- /dev/null
+++ b/srcpkgs/mymcplus/template
@@ -0,0 +1,15 @@
+# Template file for 'mymcplus'
+pkgname=mymcplus
+version=3.0.2
+revision=1
+archs=noarch
+build_style=python3-module
+pycompile_module="mymcplus"
+hostmakedepends="python3-setuptools"
+depends="wxPython4 python3-PyOpenGL"
+short_desc="PlayStation 2 memory card manager"
+maintainer="Andrew Benson <abenson+void@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/thestr4ng3r/mymcplus"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=a08fbfeb46c17affb1ea48e6234bfdac2b4de0f892a89e0ee73e6edc1a3b9275
diff --git a/srcpkgs/mysql++/template b/srcpkgs/mysql++/template
index 8904aa9924f..ddd35bf816d 100644
--- a/srcpkgs/mysql++/template
+++ b/srcpkgs/mysql++/template
@@ -1,25 +1,21 @@
 # Template file for 'mysql++'
 pkgname=mysql++
-version=3.2.4
+version=3.2.5
 revision=1
 build_style=gnu-configure
 make_install_target="install_mysqlpp"
 makedepends="libmariadbclient-devel"
 short_desc="C++ wrapper for MySQLs C API"
 maintainer="DirectorX <void.directorx@protonmail.com>"
-license="LGPL-2.1-or-later, Custom"
+license="LGPL-2.1-or-later"
 homepage="https://tangentsoft.net/mysqlpp"
 distfiles="${homepage}/releases/${pkgname}-${version}.tar.gz"
-checksum=6b60727b36b1fed78e0c935d6510b31821c71ec0076967cd9fa5ecf4320d7d63
+checksum=b780beeb3a9cd9ce6a9043028527484df8e822c58c5274d4d67ec5ba2fc0a778
 
 if [ -n "$CROSS_BUILD" ]; then
 	configure_args="--exec_prefix=${XBPS_CROSS_BASE} --with-mysql-include=${XBPS_CROSS_BASE}/usr/include/mysql"
 fi
 
-post_install() {
-	vlicense COPYING.txt
-}
-
 mysql++-devel_package() {
 	depends="mysql++>=${version}_${revision} libmysqlclient-devel"
 	short_desc+=" - development files"
diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template
index 9f3d8d6d8be..4436180804f 100644
--- a/srcpkgs/namecoin/template
+++ b/srcpkgs/namecoin/template
@@ -1,7 +1,7 @@
 # Template file for 'namecoin'
 pkgname=namecoin
-version=0.17.0
-revision=2
+version=0.18.1
+revision=1
 wrksrc="${pkgname}-core-nc${version}"
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --disable-static
@@ -14,7 +14,7 @@ maintainer="ananteris <ananteris@protonmail.ch>"
 license="MIT"
 homepage="https://namecoin.org"
 distfiles="https://github.com/namecoin/namecoin-core/archive/nc${version}.tar.gz"
-checksum=b9e56cebd6756ad8ff7c8f6c9e633cb56cb139c7c4437189945b3f25acbe0082
+checksum=7117a0a0b8f48d49e4abf3577660f8a4eb9a4dea753281d19d9470725fc75d8e
 
 case "${XBPS_TARGET_MACHINE}" in
 	armv[56]*|ppc|ppc-musl)
diff --git a/srcpkgs/nano/template b/srcpkgs/nano/template
index 74a43e7cc69..dbb86bafe65 100644
--- a/srcpkgs/nano/template
+++ b/srcpkgs/nano/template
@@ -1,19 +1,18 @@
 # Template file for 'nano'
 pkgname=nano
-version=4.3
+version=4.5
 revision=1
 build_style=gnu-configure
 configure_args="--enable-utf8"
 makedepends="file-devel ncurses-devel"
 short_desc="GNU nano text editor"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Lugubris <lugubris@disroot.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.nano-editor.org/"
 changelog="http://git.savannah.gnu.org/cgit/nano.git/plain/NEWS"
 distfiles="https://www.nano-editor.org/dist/v${version%.*}/nano-${version}.tar.xz"
-checksum=00d3ad1a287a85b4bf83e5f06cedd0a9f880413682bebd52b4b1e2af8cfc0d81
+checksum=ded5c38f5ecd9de2b624e0db8013a375c169d3fbbd49575967b868847df8f533
 
 post_install() {
 	vsconf syntax/nanorc.nanorc
 }
-
diff --git a/srcpkgs/nasa-wallpaper/template b/srcpkgs/nasa-wallpaper/template
index 8bad43b2fec..c03df8ffc4a 100644
--- a/srcpkgs/nasa-wallpaper/template
+++ b/srcpkgs/nasa-wallpaper/template
@@ -6,8 +6,8 @@ build_style="cargo"
 hostmakedepends="pkg-config"
 makedepends="libressl-devel"
 short_desc="Change your desktop background with a NASA image"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Lugubris <lugubris@disroot.org>"
 license="Apache-2.0"
-homepage="https://davidpob99.github.io/nasa-wallpaper/"
+homepage="https://github.com/davidpob99/nasa-wallpaper/"
 distfiles="https://github.com/davidpob99/nasa-wallpaper/archive/v${version}.tar.gz"
 checksum=5bdf85cabc954069f7188f32c5579a6d47aae1781bc438bead7d7a0af335f5f8
diff --git a/srcpkgs/nautilus/template b/srcpkgs/nautilus/template
index 2adf829749a..ac92882eddb 100644
--- a/srcpkgs/nautilus/template
+++ b/srcpkgs/nautilus/template
@@ -1,6 +1,6 @@
 # Template file for 'nautilus'
 pkgname=nautilus
-version=3.32.3
+version=3.34.1
 revision=1
 build_style=meson
 build_helper="gir"
@@ -17,7 +17,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Nautilus"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=01e4e0dbde6e65d64ae3f35f1949f60b104902039dcd563872396723d7cf2cf5
+checksum=37ce2c16a610c589dcc7660f9092446465568e38e29bce6ed8c24f2e8e0077f3
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/nbd/template b/srcpkgs/nbd/template
index 2777c280271..d06b95b4149 100644
--- a/srcpkgs/nbd/template
+++ b/srcpkgs/nbd/template
@@ -1,6 +1,6 @@
 # Template file for 'nbd'
 pkgname=nbd
-version=3.19
+version=3.20
 revision=1
 build_style=gnu-configure
 configure_args="--enable-syslog"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://nbd.sourceforge.io/"
 distfiles="${SOURCEFORGE_SITE}/nbd/nbd-${version}.tar.gz"
-checksum=f0b52d03f35fee3a00d2f7c27974dce8fc797f35c708786e36fd2cd2fe48879d
+checksum=b6a82acbc9b1085534820dbc0d23ddbc39b7970e587e6930aec97e262feb222b
 
 system_accounts="nbd"
 nbd_homedir="/var/chroot"
diff --git a/srcpkgs/ncdc/template b/srcpkgs/ncdc/template
index cc3f162080b..fb7139175a4 100644
--- a/srcpkgs/ncdc/template
+++ b/srcpkgs/ncdc/template
@@ -1,7 +1,7 @@
 # Template file for 'ncdc'
 pkgname=ncdc
-version=1.21
-revision=2
+version=1.22.1
+revision=1
 build_style=gnu-configure
 configure_args="--with-geoip"
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ maintainer="whoami <whoami@systemli.org>"
 license="MIT"
 homepage="https://dev.yorhel.nl/ncdc"
 distfiles="https://dev.yorhel.nl/download/$pkgname-$version.tar.gz"
-checksum=22904f93a553e45b84a3e72dc6209e11194087c3244fd08c6489bacdee991982
+checksum=d15fd378aa345f423e59a38691c668f69b516cd4b8afbbcdc446007740c3afad
 
 pre_build() {
 	make CC=$CC_FOR_BUILD CFLAGS=$BUILD_CFLAGS makeheaders
diff --git a/srcpkgs/ncmpc/template b/srcpkgs/ncmpc/template
index 7e8fa648502..a28dafdd6f1 100644
--- a/srcpkgs/ncmpc/template
+++ b/srcpkgs/ncmpc/template
@@ -1,6 +1,6 @@
 # Template file for 'ncmpc'
 pkgname=ncmpc
-version=0.34
+version=0.35
 revision=1
 build_style=meson
 configure_args="-Dlirc=disabled"
@@ -11,7 +11,7 @@ maintainer="Getty Ritter <gettyritter@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://www.musicpd.org/clients/ncmpc/"
 distfiles="https://www.musicpd.org/download/ncmpc/0/ncmpc-${version}.tar.xz"
-checksum=14c5b1dc78e83fa838fb049db76c00706686c98991600a87d2c57ec2b6c9e857
+checksum=bd4f1e638290915e08be045087c1df2d562d012b14f662dd33fd7c7043ddd241
 
 post_install() {
 	vmkdir usr/share/examples/ncmpc
diff --git a/srcpkgs/ndctl/template b/srcpkgs/ndctl/template
index dd4f0a165c9..be7895d78e3 100644
--- a/srcpkgs/ndctl/template
+++ b/srcpkgs/ndctl/template
@@ -1,6 +1,6 @@
 # Template file for 'ndctl'
 pkgname=ndctl
-version=65
+version=66
 revision=1
 build_style=gnu-configure
 configure_args="--disable-docs --without-systemd"
@@ -8,11 +8,11 @@ hostmakedepends="automake libtool pkg-config xmlto"
 makedepends="eudev-libudev-devel json-c-devel libkmod-devel libuuid-devel
  bash-completion keyutils-devel"
 short_desc="Utility library for managing libnvdimm"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="LGPL-2.1-only, GPL-2.0-only"
 homepage="https://github.com/pmem/ndctl"
 distfiles="https://github.com/pmem/ndctl/archive/v${version}.tar.gz"
-checksum=01870de8ed902b14314485f71e0d36e72694c7046e0603b41df107b2827d3781
+checksum=b2b0cd5468de235d3ae8bb3de737ab2e18e854eee57c3618c648c6d7abd02e63
 conf_files="/etc/ndctl/monitor.conf"
 
 case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/neatvi/template b/srcpkgs/neatvi/template
index 632b8282c0c..ef992320ed0 100644
--- a/srcpkgs/neatvi/template
+++ b/srcpkgs/neatvi/template
@@ -1,14 +1,14 @@
 # Template file for 'neatvi'
 pkgname=neatvi
-version=06
-revision=2
+version=07
+revision=1
 build_style=gnu-makefile
 short_desc="Small ex/vi editor"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="ISC"
 homepage="http://litcave.rudi.ir/"
 distfiles="https://github.com/litcave/${pkgname}/archive/${version}.tar.gz"
-checksum=7010b7d5992743f8e854ba012d66c6965f1da5bd2cc4251edd6e153bda0cd2f1
+checksum=f35939b5095152af9e8e76dd03ef4f52d14453a70a92430dd3e92964dcca53a1
 
 alternatives="
  vi:ex:/usr/bin/neatex
diff --git a/srcpkgs/nemo-fileroller/template b/srcpkgs/nemo-fileroller/template
index 12f3e7b3021..430b2ce3241 100644
--- a/srcpkgs/nemo-fileroller/template
+++ b/srcpkgs/nemo-fileroller/template
@@ -1,6 +1,6 @@
 # Template file for 'nemo-fileroller'
 pkgname=nemo-fileroller
-version=4.0.0
+version=4.2.0
 revision=1
 wrksrc="nemo-extensions-${version}"
 build_wrksrc=nemo-fileroller
@@ -8,11 +8,11 @@ build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="nemo-devel libglib-devel"
 short_desc="Extensions for the Nemo file manager"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/linuxmint/nemo-extensions"
 distfiles="https://github.com/linuxmint/nemo-extensions/archive/${version}.tar.gz"
-checksum=4bee7336554fd3c6e87371bc4683e5bee989a67030582b89a050aad5874a04de
+checksum=8ee8698c6058762965635d8233c18a4019437f73752e2085087d812aa46c0fe5
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/nemo/template b/srcpkgs/nemo/template
index b88a4f404c5..8f5d8fa7247 100644
--- a/srcpkgs/nemo/template
+++ b/srcpkgs/nemo/template
@@ -1,7 +1,7 @@
 # Template file for 'nemo'
 pkgname=nemo
-version=4.0.6
-revision=2
+version=4.2.3
+revision=1
 build_style=meson
 pycompile_dirs="/usr/share/nemo/actions/myaction.py"
 hostmakedepends="gettext-devel glib-devel gnome-common intltool pkg-config
@@ -14,7 +14,9 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
 distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=9e7305955d1e420f85c944c921e2d622cd799785ea271ed488888e910a097e47
+checksum=f7876862340d9823f30e3b6b87bf97578089e448d57eeb7c6e41b0a2b69995f9
+nocross="ninja stops when compiling libnemo-private/eaa6409@@nemo-private@sta/nemo-file-undo-manager.c.o"
+
 
 do_check() {
 	:
diff --git a/srcpkgs/neofetch/template b/srcpkgs/neofetch/template
index dd267e28199..60cc2c36645 100644
--- a/srcpkgs/neofetch/template
+++ b/srcpkgs/neofetch/template
@@ -1,6 +1,6 @@
 # Template file for 'neofetch'
 pkgname=neofetch
-version=6.0.0
+version=6.1.0
 revision=1
 archs=noarch
 build_style=gnu-makefile
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://github.com/dylanaraps/neofetch"
 changelog="https://raw.githubusercontent.com/dylanaraps/neofetch/master/CHANGELOG.md"
 distfiles="${homepage}/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=264a7689561bb498f97f10231959bdd8f7c873671bac2ffb660de9a5863b1c76
+checksum=ece351e35286b64d362000d409b27597fcbdcf77e8e60fa0adae1f29d3c29637
 
 post_install() {
 	vlicense LICENSE.md
diff --git a/srcpkgs/neovim-remote/template b/srcpkgs/neovim-remote/template
index bd451aa1a3d..d8473bf0521 100644
--- a/srcpkgs/neovim-remote/template
+++ b/srcpkgs/neovim-remote/template
@@ -1,6 +1,6 @@
 # Template file for 'neovim-remote'
 pkgname=neovim-remote
-version=2.1.9
+version=2.2.2
 revision=1
 archs=noarch
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="dleeram <dleeram@protonmail.com>"
 license="MIT"
 homepage="https://github.com/mhinz/neovim-remote"
 distfiles="https://github.com/mhinz/neovim-remote/archive/v${version}.tar.gz"
-checksum=25d9fe4f4c90a9b68d507d1c9f81411e00342c95517d19051c5dba3a42b703aa
+checksum=3e7442f227812ad81bc9bbbced7fc6bd92a4e74670d4c44b4dca3ed0cb85d631
 
 do_check() {
 	python3 -m pytest
diff --git a/srcpkgs/neovim/template b/srcpkgs/neovim/template
index 3132bbe0bfb..8022cf1f218 100644
--- a/srcpkgs/neovim/template
+++ b/srcpkgs/neovim/template
@@ -1,17 +1,18 @@
 # Template file for 'neovim'
 pkgname=neovim
-version=0.3.8
+version=0.4.2
 revision=1
 build_style=cmake
-configure_args="-DENABLE_JEMALLOC=0"
 hostmakedepends="pkg-config gperf LuaJIT lua51-lpeg lua51-mpack"
-makedepends="libtermkey-devel libuv-devel libvterm-devel msgpack-devel LuaJIT-devel"
+makedepends="libtermkey-devel libuv-devel libvterm-devel msgpack-devel LuaJIT-devel
+ libluv-devel"
+depends="libvterm>=0.1.0"
 short_desc="Fork of Vim aiming to improve user experience, plugins and GUIs"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="Apache-2.0, custom:Vim"
 homepage="https://neovim.io"
 distfiles="https://github.com/neovim/neovim/archive/v${version}.tar.gz"
-checksum=953e134568d824dad7cbf32ee3114951732f9a750c462e430e6b593f418af76c
+checksum=9f874d3d2a74f33b931db62adebe28f8d2ec116270d1e13998b58a73348b6e56
 
 alternatives="
  vi:vi:/usr/bin/nvim
diff --git a/srcpkgs/nerd-fonts/template b/srcpkgs/nerd-fonts/template
index a02a59223e6..dc921d751e7 100644
--- a/srcpkgs/nerd-fonts/template
+++ b/srcpkgs/nerd-fonts/template
@@ -6,7 +6,7 @@ archs=noarch
 wrksrc=NerdFonts
 depends="font-util xbps-triggers nerd-fonts-ttf nerd-fonts-otf"
 short_desc="Iconic font aggregator, collection and patcher"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://nerdfonts.com"
 distfiles="https://gitlab.com/devopsdeluxe/nerd-fonts-aur/raw/v${version}/release/NerdFonts.tar.xz
diff --git a/srcpkgs/netcdf/template b/srcpkgs/netcdf/template
index c308b202250..632cf78080a 100644
--- a/srcpkgs/netcdf/template
+++ b/srcpkgs/netcdf/template
@@ -1,6 +1,6 @@
 # Template file for 'netcdf'
 pkgname=netcdf
-version=4.7.0
+version=4.7.1
 revision=1
 wrksrc="netcdf-c-${version}"
 build_style=gnu-configure
@@ -12,7 +12,7 @@ maintainer="Hans Grob <woufrous@gmail.com>"
 license="NetCDF"
 homepage="https://www.unidata.ucar.edu/software/netcdf/"
 distfiles="https://github.com/Unidata/netcdf-c/archive/v${version}.tar.gz"
-checksum=26d03164074363b3911ed79b7cddd045c22adf5ebaf978943db11a1d9f15e9d3
+checksum=583e6b89c57037293fc3878c9181bb89151da8c6015ecea404dd426fea219b2c
 
 post_install() {
 	# Remove references to hardening -specs.
diff --git a/srcpkgs/netpbm/files/netpbm-security-code.patch b/srcpkgs/netpbm/files/netpbm-security-code.patch
index 1a0d2438e97..ca74b96dff9 100644
--- a/srcpkgs/netpbm/files/netpbm-security-code.patch
+++ b/srcpkgs/netpbm/files/netpbm-security-code.patch
@@ -1016,75 +1016,6 @@ diff -up netpbm-10.58.01/urt/rle_addhist.c.security-code netpbm-10.58.01/urt/rle
      ++length;                               /*Cater for the null. */
  
      MALLOCARRAY(newc, length);
-diff -up netpbm-10.58.01/urt/rle_hdr.c.security-code netpbm-10.58.01/urt/rle_hdr.c
---- netpbm-10.58.01/urt/rle_hdr.c.security-code	2012-04-09 15:31:45.000000000 +0200
-+++ netpbm-10.58.01/urt/rle_hdr.c	2012-04-09 15:40:03.233619414 +0200
-@@ -14,6 +14,8 @@
-  * If you modify this software, you should include a notice giving the
-  * name of the person performing the modification, the date of modification,
-  * and the reason for such modification.
-+ *
-+ *  2002-12-19: Fix maths wrapping bugs. Alan Cox <alan@redhat.com>
-  */
- /* 
-  * rle_hdr.c - Functions to manipulate rle_hdr structures.
-@@ -80,7 +82,10 @@ int img_num;
-     /* Fill in with copies of the strings. */
-     if ( the_hdr->cmd != pgmname )
-     {
--	char *tmp = (char *)malloc( strlen( pgmname ) + 1 );
-+	char *tmp ;
-+
-+	overflow_add(strlen(pgmname), 1);
-+	tmp = malloc( strlen( pgmname ) + 1 );
- 	RLE_CHECK_ALLOC( pgmname, tmp, 0 );
- 	strcpy( tmp, pgmname );
- 	the_hdr->cmd = tmp;
-@@ -88,7 +93,9 @@ int img_num;
- 
-     if ( the_hdr->file_name != fname )
-     {
--	char *tmp = (char *)malloc( strlen( fname ) + 1 );
-+	char *tmp;
-+	overflow_add(strlen(fname), 1);
-+	tmp = malloc( strlen( fname ) + 1 );
- 	RLE_CHECK_ALLOC( pgmname, tmp, 0 );
- 	strcpy( tmp, fname );
- 	the_hdr->file_name = tmp;
-@@ -153,6 +160,7 @@ rle_hdr *from_hdr, *to_hdr;
-     if ( to_hdr->bg_color )
-     {
- 	int size = to_hdr->ncolors * sizeof(int);
-+	overflow2(to_hdr->ncolors, sizeof(int));
- 	to_hdr->bg_color = (int *)malloc( size );
- 	RLE_CHECK_ALLOC( to_hdr->cmd, to_hdr->bg_color, "background color" );
- 	memcpy( to_hdr->bg_color, from_hdr->bg_color, size );
-@@ -161,7 +169,7 @@ rle_hdr *from_hdr, *to_hdr;
-     if ( to_hdr->cmap )
-     {
- 	int size = to_hdr->ncmap * (1 << to_hdr->cmaplen) * sizeof(rle_map);
--	to_hdr->cmap = (rle_map *)malloc( size );
-+	to_hdr->cmap = (rle_map *)malloc3( to_hdr->ncmap, 1<<to_hdr->cmaplen, sizeof(rle_map));
- 	RLE_CHECK_ALLOC( to_hdr->cmd, to_hdr->cmap, "color map" );
- 	memcpy( to_hdr->cmap, from_hdr->cmap, size );
-     }
-@@ -174,11 +182,16 @@ rle_hdr *from_hdr, *to_hdr;
- 	int size = 0;
- 	CONST_DECL char **cp;
- 	for ( cp=to_hdr->comments; *cp; cp++ )
-+	{
-+	    overflow_add(size, 1);
- 	    size++;		/* Count the comments. */
-+ 	}
- 	/* Check if there are really any comments. */
- 	if ( size )
- 	{
-+	    overflow_add(size, 1);
- 	    size++;		/* Copy the NULL pointer, too. */
-+	    overflow2(size, sizeof(char *));
- 	    size *= sizeof(char *);
- 	    to_hdr->comments = (CONST_DECL char **)malloc( size );
- 	    RLE_CHECK_ALLOC( to_hdr->cmd, to_hdr->comments, "comments" );
 diff -up netpbm-10.58.01/urt/rle.h.security-code netpbm-10.58.01/urt/rle.h
 --- netpbm-10.58.01/urt/rle.h.security-code	2012-04-09 15:31:45.000000000 +0200
 +++ netpbm-10.58.01/urt/rle.h	2012-04-09 15:40:03.233619414 +0200
diff --git a/srcpkgs/netpbm/template b/srcpkgs/netpbm/template
index d122865d181..acd0ee176a7 100644
--- a/srcpkgs/netpbm/template
+++ b/srcpkgs/netpbm/template
@@ -1,10 +1,10 @@
 # Template file for 'netpbm'
 pkgname=netpbm
 # from http://svn.code.sf.net/p/netpbm/code/advanced/doc/HISTORY
-version=10.87.01
+version=10.88.00
 revision=1
-_githash=b4f838a9bfbb656c7d24bcf1e39c616a0804f837
-_githash_guide=659088e47395511bee20a5ac319bc6a3ea5d64cb
+_githash=ba9611399c049edc878be544d2a91f7178dce3dd
+_githash_guide=4d6a81f76b3eeab25441f7614083bbb82328499c
 create_wrksrc=yes
 build_wrksrc="netpbm-mirror-${_githash}"
 hostmakedepends="pkg-config perl python flex"
@@ -16,8 +16,8 @@ license="BSD,GPL-2,custom"
 homepage="http://netpbm.sourceforge.net/"
 distfiles="https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash}.tar.gz
  https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash_guide}.tar.gz"
-checksum="ffb52fd44bf4b0da505c5db45a8f63c856a25d8660fe45384a35e74fa1a16712
- de7e6e3f66e561cad34afb087f50b28b7fbc585687f21306de3f81d42f6f4470"
+checksum="01faa24feff72346f77091a24ac40cea600428439837a25b692897a3bde1d4bb
+ b912e8bfcfd98d931b37e130d113e86d0656922059ea451a37d88e218f865fb5"
 
 post_extract() {
 	cd $build_wrksrc
diff --git a/srcpkgs/nettle/template b/srcpkgs/nettle/template
index e687d02a79c..7ea54b2a0b4 100644
--- a/srcpkgs/nettle/template
+++ b/srcpkgs/nettle/template
@@ -1,17 +1,17 @@
 # Template file for 'nettle'
 pkgname=nettle
-version=3.4.1
+version=3.5.1
 revision=1
 build_style=gnu-configure
 configure_args="--enable-shared"
 hostmakedepends="m4"
 makedepends="gmp-devel"
 short_desc="A low-level cryptographic library"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
 homepage="http://www.lysator.liu.se/~nisse/nettle/"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=f941cf1535cd5d1819be5ccae5babef01f6db611f9b5a777bae9c7604b8a92ad
+checksum=75cca1998761b02e16f2db56da52992aef622bf55a3b45ec538bc2eedadc9419
 
 
 nettle-devel_package() {
diff --git a/srcpkgs/networkmanager-qt5/template b/srcpkgs/networkmanager-qt5/template
index fd3b584c2f3..49e62c1c757 100644
--- a/srcpkgs/networkmanager-qt5/template
+++ b/srcpkgs/networkmanager-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'networkmanager-qt5'
 pkgname=networkmanager-qt5
-version=5.61.0
+version=5.63.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/frameworks/networkmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=1ded63af93957a04292e965ecce06388f183d3adc555b4f3d33337ee15d858c3
+checksum=2fd194fa64838dbf419df0a907bac5b1105f29f2261c96de4330283fa3f9ae79
 
 networkmanager-qt5-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/newsboat/template b/srcpkgs/newsboat/template
index 784d2c6b6be..f5fc4d9debe 100644
--- a/srcpkgs/newsboat/template
+++ b/srcpkgs/newsboat/template
@@ -1,7 +1,7 @@
 # Template file for 'newsboat'
 pkgname=newsboat
-version=2.16.1
-revision=2
+version=2.17.1
+revision=1
 wrksrc="newsboat-r${version}"
 build_style=configure
 build_helper="rust"
@@ -13,12 +13,12 @@ makedepends="json-c-devel libcurl-devel libxml2-devel sqlite-devel stfl-devel
  rust-std"
 checkdepends="ncurses-base"
 short_desc="Newsboat is a fork of Newsbeuter the Mutt of RSS feed readers"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://www.newsboat.org"
 changelog="https://raw.githubusercontent.com/newsboat/newsboat/master/CHANGELOG.md"
 distfiles="https://github.com/newsboat/newsboat/archive/r${version}.tar.gz"
-checksum=c125cf906a074598104476fecddae5e4f4dd26c9d22750bb1e8ccfd7a11813c2
+checksum=4332d5e3605f57441158d06864297c8ac79bd159b12d982296b15b0bd7455cc6
 
 CXXFLAGS=" -Wno-error=sign-compare"
 
diff --git a/srcpkgs/next/template b/srcpkgs/next/template
new file mode 100644
index 00000000000..a22f08bf917
--- /dev/null
+++ b/srcpkgs/next/template
@@ -0,0 +1,21 @@
+# Template file for 'next'
+pkgname=next
+version=1.3.4
+revision=1
+build_style=gnu-makefile
+hostmakedepends="sbcl curl pkg-config"
+makedepends="webkit2gtk-devel libfixposix-devel libressl-devel"
+depends="sqlite xclip libfixposix-devel libressl-devel"
+short_desc="Keyboard-oriented, extensible web-browser"
+maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"
+license="BSD-3-Clause"
+homepage="https://next.atlas.engineer/"
+distfiles="https://github.com/atlas-engineer/next/archive/${version}.tar.gz"
+checksum=e8fe93cef62985926a25da4138f3e865b48d8c0ed19125d5f52724fd7a4c6e87
+nostrip=yes
+nopie=yes
+nocross="https://travis-ci.org/void-linux/void-packages/builds/590346382"
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/nftables/template b/srcpkgs/nftables/template
index df138f75070..3022a9a2d1f 100644
--- a/srcpkgs/nftables/template
+++ b/srcpkgs/nftables/template
@@ -1,17 +1,17 @@
 # Template file for 'nftables'
 pkgname=nftables
-version=0.9.1
+version=0.9.2
 revision=1
 build_style=gnu-configure
-configure_args="--sbindir=/usr/bin CONFIG_MAN=y DB2MAN=docbook2man"
+configure_args="--sbindir=/usr/bin --with-json"
 hostmakedepends="asciidoc docbook2x flex pkg-config"
-makedepends="gmp-devel libmnl-devel libnftnl-devel readline-devel"
+makedepends="gmp-devel jansson-devel libmnl-devel libnftnl-devel readline-devel"
 short_desc="Netfilter nftables userspace tools"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="http://netfilter.org/projects/nftables/"
 distfiles="http://www.netfilter.org/projects/${pkgname}/files/${pkgname}-${version}.tar.bz2"
-checksum=ead3bb68ed540bfbb87a96f2b69c3d65ab0c2a0c3f6e739a395c09377d1b4fce
+checksum=5cb66180143e6bfc774f4eb316206d40ac1cb6df269a90882404cbf7165513f5
 
 post_install() {
 	vsv nftables
@@ -32,5 +32,6 @@ libnftables-devel_package() {
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.a"
+		vmove usr/share/man/man3
 	}
 }
diff --git a/srcpkgs/ngspice/template b/srcpkgs/ngspice/template
index 5e2c1934b34..4b74899cbb2 100644
--- a/srcpkgs/ngspice/template
+++ b/srcpkgs/ngspice/template
@@ -1,7 +1,7 @@
 # Template file for 'ngspice'
 pkgname=ngspice
-version=30
-revision=2
+version=31
+revision=1
 build_style=gnu-configure
 configure_args="--with-readline=yes --with-ngshared --enable-xspice --enable-cider"
 hostmakedepends="bison byacc"
@@ -11,7 +11,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://ngspice.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/ngspice/ng-spice-rework/${version}/${pkgname}-${version}.tar.gz"
-checksum=08fe0e2f3768059411328a33e736df441d7e6e7304f8dad0ed5f28e15d936097
+checksum=845f3b0c962e47ded051dfbc134c3c1e4ac925c9f0ce1cb3df64eb9b9da5c282
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/nilfs-utils/patches/max-input.patch b/srcpkgs/nilfs-utils/patches/max-input.patch
deleted file mode 100644
index 5241ea55c0b..00000000000
--- a/srcpkgs/nilfs-utils/patches/max-input.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./bin/rmcp.c.orig
-+++ ./bin/rmcp.c
-@@ -51,6 +51,9 @@
- #include "nilfs.h"
- #include "parser.h"
- 
-+#ifndef MAX_INPUT
-+#define MAX_INPUT _POSIX_MAX_INPUT
-+#endif
- 
- #ifdef _GNU_SOURCE
- #include <getopt.h>
diff --git a/srcpkgs/nilfs-utils/patches/rpc-types.patch b/srcpkgs/nilfs-utils/patches/rpc-types.patch
deleted file mode 100644
index ce55c439a2a..00000000000
--- a/srcpkgs/nilfs-utils/patches/rpc-types.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./sbin/mount/sundries.h.orig
-+++ ./sbin/mount/sundries.h
-@@ -15,7 +15,7 @@
- #include <signal.h>
- #include <stdarg.h>
- #include <stdlib.h>
--#if !defined(bool_t) && !defined(__GLIBC__)
-+#if !defined(bool_t) && !defined(__GLIBC__) && HAVE_RPC_TYPES_H
- #include <rpc/types.h>
- #endif
- 
diff --git a/srcpkgs/nilfs-utils/template b/srcpkgs/nilfs-utils/template
index ea07b0af50c..c58b411bcda 100644
--- a/srcpkgs/nilfs-utils/template
+++ b/srcpkgs/nilfs-utils/template
@@ -1,6 +1,6 @@
 # Template file for 'nilfs-utils'
 pkgname=nilfs-utils
-version=2.2.7
+version=2.2.8
 revision=1
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --enable-libmount"
@@ -8,12 +8,12 @@ make_install_args="sbindir=/usr/bin"
 hostmakedepends="automake libtool"
 makedepends="libuuid-devel libmount-devel"
 conf_files="/etc/nilfs_cleanerd.conf"
-short_desc="A log-structured file system for Linux - userspace utils"
+short_desc="Log-structured file system for Linux - userspace utils"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2, LGPL-2.1"
+license="GPL-2.0-only, LGPL-2.1-only"
 homepage="http://nilfs.sourceforge.net/"
 distfiles="http://nilfs.sourceforge.net/download/$pkgname-$version.tar.bz2"
-checksum=2cf651c47f65ae1387758d90b0c51e744e2ecce0b1d77e8be9998929f74ac005
+checksum=5a29f8f59db03edf8dd1e68dfd80ff4713e0aa184cfa83a6326ac8af93d9bda6
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/nim/template b/srcpkgs/nim/template
index 2f691870035..81e3d041b87 100644
--- a/srcpkgs/nim/template
+++ b/srcpkgs/nim/template
@@ -1,23 +1,23 @@
 # Template file for 'nim'
 pkgname=nim
-version=0.20.0
+version=1.0.0
 revision=1
 _cversion=0.20.0
-_nimbleversion=0.10.2
+_nimbleversion=0.11.0
 create_wrksrc=yes
 build_wrksrc=Nim-$version
 hostmakedepends="ed"
 depends="gcc"
-short_desc="The Nim programming language"
+short_desc="Nim programming language"
 maintainer="allan <mail@may.mooo.com>"
 license="MIT"
 homepage="https://nim-lang.org/"
 distfiles="https://github.com/nim-lang/Nim/archive/v${version}.tar.gz
  https://github.com/nim-lang/csources/archive/v${_cversion}.tar.gz>csources-${_cversion}.tar.gz
  https://github.com/nim-lang/nimble/archive/v${_nimbleversion}.tar.gz>nimble-${_nimbleversion}.tar.gz"
-checksum="53f96a92cd1a46360b1fab44720d331536bbd18993a81746e973af46fdad8fbb
+checksum="6d93d25da6b5ef4e0223acb1f1abadf06be1019a8137491ddc7c6fa030e638c3
  5e6fd15d90df1a8cb7614c4ffc70aa8c4198cd854d7742016202b96dd0228d3c
- ef62b38ad41f9d84b4c9206b10541f1dc7498edda16b2031d96eaa873f4f9730"
+ a31d06128f3d1014d68297aa5cd264023d202cae74746d78ba84e335af3399d2"
 
 post_extract() {
 	mv csources-$_cversion $build_wrksrc/csources
@@ -27,17 +27,17 @@ post_extract() {
 
 do_build() {
 	cd csources
-	CC=cc LD=cc CFLAGS="-Os -pipe" LDFLAGS= sh build.sh
+	case "$XBPS_TARGET_MACHINE" in
+		i686*)
+			CC=cc LD=cc CFLAGS="-Os -pipe" LDFLAGS= \
+			sh build.sh --cpu i686;;
+		*)
+			CC=cc LD=cc CFLAGS="-Os -pipe" LDFLAGS= sh build.sh;;
+	esac
 	cd ..
 
-	ed lib/wrappers/openssl.nim <<-EDIT
-		,s/versions = "(/versions = "(.46|/
-		w
-		q
-	EDIT
-
 	bin/nim c koch
-	./koch boot -d:release
+	./koch boot -d:release -d:danger
 
 	case "$XBPS_TARGET_MACHINE" in
 		aarch64*) _arch=arm64;;
@@ -62,7 +62,7 @@ do_build() {
 			w
 			q
 		EDIT
-		bin/nim c -d:release --os:linux --cpu:$_arch --listCmd compiler/nim
+		bin/nim c -d:release -d:danger --os:linux --cpu:$_arch --listCmd compiler/nim
 		for _p in \
 			dist/nimble/src/nimble \
 			tools/nimgrep \
diff --git a/srcpkgs/ninja/template b/srcpkgs/ninja/template
index 9e7b546d923..056f59ff57c 100644
--- a/srcpkgs/ninja/template
+++ b/srcpkgs/ninja/template
@@ -4,7 +4,7 @@ version=1.9.0
 revision=1
 hostmakedepends="python asciidoc"
 short_desc="Small build system with a focus on speed"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://ninja-build.org/"
 distfiles="https://github.com/martine/ninja/archive/v${version}.tar.gz"
diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template
index 4d994ef4241..f9c9030e72e 100644
--- a/srcpkgs/nix/template
+++ b/srcpkgs/nix/template
@@ -1,7 +1,7 @@
 # Template file for 'nix'
 pkgname=nix
 version=2.2.2
-revision=3
+revision=4
 build_style=gnu-configure
 # Use /nix/var as suggested by the official Manual.
 configure_args="--localstatedir=/nix/var --with-sandbox-shell=/bin/sh"
diff --git a/srcpkgs/nnn/template b/srcpkgs/nnn/template
index c9193ba4946..28fb4230e49 100644
--- a/srcpkgs/nnn/template
+++ b/srcpkgs/nnn/template
@@ -1,6 +1,6 @@
 # Template file for 'nnn'
 pkgname=nnn
-version=2.6
+version=2.7
 revision=1
 build_style=gnu-makefile
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ license="BSD-2-Clause"
 homepage="https://github.com/jarun/nnn"
 changelog="https://raw.githubusercontent.com/jarun/nnn/master/CHANGELOG"
 distfiles="https://github.com/jarun/nnn/archive/v${version}.tar.gz"
-checksum=17fd3e517308e41065594ffe8dcde348b4d10dea4240699f4708337db48b3e25
+checksum=0592c7cbcf2cf66cacac49e9204636480820b1bc74e4187dd7ee06945a6d07c5
 
 post_install() {
 	vinstall misc/auto-completion/bash/nnn-completion.bash 644 \
diff --git a/srcpkgs/nodejs-lts/patches/ppc32.patch b/srcpkgs/nodejs-lts/patches/ppc32.patch
index fe28ab75115..343eff58512 100644
--- a/srcpkgs/nodejs-lts/patches/ppc32.patch
+++ b/srcpkgs/nodejs-lts/patches/ppc32.patch
@@ -1,3 +1,28 @@
+--- configure.py
++++ configure.py
+@@ -848,7 +848,7 @@ def host_arch_cc():
+     '__MIPSEL__'  : 'mipsel',
+     '__mips__'    : 'mips',
+     '__PPC64__'   : 'ppc64',
+-    '__PPC__'     : 'ppc64',
++    '__PPC__'     : 'ppc',
+     '__x86_64__'  : 'x64',
+     '__s390__'    : 's390',
+     '__s390x__'   : 's390x',
+--- node.gyp
++++ node.gyp
+@@ -479,6 +479,11 @@
+       'msvs_disabled_warnings!': [4244],
+ 
+       'conditions': [
++        [ 'host_arch=="mips" or host_arch=="mipsel" or host_arch=="ppc"', {
++	  'link_settings': {
++	    'libraries': [ '-latomic' ],
++	  },
++	}],
+         [ 'node_code_cache_path!=""', {
+           'sources': [ '<(node_code_cache_path)' ]
+         }, {
 --- deps/v8/src/libsampler/sampler.cc
 +++ deps/v8/src/libsampler/sampler.cc
 @@ -418,9 +418,15 @@ void SignalHandler::FillRegisterState(void* context, RegisterState* state) {
diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index b5d307fb303..b260e1c0706 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -36,6 +36,12 @@ if [ "$XBPS_WORDSIZE" -ne "$XBPS_TARGET_WORDSIZE" ]; then
         nocross="host and target must have the same pointer size"
 fi
 
+case "$XBPS_MACHINE" in
+	ppc64*) ;;
+	mips*|ppc*) hostmakedepends+=" libatomic-devel" ;;
+        *) ;;
+esac
+
 do_configure() {
 	local _args
 
diff --git a/srcpkgs/nodejs/patches/ppc32.patch b/srcpkgs/nodejs/patches/ppc32.patch
index fe28ab75115..502d471429f 100644
--- a/srcpkgs/nodejs/patches/ppc32.patch
+++ b/srcpkgs/nodejs/patches/ppc32.patch
@@ -1,17 +1,19 @@
---- deps/v8/src/libsampler/sampler.cc
+--- deps/v8/src/libsampler/sampler.cc.orig
 +++ deps/v8/src/libsampler/sampler.cc
-@@ -418,9 +418,15 @@ void SignalHandler::FillRegisterState(void* context, RegisterState* state) {
-       reinterpret_cast<void*>(ucontext->uc_mcontext.regs->gpr[PT_R31]);
+@@ -423,10 +423,17 @@
+   state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.regs->link);
  #else
    // Some C libraries, notably Musl, define the regs member as a void pointer
 +  #if !V8_TARGET_ARCH_32_BIT
    state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[32]);
    state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[1]);
    state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[31]);
+   state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[36]);
 +  #else
 +  state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[32]);
 +  state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[1]);
 +  state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[31]);
++  state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[36]);
 +  #endif
  #endif
  #elif V8_HOST_ARCH_S390
diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index e14d74894dc..42a9011ec92 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -1,6 +1,6 @@
 # Template file for 'nodejs'
 pkgname=nodejs
-version=12.8.0
+version=12.11.1
 revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
@@ -17,7 +17,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://nodejs.org/"
 distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
-checksum=6f4e4ee7bcb52f782dce5a51d6951ff87151d9504be129d68d7aff469c0f7f36
+checksum=37043ddbe60f18a52ec31e0381b66adebbc0ec24669d72f132a1fdfacdf029ae
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
 desc_option_ssl="Enable shared libressl"
@@ -36,6 +36,11 @@ if [ "$XBPS_WORDSIZE" -ne "$XBPS_TARGET_WORDSIZE" ]; then
 	nocross="host and target must have the same pointer size"
 fi
 
+case "$XBPS_TARGET_MACHINE" in
+	ppc64*) ;;
+	ppc*) broken="Node 12.x does not support 32-bit ppc" ;;
+esac
+
 # v8 requires libatomic on ppc*/s390x/mips*
 case "$XBPS_TARGET_MACHINE" in
 	mips*|ppc*) makedepends+=" libatomic-devel" ;;
diff --git a/srcpkgs/nomad/template b/srcpkgs/nomad/template
index 8b6ad81e192..ccb62542fcf 100644
--- a/srcpkgs/nomad/template
+++ b/srcpkgs/nomad/template
@@ -1,11 +1,11 @@
 # Template file for 'nomad'
 pkgname=nomad
-version=0.9.4
+version=0.9.6
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/${pkgname}"
 go_build_tags="ui release"
-_git_commit=23c4597dbb6d1d46e020301b0f63db5cff80d3f0
+_git_commit=6c4863c5f61b0cdfb609927f6f67e17d90454197
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit}"
 hostmakedepends="git"
 short_desc="Cluster scheduler designed to easily integrate into existing workflows"
@@ -13,7 +13,7 @@ maintainer="iaroki <iaroki@protonmail.com>"
 license="MPL-2.0"
 homepage="https://www.nomadproject.io/"
 distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
-checksum=46c7998a82a45e82db87b4f4575aa48dd3d5fc0acc9d69ac3536785622867058
+checksum=c37e03cbe939ddb983307e3eb501b83e025e2c915de312094384db9164ae7a05
 patch_args="-Np1"
 
 case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/nootka/template b/srcpkgs/nootka/template
index 255299f5014..3142b147987 100644
--- a/srcpkgs/nootka/template
+++ b/srcpkgs/nootka/template
@@ -1,6 +1,6 @@
 # Template file for 'nootka'
 pkgname=nootka
-version=1.4.5
+version=1.4.6
 revision=1
 wrksrc="nootka-${version}-source"
 build_style=cmake
@@ -10,8 +10,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
 homepage="https://nootka.sourceforge.io"
 distfiles="${SOURCEFORGE_SITE}/nootka/Nootka-${version}/nootka-${version}-source.tar.bz2"
-checksum=210371ffeb8f018564e1d07d935dee7f310316c67359ac40569cc74f3c3a5e16
+checksum=26b94b90065d11a47c9f6d091ebc2c1c449f4ef26202d203045199900b2e3514
+
 
 nocross="https://travis-ci.org/void-linux/void-packages/jobs/425361689
  https://travis-ci.org/void-linux/void-packages/jobs/425361690"
-
diff --git a/srcpkgs/notify-send.sh/template b/srcpkgs/notify-send.sh/template
index f36ca389f3d..a36bce58d0c 100644
--- a/srcpkgs/notify-send.sh/template
+++ b/srcpkgs/notify-send.sh/template
@@ -4,7 +4,7 @@ version=1.0
 revision=1
 depends="bash dbus glib"
 short_desc="Drop in replacement for libnotify and notify-send"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/vlevit/notify-send.sh"
 distfiles="https://github.com/vlevit/notify-send.sh/archive/v${version}.tar.gz"
diff --git a/srcpkgs/nsd/template b/srcpkgs/nsd/template
index 8015dced091..241682461ec 100644
--- a/srcpkgs/nsd/template
+++ b/srcpkgs/nsd/template
@@ -1,6 +1,6 @@
 # Template file for 'nsd'
 pkgname=nsd
-version=4.2.1
+version=4.2.2
 revision=1
 build_style=gnu-configure
 configure_args="--enable-ratelimit --enable-ratelimit-default-is-off
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://www.nlnetlabs.nl/projects/nsd/"
 changelog="https://github.com/NLnetLabs/nsd/blob/NSD_${version//./_}_REL/doc/ChangeLog"
 distfiles="https://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=d17c0ea3968cb0eb2be79f2f83eb299b7bfcc554b784007616eed6ece828871f
+checksum=83b333940a25fe6d453bcac6ea39edfa244612a879117c4a624c97eb250246fb
 system_accounts="nsd"
 nsd_homedir=/var/db/nsd
 make_dirs="/var/db/nsd 0755 nsd nsd"
diff --git a/srcpkgs/nsjail/template b/srcpkgs/nsjail/template
index 5eb375bd9d8..9eaced49863 100644
--- a/srcpkgs/nsjail/template
+++ b/srcpkgs/nsjail/template
@@ -1,7 +1,7 @@
 # Template file for 'nsjail'
 pkgname=nsjail
-version=2.8
-revision=2
+version=2.9
+revision=1
 build_style=gnu-makefile
 hostmakedepends="bison flex pkg-config protobuf"
 makedepends="libnl3-devel protobuf-devel"
@@ -11,12 +11,16 @@ license="Apache-2.0"
 homepage="http://nsjail.com"
 distfiles="https://github.com/google/nsjail/archive/${version}.tar.gz
 https://github.com/google/kafel/archive/722b93a630e53ca472a4c69f61cb3dfc44ea5041.tar.gz"
-checksum="1eb5cad7e698d467a0224614aaca04e169bde6c2cf57f2e6a01a8ad5f787bb56
+checksum="f8578a48330d3d089c9234a2b562be08043f8fe77453c322724acdf403d0afc3
  49d2327c794c90aca50a9933c00d453705534b16e5f42d8c8e19c3d274f5e5f8"
 
 archs="aarch64* armv5tel* armv6l* armv7l* x86_64*"
 CXXFLAGS="-Wno-format-truncation"
 
+case "$XBPS_TARGET_MACHINE" in
+	armv*) broken="https://build.voidlinux.org/builders/armv6l_builder/builds/20655/steps/shell_3/logs/stdio";;
+esac
+
 post_extract() {
 	rmdir kafel
 	ln -s ../kafel-* kafel
diff --git a/srcpkgs/nspr/template b/srcpkgs/nspr/template
index 1d15607b7b2..a30f39088e1 100644
--- a/srcpkgs/nspr/template
+++ b/srcpkgs/nspr/template
@@ -1,6 +1,6 @@
 # Template file for 'nspr'
 pkgname=nspr
-version=4.21
+version=4.22
 revision=1
 build_wrksrc=nspr
 build_style=gnu-configure
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="http://www.mozilla.org/projects/nspr/"
 distfiles="${MOZILLA_SITE}/nspr/releases/v${version}/src/${pkgname}-${version}.tar.gz"
-checksum=15ea32c7b100217b6e3193bc03e77f485d9bf7504051443ba9ce86d1c17c6b5a
+checksum=c9e4b6cc24856ec93202fe13704b38b38ba219f0f2aeac93090ce2b6c696d430
 
 do_configure() {
 	CFLAGS="$CFLAGS -D_PR_POLL_AVAILABLE -D_PR_HAVE_OFF64_T -D_PR_INET6 -D_PR_HAVE_INET_NTOP -D_PR_HAVE_GETHOSTBYNAME2 -D_PR_HAVE_GETADDRINFO -D_PR_INET6_PROBE"
diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index 731a6d18c8e..693e4524e26 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -1,9 +1,9 @@
 # Template file for 'nss'
 
-_nsprver=4.21
+_nsprver=4.22
 
 pkgname=nss
-version=3.44.1
+version=3.46
 revision=1
 hostmakedepends="perl"
 makedepends="nspr-devel sqlite-devel zlib-devel"
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.mozilla.org/projects/security/pki/nss"
 distfiles="${MOZILLA_SITE}/security/nss/releases/NSS_${version//\./_}_RTM/src/nss-${version}.tar.gz"
-checksum=fce4cb80c989cde35416ecbe55920856015a35151c4f21be64470e4dd4de12f8
+checksum=6b699649d285602ba258a4b0957cb841eafc94eff5735a9da8da0adbb9a10cef
 
 do_build() {
 	# Respect LDFLAGS
diff --git a/srcpkgs/nsss/template b/srcpkgs/nsss/template
index e440dc7497e..17970bcb0e7 100644
--- a/srcpkgs/nsss/template
+++ b/srcpkgs/nsss/template
@@ -1,6 +1,6 @@
 # Template file for 'nsss'
 pkgname=nsss
-version=0.0.1.1
+version=0.0.2.0
 revision=1
 build_style=configure
 configure_args="--with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
@@ -8,12 +8,12 @@ configure_args="--with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
  --bindir=/usr/bin --dynlibdir=/usr/lib"
 makedepends="skalibs-devel"
 short_desc="Minimal competing implementation of glibc's Name Switch Service"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="ISC"
 homepage="https://skarnet.org/software/nsss/"
 changelog="https://skarnet.org/software/nsss/upgrade.html"
 distfiles="https://skarnet.org/software/nsss/nsss-${version}.tar.gz"
-checksum=a7d4779f45175011b6d3c10935fe4591ea4875ef9c47be1274a56d640fddc193
+checksum=be80015c1fa79e418a3cebf49c1b6e3136d536e6eef8db33f749507b585075f1
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) ;;
diff --git a/srcpkgs/numactl/template b/srcpkgs/numactl/template
index 5f003363cb6..e162c40df80 100644
--- a/srcpkgs/numactl/template
+++ b/srcpkgs/numactl/template
@@ -1,15 +1,15 @@
 # Template file for 'numactl'
 pkgname=numactl
-version=2.0.12
+version=2.0.13
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool"
 short_desc="Simple NUMA policy support"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="LGPL-2.1-only"
 homepage="https://github.com/numactl/numactl"
 distfiles="https://github.com/numactl/numactl/archive/v${version}.tar.gz"
-checksum=7c3e819c2bdeb883de68bafe88776a01356f7ef565e75ba866c4b49a087c6bdf
+checksum=97ee012b2f294903530424b4ff7f28bcaad6a356897ce8777383f87e5c2e325d
 
 if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
 	# XXX
diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index 702bb6c0529..f9734e83b03 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -3,8 +3,8 @@
 _desc="NVIDIA drivers for linux"
 
 pkgname=nvidia
-version=430.14
-revision=2
+version=430.40
+revision=1
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Proprietary NVIDIA license"
 homepage="http://www.nvidia.com"
@@ -23,7 +23,7 @@ build_options_default="glvnd"
 if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
 	_pkg="NVIDIA-Linux-x86_64-${version}-no-compat32"
 	distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run"
-	checksum=0f583a277b1731cb8327510b75dba9cf7adf5c781247e4f48bcc9f358253278f
+	checksum=669ff38532ff05c78e1edc3c6df2055fd96437107f5919b6e5a774c3a495501b
 	subpackages="nvidia-gtklibs nvidia-dkms
 	 nvidia-opencl nvidia-libs"
 	depends="nvidia-libs-${version}_${revision}
@@ -32,7 +32,7 @@ if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
 else
 	_pkg="NVIDIA-Linux-x86_64-${version}"
 	distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run"
-	checksum=00d46ffaf3e1e430081ddbd68b74cc361cd1328e8944224dfe69630dd8540f17
+	checksum=f700899f48ba711b7e1598014e8db9a93537d7baa3d6a64067ed08578387dfd7
 	subpackages="nvidia-libs"
 	depends="pkgconf"
 fi
diff --git a/srcpkgs/nvidia340/files/kernel-5.0.patch b/srcpkgs/nvidia340/files/kernel-5.0.patch
index 01650dbfd79..b6d43e370bc 100644
--- a/srcpkgs/nvidia340/files/kernel-5.0.patch
+++ b/srcpkgs/nvidia340/files/kernel-5.0.patch
@@ -42,4 +42,48 @@
 +#endif
  
      status = RM_OK;
+
+--- kernel/uvm/nvidia_uvm_lite.c	2019-09-10 16:26:28.674315544 +0200
++++ kernel/uvm/nvidia_uvm_lite.c	2019-09-10 16:28:05.224054277 +0200
+@@ -30,6 +30,16 @@
+ #include "nvidia_uvm_lite_counters.h"
+ #include "ctrl2080mc.h"
  
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 0, 0)
++static inline void do_gettimeofday(struct timeval *tv) {
++       struct timespec64 now;  
++
++       ktime_get_real_ts64(&now);      
++       tv->tv_sec = now.tv_sec;
++       tv->tv_usec = now.tv_nsec/1000;
++}
++#endif
++
+ //
+ // nvidia_uvm_lite.c
+ // This file contains code that is specific to the UVM-Lite mode of operation.
+@@ -820,8 +830,10 @@
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
+-#else 	
+-int _fault(struct vm_fault *vmf) 	
++#elif LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0)     
++int _fault(struct vm_fault *vmf)       
++#else
++unsigned int _fault(struct vm_fault *vmf)      
+ #endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+@@ -876,8 +888,10 @@
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
+-#else
++#elif LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0)
+ int _sigbus_fault(struct vm_fault *vmf)
++#else
++unsigned int _sigbus_fault(struct vm_fault *vmf)
+ #endif
+ {
+     vmf->page = NULL;
diff --git a/srcpkgs/nvidia340/template b/srcpkgs/nvidia340/template
index 0fa1e30c6db..25d6953db03 100644
--- a/srcpkgs/nvidia340/template
+++ b/srcpkgs/nvidia340/template
@@ -4,7 +4,7 @@ _desc="NVIDIA drivers (GeForce 8, 9, 9M, 100, 100M, 200, 300 series)"
 
 pkgname=nvidia340
 version=340.107
-revision=3
+revision=4
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Proprietary NVIDIA license"
 homepage="http://www.nvidia.com"
@@ -38,7 +38,7 @@ do_extract() {
 	rm -f ${_pkg}.run
 }
 
-do_configure() {
+do_patch() {
 	cd ${_pkg}
 	patch -p0 < ${FILESDIR}/kernel-4.11.patch
 	patch -p0 < ${FILESDIR}/kernel-5.0.patch
diff --git a/srcpkgs/nvidia390/files/kernel-5.1-x86_64.patch b/srcpkgs/nvidia390/files/kernel-5.1-x86_64.patch
deleted file mode 100644
index 04af7cc80dd..00000000000
--- a/srcpkgs/nvidia390/files/kernel-5.1-x86_64.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/kernel/nvidia-uvm/uvm8.c b/kernel/nvidia-uvm/uvm8.c
-index e00923d..2e01e3c 100644
---- a/kernel/nvidia-uvm/uvm8.c
-+++ b/kernel/nvidia-uvm/uvm8.c
-@@ -172,7 +172,11 @@ static int uvm_vm_fault_sigbus(struct vm_area_struct *vma, struct vm_fault *vmf)
-     return VM_FAULT_SIGBUS;
- }
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0)
- static int uvm_vm_fault_sigbus_wrapper(struct vm_fault *vmf)
-+#else
-+static vm_fault_t uvm_vm_fault_sigbus_wrapper(struct vm_fault *vmf)
-+#endif
- {
- #if defined(NV_VM_OPS_FAULT_REMOVED_VMA_ARG)
-     return uvm_vm_fault_sigbus(vmf->vma, vmf);
-@@ -507,7 +511,11 @@ convert_error:
-     }
- }
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0)
- static int uvm_vm_fault_wrapper(struct vm_fault *vmf)
-+#else
-+static vm_fault_t uvm_vm_fault_wrapper(struct vm_fault *vmf)
-+#endif
- {
- #if defined(NV_VM_OPS_FAULT_REMOVED_VMA_ARG)
-     return uvm_vm_fault(vmf->vma, vmf);
-
diff --git a/srcpkgs/nvidia390/files/kernel-5.1.patch b/srcpkgs/nvidia390/files/kernel-5.1.patch
deleted file mode 100644
index 19d891c27b0..00000000000
--- a/srcpkgs/nvidia390/files/kernel-5.1.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-diff --git a/kernel/common/inc/nv-list-helpers.h b/kernel/common/inc/nv-list-helpers.h
-index 0aed851..d6304c9 100644
---- a/kernel/common/inc/nv-list-helpers.h
-+++ b/kernel/common/inc/nv-list-helpers.h
-@@ -26,6 +26,8 @@
- #include <linux/list.h>
- #include "conftest.h"
- 
-+#include <linux/version.h>
-+
- #if !defined (list_for_each)
- #define list_for_each(pos, head) \
-         for (pos = (head)->next; pos != (head); pos = (pos)->next)
-@@ -91,10 +93,12 @@
-         list_entry((pos)->member.next, typeof(*(pos)), member)
- #endif
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0)
- static inline int list_is_first(const struct list_head *list,
-                                 const struct list_head *head)
- {
-     return list->prev == head;
- }
-+#endif
- 
- #endif // __NV_LIST_HELPERS_H__
-diff --git a/kernel/nvidia-drm/nvidia-drm-connector.c b/kernel/nvidia-drm/nvidia-drm-connector.c
-index 24631c0..ba1497c 100644
---- a/kernel/nvidia-drm/nvidia-drm-connector.c
-+++ b/kernel/nvidia-drm/nvidia-drm-connector.c
-@@ -30,7 +30,12 @@
- #include "nvidia-drm-utils.h"
- #include "nvidia-drm-encoder.h"
- 
-+#include <linux/version.h>
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0)
- #include <drm/drm_crtc_helper.h>
-+#else
-+#include <drm/drm_probe_helper.h>
-+#endif
- 
- #include <drm/drm_atomic.h>
- #include <drm/drm_atomic_helper.h>
-diff --git a/kernel/nvidia-drm/nvidia-drm-drv.c b/kernel/nvidia-drm/nvidia-drm-drv.c
-index 1c2db68..d524d51 100644
---- a/kernel/nvidia-drm/nvidia-drm-drv.c
-+++ b/kernel/nvidia-drm/nvidia-drm-drv.c
-@@ -41,7 +41,12 @@
- 
- #include <drm/drmP.h>
- 
-+#include <linux/version.h>
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0)
- #include <drm/drm_crtc_helper.h>
-+#else
-+#include <drm/drm_probe_helper.h>
-+#endif
- 
- #if defined(NV_DRM_DRM_GEM_H_PRESENT)
- #include <drm/drm_gem.h>
-diff --git a/kernel/nvidia-drm/nvidia-drm-encoder.c b/kernel/nvidia-drm/nvidia-drm-encoder.c
-index f66bbd7..df38042 100644
---- a/kernel/nvidia-drm/nvidia-drm-encoder.c
-+++ b/kernel/nvidia-drm/nvidia-drm-encoder.c
-@@ -31,7 +31,12 @@
- #include "nvidia-drm-crtc.h"
- #include "nvidia-drm-helper.h"
- 
-+#include <linux/version.h>
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0)
- #include <drm/drm_crtc_helper.h>
-+#else
-+#include <drm/drm_probe_helper.h>
-+#endif
- 
- #include <drm/drm_atomic.h>
- #include <drm/drm_atomic_helper.h>
-diff --git a/kernel/nvidia-drm/nvidia-drm-gem-nvkms-memory.c b/kernel/nvidia-drm/nvidia-drm-gem-nvkms-memory.c
-index 8636eff..fd0c8da 100644
---- a/kernel/nvidia-drm/nvidia-drm-gem-nvkms-memory.c
-+++ b/kernel/nvidia-drm/nvidia-drm-gem-nvkms-memory.c
-@@ -29,6 +29,8 @@
- 
- #include "nv-mm.h"
- 
-+#include <linux/version.h>
-+
- static void __nv_drm_gem_nvkms_memory_free(struct nv_drm_gem_object *nv_gem)
- {
-     struct nv_drm_device *nv_dev = nv_gem->nv_dev;
-@@ -268,7 +270,11 @@ static int __nv_drm_vma_fault(struct vm_area_struct *vma,
-  */
- 
- #if defined(NV_VM_OPS_FAULT_REMOVED_VMA_ARG)
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0)
- static int nv_drm_vma_fault(struct vm_fault *vmf)
-+#else
-+static vm_fault_t nv_drm_vma_fault(struct vm_fault *vmf)
-+#endif
- {
-     return __nv_drm_vma_fault(vmf->vma, vmf);
- }
diff --git a/srcpkgs/nvidia390/files/kernel-5.2-x86_64.patch b/srcpkgs/nvidia390/files/kernel-5.2-x86_64.patch
deleted file mode 100644
index 344771d27d8..00000000000
--- a/srcpkgs/nvidia390/files/kernel-5.2-x86_64.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -u -r a/kernel/nvidia-uvm/uvm8_tools.c b/kernel/nvidia-uvm/uvm8_tools.c
---- a/kernel/nvidia-uvm/uvm8_tools.c	2019-01-27 16:12:22.000000000 +0000
-+++ b/kernel/nvidia-uvm/uvm8_tools.c	2019-07-09 04:42:40.134899491 +0000
-@@ -204,12 +204,14 @@
-     return event_tracker != NULL && !event_tracker->is_queue;
- }
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0)
- static void put_user_pages(struct page **pages, NvU64 page_count)
- {
-     NvU64 i;
-     for (i = 0; i < page_count; i++)
-         put_page(pages[i]);
- }
-+#endif
- 
- static void unmap_user_pages(struct page **pages, void *addr, NvU64 size)
- {
diff --git a/srcpkgs/nvidia390/template b/srcpkgs/nvidia390/template
index c667dd0cd6a..058d89fab67 100644
--- a/srcpkgs/nvidia390/template
+++ b/srcpkgs/nvidia390/template
@@ -3,10 +3,10 @@
 _desc="NVIDIA drivers (GeForce 400, 500 series)"
 
 pkgname=nvidia390
-version=390.116
-revision=3
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Proprietary NVIDIA license"
+version=390.129
+revision=2
+maintainer="Andrew Benson <abenson+void@gmail.com>"
+license="custom:NVIDIA Proprietary"
 homepage="http://www.nvidia.com"
 
 archs="i686 x86_64"
@@ -14,7 +14,8 @@ nopie=yes
 repository="nonfree"
 create_wrksrc=yes
 short_desc="${_desc} - Libraries and Utilities"
-depends="nvidia390-gtklibs-${version}_${revision} nvidia390-dkms-${version}_${revision} pkg-config"
+depends="nvidia390-libs-${version}_${revision} nvidia390-gtklibs-${version}_${revision}
+ nvidia390-dkms-${version}_${revision} pkg-config"
 conflicts="catalyst>=0 xserver-abi-video>24_1"
 
 build_options="glvnd"
@@ -24,11 +25,11 @@ build_options_default="glvnd"
 if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
 	_pkg="NVIDIA-Linux-x86-${version}"
 	distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86/${version}/${_pkg}.run"
-	checksum=13133f07e8c733eeca9f78decbcd17754f37f84b9038c8b235f9e89b52fc5b29
+	checksum=5854268c26f112a16c6fd7ded0031bf95cc8f4dab617ac5d701090fec19d6f36
 else
 	_pkg="NVIDIA-Linux-x86_64-${version}-no-compat32"
 	distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run"
-	checksum=de85a2eea39ca16e25645b345259b01fbe858b833286b7e6785afa273009ef6f
+	checksum=a7925a327cab828d1eb9e74f8943623c5dbc9a5e376a4c0184065d4a319696c1
 fi
 
 subpackages="nvidia390-gtklibs nvidia390-dkms nvidia390-opencl nvidia390-libs"
@@ -40,17 +41,6 @@ do_extract() {
 	rm -f ${_pkg}.run
 }
 
-do_patch() {
-	cd ${_pkg}
-	patch -p1 < ${FILESDIR}/kernel-5.1.patch
-	case "$XBPS_TARGET_MACHINE" in
-		x86_64)
-			patch -p1 < ${FILESDIR}/kernel-5.1-x86_64.patch
-			patch -p1 < ${FILESDIR}/kernel-5.2-x86_64.patch
-		;;
-	esac
-}
-
 pre_install() {
 	cd ${_pkg}
 	cp nvidia_icd.json.template nvidia_icd.json
diff --git a/srcpkgs/nvme-cli/INSTALL b/srcpkgs/nvme-cli/INSTALL
new file mode 100644
index 00000000000..64541c01d2c
--- /dev/null
+++ b/srcpkgs/nvme-cli/INSTALL
@@ -0,0 +1,12 @@
+if [ "$UPDATE" != "yes" ]; then
+	case "${ACTION}" in
+	post)
+		if [ ! -s etc/nvme/hostnqn ]; then
+			echo $(nvme gen-hostnqn) > etc/nvme/hostnqn
+		fi
+		if [ ! -s etc/nvme/hostid ]; then
+			uuidgen > etc/nvme/hostid
+		fi
+		;;
+	esac
+fi
diff --git a/srcpkgs/nvme-cli/REMOVE b/srcpkgs/nvme-cli/REMOVE
new file mode 100644
index 00000000000..2d37bea1a51
--- /dev/null
+++ b/srcpkgs/nvme-cli/REMOVE
@@ -0,0 +1,8 @@
+if [ "$UPDATE" != "yes" ]; then
+	case "${ACTION}" in
+	pre)
+		rm -f etc/nvme/hostnqn
+		rm -f etc/nvme/hostid
+		;;
+	esac
+fi
diff --git a/srcpkgs/nvme-cli/template b/srcpkgs/nvme-cli/template
index 8aa3947d890..7bcb4e97357 100644
--- a/srcpkgs/nvme-cli/template
+++ b/srcpkgs/nvme-cli/template
@@ -1,14 +1,26 @@
 # Template file for 'nvme-cli'
 pkgname=nvme-cli
-version=1.8.1
-revision=1
+version=1.9
+revision=2
 build_style=gnu-makefile
+# yeah, it must be 0 to enable
+make_build_args="LIBUUID=0"
 make_install_args="SBINDIR=/usr/bin"
+make_install_target="install-spec"
+makedepends="libuuid-devel"
+depends="util-linux"
 short_desc="NVMe management command line interface"
 maintainer="Peter Froehlich <peter.hans.froehlich@gmail.com>"
 license="GPL-2.0-only"
 homepage="http://nvmexpress.org"
 distfiles="https://github.com/linux-nvme/nvme-cli/archive/v${version}.tar.gz"
-checksum=93b9134b7a4cc36c9444b9ee52ef016be6e3e2f2ece50fab1f4a56ebe1e3612b
+checksum=d7c3d56f36f81c0933f7b7c3f90c4196be0fec758affc8062c525b6bc5ea65f5
 
 CFLAGS="-Wno-error -I."
+
+# these files are touch'd by install, remove so they don't get registered
+# by the package (which would subsequently cause trouble during removal)
+post_install() {
+	rm -f "${PKGDESTDIR}/etc/nvme/hostnqn"
+	rm -f "${PKGDESTDIR}/etc/nvme/hostid"
+}
diff --git a/srcpkgs/oblibs/template b/srcpkgs/oblibs/template
index 3a8d8f8a0bb..5f73199e067 100644
--- a/srcpkgs/oblibs/template
+++ b/srcpkgs/oblibs/template
@@ -1,17 +1,17 @@
 # Template file for 'oblibs'
 pkgname=oblibs
-version=0.0.1.3
+version=0.0.2.1
 revision=1
 wrksrc="${pkgname}-v${version}"
 build_style=configure
 configure_args="--prefix=/usr --libdir=/usr/lib --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps"
-makedepends="skalibs-devel"
+makedepends="skalibs-devel execline-devel"
 short_desc="Obarun library"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="ISC"
 homepage="https://framagit.org/Obarun/oblibs"
 distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.bz2"
-checksum=eb6a745e7c2e636807c8a258c250be5a3ba084b95773c13d9ad64fe6c14f8232
+checksum=16e12024183c464ef6a5e05caa9121ebd08c02f3b83190890d0680e6c04e799c
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/obs/template b/srcpkgs/obs/template
index 16877f7e78e..3ed426b1583 100644
--- a/srcpkgs/obs/template
+++ b/srcpkgs/obs/template
@@ -1,6 +1,6 @@
 # Template file for 'obs'
 pkgname=obs
-version=23.2.1
+version=24.0.1
 revision=1
 _commit_hash_obs_browser="693498b518cf893876f454ef581e13106e8370ec"
 _commit_hash_obs_vst="fde438f7a8afdf41a7ab386a0aa1a61175fc8427"
@@ -23,7 +23,7 @@ distfiles="https://github.com/obsproject/obs-studio/archive/${version}.tar.gz
 https://github.com/obsproject/obs-browser/archive/${_commit_hash_obs_browser}.tar.gz>obs_browser.tgz
 https://github.com/obsproject/obs-vst/archive/${_commit_hash_obs_vst}.tar.gz>obs_vst.tgz
 https://github.com/Mixer/ftl-sdk/archive/${_commit_hash_ftl_sdk}.tar.gz>ftl_sdk.tgz"
-checksum="9e40d1b1552ea2e4f3aa079a8a867a1d94346069a0c199461af1cc90e5271760
+checksum="5c298328fd5e8f372091fd605ad7196da73fe981668ddb7add0a930857bbb6e9
  354c5775bba5f43c2d94ed3ca1777dbb7b686f7f7a943683996dbb3aac1037ac
  0e450202e6a90f56132de0415a3d4615e9807b799a3d1955e45b33df68535cec
  00bb0d9dfe9cccd865eea4ebbe77e3a1f4a138b4a18ab4efb25ec3cddb6d1fd1"
diff --git a/srcpkgs/ocaml-findlib/template b/srcpkgs/ocaml-findlib/template
index 519aa89bbab..c2f9d246dc2 100644
--- a/srcpkgs/ocaml-findlib/template
+++ b/srcpkgs/ocaml-findlib/template
@@ -1,7 +1,7 @@
 # Template file for 'ocaml-findlib'
 pkgname=ocaml-findlib
-version=1.7.3
-revision=5
+version=1.8.1
+revision=2
 build_style=configure
 configure_args="-config /etc/findlib.conf -sitelib /usr/lib/ocaml -mandir /usr/share/man"
 make_build_args="all opt"
@@ -10,8 +10,8 @@ short_desc="OCaml package manager"
 maintainer="John Regan <john@jrjrtech.com>"
 license="MIT"
 homepage="http://projects.camlcity.org/projects/findlib.html"
-distfiles="http://download2.camlcity.org/download/findlib-${version}.tar.gz"
-checksum=d196608fa23c36c2aace27d5ef124a815132a5fcea668d41fa7d6c1ca246bd8b
+distfiles="http://download.camlcity.org/download/findlib-${version}.tar.gz"
+checksum=8e85cfa57e8745715432df3116697c8f41cb24b5ec16d1d5acd25e0196d34303
 wrksrc="findlib-${version}"
 nocross=yes
 nopie=yes
@@ -21,4 +21,6 @@ do_install() {
 	make prefix="$DESTDIR" install
 	vbin src/findlib/ocamlfind_opt
 	vlicense LICENSE
+
+	rm ${DESTDIR}/usr/lib/ocaml/ocamlbuild/META
 }
diff --git a/srcpkgs/ocaml-lablgtk2/template b/srcpkgs/ocaml-lablgtk2/template
index bd235dd0823..2bede4f1ce6 100644
--- a/srcpkgs/ocaml-lablgtk2/template
+++ b/srcpkgs/ocaml-lablgtk2/template
@@ -1,7 +1,7 @@
 # Template file for 'ocaml-lablgtk2'
 pkgname=ocaml-lablgtk2
 version=2.18.8
-revision=1
+revision=2
 wrksrc="lablgtk-${version}"
 build_style=gnu-configure
 configure_args="--without-glade --without-gnomeui --without-gtksourceview"
diff --git a/srcpkgs/ocaml-num/template b/srcpkgs/ocaml-num/template
index bf5af4e7a68..c8aa7bbbb9e 100644
--- a/srcpkgs/ocaml-num/template
+++ b/srcpkgs/ocaml-num/template
@@ -1,7 +1,7 @@
 # Template file for 'ocaml-num'
 pkgname=ocaml-num
 version=1.2
-revision=2
+revision=3
 build_style=gnu-makefile
 makedepends="ocaml ocaml-findlib"
 make_install_target="findlib-install"
diff --git a/srcpkgs/ocaml/template b/srcpkgs/ocaml/template
index 7ac1c214310..c246404a01a 100644
--- a/srcpkgs/ocaml/template
+++ b/srcpkgs/ocaml/template
@@ -1,6 +1,6 @@
 # Template file for 'ocaml'
 pkgname=ocaml
-version=4.08.1
+version=4.09.0
 revision=1
 build_style="gnu-configure"
 configure_args="--with-pic"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="QPL-1.0, LGPL-2.1-only"
 homepage="http://ocaml.org/"
 distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
-checksum=b53ed3d487b83fd49bc181bded066ae8e6fb592cf40514261d27d36050d5db85
+checksum=a7bc044167e7d09f8e3ea84b88ec9d81392908ecdac861d3d5015e5f0fc496a3
 nocross=yes
 patch_args="-Np1"
 
diff --git a/srcpkgs/ocamlbuild/template b/srcpkgs/ocamlbuild/template
index bb7d2201edd..b5db3a6d844 100644
--- a/srcpkgs/ocamlbuild/template
+++ b/srcpkgs/ocamlbuild/template
@@ -1,7 +1,7 @@
 # Template file for 'ocamlbuild'
 pkgname=ocamlbuild
 version=0.14.0
-revision=2
+revision=3
 build_style=gnu-makefile
 make_build_args="PREFIX=/usr"
 make_install_args="PREFIX=/usr"
diff --git a/srcpkgs/occt/files/opencascade.sh b/srcpkgs/occt/files/opencascade.sh
new file mode 100644
index 00000000000..4d30d9ff1d6
--- /dev/null
+++ b/srcpkgs/occt/files/opencascade.sh
@@ -0,0 +1,24 @@
+export CASROOT=/usr
+
+export CSF_LANGUAGE=us
+export MMGT_CLEAR=1
+export CSF_EXCEPTION_PROMPT=1
+
+export CSF_OCCTResourcePath=$CASROOT/share/opencascade/resources
+export CSF_SHMessage=$CSF_OCCTResourcePath/SHMessage
+export CSF_MDTVTexturesDirectory=$CSF_OCCTResourcePath/Textures
+export CSF_ShadersDirectory=$CSF_OCCTResourcePath/Shaders
+export CSF_XSMessage=$CSF_OCCTResourcePath/XSMessage
+export CSF_TObjMessage=$CSF_OCCTResourcePath/TObj
+export CSF_StandardDefaults=$CSF_OCCTResourcePath/StdResource
+export CSF_PluginDefaults=$CSF_OCCTResourcePath/StdResource
+export CSF_XCAFDefaults=$CSF_OCCTResourcePath/StdResource
+export CSF_TObjDefaults=$CSF_OCCTResourcePath/StdResource
+export CSF_StandardLiteDefaults=$CSF_OCCTResourcePath/StdResource
+export CSF_IGESDefaults=$CSF_OCCTResourcePath/XSTEPResource
+export CSF_STEPDefaults=$CSF_OCCTResourcePath/XSTEPResource
+export CSF_XmlOcafResource=$CSF_OCCTResourcePath/XmlOcafResource
+export CSF_MIGRATION_TYPES=$CSF_OCCTResourcePath/StdResource/MigrationSheet.txt
+export CSF_DrawPluginDefaults=$CSF_OCCTResourcePath/DrawResources
+export DRAWHOME=$CSF_OCCTResourcePath/DrawResources
+export DRAWDEFAULT=$CSF_OCCTResourcePath/DrawResources/DrawDefault
diff --git a/srcpkgs/occt/patches/musl-fenv.patch b/srcpkgs/occt/patches/musl-fenv.patch
index 4a2e880db4f..c4fd770646d 100644
--- a/srcpkgs/occt/patches/musl-fenv.patch
+++ b/srcpkgs/occt/patches/musl-fenv.patch
@@ -7,7 +7,7 @@ non-posix functions fegetexcept(3) and feenableexcept(3).
 
 --- src/OSD/OSD_signal.cxx.orig
 +++ src/OSD/OSD_signal.cxx
-@@ -645,7 +645,7 @@
+@@ -703,7 +703,7 @@
  
  #include <signal.h>
  
@@ -16,40 +16,21 @@ non-posix functions fegetexcept(3) and feenableexcept(3).
    #include <sys/signal.h>
  #endif
  
-@@ -687,7 +687,7 @@
-   // cout << "OSD::Handler: signal " << (int) theSignal << " occured inside a try block " <<  endl ;
-   if ( ADR_ACT_SIGIO_HANDLER != NULL )
-     (*ADR_ACT_SIGIO_HANDLER)() ;
--#ifdef __linux__
-+#if defined(__linux__) && defined(__GLIBC__)
-   if (fFltExceptions)
-     feenableexcept (FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW);
-     //feenableexcept (FE_INVALID | FE_DIVBYZERO);
-@@ -805,7 +805,7 @@
-   (void)theSignal; // silence GCC warnings
-   (void)theContext;
- 
--#ifdef __linux__
-+#if defined(__linux__) && defined(__GLIBC__)
-   if (fFltExceptions)
-     feenableexcept (FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW);
-     //feenableexcept (FE_INVALID | FE_DIVBYZERO);
-@@ -892,14 +892,18 @@
- #endif
-     }
- #elif defined (__linux__)
-+#if defined(__GLIBC__)
-     feenableexcept (FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW);
-+#endif
-     fFltExceptions = Standard_True;
- #endif
-   }
-   else
+@@ -914,7 +914,7 @@
+ //=======================================================================
+ void OSD::SetFloatingSignal (Standard_Boolean theFloatingSignal)
+ {
+-#if defined (__linux__)
++#if defined (__linux__) && defined(__GLIBC__)
+   feclearexcept (FE_ALL_EXCEPT);
+   if (theFloatingSignal)
    {
- #if defined (__linux__)
-+#if defined(__GLIBC__)
-     fedisableexcept (FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW);
-+#endif
-     fFltExceptions = Standard_False;
- #endif
-   }
+@@ -947,7 +947,7 @@
+ //=======================================================================
+ Standard_Boolean OSD::ToCatchFloatingSignals()
+ {
+-#if defined (__linux__)
++#if defined (__linux__) && defined(__GLIBC__)
+   return (fegetexcept() & _OSD_FPX) != 0;
+ #else
+   return Standard_False;
diff --git a/srcpkgs/occt/template b/srcpkgs/occt/template
index 70647369464..3b131d74512 100644
--- a/srcpkgs/occt/template
+++ b/srcpkgs/occt/template
@@ -1,6 +1,6 @@
 # Template file for 'occt'
 pkgname=occt
-version=7.3.0p3
+version=7.4.0
 revision=1
 _gittag="V${version//./_}"
 wrksrc=occt-${_gittag}
@@ -13,16 +13,19 @@ short_desc="OpenCASCADE Technology - library for CAD/CAM/CAE applications"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="LGPL-2.1-only"
 homepage="https://www.opencascade.com"
-# distifile: use git instead of official tarball that requires registration
+# distfile: use git instead of official tarball, which requires registration
 # see https://www.opencascade.com/content/packaging-again-debian
 distfiles="https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/tags/${_gittag};sf=tgz>occt-${_gittag}.tar.gz"
-checksum=fbd46db3e75313131b88a606024ea4d4496c3c7f6e68c23988e9d3e673d4f21b
+checksum=655da7717dac3460a22a6a7ee68860c1da56da2fec9c380d8ac0ac0349d67676
 conflicts="oce>=0"
 
 post_install() {
 	rm ${PKGDESTDIR}/usr/share/doc/opencascade/*_LGPL_*.txt
 	vlicense OCCT_LGPL_EXCEPTION.txt
 	rm ${DESTDIR}/usr/bin/custom*.sh
+
+	vmkdir /etc/profile.d
+	vinstall ${FILESDIR}/opencascade.sh 644 /etc/profile.d
 }
 
 occt-devel_package() {
diff --git a/srcpkgs/offlineimap/template b/srcpkgs/offlineimap/template
index cdbeb81a3ed..b58c5fa5bd9 100644
--- a/srcpkgs/offlineimap/template
+++ b/srcpkgs/offlineimap/template
@@ -1,19 +1,19 @@
 # Template file for 'offlineimap'
 pkgname=offlineimap
-version=7.2.4
+version=7.3.0
 revision=1
 archs=noarch
 build_style=python2-module
 pycompile_module="offlineimap"
-hostmakedepends="python-six asciidoc"
-depends="python-six"
+hostmakedepends="python-six python-rfc6555 asciidoc"
+depends="python-six python-rfc6555"
 short_desc="Powerful IMAP/Maildir synchronization and reader support"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Peter Bui <pbui@github.bx612.space>"
 license="GPL-2.0-or-later"
 homepage="http://offlineimap.org/"
 changelog="https://raw.githubusercontent.com/OfflineIMAP/offlineimap/master/Changelog.md"
 distfiles="https://github.com/OfflineIMAP/offlineimap/archive/v${version}.tar.gz"
-checksum=5b6590c82cd5f6cbfe09e89ce52622208f5d4b24e021fce7646204b417bd1d2e
+checksum=d8378e82e392c70f5c20cb08705687da30cd427f2bca539939311512777e6659
 
 post_install() {
 	make -C docs man
diff --git a/srcpkgs/ofono/template b/srcpkgs/ofono/template
index c218c991b45..379bc9f981a 100644
--- a/srcpkgs/ofono/template
+++ b/srcpkgs/ofono/template
@@ -1,18 +1,18 @@
 # Template file for 'ofono'
 pkgname=ofono
-version=1.28
+version=1.30
 revision=1
 build_style=gnu-configure
-configure_args="--disable-bluez4"
+configure_args="--disable-bluez4 --enable-external-ell"
 conf_files="/etc/ofono/phonesim.conf /etc/dbus-1/system.d/ofono.conf"
 hostmakedepends="pkg-config"
-makedepends="libglib-devel eudev-libudev-devel mobile-broadband-provider-info"
+makedepends="libglib-devel eudev-libudev-devel mobile-broadband-provider-info ell-devel"
 short_desc="Infrastructure for building mobile telephony (GMS/UTMS) applications"
 maintainer="Daniel Santana <daniel@santana.tech>"
 license="GPL-2.0-or-later"
 homepage="https://01.org/ofono"
 distfiles="${KERNEL_SITE}/network/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=93bb2cedef54f897dd5200e22b072a6e38b5d9b44be57eebbbe8d513f0beb0e4
+checksum=8079735efc5d7f33be9e792e791f2f7ff75c31ce67d477b994673e32319eec5c
 
 post_install() {
 	vsv ofonod
diff --git a/srcpkgs/ok.sh/template b/srcpkgs/ok.sh/template
index b7b908195cf..627b49f51a4 100644
--- a/srcpkgs/ok.sh/template
+++ b/srcpkgs/ok.sh/template
@@ -5,7 +5,7 @@ revision=1
 depends="curl jq"
 checkdepends="socat ${depends}"
 short_desc="GitHub API client library written in POSIX sh"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/whiteinge/ok.sh"
 distfiles="https://github.com/whiteinge/ok.sh/archive/${version}.tar.gz"
diff --git a/srcpkgs/okular/template b/srcpkgs/okular/template
index cf9991781dc..f4de8263755 100644
--- a/srcpkgs/okular/template
+++ b/srcpkgs/okular/template
@@ -1,6 +1,6 @@
 # Template file for 'okular'
 pkgname=okular
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config kcoreaddons"
@@ -14,7 +14,7 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-only"
 homepage="https://www.kde.org/applications/graphics/okular/"
 distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=721a0d02d5ff9277c4a9a13dbde0ede3528eff848622e83abc36d57d9759b3ec
+checksum=ff3d2eac444a110a611add71c30b0556085f5aaccdd821a80bd070a646c9f6b3
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-qmake qt5-host-tools kdoctools kconfig"
diff --git a/srcpkgs/olive/template b/srcpkgs/olive/template
index 0a93dbbc59a..afde6b92a34 100644
--- a/srcpkgs/olive/template
+++ b/srcpkgs/olive/template
@@ -1,6 +1,6 @@
 # Template file for 'olive'
 pkgname=olive
-version=0.1.0
+version=0.1.1
 revision=1
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-multimedia-devel qt5-svg-devel pkg-config"
@@ -10,7 +10,7 @@ maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.olivevideoeditor.org"
 distfiles="https://github.com/olive-editor/olive/archive/${version}.tar.gz"
-checksum=099fc37fd9ae0cf272a86d0fb56ede154b0b76779690631cd256339a0a440244
+checksum=0df1b596d48d8b9d9fa3f5d0055000ef3b1ac2f12ce18fdedeb54b3c0e882a89
 
 do_install() {
 	vbin olive-editor
diff --git a/srcpkgs/olm-python/template b/srcpkgs/olm-python/template
index cdb021a5652..57ac1cfa01b 100644
--- a/srcpkgs/olm-python/template
+++ b/srcpkgs/olm-python/template
@@ -1,6 +1,6 @@
 # Template file for 'olm-python'
 pkgname=olm-python
-version=3.1.3
+version=3.1.4
 revision=1
 wrksrc="olm-${version}"
 build_wrksrc=python
@@ -14,7 +14,7 @@ maintainer="Adam Beckmeyer <adam_gpg@thebeckmeyers.xyz>"
 license="Apache-2.0"
 homepage="https://gitlab.matrix.org/matrix-org/olm"
 distfiles="https://gitlab.matrix.org/matrix-org/olm/-/archive/${version}/olm-${version}.tar.bz2"
-checksum=ed898604eb8ba61b470ce492c0a21994100484e4b6e3e78fb589b16042cb1d13
+checksum=eff513cff8e5c7af657e800a2c2dbbdee5be19ee9ce24c5498a2528c4b5f1dc3
 
 pre_build() {
 	make include/olm/olm.h
diff --git a/srcpkgs/olm/template b/srcpkgs/olm/template
index 86bdaf2f767..c4d8e41b5a8 100644
--- a/srcpkgs/olm/template
+++ b/srcpkgs/olm/template
@@ -1,6 +1,6 @@
 # Template file for 'olm'
 pkgname=olm
-version=3.1.3
+version=3.1.4
 revision=1
 build_style=cmake
 short_desc="Implementation of the Double Ratchet cryptographic ratchet"
@@ -8,7 +8,7 @@ maintainer="Adam Beckmeyer <adam_gpg@thebeckmeyers.xyz>"
 license="Apache-2.0"
 homepage="https://gitlab.matrix.org/matrix-org/olm"
 distfiles="https://gitlab.matrix.org/matrix-org/olm/-/archive/${version}/olm-${version}.tar.bz2"
-checksum=ed898604eb8ba61b470ce492c0a21994100484e4b6e3e78fb589b16042cb1d13
+checksum=eff513cff8e5c7af657e800a2c2dbbdee5be19ee9ce24c5498a2528c4b5f1dc3
 
 do_check() {
 	cd build/tests
diff --git a/srcpkgs/onionshare/template b/srcpkgs/onionshare/template
index 1eb1272c56a..c585ae6101e 100644
--- a/srcpkgs/onionshare/template
+++ b/srcpkgs/onionshare/template
@@ -1,6 +1,6 @@
 # Template file for 'onionshare'
 pkgname=onionshare
-version=2.1
+version=2.2
 revision=1
 archs=noarch
 build_style=python3-module
@@ -12,13 +12,14 @@ depends="python3-cffi python3-chardet python3-click python3-cryptography
  python3-Jinja2 python3-MarkupSafe python3-pycparser python3-pycryptodome
  python3-PyQt5 python3-pysocks python3-requests python3-six python3-stem
  python3-urllib3 python3-Werkzeug python3-asn1crypto python3-altgraph
- python3-sip-PyQt5 python3-macholib python3-pefile python3-simplejson tor"
+ python3-sip-PyQt5 python3-macholib python3-pefile python3-simplejson tor
+ python3-Flask-HTTPAuth"
 short_desc="Share files anonymously and securely"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://onionshare.org/"
 distfiles="https://github.com/micahflee/onionshare/archive/v${version}.tar.gz"
-checksum=b412bc1e9d08deaa2805cfc9532b556928fa7b332d249189fb0887f27d587ddb
+checksum=7173863d7582b05aa8fd0d2207236e3cbbb38d854aad65e3b98ec5baad521fc2
 
 conf_files="/etc/apparmor.d/local/*"
 
diff --git a/srcpkgs/opam/template b/srcpkgs/opam/template
index efb8f38140b..110a00f4b73 100644
--- a/srcpkgs/opam/template
+++ b/srcpkgs/opam/template
@@ -1,7 +1,7 @@
 # Template file for 'opam'
 pkgname=opam
 version=2.0.5
-revision=1
+revision=2
 build_style=gnu-configure
 disable_parallel_build=yes
 configure_args="--docdir=/usr/share/doc/${pkgname}"
diff --git a/srcpkgs/open-iscsi/patches/ether.patch b/srcpkgs/open-iscsi/patches/ether.patch
deleted file mode 100644
index 03dcacc750f..00000000000
--- a/srcpkgs/open-iscsi/patches/ether.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- iscsiuio/src/unix/libs/qedi.c.orig
-+++ iscsiuio/src/unix/libs/qedi.c
-@@ -46,6 +46,7 @@
- #include <errno.h>
- #include <stdio.h>
- #include <string.h>
-+#include <netinet/if_ether.h>
- #include <arpa/inet.h>
- #include <linux/types.h>
- #include <linux/sockios.h>
diff --git a/srcpkgs/open-iscsi/patches/fix-musl-2.patch b/srcpkgs/open-iscsi/patches/fix-musl-2.patch
deleted file mode 100644
index 9841ed9ed9d..00000000000
--- a/srcpkgs/open-iscsi/patches/fix-musl-2.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- libopeniscsiusr/iface.c.orig	2018-01-25 05:03:12.126607300 +0100
-+++ libopeniscsiusr/iface.c	2018-01-25 05:03:24.741754982 +0100
-@@ -30,6 +30,7 @@
- #include <netdb.h>
- #include <assert.h>
- #include <inttypes.h>
-+#include <limits.h>
- 
- #include "libopeniscsiusr/libopeniscsiusr.h"
- #include "misc.h"
diff --git a/srcpkgs/open-iscsi/template b/srcpkgs/open-iscsi/template
index 0482757e1ca..154551e561a 100644
--- a/srcpkgs/open-iscsi/template
+++ b/srcpkgs/open-iscsi/template
@@ -1,17 +1,17 @@
 # Template file for 'open-iscsi'
 pkgname=open-iscsi
-version=2.0.876
+version=2.0.878
 revision=2
 conf_files="/etc/iscsi/iscsid.conf /etc/iscsi/initiatorname.iscsi"
 build_style=gnu-configure
-hostmakedepends="automake libtool"
-makedepends="libisns-devel libmount-devel libressl-devel"
+hostmakedepends="automake libtool pkg-config"
+makedepends="libisns-devel libkmod-devel libmount-devel libressl-devel"
 short_desc="Open-iSCSI userland tools"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://www.open-iscsi.com/"
 distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
-checksum=9f01327d5e100ed794dc5083fc18dc4a06a0c29c77b252e21abd1b8f56edd9a7
+checksum=5aeef0069c4a9d7f288269bcf56588d09a3c529a35f865f16dd8119ab8672208
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) CFLAGS+="-D_LINUX_IF_ETHER_H";;
@@ -20,15 +20,17 @@ post_extract() {
 	sed -i '1i#include <fcntl.h>' usr/idbm.c
 	sed -i 's/(__compar_fn_t)//' utils/fwparam_ibft/fwparam_ppc.c
 	sed -i '/CC.*-o/s/$/ $(LDFLAGS)/' utils/Makefile usr/Makefile
-	sed -i 's,<linux/if_ether.h>,<netinet/if_ether.h>,g' usr/iscsi_net_util.c
-	sed -i '1i#include <netinet/if_ether.h>' iscsiuio/src/unix/libs/bnx2x.c
 	sed -i 's/lib64/lib/g' libopeniscsiusr/Makefile
+	sed -i 's,<linux/if_ether.h>,<netinet/if_ether.h>,g' usr/iscsi_net_util.c
+	sed -i '1i#include <netinet/if_ether.h>' iscsiuio/src/unix/libs/bnx2x.c libopeniscsiusr/misc.c
 }
 do_configure() {
-	( cd iscsiuio && autoreconf -fi && ./configure ${configure_args} )
+	( cd iscsiuio && autoreconf -fi && ./configure ${configure_args} CFLAGS="-DNO_SYSTEMD" )
 }
 do_build() {
-	make ${makejobs} CC="$CC" OPTFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
+	make ${makejobs} CC="$CC" \
+		OPTFLAGS="$CFLAGS $(pkg-config --cflags libkmod) -DNO_SYSTEMD" \
+		LDFLAGS="$LDFLAGS $(pkg-config --libs libkmod)" NO_SYSTEMD=1
 }
 do_install() {
 	make install exec_prefix=/usr sbindir=/usr/bin DESTDIR="$DESTDIR"
diff --git a/srcpkgs/open-vm-tools/patches/gcc9.patch b/srcpkgs/open-vm-tools/patches/gcc9.patch
deleted file mode 100644
index 346c8187d61..00000000000
--- a/srcpkgs/open-vm-tools/patches/gcc9.patch
+++ /dev/null
@@ -1,103 +0,0 @@
---- hgfsmounter/hgfsmounter.c
-+++ hgfsmounter/hgfsmounter.c
-@@ -1,5 +1,5 @@
- /*********************************************************
-- * Copyright (C) 2006-2017 VMware, Inc. All rights reserved.
-+ * Copyright (C) 2006-2019 VMware, Inc. All rights reserved.
-  *
-  * This program is free software; you can redistribute it and/or
-  * modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published
-@@ -514,11 +514,13 @@ ParseFmask(const char *option,         // IN:
-option string along with value
-            HgfsMountInfo *mountInfo,   // OUT: mount data
-            int *flags)                 // OUT: mount flags
- {
-+   unsigned short fmask = 0;
-    ASSERT(option);
-    ASSERT(mountInfo);
- 
--   if (ParseMask(option, &mountInfo->fmask)) {
--      LOG("Setting mount fmask to %o\n", mountInfo->fmask);
-+   if (ParseMask(option, &fmask)) {
-+      LOG("Setting mount fmask to %o\n", fmask);
-+      mountInfo->fmask = fmask;
-       return TRUE;
-    }
- 
-@@ -548,11 +550,13 @@ ParseDmask(const char *option,         // IN:
-option string along with value
-            HgfsMountInfo *mountInfo,   // OUT: mount data
-            int *flags)                 // OUT: mount flags
- {
-+   unsigned short dmask = 0;
-    ASSERT(option);
-    ASSERT(mountInfo);
- 
--   if (ParseMask(option, &mountInfo->dmask)) {
--      LOG("Setting mount dmask to %o\n", mountInfo->dmask);
-+   if (ParseMask(option, &dmask)) {
-+      LOG("Setting mount dmask to %o\n", dmask);
-+      mountInfo->dmask = dmask;
-       return TRUE;
-    }
---- lib/hgfsServer/hgfsServer.c
-+++ lib/hgfsServer/hgfsServer.c
-@@ -1,5 +1,5 @@
- /*********************************************************
-- * Copyright (C) 1998-2018 VMware, Inc. All rights reserved.
-+ * Copyright (C) 1998-2019 VMware, Inc. All rights reserved.
-  *
-  * This program is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as published
-@@ -6536,11 +6536,13 @@ HgfsServerRead(HgfsInputParam *input)  // IN: Input params
-             payload = &reply->payload[0];
-          }
-          if (payload) {
-+            uint32 actualSize = 0;
-             status = HgfsPlatformReadFile(readFd, input->session, offset,
-                                           requiredSize, payload,
--                                          &reply->actualSize);
-+                                          &actualSize);
-             if (HGFS_ERROR_SUCCESS == status) {
-                reply->reserved = 0;
-+               reply->actualSize = actualSize;
-                replyPayloadSize = sizeof *reply;
- 
-                if (readUseDataBuffer) {
-@@ -6556,11 +6558,13 @@ HgfsServerRead(HgfsInputParam *input)  // IN: Input params
-          break;
-       }
-    case HGFS_OP_READ: {
-+         uint32 actualSize = 0;
-          HgfsReplyRead *reply = replyRead;
- 
-          status = HgfsPlatformReadFile(readFd, input->session, offset, requiredSize,
--                                       reply->payload, &reply->actualSize);
-+                                       reply->payload, &actualSize);
-          if (HGFS_ERROR_SUCCESS == status) {
-+            reply->actualSize = actualSize;
-             replyPayloadSize = sizeof *reply + reply->actualSize;
-          } else {
-             LOG(4, ("%s: V1 Failed to read-> %d.\n", __FUNCTION__, status));
---- lib/misc/util_misc.c
-+++ lib/misc/util_misc.c
-@@ -1,5 +1,5 @@
- /*********************************************************
-- * Copyright (C) 1998-2018 VMware, Inc. All rights reserved.
-+ * Copyright (C) 1998-2019 VMware, Inc. All rights reserved.
-  *
-  * This program is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as published
-@@ -719,8 +719,8 @@ Util_ExpandString(const char *fileName) // IN  file path to expand
-       ASSERT(!freeChunk[i]);
-       chunks[i] = expand;
-       if (chunks[i] == NULL) {
--	 Log("%s: Cannot allocate memory to expand \"%s\" in \"%s\".\n",
--             __FUNCTION__, expand, fileName);
-+	 Log("%s: Cannot allocate memory to expand $ in \"%s\".\n",
-+             __FUNCTION__, fileName);
- 	 goto out;
-       }
-       chunkSize[i] = strlen(expand);
diff --git a/srcpkgs/open-vm-tools/template b/srcpkgs/open-vm-tools/template
index 7d471b68a32..586d7b30879 100644
--- a/srcpkgs/open-vm-tools/template
+++ b/srcpkgs/open-vm-tools/template
@@ -1,32 +1,29 @@
 # Template file for 'open-vm-tools'
 pkgname=open-vm-tools
-version=10.3.10
-revision=3
-_build=12406962
+version=11.0.0
+revision=1
+_build=14549434
+archs="x86_64 i686"
 wrksrc="open-vm-tools-${version}-${_build}"
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --with-udev-rules-dir=/usr/lib/udev/rules.d
  --without-xmlsecurity --without-kernel-modules
  $(vopt_with x11 x) $(vopt_with pam)"
-hostmakedepends="automake libtool pkg-config"
+hostmakedepends="automake libtool pkg-config glib-devel"
 makedepends="fuse-devel glib-devel icu-devel libdnet-devel libmspack-devel
  libressl-devel libxerces-c-devel procps-ng-devel $(vopt_if pam 'pam-devel')
  $(vopt_if x11 'gtkmm-devel libXtst-devel xmlsec1-devel')"
 short_desc="Open source implementation of VMware Tools"
-maintainer="Carson Page <pagem.carson@gmail.com>"
+maintainer="Piraty <piraty1@inbox.ru>"
 license="GPL-2.0-only, LGPL-2.1-only"
 homepage="https://github.com/vmware/open-vm-tools"
+changelog="https://github.com/vmware/open-vm-tools/blob/master/open-vm-tools/ChangeLog"
 distfiles="https://github.com/vmware/open-vm-tools/releases/download/stable-${version}/open-vm-tools-${version}-${_build}.tar.gz"
-checksum=a3c02595c802680be258d6249513c76502d383a59597079b10984bb9136dbef5
+checksum=b95141b0eb8a46094f905c29b969ad7ee63997194df168c82e35389bb1cebc7b
 
 build_options="pam x11"
 build_options_default="pam x11"
 
-case "$XBPS_TARGET_MACHINE" in
-	*-musl) broken="Musl requires addl. patches";;
-	"arm"*|"aarch"*) broken=yes;;
-esac
-
 pre_configure() {
 	autoreconf -vfi
 }
@@ -45,4 +42,3 @@ post_install() {
 	# Install service
 	vsv vmtoolsd
 }
-
diff --git a/srcpkgs/openbsd-netcat/template b/srcpkgs/openbsd-netcat/template
index f130bc41665..ff03a91e538 100644
--- a/srcpkgs/openbsd-netcat/template
+++ b/srcpkgs/openbsd-netcat/template
@@ -1,19 +1,19 @@
 # Template file for 'openbsd-netcat'
 pkgname=openbsd-netcat
 version=1.203
-revision=1
+revision=2
 wrksrc="netcat-openbsd-${version%p*}"
 hostmakedepends="pkg-config"
 makedepends="libbsd-devel"
 short_desc="TCP/IP swiss army knife (OpenBSD/Debian variant)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="3-clause-BSD,2-clause-BSD"
+license="BSD-2-Clause,BSD-3-Clause"
 homepage="http://packages.debian.org/sid/netcat-openbsd"
 distfiles="
  ${DEBIAN_SITE}/main/n/netcat-openbsd/netcat-openbsd_${version%p*}.orig.tar.gz
- ${DEBIAN_SITE}/main/n/netcat-openbsd/netcat-openbsd_${version}-1.debian.tar.xz"
+ ${DEBIAN_SITE}/main/n/netcat-openbsd/netcat-openbsd_${version}-2.debian.tar.xz"
 checksum="b025399f1588da78108290a721157be66871b096bc9c3973ebdc8d773f750a3f
- 704a235862f50c550dba40820f523620bc943f8dc8e056a554032d23cd1356f9"
+ a90ef4278f773f9de44364c13cf195f5db2447dd5e3bcf137a7d1250b92455db"
 
 alternatives="
  nc:nc:/usr/bin/openbsd-nc
diff --git a/srcpkgs/openconnect/template b/srcpkgs/openconnect/template
index b576efb41a2..4d16fab5249 100644
--- a/srcpkgs/openconnect/template
+++ b/srcpkgs/openconnect/template
@@ -1,6 +1,6 @@
 # Template file for 'openconnect'
 pkgname=openconnect
-version=8.04
+version=8.05
 revision=1
 build_style=gnu-configure
 configure_args="--with-vpnc-script=/usr/libexec/vpnc-scripts/vpnc-script"
@@ -13,7 +13,7 @@ maintainer="Eivind Uggedal <eivind@uggedal.com>"
 license="LGPL-2.1-only"
 homepage="http://www.infradead.org/openconnect/"
 distfiles="ftp://ftp.infradead.org/pub/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=98979c6e3f78b294dc663e3fd75d5c9e9d779f247be9d4e3ab84b5e90565f81f
+checksum=335c2952d0cb36822acb112eaaf5e3b4acffc6874985fb614fec0b76c4c12992
 
 openconnect-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/opendkim/files/opendkim/run b/srcpkgs/opendkim/files/opendkim/run
new file mode 100644
index 00000000000..644eaac43a8
--- /dev/null
+++ b/srcpkgs/opendkim/files/opendkim/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+[ -r ./conf ] && . ./conf
+exec opendkim -f ${OPTS}
diff --git a/srcpkgs/opendkim/template b/srcpkgs/opendkim/template
index 98f7cd5bcce..a4a20b82939 100644
--- a/srcpkgs/opendkim/template
+++ b/srcpkgs/opendkim/template
@@ -1,14 +1,14 @@
 # Template file for 'opendkim'
 pkgname=opendkim
 version=2.10.3
-revision=9
+revision=10
 build_style=gnu-configure
 configure_args="--with-milter=${XBPS_CROSS_BASE}/usr"
-makedepends="libbsd-devel libressl-devel libmilter-devel"
 hostmakedepends="pkg-config"
+makedepends="libbsd-devel libressl-devel libmilter-devel"
 short_desc="DKIM library"
 maintainer="John Regan <john@jrjrtech.com>"
-license="BSD, Sendmail"
+license="BSD-3-Clause, Sendmail"
 homepage="http://www.opendkim.org"
 distfiles="${SOURCEFORGE_SITE}/project/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=43a0ba57bf942095fe159d0748d8933c6b1dd1117caf0273fa9a0003215e681b
@@ -16,6 +16,7 @@ checksum=43a0ba57bf942095fe159d0748d8933c6b1dd1117caf0273fa9a0003215e681b
 post_install() {
 	vlicense LICENSE
 	vlicense LICENSE.Sendmail
+	vsv opendkim
 }
 
 opendkim-devel_package() {
diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index c6b49047f19..045c70586a3 100644
--- a/srcpkgs/openldap/template
+++ b/srcpkgs/openldap/template
@@ -1,7 +1,7 @@
 # Template file for 'openldap'
 pkgname=openldap
 version=2.4.48
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--prefix=/usr
  --libexecdir=/usr/libexec
@@ -40,6 +40,7 @@ post_install() {
 	chmod 755 ${DESTDIR}/usr/lib/*.so.*
 	vmkdir usr/share/examples/openldap
 	mv ${DESTDIR}/etc/openldap/*.{example,default} ${DESTDIR}/usr/share/examples/openldap
+	chmod 0644 ${DESTDIR}/usr/share/examples/openldap/*
 }
 
 
diff --git a/srcpkgs/openmw/template b/srcpkgs/openmw/template
index aa1360ebd25..d5e28d625bc 100644
--- a/srcpkgs/openmw/template
+++ b/srcpkgs/openmw/template
@@ -16,8 +16,11 @@ changelog="https://openmw.org/2018/openmw-0-44-0-released/"
 distfiles="https://gitlab.com/OpenMW/openmw/-/archive/openmw-${version}/openmw-openmw-${version}.tar.gz"
 checksum=b63cf971f406ef5f28019f65e9e2bd9641a227459ede45d147562917f67e1c64
 
+if [ "$XBPS_TARGET_ENDIAN" != "le" ]; then
+	broken="https://gitlab.com/OpenMW/openmw/issues/564"
+fi
+
 case "${XBPS_TARGET_MACHINE}" in
-	mips | mips-musl ) broken="https://bugs.openmw.org/issues/564" ;;
 	arm*) broken="https://travis-ci.org/Johnnynator/void-packages/jobs/308902351" ;;
 esac
 
diff --git a/srcpkgs/openresolv/template b/srcpkgs/openresolv/template
index b7a22cc0cd8..efaffce0645 100644
--- a/srcpkgs/openresolv/template
+++ b/srcpkgs/openresolv/template
@@ -1,6 +1,6 @@
 # Template file for 'openresolv'
 pkgname=openresolv
-version=3.9.1
+version=3.9.2
 revision=1
 archs=noarch
 build_style=gnu-configure
@@ -11,5 +11,5 @@ conf_files="/etc/resolvconf.conf"
 hostmakedepends="runit"
 homepage="http://roy.marples.name/projects/openresolv/home"
 distfiles="http://roy.aydogan.net/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=38b8e7e131a39b1c0d4e5688618b8572adf92a5bf757ae9f272e9f81108a9ff2
+checksum=14d7e241682e5566f6b8bf4c7316c86d7a9b8e7ed48e1de4967dbf1ea84ed373
 configure_args="--bindir=/usr/bin"
diff --git a/srcpkgs/openssh/patches/setproctitle.patch b/srcpkgs/openssh/patches/setproctitle.patch
deleted file mode 100644
index dc40c330720..00000000000
--- a/srcpkgs/openssh/patches/setproctitle.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- openbsd-compat/setproctitle.c.orig
-+++ openbsd-compat/setproctitle.c
-@@ -36,6 +36,7 @@
- #ifndef HAVE_SETPROCTITLE
- 
- #include <stdarg.h>
-+#include <stdio.h>
- #include <stdlib.h>
- #include <unistd.h>
- #ifdef HAVE_SYS_PSTAT_H
diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 447973d0c7e..5dc97b69ca4 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,7 +1,7 @@
 # Template file for 'openssh'
 pkgname=openssh
-version=8.0p1
-revision=3
+version=8.1p1
+revision=1
 build_style=gnu-configure
 configure_args="--datadir=/usr/share/openssh
  --sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody
@@ -22,7 +22,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-2-Clause, ISC"
 homepage="https://www.openssh.com"
 distfiles="https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${version}.tar.gz"
-checksum=bd943879e69498e8031eb6b7f44d08cdc37d59a7ab689aa0b437320c3481fd68
+checksum=02f5dbef3835d0753556f973cd57b4c19b6b1f6cd24c03445e23ac77ca1b93ff
 conf_files="/etc/ssh/moduli /etc/ssh/ssh_config /etc/ssh/sshd_config /etc/pam.d/sshd"
 make_dirs="/var/chroot/ssh 0755 root root"
 
@@ -44,6 +44,7 @@ esac
 
 pre_configure() {
 	autoreconf -fi
+	vsed -i -e 's|#include <sys/sysctl.h>||' servconf.c
 }
 
 post_install() {
diff --git a/srcpkgs/opentmpfiles/template b/srcpkgs/opentmpfiles/template
index ffeb886cdb2..66e3bd34f2f 100644
--- a/srcpkgs/opentmpfiles/template
+++ b/srcpkgs/opentmpfiles/template
@@ -5,7 +5,7 @@ revision=1
 archs=noarch
 build_style=gnu-makefile
 short_desc="A standalone utility for handling systemd-style tmpfiles.d settings"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/OpenRC/opentmpfiles"
 distfiles="https://github.com/OpenRC/opentmpfiles/archive/${version}.tar.gz"
diff --git a/srcpkgs/openttd/template b/srcpkgs/openttd/template
index edc25e4c58f..71439c6a741 100644
--- a/srcpkgs/openttd/template
+++ b/srcpkgs/openttd/template
@@ -1,7 +1,7 @@
 # Template file for 'openttd'
 pkgname=openttd
-version=1.9.2
-revision=2
+version=1.9.3
+revision=1
 _gfxver=0.5.5
 _sfxver=0.2.3
 build_style=gnu-configure
@@ -16,7 +16,7 @@ homepage="https://www.openttd.org/"
 distfiles="https://proxy.binaries.openttd.org/openttd-releases/${version}/openttd-${version}-source.tar.xz
  https://bundles.openttdcoop.org/opengfx/releases/${_gfxver}/opengfx-${_gfxver}.zip
  https://bundles.openttdcoop.org/opensfx/releases/${_sfxver}/opensfx-${_sfxver}.zip"
-checksum="f9ff8c255145a1dd617798a9413179cc740a0cc91709455990880a15eeb7564a
+checksum="1988e17f5b6f4b8f423c849ef1c579c21f678722ae4440f87b27a5fea6385846
  c648d56c41641f04e48873d83f13f089135909cc55342a91ed27c5c1683f0dfe
  3574745ac0c138bae53b56972591db8d778ad9faffd51deae37a48a563e71662"
 
diff --git a/srcpkgs/opera/template b/srcpkgs/opera/template
index c17766d5a6e..4d75fa7a473 100644
--- a/srcpkgs/opera/template
+++ b/srcpkgs/opera/template
@@ -1,6 +1,6 @@
 # Template file for 'opera'
 pkgname=opera
-version=62.0.3331.99
+version=64.0.3417.54
 revision=1
 archs="x86_64"
 depends="ffmpeg desktop-file-utils hicolor-icon-theme"
@@ -9,7 +9,7 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="custom:Proprietary"
 homepage="https://www.opera.com/computer"
 distfiles="http://get.geo.opera.com/pub/opera/desktop/${version}/linux/${pkgname}-stable_${version}_amd64.deb"
-checksum=29a11c820eb97ce71f6ab42fac02e556bb38e532556116bd76685fbf77d2eadf
+checksum=bc6974261b73a6a318a35f2d4b28dbc7ddec6dda171517a744c16a5a824c1341
 repository="nonfree"
 nostrip=yes
 
diff --git a/srcpkgs/opus/template b/srcpkgs/opus/template
index d1d538df3b2..244dbdbb9d5 100644
--- a/srcpkgs/opus/template
+++ b/srcpkgs/opus/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-configure
 configure_args="--enable-float-approx"
 short_desc="Totally open, royalty-free, highly versatile audio codec"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://www.opus-codec.org/"
 distfiles="https://archive.mozilla.org/pub/opus/opus-${version}.tar.gz"
diff --git a/srcpkgs/orage/template b/srcpkgs/orage/template
index 6166a031d76..7edd2af8ada 100644
--- a/srcpkgs/orage/template
+++ b/srcpkgs/orage/template
@@ -1,7 +1,7 @@
 # Template file for 'orage'
 pkgname=orage
 version=4.12.1
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool flex"
 makedepends="libical-devel libnotify-devel gtk+3-devel
diff --git a/srcpkgs/orca/template b/srcpkgs/orca/template
index efd3e59543e..ac1c0e1dc0e 100644
--- a/srcpkgs/orca/template
+++ b/srcpkgs/orca/template
@@ -1,7 +1,7 @@
 # Template file for 'orca'
 pkgname=orca
-version=3.32.0
-revision=2
+version=3.34.0
+revision=1
 archs=noarch
 build_style=gnu-configure
 pycompile_module="orca"
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/Orca"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3130268296fa2c115acc4b37f3520967f06abd402251403d1ca507071efd5816
+checksum=977c8079519ffbabad76861aa2790a55671ff69f19f3f4a158bfeb7c192a0282
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" python3-gobject-devel"
diff --git a/srcpkgs/ortp/template b/srcpkgs/ortp/template
index c00442eedcf..e6aafa99520 100644
--- a/srcpkgs/ortp/template
+++ b/srcpkgs/ortp/template
@@ -6,7 +6,7 @@ build_style=cmake
 configure_args="-DENABLE_STATIC=OFF"
 makedepends="bctoolbox-devel"
 short_desc="Real-Time Transport Protocol (RFC 3550) library"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.linphone.org/technical-corner/ortp"
 distfiles="https://github.com/BelledonneCommunications/ortp/archive/${version}.tar.gz"
diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index 6e7e6fcf12c..77b630d37fd 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
 pkgname=osg
 reverts=3.6.0_1
 version=3.4.1
-revision=9
+revision=10
 wrksrc=OpenSceneGraph-OpenSceneGraph-${version}
 build_style=cmake
 # don't use /usr/lib64 on 64bit platforms
diff --git a/srcpkgs/osinfo-db-tools/template b/srcpkgs/osinfo-db-tools/template
index be64a6854a4..d326b51b3a5 100644
--- a/srcpkgs/osinfo-db-tools/template
+++ b/srcpkgs/osinfo-db-tools/template
@@ -1,15 +1,15 @@
 # Template file for 'osinfo-db-tools'
 pkgname=osinfo-db-tools
-version=1.5.0
+version=1.6.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config perl"
 makedepends="libglib-devel libarchive-devel libxslt-devel
- json-glib-devel"
+ json-glib-devel libsoup-devel"
 short_desc="Tools for managing osinfo database"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://libosinfo.org"
 changelog="https://gitlab.com/libosinfo/osinfo-db-tools/raw/master/NEWS"
 distfiles="https://releases.pagure.org/libosinfo/${pkgname}-${version}.tar.gz"
-checksum=f43160f3f3251849f8b8b37c84ad8640f2a51937d8ea38626f14aa2a159730de
+checksum=d0d5b1196d73a7abed051be48d0e5b4aa196aac4cdbf8ddf52f57c0c492b2574
diff --git a/srcpkgs/osinfo-db/template b/srcpkgs/osinfo-db/template
index d38dbe49e87..55168d856b2 100644
--- a/srcpkgs/osinfo-db/template
+++ b/srcpkgs/osinfo-db/template
@@ -1,16 +1,16 @@
 # Template file for 'osinfo-db'
 pkgname=osinfo-db
-version=20190504
+version=20190920
 revision=1
 archs=noarch
 build_style=fetch
 hostmakedepends="osinfo-db-tools"
 short_desc="Osinfo database about operating systems"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://libosinfo.org"
 distfiles="https://releases.pagure.org/libosinfo/${pkgname}-${version}.tar.xz"
-checksum=bf445f39cfbb31ed5e83c78823cb17a7637b4ff7d72de5e3e6c38fba9e1133fa
+checksum=c8e32e93079a85b7d8c79ba9bc1a21c2e0403612f454049476242a2529a67c8a
 skip_extraction="${pkgname}-${version}.tar.xz"
 
 do_install() {
diff --git a/srcpkgs/oxipng/template b/srcpkgs/oxipng/template
index 23aeadbfa63..5ed4845de3c 100644
--- a/srcpkgs/oxipng/template
+++ b/srcpkgs/oxipng/template
@@ -1,6 +1,6 @@
 # Template file for 'oxipng'
 pkgname=oxipng
-version=2.2.2
+version=2.3.0
 revision=1
 build_style=cargo
 short_desc="Multithreaded lossless PNG compression optimizer"
@@ -9,7 +9,7 @@ license="MIT"
 homepage="https://github.com/shssoichiro/oxipng"
 changelog="https://raw.githubusercontent.com/shssoichiro/oxipng/master/CHANGELOG.md"
 distfiles="https://github.com/shssoichiro/oxipng/archive/v${version}.tar.gz"
-checksum=f2addda729b287ce02a2b853aaa22420ee00cf20e178d6f2238c03438e89c7fb
+checksum=870c6ab802ca4df6d12a5570b6883e7e3b190bbe6e2fa91282af9b294c8e68b4
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/oxygen-icons5/template b/srcpkgs/oxygen-icons5/template
index 20665f7910b..48484514eb8 100644
--- a/srcpkgs/oxygen-icons5/template
+++ b/srcpkgs/oxygen-icons5/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen-icons5'
 pkgname=oxygen-icons5
-version=5.61.0
+version=5.63.0
 revision=1
 archs=noarch
 build_style=cmake
@@ -12,5 +12,5 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later, LGPL-3.0-or-later"
 homepage="https://projects.kde.org/projects/frameworks/oxygen-icons5"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1ca8f6e42186d069cb4f0581914b147cabc3be3e720c382e77048be134bb1b26
+checksum=2fe1d14add182c5537596bc19f1cafb4a1e25052cb4391d8f8d7ea18b55f0966
 conflicts="oxygen-icons>=0"
diff --git a/srcpkgs/oxygen/template b/srcpkgs/oxygen/template
index 439c17afe10..4bcf0c6cb25 100644
--- a/srcpkgs/oxygen/template
+++ b/srcpkgs/oxygen/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen'
 pkgname=oxygen
-version=5.16.4
+version=5.17.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/plasma/oxygen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=7ba8a18a0b44d2bf48c96679328f698a9bfd4d041724b960095fed67f228f2e1
+checksum=0ed752fc90634277d40f816a0ce0717b4708ced1e88596ab890112991c9614d2
diff --git a/srcpkgs/p11-kit/template b/srcpkgs/p11-kit/template
index f30554e513c..12bce5bad48 100644
--- a/srcpkgs/p11-kit/template
+++ b/srcpkgs/p11-kit/template
@@ -1,6 +1,6 @@
 # Template file for 'p11-kit'
 pkgname=p11-kit
-version=0.23.16.1
+version=0.23.18.1
 revision=1
 build_style=gnu-configure
 configure_args="--with-module-path=/usr/lib/pkcs11"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/p11-glue/p11-kit"
 distfiles="${homepage}/releases/download/${version}/p11-kit-${version}.tar.gz"
-checksum=4b34e92ae36fa493e0d94366c767f06d5f9951e3d8581d10fd935d738db1574d
+checksum=34c3bd8c0050dd7c4e6228aecf0f168de0a1b34562ddbf74a1c70904c2523c6f
 conf_files="/etc/pkcs11/pkcs11.conf"
 
 pre_configure() {
diff --git a/srcpkgs/packer/template b/srcpkgs/packer/template
index 5ecead529d6..38a8fce529a 100644
--- a/srcpkgs/packer/template
+++ b/srcpkgs/packer/template
@@ -1,15 +1,15 @@
 # Template file for 'packer'
 pkgname=packer
-version=1.4.2
+version=1.4.4
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/packer"
 short_desc="Create identical multiplatform machine images from a single source"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="MPL-2"
+license="MPL-2.0"
 homepage="http://www.packer.io"
 distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
-checksum=c35f46bcacd93ca8b99291701df351bfec935fac804839a5f8cf4f491367d0c1
+checksum=df5abcace27d81c6952d81bfd280fb5e8ec968bb72e53cfbd322417d2be61d2a
 replaces="packer-bin>=0"
 
 case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/palapeli/template b/srcpkgs/palapeli/template
index b09a4ef49f2..7aa16086376 100644
--- a/srcpkgs/palapeli/template
+++ b/srcpkgs/palapeli/template
@@ -1,6 +1,6 @@
 # Template file for 'palapeli'
 pkgname=palapeli
-version=19.04.3
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kdoctools
@@ -12,4 +12,4 @@ maintainer="Adam Beckmeyer <adam_gpg@thebeckmeyers.xyz>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/games/palapeli"
 distfiles="${KDE_SITE}/applications/${version}/src/palapeli-${version}.tar.xz"
-checksum=7cbf7a1666e16a476de9bdab7155f17f2224baa7db9d80cd77c785dead6f2e10
+checksum=bae810595c7ba7bdac0fa5c27e6c2a3a9bb1bbdae3521cfc036ec0cdcd9ef1a7
diff --git a/srcpkgs/pam_rundir/patches/fix.patch b/srcpkgs/pam_rundir/patches/fix.patch
new file mode 100644
index 00000000000..ffde6fbaf1a
--- /dev/null
+++ b/srcpkgs/pam_rundir/patches/fix.patch
@@ -0,0 +1,40 @@
+--- pam_rundir.c	2015-09-23 12:57:53.000000000 -0400
++++ pam_rundir2.c	2019-08-24 13:17:11.241470935 -0400
+@@ -24,6 +24,8 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <sys/file.h>
++#include <sys/prctl.h>
++#include <linux/securebits.h>
+ #include <string.h>
+ #include <pwd.h>
+ #include <fcntl.h>
+@@ -360,6 +362,7 @@
+         char file[sizeof (PARENT_DIR) + l + 2];
+         int fd;
+         int count = 0;
++        int secbits = -1;
+ 
+         print_filename (file, (int) pw->pw_uid, l);
+         fd = open_and_lock (file);
+@@ -396,6 +399,11 @@
+             goto done;
+         }
+ 
++        /* to bypass permission checks for mkdir, in case it isn't group
++         * writable */
++        secbits = prctl (PR_GET_SECUREBITS);
++        if (secbits != -1)
++            prctl (PR_SET_SECUREBITS, (unsigned long) secbits | SECBIT_NO_SETUID_FIXUP);
+         /* set euid so if we do create the dir, it is own by the user */
+         if (seteuid (pw->pw_uid) < 0)
+         {
+@@ -421,6 +429,8 @@
+         }
+ 
+ done:
++        if (secbits != -1)
++            prctl (PR_SET_SECUREBITS, (unsigned long) secbits);
+         close (fd); /* also unlocks */
+     }
+ 
diff --git a/srcpkgs/pam_rundir/template b/srcpkgs/pam_rundir/template
index 77e4b467f04..f08238ddb5f 100644
--- a/srcpkgs/pam_rundir/template
+++ b/srcpkgs/pam_rundir/template
@@ -1,12 +1,12 @@
 # Template file for 'pam_rundir'
 pkgname=pam_rundir
 version=1.0.0
-revision=4
+revision=5
 build_style=configure
 configure_args="--prefix=/usr --with-parentdir=/run/user"
 makedepends="pam-devel"
 short_desc="PAM Module to create and remove user runtime directories"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://jjacky.com/pam_rundir"
 distfiles="https://jjacky.com/${pkgname}/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/pam_ssh/template b/srcpkgs/pam_ssh/template
index c4100b2cab1..0d533bf169d 100644
--- a/srcpkgs/pam_ssh/template
+++ b/srcpkgs/pam_ssh/template
@@ -1,7 +1,7 @@
 # Template file for 'pam_ssh'
 pkgname=pam_ssh
-version=2.2
-revision=2
+version=2.3
+revision=1
 build_style=gnu-configure
 configure_args="--with-pam-dir=/usr/lib/security ac_cv_openssldir=/usr
  --includedir=${XBPS_CROSS_BASE}/usr/include
@@ -13,7 +13,7 @@ maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="BSD-2-Clause"
 homepage="http://pam-ssh.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/pam-ssh/${pkgname}-${version}.tar.xz"
-checksum=3543b7248a83831579d2cfcae330e7fc479c07371f36401ac147d735885f57ad
+checksum=0c456f6a5c9e47ce6825ac50d467e7a797e14239b2b9a72bfeb2df0100f4af31
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/papi/patches/gnu_source.patch b/srcpkgs/papi/patches/gnu_source.patch
new file mode 100644
index 00000000000..eed88b43d3f
--- /dev/null
+++ b/srcpkgs/papi/patches/gnu_source.patch
@@ -0,0 +1,12 @@
+--- src/components/perf_event/tests/perf_event_system_wide.c.orig	2019-10-12 17:48:40.217216625 +0200
++++ src/components/perf_event/tests/perf_event_system_wide.c	2019-10-12 17:49:48.246645644 +0200
+@@ -15,6 +15,9 @@
+ #define __USE_GNU
+ #endif
+ 
++/* For cpu_set_t */
++#define _GNU_SOURCE
++
+ /* For sched_setaffinity() */
+ #include <sched.h>
+ 
diff --git a/srcpkgs/papi/template b/srcpkgs/papi/template
index 297c00f683e..239cd5c34f0 100644
--- a/srcpkgs/papi/template
+++ b/srcpkgs/papi/template
@@ -1,16 +1,16 @@
 # Template file for 'papi'
 pkgname=papi
-version=5.6.0
+version=5.7.0
 revision=1
 wrksrc="papi-${version}"
 build_wrksrc="src"
 build_style=gnu-configure
 short_desc="Provides interface for use of performance counter hardware"
 maintainer="johannes <johannes.brechtmann@gmail.com>"
-license="BSD"
+license="BSD-3-Clause"
 homepage="http://icl.cs.utk.edu/papi/"
 distfiles="http://icl.utk.edu/projects/papi/downloads/papi-${version}.tar.gz"
-checksum=49b7293f9ca2d74d6d80bd06b5c4be303663123267b4ac0884cbcae4c914dc47
+checksum=d1a3bb848e292c805bc9f29e09c27870e2ff4cda6c2fba3b7da8b4bba6547589
 
 if [ -n "$CROSS_BUILD" ]; then
 	_ARCH="${XBPS_TARGET_MACHINE%-musl}"
@@ -29,6 +29,7 @@ papi-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/*.a
+		vmove usr/lib/*.so
 		vmove usr/lib/pkgconfig
 		vmove usr/share/man/man3
 	}
diff --git a/srcpkgs/papirus-icon-theme/template b/srcpkgs/papirus-icon-theme/template
index 6d3682855a5..856b0f373bc 100644
--- a/srcpkgs/papirus-icon-theme/template
+++ b/srcpkgs/papirus-icon-theme/template
@@ -1,6 +1,6 @@
 # Template file for 'papirus-icon-theme'
 pkgname=papirus-icon-theme
-version=20190720
+version=20191009
 revision=1
 archs=noarch
 short_desc="SVG icon theme for Linux, based on Paper Icon Set"
@@ -8,7 +8,7 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme"
 distfiles="https://github.com/PapirusDevelopmentTeam/${pkgname}/archive/${version}.tar.gz"
-checksum=8a3882c8d498f9172c2ab21dcf151aa1520fafb05c377160bc802cb39a8d9908
+checksum=1e40f8e7b9b827a8aa7c14ec5e3c8905574937d352496c4dd6b05d58ec391ca7
 
 do_install() {
 	vmkdir usr/share/icons
diff --git a/srcpkgs/parallel/template b/srcpkgs/parallel/template
index 658451aa036..6bfadca3bbd 100644
--- a/srcpkgs/parallel/template
+++ b/srcpkgs/parallel/template
@@ -1,6 +1,6 @@
 # Template file for 'parallel'
 pkgname=parallel
-version=20190722
+version=20190922
 revision=1
 archs="noarch"
 build_style=gnu-configure
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/parallel/"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=0ed0863184dbb396b4c030848e754b1ea76329c06ae9e43314bc0915eb6cbca7
+checksum=282fee2cb40a54ba32a922446365b782c4f461f848432b969de5a17b33193c63
 
 pre_configure() {
 	# no html and pdf doc
diff --git a/srcpkgs/paraview/template b/srcpkgs/paraview/template
new file mode 100644
index 00000000000..3b721b1833a
--- /dev/null
+++ b/srcpkgs/paraview/template
@@ -0,0 +1,63 @@
+# Template file for 'paraview'
+pkgname=paraview
+version=5.6.1
+revision=1
+wrksrc=ParaView-v${version}
+build_style=cmake
+configure_args="-DPARAVIEW_ENABLE_FFMPEG=ON
+ -DPARAVIEW_ENABLE_GDAL=ON
+ -DPARAVIEW_ENABLE_MATPLOTLIB=ON
+ -DPARAVIEW_ENABLE_PYTHON=ON
+ -DPARAVIEW_USE_MPI=ON
+ -DPARAVIEW_USE_VISITBRIDGE=OFF
+ -DPARAVIEW_USE_OSPRAY=OFF
+ -DVTK_PYTHON_FULL_THREADSAFE=ON
+ -DVTK_PYTHON_VERSION=3
+ -DVTK_SMP_IMPLEMENTATION_TYPE=TBB
+ -DVTKm_ENABLE_MPI=ON
+ -DVTKm_ENABLE_RENDERING=ON
+ -DVTKm_USE_DOUBLE_PRECISION=ON
+ -DVTK_USE_SYSTEM_LIBRARIES=OFF
+ -DVTK_USE_SYSTEM_DOUBLECONVERSION=ON
+ -DVTK_USE_SYSTEM_EIGEN=ON
+ -DVTK_USE_SYSTEM_EXPAT=ON
+ -DVTK_USE_SYSTEM_FREETYPE=ON
+ -DVTK_USE_SYSTEM_GLEW=ON
+ -DVTK_USE_SYSTEM_HDF5=ON
+ -DVTK_USE_SYSTEM_JPEG=ON
+ -DVTK_USE_SYSTEM_JSONCPP=ON
+ -DVTK_USE_SYSTEM_LIBPROJ=ON
+ -DVTK_USE_SYSTEM_LIBXML2=ON
+ -DVTK_USE_SYSTEM_LZMA=ON
+ -DVTK_USE_SYSTEM_MPI4PY=ON
+ -DVTK_USE_SYSTEM_NETCDF=ON
+ -DVTK_USE_SYSTEM_OGG=ON
+ -DVTK_USE_SYSTEM_PEGTL=OFF
+ -DVTK_USE_SYSTEM_PNG=ON
+ -DVTK_USE_SYSTEM_PUGIXML=ON
+ -DVTK_USE_SYSTEM_THEORA=ON
+ -DVTK_USE_SYSTEM_TIFF=ON
+ -DVTK_USE_SYSTEM_ZLIB=ON
+ -DVTK_USE_SYSTEM_PROTOBUF=ON"
+makedepends="MesaLib-devel libfreeglut-devel glu-devel libXt-devel
+ openmpi-devel qt5-devel qt5-x11extras-devel qt5-tools-devel qt5-plugin-mysql
+ qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds
+ qt5-xmlpatterns python3-devel double-conversion-devel eigen expat-devel
+ freetype-devel glew-devel hdf5-devel libjpeg-turbo-devel jsoncpp-devel
+ proj-devel libxml2-devel liblzma-devel liblz4-devel netcdf-devel libogg-devel
+ libpng-devel pugixml-devel libtheora-devel tiff-devel zlib-devel
+ protobuf-devel protobuf python3-Pygments ffmpeg-devel tbb-devel boost-devel
+ libgdal-devel python3-mpi4py"
+depends="openmpi"
+short_desc="Application for interactive, scientific visualization"
+maintainer="Anders Damsgaard <anders@adamsgaard.dk>"
+license="BSD-3-Clause"
+homepage="https://www.paraview.org"
+distfiles="https://www.paraview.org/paraview-downloads/download.php?submit=Download&version=v${version:0:3}&type=source&os=Sources&downloadFile=ParaView-v${version}.tar.xz>paraview-${version}.tar.xz"
+checksum=50ef01f54db6358b402e50d1460ef47c04d675bf26f250c6937737169f1e6612
+CFLAGS="-D_GNU_SOURCE"
+CXXFLAGS="-D_GNU_SOURCE"
+
+post_install() {
+	vlicense Copyright.txt
+}
diff --git a/srcpkgs/parted/patches/fix-glibc-2.27.patch b/srcpkgs/parted/patches/fix-glibc-2.27.patch
deleted file mode 100644
index b2ea15ce5f4..00000000000
--- a/srcpkgs/parted/patches/fix-glibc-2.27.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 5cb16c0474fd4b28ed58ac06fecfc76a7f1fa9fb Mon Sep 17 00:00:00 2001
-From: maxice8 <thinkabit.ukim@gmail.com>
-Date: Sat, 22 Sep 2018 23:08:51 -0300
-Subject: [PATCH] libparted/arch/linux.c: add missing sys/sysmacros.h include
- for 'minor', 'major'
-
-otherwise fails on glibc >= 2.27 with
-
-arch/linux.c: In function '_dm_is_part':
-arch/linux.c:551:28: warning: implicit declaration of function 'major' [-Wimplicit-function-declaration]
-         if (!_is_dm_major (major (deps->device[0])))
-                            ^~~~~
-arch/linux.c: In function '_device_probe_type':
-arch/linux.c:648:44: warning: implicit declaration of function 'minor'; did you mean 'mknod'? [-Wimplicit-function-declaration]
-         arch_specific->minor = dev_minor = minor (dev_stat.st_rdev);
-                                            ^~~~~
-                                            mknod
-  CCLD     libparted.la
-
-../libparted/.libs/libparted.so: undefined reference to `major'
-../libparted/.libs/libparted.so: undefined reference to `minor'
-collect2: error: ld returned 1 exit status
----
- libparted/arch/linux.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c
-index 0f18904..a15854f 100644
---- libparted/arch/linux.c
-+++ libparted/arch/linux.c
-@@ -41,6 +41,7 @@
- #include <sys/utsname.h>        /* for uname() */
- #include <scsi/scsi.h>
- #include <assert.h>
-+#include <sys/sysmacros.h>
- #ifdef ENABLE_DEVICE_MAPPER
- #include <libdevmapper.h>
- #endif
--- 
-2.19.0
-
-
diff --git a/srcpkgs/parted/patches/fix-includes.patch b/srcpkgs/parted/patches/fix-includes.patch
deleted file mode 100644
index aa39609f750..00000000000
--- a/srcpkgs/parted/patches/fix-includes.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- libparted/fs/xfs/platform_defs.h
-+++ libparted/fs/xfs/platform_defs.h
-@@ -35,6 +35,7 @@
- #define __XFS_PLATFORM_DEFS_H__
- 
- #include <stdio.h>
-+#include <fcntl.h>
- #include <stdarg.h>
- #include <assert.h>
- #include <endian.h>
diff --git a/srcpkgs/parted/template b/srcpkgs/parted/template
index 03b6bd4b61e..c8946b570ca 100644
--- a/srcpkgs/parted/template
+++ b/srcpkgs/parted/template
@@ -1,7 +1,7 @@
 # Template file for 'parted'
 pkgname=parted
-version=3.2
-revision=7
+version=3.3
+revision=1
 build_style=gnu-configure
 # parted wants off_t as 64bit type
 configure_args="ac_cv_sizeof_off_t=8"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.gnu.org/software/parted/"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=858b589c22297cacdf437f3baff6f04b333087521ab274f7ab677cb8c6bb78e4
+checksum=57e2b4bd87018625c515421d4524f6e3b55175b472302056391c5f7eccb83d44
 
 libparted_package() {
 	short_desc+=" - shared library"
diff --git a/srcpkgs/passphrase2pgp/template b/srcpkgs/passphrase2pgp/template
new file mode 100644
index 00000000000..38e47bb8ec0
--- /dev/null
+++ b/srcpkgs/passphrase2pgp/template
@@ -0,0 +1,13 @@
+# Template file for 'passphrase2pgp'
+pkgname=passphrase2pgp
+version=0.1.0
+revision=1
+build_style=go
+go_import_path="github.com/skeeto/passphrase2pgp"
+hostmakedepends="git"
+short_desc="Generate a PGP key from a passphrase"
+maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
+license="Unlicense"
+homepage="https://github.com/skeeto/passphrase2pgp"
+distfiles="https://github.com/skeeto/passphrase2pgp/archive/v${version}.tar.gz"
+checksum=15d26a836d9df2fa6e487d7224e6ab7d6f51139211ceb77b8ecd8c594b86699a
diff --git a/srcpkgs/pastel/template b/srcpkgs/pastel/template
new file mode 100644
index 00000000000..c78cf2f56c8
--- /dev/null
+++ b/srcpkgs/pastel/template
@@ -0,0 +1,15 @@
+# Template file for 'pastel'
+pkgname=pastel
+version=0.6.1
+revision=1
+build_style=cargo
+short_desc="Generate, analyze, convert and manipulate colors"
+maintainer="Andrew Benson <abenson+void@gmail.com>"
+license="MIT"
+homepage="https://github.com/sharkdp/pastel"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=ece0004d725133bcf552bbfe5508c087513eb52f6c363fbad6eeb9c74769a932
+
+post_install() {
+	vlicense LICENSE-MIT
+}
diff --git a/srcpkgs/patchelf/template b/srcpkgs/patchelf/template
index 1c5cca4eee7..fe2dc3ccee4 100644
--- a/srcpkgs/patchelf/template
+++ b/srcpkgs/patchelf/template
@@ -4,7 +4,7 @@ version=0.10
 revision=1
 build_style=gnu-configure
 short_desc="Utility for modifing existing ELF executables and libraries"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://nixos.org/patchelf.html"
 distfiles="https://nixos.org/releases/patchelf/patchelf-${version}/patchelf-${version}.tar.bz2"
diff --git a/srcpkgs/pax/template b/srcpkgs/pax/template
index 0e6310ebaa7..72d46d47efe 100644
--- a/srcpkgs/pax/template
+++ b/srcpkgs/pax/template
@@ -1,6 +1,6 @@
 # Template file for 'pax'
 pkgname=pax
-version=20190224
+version=20190825
 revision=1
 wrksrc="paxmirabilis-${version}"
 build_wrksrc="${pkgname}"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="3-clause-BSD"
 homepage="https://www.mirbsd.org/MirOS/dist/mir/cpio/"
 distfiles="https://www.mirbsd.org/MirOS/dist/mir/cpio/paxmirabilis-${version}.cpio.gz"
-checksum=381713ea1e6e25be83700312b3c0ce2e889edbc39ee09e3a59b9a31b800e0085
+checksum=94c9110e4778d762523c3915b97587b92ae4547129424e34ad4512da4eb09b81
 
 alternatives="
  pax:pax:/usr/bin/paxmirabilis
diff --git a/srcpkgs/pcmanfm-qt/template b/srcpkgs/pcmanfm-qt/template
index a0de0da42d4..544c2e85482 100644
--- a/srcpkgs/pcmanfm-qt/template
+++ b/srcpkgs/pcmanfm-qt/template
@@ -1,10 +1,11 @@
 # Template file for 'pcmanfm-qt'
 pkgname=pcmanfm-qt
 version=0.14.1
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools libfm-devel"
 makedepends="qt5-tools-devel qt5-x11extras-devel libfm-qt-devel"
+depends="qt5-translations"
 short_desc="LXQt pcmanfm Qt frontend"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
diff --git a/srcpkgs/pd/patches/fix-musl.patch b/srcpkgs/pd/patches/fix-musl.patch
new file mode 100644
index 00000000000..6e1d1f0eaa2
--- /dev/null
+++ b/srcpkgs/pd/patches/fix-musl.patch
@@ -0,0 +1,15 @@
+--- src/x_text.c.orig	2019-08-29 10:11:27.734179939 +0200
++++ src/x_text.c	2019-08-29 10:12:06.392225034 +0200
+@@ -475,9 +475,10 @@ found in msvcrt (which indeed it isn't i
+ on this, just call qsort if we're Microsoft and single-instance.  I hope nobody
+ will try to compile multi-instance Pd for 32-bit windows, but if they
+ do, they might run into my qsort_s problem again. */
+-#if defined(_WIN32) && !defined(PDINSTANCE)
++#if (!defined(__GLIBC__) || defined(_WIN32)) && !defined(PDINSTANCE)
+ #define MICROSOFT_STUPID_SORT
+-static void *stupid_zkeyinfo;
++#include <threads.h>
++thread_local static void *stupid_zkeyinfo;
+ static int stupid_sortcompare(const void *z1, const void *z2) {
+     return (text_sortcompare(z1, z2, stupid_zkeyinfo)); }
+ #endif
diff --git a/srcpkgs/pd/template b/srcpkgs/pd/template
index 4a15e6b2e42..5f3fb5815a3 100644
--- a/srcpkgs/pd/template
+++ b/srcpkgs/pd/template
@@ -1,7 +1,7 @@
 # Template file for 'pd'
 pkgname=pd
-version=0.49.0
-revision=1
+version=0.50.0
+revision=2
 _ver=${version%.*}-${version##*.}
 wrksrc="$pkgname-$_ver"
 build_style=gnu-configure
@@ -14,7 +14,11 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="BSD-3-Clause"
 homepage="https://puredata.info"
 distfiles="http://msp.ucsd.edu/Software/pd-$_ver.src.tar.gz"
-checksum=d2e04e75d22b0e41f27daacc0cd6ec6b05ae0ef214cc7315d57e5bfbeec23fa3
+checksum=faeacdc24054cc6ce6be801ff5dd3eb7890352295d56c03406c5b85256b1e441
+case "$XBPS_TARGET_MACHINE" in
+	*-musl) # Causes pd to fail if qsort is used without thread local storage.
+		CFLAGS="-DMICROSOFT_STUPID_SORT" ;;
+esac
 
 pre_configure() {
 	./autogen.sh
diff --git a/srcpkgs/pdd/template b/srcpkgs/pdd/template
index 691f671492c..70deb5a1ae3 100644
--- a/srcpkgs/pdd/template
+++ b/srcpkgs/pdd/template
@@ -7,7 +7,7 @@ build_style=gnu-makefile
 depends="python3-dateutil"
 checkdepends="python3-dateutil python3-pytest"
 short_desc="Tiny date, time diff calculator"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/jarun/pdd"
 changelog="https://raw.githubusercontent.com/jarun/pdd/master/CHANGELOG"
diff --git a/srcpkgs/pdfcrack/template b/srcpkgs/pdfcrack/template
index 75a6e6198d4..76a85706054 100644
--- a/srcpkgs/pdfcrack/template
+++ b/srcpkgs/pdfcrack/template
@@ -1,6 +1,6 @@
 # Template file for 'pdfcrack'
 pkgname=pdfcrack
-version=0.17
+version=0.18
 revision=1
 build_style=gnu-makefile
 short_desc="PDF password recovery tool"
@@ -8,7 +8,7 @@ maintainer="misuchiru03 <misuchiru03+void@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://sourceforge.net/projects/${pkgname}"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=561bb1ee21005b6a9cf09771571836de6625ad6c52822b08eaf33b9f32ef0e96
+checksum=8223aec52a2ae36f9a10a731513461458874f1fd8d803e4a04910d9dbf1cba0c
 
 do_install() {
 	vbin pdfcrack
diff --git a/srcpkgs/pdsh/patches/fix_configure_ac.patch b/srcpkgs/pdsh/patches/fix_configure_ac.patch
new file mode 100644
index 00000000000..9be920cd9c6
--- /dev/null
+++ b/srcpkgs/pdsh/patches/fix_configure_ac.patch
@@ -0,0 +1,18 @@
+configure.ac relies on git, which doesn't work for release tarball.
+See: https://github.com/chaos/pdsh/issues/116
+--- configure.ac	2017-06-28 19:28:26.000000000 -0500
++++ configure.ac	2019-09-11 08:41:27.613006239 -0500
+@@ -4,12 +4,11 @@
+ # Copyright (C) 2000-2002 Regents of the University of California
+ # See ./DISCLAIMER
+ #
+ # This file is to be processed with autoconf to generate a configure script.
+ 
+-AC_INIT([pdsh],
+-        m4_esyscmd([git describe --always |  awk '/.*/ {sub(/^pdsh-/, ""); printf "%s",$1; exit}']))
++AC_INIT([pdsh], 2)
+ 
+ AC_CONFIG_SRCDIR([pdsh])
+ AC_CONFIG_AUX_DIR([config])
+ AC_CONFIG_MACRO_DIR([config])
+ AC_CONFIG_SRCDIR([src/pdsh/dsh.h])
diff --git a/srcpkgs/pdsh/template b/srcpkgs/pdsh/template
new file mode 100644
index 00000000000..ad136987bd0
--- /dev/null
+++ b/srcpkgs/pdsh/template
@@ -0,0 +1,40 @@
+# Template file for 'pdsh'
+pkgname=pdsh
+version=2.33
+revision=1
+archs="~*-musl"
+wrksrc="pdsh-pdsh-${version}"
+build_style=gnu-configure
+configure_args="
+ --disable-static-modules
+ $(vopt_with rsh)
+ $(vopt_with exec)
+ $(vopt_with ssh)
+ $(vopt_with mrsh)
+ $(vopt_with xcpu)
+ $(vopt_with netgroup)
+ $(vopt_with readline)
+"
+hostmakedepends="automake autoconf libtool"
+makedepends="
+ $(vopt_if mrsh munge-devel)
+ $(vopt_if readline readline-devel)
+"
+short_desc="High performance, parallel remote shell utility"
+maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/chaos/pdsh"
+distfiles="https://github.com/chaos/pdsh/archive/pdsh-${version}.tar.gz"
+checksum=c026ccf06e4f1c6c52414282a865e45362405aa09f7d09fa86aaec98f6413554
+
+build_options="rsh exec ssh mrsh xcpu netgroup readline"
+build_options_default="rsh exec ssh mrsh readline"
+desc_option_rsh="Include support for the rsh remote module"
+desc_option_exec="Include support for the exec remote module"
+desc_option_mrsh="Include support for the mrsh remote module"
+desc_option_xcpu="Include support for the xcpu remote module"
+desc_option_netgroup="allows pdsh to use standard netgroup entries to build lists of target hosts."
+
+pre_configure() {
+	./bootstrap
+}
diff --git a/srcpkgs/peaclock/template b/srcpkgs/peaclock/template
index 4802b0358e2..49bf18466f7 100644
--- a/srcpkgs/peaclock/template
+++ b/srcpkgs/peaclock/template
@@ -1,15 +1,17 @@
 # Template file for 'peaclock'
 pkgname=peaclock
-version=0.2.0
+version=0.4.0
 revision=1
 build_style=cmake
+makedepends="icu-devel"
 short_desc="Colourful binary clock for the terminal"
 maintainer="Nathan Owens <ndowens04@gmail.com>"
 license="MIT"
 homepage="https://octobanana.com/software/peaclock"
 distfiles="https://github.com/octobanana/peaclock/archive/${version}.tar.gz"
-checksum=e8b71e62b6f408a95bfd7f1381bb2cfe390969be37f7c2f83b60cd313cde8589
+checksum=3b14608b2e507e268b1804c2383cbde241886eeba8d313d646524a44e3ab8615
 
-post_extract() {
+post_install() {
+	vsconf config/default default-config
 	vlicense LICENSE
 }
diff --git a/srcpkgs/peek/template b/srcpkgs/peek/template
index 2899f7de935..8108c8a8c68 100644
--- a/srcpkgs/peek/template
+++ b/srcpkgs/peek/template
@@ -1,15 +1,14 @@
 # Template file for 'peek'
 pkgname=peek
-version=1.3.1
+version=1.4.0
 revision=1
-build_style=cmake
-configure_args="-DGSETTINGS_COMPILE=OFF"
+build_style=meson
 hostmakedepends="glib-devel libxml2 pkg-config txt2man vala"
 makedepends="gtk+3-devel libkeybinder3-devel"
 depends="gsettings-desktop-schemas"
-maintainer="Orphaned <orphan@voidlinux.org>"
 short_desc="Simple animated GIF screen recorder with an easy to use interface"
+maintainer="Peter Bui <pbui@github.bx612.space>"
+license="GPL-3.0-or-later"
 homepage="https://github.com/phw/peek"
-license="GPL-3"
 distfiles="https://github.com/phw/peek/archive/${version}.tar.gz"
-checksum=8104b65b041858b7f7f482e1425f8f22d429524340ad341f95f08b08fe4e8602
+checksum=506c5797102629ff4a319c5fcc4eb6b771ffd680bb83ea07c1e5e8166000d605
diff --git a/srcpkgs/pelican/template b/srcpkgs/pelican/template
index ae80c9fe74f..39b72b83f6f 100644
--- a/srcpkgs/pelican/template
+++ b/srcpkgs/pelican/template
@@ -1,6 +1,6 @@
 # Template file for 'pelican'
 pkgname=pelican
-version=4.0.1
+version=4.1.3
 revision=1
 archs=noarch
 build_style=python2-module
@@ -10,12 +10,12 @@ depends="python-setuptools python-feedgenerator python-Jinja2 python-Pygments
  python-docutils python-pytz python-blinker python-Unidecode python-six
  python-dateutil"
 short_desc="Static site generator written in Python"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Lugubris <lugubris@disroot.org>"
 license="AGPL-3.0-or-later"
 homepage="https://getpelican.com/"
 changelog="https://raw.githubusercontent.com/getpelican/pelican/${version}/docs/changelog.rst"
 distfiles="${PYPI_SITE}/p/pelican/pelican-${version}.tar.gz"
-checksum=990aa8b62a7bcb34c7585e5a67d05a10690ab2fff3cb761d0a94826cec51cd17
+checksum=cf0ed7342e5cf38559cd89f9daee52dc2697739eafd6b9fbd33b06e523bf4cce
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/perl-ACL-Lite/template b/srcpkgs/perl-ACL-Lite/template
index 73f0c7c1b69..f3ce855be07 100644
--- a/srcpkgs/perl-ACL-Lite/template
+++ b/srcpkgs/perl-ACL-Lite/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Liteweight and flexible ACL checks"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/ACL-Lite"
 distfiles="${CPAN_SITE}/ACL/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Alien-Build/template b/srcpkgs/perl-Alien-Build/template
index f7cbc44b841..ad08c7e4a84 100644
--- a/srcpkgs/perl-Alien-Build/template
+++ b/srcpkgs/perl-Alien-Build/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-Alien-Build'
 pkgname=perl-Alien-Build
-version=1.65
+version=1.89
 revision=1
 archs=noarch
 wrksrc="${pkgname/perl-/}-${version}"
@@ -10,8 +10,8 @@ depends="perl-Capture-Tiny perl-FFI-CheckLib perl-Path-Tiny
  perl-File-Which perl-File-chdir perl-Archive-Zip"
 checkdepends="${depends} perl-Test-Simple perl-Test2-Suite"
 short_desc="Build external dependencies for use in CPAN"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/pod/Alien::Build"
 distfiles="https://cpan.metacpan.org/authors/id/P/PL/PLICEASE/Alien-Build-${version}.tar.gz"
-checksum=8ad4ffdf237b5e6d7e2f70e83bad2972eae13d5ab87d44fba5912b25b2817cf7
+checksum=ffe36fa5b43c2e9c8c72a074a5ebc7d17821c0e297cd226797b0c192362027cb
diff --git a/srcpkgs/perl-Archive-Zip/template b/srcpkgs/perl-Archive-Zip/template
index 99d98baa675..7cac357843a 100644
--- a/srcpkgs/perl-Archive-Zip/template
+++ b/srcpkgs/perl-Archive-Zip/template
@@ -1,17 +1,17 @@
 # Template file for 'perl-Archive-Zip'
 pkgname=perl-Archive-Zip
-version=1.64
+version=1.67
 revision=1
 archs=noarch
 wrksrc="Archive-Zip-${version}"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="$hostmakedepends"
-checkdepends="perl-Test-MockModule"
 depends="$makedepends"
+checkdepends="perl-Test-MockModule"
 short_desc="Provide a perl interface to ZIP archive files"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Archive-Zip"
 distfiles="${CPAN_SITE}/Archive/Archive-Zip-${version}.tar.gz"
-checksum=de5f84f2148038363d557b1fa33f58edc208111f789f7299fe3d8f6e11b4d17d
+checksum=be2274344c7659bf9189838dc6b9a59ec6f957c74ddfd35ff2780d56f4592774
diff --git a/srcpkgs/perl-Barcode-ZBar/template b/srcpkgs/perl-Barcode-ZBar/template
index eed855c93f3..c3dbc66416b 100644
--- a/srcpkgs/perl-Barcode-ZBar/template
+++ b/srcpkgs/perl-Barcode-ZBar/template
@@ -1,14 +1,14 @@
 # Template file for 'perl-Barcode-ZBar'
 pkgname=perl-Barcode-ZBar
 version=0.04
-revision=4
+revision=5
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="perl libzbar-devel"
 depends="${makedepends}"
 short_desc="Perl interface to the ZBar Barcode Reader"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1"
 homepage="https://metacpan.org/release/Barcode-ZBar"
 distfiles="${CPAN_SITE}/Barcode/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Bit-Vector/template b/srcpkgs/perl-Bit-Vector/template
index ab31b94d4db..bb6382b3396 100644
--- a/srcpkgs/perl-Bit-Vector/template
+++ b/srcpkgs/perl-Bit-Vector/template
@@ -1,7 +1,7 @@
 # Template build file for 'perl-Bit-Vector'
 pkgname=perl-Bit-Vector
 version=7.4
-revision=5
+revision=6
 wrksrc="Bit-Vector-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/perl-CPAN-Meta-Check/template b/srcpkgs/perl-CPAN-Meta-Check/template
index b82bc4067d1..1bce3bc0b3f 100644
--- a/srcpkgs/perl-CPAN-Meta-Check/template
+++ b/srcpkgs/perl-CPAN-Meta-Check/template
@@ -10,7 +10,7 @@ makedepends="perl"
 checkdepends="perl-Test-Differences perl-Test-Deep"
 depends="$makedepends"
 short_desc="CPAN::Meta::Check - Verify requirements in a CPAN::Meta object"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/CPAN-Meta-Check"
 distfiles="${CPAN_SITE}/CPAN/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Cairo-GObject/template b/srcpkgs/perl-Cairo-GObject/template
index e7e3315e4db..f1e72426388 100644
--- a/srcpkgs/perl-Cairo-GObject/template
+++ b/srcpkgs/perl-Cairo-GObject/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Cairo-GObject'
 pkgname=perl-Cairo-GObject
-version=1.004
-revision=3
+version=1.005
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-ExtUtils-Depends perl-ExtUtils-PkgConfig"
@@ -12,4 +12,4 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
 license="LGPL-2.1-or-later"
 homepage="http://gtk2-perl.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/gtk2-perl/Cairo_GObject/${pkgname/perl-/}-${version}.tar.gz"
-checksum=3bb9d40e802e51f56f1364abc553758152131803c12d85ba6e14bad6813409d5
+checksum=8d896444d71e1d0bca3d24e31e5d82bd0d9542aaed91d1fb7eab367bce675c50
diff --git a/srcpkgs/perl-Cairo/template b/srcpkgs/perl-Cairo/template
index c3ce831706b..ca65910b420 100644
--- a/srcpkgs/perl-Cairo/template
+++ b/srcpkgs/perl-Cairo/template
@@ -1,7 +1,7 @@
-# Template file for 'perl-Cairo'.
+# Template file for 'perl-Cairo'
 pkgname=perl-Cairo
-version=1.106
-revision=5
+version=1.107
+revision=1
 wrksrc="Cairo-$version"
 build_style=perl-module
 hostmakedepends="perl"
@@ -9,7 +9,7 @@ makedepends="perl-ExtUtils-Depends perl-ExtUtils-PkgConfig cairo-devel"
 depends="perl>=5.20 perl-Glib"
 short_desc="Perl bindings for Cairo"
 maintainer="Orphaned <orphan@voidlinux.org>"
+license="LGPL-2.1-or-later"
 homepage="http://gtk2-perl.sourceforge.net/"
-license="LGPL-2.1"
 distfiles="${SOURCEFORGE_SITE}/gtk2-perl/Cairo-$version.tar.gz"
-checksum=e64803018bc7cba49e73e258547f5378cc4249797beafec524852140f49c45c4
+checksum=5e1de126ddf93bd5b13f13a52f50d7f7af1157265b7f10e53d585ee1827be169
diff --git a/srcpkgs/perl-Carp-Clan/template b/srcpkgs/perl-Carp-Clan/template
index 78abc3fa823..59704ed94f5 100644
--- a/srcpkgs/perl-Carp-Clan/template
+++ b/srcpkgs/perl-Carp-Clan/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-Carp-Clan'
 pkgname=perl-Carp-Clan
-version=6.07
+version=6.08
 revision=1
 archs=noarch
 wrksrc="Carp-Clan-${version}"
@@ -13,4 +13,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Carp-Clan"
 distfiles="${CPAN_SITE}/Carp/Carp-Clan-${version}.tar.gz"
-checksum=0a08560737d8c5caab36f2684c8512e9771e633d3ab5629db814e1d49e274a3d
+checksum=c75f92e34422cc5a65ab05d155842b701452434e9aefb649d6e2289c47ef6708
diff --git a/srcpkgs/perl-Class-Method-Modifiers/template b/srcpkgs/perl-Class-Method-Modifiers/template
index 111d975be3d..533720aa724 100644
--- a/srcpkgs/perl-Class-Method-Modifiers/template
+++ b/srcpkgs/perl-Class-Method-Modifiers/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Class-Method-Modifiers'
 pkgname=perl-Class-Method-Modifiers
-version=2.12
-revision=2
+version=2.13
+revision=1
 archs=noarch
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -10,8 +10,8 @@ makedepends="perl"
 depends="$makedepends"
 checkdepends="perl-Test-Fatal perl-Test-Requires"
 short_desc="Provides Moose-like method modifiers"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Class-Method-Modifiers"
 distfiles="${CPAN_SITE}/Class/${pkgname/perl-/}-${version}.tar.gz"
-checksum=e44c1073020bf55b8c97975ed77235fd7e2a6a56f29b5c702301721184e27ac8
+checksum=ab5807f71018a842de6b7a4826d6c1f24b8d5b09fcce5005a3309cf6ea40fd63
diff --git a/srcpkgs/perl-Class-XSAccessor/template b/srcpkgs/perl-Class-XSAccessor/template
index 7107d122458..57ef5e24436 100644
--- a/srcpkgs/perl-Class-XSAccessor/template
+++ b/srcpkgs/perl-Class-XSAccessor/template
@@ -1,14 +1,14 @@
 # Template file for 'perl-Class-XSAccessor'
 pkgname=perl-Class-XSAccessor
 version=1.19
-revision=5
+revision=6
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="perl"
 depends="${makedepends}"
 short_desc="Generate fast XS accessors without runtime compilation"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Class-XSAccessor"
 distfiles="${CPAN_SITE}/Class/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Clone-Choose/template b/srcpkgs/perl-Clone-Choose/template
index db66feb1cc2..d5264c751eb 100644
--- a/srcpkgs/perl-Clone-Choose/template
+++ b/srcpkgs/perl-Clone-Choose/template
@@ -10,7 +10,7 @@ makedepends="perl"
 depends="$makedepends"
 checkdepends="perl-Clone perl-Clone-PP perl-Module-Runtime"
 short_desc="Clone::Choose - Choose appropriate clone utility"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Clone-Choose"
 distfiles="${CPAN_SITE}/Clone/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Clone-PP/template b/srcpkgs/perl-Clone-PP/template
index 9c23da74f0f..81ea599562d 100644
--- a/srcpkgs/perl-Clone-PP/template
+++ b/srcpkgs/perl-Clone-PP/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="perl"
 short_desc="Clone::PP - Recursively copy Perl datatypes"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Clone-PP"
 distfiles="${CPAN_SITE}/Clone/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Clone/template b/srcpkgs/perl-Clone/template
index 93473909a40..17b2dc4737f 100644
--- a/srcpkgs/perl-Clone/template
+++ b/srcpkgs/perl-Clone/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Clone'
 pkgname=perl-Clone
 version=0.43
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/perl-Config-Simple/template b/srcpkgs/perl-Config-Simple/template
index 7c5b17270f1..dc86662227a 100644
--- a/srcpkgs/perl-Config-Simple/template
+++ b/srcpkgs/perl-Config-Simple/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="perl"
 short_desc="Config::Simple - simple configuration file class"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Unknown"
 homepage="https://metacpan.org/release/Config-Simple"
 distfiles="http://search.cpan.org/CPAN/authors/id/S/SH/SHERZODR/Config-Simple-${version}.tar.gz"
diff --git a/srcpkgs/perl-Crypt-Blowfish/template b/srcpkgs/perl-Crypt-Blowfish/template
index 1bb185368bc..51bdb744eed 100644
--- a/srcpkgs/perl-Crypt-Blowfish/template
+++ b/srcpkgs/perl-Crypt-Blowfish/template
@@ -1,7 +1,7 @@
 # Template build file for 'perl-Crypt-Blowfish'.
 pkgname=perl-Crypt-Blowfish
 version=2.14
-revision=9
+revision=10
 wrksrc="Crypt-Blowfish-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/perl-Crypt-CAST5/template b/srcpkgs/perl-Crypt-CAST5/template
index 73855c7c154..b7cf8004ec9 100644
--- a/srcpkgs/perl-Crypt-CAST5/template
+++ b/srcpkgs/perl-Crypt-CAST5/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Crypt-CAST5'
 pkgname=perl-Crypt-CAST5
 version=0.05
-revision=4
+revision=5
 wrksrc="${pkgname#perl-}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/perl-Crypt-DES/template b/srcpkgs/perl-Crypt-DES/template
index 86901bc3bca..13f3b5721ef 100644
--- a/srcpkgs/perl-Crypt-DES/template
+++ b/srcpkgs/perl-Crypt-DES/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Crypt-DES'
 pkgname=perl-Crypt-DES
 version=2.07
-revision=4
+revision=5
 wrksrc="${pkgname#perl-}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/perl-Crypt-IDEA/template b/srcpkgs/perl-Crypt-IDEA/template
index bdcea2cb0cb..bb8980b9122 100644
--- a/srcpkgs/perl-Crypt-IDEA/template
+++ b/srcpkgs/perl-Crypt-IDEA/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Crypt-IDEA'
 pkgname=perl-Crypt-IDEA
 version=1.10
-revision=4
+revision=5
 wrksrc="${pkgname#perl-}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
index bf089393720..3c7220b73b4 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Crypt-OpenSSL-Bignum'
 pkgname=perl-Crypt-OpenSSL-Bignum
 version=0.09
-revision=8
+revision=9
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/perl-Crypt-OpenSSL-Guess/template b/srcpkgs/perl-Crypt-OpenSSL-Guess/template
index a60a7d3ab17..8c207e50fa0 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Guess/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Guess/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Module to Guess OpenSSL include path"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Crypt-OpenSSL-Guess"
 distfiles="${CPAN_SITE}/Crypt/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Crypt-OpenSSL-RSA/template b/srcpkgs/perl-Crypt-OpenSSL-RSA/template
index e8407944ec4..73830f64e08 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-RSA/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-RSA/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Crypt-OpenSSL-RSA'
 pkgname=perl-Crypt-OpenSSL-RSA
 version=0.31
-revision=3
+revision=4
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-Crypt-OpenSSL-Guess"
diff --git a/srcpkgs/perl-Crypt-OpenSSL-Random/template b/srcpkgs/perl-Crypt-OpenSSL-Random/template
index 3f1ae2af280..8152afd3e43 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Random/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Random/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Crypt-OpenSSL-Random'
 pkgname=perl-Crypt-OpenSSL-Random
 version=0.15
-revision=6
+revision=7
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-Crypt-OpenSSL-Guess"
diff --git a/srcpkgs/perl-Crypt-Rijndael/template b/srcpkgs/perl-Crypt-Rijndael/template
index a592e569297..608f21077b0 100644
--- a/srcpkgs/perl-Crypt-Rijndael/template
+++ b/srcpkgs/perl-Crypt-Rijndael/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Crypt-Rijndael'
 pkgname=perl-Crypt-Rijndael
-version=1.13
-revision=8
+version=1.14
+revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
@@ -9,7 +9,7 @@ makedepends="perl"
 depends="${hostmakedepends}"
 short_desc="Crypt::Rijndael - Crypt::CBC compliant Rijndael module"
 maintainer="Kevin Berry <kevin@opensourcealchemist.com>"
+license="LGPL-2.0-or-later"
 homepage="https://metacpan.org/release/Crypt-Rijndael"
-license="LGPL-3"
 distfiles="${CPAN_SITE}/Crypt/Crypt-Rijndael-${version}.tar.gz"
-checksum=cd7209a6dfe0a3dc8caffe1aa2233b0e6effec7572d76a7a93feefffe636214e
+checksum=6451c3dffe8703523be2bb08d1adca97e77df2a8a4dd46944d18a99330b7850e
diff --git a/srcpkgs/perl-CryptX/template b/srcpkgs/perl-CryptX/template
index c22ee7dc664..097b821f2d1 100644
--- a/srcpkgs/perl-CryptX/template
+++ b/srcpkgs/perl-CryptX/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-CryptX'
 pkgname=perl-CryptX
 version=0.064
-revision=1
+revision=2
 wrksrc="${pkgname#perl-}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/perl-Curses-UI/template b/srcpkgs/perl-Curses-UI/template
new file mode 100644
index 00000000000..15ab4c13a35
--- /dev/null
+++ b/srcpkgs/perl-Curses-UI/template
@@ -0,0 +1,15 @@
+# Template file for 'perl-Curses-UI'
+pkgname=perl-Curses-UI
+version=0.9609
+revision=1
+wrksrc="${pkgname/perl-/}-${version}"
+build_style=perl-module
+hostmakedepends="perl-Curses perl-Term-ReadKey"
+makedepends="$hostmakedepends"
+depends="$makedepends"
+short_desc="Curses based OO user interface framework"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="Artistic-1.0-Perl, GPL-1.0-or-later"
+homepage="https://metacpan.org/release/Curses"
+distfiles="${CPAN_SITE}/Curses/${pkgname/perl-/}-${version}.tar.gz"
+checksum=0ab827a513b6e14403184fb065a8ea1d2ebda122d2178cbf45c781f311240eaf
diff --git a/srcpkgs/perl-Curses/template b/srcpkgs/perl-Curses/template
index 362d811ccd1..d2f5c8017ad 100644
--- a/srcpkgs/perl-Curses/template
+++ b/srcpkgs/perl-Curses/template
@@ -1,13 +1,13 @@
 # Template file for 'perl-Curses'
 pkgname=perl-Curses
 version=1.36
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="perl ncurses-devel"
 short_desc="Terminal screen handling and optimization"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Curses"
 distfiles="${CPAN_SITE}/Curses/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-DBD-Pg/template b/srcpkgs/perl-DBD-Pg/template
index 74f84ebae48..c76c7647419 100644
--- a/srcpkgs/perl-DBD-Pg/template
+++ b/srcpkgs/perl-DBD-Pg/template
@@ -1,7 +1,7 @@
-# Template build file for 'perl-DBD-Pg'.
+# Template file for 'perl-DBD-Pg'
 pkgname=perl-DBD-Pg
-version=3.7.4
-revision=3
+version=3.10.0
+revision=1
 wrksrc="DBD-Pg-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-DBI"
@@ -9,8 +9,8 @@ makedepends="${hostmakedepends} postgresql-libs-devel"
 depends="perl perl-DBI"
 short_desc="DBD::Pg - PostgreSQL DBI driver"
 maintainer="John Regan <john@jrjrtech.com>"
-homepage="https://metacpan.org/release/DBD-Pg"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
+homepage="https://metacpan.org/release/DBD-Pg"
 distfiles="${CPAN_SITE}/DBD/DBD-Pg-$version.tar.gz"
-checksum=9ffa9c4e9d1d6b1483ec3259114b95998fd7e4a4168931c903b5ad5fd7a6783e
-nocross="yes"
+checksum=e103268a63e2828e3d43659bdba5f743446cbbe047a766f843112eedae105f80
+nocross=yes
diff --git a/srcpkgs/perl-DBD-SQLite/template b/srcpkgs/perl-DBD-SQLite/template
index 9f1678e715d..e36af674ffd 100644
--- a/srcpkgs/perl-DBD-SQLite/template
+++ b/srcpkgs/perl-DBD-SQLite/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-DBD-SQLite'
 pkgname=perl-DBD-SQLite
 version=1.64
-revision=1
+revision=2
 wrksrc="DBD-SQLite-${version}"
 build_style=perl-module
 configure_args="SQLITE_LOCATION=${XBPS_CROSS_BASE}/usr"
diff --git a/srcpkgs/perl-DBD-mysql/template b/srcpkgs/perl-DBD-mysql/template
index 3ee5e54edfc..fa85722d723 100644
--- a/srcpkgs/perl-DBD-mysql/template
+++ b/srcpkgs/perl-DBD-mysql/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-DBD-mysql'
 pkgname=perl-DBD-mysql
 version=4.050
-revision=2
+revision=3
 wrksrc="DBD-mysql-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-DBI perl-Devel-CheckLib"
diff --git a/srcpkgs/perl-DBI/template b/srcpkgs/perl-DBI/template
index 7cda7b4f8fc..9de63ac28e3 100644
--- a/srcpkgs/perl-DBI/template
+++ b/srcpkgs/perl-DBI/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-DBI'
 pkgname=perl-DBI
 version=1.642
-revision=1
+revision=2
 wrksrc="DBI-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/perl-Danga-Socket/template b/srcpkgs/perl-Danga-Socket/template
index 1cf9eb8c941..f656b5d69c5 100644
--- a/srcpkgs/perl-Danga-Socket/template
+++ b/srcpkgs/perl-Danga-Socket/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl-Sys-Syscall"
 depends="$makedepends"
 short_desc="Event loop and event-driven async sockets"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Danga-Socket"
 distfiles="${CPAN_SITE}/Danga/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Data-MessagePack/template b/srcpkgs/perl-Data-MessagePack/template
index 8392e1d51c7..66f493ad50d 100644
--- a/srcpkgs/perl-Data-MessagePack/template
+++ b/srcpkgs/perl-Data-MessagePack/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Data-MessagePack'
 pkgname=perl-Data-MessagePack
 version=1.00
-revision=4
+revision=5
 wrksrc="${pkgname/perl-//}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
@@ -9,7 +9,7 @@ makedepends="perl"
 checkdepends="perl-Test-Requires perl-Test-LeakTrace"
 depends="perl"
 short_desc="Data::MessagePack - MessagePack serializing/deserializing"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Data-MessagePack"
 distfiles="${CPAN_SITE}/Data/Data-MessagePack-${version}.tar.gz"
diff --git a/srcpkgs/perl-Data-Section-Simple/template b/srcpkgs/perl-Data-Section-Simple/template
index 2a92e074533..5148ad90e52 100644
--- a/srcpkgs/perl-Data-Section-Simple/template
+++ b/srcpkgs/perl-Data-Section-Simple/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="perl"
 short_desc="Data::Section::Simple - Read data from __DATA__"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Data-Section-Simple"
 distfiles="${CPAN_SITE}/Data/Data-Section-Simple-${version}.tar.gz"
diff --git a/srcpkgs/perl-Data-UUID/template b/srcpkgs/perl-Data-UUID/template
index 3a1256804f9..d3dfa60cb44 100644
--- a/srcpkgs/perl-Data-UUID/template
+++ b/srcpkgs/perl-Data-UUID/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Data-UUID'
 pkgname=perl-Data-UUID
 version=1.224
-revision=1
+revision=2
 wrksrc="Data-UUID-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/perl-Date-Manip/template b/srcpkgs/perl-Date-Manip/template
index 2c717a1225e..36ce91903b6 100644
--- a/srcpkgs/perl-Date-Manip/template
+++ b/srcpkgs/perl-Date-Manip/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-Date-Manip'
 pkgname=perl-Date-Manip
-version=6.76
+version=6.78
 revision=1
 archs=noarch
 wrksrc="${pkgname/perl-/}-${version}"
@@ -14,4 +14,4 @@ maintainer="John Regan <john@jrjrtech.com>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Date-Manip"
 distfiles="${CPAN_SITE}/Date/${pkgname/perl-/}-${version}.tar.gz"
-checksum=1c87c78c03e3479e3b695952c0a5c11d3593ca9a5340dfb14d0be3d3e7ad63a8
+checksum=cb36084401f9e89999c7046811c83ac58ea44fc12827bf61ca1167a79e915db9
diff --git a/srcpkgs/perl-DateTime-TimeZone/template b/srcpkgs/perl-DateTime-TimeZone/template
index fe80fca8d0c..5e3cd42f9e1 100644
--- a/srcpkgs/perl-DateTime-TimeZone/template
+++ b/srcpkgs/perl-DateTime-TimeZone/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-DateTime-TimeZone'
 pkgname=perl-DateTime-TimeZone
-version=2.34
+version=2.37
 revision=1
 archs=noarch
 wrksrc="${pkgname/perl-/}-${version}"
@@ -15,4 +15,4 @@ maintainer="John Regan <john@jrjrtech.com>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/DateTime-TimeZone"
 distfiles="${CPAN_SITE}/DateTime/${pkgname/perl-/}-${version}.tar.gz"
-checksum=dee1111c06f2aa705f803bc4f3d93b50df566d864a1a8bf31b55dfaf2b3de809
+checksum=6c12dfa6ad190191d437a7661c644fc38aaf109001e1d958c95dbb0aa143c421
diff --git a/srcpkgs/perl-DateTime/template b/srcpkgs/perl-DateTime/template
index aff7927c94d..a99d3ff8b29 100644
--- a/srcpkgs/perl-DateTime/template
+++ b/srcpkgs/perl-DateTime/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-DateTime'
 pkgname=perl-DateTime
-version=1.50
-revision=4
+version=1.51
+revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
@@ -13,8 +13,8 @@ maintainer="John Regan <john@jrjrtech.com>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/DateTime"
 distfiles="${CPAN_SITE}/DateTime/${pkgname/perl-/}-${version}.tar.gz"
-checksum=ed6b0c71ddd81310a82459508df9197074e6b13aea46fd279045c3ddc3c4b198
+checksum=de22da0de57a43a976322636d3a7474de4b1d6f37e044337123086cf94c16ec5
 
 # This isn't a direct dependency but when soname bumping perl it will
 # cause build failures
-hostmakedepends+=" perl-Package-Stash-XS perl-Sub-Identify perl-Variable-Magic perl-Params-Util"
+hostmakedepends+=" perl-Package-Stash-XS perl-Sub-Identify perl-Variable-Magic perl-Params-Util perl-Sub-Name"
diff --git a/srcpkgs/perl-Devel-Caller/template b/srcpkgs/perl-Devel-Caller/template
index 52f2665dc4e..8518b1a8e46 100644
--- a/srcpkgs/perl-Devel-Caller/template
+++ b/srcpkgs/perl-Devel-Caller/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Devel-Caller'
 pkgname=perl-Devel-Caller
 version=2.06
-revision=9
+revision=10
 wrksrc="${pkgname#*-}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/perl-Devel-LexAlias/template b/srcpkgs/perl-Devel-LexAlias/template
index 1ba0e341201..fe756906ed6 100644
--- a/srcpkgs/perl-Devel-LexAlias/template
+++ b/srcpkgs/perl-Devel-LexAlias/template
@@ -1,14 +1,14 @@
 # Template file for 'perl-Devel-LexAlias'
 pkgname=perl-Devel-LexAlias
 version=0.05
-revision=4
+revision=5
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="perl perl-Devel-Caller"
 depends="${makedepends}"
 short_desc="Devel::LexAlias - alias lexical variables"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Devel-LexAlias"
 distfiles="${CPAN_SITE}/Devel/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Digest-SHA1/template b/srcpkgs/perl-Digest-SHA1/template
index 31c61c34d7e..c4a2eb2330b 100644
--- a/srcpkgs/perl-Digest-SHA1/template
+++ b/srcpkgs/perl-Digest-SHA1/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Digest-SHA1'
 pkgname=perl-Digest-SHA1
 version=2.13
-revision=6
+revision=7
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/perl-Email-Address-XS/template b/srcpkgs/perl-Email-Address-XS/template
index 7b774e5a8eb..897817a9ddc 100644
--- a/srcpkgs/perl-Email-Address-XS/template
+++ b/srcpkgs/perl-Email-Address-XS/template
@@ -1,14 +1,14 @@
 # Template file for 'perl-Email-Address-XS'
 pkgname=perl-Email-Address-XS
 version=1.04
-revision=4
+revision=5
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="perl"
 depends="${makedepends}"
 short_desc="Parse and format RFC 2822 email addresses and groups"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Email-Address-XS"
 distfiles="${CPAN_SITE}/Email/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Email-Date-Format/template b/srcpkgs/perl-Email-Date-Format/template
index 4bfe7fd3854..57781d72c02 100644
--- a/srcpkgs/perl-Email-Date-Format/template
+++ b/srcpkgs/perl-Email-Date-Format/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Produce RFC 2822 date strings"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Email-Date-Format"
 distfiles="${CPAN_SITE}/Email/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Email-MIME-ContentType/template b/srcpkgs/perl-Email-MIME-ContentType/template
index 594351b7dcf..73737a61714 100644
--- a/srcpkgs/perl-Email-MIME-ContentType/template
+++ b/srcpkgs/perl-Email-MIME-ContentType/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Parse a MIME Content-Type or Content-Disposition Header"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Email-MIME-ContentType"
 distfiles="${CPAN_SITE}/Email/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Email-MIME-Encodings/template b/srcpkgs/perl-Email-MIME-Encodings/template
index 35456d74ff5..ba28cb0ac78 100644
--- a/srcpkgs/perl-Email-MIME-Encodings/template
+++ b/srcpkgs/perl-Email-MIME-Encodings/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl perl-Capture-Tiny"
 depends="$makedepends"
 short_desc="A unified interface to MIME encoding and decoding"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Email-MIME-Encodings"
 distfiles="${CPAN_SITE}/Email/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Email-MIME/template b/srcpkgs/perl-Email-MIME/template
index c57c28f38f0..794ad31cff2 100644
--- a/srcpkgs/perl-Email-MIME/template
+++ b/srcpkgs/perl-Email-MIME/template
@@ -11,7 +11,7 @@ makedepends="perl perl-Email-Address-XS perl-Email-MIME-ContentType
  perl-MIME-Types perl-Module-Runtime"
 depends="$makedepends"
 short_desc="Easy MIME message handling"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Email-MIME"
 distfiles="${CPAN_SITE}/Email/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Email-MessageID/template b/srcpkgs/perl-Email-MessageID/template
index ed39d92cc1b..5b52585b5f9 100644
--- a/srcpkgs/perl-Email-MessageID/template
+++ b/srcpkgs/perl-Email-MessageID/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Generate world unique message-ids"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Email-MessageID"
 distfiles="${CPAN_SITE}/Email/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Email-Simple/template b/srcpkgs/perl-Email-Simple/template
index 165cd8254ea..57ccc513dbe 100644
--- a/srcpkgs/perl-Email-Simple/template
+++ b/srcpkgs/perl-Email-Simple/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl perl-Email-Date-Format"
 depends="$makedepends"
 short_desc="Simple parsing of RFC2822 message format and headers"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Email-Simple"
 distfiles="${CPAN_SITE}/Email/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-FFI-CheckLib/template b/srcpkgs/perl-FFI-CheckLib/template
index cea7f57baa4..97ab1b6ff4c 100644
--- a/srcpkgs/perl-FFI-CheckLib/template
+++ b/srcpkgs/perl-FFI-CheckLib/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-FFI-CheckLib'
 pkgname=perl-FFI-CheckLib
-version=0.23
+version=0.25
 revision=1
 archs=noarch
 wrksrc="${pkgname/perl-/}-${version}"
@@ -9,8 +9,8 @@ hostmakedepends="perl"
 depends="perl"
 checkdepends="perl-Test2-Suite"
 short_desc="Check that a library is available for FFI"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/pod/FFI::CheckLib"
 distfiles="https://cpan.metacpan.org/authors/id/P/PL/PLICEASE/FFI-CheckLib-${version}.tar.gz"
-checksum=4ec7abca15f070dac2392d36b48a3ad27d80b4ee4cb2944a69e7ea0cb4da5166
+checksum=eb36b9a7cff1764a65b1b77e01e92c26207c558a3f986d0d17d2b110fa366ba4
diff --git a/srcpkgs/perl-File-BaseDir/template b/srcpkgs/perl-File-BaseDir/template
index 0303d25ed9c..ada966fc66f 100644
--- a/srcpkgs/perl-File-BaseDir/template
+++ b/srcpkgs/perl-File-BaseDir/template
@@ -10,7 +10,7 @@ makedepends="perl-File-Which perl-IPC-System-Simple"
 depends="perl"
 checkdepends="perl-Test-Pod perl-Test-Pod-Coverage xdg-user-dirs"
 short_desc="File::BaseDir - Use the Freedesktop.org base directory specification"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/File-BaseDir"
 distfiles="${CPAN_SITE}/File/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-File-Copy-Recursive/template b/srcpkgs/perl-File-Copy-Recursive/template
index 4b9209154bd..02d38a02582 100644
--- a/srcpkgs/perl-File-Copy-Recursive/template
+++ b/srcpkgs/perl-File-Copy-Recursive/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-File-Copy-Recursive'
 pkgname=perl-File-Copy-Recursive
-version=0.44
+version=0.45
 revision=1
 archs=noarch
 wrksrc="${pkgname/perl-/}-${version}"
@@ -10,8 +10,8 @@ makedepends="perl perl-Path-Tiny"
 depends="$makedepends"
 checkdepends="perl-Test-Deep perl-Test-Fatal perl-Test-File perl-Test-Warnings"
 short_desc="Perl extension for recursively copying files and directories"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/File-Copy-Recursive"
 distfiles="${CPAN_SITE}/File/${pkgname/perl-/}-${version}.tar.gz"
-checksum=ae19a0b58dc1b3cded9ba9cfb109288d8973d474c0b4bfd28b27cf60e8ca6ee4
+checksum=d3971cf78a8345e38042b208bb7b39cb695080386af629f4a04ffd6549df1157
diff --git a/srcpkgs/perl-File-Find-Rule/template b/srcpkgs/perl-File-Find-Rule/template
index a71009826e9..aecdb1ab8d5 100644
--- a/srcpkgs/perl-File-Find-Rule/template
+++ b/srcpkgs/perl-File-Find-Rule/template
@@ -9,7 +9,7 @@ hostmakedepends="perl perl-Text-Glob perl-Number-Compare"
 makedepends="perl"
 depends="$hostmakedepends"
 short_desc="Alternative interface to File::Find"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/File-Find-Rule"
 distfiles="${CPAN_SITE}/File/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-File-Flock-Retry/template b/srcpkgs/perl-File-Flock-Retry/template
index 86ff85d9d38..0d7d912386a 100644
--- a/srcpkgs/perl-File-Flock-Retry/template
+++ b/srcpkgs/perl-File-Flock-Retry/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl perl-File-chdir perl-File-Slurper"
 depends="$makedepends"
 short_desc="Yet another flock module"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/File-Flock-Retry"
 distfiles="${CPAN_SITE}/File/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-File-Slurp/template b/srcpkgs/perl-File-Slurp/template
index 9c0172a1804..242d810a33a 100644
--- a/srcpkgs/perl-File-Slurp/template
+++ b/srcpkgs/perl-File-Slurp/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-File-Slurp'
 pkgname=perl-File-Slurp
-version=9999.27
+version=9999.28
 revision=1
 archs=noarch
 wrksrc="${pkgname#perl-}-${version}"
@@ -9,8 +9,8 @@ hostmakedepends="perl"
 makedepends="$hostmakedepends"
 depends="$hostmakedepends"
 short_desc="Simple and Efficient Reading/Writing/Modifying of Complete Files"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/File-Slurp"
 distfiles="${CPAN_SITE}/File/${pkgname#perl-}-${version}.tar.gz"
-checksum=3a9d884f664c37946adb58f76b7708bf48c8b3fa9c34244f8cdb451ce41c43f4
+checksum=0587ce010bcb79db9e744f14b5498be97bf2c7f2474d971916d92f0a10827cee
diff --git a/srcpkgs/perl-File-Slurper/template b/srcpkgs/perl-File-Slurper/template
index 4d7871d4c93..4d863f45594 100644
--- a/srcpkgs/perl-File-Slurper/template
+++ b/srcpkgs/perl-File-Slurper/template
@@ -10,7 +10,7 @@ makedepends="perl"
 checkdepends="perl-Test-Warnings"
 depends="perl"
 short_desc="File::Slurper - A simple, sane and efficient module to slurp a file"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/File-Slurper"
 distfiles="${CPAN_SITE}/File/File-Slurper-${version}.tar.gz"
diff --git a/srcpkgs/perl-File-Write-Rotate/template b/srcpkgs/perl-File-Write-Rotate/template
index d0a8c9febbe..b0cce6f7c18 100644
--- a/srcpkgs/perl-File-Write-Rotate/template
+++ b/srcpkgs/perl-File-Write-Rotate/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-File-Write-Rotate'
 pkgname=perl-File-Write-Rotate
-version=0.31
-revision=2
+version=0.321
+revision=1
 archs=noarch
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -11,8 +11,8 @@ depends="$makedepends"
 checkdepends="perl-File-chdir perl-Monkey-Patch-Action perl-tainting perl-Test-Warnings
  perl-Test-Exception"
 short_desc="Write to files that archive/rotate themselves"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/File-Write-Rotate"
 distfiles="${CPAN_SITE}/File/${pkgname/perl-/}-${version}.tar.gz"
-checksum=df85cb70031a70043b576bb45abc9edce8e328c7f463f43084d7bae24927d033
+checksum=996929eaf57f4c4bd3c7e5ebc96dc584cb47c419089419fe94d096201673e5a3
diff --git a/srcpkgs/perl-File-chdir/template b/srcpkgs/perl-File-chdir/template
index 39773013f18..af6a761eaf2 100644
--- a/srcpkgs/perl-File-chdir/template
+++ b/srcpkgs/perl-File-chdir/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="More sensible way to change directories"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/File-chdir"
 distfiles="https://www.cpan.org/authors/id/D/DA/DAGOLDEN/File-chdir-${version}.tar.gz"
diff --git a/srcpkgs/perl-File-pushd/template b/srcpkgs/perl-File-pushd/template
index a387560e7a2..1ff8d169a2f 100644
--- a/srcpkgs/perl-File-pushd/template
+++ b/srcpkgs/perl-File-pushd/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="File::pushd - change directory temporarily for a limited scope"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/File-pushd"
 distfiles="${CPAN_SITE}/File/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Filesys-Df/template b/srcpkgs/perl-Filesys-Df/template
index edfe13638b9..9fdf493ed6b 100644
--- a/srcpkgs/perl-Filesys-Df/template
+++ b/srcpkgs/perl-Filesys-Df/template
@@ -1,7 +1,7 @@
 # Template build file for 'perl-Filesys-Df'
 pkgname=perl-Filesys-Df
 version=0.92
-revision=6
+revision=7
 wrksrc="Filesys-Df-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/perl-Filesys-Notify-Simple/template b/srcpkgs/perl-Filesys-Notify-Simple/template
index 2a46b6a1d31..5fb6d5f0d79 100644
--- a/srcpkgs/perl-Filesys-Notify-Simple/template
+++ b/srcpkgs/perl-Filesys-Notify-Simple/template
@@ -10,7 +10,7 @@ makedepends="perl"
 depends="$makedepends"
 checkdepends="perl-Test-SharedFork"
 short_desc="Simple and dumb file system watcher"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Filesys-Notify-Simple"
 distfiles="${CPAN_SITE}/Filesys/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Fuse/template b/srcpkgs/perl-Fuse/template
index 9090b98cb80..4f7a1349d9a 100644
--- a/srcpkgs/perl-Fuse/template
+++ b/srcpkgs/perl-Fuse/template
@@ -1,7 +1,7 @@
 # Template build file for 'perl-Fuse'.
 pkgname=perl-Fuse
 version=0.16
-revision=12
+revision=13
 wrksrc="Fuse-$version"
 build_style=perl-module
 hostmakedepends="pkg-config perl"
diff --git a/srcpkgs/perl-Getopt-Compact/template b/srcpkgs/perl-Getopt-Compact/template
index a1a76e40367..4fd53e9b485 100644
--- a/srcpkgs/perl-Getopt-Compact/template
+++ b/srcpkgs/perl-Getopt-Compact/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl perl-Text-Table"
 depends="$makedepends"
 short_desc="Getopt::Compact - getopt processing in a compact statement"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Getopt-Compact"
 distfiles="${CPAN_SITE}/Getopt/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Glib-Object-Introspection/template b/srcpkgs/perl-Glib-Object-Introspection/template
index 227e1515fe9..e0235e07ae6 100644
--- a/srcpkgs/perl-Glib-Object-Introspection/template
+++ b/srcpkgs/perl-Glib-Object-Introspection/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Glib-Object-Introspection'
 pkgname=perl-Glib-Object-Introspection
 version=0.047
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/perl-Glib/template b/srcpkgs/perl-Glib/template
index 5e9b2230f37..ed98bd58445 100644
--- a/srcpkgs/perl-Glib/template
+++ b/srcpkgs/perl-Glib/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-Glib'
 pkgname=perl-Glib
-version=1.329
+version=1.3291
 revision=1
 wrksrc="Glib-${version}"
 build_style=perl-module
@@ -12,5 +12,5 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="http://gtk2-perl.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/gtk2-perl/Glib-${version}.tar.gz"
-checksum=7b4ce1c8cf884849189efaa0b5722ecfb0d87a15f94fccc6a6017d3b3f982a35
+checksum=b983cdd87b9d3b5537edb110842313356237ab01b020b5f547f86f7e902b1f72
 nocross=yes
diff --git a/srcpkgs/perl-Goo-Canvas/template b/srcpkgs/perl-Goo-Canvas/template
index cd2f7e04c48..cfe2b60c986 100644
--- a/srcpkgs/perl-Goo-Canvas/template
+++ b/srcpkgs/perl-Goo-Canvas/template
@@ -1,7 +1,7 @@
 # Template build file for 'perl-Goo-Canvas'.
 pkgname=perl-Goo-Canvas
 version=0.06
-revision=5
+revision=6
 wrksrc="Goo-Canvas-$version"
 build_style=perl-module
 hostmakedepends="pkg-config perl perl-ExtUtils-Depends perl-ExtUtils-PkgConfig perl-Cairo perl-Gtk2"
diff --git a/srcpkgs/perl-Gtk2-ImageView/template b/srcpkgs/perl-Gtk2-ImageView/template
index 618dc79e500..b962dd87510 100644
--- a/srcpkgs/perl-Gtk2-ImageView/template
+++ b/srcpkgs/perl-Gtk2-ImageView/template
@@ -1,7 +1,7 @@
 # Template build file for 'perl-Gtk2-ImageView'
 pkgname=perl-Gtk2-ImageView
 version=0.05
-revision=5
+revision=6
 wrksrc="Gtk2-ImageView-$version"
 build_style=perl-module
 hostmakedepends="perl perl-ExtUtils-Depends perl-ExtUtils-PkgConfig"
diff --git a/srcpkgs/perl-Gtk2-Notify/template b/srcpkgs/perl-Gtk2-Notify/template
index f47ee780bd2..e1ea6ea72ba 100644
--- a/srcpkgs/perl-Gtk2-Notify/template
+++ b/srcpkgs/perl-Gtk2-Notify/template
@@ -1,7 +1,7 @@
 # Template build file for 'perl-Gtk2-Notify'
 pkgname=perl-Gtk2-Notify
 version=0.05
-revision=5
+revision=6
 build_style=perl-module
 hostmakedepends="perl perl-Gtk2 gtk+-devel libnotify-devel perl-ExtUtils-Depends perl-ExtUtils-PkgConfig"
 makedepends="${hostmakedepends}"
diff --git a/srcpkgs/perl-Gtk2/template b/srcpkgs/perl-Gtk2/template
index 8e5ce9ce37e..1e770c45e9d 100644
--- a/srcpkgs/perl-Gtk2/template
+++ b/srcpkgs/perl-Gtk2/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Gtk2'
 pkgname=perl-Gtk2
-version=1.24992
-revision=3
+version=1.24993
+revision=1
 wrksrc="Gtk2-$version"
 build_style=perl-module
 hostmakedepends="perl"
@@ -9,7 +9,7 @@ makedepends="perl-ExtUtils-Depends perl-ExtUtils-PkgConfig gtk+-devel perl-Pango
 depends="perl perl-Pango"
 short_desc="Perl bindings for Gtk2"
 maintainer="Orphaned <orphan@voidlinux.org>"
+license="LGPL-2.1-or-later"
 homepage="http://gtk2-perl.sourceforge.net/"
-license="LGPL-2.1"
 distfiles="${SOURCEFORGE_SITE}/gtk2-perl/Gtk2-$version.tar.gz"
-checksum=a2ed6902f7f29f7c8dddbe58119589f433252a12132c295c54afbac587cc8480
+checksum=49c443743b2eefe11a768002724f7f6a4c48efc94ff3cd3a559fb7e7b693c967
diff --git a/srcpkgs/perl-Gtk3/template b/srcpkgs/perl-Gtk3/template
index 7574a01da16..0c0acc3b0db 100644
--- a/srcpkgs/perl-Gtk3/template
+++ b/srcpkgs/perl-Gtk3/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-Gtk3'
 pkgname=perl-Gtk3
-version=0.035
+version=0.036
 revision=1
 archs=noarch
 wrksrc="${pkgname#perl-}-${version}"
@@ -14,4 +14,4 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
 license="LGPL-2.1-or-later"
 homepage="http://gtk2-perl.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/gtk2-perl/Gtk3/Gtk3-${version}.tar.gz"
-checksum=8fb9d69da95b724d70793e084ea40b7d62839e1b4ce6a5bb9579a4257b2419fe
+checksum=b6727f38a0ffcb7d57c3ea7653b7f06c292e419c2091b459cf1f77e1eafdc4c9
diff --git a/srcpkgs/perl-HTML-Form/template b/srcpkgs/perl-HTML-Form/template
index 835a725c159..c1e1ed34f01 100644
--- a/srcpkgs/perl-HTML-Form/template
+++ b/srcpkgs/perl-HTML-Form/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-HTML-Form'
 pkgname=perl-HTML-Form
-version=6.04
+version=6.05
 revision=1
 archs=noarch
 wrksrc="${pkgname/perl-/}-${version}"
@@ -13,4 +13,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/HTML-Form"
 distfiles="${CPAN_SITE}/HTML/HTML-Form-${version}.tar.gz"
-checksum=9cd557a8b61b9a98deceff259c4fb1d82df729ff9d0388f655b364dd16480080
+checksum=36c6c601ca829719f6651be1b80872028f82bec1712608dd860deeb67da32492
diff --git a/srcpkgs/perl-HTML-Parser/template b/srcpkgs/perl-HTML-Parser/template
index 2bbb08c0c88..51da32004cf 100644
--- a/srcpkgs/perl-HTML-Parser/template
+++ b/srcpkgs/perl-HTML-Parser/template
@@ -1,7 +1,7 @@
 # Template build file for 'perl-Parser'.
 pkgname=perl-HTML-Parser
 version=3.72
-revision=7
+revision=8
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/perl-HTML-Tree/template b/srcpkgs/perl-HTML-Tree/template
index e9f61c059c9..b77bf5c83a6 100644
--- a/srcpkgs/perl-HTML-Tree/template
+++ b/srcpkgs/perl-HTML-Tree/template
@@ -10,7 +10,7 @@ makedepends="perl perl-HTML-Parser perl-HTML-Tagset perl-LWP"
 depends="$makedepends"
 checkdepends="perl-Test-Fatal"
 short_desc="Functions that construct a HTML syntax tree"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/HTML-Tree"
 distfiles="${CPAN_SITE}/HTML/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-HTTP-Daemon/template b/srcpkgs/perl-HTTP-Daemon/template
index 51f8459bfb1..d9161622e18 100644
--- a/srcpkgs/perl-HTTP-Daemon/template
+++ b/srcpkgs/perl-HTTP-Daemon/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-HTTP-Daemon'
 pkgname=perl-HTTP-Daemon
-version=6.05
+version=6.06
 revision=1
 archs=noarch
 wrksrc="${pkgname/perl-/}-${version}"
@@ -14,4 +14,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/HTTP-Daemon"
 distfiles="${CPAN_SITE}/HTTP/HTTP-Daemon-${version}.tar.gz"
-checksum=b47fa46688bfd8a6e99eccf449dc5705e5530022b2fc8a873a9d07921345c72d
+checksum=fc03a161b54553f766457a4267e7066767f54ad01cacfe9a91d7caa2a0319bad
diff --git a/srcpkgs/perl-IO-HTML/template b/srcpkgs/perl-IO-HTML/template
index 78d16cde006..7fb1ca71ede 100644
--- a/srcpkgs/perl-IO-HTML/template
+++ b/srcpkgs/perl-IO-HTML/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Open an HTML file with automatic charset detection"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/IO-HTML"
 distfiles="${CPAN_SITE}/IO/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-IO-SessionData/template b/srcpkgs/perl-IO-SessionData/template
index ad09406c1b6..04b7108a4df 100644
--- a/srcpkgs/perl-IO-SessionData/template
+++ b/srcpkgs/perl-IO-SessionData/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Supporting module for SOAP::Lite"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/IO-SessionData"
 distfiles="${CPAN_SITE}/IO/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-IO-Tty/template b/srcpkgs/perl-IO-Tty/template
index adc11dea7fc..cbb0becda26 100644
--- a/srcpkgs/perl-IO-Tty/template
+++ b/srcpkgs/perl-IO-Tty/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-IO-Tty'
 pkgname=perl-IO-Tty
 version=1.12
-revision=7
+revision=8
 wrksrc="IO-Tty-$version"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/perl-IPC-System-Simple/template b/srcpkgs/perl-IPC-System-Simple/template
index 5ef360ef6e7..d9a3f351b0a 100644
--- a/srcpkgs/perl-IPC-System-Simple/template
+++ b/srcpkgs/perl-IPC-System-Simple/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="IPC::System::Simple - Run commands simply, with detailed diagnostics"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/IPC-System-Simple"
 distfiles="${CPAN_SITE}/IPC/${pkgname/perl-}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Image-Sane/template b/srcpkgs/perl-Image-Sane/template
index 337790c65ef..a375feb2680 100644
--- a/srcpkgs/perl-Image-Sane/template
+++ b/srcpkgs/perl-Image-Sane/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Image-Sane'
 pkgname=perl-Image-Sane
-version=0.14
-revision=5
+version=4
+revision=2
 wrksrc=Image-Sane-${version}
 build_style=perl-module
 hostmakedepends="perl perl-ExtUtils-Depends perl-ExtUtils-PkgConfig"
@@ -12,4 +12,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Image-Sane"
 distfiles="${CPAN_SITE}/Sane/RATCLIFFE/Image-Sane-${version}.tar.gz"
-checksum=a4b027c9b7650291f1acb0eb93861a7fc45aef4e08f6726843f174fa113c8ba5
+checksum=f970a0314e554f6fe29dcc651aec5bd45b32d547801d304434ae80b4b806896b
diff --git a/srcpkgs/perl-Importer/template b/srcpkgs/perl-Importer/template
index acf93800990..455ee533b1b 100644
--- a/srcpkgs/perl-Importer/template
+++ b/srcpkgs/perl-Importer/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Alternative but compatible interface to modules that export symbols"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Importer"
 distfiles="https://cpan.metacpan.org/authors/id/E/EX/EXODIST/Importer-${version}.tar.gz"
diff --git a/srcpkgs/perl-Inline-C/template b/srcpkgs/perl-Inline-C/template
index 1ded429c5e3..1ed461f4ffa 100644
--- a/srcpkgs/perl-Inline-C/template
+++ b/srcpkgs/perl-Inline-C/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-Inline-C'
 pkgname=perl-Inline-C
-version=0.80
+version=0.81
 revision=1
 archs=noarch
 wrksrc="${pkgname/perl-/}-${version}"
@@ -11,8 +11,8 @@ makedepends="perl-File-Copy-Recursive perl-Inline perl-Parse-RecDescent
 depends="$makedepends"
 checkdepends="perl-Test-Warn"
 short_desc="C language support for Inline"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Inline-C"
 distfiles="${CPAN_SITE}/Inline/${pkgname/perl-/}-${version}.tar.gz"
-checksum=35f5ff188f56b9c8a5ec342e2ff3a2d248ddbc91eead80d9361697914d5adbe3
+checksum=f185258d9050d7f79b4f00f12625cc469c2f700ff62d3e831cb18d80d2c87aac
diff --git a/srcpkgs/perl-Inline/template b/srcpkgs/perl-Inline/template
index 003c79990b4..07718a79d30 100644
--- a/srcpkgs/perl-Inline/template
+++ b/srcpkgs/perl-Inline/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-Inline'
 pkgname=perl-Inline
-version=0.82
+version=0.83
 revision=1
 archs=noarch
 wrksrc="${pkgname/perl-/}-${version}"
@@ -10,8 +10,8 @@ makedepends="perl"
 depends="$makedepends"
 checkdepends="perl-Test-Warn"
 short_desc="Write Perl Subroutines in Other Programming Languages"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Inline"
 distfiles="${CPAN_SITE}/Inline/${pkgname/perl-/}-${version}.tar.gz"
-checksum=1af94a8e95e4ba4545592341c47d8d1dc45b01822b877f7d3095a438566e874b
+checksum=171a8e5f66faf88fe5ef4de7126267cd8fb2503483432eabc3b88ac7d5be4239
diff --git a/srcpkgs/perl-JSON-XS/template b/srcpkgs/perl-JSON-XS/template
index 07ce7a7058a..aed01d75e5b 100644
--- a/srcpkgs/perl-JSON-XS/template
+++ b/srcpkgs/perl-JSON-XS/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-JSON-XS'
 pkgname=perl-JSON-XS
 version=4.02
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-Canary-Stability"
diff --git a/srcpkgs/perl-LWP-MediaTypes/template b/srcpkgs/perl-LWP-MediaTypes/template
index 6c270800659..bdb32bcf9ee 100644
--- a/srcpkgs/perl-LWP-MediaTypes/template
+++ b/srcpkgs/perl-LWP-MediaTypes/template
@@ -10,7 +10,7 @@ makedepends="$hostmakedepends"
 depends="$makedepends"
 checkdepends="perl-Test-Fatal"
 short_desc="LWP::MediaTypes - guess media type for a file or a URL"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/LWP-MediaTypes"
 distfiles="${CPAN_SITE}/LWP/LWP-MediaTypes-${version}.tar.gz"
diff --git a/srcpkgs/perl-Lchown/template b/srcpkgs/perl-Lchown/template
index 91829220c74..fd6a946af5c 100644
--- a/srcpkgs/perl-Lchown/template
+++ b/srcpkgs/perl-Lchown/template
@@ -1,12 +1,12 @@
 # Template file for 'perl-Lchown'
 pkgname=perl-Lchown
 version=1.01
-revision=12
+revision=13
 wrksrc="Lchown-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-Module-Build"
 makedepends="$hostmakedepends"
-shlib_requires=libperl.so.5.28
+shlib_requires=libperl.so.5.30
 depends="$makedepends"
 short_desc="Perl module interface to the lchown() system call"
 maintainer="Orphaned <orphan@voidlinux.org>"
diff --git a/srcpkgs/perl-Linux-Inotify2/template b/srcpkgs/perl-Linux-Inotify2/template
index 5d89f166dd6..f7162a199c2 100644
--- a/srcpkgs/perl-Linux-Inotify2/template
+++ b/srcpkgs/perl-Linux-Inotify2/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Linux-Inotify2'
 pkgname=perl-Linux-Inotify2
 version=2.1
-revision=1
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/perl-List-MoreUtils-XS/template b/srcpkgs/perl-List-MoreUtils-XS/template
index 5e07a11a533..cce89491ab5 100644
--- a/srcpkgs/perl-List-MoreUtils-XS/template
+++ b/srcpkgs/perl-List-MoreUtils-XS/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-List-MoreUtils-XS'
 pkgname=perl-List-MoreUtils-XS
 version=0.428
-revision=5
+revision=6
 wrksrc="List-MoreUtils-XS-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/perl-Locale-gettext/template b/srcpkgs/perl-Locale-gettext/template
index 8f2e09ab7e3..3316fd73fdc 100644
--- a/srcpkgs/perl-Locale-gettext/template
+++ b/srcpkgs/perl-Locale-gettext/template
@@ -1,7 +1,7 @@
 # Template build file for 'perl-Locale-gettext'
 pkgname=perl-Locale-gettext
 version=1.07
-revision=8
+revision=9
 wrksrc="Locale-gettext-$version"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/perl-MP3-Tag/template b/srcpkgs/perl-MP3-Tag/template
index 615c9cacd55..1bff6e2e7b7 100644
--- a/srcpkgs/perl-MP3-Tag/template
+++ b/srcpkgs/perl-MP3-Tag/template
@@ -1,16 +1,16 @@
 # Template file for 'perl-MP3-Tag'
 pkgname=perl-MP3-Tag
-version=1.14
+version=1.15
 revision=1
 archs=noarch
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
-hostmakedepends="perl"
+hostmakedepends="perl unzip"
 makedepends="${hostmakedepends}"
 depends="${makedepends}"
 short_desc="Module for reading tags of MP3 audio files"
 maintainer="eater <=@eater.me>"
+license="Artistic-1.0-Perl"
 homepage="https://metacpan.org/release/MP3-Tag"
-license="Artistic"
-distfiles="${CPAN_SITE}/MP3/${pkgname/perl-/}-${version}.tar.gz"
-checksum=3ec392f273ce38228ee2d7e53f7622f6f90a9c31c5079e6c9f354fb04a98c259
+distfiles="${CPAN_SITE}/MP3/${pkgname/perl-/}-${version}.zip"
+checksum=aaac48f4637edca408fd79381bc0bff0f9b11bd8e1e94de059dae993365f56d1
diff --git a/srcpkgs/perl-Mail-Box/template b/srcpkgs/perl-Mail-Box/template
index 3a1de40e86a..f2e68883b5e 100644
--- a/srcpkgs/perl-Mail-Box/template
+++ b/srcpkgs/perl-Mail-Box/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-Mail-Box'
 pkgname=perl-Mail-Box
-version=3.006
+version=3.008
 revision=1
 archs=noarch
 wrksrc="${pkgname/perl-/}-${version}"
@@ -17,4 +17,4 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Mail-Box"
 distfiles="${CPAN_SITE}/Mail/${pkgname/perl-/}-${version}.tar.gz"
-checksum=02948613e1df82b55df2ce963ec1d244e1f67f93ca5a4f9c70ee6039c23fa1ba
+checksum=b51a50945db1335503e1414d76dcc74e669c4179ea07852f9800b270d5c0d297
diff --git a/srcpkgs/perl-Mail-DKIM/template b/srcpkgs/perl-Mail-DKIM/template
index a9f16723718..e114481006e 100644
--- a/srcpkgs/perl-Mail-DKIM/template
+++ b/srcpkgs/perl-Mail-DKIM/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-Mail-DKIM'
 pkgname=perl-Mail-DKIM
-version=0.55
+version=0.57
 revision=1
 archs=noarch
 wrksrc="${pkgname/perl-/}-${version}"
@@ -15,4 +15,4 @@ maintainer="johannes <johannes.brechtmann@gmail.com>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Mail-DKIM"
 distfiles="${CPAN_SITE}/Mail/Mail-DKIM-${version}.tar.gz"
-checksum=df29ddf187025b6a8dfc1387209b7fef35557fed51f8313bd1763ae35c80daa2
+checksum=6b535354408e842eada8f4a118f7c990ee21284145229685e128414d2c87ae3a
diff --git a/srcpkgs/perl-Mail-Message/template b/srcpkgs/perl-Mail-Message/template
index 5b5a8a732db..9c54fceddbb 100644
--- a/srcpkgs/perl-Mail-Message/template
+++ b/srcpkgs/perl-Mail-Message/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl-IO-stringy perl-MailTools perl-MIME-Types perl-URI perl-User-Identity"
 depends="$makedepends"
 short_desc="Container for MIME-encoded message information"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Mail-Message"
 distfiles="${CPAN_SITE}/Mail/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Mail-POP3Client/template b/srcpkgs/perl-Mail-POP3Client/template
index 4661f3799f1..5317b8ce273 100644
--- a/srcpkgs/perl-Mail-POP3Client/template
+++ b/srcpkgs/perl-Mail-POP3Client/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Mail::POP3Client - Perl 5 module to talk to a POP3 (RFC1939) server"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Mail-POP3Client"
 distfiles="${CPAN_SITE}/Mail/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Mail-Sendmail/template b/srcpkgs/perl-Mail-Sendmail/template
index d3e49c5378e..55fdfc7f3ad 100644
--- a/srcpkgs/perl-Mail-Sendmail/template
+++ b/srcpkgs/perl-Mail-Sendmail/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Mail::Sendmail - Simple platform independent mailer"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Mail-Sendmail"
 distfiles="${CPAN_SITE}/Mail/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Mail-Transport/template b/srcpkgs/perl-Mail-Transport/template
index 68d7d8e20dd..1e1501c286e 100644
--- a/srcpkgs/perl-Mail-Transport/template
+++ b/srcpkgs/perl-Mail-Transport/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-Mail-Transport'
 pkgname=perl-Mail-Transport
-version=3.003
+version=3.004
 revision=1
 archs=noarch
 wrksrc="${pkgname/perl-/}-${version}"
@@ -9,8 +9,8 @@ hostmakedepends="perl"
 makedepends="perl perl-Mail-Message"
 depends="$makedepends"
 short_desc="Mail::Transport - base class for message exchange"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Mail-Transport"
 distfiles="${CPAN_SITE}/Mail/${pkgname/perl-/}-${version}.tar.gz"
-checksum=d7845063364175a6bd62bacf886c73a91742a5406918f378b19671312f576151
+checksum=cf315a09f617e881c01318069054ef9f17ef947ffbbc5ced2f1b00ebbad43d11
diff --git a/srcpkgs/perl-Math-BigInt-GMP/template b/srcpkgs/perl-Math-BigInt-GMP/template
index e926aa9e016..0e0ca21867a 100644
--- a/srcpkgs/perl-Math-BigInt-GMP/template
+++ b/srcpkgs/perl-Math-BigInt-GMP/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-Math-BigInt-GMP'
 pkgname=perl-Math-BigInt-GMP
-version=1.6006
+version=1.6007
 revision=1
 wrksrc="Math-BigInt-GMP-${version}"
 build_style=perl-module
@@ -9,10 +9,10 @@ makedepends="perl gmp-devel"
 depends="perl"
 short_desc="Math::BigInt::GMP - Use the GMP library for Math::BigInt routines"
 maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="https://metacpan.org/release/Math-BigInt-GMP"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
+homepage="https://metacpan.org/release/Math-BigInt-GMP"
 distfiles="${CPAN_SITE}/Math/Math-BigInt-GMP-${version}.tar.gz"
-checksum=0ec210b5dfb60b74a1923c03a8d5cd2cca287e5ea80380c4ba60b0270b1caf81
+checksum=5d725e6d20ccb37e072673628f0b0dd10e5dd011619f70f50ad58aded454c01f
 
 post_extract() {
 	sed -i /check_lib_or/d Makefile.PL
diff --git a/srcpkgs/perl-Math-FFT/template b/srcpkgs/perl-Math-FFT/template
new file mode 100644
index 00000000000..02017e387cc
--- /dev/null
+++ b/srcpkgs/perl-Math-FFT/template
@@ -0,0 +1,15 @@
+# Template file for 'perl-Math-FFT'
+pkgname=perl-Math-FFT
+version=1.34
+revision=2
+wrksrc="Math-FFT-${version}"
+build_style=perl-module
+hostmakedepends="perl"
+makedepends="perl"
+depends="perl"
+short_desc="Math::FFT - Fast Fourier Transform for perl"
+maintainer="Michal V <michal@pmsdev.tk>"
+license="Artistic-1.0-Perl, GPL-1.0-or-later"
+homepage="https://metacpan.org/release/Math-FFT"
+distfiles="${CPAN_SITE}/Math/Math-FFT-${version}.tar.gz"
+checksum=df7badbb4c1d21189ab7a3face3ecf817ee19d2df6f226451d3bc8fa2b7a7348
diff --git a/srcpkgs/perl-Math-Prime-Util-GMP/template b/srcpkgs/perl-Math-Prime-Util-GMP/template
index 1be58398a20..fad540d9ce5 100644
--- a/srcpkgs/perl-Math-Prime-Util-GMP/template
+++ b/srcpkgs/perl-Math-Prime-Util-GMP/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Math-Prime-Util-GMP'
 pkgname=perl-Math-Prime-Util-GMP
 version=0.51
-revision=2
+revision=3
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/perl-Math-Prime-Util/template b/srcpkgs/perl-Math-Prime-Util/template
index d29ec410db1..cf5d3db2cd4 100644
--- a/srcpkgs/perl-Math-Prime-Util/template
+++ b/srcpkgs/perl-Math-Prime-Util/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Math-Prime-Util'
 pkgname=perl-Math-Prime-Util
 version=0.73
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-Math-Prime-Util-GMP"
diff --git a/srcpkgs/perl-Module-Pluggable/template b/srcpkgs/perl-Module-Pluggable/template
index 24f881640b4..793c7d6c8bd 100644
--- a/srcpkgs/perl-Module-Pluggable/template
+++ b/srcpkgs/perl-Module-Pluggable/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Automatically give your module the ability to have plugins"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Module-Pluggable"
 distfiles="${CPAN_SITE}/Module/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Mojolicious/template b/srcpkgs/perl-Mojolicious/template
index 30d5f09d327..5e095d17f16 100644
--- a/srcpkgs/perl-Mojolicious/template
+++ b/srcpkgs/perl-Mojolicious/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-Mojolicious'
 pkgname=perl-Mojolicious
-version=8.14
+version=8.25
 revision=1
 archs=noarch
 wrksrc="${pkgname//perl-/}-${version}"
@@ -12,5 +12,4 @@ maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Mojolicious"
 distfiles="${CPAN_SITE}/${pkgname//perl-/}/${pkgname//perl-/}-${version}.tar.gz"
-checksum=381578a16a8c6c4600345b1a5e107f7485ff0a9a30fa3296b0d8b3507aab5535
-
+checksum=366c9f65b126d71a65eb34512fe47a0d18e1cf21dbb07f6d19a4a7c7dfdd257b
diff --git a/srcpkgs/perl-Monkey-Patch-Action/template b/srcpkgs/perl-Monkey-Patch-Action/template
index 07c4ba734d1..f13376e85df 100644
--- a/srcpkgs/perl-Monkey-Patch-Action/template
+++ b/srcpkgs/perl-Monkey-Patch-Action/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl-Sub-Delete"
 depends="$makedepends"
 short_desc="Wrap/add/replace/delete subs from other packages"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Monkey-Patch-Action"
 distfiles="${CPAN_SITE}/LWP/PERLANCAR/Monkey-Patch-Action-${version}.tar.gz"
diff --git a/srcpkgs/perl-Moo/template b/srcpkgs/perl-Moo/template
index 2fcb17a3bed..fc361c6ae6c 100644
--- a/srcpkgs/perl-Moo/template
+++ b/srcpkgs/perl-Moo/template
@@ -12,7 +12,7 @@ makedepends="perl perl-Class-Method-Modifiers perl-Devel-GlobalDestruction
 depends="$makedepends"
 checkdepends="perl-Test-Fatal"
 short_desc="Minimal Object Orientation support for Roles"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Moo"
 distfiles="https://cpan.org/authors/id/H/HA/HAARG/Moo-${version}.tar.gz"
diff --git a/srcpkgs/perl-MusicBrainz-DiscID/template b/srcpkgs/perl-MusicBrainz-DiscID/template
index 2c459e16040..d4b254144d5 100644
--- a/srcpkgs/perl-MusicBrainz-DiscID/template
+++ b/srcpkgs/perl-MusicBrainz-DiscID/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-musicbrainz-discid'
 pkgname=perl-MusicBrainz-DiscID
 version=0.04
-revision=4
+revision=5
 wrksrc="${pkgname//perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl pkg-config"
diff --git a/srcpkgs/perl-Net-DBus/template b/srcpkgs/perl-Net-DBus/template
index cfb6222e789..8a8a6401480 100644
--- a/srcpkgs/perl-Net-DBus/template
+++ b/srcpkgs/perl-Net-DBus/template
@@ -1,7 +1,7 @@
 # Template build file for 'perl-Net-DBus'.
 pkgname=perl-Net-DBus
 version=1.1.0
-revision=6
+revision=7
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl pkg-config"
diff --git a/srcpkgs/perl-Net-DNS-Resolver-Mock/template b/srcpkgs/perl-Net-DNS-Resolver-Mock/template
index 7cc7b5af2b9..dab8e29c040 100644
--- a/srcpkgs/perl-Net-DNS-Resolver-Mock/template
+++ b/srcpkgs/perl-Net-DNS-Resolver-Mock/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl perl-Net-DNS"
 depends="$makedepends"
 short_desc="Mock a DNS Resolver object for testing"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Net-DNS-Resolver-Mock"
 distfiles="${CPAN_SITE}/Net/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Net-IMAP-Client/template b/srcpkgs/perl-Net-IMAP-Client/template
index 5a6d302c01f..1e0f579548f 100644
--- a/srcpkgs/perl-Net-IMAP-Client/template
+++ b/srcpkgs/perl-Net-IMAP-Client/template
@@ -10,7 +10,7 @@ makedepends="perl perl-List-MoreUtils perl-IO-Socket-SSL"
 depends="$makedepends"
 checkdepends="perl-Test-Pod perl-Test-Pod-Coverage"
 short_desc="Not so simple IMAP client library"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Net-IMAP-Client"
 distfiles="${CPAN_SITE}/Net/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Net-IMAP-Simple/template b/srcpkgs/perl-Net-IMAP-Simple/template
index e394ca2bcc0..30d331492fb 100644
--- a/srcpkgs/perl-Net-IMAP-Simple/template
+++ b/srcpkgs/perl-Net-IMAP-Simple/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl-Parse-RecDescent"
 depends="$makedepends"
 short_desc="Perl extension for simple IMAP account handling"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Net-IMAP-Simple"
 distfiles="${CPAN_SITE}/Net/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Net-MPD/template b/srcpkgs/perl-Net-MPD/template
index 4aa330d023d..38363aa7b48 100644
--- a/srcpkgs/perl-Net-MPD/template
+++ b/srcpkgs/perl-Net-MPD/template
@@ -9,7 +9,7 @@ hostmakedepends="perl perl-Module-Build-Tiny"
 makedepends="perl"
 depends="perl mpd"
 short_desc="Net::MPD - Communicate with an MPD server"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://metacpan.org/release/Net-MPD"
 distfiles="${CPAN_SITE}/Net/Net-MPD-${version}.tar.gz"
diff --git a/srcpkgs/perl-Net-SSH2/template b/srcpkgs/perl-Net-SSH2/template
index 1243736de6e..fb1eab5c37f 100644
--- a/srcpkgs/perl-Net-SSH2/template
+++ b/srcpkgs/perl-Net-SSH2/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Net-SSH2'
 pkgname=perl-Net-SSH2
 version=0.70
-revision=2
+revision=3
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 configure_args="inc=${XBPS_CROSS_BASE}/usr/include lib=${XBPS_CROSS_BASE}/usr/lib"
diff --git a/srcpkgs/perl-Net-SSLeay/template b/srcpkgs/perl-Net-SSLeay/template
index 6222a9d4601..84d81817495 100644
--- a/srcpkgs/perl-Net-SSLeay/template
+++ b/srcpkgs/perl-Net-SSLeay/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Net-SSLeay'
 pkgname=perl-Net-SSLeay
 version=1.88
-revision=2
+revision=3
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl libressl"
diff --git a/srcpkgs/perl-NetAddr-IP/template b/srcpkgs/perl-NetAddr-IP/template
index 0206c62a099..6656608f85a 100644
--- a/srcpkgs/perl-NetAddr-IP/template
+++ b/srcpkgs/perl-NetAddr-IP/template
@@ -1,7 +1,7 @@
 # Template build file for 'perl-NetAddr-IP'.
 pkgname=perl-NetAddr-IP
 version=4.079
-revision=7
+revision=8
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/perl-Number-Compare/template b/srcpkgs/perl-Number-Compare/template
index 234a8f72106..df4eaca2780 100644
--- a/srcpkgs/perl-Number-Compare/template
+++ b/srcpkgs/perl-Number-Compare/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Numeric comparisons"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Number-Compare"
 distfiles="${CPAN_SITE}/Number/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Object-MultiType/template b/srcpkgs/perl-Object-MultiType/template
index fc604ebf8c6..7caf30b452d 100644
--- a/srcpkgs/perl-Object-MultiType/template
+++ b/srcpkgs/perl-Object-MultiType/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Perl Objects as Hash, Array, Scalar, Code and Glob at the same time"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Object-MultiType"
 distfiles="${CPAN_SITE}/Object/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-OpenGL/template b/srcpkgs/perl-OpenGL/template
index 01f850e8851..54eb38ce3e9 100644
--- a/srcpkgs/perl-OpenGL/template
+++ b/srcpkgs/perl-OpenGL/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-OpenGL'
 pkgname=perl-OpenGL
 version=0.70
-revision=1
+revision=2
 wrksrc="OpenGL-${version}"
 build_style=perl-module
 hostmakedepends="perl libfreeglut-devel libXmu-devel"
diff --git a/srcpkgs/perl-PDF-API2/template b/srcpkgs/perl-PDF-API2/template
index c75a8c69373..daa75dac3ec 100644
--- a/srcpkgs/perl-PDF-API2/template
+++ b/srcpkgs/perl-PDF-API2/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-PDF-API2'
 pkgname=perl-PDF-API2
-version=2.035
+version=2.036
 revision=1
 archs=noarch
 wrksrc="PDF-API2-${version}"
@@ -13,4 +13,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://metacpan.org/release/PDF-API2"
 distfiles="${CPAN_SITE}/PDF/PDF-API2-${version}.tar.gz"
-checksum=7e4435ff51c808451f53fa161672ba2eaa7c4d49f4ab6506801383882405bf80
+checksum=070444e9fef8beb6f115994a6ac89533fe8ba02d5e240a35bb07adcbcb511774
diff --git a/srcpkgs/perl-Package-Stash-XS/template b/srcpkgs/perl-Package-Stash-XS/template
index 4cb07baca25..87d594b7c1e 100644
--- a/srcpkgs/perl-Package-Stash-XS/template
+++ b/srcpkgs/perl-Package-Stash-XS/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Package-Stash-XS'
 pkgname=perl-Package-Stash-XS
 version=0.29
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/perl-PadWalker/template b/srcpkgs/perl-PadWalker/template
index 09ccaa1e0fd..77a8f471542 100644
--- a/srcpkgs/perl-PadWalker/template
+++ b/srcpkgs/perl-PadWalker/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-PadWalker'
 pkgname=perl-PadWalker
 version=2.3
-revision=4
+revision=5
 wrksrc="${pkgname#*-}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/perl-Pango/template b/srcpkgs/perl-Pango/template
index 730d58ce827..d2d752599e8 100644
--- a/srcpkgs/perl-Pango/template
+++ b/srcpkgs/perl-Pango/template
@@ -1,7 +1,7 @@
 # Template build file for 'perl-Pango'.
 pkgname=perl-Pango
 version=1.227
-revision=5
+revision=6
 wrksrc="Pango-$version"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/perl-Params-Util/template b/srcpkgs/perl-Params-Util/template
index aee5ca72d7a..8529d17507d 100644
--- a/srcpkgs/perl-Params-Util/template
+++ b/srcpkgs/perl-Params-Util/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Params-Util'
 pkgname=perl-Params-Util
 version=1.07
-revision=8
+revision=9
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/perl-Parse-RecDescent/template b/srcpkgs/perl-Parse-RecDescent/template
index 2ceaad7a9ed..272fe0008b6 100644
--- a/srcpkgs/perl-Parse-RecDescent/template
+++ b/srcpkgs/perl-Parse-RecDescent/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Generate Recursive-Descent Parsers"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Parse-RecDescent"
 distfiles="${CPAN_SITE}/Parse/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-PatchReader/template b/srcpkgs/perl-PatchReader/template
index ffe75775af7..51cd3172766 100644
--- a/srcpkgs/perl-PatchReader/template
+++ b/srcpkgs/perl-PatchReader/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="PatchReader - Utilities to read and manipulate patches and CVS"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Unknown"
 homepage="https://metacpan.org/release/PatchReader"
 distfiles="https://cpan.metacpan.org/authors/id/T/TM/TMANNERM/PatchReader-${version}.tar.gz"
diff --git a/srcpkgs/perl-Pegex/template b/srcpkgs/perl-Pegex/template
index 3fb7adbaa89..5700b7bec92 100644
--- a/srcpkgs/perl-Pegex/template
+++ b/srcpkgs/perl-Pegex/template
@@ -9,7 +9,7 @@ hostmakedepends="perl perl-File-ShareDir-Install"
 makedepends="perl perl-File-ShareDir-Install perl-YAML-LibYAML"
 depends="$makedepends"
 short_desc="Acmeist PEG Parser Framework"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Pegex"
 distfiles="http://search.cpan.org/CPAN/authors/id/I/IN/INGY/Pegex-${version}.tar.gz"
diff --git a/srcpkgs/perl-Pod-Simple-Text-Termcap/template b/srcpkgs/perl-Pod-Simple-Text-Termcap/template
index 9da2462b24e..65fcd4aa738 100644
--- a/srcpkgs/perl-Pod-Simple-Text-Termcap/template
+++ b/srcpkgs/perl-Pod-Simple-Text-Termcap/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Convert POD data to ASCII text with format escapes"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Pod-Simple-Text-Termcap"
 distfiles="${CPAN_SITE}/Pod/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Proc-Daemontools/template b/srcpkgs/perl-Proc-Daemontools/template
index 11ac2005782..ded05432e82 100644
--- a/srcpkgs/perl-Proc-Daemontools/template
+++ b/srcpkgs/perl-Proc-Daemontools/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Perl interface for the functionalities of Daemontools"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Proc-Daemontools"
 distfiles="${CPAN_SITE}/Proc/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Proc-Govern/template b/srcpkgs/perl-Proc-Govern/template
index 65eb1752542..f9b56c224c9 100644
--- a/srcpkgs/perl-Proc-Govern/template
+++ b/srcpkgs/perl-Proc-Govern/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Proc-Govern'
 pkgname=perl-Proc-Govern
-version=0.200
-revision=2
+version=0.208
+revision=1
 archs=noarch
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -9,8 +9,8 @@ hostmakedepends="perl"
 makedepends="perl perl-IPC-Run perl-File-Write-Rotate perl-Unix-Uptime"
 depends="$makedepends"
 short_desc="Run child process and govern its various aspects"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Proc-Govern"
 distfiles="${CPAN_SITE}/Proc/${pkgname/perl-/}-${version}.tar.gz"
-checksum=069d5e25f18929cab1ab3fe8380ff59eae7de6800aa6f8c9c71ed2d43eec88e9
+checksum=006ca518e605596b82be070b0bc3106034a189c97857e9b5165c083988ade1d7
diff --git a/srcpkgs/perl-Proc-PID-File/template b/srcpkgs/perl-Proc-PID-File/template
index 76b226feff1..c0a1929f98c 100644
--- a/srcpkgs/perl-Proc-PID-File/template
+++ b/srcpkgs/perl-Proc-PID-File/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="A module to manage process id files"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Proc-PID-File"
 distfiles="${CPAN_SITE}/Proc/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Proc-ProcessTable/template b/srcpkgs/perl-Proc-ProcessTable/template
index 840a0e460bd..58c07f2cb22 100644
--- a/srcpkgs/perl-Proc-ProcessTable/template
+++ b/srcpkgs/perl-Proc-ProcessTable/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Proc-ProcessTable'
 pkgname=perl-Proc-ProcessTable
 version=0.59
-revision=1
+revision=2
 wrksrc="Proc-ProcessTable-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/perl-Ref-Util-XS/template b/srcpkgs/perl-Ref-Util-XS/template
index 14bc317f21f..2eab774f615 100644
--- a/srcpkgs/perl-Ref-Util-XS/template
+++ b/srcpkgs/perl-Ref-Util-XS/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Ref-Util-XS'
 pkgname=perl-Ref-Util-XS
 version=0.117
-revision=1
+revision=2
 wrksrc="${pkgname#perl-}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/perl-Regexp-Grammars/template b/srcpkgs/perl-Regexp-Grammars/template
index 9bb70ecbca7..8e862310779 100644
--- a/srcpkgs/perl-Regexp-Grammars/template
+++ b/srcpkgs/perl-Regexp-Grammars/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-Regexp-Grammars'
 pkgname=perl-Regexp-Grammars
-version=1.049
+version=1.052
 revision=1
 archs=noarch
 wrksrc="${pkgname/perl-/}-${version}"
@@ -9,8 +9,8 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Add grammatical parsing features to Perl 5.10 regexes"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Regexp-Grammars"
 distfiles="${CPAN_SITE}/Regexp/${pkgname/perl-/}-${version}.tar.gz"
-checksum=2e642a7051b9ea5dccd05d53e49684ca28e99c43b811bbec37d160d3f81edf68
+checksum=d552e7aaec956fc9ff0c56602fc95bc5c97ef815a0a8df7f42d1128f39534a62
diff --git a/srcpkgs/perl-Role-Tiny/template b/srcpkgs/perl-Role-Tiny/template
index bd62ad2c418..be50a46b9b1 100644
--- a/srcpkgs/perl-Role-Tiny/template
+++ b/srcpkgs/perl-Role-Tiny/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-Role-Tiny'
 pkgname=perl-Role-Tiny
-version=2.000008
+version=2.001003
 revision=1
 archs=noarch
 wrksrc="${pkgname/perl-/}-${version}"
@@ -13,4 +13,4 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Role-Tiny"
 distfiles="${CPAN_SITE}/lib/HAARG/Role-Tiny-${version}.tar.gz"
-checksum=b1541fc5e3e0eb2dbd55b25c432293c197e0153c2c9f7747deba4df72c27146a
+checksum=6cef8d6371342a94a6a04c1be5bd7a3f2bd6ea36f1a21b4649b08d5b88b28eeb
diff --git a/srcpkgs/perl-SUPER/template b/srcpkgs/perl-SUPER/template
index 0b02c99b087..1b11e76b38e 100644
--- a/srcpkgs/perl-SUPER/template
+++ b/srcpkgs/perl-SUPER/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-SUPER'
 pkgname=perl-SUPER
-version=1.20141117
-revision=3
+version=1.20190531
+revision=1
 archs=noarch
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -9,8 +9,8 @@ hostmakedepends="perl"
 makedepends="perl perl-Sub-Identify"
 depends="$makedepends"
 short_desc="SUPER - control superclass method dispatch"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/SUPER"
 distfiles="${CPAN_SITE}/SUPER/SUPER-${version}.tar.gz"
-checksum=1a620e7d60aee9b13b1b26a44694c43fdb2bba1755cfff435dae83c7d42cc0b2
+checksum=685d1ee76e7f0e9006942923bf7df8b11c107132992917593dcf7397d417d39a
diff --git a/srcpkgs/perl-Scope-Guard/template b/srcpkgs/perl-Scope-Guard/template
index dacad0c4e7e..f17c470e784 100644
--- a/srcpkgs/perl-Scope-Guard/template
+++ b/srcpkgs/perl-Scope-Guard/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Lexically-scoped resource management"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Scope-Guard"
 distfiles="${CPAN_SITE}/Scope/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Search-Xapian/template b/srcpkgs/perl-Search-Xapian/template
index 15b15947e56..5c98eb870d7 100644
--- a/srcpkgs/perl-Search-Xapian/template
+++ b/srcpkgs/perl-Search-Xapian/template
@@ -1,7 +1,7 @@
 # Template build file for 'perl-Search-Xapian'
 pkgname=perl-Search-Xapian
 version=1.2.25.2
-revision=1
+revision=2
 wrksrc="Search-Xapian-$version"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/perl-Socket-MsgHdr/template b/srcpkgs/perl-Socket-MsgHdr/template
index 5d3a922c423..211189bc467 100644
--- a/srcpkgs/perl-Socket-MsgHdr/template
+++ b/srcpkgs/perl-Socket-MsgHdr/template
@@ -1,14 +1,14 @@
 # Template file for 'perl-Socket-MsgHdr'
 pkgname=perl-Socket-MsgHdr
 version=0.05
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Sendmsg, recvmsg and ancillary data operations"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Socket-MsgHdr"
 distfiles="${CPAN_SITE}/Socket/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Socket6/template b/srcpkgs/perl-Socket6/template
index 7cc288d0bfc..0a54eda01f4 100644
--- a/srcpkgs/perl-Socket6/template
+++ b/srcpkgs/perl-Socket6/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Socket6'
 pkgname=perl-Socket6
 version=0.29
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/perl-Spiffy/template b/srcpkgs/perl-Spiffy/template
index e773b0d0225..4412ade6858 100644
--- a/srcpkgs/perl-Spiffy/template
+++ b/srcpkgs/perl-Spiffy/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Spiffy - Spiffy Perl Interface Framework For You"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Spiffy"
 distfiles="https://www.cpan.org/authors/id/I/IN/INGY/Spiffy-${version}.tar.gz"
diff --git a/srcpkgs/perl-Sub-Delete/template b/srcpkgs/perl-Sub-Delete/template
index d61efd5dbc3..f57c5ceee74 100644
--- a/srcpkgs/perl-Sub-Delete/template
+++ b/srcpkgs/perl-Sub-Delete/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Perl module enabling one to delete subroutines"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Sub-Delete"
 distfiles="${CPAN_SITE}/Sub/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Sub-Identify/template b/srcpkgs/perl-Sub-Identify/template
index cdd8339aa2d..9dd8b94c50d 100644
--- a/srcpkgs/perl-Sub-Identify/template
+++ b/srcpkgs/perl-Sub-Identify/template
@@ -1,7 +1,7 @@
 # Template build file for 'perl-Sub-Identify'.
 pkgname=perl-Sub-Identify
 version=0.14
-revision=4
+revision=5
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/perl-Sub-Info/template b/srcpkgs/perl-Sub-Info/template
index 122134b6ad2..6026d8f5bf2 100644
--- a/srcpkgs/perl-Sub-Info/template
+++ b/srcpkgs/perl-Sub-Info/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl perl-Importer"
 depends="$makedepends"
 short_desc="Sub::Info - Tool for inspecting subroutines"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Sub-Info"
 distfiles="${CPAN_SITE}/Sub/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Sub-Name/template b/srcpkgs/perl-Sub-Name/template
index 2f7f1eea580..58e62fbbd6b 100644
--- a/srcpkgs/perl-Sub-Name/template
+++ b/srcpkgs/perl-Sub-Name/template
@@ -1,7 +1,7 @@
-# Template build file for 'perl-Sub-Name'.
+# Template file for 'perl-Sub-Name'
 pkgname=perl-Sub-Name
-version=0.21
-revision=4
+version=0.26
+revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
@@ -9,7 +9,7 @@ makedepends="perl"
 depends="perl"
 short_desc="Assigns a new name to referenced sub"
 maintainer="newbluemoon <blaumolch@mailbox.org>"
-homepage="https://metacpan.org/release/Sub-Name"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
+homepage="https://metacpan.org/release/Sub-Name"
 distfiles="${CPAN_SITE}/Sub/${pkgname/perl-/}-$version.tar.gz"
-checksum="bd32e9dee07047c10ae474c9f17d458b6e9885a6db69474c7a494ccc34c27117"
+checksum=2d2f2d697d516c89547e7c4307f1e79441641cae2c7395e7319b306d390df105
diff --git a/srcpkgs/perl-Sub-Quote/template b/srcpkgs/perl-Sub-Quote/template
index 9bf4475b1e4..1ab6d42ec20 100644
--- a/srcpkgs/perl-Sub-Quote/template
+++ b/srcpkgs/perl-Sub-Quote/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-Sub-Quote'
 pkgname=perl-Sub-Quote
-version=2.006003
+version=2.006006
 revision=1
 archs=noarch
 wrksrc="${pkgname/perl-/}-${version}"
@@ -10,8 +10,8 @@ makedepends="perl perl-Sub-Name"
 depends="$makedepends"
 checkdepends="perl-Test-Fatal"
 short_desc="Efficient generation of subroutines via string eval"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Sub-Quote"
 distfiles="${CPAN_SITE}/Sub/${pkgname/perl-/}-${version}.tar.gz"
-checksum=be1f3a6f773f351f203cdc8f614803ac492b77d15fd68d5b1f0cd3884be18176
+checksum=6e4e2af42388fa6d2609e0e82417de7cc6be47223f576592c656c73c7524d89d
diff --git a/srcpkgs/perl-Svsh/template b/srcpkgs/perl-Svsh/template
index 6fd5955024d..06a7bfa948e 100644
--- a/srcpkgs/perl-Svsh/template
+++ b/srcpkgs/perl-Svsh/template
@@ -10,7 +10,7 @@ makedepends="perl perl-namespace-clean perl-Term-ShellUI perl-Proc-ProcessTable
  perl-Term-ReadLine-Gnu perl-Moo perl-Getopt-Compact perl-Pod-Simple-Text-Termcap"
 depends="$makedepends"
 short_desc="Process supervision shell for daemontools-family of supervisors"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Svsh"
 distfiles="https://cpan.org/authors/id/I/ID/IDOPEREL/Svsh-${version}.tar.gz"
diff --git a/srcpkgs/perl-Sys-Syscall/template b/srcpkgs/perl-Sys-Syscall/template
index 01b98e87dbc..cdcc58dc479 100644
--- a/srcpkgs/perl-Sys-Syscall/template
+++ b/srcpkgs/perl-Sys-Syscall/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Access system calls that Perl doesn't normally provide access to"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Sys-Syscall"
 distfiles="${CPAN_SITE}/Sys/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Taint-Runtime/template b/srcpkgs/perl-Taint-Runtime/template
index 3f06d3308f9..9c0d0b7a17e 100644
--- a/srcpkgs/perl-Taint-Runtime/template
+++ b/srcpkgs/perl-Taint-Runtime/template
@@ -1,14 +1,14 @@
 # Template file for 'perl-Taint-Runtime'
 pkgname=perl-Taint-Runtime
 version=0.03
-revision=5
+revision=6
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="perl"
 depends="${makedepends}"
 short_desc="Runtime enable taint checking"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Taint-Runtime"
 distfiles="${CPAN_SITE}/Taint/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Template-Toolkit/template b/srcpkgs/perl-Template-Toolkit/template
index 291db570c49..b361f97fe35 100644
--- a/srcpkgs/perl-Template-Toolkit/template
+++ b/srcpkgs/perl-Template-Toolkit/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Template-Toolkit'
 pkgname=perl-Template-Toolkit
 version=2.29
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/perl-Term-ExtendedColor/template b/srcpkgs/perl-Term-ExtendedColor/template
index b4d3e4ed16c..971fc6ffbd0 100644
--- a/srcpkgs/perl-Term-ExtendedColor/template
+++ b/srcpkgs/perl-Term-ExtendedColor/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-Term-ExtendedColor'
 pkgname=perl-Term-ExtendedColor
-version=0.503
+version=0.504
 revision=1
 archs=noarch
 wrksrc="Term-ExtendedColor-${version}"
@@ -9,8 +9,8 @@ hostmakedepends="perl"
 makedepends="$hostmakedepends"
 depends="$hostmakedepends"
 short_desc="Color screen output using 256 colors"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Term-ExtendedColor"
 distfiles="${CPAN_SITE}/Term/Term-ExtendedColor-${version}.tar.gz"
-checksum=73cc7ee3314381dce3a8694874e25b9b610b44ce0bb8c5b9f0ac3e372fb72752
+checksum=8965f8f032a27df755b92b27a07901b0dbb2ee0178c0f6fa38c7f5c4d3c00380
diff --git a/srcpkgs/perl-Term-ReadKey/template b/srcpkgs/perl-Term-ReadKey/template
index 00aabd54e84..489f3123de7 100644
--- a/srcpkgs/perl-Term-ReadKey/template
+++ b/srcpkgs/perl-Term-ReadKey/template
@@ -2,7 +2,7 @@
 pkgname=perl-Term-ReadKey
 reverts="2.37_1"
 version=2.33
-revision=8
+revision=9
 wrksrc="TermReadKey-$version"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/perl-Term-ReadLine-Gnu/template b/srcpkgs/perl-Term-ReadLine-Gnu/template
index 9a7eece7590..e4f60f8c69e 100644
--- a/srcpkgs/perl-Term-ReadLine-Gnu/template
+++ b/srcpkgs/perl-Term-ReadLine-Gnu/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Term-ReadLine-Gnu'
 pkgname=perl-Term-ReadLine-Gnu
 version=1.36
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl ncurses-devel readline-devel"
diff --git a/srcpkgs/perl-Term-Table/template b/srcpkgs/perl-Term-Table/template
index 7091775438d..5c312a05282 100644
--- a/srcpkgs/perl-Term-Table/template
+++ b/srcpkgs/perl-Term-Table/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-Term-Table'
 pkgname=perl-Term-Table
-version=0.013
+version=0.014
 revision=1
 archs=noarch
 wrksrc="${pkgname/perl-/}-${version}"
@@ -9,8 +9,8 @@ hostmakedepends="perl"
 makedepends="perl perl-Importer"
 depends="$makedepends"
 short_desc="Format a header and rows into a table"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Term-Table"
 distfiles="${CPAN_SITE}/Term/${pkgname/perl-/}-${version}.tar.gz"
-checksum=ffeb36dcb25c575b9f63657d1591a14af22cd10ba23cc76de9d976b426f4fc40
+checksum=167a0669e2ef8c6386ea4dd213495e445049493ce1d5097d5632c0e928b7426d
diff --git a/srcpkgs/perl-Test-Base/template b/srcpkgs/perl-Test-Base/template
index 254b1fbfdfd..9eef8acf384 100644
--- a/srcpkgs/perl-Test-Base/template
+++ b/srcpkgs/perl-Test-Base/template
@@ -10,7 +10,7 @@ makedepends="perl perl-Text-Diff perl-Spiffy"
 depends="$makedepends"
 checkdepends="perl-Test-Deep"
 short_desc="Test::Base - A Data Driven Testing Framework"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-Base"
 distfiles="${CPAN_SITE}/Test/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Test-CPAN-Meta/template b/srcpkgs/perl-Test-CPAN-Meta/template
index 1f4b17960f7..3c21325b9e1 100644
--- a/srcpkgs/perl-Test-CPAN-Meta/template
+++ b/srcpkgs/perl-Test-CPAN-Meta/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Test::CPAN::Meta - Validate your CPAN META.yml files"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-2.0"
 homepage="https://metacpan.org/release/Test-CPAN-Meta"
 distfiles="${CPAN_SITE}/Test/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Test-Class/template b/srcpkgs/perl-Test-Class/template
index 496d28d7844..1b60133766e 100644
--- a/srcpkgs/perl-Test-Class/template
+++ b/srcpkgs/perl-Test-Class/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl perl-MRO-Compat perl-Try-Tiny perl-Test-Exception perl-Module-Runtime"
 depends="$makedepends"
 short_desc="Easily create test classes in an xUnit/JUnit style"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-Class"
 distfiles="${CPAN_SITE}/Test/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Test-Cmd/template b/srcpkgs/perl-Test-Cmd/template
index 51f316b727c..aa4e8c68a7c 100644
--- a/srcpkgs/perl-Test-Cmd/template
+++ b/srcpkgs/perl-Test-Cmd/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Test::Cmd - Perl module for portable testing of commands and scripts"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-Cmd"
 distfiles="${CPAN_SITE}/Test/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Test-Command/template b/srcpkgs/perl-Test-Command/template
index a237b30706d..2232d4c1d82 100644
--- a/srcpkgs/perl-Test-Command/template
+++ b/srcpkgs/perl-Test-Command/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Test routines for external commands"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-Command"
 distfiles="${CPAN_SITE}/Test/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Test-Deep/template b/srcpkgs/perl-Test-Deep/template
index 38e8092dba4..504bdb592e8 100644
--- a/srcpkgs/perl-Test-Deep/template
+++ b/srcpkgs/perl-Test-Deep/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Test::Deep - Extremely flexible deep comparison"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-Deep"
 distfiles="${CPAN_SITE}/Test/${pkgname/perl-}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Test-FailWarnings/template b/srcpkgs/perl-Test-FailWarnings/template
index 91da229a974..e3fdb4ab06e 100644
--- a/srcpkgs/perl-Test-FailWarnings/template
+++ b/srcpkgs/perl-Test-FailWarnings/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl perl-Capture-Tiny"
 depends="$makedepends"
 short_desc="Test::FailWarnings - Add test failures if warnings are caught"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://metacpan.org/release/Test-FailWarnings"
 distfiles="${CPAN_SITE}/Test/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Test-File-ShareDir/template b/srcpkgs/perl-Test-File-ShareDir/template
index 92b2bae7ae3..6dd421ddbde 100644
--- a/srcpkgs/perl-Test-File-ShareDir/template
+++ b/srcpkgs/perl-Test-File-ShareDir/template
@@ -11,7 +11,7 @@ makedepends="perl perl-Path-Tiny perl-File-ShareDir perl-Class-Tiny
 depends="$makedepends"
 checkdepends="perl-Test-Fatal"
 short_desc="Simplified dist oriented ShareDir tester"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-File-ShareDir"
 distfiles="${CPAN_SITE}/Test/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Test-File/template b/srcpkgs/perl-Test-File/template
index 712b9cbdec6..08d104ca38a 100644
--- a/srcpkgs/perl-Test-File/template
+++ b/srcpkgs/perl-Test-File/template
@@ -10,7 +10,7 @@ makedepends="perl"
 depends="$makedepends"
 checkdepends="perl-Test-utf8"
 short_desc="Test file attributes"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-File"
 distfiles="${CPAN_SITE}/Test/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Test-HTTP-Server-Simple/template b/srcpkgs/perl-Test-HTTP-Server-Simple/template
index 683dd071ca7..a9ea7150716 100644
--- a/srcpkgs/perl-Test-HTTP-Server-Simple/template
+++ b/srcpkgs/perl-Test-HTTP-Server-Simple/template
@@ -10,7 +10,7 @@ makedepends="perl-HTTP-Server-Simple"
 depends="$makedepends"
 checkdepends="perl-Test-Pod perl-Test-Pod-Coverage"
 short_desc="Test::More functions for HTTP::Server::Simple"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-HTTP-Server-Simple"
 distfiles="${CPAN_SITE}/Test/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Test-Inter/template b/srcpkgs/perl-Test-Inter/template
index 79f9d86f8b1..321f710da5f 100644
--- a/srcpkgs/perl-Test-Inter/template
+++ b/srcpkgs/perl-Test-Inter/template
@@ -10,7 +10,7 @@ makedepends="$hostmakedepends"
 depends="$makedepends"
 checkdepends="perl-Test-Pod-Coverage perl-Test-Pod"
 short_desc="Framework for more readable interactive test scripts"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-Inter"
 distfiles="${CPAN_SITE}/Test/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Test-LeakTrace/template b/srcpkgs/perl-Test-LeakTrace/template
index 69fe32c0d82..e400fdc0120 100644
--- a/srcpkgs/perl-Test-LeakTrace/template
+++ b/srcpkgs/perl-Test-LeakTrace/template
@@ -1,14 +1,14 @@
 # Template file for 'perl-Test-LeakTrace'
 pkgname=perl-Test-LeakTrace
 version=0.16
-revision=4
+revision=5
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="perl"
 depends="${makedepends}"
 short_desc="Test::LeakTrace - Traces memory leaks"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-LeakTrace"
 distfiles="${CPAN_SITE}/Test/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Test-MockModule/template b/srcpkgs/perl-Test-MockModule/template
index d8ba050dd04..af992603020 100644
--- a/srcpkgs/perl-Test-MockModule/template
+++ b/srcpkgs/perl-Test-MockModule/template
@@ -10,7 +10,7 @@ makedepends="perl-SUPER"
 depends="perl-SUPER"
 checkdepends="perl-Test-Pod perl-Test-Pod-Coverage perl-Test-Warnings"
 short_desc="Test::MockModule - Override subroutines in a module for unit testing"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-MockModule"
 distfiles="${CPAN_SITE}/Test/${pkgname/perl-/}-v${version}.tar.gz"
diff --git a/srcpkgs/perl-Test-Most/template b/srcpkgs/perl-Test-Most/template
index 2ff02dc2139..70013c70ae3 100644
--- a/srcpkgs/perl-Test-Most/template
+++ b/srcpkgs/perl-Test-Most/template
@@ -10,7 +10,7 @@ makedepends="perl perl-Exception-Class perl-Devel-StackTrace perl-Test-Differenc
 perl-Test-Exception perl-Test-Warn perl-Test-Deep"
 depends="$makedepends"
 short_desc="Test::Most - Most commonly needed test functions and features"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-Most"
 distfiles="${CPAN_SITE}/Test/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Test-Needs/template b/srcpkgs/perl-Test-Needs/template
index 0dc6edaf58c..e5c81edc3ac 100644
--- a/srcpkgs/perl-Test-Needs/template
+++ b/srcpkgs/perl-Test-Needs/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Test::Needs - Skip tests when modules not available"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-Needs"
 distfiles="${CPAN_SITE}/Test/Test-Needs-${version}.tar.gz"
diff --git a/srcpkgs/perl-Test-Output/template b/srcpkgs/perl-Test-Output/template
index dd678dcb29e..df03ea4add2 100644
--- a/srcpkgs/perl-Test-Output/template
+++ b/srcpkgs/perl-Test-Output/template
@@ -10,7 +10,7 @@ makedepends="perl perl-Capture-Tiny"
 depends="$makedepends"
 checkdepends="perl-Test-Pod perl-Test-Pod-Coverage"
 short_desc="Test::Output - Utilities to test STDOUT and STDERR messages"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-Output"
 distfiles="${CPAN_SITE}/Test/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Test-Requires/template b/srcpkgs/perl-Test-Requires/template
index 92273cd5fde..2c58650b6ee 100644
--- a/srcpkgs/perl-Test-Requires/template
+++ b/srcpkgs/perl-Test-Requires/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Test::Requires - Checks to see if the module can be loaded"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-Requires"
 distfiles="${CPAN_SITE}/Test/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Test-RequiresInternet/template b/srcpkgs/perl-Test-RequiresInternet/template
index f49da4bed58..69d8f515348 100644
--- a/srcpkgs/perl-Test-RequiresInternet/template
+++ b/srcpkgs/perl-Test-RequiresInternet/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Test::RequiresInternet - Easily test network connectivity"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-RequiresInternet"
 distfiles="${CPAN_SITE}/Test/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Test-SharedFork/template b/srcpkgs/perl-Test-SharedFork/template
index b646012aee3..b975ff0ecc3 100644
--- a/srcpkgs/perl-Test-SharedFork/template
+++ b/srcpkgs/perl-Test-SharedFork/template
@@ -10,7 +10,7 @@ makedepends="perl"
 depends="$makedepends"
 checkdepends="perl-Test-Requires"
 short_desc="Utility module for Test::Builder that wraps fork(2)"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-SharedFork"
 distfiles="${CPAN_SITE}/Test/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Test-Simple/template b/srcpkgs/perl-Test-Simple/template
index a710cb67081..1f5002d8f9d 100644
--- a/srcpkgs/perl-Test-Simple/template
+++ b/srcpkgs/perl-Test-Simple/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-Test-Simple'
 pkgname=perl-Test-Simple
-version=1.302162
+version=1.302168
 revision=1
 archs=noarch
 wrksrc="${pkgname/perl-/}-${version}"
@@ -9,8 +9,8 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Framework for writing test tools that work well together"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-Simple"
 distfiles="${CPAN_SITE}/Test/${pkgname/perl-/}-${version}.tar.gz"
-checksum=73a0197c3d735e060881da509f4c5fa76c4cbf7dbabd4297d3cf5f5feed31fc4
+checksum=02f6132b2062abb23474b0fc02e70a0fbbf7bf581a6010e64c08891530447ffa
diff --git a/srcpkgs/perl-Test-Subroutines/template b/srcpkgs/perl-Test-Subroutines/template
index 5a3cdd93d5a..acfd9da0cd8 100644
--- a/srcpkgs/perl-Test-Subroutines/template
+++ b/srcpkgs/perl-Test-Subroutines/template
@@ -10,7 +10,7 @@ makedepends="perl perl-Devel-LexAlias perl-File-Slurp"
 depends="$makedepends"
 checkdepends="perl-Test-Pod perl-Test-Pod-Coverage"
 short_desc="Test::Subroutines - Standalone execution of Perl program subroutines"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-Subroutines"
 distfiles="${CPAN_SITE}/Test/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Test-TCP/template b/srcpkgs/perl-Test-TCP/template
index c714bb5fc7e..31caea2c412 100644
--- a/srcpkgs/perl-Test-TCP/template
+++ b/srcpkgs/perl-Test-TCP/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-Test-TCP'
 pkgname=perl-Test-TCP
-version=2.20
+version=2.22
 revision=1
 archs=noarch
 wrksrc="Test-TCP-$version"
@@ -14,4 +14,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-TCP"
 distfiles="${CPAN_SITE}/Test/Test-TCP-${version}.tar.gz"
-checksum=49e0ea0d9114e185b695200eabb8306fd1ffcf111b0295397838eb79a3c42989
+checksum=3e53c3c06d6d0980a2bfeb915602b714e682ee211ae88c11748cf2cc714e7b57
diff --git a/srcpkgs/perl-Test-Warn/template b/srcpkgs/perl-Test-Warn/template
index 5338f333c8f..174a5303531 100644
--- a/srcpkgs/perl-Test-Warn/template
+++ b/srcpkgs/perl-Test-Warn/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="${hostmakedepends} perl-Sub-Uplevel"
 depends="$makedepends"
 short_desc="Test::Warn - Perl extension to test methods for warnings"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-Warn"
 changelog="https://fastapi.metacpan.org/source/BIGJ/Test-Warn-${version}/Changes"
diff --git a/srcpkgs/perl-Test-Warnings/template b/srcpkgs/perl-Test-Warnings/template
index ac3b4ed5f3b..5378790e5c5 100644
--- a/srcpkgs/perl-Test-Warnings/template
+++ b/srcpkgs/perl-Test-Warnings/template
@@ -1,17 +1,17 @@
 # Template file for 'perl-Test-Warnings'
 pkgname=perl-Test-Warnings
-version=0.026
-revision=2
+version=0.027
+revision=1
 archs=noarch
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="perl"
-checkdepends="perl-CPAN-Meta-Check"
 depends="$makedepends"
+checkdepends="perl-CPAN-Meta-Check"
 short_desc="Test::Warnings - Test for warnings and the lack of them"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-Warnings"
 distfiles="${CPAN_SITE}/Test/${pkgname/perl-/}-${version}.tar.gz"
-checksum=ae2b68b1b5616704598ce07f5118efe42dc4605834453b7b2be14e26f9cc9a08
+checksum=118dd9f48408557555f0af5478e0e873f9df0952cf5911f697a4ce5165880864
diff --git a/srcpkgs/perl-Test-Weaken/template b/srcpkgs/perl-Test-Weaken/template
index 84332c83821..f336b5a09b6 100644
--- a/srcpkgs/perl-Test-Weaken/template
+++ b/srcpkgs/perl-Test-Weaken/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Test::Weaken - Test that freed memory objects were, indeed, freed"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-Weaken"
 distfiles="${CPAN_SITE}/Test/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Test-Without-Module/template b/srcpkgs/perl-Test-Without-Module/template
index a8bcdaf6279..662a2293596 100644
--- a/srcpkgs/perl-Test-Without-Module/template
+++ b/srcpkgs/perl-Test-Without-Module/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Test fallback vehaivour in absence of modules"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-Without-Module"
 distfiles="${CPAN_SITE}/Test/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Test-YAML/template b/srcpkgs/perl-Test-YAML/template
index 5b9dfe1eaa6..21f167214ef 100644
--- a/srcpkgs/perl-Test-YAML/template
+++ b/srcpkgs/perl-Test-YAML/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl perl-Test-Base"
 depends="$makedepends"
 short_desc="Test::YAML - Testing Module for YAML Implementations"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-YAML"
 distfiles="${CPAN_SITE}/Test/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Test-utf8/template b/srcpkgs/perl-Test-utf8/template
index 4d62fb503ff..efb545abc01 100644
--- a/srcpkgs/perl-Test-utf8/template
+++ b/srcpkgs/perl-Test-utf8/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Handy UTF8 tests"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-utf8"
 distfiles="${CPAN_SITE}/Test/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Test2-Plugin-NoWarnings/template b/srcpkgs/perl-Test2-Plugin-NoWarnings/template
index f867cfb170e..45501cb5757 100644
--- a/srcpkgs/perl-Test2-Plugin-NoWarnings/template
+++ b/srcpkgs/perl-Test2-Plugin-NoWarnings/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Test2-Plugin-NoWarnings'
 pkgname=perl-Test2-Plugin-NoWarnings
-version=0.06
-revision=2
+version=0.08
+revision=1
 archs=noarch
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -10,8 +10,8 @@ makedepends="perl"
 depends="$makedepends"
 checkdepends="perl-IPC-Run3 perl-Test2-Suite perl-Term-Table"
 short_desc="Fail if tests warn plugin for Test2"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test2-Plugin-NoWarnings"
 distfiles="${CPAN_SITE}/Test/DROLSKY/Test2-Plugin-NoWarnings-${version}.tar.gz"
-checksum=8288c1d934f69a03224598fbb715adc079c0d1609bfbaea6c88682aab1995800
+checksum=9e914cbd54008f49f9c115539914667d3b30f7acf7a6ab5272e06162f5645988
diff --git a/srcpkgs/perl-Test2-Suite/template b/srcpkgs/perl-Test2-Suite/template
index df823b2ea23..b1ff48eea50 100644
--- a/srcpkgs/perl-Test2-Suite/template
+++ b/srcpkgs/perl-Test2-Suite/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-Test2-Suite'
 pkgname=perl-Test2-Suite
-version=0.000119
+version=0.000126
 revision=1
 archs=noarch
 wrksrc="${pkgname/perl-/}-${version}"
@@ -10,8 +10,8 @@ makedepends="perl perl-Module-Pluggable perl-Sub-Info perl-Scope-Guard
  perl-Term-Table"
 depends="$makedepends"
 short_desc="Distribution with a rich set of tools built upon the Test2 framework"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test2-Suite"
 distfiles="${CPAN_SITE}/Test/EXODIST/Test2-Suite-${version}.tar.gz"
-checksum=fd48764118acf1c30057f58f0af90696b194fbc5b637c77e08672e949c101e74
+checksum=370db8171c9105480872ae8948745dbd798b9d751aacc8aa0fc36266eeda79e3
diff --git a/srcpkgs/perl-Text-Aligner/template b/srcpkgs/perl-Text-Aligner/template
index 5d986e66ae2..fbfddf59bb5 100644
--- a/srcpkgs/perl-Text-Aligner/template
+++ b/srcpkgs/perl-Text-Aligner/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Justify strings with various alignment styles"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Text-Aligner"
 distfiles="${CPAN_SITE}/Text/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Text-Bidi/template b/srcpkgs/perl-Text-Bidi/template
index ce7c8e4674b..e08c9101542 100644
--- a/srcpkgs/perl-Text-Bidi/template
+++ b/srcpkgs/perl-Text-Bidi/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Text-Bidi'
 pkgname=perl-Text-Bidi
 version=2.15
-revision=1
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=perl-module
 hostmakedepends="perl swig"
diff --git a/srcpkgs/perl-Text-CharWidth/template b/srcpkgs/perl-Text-CharWidth/template
index 961b0a2f25f..a64c804efec 100644
--- a/srcpkgs/perl-Text-CharWidth/template
+++ b/srcpkgs/perl-Text-CharWidth/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Text-CharWidth'
 pkgname=perl-Text-CharWidth
 version=0.04
-revision=4
+revision=5
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/perl-Text-Markdown/template b/srcpkgs/perl-Text-Markdown/template
index d2c3fc74e51..753ace32d12 100644
--- a/srcpkgs/perl-Text-Markdown/template
+++ b/srcpkgs/perl-Text-Markdown/template
@@ -10,7 +10,7 @@ makedepends="perl"
 depends="$makedepends"
 checkdepends="perl-Test-Exception perl-List-MoreUtils perl-Test-Differences"
 short_desc="Convert Markdown syntax to (X)HTML"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Text-Markdown"
 distfiles="${CPAN_SITE}/Text/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Text-Table/template b/srcpkgs/perl-Text-Table/template
index 704cb8ea961..c375aaddb11 100644
--- a/srcpkgs/perl-Text-Table/template
+++ b/srcpkgs/perl-Text-Table/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl perl-Text-Aligner"
 depends="$makedepends"
 short_desc="Organize Data in Tables"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Text-Table"
 distfiles="${CPAN_SITE}/Text/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Text-XLogfile/template b/srcpkgs/perl-Text-XLogfile/template
index de13017e920..6cc929a6493 100644
--- a/srcpkgs/perl-Text-XLogfile/template
+++ b/srcpkgs/perl-Text-XLogfile/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Text::Xlogfile - Read and write xlogfiles"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Text-XLogfile"
 distfiles="${CPAN_SITE}/Text/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Time-modules/template b/srcpkgs/perl-Time-modules/template
index 4fc4637eaab..0bd579a552a 100644
--- a/srcpkgs/perl-Time-modules/template
+++ b/srcpkgs/perl-Time-modules/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Tools for dealing with time, time formats, timezones and calendars"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Unknown"
 homepage="https://metacpan.org/release/MUIR/Time-modules-${version}"
 distfiles="${CPAN_SITE}/Time/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Tk/template b/srcpkgs/perl-Tk/template
index ab62b1646f7..8ba1d3b2cde 100644
--- a/srcpkgs/perl-Tk/template
+++ b/srcpkgs/perl-Tk/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Tk'
 pkgname=perl-Tk
 version=804.034
-revision=3
+revision=4
 wrksrc="${pkgname#*-}-${version}"
 build_style=perl-module
 configure_args="X11INC=${XBPS_CROSS_BASE}/usr/include
diff --git a/srcpkgs/perl-Unicode-LineBreak/template b/srcpkgs/perl-Unicode-LineBreak/template
index 2d08705a6d0..3d335c91f29 100644
--- a/srcpkgs/perl-Unicode-LineBreak/template
+++ b/srcpkgs/perl-Unicode-LineBreak/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Unicode-LineBreak'
 pkgname=perl-Unicode-LineBreak
 version=2019.001
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl pkg-config"
diff --git a/srcpkgs/perl-Unicode-String/template b/srcpkgs/perl-Unicode-String/template
index d5d524297ca..57f71131a31 100644
--- a/srcpkgs/perl-Unicode-String/template
+++ b/srcpkgs/perl-Unicode-String/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Unicode-String'
 pkgname=perl-Unicode-String
 version=2.10
-revision=5
+revision=6
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/perl-Unix-Mknod/template b/srcpkgs/perl-Unix-Mknod/template
index c87dc1b1052..2d58c0e7124 100644
--- a/srcpkgs/perl-Unix-Mknod/template
+++ b/srcpkgs/perl-Unix-Mknod/template
@@ -1,14 +1,14 @@
 # Template file for 'perl-Unix-Mknod'
 pkgname=perl-Unix-Mknod
 version=0.04
-revision=4
+revision=5
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="perl"
 depends="${makedepends}"
 short_desc="Perl extension of mknod, major, minor and makedev"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Unix-Mknod"
 distfiles="${CPAN_SITE}/Unix/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Unix-Uptime/template b/srcpkgs/perl-Unix-Uptime/template
index 4139625e4c6..0c9454e3374 100644
--- a/srcpkgs/perl-Unix-Uptime/template
+++ b/srcpkgs/perl-Unix-Uptime/template
@@ -10,7 +10,7 @@ makedepends="perl"
 depends="$makedepends"
 checkdepends="procps-ng"
 short_desc="Determine current uptime, in seconds, and load averages"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Unix-Uptime"
 distfiles="${CPAN_SITE}/Unix/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-Variable-Magic/template b/srcpkgs/perl-Variable-Magic/template
index b3526b42a4d..15438827512 100644
--- a/srcpkgs/perl-Variable-Magic/template
+++ b/srcpkgs/perl-Variable-Magic/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Variable-Magic'
 pkgname=perl-Variable-Magic
 version=0.62
-revision=4
+revision=5
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/perl-WL/template b/srcpkgs/perl-WL/template
index c2916e8ac72..0f5fdbfe394 100644
--- a/srcpkgs/perl-WL/template
+++ b/srcpkgs/perl-WL/template
@@ -9,7 +9,7 @@ hostmakedepends="perl perl-Module-Build"
 makedepends="perl perl-XML-Smart perl-Socket-MsgHdr"
 depends="$makedepends"
 short_desc="Perl bindings for wayland protocol"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/WL"
 distfiles="${CPAN_SITE}/WL/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-WWW-Curl/patches/CURL_STRICTER.patch b/srcpkgs/perl-WWW-Curl/patches/CURL_STRICTER.patch
deleted file mode 100644
index 3220b248877..00000000000
--- a/srcpkgs/perl-WWW-Curl/patches/CURL_STRICTER.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 0be0223422e6e5f4091c6e4e058d213623eed105 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
-Date: Mon, 12 Sep 2016 14:40:44 +0200
-Subject: [PATCH] Skip preprocessor symbol only CURL_STRICTER
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-CURL_STRICTER leaked into curl-constants.c when building against
-curl-7.50.2. This is a preprocessor only macro without a value.
-
-CPAN RT#117793
-
-Signed-off-by: Petr Písař <ppisar@redhat.com>
----
- Makefile.PL | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- Makefile.PL
-+++ Makefile.PL
-@@ -127,7 +127,7 @@ if (!defined($curl_h)) {
-     close H;
- 
-     for my $e (sort @syms) {
--       if($e =~ /(OBSOLETE|^CURL_EXTERN|_LAST\z|_LASTENTRY\z)/) {
-+       if($e =~ /(OBSOLETE|^CURL_EXTERN|^CURL_STRICTER\z|_LAST\z|_LASTENTRY\z)/) {
-           next;
-        }
-        my ($group) = $e =~ m/^([^_]+_)/;
--- 
-2.7.4
-
diff --git a/srcpkgs/perl-WWW-Curl/patches/curl-7.50.2.patch b/srcpkgs/perl-WWW-Curl/patches/curl-7.50.2.patch
new file mode 100644
index 00000000000..3fb8c78e833
--- /dev/null
+++ b/srcpkgs/perl-WWW-Curl/patches/curl-7.50.2.patch
@@ -0,0 +1,24 @@
+--- Makefile.PL
++++ Makefile.PL
+@@ -127,7 +127,7 @@
+     close H;
+ 
+     for my $e (sort @syms) {
+-       if($e =~ /(OBSOLETE|^CURL_EXTERN|_LAST\z|_LASTENTRY\z)/) {
++       if($e =~ /(OBSOLETE|^CURL_EXTERN|^CURL_STRICTER\z|^CURL_DID_MEMORY_FUNC_TYPEDEFS\z|_LAST\z|_LASTENTRY\z|^CURLINC_CURL_H\z)/) {
+           next;
+        }
+        my ($group) = $e =~ m/^([^_]+_)/;
+--- Curl.xs
++++ Curl.xs
+@@ -18,6 +18,10 @@
+ #include <curl/easy.h>
+ #include <curl/multi.h>
+ 
++#ifdef CURLINC_MULTI_H
++#define __CURL_MULTI_H
++#endif
++
+ #define header_callback_func writeheader_callback_func
+ 
+ /* Do a favor for older perl versions */
diff --git a/srcpkgs/perl-WWW-Curl/template b/srcpkgs/perl-WWW-Curl/template
index 423bba481c6..d74a7f39216 100644
--- a/srcpkgs/perl-WWW-Curl/template
+++ b/srcpkgs/perl-WWW-Curl/template
@@ -1,7 +1,7 @@
 # Template build file for 'perl-WWW-Curl'.
 pkgname=perl-WWW-Curl
 version=4.17
-revision=9
+revision=10
 wrksrc="WWW-Curl-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/perl-WWW-Mechanize/template b/srcpkgs/perl-WWW-Mechanize/template
index 70d872e197d..9bc6d3eea8d 100644
--- a/srcpkgs/perl-WWW-Mechanize/template
+++ b/srcpkgs/perl-WWW-Mechanize/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-WWW-Mechanize'
 pkgname=perl-WWW-Mechanize
-version=1.91
+version=1.94
 revision=1
 archs=noarch
 wrksrc="${pkgname/perl-/}-${version}"
@@ -8,7 +8,7 @@ build_style=perl-module
 hostmakedepends="perl-CGI perl-HTML-Form perl-HTML-Tree
  perl-HTTP-Response-Encoding perl-HTTP-Server-Simple perl-Test-Warn"
 makedepends="perl-CGI perl-HTML-Form perl-HTML-Tree perl-HTTP-Response-Encoding
- perl-HTTP-Server-Simple perl-Test-Warn"
+ perl-HTTP-Server-Simple perl-Test-Warn perl-HTTP-Daemon"
 depends="$makedepends"
 checkdepends="perl-Test-Deep perl-Test-Exception perl-Test-Fatal
  perl-Test-NoWarnings perl-Test-Output perl-Test-Warnings"
@@ -17,7 +17,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/WWW-Mechanize"
 distfiles="${CPAN_SITE}/WWW/${pkgname/perl-/}-${version}.tar.gz"
-checksum=eb887afa401cf8c7f5294fe00bcf890e76712a2c916327ecabc029b843256131
+checksum=c850571551276aad468a5ea2b3857310107671d943fc1c0b7cae3adf552c1002
 
 pre_configure() {
 	unset configure_args
diff --git a/srcpkgs/perl-XML-LibXML/template b/srcpkgs/perl-XML-LibXML/template
index 00c0915ded8..8f93ae53732 100644
--- a/srcpkgs/perl-XML-LibXML/template
+++ b/srcpkgs/perl-XML-LibXML/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-XML-LibXML'
 pkgname=perl-XML-LibXML
 version=2.0134
-revision=2
+revision=3
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/perl-XML-Parser-Lite/template b/srcpkgs/perl-XML-Parser-Lite/template
index 768b0eee02d..3f2bea8e8f5 100644
--- a/srcpkgs/perl-XML-Parser-Lite/template
+++ b/srcpkgs/perl-XML-Parser-Lite/template
@@ -10,7 +10,7 @@ checkdepends="perl-Test-Requires"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Lightweight pure-perl XML Parser"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/XML-Parser-Lite"
 distfiles="${CPAN_SITE}/XML/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/perl-XML-Parser/template b/srcpkgs/perl-XML-Parser/template
index cdbf9d6a1ad..0929b5f0fcb 100644
--- a/srcpkgs/perl-XML-Parser/template
+++ b/srcpkgs/perl-XML-Parser/template
@@ -1,7 +1,7 @@
 # Template build file for 'perl-XML-Parser'.
 pkgname=perl-XML-Parser
-version=2.44
-revision=11
+version=2.46
+revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
@@ -12,4 +12,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/XML-Parser"
 distfiles="${CPAN_SITE}/XML/${pkgname/perl-/}-${version}.tar.gz"
-checksum=1ae9d07ee9c35326b3d9aad56eae71a6730a73a116b9fe9e8a4758b7cc033216
+checksum=d331332491c51cccfb4cb94ffc44f9cd73378e618498d4a37df9e043661c515d
+
+post_extract() {
+	vsed -e '/exit 0;/d' -i Makefile.PL   # broken cross check
+}
diff --git a/srcpkgs/perl-XML-Smart/template b/srcpkgs/perl-XML-Smart/template
index 6d645e813e5..622a2ecf1be 100644
--- a/srcpkgs/perl-XML-Smart/template
+++ b/srcpkgs/perl-XML-Smart/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
 makedepends="perl perl-Object-MultiType"
 depends="$makedepends"
 short_desc="Smart, easy and powerful way to access or create XML"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/XML-Smart"
 distfiles="https://search.cpan.org/CPAN/authors/id/T/TM/TMHARISH/XML-Smart-${version}.tar.gz"
diff --git a/srcpkgs/perl-YAML-LibYAML/template b/srcpkgs/perl-YAML-LibYAML/template
index 13457f4c5c4..5eac6a10652 100644
--- a/srcpkgs/perl-YAML-LibYAML/template
+++ b/srcpkgs/perl-YAML-LibYAML/template
@@ -1,15 +1,15 @@
 # Template file for 'perl-YAML-LibYAML'
 pkgname=perl-YAML-LibYAML
-version=0.77
-revision=1
+version=0.80
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Perl YAML Serialization using XS and libyaml"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/YAML-LibYAML"
 distfiles="${CPAN_SITE}/YAML/YAML-LibYAML-${version}.tar.gz"
-checksum=51efd448e401555e8b1dacb0438f56adc7a0f4c643be43a8fdcfe411d1518e13
+checksum=9d60d8d581b178372a20679a40bcfe2d9b018371a200daf32907df290a2716da
diff --git a/srcpkgs/perl-namespace-autoclean/template b/srcpkgs/perl-namespace-autoclean/template
index 6fe54d58cf0..a523c1aba25 100644
--- a/srcpkgs/perl-namespace-autoclean/template
+++ b/srcpkgs/perl-namespace-autoclean/template
@@ -1,17 +1,17 @@
-# Template build file for 'perl-namespace-autoclean'.
+# Template file for 'perl-namespace-autoclean'
 pkgname=perl-namespace-autoclean
-version=0.28
+version=0.29
 revision=1
 archs=noarch
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="${hostmakedepends} perl-Sub-Identify perl-namespace-clean perl-B-Hooks-EndOfScope"
-checkdepends="perl-Test-Requires"
 depends="${makedepends}"
+checkdepends="perl-Test-Needs"
 short_desc="Keep imports out of your namespace"
 maintainer="newbluemoon <blaumolch@mailbox.org>"
+license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/namespace-autoclean"
-license="Artistic, GPL-1"
 distfiles="${CPAN_SITE}/namespace/${pkgname/perl-/}-$version.tar.gz"
-checksum="cd410a1681add521a28805da2e138d44f0d542407b50999252a147e553c26c39"
+checksum=45ebd8e64a54a86f88d8e01ae55212967c8aa8fed57e814085def7608ac65804
diff --git a/srcpkgs/perl-pcsc/template b/srcpkgs/perl-pcsc/template
index c997b599966..5fa8d50a753 100644
--- a/srcpkgs/perl-pcsc/template
+++ b/srcpkgs/perl-pcsc/template
@@ -1,7 +1,7 @@
 # Template build file for 'perl-pcsc'.
 pkgname=perl-pcsc
 version=1.4.14
-revision=6
+revision=7
 _origname="pcsc-perl"
 wrksrc="${_origname}-${version}"
 build_style=perl-module
diff --git a/srcpkgs/perl-strictures/template b/srcpkgs/perl-strictures/template
index 7adaacf5714..f682d3b3732 100644
--- a/srcpkgs/perl-strictures/template
+++ b/srcpkgs/perl-strictures/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-strictures'
 pkgname=perl-strictures
-version=2.000005
+version=2.000006
 revision=1
 archs=noarch
 wrksrc="${pkgname/perl-/}-${version}"
@@ -9,8 +9,9 @@ hostmakedepends="perl"
 makedepends="perl"
 depends="$makedepends"
 short_desc="Turn on strict and make most warnings fatal"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/strictures"
-distfiles="https://cpan.org/authors/id/E/ET/ETHER/strictures-${version}.tar.gz"
-checksum=960bdb9f82c8f09caebc417bce3fdf75b27de81f4408d0ba0b0a6d61ab86dd99
+distfiles="https4.1://cpan.org/authors/id/E/ET/ETHER/strictures-${version}.tar.gz"
+distfiles="${CPAN_SITE}/lib/HAARG/${pkgname/perl-/}-${version}.tar.gz"
+checksum=09d57974a6d1b2380c802870fed471108f51170da81458e2751859f2714f8d57
diff --git a/srcpkgs/perl-tainting/template b/srcpkgs/perl-tainting/template
index 308b66b06e3..f24735ecfba 100644
--- a/srcpkgs/perl-tainting/template
+++ b/srcpkgs/perl-tainting/template
@@ -10,7 +10,7 @@ makedepends="perl perl-Taint-Runtime"
 depends="$makedepends"
 checkdepends="perl-Test-Exception"
 short_desc="Enable taint mode lexically"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/tainting"
 distfiles="${CPAN_SITE}/LWP/PERLANCAR/tainting-${version}.tar.gz"
diff --git a/srcpkgs/perl/patches/cleanup-paths.diff b/srcpkgs/perl/patches/cleanup-paths.diff
index 2f3197b20c7..5bdcd5ef854 100644
--- a/srcpkgs/perl/patches/cleanup-paths.diff
+++ b/srcpkgs/perl/patches/cleanup-paths.diff
@@ -1,19 +1,3 @@
-From bd709251a971ce7855857ba230123605cfa710e7 Mon Sep 17 00:00:00 2001
-From: Vladimir Smirnov <civil@gentoo.org>
-Date: Mon, 19 May 2014 19:54:51 +0400
-Subject: [PATCH] Cleanup PATH and shrpenv
-
-cut the crap of inventing paths, or adding search paths that we don't
-use
-
-Patch-Name: gentoo/cleanup-paths.diff
-Original-By: Torsten Veller <tove@gentoo.org>
----
- Configure | 79 ---------------------------------------------------------------
- 1 file changed, 79 deletions(-)
-
-diff --git a/Configure b/Configure
-index b221390..63b8848 100755
 --- Configure
 +++ Configure
 @@ -107,28 +107,6 @@
@@ -45,7 +29,7 @@ index b221390..63b8848 100755
  : shall we be using ksh?
  inksh=''
  needksh=''
-@@ -8720,57 +8698,6 @@
+@@ -8795,57 +8773,6 @@
  	;;
  esac
  
@@ -64,7 +48,7 @@ index b221390..63b8848 100755
 -	solaris)
 -		xxx="-R $shrpdir"
 -		;;
--	freebsd|mirbsd|netbsd|openbsd|interix|dragonfly|bitrig)
+-	freebsd|minix|mirbsd|netbsd|openbsd|interix|dragonfly|bitrig)
 -		xxx="-Wl,-R$shrpdir"
 -		;;
 -	bsdos|linux|irix*|dec_osf|gnu*|haiku)
diff --git a/srcpkgs/perl/template b/srcpkgs/perl/template
index c25761b26b4..07b8cd45114 100644
--- a/srcpkgs/perl/template
+++ b/srcpkgs/perl/template
@@ -1,87 +1,86 @@
 # Template file for 'perl'
 pkgname=perl
-version=5.28.2
+version=5.30.0
 revision=1
 _perl_cross_version=1.3
 build_style=gnu-configure
 hostmakedepends="less"
 makedepends="zlib-devel bzip2-devel gdbm-devel db-devel"
 depends="less"
+checkdepends="iana-etc perl-AnyEvent perl-Test-Pod procps-ng"
 short_desc="Practical Extraction and Report Language"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-perl, GPL-1.0-or-later"
 homepage="https://www.perl.org"
 distfiles="https://www.cpan.org/src/5.0/perl-${version}.tar.gz
  https://github.com/arsv/perl-cross/releases/download/${_perl_cross_version}/perl-cross-${_perl_cross_version}.tar.gz"
-checksum="aa95456dddb3eb1cc5475fed4e08f91876bea71fb636fba6399054dfbabed6c7
+checksum="851213c754d98ccff042caa40ba7a796b2cee88c5325f121be5cbb61bbf975f2
  49edea1ea2cd6c5c47386ca71beda8d150c748835781354dbe7f75b1df27e703"
 
 # Before updating this package to a new major version, run ${FILESDIR}/provides.pl
 # against ${wrksrc} to find the list of built in packages.
 
-provides="perl-Archive-Tar-2.30_1
+provides="perl-Archive-Tar-2.32_1
  perl-Attribute-Handlers-1.01_1
  perl-AutoLoader-5.74_1
- perl-B-Debug-1.26_1
- perl-CPAN-2.20_1
+ perl-CPAN-2.22_1
  perl-CPAN-Meta-2.150010_1
  perl-CPAN-Meta-Requirements-2.140_1
  perl-CPAN-Meta-YAML-0.018_1
  perl-Carp-1.50_1
- perl-Compress-Raw-Bzip2-2.074_1
- perl-Compress-Raw-Zlib-2.076_1
- perl-Config-Perl-V-0.29_1
- perl-DB_File-1.840_1
- perl-Data-Dumper-2.170_1
- perl-Devel-PPPort-3.40_1
+ perl-Compress-Raw-Bzip2-2.084_1
+ perl-Compress-Raw-Zlib-2.084_1
+ perl-Config-Perl-V-0.32_1
+ perl-DB_File-1.843_1
+ perl-Data-Dumper-2.174_1
+ perl-Devel-PPPort-3.52_1
  perl-Devel-SelfStubber-1.06_1
  perl-Digest-1.17_01_1
  perl-Digest-MD5-2.55_1
- perl-Digest-SHA-6.01_1
+ perl-Digest-SHA-6.02_1
  perl-Dumpvalue-1.18_1
- perl-Encode-2.97_1
+ perl-Encode-3.01_1
  perl-Env-1.04_1
  perl-Exporter-5.73_1
- perl-ExtUtils-CBuilder-0.280230_1
+ perl-ExtUtils-CBuilder-0.280231_1
  perl-ExtUtils-Constant-0.25_1
  perl-ExtUtils-Install-2.14_1
  perl-ExtUtils-MakeMaker-7.34_1
- perl-ExtUtils-Manifest-1.70_1
- perl-ExtUtils-ParseXS-3.39_1
+ perl-ExtUtils-Manifest-1.72_1
+ perl-ExtUtils-ParseXS-3.40_1
  perl-File-Fetch-0.56_1
- perl-File-Path-2.15_1
- perl-File-Temp-0.2304_1
+ perl-File-Path-2.16_1
+ perl-File-Temp-0.2309_1
  perl-Filter-Simple-0.95_1
- perl-Filter-Util-Call-1.58_1
+ perl-Filter-Util-Call-1.59_1
  perl-Getopt-Long-2.5_1
- perl-HTTP-Tiny-0.070_1
+ perl-HTTP-Tiny-0.076_1
  perl-I18N-Collate-1.02_1
  perl-I18N-LangTags-0.43_1
- perl-IO-1.39_1
- perl-IO-Compress-2.074_1
+ perl-IO-1.40_1
+ perl-IO-Compress-2.084_1
  perl-IO-Socket-IP-0.39_1
  perl-IO-Zlib-1.10_1
- perl-IPC-Cmd-1.00_1
+ perl-IPC-Cmd-1.02_1
  perl-IPC-SysV-2.07_1
- perl-JSON-PP-2.97001_1
- perl-Locale-Codes-3.56_1
+ perl-JSON-PP-4.02_1
  perl-Locale-Maketext-1.29_1
  perl-Locale-Maketext-Simple-0.21_01_1
  perl-MIME-Base64-3.15_1
- perl-Math-BigInt-1.999811_1
- perl-Math-BigInt-FastCalc-0.5006_1
- perl-Math-BigRat-0.2613_1
+ perl-Math-BigInt-1.999816_1
+ perl-Math-BigInt-FastCalc-0.5008_1
+ perl-Math-BigRat-0.2614_1
  perl-Math-Complex-1.5901_1
  perl-Memoize-1.03_01_1
- perl-Module-CoreList-5.20180622_1
- perl-Module-Load-0.32_1
+ perl-Module-CoreList-5.20190522_1
+ perl-Module-Load-0.34_1
  perl-Module-Load-Conditional-0.68_1
  perl-Module-Loaded-0.08_1
- perl-Module-Metadata-1.000033_1
+ perl-Module-Metadata-1.000036_1
  perl-NEXT-0.67_01_1
- perl-Net-Ping-2.62_1
+ perl-Net-Ping-2.71_1
  perl-Params-Check-0.38_1
- perl-PathTools-3.74_1
+ perl-PathTools-3.78_1
  perl-Perl-OSType-1.010_1
  perl-PerlIO-via-QuotedPrint-0.08_1
  perl-Pod-Checker-1.73_1
@@ -95,7 +94,7 @@ provides="perl-Archive-Tar-2.30_1
  perl-Search-Dict-1.07_1
  perl-SelfLoader-1.25_1
  perl-Socket-2.027_1
- perl-Storable-3.08_1
+ perl-Storable-3.15_1
  perl-Sys-Syslog-0.35_1
  perl-Term-ANSIColor-4.06_1
  perl-Term-Cap-1.17_1
@@ -103,19 +102,19 @@ provides="perl-Archive-Tar-2.30_1
  perl-Term-ReadLine-1.17_1
  perl-Test-1.31_1
  perl-Test-Harness-3.42_1
- perl-Test-Simple-1.302133_1
+ perl-Test-Simple-1.302162_1
  perl-Text-Abbrev-1.02_1
  perl-Text-Balanced-2.03_1
  perl-Text-ParseWords-3.30_1
  perl-Text-Tabs-2013.0523_1
- perl-Thread-Queue-3.12_1
+ perl-Thread-Queue-3.13_1
  perl-Thread-Semaphore-2.13_1
  perl-Tie-File-1.02_1
  perl-Tie-RefHash-1.39_1
- perl-Time-HiRes-1.9759_1
- perl-Time-Local-1.25_1
- perl-Time-Piece-1.3204_1
- perl-Unicode-Collate-1.25_1
+ perl-Time-HiRes-1.9760_1
+ perl-Time-Local-1.28_1
+ perl-Time-Piece-1.33_1
+ perl-Unicode-Collate-1.27_1
  perl-Unicode-Normalize-1.26_1
  perl-Win32-0.52_1
  perl-Win32API-File-0.1203_1
@@ -123,19 +122,19 @@ provides="perl-Archive-Tar-2.30_1
  perl-autodie-2.29_1
  perl-autouse-1.11_1
  perl-base-2.27_1
- perl-bignum-0.49_1
+ perl-bignum-0.51_1
  perl-constant-1.33_1
  perl-encoding-warnings-0.13_1
- perl-experimental-0.019_1
+ perl-experimental-0.020_1
  perl-if-0.0608_1
- perl-lib-0.64_1
+ perl-lib-0.65_1
  perl-libnet-3.11_1
- perl-parent-0.236_1
- perl-perlfaq-5.021011_1
+ perl-parent-0.237_1
+ perl-perlfaq-5.20190126_1
  perl-podlators-5.006_1
  perl-threads-2.22_1
- perl-threads-shared-1.58_1
- perl-version-0.9923_1"
+ perl-threads-shared-1.60_1
+ perl-version-0.9924_1"
 
 for f in ${provides}; do
 	replaces+=" $($XBPS_UHELPER_CMD getpkgname ${f})>=0"
@@ -194,6 +193,11 @@ do_configure() {
 	}
 }
 
+do_check() {
+	export LD="$CC"
+	TEST_JOBS=${XBPS_MAKEJOBS} make test
+}
+
 post_install() {
 	find ${DESTDIR}/usr/share -type f -exec chmod 644 {} \;
 	find ${DESTDIR}/usr/lib -type f -exec chmod 644 {} \;
diff --git a/srcpkgs/peru/template b/srcpkgs/peru/template
new file mode 100644
index 00000000000..682440f0b50
--- /dev/null
+++ b/srcpkgs/peru/template
@@ -0,0 +1,20 @@
+# Template file for 'peru'
+pkgname=peru
+version=1.2.0
+revision=1
+archs=noarch
+build_style=python3-module
+pycompile_module="peru"
+hostmakedepends="python3-setuptools"
+depends="curl git mercurial python3 python3-docopt python3-yaml"
+short_desc="Tool for fetching code"
+maintainer="Andy Weidenbaum <archbaum@gmail.com>"
+license="MIT"
+homepage="https://github.com/buildinspace/peru"
+distfiles="https://github.com/buildinspace/peru/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
+checksum=fb0fb02639e1c5403c9a6ddfd9719c5ea5ddf69fb440fbcfafe234470645e1dc
+
+post_install() {
+	vlicense LICENSE
+	vdoc README.md
+}
diff --git a/srcpkgs/pfetch/template b/srcpkgs/pfetch/template
new file mode 100644
index 00000000000..5a24586d0c7
--- /dev/null
+++ b/srcpkgs/pfetch/template
@@ -0,0 +1,16 @@
+# Template file for 'pfetch'
+pkgname=pfetch
+version=0.4.0
+revision=1
+archs="noarch"
+short_desc="System information tool written in POSIX sh"
+maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
+license="MIT"
+homepage="https://github.com/dylanaraps/pfetch"
+distfiles="https://github.com/dylanaraps/pfetch/archive/${version}.tar.gz"
+checksum=4cdac9e509fe94c0a27ab80454cddd830ff1a9c64216493658caa53670454fcd
+
+do_install() {
+	vbin pfetch
+	vlicense LICENSE.md
+}
diff --git a/srcpkgs/pgbackrest/template b/srcpkgs/pgbackrest/template
index 63b00cb019e..730621d804f 100644
--- a/srcpkgs/pgbackrest/template
+++ b/srcpkgs/pgbackrest/template
@@ -1,7 +1,7 @@
 # Template file for 'pgbackrest'
 pkgname=pgbackrest
 version=2.15.1
-revision=1
+revision=2
 wrksrc="${pkgname}-release-${version}"
 build_wrksrc="src"
 build_style=gnu-configure
diff --git a/srcpkgs/pgbouncer/template b/srcpkgs/pgbouncer/template
index 78526f7ed53..6d12693733f 100644
--- a/srcpkgs/pgbouncer/template
+++ b/srcpkgs/pgbouncer/template
@@ -1,6 +1,6 @@
 # Template file for 'pgbouncer'
 pkgname=pgbouncer
-version=1.10.0
+version=1.11.0
 revision=1
 build_style=gnu-configure
 makedepends="libevent-devel"
@@ -9,7 +9,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="ISC"
 homepage="https://pgbouncer.github.io/"
 distfiles="https://pgbouncer.github.io/downloads/files/${version}/pgbouncer-${version}.tar.gz"
-checksum=d8a01442fe14ce3bd712b9e2e12456694edbbb1baedb0d6ed1f915657dd71bd5
+checksum=84802fa48a2806c53675764ce10a8b6e4733f196eb23e1aa4b954dcbe7287e70
 
 post_install() {
 	vlicense COPYRIGHT
diff --git a/srcpkgs/pgweb/template b/srcpkgs/pgweb/template
index f7ec05010cc..224a6714461 100644
--- a/srcpkgs/pgweb/template
+++ b/srcpkgs/pgweb/template
@@ -1,6 +1,6 @@
 # Template file for 'pgweb'
 pkgname=pgweb
-version=0.11.3
+version=0.11.4
 revision=1
 build_style=go
 go_import_path="github.com/sosedoff/pgweb"
@@ -9,7 +9,7 @@ maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="MIT"
 homepage="http://sosedoff.github.io/pgweb"
 distfiles="https://github.com/sosedoff/pgweb/archive/v${version}.tar.gz"
-checksum=6d9606ce5c609e774781f588e5802108abb6355f706b6245e26906521799d9e2
+checksum=1dc101abc31bc349a38b746b98835572498049d06b8be9938c795f89bbeac936
 
 post_install() {
 	vdoc README.md
diff --git a/srcpkgs/phonon-qt5/template b/srcpkgs/phonon-qt5/template
index a5ac0c1842c..04a71cee352 100644
--- a/srcpkgs/phonon-qt5/template
+++ b/srcpkgs/phonon-qt5/template
@@ -1,18 +1,18 @@
 # Template file for 'phonon-qt5'
 pkgname=phonon-qt5
-version=4.10.2
+version=4.11.1
 revision=1
 wrksrc="${pkgname%-*}-${version}"
 build_style=cmake
 configure_args="-DPHONON_BUILD_PHONON4QT5=ON -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON"
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-devel"
-makedepends="glib-devel qt5-devel pulseaudio-devel"
+makedepends="glib-devel qt5-devel qt5-tools-devel pulseaudio-devel"
 short_desc="Multimedia framework for KDE"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://phonon.kde.org/"
 distfiles="${KDE_SITE}/${pkgname%-*}/${version}/${pkgname%-*}-${version}.tar.xz"
-checksum=34edb1985778575eb7004e4e45151cd7bc995f61ddd6ce3b050b97b7bd778809
+checksum=b4431ea2600df8137a717741ad9ebc7f7ec1649fa3e138541d8f42597144de2d
 
 phonon-qt5-devel_package() {
 	depends="qt5-devel ${sourcepkg}-${version}_${revision}"
@@ -22,5 +22,6 @@ phonon-qt5-devel_package() {
 		vmove usr/lib/cmake
 		vmove usr/lib/pkgconfig
 		vmove usr/share/phonon4qt5
+		vmove usr/lib/qt5/plugins/designer/phononwidgets.so
 	}
 }
diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index 47751218efb..feafa466a76 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,7 +1,7 @@
 # Template file for 'php'
 pkgname=php
-version=7.3.7
-revision=2
+version=7.3.10
+revision=1
 hostmakedepends="bison pkg-config"
 makedepends="apache-devel enchant-devel freetds-devel freetype-devel gdbm-devel
  gmp-devel libcurl-devel libjpeg-turbo-devel libmysqlclient-devel
@@ -12,7 +12,7 @@ maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="PHP-3.01"
 homepage="https://www.php.net"
 distfiles="http://www.php.net/distributions/php-${version}.tar.xz"
-checksum=ba067200ba649956b3a92ec8b71a6ed8ce8a099921212443c1bcf3260a29274c
+checksum=42f00a15419e05771734b7159c8d39d639b8a5a6770413adfa2615f6f923d906
 
 conf_files="/etc/php/php.ini"
 
diff --git a/srcpkgs/picard/template b/srcpkgs/picard/template
index fccccfc190d..1bae142434a 100644
--- a/srcpkgs/picard/template
+++ b/srcpkgs/picard/template
@@ -1,6 +1,6 @@
 # Template file for 'picard'
 pkgname=picard
-version=2.1.3
+version=2.2.2
 revision=1
 archs=noarch
 wrksrc="${pkgname}-release-${version}"
@@ -17,4 +17,4 @@ license="GPL-2.0-or-later"
 homepage="https://picard.musicbrainz.org/"
 changelog="https://picard.musicbrainz.org/changelog/"
 distfiles="http://ftp.musicbrainz.org/pub/musicbrainz/${pkgname}/${pkgname}-${version%.0}.tar.gz"
-checksum=8e044fe68c44d345c19f98952c3c7f20c72da74dbac9ce7c7b0621e2d69885a7
+checksum=00066def8e83eec5236977d2d3bc22cd72bba9c2bf1608c0fff1e3298e71e6e1
diff --git a/srcpkgs/pidgin-sipe/template b/srcpkgs/pidgin-sipe/template
index 50846cdc755..28676a038de 100644
--- a/srcpkgs/pidgin-sipe/template
+++ b/srcpkgs/pidgin-sipe/template
@@ -1,7 +1,7 @@
 # Template file for 'pidgin-sipe'
 pkgname=pidgin-sipe
-version=1.24.0
-revision=3
+version=1.25.0
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="pidgin-devel libressl-devel libxml2-devel dbus-glib-devel
@@ -12,4 +12,4 @@ maintainer="Renato Aguiar <renato@renag.me>"
 license="GPL-2.0-or-later"
 homepage="http://sipe.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/sipe/sipe/${pkgname}-${version}.tar.xz"
-checksum=958803722b23d869131f76bd90df9da19116d4ca5a873e5253371479b7390f43
+checksum=738b121b11f2b3f1744150c00cb381222eb6cf67161a7742797eb4f03e64a2ba
diff --git a/srcpkgs/pijul/patches/bindgen.patch b/srcpkgs/pijul/patches/bindgen.patch
index dd124b79c2f..c90bb9dba2b 100644
--- a/srcpkgs/pijul/patches/bindgen.patch
+++ b/srcpkgs/pijul/patches/bindgen.patch
@@ -1,10 +1,9 @@
-patch bindgen to use BINDGEN_EXTRA_CLANG_ARGS variable to set sysroot for cross builds
-https://github.com/jnbr/rust-bindgen/tree/0.43.2-clang_args
-
---- Cargo.toml.orig	2019-06-15 02:33:02.105715462 +0200
-+++ Cargo.toml	2019-06-15 02:36:33.905701785 +0200
-@@ -6,3 +6,4 @@
- "libpijul:0.12.0" = { path = "libpijul" }
- "line:0.1.15" = { path = "line" }
- "diffs:0.3.0" = { path = "diffs" }
-+"bindgen:0.43.2" = {git = 'https://github.com/jnbr/rust-bindgen', rev = "1467ac97c669c1ddda8117ccf1d398609b0e6fa9"}
+--- Cargo.toml.orig
++++ Cargo.toml
+@@ -133,3 +133,6 @@
+ version = "2.0"
+ [target."cfg(unix)".dependencies.tokio-uds]
+ version = "0.2"
++
++[replace]
++"bindgen:0.47.3" = {git = 'https://github.com/Duncaen/rust-bindgen', rev = "e70d9568887ffb6c2a7d7d165a71aed311a29129"}
diff --git a/srcpkgs/pijul/template b/srcpkgs/pijul/template
index b76bd1d3f4c..d46ca14e242 100644
--- a/srcpkgs/pijul/template
+++ b/srcpkgs/pijul/template
@@ -1,7 +1,7 @@
 # Template file for 'pijul'
 pkgname=pijul
-version=0.12.0
-revision=2
+version=0.12.2
+revision=1
 build_style=cargo
 hostmakedepends="pkg-config clang"
 makedepends="libsodium-devel libressl-devel nettle-devel"
@@ -9,8 +9,8 @@ short_desc="Distributed version control system based on patches"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://pijul.org/"
-distfiles="https://pijul.org/releases/pijul-${version}.tar.gz"
-checksum=987820fa2a6fe92a9f516f5e9b41ad59a597973e72cb0c7a44ca0f38e741a7e6
+distfiles="https://crates.io/api/v1/crates/pijul/${version}/download>pijul-${version}.tar.gz"
+checksum=f92a3f4063e780ca45c161ceb0f42baf34dfeddf3359ebf6c2e0442d9abb5889
 
 if [ "$CROSS_BUILD" ]; then
 	export HOST_CC="$BUILD_CC"
@@ -18,11 +18,6 @@ if [ "$CROSS_BUILD" ]; then
 	export BINDGEN_EXTRA_CLANG_ARGS="--sysroot=$XBPS_CROSS_BASE"
 fi
 
-pre_build() {
-	cargo update --package openssl-sys --precise 0.9.46
-	cargo update --package openssl --precise 0.10.22
-}
-
 # We only want to install the binary, so don't run cargo install
 do_install() {
 	vbin target/${RUST_TARGET}/release/pijul
diff --git a/srcpkgs/pim-data-exporter/template b/srcpkgs/pim-data-exporter/template
index 30f30811950..9694f5b2da9 100644
--- a/srcpkgs/pim-data-exporter/template
+++ b/srcpkgs/pim-data-exporter/template
@@ -1,7 +1,7 @@
 # Template file for 'pim-data-exporter'
 pkgname=pim-data-exporter
-version=19.08.0
-revision=1
+version=19.08.2
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools qt5-host-tools qt5-qmake
  kcoreaddons kconfig"
@@ -12,4 +12,4 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=f5ff68dcbad1df7ea132b409b70b9b4269badb26e28b4b7cd50239172507f7d8
+checksum=e4703d7a10935814738394a38c5ad54f9923c58e43c397e2e78a4b1b1176f4c2
diff --git a/srcpkgs/pimcommon/template b/srcpkgs/pimcommon/template
index 06b3bc9362e..e39987b8b2f 100644
--- a/srcpkgs/pimcommon/template
+++ b/srcpkgs/pimcommon/template
@@ -1,7 +1,7 @@
 # Template file for 'pimcommon'
 pkgname=pimcommon
-version=19.08.0
-revision=1
+version=19.08.2
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python libxslt
  kconfig kgendesignerplugin"
@@ -13,7 +13,7 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/applications/${version}/src/pimcommon-${version}.tar.xz"
-checksum=23be57010127831c3ad9b9475e467e8078ff92410c80609660498c5dc6fbaf9a
+checksum=ccdf2624a055a9db31b0b8109c791776d111ae91438f41ed50dcb9faca287e4c
 
 pimcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/pinentry-dmenu/template b/srcpkgs/pinentry-dmenu/template
index 78443a70ddc..8ca511bed34 100644
--- a/srcpkgs/pinentry-dmenu/template
+++ b/srcpkgs/pinentry-dmenu/template
@@ -7,7 +7,7 @@ makedepends="libXft-devel freetype-devel libconfig-devel
  libXinerama-devel libgpg-error-devel libassuan-devel
  gpgme-devel"
 short_desc="Pinentry program based on dmenu"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/ritze/pinentry-dmenu"
 distfiles="https://github.com/ritze/pinentry-dmenu/archive/${version}.tar.gz"
diff --git a/srcpkgs/pioneer/template b/srcpkgs/pioneer/template
index 571dfc3833e..3fa2cecd63e 100644
--- a/srcpkgs/pioneer/template
+++ b/srcpkgs/pioneer/template
@@ -1,7 +1,8 @@
 # Template file for 'pioneer'
 pkgname=pioneer
+reverts="20191009_1"
 version=20190203
-revision=1
+revision=3
 build_style=cmake
 configure_args="-DPIONEER_DATA_DIR=/usr/share/pioneer
  -DUSE_SYSTEM_LIBLUA=ON -DUSE_SYSTEM_LIBGLEW=ON"
@@ -15,6 +16,7 @@ license="GPL-3.0-or-later"
 homepage="https://pioneerspacesim.net"
 distfiles="https://github.com/pioneerspacesim/pioneer/archive/${version}.tar.gz"
 checksum=e526f1659ae321f45b997c0245acecbf9c4cf2122b025ab8db1090f1b9804f5e
+disable_parallel_build=yes
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" pioneer-modelcompiler"
diff --git a/srcpkgs/pioneer/update b/srcpkgs/pioneer/update
new file mode 100644
index 00000000000..829d61ff9f3
--- /dev/null
+++ b/srcpkgs/pioneer/update
@@ -0,0 +1 @@
+ignore="20191009"
diff --git a/srcpkgs/piper/template b/srcpkgs/piper/template
index 2ce36796f9e..af8cc854991 100644
--- a/srcpkgs/piper/template
+++ b/srcpkgs/piper/template
@@ -8,7 +8,7 @@ hostmakedepends="libratbag pkg-config glib-devel"
 makedepends="python3-devel python3-gobject-devel"
 depends="python3 python3-gobject libratbag python3-lxml"
 short_desc="GTK application to configure gaming mice"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/libratbag/piper"
 distfiles="https://github.com/libratbag/piper/archive/${version}.tar.gz"
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index 1fa113b8935..44e86ae8d26 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,19 +1,20 @@
 # Template file for 'pipewire'
 pkgname=pipewire
 version=0.2.6
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dman=true -Dgstreamer=enabled -Ddocs=true -Dsystemd=false"
 hostmakedepends="doxygen graphviz pkg-config xmltoman"
 makedepends="SDL2-devel ffmpeg-devel gst-plugins-base1-devel jack-devel
  sbc-devel v4l-utils-devel libva-devel"
 short_desc="Server and user space API to deal with multimedia pipelines"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://pipewire.org/"
 changelog="https://raw.githubusercontent.com/PipeWire/pipewire/master/NEWS"
 distfiles="https://github.com/PipeWire/pipewire/archive/${version}.tar.gz"
 checksum=8592bcc2a83b078fee6cfb8560397cf2747346f28e88689197e780069b19cb17
+conf_files="/etc/pipewire/pipewire.conf"
 
 libpipewire_package() {
 	short_desc+=" - pipewire library"
diff --git a/srcpkgs/pithos/template b/srcpkgs/pithos/template
index 6be69afe50b..470967f188b 100644
--- a/srcpkgs/pithos/template
+++ b/srcpkgs/pithos/template
@@ -1,14 +1,14 @@
 # Template file for 'pithos'
 pkgname=pithos
-version=1.4.1
+version=1.5.0
 revision=1
 build_style=meson
 pycompile_module="pithos"
-makedepends="intltool pkg-config python3 glib-devel"
+hostmakedepends="pkg-config intltool python3 glib-devel"
 depends="gtk+3 python3-gobject libsecret gst-plugins-good1 gst-libav gnome-keyring"
 short_desc="Native Pandora Radio client"
 maintainer="osn64 <dave@techthrones.com>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="https://pithos.github.io/"
 distfiles="https://github.com/pithos/pithos/releases/download/${version}/pithos-${version}.tar.xz"
-checksum=ebc30213ae85716d5a57e30b912f083b2fdb374a793d5adfec00a064fdfc165c
+checksum=61e2a778252358519979ea53ab9fb9dd10a9554d24f3e249560bc4971f386133
diff --git a/srcpkgs/pixman/template b/srcpkgs/pixman/template
index 704749f6bc0..eb4a6da3b03 100644
--- a/srcpkgs/pixman/template
+++ b/srcpkgs/pixman/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="--disable-gtk" # do not require gtk+!
 hostmakedepends="pkg-config perl"
 short_desc="Library of low-level pixel manipulation routines"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://wiki.freedesktop.org/xorg/"
 distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
diff --git a/srcpkgs/pkgtop/template b/srcpkgs/pkgtop/template
new file mode 100644
index 00000000000..31a769917d6
--- /dev/null
+++ b/srcpkgs/pkgtop/template
@@ -0,0 +1,18 @@
+# Template file for 'pkgtop'
+pkgname=pkgtop
+version=2.0
+revision=1
+build_style=go
+go_import_path="github.com/orhun/pkgtop"
+go_package="${go_import_path}/src"
+hostmakedepends="git"
+short_desc="Interactive package manager and resource monitor"
+maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/orhun/pkgtop"
+distfiles="https://github.com/orhun/pkgtop/archive/${version}.tar.gz"
+checksum=0356155cea97e9a325a4c1fe99a1f6989bc2d7bf6ab1a9d34763bb832123f880
+
+post_install() {
+	mv ${DESTDIR}/usr/bin/{src,pkgtop}
+}
diff --git a/srcpkgs/plantuml/template b/srcpkgs/plantuml/template
index 85bf75bb642..fc7bf73d9c0 100644
--- a/srcpkgs/plantuml/template
+++ b/srcpkgs/plantuml/template
@@ -1,7 +1,7 @@
 # Template file for 'plantuml'
 pkgname=plantuml
 reverts="8047_1 8053_1 8059_1"
-version=1.2019.7
+version=1.2019.11
 revision=1
 archs=noarch
 create_wrksrc=yes
@@ -12,7 +12,7 @@ maintainer="Julien Dehos <dehos@lisic.univ-littoral.fr>"
 license="GPL-2.0-or-later"
 homepage="http://plantuml.com/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-jar-gplv2-${version}.zip"
-checksum=6474df87daec7fd5228cdcc3b98fe4acf978fb308221f2f320fff2a6b04c0e45
+checksum=62d99aec44065b2f526e1628712f846661a0bcaeee8277e7c123f0cdf1056afe
 
 do_build() {
 	mv ${pkgname}.jar ${pkgname}-${version}.jar
@@ -25,4 +25,3 @@ do_install() {
 	vbin plantuml
 	vinstall ${pkgname}-${version}.jar 644 usr/share/java ${pkgname}-${version}.jar
 }
-
diff --git a/srcpkgs/plasma-browser-integration/template b/srcpkgs/plasma-browser-integration/template
index 7c9b37b01f2..da6776693b7 100644
--- a/srcpkgs/plasma-browser-integration/template
+++ b/srcpkgs/plasma-browser-integration/template
@@ -1,18 +1,19 @@
 # Template file for 'plasma-browser-integration'
 pkgname=plasma-browser-integration
-version=5.16.4
+version=5.17.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules pkg-config kcoreaddons qt5-host-tools
  qt5-qmake"
-makedepends="qt5-devel kio-devel ki18n-devel krunner-devel kactivities5-devel"
+makedepends="qt5-devel kio-devel ki18n-devel krunner-devel kactivities5-devel
+ purpose-devel kfilemetadata5-devel"
 short_desc="Integration of web browsers with the KDE Plasma 5 desktop"
 maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://projects.kde.org/projects/plasma/plasma-browser-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=a097b90dd47cdd01f6b7207cb9439c7f6e0ce68555272172f8b3b8e2086199ef
+checksum=2b91669492f30fa7fcc082e31499f99e93a21365e27ebae3a14ead7ddeaa28d4
 
 if [ "${CROSS_BUILD}" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/plasma-desktop/template b/srcpkgs/plasma-desktop/template
index 4b8c99f325a..e35366b6164 100644
--- a/srcpkgs/plasma-desktop/template
+++ b/srcpkgs/plasma-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-desktop'
 pkgname=plasma-desktop
-version=5.16.4
+version=5.17.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -15,7 +15,7 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2"
 homepage="https://projects.kde.org/projects/plasma/plasma-desktop"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=990e93eed2753053ac732ce5d1d45e7c9a52daa660b41b0d48955428e4834344
+checksum=f4a913a60fee4597a7a6c98a263f9a7a40f7663f3903b4042a7f90a686dc8aa0
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kconfig-devel kcoreaddons-devel kded
diff --git a/srcpkgs/plasma-framework/template b/srcpkgs/plasma-framework/template
index 1180757056f..266e6e0f9a7 100644
--- a/srcpkgs/plasma-framework/template
+++ b/srcpkgs/plasma-framework/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-framework'
 pkgname=plasma-framework
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/frameworks/plasma-framework"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=873d604aadbe21ba38cdb12b778d3baf121a54e6155596f0ebee1840138060fe
+checksum=914194ca699d4772dc3f3767ef1a536d87e8d31d325ad052e9745270388e1f5c
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/plasma-integration/template b/srcpkgs/plasma-integration/template
index 9b23a2645b6..761875619e3 100644
--- a/srcpkgs/plasma-integration/template
+++ b/srcpkgs/plasma-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-integration'
 pkgname=plasma-integration
-version=5.16.4
+version=5.17.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/plasma/plasma-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d4c5022ea91f9727cfebab821cb6b8e7b52671a6508cd7450e05bf51e248452d
+checksum=d6011bd9a94e6c8e96f9b0fbbf7f17d8170be93a24edb1e7b0ff6ac6e28429ff
diff --git a/srcpkgs/plasma-nm/template b/srcpkgs/plasma-nm/template
index 32c717c0b88..6d7222aee84 100644
--- a/srcpkgs/plasma-nm/template
+++ b/srcpkgs/plasma-nm/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-nm'
 pkgname=plasma-nm
-version=5.16.4
+version=5.17.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -15,7 +15,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/plasma/plasma-nm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=2da834873d4fa471ad87ee8ce18a871dfb2acdf0bdc0b764789e8e26ebc2ca09
+checksum=322516acabb5a49c613f951c5049f6a15edf2b54340f08bca3c86a5b1bd6e56b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/plasma-pa/template b/srcpkgs/plasma-pa/template
index 51658bf8538..642fe5b9f40 100644
--- a/srcpkgs/plasma-pa/template
+++ b/srcpkgs/plasma-pa/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-pa'
 pkgname=plasma-pa
-version=5.16.4
+version=5.17.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/plasma/plasma-pa"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=9b166e11f7115576181c17f0ced51b9a7ec689334d4b15ebb55d4e6e7ff6cbd4
+checksum=da660d75ea0a4589ee3730a2697665c791e6525f35813cbf90c48408607b1ee6
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"
diff --git a/srcpkgs/plasma-sdk/template b/srcpkgs/plasma-sdk/template
index 411ec865944..083c6fa9015 100644
--- a/srcpkgs/plasma-sdk/template
+++ b/srcpkgs/plasma-sdk/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-sdk'
 pkgname=plasma-sdk
-version=5.16.4
+version=5.17.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/plasma/plasma-sdk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=ce8152ad6044e2cf430834bf97bb4542e69e168a4b7350e313d148a9bd3b9403
+checksum=a8ff60bf62f0cab10ccc7a04e79a08e2124d78ec3d92a35a0bc78e469d8c199f
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/plasma-thunderbolt/template b/srcpkgs/plasma-thunderbolt/template
new file mode 100644
index 00000000000..58e299f6c08
--- /dev/null
+++ b/srcpkgs/plasma-thunderbolt/template
@@ -0,0 +1,19 @@
+# Template file for 'plasma-thunderbolt'
+pkgname=plasma-thunderbolt
+version=5.17.0
+revision=1
+build_style=cmake
+hostmakedepends="extra-cmake-modules kcoreaddons kcmutils
+ qt5-host-tools qt5-qmake"
+makedepends="kcmutils-devel"
+depends="bolt"
+short_desc="Plasma integration for controlling Thunderbolt devices"
+maintainer="John <johnz@posteo.net>"
+license="GPL-3.0-or-later"
+homepage="https://cgit.kde.org/plasma-thunderbolt.git"
+distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
+checksum=8e244a2f6e872451166deaf454a057110761acec054655986d55576af38a23e1
+
+do_check() {
+	: # Requires running dbus and bolt services
+}
diff --git a/srcpkgs/plasma-vault/template b/srcpkgs/plasma-vault/template
index 8cd4f83f963..af8c12cf4a6 100644
--- a/srcpkgs/plasma-vault/template
+++ b/srcpkgs/plasma-vault/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-vault'
 pkgname=plasma-vault
-version=5.16.4
+version=5.17.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools"
@@ -10,7 +10,7 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/KDE/plasma-vault"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=8d01b80079477fd7ea48a4cc3ff59728ae7dac3a5f6e552092dd5e67d72148f6
+checksum=d63cba4e3a89a10571f120d75405a837964c0176351ce78bed04f58b37f58fd6
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/plasma-workspace-wallpapers/template b/srcpkgs/plasma-workspace-wallpapers/template
index e5a21b8b387..1303e0e3e69 100644
--- a/srcpkgs/plasma-workspace-wallpapers/template
+++ b/srcpkgs/plasma-workspace-wallpapers/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-workspace-wallpapers'
 pkgname=plasma-workspace-wallpapers
-version=5.16.4
+version=5.17.0
 revision=1
 archs=noarch
 build_style=cmake
@@ -11,4 +11,4 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/plasma/plasma-workspace-wallpapers"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=052f6d978b1230706821f67574a7d053fadfb25de65227ffc8389a8570ac6003
+checksum=67d3e69d9ad6292cf6b70ab7f35fe0a88d2a626efd0a1c4fa70b5c0049d1c973
diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template
index bfcff35909a..2ea88567655 100644
--- a/srcpkgs/plasma-workspace/template
+++ b/srcpkgs/plasma-workspace/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-workspace'
 pkgname=plasma-workspace
-version=5.16.4
+version=5.17.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -9,14 +9,15 @@ makedepends="qt5-devel qt5-declarative-devel qt5-script-devel plasma-framework-d
  krunner-devel kjsembed-devel knotifyconfig-devel kdesu-devel knewstuff-devel
  kcmutils-devel kidletime-devel kdelibs4support-devel libksysguard-devel
  baloo5-devel ktexteditor-devel kwin-devel libxcb-devel libXtst-devel
- libqalculate-devel prison-devel kholidays-devel ksolid-devel"
+ libqalculate-devel prison-devel kholidays-devel ksolid-devel kpeople-devel
+ libkscreen-devel kactivities5-stats-devel"
 depends="kactivitymanagerd kwin iso-codes milou plasma-integration libxcb-devel"
 short_desc="KDE Window manager"
 maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later,GFDL-2.1, LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/plasma/plasma-workspace"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=5cd9366ef3d0b68159d9dee2f14886d1f81d1ccf7aedceed1ae5cf8e32d243f1
+checksum=4480ccf0b9168bdd10d4a5fa3ee40e5e77f10c12713f9de55c5d19e23fe993f0
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/plata-theme/INSTALL.msg b/srcpkgs/plata-theme/INSTALL.msg
new file mode 100644
index 00000000000..5bffe2a5766
--- /dev/null
+++ b/srcpkgs/plata-theme/INSTALL.msg
@@ -0,0 +1,3 @@
+Plata-theme upstream recommends the Roboto font.
+You can obtain it by installing fonts-roboto-ttf or 
+google-fonts-ttf.
diff --git a/srcpkgs/plata-theme/template b/srcpkgs/plata-theme/template
index 6a97664d55f..18daea2b078 100644
--- a/srcpkgs/plata-theme/template
+++ b/srcpkgs/plata-theme/template
@@ -1,6 +1,6 @@
 # Template file for 'plata-theme'
 pkgname=plata-theme
-version=0.8.0
+version=0.9.0
 revision=1
 archs=noarch
 build_style=gnu-configure
@@ -8,14 +8,13 @@ configure_args="--enable-parallel --enable-telegram"
 hostmakedepends="automake libtool pkg-config glib-devel libxml2 sassc inkscape
  parallel procps-ng zip"
 makedepends="libglib-devel gdk-pixbuf-devel gtk+-devel gtk+3-devel
- gtk2-engines gtk-engine-murrine"
-depends="fonts-roboto-ttf"
+ gtk2-engines gtk-engine-murrine libmarco-devel"
 short_desc="Gtk theme based on Material Design Refresh"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="mobinmob <mobinmob@disroot.org>"
 license="CC-BY-SA-4.0, GPL-2.0-or-later"
 homepage="https://gitlab.com/tista500/plata-theme"
 distfiles="https://gitlab.com/tista500/plata-theme/-/archive/${version}/plata-theme-${version}.tar.gz"
-checksum=1ee6e49716fdf4ddafae61e5fafb4f9b2c66ee02abab200f9872556c037157f8
+checksum=1e690fc208b71592b969e86d7bbbae78475a35bb8570cde391db44cde0450852
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/pluma/template b/srcpkgs/pluma/template
index e4faa8a8390..f59858cf248 100644
--- a/srcpkgs/pluma/template
+++ b/srcpkgs/pluma/template
@@ -1,6 +1,6 @@
 # Template file for 'pluma'
 pkgname=pluma
-version=1.22.1
+version=1.23.2
 revision=1
 build_style=gnu-configure
 pycompile_dirs="usr/lib/pluma/plugins"
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://mate-desktop.org"
 distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=af8d19927f1571d6b63462b8e51fed9ac851326b6ff800535ea785f15c61a591
+checksum=824bd32ca335d3bb16ad076fffdecd4414add80e445df523ed01b2dfd0c4e009
 nocross="gobject-introspection from libpeas"
 
 pre_configure() {
diff --git a/srcpkgs/pmbootstrap/template b/srcpkgs/pmbootstrap/template
index fef73e1e790..1bfa8183a84 100644
--- a/srcpkgs/pmbootstrap/template
+++ b/srcpkgs/pmbootstrap/template
@@ -1,19 +1,19 @@
 # Template file for 'pmbootstrap'
 pkgname=pmbootstrap
-version=1.7.0
+version=1.9.0
 revision=1
 archs=noarch
 build_style=python3-module
 pycompile_module="pmb"
 hostmakedepends="python3-setuptools"
-depends="python3 coreutils procps-ng libressl"
+depends="python3-setuptools coreutils procps-ng libressl"
 checkdepends="python3-pytest"
 short_desc="PostmarketOS's chroot, build and flash tool"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="bra1nwave <brainwave@openmailbox.org>"
 license="GPL-3.0-or-later"
 homepage="https://postmarketos.org"
 distfiles="https://gitlab.com/postmarketOS/pmbootstrap/-/archive/${version}/pmbootstrap-${version}.tar.gz"
-checksum=8779a3302fb0841977b08557670f079893ad674035177e8da7d7f63a9d8b300a
+checksum=f5b6034e02e6d29b0a8cbcee80fe6beeabd33beaed1a589befcd31892768a3cf
 
 do_check() {
 	python3 -m pytest
diff --git a/srcpkgs/png++/patches/musl-error.patch b/srcpkgs/png++/patches/musl-error.patch
deleted file mode 100644
index f1123d938ee..00000000000
--- a/srcpkgs/png++/patches/musl-error.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- error.hpp	2015-10-25 20:42:45.000000000 +0100
-+++ -	2018-11-07 12:49:36.093450988 +0100
-@@ -100,7 +100,7 @@
-             strerror_s(buf, ERRBUF_SIZE, errnum);
-             return std::string(buf);
- #else
--#if (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !_GNU_SOURCE
-+#if ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !_GNU_SOURCE) || !defined(__GLIBC__)
-             strerror_r(errnum, buf, ERRBUF_SIZE);
-             return std::string(buf);
- #else
diff --git a/srcpkgs/png++/template b/srcpkgs/png++/template
index 99de7397893..b156d606308 100644
--- a/srcpkgs/png++/template
+++ b/srcpkgs/png++/template
@@ -1,6 +1,6 @@
 # Template file for 'png++'
 pkgname=png++
-version=0.2.9
+version=0.2.10
 revision=1
 build_style=gnu-makefile
 make_build_target="docs"
@@ -12,7 +12,7 @@ maintainer="Alex Childs <misuchiru03+void@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.nongnu.org/pngpp"
 distfiles="${NONGNU_SITE}/pngpp/${pkgname}-${version}.tar.gz"
-checksum=abbc6a0565122b6c402d61743451830b4faee6ece454601c5711e1c1b4238791
+checksum=998af216ab16ebb88543fbaa2dbb9175855e944775b66f2996fc945c8444eee1
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/poco/template b/srcpkgs/poco/template
index e902b2a6223..5e9920b2748 100644
--- a/srcpkgs/poco/template
+++ b/srcpkgs/poco/template
@@ -1,7 +1,7 @@
 # Template file for 'poco'
 pkgname=poco
-version=1.9.0
-revision=3
+version=1.9.4
+revision=1
 wrksrc="${pkgname}-${version}-all"
 build_style=cmake
 configure_args="-DPOCO_UNBUNDLED=ON"
@@ -11,7 +11,7 @@ maintainer="Julien Dehos <dehos@univ-littoral.fr>"
 license="BSL-1.0"
 homepage="https://pocoproject.org"
 distfiles="https://pocoproject.org/releases/${pkgname}-${version}/${pkgname}-${version}-all.tar.gz"
-checksum=0387bf0f9d313e2311742e1ad0b64e07f2f3e76039eed20e3b9aa9951b88e187
+checksum=eb34f257b11240a711ee505f1d80c754a80a990aeb48d8d93407884df288fd77
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template
index 99bb01d86a6..8423a153b45 100644
--- a/srcpkgs/podman/template
+++ b/srcpkgs/podman/template
@@ -1,6 +1,6 @@
 # Template file for 'podman'
 pkgname=podman
-version=1.5.0
+version=1.5.1
 revision=1
 wrksrc="libpod-${version}"
 build_style=go
@@ -16,7 +16,7 @@ maintainer="Cameron Nemo <camerontnorman@gmail.com>"
 license="Apache-2.0"
 homepage="https://podman.io/"
 distfiles="https://github.com/containers/libpod/archive/v${version}.tar.gz"
-checksum=12f479044c5bfe23f695914c8f61d6f21247ffb877fc855c3737da289b8ec68b
+checksum=5651102e8d8f15b3dfddc80702dc93149b94de330502d6de6fafa7afddbbf709
 
 if [ "$CROSS_BUILD" ]; then
 	go_build_tags+=" containers_image_openpgp exclude_graphdriver_overlay"
diff --git a/srcpkgs/poedit/patches/LearnMoreLink.patch b/srcpkgs/poedit/patches/LearnMoreLink.patch
deleted file mode 100644
index e558c78ec6e..00000000000
--- a/srcpkgs/poedit/patches/LearnMoreLink.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 3d3d0091f0ab1433f272de9c1aa6b17b745cade7 Mon Sep 17 00:00:00 2001
-From: Thomas Klausner <tk@giga.or.at>
-Date: Tue, 21 May 2019 19:37:43 +0200
-Subject: [PATCH] Add header for LearnMoreLink.
-
----
- src/welcomescreen.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/welcomescreen.cpp b/src/welcomescreen.cpp
-index 65eb7d0d92..a24b4d7d23 100644
---- src/welcomescreen.cpp
-+++ b/src/welcomescreen.cpp
-@@ -26,6 +26,7 @@
- #include "welcomescreen.h"
- 
- #include "colorscheme.h"
-+#include "customcontrols.h"
- #include "crowdin_gui.h"
- #include "edapp.h"
- #include "edframe.h"
diff --git a/srcpkgs/poedit/template b/srcpkgs/poedit/template
index 87beeb9dbb0..c3a83887e89 100644
--- a/srcpkgs/poedit/template
+++ b/srcpkgs/poedit/template
@@ -1,7 +1,7 @@
 # Template file for 'poedit'
 pkgname=poedit
-version=2.2.3
-revision=2
+version=2.2.4
+revision=1
 build_style=gnu-configure
 configure_args="--with-wx-config=wx-config-gtk3"
 hostmakedepends="pkg-config"
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://www.poedit.net/"
 distfiles="https://github.com/vslavik/poedit/releases/download/v${version}-oss/poedit-${version}.tar.gz"
-checksum=47d52895b836a8505742a4f9bf94da5936b244877fac2ff9ab0bb94464548688
+checksum=c18ee55fbc03d0a25d8260298a9cc489774140e79fe33ad80fcbc34a97df744a
 
 CPPFLAGS="-DUCHAR_TYPE=uint16_t"
 
diff --git a/srcpkgs/poezio/template b/srcpkgs/poezio/template
index 0e46c871203..56f8138bb5e 100644
--- a/srcpkgs/poezio/template
+++ b/srcpkgs/poezio/template
@@ -1,7 +1,7 @@
 # Template file for 'poezio'
 pkgname=poezio
-version=0.12
-revision=2
+version=0.12.1
+revision=1
 build_style=python3-module
 pycompile_module="poezio poezio_plugins poezio_themes"
 hostmakedepends="python3-setuptools pkg-config"
@@ -12,7 +12,7 @@ maintainer="Franklin Delehelle <franklin.delehelle@odena.eu>"
 license="Zlib"
 homepage="https://poez.io/"
 distfiles="${PYPI_SITE}/p/poezio/poezio-${version}.tar.gz"
-checksum=4d4aacfda98454719e017e56e7012d283de12b8f7400b51c1fe0d1dc841f231e
+checksum=d59dedf80d074074dd4f6798559a257853fa6ab064d992d7a203f11c8b2a9bd7
 
 pre_configure() {
 	sed -i "s|os.environ.get('CC', 'cc')|'${CC}'|" setup.py
diff --git a/srcpkgs/poezio/update b/srcpkgs/poezio/update
new file mode 100644
index 00000000000..b53afef2735
--- /dev/null
+++ b/srcpkgs/poezio/update
@@ -0,0 +1 @@
+pattern='poezio-\K[\d.]+(?=\.tar)'
diff --git a/srcpkgs/polkit-kde-agent/template b/srcpkgs/polkit-kde-agent/template
index e10715cd5af..cb759f6b550 100644
--- a/srcpkgs/polkit-kde-agent/template
+++ b/srcpkgs/polkit-kde-agent/template
@@ -1,6 +1,6 @@
 # Template file for 'polkit-kde-agent'
 pkgname=polkit-kde-agent
-version=5.16.4
+version=5.17.0
 revision=1
 wrksrc="${pkgname}-1-${version}"
 build_style=cmake
@@ -13,4 +13,4 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/plasma/polkit-kde-agent"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-1-${version}.tar.xz"
-checksum=917b31f194fcf5d56d465bd4a3a1cc8d0a30e302be63b9048b1b85b6746b46a0
+checksum=9bbe7faa06a25768ba5dcdb3a084afeb8d9d3e284388d0c6138bd4cd51a418f0
diff --git a/srcpkgs/polygen/template b/srcpkgs/polygen/template
index 7c5df93839c..0781c4b78ec 100644
--- a/srcpkgs/polygen/template
+++ b/srcpkgs/polygen/template
@@ -1,7 +1,7 @@
 # Template file for 'polygen'
 pkgname=polygen
 version=1.0.6.ds2
-revision=4
+revision=5
 build_style=gnu-makefile
 build_wrksrc="src"
 hostmakedepends="ocaml unzip"
diff --git a/srcpkgs/ponyc/template b/srcpkgs/ponyc/template
index 734e131b4bf..c2bdcf8864b 100644
--- a/srcpkgs/ponyc/template
+++ b/srcpkgs/ponyc/template
@@ -1,6 +1,6 @@
 # Template file for 'ponyc'
 pkgname=ponyc
-version=0.29.0
+version=0.32.0
 revision=1
 archs="x86_64"
 build_style=gnu-makefile
@@ -12,7 +12,7 @@ maintainer="Brian Mitchell <brian@strmpnk.co>"
 license="BSD-2-Clause"
 homepage="https://ponylang.org/"
 distfiles="https://github.com/ponylang/ponyc/archive/${version}.tar.gz"
-checksum=9e20afeaf46343633fc93f995a15a62acd01b42943050c7c282381e4a0144241
+checksum=e8e070164ca0e4e41e606bde617ccab9cc64aa3dca8c79293635a6fdbcabf454
 
 do_build() {
 	vsed -e 's/-Werror //' -i Makefile
diff --git a/srcpkgs/poppler-qt5/template b/srcpkgs/poppler-qt5/template
index b16294fed2e..40bf9240e0a 100644
--- a/srcpkgs/poppler-qt5/template
+++ b/srcpkgs/poppler-qt5/template
@@ -4,7 +4,7 @@
 # A CYCLIC DEPENDENCY: qt5 -> cups -> poppler -> qt5.
 #
 pkgname=poppler-qt5
-version=0.79.0
+version=0.80.0
 revision=1
 wrksrc="poppler-${version}"
 build_style=cmake
@@ -18,7 +18,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
 homepage="http://poppler.freedesktop.org"
 distfiles="${homepage}/poppler-${version}.tar.xz"
-checksum=f985a4608fe592d2546d9d37d4182e502ff6b4c42f8db4be0a021a1c369528c8
+checksum=4d3ca6b79bc13b8e24092e34f83ef5f387f3bb0bbd7359a6c078e09c696d104f
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DTHREADS_PTHREAD_ARG=2"
diff --git a/srcpkgs/poppler/template b/srcpkgs/poppler/template
index a2efd828c21..3670cc19bc9 100644
--- a/srcpkgs/poppler/template
+++ b/srcpkgs/poppler/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/poppler-qt5".
 #
 pkgname=poppler
-version=0.79.0
+version=0.80.0
 revision=1
 build_style=cmake
 build_helper="gir"
@@ -18,7 +18,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
 homepage="http://poppler.freedesktop.org"
 distfiles="${homepage}/${pkgname}-${version}.tar.xz"
-checksum=f985a4608fe592d2546d9d37d4182e502ff6b4c42f8db4be0a021a1c369528c8
+checksum=4d3ca6b79bc13b8e24092e34f83ef5f387f3bb0bbd7359a6c078e09c696d104f
 
 # Package build options
 build_options="gir"
diff --git a/srcpkgs/portage/template b/srcpkgs/portage/template
index 4891e9ffbf2..b0f34731035 100644
--- a/srcpkgs/portage/template
+++ b/srcpkgs/portage/template
@@ -1,6 +1,6 @@
 # Template file for 'portage'
 pkgname=portage
-version=2.3.71
+version=2.3.77
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-only"
 homepage="https://wiki.gentoo.org/wiki/Portage"
 distfiles="https://github.com/gentoo/${pkgname}/archive/${pkgname}-${version}.tar.gz"
-checksum=9378503cd087ff37aca4add4771f42d5b0e6506438613b42530a4abf27ceb439
+checksum=03a8f595bbca31497678810934286bb5a3a71378c124fc935444ca0165f3a6fc
 
 conf_files="
 	/etc/dispatch-conf.conf
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 4a6e8011120..11052cfa141 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,16 +1,16 @@
 # Template file for 'postfix'
 pkgname=postfix
-version=3.4.6
+version=3.4.7
 revision=1
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmysqlclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"
 short_desc="High-performance mail transport agent"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="IPL-1.0, EPL-2.0"
 homepage="http://www.postfix.org/"
 distfiles="ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${version}.tar.gz"
-checksum=d674a9b40602ee30420ee7ff93c3600e8913eeb2ea9bfb0ac1d140dac5dbe326
+checksum=fe3253121d3ba8836a23774225518560b35e40497951ad5bec154afa8205f967
 
 system_accounts="postfix"
 postfix_homedir="/var/spool/postfix"
diff --git a/srcpkgs/postgis/patches/postgis-2.5.3-PROTOCC_VERSION.patch b/srcpkgs/postgis/patches/postgis-2.5.3-PROTOCC_VERSION.patch
new file mode 100644
index 00000000000..b1105fe58e2
--- /dev/null
+++ b/srcpkgs/postgis/patches/postgis-2.5.3-PROTOCC_VERSION.patch
@@ -0,0 +1,13 @@
+PROTOCC_VERSION is not defined as variable in this Makefile
+
+--- postgis/Makefile.in.ORIG	2019-08-11 07:59:31.000000000 +0200
++++ postgis/Makefile.in	2019-09-03 06:11:57.430733390 +0200
+@@ -206,7 +206,7 @@
+ ifeq (@HAVE_PROTOBUF@,yes)
+ lwgeom_out_mvt.o: vector_tile.pb-c.h
+ mvt.o: vector_tile.pb-c.h
+-ifeq ($(shell expr $(PROTOCC_VERSION) ">=" 10100),1)
++ifeq ($(shell expr @PROTOCC_VERSION@ ">=" 10100),1)
+ lwgeom_out_geobuf.o: geobuf.pb-c.h
+ geobuf.o: geobuf.pb-c.h
+ endif
diff --git a/srcpkgs/postgis/template b/srcpkgs/postgis/template
index 2dd7858ffc7..741f34323c8 100644
--- a/srcpkgs/postgis/template
+++ b/srcpkgs/postgis/template
@@ -1,7 +1,7 @@
 # Template file for 'postgis'
 pkgname=postgis
-version=2.5.2
-revision=3
+version=2.5.3
+revision=1
 build_style=gnu-configure
 configure_args="--with-projdir=${XBPS_CROSS_BASE}/usr
  --with-projdir=${XBPS_CROSS_BASE}/usr
@@ -16,7 +16,7 @@ license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=b6cb286c5016029d984f8c440947bf9178da72e1f6f840ed639270e1c451db5e
+checksum=72e8269d40f981e22fb2b78d3ff292338e69a4f5166e481a77b015e1d34e559a
 nocross="FIXME: Cannot run test program to determine PROJ version"
 
 pre_configure() {
diff --git a/srcpkgs/postgis/update b/srcpkgs/postgis/update
new file mode 100644
index 00000000000..70f8b7290d7
--- /dev/null
+++ b/srcpkgs/postgis/update
@@ -0,0 +1 @@
+ignore="*alpha*"
diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index f1890649320..fabcf3826a3 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql'
 pkgname=postgresql
 version=9.6.15
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target=world
 configure_args="--with-openssl --with-python
diff --git a/srcpkgs/potrace/template b/srcpkgs/potrace/template
index d1dd4cfc7cb..1f7f8268622 100644
--- a/srcpkgs/potrace/template
+++ b/srcpkgs/potrace/template
@@ -1,6 +1,6 @@
 # Template file for 'potrace'
 pkgname=potrace
-version=1.15
+version=1.16
 revision=1
 build_style=gnu-configure
 makedepends="zlib-devel"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2"
 homepage="http://potrace.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
-checksum=a9b33904ace328340c850a01458199e0064e03ccaaa731bc869a842b1b8d529d
+checksum=be8248a17dedd6ccbaab2fcc45835bb0502d062e40fbded3bc56028ce5eb7acc
 
 libpotrace_package() {
 	short_desc+=" - runtime library"
diff --git a/srcpkgs/powerdevil/template b/srcpkgs/powerdevil/template
index 881508d479c..531d96cd74e 100644
--- a/srcpkgs/powerdevil/template
+++ b/srcpkgs/powerdevil/template
@@ -1,6 +1,6 @@
 # Template file for 'powerdevil'
 pkgname=powerdevil
-version=5.16.4
+version=5.17.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/plasma/powerdevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=40885869890366f7ea92946ed0f8d251546fb14228eddd2ad128e3be8f88d2ed
+checksum=ea0ebd64c9f315f890421ae2ff0d7d756b61071331868ff9a63e47a9cba59fe5
diff --git a/srcpkgs/powertop/template b/srcpkgs/powertop/template
index a4628a5d1f4..83ebe8ecf21 100644
--- a/srcpkgs/powertop/template
+++ b/srcpkgs/powertop/template
@@ -1,14 +1,15 @@
 # Template file for 'powertop'
 pkgname=powertop
-version=2.10
+version=2.11
 revision=1
-wrksrc="$pkgname-v${version}"
+_githash=g7ef7f79
+wrksrc="${pkgname}-v${version}-1-${_githash}"
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="ncurses-devel pciutils-devel libnl3-devel"
-short_desc="Linux tool to find out what is using power on computer"
+short_desc="Tool to diagnose issues with power consumption and power management"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="GPL-2.0-only"
 homepage="https://01.org/powertop/"
-distfiles="https://01.org/sites/default/files/downloads/powertop-v${version}.tar.gz"
-checksum=d3b7459eaba7d01c8841dd33a3b4d369416c01e9bd8951b0d88234cf18fe4a75
+distfiles="https://01.org/sites/default/files/downloads/powertop-v${version}-1-${_githash}.tar.gz"
+checksum=ae68c913784f78b497076e0b1d588f59854a66c074690d545dae7956e4f5d64f
diff --git a/srcpkgs/ppsspp/template b/srcpkgs/ppsspp/template
index 17081ce1583..b9b6fbfdffd 100644
--- a/srcpkgs/ppsspp/template
+++ b/srcpkgs/ppsspp/template
@@ -1,13 +1,13 @@
 # Template file for 'ppsspp'
 pkgname=ppsspp
-version=1.8.0
+version=1.9.3
 revision=1
 create_wrksrc=yes
 build_wrksrc="ppsspp-${version}"
 build_style=cmake
 configure_args="-DHEADLESS=1 -DUSE_SYSTEM_FFMPEG=1 -DUNITTEST=ON
  -DUSING_QT_UI=$(vopt_if qt ON OFF)"
-hostmakedepends="pkg-config $(vopt_if qt qt5-host-tools)"
+hostmakedepends="pkg-config python3 $(vopt_if qt qt5-host-tools)"
 makedepends="zlib-devel glew-devel ffmpeg-devel libzip-devel
  snappy-devel rapidjson
  $(vopt_if sdl2 SDL2-devel) $(vopt_if wayland wayland-devel)
@@ -19,15 +19,15 @@ license="GPL-2.0-or-later"
 homepage="https://www.ppsspp.org/"
 distfiles="
  https://github.com/hrydgard/ppsspp/archive/v${version}.tar.gz
- https://github.com/hrydgard/ppsspp-lang/archive/18e0d46.tar.gz
- https://github.com/hrydgard/glslang/archive/9983f99.tar.gz
- https://github.com/KhronosGroup/SPIRV-Cross/archive/be7425e.tar.gz
+ https://github.com/hrydgard/ppsspp-lang/archive/bfc3a51.tar.gz
+ https://github.com/hrydgard/glslang/archive/f9d08a2.tar.gz
+ https://github.com/KhronosGroup/SPIRV-Cross/archive/a1f7c8d.tar.gz
  https://github.com/Kingcom/armips/archive/7885552.tar.gz
  https://github.com/discordapp/discord-rpc/archive/3d3ae7129d17643bc706da0a2eea85aafd10ab3a.tar.gz"
-checksum="a7011feb0480a352d60e6a3c939d88d4d2e3a2e76620886b183aa2cb36f910de
- 3d313170bb387d466e2bf267b23dd5689174355537f728b42a99f9ea77af0d37
- ea5c3ca101b9635508052e0f52966303e8fc94edf564ecfd0fda147b74625c9a
- 21afa0e32dd2d75ee51c4f5c0d16330a9d80d435d6ac9900d0c13bffdfd7b682
+checksum="f38e6a17977da1da2f55041fe33e8b216f6f3beb19bfe95d05d3915e174f5d26
+ c0cc57b54aa376a9dca6de9c6b162a613d54111f7a8587fcfc243e836568ac0c
+ 1e4284387cc586acb7ce0eefba712fe15e11a87c45c102063c11d0fa60f66dce
+ 456b1e2a75a8e82985ce22f4707570c7aa1fc50d4119cba1a641e8b233ecde26
  f8a03906135fb6f2932b80b7ef5991f39ccac46b36ec3690776fb38c69775c3d
  20fe5dbd7a64f7a8fdbaeb81f8dd485df61121c5054e0f7f917c6193f209ff2e"
 
diff --git a/srcpkgs/praat/template b/srcpkgs/praat/template
index 9a3fc7cdb1f..ab144b74e8a 100644
--- a/srcpkgs/praat/template
+++ b/srcpkgs/praat/template
@@ -1,6 +1,6 @@
 # Template file for 'praat'
 pkgname=praat
-version=6.1.01
+version=6.1.04
 revision=1
 create_wrksrc=yes
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.praat.org/"
 changelog="http://www.fon.hum.uva.nl/praat/manual/What_s_new_.html"
 distfiles="https://github.com/praat/praat/archive/v${version}.tar.gz"
-checksum=555c76773bb0a43b4eb25a99fca65db9e195342cafe58ada03dc7cdc53352877
+checksum=616e70e2265d8cab9fe45526dab1d665e5079bf4ea7e8ed9b6c06fe2d4c46bce
 
 build_options="pulseaudio"
 build_options_default="pulseaudio"
diff --git a/srcpkgs/prelink-cross/template b/srcpkgs/prelink-cross/template
index d6afca4c8fe..163666e8006 100644
--- a/srcpkgs/prelink-cross/template
+++ b/srcpkgs/prelink-cross/template
@@ -11,7 +11,7 @@ case $XBPS_TARGET_MACHINE in
 	*-musl) makedepends+=" argp-standalone"; LDFLAGS+=" -largp" ;;
 esac
 short_desc="Prelink from the yocto project"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://git.yoctoproject.org/cgit.cgi/prelink-cross"
 distfiles="https://github.com/Gottox/prelink-cross/archive/$_githash.tar.gz"
diff --git a/srcpkgs/print-manager/template b/srcpkgs/print-manager/template
index 867fb932e4f..7a11a70ef80 100644
--- a/srcpkgs/print-manager/template
+++ b/srcpkgs/print-manager/template
@@ -1,6 +1,6 @@
 # Template file for 'print-manager'
 pkgname=print-manager
-version=19.04.3
+version=19.08.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/KDE/print-manager"
 distfiles="${KDE_SITE}/applications/${version}/src/print-manager-${version}.tar.xz"
-checksum=5ab32527d6916c1063bf175a1515a0cebb0dfb93844881c4339b2ee690697907
+checksum=c0702208b6f485e2e44337aaf203b9e391adda22d6526bf0dd34b31230e0fb05
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DKF5_HOST_TOOLING=/usr/lib/cmake"
diff --git a/srcpkgs/prison/template b/srcpkgs/prison/template
index b10fd7763c4..1129087f5f9 100644
--- a/srcpkgs/prison/template
+++ b/srcpkgs/prison/template
@@ -1,6 +1,6 @@
 # Template file for 'prison'
 pkgname=prison
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-tools"
@@ -10,16 +10,12 @@ maintainer="John <johnz@posteo.net>"
 license="MIT"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/prison-${version}.tar.xz"
-checksum=9ebab1755e9d7cb01b2aa6e8b63640eb112d8557073423abdb94faecb42d87ab
+checksum=85ffbf88aa02bbecadd88572f035c72c932d3329a0aedcc91994572c64a9f36a
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"
 fi
 
-case "$XBPS_TARGET_MACHINE" in
-	armv6l-musl) broken="https://build.voidlinux.org/builders/armv6l-musl_builder/builds/20920/steps/shell_3/logs/stdio";;
-esac
-
 post_install() {
 	vlicense LICENSE
 }
diff --git a/srcpkgs/profanity/template b/srcpkgs/profanity/template
index 4cd3406322d..8522560242f 100644
--- a/srcpkgs/profanity/template
+++ b/srcpkgs/profanity/template
@@ -1,6 +1,6 @@
 # Template file for 'profanity'
 pkgname=profanity
-version=0.7.0
+version=0.7.1
 revision=1
 build_style=gnu-configure
 configure_args="$(vopt_enable notify notifications) $(vopt_enable otr)
@@ -13,11 +13,11 @@ makedepends="libcurl-devel libglib-devel libstrophe-devel readline-devel
  $(vopt_if xscreensaver libXScrnSaver-devel) $(vopt_if omemo 'libsignal-protocol-c libgcrypt-devel')"
 checkdepends="cmocka-devel"
 short_desc="Console based XMPP client"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="GPL-3.0-or-later"
 homepage="http://www.profanity.im/"
 distfiles="https://github.com/boothj5/profanity/releases/download/${version}/profanity-${version}.tar.gz"
-checksum=f1eb99be01683d41b891b0f997f4c873c9bb87b0b6b8400b7fccb8e553d514bb
+checksum=3fe442948ff2ee258681c3812e878d39179dcf92e1c67bc8fe0ef8896440b05b
 
 export LIBS="-lm"
 
diff --git a/srcpkgs/prometheus/template b/srcpkgs/prometheus/template
index 9c9fddae118..f2ed81efe2d 100644
--- a/srcpkgs/prometheus/template
+++ b/srcpkgs/prometheus/template
@@ -1,6 +1,6 @@
 # Template file for 'prometheus'
 pkgname=prometheus
-version=2.10.0
+version=2.12.0
 revision=1
 build_style=go
 go_import_path="github.com/prometheus/prometheus"
@@ -15,7 +15,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://prometheus.io/"
 distfiles="https://github.com/prometheus/prometheus/archive/v${version}.tar.gz"
-checksum=0362f4aa2fb44cc2c572df140da742bdf99fe9f338157a83f6634694fd693000
+checksum=9bd9ae6df02777a9ba3f6f544338865861decabd02054aa64975449bd6009e5a
 
 system_accounts="_prometheus"
 
diff --git a/srcpkgs/proot/patches/disable-seccomp-based-tracing.patch b/srcpkgs/proot/patches/disable-seccomp-based-tracing.patch
new file mode 100644
index 00000000000..1f178a86f79
--- /dev/null
+++ b/srcpkgs/proot/patches/disable-seccomp-based-tracing.patch
@@ -0,0 +1,28 @@
+# reason: https://github.com/proot-me/proot/issues/106
+# src: Debian10
+
+From: Simon McVittie <smcv@debian.org>
+Date: Sat, 14 Jan 2017 15:52:13 +0000
+X-Dgit-Generated: 5.1.0-1.2 dcc5f0999759be03aed5b62a8683e0b965d0219d
+Subject: Disable seccomp-based tracing performance improvement
+
+It is faster (according to upstream documentation), but on current
+(4.8.4+) kernels it just segfaults. Software that works slowly seems
+better than software that doesn't work at all.
+
+Bug: https://github.com/proot-me/PRoot/issues/106
+
+---
+
+--- src/GNUmakefile
++++ src/GNUmakefile
+@@ -105,7 +105,7 @@ CHECK_VERSION = VERSION=$$($(GIT) descri
+ 		then /bin/echo -e "\#undef VERSION\n\#define VERSION \"$${VERSION}\""; \
+ 		fi;
+ 
+-CHECK_FEATURES = process_vm seccomp_filter
++CHECK_FEATURES = process_vm
+ CHECK_PROGRAMS = $(foreach feature,$(CHECK_FEATURES),.check_$(feature))
+ CHECK_OBJECTS  = $(foreach feature,$(CHECK_FEATURES),.check_$(feature).o)
+ CHECK_RESULTS  = $(foreach feature,$(CHECK_FEATURES),.check_$(feature).res)
+
diff --git a/srcpkgs/proot/patches/makefile-fix-vars.patch b/srcpkgs/proot/patches/makefile-fix-vars.patch
new file mode 100644
index 00000000000..d866121719d
--- /dev/null
+++ b/srcpkgs/proot/patches/makefile-fix-vars.patch
@@ -0,0 +1,35 @@
+--- src/GNUmakefile
++++ src/GNUmakefile
+@@ -10,9 +10,9 @@
+ INSTALL  = install
+ CC       = $(CROSS_COMPILE)gcc
+ LD       = $(CC)
+-STRIP    = $(CROSS_COMPILE)strip
+-OBJCOPY  = $(CROSS_COMPILE)objcopy
+-OBJDUMP  = $(CROSS_COMPILE)objdump
++STRIP    = :
++OBJCOPY  ?= $(CROSS_COMPILE)objcopy
++OBJDUMP  ?= $(CROSS_COMPILE)objdump
+ 
+ CPPFLAGS += -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -I. -I$(VPATH)
+ CFLAGS   += -Wall -Wextra -O2
+@@ -86,7 +86,7 @@
+ quiet_LD  = @echo "  LD	$@"; $(LD)
+ quiet_INSTALL = @echo "  INSTALL	$?"; $(INSTALL)
+ 
+-V = 0
++V = 1
+ ifeq ($(V), 0)
+     quiet = quiet_
+     Q     = @
+@@ -140,8 +140,8 @@
+ 
+ OBJIFY = $($(quiet)GEN)									\
+ 	$(OBJCOPY)									\
+-		--input binary								\
+-		--output `env LANG=C $(OBJDUMP) -f cli/cli.o |				\
++		--input-target binary \
++		--output-target `env LANG=C $(OBJDUMP) -f cli/cli.o | \
+ 			grep 'file format' | awk '{print $$4}'`				\
+ 		--binary-architecture `env LANG=C $(OBJDUMP) -f cli/cli.o |		\
+ 				grep architecture | cut -f 1 -d , | awk '{print $$2}'`	\
diff --git a/srcpkgs/proot/template b/srcpkgs/proot/template
index c73a76b242b..5ee9809c01e 100644
--- a/srcpkgs/proot/template
+++ b/srcpkgs/proot/template
@@ -1,30 +1,24 @@
 # Template file for 'proot'
 pkgname=proot
 version=5.1.0
-revision=5
-wrksrc="PRoot-${version}"
+revision=6
+build_wrksrc=src
+build_style=gnu-makefile
+make_use_env=yes
 makedepends="libarchive-devel talloc-devel"
 short_desc="User-space implementation of chroot, mount --bind, and binfmt_misc"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+maintainer="Piraty <piraty1@inbox.ru>"
+license="GPL-2.0-or-later"
 homepage="https://proot-me.github.io"
 distfiles="https://github.com/proot-me/PRoot/archive/v${version}.tar.gz"
-checksum=50fcb882662b2de3e64e603b68d1af75e920d480191a49e11c0cb63d50040386
+checksum=ce0a3baca8312613bd10f65bb436a3aaa28e1034f498a22c35ad0693600e01dd
 
 pre_build() {
-	sed -i "s,strip,:,g" src/GNUmakefile
-	sed -i "s,objcopy,${OBJCOPY},g" src/GNUmakefile
-	sed -i "s,objdump,${OBJDUMP},g" src/GNUmakefile
-	sed -i "s,--input ,--input-target ,g" src/GNUmakefile
-	sed -i "s,--output ,--output-target ,g" src/GNUmakefile
 	# Fix glibc ptrace.h specific constants for musl libc
-	cp ${FILESDIR}/ptrace_compat.h ${wrksrc}/src
-}
-do_build() {
-	cd src
-	make CC=$CC CFLAGS="$CFLAGS" ${makejobs}
+	cp ${FILESDIR}/ptrace_compat.h .
 }
+
 do_install() {
-	vbin src/proot
-	vman doc/proot/man.1 proot.1
+	vbin proot
+	vman ../doc/proot/man.1 proot.1
 }
diff --git a/srcpkgs/protontricks/template b/srcpkgs/protontricks/template
new file mode 100644
index 00000000000..a32f51c4845
--- /dev/null
+++ b/srcpkgs/protontricks/template
@@ -0,0 +1,14 @@
+# Template file for 'protontricks'
+pkgname=protontricks
+version=1.2.5
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-setuptools"
+depends="python3-vdf winetricks"
+short_desc="Simple wrapper that does winetricks things for Proton enabled games"
+maintainer="Caleb JA <skywise@tutanota.de>"
+license="GPL-3.0-only"
+homepage="https://github.com/Matoking/protontricks"
+distfiles="${homepage}/archive/${version}.tar.gz"
+checksum=a37c8f6b57c6cad6daf726fbf6e90d8b110d0924ef948e1885aed73a2732f8fb
diff --git a/srcpkgs/pscircle/template b/srcpkgs/pscircle/template
index 5b3ef5e5d29..432609725e8 100644
--- a/srcpkgs/pscircle/template
+++ b/srcpkgs/pscircle/template
@@ -1,6 +1,6 @@
 # Template file for 'pscircle'
 pkgname=pscircle
-version=1.3.0
+version=1.3.1
 revision=1
 wrksrc="pscircle-v${version}"
 build_style=meson
@@ -10,5 +10,5 @@ short_desc="Radial tree process visualisation"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://gitlab.com/mildlyparallel/pscircle"
-distfiles="${homepage}/-/archive/v${version}/pscircle-v${version}.tar.gz"
-checksum=960e85219f42b633a4e663d3910082a8a2c27e80e02c7a525665910b6b210a81
+distfiles="https://gitlab.com/mildlyparallel/pscircle/-/archive/v${version}/pscircle-v${version}.tar.gz"
+checksum=29e278e34816be06b3355394b15a8db6b5818ddb305181be7dd408f4cdc43f43
diff --git a/srcpkgs/pulseaudio-module-sndio/template b/srcpkgs/pulseaudio-module-sndio/template
index dabc88743d8..c10553df930 100644
--- a/srcpkgs/pulseaudio-module-sndio/template
+++ b/srcpkgs/pulseaudio-module-sndio/template
@@ -1,18 +1,18 @@
 # Template file for 'pulseaudio-module-sndio'
 pkgname=pulseaudio-module-sndio
 version=12.0
-revision=4
+revision=5
 build_style=gnu-makefile
 make_use_env=yes
 hostmakedepends="pulseaudio pkg-config"
 makedepends="sndio-devel pulseaudio-devel libltdl-devel libpulseaudio"
-nocross="Can't link -lpulseco{re,mmon}-12.0."
 short_desc="Module for PulseAudio to support playing to sndio servers"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="LGPL-2.1-or-later, ISC"
 homepage="https://github.com/t6/pulseaudio-module-sndio"
 distfiles="https://github.com/t6/pulseaudio-module-sndio/releases/download/${version}/${pkgname}-${version}.tar.gz"
 checksum=785baffed274241eb8e1642d0d6e66a411f7f6bf0d0257f46dcd51a809feb835
+nocross="Can't link -lpulseco{re,mmon}-13.0."
 
 post_install() {
 	[ -f LICENSE ] && exit 1
diff --git a/srcpkgs/pulseaudio/patches/fix-alsa-module.patch b/srcpkgs/pulseaudio/patches/fix-alsa-module.patch
deleted file mode 100644
index ddc4236ee8f..00000000000
--- a/srcpkgs/pulseaudio/patches/fix-alsa-module.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From b89d33bb182c42db5ad3987b0e91b7bf62f421e8 Mon Sep 17 00:00:00 2001
-From: Takashi Iwai <tiwai@suse.de>
-Date: Sun, 21 Apr 2019 11:59:30 +0200
-Subject: [PATCH] alsa: Fix inclusion of use-case.h
-
-The recent change in ALSA upstream stripped -I$include/alsa path from
-pkgconfig.  We already fixed for this change in some places but still
-the code for UCM was overlooked, and this resulted in the unresolved
-symbols in alsa card module. Fix them as well.
-
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
----
- configure.ac                | 2 +-
- src/modules/alsa/alsa-ucm.h | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index c004bd70d..b44ed1595 100644
---- configure.ac
-+++ configure.ac
-@@ -826,7 +826,7 @@ AS_IF([test "x$enable_alsa" = "xyes" && test "x$HAVE_ALSA" = "x0"],
- AS_IF([test "x$HAVE_ALSA" = "x1"],
-     [
-         save_CPPFLAGS="$CPPFLAGS"; CPPFLAGS="$CPPFLAGS $ASOUNDLIB_CFLAGS"
--        AC_CHECK_HEADERS([use-case.h], HAVE_ALSA_UCM=1, HAVE_ALSA_UCM=0)
-+        AC_CHECK_HEADERS([alsa/use-case.h], HAVE_ALSA_UCM=1, HAVE_ALSA_UCM=0)
-         CPPFLAGS="$save_CPPFLAGS"
-     ],
-     HAVE_ALSA_UCM=0)
-diff --git a/src/modules/alsa/alsa-ucm.h b/src/modules/alsa/alsa-ucm.h
-index 53abf3f90..c926f3cc3 100644
---- src/modules/alsa/alsa-ucm.h
-+++ src/modules/alsa/alsa-ucm.h
-@@ -23,7 +23,7 @@
- ***/
- 
- #ifdef HAVE_ALSA_UCM
--#include <use-case.h>
-+#include <alsa/use-case.h>
- #else
- typedef void snd_use_case_mgr_t;
- #endif
diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template
index 208c5317e9a..6dbebc9694f 100644
--- a/srcpkgs/pulseaudio/template
+++ b/srcpkgs/pulseaudio/template
@@ -1,22 +1,21 @@
 # Template file for 'pulseaudio'
 pkgname=pulseaudio
-version=12.2
-revision=6
+version=13.0
+revision=1
 build_style=gnu-configure
 configure_args="--disable-oss-output --disable-oss-wrapper --disable-tcpwrap
  --enable-jack --disable-lirc --disable-hal-compat --disable-gconf --enable-orc
- --with-database=tdb --with-udev-rules-dir=/usr/lib/udev/rules.d --disable-bluez4
- --disable-esound --disable-gtk3 --enable-bluez5 --disable-bluez5-ofono-headset
- --disable-systemd-login --disable-systemd-daemon --disable-systemd-journal
- --enable-webrtc-aec --with-bash-completion-dir=/usr/share/bash-completion/completions
+ --with-database=tdb --with-udev-rules-dir=/usr/lib/udev/rules.d --disable-esound
+ --disable-gtk3 --enable-bluez5 --disable-bluez5-ofono-headset --disable-systemd-login
+ --disable-systemd-daemon --disable-systemd-journal --enable-webrtc-aec
+ --with-bash-completion-dir=/usr/share/bash-completion/completions
  --enable-bluez5-native-headset"
-hostmakedepends="automake autoconf gettext-devel glib-devel intltool libtool
- orc-devel pkg-config"
+hostmakedepends="automake gettext-devel libtool orc-devel perl-XML-Parser pkg-config"
 makedepends="avahi-libs-devel eudev-libudev-devel fftw-devel jack-devel
  libSM-devel libXtst-devel libasyncns-devel libbluetooth-devel
  libcap-devel libcap-progs libglib-devel libltdl-devel libressl-devel
  libsndfile-devel libsoxr-devel orc-devel sbc-devel speex-devel tdb-devel
-webrtc-audio-processing-devel xcb-util-devel"
+ webrtc-audio-processing-devel xcb-util-devel"
 depends="rtkit"
 conf_files="/etc/pulse/*"
 short_desc="Featureful, general-purpose sound server"
@@ -24,7 +23,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.freedesktop.org/wiki/Software/PulseAudio"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/releases/${pkgname}-${version}.tar.xz"
-checksum=809668ffc296043779c984f53461c2b3987a45b7a25eb2f0a1d11d9f23ba4055
+checksum=961b23ca1acfd28f2bc87414c27bb40e12436efcf2158d29721b1e89f3f28057
 system_groups="pulse-access"
 system_accounts="pulse"
 pulse_groups="audio"
@@ -39,10 +38,6 @@ case "$XBPS_TARGET_MACHINE" in
 	arm*) configure_args+=" --disable-neon-opt" ;;
 esac
 
-pre_configure() {
-	NOCONFIGURE=1 ./bootstrap.sh
-}
-
 post_install() {
 	rm -f ${DESTDIR}/etc/dbus-1/system.d/pulseaudio-system.conf
 	vsv pulseaudio
diff --git a/srcpkgs/puppet/template b/srcpkgs/puppet/template
index 6aa0656ea60..201cfc5dd45 100644
--- a/srcpkgs/puppet/template
+++ b/srcpkgs/puppet/template
@@ -1,6 +1,6 @@
 # Template file for 'puppet'
 pkgname=puppet
-version=6.2.0
+version=6.9.0
 revision=1
 archs=noarch
 build_style=ruby-module
@@ -12,8 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://puppetlabs.com/facter"
 distfiles="https://downloads.puppetlabs.com/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=d891970ecd4c47b93d952b02463107c09cc44094ffc58e5c81b6f4a9e8c8798b
-
+checksum=c6d359bb842857aa6a77f07150163c9f811139434c965e5fddf2342cb19b07d0
 system_accounts="puppet"
 puppet_homedir="/var/lib/puppet"
 conf_files="
@@ -22,7 +21,6 @@ conf_files="
 make_dirs="/var/lib/puppet 0755 puppet puppet"
 
 post_install() {
-	vlicense LICENSE
 	vsv puppet
 	vsv puppetmaster
 }
diff --git a/srcpkgs/purpose/template b/srcpkgs/purpose/template
index 50648c3503e..a98e8bf56ba 100644
--- a/srcpkgs/purpose/template
+++ b/srcpkgs/purpose/template
@@ -1,6 +1,6 @@
 # Template file for 'purpose'
 pkgname=purpose
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules python"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/frameworks/purpose"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=810a660d0a4d6de41e1b4d00fcb039d3b099ceae65ec96261ca8dd1fba458d08
+checksum=0e59f96272a81340914345599f231af839a23d311f770a2536aaa51f46f885d5
 
 purpose-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/putty/template b/srcpkgs/putty/template
index 2b974f88a82..97bd2a446c1 100644
--- a/srcpkgs/putty/template
+++ b/srcpkgs/putty/template
@@ -1,6 +1,6 @@
 # Template file for 'putty'
 pkgname=putty
-version=0.72
+version=0.73
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://www.chiark.greenend.org.uk/~sgtatham/putty/"
 distfiles="http://the.earth.li/~sgtatham/putty/latest/putty-${version}.tar.gz"
-checksum=f236b5a26b0905809b3cd190158e8b95d81f86ad34fdd97a4312c1877f2cec5f
+checksum=3db0b5403fb41aecd3aa506611366650d927650b6eb3d839ad4dcc782519df1c
 
 CFLAGS="-Wno-error"
 
diff --git a/srcpkgs/py3status/template b/srcpkgs/py3status/template
index 6f8fe639f30..b7a263270e4 100644
--- a/srcpkgs/py3status/template
+++ b/srcpkgs/py3status/template
@@ -1,6 +1,6 @@
 # Template file for 'py3status'
 pkgname=py3status
-version=3.20
+version=3.21
 revision=1
 archs=noarch
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="BSD-3-Clause"
 homepage="https://github.com/ultrabug/py3status"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=136d3033f6945b522d02f43754b265d7f451694fa57577d923071de1831101f1
+checksum=81a5e9a2cae77e148fd3ef1647426136e9b001c1fb8d8e9c7ade9fb5e6a0ae1b
 
 do_check() {
 	python3 -m pytest
diff --git a/srcpkgs/pycharm-community/template b/srcpkgs/pycharm-community/template
index 7546f04e581..cdd7d83a113 100644
--- a/srcpkgs/pycharm-community/template
+++ b/srcpkgs/pycharm-community/template
@@ -1,6 +1,6 @@
 # Template file for 'pycharm-community'
 pkgname=pycharm-community
-version=2019.2
+version=2019.2.3
 revision=1
 archs="i686 x86_64"
 depends="virtual?java-environment giflib libXtst"
@@ -9,7 +9,7 @@ maintainer="Felix Van der Jeugt <felix.vanderjeugt@gmail.com>"
 license="Apache-2.0"
 homepage="https://www.jetbrains.org/pycharm/"
 distfiles="https://download-cf.jetbrains.com/python/${pkgname}-${version}.tar.gz"
-checksum=632015cc40d6e4a874ab5cbab0430ec1962cd3c4a7ff5f083ce88242180f784b
+checksum=205cf868b64bce3099c65a4e600d01e416a7ba81eff117df8a2b525222b7de09
 repository=nonfree
 nopie=yes
 
diff --git a/srcpkgs/pylint/template b/srcpkgs/pylint/template
index 6119b9191c3..b6ca91fd84c 100644
--- a/srcpkgs/pylint/template
+++ b/srcpkgs/pylint/template
@@ -1,10 +1,11 @@
 # Template file for 'pylint'
 pkgname=pylint
-version=1.9.4
+reverts="2.3.1_1"
+version=1.9.5
 revision=1
 archs=noarch
 wrksrc="pylint-${version}"
-build_style=python-module
+build_style=python2-module
 pycompile_module="pylint"
 hostmakedepends="python-setuptools python3-setuptools"
 depends="python-setuptools python-astroid python-six python-isort python-mccabe
@@ -15,7 +16,7 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
 homepage="http://www.pylint.org/"
 license="GPL-2.0-or-later"
 distfiles="${PYPI_SITE}/p/pylint/pylint-${version}.tar.gz"
-checksum=ee1e85575587c5b58ddafa25e1c1b01691ef172e139fc25585e5d3f02451da93
+checksum=97a42df23d436c70132971d1dcb9efad2fe5c0c6add55b90161e773caf729300
 
 alternatives="
  pylint:epylint:/usr/bin/epylint2
@@ -37,7 +38,7 @@ post_install() {
 	# create versioned man pages
 	for f in epylint pylint pyreverse symilar; do
 		vman man/${f}.1 ${f}2.1
-		vman man/${f}.1 ${f}3.1
+		mv ${DESTDIR}/usr/bin/${f} ${DESTDIR}/usr/bin/${f}2
 	done
 
 	# install example config and emacs files
@@ -46,28 +47,3 @@ post_install() {
 	vsconf elisp/pylint.el
 	vsconf elisp/pylint-flymake.el
 }
-
-python3-pylint_package() {
-	alternatives="
-	 pylint:epylint:/usr/bin/epylint3
-	 pylint:pylint:/usr/bin/pylint3
-	 pylint:pyreverse:/usr/bin/pyreverse3
-	 pylint:symilar:/usr/bin/symilar3
-	 pylint:epylint.1:/usr/share/man/man1/epylint3.1
-	 pylint:pylint.1:/usr/share/man/man1/pylint3.1
-	 pylint:pyreverse.1:/usr/share/man/man1/pyreverse3.1
-	 pylint:symilar.1:/usr/share/man/man1/symilar3.1"
-	archs=noarch
-	pycompile_module="pylint"
-	depends="python3-setuptools python3-astroid python3-six python3-isort python3-mccabe"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/bin/*3
-		vmove usr/lib/python3*
-		vmove usr/share/man/man1/*3.1
-		vsconf examples/pylintrc
-		vsconf examples/pylintrc_camelcase
-		vsconf elisp/pylint.el
-		vsconf elisp/pylint-flymake.el
-	}
-}
diff --git a/srcpkgs/pyradio/INSTALL.msg b/srcpkgs/pyradio/INSTALL.msg
new file mode 100644
index 00000000000..f3ae4fba849
--- /dev/null
+++ b/srcpkgs/pyradio/INSTALL.msg
@@ -0,0 +1,5 @@
+To make pyradio work one of these must be installed:
+
+	- mpv & socat
+	- mplayer
+	- vlc
diff --git a/srcpkgs/pyradio/template b/srcpkgs/pyradio/template
new file mode 100644
index 00000000000..10d7d8c6fbb
--- /dev/null
+++ b/srcpkgs/pyradio/template
@@ -0,0 +1,21 @@
+# Template file for 'pyradio'
+pkgname=pyradio
+version=0.8.0
+revision=1
+archs=noarch
+build_style=python3-module
+pycompile_module="pyradio"
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Curses based internet radio player"
+maintainer="Lugubris <lugubris@disroot.org>"
+license="MIT"
+homepage="http://www.coderholic.com/pyradio/"
+changelog="https://raw.githubusercontent.com/coderholic/pyradio/master/ChangeLog"
+distfiles="https://github.com/coderholic/pyradio/archive/${version}.tar.gz"
+checksum=2b1e0c4552580a5df5b464243f7b141bfabbb1ccfe4d1a72418b161d60c1ffc1
+
+post_install() {
+	vman pyradio.1
+	vlicense LICENCE
+}
diff --git a/srcpkgs/python-Arrow/template b/srcpkgs/python-Arrow/template
index 78b6dbca9ad..456e3776188 100644
--- a/srcpkgs/python-Arrow/template
+++ b/srcpkgs/python-Arrow/template
@@ -1,7 +1,7 @@
 # Template file for 'python-Arrow'
 pkgname=python-Arrow
 reverts=0.13.1_1
-version=0.13.0
+version=0.15.2
 revision=1
 archs=noarch
 wrksrc="arrow-${version}"
@@ -14,7 +14,7 @@ maintainer="Andrea Brancaleoni <miwaxe@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/crsmithdev/arrow"
 distfiles="${PYPI_SITE}/a/arrow/arrow-${version}.tar.gz"
-checksum=9cb4a910256ed536751cd5728673bfb53e6f0026e240466f90c2a92c0b79c895
+checksum=10257c5daba1a88db34afa284823382f4963feca7733b9107956bed041aff24f
 
 python3-Arrow_package() {
 	archs=noarch
diff --git a/srcpkgs/python-Babel/template b/srcpkgs/python-Babel/template
index fcd1b7daf25..34d7a7728ce 100644
--- a/srcpkgs/python-Babel/template
+++ b/srcpkgs/python-Babel/template
@@ -1,6 +1,6 @@
 # Template file for 'python-Babel'
 pkgname=python-Babel
-version=2.6.0
+version=2.7.0
 revision=1
 archs=noarch
 wrksrc="${pkgname#*-}-${version}"
@@ -10,10 +10,10 @@ hostmakedepends="python-setuptools python3-setuptools"
 depends="python-setuptools python-pytz"
 short_desc="Tools for internationalizing Python applications (Python2)"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="http://babel.pocoo.org/"
 license="BSD-3-Clause"
+homepage="http://babel.pocoo.org/"
 distfiles="${PYPI_SITE}/B/Babel/Babel-${version}.tar.gz"
-checksum=8cba50f48c529ca3fa18cf81fa9403be176d374ac4d60738b839122dfaaa3d23
+checksum=e86135ae101e31e2c8ec20a4e0c5220f4eed12487d5cf3f78be7e98d3a57fc28
 alternatives="babel:pybabel:/usr/bin/pybabel2"
 
 post_install() {
diff --git a/srcpkgs/python-BeautifulSoup4/template b/srcpkgs/python-BeautifulSoup4/template
index 5e68904603d..70e4f8a58da 100644
--- a/srcpkgs/python-BeautifulSoup4/template
+++ b/srcpkgs/python-BeautifulSoup4/template
@@ -1,7 +1,7 @@
 # Template file for 'python-BeautifulSoup4'
 pkgname=python-BeautifulSoup4
-version=4.7.1
-revision=2
+version=4.8.0
+revision=1
 archs=noarch
 wrksrc="beautifulsoup4-${version}"
 build_style=python-module
@@ -13,7 +13,7 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="MIT"
 homepage="https://www.crummy.com/software/BeautifulSoup"
 distfiles="${PYPI_SITE}/b/beautifulsoup4/beautifulsoup4-${version}.tar.gz"
-checksum=945065979fb8529dd2f37dbb58f00b661bdbcbebf954f93b32fdf5263ef35348
+checksum=25288c9e176f354bf277c0a10aa96c782a6a18a17122dba2e8cec4a97e03343b
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python-Cheroot/template b/srcpkgs/python-Cheroot/template
index f63f8871e54..fcfdf76e69d 100644
--- a/srcpkgs/python-Cheroot/template
+++ b/srcpkgs/python-Cheroot/template
@@ -1,6 +1,6 @@
 # Template file for 'python-Cheroot'
 pkgname=python-Cheroot
-version=6.5.4
+version=8.2.0
 revision=1
 archs=noarch
 wrksrc="cheroot-${version}"
@@ -10,20 +10,18 @@ hostmakedepends="python-setuptools python3-setuptools"
 depends="python-setuptools python-six python-more-itertools
  python-backports.functools_lru_cache"
 short_desc="High-performance, pure-Python HTTP server (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="bra1nwave <brainwave@openmailbox.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/cherrypy/cheroot"
 changelog="https://github.com/cherrypy/cheroot/blob/master/CHANGES.rst"
 distfiles="${PYPI_SITE}/c/cheroot/cheroot-${version}.tar.gz"
-checksum=beb8eb9eeff5746059607e81b72efd6f4ca099111dc13f8961ae9e4f63f7786b
+checksum=42fa3e1f44d92b4784fd76621711b98f96aab66d504c383359a827286e896708
 alternatives="cheroot:cheroot:/usr/bin/cheroot2"
 
 pre_build() {
-	sed -i setup.cfg \
+	vsed -i setup.cfg \
 		-e '/setuptools_scm/d' \
-		-e '/setuptools_scm_git_archive/d' \
 		-e '/use_scm_version/d' \
-		-e '/backports.*/s/$/;python_version<"3.4"/' \
 		-e "/name = /a\
 		version = ${version}"
 }
@@ -39,8 +37,8 @@ python3-Cheroot_package() {
 	alternatives="cheroot:cheroot:/usr/bin/cheroot3"
 	short_desc="${short_desc/Python2/Python3}"
 	pkg_install() {
-		vmove usr/bin/*3
-		vmove usr/lib/python3*
+		vmove "usr/bin/*3"
+		vmove "usr/lib/python3*"
 		vlicense LICENSE.md
 	}
 }
diff --git a/srcpkgs/python-ConfigArgParse/template b/srcpkgs/python-ConfigArgParse/template
index 5a834639082..c9a00a04508 100644
--- a/srcpkgs/python-ConfigArgParse/template
+++ b/srcpkgs/python-ConfigArgParse/template
@@ -1,6 +1,6 @@
 # Template file for 'python-ConfigArgParse'
 pkgname=python-ConfigArgParse
-version=0.14.0
+version=0.15.1
 revision=1
 archs=noarch
 wrksrc="ConfigArgParse-${version}"
@@ -13,7 +13,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="MIT"
 homepage="https://github.com/bw2/ConfigArgParse"
 distfiles="${PYPI_SITE}/C/ConfigArgParse/ConfigArgParse-${version}.tar.gz"
-checksum=2e2efe2be3f90577aca9415e32cb629aa2ecd92078adbe27b53a03e53ff12e91
+checksum=baaf0fd2c1c108d007f402dab5481ac5f12d77d034825bf5a27f8224757bd0ac
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python-Cython/template b/srcpkgs/python-Cython/template
index d2230744d8c..dc39d54e9c2 100644
--- a/srcpkgs/python-Cython/template
+++ b/srcpkgs/python-Cython/template
@@ -1,6 +1,6 @@
 # Template file for 'python-Cython'
 pkgname=python-Cython
-version=0.29.11
+version=0.29.13
 revision=1
 wrksrc="Cython-${version}"
 build_style=python-module
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="https://cython.org/"
 changelog="https://raw.githubusercontent.com/cython/cython/master/CHANGES.rst"
 distfiles="${PYPI_SITE}/C/Cython/Cython-${version}.tar.gz"
-checksum=763a522cc5d1673ba7a4092c0914790f11704b1d4c41e2671e50d0f702a8c6a0
+checksum=c29d069a4a30f472482343c866f7486731ad638ef9af92bfe5fca9c7323d638e
 
 alternatives="
  cython:cygdb:/usr/bin/cygdb2
diff --git a/srcpkgs/python-Django/template b/srcpkgs/python-Django/template
index 44148cdd6cf..21aa405fba1 100644
--- a/srcpkgs/python-Django/template
+++ b/srcpkgs/python-Django/template
@@ -1,6 +1,6 @@
 # Template file for 'python-Django'
 pkgname=python-Django
-version=1.11.21
+version=1.11.25
 revision=1
 archs=noarch
 wrksrc="Django-${version}"
@@ -13,7 +13,7 @@ maintainer="Eivind Uggedal <eivind@uggedal.com>"
 license="BSD-3-Clause"
 homepage="https://www.djangoproject.com/"
 distfiles="${PYPI_SITE}/D/Django/Django-${version}.tar.gz"
-checksum=ba723e524facffa2a9d8c2e9116db871e16b9207e648e1d3e4af8aae1167b029
+checksum=5314e8586285d532b7aa5c6d763b0248d9a977a37efec86d30f0212b82e8ef66
 alternatives="django:django-admin:/usr/bin/django-admin2"
 
 post_install() {
diff --git a/srcpkgs/python-Mako/template b/srcpkgs/python-Mako/template
index ff7fd541479..e5c3c76170c 100644
--- a/srcpkgs/python-Mako/template
+++ b/srcpkgs/python-Mako/template
@@ -1,6 +1,6 @@
 # Template file for 'python-Mako'
 pkgname=python-Mako
-version=1.0.13
+version=1.1.0
 revision=1
 archs=noarch
 wrksrc="Mako-${version}"
@@ -13,7 +13,7 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="MIT"
 homepage="https://www.makotemplates.org/"
 distfiles="${PYPI_SITE}/M/Mako/Mako-${version}.tar.gz"
-checksum=95ee720cc3453063788515d55bd7ce4a2a77b7b209e4ac70ec5c86091eb02541
+checksum=a36919599a9b7dc5d86a7a8988f23a9a3a3d083070023bab23d64f7f1d1e0a4b
 alternatives="mako:mako-render:/usr/bin/mako-render2"
 
 post_install() {
diff --git a/srcpkgs/python-Markdown/template b/srcpkgs/python-Markdown/template
index a495fa53cf5..935dcc12bca 100644
--- a/srcpkgs/python-Markdown/template
+++ b/srcpkgs/python-Markdown/template
@@ -1,6 +1,6 @@
 # Template file for 'python-Markdown'
 pkgname=python-Markdown
-version=2.6.11
+version=3.1.1
 revision=1
 archs=noarch
 wrksrc="Markdown-${version}"
@@ -9,11 +9,11 @@ hostmakedepends="python-setuptools python3-setuptools"
 depends="python-setuptools"
 pycompile_module="markdown"
 short_desc="Python2 implementation of John Gruber's Markdown"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Peter Bui <pbui@github.bx612.space>"
 homepage="https://github.com/waylan/Python-Markdown"
 license="3-clause-BSD"
 distfiles="${PYPI_SITE}/M/Markdown/Markdown-${version}.tar.gz"
-checksum=a856869c7ff079ad84a3e19cd87a64998350c2b94e9e08e44270faef33400f81
+checksum=2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a
 alternatives="markdown:markdown_py:/usr/bin/markdown_py2"
 
 post_install() {
diff --git a/srcpkgs/python-MiniMock/template b/srcpkgs/python-MiniMock/template
index c9d26f43245..38c0723f374 100644
--- a/srcpkgs/python-MiniMock/template
+++ b/srcpkgs/python-MiniMock/template
@@ -9,7 +9,7 @@ pycompile_module="minimock.py"
 hostmakedepends="python-setuptools python3-setuptools"
 depends="python"
 short_desc="The simplest possible mock library in Python2"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://pypi.org/project/MiniMock/"
 distfiles="${PYPI_SITE}/M/MiniMock/MiniMock-${version}.tar.gz"
diff --git a/srcpkgs/python-Pillow/template b/srcpkgs/python-Pillow/template
index 59f4915113a..e43d22b8f62 100644
--- a/srcpkgs/python-Pillow/template
+++ b/srcpkgs/python-Pillow/template
@@ -1,6 +1,6 @@
 # Template file for 'python-Pillow'
 pkgname=python-Pillow
-version=6.0.0
+version=6.2.0
 revision=1
 wrksrc="Pillow-${version}"
 build_style=python-module
@@ -10,11 +10,11 @@ makedepends="python-devel python3-devel libjpeg-turbo-devel libopenjpeg2-devel
  tiff-devel freetype-devel lcms2-devel libwebp-devel libimagequant-devel"
 short_desc="Python Imaging Library (PIL) fork (Python2)"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="custom: PIL"
+license="custom:PIL"
 homepage="https://python-pillow.org/"
 changelog="https://raw.githubusercontent.com/python-pillow/Pillow/master/CHANGES.rst"
 distfiles="${PYPI_SITE}/P/Pillow/Pillow-${version}.tar.gz"
-checksum=809c0a2ce9032cbcd7b5313f71af4bdc5c8c771cb86eb7559afd954cab82ebb5
+checksum=4548236844327a718ce3bb182ab32a16fa2050c61e334e959f554cac052fb0df
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python-PyQt5-webengine/template b/srcpkgs/python-PyQt5-webengine/template
index fb13fcf6667..996ef6b00e2 100644
--- a/srcpkgs/python-PyQt5-webengine/template
+++ b/srcpkgs/python-PyQt5-webengine/template
@@ -19,6 +19,8 @@ checksum=bb6cabcc454ed1394aedfb42eb35dbee3ca324cf582e8c0ca5e8c8af0b00e325
 lib32disabled=yes
 
 case "$XBPS_TARGET_MACHINE" in
+	ppc64*) ;;
+	ppc*) broken="no webengine for 32-bit ppc";;
 	arm*) broken="depends on qt5-webengine";;
 	aarch64*) broken="https://build.voidlinux.org/builders/aarch64_builder/builds/20955/steps/shell_3/logs/stdio";;
 esac
diff --git a/srcpkgs/python-SQLAlchemy/template b/srcpkgs/python-SQLAlchemy/template
index 2a64302f58c..7b529ade621 100644
--- a/srcpkgs/python-SQLAlchemy/template
+++ b/srcpkgs/python-SQLAlchemy/template
@@ -1,6 +1,6 @@
 # Template file for 'python-SQLAlchemy'
 pkgname=python-SQLAlchemy
-version=1.3.5
+version=1.3.8
 revision=1
 wrksrc="SQLAlchemy-${version}"
 build_style=python-module
@@ -12,7 +12,7 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="MIT"
 homepage="https://www.sqlalchemy.org"
 distfiles="${PYPI_SITE}/S/SQLAlchemy/SQLAlchemy-${version}.tar.gz"
-checksum=c30925d60af95443458ebd7525daf791f55762b106049ae71e18f8dd58084c2f
+checksum=2f8ff566a4d3a92246d367f2e9cd6ed3edeef670dcd6dda6dfdc9efed88bcd80
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python-Unidecode/template b/srcpkgs/python-Unidecode/template
index 47f1882ae26..035c5d846be 100644
--- a/srcpkgs/python-Unidecode/template
+++ b/srcpkgs/python-Unidecode/template
@@ -1,6 +1,6 @@
 # Template file for 'python-Unidecode'
 pkgname=python-Unidecode
-version=1.0.23
+version=1.1.1
 revision=1
 archs=noarch
 wrksrc="Unidecode-${version}"
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://pypi.org/project/Unidecode/"
 distfiles="${PYPI_SITE}/U/Unidecode/Unidecode-${version}.tar.gz"
-checksum=8b85354be8fd0c0e10adbf0675f6dc2310e56fda43fa8fe049123b6c475e52fb
+checksum=2b6aab710c2a1647e928e36d69c21e76b453cd455f4e2621000e54b2a9b8cce8
 alternatives="unidecode:unidecode:/usr/bin/unidecode2"
 
 do_check() {
diff --git a/srcpkgs/python-aalib/template b/srcpkgs/python-aalib/template
index 1531914937f..349b8407343 100644
--- a/srcpkgs/python-aalib/template
+++ b/srcpkgs/python-aalib/template
@@ -7,7 +7,7 @@ pycompile_module="aalib.py"
 hostmakedepends="python-setuptools python3-setuptools"
 depends="aalib python"
 short_desc="Python2 interface to AAlib, an ASCII art library"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://jwilk.net/software/python-aalib"
 distfiles="${PYPI_SITE}/p/python-aalib/python-aalib-${version}.tar.gz"
diff --git a/srcpkgs/python-alembic/template b/srcpkgs/python-alembic/template
index 3c16c235123..4011b33c0fa 100644
--- a/srcpkgs/python-alembic/template
+++ b/srcpkgs/python-alembic/template
@@ -1,6 +1,6 @@
 # Template file for 'python-alembic'
 pkgname=python-alembic
-version=1.0.11
+version=1.2.1
 revision=1
 archs=noarch
 wrksrc="alembic-${version}"
@@ -8,13 +8,18 @@ build_style=python-module
 pycompile_module="alembic"
 hostmakedepends="python-setuptools python3-setuptools"
 depends="python-Mako python-SQLAlchemy python-dateutil python-editor"
-checkdepends="${depends} ${depends//python-/python3-} python-pytest python3-pytest python-mock"
+checkdepends="${depends} ${depends//python-/python3-}
+ python-pytest python3-pytest python-mock tox"
 short_desc="Database migration tool for SQLAlchemy (Python2)"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="MIT"
 homepage="https://bitbucket.org/zzzeek/alembic"
 distfiles="${PYPI_SITE}/a/alembic/alembic-${version}.tar.gz"
-checksum=cdb7d98bd5cbf65acd38d70b1c05573c432e6473a82f955cdea541b5c153b0cc
+checksum=9f907d7e8b286a1cfb22db9084f9ce4fde7ad7956bb496dc7c952e10ac90e36a
+
+do_check() {
+	tox -e py27,py${py3_ver/./}
+}
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python-appdirs/template b/srcpkgs/python-appdirs/template
index 02186f525cc..fdae1fe184b 100644
--- a/srcpkgs/python-appdirs/template
+++ b/srcpkgs/python-appdirs/template
@@ -9,7 +9,7 @@ pycompile_module="appdirs.py"
 hostmakedepends="python-setuptools python3-setuptools"
 depends="python"
 short_desc="Python2 module for determining appropriate platform-specific dirs"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/ActiveState/appdirs/"
 distfiles="${PYPI_SITE}/a/appdirs/appdirs-${version}.tar.gz"
diff --git a/srcpkgs/python-apsw/template b/srcpkgs/python-apsw/template
index 722c5b91558..ed47b4a7803 100644
--- a/srcpkgs/python-apsw/template
+++ b/srcpkgs/python-apsw/template
@@ -1,6 +1,6 @@
 # Template file for 'python-apsw'
 pkgname=python-apsw
-_distver=3.28.0
+_distver=3.29.0
 _patchver=r1
 version=${_distver}${_patchver}
 revision=1
@@ -12,8 +12,9 @@ short_desc="Another Python SQLite Wrapper (Python2)"
 maintainer="bra1nwave <brainwave@openmailbox.org>"
 license="Zlib"
 homepage="https://github.com/rogerbinns/apsw"
+changelog="https://raw.githubusercontent.com/rogerbinns/apsw/master/doc/changes.rst"
 distfiles="${homepage}/archive/${_distver}-${_patchver}.tar.gz"
-checksum=0347dd778f40e6d97ceeb3c469a5a06a64b1c69bb17d4a6e2c00db7ec38e2845
+checksum=a5715b4ff614d6bc3b19dcd73e54d5ba0c5340cdae6141ef6dd1e09b289bf7f7
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python-astroid/template b/srcpkgs/python-astroid/template
index 62dd495c995..9da6aebae87 100644
--- a/srcpkgs/python-astroid/template
+++ b/srcpkgs/python-astroid/template
@@ -1,12 +1,12 @@
 # Template file for 'python-astroid'
 pkgname=python-astroid
 version=1.6.6
-revision=1
+revision=2
 archs=noarch
 wrksrc="astroid-${version}"
-build_style=python-module
+build_style=python2-module
 pycompile_module="astroid"
-hostmakedepends="python-setuptools python3-setuptools"
+hostmakedepends="python-setuptools"
 depends="python-six python-lazy-object-proxy python-wrapt
  python-backports.functools_lru_cache python-enum34 python-singledispatch"
 short_desc="Abstract syntax tree for Python2"
@@ -20,13 +20,3 @@ post_install() {
 	# no tests
 	rm -rf ${DESTDIR}/usr/lib/python*/site-packages/astroid/tests
 }
-
-python3-astroid_package() {
-	archs=noarch
-	pycompile_module="astroid"
-	depends="python3-six python3-lazy-object-proxy python3-wrapt"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python-attrs/template b/srcpkgs/python-attrs/template
index 459200061d0..aaddb13f5be 100644
--- a/srcpkgs/python-attrs/template
+++ b/srcpkgs/python-attrs/template
@@ -1,6 +1,6 @@
 # Template file for 'python-attrs'
 pkgname=python-attrs
-version=18.2.0
+version=19.3.0
 revision=1
 archs=noarch
 wrksrc="attrs-${version}"
@@ -8,12 +8,19 @@ build_style=python-module
 pycompile_module="attr"
 hostmakedepends="python-setuptools python3-setuptools"
 depends="python"
+checkdepends="python-hypothesis python3-hypothesis python-pytest python3-pytest
+ python-zope.interface python3-zope.interface"
 short_desc="Attributes without boilerplate (Python2)"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="MIT"
 homepage="https://attrs.readthedocs.io/"
 distfiles="${PYPI_SITE}/a/attrs/attrs-${version}.tar.gz"
-checksum=10cbf6e27dbce8c30807caf056c8eb50917e0eaafe86347671b57254006c3e69
+checksum=f7b7ce16570fe9965acd6d30101a28f62fb4a7f9e926b3bbc9b61f8b04247e72
+
+pre_check() {
+	# those are python3 only
+	rm tests/test_annotations.py tests/test_init_subclass.py
+}
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python-audioread/template b/srcpkgs/python-audioread/template
index 84e6ccc6473..fc788a2778c 100644
--- a/srcpkgs/python-audioread/template
+++ b/srcpkgs/python-audioread/template
@@ -1,6 +1,6 @@
 # Template file for 'python-audioread'
 pkgname=python-audioread
-version=2.1.6
+version=2.1.8
 revision=1
 archs=noarch
 wrksrc="audioread-${version}"
@@ -10,10 +10,10 @@ hostmakedepends="python-setuptools python3-setuptools"
 depends="python"
 short_desc="Multi-library, cross-platform audio decoding (Python2)"
 maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="https://github.com/sampsyo/audioread/"
 license="MIT"
+homepage="https://github.com/sampsyo/audioread/"
 distfiles="${PYPI_SITE}/a/audioread/audioread-${version}.tar.gz"
-checksum=b0b9270c20833a75ce0d167fb2fdad52ddcd8e8f300be8afad3ac9715850bc50
+checksum=073904fabc842881e07bd3e4a5776623535562f70b1655b635d22886168dd168
 
 post_install() {
 	sed -n '2,13p' decode.py > LICENSE
diff --git a/srcpkgs/python-b2sdk/template b/srcpkgs/python-b2sdk/template
index 21e272fc06d..2a96e335fb5 100644
--- a/srcpkgs/python-b2sdk/template
+++ b/srcpkgs/python-b2sdk/template
@@ -1,6 +1,6 @@
 # Template file for 'python-b2sdk'
 pkgname=python-b2sdk
-version=0.1.8
+version=1.0.0
 revision=1
 archs=noarch
 build_style=python2-module
@@ -14,4 +14,4 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 homepage="https://pypi.org/project/b2sdk"
 distfiles="${PYPI_SITE}/b/b2sdk/b2sdk-${version}.tar.gz"
-checksum=91bcf09a05f5e822f7494824bf2fd75a81ff0035d2670f443a6f89454d18ab31
\ No newline at end of file
+checksum=cc4a30c5082864aa67a77ecb7ecece1ff18bea11fc718a63bdb23eb4b78a7ff1
\ No newline at end of file
diff --git a/srcpkgs/python-bitarray/template b/srcpkgs/python-bitarray/template
index c1e9f6b0f9d..4f2b4ee392c 100644
--- a/srcpkgs/python-bitarray/template
+++ b/srcpkgs/python-bitarray/template
@@ -1,7 +1,7 @@
 # Template file for 'python-bitarray'
 pkgname=python-bitarray
-version=0.8.3
-revision=2
+version=1.0.1
+revision=1
 wrksrc="bitarray-${version}"
 build_style=python-module
 pycompile_module="bitarray"
@@ -12,7 +12,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="Python-2.0"
 homepage="https://github.com/ilanschnell/bitarray"
 distfiles="https://github.com/ilanschnell/bitarray/archive/${version}.tar.gz"
-checksum=14fa725b4225c4c87579218e65d716651aaaf0da5686ff0cc217948c5d178563
+checksum=bc5be12525ba67c6dd1fffc28b4a035aa52139a4be0aa94df1b544074284113e
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python-botocore/template b/srcpkgs/python-botocore/template
index 77f92b00af0..ae1a4c17964 100644
--- a/srcpkgs/python-botocore/template
+++ b/srcpkgs/python-botocore/template
@@ -1,6 +1,6 @@
 # Template file for 'python-botocore'
 pkgname=python-botocore
-version=1.12.148
+version=1.12.243
 revision=1
 archs=noarch
 wrksrc="botocore-${version}"
@@ -13,11 +13,7 @@ maintainer="Robert Lowry <bobertlo@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/boto/botocore"
 distfiles="https://github.com/boto/botocore/archive/${version}.tar.gz"
-checksum=0b439e0ebf65d25b175665141dffd7235c73b923e834f506cb114b436dbd191c
-
-post_install() {
-	vlicense LICENSE.txt
-}
+checksum=d93f06e1a37f87bd3452cdc520a8455a19a57220d8b06bae64677775ca11a72d
 
 python3-botocore_package() {
 	archs=noarch
@@ -26,6 +22,5 @@ python3-botocore_package() {
 	short_desc="${short_desc/Python2/Python3}"
 	pkg_install() {
 		vmove "usr/lib/python3*"
-		vlicense LICENSE.txt
 	}
 }
diff --git a/srcpkgs/python-coverage/template b/srcpkgs/python-coverage/template
index 2d8680e1fd6..df6064b9879 100644
--- a/srcpkgs/python-coverage/template
+++ b/srcpkgs/python-coverage/template
@@ -1,6 +1,6 @@
 # Template file for 'python-coverage'
 pkgname=python-coverage
-version=4.5.3
+version=4.5.4
 revision=1
 wrksrc="${pkgname/python-//}-${version}"
 build_style=python-module
@@ -9,11 +9,11 @@ hostmakedepends="python-setuptools python3-setuptools"
 makedepends="python-devel python3-devel"
 depends="python-setuptools"
 short_desc="Code coverage testing for Python2"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://bitbucket.org/ned/coveragepy"
 distfiles="${PYPI_SITE}/c/coverage/coverage-${version}.tar.gz"
-checksum=9de60893fb447d1e797f6bf08fdf0dbcda0c1e34c1b06c92bd3a363c0ea8c609
+checksum=e07d9f1a23e9e93ab5c62902833bf3e4b1f65502927379148b6622686223125c
 alternatives="coverage:coverage:/usr/bin/coverage2"
 
 python3-coverage_package() {
diff --git a/srcpkgs/python-cram/template b/srcpkgs/python-cram/template
index cd629ba08bc..f1fce32149f 100644
--- a/srcpkgs/python-cram/template
+++ b/srcpkgs/python-cram/template
@@ -9,7 +9,7 @@ pycompile_module="cram"
 hostmakedepends="python-setuptools python3-setuptools"
 depends="python"
 short_desc="Simple testing framework for commandline applications (Python2)"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2"
 homepage="https://bitheap.org/cram/"
 distfiles="${PYPI_SITE}/c/cram/cram-${version}.tar.gz"
diff --git a/srcpkgs/python-cryptography/patches/libressl.patch b/srcpkgs/python-cryptography/patches/libressl.patch
deleted file mode 100644
index 38ee9bce61d..00000000000
--- a/srcpkgs/python-cryptography/patches/libressl.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-$OpenBSD: patch-src__cffi_src_openssl_ssl_py,v 1.2 2019/04/19 10:18:16 sthen Exp $
-
-Index: src/_cffi_src/openssl/ssl.py
---- src/_cffi_src/openssl/ssl.py.orig
-+++ src/_cffi_src/openssl/ssl.py
-@@ -721,9 +721,11 @@ static const long TLS_ST_OK = 0;
- 
- #if CRYPTOGRAPHY_OPENSSL_LESS_THAN_102
- static const long Cryptography_HAS_GENERIC_DTLS_METHOD = 0;
-+#if !CRYPTOGRAPHY_IS_LIBRESSL
- const SSL_METHOD *(*DTLS_method)(void) = NULL;
- const SSL_METHOD *(*DTLS_server_method)(void) = NULL;
- const SSL_METHOD *(*DTLS_client_method)(void) = NULL;
-+#endif
- static const long SSL_OP_NO_DTLSv1 = 0;
- static const long SSL_OP_NO_DTLSv1_2 = 0;
- long (*DTLS_set_link_mtu)(SSL *, long) = NULL;
-
diff --git a/srcpkgs/python-cryptography/template b/srcpkgs/python-cryptography/template
index a7838a514d3..ce3184715dd 100644
--- a/srcpkgs/python-cryptography/template
+++ b/srcpkgs/python-cryptography/template
@@ -1,25 +1,31 @@
 # Template file for 'python-cryptography'
 pkgname=python-cryptography
-version=2.4.2
-revision=2
+version=2.7
+revision=1
 wrksrc="cryptography-${version}"
 build_style=python-module
+pycompile_module="cryptography"
 hostmakedepends="python-setuptools python3-setuptools libressl-devel
  python-enum34 python-ipaddress python-six python3-six python-asn1crypto
  python3-asn1crypto python-cffi python3-cffi python-idna python3-idna"
 makedepends="libressl-devel python-devel python3-devel"
 depends="python-cffi python-asn1crypto python-six python-enum34
  python-idna python-ipaddress"
-pycompile_module="cryptography"
+checkdepends="python-cryptography_vectors python-hypothesis
+ python-iso-8601 python-pretend python-pytest python-pytz
+ python3-cryptography_vectors python3-hypothesis
+ python3-iso-8601 python3-pretend python3-pytest python3-pytz
+ ${depends}"
 short_desc="Python2 library that provides cryptographic recipes and primitives"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/pyca/cryptography"
 license="BSD-3-Clause, Apache-2.0"
+homepage="https://github.com/pyca/cryptography"
 distfiles="${PYPI_SITE}/c/cryptography/cryptography-${version}.tar.gz"
-checksum=05a6052c6a9f17ff78ba78f8e6eb1d777d25db3b763343a1ae89a7a8670386dd
+checksum=e6347742ac8f35ded4a46ff835c60e68c22a536a8ae5c4422966d06946b6d4c6
 
 post_install() {
 	vlicense LICENSE
+	vlicense LICENSE.BSD
 }
 
 python3-cryptography_package() {
@@ -29,5 +35,6 @@ python3-cryptography_package() {
 	pkg_install() {
 		vmove usr/lib/python3*
 		vlicense LICENSE
+		vlicense LICENSE.BSD
 	}
 }
diff --git a/srcpkgs/python-cryptography_vectors/template b/srcpkgs/python-cryptography_vectors/template
new file mode 100644
index 00000000000..d52e5f5e47c
--- /dev/null
+++ b/srcpkgs/python-cryptography_vectors/template
@@ -0,0 +1,30 @@
+# Template file for 'python-cryptography_vectors'
+pkgname=python-cryptography_vectors
+version=2.7
+revision=1
+archs=noarch
+wrksrc="cryptography_vectors-${version}"
+build_style=python-module
+pycompile_module="cryptography_vectors"
+hostmakedepends="python-setuptools python3-setuptools"
+short_desc="Test vectors for python-cryptography"
+maintainer="Piotr Wójcik <chocimier@tlen.pl>"
+license="BSD-3-Clause, Apache-2.0"
+homepage="https://github.com/pyca/cryptography"
+distfiles="${PYPI_SITE}/c/cryptography_vectors/cryptography_vectors-${version}.tar.gz"
+checksum=f12dfb9bd669a68004074cb5b26df6e93ed1a95ebd1a999dff0a840212ff68bc
+
+post_install() {
+	vlicense LICENSE
+	vlicense LICENSE.BSD
+}
+
+python3-cryptography_vectors_package() {
+	pycompile_module="cryptography_vectors"
+	short_desc="${short_desc/python/python3}"
+	pkg_install() {
+		vmove usr/lib/python3*
+		vlicense LICENSE
+		vlicense LICENSE.BSD
+	}
+}
diff --git a/srcpkgs/python-cssselect/template b/srcpkgs/python-cssselect/template
index 43595d806c2..d7dbcebc0ea 100644
--- a/srcpkgs/python-cssselect/template
+++ b/srcpkgs/python-cssselect/template
@@ -1,19 +1,19 @@
 # Template file for 'python-cssselect'
 pkgname=python-cssselect
-version=1.0.3
+version=1.1.0
 revision=1
 archs=noarch
 wrksrc="${pkgname#*-}-${version}"
 build_style=python-module
+pycompile_module="cssselect"
 hostmakedepends="python-setuptools python3-setuptools"
 depends="python"
-pycompile_module="cssselect"
 short_desc="CSS selectors for Python2"
 maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-3-Clause"
 homepage="https://cssselect.readthedocs.io/"
-license="3-clause-BSD"
 distfiles="${PYPI_SITE}/c/${pkgname#*-}/${pkgname#*-}-${version}.tar.gz"
-checksum=066d8bc5229af09617e24b3ca4d52f1f9092d9e061931f4184cd572885c23204
+checksum=f95f8dedd925fd8f54edb3d2dfb44c190d9d18512377d3c1e2388d16126879bc
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python-curl/template b/srcpkgs/python-curl/template
index e96da8d1a18..f1f9051d53a 100644
--- a/srcpkgs/python-curl/template
+++ b/srcpkgs/python-curl/template
@@ -1,6 +1,6 @@
 # Template file for 'python-curl'
 pkgname=python-curl
-version=7.43.0.2
+version=7.43.0.3
 revision=4
 wrksrc="pycurl-${version}"
 build_style=python-module
@@ -8,20 +8,25 @@ pycompile_module="curl"
 hostmakedepends="python-devel python3-devel"
 makedepends="libressl-devel libcurl-devel ${hostmakedepends}"
 short_desc="Python2 interface to cURL library"
-homepage="http://pycurl.io/"
-license="LGPL-2.1, MIT"
 maintainer="Orphaned <orphan@voidlinux.org>"
+license="LGPL-2.1-or-later, MIT"
+homepage="http://pycurl.io/"
 distfiles="${PYPI_SITE}/p/pycurl/pycurl-${version}.tar.gz"
-checksum=0f0cdfc7a92d4f2a5c44226162434e34f7d6967d3af416a6f1448649c09a25a4
+checksum=6f08330c5cf79fa8ef68b9912b9901db7ffd34b63e225dce74db56bb21deda8e
 
 pre_build() {
 	sed -i "/setup_args\['data_files'\] = /d" setup.py
 }
 
+post_install() {
+	vlicense COPYING-MIT
+}
+
 python3-curl_package() {
 	pycompile_module="curl"
 	short_desc="${short_desc/Python2/Python3}"
 	pkg_install() {
 		vmove usr/lib/python3*
+		vlicense COPYING-MIT
 	}
 }
diff --git a/srcpkgs/python-dbus/template b/srcpkgs/python-dbus/template
index c9faed27569..869c10b2969 100644
--- a/srcpkgs/python-dbus/template
+++ b/srcpkgs/python-dbus/template
@@ -1,20 +1,20 @@
 # Template file for 'python-dbus'
 pkgname=python-dbus
-version=1.2.8
+version=1.2.12
 revision=1
-lib32disabled=yes
 wrksrc="dbus-python-${version}"
 build_style=gnu-configure
+pycompile_module="dbus"
 hostmakedepends="pkg-config python-devel python3-devel"
 makedepends="libglib-devel ${hostmakedepends/pkg-config/}"
 depends="python dbus"
-pycompile_module="dbus"
 short_desc="D-Bus Python2 bindings"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://www.freedesktop.org/wiki/Software/DBusBindings"
 distfiles="https://dbus.freedesktop.org/releases/dbus-python/dbus-python-${version}.tar.gz"
-checksum=abf12bbb765e300bf8e2a1b2f32f85949eab06998dbda127952c31cb63957b6f
+checksum=cdd4de2c4f5e58f287b12013ed7b41dee81d503c8d0d2397c5bd2fb01badf260
+lib32disabled=yes
 
 pre_configure() {
 	mkdir -p dbus-${py2_ver}
diff --git a/srcpkgs/python-docutils/template b/srcpkgs/python-docutils/template
index c504eeece0a..62f080f416a 100644
--- a/srcpkgs/python-docutils/template
+++ b/srcpkgs/python-docutils/template
@@ -1,19 +1,19 @@
 # Template file for 'python-docutils'
 pkgname=python-docutils
-version=0.14
+version=0.15.2
 revision=1
 archs=noarch
 wrksrc="docutils-${version}"
 build_style=python-module
+pycompile_module="docutils"
 hostmakedepends="python-setuptools python3-setuptools"
 depends="python"
-pycompile_module="docutils"
 short_desc="Python2 documentation utilities"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="custom:Public Domain, BSD-2-Clause, GPL-3.0-or-later, Python-2.0"
 homepage="http://docutils.sourceforge.net"
-license="Public Domain, 2-clause-BSD, GPL-3, PSF"
 distfiles="${PYPI_SITE}/d/docutils/docutils-${version}.tar.gz"
-checksum=51e64ef2ebfb29cae1faa133b3710143496eca21c530f3f71424d77687764274
+checksum=a2aeea129088da402665e92e0b25b04b073c04b2dce4ab65caaa38b7ce2e1a99
 
 alternatives="
  docutils:rst2html:/usr/bin/rst2html.py2
diff --git a/srcpkgs/python-dogpile.cache/template b/srcpkgs/python-dogpile.cache/template
index a2e4a436f2f..f6e106fb4e8 100644
--- a/srcpkgs/python-dogpile.cache/template
+++ b/srcpkgs/python-dogpile.cache/template
@@ -1,19 +1,19 @@
 # Template file for 'python-dogpile.cache'
 pkgname=python-dogpile.cache
-version=0.7.1
-revision=2
+version=0.8.0
+revision=1
 archs=noarch
 wrksrc="dogpile.cache-${version}"
 build_style=python-module
 pycompile_module="dogpile"
 hostmakedepends="python-setuptools python3-setuptools"
 depends="python python-decorator"
-short_desc="A caching front-end based on the Dogpile lock (Python2)"
+short_desc="Caching front-end based on the Dogpile lock (Python2)"
 maintainer="Daniel Santana <daniel@santana.tech>"
 license="BSD-3-Clause"
 homepage="https://github.com/sqlalchemy/dogpile.cache"
 distfiles="${PYPI_SITE}/d/dogpile.cache/dogpile.cache-${version}.tar.gz"
-checksum=691b7f199561c4bd6e7e96f164a43cc3781b0c87bea29b7d59d859f873fd4a31
+checksum=70f5eae4aec908f76188a2c287e07105f60c05d879bb9a4efcc5ba44563d8de6
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python-dulwich/template b/srcpkgs/python-dulwich/template
index 6f75ae317f4..0bddda65069 100644
--- a/srcpkgs/python-dulwich/template
+++ b/srcpkgs/python-dulwich/template
@@ -1,6 +1,6 @@
 # Template file for 'python-dulwich'
 pkgname=python-dulwich
-version=0.19.11
+version=0.19.13
 revision=1
 wrksrc="dulwich-${version}"
 build_style=python-module
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, Apache-2.0"
 homepage="https://www.dulwich.io/"
 distfiles="${PYPI_SITE}/d/dulwich/dulwich-${version}.tar.gz"
-checksum=afbe070f6899357e33f63f3f3696e601731fef66c64a489dea1bc9f539f4a725
+checksum=aa628449c5f594a9a282f4d9e5993fef65481ef5e3b9b6c52ff31200f8f5dc95
 
 alternatives="
  dulwich:dul-receive-pack:/usr/bin/dul-receive-pack2
diff --git a/srcpkgs/python-ecdsa/template b/srcpkgs/python-ecdsa/template
index a598fe26136..5e0b217fa73 100644
--- a/srcpkgs/python-ecdsa/template
+++ b/srcpkgs/python-ecdsa/template
@@ -1,19 +1,19 @@
 # Template file for 'python-ecdsa'
 pkgname=python-ecdsa
-version=0.13
-revision=3
+version=0.13.2
+revision=1
 archs=noarch
 wrksrc="${pkgname/python-/}-${version}"
 build_style=python-module
+pycompile_module="ecdsa"
 hostmakedepends="python-setuptools python3-setuptools"
 depends="python-six"
-pycompile_module="ecdsa"
 short_desc="Implementation of ECDSA in Python2"
 maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="https://github.com/warner/python-ecdsa/"
 license="MIT"
+homepage="https://github.com/warner/python-ecdsa/"
 distfiles="${PYPI_SITE}/e/ecdsa/ecdsa-${version}.tar.gz"
-checksum=64cf1ee26d1cde3c73c6d7d107f835fed7c6a2904aef9eac223d57ad800c43fa
+checksum=5c034ffa23413ac923541ceb3ac14ec15a0d2530690413bff58c12b80e56d884
 
 pre_build() {
 	# use system six
diff --git a/srcpkgs/python-envdir/template b/srcpkgs/python-envdir/template
index 2ad0366eec9..622fcee6b34 100644
--- a/srcpkgs/python-envdir/template
+++ b/srcpkgs/python-envdir/template
@@ -9,7 +9,7 @@ pycompile_module="envdir"
 hostmakedepends="python-setuptools python3-setuptools"
 depends="python-setuptools"
 short_desc="Python2 port of daemontools' envdir"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/jezdez/envdir"
 distfiles="https://github.com/jezdez/envdir/archive/${version}.tar.gz"
diff --git a/srcpkgs/python-ewmh/template b/srcpkgs/python-ewmh/template
index ad1ea573a10..be6d04316b0 100644
--- a/srcpkgs/python-ewmh/template
+++ b/srcpkgs/python-ewmh/template
@@ -9,7 +9,7 @@ pycompile_module="ewmh"
 hostmakedepends="python-setuptools python3-setuptools"
 depends="python-xlib"
 short_desc="Python2 implementation of EWMH (Extended Window Manager Hints)"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/parkouss/pyewmh"
 distfiles="${PYPI_SITE}/e/ewmh/ewmh-${version}.tar.gz"
diff --git a/srcpkgs/python-flaky/template b/srcpkgs/python-flaky/template
index a2aa653629e..d5211c9cb60 100644
--- a/srcpkgs/python-flaky/template
+++ b/srcpkgs/python-flaky/template
@@ -1,6 +1,6 @@
 # Template file for 'python-flaky'
 pkgname=python-flaky
-version=3.5.3
+version=3.6.1
 revision=1
 archs=noarch
 wrksrc="${pkgname/python-//}-${version}"
@@ -9,11 +9,11 @@ pycompile_module="flaky"
 hostmakedepends="python-setuptools python3-setuptools"
 depends="python"
 short_desc="Plugin for nose/py.test that automatically reruns flaky tests (Python2)"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/box/flaky"
 distfiles="${PYPI_SITE}/f/flaky/flaky-${version}.tar.gz"
-checksum=12bd5e41f372b2190e8d754b6e5829c2f11dbc764e10b30f57e59f829c9ca1da
+checksum=8cd5455bb00c677f787da424eaf8c4a58a922d0e97126d3085db5b279a98b698
 
 python3-flaky_package() {
 	archs=noarch
diff --git a/srcpkgs/python-fonttools/template b/srcpkgs/python-fonttools/template
index 05c31aa35c1..6a222e87482 100644
--- a/srcpkgs/python-fonttools/template
+++ b/srcpkgs/python-fonttools/template
@@ -1,31 +1,31 @@
 # Template file for 'python-fonttools'
 pkgname=python-fonttools
-version=3.43.1
-revision=1
+version=3.44.0
+revision=4
 wrksrc="${pkgname#python-}-${version}"
-build_style=python-module
+build_style=python2-module
 pycompile_module="fonttools"
-hostmakedepends="python-devel python3-devel python-setuptools python3-setuptools"
+hostmakedepends="python-devel python-setuptools"
 makedepends="${hostmakedepends}"
 short_desc="Library to manipulate font files from Python2"
 maintainer="svenper <svenper@tuta.io>"
 license="MIT, OFL-1.1, BSD-3-Clause"
 homepage="https://github.com/fonttools/fonttools"
 distfiles="https://github.com/fonttools/fonttools/archive/${version}.tar.gz"
-checksum=12b05c56ac60fe15b2fce6958df1408e054a403270ddfc05d3a096afe73d9419
+checksum=9dadbca88a5a841d821f6892fa9f4715ec03afd53980aaf4d61bd4be345b24ed
+alternatives="
+	fonttools:fonttools:/usr/bin/fonttools2
+	fonttools:pyftmerge:/usr/bin/pyftmerge2
+	fonttools:pyftsubset:/usr/bin/pyftsubset2
+	fonttools:ttx:/usr/bin/ttx2
+	fonttools:ttx.1:/usr/share/man/man1/ttx2.1"
 
 post_install() {
+	mv ${DESTDIR}/usr/bin/fonttools{,2}
+	mv ${DESTDIR}/usr/bin/pyftmerge{,2}
+	mv ${DESTDIR}/usr/bin/pyftsubset{,2}
+	mv ${DESTDIR}/usr/bin/ttx{,2}
+	mv ${DESTDIR}/usr/share/man/man1/ttx{,2}.1
 	vlicense LICENSE
 	vlicense LICENSE.external
 }
-
-python3-fonttools_package() {
-	pycompile_module="fonttools"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove "usr/lib/python3*"
-		vmove "usr/bin/*3"
-		vlicense LICENSE
-		vlicense LICENSE.external
-	}
-}
diff --git a/srcpkgs/python-fonttools/update b/srcpkgs/python-fonttools/update
new file mode 100644
index 00000000000..2927cb964bf
--- /dev/null
+++ b/srcpkgs/python-fonttools/update
@@ -0,0 +1,3 @@
+# "The v4.x version series only supports Python 3.6 or greater.
+# You can keep using fonttools 3.x if you need support for Python 2."
+ignore="[4-9].* [1-9][0-9]*.*"
diff --git a/srcpkgs/python-gitlab/template b/srcpkgs/python-gitlab/template
index b5840cc04b6..7db583b54c4 100644
--- a/srcpkgs/python-gitlab/template
+++ b/srcpkgs/python-gitlab/template
@@ -1,6 +1,6 @@
 # Template file for 'python-gitlab'
 pkgname=python-gitlab
-version=1.8.0
+version=1.12.1
 revision=1
 archs=noarch
 build_style=python-module
@@ -14,7 +14,7 @@ license="LGPL-3.0-or-later"
 homepage="https://github.com/gpocentek/python-gitlab"
 changelog="https://raw.githubusercontent.com/python-gitlab/python-gitlab/master/ChangeLog.rst"
 distfiles="${PYPI_SITE}/p/python-gitlab/python-gitlab-${version}.tar.gz"
-checksum=a6b03bc53f6e2e22b88d5ff9772b1bb360570ec82752f1def3d6eb60cda093e7
+checksum=984e110c1f76fd939652c30ce3101267a7064e34417cbfc4687e6106d4db54ec
 alternatives="python-gitlab:gitlab:/usr/bin/gitlab2"
 
 do_check() {
diff --git a/srcpkgs/python-google-api-python-client/template b/srcpkgs/python-google-api-python-client/template
index b0fd526e63a..273cd0722b8 100644
--- a/srcpkgs/python-google-api-python-client/template
+++ b/srcpkgs/python-google-api-python-client/template
@@ -1,6 +1,6 @@
 # Template file for 'python-google-api-python-client'
 pkgname=python-google-api-python-client
-version=1.7.10
+version=1.7.11
 revision=1
 archs=noarch
 wrksrc="${pkgname#*-}-${version}"
@@ -14,7 +14,7 @@ maintainer="Peter Bui <pbui@github.bx612.space>"
 license="Apache-2.0"
 homepage="https://github.com/google/google-api-python-client/"
 distfiles="${PYPI_SITE}/g/google-api-python-client/google-api-python-client-${version}.tar.gz"
-checksum=2e55a5c7b56233c68945b6804c73e253445933f4d485d4e69e321b38772b9dd6
+checksum=a8a88174f66d92aed7ebbd73744c2c319b4b1ce828e565f9ec721352d2e2fb8c
 
 python3-google-api-python-client_package() {
 	archs=noarch
diff --git a/srcpkgs/python-grako/template b/srcpkgs/python-grako/template
index 49e01f05815..cc02973b31e 100644
--- a/srcpkgs/python-grako/template
+++ b/srcpkgs/python-grako/template
@@ -9,7 +9,7 @@ hostmakedepends="python-setuptools python3-setuptools python-Cython python3-Cyth
 makedepends="python-devel python3-devel"
 depends="python-setuptools"
 short_desc="Grammar compiler, EBNF input, PEG/Packrat parser output (Python2)"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://bitbucket.org/neogeny/grako"
 distfiles="https://bitbucket.org/neogeny/grako/get/${version}.tar.bz2"
diff --git a/srcpkgs/python-graphviz/template b/srcpkgs/python-graphviz/template
index 772c828335c..521f2e81213 100644
--- a/srcpkgs/python-graphviz/template
+++ b/srcpkgs/python-graphviz/template
@@ -9,7 +9,7 @@ pycompile_module="graphviz"
 hostmakedepends="python-setuptools python3-setuptools"
 depends="graphviz python"
 short_desc="Simple Python2 interface for Graphviz"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/xflr6/graphviz"
 changelog="https://github.com/xflr6/graphviz/blob/master/CHANGES.txt"
diff --git a/srcpkgs/python-guessit/template b/srcpkgs/python-guessit/template
index 62054da1880..5029048a041 100644
--- a/srcpkgs/python-guessit/template
+++ b/srcpkgs/python-guessit/template
@@ -1,6 +1,6 @@
 # Template file for 'python-guessit'
 pkgname=python-guessit
-version=3.0.4
+version=3.1.0
 revision=1
 archs=noarch
 wrksrc="guessit-${version}"
@@ -13,13 +13,9 @@ maintainer="Daniel Santana <daniel@santana.tech>"
 license="LGPL-3.0-only"
 homepage="https://guessit.readthedocs.io/en/latest/"
 distfiles="${PYPI_SITE}/g/guessit/guessit-${version}.tar.gz"
-checksum=37803ec0d7f20f2e1425dfe3bb978dc3b9c65872aa3760c664b31a9115232ec1
+checksum=2dcd3f2acaf6c1a864f903f084ddd6a6b753f3107ae864355d7c8c1e9cb205b2
 alternatives="guessit:guessit:/usr/bin/guessit2"
 
-post_install() {
-	vlicense LICENSE
-}
-
 python3-guessit_package() {
 	archs=noarch
 	pycompile_module="guessit"
@@ -29,6 +25,5 @@ python3-guessit_package() {
 	pkg_install() {
 		vmove usr/bin/guessit3
 		vmove usr/lib/python3*
-		vlicense LICENSE
 	}
 }
diff --git a/srcpkgs/python-html2text/template b/srcpkgs/python-html2text/template
deleted file mode 100644
index bcba0f69e49..00000000000
--- a/srcpkgs/python-html2text/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'python-html2text'
-pkgname=python-html2text
-version=2019.8.11
-revision=1
-archs=noarch
-wrksrc="${pkgname#*-}-${version}"
-build_style=python-module
-pycompile_module="html2text"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="HTML to Markdown-formatted text converter (Python2)"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-3.0-only"
-homepage="https://github.com/Alir3z4/html2text/"
-distfiles="${PYPI_SITE}/h/html2text/html2text-${version}.tar.gz"
-checksum=f516b9c10284174e2a974d86f91cab02b3cf983a17752075da751af0e895ef5e
-alternatives="html2text:html2text:/usr/bin/html2text2"
-
-python3-html2text_package() {
-	archs=noarch
-	depends="python3"
-	pycompile_module="html2text"
-	short_desc="${short_desc/Python2/Python3}"
-	alternatives="html2text:html2text:/usr/bin/html2text3"
-	pkg_install() {
-		vmove usr/bin/html2text3
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python-httmock/template b/srcpkgs/python-httmock/template
index 3f9bc69e1e5..61a60126936 100644
--- a/srcpkgs/python-httmock/template
+++ b/srcpkgs/python-httmock/template
@@ -10,7 +10,7 @@ hostmakedepends="python3-setuptools python-setuptools"
 depends="python-requests"
 checkdepends="python3-requests"
 short_desc="Mocking library for requests (Python2)"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/patrys/httmock"
 distfiles="https://github.com/patrys/httmock/archive/${version}.tar.gz"
diff --git a/srcpkgs/python-httplib2/template b/srcpkgs/python-httplib2/template
index f422b2ca2b2..edcb6abf0c1 100644
--- a/srcpkgs/python-httplib2/template
+++ b/srcpkgs/python-httplib2/template
@@ -1,6 +1,6 @@
 # Template file for 'python-httplib2'
 pkgname=python-httplib2
-version=0.13.0
+version=0.13.1
 revision=1
 archs=noarch
 wrksrc="httplib2-${version}"
@@ -15,7 +15,7 @@ homepage="https://github.com/httplib2/httplib2"
 changelog="https://raw.githubusercontent.com/httplib2/httplib2/master/CHANGELOG"
 distfiles="${PYPI_SITE}/h/httplib2/httplib2-${version}.tar.gz
  https://raw.githubusercontent.com/httplib2/httplib2/master/LICENSE>LICENSE.txt"
-checksum="d1146939d270f1f1eb8cbf8f5aa72ff37d897faccca448582bb1e180aeb4c6b2
+checksum="6901c8c0ffcf721f9ce270ad86da37bc2b4d32b8802d4a9cec38274898a64044
  589eec38f72df2be203711d3b8cbece9b908c5e7ff00bc3cab7f63bae9e366b4"
 
 post_install() {
diff --git a/srcpkgs/python-hypothesis/template b/srcpkgs/python-hypothesis/template
index 3b57658f872..f3eb931e410 100644
--- a/srcpkgs/python-hypothesis/template
+++ b/srcpkgs/python-hypothesis/template
@@ -1,6 +1,6 @@
 # Template file for 'python-hypothesis'
 pkgname=python-hypothesis
-version=4.24.2
+version=4.38.2
 revision=1
 archs=noarch
 wrksrc="hypothesis-hypothesis-python-${version}"
@@ -17,7 +17,7 @@ license="MPL-2.0"
 homepage="https://hypothesis.works/"
 changelog="https://github.com/HypothesisWorks/hypothesis/raw/master/hypothesis-python/docs/changes.rst"
 distfiles="https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-${version}.tar.gz"
-checksum=127f590504b10a7558b51e3e258e5f77c1a97f5708abd1296209132bc6c30e01
+checksum=c53b652ed15350b0116bc1dd28516a71988437da772e25903309aa526f9c719e
 
 do_check() {
 	# In python3 mock is actually unittest.mock
diff --git a/srcpkgs/python-iso-8601/template b/srcpkgs/python-iso-8601/template
new file mode 100644
index 00000000000..a483e55b0bd
--- /dev/null
+++ b/srcpkgs/python-iso-8601/template
@@ -0,0 +1,30 @@
+# Template file for 'python-iso-8601'
+pkgname=python-iso-8601
+version=0.3.0
+revision=1
+archs=noarch
+wrksrc="iso-8601-${version}"
+build_style=python-module
+pycompile_module="iso8601"
+hostmakedepends="python-setuptools python3-setuptools"
+depends="python"
+short_desc="Python2 library that provides cryptographic recipes and primitives"
+maintainer="Piotr Wójcik <chocimier@tlen.pl>"
+license="BSD-2-Clause"
+homepage="https://pypi.org/project/iso-8601/"
+distfiles="${PYPI_SITE}/i/iso-8601/iso-8601-${version}.tar.gz"
+checksum=1b9f74df591812732b69a1cfba5196e176138bf5b0b49a920af5804924cc27e0
+
+post_install() {
+	vlicense PKG-INFO
+}
+
+python3-iso-8601_package() {
+	depends="python3"
+	pycompile_module="iso8601"
+	short_desc="${short_desc/Python2/Python3}"
+	pkg_install() {
+		vmove usr/lib/python3*
+		vlicense PKG-INFO
+	}
+}
diff --git a/srcpkgs/python-iwlib/template b/srcpkgs/python-iwlib/template
index 4498bcf156c..2c58d4c8d29 100644
--- a/srcpkgs/python-iwlib/template
+++ b/srcpkgs/python-iwlib/template
@@ -1,6 +1,6 @@
 # Template file for 'python-iwlib'
 pkgname=python-iwlib
-version=1.6.1
+version=1.6.2
 revision=1
 wrksrc="${pkgname/python-//}-${version}"
 build_style=python-module
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/nathan-hoad/python-iwlib"
 distfiles="${PYPI_SITE}/i/iwlib/iwlib-${version}.tar.gz"
-checksum=fad120e7e36de1c84df6921333035cdaccd28b20e25ba180e9902e810e8dee21
+checksum=7496bcc3f7abb9b23071f83a86b4386fab41852d7ecc7aee05b6e42b832606f3
 nocross=https://build.voidlinux.org/builders/aarch64-musl_builder/builds/11458/steps/shell_3/logs/stdio
 
 do_check() {
diff --git a/srcpkgs/python-jedi/template b/srcpkgs/python-jedi/template
index 48ab3acabf5..136e6adbea4 100644
--- a/srcpkgs/python-jedi/template
+++ b/srcpkgs/python-jedi/template
@@ -1,21 +1,21 @@
 # Template file for 'python-jedi'
 pkgname=python-jedi
-version=0.14.0
+version=0.15.1
 revision=1
 archs=noarch
-_parsover=0.3.0
+_parsover=0.5.0
 wrksrc="jedi-${version}"
 build_style=python-module
 pycompile_module="jedi"
 hostmakedepends="python-setuptools python3-setuptools"
 depends="python-parso>=${_parsover}"
-checkdepends="python3-parso python3-pytest"
+checkdepends="python-parso python3-parso python-pytest python3-pytest"
 short_desc="Autocompletion/static analysis library for Python2"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="MIT"
 homepage="https://jedi.readthedocs.io/"
 distfiles="${PYPI_SITE}/j/jedi/jedi-${version}.tar.gz"
-checksum=49ccb782651bb6f7009810d17a3316f8867dde31654c750506970742e18b553d
+checksum=ba859c74fa3c966a22f2aeebe1b74ee27e2a462f56d3f5f7ca4a59af61bfe42e
 
 post_install() {
 	vlicense LICENSE.txt
diff --git a/srcpkgs/python-jsonschema/template b/srcpkgs/python-jsonschema/template
index 7c00f690fd3..63c30ce6863 100644
--- a/srcpkgs/python-jsonschema/template
+++ b/srcpkgs/python-jsonschema/template
@@ -1,7 +1,8 @@
 # Template file for 'python-jsonschema'
 pkgname=python-jsonschema
+reverts="3.0.2_1"
 version=2.6.0
-revision=2
+revision=3
 archs=noarch
 wrksrc="jsonschema-${version}"
 build_style=python-module
@@ -17,7 +18,7 @@ checksum=6ff5f3180870836cae40f06fa10419f557208175f13ad7bc26caa77beb1f6e02
 alternatives="jsonschema:jsonschema:/usr/bin/jsonschema2"
 
 pre_build() {
-	sed -i setup.py \
+	vsed -i setup.py \
 		-e '/setup_requires/d' \
 		-e '/vcversioner/d' \
 		-e "/name=/a\
diff --git a/srcpkgs/python-kaptan/template b/srcpkgs/python-kaptan/template
index d28a7dbad90..649eeec8568 100644
--- a/srcpkgs/python-kaptan/template
+++ b/srcpkgs/python-kaptan/template
@@ -1,6 +1,6 @@
 # Template file for 'python-kaptan'
 pkgname=python-kaptan
-version=0.5.11
+version=0.5.12
 revision=1
 archs=noarch
 wrksrc="kaptan-${version}"
@@ -13,7 +13,7 @@ maintainer="Alexander Egorenkov <egorenar-dev@posteo.net>"
 license="BSD-3-Clause"
 homepage="https://github.com/emre/kaptan"
 distfiles="${PYPI_SITE}/k/kaptan/kaptan-${version}.tar.gz"
-checksum=8403d6e48200c3f49cb6d6b3dcb5898aa5ab9d820831655bf9a2403e00cd4207
+checksum=@b0714c3c0c58006ca6d9fc5528d103685773ed22496d5dd582fbd7efe6a67c7a
 alternatives="kaptan:kaptan:/usr/bin/kaptan2"
 
 post_install() {
diff --git a/srcpkgs/python-lxml/template b/srcpkgs/python-lxml/template
index af3d5edbce4..c3aeabfbf1b 100644
--- a/srcpkgs/python-lxml/template
+++ b/srcpkgs/python-lxml/template
@@ -1,6 +1,6 @@
 # Template file for 'python-lxml'
 pkgname=python-lxml
-version=4.3.4
+version=4.4.1
 revision=1
 wrksrc="lxml-lxml-${version}"
 build_style=python-module
@@ -10,10 +10,10 @@ makedepends="libxslt-devel python-devel python3-devel"
 checkdepends="python3-cssselect python3-BeautifulSoup4 python3-html5lib"
 short_desc="Python2 binding for the libxml2 and libxslt libraries"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="BSD-3-Clause, ElementTree"
+license="BSD-3-Clause, custom:ElementTree"
 homepage="https://lxml.de/"
 distfiles="https://github.com/lxml/lxml/archive/lxml-${version}.tar.gz"
-checksum=d85812f0630af6c1f916253535fc315ff20c0b9879a15edff3ee750287f283aa
+checksum=a735879b25331bb0c8c115e8aff6250469241fbce98bba192142cd767ff23408
 
 do_check() {
 	cp -f build-3.*/lib.linux-*/lxml/*.so src/lxml
diff --git a/srcpkgs/python-magic/template b/srcpkgs/python-magic/template
index e38b77999a6..98e3c0802ab 100644
--- a/srcpkgs/python-magic/template
+++ b/srcpkgs/python-magic/template
@@ -8,7 +8,7 @@ pycompile_module="magic.py"
 hostmakedepends="python-setuptools python3-setuptools"
 makedepends="python libmagic"
 short_desc="File type identification using libmagic (Python2)"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/ahupp/python-magic"
 distfiles="https://github.com/ahupp/python-magic/archive/${version}.tar.gz"
diff --git a/srcpkgs/python-mechanize/template b/srcpkgs/python-mechanize/template
index 07dedb91df0..c5b2b5789a7 100644
--- a/srcpkgs/python-mechanize/template
+++ b/srcpkgs/python-mechanize/template
@@ -1,20 +1,31 @@
 # Template file for 'python-mechanize'
 pkgname=python-mechanize
-version=0.4.2
-revision=1
+version=0.4.3
+revision=2
 archs=noarch
 wrksrc="mechanize-${version}"
-build_style=python2-module
+build_style=python-module
 pycompile_module="mechanize"
-hostmakedepends="python-setuptools"
+hostmakedepends="python-setuptools python3-setuptools"
 depends="python python-html5lib"
-short_desc="Stateful programmatic web browsing in Python"
+short_desc="Stateful programmatic web browsing (Python2)"
 maintainer="Farhad Shahbazi <grauwolf@geekosphere.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/python-mechanize/mechanize"
 distfiles="https://github.com/python-mechanize/mechanize/archive/v${version}.tar.gz"
-checksum=c14a7899f34b2d8ecc0c5ec8ff26559dc39eba56668697f2e2b008e1cb82e183
+checksum=7c452a3eed7f83a13674027a58a4afe57ca67630d252a789ac1c15dcd55d310c
 
 post_install() {
 	vlicense LICENSE
 }
+
+python3-mechanize_package() {
+	archs=noarch
+	depends="python3 python3-html5lib"
+	pycompile_module="mechanize"
+	short_desc="${short_desc/Python2/Python3}"
+	pkg_install() {
+	vmove usr/lib/python3*
+	vlicense LICENSE
+	}
+}
diff --git a/srcpkgs/python-mock/template b/srcpkgs/python-mock/template
index 6c03a2134b2..95196de39df 100644
--- a/srcpkgs/python-mock/template
+++ b/srcpkgs/python-mock/template
@@ -1,7 +1,7 @@
 # Template file for 'python-mock'
 pkgname=python-mock
-version=2.0.0
-revision=3
+version=3.0.5
+revision=1
 archs=noarch
 wrksrc="${pkgname#*-}-${version}"
 build_style=python2-module
@@ -10,10 +10,10 @@ hostmakedepends="python-pbr python-setuptools"
 depends="python-funcsigs python-pbr python-setuptools python-six"
 short_desc="Rolling backport of unittest.mock for Python2"
 maintainer="Toyam Cox <Vaelatern@gmail.com>"
-homepage="https://github.com/testing-cabal/mock"
 license="BSD-2-Clause"
+homepage="https://github.com/testing-cabal/mock"
 distfiles="${PYPI_SITE}/m/mock/mock-${version}.tar.gz"
-checksum=b158b6df76edd239b8208d481dc46b6afd45a846b7812ff0ce58971cf5bc8bba
+checksum=83657d894c90d5681d62155c82bda9c1187827525880eda8ff5df4ec813437c3
 
 post_install() {
 	vlicense LICENSE.txt LICENSE
diff --git a/srcpkgs/python-nose/template b/srcpkgs/python-nose/template
index 874998f3c40..c9fbe9d28d3 100644
--- a/srcpkgs/python-nose/template
+++ b/srcpkgs/python-nose/template
@@ -9,7 +9,7 @@ pycompile_module="nose"
 hostmakedepends="python-setuptools python3-setuptools"
 depends="python-setuptools"
 short_desc="The nicer testing for Python2"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/nose-devs/nose"
 #changelog="https://raw.githubusercontent.com/nose-devs/nose/master/CHANGELOG"
diff --git a/srcpkgs/python-npyscreen/template b/srcpkgs/python-npyscreen/template
index b1c01d39f7b..0457fa1aaed 100644
--- a/srcpkgs/python-npyscreen/template
+++ b/srcpkgs/python-npyscreen/template
@@ -8,7 +8,7 @@ hostmakedepends="python-setuptools python3-setuptools"
 pycompile_module="npyscreen"
 depends="python"
 short_desc="Python2 widget library and application framework for TUIs"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/bad-day/npyscreen"
 distfiles="https://github.com/bad-day/npyscreen/archive/${version}.tar.gz"
diff --git a/srcpkgs/python-numexpr/template b/srcpkgs/python-numexpr/template
index d506e88ce7a..1db40092411 100644
--- a/srcpkgs/python-numexpr/template
+++ b/srcpkgs/python-numexpr/template
@@ -1,7 +1,7 @@
 # Template file for 'python-numexpr'
 pkgname=python-numexpr
-version=2.6.9
-revision=2
+version=2.7.0
+revision=1
 wrksrc="numexpr-${version}"
 build_style=python-module
 pycompile_module="numexpr"
@@ -10,10 +10,10 @@ makedepends="python-devel python3-devel python-numpy python3-numpy"
 depends="python-numpy"
 short_desc="Fast numerical expression evaluator for NumPy (Python2)"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/pydata/numexpr"
 license="MIT"
+homepage="https://github.com/pydata/numexpr"
 distfiles="${PYPI_SITE}/n/numexpr/numexpr-${version}.tar.gz"
-checksum=fc218b777cdbb14fa8cff8f28175ee631bacabbdd41ca34e061325b6c44a6fa6
+checksum=37324b5981b8962102bdc8640c4f05f5589da5d1df2702418783085cb78ca217
 
 post_install() {
 	vlicense LICENSE.txt
diff --git a/srcpkgs/python-numpy/template b/srcpkgs/python-numpy/template
index 05c348ba915..52308fd2aa6 100644
--- a/srcpkgs/python-numpy/template
+++ b/srcpkgs/python-numpy/template
@@ -1,6 +1,6 @@
 # Template file for 'python-numpy'
 pkgname=python-numpy
-version=1.16.4
+version=1.16.5
 revision=1
 wrksrc="numpy-${version}"
 build_style=python2-module
@@ -12,11 +12,9 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.numpy.org/"
 distfiles="https://github.com/numpy/numpy/archive/v${version}.tar.gz"
-checksum=3bdabda4a2ac4f1986b4bc55f865cd0b68b71edc9420b03e911e0ee52743e9c4
+checksum=3c82a9b8616e3096a79a2af9c288d8ed4013a10fc7baf3eaf54655309734dadd
 alternatives="numpy:f2py:/usr/bin/f2py2"
 
-nocross="https://build.voidlinux.org/builders/armv7l_builder/builds/1408/steps/shell_3/logs/stdio"
-
 post_install() {
 	# create compat symlinks for .h files
 	vmkdir ${py2_inc}
diff --git a/srcpkgs/python-oauthlib/template b/srcpkgs/python-oauthlib/template
index b010053b7ec..5bbaa7df29b 100644
--- a/srcpkgs/python-oauthlib/template
+++ b/srcpkgs/python-oauthlib/template
@@ -1,6 +1,6 @@
 # Template file for 'python-oauthlib'
 pkgname=python-oauthlib
-version=2.1.0
+version=3.1.0
 revision=1
 archs=noarch
 wrksrc="${pkgname#*-}-${version}"
@@ -8,12 +8,12 @@ build_style=python-module
 pycompile_module="oauthlib"
 hostmakedepends="python-setuptools python3-setuptools"
 depends="python"
-short_desc="Python2 implementation of the OAuth request-signing logic"
-maintainer="Eivind Uggedal <eivind@uggedal.com>"
+short_desc="Implementation of the OAuth request-signing logic (Python2)"
+maintainer="bra1nwave <brainwave@openmailbox.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/oauthlib/oauthlib"
 distfiles="${PYPI_SITE}/o/oauthlib/oauthlib-${version}.tar.gz"
-checksum=ac35665a61c1685c56336bda97d5eefa246f1202618a1d6f34fccb1bdd404162
+checksum=bee41cc35fcca6e988463cacc3bcb8a96224f470ca547e697b604cc697b2f889
 
 post_install() {
 	vlicense LICENSE
@@ -25,7 +25,7 @@ python3-oauthlib_package() {
 	pycompile_module="oauthlib"
 	short_desc="${short_desc/Python2/Python3}"
 	pkg_install() {
-		vmove usr/lib/python3*
+		vmove "usr/lib/python3*"
 		vlicense LICENSE
 	}
 }
diff --git a/srcpkgs/python-packaging/template b/srcpkgs/python-packaging/template
index ea71b02dc9b..505631bb29c 100644
--- a/srcpkgs/python-packaging/template
+++ b/srcpkgs/python-packaging/template
@@ -1,19 +1,19 @@
 # Template file for 'python-packaging'
 pkgname=python-packaging
-version=19.0
-revision=1
+version=19.1
+revision=2
 archs=noarch
 wrksrc="packaging-${version}"
 build_style=python-module
 pycompile_module="packaging"
 hostmakedepends="python-setuptools python3-setuptools"
-depends="python-parsing python-six"
+depends="python-attrs python-parsing python-six"
 short_desc="Core utilities for Python packages (Python2)"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="Apache-2.0, BSD-2-Clause"
 homepage="https://github.com/pypa/packaging"
 distfiles="${PYPI_SITE}/p/packaging/packaging-${version}.tar.gz"
-checksum=0c98a5d0be38ed775798ece1b9727178c4469d9c3b4ada66e8e6b7849f8732af
+checksum=c491ca87294da7cc01902edbe30a5bc6c4c28172b5138ab4e4aa1b9d7bfaeafe
 
 post_install() {
 	vlicense LICENSE
@@ -22,7 +22,7 @@ post_install() {
 python3-packaging_package() {
 	archs=noarch
 	pycompile_module="packaging"
-	depends="python3-parsing python3-six"
+	depends="python3-attrs python3-parsing python3-six"
 	short_desc="${short_desc/Python2/Python3}"
 	pkg_install() {
 		vmove usr/lib/python3*
diff --git a/srcpkgs/python-pafy b/srcpkgs/python-pafy
new file mode 120000
index 00000000000..4b7ea2937ae
--- /dev/null
+++ b/srcpkgs/python-pafy
@@ -0,0 +1 @@
+python3-pafy
\ No newline at end of file
diff --git a/srcpkgs/python-pafy/template b/srcpkgs/python-pafy/template
deleted file mode 100644
index 9e18d66c7e4..00000000000
--- a/srcpkgs/python-pafy/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'python-pafy'
-pkgname=python-pafy
-version=0.5.4
-revision=1
-archs=noarch
-wrksrc="pafy-${version}"
-build_style=python-module
-pycompile_module="pafy"
-hostmakedepends="python-setuptools python3-setuptools youtube-dl python3-youtube-dl"
-depends="youtube-dl"
-short_desc="Python2 library to download YouTube content and retrieve metadata"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-3"
-homepage="https://github.com/mps-youtube/pafy"
-distfiles="https://github.com/mps-youtube/pafy/archive/v${version}.tar.gz"
-checksum=a2f9fe7c6175264993190081e1558516b2f2b5987f13a581a55cd9d838df973b
-alternatives="pafy:ytdl:/usr/bin/ytdl2"
-
-python3-pafy_package() {
-	archs=noarch
-	pycompile_module="pafy"
-	depends="python3-youtube-dl"
-	short_desc="${short_desc/2/3/}"
-	alternatives="pafy:ytdl:/usr/bin/ytdl3"
-	pkg_install() {
-		vmove usr/bin/ytdl3
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python-pandas/template b/srcpkgs/python-pandas/template
index c9c68b6cb20..2150461ae59 100644
--- a/srcpkgs/python-pandas/template
+++ b/srcpkgs/python-pandas/template
@@ -1,13 +1,12 @@
 # Template file for 'python-pandas'
 pkgname=python-pandas
 version=0.24.2
-revision=1
+revision=2
 wrksrc="pandas-${version}"
-build_style=python-module
+build_style=python2-module
 pycompile_module="pandas"
-hostmakedepends="python-setuptools python3-setuptools python-Cython python3-Cython"
-makedepends="python-devel python3-devel python-numpy python3-numpy
- python-dateutil python3-dateutil python-pytz python3-pytz"
+hostmakedepends="python-setuptools python-Cython"
+makedepends="python-devel python-numpy python-dateutil python-pytz"
 depends="python-numpy python-dateutil python-pytz"
 short_desc="Python2 data analysis library"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
@@ -19,13 +18,3 @@ checksum=286787f06ac1b7bd322d04f9cf20e14ec3e0bd6b0ec9951456d8c53375545aa1
 post_install() {
 	vlicense LICENSE
 }
-
-python3-pandas_package() {
-	pycompile_module="pandas"
-	depends="python3-numpy python3-dateutil python3-pytz"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python-parsing/template b/srcpkgs/python-parsing/template
index 28160652c41..0cc744eaf79 100644
--- a/srcpkgs/python-parsing/template
+++ b/srcpkgs/python-parsing/template
@@ -1,6 +1,6 @@
 # Template file for 'python-parsing'
 pkgname=python-parsing
-version=2.3.1
+version=2.4.2
 revision=1
 archs=noarch
 wrksrc="pyparsing-pyparsing_${version}"
@@ -14,12 +14,7 @@ license="MIT"
 homepage="https://github.com/pyparsing/pyparsing"
 changelog="https://github.com/pyparsing/pyparsing/raw/master/CHANGES"
 distfiles="https://github.com/pyparsing/pyparsing/archive/pyparsing_${version}.tar.gz"
-checksum=6b4146fb3eb6c4f5798b9f1d67b9609efa106276ac875c534695e55a34409f07
-
-do_check() {
-	python2 unitTests.py
-	python3 unitTests.py
-}
+checksum=fc079f975968ae21f82223ae2340a39e7182ea993631812ddb5978619ed5c456
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python-parso/template b/srcpkgs/python-parso/template
index bb9ea981e32..20e5fe306c0 100644
--- a/srcpkgs/python-parso/template
+++ b/srcpkgs/python-parso/template
@@ -1,6 +1,6 @@
 # Template file for 'python-parso'
 pkgname=python-parso
-version=0.5.0
+version=0.5.1
 revision=1
 archs=noarch
 wrksrc="parso-${version}"
@@ -13,7 +13,7 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="MIT"
 homepage="https://github.com/davidhalter/parso"
 distfiles="${PYPI_SITE}/p/parso/parso-${version}.tar.gz"
-checksum=db5881df1643bf3e66c097bfd8935cf03eae73f4cb61ae4433c9ea4fb6613446
+checksum=666b0ee4a7a1220f65d367617f2cd3ffddff3e205f3f16a0284df30e774c2a9c
 
 post_install() {
 	vlicense LICENSE.txt
diff --git a/srcpkgs/python-pbr/template b/srcpkgs/python-pbr/template
index 5ea2d5e5b24..7ab0b39539f 100644
--- a/srcpkgs/python-pbr/template
+++ b/srcpkgs/python-pbr/template
@@ -1,6 +1,6 @@
 # Template file for 'python-pbr'
 pkgname=python-pbr
-version=5.1.3
+version=5.4.3
 revision=1
 archs=noarch
 wrksrc="pbr-${version}"
@@ -13,7 +13,7 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="Apache-2.0"
 homepage="https://docs.openstack.org/developer/pbr/"
 distfiles="${PYPI_SITE}/p/pbr/pbr-${version}.tar.gz"
-checksum=8c361cc353d988e4f5b998555c88098b9d5964c2e11acf7b0d21925a66bb5824
+checksum=2c8e420cd4ed4cec4e7999ee47409e876af575d4c35a45840d59e8b5f3155ab8
 alternatives="pbr:pbr:/usr/bin/pbr2"
 
 python3-pbr_package() {
diff --git a/srcpkgs/python-pdfrw/template b/srcpkgs/python-pdfrw/template
index 2aaababfc53..ddb43b928fc 100644
--- a/srcpkgs/python-pdfrw/template
+++ b/srcpkgs/python-pdfrw/template
@@ -10,7 +10,7 @@ pycompile_module="pdfrw"
 hostmakedepends="python-setuptools python3-setuptools"
 depends="python"
 short_desc="Pure Python2 library that reads and writes PDFs"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT, BSD-3-Clause"
 homepage="https://github.com/pmaupin/pdfrw"
 distfiles="${PYPI_SITE}/p/pdfrw/pdfrw-${version}.tar.gz"
diff --git a/srcpkgs/python-peewee/template b/srcpkgs/python-peewee/template
index 25a6a8befd0..9b07ed413b9 100644
--- a/srcpkgs/python-peewee/template
+++ b/srcpkgs/python-peewee/template
@@ -1,6 +1,6 @@
 # Template file for 'python-peewee'
 pkgname=python-peewee
-version=3.10.0
+version=3.11.2
 revision=1
 wrksrc="peewee-${version}"
 build_style=python-module
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://github.com/coleifer/peewee"
 changelog="https://raw.githubusercontent.com/coleifer/peewee/master/CHANGELOG.md"
 distfiles="https://github.com/coleifer/peewee/archive/${version}.tar.gz"
-checksum=d296cd2e8509b210a11e5b2a7e28b8ba52516fe22dc78f7062a8d2225c817bfd
+checksum=81e4297ab2482f356a21c5e4bc7a2cc8684f43cd9731b468f386a48d653a043e
 alternatives="peewee:pwiz:/usr/bin/pwiz.py2"
 
 post_install() {
diff --git a/srcpkgs/python-pex/template b/srcpkgs/python-pex/template
index 91b96f7bd36..4beafcf7b4b 100644
--- a/srcpkgs/python-pex/template
+++ b/srcpkgs/python-pex/template
@@ -1,6 +1,6 @@
 # Template file for 'python-pex'
 pkgname=python-pex
-version=1.6.8
+version=1.6.11
 revision=1
 archs=noarch
 wrksrc="pex-${version}"
@@ -13,7 +13,7 @@ maintainer="Daniel Santana <daniel@santana.tech>"
 license="Apache-2.0"
 homepage="https://github.com/pantsbuild/pex"
 distfiles="${PYPI_SITE}/p/pex/pex-${version}.tar.gz"
-checksum=727e8d3910037f5abc15d2846784fe8fbe4485fdeec6385732733772009b2bfe
+checksum=7379ae45179bec744063299305ad3e2e8cca98bd5928a8dcc440400c3838810c
 alternatives="
  pex:pex:/usr/bin/pex2
  pex:pex.1:/usr/share/man/man1/pex2.1"
diff --git a/srcpkgs/python-pexpect/template b/srcpkgs/python-pexpect/template
index 1b729da7274..8d03a1945f3 100644
--- a/srcpkgs/python-pexpect/template
+++ b/srcpkgs/python-pexpect/template
@@ -1,20 +1,20 @@
 # Template file for 'python-pexpect'
 pkgname=python-pexpect
-version=4.6.0
+version=4.7.0
 revision=1
 archs=noarch
-wrksrc="${pkgname/python-}-${version}"
+wrksrc="pexpect-${version}"
 build_style=python-module
+pycompile_module="pexpect"
 hostmakedepends="python-setuptools python3-setuptools"
 depends="python-ptyprocess"
 checkdepends="python3-pytest python3-ptyprocess mdocml"
-pycompile_module="pexpect"
 short_desc="Python2 module for spawning child applications and controlling them"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://pexpect.readthedocs.io/"
 license="ISC"
+homepage="https://pexpect.readthedocs.io/"
 distfiles="${PYPI_SITE}/p/pexpect/pexpect-${version}.tar.gz"
-checksum=2a8e88259839571d1251d278476f3eec5db26deb73a70be5ed5dc5435e418aba
+checksum=9e2c1fd0e6ee3a49b28f95d4b33bc389c89b20af6a1255906e90ff1262ce62eb
 
 do_check() {
 	# the mdcocml is for test
diff --git a/srcpkgs/python-pip/template b/srcpkgs/python-pip/template
index d9343158552..75f11561816 100644
--- a/srcpkgs/python-pip/template
+++ b/srcpkgs/python-pip/template
@@ -1,6 +1,6 @@
 # Template file for 'python-pip'
 pkgname=python-pip
-version=18.1
+version=19.2.3
 revision=1
 archs=noarch
 wrksrc="pip-${version}"
@@ -8,12 +8,12 @@ build_style=python-module
 pycompile_module="pip"
 hostmakedepends="python-setuptools python3-setuptools"
 depends="python-setuptools"
-short_desc="The PyPA recommended tool for installing PyPI packages (Python2)"
+short_desc="PyPA recommended tool for installing PyPI packages (Python2)"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://pip.pypa.io/"
 license="MIT"
+homepage="https://pip.pypa.io/"
 distfiles="${PYPI_SITE}/p/pip/pip-${version}.tar.gz"
-checksum=c0a292bd977ef590379a3f05d7b7f65135487b67470f6281289a94e015650ea1
+checksum=e7a31f147974362e6c82d84b91c7f2bdf57e4d3163d3d454e6c3e71944d67135
 alternatives="pip:pip:/usr/bin/pip2"
 
 post_install() {
diff --git a/srcpkgs/python-prctl/template b/srcpkgs/python-prctl/template
index 60f8a6e5f20..2b420d655cf 100644
--- a/srcpkgs/python-prctl/template
+++ b/srcpkgs/python-prctl/template
@@ -7,7 +7,7 @@ pycompile_module="prctl.py"
 hostmakedepends="python-setuptools python3-setuptools libcap-devel"
 makedepends="libcap-devel python-devel python3-devel"
 short_desc="Python2 interface for the Linux prctl syscall"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/seveas/python-prctl"
 distfiles="https://github.com/seveas/python-prctl/archive/v${version}.tar.gz"
diff --git a/srcpkgs/python-pretend/template b/srcpkgs/python-pretend/template
new file mode 100644
index 00000000000..9a647271b57
--- /dev/null
+++ b/srcpkgs/python-pretend/template
@@ -0,0 +1,32 @@
+# Template file for 'python-pretend'
+pkgname=python-pretend
+version=1.0.9
+revision=1
+archs=noarch
+wrksrc="pretend-${version}"
+build_style=python-module
+pycompile_module="pretend"
+hostmakedepends="python-setuptools python3-setuptools"
+depends="python"
+short_desc="Make stubbing with Python2 easier"
+maintainer="Piotr Wójcik <chocimier@tlen.pl>"
+license="BSD-3-Clause"
+homepage="https://github.com/alex/pretend"
+distfiles="${PYPI_SITE}/p/pretend/pretend-${version}.tar.gz"
+checksum=c90eb810cde8ebb06dafcb8796f9a95228ce796531bc806e794c2f4649aa1b10
+
+post_install() {
+	vdoc README.rst
+	vlicense LICENSE.rst
+}
+
+python3-pretend_package() {
+	depends="python3"
+	pycompile_module="pretend"
+	short_desc="${short_desc/Python2/Python3}"
+	pkg_install() {
+		vmove usr/lib/python3*
+		vdoc README.rst
+		vlicense LICENSE.rst
+	}
+}
diff --git a/srcpkgs/python-prometheus_client/template b/srcpkgs/python-prometheus_client/template
index 699b253e253..46df561f7d4 100644
--- a/srcpkgs/python-prometheus_client/template
+++ b/srcpkgs/python-prometheus_client/template
@@ -1,6 +1,6 @@
 # Template file for 'python-prometheus_client'
 pkgname=python-prometheus_client
-version=0.6.0
+version=0.7.1
 revision=1
 archs=noarch
 wrksrc="prometheus_client-${version}"
@@ -13,7 +13,7 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/prometheus/client_python"
 distfiles="${PYPI_SITE}/p/prometheus_client/prometheus_client-${version}.tar.gz"
-checksum=1b38b958750f66f208bcd9ab92a633c0c994d8859c831f7abc1f46724fcee490
+checksum=71cd24a2b3eb335cb800c7159f423df1bd4dcd5171b234be15e3f31ec9f622da
 
 python3-prometheus_client_package() {
 	archs=noarch
diff --git a/srcpkgs/python-psycopg2/template b/srcpkgs/python-psycopg2/template
index c34c75df913..f41de2880e6 100644
--- a/srcpkgs/python-psycopg2/template
+++ b/srcpkgs/python-psycopg2/template
@@ -1,6 +1,6 @@
 # Template file for 'python-psycopg2'
 pkgname=python-psycopg2
-version=2.8.2
+version=2.8.3
 revision=1
 wrksrc="psycopg2-${version}"
 build_style=python-module
@@ -14,7 +14,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="LGPL-3.0-or-later"
 homepage="http://initd.org/psycopg"
 distfiles="${PYPI_SITE}/p/psycopg2/psycopg2-${version}.tar.gz"
-checksum=5cacf21b6f813c239f100ef78a4132056f93a5940219ec25d2ef833cbeb05588
+checksum=897a6e838319b4bf648a574afb6cabcb17d0488f8c7195100d48d872419f4457
 
 python3-psycopg2_package() {
 	pycompile_module="psycopg2"
diff --git a/srcpkgs/python-pycryptodome/template b/srcpkgs/python-pycryptodome/template
index 0cfabd650a7..f01b5731c45 100644
--- a/srcpkgs/python-pycryptodome/template
+++ b/srcpkgs/python-pycryptodome/template
@@ -1,6 +1,6 @@
 # Template file for 'python-pycryptodome'
 pkgname=python-pycryptodome
-version=3.8.2
+version=3.9.0
 revision=1
 wrksrc="pycryptodome-${version}"
 build_style=python-module
@@ -12,7 +12,7 @@ maintainer="Wietse Kuipers <wietse@kuiprs.nl>"
 license="Public Domain, BSD-2-Clause"
 homepage="https://www.pycryptodome.org/"
 distfiles="${PYPI_SITE}/p/pycryptodome/pycryptodome-${version}.tar.gz"
-checksum=5bc40f8aa7ba8ca7f833ad2477b9d84e1bfd2630b22a46d9bbd221982f8c3ac0
+checksum=dbeb08ad850056747aa7d5f33273b7ce0b9a77910604a1be7b7a6f2ef076213f
 
 provides="python-crypto-${version}_1"
 replaces="python-crypto>=0"
diff --git a/srcpkgs/python-pyglet/template b/srcpkgs/python-pyglet/template
index ee1606d9ba0..f8315bdf616 100644
--- a/srcpkgs/python-pyglet/template
+++ b/srcpkgs/python-pyglet/template
@@ -1,19 +1,19 @@
 # Template file for 'python-pyglet'
 pkgname=python-pyglet
-version=1.3.2
+version=1.4.4
 revision=1
 archs=noarch
 wrksrc="pyglet-${version}"
 build_style=python-module
 pycompile_module="pyglet"
-hostmakedepends="python-setuptools python3-setuptools"
+hostmakedepends="python-setuptools python3-setuptools unzip"
 depends="python"
 short_desc="Cross-platform windowing and multimedia library for Python2"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.pyglet.org"
-distfiles="${PYPI_SITE}/p/pyglet/pyglet-${version}.tar.gz"
-checksum=b00570e7cdf6971af8953b6ece50d83d13272afa5d1f1197c58c0f478dd17743
+distfiles="${PYPI_SITE}/p/pyglet/pyglet-${version}.zip"
+checksum=08353c549b7f26d5815cc2e9360a85e4e0d80e6a67962e18df0255b00cb529ab
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python-pyotp/template b/srcpkgs/python-pyotp/template
index d20586a94b8..54714ee2ebb 100644
--- a/srcpkgs/python-pyotp/template
+++ b/srcpkgs/python-pyotp/template
@@ -1,6 +1,6 @@
 # Template file for 'python-pyotp'
 pkgname=python-pyotp
-version=2.2.7
+version=2.3.0
 revision=1
 archs=noarch
 wrksrc="pyotp-${version}"
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/pyotp/pyotp"
 distfiles="${PYPI_SITE}/p/pyotp/pyotp-${version}.tar.gz"
-checksum=be0ffeabddaa5ee53e7204e7740da842d070cf69168247a3d0c08541b84de602
+checksum=fc537e8acd985c5cbf51e11b7d53c42276fee017a73aec7c07380695671ca1a1
 
 do_check() {
 	python2 -B setup.py test
diff --git a/srcpkgs/python-pytz/template b/srcpkgs/python-pytz/template
index d0e90b5c9d0..d6becf829a7 100644
--- a/srcpkgs/python-pytz/template
+++ b/srcpkgs/python-pytz/template
@@ -1,6 +1,6 @@
 # Template file for 'python-pytz'
 pkgname=python-pytz
-version=2019.1
+version=2019.3
 revision=1
 archs=noarch
 wrksrc="pytz-${version}"
@@ -13,7 +13,7 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="MIT"
 homepage="https://pythonhosted.org/pytz/"
 distfiles="${PYPI_SITE}/p/pytz/pytz-${version}.tar.gz"
-checksum=d747dd3d23d77ef44c6a3526e274af6efeb0a6f1afd5a69ba4d5be4098c8e141
+checksum=b02c06db6cf09c12dd25137e563b31700d3b80fcc4ad23abb7a315f2789819be
 
 post_install() {
 	# use system tz database
diff --git a/srcpkgs/python-rarfile/template b/srcpkgs/python-rarfile/template
index 7505d303395..e0c597c1fb1 100644
--- a/srcpkgs/python-rarfile/template
+++ b/srcpkgs/python-rarfile/template
@@ -1,6 +1,6 @@
 # Template file for 'python-rarfile'
 pkgname=python-rarfile
-version=3.0
+version=3.1
 revision=1
 archs=noarch
 wrksrc="rarfile-${version}"
@@ -13,7 +13,7 @@ maintainer="Daniel Santana <daniel@santana.tech>"
 license="ISC"
 homepage="https://github.com/markokr/rarfile"
 distfiles="${PYPI_SITE}/r/rarfile/rarfile-${version}.tar.gz"
-checksum=e816409e3b36794507cbe0b678bed3e4703d7412c5f7f9201a510ed6fdc66c35
+checksum=dc1062176c529f417522af7da1291a35b85c8017464e665aabce048cfe2659b6
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python-rebulk/template b/srcpkgs/python-rebulk/template
index 51cfd5ff952..1cf6cf623c8 100644
--- a/srcpkgs/python-rebulk/template
+++ b/srcpkgs/python-rebulk/template
@@ -1,6 +1,6 @@
 # Template file for 'python-rebulk'
 pkgname=python-rebulk
-version=1.0.0
+version=2.0.0
 revision=1
 archs=noarch
 wrksrc="rebulk-${version}"
@@ -13,7 +13,7 @@ maintainer="Daniel Santana <daniel@santana.tech>"
 license="MIT"
 homepage="https://github.com/Toilal/rebulk"
 distfiles="${PYPI_SITE}/r/rebulk/rebulk-${version}.tar.gz"
-checksum=1d49e4f7ef6fb874e60efccacbbe661092fabdb7770cdf7f7de4516d50535998
+checksum=1b0d526859ef3e8647f37c606d7ae7c32259e370b3f1519e4219a3ba72740aec
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python-regex/template b/srcpkgs/python-regex/template
index 7036a927150..33e99b0127b 100644
--- a/srcpkgs/python-regex/template
+++ b/srcpkgs/python-regex/template
@@ -1,15 +1,35 @@
 # Template file for 'python-regex'
 pkgname=python-regex
-version=2019.04.14
+version=2019.08.19
 revision=1
 wrksrc="regex-${version}"
-build_style=python2-module
+build_style=python-module
 pycompile_module="_regex_core.py regex.py test_regex.py"
 hostmakedepends="python-devel python3-devel"
 makedepends="python-devel python3-devel"
 short_desc="Alternative regular expression module (Python2)"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="PSF"
+license="Python-2.0"
 homepage="https://pypi.org/project/regex/"
 distfiles="${PYPI_SITE}/r/regex/regex-${version}.tar.gz"
-checksum=d56ce4c7b1a189094b9bee3b81c4aeb3f1ba3e375e91627ec8561b6ab483d0a8
+checksum=587b62d48ca359d2d4f02d486f1f0aa9a20fbaf23a9d4198c4bed72ab2f6c849
+
+post_install() {
+	local i
+	for i in docs/*.* ; do
+		vdoc $i
+	done
+}
+
+python3-regex_package() {
+	depends="python3"
+	pycompile_module="_regex_core.py regex.py test_regex.py"
+	short_desc="${short_desc/Python2/Python3}"
+	pkg_install() {
+	vmove usr/lib/python3*
+	local i
+	for i in docs/*.* ; do
+		vdoc $i
+	done
+	}
+}
diff --git a/srcpkgs/python-requests-oauthlib/template b/srcpkgs/python-requests-oauthlib/template
index 6b12e84f152..b011ea17a36 100644
--- a/srcpkgs/python-requests-oauthlib/template
+++ b/srcpkgs/python-requests-oauthlib/template
@@ -1,6 +1,6 @@
 # Template file for 'python-requests-oauthlib'
 pkgname=python-requests-oauthlib
-version=1.1.0
+version=1.2.0
 revision=1
 archs=noarch
 wrksrc="${pkgname#*-}-${version}"
@@ -9,11 +9,11 @@ pycompile_module="requests_oauthlib"
 hostmakedepends="python-setuptools python3-setuptools"
 depends="python-requests python-oauthlib"
 short_desc="OAuthlib authentication support for Requests (Python2)"
-maintainer="Eivind Uggedal <eivind@uggedal.com>"
+maintainer="bra1nwave <brainwave@openmailbox.org>"
 license="ISC"
 homepage="https://github.com/requests/requests-oauthlib"
 distfiles="${PYPI_SITE}/r/requests-oauthlib/requests-oauthlib-${version}.tar.gz"
-checksum=eabd8eb700ebed81ba080c6ead96d39d6bdc39996094bd23000204f6965786b0
+checksum=bd6533330e8748e94bf0b214775fed487d309b8b8fe823dc45641ebcd9a32f57
 
 post_install() {
 	vlicense LICENSE
@@ -25,7 +25,7 @@ python3-requests-oauthlib_package() {
 	pycompile_module="requests_oauthlib"
 	short_desc="${short_desc/Python2/Python3}"
 	pkg_install() {
-		vmove usr/lib/python3*
+		vmove "usr/lib/python3*"
 		vlicense LICENSE
 	}
 }
diff --git a/srcpkgs/python-requests/template b/srcpkgs/python-requests/template
index c3446cdd356..fc806b611e9 100644
--- a/srcpkgs/python-requests/template
+++ b/srcpkgs/python-requests/template
@@ -1,6 +1,6 @@
 # Template file for 'python-requests'
 pkgname=python-requests
-version=2.21.0
+version=2.22.0
 revision=1
 archs=noarch
 wrksrc="requests-${version}"
@@ -10,13 +10,13 @@ hostmakedepends="python-setuptools python3-setuptools"
 depends="ca-certificates python-chardet python-urllib3 python-idna"
 short_desc="Python2 HTTP library for human beings"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="http://python-requests.org/"
 license="Apache-2.0"
+homepage="http://python-requests.org/"
 distfiles="${PYPI_SITE}/r/requests/requests-${version}.tar.gz"
-checksum=502a824f31acdacb3a35b6690b5fbf0bc41d63a24a45c4004352b0242707598e
+checksum=11e007a8a2aa0323f5a921e9e6a2d7e4e67d9877e85773fba9ba6419025cbeb4
 
 pre_build() {
-	sed -i '/certifi/d' setup.py
+	vsed -i '/certifi/d' setup.py
 }
 
 python3-requests_package() {
diff --git a/srcpkgs/python-rfc6555/template b/srcpkgs/python-rfc6555/template
new file mode 100644
index 00000000000..c3babc25b93
--- /dev/null
+++ b/srcpkgs/python-rfc6555/template
@@ -0,0 +1,25 @@
+# Template file for 'python-rfc6555'
+pkgname=python-rfc6555
+version=0.0.0
+revision=1
+archs=noarch
+wrksrc="rfc6555-${version}"
+build_style=python-module
+pycompile_module="rfc6555"
+hostmakedepends="python-setuptools python3-setuptools"
+depends="python-selectors2"
+short_desc="Python2 implementation of the Happy Eyeballs Algorithm"
+maintainer="Peter Bui <pbui@github.bx612.space>"
+license="Apache-2.0"
+homepage="https://github.com/sethmlarson/rfc6555"
+distfiles="${PYPI_SITE}/r/rfc6555/rfc6555-${version}.tar.gz"
+checksum=191cbba0315b53654155321e56a93466f42cd0a474b4f341df4d03264dcb5217
+
+python3-rfc6555_package() {
+	archs=noarch
+	pycompile_module="rfc6555"
+	short_desc="${short_desc/Python2/Python3}"
+	pkg_install() {
+		vmove usr/lib/python3*
+	}
+}
diff --git a/srcpkgs/python-s3transfer/template b/srcpkgs/python-s3transfer/template
index 0072389ca26..e306c3c3b1a 100644
--- a/srcpkgs/python-s3transfer/template
+++ b/srcpkgs/python-s3transfer/template
@@ -1,6 +1,6 @@
 # Template file for 'python-s3transfer'
 pkgname=python-s3transfer
-version=0.2.0
+version=0.2.1
 revision=1
 archs=noarch
 wrksrc="s3transfer-${version}"
@@ -13,11 +13,7 @@ maintainer="Robert Lowry <bobertlo@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/boto/s3transfer"
 distfiles="https://github.com/boto/s3transfer/archive/${version}.tar.gz"
-checksum=fe96e25f89f405e22a0283df8eefe1b0d2c998eab01c6c8f39923e16faf78522
-
-post_install() {
-	vlicense LICENSE.txt
-}
+checksum=4181e0cf31d1ff1c8233ddda7cc7efa5dd0cf9a1e47143b951a3389ff6812660
 
 python3-s3transfer_package() {
 	archs=noarch
@@ -26,6 +22,5 @@ python3-s3transfer_package() {
 	short_desc="${short_desc/Python2/Python3}"
 	pkg_install() {
 		vmove "usr/lib/python3*"
-		vlicense LICENSE.txt
 	}
 }
diff --git a/srcpkgs/python-scikit-learn/template b/srcpkgs/python-scikit-learn/template
deleted file mode 100644
index 88d794612d7..00000000000
--- a/srcpkgs/python-scikit-learn/template
+++ /dev/null
@@ -1,30 +0,0 @@
-# Template file for 'python-scikit-learn'
-pkgname=python-scikit-learn
-version=0.20.2
-revision=2
-wrksrc="scikit-learn-${version}"
-build_style=python-module
-pycompile_module="sklearn"
-hostmakedepends="python-setuptools python3-setuptools python-Cython python3-Cython"
-makedepends="python-devel python3-devel python-scipy python3-scipy"
-depends="python-scipy"
-short_desc="Python2 modules for machine learning and data mining"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://scikit-learn.org/"
-license="BSD-3-Clause"
-distfiles="https://github.com/scikit-learn/scikit-learn/archive/${version}.tar.gz"
-checksum=a5df291430f7b2d4e1b0d95680d49f170f28e37cf6594c0b7fc5e4f17330d0b0
-
-post_install() {
-	vlicense COPYING
-}
-
-python3-scikit-learn_package() {
-	depends="python3-scipy"
-	pycompile_module="sklearn"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense COPYING
-	}
-}
diff --git a/srcpkgs/python-scipy/template b/srcpkgs/python-scipy/template
deleted file mode 100644
index adbc6de4d52..00000000000
--- a/srcpkgs/python-scipy/template
+++ /dev/null
@@ -1,33 +0,0 @@
-# Template file for 'python-scipy'
-pkgname=python-scipy
-version=1.2.2
-revision=1
-wrksrc="scipy-${version}"
-build_style=python-module
-pycompile_module="scipy"
-hostmakedepends="python-setuptools python3-setuptools
- python-Cython python3-Cython gcc-fortran"
-makedepends="python-devel python3-devel python-numpy python3-numpy lapack-devel"
-depends="python-numpy"
-short_desc="Scientific library for Python2"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://scipy.org/scipylib/"
-license="BSD-3-Clause"
-distfiles="https://github.com/scipy/scipy/archive/v${version}.tar.gz"
-checksum=bc8c1364b365e741a9ba5ed67496eacc8565c67d1e0b82be0f203384f05d8026
-
-LDFLAGS="-shared"
-
-post_install() {
-	vlicense LICENSE.txt
-}
-
-python3-scipy_package() {
-	pycompile_module="scipy"
-	depends="python3-numpy"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE.txt
-	}
-}
diff --git a/srcpkgs/python-setuptools/template b/srcpkgs/python-setuptools/template
index 59f10e20c64..382a9b45bcd 100644
--- a/srcpkgs/python-setuptools/template
+++ b/srcpkgs/python-setuptools/template
@@ -1,22 +1,22 @@
 # Template file for 'python-setuptools'
 pkgname=python-setuptools
-version=40.6.3
+version=41.2.0
 revision=2
 archs=noarch
 wrksrc="setuptools-${version}"
 build_style=python-module
+pycompile_module="pkg_resources setuptools easy_install.py"
 hostmakedepends="unzip python-devel python3-devel"
 depends="python"
-pycompile_module="pkg_resources setuptools easy_install.py"
-provides="python-distribute-${version}_1"
-replaces="python-distribute>=0"
 short_desc="Easily build and distribute Python2 packages"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/pypa/setuptools"
 license="MIT"
+homepage="https://github.com/pypa/setuptools"
 distfiles="${PYPI_SITE}/s/setuptools/setuptools-${version}.zip"
-checksum=3b474dad69c49f0d2d86696b68105f3a6f195f7ab655af12ef9a9c326d2b08f8
+checksum=66b86bbae7cc7ac2e867f52dc08a6bd064d938bac59dfec71b9b565dd36d6012
 alternatives="setuptools:easy_install:/usr/bin/easy_install2"
+provides="python-distribute-${version}_1"
+replaces="python-distribute>=0"
 
 export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0
 export SETUPTOOLS_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
diff --git a/srcpkgs/python-snappy/template b/srcpkgs/python-snappy/template
index 7a27e7e4bb0..ac386f64fae 100644
--- a/srcpkgs/python-snappy/template
+++ b/srcpkgs/python-snappy/template
@@ -7,7 +7,7 @@ pycompile_module="snappy"
 hostmakedepends="python-setuptools python3-setuptools"
 makedepends="python-devel python3-devel snappy-devel"
 short_desc="Python2 bindings for the snappy compression library from Google"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/andrix/python-snappy"
 distfiles="${PYPI_SITE}/p/${pkgname}/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/python-soupsieve/template b/srcpkgs/python-soupsieve/template
index cc1e5eea884..586553ca759 100644
--- a/srcpkgs/python-soupsieve/template
+++ b/srcpkgs/python-soupsieve/template
@@ -1,6 +1,6 @@
 # Template file for 'python-soupsieve'
 pkgname=python-soupsieve
-version=1.9.3
+version=1.9.4
 revision=1
 archs=noarch
 wrksrc="soupsieve-${version}"
@@ -15,7 +15,7 @@ maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"
 license="MIT"
 homepage="https://facelessuser.github.io/soupsieve/"
 distfiles="${PYPI_SITE}/s/soupsieve/soupsieve-${version}.tar.gz"
-checksum=8662843366b8d8779dec4e2f921bebec9afd856a5ff2e82cd419acc5054a1a92
+checksum=605f89ad5fdbfefe30cdc293303665eff2d188865d4dbe4eb510bba1edfbfce3
 
 do_check() {
 	PY2PATH="${PWD}/build-2.7/lib"
diff --git a/srcpkgs/python-tmuxp/template b/srcpkgs/python-tmuxp/template
index 671d243a749..00c86730cbe 100644
--- a/srcpkgs/python-tmuxp/template
+++ b/srcpkgs/python-tmuxp/template
@@ -1,6 +1,6 @@
 # Template file for 'python-tmuxp'
 pkgname=python-tmuxp
-version=1.5.1
+version=1.5.3
 revision=1
 archs=noarch
 wrksrc="tmuxp-${version}"
@@ -13,7 +13,7 @@ maintainer="Alexander Egorenkov <egorenar-dev@posteo.net>"
 license="MIT"
 homepage="https://github.com/tmux-python/tmuxp/"
 distfiles="${PYPI_SITE}/t/tmuxp/tmuxp-${version}.tar.gz"
-checksum=0a8bb0d65d9a816f0f4ac9617904596f65865093fd13118e2b5a856f48ac52e8
+checksum=c1092d55d946e9635f19e4e46050cbe0785b7012545102eddf4d0c3872c1b66f
 alternatives="tmuxp:tmuxp:/usr/bin/tmuxp2"
 
 pre_configure() {
diff --git a/srcpkgs/python-tornado/template b/srcpkgs/python-tornado/template
index e4c8c9e0b5d..7e5700177f5 100644
--- a/srcpkgs/python-tornado/template
+++ b/srcpkgs/python-tornado/template
@@ -1,7 +1,7 @@
 # Template file for 'python-tornado'
 pkgname=python-tornado
-version=4.5.3
-revision=2
+version=5.1.1
+revision=1
 wrksrc="tornado-${version}"
 build_style=python-module
 pycompile_module="tornado"
@@ -10,10 +10,10 @@ makedepends="python-devel python3-devel"
 depends="ca-certificates python-singledispatch python-backports_abc"
 short_desc="Python2 web framework and asynchronous networking library"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="http://www.tornadoweb.org/"
 license="Apache-2.0"
+homepage="http://www.tornadoweb.org/"
 distfiles="${PYPI_SITE}/t/tornado/tornado-${version}.tar.gz"
-checksum=6d14e47eab0e15799cf3cdcc86b0b98279da68522caace2bd7ce644287685f0a
+checksum=4e5158d97583502a7e2739951553cbd88a72076f152b4b11b64b9a10c4c49409
 
 pre_build() {
 	# use system ca-certificates
diff --git a/srcpkgs/python-tqdm/template b/srcpkgs/python-tqdm/template
index b7e39daf2b5..69369bfd6b9 100644
--- a/srcpkgs/python-tqdm/template
+++ b/srcpkgs/python-tqdm/template
@@ -1,6 +1,6 @@
 # Template file for 'python-tqdm'
 pkgname=python-tqdm
-version=4.33.0
+version=4.36.1
 revision=1
 archs=noarch
 wrksrc="tqdm-${version}"
@@ -13,7 +13,7 @@ maintainer="bra1nwave <brainwave@openmailbox.org>"
 license="MPL-2.0, MIT"
 homepage="https://tqdm.github.io/"
 distfiles="https://github.com/tqdm/tqdm/archive/v${version}.tar.gz"
-checksum=d496966b62045c8ec0461acb69a63280fc22dfb155ec39deb21f0ed19b77297c
+checksum=b34944a6c554932527dfe58473cd143f1672e3e5592274948ec035b31f437018
 alternatives="
  tqdm:tqdm:/usr/bin/tqdm2
  tqdm:tqdm.1:/usr/share/man/man1/tqdm2.1"
diff --git a/srcpkgs/python-traitlets/template b/srcpkgs/python-traitlets/template
index f9c7a42ed7a..d2d1b85edb6 100644
--- a/srcpkgs/python-traitlets/template
+++ b/srcpkgs/python-traitlets/template
@@ -1,19 +1,19 @@
 # Template file for 'python-traitlets'
 pkgname=python-traitlets
-version=4.3.2
-revision=2
+version=4.3.3
+revision=1
 archs=noarch
 wrksrc="traitlets-${version}"
 build_style=python-module
+pycompile_module="traitlets"
 hostmakedepends="python-setuptools python3-setuptools"
 depends="python-decorator python-ipython_genutils python-six python-enum34"
-pycompile_module="traitlets"
 short_desc="Configuration system for Python2 applications"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="BSD-3-Clause"
 homepage="https://github.com/ipython/traitlets"
-license="3-clause-BSD"
 distfiles="${PYPI_SITE}/t/traitlets/traitlets-${version}.tar.gz"
-checksum=9c4bd2d267b7153df9152698efb1050a5d84982d3384a37b2c1f7723ba3e7835
+checksum=d023ee369ddd2763310e4c3eae1ff649689440d4ae59d7485eb4cfbbe3e359f7
 
 post_install() {
 	vlicense COPYING.md LICENSE
diff --git a/srcpkgs/python-tweepy/template b/srcpkgs/python-tweepy/template
index a819ecb2d6f..ef61039dac5 100644
--- a/srcpkgs/python-tweepy/template
+++ b/srcpkgs/python-tweepy/template
@@ -9,7 +9,7 @@ pycompile_module="tweepy"
 hostmakedepends="python-setuptools python3-setuptools"
 depends="python-requests-oauthlib python-six python-pysocks"
 short_desc="Twitter library for Python2"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/tweepy/tweepy"
 distfiles="${PYPI_SITE}/t/tweepy/tweepy-${version}.tar.gz
diff --git a/srcpkgs/python-urllib3/template b/srcpkgs/python-urllib3/template
index ef3e3e30e2a..8056518c9c1 100644
--- a/srcpkgs/python-urllib3/template
+++ b/srcpkgs/python-urllib3/template
@@ -1,6 +1,6 @@
 # Template file for 'python-urllib3'
 pkgname=python-urllib3
-version=1.24.3
+version=1.25.3
 revision=1
 archs=noarch
 wrksrc="urllib3-${version}"
@@ -13,7 +13,7 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="MIT"
 homepage="https://urllib3.readthedocs.io/"
 distfiles="${PYPI_SITE}/u/urllib3/urllib3-${version}.tar.gz"
-checksum=2393a695cd12afedd0dcb26fe5d50d0cf248e5a66f75dbd89a3d4eb333a61af4
+checksum=dbe59173209418ae49d485b87d1681aefa36252ee85884c31346debd19463232
 
 post_install() {
 	# replace bundled copy of six
diff --git a/srcpkgs/python-virtualenv/template b/srcpkgs/python-virtualenv/template
index c0257df5d89..1f9166e79a2 100644
--- a/srcpkgs/python-virtualenv/template
+++ b/srcpkgs/python-virtualenv/template
@@ -1,6 +1,6 @@
 # Template file for 'python-virtualenv'
 pkgname=python-virtualenv
-version=16.1.0
+version=16.7.5
 revision=1
 archs=noarch
 wrksrc="virtualenv-${version}"
@@ -10,10 +10,10 @@ hostmakedepends="python-setuptools python3-setuptools"
 depends="python-setuptools"
 short_desc="Virtual Python2 environment builder"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://virtualenv.pypa.io/"
 license="MIT"
+homepage="https://virtualenv.pypa.io/"
 distfiles="${PYPI_SITE}/v/virtualenv/virtualenv-${version}.tar.gz"
-checksum=f899fafcd92e1150f40c8215328be38ff24b519cd95357fa6e78e006c7638208
+checksum=f78d81b62d3147396ac33fc9d77579ddc42cc2a98dd9ea38886f616b33bc7fb2
 alternatives="virtualenv:virtualenv:/usr/bin/virtualenv2"
 
 post_install() {
diff --git a/srcpkgs/python-vispy/template b/srcpkgs/python-vispy/template
index 19ecb746f03..b757e5a271f 100644
--- a/srcpkgs/python-vispy/template
+++ b/srcpkgs/python-vispy/template
@@ -1,19 +1,19 @@
 # Template file for 'python-vispy'
 pkgname=python-vispy
-version=0.5.3
+version=0.6.1
 revision=1
-archs=noarch
-pycompile_module="vispy"
-build_style=python-module
 wrksrc="vispy-${version}"
+build_style=python-module
+pycompile_module="vispy"
 hostmakedepends="python-setuptools python3-setuptools"
+makedepends="python3-numpy python-numpy python-Cython python3-Cython python-devel python3-devel"
 depends="python-numpy"
 short_desc="Python2 library for interactive scientific visualization"
 maintainer="johannes <johannes.brechtmann@gmail.com>"
 license="BSD-3-Clause"
 homepage="http://vispy.org"
 distfiles="${PYPI_SITE}/v/vispy/vispy-${version}.tar.gz"
-checksum=f6c36408df851b91322c928aadb2c8aaf3b31150e11f723784cc81b6280fdcc0
+checksum=8f4cf863a1c6142338d06cf3f824e75373dd45a4ce9a9a133e1c36b662f49aa1
 
 post_install() {
 	vlicense LICENSE.txt
diff --git a/srcpkgs/python-xmltodict/template b/srcpkgs/python-xmltodict/template
index 5be3122a765..a48e6d46aa6 100644
--- a/srcpkgs/python-xmltodict/template
+++ b/srcpkgs/python-xmltodict/template
@@ -10,7 +10,7 @@ hostmakedepends="python-setuptools python3-setuptools"
 depends="python"
 checkdepends="python3-nose"
 short_desc="Python2 module that makes working with XML feel like working JSON"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/martinblech/xmltodict"
 distfiles="${PYPI_SITE}/x/xmltodict/xmltodict-${version}.tar.gz"
diff --git a/srcpkgs/python-yaml/template b/srcpkgs/python-yaml/template
index 2f776a6f800..8a7caf1d99e 100644
--- a/srcpkgs/python-yaml/template
+++ b/srcpkgs/python-yaml/template
@@ -1,18 +1,18 @@
 # Template file for 'python-yaml'
 pkgname=python-yaml
-version=3.13
-revision=2
+version=5.1.2
+revision=1
 wrksrc="PyYAML-${version}"
 build_style=python-module
 pycompile_module="yaml"
 hostmakedepends="python-setuptools python3-setuptools"
 makedepends="libyaml-devel python-devel python3-devel"
 short_desc="YAML parser and emitter for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Peter Bui <pbui@github.bx612.space>"
 license="MIT"
 homepage="http://pyyaml.org/wiki/PyYAML"
 distfiles="${PYPI_SITE}/P/PyYAML/PyYAML-${version}.tar.gz"
-checksum=3ef3092145e9b70e3ddd2c7ad59bdd0252a94dfe3949721633e41344de00a6bf
+checksum=01adf0b6c6f61bd11af6e10ca52b7d4057dd0be0343eb9283c878cf3af56aee4
 
 do_check() {
 	python3 setup.py test
diff --git a/srcpkgs/python-zeroconf/template b/srcpkgs/python-zeroconf/template
deleted file mode 100644
index 8c0034d2917..00000000000
--- a/srcpkgs/python-zeroconf/template
+++ /dev/null
@@ -1,21 +0,0 @@
-# Template file for 'python-zeroconf'
-pkgname=python-zeroconf
-version=0.19.1
-revision=3
-archs=noarch
-build_style=python2-module
-pycompile_module="zeroconf.py"
-hostmakedepends="python-setuptools"
-depends="python-netifaces python-six python-enum34"
-short_desc="Pure Python2 implementation of multicast DNS service discovery"
-maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
-license="LGPL-2.1-or-later"
-homepage="https://github.com/jstasiak/python-zeroconf/"
-distfiles="https://github.com/jstasiak/python-zeroconf/archive/${version}.tar.gz"
-checksum="ca8952a3eb04818dcb566e1344f2f15b5dd6d487770384651cdfae777d5eb848"
-
-pre_build() {
-	# Remove enum-compat from install_requires, it's a virtual package.
-	# Also, no need for enum-compat on Python 3.4+.
-	sed -i '/enum-compat/d' setup.py
-}
diff --git a/srcpkgs/python-zeroconf/update b/srcpkgs/python-zeroconf/update
deleted file mode 100644
index 80e286a5a0e..00000000000
--- a/srcpkgs/python-zeroconf/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="0.2*"
diff --git a/srcpkgs/python3-CherryPy/template b/srcpkgs/python3-CherryPy/template
index af8be4ee59e..b78c01eba2c 100644
--- a/srcpkgs/python3-CherryPy/template
+++ b/srcpkgs/python3-CherryPy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-CherryPy'
 pkgname=python3-CherryPy
-version=18.1.2
+version=18.3.0
 revision=1
 archs=noarch
 wrksrc="CherryPy-${version}"
@@ -12,8 +12,9 @@ short_desc="Object-oriented HTTP framework (Python3)"
 maintainer="bra1nwave <brainwave@openmailbox.org>"
 license="BSD-3-Clause"
 homepage="https://cherrypy.org/"
+changelog="https://raw.githubusercontent.com/cherrypy/cherrypy/master/CHANGES.rst"
 distfiles="${PYPI_SITE}/C/CherryPy/CherryPy-${version}.tar.gz"
-checksum=48de31ba3db04c5354a0fcf8acf21a9c5190380013afca746d50237c9ebe70f0
+checksum=683e687e7c7b1ba31ef86a113b1eafd0407269fed175bf488d3c839d37d1cc60
 alternatives="cherrypy:cherryd:/usr/bin/cherryd3"
 
 pre_build() {
@@ -23,6 +24,6 @@ pre_build() {
 }
 
 post_install() {
-	mv ${DESTDIR}/usr/bin/cherryd ${DESTDIR}/usr/bin/cherryd3
+	mv ${DESTDIR}/usr/bin/cherryd{,3}
 	vlicense LICENSE.md
 }
diff --git a/srcpkgs/python3-Flask-HTTPAuth/template b/srcpkgs/python3-Flask-HTTPAuth/template
new file mode 100644
index 00000000000..2584e2b8822
--- /dev/null
+++ b/srcpkgs/python3-Flask-HTTPAuth/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-Flask-HTTPAuth'
+pkgname=python3-Flask-HTTPAuth
+version=3.3.0
+revision=1
+wrksrc=Flask-HTTPAuth-${version}
+build_style=python3-module
+pycompile_module="flask_httpauth.py"
+hostmakedepends="python3-setuptools"
+depends="python3-Flask"
+short_desc="Basic, Digest and Token HTTP authentication for Flask routes"
+maintainer="mobinmob <mobinmob@disroot.org>"
+license="MIT"
+homepage="https://github.com/miguelgrinberg/Flask-HTTPAuth"
+distfiles="${PYPI_SITE}/f/flask-httpauth/Flask-HTTPAuth-${version}.tar.gz"
+checksum=6ef8b761332e780f9ff74d5f9056c2616f52babc1998b01d9f361a1e439e61b9
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/python3-MechanicalSoup/template b/srcpkgs/python3-MechanicalSoup/template
index 44687c89bae..b1bbfa4184c 100644
--- a/srcpkgs/python3-MechanicalSoup/template
+++ b/srcpkgs/python3-MechanicalSoup/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-MechanicalSoup'
 pkgname=python3-MechanicalSoup
-version=0.11.0
+version=0.12.0
 revision=1
 archs=noarch
 wrksrc=MechanicalSoup-${version}
@@ -14,7 +14,7 @@ maintainer="Alex Childs <misuchiru03+void@gmail.com>"
 license="MIT"
 homepage="https://mechanicalsoup.readthedocs.io/en/stable/index.html"
 distfiles="${PYPI_SITE}/M/MechanicalSoup/MechanicalSoup-${version}.tar.gz"
-checksum=2712ec0f3087cbc719c6c3dfb317a05800ff14fcdbfa67a2f9f6e07226e7a94c
+checksum=39a60627a97981869251837b8bd082485f2f681df8a3315836ffaa74663627bd
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-PyBrowserID/template b/srcpkgs/python3-PyBrowserID/template
index d622c24a003..abec9dac54e 100644
--- a/srcpkgs/python3-PyBrowserID/template
+++ b/srcpkgs/python3-PyBrowserID/template
@@ -10,7 +10,7 @@ hostmakedepends="python3-setuptools"
 depends="python3-requests"
 checkdepends="python3-requests python3-M2Crypto"
 short_desc="Python3 library for the BrowserID Protocol"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://github.com/mozilla/PyBrowserID"
 distfiles="${PYPI_SITE}/P/PyBrowserID/PyBrowserID-${version}.tar.gz"
diff --git a/srcpkgs/python3-PyFxA/template b/srcpkgs/python3-PyFxA/template
index 1d83e377c0d..31175c92435 100644
--- a/srcpkgs/python3-PyFxA/template
+++ b/srcpkgs/python3-PyFxA/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-PyFxA'
 pkgname=python3-PyFxA
-version=0.7.1
+version=0.7.3
 revision=1
 archs=noarch
 wrksrc="PyFxA-${version}"
@@ -12,11 +12,11 @@ depends="python3-setuptools python3-cryptography python3-six python3-requests
 # Missing package: responses
 checkdepends="$depends python3-pyotp"
 short_desc="Python3 library for interacting with Firefox Accounts"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://github.com/mozilla/PyFxA"
 distfiles="${PYPI_SITE}/P/PyFxA/PyFxA-${version}.tar.gz"
-checksum=616689486d8d63956aa40836cffafde6e7590cdeb200badabaaf3c17d5b26cce
+checksum=f47f4285629fa6c033c79adc3fb90926c0818a42cfddb04d32818547362f1627
 
 do_check() {
 	# gevent/grequests test is limited to Python 2 by upstream
diff --git a/srcpkgs/python3-PyJWT/template b/srcpkgs/python3-PyJWT/template
new file mode 100644
index 00000000000..6f0830125c1
--- /dev/null
+++ b/srcpkgs/python3-PyJWT/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-PyJWT'
+pkgname=python3-PyJWT
+version=1.7.1
+revision=1
+wrksrc="PyJWT-${version}"
+build_style=python3-module
+pycompile_module="PyJWT.py"
+hostmakedepends="python3-setuptools"
+short_desc="Platform independent file lock"
+maintainer="fosslinux <fosslinux@aussies.space>"
+license="Unlicense"
+homepage="https://filelock.readthedocs.io/en/latest/"
+distfiles="${PYPI_SITE}/P/PyJWT/PyJWT-${version}.tar.gz"
+checksum=8d59a976fb773f3e6a39c85636357c4f0e242707394cadadd9814f5cbaa20e96
diff --git a/srcpkgs/python3-SoCo/template b/srcpkgs/python3-SoCo/template
index e6a9856e297..f0ac9825f57 100644
--- a/srcpkgs/python3-SoCo/template
+++ b/srcpkgs/python3-SoCo/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-SoCo'
 pkgname=python3-SoCo
-version=0.16
+version=0.18
 revision=1
 archs=noarch
 wrksrc="SoCo-${version}"
@@ -9,11 +9,11 @@ pycompile_module="soco"
 hostmakedepends="python3-setuptools"
 depends="python3-xmltodict python3-requests"
 short_desc="Python3 bindings for programmatic control of Sonos speakers"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://python-soco.com"
 distfiles="https://github.com/SoCo/SoCo/archive/v${version}.tar.gz"
-checksum=6db315b785c9b373a36647ef454c3a5cea07f33f9fe34c1d6f9d22ed444550e3
+checksum=b289877267d0a5707f2c6c9a66e7b5062c232d62f8bd8633150deabbe0bee3b4
 
 post_install() {
 	vlicense LICENSE.rst
diff --git a/srcpkgs/python3-Telethon/template b/srcpkgs/python3-Telethon/template
index 4ffcb075262..b0786559591 100644
--- a/srcpkgs/python3-Telethon/template
+++ b/srcpkgs/python3-Telethon/template
@@ -1,19 +1,19 @@
 # Template file for 'python3-Telethon'
 pkgname=python3-Telethon
-version=1.9.0
+version=1.10.6
 revision=1
 archs=noarch
 wrksrc="Telethon-${version}"
 build_style=python3-module
 pycompile_module="telethon telethon_generator"
 hostmakedepends="python3-setuptools"
-depends="python3-pyaes python3-rsa python3-async_generator"
+depends="python3-pyaes python3-rsa"
 short_desc="Pure Python3 Telegram client library"
 maintainer="Peter Bui <pbui@github.bx612.space>"
 license="MIT"
 homepage="https://lonamiwebs.github.io/Telethon"
 distfiles="https://github.com/LonamiWebs/Telethon/archive/v${version}.tar.gz"
-checksum=3c0a37d6520234c731e6ee60546dd58730768c8ed7a08c78796ce07cede799bc
+checksum=fdb86ae0eb5ffcab4e41fded937010a2f0e64a42082a476c7797958413d01ea6
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-TxSNI/template b/srcpkgs/python3-TxSNI/template
index 86835c713af..403010da5be 100644
--- a/srcpkgs/python3-TxSNI/template
+++ b/srcpkgs/python3-TxSNI/template
@@ -9,7 +9,7 @@ pycompile_module="txsni"
 hostmakedepends="python3-setuptools"
 depends="python3-Twisted python3-openssl"
 short_desc="Easy-to-use SNI endpoint for twisted"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/glyph/txsni"
 distfiles="${PYPI_SITE}/T/TxSNI/TxSNI-${version}.tar.gz
diff --git a/srcpkgs/python3-WebOb/template b/srcpkgs/python3-WebOb/template
index 063a969a063..c360542a1f2 100644
--- a/srcpkgs/python3-WebOb/template
+++ b/srcpkgs/python3-WebOb/template
@@ -9,7 +9,7 @@ pycompile_module="webob"
 hostmakedepends="python3-setuptools"
 depends="python3"
 short_desc="WSGI request and response object"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://webob.org"
 distfiles="${PYPI_SITE}/W/WebOb/WebOb-${version}.tar.gz"
diff --git a/srcpkgs/python3-acme/template b/srcpkgs/python3-acme/template
index 902cbb7eb57..d7ef20f2301 100644
--- a/srcpkgs/python3-acme/template
+++ b/srcpkgs/python3-acme/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-acme'
 pkgname=python3-acme
-version=0.33.1
+version=0.39.0
 revision=1
 archs=noarch
 wrksrc="acme-${version}"
@@ -11,8 +11,8 @@ depends="python3-cryptography python3-openssl python3-pyrfc3339
  python3-pytz python3-requests python3-requests-toolbelt python3-setuptools
  python3-six python3-josepy"
 short_desc="ACME protocol implementation in Python"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/certbot/certbot"
 distfiles="${PYPI_SITE}/a/acme/acme-${version}.tar.gz"
-checksum=b38cdb71d0071efe1f1190a744f8f95f3c698b76ac0f5d919bbfe3522e277a82
+checksum=a2fcb75d16de6804f4b4d773a457ee2f6434ebaf8fd1aa60862a91d4e8f73608
diff --git a/srcpkgs/python3-altgraph/template b/srcpkgs/python3-altgraph/template
index 7f97364983a..eff10f7aef4 100644
--- a/srcpkgs/python3-altgraph/template
+++ b/srcpkgs/python3-altgraph/template
@@ -9,7 +9,7 @@ pycompile_module="altgraph"
 hostmakedepends="python3-setuptools"
 depends="python3"
 short_desc="Fork of graphlib for building network graphs"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://altgraph.readthedocs.io/en/latest/"
 distfiles="${PYPI_SITE}/a/altgraph/altgraph-${version}.tar.gz"
diff --git a/srcpkgs/python3-aniso8601/template b/srcpkgs/python3-aniso8601/template
index 02979efd643..26540bc8c3f 100644
--- a/srcpkgs/python3-aniso8601/template
+++ b/srcpkgs/python3-aniso8601/template
@@ -1,9 +1,9 @@
 # Template file for 'python3-aniso8601'
 pkgname=python3-aniso8601
-version=7.0.0
+version=8.0.0
 revision=1
 archs=noarch
-_gitver=20c1f00a38f8
+_gitver=0ec13b9d81c9
 wrksrc="nielsenb-aniso8601-${_gitver}"
 build_style=python3-module
 pycompile_module="aniso8601"
@@ -14,7 +14,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://bitbucket.org/nielsenb/aniso8601"
 distfiles="${homepage}/get/v${version}.tar.gz"
-checksum=65ee237d9cb5d63f153ef6de355ad501ce36543107d590cf2d2e83e3d01dd511
+checksum=4947491026822bfc5711f3f51f9b4399996c6fe7b635e38e3e260c1f6cd81bd2
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-astroid b/srcpkgs/python3-astroid
deleted file mode 120000
index 8ab3dd7a4e8..00000000000
--- a/srcpkgs/python3-astroid
+++ /dev/null
@@ -1 +0,0 @@
-python-astroid
\ No newline at end of file
diff --git a/srcpkgs/python3-astroid/template b/srcpkgs/python3-astroid/template
new file mode 100644
index 00000000000..28f01bd4445
--- /dev/null
+++ b/srcpkgs/python3-astroid/template
@@ -0,0 +1,22 @@
+# Template file for 'python3-astroid'
+pkgname=python3-astroid
+version=2.2.5
+revision=2
+archs=noarch
+wrksrc="astroid-${version}"
+build_style=python3-module
+pycompile_module="astroid"
+hostmakedepends="python3-setuptools"
+depends="python3-six python3-lazy-object-proxy python3-wrapt
+ python3-typed-ast"
+short_desc="Abstract syntax tree for Python3"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+homepage="https://github.com/PyCQA/astroid"
+license="GPL-2.0-or-later, LGPL-2.1-or-later"
+distfiles="${PYPI_SITE}/a/astroid/astroid-${version}.tar.gz"
+checksum=6560e1e1749f68c64a4b5dee4e091fce798d2f0d84ebe638cf0e0585a343acf4
+
+post_install() {
+	# no tests
+	rm -rf ${DESTDIR}/usr/lib/python*/site-packages/astroid/tests
+}
diff --git a/srcpkgs/python3-async_generator/template b/srcpkgs/python3-async_generator/template
index c749400fc80..c2053d7bf1f 100644
--- a/srcpkgs/python3-async_generator/template
+++ b/srcpkgs/python3-async_generator/template
@@ -9,7 +9,7 @@ pycompile_module="async_generator"
 hostmakedepends="python3-setuptools"
 depends="python3"
 short_desc="Async generators and context managers for Python3.5+"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0, MIT"
 homepage="https://github.com/python-trio/async_generator"
 changelog="https://raw.githubusercontent.com/python-trio/async_generator/master/docs/source/history.rst"
diff --git a/srcpkgs/python3-autobahn/template b/srcpkgs/python3-autobahn/template
new file mode 100644
index 00000000000..053e45608e5
--- /dev/null
+++ b/srcpkgs/python3-autobahn/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-autobahn'
+pkgname=python3-autobahn
+version=19.10.1
+revision=1
+archs=noarch
+wrksrc="autobahn-${version}"
+build_style=python3-module
+pycompile_module="autobahn twisted"
+hostmakedepends="python3 python3-setuptools"
+depends="python3-cffi python3-Twisted python3-six python3-cryptography python3-txaio"
+short_desc="Real-time framework for Web, Mobile & Internet of Things"
+maintainer="travankor <travankor@tuta.io>"
+license="MIT"
+homepage="https://crossbar.io/autobahn"
+distfiles="${PYPI_SITE}/a/autobahn/autobahn-${version}.tar.gz"
+checksum=734385b00547448b3f30a752cbfd2900d15924d77dc4a1699b8bce1ea8899f39
+
+post-install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/python-bcc b/srcpkgs/python3-bcc
similarity index 100%
rename from srcpkgs/python-bcc
rename to srcpkgs/python3-bcc
diff --git a/srcpkgs/python3-blessed/template b/srcpkgs/python3-blessed/template
index 00f3ec8bd9b..4d494883f9a 100644
--- a/srcpkgs/python3-blessed/template
+++ b/srcpkgs/python3-blessed/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-blessed'
 pkgname=python3-blessed
-version=1.15.0
+version=1.15.1
 revision=1
 archs=noarch
 wrksrc="blessed-${version}"
@@ -12,8 +12,8 @@ short_desc="Wrapper around terminal coloring, styling, and positioning"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/jquast/blessed"
-distfiles="${PYPI_SITE}/b/blessed/blessed-${version}.tar.gz"
-checksum=777b0b6b5ce51f3832e498c22bc6a093b6b5f99148c7cbf866d26e2dec51ef21
+distfiles="${homepage}/archive/${version}.tar.gz"
+checksum=9bd5be8b9a8bf66165911e03ba9849ac5eddcad8e1cf4a9549820e5867f98b3b
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-boltons/template b/srcpkgs/python3-boltons/template
index 13e22e79f38..84a991feef4 100644
--- a/srcpkgs/python3-boltons/template
+++ b/srcpkgs/python3-boltons/template
@@ -9,7 +9,7 @@ pycompile_module="boltons"
 hostmakedepends="python3-setuptools"
 depends="python3"
 short_desc="Collection of functionality to be bolted on the standard lib"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/mahmoud/boltons"
 distfiles="${PYPI_SITE}/b/boltons/boltons-${version}.tar.gz"
diff --git a/srcpkgs/python3-canonicaljson/template b/srcpkgs/python3-canonicaljson/template
index caa054a821e..abc8e95820d 100644
--- a/srcpkgs/python3-canonicaljson/template
+++ b/srcpkgs/python3-canonicaljson/template
@@ -9,7 +9,7 @@ pycompile_module="canonicaljson.py"
 hostmakedepends="python3-setuptools"
 depends="python3-simplejson>=3.6.5 python3-frozendict>=1.0 python3-six"
 short_desc="Canonical JSON"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/matrix-org/python-canonicaljson"
 distfiles="${PYPI_SITE}/c/canonicaljson/canonicaljson-${version}.tar.gz"
diff --git a/srcpkgs/python3-casttube/template b/srcpkgs/python3-casttube/template
index 723325dfe97..ccd95f3f31c 100644
--- a/srcpkgs/python3-casttube/template
+++ b/srcpkgs/python3-casttube/template
@@ -9,7 +9,7 @@ pycompile_module="casttube"
 hostmakedepends="python3-setuptools"
 depends="python3-requests"
 short_desc="Python3 library to interface with the YouTube Chromecast API"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/ur1katz/casttube"
 distfiles="https://github.com/ur1katz/casttube/archive/${version}.tar.gz"
diff --git a/srcpkgs/python3-changelogs/template b/srcpkgs/python3-changelogs/template
index bec46d427b5..5c2a4889959 100644
--- a/srcpkgs/python3-changelogs/template
+++ b/srcpkgs/python3-changelogs/template
@@ -10,7 +10,7 @@ hostmakedepends="python3-setuptools"
 depends="python3-requests python3-lxml python3-packaging python3-validators
  python3-gitchangelog"
 short_desc="Changelog finder and parser for vendors like PyPi and npm"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/pyupio/changelogs"
 changelog="https://raw.githubusercontent.com/pyupio/changelogs/master/HISTORY.rst"
diff --git a/srcpkgs/python3-cheetah3/template b/srcpkgs/python3-cheetah3/template
index 2d03415d6eb..40dfee6e322 100644
--- a/srcpkgs/python3-cheetah3/template
+++ b/srcpkgs/python3-cheetah3/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-cheetah3'
 pkgname=python3-cheetah3
-version=3.2.3
+version=3.2.4
 revision=1
 wrksrc="Cheetah3-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="MIT"
 homepage="http://www.cheetahtemplate.org/"
 distfiles="${PYPI_SITE}/C/Cheetah3/Cheetah3-${version}.tar.gz"
-checksum=7c450bce04a82d34cf6d48992c736c2048246cbc00f7b4903a39cf9a8ea3990c
+checksum=caabb9c22961a3413ac85cd1e5525ec9ca80daeba6555f4f60802b6c256e252b
 alternatives="python-cheetah:cheetah:/usr/bin/cheetah3
  python-cheetah:cheetah-analyze:/usr/bin/cheetah-analyze3
  python-cheetah:cheetah-compile:/usr/bin/cheetah-compile3"
diff --git a/srcpkgs/python3-chromecast/template b/srcpkgs/python3-chromecast/template
index ba3cfd7bb80..16df7502633 100644
--- a/srcpkgs/python3-chromecast/template
+++ b/srcpkgs/python3-chromecast/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-chromecast'
 pkgname=python3-chromecast
-version=3.2.0
+version=4.0.1
 revision=1
 archs=noarch
 wrksrc="pychromecast-${version}"
@@ -9,11 +9,11 @@ pycompile_module="pychromecast"
 hostmakedepends="python3-setuptools"
 depends="python3-requests python3-protobuf python3-zeroconf python3-casttube"
 short_desc="Python3 library to communicate with Google Chromecast"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/balloob/pychromecast"
 distfiles="https://github.com/balloob/pychromecast/archive/${version}.tar.gz"
-checksum=163a39e751ddc7bf361360c5610a99951a115e41d6656768c1bf70237a6cc74e
+checksum=dd994c74989292070d43bb70dba5ec06d191e759e3daf0feb7551fce50582b3b
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-cryptography_vectors b/srcpkgs/python3-cryptography_vectors
new file mode 120000
index 00000000000..321bb702bd9
--- /dev/null
+++ b/srcpkgs/python3-cryptography_vectors
@@ -0,0 +1 @@
+python-cryptography_vectors
\ No newline at end of file
diff --git a/srcpkgs/python3-dbusmock/template b/srcpkgs/python3-dbusmock/template
index 45819984f40..67e0ed68078 100644
--- a/srcpkgs/python3-dbusmock/template
+++ b/srcpkgs/python3-dbusmock/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-dbusmock'
 pkgname=python3-dbusmock
-version=0.18.2
+version=0.18.3
 revision=1
 archs=noarch
 wrksrc="python-dbusmock-${version}"
@@ -11,8 +11,8 @@ depends="python3-dbus python3-gobject"
 checkdepends="python3-nose python3-dbus python3-gobject upower bluez
  NetworkManager"
 short_desc="Python3 library to mock D-Bus objects for testing"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/martinpitt/python-dbusmock"
 distfiles="https://github.com/martinpitt/python-dbusmock/releases/download/${version}/python-dbusmock-${version}.tar.gz"
-checksum=37201c223165a9e0e82fc01015c8affbed3375eed697b4011763bccceb69db7b
+checksum=994a178268b6d74aeb158c0f155cd141e9a0cfae14226a764cd022c4949fe242
diff --git a/srcpkgs/python3-distro/template b/srcpkgs/python3-distro/template
new file mode 100644
index 00000000000..86e94572ed7
--- /dev/null
+++ b/srcpkgs/python3-distro/template
@@ -0,0 +1,16 @@
+# Template file for 'python3-distro'
+pkgname=python3-distro
+version=1.4.0
+revision=1
+wrksrc=distro-${version}
+build_style=python3-module
+pycompile_module="distro"
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+depends="python3"
+short_desc="OS platform information API"
+maintainer="mobinmob <mobinmob@disroot.org>"
+license="Apache-2.0"
+homepage="https://github.com/nir0s/distro"
+distfiles="${PYPI_SITE}/d/distro/distro-${version}.tar.gz"
+checksum=362dde65d846d23baee4b5c058c8586f219b5a54be1cf5fc6ff55c4578392f57
diff --git a/srcpkgs/python3-eliot/template b/srcpkgs/python3-eliot/template
index bbeefc2e9a2..15b05dd7331 100644
--- a/srcpkgs/python3-eliot/template
+++ b/srcpkgs/python3-eliot/template
@@ -10,7 +10,7 @@ hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-six python3-zope.interface python3-rsistent
  python3-boltons"
 short_desc="Logging library that tells you why it happened"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/itamarst/eliot/"
 distfiles="${PYPI_SITE}/e/eliot/eliot-${version}.tar.gz"
diff --git a/srcpkgs/python3-fido2/template b/srcpkgs/python3-fido2/template
new file mode 100644
index 00000000000..fafb4d61d56
--- /dev/null
+++ b/srcpkgs/python3-fido2/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-fido2'
+pkgname=python3-fido2
+_pkgname=fido2
+version=0.7.1
+revision=1
+archs=noarch
+wrksrc="${_pkgname}-${version}"
+build_style=python3-module
+pycompile_module=${_pkgname}
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Library for FIDO2 functionality"
+maintainer="Doan Tran Cong Danh <congdanhqx@gmail.com>"
+license="BSD-2-Clause"
+homepage="https://github.com/Yubico/python-fido2"
+distfiles="${PYPI_SITE}/f/${_pkgname}/${_pkgname}-${version}.tar.gz"
+checksum=4483b48ab3da0a3f3cc8e2f11d833160dfa2e6d12148e938982df4acd10b2682
+
+post_install() {
+	vlicense COPYING
+}
diff --git a/srcpkgs/python3-fishnet/template b/srcpkgs/python3-fishnet/template
index 06ddaf7ed84..9dde60cbb6c 100644
--- a/srcpkgs/python3-fishnet/template
+++ b/srcpkgs/python3-fishnet/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-fishnet'
 pkgname=python3-fishnet
-version=1.15.16
+version=1.15.18
 revision=1
 archs=noarch
 wrksrc="fishnet-${version}"
@@ -9,9 +9,9 @@ pycompile_module="fishnet.py"
 hostmakedepends="python3-setuptools"
 depends="python3-requests"
 checkdepends="python3-requests"
-short_desc="Distributed Stockfish analysis for lichess.org (Python2)"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+short_desc="Distributed Stockfish analysis for lichess.org"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/niklasf/fishnet"
 distfiles="https://github.com/niklasf/fishnet/archive/v${version}.tar.gz"
-checksum=f0d229640173b767d1d343c2d71f20eb45a4a180a43d12bf12a1060fa58e01c6
+checksum=1854ec228fddd71ecae21abb5d2b5a523fc3781d08cea1f2f757c53936db0daf
diff --git a/srcpkgs/python3-flexmock/template b/srcpkgs/python3-flexmock/template
index 3bf417f241d..0663ed5122d 100644
--- a/srcpkgs/python3-flexmock/template
+++ b/srcpkgs/python3-flexmock/template
@@ -10,7 +10,7 @@ hostmakedepends="python3-setuptools"
 depends="python3"
 checkdepends="python3-pytest"
 short_desc="Testing library for Python3 inspired by Ruby's flexmock"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://flexmock.readthedocs.io/en/latest/"
 distfiles="${PYPI_SITE}/f/flexmock/flexmock-${version}.tar.gz"
diff --git a/srcpkgs/python3-fonttools b/srcpkgs/python3-fonttools
deleted file mode 120000
index 8b2310cea88..00000000000
--- a/srcpkgs/python3-fonttools
+++ /dev/null
@@ -1 +0,0 @@
-python-fonttools
\ No newline at end of file
diff --git a/srcpkgs/python3-fonttools/template b/srcpkgs/python3-fonttools/template
new file mode 100644
index 00000000000..15cf36585fb
--- /dev/null
+++ b/srcpkgs/python3-fonttools/template
@@ -0,0 +1,31 @@
+# Template file for 'python3-fonttools'
+pkgname=python3-fonttools
+version=4.0.2
+revision=1
+wrksrc="${pkgname#python3-}-${version}"
+build_style=python3-module
+pycompile_module="fonttools"
+hostmakedepends="python3-devel python3-setuptools"
+makedepends="${hostmakedepends}"
+short_desc="Library to manipulate font files from Python3"
+maintainer="svenper <svenper@tuta.io>"
+license="MIT, OFL-1.1, BSD-3-Clause"
+homepage="https://github.com/fonttools/fonttools"
+distfiles="https://github.com/fonttools/fonttools/archive/${version}.tar.gz"
+checksum=0c92b058ccbcd44f71fe094c06bba105c989ae552852486411cd19a3763eed2c
+alternatives="
+	fonttools:fonttools:/usr/bin/fonttools3
+	fonttools:pyftmerge:/usr/bin/pyftmerge3
+	fonttools:pyftsubset:/usr/bin/pyftsubset3
+	fonttools:ttx:/usr/bin/ttx3
+	fonttools:ttx.1:/usr/share/man/man1/ttx3.1"
+
+post_install() {
+	mv ${DESTDIR}/usr/bin/fonttools{,3}
+	mv ${DESTDIR}/usr/bin/pyftmerge{,3}
+	mv ${DESTDIR}/usr/bin/pyftsubset{,3}
+	mv ${DESTDIR}/usr/bin/ttx{,3}
+	mv ${DESTDIR}/usr/share/man/man1/ttx{,3}.1
+	vlicense LICENSE
+	vlicense LICENSE.external
+}
diff --git a/srcpkgs/python3-frozendict/template b/srcpkgs/python3-frozendict/template
index fe99788da9a..d3b4dc91602 100644
--- a/srcpkgs/python3-frozendict/template
+++ b/srcpkgs/python3-frozendict/template
@@ -9,7 +9,7 @@ pycompile_module="frozendict"
 hostmakedepends="python3-setuptools"
 depends="python3"
 short_desc="Immutable mapping for Python3"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/slezica/python-frozendict"
 distfiles="${PYPI_SITE}/f/frozendict/frozendict-${version}.tar.gz"
diff --git a/srcpkgs/python3-geojson/template b/srcpkgs/python3-geojson/template
index fc9fdb49996..6bcd0c3092e 100644
--- a/srcpkgs/python3-geojson/template
+++ b/srcpkgs/python3-geojson/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-geojson'
 pkgname=python3-geojson
-version=2.4.1
+version=2.5.0
 revision=1
 archs=noarch
 wrksrc="geojson-${version}"
@@ -9,11 +9,11 @@ pycompile_module="geojson"
 hostmakedepends="python3-setuptools"
 depends="python3"
 short_desc="Bindings and utilities for GeoJSON (Python3)"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/frewsxcv/python-geojson"
 distfiles="${PYPI_SITE}/g/geojson/geojson-${version}.tar.gz"
-checksum=b175e00a76d923d6e7409de0784c147adcdd6e04b311b1d405895a4db3612c9d
+checksum=6e4bb7ace4226a45d9c8c8b1348b3fc43540658359f93c3f7e03efa9f15f658a
 
 do_check() {
 	python3 setup.py test
diff --git a/srcpkgs/python3-gitchangelog/template b/srcpkgs/python3-gitchangelog/template
index e8ea46c4f17..ed381e07d78 100644
--- a/srcpkgs/python3-gitchangelog/template
+++ b/srcpkgs/python3-gitchangelog/template
@@ -9,7 +9,7 @@ pycompile_module="gitchangelog"
 hostmakedepends="python3-setuptools git"
 depends="python3-pystache python3-Mako"
 short_desc="Creates a changelog from git log history"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/vaab/gitchangelog"
 distfiles="${PYPI_SITE}/g/gitchangelog/gitchangelog-${version}.tar.gz"
diff --git a/srcpkgs/python3-hawkauthlib/template b/srcpkgs/python3-hawkauthlib/template
index f0bbb913bce..fd7f1405790 100644
--- a/srcpkgs/python3-hawkauthlib/template
+++ b/srcpkgs/python3-hawkauthlib/template
@@ -10,7 +10,7 @@ hostmakedepends="python3-setuptools"
 depends="python3-WebOb"
 checkdepends="python3-WebOb python3-requests"
 short_desc="Low-level library for implementing Hawk Access Authentication"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://github.com/mozilla-services/hawkauthlib"
 distfiles="${PYPI_SITE}/h/hawkauthlib/hawkauthlib-${version}.tar.gz"
diff --git a/srcpkgs/python3-hkdf/template b/srcpkgs/python3-hkdf/template
new file mode 100644
index 00000000000..fabc91ee974
--- /dev/null
+++ b/srcpkgs/python3-hkdf/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-hkdf'
+pkgname=python3-hkdf
+version=0.0.3
+revision=1
+archs=noarch
+wrksrc="hkdf-${version}"
+build_style=python3-module
+pycompile_module="hkdf.py"
+hostmakedepends="python3 python3-setuptools"
+short_desc="HMAC Key Derivation module"
+maintainer="travankor <travankor@tuta.io>"
+license="BSD-2-Clause"
+homepage="https://pypi.org/project/hkdf/"
+distfiles="${PYPI_SITE}/h/hkdf/hkdf-${version}.tar.gz"
+checksum=622a31c634bc185581530a4b44ffb731ed208acf4614f9c795bdd70e77991dca
+
+post-install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/python3-html2text b/srcpkgs/python3-html2text
deleted file mode 120000
index 9176db1c683..00000000000
--- a/srcpkgs/python3-html2text
+++ /dev/null
@@ -1 +0,0 @@
-python-html2text
\ No newline at end of file
diff --git a/srcpkgs/python3-html2text/template b/srcpkgs/python3-html2text/template
new file mode 100644
index 00000000000..006f2a127ad
--- /dev/null
+++ b/srcpkgs/python3-html2text/template
@@ -0,0 +1,16 @@
+# Template file for 'python3-html2text'
+pkgname=python3-html2text
+version=2019.9.26
+revision=1
+archs=noarch
+wrksrc="${pkgname#*-}-${version}"
+build_style=python3-module
+pycompile_module="html2text"
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="HTML to Markdown-formatted text converter"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="GPL-3.0-only"
+homepage="https://github.com/Alir3z4/html2text/"
+distfiles="${PYPI_SITE}/h/html2text/html2text-${version}.tar.gz"
+checksum=6f56057c5c2993b5cc5b347cb099bdf6d095828fef1b53ef4e2a2bf2a1be9b4f
diff --git a/srcpkgs/python3-importlib_metadata/template b/srcpkgs/python3-importlib_metadata/template
index 71b94f7e6a1..9acbe968e10 100644
--- a/srcpkgs/python3-importlib_metadata/template
+++ b/srcpkgs/python3-importlib_metadata/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-importlib_metadata'
 pkgname=python3-importlib_metadata
-version=0.19
+version=0.23
 revision=1
 archs=noarch
 wrksrc="importlib_metadata-${version}"
@@ -15,4 +15,4 @@ license="Apache-2.0"
 homepage="https://importlib-metadata.readthedocs.io/en/latest/"
 changelog="https://importlib-metadata.readthedocs.io/en/latest/changelog%20(links).html"
 distfiles="${PYPI_SITE}/i/importlib_metadata/importlib_metadata-${version}.tar.gz"
-checksum=23d3d873e008a513952355379d93cbcab874c58f4f034ff657c7a87422fa64e8
+checksum=aa18d7378b00b40847790e7c27e11673d7fed219354109d0e7b9e5b25dc3ad26
diff --git a/srcpkgs/python3-ipython/template b/srcpkgs/python3-ipython/template
index 7bc45ad005e..63242f382db 100644
--- a/srcpkgs/python3-ipython/template
+++ b/srcpkgs/python3-ipython/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ipython'
 pkgname=python3-ipython
-version=7.5.0
+version=7.8.0
 revision=1
 archs=noarch
 wrksrc="ipython-${version}"
@@ -15,7 +15,7 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://ipython.org/"
 distfiles="${PYPI_SITE}/i/ipython/ipython-${version}.tar.gz"
-checksum=e840810029224b56cd0d9e7719dc3b39cf84d577f8ac686547c8ba7a06eeab26
+checksum=dd76831f065f17bddd7eaa5c781f5ea32de5ef217592cf019e34043b56895aa1
 
 alternatives="
  ipython:ipython:/usr/bin/ipython3
diff --git a/srcpkgs/python3-iso-8601 b/srcpkgs/python3-iso-8601
new file mode 120000
index 00000000000..e44531aa04c
--- /dev/null
+++ b/srcpkgs/python3-iso-8601
@@ -0,0 +1 @@
+python-iso-8601
\ No newline at end of file
diff --git a/srcpkgs/python3-jellyfish/template b/srcpkgs/python3-jellyfish/template
index caf01f0c0c4..dec74539e3f 100644
--- a/srcpkgs/python3-jellyfish/template
+++ b/srcpkgs/python3-jellyfish/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-jellyfish'
 pkgname=python3-jellyfish
-version=0.7.1
+version=0.7.2
 revision=1
 wrksrc="jellyfish-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/sunlightlabs/jellyfish"
 distfiles="${PYPI_SITE}/j/jellyfish/jellyfish-${version}.tar.gz"
-checksum=79a5640bb47120596c91b9030ed3164cc5a3d0bb6b15779bb82c3c21f8efa1c1
+checksum=cb09c50d7e2bb7b926fc7654762bc81f9c629e0c92ae7137bf22b34f39515286
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-josepy/template b/srcpkgs/python3-josepy/template
index f1ae7e7b5df..6d6e4547d38 100644
--- a/srcpkgs/python3-josepy/template
+++ b/srcpkgs/python3-josepy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-josepy'
 pkgname=python3-josepy
-version=1.1.0
+version=1.2.0
 revision=1
 archs=noarch
 wrksrc="josepy-${version}"
@@ -9,8 +9,8 @@ pycompile_module="josepy"
 hostmakedepends="python3-setuptools"
 depends="python3-cryptography python3-openssl python3-setuptools python3-six"
 short_desc="JOSE protocol implementation in Python3"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/certbot/josepy"
 distfiles="${PYPI_SITE}/j/josepy/josepy-${version}.tar.gz"
-checksum=fb5c62c77d26e04df29cb5ecd01b9ce69b6fcc9e521eb1ca193b7faa2afa7086
+checksum=9cec9a839fe9520f0420e4f38e7219525daccce4813296627436fe444cd002d3
diff --git a/srcpkgs/python3-libevdev/template b/srcpkgs/python3-libevdev/template
new file mode 100644
index 00000000000..0a79893726c
--- /dev/null
+++ b/srcpkgs/python3-libevdev/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-libevdev'
+pkgname=python3-libevdev
+version=0.8
+revision=1
+_githash=1827bebcf789adee8492cbfcc7cf8d56059a42a4
+wrksrc="python-libevdev-${version}-${_githash}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3 libevdev"
+short_desc="Python3 wrapper around the libevdev C library"
+maintainer="bra1nwave <brainwave@openmailbox.org>"
+license="MIT"
+homepage="https://gitlab.freedesktop.org/libevdev/python-libevdev"
+distfiles="${homepage}/-/archive/${version}/${version}.tar.gz"
+checksum=eff61d4bfa30f3748bf2369b71d2f7d329fdede1c56bc8cf770d2b5fdf327f55
+
+post_install() {
+	vlicense COPYING
+}
diff --git a/srcpkgs/python3-macaroons/template b/srcpkgs/python3-macaroons/template
index 1a50f82914a..d44100c20f2 100644
--- a/srcpkgs/python3-macaroons/template
+++ b/srcpkgs/python3-macaroons/template
@@ -9,7 +9,7 @@ pycompile_module="pymacaroons"
 hostmakedepends="python3-setuptools"
 depends="python3-six>=1.8.0 python3-nacl>=1.1.2 python3-nacl<2.0"
 short_desc="Python3 Macaroon library"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/ecordell/pymacaroons"
 distfiles="${PYPI_SITE}/p/pymacaroons/pymacaroons-${version}.tar.gz"
diff --git a/srcpkgs/python3-macholib/template b/srcpkgs/python3-macholib/template
index d0db22e2d84..a2738f57eb0 100644
--- a/srcpkgs/python3-macholib/template
+++ b/srcpkgs/python3-macholib/template
@@ -9,7 +9,7 @@ pycompile_module="macholib"
 hostmakedepends="python3-setuptools"
 depends="python3-altgraph python3-setuptools"
 short_desc="Python3 module for Mach-O header analysis and editing"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/erocarrera/pefile"
 distfiles="${PYPI_SITE}/m/macholib/macholib-${version}.tar.gz"
diff --git a/srcpkgs/python3-matplotlib/template b/srcpkgs/python3-matplotlib/template
index bb0abb22844..857ba17cacf 100644
--- a/srcpkgs/python3-matplotlib/template
+++ b/srcpkgs/python3-matplotlib/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-matplotlib'
 pkgname=python3-matplotlib
-version=3.0.3
+version=3.1.1
 revision=1
 wrksrc="matplotlib-${version}"
 build_style=python3-module
@@ -12,10 +12,10 @@ depends="python3-matplotlib-data>=${version}_${revision} python3-numpy
  python3-dateutil python3-parsing python3-cycler python3-kiwisolver"
 short_desc="Python3 2D/3D plotting library"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="matplotlib, BSD-3-Clause, MIT"
+license="custom:matplotlib, BSD-3-Clause, MIT"
 homepage="https://matplotlib.org/"
 distfiles="https://github.com/matplotlib/matplotlib/archive/v${version}.tar.gz"
-checksum=d384a58409c1c23b8760b6f3d84ebed2c936df7dcb82797e983faaf30ae4d69d
+checksum=29d1a239bb7d1095d98d8831bb661519ab0d23e30d38ed47729f554f15e8cd3e
 
 pre_build() {
 	# adjust qhull path
diff --git a/srcpkgs/python3-mechanize b/srcpkgs/python3-mechanize
new file mode 120000
index 00000000000..e96661e4701
--- /dev/null
+++ b/srcpkgs/python3-mechanize
@@ -0,0 +1 @@
+python-mechanize
\ No newline at end of file
diff --git a/srcpkgs/python3-more-itertools/template b/srcpkgs/python3-more-itertools/template
index 338f153a80c..b089992f84e 100644
--- a/srcpkgs/python3-more-itertools/template
+++ b/srcpkgs/python3-more-itertools/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-more-itertools'
 pkgname=python3-more-itertools
-version=7.0.0
+version=7.2.0
 revision=1
 archs=noarch
 wrksrc="more-itertools-${version}"
@@ -9,11 +9,11 @@ pycompile_module="more_itertools"
 hostmakedepends="python3-setuptools"
 depends="python3"
 short_desc="More Python3 routines for operating on itertables"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/erikrose/more-itertools"
-distfiles="https://github.com/erikrose/more-itertools/archive/${version}.tar.gz"
-checksum=3a4be24ce0cc357e227e216cf16309bac255fa984b1e26e47f88d12cb857334d
+distfiles="${PYPI_SITE}/m/more-itertools/more-itertools-${version}.tar.gz"
+checksum=409cd48d4db7052af495b09dec721011634af3753ae1ef92d2b32f73a745f832
 
 do_check() {
 	python3 setup.py test
diff --git a/srcpkgs/python3-mpi4py/template b/srcpkgs/python3-mpi4py/template
new file mode 100644
index 00000000000..94a83b688f2
--- /dev/null
+++ b/srcpkgs/python3-mpi4py/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-mpi4py'
+pkgname=python3-mpi4py
+version=3.0.2
+revision=1
+wrksrc="mpi4py-${version}"
+build_style=python3-module
+pycompile_module="mpi4py"
+hostmakedepends="python3-setuptools python3-Cython gcc-fortran openmpi"
+makedepends="python3-devel openmpi-devel"
+depends="openmpi"
+short_desc="Python bindings for the Message Passing Interface (MPI) standard"
+maintainer="Anders Damsgaard <anders@adamsgaard.dk>"
+license="BSD-2-Clause"
+homepage="https://bitbucket.org/mpi4py/mpi4py"
+distfiles="$PYPI_SITE/m/mpi4py/mpi4py-${version}.tar.gz"
+checksum=f8d629d1e3e3b7b89cb99d0e3bc5505e76cc42089829807950d5c56606ed48e0
+
+post_install() {
+	vlicense LICENSE.rst
+}
diff --git a/srcpkgs/python3-mpv/template b/srcpkgs/python3-mpv/template
index c8ea0a3b2d5..2780c02610b 100644
--- a/srcpkgs/python3-mpv/template
+++ b/srcpkgs/python3-mpv/template
@@ -9,7 +9,7 @@ pycompile_module="mpv.py"
 hostmakedepends="python3-setuptools"
 depends="python3 mpv"
 short_desc="Python3 interface to the MPV media player"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-or-later"
 homepage="https://github.com/jaseg/python-mpv"
 distfiles="https://github.com/jaseg/python-mpv/archive/v${version}.tar.gz"
diff --git a/srcpkgs/python3-mypy/template b/srcpkgs/python3-mypy/template
index da2f7fcddd5..37ecd732c06 100644
--- a/srcpkgs/python3-mypy/template
+++ b/srcpkgs/python3-mypy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-mypy'
 pkgname=python3-mypy
-version=0.701
+version=0.730
 revision=1
 archs=noarch
 wrksrc="mypy-${version}"
@@ -9,11 +9,11 @@ pycompile_module="mypy"
 hostmakedepends="python3-setuptools"
 depends="python3-mypy_extensions python3-typed-ast"
 short_desc="Optional static typing for Python3"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/python/mypy"
 distfiles="${PYPI_SITE}/m/mypy/mypy-${version}.tar.gz"
-checksum=5764f10d27b2e93c84f70af5778941b8f4aa1379b2430f85c827e0f5464e8714
+checksum=42a78944e80770f21609f504ca6c8173f7768043205b5ac51c9144e057dcf879
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-mypy_extensions/template b/srcpkgs/python3-mypy_extensions/template
index d3efb12f17a..2761924248e 100644
--- a/srcpkgs/python3-mypy_extensions/template
+++ b/srcpkgs/python3-mypy_extensions/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-mypy_extensions'
 pkgname=python3-mypy_extensions
-version=0.4.1
+version=0.4.2
 revision=1
 archs=noarch
 wrksrc="mypy_extensions-${version}"
@@ -9,11 +9,11 @@ pycompile_module="mypy_extensions.py"
 hostmakedepends="python3-setuptools"
 depends="python3"
 short_desc="Extensions to the typing module use by mypy"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://www.mypy-lang.org/"
 distfiles="${PYPI_SITE}/m/mypy_extensions/mypy_extensions-${version}.tar.gz"
-checksum=37e0e956f41369209a3d5f34580150bcacfabaa57b33a15c0b25f4b5725e0812
+checksum=a161e3b917053de87dbe469987e173e49fb454eca10ef28b48b384538cc11458
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-nacl/template b/srcpkgs/python3-nacl/template
index 621be4193dc..5dd6a71ad6a 100644
--- a/srcpkgs/python3-nacl/template
+++ b/srcpkgs/python3-nacl/template
@@ -9,7 +9,7 @@ hostmakedepends="python3-setuptools python3-pycparser python3-cffi"
 makedepends="libsodium-devel python3-devel libffi-devel"
 depends="python3-six python3-cffi"
 short_desc="Python3 bindings for the NaCl library"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/pyca/pynacl/"
 distfiles="${PYPI_SITE}/P/PyNaCl/PyNaCl-${version}.tar.gz"
diff --git a/srcpkgs/python3-numpy/template b/srcpkgs/python3-numpy/template
index 6cf4bb72608..c4c1936cc0d 100644
--- a/srcpkgs/python3-numpy/template
+++ b/srcpkgs/python3-numpy/template
@@ -1,22 +1,27 @@
 # Template file for 'python3-numpy'
 pkgname=python3-numpy
-version=1.17.0
+version=1.17.2
 revision=1
 wrksrc="numpy-${version}"
 build_style=python3-module
 pycompile_module="numpy"
 hostmakedepends="python3-setuptools python3-Cython gcc-fortran"
 makedepends="python3-devel lapack-devel cblas-devel"
+checkdepends="python3-pytest"
 short_desc="Fast and sophisticated array facility to Python3"
 maintainer="bra1nwave <brainwave@openmailbox.org>"
 license="BSD-3-Clause"
 homepage="https://www.numpy.org/"
 distfiles="https://github.com/numpy/numpy/archive/v${version}.tar.gz"
-checksum=56b53127c1d9dbb91fe1493646d71d8d95feea8320a1fa9808c9d983d1dc4a87
+checksum=689d9852d162dc7cda4aa563cdd1f5af166b6878493aeb98d584b5edefcea4b2
 alternatives="numpy:f2py:/usr/bin/f2py3"
 
 nocross="https://build.voidlinux.org/builders/armv7l_builder/builds/1408/steps/shell_3/logs/stdio"
 
+do_check() {
+	./runtests.py
+}
+
 post_install() {
 	# create compat symlinks for .h files
 	vmkdir ${py3_inc}
diff --git a/srcpkgs/python3-pafy b/srcpkgs/python3-pafy
deleted file mode 120000
index 81da0afb146..00000000000
--- a/srcpkgs/python3-pafy
+++ /dev/null
@@ -1 +0,0 @@
-python-pafy
\ No newline at end of file
diff --git a/srcpkgs/python3-pafy/template b/srcpkgs/python3-pafy/template
new file mode 100644
index 00000000000..ce26f770c69
--- /dev/null
+++ b/srcpkgs/python3-pafy/template
@@ -0,0 +1,22 @@
+# Template file for 'python3-pafy'
+pkgname=python3-pafy
+version=0.5.4
+revision=2
+archs=noarch
+wrksrc="pafy-${version}"
+build_style=python3-module
+pycompile_module="pafy"
+hostmakedepends="python3-setuptools youtube-dl"
+depends="youtube-dl"
+short_desc="Python3 library to download YouTube content and retrieve metadata"
+maintainer="q66 <daniel@octaforge.org>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/mps-youtube/pafy"
+distfiles="https://github.com/mps-youtube/pafy/archive/v${version}.tar.gz"
+checksum=a2f9fe7c6175264993190081e1558516b2f2b5987f13a581a55cd9d838df973b
+
+python-pafy_package() {
+	depends="python3-pafy"
+	short_desc+=" - transitional dummy package"
+	build_style=meta
+}
diff --git a/srcpkgs/python3-pandas b/srcpkgs/python3-pandas
deleted file mode 120000
index c34bebd91ab..00000000000
--- a/srcpkgs/python3-pandas
+++ /dev/null
@@ -1 +0,0 @@
-python-pandas
\ No newline at end of file
diff --git a/srcpkgs/python-pandas/python3-pandas.INSTALL.msg b/srcpkgs/python3-pandas/INSTALL.msg
similarity index 100%
rename from srcpkgs/python-pandas/python3-pandas.INSTALL.msg
rename to srcpkgs/python3-pandas/INSTALL.msg
diff --git a/srcpkgs/python3-pandas/template b/srcpkgs/python3-pandas/template
new file mode 100644
index 00000000000..ad282b4d5d4
--- /dev/null
+++ b/srcpkgs/python3-pandas/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-pandas'
+pkgname=python3-pandas
+version=0.25.1
+revision=1
+wrksrc="pandas-${version}"
+build_style=python3-module
+pycompile_module="pandas"
+hostmakedepends="python3-setuptools python3-Cython"
+makedepends="python3-devel python3-numpy python3-dateutil python3-pytz"
+depends="python3-numpy python3-dateutil python3-pytz"
+short_desc="Python3 data analysis library"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://pandas.pydata.org/"
+distfiles="https://github.com/pandas-dev/pandas/archive/v${version}.tar.gz"
+checksum=94e2fccca4f758b5dc20e80466516bd6dc2ee24dd62fc8bf41866b8902d3d2eb
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/python3-pandas/update b/srcpkgs/python3-pandas/update
new file mode 100644
index 00000000000..e299d00ea67
--- /dev/null
+++ b/srcpkgs/python3-pandas/update
@@ -0,0 +1 @@
+ignore="*rc*"
diff --git a/srcpkgs/python3-pefile/template b/srcpkgs/python3-pefile/template
index 189e8dbd9fb..305d64e0758 100644
--- a/srcpkgs/python3-pefile/template
+++ b/srcpkgs/python3-pefile/template
@@ -9,7 +9,7 @@ pycompile_module="pefile.py peutils.py ordlookup"
 hostmakedepends="python3-setuptools"
 depends="python3-future"
 short_desc="Read and work with Portable Executable (PE) files"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://altgraph.readthedocs.io/en/latest/"
 distfiles="${PYPI_SITE}/p/pefile/pefile-${version}.tar.gz"
diff --git a/srcpkgs/python3-pem/template b/srcpkgs/python3-pem/template
index 6fc101974d2..3517c80b66a 100644
--- a/srcpkgs/python3-pem/template
+++ b/srcpkgs/python3-pem/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pem'
 pkgname=python3-pem
-version=19.1.0
+version=19.2.0
 revision=1
 archs=noarch
 wrksrc="pem-${version}"
@@ -9,11 +9,11 @@ pycompile_module="pem"
 hostmakedepends="python3-setuptools"
 depends="python3"
 short_desc="Easy PEM file parsing in Python3"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://pem.readthedocs.io/en/stable/"
 distfiles="${PYPI_SITE}/p/pem/pem-${version}.tar.gz"
-checksum=0f0428fbe22cafa3eb973619a1c329aa886a24bbdafe138d3a46a084059dc0b1
+checksum=a6f42d89cc43d62b5ed4c0fe9f87e8ab86af909ce4d4bb2b9098d79d84353a98
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-perf/template b/srcpkgs/python3-perf/template
index 3ea2ad0ccc3..a03251f97e8 100644
--- a/srcpkgs/python3-perf/template
+++ b/srcpkgs/python3-perf/template
@@ -1,20 +1,20 @@
 # Template file for 'python3-perf'
 pkgname=python3-perf
-version=1.6.0
+version=1.6.1
 revision=1
 archs=noarch
-wrksrc="perf-${version}"
+wrksrc="pyperf-${version}"
 build_style=python3-module
-pycompile_module="perf"
+pycompile_module="pyperf"
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-six"
 short_desc="Toolkit to run Python benchmarks"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
-homepage="https://github.com/vstinner/perf"
-#changelog="https://raw.githubusercontent.com/vstinner/perf/master/doc/changelog.rst"
-distfiles="https://github.com/vstinner/perf/archive/${version}.tar.gz"
-checksum=c1f6f0262be85e7e14daa0875c7d226d6a87b2cf9eebbfb91f6e7c34ef223df0
+homepage="https://pyperf.readthedocs.io"
+changelog="https://raw.githubusercontent.com/vstinner/pyperf/master/doc/changelog.rst"
+distfiles="https://github.com/vstinner/pyperf/archive/${version}.tar.gz"
+checksum=fbe793f6f2e036ab4dcca105b5c5aa34fd331dd881e7a3e158e5e218c63cfc32
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/python3-pgspecial/template b/srcpkgs/python3-pgspecial/template
index 748e4b2f99a..dc52d12c214 100644
--- a/srcpkgs/python3-pgspecial/template
+++ b/srcpkgs/python3-pgspecial/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pgspecial'
 pkgname=python3-pgspecial
-version=1.11.5
+version=1.11.7
 revision=1
 archs=noarch
 wrksrc="pgspecial-${version}"
@@ -8,12 +8,13 @@ build_style=python3-module
 pycompile_module="pgspecial"
 hostmakedepends="python3-setuptools"
 depends="python3-click python3-sqlparse python3-psycopg2"
+checkdepends="${depends} python3-pytest"
 short_desc="Meta-commands handler for PostgreSQL"
 maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"
 license="BSD-3-Clause"
 homepage="https://www.dbcli.com"
 distfiles="${PYPI_SITE}/p/pgspecial/pgspecial-${version}.tar.gz"
-checksum=f44dd48db53fd93dc78d61ebac0ca2cc3c58203f94b30edc730b02bfd3ee747b
+checksum=f7501681e276b07cb260e665ce578ff5c64bcd1bc58bde27a01b78425afdc173
 
 do_check() {
 	# pgspecial tests require a PostgreSQL server; skip them.
diff --git a/srcpkgs/python3-phonenumbers/template b/srcpkgs/python3-phonenumbers/template
index 7c91c19a1f1..ebf33f226e4 100644
--- a/srcpkgs/python3-phonenumbers/template
+++ b/srcpkgs/python3-phonenumbers/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-phonenumbers'
 pkgname=python3-phonenumbers
-version=8.10.10
+version=8.10.20
 revision=1
 archs=noarch
 wrksrc="phonenumbers-${version}"
@@ -9,8 +9,8 @@ pycompile_module="phonenumbers"
 hostmakedepends="python3-setuptools"
 depends="python3"
 short_desc="Library for dealing with international phone numbers"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/daviddrysdale/python-phonenumbers"
 distfiles="${PYPI_SITE}/p/phonenumbers/phonenumbers-${version}.tar.gz"
-checksum=dabc8cfcff96446b0787ea337739ea286ec3949ec27a4790a9b4587817da5c5f
+checksum=f743940907118dacb552da39caf1839632a5cc510157fc468a1f497f36562e1c
diff --git a/srcpkgs/python3-pivy/template b/srcpkgs/python3-pivy/template
index 9daf33025d3..4a733e805e3 100644
--- a/srcpkgs/python3-pivy/template
+++ b/srcpkgs/python3-pivy/template
@@ -15,6 +15,11 @@ distfiles="https://bitbucket.org/Coin3D/pivy/get/${version}.tar.gz"
 checksum=2ee684dbf0f52c05b491c5423013fd82e679614bffee23641485248c8a790c4e
 nocross="require coin-config script"
 
+case "$XBPS_TARGET_MACHINE" in
+	ppc64*);;
+	ppc*) broken="{standard input}:3376761: Error: operand out of range";;
+esac
+
 post_extract() (
 	# use setup_old.py until have Coin with cmake support
 	mv -f setup_old.py setup.py
diff --git a/srcpkgs/python3-pluggy/template b/srcpkgs/python3-pluggy/template
index 42b31ff8af5..37ebc2dae40 100644
--- a/srcpkgs/python3-pluggy/template
+++ b/srcpkgs/python3-pluggy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pluggy'
 pkgname=python3-pluggy
-version=0.12.0
+version=0.13.0
 revision=1
 archs=noarch
 wrksrc="pluggy-${version}"
@@ -14,7 +14,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="MIT"
 homepage="https://github.com/pytest-dev/pluggy"
 distfiles="${PYPI_SITE}/p/pluggy/pluggy-${version}.tar.gz"
-checksum=0825a152ac059776623854c1543d65a4ad408eb3d33ee114dff91e57ec6ae6fc
+checksum=fa5fa1622fa6dd5c030e9cad086fa19ef6a0cf6d7a2d12318e10cb49d6d68f34
 
 do_check() {
 	python3 -m pytest
diff --git a/srcpkgs/python3-precis-i18n/template b/srcpkgs/python3-precis-i18n/template
index 6187f3b9ef9..19612bc818b 100644
--- a/srcpkgs/python3-precis-i18n/template
+++ b/srcpkgs/python3-precis-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-precis-i18n'
 pkgname=python3-precis-i18n
-version=1.0.0
+version=1.0.1
 revision=1
 archs=noarch
 wrksrc="precis_i18n-${version}"
@@ -9,11 +9,11 @@ pycompile_module="precis_i18n"
 hostmakedepends="python3-setuptools"
 depends="python3"
 short_desc="Internationalized usernames and passwords"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/byllyfish/precis_i18n"
 distfiles="${PYPI_SITE}/p/precis_i18n/precis_i18n-${version}.tar.gz"
-checksum=227ac196b8a31b1209030bfbe90616dd375be946e0a9403349dd45851adf503e
+checksum=5abd7c06e5247fb519089c7649c9b775f934f0d1cc0a680b44fbeb2d5403aed8
 
 do_check() {
 	python3 setup.py test
diff --git a/srcpkgs/python3-pretend b/srcpkgs/python3-pretend
new file mode 120000
index 00000000000..50477566bea
--- /dev/null
+++ b/srcpkgs/python3-pretend
@@ -0,0 +1 @@
+python-pretend
\ No newline at end of file
diff --git a/srcpkgs/python3-pulsectl/template b/srcpkgs/python3-pulsectl/template
index 4e4a9efdaa5..429dd1abe45 100644
--- a/srcpkgs/python3-pulsectl/template
+++ b/srcpkgs/python3-pulsectl/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pulsectl'
 pkgname=python3-pulsectl
-version=18.12.5
+version=19.9.5
 revision=1
 archs=noarch
 wrksrc="pulsectl-${version}"
@@ -9,12 +9,12 @@ pycompile_module="pulsectl"
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools"
 short_desc="Python3 high-level interfaces and ctypes bindings for libpulse"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/mk-fg/python-pulse-control"
 changelog="https://github.com/mk-fg/python-pulse-control/raw/master/CHANGES.rst"
 distfiles="${PYPI_SITE}/p/pulsectl/pulsectl-${version}.tar.gz"
-checksum=41db4dd19e7cd28e2609baf2b551f34991f1890024be119b6075a286abfb65d3
+checksum=c4a739f2f4750c2e6be879fe085935f81033da71dd8b13c56a42f379f1bafe5d
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/python3-pyfiglet/template b/srcpkgs/python3-pyfiglet/template
new file mode 100644
index 00000000000..d00b4fda62a
--- /dev/null
+++ b/srcpkgs/python3-pyfiglet/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-pyfiglet'
+pkgname=python3-pyfiglet
+version=0.8.0
+revision=1
+archs=noarch
+wrksrc="pyfiglet-${version}"
+build_style="python3-module"
+pycompile_module="pyfiglet"
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Implementation of figlet written in Python"
+maintainer="Illia Shestakov <ishestakov@airmail.cc>"
+license="MIT"
+homepage="https://github.com/pwaller/pyfiglet"
+distfiles="https://github.com/pwaller/pyfiglet/archive/v${version}.tar.gz"
+checksum=0331d8cd949b0def033fce08c9b1f62006b8d1e1dce578dd28fdb02ae0f827f1
+
+post_install() {
+	vlicense LICENSE
+	vdoc README
+}
diff --git a/srcpkgs/python3-pylint b/srcpkgs/python3-pylint
deleted file mode 120000
index 54b18e249c1..00000000000
--- a/srcpkgs/python3-pylint
+++ /dev/null
@@ -1 +0,0 @@
-pylint
\ No newline at end of file
diff --git a/srcpkgs/python3-pylint/template b/srcpkgs/python3-pylint/template
new file mode 100644
index 00000000000..6c8800069f0
--- /dev/null
+++ b/srcpkgs/python3-pylint/template
@@ -0,0 +1,47 @@
+# Template file for 'python3-pylint'
+pkgname=python3-pylint
+version=2.3.1
+revision=2
+archs=noarch
+wrksrc="pylint-${version}"
+build_style=python3-module
+pycompile_module="pylint"
+hostmakedepends="python3-setuptools"
+depends="python3-setuptools python3-astroid python3-six python3-isort
+ python3-mccabe"
+short_desc="Python3 code static checker"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+homepage="http://www.pylint.org/"
+license="GPL-2.0-or-later"
+distfiles="${PYPI_SITE}/p/pylint/pylint-${version}.tar.gz"
+checksum=723e3db49555abaf9bf79dc474c6b9e2935ad82230b10c1138a71ea41ac0fff1
+
+alternatives="
+ pylint:epylint:/usr/bin/epylint3
+ pylint:pylint:/usr/bin/pylint3
+ pylint:pyreverse:/usr/bin/pyreverse3
+ pylint:symilar:/usr/bin/symilar3
+ pylint:epylint.1:/usr/share/man/man1/epylint3.1
+ pylint:pylint.1:/usr/share/man/man1/pylint3.1
+ pylint:pyreverse.1:/usr/share/man/man1/pyreverse3.1
+ pylint:symilar.1:/usr/share/man/man1/symilar3.1"
+
+pre_build() {
+	sed -i '/setup_requires=/d' setup.py
+}
+post_install() {
+	# no tests
+	rm -rf ${DESTDIR}/usr/lib/python*/site-packages/pylint/test
+
+	# create versioned man pages
+	for f in epylint pylint pyreverse symilar; do
+		vman man/${f}.1 ${f}3.1
+		mv ${DESTDIR}/usr/bin/${f} ${DESTDIR}/usr/bin/${f}3
+	done
+
+	# install example config and emacs files
+	vsconf examples/pylintrc
+	vsconf examples/pylintrc_camelcase
+	vsconf elisp/pylint.el
+	vsconf elisp/pylint-flymake.el
+}
diff --git a/srcpkgs/python3-pysol_cards/template b/srcpkgs/python3-pysol_cards/template
index fd85e444508..e03d92fe077 100644
--- a/srcpkgs/python3-pysol_cards/template
+++ b/srcpkgs/python3-pysol_cards/template
@@ -1,20 +1,23 @@
 # Template file for 'python3-pysol_cards'
 pkgname=python3-pysol_cards
-version=0.8.4
+version=0.8.6
 revision=1
 wrksrc="pysol_cards-${version}"
 build_style=python3-module
 pycompile_module="pysol_cards"
 hostmakedepends="python3-setuptools"
-depends="python3-pbr"
-checkdepends="python3-random2 python3-six python3-pyperclip python3-colorama
- python3-cffi python3-appdirs python3-decorator python3-netifaces"
+depends="python3-pbr python3-six"
+checkdepends="python3-appdirs python3-attrs python3-colorama python3-coverage
+ python3-cryptography python3-dogpile.cache python3-future python3-jmespath
+ python3-jsonpointer python3-netifaces python3-pyperclip python3-random2
+ python3-requests python3-stevedore python3-voluptuous python3-wcwidth
+ python3-wrapt python3-yaml"
 short_desc="Deal PySol FC Cards"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="MIT"
 homepage="https://fc-solve.shlomifish.org/"
 distfiles="${PYPI_SITE}/p/pysol_cards/pysol_cards-${version}.tar.gz"
-checksum=24c6d1dd8e6ee3a1d009e6b786e2973377d43e6008fc712fff5d05901936ec78
+checksum=6e536a60fad9a59d5ecc197b0a22718fa8b16de42ede37caa8f7b87b8e256148
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pytest-asyncio/template b/srcpkgs/python3-pytest-asyncio/template
index ad557035c11..bd104f99e2c 100644
--- a/srcpkgs/python3-pytest-asyncio/template
+++ b/srcpkgs/python3-pytest-asyncio/template
@@ -9,7 +9,7 @@ pycompile_module="pytest_asyncio"
 hostmakedepends="python3-setuptools"
 depends="python3-pytest"
 short_desc="Pytest support for asyncio"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/pytest-dev/pytest-asyncio"
 distfiles="${PYPI_SITE}/p/pytest-asyncio/pytest-asyncio-${version}.tar.gz"
diff --git a/srcpkgs/python3-regex b/srcpkgs/python3-regex
new file mode 120000
index 00000000000..172b6e9673d
--- /dev/null
+++ b/srcpkgs/python3-regex
@@ -0,0 +1 @@
+python-regex
\ No newline at end of file
diff --git a/srcpkgs/python3-rfc6555 b/srcpkgs/python3-rfc6555
new file mode 120000
index 00000000000..7275c04c1a4
--- /dev/null
+++ b/srcpkgs/python3-rfc6555
@@ -0,0 +1 @@
+python-rfc6555
\ No newline at end of file
diff --git a/srcpkgs/python3-rsistent/template b/srcpkgs/python3-rsistent/template
index 64c141eab37..13019f472cd 100644
--- a/srcpkgs/python3-rsistent/template
+++ b/srcpkgs/python3-rsistent/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-rsistent'
 pkgname=python3-rsistent
-version=0.14.11
-revision=2
+version=0.15.4
+revision=1
 wrksrc="pyrsistent-${version}"
 build_style=python3-module
 pycompile_module="pyrsistent"
@@ -9,11 +9,11 @@ hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
 depends="python3-six"
 short_desc="Persistent/Functional/Immutable data structures"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/tobgu/pyrsistent/"
 distfiles="${PYPI_SITE}/p/pyrsistent/pyrsistent-${version}.tar.gz"
-checksum=3ca82748918eb65e2d89f222b702277099aca77e34843c5eb9d52451173970e2
+checksum=34b47fa169d6006b32e99d4b3c4031f155e6e68ebcc107d6454852e8e0ee6533
 
 post_intsall() {
 	vlicense LICENSE.mit
diff --git a/srcpkgs/python3-rss2email/template b/srcpkgs/python3-rss2email/template
new file mode 100644
index 00000000000..d07984d33d8
--- /dev/null
+++ b/srcpkgs/python3-rss2email/template
@@ -0,0 +1,16 @@
+# Template file for 'python3-rss2email'
+pkgname=python3-rss2email
+version=3.10
+revision=1
+archs=noarch
+wrksrc="rss2email-${version}"
+build_style=python3-module
+pycompile_module="rss2email"
+hostmakedepends="python3-setuptools"
+depends="python3-feedparser python3-html2text"
+short_desc="Forward RSS feeds to email (community edition)"
+maintainer="Anders Damsgaard <anders@adamsgaard.dk>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/rss2email/rss2email"
+distfiles="https://github.com/rss2email/rss2email/archive/v${version}.tar.gz"
+checksum=922b33f5bc3bce20568b977bff84dfdef3f1f7117fc70cc0b1bee7daa0e0acac
diff --git a/srcpkgs/python3-saml2/template b/srcpkgs/python3-saml2/template
index 6eac12fbaad..e94602a82ea 100644
--- a/srcpkgs/python3-saml2/template
+++ b/srcpkgs/python3-saml2/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-saml2'
 pkgname=python3-saml2
-version=4.7.0
+version=4.8.0
 revision=1
 archs=noarch
 wrksrc="pysaml2-${version}"
@@ -10,8 +10,8 @@ hostmakedepends="python3-setuptools"
 depends="python3-cryptography python3-openssl python3-dateutil python3-pytz
  python3-requests python3-six python3-defusedxml"
 short_desc="Python3 implementation of SAML Version 2 Standard"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/IdentityPython/pysaml2"
 distfiles="${PYPI_SITE}/p/pysaml2/pysaml2-${version}.tar.gz"
-checksum=b4efc61bd882a6afac18d333cb9ebf2ff4c80f99cf92ceaffd7d060e0b691613
+checksum=4115b3acf0cc58c8bf265b120c48c38c5346147748643bb7757462ca47059329
diff --git a/srcpkgs/python3-scard/template b/srcpkgs/python3-scard/template
new file mode 100644
index 00000000000..793f144a74b
--- /dev/null
+++ b/srcpkgs/python3-scard/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-scard'
+pkgname=python3-scard
+_pkgname=pyscard
+version=1.9.8
+revision=1
+wrksrc="${_pkgname}-${version}"
+build_style=python3-module
+pycompile_module=smartcard
+hostmakedepends="python3-setuptools swig"
+makedepends="python3-devel pcsclite-devel"
+depends="python3 pcsclite"
+short_desc="Python library for smartcard"
+maintainer="Doan Tran Cong Danh <congdanhqx@gmail.com>"
+license="LGPL-2.1-or-later"
+homepage="https://pyscard.sourceforge.io/index.html"
+distfiles="${PYPI_SITE}/p/${_pkgname}/${_pkgname}-${version}.tar.gz"
+checksum=f59dc7ee467b210094e64c923e1c7f5e8e9501a672fc0c8f2cd958153e00d095
+
+CPPFLAGS="-I${XBPS_CROSS_BASE}/usr/include/PCSC"
diff --git a/srcpkgs/python3-scikit-learn b/srcpkgs/python3-scikit-learn
deleted file mode 120000
index b21d4d2c2b2..00000000000
--- a/srcpkgs/python3-scikit-learn
+++ /dev/null
@@ -1 +0,0 @@
-python-scikit-learn
\ No newline at end of file
diff --git a/srcpkgs/python3-scikit-learn/template b/srcpkgs/python3-scikit-learn/template
new file mode 100644
index 00000000000..73799b9f420
--- /dev/null
+++ b/srcpkgs/python3-scikit-learn/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-scikit-learn'
+pkgname=python3-scikit-learn
+version=0.20.4
+revision=1
+wrksrc="scikit-learn-${version}"
+build_style=python3-module
+pycompile_module="sklearn"
+hostmakedepends="python3-setuptools python3-Cython"
+makedepends="python3-devel python3-numpy python3-scipy"
+depends="python3-numpy python3-scipy"
+short_desc="Python3 modules for machine learning and data mining"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://scikit-learn.org/"
+distfiles="https://github.com/scikit-learn/scikit-learn/archive/${version}.tar.gz"
+checksum=1ec7a8dbf45fec730afaf6c783a797f9863fefc1225735ac4ce4706cc5857415
+
+post_install() {
+	vlicense COPYING
+}
diff --git a/srcpkgs/python3-scipy b/srcpkgs/python3-scipy
deleted file mode 120000
index 5107676dd24..00000000000
--- a/srcpkgs/python3-scipy
+++ /dev/null
@@ -1 +0,0 @@
-python-scipy
\ No newline at end of file
diff --git a/srcpkgs/python3-scipy/template b/srcpkgs/python3-scipy/template
new file mode 100644
index 00000000000..291ac3734f1
--- /dev/null
+++ b/srcpkgs/python3-scipy/template
@@ -0,0 +1,23 @@
+# Template file for 'python3-scipy'
+pkgname=python3-scipy
+version=1.3.1
+revision=1
+wrksrc="scipy-${version}"
+build_style=python3-module
+pycompile_module="scipy"
+hostmakedepends="python3-setuptools
+ python3-Cython gcc-fortran"
+makedepends="python3-devel python3-numpy lapack-devel"
+depends="python-numpy"
+short_desc="Scientific library for Python3"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://scipy.org/scipylib/"
+distfiles="https://github.com/scipy/scipy/releases/download/v${version}/scipy-${version}.tar.xz"
+checksum=326ffdad79f113659ed0bca80f5d0ed5e28b2e967b438bb1f647d0738073a92e
+
+LDFLAGS="-shared"
+
+post_install() {
+	vlicense LICENSE.txt
+}
diff --git a/srcpkgs/python-scipy/update b/srcpkgs/python3-scipy/update
similarity index 100%
rename from srcpkgs/python-scipy/update
rename to srcpkgs/python3-scipy/update
diff --git a/srcpkgs/python3-scruffy/template b/srcpkgs/python3-scruffy/template
index 86156b901fd..e797b110f42 100644
--- a/srcpkgs/python3-scruffy/template
+++ b/srcpkgs/python3-scruffy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-scruffy'
 pkgname=python3-scruffy
-version=0.3.8
+version=0.3.8.1
 revision=1
 archs=noarch
 wrksrc="scruffy-${version}"
@@ -13,7 +13,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/snare/scruffy"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=6cb1b46010947b0ec3b9247abcb533d74f036122db2f2b2c0c3e5e76966f191f
+checksum=9a4f208ee723d5ee40614b09166ad52a319eb7fa6e4fcfe18ee6cabde3f8d1a6
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-shodan/template b/srcpkgs/python3-shodan/template
index 99fff569849..858a0b921f8 100644
--- a/srcpkgs/python3-shodan/template
+++ b/srcpkgs/python3-shodan/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-shodan'
 pkgname=python3-shodan
-version=1.12.1
+version=1.19.0
 revision=1
 archs=noarch
 wrksrc="shodan-python-${version}"
@@ -14,7 +14,7 @@ maintainer="Alex Childs <misuchiru03+void@gmail.com>"
 license="MIT"
 homepage="https://developer.shodan.io"
 distfiles="https://github.com/achillean/shodan-python/archive/${version}.tar.gz"
-checksum=c8e935fe4262d4267127aa9ec1f1924197853fdf5f26b477c6c8add1ad11a758
+checksum=e27cf7d0168bd3d0e79cf024950e9980f2f539209175bf7badb839a438455fe1
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-signedjson/template b/srcpkgs/python3-signedjson/template
index 4b6b82aab35..6f6fb339fd2 100644
--- a/srcpkgs/python3-signedjson/template
+++ b/srcpkgs/python3-signedjson/template
@@ -10,7 +10,7 @@ hostmakedepends="python3-setuptools"
 depends="python3-canonicaljson>=1.0.0 python3-unpaddedbase64>=1.0.1
  python3-nacl>=0.3.0"
 short_desc="Sign JSON with Ed25519 signatures"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/matrix-org/python-signedjson"
 distfiles="https://github.com/matrix-org/python-signedjson/archive/v${version}.tar.gz"
diff --git a/srcpkgs/python3-sortedcontainers/template b/srcpkgs/python3-sortedcontainers/template
index 3f836afa2b7..2b531ded9b6 100644
--- a/srcpkgs/python3-sortedcontainers/template
+++ b/srcpkgs/python3-sortedcontainers/template
@@ -8,7 +8,7 @@ build_style=python3-module
 pycompile_module="sortedcontainers"
 hostmakedepends="python3-setuptools"
 short_desc="Sorted List, Sorted Dict, Sorted Set"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="http://www.grantjenks.com/docs/sortedcontainers/"
 distfiles="${PYPI_SITE}/s/sortedcontainers/sortedcontainers-${version}.tar.gz"
diff --git a/srcpkgs/python3-spake2/template b/srcpkgs/python3-spake2/template
new file mode 100644
index 00000000000..ff83afed1d6
--- /dev/null
+++ b/srcpkgs/python3-spake2/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-spake2'
+pkgname=python3-spake2
+version=0.8
+revision=1
+archs=noarch
+wrksrc="python-spake2-${version}"
+build_style=python3-module
+pycompile_module="spake2"
+hostmakedepends="python3 python3-setuptools"
+depends="python3-hkdf"
+short_desc="SPAKE2 Password-Authenticated Key Exchange"
+maintainer="travankor <travankor@tuta.io>"
+license="MIT"
+homepage="https://github.com/warner/python-spake2"
+distfiles="https://github.com/warner/python-spake2/archive/v${version}.tar.gz"
+checksum=c96c1d9438ca7f738959690b0860473b5bf8f8b95884f78fd5af11d2e6db662f
+
+post-install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/python3-tabulate/template b/srcpkgs/python3-tabulate/template
index e7685583ff2..19b61edd88c 100644
--- a/srcpkgs/python3-tabulate/template
+++ b/srcpkgs/python3-tabulate/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-tabulate'
 pkgname=python3-tabulate
-version=0.8.3
+version=0.8.4
 revision=1
 archs=noarch
 wrksrc="tabulate-${version}"
@@ -9,11 +9,11 @@ pycompile_module="tabulate.py"
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-wcwidth"
 short_desc="Pretty-print tabular data (Python3)"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://bitbucket.org/astanin/python-tabulate"
 distfiles="${PYPI_SITE}/t/tabulate/tabulate-${version}.tar.gz"
-checksum=8af07a39377cee1103a5c8b3330a421c2d99b9141e9cc5ddd2e3263fea416943
+checksum=dde537a1c44e6d9d635b2489923513bef89fadb181819998cccdf2a99e652464
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-tinycss/template b/srcpkgs/python3-tinycss/template
new file mode 100644
index 00000000000..91fda6f808d
--- /dev/null
+++ b/srcpkgs/python3-tinycss/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-tinycss'
+pkgname=python3-tinycss
+version=0.4
+revision=1
+archs=noarch
+wrksrc=tinycss-${version}
+build_style=python3-module
+pycompile_module="tinycss"
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+depends="python3"
+short_desc="Complete yet simple CSS parser for Python"
+maintainer="mobinmob <mobinmob@disroot.org>"
+license="BSD-3-Clause"
+homepage="https://tinycss.readthedocs.io/en/latest/"
+distfiles="${PYPI_SITE}/t/tinycss/tinycss-${version}.tar.gz"
+checksum=12306fb50e5e9e7eaeef84b802ed877488ba80e35c672867f548c0924a76716e
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/python3-treq/template b/srcpkgs/python3-treq/template
index 78031e04e12..8f210d13489 100644
--- a/srcpkgs/python3-treq/template
+++ b/srcpkgs/python3-treq/template
@@ -10,7 +10,7 @@ hostmakedepends="python3-setuptools"
 depends="python3-incremental python3-requests>=2.1.0 python3-six
  python3-Twisted python3-attrs"
 short_desc="Requests-like API built on top of twisted.web's Agent"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/twisted/treq"
 distfiles="${PYPI_SITE}/t/treq/treq-${version}.tar.gz"
diff --git a/srcpkgs/python3-txacme/template b/srcpkgs/python3-txacme/template
index 999bcdf029d..e6becf593e7 100644
--- a/srcpkgs/python3-txacme/template
+++ b/srcpkgs/python3-txacme/template
@@ -10,7 +10,7 @@ hostmakedepends="python3-setuptools"
 depends="python3-attrs python3-acme python3-josepy python3-treq python3-Twisted
  python3-openssl python3-eliot python3-TxSNI python3-pem"
 short_desc="ACME protocol implementation for Twisted"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/twisted/txacme"
 distfiles="${PYPI_SITE}/t/txacme/txacme-${version}.tar.gz"
diff --git a/srcpkgs/python3-txaio/template b/srcpkgs/python3-txaio/template
new file mode 100644
index 00000000000..fa13338cd30
--- /dev/null
+++ b/srcpkgs/python3-txaio/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-txaio'
+pkgname=python3-txaio
+version=18.8.1
+revision=1
+archs=noarch
+wrksrc="txaio-${version}"
+build_style=python3-module
+pycompile_module="txaio"
+hostmakedepends="python3 python3-setuptools"
+short_desc="Utilities to support code that runs unmodified on Twisted and asyncio"
+maintainer="travankor <travankor@tuta.io>"
+license="MIT"
+homepage="https://github.com/crossbario/txaio"
+distfiles="https://github.com/crossbario/txaio/archive/v${version}.tar.gz"
+checksum=5b468ba8f8cee26e5a6de9e69169fddd9223b418bad9a6e9d3597906a013de97
+
+post-install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/python3-txtorcon/template b/srcpkgs/python3-txtorcon/template
new file mode 100644
index 00000000000..3018a65e457
--- /dev/null
+++ b/srcpkgs/python3-txtorcon/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-txtorcon'
+pkgname=python3-txtorcon
+version=19.1.0
+revision=1
+archs=noarch
+wrksrc="txtorcon-${version}"
+build_style=python3-module
+pycompile_module="twisted txtorcon"
+hostmakedepends="python3 python3-setuptools"
+depends="python3-automat python3-Twisted"
+short_desc="Twisted-based asynchronous Tor control protocol implementation"
+maintainer="travankor <travankor@tuta.io>"
+license="MIT"
+homepage="https://txtorcon.readthedocs.io/en/latest/"
+distfiles="https://github.com/meejah/txtorcon/archive/v${version}.tar.gz"
+checksum=c72d7474ff4385cd60b5c2c52a50ece3f19a6f00259bf0ff0c38b264036e1c2d
+
+post-install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/python3-unpaddedbase64/template b/srcpkgs/python3-unpaddedbase64/template
index 9321e73ae13..37df2c1d642 100644
--- a/srcpkgs/python3-unpaddedbase64/template
+++ b/srcpkgs/python3-unpaddedbase64/template
@@ -9,7 +9,7 @@ pycompile_module="unpaddedbase64.py"
 hostmakedepends="python3-setuptools"
 depends="python3"
 short_desc="Encode and decode Base64 without '=' padding"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://pypi.org/project/unpaddedbase64/"
 distfiles="https://github.com/matrix-org/python-unpaddedbase64/archive/v${version}.tar.gz"
diff --git a/srcpkgs/python3-usb/template b/srcpkgs/python3-usb/template
new file mode 100644
index 00000000000..a081ee5ba76
--- /dev/null
+++ b/srcpkgs/python3-usb/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-usb'
+pkgname=python3-usb
+_pkgname=pyusb
+version=1.0.2
+revision=1
+archs=noarch
+wrksrc="${_pkgname}-${version}"
+build_style=python3-module
+pycompile_module=usb
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python library for USB communication"
+maintainer="Doan Tran Cong Danh <congdanhqx@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://github.com/pyusb/pyusb"
+distfiles="${PYPI_SITE}/p/${_pkgname}/${_pkgname}-${version}.tar.gz"
+checksum=4e9b72cc4a4205ca64fbf1f3fff39a335512166c151ad103e55c8223ac147362
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/python3-validators/template b/srcpkgs/python3-validators/template
index 600d6f4731c..29b9fc74c30 100644
--- a/srcpkgs/python3-validators/template
+++ b/srcpkgs/python3-validators/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-validators'
 pkgname=python3-validators
-version=0.12.5
+version=0.14.0
 revision=1
 archs=noarch
 wrksrc="validators-${version}"
@@ -9,12 +9,12 @@ pycompile_module="validators"
 hostmakedepends="python3-setuptools"
 depends="python3-decorator python3-six"
 short_desc="Python3 Data Validation tools"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/kvesteri/validators"
 changelog="https://raw.githubusercontent.com/kvesteri/validators/master/CHANGES.rst"
 distfiles="${PYPI_SITE}/v/validators/validators-${version}.tar.gz"
-checksum=df3dda070965519283bae72249a36927ee3ea9c206f9ee6f234a71cf19b36136
+checksum=f0ac832212e3ee2e9b10e156f19b106888cf1429c291fbc5297aae87685014ae
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-vdf/template b/srcpkgs/python3-vdf/template
new file mode 100644
index 00000000000..44c635ecdd6
--- /dev/null
+++ b/srcpkgs/python3-vdf/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-vdf'
+pkgname=python3-vdf
+version=3.2
+revision=1
+wrksrc=vdf-${version}
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-setuptools"
+short_desc="Python library for working with Valve's VDF text format"
+maintainer="Caleb JA <skywise@tutanota.de>"
+license="MIT"
+homepage="https://github.com/ValvePython/vdf"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=ad790a34a20d9c5f36b8bd9e93658f85a9e90be7c84bb3a24f893b531a94e3ca
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/python3-virustotal-api/template b/srcpkgs/python3-virustotal-api/template
index fe38c1dc819..2bc6592c91f 100644
--- a/srcpkgs/python3-virustotal-api/template
+++ b/srcpkgs/python3-virustotal-api/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-virustotal-api'
 pkgname=python3-virustotal-api
-version=1.1.10
+version=1.1.11
 revision=1
 archs=noarch
 wrksrc="virustotal-api-${version}"
@@ -13,7 +13,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/blacktop/virustotal-api"
 distfiles="${PYPI_SITE}/v/virustotal-api/virustotal-api-${version}.tar.gz"
-checksum=7705881533852e3d22f45a3e8f266c14f153aee79a6768cec36ff88dd5b625f8
+checksum=9f1d783a848e928a78aa168372645c6899cbbd6b888951e1d6335e5b87de1c3d
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-yara/template b/srcpkgs/python3-yara/template
index f7065a9d994..4a6c56dd083 100644
--- a/srcpkgs/python3-yara/template
+++ b/srcpkgs/python3-yara/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-yara'
 pkgname=python3-yara
-version=3.10.0
+version=3.11.0
 revision=1
 wrksrc="yara-python-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="http://virustotal.github.io/yara/"
 distfiles="https://github.com/VirusTotal/yara-python/archive/v${version}.tar.gz"
-checksum=14ae284b3963eaaea280895647cce9860e3c97d747edb5b9269c78710ee21c2b
+checksum=1280cfa4844902e9d5848c84ecc87da3fc05fbacbd74371bb738d1f4fbba2850
diff --git a/srcpkgs/python3-zipp/template b/srcpkgs/python3-zipp/template
index ad4e3a01713..8445c10825c 100644
--- a/srcpkgs/python3-zipp/template
+++ b/srcpkgs/python3-zipp/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-zipp'
 pkgname=python3-zipp
-version=0.5.2
+version=0.6.0
 revision=1
 archs=noarch
 wrksrc="zipp-${version}"
@@ -14,7 +14,7 @@ license="MIT"
 homepage="https://github.com/jaraco/zipp"
 changelog="https://raw.githubusercontent.com/jaraco/zipp/master/CHANGES.rst"
 distfiles="${PYPI_SITE}/z/zipp/zipp-${version}.tar.gz"
-checksum=4970c3758f4e89a7857a973b1e2a5d75bcdc47794442f2e2dd4fe8e0466e809a
+checksum=3718b1cbcd963c7d4c5511a8240812904164b7f381b647143a89d3b98f9bcd8e
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/qalculate-gtk/template b/srcpkgs/qalculate-gtk/template
index bd303b3470b..065d1005309 100644
--- a/srcpkgs/qalculate-gtk/template
+++ b/srcpkgs/qalculate-gtk/template
@@ -1,6 +1,6 @@
 # Template file for 'qalculate-gtk'
 pkgname=qalculate-gtk
-version=3.3.0
+version=3.4.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config"
@@ -11,4 +11,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
 distfiles="https://github.com/Qalculate/qalculate-gtk/releases/download/v${version}/qalculate-gtk-${version}.tar.gz"
-checksum=45b2ef84dc3c1cc77fff9b78b9a81d7b6e29f7ac6d2c4ed8cdde37a58de77da7
+checksum=6ff0c1e9dd02fc4239569ca78bd3f5b8502676c9a08473e62975da22af97c271
diff --git a/srcpkgs/qalculate/template b/srcpkgs/qalculate/template
index a18d8e94ecd..b00c0d0c6c0 100644
--- a/srcpkgs/qalculate/template
+++ b/srcpkgs/qalculate/template
@@ -1,7 +1,7 @@
 # Template file for 'qalculate'
 pkgname=qalculate
-version=3.3.0
-revision=2
+version=3.4.0
+revision=1
 wrksrc="lib${pkgname}-${version}"
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config"
@@ -12,7 +12,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
 distfiles="https://github.com/Qalculate/libqalculate/releases/download/v${version}/libqalculate-${version}.tar.gz"
-checksum=708f1d461a7856fb94b12c400d6b07b001bbe853d7ac4aa8df43a8fe2a1c8547
+checksum=752d975c3e2cd3ff5827fde5f6d4554a2e5c436826ba8af9cb0623f82615dc60
 
 libqalculate-data_package() {
 	archs=noarch
diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template
index 32a1cadaf56..3dbf7b34ee9 100644
--- a/srcpkgs/qbittorrent/template
+++ b/srcpkgs/qbittorrent/template
@@ -1,6 +1,6 @@
 # Template file for 'qbittorrent'
 pkgname=qbittorrent
-version=4.1.7
+version=4.1.8
 revision=1
 create_wrksrc=yes
 build_style=qmake
@@ -12,7 +12,7 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"
 homepage="http://www.qbittorrent.org/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=1eef2cf930e167e7e1d2d338bf1efc0a4a38cba1211f909bc9741a7b5ff2b330
+checksum=3feea2ea401d933c492630e4406141658f17b5dc0c8cf9267f849ff2078fb0bb
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-svg-devel"
diff --git a/srcpkgs/qemu-user-static/template b/srcpkgs/qemu-user-static/template
index 6f3ecdf1b22..31031fc06cd 100644
--- a/srcpkgs/qemu-user-static/template
+++ b/srcpkgs/qemu-user-static/template
@@ -1,16 +1,16 @@
 # Template file for 'qemu-user-static'
 pkgname=qemu-user-static
-version=4.0.0
-revision=2
+version=4.1.0
+revision=1
 wrksrc="qemu-${version}"
 hostmakedepends="pkg-config automake python"
 makedepends="dtc-devel libglib-static pixman-devel libuuid-devel"
 short_desc="QEMU User-mode emulators (statically compiled)"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.qemu.org"
 distfiles="https://wiki.qemu.org/download/qemu-${version}.tar.bz2"
-checksum=6d7f713f7400c8a636c770118957b13d6a7f72b0d2da4a925d10455d8e33af20
+checksum=49f0de77410d4d0f7d0321ff2c2888b281381f06e1e2dac9ec4d061e3934f4ae
 
 _fmts="aarch64 alpha arm armeb cris i386 m68k microblaze mips mipsel mips64 mips64el ppc ppc64 ppc64abi32 ppc64le s390x sh4 sh4eb sparc sparc32plus sparc64 x86_64"
 
diff --git a/srcpkgs/qemu/patches/0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch b/srcpkgs/qemu/patches/0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch
index 848522715ef..4acb8e070ce 100644
--- a/srcpkgs/qemu/patches/0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch
+++ b/srcpkgs/qemu/patches/0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch
@@ -1,8 +1,8 @@
 Updated version of 0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch for qemu-3.0.0
 from alpine, original author Natanael Copa.
---- linux-user/signal.c	2018-09-04 10:23:03.244301111 +0200
-+++ linux-user/signal.c	2018-09-04 10:29:52.333828797 +0200
-@@ -26,6 +26,13 @@
+--- linux-user/signal.c	2019-08-22 19:46:40.369463327 +0200
++++ linux-user/signal.c	2019-08-22 19:47:25.176898649 +0200
+@@ -25,6 +25,13 @@
  #include "trace.h"
  #include "signal-common.h"
  
@@ -13,6 +13,6 @@ from alpine, original author Natanael Copa.
 +#define __SIGRTMAX (NSIG-1)
 +#endif
 +
- struct target_sigaltstack target_sigaltstack_used = {
-     .ss_sp = 0,
-     .ss_size = 0,
+ static struct target_sigaction sigact_table[TARGET_NSIG];
+ 
+ static void host_signal_handler(int host_signum, siginfo_t *info,
diff --git a/srcpkgs/qemu/patches/musl-ppc.patch b/srcpkgs/qemu/patches/musl-ppc.patch
index 86c21df4f1f..6f066c0b30e 100644
--- a/srcpkgs/qemu/patches/musl-ppc.patch
+++ b/srcpkgs/qemu/patches/musl-ppc.patch
@@ -58,3 +58,16 @@
  
      if (*pcreg > (uintptr_t)safe_syscall_start
          && *pcreg < (uintptr_t)safe_syscall_end) {
+--- util/mmap-alloc.c
++++ util/mmap-alloc.c
+@@ -25,6 +25,10 @@
+ 
+ #ifdef CONFIG_LINUX
+ #include <sys/vfs.h>
++/* musl undefs this on ppc and mips */
++#ifndef MAP_SYNC
++#define MAP_SYNC 0x80000
++#endif
+ #endif
+ 
+ size_t qemu_fd_getpagesize(int fd)
diff --git a/srcpkgs/qemu/template b/srcpkgs/qemu/template
index 630bbd5b206..c78d6ce0352 100644
--- a/srcpkgs/qemu/template
+++ b/srcpkgs/qemu/template
@@ -1,14 +1,13 @@
 # Template file for 'qemu'
 pkgname=qemu
-version=4.0.0
-revision=4
+version=4.1.0
+revision=3
 short_desc="Open Source Processor Emulator"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.qemu.org"
 distfiles="https://wiki.qemu.org/download/qemu-${version}.tar.bz2"
-checksum=6d7f713f7400c8a636c770118957b13d6a7f72b0d2da4a925d10455d8e33af20
-nocross=https://api.travis-ci.org/jobs/210268003/log.txt
+checksum=49f0de77410d4d0f7d0321ff2c2888b281381f06e1e2dac9ec4d061e3934f4ae
 
 nostrip=yes
 hostmakedepends="pkg-config perl python3 automake libtool flex python3-Sphinx"
@@ -31,7 +30,7 @@ desc_option_smartcard="Enable smartcard support"
 desc_option_numa="Enable support for host NUMA"
 
 case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*|ppc64*) build_options_default+=" spice";;
+	i686*|x86_64*|ppc64le*) build_options_default+=" spice";;
 	aarch64-musl) CFLAGS+=" -D_LINUX_SYSINFO_H";;
 esac
 
@@ -62,7 +61,7 @@ do_configure() {
 		--disable-xen --enable-tpm \
 		--enable-vhost-net --enable-vnc-png --enable-virtfs \
 		--enable-libusb --disable-glusterfs --enable-snappy --enable-usb-redir \
-		--enable-pie --localstatedir=/var --datadir=/usr/lib \
+		--enable-pie --localstatedir=/var --datadir=/usr/lib --enable-docs \
 		$(vopt_enable virgl virglrenderer) $(vopt_enable opengl) $(vopt_enable spice) \
 		${want_sdl} \
 		$(vopt_enable smartcard) \
@@ -72,13 +71,6 @@ do_build() {
 	# Remove our strip(1) wrapper... E2BIG.
 	rm -f ${XBPS_WRAPPERDIR}/strip
 
-	if [ "$CROSS_BUILD" ]; then
-		# XXX libtool execs cc and ar.
-		mkdir -p ${wrksrc}/cross
-		ln -sf /usr/bin/${XBPS_CROSS_TRIPLET}-gcc ${wrksrc}/cross/cc
-		ln -sf /usr/bin/${XBPS_CROSS_TRIPLET}-ar ${wrksrc}/cross/ar
-		export PATH=${wrksrc}/cross:$PATH
-	fi
 	make ${makejobs}
 }
 do_install() {
diff --git a/srcpkgs/qgit/template b/srcpkgs/qgit/template
index 7b9de0759c9..e4dcd3e5585 100644
--- a/srcpkgs/qgit/template
+++ b/srcpkgs/qgit/template
@@ -1,9 +1,9 @@
 # Template file for 'qgit'
 pkgname=qgit
-version=2.8
-revision=2
-build_style=cmake
+version=2.9
+revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
+build_style=cmake
 makedepends="qt5-devel"
 depends="git"
 short_desc="Qt-based Git GUI"
@@ -11,7 +11,7 @@ maintainer="Matthias von Faber <mvf@gmx.eu>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/tibirna/qgit"
 distfiles="${homepage}/archive/${pkgname}-${version}.tar.gz"
-checksum=a6751181bde2ff9f3a097694e5c42db689633028b178595f66909d6585cad514
+checksum=69788efda7d434d1bc094bb414bd92c269dc7894326320634500b05d63c008e8
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/qimgv/template b/srcpkgs/qimgv/template
index 6933f900e87..3ead6dbdc2b 100644
--- a/srcpkgs/qimgv/template
+++ b/srcpkgs/qimgv/template
@@ -1,17 +1,18 @@
 # Template file for 'qimgv'
 pkgname=qimgv
-version=0.7.3
+version=0.8.5
 revision=1
 build_style=cmake
 configure_args="$(vopt_if video -DVIDEO_SUPPORT=ON)"
-makedepends="qt5-devel $(vopt_if video mpv-devel)"
+makedepends="exiv2-devel qt5-devel $(vopt_if video mpv-devel)"
 depends="hicolor-icon-theme"
 short_desc="Cross-platform image viewer with webm support"
 maintainer="travankor <travankor@tuta.io>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/easymodo/qimgv"
 distfiles="https://github.com/easymodo/qimgv/archive/v${version}.tar.gz"
-checksum=f5c9e4dfdc0e9842c6cec5d2d546e6f77b2c33312f5cb416eaf50a29a0dc65a1
+checksum=857919b6f0432965fa26e5c72fa293299d797f0253848e18b86218c1b387d562
+
 build_options="video"
 build_options_default="video"
 desc_option_video="Enable video support"
diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template
index 572968cf4eb..38d597225ff 100644
--- a/srcpkgs/qmmp/template
+++ b/srcpkgs/qmmp/template
@@ -1,7 +1,7 @@
 # Template file for 'qmmp'
 pkgname=qmmp
-version=1.3.3
-revision=2
+version=1.3.4
+revision=1
 build_style=cmake
 configure_args="-DUSE_HAL:BOOL=FALSE -DQMMP_DEFAULT_UI:STRING=simple"
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -20,7 +20,7 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-3.0-or-newer"
 homepage="http://qmmp.ylsoftware.com"
 distfiles="http://qmmp.ylsoftware.com/files/${pkgname}-${version}.tar.bz2"
-checksum=471c93cdd15f635893c00db72865e5d475eaf85b0f00cf15c550cfb51f9ee79c
+checksum=e07d9026e5d0c53bf1a057974088363929a06f4e3785447956879b204c7d3b49
 
 qmmp-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/qpdf/template b/srcpkgs/qpdf/template
index 6135ccb9ac3..a84fc8bd777 100644
--- a/srcpkgs/qpdf/template
+++ b/srcpkgs/qpdf/template
@@ -1,6 +1,6 @@
 # Template file for 'qpdf'
 pkgname=qpdf
-version=8.4.2
+version=9.0.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl"
@@ -11,7 +11,7 @@ license="Apache-2.0"
 homepage="http://qpdf.sourceforge.net"
 changelog="https://raw.githubusercontent.com/qpdf/qpdf/master/ChangeLog"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=69a30a65ef9398e6dbf151f1f6a31321cbc0f49b6cc0689ce10ea958bfd13ec3
+checksum=d02451d906068947f45e5216032f0f29ae53313c70c4deedcf3c3e173584d22c
 
 libqpdf_package() {
 	short_desc+=" - shared library"
diff --git a/srcpkgs/qqc2-desktop-style/template b/srcpkgs/qqc2-desktop-style/template
index 1e8a4f8cde8..09a1fa2ba2e 100644
--- a/srcpkgs/qqc2-desktop-style/template
+++ b/srcpkgs/qqc2-desktop-style/template
@@ -1,6 +1,6 @@
 # Template file for 'qqc2-desktop-style'
 pkgname=qqc2-desktop-style
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-or-later, LGPL-3.0-only, GPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/framework/qqc2-desktop-style"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=26042c4f939b94caa559cba3ef171ef7bb1490f57c9907f5e4b30a701659abb4
+checksum=859a2cdc4e5e357e0d8024b68170fcb30a5e9df0e0ecb2fc2dc614ebca38e2eb
 
 qqc2-desktop-style-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/qt/patches/gcc9-qforeach.patch b/srcpkgs/qt/patches/gcc9-qforeach.patch
new file mode 100644
index 00000000000..a5397c9e4fc
--- /dev/null
+++ b/srcpkgs/qt/patches/gcc9-qforeach.patch
@@ -0,0 +1,67 @@
+# reason: FTBFS with gcc9
+# src: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=925811
+
+From c35a3f519007af44c3b364b9af86f6a336f6411b Mon Sep 17 00:00:00 2001
+From: Thiago Macieira <thiago.macieira@intel.com>
+Date: Tue, 11 Feb 2014 16:17:46 -0800
+Subject: [PATCH] Redo the Q_FOREACH loop control without GCC statement
+ expressions
+
+It's possible to do without them, which probably makes the number of
+supported compilers a lot bigger: they just need to support decltype()
+or __typeof__.
+
+That includes the Intel compiler. The old code was also apparently
+working, but no one had realized the old workaround for some old version
+was still in place.
+
+The loop overhead is more or less the same. I have not done benchmarks,
+but inspection of the generated assembly shows more or less the same
+number of instructions.
+
+Change-Id: I32d499c84a6ddd19d994b49f17a469acb5c3a3f1
+Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
+Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
+
+Backported to Qt 4
+
+--- a/src/corelib/global/qglobal.h
++++ b/src/corelib/global/qglobal.h
+@@ -2482,22 +2482,32 @@ typedef uint Flags;
+ 
+ #endif /* Q_NO_TYPESAFE_FLAGS */
+ 
+-#if defined(Q_CC_GNU) && !defined(Q_CC_INTEL) && !defined(Q_CC_RVCT)
++#if (defined(Q_CC_GNU) && !defined(Q_CC_RVCT))
+ /* make use of typeof-extension */
+ template <typename T>
+ class QForeachContainer {
+ public:
+-    inline QForeachContainer(const T& t) : c(t), brk(0), i(c.begin()), e(c.end()) { }
++    inline QForeachContainer(const T& t) : c(t), i(c.begin()), e(c.end()), control(1) { }
+     const T c;
+     int brk;
+     typename T::const_iterator i, e;
++    int control;
+ };
+ 
++// Explanation of the control word:
++//  - it's initialized to 1
++//  - that means both the inner and outer loops start
++//  - if there were no breaks, at the end of the inner loop, it's set to 0, which
++//    causes it to exit (the inner loop is run exactly once)
++//  - at the end of the outer loop, it's inverted, so it becomes 1 again, allowing
++//    the outer loop to continue executing
++//  - if there was a break inside the inner loop, it will exit with control still
++//    set to 1; in that case, the outer loop will invert it to 0 and will exit too
+ #define Q_FOREACH(variable, container)                                \
+ for (QForeachContainer<__typeof__(container)> _container_(container); \
+-     !_container_.brk && _container_.i != _container_.e;              \
+-     __extension__  ({ ++_container_.brk; ++_container_.i; }))                       \
+-    for (variable = *_container_.i;; __extension__ ({--_container_.brk; break;}))
++     _container_.control && _container_.i != _container_.e;         \
++     ++_container_.i, _container_.control ^= 1)                     \
++    for (variable = *_container_.i; _container_.control; _container_.control = 0)
+ 
+ #else
+ 
diff --git a/srcpkgs/qt5-styleplugins/template b/srcpkgs/qt5-styleplugins/template
index 745bcb8f7a5..d136d665c9a 100644
--- a/srcpkgs/qt5-styleplugins/template
+++ b/srcpkgs/qt5-styleplugins/template
@@ -1,19 +1,19 @@
 # Template file for 'qt5-styleplugins'
 pkgname=qt5-styleplugins
 version=5.0.0
-revision=8
-_gitrev=600c296f4d429ffeb8203feb54efeacc2bbea0f7
+revision=10
+_gitrev=335dbece103e2cbf6c7cf819ab6672c2956b17b3
 wrksrc="qtstyleplugins-${_gitrev}"
 build_style=qmake
 hostmakedepends="pkg-config qt5-host-tools qt5-devel"
 makedepends="libxcb-devel libxkbcommon-devel libinput-devel tslib-devel gtk+-devel qt5-devel"
-depends="qt5>=5.13.0<5.13.1"
+depends="qt5>=5.13.1<5.13.2"
 short_desc="Additional style plugins for Qt5"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="LGPL-2.1-only, LGPL-3.0-only"
 homepage="https://github.com/qt/qtstyleplugins"
 distfiles="https://github.com/qt/qtstyleplugins/archive/${_gitrev}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=dbe1c03f00c6eadebc0ed9d5ec1eeb9129e8132c8574545dfa788f505c2dd9a3
+checksum=29ec24fa8df64be161ad06d0e5af3ba1a20bfe265004f5fe4ab9f5f3abf9a5ba
 
 # Cross builds fail with -fuse-ld=gold
 LDFLAGS="-Wl,-fuse-ld=bfd"
diff --git a/srcpkgs/qt5-webkit/patches/musl-ppc.patch b/srcpkgs/qt5-webkit/patches/musl-ppc.patch
new file mode 100644
index 00000000000..21d3017397e
--- /dev/null
+++ b/srcpkgs/qt5-webkit/patches/musl-ppc.patch
@@ -0,0 +1,14 @@
+--- Source/JavaScriptCore/heap/MachineStackMarker.cpp
++++ Source/JavaScriptCore/heap/MachineStackMarker.cpp
+@@ -87,7 +87,11 @@ static void pthreadSignalHandlerSuspendResume(int, siginfo_t*, void* ucontext)
+ 
+     ucontext_t* userContext = static_cast<ucontext_t*>(ucontext);
+ #if CPU(PPC)
++# if defined(__GLIBC__)
+     thread->suspendedMachineContext = *userContext->uc_mcontext.uc_regs;
++# else
++    thread->suspendedMachineContext = *userContext->uc_regs;
++# endif
+ #else
+     thread->suspendedMachineContext = userContext->uc_mcontext;
+ #endif
diff --git a/srcpkgs/qt5-webkit/patches/ppc-llint.patch b/srcpkgs/qt5-webkit/patches/ppc-llint.patch
new file mode 100644
index 00000000000..2fc5a46e523
--- /dev/null
+++ b/srcpkgs/qt5-webkit/patches/ppc-llint.patch
@@ -0,0 +1,32 @@
+This fixes JavaScriptCore on big endian systems (mainly ppc).
+
+Without the patch, attempting to run any JS results in
+a crash as the generated code was endian specific.
+
+--- Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
++++ Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
+@@ -1500,13 +1500,13 @@ _llint_op_put_by_id:
+     loadp StructureChain::m_vector[t3], t3
+     assert(macro (ok) btpnz t3, ok end)
+ 
+-    loadp Structure::m_prototype[t2], t2
++    loadp Structure::m_prototype + PayloadOffset[t2], t2
+     btpz t2, .opPutByIdTransitionChainDone
+ .opPutByIdTransitionChainLoop:
+     loadp [t3], t1
+     bpneq t1, JSCell::m_structureID[t2], .opPutByIdSlow
+     addp 4, t3
+-    loadp Structure::m_prototype[t1], t2
++    loadp Structure::m_prototype + PayloadOffset[t1], t2
+     btpnz t2, .opPutByIdTransitionChainLoop
+ 
+ .opPutByIdTransitionChainDone:
+@@ -1984,7 +1984,7 @@ _llint_throw_from_slow_path_trampoline:
+     # When throwing from the interpreter (i.e. throwing from LLIntSlowPaths), so
+     # the throw target is not necessarily interpreted code, we come to here.
+     # This essentially emulates the JIT's throwing protocol.
+-    loadp Callee[cfr], t1
++    loadp Callee + PayloadOffset[cfr], t1
+     andp MarkedBlockMask, t1
+     loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t1], t1
+     copyCalleeSavesToVMCalleeSavesBuffer(t1, t2)
diff --git a/srcpkgs/qt5-webkit/patches/reduce-exports.patch b/srcpkgs/qt5-webkit/patches/reduce-exports.patch
new file mode 100644
index 00000000000..7addb0f7c16
--- /dev/null
+++ b/srcpkgs/qt5-webkit/patches/reduce-exports.patch
@@ -0,0 +1,27 @@
+Description: reduce the number of exported symbols in libQt5WebKit.so.5
+Author: Dmitry Shachnev <mitya57@debian.org>
+Forwarded: not-needed
+Last-Update: 2017-08-27
+
+--- Source/WTF/wtf/ExportMacros.h
++++ Source/WTF/wtf/ExportMacros.h
+@@ -56,7 +56,7 @@
+ 
+ #elif defined(__GNUC__) && !defined(__CC_ARM) && !defined(__ARMCC__)
+ 
+-#define WTF_EXPORT_DECLARATION __attribute__((visibility("default")))
++#define WTF_EXPORT_DECLARATION
+ #define WTF_IMPORT_DECLARATION WTF_EXPORT_DECLARATION
+ #define WTF_HIDDEN_DECLARATION __attribute__((visibility("hidden")))
+ 
+--- Source/cmake/OptionsQt.cmake
++++ Source/cmake/OptionsQt.cmake
+@@ -658,6 +658,7 @@ if (COMPILER_IS_GCC_OR_CLANG AND UNIX)
+     if (NOT SHARED_CORE)
+         set(CMAKE_C_FLAGS "-fvisibility=hidden ${CMAKE_C_FLAGS}")
+         set(CMAKE_CXX_FLAGS "-fvisibility=hidden -fvisibility-inlines-hidden ${CMAKE_CXX_FLAGS}")
++        add_definitions(-DJS_NO_EXPORT)
+     endif ()
+ endif ()
+ 
+
diff --git a/srcpkgs/qt5-webkit/template b/srcpkgs/qt5-webkit/template
index fefc8261ade..c7c09c1376e 100644
--- a/srcpkgs/qt5-webkit/template
+++ b/srcpkgs/qt5-webkit/template
@@ -1,23 +1,30 @@
 # Template file for 'qt5-webkit'
 pkgname=qt5-webkit
 version=5.212.0
-revision=5
-_snap=1561566461
+revision=6
+_snap=1565895469
 _v=${version%.*}
 wrksrc="qtwebkit-everywhere-src-${_v}"
 build_style=cmake
-configure_args="-DPORT=Qt -DUSE_LD_GOLD=OFF"
+# some nasty stuff to prevent cmake from inducing buggy -O3 and default -g
+configure_args="-DPORT=Qt -DUSE_LD_GOLD=OFF
+ -DCMAKE_CXX_FLAGS_RELEASE=-DNDEBUG
+ -DCMAKE_CXX_FLAGS_DEBUG=-DNDEBUG
+ -DCMAKE_CXX_FLAGS_RELWITHDEBINFO=-DNDEBUG
+ -DCMAKE_C_FLAGS_RELEASE=-DNDEBUG
+ -DCMAKE_C_FLAGS_DEBUG=-DNDEBUG
+ -DCMAKE_C_FLAGS_RELWITHDEBINFO=-DNDEBUG"
 hostmakedepends="flex gperf perl pkg-config python qt5-qmake ruby"
 makedepends="libwebp-devel libxslt-devel libXcomposite-devel sqlite-devel
  libjpeg-turbo-devel gst-plugins-base1-devel qt5-declarative-devel
  qt5-location-devel qt5-sensors-devel qt5-webchannel-devel hyphen-devel
  ruby-devel"
 short_desc="Cross-platform application and UI framework (Qt5) - WebKit2 component"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="q66 <daniel@octaforge.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.qt.io/"
 distfiles="https://download.qt.io/snapshots/ci/qtwebkit/${_v}/${_snap}/src/submodules/qtwebkit-everywhere-src-${_v}.tar.xz"
-checksum=68eae85e7a12077b8004d7a039af065d68112e8e9ab95013f4e01527759fab9f
+checksum=607f0a13e05bbf831d86904d12ae464e7d46a15f0ceed2465487b53512948824
 
 CPPFLAGS="-I${XBPS_CROSS_BASE}/usr/include"
 CXXFLAGS="-fpermissive -Wno-class-memaccess"
@@ -27,25 +34,45 @@ if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DRUBY_CONFIG_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include/ruby-*"
 fi
 
+# only a few platform support JIT
 case "$XBPS_TARGET_MACHINE" in
-	armv6*)	# Need libatomic for __atomic_fetch_add_8 etc.
-		makedepends+=" libatomic-devel"
-		LIBS+=" -latomic"
-		;;
-	ppc64*)	# no JIT on ppc64 and other build workarounds
-		configure_args+=" -DENABLE_JIT=OFF -DUSE_SYSTEM_MALLOC=ON"
-		;;
-	i686*)  # try to reduce memory footprint when linking
-		nodebug=1
-		;;
-	ppc*)   # no JIT on ppc and need libatomic
-		configure_args+=" -DENABLE_JIT=OFF -DUSE_SYSTEM_MALLOC=ON"
+	armv[67]*|aarch64*|i686*|x86_64*|mips*) ;;
+	*) configure_args+=" -DENABLE_JIT=OFF" ;;
+esac
+
+# some platforms need libatomic
+case "$XBPS_TARGET_MACHINE" in
+	ppc64*) ;;
+	armv6*|ppc*)
 		makedepends+=" libatomic-devel"
 		LIBS+=" -latomic"
 		;;
+	*) ;;
+esac
+
+# use system malloc on ppc64le (potential 64k page kernel)
+case "$XBPS_TARGET_MACHINE" in
+	ppc64le*) configure_args+=" -DUSE_SYSTEM_MALLOC=ON" ;;
+	*) ;;
 esac
 
 pre_configure() {
+	# work around large debug symbols on 32-bit hosts
+	if [ "$XBPS_WORDSIZE" = "32" ]; then
+		export CFLAGS="${CFLAGS/-g/-g1}"
+		export CXXFLAGS="${CXXFLAGS/-g/-g1}"
+		export LDFLAGS+=" -Wl,--no-keep-memory"
+	fi
+
+	# the above is not enough for 32-bit ppc and debug
+	case "$XBPS_TARGET_MACHINE" in
+		ppc64*) ;;
+		ppc*)
+			export CFLAGS="${CFLAGS/-O2/-Os}"
+			export CXXFLAGS="${CXXFLAGS/-O2/-Os}"
+			;;
+	esac
+
 	if [ "$CROSS_BUILD" ]; then
 		# XXX: disable failing check for private headers and assume they are available
 		sed -i Source/cmake/OptionsQt.cmake \
diff --git a/srcpkgs/qt5/patches/0027-remove-glibc-check.patch b/srcpkgs/qt5/patches/0027-remove-glibc-check.patch
new file mode 100644
index 00000000000..fd0ab849c01
--- /dev/null
+++ b/srcpkgs/qt5/patches/0027-remove-glibc-check.patch
@@ -0,0 +1,13 @@
+--- qtwebengine/config.tests/glibc/glibc.cpp
++++ qtwebengine/config.tests/glibc/glibc.cpp
+@@ -28,10 +28,6 @@
+ 
+ #include <features.h>
+ 
+-#if __GLIBC__ < 2 || __GLIBC_MINOR__ < 17
+-#error glibc versions below 2.17 are not supported
+-#endif
+-
+ int main(int , char **) {
+   return 0;
+ }
diff --git a/srcpkgs/qt5/patches/0048-qtbug-76742.patch b/srcpkgs/qt5/patches/0048-qtbug-76742.patch
deleted file mode 100644
index 311ad55e4d4..00000000000
--- a/srcpkgs/qt5/patches/0048-qtbug-76742.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Source: https://codereview.qt-project.org/c/qt/qtbase/+/267242
-Upstream: yes
-Reason: fix focus stealing in applications (e.g. VirtualBox)
-
---- qtbase/src/plugins/platforms/xcb/qxcbconnection.cpp	2019-06-13 06:18:18.000000000 +0200
-+++ qtbase/src/plugins/platforms/xcb/qxcbconnection.cpp	2019-07-21 11:56:22.250127747 +0200
-@@ -133,6 +133,7 @@
-         qunsetenv("DESKTOP_STARTUP_ID");
- 
-     m_focusInTimer.setSingleShot(true);
-+    m_focusInTimer.setInterval(100);
-     m_focusInTimer.callOnTimeout([]() {
-         // No FocusIn events for us, proceed with FocusOut normally.
-         QWindowSystemInterface::handleWindowActivated(nullptr, Qt::ActiveWindowFocusReason);
---- qtbase/src/plugins/platforms/xcb/qxcbwindow.cpp	2019-06-13 06:18:18.000000000 +0200
-+++ qtbase/src/plugins/platforms/xcb/qxcbwindow.cpp	2019-07-21 11:58:00.255122346 +0200
-@@ -848,7 +848,7 @@
-     connection()->setFocusWindow(nullptr);
-     relayFocusToModalWindow();
-     // Do not set the active window to nullptr if there is a FocusIn coming.
--    connection()->focusInTimer().start(400);
-+    connection()->focusInTimer().start();
- }
- 
- struct QtMotifWmHints {
diff --git a/srcpkgs/qt5/patches/0049-big-endian-scroll.patch b/srcpkgs/qt5/patches/0049-big-endian-scroll.patch
new file mode 100644
index 00000000000..013fa6a1ab4
--- /dev/null
+++ b/srcpkgs/qt5/patches/0049-big-endian-scroll.patch
@@ -0,0 +1,54 @@
+--- qtbase/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
++++ qtbase/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
+@@ -43,6 +43,7 @@
+ #include "qxcbwindow.h"
+ #include "qtouchdevice.h"
+ #include "QtCore/qmetaobject.h"
++#include "QtCore/qendian.h"
+ #include <qpa/qwindowsysteminterface_p.h>
+ #include <QDebug>
+ #include <cmath>
+@@ -66,6 +67,7 @@
+     xiEventMask.mask = XCB_INPUT_XI_EVENT_MASK_HIERARCHY;
+     xiEventMask.mask |= XCB_INPUT_XI_EVENT_MASK_DEVICE_CHANGED;
+     xiEventMask.mask |= XCB_INPUT_XI_EVENT_MASK_PROPERTY;
++    xiEventMask.mask = qToLittleEndian(xiEventMask.mask);
+     xcb_input_xi_select_events(xcb_connection(), rootWindow(), 1, &xiEventMask.header);
+ }
+ 
+@@ -90,7 +92,7 @@
+     qt_xcb_input_event_mask_t mask;
+     mask.header.deviceid = XCB_INPUT_DEVICE_ALL_MASTER;
+     mask.header.mask_len = 1;
+-    mask.mask = bitMask;
++    mask.mask = qToLittleEndian(bitMask);
+     xcb_void_cookie_t cookie =
+             xcb_input_xi_select_events_checked(xcb_connection(), window, 1, &mask.header);
+     xcb_generic_error_t *error = xcb_request_check(xcb_connection(), cookie);
+@@ -359,7 +361,7 @@
+         qt_xcb_input_event_mask_t xiMask;
+         xiMask.header.deviceid = XCB_INPUT_DEVICE_ALL_MASTER;
+         xiMask.header.mask_len = 1;
+-        xiMask.mask = mask;
++        xiMask.mask = qToLittleEndian(mask);
+ 
+         xcb_void_cookie_t cookie =
+                 xcb_input_xi_select_events_checked(xcb_connection(), window, 1, &xiMask.header);
+@@ -386,7 +388,7 @@
+             tabletDevices.insert(deviceId);
+             xiEventMask[i].header.deviceid = deviceId;
+             xiEventMask[i].header.mask_len = 1;
+-            xiEventMask[i].mask = mask;
++            xiEventMask[i].mask = qToLittleEndian(mask);
+         }
+         xcb_input_xi_select_events(xcb_connection(), window, nrTablets, &(xiEventMask.data()->header));
+     }
+@@ -402,7 +404,7 @@
+ #endif
+             xiEventMask[i].header.deviceid = scrollingDevice.deviceId;
+             xiEventMask[i].header.mask_len = 1;
+-            xiEventMask[i].mask = mask;
++            xiEventMask[i].mask = qToLittleEndian(mask);
+             i++;
+         }
+         xcb_input_xi_select_events(xcb_connection(), window, i, &(xiEventMask.data()->header));
diff --git a/srcpkgs/qt5/patches/0050-pulse-stubs.patch b/srcpkgs/qt5/patches/0050-pulse-stubs.patch
new file mode 100644
index 00000000000..c4f0fae86ee
--- /dev/null
+++ b/srcpkgs/qt5/patches/0050-pulse-stubs.patch
@@ -0,0 +1,49 @@
+Pulse changed API in a recent update and these need to be fixed
+in order to avoid build errors.
+
+--- qtwebengine/src/3rdparty/chromium/media/audio/pulse/pulse.sigs
++++ qtwebengine/src/3rdparty/chromium/media/audio/pulse/pulse.sigs
+@@ -24,11 +24,11 @@ pa_operation* pa_context_get_source_info_by_index(pa_context* c, uint32_t idx, p
+ pa_operation* pa_context_get_source_info_by_name(pa_context* c, const char* name, pa_source_info_cb_t cb, void *userdata);
+ pa_operation* pa_context_get_source_info_list(pa_context* c, pa_source_info_cb_t cb, void* userdata);
+ pa_operation* pa_context_get_sink_info_list(pa_context* c, pa_sink_info_cb_t cb, void* userdata);
+-pa_context_state_t pa_context_get_state(pa_context* c);
++pa_context_state_t pa_context_get_state(const pa_context* c);
+ pa_context* pa_context_new(pa_mainloop_api* mainloop, const char* name);
+ pa_operation* pa_context_set_source_volume_by_index(pa_context* c, uint32_t idx, const pa_cvolume* volume, pa_context_success_cb_t cb, void* userdata);
+ void pa_context_set_state_callback(pa_context* c, pa_context_notify_cb_t cb, void* userdata);
+-pa_operation_state_t pa_operation_get_state(pa_operation* o);
++pa_operation_state_t pa_operation_get_state(const pa_operation* o);
+ void pa_context_unref(pa_context* c);
+ void pa_operation_unref(pa_operation* o);
+ int pa_stream_begin_write(pa_stream* p, void** data, size_t* nbytes);
+@@ -38,23 +38,23 @@ pa_operation* pa_stream_cork(pa_stream* s, int b, pa_stream_success_cb_t cb, voi
+ int pa_stream_disconnect(pa_stream* s);
+ int pa_stream_drop(pa_stream *p);
+ pa_operation* pa_stream_flush(pa_stream* s, pa_stream_success_cb_t cb, void* userdata);
+-uint32_t pa_stream_get_device_index(pa_stream* s);
++uint32_t pa_stream_get_device_index(const pa_stream* s);
+ int pa_stream_get_latency(pa_stream* s, pa_usec_t* r_usec, int* negative);
+-pa_stream_state_t pa_stream_get_state(pa_stream* p);
++pa_stream_state_t pa_stream_get_state(const pa_stream* p);
+ pa_stream* pa_stream_new(pa_context*  c, const char*  name, const pa_sample_spec*  ss, const pa_channel_map *  map);
+ pa_stream* pa_stream_new_with_proplist(pa_context* c, const char* name, const pa_sample_spec* ss, const pa_channel_map* map, pa_proplist* p);
+ pa_proplist* pa_proplist_new(void);
+-int pa_proplist_contains(pa_proplist* p, const char* key);
++int pa_proplist_contains(const pa_proplist* p, const char* key);
+ void pa_proplist_free(pa_proplist* p);
+-const char* pa_proplist_gets(pa_proplist* p, const char* key);
++const char* pa_proplist_gets(const pa_proplist* p, const char* key);
+ int pa_proplist_sets(pa_proplist* p, const char* key, const char* value);
+-size_t pa_stream_readable_size(pa_stream *p);
++size_t pa_stream_readable_size(const pa_stream *p);
+ int pa_stream_peek(pa_stream* p, const void** data, size_t* nbytes);
+ void pa_stream_set_read_callback(pa_stream* p, pa_stream_request_cb_t cb, void* userdata);
+ void pa_stream_set_state_callback(pa_stream* s, pa_stream_notify_cb_t cb, void* userdata);
+ int pa_stream_write(pa_stream* p, const void* data, size_t nbytes, pa_free_cb_t free_cb, int64_t offset, pa_seek_mode_t seek);
+ void pa_stream_set_write_callback(pa_stream *p, pa_stream_request_cb_t cb, void *userdata);
+ void pa_stream_unref(pa_stream* s);
+-int pa_context_errno(pa_context *c);
++int pa_context_errno(const pa_context *c);
+ const char* pa_strerror(int error);
+ pa_cvolume* pa_cvolume_set(pa_cvolume* a, unsigned  channels, pa_volume_t v);
diff --git a/srcpkgs/qt5/patches/0100-qtbug-77364.patch b/srcpkgs/qt5/patches/0100-qtbug-77364.patch
new file mode 100644
index 00000000000..5a3629bf0b7
--- /dev/null
+++ b/srcpkgs/qt5/patches/0100-qtbug-77364.patch
@@ -0,0 +1,26 @@
+From c09cf578bd7267b867326101cd2d0f39e7c814fe Mon Sep 17 00:00:00 2001
+From: David Faure <david.faure@kdab.com>
+Date: Mon, 09 Sep 2019 18:12:26 +0200
+Subject: [PATCH] QWidget::setFocusProxy: adjust focus widget properly
+
+My commit 3e7463411e adjusted the focus widget by setting
+QApplicationPrivate::focus_widget directly, while there is a method for
+doing this properly, including setFocus_sys() and emitting signals.
+
+Fixes: QTBUG-77364
+Change-Id: I218acf7a9de39173d282ced46def4f65594f80b4
+---
+
+diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
+index cf5a81c..6889c2e 100644
+--- qtbase/src/widgets/kernel/qwidget.cpp
++++ qtbase/src/widgets/kernel/qwidget.cpp
+@@ -6204,7 +6204,7 @@
+ 
+     if (changingAppFocusWidget) {
+         QWidget *newDeepestFocusProxy = d_func()->deepestFocusProxy();
+-        QApplicationPrivate::focus_widget = newDeepestFocusProxy ? newDeepestFocusProxy : this;
++        QApplicationPrivate::setFocusWidget(newDeepestFocusProxy ? newDeepestFocusProxy : this, Qt::NoFocusReason);
+     }
+ }
+ 
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index b74455ff653..0b74add5101 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5'
 pkgname=qt5
-version=5.13.0
-revision=4
+version=5.13.1
+revision=1
 wrksrc="qt-everywhere-src-${version}"
 build_style=gnu-configure
 hostmakedepends="cmake clang flex git glib-devel gperf ninja pkg-config
@@ -21,7 +21,7 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-3.0-or-later, LGPL-3.0-or-later"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/single/qt-everywhere-src-${version}.tar.xz"
-checksum=2cba31e410e169bd5cdae159f839640e672532a4687ea0f265f686421e0e86d6
+checksum=adf00266dc38352a166a9739f1a24a1e36f1be9c04bf72e16e142a256436974e
 replaces="qt5-doc<5.6.0 qt5-quick1<5.6.0 qt5-quick1-devel<5.6.0 qt5-webkit<5.6.0 qt5-webkit-devel<5.6.0
  qt5-enginio<5.7.1 qt5-enginio-devel<5.7.1 qt5-plugin-gtk<5.7.1 qt5-canvas3d<5.13.0"
 
@@ -75,7 +75,7 @@ if [ "$build_option_webengine" ]; then
 	subpackages+=" qt5-webengine qt5-webengine-devel"
 fi
 
-if [ "${XBPS_MACHINE%%-musl}" = i686 ]; then
+if [ "$XBPS_WORDSIZE" -eq 32 ]; then
 	nodebug=yes  # prevent OOM
 fi
 
@@ -412,6 +412,7 @@ do_configure() {
 }
 
 do_build() {
+	export NINJAJOBS=${makejobs}
 	# Run make twice because sometimes a file "chrome/grit/generated_resources.h"
 	# is not yet ready when it is to be included. Repeating make works around that
 	# problem without having to resort to disable_parallel_build=yes
diff --git a/srcpkgs/qt5dxcb-plugin/template b/srcpkgs/qt5dxcb-plugin/template
index 5013fc8751e..1dbb3a8f99c 100644
--- a/srcpkgs/qt5dxcb-plugin/template
+++ b/srcpkgs/qt5dxcb-plugin/template
@@ -1,14 +1,14 @@
 # Template file for 'qt5dxcb-plugin'
 pkgname=qt5dxcb-plugin
 version=5.0.1
-revision=1
+revision=2
 build_style=qmake
 make_build_args="VERSION=${version}"
 hostmakedepends="pkg-config qt5-qmake"
 makedepends="cairo-devel libSM-devel libXi-devel libxkbcommon-devel
  qt5-x11extras-devel xcb-util-image-devel xcb-util-keysyms-devel
  xcb-util-renderutil-devel xcb-util-wm-devel"
-depends="qt5>=5.13.0<5.13.1"
+depends="qt5>=5.13.1<5.13.2"
 short_desc="Qt platform plugins for DDE"
 maintainer="John <johnz@posteo.net>"
 license="GPL-3.0-or-later"
@@ -29,6 +29,11 @@ pre_configure() {
 		msg_red "${_qt5_version%_*} does not match ${_qt5_dep_ver}\\n"
 		exit 1
 	fi
+
+	# no headers for 5.13.1 yet; 5.13.0 headers are the same for this
+	# remove on next version upgrade (after upstream has added them)
+	ln -s ${wrksrc}/platformplugin/libqt5xcbqpa-dev/5.13.0 \
+		${wrksrc}/platformplugin/libqt5xcbqpa-dev/5.13.1
 }
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/qt5integration/template b/srcpkgs/qt5integration/template
index 5fcb13ba952..5b948a83f4e 100644
--- a/srcpkgs/qt5integration/template
+++ b/srcpkgs/qt5integration/template
@@ -1,12 +1,12 @@
 # Template file for 'qt5integration'
 pkgname=qt5integration
 version=5.0.0
-revision=1
+revision=2
 build_style=qmake
 hostmakedepends="qt5-qmake pkg-config"
 makedepends="libqtxdg-devel dtkwm-devel dtkwidget-devel mtdev-devel
  qt5-svg-devel qt5-x11extras-devel qt5-multimedia-devel"
-depends="qt5dxcb-plugin qt5-styleplugins qt5>=5.13.0<5.13.1"
+depends="qt5dxcb-plugin qt5-styleplugins qt5>=5.13.1<5.13.2"
 short_desc="Qt platform theme integration plugins for Deepin Desktop Environment"
 maintainer="John <johnz@posteo.net>"
 license="GPL-3.0-or-later"
diff --git a/srcpkgs/qt5pas/template b/srcpkgs/qt5pas/template
index f47b4eec5d7..0d8c75b9240 100644
--- a/srcpkgs/qt5pas/template
+++ b/srcpkgs/qt5pas/template
@@ -7,7 +7,7 @@ build_style=qmake
 hostmakedepends="qt5-qmake"
 makedepends="qt5-devel qt5-x11extras-devel"
 short_desc="Qt5 interface bindings for Pascal"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-3.0-or-later"
 homepage="https://svn.freepascal.org/svn/lazarus/trunk/lcl/interfaces/qt5/cbindings"
 distfiles="${DEBIAN_SITE}/main/libq/libqtpas/libqtpas_${version}.orig.tar.xz"
diff --git a/srcpkgs/qtcreator/patches/clang9.patch b/srcpkgs/qtcreator/patches/clang9.patch
new file mode 100644
index 00000000000..25a1a861746
--- /dev/null
+++ b/srcpkgs/qtcreator/patches/clang9.patch
@@ -0,0 +1,11 @@
+--- src/plugins/clangformat/clangformatutils.cpp
++++ src/plugins/clangformat/clangformatutils.cpp
+@@ -60,7 +60,7 @@ static clang::format::FormatStyle qtcStyle()
+     style.AllowShortBlocksOnASingleLine = false;
+     style.AllowShortCaseLabelsOnASingleLine = false;
+     style.AllowShortFunctionsOnASingleLine = FormatStyle::SFS_Inline;
+-    style.AllowShortIfStatementsOnASingleLine = false;
++    style.AllowShortIfStatementsOnASingleLine = FormatStyle::SIS_Never;
+     style.AllowShortLoopsOnASingleLine = false;
+     style.AlwaysBreakAfterReturnType = FormatStyle::RTBS_None;
+     style.AlwaysBreakBeforeMultilineStrings = false;
diff --git a/srcpkgs/qtcreator/template b/srcpkgs/qtcreator/template
index 40615534e8f..e52abce9d49 100644
--- a/srcpkgs/qtcreator/template
+++ b/srcpkgs/qtcreator/template
@@ -1,7 +1,7 @@
 # Template file for 'qtcreator'
 pkgname=qtcreator
-version=4.9.2
-revision=3
+version=4.10.1
+revision=1
 wrksrc="qt-creator-opensource-src-${version}"
 build_style=qmake
 make_install_args="INSTALL_ROOT=\${DESTDIR}/usr"
@@ -14,13 +14,11 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-3.0-only,QtCompany-GPL-Exception-1.0"
 homepage="https://wiki.qt.io/Category:Tools::QtCreator"
 distfiles="https://download.qt.io/official_releases/qtcreator/${version%.*}/${version}/${wrksrc}.tar.xz"
-checksum=b7e0c797e7704c6c22eb35351946c0a758502fd082f6beaee043166e1739d3d7
-
-nocross="clang in makedepends: at-spi2-atk-2.30.0_1: broken, unresolvable shlib 'ld-linux-armhf.so.3'"
+checksum=5098d87027bec3296bd93a7e112588759ccb0511fbfdc5558c1a1e83dff8d2a9
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-declarative-devel qt5-host-tools qt5-script-devel qt5-tools-devel"
-	makedepends+=" clang"
+	makedepends+=" clang llvm"
 fi
 
 pre_configure() {
@@ -42,11 +40,14 @@ qtcreator-full_package() {
  qt5-quickcontrols2-devel qt5-remoteobjects-devel qt5-script-devel qt5-scxml-devel
  qt5-sensors-devel qt5-serialbus-devel qt5-serialport-devel qt5-speech-devel qt5-svg-devel
  qt5-tools-devel qt5-virtualkeyboard-devel qt5-wayland-devel qt5-webchannel-devel
- qt5-webengine-devel qt5-webglplugin-devel qt5-websockets-devel qt5-webview-devel
+ qt5-webglplugin-devel qt5-webkit-devel qt5-websockets-devel qt5-webview-devel
  qt5-x11extras-devel qt5-xmlpatterns-devel qt5-tools-devel qt5-host-tools
  qt5-examples qt5-imageformats qt5-graphicaleffects qt5-translations
- qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds
- qt5-webkit-devel"
+ qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds"
+	case "$XBPS_TARGET_MACHINE" in
+		ppc|ppc-musl) ;;
+		*) depends+=" qt5-webengine-devel" ;;
+	esac
 	build_style=meta
 	pkg_install() {
 		echo "Just the dependencies"
diff --git a/srcpkgs/qtcurve/patches/gtkprops_constexpr.patch b/srcpkgs/qtcurve/patches/gtkprops_constexpr.patch
new file mode 100644
index 00000000000..c0e80d1e316
--- /dev/null
+++ b/srcpkgs/qtcurve/patches/gtkprops_constexpr.patch
@@ -0,0 +1,29 @@
+From ee2228ea2f18ac5da9b434ee6089381df815aa94 Mon Sep 17 00:00:00 2001
+From: Yichao Yu <yyc1992@gmail.com>
+Date: Wed, 5 Jun 2019 09:03:40 -0400
+Subject: [utils/gtkprops] Remove unnecessary constexpr, this is not allowed in
+ C++14
+
+BUG: 408286
+---
+ lib/utils/gtkprops.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+(limited to 'lib/utils/gtkprops.h')
+
+diff --git a/lib/utils/gtkprops.h b/lib/utils/gtkprops.h
+index abc0675..e248255 100644
+--- lib/utils/gtkprops.h
++++ lib/utils/gtkprops.h
+@@ -74,7 +74,7 @@ class GtkWidgetProps {
+         };
+ #define DEF_WIDGET_SIG_CONN_PROPS(name)                                 \
+         struct _SigConn_##name##_ObjGetter {                            \
+-            constexpr inline GObject*                                   \
++            inline GObject*                                             \
+             operator()(SigConn<_SigConn_##name##_ObjGetter> *p) const   \
+             {                                                           \
+                 return (GObject*)qtcContainerOf(p, Props, name)->m_w;   \
+-- 
+cgit v1.1
+
diff --git a/srcpkgs/qtcurve/template b/srcpkgs/qtcurve/template
index 3ced623a5a0..9f1011e9a53 100644
--- a/srcpkgs/qtcurve/template
+++ b/srcpkgs/qtcurve/template
@@ -1,16 +1,18 @@
 # Template file for 'qtcurve'
 pkgname=qtcurve
 version=1.9.1
-revision=1
+revision=3
 build_style=cmake
-hostmakedepends="pkg-config extra-cmake-modules automoc4 perl qt-qmake"
-makedepends="libxcb-devel libX11-devel qt-devel qt5-devel gtk+-devel
- phonon-devel qt5-svg-devel qt5-x11extras-devel frameworkintegration-devel
+configure_args="-DENABLE_QT4=OFF"
+hostmakedepends="pkg-config extra-cmake-modules perl qt5-qmake qt5-host-tools
+ kcoreaddons gdk-pixbuf-devel"
+makedepends="libxcb-devel libX11-devel qt5-devel gtk+-devel
+ qt5-svg-devel qt5-x11extras-devel frameworkintegration-devel
  ki18n-devel kdelibs4support-devel"
-homepage="https://quickgit.kde.org/?p=qtcurve.git"
-short_desc="A configurable set of widget styles for KDE and Gtk"
+short_desc="Configurable set of widget styles for KDE and Gtk"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
-license="LGPL-2.1"
-configure_args="-DQT_QMAKE_EXECUTABLE=/usr/bin/qmake-qt4 -DQTC_QT4_ENABLE_KDE=false"
+license="LGPL-2.1-or-later"
+homepage="https://quickgit.kde.org/?p=qtcurve.git"
 distfiles="https://github.com/KDE/qtcurve/archive/${version}.tar.gz"
 checksum=fbfdafdac90d4c540dd55a4accfecfc3a17c1f532c5241e28003348beafaca15
+nocross="tries to execute a helper binary compiled for target on the host"
diff --git a/srcpkgs/qtfm/template b/srcpkgs/qtfm/template
index 149e4afd901..f7d177a9339 100644
--- a/srcpkgs/qtfm/template
+++ b/srcpkgs/qtfm/template
@@ -1,18 +1,18 @@
 # Template file for 'qtfm'
 pkgname=qtfm
-version=6.1.8
+version=6.2.0
 revision=1
 build_style=qmake
 configure_args="CONFIG+=release"
 makedepends="qt5-devel"
 depends="hicolor-icon-theme"
 short_desc="Lightweight file manager for Linux desktops based on pure Qt"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Frank Steinborn <steinex@nognu.de>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/rodlie/qtfm"
 changelog="https://raw.githubusercontent.com/rodlie/qtfm/master/ChangeLog"
 distfiles="https://github.com/rodlie/qtfm/archive/${version}.tar.gz"
-checksum=dddeaebcd05b91fb0124f26c3076a71872060aeba1995f35fc6773ac6c10de46
+checksum=58c6af502b606e63f96e8aec96b65ca9125be18ecdd5e4680ccaf50e9c40b064
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel"
diff --git a/srcpkgs/qtpass/patches/qmake-qt5.13.patch b/srcpkgs/qtpass/patches/qmake-qt5.13.patch
index 45bacf75a4a..cc20f357b02 100644
--- a/srcpkgs/qtpass/patches/qmake-qt5.13.patch
+++ b/srcpkgs/qtpass/patches/qmake-qt5.13.patch
@@ -1,10 +1,11 @@
 --- src/src.pro	2018-06-04 11:43:53.000000000 +0200
 +++ -	2019-07-10 02:36:51.536590804 +0200
-@@ -7,6 +7,31 @@
+@@ -7,6 +7,32 @@
  CONFIG += c++11 staticlib
  CONFIG(release, debug|release):DEFINES += QT_NO_DEBUG_OUTPUT
  
 +TRANSLATIONS    +=  ../localization/localization_nl_NL.ts \
++                    ../localization/localization_nl.ts \
 +                    ../localization/localization_ca.ts \
 +                    ../localization/localization_de_DE.ts \
 +                    ../localization/localization_es_ES.ts \
diff --git a/srcpkgs/qtpass/template b/srcpkgs/qtpass/template
index 80b6bc6c712..cce56db1986 100644
--- a/srcpkgs/qtpass/template
+++ b/srcpkgs/qtpass/template
@@ -1,6 +1,6 @@
 # Template file for 'qtpass'
 pkgname=qtpass
-version=1.2.3
+version=1.3.2
 revision=1
 wrksrc="QtPass-${version}"
 build_style=qmake
@@ -13,8 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://qtpass.org/"
 changelog="https://raw.githubusercontent.com/IJHack/QtPass/master/CHANGELOG.md"
 distfiles="https://github.com/IJHack/${pkgname}/archive/v${version}.tar.gz"
-checksum=658b632bb06e9ad63d5076aace5fe0e57a0f7f20e0aafdfb64f86a25bdadbb07
-
+checksum=7a68e1afe68462c878c212a79c40ade5ba14b72710c5e62450cf54c7b5621254
 
 do_install() {
 	vbin main/qtpass
diff --git a/srcpkgs/quadrapassel/template b/srcpkgs/quadrapassel/template
index 903e65aab66..46d3bbb1feb 100644
--- a/srcpkgs/quadrapassel/template
+++ b/srcpkgs/quadrapassel/template
@@ -1,14 +1,14 @@
 # Template file for 'quadrapassel'
 pkgname=quadrapassel
-version=3.32.0
+version=3.34.1
 revision=1
 build_style=meson
 hostmakedepends="glib-devel itstool pkg-config vala"
-makedepends="gtk+3-devel libglib-devel libcanberra-devel
+makedepends="gsound-devel gtk+3-devel libglib-devel libcanberra-devel
  clutter-gtk-devel librsvg-devel libmanette-devel"
 short_desc="GNOME classic falling-block game (Tetris)"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Quadrapassel"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fe6ee9f45f262317606b1ea40259d363e45a126cc2e686526de9db794a0a11fe
+checksum=b39acdd4754580dfcdf5a48f22945826926f3b324c92e417144f610a528706e2
diff --git a/srcpkgs/qutebrowser/template b/srcpkgs/qutebrowser/template
index ce0987fdda7..11b74e4445d 100644
--- a/srcpkgs/qutebrowser/template
+++ b/srcpkgs/qutebrowser/template
@@ -1,6 +1,6 @@
 # Template file for 'qutebrowser'
 pkgname=qutebrowser
-version=1.7.0
+version=1.8.1
 revision=1
 archs=noarch
 build_style=python3-module
@@ -15,7 +15,7 @@ license="GPL-3.0-or-later"
 homepage="https://qutebrowser.org/"
 changelog="https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/changelog.asciidoc"
 distfiles="https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz"
-checksum=f1f01b33669a9b08071997bb2642d46a1e5be9e293bdeb817d83db8dc5aad273
+checksum=dcf6eb63fc2430ac28ee40e2a236391adb7cdbe7debf4cbe53e0d12ff8726e32
 
 pre_build() {
 	a2x -f manpage doc/qutebrowser.1.asciidoc
diff --git a/srcpkgs/racket/template b/srcpkgs/racket/template
index 520ae7a8177..0f6f48ab79e 100644
--- a/srcpkgs/racket/template
+++ b/srcpkgs/racket/template
@@ -1,6 +1,6 @@
 # Template file for 'racket'
 pkgname=racket
-version=7.3
+version=7.4
 revision=1
 build_style=gnu-configure
 build_wrksrc=src
@@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="LGPL-3"
 homepage="http://racket-lang.org/"
 distfiles="http://mirror.racket-lang.org/installers/${version}/${pkgname}-${version}-src.tgz"
-checksum=d49b11de4aa8f62d23d096134d4246f6cbd7a1da326645fecc072d28ad38c040
+checksum=118495f3b5d530096066fa820f1fa41f84cc84a6a39197ec03546b3e95462e1f
 nostrip=yes
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/radare2/template b/srcpkgs/radare2/template
index 4dbd803fa0c..a1210480750 100644
--- a/srcpkgs/radare2/template
+++ b/srcpkgs/radare2/template
@@ -1,15 +1,15 @@
 # Template file for 'radare2'
 # cutter needs to be bumped when radare2 is updated
 pkgname=radare2
-version=3.7.1
+version=3.9.0
 revision=1
 build_style=gnu-configure
 configure_args="--with-syscapstone"
 hostmakedepends="pkg-config"
 makedepends="capstone-devel"
 short_desc="Advanced command line debugger and hexadecimal editor"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="LGPL-3.0-only"
 homepage="http://www.radare.org"
 distfiles="https://github.com/radare/radare2/archive/${version}.tar.gz"
-checksum=89c605c307e7d29458aa816dfa556077a63474474838b9a5f45d2691b32ba0d5
+checksum=270cf67d0dee8dab4ed21dfaab57671b479ec82f0fc8d1c988e121c48b51addc
diff --git a/srcpkgs/radeon-profile/template b/srcpkgs/radeon-profile/template
index 9050aee2d76..732d462b322 100644
--- a/srcpkgs/radeon-profile/template
+++ b/srcpkgs/radeon-profile/template
@@ -1,6 +1,6 @@
 # Template file for 'radeon-profile'
 pkgname=radeon-profile
-version=20190603
+version=20190903
 revision=1
 build_wrksrc=radeon-profile
 build_style=qmake
@@ -10,7 +10,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/marazmista/radeon-profile"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=f027d2dcc3278a8ce684778359310ee02ee7c79fa5c4ecc56e636a4020bdeeed
+checksum=932fb27bbd491216a6eb0267b9d834ec79fd606a8b1492d4b72a5599f85d3b47
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-qmake qt5-charts-devel"
diff --git a/srcpkgs/rakudo/patches/fix-perl6-home-dir.patch b/srcpkgs/rakudo/patches/fix-perl6-home-dir.patch
new file mode 100644
index 00000000000..3bd5046a4e8
--- /dev/null
+++ b/srcpkgs/rakudo/patches/fix-perl6-home-dir.patch
@@ -0,0 +1,26 @@
+diff --git src/main.nqp src/main.nqp
+index b53302759..bd9aeb5d5 100644
+--- src/main.nqp
++++ src/main.nqp
+@@ -33,7 +33,7 @@ my $install-dir := $execname eq ''
+ 
+ my $perl6-home := $comp.config<static_perl6_home>
+     // nqp::getenvhash()<PERL6_HOME>
+-    // $install-dir ~ '/share/perl6';
++    // $comp.config<libdir> ~ '/perl6';
+ if nqp::substr($perl6-home, nqp::chars($perl6-home) - 1) eq $sep {
+     $perl6-home := nqp::substr($perl6-home, 0, nqp::chars($perl6-home) - 1);
+ }
+diff --git tools/lib/NQP/Config/Rakudo.pm tools/lib/NQP/Config/Rakudo.pm
+index 90839c229..2819b60b6 100644
+--- tools/lib/NQP/Config/Rakudo.pm
++++ tools/lib/NQP/Config/Rakudo.pm
+@@ -347,7 +347,7 @@ sub configure_moar_backend {
+           );
+         $config->{static_perl6_home} =
+           File::Spec->rel2abs(
+-            File::Spec->catdir( $config->{prefix}, 'share', 'perl6' ) );
++            File::Spec->catdir( $config->{libdir}, 'perl6' ) );
+         $config->{static_nqp_home_define} =
+           '-DSTATIC_NQP_HOME='
+           . $self->c_escape_string( $config->{static_nqp_home} );
diff --git a/srcpkgs/rakudo/template b/srcpkgs/rakudo/template
index 01cbe144520..ff5d757cd71 100644
--- a/srcpkgs/rakudo/template
+++ b/srcpkgs/rakudo/template
@@ -1,7 +1,7 @@
 # Template file for 'rakudo'
 pkgname=rakudo
 version=2019.07.1
-revision=1
+revision=2
 build_style=configure
 make_check_target=test
 make_install_args="RAKUDO_LOG_PRECOMP=1 RAKUDO_RERESOLVE_DEPENDENCIES=0"
@@ -27,7 +27,7 @@ make_dirs="
  /usr/lib/perl6/vendor/sources 0755 root root"
 hostmakedepends="perl"
 makedepends="libatomic_ops-devel libffi-devel libtommath-devel libuv-devel nqp"
-depends="nqp-${version}_${revision}"
+depends="nqp>=${version}_1"
 short_desc="Production-ready, stable implementation of the Perl 6 language"
 maintainer="Ruslan <axetwe@gmail.com>"
 license="Artistic-2.0"
diff --git a/srcpkgs/range-v3/patches/fix-is_trivial.patch b/srcpkgs/range-v3/patches/fix-is_trivial.patch
deleted file mode 100644
index 8e7e80546f7..00000000000
--- a/srcpkgs/range-v3/patches/fix-is_trivial.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-diff --git include/meta/meta_fwd.hpp include/meta/meta_fwd.hpp
-index edfb9068..ac041999 100644
---- include/meta/meta_fwd.hpp
-+++ include/meta/meta_fwd.hpp
-@@ -152,6 +152,13 @@
- #define META_TYPE_CONSTRAINT(...) typename
- #endif
- 
-+#if (defined(__cpp_lib_type_trait_variable_templates) && \
-+     __cpp_lib_type_trait_variable_templates > 0)
-+#define META_CXX_TRAIT_VARIABLE_TEMPLATES 1
-+#else
-+#define META_CXX_TRAIT_VARIABLE_TEMPLATES 0
-+#endif
-+
- namespace meta
- {
- #if META_CXX_INTEGER_SEQUENCE
-@@ -208,8 +215,10 @@ namespace meta
-         META_CONCEPT_BARRIER(__is_same(T, U));
- #elif defined(__GNUC__) && __GNUC__ >= 6
-         META_CONCEPT_BARRIER(__is_same_as(T, U));
--#else
-+#elif defined(META_CXX_TRAIT_VARIABLE_TEMPLATES)
-         META_CONCEPT_BARRIER(std::is_same_v<T, U>);
-+#else
-+        META_CONCEPT_BARRIER(std::is_same<T, U>::value);
- #endif
- 
-     template <template <typename...> class C, typename... Ts>
-@@ -248,7 +257,11 @@ namespace meta
-         typename T::type::value_type;
-     }
-     && Same<typename T::value_type, typename T::type::value_type>
-+#if META_CXX_TRAIT_VARIABLE_TEMPLATES
-     && std::is_integral_v<typename T::value_type>
-+#else
-+    && std::is_integral<typename T::value_type>::value
-+#endif
-     && requires
-     {
-         // { T::value } -> Same<const typename T::value_type&>;
-diff --git include/range/v3/range_fwd.hpp include/range/v3/range_fwd.hpp
-index 0378a0bd..2fabf26c 100644
---- include/range/v3/range_fwd.hpp
-+++ include/range/v3/range_fwd.hpp
-@@ -247,6 +247,16 @@ namespace ranges
-             struct priority_tag<0>
-             {};
- 
-+        template<typename T>
-+        using is_trivial = meta::bool_<
-+#if META_CXX_TRAIT_VARIABLE_TEMPLATES
-+            std::is_trivially_copyable_v<T> &&
-+            std::is_trivially_default_constructible_v<T>>;
-+#else
-+            std::is_trivially_copyable<T>::value &&
-+            std::is_trivially_default_constructible<T>::value>;
-+#endif
-+
-         #if defined(__clang__) && !defined(_LIBCPP_VERSION)
-             template<typename T, typename... Args>
-             using is_trivially_constructible =
-@@ -272,19 +282,6 @@ namespace ranges
-             template<typename T>
-             using is_trivially_copyable =
-                 meta::bool_<__is_trivially_copyable(T)>;
--        #elif defined(__GNUC__) && !defined(__clang__) && __GNUC__ < 5
--            template<typename T>
--            using is_trivially_default_constructible = std::is_trivial<T>;
--            template<typename T>
--            using is_trivially_copy_constructible = std::is_trivial<T>;
--            template<typename T>
--            using is_trivially_move_constructible = std::is_trivial<T>;
--            template<typename T>
--            using is_trivially_copy_assignable = std::is_trivial<T>;
--            template<typename T>
--            using is_trivially_move_assignable = std::is_trivial<T>;
--            template<typename T>
--            using is_trivially_copyable = std::is_trivial<T>;
-         #else
-             template<typename T>
-             using is_trivially_default_constructible =
-diff --git include/range/v3/utility/box.hpp include/range/v3/utility/box.hpp
-index 5e8b90dd..33d674df 100644
---- include/range/v3/utility/box.hpp
-+++ include/range/v3/utility/box.hpp
-@@ -128,7 +128,7 @@ namespace ranges
-             // MSVC pukes passing non-constant-expression objects to constexpr
-             // functions, so do not coalesce.
-             template<typename T, typename = meta::if_<
--                meta::strict_and<std::is_empty<T>, std::is_trivial<T>>>>
-+                meta::strict_and<std::is_empty<T>, detail::is_trivial<T>>>>
-             constexpr box_compress box_compression_(int)
-             {
-                 return box_compress::coalesce;
diff --git a/srcpkgs/range-v3/template b/srcpkgs/range-v3/template
index a134ed5d549..e04b8965cc2 100644
--- a/srcpkgs/range-v3/template
+++ b/srcpkgs/range-v3/template
@@ -1,7 +1,7 @@
 # Template file for 'range-v3'
 pkgname=range-v3
-version=0.5.0
-revision=2
+version=0.9.1
+revision=1
 build_style=cmake
 configure_args="-DRANGE_V3_EXAMPLES=OFF -DRANGES_BUILD_CALENDAR_EXAMPLE=OFF
  -DRANGES_NATIVE=OFF"
@@ -10,7 +10,7 @@ maintainer="John <johnz@posteo.net>"
 license="BSL-1.0"
 homepage="https://github.com/ericniebler/range-v3"
 distfiles="https://github.com/ericniebler/range-v3/archive/${version}.tar.gz"
-checksum=32e30b3be042246030f31d40394115b751431d9d2b4e0f6d58834b2fd5594280
+checksum=2b5b442d572b5978ea51c650adfaf0796f39f326404d09b83d846e04f571876b
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DRANGE_V3_HEADER_CHECKS=ON -DRANGE_V3_TESTS=ON
diff --git a/srcpkgs/ranger/template b/srcpkgs/ranger/template
index 5efbcb6bff7..a387eac4ed7 100644
--- a/srcpkgs/ranger/template
+++ b/srcpkgs/ranger/template
@@ -10,7 +10,7 @@ makedepends="python3-devel"
 depends="python3"
 checkdepends="python-pytest pylint flake8 ncurses-term"
 short_desc="File manager with an ncurses frontend written in Python"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
 homepage="https://ranger.github.io"
 distfiles="${homepage}/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/rawtherapee/template b/srcpkgs/rawtherapee/template
index 348548bc59f..a715d836ee3 100644
--- a/srcpkgs/rawtherapee/template
+++ b/srcpkgs/rawtherapee/template
@@ -1,6 +1,6 @@
 # Template file for 'rawtherapee'
 pkgname=rawtherapee
-version=5.6
+version=5.7
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://rawtherapee.com/"
 distfiles="http://rawtherapee.com/shared/source/rawtherapee-${version}.tar.xz"
-checksum=f9ea4b159580bd99aa7eaba9487c07e9dc7c095405f310f243400e67ae630d74
+checksum=dbd7c7cf7488fb97c520821eee2c745291637644b391e3ec0ed3a29701f1a9c7
diff --git a/srcpkgs/rclone/template b/srcpkgs/rclone/template
index 8cf9220ac33..cc6be1978ef 100644
--- a/srcpkgs/rclone/template
+++ b/srcpkgs/rclone/template
@@ -1,17 +1,17 @@
 # Template file for 'rclone'
 pkgname=rclone
-version=1.48.0
+version=1.49.5
 revision=1
 wrksrc="rclone-v${version}"
 build_style=go
-go_import_path=github.com/ncw/rclone
+go_import_path=github.com/rclone/rclone
 hostmakedepends="git"
 short_desc="Rsync for cloud storage"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="MIT"
-homepage="https://rclone.org/downloads/"
-distfiles="https://github.com/ncw/rclone/releases/download/v${version}/rclone-v${version}.tar.gz"
-checksum=8cfed0b0e0c341c74d466d3ecc84e35e32666391d075445d50fe623035cd03e4
+homepage="https://rclone.org/"
+distfiles="https://github.com/rclone/rclone/releases/download/v${version}/rclone-v${version}.tar.gz"
+checksum=abd2c83d71c63a4b0a30b1980b942868e707d05e14ae76ad39abf5cc5a5fde63
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/rcm/template b/srcpkgs/rcm/template
index 6ba4fd11d84..2f84ba88ad3 100644
--- a/srcpkgs/rcm/template
+++ b/srcpkgs/rcm/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 checkdepends="python3-cram"
 depends="perl"
 short_desc="Management suite for dotfiles"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/thoughtbot/rcm"
 distfiles="https://thoughtbot.github.io/rcm/dist/rcm-${version}.tar.gz"
diff --git a/srcpkgs/rdfind/template b/srcpkgs/rdfind/template
index 7edac19eedd..510e46839ba 100644
--- a/srcpkgs/rdfind/template
+++ b/srcpkgs/rdfind/template
@@ -1,7 +1,7 @@
 # Template file for 'rdfind'
 pkgname=rdfind
 version=1.4.1
-revision=1
+revision=2
 build_style=gnu-configure
 makedepends="nettle-devel"
 short_desc="A program that finds duplicate files"
diff --git a/srcpkgs/rdup/template b/srcpkgs/rdup/template
index 87f7f34b1c5..868d8f004d2 100644
--- a/srcpkgs/rdup/template
+++ b/srcpkgs/rdup/template
@@ -1,7 +1,7 @@
 # Template file for 'rdup'
 pkgname=rdup
 version=1.1.15
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake pkg-config"
 makedepends="glib-devel libarchive-devel nettle-devel"
@@ -13,5 +13,6 @@ distfiles="https://github.com/miekg/rdup/archive/${version}.tar.gz"
 checksum=787b8c37e88be810a710210a9d9f6966b544b1389a738aadba3903c71e0c29cb
 
 pre_configure() {
+	vsed -e 's/-Werror/-Werror -Wno-deprecated-declarations/' -i GNUmakefile.in
 	autoreconf -fi
 }
diff --git a/srcpkgs/re/template b/srcpkgs/re/template
index b4872995a36..45659f4a129 100644
--- a/srcpkgs/re/template
+++ b/srcpkgs/re/template
@@ -1,7 +1,7 @@
 # Template file for 're'
 pkgname=re
-version=0.6.0
-revision=2
+version=0.6.1
+revision=1
 build_style=gnu-makefile
 make_build_args="RELEASE=1 EXTRA_CFLAGS=$CFLAGS
  EXTRA_LFLAGS=$LDFLAGS USE_OPENSSL=yes USE_DTLS=yes USE_DTLS_SRTP=yes"
@@ -13,7 +13,7 @@ maintainer="JohnZ <johnz@posteo.net>"
 license="BSD-3-Clause"
 homepage="http://www.creytiv.com/"
 distfiles="http://www.creytiv.com/pub/re-${version}.tar.gz"
-checksum=0e97bcb5cc8f84d6920aa78de24c7d4bf271c5ddefbb650848e0db50afe98131
+checksum=cd5bfc79640411803b200c7531e4ba8a230da3806746d3bd2de970da2060fe43
 shlib_provides="libre.so"
 
 case $XBPS_TARGET_MACHINE in
diff --git a/srcpkgs/re2/template b/srcpkgs/re2/template
index 3392eb66e2f..a173a971039 100644
--- a/srcpkgs/re2/template
+++ b/srcpkgs/re2/template
@@ -1,6 +1,6 @@
 # Template file for 're2'
 pkgname=re2
-version=2019.08.01
+version=2019.09.01
 revision=1
 wrksrc="${pkgname}-${version//./-}"
 build_style=gnu-makefile
@@ -10,7 +10,7 @@ maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/google/re2"
 distfiles="${homepage}/archive/${version//./-}.tar.gz"
-checksum=38bc0426ee15b5ed67957017fd18201965df0721327be13f60496f2b356e3e01
+checksum=b0382aa7369f373a0148218f2df5a6afd6bfa884ce4da2dfb576b979989e615e
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/reap/template b/srcpkgs/reap/template
new file mode 100644
index 00000000000..dc216f03165
--- /dev/null
+++ b/srcpkgs/reap/template
@@ -0,0 +1,11 @@
+# Template file for 'reap'
+pkgname=reap
+version=0.1
+revision=1
+build_style=gnu-makefile
+short_desc="Unix command line queue utility"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="CC0-1.0"
+homepage="https://github.com/leahneukirchen/reap"
+distfiles="https://github.com/leahneukirchen/${pkgname}/archive/v${version}.tar.gz"
+checksum=fbf1f2f85e6cefeef8aa4778ec5db83773514f1c58ca01b107fb6823165d09d8
diff --git a/srcpkgs/rebar3/template b/srcpkgs/rebar3/template
index 5559a9ccf72..07e29cc5ed0 100644
--- a/srcpkgs/rebar3/template
+++ b/srcpkgs/rebar3/template
@@ -1,6 +1,6 @@
 # Template file for 'rebar3'
 pkgname=rebar3
-version=3.11.1
+version=3.12.0
 revision=1
 archs=noarch
 hostmakedepends=erlang
@@ -10,7 +10,7 @@ maintainer="Noel Cower <ncower@gmail.com>"
 license="Apache-2.0"
 homepage="https://www.rebar3.org/"
 distfiles="https://github.com/erlang/rebar3/archive/${version}.tar.gz"
-checksum=a1822db5210b96b5f8ef10e433b22df19c5fc54dfd847bcaab86c65151ce4171
+checksum=8ac45498f03e293bc6342ec431888f9a81a4fb9e1177a69965238d127c00a79e
 
 do_build() {
 	./bootstrap
diff --git a/srcpkgs/recutils/template b/srcpkgs/recutils/template
index 55dbe617763..3e71312c4e2 100644
--- a/srcpkgs/recutils/template
+++ b/srcpkgs/recutils/template
@@ -7,7 +7,7 @@ configure_args="--with-bash-headers --disable-rpath"
 hostmakedepends="pkg-config"
 makedepends="acl-devel libgcrypt-devel libuuid-devel libcurl-devel"
 short_desc="Utilities to deal with recfiles"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/recutils/"
 distfiles="${GNU_SITE}/recutils/recutils-${version}.tar.gz"
diff --git a/srcpkgs/redis/template b/srcpkgs/redis/template
index 2cb07edbb19..5807af0b36f 100644
--- a/srcpkgs/redis/template
+++ b/srcpkgs/redis/template
@@ -1,16 +1,16 @@
 # Template file for 'redis'
 pkgname=redis
-version=5.0.5
+version=5.0.6
 revision=1
 makedepends="jemalloc-devel libatomic-devel"
-checkdepends="tcl-devel"
+checkdepends="tcl-devel procps-ng"
 short_desc="Advanced key-value store"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://redis.io"
 changelog="https://raw.githubusercontent.com/antirez/redis/5.0/00-RELEASENOTES"
 distfiles="http://download.redis.io/releases/${pkgname}-${version}.tar.gz"
-checksum=2139009799d21d8ff94fc40b7f36ac46699b9e1254086299f8d3b223ca54a375
+checksum=6624841267e142c5d5d5be292d705f8fb6070677687c5aad1645421a936d22b3
 
 system_accounts="redis"
 redis_homedir="/var/lib/redis"
diff --git a/srcpkgs/remmina/template b/srcpkgs/remmina/template
index 6dac179b523..c8bac8ad0f3 100644
--- a/srcpkgs/remmina/template
+++ b/srcpkgs/remmina/template
@@ -1,6 +1,6 @@
 # Template file for 'remmina'
 pkgname=remmina
-version=1.3.5
+version=1.3.6
 revision=1
 wrksrc="Remmina-${version}"
 build_style=cmake
@@ -20,7 +20,7 @@ license="GPL-2.0-or-later"
 homepage="https://remmina.org"
 changelog="https://raw.githubusercontent.com/FreeRDP/Remmina/master/CHANGELOG.md"
 distfiles="https://github.com/FreeRDP/Remmina/archive/v${version}.tar.gz"
-checksum=babb477f5acd1cb7056cf47ba50dc56ef1c850f9c00a9ec012573553b03ca5a4
+checksum=c9a2327d02285cec78ef6eab8154d88d78d2d6a874e17681fcc6cb1aff20c40d
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) makedepends+=" libexecinfo-devel" ;;
diff --git a/srcpkgs/resvg/template b/srcpkgs/resvg/template
index 02506182ef8..c48e52ae2f2 100644
--- a/srcpkgs/resvg/template
+++ b/srcpkgs/resvg/template
@@ -6,7 +6,7 @@ build_helper="rust"
 hostmakedepends="cargo qt5-host-tools pkg-config"
 makedepends="pango-devel cairo-devel gdk-pixbuf-devel rust-std qt5-devel"
 short_desc="SVG rendering library written in Rust"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://github.com/RazrFalcon/resvg"
 distfiles="https://github.com/RazrFalcon/resvg/releases/download/v${version}/resvg-${version}.tar.xz"
diff --git a/srcpkgs/retro-gtk/template b/srcpkgs/retro-gtk/template
index 850488c584d..da0aeccd243 100644
--- a/srcpkgs/retro-gtk/template
+++ b/srcpkgs/retro-gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'retro-gtk'
 pkgname=retro-gtk
-version=0.16.1
-revision=2
+version=0.18.0
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="$(vopt_bool gir introspection)"
@@ -12,7 +12,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/retro-gtk"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f3c65e52da19f96dedc33e20ea899bf94e914cc8f85ad12e9957d09421bed8c8
+checksum=cedb881174c42e88954eecb5dfac78954a1981aaeebdc8918c8861c6c08a4512
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index be8b36ade21..d6ce272c9ee 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,6 +1,6 @@
 # Template file for 'retroarch'
 pkgname=retroarch
-version=1.7.7
+version=1.7.9
 revision=1
 wrksrc="RetroArch-$version"
 build_style=configure
@@ -22,7 +22,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.libretro.com/"
 distfiles="https://github.com/libretro/RetroArch/archive/v$version.tar.gz"
-checksum=84cdf88b7dfbbe229521c32489820040eeee7736ef8fb43f1f345235b34e9732
+checksum=00d45a468023fbab8c023a81d4f26bca91bacb24ab24a7162079c26ff042c367
 build_options="ffmpeg opengl jack pulseaudio sdl2 x11 vulkan"
 
 build_options_default="ffmpeg"
diff --git a/srcpkgs/rinse/template b/srcpkgs/rinse/template
index 2249c4aac08..2294afc2605 100644
--- a/srcpkgs/rinse/template
+++ b/srcpkgs/rinse/template
@@ -9,7 +9,7 @@ makedepends="perl"
 depends="perl-LWP rpm wget"
 checkdepends="perl-LWP perl-Test-Pod rpm wget"
 short_desc="Bootstrap a rpm based distribution like debootstrap"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://salsa.debian.org/debian/rinse"
 #changelog="https://salsa.debian.org/debian/rinse/raw/master/debian/changelog"
diff --git a/srcpkgs/riot-desktop/patches/electron5.patch b/srcpkgs/riot-desktop/patches/electron5.patch
deleted file mode 100644
index c90db20fb75..00000000000
--- a/srcpkgs/riot-desktop/patches/electron5.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-from https://gist.github.com/dbkr/e898624be6d53590ebf494521d868fec
-
-diff --git a/electron_app/src/electron-main.js b/electron_app/src/electron-main.js
-index 99ddfbd1..c3aa4f5d 100644
---- electron_app/src/electron-main.js
-+++ electron_app/src/electron-main.js
-@@ -206,7 +206,10 @@ const launcher = new AutoLaunch({
- // work.
- // Also mark it as secure (ie. accessing resources from this
- // protocol and HTTPS won't trigger mixed content warnings).
--protocol.registerStandardSchemes(['vector'], {secure: true});
-+//protocol.registerStandardSchemes(['vector'], {secure: true});
-+protocol.registerSchemesAsPrivileged([{
-+    scheme: 'vector', privileges: {standard: true, secure: true, supportFetchAPI: true},
-+}]);
- 
- app.on('ready', () => {
-     if (argv['devtools']) {
-diff --git a/electron_app/src/preload.js b/electron_app/src/preload.js
-index 3a4f7c9a..f63e19d4 100644
---- electron_app/src/preload.js
-+++ electron_app/src/preload.js
-@@ -23,7 +23,7 @@ window.ipcRenderer = ipcRenderer;
- // protocol: this is necessary to load olm.wasm.
- // (Also mark it a secure although we've already
- // done this in the main process).
--webFrame.registerURLSchemeAsPrivileged('vector', {
-+/*webFrame.registerURLSchemeAsPrivileged('vector', {
-     secure: true,
-     supportFetchAPI: true,
--});
-+});*/
diff --git a/srcpkgs/riot-desktop/template b/srcpkgs/riot-desktop/template
index 1bc9ed54a54..c54b84d88a2 100644
--- a/srcpkgs/riot-desktop/template
+++ b/srcpkgs/riot-desktop/template
@@ -1,18 +1,18 @@
 # Template file for 'riot-desktop'
 pkgname=riot-desktop
-version=1.2.1
-revision=2
+version=1.4.2
+revision=1
 archs="i686 x86_64"
 wrksrc="riot-web-${version}"
 conf_files="/etc/${pkgname}/config.json"
 hostmakedepends="git nodejs yarn"
 depends="c-ares ffmpeg gtk+3 http-parser libevent libxslt minizip nss re2 snappy"
 short_desc="Glossy Matrix collaboration client, desktop version"
-maintainer="zethra <jediben97@gmail.com>"
+maintainer="Bendodroid <bendodroid@icloud.com>"
 license="Apache-2.0"
 homepage="https://riot.im"
 distfiles="https://github.com/vector-im/riot-web/archive/v${version}.tar.gz"
-checksum=7519083fcf579bf79bd5e0e5665bad43b89432a215f677fa00d8a115a34fdf08
+checksum=0d8ce20912ea8c6961ff04a3e3231da1f77ec18cfdc5000a1f01d19eec9ad51c
 nocross=yes
 nostrip=yes
 shlib_provides="libGLVESv2.so"
diff --git a/srcpkgs/rlottie/template b/srcpkgs/rlottie/template
index 3f84d208d37..aa6ef4322ef 100644
--- a/srcpkgs/rlottie/template
+++ b/srcpkgs/rlottie/template
@@ -1,7 +1,7 @@
 # Template file for 'rlottie'
 pkgname=rlottie
-_commit=33d4fca732943eb393c23b143e5783b463847193
-version=0.0.20190809
+_commit=71dfd5c3ba206cad9d73e3c249dd7d22f4f65b98
+version=0.0.20191002
 revision=2
 wrksrc="rlottie-${_commit}"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later, FTL, MIT, JSON, BSD-3-Clause"
 homepage="https://github.com/Samsung/rlottie"
 distfiles="https://github.com/Samsung/rlottie/archive/${_commit}.tar.gz"
-checksum=1cf21762b983e5edf71ca4b487a1af4a9e6e127c1c7c1bec95b886022c96ff7f
+checksum=df064c381ade4fce143e5d7ee27771bbf7bc2218ac7a32afe3f49036ddcba422
 
 post_patch() {
 	vsed -e 's/c++14/c++17/g' -i CMakeLists.txt
diff --git a/srcpkgs/rmlint/template b/srcpkgs/rmlint/template
index faca4260b17..dc8d904d0c2 100644
--- a/srcpkgs/rmlint/template
+++ b/srcpkgs/rmlint/template
@@ -1,7 +1,7 @@
 # Template file for 'rmlint'
 pkgname=rmlint
-version=2.8.0
-revision=2
+version=2.9.0
+revision=1
 build_style=scons
 hostmakedepends="pkg-config python3-Sphinx glib-devel"
 makedepends="libblkid-devel elfutils-devel json-glib-devel"
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-3.0-or-later"
 homepage="http://rmlint.rtfd.org/"
 distfiles="https://github.com/sahib/${pkgname}/archive/v${version}.tar.gz"
-checksum=196bb595ac4d3d1a76ed62542b7895bda1cea47f0f77483286b2dfc8fc797253
+checksum=a2d26863e0018efad60f0b1123e7cffd8ef764c8fb574a7987a49260e4e51c8f
 
 do_install() {
 	scons install --prefix=${DESTDIR}/usr
diff --git a/srcpkgs/roswell/template b/srcpkgs/roswell/template
index 0e83bffe40e..7a1c340444c 100644
--- a/srcpkgs/roswell/template
+++ b/srcpkgs/roswell/template
@@ -1,6 +1,6 @@
 # Template file for 'roswell'
 pkgname=roswell
-version=19.4.10.98
+version=19.09.12.102
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://github.com/roswell/roswell"
 changelog="https://raw.githubusercontent.com/roswell/roswell/master/ChangeLog"
 distfiles="https://github.com/roswell/roswell/releases/download/v${version}/roswell_${version}.orig.tar.gz"
-checksum=5783431ef096840dd5696b448c76e66e8805e53bd7ac6fb572734e3ffd969649
+checksum=99aa1535761e2cdd45ad447256a985d311dffb6826f50d9a61c77a6f737a82bf
 
 pre_configure() {
 	./bootstrap
diff --git a/srcpkgs/roxterm/template b/srcpkgs/roxterm/template
index 35404d97263..299487d3009 100644
--- a/srcpkgs/roxterm/template
+++ b/srcpkgs/roxterm/template
@@ -1,19 +1,16 @@
 # Template file for 'roxterm'
 pkgname=roxterm
-version=3.7.3
+version=3.8.2
 revision=1
 build_style=cmake
-hostmakedepends="ImageMagick itstool librsvg-utils libtool pkg-config po4a xmlto"
+hostmakedepends="ImageMagick glib-devel itstool librsvg-utils libtool
+ pkg-config po4a xmlto"
 makedepends="dbus-glib-devel libSM-devel vte3-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Highly configurable terminal emulator"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Frank Steinborn <steinex@nognu.de>"
 license="GPL-2.0-or-later, LGPL-3.0-only"
 homepage="https://github.com/realh/roxterm"
 changelog="https://raw.githubusercontent.com/realh/roxterm/master/debian/changelog"
 distfiles="https://github.com/realh/roxterm/archive/${version}.tar.gz"
-checksum=59b1ab781477a712b4509dac812931bff3c2bb7a9a82435f43430bede5cdca13
-
-pre_configure() {
-	echo -n ${version} > version
-}
+checksum=289a5e87030ad7b24677ecda81c6e99d33fbef995b73d7a81bc91f4bbaba62cf
diff --git a/srcpkgs/rpi-firmware/template b/srcpkgs/rpi-firmware/template
index 3fba1022f78..7386619bfdc 100644
--- a/srcpkgs/rpi-firmware/template
+++ b/srcpkgs/rpi-firmware/template
@@ -1,18 +1,18 @@
 # Template file for 'rpi-firmware'
-_githash="3822340923e5cddc772492386d82ba00f4275d62"
+_githash="18bf532d97f73acd4b476429518e89f0e3d7007c"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi-firmware
-version=20190801
-revision=1
+version=20190828
+revision=2
 archs=noarch
 wrksrc="firmware-${_githash}"
 short_desc="Firmware files for the Raspberry Pi (git ${_gitshort})"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
+maintainer="Peter Bui <pbui@github.bx612.space>"
+license="BSD-3-Clause, custom:Cypress"
 homepage="https://github.com/raspberrypi/firmware"
 distfiles="https://github.com/raspberrypi/firmware/archive/${_githash}.tar.gz"
-checksum=35a5b0a30cdc68aeeda355a506dc967bc5de5cf7fc94e90367d979bff0a0f0bb
+checksum=7e988a93c27cc59c89fa5270455196a71516b4aa9668152f8e87d6b1448ea914
 
 conf_files="/boot/cmdline.txt /boot/config.txt"
 
@@ -32,23 +32,26 @@ do_install() {
 	vinstall ${FILESDIR}/cmdline.txt 644 boot
 	vinstall ${FILESDIR}/config.txt 644 boot
 
+	$XBPS_FETCH_CMD https://github.com/RPi-Distro/firmware-nonfree/raw/master/LICENCE.cypress
+	vlicense LICENCE.cypress
+
 	# Firmware for rpi3 b and zero wifi chip
 	for f in bin txt; do
-		$XBPS_FETCH_CMD https://archlinuxarm.org/builder/src/bcm43430/7.45.98.38/brcmfmac43430-sdio.${f}
+		$XBPS_FETCH_CMD https://github.com/RPi-Distro/firmware-nonfree/raw/master/brcm/brcmfmac43430-sdio.${f}
 		vinstall brcmfmac43430-sdio.${f} 0644 usr/lib/firmware/brcm
 	done
 
 	# Firmware for rpi3 b and zero bluetooth chip
-	$XBPS_FETCH_CMD https://archlinuxarm.org/builder/src/bcm43430/BCM43430A1.hcd
+	$XBPS_FETCH_CMD https://github.com/RPi-Distro/bluez-firmware/raw/master/broadcom/BCM43430A1.hcd
 	vinstall BCM43430A1.hcd 0644 usr/lib/firmware/brcm
 
 	# Firmware for rpi3 b+ wifi chip
 	for f in bin txt clm_blob; do
-		$XBPS_FETCH_CMD https://archlinuxarm.org/builder/src/bcm43455/7.45.154/brcmfmac43455-sdio.${f}
+		$XBPS_FETCH_CMD https://github.com/RPi-Distro/firmware-nonfree/raw/master/brcm/brcmfmac43455-sdio.${f}
 		vinstall brcmfmac43455-sdio.${f} 0644 usr/lib/firmware/brcm
 	done
 
 	# Firmware for rpi3 b+ bluetooth chip
-	$XBPS_FETCH_CMD https://archlinuxarm.org/builder/src/bcm43455/BCM4345C0.hcd
+	$XBPS_FETCH_CMD https://github.com/RPi-Distro/bluez-firmware/raw/master/broadcom/BCM4345C0.hcd
 	vinstall BCM4345C0.hcd 0644 usr/lib/firmware/brcm
 }
diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index 87f024de529..ce4a492499c 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -5,19 +5,19 @@
 #
 #   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=224931
 
-_githash="fc5826fb999e0b32900d1f487e90c27a92010214"
+_githash="047589b6dcd5dfd9673a995c5d36ec4073e578b5"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi-kernel
-version=4.19.66
+version=4.19.79
 revision=1
 wrksrc="linux-${_githash}"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Peter Bui <pbui@github.bx612.space>"
 homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="The Linux kernel for Raspberry Pi (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=cd8076d65788ad6e1719f29f3023ea6141c1727a330e1bbc947e3106b320bc2d
+checksum=f617730cd3a3ca35351259cc58105d95a4d106b8a2971386c81dab073c0fbd15
 
 _kernver="${version}_${revision}"
 
@@ -41,76 +41,67 @@ mutable_files="
 	/usr/lib/modules/${_kernver}/modules.alias.bin
 	/usr/lib/modules/${_kernver}/modules.devname"
 
+_arch=
+case "$XBPS_TARGET_MACHINE" in
+	arm*) _arch=arm ;;
+	aarch64*) _arch=arm64 ;;
+esac
+_cross=
+if [ "$CROSS_BUILD" ]; then
+	_cross="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
+fi
+
 pre_configure() {
 	# Remove .git directory, otherwise scripts/setkernelversion.sh
 	# modifies KERNELRELEASE and appends + to it.
 	rm -rf .git
 }
 do_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
-	fi
+	local target defconfig
 
-	# Use upstream default configuration, no need to maintain ours.
+	# Use upstream's default configuration, no need to maintain ours.
 	case "$XBPS_TARGET_MACHINE" in
-	aarch64*)
-		echo "CONFIG_CONNECTOR=y" >> arch/arm64/configs/bcmrpi3_defconfig
-		echo "CONFIG_PROC_EVENTS=y" >> arch/arm64/configs/bcmrpi3_defconfig
-		echo "CONFIG_F2FS_FS_SECURITY=y" >> arch/arm64/configs/bcmrpi3_defconfig
-		echo "CONFIG_CGROUP_PIDS=y" >> arch/arm64/configs/bcmrpi3_defconfig
-		make ${makejobs} ${_args} ARCH=arm64 bcmrpi3_defconfig
-		;;
-	armv7l*)
-		echo "CONFIG_USER_NS=y" >> arch/arm/configs/bcm2709_defconfig
-		echo "CONFIG_CONNECTOR=y" >> arch/arm/configs/bcm2709_defconfig
-		echo "CONFIG_PROC_EVENTS=y" >> arch/arm/configs/bcm2709_defconfig
-		echo "CONFIG_F2FS_FS_SECURITY=y" >> arch/arm/configs/bcm2709_defconfig
-		echo "CONFIG_CGROUP_PIDS=y" >> arch/arm/configs/bcm2709_defconfig
-		make ${makejobs} ${_args} ARCH=arm bcm2709_defconfig
-		;;
-	armv6l*)
-		echo "CONFIG_USER_NS=y" >> arch/arm/configs/bcmrpi_defconfig
-		echo "CONFIG_CONNECTOR=y" >> arch/arm/configs/bcmrpi_defconfig
-		echo "CONFIG_PROC_EVENTS=y" >> arch/arm/configs/bcmrpi_defconfig
-		echo "CONFIG_F2FS_FS_SECURITY=y" >> arch/arm/configs/bcmrpi_defconfig
-		echo "CONFIG_CGROUP_PIDS=y" >> arch/arm/configs/bcmrpi_defconfig
-		make ${makejobs} ${_args} ARCH=arm bcmrpi_defconfig
-		;;
+		# RPi3
+		aarch64*)
+			target=bcmrpi3_defconfig
+			;;
+		# RPi2 / RPi3
+		armv7l*)
+			target=bcm2709_defconfig
+			;;
+		# RPi1
+		armv6l*)
+			target=bcmrpi_defconfig
+			;;
 	esac
 
+	defconfig="arch/${_arch}/configs/${target}"
+	echo "CONFIG_CONNECTOR=y" >> "$defconfig"
+	echo "CONFIG_PROC_EVENTS=y" >> "$defconfig"
+	echo "CONFIG_F2FS_FS_SECURITY=y" >> "$defconfig"
+	echo "CONFIG_CGROUP_PIDS=y" >> "$defconfig"
+
+	make ${makejobs} ${_cross} ARCH=${_arch} ${target}
+
 	# Always use our revision to CONFIG_LOCALVERSION to match our pkg version.
-	sed -i -e "s|^\(CONFIG_LOCALVERSION=\).*|\1\"_${revision}\"|" .config
+	vsed -i -e "s|^\(CONFIG_LOCALVERSION=\).*|\1\"_${revision}\"|" .config
 }
 do_build() {
-	if [ "$CROSS_BUILD" ]; then
-		_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
-	fi
+	local target
 
 	case "$XBPS_TARGET_MACHINE" in
-	arm*)
-		_arch=arm
-		_targets="zImage modules dtbs"
-		;;
-	aarch64*)
-		unset LDFLAGS
-		_arch=arm64
-		_targets="Image modules dtbs"
-		;;
+		arm*)
+			target="zImage modules dtbs"
+			;;
+		aarch64*)
+			target="Image modules dtbs"
+			;;
 	esac
 
-	make ${makejobs} ${_args} ARCH=${_arch} prepare
-	make ${makejobs} ${_args} ARCH=${_arch} ${_targets}
+	make ${makejobs} ${_cross} ARCH=${_arch} prepare
+	make ${makejobs} ${_cross} ARCH=${_arch} ${target}
 }
 do_install() {
-	case "$XBPS_TARGET_MACHINE" in
-	arm*)
-		_arch="arm"
-	;;
-	aarch64*)
-		_arch="arm64"
-	;;
-	esac
-
 	local hdrdest
 
 	# Run depmod after compressing modules.
@@ -158,31 +149,50 @@ do_install() {
 	install -Dm644 Makefile ${hdrdest}/Makefile
 	install -Dm644 kernel/Makefile ${hdrdest}/kernel/Makefile
 	install -Dm644 .config ${hdrdest}/.config
+	for file in $(find . -name Kconfig\*); do
+		mkdir -p ${hdrdest}/$(dirname $file)
+		install -Dm644 $file ${hdrdest}/${file}
+	done
+	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+		mkdir -p ${hdrdest}/$(dirname $file)
+		install -Dm644 $file ${hdrdest}/${file}
+	done
 	mkdir -p ${hdrdest}/include
 
 	# Remove firmware stuff provided by the "linux-firmware" pkg.
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
-	for i in acpi asm-generic config crypto drm generated linux math-emu \
-		media net pcmcia scsi sound trace uapi video xen; do
+	for i in acpi asm-generic clocksource config crypto drm generated linux \
+		math-emu media net pcmcia scsi sound trace uapi video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
 	cd ${wrksrc}
+	# Remove helper binaries built for host,
+	# if generated files from the scripts/ directory need to be included,
+	# they need to be copied to ${hdrdest} before this step
+	if [ "$CROSS_BUILD" ]; then
+		make ${makejobs} ARCH=${_arch} _mrproper_scripts
+	fi
+
 	# Copy files necessary for later builds.
 	cp Module.symvers ${hdrdest}
 	cp -a scripts ${hdrdest}
-
-	# fix permissions on scripts dir
-	chmod og-w -R ${hdrdest}/scripts
+	mkdir -p ${hdrdest}/security/selinux
+	cp -a security/selinux/include ${hdrdest}/security/selinux
+	mkdir -p ${hdrdest}/tools/include
+	cp -a tools/include/tools ${hdrdest}/tools/include
 
 	# copy arch includes for external modules
 	mkdir -p ${hdrdest}/arch/${_arch}
 	cp -a arch/${_arch}/include ${hdrdest}/arch/${_arch}
 
-	mkdir -p ${hdrdest}/arch/${arch}/kernel
+	mkdir -p ${hdrdest}/arch/${_arch}/kernel
 	cp arch/${_arch}/Makefile ${hdrdest}/arch/${_arch}
 	cp arch/${_arch}/kernel/asm-offsets.s ${hdrdest}/arch/${_arch}/kernel
+	if [ "$_arch" = "arm64" ] ; then
+		cp -a arch/${_arch}/kernel/vdso ${hdrdest}/arch/${_arch}/kernel/
+	fi
 
 	# Add md headers
 	mkdir -p ${hdrdest}/drivers/md
@@ -200,17 +210,15 @@ do_install() {
 	mkdir -p ${hdrdest}/include/config/dvb/
 	cp include/config/dvb/*.h ${hdrdest}/include/config/dvb/
 
-	# Copy in Kconfig files
-	for i in $(find . -name "Kconfig*"); do
-		mkdir -p ${hdrdest}/$(echo $i | sed 's|/Kconfig.*||')
-		cp $i ${hdrdest}/$i
-	done
-
 	# Remove unneeded architectures
-	for arch in alpha arc avr32 blackfin c6x cris frv h8300 \
-		hexagon ia64 m* n* p* s* um v850 x86 xtensa; do
-		rm -rf ${hdrdest}/arch/${arch}
-	done
+	# (save the correct one + Kconfig and delete all others)
+	mkdir -p arch-backup
+	cp -r ${hdrdest}/arch/${_arch} ${hdrdest}/arch/Kconfig arch-backup/
+	rm -rf ${hdrdest}/arch
+	mv arch-backup ${hdrdest}/arch
+	# Keep arch/x86/ras/Kconfig as it is needed by drivers/ras/Kconfig
+	mkdir -p ${hdrdest}/arch/x86/ras
+	cp -a arch/x86/ras/Kconfig ${hdrdest}/arch/x86/ras/Kconfig
 
 	# Compress all modules with xz to save a few MBs.
 	msg_normal "$pkgver: compressing kernel modules with gzip, please wait...\n"
diff --git a/srcpkgs/rpm/template b/srcpkgs/rpm/template
index ab4cd7624c7..98e35930c4c 100644
--- a/srcpkgs/rpm/template
+++ b/srcpkgs/rpm/template
@@ -1,24 +1,24 @@
 # Template file for 'rpm'
 pkgname=rpm
-version=4.14.2.1
-revision=2
+version=4.15.0
+revision=1
 build_style=gnu-configure
 configure_args="--with-lua --with-cap --with-acl --with-external-db
  --enable-python PYTHON=python3"
 hostmakedepends="automake gettext-devel libtool nss-devel pkg-config
  python3-setuptools"
 makedepends="binutils-devel db-devel elfutils-devel file-devel libarchive-devel
- libcap-devel lua52-devel nss-devel popt-devel python3-devel"
+ libcap-devel lua52-devel nss-devel popt-devel python3-devel libgomp-devel"
 short_desc="Red Hat Package Management Utils"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://rpm.org"
 changelog="https://rpm.org/wiki/Releases/${version}.html"
-distfiles="http://ftp.rpm.org/releases/rpm-${version%.*.*}.x/rpm-${version}.tar.bz2"
-checksum=1139c24b7372f89c0a697096bf9809be70ba55e006c23ff47305c1849d98acda
+distfiles="http://ftp.rpm.org/releases/rpm-4.15.x/rpm-${version}.tar.bz2"
+checksum=1e06723b13591e57c99ebe2006fb8daddc4cf72efb366a64a34673ba5f61c201
 conflicts="rpmextract>=0" # Both provide rpm2cpio
 
-CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/python2.7"
+CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/python3.6"
 CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/nss"
 CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/nspr"
 
diff --git a/srcpkgs/rrdtool/template b/srcpkgs/rrdtool/template
index 05714e60f8b..b858a42f99c 100644
--- a/srcpkgs/rrdtool/template
+++ b/srcpkgs/rrdtool/template
@@ -1,7 +1,7 @@
 # Template file for 'rrdtool'
 pkgname=rrdtool
 version=1.7.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-perl --enable-perl-site-install
  --with-perl-options=INSTALLDIRS=vendor --enable-ruby
@@ -27,7 +27,7 @@ python-rrdtool_package() {
 
 perl-rrdtool_package() {
 	short_desc+=" - perl bindings"
-	shlib_requires="libperl.so.5.28"
+	shlib_requires="libperl.so.5.30"
 	pkg_install() {
 		vmove usr/lib/perl5
 		vmove usr/share/perl5
diff --git a/srcpkgs/rsClock/template b/srcpkgs/rsClock/template
new file mode 100644
index 00000000000..3da575801f0
--- /dev/null
+++ b/srcpkgs/rsClock/template
@@ -0,0 +1,16 @@
+# Template file for 'rsClock'
+pkgname=rsClock
+version=0.1.4
+revision=1
+wrksrc="${pkgname}-${version}"
+build_style=cargo
+short_desc="Simple terminal clock written in Rust"
+maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"
+license="MIT"
+homepage="https://github.com/valebes/rsClock"
+distfiles="https://github.com/valebes/rsClock/archive/v${version}.tar.gz"
+checksum=3e1c903a944325a9fabebfed34029830c94b4cd2463354bc02be01eb18401d04
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/rsyslog/template b/srcpkgs/rsyslog/template
index 02a9571b54b..dcad3e56e99 100644
--- a/srcpkgs/rsyslog/template
+++ b/srcpkgs/rsyslog/template
@@ -1,6 +1,6 @@
 # Template file for 'rsyslog'
 pkgname=rsyslog
-version=8.1904.0
+version=8.1910.0
 revision=1
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --enable-gnutls --enable-mysql
@@ -10,7 +10,7 @@ configure_args="--sbindir=/usr/bin --enable-gnutls --enable-mysql
  --enable-pmaixforwardedfrom --enable-omuxsock --disable-generate-man-pages
  --enable-testbench"
 hostmakedepends="pkg-config postgresql-libs-devel"
-makedepends="gnutls-devel libcurl-devel libee-devel libfastjson-devel
+makedepends="gnutls-devel libcurl-devel libestr-devel libfastjson-devel
  liblogging-devel libmysqlclient-devel mit-krb5-devel postgresql-libs-devel"
 short_desc="Enhanced multi-threaded syslog daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -18,7 +18,7 @@ license="GPL-3.0-or-later, Apache-2.0"
 homepage="https://www.rsyslog.com"
 changelog="https://raw.githubusercontent.com/rsyslog/rsyslog/master/ChangeLog"
 distfiles="${homepage}/files/download/rsyslog/${pkgname}-${version}.tar.gz"
-checksum=7098b459dfc3f8bfc35d5b114c56e7945614ba76efa4e513b1db9c38b0ff9c3d
+checksum=0219ee692f31a39743acb62aaf4196b644ce94edf386df4605fd6a11a4fe0c93
 conf_files="/etc/rsyslog.conf"
 make_dirs="/etc/rsyslog.d 0755 root root"
 lib32disabled=yes
diff --git a/srcpkgs/rtags/template b/srcpkgs/rtags/template
index 3ac8ac10ec8..d55cef3e284 100644
--- a/srcpkgs/rtags/template
+++ b/srcpkgs/rtags/template
@@ -1,7 +1,7 @@
 # Template file for 'rtags'
 pkgname=rtags
 version=2.22
-revision=2
+revision=3
 build_style=cmake
 # Don't run tests in do_install, please.
 configure_args="-DSKIP_CTEST=TRUE"
diff --git a/srcpkgs/rtaudio/template b/srcpkgs/rtaudio/template
index c471ec910d0..b036e1cae78 100644
--- a/srcpkgs/rtaudio/template
+++ b/srcpkgs/rtaudio/template
@@ -7,7 +7,7 @@ configure_args="--with-alsa --with-jack --with-pulse"
 hostmakedepends="pkg-config"
 makedepends="alsa-lib-devel pulseaudio-devel jack-devel"
 short_desc="C++ classes for common Linux, MacOS and Windows realtime audio APIs"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://www.music.mcgill.ca/~gary/rtaudio/"
 distfiles="http://www.music.mcgill.ca/~gary/rtaudio/release/rtaudio-${version}.tar.gz"
diff --git a/srcpkgs/rtl8822bu-dkms/template b/srcpkgs/rtl8822bu-dkms/template
index a7217ba5a1d..3a0da5a87dc 100644
--- a/srcpkgs/rtl8822bu-dkms/template
+++ b/srcpkgs/rtl8822bu-dkms/template
@@ -1,8 +1,8 @@
 # Template file for 'rtl8822bu-dkms'
 pkgname=rtl8822bu-dkms
-version=20190427
+version=20190713
 revision=1
-_gitrev=dbbf4f7c3527f1bff38054349f01a4a8438db0f4
+_gitrev=dea3bb8e631191ded1839c53fb266d80ef7e8ad3
 archs=noarch
 wrksrc="rtl8822bu-${_gitrev}"
 depends="dkms"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://www.tp-link.com"
 distfiles="https://github.com/EntropicEffect/rtl8822bu/archive/${_gitrev}.tar.gz"
-checksum=96bd6dcf9a285fb7ebac7575bc1e8a28577c200dc1c7ec2abae4005181ef0de5
+checksum=34474838558a8502edc9bcd1091c8911ec128d50aeda2f83173b36c1a592250c
 dkms_modules="88x2bu ${version}"
 
 do_install() {
diff --git a/srcpkgs/rtl_433/template b/srcpkgs/rtl_433/template
index 1b9bcf4da30..d63e4c452db 100644
--- a/srcpkgs/rtl_433/template
+++ b/srcpkgs/rtl_433/template
@@ -1,16 +1,17 @@
 # Template file for 'rtl_433'
 pkgname=rtl_433
-version=18.12
+version=19.08
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="librtlsdr-devel SoapySDR-devel"
+makedepends="librtlsdr-devel SoapySDR-devel libusb-devel"
 short_desc="RTLSDR based 433MHz generic data receiver"
 maintainer="bra1nwave <brainwave@openmailbox.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/merbanan/rtl_433"
+changelog="https://raw.githubusercontent.com/merbanan/rtl_433/master/CHANGELOG.md"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=8d9a0d57155430b03d299effd48b43b7e072f49868485f0fc79294a28402d654
+checksum=6d7975e8e08e724a30fe0c8658e156fe0e67299a9fddfa14daed5f62c625731f
 
 post_install() {
 	vmkdir usr/share/examples
diff --git a/srcpkgs/ruby-addressable/template b/srcpkgs/ruby-addressable/template
index 7397ff4888a..c2674f6e8b6 100644
--- a/srcpkgs/ruby-addressable/template
+++ b/srcpkgs/ruby-addressable/template
@@ -1,12 +1,12 @@
 # Template file for 'ruby-addressable'
 pkgname=ruby-addressable
-version=2.6.0
+version=2.7.0
 revision=1
 archs=noarch
 build_style=gem
 depends="ruby-public_suffix>=2.0.2 ruby-public_suffix<4.0"
 short_desc="Replacement for Ruby's standard library URI implementation"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/sporkmonger/addressable"
-checksum=d490ad06dfc421503e659a12597d6bb0273b5cd7ff2789a1ec27210b1914952d
+checksum=5e9b62fe1239091ea9b2893cd00ffe1bcbdd9371f4e1d35fac595c98c5856cbb
diff --git a/srcpkgs/ruby-asciidoctor/template b/srcpkgs/ruby-asciidoctor/template
index 169365c6f3c..c1cfa5066b2 100644
--- a/srcpkgs/ruby-asciidoctor/template
+++ b/srcpkgs/ruby-asciidoctor/template
@@ -1,14 +1,14 @@
 # Template file for 'ruby-asciidoctor'
 pkgname=ruby-asciidoctor
-version=2.0.7
+version=2.0.10
 revision=1
 archs=noarch
 build_style=gem
 short_desc="Ruby implementation of AsciiDoc"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://asciidoctor.org"
-checksum=9027efd3ba6084c84e9d1eb645b23b4b0a1c5df7516fd7c7ebd1055009b4ec1b
+checksum=7f3df92816f75344d36bb15e49a6fbc07ac0999a1cd2938fd0802ea587964aac
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/ruby-backports/template b/srcpkgs/ruby-backports/template
index 3c79095f178..e7bd1b921a5 100644
--- a/srcpkgs/ruby-backports/template
+++ b/srcpkgs/ruby-backports/template
@@ -1,13 +1,13 @@
 # Template file for 'ruby-backports'
 pkgname=ruby-backports
-version=3.13.0
+version=3.15.0
 revision=1
 build_style=gem
 short_desc="Essential backports that enable many of the nice features of Ruby"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/marcandre/backports"
-checksum=31372dff80d100d95900de82fcb7209ca7c44d458d93c76b610ac14d13e29cfc
+checksum=c23ad4b8b3637992f34c41256b46d49dc49a3725f1df78de42469deb43749f31
 
 post_install() {
 	vlicense LICENSE.txt
diff --git a/srcpkgs/ruby-connection_pool/template b/srcpkgs/ruby-connection_pool/template
index bceae6b8f5c..428ddf6c2ee 100644
--- a/srcpkgs/ruby-connection_pool/template
+++ b/srcpkgs/ruby-connection_pool/template
@@ -5,7 +5,7 @@ revision=2
 archs=noarch
 build_style=gem
 short_desc="Generic connection pool for Ruby"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/mperham/connection_pool"
 checksum=c8cc9446bcc51034103c1259ad70b91dc9f5297d13460b2c0cce7e5a93e8d451
diff --git a/srcpkgs/ruby-erubis/template b/srcpkgs/ruby-erubis/template
index c14abedd5c1..18e85dbceab 100644
--- a/srcpkgs/ruby-erubis/template
+++ b/srcpkgs/ruby-erubis/template
@@ -4,7 +4,7 @@ version=2.7.0
 revision=2
 build_style=gem
 short_desc="Erubis is an implementation of eRuby"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://www.kuwata-lab.com/erubis/"
 checksum=63653f5174a7997f6f1d6f465fbe1494dcc4bdab1fb8e635f6216989fb1148ba
diff --git a/srcpkgs/ruby-ethon/template b/srcpkgs/ruby-ethon/template
index 2c91435f3f7..70e9b201df6 100644
--- a/srcpkgs/ruby-ethon/template
+++ b/srcpkgs/ruby-ethon/template
@@ -6,7 +6,7 @@ archs=noarch
 build_style=gem
 depends="ruby-ffi>=1.3.0"
 short_desc="Lightweight wrapper around libcurl"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/typhoeus/ethon"
 checksum=e99d3095e89f82c5a7e63d9261ddf4a21f28ae5d12a9d3abaa6920cce6cbef3d
diff --git a/srcpkgs/ruby-faraday/template b/srcpkgs/ruby-faraday/template
index 11e42a7214b..2ba74734289 100644
--- a/srcpkgs/ruby-faraday/template
+++ b/srcpkgs/ruby-faraday/template
@@ -1,15 +1,15 @@
 # Template file for 'ruby-faraday'
 pkgname=ruby-faraday
-version=0.15.4
-revision=2
+version=0.17.0
+revision=1
 archs=noarch
 build_style=gem
 depends="ruby-multipart-post>=1.2 ruby-multipart-post<3"
 short_desc="HTTP/REST API client library"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/lostisland/faraday"
-checksum=00e6ffd6f1bccd9dc9e3b993a0004e69680559422206ce4cbb81fd2d0ba8e268
+checksum=5f19b5c6d22eca82564fe26e4963f58cf0ba34059b8e9399c0b19a4eb25a624a
 
 post_install() {
 	vlicense LICENSE.md
diff --git a/srcpkgs/ruby-faraday_middleware/template b/srcpkgs/ruby-faraday_middleware/template
index 1907d5000e6..0bff1baaf25 100644
--- a/srcpkgs/ruby-faraday_middleware/template
+++ b/srcpkgs/ruby-faraday_middleware/template
@@ -6,7 +6,7 @@ archs=noarch
 build_style=gem
 depends="ruby-faraday>=0.7.4 ruby-faraday<1.0"
 short_desc="Various middleware for Faraday"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/lostisland/faraday_middleware"
 checksum=b94e3e7845f78db0eacdfc7e0185f0310765ccd70a46b6ce6478aa858ace23a9
diff --git a/srcpkgs/ruby-ffi/template b/srcpkgs/ruby-ffi/template
index 382669aad69..f2a0fccd2d3 100644
--- a/srcpkgs/ruby-ffi/template
+++ b/srcpkgs/ruby-ffi/template
@@ -1,17 +1,17 @@
 # Template file for 'ruby-ffi'
 pkgname=ruby-ffi
-version=1.10.0
+version=1.11.1
 revision=3
 wrksrc="ffi-${version}"
 build_style=gemspec
 hostmakedepends="libffi-devel"
 makedepends="libffi-devel"
 short_desc="Ruby FFI library"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/ffi/ffi/wiki"
 distfiles="https://rubygems.org/downloads/ffi-${version}.gem"
-checksum=17001940b28a961c94251a39f0ae00b32c2d0850479b5978c971759591fc1749
+checksum=90ae2a7fe7ac4c0af30650fba8b75d93ff3611803c4937248118797ae5edbb1a
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/ruby-gh/template b/srcpkgs/ruby-gh/template
index 4c60a77babd..5d6421b9fbe 100644
--- a/srcpkgs/ruby-gh/template
+++ b/srcpkgs/ruby-gh/template
@@ -7,7 +7,7 @@ build_style=gem
 depends="ruby-addressable>=2.4.0 ruby-backports ruby-faraday>=0.8
  ruby-multi_json>=1.0 ruby-net-http-persistent>=2.9 ruby-net-http-pipeline"
 short_desc="Multi-layer client for the GitHub v3 API"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/travis-ci/gh"
 checksum=ef733f81c17846f217f5ad9616105e9adc337775d41de1cc330133ad25708d3c
diff --git a/srcpkgs/ruby-highline/template b/srcpkgs/ruby-highline/template
index 70727b74128..f0d8ecc7179 100644
--- a/srcpkgs/ruby-highline/template
+++ b/srcpkgs/ruby-highline/template
@@ -1,11 +1,11 @@
 # Template file for 'ruby-highline'
 pkgname=ruby-highline
-version=2.0.2
+version=2.0.3
 revision=1
 archs=noarch
 build_style=gem
 short_desc="High-level IO library for comamndline interfaces"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Ruby"
 homepage="https://github.com/JEG2/highline"
-checksum=999780b892b3bb835cdaafbd0933f65ff85b72ccd1326890629b23e9a8ba1fbc
+checksum=2ddd5c127d4692721486f91737307236fe005352d12a4202e26c48614f719479
diff --git a/srcpkgs/ruby-hpricot/template b/srcpkgs/ruby-hpricot/template
index 4055113bc60..d23de17adf3 100644
--- a/srcpkgs/ruby-hpricot/template
+++ b/srcpkgs/ruby-hpricot/template
@@ -6,7 +6,7 @@ wrksrc="${pkgname#ruby-}-${version}"
 build_style=gemspec
 makedepends="ruby-devel"
 short_desc="Swift, liberal HTML parser"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://code.whytheluckystiff.net/hpricot/"
 distfiles="https://github.com/hpricot/hpricot/archive/${version}.tar.gz"
diff --git a/srcpkgs/ruby-httparty/template b/srcpkgs/ruby-httparty/template
index 41dc8c7bfc7..dfb51dc862f 100644
--- a/srcpkgs/ruby-httparty/template
+++ b/srcpkgs/ruby-httparty/template
@@ -1,15 +1,15 @@
 # Template file for 'ruby-httparty'
 pkgname=ruby-httparty
-version=0.17.0
+version=0.17.1
 revision=1
 archs=noarch
 build_style=gem
 depends="ruby-mime-types>=3.0 ruby-multi_xml>=0.5.2"
 short_desc="Makes http fun! Also, makes consuming restful web services dead easy"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/jnunemaker/httparty"
-checksum=76f359eb0f06873fc64315bb71be33e44100c0865fbf36570811c8a5e9d5151f
+checksum=972f9bff3f94511cf6601ba356ab569897e2b229904a86507057b3844f9439ea
 
 post_install() {
 	vlicense MIT-LICENSE
diff --git a/srcpkgs/ruby-launchy/template b/srcpkgs/ruby-launchy/template
index d8691a7c1bb..aab45c852f5 100644
--- a/srcpkgs/ruby-launchy/template
+++ b/srcpkgs/ruby-launchy/template
@@ -6,7 +6,7 @@ archs=noarch
 build_style=gem
 depends="ruby-addressable>=2.3 ruby-addressable<3.0"
 short_desc="Helper class for launching cross-platform applications"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="ISC"
 homepage="https://github.com/copiousfreetime/launchy"
 checksum=42f52ce12c6fe079bac8a804c66522a0eefe176b845a62df829defe0e37214a4
diff --git a/srcpkgs/ruby-mime-types-data/template b/srcpkgs/ruby-mime-types-data/template
index 0da1e9dc2a1..5b2c2e8ae74 100644
--- a/srcpkgs/ruby-mime-types-data/template
+++ b/srcpkgs/ruby-mime-types-data/template
@@ -1,14 +1,14 @@
 # Template file for 'ruby-mime-types-data'
 pkgname=ruby-mime-types-data
-version=3.2019.0331
+version=3.2019.1009
 revision=1
 archs=noarch
 build_style=gem
 short_desc="Registry for MIME media type definitions"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/mime-types/mime-types-data/"
-checksum=8a70976e9e3268e01df23bd8fdb503d80b285548f4754671b0875496c2bb00d4
+checksum=b09bb0076f4d209d21de5f81569edffdb6e53d43f891e30edfa12433980ba6a3
 
 post_install() {
 	vlicense Licence.md
diff --git a/srcpkgs/ruby-mime-types/template b/srcpkgs/ruby-mime-types/template
index cacfdbe70b8..cf778f045fd 100644
--- a/srcpkgs/ruby-mime-types/template
+++ b/srcpkgs/ruby-mime-types/template
@@ -1,15 +1,15 @@
 # Template file for 'ruby-mime-types'
 pkgname=ruby-mime-types
-version=3.2.2
-revision=2
+version=3.3
+revision=1
 archs=noarch
 build_style=gem
 depends="ruby-mime-types-data>=3.2015"
 short_desc="Library for registry and information about MIME types"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/mime-types/ruby-mime-types/"
-checksum=93f308f0b6754b0ca50dd1982b817f65b8946f6a34bd3db6bd3d8a5265f05d3a
+checksum=933ef7ba38c3e4d5561cbff4aaf92d9d76b97df77b7ab1083e3f2df9220af43c
 
 post_install() {
 	vlicense Licence.md
diff --git a/srcpkgs/ruby-mini_portile2/template b/srcpkgs/ruby-mini_portile2/template
index 03bbcddb42f..7a5be2a2784 100644
--- a/srcpkgs/ruby-mini_portile2/template
+++ b/srcpkgs/ruby-mini_portile2/template
@@ -4,7 +4,7 @@ version=2.4.0
 revision=1
 build_style=gem
 short_desc="Simplistic port-like solution for developers"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://github.com/flavorjones/mini_portile"
 checksum=7e178a397ad62bb8a96977986130dc81f1b13201c6dd95a48bd8cec1dda5f797
diff --git a/srcpkgs/ruby-multi_json/template b/srcpkgs/ruby-multi_json/template
index aade5767780..ea054b27805 100644
--- a/srcpkgs/ruby-multi_json/template
+++ b/srcpkgs/ruby-multi_json/template
@@ -1,14 +1,14 @@
 # Template file for 'ruby-multi_json'
 pkgname=ruby-multi_json
-version=1.13.1
-revision=2
+version=1.14.1
+revision=1
 archs=noarch
 build_style=gem
 short_desc="Common interface for multiple JSON parsing libraries"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/intridea/multi_json"
-checksum=db8613c039b9501e6b2fb85efe4feabb02f55c3365bae52bba35381b89c780e6
+checksum=d971296c0eacea289d31e4a7ab7ac5eda97262c62bbc8c110de4f5e36425c577
 
 post_install() {
 	vlicense LICENSE.md
diff --git a/srcpkgs/ruby-multi_xml/template b/srcpkgs/ruby-multi_xml/template
index b2c924f22ee..6279a2e499c 100644
--- a/srcpkgs/ruby-multi_xml/template
+++ b/srcpkgs/ruby-multi_xml/template
@@ -5,7 +5,7 @@ revision=2
 archs=noarch
 build_style=gem
 short_desc="Swappable XML backends utilizing LibXML, Nokogiri, Ox, or REXML"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/sferik/multi_xml"
 checksum=d24393cf958adb226db884b976b007914a89c53ad88718e25679d7008823ad52
diff --git a/srcpkgs/ruby-multipart-post/template b/srcpkgs/ruby-multipart-post/template
index 40c94357b02..9c657d8e190 100644
--- a/srcpkgs/ruby-multipart-post/template
+++ b/srcpkgs/ruby-multipart-post/template
@@ -1,14 +1,14 @@
 # Template file for 'ruby-multipart-post'
 pkgname=ruby-multipart-post
-version=2.0.0
-revision=2
+version=2.1.1
+revision=1
 archs=noarch
 build_style=gem
 short_desc="Use with Net::HTTP to do multipart form posts"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/nicksieger/multipart-post"
-checksum=3dc44e50d3df3d42da2b86272c568fd7b75c928d8af3cc5f9834e2e5d9586026
+checksum=d2dd7aa957650e0d99e0513cd388401b069f09528441b87d884609c8e94ffcfd
 
 post_install() {
 	sed -n '58,77p' README.md > LICENSE
diff --git a/srcpkgs/ruby-mustache/template b/srcpkgs/ruby-mustache/template
index dd7ce924024..049eef94945 100644
--- a/srcpkgs/ruby-mustache/template
+++ b/srcpkgs/ruby-mustache/template
@@ -5,7 +5,7 @@ revision=2
 archs=noarch
 build_style=gem
 short_desc="Framework-agnostic way to render logic-free views"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/mustache/mustache"
 checksum=7365441281b93b9a3e7299c432af1b971435155168ef12631a72bbdaf9ed2899
diff --git a/srcpkgs/ruby-net-http-persistent/template b/srcpkgs/ruby-net-http-persistent/template
index 3381362b27b..6552be19a18 100644
--- a/srcpkgs/ruby-net-http-persistent/template
+++ b/srcpkgs/ruby-net-http-persistent/template
@@ -1,15 +1,15 @@
 # Template file for 'ruby-net-http-persistent'
 pkgname=ruby-net-http-persistent
-version=3.0.0
-revision=2
+version=3.1.0
+revision=1
 archs=noarch
 build_style=gem
 depends="ruby-connection_pool>=2.2 ruby-connection_pool<3.0"
 short_desc="Manages persistent connections using Net::HTTP"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://docs.seattlerb.org/net-http-persistent"
-checksum=285cbf0bc3eb6312a86f883e0f5148e764aed76127075f3836dff5b74adad994
+checksum=eab637fcee31d2f2c119c24b5ae36d73cd8c08ccd9a45567829f24059e9836ae
 
 post_install() {
 	sed -n '63,82p' README.rdoc > LICENSE
diff --git a/srcpkgs/ruby-net-http-pipeline/template b/srcpkgs/ruby-net-http-pipeline/template
index c8ddf3f7800..25304d334fc 100644
--- a/srcpkgs/ruby-net-http-pipeline/template
+++ b/srcpkgs/ruby-net-http-pipeline/template
@@ -5,7 +5,7 @@ revision=2
 archs=noarch
 build_style=gem
 short_desc="HTTP/1.1 pipelining implementation atop Net::HTTP"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://docs.seattlerb.org/net-http-pipeline"
 checksum=6923ce2f28bfde589a9f385e999395eead48ccfe4376d4a85d9a77e8c7f0b22f
diff --git a/srcpkgs/ruby-pkg-config/template b/srcpkgs/ruby-pkg-config/template
index fdf98c041cd..196611e7e57 100644
--- a/srcpkgs/ruby-pkg-config/template
+++ b/srcpkgs/ruby-pkg-config/template
@@ -1,10 +1,10 @@
 # Template file for 'ruby-pkg-config'
 pkgname=ruby-pkg-config
-version=1.3.7
+version=1.3.9
 revision=1
 build_style=gem
 short_desc="Properly detect need libraries for compiling Ruby native extensions"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://github.com/ruby-gnome2/pkg-config"
-checksum=216fdf7ecd753dcc258cf516e1843f8e354c155b0aef2428f36e60c840f5a6e8
+checksum=fed18718d618565505af031c0df4054c4edc713ec6f37717253b82c9c98472dc
diff --git a/srcpkgs/ruby-public_suffix/template b/srcpkgs/ruby-public_suffix/template
index e0e0a58d364..250f8bb518e 100644
--- a/srcpkgs/ruby-public_suffix/template
+++ b/srcpkgs/ruby-public_suffix/template
@@ -1,14 +1,14 @@
 # Template file for 'ruby-public_suffix'
 pkgname=ruby-public_suffix
-version=3.0.3
-revision=2
+version=4.0.1
+revision=1
 archs=noarch
 build_style=gem
 short_desc="Parse domain names into top level domain, domain and subdomains"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://simonecarletti.com/code/publicsuffix-ruby"
-checksum=d4f4addffbd1ad3e7b5bb2e258a761ccef5670c23c29b0476b2299bcca220623
+checksum=6035585fe67676a195ba53fa5860625a70e057cf2226ecc5bbede125a4d8ce76
 
 post_install() {
 	vlicense LICENSE.txt
diff --git a/srcpkgs/ruby-pusher-client/template b/srcpkgs/ruby-pusher-client/template
index 699f90e1ada..dc9308e99f8 100644
--- a/srcpkgs/ruby-pusher-client/template
+++ b/srcpkgs/ruby-pusher-client/template
@@ -6,7 +6,7 @@ archs=noarch
 build_style=gem
 depends="ruby-websocket>=1.0 ruby-websocket<2.0"
 short_desc="Client for consuming WebSockets from http://pusher.com"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/pusher/pusher-ruby-client"
 checksum=c405c931090e126c056d99f6b69a01b1bcb6cbfdde02389c93e7d547c6efd5a3
diff --git a/srcpkgs/ruby-rb-readline/template b/srcpkgs/ruby-rb-readline/template
index 4ec255476fe..f7ff697fc6e 100644
--- a/srcpkgs/ruby-rb-readline/template
+++ b/srcpkgs/ruby-rb-readline/template
@@ -6,7 +6,7 @@ archs=noarch
 build_style=gem
 depends="ruby"
 short_desc="Pure Ruby implementation of GNU readline library"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/ConnorAtherton/rb-readline"
 checksum=9e9bd7e198bdef0822c46902f6c592b882c1f9777894a4c3dcf5b320824a8793
diff --git a/srcpkgs/ruby-rdiscount/template b/srcpkgs/ruby-rdiscount/template
index e502c4c90ee..abf271f6ac2 100644
--- a/srcpkgs/ruby-rdiscount/template
+++ b/srcpkgs/ruby-rdiscount/template
@@ -6,7 +6,7 @@ wrksrc="${pkgname#ruby-}-${version}"
 build_style=gemspec
 makedepends="ruby-devel"
 short_desc="Fast implementation of Gruber's Markdown in C"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://dafoster.net/projects/rdiscount/"
 distfiles="https://github.com/davidfstr/rdiscount/archive/${version}.tar.gz"
diff --git a/srcpkgs/ruby-ronn/template b/srcpkgs/ruby-ronn/template
index 5b9751cede4..a7e498329ba 100644
--- a/srcpkgs/ruby-ronn/template
+++ b/srcpkgs/ruby-ronn/template
@@ -6,7 +6,7 @@ archs=noarch
 build_style=gem
 depends="ruby-hpricot ruby-mustache ruby-rdiscount groff"
 short_desc="Strick markdown-like format for manpages"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://rtomayko.github.com/ronn"
 checksum=82df6fd4a3aa91734866710d2811a6387e50a7513fc528ce6c7d95ee7ad7f41e
diff --git a/srcpkgs/ruby-thor/template b/srcpkgs/ruby-thor/template
index 30a13e09d48..dc324c08a63 100644
--- a/srcpkgs/ruby-thor/template
+++ b/srcpkgs/ruby-thor/template
@@ -4,7 +4,7 @@ version=0.20.3
 revision=2
 build_style=gem
 short_desc="Toolkit for building powerful command-line interfaces"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://whatisthor.com/"
 checksum=49bc217fe28f6af34c6e60b003e3405c27595a55689077d82e9e61d4d3b519fa
diff --git a/srcpkgs/ruby-travis/template b/srcpkgs/ruby-travis/template
index 17ce179207e..b7f1382b039 100644
--- a/srcpkgs/ruby-travis/template
+++ b/srcpkgs/ruby-travis/template
@@ -8,7 +8,7 @@ depends="ruby-backports ruby-faraday>=0.9 ruby-faraday_middleware>=0.9.1
  ruby-gh>=0.13 ruby-highline>=1.6 ruby-launchy>=2.1 ruby-pusher-client>=0.4
  ruby-typhoeus>=0.6.8"
 short_desc="CLI and Ruby library client for Travis CI"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/travis-ci/travis.rb"
 checksum=533752268510d061ab4c6b77d462eae0ec54afe38412f4803e74da7da39eed3d
diff --git a/srcpkgs/ruby-typhoeus/template b/srcpkgs/ruby-typhoeus/template
index b134040cd9d..7b08216c4ba 100644
--- a/srcpkgs/ruby-typhoeus/template
+++ b/srcpkgs/ruby-typhoeus/template
@@ -6,7 +6,7 @@ archs=noarch
 build_style=gem
 depends="ruby-ethon>=0.9.0"
 short_desc="Parallel HTTP requests runner"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/typhoeus/typhoeus"
 checksum=257e7163d50bed15e52c3c25bde890ea3ad854f3bd2e3fd16ce0b216c342d132
diff --git a/srcpkgs/ruby-websocket/template b/srcpkgs/ruby-websocket/template
index 1709e81df11..5d221fa67d6 100644
--- a/srcpkgs/ruby-websocket/template
+++ b/srcpkgs/ruby-websocket/template
@@ -5,7 +5,7 @@ revision=2
 archs=noarch
 build_style=gem
 short_desc="Universal Ruby library to handle WebSocket protocol"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/imanel/websocket-ruby"
 checksum=1d8155c1cdaab8e8e72587a60e08423c9dd84ee44e4e827358ce3d4c2ccb2138
diff --git a/srcpkgs/ruby-xdg/template b/srcpkgs/ruby-xdg/template
index 6859faeac31..9923e24baea 100644
--- a/srcpkgs/ruby-xdg/template
+++ b/srcpkgs/ruby-xdg/template
@@ -1,14 +1,14 @@
 # Template file for 'ruby-xdg'
 pkgname=ruby-xdg
-version=2.2.3
-revision=2
+version=3.1.0
+revision=1
 build_style=gem
 short_desc="Module for supporting the XDG Base Directory Standard"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="http://rubyworks.github.com/xdg"
-checksum=b87e4ad02eaa1557d09ae620dac134a3f20ac588063dc7e46e0b77be9a3bc4ae
+checksum=ab7e4d69cf241d4eb616fa2918007a2961e86e97daefec9e1c21645e2c72eaf9
 
 post_install() {
-	vlicense LICENSE.txt
+	vlicense LICENSE.md
 }
diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index ffe8e187ccd..d5db49edef4 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -2,8 +2,8 @@
 _ruby_abiver=2.6.0
 
 pkgname=ruby
-version=2.6.3
-revision=2
+version=2.6.5
+revision=1
 build_style=gnu-configure
 configure_args="--enable-shared --disable-rpath
  DOXYGEN=/usr/bin/doxygen DOT=/usr/bin/dot PKG_CONFIG=/usr/bin/pkg-config"
@@ -17,7 +17,7 @@ homepage="http://www.ruby-lang.org/en/"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Ruby, BSD-2-Clause"
 distfiles="https://cache.ruby-lang.org/pub/ruby/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=dd638bf42059182c1d04af0d5577131d4ce70b79105231c4cc0a60de77b14f2e
+checksum=97ddf1b922f83c1f5c50e75bf54e27bba768d75fea7cda903b886c6745e60f0a
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Broken on the builders but successfully built locally
diff --git a/srcpkgs/run-parts/template b/srcpkgs/run-parts/template
index c3917512df9..665d03ad902 100644
--- a/srcpkgs/run-parts/template
+++ b/srcpkgs/run-parts/template
@@ -1,18 +1,18 @@
 # Template file for 'run-parts'
 pkgname=run-parts
-version=4.8.6.3
+version=4.9
 revision=1
 bootstrap=yes
 wrksrc="debianutils-${version}"
 build_style=gnu-configure
 make_build_target=run-parts
 short_desc="Run scripts or programs in a directory"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Peter Bui <pbui@github.bx612.space>"
 license="GPL-2.0-or-later"
 homepage="https://tracker.debian.org/pkg/debianutils"
 changelog="http://metadata.ftp-master.debian.org/changelogs/main/d/debianutils/debianutils_${version}_changelog"
 distfiles="${DEBIAN_SITE}/main/d/debianutils/debianutils_${version}.tar.xz"
-checksum=2cc7de3afc6df1cf6d00af9938efac7ee8f739228e548e512ddc186b6a7be221
+checksum=20975c5cb8cb305f28c2ac35dd99fd9f594f25b6140b5d478a0a364e9fa8073f
 
 do_install() {
 	vbin run-parts
diff --git a/srcpkgs/runc/template b/srcpkgs/runc/template
index cb6708140c2..8097bd39d2d 100644
--- a/srcpkgs/runc/template
+++ b/srcpkgs/runc/template
@@ -1,8 +1,8 @@
 # Template file for 'runc'
 pkgname=runc
 version=1.0.0
-revision=10
-_subver="rc8"
+revision=11
+_subver="rc9"
 _ver="$version-$_subver"
 wrksrc="$pkgname-$_ver"
 build_style=go
@@ -15,7 +15,7 @@ maintainer="Paul Knopf <pauldotknopf@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/opencontainers/runc"
 distfiles="https://github.com/opencontainers/runc/releases/download/v${_ver}/runc.tar.xz"
-checksum=5d46f01bca203ae226f107f8e3351211f492d43038af19b8337acffab6c4f576
+checksum=2f1c7ebac67c779affe2bb4370bba44b08ed280144ba58c86219186e303832ba
 
 post_build() {
 	make man
diff --git a/srcpkgs/runit-void/template b/srcpkgs/runit-void/template
index 14f605fdc92..52199f0f912 100644
--- a/srcpkgs/runit-void/template
+++ b/srcpkgs/runit-void/template
@@ -1,7 +1,7 @@
 # Template file for 'runit-void'
 pkgname=runit-void
-version=20180623
-revision=2
+version=20190906
+revision=1
 wrksrc="void-runit-${version}"
 build_style=gnu-makefile
 homepage="https://github.com/void-linux/void-runit"
@@ -9,7 +9,7 @@ short_desc="Void Linux runit scripts"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Public Domain"
 distfiles="https://github.com/void-linux/void-runit/archive/${version}.tar.gz"
-checksum=f71a070ac5e5af39fdaa0ffbd7404b607e503c2226cb49e98ac19e042283ff2c
+checksum=9e1027c07124ff4efad63bef74b9f1ae0659e43f9d4e7cfde996be271706570c
 
 depends="virtual?awk procps-ng runit"
 conf_files="
diff --git a/srcpkgs/rust-cargo-audit/template b/srcpkgs/rust-cargo-audit/template
index a4eda925e0a..f0daae87024 100644
--- a/srcpkgs/rust-cargo-audit/template
+++ b/srcpkgs/rust-cargo-audit/template
@@ -1,6 +1,6 @@
 # Template file for 'rust-cargo-audit'
 pkgname=rust-cargo-audit
-version=0.7.0
+version=0.9.3
 revision=1
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0, MIT"
 homepage="https://rustsec.org"
 distfiles="https://static.crates.io/crates/cargo-audit/cargo-audit-${version}.crate"
-checksum=c246d7f8c9e42f3f4afac539feed3abe42042585c8e808c0836eb65ad86513ad
+checksum=7693507d43e5713dbdf2ad708b12fdc02e8efcb907e74f313c8e34c47d9b8821
 
 post_install() {
 	vlicense LICENSE-APACHE
diff --git a/srcpkgs/rust-cargo-bloat/template b/srcpkgs/rust-cargo-bloat/template
index 909a98c287b..654451a27fa 100644
--- a/srcpkgs/rust-cargo-bloat/template
+++ b/srcpkgs/rust-cargo-bloat/template
@@ -1,6 +1,6 @@
 # Template file for 'rust-cargo-bloat'
 pkgname=rust-cargo-bloat
-version=0.6.4
+version=0.9.0
 revision=1
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
@@ -9,7 +9,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://crates.io/crates/cargo-bloat"
 distfiles="https://static.crates.io/crates/cargo-bloat/cargo-bloat-${version}.crate"
-checksum=a62b35cd133892e7531cdcb24d9ec1a26d97087d0b1e77ffae922d2af0d6b42d
+checksum=780dce4cdcd0dd4de468a90f712086c23fefc1d028b709873d4075ff200f5eaf
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/rust-sccache/template b/srcpkgs/rust-sccache/template
index dc21c37a84a..e7ec7cb03a9 100644
--- a/srcpkgs/rust-sccache/template
+++ b/srcpkgs/rust-sccache/template
@@ -1,7 +1,7 @@
 # Template file for 'rust-sccache'
 pkgname=rust-sccache
-version=0.2.8
-revision=2
+version=0.2.12
+revision=1
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
@@ -11,8 +11,13 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://crates.io/crates/sccache"
 distfiles="https://static.crates.io/crates/sccache/sccache-${version}.crate"
-checksum=c1e914cab6496ac4ea3ef9e52b2a14661edd313ae3ecad8ce52f3a254aafcc1a
+checksum=dfbf49fad5edeb3a1ead50a41eea2d115ce591342f5d8f6b60b00dd76bec3c49
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc*) broken="ftbfs in ring" ;;
 esac
+
+pre_build() {
+	cargo update --package openssl-sys --precise 0.9.49
+	cargo update --package openssl:0.10.15 --precise 0.10.24
+}
diff --git a/srcpkgs/rust/patches/0002-Fix-LLVM-build.patch b/srcpkgs/rust/patches/0002-Fix-LLVM-build.patch
index 95e261df034..83091f46bf6 100644
--- a/srcpkgs/rust/patches/0002-Fix-LLVM-build.patch
+++ b/srcpkgs/rust/patches/0002-Fix-LLVM-build.patch
@@ -1,17 +1,17 @@
-From 59faa3f7b9b07d986bcd810d750daad956bd612b Mon Sep 17 00:00:00 2001
+From 0a19456e2445def4cfe99dd02cf8292c1db5d4d4 Mon Sep 17 00:00:00 2001
 From: Samuel Holland <samuel@sholland.org>
 Date: Fri, 8 Sep 2017 00:04:29 -0500
-Subject: [PATCH 02/12] Fix LLVM build
+Subject: [PATCH 02/16] Fix LLVM build
 
 ---
  src/bootstrap/lib.rs | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs
-index ca4489655..7618a6e6d 100644
+index 4d297fa918a..867df81d972 100644
 --- a/src/bootstrap/lib.rs
 +++ b/src/bootstrap/lib.rs
-@@ -774,7 +774,8 @@ impl Build {
+@@ -769,7 +769,8 @@ impl Build {
          // cc-rs because the build scripts will determine that for themselves.
          let mut base = self.cc[&target].args().iter()
                             .map(|s| s.to_string_lossy().into_owned())
@@ -22,5 +22,5 @@ index ca4489655..7618a6e6d 100644
  
          // If we're compiling on macOS then we add a few unconditional flags
 -- 
-2.22.0
+2.21.0
 
diff --git a/srcpkgs/rust/patches/0003-Allow-rustdoc-to-work-when-cross-compiling-on-musl.patch b/srcpkgs/rust/patches/0003-Allow-rustdoc-to-work-when-cross-compiling-on-musl.patch
index 55c4ab799ee..cf07c76d281 100644
--- a/srcpkgs/rust/patches/0003-Allow-rustdoc-to-work-when-cross-compiling-on-musl.patch
+++ b/srcpkgs/rust/patches/0003-Allow-rustdoc-to-work-when-cross-compiling-on-musl.patch
@@ -1,7 +1,7 @@
-From 681f46ea92719a419c3dadbe3376062cc5bde8b8 Mon Sep 17 00:00:00 2001
+From 2200debf48b6ef4c87e258cf8a968a89903f8723 Mon Sep 17 00:00:00 2001
 From: Samuel Holland <samuel@sholland.org>
 Date: Sat, 2 Dec 2017 17:25:44 -0600
-Subject: [PATCH 03/12] Allow rustdoc to work when cross-compiling on musl
+Subject: [PATCH 03/16] Allow rustdoc to work when cross-compiling on musl
 
 musl can't handle foreign-architecture libraries in LD_LIBRARY_PATH.
 ---
@@ -9,7 +9,7 @@ musl can't handle foreign-architecture libraries in LD_LIBRARY_PATH.
  1 file changed, 2 insertions(+), 5 deletions(-)
 
 diff --git a/src/bootstrap/bin/rustdoc.rs b/src/bootstrap/bin/rustdoc.rs
-index 1c9f6e1ab..7e90be8d8 100644
+index 1c9f6e1ab28..7e90be8d8cc 100644
 --- a/src/bootstrap/bin/rustdoc.rs
 +++ b/src/bootstrap/bin/rustdoc.rs
 @@ -23,9 +23,6 @@ fn main() {
@@ -41,5 +41,5 @@ index 1c9f6e1ab..7e90be8d8 100644
          );
          eprintln!("sysroot: {:?}", sysroot);
 -- 
-2.22.0
+2.21.0
 
diff --git a/srcpkgs/rust/patches/0004-Require-static-native-libraries-when-linking-static-.patch b/srcpkgs/rust/patches/0004-Require-static-native-libraries-when-linking-static-.patch
index 58aa482d6fb..854cd61e68e 100644
--- a/srcpkgs/rust/patches/0004-Require-static-native-libraries-when-linking-static-.patch
+++ b/srcpkgs/rust/patches/0004-Require-static-native-libraries-when-linking-static-.patch
@@ -1,7 +1,7 @@
-From b0de26f4cef75c63a7901990ed92fe0616a971fc Mon Sep 17 00:00:00 2001
+From 10bd267ac2621267e1f537a5a7df34cb87354cd3 Mon Sep 17 00:00:00 2001
 From: Samuel Holland <samuel@sholland.org>
 Date: Fri, 8 Sep 2017 00:05:18 -0500
-Subject: [PATCH 04/12] Require static native libraries when linking static
+Subject: [PATCH 04/16] Require static native libraries when linking static
  executables
 
 On ELF targets like Linux, gcc/ld will create a dynamically-linked
@@ -16,10 +16,10 @@ Fixes #54243
  1 file changed, 14 insertions(+), 4 deletions(-)
 
 diff --git a/src/librustc_codegen_ssa/back/link.rs b/src/librustc_codegen_ssa/back/link.rs
-index d5a56f6a0..bb06d80d8 100644
+index e3d297e7862..974e8c0239b 100644
 --- a/src/librustc_codegen_ssa/back/link.rs
 +++ b/src/librustc_codegen_ssa/back/link.rs
-@@ -1548,9 +1548,7 @@ fn add_upstream_rust_crates<'a, B: ArchiveBuilder<'a>>(cmd: &mut dyn Linker,
+@@ -1571,9 +1571,7 @@ fn add_upstream_rust_crates<'a, B: ArchiveBuilder<'a>>(cmd: &mut dyn Linker,
      }
  }
  
@@ -30,7 +30,7 @@ index d5a56f6a0..bb06d80d8 100644
  //
  // 1. The upstream crate is an rlib. In this case we *must* link in the
  // native dependency because the rlib is just an archive.
-@@ -1593,7 +1591,19 @@ pub fn add_upstream_native_libraries(cmd: &mut dyn Linker,
+@@ -1616,7 +1614,19 @@ pub fn add_upstream_native_libraries(cmd: &mut dyn Linker,
                  continue
              }
              match lib.kind {
@@ -52,5 +52,5 @@ index d5a56f6a0..bb06d80d8 100644
                  NativeLibraryKind::NativeStaticNobundle => {
                      // Link "static-nobundle" native libs only if the crate they originate from
 -- 
-2.22.0
+2.21.0
 
diff --git a/srcpkgs/rust/patches/0005-Remove-nostdlib-and-musl_root-from-musl-targets.patch b/srcpkgs/rust/patches/0005-Remove-nostdlib-and-musl_root-from-musl-targets.patch
index 7f524b1eabf..88e05b3887d 100644
--- a/srcpkgs/rust/patches/0005-Remove-nostdlib-and-musl_root-from-musl-targets.patch
+++ b/srcpkgs/rust/patches/0005-Remove-nostdlib-and-musl_root-from-musl-targets.patch
@@ -1,7 +1,7 @@
-From 9e646efacc9459f05bcefe9ad6d8e65dd06ba2d7 Mon Sep 17 00:00:00 2001
+From e8ef432c23ea9fb70b28bea07042b33f1050569b Mon Sep 17 00:00:00 2001
 From: Samuel Holland <samuel@sholland.org>
 Date: Fri, 8 Sep 2017 22:11:14 -0500
-Subject: [PATCH 05/12] Remove -nostdlib and musl_root from musl targets
+Subject: [PATCH 05/16] Remove -nostdlib and musl_root from musl targets
 
 ---
  config.toml.example                           |  6 ----
@@ -20,10 +20,10 @@ Subject: [PATCH 05/12] Remove -nostdlib and musl_root from musl targets
  13 files changed, 4 insertions(+), 152 deletions(-)
 
 diff --git a/config.toml.example b/config.toml.example
-index 556625b53..3c6f18728 100644
+index c14adf8ce33..8ec8d2bbbb7 100644
 --- a/config.toml.example
 +++ b/config.toml.example
-@@ -474,12 +474,6 @@
+@@ -479,12 +479,6 @@
  # only use static libraries. If unset, the target's default linkage is used.
  #crt-static = false
  
@@ -37,10 +37,10 @@ index 556625b53..3c6f18728 100644
  #wasi-root = "..."
  
 diff --git a/src/bootstrap/bin/rustc.rs b/src/bootstrap/bin/rustc.rs
-index 821c37dc2..906af787f 100644
+index 595deb07ec8..c077dc1581e 100644
 --- a/src/bootstrap/bin/rustc.rs
 +++ b/src/bootstrap/bin/rustc.rs
-@@ -122,16 +122,6 @@ fn main() {
+@@ -145,16 +145,6 @@ fn main() {
              cmd.arg("-Cprefer-dynamic");
          }
  
@@ -58,7 +58,7 @@ index 821c37dc2..906af787f 100644
              let mut root = OsString::from("native=");
              root.push(&s);
 diff --git a/src/bootstrap/cc_detect.rs b/src/bootstrap/cc_detect.rs
-index dfc243b70..848d1d4b2 100644
+index 400375cd201..0394ab7a8a7 100644
 --- a/src/bootstrap/cc_detect.rs
 +++ b/src/bootstrap/cc_detect.rs
 @@ -84,7 +84,7 @@ pub fn find(build: &mut Build) {
@@ -70,16 +70,16 @@ index dfc243b70..848d1d4b2 100644
          }
  
          let compiler = cfg.get_compiler();
-@@ -113,7 +113,7 @@ pub fn find(build: &mut Build) {
-         if let Some(cxx) = config.and_then(|c| c.cxx.as_ref()) {
+@@ -107,7 +107,7 @@ pub fn find(build: &mut Build) {
              cfg.compiler(cxx);
+             true
+         } else if build.hosts.contains(&target) || build.build == target {
+-            set_compiler(&mut cfg, Language::CPlusPlus, target, config, build);
++            set_compiler(&mut cfg, Language::CPlusPlus, target, config);
+             true
          } else {
--            set_compiler(&mut cfg, Language::CPlusPlus, host, config, build);
-+            set_compiler(&mut cfg, Language::CPlusPlus, host, config);
-         }
-         let compiler = cfg.get_compiler();
-         build.verbose(&format!("CXX_{} = {:?}", host, compiler.path()));
-@@ -124,8 +124,7 @@ pub fn find(build: &mut Build) {
+             false
+@@ -134,8 +134,7 @@ pub fn find(build: &mut Build) {
  fn set_compiler(cfg: &mut cc::Build,
                  compiler: Language,
                  target: Interned<String>,
@@ -89,7 +89,7 @@ index dfc243b70..848d1d4b2 100644
      match &*target {
          // When compiling for android we may have the NDK configured in the
          // config.toml in which case we look there. Otherwise the default
-@@ -165,26 +164,6 @@ fn set_compiler(cfg: &mut cc::Build,
+@@ -175,26 +174,6 @@ fn set_compiler(cfg: &mut cc::Build,
              }
          }
  
@@ -117,10 +117,10 @@ index dfc243b70..848d1d4b2 100644
      }
  }
 diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs
-index e1cdd226f..05442c6c6 100644
+index 576267e6948..8e5de3907f6 100644
 --- a/src/bootstrap/compile.rs
 +++ b/src/bootstrap/compile.rs
-@@ -115,20 +115,7 @@ impl Step for Std {
+@@ -116,20 +116,7 @@ impl Step for Std {
  fn copy_third_party_objects(builder: &Builder<'_>, compiler: &Compiler, target: Interned<String>) {
      let libdir = builder.sysroot_libdir(*compiler, target);
  
@@ -142,7 +142,7 @@ index e1cdd226f..05442c6c6 100644
          for &obj in &["crt1.o"] {
              builder.copy(
                  &builder.wasi_root(target).unwrap().join("lib/wasm32-wasi").join(obj),
-@@ -191,12 +178,6 @@ pub fn std_cargo(builder: &Builder<'_>,
+@@ -219,12 +206,6 @@ pub fn std_cargo(builder: &Builder<'_>,
              .arg("--manifest-path")
              .arg(builder.src.join("src/libstd/Cargo.toml"));
  
@@ -156,10 +156,10 @@ index e1cdd226f..05442c6c6 100644
              if let Some(p) = builder.wasi_root(target) {
                  cargo.env("WASI_ROOT", p);
 diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs
-index b1d009a67..cc567839f 100644
+index 66f504ea924..5bb211501b1 100644
 --- a/src/bootstrap/config.rs
 +++ b/src/bootstrap/config.rs
-@@ -135,8 +135,6 @@ pub struct Config {
+@@ -133,8 +133,6 @@ pub struct Config {
      pub print_step_timings: bool,
      pub missing_tools: bool,
  
@@ -168,7 +168,7 @@ index b1d009a67..cc567839f 100644
      pub prefix: Option<PathBuf>,
      pub sysconfdir: Option<PathBuf>,
      pub datadir: Option<PathBuf>,
-@@ -171,7 +169,6 @@ pub struct Target {
+@@ -169,7 +167,6 @@ pub struct Target {
      pub linker: Option<PathBuf>,
      pub ndk: Option<PathBuf>,
      pub crt_static: Option<bool>,
@@ -176,15 +176,15 @@ index b1d009a67..cc567839f 100644
      pub wasi_root: Option<PathBuf>,
      pub qemu_rootfs: Option<PathBuf>,
      pub no_std: bool,
-@@ -308,7 +305,6 @@ struct Rust {
+@@ -307,7 +304,6 @@ struct Rust {
      backtrace: Option<bool>,
      default_linker: Option<String>,
      channel: Option<String>,
 -    musl_root: Option<String>,
      rpath: Option<bool>,
      optimize_tests: Option<bool>,
-     debuginfo_tests: Option<bool>,
-@@ -348,7 +344,6 @@ struct TomlTarget {
+     codegen_tests: Option<bool>,
+@@ -346,7 +342,6 @@ struct TomlTarget {
      linker: Option<String>,
      android_ndk: Option<String>,
      crt_static: Option<bool>,
@@ -192,7 +192,7 @@ index b1d009a67..cc567839f 100644
      wasi_root: Option<String>,
      qemu_rootfs: Option<String>,
  }
-@@ -568,7 +563,6 @@ impl Config {
+@@ -569,7 +564,6 @@ impl Config {
              set(&mut config.llvm_tools_enabled, rust.llvm_tools);
              config.rustc_parallel = rust.parallel_compiler.unwrap_or(false);
              config.rustc_default_linker = rust.default_linker.clone();
@@ -200,7 +200,7 @@ index b1d009a67..cc567839f 100644
              config.save_toolstates = rust.save_toolstates.clone().map(PathBuf::from);
              set(&mut config.deny_warnings, rust.deny_warnings.or(flags.warnings));
              set(&mut config.backtrace_on_ice, rust.backtrace_on_ice);
-@@ -611,7 +605,6 @@ impl Config {
+@@ -607,7 +601,6 @@ impl Config {
                  target.ranlib = cfg.ranlib.clone().map(PathBuf::from);
                  target.linker = cfg.linker.clone().map(PathBuf::from);
                  target.crt_static = cfg.crt_static.clone();
@@ -209,10 +209,10 @@ index b1d009a67..cc567839f 100644
                  target.qemu_rootfs = cfg.qemu_rootfs.clone().map(PathBuf::from);
  
 diff --git a/src/bootstrap/configure.py b/src/bootstrap/configure.py
-index ade8afee7..f9ccf7aed 100755
+index 907983d43ad..e91f6fcbe4b 100755
 --- a/src/bootstrap/configure.py
 +++ b/src/bootstrap/configure.py
-@@ -111,28 +111,6 @@ v("aarch64-linux-android-ndk", "target.aarch64-linux-android.android-ndk",
+@@ -110,30 +110,6 @@ v("aarch64-linux-android-ndk", "target.aarch64-linux-android.android-ndk",
    "aarch64-linux-android NDK standalone path")
  v("x86_64-linux-android-ndk", "target.x86_64-linux-android.android-ndk",
    "x86_64-linux-android NDK standalone path")
@@ -230,7 +230,9 @@ index ade8afee7..f9ccf7aed 100755
 -  "arm-unknown-linux-musleabihf install directory")
 -v("musl-root-armv5te", "target.armv5te-unknown-linux-musleabi.musl-root",
 -  "armv5te-unknown-linux-musleabi install directory")
--v("musl-root-armv7", "target.armv7-unknown-linux-musleabihf.musl-root",
+-v("musl-root-armv7", "target.armv7-unknown-linux-musleabi.musl-root",
+-  "armv7-unknown-linux-musleabi install directory")
+-v("musl-root-armv7hf", "target.armv7-unknown-linux-musleabihf.musl-root",
 -  "armv7-unknown-linux-musleabihf install directory")
 -v("musl-root-aarch64", "target.aarch64-unknown-linux-musl.musl-root",
 -  "aarch64-unknown-linux-musl install directory")
@@ -242,10 +244,10 @@ index ade8afee7..f9ccf7aed 100755
    "rootfs in qemu testing, you probably don't want to use this")
  v("qemu-aarch64-rootfs", "target.aarch64-unknown-linux-gnu.qemu-rootfs",
 diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs
-index 7618a6e6d..49cdb526e 100644
+index 867df81d972..4fb57aa6db6 100644
 --- a/src/bootstrap/lib.rs
 +++ b/src/bootstrap/lib.rs
-@@ -852,14 +852,6 @@ impl Build {
+@@ -847,14 +847,6 @@ impl Build {
          }
      }
  
@@ -261,7 +263,7 @@ index 7618a6e6d..49cdb526e 100644
      fn wasi_root(&self, target: Interned<String>) -> Option<&Path> {
          self.config.target_config.get(&target)
 diff --git a/src/bootstrap/sanity.rs b/src/bootstrap/sanity.rs
-index dc65fb9b7..060ba6d9e 100644
+index dc65fb9b797..060ba6d9e42 100644
 --- a/src/bootstrap/sanity.rs
 +++ b/src/bootstrap/sanity.rs
 @@ -176,34 +176,6 @@ pub fn check(build: &mut Build) {
@@ -299,63 +301,8 @@ index dc65fb9b7..060ba6d9e 100644
          if target.contains("msvc") {
              // There are three builds of cmake on windows: MSVC, MinGW, and
              // Cygwin. The Cygwin build does not have generators for Visual
-diff --git a/src/ci/docker/dist-i586-gnu-i586-i686-musl/Dockerfile b/src/ci/docker/dist-i586-gnu-i586-i686-musl/Dockerfile
-index ba2d32a92..412c37fdd 100644
---- a/src/ci/docker/dist-i586-gnu-i586-i686-musl/Dockerfile
-+++ b/src/ci/docker/dist-i586-gnu-i586-i686-musl/Dockerfile
-@@ -30,8 +30,6 @@ COPY scripts/sccache.sh /scripts/
- RUN sh /scripts/sccache.sh
- 
- ENV RUST_CONFIGURE_ARGS \
--      --musl-root-i586=/musl-i586 \
--      --musl-root-i686=/musl-i686 \
-       --enable-extended \
-       --disable-docs
- 
-diff --git a/src/ci/docker/dist-various-1/Dockerfile b/src/ci/docker/dist-various-1/Dockerfile
-index a722a4183..44e6728de 100644
---- a/src/ci/docker/dist-various-1/Dockerfile
-+++ b/src/ci/docker/dist-various-1/Dockerfile
-@@ -132,13 +132,6 @@ ENV CC_mipsel_unknown_linux_musl=mipsel-openwrt-linux-gcc \
-     CXX_thumbv7neon_unknown_linux_gnueabihf=arm-linux-gnueabihf-g++
-     
- ENV RUST_CONFIGURE_ARGS \
--      --musl-root-armv5te=/musl-armv5te \
--      --musl-root-arm=/musl-arm \
--      --musl-root-armhf=/musl-armhf \
--      --musl-root-armv7=/musl-armv7 \
--      --musl-root-aarch64=/musl-aarch64 \
--      --musl-root-mips=/musl-mips \
--      --musl-root-mipsel=/musl-mipsel \
-       --enable-emscripten \
-       --disable-docs
- 
-diff --git a/src/ci/docker/dist-x86_64-musl/Dockerfile b/src/ci/docker/dist-x86_64-musl/Dockerfile
-index 385eefde8..81d4f7737 100644
---- a/src/ci/docker/dist-x86_64-musl/Dockerfile
-+++ b/src/ci/docker/dist-x86_64-musl/Dockerfile
-@@ -31,7 +31,6 @@ RUN sh /scripts/sccache.sh
- ENV HOSTS=x86_64-unknown-linux-musl
- 
- ENV RUST_CONFIGURE_ARGS \
--      --musl-root-x86_64=/usr/local/x86_64-linux-musl \
-       --enable-extended \
-       --disable-docs \
-       --set target.x86_64-unknown-linux-musl.crt-static=false \
-diff --git a/src/ci/docker/test-various/Dockerfile b/src/ci/docker/test-various/Dockerfile
-index 611a24a69..99c2b866b 100644
---- a/src/ci/docker/test-various/Dockerfile
-+++ b/src/ci/docker/test-various/Dockerfile
-@@ -31,7 +31,6 @@ COPY scripts/sccache.sh /scripts/
- RUN sh /scripts/sccache.sh
- 
- ENV RUST_CONFIGURE_ARGS \
--  --musl-root-x86_64=/usr/local/x86_64-linux-musl \
-   --set build.nodejs=/node-v9.2.0-linux-x64/bin/node \
-   --set rust.lld
- 
 diff --git a/src/librustc_target/spec/linux_musl_base.rs b/src/librustc_target/spec/linux_musl_base.rs
-index e294e6398..58ae91a96 100644
+index e294e63982d..58ae91a96aa 100644
 --- a/src/librustc_target/spec/linux_musl_base.rs
 +++ b/src/librustc_target/spec/linux_musl_base.rs
 @@ -3,28 +3,12 @@ use crate::spec::{LinkerFlavor, TargetOptions};
@@ -388,5 +335,5 @@ index e294e6398..58ae91a96 100644
      base.crt_static_default = true;
      // These targets allow the user to choose between static and dynamic linking.
 -- 
-2.22.0
+2.21.0
 
diff --git a/srcpkgs/rust/patches/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch b/srcpkgs/rust/patches/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch
index 4a06be304f1..2f109444886 100644
--- a/srcpkgs/rust/patches/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch
+++ b/srcpkgs/rust/patches/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch
@@ -1,17 +1,17 @@
-From b8815ecb4ec9ecf7c2469703005bede91c0f6f82 Mon Sep 17 00:00:00 2001
+From 1eb558f246269606c6d8d73824ef6b44fa10764e Mon Sep 17 00:00:00 2001
 From: Samuel Holland <samuel@sholland.org>
 Date: Sat, 9 Sep 2017 00:14:16 -0500
-Subject: [PATCH 06/12] Prefer libgcc_eh over libunwind for musl
+Subject: [PATCH 06/16] Prefer libgcc_eh over libunwind for musl
 
 ---
  src/libunwind/lib.rs | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/libunwind/lib.rs b/src/libunwind/lib.rs
-index 0ccffea31..935175dd8 100644
+index 9182e349b19..0377fbb58fc 100644
 --- a/src/libunwind/lib.rs
 +++ b/src/libunwind/lib.rs
-@@ -26,6 +26,6 @@ cfg_if! {
+@@ -23,6 +23,6 @@ cfg_if::cfg_if! {
  }
  
  #[cfg(target_env = "musl")]
@@ -20,5 +20,5 @@ index 0ccffea31..935175dd8 100644
  #[link(name = "gcc_s", cfg(not(target_feature = "crt-static")))]
  extern {}
 -- 
-2.22.0
+2.21.0
 
diff --git a/srcpkgs/rust/patches/0007-Fix-C-aggregate-passing-ABI-on-powerpc.patch b/srcpkgs/rust/patches/0007-Fix-C-aggregate-passing-ABI-on-powerpc.patch
new file mode 100644
index 00000000000..05b91456f77
--- /dev/null
+++ b/srcpkgs/rust/patches/0007-Fix-C-aggregate-passing-ABI-on-powerpc.patch
@@ -0,0 +1,93 @@
+From c9a914f48652de22832a40ef9639ff8d57c57f31 Mon Sep 17 00:00:00 2001
+From: Samuel Holland <samuel@sholland.org>
+Date: Wed, 4 Sep 2019 20:40:18 -0500
+Subject: [PATCH 07/16] Fix C aggregate-passing ABI on powerpc
+
+The existing code (which looks like it was copied from MIPS) passes
+aggregates by value in registers. This is wrong. According to the SVR4
+powerpc psABI, all aggregates are passed indirectly.
+---
+ src/librustc_target/abi/call/mod.rs     |  2 +-
+ src/librustc_target/abi/call/powerpc.rs | 41 ++++++-------------------
+ 2 files changed, 11 insertions(+), 32 deletions(-)
+
+diff --git a/src/librustc_target/abi/call/mod.rs b/src/librustc_target/abi/call/mod.rs
+index fbbd120f934..f4d98177072 100644
+--- a/src/librustc_target/abi/call/mod.rs
++++ b/src/librustc_target/abi/call/mod.rs
+@@ -562,7 +562,7 @@ impl<'a, Ty> FnType<'a, Ty> {
+             "arm" => arm::compute_abi_info(cx, self),
+             "mips" => mips::compute_abi_info(cx, self),
+             "mips64" => mips64::compute_abi_info(cx, self),
+-            "powerpc" => powerpc::compute_abi_info(cx, self),
++            "powerpc" => powerpc::compute_abi_info(self),
+             "powerpc64" => powerpc64::compute_abi_info(cx, self),
+             "s390x" => s390x::compute_abi_info(cx, self),
+             "asmjs" => asmjs::compute_abi_info(cx, self),
+diff --git a/src/librustc_target/abi/call/powerpc.rs b/src/librustc_target/abi/call/powerpc.rs
+index d496abf8e8b..f20defd6f5b 100644
+--- a/src/librustc_target/abi/call/powerpc.rs
++++ b/src/librustc_target/abi/call/powerpc.rs
+@@ -1,49 +1,28 @@
+-use crate::abi::call::{ArgType, FnType, Reg, Uniform};
+-use crate::abi::{HasDataLayout, LayoutOf, Size, TyLayoutMethods};
++use crate::abi::call::{ArgType, FnType};
+ 
+-fn classify_ret_ty<'a, Ty, C>(cx: &C, ret: &mut ArgType<'_, Ty>, offset: &mut Size)
+-    where Ty: TyLayoutMethods<'a, C>, C: LayoutOf<Ty = Ty> + HasDataLayout
+-{
+-    if !ret.layout.is_aggregate() {
+-        ret.extend_integer_width_to(32);
+-    } else {
++fn classify_ret_ty<Ty>(ret: &mut ArgType<'_, Ty>) {
++    if ret.layout.is_aggregate() {
+         ret.make_indirect();
+-        *offset += cx.data_layout().pointer_size;
++    } else {
++        ret.extend_integer_width_to(32);
+     }
+ }
+ 
+-fn classify_arg_ty<'a, Ty, C>(cx: &C, arg: &mut ArgType<'_, Ty>, offset: &mut Size)
+-    where Ty: TyLayoutMethods<'a, C>, C: LayoutOf<Ty = Ty> + HasDataLayout
+-{
+-    let dl = cx.data_layout();
+-    let size = arg.layout.size;
+-    let align = arg.layout.align.max(dl.i32_align).min(dl.i64_align).abi;
+-
++fn classify_arg_ty<Ty>(arg: &mut ArgType<'_, Ty>) {
+     if arg.layout.is_aggregate() {
+-        arg.cast_to(Uniform {
+-            unit: Reg::i32(),
+-            total: size
+-        });
+-        if !offset.is_aligned(align) {
+-            arg.pad_with(Reg::i32());
+-        }
++        arg.make_indirect();
+     } else {
+         arg.extend_integer_width_to(32);
+     }
+-
+-    *offset = offset.align_to(align) + size.align_to(align);
+ }
+ 
+-pub fn compute_abi_info<'a, Ty, C>(cx: &C, fty: &mut FnType<'_, Ty>)
+-    where Ty: TyLayoutMethods<'a, C>, C: LayoutOf<Ty = Ty> + HasDataLayout
+-{
+-    let mut offset = Size::ZERO;
++pub fn compute_abi_info<Ty>(fty: &mut FnType<'_, Ty>) {
+     if !fty.ret.is_ignore() {
+-        classify_ret_ty(cx, &mut fty.ret, &mut offset);
++        classify_ret_ty(&mut fty.ret);
+     }
+ 
+     for arg in &mut fty.args {
+         if arg.is_ignore() { continue; }
+-        classify_arg_ty(cx, arg, &mut offset);
++        classify_arg_ty(arg);
+     }
+ }
+-- 
+2.21.0
+
diff --git a/srcpkgs/rust/patches/0007-runtest-Fix-proc-macro-tests-on-musl-hosts.patch b/srcpkgs/rust/patches/0007-runtest-Fix-proc-macro-tests-on-musl-hosts.patch
deleted file mode 100644
index c04cb295d65..00000000000
--- a/srcpkgs/rust/patches/0007-runtest-Fix-proc-macro-tests-on-musl-hosts.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 0401335b6e3724d4868c9c4b556f586c7fcf60b8 Mon Sep 17 00:00:00 2001
-From: Samuel Holland <samuel@sholland.org>
-Date: Sat, 6 Jul 2019 17:49:18 +0200
-Subject: [PATCH 07/12] runtest: Fix proc-macro tests on musl hosts
-
----
- src/tools/compiletest/src/runtest.rs | 9 ++-------
- 1 file changed, 2 insertions(+), 7 deletions(-)
-
-diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
-index 2082de7cb..03c7a4c58 100644
---- a/src/tools/compiletest/src/runtest.rs
-+++ b/src/tools/compiletest/src/runtest.rs
-@@ -1649,9 +1649,6 @@ impl<'test> TestCx<'test> {
-                 (true, None)
-             } else if self.config.target.contains("cloudabi")
-                 || self.config.target.contains("emscripten")
--                || (self.config.target.contains("musl")
--                    && !aux_props.force_host
--                    && !self.config.host.contains("musl"))
-                 || self.config.target.contains("wasm32")
-                 || self.config.target.contains("nvptx")
-             {
-@@ -1660,10 +1657,8 @@ impl<'test> TestCx<'test> {
-                 // for the test suite (otherwise including libstd statically in all
-                 // executables takes up quite a bit of space).
-                 //
--                // For targets like MUSL or Emscripten, however, there is no support for
--                // dynamic libraries so we just go back to building a normal library. Note,
--                // however, that for MUSL if the library is built with `force_host` then
--                // it's ok to be a dylib as the host should always support dylibs.
-+                // For targets like Emscripten, however, there is no support for
-+                // dynamic libraries so we just go back to building a normal library.
-                 (false, Some("lib"))
-             } else {
-                 (true, Some("dylib"))
--- 
-2.22.0
-
diff --git a/srcpkgs/rust/patches/0008-Fix-zero-sized-aggregate-ABI-on-powerpc.patch b/srcpkgs/rust/patches/0008-Fix-zero-sized-aggregate-ABI-on-powerpc.patch
new file mode 100644
index 00000000000..c3da394a757
--- /dev/null
+++ b/srcpkgs/rust/patches/0008-Fix-zero-sized-aggregate-ABI-on-powerpc.patch
@@ -0,0 +1,62 @@
+From f67f0ab40f1328e04916512b9af858ca1b7faa24 Mon Sep 17 00:00:00 2001
+From: Samuel Holland <samuel@sholland.org>
+Date: Wed, 4 Sep 2019 20:44:30 -0500
+Subject: [PATCH 08/16] Fix zero-sized aggregate ABI on powerpc
+
+For targets that pass zero-sized aggregates indirectly (generally
+those that pass all aggregates indirectly), we must allocate a register
+for passing the address of the ZST. Clean up the existing cases and add
+powerpc, which requires this as well.
+
+While there are not currently musl targets for s390x or sparc64, they
+would have the same ABI as gnu targets, so remove the env == "gnu" check
+in the Linux case.
+
+Ideally, since it is a property of the C ABI, the `!rust_abi` case would
+be handled entirely in `adjust_c_abi`. However, that would require
+updating each implementation of `compute_abi_info` to handle ZSTs.
+---
+ src/librustc/ty/layout.rs | 20 +++++++++-----------
+ 1 file changed, 9 insertions(+), 11 deletions(-)
+
+diff --git a/src/librustc/ty/layout.rs b/src/librustc/ty/layout.rs
+index 4af26e19b37..163db9778e5 100644
+--- a/src/librustc/ty/layout.rs
++++ b/src/librustc/ty/layout.rs
+@@ -2667,12 +2667,11 @@ where
+         };
+ 
+         let target = &cx.tcx().sess.target.target;
+-        let win_x64_gnu =
+-            target.target_os == "windows" && target.arch == "x86_64" && target.target_env == "gnu";
+-        let linux_s390x =
+-            target.target_os == "linux" && target.arch == "s390x" && target.target_env == "gnu";
+-        let linux_sparc64 =
+-            target.target_os == "linux" && target.arch == "sparc64" && target.target_env == "gnu";
++        let indirect_zst = match target.arch.as_ref() {
++            "powerpc" | "s390x" | "sparc64" => true,
++            "x86_64" => target.target_os == "windows" && target.target_env == "gnu",
++            _ => false,
++        };
+         let rust_abi = match sig.abi {
+             RustIntrinsic | PlatformIntrinsic | Rust | RustCall => true,
+             _ => false,
+@@ -2742,11 +2741,10 @@ where
+             let is_return = arg_idx.is_none();
+             let mut arg = mk_arg_type(ty, arg_idx);
+             if arg.layout.is_zst() {
+-                // For some forsaken reason, x86_64-pc-windows-gnu
+-                // doesn't ignore zero-sized struct arguments.
+-                // The same is true for s390x-unknown-linux-gnu
+-                // and sparc64-unknown-linux-gnu.
+-                if is_return || rust_abi || (!win_x64_gnu && !linux_s390x && !linux_sparc64) {
++                // FIXME: The C ABI case should be handled in adjust_for_cabi.
++                // Zero-sized struct arguments cannot be ignored in the C ABI
++                // if they are passed indirectly.
++                if is_return || rust_abi || !indirect_zst {
+                     arg.mode = PassMode::Ignore(IgnoreMode::Zst);
+                 }
+             }
+-- 
+2.21.0
+
diff --git a/srcpkgs/rust/patches/0009-compiletest-Match-suffixed-environments.patch b/srcpkgs/rust/patches/0009-compiletest-Match-suffixed-environments.patch
new file mode 100644
index 00000000000..9ca4d99000c
--- /dev/null
+++ b/srcpkgs/rust/patches/0009-compiletest-Match-suffixed-environments.patch
@@ -0,0 +1,48 @@
+From 0b28aa018f3f64913101495ce9806d356230856e Mon Sep 17 00:00:00 2001
+From: Samuel Holland <samuel@sholland.org>
+Date: Mon, 2 Sep 2019 22:10:10 -0500
+Subject: [PATCH 09/16] compiletest: Match suffixed environments
+
+---
+ src/tools/compiletest/src/header.rs | 2 +-
+ src/tools/compiletest/src/util.rs   | 8 ++++++--
+ 2 files changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/src/tools/compiletest/src/header.rs b/src/tools/compiletest/src/header.rs
+index 52f777db2da..4bf3c1a8527 100644
+--- a/src/tools/compiletest/src/header.rs
++++ b/src/tools/compiletest/src/header.rs
+@@ -820,10 +820,10 @@ impl Config {
+ 
+             if name == "test" ||
+                 util::matches_os(&self.target, name) ||             // target
++                util::matches_env(&self.target, name) ||            // env
+                 name == util::get_arch(&self.target) ||             // architecture
+                 name == util::get_pointer_width(&self.target) ||    // pointer width
+                 name == self.stage_id.split('-').next().unwrap() || // stage
+-                Some(name) == util::get_env(&self.target) ||        // env
+                 (self.target != self.host && name == "cross-compile") ||
+                 match self.compare_mode {
+                     Some(CompareMode::Nll) => name == "compare-mode-nll",
+diff --git a/src/tools/compiletest/src/util.rs b/src/tools/compiletest/src/util.rs
+index 8caf5ca00f5..d23f4edc55d 100644
+--- a/src/tools/compiletest/src/util.rs
++++ b/src/tools/compiletest/src/util.rs
+@@ -101,8 +101,12 @@ pub fn get_arch(triple: &str) -> &'static str {
+     panic!("Cannot determine Architecture from triple");
+ }
+ 
+-pub fn get_env(triple: &str) -> Option<&str> {
+-    triple.split('-').nth(3)
++pub fn matches_env(triple: &str, name: &str) -> bool {
++    if let Some(env) = triple.split('-').nth(3) {
++        env.starts_with(name)
++    } else {
++        false
++    }
+ }
+ 
+ pub fn get_pointer_width(triple: &str) -> &'static str {
+-- 
+2.21.0
+
diff --git a/srcpkgs/rust/patches/0010-test-c-variadic-Fix-patterns-on-powerpc64.patch b/srcpkgs/rust/patches/0010-test-c-variadic-Fix-patterns-on-powerpc64.patch
new file mode 100644
index 00000000000..2e2111edbbc
--- /dev/null
+++ b/srcpkgs/rust/patches/0010-test-c-variadic-Fix-patterns-on-powerpc64.patch
@@ -0,0 +1,73 @@
+From e6a01c436377109808cac2d49ec30968a02b561d Mon Sep 17 00:00:00 2001
+From: Samuel Holland <samuel@sholland.org>
+Date: Mon, 2 Sep 2019 22:09:15 -0500
+Subject: [PATCH 10/16] test/c-variadic: Fix patterns on powerpc64
+
+---
+ src/test/codegen/c-variadic.rs | 22 +++++++++++-----------
+ 1 file changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/src/test/codegen/c-variadic.rs b/src/test/codegen/c-variadic.rs
+index bb90a9653f5..6ef77ca483f 100644
+--- a/src/test/codegen/c-variadic.rs
++++ b/src/test/codegen/c-variadic.rs
+@@ -14,13 +14,13 @@ extern "C" {
+ #[unwind(aborts)] // FIXME(#58794)
+ pub unsafe extern "C" fn use_foreign_c_variadic_0() {
+     // Ensure that we correctly call foreign C-variadic functions.
+-    // CHECK: invoke void (i32, ...) @foreign_c_variadic_0(i32 0)
++    // CHECK: invoke void (i32, ...) @foreign_c_variadic_0([[PARAM:i32( signext)?]] 0)
+     foreign_c_variadic_0(0);
+-    // CHECK: invoke void (i32, ...) @foreign_c_variadic_0(i32 0, i32 42)
++    // CHECK: invoke void (i32, ...) @foreign_c_variadic_0([[PARAM]] 0, [[PARAM]] 42)
+     foreign_c_variadic_0(0, 42i32);
+-    // CHECK: invoke void (i32, ...) @foreign_c_variadic_0(i32 0, i32 42, i32 1024)
++    // CHECK: invoke void (i32, ...) @foreign_c_variadic_0([[PARAM]] 0, [[PARAM]] 42, [[PARAM]] 1024)
+     foreign_c_variadic_0(0, 42i32, 1024i32);
+-    // CHECK: invoke void (i32, ...) @foreign_c_variadic_0(i32 0, i32 42, i32 1024, i32 0)
++    // CHECK: invoke void (i32, ...) @foreign_c_variadic_0([[PARAM]] 0, [[PARAM]] 42, [[PARAM]] 1024, [[PARAM]] 0)
+     foreign_c_variadic_0(0, 42i32, 1024i32, 0i32);
+ }
+ 
+@@ -34,18 +34,18 @@ pub unsafe extern "C" fn use_foreign_c_variadic_1_0(ap: VaList) {
+ 
+ #[unwind(aborts)] // FIXME(#58794)
+ pub unsafe extern "C" fn use_foreign_c_variadic_1_1(ap: VaList) {
+-    // CHECK: invoke void ({{.*}}*, ...) @foreign_c_variadic_1({{.*}} %ap, i32 42)
++    // CHECK: invoke void ({{.*}}*, ...) @foreign_c_variadic_1({{.*}} %ap, [[PARAM]] 42)
+     foreign_c_variadic_1(ap, 42i32);
+ }
+ #[unwind(aborts)] // FIXME(#58794)
+ pub unsafe extern "C" fn use_foreign_c_variadic_1_2(ap: VaList) {
+-    // CHECK: invoke void ({{.*}}*, ...) @foreign_c_variadic_1({{.*}} %ap, i32 2, i32 42)
++    // CHECK: invoke void ({{.*}}*, ...) @foreign_c_variadic_1({{.*}} %ap, [[PARAM]] 2, [[PARAM]] 42)
+     foreign_c_variadic_1(ap, 2i32, 42i32);
+ }
+ 
+ #[unwind(aborts)] // FIXME(#58794)
+ pub unsafe extern "C" fn use_foreign_c_variadic_1_3(ap: VaList) {
+-    // CHECK: invoke void ({{.*}}*, ...) @foreign_c_variadic_1({{.*}} %ap, i32 2, i32 42, i32 0)
++    // CHECK: invoke void ({{.*}}*, ...) @foreign_c_variadic_1({{.*}} %ap, [[PARAM]] 2, [[PARAM]] 42, [[PARAM]] 0)
+     foreign_c_variadic_1(ap, 2i32, 42i32, 0i32);
+ }
+ 
+@@ -64,12 +64,12 @@ pub unsafe extern "C" fn c_variadic(n: i32, mut ap: ...) -> i32 {
+ // Ensure that we generate the correct `call` signature when calling a Rust
+ // defined C-variadic.
+ pub unsafe fn test_c_variadic_call() {
+-    // CHECK: call i32 (i32, ...) @c_variadic(i32 0)
++    // CHECK: call [[RET:(signext )?i32]] (i32, ...) @c_variadic([[PARAM]] 0)
+     c_variadic(0);
+-    // CHECK: call i32 (i32, ...) @c_variadic(i32 0, i32 42)
++    // CHECK: call [[RET]] (i32, ...) @c_variadic([[PARAM]] 0, [[PARAM]] 42)
+     c_variadic(0, 42i32);
+-    // CHECK: call i32 (i32, ...) @c_variadic(i32 0, i32 42, i32 1024)
++    // CHECK: call [[RET]] (i32, ...) @c_variadic([[PARAM]] 0, [[PARAM]] 42, [[PARAM]] 1024)
+     c_variadic(0, 42i32, 1024i32);
+-    // CHECK: call i32 (i32, ...) @c_variadic(i32 0, i32 42, i32 1024, i32 0)
++    // CHECK: call [[RET]] (i32, ...) @c_variadic([[PARAM]] 0, [[PARAM]] 42, [[PARAM]] 1024, [[PARAM]] 0)
+     c_variadic(0, 42i32, 1024i32, 0i32);
+ }
+-- 
+2.21.0
+
diff --git a/srcpkgs/rust/patches/0008-test-use-extern-for-plugins-Don-t-assume-multilib.patch b/srcpkgs/rust/patches/0011-test-use-extern-for-plugins-Don-t-assume-multilib.patch
similarity index 79%
rename from srcpkgs/rust/patches/0008-test-use-extern-for-plugins-Don-t-assume-multilib.patch
rename to srcpkgs/rust/patches/0011-test-use-extern-for-plugins-Don-t-assume-multilib.patch
index ab6a75d5c43..002d84024e9 100644
--- a/srcpkgs/rust/patches/0008-test-use-extern-for-plugins-Don-t-assume-multilib.patch
+++ b/srcpkgs/rust/patches/0011-test-use-extern-for-plugins-Don-t-assume-multilib.patch
@@ -1,14 +1,14 @@
-From a10b846716f923b3c5c28fc86e9b07103600ed52 Mon Sep 17 00:00:00 2001
+From f0fce1130ffe6b5a7666979aedd956becc4d7c25 Mon Sep 17 00:00:00 2001
 From: Samuel Holland <samuel@sholland.org>
-Date: Sat, 6 Jul 2019 17:50:54 +0200
-Subject: [PATCH 08/12] test/use-extern-for-plugins: Don't assume multilib
+Date: Sat, 6 Oct 2018 04:01:48 +0000
+Subject: [PATCH 11/16] test/use-extern-for-plugins: Don't assume multilib
 
 ---
  src/test/run-make-fulldeps/use-extern-for-plugins/Makefile | 7 +------
  1 file changed, 1 insertion(+), 6 deletions(-)
 
 diff --git a/src/test/run-make-fulldeps/use-extern-for-plugins/Makefile b/src/test/run-make-fulldeps/use-extern-for-plugins/Makefile
-index 838b1a271..94fa9f6d0 100644
+index 838b1a2719b..94fa9f6d067 100644
 --- a/src/test/run-make-fulldeps/use-extern-for-plugins/Makefile
 +++ b/src/test/run-make-fulldeps/use-extern-for-plugins/Makefile
 @@ -4,12 +4,7 @@
@@ -26,5 +26,5 @@ index 838b1a271..94fa9f6d0 100644
  all:
  	$(RUSTC) foo.rs -C extra-filename=-host
 -- 
-2.22.0
+2.21.0
 
diff --git a/srcpkgs/rust/patches/0009-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch b/srcpkgs/rust/patches/0012-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch
similarity index 80%
rename from srcpkgs/rust/patches/0009-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch
rename to srcpkgs/rust/patches/0012-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch
index 442571fdd45..6123af8379f 100644
--- a/srcpkgs/rust/patches/0009-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch
+++ b/srcpkgs/rust/patches/0012-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch
@@ -1,7 +1,7 @@
-From 9f457d208f0e916a5fb61401f6558e1302b97fd5 Mon Sep 17 00:00:00 2001
+From 93835653d45142c17adcf3087d2a8e512053bccf Mon Sep 17 00:00:00 2001
 From: Samuel Holland <samuel@sholland.org>
 Date: Mon, 17 Sep 2018 01:32:20 +0000
-Subject: [PATCH 09/12] test/sysroot-crates-are-unstable: Fix test when rpath
+Subject: [PATCH 12/16] test/sysroot-crates-are-unstable: Fix test when rpath
  is disabled
 
 Without this environment var, the test can't run rustc to find
@@ -11,7 +11,7 @@ the sysroot path.
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile b/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile
-index a35174b3c..9e7707068 100644
+index a35174b3c2a..9e770706857 100644
 --- a/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile
 +++ b/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile
 @@ -1,2 +1,4 @@
@@ -21,5 +21,5 @@ index a35174b3c..9e7707068 100644
 -	python2.7 test.py
 +	env '$(HOST_RPATH_ENV)' python2.7 test.py
 -- 
-2.22.0
+2.21.0
 
diff --git a/srcpkgs/rust/patches/0010-Ignore-broken-and-non-applicable-tests.patch b/srcpkgs/rust/patches/0013-Ignore-broken-and-non-applicable-tests.patch
similarity index 71%
rename from srcpkgs/rust/patches/0010-Ignore-broken-and-non-applicable-tests.patch
rename to srcpkgs/rust/patches/0013-Ignore-broken-and-non-applicable-tests.patch
index f0c8df9f2b5..d0501d49005 100644
--- a/srcpkgs/rust/patches/0010-Ignore-broken-and-non-applicable-tests.patch
+++ b/srcpkgs/rust/patches/0013-Ignore-broken-and-non-applicable-tests.patch
@@ -1,7 +1,7 @@
-From 8c4cc90bccacf5ebbb837e5c72de47ab862238f4 Mon Sep 17 00:00:00 2001
+From 8eb87a7b794e649003bc8f4bed6c6d6739f65e43 Mon Sep 17 00:00:00 2001
 From: Samuel Holland <samuel@sholland.org>
 Date: Sun, 16 Sep 2018 16:38:48 +0000
-Subject: [PATCH 10/12] Ignore broken and non-applicable tests
+Subject: [PATCH 13/16] Ignore broken and non-applicable tests
 
 c-link-to-rust-va-list-fn: unstable feature, broken on aarch64, #56475
 env-funky-keys: can't handle LD_PRELOAD (e.g. sandbox)
@@ -13,15 +13,16 @@ sysroot-crates-are-unstable: can't run rustc without RPATH
 ---
  src/test/codegen/sparc-struct-abi.rs                            | 1 +
  src/test/run-make-fulldeps/c-link-to-rust-va-list-fn/Makefile   | 2 ++
+ src/test/run-make-fulldeps/linker-output-non-utf8/Makefile      | 2 ++
  src/test/run-make-fulldeps/long-linker-command-lines/Makefile   | 2 ++
  src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile | 2 ++
  src/test/run-pass/env-funky-keys.rs                             | 1 +
  src/test/run-pass/simd/simd-intrinsic-generic-bitmask.rs        | 2 ++
  src/test/run-pass/simd/simd-intrinsic-generic-select.rs         | 2 ++
- 7 files changed, 12 insertions(+)
+ 8 files changed, 14 insertions(+)
 
 diff --git a/src/test/codegen/sparc-struct-abi.rs b/src/test/codegen/sparc-struct-abi.rs
-index 78e5b14a2..6f93e9328 100644
+index 78e5b14a212..6f93e93286b 100644
 --- a/src/test/codegen/sparc-struct-abi.rs
 +++ b/src/test/codegen/sparc-struct-abi.rs
 @@ -4,6 +4,7 @@
@@ -33,7 +34,7 @@ index 78e5b14a2..6f93e9328 100644
  #![no_core]
  
 diff --git a/src/test/run-make-fulldeps/c-link-to-rust-va-list-fn/Makefile b/src/test/run-make-fulldeps/c-link-to-rust-va-list-fn/Makefile
-index f124ca2ab..363b18f09 100644
+index f124ca2ab61..363b18f0985 100644
 --- a/src/test/run-make-fulldeps/c-link-to-rust-va-list-fn/Makefile
 +++ b/src/test/run-make-fulldeps/c-link-to-rust-va-list-fn/Makefile
 @@ -1,3 +1,5 @@
@@ -42,8 +43,21 @@ index f124ca2ab..363b18f09 100644
  -include ../tools.mk
  
  all:
+diff --git a/src/test/run-make-fulldeps/linker-output-non-utf8/Makefile b/src/test/run-make-fulldeps/linker-output-non-utf8/Makefile
+index b47ce17ec8b..59c44fcf438 100644
+--- a/src/test/run-make-fulldeps/linker-output-non-utf8/Makefile
++++ b/src/test/run-make-fulldeps/linker-output-non-utf8/Makefile
+@@ -13,6 +13,8 @@
+ # This also does not work on Apple APFS due to the filesystem requiring
+ # valid UTF-8 paths.
+ 
++# ignore-musl
++
+ # The zzz it to allow humans to tab complete or glob this thing.
+ bad_dir := $(TMPDIR)/zzz$$'\xff'
+ 
 diff --git a/src/test/run-make-fulldeps/long-linker-command-lines/Makefile b/src/test/run-make-fulldeps/long-linker-command-lines/Makefile
-index 5876fbc94..5f167ece1 100644
+index 5876fbc94bc..5f167ece1a2 100644
 --- a/src/test/run-make-fulldeps/long-linker-command-lines/Makefile
 +++ b/src/test/run-make-fulldeps/long-linker-command-lines/Makefile
 @@ -1,3 +1,5 @@
@@ -53,7 +67,7 @@ index 5876fbc94..5f167ece1 100644
  
  all:
 diff --git a/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile b/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile
-index 9e7707068..6d92ec5ce 100644
+index 9e770706857..6d92ec5cec8 100644
 --- a/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile
 +++ b/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile
 @@ -1,3 +1,5 @@
@@ -63,9 +77,9 @@ index 9e7707068..6d92ec5ce 100644
  
  all:
 diff --git a/src/test/run-pass/env-funky-keys.rs b/src/test/run-pass/env-funky-keys.rs
-index 3b236e2b3..7284d25de 100644
---- a/src/test/run-pass/env-funky-keys.rs
-+++ b/src/test/run-pass/env-funky-keys.rs
+index 3b236e2b3af..7284d25de48 100644
+--- a/src/test/ui/env-funky-keys.rs
++++ b/src/test/ui/env-funky-keys.rs
 @@ -1,5 +1,6 @@
  // Ignore this test on Android, because it segfaults there.
  
@@ -74,9 +88,9 @@ index 3b236e2b3..7284d25de 100644
  // ignore-windows
  // ignore-cloudabi no execve
 diff --git a/src/test/run-pass/simd/simd-intrinsic-generic-bitmask.rs b/src/test/run-pass/simd/simd-intrinsic-generic-bitmask.rs
-index b28f742a9..3ee4ccce7 100644
---- a/src/test/run-pass/simd/simd-intrinsic-generic-bitmask.rs
-+++ b/src/test/run-pass/simd/simd-intrinsic-generic-bitmask.rs
+index b28f742a92e..3ee4ccce731 100644
+--- a/src/test/ui/simd/simd-intrinsic-generic-bitmask.rs
++++ b/src/test/ui/simd/simd-intrinsic-generic-bitmask.rs
 @@ -2,6 +2,8 @@
  #![allow(non_camel_case_types)]
  
@@ -86,19 +100,6 @@ index b28f742a9..3ee4ccce7 100644
  
  // Test that the simd_bitmask intrinsic produces correct results.
  
-diff --git a/src/test/run-pass/simd/simd-intrinsic-generic-select.rs b/src/test/run-pass/simd/simd-intrinsic-generic-select.rs
-index f79b14049..39080c8c9 100644
---- a/src/test/run-pass/simd/simd-intrinsic-generic-select.rs
-+++ b/src/test/run-pass/simd/simd-intrinsic-generic-select.rs
-@@ -2,6 +2,8 @@
- #![allow(non_camel_case_types)]
- 
- // ignore-emscripten
-+// ignore-powerpc
-+// ignore-powerpc64
- 
- // Test that the simd_select intrinsics produces correct results.
- 
 -- 
-2.22.0
+2.21.0
 
diff --git a/srcpkgs/rust/patches/0011-Link-stage-2-tools-dynamically-to-libstd.patch b/srcpkgs/rust/patches/0014-Link-stage-2-tools-dynamically-to-libstd.patch
similarity index 75%
rename from srcpkgs/rust/patches/0011-Link-stage-2-tools-dynamically-to-libstd.patch
rename to srcpkgs/rust/patches/0014-Link-stage-2-tools-dynamically-to-libstd.patch
index 47696bcf24f..47e9173a907 100644
--- a/srcpkgs/rust/patches/0011-Link-stage-2-tools-dynamically-to-libstd.patch
+++ b/srcpkgs/rust/patches/0014-Link-stage-2-tools-dynamically-to-libstd.patch
@@ -1,17 +1,17 @@
-From 7171338ff6f967b6f2c30bdb8804c8f49670a0de Mon Sep 17 00:00:00 2001
+From 8e160daedd1a8c928024db648c2f851cddbbd000 Mon Sep 17 00:00:00 2001
 From: Samuel Holland <samuel@sholland.org>
 Date: Mon, 24 Sep 2018 23:42:23 +0000
-Subject: [PATCH 11/12] Link stage 2 tools dynamically to libstd
+Subject: [PATCH 14/16] Link stage 2 tools dynamically to libstd
 
 ---
  src/bootstrap/tool.rs | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs
-index edcd68d01..b5acf43bb 100644
+index bd77f7a91d9..70477b44032 100644
 --- a/src/bootstrap/tool.rs
 +++ b/src/bootstrap/tool.rs
-@@ -209,7 +209,9 @@ pub fn prepare_tool_cargo(
+@@ -210,7 +210,9 @@ pub fn prepare_tool_cargo(
  
      // We don't want to build tools dynamically as they'll be running across
      // stages and such and it's just easier if they're not dynamically linked.
@@ -23,5 +23,5 @@ index edcd68d01..b5acf43bb 100644
      if source_type == SourceType::Submodule {
          cargo.env("RUSTC_EXTERNAL_TOOL", "1");
 -- 
-2.22.0
+2.21.0
 
diff --git a/srcpkgs/rust/patches/0012-Move-debugger-scripts-to-usr-share-rust.patch b/srcpkgs/rust/patches/0015-Move-debugger-scripts-to-usr-share-rust.patch
similarity index 85%
rename from srcpkgs/rust/patches/0012-Move-debugger-scripts-to-usr-share-rust.patch
rename to srcpkgs/rust/patches/0015-Move-debugger-scripts-to-usr-share-rust.patch
index 7060a1cb894..ed30dfd151b 100644
--- a/srcpkgs/rust/patches/0012-Move-debugger-scripts-to-usr-share-rust.patch
+++ b/srcpkgs/rust/patches/0015-Move-debugger-scripts-to-usr-share-rust.patch
@@ -1,7 +1,7 @@
-From 6b0dc5093cc23c74dcf1d3bf3a0772b08426785a Mon Sep 17 00:00:00 2001
+From 1d81148c7b7c048cb1c586ece96bd326ae0f72ec Mon Sep 17 00:00:00 2001
 From: Samuel Holland <samuel@sholland.org>
 Date: Mon, 17 Sep 2018 02:09:10 +0000
-Subject: [PATCH 12/12] Move debugger scripts to /usr/share/rust
+Subject: [PATCH 15/16] Move debugger scripts to /usr/share/rust
 
 ---
  src/bootstrap/dist.rs | 2 +-
@@ -10,10 +10,10 @@ Subject: [PATCH 12/12] Move debugger scripts to /usr/share/rust
  3 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
-index b0616ff66..7a1225a93 100644
+index 45bc77ec97d..9e82352ef65 100644
 --- a/src/bootstrap/dist.rs
 +++ b/src/bootstrap/dist.rs
-@@ -597,7 +597,7 @@ impl Step for DebuggerScripts {
+@@ -593,7 +593,7 @@ impl Step for DebuggerScripts {
      fn run(self, builder: &Builder<'_>) {
          let host = self.host;
          let sysroot = self.sysroot;
@@ -23,7 +23,7 @@ index b0616ff66..7a1225a93 100644
          let cp_debugger_script = |file: &str| {
              builder.install(&builder.src.join("src/etc/").join(file), &dst, 0o644);
 diff --git a/src/etc/rust-gdb b/src/etc/rust-gdb
-index 23ba93da8..dc51b16c5 100755
+index 23ba93da8e5..dc51b16c572 100755
 --- a/src/etc/rust-gdb
 +++ b/src/etc/rust-gdb
 @@ -4,7 +4,7 @@ set -e
@@ -36,7 +36,7 @@ index 23ba93da8..dc51b16c5 100755
  # Run GDB with the additional arguments that load the pretty printers
  # Set the environment variable `RUST_GDB` to overwrite the call to a
 diff --git a/src/etc/rust-lldb b/src/etc/rust-lldb
-index 424302d49..460e11921 100755
+index 0eb99423df5..f069300dafe 100755
 --- a/src/etc/rust-lldb
 +++ b/src/etc/rust-lldb
 @@ -26,7 +26,7 @@ display the contents of local variables!"
@@ -49,5 +49,5 @@ index 424302d49..460e11921 100755
  category_enable="type category enable Rust"
  
 -- 
-2.22.0
+2.21.0
 
diff --git a/srcpkgs/rust/patches/0030-libc-linkage.patch b/srcpkgs/rust/patches/0030-libc-linkage.patch
index 3d3ed67a309..5ba322cb4bf 100644
--- a/srcpkgs/rust/patches/0030-libc-linkage.patch
+++ b/srcpkgs/rust/patches/0030-libc-linkage.patch
@@ -1,16 +1,16 @@
---- rustc-1.36.0-src/vendor/libc/src/lib.rs
-+++ rustc-1.36.0-src/vendor/libc/src/lib.rs
-@@ -26,6 +26,7 @@
+--- rustc-1.38.0-src/vendor/libc/src/lib.rs
++++ rustc-1.38.0-src/vendor/libc/src/lib.rs
+@@ -27,6 +27,7 @@
  #![deny(missing_copy_implementations, safe_packed_borrows)]
  #![no_std]
  #![cfg_attr(feature = "rustc-dep-of-std", no_core)]
 +#![cfg_attr(feature = "rustc-dep-of-std", feature(static_nobundle))]
+ #![cfg_attr(target_os = "redox", feature(static_nobundle))]
  
  #[macro_use]
- mod macros;
---- rustc-1.36.0-src/vendor/libc/src/unix/mod.rs
-+++ rustc-1.36.0-src/vendor/libc/src/unix/mod.rs
-@@ -307,11 +307,11 @@ cfg_if! {
+--- rustc-1.38.0-src/vendor/libc/src/unix/mod.rs
++++ rustc-1.38.0-src/vendor/libc/src/unix/mod.rs
+@@ -297,11 +297,11 @@ cfg_if! {
          // cargo build, don't pull in anything extra as the libstd dep
          // already pulls in all libs.
      } else if #[cfg(target_env = "musl")] {
diff --git a/srcpkgs/rust/patches/0091-bootstrap.patch b/srcpkgs/rust/patches/0091-bootstrap.patch
new file mode 100644
index 00000000000..cd8c33e3f34
--- /dev/null
+++ b/srcpkgs/rust/patches/0091-bootstrap.patch
@@ -0,0 +1,71 @@
+Rust 1.38 can't bootstrap itself. It has some ridiculous warnings enabled
+by default which break this (even though the compiler obviously needs to
+be able to compile itself just fine, that's what stage1 is all about).
+
+diff --git a/src/bootstrap/bin/main.rs b/src/bootstrap/bin/main.rs
+index bd1a87c..138b7f4 100644
+--- a/src/bootstrap/bin/main.rs
++++ b/src/bootstrap/bin/main.rs
+@@ -5,9 +5,6 @@
+ //! parent directory, and otherwise documentation can be found throughout the `build`
+ //! directory in each respective module.
+ 
+-// NO-RUSTC-WRAPPER
+-#![deny(warnings, rust_2018_idioms, unused_lifetimes)]
+-
+ use std::env;
+ 
+ use bootstrap::{Config, Build};
+diff --git a/src/bootstrap/bin/rustc.rs b/src/bootstrap/bin/rustc.rs
+index 81e7e46..d3d84ca 100644
+--- a/src/bootstrap/bin/rustc.rs
++++ b/src/bootstrap/bin/rustc.rs
+@@ -15,9 +15,6 @@
+ //! switching compilers for the bootstrap and for build scripts will probably
+ //! never get replaced.
+ 
+-// NO-RUSTC-WRAPPER
+-#![deny(warnings, rust_2018_idioms, unused_lifetimes)]
+-
+ use std::env;
+ use std::ffi::OsString;
+ use std::io;
+diff --git a/src/bootstrap/bin/rustdoc.rs b/src/bootstrap/bin/rustdoc.rs
+index 184c9b1..2a8397a 100644
+--- a/src/bootstrap/bin/rustdoc.rs
++++ b/src/bootstrap/bin/rustdoc.rs
+@@ -2,9 +2,6 @@
+ //!
+ //! See comments in `src/bootstrap/rustc.rs` for more information.
+ 
+-// NO-RUSTC-WRAPPER
+-#![deny(warnings, rust_2018_idioms, unused_lifetimes)]
+-
+ use std::env;
+ use std::process::Command;
+ use std::path::PathBuf;
+diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs
+index 76cc0dd..5eeed7c 100644
+--- a/src/bootstrap/lib.rs
++++ b/src/bootstrap/lib.rs
+@@ -103,9 +103,6 @@
+ //! More documentation can be found in each respective module below, and you can
+ //! also check out the `src/bootstrap/README.md` file for more information.
+ 
+-// NO-RUSTC-WRAPPER
+-#![deny(warnings, rust_2018_idioms, unused_lifetimes)]
+-
+ #![feature(core_intrinsics)]
+ #![feature(drain_filter)]
+ 
+diff --git a/src/build_helper/lib.rs b/src/build_helper/lib.rs
+index a1aa189..f3f5913 100644
+--- a/src/build_helper/lib.rs
++++ b/src/build_helper/lib.rs
+@@ -1,6 +1,3 @@
+-// NO-RUSTC-WRAPPER
+-#![deny(warnings, rust_2018_idioms, unused_lifetimes)]
+-
+ use std::fs::File;
+ use std::path::{Path, PathBuf};
+ use std::process::{Command, Stdio};
diff --git a/srcpkgs/rust/patches/0091-lzma-sys-cross-ldflags.patch b/srcpkgs/rust/patches/0091-lzma-sys-cross-ldflags.patch
deleted file mode 100644
index cc2ead3d414..00000000000
--- a/srcpkgs/rust/patches/0091-lzma-sys-cross-ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-This allows lzma-sys to build in a cross-compiling environment.
---- rustc-1.36.0-src/vendor/lzma-sys/build.rs
-+++ rustc-1.36.0-src/vendor/lzma-sys/build.rs
-@@ -101,6 +101,7 @@ fn main() {
-         }
-         cmd.env("CC", compiler.path())
-            .env("CFLAGS", cflags)
-+           .env("LDFLAGS", "")
-            .current_dir(&dst.join("build"))
-            .arg(sanitize_sh(&src.join("configure")));
-         cmd.arg(format!("--prefix={}", sanitize_sh(&dst)));
diff --git a/srcpkgs/rust/template b/srcpkgs/rust/template
index 45ad7d98411..2f5e5def714 100644
--- a/srcpkgs/rust/template
+++ b/srcpkgs/rust/template
@@ -1,22 +1,23 @@
 # Template file for 'rust'
 # partially adapted from Alpine/Adélie's Rust APKBUILD
 pkgname=rust
-version=1.36.0
+version=1.38.0
 revision=1
-_rust_dist_version=1.36.0
-_cargo_dist_version=0.37.0
+_rust_dist_version=1.38.0
+_cargo_dist_version=0.39.0
 # Always make sure custom distfiles used for bootstrap are
 # uploaded to https://alpha.de.repo.voidlinux.org/distfiles/
 wrksrc="rustc-${version}-src"
 hostmakedepends="cmake curl pkg-config python3"
-makedepends="libffi-devel ncurses-devel libxml2-devel zlib-devel llvm"
+# using llvm9 results in broken executables for some targets
+makedepends="libffi-devel ncurses-devel libxml2-devel zlib-devel llvm8"
 depends="rust-std"
 short_desc="Safe, concurrent, practical systems language"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT, Apache-2.0"
 homepage="https://www.rust-lang.org/"
 distfiles="https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz"
-checksum=04c4e4d7213d036d6aaed392841496d272146312c0290f728b7400fccd15bb1b
+checksum=644263ca7c7106f8ee8fcde6bb16910d246b30668a74be20b8c7e0e9f4a52d80
 lib32disabled=yes
 patch_args="-Np1"
 
@@ -25,14 +26,15 @@ build_options="static_llvm"
 _bootstrap_dir="stage0-bootstrap"
 
 if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" cargo llvm"
+	hostmakedepends+=" cargo llvm8"
 	# These are required for building the buildhost's stage0/1
 	hostmakedepends+=" libffi-devel libxml2-devel ncurses-devel zlib-devel"
 else
 	_bootstrap_url="https://static.rust-lang.org/dist"
 
+	# 32-bit ppc needs custom bootstrap for now because of patches
 	case "$XBPS_MACHINE" in
-		x86_64*|i686|ppc64le|ppc) ;;
+		x86_64*|i686|ppc64le) ;;
 		ppc*) _bootstrap_url="https://alpha.de.repo.voidlinux.org/distfiles" ;;
 		*) broken="unsupported host: ${XBPS_MACHINE}" ;;
 	esac
@@ -46,57 +48,57 @@ else
 	case "$XBPS_MACHINE" in
 		i686)
 			checksum+="
-			 ad86a75cc8a02a0129df480ccb28082985215f4b5558a42881777691ae1d3ff3
-			 a78f7bdbce0a960f3334c6c639cbe96f05b9b74df26cda9a5161834098119217
-			 6835a73e2ce17e11eda5393133dd7c78bc41bae5a09784e5327648f14340fd48"
+			 183dca6a4d746b833804e658267c1a60cdb446a36d4e4f8d29b04cfd29d886d5
+			 a3248cf8cf7e33afb0a2508c7c204ffe5db2e515c3d3d31ffd9a2146ffa3bad3
+			 2996b0fb41506e87d9b07851f40b41fed94725cf53c3d251e4e1c78eea08df4c"
 			;;
 		x86_64)
 			checksum+="
-			 fff0158da6f5af2a89936dc3e0c361077c06c2983eb310615e02f81ebbde1416
-			 ce8e12684b568a8a4f7d346a743383429849cf3f028f5712ad3d3e31590c8db3
-			 d20fa121951339d5492cf8862f8a7af59efc99d18f3c27b95ab6d4658b6a7d67"
+			 0fedde3406cf3367ceb00f493698e6bfc3264bd7f7253c85de7a042b45f873fa
+			 51b334337804baeff7524e5496d396f254894d7529860d236975e9ed8fcca371
+			 80bcb1368ce98d13cb371df89cbbed9007fb98843f34d07f2abd2c03b8f2747a"
 			;;
 		x86_64-musl)
 			checksum+="
-			 04c15e34bdfd17136b924baa4f93cfbfe64739964b57f5a13ada8e91f9239076
-			 70d0cc38cc829603c81812c59435ef85456a93962bea20deb12f0634e87fbaf7
-			 53975d91e11569f2255d8e30176f05f6976cd810725197a527b0e7ad547ca70c"
+			 9bc0b51bdfca3ed7b298021e2ec768bd28ea3af138d9dc1854a70e3866f06c0d
+			 efcc1779f9815c1d99010ef9eb66a2439f3993bc4d5accd7566e669d1b182373
+			 1d7d881a5af73fb7c3f632278d47a7d174f8347673e2263c4cd6a2f7d0278733"
 			;;
 		ppc64le)
 			checksum+="
-			 702818334ed9f01f60a433aa424784ec9b3785826cdaf03b0f69d03aded98df6
-			 db7a9a06b8b1b84d6fe10bc1e2e136234e31bfaa77499b9df36e2d441ef1b856
-			 4cda7686160f6981e936229703e8e2e756c74f390245f2ad9e356bbbed28a2c9"
+			 d7c011dae42ba4498493488385d3ab00d793124866baa8310cc6414b66c9d2d2
+			 937d2ece46539ba149cdce307718dadbc4b038a3c751bd75749430bd421a6249
+			 456d019511cfe015152a7a4c1c2f518fdeb10e0c610c9bc3ef44d73861ca967e"
 			;;
 		ppc64le-musl)
 			checksum+="
-			 e04239f9c0f230249412ca814f2f954e269c9724fe5741d87f6dc76ddaa15251
-			 98e8b4e6335bdb8cd387c8681686e20d9aa230bcf16ba0ea7cf3c1818d964425
-			 d2690135522db9fdc6efa2f432e5719b8b70abc94e91db278b84be834a75bf72"
+			 37420069fc877a430c32b8b5a533483fdb7cc1a28d0d9e0c1f0579a111aec888
+			 f4b6f37b1f914a2ca086a7e806d7552275a20982b139670ecb2bc1be2d33df2f
+			 5725c42c8356443db15f378d88f2ccb67e363ebf4beacc96ae1eac9ba36f8fe7"
 			;;
 		ppc64)
 			checksum+="
-			 4328cd52d37df39b78c6223a7a6d07129ef9861efa67dbdadbcfe6c991e0febf
-			 800f27805adef749219f9507497dbadebdac2d5c50f951ca1426d4d447e7f318
-			 8b2f7d5da611a21dd7e0b4238b9aca6ee32f1e49d8fe831435301f11a29b12de"
+			 7821de7c49e6c26606f2248f8cd126bef92661e149f0a67cc87f08e359685d4e
+			 b4d2a800fef9ca53208d16c5d5e215b01849d2f34eb476fa9d05457adf1b67ae
+			 73a4f13b8edda6b4c9c1818341c5d936f7b11a04f892358039d072b80ccd41dc"
 			;;
 		ppc64-musl)
 			checksum+="
-			 7cef3f67652607e4f6ed09ff6eb54ee0a7485ae5491a2c015ef9357aadc40295
-			 6f2dc455113a12b2f5fcefbda6e225ad568e750b8f900de5d326cf2c05e45ec9
-			 131db0127366665b2ae55327155c171e99c2eddfb4bcdd7e5cd2663ada109bd5"
+			 a607da72ea9ae81149d563e5e07c03bfc9fcf819ad079f5193f86fcab376315c
+			 4f3b8f8d3e07b27096224131816668c7f34a2d80b5f2c0353905dcd878c50f12
+			 ac18707b8df5d1f64b7e15dabd73eb7a3b0f9ef5976ef7c6ceb462b5d3feb9cd"
 			;;
 		ppc)
 			checksum+="
-			 6c47ae44afc4567fd5584ff8f23c6d0ee1680e66b2ce91cc891571e973097a99
-			 b22c7104c1bea83aef920140a25be974c3e08dd600431901346908916be46f43
-			 856fcb63f6ebeab67038fe3fc96ee0911353b1ee19cabcb0496c7d419de0d531"
+			 e4f088461db79b75c55210a1c70fd3127675287138196322a8416d078045468d
+			 94a2a2fc17adec46daf913e0c71280f03c12048f5224e39c7a77c533a4582f08
+			 02c07b741062e75556f5993a05eefe6dace70fee4a45542f1c6997fa69624d7e"
 			;;
 		ppc-musl)
 			checksum+="
-			 181c81346bc75d6316d08efa242f49c3d3e70fa0c480e673c9bc7209c63ca6e6
-			 4449b886359efe7fb39d75a086fc25520730f96932588e120abbf04387ac8aad
-			 119dba3538f6c1d1164b720b238acac598e1924d943ebbdf3c7113ec3cbd8a2a"
+			 80428db030216eea9117d131acdb1293404e78b71d26746dceeed3bb30629d32
+			 ca6253605d6eafafa9c2fbf27504b3c5d3f8efcaab69852a22ae080c265f03a9
+			 b06306fc164bffa73afd2d21d96381a28d38446e58cf01a0d1585e92b4656a23"
 			;;
 	esac
 fi
@@ -132,13 +134,12 @@ post_patch() {
 
 	# clear out all the checksum nonsense of patched vendor crates
 	_clear_vendor_checksums libc
-	_clear_vendor_checksums lzma-sys
 	_clear_vendor_checksums typenum
 	_clear_vendor_checksums backtrace-sys
 }
 
 do_configure() {
-	local _rust_root _local_rebuild _use_debug _use_rpath
+	local _rust_root _local_rebuild _use_debug _use_debug_rustc _use_rpath
 
 	if [ "$CROSS_BUILD" ]; then
 		_rust_root="/usr"
@@ -148,12 +149,18 @@ do_configure() {
 		_local_rebuild="false"
 	fi
 
-	# emit debug info, enabled when generating debug packages
+	# disable rustc debug info as it bloats up rust-std significantly
+	# set to 1 or 2 if you wish to have debug info for rustc, it won't
+	# link on 32-bit platforms though (too big)
+	_use_debug_rustc="0"
+
+	# use stdlib debug level 2 for all platforms when generating debug
 	if [ -n "$XBPS_DEBUG_PKGS" ]; then
-		_use_debug="true"
+		_use_debug="2"
 	else
-		_use_debug="false"
+		_use_debug="0"
 	fi
+
 	# if true, the binaries will be built with rpath, so the binaries will be
 	# usable directly from the build directory, this is not desirable for
 	# packaging but is useful when building bootstrap binaries
@@ -179,15 +186,23 @@ do_configure() {
 		prefix = "/usr"
 		[rust]
 		codegen-units = 1
-		debuginfo = ${_use_debug}
-		debuginfo-lines = ${_use_debug}
-		debuginfo-only-std = ${_use_debug}
-		debuginfo-tools = ${_use_debug}
+		codegen-units-std = 1
+		debug-assertions = false
+		debuginfo-level = ${_use_debug}
+		debuginfo-level-rustc = ${_use_debug_rustc}
+		debuginfo-level-tests = 0
 		backtrace = true
+		incremental = false
+		parallel-compiler = false
 		channel = "stable"
 		rpath = ${_use_rpath}
+		verbose-tests = true
+		dist-src = false
 		jemalloc = false
+		llvm-libunwind = false
 		codegen-tests = false
+		[dist]
+		src-tarball = false
 		[target.${RUST_BUILD}]
 		llvm-config = "/usr/bin/llvm-config"
 		crt-static = false
diff --git a/srcpkgs/rxvt-unicode/template b/srcpkgs/rxvt-unicode/template
index 196c89c4129..43fc6e9ec92 100644
--- a/srcpkgs/rxvt-unicode/template
+++ b/srcpkgs/rxvt-unicode/template
@@ -1,7 +1,7 @@
 # Template file for 'rxvt-unicode'
 pkgname=rxvt-unicode
 version=9.22
-revision=10
+revision=11
 build_style=gnu-configure
 configure_args="
  --with-terminfo=/usr/share/terminfo --enable-256-color
diff --git a/srcpkgs/s/template b/srcpkgs/s/template
index 7b49e278e78..f7669a2c7e6 100644
--- a/srcpkgs/s/template
+++ b/srcpkgs/s/template
@@ -1,12 +1,12 @@
 # Template file for 's'
 pkgname=s
 version=0.5.14
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/zquestz/s
 hostmakedepends="git"
 short_desc="Web search from the terminal"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="MIT"
 homepage="https://github.com/zquestz/s"
 distfiles="https://github.com/zquestz/s/archive/v${version}.tar.gz"
@@ -14,4 +14,5 @@ checksum=c32eedf6a4080cbe221c902cf7f63b1668b3927edfc448d963d69ed66c8ec2fb
 
 post_install() {
 	vlicense LICENSE
+	vinstall autocomplete/s.fish 644 usr/share/fish/completions
 }
diff --git a/srcpkgs/s6-dns/template b/srcpkgs/s6-dns/template
index e351982a9b9..6b778516cc6 100644
--- a/srcpkgs/s6-dns/template
+++ b/srcpkgs/s6-dns/template
@@ -1,7 +1,7 @@
 # Template file for 's6-dns'
 pkgname=s6-dns
-version=2.3.0.2
-revision=2
+version=2.3.1.0
+revision=1
 build_style=configure
 configure_args="--prefix=/usr --libdir=/usr/lib
  --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
@@ -12,7 +12,7 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="ISC"
 homepage="https://skarnet.org/software/${pkgname}/"
 distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=4806c8b1dadb582029c92986f0b09763090e03b38e565a70174be385fa862bf9
+checksum=b11ce255668b683d785a1ef8ba89551a9586481b8888bc1a66d4b997e68892ca
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/s6-linux-utils/template b/srcpkgs/s6-linux-utils/template
index 443a27491e3..7c9e44c930f 100644
--- a/srcpkgs/s6-linux-utils/template
+++ b/srcpkgs/s6-linux-utils/template
@@ -1,6 +1,6 @@
 # Template file for 's6-linux-utils'
 pkgname=s6-linux-utils
-version=2.5.0.1
+version=2.5.1.0
 revision=1
 build_style=configure
 makedepends="skalibs-devel"
@@ -13,7 +13,7 @@ license="ISC"
 homepage="https://skarnet.org/software/${pkgname}/"
 changelog="https://skarnet.org/software/s6-linux-utils/upgrade.html"
 distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=a177f9ae546fb95f5e47e783d7bdd471bbdaf9c959cd350288e4af3ca052ec2e
+checksum=58d6cbbaabf5c03739716e208f1690f7e7241480583cc9f5396093b428941bba
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) makedepends+=" nsss-devel" configure_args+=" --enable-nsss" ;;
diff --git a/srcpkgs/s6-networking/template b/srcpkgs/s6-networking/template
index 59c9c4a7a91..6841e25170a 100644
--- a/srcpkgs/s6-networking/template
+++ b/srcpkgs/s6-networking/template
@@ -1,7 +1,7 @@
 # Template file for 's6-networking'
 pkgname=s6-networking
-version=2.3.0.4
-revision=2
+version=2.3.1.0
+revision=1
 build_style=configure
 makedepends="execline-devel libressl-devel skalibs-devel s6-devel s6-dns-devel"
 configure_args="--libdir=/usr/lib --enable-ssl=libressl
@@ -13,7 +13,7 @@ license="ISC"
 homepage="https://skarnet.org/software/${pkgname}/"
 changelog="https://skarnet.org/software/s6-networking/upgrade.html"
 distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=0ae36a4adcf0000324d0cdb48767d7aa2b185a4e69105d3e7087a1cb2ab87802
+checksum=814fa3b70718d2423c742e920d31f64088272f7987c2cf7bebc86a63a75596b8
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) makedepends+=" nsss-devel" configure_args+=" --enable-nsss" ;;
diff --git a/srcpkgs/s6-portable-utils/template b/srcpkgs/s6-portable-utils/template
index 3926ec79807..88c093cfa0a 100644
--- a/srcpkgs/s6-portable-utils/template
+++ b/srcpkgs/s6-portable-utils/template
@@ -1,7 +1,7 @@
 # Template file for 's6-portable-utils'
 pkgname=s6-portable-utils
-version=2.2.1.3
-revision=2
+version=2.2.2.0
+revision=1
 build_style=configure
 configure_args="--prefix=/usr --libdir=/usr/lib --includedir=/usr/include
  --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="ISC"
 homepage="https://skarnet.org/software/${pkgname}/"
 distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=62ef131cccaaac76f47807f1684071012cf465a63fc744e5b9e179aa83b672c5
+checksum=0503841a2aee1cd79122c9ecf49dbefad5c5d21be7114e83e71c210e106abf0a
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/s6-rc/template b/srcpkgs/s6-rc/template
index 692bd2aca56..14da7d602fb 100644
--- a/srcpkgs/s6-rc/template
+++ b/srcpkgs/s6-rc/template
@@ -1,19 +1,20 @@
 # Template file for 's6-rc'
 pkgname=s6-rc
-version=0.5.0.0
-revision=6
+version=0.5.1.0
+revision=1
 build_style=configure
 configure_args="--prefix=/usr --libdir=/usr/lib --includedir=/usr/include
  --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
  --with-lib=${XBPS_CROSS_BASE}/usr/lib"
 makedepends="execline-devel skalibs-devel s6-devel"
-depends="s6>=2.8.0.0_1 execline>=2.5.1.0_1"
+depends="s6>=2.9.0.0_1 execline>=2.5.2.0_1"
 short_desc="Service manager of the s6 init system"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="ISC"
-homepage="https://skarnet.org/software/${pkgname}/"
+homepage="https://skarnet.org/software/s6-rc/"
+changelog="https://skarnet.org/software/s6-rc/upgrade.html"
 distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=cb7f033965a6c1b6f500cbb7a2f3ecdf2310fbb18f79e7a2a384541413b9275d
+checksum=93c02d0b505c036c332e13769154d82c9e31e4dd99f3ba80aa97d377ca9ac11c
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/s6/template b/srcpkgs/s6/template
index 0a086d9a3f2..c4d8b66a281 100644
--- a/srcpkgs/s6/template
+++ b/srcpkgs/s6/template
@@ -1,6 +1,6 @@
 # Template file for 's6'
 pkgname=s6
-version=2.8.0.1
+version=2.9.0.0
 revision=1
 build_style=configure
 makedepends="execline-devel skalibs-devel"
@@ -9,12 +9,12 @@ configure_args="--libdir=/usr/lib --bindir=/usr/bin
  --with-lib=${XBPS_CROSS_BASE}/usr/lib
  --exec-prefix=/usr"
 short_desc="Small suite of programs for UNIX, designed to allow process supervision"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Duncaen <duncaen@voidlinux.org>"
 license="ISC"
 homepage="http://skarnet.org/software/s6/"
 changelog="https://skarnet.org/software/s6/upgrade.html"
 distfiles="http://skarnet.org/software/s6/s6-${version}.tar.gz"
-checksum=dbe08f5b76c15fa32a090779b88fb2de9a9a107c3ac8ce488931dd39aa1c31d8
+checksum=1cac59bf9ff7c011b189ae2def3c76b147c2c431b0a901029fcaf957a6d9a343
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) makedepends+=" nsss-devel" configure_args+=" --enable-nsss" ;;
diff --git a/srcpkgs/sabnzbd/template b/srcpkgs/sabnzbd/template
index 3b850501ac9..38bd8db0731 100644
--- a/srcpkgs/sabnzbd/template
+++ b/srcpkgs/sabnzbd/template
@@ -1,6 +1,6 @@
 # Template file for 'sabnzbd'
 pkgname=sabnzbd
-version=2.3.8
+version=2.3.9
 revision=1
 archs=noarch
 wrksrc="SABnzbd-${version}"
@@ -10,9 +10,10 @@ depends="par2cmdline python-cheetah python-configobj python-feedparser
 short_desc="Open Source Binary Newsreader written in Python"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
+changelog="https://github.com/sabnzbd/sabnzbd/releases"
 homepage="https://sabnzbd.org/"
 distfiles="https://github.com/sabnzbd/sabnzbd/releases/download/${version}/SABnzbd-${version}-src.tar.gz"
-checksum=0685e867250106c0cab6cc9ffb5241caa9b1e2cdd43faec67ea41021d4997b72
+checksum=f3ab6dffba914e6ddf88f1a755ec3ebaa95f0bdbec6f04b7bf0f90822249bb0c
 
 post_extract() {
 	rm -rf gntp sabnzbd/utils/{feedparser,configobj}.py
diff --git a/srcpkgs/sakura/patches/0002-Fixed-crash-with-vte-0.54-Bug-1790317.patch b/srcpkgs/sakura/patches/0002-Fixed-crash-with-vte-0.54-Bug-1790317.patch
deleted file mode 100644
index edc5f39b25b..00000000000
--- a/srcpkgs/sakura/patches/0002-Fixed-crash-with-vte-0.54-Bug-1790317.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From: Egmont Kobingler <egmont@gmail.com>
-Date: Thu, 27 Sep 2018 16:21:28 +0200
-Subject: * Bug #1790317 fixed: Crash with vte 0.54
-
----
- src/sakura.c | 29 +++--------------------------
- 1 file changed, 3 insertions(+), 26 deletions(-)
-
-diff --git a/src/sakura.c b/src/sakura.c
-index e72a9aa..5eab95a 100644
---- a/src/sakura.c
-+++ b/src/sakura.c
-@@ -339,6 +339,7 @@ struct terminal {
- 	bool label_set_byuser;
- 	GtkBorder padding;   /* inner-property data */
- 	int colorset;
-+	gulong exit_handler_id;
- };
- 
- 
-@@ -984,31 +985,6 @@ sakura_eof (GtkWidget *widget, void *data)
- 	if (npages==1) {
- 		sakura_config_done();
- 	}
--
--	/* Workaround for libvte strange behaviour. There is not child-exited signal for
--	   the last terminal, so we need to kill it here.  Check with libvte authors about
--	   child-exited/eof signals */
--	if (gtk_notebook_get_current_page(GTK_NOTEBOOK(sakura.notebook))==0) {
--
--		term = sakura_get_page_term(sakura, 0);
--
--		if (option_hold==TRUE) {
--			SAY("hold option has been activated");
--			return;
--		}
--
--        //SAY("waiting for terminal pid (in eof) %d", term->pid);
--        //waitpid(term->pid, &status, WNOHANG);
--	/* TODO: check wait return */
--		/* Child should be automatically reaped because we don't use G_SPAWN_DO_NOT_REAP_CHILD flag */
--		g_spawn_close_pid(term->pid);
--
--		sakura_del_tab(0);
--
--		npages = gtk_notebook_get_n_pages(GTK_NOTEBOOK(sakura.notebook));
--		if (npages==0)
--			sakura_destroy();
--	}	
- }
- 
- /* This handler is called when window title changes, and is used to change window and notebook pages titles */
-@@ -3167,7 +3143,7 @@ sakura_add_tab()
- 	g_signal_connect(G_OBJECT(term->vte), "bell", G_CALLBACK(sakura_beep), NULL);
- 	g_signal_connect(G_OBJECT(term->vte), "increase-font-size", G_CALLBACK(sakura_increase_font), NULL);
- 	g_signal_connect(G_OBJECT(term->vte), "decrease-font-size", G_CALLBACK(sakura_decrease_font), NULL);
--	g_signal_connect(G_OBJECT(term->vte), "child-exited", G_CALLBACK(sakura_child_exited), NULL);
-+	term->exit_handler_id = g_signal_connect(G_OBJECT(term->vte), "child-exited", G_CALLBACK(sakura_child_exited), NULL);
- 	g_signal_connect(G_OBJECT(term->vte), "eof", G_CALLBACK(sakura_eof), NULL);
- 	g_signal_connect(G_OBJECT(term->vte), "window-title-changed", G_CALLBACK(sakura_title_changed), NULL);
- 	g_signal_connect_swapped(G_OBJECT(term->vte), "button-press-event", G_CALLBACK(sakura_button_press), sakura.menu);
-@@ -3366,6 +3342,7 @@ sakura_del_tab(gint page)
- 	}
- 
- 	gtk_widget_hide(term->hbox);
-+	g_signal_handler_disconnect (term->vte, term->exit_handler_id);
- 	gtk_notebook_remove_page(GTK_NOTEBOOK(sakura.notebook), page);
- 
- 	/* Find the next page, if it exists, and grab focus */
diff --git a/srcpkgs/sakura/template b/srcpkgs/sakura/template
index 7f1474aaca0..2b3d106f95e 100644
--- a/srcpkgs/sakura/template
+++ b/srcpkgs/sakura/template
@@ -1,15 +1,15 @@
 # Template file for 'sakura'
 pkgname=sakura
-version=3.6.0
-revision=2
-patch_args="-Np1"
+version=3.7.0
+revision=1
 build_style=cmake
 hostmakedepends="perl pkg-config"
 makedepends="vte3-devel"
 depends="desktop-file-utils"
 short_desc="Simple but powerful libvte based terminal emulator"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="travankor <travankor@tuta.io>"
 license="GPL-2.0-only"
 homepage="https://launchpad.net/sakura"
-distfiles="https://launchpad.net/sakura/trunk/${version}/+download/sakura-${version}.tar.bz2"
-checksum=a1161f3cedde20a7e1bc5981b3e6ab3b91d2cd3a5ffe35c792a7fa402a1e86e0
+distfiles="https://launchpad.net/sakura/trunk/${version}/+download/sakura-${version}.tar.gz"
+checksum=b554dd21dc14d11ce14bb3110ca9fc567437cb3883e84b241b1a97ed8b9cfa95
+patch_args="-Np1"
diff --git a/srcpkgs/saml2aws/template b/srcpkgs/saml2aws/template
new file mode 100644
index 00000000000..2f308b8e3a2
--- /dev/null
+++ b/srcpkgs/saml2aws/template
@@ -0,0 +1,25 @@
+# Template file for 'saml2aws'
+pkgname=saml2aws
+version=2.17.0
+revision=1
+build_style=go
+go_import_path=github.com/Versent/saml2aws
+go_package="$go_import_path/cmd/saml2aws"
+hostmakedepends="git dep"
+depends="aws-cli"
+short_desc="Get AWS temporary credentials from SAML provider"
+maintainer="Mate GABRI <iam@theguy.io>"
+license="MIT"
+homepage="https://github.com/Versent/saml2aws"
+distfiles="https://github.com/Versent/saml2aws/archive/v${version}.tar.gz"
+checksum=fd7a1eeff96af1c78b68bcd1473965016cc078b4e50963d39fd69ad4311e7094
+
+pre_build() {
+	cd $GOSRCPATH
+	dep ensure
+	cd $wrksrc
+}
+
+post_install() {
+	vlicense LICENSE.md
+}
diff --git a/srcpkgs/sampler/template b/srcpkgs/sampler/template
index c8007f4784d..70b7e23ec66 100644
--- a/srcpkgs/sampler/template
+++ b/srcpkgs/sampler/template
@@ -1,6 +1,6 @@
 # Template file for 'sampler'
 pkgname=sampler
-version=1.0.2
+version=1.0.3
 revision=1
 build_style=go
 go_import_path="github.com/sqshq/sampler"
@@ -11,7 +11,7 @@ maintainer="Renato Aguiar <renato@renag.me>"
 license="GPL-3.0-only"
 homepage="https://sampler.dev/"
 distfiles="https://github.com/sqshq/sampler/archive/v${version}.tar.gz"
-checksum=3b5240322ed0f48529af94cecee55900ae05ab776531a2e75337bf99fe8b1ff2
+checksum=03aa155c04e02fa40097841515de4fbf57904142defe5433490e28792868842d
 
 post_install() {
 	vinstall example.yml 644 usr/share/examples/sampler
diff --git a/srcpkgs/sane/patches/sane-desc-cross.patch b/srcpkgs/sane/patches/sane-desc-cross.patch
index 168a768f966..5999809da9c 100644
--- a/srcpkgs/sane/patches/sane-desc-cross.patch
+++ b/srcpkgs/sane/patches/sane-desc-cross.patch
@@ -5,7 +5,7 @@
  sane-desc$(EXEEXT): $(sane_desc_OBJECTS) $(sane_desc_DEPENDENCIES) $(EXTRA_sane_desc_DEPENDENCIES) 
  	@rm -f sane-desc$(EXEEXT)
 -	$(AM_V_CCLD)$(LINK) $(sane_desc_OBJECTS) $(sane_desc_LDADD) $(LIBS)
-+	cc -I. sane-desc.c -I../include ../sanei/sanei_config.c ../sanei/sanei_init_debug.c ../sanei/sanei_constrain_value.c ../lib/isfdtype.c -o $@
++	cc -I. sane-desc.c -I../include ../sanei/sanei_config.c ../sanei/sanei_init_debug.c ../sanei/sanei_constrain_value.c -o $@
  
  sane-find-scanner$(EXEEXT): $(sane_find_scanner_OBJECTS) $(sane_find_scanner_DEPENDENCIES) $(EXTRA_sane_find_scanner_DEPENDENCIES) 
  	@rm -f sane-find-scanner$(EXEEXT)
diff --git a/srcpkgs/sane/template b/srcpkgs/sane/template
index 1c2fe80b21c..77fa2eccdff 100644
--- a/srcpkgs/sane/template
+++ b/srcpkgs/sane/template
@@ -1,10 +1,10 @@
 # Template file for 'sane'
 pkgname=sane
-version=1.0.27
-revision=2
+_gitlab_release_hash=9e718daff347826f4cfe21126c8d5091
+version=1.0.28
+revision=1
 wrksrc="sane-backends-${version}"
 build_style=gnu-configure
-build_options="snmp"
 configure_args="--disable-locking --enable-avahi --enable-ipv6 --enable-pthread
  --with-usb --docdir=/usr/share/doc/sane ac_cv_func_mmap_fixed_mapped=yes
  $(vopt_with snmp)"
@@ -14,35 +14,40 @@ makedepends="avahi-libs-devel libjpeg-turbo-devel tiff-devel libgphoto2-devel
 depends="$(vopt_if snmp net-snmp)"
 conf_files="/etc/sane.d/*.conf"
 short_desc="Scanner Access Now Easy"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Piraty <piraty1@inbox.ru>"
+license="GPL-2.0-or-later, SANE-exception"
 homepage="http://www.sane-project.org/"
-license="GPL-2"
-distfiles="https://fossies.org/linux/misc/sane-backends-${version}.tar.xz"
-checksum=9483e6789dae8117371059c95caaeda3e67dc25130f1d69ebfe926c5422e67b9
-
-post_install() {
-	# fix hp officejets
-	echo "#hpaio" >> ${DESTDIR}/etc/sane.d/dll.conf
+distfiles="https://gitlab.com/sane-project/backends/uploads/${_gitlab_release_hash}/sane-backends-${version}.tar.gz"
+checksum=31260f3f72d82ac1661c62c5a4468410b89fb2b4a811dabbfcc0350c1346de03
 
-	vinstall ${FILESDIR}/saned.xinetd 644 etc/xinetd.d saned.conf
-	vinstall ${wrksrc}/tools/sane-backends.pc 644 usr/lib/pkgconfig
+build_options="snmp"
 
+post_build() {
 	# generate udev file
 	cd tools
 	mkdir -p udev
 	make udev/libsane.rules
+}
+
+post_install() {
+	vinstall ${FILESDIR}/saned.xinetd 644 etc/xinetd.d saned.conf
+	vinstall ${wrksrc}/tools/sane-backends.pc 644 usr/lib/pkgconfig
+
 	# install udev file
-	vinstall udev/libsane.rules 644 usr/lib/udev/rules.d 49-sane.rules
-	# fix udev rules
-	sed -i 's|NAME="%k", ||g' ${DESTDIR}/usr/lib/udev/rules.d/49-sane.rules
+	vinstall tools/udev/libsane.rules 644 usr/lib/udev/rules.d 49-sane.rules
+
+	vlicense LICENSE # License clarification
+	vlicense COPYING # GPL-2.0
+	sed -n "1,43 p" "${wrksrc}/backend/dll.c" > "${DESTDIR}/usr/share/licenses/sane/SANE-EXCEPTION"
 }
 
 libsane_package() {
 	short_desc+=" - runtime shared library"
 	pkg_install() {
-		vmove usr/lib/libsane.so.*
+		vmove "usr/lib/libsane.so.*"
 	}
 }
+
 sane-devel_package() {
 	depends="libsane>=${version}_${revision}"
 	short_desc+=" - development files"
@@ -51,6 +56,6 @@ sane-devel_package() {
 		vmove usr/bin/sane-config
 		vmove usr/share/man/man1/sane-config.1
 		vmove usr/lib/pkgconfig
-		vmove usr/lib/*.so
+		vmove "usr/lib/*.so"
 	}
 }
diff --git a/srcpkgs/sanoid/template b/srcpkgs/sanoid/template
index 94bd9574400..9ec3715aea8 100644
--- a/srcpkgs/sanoid/template
+++ b/srcpkgs/sanoid/template
@@ -1,18 +1,17 @@
 # Template file for 'sanoid'
 pkgname=sanoid
-version=2.0.1
+version=2.0.2
 revision=1
-depends="perl perl-Config-IniFiles"
+depends="perl perl-Config-IniFiles perl-Capture-Tiny"
 short_desc="Policy-driven snapshot management tool for ZFS filesystems"
 maintainer="Benjamin Slade <slade@jnanam.net>"
 license="GPL-3.0-or-later"
 homepage="http://www.openoid.net/products/"
 distfiles="https://github.com/jimsalterjrs/sanoid/archive/v$version.tar.gz"
 conf_files="/etc/sanoid/sanoid.conf /etc/sanoid/sanoid.defaults.conf"
-checksum=e28bd2ee372d777cd58e3a2ddd9c5c04210d07323b648c6c21030d0f7a22a464
+checksum=8937f1b3ef984e1b4d09603b005dcbf6a0315efd65d001aacbeaf56b67558605
 
 do_install() {
-	     vlicense LICENSE
 	     vdoc README.md
 	     vinstall sanoid.conf 644 etc/sanoid/
 	     vinstall sanoid.defaults.conf 644 etc/sanoid/
diff --git a/srcpkgs/sassc/template b/srcpkgs/sassc/template
index 6f3d4249533..91054ca2595 100644
--- a/srcpkgs/sassc/template
+++ b/srcpkgs/sassc/template
@@ -1,7 +1,7 @@
 # Template file for 'sassc'
 pkgname=sassc
 version=3.6.1
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool"
 makedepends="libsass-devel"
diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template
index 5f1fdb67f2a..2cecabfdbee 100644
--- a/srcpkgs/sbcl/template
+++ b/srcpkgs/sbcl/template
@@ -1,6 +1,6 @@
 # Template file for 'sbcl'
 pkgname=sbcl
-version=1.5.5
+version=1.5.7
 revision=1
 archs="i686 x86_64* armv7l aarch64"
 
@@ -13,7 +13,7 @@ license="custom"
 homepage="http://www.sbcl.org/"
 changelog="http://www.sbcl.org/news.html"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.tar.bz2"
-checksum=cb47fae6a86f0c5c57431604fb4e5f11c8a823f94ce128d568b8770fc5bcaae2
+checksum=54742fb5e2f3f350fbafd72bc73662fca21382b5553ed6a146098950d2409485
 nocross=yes
 nopie=yes
 
@@ -21,7 +21,7 @@ _bootstrap_lisp="bash ../sbcl-*-linux/run-sbcl.sh --no-sysinit --no-userinit --d
 case "$XBPS_TARGET_MACHINE" in
 x86_64)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-x86-64-linux-binary.tar.bz2"
-	checksum+=" 76ed2d873379cc9c898323a252bbd5ad8f91fb143f70549e32490e13b185bff9"
+	checksum+=" 7f41c480076ce5917c604219ad0e6e28af477dc446b002b3c4d299644097af32"
 	;;
 i686)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.4.3-x86-linux-binary.tar.bz2"
diff --git a/srcpkgs/sblg/template b/srcpkgs/sblg/template
index 8caf2ba6306..25ee7964b7c 100644
--- a/srcpkgs/sblg/template
+++ b/srcpkgs/sblg/template
@@ -1,6 +1,6 @@
 # Template file for 'sblg'
 pkgname=sblg
-version=0.5.4
+version=0.5.7
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -11,7 +11,7 @@ license="ISC"
 homepage="https://kristaps.bsd.lv/sblg/"
 changelog="https://kristaps.bsd.lv/sblg/archive.html"
 distfiles="https://kristaps.bsd.lv/sblg/snapshots/${pkgname}-${version}.tar.gz"
-checksum=b133254b2268a2f7784086e016cf8b8ffc5cdd06484c778a935e6341722222bb
+checksum=c8fe402b9086f0359d48fdf5ede6124a284718e20303160f210892a4b7d9c458
 
 pre_configure() {
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/scapy/template b/srcpkgs/scapy/template
index 322fbb87d3d..65242f332a8 100644
--- a/srcpkgs/scapy/template
+++ b/srcpkgs/scapy/template
@@ -1,6 +1,6 @@
 # Template file for 'scapy'
 pkgname=scapy
-version=2.4.2
+version=2.4.3
 revision=1
 archs=noarch
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="cipr3s <cipr3s@gmx.com>"
 license="GPL-2.0-only"
 homepage="https://scapy.net/"
 distfiles="${PYPI_SITE}/s/scapy/scapy-${version}.tar.gz"
-checksum=1baa048936207ceb1a4281a0e1e3b4317667c754872a0bb4734c5213c468e86a
+checksum=e2f8d11f6a941c14a789ae8b236b27bd634681f1b29b5e893861e284d234f6b0
diff --git a/srcpkgs/scc/template b/srcpkgs/scc/template
new file mode 100644
index 00000000000..665dbc0f358
--- /dev/null
+++ b/srcpkgs/scc/template
@@ -0,0 +1,17 @@
+# Template file for 'scc'
+pkgname=scc
+version=2.8.0
+revision=1
+build_style=go
+go_import_path="github.com/boyter/scc"
+hostmakedepends="git"
+short_desc="Fast cloc replacement written in pure Go"
+maintainer="Sami Pitkänen <bilebucket@airmail.cc>"
+license="MIT"
+homepage="https://github.com/boyter/scc"
+distfiles="https://github.com/boyter/scc/archive/v${version}.tar.gz"
+checksum=1a4a08d4c39b1168f6626dff59a821a09bfd1922d9b7732506ebf124408f4361
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/scdoc/template b/srcpkgs/scdoc/template
index 17fd5c99d05..a97d72c6aa2 100644
--- a/srcpkgs/scdoc/template
+++ b/srcpkgs/scdoc/template
@@ -1,6 +1,6 @@
 # Template file for 'scdoc'
 pkgname=scdoc
-version=1.9.6
+version=1.10.0
 revision=1
 build_style=gnu-makefile
 make_build_args="PREFIX=/usr"
@@ -9,7 +9,7 @@ maintainer="Julio Galvan <juliogalvan@protonmail.com>"
 license="MIT"
 homepage="https://git.sr.ht/~sircmpwn/scdoc"
 distfiles="https://git.sr.ht/~sircmpwn/scdoc/archive/${version}.tar.gz"
-checksum=89a5f2294b4b72ee1d20b8a478d16bee1f96b6202bfeedb6df76c27881ed5928
+checksum=3482e08b994cc4a528caf3d20dd70efda2d2ec86b30f66af75a1d192fee56852
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" scdoc"
diff --git a/srcpkgs/scons/template b/srcpkgs/scons/template
index a31d541d2ea..e130e12ee7b 100644
--- a/srcpkgs/scons/template
+++ b/srcpkgs/scons/template
@@ -1,6 +1,6 @@
 # Template file for 'scons'
 pkgname=scons
-version=3.0.5
+version=3.1.1
 revision=1
 build_style=python2-module
 make_install_args="--standard-lib --install-data=/usr/share"
@@ -13,8 +13,8 @@ license="MIT"
 homepage="https://www.scons.org/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz
  https://raw.githubusercontent.com/SCons/scons/master/LICENSE>LICENSE.txt"
-checksum="df676f23dc6d4bfa384fc389d95dcd21ab907e6349d4c848958ba4befb73c73e
- 159d5c59118f24519f12d39a129ee0dba4a601f8a41b8de324d399005aba6eb6"
+checksum="4cea417fdd7499a36f407923d03b4b7000b0f9e8fd7b31b316b9ce7eba9143a5
+ 72ed889165fb28378cadac14552be4a959f1ebab6b148abb5dd2b49712c3c6f6"
 
 
 post_install() {
diff --git a/srcpkgs/screen/template b/srcpkgs/screen/template
index dd221da239c..3419228d3fc 100644
--- a/srcpkgs/screen/template
+++ b/srcpkgs/screen/template
@@ -1,6 +1,6 @@
 # Template file for 'screen'
 pkgname=screen
-version=4.6.2
+version=4.7.0
 revision=1
 build_style=gnu-configure
 configure_args="--with-sys-screenrc=/etc/screenrc --enable-pam
@@ -10,10 +10,10 @@ makedepends="pam-devel ncurses-devel"
 conf_files="/etc/screenrc /etc/skel/.screenrc"
 short_desc="GNU screen manager with VT100/ANSI terminal emulation"
 maintainer="Frank Steinborn <steinex@nognu.de>"
+license="GPL-3.0-only"
 homepage="http://www.gnu.org/s/screen/"
-license="GPL-3"
 distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.gz"
-checksum=1b6922520e6a0ce5e28768d620b0f640a6631397f95ccb043b70b91bb503fa3a
+checksum=da775328fa783bd2a787d722014dbd99c6093effc11f337827604c2efc5d20c1
 
 post_install() {
 	vinstall etc/etcscreenrc 0644 etc screenrc
diff --git a/srcpkgs/scrot/template b/srcpkgs/scrot/template
index c44b143f365..2f12be320ee 100644
--- a/srcpkgs/scrot/template
+++ b/srcpkgs/scrot/template
@@ -1,17 +1,17 @@
 # Template file for 'scrot'
 pkgname=scrot
-version=1.1.1
+version=1.2
 revision=1
 build_style=gnu-configure
 make_install_args="docsdir=/usr/share/doc/scrot"
 hostmakedepends="automake autoconf-archive"
 makedepends="libX11-devel libXcursor-devel giblib-devel imlib2-devel"
 short_desc="Simple command-line screenshot utility for X"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Frank Steinborn <steinex@nognu.de>"
 license="MIT"
 homepage="https://github.com/resurrecting-open-source-projects/scrot"
 distfiles="https://github.com/resurrecting-open-source-projects/scrot/archive/${version}.tar.gz"
-checksum=63bc645d5dfff51e441541dc999379b34722c6428a4cd642e20005e6901383ba
+checksum=e9b41d4cb9b5ab3747d6718c4eb51d5aaf35b6cac23c9ff68af15fc1c9ce187c
 
 pre_configure() {
 	./autogen.sh
diff --git a/srcpkgs/scrypt/template b/srcpkgs/scrypt/template
index fbff8b0fb30..b807c55bf65 100644
--- a/srcpkgs/scrypt/template
+++ b/srcpkgs/scrypt/template
@@ -1,15 +1,15 @@
 # Template file for 'scrypt'
 pkgname=scrypt
-version=1.2.1
-revision=7
+version=1.3.0
+revision=1
 build_style=gnu-configure
 makedepends="libressl-devel"
-short_desc="The scrypt key derivation function"
+short_desc="Scrypt key derivation function"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://www.tarsnap.com/scrypt.html"
 distfiles="https://www.tarsnap.com/scrypt/scrypt-${version}.tgz"
-checksum=4621f5e7da2f802e20850436219370092e9fcda93bd598f6d4236cce33f4c577
+checksum=263034edd4d1e117d4051d9a9260c74dedb0efaf4491c5152b738978b3f32748
 
 post_install() {
 	vlicense COPYRIGHT
diff --git a/srcpkgs/scummvm/template b/srcpkgs/scummvm/template
index c24ae51929e..70e5a912720 100644
--- a/srcpkgs/scummvm/template
+++ b/srcpkgs/scummvm/template
@@ -1,36 +1,31 @@
 # Template file for 'scummvm'
 pkgname=scummvm
-version=2.0.0
+version=2.1.0
 revision=1
 build_style=configure
-configure_args="--prefix=/usr --enable-plugins --enable-all-engines"
+configure_args="--prefix=/usr --enable-release-mode
+ --with-sdl-prefix=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="pkg-config nasm"
-makedepends="zlib-devel libpng-devel SDL-devel libmad-devel faad2-devel
+makedepends="zlib-devel libpng-devel SDL2-devel libmad-devel faad2-devel
  fluidsynth-devel libvorbis-devel libtheora-devel libflac-devel
- freetype-devel libjpeg-turbo-devel"
+ freetype-devel libjpeg-turbo-devel libcurl-devel SDL2_net-devel
+ libmpeg2-devel liba52-devel"
 short_desc="Free implementation of LucasArts' SCUMM interpreter"
-maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://www.scummvm.org/"
-license="GPL-2"
-distfiles="http://www.scummvm.org/frs/${pkgname}/${version}/${pkgname}-${version}.tar.xz"
-checksum=9784418d555ba75822d229514a05cf226b8ce1a751eec425432e6b7e128fca60
+maintainer="John <johnz@posteo.net>"
+license="GPL-2.0-or-later"
+homepage="https://www.scummvm.org/"
+distfiles="https://www.scummvm.org/frs/${pkgname}/${version}/${pkgname}-${version}.tar.xz"
+checksum=6b50c6596a1536b52865f556dc05ded20f86b6ffabe4bccbd746b5587b15f727
 
-if [ "$CROSS_BUILD" ]; then
-	configure_args+=" --host=${XBPS_CROSS_TRIPLET} --disable-nasm"
-	CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/SDL"
+case "$XBPS_TARGET_MACHINE" in
+	i686*|x86_64*);;
+	*) configure_args+=" --disable-nasm";;
+esac
 
-	pre_configure() {
-		sed -i -e "s|_ranlib=ranlib|_ranlib=${XBPS_CROSS_TRIPLET}-ranlib|" \
-		-e "s|_strip=strip|_strip=${XBPS_CROSS_TRIPLET}-strip|" \
-		-e "s|_ar=\"ar cru\"|_ar=\"${XBPS_CROSS_TRIPLET}-ar cru\"|" \
-		-e "s|_as=\"as\"|_as=\"${XBPS_CROSS_TRIPLET}-as\"|" configure
-	}
+if [ "$CROSS_BUILD" ]; then
+	configure_args+=" --host=${XBPS_CROSS_TRIPLET}"
 fi
 
-do_install() {
-	vbin scummvm
-	vman dists/scummvm.6
-	vinstall dists/scummvm.desktop 644 usr/share/applications
-	vinstall icons/scummvm.xpm 644 usr/share/pixmaps
-	vinstall gui/themes/scummmodern.zip 644 usr/share/scummvm
+do_check() {
+	make test
 }
diff --git a/srcpkgs/sddm-kcm/template b/srcpkgs/sddm-kcm/template
index 49beeae6c95..e482a971c93 100644
--- a/srcpkgs/sddm-kcm/template
+++ b/srcpkgs/sddm-kcm/template
@@ -1,6 +1,6 @@
 # Template file for 'sddm-kcm'
 pkgname=sddm-kcm
-version=5.16.4
+version=5.17.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/plasma/sddm-kcm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=340034c5475d751c19c96a75445fa50877fad1c4de3422bc02f4b95e8f14bd68
+checksum=3ab6da7692df4b35c088f45657dfe2430797021c7c7fd6091747d7fd9ca594d7
diff --git a/srcpkgs/seafile-client-qt/template b/srcpkgs/seafile-client-qt/template
index d3fa18450b9..573a81460fa 100644
--- a/srcpkgs/seafile-client-qt/template
+++ b/srcpkgs/seafile-client-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'seafile-client-qt'
 pkgname=seafile-client-qt
-version=6.2.11
+version=7.0.2
 revision=1
 _sourcename="seafile-client"
 wrksrc="${_sourcename}-${version}"
@@ -14,16 +14,19 @@ maintainer="yopito <pierre.bourgin@free.fr>"
 license="Apache-2.0"
 homepage="https://github.com/haiwen/${_sourcename}"
 distfiles="https://github.com/haiwen/${_sourcename}/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=a862b3bf6dda9bd6d73270643dac9dad21296cc0bcd7aefa200b778c7675bb12
+checksum=338cc25dcb7307ac22c4dafc3d3434011368892752869ce6b7d281b991a6fca1
 
 build_options="shibboleth"
 desc_option_shibboleth="Build with Shibboleth support"
-build_options_default="shibboleth"
 
+# no arm by default (webengine does not crosscompile from 64-bit to 32-bit)
 case "$XBPS_TARGET_MACHINE" in
-	*-musl)	# Add musl-fts implementation
-		makedepends+=" musl-fts-devel"
-		;;
+	x86_64*|i686*|ppc64*|aarch64*) build_options_default="shibboleth" ;;
+esac
+
+case "$XBPS_TARGET_MACHINE" in
+	*-musl)	# need fts implementation
+		makedepends+=" musl-fts-devel" ;;
 esac
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/seafile-libclient/template b/srcpkgs/seafile-libclient/template
index fa9cd7b7d3f..47c49d5ceb2 100644
--- a/srcpkgs/seafile-libclient/template
+++ b/srcpkgs/seafile-libclient/template
@@ -1,7 +1,7 @@
 # Template file for 'seafile-libclient'
 pkgname=seafile-libclient
-version=6.2.11
-revision=2
+version=7.0.2
+revision=1
 _distname="${pkgname/-libclient/}"
 wrksrc="${_distname}-${version}"
 build_style=gnu-configure
@@ -14,7 +14,7 @@ maintainer="yopito <pierre.bourgin@free.fr>"
 license="GPL-2.0-or-later" # Has openssl exception not yet present on SPDX
 homepage="https://github.com/haiwen/seafile"
 distfiles="${homepage}/archive/v${version}.tar.gz>${_distname}-${version}.tar.gz"
-checksum=58c751d0d5f7afa674718a08ed828e9f94d00173d721018bbf61dd6b032f5a57
+checksum=2424b303fa826321affad0f23341ac46ca085c895f3d6e1345e9b43dc13c2ab3
 
 pre_configure() {
 	./autogen.sh
diff --git a/srcpkgs/seahorse/template b/srcpkgs/seahorse/template
index bfb7ec2a1c1..fd3e5a1a5f5 100644
--- a/srcpkgs/seahorse/template
+++ b/srcpkgs/seahorse/template
@@ -1,6 +1,6 @@
 # Template file for 'seahorse'
 pkgname=seahorse
-version=3.32.0
+version=3.32.2
 revision=1
 wrksrc="$pkgname-${version%.*}"
 build_style=meson
diff --git a/srcpkgs/sequeler/template b/srcpkgs/sequeler/template
index fbaeb8c1a84..7d39e69977f 100644
--- a/srcpkgs/sequeler/template
+++ b/srcpkgs/sequeler/template
@@ -1,6 +1,6 @@
 # Template file for 'sequeler'
 pkgname=sequeler
-version=0.7.2
+version=0.7.3
 revision=1
 build_style=meson
 hostmakedepends="pkg-config glib-devel vala"
@@ -11,4 +11,4 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Alecaddd/sequeler"
 distfiles="https://github.com/Alecaddd/sequeler/archive/v${version}.tar.gz"
-checksum=5134fd93324b1c96e614e05d94b1e0176e329c90c45811b785b2f54c1a50de91
+checksum=c25f540a4c95be50edd5e8495f6f436ba955d806481a0248fb03edfb10356217
diff --git a/srcpkgs/sfeed/template b/srcpkgs/sfeed/template
index cac8bcc40fe..54be7e421b3 100644
--- a/srcpkgs/sfeed/template
+++ b/srcpkgs/sfeed/template
@@ -1,6 +1,6 @@
 # Template file for 'sfeed'
 pkgname=sfeed
-version=0.9.12
+version=0.9.13
 revision=1
 build_style=gnu-makefile
 make_install_args="MANPREFIX=/usr/share/man"
@@ -10,7 +10,7 @@ maintainer="Rubén Santos <kojicomics@cocaine.ninja>"
 license="ISC"
 homepage="https://git.codemadness.org/sfeed"
 distfiles="https://codemadness.org/releases/sfeed/sfeed-${version}.tar.gz"
-checksum=ba512f734cdca5a10171ba7a051b0b614a7d93fdc29ea296eb464a57ce314ffd
+checksum=5e78fd75fa4949733b48640cd8205d0977b200f1cb403dcad33d1d7ea7032cee
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/shaderc/template b/srcpkgs/shaderc/template
index 51fd7bb23db..06768ed8a2b 100644
--- a/srcpkgs/shaderc/template
+++ b/srcpkgs/shaderc/template
@@ -8,7 +8,7 @@ configure_args="-DSHADERC_SKIP_TESTS=ON"
 hostmakedepends="python3"
 makedepends="SPIRV-Tools-devel glslang-devel"
 short_desc="Collection of tools, libraries and tests for shader compilation"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/google/shaderc"
 distfiles="https://github.com/google/shaderc/archive/v${version}.tar.gz"
diff --git a/srcpkgs/shared-mime-info/template b/srcpkgs/shared-mime-info/template
index 32cb30ed6b5..c46de16f454 100644
--- a/srcpkgs/shared-mime-info/template
+++ b/srcpkgs/shared-mime-info/template
@@ -1,15 +1,21 @@
 # Template file for 'shared-mime-info'
 pkgname=shared-mime-info
-version=1.12
+version=1.14
 revision=1
+_tarver=1-14
+wrksrc=${pkgname}-Release-${_tarver}
 build_style=gnu-configure
 configure_args="--disable-update-mimedb"
-hostmakedepends="pkg-config intltool"
+hostmakedepends="pkg-config intltool autoconf automake itstool gettext-devel"
 makedepends="libglib-devel libxml2-devel"
 short_desc="Core database of common types"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://freedesktop.org/Software/shared-mime-info"
-distfiles="https://gitlab.freedesktop.org/xdg/shared-mime-info/uploads/80c7f1afbcad2769f38aeb9ba6317a51/shared-mime-info-${version}.tar.xz"
-checksum=18b2f0fe07ed0d6f81951a5fd5ece44de9c8aeb4dc5bb20d4f595f6cc6bd403e
+distfiles="https://gitlab.freedesktop.org/xdg/shared-mime-info/-/archive/Release-1-14/shared-mime-info-Release-${_tarver}.tar.bz2"
+checksum=f6dec545944e3334a57cee04fb50da8c9005b9eff81514e8357cb17ed522ac8e
 disable_parallel_build=yes
+
+pre_configure() {
+	NOCONFIGURE=1 ./autogen.sh
+}
diff --git a/srcpkgs/shfmt/template b/srcpkgs/shfmt/template
index b2992235cdb..027fbe0de20 100644
--- a/srcpkgs/shfmt/template
+++ b/srcpkgs/shfmt/template
@@ -7,7 +7,7 @@ build_style=go
 go_import_path=mvdan.cc/sh
 go_package="${go_import_path}/cmd/shfmt"
 short_desc="Shell parser and formatter"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/mvdan/sh"
 distfiles="https://github.com/mvdan/sh/archive/v${version}.tar.gz"
diff --git a/srcpkgs/shiboken2/patches/qstringlist.patch b/srcpkgs/shiboken2/patches/qstringlist.patch
new file mode 100644
index 00000000000..2dc1e3d0885
--- /dev/null
+++ b/srcpkgs/shiboken2/patches/qstringlist.patch
@@ -0,0 +1,12 @@
+Fixes build with Qt 5.13.
+
+--- sources/shiboken2/ApiExtractor/clangparser/clangutils.h
++++ sources/shiboken2/ApiExtractor/clangparser/clangutils.h
+@@ -33,6 +33,7 @@
+ #include <QtCore/QPair>
+ #include <QtCore/QString>
+ #include <QtCore/QVector>
++#include <QtCore/QStringList>
+ 
+ QT_FORWARD_DECLARE_CLASS(QDebug)
+ 
diff --git a/srcpkgs/shiboken2/template b/srcpkgs/shiboken2/template
index 437833aed3f..394d9ba4f94 100644
--- a/srcpkgs/shiboken2/template
+++ b/srcpkgs/shiboken2/template
@@ -1,7 +1,7 @@
 # Template file for 'shiboken2'
 pkgname=shiboken2
 version=5.11.2
-revision=1
+revision=2
 _pkgname="pyside-setup-everywhere-src-${version}"
 wrksrc="$_pkgname"
 configure_args="-DUSE_PYTHON_VERSION=3 -DCMAKE_INSTALL_PREFIX=/usr
diff --git a/srcpkgs/shotcut/template b/srcpkgs/shotcut/template
index 28bff11f5c0..c4bd0a94c76 100644
--- a/srcpkgs/shotcut/template
+++ b/srcpkgs/shotcut/template
@@ -1,6 +1,6 @@
 # Template file for 'shotcut'
 pkgname=shotcut
-version=19.08.16
+version=19.09.14
 revision=1
 build_style=qmake
 configure_args="SHOTCUT_VERSION=VOID-$version DEFINES+=SHOTCUT_NOUPGRADE"
@@ -15,7 +15,7 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-3.0-or-later"
 homepage="https://www.shotcut.org"
 distfiles="https://github.com/mltframework/shotcut/archive/v${version}.tar.gz"
-checksum=03c0938eb69a239c442c0b73e547abcf626c6053e6bd189166c3391262b106bf
+checksum=b8e2dfa95928a8b08d4427a379a56efea79301ba82aee63f0f2f883a8269eb51
 
 CXXFLAGS="-DHAVE_LOCALE_H=1"
 
diff --git a/srcpkgs/shotwell/template b/srcpkgs/shotwell/template
index 641138f9fb9..a931bbd126e 100644
--- a/srcpkgs/shotwell/template
+++ b/srcpkgs/shotwell/template
@@ -1,6 +1,6 @@
 # Template file for 'shotwell'
 pkgname=shotwell
-version=0.30.5
+version=0.30.7
 revision=1
 build_style=meson
 hostmakedepends="gcr-devel glib-devel gnome-doc-utils itstool libgee08-devel
@@ -14,6 +14,6 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later, CC-BY-SA-3.0"
 homepage="https://wiki.gnome.org/Apps/Shotwell"
 distfiles="${GNOME_SITE}/shotwell/${version%.*}/shotwell-${version}.tar.xz"
-checksum=af8be0396509c7a0ad435c9562d8ed29a496b97aa6fba5fc472c390a08fca4a5
+checksum=345d4205760d26f54033d44cf1b778ed9d3fc964de71293bfd5034ff484631d5
 lib32disabled=yes
 nocross="https://build.voidlinux.org/builders/armv7l-musl_builder/builds/20405/steps/shell_3/logs/stdio"
diff --git a/srcpkgs/shunit2/template b/srcpkgs/shunit2/template
index 4b0b90ae1d4..e5be2806828 100644
--- a/srcpkgs/shunit2/template
+++ b/srcpkgs/shunit2/template
@@ -5,7 +5,7 @@ revision=1
 checkdepends="bash zsh ksh"
 depends="bash"
 short_desc="Unit testing framework for Unix shell scripts based on xUnit"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1"
 homepage="https://github.com/kward/shunit2"
 distfiles="https://github.com/kward/shunit2/archive/v${version}.tar.gz"
diff --git a/srcpkgs/signon-kwallet-extension/template b/srcpkgs/signon-kwallet-extension/template
index 47be51fd105..161e51d2e62 100644
--- a/srcpkgs/signon-kwallet-extension/template
+++ b/srcpkgs/signon-kwallet-extension/template
@@ -1,6 +1,6 @@
 # Template file for 'signon-kwallet-extension'
 pkgname=signon-kwallet-extension
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://cgit.kde.org/signon-kwallet-extension.git/"
 distfiles="${KDE_SITE}/applications/${version}/src/signon-kwallet-extension-${version}.tar.xz"
-checksum=f8cd646365f82c82de6c9f2dda8250579a2e469504e4358a334786f8f8e8b61f
+checksum=2521cd2c4f25717f5caf9915474f75614be7dec7053f1e94c1429fac7045cc29
diff --git a/srcpkgs/sk1/template b/srcpkgs/sk1/template
index 2e197a4d71a..1332211e175 100644
--- a/srcpkgs/sk1/template
+++ b/srcpkgs/sk1/template
@@ -1,8 +1,7 @@
 # Template file for 'sk1'
 pkgname=sk1
-reverts="2.0rc3.20180316_1 2.0rc3.20180329_1"
-version=2.0rc3
-revision=5
+version=2.0rc4
+revision=1
 build_style=python2-module
 pycompile_dirs="/usr/lib/sk1-wx-${version}"
 hostmakedepends="pkg-config python"
@@ -11,10 +10,10 @@ depends="desktop-file-utils hicolor-icon-theme python-cairo python-Pillow
  python-reportlab wxPython"
 short_desc="Open source multiplatform vector graphics editor"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="https://sk1project.net"
 distfiles="https://downloads.sk1project.net/sk1/${version}/sk1-${version}.tar.gz"
-checksum=d3b94131794d42d7c80c678e11a28a8e6a50401af4a35e42ed534d02b14abdff
+checksum=65ef0856389d3972e758d55eea33357a4bccec8b97d95eb8dc6be186a7956063
 
 pre_configure() {
 	# python2: can't open file 'setup.py': [Errno 2] No such file or directory
@@ -25,4 +24,3 @@ do_install() {
 	# must supply either prefix/exec-prefix/home or install-base/install-platbase -- not both
 	python2 setup.py install --root=${DESTDIR}
 }
-
diff --git a/srcpkgs/sk1/update b/srcpkgs/sk1/update
index 4d0b2efb096..0545d0dbcec 100644
--- a/srcpkgs/sk1/update
+++ b/srcpkgs/sk1/update
@@ -1 +1,2 @@
 ignore="*pkgbuild*"
+vdsuffix=rc.
diff --git a/srcpkgs/skaffold/template b/srcpkgs/skaffold/template
index 258a02e8062..7e87975557f 100644
--- a/srcpkgs/skaffold/template
+++ b/srcpkgs/skaffold/template
@@ -1,6 +1,6 @@
 # Template file for 'skaffold'
 pkgname=skaffold
-version=0.36.0
+version=0.40.0
 revision=1
 build_style=go
 go_import_path=github.com/GoogleContainerTools/skaffold
@@ -10,5 +10,6 @@ short_desc="Easy and repeatable Kubernetes development"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="https://skaffold.dev/"
+changelog="https://github.com/GoogleContainerTools/skaffold/releases"
 distfiles="https://github.com/GoogleContainerTools/skaffold/archive/v${version}.tar.gz"
-checksum=3b4d1b305feee16f3c44951e56a5105de00166384cef3265dd0f724081afcf41
+checksum=a89f8b75077193918efc8051d6b58b74408dc76467edbb0115d0765f60d13ed4
diff --git a/srcpkgs/skalibs/template b/srcpkgs/skalibs/template
index 559b40d1512..807b927f3fa 100644
--- a/srcpkgs/skalibs/template
+++ b/srcpkgs/skalibs/template
@@ -1,31 +1,21 @@
 # Template file for 'skalibs'
 pkgname=skalibs
-version=2.8.1.0
+version=2.9.0.0
 revision=1
 _sysdepspkg=skaware-void-sysdeps
 build_style=configure
-configure_args="--libdir=/usr/lib --enable-static --enable-shared --enable-clock
- --enable-monotonic --enable-force-devr --datadir=/usr/share/$pkgname --libdir=/usr/lib
- --bindir=/usr/bin --dynlibdir=/usr/lib"
+configure_args="--libdir=/usr/lib --enable-static --enable-shared
+ --enable-clock --enable-monotonic --enable-force-devr
+ --datadir=/usr/share/$pkgname --libdir=/usr/lib
+ --bindir=/usr/bin --dynlibdir=/usr/lib
+ --with-sysdep-devurandom=yes"
 short_desc="General purpose libraries for building software from skarnet.org"
 maintainer="bougyman <bougyman@voidlinux.org>"
 license="ISC"
 homepage="https://skarnet.org/software/skalibs/"
+changelog="https://skarnet.org/software/skalibs/upgrade.html"
 distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=431c6507b4a0f539b6463b4381b9b9153c86ad75fa3c6bfc9dc4722f00b166ba
-
-CFLAGS="-D_DEFAULT_SOURCE"
-
-if [ "$CROSS_BUILD" ]; then
-	distfiles+=" https://github.com/CMB/${_sysdepspkg}/archive/${version}.tar.gz"
-	checksum+=" b5a56d24caeb731f9a8468fa61ab0e9ae139370609ef4acb36888e69bbe8d98d"
-	configure_args+=" --with-sysdeps=../${_sysdepspkg}-${version}/${XBPS_CROSS_TRIPLET}"
-
-	case "$XBPS_TARGET_MACHINE" in
-		aarch64*|armv6*|armv7l*|i686|x86_64*|ppc*) ;;
-		*) nocross="Missing cross sysdeps" ;;
-	esac
-fi
+checksum=f5604f9e5ebb436d3a8efa16a2c4133f7bd424d9f22aa88fe7a372f0153396fb
 
 post_install() {
 	vlicense COPYING LICENSE
@@ -40,6 +30,7 @@ skalibs-doc_package() {
 		vcopy "doc/*" usr/share/doc/skalibs
 	}
 }
+
 skalibs-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/skim/template b/srcpkgs/skim/template
index deb8158a246..7e6b6a6f5fb 100644
--- a/srcpkgs/skim/template
+++ b/srcpkgs/skim/template
@@ -4,7 +4,7 @@ version=0.6.8
 revision=1
 build_style=cargo
 short_desc="Fuzzy Finder in rust"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/lotabout/skim"
 distfiles="https://github.com/lotabout/skim/archive/v${version}.tar.gz"
diff --git a/srcpkgs/skype/template b/srcpkgs/skype/template
index 123d56c8252..d7f3ac127f7 100644
--- a/srcpkgs/skype/template
+++ b/srcpkgs/skype/template
@@ -1,19 +1,19 @@
 # Template file for 'skype'
 # This just repackages the debian package.
 pkgname=skype
-version=8.50.0.38
+version=8.53.0.85
 revision=1
 archs="x86_64"
-repository="nonfree"
 build_style="fetch"
-nostrip="yes"
 depends="elogind"
 short_desc="Skype for Linux"
 maintainer="Lon Willett <xgit@lonw.net>"
 license="skype"
 homepage="https://www.skype.com"
 distfiles="https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"
-checksum=c64e27057a91cc006476d174f101a758eb917d4146078e0218f73f4c2e530abc
+checksum=fbb31b857bcb0b406cb1dd42336948c2f0a04caa229b9e4b6ff6e6bc5a8a836b
+repository="nonfree"
+nostrip="yes"
 
 do_extract() {
 	ar p ${XBPS_SRCDISTDIR}/${pkgname}-${version}/skypeforlinux_${version}_amd64.deb data.tar.xz | tar xJpf - ./usr
diff --git a/srcpkgs/slack-desktop/template b/srcpkgs/slack-desktop/template
index 1c0eb43b69f..e6ad447fcaf 100644
--- a/srcpkgs/slack-desktop/template
+++ b/srcpkgs/slack-desktop/template
@@ -1,14 +1,14 @@
 # Template file for 'slack-desktop'
 pkgname=slack-desktop
-version=4.0.0
+version=4.1.1
 revision=1
 archs="x86_64"
 short_desc="Messaging app for teams"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
-license="Proprietary"
+license="custom:Proprietary"
 homepage="https://slack.com/"
 distfiles="https://slack-ssb-updates.global.ssl.fastly.net/linux_releases/${pkgname}-${version}-amd64.deb"
-checksum=911a4c05fb4f85181df13f013e82440b0d171862c9cb137dc19b6381d47bd57e
+checksum=2e84af28a9179faf1a6c64e36e6316792531de1d4530fcd2909e5eae77d1ced9
 restricted=yes
 repository="nonfree"
 nopie=yes
diff --git a/srcpkgs/sleuthkit/template b/srcpkgs/sleuthkit/template
index d33aa6aec29..b17362edc70 100644
--- a/srcpkgs/sleuthkit/template
+++ b/srcpkgs/sleuthkit/template
@@ -1,6 +1,6 @@
 # Template file for 'sleuthkit'
 pkgname=sleuthkit
-version=4.6.7
+version=4.7.0
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only, IPL-1.0, CPL-1.0"
 homepage="https://www.sleuthkit.org/"
 distfiles="https://github.com/sleuthkit/${pkgname}/archive/${pkgname}-${version}.tar.gz"
-checksum=7f6305160109d681dd6fe00b7a19f1c43af35d2eb265d3abbdc2749611707687
+checksum=bc56f342442ef02f981a7c461e23ff407e1b9e68b16d2f28150b6300c4435996
 
 post_extract() {
 	sed -i 's/daddr_t/uint32_t/g' tools/srchtools/sigfind.cpp
diff --git a/srcpkgs/slirp4netns/template b/srcpkgs/slirp4netns/template
index 37d3ed2e5ed..50ac856075a 100644
--- a/srcpkgs/slirp4netns/template
+++ b/srcpkgs/slirp4netns/template
@@ -1,16 +1,16 @@
 # Template file for 'slirp4netns'
 pkgname=slirp4netns
-version=0.3.2
+version=0.4.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="autoconf automake pkg-config"
-makedepends="glib-devel"
+makedepends="glib-devel libseccomp-devel libcap-devel"
 short_desc="User-mode networking for unprivileged network namespaces"
-maintainer="Cameron Nemo <camerontnorman@gmail.com>"
+maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="GPL-2.0-only"
 homepage="https://github.com/rootless-containers/slirp4netns"
 distfiles="https://github.com/rootless-containers/slirp4netns/archive/v${version}.tar.gz"
-checksum=fe400337e857cee668a0c9161e2997af9c5c8cbaf4cbec12b32b458064eec380
+checksum=75d2a7411cc2b3e341d8530228750bb1db06077b349d10fbdddbb582c27f8cfc
 
 pre_configure() {
 	./autogen.sh
diff --git a/srcpkgs/smenu/template b/srcpkgs/smenu/template
index 3c900b6a8b9..1d295cb5e85 100644
--- a/srcpkgs/smenu/template
+++ b/srcpkgs/smenu/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-configure
 makedepends="ncurses-devel"
 short_desc="Create selection menus with words from stdin"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/p-gen/smenu"
 distfiles="https://github.com/p-gen/smenu/archive/v${version}.tar.gz"
diff --git a/srcpkgs/socat/template b/srcpkgs/socat/template
index a3072a292f2..57b99020a92 100644
--- a/srcpkgs/socat/template
+++ b/srcpkgs/socat/template
@@ -1,15 +1,13 @@
 # Template file for 'socat'
 pkgname=socat
 version=1.7.3.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-libwrap --enable-fips
- ac_cv_have_z_modifier=yes sc_cv_sys_crdly_shift=9
- sc_cv_sys_tabdly_shift=11 sc_cv_sys_csize_shift=4
- ac_cv_ispeed_offset=13"
+ ac_cv_have_z_modifier=yes"
 makedepends="readline-devel libressl-devel"
 short_desc="Relay for bidirectional data transfer between two independent channels"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="q66 <daniel@octaforge.org>"
 license="GPL-2.0-only"
 homepage="http://www.dest-unreach.org/socat/"
 distfiles="http://www.dest-unreach.org/socat/download/socat-${version}.tar.bz2"
@@ -18,3 +16,20 @@ checksum=0dd63ffe498168a4aac41d307594c5076ff307aa0ac04b141f8f1cec6594d04a
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) CFLAGS="-D_LINUX_IF_ETHER_H";;
 esac
+
+case "$XBPS_TARGET_MACHINE" in
+	ppc*)
+		configure_args+="
+		 sc_cv_sys_crdly_shift=12
+		 sc_cv_sys_tabdly_shift=10
+		 sc_cv_sys_csize_shift=8"
+		;;
+	*)
+		configure_args+="
+		 sc_cv_sys_crdly_shift=9
+		 sc_cv_sys_tabdly_shift=11
+		 sc_cv_sys_csize_shift=4"
+		;;
+esac
+
+configure_args+=" ac_cv_ispeed_offset=13"
diff --git a/srcpkgs/solarus-quest-editor/template b/srcpkgs/solarus-quest-editor/template
index 1268a562e68..de2aa962355 100644
--- a/srcpkgs/solarus-quest-editor/template
+++ b/srcpkgs/solarus-quest-editor/template
@@ -1,6 +1,6 @@
 # Template file for 'solarus-quest-editor'
 pkgname=solarus-quest-editor
-version=1.6.0
+version=1.6.2
 revision=1
 wrksrc="${pkgname}-v${version}"
 build_style=cmake
@@ -13,4 +13,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="http://www.solarus-games.org"
 distfiles="https://gitlab.com/solarus-games/${pkgname}/-/archive/v${version}/${pkgname}-v${version}.tar.bz2"
-checksum=79f5ae343b6340ba07702333d96e26dfa2d5b1f43a3f2bf90e168d42b08a769b
+checksum=278e0c2856bd1eb4862253f1ece50480d936a7ebc7d694664a791b2fd1a750e5
diff --git a/srcpkgs/solarus/template b/srcpkgs/solarus/template
index 94085e2b470..1611a1190cd 100644
--- a/srcpkgs/solarus/template
+++ b/srcpkgs/solarus/template
@@ -1,6 +1,6 @@
 # Template file for 'solarus'
 pkgname=solarus
-version=1.6.0
+version=1.6.2
 revision=1
 wrksrc="${pkgname}-v${version}"
 build_style=cmake
@@ -12,13 +12,13 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="http://www.solarus-games.org/"
 distfiles="https://gitlab.com/solarus-games/solarus/-/archive/v${version}/solarus-v${version}.tar.bz2"
-checksum=7a7a3e8f85ed44c1ee84bfee0b6f63f5d351cde6c10a1b7c5f2072b66068692d
+checksum=c14cd97bad6e12310b938d90abd4e8ebdd0abb403cdcc015d5add82dfc5a085b
 
 solarus-devel_package() {
 	short_desc+=" - development files"
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
-		vmove usr/lib/libsolarus.so
+		vmove "usr/lib/*.so"
 	}
 }
diff --git a/srcpkgs/sonnet/template b/srcpkgs/sonnet/template
index 394fb8c5191..fcdd5583c1f 100644
--- a/srcpkgs/sonnet/template
+++ b/srcpkgs/sonnet/template
@@ -1,6 +1,6 @@
 # Template file for 'sonnet'
 pkgname=sonnet
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/frameworks/sonnet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4c8818897ea5dac25e0120acfd4e15c44adf2ee76749870b8f70178f1a3d8b29
+checksum=2f26251d7008de895dd5962a7ba09fbb82beaabbe88b8e5cd259585ebbaf1d3f
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-tools-devel sonnet"
diff --git a/srcpkgs/sops/template b/srcpkgs/sops/template
new file mode 100644
index 00000000000..47365ff9b26
--- /dev/null
+++ b/srcpkgs/sops/template
@@ -0,0 +1,13 @@
+# Template file for 'sops'
+pkgname=sops
+version=3.4.0
+revision=1
+build_style=go
+go_import_path="go.mozilla.org/sops/cmd/sops"
+hostmakedepends="git"
+short_desc="Simple and flexible tool for managing secrets"
+maintainer="Noel Cower <ncower@gmail.com>"
+license="MPL-2.0"
+homepage="https://github.com/mozilla/sops"
+distfiles="${homepage}/archive/${version}.tar.gz"
+checksum=65f680ada424094dcdb80b44e3c11c86235618ef1ab10f5f632fcda954a06363
diff --git a/srcpkgs/source-sans-pro/template b/srcpkgs/source-sans-pro/template
index 68dfd56264e..510f5a74e91 100644
--- a/srcpkgs/source-sans-pro/template
+++ b/srcpkgs/source-sans-pro/template
@@ -1,8 +1,8 @@
 # Template file for 'source-sans-pro'
 pkgname=source-sans-pro
-version=2.045
+version=3.006
 revision=1
-_relver="2.045R-ro/1.095R-it"
+_relver="3.006R"
 archs=noarch
 wrksrc="source-sans-pro-${_relver/\//-}"
 depends="font-util"
@@ -11,7 +11,7 @@ maintainer="WantToHelp <ghostinthecsh@gmail.com>"
 license="OFL-1.1"
 homepage="https://adobe-fonts.github.io/source-sans-pro/"
 distfiles="https://github.com/adobe-fonts/source-sans-pro/archive/${_relver}.tar.gz"
-checksum=01e78d7ff451545ff1eec6cf14b28f62135e430a7ba80d74a90efd5334fef7eb
+checksum=a384e8c3246490bb5eaf79eb9eb9e41d7f2d167bb7d36280156ec77ae8ddfda1
 font_dirs="/usr/share/fonts/OTF /usr/share/fonts/TTF"
 
 do_install() {
diff --git a/srcpkgs/sparse/template b/srcpkgs/sparse/template
index 3ea4849b2e8..206ccedeab1 100644
--- a/srcpkgs/sparse/template
+++ b/srcpkgs/sparse/template
@@ -1,6 +1,6 @@
 # Template file for 'sparse'
 pkgname=sparse
-version=0.6.0
+version=0.6.1
 revision=1
 build_style=gnu-makefile
 make_use_env=yes
@@ -9,7 +9,7 @@ maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="MIT"
 homepage="https://git.kernel.org/pub/scm/devel/sparse/sparse.git"
 distfiles="${homepage}/snapshot/${pkgname}-${version}.tar.gz"
-checksum=08676b6188ac09a12035ecebf9353d786762c74dd7f036595c53bcc03bbc9932
+checksum=b0502efa4c4d60d718b089af5659c40e1f972c1e246d59de1150a5e828d703ea
 
 pre_build() {
 	make_build_args="CC=$CC LD=$CC AR=$AR"
diff --git a/srcpkgs/spdx-licenses-list/template b/srcpkgs/spdx-licenses-list/template
index b91e8c55fcf..948cd4f767b 100644
--- a/srcpkgs/spdx-licenses-list/template
+++ b/srcpkgs/spdx-licenses-list/template
@@ -5,7 +5,7 @@ revision=1
 archs=noarch
 wrksrc="license-list-data-${version}"
 short_desc="SPDX License List"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://spdx.org"
 distfiles="https://github.com/spdx/license-list-data/archive/v${version}.tar.gz"
diff --git a/srcpkgs/spectacle/template b/srcpkgs/spectacle/template
index f2ea6f3edbe..42c573403dc 100644
--- a/srcpkgs/spectacle/template
+++ b/srcpkgs/spectacle/template
@@ -1,17 +1,17 @@
 # Template file for 'spectacle'
 pkgname=spectacle
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules kdoctools python qt5-host-tools qt5-qmake
  kcoreaddons"
 makedepends="kdeclarative-devel libkipi5-devel xcb-util-image-devel xcb-util-cursor-devel
- purpose-devel knewstuff-devel"
+ kwayland-devel purpose-devel knewstuff-devel"
 depends="qt5-tools"
 short_desc="KDE screenshot capture utility"
 maintainer="John <johnz@posteo.net>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/kde/kdegraphics/spectacle"
 distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=8ada4f765f81ee496f9fd00b74764690df9c479e343a035e363f7159f93c35a4
+checksum=4cf2f0903cec2787a03a8bbdbd219acc29ac412f352a4ff94ef50ae9a6eb459e
diff --git a/srcpkgs/speedtest-cli/template b/srcpkgs/speedtest-cli/template
index e5d2b4bd33e..6746ea3a35e 100644
--- a/srcpkgs/speedtest-cli/template
+++ b/srcpkgs/speedtest-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'speedtest-cli'
 pkgname=speedtest-cli
-version=2.1.1
+version=2.1.2
 revision=1
 archs=noarch
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Aaron Marcher <info@nulltime.net>"
 license="Apache-2.0"
 homepage="https://github.com/sivel/speedtest-cli"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=433675c19bd40c059da5d98c512874742405e8185afed47f8aa11a02ac61aa06
+checksum=a877142eec0ee8dda86519c36fe789480ed6fa603b016b620affd77fbf79b0d9
diff --git a/srcpkgs/spice-gtk/template b/srcpkgs/spice-gtk/template
index c6ac4a44595..0c042971ee2 100644
--- a/srcpkgs/spice-gtk/template
+++ b/srcpkgs/spice-gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'spice-gtk'
 pkgname=spice-gtk
 version=0.37
-revision=3
+revision=4
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
@@ -36,7 +36,8 @@ spice-gtk-devel_package() {
 	depends="gtk+3-devel pixman-devel libressl-devel opus-devel
 	 libva-devel libsasl-devel liblz4-devel usbredir-devel phodav-devel
 	 json-glib-devel gstreamer1-devel gst-plugins-base1-devel
-	 $(vopt_if gir libgirepository-devel) ${sourcepkg}-${version}_${revision}"
+	 spice-protocol $(vopt_if gir libgirepository-devel)
+	 ${sourcepkg}-${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
diff --git a/srcpkgs/spice/template b/srcpkgs/spice/template
index 296b96de6ce..e272e8ffced 100644
--- a/srcpkgs/spice/template
+++ b/srcpkgs/spice/template
@@ -17,6 +17,10 @@ homepage="http://www.spice-space.org"
 distfiles="http://www.spice-space.org/download/releases/spice-${version}.tar.bz2"
 checksum=b203b3882e06f4c7249a3150d90c84e1a90490d41ead255a3d2cede46f4a29a7
 
+if [ "$XBPS_TARGET_ENDIAN" != "le" ]; then
+	broken="SPICE server only works on little endian architectures"
+fi
+
 post_extract() {
 	sed -i 's/armv6hl/arm/g' configure	# "detects" cpu from triplet.
 }
diff --git a/srcpkgs/spigot/template b/srcpkgs/spigot/template
index 06f1a4ada43..e11ec242391 100644
--- a/srcpkgs/spigot/template
+++ b/srcpkgs/spigot/template
@@ -1,6 +1,6 @@
 # Template file for 'spigot'
 pkgname=spigot
-version=20190809.34f87c2
+version=20190901.1791406
 revision=1
 build_style=gnu-configure
 make_check_target="test"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://www.chiark.greenend.org.uk/~sgtatham/spigot/"
 distfiles="https://www.chiark.greenend.org.uk/~sgtatham/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=05763ecb046ac6215bf8edb40f29d3f6ccaf940514384c31f0ecbec373d6f491
+checksum=e6116e9cbe461a9da08b25d897efc41d159ea6366a0500b9905d791c0d2be129
 
 post_install() {
 	vlicense LICENCE
diff --git a/srcpkgs/spotify-adblock-linux/files/spotify-adblock.desktop b/srcpkgs/spotify-adblock-linux/files/spotify-adblock.desktop
new file mode 100644
index 00000000000..074ba5775a5
--- /dev/null
+++ b/srcpkgs/spotify-adblock-linux/files/spotify-adblock.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Type=Application
+Name=Spotify (adblock)
+GenericName=Music Player
+Icon=spotify-client
+TryExec=spotify
+Exec=env LD_PRELOAD=/usr/lib/spotify-adblock.so spotify %U
+Terminal=false
+MimeType=x-scheme-handler/spotify;
+Categories=Audio;Music;Player;AudioVideo;
+StartupWMClass=spotify
diff --git a/srcpkgs/spotify-adblock-linux/template b/srcpkgs/spotify-adblock-linux/template
new file mode 100644
index 00000000000..fc61feb19c3
--- /dev/null
+++ b/srcpkgs/spotify-adblock-linux/template
@@ -0,0 +1,20 @@
+# Template file for 'spotify-adblock-linux'
+pkgname=spotify-adblock-linux
+version=1.0
+revision=1
+build_style=gnu-makefile
+makedepends="libcurl-devel"
+short_desc="Spotify adblocker for Linux"
+maintainer="linarcx <linarcx@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/abba23/spotify-adblock-linux"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=811358fd2da2ca83e76e3a0dd5ce03ddab39fc19ae9831dd0ccaf4b74abd0804
+
+CFLAGS+=" -shared -fPIC"
+
+do_install() {
+	vmkdir usr/lib
+	vcopy "*.so" usr/lib
+	vinstall ${FILESDIR}/spotify-adblock.desktop 644 usr/share/applications/
+}
diff --git a/srcpkgs/spotify-tui/template b/srcpkgs/spotify-tui/template
new file mode 100644
index 00000000000..900440a90df
--- /dev/null
+++ b/srcpkgs/spotify-tui/template
@@ -0,0 +1,17 @@
+# Template file for 'spotify-tui'
+pkgname=spotify-tui
+version=0.6.2
+revision=1
+build_style=cargo
+hostmakedepends="pkg-config"
+makedepends="libressl-devel"
+short_desc="Spotify for the terminal"
+maintainer="Andrew Benson <abenson+void@gmail.com>"
+license="MIT"
+homepage="https://github.com/Rigellute/spotify-tui"
+distfiles="https://github.com/Rigellute/spotify-tui/archive/v${version}.tar.gz"
+checksum=fb741a0f1e69d547015efa5b0edde0600d2d0a02d4b056b31012e6d9058b94f6
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/sqlite-replication/template b/srcpkgs/sqlite-replication/template
index b5b1063d8ca..cd6cf735da9 100644
--- a/srcpkgs/sqlite-replication/template
+++ b/srcpkgs/sqlite-replication/template
@@ -1,10 +1,10 @@
 # Template file for 'sqlite-replication'
 pkgname=sqlite-replication
-version=3.28.0
-revision=1
+version=3.29.0
+revision=2
 wrksrc="sqlite-version-${version}-replication3"
 build_style=gnu-configure
-configure_args="--enable-wal-replication --enable-threadsafe --enable-dynamic-extensions --enable-fts5"
+configure_args="--enable-replication --enable-threadsafe --enable-dynamic-extensions --enable-fts5"
 hostmakedepends="tcl"
 makedepends="libedit-devel"
 short_desc="Replication Enabled SQL Database Engine in a C Library"
@@ -12,7 +12,7 @@ maintainer="Cameron Nemo <camerontnorman@gmail.com>"
 license="Public Domain"
 homepage="https://github.com/CanonicalLtd/sqlite"
 distfiles="${homepage}/archive/version-${version}+replication3.tar.gz"
-checksum=3e52fb92ef8f66ba640145941f05aabbffb4f422a0b9a42a97b6806e2c3c6812
+checksum=516ae04b7bef44b6de71fed99f41f1f11afc781495145c7bccf3c1e1073c37be
 replaces="sqlite>=3.8.11.1_3"
 provides="sqlite-${version}_${revision}"
 shlib_provides="libsqlite3.so"
@@ -26,9 +26,6 @@ CFLAGS+=" -DHAVE_FDATASYNC"
 disable_parallel_build=yes
 
 pre_configure() {
-	printf -- "D 2019-03-09T15:45:46\n" > manifest
-	printf -- "8250984a368079bb1838d48d99f8c1a6282e00bc" > manifest.uuid
-
 	sed -i -e 's/ -ltinfo//g' configure
 }
 
diff --git a/srcpkgs/sqlite/template b/srcpkgs/sqlite/template
index 137f3d6c8ff..204ff038c81 100644
--- a/srcpkgs/sqlite/template
+++ b/srcpkgs/sqlite/template
@@ -1,6 +1,6 @@
 # Template file for 'sqlite'
 pkgname=sqlite
-version=3.29.0
+version=3.30.1
 revision=1
 _amalgamationver=$(printf "%d%02d%02d00\n" ${version//./ })
 wrksrc="sqlite-autoconf-${_amalgamationver}"
@@ -8,12 +8,12 @@ build_style=gnu-configure
 configure_args="--enable-threadsafe --enable-dynamic-extensions --enable-fts5"
 makedepends="libedit-devel zlib-devel"
 short_desc="SQL Database Engine in a C Library"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="Public Domain"
 homepage="https://sqlite.org/"
 changelog="https://www.sqlite.org/releaselog/${version//./_}.html"
 distfiles="${homepage}/2019/sqlite-autoconf-${_amalgamationver}.tar.gz"
-checksum=8e7c1e2950b5b04c5944a981cb31fffbf9d2ddda939d536838ebc854481afd5b
+checksum=8c5a50db089bd2a1b08dbc5b00d2027602ca7ff238ba7658fabca454d4298e60
 
 CFLAGS="-DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_COLUMN_METADATA \
  -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE -DSQLITE_ENABLE_JSON1 \
diff --git a/srcpkgs/sqlmap/template b/srcpkgs/sqlmap/template
new file mode 100644
index 00000000000..be9d774e94d
--- /dev/null
+++ b/srcpkgs/sqlmap/template
@@ -0,0 +1,27 @@
+# Template file for 'sqlmap'
+pkgname=sqlmap
+version=1.3.9
+revision=1
+archs=noarch
+pycompile_dirs="usr/share/sqlmap"
+depends="python3"
+short_desc="Automatic SQL injection and database takeover tool"
+maintainer="Andrew Benson <abenson+void@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="http://sqlmap.org"
+distfiles="https://github.com/sqlmapproject/sqlmap/archive/${version}.tar.gz"
+checksum=44669d0ca2568d7595877d80ab1a36fe6f683a4382a1779459c7db5a7accd14a
+pycompile_version="$py3_ver"
+
+do_install() {
+	vmkdir usr/share/${pkgname}
+	for dir in data extra lib plugins tamper thirdparty sqlmap.py sqlmapapi.py; do
+		vcopy $dir usr/share/${pkgname}
+	done
+
+	vmkdir usr/bin
+	ln -sf /usr/share/${pkgname}/sqlmap.py ${DESTDIR}/usr/bin/
+	ln -sf /usr/share/${pkgname}/sqlmapapi.py ${DESTDIR}/usr/bin/
+
+	vsconf sqlmap.conf
+}
diff --git a/srcpkgs/squashfs-tools/patches/CVE-2015-4645.patch b/srcpkgs/squashfs-tools/patches/CVE-2015-4645.patch
deleted file mode 100644
index bb0f85e0577..00000000000
--- a/srcpkgs/squashfs-tools/patches/CVE-2015-4645.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- squashfs-tools/unsquash-4.c
-+++ squashfs-tools/unsquash-4.c
-@@ -31,9 +31,9 @@ static unsigned int *id_table;
- int read_fragment_table_4(long long *directory_table_end)
- {
- 	int res, i;
--	int bytes = SQUASHFS_FRAGMENT_BYTES(sBlk.s.fragments);
--	int  indexes = SQUASHFS_FRAGMENT_INDEXES(sBlk.s.fragments);
--	long long fragment_table_index[indexes];
-+	size_t bytes = SQUASHFS_FRAGMENT_BYTES(sBlk.s.fragments);
-+	size_t indexes = SQUASHFS_FRAGMENT_INDEXES(sBlk.s.fragments);
-+	long long *fragment_table_index;
- 
- 	TRACE("read_fragment_table: %d fragments, reading %d fragment indexes "
- 		"from 0x%llx\n", sBlk.s.fragments, indexes,
-@@ -44,6 +44,11 @@ int read_fragment_table_4(long long *directory_table_end)
- 		return TRUE;
- 	}
- 
-+	fragment_table_index = malloc(indexes*sizeof(long long));
-+	if(fragment_table_index == NULL)
-+		EXIT_UNSQUASH("read_fragment_table: failed to allocate "
-+			"fragment table index\n");
-+
- 	fragment_table = malloc(bytes);
- 	if(fragment_table == NULL)
- 		EXIT_UNSQUASH("read_fragment_table: failed to allocate "
diff --git a/srcpkgs/squashfs-tools/patches/fix-compat.patch b/srcpkgs/squashfs-tools/patches/fix-compat.patch
deleted file mode 100644
index 91ebfd97af3..00000000000
--- a/srcpkgs/squashfs-tools/patches/fix-compat.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- squashfs-tools/action.c
-+++ squashfs-tools/action.c
-@@ -1905,6 +1905,9 @@
- 	return 1;
- }
- 
-+#ifndef FNM_EXTMATCH
-+#define FNM_EXTMATCH 0
-+#endif
- 
- TEST_FN(name, ACTION_ALL_LNK, \
- 	return fnmatch(atom->argv[0], action_data->name,
---- squashfs-tools/mksquashfs.c
-+++ squashfs-tools/mksquashfs.c
-@@ -4391,6 +4391,9 @@
- 	return paths;
- }
- 
-+#ifndef FNM_EXTMATCH
-+#define FNM_EXTMATCH 0
-+#endif
- 
- int excluded_match(char *name, struct pathname *path, struct pathnames **new)
- {
---- squashfs-tools/pseudo.c
-+++ squashfs-tools/pseudo.c
-@@ -32,6 +32,7 @@
- #include <stdlib.h>
- #include <sys/types.h>
- #include <sys/wait.h>
-+#include <sys/stat.h>
- #include <ctype.h>
- 
- #include "pseudo.h"
---- squashfs-tools/unsquashfs.c
-+++ squashfs-tools/unsquashfs.c
-@@ -1410,6 +1410,9 @@
- 	free(paths);
- }
- 
-+#ifndef FNM_EXTMATCH
-+#define FNM_EXTMATCH 0
-+#endif
- 
- int matches(struct pathnames *paths, char *name, struct pathnames **new)
- {
diff --git a/srcpkgs/squashfs-tools/patches/vla-overlow.patch b/srcpkgs/squashfs-tools/patches/vla-overlow.patch
deleted file mode 100644
index a9840fe01f0..00000000000
--- a/srcpkgs/squashfs-tools/patches/vla-overlow.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- ./squashfs-tools/unsquashfs.c.orig
-+++ ./squashfs-tools/unsquashfs.c
-@@ -2099,7 +2099,9 @@
-  */
- void *inflator(void *arg)
- {
--	char tmp[block_size];
-+	char *tmp = malloc(block_size);
-+	if(tmp == NULL)
-+		EXIT_UNSQUASH("Out of memory allocating block buffer\n");
- 
- 	while(1) {
- 		struct cache_entry *entry = queue_get(to_inflate);
-@@ -2122,6 +2124,7 @@
-  		 */ 
- 		cache_block_ready(entry, res == -1);
- 	}
-+	free(tmp);
- }
- 
- 
diff --git a/srcpkgs/squashfs-tools/template b/srcpkgs/squashfs-tools/template
index 86cab25984e..28697ad93ad 100644
--- a/srcpkgs/squashfs-tools/template
+++ b/srcpkgs/squashfs-tools/template
@@ -1,20 +1,23 @@
 # Template file for 'squashfs-tools'
 pkgname=squashfs-tools
-version=4.3
-revision=6
+version=4.4
+revision=1
 wrksrc="squashfs${version}"
+build_wrksrc="squashfs-tools"
+build_style=gnu-makefile
 makedepends="zlib-devel lzo-devel liblzma-devel liblz4-devel"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://squashfs.sf.net/"
 short_desc="Tool to create and append to squashfs filesystems"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Duncaen <duncaen@voidlinux.org>"
 distfiles="${SOURCEFORGE_SITE}/squashfs/squashfs${version}.tar.gz"
-checksum=0d605512437b1eb800b4736791559295ee5f60177e102e4d4ccd0ee241a5f3f6
+checksum=a981b3f3f2054b5a2e658851a3c06a2460ad04a9a8a645e0afe063a63fdbb07e
 
 do_build() {
-	make -C ${pkgname} ${makejobs} XZ_SUPPORT=1 LZO_SUPPORT=1 LZMA_XZ_SUPPORT=1 LZ4_SUPPORT=1
+	make ${makejobs} XZ_SUPPORT=1 LZO_SUPPORT=1 LZMA_XZ_SUPPORT=1 LZ4_SUPPORT=1
 }
+
 do_install() {
-	vbin ${pkgname}/mksquashfs
-	vbin ${pkgname}/unsquashfs
+	vbin mksquashfs
+	vbin unsquashfs
 }
diff --git a/srcpkgs/stagit/patches/libgit2-0.28.patch b/srcpkgs/stagit/patches/libgit2-0.28.patch
deleted file mode 100644
index 84481bce0de..00000000000
--- a/srcpkgs/stagit/patches/libgit2-0.28.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/stagit-index.c b/stagit-index.c
-index e019793..6b25969 100644
---- stagit-index.c
-+++ stagit-index.c
-@@ -174,7 +174,7 @@ main(int argc, char *argv[])
- 
- 		if (git_repository_open_ext(&repo, repodir,
- 		    GIT_REPOSITORY_OPEN_NO_SEARCH, NULL)) {
--			e = giterr_last();
-+			e = git_error_last();
- 			fprintf(stderr, "%s: %s\n", argv[0], e->message);
- 			ret = 1;
- 			continue;
-diff --git a/stagit.c b/stagit.c
-index 093cdab..25be042 100644
---- stagit.c
-+++ stagit.c
-@@ -1101,7 +1101,7 @@ main(int argc, char *argv[])
- 
- 	if (git_repository_open_ext(&repo, repodir,
- 		GIT_REPOSITORY_OPEN_NO_SEARCH, NULL) < 0) {
--		e = giterr_last();
-+		e = git_error_last();
- 		fprintf(stderr, "%s: %s\n", argv[0], e->message);
- 		return 1;
- 	}
-
diff --git a/srcpkgs/stagit/template b/srcpkgs/stagit/template
index eab367ae840..c087227f26c 100644
--- a/srcpkgs/stagit/template
+++ b/srcpkgs/stagit/template
@@ -1,16 +1,16 @@
 # Template file for 'stagit'
 pkgname=stagit
-version=0.9
-revision=2
+version=0.9.2
+revision=1
 build_style=gnu-makefile
 make_install_args="MANPREFIX=/usr/share/man"
 makedepends="libgit2-devel"
 short_desc="Static git page generator"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="MIT"
-homepage="http://git.2f30.org/stagit"
-distfiles="http://dl.2f30.org/releases/${pkgname}-${version}.tar.gz"
-checksum=09e585c5908bee0208c9b2d457a716d2679d89ca7485da42ca8a06bd78bc2293
+homepage="https://codemadness.org/git/stagit/log.html"
+distfiles="https://codemadness.org/releases/stagit/${pkgname}-${version}.tar.gz"
+checksum=721cd7cfac479008e803eff5afd0c95ff9dbc640450afa5b844be82d8dfe0cba
 LDFLAGS="-lgit2"
 
 post_install() {
diff --git a/srcpkgs/starship/template b/srcpkgs/starship/template
new file mode 100644
index 00000000000..8f91dc73221
--- /dev/null
+++ b/srcpkgs/starship/template
@@ -0,0 +1,18 @@
+# Template file for 'starship'
+pkgname=starship
+version=0.24.0
+revision=1
+build_style=cargo
+build_helper="rust"
+hostmakedepends="pkg-config"
+makedepends="libgit2-devel"
+short_desc="Minimal, fast and customizable cross-shell prompt"
+maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"
+license="ISC"
+homepage="https://starship.rs"
+distfiles="https://github.com/starship/starship/archive/v${version}.tar.gz"
+checksum=f8cd71d7cf9b9a1ff57acd81f22960994bdaea58cfae813bd8e42146de431c0b
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/stow/template b/srcpkgs/stow/template
index 0f4b383f36c..4fc87c43888 100644
--- a/srcpkgs/stow/template
+++ b/srcpkgs/stow/template
@@ -1,7 +1,7 @@
 # Template file for 'stow'
 pkgname=stow
-version=2.2.2
-revision=2
+version=2.3.1
+revision=1
 archs=noarch
 build_style=gnu-configure
 make_check_target="test"
@@ -11,7 +11,7 @@ depends="${makedepends}"
 checkdepends="perl-Test-Output perl-IO-stringy"
 short_desc="GNU Stow is a symlink manager"
 maintainer="Martin Harrigan <martinharrigan@gmail.com>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/stow/"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=e2f77649301b215b9adbc2f074523bedebad366812690b9dc94457af5cf273df
+checksum=09d5d99671b78537fd9b2c0b39a5e9761a7a0e979f6fdb7eabfa58ee45f03d4b
diff --git a/srcpkgs/strace/template b/srcpkgs/strace/template
index 0962a81cdd1..618966e28e4 100644
--- a/srcpkgs/strace/template
+++ b/srcpkgs/strace/template
@@ -1,16 +1,16 @@
 # Template file for 'strace'
 pkgname=strace
-version=5.2
+version=5.3
 revision=1
 build_style=gnu-configure
 configure_args="--with-libunwind"
 makedepends="libunwind-devel"
 short_desc="System Call Tracer"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="LGPL-2.1-or-later"
 homepage="https://strace.io/"
 distfiles="https://github.com/strace/strace/releases/download/v${version}/strace-${version}.tar.xz"
-checksum=d513bc085609a9afd64faf2ce71deb95b96faf46cd7bc86048bc655e4e4c24d2
+checksum=6c131198749656401fe3efd6b4b16a07ea867e8f530867ceae8930bbc937a047
 
 case "$XBPS_TARGET_MACHINE" in
 	aarch64-musl) configure_args=; makedepends= ;;
@@ -27,6 +27,3 @@ pre_configure() {
 		*-musl) export CFLAGS+=" -Dsigcontext_struct=sigcontext";;
 	esac
 }
-post_install() {
-	vlicense COPYING
-}
diff --git a/srcpkgs/streamlink/template b/srcpkgs/streamlink/template
index cb680ac51ed..abcdc12c4ac 100644
--- a/srcpkgs/streamlink/template
+++ b/srcpkgs/streamlink/template
@@ -1,6 +1,6 @@
 # Template file for 'streamlink'
 pkgname=streamlink
-version=1.1.1
+version=1.2.0
 revision=1
 archs=noarch
 build_style=python3-module
@@ -16,7 +16,7 @@ license="BSD-2-Clause"
 homepage="https://streamlink.github.io/"
 changelog="https://raw.githubusercontent.com/streamlink/streamlink/master/CHANGELOG.md"
 distfiles="https://github.com/streamlink/streamlink/releases/download/${version}/streamlink-${version}.tar.gz"
-checksum=496c81804bbe534b47f6cf4d77aa6fae95347ebaab495277f9d2526543cbafa6
+checksum=7aa6e02d914e29fe2e344afd185760b11e46a6a31f9d99f7f9dc87b808812992
 
 export STREAMLINK_USE_PYCOUNTRY=1
 
diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template
index cef6d48f232..6cd7c898b54 100644
--- a/srcpkgs/stremio-shell/template
+++ b/srcpkgs/stremio-shell/template
@@ -1,7 +1,7 @@
 # Template file for 'stremio-shell'
 pkgname=stremio-shell
-version=4.4.25
-revision=2
+version=4.4.77
+revision=1
 _singleapplication_hash=6fbf6bffc848821d41a09ccd9fc0ede83bbbcdce
 build_style=qmake
 hostmakedepends="qt5-host-tools qt5-qmake"
@@ -10,14 +10,14 @@ makedepends="mpv-devel qt5-webview-devel qt5-webengine-devel
  qt5-quickcontrols2-devel qt5-quickcontrols chromaprint-devel"
 depends="qt5-quickcontrols qt5-quickcontrols2 virtual?nodejs-runtime"
 short_desc="Hub for video content aggregation"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.stremio.com"
 distfiles="https://github.com/Stremio/stremio-shell/archive/${version}.tar.gz
  https://github.com/itay-grudev/SingleApplication/archive/${_singleapplication_hash}.tar.gz
  https://dl.strem.io/four/v4.4.10/server.js
  https://dl.strem.io/four/v4.4.10/stremio.asar"
-checksum="f2f4f0432a9c84e6f4fc2039ee27cb3635ea4a9341f3f6c823fa7dc96a0a2f6b
+checksum="9e6643f41b454527f69317f03394d9f1cca31215c14d702edfec3a76f2519339
  11840ed3dc80a909980908e310dc370bca2f7f61c45101fdea00187f620a1ff1
  52e453dc24e291b863582b250f5633d45d9634cafe24ac68165854b17b31114e
  8abe09aa0c577b9be05a7343438f9a37718689f74b9d7a124590f5ba3bb2764f"
diff --git a/srcpkgs/stress-ng/template b/srcpkgs/stress-ng/template
index 62427dba3a5..6d987ee9341 100644
--- a/srcpkgs/stress-ng/template
+++ b/srcpkgs/stress-ng/template
@@ -1,6 +1,6 @@
 # Template file for 'stress-ng'
 pkgname=stress-ng
-version=0.10.01
+version=0.10.07
 revision=1
 build_style=gnu-makefile
 make_use_env=1
@@ -9,4 +9,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://kernel.ubuntu.com/~cking/stress-ng/"
 distfiles="http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${pkgname}-${version}.tar.xz"
-checksum=4a74f2a60b248dc7ff20e950facb4a7d010f46bf8c0cfcbed6fecf7c4daa8f3d
+checksum=85ae86587f605225cc736e1ddba6cc5fd129dfbba0f7d94df755e2e6ac5230e6
diff --git a/srcpkgs/strongswan/template b/srcpkgs/strongswan/template
index 542a3ff80bc..22b5eece3ce 100644
--- a/srcpkgs/strongswan/template
+++ b/srcpkgs/strongswan/template
@@ -1,6 +1,6 @@
 # Template file for 'strongswan'
 pkgname=strongswan
-version=5.8.0
+version=5.8.1
 revision=1
 build_style=gnu-configure
 # tpm support waits on libtss2
@@ -18,7 +18,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.strongswan.org/"
 changelog="https://wiki.strongswan.org/projects/strongswan/wiki/Changelog"
 distfiles="https://download.strongswan.org/${pkgname}-${version}.tar.bz2"
-checksum=15b1e10c7dd6253ab5d791fe9b9cb84624e24c118aecd9b90251b4e60daa0933
+checksum=d9af70acea5c054952ad1584916c1bf231b064eb6c8a9791dcb6ae90a769990c
 make_dirs="/etc/ipsec.d/ 0755 root root
  /etc/ipsec.d/aacerts 0755 root root
  /etc/ipsec.d/acerts 0755 root root
diff --git a/srcpkgs/sublime-merge/template b/srcpkgs/sublime-merge/template
index f82965570bc..363c82a52b2 100644
--- a/srcpkgs/sublime-merge/template
+++ b/srcpkgs/sublime-merge/template
@@ -1,6 +1,6 @@
 # Template file for 'sublime-merge'
 pkgname=sublime-merge
-version=1107
+version=1119
 revision=1
 archs="x86_64"
 wrksrc=sublime_merge
@@ -10,7 +10,7 @@ maintainer="Adelmo Junior <noblehelm@gmail.com>"
 license="Proprietary"
 homepage="https://www.sublimemerge.com"
 distfiles="https://download.sublimetext.com/sublime_merge_build_${version}_x64.tar.xz"
-checksum=70edbb16529d638ea41a694dbc5b1408c76fcc3a7d663ef0e48b4e89e1f19c71
+checksum=64b06320c0300923ade0901493cfd78e7f28598324f99d4c3609b3c85c5f1cea
 nopie=yes
 repository=nonfree
 
diff --git a/srcpkgs/sublime-text3/template b/srcpkgs/sublime-text3/template
index 778605a8510..e87de887ad0 100644
--- a/srcpkgs/sublime-text3/template
+++ b/srcpkgs/sublime-text3/template
@@ -1,6 +1,6 @@
 # Template file for 'sublime-text3'
 pkgname=sublime-text3
-version=3207
+version=3211
 revision=1
 depends="libpng gtk+ hicolor-icon-theme desktop-file-utils"
 short_desc="Sophisticated text editor for code, markup and prose"
@@ -10,10 +10,10 @@ homepage="http://www.sublimetext.com/3dev"
 
 if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
 	distfiles="https://download.sublimetext.com/sublime_text_3_build_${version}_x64.tar.bz2"
-	checksum=acb64f1de024a0f004888096afa101051e48d96c7a3e7fe96e11312d524938c4
+	checksum=0b3c8ca5e6df376c3c24a4b9ac2e3b391333f73b229bc6e87d0b4a5f636d74ee
 else
 	distfiles="https://download.sublimetext.com/sublime_text_3_build_${version}_x32.tar.bz2"
-	checksum=743dbb313fe8b5754c64972c59a6162e0519a9c375ffeedaf5f7558f15e1e212
+	checksum=480609962bbbd12128b5332c7831372b8851c13e160512730d1b0a6a835a3071
 fi
 
 repository="nonfree"
diff --git a/srcpkgs/sudo/template b/srcpkgs/sudo/template
index 9047ac6167a..7119eba3208 100644
--- a/srcpkgs/sudo/template
+++ b/srcpkgs/sudo/template
@@ -1,6 +1,6 @@
 # Template file for 'sudo'
 pkgname=sudo
-version=1.8.27
+version=1.8.28p1
 revision=1
 build_style=gnu-configure
 configure_args="--with-ignore-dot --with-insults=disabled --with-all-insults --with-env-editor
@@ -15,7 +15,7 @@ license="ISC"
 homepage="https://www.sudo.ws/"
 changelog="https://www.sudo.ws/repos/sudo/raw-file/tip/NEWS"
 distfiles="https://www.sudo.ws/dist/sudo-${version}.tar.gz"
-checksum=7beb68b94471ef56d8a1036dbcdc09a7b58a949a68ffce48b83f837dd33e2ec0
+checksum=23ba5a84af31e3b5ded58d4be6d3f6939a495a55561fba92c6941b79a6e8b027
 conf_files="/etc/pam.d/sudo /etc/sudoers"
 lib32disabled=yes
 
diff --git a/srcpkgs/supercollider/patches/bbcd068659ced596402dedc78f49fabfab6470bd.patch b/srcpkgs/supercollider/patches/bbcd068659ced596402dedc78f49fabfab6470bd.patch
deleted file mode 100644
index 319b8da6a53..00000000000
--- a/srcpkgs/supercollider/patches/bbcd068659ced596402dedc78f49fabfab6470bd.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From bbcd068659ced596402dedc78f49fabfab6470bd Mon Sep 17 00:00:00 2001
-From: David Runge <dave@sleepmap.de>
-Date: Sat, 29 Sep 2018 17:14:18 +0200
-Subject: [PATCH] server/supernova/utilities/time_tag.hpp: Adding static_cast
- to long for time_duration offset in microseconds to satisfy boost >= 1.67.0.
-
----
- server/supernova/utilities/time_tag.hpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git server/supernova/utilities/time_tag.hpp server/supernova/utilities/time_tag.hpp
-index 33b1effd80..3d0f21dba9 100644
---- server/supernova/utilities/time_tag.hpp
-+++ server/supernova/utilities/time_tag.hpp
-@@ -229,7 +229,7 @@ class time_tag
- #ifdef BOOST_DATE_TIME_POSIX_TIME_STD_CONFIG
-         time_duration offset = seconds(get_secs() - ntp_offset) + nanoseconds(get_nanoseconds());
- #else
--        time_duration offset = seconds(get_secs() - ntp_offset) + microseconds(get_nanoseconds()/1000);
-+        time_duration offset = seconds(get_secs() - ntp_offset) + microseconds(static_cast<long>(get_nanoseconds()/1000));
- #endif
-         return ptime(base, offset);
-     }
diff --git a/srcpkgs/supercollider/template b/srcpkgs/supercollider/template
index 985c52947ce..2101a22a160 100644
--- a/srcpkgs/supercollider/template
+++ b/srcpkgs/supercollider/template
@@ -1,6 +1,6 @@
 # Template file for 'supercollider'
 pkgname=supercollider
-version=3.10.2
+version=3.10.3
 revision=1
 wrksrc=SuperCollider-Source
 build_style=cmake
@@ -16,7 +16,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/supercollider/supercollider"
 distfiles="${homepage}/releases/download/Version-${version}/SuperCollider-${version}-Source-linux.tar.bz2"
-checksum=389a9b3ecad7907c31f97566a48a8b2c5c53b73a8ad8004f81a5e9cb9a0fdf7a
+checksum=e1ffc4720590aa67bdd435cd1345b78cb709fdf5c4cbc948cbb3c5af1637356b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel"
@@ -28,6 +28,7 @@ esac
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*);;
+	arm*) broken="depends on qt5-webengine";;
 	*) configure_args+=" -DSSE=OFF -DSSE2=OFF";;
 esac
 
diff --git a/srcpkgs/supermin/template b/srcpkgs/supermin/template
index 07fe80f46b3..126ee0d8ccd 100644
--- a/srcpkgs/supermin/template
+++ b/srcpkgs/supermin/template
@@ -1,7 +1,7 @@
 # Template file for 'supermin'
 pkgname=supermin
 version=5.1.20
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="ocaml ocaml-findlib pkg-config e2fsprogs cpio perl"
 makedepends="e2fsprogs-devel"
diff --git a/srcpkgs/svctl/template b/srcpkgs/svctl/template
index 006c398759f..b6dbc562b06 100644
--- a/srcpkgs/svctl/template
+++ b/srcpkgs/svctl/template
@@ -7,7 +7,7 @@ go_import_path="github.com/KenjiTakahashi/svctl"
 go_ldflags="-X main.Version=v${version}"
 short_desc="Interactive controller for runit"
 hostmakedepends="git"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/KenjiTakahashi/svctl"
 distfiles="https://github.com/KenjiTakahashi/svctl/archive/${version}.tar.gz"
diff --git a/srcpkgs/svgpart/template b/srcpkgs/svgpart/template
index 37aacd8ab9b..2142771093e 100644
--- a/srcpkgs/svgpart/template
+++ b/srcpkgs/svgpart/template
@@ -1,6 +1,6 @@
 # Template file for 'svgpart'
 pkgname=svgpart
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-host-tools qt5-qmake"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/svgpart.git"
 distfiles="${KDE_SITE}/applications/${version}/src/svgpart-${version}.tar.xz"
-checksum=7e1f4b3f8807e996b2acb496971bd7ebcb1e456ac090e269e42d15fce629858d
+checksum=6c6510b604bba3aebbeca136ec9534c416bc0ba55125227bdd0af2a86052855c
diff --git a/srcpkgs/swaks/template b/srcpkgs/swaks/template
index 1d706f35494..e9394bf0b20 100644
--- a/srcpkgs/swaks/template
+++ b/srcpkgs/swaks/template
@@ -1,6 +1,6 @@
 # Template file for 'swaks'
 pkgname=swaks
-version=20181104.0
+version=20190914.0
 revision=1
 archs=noarch
 hostmakedepends="perl"
@@ -10,7 +10,7 @@ maintainer="allan <mail@may.mooo.com>"
 license="GPL-2.0-only"
 homepage="http://www.jetmore.org/john/code/swaks/"
 distfiles="http://www.jetmore.org/john/code/${pkgname}/files/${pkgname}-${version}.tar.gz"
-checksum=023f7f8818ebcd638618327809cf1939c5ffcaf6c3d2572ef56179d68f683e58
+checksum=5733a51a5c3f74f62274c17dc825f177c22ed52703c97c3b23a5354d7ec15c89
 
 do_install() {
 	vbin swaks
diff --git a/srcpkgs/sway/template b/srcpkgs/sway/template
index 574ff5f90cd..a650b8c559c 100644
--- a/srcpkgs/sway/template
+++ b/srcpkgs/sway/template
@@ -1,6 +1,6 @@
 # Template file for 'sway'
 pkgname=sway
-version=1.1.1
+version=1.2
 revision=1
 build_style=meson
 conf_files="/etc/sway/config"
@@ -13,11 +13,15 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://swaywm.org"
 distfiles="https://github.com/swaywm/${pkgname}/archive/${version}.tar.gz"
-checksum=740bf97556c54da83937a255113d715aaa05e05b44d61fbe85e01b53ff1f9922
+checksum=9f79382577ee132111c290b4d1a1a3e114ef485595c30cf5f181a11575bda846
 
 build_options="elogind"
 desc_option_elogind="Uses elogind instead of setuid for privilege escalation"
 
+post_patch() {
+	vsed -e 's/werror=true/werror=false/g' -i meson.build
+}
+
 post_install() {
 	vlicense LICENSE
 	if [ -z "$build_option_elogind" ]; then
diff --git a/srcpkgs/swell-foop/patches/pivot_point.patch b/srcpkgs/swell-foop/patches/pivot_point.patch
new file mode 100644
index 00000000000..9ff27d5f40c
--- /dev/null
+++ b/srcpkgs/swell-foop/patches/pivot_point.patch
@@ -0,0 +1,32 @@
+--- src/game-view.vala	2019-09-09 21:09:07.000000000 +0200
++++ src/game-view.vala	2019-10-13 20:40:46.515571474 +0200
+@@ -398,8 +398,7 @@
+ 
+         set_content_gravity (Clutter.ContentGravity.CENTER);
+ 
+-        pivot_point.x = 0.5f;
+-        pivot_point.y = 0.5f;
++	set_pivot_point (0.5f, 0.5f);
+     }
+ 
+     /* Destroy the tile */
+@@ -438,8 +437,7 @@
+ 
+         set_content_gravity (Clutter.ContentGravity.CENTER);
+ 
+-        pivot_point.x = 0.5f;
+-        pivot_point.y = 0.5f;
++	set_pivot_point (0.5f, 0.5f);
+     }
+ }
+ 
+@@ -460,8 +458,7 @@
+ 
+         add_child (label);
+ 
+-        pivot_point.x = 0.5f;
+-        pivot_point.y = 0.5f;
++	set_pivot_point (0.5f, 0.5f);
+ 
+         this.scene_width = (float) width;
+         this.scene_height = (float) height;
diff --git a/srcpkgs/swell-foop/template b/srcpkgs/swell-foop/template
index d6f96dc37e3..1ff5ae68311 100644
--- a/srcpkgs/swell-foop/template
+++ b/srcpkgs/swell-foop/template
@@ -1,7 +1,7 @@
 # Template file for 'swell-foop'
 pkgname=swell-foop
-version=3.32.0
-revision=1
+version=3.34.0
+revision=2
 build_style=meson
 hostmakedepends="glib-devel itstool pkg-config vala"
 makedepends="clutter-gtk-devel"
@@ -10,4 +10,4 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Swell%20Foop"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=91ddc86b6d003e5755004004c74584531b1328cb604883b0deeb7b1ed888ec4a
+checksum=65a713e7702595a3f42a45dd2b3ab7ce6407cd1660427e564e5a5826c3a26ced
diff --git a/srcpkgs/sx/template b/srcpkgs/sx/template
index e95dc88cae7..d39555258a0 100644
--- a/srcpkgs/sx/template
+++ b/srcpkgs/sx/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-makefile
 depends="xorg-server xauth"
 short_desc="Posix script to start an xserver instance"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/Earnestly/sx"
 distfiles="https://github.com/Earnestly/sx/archive/${version}.tar.gz"
diff --git a/srcpkgs/synapse/patches/bump-python-dependencies.patch b/srcpkgs/synapse/patches/bump-python-dependencies.patch
deleted file mode 100644
index 06321a9e8d4..00000000000
--- a/srcpkgs/synapse/patches/bump-python-dependencies.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From c1a7db468d4dbb3958f5b480fcde760566962ba4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Johannes=20L=C3=B6thberg?= <johannes@kyriasis.com>
-Date: Tue, 8 Jan 2019 20:09:50 +0100
-Subject: [PATCH] Bump python_dependencies
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
----
- synapse/python_dependencies.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py
-index f71e21ff4..b49873781 100644
---- synapse/python_dependencies.py
-+++ synapse/python_dependencies.py
-@@ -62,7 +62,7 @@ REQUIREMENTS = [
-     "six>=1.10",
-     # prometheus_client 0.4.0 changed the format of counter metrics
-     # (cf https://github.com/matrix-org/synapse/issues/4001)
--    "prometheus_client>=0.0.18,<0.4.0",
-+    "prometheus_client>=0.0.18,<0.7.0",
- 
-     # we use attr.s(slots), which arrived in 16.0.0
-     # Twisted 18.7.0 requires attrs>=17.4.0
--- 
-2.21.0
-
-
diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index 616dae0c4ee..daae80e5792 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,6 +1,6 @@
 # Template file for 'synapse'
 pkgname=synapse
-version=0.99.3
+version=1.3.1
 revision=1
 archs=noarch
 build_style=python3-module
@@ -14,11 +14,11 @@ depends="python3-jsonschema python3-frozendict python3-canonicaljson
  python3-Jinja2 python3-psycopg2 python3-lxml python3-saml2 python3-treq
  python3-txacme python3-macaroons python3-sortedcontainers"
 short_desc="Matrix reference homeserver"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Pete <pete@port22.co.uk>"
 license="Apache-2.0"
 homepage="https://github.com/matrix-org/synapse"
 distfiles="https://github.com/matrix-org/synapse/archive/v${version}.tar.gz"
-checksum=60a2b4caaed3e23a8fe9b43406dbee695d60271650f332cf3df3fce675a68274
+checksum=7fd0a15b7b5970e5afd2faad296c95f0707fc51865861dda45e983ace151cee0
 
 conf_files="/etc/synapse/log_config.yaml"
 
diff --git a/srcpkgs/syncthing-gtk/template b/srcpkgs/syncthing-gtk/template
index 13c99b942cc..38ff8064cbf 100644
--- a/srcpkgs/syncthing-gtk/template
+++ b/srcpkgs/syncthing-gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'syncthing-gtk'
 pkgname=syncthing-gtk
 reverts="0.14.36_1"
-version=0.9.4.3
+version=0.9.4.4
 revision=1
 archs=noarch
 build_style=python2-module
@@ -9,9 +9,9 @@ hostmakedepends="python-setuptools"
 depends="syncthing python-dateutil libnotify librsvg python-bcrypt
  python-cairo gtk+3 python-gobject"
 short_desc="GTK3 and python based GUI for Syncthing"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Frank Steinborn <steinex@nognu.de>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/syncthing/syncthing-gtk"
 distfiles="https://github.com/syncthing/syncthing-gtk/archive/v${version}.tar.gz"
-checksum=058e13a8dd65c0024c92074dc5445b27278d71379d1843b7cbc84ee5c87afa12
+checksum=896ddaaba4ad0b8f090c5a381a28b3da759932314562cdd50ca288543b03ddcc
 nocross="gobject-introspection"
diff --git a/srcpkgs/syncthing-inotify/template b/srcpkgs/syncthing-inotify/template
index ed4c71c2f65..061c91aba27 100644
--- a/srcpkgs/syncthing-inotify/template
+++ b/srcpkgs/syncthing-inotify/template
@@ -6,7 +6,7 @@ build_style=go
 go_import_path="github.com/syncthing/syncthing-inotify"
 go_ldflags="-X main.Version=v${version}"
 short_desc="Inotify file watcher for Syncthing"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPLv2"
 homepage="https://github.com/syncthing/syncthing-inotify"
 distfiles="https://github.com/syncthing/syncthing-inotify/archive/v${version}.tar.gz"
diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index 1ee1faf8e2d..f7291fe36be 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,6 +1,6 @@
 # Template file for 'syncthing'
 pkgname=syncthing
-version=1.2.1
+version=1.3.0
 revision=1
 build_style=go
 go_import_path="github.com/syncthing/syncthing"
@@ -14,13 +14,14 @@ license="MPL-2.0"
 changelog="https://github.com/syncthing/syncthing/releases"
 homepage="http://syncthing.net/"
 distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz"
-checksum=4274126059f854fa166d4610d6797116ee56be8b804abc1f4c6b02f650b78f52
+checksum=c6bb52c108a30a610afcc1023949674ca66f24127cbd569ab64789f0071d72e7
 
 pre_build() {
 	GOARCH= go run script/genassets.go gui > ./lib/auto/gui.files.go
 }
 
 post_install() {
+	vinstall etc/firewall-ufw/syncthing 644 etc/ufw/applications.d
 	vlicense LICENSE
 	vdoc README.md
 }
diff --git a/srcpkgs/syndication/template b/srcpkgs/syndication/template
index b4c86e93ea0..883b6bd3fe6 100644
--- a/srcpkgs/syndication/template
+++ b/srcpkgs/syndication/template
@@ -1,7 +1,7 @@
 # Template file for 'syndication'
 pkgname=syndication
 reverts="18.08.0_1 18.08.0_2 18.08.1_1"
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/syndication-${version}.tar.xz"
-checksum=2803b2960dd23492ad002e0f23563c9f06500ddc144dd0be2e3e0ef2f6c1f576
+checksum=e609c7f36559d6081d4ffe5c3cf995d96c620f18550f14f274d4c717423713b4
 
 syndication-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/syntax-highlighting/template b/srcpkgs/syntax-highlighting/template
index d3ba5310378..1b0354af681 100644
--- a/srcpkgs/syntax-highlighting/template
+++ b/srcpkgs/syntax-highlighting/template
@@ -1,6 +1,6 @@
 # Template file for 'syntax-highlighting'
 pkgname=syntax-highlighting
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/frameworks/syntax-highlighting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=475392c03534d7b5301ff2e02461444e463ad4def985da81ad4b315660416721
+checksum=9a29d8311ab41d74edcea71795658193f5221517870ff5e8ee4b07cc38a9c023
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools syntax-highlighting qt5-devel qt5-tools-devel"
diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template
index 53afafc1e9c..636d3e54525 100644
--- a/srcpkgs/sysdig/template
+++ b/srcpkgs/sysdig/template
@@ -1,7 +1,7 @@
 # Template file for 'sysdig'
 pkgname=sysdig
-version=0.26.2
-revision=1
+version=0.26.4
+revision=2
 archs="i686 x86_64 ppc64le"
 build_style=cmake
 configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
@@ -19,17 +19,11 @@ license="Apache-2.0, MIT, GPL-2.0-only"
 homepage="http://www.sysdig.org/"
 changelog="https://github.com/draios/sysdig/releases"
 distfiles="https://github.com/draios/${pkgname}/archive/${version}.tar.gz"
-checksum=6f4f5b7b187c3774b6c374c1728b3f905ac18a945bde15151dcfb24c79abb441
+checksum=7c15ee25abf6cca850eaf6f4e42e25a1d9ad2b775ae794028f94afbd1ce9d271
 disable_parallel_build=yes
 dkms_modules="sysdig ${version}"
 nocross=yes
 
-case "$XBPS_TARGET_MACHINE" in
-        i686) 
-	broken="https://build.voidlinux.org/builders/i686_builder/builds/19262/steps/shell_3/logs/stdio"
-	;;
-esac
-
 post_extract() {
 	sed -i 's,"${DIR_ETC}/bash_completion.d",share/bash-completion/completions,g' scripts/CMakeLists.txt
 	sed -i '1i#include <sys/select.h>' userspace/libsinsp/mesos_collector.h
diff --git a/srcpkgs/sysexxer-ng/template b/srcpkgs/sysexxer-ng/template
new file mode 100644
index 00000000000..3b7cea47138
--- /dev/null
+++ b/srcpkgs/sysexxer-ng/template
@@ -0,0 +1,17 @@
+# Template file for 'sysexxer-ng'
+pkgname=sysexxer-ng
+version=1.0
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config"
+makedepends="boost-devel fltk-devel jack-devel libev-devel ncurses-devel rtmidi-devel"
+short_desc="Universal tool to exchange MIDI system-exclusive data"
+maintainer="bra1nwave <brainwave@openmailbox.org>"
+license="BSL-1.0"
+homepage="https://github.com/linuxmao-org/sysexxer-ng"
+distfiles="${homepage}/releases/download/v${version}/sysexxer-ng-${version}.tar.gz"
+checksum=66e2eb66b7ab34b8287bba3230009a311b7db1870c47911049666c523fced5a9
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/sysprof/template b/srcpkgs/sysprof/template
index 1e279c22d54..8703271a34d 100644
--- a/srcpkgs/sysprof/template
+++ b/srcpkgs/sysprof/template
@@ -1,17 +1,17 @@
 # Template file for 'sysprof'
 pkgname=sysprof
-version=3.32.0
-revision=2
+version=3.34.1
+revision=1
 build_style=meson
 configure_args="-Denable_gtk=true -Dsystemdunitdir=deleteme"
 hostmakedepends="pkg-config itstool glib-devel"
-makedepends="gtk+3-devel polkit-devel glib-devel elogind-devel"
+makedepends="gtk+3-devel libdazzle-devel polkit-devel glib-devel elogind-devel"
 short_desc="System-wide profiler for Linux"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
 homepage="http://sysprof.com/"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fc22a69e468701c5ec9036e960c6273afa1ed6a89df1f889fed49417add5554d
+checksum=844bbb8d8b65071b3bca96f8e921319ceef81f2d2c51fcc9da63a4b355c893d0
 
 # for ITS rules
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/sysstat/template b/srcpkgs/sysstat/template
index 8cced9ea327..b7d06501460 100644
--- a/srcpkgs/sysstat/template
+++ b/srcpkgs/sysstat/template
@@ -1,11 +1,10 @@
 # Template file for 'sysstat'
 pkgname=sysstat
-version=12.0.6
+version=12.1.7
 revision=1
 build_style=gnu-configure
 configure_args="--enable-copy-only --disable-file-attr
  --with-systemdsystemunitdir= --enable-install-cron"
-make_dirs="/var/log/sa 0755 root root"
 conf_files="/etc/default/sysstat /etc/default/sysstat.ioconf"
 hostmakedepends="pkg-config"
 depends="lm_sensors"
@@ -14,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://pagesperso-orange.fr/sebastien.godard/"
 distfiles="http://pagesperso-orange.fr/sebastien.godard/${pkgname}-${version}.tar.xz"
-checksum=dd141d82a0b2f6c6924676524b0ad8ae60a6410461869f959dc484e8c5096912
+checksum=e711110fdde0885d5edb54d38feb134e20de3e50b8be1f05922fd03c09f118c4
 
 post_extract() {
 	sed -i 's/lib64/lib/' configure
diff --git a/srcpkgs/systemsettings/template b/srcpkgs/systemsettings/template
index c3c6805eb26..a7f2c5633e9 100644
--- a/srcpkgs/systemsettings/template
+++ b/srcpkgs/systemsettings/template
@@ -1,6 +1,6 @@
 # Template file for 'systemsettings'
 pkgname=systemsettings
-version=5.16.4
+version=5.17.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later, GFDL-1.2"
 homepage="https://projects.kde.org/projects/plasma/systemsettings"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=73b78c3c5177aa3ba0ffe970a83cb8bea1ba8ac54420a6c8379d6e86cabda31e
+checksum=7b3d93bd3cd4c33b878aabff4bd9c8134ca7395a0290e59260464cf5d69f17f3
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" python qt5-qmake qt5-host-tools kconfig
diff --git a/srcpkgs/systemtap/template b/srcpkgs/systemtap/template
index 7a093786645..95069a7b977 100644
--- a/srcpkgs/systemtap/template
+++ b/srcpkgs/systemtap/template
@@ -1,6 +1,6 @@
 # Template file for 'systemtap'
 pkgname=systemtap
-version=4.0
+version=4.1
 revision=1
 archs="i686 x86_64 armv6l armv7l aarch64 ppc64le"
 build_style=gnu-configure
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://sourceware.org/systemtap/"
 distfiles="https://sourceware.org/systemtap/ftp/releases/systemtap-${version}.tar.gz"
-checksum=008cc22e8da8f7d16ce3bcc10d36fdd2024b79489c4da3d983e589555ca7c8d5
+checksum=8efa1ee2b34f1c6b2f33a25313287d59c8ed1b00265e900aea874da8baca1e1d
 
 systemtap-devel_package() {
 	depends="systemtap-${version}_${revision}"
diff --git a/srcpkgs/tab/template b/srcpkgs/tab/template
index 5329594a9d5..2044ed808f6 100644
--- a/srcpkgs/tab/template
+++ b/srcpkgs/tab/template
@@ -1,14 +1,14 @@
 # Template file for 'tab'
 pkgname=tab
-version=7.1
+version=7.2
 revision=1
-wrksrc="tkatchev-tab-0b0349843e91"
+wrksrc="tkatchev-tab-f2e160ebddf8"
 short_desc="Shell language for text/number manipulation"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSL-1.0"
 homepage="http://tkatchev.bitbucket.io/tab/"
 distfiles="https://bitbucket.org/tkatchev/${pkgname}/get/${version}.tar.bz2"
-checksum=4a9071f180927fa861c5b4914d56dd84c0008ec755082628da834ba679185932
+checksum=446703528a7e51601371240a8fb74665aa98b02b2c89034ed61705bb3ff488b4
 
 do_build() {
 	${CXX} ${CXXFLAGS} -std=c++11 -Wall -Iaxe *.cc -o tab ${LDFLAGS} -pthread -lm
diff --git a/srcpkgs/taisei/template b/srcpkgs/taisei/template
index 83e79f58c58..8919e75a452 100644
--- a/srcpkgs/taisei/template
+++ b/srcpkgs/taisei/template
@@ -1,18 +1,22 @@
 # Template file for 'taisei'
 pkgname=taisei
-version=1.3
+version=1.3.1
 revision=1
 wrksrc="taisei-v${version}"
 build_style=meson
 hostmakedepends="pkg-config python3-docutils"
-makedepends="SDL2_mixer-devel freetype-devel libwebp-devel libzip-devel"
+makedepends="SDL2_mixer-devel freetype-devel libwebp-devel libzip-devel opusfile-devel"
 depends="${pkgname}-data"
 short_desc="Free and open-source Touhou Project clone and fangame"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
-license="GPL-3.0-or-later"
+license="MIT"
 homepage="https://taisei-project.org"
 distfiles="https://github.com/taisei-project/taisei/releases/download/v${version}/taisei-v${version}.tar.xz"
-checksum=4d6ede1e8a512eedec76cc9105022b0f5a361d23841ec1607d06a22c170b843a
+checksum=86583a3a710093e63014a5ae6b68251a069cb25ada06c6f8d734f85f31adc985
+
+post_install() {
+	vlicense COPYING
+}
 
 taisei-data_package() {
 	short_desc+=" - data files"
diff --git a/srcpkgs/tarpaulin/template b/srcpkgs/tarpaulin/template
new file mode 100644
index 00000000000..d9791af1506
--- /dev/null
+++ b/srcpkgs/tarpaulin/template
@@ -0,0 +1,19 @@
+# Template file for 'tarpaulin'
+pkgname=tarpaulin
+version=0.9.0
+revision=1
+archs="x86_64*"
+build_style=cargo
+hostmakedepends="pkg-config cmake"
+makedepends="libressl-devel zlib-devel"
+short_desc="Code coverage tool for Rust/Cargo projects"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="MIT, Apache-2.0"
+homepage="https://github.com/xd009642/tarpaulin"
+distfiles="https://github.com/xd009642/tarpaulin/archive/${version}.tar.gz"
+checksum=e1812627338c3e4c272f280105f6d250ecc2d389b775bf6f24de13940758343b
+
+post_install() {
+	vlicense LICENSE-MIT
+	vlicense LICENSE-APACHE
+}
diff --git a/srcpkgs/tau/template b/srcpkgs/tau/template
new file mode 100644
index 00000000000..f93b3975ff9
--- /dev/null
+++ b/srcpkgs/tau/template
@@ -0,0 +1,29 @@
+# Template file for 'tau'
+pkgname=tau
+version=0.9.3
+revision=1
+build_style=meson
+build_helper=rust
+hostmakedepends="cargo pkg-config rust glib-devel"
+makedepends="gtk+3-devel rust-std"
+checkdepends="appstream-glib desktop-file-utils"
+short_desc="GTK frontend for the Xi text editor, written in Rust"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="MIT"
+homepage="https://gitlab.gnome.org/World/Tau"
+distfiles="https://gitlab.gnome.org/World/Tau/uploads/375ce054c0bc98e0c1a3e95fdcd4e46c/tau-${version}.tar.xz"
+checksum=e58b400e86fb7dd1a6610427732a6a360355e8f3b03712d518fb5438b6daae0b
+
+case $XBPS_MACHINE in
+	*-musl) broken="crashes rustc" ;;
+esac
+
+post_install() {
+	vlicense LICENSE
+}
+
+gxi_package() {
+	depends="tau>=${version}_${revision}"
+	build_style=meta
+	short_desc+=" (transitional dummy package)"
+}
diff --git a/srcpkgs/tbb/template b/srcpkgs/tbb/template
index 1cfffa8ef02..8705875175f 100644
--- a/srcpkgs/tbb/template
+++ b/srcpkgs/tbb/template
@@ -1,8 +1,8 @@
 # Template file for 'tbb'
 pkgname=tbb
-version=2019.U8
+version=2019.U9
 revision=1
-archs="i686* x86_64* armv7l* aarch64* ppc64le* ppc64"
+archs="i686* x86_64* armv7l* aarch64* ppc*"
 # version rewrite: 2017_U7 (upstream) => 2017.7 (xbps)
 _ver=${version/./_}
 wrksrc="${pkgname}-${_ver}"
@@ -13,7 +13,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://www.threadingbuildingblocks.org"
 distfiles="https://github.com/intel/tbb/archive/${_ver}.tar.gz"
-checksum=7b1fd8caea14be72ae4175896510bf99c809cd7031306a1917565e6de7382fba
+checksum=15652f5328cf00c576f065e5cd3eaf3317422fe82afb67a9bcec0dc065bd2abe
 
 case "$XBPS_TARGET_MACHINE" in
 	armv7l*)
diff --git a/srcpkgs/tcpdump/template b/srcpkgs/tcpdump/template
index f0743609837..0b4b94eea61 100644
--- a/srcpkgs/tcpdump/template
+++ b/srcpkgs/tcpdump/template
@@ -1,7 +1,7 @@
 # Template file for 'tcpdump'
 pkgname=tcpdump
-version=4.9.2
-revision=5
+version=4.9.3
+revision=1
 build_style=gnu-configure
 configure_args="td_cv_buggygetaddrinfo=no"
 makedepends="libpcap-devel libressl-devel"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://www.tcpdump.org"
 distfiles="https://www.tcpdump.org/release/${pkgname}-${version}.tar.gz"
-checksum=798b3536a29832ce0cbb07fafb1ce5097c95e308a6f592d14052e1ef1505fe79
+checksum=2cd47cb3d460b6ff75f4a9940f594317ad456cfbf2bd2c8e5151e16559db6410
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/teamspeak3/template b/srcpkgs/teamspeak3/template
index 5e7b3fdd488..4be6a87dd5e 100644
--- a/srcpkgs/teamspeak3/template
+++ b/srcpkgs/teamspeak3/template
@@ -1,6 +1,6 @@
 # Template file for 'teamspeak3'
 pkgname=teamspeak3
-version=3.3.0
+version=3.3.2
 revision=1
 archs="i686 x86_64"
 wrksrc=teamspeak3
@@ -18,11 +18,11 @@ noverifyrdeps=yes
 if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
 	_pkg="TeamSpeak3-Client-linux_amd64-${version}"
 	distfiles="https://files.teamspeak-services.com/releases/client/${version}/${_pkg}.run"
-	checksum=0a8d31e59bb140fd3c9221286c75fb9a68fbf97530f88ab6f311932b5733488c
+	checksum=f1c2c399b4277bb7ffd5ffdf82260949c02ebe4df517f6dc2ab2b763743321d9
 elif [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
 	_pkg="TeamSpeak3-Client-linux_x86-${version}"
 	distfiles="https://files.teamspeak-services.com/releases/client/${version}/${_pkg}.run"
-	checksum=2506871bc4382a16086df41c469fd7a4445e644927d9eaca1e876f7b30659c12
+	checksum=c2fa7272a7542eb7f15170b386b8b2597e34aca8c5afcdff429b2c46672f5433
 else
 	broken="No known upstream client for this architecture"
 fi
diff --git a/srcpkgs/telegram-desktop/files/Telegram.cmake b/srcpkgs/telegram-desktop/files/Telegram.cmake
index 456d2eed261..218facfc506 100644
--- a/srcpkgs/telegram-desktop/files/Telegram.cmake
+++ b/srcpkgs/telegram-desktop/files/Telegram.cmake
@@ -73,12 +73,14 @@ include(TelegramCodegen)
 set_property(SOURCE ${TELEGRAM_GENERATED_SOURCES} PROPERTY SKIP_AUTOMOC ON)
 
 set(QRC_FILES
-	Resources/qrc/telegram.qrc
-	Resources/qrc/telegram_emoji_1.qrc
-	Resources/qrc/telegram_emoji_2.qrc
-	Resources/qrc/telegram_emoji_3.qrc
-	Resources/qrc/telegram_emoji_4.qrc
-	Resources/qrc/telegram_emoji_5.qrc
+	Resources/qrc/telegram/sounds.qrc
+	Resources/qrc/telegram/telegram.qrc
+	Resources/qrc/emoji_1.qrc
+	Resources/qrc/emoji_2.qrc
+	Resources/qrc/emoji_3.qrc
+	Resources/qrc/emoji_4.qrc
+	Resources/qrc/emoji_5.qrc
+	Resources/qrc/emoji_preview.qrc
 
 	# This only disables system plugin search path
 	# We do not want this behavior for system build
@@ -139,6 +141,8 @@ file(GLOB SUBDIRS_EXTRA_FILES
 	SourceFiles/info/feed/*.cpp
 	SourceFiles/info/channels/*.cpp
 	SourceFiles/history/feed/*.cpp
+	SourceFiles/ui/platform/mac/*.cpp
+	SourceFiles/ui/platform/win/*.cpp
 )
 list(REMOVE_ITEM SUBDIRS_SOURCE_FILES ${SUBDIRS_EXTRA_FILES})
 
diff --git a/srcpkgs/telegram-desktop/files/TelegramCodegenTools.cmake b/srcpkgs/telegram-desktop/files/TelegramCodegenTools.cmake
index 2021cb9a648..22a52583f9c 100644
--- a/srcpkgs/telegram-desktop/files/TelegramCodegenTools.cmake
+++ b/srcpkgs/telegram-desktop/files/TelegramCodegenTools.cmake
@@ -13,6 +13,8 @@ include_directories(${TELEGRAM_SOURCES_DIR})
 file(GLOB CODEGEN_COMMON_SOURCES
 	${TELEGRAM_SOURCES_DIR}/codegen/common/*.h
 	${TELEGRAM_SOURCES_DIR}/codegen/common/*.cpp
+	${TELEGRAM_SOURCES_DIR}/base/crc32hash.cpp
+	${TELEGRAM_SOURCES_DIR}/base/crc32hash.h
 )
 
 add_library(codegen_common OBJECT ${CODEGEN_COMMON_SOURCES})
diff --git a/srcpkgs/telegram-desktop/patches/stdafx.h.patch b/srcpkgs/telegram-desktop/patches/stdafx.h.patch
new file mode 100644
index 00000000000..1202a268f6d
--- /dev/null
+++ b/srcpkgs/telegram-desktop/patches/stdafx.h.patch
@@ -0,0 +1,19 @@
+--- Telegram/SourceFiles/stdafx.h	2019-09-10 17:30:47.000000000 +0200
++++ -	2019-09-18 14:03:45.704797349 +0200
+@@ -60,6 +60,8 @@
+ #include <QtCore/QString>
+ #include <QtCore/QStringList>
+ #include <QtCore/QVector>
++#include <QtNetwork/QNetworkProxy>
++#include <QtNetwork/QTcpSocket>
+ 
+ #include <QtGui/QIcon>
+ #include <QtGui/QImage>
+@@ -119,6 +121,7 @@
+ 
+ #include "base/basic_types.h"
+ #include "logs.h"
++#include "scheme.h"
+ #include "core/utils.h"
+ #include "config.h"
+ 
diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index ccd9b9a9e93..be11cde6cfb 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
-version=1.8.2
+version=1.8.15
 revision=1
 _libtgvoip_commit=d4a0f719ffd8d29e88474f67abc9fc862661c3b9
 _GSL_commit=d846fe50a3f0bb7767c7e087a05f4be95f4da0ec
@@ -17,8 +17,8 @@ hostmakedepends="pkg-config qt5-qmake qt5-host-tools python"
 makedepends="alsa-lib-devel ffmpeg-devel gtk+3-devel libappindicator-devel
  libdbusmenu-glib-devel libopenal-devel minizip-devel opus-devel xxHash-devel
  $(vopt_if pulseaudio 'pulseaudio-devel') qt5-devel range-v3 libva-devel
- rapidjson liblz4-devel rlottie-devel"
-depends="qt5-imageformats qt5>=5.13.0<5.13.1"
+ rapidjson liblz4-devel rlottie-devel MesaLib-devel"
+depends="qt5-imageformats qt5>=5.13.1<5.13.2"
 short_desc="Telegram Desktop messaging app"
 maintainer="John <johnz@posteo.net>"
 license="GPL-3.0-or-later WITH OpenSSL"
@@ -30,7 +30,7 @@ distfiles="https://github.com/telegramdesktop/tdesktop/archive/v${version}.tar.g
  https://github.com/mapbox/variant/archive/${_variant_commit}.tar.gz
  https://github.com/telegramdesktop/crl/archive/${_crl_commit}.tar.gz
  https://github.com/catchorg/Catch2/archive/${_Catch_commit}.tar.gz"
-checksum="bbacd3aa6ae5f78321346e9bff0b202e8aa64fccafcb06e5e2777c2f0cd908c6
+checksum="68bb6c3d007fe21847286815f22c2532a7cf9c247dc2781d749ebeb40f02ed99
  bb75188b900907a5b00594ad3ddb78195c8d1fdc144e5a458b314dd666eba996
  be81db4ab1b57102a0fa1cd0c4a6469294eb9daf24294347592245b754f65ff6
  aa794dfefe0a90501587e36d977b958d0df888503117a8d9aa43dc14f8526d9d
@@ -45,7 +45,8 @@ case $XBPS_TARGET_MACHINE in
 	mips*)
 		broken="unsupported"
 		;;
-	armv[56]*)
+	ppc64*) ;;
+	armv[56]*|ppc*)
 		makedepends+=" libatomic-devel"
 		configure_args+=" -DUSE_LIBATOMIC=ON"
 		;;
diff --git a/srcpkgs/telepresence/template b/srcpkgs/telepresence/template
index fbf48bb2e44..17300f3b548 100644
--- a/srcpkgs/telepresence/template
+++ b/srcpkgs/telepresence/template
@@ -1,6 +1,6 @@
 # Template file for 'telepresence'
 pkgname=telepresence
-version=0.101
+version=0.102
 revision=1
 archs=noarch
 build_style=python3-module
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://www.telepresence.io"
 changelog="https://raw.githubusercontent.com/telepresenceio/telepresence/master/docs/reference/changelog.md"
 distfiles="https://github.com/datawire/telepresence/archive/${version}.tar.gz"
-checksum=5aa120fbc13ef6f9404f2809e534f13378a741559bdf9a318ca89a7d7225e4d1
+checksum=f5b5a7da8504dbfdcee9c25baaad3c9c06671a483918245391400e2ed20885e0
 
 post_build() {
 	packaging/build-sshuttle.py
@@ -21,5 +21,4 @@ post_build() {
 
 post_install() {
 	vbin dist/sshuttle-telepresence
-	vlicense LICENSE
 }
diff --git a/srcpkgs/termdown/template b/srcpkgs/termdown/template
new file mode 100644
index 00000000000..90a4a894d42
--- /dev/null
+++ b/srcpkgs/termdown/template
@@ -0,0 +1,15 @@
+# Template file for 'termdown'
+pkgname=termdown
+version=1.16.0
+revision=1
+archs=noarch
+build_style=python3-module
+pycompile_module="termdown.py"
+hostmakedepends="python3-setuptools"
+depends="python3-setuptools python3-dateutil python3-click python3-pyfiglet"
+short_desc="Countdown timer and stopwatch in your terminal"
+maintainer="Illia Shestakov <ishestakov@airmail.cc>"
+license="GPL-3.0-only"
+homepage="https://github.com/trehn/termdown"
+distfiles="https://github.com/trehn/termdown/archive/${version}.tar.gz"
+checksum=bab26e830a6e3f7758e1daccb2580aec094a257f5631546aa0f66bc35c3a37bc
diff --git a/srcpkgs/terraform/template b/srcpkgs/terraform/template
index d7f3544691d..625f18da658 100644
--- a/srcpkgs/terraform/template
+++ b/srcpkgs/terraform/template
@@ -1,6 +1,6 @@
 # Template file for 'terraform'
 pkgname=terraform
-version=0.12.6
+version=0.12.10
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/$pkgname"
@@ -9,4 +9,4 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MPL-2.0"
 homepage="https://www.terraform.io/"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=df108a45f5ba2658eed844c3a6647117324c99770e06cbd549b26dd7c20ee623
+checksum=289d5287fda0bb870c1fb1ed504523bf24885ccf763b9547d91f8225310dc4f5
diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index fdb0f81f130..8b34e50f2f1 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -1,6 +1,6 @@
 # Template file for 'terragrunt'
 pkgname=terragrunt
-version=0.19.12
+version=0.20.4
 revision=1
 build_style=go
 go_import_path="github.com/gruntwork-io/$pkgname"
@@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 homepage="https://github.com/gruntwork-io/terragrunt"
 distfiles="$homepage/archive/v$version.tar.gz"
-checksum=53b885321feb091ddd82800eaf202aef7b1176a35be3fcf0a77f2e1c46c307f0
+checksum=48105e1a8127c5fffd81d64d1d2915aa9459f3fd9cc20504e805ca77e735539f
 
 pre_build() {
 	git config --global http.https://gopkg.in.followRedirects true
diff --git a/srcpkgs/texlive-bin/template b/srcpkgs/texlive-bin/template
index da83344e453..ecf0cebc83e 100644
--- a/srcpkgs/texlive-bin/template
+++ b/srcpkgs/texlive-bin/template
@@ -9,16 +9,17 @@ license="GPL-2"
 homepage="http://tug.org/texlive/"
 provides="texlive-${version}_${revision}"
 
+case "$XBPS_TARGET_MACHINE" in
+	i686) _tlarch=i386-linux;;
+	x86_64) _tlarch=x86_64-linux;;
+	x86_64-musl) _tlarch=x86_64-linuxmusl;;
+	arm*) _tlarch=armhf-linux;;
+	aarch64) _tlarch=aarch64-linux;;
+	*) broken="$XBPS_TARGET_MACHINE is not supported";;
+esac
+
 do_install() {
 	vmkdir etc/profile.d
-	case "$XBPS_TARGET_MACHINE" in
-		i686) tlarch=i386-linux;;
-		x86_64) tlarch=x86_64-linux;;
-		x86_64-musl) tlarch=x86_64-linuxmusl;;
-		arm*) tlarch=armhf-linux;;
-		aarch64) tlarch=aarch64-linux;;
-		*) broken="$XBPS_TARGET_MACHINE is not supported";;
-	esac
-	sed -e "s/@@ARCH@@/${tlarch}/; s/@@VERSION@@/${version}/" \
+	sed -e "s/@@ARCH@@/${_tlarch}/; s/@@VERSION@@/${version}/" \
 		${FILESDIR}/texlive.sh >${DESTDIR}/etc/profile.d/texlive.sh
 }
diff --git a/srcpkgs/thermald/template b/srcpkgs/thermald/template
index ba6786c6d99..daa5d9eb5b7 100644
--- a/srcpkgs/thermald/template
+++ b/srcpkgs/thermald/template
@@ -1,6 +1,6 @@
 # Template file for 'thermald'
 pkgname=thermald
-version=1.8
+version=1.9
 revision=1
 _pkgname=thermal_daemon
 wrksrc="${_pkgname}-${version}"
@@ -13,7 +13,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2"
 homepage="https://github.com/01org/${_pkgname}"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=662456eff5b7ee5a42e54b8a667d002d3a4dec5cacbddc5e1ab5ec94dab218c6
+checksum=d8f40bce80fb8303a0c103d2531d0e4cc1caad0a8d027cd26a1b5b10cdaae4e3
 conf_files='/etc/thermald/*'
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/thingylaunch/template b/srcpkgs/thingylaunch/template
index 0b9bfded2fd..5e862376125 100644
--- a/srcpkgs/thingylaunch/template
+++ b/srcpkgs/thingylaunch/template
@@ -7,7 +7,7 @@ configure_args="-DUSE_XCB=ON"
 hostmakedepends="pkg-config"
 makedepends="xcb-util-wm-devel xcb-util-keysyms-devel"
 short_desc="X11 application launcher with tab-completion, history, and bookmarks"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD"
 homepage="https://gahr.ch/thingylaunch/"
 distfiles="https://github.com/gahr/${pkgname}/archive/${version}.tar.gz"
diff --git a/srcpkgs/threadweaver/template b/srcpkgs/threadweaver/template
index 3257d177460..a677fa9b3ff 100644
--- a/srcpkgs/threadweaver/template
+++ b/srcpkgs/threadweaver/template
@@ -1,6 +1,6 @@
 # Template file for 'threadweaver'
 pkgname=threadweaver
-version=5.61.0
+version=5.63.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="LGPL-2.1-or-later"
 homepage="https://projects.kde.org/projects/frameworks/threadweaver"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e7a0cecfaa60c7a8e4bdd4dfe842fb54a344d331a6c62316c147d8dc2a5e5843
+checksum=4fb56509b42cf02750c063531c981d5a663210e628dd280b7a6c5755ad01497c
 
 threadweaver-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/thunderbird-i18n/template b/srcpkgs/thunderbird-i18n/template
index 64f51e0df9e..75f5a6808f8 100644
--- a/srcpkgs/thunderbird-i18n/template
+++ b/srcpkgs/thunderbird-i18n/template
@@ -1,12 +1,12 @@
 # Template file for 'thunderbird-i18n'
 pkgname=thunderbird-i18n
-version=60.8.0
-revision=1
+version=68.1.0
+revision=2
 build_style=meta
-homepage="https://www.thunderbird.net/"
 short_desc="Thunderbird language packs"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MPL-2.0"
+homepage="https://www.thunderbird.net/"
 
 create_wrksrc=yes
 
@@ -96,58 +96,58 @@ _pkgtmpl() {
 	}
 }
 
-checksum="3a82402cb19f5750448596246cca7d00569b54a2fd79e2e69be29a477fa0c66d
- 424f45a8e2a7adbfce468fcb42a6e079baa5620f358ae8a0296e913d77c269ab
- 90e30da3ae53c1ff00053ce24437f35903d684ca321ccfba63b8dc27cbdd1570
- 08d0626bf8aceff1b06486be9bce40718a992d72c23bd8e4d5e02facd57b06a7
- ad978b3a02f884b3606c8daead800a1062ffaf6caa304eac56a081e97cb027f5
- 154a489330a5e56fa975e56411fd51f5ea3e76e83580f0b242c2801397526efb
- 19cd65ec1f212681c0cb35e59d2a2fbf6c513a9f9c5fa88775993725ff3b4107
- 761f555123211c36e4fd919d3131f66b5ff9ccd5b8c7fbed3d49b3637d2d727c
- 48a106e1c88feb79ab6ce1e6e60eaaa179e711193753997591ccfe963b2bacf5
- 52af378833f2ed12b29c3d65114f20174e0ae2ac9b33d278f564fdd8dce8fb44
- 2015ff789f559b223d6cae477b072ff7cbaa884d8440b482f82486ed9d580a1d
- 3d633f451764beec8fee9232c5ed6db58ac76c687f5c5b16e3d41727103c5e1d
- d0317fc45ece1c79ca4db28cd7f54d967cb58039116ea1b3167fe905bb220471
- 15ac96008cb1bd14565ad4263d54acebb6ac41ea8cb88a140800b21592ad008e
- ba70eceddeeb10dd9303437e0f51fd52d1c95fd3bc7cbc3cccc846a9784c2304
- 5685cede9c0f12b1ab12652315b82f7c778a16b75da74e645669a3ebef4536c8
- 6c206ca642f9211ff88e3070cb49f42967ea3a945bc12f1ab057ff0cbc42e17d
- 44e82253413a3700f3001c0053121ee80d2a3146b97c3ccaf8ed676d6d063a2c
- f8a2f7d6fbebc04f38bb8598da1685a57344a974dbedfc144f11567726cd48f4
- 01c055021d4d7a84b002a0d21b60c4a5ac7e242f27e9cf88fc0323c3fb7a325a
- 8660fd33e60943664adaa0ec317e428baef5bb764ce1e64b575cbbe9bf078993
- f4e64e98e5c55e716752ebf055ed2596b65038dae1a1891c557aac1409e803d4
- 1d94d187026f65d58a884c6a2a26c5eec906e2b4248be2e307f07bffaf215d78
- 3d95017f9e31d3c85988d4be05acf8d65da6b8cfb1cd337ccacdf5bf0ef52011
- 13d62c97b8004635814ab83afdf69535a1adacc4967089c2a00e2a9c8fad7c7a
- 25f2505a409abf77d773ffe3e858f6916b9c11a27c9c064c883343ee5d07c0e8
- 71e6ea1ed225dca3b8e40003b8422b1a9b94d83ff76c68550cd00a3dec77c9c9
- ad1777b07ea9f3c0f69348511b2647dd262c516b6f6a4339a823777d67f04a7e
- 84c4c1fbca7f8a4d8bbf58b0e674976c71b5bc2d992f57fbf56ba7d7eaf6469f
- ee485bf384d62c5fbe9380174d12e81242b17776e421a61b2600ab4833a0af97
- df9ab4b9162829cd01b405167a074c79ee326ceb7b5be4b77b545637b8235bfc
- 304471f154f4b9b347cc24f151d7da244df7789663eaaeb2fef4c2864c7be364
- eebe9383c8d78c1f861f8bc11d5d707ff8b7d3b03dc7c4a41e6f6041aabc3d5a
- 2c2ad8521b2ba99cfa458dab960e8cf4470e74681f527864df5553c82677efad
- 835e2fc54b2d38751859251e05e14141682edf47d6df5897f820716aa1b60a1a
- a1aa783ef7eb3180ea5638d3aef83deccbd9857d8d6208381a75085abfee4833
- 3457079f767f17b1a5ec0c60f9acb0546c3634d26faaf126fc43884585953081
- ed01b08d542b6d3a3eaa26894cdd8bda59d1459ffc7a87c705ee8aa40539e089
- 1ad125f6c2f79ed9a7acd576e724b72bd7075ec7f31ffc5d917239d09562fc32
- 2137096acb589bd68b7ffe566acf61eb35982e185491bc72ca2eac2c052aec9d
- 1a4863812d27e352b9695ca8e389c523fb48c40a8d7f5c3d283ce57ac34653e0
- f9702a01f64d65edf737e8fb3125b866c5aebd8d4c448ae5500690ea8abb2fab
- f73f27ff403203fc745b527a67bf8e07027b4266dcd2a44c4b613298503a70da
- 888a6d43c3ada7e08086877e4e0b81946ac6e887c39cc4ddf3da60bdeecace4e
- 7382cfb3792a86c2ba647ba116673862bb532841b8f2435e60c502fbdd316ccf
- 5fbfd5ca4672f9f5e12e3e30735aac59c6aaba3035af8fe060d8785d43ee4aae
- f3b848247997509b21d075f48c1b57993e1795c78aa990e26ef2e416781ab541
- f1c6eb5df36fff653fadc3375f7b952154f0f76cccfbe5a1187242b431e5a69f
- 1e44a272833d00825015db35e3d5438ad4af1c83ec2b5406430bbf7645660330
- fccd9a9e53ab4ef287a9c02062befcf62c02899bb04bb8488ecab009d9b3b84b
- d418bb9b7e057fa25901a29bc07d740ddce4eb134c8cd8a757de97b0cc6e81e6
- ed7586c033b1190c3e239c56c4051750495a1593c1f66e6cdbc711f6d338b2ac
- 83534ec01cbca94d35e492048d3f9c123c8db01556107925cea069b318b0a3be
- 034c60b4c86ad7df2d51fe9e14a20376ebcd582d599aca9600ea35a244c64544
- 857cfd43c0de9afe2bb7054c3f2a30100e887ef368b81055ffdf07f6c11e7a93"
+checksum="299c3cd104a772caddb3f9846d9f5a9ed4fe458107d20fbc572c6f64ff8dd803
+ 4b2fd0ccedaa53d563109c49285ab94fb3253574bac47e9f15e08f9292822f0b
+ c9c3ef83e168053ea643634bb68be3bf535f5fa034baf510037b039caae2be3b
+ 0ab37e7610d867ccee8cbd60225e3411a1903bb66cf122ea0a76b8a3143240d6
+ 2ed1f39b05d7c796e72991b295dd7ed0a379a82d9e04eb71a02988d31bb50c9c
+ 5b8f52004ebb534bf56b7f50a777cfd75b9a9afe1e56599d140bacb6070a9e2d
+ 8fe713b8e40ef6dbcaf0c9b25a746c6357ca9f8199b4f260d70fa52df32b2e8f
+ 1de5dcb10200cc0f4c18460818e8f4eaa7d6935798823ac7b940bdb23bd71105
+ 507a951afd321672aa3afdf3929dcdd115a0467b6c9a44fbd1a8f0da6834766c
+ 96acf1fb337ecc7cedbed1f5645174ec097b13d4f991626ac82aea1dfd51263e
+ 90e33e95e38df7f5062dcc75651b32ac2b8a33c52488ea4d14f6aa599ab0c326
+ d5d722c13d330a4a7cbff2194a0dcee38adc4a9c991b190cfa6fd34d6386e204
+ ebd469af94e084b5444e199a9fb0d9d78b9883f7344f17e3d40d4accb408937a
+ c5a620c0bedda19473f016f974d5c0f2d3059dcb50378c4508499d291939ed03
+ 5080942902184e756853be14d638230e303cf759a9d2624675aeb10bdec6af63
+ c8cd9bb150d378a4b31fb39e7c599ed2846f236bc3e9055096fd6dbe47884e3b
+ 9b3d4eee8044dd8aa700d4516624abeccf5a07df6eea85c8c190a3f1d8c7dc38
+ b6b890964b13a96db89ef0df67875c57f312128fd65c3d2bf74fde69b7e50538
+ 4f1583824df5c2cf1226b0ac4e273a84527c2918cc7693764ed9ca29d70c2ec1
+ b2232b56e8fb57e6b7afb5fe2fc3d0b0310b859c57007757f8728a265aea2168
+ 3b33c15a67f085ea3ba09592aa6838d7fc92c15d896970ce6c14f00b995c9fb3
+ 1ef54e007d31be97a4cbae13502102fbe4a96c5aa10f88cf5d8668d81002ea96
+ d8343c9929471be60a630c02813f22dfda92053ebd7e015293c074416e9303a1
+ 7648f75c750bc2217dbbe2cedffecd8adac822e5ff47c8ba90852f710da50fb6
+ 68b87c15541da22030209a9e778a3f6630a28585a676eb66c83c27438bf0b502
+ 43883f25a5900491b9cc580d3a915ae9a2f0e079365ca7ce270d896e80c89516
+ 941bf45eabf44913061df016c4075f83774bea40fb8eac30d0694857b4b794fa
+ b1fba58a22c5f5ee287bd6ca318e86af92f1fc36dce450ffb8d762a2acb5d4fb
+ 5e2b2d25586bde17f91674f9f06bd32cc8e49d3e3f20666d5592f33de67c9ef5
+ 1d6213971b700be7de8e074e2b5a78dc89bc75cdbcd3020b9c36d423d01fbfac
+ fbc4a8a47adcc79394e12108c5187e274cafb5857f36843a40bb4dfecba3fd13
+ 4701efa9204bccb8e37f0be35487908ce21b3bc7a654a230b5c925ff778a815a
+ 3609d9cadfbf377ae5bc115c5badbad6000352c800272bba75663b9eb51dd7ca
+ a54b54f2e07e9127a0cb73bfd6cf19d766603be12ba9b4e159cc848a70fa93cb
+ 923ef8755962cbe7871636d5dae60a4821ff9dd6a61cb5c610fe5290511cccee
+ baf929ad8c96da4f90920d3a00e585da7e400fef9a48dab283ee1c27eca86914
+ c5af8270516f87b7ba3b48914bed4d55a7d2dbb27d847c6d408c9e71e4065fbd
+ 7128daa26fc5eab437a4a71ee76f4678376c4fee1d43eda1fb5d081e1f213a55
+ 949646dba79b8caca43953360887cf1eec4b71c2fa695f4842c6e7fd5503cec6
+ 30f621990e2f54c4c9e9a57e1efe2603088158593d6315bf8d333faa8c774680
+ cacbea21c271f54657fdf12ee50e6b4e9e1c6cbd99f4848609b888748a85e4ae
+ dddccfe6dc39514598b59186fd26e59287cfce4e16e23e68d7f3a0eac2a78b1c
+ 24c14480fd5fd93c8f327464ef77e619e043bbe0af682ad8791039b2f54cf693
+ 6c97b56c97a0e51dfd5ba11f2a4c6988580f172217d70ea99d7b0f1cfa01d6b4
+ d5f294c8e7b0471be3cc501e419aaa62e5948c8d5b916bfd6d13ffd82b794610
+ 0bfab08dca7ca8d32f36c8daf02c9bab7d88f44a87027339e2418f2a6dcdf134
+ dd3e7ae3b7f6fe0de56e2cbc67d4fa65d4d5816aad93508afa60ff8c62246823
+ abd21a9560b8be091e1961a4f350d161f2fabfdaa05ae86cbc0334feb20bdee6
+ 95ba0af507f9f665631845a76a2a494d25442c939f4e5db9dd96f1bf0938aae9
+ 9a8fb53132614122c7cffa6a642bdce84d02c78205656c2382c49bf4aa5dc2b7
+ 26901add0592a4b29cc54940b73dde0b3e3231af3d4d0c34be056f12c1aa950f
+ 64ab10bf053df33d19f6145a51edc22643d95f6e0a4e3a4049dd2a14bef32317
+ 534af1dd87667c451f55b00f9dd2f8192160d3902f8976666b3be85c4fe0f353
+ bad55df7f823c15ccb492a4468dc3507194ccd1900c9771139509cc17dc7742a
+ 47aee2cf1c4a55e432ddf7ef99099e1ef5a77d6fffe0945cc889b583048b2432"
diff --git a/srcpkgs/thunderbird/files/mozconfig b/srcpkgs/thunderbird/files/mozconfig
index 4d1267b2351..334846e9a64 100644
--- a/srcpkgs/thunderbird/files/mozconfig
+++ b/srcpkgs/thunderbird/files/mozconfig
@@ -12,7 +12,6 @@ ac_add_options --with-system-icu
 # XXX: the system's libpng doesn't have APNG support
 ac_add_options --without-system-png
 ac_add_options --enable-system-pixman
-ac_add_options --enable-system-hunspell
 ac_add_options --enable-system-sqlite
 ac_add_options --enable-system-ffi
 
@@ -34,8 +33,8 @@ ac_add_options --disable-updater
 ac_add_options --disable-install-strip
 ac_add_options --disable-strip
 ac_add_options --disable-profiling
+ac_add_options --disable-gold
 ac_add_options --enable-optimize="$CFLAGS"
-ac_add_options --enable-pie
 
 ac_add_options --enable-official-branding
 ac_add_options --enable-calendar
diff --git a/srcpkgs/thunderbird/patches/disable-hunspell_hooks.patch b/srcpkgs/thunderbird/patches/disable-hunspell_hooks.patch
deleted file mode 100644
index a5f7c29f2bd..00000000000
--- a/srcpkgs/thunderbird/patches/disable-hunspell_hooks.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mozilla-config.h.in	2016-07-06 15:16:06.621880293 +0200
-+++ mozilla-config.h.in	2016-07-06 15:16:42.958428126 +0200
-@@ -54,7 +54,7 @@
-  * HUNSPELL_STATIC is defined in extensions/spellcheck/hunspell/src/Makefile.in,
-  * unless --enable-system-hunspell is defined.
-  */
--#if defined(HUNSPELL_STATIC)
-+#if 0
- #include "hunspell_alloc_hooks.h"
- #include "hunspell_fopen_hooks.h"
- #endif
diff --git a/srcpkgs/thunderbird/patches/disable-image-format-warning.patch b/srcpkgs/thunderbird/patches/disable-image-format-warning.patch
new file mode 100644
index 00000000000..bd56e6bc37c
--- /dev/null
+++ b/srcpkgs/thunderbird/patches/disable-image-format-warning.patch
@@ -0,0 +1,15 @@
+Imported from Adélie. Firefox is prone to this warning on BE and
+it leads to huge .xsession-errors, and the warning is not very
+important or meaningful, so just disable it.
+
+--- gfx/2d/HelpersCairo.h
++++ gfx/2d/HelpersCairo.h
+@@ -147,7 +147,7 @@
+     case SurfaceFormat::R5G6B5_UINT16:
+       return CAIRO_FORMAT_RGB16_565;
+     default:
+-      gfxCriticalError() << "Unknown image format " << (int)format;
++      //gfxCriticalError() << "Unknown image format " << (int)format;
+       return CAIRO_FORMAT_ARGB32;
+   }
+ }
diff --git a/srcpkgs/thunderbird/patches/fix-arm-opus-include.patch b/srcpkgs/thunderbird/patches/fix-arm-opus-include.patch
new file mode 100644
index 00000000000..6e0c5875da3
--- /dev/null
+++ b/srcpkgs/thunderbird/patches/fix-arm-opus-include.patch
@@ -0,0 +1,11 @@
+--- media/libopus/silk/arm/arm_silk_map.c.orig	2019-03-19 20:55:01.249609964 +0100
++++ media/libopus/silk/arm/arm_silk_map.c	2019-03-19 20:55:25.769400255 +0100
+@@ -28,7 +28,7 @@
+ # include "config.h"
+ #endif
+
+-#include "main_FIX.h"
++#include "../fixed/main_FIX.h"
+ #include "NSQ.h"
+ #include "SigProc_FIX.h"
+
diff --git a/srcpkgs/thunderbird/patches/fix-i686-ppc-musl.patch b/srcpkgs/thunderbird/patches/fix-i686-ppc-musl.patch
new file mode 100644
index 00000000000..40aab43ae86
--- /dev/null
+++ b/srcpkgs/thunderbird/patches/fix-i686-ppc-musl.patch
@@ -0,0 +1,11 @@
+--- mozglue/misc/StackWalk.cpp	2017-04-11 04:13:21.000000000 +0200
++++ mozglue/misc/StackWalk.cpp	2017-11-29 15:23:07.218649970 +0100
+@@ -33,7 +33,7 @@ using namespace mozilla;
+ #  define MOZ_STACKWALK_SUPPORTS_MACOSX 0
+ #endif
+ 
+-#if (defined(linux) &&                                            \
++#if defined(__GLIBC__) && (defined(linux) && \
+      ((defined(__GNUC__) && (defined(__i386) || defined(PPC))) || \
+       defined(HAVE__UNWIND_BACKTRACE)))
+ #  define MOZ_STACKWALK_SUPPORTS_LINUX 1
diff --git a/srcpkgs/thunderbird/patches/fix-musl.patch b/srcpkgs/thunderbird/patches/fix-musl.patch
index c32921d39e1..c1cb99bf651 100644
--- a/srcpkgs/thunderbird/patches/fix-musl.patch
+++ b/srcpkgs/thunderbird/patches/fix-musl.patch
@@ -1,11 +1,11 @@
---- tools/profiler/core/platform.h.orig
-+++ tools/profiler/core/platform.h
-@@ -56,7 +56,7 @@
-
- // We need a definition of gettid(), but glibc doesn't provide a
- // wrapper for it.
+--- tools/profiler/core/platform-linux-android.cpp.orig	2019-07-09 22:58:30.039475686 +0200
++++ tools/profiler/core/platform-linux-android.cpp	2019-07-09 22:58:39.331437677 +0200
+@@ -73,7 +73,7 @@
+ 
+ int profiler_current_thread_id() {
+   // glibc doesn't provide a wrapper for gettid().
 -#if defined(__GLIBC__)
 +#if defined(__linux__)
- #include <unistd.h>
- #include <sys/syscall.h>
- static inline pid_t gettid()
+   return static_cast<int>(static_cast<pid_t>(syscall(SYS_gettid)));
+ #else
+   return static_cast<int>(gettid());
diff --git a/srcpkgs/thunderbird/patches/fix-rust-1.29.patch b/srcpkgs/thunderbird/patches/fix-rust-1.29.patch
deleted file mode 100644
index e48c93a9dce..00000000000
--- a/srcpkgs/thunderbird/patches/fix-rust-1.29.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- build/moz.configure/rust.configure.orig	2018-10-26 15:02:30.276600157 +0200
-+++ build/moz.configure/rust.configure	2018-10-26 15:02:14.081581242 +0200
-@@ -119,7 +119,10 @@ def rust_supported_targets(rustc):
-     ambiguous = set()
-     per_raw_os = {}
-     for t in out:
--        t = split_triplet(t, allow_unknown=True)
-+        try:
-+            t = split_triplet(t, allow_unknown=True)
-+        except:
-+            continue
-         key = (t.cpu, t.endianness, t.os)
-         if key in per_os:
-             previous = per_os[key]
diff --git a/srcpkgs/thunderbird/patches/fix-sandbox-membarrier.patch b/srcpkgs/thunderbird/patches/fix-sandbox-membarrier.patch
new file mode 100644
index 00000000000..caffd83cf67
--- /dev/null
+++ b/srcpkgs/thunderbird/patches/fix-sandbox-membarrier.patch
@@ -0,0 +1,52 @@
+allow usage of SYS_membarrier, needed since musl-1.1.22
+
+--- security/sandbox/linux/SandboxFilter.cpp
++++ security/sandbox/linux/SandboxFilter.cpp
+@@ -283,6 +283,8 @@
+       case __NR_set_tid_address:
+         return Allow();
+ #endif
++      case __NR_membarrier:
++        return Allow();
+ 
+         // prctl
+       case __NR_prctl: {
+
+--- security/sandbox/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
++++ security/sandbox/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
+@@ -1385,6 +1385,10 @@
+ #define __NR_memfd_create (__NR_SYSCALL_BASE+385)
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier (__NR_SYSCALL_BASE+389)
++#endif
++
+ // ARM private syscalls.
+ #if !defined(__ARM_NR_BASE)
+ #define __ARM_NR_BASE (__NR_SYSCALL_BASE + 0xF0000)
+
+--- security/sandbox/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h
++++ security/sandbox/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h
+@@ -1290,5 +1290,9 @@
+ #define __NR_memfd_create 319
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier 324
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_X86_64_LINUX_SYSCALLS_H_
+ 
+--- security/sandbox/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
++++ security/sandbox/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
+@@ -1490,5 +1490,9 @@
+ #define __NR_shutdown 373
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier 375
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_X86_32_LINUX_SYSCALLS_H_
+ 
diff --git a/srcpkgs/thunderbird/patches/fix-toolkit.patch b/srcpkgs/thunderbird/patches/fix-toolkit.patch
index 120ea8561e9..86e8ef47855 100644
--- a/srcpkgs/thunderbird/patches/fix-toolkit.patch
+++ b/srcpkgs/thunderbird/patches/fix-toolkit.patch
@@ -47,17 +47,28 @@
  #include <a.out.h>
  #endif
 
+--- toolkit.orig/mozapps/update/common/updatedefines.h	2019-01-29 11:34:36.416804577 +0100
++++ toolkit/mozapps/update/common/updatedefines.h	2019-01-29 11:34:59.193583777 +0100
+@@ -102,7 +102,7 @@
+
+ #  ifdef SOLARIS
+ #    include <sys/stat.h>
+-#  else
++#  elif !(defined(__linux__)) || defined(__GLIBC__)
+ #    include <fts.h>
+ #  endif
+ #  include <dirent.h>
 --- toolkit.orig/mozapps/update/updater/updater.cpp	2014-03-15 05:19:37.000000000 +0000
 +++ toolkit/mozapps/update/updater/updater.cpp	2014-04-17 10:24:33.796765327 +0000
-@@ -3432,6 +3432,7 @@
- int add_dir_entries(const NS_tchar *dirpath, ActionList *list)
- {
+@@ -3978,6 +3978,7 @@
+ 
+ int add_dir_entries(const NS_tchar* dirpath, ActionList* list) {
    int rv = OK;
 +#if !defined(__linux__) || defined(__GLIBC__)
-   FTS *ftsdir;
-   FTSENT *ftsdirEntry;
-   NS_tchar searchpath[MAXPATHLEN];
-@@ -3534,6 +3535,7 @@
+   FTS* ftsdir;
+   FTSENT* ftsdirEntry;
+   mozilla::UniquePtr<NS_tchar[]> searchpath(get_full_path(dirpath));
+@@ -4085,6 +4086,7 @@
    }
  
    fts_close(ftsdir);
@@ -65,14 +76,3 @@
  
    return rv;
  }
---- toolkit/mozapps/update/common/updatedefines.h	2019-02-03 14:48:50.526625890 +0100
-+++ toolkit/mozapps/update/common/updatedefines.h	2019-02-03 14:49:51.466743641 +0100
-@@ -100,7 +100,7 @@
- 
- #ifdef SOLARIS
- #include <sys/stat.h>
--#else
-+#elif !defined(__linux__) || defined(__GLIBC__)
- #include <fts.h>
- #endif
- #include <dirent.h>
diff --git a/srcpkgs/thunderbird/patches/fix-tools.patch b/srcpkgs/thunderbird/patches/fix-tools.patch
index 97e77307cea..0ed043fb5b5 100644
--- a/srcpkgs/thunderbird/patches/fix-tools.patch
+++ b/srcpkgs/thunderbird/patches/fix-tools.patch
@@ -1,17 +1,6 @@
---- tools/profiler/core/platform.h
-+++ tools/profiler/core/platform.h
-@@ -29,6 +29,8 @@
- #ifndef TOOLS_PLATFORM_H_
- #define TOOLS_PLATFORM_H_
-
-+#include <sys/types.h>
-+
- #include <stdint.h>
- #include <math.h>
- #include "MainThreadUtils.h"
---- tools/profiler/lul/LulElf.cpp	2019-02-03 14:54:15.727928668 +0100
-+++ tools/profiler/lul/LulElf.cpp	2019-02-03 14:55:54.342546975 +0100
-@@ -459,10 +459,10 @@
+--- tools/profiler/lul/LulElf.cpp.orig	2019-01-29 12:05:34.223834130 +0100
++++ tools/profiler/lul/LulElf.cpp	2019-01-29 12:08:02.480400845 +0100
+@@ -469,10 +469,10 @@
  // Return the non-directory portion of FILENAME: the portion after the
  // last slash, or the whole filename if there are no slashes.
  string BaseFileName(const string& filename) {
@@ -26,9 +15,21 @@
    return base;
  }
  
---- tools/profiler/core/platform-linux-android.cpp	2019-02-03 14:56:23.607139579 +0100
-+++ tools/profiler/core/platform-linux-android.cpp	2019-02-03 14:57:03.198587558 +0100
-@@ -497,8 +497,10 @@
+--- tools/profiler/core/platform-linux-android.cpp.orig	2019-01-29 12:09:40.980448579 +0100
++++ tools/profiler/core/platform-linux-android.cpp	2019-01-29 12:11:09.689590967 +0100
+@@ -253,7 +253,11 @@
+ 
+   // Request profiling signals.
+   struct sigaction sa;
++#if defined(GP_ARCH_arm)
++  sa.sa_sigaction = SigprofHandler;
++#else
+   sa.sa_sigaction = MOZ_SIGNAL_TRAMPOLINE(SigprofHandler);
++#endif
+   sigemptyset(&sa.sa_mask);
+   sa.sa_flags = SA_RESTART | SA_SIGINFO;
+   if (sigaction(SIGPROF, &sa, &mOldSigprofHandler) != 0) {
+@@ -497,8 +501,10 @@
  ucontext_t sSyncUContext;
  
  void Registers::SyncPopulate() {
diff --git a/srcpkgs/thunderbird/patches/fix-wasm-arm.patch b/srcpkgs/thunderbird/patches/fix-wasm-arm.patch
new file mode 100644
index 00000000000..e6ad61c9f44
--- /dev/null
+++ b/srcpkgs/thunderbird/patches/fix-wasm-arm.patch
@@ -0,0 +1,15 @@
+--- js/src/wasm/WasmSignalHandlers.cpp
++++ js/src/wasm/WasmSignalHandlers.cpp
+@@ -243,9 +243,9 @@
+ // If you run into compile problems on a tier-3 platform, you can disable the
+ // emulation here.
+ 
+-#if defined(__linux__) && defined(__arm__)
+-#  define WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS
+-#endif
++// #if defined(__linux__) && defined(__arm__)
++// #  define WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS
++// #endif
+ 
+ #ifdef WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS
+ #  include <sys/user.h>
diff --git a/srcpkgs/thunderbird/patches/fix-webrtc-glibcisms.patch b/srcpkgs/thunderbird/patches/fix-webrtc-glibcisms.patch
index 0a9304430b2..cf895dd8448 100644
--- a/srcpkgs/thunderbird/patches/fix-webrtc-glibcisms.patch
+++ b/srcpkgs/thunderbird/patches/fix-webrtc-glibcisms.patch
@@ -1,13 +1,20 @@
---- media/webrtc/trunk/webrtc/system_wrappers/source/cpu_features_linux.c.orig	2018-05-09 23:48:44.677389171 +0200
-+++ media/webrtc/trunk/webrtc/system_wrappers/source/cpu_features_linux.c	2018-05-09 23:48:56.254373557 +0200
-@@ -11,7 +11,9 @@
- #include <stdlib.h>
- #include <string.h>
- #include <features.h>
+--- media/webrtc/trunk/webrtc/system_wrappers/source/cpu_features_linux.c.orig	2019-01-29 11:20:52.298793223 +0100
++++ media/webrtc/trunk/webrtc/system_wrappers/source/cpu_features_linux.c	2019-01-29 11:21:48.250250850 +0100
+@@ -14,7 +14,7 @@
+ #ifndef __GLIBC_PREREQ
+ #define __GLIBC_PREREQ(a, b) 0
+ #endif
 -#if __GLIBC_PREREQ(2, 16)
-+#if !__GLIBC__
-+#include <sys/auxv.h>
-+#elif __GLIBC_PREREQ(2, 16)
++#if !__GLIBC__ || __GLIBC_PREREQ(2, 16)
  #include <sys/auxv.h>
  #else
  #include <fcntl.h>
+@@ -32,7 +32,7 @@
+   int architecture = 0;
+   unsigned long hwcap = 0;
+   const char* platform = NULL;
+-#if __GLIBC_PREREQ(2, 16)
++#if !__GLIBC__ || __GLIBC_PREREQ(2, 16)
+   hwcap = getauxval(AT_HWCAP);
+   platform = (const char*)getauxval(AT_PLATFORM);
+ #else
diff --git a/srcpkgs/thunderbird/patches/fix-xpcom.patch b/srcpkgs/thunderbird/patches/fix-xpcom.patch
deleted file mode 100644
index 38dd582d96b..00000000000
--- a/srcpkgs/thunderbird/patches/fix-xpcom.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xpcom/base/nsMemoryReporterManager.cpp.orig	2015-12-16 11:53:14.211144456 +0100
-+++ xpcom/base/nsMemoryReporterManager.cpp	2015-12-16 11:55:26.859476381 +0100
-@@ -46,7 +46,7 @@ using namespace mozilla;
- #  include "mozmemory.h"
- #endif  // MOZ_MEMORY
- 
--#if defined(XP_LINUX)
-+#if defined(XP_LINUX) && defined(__GLIBC__)
- 
- #include <malloc.h>
- #include <string.h>
diff --git a/srcpkgs/thunderbird/patches/mallinfo.patch b/srcpkgs/thunderbird/patches/mallinfo.patch
index c9a38d45bdf..afea86c0a2c 100644
--- a/srcpkgs/thunderbird/patches/mallinfo.patch
+++ b/srcpkgs/thunderbird/patches/mallinfo.patch
@@ -1,18 +1,34 @@
---- xpcom/base/nsMemoryReporterManager.cpp
-+++ xpcom/base/nsMemoryReporterManager.cpp
-@@ -153,6 +153,7 @@ ResidentUniqueDistinguishedAmount(int64_t* aN)
+--- xpcom/base/nsMemoryReporterManager.cpp.orig	2019-03-19 17:12:20.844810044 +0100
++++ xpcom/base/nsMemoryReporterManager.cpp	2019-03-19 17:13:32.505133615 +0100
+@@ -123,6 +123,7 @@
    return GetProcSelfSmapsPrivate(aN);
  }
  
 +#ifdef __GLIBC__
- #define HAVE_SYSTEM_HEAP_REPORTER 1
- nsresult
- SystemHeapSize(int64_t* aSizeOut)
-@@ -172,6 +173,7 @@ SystemHeapSize(int64_t* aSizeOut)
-     *aSizeOut = size_t(info.hblkhd) + size_t(info.uordblks);
-     return NS_OK;
+ #  ifdef HAVE_MALLINFO
+ #    define HAVE_SYSTEM_HEAP_REPORTER 1
+ static MOZ_MUST_USE nsresult SystemHeapSize(int64_t* aSizeOut) {
+@@ -142,6 +143,7 @@
+   return NS_OK;
  }
-+#endif
+ #  endif
++#endif // __GLIBC__
  
- #elif defined(__DragonFly__) || defined(__FreeBSD__) \
-     || defined(__NetBSD__) || defined(__OpenBSD__) \
+ #elif defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || \
+     defined(__OpenBSD__) || defined(__FreeBSD_kernel__)
+@@ -642,6 +644,7 @@
+   return NS_OK;
+ }
+ 
++#ifdef __GLIBC__
+ #  define HAVE_SYSTEM_HEAP_REPORTER 1
+ // Windows can have multiple separate heaps. During testing there were multiple
+ // heaps present but the non-default ones had sizes no more than a few 10s of
+@@ -698,6 +701,7 @@
+   *aSizeOut = heapsSize;
+   return NS_OK;
+ }
++#endif // __GLIBC__
+ 
+ struct SegmentKind {
+   DWORD mState;
diff --git a/srcpkgs/thunderbird/patches/ppc32-skia-portable.patch b/srcpkgs/thunderbird/patches/ppc32-skia-portable.patch
new file mode 100644
index 00000000000..93c625a861e
--- /dev/null
+++ b/srcpkgs/thunderbird/patches/ppc32-skia-portable.patch
@@ -0,0 +1,14 @@
+--- gfx/skia/skia/third_party/skcms/skcms.cc
++++ gfx/skia/skia/third_party/skcms/skcms.cc
+@@ -1806,6 +1806,11 @@ typedef enum {
+     Op_store_ffff,
+ } Op;
+ 
++// work around ICE on 32-bit ppc
++#if defined(__powerpc__) && !defined(__powerpc64__)
++#  define SKCMS_PORTABLE
++#endif
++
+ #if defined(__clang__)
+     template <int N, typename T> using Vec = T __attribute__((ext_vector_type(N)));
+ #elif defined(__GNUC__)
diff --git a/srcpkgs/thunderbird/patches/rust-configure.patch b/srcpkgs/thunderbird/patches/rust-configure.patch
new file mode 100644
index 00000000000..84077f4fc88
--- /dev/null
+++ b/srcpkgs/thunderbird/patches/rust-configure.patch
@@ -0,0 +1,42 @@
+Mozilla rustc check does not support crossbuild: let's remove it
+Remove calls to unwrap_rustup, they fail if rustup isn't present
+
+--- build/moz.configure/rust.configure	2019-07-06 03:48:30.000000000 +0200
++++ build/moz.configure/rust.configure	2019-07-09 22:35:23.326851798 +0200
+@@ -79,9 +79,6 @@
+ 
+     return unwrap
+ 
+-rustc = unwrap_rustup(rustc, 'rustc')
+-cargo = unwrap_rustup(cargo, 'cargo')
+-
+ 
+ set_config('CARGO', cargo)
+ set_config('RUSTC', rustc)
+@@ -294,26 +291,6 @@
+ 
+             os.write(in_fd, source)
+             os.close(in_fd)
+-
+-            cmd = [
+-                rustc,
+-                '--crate-type', 'staticlib',
+-                target_arg,
+-                '-o', out_path,
+-                in_path,
+-            ]
+-
+-            def failed():
+-                die(dedent('''\
+-                Cannot compile for {} with {}
+-                The target may be unsupported, or you may not have
+-                a rust std library for that target installed. Try:
+-
+-                  rustup target add {}
+-                '''.format(host_or_target.alias, rustc, rustc_target.alias)))
+-            check_cmd_output(*cmd, onerror=failed)
+-            if not os.path.exists(out_path) or os.path.getsize(out_path) == 0:
+-                failed()
+         finally:
+             os.remove(in_path)
+             os.remove(out_path)
diff --git a/srcpkgs/thunderbird/patches/rust-cssparser.patch b/srcpkgs/thunderbird/patches/rust-cssparser.patch
new file mode 100644
index 00000000000..1ebef87c014
--- /dev/null
+++ b/srcpkgs/thunderbird/patches/rust-cssparser.patch
@@ -0,0 +1,90 @@
+backport of:
+
+From 3c98d22c5de3b696bf1fde2b6c90069812312aa6 Mon Sep 17 00:00:00 2001
+From: Simon Sapin <simon.sapin@exyr.org>
+Date: Tue, 23 Apr 2019 13:47:25 +0200
+Subject: [PATCH] Fix a future-compat warning
+
+```
+warning[E0506]: cannot assign to `self.input.cached_token` because it is borrowed
+   --> src/parser.rs:591:17
+    |
+566 |     pub fn next_including_whitespace_and_comments(&mut self) -> Result<&Token<'i>, BasicParseError<'i>> {
+    |                                                   - let's call the lifetime of this reference `'1`
+...
+579 |             Some(ref cached_token)
+    |                  ---------------- borrow of `self.input.cached_token` occurs here
+...
+591 |                 self.input.cached_token = Some(CachedToken {
+    |                 ^^^^^^^^^^^^^^^^^^^^^^^ assignment to borrowed `self.input.cached_token` occurs here
+...
+603 |         Ok(token)
+    |         --------- returning this value requires that `self.input.cached_token.0` is borrowed for `'1`
+    |
+    = warning: this error has been downgraded to a warning for backwards compatibility with previous releases
+    = warning: this represents potential undefined behavior in your code and this warning will become a hard error in the future
+```
+---
+ src/parser.rs | 50 +++++++++++++++++++++++++++-----------------------
+ 1 file changed, 27 insertions(+), 23 deletions(-)
+
+diff --git a/src/parser.rs b/src/parser.rs
+index 51f441e4..7cef117c 100644
+--- third_party/rust/cssparser/src/parser.rs
++++ third_party/rust/cssparser/src/parser.rs
+@@ -555,28 +555,34 @@
+         }
+ 
+         let token_start_position = self.input.tokenizer.position();
+-        let token;
+-        match self.input.cached_token {
+-            Some(ref cached_token)
+-            if cached_token.start_position == token_start_position => {
+-                self.input.tokenizer.reset(&cached_token.end_state);
+-                match cached_token.token {
+-                    Token::Function(ref name) => self.input.tokenizer.see_function(name),
+-                    _ => {}
+-                }
+-                token = &cached_token.token
++        let using_cached_token = self
++            .input
++            .cached_token
++            .as_ref()
++            .map_or(false, |cached_token| {
++                cached_token.start_position == token_start_position
++            });
++        let token = if using_cached_token {
++            let cached_token = self.input.cached_token.as_ref().unwrap();
++            self.input.tokenizer.reset(&cached_token.end_state);
++            match cached_token.token {
++                Token::Function(ref name) => self.input.tokenizer.see_function(name),
++                _ => {}
+             }
+-            _ => {
+-                let new_token = self.input.tokenizer.next()
+-                    .map_err(|()| self.new_basic_error(BasicParseErrorKind::EndOfInput))?;
+-                self.input.cached_token = Some(CachedToken {
+-                    token: new_token,
+-                    start_position: token_start_position,
+-                    end_state: self.input.tokenizer.state(),
+-                });
+-                token = self.input.cached_token_ref()
+-            }
+-        }
++            &cached_token.token
++        } else {
++            let new_token = self
++                .input
++                .tokenizer
++                .next()
++                .map_err(|()| self.new_basic_error(BasicParseErrorKind::EndOfInput))?;
++            self.input.cached_token = Some(CachedToken {
++                token: new_token,
++                start_position: token_start_position,
++                end_state: self.input.tokenizer.state(),
++            });
++            self.input.cached_token_ref()
++        };
+ 
+         if let Some(block_type) = BlockType::opening(token) {
+             self.at_start_of = Some(block_type);
diff --git a/srcpkgs/thunderbird/patches/rust-unitialized-field.patch b/srcpkgs/thunderbird/patches/rust-unitialized-field.patch
deleted file mode 100644
index 67ef3a02ab8..00000000000
--- a/srcpkgs/thunderbird/patches/rust-unitialized-field.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- ./media/audioipc/audioipc/src/cmsg.rs.orig	2018-05-09 22:19:14.748631939 +0200
-+++ ./media/audioipc/audioipc/src/cmsg.rs	2018-05-09 22:19:22.961620862 +0200
-@@ -106,11 +106,11 @@ impl ControlMsgBuilder {
-                 return Err(Error::NoSpace);
-             }
- 
--            let cmsghdr = cmsghdr {
--                cmsg_len: cmsg_len as _,
--                cmsg_level: level,
--                cmsg_type: kind,
--            };
-+            use std::mem;
-+            let mut cmsghdr: cmsghdr =  unsafe { mem::zeroed() };
-+            cmsghdr.cmsg_len = cmsg_len as _;
-+            cmsghdr.cmsg_level = level;
-+            cmsghdr.cmsg_type = kind;
- 
-             let cmsghdr = unsafe {
-                 slice::from_raw_parts(&cmsghdr as *const _ as *const _, mem::size_of::<cmsghdr>())
diff --git a/srcpkgs/thunderbird/patches/rust133.patch b/srcpkgs/thunderbird/patches/rust133.patch
deleted file mode 100644
index ebdcac7e3a3..00000000000
--- a/srcpkgs/thunderbird/patches/rust133.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-This fixes build errors under recent Rust.
-
---- servo/components/style_traits/lib.rs
-+++ servo/components/style_traits/lib.rs
-@@ -9,7 +9,7 @@
- #![crate_name = "style_traits"]
- #![crate_type = "rlib"]
- 
--#![deny(unsafe_code, missing_docs)]
-+#![deny(unsafe_code)]
- 
- extern crate app_units;
- #[macro_use] extern crate bitflags;
---- servo/components/style/lib.rs
-+++ servo/components/style/lib.rs
-@@ -23,8 +23,6 @@
- //! [cssparser]: ../cssparser/index.html
- //! [selectors]: ../selectors/index.html
- 
--#![deny(missing_docs)]
--
- extern crate app_units;
- extern crate arrayvec;
- extern crate atomic_refcell;
diff --git a/srcpkgs/thunderbird/patches/sndio.patch b/srcpkgs/thunderbird/patches/sndio.patch
index 097b313e90b..6c72284c19b 100644
--- a/srcpkgs/thunderbird/patches/sndio.patch
+++ b/srcpkgs/thunderbird/patches/sndio.patch
@@ -51,14 +51,14 @@
      ]
 --- build/moz.configure/old.configure.orig
 +++ build/moz.configure/old.configure
-@@ -159,6 +159,7 @@
-     '--enable-accessibility',
-     '--enable-address-sanitizer',
-     '--enable-alsa',
+@@ -169,6 +169,7 @@
+ @old_configure_options(
+     '--cache-file',
+     '--datadir',
 +    '--enable-sndio',
-     '--enable-bundled-fonts',
-     '--enable-clang-plugin',
      '--enable-content-sandbox',
+     '--enable-cookies',
+     '--enable-cpp-rtti',
 --- security/sandbox/linux/broker/SandboxBrokerPolicyFactory.cpp.orig
 +++ security/sandbox/linux/broker/SandboxBrokerPolicyFactory.cpp
 @@ -349,6 +349,21 @@
diff --git a/srcpkgs/thunderbird/patches/yuv-be.patch b/srcpkgs/thunderbird/patches/yuv-be.patch
new file mode 100644
index 00000000000..1c26f2ecced
--- /dev/null
+++ b/srcpkgs/thunderbird/patches/yuv-be.patch
@@ -0,0 +1,48 @@
+# HG changeset patch
+# User A. Wilcox <AWilcox@Wilcox-Tech.com>
+# Date 1543674229 0
+#      Sat Dec 01 14:23:49 2018 +0000
+# Node ID 0309ff19e46b126c527e633518d7de8570442114
+# Parent  53107afbc21ec78e7ac46d37af212505f2032d5d
+Bug 1511604 - Swizzle YCbCr->RGB data on big-endian machines
+
+diff -r 53107afbc21e -r 0309ff19e46b gfx/ycbcr/YCbCrUtils.cpp
+--- gfx/ycbcr/YCbCrUtils.cpp	Wed Nov 07 04:50:21 2018 +0000
++++ gfx/ycbcr/YCbCrUtils.cpp	Sat Dec 01 14:23:49 2018 +0000
+@@ -3,7 +3,9 @@
+  * License, v. 2.0. If a copy of the MPL was not distributed with this
+  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+ 
++#include "mozilla/EndianUtils.h"
+ #include "gfx2DGlue.h"
++#include "mozilla/gfx/Swizzle.h"
+ 
+ #include "YCbCrUtils.h"
+ #include "yuv_convert.h"
+@@ -236,6 +238,13 @@
+                           yuvtype,
+                           srcData.mYUVColorSpace);
+   }
++#if MOZ_BIG_ENDIAN
++  // libyuv makes endian-correct result, which needs to be swapped to BGRX
++  if (aDestFormat != SurfaceFormat::R5G6B5_UINT16)
++    gfx::SwizzleData(aDestBuffer, aStride, gfx::SurfaceFormat::X8R8G8B8,
++                     aDestBuffer, aStride, gfx::SurfaceFormat::B8G8R8X8,
++                     srcData.mPicSize);
++#endif
+ }
+ 
+ void
+@@ -257,6 +266,12 @@
+                         aSrcStrideYA,
+                         aSrcStrideUV,
+                         aDstStrideARGB);
++#if MOZ_BIG_ENDIAN
++  // libyuv makes endian-correct result, which needs to be swapped to BGRA
++  gfx::SwizzleData(aDstARGB, aDstStrideARGB, gfx::SurfaceFormat::A8R8G8B8,
++                   aDstARGB, aDstStrideARGB, gfx::SurfaceFormat::B8G8R8A8,
++                   IntSize(aWidth, aHeight));
++#endif
+ }
+ 
+ } // namespace gfx
diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index 0048d50de61..7aacf91d0af 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -3,24 +3,24 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/thunderbird-i18n".
 #
 pkgname=thunderbird
-version=60.8.0
-revision=2
+version=68.1.0
+revision=1
+build_helper="rust"
 short_desc="Standalone Mail/News reader"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-homepage="https://www.thunderbird.net/"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
+homepage="https://www.thunderbird.net/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=1e7a13e64b63476d2235aaac6823fdab949af45cfcd5a25ee710cbae08c2f5d1
+checksum=de0e5c7d1d5576f451e386e4779f155b7af97621a4e22caac0c6dee3c9d76eef
 
-archs="i686* x86_64* ppc64*"
 lib32disabled=yes
 
-hostmakedepends="autoconf213 unzip zip pkg-config perl python yasm rust cargo
- llvm clang"
+hostmakedepends="autoconf213 unzip zip pkg-config perl python3 yasm rust cargo
+ llvm clang nodejs cbindgen nasm python"
 makedepends="nss-devel libjpeg-turbo-devel gtk+-devel gtk+3-devel icu-devel
  pixman-devel sqlite-devel libevent-devel libnotify-devel libvpx5-devel
- libXrender-devel libXcomposite-devel libSM-devel libXt-devel
- libXdamage-devel hunspell-devel $(vopt_if alsa alsa-lib-devel)
+ libXrender-devel libXcomposite-devel libSM-devel libXt-devel rust-std
+ libXdamage-devel freetype-devel $(vopt_if alsa alsa-lib-devel)
  $(vopt_if dbus dbus-glib-devel) $(vopt_if pulseaudio pulseaudio-devel)
  $(vopt_if startup_notification startup-notification-devel)
  $(vopt_if xscreensaver libXScrnSaver-devel)
@@ -30,15 +30,28 @@ depends="nss>=3.37.3 desktop-file-utils hicolor-icon-theme"
 build_options="alsa dbus pulseaudio startup_notification xscreensaver sndio wayland"
 build_options_default="alsa dbus pulseaudio startup_notification xscreensaver sndio wayland"
 
-if [ "$XBPS_WORDSIZE" -eq 32 ]; then
-	nodebug=yes
-fi
-
 case $XBPS_TARGET_MACHINE in
 	ppc64*) ;;
 	ppc*) broken="ftbfs in several places" ;;
 esac
 
+case $XBPS_TARGET_MACHINE in
+	armv6*)
+		broken="required NEON extensions are not supported on armv6"
+		;;
+	ppc64*) ;;
+	ppc*)
+		makedepends+=" libatomic-devel"
+		;;
+esac
+
+# we need this because cargo verifies checksums of all files in vendor
+# crates when it builds and gives us no way to override or update the
+# file sanely... so just clear out the file list
+_clear_vendor_checksums() {
+	sed -i 's/\("files":{\)[^}]*/\1/' third_party/rust/$1/.cargo-checksum.json
+}
+
 post_extract() {
 	case "$XBPS_TARGET_MACHINE" in
 	*-musl)
@@ -54,13 +67,17 @@ post_extract() {
 	# Note: This is for Void Linux use ONLY.
 	echo -n "cd894504-7a2a-4263-abff-ff73ee89ffca" > mozilla-api-key
 }
+
+post_patch() {
+	_clear_vendor_checksums cssparser
+}
+
 do_build() {
 	cp "${FILESDIR}/mozconfig" "${wrksrc}/.mozconfig"
 
 	case "$XBPS_TARGET_MACHINE" in
 	*-musl)
 		echo "ac_add_options --disable-jemalloc" >>.mozconfig
-		echo "ac_add_options --disable-gold" >>.mozconfig
 		echo "ac_add_options --enable-release" >>.mozconfig
 		;;
 	esac
@@ -71,6 +88,16 @@ do_build() {
 		;;
 	esac
 
+	# webrtc currently fails to build on 32-bit ppc...
+	# also need explicit libatomic
+	case "$XBPS_TARGET_MACHINE" in
+	ppc64*) ;;
+	ppc*)
+		echo "ac_add_options --disable-webrtc" >>.mozconfig
+		export LDFLAGS+=" -latomic"
+		;;
+	esac
+
 	case "$XBPS_TARGET_MACHINE" in
 	x86_64-musl|i686-musl)
 		echo "ac_add_options --host=${XBPS_TRIPLET}" >>.mozconfig
@@ -79,6 +106,14 @@ do_build() {
 	esac
 
 	if [ "$CROSS_BUILD" ]; then
+		BINDGEN_INCLUDE_FLAGS=$( $CPP -x c++ -v /dev/null -o /dev/null 2>&1 | \
+			sed -n '/#include <...> search starts here:/,/End of search list./p' | \
+			sed '1,1d;$d' | sed  's/^ /-I/' | paste -s )
+
+		export BINDGEN_CFLAGS="--target=$XBPS_CROSS_TRIPLET \
+			--sysroot=${XBPS_CROSS_BASE} ${BINDGEN_INCLUDE_FLAGS}"
+		export HOST_CC=cc
+		export TARGET_CC="${CC}"
 		export HOST_CFLAGS="${XBPS_CFLAGS}"
 		export HOST_CXXFLAGS="${XBPS_CXXFLAGS}"
 		export ac_cv_sqlite_secure_delete=yes \
@@ -87,18 +122,37 @@ do_build() {
 			ac_cv_sqlite_dbstat_vtab=yes \
 			ac_cv_sqlite_enable_unlock_notify=yes \
 			ac_cv_prog_hostcxx_works=1
+
 		echo "ac_add_options --target=$XBPS_CROSS_TRIPLET" >>.mozconfig
+		echo "ac_add_options --host=$XBPS_TRIPLET" >>.mozconfig
+	else
+		echo "ac_add_options --target=$XBPS_TRIPLET" >>.mozconfig
+		echo "ac_add_options --host=$XBPS_TRIPLET" >>.mozconfig
 	fi
 
+	mkdir -p third_party/rust/libloading/.deps
+
 	case "$XBPS_TARGET_MACHINE" in
 	i686*)
 		export CFLAGS+=" -D_FILE_OFFSET_BITS=64"
 		export CXXFLAGS+=" -D_FILE_OFFSET_BITS=64"
-		# ENOMEM
-                echo "ac_add_options --disable-debug-symbols" >>.mozconfig
+		;;
+	armv7*)
+		export CFLAGS+=" -mfpu=neon -Wno-psabi"
+		export CXXFLAGS+=" -mfpu=neon -Wno-psabi"
 		;;
 	esac
 
+	# work around large debug symbols on 32-bit hosts
+	if [ "$XBPS_WORDSIZE" = "32" ]; then
+		export CFLAGS="${CFLAGS/-g/-g1}"
+		export CXXFLAGS="${CXXFLAGS/-g/-g1}"
+		export LDFLAGS+=" -Wl,--no-keep-memory"
+		# patch the rust debug level, this is hardcoded
+		sed -i "s/debug_info = '2'/debug_info = '1'/" \
+		 build/moz.configure/toolchain.configure
+	fi
+
 	export LDFLAGS+=" -Wl,-rpath=/usr/lib/thunderbird"
 
 	if [ "$SOURCE_DATE_EPOCH" ]; then
@@ -106,6 +160,10 @@ do_build() {
 	fi
 
 	export MOZ_MAKE_FLAGS="${makejobs}"
+	export MOZ_NOSPAM=1
+	export MOZBUILD_STATE_PATH="${wrksrc}/mozbuild"
+	# avoid error: /usr/bin/as: invalid option -- 'N'
+	unset AS
 
 	cat <<! >>.mozconfig
 ac_add_options --with-google-location-service-api-keyfile="${wrksrc}/google-api-key"
diff --git a/srcpkgs/tig/template b/srcpkgs/tig/template
index 75bcf1c5dfc..f35ff9556ef 100644
--- a/srcpkgs/tig/template
+++ b/srcpkgs/tig/template
@@ -10,8 +10,8 @@ makedepends="ncurses-devel"
 depends="git"
 conf_files="/etc/tigrc"
 short_desc="Text-mode interface for Git"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+maintainer="Lugubris <lugubris@disroot.org>"
+license="GPL-2.0-only"
 homepage="https://jonas.github.io/tig/"
 distfiles="https://github.com/jonas/tig/archive/tig-${version}.tar.gz"
 checksum=833c81b04082ed318ae5fd5342193f086781e74372cf418c2f82a1313b84cedd
diff --git a/srcpkgs/tigervnc/template b/srcpkgs/tigervnc/template
index 26ce524de7e..2e8658830d3 100644
--- a/srcpkgs/tigervnc/template
+++ b/srcpkgs/tigervnc/template
@@ -1,7 +1,7 @@
 # Template file for 'tigervnc'
 pkgname=tigervnc
 version=1.9.0
-revision=1
+revision=2
 _xorg_version=1.20.0
 build_style=cmake
 short_desc="VNC client forked from TightVNC"
diff --git a/srcpkgs/timeshift/template b/srcpkgs/timeshift/template
index 572f5b93ee8..d93e3363d43 100644
--- a/srcpkgs/timeshift/template
+++ b/srcpkgs/timeshift/template
@@ -1,6 +1,6 @@
 # Template file for 'timeshift'
 pkgname=timeshift
-version=19.01
+version=19.08.1
 revision=1
 build_style=gnu-makefile
 conf_files="/etc/default/timeshift.json"
@@ -12,7 +12,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="http://www.teejeetech.in/p/timeshift.html"
 distfiles="https://github.com/teejee2008/timeshift/archive/v${version}.tar.gz"
-checksum=557223cf0b9ab0c4848455e1cc4d9068c607b9f5492a2de4935a2f40393e3c5f
+checksum=ab56331f97c1616b889e69adccedeca06f0150e964eea631b52c9bd399f77604
 
 # Remove hard-dep on crontab, leave up to user to decide
 post_extract() {
diff --git a/srcpkgs/tinc/template b/srcpkgs/tinc/template
index b9cd2097547..5c8c1b48ef9 100644
--- a/srcpkgs/tinc/template
+++ b/srcpkgs/tinc/template
@@ -1,7 +1,7 @@
 # Template file for 'tinc'
 pkgname=tinc
-version=1.0.35
-revision=3
+version=1.0.36
+revision=1
 build_style=gnu-configure
 makedepends="zlib-devel lzo-devel libressl-devel"
 short_desc="VPN (Virtual Private Network) daemon"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.tinc-vpn.org"
 distfiles="${homepage}/packages/${pkgname}-${version}.tar.gz"
-checksum=18c83b147cc3e2133a7ac2543eeb014d52070de01c7474287d3ccecc9b16895e
+checksum=40f73bb3facc480effe0e771442a706ff0488edea7a5f2505d4ccb2aa8163108
 
 post_install() {
 	vsv tincd
diff --git a/srcpkgs/tintin/template b/srcpkgs/tintin/template
index f277a20e188..95297ce7cb5 100644
--- a/srcpkgs/tintin/template
+++ b/srcpkgs/tintin/template
@@ -1,6 +1,6 @@
 # Template file for 'tintin'
 pkgname=tintin
-version=2.01.7
+version=2.01.90
 revision=1
 wrksrc=tt
 build_wrksrc=src
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://tintin.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/tintin/${pkgname}-${version}.tar.gz"
-checksum=fb7c8970855aa57f23bff7859ced0a63f0644f220037d2deb083d6ee2f41760c
+checksum=6b3eef2a993250d7094c5fcd4aa6ea3e2356228b006c70062f5757577c86936c
 
 post_install() {
 	for i in FAQ SCRIPTS README; do
diff --git a/srcpkgs/tinyxml2/template b/srcpkgs/tinyxml2/template
index 4a33042a4e2..73aaf563664 100644
--- a/srcpkgs/tinyxml2/template
+++ b/srcpkgs/tinyxml2/template
@@ -1,14 +1,14 @@
 # Template file for 'tinyxml2'
 pkgname=tinyxml2
-version=7.0.1
+version=7.1.0
 revision=1
 build_style=cmake
 short_desc="Simple, small and efficient C++ XML parser"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Zlib"
 homepage="http://www.grinninglizard.com/tinyxml2/index.html"
 distfiles="https://github.com/leethomason/tinyxml2/archive/${version}.tar.gz"
-checksum=a381729e32b6c2916a23544c04f342682d38b3f6e6c0cad3c25e900c3a7ef1a6
+checksum=68ebd396a4220d5a9b5a621c6e9c66349c5cfdf5efaea3f16e3bb92e45f4e2a3
 
 tinyxml2-devel_package() {
 	depends="tinyxml2-${version}_${revision}"
diff --git a/srcpkgs/tlp/template b/srcpkgs/tlp/template
index c7ba1bc4e74..841ee405a64 100644
--- a/srcpkgs/tlp/template
+++ b/srcpkgs/tlp/template
@@ -6,7 +6,7 @@ archs=noarch
 wrksrc="TLP-${version}"
 depends="hdparm bash iw util-linux ethtool perl"
 short_desc="Advanced power management tool for Linux"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://linrunner.de/en/tlp/docs/tlp-linux-advanced-power-management.html"
 #changelog="https://github.com/linrunner/TLP/blob/master/changelog"
diff --git a/srcpkgs/tmux/template b/srcpkgs/tmux/template
index 0050e3f5a22..3f11d2031cf 100644
--- a/srcpkgs/tmux/template
+++ b/srcpkgs/tmux/template
@@ -1,11 +1,11 @@
 # Template file for 'tmux'
 pkgname=tmux
 version=2.9a
-revision=1
+revision=2
 build_style=gnu-configure
 makedepends="libevent-devel ncurses-devel"
 short_desc="Terminal Multiplexer"
-maintainer="Nathan <ndowens@yahoo.com>"
+maintainer="Nathan <ndowens@gmail.com>"
 license="ISC"
 homepage="https://tmux.github.io"
 changelog="https://raw.githubusercontent.com/tmux/tmux/master/CHANGES"
diff --git a/srcpkgs/tomahawk/template b/srcpkgs/tomahawk/template
index 9dd3b936fb6..073e1b262ac 100644
--- a/srcpkgs/tomahawk/template
+++ b/srcpkgs/tomahawk/template
@@ -1,7 +1,7 @@
 # Template file for 'tomahawk'
 pkgname=tomahawk
 version=0.8.4
-revision=18
+revision=19
 wrksrc=${pkgname}-${_commit}
 _commit=00f602e10203b76fc28b4615868c567e6bd4ced4
 build_style=cmake
@@ -22,7 +22,7 @@ makedepends="Lucene++-devel attica-qt5-devel boost-devel gnutls-devel
  libechonest-qt5-devel liblastfm-qt5-devel phonon-qt5-devel qca-qt5-devel
  qt5-svg-devel qt5-tools-devel qt5-webkit-devel qtkeychain-qt5-devel
  quazip-devel sparsehash taglib-devel vlc-devel libsecret-devel
- $(vopt_if hatchet websocketpp) $(vopt_if xmpp jreen-qt5-devel)
+ $(vopt_if hatchet websocketpp) $(vopt_if xmpp jreen-devel)
  $(vopt_if kde telepathy-qt5-devel)"
 depends="virtual?phonon-qt5-backend qt5-plugin-sqlite $(vopt_if xmpp qca-qt5-ossl)"
 short_desc="Multi-source social music player"
@@ -36,6 +36,10 @@ if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
 fi
 
+case "$XBPS_TARGET_MACHINE" in
+	armv6*) makedepends+=" libatomic-devel"
+esac
+
 tomahawk-devel_package() {
 	depends="tomahawk>=${version}_${revision}"
 	short_desc+=" - development files"
diff --git a/srcpkgs/tomb/template b/srcpkgs/tomb/template
index 96ab14ea876..8c67f338b2b 100644
--- a/srcpkgs/tomb/template
+++ b/srcpkgs/tomb/template
@@ -1,18 +1,18 @@
 # Template file for 'tomb'
 pkgname=tomb
-version=2.6
+version=2.7
 revision=1
 wrksrc=Tomb-${version}
 build_style=gnu-makefile
 hostmakedepends="pkg-config"
 makedepends="libnotify-devel gtk+-devel"
 depends="sudo gnupg cryptsetup pinentry zsh"
-short_desc="A minimalistic commandline tool to manage encrypted volumes"
+short_desc="Minimalistic commandline tool to manage encrypted volumes"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.dyne.org/software/tomb/"
 distfiles="https://files.dyne.org/tomb/releases/Tomb-${version}.tar.gz"
-checksum=02b650a37c4638458f55c84db5fcfdbd57f565685581d691f59155932c9323eb
+checksum=960107427e42cf0ac10b876cdec0e9f898c10a32d078e3370b7d9b7404a06a74
 
 pre_build() {
 	sed -i extras/gtk-tray/Makefile \
@@ -35,4 +35,3 @@ do_install() {
 	make
 	vbin tomb-gtk-tray
 }
-
diff --git a/srcpkgs/toot/template b/srcpkgs/toot/template
index 1a84b430a5d..b6dcdc9ede6 100644
--- a/srcpkgs/toot/template
+++ b/srcpkgs/toot/template
@@ -1,15 +1,16 @@
 # Template file for 'toot'
 pkgname=toot
-version=0.22.0
+version=0.24.0
 revision=1
 archs=noarch
 build_style=python3-module
 pycompile_module="toot"
 hostmakedepends="python3-setuptools"
-depends="python3-BeautifulSoup4 python3-requests python3-setuptools python3-wcwidth"
+depends="python3-BeautifulSoup4 python3-requests python3-setuptools python3-wcwidth
+ python3-urwid"
 short_desc="Mastodon CLI client"
 maintainer="Nathan Owens <ndowens04@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/ihabunek/toot"
 distfiles="https://github.com/ihabunek/toot/archive/${version}.tar.gz"
-checksum=1d1a7596689ed21562cf4fd8514d76d5f19e98e02bd3ada10c44ad0cf0edd3c5
+checksum=645db4d1284cde8d29de1e6852efcb84284e66b55a1847c71b7f32a6ebe658ee
diff --git a/srcpkgs/topgrade/template b/srcpkgs/topgrade/template
index 0eb80b00365..a03c3cff609 100644
--- a/srcpkgs/topgrade/template
+++ b/srcpkgs/topgrade/template
@@ -1,6 +1,6 @@
 # Template file for 'topgrade'
 pkgname=topgrade
-version=2.8.0
+version=3.1.0
 revision=1
 build_style=cargo
 short_desc="Meta upgrade tool for pip, flatpak, your distro and everything else"
@@ -8,4 +8,4 @@ maintainer="jcgruenhage <jan.christian@gruenhage.xyz>"
 license="GPL-3.0-only"
 homepage="https://github.com/r-darwish/topgrade"
 distfiles="https://github.com/r-darwish/topgrade/archive/v${version}.tar.gz"
-checksum=a1c125ddf5f43ecb1c53a7a4b8853f6b31cdf193cf4d4f64070ee224089c8ed2
+checksum=801bec18bf3b9fd3dfa9f8343864e10dd47edae8a1d86a186d9c33a77af2608c
diff --git a/srcpkgs/tor/patches/ppc.patch b/srcpkgs/tor/patches/ppc.patch
new file mode 100644
index 00000000000..c72cdf6ad78
--- /dev/null
+++ b/srcpkgs/tor/patches/ppc.patch
@@ -0,0 +1,35 @@
+--- src/lib/sandbox/sandbox.c
++++ src/lib/sandbox/sandbox.c
+@@ -115,6 +115,16 @@
+ #define REG_SYSCALL 8
+ #define M_SYSCALL regs[REG_SYSCALL]
+ 
++#elif defined(__powerpc64__)
++
++#define REG_SYSCALL 0
++#define M_SYSCALL gp_regs[REG_SYSCALL]
++
++#elif defined(__powerpc__)
++
++#define REG_SYSCALL 0
++#define M_SYSCALL gregs[REG_SYSCALL]
++
+ #endif /* defined(__i386__) || ... */
+ 
+ /**Determines if at least one sandbox is active.*/
+@@ -1613,7 +1623,15 @@ sigsys_debugging(int nr, siginfo_t *info, void *void_context)
+   if (!ctx)
+     return;
+ 
++#if defined(__powerpc__) && !defined(__powerpc64__)
++#if defined(__GLIBC__)
++  syscall = (int) ctx->uc_mcontext.uc_regs->M_SYSCALL;
++#else
++  syscall = (int) ctx->uc_regs->M_SYSCALL;
++#endif
++#else
+   syscall = (int) ctx->uc_mcontext.M_SYSCALL;
++#endif
+ 
+ #ifdef USE_BACKTRACE
+   depth = backtrace(syscall_cb_buf, MAX_DEPTH);
diff --git a/srcpkgs/tor/patches/ppc64.patch b/srcpkgs/tor/patches/ppc64.patch
deleted file mode 100644
index aef2ba51f90..00000000000
--- a/srcpkgs/tor/patches/ppc64.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/lib/sandbox/sandbox.c	2018-12-20 17:33:15.815307612 +0100
-+++ src/lib/sandbox/sandbox.c	2018-12-20 17:36:59.795797024 +0100
-@@ -111,6 +111,11 @@
- #define REG_SYSCALL 8
- #define M_SYSCALL regs[REG_SYSCALL]
- 
-+#elif defined(__powerpc64__)
-+
-+#define REG_SYSCALL 0
-+#define M_SYSCALL gp_regs[REG_SYSCALL]
-+
- #endif /* defined(__i386__) || ... */
- 
- /**Determines if at least one sandbox is active.*/
diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index 14d51fd0dc4..f7f6fba4dfd 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,17 +1,17 @@
 # Template file for 'tor'
 pkgname=tor
-version=0.4.0.5
-revision=2
+version=0.4.1.6
+revision=1
 build_style=gnu-configure
 makedepends="libevent-devel libseccomp-devel zlib-devel"
 depends="ca-certificates torsocks"
-short_desc="Anonymity Online"
-maintainer="Orphaned <orphan@voidlinux.org>"
+short_desc="Anonymizing overlay network"
+maintainer="Daniel Eyßer <daniel.eysser@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.torproject.org/"
-changelog="https://blog.torproject.org/new-release-tor-0405"
-distfiles="https://www.torproject.org/dist/tor-${version}.tar.gz"
-checksum=b5a2cbf0dcd3f1df2675dbd5ec10bbe6f8ae995c41b68cebe2bc95bffc90696e
+changelog="https://blog.torproject.org/new-release-tor-0416"
+distfiles="https://dist.torproject.org/tor-${version}.tar.gz"
+checksum=2a88524ce426079fb9b828bc1b789f2c8ade3ed53c130851102debc3518bed71
 
 conf_files="/etc/tor/torrc"
 system_accounts="tor"
diff --git a/srcpkgs/torbrowser-launcher/template b/srcpkgs/torbrowser-launcher/template
new file mode 100644
index 00000000000..a4aa707495c
--- /dev/null
+++ b/srcpkgs/torbrowser-launcher/template
@@ -0,0 +1,21 @@
+# Template file for 'torbrowser-launcher'
+pkgname=torbrowser-launcher
+version=0.3.2
+revision=1
+archs="i686 x86_64" # limited by Tor Browser itself
+build_style=python3-module
+pycompile_module="torbrowser_launcher"
+hostmakedepends="python3-setuptools"
+depends="python3-PyQt5 python3-gpg python3-requests python3-pysocks gnupg2 tor"
+short_desc="Securely download, verify and run Tor Browser"
+maintainer="Daniel Eyßer <daniel.eysser@gmail.com>"
+license="MIT"
+homepage="https://github.com/micahflee/torbrowser-launcher"
+changelog="https://raw.githubusercontent.com/micahflee/torbrowser-launcher/master/CHANGELOG.md"
+distfiles="https://github.com/micahflee/torbrowser-launcher/archive/v${version}.tar.gz"
+checksum=25ad4b0c70579628bf18f4cdcd18ac303fe4f7f1c590cc48df2a87651c92991c
+
+post_install() {
+	vlicense LICENSE
+	rm ${DESTDIR}/usr/share/locale/torbrowser-launcher.mo # installed twice
+}
diff --git a/srcpkgs/totem/template b/srcpkgs/totem/template
index 8db4a834beb..81522b31488 100644
--- a/srcpkgs/totem/template
+++ b/srcpkgs/totem/template
@@ -1,6 +1,6 @@
 # Template file for 'totem'
 pkgname=totem
-version=3.32.1
+version=3.34.1
 revision=1
 build_style=meson
 build_helper="gir"
@@ -21,7 +21,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Videos"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7b646865083b40b6ba4fd1e846448f9c345433cc0ccdd08ee3b7eac3ae422a7b
+checksum=6bf89ab096dfc564f260976e484165f09bd886434d184410d2f944bfba611a09
 
 # XXX xulrunner plugin.
 # XXX reenable python plugin if pylint pkg exists.
diff --git a/srcpkgs/tox/template b/srcpkgs/tox/template
index c735c42c37c..8c6b63a3cb1 100644
--- a/srcpkgs/tox/template
+++ b/srcpkgs/tox/template
@@ -1,6 +1,6 @@
 # Template file for 'tox'
 pkgname=tox
-version=3.13.2
+version=3.14.0
 revision=1
 build_style=python3-module
 pycompile_module="tox"
@@ -13,7 +13,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="MIT"
 homepage="https://tox.readthedocs.io/en/latest/"
 distfiles="${PYPI_SITE}/t/tox/tox-${version}.tar.gz"
-checksum=ee35ffce74933a6c6ac10c9a0182e41763140a5a5070e21b114feca56eaccdcd
+checksum=c4f6b319c20ba4913dbfe71ebfd14ff95d1853c4231493608182f66e566ecfe1
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/translate-shell/template b/srcpkgs/translate-shell/template
index 9119ba47479..99475738ac3 100644
--- a/srcpkgs/translate-shell/template
+++ b/srcpkgs/translate-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'translate-shell'
 pkgname=translate-shell
-version=0.9.6.10
+version=0.9.6.11
 revision=1
 build_style=gnu-makefile
 make_build_args="$(vopt_if zsh TARGET=zsh)"
@@ -12,7 +12,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="Unlicense"
 homepage="https://www.soimort.org/translate-shell"
 distfiles="https://github.com/soimort/translate-shell/archive/v${version}.tar.gz"
-checksum=18c23af071ab5ae8653a5d0d1c50784b32c4a51efd9e05da07f888a6a6428958
+checksum=589505248212726dff2b3e8828514036491f019fcee8657c0d94bb1a5dac6c5b
 
 build_options="zsh"
 desc_option_zsh="Use zsh compatible wrapper"
diff --git a/srcpkgs/tty-clock/template b/srcpkgs/tty-clock/template
index b3871ee98e0..8d2b8e1282b 100644
--- a/srcpkgs/tty-clock/template
+++ b/srcpkgs/tty-clock/template
@@ -1,15 +1,18 @@
 # Template file for 'tty-clock'
 pkgname=tty-clock
 version=2.3
-revision=1
-replaces="tty-clock-git>=0"
+revision=2
 makedepends="ncurses-devel"
 short_desc="Digital clock in ncurses"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3"
+maintainer="Lugubris <lugubris@disroot.org>"
+license="BSD-3-Clause"
 homepage="https://github.com/xorg62/tty-clock"
-distfiles="https://github.com/xorg62/tty-clock/archive/v${version}.tar.gz"
-checksum=343e119858db7d5622a545e15a3bbfde65c107440700b62f9df0926db8f57984
+distfiles="https://github.com/xorg62/tty-clock/archive/v${version}.tar.gz
+ https://raw.githubusercontent.com/xorg62/tty-clock/master/LICENSE"
+checksum="343e119858db7d5622a545e15a3bbfde65c107440700b62f9df0926db8f57984
+ 19b60b629c724d426ce56bfd8effefa03555c4bafd757e66063722c9178cc971"
+replaces="tty-clock-git>=0"
+skip_extraction="LICENSE"
 
 do_build() {
 	make CC="$CC" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS -lncursesw"
@@ -19,3 +22,7 @@ do_install() {
 	vbin tty-clock
 	vman tty-clock.1
 }
+
+post_install() {
+	vlicense  ${XBPS_SRCDISTDIR}/${pkgname}-${version}/LICENSE
+}
diff --git a/srcpkgs/ttyd/template b/srcpkgs/ttyd/template
index 3fb224a0e08..0190f1c9943 100644
--- a/srcpkgs/ttyd/template
+++ b/srcpkgs/ttyd/template
@@ -1,6 +1,6 @@
 # Template file for 'ttyd'
 pkgname=ttyd
-version=1.5.1
+version=1.5.2
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config xxd"
@@ -10,7 +10,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="MIT"
 homepage="https://tsl0922.github.io/ttyd/"
 distfiles="https://github.com/tsl0922/ttyd/archive/${version}.tar.gz"
-checksum=817d33d59834f9a76af99f689339722fc1ec9f3c46c9a324665b91cb44d79ee8
+checksum=b5b62ec2ce08add0173e6d1dfdd879e55f02f9490043e89f389981a62e87d376
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/tudu/template b/srcpkgs/tudu/template
index f1dc6a0edd1..0786cb1d095 100644
--- a/srcpkgs/tudu/template
+++ b/srcpkgs/tudu/template
@@ -1,13 +1,13 @@
 # Template file for 'tudu'
 pkgname=tudu
-version=0.10.2
+version=0.10.3
 revision=1
 build_style=gnu-configure
 conf_files="/etc/tudurc"
 makedepends="ncurses-devel"
-short_desc="A command line interface to manage hierarchical todos"
+short_desc="Ncurses-based tool to manage hierarchical todos"
 maintainer="Eivind Uggedal <eivind@uggedal.com>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="http://code.meskio.net/tudu/"
 distfiles="http://code.meskio.net/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=d5e32ce04033470d2315d97cb8d44d88f19c93bfba16f61bf0681b16da6656f7
+checksum=5e58b48aa182a4bc881e0f548451920781351af42825cdb52fa0b15308bf8004
diff --git a/srcpkgs/tuir/template b/srcpkgs/tuir/template
index 2f1ba471b5b..dfc0b15c535 100644
--- a/srcpkgs/tuir/template
+++ b/srcpkgs/tuir/template
@@ -1,6 +1,6 @@
 # Template file for 'tuir'
 pkgname=tuir
-version=1.28.2
+version=1.28.3
 revision=1
 archs=noarch
 wrksrc="$pkgname-v$version"
@@ -14,7 +14,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://gitlab.com/ajak/tuir"
 distfiles="${homepage}/-/archive/v${version}/tuir-v${version}.tar.bz2"
-checksum=ad9c7af1958ee72c405a96baa4f8c3814a852574b65411e60ab0ef8778901df4
+checksum=115c209b6ded5342407c673f5cd7699c686b469f5574ac784221cc7419f664ba
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/turses/template b/srcpkgs/turses/template
index f06efd1ed9f..e5d2e11c97a 100644
--- a/srcpkgs/turses/template
+++ b/srcpkgs/turses/template
@@ -4,7 +4,7 @@ version=0.3.1
 revision=1
 build_style=python2-module
 short_desc="A Twitter client for the console"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 hostmakedepends="python-setuptools"
 depends="python-urwid python-future python-tweepy python-backports.configparser"
 license="GPL-3"
diff --git a/srcpkgs/txr/template b/srcpkgs/txr/template
index ddc98a055f7..141593d986e 100644
--- a/srcpkgs/txr/template
+++ b/srcpkgs/txr/template
@@ -1,6 +1,6 @@
 # Template file for 'txr'
 pkgname=txr
-version=223
+version=225
 revision=1
 build_style=configure
 make_check_target=tests
@@ -10,7 +10,7 @@ maintainer="Oliver Kiddle <okiddle@yahoo.co.uk>"
 license="BSD-2-Clause"
 homepage="http://www.nongnu.org/txr/"
 distfiles="http://www.kylheku.com/cgit/txr/snapshot/${pkgname}-${version}.tar.bz2"
-checksum=9bb9100c11ea958b42ed6c5e8b4c9cb95dc758a9b7a1d2e750eb3ddc22c20904
+checksum=d277c77369637afce7f43f9ff05a22a8896bafb8f70e5a428e5a64b96b06701f
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" txr"
diff --git a/srcpkgs/txtw/template b/srcpkgs/txtw/template
index 638eb000a26..59e57d5542c 100644
--- a/srcpkgs/txtw/template
+++ b/srcpkgs/txtw/template
@@ -6,7 +6,7 @@ build_style=gnu-makefile
 make_use_env=compliant
 makedepends="cairo-devel"
 short_desc="Return the pixel width of the given strings for a given font"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Unlicense"
 homepage="https://github.com/baskerville/txtw"
 distfiles="https://github.com/baskerville/txtw/archive/${version}.tar.gz"
diff --git a/srcpkgs/tzdata/template b/srcpkgs/tzdata/template
index 058aa5ec430..aafa8cfd072 100644
--- a/srcpkgs/tzdata/template
+++ b/srcpkgs/tzdata/template
@@ -1,6 +1,6 @@
 # Template file for 'tzdata'
 pkgname=tzdata
-version=2019b
+version=2019c
 revision=1
 archs=noarch
 wrksrc=tzdata
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Public Domain"
 homepage="http://www.iana.org/time-zones"
 distfiles="http://www.iana.org/time-zones/repository/releases/tzdata${version}.tar.gz"
-checksum=05d9092c90dcf9ec4f3ccfdea80c7dcea5e882b3b105c3422da172aaa9a50c64
+checksum=79c7806dab09072308da0e3d22c37d3b245015a591891ea147d3b133b60ffc7c
 
 do_install() {
 	local timezones="africa antarctica asia australasia europe northamerica \
diff --git a/srcpkgs/tzutils/template b/srcpkgs/tzutils/template
index 3d82ca54358..76e5cd69dbc 100644
--- a/srcpkgs/tzutils/template
+++ b/srcpkgs/tzutils/template
@@ -1,14 +1,14 @@
 # Template file for 'tzutils'
 pkgname=tzutils
-version=2019b
+version=2019c
 revision=1
 wrksrc="tz-${version}"
 short_desc="Time zone and daylight-saving time utilities"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Public Domain"
+maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
+license="Public Domain, BSD-3-Clause"
 homepage="https://www.iana.org/time-zones"
 distfiles="https://github.com/eggert/tz/archive/${version}.tar.gz"
-checksum=e51485f59c96a2a31170ac0700d0b76c8627ca00fa4040987352ca44cdd0887b
+checksum=38b1f7c7a050daa14fb07f6b72cdde1fc895fece40758d4d55736847041ad9e2
 
 do_build() {
 	make TZDIR=/usr/share/zoneinfo CC=$CC CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
@@ -22,3 +22,7 @@ do_install() {
 	vman zdump.8
 	vman tzselect.8
 }
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/ucspi-ssl/template b/srcpkgs/ucspi-ssl/template
index 6f490c0adab..a0b154efcf8 100644
--- a/srcpkgs/ucspi-ssl/template
+++ b/srcpkgs/ucspi-ssl/template
@@ -1,7 +1,7 @@
 # Template file for 'ucspi-ssl'
 pkgname=ucspi-ssl
 version=0.99e
-revision=2
+revision=3
 create_wrksrc=yes
 build_wrksrc="host/superscript.com/net/${pkgname}-${version}/src"
 build_style=gnu-makefile
diff --git a/srcpkgs/ufetch/template b/srcpkgs/ufetch/template
index 989dcb76523..a8b5f8cb6cf 100644
--- a/srcpkgs/ufetch/template
+++ b/srcpkgs/ufetch/template
@@ -6,7 +6,7 @@ archs=noarch
 wrksrc="ufetch-v${version}"
 depends="xbps coreutils ncurses"
 short_desc="Tiny system info for Void"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="ISC"
 homepage="https://gitlab.com/jschx/ufetch"
 distfiles="https://gitlab.com/jschx/ufetch/-/archive/v${version}/ufetch-v${version}.tar.gz"
diff --git a/srcpkgs/uget/template b/srcpkgs/uget/template
index d6d9e6d832f..a6ec77d74ef 100644
--- a/srcpkgs/uget/template
+++ b/srcpkgs/uget/template
@@ -1,7 +1,7 @@
 # Template file for 'uget'
 pkgname=uget
-version=2.2.1
-revision=4
+version=2.2.2
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="libnotify-devel gtk+3-devel libcurl-devel gstreamer1-devel"
@@ -10,4 +10,4 @@ maintainer="Alexander Mamay <alexander@mamay.su>"
 license="LGPL-2.1-or-later"
 homepage="http://ugetdm.com/"
 distfiles="${SOURCEFORGE_SITE}/urlget/${pkgname}-${version}.tar.gz"
-checksum=445cf58799a9a06e08cd4180b172f4b0a8a8c2ee82da732bdfe2dd502d949936
+checksum=5cf7f311ef59bd02b71e0ce750dd37a0299ef15f9f6c6e7e60ffd175409abfc2
diff --git a/srcpkgs/umbrello/template b/srcpkgs/umbrello/template
index 05fd6e29408..e662e17b3b2 100644
--- a/srcpkgs/umbrello/template
+++ b/srcpkgs/umbrello/template
@@ -1,17 +1,17 @@
 # Template file for 'umbrello'
 pkgname=umbrello
-version=19.08.0
+version=19.08.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
-hostmakedepends="extra-cmake-modules kcoreaddons kconfig kdoctools python qt5-host-tools qt5-qmake"
+hostmakedepends="extra-cmake-modules kcoreaddons kconfig kdoctools qt5-host-tools qt5-qmake"
 makedepends="kdelibs4support-devel ktexteditor-devel qt5-webkit-devel"
 short_desc="UML modelling tool and code generator"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://umbrello.kde.org/"
 distfiles="${KDE_SITE}/applications/${version}/src/umbrello-${version}.tar.xz"
-checksum=8df6e0394670ee3f91f449a3110312a37876d3aa047442ed8439d8b876a6b0e2
+checksum=69a721d27ecedbe694d232e04469002dcf2319dd320982aacc2a02e32430c382
 
 pre_configure() {
 	vsed -i CMakeLists.txt -e 's/# set default umbrello version/set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-suggest-override")/'
diff --git a/srcpkgs/unbound/template b/srcpkgs/unbound/template
index 6614f77681f..c4deafd3af1 100644
--- a/srcpkgs/unbound/template
+++ b/srcpkgs/unbound/template
@@ -1,6 +1,6 @@
 # Template file for 'unbound'
 pkgname=unbound
-version=1.9.2
+version=1.9.4
 revision=1
 build_style=gnu-configure
 configure_args="--with-libevent --with-conf-file=/etc/unbound/unbound.conf
@@ -16,7 +16,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://unbound.net/"
 distfiles="https://unbound.net/downloads/${pkgname}-${version}.tar.gz"
-checksum=6f7acec5cf451277fcda31729886ae7dd62537c4f506855603e3aa153fcb6b95
+checksum=3d3e25fb224025f0e732c7970e5676f53fd1764c16d6a01be073a13e42954bb0
 system_accounts="_unbound"
 
 post_install() {
@@ -37,4 +37,3 @@ unbound-devel_package() {
 		vmove usr/share/man/man3
 	}
 }
-
diff --git a/srcpkgs/unison/template b/srcpkgs/unison/template
index abdf9a02831..0f561b50bc5 100644
--- a/srcpkgs/unison/template
+++ b/srcpkgs/unison/template
@@ -1,7 +1,7 @@
 # Template file for 'unison'
 pkgname="unison"
 version=2.51.2
-revision=3
+revision=4
 hostmakedepends="ocaml"
 short_desc="A file-synchronization tool"
 maintainer="allan <mail@may.mooo.com>"
diff --git a/srcpkgs/unrar/template b/srcpkgs/unrar/template
index ea6121dd852..da0b5935eac 100644
--- a/srcpkgs/unrar/template
+++ b/srcpkgs/unrar/template
@@ -1,14 +1,14 @@
 # Template file for 'unrar'
 pkgname=unrar
-version=5.7.5
+version=5.8.2
 revision=1
 wrksrc=unrar
 short_desc="Unarchiver for .rar files (non-free version)"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="freeware"
+license="custom:freeware"
 homepage="https://www.rarlab.com/rar_add.htm"
 distfiles="https://www.rarlab.com/rar/unrarsrc-${version}.tar.gz"
-checksum=e1c2fddaa87a88b1535bfc10ca484f3c5af4e5a55fbb933f8819e26203bbe2ee
+checksum=33386623fd3fb153b56292df4a6a69b457e69e1803b6d07b614e5fd22fb33dda
 repository=nonfree
 
 do_build() {
diff --git a/srcpkgs/urh/template b/srcpkgs/urh/template
index aaa9ec03e39..2cec83082fd 100644
--- a/srcpkgs/urh/template
+++ b/srcpkgs/urh/template
@@ -1,6 +1,6 @@
 # Template file for 'urh'
 pkgname=urh
-version=2.7.3
+version=2.7.5
 revision=1
 build_style=python3-module
 pycompile_module="urh"
@@ -13,7 +13,7 @@ maintainer="bra1nwave <brainwave@openmailbox.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/jopohl/urh"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=2f82f5854dbefd2b7a11d6444b66204107ab6634ed1f90bf676b727725b18554
+checksum=fa3bba4447130a2aa0e9d0e1ff7a90ac87a5c76e8401f27a95721a8fdb11d5f2
 
 post_install() {
 	vinstall data/urh.desktop 644 usr/share/applications
diff --git a/srcpkgs/urlscan/template b/srcpkgs/urlscan/template
index 340cd9a6b78..f6f0d1db07b 100644
--- a/srcpkgs/urlscan/template
+++ b/srcpkgs/urlscan/template
@@ -1,6 +1,6 @@
 # Template file for 'urlscan'
 pkgname=urlscan
-version=0.9.3
+version=0.9.4
 revision=1
 archs=noarch
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Crestwave <crest.wave@yahoo.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/firecat53/urlscan"
 distfiles="https://github.com/firecat53/urlscan/archive/${version}.tar.gz"
-checksum=d3eaef486df70da85614b51a383fa5d570b6253c147349da29df04cd36ed7955
+checksum=fc76c3c8a852f1fbdde69faa336184b7f060b33e8e4573d6ffa8790ed6f429b6
diff --git a/srcpkgs/usbguard/files/usbguard/run b/srcpkgs/usbguard/files/usbguard/run
new file mode 100644
index 00000000000..9c33365a71e
--- /dev/null
+++ b/srcpkgs/usbguard/files/usbguard/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec usbguard-daemon
diff --git a/srcpkgs/usbguard/patches/musl.patch b/srcpkgs/usbguard/patches/musl.patch
new file mode 100644
index 00000000000..066c70c8e86
--- /dev/null
+++ b/srcpkgs/usbguard/patches/musl.patch
@@ -0,0 +1,84 @@
+--- src/CLI/usbguard.cpp.orig	2019-06-13 11:51:53.787863657 +0000
++++ src/CLI/usbguard.cpp	2019-08-23 01:52:34.233056882 +0000
+@@ -26,10 +26,8 @@
+ #include <map>
+ #include <iostream>
+ 
+-#ifndef _GNU_SOURCE
+-  #define _GNU_SOURCE
+-#endif
+-#include <cstring> /* GNU version of basename(3) */
++#include <cstring>
++#include <libgen.h>
+ 
+ #include "usbguard.hpp"
+ #include "usbguard-get-parameter.hpp"
+@@ -99,7 +97,7 @@
+ 
+   static int usbguard_cli(int argc, char* argv[])
+   {
+-    usbguard_arg0 = ::basename(argv[0]);
++    usbguard_arg0 = ::basename(strdup(argv[0]));
+ 
+     if (argc == 1) {
+       showTopLevelHelp();
+--- src/CLI/usbguard-rule-parser.cpp.orig	2019-06-13 11:51:53.783863704 +0000
++++ src/CLI/usbguard-rule-parser.cpp	2019-08-23 01:52:34.234056870 +0000
+@@ -24,10 +24,8 @@
+ #include "RuleParser.hpp"
+ 
+ #include <iostream>
+-#ifndef _GNU_SOURCE
+-  #define _GNU_SOURCE
+-#endif
+ #include <cstring>
++#include <libgen.h>
+ #include <fstream>
+ 
+ #include <getopt.h>
+@@ -43,8 +41,10 @@
+ 
+ static void showHelp(std::ostream& stream, const char* usbguard_arg0)
+ {
+-  stream << " Usage: " << ::basename(usbguard_arg0) << " [OPTIONS] <rule_spec>" << std::endl;
+-  stream << " Usage: " << ::basename(usbguard_arg0) << " [OPTIONS] -f <file>" << std::endl;
++  char *usbguard_arg0_copy = strdup(usbguard_arg0);
++  stream << " Usage: " << ::basename(usbguard_arg0_copy) << " [OPTIONS] <rule_spec>" << std::endl;
++  stream << " Usage: " << ::basename(usbguard_arg0_copy) << " [OPTIONS] -f <file>" << std::endl;
++  free(usbguard_arg0_copy);
+   stream << std::endl;
+   stream << " Options:" << std::endl;
+   stream << "  -f, --file       Interpret the argument as a path to a file that should be parsed." << std::endl;
+--- src/DBus/gdbus-server.cpp.orig	2019-06-28 08:45:27.616687137 +0000
++++ src/DBus/gdbus-server.cpp	2019-08-23 01:52:34.274056367 +0000
+@@ -23,6 +23,7 @@
+ #include <stdlib.h>
+ #include <iostream>
+ #include <getopt.h>
++#include <libgen.h>
+ #include "DBusBridge.hpp"
+ 
+ static usbguard::DBusBridge* dbus_bridge = nullptr;
+@@ -208,7 +209,9 @@
+ 
+ static void showHelp(std::ostream& stream)
+ {
+-  stream << " Usage: " << ::basename(usbguard_arg0) << " [OPTIONS]" << std::endl;
++  char *usbguard_arg0_copy = strdup(usbguard_arg0);
++  stream << " Usage: " << ::basename(usbguard_arg0_copy) << " [OPTIONS]" << std::endl;
++  free(usbguard_arg0_copy);
+   stream << std::endl;
+   stream << " Options:" << std::endl;
+   stream << "  -s, --system   Listen on the system bus." << std::endl;
+--- src/Library/public/usbguard/Exception.hpp.orig	2019-06-28 08:45:27.620687089 +0000
++++ src/Library/public/usbguard/Exception.hpp	2019-08-23 01:52:34.323055751 +0000
+@@ -116,7 +116,8 @@
+     static std::string reasonFromErrno(const int errno_value)
+     {
+       char buffer[1024];
+-      return std::string(strerror_r(errno_value, buffer, sizeof buffer));
++      strerror_r(errno_value, buffer, sizeof buffer);
++      return std::string(buffer);
+     }
+   };
+ 
diff --git a/srcpkgs/usbguard/template b/srcpkgs/usbguard/template
new file mode 100644
index 00000000000..f4de1be507d
--- /dev/null
+++ b/srcpkgs/usbguard/template
@@ -0,0 +1,20 @@
+# Template file for 'usbguard'
+pkgname=usbguard
+version=0.7.5
+revision=1
+build_style=gnu-configure
+configure_args="--with-crypto-library=sodium --with-bundled-catch --with-bundled-pegtl"
+conf_files="/etc/usbguard/*"
+make_dirs="/var/log/usbguard 0755 root root"
+hostmakedepends="automake libtool pkg-config asciidoc glib-devel protobuf"
+makedepends="libqb-devel libsodium-devel protobuf-devel dbus-glib-devel polkit-devel libcap-ng-devel libseccomp-devel"
+short_desc="Tool for whitelisting and blacklisting USB devices"
+maintainer="Philoponus Bindle <philoponus-bindle@protonmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://usbguard.github.io"
+distfiles="https://github.com/USBGuard/usbguard/releases/download/usbguard-$version/usbguard-$version.tar.gz"
+checksum=ab98091969bf4ea68d7a950997cd7af98ddac84558aa6dfe733e8fa0a936454a
+
+post_install() {
+	vsv usbguard
+}
diff --git a/srcpkgs/user-manager/template b/srcpkgs/user-manager/template
index 9becb44c393..b2c54cea4be 100644
--- a/srcpkgs/user-manager/template
+++ b/srcpkgs/user-manager/template
@@ -1,6 +1,6 @@
 # Template file for 'user-manager'
 pkgname=user-manager
-version=5.16.4
+version=5.17.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/plasma/user-manager"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3dd29a6abf8c15014ed87a448b13190516e16d8dc3a67d56f05f62d1f2e1b745
+checksum=659fab189915140e136c426d6a22852f9685ab85f1fec07a44faaa7a663c8d3d
diff --git a/srcpkgs/usql/template b/srcpkgs/usql/template
index f9ed514eba7..7f340cbebc8 100644
--- a/srcpkgs/usql/template
+++ b/srcpkgs/usql/template
@@ -1,16 +1,16 @@
 # Template file for 'usql'
 pkgname=usql
-version=0.7.4
+version=0.7.5
 revision=1
 build_style=go
 go_import_path=github.com/xo/usql
 hostmakedepends="git"
 short_desc="Universal command-line interface for SQL databases"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/xo/usql"
 distfiles="https://github.com/xo/usql/archive/v${version}.tar.gz"
-checksum=fbb1c48c49ce20c30042c9c5498d021ac8980b796287f2cbd5277178f7f8b683
+checksum=5f0478611ecaa8f069796462fdf81386fe8f53ec52aa2ec90db6e066010b597f
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/util-linux/patches/chsh.patch b/srcpkgs/util-linux/patches/chsh.patch
new file mode 100644
index 00000000000..d2cbd0d8ddf
--- /dev/null
+++ b/srcpkgs/util-linux/patches/chsh.patch
@@ -0,0 +1,89 @@
+Patch by Quentin Rameau <quinq@fifth.space>:
+use getpwuid_r since chsh uses readline (which does tilde expansion)
+can overwrite the getpwuid buffer on musl in the meantime.
+
+https://inbox.vuxu.org/voidlinux/20190922131237.93849-1-quinq@fifth.space/
+https://lore.kernel.org/util-linux/20190921185021.10568-1-quinq@fifth.space/
+
+--- include/pwdutils.h
++++ include/pwdutils.h
+@@ -5,6 +5,7 @@
+ #include <pwd.h>
+ 
+ extern struct passwd *xgetpwnam(const char *username, char **pwdbuf);
++extern struct passwd *xgetpwuid(uid_t uid, char **pwdbuf);
+ extern char *xgetlogin(void);
+ 
+ #endif /* UTIL_LINUX_PWDUTILS_H */
+--- lib/pwdutils.c
++++ lib/pwdutils.c
+@@ -36,6 +36,34 @@ failed:
+ 	return NULL;
+ }
+ 
++struct passwd *xgetpwuid(uid_t uid, char **pwdbuf)
++{
++	struct passwd *pwd = NULL, *res = NULL;
++	int rc;
++
++	if (!pwdbuf)
++		return NULL;
++
++	*pwdbuf = xmalloc(UL_GETPW_BUFSIZ);
++	pwd = xcalloc(1, sizeof(struct passwd));
++
++	errno = 0;
++	rc = getpwuid_r(uid, pwd, *pwdbuf, UL_GETPW_BUFSIZ, &res);
++	if (rc != 0) {
++		errno = rc;
++		goto failed;
++	}
++	if (!res) {
++		errno = EINVAL;
++		goto failed;
++	}
++	return pwd;
++failed:
++	free(pwd);
++	free(*pwdbuf);
++	return NULL;
++}
++
+ char *xgetlogin(void)
+ {
+ 	struct passwd *pw = NULL;
+--- login-utils/chsh.c
++++ login-utils/chsh.c
+@@ -38,6 +38,7 @@
+ #include "islocal.h"
+ #include "nls.h"
+ #include "pathnames.h"
++#include "pwdutils.h"
+ #include "setpwnam.h"
+ #include "strutils.h"
+ #include "xalloc.h"
+@@ -253,7 +254,7 @@ static void check_shell(const char *shell)
+ 
+ int main(int argc, char **argv)
+ {
+-	char *oldshell;
++	char *oldshell, *pwbuf;
+ 	int nullshell = 0;
+ 	const uid_t uid = getuid();
+ 	struct sinfo info = { NULL };
+@@ -267,12 +268,12 @@ int main(int argc, char **argv)
+ 
+ 	parse_argv(argc, argv, &info);
+ 	if (!info.username) {
+-		pw = getpwuid(uid);
++		pw = xgetpwuid(uid, &pwbuf);
+ 		if (!pw)
+ 			errx(EXIT_FAILURE, _("you (user %d) don't exist."),
+ 			     uid);
+ 	} else {
+-		pw = getpwnam(info.username);
++		pw = xgetpwnam(info.username, &pwbuf);
+ 		if (!pw)
+ 			errx(EXIT_FAILURE, _("user \"%s\" does not exist."),
+ 			     info.username);
+
diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template
index 8a06c8f1e3c..9f912097d85 100644
--- a/srcpkgs/util-linux/template
+++ b/srcpkgs/util-linux/template
@@ -1,7 +1,7 @@
 # Template file for 'util-linux'
 pkgname=util-linux
 version=2.34
-revision=1
+revision=2
 hostmakedepends="automake bison gettext-devel libtool pkg-config"
 makedepends="libcap-ng-devel pam-devel readline-devel zlib-devel"
 checkdepends="ncurses" # Some tests require terminfo-entries
diff --git a/srcpkgs/utox/template b/srcpkgs/utox/template
index 50c6972e63d..d04cc5c5748 100644
--- a/srcpkgs/utox/template
+++ b/srcpkgs/utox/template
@@ -1,7 +1,7 @@
 # Template file for 'utox'
 pkgname=utox
-version=0.17.0
-revision=3
+version=0.17.1
+revision=1
 wrksrc=uTox
 build_style=cmake
 configure_args="-DENABLE_ASAN=OFF"
@@ -9,12 +9,12 @@ hostmakedepends="pkg-config"
 makedepends="check-devel dbus-devel filter_audio-devel fontconfig-devel
  libXrender-devel libopenal-devel libsodium-devel libvpx-devel opus-devel
  toxcore-devel v4l-utils-devel"
-short_desc="Lightweight TOX instant messenger client written in C"
+short_desc="Lightweight Tox instant messenger client written in C"
 maintainer="Spencer Hill <spencernh77@gmail.com>"
 license="MIT"
 homepage="http://utox.io/"
 distfiles="https://github.com/uTox/uTox/releases/download/v${version}/uTox-${version}-full.tar.gz"
-checksum=219ae83e9139d3a421c7bb6d03cc3f8953dd36fb8e8b67100d47d92d413e9d46
+checksum=6a6d399827f31593f840274b08ed80039c99d5abf0bd6634faf22cc064930460
 nocross=yes
 
 post_install() {
diff --git a/srcpkgs/vagrant/template b/srcpkgs/vagrant/template
index 644ad031360..c3466215595 100644
--- a/srcpkgs/vagrant/template
+++ b/srcpkgs/vagrant/template
@@ -1,7 +1,7 @@
 # Template file for 'vagrant'
 pkgname=vagrant
-version=2.2.5
-revision=2
+version=2.2.6
+revision=1
 archs="i686 x86_64"
 hostmakedepends="ruby"
 makedepends="ruby-devel zlib-devel"
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 homepage="https://www.vagrantup.com/"
 distfiles="https://github.com/mitchellh/${pkgname}/archive/v${version}.tar.gz"
-checksum=0a228f5185b24b72efcc5a3924f86fa9fabab6f7562c3c63c1d9d239aa72a7b1
+checksum=1bdafbce594cb17b9b4a7d85ba3dc35093d6693b1717280e062ec64ca2c05a5b
 nocross=yes
 
 post_extract() {
diff --git a/srcpkgs/vala-panel-appmenu/template b/srcpkgs/vala-panel-appmenu/template
index fa197105c43..0913a270047 100644
--- a/srcpkgs/vala-panel-appmenu/template
+++ b/srcpkgs/vala-panel-appmenu/template
@@ -1,7 +1,7 @@
 # Template file for 'vala-panel-appmenu'
 pkgname=vala-panel-appmenu
 version=0.7.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_XFCE=ON -DENABLE_VALAPANEL=ON
  -DENABLE_MATE=ON -DENABLE_JAYATANA=OFF -DENABLE_APPMENU_GTK_MODULE=ON"
@@ -31,7 +31,7 @@ post_install() {
 appmenu-gtk-module-devel_package() {
 	short_desc="GTK module for exposing menus - development files"
 	depends="appmenu-gtk-module-${version}_${revision}
-	 appmenu-gkt3-module-${version}_${revision}"
+	 appmenu-gtk3-module-${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
diff --git a/srcpkgs/vala/template b/srcpkgs/vala/template
index f0ac1f6007b..a3001e75b98 100644
--- a/srcpkgs/vala/template
+++ b/srcpkgs/vala/template
@@ -1,7 +1,7 @@
 # Template file for 'vala'
 pkgname=vala
 # Should be kept in sync with 'valadoc' (shared distfiles)
-version=0.44.6
+version=0.46.3
 revision=1
 build_style=gnu-configure
 configure_args="--disable-valadoc"
@@ -14,7 +14,7 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
 changelog="https://gitlab.gnome.org/GNOME/vala/raw/0.42/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=ab9f1756af7460aa1e39c9a7388f5492a4252a3cd9c76b02f2033f1dedcd793a
+checksum=e29c2b1f108dc22c91bb501975a77c938aef079ca7875e1fbf41191e22cc57e3
 shlib_provides="libvalaccodegen.so"
 
 post_install() {
@@ -22,8 +22,8 @@ post_install() {
 	# so the package that use it fall into our wrapper.
 	# keep the binary versioned, we don't know the potential
 	# fallout from using the unversioned one
-	vsed -e 's|^vapigen=.*|vapigen=vapigen-0.44|g' \
-		 -i ${DESTDIR}/usr/lib/pkgconfig/vapigen-0.44.pc
+	vsed -e 's|^vapigen=.*|vapigen=vapigen-0.46|g' \
+		 -i ${DESTDIR}/usr/lib/pkgconfig/vapigen-0.46.pc
 }
 
 libvala_package() {
diff --git a/srcpkgs/valabind/template b/srcpkgs/valabind/template
index 71c2af1a2c2..10ebb16fb3f 100644
--- a/srcpkgs/valabind/template
+++ b/srcpkgs/valabind/template
@@ -1,7 +1,7 @@
 # Template file for 'valabind'
 pkgname=valabind
 version=1.7.1
-revision=3
+revision=4
 build_style=meson
 hostmakedepends="pkg-config vala-devel git"
 makedepends="vala-devel glib-devel"
diff --git a/srcpkgs/valadoc/template b/srcpkgs/valadoc/template
index 43ac247ea63..e90e31a15be 100644
--- a/srcpkgs/valadoc/template
+++ b/srcpkgs/valadoc/template
@@ -1,7 +1,7 @@
 # Template file for 'valadoc'
 pkgname=valadoc
 # Should be kept in sync with 'vala' (shared distfiles)
-version=0.44.3
+version=0.46.3
 revision=1
 wrksrc="vala-${version}"
 build_style=gnu-configure
@@ -15,7 +15,7 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
 changelog="https://gitlab.gnome.org/GNOME/vala/raw/0.42/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=8553b422484af88be1685d8b47f7b0df36ae4477c3e77e89ab22276ffed1eae9
+checksum=e29c2b1f108dc22c91bb501975a77c938aef079ca7875e1fbf41191e22cc57e3
 
 pre_configure() {
 	autoreconf -if
@@ -33,8 +33,8 @@ libvaladoc_package() {
 	short_desc+=" - shared library"
 	pkg_install() {
 		vmove "usr/lib/libvaladoc-*.so.*"
-		vmove usr/lib/valadoc
-		vmove usr/share/valadoc
+		vmove "usr/lib/valadoc-${version%.*}"
+		vmove "usr/share/valadoc-${version%.*}"
 	}
 }
 
diff --git a/srcpkgs/vamp-plugin-sdk/template b/srcpkgs/vamp-plugin-sdk/template
index 25898b714d4..97105ef69a7 100644
--- a/srcpkgs/vamp-plugin-sdk/template
+++ b/srcpkgs/vamp-plugin-sdk/template
@@ -1,16 +1,16 @@
 # Template file for 'vamp-plugin-sdk'
 pkgname=vamp-plugin-sdk
-version=2.7.1
-revision=2
+version=2.8.0
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libsndfile-devel"
-short_desc="The Vamp audio analysis plugin system"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD"
-homepage="http://www.vamp-plugins.org/"
-distfiles="https://code.soundsoftware.ac.uk/attachments/download/2206/${pkgname}-${version}.tar.gz"
-checksum=c6fef3ff79d2bf9575ce4ce4f200cbf219cbe0a21cfbad5750e86ff8ae53cb0b
+short_desc="Vamp audio analysis plugin system"
+maintainer="John <johnz@posteo.net>"
+license="MIT"
+homepage="https://www.vamp-plugins.org/"
+distfiles="https://code.soundsoftware.ac.uk/attachments/download/2450/${pkgname}-${version}.tar.gz"
+checksum=dcc96ae894795822398789f251c2c7effa602fc60e9dd6c7a5c5d2e7a513526c
 
 post_extract() {
 	# don't run test target by default, fixes cross build.
diff --git a/srcpkgs/vapoursynth/template b/srcpkgs/vapoursynth/template
index 1d021599090..dd85e8b39dc 100644
--- a/srcpkgs/vapoursynth/template
+++ b/srcpkgs/vapoursynth/template
@@ -1,6 +1,6 @@
 # Template file for 'vapoursynth'
 pkgname=vapoursynth
-version=R47.1
+version=R47.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake pkg-config libtool nasm python3-Cython"
@@ -12,7 +12,7 @@ license="LGPL-2.1-or-later, OFL-1.1"
 homepage="http://www.vapoursynth.com"
 changelog="https://raw.githubusercontent.com/vapoursynth/vapoursynth/master/ChangeLog"
 distfiles="https://github.com/vapoursynth/vapoursynth/archive/$version.tar.gz"
-checksum=095509b088ed1c3ba452ee0fed4a5f134719ac817ffc594f79557f499ad9fa6b
+checksum=8ce4553f9fc5e5bbfb26ec9c0c5bf94be307530f947424c713ef67bc8a6d22b2
 
 case $XBPS_TARGET_MACHINE in
 	aarch64*)
diff --git a/srcpkgs/varnish/INSTALL.msg b/srcpkgs/varnish/INSTALL.msg
deleted file mode 100644
index 3b1bebb7afb..00000000000
--- a/srcpkgs/varnish/INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-varnish is no longer provided by Void Linux, and will be fully removed from the repos on 2019/04/25
diff --git a/srcpkgs/varnish/files/varnishd/log/run b/srcpkgs/varnish/files/varnishd/log/run
new file mode 100755
index 00000000000..280d955ac11
--- /dev/null
+++ b/srcpkgs/varnish/files/varnishd/log/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec logger -t varnishd -p daemon.info
diff --git a/srcpkgs/varnish/files/varnishd/run b/srcpkgs/varnish/files/varnishd/run
new file mode 100755
index 00000000000..1f480573394
--- /dev/null
+++ b/srcpkgs/varnish/files/varnishd/run
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+# Default options
+VARNISH_ADDR=0.0.0.0:80
+VARNISH_MGMT_ADDR=localhost:6082
+VARNISH_CONFIG=/etc/varnish/default.vcl
+VARNISH_STORAGE=malloc,64M
+VARNISH_JAIL=unix,user=_varnish,workuser=_vcache
+VARNISH_OPTIONS=
+
+[ -r ./conf ] && . ./conf
+
+exec varnishd \
+  -F \
+  ${VARNISH_ADDR:+-a "$VARNISH_ADDR"} \
+  ${VARNISH_CONFIG:+-f "$VARNISH_CONFIG"} \
+  ${VARNISH_ADDR:+-T "$VARNISH_MGMT_ADDR"} \
+  ${VARNISH_STORAGE:+-s "$VARNISH_STORAGE"} \
+  ${VARNISH_JAIL:+-j "$VARNISH_JAIL"} \
+  ${VARNISH_OPTIONS}
diff --git a/srcpkgs/varnish/patches/musl.patch b/srcpkgs/varnish/patches/musl.patch
new file mode 100644
index 00000000000..a417c319043
--- /dev/null
+++ b/srcpkgs/varnish/patches/musl.patch
@@ -0,0 +1,22 @@
+--- include/vpf.h	2016-03-03 14:40:01.000000000 +0100
++++ include/vpf.h	2018-01-11 11:45:26.521900821 +0100
+@@ -30,6 +30,8 @@
+ #ifndef VPF_H_INCLUDED
+ #define VPF_H_INCLUDED
+ 
++#include <sys/types.h>
++
+ struct vpf_fh;
+ 
+ struct vpf_fh *VPF_Open(const char *path, mode_t mode, pid_t *pidptr);
+--- include/vsb.h	2017-11-14 14:39:22.000000000 +0100
++++ include/vsb.h	2018-01-11 11:48:15.505912873 +0100
+@@ -31,6 +31,8 @@
+ #ifndef VSB_H_INCLUDED
+ #define VSB_H_INCLUDED
+ 
++#include <sys/types.h>
++
+ /*
+  * Structure definition
+  */
diff --git a/srcpkgs/varnish/template b/srcpkgs/varnish/template
index 0dc852ece20..cdbec495da8 100644
--- a/srcpkgs/varnish/template
+++ b/srcpkgs/varnish/template
@@ -1,9 +1,66 @@
 # Template file for 'varnish'
 pkgname=varnish
-version=6.1.1
-revision=3
-archs=noarch
-build_style=meta
-short_desc="A fast caching HTTP reverse proxy (removed package)"
-license="metapackage"
+version=6.3.0
+revision=1
+build_style=gnu-configure
+configure_args="--cache-file=config.void --disable-static $(vopt_enable pcrejit pcre-jit)"
+hostmakedepends="pkg-config python3 python3-docutils python3-Sphinx"
+makedepends="pcre-devel readline-devel"
+short_desc="Fast caching HTTP reverse proxy"
+maintainer="Noel Cower <ncower@gmail.com>"
+license="BSD-2-Clause"
 homepage="https://varnish-cache.org/"
+distfiles="https://varnish-cache.org/_downloads/${pkgname}-${version}.tgz"
+checksum=95ccdec5f1dcba8b41d24e685b3f2379fbc6b9701d106cc78011d4d09a73947f
+lib32disabled=yes
+
+build_options="pcrejit"
+
+conf_files="/etc/varnish/default.vcl"
+make_dirs="/var/lib/varnish 0750 _varnish _varnish
+ /var/log/varnish 0750 _varnish _varnish"
+
+system_accounts="_varnish _vcache"
+_varnish_homedir="/var/lib/varnish"
+_vcache_pgroup="_varnish"
+
+if [ yes = "$(vopt_if pcrejit yes)" ]; then
+	# Don't permit cross builds if pcrejit is set.
+	nocross="Cannot run test program when cross compiling (PCRE_JIT)"
+elif [ "${XBPS_MACHINE%-musl}" != "${XBPS_TARGET_MACHINE%-musl}" ]; then
+	# Mark builds with different architectures as nocross.
+	nocross="Host and target architectures must be the same to run the program during build"
+fi
+
+case "$XBPS_TARGET_MACHINE" in
+	*-musl)
+		configure_args+=" --without-jemalloc"
+		makedepends+=" libexecinfo-devel"
+		;;
+	*)
+		makedepends+=" jemalloc-devel"
+		;;
+esac
+
+post_install() {
+	vinstall etc/example.vcl 644 etc/varnish default.vcl
+	vsv varnishd
+	vlicense LICENSE
+}
+
+libvarnishapi_package() {
+	short_desc+=" - API runtime library"
+	pkg_install() {
+		vmove "usr/lib/*.so.*"
+	}
+}
+libvarnishapi-devel_package() {
+	depends="libvarnishapi>=${version}_${revision}"
+	short_desc+=" - API development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+		vmove usr/share/man/man3
+	}
+}
diff --git a/srcpkgs/varnish/update b/srcpkgs/varnish/update
new file mode 100644
index 00000000000..30fbc3a065b
--- /dev/null
+++ b/srcpkgs/varnish/update
@@ -0,0 +1 @@
+site="https://varnish-cache.org/releases/index.html"
diff --git a/srcpkgs/vault/template b/srcpkgs/vault/template
index c7d6e7cbaf6..a2ed23b8215 100644
--- a/srcpkgs/vault/template
+++ b/srcpkgs/vault/template
@@ -1,19 +1,29 @@
 # Template file for 'vault'
 pkgname=vault
-version=1.2.0
+version=1.2.3
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/${pkgname}"
+go_build_tags="ui release"
+_git_commit=e16495da552c996068e05574cddf69875199f949
+go_ldflags="-X ${go_import_path}/sdk/version.GitCommit=${_git_commit}"
 conf_files="/etc/vault.hcl"
 make_dirs="/var/lib/vault 0700 _vault _vault"
+hostmakedepends="git nodejs-lts python yarn"
 short_desc="Tool for securely accessing secrets"
 maintainer="iaroki <iaroki@protonmail.com>"
 license="MPL-2.0"
 homepage="https://www.vaultproject.io/"
 distfiles="https://github.com/hashicorp/${pkgname}/archive/v${version}.tar.gz"
-checksum=9ec2b23d7f6fd16909dd409a15e0da52235ac4f0c7e1903e6cfb5de9308cab4d
+checksum=b9f909b613d53ae591a5b91a4862c750aaf59e87592b1a74b4c4651c0b5790e3
 system_accounts="_vault"
 
+pre_build() {
+	vsed -i Makefile -e "s@(find \. -name '\*\.go' | grep -v pb\.go | grep -v vendor)@(find . -name '*.go' | grep -v pb.go | grep -v vendor | grep -v ./_build-)@"
+	local depbin="${wrksrc}/_build-depbin"
+	GOOS= GOARCH= CGO_ENABLED=0 PATH="$depbin:$PATH" GOBIN="$depbin" make bootstrap ember-dist static-assets
+}
+
 post_install() {
 	vinstall ${FILESDIR}/vault.hcl 644 etc/
 	vlicense LICENSE
diff --git a/srcpkgs/vba-m/template b/srcpkgs/vba-m/template
index 94f7c6dd367..007c24f2ebd 100644
--- a/srcpkgs/vba-m/template
+++ b/srcpkgs/vba-m/template
@@ -1,8 +1,8 @@
 # Template file for 'vba-m'
 pkgname=vba-m
 reverts=1292_2
-version=2.1.3
-revision=1
+version=2.1.4
+revision=2
 wrksrc="visualboyadvance-m-${version}"
 build_style=cmake
 configure_args="-DENABLE_GTK=TRUE -DENABLE_FFMPEG=TRUE -DENABLE_LINK=TRUE"
@@ -15,4 +15,5 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/visualboyadvance-m/visualboyadvance-m/"
 distfiles="https://github.com/visualboyadvance-m/visualboyadvance-m/archive/v${version}.tar.gz"
-checksum=c64a8b400e9af862e0be74148760a7c73f98d08dcbb7d01eca81e6dc5ad376fd
+checksum=8342e017212842de66b0d86bc7610c82349af2d4e59951d969a33fff956c39ba
+nocross=y
diff --git a/srcpkgs/vhba-module-dkms/template b/srcpkgs/vhba-module-dkms/template
index 5b720d3e143..78fc526b2d2 100644
--- a/srcpkgs/vhba-module-dkms/template
+++ b/srcpkgs/vhba-module-dkms/template
@@ -1,6 +1,6 @@
 # Template file for 'vhba-module-dkms'
 pkgname=vhba-module-dkms
-version=20190410
+version=20190831
 revision=1
 wrksrc=vhba-module-${version}
 conf_files="/usr/lib/udev/rules.d/40-vhba.rules"
@@ -9,7 +9,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://cdemu.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/cdemu/vhba-module-${version}.tar.bz2"
-checksum=0c18954a8c2c7e208b20afdf785501b23be9382345e6577eba5d653002862394
+checksum=9a83772cf8bec15723f7a8105a0aae3faa057edbd5595e6c081e5803a8996bf9
 
 dkms_modules="vhba-module ${version}"
 depends="dkms"
diff --git a/srcpkgs/viewres/template b/srcpkgs/viewres/template
index 2e391ee631b..80d51af8138 100644
--- a/srcpkgs/viewres/template
+++ b/srcpkgs/viewres/template
@@ -1,6 +1,6 @@
 # Template build file for 'viewres'.
 pkgname=viewres
-version=1.0.5
+version=1.0.6
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ homepage="http://xorg.freedesktop.org"
 license="MIT"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=5ed818e84c39bcf26dadc885c9860432b85843caad3621e26d99edea660ae3d7
+checksum=11c15db02066c1d5fc3febf9b185d16c1112f87e37c4b101a484dcefffb80934
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/vifm/template b/srcpkgs/vifm/template
index 064cccf7a34..1967c6c719e 100644
--- a/srcpkgs/vifm/template
+++ b/srcpkgs/vifm/template
@@ -1,6 +1,6 @@
 # Template file for 'vifm'
 pkgname=vifm
-version=0.10
+version=0.10.1
 revision=1
 build_style=gnu-configure
 configure_args="--without-gtk"
@@ -12,11 +12,12 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://vifm.info/"
 distfiles="${SOURCEFORGE_SITE}/vifm/vifm-${version}.tar.bz2"
-checksum=e05a699f58279f69467d75d8cd3d6c8d2f62806c467fd558eda45ae9590768b8
+checksum=99006f56db05e1bdfb7983e8d5c31c9ac93bf2ac9e0409a577c8ca660fecd03b
 
 post_install() {
 	vsconf data/vifmrc
 	rm -f ${DESTDIR}/usr/share/vifm/vifmrc
 	rm -f ${DESTDIR}/usr/share/vifm/vifmrc-osx
+	rm -f ${DESTDIR}/usr/share/vifm/vifm-media-osx
 	rm -f ${DESTDIR}/usr/share/doc/vifm/COPYING
 }
diff --git a/srcpkgs/viking/template b/srcpkgs/viking/template
index 4a81b582834..c860fe5eecc 100644
--- a/srcpkgs/viking/template
+++ b/srcpkgs/viking/template
@@ -1,7 +1,7 @@
 # Template file for 'viking'
 pkgname=viking
 version=1.7
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-realtime-gps-tracking --disable-bluemarble
  --disable-bing --disable-terraserver --disable-spotmaps
diff --git a/srcpkgs/vim/template b/srcpkgs/vim/template
index 12b5ff95fdb..8f543069d19 100644
--- a/srcpkgs/vim/template
+++ b/srcpkgs/vim/template
@@ -1,7 +1,7 @@
 # Template file for 'vim'
 pkgname=vim
-version=8.1.1764
-revision=1
+version=8.1.2021
+revision=3
 hostmakedepends="glib-devel pkg-config"
 makedepends="acl-devel gtk+3-devel libXt-devel lua-devel ncurses-devel
  perl python-devel python3-devel ruby-devel"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Vim"
 homepage="https://www.vim.org"
 distfiles="https://github.com/vim/vim/archive/v${version}.tar.gz"
-checksum=c74441b7b971cb93aab12b8cd814089a2d47e18e91ca4d7e7851f3f6bafa6d7a
+checksum=b56a9cc7f950dc98fef925acfed35824979c2fa34b4607155117204891adfed8
 
 subpackages="xxd vim-common vim-x11 gvim"
 # XXX vim-huge cannot be cross compiled for now.
diff --git a/srcpkgs/vinagre/template b/srcpkgs/vinagre/template
index 2843775c7c3..05c0c384d41 100644
--- a/srcpkgs/vinagre/template
+++ b/srcpkgs/vinagre/template
@@ -1,13 +1,13 @@
 # Template file for 'vinagre'
 pkgname=vinagre
 version=3.22.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-schemas-compile --enable-compile-warnings=no"
 hostmakedepends="pkg-config intltool itstool glib gnome-doc-utils"
 makedepends="libxml2-devel libsecret-devel avahi-ui-libs-devel
- spice-devel avahi-glib-libs-devel telepathy-glib-devel vte3-devel
- gtk-vnc-devel openssh"
+ avahi-glib-libs-devel telepathy-glib-devel vte3-devel
+ spice-gtk-devel gtk-vnc-devel openssh"
 depends="openssh desktop-file-utils hicolor-icon-theme"
 short_desc="VNC client for the GNOME desktop"
 maintainer="Orphaned <orphan@voidlinux.org>"
diff --git a/srcpkgs/virt-viewer/template b/srcpkgs/virt-viewer/template
index 30342407274..530f42d4452 100644
--- a/srcpkgs/virt-viewer/template
+++ b/srcpkgs/virt-viewer/template
@@ -1,12 +1,11 @@
 # Template file for 'virt-viewer'
 pkgname=virt-viewer
 version=8.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-update-mimedb"
 hostmakedepends="glib-devel intltool pkg-config"
-makedepends="gtk-vnc-devel libvirt-glib-devel spice-devel spice-gtk-devel
- vte3-devel"
+makedepends="gtk-vnc-devel libvirt-glib-devel spice-gtk-devel vte3-devel"
 short_desc="Tool for displaying the graphical console of a virtual machine"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"
diff --git a/srcpkgs/virt-what/template b/srcpkgs/virt-what/template
index d32a392a566..ee3ad8b04b0 100644
--- a/srcpkgs/virt-what/template
+++ b/srcpkgs/virt-what/template
@@ -1,6 +1,6 @@
 # Template file for 'virt-what'
 pkgname=virt-what
-version=1.19
+version=1.20
 revision=1
 build_style=gnu-configure
 short_desc="Detect when running in a virtual machine"
@@ -8,4 +8,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="https://people.redhat.com/~rjones/virt-what/"
 distfiles="https://people.redhat.com/~rjones/${pkgname}/files/${pkgname}-${version}.tar.gz"
-checksum=936793fe396f4cfe8b8ffcb609f470503b8a2e166c7896b647fa025c3ce5d002
+checksum=f913dcd29add5121e3ffc0f2d0f17e19ff3183e8ab8ca417a5b6be43787910e8
diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index 06f85a2decd..4fdfd1d01a1 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -1,6 +1,6 @@
 # Template file for 'virtualbox-ose'
 pkgname=virtualbox-ose
-version=6.0.10
+version=6.0.12
 revision=1
 wrksrc="VirtualBox-${version%*a}"
 short_desc="General-purpose full virtualizer for x86 hardware"
@@ -9,7 +9,7 @@ license="GPL-2.0-only, CDDL-1.0"
 homepage="https://www.virtualbox.org"
 changelog="https://www.virtualbox.org/wiki/Changelog"
 distfiles="http://download.virtualbox.org/virtualbox/${version%*a}/VirtualBox-$version.tar.bz2"
-checksum=5236148a93267478fb6d306f6343aa9587d3f90f437f54c7b3485bd9d538d2f8
+checksum=c8878d1ad867461e6adfb82c22f15bf5d284e214e75f7b2c6bcd81854edeabc3
 
 nopie=yes
 lib32disabled=yes
diff --git a/srcpkgs/vivaldi/template b/srcpkgs/vivaldi/template
index caac7fc1004..4b89cc5ab17 100644
--- a/srcpkgs/vivaldi/template
+++ b/srcpkgs/vivaldi/template
@@ -1,12 +1,14 @@
 # Template file for 'vivaldi'
 pkgname=vivaldi
-version=2.6.1566.49
+version=2.8.1664.40
 revision=1
 _release=1
 archs="i686 x86_64"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Advanced browser made with the power user in mind"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
+# EULA: https://vivaldi.com/privacy/vivaldi-end-user-license-agreement/
+# Privacy Policy: https://vivaldi.com/privacy/browser/
 license="Proprietary"
 homepage="https://vivaldi.com"
 repository=nonfree
@@ -15,10 +17,10 @@ nostrip=yes
 
 if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
 	_debarch=amd64
-	checksum=2d3155a0df6dc7023679b7134c39aee82260a7115db1a6cf9bb39a38305687c2
+	checksum=5d17bda4ca21aeaa24b7cbf6a137cba60979016a5f45c86737a6309ff2b8671f
 else
 	_debarch=i386
-	checksum=21b85a22429cc8a2831806fd9a452f44f91d74b343f18707f9c36d2d17a3bc0c
+	checksum=4c84a069eefb86802192a064e252b5eb239581040a0ac28db1f1bd0a49ebe3c5
 fi
 
 distfiles="https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-${_release}_${_debarch}.deb"
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 518c232ca9b..7f343d922be 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,6 +1,6 @@
 # Template file for 'vlc'
 pkgname=vlc
-version=3.0.7.1
+version=3.0.8
 revision=2
 build_style=gnu-configure
 configure_args="--disable-gme --disable-libtar --enable-jack
@@ -8,19 +8,21 @@ configure_args="--disable-gme --disable-libtar --enable-jack
  --enable-flac --enable-merge-ffmpeg
  $(vopt_enable notify) $(vopt_enable qt) $(vopt_enable x265)
  $(vopt_enable svg) $(vopt_enable v4l2) $(vopt_enable smb smbclient)
- $(vopt_enable lua) $(vopt_enable vaapi libva) $(vopt_enable vdpau)"
+ $(vopt_enable lua) $(vopt_enable vaapi libva) $(vopt_enable vdpau)
+ $(vopt_enable chromecast microdns) $(vopt_enable chromecast)
+ $(vopt_enable chromecast sout)"
 short_desc="Cross-platform multimedia player"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only, LGPL-2.1-only"
 homepage="https://www.videolan.org/vlc/"
 changelog="https://www.videolan.org/developers/vlc-branch/NEWS"
 distfiles="https://download.videolan.org/pub/videolan/vlc/${version}/vlc-${version}.tar.xz"
-checksum=0655804371096772f06104b75c21cde8a76e3b6c8a2fdadc97914f082c6264f5
+checksum=e0149ef4a20a19b9ecd87309c2d27787ee3f47dfd47c6639644bc1f6fd95bdf6
 
 lib32disabled=yes
 
 # XXX Add missing deps: gme, telepathy, libtar (for skins2).
-hostmakedepends="automake libtool pkg-config flex bison libgcrypt-devel live555-devel $(vopt_if lua lua52)"
+hostmakedepends="automake libtool pkg-config flex bison libgcrypt-devel live555-devel $(vopt_if lua lua52) $(vopt_if chromecast protobuf)"
 makedepends="
  avahi-libs-devel dbus-glib-devel faad2-devel ffmpeg-devel freefont-ttf
  gnutls-devel jack-devel liba52-devel libass-devel libbluray-devel
@@ -36,12 +38,13 @@ makedepends="
  $(vopt_if v4l2 v4l-utils-devel) $(vopt_if smb samba-devel)
  $(vopt_if lua lua52-devel) $(vopt_if vaapi libva-devel)
  $(vopt_if vdpau libvdpau-devel) $(vopt_if x265 x265-devel)
- $(vopt_if svg librsvg-devel) $(vopt_if sndio sndio-devel)"
+ $(vopt_if svg librsvg-devel) $(vopt_if sndio sndio-devel)
+ $(vopt_if chromecast protobuf-devel) $(vopt_if chromecast libmicrodns-devel)"
 depends="freefont-ttf hicolor-icon-theme desktop-file-utils"
 
 # Package build options
-build_options="lua notify opengl qt smb svg v4l2 vaapi vdpau x265 sndio"
-build_options_default="lua smb v4l2 x265 sndio"
+build_options="lua notify opengl qt smb svg v4l2 vaapi vdpau x265 sndio chromecast"
+build_options_default="lua smb v4l2 x265 sndio chromecast"
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*|ppc64*)
diff --git a/srcpkgs/vmpk/template b/srcpkgs/vmpk/template
new file mode 100644
index 00000000000..18061b69d05
--- /dev/null
+++ b/srcpkgs/vmpk/template
@@ -0,0 +1,23 @@
+# Template file for 'vmpk'
+pkgname=vmpk
+version=0.7.1
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config libxslt docbook-xsl"
+makedepends="qt5-x11extras-devel qt5-tools-devel drumstick-devel"
+short_desc="MIDI events generator and receiver"
+maintainer="Mohammad Amin Sameti <mamins1376@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="http://vmpk.sourceforge.net"
+distfiles="${SOURCEFORGE_SITE}/vmpk/${version}/vmpk-${version}.tar.bz2"
+checksum=06d78872b8c23976cd1ed4e66ac6a3bfce93af28ce8db96c2c015cf185ce651b
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt5-qmake qt5-host-tools"
+fi
+
+post_install() {
+	for doc in NEWS ChangeLog README AUTHORS; do
+		vdoc $doc
+	done
+}
diff --git a/srcpkgs/vnstat/template b/srcpkgs/vnstat/template
index 38f4cedc944..705a0d6817b 100644
--- a/srcpkgs/vnstat/template
+++ b/srcpkgs/vnstat/template
@@ -1,6 +1,6 @@
 # Template file for 'vnstat'
 pkgname=vnstat
-version=2.3
+version=2.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
@@ -11,7 +11,7 @@ maintainer="Eivind Uggedal <eivind@uggedal.com>"
 license="GPL-2.0-only"
 homepage="https://humdi.net/vnstat/"
 distfiles="https://humdi.net/vnstat/vnstat-${version}.tar.gz"
-checksum=280af973a7c54b84ef254c69808a9ef2ff894d80ac0b2d584fa5e68e5b3a1a8d
+checksum=a0955999abd56d5463d257ffdccc9b1e9ad9ea504de81e64ba4c197f1245abaa
 
 conf_files="/etc/vnstat.conf"
 make_dirs="/var/lib/vnstat 0755 root root"
diff --git a/srcpkgs/vpnc-scripts/patches/fix-ipv6.patch b/srcpkgs/vpnc-scripts/patches/fix-ipv6.patch
deleted file mode 100644
index cd6bc126e39..00000000000
--- a/srcpkgs/vpnc-scripts/patches/fix-ipv6.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- vpnc-script	2018-02-26 15:22:35.000000000 +0000
-+++ vpnc-script	2018-08-06 12:02:25.418113014 +0100
-@@ -881,10 +881,10 @@ do_connect() {
- 		while [ $i -lt $CISCO_IPV6_SPLIT_INC ] ; do
- 			eval NETWORK="\${CISCO_IPV6_SPLIT_INC_${i}_ADDR}"
- 			eval NETMASKLEN="\${CISCO_IPV6_SPLIT_INC_${i}_MASKLEN}"
--			if [ $NETMASKLEN -lt 128 ]; then
--				set_ipv6_network_route "$NETWORK" "$NETMASKLEN" "$TUNDEV"
--			else
-+			if [ $NETMASKLEN -eq 0 ]; then
- 				set_ipv6_default_route
-+			else
-+				set_ipv6_network_route "$NETWORK" "$NETMASKLEN" "$TUNDEV"
- 			fi
- 			i=`expr $i + 1`
- 		done
diff --git a/srcpkgs/vpnc-scripts/template b/srcpkgs/vpnc-scripts/template
index 47bc5f70b07..c912bdec848 100644
--- a/srcpkgs/vpnc-scripts/template
+++ b/srcpkgs/vpnc-scripts/template
@@ -1,6 +1,6 @@
 # Template file for 'vpnc-scripts'
 pkgname=vpnc-scripts
-version=20190425
+version=20190611
 revision=1
 archs=noarch
 short_desc="Network configuration scripts for VPNC and OpenConnect"
@@ -8,7 +8,7 @@ maintainer="Eivind Uggedal <eivind@uggedal.com>"
 license="GPL-2.0-or-later"
 homepage="http://www.infradead.org/openconnect/vpnc-script.html"
 distfiles="ftp://ftp.infradead.org/pub/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=91c57042f10588487e8e49c76d8570f68e773987f66be44a064f386464878d47
+checksum=e0953af7aa336fa9f50d4db6325239024f0d6e5a95ea4ad260918c791ca96473
 
 do_install() {
 	vinstall vpnc-script 755 usr/libexec/vpnc-scripts
diff --git a/srcpkgs/vscode/patches/fix_dir.patch b/srcpkgs/vscode/patches/fix_dir.patch
index b2edcc729ca..685e04f71d0 100644
--- a/srcpkgs/vscode/patches/fix_dir.patch
+++ b/srcpkgs/vscode/patches/fix_dir.patch
@@ -1,8 +1,8 @@
 diff --git a/resources/linux/bin/code.sh b/resources/linux/bin/code.sh
-index 55f50b6f1c14..16b73343e6ea 100755
+index 564f13ef95..0aa2b48fab 100755
 --- a/resources/linux/bin/code.sh
 +++ b/resources/linux/bin/code.sh
-@@ -26,7 +26,7 @@ else
+@@ -35,7 +35,7 @@ else
  		VSCODE_PATH="$(dirname $(readlink -f $0))/.."
  	else
  		# else use the standard install location
@@ -12,14 +12,14 @@ index 55f50b6f1c14..16b73343e6ea 100755
  fi
  
 diff --git a/resources/linux/code.desktop b/resources/linux/code.desktop
-index dbc7818cecf3..eefe01f43397 100644
+index 1273bb2db7..eefe01f433 100644
 --- a/resources/linux/code.desktop
 +++ b/resources/linux/code.desktop
 @@ -2,7 +2,7 @@
  Name=@@NAME_LONG@@
  Comment=Code Editing. Redefined.
  GenericName=Text Editor
--Exec=/usr/share/@@NAME@@/@@NAME@@ --unity-launch %F
+-Exec=@@EXEC@@ --unity-launch %F
 +Exec=/usr/lib/@@NAME@@/@@NAME@@ --unity-launch %F
  Icon=@@ICON@@
  Type=Application
@@ -28,6 +28,6 @@ index dbc7818cecf3..eefe01f43397 100644
  
  [Desktop Action new-empty-window]
  Name=New Empty Window
--Exec=/usr/share/@@NAME@@/@@NAME@@ --new-window %F
+-Exec=@@EXEC@@ --new-window %F
 +Exec=/usr/lib/@@NAME@@/@@NAME@@ --new-window %F
  Icon=@@ICON@@
diff --git a/srcpkgs/vscode/patches/gulp.patch b/srcpkgs/vscode/patches/gulp.patch
index 0a1f1c8e09d..cb1e22fc2e5 100644
--- a/srcpkgs/vscode/patches/gulp.patch
+++ b/srcpkgs/vscode/patches/gulp.patch
@@ -13,7 +13,7 @@ index 090db00ffebb..0c54098d2601 100644
 +				.pipe(replace('@@NAME_LONG@@', product.nameLong))
 +				.pipe(replace('@@NAME_SHORT@@', product.nameShort))
 +				.pipe(replace('@@NAME@@', product.applicationName))
-+				.pipe(replace('@@ICON@@', `/usr/share/pixmaps/${product.applicationName}.png`));
++				.pipe(replace('@@ICON@@', `code-oss`));
 +
 +			all = es.merge(all, icon, desktop);
 		} else if (platform === 'darwin') {
diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index 2ca4af6035a..a428c44986a 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.36.1
+version=1.39.0
 revision=1
 hostmakedepends="pkg-config python nodejs-lts yarn"
 makedepends="libxkbfile-devel libsecret-devel"
@@ -10,7 +10,7 @@ maintainer="shizonic <realtiaz@gmail.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
 distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
-checksum=24b9f4046bd8ef7edb663429a58bf7dbe3acc22487a2946a4e5ead216415c065
+checksum=a2e3a718e3b10af4b4022315e35e6e144beea37b03deb3874054acbc9f86b514
 patch_args="-Np1"
 
 # Due to electron
@@ -35,11 +35,6 @@ pre_build() {
 
 do_build() {
 	export NODE_OPTIONS="${_mem_limit}"
-	# Remove once nodejs-lts >= 10; see node-gyp issue 1457 and
-	# electron/node issue 64.
-	export npm_config_build_v8_with_gn="false"
-	export npm_config_enable_lto="false"
-
 	yarn install --ignore-engines --arch=${_ARCH}
 	yarn run gulp vscode-linux-${_ARCH}-min
 }
diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index 7fe00d03692..b449f998e4a 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -1,22 +1,22 @@
 # Template file for 'vte3'
 pkgname=vte3
-version=0.56.3
+version=0.58.2
 revision=1
 wrksrc="vte-${version}"
-build_style=gnu-configure
+build_style=meson
 build_helper="gir"
-configure_args="--disable-static $(vopt_enable gir introspection)
- $(vopt_enable vala)"
+configure_args="-Db_ndebug=false -Dgir=$(vopt_if gir true false)
+ -Dvapi=$(vopt_if vala true false)"
 hostmakedepends="glib-devel gnome-doc-utils gperf intltool pkg-config
  $(vopt_if vala vala)"
-makedepends="gnutls-devel gtk+3-devel pcre2-devel $(vopt_if vala vala)"
+makedepends="gnutls-devel gtk+3-devel pcre2-devel $(vopt_if vala vala-devel)"
 depends="vte"
 short_desc="Terminal widget with improved accessibility and I18N support"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later, LGPL-2.1-or-later, LGPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Terminal/VTE"
 distfiles="${GNOME_SITE}/vte/${version%.*}/vte-${version}.tar.xz"
-checksum=17a1d4bc8848f1d2acfa4c20aaa24b9bac49f057b8909c56d3dafec2e2332648
+checksum=33c966d2b1f2c3b0f9416dbca883fd746159b5bd040350e3b78f8104b2a42bc0
 
 # Suppress warnings as errors for NULL format strings (musl libc)
 CXXFLAGS="-Wno-error=format="
@@ -42,6 +42,5 @@ vte3-devel_package() {
 		if [ "$build_option_vala" ]; then
 			vmove usr/share/vala
 		fi
-		vmove usr/share/gtk-doc
 	}
 }
diff --git a/srcpkgs/vulkan-loader/template b/srcpkgs/vulkan-loader/template
index 8b3d7653bb5..6fddbd89c20 100644
--- a/srcpkgs/vulkan-loader/template
+++ b/srcpkgs/vulkan-loader/template
@@ -1,7 +1,7 @@
 # Template file for 'vulkan-loader'
 pkgname=vulkan-loader
 _pkgname=Vulkan-Loader
-version=1.1.115
+version=1.1.123
 revision=1
 wrksrc="${_pkgname}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="Arvin Ignaci <arvin.ignaci@gmail.com>"
 license="Apache-2.0"
 homepage="https://www.khronos.org/vulkan/"
 distfiles="https://github.com/KhronosGroup/${_pkgname}/archive/v${version}.tar.gz"
-checksum=25ae51a41f5df0b15d521188a3a963e7b1c4221762613852595622eafefcb600
+checksum=9d3ddb84c21c41b259bbd59e649732f0c06b7bb9c42b27311851680bace0ddde
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DVULKAN_HEADERS_INSTALL_DIR=${XBPS_CROSS_BASE}/usr"
diff --git a/srcpkgs/w3m/template b/srcpkgs/w3m/template
index 4d632ba2e2d..ae432a48ce3 100644
--- a/srcpkgs/w3m/template
+++ b/srcpkgs/w3m/template
@@ -9,7 +9,7 @@ configure_args="--libexecdir=/usr/lib --enable-image=x11,fb
 hostmakedepends="pkg-config gc-devel perl"
 makedepends="zlib-devel ncurses-devel gc-devel libressl-devel imlib2-devel libX11-devel"
 short_desc="Text-based Web browser and pager (with Debian patches)"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://tracker.debian.org/pkg/w3m"
 changelog="https://raw.githubusercontent.com/tats/w3m/master/NEWS"
diff --git a/srcpkgs/warzone2100/template b/srcpkgs/warzone2100/template
index 4614a079ff2..9f19f6e3b71 100644
--- a/srcpkgs/warzone2100/template
+++ b/srcpkgs/warzone2100/template
@@ -1,21 +1,26 @@
 # Template file for 'warzone2100'
 pkgname=warzone2100
-version=3.2.3
-revision=6
+version=3.3.0
+revision=1
+wrksrc="warzone2100"
 build_style=gnu-configure
 configure_args="--with-distributor=void"
-hostmakedepends="zip unzip asciidoc pkg-config perl"
+hostmakedepends="zip unzip asciidoc pkg-config perl autoconf automake"
 makedepends="libpng-devel fribidi-devel fontconfig-devel SDL2-devel libvorbis-devel
- libtheora-devel libopenal-devel glew-devel physfs-devel qt5-script-devel harfbuzz-devel"
+ libtheora-devel libopenal-devel glew-devel physfs-devel harfbuzz-devel
+ qt5-script-devel"
 depends="desktop-file-utils ${pkgname}-data"
 short_desc="3D realtime strategy game on a future Earth"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="http://wz2100.net/"
-distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.xz"
-checksum=fcab9e860203e7dacda6ee60384da490a9d44aeafc07aa31ff25f9c548be7582
+maintainer="Helmut Pozimski <helmut@pozimski.eu>"
+license="GPL-2.0-or-later"
+homepage="http://wz2100.net"
+distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}_src.tar.xz"
+checksum=cc48c8128d17a499e833996470d843855389d9fc985c71f05be08901f33116e8
+nocross="cannot run test program while cross compiling"
 
-nocross="yes" # cannot run test program while cross compiling
+pre_configure() {
+	NOCONFIGURE=1 ./autogen.sh
+}
 
 warzone2100-data_package() {
 	archs=noarch
diff --git a/srcpkgs/way-cooler/template b/srcpkgs/way-cooler/template
index 1b89eda5bc5..7abf1a94ef2 100644
--- a/srcpkgs/way-cooler/template
+++ b/srcpkgs/way-cooler/template
@@ -7,7 +7,7 @@ hostmakedepends="pkg-config git python3 glib-devel"
 makedepends="dbus-devel libglib-devel cairo-devel wayland-devel wlc-devel
  libxcb-devel gdk-pixbuf-devel lua-devel"
 short_desc="Customizable Wayland compositor written in Rust with Lua API"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/way-cooler/way-cooler"
 distfiles="https://github.com/way-cooler/way-cooler/archive/v${version}.tar.gz"
diff --git a/srcpkgs/wayfire/template b/srcpkgs/wayfire/template
index 2ee4bd17ae9..c5e31d12414 100644
--- a/srcpkgs/wayfire/template
+++ b/srcpkgs/wayfire/template
@@ -1,16 +1,16 @@
 # Template file for 'wayfire'
 pkgname=wayfire
-version=0.2
+version=0.3.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config wayland-devel"
-makedepends="wlroots-devel glm cairo-devel wf-config"
+makedepends="wlroots-devel glm cairo-devel wf-config-devel"
 short_desc="3D wayland compositor"
 maintainer="Young Jin Park <youngjinpark20@gmail.com>"
 license="MIT"
 homepage="https://wayfire.org"
-distfiles="https://github.com/WayfireWM/wayfire/archive/v${version}.tar.gz"
-checksum=94fe93bb2b86048fd1c7601f97b167767e19618bb6b6226e21c22fbd052540bf
+distfiles="https://github.com/WayfireWM/wayfire/archive/${version}.tar.gz"
+checksum=c686bf5abb7f0db829196785bba4136c85d7b52d701212e21636dad75e1da0aa
 
 case $XBPS_TARGET_MACHINE in
 	*-musl) makedepends+=" libexecinfo-devel"
diff --git a/srcpkgs/wayland-protocols/template b/srcpkgs/wayland-protocols/template
index 2e30a2468a9..4a6f5ff5ddb 100644
--- a/srcpkgs/wayland-protocols/template
+++ b/srcpkgs/wayland-protocols/template
@@ -1,16 +1,16 @@
 # Template file for 'wayland-protocols'
 pkgname=wayland-protocols
-version=1.17
+version=1.18
 revision=1
 archs=noarch
 build_style=gnu-configure
 hostmakedepends="pkg-config wayland-devel automake"
 short_desc="Protocols and extensions complementing the Wayland core protocol"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://wayland.freedesktop.org"
 distfiles="https://github.com/wayland-project/wayland-protocols/archive/${version}.tar.gz"
-checksum=f35e2e3e2b0fa71a7371e8330dcbcdedf933a9da631a326459298b4f4ba54035
+checksum=eccbd485a3e657a745c46ac84cef924e9279285ae21c1289657df9a715b1ac83
 
 pre_configure() {
 	export wayland_scanner=wayland-scanner
diff --git a/srcpkgs/wayland/template b/srcpkgs/wayland/template
index 7c57799e4f8..0cbc4661752 100644
--- a/srcpkgs/wayland/template
+++ b/srcpkgs/wayland/template
@@ -7,7 +7,7 @@ configure_args="--disable-documentation --disable-static"
 hostmakedepends="flex pkg-config"
 makedepends="expat-devel libffi-devel libfl-devel libxml2-devel"
 short_desc="Wayland protocol compositor"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://wayland.freedesktop.org/"
 distfiles="https://wayland.freedesktop.org/releases/wayland-${version}.tar.xz"
diff --git a/srcpkgs/webkit2gtk/patches/fix-fast-memory-disabled.patch b/srcpkgs/webkit2gtk/patches/fix-fast-memory-disabled.patch
deleted file mode 100644
index 4b5e507274a..00000000000
--- a/srcpkgs/webkit2gtk/patches/fix-fast-memory-disabled.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- Source/JavaScriptCore/wasm/WasmFaultSignalHandler.cpp.orig	2017-09-14 10:03:40.908890971 +0200
-+++ Source/JavaScriptCore/wasm/WasmFaultSignalHandler.cpp	2017-09-14 10:04:17.084859537 +0200
-@@ -112,7 +112,11 @@ void unregisterCode(void* start, void* e
- 
- bool fastMemoryEnabled()
- {
-+#if ENABLE(WEBASSEMBLY_FAST_MEMORY)
-     return fastHandlerInstalled;
-+#else
-+    return false;
-+#endif // ENABLE(WEBASSEMBLY_FAST_MEMORY)
- }
- 
- void enableFastMemory()
diff --git a/srcpkgs/webkit2gtk/patches/fix-musl-javascriptcore.patch b/srcpkgs/webkit2gtk/patches/fix-musl-javascriptcore.patch
index c9b4de24493..129ea037849 100644
--- a/srcpkgs/webkit2gtk/patches/fix-musl-javascriptcore.patch
+++ b/srcpkgs/webkit2gtk/patches/fix-musl-javascriptcore.patch
@@ -1,10 +1,12 @@
-Source: @pullmoll
-Upstream: Alpine Linux
+Source: @q66, @pullmoll
+Original upstream: Alpine Linux
 Reason: fixing machine context access for musl libc; reduce stack/heap usage for jsc; fix some overly restrictive __GLIBC__ checks
 
---- Source/JavaScriptCore/runtime/MachineContext..orig	2018-08-10 08:48:05.000000000 +0200
-+++ Source/JavaScriptCore/runtime/MachineContext.h	2018-09-17 12:16:41.030618109 +0200
-@@ -188,7 +188,7 @@
+Updated for latest webkit2gtk.
+
+--- Source/JavaScriptCore/runtime/MachineContext.h
++++ Source/JavaScriptCore/runtime/MachineContext.h
+@@ -188,7 +188,7 @@ static inline void*& stackPointerImpl(mcontext_t& machineContext)
  #error Unknown Architecture
  #endif
  
@@ -13,7 +15,7 @@ Reason: fixing machine context access for musl libc; reduce stack/heap usage for
  
  #if CPU(X86)
      return reinterpret_cast<void*&>((uintptr_t&) machineContext.gregs[REG_ESP]);
-@@ -335,7 +335,7 @@
+@@ -335,7 +335,7 @@ static inline void*& framePointerImpl(mcontext_t& machineContext)
  #error Unknown Architecture
  #endif
  
@@ -22,7 +24,7 @@ Reason: fixing machine context access for musl libc; reduce stack/heap usage for
  
  // The following sequence depends on glibc's sys/ucontext.h.
  #if CPU(X86)
-@@ -482,7 +482,7 @@
+@@ -482,7 +482,7 @@ static inline void*& instructionPointerImpl(mcontext_t& machineContext)
  #error Unknown Architecture
  #endif
  
@@ -31,7 +33,7 @@ Reason: fixing machine context access for musl libc; reduce stack/heap usage for
  
  // The following sequence depends on glibc's sys/ucontext.h.
  #if CPU(X86)
-@@ -639,7 +639,7 @@
+@@ -639,7 +639,7 @@ inline void*& argumentPointer<1>(mcontext_t& machineContext)
  #error Unknown Architecture
  #endif
  
@@ -40,7 +42,7 @@ Reason: fixing machine context access for musl libc; reduce stack/heap usage for
  
  // The following sequence depends on glibc's sys/ucontext.h.
  #if CPU(X86)
-@@ -756,7 +756,7 @@
+@@ -756,7 +756,7 @@ inline void*& llintInstructionPointer(mcontext_t& machineContext)
  #error Unknown Architecture
  #endif
  
@@ -49,447 +51,71 @@ Reason: fixing machine context access for musl libc; reduce stack/heap usage for
  
  // The following sequence depends on glibc's sys/ucontext.h.
  #if CPU(X86)
---- Source/JavaScriptCore/runtime/Options.h.orig	2018-08-22 10:15:13.000000000 +0200
-+++ Source/JavaScriptCore/runtime/Options.h	2018-09-17 15:22:16.044174123 +0200
-@@ -130,6 +130,7 @@
+--- Source/JavaScriptCore/runtime/Options.h
++++ Source/JavaScriptCore/runtime/Options.h
+@@ -112,6 +112,16 @@ constexpr bool enableWebAssemblyStreamingApi = true;
  constexpr bool enableWebAssemblyStreamingApi = false;
  #endif
  
 +#if defined(__GLIBC__)
++constexpr unsigned jscMaxPerThreadStack = 4 * MB;
++constexpr unsigned jscSoftReservedZoneSize = 128 * KB;
++constexpr unsigned jscReservedZoneSize = 64 * KB;
++#else
++constexpr unsigned jscMaxPerThreadStack = 80 * KB;
++constexpr unsigned jscSoftReservedZoneSize = 32 * KB;
++constexpr unsigned jscReservedZoneSize = 16 * KB;
++#endif
++
  #define JSC_OPTIONS(v) \
      v(bool, validateOptions, false, Normal, "crashes if mis-typed JSC options were passed to the VM") \
      v(unsigned, dumpOptions, 0, Normal, "dumps JSC options (0 = None, 1 = Overridden only, 2 = All, 3 = Verbose)") \
-@@ -516,6 +517,397 @@
-     v(bool, traceLLIntExecution, false, Configurable, nullptr) \
-     v(bool, traceLLIntSlowPath, false, Configurable, nullptr) \
- 
-+#else	/* defined(__GLIBC__) */
-+
-+#define JSC_OPTIONS(v) \
-+    v(bool, validateOptions, false, Normal, "crashes if mis-typed JSC options were passed to the VM") \
-+    v(unsigned, dumpOptions, 0, Normal, "dumps JSC options (0 = None, 1 = Overridden only, 2 = All, 3 = Verbose)") \
-+    v(optionString, configFile, nullptr, Normal, "file to configure JSC options and logging location") \
-+    \
-+    v(bool, useLLInt,  true, Normal, "allows the LLINT to be used if true") \
-+    v(bool, useJIT,    jitEnabledByDefault(), Normal, "allows the executable pages to be allocated for JIT and thunks if true") \
-+    v(bool, useBaselineJIT, true, Normal, "allows the baseline JIT to be used if true") \
-+    v(bool, useDFGJIT, true, Normal, "allows the DFG JIT to be used if true") \
-+    v(bool, useRegExpJIT, jitEnabledByDefault(), Normal, "allows the RegExp JIT to be used if true") \
-+    v(bool, useDOMJIT, is64Bit(), Normal, "allows the DOMJIT to be used if true") \
-+    \
-+    v(bool, reportMustSucceedExecutableAllocations, false, Normal, nullptr) \
-+    \
-+    v(unsigned, maxPerThreadStackUsage, 80 * KB, Normal, "Max allowed stack usage by the VM") \
-+    v(unsigned, softReservedZoneSize, 32 * KB, Normal, "A buffer greater than reservedZoneSize that reserves space for stringifying exceptions.") \
-+    v(unsigned, reservedZoneSize, 16 * KB, Normal, "The amount of stack space we guarantee to our clients (and to interal VM code that does not call out to clients).") \
-+    \
-+    v(bool, crashIfCantAllocateJITMemory, false, Normal, nullptr) \
-+    v(unsigned, jitMemoryReservationSize, 0, Normal, "Set this number to change the executable allocation size in ExecutableAllocatorFixedVMPool. (In bytes.)") \
-+    v(bool, useSeparatedWXHeap, false, Normal, nullptr) \
-+    \
-+    v(bool, forceCodeBlockLiveness, false, Normal, nullptr) \
-+    v(bool, forceICFailure, false, Normal, nullptr) \
-+    \
-+    v(unsigned, repatchCountForCoolDown, 8, Normal, nullptr) \
-+    v(unsigned, initialCoolDownCount, 20, Normal, nullptr) \
-+    v(unsigned, repatchBufferingCountdown, 8, Normal, nullptr) \
-+    \
-+    v(bool, dumpGeneratedBytecodes, false, Normal, nullptr) \
-+    v(bool, dumpBytecodeLivenessResults, false, Normal, nullptr) \
-+    v(bool, validateBytecode, false, Normal, nullptr) \
-+    v(bool, forceDebuggerBytecodeGeneration, false, Normal, nullptr) \
-+    v(bool, dumpBytecodesBeforeGeneratorification, false, Normal, nullptr) \
-+    \
-+    v(bool, useFunctionDotArguments, true, Normal, nullptr) \
-+    v(bool, useTailCalls, true, Normal, nullptr) \
-+    v(bool, optimizeRecursiveTailCalls, true, Normal, nullptr) \
-+    v(bool, alwaysUseShadowChicken, false, Normal, nullptr) \
-+    v(unsigned, shadowChickenLogSize, 1000, Normal, nullptr) \
-+    v(unsigned, shadowChickenMaxTailDeletedFramesSize, 128, Normal, nullptr) \
-+    \
-+    /* dumpDisassembly implies dumpDFGDisassembly. */ \
-+    v(bool, dumpDisassembly, false, Normal, "dumps disassembly of all JIT compiled code upon compilation") \
-+    v(bool, asyncDisassembly, false, Normal, nullptr) \
-+    v(bool, dumpDFGDisassembly, false, Normal, "dumps disassembly of DFG function upon compilation") \
-+    v(bool, dumpFTLDisassembly, false, Normal, "dumps disassembly of FTL function upon compilation") \
-+    v(bool, dumpRegExpDisassembly, false, Normal, "dumps disassembly of RegExp upon compilation") \
-+    v(bool, dumpAllDFGNodes, false, Normal, nullptr) \
-+    v(bool, logJITCodeForPerf, false, Configurable, nullptr) \
-+    v(optionRange, bytecodeRangeToJITCompile, 0, Normal, "bytecode size range to allow compilation on, e.g. 1:100") \
-+    v(optionRange, bytecodeRangeToDFGCompile, 0, Normal, "bytecode size range to allow DFG compilation on, e.g. 1:100") \
-+    v(optionRange, bytecodeRangeToFTLCompile, 0, Normal, "bytecode size range to allow FTL compilation on, e.g. 1:100") \
-+    v(optionString, jitWhitelist, nullptr, Normal, "file with list of function signatures to allow compilation on") \
-+    v(optionString, dfgWhitelist, nullptr, Normal, "file with list of function signatures to allow DFG compilation on") \
-+    v(optionString, ftlWhitelist, nullptr, Normal, "file with list of function signatures to allow FTL compilation on") \
-+    v(bool, dumpSourceAtDFGTime, false, Normal, "dumps source code of JS function being DFG compiled") \
-+    v(bool, dumpBytecodeAtDFGTime, false, Normal, "dumps bytecode of JS function being DFG compiled") \
-+    v(bool, dumpGraphAfterParsing, false, Normal, nullptr) \
-+    v(bool, dumpGraphAtEachPhase, false, Normal, nullptr) \
-+    v(bool, dumpDFGGraphAtEachPhase, false, Normal, "dumps the DFG graph at each phase of DFG compilation (note this excludes DFG graphs during FTL compilation)") \
-+    v(bool, dumpDFGFTLGraphAtEachPhase, false, Normal, "dumps the DFG graph at each phase of DFG compilation when compiling FTL code") \
-+    v(bool, dumpB3GraphAtEachPhase, false, Normal, "dumps the B3 graph at each phase of compilation") \
-+    v(bool, dumpAirGraphAtEachPhase, false, Normal, "dumps the Air graph at each phase of compilation") \
-+    v(bool, verboseDFGBytecodeParsing, false, Normal, nullptr) \
-+    v(bool, safepointBeforeEachPhase, true, Normal, nullptr) \
-+    v(bool, verboseCompilation, false, Normal, nullptr) \
-+    v(bool, verboseFTLCompilation, false, Normal, nullptr) \
-+    v(bool, logCompilationChanges, false, Normal, nullptr) \
-+    v(bool, useProbeOSRExit, false, Normal, nullptr) \
-+    v(bool, printEachOSRExit, false, Normal, nullptr) \
-+    v(bool, validateGraph, false, Normal, nullptr) \
-+    v(bool, validateGraphAtEachPhase, false, Normal, nullptr) \
-+    v(bool, verboseValidationFailure, false, Normal, nullptr) \
-+    v(bool, verboseOSR, false, Normal, nullptr) \
-+    v(bool, verboseDFGOSRExit, false, Normal, nullptr) \
-+    v(bool, verboseFTLOSRExit, false, Normal, nullptr) \
-+    v(bool, verboseCallLink, false, Normal, nullptr) \
-+    v(bool, verboseCompilationQueue, false, Normal, nullptr) \
-+    v(bool, reportCompileTimes, false, Normal, "dumps JS function signature and the time it took to compile in all tiers") \
-+    v(bool, reportBaselineCompileTimes, false, Normal, "dumps JS function signature and the time it took to BaselineJIT compile") \
-+    v(bool, reportDFGCompileTimes, false, Normal, "dumps JS function signature and the time it took to DFG and FTL compile") \
-+    v(bool, reportFTLCompileTimes, false, Normal, "dumps JS function signature and the time it took to FTL compile") \
-+    v(bool, reportTotalCompileTimes, false, Normal, nullptr) \
-+    v(bool, reportParseTimes, false, Normal, "dumps JS function signature and the time it took to parse") \
-+    v(bool, reportBytecodeCompileTimes, false, Normal, "dumps JS function signature and the time it took to bytecode compile") \
-+    v(bool, verboseExitProfile, false, Normal, nullptr) \
-+    v(bool, verboseCFA, false, Normal, nullptr) \
-+    v(bool, verboseDFGFailure, false, Normal, nullptr) \
-+    v(bool, verboseFTLToJSThunk, false, Normal, nullptr) \
-+    v(bool, verboseFTLFailure, false, Normal, nullptr) \
-+    v(bool, alwaysComputeHash, false, Normal, nullptr) \
-+    v(bool, testTheFTL, false, Normal, nullptr) \
-+    v(bool, verboseSanitizeStack, false, Normal, nullptr) \
-+    v(bool, useGenerationalGC, true, Normal, nullptr) \
-+    v(bool, useConcurrentBarriers, true, Normal, nullptr) \
-+    v(bool, useConcurrentGC, true, Normal, nullptr) \
-+    v(bool, collectContinuously, false, Normal, nullptr) \
-+    v(double, collectContinuouslyPeriodMS, 1, Normal, nullptr) \
-+    v(bool, forceFencedBarrier, false, Normal, nullptr) \
-+    v(bool, verboseVisitRace, false, Normal, nullptr) \
-+    v(bool, optimizeParallelSlotVisitorsForStoppedMutator, false, Normal, nullptr) \
-+    v(unsigned, largeHeapSize, 32 * 1024 * 1024, Normal, nullptr) \
-+    v(unsigned, smallHeapSize, 1 * 1024 * 1024, Normal, nullptr) \
-+    v(double, smallHeapRAMFraction, 0.25, Normal, nullptr) \
-+    v(double, smallHeapGrowthFactor, 2, Normal, nullptr) \
-+    v(double, mediumHeapRAMFraction, 0.5, Normal, nullptr) \
-+    v(double, mediumHeapGrowthFactor, 1.5, Normal, nullptr) \
-+    v(double, largeHeapGrowthFactor, 1.24, Normal, nullptr) \
-+    v(double, miniVMHeapGrowthFactor, 1.27, Normal, nullptr) \
-+    v(double, criticalGCMemoryThreshold, 0.80, Normal, "percent memory in use the GC considers critical.  The collector is much more aggressive above this threshold") \
-+    v(double, minimumMutatorUtilization, 0, Normal, nullptr) \
-+    v(double, maximumMutatorUtilization, 0.7, Normal, nullptr) \
-+    v(double, epsilonMutatorUtilization, 0.01, Normal, nullptr) \
-+    v(double, concurrentGCMaxHeadroom, 1.5, Normal, nullptr) \
-+    v(double, concurrentGCPeriodMS, 2, Normal, nullptr) \
-+    v(bool, useStochasticMutatorScheduler, true, Normal, nullptr) \
-+    v(double, minimumGCPauseMS, 0.3, Normal, nullptr) \
-+    v(double, gcPauseScale, 0.3, Normal, nullptr) \
-+    v(double, gcIncrementBytes, 10000, Normal, nullptr) \
-+    v(double, gcIncrementMaxBytes, 100000, Normal, nullptr) \
-+    v(double, gcIncrementScale, 0, Normal, nullptr) \
-+    v(bool, scribbleFreeCells, false, Normal, nullptr) \
-+    v(double, sizeClassProgression, 1.4, Normal, nullptr) \
-+    v(unsigned, largeAllocationCutoff, 100000, Normal, nullptr) \
-+    v(bool, dumpSizeClasses, false, Normal, nullptr) \
-+    v(bool, useBumpAllocator, true, Normal, nullptr) \
-+    v(bool, stealEmptyBlocksFromOtherAllocators, true, Normal, nullptr) \
-+    v(bool, tradeDestructorBlocks, true, Normal, nullptr) \
-+    v(bool, eagerlyUpdateTopCallFrame, false, Normal, nullptr) \
-+    \
-+    v(bool, useOSREntryToDFG, true, Normal, nullptr) \
-+    v(bool, useOSREntryToFTL, true, Normal, nullptr) \
-+    \
-+    v(bool, useFTLJIT, true, Normal, "allows the FTL JIT to be used if true") \
-+    v(bool, useFTLTBAA, true, Normal, nullptr) \
-+    v(bool, validateFTLOSRExitLiveness, false, Normal, nullptr) \
-+    v(unsigned, defaultB3OptLevel, 2, Normal, nullptr) \
-+    v(bool, b3AlwaysFailsBeforeCompile, false, Normal, nullptr) \
-+    v(bool, b3AlwaysFailsBeforeLink, false, Normal, nullptr) \
-+    v(bool, ftlCrashes, false, Normal, nullptr) /* fool-proof way of checking that you ended up in the FTL. ;-) */\
-+    v(bool, clobberAllRegsInFTLICSlowPath, !ASSERT_DISABLED, Normal, nullptr) \
-+    v(bool, enableJITDebugAssertions, !ASSERT_DISABLED, Normal, nullptr) \
-+    v(bool, useAccessInlining, true, Normal, nullptr) \
-+    v(unsigned, maxAccessVariantListSize, 8, Normal, nullptr) \
-+    v(bool, usePolyvariantDevirtualization, true, Normal, nullptr) \
-+    v(bool, usePolymorphicAccessInlining, true, Normal, nullptr) \
-+    v(unsigned, maxPolymorphicAccessInliningListSize, 8, Normal, nullptr) \
-+    v(bool, usePolymorphicCallInlining, true, Normal, nullptr) \
-+    v(bool, usePolymorphicCallInliningForNonStubStatus, false, Normal, nullptr) \
-+    v(unsigned, maxPolymorphicCallVariantListSize, 15, Normal, nullptr) \
-+    v(unsigned, maxPolymorphicCallVariantListSizeForTopTier, 5, Normal, nullptr) \
-+    v(unsigned, maxPolymorphicCallVariantListSizeForWebAssemblyToJS, 5, Normal, nullptr) \
-+    v(unsigned, maxPolymorphicCallVariantsForInlining, 5, Normal, nullptr) \
-+    v(unsigned, frequentCallThreshold, 2, Normal, nullptr) \
-+    v(double, minimumCallToKnownRate, 0.51, Normal, nullptr) \
-+    v(bool, createPreHeaders, true, Normal, nullptr) \
-+    v(bool, useMovHintRemoval, true, Normal, nullptr) \
-+    v(bool, usePutStackSinking, true, Normal, nullptr) \
-+    v(bool, useObjectAllocationSinking, true, Normal, nullptr) \
-+    v(bool, useArityFixupInlining, true, Normal, nullptr) \
-+    v(bool, logExecutableAllocation, false, Normal, nullptr) \
-+    \
-+    v(bool, useConcurrentJIT, true, Normal, "allows the DFG / FTL compilation in threads other than the executing JS thread") \
-+    v(unsigned, numberOfDFGCompilerThreads, computeNumberOfWorkerThreads(3, 2) - 1, Normal, nullptr) \
-+    v(unsigned, numberOfFTLCompilerThreads, computeNumberOfWorkerThreads(MAXIMUM_NUMBER_OF_FTL_COMPILER_THREADS, 2) - 1, Normal, nullptr) \
-+    v(int32, priorityDeltaOfDFGCompilerThreads, computePriorityDeltaOfWorkerThreads(-1, 0), Normal, nullptr) \
-+    v(int32, priorityDeltaOfFTLCompilerThreads, computePriorityDeltaOfWorkerThreads(-2, 0), Normal, nullptr) \
-+    v(int32, priorityDeltaOfWasmCompilerThreads, computePriorityDeltaOfWorkerThreads(-1, 0), Normal, nullptr) \
-+    \
-+    v(bool, useProfiler, false, Normal, nullptr) \
-+    v(bool, disassembleBaselineForProfiler, true, Normal, nullptr) \
-+    \
-+    v(bool, useArchitectureSpecificOptimizations, true, Normal, nullptr) \
-+    \
-+    v(bool, breakOnThrow, false, Normal, nullptr) \
-+    \
-+    v(unsigned, maximumOptimizationCandidateInstructionCount, 100000, Normal, nullptr) \
-+    \
-+    v(unsigned, maximumFunctionForCallInlineCandidateInstructionCount, 190, Normal, nullptr) \
-+    v(unsigned, maximumFunctionForClosureCallInlineCandidateInstructionCount, 100, Normal, nullptr) \
-+    v(unsigned, maximumFunctionForConstructInlineCandidateInstructionCount, 100, Normal, nullptr) \
-+    \
-+    v(unsigned, maximumFTLCandidateInstructionCount, 20000, Normal, nullptr) \
-+    \
-+    /* Depth of inline stack, so 1 = no inlining, 2 = one level, etc. */ \
-+    v(unsigned, maximumInliningDepth, 5, Normal, "maximum allowed inlining depth.  Depth of 1 means no inlining") \
-+    v(unsigned, maximumInliningRecursion, 2, Normal, nullptr) \
-+    \
-+    /* Maximum size of a caller for enabling inlining. This is purely to protect us */\
-+    /* from super long compiles that take a lot of memory. */\
-+    v(unsigned, maximumInliningCallerSize, 10000, Normal, nullptr) \
-+    \
-+    v(unsigned, maximumVarargsForInlining, 100, Normal, nullptr) \
-+    \
-+    v(bool, useMaximalFlushInsertionPhase, false, Normal, "Setting to true allows the DFG's MaximalFlushInsertionPhase to run.") \
-+    \
-+    v(unsigned, maximumBinaryStringSwitchCaseLength, 50, Normal, nullptr) \
-+    v(unsigned, maximumBinaryStringSwitchTotalLength, 2000, Normal, nullptr) \
-+    \
-+    v(double, jitPolicyScale, 1.0, Normal, "scale JIT thresholds to this specified ratio between 0.0 (compile ASAP) and 1.0 (compile like normal).") \
-+    v(bool, forceEagerCompilation, false, Normal, nullptr) \
-+    v(int32, thresholdForJITAfterWarmUp, 500, Normal, nullptr) \
-+    v(int32, thresholdForJITSoon, 100, Normal, nullptr) \
-+    \
-+    v(int32, thresholdForOptimizeAfterWarmUp, 1000, Normal, nullptr) \
-+    v(int32, thresholdForOptimizeAfterLongWarmUp, 1000, Normal, nullptr) \
-+    v(int32, thresholdForOptimizeSoon, 1000, Normal, nullptr) \
-+    v(int32, executionCounterIncrementForLoop, 1, Normal, nullptr) \
-+    v(int32, executionCounterIncrementForEntry, 15, Normal, nullptr) \
-+    \
-+    v(int32, thresholdForFTLOptimizeAfterWarmUp, 100000, Normal, nullptr) \
-+    v(int32, thresholdForFTLOptimizeSoon, 1000, Normal, nullptr) \
-+    v(int32, ftlTierUpCounterIncrementForLoop, 1, Normal, nullptr) \
-+    v(int32, ftlTierUpCounterIncrementForReturn, 15, Normal, nullptr) \
-+    v(unsigned, ftlOSREntryFailureCountForReoptimization, 15, Normal, nullptr) \
-+    v(unsigned, ftlOSREntryRetryThreshold, 100, Normal, nullptr) \
-+    \
-+    v(int32, evalThresholdMultiplier, 10, Normal, nullptr) \
-+    v(unsigned, maximumEvalCacheableSourceLength, 256, Normal, nullptr) \
-+    \
-+    v(bool, randomizeExecutionCountsBetweenCheckpoints, false, Normal, nullptr) \
-+    v(int32, maximumExecutionCountsBetweenCheckpointsForBaseline, 1000, Normal, nullptr) \
-+    v(int32, maximumExecutionCountsBetweenCheckpointsForUpperTiers, 50000, Normal, nullptr) \
-+    \
-+    v(unsigned, likelyToTakeSlowCaseMinimumCount, 20, Normal, nullptr) \
-+    v(unsigned, couldTakeSlowCaseMinimumCount, 10, Normal, nullptr) \
-+    \
-+    v(unsigned, osrExitCountForReoptimization, 100, Normal, nullptr) \
-+    v(unsigned, osrExitCountForReoptimizationFromLoop, 5, Normal, nullptr) \
-+    \
-+    v(unsigned, reoptimizationRetryCounterMax, 0, Normal, nullptr)  \
-+    \
-+    v(unsigned, minimumOptimizationDelay, 1, Normal, nullptr) \
-+    v(unsigned, maximumOptimizationDelay, 5, Normal, nullptr) \
-+    v(double, desiredProfileLivenessRate, 0.75, Normal, nullptr) \
-+    v(double, desiredProfileFullnessRate, 0.35, Normal, nullptr) \
-+    \
-+    v(double, doubleVoteRatioForDoubleFormat, 2, Normal, nullptr) \
-+    v(double, structureCheckVoteRatioForHoisting, 1, Normal, nullptr) \
-+    v(double, checkArrayVoteRatioForHoisting, 1, Normal, nullptr) \
-+    \
-+    v(unsigned, maximumDirectCallStackSize, 200, Normal, nullptr) \
-+    \
-+    v(unsigned, minimumNumberOfScansBetweenRebalance, 100, Normal, nullptr) \
-+    v(unsigned, numberOfGCMarkers, computeNumberOfGCMarkers(8), Normal, nullptr) \
-+    v(bool, useParallelMarkingConstraintSolver, true, Normal, nullptr) \
-+    v(unsigned, opaqueRootMergeThreshold, 1000, Normal, nullptr) \
-+    v(double, minHeapUtilization, 0.8, Normal, nullptr) \
-+    v(double, minMarkedBlockUtilization, 0.9, Normal, nullptr) \
-+    v(unsigned, slowPathAllocsBetweenGCs, 0, Normal, "force a GC on every Nth slow path alloc, where N is specified by this option") \
-+    \
-+    v(double, percentCPUPerMBForFullTimer, 0.0003125, Normal, nullptr) \
-+    v(double, percentCPUPerMBForEdenTimer, 0.0025, Normal, nullptr) \
-+    v(double, collectionTimerMaxPercentCPU, 0.05, Normal, nullptr) \
-+    \
-+    v(bool, forceWeakRandomSeed, false, Normal, nullptr) \
-+    v(unsigned, forcedWeakRandomSeed, 0, Normal, nullptr) \
-+    \
-+    v(bool, useZombieMode, false, Normal, "debugging option to scribble over dead objects with 0xbadbeef0") \
-+    v(bool, useImmortalObjects, false, Normal, "debugging option to keep all objects alive forever") \
-+    v(bool, sweepSynchronously, false, Normal, "debugging option to sweep all dead objects synchronously at GC end before resuming mutator") \
-+    v(unsigned, maxSingleAllocationSize, 0, Configurable, "debugging option to limit individual allocations to a max size (0 = limit not set, N = limit size in bytes)") \
-+    \
-+    v(gcLogLevel, logGC, GCLogging::None, Normal, "debugging option to log GC activity (0 = None, 1 = Basic, 2 = Verbose)") \
-+    v(bool, useGC, true, Normal, nullptr) \
-+    v(bool, gcAtEnd, false, Normal, "If true, the jsc CLI will do a GC before exiting") \
-+    v(bool, forceGCSlowPaths, false, Normal, "If true, we will force all JIT fast allocations down their slow paths.") \
-+    v(unsigned, gcMaxHeapSize, 0, Normal, nullptr) \
-+    v(unsigned, forceRAMSize, 0, Normal, nullptr) \
-+    v(bool, recordGCPauseTimes, false, Normal, nullptr) \
-+    v(bool, logHeapStatisticsAtExit, false, Normal, nullptr) \
-+    v(bool, forceCodeBlockToJettisonDueToOldAge, false, Normal, "If true, this means that anytime we can jettison a CodeBlock due to old age, we do.") \
-+    v(bool, useEagerCodeBlockJettisonTiming, false, Normal, "If true, the time slices for jettisoning a CodeBlock due to old age are shrunk significantly.") \
-+    \
-+    v(bool, useTypeProfiler, false, Normal, nullptr) \
-+    v(bool, useControlFlowProfiler, false, Normal, nullptr) \
-+    \
-+    v(bool, useSamplingProfiler, false, Normal, nullptr) \
-+    v(unsigned, sampleInterval, 1000, Normal, "Time between stack traces in microseconds.") \
-+    v(bool, collectSamplingProfilerDataForJSCShell, false, Normal, "This corresponds to the JSC shell's --sample option.") \
-+    v(unsigned, samplingProfilerTopFunctionsCount, 12, Normal, "Number of top functions to report when using the command line interface.") \
-+    v(unsigned, samplingProfilerTopBytecodesCount, 40, Normal, "Number of top bytecodes to report when using the command line interface.") \
-+    v(optionString, samplingProfilerPath, nullptr, Normal, "The path to the directory to write sampiling profiler output to. This probably will not work with WK2 unless the path is in the whitelist.") \
-+    v(bool, sampleCCode, false, Normal, "Causes the sampling profiler to record profiling data for C frames.") \
-+    \
-+    v(bool, alwaysGeneratePCToCodeOriginMap, false, Normal, "This will make sure we always generate a PCToCodeOriginMap for JITed code.") \
-+    \
-+    v(bool, verifyHeap, false, Normal, nullptr) \
-+    v(unsigned, numberOfGCCyclesToRecordForVerification, 3, Normal, nullptr) \
-+    \
-+    v(unsigned, exceptionStackTraceLimit, 100, Normal, "Stack trace limit for internal Exception object") \
-+    v(unsigned, defaultErrorStackTraceLimit, 100, Normal, "The default value for Error.stackTraceLimit") \
-+    v(bool, useExceptionFuzz, false, Normal, nullptr) \
-+    v(unsigned, fireExceptionFuzzAt, 0, Normal, nullptr) \
-+    v(bool, validateDFGExceptionHandling, false, Normal, "Causes the DFG to emit code validating exception handling for each node that can exit") /* This is true by default on Debug builds */\
-+    v(bool, dumpSimulatedThrows, false, Normal, "Dumps the call stack of the last simulated throw if exception scope verification fails") \
-+    v(bool, validateExceptionChecks, false, Normal, "Verifies that needed exception checks are performed.") \
-+    v(unsigned, unexpectedExceptionStackTraceLimit, 100, Normal, "Stack trace limit for debugging unexpected exceptions observed in the VM") \
-+    \
-+    v(bool, useExecutableAllocationFuzz, false, Normal, nullptr) \
-+    v(unsigned, fireExecutableAllocationFuzzAt, 0, Normal, nullptr) \
-+    v(unsigned, fireExecutableAllocationFuzzAtOrAfter, 0, Normal, nullptr) \
-+    v(bool, verboseExecutableAllocationFuzz, false, Normal, nullptr) \
-+    \
-+    v(bool, useOSRExitFuzz, false, Normal, nullptr) \
-+    v(unsigned, fireOSRExitFuzzAtStatic, 0, Normal, nullptr) \
-+    v(unsigned, fireOSRExitFuzzAt, 0, Normal, nullptr) \
-+    v(unsigned, fireOSRExitFuzzAtOrAfter, 0, Normal, nullptr) \
-+    \
-+    v(bool, logPhaseTimes, false, Normal, nullptr) \
-+    v(double, rareBlockPenalty, 0.001, Normal, nullptr) \
-+    v(bool, airLinearScanVerbose, false, Normal, nullptr) \
-+    v(bool, airLinearScanSpillsEverything, false, Normal, nullptr) \
-+    v(bool, airForceBriggsAllocator, false, Normal, nullptr) \
-+    v(bool, airForceIRCAllocator, false, Normal, nullptr) \
-+    v(bool, airRandomizeRegs, false, Normal, nullptr) \
-+    v(bool, coalesceSpillSlots, true, Normal, nullptr) \
-+    v(bool, logAirRegisterPressure, false, Normal, nullptr) \
-+    v(bool, useB3TailDup, true, Normal, nullptr) \
-+    v(unsigned, maxB3TailDupBlockSize, 3, Normal, nullptr) \
-+    v(unsigned, maxB3TailDupBlockSuccessors, 3, Normal, nullptr) \
-+    \
-+    v(bool, useDollarVM, false, Restricted, "installs the $vm debugging tool in global objects") \
-+    v(optionString, functionOverrides, nullptr, Restricted, "file with debugging overrides for function bodies") \
-+    v(bool, useSigillCrashAnalyzer, false, Configurable, "logs data about SIGILL crashes") \
-+    \
-+    v(unsigned, watchdog, 0, Normal, "watchdog timeout (0 = Disabled, N = a timeout period of N milliseconds)") \
-+    v(bool, usePollingTraps, false, Normal, "use polling (instead of signalling) VM traps") \
-+    \
-+    v(bool, useMachForExceptions, true, Normal, "Use mach exceptions rather than signals to handle faults and pass thread messages. (This does nothing on platforms without mach)") \
-+    \
-+    v(bool, useICStats, false, Normal, nullptr) \
-+    \
-+    v(unsigned, prototypeHitCountForLLIntCaching, 2, Normal, "Number of prototype property hits before caching a prototype in the LLInt. A count of 0 means never cache.") \
-+    \
-+    v(bool, dumpCompiledRegExpPatterns, false, Normal, nullptr) \
-+    \
-+    v(bool, dumpModuleRecord, false, Normal, nullptr) \
-+    v(bool, dumpModuleLoadingState, false, Normal, nullptr) \
-+    v(bool, exposeInternalModuleLoader, false, Normal, "expose the internal module loader object to the global space for debugging") \
-+    \
-+    v(bool, useSuperSampler, false, Normal, nullptr) \
-+    \
-+    v(bool, useSourceProviderCache, true, Normal, "If false, the parser will not use the source provider cache. It's good to verify everything works when this is false. Because the cache is so successful, it can mask bugs.") \
-+    v(bool, useCodeCache, true, Normal, "If false, the unlinked byte code cache will not be used.") \
-+    \
-+    v(bool, useWebAssembly, true, Normal, "Expose the WebAssembly global object.") \
-+    \
-+    v(bool, enableSpectreMitigations, true, Restricted, "Enable Spectre mitigations.") \
-+    v(bool, enableSpectreGadgets, false, Restricted, "enable gadgets to test Spectre mitigations.") \
-+    v(bool, zeroStackFrame, false, Normal, "Zero stack frame on entry to a function.") \
-+    \
-+    v(bool, failToCompileWebAssemblyCode, false, Normal, "If true, no Wasm::Plan will sucessfully compile a function.") \
-+    v(size, webAssemblyPartialCompileLimit, 5000, Normal, "Limit on the number of bytes a Wasm::Plan::compile should attempt before checking for other work.") \
-+    v(unsigned, webAssemblyBBQOptimizationLevel, 0, Normal, "B3 Optimization level for BBQ Web Assembly module compilations.") \
-+    v(unsigned, webAssemblyOMGOptimizationLevel, Options::defaultB3OptLevel(), Normal, "B3 Optimization level for OMG Web Assembly module compilations.") \
-+    \
-+    v(bool, useBBQTierUpChecks, true, Normal, "Enables tier up checks for our BBQ code.") \
-+    v(unsigned, webAssemblyOMGTierUpCount, 5000, Normal, "The countdown before we tier up a function to OMG.") \
-+    v(unsigned, webAssemblyLoopDecrement, 15, Normal, "The amount the tier up countdown is decremented on each loop backedge.") \
-+    v(unsigned, webAssemblyFunctionEntryDecrement, 1, Normal, "The amount the tier up countdown is decremented on each function entry.") \
-+    \
-+    /* FIXME: enable fast memories on iOS and pre-allocate them. https://bugs.webkit.org/show_bug.cgi?id=170774 */ \
-+    v(bool, useWebAssemblyFastMemory, !isIOS(), Normal, "If true, we will try to use a 32-bit address space with a signal handler to bounds check wasm memory.") \
-+    v(bool, logWebAssemblyMemory, false, Normal, nullptr) \
-+    v(unsigned, webAssemblyFastMemoryRedzonePages, 128, Normal, "WebAssembly fast memories use 4GiB virtual allocations, plus a redzone (counted as multiple of 64KiB WebAssembly pages) at the end to catch reg+imm accesses which exceed 32-bit, anything beyond the redzone is explicitly bounds-checked") \
-+    v(bool, crashIfWebAssemblyCantFastMemory, false, Normal, "If true, we will crash if we can't obtain fast memory for wasm.") \
-+    v(unsigned, maxNumWebAssemblyFastMemories, 4, Normal, nullptr) \
-+    v(bool, useFastTLSForWasmContext, true, Normal, "If true, we will store context in fast TLS. If false, we will pin it to a register.") \
-+    v(bool, wasmBBQUsesAir, true, Normal, nullptr) \
-+    v(bool, useWebAssemblyStreamingApi, enableWebAssemblyStreamingApi, Normal, "Allow to run WebAssembly's Streaming API") \
-+    v(bool, useCallICsForWebAssemblyToJSCalls, true, Normal, "If true, we will use CallLinkInfo to inline cache Wasm to JS calls.") \
-+    v(bool, useEagerWebAssemblyModuleHashing, false, Normal, "Unnamed WebAssembly modules are identified in backtraces through their hash, if available.") \
-+    v(bool, useBigInt, false, Normal, "If true, we will enable BigInt support.") \
-+    v(bool, useIntlNumberFormatToParts, enableIntlNumberFormatToParts, Normal, "If true, we will enable Intl.NumberFormat.prototype.formatToParts") \
-+    v(bool, useIntlPluralRules, enableIntlPluralRules, Normal, "If true, we will enable Intl.PluralRules.") \
-+    v(bool, useArrayAllocationProfiling, true, Normal, "If true, we will use our normal array allocation profiling. If false, the allocation profile will always claim to be undecided.") \
-+    v(bool, forcePolyProto, false, Normal, "If true, create_this will always create an object with a poly proto structure.") \
-+    v(bool, forceMiniVMMode, false, Normal, "If true, it will force mini VM mode on.") \
-+    v(bool, useTracePoints, false, Normal, nullptr) \
-+    v(bool, traceLLIntExecution, false, Configurable, nullptr) \
-+    v(bool, traceLLIntSlowPath, false, Configurable, nullptr) \
-+    v(bool, traceBaselineJITExecution, false, Normal, nullptr) \
-+    v(unsigned, thresholdForGlobalLexicalBindingEpoch, UINT_MAX, Normal, "Threshold for global lexical binding epoch. If the epoch reaches to this value, CodeBlock metadata for scope operations will be revised globally. It needs to be greater than 1.") \
-+    v(optionString, diskCachePath, nullptr, Restricted, nullptr) \
-+    v(bool, forceDiskCache, false, Restricted, nullptr) \
-+
-+#endif	/* !defined(__GLIBC__) */
- 
- enum OptionEquivalence {
-     SameOption,
---- Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.cpp.orig	2018-04-18 08:26:39.000000000 +0200
-+++ Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.cpp	2018-09-17 15:42:30.694125692 +0200
-@@ -836,7 +836,7 @@
+@@ -126,9 +136,9 @@ constexpr bool enableWebAssemblyStreamingApi = false;
+     \
+     v(bool, reportMustSucceedExecutableAllocations, false, Normal, nullptr) \
+     \
+-    v(unsigned, maxPerThreadStackUsage, 4 * MB, Normal, "Max allowed stack usage by the VM") \
+-    v(unsigned, softReservedZoneSize, 128 * KB, Normal, "A buffer greater than reservedZoneSize that reserves space for stringifying exceptions.") \
+-    v(unsigned, reservedZoneSize, 64 * KB, Normal, "The amount of stack space we guarantee to our clients (and to interal VM code that does not call out to clients).") \
++    v(unsigned, maxPerThreadStackUsage, jscMaxPerThreadStack, Normal, "Max allowed stack usage by the VM") \
++    v(unsigned, softReservedZoneSize, jscSoftReservedZoneSize, Normal, "A buffer greater than reservedZoneSize that reserves space for stringifying exceptions.") \
++    v(unsigned, reservedZoneSize, jscReservedZoneSize, Normal, "The amount of stack space we guarantee to our clients (and to interal VM code that does not call out to clients).") \
+     \
+     v(bool, crashIfCantAllocateJITMemory, false, Normal, nullptr) \
+     v(unsigned, jitMemoryReservationSize, 0, Normal, "Set this number to change the executable allocation size in ExecutableAllocatorFixedVMPool. (In bytes.)") \
+--- Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.cpp
++++ Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.cpp
+@@ -728,7 +728,7 @@ int yydebug;
  #if YYERROR_VERBOSE
  
- # ifndef yystrlen
--#  if defined __GLIBC__ && defined _STRING_H
-+#  if defined __linux__ && defined _STRING_H
- #   define yystrlen strlen
- #  else
+ #    ifndef yystrlen
+-#        if defined __GLIBC__ && defined _STRING_H
++#        if defined __linux__ && defined _STRING_H
+ #            define yystrlen strlen
+ #        else
  /* Return the length of YYSTR.  */
-@@ -852,7 +852,7 @@
- # endif
- 
- # ifndef yystpcpy
--#  if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
-+#  if defined __linux__ && defined _STRING_H && defined _GNU_SOURCE
- #   define yystpcpy stpcpy
- #  else
+@@ -743,7 +743,7 @@ static YYSIZE_T yystrlen(const char *yystr)
+ #    endif
+ 
+ #    ifndef yystpcpy
+-#        if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
++#        if defined __linux__ && defined _STRING_H && defined _GNU_SOURCE
+ #            define yystpcpy stpcpy
+ #        else
  /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
---- Source/WTF/wtf/Platform.h.orig	2018-09-03 09:39:47.000000000 +0200
-+++ Source/WTF/wtf/Platform.h	2018-09-17 15:45:20.959118903 +0200
-@@ -697,7 +697,7 @@
- #define HAVE_CFNETWORK_STORAGE_PARTITIONING 1
- #endif
+--- Source/WTF/wtf/Platform.h
++++ Source/WTF/wtf/Platform.h
+@@ -707,7 +707,7 @@
+ 
+ #endif /* OS(DARWIN) */
  
 -#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || defined(__GLIBC__) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
 +#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || defined(__linux__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
  #define HAVE_MACHINE_CONTEXT 1
  #endif
  
---- Source/WebCore/xml/XPathGrammar.cpp.orig	2018-04-18 08:26:41.000000000 +0200
-+++ Source/WebCore/xml/XPathGrammar.cpp	2018-09-17 15:46:36.742115881 +0200
+--- Source/WebCore/xml/XPathGrammar.cpp
++++ Source/WebCore/xml/XPathGrammar.cpp
 @@ -966,7 +966,7 @@
  #if YYERROR_VERBOSE
  
diff --git a/srcpkgs/webkit2gtk/patches/ppc-llint.patch b/srcpkgs/webkit2gtk/patches/ppc-llint.patch
new file mode 100644
index 00000000000..f42708d5acb
--- /dev/null
+++ b/srcpkgs/webkit2gtk/patches/ppc-llint.patch
@@ -0,0 +1,41 @@
+This fixes JavaScriptCore on big endian systems (mainly ppc).
+
+Without the patch, attempting to run any JS results in
+a crash as the generated code was endian specific.
+
+--- Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
++++ Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
+@@ -1435,13 +1435,13 @@ llintOpWithMetadata(op_put_by_id, OpPutById, macro (size, get, dispatch, metadat
+     loadp StructureChain::m_vector[t3], t3
+     assert(macro (ok) btpnz t3, ok end)
+ 
+-    loadp Structure::m_prototype[t2], t2
++    loadp Structure::m_prototype + PayloadOffset[t2], t2
+     btpz t2, .opPutByIdTransitionChainDone
+ .opPutByIdTransitionChainLoop:
+     loadp [t3], t1
+     bineq t1, JSCell::m_structureID[t2], .opPutByIdSlow
+     addp 4, t3
+-    loadp Structure::m_prototype[t1], t2
++    loadp Structure::m_prototype + PayloadOffset[t1], t2
+     btpnz t2, .opPutByIdTransitionChainLoop
+ 
+ .opPutByIdTransitionChainDone:
+@@ -1952,7 +1952,7 @@ end)
+ 
+ 
+ op(llint_throw_from_slow_path_trampoline, macro()
+-    loadp Callee[cfr], t1
++    loadp Callee + PayloadOffset[cfr], t1
+     andp MarkedBlockMask, t1
+     loadp MarkedBlockFooterOffset + MarkedBlock::Footer::m_vm[t1], t1
+     copyCalleeSavesToVMEntryFrameCalleeSavesBuffer(t1, t2)
+@@ -1962,7 +1962,7 @@ op(llint_throw_from_slow_path_trampoline, macro()
+     # When throwing from the interpreter (i.e. throwing from LLIntSlowPaths), so
+     # the throw target is not necessarily interpreted code, we come to here.
+     # This essentially emulates the JIT's throwing protocol.
+-    loadp Callee[cfr], t1
++    loadp Callee + PayloadOffset[cfr], t1
+     andp MarkedBlockMask, t1
+     loadp MarkedBlockFooterOffset + MarkedBlock::Footer::m_vm[t1], t1
+     jmp VM::targetMachinePCForThrow[t1]
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index a603525306b..1c4f93ccae0 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -1,17 +1,28 @@
 # Template file for 'webkit2gtk'
 pkgname=webkit2gtk
-version=2.24.3
-revision=2
+version=2.26.0
+revision=1
 wrksrc="webkitgtk-${version}"
 build_style=cmake
 build_helper="gir"
-configure_args="-DPORT=GTK -DENABLE_GTKDOC=OFF -DCMAKE_LINKER=${XBPS_CROSS_TRIPLET}-gcc
- -DUSE_GSTREAMER_GL=OFF -DRUBY_VERSION=2.6 -DENABLE_C_LOOP=$(vopt_if jit OFF ON)
+configure_args="-DPORT=GTK -DUSE_LD_GOLD=OFF
+ -DCMAKE_CXX_FLAGS_RELEASE=-DNDEBUG
+ -DCMAKE_CXX_FLAGS_DEBUG=-DNDEBUG
+ -DCMAKE_CXX_FLAGS_RELWITHDEBINFO=-DNDEBUG
+ -DCMAKE_C_FLAGS_RELEASE=-DNDEBUG
+ -DCMAKE_C_FLAGS_DEBUG=-DNDEBUG
+ -DCMAKE_C_FLAGS_RELWITHDEBINFO=-DNDEBUG
+ -DCMAKE_LINKER=${XBPS_CROSS_TRIPLET}-gcc
+ -DRUBY_VERSION=2.6
  -DRUBY_CONFIG_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include/ruby-2.6.0
+ -DENABLE_GTKDOC=OFF -DUSE_GSTREAMER_GL=OFF -DUSE_WPE_RENDERER=OFF
+ -DENABLE_JIT=$(vopt_if jit ON OFF)
+ -DENABLE_C_LOOP=$(vopt_if jit OFF ON)
  -DENABLE_INTROSPECTION=$(vopt_if gir ON OFF)
  -DENABLE_WAYLAND_TARGET=$(vopt_if wayland ON OFF)
- -DENABLE_X11_TARGET=$(vopt_if x11 ON OFF) -DENABLE_JIT=$(vopt_if jit ON OFF)
- -DENABLE_SAMPLING_PROFILER=$(vopt_if sampling_profiler ON OFF)"
+ -DENABLE_X11_TARGET=$(vopt_if x11 ON OFF)
+ -DENABLE_SAMPLING_PROFILER=$(vopt_if sampling_profiler ON OFF)
+ -DENABLE_BUBBLEWRAP_SANDBOX=$(vopt_if bubblewrap ON OFF)"
 hostmakedepends="perl python pkg-config gperf flex ruby glib-devel geoclue2
  $(vopt_if wayland wayland-devel)"
 makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
@@ -19,47 +30,74 @@ makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
  libsoup-devel libxslt-devel gnutls-devel icu-devel enchant-devel
  dbus-glib-devel libwebp-devel gtk+-devel gtk+3-devel libgudev-devel
  libsecret-devel ruby-devel geoclue2-devel libnotify-devel hyphen-devel
- woff2-devel freetype-devel libopenjpeg2-devel
- $(vopt_if x11 libXt-devel) $(vopt_if jit '' libatomic-devel)
+ woff2-devel freetype-devel libopenjpeg2-devel libatomic-devel
+ qt5-devel $(vopt_if x11 libXt-devel)
  $(vopt_if wayland 'MesaLib-devel libxkbcommon-devel wayland-devel wayland-protocols')"
 short_desc="GTK+3 port of the WebKit2 browser engine"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later, BSD-2-Clause"
 homepage="https://webkitgtk.org/"
 distfiles="${homepage}/releases/webkitgtk-${version}.tar.xz"
-checksum=940d746d7e82c357222feb5b3f44c4b201e81df7d81ddca5ca2bf3ae0acf6c51
+checksum=d210c0ecd1a89a22c9f8f1f450334f3489c5c50159b3a5e14dd93d5f349dcced
 
-makedepends+=" qt5-devel"
+build_options="gir wayland x11 bubblewrap jit sampling_profiler"
+build_options_default="gir wayland x11 bubblewrap"
 
-# ETOOHUGE
-nodebug=1
+desc_option_bubblewrap="Enable bubblewrap sandbox"
+desc_option_jit="JavaScript JIT (Only some architectures)"
+desc_option_sampling_profiler="Sampling profiler support (JIT + glibc only)"
 
-CXXFLAGS="-Wno-expansion-to-defined -Wno-redundant-move -Wno-deprecated-copy"
-
-# Package build options
-build_options="gir wayland x11 jit sampling_profiler"
-build_options_default="gir wayland x11"
-
-desc_option_jit="Enable JustInTime JS support"
-desc_option_sampling_profiler="Toggle sampling profiler support (disabled on musl)"
+# detection + runtime
+if [ "$build_option_bubblewrap" ]; then
+	hostmakedepends+=" bubblewrap xdg-dbus-proxy"
+	makedepends+=" libseccomp-devel"
+	depends+=" bubblewrap xdg-dbus-proxy"
+fi
 
+# only a few platform support JIT
 case "$XBPS_TARGET_MACHINE" in
-	aarch64*|arm*|ppc|ppc-musl) configure_args+=" -DUSE_LD_GOLD=0";;
+	aarch64*|x86_64*|mips*)
+		build_options_default+=" jit"
+		if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
+			build_options_default+=" sampling_profiler"
+		elif [ "$build_option_sampling_profiler" ]; then
+			broken="sampling_profiler is only supported on glibc"
+		fi
+		;;
+	i686*)
+		# JIT requires SSE2 so disabled by default
+		# it's also currently broken
+		if [ "$build_option_jit" ]; then
+			broken="OffsetExtractor: No magic values found."
+		fi
+		;;
+	*)
+		if [ "$build_option_jit" ]; then
+			broken="JIT is not supported on ${XBPS_TARGET_MACHINE}"
+		fi
+		;;
 esac
 
-# JIT conflicts with sampling_profiler
-case "$XBPS_TARGET_MACHINE" in
-	i686*|ppc*|mips*|arm*) ;;
-	*-musl) build_options_default+=" jit" ;;
-	*) build_options_default+=" jit sampling_profiler" ;;
-esac
+# extra validation
+if [ "$build_option_sampling_profiler" -a -z "$build_option_jit" ]; then
+	broken="sampling_profiler requires JIT"
+fi
 
 pre_configure() {
+	# work around large debug symbols on 32-bit hosts
+	if [ "$XBPS_WORDSIZE" = "32" ]; then
+		export CFLAGS="${CFLAGS/-g/-g1}"
+		export CXXFLAGS="${CXXFLAGS/-g/-g1}"
+		export LDFLAGS+=" -Wl,--no-keep-memory"
+	fi
+
+	# the above is not enough for 32-bit ppc and debug
 	case "$XBPS_TARGET_MACHINE" in
-	armv[56]*|ppc|ppc-musl) # Add -latomic to the targets
-		find -name "CMakeLists.txt" -exec sed -i "{}" \
-		-e "/target_link_libraries/s/)/ atomic)/" \;
-		;;
+		ppc64*) ;;
+		ppc*)
+			export CFLAGS="${CFLAGS/-O2/-Os}"
+			export CXXFLAGS="${CXXFLAGS/-O2/-Os}"
+			;;
 	esac
 }
 
diff --git a/srcpkgs/weechat/template b/srcpkgs/weechat/template
index 3cf06599c6a..19f8af4fd8f 100644
--- a/srcpkgs/weechat/template
+++ b/srcpkgs/weechat/template
@@ -1,23 +1,23 @@
 # Template file for 'weechat'
 pkgname=weechat
-version=2.5
-revision=1
+version=2.6
+revision=2
 build_style=cmake
 configure_args="-DENABLE_MAN=ON -DENABLE_ENCHANT=ON -DENABLE_PERL=ON
  -DENABLE_LUA=ON -DENABLE_RUBY=ON -DENABLE_SPELL=ON
- -DPYTHON_EXECUTABLE=/usr/bin/python2.7
- -DPYTHON_LIBRARY=${XBPS_CROSS_BASE}/usr/lib/libpython2.7.so"
-hostmakedepends="ruby-asciidoctor libgcrypt-devel pkg-config python tcl-devel"
-makedepends="enchant-devel gnutls-devel libcurl-devel lua-devel python-devel
+ -DPYTHON_EXECUTABLE=/usr/bin/python3
+ -DPYTHON_LIBRARY=${XBPS_CROSS_BASE}/usr/lib/libpython3.so"
+hostmakedepends="ruby-asciidoctor libgcrypt-devel pkg-config python3 tcl-devel"
+makedepends="enchant-devel gnutls-devel libcurl-devel lua-devel python3-devel
  ruby-devel tcl-devel perl"
 depends="ca-certificates"
 short_desc="Fast, light and extensible IRC client"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.weechat.org"
 changelog="https://raw.githubusercontent.com/weechat/weechat/master/ChangeLog.adoc"
 distfiles="https://www.weechat.org/files/src/weechat-${version}.tar.xz"
-checksum=52c87775c3ff9714a62cfa5b7e13e2fa59bf32829fe083781c1d9c7f1c2d4c27
+checksum=fa9e3130e7afdfb6eff1b7892caac3efdd38a442f9989ca8c061eced2c755148
 lib32disabled=yes
 
 subpackages="weechat-aspell weechat-devel weechat-ruby weechat-python weechat-tcl weechat-lua weechat-perl"
diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template
index d9e1af044ed..183a6b266de 100644
--- a/srcpkgs/wesnoth/template
+++ b/srcpkgs/wesnoth/template
@@ -1,7 +1,7 @@
 # Template file for 'wesnoth'
 pkgname=wesnoth
-version=1.14.7
-revision=2
+version=1.14.9
+revision=1
 build_style=cmake
 configure_args="-DENABLE_OMP=1"
 hostmakedepends="pkg-config"
@@ -14,7 +14,7 @@ maintainer="Philipp Hirsch <itself@hanspolo.net>"
 license="GPL-2.0-or-later"
 homepage="https://wesnoth.org"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=475e6ce3720edf76cfc3a9b9ac015067d473a46d164dcc4406b3c8f7d8dc5e48
+checksum=ea8d51f474861c3954efdbfce3980e8c7ee58edeab714a8ab3d3f74e1dcd0dd6
 
 post_install() {
 	# runit service
diff --git a/srcpkgs/wf-config-devel b/srcpkgs/wf-config-devel
new file mode 120000
index 00000000000..fb3df2e900c
--- /dev/null
+++ b/srcpkgs/wf-config-devel
@@ -0,0 +1 @@
+wf-config/
\ No newline at end of file
diff --git a/srcpkgs/wf-config/patches/fix-musl.patch b/srcpkgs/wf-config/patches/fix-musl.patch
deleted file mode 100644
index b87797ba555..00000000000
--- a/srcpkgs/wf-config/patches/fix-musl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/config.cpp b/src/config.cpp
-index f586ab5..811ce29 100644
---- src/config.cpp
-+++ src/config.cpp
-@@ -4,6 +4,7 @@
- #include <sstream>
- #include <fstream>
- #include <algorithm>
-+#include <fcntl.h>
- 
- std::ofstream out;
- 
-
diff --git a/srcpkgs/wf-config/template b/srcpkgs/wf-config/template
index 98eee65d39e..adee709a060 100644
--- a/srcpkgs/wf-config/template
+++ b/srcpkgs/wf-config/template
@@ -1,6 +1,6 @@
 # Template file for 'wf-config'
 pkgname=wf-config
-version=0.1
+version=0.3
 revision=1
 build_style=meson
 hostmakedepends="pkg-config"
@@ -9,11 +9,19 @@ short_desc="Wayfire library for managing configuration files"
 maintainer="Young Jin Park <youngjinpark20@gmail.com>"
 license="MIT"
 homepage="https://wayfire.org"
-distfiles="https://github.com/WayfireWM/wf-config/archive/v${version}.tar.gz
- https://raw.githubusercontent.com/WayfireWM/wf-config/master/LICENSE>LICENSE.txt"
-checksum="0dac4683013d5a0b143f0e211288c7f2f621740b9ac664359297ff530a7dcdc5
- 7053b1aa75aaccfe2a2bfacd400c0a8694858797ff9c7d584664e2941fb3016e"
+distfiles="https://github.com/WayfireWM/wf-config/archive/${version}.tar.gz"
+checksum=5d1a5038b11a177174b392f3b383d787f568265ce483a5be9178698f548f7c66
 
 post_install() {
-	vlicense ../LICENSE.txt
+	vlicense LICENSE
+}
+
+wf-config-devel_package() {
+	depends="libevdev-devel wlroots-devel wf-config>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
 }
diff --git a/srcpkgs/wf-shell/template b/srcpkgs/wf-shell/template
index ccfd8c574a0..8e47f341bb6 100644
--- a/srcpkgs/wf-shell/template
+++ b/srcpkgs/wf-shell/template
@@ -1,16 +1,34 @@
 # Template file for 'wf-shell'
 pkgname=wf-shell
-version=0.1
+version=0.3
 revision=1
+_gtklayershell_hash="d1f9d94be32f8cc61c0a53af7558146570f0fa9f"
+_gvc_hash="468022b708fc1a56154f3b0cc5af3b938fb3e9fb"
+create_wrksrc=yes
+build_wrksrc=${pkgname}-${version}
 build_style=meson
-hostmakedepends="pkg-config wayland-devel"
-makedepends="gtkmm-devel libevdev-devel wlroots-devel wf-config"
+build_helper="gir"
+hostmakedepends="gobject-introspection pkg-config wayland-devel"
+makedepends="alsa-lib-devel pulseaudio-devel gtkmm-devel
+ gtk+3-devel libevdev-devel wlroots-devel wf-config-devel"
 short_desc="Wayfire shell with GTK-based panel and background client"
 maintainer="Young Jin Park <youngjinpark20@gmail.com>"
 license="MIT"
 homepage="https://wayfire.org"
-distfiles="https://github.com/WayfireWM/wf-shell/archive/${version}.tar.gz"
-checksum=625637fddf58a6a1825980e68d156ddb377cf4aae9bf5d844fb15aefee4c6f4f
+distfiles="https://github.com/WayfireWM/wf-shell/archive/${version}.tar.gz
+ https://github.com/wmww/gtk-layer-shell/archive/${_gtklayershell_hash}.tar.gz
+ https://github.com/GNOME/libgnome-volume-control/archive/${_gvc_hash}.tar.gz"
+checksum="326c732415a10215997c0915741fd561a306412327fae123eab67f1af9ee41de
+ 0b66a943375e3c8f597ca293f8e0ca0cfa585163ed5a7dfb7956c02147c40c17
+ 3ab63b0073bf21cab80b3974c9f6aa969ff1a4c4911aae6a09681c7d1b2b785f"
+
+post_extract() {
+	_gtklayershell_dir="${build_wrksrc}/subprojects/gtk-layer-shell"
+	_gvc_dir="${build_wrksrc}/subprojects/gvc"
+	rmdir ${_gtklayershell_dir} ${_gvc_dir}
+	mv gtk-layer-shell-${_gtklayershell_hash} ${_gtklayershell_dir}
+	mv libgnome-volume-control-${_gvc_hash} ${_gvc_dir}
+}
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/whois/template b/srcpkgs/whois/template
index 2093546e41d..e27f1382778 100644
--- a/srcpkgs/whois/template
+++ b/srcpkgs/whois/template
@@ -1,15 +1,16 @@
 # Template file for 'whois'
 pkgname=whois
-version=5.4.3
+version=5.5.2
 revision=1
+wrksrc=whois
 hostmakedepends="perl pkg-config"
 makedepends="libidn2-devel"
 short_desc="Improved whois client"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.linux.it/~md/software"
 distfiles="${DEBIAN_SITE}/main/w/${pkgname}/${pkgname}_${version}.tar.xz"
-checksum=fefa84029f70985db19743e51c4a8b318a169426babeaa824a27110c26090fc3
+checksum=c0594d3bc81c12958118ffa5c1bc04db105b853e7f748021588913c986fea5c0
 
 alternatives="
  whois:whois:/usr/bin/gwhois
@@ -24,3 +25,13 @@ do_install() {
 	mv ${DESTDIR}/usr/bin/{whois,gwhois}
 	mv ${DESTDIR}/usr/share/man/man1/{whois,gwhois}.1
 }
+
+mkpasswd_package() {
+	short_desc="Feature-rich front end to crypt(3) password encryption"
+	alternatives="mkpasswd:mkpasswd:/usr/bin/gmkpasswd
+	 mkpasswd:mkpasswd.1:/usr/share/man/man1/gmkpasswd.1"
+	pkg_install() {
+		vbin mkpasswd gmkpasswd
+		vman mkpasswd.1 gmkpasswd.1
+	}
+}
diff --git a/srcpkgs/wine-mono/template b/srcpkgs/wine-mono/template
index e3103a92b5a..36fdcab1d14 100644
--- a/srcpkgs/wine-mono/template
+++ b/srcpkgs/wine-mono/template
@@ -1,6 +1,6 @@
 # Template file for 'wine-mono'
 pkgname=wine-mono
-version=4.9.0
+version=4.9.3
 revision=1
 archs=noarch
 build_style=fetch
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT, GPL-3.0-or-later, LGPL-2.0-or-later"
 homepage="https://wiki.winehq.org/Mono"
 distfiles="http://dl.winehq.org/wine/wine-mono/${version}/${pkgname}-${version}.msi"
-checksum=8e2ec7ce6f10faa24e7b1b4bcab99a946dfe975c21327c8420c7abc74ee1c713
+checksum=7cf6b7674697f9de9cd1630ceb1de4c56adebb617fcca4d179a22cb7e1b2476d
 
 do_install() {
 	# The actual installation within WINE occurs at runtime in whatever
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 534b2f1ea1d..1df42b4f481 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=4.13
+version=4.17
 revision=1
 build_style=gnu-configure
 configure_args="--without-gstreamer"
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="LGPL-2.1-or-later"
 homepage="http://www.winehq.org/"
 distfiles="https://dl.winehq.org/wine/source/${version%%.*}.x/wine-${version}.tar.xz"
-checksum=79174151cbc403250d4727dc9c55df8d6a60a2fe28343642c2452a92c6431d67
+checksum=7480a1436687486996ba6cf91fef71b70e6dafffbf2c55ea2430094c1025b2ae
 
 nopie_files="/usr/bin/wine"
 
diff --git a/srcpkgs/winetricks/template b/srcpkgs/winetricks/template
index 14b578dbe56..4083fb68c1b 100644
--- a/srcpkgs/winetricks/template
+++ b/srcpkgs/winetricks/template
@@ -1,6 +1,6 @@
 # Template file for 'winetricks'
 pkgname=winetricks
-version=20190615
+version=20190912
 revision=1
 archs=noarch
 build_style=gnu-makefile
@@ -10,4 +10,4 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="LGPL-3.0-or-later"
 homepage="http://wiki.winehq.org/winetricks"
 distfiles="https://github.com/Winetricks/winetricks/archive/$version.tar.gz"
-checksum=2a5ebbd95e0ed0041f903148af19ba28d5b7e29a62db4501771dfffb7368fc42
+checksum=acedd8aebe9a7fef4548ff8a47cc8ab7e6d13f6051c1b79d51cd4105e0f7fb9f
diff --git a/srcpkgs/wireguard/template b/srcpkgs/wireguard/template
index 847c9b797b6..7d38a9bca97 100644
--- a/srcpkgs/wireguard/template
+++ b/srcpkgs/wireguard/template
@@ -1,6 +1,6 @@
 # Template file for 'wireguard'
 pkgname=wireguard
-version=0.0.20190702
+version=0.0.20191012
 revision=1
 wrksrc="WireGuard-${version}"
 build_wrksrc="src/tools"
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://www.wireguard.com/"
 distfiles="https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"
-checksum=1a1311bc71abd47a72c47d918be3bacc486b3de90734661858af75cc990dbaac
+checksum=93573193c9c1c22fde31eb1729ad428ca39da77a603a3d81561a9816ccecfa8e
 
 dkms_modules="wireguard ${version}"
 
@@ -28,6 +28,7 @@ post_install() {
 wireguard-tools_package() {
 	short_desc+=" - tools"
 	depends="openresolv"
+	make_dirs="/etc/wireguard 0700 root root"
 	pkg_install() {
 		vmove usr/bin/wg
 		vmove usr/bin/wg-quick
diff --git a/srcpkgs/wireshark/template b/srcpkgs/wireshark/template
index ce21774b8b3..10a99e65bcb 100644
--- a/srcpkgs/wireshark/template
+++ b/srcpkgs/wireshark/template
@@ -1,6 +1,6 @@
 # Template file for 'wireshark'
 pkgname=wireshark
-version=3.0.3
+version=3.0.5
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config flex perl python3-devel mit-krb5-devel qt5-tools
@@ -15,7 +15,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.wireshark.org"
 distfiles="https://www.wireshark.org/download/src/${pkgname}-${version}.tar.xz"
-checksum=af92729c781d870110885c31ebcbe4c4224ed51bb580d00c896fe9746994211c
+checksum=c551fce475c49cea317ccbf9d22404bc827dde9cee0ccdf6648bfed3ecd9f820
 system_groups="wireshark"
 
 CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/lua5.2"
diff --git a/srcpkgs/wl-clipboard/template b/srcpkgs/wl-clipboard/template
index ba7b5413ca5..3aea91fa02e 100644
--- a/srcpkgs/wl-clipboard/template
+++ b/srcpkgs/wl-clipboard/template
@@ -1,13 +1,13 @@
 # Template file for 'wl-clipboard'
 pkgname=wl-clipboard
-version=1.0.0
+version=2.0.0
 revision=1
 build_style=meson
 hostmakedepends="wayland-devel pkg-config"
 makedepends="wayland-protocols wayland-devel"
 short_desc="Wayland clipboard utilities"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/bugaevc/wl-clipboard"
 distfiles="https://github.com/bugaevc/wl-clipboard/archive/v${version}.tar.gz"
-checksum=9b5c1f5f67c40672324194ec11c1fcbeccc72c0cd5b6712d6c7257be252387e3
+checksum=2c42f182432adabe56da0f1144d5fcc40b7aae3d8e14d2bc4dc4c3f91b51808d
diff --git a/srcpkgs/wlroots/template b/srcpkgs/wlroots/template
index 9a57e9b99d2..75ddb338a15 100644
--- a/srcpkgs/wlroots/template
+++ b/srcpkgs/wlroots/template
@@ -1,23 +1,23 @@
 # Template file for 'wlroots'
 pkgname=wlroots
-version=0.6.0
-revision=2
+version=0.8.1
+revision=1
 build_style=meson
 configure_args="-Dlibcap=enabled -Dlogind=enabled -Dlogind-provider=elogind
  -Dxcb-errors=enabled -Dxcb-icccm=enabled -Dxwayland=enabled
- -Dx11-backend=enabled -Dexamples=false -Drootston=false"
+ -Dx11-backend=enabled -Dexamples=false"
 hostmakedepends="pkg-config wayland-devel"
 makedepends="elogind-devel libcap-devel wayland-devel wayland-protocols
  MesaLib-devel libinput-devel libxkbcommon-devel libdrm-devel pixman-devel
  libxcb-devel xcb-util-cursor-devel xcb-util-devel xcb-util-image-devel
  xcb-util-keysyms-devel xcb-util-renderutil-devel xcb-util-wm-devel
  xcb-util-errors-devel xcb-util-xrm-devel freerdp-devel"
-short_desc="Module Wayland compositor library"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+short_desc="Modular Wayland compositor library"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/swaywm/wlroots"
 distfiles="https://github.com/swaywm/wlroots/archive/${version}.tar.gz"
-checksum=9cf3716f3683d800df8b150f256ff66dad65faf13a9d67c284f67a9444d28c70
+checksum=202b86e0e21699b6660bbda56afc2e3358db7252f83ff69c89f01926b4900d98
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/woff2/template b/srcpkgs/woff2/template
index ecf52247c43..9af0c9f8428 100644
--- a/srcpkgs/woff2/template
+++ b/srcpkgs/woff2/template
@@ -6,7 +6,7 @@ build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="brotli-devel"
 short_desc="Web Open Font Format 2 reference implementaton"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/google/woff2"
 distfiles="https://github.com/google/woff2/archive/v${version}.tar.gz"
diff --git a/srcpkgs/workrave/template b/srcpkgs/workrave/template
index 7ef66057e60..f34f232ef22 100644
--- a/srcpkgs/workrave/template
+++ b/srcpkgs/workrave/template
@@ -19,13 +19,12 @@ homepage="http://www.workrave.org/"
 distfiles="https://github.com/rcaelers/${pkgname}/archive/v${_realversion}.tar.gz"
 checksum=969fb8a6cb14aed08b2294bd01dbb2c2485a4c9bf6936fa8a513867aed759f63
 
-case "$XBPS_TARGET_MACHINE" in
-	x86_64-musl) ;;
-	*-musl) broken="gobject introspection" ;;
-esac
-
 build_options="pulseaudio"
 
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	nocross="Locale.cc: undefined reference to '_nl_msg_cat_cntr'"
+fi
+
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh
 }
diff --git a/srcpkgs/wpa-cute/template b/srcpkgs/wpa-cute/template
new file mode 100644
index 00000000000..bc09dfff743
--- /dev/null
+++ b/srcpkgs/wpa-cute/template
@@ -0,0 +1,23 @@
+# Template file for 'wpa-cute'
+pkgname=wpa-cute
+version=0.8.1
+revision=1
+build_wrksrc="src"
+build_style=qmake
+hostmakedepends="qt5-host-tools qt5-qmake"
+makedepends="qt5-devel"
+depends="wpa_supplicant"
+short_desc="Graphical wpa_supplicant front end"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/loh-tar/wpa-cute"
+distfiles="https://github.com/loh-tar/wpa-cute/archive/v${version}.tar.gz"
+checksum=42e79dbfd4b190c7679e0df9b7d8365682c9e9a513312833599f5705004e79b7
+
+do_install() {
+	vbin wpa-cute
+	vman "${wrksrc}/doc/wpa-cute.8"
+	vinstall icons/wpa_gui.svg 644 /usr/share/pixmaps
+	vinstall wpa-cute.desktop 644 /usr/share/applications
+	vlicense "${wrksrc}/COPYING"
+}
diff --git a/srcpkgs/wxMaxima/template b/srcpkgs/wxMaxima/template
index e44601de941..30d41414d75 100644
--- a/srcpkgs/wxMaxima/template
+++ b/srcpkgs/wxMaxima/template
@@ -1,6 +1,6 @@
 # Template file for 'wxMaxima'
 pkgname=wxMaxima
-version=19.07.0
+version=19.10.0
 revision=1
 wrksrc="wxmaxima-Version-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Martin Riese <grauehaare@gmx.de>"
 license="GPL-2.0-or-later"
 homepage="https://wxmaxima-developers.github.io/wxmaxima/"
 distfiles="https://github.com/wxMaxima-developers/wxmaxima/archive/Version-${version}.tar.gz"
-checksum=16237f22cf76ecb9159e536bbb121e89ac5ad043843a5f32aaac74f0b409c658
+checksum=5ec0a912ebe2688b0fbe10999463cb8365ce5e87d8a47eb04f95bd63880dc2f0
 nocross="clisp is nocross"
 
 post_install() {
diff --git a/srcpkgs/wxPython4/patches/0001-Switch-to-wx-config-gtk3.0-to-avoid-conflict-with-wx.patch b/srcpkgs/wxPython4/patches/0001-Switch-to-wx-config-gtk3.0-to-avoid-conflict-with-wx.patch
index 47606caa474..f741a968864 100644
--- a/srcpkgs/wxPython4/patches/0001-Switch-to-wx-config-gtk3.0-to-avoid-conflict-with-wx.patch
+++ b/srcpkgs/wxPython4/patches/0001-Switch-to-wx-config-gtk3.0-to-avoid-conflict-with-wx.patch
@@ -1,7 +1,7 @@
 From cddbe3b3b237b8e63abd8921fdb20314c20c2c08 Mon Sep 17 00:00:00 2001
 From: Jasper Chan <jasperchan515@gmail.com>
 Date: Sat, 22 Sep 2018 20:59:29 -0700
-Subject: [PATCH] Switch to wx-config-gtk3.0 to avoid conflict with
+Subject: [PATCH] Switch to wx-config-gtk3 to avoid conflict with
  wxWidgets-gtk2
 
 ---
@@ -17,7 +17,7 @@ index 3cd5b828..57dbd384 100755
  
          ("use_syswx",      (False, "Try to use an installed wx rather than building the "
 -                                   "one in this source tree.  The wx-config in {prefix}/bin "
-+                                   "one in this source tree.  The wx-config-gtk3.0 in {prefix}/bin "
++                                   "one in this source tree.  The wx-config-gtk3 in {prefix}/bin "
                                     "or the first found on the PATH determines which wx is "
                                     "used.  Implies --no_magic.")),
          ("force_config",   (False, "Run configure when building even if the script "
@@ -26,7 +26,7 @@ index 3cd5b828..57dbd384 100755
                               os.path.join(wxDir(), 'setup.h.in'),
                               os.path.join(wxDir(), 'version-script.in'),
 -                             os.path.join(wxDir(), 'wx-config.in'),
-+                             os.path.join(wxDir(), 'wx-config-gtk3.0.in'),
++                             os.path.join(wxDir(), 'wx-config-gtk3.in'),
                               ]
              for dep in dependencies:
                  if newer(dep, os.path.join(BUILD_DIR, "Makefile")):
@@ -35,15 +35,15 @@ index 3cd5b828..57dbd384 100755
  
      if not isWindows:
 -        WX_CONFIG = posixjoin(BUILD_DIR, 'wx-config')
-+        WX_CONFIG = posixjoin(BUILD_DIR, 'wx-config-gtk3.0')
++        WX_CONFIG = posixjoin(BUILD_DIR, 'wx-config-gtk3')
          if options.use_syswx:
 -            wxcfg = posixjoin(options.prefix, 'bin', 'wx-config')
-+            wxcfg = posixjoin(options.prefix, 'bin', 'wx-config-gtk3.0')
++            wxcfg = posixjoin(options.prefix, 'bin', 'wx-config-gtk3')
              if options.prefix and os.path.exists(wxcfg):
                  WX_CONFIG = wxcfg
              else:
 -                WX_CONFIG = 'wx-config' # hope it is on the PATH
-+                WX_CONFIG = 'wx-config-gtk3.0' # hope it is on the PATH
++                WX_CONFIG = 'wx-config-gtk3' # hope it is on the PATH
  
  
      wafBuildBase = wafBuildDir = getWafBuildBase()
diff --git a/srcpkgs/wxPython4/template b/srcpkgs/wxPython4/template
index e0609856dea..2aa7117d5e0 100644
--- a/srcpkgs/wxPython4/template
+++ b/srcpkgs/wxPython4/template
@@ -1,29 +1,29 @@
 # Template file for 'wxPython4'
 pkgname=wxPython4
-version=4.0.4
-revision=1
+version=4.0.6
+revision=2
 wrksrc="wxPython-${version}"
 build_style=python3-module
 pycompile_module="wx"
 make_build_args="--skip-build"
 make_install_args="--skip-build"
-hostmakedepends="pkg-config python3-setuptools"
+hostmakedepends="pkg-config python3-setuptools python3-pathlib2"
 makedepends="python3-devel wxWidgets-gtk3-devel SDL2-devel webkit2gtk-devel
  gst-plugins-base1-devel"
 depends="python3"
 short_desc="WxWidgets GUI toolkit library (Python3 Bindings)"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
-license="wxWindows"
+license="custom:wxWindows"
 homepage="http://www.wxpython.org/"
 distfiles="${PYPI_SITE}/w/wxPython/wxPython-${version}.tar.gz"
-checksum=0d9ef4260cb2f3e23ed9dcf6baa905ba585ac7d631613cddc299c4c83463ae29
+checksum=35cc8ae9dd5246e2c9861bb796026bbcb9fb083e4d49650f776622171ecdab37
 
 if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" python3"
 	CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/python${py3_ver}"
 fi
 
 pre_build() {
+	chmod -R go+rX $wrksrc
 	if [ "$CROSS_BUILD" ]; then
 		PYPREFIX="$XBPS_CROSS_BASE"
 		CFLAGS+=" -I${XBPS_CROSS_BASE}/${py3_inc} -I${XBPS_CROSS_BASE}/usr/include"
@@ -32,9 +32,10 @@ pre_build() {
 		LDSHARED="${CC} -shared $LDFLAGS"
 		env CC="$CC" LDSHARED="$LDSHARED" \
 			PYPREFIX="$PYPREFIX" CFLAGS="$CFLAGS" \
-			LDFLAGS="$LDFLAGS" python3 build.py --use_syswx
+			PYTHON_CONFIG="${XBPS_CROSS_BASE}/bin/python3-config" \
+			LDFLAGS="$LDFLAGS" python3 build.py build_py --use_syswx
 	else
-		python3 build.py --use_syswx
+		python3 build.py build_py --use_syswx
 	fi
 }
 
diff --git a/srcpkgs/x264/template b/srcpkgs/x264/template
index 7409444bc9c..53a148c1f6f 100644
--- a/srcpkgs/x264/template
+++ b/srcpkgs/x264/template
@@ -1,17 +1,17 @@
 # Template file for 'x264'
 pkgname=x264
-_snap_date=20190712
+_snap_date=20190911
 _snap_rev=2245
 version="${_snap_date}.${_snap_rev}"
 revision=1
 wrksrc="x264-snapshot-${_snap_date}-${_snap_rev}-stable"
 hostmakedepends="nasm perl"
 short_desc="Free library for encoding H264/AVC video streams"
-maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://www.videolan.org/developers/x264.html"
+maintainer="DirectorX <void.directorx@protonmail.com>"
 license="GPL-2.0-or-later"
-distfiles="http://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${_snap_date}-${_snap_rev}-stable.tar.bz2"
-checksum=233231456a83077ec5658f537d18688a419b08f52f9c7d3524e09328d78639ed
+homepage="https://www.videolan.org/developers/x264.html"
+distfiles="https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${_snap_date}-${_snap_rev}-stable.tar.bz2"
+checksum=a11065258559feb53b532f039b9df90fd616c6a3042c1bcd36cee29c6cc2b5c1
 
 do_configure() {
 	local args
diff --git a/srcpkgs/x42-plugins/template b/srcpkgs/x42-plugins/template
index af61d613391..c31b98c5f1d 100644
--- a/srcpkgs/x42-plugins/template
+++ b/srcpkgs/x42-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'x42-plugins'
 pkgname=x42-plugins
-version=20190507
+version=20190820
 revision=1
 build_style=gnu-makefile
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ maintainer="bluntphenomena <gregwyd@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/x42/x42-plugins"
 distfiles="http://gareus.org/misc/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=a728ac8ed5564072b09f95b69c1c9f3993285d7830cb7002dfee857de2993d2c
+checksum=70935871c8113ed07bf557fbdfacaca26b22298d1189992428dd8eda7d511a37
 
 pre_build() {
 	export OPTIMIZATIONS="-fomit-frame-pointer -O3 -fno-finite-math-only -DNDEBUG"
diff --git a/srcpkgs/xapian-core/template b/srcpkgs/xapian-core/template
index 8cd4edfd0bc..db7bbdd3a39 100644
--- a/srcpkgs/xapian-core/template
+++ b/srcpkgs/xapian-core/template
@@ -1,7 +1,7 @@
 # Template file for 'xapian-core'
 pkgname=xapian-core
-version=1.4.11
-revision=2
+version=1.4.12
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
 makedepends="zlib-devel libuuid-devel"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.xapian.org/"
 distfiles="https://oligarchy.co.uk/xapian/${version}/${pkgname}-${version}.tar.xz"
-checksum=9f16b2f3e2351a24034d7636f73566ab74c3f0729e9e0492934e956b25c5bc07
+checksum=4f8a36da831712db41d38a039fefb5251869761a58be28ba802994bb930fac7c
 
 # xapian-config needs the .la
 keep_libtool_archives=yes
diff --git a/srcpkgs/xapps/template b/srcpkgs/xapps/template
index 955199a35be..80bc0bd7cbf 100644
--- a/srcpkgs/xapps/template
+++ b/srcpkgs/xapps/template
@@ -1,6 +1,6 @@
 # Template file for 'xapps'
 pkgname=xapps
-version=1.4.8
+version=1.4.9
 revision=1
 build_style=meson
 build_helper="gir"
@@ -14,7 +14,7 @@ license="GPL-3.0-or-later, LGPL-3.0-or-later"
 homepage="https://github.com/linuxmint/xapps"
 changelog="https://raw.githubusercontent.com/linuxmint/xapps/master/debian/changelog"
 distfiles="https://github.com/linuxmint/xapps/archive/${version}.tar.gz"
-checksum=6f6c37c568e58ea1644fecc3513708877d358eb3911ff138a992c5078e4b0c73
+checksum=c2122c8c0616b07aca0654c86810549545363733ad36ec6f27451345083c80ca
 
 xapps-devel_package() {
 	short_desc+=" - development files"
@@ -24,5 +24,7 @@ xapps-devel_package() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
+		vmove usr/share/gir-1.0
+		vmove usr/share/vala
 	}
 }
diff --git a/srcpkgs/xbps-triggers/files/dkms b/srcpkgs/xbps-triggers/files/dkms
index 0f1fbb9ec0a..2208af9e745 100755
--- a/srcpkgs/xbps-triggers/files/dkms
+++ b/srcpkgs/xbps-triggers/files/dkms
@@ -72,7 +72,7 @@ add_modules() {
 		fi
 		if [ ! -f ${f}/build/scripts/basic/fixdep ] ; then
 			echo -n "Building scripts for kernel-${_kver}... "
-			make -C ${f}/build scripts &> ${f}/build/make.log
+			yes "" | make -j$(nproc) -C ${f}/build scripts > ${f}/build/make.log 2>&1
 			if [ $? -eq 0 ]; then
 				echo "done."
 			else
diff --git a/srcpkgs/xbps-triggers/template b/srcpkgs/xbps-triggers/template
index 4247352939c..e4b1dd25f41 100644
--- a/srcpkgs/xbps-triggers/template
+++ b/srcpkgs/xbps-triggers/template
@@ -1,7 +1,7 @@
 # Template file for 'xbps-triggers'
 pkgname=xbps-triggers
 version=0.113
-revision=1
+revision=3
 archs=noarch
 bootstrap=yes
 short_desc="The XBPS triggers for Void Linux"
diff --git a/srcpkgs/xcb-util-xrm/template b/srcpkgs/xcb-util-xrm/template
index b6fec86d146..a1339585a50 100644
--- a/srcpkgs/xcb-util-xrm/template
+++ b/srcpkgs/xcb-util-xrm/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config xorg-util-macros"
 makedepends="libX11-devel xcb-util-devel"
 short_desc="XCB utility functions for the X resource manager"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/Airblader/xcb-util-xrm"
 distfiles="https://github.com/Airblader/xcb-util-xrm/archive/v${version}.tar.gz"
diff --git a/srcpkgs/xdg-dbus-proxy/patches/musl.patch b/srcpkgs/xdg-dbus-proxy/patches/musl.patch
new file mode 100644
index 00000000000..b0c01f4dc0d
--- /dev/null
+++ b/srcpkgs/xdg-dbus-proxy/patches/musl.patch
@@ -0,0 +1,19 @@
+--- dbus-proxy.c	2019-01-15 18:02:01.000000000 +0000
++++ -	2019-08-25 19:41:33.423715619 +0000
+@@ -31,6 +31,16 @@
+ 
+ #include "flatpak-proxy.h"
+ 
++// Taken from glibc unistd.h
++#ifndef TEMP_FAILURE_RETRY
++# define TEMP_FAILURE_RETRY(expression) \
++  (__extension__                                                              \
++    ({ long int __result;                                                     \
++       do __result = (long int) (expression);                                 \
++       while (__result == -1L && errno == EINTR);                             \
++       __result; }))
++#endif
++
+ static const char *argv0;
+ static GList *proxies;
+ static int sync_fd = -1;
diff --git a/srcpkgs/xdg-dbus-proxy/template b/srcpkgs/xdg-dbus-proxy/template
index 7d489f6e382..3d01f5e60b1 100644
--- a/srcpkgs/xdg-dbus-proxy/template
+++ b/srcpkgs/xdg-dbus-proxy/template
@@ -1,14 +1,14 @@
 # Template file for 'xdg-dbus-proxy'
 pkgname=xdg-dbus-proxy
-version=0.1.1
+version=0.1.2
 revision=1
 build_style=gnu-configure
 configure_args="--enable-man"
 hostmakedepends="libxslt pkg-config docbook-xsl"
 makedepends="libglib-devel"
 short_desc="Filtering proxy for D-Bus connections"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/flatpak/xdg-dbus-proxy"
 distfiles="${homepage}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=10b71573009d0e474d246576714742389eb65bba529276524b59ff5064791ef1
+checksum=1749d6f9f46dcc9edc87725641cf56cf91dcad1b01707891ea0850c1000c520f
diff --git a/srcpkgs/xdg-desktop-portal-kde/template b/srcpkgs/xdg-desktop-portal-kde/template
index e2885a3f146..c39d625283d 100644
--- a/srcpkgs/xdg-desktop-portal-kde/template
+++ b/srcpkgs/xdg-desktop-portal-kde/template
@@ -1,6 +1,6 @@
 # Template file for 'xdg-desktop-portal-kde'
 pkgname=xdg-desktop-portal-kde
-version=5.16.4
+version=5.17.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kcoreaddons"
@@ -10,4 +10,4 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-3.0-or-later"
 homepage="https://phabricator.kde.org/source/xdg-desktop-portal-kde"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3b8aa78451cfc97ef316f1632f6a255ccebbe383ec8389ffc74d44540fc05052
+checksum=5d6a54e764cc77c4d14cbae6ca76a4908fe93dcc7e36f641a1df1ce38b43da35
diff --git a/srcpkgs/xdgmenumaker/files/1.5/xdgmenumaker.1 b/srcpkgs/xdgmenumaker/files/1.5/xdgmenumaker.1
new file mode 100644
index 00000000000..062696370a8
--- /dev/null
+++ b/srcpkgs/xdgmenumaker/files/1.5/xdgmenumaker.1
@@ -0,0 +1,464 @@
+.TH "xdgmenumaker" 1 "09/16/2018" "George Vlahavas"
+
+.SH NAME
+.P
+xdgmenumaker \- generate XDG menus
+.SH SYNOPSIS
+.P
+\fBxdgmenumaker\fR [\fIOPTIONS\fR]
+.SH DESCRIPTION
+.P
+\fBxdgmenumaker\fR is a command line tool, written in python, that
+generates application menus using XDG information, by scanning
+*.desktop files in all \fI$XDG_DATA_DIRS/applications\fR directories. All
+applications are sorted according to the main categories as specified
+by
+freedesktop.org (http://standards.freedesktop.org/menu\-spec/latest/apa.html)
+.P
+The menu entries that are generated by \fBxdgmenumaker\fR are localised
+according to the running user locale settings.
+.P
+\fBxdgmenumaker\fR currently supports generating menus for:
+
+.RS
+.IP \(bu 3
+amiwm
+.IP \(bu 3
+blackbox
+.IP \(bu 3
+compizboxmenu
+.IP \(bu 3
+fluxbox
+.IP \(bu 3
+fvwm
+.IP \(bu 3
+icewm
+.IP \(bu 3
+jwm
+.IP \(bu 3
+pekwm
+.IP \(bu 3
+twm and compatible derivatives such as ctwm and vtwm
+.IP \(bu 3
+windowmaker
+.RE
+.IP
+
+.P
+\fBxdgmenumaker\fR requires \fIPython 2.7\fR or \fI3.x\fR, \fIpygtk\fR
+(for Python 2.7) or \fIpygobject\fR and \fIgobject\-instrospection\fR
+(for Python 3.x), as well as \fIpyxdg\fR. \fIPillow\fR is an optional
+dependency (used by the \fB\-\-max\-icon\-size\fR option).
+.SH OPTIONS
+
+.TP
+\fB\-f, \-\-format\fR
+specify the output format to use. Valid options are \fIamiwm\fR, \fIblackbox\fR,
+\fIcompizboxmenu\fR, \fIfluxbox\fR, \fIfvwm\fR, \fIicewm\fR, \fIjwm\fR, \fIpekwm\fR,
+\fItwm\fR and \fIwindowmaker\fR.
+Specifying the output format is mandatory.
+
+.TP
+\fB\-i, \-\-icons\fR
+enable support for icons in the menus. This option does not have any
+effect for \fIamiwm\fR, \fIblackbox\fR or \fIwindowmaker\fR menus.
+
+.TP
+\fB\-s, \-\-size\fR
+set the preferred icon size in pixels. The default size is 16. You can
+set this to any number, but it generally makes sense to use standard
+icons sizes, like 16, 22, 24, 32 etc. Obviously this has an effect only
+if the \fI\-\-icons\fR option is used. You have to be careful with the sizes
+you use; some window managers don't support large icons in the menu.
+
+.TP
+\fB\-n, \-\-no\-submenu\fR
+do not create a submenu. Instead, place the application categories menus
+in the window manager's main menu. This option does not have any effect
+for \fIwindowmaker\fR menus.
+
+.TP
+\fB\-\-max\-icon\-size\fR
+restrict the maximum size for icons to the one specified with the
+\fI\-\-size\fR option. Any icons that are larger than the specified size
+will get discarded and will not be used.
+
+.TP
+\fB\-\-no\-svg\fR
+do not use SVG icons even for the WMs that support it. Right now that
+is only JWM.
+
+.TP
+\fB\-\-pekwm\-dynamic\fR
+create dynamic menus for pekwm. If you want to have dynamically
+generated menus for pekwm you have to use this option. Do not use it if
+you want to generate static menus for pekwm. Only works with \fIpekwm\fR
+of course.
+
+.TP
+\fB\-\-twm\-titles\fR
+display menu titles in TWM menus. Naturally, only has an effect when
+used with \fItwm\fR.
+
+.SH GENERAL OPTIONS
+
+.TP
+\fB\-h\fR
+Prints a usage message briefly summarizing all command\-line options
+and exits.
+
+.SH CONFIGURATION
+.P
+The terminal emulator to be used for menu entries that state that an
+application must be launched inside a terminal, can be specified in a
+\fI~/.config/xdgmenumaker.cfg\fR configuration file. Here's an example
+specifying \fBrxvt\fR as the default terminal emulator:
+
+.nf
+[Terminal]
+terminal = rxvt
+.fi
+
+
+.P
+If no such file is present, or if no terminal is set within the file,
+xdgmenumaker will default to the one specified in the debian
+alternatives system on debian and debian\-like systems and to xterm in
+any other case.
+.P
+Setting the path to a terminal emulator in an \fIXDGMENUMAKERTERM\fR
+environment variable will override any other setting.
+.SH USAGE
+
+.TP
+\fBAmiWM\fR
+
+You can generate a menu for AmiWM, running xdgmenumaker like this:
+
+$ xdgmenumaker \-f amiwm > ~/.amiwm\-xdgmenu
+
+As AmiWM does not support including other files in its settings file,
+you'll have to copy the contents of the created file in your
+\fI~/.amiwmrc\fR. It should be possible to create a script that would
+generate the main \fI~/.amiwmrc\fR file from different "source" files, but
+I'll leave that as an exercise to the user.
+
+.TP
+\fBBlackbox\fR
+
+To generate an application menu for Blackbox, you can run
+\fBxdgmenumaker\fR like this:
+
+$ xdgmenumaker \-f blackbox > ~/.blackbox/xdg_menu
+
+and then change your main Blackbox menu to include this file as a
+submenu. For example, add this somewhere in your \fI~/.blackbox/menu\fR file:
+
+[include] (~/.blackbox/xdg_menu)
+
+You can add the \fBxdgmenumaker\fR command as another item in your menu,
+if you want to update it, without having to run the command manually
+again:
+
+[exec] (Update Blackbox Menu) {xdgmenumaker \-f blackbox > ~/.blackbox/xdg_menu}
+
+.TP
+\fBCompiz Boxmenu\fR
+
+There are two ways to have an xdg menu in compiz\-boxmenu. The first one,
+auto\-updates the menu, every time the menu is called. The second one,
+updates the menu only when the user wants to.
+
+\fBDynamic Menus\fR
+
+Edit your \fI~/.config/compiz/boxmenu/menu.xml\fR file with your favorite text
+editor and add a block of code like this inside the root \fI<menu>\fR element:
+
+.nf
+<item type="launcher">
+  <command mode2="pipe">xdgmenumaker -nif compizboxmenu</command>
+  <icon>applications-other</icon>
+  <name>Applications</name>
+</item>
+.fi
+
+
+
+Alternatively, you can also run \fBcompiz\-boxmenu\-editor\fR and click the
+dropdown for new menu files or menu items. Select launcher to create a
+new launcher. Set the name of the launcher to whatever you want. This will
+be the display name for the pipe menu. Then enter in:
+
+xdgmenumaker \-nif compizboxmenu
+
+for the command entry. Click the combobox
+next to the command text box and switch that to "Pipe".
+
+\fBStatic Menus\fR
+
+Edit your \fI~/.config/compiz/boxmenu/menu.xml\fR file with your favorite text
+editor and paste the output of:
+
+$ xdgmenumaker \-if compizboxmenu
+
+into \fI~/.config/compiz/boxmenu/menu.xml\fR.
+
+Alternatively, you can also run \fBcompiz\-boxmenu\-editor\fR and click the
+button that says \fIGenerate menu entries from a pipemenu script\fR. In the dialog
+box that pops up, type in:
+
+xdgmenumaker \-if compizboxmenu
+
+to append the statically generated menu to any menu file you want.
+
+.TP
+\fBFluxbox\fR
+
+To generate an application menu for Fluxbox, you can run
+\fBxdgmenumaker\fR like this:
+
+$ xdgmenumaker \-f fluxbox > ~/.fluxbox/xdg_menu
+
+and then change your main Fluxbox menu to include this file as a
+submenu. For example, add this somewhere in your \fI~/.fluxbox/menu\fR file:
+
+[include] (~/.fluxbox/xdg_menu)
+
+You can add the \fBxdgmenumaker\fR command as another item in your menu,
+if you want to update it, without having to run the command manually
+again:
+
+[exec] (Update Fluxbox Menu) {xdgmenumaker \-f fluxbox > ~/.fluxbox/xdg_menu}
+
+.TP
+\fBFvwm\fR
+
+To generate an application menu for Fvwm, you can run \fBxdgmenumaker\fR
+like this:
+
+$ xdgmenumaker \-f fvwm > ~/.fvwm/xdgmenu
+
+and then edit your main Fvwm configuration file and add a line to read
+that file:
+
+read xdgmenu
+
+and also include it somewhere in your main menu, for example:
+
+.nf
+AddToMenu MenuFvwmRoot  "Root Menu"             Title
++                       "Applications"          Popup xdgmenu
+.fi
+
+
+You could also put the menus for individual categories in your main menu
+if you want. Just look in the ~/.fvwm/xdgmenu file for the category
+names.
+
+You can add the \fBxdgmenumaker\fR command as another item in your menu,
+if you want to update it:
+
++ "Update Fvwm Menu" Exec xdgmenumaker \-f fvwm > ~/.fvwm/xdgmenu
+
+and restart Fvwm to apply the changes.
+
+\fINOTE:\fR If you're going to use the \fI\-\-icons\fR option to include icons
+in your menus, you might consider using the \fI\-\-max\-icon\-size\fR
+option too. Fvwm does not resize icons in its menu and having entries
+with icons that are too big makes for funny looking menus.
+
+.TP
+\fBIceWM\fR
+
+To generate an application menu for IceWM, run \fBxdgmenumaker\fR like this:
+
+$ xdgmenumaker \-f icewm > ~/.icewm/appmenu
+
+or if you want icons in your menu:
+
+$ xdgmenumaker \-i \-f icewm > ~/.icewm/appmenu
+
+and you can then edit your \fI~/.icewm/menu\fR file and add this line
+somewhere:
+
+include appmenu
+
+You can add the \fBxdgmenumaker\fR command as another item in your menu, if
+you want to update it, without having to run the command manually again:
+
+prog "Update Menu" _none_ xdgmenumaker \-i \-f icewm > ~/.icewm/appmenu
+
+\fINOTE:\fR If you don't request icons in the menu, or if an icon is not found
+for a certain app, the icon name in the menu for that app is set to
+"_none_". This doesn't actually set the icon for that app to none.
+IceWM menu entries should always include an icon . So, by pointing it
+to a non existing icon, you essentially set it to use no icon. If you
+actually have an icewm icon named "_none_", that one will be used instead.
+
+.TP
+\fBJWM\fR
+
+You can edit your \fI~/.jwmrc\fR file and add a line that generates the
+applications menu, like this:
+
+<Include>exec: xdgmenumaker \-n \-i \-f jwm</Include>
+
+You need to put that line somewhere in the \fIRootMenu\fR section of the
+\fI~/.jwmrc\fR file.
+
+You can update the menu with:
+
+$ jwm \-reload
+
+Or you can restart JWM and the updated menu should appear. The menu will be
+recreated every time JWM is started, restarted, or when the menu is
+reloaded with the above command. You can even add a menu item that will
+refresh the menu, like this:
+
+<Program label="Refresh Menu">jwm \-reload</Program>
+
+.TP
+\fBpekwm\fR
+
+There are two ways to have an XDG menu in pekwm. The first one,
+auto\-updates the menu, every time the menu is called. The second one,
+updates the menu only when the user wants to.
+
+\fBDynamic Menus\fR
+
+Edit your \fI~/.pekwm/menu\fR file with your favourite text editor and add
+a line like the following one in the location that you want the
+dynamically generated menu to appear:
+
+.nf
+Entry = "" { Actions = "Dynamic /usr/bin/xdgmenumaker -n -i -f pekwm --pekwm-dynamic" }
+.fi
+
+
+
+Restart pekwm and the generated menu should appear. The menu will be
+automatically generated every time you access it, so it will always be
+up to date. But since xdgmenumaker will run every time you access the
+menu, the menu might not appear instantly, especially if you are using
+an older PC.
+
+\fBStatic Menus\fR
+
+Run:
+
+$ xdgmenumaker \-n \-i \-f pekwm > ~/.pekwm/appsmenu
+
+to create a file with the menu contents. Then edit your
+\fI~/.pekwm/menu\fR file to include that menu, by adding a line like the
+following, in the location that you want the menu to appear:
+
+INCLUDE = "/home/your_user_name/.pekwm/appsmenu"
+
+Restart pekwm and the generated menu should appear. The menu is static
+and if you add/remove any applications, you will have to run the
+xdgmenumaker command and restart pekwm all over again to update it. The
+advantage is that there will be no delay in displaying the menu.
+
+.TP
+\fBTWM and Derivatives\fR
+
+You can create a menu for TWM running \fBxdgmenumaker\fR like this:
+
+$ xdgmenumaker \-f twm > ~/.twm\-xdgmenu
+
+If you're using the standard TWM, then unfortunately you'll have to
+manually copy/paste the contents of the generated \fI~/.twm\-xdgmenu\fR file
+into your \fI~/.twmrc\fR manually. You could then add something like this
+to your main menu definition:
+
+.nf
+"Applications" f.menu "xdgmenu"
+.fi
+
+
+
+It could be possible to create a script that updates the menus inside
+the main \fI~/.twmrc\fR settings file, but I'll leave that as an exercise
+for the user.
+
+If you're using CTWM or VTWM, instead of manually copy/pasting the menu
+contents into your settings file, you could just add an include line
+like this:
+
+.nf
+sinclude(`/home/george/.twm-xdgmenu')
+.fi
+
+
+
+\fINote:\fR In order for this to work with VTWM, \fBvtwm\fR has to be called
+with the \fI\-m\fR switch.
+
+.TP
+\fBWindowMaker\fR
+
+There are two ways to have an XDG menu in WindowMaker. The first one,
+auto\-updates the menu, every time the menu is called. The second one,
+updates the menu only when the user wants to.
+
+\fBxdgmenumaker\fR uses utf8 encoding and localised strings by default
+and has been tested only with wmaker\-crm>=0.95.1. No idea if utf8 works
+properly with older WindowMaker versions.
+
+\fBDynamic Menus\fR
+
+Open the WindowMaker preferences tool. In the \fIApplication Menu Definition\fR
+section, add a \fIGenerated Submenu\fR in your menu, by dragging it
+in. Click on the menu item you just dragged in and in the preferences
+window, in \fICommand\fR, add:
+
+xdgmenumaker \-f windowmaker
+
+Save and close the preferences window.
+
+That command will be run every time you access that submenu, so the
+application list in there will be always up to date. The downside is
+that with running this command every time, especially if
+you are on a very old PC, it might slow things down a bit. Even then it
+is probably not anything considerable.
+
+\fBStatic Menus\fR
+
+Run:
+
+$ xdgmenumaker \-f windowmaker > ~/GNUstep/Defaults/xdg_menu
+
+Then open the WindowMaker preferences tool and in the
+\fIApplication Menu Definition\fR section, add an
+\fIExternal Submenu\fR by dragging it in your menu.
+Click on the menu item you just dragged in and in the preferences
+window, in \fIPath for Menu\fR, add the location of the menu file you just
+created:
+
+~/GNUstep/Defaults/xdg_menu
+
+You can add the above mentioned \fBxdgmenumaker\fR command as another
+item in your menu, if you want to update it, without having to run the
+command manually again.
+In the \fIApplication Menu Definition\fR section in the WindowMaker
+preferences window, add a \fIRun Program\fR item in your menu by dragging it
+your menu. Click on the menu item you just dragged in and in the
+preferences window, in \fIProgram to Run\fR, add the \fBxdgmenumaker\fR command as
+mentioned above.
+
+The downside of this method, is that the menu contents will not be
+updated when you install a new application or remove one. You will need
+to run the xdgmenumaker command every time you want the menu to be
+updated. The upside is that the menu will not be generated every time
+you access the menu. This might be a better choice for (really) older
+hardware.
+
+.SH WEBSITE
+.P
+https://github.com/gapan/xdgmenumaker
+.SH AUTHORS
+.P
+\fBxdgmenumaker\fR was written by George Vlahavas <vlahavas~at~gmail~dot~com>
+
+.\" man code generated by txt2tags 2.6. (http://txt2tags.org)
+.\" cmdline: txt2tags /home/mobinmob/projects/void-packages/masterdir/builddir/xdgmenumaker-1.5/man/xdgmenumaker.t2t
diff --git a/srcpkgs/xdgmenumaker/template b/srcpkgs/xdgmenumaker/template
index 453c1584565..c9ee447c743 100644
--- a/srcpkgs/xdgmenumaker/template
+++ b/srcpkgs/xdgmenumaker/template
@@ -1,21 +1,22 @@
 # Template file for 'xdgmenumaker'
 pkgname=xdgmenumaker
 version=1.5
-revision=1
-hostmakedepends="make"
-depends="python3 python3-xdg pygtk python-gobject gobject-introspection"
+revision=2
+archs=noarch
+build_style=gnu-makefile
+depends="python3-xdg python3-gobject gobject-introspection python3-Pillow"
 short_desc="Automatic menu generator for WMs, such as, fluxbox, icewm, jwm, pekwm"
 maintainer="reback00 <reback00@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/gapan/xdgmenumaker"
 distfiles="https://github.com/gapan/${pkgname}/archive/${version}.tar.gz"
 checksum=a8319db5998ea1c49e52f6d04aad40334daea8047840c6762b4e7f02082b0573
+python_version=3
 patch_args="-Np1"
 
-do_build() {
-	make
-}
-
-do_install() {
-	make DESTDIR="${DESTDIR}" install
+pre_install() {
+	# Install pre-generated man page
+	vman ${FILESDIR}/${version}/xdgmenumaker.1
+	# Install README.md as documentation
+	vdoc README.md
 }
diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template
index 89ab96178c2..64507ab4715 100644
--- a/srcpkgs/xen/template
+++ b/srcpkgs/xen/template
@@ -1,7 +1,7 @@
 # Template file for 'xen'
 pkgname=xen
 version=4.10.4
-revision=1
+revision=2
 # grep -R IPXE_GIT_TAG src/xen-*/tools/firmware/etherboot
 _git_tag_ipxe=356f6c1b64d7a97746d1816cef8ca22bdd8d0b5d
 archs="x86_64*"
diff --git a/srcpkgs/xev/template b/srcpkgs/xev/template
index f7fbb8d56c0..e256b708c98 100644
--- a/srcpkgs/xev/template
+++ b/srcpkgs/xev/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libXrandr-devel"
 short_desc="Display X events"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2"
diff --git a/srcpkgs/xf86-input-libinput/template b/srcpkgs/xf86-input-libinput/template
index 08ee7c12486..c6a5d45b05a 100644
--- a/srcpkgs/xf86-input-libinput/template
+++ b/srcpkgs/xf86-input-libinput/template
@@ -7,7 +7,7 @@ hostmakedepends="pkg-config"
 makedepends="libinput-devel xorg-server-devel"
 depends="virtual?xserver-abi-input-24_1"
 short_desc="Generic input driver for the X.Org server based on libinput"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://xorg.freedesktop.org/"
 distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2"
diff --git a/srcpkgs/xf86-video-amdgpu/template b/srcpkgs/xf86-video-amdgpu/template
index 7ab3e1f5d92..8488f26a931 100644
--- a/srcpkgs/xf86-video-amdgpu/template
+++ b/srcpkgs/xf86-video-amdgpu/template
@@ -1,6 +1,6 @@
 # Template file for 'xf86-video-amdgpu'
 pkgname=xf86-video-amdgpu
-version=19.0.1
+version=19.1.0
 revision=1
 archs="i686* x86_64* ppc64* ppc ppc-musl"
 build_style=gnu-configure
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://wiki.freedesktop.org/xorg"
 distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2"
-checksum=aaa197196aadcb12e93e10a2aa03c9aedc9ba7b27c2643a8ef620d41e2d1c6d5
+checksum=4f0ea4e0ae61995ac2b7c72433d31deab63b60c78763020aaa1b28696124fe5d
 
 lib32disabled=yes
 LDFLAGS="-Wl,-z,lazy"
diff --git a/srcpkgs/xfce4-battery-plugin/template b/srcpkgs/xfce4-battery-plugin/template
index 8a524e6bbbf..053abe5a7a1 100644
--- a/srcpkgs/xfce4-battery-plugin/template
+++ b/srcpkgs/xfce4-battery-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-battery-plugin'
 pkgname=xfce4-battery-plugin
 version=1.1.3
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
diff --git a/srcpkgs/xfce4-clipman-plugin/template b/srcpkgs/xfce4-clipman-plugin/template
index 987a68f7d5f..ef082d98644 100644
--- a/srcpkgs/xfce4-clipman-plugin/template
+++ b/srcpkgs/xfce4-clipman-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-clipman-plugin'
 pkgname=xfce4-clipman-plugin
 version=1.4.3
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config"
 makedepends="xfce4-panel-devel libXtst-devel qrencode-devel"
diff --git a/srcpkgs/xfce4-cpufreq-plugin/template b/srcpkgs/xfce4-cpufreq-plugin/template
index 0b7321081f6..62192b09bf8 100644
--- a/srcpkgs/xfce4-cpufreq-plugin/template
+++ b/srcpkgs/xfce4-cpufreq-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-cpufreq-plugin'
 pkgname=xfce4-cpufreq-plugin
 version=1.2.1
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config"
 makedepends="xfce4-panel-devel"
diff --git a/srcpkgs/xfce4-cpugraph-plugin/template b/srcpkgs/xfce4-cpugraph-plugin/template
index d1ff3abd659..3ece809d5ab 100644
--- a/srcpkgs/xfce4-cpugraph-plugin/template
+++ b/srcpkgs/xfce4-cpugraph-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-cpugraph-plugin'
 pkgname=xfce4-cpugraph-plugin
 version=1.1.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
diff --git a/srcpkgs/xfce4-dict/template b/srcpkgs/xfce4-dict/template
index 0ae2951c552..8af24128912 100644
--- a/srcpkgs/xfce4-dict/template
+++ b/srcpkgs/xfce4-dict/template
@@ -1,13 +1,13 @@
 # Template file for 'xfce4-dict'
 pkgname=xfce4-dict
-version=0.8.2
-revision=1
+version=0.8.3
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
-short_desc="A dictionary plugin for the Xfce panel"
+short_desc="Dictionary plugin for the Xfce panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/applications/xfce4-dict"
 distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=324d56128bfc2f06ad8df59a832565981ec9b360710319300185517d98b7db0a
+checksum=7cf4ce77f9e95ca04894b8eaa385ca52c080e28ec1e1846355b1b67a800dc279
diff --git a/srcpkgs/xfce4-diskperf-plugin/template b/srcpkgs/xfce4-diskperf-plugin/template
index 225c41c10bf..623556cc608 100644
--- a/srcpkgs/xfce4-diskperf-plugin/template
+++ b/srcpkgs/xfce4-diskperf-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-diskperf-plugin'
 pkgname=xfce4-diskperf-plugin
 version=2.6.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
diff --git a/srcpkgs/xfce4-fsguard-plugin/template b/srcpkgs/xfce4-fsguard-plugin/template
index 71a23868c08..60feab6e6ec 100644
--- a/srcpkgs/xfce4-fsguard-plugin/template
+++ b/srcpkgs/xfce4-fsguard-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-fsguard-plugin'
 pkgname=xfce4-fsguard-plugin
 version=1.1.1
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
diff --git a/srcpkgs/xfce4-genmon-plugin/template b/srcpkgs/xfce4-genmon-plugin/template
index 555f626fa8c..00e8f521f9e 100644
--- a/srcpkgs/xfce4-genmon-plugin/template
+++ b/srcpkgs/xfce4-genmon-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-genmon-plugin'
 pkgname=xfce4-genmon-plugin
 version=4.0.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config"
 makedepends="xfce4-panel-devel"
diff --git a/srcpkgs/xfce4-hardware-monitor-plugin/template b/srcpkgs/xfce4-hardware-monitor-plugin/template
index 0a5e5521b92..b69c1cbf3fd 100644
--- a/srcpkgs/xfce4-hardware-monitor-plugin/template
+++ b/srcpkgs/xfce4-hardware-monitor-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-hardware-monitor-plugin'
 pkgname=xfce4-hardware-monitor-plugin
 version=1.6.0
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="autoconf automake libtool intltool pkg-config glib-devel gettext-devel"
 makedepends="xfce4-panel-devel libgtop-devel libgnomecanvasmm-devel gtkmm2-devel libsensors-devel"
diff --git a/srcpkgs/xfce4-kbdleds-plugin/template b/srcpkgs/xfce4-kbdleds-plugin/template
index bdf9a7e6261..cdec548a2bc 100644
--- a/srcpkgs/xfce4-kbdleds-plugin/template
+++ b/srcpkgs/xfce4-kbdleds-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-kbdleds-plugin'
 pkgname=xfce4-kbdleds-plugin
 version=0.0.6
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config"
 makedepends="libX11-devel gtk+-devel libxfce4ui-devel xfce4-panel-devel"
diff --git a/srcpkgs/xfce4-mailwatch-plugin/template b/srcpkgs/xfce4-mailwatch-plugin/template
index 44c4ee1f707..ac2511c8c49 100644
--- a/srcpkgs/xfce4-mailwatch-plugin/template
+++ b/srcpkgs/xfce4-mailwatch-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-mailwatch-plugin'
 pkgname=xfce4-mailwatch-plugin
 version=1.2.0
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="libglib-devel exo-devel libxfce4ui-devel libxfce4util-devel
diff --git a/srcpkgs/xfce4-mpc-plugin/template b/srcpkgs/xfce4-mpc-plugin/template
index 50c2f0f9a3e..05b9e282c5e 100644
--- a/srcpkgs/xfce4-mpc-plugin/template
+++ b/srcpkgs/xfce4-mpc-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-mpc-plugin'
 pkgname=xfce4-mpc-plugin
 version=0.5.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
diff --git a/srcpkgs/xfce4-netload-plugin/template b/srcpkgs/xfce4-netload-plugin/template
index d08ee101f2b..6cb3967727b 100644
--- a/srcpkgs/xfce4-netload-plugin/template
+++ b/srcpkgs/xfce4-netload-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-netload-plugin'
 pkgname=xfce4-netload-plugin
 version=1.3.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
diff --git a/srcpkgs/xfce4-notes-plugin/template b/srcpkgs/xfce4-notes-plugin/template
index 1509c90fc24..ed3e310a952 100644
--- a/srcpkgs/xfce4-notes-plugin/template
+++ b/srcpkgs/xfce4-notes-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-notes-plugin'
 pkgname=xfce4-notes-plugin
 version=1.8.1
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel libunique1-devel"
diff --git a/srcpkgs/xfce4-notifyd/template b/srcpkgs/xfce4-notifyd/template
index 66a0331ec6c..7120eaa6d71 100644
--- a/srcpkgs/xfce4-notifyd/template
+++ b/srcpkgs/xfce4-notifyd/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-notifyd'
 pkgname=xfce4-notifyd
 version=0.4.4
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool glib-devel dbus-glib-devel"
 makedepends="libnotify-devel xfce4-panel-devel"
diff --git a/srcpkgs/xfce4-panel/template b/srcpkgs/xfce4-panel/template
index d14422a9736..719d78fda2a 100644
--- a/srcpkgs/xfce4-panel/template
+++ b/srcpkgs/xfce4-panel/template
@@ -1,25 +1,25 @@
 # Template file for 'xfce4-panel'
 pkgname=xfce4-panel
-version=4.14.0
-revision=3
+version=4.14.1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-static --enable-gio-unix --enable-gtk3"
 hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel glib-devel"
 makedepends="libwnck-devel libxfce4ui-devel xfconf-devel garcon-devel exo-devel"
 short_desc="Next generation panel for the XFCE desktop environment"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+maintainer="Peter Bui <pbui@github.bx612.space>"
+license="GPL-2.0-or-later"
 homepage="https://xfce.org/"
 distfiles="https://archive.xfce.org/src/xfce/$pkgname/${version%.*}/$pkgname-$version.tar.bz2"
-checksum=d5f8f3bd7e142139987e5e62cda26135a424baabb5e47aa0c23b4169d0a66ef4
+checksum=9c3c78b49ddfac7d42a804e6a6ad9d22ad64ec60bbe17d8724bc52d3e3f6d114
 
 # Package build options
 build_options="gir"
 build_options_default="gir"
 
 xfce4-panel-devel_package() {
-	depends="libxfce4ui-devel ${sourcepkg}>=${version}_${revision}"
+	depends="libxfce4ui-devel libxfce4panel>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
@@ -31,3 +31,10 @@ xfce4-panel-devel_package() {
 		fi
 	}
 }
+
+libxfce4panel_package() {
+	short_desc+=" - runtime library"
+	pkg_install() {
+		vmove "usr/lib/*.so.*"
+	}
+}
diff --git a/srcpkgs/xfce4-places-plugin/template b/srcpkgs/xfce4-places-plugin/template
index 599a7bbc0ff..41ca9afa44f 100644
--- a/srcpkgs/xfce4-places-plugin/template
+++ b/srcpkgs/xfce4-places-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-places-plugin'
 pkgname=xfce4-places-plugin
 version=1.8.1
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config"
 makedepends="exo-devel xfce4-panel-devel"
diff --git a/srcpkgs/xfce4-power-manager/template b/srcpkgs/xfce4-power-manager/template
index c10d65e0901..6ba86715b24 100644
--- a/srcpkgs/xfce4-power-manager/template
+++ b/srcpkgs/xfce4-power-manager/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-power-manager'
 pkgname=xfce4-power-manager
 version=1.6.5
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool"
diff --git a/srcpkgs/xfce4-pulseaudio-plugin/template b/srcpkgs/xfce4-pulseaudio-plugin/template
index 307b54639ce..3238c63a40a 100644
--- a/srcpkgs/xfce4-pulseaudio-plugin/template
+++ b/srcpkgs/xfce4-pulseaudio-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-pulseaudio-plugin'
 pkgname=xfce4-pulseaudio-plugin
 version=0.4.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="gettext-devel xfce4-dev-tools"
 makedepends="libkeybinder3-devel libnotify-devel pulseaudio-devel xfce4-panel-devel"
diff --git a/srcpkgs/xfce4-screensaver/template b/srcpkgs/xfce4-screensaver/template
index 8d0ae5fbb97..08a7a2bb0d9 100644
--- a/srcpkgs/xfce4-screensaver/template
+++ b/srcpkgs/xfce4-screensaver/template
@@ -10,7 +10,7 @@ makedepends="gtk+3-devel libglib-devel libxklavier-devel libwnck-devel
  xfconf-devel garcon-devel libXScrnSaver-devel libXrandr-devel
  pam-devel elogind-devel"
 short_desc="Screensaver for XFCE4"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://git.xfce.org/apps/xfce4-screensaver"
 distfiles="https://archive.xfce.org/src/apps/xfce4-screensaver/${version%.*}/xfce4-screensaver-${version}.tar.bz2"
diff --git a/srcpkgs/xfce4-screenshooter/template b/srcpkgs/xfce4-screenshooter/template
index c57ab96d559..72f4fa65d72 100644
--- a/srcpkgs/xfce4-screenshooter/template
+++ b/srcpkgs/xfce4-screenshooter/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-screenshooter'
 pkgname=xfce4-screenshooter
-version=1.9.5
-revision=1
+version=1.9.6
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="libxfce4ui-devel xfce4-panel-devel exo-devel libsoup-devel"
@@ -11,4 +11,4 @@ maintainer="Frank Steinborn <steinex@nognu.de>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/applications/xfce4-screenshooter"
 distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=bf35b5432cb920987c6d7ff193600e5dd4d73422b6aa02b4ec5288744053b38c
+checksum=88c174ce687d1f7ba5470d6ab5784d33dc215f8f220211e892e268189dbea658
diff --git a/srcpkgs/xfce4-sensors-plugin/template b/srcpkgs/xfce4-sensors-plugin/template
index fab70ac843a..e64ec44d95a 100644
--- a/srcpkgs/xfce4-sensors-plugin/template
+++ b/srcpkgs/xfce4-sensors-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-sensors-plugin'
 pkgname=xfce4-sensors-plugin
 version=1.3.92
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool"
diff --git a/srcpkgs/xfce4-settings/template b/srcpkgs/xfce4-settings/template
index 52df7238b84..a7e471d686d 100644
--- a/srcpkgs/xfce4-settings/template
+++ b/srcpkgs/xfce4-settings/template
@@ -1,6 +1,6 @@
 # Template file for 'xfce4-settings'
 pkgname=xfce4-settings
-version=4.14.0
+version=4.14.1
 revision=1
 build_style=gnu-configure
 configure_args="--enable-sound-settings --enable-pluggable-dialogs"
@@ -13,6 +13,6 @@ short_desc="Xfce settings manager"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://xfce.org/"
-changelog="https://raw.githubusercontent.com/xfce-mirror/xfce4-settings/master/NEWS"
+changelog="https://raw.githubusercontent.com/xfce-mirror/xfce4-settings/xfce-4.14/NEWS"
 distfiles="https://archive.xfce.org/src/xfce/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=e03040d623abda0222ad04f226582277a1936507ddfa927ec8e87927debc113c
+checksum=e873e9f6b8e801fd9304ee100c4c76ed9987446c38429d02477c086431c0bf7a
diff --git a/srcpkgs/xfce4-systemload-plugin/template b/srcpkgs/xfce4-systemload-plugin/template
index 4eaa0d9ed16..c19a75e226f 100644
--- a/srcpkgs/xfce4-systemload-plugin/template
+++ b/srcpkgs/xfce4-systemload-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-systemload-plugin'
 pkgname=xfce4-systemload-plugin
 version=1.2.3
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
diff --git a/srcpkgs/xfce4-taskmanager/template b/srcpkgs/xfce4-taskmanager/template
index 0b94ada0e64..8b6aa65dc86 100644
--- a/srcpkgs/xfce4-taskmanager/template
+++ b/srcpkgs/xfce4-taskmanager/template
@@ -5,8 +5,7 @@ revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool"
-makedepends="libxfce4ui-devel xfce4-panel-devel libwnck2-devel libXmu-devel
- gtk+3-devel"
+makedepends="libxfce4ui-devel libwnck2-devel libXmu-devel gtk+3-devel"
 depends="hicolor-icon-theme desktop-file-utils"
 short_desc="XFCE task manager plugin"
 maintainer="Orphaned <orphan@voidlinux.org>"
diff --git a/srcpkgs/xfce4-time-out-plugin/template b/srcpkgs/xfce4-time-out-plugin/template
index 3d0fea97d23..5561643e2a1 100644
--- a/srcpkgs/xfce4-time-out-plugin/template
+++ b/srcpkgs/xfce4-time-out-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-time-out-plugin'
 pkgname=xfce4-time-out-plugin
 version=1.0.3
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
diff --git a/srcpkgs/xfce4-timer-plugin/template b/srcpkgs/xfce4-timer-plugin/template
index 1b8d7ce7ffb..0d827c5e04a 100644
--- a/srcpkgs/xfce4-timer-plugin/template
+++ b/srcpkgs/xfce4-timer-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-timer-plugin'
 pkgname=xfce4-timer-plugin
 version=1.7.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
diff --git a/srcpkgs/xfce4-verve-plugin/template b/srcpkgs/xfce4-verve-plugin/template
index f8550835345..0ee22148eb0 100644
--- a/srcpkgs/xfce4-verve-plugin/template
+++ b/srcpkgs/xfce4-verve-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-verve-plugin'
 pkgname=xfce4-verve-plugin
 version=2.0.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config"
 makedepends="xfce4-panel-devel"
diff --git a/srcpkgs/xfce4-wavelan-plugin/template b/srcpkgs/xfce4-wavelan-plugin/template
index 7c48dc3934f..ba1609d2693 100644
--- a/srcpkgs/xfce4-wavelan-plugin/template
+++ b/srcpkgs/xfce4-wavelan-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-wavelan-plugin'
 pkgname=xfce4-wavelan-plugin
 version=0.6.1
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
diff --git a/srcpkgs/xfce4-weather-plugin/template b/srcpkgs/xfce4-weather-plugin/template
index c87292db6ee..97dfd26af99 100644
--- a/srcpkgs/xfce4-weather-plugin/template
+++ b/srcpkgs/xfce4-weather-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-weather-plugin'
 pkgname=xfce4-weather-plugin
 version=0.10.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="libxfce4ui-devel xfce4-panel-devel libxml2-devel libsoup-devel upower-devel"
diff --git a/srcpkgs/xfce4-whiskermenu-plugin/template b/srcpkgs/xfce4-whiskermenu-plugin/template
index a9650a0f7b5..64cdfbe4daa 100644
--- a/srcpkgs/xfce4-whiskermenu-plugin/template
+++ b/srcpkgs/xfce4-whiskermenu-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-whiskermenu-plugin'
 pkgname=xfce4-whiskermenu-plugin
 version=2.3.3
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="exo-devel garcon-devel xfce4-panel-devel"
diff --git a/srcpkgs/xfce4-windowck-plugin/template b/srcpkgs/xfce4-windowck-plugin/template
index e5cc89e85e5..b5e035bcb05 100644
--- a/srcpkgs/xfce4-windowck-plugin/template
+++ b/srcpkgs/xfce4-windowck-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-windowck-plugin'
 pkgname=xfce4-windowck-plugin
 version=0.4.6
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="intltool xfce4-dev-tools exo-devel python3-devel glib-devel gettext-devel ImageMagick"
 makedepends="libwnck2-devel xfce4-panel-devel xorg-server-devel"
diff --git a/srcpkgs/xfce4-xkb-plugin/template b/srcpkgs/xfce4-xkb-plugin/template
index b669b9a1283..eee39e63402 100644
--- a/srcpkgs/xfce4-xkb-plugin/template
+++ b/srcpkgs/xfce4-xkb-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-xkb-plugin'
 pkgname=xfce4-xkb-plugin
 version=0.8.1
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="garcon-devel xfce4-panel-devel libxklavier-devel librsvg-devel libwnck-devel"
diff --git a/srcpkgs/xfsdump/template b/srcpkgs/xfsdump/template
index adcf5263132..ac8afcccb88 100644
--- a/srcpkgs/xfsdump/template
+++ b/srcpkgs/xfsdump/template
@@ -1,18 +1,19 @@
 # Template file for 'xfsdump'
 pkgname=xfsdump
 version=3.1.8
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin"
 makedepends="libuuid-devel ncurses-devel xfsprogs-devel attr-devel"
 short_desc="XFS filesystem incremental dump/restore utility"
-maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
-license="LGPL-2.1"
-homepage="http://oss.sgi.com/projects/xfs/"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="GPL-2.0-or-later"
+homepage="https://git.kernel.org/pub/scm/fs/xfs/xfsdump-dev.git/"
 distfiles="${KERNEL_SITE}/utils/fs/xfs/xfsdump/xfsdump-${version}.tar.xz"
 checksum=ed14e67ae5b273c2698e767b43a46f033d361e540fe13feaaf9b110ee0edc585
 
 post_extract() {
+	sed -i 's/xfs_fsop_geom_v1_t/struct xfs_fsop_geom_v1/g' common/fs.c
 	case "$XBPS_TARGET_MACHINE" in
 	*-musl)
 		sed -i -e 's/SIGCLD/SIGCHLD/g' \
diff --git a/srcpkgs/xfsprogs/template b/srcpkgs/xfsprogs/template
index dcf86402078..8fff3e8d7a4 100644
--- a/srcpkgs/xfsprogs/template
+++ b/srcpkgs/xfsprogs/template
@@ -1,6 +1,6 @@
 # Template file for 'xfsprogs'
 pkgname=xfsprogs
-version=5.2.0
+version=5.2.1
 revision=1
 build_style=gnu-configure
 configure_args="--enable-readline=yes --enable-lib64=no"
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="http://xfs.org/index.php/Main_Page"
 distfiles="${KERNEL_SITE}/utils/fs/xfs/xfsprogs/xfsprogs-${version}.tar.xz"
-checksum=e41cdaa43d92b38c8a12ce9cb612ab911ba0e019c2e0762c494a8a601f533fd6
+checksum=7b500e148cebd08f99e37cf744c7843817b37e7be2a32c4dc57d6ea16e3019ae
 
 do_install() {
 	make install install-dev DIST_ROOT=${DESTDIR} \
diff --git a/srcpkgs/xhost/template b/srcpkgs/xhost/template
index 4c560a6c47b..681ceed6b56 100644
--- a/srcpkgs/xhost/template
+++ b/srcpkgs/xhost/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libXmu-devel"
 short_desc="Server access control program for X"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2"
diff --git a/srcpkgs/xi-editor/template b/srcpkgs/xi-editor/template
index 56dc3b70293..d1f8173097b 100644
--- a/srcpkgs/xi-editor/template
+++ b/srcpkgs/xi-editor/template
@@ -5,7 +5,7 @@ revision=1
 build_wrksrc=rust
 build_style=cargo
 short_desc="Modern editor with a Rust backend"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/xi-editor/xi-editor"
 distfiles="https://github.com/xi-editor/xi-editor/archive/v${version}.tar.gz"
diff --git a/srcpkgs/xkb-switch/template b/srcpkgs/xkb-switch/template
index 2ed2ae13731..3e85baf4b8d 100644
--- a/srcpkgs/xkb-switch/template
+++ b/srcpkgs/xkb-switch/template
@@ -1,16 +1,16 @@
 # Template file for 'xkb-switch'
 pkgname=xkb-switch
-version=1.5.0
+version=1.6.0
 revision=1
 build_style=cmake
 hostmakedepends="cmake"
 makedepends="libX11-devel libxkbfile-devel"
 short_desc="Query and change the XKB layout state"
 maintainer="Andrey Raugas <kainonergon@gmail.com>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="https://github.com/ierton/xkb-switch"
 distfiles="https://github.com/ierton/${pkgname}/archive/${version}.tar.gz"
-checksum=3e100ac15670eda2109fb0d3159ad08e85e3b33de4cb1b3369dce5da7d83e954
+checksum=17ddd00a09945f634654ddf98d55023b0727755f828706747fd5227e2651633d
 
 post_install() {
 	vman man/xkb-switch.1
diff --git a/srcpkgs/xkcdpass/template b/srcpkgs/xkcdpass/template
index ba2bad454b4..46b4a9635f9 100644
--- a/srcpkgs/xkcdpass/template
+++ b/srcpkgs/xkcdpass/template
@@ -10,7 +10,7 @@ hostmakedepends="python3-setuptools"
 depends="python3-setuptools"
 checkdepends="python3-pytest"
 short_desc="Generate secure multiword passwords/passphrases, inspired by XKCD"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Lugubris <lugubris@disroot.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/redacted/XKCD-password-generator"
 distfiles="https://github.com/redacted/XKCD-password-generator/archive/xkcdpass-${version}.tar.gz"
diff --git a/srcpkgs/xl2tpd/template b/srcpkgs/xl2tpd/template
index 45ad8668192..7214468587a 100644
--- a/srcpkgs/xl2tpd/template
+++ b/srcpkgs/xl2tpd/template
@@ -1,6 +1,6 @@
 # Template file for 'xl2tpd'
 pkgname=xl2tpd
-version=1.3.14
+version=1.3.15
 revision=1
 build_style=gnu-makefile
 make_use_env=yes
@@ -11,9 +11,9 @@ short_desc="Open source implementation of the Layer 2 Tunnelling Protocol"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.xelerance.com/services/software/xl2tpd/"
-#changelog="https://github.com/xelerance/xl2tpd/blob/master/CHANGES"
+changelog="https://github.com/xelerance/xl2tpd/blob/master/CHANGES"
 distfiles="https://github.com/xelerance/xl2tpd/archive/v${version}.tar.gz"
-checksum=ff5a0806fecc58c7b9cbc625117a4521c0546522a5f5951ffb6eebdab998610f
+checksum=0d149bf9d2f7d838806e6a36fd7a676d03bf246d2b7869e16c945330e13b922e
 
 conf_files="
  /etc/xl2tpd/xl2tpd.conf
diff --git a/srcpkgs/xlockmore/template b/srcpkgs/xlockmore/template
index a0bcb39a5c2..3e8d34711fa 100644
--- a/srcpkgs/xlockmore/template
+++ b/srcpkgs/xlockmore/template
@@ -1,17 +1,17 @@
 # Template file for 'xlockmore'
 pkgname=xlockmore
-version=5.57
+version=5.59
 revision=1
 build_style=gnu-configure
 configure_args="--with-xinerama"
 hostmakedepends="pkg-config"
 makedepends="freetype-devel libXt-devel libXext-devel libXinerama-devel"
 short_desc="Provides the 'xlock' X screen locker"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD"
+maintainer="Andrew Benson <abenson+void@gmail.com>"
+license="MIT"
 homepage="http://sillycycle.com/xlockmore.html"
 distfiles="http://sillycycle.com/xlock/xlockmore-${version}.tar.xz"
-checksum=f9acf99befd798ac93909b2d7d6578a256d2dac283ddc562acc9b6ef10cc28a3
+checksum=2d2a6855ecdeee4856ace76acf615d3b2e48303951bb5fd31a234e4a54615251
 CFLAGS="-D_DEFAULT_SOURCE"
 
 pre_configure() {
diff --git a/srcpkgs/xlsatoms/template b/srcpkgs/xlsatoms/template
index 3d7594a0e4a..42570e6b125 100644
--- a/srcpkgs/xlsatoms/template
+++ b/srcpkgs/xlsatoms/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libxcb-devel"
 short_desc="List interned atoms defined on the X server"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2"
diff --git a/srcpkgs/xmltoman/template b/srcpkgs/xmltoman/template
index f948b2c8551..2f74978bea7 100644
--- a/srcpkgs/xmltoman/template
+++ b/srcpkgs/xmltoman/template
@@ -6,7 +6,7 @@ build_style=gnu-makefile
 hostmakedepends="perl perl-XML-Parser"
 depends="perl-XML-Parser"
 short_desc="Convert XML to man pages in groff format or html"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3"
 homepage="https://sourceforge.net/projects/xmltoman"
 distfiles="https://github.com/Distrotech/xmltoman/archive/${version}.tar.gz"
diff --git a/srcpkgs/xmodmap/template b/srcpkgs/xmodmap/template
index baf58f240ef..2f8678807d6 100644
--- a/srcpkgs/xmodmap/template
+++ b/srcpkgs/xmodmap/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libX11-devel"
 short_desc="X modmap program to modify keymaps and pointer button mappings"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2"
diff --git a/srcpkgs/xob/template b/srcpkgs/xob/template
index 4618280ffa5..04bedef94c0 100644
--- a/srcpkgs/xob/template
+++ b/srcpkgs/xob/template
@@ -8,7 +8,7 @@ make_use_env=yes
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libconfig-devel"
 short_desc="Lightweight overlay bar for the X Window System"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/florentc/xob"
 distfiles="https://github.com/florentc/xob/archive/v${version}.tar.gz"
diff --git a/srcpkgs/xonsh/template b/srcpkgs/xonsh/template
index bb8563500eb..768ebf36022 100644
--- a/srcpkgs/xonsh/template
+++ b/srcpkgs/xonsh/template
@@ -1,6 +1,6 @@
 # Template file for 'xonsh'
 pkgname=xonsh
-version=0.9.8
+version=0.9.12
 revision=1
 archs=noarch
 build_style=python3-module
@@ -12,5 +12,5 @@ license="GPL-3.0-or-later"
 homepage="https://xon.sh/"
 changelog="https://raw.githubusercontent.com/xonsh/xonsh/${version}/CHANGELOG.rst"
 distfiles="https://github.com/xonsh/xonsh/archive/${version}.tar.gz"
-checksum=f9185bac74241c7503f4d0805348e64453576daa282aa4238f526c0bfbae55d8
+checksum=e7cf4e98ebfb9a35b197e681e426f58e8c0c4ce5aee5e1ec9d1d25a37eb92eda
 register_shell="/bin/xonsh"
diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 178cd37b34f..06ddfb3eac1 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,7 +1,7 @@
 # Template file for 'xorg-server'
 pkgname=xorg-server
 version=1.20.5
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
  -Dxvfb=true -Dhal=false -Dudev=true -Dxkb_dir=/usr/share/X11/xkb
diff --git a/srcpkgs/xorgproto/template b/srcpkgs/xorgproto/template
index 20afccaf68d..460d74fc855 100644
--- a/srcpkgs/xorgproto/template
+++ b/srcpkgs/xorgproto/template
@@ -1,12 +1,12 @@
 # Template file for 'xorgproto'
 pkgname=xorgproto
 version=2019.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-legacy"
 hostmakedepends="xorg-util-macros"
 short_desc="Combined X.Org X11 Protocol headers"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/proto/xorgproto-${version}.tar.gz"
@@ -52,4 +52,7 @@ post_install() {
 	rm -f ${DESTDIR}/usr/include/X11/extensions/{apple,windows}*
 	rm -f ${DESTDIR}/usr/share/licenses/${pkgname}/COPYING-{apple,windows}wmproto
 	rm -f ${DESTDIR}/usr/share/pkgconfig/{apple,windows}wmproto.pc
+
+	# provided by libX11-devel
+	rm -f ${DESTDIR}/usr/include/X11/extensions/XKBgeom.h
 }
diff --git a/srcpkgs/xpdf/template b/srcpkgs/xpdf/template
index a5c3fba24b0..fa3a213db45 100644
--- a/srcpkgs/xpdf/template
+++ b/srcpkgs/xpdf/template
@@ -1,6 +1,6 @@
 # Template file for 'xpdf'
 pkgname=xpdf
-version=4.01.01
+version=4.02
 revision=1
 build_style=cmake
 configure_args="-DSYSTEM_XPDFRC=/etc/xpdfrc"
@@ -11,9 +11,9 @@ depends="gsfonts"
 short_desc="Viewer for Portable Document Format (PDF) files"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
-homepage="http://www.foolabs.com/xpdf/"
+homepage="http://www.xpdfreader.com/"
 distfiles="https://xpdfreader-dl.s3.amazonaws.com/xpdf-$version.tar.gz"
-checksum=ba550c7d3e4f73b1833cfcdcd9dbe39849dd0cd459b6774c4ecdfeca993204a4
+checksum=52d51dc943b9614b8da66e8662b3031a3c82dc25bfc792eac6b438aa36d549a4
 patch_args="-Np1"
 
 post_extract() {
diff --git a/srcpkgs/xpdf/update b/srcpkgs/xpdf/update
new file mode 100644
index 00000000000..e03f3354958
--- /dev/null
+++ b/srcpkgs/xpdf/update
@@ -0,0 +1 @@
+site='http://www.xpdfreader.com/download.html'
diff --git a/srcpkgs/xpra/template b/srcpkgs/xpra/template
index b9efd4f1583..4180b3a1f22 100644
--- a/srcpkgs/xpra/template
+++ b/srcpkgs/xpra/template
@@ -10,7 +10,7 @@ makedepends="ffmpeg-devel libXcomposite-devel libXrandr-devel libXtst-devel
 depends="cups pygtk python-Pillow python-cups python-dbus python-lz4
  python-paramiko python-rencode xauth xf86-video-dummy xorg-server-xvfb"
 short_desc="Like screen(1) for X"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://xpra.org/"
 changelog="https://xpra.org/svn/Xpra/trunk/debian/changelog"
diff --git a/srcpkgs/xprintidle/template b/srcpkgs/xprintidle/template
index 597e28350b0..a6d77d4077e 100644
--- a/srcpkgs/xprintidle/template
+++ b/srcpkgs/xprintidle/template
@@ -5,7 +5,7 @@ revision=2
 build_style=gnu-configure
 makedepends="libXScrnSaver-devel"
 short_desc="Query X server for user's idle time and print it in milliseconds"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2"
 homepage="https://github.com/g0hl1n/xprintidle"
 distfiles="https://github.com/g0hl1n/xprintidle/archive/${version}.tar.gz"
diff --git a/srcpkgs/xrdb/template b/srcpkgs/xrdb/template
index e30fadc2009..6d849ba0571 100644
--- a/srcpkgs/xrdb/template
+++ b/srcpkgs/xrdb/template
@@ -8,7 +8,7 @@ hostmakedepends="pkg-config"
 makedepends="libX11-devel libXmu-devel"
 depends="mcpp"
 short_desc="X server resource database utility"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2"
diff --git a/srcpkgs/xsecurelock/template b/srcpkgs/xsecurelock/template
index 0e8d0a56a29..d0c4503d11d 100644
--- a/srcpkgs/xsecurelock/template
+++ b/srcpkgs/xsecurelock/template
@@ -1,6 +1,6 @@
 # Template file for 'xsecurelock'
 pkgname=xsecurelock
-version=1.4.0
+version=1.5.1
 revision=1
 build_style=gnu-configure
 configure_args="--with-pam-service-name=system-local-login"
@@ -13,7 +13,7 @@ maintainer="Sean R. Lang <srlang@ncsu.edu>"
 license="Apache-2.0"
 homepage="https://github.com/google/xsecurelock"
 distfiles="https://github.com/google/xsecurelock/archive/v${version}.tar.gz"
-checksum=68a09a03ddb2180ad84a1c52da849912d584ec2bdb4f22ccdd40802907ab504f
+checksum=069a71994d39fee48c7c010194506466318c2b8b8bd8977d6ebbcd278d15e0b2
 
 pre_configure() {
 	sh autogen.sh
diff --git a/srcpkgs/xst/template b/srcpkgs/xst/template
index 56801dc4f75..fb998050583 100644
--- a/srcpkgs/xst/template
+++ b/srcpkgs/xst/template
@@ -1,7 +1,7 @@
 # Template file for 'xst'
 pkgname=xst
 version=0.7.2
-revision=2
+revision=3
 build_style=gnu-makefile
 make_use_env=compliant
 hostmakedepends="pkg-config"
@@ -21,6 +21,7 @@ do_install() {
 	vinstall doc/xst.info 644 usr/share/terminfo/x xst.terminfo
 	vdoc README.md README
 	vdoc doc/FAQ
+	vsed -i 's/st-256color/xst-256color/' doc/Xresources
 	vdoc doc/Xresources
 	vlicense doc/LICENSE
 }
diff --git a/srcpkgs/xterm/template b/srcpkgs/xterm/template
index 4cede25fd96..f67ce908c43 100644
--- a/srcpkgs/xterm/template
+++ b/srcpkgs/xterm/template
@@ -1,7 +1,7 @@
 # Template file for 'xterm'
 pkgname=xterm
-version=347
-revision=2
+version=349
+revision=1
 build_style=gnu-configure
 configure_args="--enable-wide-chars --enable-88-color --enable-broken-osc
  --enable-256-color --enable-luit --enable-paste64 --enable-ansi-color
@@ -15,12 +15,12 @@ hostmakedepends="pkg-config"
 makedepends="libXaw-devel libXft-devel libutempter-devel libxkbfile-devel
  ncurses-devel"
 short_desc="X Terminal Emulator"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Frank Steinborn <steinex@nognu.de>"
 license="MIT"
 homepage="http://invisible-island.net/xterm/"
 changelog="http://invisible-island.net/xterm/xterm.log.html"
 distfiles="https://invisible-mirror.net/archives/xterm/xterm-${version}.tgz"
-checksum=400f73e1277ef96dfcb3885388525e6a13a3657a4032b83c1203e812b710b908
+checksum=39a6a3d3724f9a0a068f8cc353ab0c82831f0a43abb24470d933af299658475f
 
 post_install() {
 	for f in {u,}xterm.desktop; do
diff --git a/srcpkgs/xtitle/template b/srcpkgs/xtitle/template
index 12b64ded09b..a6a0dc80d3d 100644
--- a/srcpkgs/xtitle/template
+++ b/srcpkgs/xtitle/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-makefile
 makedepends="libxcb-devel xcb-util-devel xcb-util-wm-devel"
 short_desc="Outputs X window titles"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Public Domain"
 homepage="https://github.com/baskerville/xtitle"
 distfiles="${homepage}/archive/${version}.tar.gz"
diff --git a/srcpkgs/xurls/template b/srcpkgs/xurls/template
index 7324801344e..c1d66b933ba 100644
--- a/srcpkgs/xurls/template
+++ b/srcpkgs/xurls/template
@@ -1,6 +1,6 @@
 # Template file for 'xurls'
 pkgname=xurls
-version=2.0.0
+version=2.1.0
 revision=1
 build_style=go
 go_import_path="github.com/mvdan/${pkgname}"
@@ -11,7 +11,7 @@ maintainer="dleeram <dleeram@protonmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.github.com/mvdan/xurls"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=515f05122890daab367bdff142f9c605475e81e3089d9aff080bc31bf0ddaf7b
+checksum=b6559d06ab8f59cc8ed0ac2de6018fe663587c803f981d25058e840c42ec76b0
 
 do_check() {
 	go test -v
diff --git a/srcpkgs/xvinfo/template b/srcpkgs/xvinfo/template
index cafc195447c..21be07874f8 100644
--- a/srcpkgs/xvinfo/template
+++ b/srcpkgs/xvinfo/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libXv-devel"
 short_desc="Query X-Video capabilities"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2"
diff --git a/srcpkgs/xvkbd/template b/srcpkgs/xvkbd/template
index 0e2fea8b9de..72bf1390a50 100644
--- a/srcpkgs/xvkbd/template
+++ b/srcpkgs/xvkbd/template
@@ -1,6 +1,6 @@
 # Template file for 'xvkbd'
 pkgname=xvkbd
-version=3.9
+version=4.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="imake xorg-cf-files gccmakedep"
@@ -10,11 +10,16 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2"
 homepage="http://t-sato.in.coocan.jp/xvkbd/"
 distfiles="http://t-sato.in.coocan.jp/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=b81c37ddfb7b78993dad15d304f8fd78e540d57c0a72f7e3316fd45fba919a9d
+checksum=eb54e440badc40299ba9a8f27fcea740cd3501310e8955651af7ade517a3ac82
 nocross=yes  # xmkmf broken
 
+case "$XBPS_TARGET_MACHINE" in
+	x86_64-musl) broken="cannot retrieve distfiles (Forbidden)" ;;
+esac
+
 do_configure() {
 	xmkmf
+	sed -i 's/\$(DESTDIR) \$(SHAREDIR)/$(DESTDIR)$(SHAREDIR)/' Makefile
 }
 pre_build() {
 	export MODULE_CFLAGS="$CFLAGS"
diff --git a/srcpkgs/xxHash/template b/srcpkgs/xxHash/template
index c085dfc296d..4835415747c 100644
--- a/srcpkgs/xxHash/template
+++ b/srcpkgs/xxHash/template
@@ -1,6 +1,6 @@
 # Template file for 'xxHash'
 pkgname=xxHash
-version=0.7.1
+version=0.7.2
 revision=1
 build_style=gnu-makefile
 make_use_env=yes
@@ -10,7 +10,7 @@ maintainer="John <johnz@posteo.net>"
 license="BSD-2-Clause, GPL-2.0-or-later"
 homepage="https://cyan4973.github.io/xxHash/"
 distfiles="https://github.com/Cyan4973/${pkgname}/archive/v${version}.tar.gz>xxhash-${version}.tar.gz"
-checksum=afa29766cfc0448ff4a1fd9f2c47e02c48d50be5b79749925d15d545008c3f81
+checksum=7e93d28e81c3e95ff07674a400001d0cdf23b7842d49b211e5582d00d8e3ac3e
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/yabasic/template b/srcpkgs/yabasic/template
index d7bf6a43010..c7f86dfacbb 100644
--- a/srcpkgs/yabasic/template
+++ b/srcpkgs/yabasic/template
@@ -1,16 +1,16 @@
 # Template file for 'yabasic'
 pkgname=yabasic
 reverts="2.769_1"
-version=2.84.0
+version=2.84.2
 revision=1
 build_style=gnu-configure
-makedepends="libXt-devel ncurses-devel"
+makedepends="libXt-devel ncurses-devel libffi-devel"
 short_desc="Yet another Basic"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3.0-or-later"
-homepage="http://2484.de/yabasic/"
-distfiles="http://2484.de/yabasic/download/yabasic-${version}.tar.gz"
-checksum=103fd4a2a8edc61a2bd7f56d721775a5c56c19026566f74e16cdabc1816389d2
+homepage="https://2484.de/yabasic/"
+distfiles="https://2484.de/yabasic/download/yabasic-${version}.tar.gz"
+checksum=98064a2631428ad938b4f515f78688f366ea2f2bebe80c31eebc2747f5b46fa6
 
 do_install() {
 	vbin yabasic
diff --git a/srcpkgs/yad/template b/srcpkgs/yad/template
index 105fd7310ba..b67c4b9e564 100644
--- a/srcpkgs/yad/template
+++ b/srcpkgs/yad/template
@@ -1,17 +1,17 @@
 # Template file for 'yad'
 pkgname=yad
-version=2.0
+version=4.1
 revision=1
 build_style=gnu-configure
 configure_args="--enable-icon-browser"
 hostmakedepends="automake gettext-devel glib-devel intltool pkg-config"
-makedepends="gtk+3-devel"
+makedepends="gtk+3-devel webkit2gtk-devel gtksourceview-devel gspell-devel"
 short_desc="Yet Another Dialog"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/v1cont/yad"
 distfiles="https://github.com/v1cont/yad/archive/${version}.tar.gz"
-checksum=acdbd59ee2e3ad67a61da965b2ea88e3b07bcee438382f4614e8f6f1f1ee7871
+checksum=668987b2452ab5c82b14e993c680fcf2abed8fdd37bda3d54580860a9a09aabf
 
 pre_configure() {
 	autoreconf -ivf
diff --git a/srcpkgs/yakuake/template b/srcpkgs/yakuake/template
index e2ecce48f30..9e67e48e457 100644
--- a/srcpkgs/yakuake/template
+++ b/srcpkgs/yakuake/template
@@ -1,17 +1,13 @@
 # Template file for 'yakuake'
 pkgname=yakuake
-version=3.0.5
-revision=2
+version=19.08.2
+revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules"
+hostmakedepends="extra-cmake-modules kconfig kcoreaddons qt5-host-tools qt5-qmake"
 makedepends="knewstuff-devel knotifyconfig-devel kparts-devel"
-short_desc="A drop-down terminal emulator based on KDE konsole technology"
+short_desc="Drop-down terminal emulator based on KDE konsole technology"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="http://yakuake.kde.org/"
-distfiles="${KDE_SITE}/${pkgname}/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=08e23bd3ed58732bec44bf1b6797990bbdc58fad0725da7215db39f86c4d2a08
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" kconfig python qt5-host-tools qt5-qmake"
-fi
+distfiles="${KDE_SITE}/applications/${version}/src/yakuake-${version}.tar.xz"
+checksum=3ebf477069c85a8705302b6b51902a74af7bb92349fab41000f71484a4de5aee
diff --git a/srcpkgs/yandex-disk/template b/srcpkgs/yandex-disk/template
index 9f5eac00752..4a40b02aed0 100644
--- a/srcpkgs/yandex-disk/template
+++ b/srcpkgs/yandex-disk/template
@@ -1,6 +1,6 @@
 # Template file for 'yandex-disk'
 pkgname=yandex-disk
-version=0.1.5.1010
+version=0.1.5.1039
 revision=1
 archs="i686 x86_64"
 short_desc="Console client for Yandex.Disk"
@@ -14,11 +14,11 @@ nostrip_files=yandex-disk
 if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
 	debpkgid="${pkgname}_${version}_amd64.deb"
 	distfiles="http://repo.yandex.ru/yandex-disk/deb/pool/main/y/${pkgname}/${debpkgid}"
-	checksum=901756adb89ee46dab4838795bd62c74ee272e64946bb1670dd0b7b246fae3cc
+	checksum=1a6b8c6200a09bd8d2f8aacb3ebb18208b89d5b055be9bab5c3ed1a0336ac1d6
 else
 	debpkgid="${pkgname}_${version}_i386.deb"
 	distfiles="http://repo.yandex.ru/yandex-disk/deb/pool/main/y/${pkgname}/${debpkgid}"
-	checksum=685f6f62a637ae0ffa5a93382024d2fd95853096d7e91c49bb3d280c2980eb7b
+	checksum=da195f7ddc3dcd8bf4fa08ff042860beea0759f39af74b8459be333e2b81393e
 fi
 
 do_extract() {
@@ -36,4 +36,3 @@ do_install() {
 		${DESTDIR}/usr/share/bash-completion/completions/yandex-disk
 	sed -e "s/^\(have.*\)/\#\1/" -i ${DESTDIR}/usr/share/bash-completion/completions/yandex-disk
 }
-
diff --git a/srcpkgs/yank/template b/srcpkgs/yank/template
index d4f764f9978..b062506a72b 100644
--- a/srcpkgs/yank/template
+++ b/srcpkgs/yank/template
@@ -1,9 +1,9 @@
 # Template file for 'yank'
 pkgname=yank
-version=1.1.0
+version=1.2.0
 revision=1
-make_use_env=yes
 build_style=gnu-makefile
+make_use_env=yes
 depends="xsel"
 short_desc="Yank terminal output to clipboard"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://github.com/mptre/yank"
 changelog="https://raw.githubusercontent.com/mptre/yank/master/CHANGELOG.md"
 distfiles="https://github.com/mptre/yank/releases/download/v${version}/yank-${version}.tar.gz"
-checksum=f197107cd604c41ef3c2390175bd34e5ad3c7cf1feafedefe357ba75149f1c59
+checksum=b500d1a71378e69a2a348032107e6d8db728b8f6af280a9bb4cb446c1d26e43a
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/yarn-bin/template b/srcpkgs/yarn-bin/template
index 6c375401272..cc1180caaf7 100644
--- a/srcpkgs/yarn-bin/template
+++ b/srcpkgs/yarn-bin/template
@@ -1,14 +1,14 @@
 # Template file for 'yarn-bin'
 pkgname=yarn-bin
-version=1.17.3
+version=1.19.0
 revision=1
 depends="virtual?nodejs-runtime"
 short_desc="Fast, reliable, and secure dependency management - precompiled binaries"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
-license="2-cause-BSD"
+license="BSD-2-Clause"
 homepage="https://yarnpkg.com/"
 distfiles="https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz"
-checksum=e3835194409f1b3afa1c62ca82f561f1c29d26580c9e220c36866317e043c6f3
+checksum=6bbdaab9c31eedbe7b53cbcde2be06b8c926f139bd0f7c00fccad406016e8934
 conflicts="yarn>=0"
 
 do_extract() {
diff --git a/srcpkgs/yaru/template b/srcpkgs/yaru/template
index 79f6e207389..17fd11f3a8e 100644
--- a/srcpkgs/yaru/template
+++ b/srcpkgs/yaru/template
@@ -1,6 +1,6 @@
 # Template file for 'yaru'
 pkgname=yaru
-version=19.10.1
+version=19.10.4
 revision=1
 archs=noarch
 build_style=meson
@@ -11,4 +11,4 @@ maintainer="Dawid Potocki <dpot@disroot.org>"
 license="GPL-3.0-or-later, CC-BY-SA-4.0"
 homepage="https://github.com/ubuntu/yaru"
 distfiles="https://github.com/ubuntu/yaru/archive/$version.tar.gz"
-checksum=1c66fca466591af3265cf2d004258e2d9cd431bd22456be18fc8bb8b5e18f137
+checksum=bff882ded3e9951d9c657eb60c34fe2d4cf5b9b98751f63fb062c64a98d08fd1
diff --git a/srcpkgs/yash/template b/srcpkgs/yash/template
index 712c7c8dcb7..1383d50ad33 100644
--- a/srcpkgs/yash/template
+++ b/srcpkgs/yash/template
@@ -1,22 +1,23 @@
 # Template file for 'yash'
 pkgname=yash
-version=2.48
+version=2.49
 revision=1
 build_style=configure
 configure_args="--prefix=/usr"
+make_build_args="LDLIBS=-lm LDLIBS+=${XBPS_CROSS_BASE}/usr/lib/libncursesw.a"
 makedepends="ncurses-devel"
+checkdepends="ed"
 short_desc="Yet another shell (POSIX-compliant)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://yash.osdn.jp/"
-#changelog="https://github.com/magicant/yash/releases"
+changelog="https://github.com/magicant/yash/releases"
 distfiles="https://github.com/magicant/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=f46294d77c5a646405db20a6dc3d16bc1ed109b061b2a508081ce483153c1e8d
-make_build_args="LDLIBS=-lm LDLIBS+=${XBPS_CROSS_BASE}/usr/lib/libncursesw.a"
-register_shell="/bin/yash"
+checksum=66eaf11d6c749165a7503801691759ae151e4eae00785875e121db2e9c219c72
 alternatives="
  sh:sh:/usr/bin/yash
  sh:sh.1:/usr/share/man/man1/yash.1"
+register_shell="/bin/yash"
 
 post_extract() {
 	sed -i '40i#undef iswdigit' arith.c  # macro in musl
diff --git a/srcpkgs/yelp-xsl/template b/srcpkgs/yelp-xsl/template
index b7e337e2f2c..153edd0f5c9 100644
--- a/srcpkgs/yelp-xsl/template
+++ b/srcpkgs/yelp-xsl/template
@@ -1,6 +1,6 @@
 # Template file for 'yelp-xsl'
 pkgname=yelp-xsl
-version=3.32.1
+version=3.34.0
 revision=1
 archs=noarch
 build_style=gnu-configure
@@ -11,4 +11,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Yelp/Xsl"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=cac31bc150545d6aa0de15dce04560cbf591008d17a783a1d1d9cdd47b147f04
+checksum=e8063aee67d1df634f3d062f1c28130b2dabb3c0c66396b1af90388f34e14ee2
diff --git a/srcpkgs/yelp/template b/srcpkgs/yelp/template
index a0195be2fa2..1288d697159 100644
--- a/srcpkgs/yelp/template
+++ b/srcpkgs/yelp/template
@@ -1,6 +1,6 @@
 # Template file for 'yelp'
 pkgname=yelp
-version=3.32.2
+version=3.34.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-schemas-compile --disable-static"
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Yelp"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=eef4dfa77d31a0005b4b39bf5f193263e1f4fe4ba1d0aecfdb3dd7caa249347b
+checksum=e3d6527c5963d73206891b32f1f23363164be57de248555513bd0be77a7bd045
 
 yelp-devel_package() {
 	depends="yelp-${version}_${revision}"
diff --git a/srcpkgs/yggdrasil/template b/srcpkgs/yggdrasil/template
index b0b43d94b92..2c8c5b909ff 100644
--- a/srcpkgs/yggdrasil/template
+++ b/srcpkgs/yggdrasil/template
@@ -1,7 +1,7 @@
 # Template file for 'yggdrasil'
 pkgname=yggdrasil
-version=0.3.7
-revision=2
+version=0.3.10
+revision=1
 wrksrc="yggdrasil-go-${version}"
 build_style=go
 go_import_path=github.com/yggdrasil-network/yggdrasil-go
@@ -11,7 +11,7 @@ maintainer="Jan Christian Gruenhage <jan.christian@gruenhage.xyz>"
 license="LGPL-3.0-only"
 homepage="https://yggdrasil-network.github.io/"
 distfiles="https://github.com/yggdrasil-network/yggdrasil-go/archive/v${version}.tar.gz"
-checksum=a0fc98f7d479fb44943fe85f223fbd9c5de529baa6f66887e37e904117e18a6a
+checksum=c6abe1757b044e80ff28a4003a03ddb192181c9dcb4aaf9de5749394861b733e
 
 do_build() {
 	PKGNAME=${pkgname} PKGVER=${version} ./build
diff --git a/srcpkgs/ykpivmgr/patches/libressl.patch b/srcpkgs/ykpivmgr/patches/libressl.patch
deleted file mode 100644
index 4c48300e932..00000000000
--- a/srcpkgs/ykpivmgr/patches/libressl.patch
+++ /dev/null
@@ -1,158 +0,0 @@
---- tool/openssl-compat.c
-+++ tool/openssl-compat.c
-@@ -71,6 +71,10 @@
-         *iqmp = r->iqmp;
- }
- 
-+#endif /* OPENSSL_VERSION_NUMBER */
-+
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+
- void X509_SIG_getm(X509_SIG *sig, X509_ALGOR **palg,
-                    ASN1_OCTET_STRING **pdigest)
- {
-@@ -80,4 +84,4 @@
-         *pdigest = sig->digest;
- }
- 
--#endif /* OPENSSL_VERSION_NUMBER */
-+#endif /* OPENSSL_VERSION_NUMBER || defined(LIBRESSL_VERSION_NUMBER) */
-
---- tool/openssl-compat.h
-+++ tool/openssl-compat.h
-@@ -20,7 +20,6 @@
- #include <openssl/ecdsa.h>
- #include <openssl/dh.h>
- #include <openssl/evp.h>
--#include <openssl/x509.h>
- 
- int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d);
- void RSA_get0_key(const RSA *r,
-@@ -29,9 +28,15 @@
- void RSA_get0_crt_params(const RSA *r,
-                          const BIGNUM **dmp1, const BIGNUM **dmq1,
-                          const BIGNUM **iqmp);
-+#endif /* OPENSSL_VERSION_NUMBER */
-+
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+
-+#include <openssl/x509.h>
-+
- void X509_SIG_getm(X509_SIG *sig, X509_ALGOR **palg,
-                    ASN1_OCTET_STRING **pdigest);
- 
-+#endif /* OPENSSL_VERSION_NUMBER || defined(LIBRESSL_VERSION_NUMBER) */
- #endif /* _WINDOWS */
--#endif /* OPENSSL_VERSION_NUMBER */
- #endif /* LIBCRYPTO_COMPAT_H */
-
---- tool/yubico-piv-tool.c
-+++ tool/yubico-piv-tool.c
-@@ -124,7 +124,7 @@
-   return false;
- }
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if !((OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER))
- static int ec_key_ex_data_idx = -1;
- 
- struct internal_key {
-@@ -688,7 +688,7 @@
-     goto request_out;
-   }
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
-   memcpy(digest, oid, oid_len);
-   /* XXX: this should probably use X509_REQ_digest() but that's buggy */
-   if(!ASN1_item_digest(ASN1_ITEM_rptr(X509_REQ_INFO), md, req->req_info,
-@@ -721,7 +721,7 @@
-       fprintf(stderr, "Failed signing request.\n");
-       goto request_out;
-     }
--    M_ASN1_BIT_STRING_set(req->signature, signature, sig_len);
-+    ASN1_BIT_STRING_set(req->signature, signature, sig_len);
-     /* mark that all bits should be used. */
-     req->signature->flags = ASN1_STRING_FLAG_BITS_LEFT;
-   }
-@@ -751,7 +751,7 @@
-     EVP_PKEY_free(public_key);
-   }
-   if(req) {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
-     if(req->sig_alg->parameter) {
-       req->sig_alg->parameter = NULL;
-     }
-@@ -884,7 +884,7 @@
-   if(nid == 0) {
-     goto selfsign_out;
-   }
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
-   if(YKPIV_IS_RSA(algorithm)) {
-     signinput = digest;
-     len = oid_len + md_len;
-@@ -912,7 +912,7 @@
-       fprintf(stderr, "Failed signing certificate.\n");
-       goto selfsign_out;
-     }
--    M_ASN1_BIT_STRING_set(x509->signature, signature, sig_len);
-+    ASN1_BIT_STRING_set(x509->signature, signature, sig_len);
-     /* setting flags to ASN1_STRING_FLAG_BITS_LEFT here marks that no bits
-      * should be subtracted from the bit string, thus making sure that the
-      * certificate can be validated. */
-@@ -941,7 +941,7 @@
-     fclose(output_file);
-   }
-   if(x509) {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
-     if(x509->sig_alg->parameter) {
-       x509->sig_alg->parameter = NULL;
-       x509->cert_info->signature->parameter = NULL;
-
-diff --git ykcs11/openssl_utils.c ykcs11/openssl_utils.c
-index 68fb29a..5a7f85d 100644
---- ykcs11/openssl_utils.c
-+++ ykcs11/openssl_utils.c
-@@ -165,7 +165,7 @@ CK_RV do_create_empty_cert(CK_BYTE_PTR in, CK_ULONG in_len, CK_BBOOL is_rsa,
-   X509_set_notBefore(cert, tm);
-   X509_set_notAfter(cert, tm);
- 
--#if OPENSSL_VERSION_NUMBER < 10100000L
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
-   // Manually set the signature algorithms.
-   // OpenSSL 1.0.1i complains about empty DER fields
-   // 8 => md5WithRsaEncryption
-diff --git ykcs11/tests/ykcs11_tests.c ykcs11/tests/ykcs11_tests.c
-index 9fb51da..257c938 100644
---- ykcs11/tests/ykcs11_tests.c
-+++ ykcs11/tests/ykcs11_tests.c
-@@ -274,7 +274,7 @@ static void test_login() {
- 
- }
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if !((OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER))
- static int bogus_sign(int dtype, const unsigned char *m, unsigned int m_length,
-                unsigned char *sigret, unsigned int *siglen, const RSA *rsa) {
-   sigret = malloc(1);
-@@ -385,7 +385,7 @@ static void test_import_and_sign_all_10() {
-   X509_set_notBefore(cert, tm);
-   X509_set_notAfter(cert, tm);
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
-   cert->sig_alg->algorithm = OBJ_nid2obj(8);
-   cert->cert_info->signature->algorithm = OBJ_nid2obj(8);
- 
-@@ -583,7 +583,7 @@ static void test_import_and_sign_all_10_RSA() {
-   X509_set_notBefore(cert, tm);
-   X509_set_notAfter(cert, tm);
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
-   /* putting bogus data to signature to make some checks happy */
-   cert->sig_alg->algorithm = OBJ_nid2obj(8);
-   cert->cert_info->signature->algorithm = OBJ_nid2obj(8);
diff --git a/srcpkgs/ykpivmgr/patches/ssl_obsolete.patch b/srcpkgs/ykpivmgr/patches/ssl_obsolete.patch
new file mode 100644
index 00000000000..e842806e821
--- /dev/null
+++ b/srcpkgs/ykpivmgr/patches/ssl_obsolete.patch
@@ -0,0 +1,22 @@
+diff --git a/tool/yubico-piv-tool.c b/tool/yubico-piv-tool.c
+index d7e11d5..7cd15e3 100644
+--- a/tool/yubico-piv-tool.c
++++ b/tool/yubico-piv-tool.c
+@@ -751,7 +751,7 @@ static bool request_certificate(ykpiv_state *state, enum enum_key_format key_for
+       fprintf(stderr, "Failed signing request.\n");
+       goto request_out;
+     }
+-    M_ASN1_BIT_STRING_set(req->signature, signature, sig_len);
++    ASN1_STRING_set(req->signature, signature, sig_len);
+     /* mark that all bits should be used. */
+     req->signature->flags = ASN1_STRING_FLAG_BITS_LEFT;
+   }
+@@ -1007,7 +1007,7 @@ static bool selfsign_certificate(ykpiv_state *state, enum enum_key_format key_fo
+       fprintf(stderr, "Failed signing certificate.\n");
+       goto selfsign_out;
+     }
+-    M_ASN1_BIT_STRING_set(x509->signature, signature, sig_len);
++    ASN1_STRING_set(x509->signature, signature, sig_len);
+     /* setting flags to ASN1_STRING_FLAG_BITS_LEFT here marks that no bits
+      * should be subtracted from the bit string, thus making sure that the
+      * certificate can be validated. */
diff --git a/srcpkgs/ykpivmgr/template b/srcpkgs/ykpivmgr/template
index 7e72bcc15f5..1e4a78e0e4a 100644
--- a/srcpkgs/ykpivmgr/template
+++ b/srcpkgs/ykpivmgr/template
@@ -6,8 +6,8 @@ _libykcs_name="libykcs11"
 _libykcs_desc="Yubikey PIV pkcs11 library"
 
 pkgname=ykpivmgr
-version=1.5.0
-revision=5
+version=1.7.0
+revision=1
 wrksrc="${_real_name}-${version}"
 build_style=gnu-configure
 configure_args="--enable-doxygen-man --program-transform-name='s/^yubico-piv-tool$/ykpivmgr/'"
@@ -15,10 +15,11 @@ hostmakedepends="automake libtool gengetopt pkg-config doxygen perl"
 makedepends="libressl-devel check-devel pcsclite-devel"
 short_desc="Yubikey PIV management tool"
 maintainer="Aloz1 <kno0001@gmail.com>"
-license="BSD"
+license="BSD-2-Clause"
 homepage="https://developers.yubico.com/${_real_name}"
 distfiles="https://developers.yubico.com/${_real_name}/Releases/${_real_name}-${version}.tar.gz"
-checksum=c18375179ba25bf9d61365b3903f033f112897bbd54ca63c62fa153f2d05aaab
+checksum=b428527e4031453a637128077983e782e9fea25df98e95e0fc27819b2e82fd7f
+patch_args="-Np1"
 
 post_extract() {
 	sed -i '/^yubico-piv-tool.1/,$d' tool/Makefile.am
diff --git a/srcpkgs/yoshimi/template b/srcpkgs/yoshimi/template
index d34d8fe03ea..9196f3e25a3 100644
--- a/srcpkgs/yoshimi/template
+++ b/srcpkgs/yoshimi/template
@@ -1,6 +1,6 @@
 # Template file for 'yoshimi'
 pkgname=yoshimi
-version=1.5.11.4
+version=1.6.0.1
 revision=1
 build_wrksrc=src
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="https://yoshimi.github.io/"
 distfiles="https://github.com/Yoshimi/$pkgname/archive/$version.tar.gz"
-checksum=36e0b1ff3b513646387612cbe420ddf444ca91842994d01b7a8890696d6a63dc
+checksum=92c4570391721f8faff1059063cf36f6e9018e52be6b18bce9d3d263087afcfb
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) makedepends+=" argp-standalone";;
diff --git a/srcpkgs/yosys/template b/srcpkgs/yosys/template
index 4516a7e4c88..b35f42713b7 100644
--- a/srcpkgs/yosys/template
+++ b/srcpkgs/yosys/template
@@ -1,11 +1,11 @@
 # Template file for 'yosys'
 pkgname=yosys
-version=0.8
+version=0.9
 revision=1
 wrksrc=${pkgname}-${pkgname}-${version}
 build_style=gnu-makefile
 make_use_env=yes
-hostmakedepends="python3 bison flex pkg-config clang git tcl"
+hostmakedepends="python3 bison flex pkg-config clang git tcl readline"
 makedepends="tcl-devel readline-devel libffi-devel"
 depends="graphviz xdot"
 short_desc="Verilog RTL Synthesis Suite"
@@ -13,7 +13,7 @@ maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="http://www.clifford.at/yosys/about.html"
 distfiles="https://github.com/cliffordwolf/yosys/archive/yosys-${version}.tar.gz"
-checksum=07760fe732003585b26d97f9e02bcddf242ff7fc33dbd415446ac7c70e85c66f
+checksum=f2e31371f9cf1b36cb4f57b23fd6eb849adc7d935dcf49f3c905aa5136382c2f
 
 pre_build() {
 	vsed -e "s,CXX = gcc,CXX = ${CC}," -e "s,LD = gcc, LD = ${CC}," -i Makefile
diff --git a/srcpkgs/youtube-dl/template b/srcpkgs/youtube-dl/template
index 2dc6f2cf94b..d6596b80bd3 100644
--- a/srcpkgs/youtube-dl/template
+++ b/srcpkgs/youtube-dl/template
@@ -1,9 +1,9 @@
 # Template file for 'youtube-dl'
 pkgname=youtube-dl
-version=2019.08.13
+version=2019.10.16
 revision=1
 archs=noarch
-wrksrc="$pkgname"
+wrksrc=youtube-dl
 build_style=python3-module
 pycompile_module="youtube_dl"
 hostmakedepends="python3"
@@ -11,16 +11,16 @@ depends="python3"
 short_desc="CLI program to download videos from YouTube and other sites"
 maintainer="Daniel Eyßer <daniel.eysser@gmail.com>"
 license="Unlicense"
-homepage="https://rg3.github.io/youtube-dl/"
-changelog="https://raw.githubusercontent.com/rg3/youtube-dl/master/ChangeLog"
-distfiles="https://yt-dl.org/downloads/${version}/${pkgname}-${version}.tar.gz"
-checksum=b23d59df96f9dccf34d9c48b65e7bc93532f1ebc4bf71b9285f228bc6086242d
+homepage="https://ytdl-org.github.io/youtube-dl/"
+changelog="https://raw.githubusercontent.com/ytdl-org/youtube-dl/master/ChangeLog"
+distfiles="https://yt-dl.org/downloads/${version}/youtube-dl-${version}.tar.gz"
+checksum=f2acb43ae419ee6c33e94989cada162b4566755dc1d5e0935368952290a92b21
 
 post_install() {
 	rm -rf ${DESTDIR}/usr/etc
-	vinstall ${pkgname}.bash-completion 644 usr/share/bash-completion/completions ${pkgname}
-	vinstall ${pkgname}.zsh 644 usr/share/zsh/site-functions _${pkgname}
-	vinstall ${pkgname}.fish 644 usr/share/fish/completions ${pkgname}.fish
+	vinstall youtube-dl.bash-completion 644 usr/share/bash-completion/completions youtube-dl
+	vinstall youtube-dl.zsh 644 usr/share/zsh/site-functions _youtube-dl
+	vinstall youtube-dl.fish 644 usr/share/fish/completions youtube-dl.fish
 }
 
 python3-youtube-dl_package() {
diff --git a/srcpkgs/youtube-viewer/template b/srcpkgs/youtube-viewer/template
index da4595922ed..454b7fa625b 100644
--- a/srcpkgs/youtube-viewer/template
+++ b/srcpkgs/youtube-viewer/template
@@ -1,6 +1,6 @@
 # Template file for 'youtube-viewer'
 pkgname=youtube-viewer
-version=3.5.6
+version=3.5.8
 revision=1
 archs=noarch
 build_style=perl-ModuleBuild
@@ -14,7 +14,7 @@ license="Artistic-2.0"
 homepage="https://github.com/trizen/youtube-viewer"
 changelog="https://github.com/trizen/youtube-viewer/releases"
 distfiles="https://github.com/trizen/youtube-viewer/archive/${version}.tar.gz"
-checksum=b4d2d17e3ff8aba5f3c358db170867d89ca5e35f3340312c81b9af7c70f3c826
+checksum=afe061263917a84cd297919c1ac79157ed3952f549825552eb6bb821e38fae0c
 
 gtk-youtube-viewer_package() {
 	depends="${sourcepkg}-${version}_${revision} perl-Gtk2 perl-File-ShareDir"
diff --git a/srcpkgs/yq-go/template b/srcpkgs/yq-go/template
index f9d15a53692..32efacef040 100644
--- a/srcpkgs/yq-go/template
+++ b/srcpkgs/yq-go/template
@@ -7,7 +7,7 @@ build_style=go
 go_import_path=github.com/mikefarah/yq
 hostmakedepends="git"
 short_desc="Lightweight and portable command-line YAML processor written in go"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/mikefarah/yq"
 distfiles="https://github.com/mikefarah/yq/archive/${version}.tar.gz"
diff --git a/srcpkgs/yq/template b/srcpkgs/yq/template
index dfc2acac734..7c3af7f43c2 100644
--- a/srcpkgs/yq/template
+++ b/srcpkgs/yq/template
@@ -10,7 +10,7 @@ depends="python3-setuptools"
 depends="jq python3-xmltodict python3-yaml python3-toml"
 checkdepends="jq python3-xmltodict python3-toml"
 short_desc="Command-line YAML processor written in Python that wraps around jq"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/kislyuk/yq"
 distfiles="${PYPI_SITE}/y/yq/yq-${version}.tar.gz"
diff --git a/srcpkgs/yubikey-manager/template b/srcpkgs/yubikey-manager/template
new file mode 100644
index 00000000000..af0330e8e15
--- /dev/null
+++ b/srcpkgs/yubikey-manager/template
@@ -0,0 +1,19 @@
+# Template file for 'yubikey-manager'
+pkgname=yubikey-manager
+version=3.1.0
+revision=1
+archs=noarch
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="libu2f-host python3-fido2 python3-openssl python3-usb python3-scard
+python3-click python3-cryptography python3-six pcsc-ccid"
+short_desc="Library and CLI tools to configure YubiKey"
+maintainer="Doan Tran Cong Danh <congdanhqx@gmail.com>"
+license="BSD-2-Clause"
+homepage="https://developers.yubico.com/yubikey-manager/"
+distfiles="https://developers.yubico.com/${pkgname}/Releases/${pkgname}-${version}.tar.gz"
+checksum=0137acd30cffa60421dde8277b3bb0c5d5e2179d36df0d190de6faf7eec76359
+
+post_install() {
+	vlicense COPYING
+}
diff --git a/srcpkgs/z3/template b/srcpkgs/z3/template
index 3173c97b918..d632a285019 100644
--- a/srcpkgs/z3/template
+++ b/srcpkgs/z3/template
@@ -1,8 +1,8 @@
 # Template file for 'z3'
 pkgname=z3
-version=4.8.5
-revision=3
-wrksrc="${pkgname}-Z3-${version}"
+version=4.8.6
+revision=2
+wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=configure
 configure_args="--prefix=/usr -g --python $(vopt_if ocaml --ml)"
 make_build_args="-C build all examples"
@@ -15,8 +15,8 @@ short_desc="Z3 theorem prover and SMT solver (command line + Python3 module)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/Z3Prover/z3"
-distfiles="https://github.com/Z3Prover/z3/archive/Z3-${version}.tar.gz"
-checksum=4e8e232887ddfa643adb6a30dcd3743cb2fa6591735fbd302b49f7028cdc0363
+distfiles="https://github.com/Z3Prover/z3/archive/z3-${version}.tar.gz"
+checksum=37922fa5085170cad6504498d9758fb63c61d5cb5b68689c11a6c5e84f0311b3
 
 build_options="ocaml"
 desc_option_ocaml="Enable support for OCaml bindings"
diff --git a/srcpkgs/zabbix/template b/srcpkgs/zabbix/template
index 9f6f0094773..02b90b235a2 100644
--- a/srcpkgs/zabbix/template
+++ b/srcpkgs/zabbix/template
@@ -11,7 +11,7 @@ makedepends="gnutls-devel libcurl-devel libevent-devel libmysqlclient-devel
  libxml2-devel net-snmp-devel pcre-devel"
 depends="fping mysql"
 short_desc="IT Infrastructure components availability and performance monitoring"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.zabbix.com"
 changelog="https://www.zabbix.com/rn/rn${version}"
diff --git a/srcpkgs/zaproxy/template b/srcpkgs/zaproxy/template
deleted file mode 100644
index aad6edcd11f..00000000000
--- a/srcpkgs/zaproxy/template
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for 'zaproxy'
-pkgname=zaproxy
-version=2.7.0
-revision=1
-hostmakedepends="openjdk apache-ant"
-depends="virtual?java-runtime"
-short_desc="Web application vulnerability scanner"
-maintainer="Michael Aldridge <maldridge@voidlinux.org>"
-license="Apache-2.0"
-homepage="https://www.owasp.org/index.php/ZAP"
-distfiles="https://github.com/zaproxy/zaproxy/archive/${version}.tar.gz"
-checksum=325bd7cf78775a302287daee01872a8224297c3bb261eedd8d91809c91ca0ccb
-
-do_configure() {
-	# Set version for ant
-	sed -i "s/Dev Build/${version}/" build/version.txt
-}
-
-do_build() {
-	ant -f build/build.xml dist
-}
-
-post_build() {
-	rm build/zap/zap.bat
-	chmod +x build/zap/zap.sh
-}
-
-do_install() {
-	vmkdir usr/share/${pkgname}
-	vcopy "build/zap/*" usr/share/${pkgname}
-	vinstall build/zap/zap.sh 755 usr/share/${pkgname}
-	vmkdir usr/bin
-	ln -rs ${DESTDIR}/usr/share/${pkgname}/zap.sh ${DESTDIR}/usr/bin/zaproxy
-}
diff --git a/srcpkgs/zaproxy/update b/srcpkgs/zaproxy/update
deleted file mode 100644
index 918c4f312d0..00000000000
--- a/srcpkgs/zaproxy/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://raw.githubusercontent.com/zaproxy/zap-admin/master/ZapVersions.xml"
-pattern="<version>\K[\d\.]+(?=</version>)"
diff --git a/srcpkgs/zathura/template b/srcpkgs/zathura/template
index 762d990e295..fbd4f024f4b 100644
--- a/srcpkgs/zathura/template
+++ b/srcpkgs/zathura/template
@@ -1,25 +1,22 @@
 # Template file for 'zathura'
 pkgname=zathura
-version=0.4.3
-revision=2
+version=0.4.4
+revision=1
 build_style=meson
 configure_args="-Dsynctex=disabled -Dtests=disabled"
 hostmakedepends="pkg-config intltool python3-Sphinx desktop-file-utils
  appstream-glib glib-devel librsvg-utils"
 makedepends="girara-devel sqlite-devel file-devel zlib-devel libseccomp-devel
  libglib-devel"
-short_desc="A highly customizable and functional document viewer"
+short_desc="Highly customizable and functional document viewer"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
 homepage="https://pwmt.org/projects/zathura/installation/"
 changelog="https://pwmt.org/projects/zathura/changelog/${version}"
-distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz"
-checksum=7e12194426d709670e0f4b0b107c80dd21322881b57d4a0bf9a09998402ffd41
+distfiles="https://git.pwmt.org/pwmt/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
+checksum=ebc98478fd8ec412b8f87c6b75067cf52d89d200731c1848ec3a2700f2a3b36c
 
 post_install() {
-	vmkdir usr/share/zsh/site-functions
-	mv ${DESTDIR}/usr/share/zsh/{vendor-completions,site-functions}/_zathura
-
 	vlicense LICENSE
 }
 
diff --git a/srcpkgs/zchunk/template b/srcpkgs/zchunk/template
index c0a02770aca..5230573fd58 100644
--- a/srcpkgs/zchunk/template
+++ b/srcpkgs/zchunk/template
@@ -1,16 +1,16 @@
 # Template file for 'zchunk'
 pkgname=zchunk
-version=1.1.2
-revision=2
+version=1.1.3
+revision=1
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="libcurl-devel libzstd-devel"
 short_desc="Easy-to-delta, compressed file format"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/zchunk/zchunk"
 distfiles="https://github.com/zchunk/zchunk/archive/${version}.tar.gz"
-checksum=dcd7389ab9f947a53c83e32e842ba6ef69f931836bba585617a2bb7ec3cf900f
+checksum=4972d488f2e035b7b6ebe2484ac5123a49ce616c2a4bcca8112841c5ed94b8b7
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) makedepends+=" argp-standalone"
diff --git a/srcpkgs/zfs/template b/srcpkgs/zfs/template
index 8947eeff7d8..ce124ff12bb 100644
--- a/srcpkgs/zfs/template
+++ b/srcpkgs/zfs/template
@@ -1,6 +1,6 @@
 # Template file for 'zfs'
 pkgname=zfs
-version=0.8.1
+version=0.8.2
 revision=1
 build_style=gnu-configure
 configure_args="--with-config=user --with-mounthelperdir=/usr/bin
@@ -14,7 +14,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="CDDL-1.0"
 homepage="https://zfsonlinux.org/"
 distfiles="https://github.com/zfsonlinux/zfs/releases/download/zfs-${version}/zfs-${version}.tar.gz"
-checksum=0af79fde44b7b8ecb94d5166ce2e4fff7409c20ed874c2d759db92909e6c2799
+checksum=47608e257c8ecebb918014ef1da6172c3a45d990885891af18e80f5cc28beab8
 
 replaces="spl<=0.7.13_1" # Because SPL was merged into zfs in 0.8.0
 
diff --git a/srcpkgs/zim-tools/template b/srcpkgs/zim-tools/template
index a73fc304ef9..66d1150ba0b 100644
--- a/srcpkgs/zim-tools/template
+++ b/srcpkgs/zim-tools/template
@@ -1,13 +1,13 @@
 # Template file for 'zim-tools'
 pkgname=zim-tools
-version=1.0.4
+version=1.0.5
 revision=1
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="libzim-devel xapian-core-devel icu-devel"
 short_desc="Various ZIM command line tools"
-maintainer="John Zimmermann <johnz@posteo.net>"
+maintainer="John <johnz@posteo.net>"
 license="GPL-3.0-or-later"
 homepage="http://www.openzim.org"
 distfiles="https://github.com/openzim/zim-tools/archive/${version}.tar.gz"
-checksum=9ef17a6cdbf7f3d7f6564c757a09e0b7b2c0f722d12a05afec43de80b2635b5e
+checksum=e2f2eac965d895f7cb619fd7e95ff48b1cb0599d329d96ba2a8835c85da160b9
diff --git a/srcpkgs/zimwriterfs/template b/srcpkgs/zimwriterfs/template
index 9616b0e47a7..e8b9c7899e0 100644
--- a/srcpkgs/zimwriterfs/template
+++ b/srcpkgs/zimwriterfs/template
@@ -1,6 +1,6 @@
 # Template file for 'zimwriterfs'
 pkgname=zimwriterfs
-version=1.3.3
+version=1.3.7
 revision=1
 build_style=meson
 hostmakedepends="pkg-config"
@@ -11,4 +11,4 @@ maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/openzim/zimwriterfs"
 distfiles="https://github.com/openzim/zimwriterfs/archive/${version}.tar.gz"
-checksum=3080085bc7bda6587330ffafb2aaa5ef611fae9105997d065e4e011b62d52a73
+checksum=d55e13194e29100bf88bb201c5661ab7d2600a9e45c6caeb2a21647cdbf6cb4e
diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template
index 5c6844a9ec4..8af8f23a145 100644
--- a/srcpkgs/znc/template
+++ b/srcpkgs/znc/template
@@ -1,7 +1,7 @@
 # Template file for 'znc'
 pkgname=znc
-version=1.7.4
-revision=2
+version=1.7.5
+revision=1
 build_style=gnu-configure
 configure_args="
  --enable-python
@@ -15,10 +15,10 @@ makedepends="libressl-devel python3-devel tcl-devel libsasl-devel
 short_desc="An advanced IRC Bouncer"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="Apache-2.0"
-#changelog="https://github.com/znc/znc/raw/master/ChangeLog.md"
+changelog="https://github.com/znc/znc/raw/master/ChangeLog.md"
 homepage="https://znc.in/"
 distfiles="https://znc.in/releases/${pkgname}-${version}.tar.gz"
-checksum=b1a32921a8e6d79ee6c5900c8d07293026966db7c05aaac48984231befc49b71
+checksum=a8941e1385c8654287a4428018d93459482e9d5eeedf86bef7b020ddc5f24721
 
 system_accounts="znc"
 znc_homedir="/var/lib/znc"
diff --git a/srcpkgs/zola/template b/srcpkgs/zola/template
index 49ccaeabe15..d6f035d3ed9 100644
--- a/srcpkgs/zola/template
+++ b/srcpkgs/zola/template
@@ -1,22 +1,27 @@
 # Template file for 'zola'
 pkgname=zola
-version=0.8.0
+version=0.9.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libsass-devel"
+makedepends="libressl-devel libsass-devel oniguruma-devel"
 short_desc="Fast opinionated static site generator written in rust"
 maintainer="Carson Page <pagem.carson@gmail.com>"
 license="MIT"
 homepage="https://github.com/getzola/zola"
 changelog="https://github.com/getzola/zola/raw/master/CHANGELOG.md"
 distfiles="https://github.com/getzola/zola/archive/v${version}.tar.gz"
-checksum=c16909fc20ad3e2f922beb270b2350928669149ba2e958de72558f96620a9624
+checksum=8d226ec764f2bc06de8e49e2e22ccf37811bc478bbcaa83c2c841b222ef4fc4e
 
 case $XBPS_TARGET_MACHINE in
-	armv6l-musl) broken="triggers segfailt in rustc" ;;
+	armv6l-musl) broken="triggers segfault in rustc" ;;
 esac
 
+pre_build() {
+	export PKG_CONFIG_ALL_DYNAMIC=1
+	export RUSTONIG_SYSTEM_LIBONIG=1
+}
+
 post_install() {
 	vlicense LICENSE
 
diff --git a/srcpkgs/zoom/template b/srcpkgs/zoom/template
index 246de5c0ec9..2cf25bd27a2 100644
--- a/srcpkgs/zoom/template
+++ b/srcpkgs/zoom/template
@@ -1,20 +1,21 @@
 # Template file for 'zoom'
 pkgname=zoom
-version=2.9.265650.0716
+version=3.0.303290.1010
 revision=1
 archs="x86_64"
 wrksrc=zoom
 create_wrksrc=yes
 short_desc="Video Conferencing and Web Conferencing Service"
 maintainer="Daniel Santana <daniel@santana.tech>"
-license="Proprietary"
+license="custom:Proprietary"
 homepage="https://zoom.us/"
 distfiles="https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz"
-checksum=f9014967875c6e5f90968c11ed08846a24001f48191f6f860e5c95bbf58512e2
+checksum=4f5aea98a0a819ac9e0891080ddfa5f63344fa762c28309513010c64946b12da
 repository=nonfree
 restricted=yes
 nopie=yes
 
+
 do_install() {
 	vcopy opt .
 	vcopy usr .
diff --git a/srcpkgs/zou/template b/srcpkgs/zou/template
index ce39e39ec31..1badb2d8bcf 100644
--- a/srcpkgs/zou/template
+++ b/srcpkgs/zou/template
@@ -6,7 +6,7 @@ build_style=cargo
 hostmakedepends="pkg-config"
 makedepends="libressl-devel"
 short_desc="Simple and fast download accelerator, written in Rust"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/k0pernicus/zou"
 distfiles="https://github.com/k0pernicus/zou/archive/v${version}.tar.gz"
diff --git a/srcpkgs/zsh-completions/template b/srcpkgs/zsh-completions/template
index e7f30d81bed..24123f79690 100644
--- a/srcpkgs/zsh-completions/template
+++ b/srcpkgs/zsh-completions/template
@@ -1,6 +1,6 @@
 # Template file for 'zsh-completions'
 pkgname=zsh-completions
-version=0.30.0
+version=0.31.0
 revision=1
 archs=noarch
 depends="zsh"
@@ -9,7 +9,7 @@ maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="BSD-3-Clause, Apache-2.0, MIT"
 homepage="https://github.com/zsh-users/zsh-completions"
 distfiles="${homepage}/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=981c386fa01f9bcb0c8a66b0db16af794ab10169d12e2242f83715967b737621
+checksum=6c1cccf6fd8c7d875145e357e3a46680b74013b6fc7b98724801126c072fc024
 
 do_install() {
 	vmkdir usr/share/zsh/site-functions/
diff --git a/srcpkgs/zstd/template b/srcpkgs/zstd/template
index 9635ec76322..73af2d9b763 100644
--- a/srcpkgs/zstd/template
+++ b/srcpkgs/zstd/template
@@ -1,16 +1,16 @@
 # Template file for 'zstd'
 pkgname=zstd
-version=1.4.2
+version=1.4.3
 revision=1
 bootstrap=yes
 makedepends="zlib-devel liblzma-devel liblz4-devel"
 checkdepends="gtest-devel"
 short_desc="Fast real-time compression algorithm - CLI tool"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause, GPL-2.0-or-later"
 homepage="http://www.zstd.net"
 distfiles="https://github.com/facebook/zstd/archive/v${version}.tar.gz"
-checksum=7a6e1dad34054b35e2e847eb3289be8820a5d378228802239852f913c6dcf6a7
+checksum=5eda3502ecc285c3c92ee0cc8cd002234dee39d539b3f692997a0e80de1d33de
 
 do_build() {
 	make ${makejobs}
@@ -21,7 +21,6 @@ do_check() {
 	# using the test target is too expensive
 	make ${makejobs} shortest
 	make ${makejobs} -C contrib/pzstd tests check
-
 }
 
 do_install() {
diff --git a/srcpkgs/zulucrypt/template b/srcpkgs/zulucrypt/template
index 5143ab6c913..05f92cf4bc6 100644
--- a/srcpkgs/zulucrypt/template
+++ b/srcpkgs/zulucrypt/template
@@ -1,7 +1,7 @@
 # Template file for 'zulucrypt'
 pkgname=zulucrypt
-version=5.5.0
-revision=2
+version=5.7.0
+revision=1
 wrksrc="zuluCrypt-${version}"
 build_style=cmake
 configure_args="-DINTERNAL_ZULUPLAY=false -DQT5=true
@@ -18,8 +18,9 @@ short_desc="Frontend to cryptsetup and Veracrypt for harddrive and file encrypti
 maintainer="Piraty <piraty1@inbox.ru>"
 license="GPL-2.0-or-later"
 homepage="https://mhogomchungu.github.io/zuluCrypt"
+changelog="https://github.com/mhogomchungu/zuluCrypt/blob/master/changelog"
 distfiles="https://github.com/mhogomchungu/zuluCrypt/archive/${version}.tar.gz"
-checksum=5f061202c3ac1264a8fba10cccc7e3f7a623f108ff618e02ebcb54870f3d2822
+checksum=53c1a450a7c5c18f7b6a8cf46bd4f051174f9d98c77f79a20c733e96b463f2d5
 
 #https://github.com/mhogomchungu/zuluCrypt/blob/e138cc4459545b2e0f729814791a045c31b63014/BUILD_INSTRUCTIONS
 build_options="udev kde gnome pwquality polkit homemount"

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PR PATCH] [Updated] libnotify: update to 0.7.8
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-13708@inbox.vuxu.org>
  2019-09-03  9:36 ` [PR PATCH] [Updated] libnotify: update to 0.7.8 voidlinux-github
@ 2019-09-03  9:36 ` voidlinux-github
  2019-10-19 10:22 ` voidlinux-github
  2019-10-19 10:22 ` voidlinux-github
  3 siblings, 0 replies; 4+ messages in thread
From: voidlinux-github @ 2019-09-03  9:36 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 518 bytes --]

There is an updated pull request by biopsin against master on the void-packages repository

https://github.com/biopsin/void-packages patch-1
https://github.com/void-linux/void-packages/pull/13708

libnotify: update to 0.7.8
switch to meson, added build options for docs..

noticed this warning while build:
/usr/include/features.h:382:4: warning: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Wcpp]


A patch file from https://github.com/void-linux/void-packages/pull/13708.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-patch-1-13708.patch --]
[-- Type: text/x-diff, Size: 4909 bytes --]

From 66cbe34a1cd4c226829d228283436b70b6f0a3ac Mon Sep 17 00:00:00 2001
From: biopsin <biopsin@yahoo.no>
Date: Fri, 16 Aug 2019 09:12:49 +0200
Subject: [PATCH 1/4] libnotify: update to 0.7.8

switch to meson, added build options for docs..

noticed this warning while build:
/usr/include/features.h:382:4: warning: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Wcpp]
---
 srcpkgs/libnotify/template | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/libnotify/template b/srcpkgs/libnotify/template
index ca699bda40a..bda47d17c18 100644
--- a/srcpkgs/libnotify/template
+++ b/srcpkgs/libnotify/template
@@ -1,21 +1,24 @@
 # Template file for 'libnotify'
 pkgname=libnotify
-version=0.7.7
-revision=3
-build_style=gnu-configure
+version=0.7.8
+revision=1
+build_style=meson
 build_helper="gir"
-configure_args="--disable-static $(vopt_enable gir introspection)"
+configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
+ -Dgtk_doc=$(vopt_if gtk_doc true false)
+ -Ddocbook_docs=$(vopt_if docbook enabled disabled)"
 hostmakedepends="pkg-config glib-devel"
-makedepends="libglib-devel libpng-devel gdk-pixbuf-devel gtk+3-devel"
+makedepends="libglib-devel libpng-devel gdk-pixbuf-devel gtk+3-devel
+ $(vopt_if gtk_doc gtk-doc) $(vopt_if docbook 'xmlto docbook-xsl')"
 short_desc="Desktop notification library"
 maintainer="Juan RP <xtraeme@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="http://library.gnome.org/devel/notification-spec/"
 distfiles="${GNOME_SITE}/${pkgname}/0.7/${pkgname}-${version}.tar.xz"
-checksum=9cb4ce315b2655860c524d46b56010874214ec27e854086c1a1d0260137efc04
+checksum=69209e0b663776a00c7b6c0e560302a8dbf66b2551d55616304f240bba66e18c
 
 # Package build options
-build_options="gir"
+build_options="gir gtk_doc docbook"
 build_options_default="gir"
 
 libnotify-devel_package() {

From bf76a08bd3c448da1e67e1a54640d31bcdc65fd8 Mon Sep 17 00:00:00 2001
From: biopsin <biopsin@yahoo.no>
Date: Mon, 19 Aug 2019 08:55:11 +0200
Subject: [PATCH 2/4] Update template

---
 srcpkgs/libnotify/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libnotify/template b/srcpkgs/libnotify/template
index bda47d17c18..2243a2eef72 100644
--- a/srcpkgs/libnotify/template
+++ b/srcpkgs/libnotify/template
@@ -11,7 +11,7 @@ hostmakedepends="pkg-config glib-devel"
 makedepends="libglib-devel libpng-devel gdk-pixbuf-devel gtk+3-devel
  $(vopt_if gtk_doc gtk-doc) $(vopt_if docbook 'xmlto docbook-xsl')"
 short_desc="Desktop notification library"
-maintainer="Juan RP <xtraeme@voidlinux.org>"
+maintainer="biopsin <biopsin@yahoo.no>"
 license="LGPL-2.1-or-later"
 homepage="http://library.gnome.org/devel/notification-spec/"
 distfiles="${GNOME_SITE}/${pkgname}/0.7/${pkgname}-${version}.tar.xz"

From 05ca14c65ca07f012b37597aa4ff7e5592b11e94 Mon Sep 17 00:00:00 2001
From: biopsin <biopsin@yahoo.no>
Date: Wed, 21 Aug 2019 09:28:17 +0200
Subject: [PATCH 3/4] Update template

---
 srcpkgs/libnotify/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libnotify/template b/srcpkgs/libnotify/template
index 2243a2eef72..5390f45af82 100644
--- a/srcpkgs/libnotify/template
+++ b/srcpkgs/libnotify/template
@@ -4,7 +4,7 @@ version=0.7.8
 revision=1
 build_style=meson
 build_helper="gir"
-configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
+configure_args="-Dc_args=-O2 -Dintrospection=$(vopt_if gir enabled disabled)
  -Dgtk_doc=$(vopt_if gtk_doc true false)
  -Ddocbook_docs=$(vopt_if docbook enabled disabled)"
 hostmakedepends="pkg-config glib-devel"

From 9d660c090b19caedf4c5bbf39dbbed940bd66619 Mon Sep 17 00:00:00 2001
From: biopsin <biopsin@yahoo.no>
Date: Tue, 3 Sep 2019 11:36:05 +0200
Subject: [PATCH 4/4] libnotify: update to 0.7.8

trying to resolve my stupidity
---
 srcpkgs/libnotify/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libnotify/template b/srcpkgs/libnotify/template
index 5390f45af82..99ba36df8a0 100644
--- a/srcpkgs/libnotify/template
+++ b/srcpkgs/libnotify/template
@@ -5,8 +5,7 @@ revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Dc_args=-O2 -Dintrospection=$(vopt_if gir enabled disabled)
- -Dgtk_doc=$(vopt_if gtk_doc true false)
- -Ddocbook_docs=$(vopt_if docbook enabled disabled)"
+ -Dgtk_doc=false -Ddocbook_docs=$(vopt_if docbook enabled disabled)"
 hostmakedepends="pkg-config glib-devel"
 makedepends="libglib-devel libpng-devel gdk-pixbuf-devel gtk+3-devel
  $(vopt_if gtk_doc gtk-doc) $(vopt_if docbook 'xmlto docbook-xsl')"
@@ -18,7 +17,7 @@ distfiles="${GNOME_SITE}/${pkgname}/0.7/${pkgname}-${version}.tar.xz"
 checksum=69209e0b663776a00c7b6c0e560302a8dbf66b2551d55616304f240bba66e18c
 
 # Package build options
-build_options="gir gtk_doc docbook"
+build_options="gir docbook"
 build_options_default="gir"
 
 libnotify-devel_package() {

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2019-10-19 10:22 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
     [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-13708@inbox.vuxu.org>
2019-09-03  9:36 ` [PR PATCH] [Updated] libnotify: update to 0.7.8 voidlinux-github
2019-09-03  9:36 ` voidlinux-github
2019-10-19 10:22 ` voidlinux-github
2019-10-19 10:22 ` voidlinux-github

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).